diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..aa854cde75
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,13 @@
+{
+	"name": "Discourse",
+	"image": "discourse/discourse_dev:release",
+	"workspaceMount": "source=${localWorkspaceFolder}/../..,target=/var/www/discourse,type=bind",
+	"workspaceFolder": "/var/www/discourse",
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+	"postCreateCommand": "sudo /sbin/boot",
+	"extensions": ["rebornix.Ruby"],
+    "forwardPorts": [9292],
+	"remoteUser": "discourse"
+}
\ No newline at end of file
diff --git a/.eslintignore b/.eslintignore
index c7910a26c0..68b8560b4a 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,5 @@
+app/assets/javascripts/browser-update.js
+app/assets/javascripts/discourse-loader.js
 app/assets/javascripts/env.js
 app/assets/javascripts/main_include_admin.js
 app/assets/javascripts/vendor.js
diff --git a/.eslintrc b/.eslintrc
index 58952b4eb3..8706c9f23d 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -2,7 +2,7 @@
   "extends": "eslint-config-discourse",
   "rules": {
     "discourse-ember/global-ember": 2,
-    "no-duplicate-imports": 2
+    "eol-last": 2
   },
   "globals": {
     "moduleFor": "off",
@@ -13,6 +13,6 @@
     "currentURL": "off",
     "invisible": "off",
     "visible": "off",
-    "count": "off",
+    "count": "off"
   }
 }
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 7e97daba6d..ab85796b3c 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -45,10 +45,13 @@ bf88410126f73aab47b7e694e3c5b46453cec1b6
 ce3fe2f4c4ddf166949ee3cec3d9ecbf9108ab52
 
 # REFACTOR: Move qunit tests to a different directory structure
-bc97c79a35d8acd283d4d8b79aa079bce9d127c6
+445d6ba45fe954fb7de11ce7b1392232160e2b63
 
 # REFACTOR: Move javascript tests inside discourse app
 23f24bfb510edb25b18b6a0d5485270c88df9b24
 
 # DEV: Tidy up imports. (#11364)
 1c2358ba162eb9f9ba9095c9afe30cf51dd85e04
+
+# DEV: Sort imports alphabetically (#11382) 
+bbe5d8d5cf1220165842985c0e2cd4c454d501cd
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7b1bb84427..aefab9fadb 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,5 +1,9 @@
 version: 2
 updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "weekly"
 - package-ecosystem: bundler
   directory: "/"
   schedule:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index 8e4c2b6ac1..0000000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,222 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches-ignore:
-      - "tests-passed"
-
-jobs:
-  build:
-    name: "${{ matrix.target }}-${{ matrix.build_types }}"
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-
-    env:
-      DISCOURSE_HOSTNAME: www.example.com
-      RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072
-      BUILD_TYPE: ${{ matrix.build_types }}
-      TARGET: ${{ matrix.target }}
-      RAILS_ENV: test
-      PGHOST: localhost
-      PGUSER: discourse
-      PGPASSWORD: discourse
-
-    strategy:
-      fail-fast: false
-
-      matrix:
-        build_types: ["BACKEND", "FRONTEND", "LINT"]
-        target: ["PLUGINS", "CORE"]
-        os: [ubuntu-latest]
-        ruby: ["2.6"]
-        postgres: ["12"]
-        redis: ["4.x"]
-
-    services:
-      postgres:
-        image: postgres:${{ matrix.postgres }}
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_USER: discourse
-          POSTGRES_PASSWORD: discourse
-          POSTGRES_DB: discourse_test
-        options: >-
-          --mount type=tmpfs,destination=/var/lib/postgresql/data
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
-    steps:
-      - uses: actions/checkout@master
-        with:
-          fetch-depth: 1
-
-      - name: Setup Git
-        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 update
-          sudo apt-get -yqq install postgresql-client libpq-dev 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'
-        with:
-          redis-version: ${{ matrix.redis }}
-
-      - name: Setup ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-
-      - name: Setup bundler
-        run: |
-          gem install bundler -v 2.1.4 --no-doc
-          bundle config deployment 'true'
-          bundle config without 'development'
-          bundle config path vendor/bundle
-
-      - name: Bundler cache
-        uses: actions/cache@v2
-        id: bundler-cache
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gem-
-
-      - name: Setup gems
-        run: bundle install --jobs 4
-
-      - name: Get yarn cache directory
-        id: yarn-cache-dir
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - name: Yarn cache
-        uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.os }}-yarn-
-
-      - name: Yarn install
-        run: yarn install --dev
-
-      - name: "Checkout official plugins"
-        if: env.TARGET == 'PLUGINS'
-        run: bin/rake plugin:install_all_official
-
-      - name: Create database
-        if: env.BUILD_TYPE != 'LINT'
-        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
-
-      - name: Rubocop (core and core plugins)
-        if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'CORE'
-        run: bundle exec rubocop .
-
-      - name: Rubocop (all plugins)
-        if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'PLUGINS'
-        run: bundle exec rubocop plugins
-
-      - name: ESLint (core)
-        if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'CORE'
-        run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern app/assets/javascripts
-
-      - name: ESLint (core plugins)
-        if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'CORE'
-        run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern plugins/**/{test,assets}/javascripts
-
-      - name: ESLint (all plugins)
-        if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'PLUGINS'
-        run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern plugins/**/{test,assets}/javascripts
-
-      - name: Prettier (core and core plugins)
-        if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'CORE'
-        run: |
-          yarn prettier -v
-          yarn prettier --list-different \
-            "app/assets/stylesheets/**/*.scss" \
-            "app/assets/javascripts/**/*.{js,es6}" \
-            "plugins/**/assets/stylesheets/**/*.scss" \
-            "plugins/**/assets/javascripts/**/*.{js,es6}"
-
-      - name: Prettier (all plugins)
-        if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'PLUGINS'
-        run: |
-          yarn prettier -v
-          yarn prettier --list-different \
-            "plugins/**/assets/stylesheets/**/*.scss" \
-            "plugins/**/assets/javascripts/**/*.{js,es6}"
-
-      - name: Ember template lint (core and core plugins)
-        if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'CORE'
-        run: |
-          yarn ember-template-lint \
-            app/assets/javascripts \
-            plugins/**/assets/javascripts
-
-      - name: Ember template lint (all plugins)
-        if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'PLUGINS'
-        run: |
-          yarn ember-template-lint \
-            plugins/**/assets/javascripts
-
-      - 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: |
-          bin/turbo_rspec
-          bin/rake plugin:spec
-
-      - name: Plugin RSpec
-        if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'PLUGINS'
-        run: bin/rake plugin:spec
-
-      - name: Core QUnit
-        if: env.BUILD_TYPE == 'FRONTEND' && env.TARGET == 'CORE'
-        run: bundle exec rake qunit:test['1200000']
-        timeout-minutes: 30
-
-      - name: Wizard QUnit
-        if: env.BUILD_TYPE == 'FRONTEND' && env.TARGET == 'CORE'
-        run: bundle exec rake qunit:test['1200000','/wizard/qunit']
-        timeout-minutes: 30
-
-      - 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['*','1200000']
-        timeout-minutes: 30
diff --git a/.github/workflows/ember.yml b/.github/workflows/ember.yml
new file mode 100644
index 0000000000..d06fc9885a
--- /dev/null
+++ b/.github/workflows/ember.yml
@@ -0,0 +1,47 @@
+name: Ember CLI tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - main
+
+jobs:
+  build:
+    name: run
+    runs-on: ubuntu-latest
+    container: discourse/discourse_test:release
+    timeout-minutes: 40
+
+    steps:
+      - uses: actions/checkout@master
+        with:
+          fetch-depth: 1
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "ci@ci.invalid"
+          git config --global user.name "Discourse CI"
+
+      - name: Get yarn cache directory
+        id: yarn-cache-dir
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: Yarn cache
+        uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Yarn install
+        working-directory: ./app/assets/javascripts/discourse
+        run: yarn install
+
+      - name: Core QUnit
+        working-directory: ./app/assets/javascripts/discourse
+        run: yarn ember test
+        timeout-minutes: 30
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
new file mode 100644
index 0000000000..ff63a3b85b
--- /dev/null
+++ b/.github/workflows/linting.yml
@@ -0,0 +1,94 @@
+name: Linting
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - main
+
+jobs:
+  build:
+    name: run
+    runs-on: ubuntu-latest
+    container: discourse/discourse_test:release
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@master
+        with:
+          fetch-depth: 1
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "ci@ci.invalid"
+          git config --global user.name "Discourse CI"
+
+      - name: Bundler cache
+        uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gem-
+
+      - name: Setup gems
+        run: |
+          bundle config --local path vendor/bundle
+          bundle config --local deployment true
+          bundle config --local without development
+          bundle install --jobs 4
+          bundle clean
+
+      - name: Get yarn cache directory
+        id: yarn-cache-dir
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: Yarn cache
+        uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Yarn install
+        run: yarn install
+
+      - name: Rubocop
+        if: ${{ always() }}
+        run: bundle exec rubocop .
+
+      - name: ESLint (core)
+        if: ${{ always() }}
+        run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern app/assets/javascripts
+
+      - name: ESLint (core plugins)
+        if: ${{ always() }}
+        run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern plugins/**/{test,assets}/javascripts
+
+      - name: Prettier
+        if: ${{ always() }}
+        run: |
+          yarn prettier -v
+          yarn prettier --list-different \
+            "app/assets/stylesheets/**/*.scss" \
+            "app/assets/javascripts/**/*.{js,es6}" \
+            "plugins/**/assets/stylesheets/**/*.scss" \
+            "plugins/**/assets/javascripts/**/*.{js,es6}"
+
+      - name: Ember template lint
+        if: ${{ always() }}
+        run: |
+          yarn ember-template-lint \
+            app/assets/javascripts \
+            plugins/**/assets/javascripts
+
+      - name: English locale lint (core)
+        if: ${{ always() }}
+        run: bundle exec ruby script/i18n_lint.rb "config/**/locales/{client,server}.en.yml"
+
+      - name: English locale lint (core plugins)
+        if: ${{ always() }}
+        run: bundle exec ruby script/i18n_lint.rb "plugins/**/locales/{client,server}.en.yml"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000000..8a94b40452
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,133 @@
+name: Tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - main
+
+jobs:
+  build:
+    name: ${{ matrix.target }} ${{ matrix.build_type }}
+    runs-on: ubuntu-latest
+    container: discourse/discourse_test:release
+    timeout-minutes: 60
+
+    env:
+      DISCOURSE_HOSTNAME: www.example.com
+      RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072
+      RAILS_ENV: test
+      PGHOST: postgres
+      PGUSER: discourse
+      PGPASSWORD: discourse
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        build_type: [backend, frontend]
+        target: [core, plugins]
+        postgres: ["13"]
+        redis: ["6.x"]
+
+    services:
+      postgres:
+        image: postgres:${{ matrix.postgres }}
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_USER: discourse
+          POSTGRES_PASSWORD: discourse
+          POSTGRES_DB: discourse_test
+        options: >-
+          --mount type=tmpfs,destination=/var/lib/postgresql/data
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - uses: actions/checkout@master
+        with:
+          fetch-depth: 1
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "ci@ci.invalid"
+          git config --global user.name "Discourse CI"
+
+      - name: Setup redis
+        uses: shogo82148/actions-setup-redis@v1
+        with:
+          redis-version: ${{ matrix.redis }}
+
+      - name: Bundler cache
+        uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gem-
+
+      - name: Setup gems
+        run: |
+          bundle config --local path vendor/bundle
+          bundle config --local deployment true
+          bundle config --local without development
+          bundle install --jobs 4
+          bundle clean
+
+      - name: Get yarn cache directory
+        id: yarn-cache-dir
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: Yarn cache
+        uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Yarn install
+        run: yarn install
+
+      - name: Checkout official plugins
+        if: matrix.target == 'plugins'
+        run: bin/rake plugin:install_all_official
+
+      - name: Create database
+        run: |
+          bin/rake db:create
+          bin/rake db:migrate
+
+      - name: Create parallel databases
+        if: matrix.build_type == 'backend' && matrix.target == 'core'
+        run: |
+          bin/rake parallel:create
+          bin/rake parallel:migrate
+
+      - name: Core RSpec
+        if: matrix.build_type == 'backend' && matrix.target == 'core'
+        run: bin/turbo_rspec
+
+      - name: Plugin RSpec
+        if: matrix.build_type == 'backend' && matrix.target == 'plugins'
+        run: bin/rake plugin:spec
+
+      - name: Core QUnit
+        if: matrix.build_type == 'frontend' && matrix.target == 'core'
+        run: bin/rake qunit:test['1200000']
+        timeout-minutes: 30
+
+      - name: Wizard QUnit
+        if: matrix.build_type == 'frontend' && matrix.target == 'core'
+        run: bin/rake qunit:test['600000','/wizard/qunit']
+        timeout-minutes: 10
+
+      - name: Plugin QUnit
+        if: matrix.build_type == 'frontend' && matrix.target == 'plugins'
+        run: bin/rake plugin:qunit['*','1200000']
+        timeout-minutes: 30
diff --git a/.gitignore b/.gitignore
index d0359a12ee..8aea19bec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,26 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
+/copyright
+/coverage
+/data
+/log
+/tmp
 
-.DS_Store
-._.DS_Store
-dump.rdb
+/.env
+/.procfile
+/dump.rdb
 
-bin/*
+/config/discourse.conf
+/config/discourse.pill
+/config/multisite.yml
+# `discourse_dev` gem
+/config/dev.yml
 
-data/
-
-.sass-cache/*
-public/csv/*
-public/plugins/*
-public/tombstone/*
-
-# Ignore bundler config
-/.bundle
-/cache
-/coverage/*
-
-/public/assets/*
-/public/tombstone/*
-/bundle/*
-
-config/discourse.pill
-config/discourse.conf
+/public/assets
+/public/backups
+/public/csv
+/public/fonts
+/public/plugins
+/public/tombstone
+/public/uploads
 
 # Ignore the default SQLite database and db dumps
 *.sql
@@ -36,117 +29,31 @@ config/discourse.conf
 /db/*.sqlite3
 /db/structure.sql
 /db/schema.rb
+/db/schema_cache.yml
 
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp
-/logfile
-log/
-bootsnap-load-path-cache
-bootsnap-compile-cache/
-
-# Ignore plugins except for the bundled ones.
+# Plugins except for the bundled ones
 /plugins/*
-!/plugins/lazy-yt/
-!/plugins/poll/
 !/plugins/discourse-details/
-!/plugins/discourse-nginx-performance-report
+!/plugins/discourse-local-dates
 !/plugins/discourse-narrative-bot
 !/plugins/discourse-presence
+!/plugins/lazy-yt/
+!/plugins/poll/
 !/plugins/styleguide
-!/plugins/discourse-local-dates
 /plugins/*/auto_generated/
 
 /spec/fixtures/plugins/my_plugin/auto_generated
 
-# Ignore Eclipse .project file
-/.project
-
-# Ignore Eclipse .buildpath file
-/.buildpath
-
-# Ignore byebug history
-/.byebug_history
-
-# Ignore RubyMine settings
-/.idea
-
-# Ignore gem that is copied in
-MiniProfiler/Ruby/rack-mini-profiler-2.0.1a.gem
-
-discourse.sublime-workspace
-
-# Vim temp files
-*~
-*.swp
-*.swo
-*.swm
-
-# don't check in multisite config
-config/multisite.yml
-# don't check in my renamed multisite config as well :)
-config/multisite1.yml
-config/fog_credentials.yml
-
-/public/fonts
-/public/uploads
-/public/backups
-/public/stylesheet-cache/*
-
-# Scripts used for downloading/refreshing db
-script/download_db
-script/refresh_db
-
-# .procfile
-.procfile
-
-# .env, local environment variables for use with foreman
-.env
-
-# exclude our git version file for now
-config/version.rb
-
-# ignore the Ruby Version manager (rvm)
-.rvmrc
-.ruby-version
-.ruby-gemset
-.rbenv
-bundler_stubs/*
-
-vendor/bundle/*
-*.db
-
-# ignore jetbrains ide file
-*.iml
-
-# vim swap
-*.swn
-
-# ignore nodejs files
-node_modules
-/package-lock.json
-
+/vendor/bundle/*
 /vendor/data/GeoLite2-City.mmdb
 
-# Vagrant
-.vagrant
+# Front-end
+dist
+node_modules
+yarn-error.log
 
-# ignore auto-generated plugin js assets
+# Auto-generated plugin JS assets
 /app/assets/javascripts/plugins/*
 
-# ignore generated api documentation files
+# Generated API documentation files
 openapi/*
-
-# ignore VSCode config files
-.vscode
-
-# ignore direnv
-.envrc
-
-# ember-cli generated
-dist
-
-# Copyright Deposits
-copyright
-
-yarn-error.log
diff --git a/.prettierignore b/.prettierignore
index ca81e935a8..3884169675 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -6,6 +6,8 @@ config/locales/**/*.yml
 !config/locales/**/*.en*.yml
 script/import_scripts/**/*.yml
 
+app/assets/javascripts/browser-update.js
+app/assets/javascripts/discourse-loader.js
 app/assets/javascripts/env.js
 app/assets/javascripts/main_include_admin.js
 app/assets/javascripts/vendor.js
diff --git a/.template-lintrc.js b/.template-lintrc.js
index 9148dda21f..66890f87ba 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -2,12 +2,10 @@ module.exports = {
   extends: "recommended",
   ignore: ["**/*.raw"],
 
-  // Pending:
-  // "eol-last": "always",
-
   rules: {
     "block-indentation": true,
     "deprecated-render-helper": true,
+    "eol-last": "always",
     "linebreak-style": true,
     "link-rel-noopener": "strict",
     "no-abstract-roles": true,
diff --git a/.vscode-sample/launch.json b/.vscode-sample/launch.json
new file mode 100644
index 0000000000..e1231a270f
--- /dev/null
+++ b/.vscode-sample/launch.json
@@ -0,0 +1,19 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Discourse",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "/home/discourse/workspace/discourse", 
+            // run bundle install before rails server
+            "preLaunchTask": "Prepare discourse",
+            "env": { "DISCOURSE_DEV_HOSTS": "${env:CLOUDENV_ENVIRONMENT_ID}-9292.apps.codespaces.githubusercontent.com", "UNICORN_BIND_ALL": "1", "UNICORN_WORKERS": "4", "DISCOURSE_DEV_ALLOW_ANON_TO_IMPERSONATE": "1" },
+            "program": "bin/unicorn",
+            "args": ["-x"],
+        }
+    ]
+}
diff --git a/.vscode-sample/tasks.json b/.vscode-sample/tasks.json
new file mode 100644
index 0000000000..ad8af2fea2
--- /dev/null
+++ b/.vscode-sample/tasks.json
@@ -0,0 +1,12 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Prepare discourse",
+            "type": "shell",
+            "command": "cd /home/discourse/workspace/discourse && bundle install && yarn && bin/rake db:migrate"
+        }, 
+    ], 
+}
diff --git a/Dangerfile b/Dangerfile
deleted file mode 100644
index 33cf8fc565..0000000000
--- a/Dangerfile
+++ /dev/null
@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-if github.pr_json && (github.pr_json["additions"] || 0) > 250 || (github.pr_json["deletions"] || 0) > 250
-  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/**/*.js" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"`.split("\n")
-
-unless prettier_offenses.empty?
-  fail(%{
-This PR doesn't match our required code formatting standards, as enforced by prettier.io. <a href='https://meta.discourse.org/t/prettier-code-formatting-tool/93212'>Here's how to set up prettier in your code editor.</a>\n
-#{prettier_offenses.map { |o| github.html_link(o) }.join("\n")}
-  })
-end
-
-locales_changes = git.modified_files.grep(%r{config/locales})
-has_non_en_locales_changes = locales_changes.grep_v(%r{config/locales/(?:client|server)\.(?:en|en_US)\.yml}).any?
-
-if locales_changes.any? && has_non_en_locales_changes
-  fail("Please submit your non-English translation updates via [Crowdin](https://translate.discourse.org/). You can read more on how to contribute translations [here](https://meta.discourse.org/t/contribute-a-translation-to-discourse/14882).")
-end
-
-files = (git.added_files + git.modified_files)
-  .select { |path| !path.start_with?("plugins/") }
-  .select { |path| path.end_with?("es6") || path.end_with?("js") || path.end_with?("rb") }
-
-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 = []
-self_offenses = []
-js_files.each do |path|
-  diff = git.diff_for_file(path)
-
-  next if !diff
-
-  diff.patch.lines.grep(/^\+\s\s/).each do |added_line|
-    super_offenses << path if added_line['this._super()']
-    self_offenses << path if added_line[/(?:(^|\W)self\.?)/]
-  end
-end
-
-jquery_find_offenses = []
-js_test_files.each do |path|
-  diff = git.diff_for_file(path)
-
-  next if !diff
-
-  diff.patch.lines.grep(/^\+\s\s/).each do |added_line|
-    jquery_find_offenses << path if added_line['this.$(']
-  end
-end
-
-if !self_offenses.empty?
-  warn(%{
-Use fat arrow instead of self pattern.\n
-#{self_offenses.uniq.map { |o| github.html_link(o) }.join("\n")}
-  })
-end
-
-if !super_offenses.empty?
-  warn(%{
-When possible use `this._super(...arguments)` instead of `this._super()`\n
-#{super_offenses.uniq.map { |o| github.html_link(o) }.join("\n")}
-  })
-end
-
-if !jquery_find_offenses.empty?
-  warn(%{
-Use `find()` instead of `this.$` in js tests`\n
-#{jquery_find_offenses.uniq.map { |o| github.html_link(o) }.join("\n")}
-  })
-end
diff --git a/Gemfile b/Gemfile
index ed8fd0f8c9..71ee3f910c 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.7'
-  gem 'actionpack', '6.0.3.7'
-  gem 'actionview', '6.0.3.7'
-  gem 'activemodel', '6.0.3.7'
-  gem 'activerecord', '6.0.3.7'
-  gem 'activesupport', '6.0.3.7'
-  gem 'railties', '6.0.3.7'
+  gem 'actionmailer', '6.1.3.2'
+  gem 'actionpack', '6.1.3.2'
+  gem 'actionview', '6.1.3.2'
+  gem 'activemodel', '6.1.3.2'
+  gem 'activerecord', '6.1.3.2'
+  gem 'activesupport', '6.1.3.2'
+  gem 'railties', '6.1.3.2'
   gem 'sprockets-rails'
 end
 
@@ -40,7 +40,7 @@ gem 'actionview_precompiler', require: false
 
 gem 'seed-fu'
 
-gem 'mail', require: false
+gem 'mail', git: 'https://github.com/discourse/mail.git', require: false
 gem 'mini_mime'
 gem 'mini_suffix'
 
@@ -96,6 +96,7 @@ gem 'discourse_image_optim', require: 'image_optim'
 gem 'multi_json'
 gem 'mustache'
 gem 'nokogiri'
+gem 'loofah'
 gem 'css_parser', require: false
 
 gem 'omniauth'
@@ -132,6 +133,7 @@ gem 'rack-protection' # security
 gem 'cbor', require: false
 gem 'cose', require: false
 gem 'addressable'
+gem 'json_schemer'
 
 # Gems used only for assets and not required in production environments by default.
 # Allow everywhere for now cause we are allowing asset debugging in production
@@ -176,6 +178,7 @@ group :development do
   gem 'binding_of_caller'
   gem 'yaml-lint'
   gem 'annotate'
+  gem 'discourse_dev'
 end
 
 # this is an optional gem, it provides a high performance replacement
@@ -192,7 +195,6 @@ gem 'htmlentities', require: false
 #  If you want to amend mini profiler to do the monkey patches in the railties
 #  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 'unicorn', require: false, platform: :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index 2dd6c3013f..2bbc42e7d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,29 @@
+GIT
+  remote: https://github.com/discourse/mail.git
+  revision: 5b700fc95ee66378e0cf2559abc73c8bc3062a4b
+  specs:
+    mail (2.8.0.edge)
+      mini_mime (>= 0.1.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
+    actionmailer (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.7)
-      actionview (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.3.2)
+      actionview (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionview (6.1.3.2)
+      activesupport (= 6.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -24,44 +32,44 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.0.3.7)
-      activesupport (= 6.0.3.7)
+    activejob (6.1.3.2)
+      activesupport (= 6.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activerecord (6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activesupport (6.0.3.7)
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activerecord (6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
-    ast (2.4.1)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.390.0)
-    aws-sdk-core (3.109.2)
+    ast (2.4.2)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.432.0)
+    aws-sdk-core (3.112.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kms (1.42.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.2)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-s3 (1.90.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.35.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-sns (1.38.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sigv4 (1.2.3)
       aws-eventstream (~> 1, >= 1.0.2)
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)
@@ -70,31 +78,32 @@ GEM
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
-    binding_of_caller (0.8.0)
+    binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.5.1)
+    bootsnap (1.7.5)
       msgpack (~> 1.0)
     builder (3.2.4)
-    bullet (6.1.0)
+    bullet (6.1.4)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
     cbor (0.5.9.6)
     certified (1.0.0)
-    chunky_png (1.3.14)
+    chunky_png (1.4.0)
     coderay (1.1.3)
     colored2 (3.1.2)
     concurrent-ruby (1.1.8)
-    connection_pool (2.2.3)
+    connection_pool (2.2.5)
     cose (1.2.0)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
     cppjieba_rb (0.3.3)
-    crack (0.4.4)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
-    css_parser (1.7.1)
+    css_parser (1.9.0)
       addressable
-    debug_inspector (0.0.3)
+    debug_inspector (1.1.0)
     diff-lcs (1.4.4)
     diffy (3.4.0)
     discourse-ember-rails (0.18.6)
@@ -104,15 +113,19 @@ GEM
       ember-source (>= 1.1.0)
       jquery-rails (>= 1.0.17)
       railties (>= 3.1)
-    discourse-ember-source (3.12.2.2)
-    discourse-fonts (0.0.5)
+    discourse-ember-source (3.12.2.3)
+    discourse-fonts (0.0.8)
+    discourse_dev (0.2.1)
+      faker (~> 2.16)
     discourse_image_optim (0.26.2)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (~> 1.5)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    docile (1.3.2)
+    docile (1.4.0)
+    ecma-re-validator (0.3.0)
+      regexp_parser (~> 2.0)
     email_reply_trimmer (0.1.13)
     ember-data-source (3.0.2)
       ember-source (>= 2, < 3.0)
@@ -121,24 +134,32 @@ GEM
       sprockets (>= 3.3, < 4.1)
     ember-source (2.18.2)
     erubi (1.10.0)
-    excon (0.78.0)
-    execjs (2.7.0)
+    excon (0.81.0)
+    execjs (2.8.1)
     exifr (1.3.9)
-    fabrication (2.21.1)
+    fabrication (2.22.0)
+    faker (2.17.0)
+      i18n (>= 1.6, < 2)
     fakeweb (1.3.0)
-    faraday (1.1.0)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     fast_blank (1.0.0)
     fast_xs (0.8.0)
-    fastimage (2.2.0)
-    ffi (1.13.1)
-    flamegraph (0.9.5)
+    fastimage (2.2.3)
+    ffi (1.15.0)
     fspath (3.1.2)
     gc_tracer (1.5.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     guess_html_encoding (0.0.11)
+    hana (1.3.7)
     hashdiff (1.0.1)
     hashie (4.1.0)
     highline (2.0.3)
@@ -154,18 +175,23 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.3.1)
+    json (2.5.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    jwt (2.2.2)
+    json_schemer (0.2.18)
+      ecma-re-validator (~> 0.3)
+      hana (~> 1.3)
+      regexp_parser (~> 2.0)
+      uri_template (~> 0.7)
+    jwt (2.2.3)
     kgio (2.11.3)
-    libv8 (8.4.255.0)
-    libv8 (8.4.255.0-universal-darwin-20)
-    libv8 (8.4.255.0-x86_64-darwin-18)
-    libv8 (8.4.255.0-x86_64-darwin-19)
-    libv8 (8.4.255.0-x86_64-darwin-20)
-    libv8 (8.4.255.0-x86_64-linux)
-    listen (3.3.1)
+    libv8-node (15.14.0.1)
+    libv8-node (15.14.0.1-arm64-darwin-20)
+    libv8-node (15.14.0.1-x86_64-darwin-18)
+    libv8-node (15.14.0.1-x86_64-darwin-19)
+    libv8-node (15.14.0.1-x86_64-darwin-20)
+    libv8-node (15.14.0.1-x86_64-linux)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lograge (0.11.2)
@@ -176,37 +202,36 @@ GEM
     logstash-event (1.2.02)
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
-    logster (2.9.4)
+    logster (2.9.6)
     loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
     lz4-ruby (0.3.3)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
-    memory_profiler (0.9.14)
-    message_bus (3.3.4)
+    memory_profiler (1.0.0)
+    message_bus (3.3.5)
       rack (>= 1.1.3)
     method_source (1.0.0)
     mini_mime (1.1.0)
     mini_portile2 (2.5.1)
-    mini_racer (0.3.1)
-      libv8 (~> 8.4.255)
-    mini_scheduler (0.12.3)
-      sidekiq
-    mini_sql (0.3)
-    mini_suffix (0.3.0)
+    mini_racer (0.4.0)
+      libv8-node (~> 15.14.0.0)
+    mini_scheduler (0.13.0)
+      sidekiq (>= 4.2.3)
+    mini_sql (1.1.3)
+    mini_suffix (0.3.2)
       ffi (~> 1.9)
     minitest (5.14.4)
-    mocha (1.11.2)
-    mock_redis (0.26.0)
-    msgpack (1.3.3)
+    mocha (1.12.0)
+    mock_redis (0.28.0)
+      ruby2_keywords
+    msgpack (1.4.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mustache (1.1.1)
-    nio4r (2.5.4)
+    nio4r (2.5.7)
     nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
@@ -216,16 +241,16 @@ GEM
       racc (~> 1.4)
     nokogiri (1.11.3-x86_64-linux)
       racc (~> 1.4)
-    nokogumbo (2.0.2)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
-    oauth (0.5.4)
-    oauth2 (1.4.4)
+    oauth (0.5.6)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.10.16)
+    oj (3.11.5)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
@@ -234,35 +259,38 @@ GEM
     omniauth-github (1.4.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-google-oauth2 (0.8.0)
+    omniauth-google-oauth2 (0.8.2)
       jwt (>= 2.0)
-      omniauth (>= 1.1.1)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.1)
       omniauth-oauth2 (>= 1.6)
-    omniauth-oauth (1.1.0)
+    omniauth-oauth (1.2.0)
       oauth
-      omniauth (~> 1.0)
-    omniauth-oauth2 (1.7.0)
+      omniauth (>= 1.0, < 3)
+    omniauth-oauth2 (1.7.1)
       oauth2 (~> 1.4)
-      omniauth (~> 1.9)
+      omniauth (>= 1.9, < 3)
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (2.2.1)
+    onebox (2.2.15)
       addressable (~> 2.7.0)
       htmlentities (~> 4.3)
       multi_json (~> 1.11)
       mustache
       nokogiri (~> 1.7)
       sanitize
-    openssl-signature_algorithm (1.0.0)
+    openssl (2.2.0)
+    openssl-signature_algorithm (1.1.1)
+      openssl (~> 2.0)
     optimist (3.0.1)
     parallel (1.20.1)
-    parallel_tests (3.4.0)
+    parallel_tests (3.7.0)
       parallel
-    parser (2.7.2.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     pg (1.2.3)
-    progress (3.5.2)
+    progress (3.6.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -272,12 +300,12 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
-    puma (5.0.4)
+    puma (5.3.1)
       nio4r (~> 2.0)
     r2 (0.2.7)
     racc (1.5.2)
     rack (2.2.3)
-    rack-mini-profiler (2.2.0)
+    rack-mini-profiler (2.3.2)
       rack (>= 1.2.0)
     rack-protection (2.1.0)
       rack
@@ -288,23 +316,23 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_failover (0.6.2)
+    rails_failover (0.7.3)
       activerecord (~> 6.0)
       concurrent-ruby
       railties (~> 6.0)
-    rails_multisite (2.5.0)
+    rails_multisite (3.0.0)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
-    railties (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    railties (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      thor (~> 1.0)
     rainbow (3.0.0)
     raindrops (0.19.1)
     rake (13.0.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbtrace (0.4.14)
@@ -313,72 +341,72 @@ GEM
       optimist (>= 3.0.0)
     rchardet (1.8.0)
     redis (4.2.5)
-    redis-namespace (1.8.0)
+    redis-namespace (1.8.1)
       redis (>= 3.0.4)
-    regexp_parser (2.0.0)
+    regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rinku (2.0.6)
     rotp (6.2.0)
-    rqrcode (1.1.2)
+    rqrcode (2.0.0)
       chunky_png (~> 1.0)
-      rqrcode_core (~> 0.1)
-    rqrcode_core (0.1.2)
+      rqrcode_core (~> 1.0)
+    rqrcode_core (1.0.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-html-matchers (0.9.4)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (4.0.1)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
-      rspec-core (~> 3.9)
-      rspec-expectations (~> 3.9)
-      rspec-mocks (~> 3.9)
-      rspec-support (~> 3.9)
-    rspec-support (3.10.0)
-    rswag-specs (2.3.1)
+    rspec-rails (5.0.1)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.2)
+    rswag-specs (2.4.0)
       activesupport (>= 3.1, < 7.0)
       json-schema (~> 2.2)
       railties (>= 3.1, < 7.0)
     rtlit (0.0.5)
-    rubocop (1.4.2)
+    rubocop (1.14.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.1.1)
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.2.0)
-      parser (>= 2.7.1.5)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
     rubocop-discourse (2.4.1)
       rubocop (>= 1.1.0)
       rubocop-rspec (>= 2.0.0)
-    rubocop-rspec (2.0.0)
+    rubocop-rspec (2.3.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
-    ruby-prof (1.4.2)
-    ruby-progressbar (1.10.1)
+    ruby-prof (1.4.3)
+    ruby-progressbar (1.11.0)
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)
       nokogiri (>= 1.6.0)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     rubyzip (2.3.0)
-    sanitize (5.2.1)
+    sanitize (5.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
@@ -394,18 +422,18 @@ GEM
     seed-fu (2.3.9)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
-    shoulda-matchers (4.4.1)
+    shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
-    sidekiq (6.1.2)
+    sidekiq (6.2.1)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
-    simplecov (0.20.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -414,24 +442,24 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sshkey (2.0.0)
-    stackprof (0.2.16)
-    test-prof (0.12.2)
+    stackprof (0.2.17)
+    test-prof (1.0.5)
     thor (1.1.0)
-    thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
-    unicorn (5.7.0)
+    unicode-display_width (2.0.0)
+    unicorn (6.0.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    uniform_notifier (1.13.0)
-    webmock (3.10.0)
+    uniform_notifier (1.14.2)
+    uri_template (0.7.0)
+    webmock (3.12.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -451,14 +479,14 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  actionmailer (= 6.0.3.7)
-  actionpack (= 6.0.3.7)
-  actionview (= 6.0.3.7)
+  actionmailer (= 6.1.3.2)
+  actionpack (= 6.1.3.2)
+  actionview (= 6.1.3.2)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (= 6.0.3.7)
-  activerecord (= 6.0.3.7)
-  activesupport (= 6.0.3.7)
+  activemodel (= 6.1.3.2)
+  activerecord (= 6.1.3.2)
+  activesupport (= 6.1.3.2)
   addressable
   annotate
   aws-sdk-s3
@@ -479,6 +507,7 @@ DEPENDENCIES
   discourse-ember-rails (= 0.18.6)
   discourse-ember-source (~> 3.12.2)
   discourse-fonts
+  discourse_dev
   discourse_image_optim
   email_reply_trimmer
   ember-handlebars-template (= 0.8.0)
@@ -489,20 +518,21 @@ DEPENDENCIES
   fast_blank
   fast_xs
   fastimage
-  flamegraph
   gc_tracer
   highline
   htmlentities
   http_accept_language
   json
+  json_schemer
   listen
   lograge
   logstash-event
   logstash-logger
   logster
+  loofah
   lru_redux
   lz4-ruby
-  mail
+  mail!
   maxminddb
   memory_profiler
   message_bus
@@ -536,7 +566,7 @@ DEPENDENCIES
   rack-protection
   rails_failover
   rails_multisite
-  railties (= 6.0.3.7)
+  railties (= 6.1.3.2)
   rake
   rb-fsevent
   rbtrace
@@ -576,4 +606,4 @@ DEPENDENCIES
   yaml-lint
 
 BUNDLED WITH
-   2.2.15
+   2.2.16
diff --git a/README.md b/README.md
index 91a9304300..1bb39f2f5c 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,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 4.0+](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.7+](https://www.ruby-lang.org/en/downloads/), [PostgreSQL 13+](https://www.postgresql.org/download/), [Redis 6.0+](https://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
 
 ## Setting up Discourse
 
@@ -43,6 +43,8 @@ If you want to set up a Discourse forum for production use, see our [**Discourse
 
 If you're looking for business class hosting, see [discourse.org/buy](https://www.discourse.org/buy/).
 
+If you're looking for our remote work solution, see [teams.discourse.com](https://teams.discourse.com/).
+
 ## Requirements
 
 Discourse is built for the *next* 10 years of the Internet, so our requirements are high.
@@ -94,7 +96,7 @@ The original Discourse code contributors can be found in [**AUTHORS.MD**](docs/A
 
 ## Copyright / License
 
-Copyright 2014 - 2020 Civilized Discourse Construction Kit, Inc.
+Copyright 2014 - 2021 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.
diff --git a/Rakefile b/Rakefile
index dc7fdf2ecf..d0e674f5ab 100755
--- a/Rakefile
+++ b/Rakefile
@@ -7,7 +7,3 @@
 require File.expand_path('../config/application', __FILE__)
 
 Discourse::Application.load_tasks
-
-# this prevents crashes when migrating a database in production in certain
-# PostgreSQL configuations when trying to create structure.sql
-Rake::Task["db:structure:dump"].clear if Rails.env.production?
diff --git a/app/assets/images/favicons/amazon.png b/app/assets/images/favicons/amazon.png
deleted file mode 100644
index b2ef6045ee..0000000000
Binary files a/app/assets/images/favicons/amazon.png and /dev/null differ
diff --git a/app/assets/images/favicons/apple.png b/app/assets/images/favicons/apple.png
deleted file mode 100644
index da6b59f17f..0000000000
Binary files a/app/assets/images/favicons/apple.png and /dev/null differ
diff --git a/app/assets/images/favicons/github.png b/app/assets/images/favicons/github.png
deleted file mode 100644
index d19beac3d0..0000000000
Binary files a/app/assets/images/favicons/github.png and /dev/null differ
diff --git a/app/assets/images/favicons/rottentomatoes.png b/app/assets/images/favicons/rottentomatoes.png
deleted file mode 100644
index acd019cad3..0000000000
Binary files a/app/assets/images/favicons/rottentomatoes.png and /dev/null differ
diff --git a/app/assets/images/favicons/twitter.png b/app/assets/images/favicons/twitter.png
deleted file mode 100644
index d46388dc36..0000000000
Binary files a/app/assets/images/favicons/twitter.png and /dev/null differ
diff --git a/app/assets/images/favicons/wikipedia.png b/app/assets/images/favicons/wikipedia.png
deleted file mode 100644
index 050c5df90c..0000000000
Binary files a/app/assets/images/favicons/wikipedia.png and /dev/null differ
diff --git a/app/assets/images/select2-spinner.gif b/app/assets/images/select2-spinner.gif
deleted file mode 100644
index 703391003b..0000000000
Binary files a/app/assets/images/select2-spinner.gif and /dev/null differ
diff --git a/app/assets/images/select2.png b/app/assets/images/select2.png
deleted file mode 100644
index 32c2fc3a22..0000000000
Binary files a/app/assets/images/select2.png and /dev/null differ
diff --git a/app/assets/images/select2x2.png b/app/assets/images/select2x2.png
deleted file mode 100644
index e0a62658da..0000000000
Binary files a/app/assets/images/select2x2.png and /dev/null differ
diff --git a/app/assets/images/spinner_96.gif b/app/assets/images/spinner_96.gif
deleted file mode 100644
index 0fe3321439..0000000000
Binary files a/app/assets/images/spinner_96.gif and /dev/null differ
diff --git a/app/assets/javascripts/admin.js.erb b/app/assets/javascripts/admin.js.erb
index 41f0315deb..dda5756177 100644
--- a/app/assets/javascripts/admin.js.erb
+++ b/app/assets/javascripts/admin.js.erb
@@ -3,10 +3,10 @@ require_asset("main_include_admin.js")
 
 DiscoursePluginRegistry.admin_javascripts.each { |js| require_asset(js) }
 
-DiscoursePluginRegistry.each_globbed_asset(admin: true) do |f, ext|
+DiscoursePluginRegistry.each_globbed_asset(admin: true) do |f|
   if File.directory?(f)
     depend_on(f)
-  elsif f.to_s.end_with?(".#{ext}")
+  else
     require_asset(f)
   end
 end
diff --git a/app/assets/javascripts/admin/addon/components/ace-editor.js b/app/assets/javascripts/admin/addon/components/ace-editor.js
index 41c22eff56..06afc360e6 100644
--- a/app/assets/javascripts/admin/addon/components/ace-editor.js
+++ b/app/assets/javascripts/admin/addon/components/ace-editor.js
@@ -1,15 +1,19 @@
 import Component from "@ember/component";
-import loadScript from "discourse/lib/load-script";
 import getURL from "discourse-common/lib/get-url";
+import loadScript from "discourse/lib/load-script";
+import I18n from "I18n";
 import { observes } from "discourse-common/utils/decorators";
 import { on } from "@ember/object/evented";
 
+const COLOR_VARS_REGEX = /\$(primary|secondary|tertiary|quaternary|header_background|header_primary|highlight|danger|success|love)(\s|;|-(low|medium|high))/g;
+
 export default Component.extend({
   mode: "css",
   classNames: ["ace-wrapper"],
   _editor: null,
   _skipContentChangeEvent: null,
   disabled: false,
+  htmlPlaceholder: false,
 
   @observes("editorId")
   editorIdChanged() {
@@ -18,6 +22,10 @@ export default Component.extend({
     }
   },
 
+  didRender() {
+    this._skipContentChangeEvent = false;
+  },
+
   @observes("content")
   contentChanged() {
     const content = this.content || "";
@@ -86,6 +94,10 @@ export default Component.extend({
         loadedAce.config.set("loadWorkerFromBlob", false);
         loadedAce.config.set("workerPath", getURL("/javascripts/ace")); // Do not use CDN for workers
 
+        if (this.htmlPlaceholder) {
+          this._overridePlaceholder(loadedAce);
+        }
+
         if (!this.element || this.isDestroying || this.isDestroyed) {
           return;
         }
@@ -98,14 +110,28 @@ export default Component.extend({
         editor.on("change", () => {
           this._skipContentChangeEvent = true;
           this.set("content", editor.getSession().getValue());
-          this._skipContentChangeEvent = false;
         });
+        if (this.attrs.save) {
+          editor.commands.addCommand({
+            name: "save",
+            exec: () => {
+              this.attrs.save();
+            },
+            bindKey: { mac: "cmd-s", win: "ctrl-s" },
+          });
+        }
+
+        editor.on("blur", () => {
+          this.warnSCSSDeprecations();
+        });
+
         editor.$blockScrolling = Infinity;
         editor.renderer.setScrollMargin(10, 10);
 
         this.element.setAttribute("data-editor", editor);
         this._editor = editor;
         this.changeDisabledState();
+        this.warnSCSSDeprecations();
 
         $(window)
           .off("ace:resize")
@@ -123,6 +149,38 @@ export default Component.extend({
     });
   },
 
+  warnSCSSDeprecations() {
+    if (
+      this.mode !== "scss" ||
+      this.editorId.startsWith("color_definitions") ||
+      !this._editor
+    ) {
+      return;
+    }
+
+    let warnings = this.content
+      .split("\n")
+      .map((line, row) => {
+        if (line.match(COLOR_VARS_REGEX)) {
+          return {
+            row,
+            column: 0,
+            text: I18n.t("admin.customize.theme.scss_warning_inline"),
+            type: "warning",
+          };
+        }
+      })
+      .filter(Boolean);
+
+    this._editor.getSession().setAnnotations(warnings);
+
+    this.setWarning(
+      warnings.length
+        ? I18n.t("admin.customize.theme.scss_color_variables_warning")
+        : false
+    );
+  },
+
   actions: {
     focus() {
       if (this._editor) {
@@ -131,4 +189,32 @@ export default Component.extend({
       }
     },
   },
+
+  _overridePlaceholder(loadedAce) {
+    const originalPlaceholderSetter =
+      loadedAce.config.$defaultOptions.editor.placeholder.set;
+
+    loadedAce.config.$defaultOptions.editor.placeholder.set = function () {
+      if (!this.$updatePlaceholder) {
+        const originalRendererOn = this.renderer.on;
+        this.renderer.on = function () {};
+        originalPlaceholderSetter.call(this, ...arguments);
+        this.renderer.on = originalRendererOn;
+
+        const originalUpdatePlaceholder = this.$updatePlaceholder;
+
+        this.$updatePlaceholder = function () {
+          originalUpdatePlaceholder.call(this, ...arguments);
+
+          if (this.renderer.placeholderNode) {
+            this.renderer.placeholderNode.innerHTML = this.$placeholder || "";
+          }
+        }.bind(this);
+
+        this.on("input", this.$updatePlaceholder);
+      }
+
+      this.$updatePlaceholder();
+    };
+  },
 });
diff --git a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js
index 1bb36931a0..f691f3ffc6 100644
--- a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js
+++ b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
-import { scheduleOnce } from "@ember/runloop";
-import Component from "@ember/component";
-import discourseDebounce from "discourse/lib/debounce";
 import { observes, on } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
+import I18n from "I18n";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { scheduleOnce } from "@ember/runloop";
 
 export default Component.extend({
   classNames: ["admin-backups-logs"],
@@ -33,9 +33,7 @@ export default Component.extend({
     }
   },
 
-  @on("init")
-  @observes("logs.[]")
-  _updateFormattedLogs: discourseDebounce(function () {
+  _updateFormattedLogsFunc: function () {
     const logs = this.logs;
     if (logs.length === 0) {
       return;
@@ -57,7 +55,13 @@ export default Component.extend({
     this.renderLogs();
 
     scheduleOnce("afterRender", this, this._scrollDown);
-  }, 150),
+  },
+
+  @on("init")
+  @observes("logs.[]")
+  _updateFormattedLogs() {
+    discourseDebounce(this, this._updateFormattedLogsFunc, 150);
+  },
 
   renderLogs() {
     const formattedLogs = this.formattedLogs;
diff --git a/app/assets/javascripts/admin/addon/components/admin-graph.js b/app/assets/javascripts/admin/addon/components/admin-graph.js
index bee93aa1c5..b6bf870bc1 100644
--- a/app/assets/javascripts/admin/addon/components/admin-graph.js
+++ b/app/assets/javascripts/admin/addon/components/admin-graph.js
@@ -10,7 +10,7 @@ export default Component.extend({
     const model = this.model;
     const rawData = this.get("model.data");
 
-    var data = {
+    let data = {
       labels: rawData.map((r) => r.x),
       datasets: [
         {
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-chart.js b/app/assets/javascripts/admin/addon/components/admin-report-chart.js
index 20a190d9d2..8a894b9562 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-chart.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-chart.js
@@ -1,8 +1,9 @@
-import { makeArray } from "discourse-common/lib/helpers";
-import { debounce, schedule } from "@ember/runloop";
 import Component from "@ember/component";
-import { number } from "discourse/lib/formatter";
+import discourseDebounce from "discourse-common/lib/debounce";
 import loadScript from "discourse/lib/load-script";
+import { makeArray } from "discourse-common/lib/helpers";
+import { number } from "discourse/lib/formatter";
+import { schedule } from "@ember/runloop";
 
 export default Component.extend({
   classNames: ["admin-report-chart"],
@@ -14,7 +15,7 @@ export default Component.extend({
     this._super(...arguments);
 
     this.resizeHandler = () =>
-      debounce(this, this._scheduleChartRendering, 500);
+      discourseDebounce(this, this._scheduleChartRendering, 500);
   },
 
   didInsertElement() {
@@ -34,7 +35,7 @@ export default Component.extend({
   didReceiveAttrs() {
     this._super(...arguments);
 
-    debounce(this, this._scheduleChartRendering, 100);
+    discourseDebounce(this, this._scheduleChartRendering, 100);
   },
 
   _scheduleChartRendering() {
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-counts.js
index 6d3c0b398b..03c690dbbd 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-counts.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-counts.js
@@ -1,5 +1,5 @@
-import { match } from "@ember/object/computed";
 import Component from "@ember/component";
+import { match } from "@ember/object/computed";
 export default Component.extend({
   allTime: true,
   tagName: "tr",
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js b/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js
index 3519e6a163..4cac3b15db 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js
@@ -1,8 +1,9 @@
-import { makeArray } from "discourse-common/lib/helpers";
-import { debounce, schedule } from "@ember/runloop";
 import Component from "@ember/component";
-import { number } from "discourse/lib/formatter";
+import discourseDebounce from "discourse-common/lib/debounce";
 import loadScript from "discourse/lib/load-script";
+import { makeArray } from "discourse-common/lib/helpers";
+import { number } from "discourse/lib/formatter";
+import { schedule } from "@ember/runloop";
 
 export default Component.extend({
   classNames: ["admin-report-chart", "admin-report-stacked-chart"],
@@ -11,7 +12,7 @@ export default Component.extend({
     this._super(...arguments);
 
     this.resizeHandler = () =>
-      debounce(this, this._scheduleChartRendering, 500);
+      discourseDebounce(this, this._scheduleChartRendering, 500);
   },
 
   didInsertElement() {
@@ -31,7 +32,7 @@ export default Component.extend({
   didReceiveAttrs() {
     this._super(...arguments);
 
-    debounce(this, this._scheduleChartRendering, 100);
+    discourseDebounce(this, this._scheduleChartRendering, 100);
   },
 
   _scheduleChartRendering() {
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js
index b41304ec34..e12bc6432f 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
+import I18n from "I18n";
+import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 import { setting } from "discourse/lib/computed";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js
index 967370ab8e..aadf6e0f73 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
+import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "td",
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-header.js b/app/assets/javascripts/admin/addon/components/admin-report-table-header.js
index f7c91dcab6..5c7cdf1e4c 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-table-header.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-table-header.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "th",
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table.js b/app/assets/javascripts/admin/addon/components/admin-report-table.js
index b44ea784dd..a237e93ee4 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-table.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-table.js
@@ -1,7 +1,7 @@
+import Component from "@ember/component";
+import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
-import { alias } from "@ember/object/computed";
-import Component from "@ember/component";
 
 const PAGES_LIMIT = 8;
 
diff --git a/app/assets/javascripts/admin/addon/components/admin-report.js b/app/assets/javascripts/admin/addon/components/admin-report.js
index eb9b06f703..3ecf00451d 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report.js
@@ -1,16 +1,16 @@
-import I18n from "I18n";
-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 EmberObject, { computed, action } from "@ember/object";
-import { next } from "@ember/runloop";
-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 EmberObject, { action, computed } from "@ember/object";
 import Report, { SCHEMA_VERSION } from "admin/models/report";
+import { alias, and, equal, notEmpty, or } from "@ember/object/computed";
+import Component from "@ember/component";
+import I18n from "I18n";
+import ReportLoader from "discourse/lib/reports-loader";
+import discourseComputed from "discourse-common/utils/decorators";
+import { exportEntity } from "discourse/lib/export-csv";
 import { isPresent } from "@ember/utils";
 import { isTesting } from "discourse-common/config/environment";
+import { makeArray } from "discourse-common/lib/helpers";
+import { next } from "@ember/runloop";
+import { outputExportResult } from "discourse/lib/export-result";
 
 const TABLE_OPTIONS = {
   perPage: 8,
@@ -68,6 +68,8 @@ export default Component.extend({
   showDatesOptions: alias("model.dates_filtering"),
   showRefresh: or("showDatesOptions", "model.available_filters.length"),
   shouldDisplayTrend: and("showTrend", "model.prev_period"),
+  endDate: null,
+  startDate: null,
 
   init() {
     this._super(...arguments);
@@ -82,25 +84,21 @@ export default Component.extend({
       .includes(this.dataSourceName);
   }),
 
-  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);
 
+    let startDate = moment();
+    if (this.filters && isPresent(this.filters.startDate)) {
+      startDate = moment(this.filters.startDate, "YYYY-MM-DD");
+    }
+    this.set("startDate", startDate);
+
+    let endDate = moment();
+    if (this.filters && isPresent(this.filters.endDate)) {
+      endDate = moment(this.filters.endDate, "YYYY-MM-DD");
+    }
+    this.set("endDate", endDate);
+
     if (this.report) {
       this._renderReport(this.report, this.forcedModes, this.currentMode);
     } else if (this.dataSourceName) {
@@ -213,7 +211,7 @@ export default Component.extend({
 
   @action
   onChangeDateRange(range) {
-    this.send("refreshReport", {
+    this.setProperties({
       startDate: range.from,
       endDate: range.to,
     });
diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
index c453c877d6..36d861779a 100644
--- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
+++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
@@ -1,10 +1,13 @@
-import I18n from "I18n";
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
+import { isDocumentRTL } from "discourse/lib/text-direction";
+import { next } from "@ember/runloop";
 
 export default Component.extend({
+  warning: null,
+
   @discourseComputed("theme.targets", "onlyOverridden", "showAdvanced")
   visibleTargets(targets, onlyOverridden, showAdvanced) {
     return targets.filter((target) => {
@@ -43,9 +46,17 @@ export default Component.extend({
 
   @discourseComputed("currentTargetName", "fieldName")
   placeholder(targetName, fieldName) {
-    return fieldName && fieldName === "color_definitions"
-      ? I18n.t("admin.customize.theme.color_definitions.placeholder")
-      : "";
+    if (fieldName && fieldName === "color_definitions") {
+      const example =
+        ":root {\n" +
+        "  --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};\n" +
+        "}";
+
+      return I18n.t("admin.customize.theme.color_definitions.placeholder", {
+        example: isDocumentRTL() ? `<div dir="ltr">${example}</div>` : example,
+      });
+    }
+    return "";
   },
 
   @discourseComputed("fieldName", "currentTargetName", "theme")
@@ -111,5 +122,13 @@ export default Component.extend({
     onlyOverriddenChanged(value) {
       this.onlyOverriddenChanged(value);
     },
+
+    save() {
+      this.attrs.save();
+    },
+
+    setWarning(message) {
+      this.set("warning", message);
+    },
   },
 });
diff --git a/app/assets/javascripts/admin/addon/components/admin-user-field-item.js b/app/assets/javascripts/admin/addon/components/admin-user-field-item.js
index 17634d5c49..be2674ec6c 100644
--- a/app/assets/javascripts/admin/addon/components/admin-user-field-item.js
+++ b/app/assets/javascripts/admin/addon/components/admin-user-field-item.js
@@ -1,16 +1,16 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import { empty } from "@ember/object/computed";
-import { scheduleOnce } from "@ember/runloop";
-import Component from "@ember/component";
-import UserField from "admin/models/user-field";
-import { bufferedProperty } from "discourse/mixins/buffered-content";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { propertyEqual, i18n } from "discourse/lib/computed";
 import discourseComputed, {
   observes,
   on,
 } from "discourse-common/utils/decorators";
+import { i18n, propertyEqual } from "discourse/lib/computed";
+import Component from "@ember/component";
+import I18n from "I18n";
+import UserField from "admin/models/user-field";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import { empty } from "@ember/object/computed";
+import { isEmpty } from "@ember/utils";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { scheduleOnce } from "@ember/runloop";
 
 export default Component.extend(bufferedProperty("userField"), {
   editing: empty("userField.id"),
@@ -44,25 +44,25 @@ export default Component.extend(bufferedProperty("userField"), {
   },
 
   @discourseComputed(
-    "userField.editable",
-    "userField.required",
-    "userField.show_on_profile",
-    "userField.show_on_user_card"
+    "userField.{editable,required,show_on_profile,show_on_user_card,searchable}"
   )
-  flags(editable, required, showOnProfile, showOnUserCard) {
+  flags(userField) {
     const ret = [];
-    if (editable) {
+    if (userField.editable) {
       ret.push(I18n.t("admin.user_fields.editable.enabled"));
     }
-    if (required) {
+    if (userField.required) {
       ret.push(I18n.t("admin.user_fields.required.enabled"));
     }
-    if (showOnProfile) {
+    if (userField.showOnProfile) {
       ret.push(I18n.t("admin.user_fields.show_on_profile.enabled"));
     }
-    if (showOnUserCard) {
+    if (userField.showOnUserCard) {
       ret.push(I18n.t("admin.user_fields.show_on_user_card.enabled"));
     }
+    if (userField.searchable) {
+      ret.push(I18n.t("admin.user_fields.searchable.enabled"));
+    }
 
     return ret.join(", ");
   },
@@ -78,6 +78,7 @@ export default Component.extend(bufferedProperty("userField"), {
         "required",
         "show_on_profile",
         "show_on_user_card",
+        "searchable",
         "options"
       );
 
diff --git a/app/assets/javascripts/admin/addon/components/admin-watched-word.js b/app/assets/javascripts/admin/addon/components/admin-watched-word.js
index 061c83d56a..fb24a6f388 100644
--- a/app/assets/javascripts/admin/addon/components/admin-watched-word.js
+++ b/app/assets/javascripts/admin/addon/components/admin-watched-word.js
@@ -1,17 +1,9 @@
-import I18n from "I18n";
 import Component from "@ember/component";
-import { iconHTML } from "discourse-common/lib/icon-library";
+import I18n from "I18n";
 import bootbox from "bootbox";
 
 export default Component.extend({
   classNames: ["watched-word"],
-  watchedWord: null,
-  xIcon: iconHTML("times").htmlSafe(),
-
-  init() {
-    this._super(...arguments);
-    this.set("watchedWord", this.get("word.word"));
-  },
 
   click() {
     this.word
diff --git a/app/assets/javascripts/admin/addon/components/admin-web-hook-event-chooser.js b/app/assets/javascripts/admin/addon/components/admin-web-hook-event-chooser.js
index 98e39518bf..1c8e59fd27 100644
--- a/app/assets/javascripts/admin/addon/components/admin-web-hook-event-chooser.js
+++ b/app/assets/javascripts/admin/addon/components/admin-web-hook-event-chooser.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
+import I18n from "I18n";
+import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   classNames: ["hook-event"],
diff --git a/app/assets/javascripts/admin/addon/components/admin-web-hook-event.js b/app/assets/javascripts/admin/addon/components/admin-web-hook-event.js
index 75f1326a48..fbcf1594e0 100644
--- a/app/assets/javascripts/admin/addon/components/admin-web-hook-event.js
+++ b/app/assets/javascripts/admin/addon/components/admin-web-hook-event.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import { ensureJSON, plainJSON, prettyJSON } from "discourse/lib/formatter";
+import Component from "@ember/component";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Component.extend({
   tagName: "li",
diff --git a/app/assets/javascripts/admin/addon/components/admin-web-hook-status.js b/app/assets/javascripts/admin/addon/components/admin-web-hook-status.js
index 818970f125..a80a769e94 100644
--- a/app/assets/javascripts/admin/addon/components/admin-web-hook-status.js
+++ b/app/assets/javascripts/admin/addon/components/admin-web-hook-status.js
@@ -1,6 +1,6 @@
+import Component from "@ember/component";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/admin/addon/components/admin-wrapper.js b/app/assets/javascripts/admin/addon/components/admin-wrapper.js
index 5b907c9a04..d6a3564d42 100644
--- a/app/assets/javascripts/admin/addon/components/admin-wrapper.js
+++ b/app/assets/javascripts/admin/addon/components/admin-wrapper.js
@@ -2,11 +2,13 @@ import Component from "@ember/component";
 export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
-    $("body").addClass("admin-interface");
+    document.querySelector("html").classList.add("admin-area");
+    document.querySelector("body").classList.add("admin-interface");
   },
 
   willDestroyElement() {
     this._super(...arguments);
-    $("body").removeClass("admin-interface");
+    document.querySelector("html").classList.remove("admin-area");
+    document.querySelector("body").classList.remove("admin-interface");
   },
 });
diff --git a/app/assets/javascripts/admin/addon/components/color-input.js b/app/assets/javascripts/admin/addon/components/color-input.js
index 3d7dad5e00..c563fedc94 100644
--- a/app/assets/javascripts/admin/addon/components/color-input.js
+++ b/app/assets/javascripts/admin/addon/components/color-input.js
@@ -1,8 +1,8 @@
-import { schedule } from "@ember/runloop";
-import Component from "@ember/component";
-import { computed, action } from "@ember/object";
+import { action, computed } from "@ember/object";
 import loadScript, { loadCSS } from "discourse/lib/load-script";
+import Component from "@ember/component";
 import { observes } from "discourse-common/utils/decorators";
+import { schedule } from "@ember/runloop";
 
 /**
   An input field for a color.
diff --git a/app/assets/javascripts/admin/addon/components/dashboard-new-features.js b/app/assets/javascripts/admin/addon/components/dashboard-new-features.js
new file mode 100644
index 0000000000..059e138240
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/dashboard-new-features.js
@@ -0,0 +1,33 @@
+import Component from "@ember/component";
+import { action, computed } from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
+
+export default Component.extend({
+  newFeatures: null,
+  classNames: ["section", "dashboard-new-features"],
+  classNameBindings: ["hasUnseenFeatures:ordered-first"],
+  releaseNotesLink: null,
+
+  init() {
+    this._super(...arguments);
+
+    ajax("/admin/dashboard/new-features.json").then((json) => {
+      this.setProperties({
+        newFeatures: json.new_features,
+        hasUnseenFeatures: json.has_unseen_features,
+        releaseNotesLink: json.release_notes_link,
+      });
+    });
+  },
+
+  columnCountClass: computed("newFeatures", function () {
+    return this.newFeatures.length > 2 ? "three-or-more-items" : "";
+  }),
+
+  @action
+  dismissNewFeatures() {
+    ajax("/admin/dashboard/mark-new-features-as-seen.json", {
+      type: "PUT",
+    }).then(() => this.set("hasUnseenFeatures", false));
+  },
+});
diff --git a/app/assets/javascripts/admin/addon/components/email-styles-editor.js b/app/assets/javascripts/admin/addon/components/email-styles-editor.js
index c40f8a543e..e3e980e632 100644
--- a/app/assets/javascripts/admin/addon/components/email-styles-editor.js
+++ b/app/assets/javascripts/admin/addon/components/email-styles-editor.js
@@ -1,8 +1,8 @@
+import Component from "@ember/component";
 import I18n from "I18n";
+import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
 import { reads } from "@ember/object/computed";
-import Component from "@ember/component";
-import bootbox from "bootbox";
 
 export default Component.extend({
   editorId: reads("fieldName"),
@@ -50,5 +50,8 @@ export default Component.extend({
         }
       );
     },
+    save() {
+      this.attrs.save();
+    },
   },
 });
diff --git a/app/assets/javascripts/admin/addon/components/embeddable-host.js b/app/assets/javascripts/admin/addon/components/embeddable-host.js
index 9846c9fc7b..a0f546227b 100644
--- a/app/assets/javascripts/admin/addon/components/embeddable-host.js
+++ b/app/assets/javascripts/admin/addon/components/embeddable-host.js
@@ -1,16 +1,12 @@
+import Category from "discourse/models/category";
+import Component from "@ember/component";
 import I18n from "I18n";
-import discourseComputed, {
-  on,
-  observes,
-} from "discourse-common/utils/decorators";
+import bootbox from "bootbox";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { or } from "@ember/object/computed";
-import { schedule } from "@ember/runloop";
-import Component from "@ember/component";
-import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import Category from "discourse/models/category";
-import bootbox from "bootbox";
 
 export default Component.extend(bufferedProperty("host"), {
   editToggled: false,
@@ -19,14 +15,6 @@ export default Component.extend(bufferedProperty("host"), {
 
   editing: or("host.isNew", "editToggled"),
 
-  @on("didInsertElement")
-  @observes("editing")
-  _focusOnInput() {
-    schedule("afterRender", () => {
-      this.element.querySelector(".host-name").focus();
-    });
-  },
-
   @discourseComputed("buffered.host", "host.isSaving")
   cantSave(host, isSaving) {
     return isSaving || isEmpty(host);
diff --git a/app/assets/javascripts/admin/addon/components/embedding-setting.js b/app/assets/javascripts/admin/addon/components/embedding-setting.js
index 8c1a187ac6..7b8417aa06 100644
--- a/app/assets/javascripts/admin/addon/components/embedding-setting.js
+++ b/app/assets/javascripts/admin/addon/components/embedding-setting.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   classNames: ["embed-setting"],
diff --git a/app/assets/javascripts/admin/addon/components/emoji-value-list.js b/app/assets/javascripts/admin/addon/components/emoji-value-list.js
new file mode 100644
index 0000000000..e7096a71da
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/emoji-value-list.js
@@ -0,0 +1,168 @@
+import Component from "@ember/component";
+import I18n from "I18n";
+import discourseComputed from "discourse-common/utils/decorators";
+import { emojiUrlFor } from "discourse/lib/text";
+import { action, set, setProperties } from "@ember/object";
+import { later, schedule } from "@ember/runloop";
+
+export default Component.extend({
+  classNameBindings: [":value-list", ":emoji-list"],
+  values: null,
+  validationMessage: null,
+  emojiPickerIsActive: false,
+  isEditorFocused: false,
+
+  @discourseComputed("values")
+  collection(values) {
+    values = values || "";
+
+    return values
+      .split("|")
+      .filter(Boolean)
+      .map((value) => {
+        return {
+          isEditable: true,
+          isEditing: false,
+          value,
+          emojiUrl: emojiUrlFor(value),
+        };
+      });
+  },
+
+  @action
+  closeEmojiPicker() {
+    this.collection.setEach("isEditing", false);
+    this.set("emojiPickerIsActive", false);
+    this.set("isEditorFocused", false);
+  },
+
+  @action
+  emojiSelected(code) {
+    if (!this._validateInput(code)) {
+      return;
+    }
+
+    const item = this.collection.findBy("isEditing");
+    if (item) {
+      setProperties(item, {
+        value: code,
+        emojiUrl: emojiUrlFor(code),
+        isEditing: false,
+      });
+
+      this._saveValues();
+    } else {
+      const newCollectionValue = {
+        value: code,
+        emojiUrl: emojiUrlFor(code),
+        isEditable: true,
+        isEditing: false,
+      };
+      this.collection.addObject(newCollectionValue);
+      this._saveValues();
+    }
+
+    this.set("emojiPickerIsActive", false);
+    this.set("isEditorFocused", false);
+  },
+
+  @discourseComputed("collection")
+  showUpDownButtons(collection) {
+    return collection.length - 1 ? true : false;
+  },
+
+  _splitValues(values) {
+    if (values && values.length) {
+      const emojiList = [];
+      const emojis = values.split("|").filter(Boolean);
+      emojis.forEach((emojiName) => {
+        const emoji = {
+          isEditable: true,
+          isEditing: false,
+        };
+        emoji.value = emojiName;
+        emoji.emojiUrl = emojiUrlFor(emojiName);
+
+        emojiList.push(emoji);
+      });
+
+      return emojiList;
+    } else {
+      return [];
+    }
+  },
+
+  @action
+  editValue(index) {
+    this.closeEmojiPicker();
+    schedule("afterRender", () => {
+      if (parseInt(index, 10) >= 0) {
+        const item = this.collection[index];
+        if (item.isEditable) {
+          set(item, "isEditing", true);
+        }
+      }
+
+      this.set("isEditorFocused", true);
+      later(() => {
+        if (this.element && !this.isDestroying && !this.isDestroyed) {
+          this.set("emojiPickerIsActive", true);
+        }
+      }, 100);
+    });
+  },
+
+  @action
+  removeValue(value) {
+    this._removeValue(value);
+  },
+
+  @action
+  shift(operation, index) {
+    let futureIndex = index + operation;
+
+    if (futureIndex > this.collection.length - 1) {
+      futureIndex = 0;
+    } else if (futureIndex < 0) {
+      futureIndex = this.collection.length - 1;
+    }
+
+    const shiftedEmoji = this.collection[index];
+    this.collection.removeAt(index);
+    this.collection.insertAt(futureIndex, shiftedEmoji);
+
+    this._saveValues();
+  },
+
+  _validateInput(input) {
+    this.set("validationMessage", null);
+
+    if (!emojiUrlFor(input)) {
+      this.set(
+        "validationMessage",
+        I18n.t("admin.site_settings.emoji_list.invalid_input")
+      );
+      return false;
+    }
+
+    return true;
+  },
+
+  _removeValue(value) {
+    this.collection.removeObject(value);
+    this._saveValues();
+  },
+
+  _replaceValue(index, newValue) {
+    const item = this.collection[index];
+    if (item.value === newValue) {
+      return;
+    }
+    set(item, "value", newValue);
+    this._saveValues();
+  },
+
+  _saveValues() {
+    this.set("values", this.collection.mapBy("value").join("|"));
+  },
+});
diff --git a/app/assets/javascripts/admin/addon/components/highlighted-code.js b/app/assets/javascripts/admin/addon/components/highlighted-code.js
index f5486db8d9..21cfaf6b15 100644
--- a/app/assets/javascripts/admin/addon/components/highlighted-code.js
+++ b/app/assets/javascripts/admin/addon/components/highlighted-code.js
@@ -1,5 +1,5 @@
+import { observes, on } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import { on, observes } from "discourse-common/utils/decorators";
 import highlightSyntax from "discourse/lib/highlight-syntax";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/admin/addon/components/ip-lookup.js b/app/assets/javascripts/admin/addon/components/ip-lookup.js
index db19cb25c3..99929048a4 100644
--- a/app/assets/javascripts/admin/addon/components/ip-lookup.js
+++ b/app/assets/javascripts/admin/addon/components/ip-lookup.js
@@ -1,12 +1,12 @@
-import I18n from "I18n";
-import EmberObject from "@ember/object";
-import { later } from "@ember/runloop";
-import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
-import { ajax } from "discourse/lib/ajax";
 import AdminUser from "admin/models/admin-user";
-import copyText from "discourse/lib/copy-text";
+import Component from "@ember/component";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
+import copyText from "discourse/lib/copy-text";
+import discourseComputed from "discourse-common/utils/decorators";
+import { later } from "@ember/runloop";
 
 export default Component.extend({
   classNames: ["ip-lookup"],
diff --git a/app/assets/javascripts/admin/addon/components/penalty-post-action.js b/app/assets/javascripts/admin/addon/components/penalty-post-action.js
index 4a46bbbea7..e010272447 100644
--- a/app/assets/javascripts/admin/addon/components/penalty-post-action.js
+++ b/app/assets/javascripts/admin/addon/components/penalty-post-action.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
 import discourseComputed, {
   afterRender,
 } from "discourse-common/utils/decorators";
-import { equal } from "@ember/object/computed";
 import Component from "@ember/component";
+import I18n from "I18n";
+import { equal } from "@ember/object/computed";
 
 const ACTIONS = ["delete", "delete_replies", "edit", "none"];
 
diff --git a/app/assets/javascripts/admin/addon/components/permalink-form.js b/app/assets/javascripts/admin/addon/components/permalink-form.js
index b7238f5700..da8f947170 100644
--- a/app/assets/javascripts/admin/addon/components/permalink-form.js
+++ b/app/assets/javascripts/admin/addon/components/permalink-form.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
-import { fmt } from "discourse/lib/computed";
+import I18n from "I18n";
 import Permalink from "admin/models/permalink";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
+import { fmt } from "discourse/lib/computed";
+import { schedule } from "@ember/runloop";
 
 export default Component.extend({
   classNames: ["permalink-form"],
@@ -69,9 +69,13 @@ export default Component.extend({
               this.set("formSubmitted", false);
 
               let error;
-              if (e.responseJSON && e.responseJSON.errors) {
+              if (
+                e.jqXHR &&
+                e.jqXHR.responseJSON &&
+                e.jqXHR.responseJSON.errors
+              ) {
                 error = I18n.t("generic_error_with_reason", {
-                  error: e.responseJSON.errors.join(". "),
+                  error: e.jqXHR.responseJSON.errors.join(". "),
                 });
               } else {
                 error = I18n.t("generic_error");
diff --git a/app/assets/javascripts/admin/addon/components/report-filters/bool.js b/app/assets/javascripts/admin/addon/components/report-filters/bool.js
index 0a752c54e2..544709791c 100644
--- a/app/assets/javascripts/admin/addon/components/report-filters/bool.js
+++ b/app/assets/javascripts/admin/addon/components/report-filters/bool.js
@@ -1,5 +1,5 @@
-import { action } from "@ember/object";
 import FilterComponent from "admin/components/report-filters/filter";
+import { action } from "@ember/object";
 
 export default FilterComponent.extend({
   checked: false,
diff --git a/app/assets/javascripts/admin/addon/components/report-filters/category.js b/app/assets/javascripts/admin/addon/components/report-filters/category.js
index 4cbe965193..877c3aee7a 100644
--- a/app/assets/javascripts/admin/addon/components/report-filters/category.js
+++ b/app/assets/javascripts/admin/addon/components/report-filters/category.js
@@ -1,6 +1,6 @@
+import FilterComponent from "admin/components/report-filters/filter";
 import { action } from "@ember/object";
 import { readOnly } from "@ember/object/computed";
-import FilterComponent from "admin/components/report-filters/filter";
 
 export default FilterComponent.extend({
   category: readOnly("filter.default"),
diff --git a/app/assets/javascripts/admin/addon/components/report-filters/group.js b/app/assets/javascripts/admin/addon/components/report-filters/group.js
index 5cf379332b..30dd4c7b1b 100644
--- a/app/assets/javascripts/admin/addon/components/report-filters/group.js
+++ b/app/assets/javascripts/admin/addon/components/report-filters/group.js
@@ -1,5 +1,5 @@
-import { computed } from "@ember/object";
 import FilterComponent from "admin/components/report-filters/filter";
+import { computed } from "@ember/object";
 
 export default FilterComponent.extend({
   classNames: ["group-filter"],
diff --git a/app/assets/javascripts/admin/addon/components/resumable-upload.js b/app/assets/javascripts/admin/addon/components/resumable-upload.js
index 0afa189a1d..8e3ce18e8c 100644
--- a/app/assets/javascripts/admin/addon/components/resumable-upload.js
+++ b/app/assets/javascripts/admin/addon/components/resumable-upload.js
@@ -1,9 +1,9 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
 import { later, schedule } from "@ember/runloop";
 import Component from "@ember/component";
+import I18n from "I18n";
+import getURL from "discourse-common/lib/get-url";
 import { iconHTML } from "discourse-common/lib/icon-library";
-import discourseComputed, { on } from "discourse-common/utils/decorators";
 
 /*global Resumable:true */
 
diff --git a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js
index e738c81b85..40dd71ad9a 100644
--- a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js
+++ b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
-import bootbox from "bootbox";
+import I18n from "I18n";
 import ScreenedIpAddress from "admin/models/screened-ip-address";
+import bootbox from "bootbox";
+import { schedule } from "@ember/runloop";
 
 /**
   A form to create an IP address that will be blocked or allowed.
diff --git a/app/assets/javascripts/admin/addon/components/secret-value-list.js b/app/assets/javascripts/admin/addon/components/secret-value-list.js
index 9b59c26d3a..cd63e3b0ad 100644
--- a/app/assets/javascripts/admin/addon/components/secret-value-list.js
+++ b/app/assets/javascripts/admin/addon/components/secret-value-list.js
@@ -1,6 +1,6 @@
+import Component from "@ember/component";
 import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
-import Component from "@ember/component";
 import { on } from "discourse-common/utils/decorators";
 import { set } from "@ember/object";
 
@@ -94,9 +94,9 @@ export default Component.extend({
   _splitValues(values, delimiter) {
     if (values && values.length) {
       const keys = ["key", "secret"];
-      var res = [];
+      let res = [];
       values.split(delimiter).forEach(function (str) {
-        var object = {};
+        let object = {};
         str.split("|").forEach(function (a, i) {
           object[keys[i]] = a;
         });
diff --git a/app/assets/javascripts/admin/addon/components/simple-list.js b/app/assets/javascripts/admin/addon/components/simple-list.js
index f3db4c5973..96136c98e2 100644
--- a/app/assets/javascripts/admin/addon/components/simple-list.js
+++ b/app/assets/javascripts/admin/addon/components/simple-list.js
@@ -1,6 +1,6 @@
-import { empty } from "@ember/object/computed";
 import Component from "@ember/component";
 import { action } from "@ember/object";
+import { empty } from "@ember/object/computed";
 import { on } from "discourse-common/utils/decorators";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/admin/addon/components/site-setting.js b/app/assets/javascripts/admin/addon/components/site-setting.js
index 695ddac781..888daa3117 100644
--- a/app/assets/javascripts/admin/addon/components/site-setting.js
+++ b/app/assets/javascripts/admin/addon/components/site-setting.js
@@ -1,7 +1,7 @@
-import Component from "@ember/component";
 import BufferedContent from "discourse/mixins/buffered-content";
-import SiteSetting from "admin/models/site-setting";
+import Component from "@ember/component";
 import SettingComponent from "admin/mixins/setting-component";
+import SiteSetting from "admin/models/site-setting";
 import { readOnly } from "@ember/object/computed";
 
 export default Component.extend(BufferedContent, SettingComponent, {
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/bool.js b/app/assets/javascripts/admin/addon/components/site-settings/bool.js
index a565648c6d..70d7c59ae0 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/bool.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/bool.js
@@ -1,6 +1,6 @@
+import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
-import Component from "@ember/component";
 
 export default Component.extend({
   @discourseComputed("value")
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/category-list.js b/app/assets/javascripts/admin/addon/components/site-settings/category-list.js
index 0369756c08..9dc792e6de 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/category-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/category-list.js
@@ -1,5 +1,5 @@
-import Component from "@ember/component";
 import Category from "discourse/models/category";
+import Component from "@ember/component";
 import { computed } from "@ember/object";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/color.js b/app/assets/javascripts/admin/addon/components/site-settings/color.js
index 7e5e71effc..8d098cb7d8 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/color.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/color.js
@@ -1,5 +1,5 @@
+import { action, computed } from "@ember/object";
 import Component from "@ember/component";
-import { computed, action } from "@ember/object";
 
 function RGBToHex(rgb) {
   // Choose correct separator
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/group-list.js b/app/assets/javascripts/admin/addon/components/site-settings/group-list.js
index f7ea894503..ad9dbbfd1c 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/group-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/group-list.js
@@ -1,5 +1,5 @@
-import { computed } from "@ember/object";
 import Component from "@ember/component";
+import { computed } from "@ember/object";
 
 export default Component.extend({
   tokenSeparator: "|",
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/string.js b/app/assets/javascripts/admin/addon/components/site-settings/string.js
new file mode 100644
index 0000000000..2224c8745f
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/site-settings/string.js
@@ -0,0 +1,20 @@
+import { action } from "@ember/object";
+import Component from "@ember/component";
+import showModal from "discourse/lib/show-modal";
+
+export default Component.extend({
+  @action
+  launchJsonEditorModal() {
+    const schemaModal = showModal("json-schema-editor", {
+      model: {
+        value: this.value,
+        settingName: this.setting.setting,
+        jsonSchema: this.setting.json_schema,
+      },
+    });
+
+    schemaModal.set("onClose", () => {
+      this.set("value", schemaModal.model.value);
+    });
+  },
+});
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js b/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js
index e5723668d7..d679063df1 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   @discourseComputed("value")
diff --git a/app/assets/javascripts/admin/addon/components/site-text-summary.js b/app/assets/javascripts/admin/addon/components/site-text-summary.js
index abe4f5fa63..071091f12b 100644
--- a/app/assets/javascripts/admin/addon/components/site-text-summary.js
+++ b/app/assets/javascripts/admin/addon/components/site-text-summary.js
@@ -1,6 +1,6 @@
 import Component from "@ember/component";
-import { on } from "discourse-common/utils/decorators";
 import highlightHTML from "discourse/lib/highlight-html";
+import { on } from "discourse-common/utils/decorators";
 
 export default Component.extend({
   classNames: ["site-text"],
diff --git a/app/assets/javascripts/admin/addon/components/suspension-details.js b/app/assets/javascripts/admin/addon/components/suspension-details.js
index f9edc0e225..e99a7e1c5b 100644
--- a/app/assets/javascripts/admin/addon/components/suspension-details.js
+++ b/app/assets/javascripts/admin/addon/components/suspension-details.js
@@ -1,8 +1,8 @@
 import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "I18n";
-import { equal } from "@ember/object/computed";
 import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
+import { equal } from "@ember/object/computed";
 
 const CUSTOM_REASON_KEY = "custom";
 
diff --git a/app/assets/javascripts/admin/addon/components/tags-uploader.js b/app/assets/javascripts/admin/addon/components/tags-uploader.js
index 3c547adf8d..1dc3bfc467 100644
--- a/app/assets/javascripts/admin/addon/components/tags-uploader.js
+++ b/app/assets/javascripts/admin/addon/components/tags-uploader.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
+import I18n from "I18n";
 import UploadMixin from "discourse/mixins/upload";
+import { alias } from "@ember/object/computed";
 import bootbox from "bootbox";
 
 export default Component.extend(UploadMixin, {
diff --git a/app/assets/javascripts/admin/addon/components/theme-setting-editor.js b/app/assets/javascripts/admin/addon/components/theme-setting-editor.js
index cf87683ff7..8ceaf32bbb 100644
--- a/app/assets/javascripts/admin/addon/components/theme-setting-editor.js
+++ b/app/assets/javascripts/admin/addon/components/theme-setting-editor.js
@@ -1,5 +1,5 @@
-import Component from "@ember/component";
 import BufferedContent from "discourse/mixins/buffered-content";
+import Component from "@ember/component";
 import SettingComponent from "admin/mixins/setting-component";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
diff --git a/app/assets/javascripts/admin/addon/components/theme-setting-relatives-selector.js b/app/assets/javascripts/admin/addon/components/theme-setting-relatives-selector.js
index b23760f665..4f02a14768 100644
--- a/app/assets/javascripts/admin/addon/components/theme-setting-relatives-selector.js
+++ b/app/assets/javascripts/admin/addon/components/theme-setting-relatives-selector.js
@@ -1,5 +1,5 @@
-import Component from "@ember/component";
 import BufferedContent from "discourse/mixins/buffered-content";
+import Component from "@ember/component";
 import SettingComponent from "admin/mixins/setting-component";
 
 export default Component.extend(BufferedContent, SettingComponent, {
diff --git a/app/assets/javascripts/admin/addon/components/theme-translation.js b/app/assets/javascripts/admin/addon/components/theme-translation.js
index 6174aeb4eb..7a598db1c8 100644
--- a/app/assets/javascripts/admin/addon/components/theme-translation.js
+++ b/app/assets/javascripts/admin/addon/components/theme-translation.js
@@ -1,7 +1,7 @@
-import { alias } from "@ember/object/computed";
-import Component from "@ember/component";
 import BufferedContent from "discourse/mixins/buffered-content";
+import Component from "@ember/component";
 import SettingComponent from "admin/mixins/setting-component";
+import { alias } from "@ember/object/computed";
 
 export default Component.extend(BufferedContent, SettingComponent, {
   layoutName: "admin/templates/components/site-setting",
diff --git a/app/assets/javascripts/admin/addon/components/themes-list-item.js b/app/assets/javascripts/admin/addon/components/themes-list-item.js
index d8af9eabc7..edc1783535 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list-item.js
+++ b/app/assets/javascripts/admin/addon/components/themes-list-item.js
@@ -1,10 +1,10 @@
-import { gt, and } from "@ember/object/computed";
-import { schedule } from "@ember/runloop";
-import Component from "@ember/component";
+import { and, gt } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { iconHTML } from "discourse-common/lib/icon-library";
+import Component from "@ember/component";
 import { escape } from "pretty-text/sanitizer";
+import { iconHTML } from "discourse-common/lib/icon-library";
 import { isTesting } from "discourse-common/config/environment";
+import { schedule } from "@ember/runloop";
 
 const MAX_COMPONENTS = 4;
 
diff --git a/app/assets/javascripts/admin/addon/components/themes-list.js b/app/assets/javascripts/admin/addon/components/themes-list.js
index cdad5e454a..715ca9ccee 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list.js
+++ b/app/assets/javascripts/admin/addon/components/themes-list.js
@@ -1,6 +1,6 @@
-import { gt, equal } from "@ember/object/computed";
+import { COMPONENTS, THEMES } from "admin/models/theme";
+import { equal, gt } from "@ember/object/computed";
 import Component from "@ember/component";
-import { THEMES, COMPONENTS } from "admin/models/theme";
 import discourseComputed from "discourse-common/utils/decorators";
 import { inject as service } from "@ember/service";
 
diff --git a/app/assets/javascripts/admin/addon/components/value-list.js b/app/assets/javascripts/admin/addon/components/value-list.js
index 9951eee3f4..aa89de7f38 100644
--- a/app/assets/javascripts/admin/addon/components/value-list.js
+++ b/app/assets/javascripts/admin/addon/components/value-list.js
@@ -1,7 +1,7 @@
 import discourseComputed, { on } from "discourse-common/utils/decorators";
-import { makeArray } from "discourse-common/lib/helpers";
 import { empty, reads } from "@ember/object/computed";
 import Component from "@ember/component";
+import { makeArray } from "discourse-common/lib/helpers";
 
 export default Component.extend({
   classNameBindings: [":value-list"],
diff --git a/app/assets/javascripts/admin/addon/components/watched-word-form.js b/app/assets/javascripts/admin/addon/components/watched-word-form.js
index 5dc9d7b8e6..cf957148e2 100644
--- a/app/assets/javascripts/admin/addon/components/watched-word-form.js
+++ b/app/assets/javascripts/admin/addon/components/watched-word-form.js
@@ -1,13 +1,14 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import { schedule } from "@ember/runloop";
+import discourseComputed, {
+  observes,
+  on,
+} from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import I18n from "I18n";
 import WatchedWord from "admin/models/watched-word";
 import bootbox from "bootbox";
-import discourseComputed, {
-  on,
-  observes,
-} from "discourse-common/utils/decorators";
+import { equal } from "@ember/object/computed";
+import { isEmpty } from "@ember/utils";
+import { schedule } from "@ember/runloop";
 
 export default Component.extend({
   classNames: ["watched-word-form"],
@@ -15,6 +16,9 @@ export default Component.extend({
   actionKey: null,
   showMessage: false,
 
+  canReplace: equal("actionKey", "replace"),
+  canTag: equal("actionKey", "tag"),
+
   @discourseComputed("regularExpressions")
   placeholderKey(regularExpressions) {
     return (
@@ -56,6 +60,7 @@ export default Component.extend({
 
         const watchedWord = WatchedWord.create({
           word: this.word,
+          replacement: this.canReplace || this.canTag ? this.replacement : null,
           action: this.actionKey,
         });
 
@@ -64,6 +69,7 @@ export default Component.extend({
           .then((result) => {
             this.setProperties({
               word: "",
+              replacement: "",
               formSubmitted: false,
               showMessage: true,
               message: I18n.t("admin.watched_words.form.success"),
diff --git a/app/assets/javascripts/admin/addon/components/watched-word-uploader.js b/app/assets/javascripts/admin/addon/components/watched-word-uploader.js
index 800c0d4988..040154d30b 100644
--- a/app/assets/javascripts/admin/addon/components/watched-word-uploader.js
+++ b/app/assets/javascripts/admin/addon/components/watched-word-uploader.js
@@ -1,14 +1,14 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
+import I18n from "I18n";
 import UploadMixin from "discourse/mixins/upload";
+import { alias } from "@ember/object/computed";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend(UploadMixin, {
   type: "txt",
   classNames: "watched-words-uploader",
-  uploadUrl: "/admin/logs/watched_words/upload",
+  uploadUrl: "/admin/customize/watched_words/upload",
   addDisabled: alias("uploading"),
 
   validateUploadedFilesOptions() {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-index.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-index.js
index 880a2c6435..5b4ee4ee0a 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-index.js
@@ -1,5 +1,5 @@
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import Controller from "@ember/controller";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
   actions: {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
index 06e495109c..c90316369a 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
@@ -1,8 +1,9 @@
-import I18n from "I18n";
-import { isBlank } from "@ember/utils";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
+import { isBlank } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { get } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend({
@@ -30,6 +31,10 @@ export default Controller.extend({
   },
 
   actions: {
+    updateUsername(selected) {
+      this.set("model.username", get(selected, "firstObject"));
+    },
+
     changeUserMode(value) {
       if (value === "all") {
         this.model.set("username", null);
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js
index 11251a45e6..28a883d985 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js
@@ -1,8 +1,8 @@
-import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Controller from "@ember/controller";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import { empty } from "@ember/object/computed";
 import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { empty } from "@ember/object/computed";
 import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend(bufferedProperty("model"), {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js
index c32e70f633..c53adeecf9 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import { alias, equal } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
+import { alias, equal } from "@ember/object/computed";
+import { i18n, setting } from "discourse/lib/computed";
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import discourseComputed from "discourse-common/utils/decorators";
-import { setting, i18n } from "discourse/lib/computed";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   adminBackups: controller(),
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js
index 8c70f05439..e8a1694e2c 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js
@@ -1,5 +1,5 @@
-import { alias } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
+import { alias } from "@ember/object/computed";
 
 export default Controller.extend({
   adminBackups: controller(),
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups.js b/app/assets/javascripts/admin/addon/controllers/admin-backups.js
index 83a93d8898..77dfbc3132 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-backups.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-backups.js
@@ -1,4 +1,4 @@
-import { not, and } from "@ember/object/computed";
+import { and, not } from "@ember/object/computed";
 import Controller from "@ember/controller";
 export default Controller.extend({
   noOperationIsRunning: not("model.isOperationRunning"),
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges-award.js b/app/assets/javascripts/admin/addon/controllers/admin-badges-award.js
index f3ef51d701..218b3cb0e0 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-badges-award.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-badges-award.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import bootbox from "bootbox";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
   saving: false,
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js b/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js
index 3fec918ba9..5e1ed5bb21 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js
@@ -1,23 +1,31 @@
-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";
-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";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import I18n from "I18n";
 import bootbox from "bootbox";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { propertyNotEqual } from "discourse/lib/computed";
+import { equal, reads } from "@ember/object/computed";
+import { run } from "@ember/runloop";
+import { action } from "@ember/object";
+import getURL from "discourse-common/lib/get-url";
+
+const IMAGE = "image";
+const ICON = "icon";
 
 export default Controller.extend(bufferedProperty("model"), {
   adminBadges: controller(),
   saving: false,
   savingStatus: "",
+  selectedGraphicType: null,
   badgeTypes: reads("adminBadges.badgeTypes"),
   badgeGroupings: reads("adminBadges.badgeGroupings"),
   badgeTriggers: reads("adminBadges.badgeTriggers"),
   protectedSystemFields: reads("adminBadges.protectedSystemFields"),
   readOnly: reads("buffered.system"),
   showDisplayName: propertyNotEqual("name", "displayName"),
+  iconSelectorSelected: equal("selectedGraphicType", ICON),
+  imageUploaderSelected: equal("selectedGraphicType", IMAGE),
 
   init() {
     this._super(...arguments);
@@ -56,12 +64,52 @@ export default Controller.extend(bufferedProperty("model"), {
     return modelQuery && modelQuery.trim().length > 0;
   },
 
+  @discourseComputed("model.i18n_name")
+  textCustomizationPrefix(i18n_name) {
+    return `badges.${i18n_name}.`;
+  },
+
   @observes("model.id")
   _resetSaving: function () {
     this.set("saving", false);
     this.set("savingStatus", "");
   },
 
+  showIconSelector() {
+    this.set("selectedGraphicType", ICON);
+  },
+
+  showImageUploader() {
+    this.set("selectedGraphicType", IMAGE);
+  },
+
+  @action
+  changeGraphicType(newType) {
+    if (newType === IMAGE) {
+      this.showImageUploader();
+    } else if (newType === ICON) {
+      this.showIconSelector();
+    } else {
+      throw new Error(`Unknown badge graphic type "${newType}"`);
+    }
+  },
+
+  @action
+  setImage(upload) {
+    this.buffered.setProperties({
+      image_upload_id: upload.id,
+      image_url: getURL(upload.url),
+    });
+  },
+
+  @action
+  removeImage() {
+    this.buffered.setProperties({
+      image_upload_id: null,
+      image_url: null,
+    });
+  },
+
   actions: {
     save() {
       if (!this.saving) {
@@ -77,7 +125,7 @@ export default Controller.extend(bufferedProperty("model"), {
           "description",
           "long_description",
           "icon",
-          "image",
+          "image_upload_id",
           "query",
           "badge_grouping_id",
           "trigger",
@@ -105,7 +153,7 @@ export default Controller.extend(bufferedProperty("model"), {
         const data = {};
         const buffered = this.buffered;
         fields.forEach(function (field) {
-          var d = buffered.get(field);
+          let d = buffered.get(field);
           if (boolFields.includes(field)) {
             d = !!d;
           }
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges.js b/app/assets/javascripts/admin/addon/controllers/admin-badges.js
index 433c49bac5..11d78fc4cc 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-badges.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-badges.js
@@ -1,6 +1,6 @@
 import Controller from "@ember/controller";
-import { inject as service } from "@ember/service";
 import discourseComputed from "discourse-common/utils/decorators";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
   routing: service("-routing"),
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js
index 5fa6218839..37394fd17f 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js
@@ -1,8 +1,8 @@
+import Controller from "@ember/controller";
 import I18n from "I18n";
+import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
 import { later } from "@ember/runloop";
-import Controller from "@ember/controller";
-import bootbox from "bootbox";
 
 export default Controller.extend({
   @discourseComputed("model.colors", "onlyOverridden")
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js
index 01898b161a..7f06b1f3f0 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
-import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
-import showModal from "discourse/lib/show-modal";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
+import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend({
   @discourseComputed("model.@each.id")
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js
index f1190600e8..79813399b2 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   @discourseComputed("model.isSaving")
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js
index f5f7a563ef..d20f812ca3 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller, { inject as controller } from "@ember/controller";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { bufferedProperty } from "discourse/mixins/buffered-content";
+import I18n from "I18n";
 import { action } from "@ember/object";
 import bootbox from "bootbox";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import discourseComputed from "discourse-common/utils/decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(bufferedProperty("emailTemplate"), {
   adminCustomizeEmailTemplates: controller(),
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js
index 415cf1d157..a3d7f360e0 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js
@@ -1,6 +1,6 @@
-import { sort } from "@ember/object/computed";
-import { action } from "@ember/object";
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
+import { sort } from "@ember/object/computed";
 
 export default Controller.extend({
   sortedTemplates: sort("emailTemplates", "titleSorting"),
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js
index 7da0720744..a178f2c999 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js
@@ -1,7 +1,7 @@
-import { not } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
+import { not } from "@ember/object/computed";
 import { propertyEqual } from "discourse/lib/computed";
 
 export default Controller.extend(bufferedProperty("model"), {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js
index 889d90a921..2e1536d181 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
-import { url } from "discourse/lib/computed";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
+import { url } from "discourse/lib/computed";
 
 export default Controller.extend({
   section: null,
@@ -64,5 +64,9 @@ export default Controller.extend({
         }
       }
     },
+
+    goBack() {
+      this.replaceRoute(this.showRouteName, this.model.id);
+    },
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
index 9e9afda71d..000e1d3fc8 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
@@ -1,21 +1,21 @@
-import I18n from "I18n";
-import { makeArray } from "discourse-common/lib/helpers";
+import { COMPONENTS, THEMES } from "admin/models/theme";
 import {
   empty,
   filterBy,
-  match,
   mapBy,
+  match,
   notEmpty,
 } from "@ember/object/computed";
 import Controller from "@ember/controller";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
+import ThemeSettings from "admin/models/theme-settings";
+import bootbox from "bootbox";
 import discourseComputed from "discourse-common/utils/decorators";
-import { url } from "discourse/lib/computed";
+import { makeArray } from "discourse-common/lib/helpers";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
-import ThemeSettings from "admin/models/theme-settings";
-import { THEMES, COMPONENTS } from "admin/models/theme";
-import EmberObject from "@ember/object";
-import bootbox from "bootbox";
+import { url } from "discourse/lib/computed";
 
 const THEME_UPLOAD_VAR = 2;
 
@@ -231,6 +231,11 @@ export default Controller.extend({
       : remoteThemeUrl;
   },
 
+  @discourseComputed("model.user.id", "model.default")
+  showConvert(userId, defaultTheme) {
+    return userId > 0 && !defaultTheme;
+  },
+
   actions: {
     updateToLatest() {
       this.set("updatingRemote", true);
@@ -369,25 +374,29 @@ export default Controller.extend({
 
     switchType() {
       const relatives = this.get("model.component")
-        ? this.parentThemes
+        ? this.get("model.parentThemes")
         : this.get("model.childThemes");
+
+      let message = I18n.t(`${this.convertKey}_alert_generic`);
+
       if (relatives && relatives.length > 0) {
-        const names = relatives.map((relative) => relative.get("name"));
-        bootbox.confirm(
-          I18n.t(`${this.convertKey}_alert`, {
-            relatives: names.join(", "),
-          }),
-          I18n.t("no_value"),
-          I18n.t("yes_value"),
-          (result) => {
-            if (result) {
-              this.commitSwitchType();
-            }
-          }
-        );
-      } else {
-        this.commitSwitchType();
+        message = I18n.t(`${this.convertKey}_alert`, {
+          relatives: relatives
+            .map((relative) => relative.get("name"))
+            .join(", "),
+        });
       }
+
+      bootbox.confirm(
+        message,
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        (result) => {
+          if (result) {
+            this.commitSwitchType();
+          }
+        }
+      );
     },
 
     enableComponent() {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js
index 3ffe9301f1..a598ade6f5 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js
@@ -1,6 +1,6 @@
 import Controller from "@ember/controller";
-import discourseComputed from "discourse-common/utils/decorators";
 import { THEMES } from "admin/models/theme";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   currentTab: THEMES,
@@ -15,8 +15,8 @@ export default Controller.extend({
     return themes.filter((t) => t.get("component"));
   },
 
-  @discourseComputed("model", "model.@each.component")
-  installedThemes(themes) {
-    return themes.map((t) => t.name);
+  @discourseComputed("model.content")
+  installedThemes(content) {
+    return content || [];
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js
index fe97fb0855..a831b686bc 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js
@@ -1,13 +1,13 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { makeArray } from "discourse-common/lib/helpers";
 import Controller, { inject } from "@ember/controller";
-import { setting } from "discourse/lib/computed";
 import AdminDashboard from "admin/models/admin-dashboard";
-import Report from "admin/models/report";
+import I18n from "I18n";
 import PeriodComputationMixin from "admin/mixins/period-computation";
+import Report from "admin/models/report";
 import { computed } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 import getURL from "discourse-common/lib/get-url";
+import { makeArray } from "discourse-common/lib/helpers";
+import { setting } from "discourse/lib/computed";
 
 function staticReport(reportType) {
   return computed("reports.[]", function () {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js
index 6781c50bde..16e632d6e2 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js
@@ -1,8 +1,8 @@
-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";
 import { computed } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
 
 export default Controller.extend(PeriodComputationMixin, {
   @discourseComputed
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js
index 966304a0e5..ab10591c80 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js
@@ -1,7 +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";
+import discourseComputed from "discourse-common/utils/decorators";
+import discourseDebounce from "discourse-common/lib/debounce";
 
 const { get } = Ember;
 
@@ -34,7 +34,7 @@ export default Controller.extend({
 
   actions: {
     filterReports(filter) {
-      debounce(this, this._performFiltering, filter, INPUT_DELAY);
+      discourseDebounce(this, this._performFiltering, filter, INPUT_DELAY);
     },
   },
 
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js
index 29e1ad0c5a..89955953fb 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js
@@ -1,9 +1,9 @@
-import discourseComputed from "discourse-common/utils/decorators";
 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";
+import { computed } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
+import { setting } from "discourse/lib/computed";
 
 const PROBLEMS_CHECK_MINUTES = 1;
 
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
index 07721cdff0..1500549564 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
@@ -1,11 +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";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { observes } from "discourse-common/utils/decorators";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,user,address,type}")
-  filterEmailLogs: discourseDebounce(function () {
-    this.loadLogs();
-  }, INPUT_DELAY),
+  filterEmailLogs() {
+    discourseDebounce(this, this.loadLogs, INPUT_DELAY);
+  },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-index.js b/app/assets/javascripts/admin/addon/controllers/admin-email-index.js
index f356731e6d..18bfd4a8c4 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-index.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
-import { empty } from "@ember/object/computed";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import { observes } from "discourse-common/utils/decorators";
 import bootbox from "bootbox";
+import { empty } from "@ember/object/computed";
+import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   /**
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
index 4b6ba80ce6..1a6fbf2184 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
@@ -1,8 +1,9 @@
-import { empty, or, notEmpty } from "@ember/object/computed";
+import { empty, notEmpty, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import EmailPreview from "admin/models/email-preview";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import bootbox from "bootbox";
+import { get } from "@ember/object";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
   username: null,
@@ -14,6 +15,10 @@ export default Controller.extend({
   htmlEmpty: empty("model.html_content"),
 
   actions: {
+    updateUsername(selected) {
+      this.set("username", get(selected, "firstObject"));
+    },
+
     refresh() {
       const model = this.model;
 
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-received.js b/app/assets/javascripts/admin/addon/controllers/admin-email-received.js
index ab02337866..0a2933fa23 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-received.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-received.js
@@ -1,14 +1,14 @@
 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";
+import IncomingEmail from "admin/models/incoming-email";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { observes } from "discourse-common/utils/decorators";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,from,to,subject}")
-  filterIncomingEmails: discourseDebounce(function () {
-    this.loadLogs(IncomingEmail);
-  }, INPUT_DELAY),
+  filterIncomingEmails() {
+    discourseDebounce(this, this.loadLogs, IncomingEmail, INPUT_DELAY);
+  },
 
   actions: {
     loadMore() {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
index 2c160648c6..89c67f3cf9 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
@@ -1,14 +1,14 @@
 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";
+import IncomingEmail from "admin/models/incoming-email";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { observes } from "discourse-common/utils/decorators";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,from,to,subject,error}")
-  filterIncomingEmails: discourseDebounce(function () {
-    this.loadLogs(IncomingEmail);
-  }, INPUT_DELAY),
+  filterIncomingEmails() {
+    discourseDebounce(this, this.loadLogs, IncomingEmail, INPUT_DELAY);
+  },
 
   actions: {
     loadMore() {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js b/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js
index 2c7890cde8..5cc83109f8 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js
@@ -1,11 +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";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { observes } from "discourse-common/utils/decorators";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,user,address,type,reply_key}")
-  filterEmailLogs: discourseDebounce(function () {
-    this.loadLogs();
-  }, INPUT_DELAY),
+  filterEmailLogs() {
+    discourseDebounce(this, this.loadLogs, INPUT_DELAY);
+  },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js b/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js
index 07721cdff0..1500549564 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js
@@ -1,11 +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";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { observes } from "discourse-common/utils/decorators";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,user,address,type}")
-  filterEmailLogs: discourseDebounce(function () {
-    this.loadLogs();
-  }, INPUT_DELAY),
+  filterEmailLogs() {
+    discourseDebounce(this, this.loadLogs, INPUT_DELAY);
+  },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-embedding.js b/app/assets/javascripts/admin/addon/controllers/admin-embedding.js
index df7f856ed5..147d4dd35a 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-embedding.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-embedding.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-emojis.js b/app/assets/javascripts/admin/addon/controllers/admin-emojis.js
index 4019cb188e..94e284c0c9 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-emojis.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-emojis.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
-import { sort } from "@ember/object/computed";
 import EmberObject, { action, computed } from "@ember/object";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
+import { sort } from "@ember/object/computed";
 
 const ALL_FILTER = "all";
 
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js
index 134968eb10..ed3cd6489d 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js
@@ -1,7 +1,7 @@
 import Controller from "@ember/controller";
+import ScreenedEmail from "admin/models/screened-email";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
-import ScreenedEmail from "admin/models/screened-email";
 
 export default Controller.extend({
   loading: false,
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
index 68ac649425..fb923131ed 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
@@ -1,25 +1,29 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
-import discourseDebounce from "discourse/lib/debounce";
-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 I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
+import ScreenedIpAddress from "admin/models/screened-ip-address";
 import bootbox from "bootbox";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { exportEntity } from "discourse/lib/export-csv";
+import { observes } from "discourse-common/utils/decorators";
+import { outputExportResult } from "discourse/lib/export-result";
 
 export default Controller.extend({
   loading: false,
   filter: null,
   savedIpAddress: null,
 
-  @observes("filter")
-  show: discourseDebounce(function () {
+  _debouncedShow() {
     this.set("loading", true);
     ScreenedIpAddress.findAll(this.filter).then((result) => {
       this.setProperties({ model: result, loading: false });
     });
-  }, INPUT_DELAY),
+  },
+
+  @observes("filter")
+  show() {
+    discourseDebounce(this, this._debouncedShow, INPUT_DELAY);
+  },
 
   actions: {
     allow(record) {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js
index 90d008bb86..86621f5968 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js
@@ -1,7 +1,7 @@
 import Controller from "@ember/controller";
+import ScreenedUrl from "admin/models/screened-url";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
-import ScreenedUrl from "admin/models/screened-url";
 
 export default Controller.extend({
   loading: false,
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
index 70496049d1..2758a10aa1 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
@@ -1,10 +1,10 @@
 import Controller from "@ember/controller";
 import EmberObject from "@ember/object";
-import { scheduleOnce } from "@ember/runloop";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
-import I18n from "I18n";
+import { scheduleOnce } from "@ember/runloop";
 
 export default Controller.extend({
   queryParams: ["filters"],
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js b/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js
index 729cdab0c8..b11b397311 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js
@@ -1,22 +1,26 @@
-import I18n from "I18n";
 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 I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
+import Permalink from "admin/models/permalink";
 import bootbox from "bootbox";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   loading: false,
   filter: null,
 
-  @observes("filter")
-  show: discourseDebounce(function () {
+  _debouncedShow() {
     Permalink.findAll(this.filter).then((result) => {
       this.set("model", result);
       this.set("loading", false);
     });
-  }, INPUT_DELAY),
+  },
+
+  @observes("filter")
+  show() {
+    discourseDebounce(this, this._debouncedShow, INPUT_DELAY);
+  },
 
   actions: {
     recordAdded(arg) {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-plugins.js b/app/assets/javascripts/admin/addon/controllers/admin-plugins.js
index 955aaba5c3..d19c5584aa 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-plugins.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-plugins.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   @discourseComputed
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js b/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js
index c20dfc1c2e..64a2c5de93 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   queryParams: ["start_date", "end_date", "filters", "chart_grouping"],
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-search-logs-index.js b/app/assets/javascripts/admin/addon/controllers/admin-search-logs-index.js
index 2e2bcb4f73..bf110796f2 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-search-logs-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-search-logs-index.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 export const DEFAULT_PERIOD = "yearly";
 
 export default Controller.extend({
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-search-logs-term.js b/app/assets/javascripts/admin/addon/controllers/admin-search-logs-term.js
index 8ee5dd5df1..2d4f22211b 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-search-logs-term.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-search-logs-term.js
@@ -1,6 +1,6 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
 import { DEFAULT_PERIOD } from "admin/controllers/admin-search-logs-index";
+import I18n from "I18n";
 
 export default Controller.extend({
   loading: false,
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js b/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js
index 5a12f1d717..2727c56010 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller, { inject as controller } from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   adminSiteSettings: controller(),
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js
index 02e7ab8f07..58859ae933 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-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 I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
+import { alias } from "@ember/object/computed";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { isEmpty } from "@ember/utils";
+import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   filter: null,
@@ -112,13 +112,19 @@ export default Controller.extend({
   },
 
   @observes("filter", "onlyOverridden", "model")
-  filterContent: discourseDebounce(function () {
-    if (this._skipBounce) {
-      this.set("_skipBounce", false);
-    } else {
-      this.filterContentNow(this.categoryNameKey);
-    }
-  }, INPUT_DELAY),
+  filterContent() {
+    discourseDebounce(
+      this,
+      () => {
+        if (this._skipBounce) {
+          this.set("_skipBounce", false);
+        } else {
+          this.filterContentNow(this.categoryNameKey);
+        }
+      },
+      INPUT_DELAY
+    );
+  },
 
   actions: {
     clearFilter() {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js
index b33bbe3968..cc7bac3267 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js
@@ -1,12 +1,13 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { bufferedProperty } from "discourse/mixins/buffered-content";
+import I18n from "I18n";
 import bootbox from "bootbox";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import discourseComputed from "discourse-common/utils/decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(bufferedProperty("siteText"), {
   saved: false,
+  queryParams: ["locale"],
 
   @discourseComputed("buffered.value")
   saveDisabled(value) {
@@ -15,9 +16,11 @@ export default Controller.extend(bufferedProperty("siteText"), {
 
   actions: {
     saveChanges() {
-      const buffered = this.buffered;
+      const attrs = this.buffered.getProperties("value");
+      attrs.locale = this.locale;
+
       this.siteText
-        .save(buffered.getProperties("value"))
+        .save(attrs)
         .then(() => {
           this.commitBuffer();
           this.set("saved", true);
@@ -27,10 +30,11 @@ export default Controller.extend(bufferedProperty("siteText"), {
 
     revertChanges() {
       this.set("saved", false);
+
       bootbox.confirm(I18n.t("admin.site_text.revert_confirm"), (result) => {
         if (result) {
           this.siteText
-            .revert()
+            .revert(this.locale)
             .then((props) => {
               const buffered = this.buffered;
               buffered.setProperties(props);
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js
index e46096c751..2f2b708d17 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js
@@ -1,43 +1,88 @@
-import { debounce } from "@ember/runloop";
 import Controller from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
+import discourseDebounce from "discourse-common/lib/debounce";
 let lastSearch;
 
 export default Controller.extend({
   searching: false,
   siteTexts: null,
   preferred: false,
-  queryParams: ["q", "overridden"],
+  queryParams: ["q", "overridden", "locale"],
+  locale: null,
 
   q: null,
   overridden: false,
 
+  init() {
+    this._super(...arguments);
+
+    this.set("locale", this.siteSettings.default_locale);
+  },
+
   _performSearch() {
     this.store
-      .find("site-text", this.getProperties("q", "overridden"))
+      .find("site-text", this.getProperties("q", "overridden", "locale"))
       .then((results) => {
         this.set("siteTexts", results);
       })
       .finally(() => this.set("searching", false));
   },
 
+  @discourseComputed()
+  availableLocales() {
+    return JSON.parse(this.siteSettings.available_locales);
+  },
+
+  @discourseComputed("locale")
+  fallbackLocaleFullName() {
+    if (this.siteTexts.extras.fallback_locale) {
+      return this.availableLocales.find((l) => {
+        return l.value === this.siteTexts.extras.fallback_locale;
+      }).name;
+    }
+  },
+
+  @discourseComputed("locale")
+  showFallbackLocaleWarning() {
+    return (
+      this.siteSettings.allow_user_locale &&
+      this.siteSettings.set_locale_from_accept_language_header &&
+      this.fallbackLocaleFullName
+    );
+  },
+
   actions: {
     edit(siteText) {
-      this.transitionToRoute("adminSiteText.edit", siteText.get("id"));
+      this.transitionToRoute("adminSiteText.edit", siteText.get("id"), {
+        queryParams: {
+          locale: this.locale,
+          localeFullName: this.availableLocales[this.locale],
+        },
+      });
     },
 
     toggleOverridden() {
       this.toggleProperty("overridden");
       this.set("searching", true);
-      debounce(this, this._performSearch, 400);
+      discourseDebounce(this, this._performSearch, 400);
     },
 
     search() {
       const q = this.q;
       if (q !== lastSearch) {
         this.set("searching", true);
-        debounce(this, this._performSearch, 400);
+        discourseDebounce(this, this._performSearch, 400);
         lastSearch = q;
       }
     },
+
+    updateLocale(value) {
+      this.setProperties({
+        searching: true,
+        locale: value,
+      });
+
+      discourseDebounce(this, this._performSearch, 400);
+    },
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js
index 6951a7b562..2c5212e4ba 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js
@@ -1,11 +1,11 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { alias, sort } from "@ember/object/computed";
-import { next } from "@ember/runloop";
 import Controller, { inject as controller } from "@ember/controller";
+import { alias, sort } from "@ember/object/computed";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
-import { popupAjaxError } from "discourse/lib/ajax-error";
+import I18n from "I18n";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
+import { next } from "@ember/runloop";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(GrantBadgeController, {
   adminUser: controller(),
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js b/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js
index 913ed729a7..bafcc02937 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
 import { gte, sort } from "@ember/object/computed";
 import Controller from "@ember/controller";
-import { popupAjaxError } from "discourse/lib/ajax-error";
+import I18n from "I18n";
 import bootbox from "bootbox";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 const MAX_FIELDS = 30;
 
@@ -53,17 +53,18 @@ export default Controller.extend({
 
       // Only confirm if we already been saved
       if (f.get("id")) {
-        bootbox.confirm(I18n.t("admin.user_fields.delete_confirm"), function (
-          result
-        ) {
-          if (result) {
-            f.destroyRecord()
-              .then(function () {
-                model.removeObject(f);
-              })
-              .catch(popupAjaxError);
+        bootbox.confirm(
+          I18n.t("admin.user_fields.delete_confirm"),
+          function (result) {
+            if (result) {
+              f.destroyRecord()
+                .then(function () {
+                  model.removeObject(f);
+                })
+                .catch(popupAjaxError);
+            }
           }
-        });
+        );
       } else {
         model.removeObject(f);
       }
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
index 2bed595b3f..517f0c0386 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
@@ -1,16 +1,19 @@
-import I18n from "I18n";
-import { notEmpty, and } from "@ember/object/computed";
-import { inject as service } from "@ember/service";
-import Controller from "@ember/controller";
-import { ajax } from "discourse/lib/ajax";
+import DiscourseURL, { userPath } from "discourse/lib/url";
+import { and, notEmpty } from "@ember/object/computed";
+import { fmt, propertyNotEqual, setting } from "discourse/lib/computed";
+import AdminUser from "admin/models/admin-user";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
-import { propertyNotEqual, setting, fmt } from "discourse/lib/computed";
-import { userPath } from "discourse/lib/url";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import discourseComputed from "discourse-common/utils/decorators";
-import { htmlSafe } from "@ember/template";
-import showModal from "discourse/lib/show-modal";
+import Controller from "@ember/controller";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
+import { htmlSafe } from "@ember/template";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
+import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend(CanCheckEmails, {
   adminTools: service(),
@@ -19,6 +22,7 @@ export default Controller.extend(CanCheckEmails, {
   availableGroups: null,
   userTitleValue: null,
   ssoExternalEmail: null,
+  ssoLastPayload: null,
 
   showBadges: setting("enable_badges"),
   hasLockedTrustLevel: notEmpty("model.manual_locked_trust_level"),
@@ -134,17 +138,28 @@ export default Controller.extend(CanCheckEmails, {
       .catch(() => bootbox.alert(I18n.t("generic_error")));
   },
 
-  @discourseComputed("model.single_sign_on_record.last_payload")
+  @discourseComputed("ssoLastPayload")
   ssoPayload(lastPayload) {
     return lastPayload.split("&");
   },
 
   actions: {
     impersonate() {
-      return this.model.impersonate();
+      return this.model
+        .impersonate()
+        .then(() => DiscourseURL.redirectTo("/"))
+        .catch((e) => {
+          if (e.status === 404) {
+            bootbox.alert(I18n.t("admin.impersonate.not_found"));
+          } else {
+            bootbox.alert(I18n.t("admin.impersonate.invalid"));
+          }
+        });
     },
     logOut() {
-      return this.model.logOut();
+      return this.model
+        .logOut()
+        .then(() => bootbox.alert(I18n.t("admin.user.logged_out")));
     },
     resetBounceScore() {
       return this.model.resetBounceScore();
@@ -152,20 +167,56 @@ export default Controller.extend(CanCheckEmails, {
     approve() {
       return this.model.approve(this.currentUser);
     },
+
+    _formatError(event) {
+      return `http: ${event.status} - ${event.body}`;
+    },
+
     deactivate() {
-      return this.model.deactivate();
+      return this.model
+        .deactivate()
+        .then(() =>
+          this.model.setProperties({ active: false, can_activate: true })
+        )
+        .catch((e) => {
+          const error = I18n.t("admin.user.deactivate_failed", {
+            error: this._formatError(e),
+          });
+          bootbox.alert(error);
+        });
     },
     sendActivationEmail() {
-      return this.model.sendActivationEmail();
+      return this.model
+        .sendActivationEmail()
+        .then(() => bootbox.alert(I18n.t("admin.user.activation_email_sent")))
+        .catch(popupAjaxError);
     },
     activate() {
-      return this.model.activate();
+      return this.model
+        .activate()
+        .then(() =>
+          this.model.setProperties({
+            active: true,
+            can_deactivate: !this.model.staff,
+          })
+        )
+        .catch((e) => {
+          const error = I18n.t("admin.user.activate_failed", {
+            error: this._formatError(e),
+          });
+          bootbox.alert(error);
+        });
     },
     revokeAdmin() {
       return this.model.revokeAdmin();
     },
     grantAdmin() {
-      return this.model.grantAdmin();
+      return this.model
+        .grantAdmin()
+        .then(() => {
+          bootbox.alert(I18n.t("admin.user.grant_admin_confirm"));
+        })
+        .catch(popupAjaxError);
     },
     revokeModeration() {
       return this.model.revokeModeration();
@@ -174,13 +225,41 @@ export default Controller.extend(CanCheckEmails, {
       return this.model.grantModeration();
     },
     saveTrustLevel() {
-      return this.model.saveTrustLevel();
+      return this.model
+        .saveTrustLevel()
+        .then(() => window.location.reload())
+        .catch((e) => {
+          let error;
+          if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+            error = e.jqXHR.responseJSON.errors[0];
+          }
+          error =
+            error ||
+            I18n.t("admin.user.trust_level_change_failed", {
+              error: this._formatError(e),
+            });
+          bootbox.alert(error);
+        });
     },
     restoreTrustLevel() {
       return this.model.restoreTrustLevel();
     },
     lockTrustLevel(locked) {
-      return this.model.lockTrustLevel(locked);
+      return this.model
+        .lockTrustLevel(locked)
+        .then(() => window.location.reload())
+        .catch((e) => {
+          let error;
+          if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+            error = e.jqXHR.responseJSON.errors[0];
+          }
+          error =
+            error ||
+            I18n.t("admin.user.trust_level_change_failed", {
+              error: this._formatError(e),
+            });
+          bootbox.alert(error);
+        });
     },
     unsilence() {
       return this.model.unsilence();
@@ -189,11 +268,117 @@ export default Controller.extend(CanCheckEmails, {
       return this.model.silence();
     },
     deleteAllPosts() {
-      return this.model.deleteAllPosts();
+      let deletedPosts = 0;
+      let deletedPercentage = 0;
+      const user = this.model;
+      const message = I18n.messageFormat(
+        "admin.user.delete_all_posts_confirm_MF",
+        {
+          POSTS: user.get("post_count"),
+          TOPICS: user.get("topic_count"),
+        }
+      );
+
+      const performDelete = (progressModal) => {
+        this.model
+          .deleteAllPosts()
+          .then(({ posts_deleted }) => {
+            if (posts_deleted === 0) {
+              user.set("post_count", 0);
+              progressModal.send("closeModal");
+            } else {
+              deletedPosts += posts_deleted;
+              deletedPercentage = Math.floor(
+                (deletedPosts * 100) / user.get("post_count")
+              );
+              progressModal.setProperties({
+                deletedPercentage: deletedPercentage,
+              });
+              performDelete(progressModal);
+            }
+          })
+          .catch((e) => {
+            progressModal.send("closeModal");
+            let error;
+            AdminUser.find(user.get("id")).then((u) => user.setProperties(u));
+            if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+              error = e.jqXHR.responseJSON.errors[0];
+            }
+            error = error || I18n.t("admin.user.delete_posts_failed");
+            bootbox.alert(error);
+          });
+      };
+
+      const buttons = [
+        {
+          label: I18n.t("composer.cancel"),
+          class: "d-modal-cancel",
+          link: true,
+        },
+        {
+          icon: iconHTML("exclamation-triangle"),
+          label: I18n.t("admin.user.delete_all_posts"),
+          class: "btn btn-danger",
+          callback: () => {
+            const progressModal = openProgressModal();
+            performDelete(progressModal);
+          },
+        },
+      ];
+
+      const openProgressModal = () => {
+        return showModal("admin-delete-user-posts-progress", {
+          admin: true,
+        });
+      };
+
+      bootbox.dialog(message, buttons, { classes: "delete-all-posts" });
     },
+
     anonymize() {
-      return this.model.anonymize();
+      const user = this.model;
+      const message = I18n.t("admin.user.anonymize_confirm");
+
+      const performAnonymize = () => {
+        this.model
+          .anonymize()
+          .then((data) => {
+            if (data.success) {
+              if (data.username) {
+                document.location = getURL(
+                  `/admin/users/${user.get("id")}/${data.username}`
+                );
+              } else {
+                document.location = getURL("/admin/users/list/active");
+              }
+            } else {
+              bootbox.alert(I18n.t("admin.user.anonymize_failed"));
+              if (data.user) {
+                user.setProperties(data.user);
+              }
+            }
+          })
+          .catch(() => bootbox.alert(I18n.t("admin.user.anonymize_failed")));
+      };
+      const buttons = [
+        {
+          label: I18n.t("composer.cancel"),
+          class: "cancel",
+          link: true,
+        },
+        {
+          label: I18n.t("admin.user.anonymize_yes"),
+          class: "btn btn-danger",
+          icon: iconHTML("exclamation-triangle"),
+          callback: () => {
+            performAnonymize();
+          },
+        },
+      ];
+
+      bootbox.dialog(message, buttons, { classes: "delete-user-modal" });
     },
+
     disableSecondFactor() {
       return this.model.disableSecondFactor();
     },
@@ -210,11 +395,62 @@ export default Controller.extend(CanCheckEmails, {
     destroy() {
       const postCount = this.get("model.post_count");
       const maxPostCount = this.siteSettings.delete_all_posts_max;
-      if (postCount <= maxPostCount) {
-        return this.model.destroy({ deletePosts: true });
-      } else {
-        return this.model.destroy();
-      }
+      const message = I18n.t("admin.user.delete_confirm");
+      const location = document.location.pathname;
+
+      const performDestroy = (block) => {
+        bootbox.dialog(I18n.t("admin.user.deleting_user"));
+        let formData = { context: location };
+        if (block) {
+          formData["block_email"] = true;
+          formData["block_urls"] = true;
+          formData["block_ip"] = true;
+        }
+        if (postCount <= maxPostCount) {
+          formData["delete_posts"] = true;
+        }
+        this.model
+          .destroy(formData)
+          .then((data) => {
+            if (data.deleted) {
+              if (/^\/admin\/users\/list\//.test(location)) {
+                document.location = location;
+              } else {
+                document.location = getURL("/admin/users/list/active");
+              }
+            } else {
+              bootbox.alert(I18n.t("admin.user.delete_failed"));
+            }
+          })
+          .catch(() => {
+            bootbox.alert(I18n.t("admin.user.delete_failed"));
+          });
+      };
+
+      const buttons = [
+        {
+          label: I18n.t("composer.cancel"),
+          class: "btn",
+          link: true,
+        },
+        {
+          icon: iconHTML("exclamation-triangle"),
+          label: I18n.t("admin.user.delete_and_block"),
+          class: "btn btn-danger",
+          callback: () => {
+            performDestroy(true);
+          },
+        },
+        {
+          label: I18n.t("admin.user.delete_dont_block"),
+          class: "btn btn-primary",
+          callback: () => {
+            performDestroy(false);
+          },
+        },
+      ];
+
+      bootbox.dialog(message, buttons, { classes: "delete-user-modal" });
     },
 
     promptTargetUser() {
@@ -235,7 +471,31 @@ export default Controller.extend(CanCheckEmails, {
     },
 
     merge(targetUsername) {
-      return this.model.merge({ targetUsername });
+      const user = this.model;
+      const location = document.location.pathname;
+
+      let formData = { context: location };
+
+      if (targetUsername) {
+        formData["target_username"] = targetUsername;
+      }
+
+      this.model
+        .merge(formData)
+        .then((response) => {
+          if (response.success) {
+            showModal("admin-merge-users-progress", {
+              admin: true,
+              model: this.model,
+            });
+          } else {
+            bootbox.alert(I18n.t("admin.user.merge_failed"));
+          }
+        })
+        .catch(() => {
+          AdminUser.find(user.id).then((u) => user.setProperties(u));
+          bootbox.alert(I18n.t("admin.user.merge_failed"));
+        });
     },
 
     viewActionLogs() {
@@ -331,11 +591,13 @@ export default Controller.extend(CanCheckEmails, {
 
     deleteSSORecord() {
       return bootbox.confirm(
-        I18n.t("admin.user.sso.confirm_delete"),
+        I18n.t("admin.user.discourse_connect.confirm_delete"),
         I18n.t("no_value"),
         I18n.t("yes_value"),
-        () => {
-          return this.model.deleteSSORecord();
+        (confirmed) => {
+          if (confirmed) {
+            return this.model.deleteSSORecord();
+          }
         }
       );
     },
@@ -349,5 +611,15 @@ export default Controller.extend(CanCheckEmails, {
         }
       });
     },
+
+    checkSsoPayload() {
+      return ajax(userPath(`${this.model.username_lower}/sso-payload.json`), {
+        data: { context: window.location.pathname },
+      }).then((result) => {
+        if (result) {
+          this.set("ssoLastPayload", result.payload);
+        }
+      });
+    },
   },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js b/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js
index fd20b6c308..b0b25706e5 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js
@@ -1,11 +1,11 @@
-import I18n from "I18n";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import Controller from "@ember/controller";
-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 Controller from "@ember/controller";
+import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { i18n } from "discourse/lib/computed";
 
 export default Controller.extend(CanCheckEmails, {
   model: null,
@@ -32,9 +32,9 @@ export default Controller.extend(CanCheckEmails, {
   },
 
   @observes("listFilter")
-  _filterUsers: discourseDebounce(function () {
-    this.resetFilters();
-  }, INPUT_DELAY),
+  _filterUsers() {
+    discourseDebounce(this, this.resetFilters, INPUT_DELAY);
+  },
 
   resetFilters() {
     this._page = 1;
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
index 6a9b78bf29..1265e3d028 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
@@ -1,13 +1,13 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { or } from "@ember/object/computed";
-import { schedule } from "@ember/runloop";
 import Controller, { inject as controller } from "@ember/controller";
+import I18n from "I18n";
 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";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
+import { fmt } from "discourse/lib/computed";
+import { or } from "@ember/object/computed";
+import { schedule } from "@ember/runloop";
+import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend({
   adminWatchedWords: controller(),
@@ -18,7 +18,7 @@ export default Controller.extend({
   ),
   downloadLink: fmt(
     "actionNameKey",
-    "/admin/logs/watched_words/action/%@/download"
+    "/admin/customize/watched_words/action/%@/download"
   ),
 
   findAction(actionName) {
@@ -90,12 +90,14 @@ export default Controller.extend({
     clearAll() {
       const actionKey = this.actionNameKey;
       bootbox.confirm(
-        I18n.t(`admin.watched_words.clear_all_confirm_${actionKey}`),
+        I18n.t("admin.watched_words.clear_all_confirm", {
+          action: I18n.t("admin.watched_words.actions." + actionKey),
+        }),
         I18n.t("no_value"),
         I18n.t("yes_value"),
         (result) => {
           if (result) {
-            ajax(`/admin/logs/watched_words/action/${actionKey}.json`, {
+            ajax(`/admin/customize/watched_words/action/${actionKey}.json`, {
               type: "DELETE",
             }).then(() => {
               const action = this.findAction(actionKey);
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js
index 151fc82c33..cfd86c6c22 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js
@@ -1,10 +1,10 @@
-import { isEmpty } from "@ember/utils";
-import { alias } from "@ember/object/computed";
-import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
-import discourseDebounce from "discourse/lib/debounce";
-import { observes } from "discourse-common/utils/decorators";
+import EmberObject from "@ember/object";
 import { INPUT_DELAY } from "discourse-common/config/environment";
+import { alias } from "@ember/object/computed";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { isEmpty } from "@ember/utils";
+import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   filter: null,
@@ -48,10 +48,16 @@ export default Controller.extend({
   },
 
   @observes("filter")
-  filterContent: discourseDebounce(function () {
-    this.filterContentNow();
-    this.set("filtered", !isEmpty(this.filter));
-  }, INPUT_DELAY),
+  filterContent() {
+    discourseDebounce(
+      this,
+      function () {
+        this.filterContentNow();
+        this.set("filtered", !isEmpty(this.filter));
+      },
+      INPUT_DELAY
+    );
+  },
 
   actions: {
     clearFilter() {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
index 49c87926d2..cdb4c9b615 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
@@ -1,7 +1,7 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
+import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js
index f2e9f2178d..26b5fb20d0 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js
@@ -1,13 +1,13 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { isEmpty } from "@ember/utils";
-import { alias } from "@ember/object/computed";
 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";
+import I18n from "I18n";
+import { alias } from "@ember/object/computed";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
+import { extractDomainFromUrl } from "discourse/lib/utilities";
+import { isAbsoluteURL } from "discourse-common/lib/get-url";
+import { isEmpty } from "@ember/utils";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
   adminWebHooks: controller(),
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks.js
index cc13ea9e9d..6e1acf97dc 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
-import { popupAjaxError } from "discourse/lib/ajax-error";
+import I18n from "I18n";
 import bootbox from "bootbox";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
   actions: {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin.js b/app/assets/javascripts/admin/addon/controllers/admin.js
index 4c51eb38b7..03838b789c 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin.js
@@ -1,7 +1,7 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import { dasherize } from "@ember/string";
+import discourseComputed from "discourse-common/utils/decorators";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
   router: service(),
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-add-upload.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-add-upload.js
index 12b2be4f4a..876ac3ae9a 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-add-upload.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-add-upload.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import { and, not } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
+import { and, not } from "@ember/object/computed";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 const THEME_FIELD_VARIABLE_TYPE_IDS = [2, 3, 4];
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-badge-preview.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-badge-preview.js
index 90af87cb73..322436303f 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-badge-preview.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-badge-preview.js
@@ -1,6 +1,6 @@
-import I18n from "I18n";
 import { alias, map } from "@ember/object/computed";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { escapeExpression } from "discourse/lib/utilities";
 
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-delete-user-posts-progress.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-delete-user-posts-progress.js
new file mode 100644
index 0000000000..61b9bae999
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-delete-user-posts-progress.js
@@ -0,0 +1,6 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+
+export default Controller.extend(ModalFunctionality, {
+  deletedPercentage: 0,
+});
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-edit-badge-groupings.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-edit-badge-groupings.js
index cedbf43632..aa7d5665fa 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-edit-badge-groupings.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-edit-badge-groupings.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import Controller from "@ember/controller";
 import { A } from "@ember/array";
-import { ajax } from "discourse/lib/ajax";
+import Controller from "@ember/controller";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { observes } from "discourse-common/utils/decorators";
+import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
+import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend(ModalFunctionality, {
   @observes("model")
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-incoming-email.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-incoming-email.js
index 45df8e4628..6055baa1fe 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-incoming-email.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-incoming-email.js
@@ -1,7 +1,7 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
 import IncomingEmail from "admin/models/incoming-email";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import discourseComputed from "discourse-common/utils/decorators";
 import { longDate } from "discourse/lib/formatter";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js
index 4bdb6ca85c..df91acd094 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js
@@ -1,12 +1,12 @@
-import I18n from "I18n";
-import { equal, match, alias } from "@ember/object/computed";
+import { COMPONENTS, THEMES } from "admin/models/theme";
 import Controller, { inject as controller } from "@ember/controller";
+import { alias, equal, match } from "@ember/object/computed";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { POPULAR_THEMES } from "discourse-common/helpers/popular-themes";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { THEMES, COMPONENTS } from "admin/models/theme";
-import { POPULAR_THEMES } from "discourse-common/helpers/popular-themes";
 import { set } from "@ember/object";
 
 const MIN_NAME_LENGTH = 4;
@@ -18,15 +18,16 @@ export default Controller.extend(ModalFunctionality, {
   local: equal("selection", "local"),
   remote: equal("selection", "remote"),
   create: equal("selection", "create"),
+  directRepoInstall: equal("selection", "directRepoInstall"),
   selection: "popular",
   loading: false,
   keyGenUrl: "/admin/themes/generate_key_pair",
   importUrl: "/admin/themes/import",
   recordType: "theme",
-  checkPrivate: match("uploadUrl", /^git/),
+  checkPrivate: match("uploadUrl", /^ssh\:\/\/.*\@.*\.git$|.*\@.*\:.*\.git$/),
   localFile: null,
   uploadUrl: null,
-  urlPlaceholder: "https://github.com/discourse/sample_theme",
+  uploadName: null,
   advancedVisible: false,
   selectedType: alias("themesController.currentTab"),
   component: equal("selectedType", COMPONENTS),
@@ -43,7 +44,9 @@ export default Controller.extend(ModalFunctionality, {
   @discourseComputed("themesController.installedThemes")
   themes(installedThemes) {
     return POPULAR_THEMES.map((t) => {
-      if (installedThemes.includes(t.name)) {
+      if (
+        installedThemes.some((theme) => this.themeHasSameUrl(theme, t.value))
+      ) {
         set(t, "installed", true);
       }
       return t;
@@ -76,12 +79,15 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
+  @discourseComputed("privateChecked")
+  urlPlaceholder(privateChecked) {
+    return privateChecked
+      ? "git@github.com:discourse/sample_theme.git"
+      : "https://github.com/discourse/sample_theme";
+  },
+
   @observes("privateChecked")
   privateWasChecked() {
-    this.privateChecked
-      ? this.set("urlPlaceholder", "git@github.com:discourse/sample_theme.git")
-      : this.set("urlPlaceholder", "https://github.com/discourse/sample_theme");
-
     const checked = this.privateChecked;
     if (checked && !this._keyLoading) {
       this._keyLoading = true;
@@ -125,6 +131,28 @@ export default Controller.extend(ModalFunctionality, {
     return privateChecked && checkPrivate && publicKey;
   },
 
+  onClose() {
+    this.setProperties({
+      duplicateRemoteThemeWarning: null,
+      privateChecked: false,
+      privateKey: null,
+      localFile: null,
+      uploadUrl: null,
+      publicKey: null,
+      branch: null,
+      selection: "popular",
+    });
+  },
+
+  themeHasSameUrl(theme, url) {
+    const themeUrl = theme.remote_theme && theme.remote_theme.remote_url;
+    return (
+      themeUrl &&
+      url &&
+      url.replace(/\.git$/, "") === themeUrl.replace(/\.git$/, "")
+    );
+  },
+
   actions: {
     uploadLocaleFile() {
       this.set("localFile", $("#file-input")[0].files[0]);
@@ -166,7 +194,18 @@ export default Controller.extend(ModalFunctionality, {
         options.data.append("theme", this.localFile);
       }
 
-      if (this.remote || this.popular) {
+      if (this.remote || this.popular || this.directRepoInstall) {
+        const duplicate = this.themesController.model.content.find((theme) =>
+          this.themeHasSameUrl(theme, this.uploadUrl)
+        );
+        if (duplicate && !this.duplicateRemoteThemeWarning) {
+          const warning = I18n.t(
+            "admin.customize.theme.duplicate_remote_theme",
+            { name: duplicate.name }
+          );
+          this.set("duplicateRemoteThemeWarning", warning);
+          return;
+        }
         options.data = {
           remote: this.uploadUrl,
           branch: this.branch,
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js
index f2233c07a3..7c37ddd017 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
 import Controller, { inject as controller } from "@ember/controller";
+import I18n from "I18n";
 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";
+import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend(ModalFunctionality, {
   adminUserIndex: controller(),
@@ -22,6 +22,13 @@ export default Controller.extend(ModalFunctionality, {
     });
   },
 
+  @discourseComputed("username")
+  mergeButtonText(username) {
+    return I18n.t(`admin.user.merge.confirmation.transfer_and_delete`, {
+      username,
+    });
+  },
+
   @discourseComputed("value", "text")
   mergeDisabled(value, text) {
     return !value || text !== value;
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-progress.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-progress.js
new file mode 100644
index 0000000000..3d9248d36d
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-progress.js
@@ -0,0 +1,31 @@
+import Controller from "@ember/controller";
+import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import messageBus from "message-bus-client";
+
+export default Controller.extend(ModalFunctionality, {
+  message: I18n.t("admin.user.merging_user"),
+
+  onShow() {
+    messageBus.subscribe("/merge_user", (data) => {
+      if (data.merged) {
+        if (/^\/admin\/users\/list\//.test(location)) {
+          DiscourseURL.redirectTo(location);
+        } else {
+          DiscourseURL.redirectTo(
+            `/admin/users/${data.user.id}/${data.user.username}`
+          );
+        }
+      } else if (data.message) {
+        this.set("message", data.message);
+      } else if (data.failed) {
+        this.set("message", I18n.t("admin.user.merge_failed"));
+      }
+    });
+  },
+
+  onClose() {
+    this.messageBus.unsubscribe("/merge_user");
+  },
+});
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js
index baaf7cef7a..46e23305f2 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js
@@ -1,8 +1,9 @@
 import Controller, { inject as controller } from "@ember/controller";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import discourseComputed from "discourse-common/utils/decorators";
+import { action, get } from "@ember/object";
 import { alias } from "@ember/object/computed";
-import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend(ModalFunctionality, {
   adminUserIndex: controller(),
@@ -17,6 +18,13 @@ export default Controller.extend(ModalFunctionality, {
     return !targetUsername || username === targetUsername;
   },
 
+  @discourseComputed("username")
+  mergeButtonText(username) {
+    return I18n.t(`admin.user.merge.confirmation.transfer_and_delete`, {
+      username,
+    });
+  },
+
   @action
   showConfirmation() {
     this.send("closeModal");
@@ -27,4 +35,9 @@ export default Controller.extend(ModalFunctionality, {
   close() {
     this.send("closeModal");
   },
+
+  @action
+  updateUsername(selected) {
+    this.set("targetUsername", get(selected, "firstObject"));
+  },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-reseed.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-reseed.js
index b29a800aa0..672f6d8db3 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-reseed.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-reseed.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-silence-user.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-silence-user.js
index e379b903c2..b76565f815 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-silence-user.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-silence-user.js
@@ -1,7 +1,7 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import PenaltyController from "admin/mixins/penalty-controller";
+import discourseComputed from "discourse-common/utils/decorators";
+import { isEmpty } from "@ember/utils";
 
 export default Controller.extend(PenaltyController, {
   silenceUntil: null,
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-suspend-user.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-suspend-user.js
index 4997f62947..2712b57cf2 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-suspend-user.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-suspend-user.js
@@ -1,7 +1,7 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import PenaltyController from "admin/mixins/penalty-controller";
+import discourseComputed from "discourse-common/utils/decorators";
+import { isEmpty } from "@ember/utils";
 
 export default Controller.extend(PenaltyController, {
   suspendUntil: null,
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
index 0aeffaad59..7ab4cb6984 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
@@ -1,5 +1,5 @@
+import { observes, on } from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
-import { on, observes } from "discourse-common/utils/decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-watched-word-test.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-watched-word-test.js
index b088cccb75..215cc08a6d 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-watched-word-test.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-watched-word-test.js
@@ -1,6 +1,6 @@
 import Controller from "@ember/controller";
-import discourseComputed from "discourse-common/utils/decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend(ModalFunctionality, {
   @discourseComputed("value", "model.compiledRegularExpression")
diff --git a/app/assets/javascripts/admin/addon/helpers/check-icon.js b/app/assets/javascripts/admin/addon/helpers/check-icon.js
index 51fb238550..14ae3e649c 100644
--- a/app/assets/javascripts/admin/addon/helpers/check-icon.js
+++ b/app/assets/javascripts/admin/addon/helpers/check-icon.js
@@ -1,6 +1,6 @@
+import { htmlSafe } from "@ember/template";
 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";
diff --git a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js
index 03960ff289..5dbd069cf3 100644
--- a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js
+++ b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js
@@ -1,5 +1,5 @@
-import { iconHTML } from "discourse-common/lib/icon-library";
 import Helper from "@ember/component/helper";
+import { iconHTML } from "discourse-common/lib/icon-library";
 
 export default Helper.extend({
   compute([disposition]) {
diff --git a/app/assets/javascripts/admin/addon/helpers/post-action-title.js b/app/assets/javascripts/admin/addon/helpers/post-action-title.js
index 2d8e3c3fe8..9a1d213d93 100644
--- a/app/assets/javascripts/admin/addon/helpers/post-action-title.js
+++ b/app/assets/javascripts/admin/addon/helpers/post-action-title.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Helper from "@ember/component/helper";
+import I18n from "I18n";
 
 function postActionTitle([id, nameKey]) {
   let title = I18n.t(`admin.flags.short_names.${nameKey}`, {
diff --git a/app/assets/javascripts/admin/addon/helpers/preserve-newlines.js b/app/assets/javascripts/admin/addon/helpers/preserve-newlines.js
index 16639f30cc..3d7f2e019e 100644
--- a/app/assets/javascripts/admin/addon/helpers/preserve-newlines.js
+++ b/app/assets/javascripts/admin/addon/helpers/preserve-newlines.js
@@ -1,5 +1,5 @@
-import { htmlHelper } from "discourse-common/lib/helpers";
 import { escapeExpression } from "discourse/lib/utilities";
+import { htmlHelper } from "discourse-common/lib/helpers";
 
 export default htmlHelper((str) =>
   escapeExpression(str).replace(/\n/g, "<br>")
diff --git a/app/assets/javascripts/admin/addon/helpers/value-at-tl.js b/app/assets/javascripts/admin/addon/helpers/value-at-tl.js
index 9e6b8c7514..158b02b546 100644
--- a/app/assets/javascripts/admin/addon/helpers/value-at-tl.js
+++ b/app/assets/javascripts/admin/addon/helpers/value-at-tl.js
@@ -1,9 +1,9 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 
 registerUnbound("value-at-tl", function (data, params) {
-  var tl = parseInt(params.level, 10);
+  let tl = parseInt(params.level, 10);
   if (data) {
-    var item = data.find(function (d) {
+    let item = data.find(function (d) {
       return parseInt(d.x, 10) === tl;
     });
     if (item) {
diff --git a/app/assets/javascripts/admin/addon/mixins/penalty-controller.js b/app/assets/javascripts/admin/addon/mixins/penalty-controller.js
index 250d60664f..55514dfe48 100644
--- a/app/assets/javascripts/admin/addon/mixins/penalty-controller.js
+++ b/app/assets/javascripts/admin/addon/mixins/penalty-controller.js
@@ -1,10 +1,10 @@
 import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { extractError } from "discourse/lib/ajax-error";
 import Mixin from "@ember/object/mixin";
-import { next } from "@ember/runloop";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { Promise } from "rsvp";
 import bootbox from "bootbox";
+import { extractError } from "discourse/lib/ajax-error";
+import { next } from "@ember/runloop";
 
 export default Mixin.create(ModalFunctionality, {
   errorMessage: null,
diff --git a/app/assets/javascripts/admin/addon/mixins/period-computation.js b/app/assets/javascripts/admin/addon/mixins/period-computation.js
index 7b8afe796a..b46503e73c 100644
--- a/app/assets/javascripts/admin/addon/mixins/period-computation.js
+++ b/app/assets/javascripts/admin/addon/mixins/period-computation.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import DiscourseURL from "discourse/lib/url";
 import Mixin from "@ember/object/mixin";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Mixin.create({
   queryParams: ["period"],
diff --git a/app/assets/javascripts/admin/addon/mixins/setting-component.js b/app/assets/javascripts/admin/addon/mixins/setting-component.js
index c7d42df43a..fc6c6c24d5 100644
--- a/app/assets/javascripts/admin/addon/mixins/setting-component.js
+++ b/app/assets/javascripts/admin/addon/mixins/setting-component.js
@@ -1,14 +1,14 @@
-import I18n from "I18n";
-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";
-import { on } from "@ember/object/evented";
+import I18n from "I18n";
 import Mixin from "@ember/object/mixin";
-import showModal from "discourse/lib/show-modal";
 import { Promise } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
+import { categoryLinkHTML } from "discourse/helpers/category-link";
+import discourseComputed from "discourse-common/utils/decorators";
 import { htmlSafe } from "@ember/template";
+import { on } from "@ember/object/evented";
+import showModal from "discourse/lib/show-modal";
+import { warn } from "@ember/debug";
 
 const CUSTOM_TYPES = [
   "bool",
@@ -27,6 +27,7 @@ const CUSTOM_TYPES = [
   "tag_list",
   "color",
   "simple_list",
+  "emoji_list",
 ];
 
 const AUTO_REFRESH_ON_SAVE = ["logo", "logo_small", "large_icon"];
diff --git a/app/assets/javascripts/admin/addon/mixins/setting-object.js b/app/assets/javascripts/admin/addon/mixins/setting-object.js
index 5a40360b08..29dbb0d967 100644
--- a/app/assets/javascripts/admin/addon/mixins/setting-object.js
+++ b/app/assets/javascripts/admin/addon/mixins/setting-object.js
@@ -1,7 +1,7 @@
 import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { computed } from "@ember/object";
 import Mixin from "@ember/object/mixin";
+import { computed } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 import { isPresent } from "@ember/utils";
 
 export default Mixin.create({
diff --git a/app/assets/javascripts/admin/addon/models/admin-dashboard.js b/app/assets/javascripts/admin/addon/models/admin-dashboard.js
index dec30faf2d..c0c9f86702 100644
--- a/app/assets/javascripts/admin/addon/models/admin-dashboard.js
+++ b/app/assets/javascripts/admin/addon/models/admin-dashboard.js
@@ -1,5 +1,5 @@
-import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
 
 const GENERAL_ATTRIBUTES = [
   "updated_at",
@@ -14,6 +14,7 @@ AdminDashboard.reopenClass({
     return ajax("/admin/dashboard.json").then((json) => {
       const model = AdminDashboard.create();
       model.set("version_check", json.version_check);
+
       return model;
     });
   },
diff --git a/app/assets/javascripts/admin/addon/models/admin-user.js b/app/assets/javascripts/admin/addon/models/admin-user.js
index 0bc1132623..cbcdcc2e24 100644
--- a/app/assets/javascripts/admin/addon/models/admin-user.js
+++ b/app/assets/javascripts/admin/addon/models/admin-user.js
@@ -1,16 +1,14 @@
-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";
-import { iconHTML } from "discourse-common/lib/icon-library";
-import { ajax } from "discourse/lib/ajax";
-import { propertyNotEqual } from "discourse/lib/computed";
-import { popupAjaxError } from "discourse/lib/ajax-error";
+import { filter, gt, lt, not, or } from "@ember/object/computed";
 import Group from "discourse/models/group";
-import DiscourseURL, { userPath } from "discourse/lib/url";
+import I18n from "I18n";
 import { Promise } from "rsvp";
 import User from "discourse/models/user";
-import bootbox from "bootbox";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { propertyNotEqual } from "discourse/lib/computed";
+import { userPath } from "discourse/lib/url";
 
 const wrapAdmin = (user) => (user ? AdminUser.create(user) : null);
 
@@ -80,74 +78,9 @@ const AdminUser = User.extend({
   },
 
   deleteAllPosts() {
-    let deletedPosts = 0;
-    const user = this;
-    const message = I18n.messageFormat(
-      "admin.user.delete_all_posts_confirm_MF",
-      {
-        POSTS: user.get("post_count"),
-        TOPICS: user.get("topic_count"),
-      }
-    );
-    const buttons = [
-      {
-        label: I18n.t("composer.cancel"),
-        class: "d-modal-cancel",
-        link: true,
-      },
-      {
-        label:
-          `${iconHTML("exclamation-triangle")} ` +
-          I18n.t("admin.user.delete_all_posts"),
-        class: "btn btn-danger",
-        callback: () => {
-          openProgressModal();
-          performDelete();
-        },
-      },
-    ];
-    const openProgressModal = () => {
-      bootbox.dialog(
-        `<p>${I18n.t(
-          "admin.user.delete_posts_progress"
-        )}</p><div class='progress-bar'><span></span></div>`,
-        [],
-        { classes: "delete-posts-progress" }
-      );
-    };
-    const performDelete = () => {
-      let deletedPercentage = 0;
-      return ajax(`/admin/users/${user.get("id")}/delete_posts_batch`, {
-        type: "PUT",
-      })
-        .then(({ posts_deleted }) => {
-          if (posts_deleted === 0) {
-            user.set("post_count", 0);
-            bootbox.hideAll();
-          } else {
-            deletedPosts += posts_deleted;
-            deletedPercentage = Math.floor(
-              (deletedPosts * 100) / user.get("post_count")
-            );
-            $(".delete-posts-progress .progress-bar > span").css({
-              width: `${deletedPercentage}%`,
-            });
-            performDelete();
-          }
-        })
-        .catch((e) => {
-          bootbox.hideAll();
-          let error;
-          AdminUser.find(user.get("id")).then((u) => user.setProperties(u));
-          if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
-            error = e.jqXHR.responseJSON.errors[0];
-          }
-          error = error || I18n.t("admin.user.delete_posts_failed");
-          bootbox.alert(error);
-        });
-    };
-
-    bootbox.dialog(message, buttons, { classes: "delete-all-posts" });
+    return ajax(`/admin/users/${this.get("id")}/delete_posts_batch`, {
+      type: "PUT",
+    });
   },
 
   revokeAdmin() {
@@ -165,11 +98,7 @@ const AdminUser = User.extend({
   grantAdmin() {
     return ajax(`/admin/users/${this.id}/grant_admin`, {
       type: "PUT",
-    })
-      .then(() => {
-        bootbox.alert(I18n.t("admin.user.grant_admin_confirm"));
-      })
-      .catch(popupAjaxError);
+    });
   },
 
   revokeModeration() {
@@ -232,20 +161,7 @@ const AdminUser = User.extend({
     return ajax(`/admin/users/${this.id}/trust_level`, {
       type: "PUT",
       data: { level: this.trust_level },
-    })
-      .then(() => window.location.reload())
-      .catch((e) => {
-        let error;
-        if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
-          error = e.jqXHR.responseJSON.errors[0];
-        }
-        error =
-          error ||
-          I18n.t("admin.user.trust_level_change_failed", {
-            error: this._formatError(e),
-          });
-        bootbox.alert(error);
-      });
+    });
   },
 
   restoreTrustLevel() {
@@ -256,20 +172,7 @@ const AdminUser = User.extend({
     return ajax(`/admin/users/${this.id}/trust_level_lock`, {
       type: "PUT",
       data: { locked: !!locked },
-    })
-      .then(() => window.location.reload())
-      .catch((e) => {
-        let error;
-        if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
-          error = e.jqXHR.responseJSON.errors[0];
-        }
-        error =
-          error ||
-          I18n.t("admin.user.trust_level_change_failed", {
-            error: this._formatError(e),
-          });
-        bootbox.alert(error);
-      });
+    });
   },
 
   canLockTrustLevel: lt("trust_level", 4),
@@ -300,49 +203,27 @@ const AdminUser = User.extend({
     return ajax("/admin/users/" + this.id + "/log_out", {
       type: "POST",
       data: { username_or_email: this.username },
-    }).then(() => bootbox.alert(I18n.t("admin.user.logged_out")));
+    });
   },
 
   impersonate() {
     return ajax("/admin/impersonate", {
       type: "POST",
       data: { username_or_email: this.username },
-    })
-      .then(() => (document.location = getURL("/")))
-      .catch((e) => {
-        if (e.status === 404) {
-          bootbox.alert(I18n.t("admin.impersonate.not_found"));
-        } else {
-          bootbox.alert(I18n.t("admin.impersonate.invalid"));
-        }
-      });
+    });
   },
 
   activate() {
     return ajax(`/admin/users/${this.id}/activate`, {
       type: "PUT",
-    })
-      .then(() => window.location.reload())
-      .catch((e) => {
-        const error = I18n.t("admin.user.activate_failed", {
-          error: this._formatError(e),
-        });
-        bootbox.alert(error);
-      });
+    });
   },
 
   deactivate() {
     return ajax(`/admin/users/${this.id}/deactivate`, {
       type: "PUT",
       data: { context: document.location.pathname },
-    })
-      .then(() => window.location.reload())
-      .catch((e) => {
-        const error = I18n.t("admin.user.deactivate_failed", {
-          error: this._formatError(e),
-        });
-        bootbox.alert(error);
-      });
+    });
   },
 
   unsilence() {
@@ -370,162 +251,39 @@ const AdminUser = User.extend({
     return ajax(userPath("action/send_activation_email"), {
       type: "POST",
       data: { username: this.username },
-    })
-      .then(() => bootbox.alert(I18n.t("admin.user.activation_email_sent")))
-      .catch(popupAjaxError);
+    });
   },
 
   anonymize() {
-    const user = this;
-    const message = I18n.t("admin.user.anonymize_confirm");
-
-    const performAnonymize = function () {
-      return ajax(`/admin/users/${user.get("id")}/anonymize.json`, {
-        type: "PUT",
-      })
-        .then(function (data) {
-          if (data.success) {
-            if (data.username) {
-              document.location = getURL(
-                `/admin/users/${user.get("id")}/${data.username}`
-              );
-            } else {
-              document.location = getURL("/admin/users/list/active");
-            }
-          } else {
-            bootbox.alert(I18n.t("admin.user.anonymize_failed"));
-            if (data.user) {
-              user.setProperties(data.user);
-            }
-          }
-        })
-        .catch(() => bootbox.alert(I18n.t("admin.user.anonymize_failed")));
-    };
-
-    const buttons = [
-      {
-        label: I18n.t("composer.cancel"),
-        class: "cancel",
-        link: true,
-      },
-      {
-        label:
-          `${iconHTML("exclamation-triangle")} ` +
-          I18n.t("admin.user.anonymize_yes"),
-        class: "btn btn-danger",
-        callback: function () {
-          performAnonymize();
-        },
-      },
-    ];
-
-    bootbox.dialog(message, buttons, { classes: "delete-user-modal" });
+    return ajax(`/admin/users/${this.id}/anonymize.json`, {
+      type: "PUT",
+    });
   },
 
-  destroy(opts) {
-    const user = this;
-    const message = I18n.t("admin.user.delete_confirm");
-    const location = document.location.pathname;
-
-    const performDestroy = function (block) {
-      bootbox.dialog(I18n.t("admin.user.deleting_user"));
-      let formData = { context: location };
-      if (block) {
-        formData["block_email"] = true;
-        formData["block_urls"] = true;
-        formData["block_ip"] = true;
-      }
-      if (opts && opts.deletePosts) {
-        formData["delete_posts"] = true;
-      }
-      return ajax(`/admin/users/${user.get("id")}.json`, {
-        type: "DELETE",
-        data: formData,
-      })
-        .then(function (data) {
-          if (data.deleted) {
-            if (/^\/admin\/users\/list\//.test(location)) {
-              document.location = location;
-            } else {
-              document.location = getURL("/admin/users/list/active");
-            }
-          } else {
-            bootbox.alert(I18n.t("admin.user.delete_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.delete_failed"));
-        });
-    };
-
-    const buttons = [
-      {
-        label: I18n.t("composer.cancel"),
-        class: "btn",
-        link: true,
-      },
-      {
-        label:
-          `${iconHTML("exclamation-triangle")} ` +
-          I18n.t("admin.user.delete_and_block"),
-        class: "btn btn-danger",
-        callback: function () {
-          performDestroy(true);
-        },
-      },
-      {
-        label: I18n.t("admin.user.delete_dont_block"),
-        class: "btn btn-primary",
-        callback: function () {
-          performDestroy(false);
-        },
-      },
-    ];
-
-    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.id}/merge.json`, {
-      type: "POST",
+  destroy(formData) {
+    return ajax(`/admin/users/${this.id}.json`, {
+      type: "DELETE",
       data: formData,
     })
       .then((data) => {
-        if (data.merged) {
-          if (/^\/admin\/users\/list\//.test(location)) {
-            DiscourseURL.redirectTo(location);
-          } else {
-            DiscourseURL.redirectTo(
-              `/admin/users/${data.user.id}/${data.user.username}`
-            );
-          }
-        } else {
-          bootbox.alert(I18n.t("admin.user.merge_failed"));
-          if (data.user) {
-            user.setProperties(data.user);
-          }
+        if (!data.deleted && data.user) {
+          this.setProperties(data.user);
         }
+
+        return data;
       })
       .catch(() => {
-        AdminUser.find(user.id).then((u) => user.setProperties(u));
-        bootbox.alert(I18n.t("admin.user.merge_failed"));
+        this.find(this.id).then((u) => this.setProperties(u));
       });
   },
 
+  merge(formData) {
+    return ajax(`/admin/users/${this.id}/merge.json`, {
+      type: "POST",
+      data: formData,
+    });
+  },
+
   loadDetails() {
     if (this.loadedDetails) {
       return Promise.resolve(this);
@@ -553,10 +311,6 @@ const AdminUser = User.extend({
   @discourseComputed("approved_by")
   approvedBy: wrapAdmin,
 
-  _formatError(event) {
-    return `http: ${event.status} - ${event.body}`;
-  },
-
   deleteSSORecord() {
     return ajax(`/admin/users/${this.id}/sso_record.json`, {
       type: "DELETE",
diff --git a/app/assets/javascripts/admin/addon/models/api-key.js b/app/assets/javascripts/admin/addon/models/api-key.js
index adf186d454..be5475a4ab 100644
--- a/app/assets/javascripts/admin/addon/models/api-key.js
+++ b/app/assets/javascripts/admin/addon/models/api-key.js
@@ -1,8 +1,8 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import AdminUser from "admin/models/admin-user";
 import RestModel from "discourse/models/rest";
 import { ajax } from "discourse/lib/ajax";
 import { computed } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 
 const ApiKey = RestModel.extend({
diff --git a/app/assets/javascripts/admin/addon/models/backup-status.js b/app/assets/javascripts/admin/addon/models/backup-status.js
index 474c3c1688..dffad0d060 100644
--- a/app/assets/javascripts/admin/addon/models/backup-status.js
+++ b/app/assets/javascripts/admin/addon/models/backup-status.js
@@ -1,6 +1,6 @@
+import EmberObject from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 import { not } from "@ember/object/computed";
-import EmberObject from "@ember/object";
 
 export default EmberObject.extend({
   restoreDisabled: not("restoreEnabled"),
diff --git a/app/assets/javascripts/admin/addon/models/backup.js b/app/assets/javascripts/admin/addon/models/backup.js
index 4112b06f2b..717192e8ac 100644
--- a/app/assets/javascripts/admin/addon/models/backup.js
+++ b/app/assets/javascripts/admin/addon/models/backup.js
@@ -1,10 +1,6 @@
-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";
 import EmberObject from "@ember/object";
 import MessageBus from "message-bus-client";
-import bootbox from "bootbox";
+import { ajax } from "discourse/lib/ajax";
 
 const Backup = EmberObject.extend({
   destroy() {
@@ -21,16 +17,7 @@ const Backup = EmberObject.extend({
 
 Backup.reopenClass({
   find() {
-    return ajax("/admin/backups.json")
-      .then((backups) => backups.map((backup) => Backup.create(backup)))
-      .catch((error) => {
-        bootbox.alert(
-          I18n.t("admin.backups.backup_storage_error", {
-            error_message: extractError(error),
-          })
-        );
-        return [];
-      });
+    return ajax("/admin/backups.json");
   },
 
   start(withUploads) {
@@ -43,33 +30,18 @@ Backup.reopenClass({
         with_uploads: withUploads,
         client_id: MessageBus.clientId,
       },
-    }).then((result) => {
-      if (!result.success) {
-        bootbox.alert(result.message);
-      }
     });
   },
 
   cancel() {
     return ajax("/admin/backups/cancel.json", {
       type: "DELETE",
-    }).then((result) => {
-      if (!result.success) {
-        bootbox.alert(result.message);
-      }
     });
   },
 
   rollback() {
     return ajax("/admin/backups/rollback.json", {
       type: "POST",
-    }).then((result) => {
-      if (!result.success) {
-        bootbox.alert(result.message);
-      } else {
-        // redirect to homepage (session might be lost)
-        window.location = getURL("/");
-      }
     });
   },
 });
diff --git a/app/assets/javascripts/admin/addon/models/color-scheme-color.js b/app/assets/javascripts/admin/addon/models/color-scheme-color.js
index f5427d542c..49cb552a92 100644
--- a/app/assets/javascripts/admin/addon/models/color-scheme-color.js
+++ b/app/assets/javascripts/admin/addon/models/color-scheme-color.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
 import discourseComputed, {
   observes,
   on,
 } from "discourse-common/utils/decorators";
-import { propertyNotEqual } from "discourse/lib/computed";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
+import { propertyNotEqual } from "discourse/lib/computed";
 
 const ColorSchemeColor = EmberObject.extend({
   @on("init")
diff --git a/app/assets/javascripts/admin/addon/models/color-scheme.js b/app/assets/javascripts/admin/addon/models/color-scheme.js
index 4bce289ba7..e1b73ad14e 100644
--- a/app/assets/javascripts/admin/addon/models/color-scheme.js
+++ b/app/assets/javascripts/admin/addon/models/color-scheme.js
@@ -1,11 +1,11 @@
-import I18n from "I18n";
 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";
 import ColorSchemeColor from "admin/models/color-scheme-color";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+import { not } from "@ember/object/computed";
 
 const ColorScheme = EmberObject.extend({
   init() {
diff --git a/app/assets/javascripts/admin/addon/models/email-log.js b/app/assets/javascripts/admin/addon/models/email-log.js
index 18406ceb7a..6565611974 100644
--- a/app/assets/javascripts/admin/addon/models/email-log.js
+++ b/app/assets/javascripts/admin/addon/models/email-log.js
@@ -1,7 +1,7 @@
-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";
+import { ajax } from "discourse/lib/ajax";
+import getURL from "discourse-common/lib/get-url";
 
 const EmailLog = EmberObject.extend({});
 
diff --git a/app/assets/javascripts/admin/addon/models/email-preview.js b/app/assets/javascripts/admin/addon/models/email-preview.js
index 893fb5b4fb..96ffe2f949 100644
--- a/app/assets/javascripts/admin/addon/models/email-preview.js
+++ b/app/assets/javascripts/admin/addon/models/email-preview.js
@@ -1,5 +1,5 @@
-import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
 
 const EmailPreview = EmberObject.extend({});
 
diff --git a/app/assets/javascripts/admin/addon/models/email-settings.js b/app/assets/javascripts/admin/addon/models/email-settings.js
index 52ac14acec..f959df408f 100644
--- a/app/assets/javascripts/admin/addon/models/email-settings.js
+++ b/app/assets/javascripts/admin/addon/models/email-settings.js
@@ -1,5 +1,5 @@
-import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
 
 const EmailSettings = EmberObject.extend({});
 
diff --git a/app/assets/javascripts/admin/addon/models/email-template.js b/app/assets/javascripts/admin/addon/models/email-template.js
index b58da0457f..4be7d9fff9 100644
--- a/app/assets/javascripts/admin/addon/models/email-template.js
+++ b/app/assets/javascripts/admin/addon/models/email-template.js
@@ -1,5 +1,5 @@
-import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
+import { ajax } from "discourse/lib/ajax";
 const { getProperties } = Ember;
 
 export default RestModel.extend({
diff --git a/app/assets/javascripts/admin/addon/models/flag-type.js b/app/assets/javascripts/admin/addon/models/flag-type.js
index 607cb755d8..5859584ce7 100644
--- a/app/assets/javascripts/admin/addon/models/flag-type.js
+++ b/app/assets/javascripts/admin/addon/models/flag-type.js
@@ -1,6 +1,6 @@
 import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import RestModel from "discourse/models/rest";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default RestModel.extend({
   @discourseComputed("id")
diff --git a/app/assets/javascripts/admin/addon/models/incoming-email.js b/app/assets/javascripts/admin/addon/models/incoming-email.js
index 42eb995f85..8489ae8dd3 100644
--- a/app/assets/javascripts/admin/addon/models/incoming-email.js
+++ b/app/assets/javascripts/admin/addon/models/incoming-email.js
@@ -1,6 +1,6 @@
-import { ajax } from "discourse/lib/ajax";
 import AdminUser from "admin/models/admin-user";
 import EmberObject from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
 
 const IncomingEmail = EmberObject.extend({});
 
diff --git a/app/assets/javascripts/admin/addon/models/permalink.js b/app/assets/javascripts/admin/addon/models/permalink.js
index de61b27fd4..a2e8445b08 100644
--- a/app/assets/javascripts/admin/addon/models/permalink.js
+++ b/app/assets/javascripts/admin/addon/models/permalink.js
@@ -1,8 +1,8 @@
+import Category from "discourse/models/category";
+import DiscourseURL from "discourse/lib/url";
+import EmberObject from "@ember/object";
 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({
   save: function () {
diff --git a/app/assets/javascripts/admin/addon/models/report.js b/app/assets/javascripts/admin/addon/models/report.js
index a7b3d5786d..84e6304c75 100644
--- a/app/assets/javascripts/admin/addon/models/report.js
+++ b/app/assets/javascripts/admin/addon/models/report.js
@@ -1,19 +1,19 @@
-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";
-import { isEmpty } from "@ember/utils";
-import EmberObject from "@ember/object";
-import { ajax } from "discourse/lib/ajax";
-import round from "discourse/lib/round";
+import { durationTiny, number } from "discourse/lib/formatter";
 import {
+  escapeExpression,
   fillMissingDates,
   formatUsername,
   toNumber,
-  escapeExpression,
 } from "discourse/lib/utilities";
-import { number, durationTiny } from "discourse/lib/formatter";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
+import { isEmpty } from "@ember/utils";
+import { makeArray } from "discourse-common/lib/helpers";
 import { renderAvatar } from "discourse/helpers/user-avatar";
+import round from "discourse/lib/round";
 
 // Change this line each time report format change
 // and you want to ensure cache is reset
@@ -278,6 +278,7 @@ const Report = EmberObject.extend({
 
       return {
         title: label.title,
+        htmlTitle: label.html_title,
         sortProperty: label.sort_property || mainProperty,
         mainProperty,
         type,
diff --git a/app/assets/javascripts/admin/addon/models/screened-email.js b/app/assets/javascripts/admin/addon/models/screened-email.js
index 4e902488d1..857cca0d63 100644
--- a/app/assets/javascripts/admin/addon/models/screened-email.js
+++ b/app/assets/javascripts/admin/addon/models/screened-email.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
 
 const ScreenedEmail = EmberObject.extend({
   @discourseComputed("action")
diff --git a/app/assets/javascripts/admin/addon/models/screened-ip-address.js b/app/assets/javascripts/admin/addon/models/screened-ip-address.js
index 33e2b44317..a7d29aab31 100644
--- a/app/assets/javascripts/admin/addon/models/screened-ip-address.js
+++ b/app/assets/javascripts/admin/addon/models/screened-ip-address.js
@@ -1,8 +1,8 @@
+import EmberObject from "@ember/object";
 import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
-import { ajax } from "discourse/lib/ajax";
-import EmberObject from "@ember/object";
 
 const ScreenedIpAddress = EmberObject.extend({
   @discourseComputed("action_name")
diff --git a/app/assets/javascripts/admin/addon/models/screened-url.js b/app/assets/javascripts/admin/addon/models/screened-url.js
index a7bc7cfa6f..f3769c7d2f 100644
--- a/app/assets/javascripts/admin/addon/models/screened-url.js
+++ b/app/assets/javascripts/admin/addon/models/screened-url.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
 
 const ScreenedUrl = EmberObject.extend({
   @discourseComputed("action")
diff --git a/app/assets/javascripts/admin/addon/models/site-setting.js b/app/assets/javascripts/admin/addon/models/site-setting.js
index 350281e616..49ed58366e 100644
--- a/app/assets/javascripts/admin/addon/models/site-setting.js
+++ b/app/assets/javascripts/admin/addon/models/site-setting.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import { ajax } from "discourse/lib/ajax";
-import Setting from "admin/mixins/setting-object";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
+import Setting from "admin/mixins/setting-object";
+import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 
 const SiteSetting = EmberObject.extend(Setting, {
diff --git a/app/assets/javascripts/admin/addon/models/site-text.js b/app/assets/javascripts/admin/addon/models/site-text.js
index 7dcd614402..c25a5b30a0 100644
--- a/app/assets/javascripts/admin/addon/models/site-text.js
+++ b/app/assets/javascripts/admin/addon/models/site-text.js
@@ -1,10 +1,10 @@
-import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
-const { getProperties } = Ember;
+import { ajax } from "discourse/lib/ajax";
+import { getProperties } from "@ember/object";
 
 export default RestModel.extend({
-  revert() {
-    return ajax(`/admin/customize/site_texts/${this.id}`, {
+  revert(locale) {
+    return ajax(`/admin/customize/site_texts/${this.id}?locale=${locale}`, {
       type: "DELETE",
     }).then((result) => getProperties(result.site_text, "value", "can_revert"));
   },
diff --git a/app/assets/javascripts/admin/addon/models/staff-action-log.js b/app/assets/javascripts/admin/addon/models/staff-action-log.js
index 09d84b6791..70d86c41e7 100644
--- a/app/assets/javascripts/admin/addon/models/staff-action-log.js
+++ b/app/assets/javascripts/admin/addon/models/staff-action-log.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { ajax } from "discourse/lib/ajax";
 import AdminUser from "admin/models/admin-user";
-import { escapeExpression } from "discourse/lib/utilities";
+import I18n from "I18n";
 import RestModel from "discourse/models/rest";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+import { escapeExpression } from "discourse/lib/utilities";
 
 function format(label, value, escape = true) {
   return value
diff --git a/app/assets/javascripts/admin/addon/models/theme-settings.js b/app/assets/javascripts/admin/addon/models/theme-settings.js
index a823592ad2..d91c3e583e 100644
--- a/app/assets/javascripts/admin/addon/models/theme-settings.js
+++ b/app/assets/javascripts/admin/addon/models/theme-settings.js
@@ -1,4 +1,4 @@
-import Setting from "admin/mixins/setting-object";
 import EmberObject from "@ember/object";
+import Setting from "admin/mixins/setting-object";
 
 export default EmberObject.extend(Setting, {});
diff --git a/app/assets/javascripts/admin/addon/models/theme.js b/app/assets/javascripts/admin/addon/models/theme.js
index 10c78c5b82..d41ecb7f5f 100644
--- a/app/assets/javascripts/admin/addon/models/theme.js
+++ b/app/assets/javascripts/admin/addon/models/theme.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
-import { get } from "@ember/object";
+import { gt, or } from "@ember/object/computed";
 import { isBlank, isEmpty } from "@ember/utils";
-import { or, gt } from "@ember/object/computed";
+import I18n from "I18n";
 import RestModel from "discourse/models/rest";
 import discourseComputed from "discourse-common/utils/decorators";
+import { get } from "@ember/object";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 const THEME_UPLOAD_VAR = 2;
@@ -253,6 +253,11 @@ const Theme = RestModel.extend({
     }
   },
 
+  @discourseComputed("recentlyInstalled", "component", "hasParents")
+  warnUnassignedComponent(recent, component, hasParents) {
+    return recent && component && !hasParents;
+  },
+
   removeChildTheme(theme) {
     const childThemes = this.childThemes;
     childThemes.removeObject(theme);
diff --git a/app/assets/javascripts/admin/addon/models/tl3-requirements.js b/app/assets/javascripts/admin/addon/models/tl3-requirements.js
index a6b31363b9..920d6e5f66 100644
--- a/app/assets/javascripts/admin/addon/models/tl3-requirements.js
+++ b/app/assets/javascripts/admin/addon/models/tl3-requirements.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default EmberObject.extend({
   @discourseComputed("days_visited", "time_period")
diff --git a/app/assets/javascripts/admin/addon/models/version-check.js b/app/assets/javascripts/admin/addon/models/version-check.js
index 53882d6eca..4f939064af 100644
--- a/app/assets/javascripts/admin/addon/models/version-check.js
+++ b/app/assets/javascripts/admin/addon/models/version-check.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
 
 const VersionCheck = EmberObject.extend({
   @discourseComputed("updated_at")
diff --git a/app/assets/javascripts/admin/addon/models/watched-word.js b/app/assets/javascripts/admin/addon/models/watched-word.js
index 938b25f7bc..9aebef18eb 100644
--- a/app/assets/javascripts/admin/addon/models/watched-word.js
+++ b/app/assets/javascripts/admin/addon/models/watched-word.js
@@ -1,21 +1,27 @@
+import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import EmberObject from "@ember/object";
 
 const WatchedWord = EmberObject.extend({
   save() {
     return ajax(
-      "/admin/logs/watched_words" + (this.id ? "/" + this.id : "") + ".json",
+      "/admin/customize/watched_words" +
+        (this.id ? "/" + this.id : "") +
+        ".json",
       {
         type: this.id ? "PUT" : "POST",
-        data: { word: this.word, action_key: this.action },
+        data: {
+          word: this.word,
+          replacement: this.replacement,
+          action_key: this.action,
+        },
         dataType: "json",
       }
     );
   },
 
   destroy() {
-    return ajax("/admin/logs/watched_words/" + this.id + ".json", {
+    return ajax("/admin/customize/watched_words/" + this.id + ".json", {
       type: "DELETE",
     });
   },
@@ -23,7 +29,7 @@ const WatchedWord = EmberObject.extend({
 
 WatchedWord.reopenClass({
   findAll() {
-    return ajax("/admin/logs/watched_words.json").then((list) => {
+    return ajax("/admin/customize/watched_words.json").then((list) => {
       const actions = {};
       list.words.forEach((s) => {
         if (!actions[s.action]) {
diff --git a/app/assets/javascripts/admin/addon/models/web-hook.js b/app/assets/javascripts/admin/addon/models/web-hook.js
index 677d76aa88..8dd568a9fb 100644
--- a/app/assets/javascripts/admin/addon/models/web-hook.js
+++ b/app/assets/javascripts/admin/addon/models/web-hook.js
@@ -1,9 +1,9 @@
-import { isEmpty } from "@ember/utils";
-import RestModel from "discourse/models/rest";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Category from "discourse/models/category";
 import Group from "discourse/models/group";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import RestModel from "discourse/models/rest";
 import Site from "discourse/models/site";
+import { isEmpty } from "@ember/utils";
 
 export default RestModel.extend({
   content_type: 1, // json
diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups-index.js b/app/assets/javascripts/admin/addon/routes/admin-backups-index.js
index aee755b705..cb05c26580 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-backups-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-backups-index.js
@@ -1,5 +1,5 @@
-import Route from "@ember/routing/route";
 import Backup from "admin/models/backup";
+import Route from "@ember/routing/route";
 
 export default Route.extend({
   activate() {
@@ -12,7 +12,9 @@ export default Route.extend({
   },
 
   model() {
-    return Backup.find();
+    return Backup.find().then((backups) =>
+      backups.map((backup) => Backup.create(backup))
+    );
   },
 
   deactivate() {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js b/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js
index e2e3a933c8..8de1ef5240 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js
@@ -1,6 +1,6 @@
 import EmberObject from "@ember/object";
-import Route from "@ember/routing/route";
 import PreloadStore from "discourse/lib/preload-store";
+import Route from "@ember/routing/route";
 
 export default Route.extend({
   // since the logs are pushed via the message bus
diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups.js b/app/assets/javascripts/admin/addon/routes/admin-backups.js
index 41c6cb0f8b..063eeec9d7 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-backups.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-backups.js
@@ -1,14 +1,15 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import EmberObject from "@ember/object";
-import DiscourseRoute from "discourse/routes/discourse";
-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 BackupStatus from "admin/models/backup-status";
+import DiscourseRoute from "discourse/routes/discourse";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
 import PreloadStore from "discourse/lib/preload-store";
 import User from "discourse/models/user";
+import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
+import { extractError } from "discourse/lib/ajax-error";
+import getURL from "discourse-common/lib/get-url";
+import showModal from "discourse/lib/show-modal";
 
 const LOG_CHANNEL = "/admin/backups/logs";
 
@@ -74,7 +75,11 @@ export default DiscourseRoute.extend({
 
     startBackup(withUploads) {
       this.transitionTo("admin.backups.logs");
-      Backup.start(withUploads);
+      Backup.start(withUploads).then((result) => {
+        if (!result.success) {
+          bootbox.alert(result.message);
+        }
+      });
     },
 
     destroyBackup(backup) {
@@ -135,7 +140,14 @@ export default DiscourseRoute.extend({
         I18n.t("yes_value"),
         (confirmed) => {
           if (confirmed) {
-            Backup.rollback();
+            Backup.rollback().then((result) => {
+              if (!result.success) {
+                bootbox.alert(result.message);
+              } else {
+                // redirect to homepage (session might be lost)
+                window.location = getURL("/");
+              }
+            });
           }
         }
       );
@@ -152,12 +164,22 @@ export default DiscourseRoute.extend({
     },
 
     remoteUploadSuccess() {
-      Backup.find().then((backups) => {
-        this.controllerFor("adminBackupsIndex").set(
-          "model",
-          backups.map((backup) => Backup.create(backup))
-        );
-      });
+      Backup.find()
+        .then((backups) => backups.map((backup) => Backup.create(backup)))
+        .then((backups) => {
+          this.controllerFor("adminBackupsIndex").set(
+            "model",
+            backups.map((backup) => Backup.create(backup))
+          );
+        })
+        .catch((error) => {
+          bootbox.alert(
+            I18n.t("admin.backups.backup_storage_error", {
+              error_message: extractError(error),
+            })
+          );
+          return [];
+        });
     },
   },
 });
diff --git a/app/assets/javascripts/admin/addon/routes/admin-badges-show.js b/app/assets/javascripts/admin/addon/routes/admin-badges-show.js
index c95cae8afa..7053be216f 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-badges-show.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-badges-show.js
@@ -1,10 +1,10 @@
+import Badge from "discourse/models/badge";
 import I18n from "I18n";
-import { get } from "@ember/object";
 import Route from "@ember/routing/route";
 import { ajax } from "discourse/lib/ajax";
-import Badge from "discourse/models/badge";
-import showModal from "discourse/lib/show-modal";
 import bootbox from "bootbox";
+import { get } from "@ember/object";
+import showModal from "discourse/lib/show-modal";
 
 export default Route.extend({
   serialize(m) {
@@ -23,6 +23,15 @@ export default Route.extend({
     );
   },
 
+  setupController(controller, model) {
+    this._super(...arguments);
+    if (model.image_url) {
+      controller.showImageUploader();
+    } else if (model.icon) {
+      controller.showIconSelector();
+    }
+  },
+
   actions: {
     saveError(e) {
       let msg = I18n.t("generic_error");
diff --git a/app/assets/javascripts/admin/addon/routes/admin-badges.js b/app/assets/javascripts/admin/addon/routes/admin-badges.js
index 59bc0944cb..ac4b9e9b53 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-badges.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-badges.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
-import DiscourseRoute from "discourse/routes/discourse";
-import { ajax } from "discourse/lib/ajax";
 import Badge from "discourse/models/badge";
 import BadgeGrouping from "discourse/models/badge-grouping";
+import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
 
 export default DiscourseRoute.extend({
   _json: null,
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js b/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js
index b2d4f2c16b..cf2dc3d18d 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js
@@ -1,5 +1,5 @@
-import Route from "@ember/routing/route";
 import ColorScheme from "admin/models/color-scheme";
+import Route from "@ember/routing/route";
 
 export default Route.extend({
   model() {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-index.js
index 931867c40c..615926c1c3 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-index.js
@@ -1,6 +1,10 @@
 import Route from "@ember/routing/route";
 export default Route.extend({
   beforeModel() {
-    this.transitionTo("adminCustomizeThemes");
+    if (this.currentUser.admin) {
+      this.transitionTo("adminCustomizeThemes");
+    } else {
+      this.transitionTo("adminWatchedWords");
+    }
   },
 });
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js
index 030645e445..0d55baa6ce 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js
@@ -28,7 +28,7 @@ export default Route.extend({
     const fields = wrapper.model
       .get("fields")
       [wrapper.target].map((f) => f.name);
-    if (wrapper.model.remote_theme) {
+    if (wrapper.model.remote_theme && wrapper.model.remote_theme.is_git) {
       this.transitionTo("adminCustomizeThemes.index");
       return;
     }
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js
index feaf0ef7ae..5bcf95d3d2 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js
@@ -1,7 +1,21 @@
+import { COMPONENTS, THEMES } from "admin/models/theme";
 import I18n from "I18n";
 import Route from "@ember/routing/route";
 import { scrollTop } from "discourse/mixins/scroll-top";
-import { THEMES, COMPONENTS } from "admin/models/theme";
+
+export function showUnassignedComponentWarning(theme, callback) {
+  bootbox.confirm(
+    I18n.t("admin.customize.theme.unsaved_parent_themes"),
+    I18n.t("admin.customize.theme.discard"),
+    I18n.t("admin.customize.theme.stay"),
+    (result) => {
+      if (!result) {
+        theme.set("recentlyInstalled", false);
+      }
+      callback(result);
+    }
+  );
+}
 
 export default Route.extend({
   serialize(model) {
@@ -11,7 +25,7 @@ export default Route.extend({
   model(params) {
     const all = this.modelFor("adminCustomizeThemes");
     const model = all.findBy("id", parseInt(params.theme_id, 10));
-    return model ? model : this.replaceWith("adminCustomizeTheme.index");
+    return model ? model : this.replaceWith("adminCustomizeThemes.index");
   },
 
   setupController(controller, model) {
@@ -55,19 +69,13 @@ export default Route.extend({
     },
     willTransition(transition) {
       const model = this.controller.model;
-      if (model.recentlyInstalled && !model.hasParents && model.component) {
+      if (model.warnUnassignedComponent) {
         transition.abort();
-        bootbox.confirm(
-          I18n.t("admin.customize.theme.unsaved_parent_themes"),
-          I18n.t("admin.customize.theme.discard"),
-          I18n.t("admin.customize.theme.stay"),
-          (result) => {
-            if (!result) {
-              this.controller.model.setProperties({ recentlyInstalled: false });
-              transition.retry();
-            }
+        showUnassignedComponentWarning(model, (result) => {
+          if (!result) {
+            transition.retry();
           }
-        );
+        });
       }
     },
   },
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js
index 2da0266f42..5eeae3a551 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js
@@ -1,7 +1,14 @@
 import Route from "@ember/routing/route";
 import showModal from "discourse/lib/show-modal";
+import { next } from "@ember/runloop";
+import { showUnassignedComponentWarning } from "admin/routes/admin-customize-themes-show";
 
 export default Route.extend({
+  queryParams: {
+    repoUrl: null,
+    repoName: null,
+  },
+
   model() {
     return this.store.findAll("theme");
   },
@@ -9,17 +16,44 @@ export default Route.extend({
   setupController(controller, model) {
     this._super(controller, model);
     controller.set("editingTheme", false);
+
+    if (controller.repoUrl) {
+      next(() => {
+        showModal("admin-install-theme", {
+          admin: true,
+        }).setProperties({
+          uploadUrl: controller.repoUrl,
+          uploadName: controller.repoName,
+          selection: "directRepoInstall",
+        });
+      });
+    }
   },
 
   actions: {
     installModal() {
-      showModal("admin-install-theme", { admin: true });
+      const currentTheme = this.controllerFor("adminCustomizeThemes.show")
+        .model;
+      if (currentTheme && currentTheme.warnUnassignedComponent) {
+        showUnassignedComponentWarning(currentTheme, (result) => {
+          if (!result) {
+            showModal("admin-install-theme", { admin: true });
+          }
+        });
+      } else {
+        showModal("admin-install-theme", { admin: true });
+      }
     },
 
     addTheme(theme) {
       this.refresh();
       theme.setProperties({ recentlyInstalled: true });
-      this.transitionTo("adminCustomizeThemes.show", theme.get("id"));
+      this.transitionTo("adminCustomizeThemes.show", theme.get("id"), {
+        queryParams: {
+          repoName: null,
+          repoUrl: null,
+        },
+      });
     },
   },
 });
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js b/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js
index 041b25fc05..d89010c9ef 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js
@@ -1,5 +1,5 @@
-import showModal from "discourse/lib/show-modal";
 import AdminEmailLogs from "admin/routes/admin-email-logs";
+import showModal from "discourse/lib/show-modal";
 
 export default AdminEmailLogs.extend({
   status: "bounced",
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js
index 03d72f0f82..730bcd0e7e 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js
@@ -1,5 +1,5 @@
-import DiscourseRoute from "discourse/routes/discourse";
 import EmailPreview, { oneWeekAgo } from "admin/models/email-preview";
+import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
   model() {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js b/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js
index e5d4501549..ce45fa8962 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js
@@ -1,5 +1,5 @@
-import showModal from "discourse/lib/show-modal";
 import AdminEmailIncomings from "admin/routes/admin-email-incomings";
+import showModal from "discourse/lib/show-modal";
 
 export default AdminEmailIncomings.extend({
   status: "rejected",
diff --git a/app/assets/javascripts/admin/addon/routes/admin-emojis.js b/app/assets/javascripts/admin/addon/routes/admin-emojis.js
index 5db8760a51..5047bd6f82 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-emojis.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-emojis.js
@@ -1,5 +1,5 @@
-import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js
index a3c3f196e0..f643d41e18 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js
@@ -1,12 +1,20 @@
 import DiscourseRoute from "discourse/routes/discourse";
-import showModal from "discourse/lib/show-modal";
 import EmberObject from "@ember/object";
+import showModal from "discourse/lib/show-modal";
 
 export default DiscourseRoute.extend({
   queryParams: {
     filters: { refreshModel: true },
   },
 
+  beforeModel(transition) {
+    const params = transition.to.queryParams;
+    const controller = this.controllerFor("admin-logs-staff-action-logs");
+    if (controller.filters === null || params.force_refresh) {
+      controller.resetFilters();
+    }
+  },
+
   deserializeQueryParam(value, urlKey, defaultValueType) {
     if (urlKey === "filters") {
       return EmberObject.create(JSON.parse(decodeURIComponent(value)));
@@ -27,13 +35,6 @@ export default DiscourseRoute.extend({
     return this._super(value, urlKey, defaultValueType);
   },
 
-  activate() {
-    const controller = this.controllerFor("admin-logs-staff-action-logs");
-    if (controller.filters === null) {
-      controller.resetFilters();
-    }
-  },
-
   // TODO: make this automatic using an `{{outlet}}`
   renderTemplate() {
     this.render("admin/templates/logs/staff-action-logs", {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-route-map.js b/app/assets/javascripts/admin/addon/routes/admin-route-map.js
index bdc27d133f..9b888f9ce5 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-route-map.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-route-map.js
@@ -97,6 +97,14 @@ export default function () {
             this.route("edit", { path: "/:field_name" });
           }
         );
+        this.route(
+          "adminWatchedWords",
+          { path: "/watched_words", resetNamespace: true },
+          function () {
+            this.route("index", { path: "/" });
+            this.route("action", { path: "/action/:action_id" });
+          }
+        );
       }
     );
 
@@ -152,14 +160,6 @@ export default function () {
             this.route("term", { path: "/term" });
           }
         );
-        this.route(
-          "adminWatchedWords",
-          { path: "/watched_words", resetNamespace: true },
-          function () {
-            this.route("index", { path: "/" });
-            this.route("action", { path: "/action/:action_id" });
-          }
-        );
       }
     );
 
diff --git a/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js b/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js
index c688b8ebba..c04f3b22b8 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js
@@ -1,5 +1,5 @@
-import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js b/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js
index 989d258384..b9613fe04f 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js
@@ -1,5 +1,5 @@
-import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { fillMissingDates } from "discourse/lib/utilities";
 import { translateResults } from "discourse/lib/search";
diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js
index be2a2180d2..aab0b337db 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js
@@ -1,6 +1,6 @@
-import I18n from "I18n";
-import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   model(params) {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-text-edit.js b/app/assets/javascripts/admin/addon/routes/admin-site-text-edit.js
index fe720907c7..40c74fced3 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-site-text-edit.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-site-text-edit.js
@@ -1,10 +1,30 @@
 import Route from "@ember/routing/route";
+import { ajax } from "discourse/lib/ajax";
+
 export default Route.extend({
+  queryParams: {
+    locale: { replace: true },
+  },
+
   model(params) {
-    return this.store.find("site-text", params.id);
+    return ajax(
+      `/admin/customize/site_texts/${params.id}?locale=${params.locale}`
+    ).then((result) => {
+      return this.store.createRecord("site-text", result.site_text);
+    });
   },
 
   setupController(controller, siteText) {
-    controller.setProperties({ siteText, saved: false });
+    const locales = JSON.parse(this.siteSettings.available_locales);
+
+    const localeFullName = locales.find((locale) => {
+      return locale.value === controller.locale;
+    }).name;
+
+    controller.setProperties({
+      siteText,
+      saved: false,
+      localeFullName: localeFullName,
+    });
   },
 });
diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js b/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js
index 036438235d..255315a846 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js
@@ -1,17 +1,18 @@
 import Route from "@ember/routing/route";
-import showModal from "discourse/lib/show-modal";
 import { getProperties } from "@ember/object";
+import showModal from "discourse/lib/show-modal";
 
 export default Route.extend({
   queryParams: {
     q: { replace: true },
     overridden: { replace: true },
+    locale: { replace: true },
   },
 
   model(params) {
     return this.store.find(
       "site-text",
-      getProperties(params, "q", "overridden")
+      getProperties(params, "q", "overridden", "locale")
     );
   },
 
diff --git a/app/assets/javascripts/admin/addon/routes/admin-user-badges.js b/app/assets/javascripts/admin/addon/routes/admin-user-badges.js
index f15649f92d..0c1621926f 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-user-badges.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-user-badges.js
@@ -1,6 +1,6 @@
+import Badge from "discourse/models/badge";
 import DiscourseRoute from "discourse/routes/discourse";
 import UserBadge from "discourse/models/user-badge";
-import Badge from "discourse/models/badge";
 
 export default DiscourseRoute.extend({
   model() {
@@ -14,7 +14,7 @@ export default DiscourseRoute.extend({
     Badge.findAll().then(function (badges) {
       controller.set("badges", badges);
       if (badges.length > 0) {
-        var grantableBadges = controller.get("grantableBadges");
+        let grantableBadges = controller.get("grantableBadges");
         if (grantableBadges.length > 0) {
           controller.set("selectedBadgeId", grantableBadges[0].get("id"));
         }
diff --git a/app/assets/javascripts/admin/addon/routes/admin-user.js b/app/assets/javascripts/admin/addon/routes/admin-user.js
index 90436dabd4..d9627ba571 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-user.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-user.js
@@ -1,6 +1,6 @@
-import { get } from "@ember/object";
-import DiscourseRoute from "discourse/routes/discourse";
 import AdminUser from "admin/models/admin-user";
+import DiscourseRoute from "discourse/routes/discourse";
+import { get } from "@ember/object";
 
 export default DiscourseRoute.extend({
   serialize(model) {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-list.js b/app/assets/javascripts/admin/addon/routes/admin-users-list.js
index db8106a8ed..4630c8efc8 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-users-list.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-users-list.js
@@ -1,7 +1,7 @@
+import AdminUser from "admin/models/admin-user";
 import DiscourseRoute from "discourse/routes/discourse";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
-import AdminUser from "admin/models/admin-user";
 
 export default DiscourseRoute.extend({
   actions: {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js
index 3c770f7e09..fe1ce75ab7 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js
@@ -1,6 +1,6 @@
-import I18n from "I18n";
-import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   model(params) {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show-events.js b/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show-events.js
index b07b390d40..1b7923224b 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show-events.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show-events.js
@@ -1,5 +1,5 @@
-import { get } from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
+import { get } from "@ember/object";
 
 export default DiscourseRoute.extend({
   model(params) {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js b/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js
index a5eb3dd873..6d7c64f955 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js
@@ -1,5 +1,5 @@
-import { get } from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
+import { get } from "@ember/object";
 
 export default DiscourseRoute.extend({
   serialize(model) {
diff --git a/app/assets/javascripts/admin/addon/routes/admin.js b/app/assets/javascripts/admin/addon/routes/admin.js
index c84051d171..e0949ba414 100644
--- a/app/assets/javascripts/admin/addon/routes/admin.js
+++ b/app/assets/javascripts/admin/addon/routes/admin.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   titleToken() {
diff --git a/app/assets/javascripts/admin/addon/services/admin-tools.js b/app/assets/javascripts/admin/addon/services/admin-tools.js
index fc02b998fe..8928af14e5 100644
--- a/app/assets/javascripts/admin/addon/services/admin-tools.js
+++ b/app/assets/javascripts/admin/addon/services/admin-tools.js
@@ -1,16 +1,16 @@
-import I18n from "I18n";
+import AdminUser from "admin/models/admin-user";
 // 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!
 
-import AdminUser from "admin/models/admin-user";
-import { iconHTML } from "discourse-common/lib/icon-library";
-import { ajax } from "discourse/lib/ajax";
-import showModal from "discourse/lib/show-modal";
-import { getOwner } from "discourse-common/lib/get-owner";
-import Service from "@ember/service";
+import I18n from "I18n";
 import { Promise } from "rsvp";
+import Service from "@ember/service";
+import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import showModal from "discourse/lib/show-modal";
 
 export default Service.extend({
   init() {
@@ -33,8 +33,8 @@ export default Service.extend({
     return AdminUser.find(userId).then((au) => this.spammerDetails(au));
   },
 
-  deleteUser(id) {
-    AdminUser.find(id).then((user) => user.destroy({ deletePosts: true }));
+  deleteUser(id, formData) {
+    return AdminUser.find(id).then((user) => user.destroy(formData));
   },
 
   spammerDetails(adminUser) {
diff --git a/app/assets/javascripts/admin/addon/templates/admin.hbs b/app/assets/javascripts/admin/addon/templates/admin.hbs
index bcbe6940d4..cc27366dd9 100644
--- a/app/assets/javascripts/admin/addon/templates/admin.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin.hbs
@@ -18,8 +18,8 @@
             {{nav-item route="adminEmail" label="admin.email.title"}}
           {{/if}}
           {{nav-item route="adminLogs" label="admin.logs.title"}}
+          {{nav-item route="adminCustomize" label="admin.customize.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"}}
diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
index 7d6219ffac..a8957262df 100644
--- a/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
+++ b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
@@ -25,10 +25,14 @@
 
     {{#if showUserSelector}}
       {{#admin-form-row label="admin.api.user"}}
-        {{user-selector single="true"
-          usernames=model.username
-          placeholderKey="admin.api.user_placeholder"
-          }}
+        {{email-group-user-chooser
+          value=model.username
+          onChange=(action "updateUsername")
+          options=(hash
+            maximum=1
+            filterPlaceholder="admin.api.user_placeholder"
+          )
+        }}
       {{/admin-form-row}}
     {{/if}}
 
diff --git a/app/assets/javascripts/admin/addon/templates/badges-show.hbs b/app/assets/javascripts/admin/addon/templates/badges-show.hbs
index 49741c8bc6..e71ed63bb3 100644
--- a/app/assets/javascripts/admin/addon/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/badges-show.hbs
@@ -4,29 +4,59 @@
       <label for="name">{{i18n "admin.badges.name"}}</label>
       {{#if readOnly}}
         {{input type="text" name="name" value=buffered.name disabled=true}}
+        <p class="help">
+          {{#link-to "adminSiteText" (query-params q=(concat textCustomizationPrefix "name"))}}
+            {{i18n "admin.badges.read_only_setting_help"}}
+          {{/link-to}}
+        </p>
       {{else}}
         {{input type="text" name="name" value=buffered.name}}
       {{/if}}
     </div>
 
     <div>
-      <label for="icon">{{i18n "admin.badges.icon"}}</label>
-      {{icon-picker
-        name="icon"
-        value=buffered.icon
-        options=(hash
-          maximum=1
-        )
-        onChange=(action (mut buffered.icon))
-      }}
+      <label for="graphic">{{i18n "admin.badges.graphic"}}</label>
+      <div class="radios">
+        <label class="radio-label" for="badge-icon">
+          {{radio-button
+            name="badge-icon"
+            id="badge-icon"
+            value="icon"
+            selection=selectedGraphicType
+            onChange=(action "changeGraphicType")
+          }}
+          <span>{{i18n "admin.badges.select_an_icon"}}</span>
+        </label>
 
-      <p class="help">{{i18n "admin.badges.icon_help"}}</p>
-    </div>
-
-    <div>
-      <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>
+        <label class="radio-label" for="badge-image">
+          {{radio-button
+            name="badge-image"
+            id="badge-image"
+            value="image"
+            selection=selectedGraphicType
+            onChange=(action "changeGraphicType")
+          }}
+          <span>{{i18n "admin.badges.upload_an_image"}}</span>
+        </label>
+      </div>
+      {{#if imageUploaderSelected}}
+        {{image-uploader
+          imageUrl=buffered.image_url
+          onUploadDone=(action "setImage")
+          onUploadDeleted=(action "removeImage")
+          type="badge_image"
+          class="no-repeat contain-image"}}
+        <div class="control-instructions">
+          <p class="help">{{i18n "admin.badges.image_help"}}</p>
+        </div>
+      {{else if iconSelectorSelected}}
+        {{icon-picker
+          name="icon"
+          value=buffered.icon
+          options=(hash maximum=1)
+          onChange=(action (mut buffered.icon))
+        }}
+      {{/if}}
     </div>
 
     <div>
@@ -64,6 +94,11 @@
       <label for="description">{{i18n "admin.badges.description"}}</label>
       {{#if buffered.system}}
         {{textarea name="description" value=buffered.description disabled=true}}
+        <p class="help">
+          {{#link-to "adminSiteText" (query-params q=(concat textCustomizationPrefix "description"))}}
+            {{i18n "admin.badges.read_only_setting_help"}}
+          {{/link-to}}
+        </p>
       {{else}}
         {{textarea name="description" value=buffered.description}}
       {{/if}}
@@ -73,6 +108,11 @@
       <label for="long_description">{{i18n "admin.badges.long_description"}}</label>
       {{#if buffered.system}}
         {{textarea name="long_description" value=buffered.long_description disabled=true}}
+        <p class="help">
+          {{#link-to "adminSiteText" (query-params q=(concat textCustomizationPrefix "long_description"))}}
+            {{i18n "admin.badges.read_only_setting_help"}}
+          {{/link-to}}
+        </p>
       {{else}}
         {{textarea name="long_description" value=buffered.long_description}}
       {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/badges.hbs b/app/assets/javascripts/admin/addon/templates/badges.hbs
index 82d77418d3..2f3d3358d9 100644
--- a/app/assets/javascripts/admin/addon/templates/badges.hbs
+++ b/app/assets/javascripts/admin/addon/templates/badges.hbs
@@ -7,7 +7,7 @@
         <span>{{i18n "admin.badges.new"}}</span>
       {{/link-to}}
 
-      {{#link-to "adminBadges.award" "new" class="btn"}}
+      {{#link-to "adminBadges.award" "new" class="btn btn-default"}}
         {{d-icon "upload"}}
         <span>{{i18n "admin.badges.mass_award.title"}}</span>
       {{/link-to}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-table-header.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-table-header.hbs
index 15f85276f5..f03bb92f2c 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report-table-header.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report-table-header.hbs
@@ -2,4 +2,8 @@
   {{d-button action=sortByLabel icon=sortIcon class="sort-btn"}}
 {{/if}}
 
-<span class="title">{{label.title}}</span>
+{{#if label.htmlTitle}}
+  <span class="title">{{html-safe label.htmlTitle}}</span>
+{{else}}
+  <span class="title">{{label.title}}</span>
+{{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
index ce928108a2..a309f9aba5 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
@@ -87,4 +87,17 @@
   <pre class="field-error">{{error}}</pre>
 {{/if}}
 
-{{ace-editor content=activeSection editorId=editorId mode=activeSectionMode autofocus="true" placeholder=placeholder}}
+{{#if warning}}
+  <pre class="field-warning">{{html-safe warning}}</pre>
+{{/if}}
+
+{{ace-editor
+  content=activeSection
+  editorId=editorId
+  mode=activeSectionMode
+  autofocus="true"
+  placeholder=placeholder
+  htmlPlaceholder=true
+  save=(action "save")
+  setWarning=(action "setWarning")
+}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-user-field-item.hbs
index 211cc00b51..06ab7a286e 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-user-field-item.hbs
@@ -22,19 +22,23 @@
   {{/if}}
 
   {{#admin-form-row wrapLabel="true"}}
-    {{input type="checkbox" checked=buffered.editable}} {{i18n "admin.user_fields.editable.title"}}
+    {{input type="checkbox" checked=buffered.editable}} <span>{{i18n "admin.user_fields.editable.title"}}</span>
   {{/admin-form-row}}
 
   {{#admin-form-row wrapLabel="true"}}
-    {{input type="checkbox" checked=buffered.required}} {{i18n "admin.user_fields.required.title"}}
+    {{input type="checkbox" checked=buffered.required}} <span>{{i18n "admin.user_fields.required.title"}}</span>
   {{/admin-form-row}}
 
   {{#admin-form-row wrapLabel="true"}}
-    {{input type="checkbox" checked=buffered.show_on_profile}} {{i18n "admin.user_fields.show_on_profile.title"}}
+    {{input type="checkbox" checked=buffered.show_on_profile}} <span>{{i18n "admin.user_fields.show_on_profile.title"}}</span>
   {{/admin-form-row}}
 
   {{#admin-form-row wrapLabel="true"}}
-    {{input type="checkbox" checked=buffered.show_on_user_card}} {{i18n "admin.user_fields.show_on_user_card.title"}}
+    {{input type="checkbox" checked=buffered.show_on_user_card}} <span>{{i18n "admin.user_fields.show_on_user_card.title"}}</span>
+  {{/admin-form-row}}
+
+  {{#admin-form-row wrapLabel="true"}}
+    {{input type="checkbox" checked=buffered.searchable}} <span>{{i18n "admin.user_fields.searchable.title"}}</span>
   {{/admin-form-row}}
 
   {{#admin-form-row}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs
index c9e4fd9b04..cc03496510 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs
@@ -1 +1 @@
-{{xIcon}}{{watchedWord}}
+{{d-icon "times"}} {{word.word}} {{#if word.replacement}}&rarr; <span class="replacement">{{word.replacement}}</span>{{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/dashboard-new-feature-item.hbs b/app/assets/javascripts/admin/addon/templates/components/dashboard-new-feature-item.hbs
new file mode 100644
index 0000000000..2aff298640
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/components/dashboard-new-feature-item.hbs
@@ -0,0 +1,13 @@
+<div class="admin-new-feature-item">
+  <div class="new-feature-emoji">{{item.emoji}}</div>
+  <div class="new-feature-content">
+    <div class="header">
+      {{#if item.link}}
+        <a href={{item.link}} target="_blank" rel="noopener noreferrer">{{item.title}}</a>
+      {{else}}
+        {{item.title}}
+      {{/if}}
+    </div>
+    <div class="feature-description">{{item.description}}</div>
+  </div>
+</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/dashboard-new-features.hbs b/app/assets/javascripts/admin/addon/templates/components/dashboard-new-features.hbs
new file mode 100644
index 0000000000..74f1a90d9c
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/components/dashboard-new-features.hbs
@@ -0,0 +1,19 @@
+{{#if newFeatures}}
+  <div class="section-title">
+    <h2>{{replace-emoji (i18n "admin.dashboard.new_features.title") }}</h2>
+  </div>
+
+  <div class="section-body {{columnCountClass}}">
+    {{#each newFeatures as |feature|}}
+      {{dashboard-new-feature-item item=feature tagName=""}}
+    {{/each}}
+  </div>
+  <div class="section-footer">
+    {{#if releaseNotesLink}}
+      <a rel="noopener noreferrer" target="_blank" href={{releaseNotesLink}} class="btn btn-primary new-features-release-notes">
+        {{i18n "admin.dashboard.new_features.learn_more"}}
+      </a>
+    {{/if}}
+    {{d-button label="admin.dashboard.new_features.dismiss" class="btn-default new-features-dismiss" action=dismissNewFeatures }}
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs
index 742c71a5b3..cc510651d0 100644
--- a/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs
@@ -9,12 +9,10 @@
   </div>
 </div>
 
-{{ace-editor content=editorContents mode=currentEditorMode editorId=editorId}}
+{{ace-editor content=editorContents mode=currentEditorMode editorId=editorId save=(action "save")}}
 
 <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}}
+    {{d-button action=(action "reset") disabled=resetDisabled class="btn-default" label="admin.customize.email_style.reset"}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs
index 7d73d93a2b..db8d108308 100644
--- a/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs
@@ -1,7 +1,7 @@
 {{#if editing}}
   <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.host"}}</div>
-    {{input value=buffered.host placeholder="example.com" enter=(action "save") class="host-name"}}
+    {{input value=buffered.host placeholder="example.com" enter=(action "save") class="host-name" autofocus=true}}
   </td>
   <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.class_name"}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/emoji-value-list.hbs b/app/assets/javascripts/admin/addon/templates/components/emoji-value-list.hbs
new file mode 100644
index 0000000000..d1843a2a26
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/components/emoji-value-list.hbs
@@ -0,0 +1,52 @@
+{{#if collection}}
+  <ul class="values emoji-value-list">
+    {{#each collection as |data index|}}
+      <li class="value" data-index={{index}}>
+        {{d-button
+          action=(action "removeValue")
+          actionParam=data
+          icon="times"
+          class="remove-value-btn btn-small"
+          disabled=(not data.isEditable)
+        }}
+
+        <div class="value-input emoji-details {{if data.isEditable "can-edit"}} {{if data.isEditing "d-editor-textarea-wrapper"}}" {{on "click" (fn this.editValue index)}} role="button">
+          <img height="15px" width="15px" src={{data.emojiUrl}} class="emoji-list-emoji">
+          <span class="emoji-name">{{data.value}}</span>
+        </div>
+
+        {{#if showUpDownButtons}}
+          {{d-button
+            action=(action "shift" -1 index)
+            icon="arrow-up"
+            class="shift-up-value-btn btn-small"
+          }}
+          {{d-button
+            action=(action "shift" 1 index)
+            icon="arrow-down"
+            class="shift-down-value-btn btn-small"
+          }}
+        {{/if}}
+      </li>
+    {{/each}}
+  </ul>
+{{/if}}
+
+<div class="value">
+  {{d-button
+    action=(action "editValue")
+    actionParam=data
+    icon="emoji-icon"
+    class="add-emoji-button d-editor-textarea-wrapper"
+    label="admin.site_settings.emoji_list.add_emoji_button.label"
+  }}
+</div>
+
+{{emoji-picker
+  isActive=emojiPickerIsActive
+  isEditorFocused=isEditorFocused
+  emojiSelected=(action "emojiSelected")
+  onEmojiPickerClose=(action "closeEmojiPicker")
+}}
+
+{{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs b/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs
index 4d96755ff9..de106adfd8 100644
--- a/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs
@@ -2,4 +2,4 @@
   type="checkbox"
   checked=checked
   click=(action "onChange")
-}}
\ No newline at end of file
+}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-setting.hbs b/app/assets/javascripts/admin/addon/templates/components/site-setting.hbs
index b7029ebe02..01e47fee83 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-setting.hbs
@@ -2,7 +2,7 @@
   <h3>
     {{#if staffLogFilter}}
       {{settingName}}
-      {{#link-to "adminLogs.staffActionLogs" (query-params filters=staffLogFilter) title=(i18n "admin.settings.history")}}
+      {{#link-to "adminLogs.staffActionLogs" (query-params filters=staffLogFilter force_refresh=true) title=(i18n "admin.settings.history")}}
         <span class="history-icon">
           {{d-icon "history"}}
         </span>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/emoji-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/emoji-list.hbs
new file mode 100644
index 0000000000..50d1d18898
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/emoji-list.hbs
@@ -0,0 +1,3 @@
+{{emoji-value-list setting=setting values=value}}
+<div class="desc">{{html-safe setting.description}}</div>
+{{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/html.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/html.hbs
new file mode 100644
index 0000000000..0da61a84e1
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/html.hbs
@@ -0,0 +1,2 @@
+{{text-field value=(html-safe value) classNames="input-setting-string"}}
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs
index 91106e9bdd..09eb918646 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs
@@ -1,5 +1,11 @@
 {{#if setting.textarea}}
   {{textarea value=value classNames="input-setting-textarea"}}
+{{else if setting.json_schema}}
+  {{d-button
+    action=(action "launchJsonEditorModal")
+    icon="pencil-alt"
+    label="admin.site_settings.json_schema.edit"
+  }}
 {{else if isSecret}}
   {{input type="password" value=value classNames="input-setting-string"}}
 {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/tag-list.hbs
index 7efd7421ce..b03ec4f36e 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/tag-list.hbs
@@ -1,6 +1,7 @@
 {{tag-chooser
   tags=selectedTags
   onChange=(action "changeSelectedTags")
+  everyTag=true
   options=(hash
     allowAny=false
   )
diff --git a/app/assets/javascripts/admin/addon/templates/components/tags-uploader.hbs b/app/assets/javascripts/admin/addon/templates/components/tags-uploader.hbs
index 1531feb677..4ab018c5e9 100644
--- a/app/assets/javascripts/admin/addon/templates/components/tags-uploader.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/tags-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn {{if addDisabled "disabled"}}">
+<label class="btn btn-default {{if addDisabled "disabled"}}">
   {{d-icon "upload"}}
   {{i18n "admin.watched_words.form.upload"}}
   <input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain,text/csv">
diff --git a/app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs b/app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs
index 0aa201b602..dbc7c8603f 100644
--- a/app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs
@@ -1,5 +1,22 @@
-<b>{{i18n "admin.watched_words.form.label"}}</b>
-{{text-field value=word disabled=formSubmitted class="watched-word-input" autocorrect="off" autocapitalize="off" placeholderKey=placeholderKey}}
+<div class="watched-word-input">
+  <label for="watched-word">{{i18n "admin.watched_words.form.label"}}</label>
+  {{text-field id="watched-word" value=word disabled=formSubmitted class="watched-word-input-field" autocorrect="off" autocapitalize="off" placeholderKey=placeholderKey title=(i18n placeholderKey)}}
+</div>
+
+{{#if canReplace}}
+  <div class="watched-word-input">
+    <label for="watched-replacement">{{i18n "admin.watched_words.form.replacement_label"}}</label>
+    {{text-field id="watched-replacement" value=replacement disabled=formSubmitted class="watched-word-input-replace" autocorrect="off" autocapitalize="off" placeholderKey="admin.watched_words.form.replacement_placeholder"}}
+  </div>
+{{/if}}
+
+{{#if canTag}}
+  <div class="watched-word-input">
+    <label for="watched-tag">{{i18n "admin.watched_words.form.tag_label"}}</label>
+    {{text-field id="watched-tag" value=replacement disabled=formSubmitted class="watched-word-input" autocorrect="off" autocapitalize="off" placeholderKey="admin.watched_words.form.tag_placeholder"}}
+  </div>
+{{/if}}
+
 {{d-button class="btn-default" action=(action "submit") disabled=formSubmitted label="admin.watched_words.form.add"}}
 
 {{#if showMessage}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/watched-word-uploader.hbs b/app/assets/javascripts/admin/addon/templates/components/watched-word-uploader.hbs
index 5d92bcc409..41c4920d63 100644
--- a/app/assets/javascripts/admin/addon/templates/components/watched-word-uploader.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/watched-word-uploader.hbs
@@ -1,6 +1,5 @@
 <label class="btn btn-default {{if addDisabled "disabled"}}">
   {{d-icon "upload"}}
   {{i18n "admin.watched_words.form.upload"}}
-  <input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain">
+  <input class="hidden-upload-field" disabled={{addDisabled}} type="file">
 </label>
-<span class="instructions">{{i18n "admin.watched_words.one_word_per_line"}}</span>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
index e359c1fe67..eeabe4e5c9 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
@@ -41,31 +41,34 @@
     <br>
 
     <div class="admin-controls">
-      {{#if model.theme_id}}
-        {{inline-edit-checkbox action=(action "applyUserSelectable") labelKey="admin.customize.theme.color_scheme_user_selectable" checked=model.user_selectable modelId=model.id}}
-      {{else}}
-        <label>
-          {{input type="checkbox" checked=model.user_selectable}}
-          {{i18n "admin.customize.theme.color_scheme_user_selectable"}}
-        </label>
-      {{/if}}
+      {{#unless model.theme_id}}
+        <div class="pull-right">
+          <label>
+            {{input type="checkbox" checked=onlyOverridden}}
+            {{i18n "admin.settings.show_overriden"}}
+          </label>
+        </div>
+      {{/unless}}
+
+      <div>
+        {{#if model.theme_id}}
+          {{inline-edit-checkbox action=(action "applyUserSelectable") labelKey="admin.customize.theme.color_scheme_user_selectable" checked=model.user_selectable modelId=model.id}}
+        {{else}}
+          <label>
+            {{input type="checkbox" checked=model.user_selectable}}
+            {{i18n "admin.customize.theme.color_scheme_user_selectable"}}
+          </label>
+        {{/if}}
+      </div>
     </div>
 
     {{#if colors.length}}
       <table class="table colors">
         <thead>
           <tr>
-            <th>
-            </th>
+            <th></th>
             <th class="hex">{{i18n "admin.customize.color"}}</th>
-            <th class="overriden">
-              {{#unless model.theme_id}}
-                <label>
-                  {{input type="checkbox" checked=onlyOverridden}}
-                  {{i18n "admin.settings.show_overriden"}}
-                </label>
-              {{/unless}}
-            </th>
+            <th></th>
           </tr>
         </thead>
         <tbody>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs
index 17baf19938..6acb4ed37b 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs
@@ -1,9 +1,7 @@
-{{email-styles-editor styles=model fieldName=fieldName}}
+{{email-styles-editor styles=model fieldName=fieldName save=(action "save")}}
 
 <div class="admin-footer">
   <div class="buttons">
-    {{#d-button action=(action "save") disabled=saveDisabled class="btn-primary"}}
-      {{saveButtonText}}
-    {{/d-button}}
+    {{d-button action=(action "save") disabled=saveDisabled class="btn-primary" translatedLabel=saveButtonText}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs
index a4e7fa583f..b4e845e416 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs
@@ -1,6 +1,21 @@
 <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="editor-information">
+      {{d-button
+        title="go_back"
+        action=(action "goBack")
+        icon="chevron-left"
+        class="btn-small editor-back-button"
+      }}
+
+      <span class="editor-theme-name-wrapper">
+        {{i18n "admin.customize.theme.edit_css_html"}}
+        {{#link-to showRouteName model.id replace=true class="editor-theme-name"
+        }}
+          {{model.name}}
+        {{/link-to}}
+      </span>
+    </div>
 
     {{admin-theme-editor
       theme=model
@@ -10,21 +25,31 @@
       fieldAdded=(action "fieldAdded")
       maximized=maximized
       onlyOverriddenChanged=(action "onlyOverriddenChanged")
+      save=(action "save")
     }}
 
     <div class="admin-footer">
       <div class="status-actions">
         {{#unless model.changed}}
-          <a href={{previewUrl}} rel="noopener noreferrer" 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}}
       </div>
 
       <div class="buttons">
-        {{#d-button action=(action "save") disabled=saveDisabled class="btn-primary"}}
-          {{saveButtonText}}
-        {{/d-button}}
+        {{d-button
+          action=(action "save")
+          disabled=saveDisabled
+          class="btn-primary"
+          translatedLabel=saveButtonText
+        }}
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
index dadbc7c347..078af97bb6 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
@@ -84,6 +84,9 @@
 
       <div class="control-unit">
         {{#if model.remote_theme.is_git}}
+          <div class="alert alert-info">
+            {{html-safe (i18n "admin.customize.theme.remote_theme_edits" repoURL=remoteThemeLink)}}
+          </div>
 
           {{#if showRemoteError}}
             <div class="error-message">
@@ -201,7 +204,7 @@
     {{/d-section}}
   {{/if}}
 
-  {{#unless model.remote_theme}}
+  {{#unless model.remote_theme.is_git}}
     <div class="control-unit">
       <div class="mini-title">{{i18n "admin.customize.theme.css_html"}}</div>
       {{#if model.hasEditedFields}}
@@ -290,7 +293,9 @@
     <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}}
+    {{#if showConvert}}
+      {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
+    {{/if}}
 
     {{#if model.component}}
       {{#if model.enabled}}
diff --git a/app/assets/javascripts/admin/addon/templates/customize.hbs b/app/assets/javascripts/admin/addon/templates/customize.hbs
index cafafd1285..48ed0896ef 100644
--- a/app/assets/javascripts/admin/addon/templates/customize.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize.hbs
@@ -1,13 +1,16 @@
 {{#admin-nav}}
-  {{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"}}
+  {{#if currentUser.admin}}
+    {{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"}}
+  {{/if}}
+  {{nav-item route="adminWatchedWords" label="admin.watched_words.title" class="admin-customize-watched-words"}}
 {{/admin-nav}}
 
 <div class="admin-container">
diff --git a/app/assets/javascripts/admin/addon/templates/dashboard.hbs b/app/assets/javascripts/admin/addon/templates/dashboard.hbs
index 0e4f4beec2..95f26205e7 100644
--- a/app/assets/javascripts/admin/addon/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/addon/templates/dashboard.hbs
@@ -50,4 +50,6 @@
 
 {{outlet}}
 
+{{dashboard-new-features tagName="div"}}
+
 {{plugin-outlet name="admin-dashboard-bottom"}}
diff --git a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
index 8d10ac3a8b..c93d048ba6 100644
--- a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
@@ -5,7 +5,13 @@
     <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>
-    {{user-selector single="true" usernames=username canReceiveUpdates=true}}
+    {{email-group-user-chooser
+      value=username
+      onChange=(action "updateUsername")
+      options=(hash
+        maximum=1
+      )
+    }}
     {{d-button
       class="btn-primary digest-refresh-button"
       action=(action "refresh")
diff --git a/app/assets/javascripts/admin/addon/templates/logs.hbs b/app/assets/javascripts/admin/addon/templates/logs.hbs
index 194f6ec8bf..4cc214e184 100644
--- a/app/assets/javascripts/admin/addon/templates/logs.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs.hbs
@@ -3,7 +3,6 @@
   {{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"}}
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-delete-user-posts-progress.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-delete-user-posts-progress.hbs
new file mode 100644
index 0000000000..8f381db847
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-delete-user-posts-progress.hbs
@@ -0,0 +1,4 @@
+{{#d-modal-body title="admin.user.delete_posts.progress.title" dismissable=false}}
+  <p>{{I18n "admin.user.delete_posts_progress"}}</p>
+  <div class="progress-bar"><span style={{html-safe (concat "width: " deletedPercentage "%")}}></span></div>
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs
index 053ce042a8..2fda0a1b00 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs
@@ -1,10 +1,12 @@
 {{#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"}}
-    {{install-theme-item value="remote" selection=selection label="admin.customize.theme.install_git_repo"}}
-    {{install-theme-item value="create" selection=selection label="admin.customize.theme.install_create" showIcon=true}}
-  </div>
+  {{#unless directRepoInstall}}
+    <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"}}
+      {{install-theme-item value="remote" selection=selection label="admin.customize.theme.install_git_repo"}}
+      {{install-theme-item value="create" selection=selection label="admin.customize.theme.install_create" showIcon=true}}
+    </div>
+  {{/unless}}
   <div class="install-theme-content">
     {{#if popular}}
       <div class="popular-theme-items">
@@ -78,6 +80,10 @@
               <div class="label">{{i18n "admin.customize.theme.public_key"}}</div>
               {{textarea readonly=true value=publicKey}}
             </div>
+          {{else}}
+            {{#if privateChecked}}
+              <div class="public-key-note">{{i18n "admin.customize.theme.public_key_note"}}</div>
+            {{/if}}
           {{/if}}
         {{/if}}
       </div>
@@ -97,12 +103,24 @@
         }}
       </div>
     {{/if}}
+
+    {{#if directRepoInstall}}
+      <div class="repo">
+        <div class="label">{{html-safe (i18n "admin.customize.theme.direct_install_tip" name=uploadName)}}</div>
+        <pre><code>{{uploadUrl}}</code></pre>
+      </div>
+    {{/if}}
   </div>
 
 {{/d-modal-body}}
 
 {{#unless popular}}
   <div class="modal-footer">
+    {{#if duplicateRemoteThemeWarning}}
+      <div class="install-theme-warning">
+        ⚠️ {{duplicateRemoteThemeWarning}}
+      </div>
+    {{/if}}
     {{d-button action=(action "installTheme") disabled=installDisabled class="btn btn-primary" label=submitLabel}}
     {{d-modal-cancel close=(route-action "closeModal")}}
   </div>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs
index b2522607b5..fc07ea1f19 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs
@@ -5,14 +5,13 @@
   {{/d-modal-body}}
 
   <div class="modal-footer">
-    {{#d-button
+    {{d-button
       class="btn-danger"
       action=(action "confirm")
       icon="trash-alt"
       disabled=mergeDisabled
+      translatedLabel=mergeButtonText
     }}
-      {{i18n "admin.user.merge.confirmation.transfer_and_delete" username=username}}
-    {{/d-button}}
     {{d-button
       action=(action "close")
       label="admin.user.merge.confirmation.cancel"
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-progress.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-progress.hbs
new file mode 100644
index 0000000000..40c3c160da
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-progress.hbs
@@ -0,0 +1,3 @@
+{{#d-modal-body title="admin.user.merge.progress.title" dismissable=false}}
+  {{ message }}
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs
index 71f7a404bc..458c5b56bc 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs
@@ -1,21 +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"}}
+    {{email-group-user-chooser
+      value=targetUsername
+      onChange=(action "updateUsername")
+      options=(hash
+        maximum=1
+        filterPlaceholder="admin.user.merge.prompt.target_username_placeholder"
+      )
+    }}
   {{/d-modal-body}}
 
   <div class="modal-footer">
-    {{#d-button
+    {{d-button
       class="btn-primary"
       action=(action "showConfirmation")
       icon="trash-alt"
       disabled=mergeDisabled
+      translatedLabel=mergeButtonText
     }}
-      {{i18n "admin.user.merge.prompt.transfer_and_delete" username=username}}
-    {{/d-button}}
     {{d-button
       action=(action "close")
       label="admin.user.merge.prompt.cancel"
diff --git a/app/assets/javascripts/admin/addon/templates/plugins-index.hbs b/app/assets/javascripts/admin/addon/templates/plugins-index.hbs
index 072f7d2141..d546540250 100644
--- a/app/assets/javascripts/admin/addon/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/plugins-index.hbs
@@ -23,11 +23,16 @@
           </td>
 
           <td class="plugin-name">
-            {{#if plugin.url}}
-              <a href={{plugin.url}} rel="noopener noreferrer" target="_blank">{{plugin.name}}</a>
-            {{else}}
-              {{plugin.name}}
-            {{/if}}
+            <div class="name">
+              {{#if plugin.url}}
+                <a href={{plugin.url}} rel="noopener noreferrer" target="_blank">{{plugin.name}}</a>
+              {{else}}
+                {{plugin.name}}
+              {{/if}}
+            </div>
+            <div class="about">
+              {{plugin.about}}
+            </div>
           </td>
           <td class="version">
             <div class="label">{{i18n "admin.plugins.version"}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs b/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs
index 279a5a5acb..2bf960c24b 100644
--- a/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs
@@ -1,9 +1,12 @@
 <div class="edit-site-text">
-
   <div class="title">
     <h3>{{siteText.id}}</h3>
   </div>
 
+  <div class="title">
+    <h4>{{i18n "admin.site_text.locale"}} {{localeFullName}}</h4>
+  </div>
+
   {{expanding-text-area value=buffered.value rows="1" class="site-text-value"}}
 
   {{#save-controls model=siteText action=(action "saveChanges") saved=saved saveDisabled=saveDisabled}}
@@ -12,7 +15,7 @@
     {{/if}}
   {{/save-controls}}
 
-  {{#link-to "adminSiteText.index" class="go-back"}}
+  {{#link-to "adminSiteText.index" (query-params locale=locale) class="go-back"}}
     {{d-icon "arrow-left"}}
     {{i18n "admin.site_text.go_back"}}
   {{/link-to}}
diff --git a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
index fa72cc36f4..1595118769 100644
--- a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
@@ -16,6 +16,21 @@
   </div>
 
   <p class="filter-options">
+    <div class="locale">
+      <label>{{i18n "admin.site_text.locale"}}</label>
+      {{combo-box
+        valueProperty="value"
+        content=availableLocales
+        value=locale
+        onChange=(action "updateLocale")
+        class="locale-search"
+        options=(hash
+          filterable=true
+          none="user.locale.default"
+        )
+      }}
+    </div>
+
     <label>
       {{input type="checkbox" checked=overridden click=(action "toggleOverridden")}}
       {{i18n "admin.site_text.show_overriden"}}
@@ -24,6 +39,13 @@
 </div>
 
 {{#conditional-loading-spinner condition=searching}}
+  {{#if showFallbackLocaleWarning}}
+    <div class="alert alert-info">
+      {{d-icon "exclamation-circle"}}
+      {{i18n "admin.site_text.fallback_locale_warning" fallback=fallbackLocaleFullName}}
+    </div>
+  {{/if}}
+
   {{#if siteTexts.extras.recommended}}
     <p><b>{{i18n "admin.site_text.recommended"}}</b></p>
   {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/user-index.hbs b/app/assets/javascripts/admin/addon/templates/user-index.hbs
index cc25a5b0ca..41da0bff3d 100644
--- a/app/assets/javascripts/admin/addon/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-index.hbs
@@ -70,8 +70,8 @@
         {{/if}}
       </div>
       <div class="controls">
-        {{#if siteSettings.sso_overrides_email}}
-          {{i18n "user.email.sso_override_instructions"}}
+        {{#if siteSettings.auth_overrides_email}}
+          {{i18n "user.email.auth_override_instructions"}}
         {{else if model.email}}
           {{html-safe (i18n "admin.user.visit_profile" url=preferencesPath)}}
         {{/if}}
@@ -105,8 +105,8 @@
       <div class="controls">
         {{#if model.email}}
           {{#if model.secondary_emails}}
-            {{#if siteSettings.sso_overrides_email}}
-              {{i18n "user.email.sso_override_instructions"}}
+            {{#if siteSettings.auth_overrides_email}}
+              {{i18n "user.email.auth_override_instructions"}}
             {{else}}
               {{html-safe (i18n "admin.user.visit_profile" url=preferencesPath)}}
             {{/if}}
@@ -189,7 +189,7 @@
         {{i18n "badges.badge_count" count=model.badge_count}}
       </div>
       <div class="controls">
-        {{#link-to "adminUser.badges" model class="btn"}}
+        {{#link-to "adminUser.badges" model class="btn btn-default"}}
           {{d-icon "certificate"}}
           {{i18n "admin.badges.edit_badges"}}
         {{/link-to}}
@@ -316,8 +316,7 @@
         {{model.api_key_count}}
       </div>
       <div class="controls">
-        {{d-button href="/admin/api/keys" label="admin.api.manage_keys"}}
-
+        {{d-button class="btn-default" href="/admin/api/keys" label="admin.api.manage_keys"}}
       </div>
     </div>
   {{/if}}
@@ -646,11 +645,11 @@
 
 {{#if model.single_sign_on_record}}
   <section class="details">
-    <h1>{{i18n "admin.user.sso.title"}}</h1>
+    <h1>{{i18n "admin.user.discourse_connect.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="field">{{i18n "admin.user.discourse_connect.external_id"}}</div>
         <div class="value">{{sso.external_id}}</div>
         {{#if model.can_delete_sso_record}}
           <div class="controls">
@@ -658,22 +657,22 @@
               class="btn-danger"
               action=(action "deleteSSORecord")
               icon="far-trash-alt"
-              label="admin.user.sso.delete_sso_record"
+              label="admin.user.discourse_connect.delete_sso_record"
             }}
           </div>
         {{/if}}
       </div>
       <div class="display-row">
-        <div class="field">{{i18n "admin.user.sso.external_username"}}</div>
+        <div class="field">{{i18n "admin.user.discourse_connect.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="field">{{i18n "admin.user.discourse_connect.external_name"}}</div>
         <div class="value">{{sso.external_name}}</div>
       </div>
       {{#if canAdminCheckEmails}}
         <div class="display-row">
-          <div class="field">{{i18n "admin.user.sso.external_email"}}</div>
+          <div class="field">{{i18n "admin.user.discourse_connect.external_email"}}</div>
           {{#if ssoExternalEmail}}
             <div class="value">{{ssoExternalEmail}}</div>
           {{else}}
@@ -687,17 +686,26 @@
         </div>
       {{/if}}
       <div class="display-row">
-        <div class="field">{{i18n "admin.user.sso.external_avatar_url"}}</div>
+        <div class="field">{{i18n "admin.user.discourse_connect.external_avatar_url"}}</div>
         <div class="value">{{sso.external_avatar_url}}</div>
       </div>
-      {{#if sso.last_payload}}
+      {{#if canAdminCheckEmails}}
         <div class="display-row">
-          <div class="field">{{i18n "admin.user.sso.last_payload"}}</div>
-          <div class="value">
-            {{#each ssoPayload as |line|}}
-              {{line}}<br>
-            {{/each}}
-          </div>
+          <div class="field">{{i18n "admin.user.discourse_connect.last_payload"}}</div>
+          {{#if ssoLastPayload}}
+            <div class="value">
+              {{#each ssoPayload as |line|}}
+                {{line}}<br>
+              {{/each}}
+            </div>
+          {{else}}
+            {{d-button
+              class="btn-default"
+              action=(action "checkSsoPayload")
+              actionParam=model icon="far-list-alt"
+              label="admin.users.check_sso.text"
+              title="admin.users.check_sso.title"}}
+          {{/if}}
         </div>
       {{/if}}
     {{/with}}
diff --git a/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
index 4f15862a8a..d17ce9e300 100644
--- a/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
+++ b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
@@ -1,50 +1,43 @@
-<h2>{{model.name}}</h2>
-
-<p class="about">{{actionDescription}}</p>
-
 <div class="watched-word-controls">
-  {{watched-word-form
-    actionKey=actionNameKey
-    action=(action "recordAdded")
-    filteredContent=filteredContent
-    regularExpressions=adminWatchedWords.regularExpressions}}
+  {{d-button
+    class="btn-default download-link"
+    href=downloadLink
+    icon="download"
+    label="admin.watched_words.download"}}
 
-  <div class="download-upload-controls">
-    <div class="download">
-      {{d-button
-        class="btn-default download-link"
-        href=downloadLink
-        icon="download"
-        label="admin.watched_words.download"}}
-    </div>
-    {{watched-word-uploader uploading=uploading actionKey=actionNameKey done=(action "uploadComplete")}}
-  </div>
-</div>
+  {{watched-word-uploader uploading=uploading actionKey=actionNameKey done=(action "uploadComplete")}}
 
-<div>
-  <label class="show-words-checkbox">
-    {{input type="checkbox" checked=adminWatchedWords.showWords disabled=adminWatchedWords.disableShowWords}}
-    {{i18n "admin.watched_words.show_words"}}
-  </label>
-</div>
-<div class="watched-words-list">
-  {{#if showWordsList}}
-    {{#each filteredContent as |word| }}
-      <div class="watched-word-box">{{admin-watched-word word=word action=(action "recordRemoved")}}</div>
-    {{/each}}
-  {{else}}
-    {{i18n "admin.watched_words.word_count" count=wordCount}}
-  {{/if}}
-</div>
-
-<div class="clear-all-row">
   {{d-button
     label="admin.watched_words.test.button_label"
     icon="far-eye"
     action=(action "test")}}
+
   {{d-button
     class="btn-danger clear-all"
     label="admin.watched_words.clear_all"
     icon="trash-alt"
     action=(action "clearAll")}}
 </div>
+
+<p class="about">{{actionDescription}}</p>
+
+{{watched-word-form
+  actionKey=actionNameKey
+  action=(action "recordAdded")
+  filteredContent=filteredContent
+  regularExpressions=adminWatchedWords.regularExpressions}}
+
+{{#if wordCount}}
+  <label class="show-words-checkbox">
+    {{input type="checkbox" checked=adminWatchedWords.showWords disabled=adminWatchedWords.disableShowWords}}
+    {{i18n "admin.watched_words.show_words" count=wordCount}}
+  </label>
+{{/if}}
+
+{{#if showWordsList}}
+  <div class="watched-words-list">
+    {{#each filteredContent as |word| }}
+      <div class="watched-word-box">{{admin-watched-word word=word action=(action "recordRemoved")}}</div>
+    {{/each}}
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json
index 71f324cfba..7d6e02b5c9 100644
--- a/app/assets/javascripts/admin/package.json
+++ b/app/assets/javascripts/admin/package.json
@@ -25,7 +25,7 @@
     "@glimmer/component": "^1.0.0",
     "babel-eslint": "^10.0.3",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.15.2",
+    "ember-cli": "~3.25.3",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-eslint": "^5.1.0",
     "ember-cli-inject-live-reload": "^2.0.1",
@@ -48,6 +48,6 @@
     "node": "8.* || >= 10.*"
   },
   "ember": {
-    "edition": "octane"
+    "edition": "default"
   }
 }
diff --git a/app/assets/javascripts/admin/tests/admin/integration/components/group-list-setting-test.js b/app/assets/javascripts/admin/tests/admin/integration/components/group-list-setting-test.js
deleted file mode 100644
index 4df70d2c89..0000000000
--- a/app/assets/javascripts/admin/tests/admin/integration/components/group-list-setting-test.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { moduleForComponent } from "ember-qunit";
-import EmberObject from "@ember/object";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
-import componentTest from "discourse/tests/helpers/component-test";
-
-moduleForComponent("group-list", { integration: true });
-
-componentTest("default", {
-  template: "{{site-setting setting=setting}}",
-
-  beforeEach() {
-    this.site.groups = [
-      {
-        id: 1,
-        name: "Donuts",
-      },
-      {
-        id: 2,
-        name: "Cheese cake",
-      },
-    ];
-
-    this.set(
-      "setting",
-      EmberObject.create({
-        allowsNone: undefined,
-        category: "foo",
-        default: "",
-        description: "Choose groups",
-        overridden: false,
-        placeholder: null,
-        preview: null,
-        secret: false,
-        setting: "foo_bar",
-        type: "group_list",
-        validValues: undefined,
-        value: "1",
-      })
-    );
-  },
-
-  async test(assert) {
-    const subject = selectKit(".list-setting");
-
-    assert.equal(
-      subject.header().value(),
-      "1",
-      "it selects the setting's value"
-    );
-
-    await subject.expand();
-    await subject.selectRowByValue("2");
-
-    assert.equal(
-      subject.header().value(),
-      "1,2",
-      "it allows to select a setting from the list of choices"
-    );
-  },
-});
diff --git a/app/assets/javascripts/admin/tests/admin/integration/components/themes-list-item-test.js b/app/assets/javascripts/admin/tests/admin/integration/components/themes-list-item-test.js
deleted file mode 100644
index ff2356ba6e..0000000000
--- a/app/assets/javascripts/admin/tests/admin/integration/components/themes-list-item-test.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
-import { moduleForComponent } from "ember-qunit";
-import I18n from "I18n";
-import componentTest from "discourse/tests/helpers/component-test";
-import Theme from "admin/models/theme";
-
-moduleForComponent("themes-list-item", { integration: true });
-
-componentTest("default theme", {
-  template: "{{themes-list-item theme=theme}}",
-  beforeEach() {
-    this.set("theme", Theme.create({ name: "Test", default: true }));
-  },
-
-  test(assert) {
-    assert.expect(1);
-    assert.equal(
-      queryAll(".d-icon-check").length,
-      1,
-      "shows default theme icon"
-    );
-  },
-});
-
-componentTest("pending updates", {
-  template: "{{themes-list-item theme=theme}}",
-  beforeEach() {
-    this.set(
-      "theme",
-      Theme.create({ name: "Test", remote_theme: { commits_behind: 6 } })
-    );
-  },
-
-  test(assert) {
-    assert.expect(1);
-    assert.equal(
-      queryAll(".d-icon-sync").length,
-      1,
-      "shows pending update icon"
-    );
-  },
-});
-
-componentTest("broken theme", {
-  template: "{{themes-list-item theme=theme}}",
-  beforeEach() {
-    this.set(
-      "theme",
-      Theme.create({
-        name: "Test",
-        theme_fields: [{ name: "scss", type_id: 1, error: "something" }],
-      })
-    );
-  },
-
-  test(assert) {
-    assert.expect(1);
-    assert.equal(
-      queryAll(".d-icon-exclamation-circle").length,
-      1,
-      "shows broken theme icon"
-    );
-  },
-});
-
-componentTest("with children", {
-  template: "{{themes-list-item theme=theme}}",
-
-  beforeEach() {
-    this.childrenList = [1, 2, 3, 4, 5].map((num) =>
-      Theme.create({ name: `Child ${num}`, component: true })
-    );
-
-    this.set(
-      "theme",
-      Theme.create({
-        name: "Test",
-        childThemes: this.childrenList,
-        default: true,
-      })
-    );
-  },
-
-  test(assert) {
-    assert.expect(2);
-    assert.deepEqual(
-      queryAll(".components")
-        .text()
-        .trim()
-        .split(",")
-        .map((n) => n.trim())
-        .join(","),
-      this.childrenList
-        .splice(0, 4)
-        .map((theme) => theme.get("name"))
-        .join(","),
-      "lists the first 4 children"
-    );
-    assert.deepEqual(
-      queryAll(".others-count").text().trim(),
-      I18n.t("admin.customize.theme.and_x_more", { count: 1 }),
-      "shows count of remaining children"
-    );
-  },
-});
diff --git a/app/assets/javascripts/admin/tests/admin/integration/components/themes-list-test.js b/app/assets/javascripts/admin/tests/admin/integration/components/themes-list-test.js
deleted file mode 100644
index 0eaa6ebd79..0000000000
--- a/app/assets/javascripts/admin/tests/admin/integration/components/themes-list-test.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
-import { moduleForComponent } from "ember-qunit";
-import I18n from "I18n";
-import componentTest from "discourse/tests/helpers/component-test";
-import Theme, { THEMES, COMPONENTS } from "admin/models/theme";
-
-moduleForComponent("themes-list", { integration: true });
-
-componentTest("current tab is themes", {
-  template:
-    "{{themes-list themes=themes components=components currentTab=currentTab}}",
-  beforeEach() {
-    this.themes = [1, 2, 3, 4, 5].map((num) =>
-      Theme.create({ name: `Theme ${num}` })
-    );
-    this.components = [1, 2, 3, 4, 5].map((num) =>
-      Theme.create({
-        name: `Child ${num}`,
-        component: true,
-        parentThemes: [this.themes[num - 1]],
-        parent_themes: [1, 2, 3, 4, 5],
-      })
-    );
-    this.setProperties({
-      themes: this.themes,
-      components: this.components,
-      currentTab: THEMES,
-    });
-  },
-
-  test(assert) {
-    assert.equal(
-      queryAll(".themes-tab").hasClass("active"),
-      true,
-      "themes tab is active"
-    );
-    assert.equal(
-      queryAll(".components-tab").hasClass("active"),
-      false,
-      "components tab is not active"
-    );
-
-    assert.equal(
-      queryAll(".inactive-indicator").index(),
-      -1,
-      "there is no inactive themes separator when all themes are inactive"
-    );
-    assert.equal(
-      queryAll(".themes-list-item").length,
-      5,
-      "displays all themes"
-    );
-
-    [2, 3].forEach((num) => this.themes[num].set("user_selectable", true));
-    this.themes[4].set("default", true);
-    this.set("themes", this.themes);
-    const names = [4, 2, 3, 0, 1].map((num) => this.themes[num].get("name")); // default theme always on top, followed by user-selectable ones and then the rest
-    assert.deepEqual(
-      Array.from(queryAll(".themes-list-item .name")).map((node) =>
-        node.innerText.trim()
-      ),
-      names,
-      "sorts themes correctly"
-    );
-    assert.equal(
-      queryAll(".inactive-indicator").index(),
-      3,
-      "the separator is in the right location"
-    );
-
-    this.themes.forEach((theme) => theme.set("user_selectable", true));
-    this.set("themes", this.themes);
-    assert.equal(
-      queryAll(".inactive-indicator").index(),
-      -1,
-      "there is no inactive themes separator when all themes are user-selectable"
-    );
-
-    this.set("themes", []);
-    assert.equal(
-      queryAll(".themes-list-item").length,
-      1,
-      "shows one entry with a message when there is nothing to display"
-    );
-    assert.equal(
-      queryAll(".themes-list-item span.empty").text().trim(),
-      I18n.t("admin.customize.theme.empty"),
-      "displays the right message"
-    );
-  },
-});
-
-componentTest("current tab is components", {
-  template:
-    "{{themes-list themes=themes components=components currentTab=currentTab}}",
-  beforeEach() {
-    this.themes = [1, 2, 3, 4, 5].map((num) =>
-      Theme.create({ name: `Theme ${num}` })
-    );
-    this.components = [1, 2, 3, 4, 5].map((num) =>
-      Theme.create({
-        name: `Child ${num}`,
-        component: true,
-        parentThemes: [this.themes[num - 1]],
-        parent_themes: [1, 2, 3, 4, 5],
-      })
-    );
-    this.setProperties({
-      themes: this.themes,
-      components: this.components,
-      currentTab: COMPONENTS,
-    });
-  },
-
-  test(assert) {
-    assert.equal(
-      queryAll(".components-tab").hasClass("active"),
-      true,
-      "components tab is active"
-    );
-    assert.equal(
-      queryAll(".themes-tab").hasClass("active"),
-      false,
-      "themes tab is not active"
-    );
-
-    assert.equal(
-      queryAll(".inactive-indicator").index(),
-      -1,
-      "there is no separator"
-    );
-    assert.equal(
-      queryAll(".themes-list-item").length,
-      5,
-      "displays all components"
-    );
-
-    this.set("components", []);
-    assert.equal(
-      queryAll(".themes-list-item").length,
-      1,
-      "shows one entry with a message when there is nothing to display"
-    );
-    assert.equal(
-      queryAll(".themes-list-item span.empty").text().trim(),
-      I18n.t("admin.customize.theme.empty"),
-      "displays the right message"
-    );
-  },
-});
diff --git a/app/assets/javascripts/admin/tests/admin/unit/controllers/admin-customize-themes-show-test.js b/app/assets/javascripts/admin/tests/admin/unit/controllers/admin-customize-themes-show-test.js
deleted file mode 100644
index 318f55fdc0..0000000000
--- a/app/assets/javascripts/admin/tests/admin/unit/controllers/admin-customize-themes-show-test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import { moduleFor } from "ember-qunit";
-import { test } from "qunit";
-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"],
-});
-
-test("can display source url for remote themes", function (assert) {
-  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,
-  });
-
-  assert.deepEqual(
-    controller.get("remoteThemeLink"),
-    repoUrl,
-    "returns theme's repo URL"
-  );
-});
-
-test("can display source url for remote theme branches", function (assert) {
-  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"),
-    "https://github.com/discourse/discourse-brand-header/tree/beta",
-    "returns theme's repo URL to branch"
-  );
-});
diff --git a/app/assets/javascripts/admin/tests/admin/unit/controllers/admin-customize-themes-test.js b/app/assets/javascripts/admin/tests/admin/unit/controllers/admin-customize-themes-test.js
deleted file mode 100644
index 06eec98328..0000000000
--- a/app/assets/javascripts/admin/tests/admin/unit/controllers/admin-customize-themes-test.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import { moduleFor } from "ember-qunit";
-import { test } from "qunit";
-import { mapRoutes } from "discourse/mapping-router";
-import Theme from "admin/models/theme";
-
-moduleFor("controller:admin-customize-themes", {
-  beforeEach() {
-    this.registry.register("router:main", mapRoutes());
-  },
-  needs: ["controller:adminUser"],
-});
-
-test("can list themes correctly", function (assert) {
-  const defaultTheme = Theme.create({ id: 2, default: true, name: "default" });
-  const userTheme = Theme.create({
-    id: 3,
-    user_selectable: true,
-    name: "name",
-  });
-  const strayTheme1 = Theme.create({ id: 4, name: "stray1" });
-  const strayTheme2 = Theme.create({ id: 5, name: "stray2" });
-  const componentTheme = Theme.create({
-    id: 6,
-    name: "component",
-    component: true,
-  });
-
-  const controller = this.subject({
-    model: [strayTheme2, strayTheme1, userTheme, defaultTheme, componentTheme],
-  });
-
-  assert.deepEqual(
-    controller.get("fullThemes").map((t) => t.get("name")),
-    [strayTheme2, strayTheme1, userTheme, defaultTheme].map((t) =>
-      t.get("name")
-    ),
-    "returns a list of themes without components"
-  );
-
-  assert.deepEqual(
-    controller.get("childThemes").map((t) => t.get("name")),
-    [componentTheme].map((t) => t.get("name")),
-    "separate components from themes"
-  );
-});
diff --git a/app/assets/javascripts/admin/tests/admin/unit/controllers/admin-user-badges-test.js b/app/assets/javascripts/admin/tests/admin/unit/controllers/admin-user-badges-test.js
deleted file mode 100644
index b377f7f31d..0000000000
--- a/app/assets/javascripts/admin/tests/admin/unit/controllers/admin-user-badges-test.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { moduleFor } from "ember-qunit";
-import { test } from "qunit";
-import Badge from "discourse/models/badge";
-import { mapRoutes } from "discourse/mapping-router";
-
-moduleFor("controller:admin-user-badges", {
-  beforeEach() {
-    this.registry.register("router:main", mapRoutes());
-  },
-  needs: ["controller:adminUser"],
-});
-
-test("grantableBadges", function (assert) {
-  const badgeFirst = Badge.create({
-    id: 3,
-    name: "A Badge",
-    enabled: true,
-    manually_grantable: true,
-  });
-  const badgeMiddle = Badge.create({
-    id: 1,
-    name: "My Badge",
-    enabled: true,
-    manually_grantable: true,
-  });
-  const badgeLast = Badge.create({
-    id: 2,
-    name: "Zoo Badge",
-    enabled: true,
-    manually_grantable: true,
-  });
-  const badgeDisabled = Badge.create({
-    id: 4,
-    name: "Disabled Badge",
-    enabled: false,
-    manually_grantable: true,
-  });
-  const badgeAutomatic = Badge.create({
-    id: 5,
-    name: "Automatic Badge",
-    enabled: true,
-    manually_grantable: false,
-  });
-
-  const controller = this.subject({
-    model: [],
-    badges: [badgeLast, badgeFirst, badgeMiddle, badgeDisabled, badgeAutomatic],
-  });
-
-  const sortedNames = [badgeFirst.name, badgeMiddle.name, badgeLast.name];
-  const badgeNames = controller.get("grantableBadges").map(function (badge) {
-    return badge.name;
-  });
-
-  assert.not(badgeNames.includes(badgeDisabled), "excludes disabled badges");
-  assert.deepEqual(badgeNames, sortedNames, "sorts badges by name");
-});
diff --git a/app/assets/javascripts/app-boot.js b/app/assets/javascripts/app-boot.js
index 95ec3c3cb7..8989827165 100644
--- a/app/assets/javascripts/app-boot.js
+++ b/app/assets/javascripts/app-boot.js
@@ -4,6 +4,7 @@
   if (window.unsupportedBrowser) {
     throw "Unsupported browser detected";
   }
+
   let Discourse = requirejs("discourse/app").default.create();
 
   // required for our template compiler
@@ -11,7 +12,7 @@
     "discourse-common/lib/raw-templates"
   ).__DISCOURSE_RAW_TEMPLATES;
 
-  // required for select kit to work without Ember CLI
+  // required for addons to work without Ember CLI
   Object.keys(Ember.TEMPLATES).forEach((k) => {
     if (k.indexOf("select-kit") === 0) {
       let template = Ember.TEMPLATES[k];
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 8adedfd9c9..a42435af3a 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,3 +1,4 @@
+//= require_tree ./truth-helpers/addon
 //= require_tree ./discourse-common/addon
 //= require ./polyfills
 //= require_tree ./select-kit/addon
diff --git a/app/assets/javascripts/browser-update.js b/app/assets/javascripts/browser-update.js
index cd2f60430b..07b5c9b5f4 100644
--- a/app/assets/javascripts/browser-update.js
+++ b/app/assets/javascripts/browser-update.js
@@ -1,6 +1,8 @@
 //browser-update.org notification script, <browser-update.org>
 //Copyright (c) 2007-2009, MIT Style License <browser-update.org/LICENSE.txt>
 
+/* eslint-disable no-var */
+
 (function () {
   var $buo = function () {
     // Sometimes we have to resort to parsing the user agent string. :(
diff --git a/app/assets/javascripts/discourse-common/addon/config/environment.js b/app/assets/javascripts/discourse-common/addon/config/environment.js
index b580231ee7..d2a47b1247 100644
--- a/app/assets/javascripts/discourse-common/addon/config/environment.js
+++ b/app/assets/javascripts/discourse-common/addon/config/environment.js
@@ -11,7 +11,13 @@ export function setEnvironment(e) {
 }
 
 export function isTesting() {
-  return Ember.testing;
+  return Ember.testing || environment === "testing";
+}
+
+// Generally means "before we migrated to Ember CLI"
+let _isLegacy = Ember.VERSION.startsWith("3.12");
+export function isLegacyEmber() {
+  return _isLegacy;
 }
 
 export function isDevelopment() {
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 9d4e387df6..ec759798b2 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,6 @@
+import { htmlSafe } from "@ember/template";
 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 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 04d701153b..7df981e96f 100644
--- a/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js
+++ b/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js
@@ -1,7 +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";
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { renderIcon } from "discourse-common/lib/icon-library";
 
 export function iconHTML(id, params) {
   return renderIcon("string", id, params);
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 e1821eeea2..14d907ec36 100644
--- a/app/assets/javascripts/discourse-common/addon/helpers/get-url.js
+++ b/app/assets/javascripts/discourse-common/addon/helpers/get-url.js
@@ -1,6 +1,6 @@
-import { registerUnbound } from "discourse-common/lib/helpers";
-import getUrl from "discourse-common/lib/get-url";
 import deprecated from "discourse-common/lib/deprecated";
+import getUrl from "discourse-common/lib/get-url";
+import { registerUnbound } from "discourse-common/lib/helpers";
 
 registerUnbound("get-url", (value) => getUrl(value));
 registerUnbound("base-url", () => {
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/html-safe.js b/app/assets/javascripts/discourse-common/addon/helpers/html-safe.js
index 355dbfb35a..11809ba8b8 100644
--- a/app/assets/javascripts/discourse-common/addon/helpers/html-safe.js
+++ b/app/assets/javascripts/discourse-common/addon/helpers/html-safe.js
@@ -1,5 +1,5 @@
-import { registerUnbound } from "discourse-common/lib/helpers";
 import { htmlSafe } from "@ember/template";
+import { registerUnbound } from "discourse-common/lib/helpers";
 
 registerUnbound("html-safe", function (string) {
   return htmlSafe(string);
diff --git a/app/assets/javascripts/discourse-common/addon/lib/attribute-hook.js b/app/assets/javascripts/discourse-common/addon/lib/attribute-hook.js
index 07bda95a9e..d60b94eaf7 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/attribute-hook.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/attribute-hook.js
@@ -32,8 +32,8 @@ AttributeHook.prototype.unhook = function (node, prop, next) {
     return;
   }
 
-  var colonPosition = prop.indexOf(":");
-  var localName = colonPosition > -1 ? prop.substr(colonPosition + 1) : prop;
+  let colonPosition = prop.indexOf(":");
+  let localName = colonPosition > -1 ? prop.substr(colonPosition + 1) : prop;
   node.removeAttributeNS(this.namespace, localName);
 };
 
diff --git a/app/assets/javascripts/discourse-common/addon/lib/debounce.js b/app/assets/javascripts/discourse-common/addon/lib/debounce.js
new file mode 100644
index 0000000000..5e30864574
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/addon/lib/debounce.js
@@ -0,0 +1,18 @@
+import { debounce, next, run } from "@ember/runloop";
+import { isLegacyEmber, isTesting } from "discourse-common/config/environment";
+
+/**
+  Debounce a Javascript function. This means if it's called many times in a time limit it
+  should only be executed once (at the end of the limit counted from the last call made).
+  Original function will be called with the context and arguments from the last call made.
+**/
+
+let testingFunc = isLegacyEmber() ? run : next;
+
+export default function () {
+  if (isTesting()) {
+    return testingFunc(...arguments);
+  } else {
+    return debounce(...arguments);
+  }
+}
diff --git a/app/assets/javascripts/discourse-common/addon/lib/escape.js b/app/assets/javascripts/discourse-common/addon/lib/escape.js
new file mode 100644
index 0000000000..6b7da6a67f
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/addon/lib/escape.js
@@ -0,0 +1,32 @@
+const ESCAPE_REPLACEMENTS = {
+  "&": "&amp;",
+  "<": "&lt;",
+  ">": "&gt;",
+  '"': "&quot;",
+  "'": "&#x27;",
+  "`": "&#x60;",
+};
+const BAD_CHARS = /[&<>"'`]/g;
+const POSSIBLE_CHARS = /[&<>"'`]/;
+
+function escapeChar(chr) {
+  return ESCAPE_REPLACEMENTS[chr];
+}
+
+export default function escape(string) {
+  if (string === null) {
+    return "";
+  } else if (!string) {
+    return string + "";
+  }
+
+  // Force a string conversion as this will be done by the append regardless and
+  // the regex test will do this transparently behind the scenes, causing issues if
+  // an object's to string has escaped characters in it.
+  string = "" + string;
+
+  if (!POSSIBLE_CHARS.test(string)) {
+    return string;
+  }
+  return string.replace(BAD_CHARS, escapeChar);
+}
diff --git a/app/assets/javascripts/discourse-common/addon/lib/get-owner.js b/app/assets/javascripts/discourse-common/addon/lib/get-owner.js
index f26a3bd758..94a12c2358 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/get-owner.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/get-owner.js
@@ -1,5 +1,5 @@
-import deprecated from "discourse-common/lib/deprecated";
 import { getOwner as emberGetOwner, setOwner } from "@ember/application";
+import deprecated from "discourse-common/lib/deprecated";
 
 let _default = {};
 
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 1981a38bfb..9eddfa6fee 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/get-url.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/get-url.js
@@ -1,9 +1,9 @@
-let cdn, baseUrl, baseUri;
+let cdn, baseUrl, baseUri, baseUriMatcher;
 let S3BaseUrl, S3CDN;
 
 export default function getURL(url) {
   if (baseUri === undefined) {
-    baseUri = $('meta[name="discourse-base-uri"]').attr("content") || "";
+    setPrefix($('meta[name="discourse-base-uri"]').attr("content") || "");
   }
 
   if (!url) {
@@ -15,9 +15,9 @@ export default function getURL(url) {
     return url;
   }
 
-  const found = url.indexOf(baseUri);
+  const found = baseUriMatcher.test(url);
 
-  if (found >= 0 && found < 3) {
+  if (found) {
     return url;
   }
   if (url[0] !== "/") {
@@ -47,18 +47,22 @@ export function isAbsoluteURL(url) {
 }
 
 export function withoutPrefix(path) {
-  const rootURL = (!baseUri ? "/" : baseUri).replace(/\/$/, "");
-  return path.replace(rootURL, "");
+  if (!baseUri) {
+    return path;
+  } else {
+    return path.replace(baseUriMatcher, "$1");
+  }
 }
 
 export function setPrefix(configBaseUri) {
   baseUri = configBaseUri;
+  baseUriMatcher = new RegExp(`^${baseUri}(/|$)`);
 }
 
 export function setupURL(configCdn, configBaseUrl, configBaseUri) {
   cdn = configCdn;
   baseUrl = configBaseUrl;
-  baseUri = configBaseUri;
+  setPrefix(configBaseUri);
 }
 
 export function setupS3CDN(configS3BaseUrl, configS3CDN) {
diff --git a/app/assets/javascripts/discourse-common/addon/lib/helpers.js b/app/assets/javascripts/discourse-common/addon/lib/helpers.js
index 76de9ae2f4..a2014653c8 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/helpers.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/helpers.js
@@ -1,6 +1,6 @@
-import { get } from "@ember/object";
 import Helper from "@ember/component/helper";
 import RawHandlebars from "discourse-common/lib/raw-handlebars";
+import { get } from "@ember/object";
 import { htmlSafe } from "@ember/template";
 
 export function makeArray(obj) {
@@ -22,7 +22,7 @@ const _helpers = {};
 
 function rawGet(ctx, property, options) {
   if (options.types && options.data.view) {
-    var view = options.data.view;
+    let view = options.data.view;
     return view.getStream
       ? view.getStream(property).value()
       : view.getAttr(property);
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 38d13285a8..8a01d633f0 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
@@ -1,7 +1,8 @@
 import I18n from "I18n";
-import { h } from "virtual-dom";
 import attributeHook from "discourse-common/lib/attribute-hook";
+import { h } from "virtual-dom";
 import { isDevelopment } from "discourse-common/config/environment";
+import escape from "discourse-common/lib/escape";
 
 const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
 let _renderers = [];
@@ -140,25 +141,24 @@ registerIconRenderer({
   name: "font-awesome",
 
   string(icon, params) {
-    const id = handleIconId(icon);
-    let html = `<svg class='${iconClasses(icon, params)} svg-string'`;
+    const id = escape(handleIconId(icon));
+    let html = `<svg class='${escape(iconClasses(icon, params))} svg-string'`;
 
     if (params.label) {
       html += " aria-hidden='true'";
     }
     html += ` xmlns="${SVG_NAMESPACE}"><use xlink:href="#${id}" /></svg>`;
     if (params.label) {
-      html += `<span class='sr-only'>${params.label}</span>`;
+      html += `<span class='sr-only'>${escape(params.label)}</span>`;
     }
     if (params.title) {
-      html = `<span class="svg-icon-title" title='${I18n.t(
-        params.title
-      ).replace(/'/g, "&#39;")}'>${html}</span>`;
+      html = `<span class="svg-icon-title" title='${escape(
+        I18n.t(params.title)
+      )}'>${html}</span>`;
     }
     if (params.translatedtitle) {
-      html = `<span class="svg-icon-title" title='${params.translatedtitle.replace(
-        /'/g,
-        "&#39;"
+      html = `<span class="svg-icon-title" title='${escape(
+        params.translatedtitle
       )}'>${html}</span>`;
     }
     return html;
@@ -176,7 +176,10 @@ registerIconRenderer({
       },
       [
         h("use", {
-          "xlink:href": attributeHook("http://www.w3.org/1999/xlink", `#${id}`),
+          "xlink:href": attributeHook(
+            "http://www.w3.org/1999/xlink",
+            `#${escape(id)}`
+          ),
           namespace: SVG_NAMESPACE,
         }),
       ]
diff --git a/app/assets/javascripts/discourse-common/addon/lib/object.js b/app/assets/javascripts/discourse-common/addon/lib/object.js
index 4fe99d96b8..294235b1ce 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/object.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/object.js
@@ -47,7 +47,7 @@ export function deepEqual(obj1, obj2) {
     if (Object.keys(obj1).length !== Object.keys(obj2).length) {
       return false;
     }
-    for (var prop in obj1) {
+    for (let prop in obj1) {
       if (!deepEqual(obj1[prop], obj2[prop])) {
         return false;
       }
diff --git a/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js
index 6f6a386101..c992c51b51 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js
@@ -8,6 +8,10 @@ export function registerRawHelpers(hbs, handlebarsClass) {
   if (!hbs.helpers) {
     hbs.helpers = Object.create(handlebarsClass.helpers);
   }
+  if (hbs.__helpers_registered) {
+    return;
+  }
+  hbs.__helpers_registered = true;
 
   hbs.helpers["get"] = function (context, options) {
     if (!context || !options.contexts) {
@@ -29,24 +33,22 @@ export function registerRawHelpers(hbs, handlebarsClass) {
   };
 
   // #each .. in support (as format is transformed to this)
-  hbs.registerHelper("each", function (
-    localName,
-    inKeyword,
-    contextName,
-    options
-  ) {
-    if (typeof contextName === "undefined") {
-      return;
+  hbs.registerHelper(
+    "each",
+    function (localName, inKeyword, contextName, options) {
+      if (typeof contextName === "undefined") {
+        return;
+      }
+      let list = get(this, contextName);
+      let output = [];
+      for (let i = 0; i < list.length; i++) {
+        let innerContext = {};
+        innerContext[localName] = list[i];
+        output.push(options.fn(innerContext));
+      }
+      return output.join("");
     }
-    var list = get(this, contextName);
-    var output = [];
-    var innerContext = Object.create(this);
-    for (var i = 0; i < list.length; i++) {
-      innerContext[localName] = list[i];
-      output.push(options.fn(innerContext));
-    }
-    return output.join("");
-  });
+  );
 
   function stringCompatHelper(fn) {
     const old = hbs.helpers[fn];
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 d2d3149c79..f49e427317 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js
@@ -6,7 +6,7 @@ import Handlebars from "handlebars";
 const RawHandlebars = Handlebars.create();
 
 function buildPath(blk, args) {
-  var result = {
+  let result = {
     type: "PathExpression",
     data: false,
     depth: blk.path.depth,
@@ -22,7 +22,7 @@ function buildPath(blk, args) {
 }
 
 function replaceGet(ast) {
-  var visitor = new Handlebars.Visitor();
+  let visitor = new Handlebars.Visitor();
   visitor.mutating = true;
 
   visitor.MustacheStatement = function (mustache) {
@@ -42,7 +42,7 @@ function replaceGet(ast) {
   // This allows us to use the same syntax in all templates
   visitor.BlockStatement = function (block) {
     if (block.path.original === "each" && block.params.length === 1) {
-      var paramName = block.program.blockParams[0];
+      let paramName = block.program.blockParams[0];
       block.params = [
         buildPath(block, { original: paramName }),
         { type: "CommentStatement", value: "in" },
@@ -74,10 +74,10 @@ if (Handlebars.Compiler) {
   RawHandlebars.JavaScriptCompiler.prototype.namespace = "RawHandlebars";
 
   RawHandlebars.precompile = function (value, asObject) {
-    var ast = Handlebars.parse(value);
+    let ast = Handlebars.parse(value);
     replaceGet(ast);
 
-    var options = {
+    let options = {
       knownHelpers: {
         get: true,
       },
@@ -87,7 +87,7 @@ if (Handlebars.Compiler) {
 
     asObject = asObject === undefined ? true : asObject;
 
-    var environment = new RawHandlebars.Compiler().compile(ast, options);
+    let environment = new RawHandlebars.Compiler().compile(ast, options);
     return new RawHandlebars.JavaScriptCompiler().compile(
       environment,
       options,
@@ -97,20 +97,20 @@ if (Handlebars.Compiler) {
   };
 
   RawHandlebars.compile = function (string) {
-    var ast = Handlebars.parse(string);
+    let ast = Handlebars.parse(string);
     replaceGet(ast);
 
     // this forces us to rewrite helpers
-    var options = { data: true, stringParams: true };
-    var environment = new RawHandlebars.Compiler().compile(ast, options);
-    var templateSpec = new RawHandlebars.JavaScriptCompiler().compile(
+    let options = { data: true, stringParams: true };
+    let environment = new RawHandlebars.Compiler().compile(ast, options);
+    let templateSpec = new RawHandlebars.JavaScriptCompiler().compile(
       environment,
       options,
       undefined,
       true
     );
 
-    var t = RawHandlebars.template(templateSpec);
+    let t = RawHandlebars.template(templateSpec);
     t.isMethod = false;
 
     return t;
diff --git a/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js b/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js
index b39c9eca74..2b88dfc82b 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js
@@ -2,7 +2,11 @@ import { getResolverOption } from "discourse-common/resolver";
 
 export const __DISCOURSE_RAW_TEMPLATES = {};
 
-export function addRawTemplate(name, template) {
+export function addRawTemplate(name, template, opts = {}) {
+  // Core templates should never overwrite themes / plugins
+  if (opts.core && __DISCOURSE_RAW_TEMPLATES[name]) {
+    return;
+  }
   __DISCOURSE_RAW_TEMPLATES[name] = template;
 }
 
diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js
index 4fcc1966d1..057f173563 100644
--- a/app/assets/javascripts/discourse-common/addon/resolver.js
+++ b/app/assets/javascripts/discourse-common/addon/resolver.js
@@ -1,9 +1,9 @@
+import { classify, dasherize } from "@ember/string";
+import deprecated from "discourse-common/lib/deprecated";
 import { findHelper } from "discourse-common/lib/helpers";
 import { get } from "@ember/object";
-import deprecated from "discourse-common/lib/deprecated";
-import { classify, dasherize } from "@ember/string";
 
-const _options = {};
+let _options = {};
 
 export function setResolverOption(name, value) {
   _options[name] = value;
@@ -13,6 +13,10 @@ export function getResolverOption(name) {
   return _options[name];
 }
 
+export function clearResolverOptions() {
+  _options = {};
+}
+
 function parseName(fullName) {
   const nameParts = fullName.split(":");
   const type = nameParts[0];
@@ -105,12 +109,13 @@ export function buildResolver(baseName) {
         dashed = dasherize(suffix),
         moduleName = Object.keys(requirejs.entries).find(function (e) {
           return (
-            e.indexOf(suffix, e.length - suffix.length) !== -1 ||
-            e.indexOf(dashed, e.length - dashed.length) !== -1
+            e.indexOf("/templates/") === -1 &&
+            (e.indexOf(suffix, e.length - suffix.length) !== -1 ||
+              e.indexOf(dashed, e.length - dashed.length) !== -1)
           );
         });
 
-      var module;
+      let module;
       if (moduleName) {
         module = requirejs(moduleName, null, null, true /* force sync */);
         if (module && module["default"]) {
@@ -199,7 +204,7 @@ export function buildResolver(baseName) {
 
     findPluginMobileTemplate(parsedName) {
       if (_options.mobileView) {
-        var pluginParsedName = this.parseName(
+        let pluginParsedName = this.parseName(
           parsedName.fullName.replace(
             "template:",
             "template:javascripts/mobile/"
@@ -211,7 +216,7 @@ export function buildResolver(baseName) {
 
     findMobileTemplate(parsedName) {
       if (_options.mobileView) {
-        var mobileParsedName = this.parseName(
+        let mobileParsedName = this.parseName(
           parsedName.fullName.replace("template:", "template:mobile/")
         );
         return this.findTemplate(mobileParsedName);
@@ -240,15 +245,15 @@ export function buildResolver(baseName) {
     },
 
     findUnderscoredTemplate(parsedName) {
-      var decamelized = parsedName.fullNameWithoutType.decamelize();
-      var underscored = decamelized.replace(/\-/g, "_");
+      let decamelized = parsedName.fullNameWithoutType.decamelize();
+      let underscored = decamelized.replace(/\-/g, "_");
       return Ember.TEMPLATES[underscored];
     },
 
     // Try to find a template within a special admin namespace, e.g. adminEmail => admin/templates/email
     // (similar to how discourse lays out templates)
     findAdminTemplate(parsedName) {
-      var decamelized = parsedName.fullNameWithoutType.decamelize();
+      let decamelized = parsedName.fullNameWithoutType.decamelize();
       if (decamelized.indexOf("components") === 0) {
         let comPath = `admin/templates/${decamelized}`;
         const compTemplate =
diff --git a/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js b/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js
index 96692bb553..dd4299c700 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js
@@ -12,7 +12,7 @@ export default function decoratorAlias(fn, errorMessage) {
           configurable: desc.configurable,
           writable: desc.writable,
           initializer: function () {
-            var value = extractValue(desc);
+            let value = extractValue(desc);
             return fn.apply(null, params.concat(value));
           },
         };
diff --git a/app/assets/javascripts/discourse-common/addon/utils/decorators.js b/app/assets/javascripts/discourse-common/addon/utils/decorators.js
index 98742a8791..4fad373bf8 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/decorators.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/decorators.js
@@ -1,9 +1,9 @@
+import { bind as emberBind, next, schedule } from "@ember/runloop";
+import decoratorAlias from "discourse-common/utils/decorator-alias";
+import extractValue from "discourse-common/utils/extract-value";
 import handleDescriptor from "discourse-common/utils/handle-descriptor";
 import isDescriptor from "discourse-common/utils/is-descriptor";
-import 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, bind as emberBind } from "@ember/runloop";
 
 export default function discourseComputedDecorator(...params) {
   // determine if user called as @discourseComputed('blah', 'blah') or @discourseComputed
@@ -51,7 +51,7 @@ export function readOnly(target, name, desc) {
     enumerable: desc.enumerable,
     configurable: desc.configurable,
     initializer: function () {
-      var value = extractValue(desc);
+      let value = extractValue(desc);
       return value.readOnly();
     },
   };
diff --git a/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js b/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js
index f8ff22c817..3987adffa6 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js
@@ -10,7 +10,7 @@ export default function handleDescriptor(target, key, desc, params = []) {
       let computedDescriptor;
 
       if (desc.writable) {
-        var val = extractValue(desc);
+        let val = extractValue(desc);
         if (typeof val === "object") {
           let value = {};
           if (val.get) {
diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json
index 66ed9ceb7f..26b9d924a3 100644
--- a/app/assets/javascripts/discourse-common/package.json
+++ b/app/assets/javascripts/discourse-common/package.json
@@ -18,14 +18,15 @@
     "ember-cli-babel": "^7.13.0",
     "ember-cli-htmlbars": "^4.2.0",
     "ember-auto-import": "^1.5.3",
-    "handlebars": "^4.7.0"
+    "handlebars": "^4.7.0",
+    "truth-helpers": "^1.0.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-cli": "~3.15.2",
+    "ember-cli": "~3.25.3",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-eslint": "^5.1.0",
     "ember-cli-inject-live-reload": "^2.0.1",
diff --git a/app/assets/javascripts/discourse-hbr/addon/.gitkeep b/app/assets/javascripts/discourse-hbr/addon/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/discourse-hbr/app/.gitkeep b/app/assets/javascripts/discourse-hbr/app/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/discourse-hbr/config/ember-try.js b/app/assets/javascripts/discourse-hbr/config/ember-try.js
new file mode 100644
index 0000000000..454a1cef3e
--- /dev/null
+++ b/app/assets/javascripts/discourse-hbr/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-hbr/config/environment.js b/app/assets/javascripts/discourse-hbr/config/environment.js
new file mode 100644
index 0000000000..b7238585e6
--- /dev/null
+++ b/app/assets/javascripts/discourse-hbr/config/environment.js
@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = function (/* environment, appConfig */) {
+  return {};
+};
diff --git a/app/assets/javascripts/discourse-hbr/index.js b/app/assets/javascripts/discourse-hbr/index.js
new file mode 100644
index 0000000000..6747915863
--- /dev/null
+++ b/app/assets/javascripts/discourse-hbr/index.js
@@ -0,0 +1,11 @@
+"use strict";
+
+const rawHandlebarsCompiler = require("./raw-handlebars-compiler");
+
+module.exports = {
+  name: require("./package").name,
+
+  treeForApp() {
+    return rawHandlebarsCompiler(this.app.trees.app);
+  },
+};
diff --git a/app/assets/javascripts/discourse-hbr/package.json b/app/assets/javascripts/discourse-hbr/package.json
new file mode 100644
index 0000000000..217d246a57
--- /dev/null
+++ b/app/assets/javascripts/discourse-hbr/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "discourse-hbr",
+  "version": "1.0.0",
+  "description": "Support for Discourse's raw Handlebars templates (hbr)",
+  "author": "Discourse",
+  "license": "GPL-2.0-only",
+  "keywords": [
+    "ember-addon"
+  ],
+  "repository": "",
+  "scripts": {
+    "build": "ember build",
+    "lint:hbs": "ember-template-lint .",
+    "lint:js": "eslint .",
+    "start": "ember serve"
+  },
+  "dependencies": {
+    "ember-auto-import": "^1.5.3",
+    "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",
+    "broccoli-stew": "^3.0.0",
+    "ember-cli": "~3.25.3",
+    "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",
+    "handlebars": "^4.7.6",
+    "loader.js": "^4.7.0"
+  },
+  "engines": {
+    "node": "8.* || >= 10.*"
+  },
+  "ember": {
+    "edition": "octane"
+  }
+}
diff --git a/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js b/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js
new file mode 100644
index 0000000000..ff9b87a04a
--- /dev/null
+++ b/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js
@@ -0,0 +1,155 @@
+"use strict";
+
+const Filter = require("broccoli-filter");
+const Handlebars = require("handlebars");
+
+const RawHandlebars = Handlebars.create();
+
+function buildPath(blk, args) {
+  let result = {
+    type: "PathExpression",
+    data: false,
+    depth: blk.path.depth,
+    loc: blk.path.loc,
+  };
+
+  // Server side precompile doesn't have jquery.extend
+  Object.keys(args).forEach(function (a) {
+    result[a] = args[a];
+  });
+
+  return result;
+}
+
+function replaceGet(ast) {
+  let visitor = new Handlebars.Visitor();
+  visitor.mutating = true;
+
+  visitor.MustacheStatement = function (mustache) {
+    if (!(mustache.params.length || mustache.hash)) {
+      mustache.params[0] = mustache.path;
+      mustache.path = buildPath(mustache, {
+        parts: ["get"],
+        original: "get",
+        strict: true,
+        falsy: true,
+      });
+    }
+    return Handlebars.Visitor.prototype.MustacheStatement.call(this, mustache);
+  };
+
+  // rewrite `each x as |y|` as each y in x`
+  // This allows us to use the same syntax in all templates
+  visitor.BlockStatement = function (block) {
+    if (block.path.original === "each" && block.params.length === 1) {
+      let paramName = block.program.blockParams[0];
+      block.params = [
+        buildPath(block, { original: paramName }),
+        { type: "CommentStatement", value: "in" },
+        block.params[0],
+      ];
+      delete block.program.blockParams;
+    }
+
+    return Handlebars.Visitor.prototype.BlockStatement.call(this, block);
+  };
+
+  visitor.accept(ast);
+}
+
+RawHandlebars.Compiler = function () {};
+RawHandlebars.Compiler.prototype = Object.create(Handlebars.Compiler.prototype);
+RawHandlebars.Compiler.prototype.compiler = RawHandlebars.Compiler;
+
+RawHandlebars.JavaScriptCompiler = function () {};
+
+RawHandlebars.JavaScriptCompiler.prototype = Object.create(
+  Handlebars.JavaScriptCompiler.prototype
+);
+RawHandlebars.JavaScriptCompiler.prototype.compiler =
+  RawHandlebars.JavaScriptCompiler;
+RawHandlebars.JavaScriptCompiler.prototype.namespace = "RawHandlebars";
+
+RawHandlebars.precompile = function (value, asObject) {
+  let ast = Handlebars.parse(value);
+  replaceGet(ast);
+
+  let options = {
+    knownHelpers: {
+      get: true,
+    },
+    data: true,
+    stringParams: true,
+  };
+
+  asObject = asObject === undefined ? true : asObject;
+
+  let environment = new RawHandlebars.Compiler().compile(ast, options);
+  return new RawHandlebars.JavaScriptCompiler().compile(
+    environment,
+    options,
+    undefined,
+    asObject
+  );
+};
+
+RawHandlebars.compile = function (string) {
+  let ast = Handlebars.parse(string);
+  replaceGet(ast);
+
+  // this forces us to rewrite helpers
+  let options = { data: true, stringParams: true };
+  let environment = new RawHandlebars.Compiler().compile(ast, options);
+  let templateSpec = new RawHandlebars.JavaScriptCompiler().compile(
+    environment,
+    options,
+    undefined,
+    true
+  );
+
+  let t = RawHandlebars.template(templateSpec);
+  t.isMethod = false;
+
+  return t;
+};
+function TemplateCompiler(inputTree, options) {
+  if (!(this instanceof TemplateCompiler)) {
+    return new TemplateCompiler(inputTree, options);
+  }
+
+  Filter.call(this, inputTree, options); // this._super()
+
+  this.options = options || {};
+  this.inputTree = inputTree;
+}
+
+TemplateCompiler.prototype = Object.create(Filter.prototype);
+TemplateCompiler.prototype.constructor = TemplateCompiler;
+TemplateCompiler.prototype.extensions = ["hbr"];
+TemplateCompiler.prototype.targetExtension = "js";
+
+TemplateCompiler.prototype.registerPlugins = function registerPlugins() {};
+
+TemplateCompiler.prototype.initializeFeatures = function initializeFeatures() {};
+
+TemplateCompiler.prototype.processString = function (string, relativePath) {
+  let filename = relativePath.replace(/^templates\//, "").replace(/\.hbr$/, "");
+
+  return (
+    'import { template as compiler } from "discourse-common/lib/raw-handlebars";\n' +
+    'import { addRawTemplate } from "discourse-common/lib/raw-templates";\n\n' +
+    "let template = compiler(" +
+    this.precompile(string, false) +
+    ");\n\n" +
+    'addRawTemplate("' +
+    filename +
+    '", template, { core: true });\n' +
+    "export default template;"
+  );
+};
+
+TemplateCompiler.prototype.precompile = function (value, asObject) {
+  return RawHandlebars.precompile(value, asObject);
+};
+
+module.exports = TemplateCompiler;
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 7682617ce9..dff3d3d50a 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -112,16 +112,31 @@ var define, requirejs;
         isPresent: Ember.isPresent,
       },
       rsvp: {
+        asap: Ember.RSVP.asap,
+        all: Ember.RSVP.all,
+        allSettled: Ember.RSVP.allSettled,
+        race: Ember.RSVP.race,
+        hash: Ember.RSVP.hash,
+        hashSettled: Ember.RSVP.hashSettled,
+        rethrow: Ember.RSVP.rethrow,
+        defer: Ember.RSVP.defer,
+        denodeify: Ember.RSVP.denodeify,
+        resolve: Ember.RSVP.resolve,
+        reject: Ember.RSVP.reject,
+        map: Ember.RSVP.map,
+        filter: Ember.RSVP.filter,
         default: Ember.RSVP,
         Promise: Ember.RSVP.Promise,
-        hash: Ember.RSVP.hash,
-        all: Ember.RSVP.all,
+        EventTarget: Ember.RSVP.EventTarget,
       },
       "@ember/string": {
+        w: Ember.String.w,
         dasherize: Ember.String.dasherize,
+        decamelize: Ember.String.decamelize,
+        camelize: Ember.String.camelize,
         classify: Ember.String.classify,
         underscore: Ember.String.underscore,
-        camelize: Ember.String.camelize,
+        capitalize: Ember.String.capitalize,
       },
       "@ember/template": {
         htmlSafe: Ember.String.htmlSafe,
diff --git a/app/assets/javascripts/discourse-shims.js b/app/assets/javascripts/discourse-shims.js
index 384fb92af2..bf4765a13f 100644
--- a/app/assets/javascripts/discourse-shims.js
+++ b/app/assets/javascripts/discourse-shims.js
@@ -17,10 +17,19 @@ define("message-bus-client", ["exports"], function (__exports__) {
   __exports__.default = window.MessageBus;
 });
 
+define("mousetrap-global-bind", ["exports"], function (__exports__) {
+  // In the Rails app it's applied from the vendored file
+  __exports__.default = {};
+});
+
 define("ember-buffered-proxy/proxy", ["exports"], function (__exports__) {
   __exports__.default = window.BufferedProxy;
 });
 
+define("ember-buffered-proxy/mixin", ["exports"], function (__exports__) {
+  __exports__.default = null;
+});
+
 define("bootbox", ["exports"], function (__exports__) {
   __exports__.default = window.bootbox;
 });
diff --git a/app/assets/javascripts/discourse-widget-hbs/addon/.gitkeep b/app/assets/javascripts/discourse-widget-hbs/addon/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js b/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js
new file mode 100644
index 0000000000..3d4f077eb4
--- /dev/null
+++ b/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js
@@ -0,0 +1,11 @@
+import { avatarFor as avatar } from "discourse/widgets/post";
+import { dateNode } from "discourse/helpers/node";
+import { iconNode } from "discourse-common/lib/icon-library";
+import rawHtml from "discourse/widgets/raw-html";
+
+export default {
+  avatar,
+  dateNode,
+  iconNode,
+  rawHtml,
+};
diff --git a/app/assets/javascripts/discourse-widget-hbs/app/.gitkeep b/app/assets/javascripts/discourse-widget-hbs/app/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/discourse-widget-hbs/config/ember-try.js b/app/assets/javascripts/discourse-widget-hbs/config/ember-try.js
new file mode 100644
index 0000000000..454a1cef3e
--- /dev/null
+++ b/app/assets/javascripts/discourse-widget-hbs/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-widget-hbs/config/environment.js b/app/assets/javascripts/discourse-widget-hbs/config/environment.js
new file mode 100644
index 0000000000..b7238585e6
--- /dev/null
+++ b/app/assets/javascripts/discourse-widget-hbs/config/environment.js
@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = function (/* environment, appConfig */) {
+  return {};
+};
diff --git a/app/assets/javascripts/discourse-widget-hbs/index.js b/app/assets/javascripts/discourse-widget-hbs/index.js
new file mode 100644
index 0000000000..2372ea55a0
--- /dev/null
+++ b/app/assets/javascripts/discourse-widget-hbs/index.js
@@ -0,0 +1,30 @@
+"use strict";
+
+const WidgetHbsCompiler = require("../../../../lib/javascripts/widget-hbs-compiler")
+  .WidgetHbsCompiler;
+
+const glimmer = require("@glimmer/syntax");
+
+module.exports = {
+  name: require("./package").name,
+
+  included() {
+    this._super.included.apply(this, arguments);
+    let addonOptions = this._getAddonOptions();
+    addonOptions.babel = addonOptions.babel || {};
+    addonOptions.babel.plugins = addonOptions.babel.plugins || [];
+    let babelPlugins = addonOptions.babel.plugins;
+
+    WidgetHbsCompiler.cacheKey = () => "discourse-widget-hbs";
+    WidgetHbsCompiler.glimmer = glimmer;
+    babelPlugins.push(WidgetHbsCompiler);
+  },
+
+  _getAddonOptions() {
+    return (
+      (this.parent && this.parent.options) ||
+      (this.app && this.app.options) ||
+      {}
+    );
+  },
+};
diff --git a/app/assets/javascripts/discourse-widget-hbs/package.json b/app/assets/javascripts/discourse-widget-hbs/package.json
new file mode 100644
index 0000000000..8353998b5b
--- /dev/null
+++ b/app/assets/javascripts/discourse-widget-hbs/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "discourse-widget-hbs",
+  "version": "1.0.0",
+  "description": "Support for Discourse's inline `hbs` compiler for widgets",
+  "author": "Discourse",
+  "license": "GPL-2.0-only",
+  "keywords": [
+    "ember-addon"
+  ],
+  "repository": "",
+  "scripts": {
+    "build": "ember build",
+    "lint:hbs": "ember-template-lint .",
+    "lint:js": "eslint .",
+    "start": "ember serve"
+  },
+  "dependencies": {
+    "ember-auto-import": "^1.5.3",
+    "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",
+    "broccoli-stew": "^3.0.0",
+    "ember-cli": "~3.25.3",
+    "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",
+    "handlebars": "^4.7.6",
+    "loader.js": "^4.7.0"
+  },
+  "engines": {
+    "node": "8.* || >= 10.*"
+  },
+  "ember": {
+    "edition": "octane"
+  }
+}
diff --git a/app/assets/javascripts/discourse/.ember-cli b/app/assets/javascripts/discourse/.ember-cli
new file mode 100644
index 0000000000..ee64cfed2a
--- /dev/null
+++ b/app/assets/javascripts/discourse/.ember-cli
@@ -0,0 +1,9 @@
+{
+  /**
+    Ember CLI sends analytics information by default. The data is completely
+    anonymous, but there are times when you might want to disable this behavior.
+
+    Setting `disableAnalytics` to true will prevent any data from being sent.
+  */
+  "disableAnalytics": false
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/post-reply-history.js b/app/assets/javascripts/discourse/app/adapters/post-reply-history.js
index 0116f32744..e8d58d969a 100644
--- a/app/assets/javascripts/discourse/app/adapters/post-reply-history.js
+++ b/app/assets/javascripts/discourse/app/adapters/post-reply-history.js
@@ -1,5 +1,5 @@
-import { ajax } from "discourse/lib/ajax";
 import RestAdapter from "discourse/adapters/rest";
+import { ajax } from "discourse/lib/ajax";
 
 export default RestAdapter.extend({
   find(store, type, findArgs) {
diff --git a/app/assets/javascripts/discourse/app/adapters/post-reply.js b/app/assets/javascripts/discourse/app/adapters/post-reply.js
index 7f12465127..4d6871e2de 100644
--- a/app/assets/javascripts/discourse/app/adapters/post-reply.js
+++ b/app/assets/javascripts/discourse/app/adapters/post-reply.js
@@ -1,5 +1,5 @@
-import { ajax } from "discourse/lib/ajax";
 import RestAdapter from "discourse/adapters/rest";
+import { ajax } from "discourse/lib/ajax";
 
 export default RestAdapter.extend({
   find(store, type, findArgs) {
diff --git a/app/assets/javascripts/discourse/app/adapters/post.js b/app/assets/javascripts/discourse/app/adapters/post.js
index 4318cc0d07..3a203510f4 100644
--- a/app/assets/javascripts/discourse/app/adapters/post.js
+++ b/app/assets/javascripts/discourse/app/adapters/post.js
@@ -1,5 +1,5 @@
-import { ajax } from "discourse/lib/ajax";
 import RestAdapter, { Result } from "discourse/adapters/rest";
+import { ajax } from "discourse/lib/ajax";
 import { underscore } from "@ember/string";
 
 export default RestAdapter.extend({
diff --git a/app/assets/javascripts/discourse/app/adapters/topic-list.js b/app/assets/javascripts/discourse/app/adapters/topic-list.js
index cc36b230f5..fb6a0c80d5 100644
--- a/app/assets/javascripts/discourse/app/adapters/topic-list.js
+++ b/app/assets/javascripts/discourse/app/adapters/topic-list.js
@@ -1,7 +1,7 @@
-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";
+import RestAdapter from "discourse/adapters/rest";
+import { ajax } from "discourse/lib/ajax";
+import getURL from "discourse-common/lib/get-url";
 
 export function finderFor(filter, params) {
   return function () {
diff --git a/app/assets/javascripts/discourse/app/adapters/topic.js b/app/assets/javascripts/discourse/app/adapters/topic.js
index 5c22b1c17f..ee68791717 100644
--- a/app/assets/javascripts/discourse/app/adapters/topic.js
+++ b/app/assets/javascripts/discourse/app/adapters/topic.js
@@ -1,5 +1,5 @@
-import { ajax } from "discourse/lib/ajax";
 import RestAdapter from "discourse/adapters/rest";
+import { ajax } from "discourse/lib/ajax";
 
 export default RestAdapter.extend({
   find(store, type, findArgs) {
diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index e303100c63..ddcc134df9 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -1,8 +1,10 @@
 import Application from "@ember/application";
-import { buildResolver } from "discourse-common/resolver";
 import Mousetrap from "mousetrap";
+import { buildResolver } from "discourse-common/resolver";
+import { isTesting } from "discourse-common/config/environment";
 
 const _pluginCallbacks = [];
+let _themeErrors = [];
 
 const Discourse = Application.extend({
   rootElement: "#main",
@@ -19,14 +21,38 @@ const Discourse = Application.extend({
   Resolver: buildResolver("discourse"),
 
   _prepareInitializer(moduleName) {
-    const module = requirejs(moduleName, null, null, true);
-    if (!module) {
-      throw new Error(moduleName + " must export an initializer.");
+    const themeId = moduleThemeId(moduleName);
+    let module = null;
+
+    try {
+      module = requirejs(moduleName, null, null, true);
+
+      if (!module) {
+        throw new Error(moduleName + " must export an initializer.");
+      }
+    } catch (err) {
+      if (!themeId || isTesting()) {
+        throw err;
+      }
+      _themeErrors.push([themeId, err]);
+      fireThemeErrorEvent();
+      return;
     }
 
     const init = module.default;
     const oldInitialize = init.initialize;
-    init.initialize = () => oldInitialize.call(init, this.__container__, this);
+    init.initialize = (app) => {
+      try {
+        return oldInitialize.call(init, app.__container__, app);
+      } catch (err) {
+        if (!themeId || isTesting()) {
+          throw err;
+        }
+        _themeErrors.push([themeId, err]);
+        fireThemeErrorEvent();
+      }
+    };
+
     return init;
   },
 
@@ -36,9 +62,15 @@ const Discourse = Application.extend({
 
     Object.keys(requirejs._eak_seen).forEach((key) => {
       if (/\/pre\-initializers\//.test(key)) {
-        this.initializer(this._prepareInitializer(key));
+        const initializer = this._prepareInitializer(key);
+        if (initializer) {
+          this.initializer(initializer);
+        }
       } else if (/\/(api\-)?initializers\//.test(key)) {
-        this.instanceInitializer(this._prepareInitializer(key));
+        const initializer = this._prepareInitializer(key);
+        if (initializer) {
+          this.instanceInitializer(initializer);
+        }
       }
     });
 
@@ -59,4 +91,22 @@ const Discourse = Application.extend({
   },
 });
 
+function moduleThemeId(moduleName) {
+  const match = moduleName.match(/^discourse\/theme\-(\d+)\//);
+  if (match) {
+    return parseInt(match[1], 10);
+  }
+}
+
+function fireThemeErrorEvent() {
+  const event = new CustomEvent("discourse-theme-error");
+  document.dispatchEvent(event);
+}
+
+export function getAndClearThemeErrors() {
+  const copy = _themeErrors;
+  _themeErrors = [];
+  return copy;
+}
+
 export default Discourse;
diff --git a/app/assets/javascripts/discourse/app/components/about-page-users.js b/app/assets/javascripts/discourse/app/components/about-page-users.js
index 482daa80da..f0412f4f24 100644
--- a/app/assets/javascripts/discourse/app/components/about-page-users.js
+++ b/app/assets/javascripts/discourse/app/components/about-page-users.js
@@ -1,10 +1,10 @@
 import Component from "@ember/component";
-import { userPath } from "discourse/lib/url";
+import { computed } from "@ember/object";
 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";
+import { renderAvatar } from "discourse/helpers/user-avatar";
+import { userPath } from "discourse/lib/url";
 
 export default Component.extend({
   usersTemplates: computed("users.[]", function () {
diff --git a/app/assets/javascripts/discourse/app/components/activation-controls.js b/app/assets/javascripts/discourse/app/components/activation-controls.js
index 15d48468b0..99ed8d2b1b 100644
--- a/app/assets/javascripts/discourse/app/components/activation-controls.js
+++ b/app/assets/javascripts/discourse/app/components/activation-controls.js
@@ -1,4 +1,10 @@
 import Component from "@ember/component";
+import { or } from "@ember/object/computed";
+
 export default Component.extend({
   classNames: "activation-controls",
+  canEditEmail: or(
+    "siteSettings.enable_local_logins",
+    "siteSettings.email_editable"
+  ),
 });
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 5120b18735..8e8dd86683 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
@@ -1,6 +1,6 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "discourse-common/utils/decorators";
+import { scheduleOnce } from "@ember/runloop";
 
 export default Component.extend({
   _slug: null,
diff --git a/app/assets/javascripts/discourse/app/components/add-topic-status-classes.js b/app/assets/javascripts/discourse/app/components/add-topic-status-classes.js
new file mode 100644
index 0000000000..e445eae1ac
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/add-topic-status-classes.js
@@ -0,0 +1,50 @@
+import Component from "@ember/component";
+import { scheduleOnce } from "@ember/runloop";
+
+export default Component.extend({
+  tagName: "",
+
+  didInsertElement() {
+    this._super(...arguments);
+    this.refreshClass();
+  },
+
+  _updateClass() {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+    const body = document.getElementsByTagName("body")[0];
+
+    this._removeClass();
+
+    if (this.topic.invisible) {
+      body.classList.add("topic-status-unlisted");
+    }
+    if (this.topic.pinned) {
+      body.classList.add("topic-status-pinned");
+    }
+    if (this.topic.unpinned) {
+      body.classList.add("topic-status-unpinned");
+    }
+  },
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+    this.refreshClass();
+  },
+
+  refreshClass() {
+    scheduleOnce("afterRender", this, this._updateClass);
+  },
+
+  _removeClass() {
+    const regx = new RegExp(/\btopic-status-\S+/, "g");
+    const body = document.getElementsByTagName("body")[0];
+    body.className = body.className.replace(regx, "");
+  },
+
+  willDestroyElement() {
+    this._super(...arguments);
+    this._removeClass();
+  },
+});
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 131593ebc7..6c020a3d16 100644
--- a/app/assets/javascripts/discourse/app/components/auth-token-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/auth-token-dropdown.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
 import { computed } from "@ember/object";
 
 export default DropdownSelectBoxComponent.extend({
diff --git a/app/assets/javascripts/discourse/app/components/avatar-flair.js b/app/assets/javascripts/discourse/app/components/avatar-flair.js
index 7789e18bbf..8e6331d330 100644
--- a/app/assets/javascripts/discourse/app/components/avatar-flair.js
+++ b/app/assets/javascripts/discourse/app/components/avatar-flair.js
@@ -1,5 +1,5 @@
-import { observes } from "discourse-common/utils/decorators";
 import MountWidget from "discourse/components/mount-widget";
+import { observes } from "discourse-common/utils/decorators";
 
 export default MountWidget.extend({
   widget: "avatar-flair",
diff --git a/app/assets/javascripts/discourse/app/components/avatar-uploader.js b/app/assets/javascripts/discourse/app/components/avatar-uploader.js
index 4b59d96c47..0620aa0d9f 100644
--- a/app/assets/javascripts/discourse/app/components/avatar-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/avatar-uploader.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import UploadMixin from "discourse/mixins/upload";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend(UploadMixin, {
   type: "avatar",
diff --git a/app/assets/javascripts/discourse/app/components/backup-codes.js b/app/assets/javascripts/discourse/app/components/backup-codes.js
index 1b74cf1462..565f282174 100644
--- a/app/assets/javascripts/discourse/app/components/backup-codes.js
+++ b/app/assets/javascripts/discourse/app/components/backup-codes.js
@@ -1,16 +1,16 @@
-import discourseComputed from "discourse-common/utils/decorators";
+import { slugify, toAsciiPrintable } from "discourse/lib/utilities";
 import Component from "@ember/component";
-import { toAsciiPrintable, slugify } from "discourse/lib/utilities";
+import discourseComputed from "discourse-common/utils/decorators";
 
 // https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding
 function b64EncodeUnicode(str) {
   return btoa(
-    encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function toSolidBytes(
-      match,
-      p1
-    ) {
-      return String.fromCharCode("0x" + p1);
-    })
+    encodeURIComponent(str).replace(
+      /%([0-9A-F]{2})/g,
+      function toSolidBytes(match, p1) {
+        return String.fromCharCode("0x" + p1);
+      }
+    )
   );
 }
 
diff --git a/app/assets/javascripts/discourse/app/components/backup-uploader.js b/app/assets/javascripts/discourse/app/components/backup-uploader.js
index bc2f5ceb14..69e9ba6db0 100644
--- a/app/assets/javascripts/discourse/app/components/backup-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/backup-uploader.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
+import I18n from "I18n";
 import UploadMixin from "discourse/mixins/upload";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
 import { on } from "@ember/object/evented";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Component.extend(UploadMixin, {
   tagName: "span",
diff --git a/app/assets/javascripts/discourse/app/components/badge-button.js b/app/assets/javascripts/discourse/app/components/badge-button.js
index b9acaee6e3..26c378678d 100644
--- a/app/assets/javascripts/discourse/app/components/badge-button.js
+++ b/app/assets/javascripts/discourse/app/components/badge-button.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
+import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "span",
diff --git a/app/assets/javascripts/discourse/app/components/badge-card.js b/app/assets/javascripts/discourse/app/components/badge-card.js
index 60a25847b4..6e2a862c38 100644
--- a/app/assets/javascripts/discourse/app/components/badge-card.js
+++ b/app/assets/javascripts/discourse/app/components/badge-card.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
+import { emojiUnescape, sanitize } from "discourse/lib/text";
 import Component from "@ember/component";
-import { sanitize, emojiUnescape } from "discourse/lib/text";
+import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 
 export default Component.extend({
@@ -22,14 +22,13 @@ export default Component.extend({
     }
   },
 
-  @discourseComputed("size")
-  summary(size) {
+  @discourseComputed("size", "badge.long_description", "badge.description")
+  summary(size, longDescription, description) {
     if (size === "large") {
-      const longDescription = this.get("badge.long_description");
       if (!isEmpty(longDescription)) {
         return emojiUnescape(sanitize(longDescription));
       }
     }
-    return sanitize(this.get("badge.description"));
+    return sanitize(description);
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/badge-selector.js b/app/assets/javascripts/discourse/app/components/badge-selector.js
index bf97777dc1..b8530f1300 100644
--- a/app/assets/javascripts/discourse/app/components/badge-selector.js
+++ b/app/assets/javascripts/discourse/app/components/badge-selector.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
-import Component from "@ember/component";
 import discourseComputed, {
-  on,
   observes,
+  on,
 } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
+import I18n from "I18n";
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
 const { makeArray } = Ember;
 
diff --git a/app/assets/javascripts/discourse/app/components/badge-title.js b/app/assets/javascripts/discourse/app/components/badge-title.js
index 6034ce986b..0dbdd75722 100644
--- a/app/assets/javascripts/discourse/app/components/badge-title.js
+++ b/app/assets/javascripts/discourse/app/components/badge-title.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Component from "@ember/component";
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
 
diff --git a/app/assets/javascripts/discourse/app/components/basic-topic-list.js b/app/assets/javascripts/discourse/app/components/basic-topic-list.js
index f28d8bbbff..3343512568 100644
--- a/app/assets/javascripts/discourse/app/components/basic-topic-list.js
+++ b/app/assets/javascripts/discourse/app/components/basic-topic-list.js
@@ -1,5 +1,5 @@
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { alias, not } from "@ember/object/computed";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 
 export default Component.extend({
@@ -10,7 +10,7 @@ export default Component.extend({
 
   @discourseComputed("topicList.loaded")
   loaded() {
-    var topicList = this.topicList;
+    let topicList = this.topicList;
     if (topicList) {
       return topicList.get("loaded");
     } else {
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 21fe283f69..e039f4d5ae 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
@@ -1,6 +1,11 @@
-import I18n from "I18n";
-import { computed, action } from "@ember/object";
+import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
+
+const ACTION_REMOVE = "remove";
+const ACTION_EDIT = "edit";
+const ACTION_PIN = "pin";
 
 export default DropdownSelectBoxComponent.extend({
   classNames: ["bookmark-actions-dropdown"],
@@ -11,10 +16,11 @@ export default DropdownSelectBoxComponent.extend({
     showFullTitle: true,
   },
 
-  content: computed(() => {
+  @discourseComputed("bookmark")
+  content(bookmark) {
     return [
       {
-        id: "remove",
+        id: ACTION_REMOVE,
         icon: "trash-alt",
         name: I18n.t("post.bookmarks.actions.delete_bookmark.name"),
         description: I18n.t(
@@ -22,20 +28,32 @@ export default DropdownSelectBoxComponent.extend({
         ),
       },
       {
-        id: "edit",
+        id: ACTION_EDIT,
         icon: "pencil-alt",
         name: I18n.t("post.bookmarks.actions.edit_bookmark.name"),
         description: I18n.t("post.bookmarks.actions.edit_bookmark.description"),
       },
+      {
+        id: ACTION_PIN,
+        icon: "thumbtack",
+        name: I18n.t(
+          `post.bookmarks.actions.${bookmark.pinAction()}_bookmark.name`
+        ),
+        description: I18n.t(
+          `post.bookmarks.actions.${bookmark.pinAction()}_bookmark.description`
+        ),
+      },
     ];
-  }),
+  },
 
   @action
   onChange(selectedAction) {
-    if (selectedAction === "remove") {
+    if (selectedAction === ACTION_REMOVE) {
       this.removeBookmark(this.bookmark);
-    } else if (selectedAction === "edit") {
+    } else if (selectedAction === ACTION_EDIT) {
       this.editBookmark(this.bookmark);
+    } else if (selectedAction === ACTION_PIN) {
+      this.togglePinBookmark(this.bookmark);
     }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/bookmark-list.js b/app/assets/javascripts/discourse/app/components/bookmark-list.js
index 546b9bf5e3..30b7197c4c 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-list.js
+++ b/app/assets/javascripts/discourse/app/components/bookmark-list.js
@@ -1,13 +1,13 @@
-import Component from "@ember/component";
-import { Promise } from "rsvp";
-import I18n from "I18n";
-import { action } from "@ember/object";
-import showModal from "discourse/lib/show-modal";
 import {
-  shouldOpenInNewTab,
   openLinkInNewTab,
+  shouldOpenInNewTab,
 } from "discourse/lib/click-track";
+import Component from "@ember/component";
+import I18n from "I18n";
+import { Promise } from "rsvp";
+import { action } from "@ember/object";
 import bootbox from "bootbox";
+import showModal from "discourse/lib/show-modal";
 
 export default Component.extend({
   classNames: ["bookmark-list-wrapper"],
@@ -61,7 +61,12 @@ export default Component.extend({
       title: "post.bookmarks.edit",
       modalClass: "bookmark-with-reminder",
     });
-    controller.set("afterSave", () => this.reload());
+    controller.set("afterSave", this.reload);
+  },
+
+  @action
+  togglePinBookmark(bookmark) {
+    bookmark.togglePin().then(this.reload);
   },
 
   _removeBookmarkFromList(bookmark) {
diff --git a/app/assets/javascripts/discourse/app/components/bookmark.js b/app/assets/javascripts/discourse/app/components/bookmark.js
new file mode 100644
index 0000000000..ccd790e526
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/bookmark.js
@@ -0,0 +1,428 @@
+import {
+  LATER_TODAY_CUTOFF_HOUR,
+  MOMENT_THURSDAY,
+  laterToday,
+  now,
+  parseCustomDatetime,
+  startOfDay,
+  tomorrow,
+} from "discourse/lib/time-utils";
+import { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";
+import Component from "@ember/component";
+import I18n from "I18n";
+import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
+import Mousetrap from "mousetrap";
+import { Promise } from "rsvp";
+import { TIME_SHORTCUT_TYPES } from "discourse/lib/time-shortcut";
+import { action } from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
+import bootbox from "bootbox";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
+import { formattedReminderTime } from "discourse/lib/bookmark";
+import { and, notEmpty } from "@ember/object/computed";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { later } from "@ember/runloop";
+
+const BOOKMARK_BINDINGS = {
+  enter: { handler: "saveAndClose" },
+  "d d": { handler: "delete" },
+};
+
+export default Component.extend({
+  tagName: "",
+
+  errorMessage: null,
+  selectedReminderType: null,
+  _closeWithoutSaving: null,
+  _savingBookmarkManually: null,
+  _saving: null,
+  _deleting: null,
+  postDetectedLocalDate: null,
+  postDetectedLocalTime: null,
+  postDetectedLocalTimezone: null,
+  prefilledDatetime: null,
+  userTimezone: null,
+  showOptions: null,
+  model: null,
+
+  afterSave: null,
+
+  @on("init")
+  _setup() {
+    this.setProperties({
+      errorMessage: null,
+      selectedReminderType: TIME_SHORTCUT_TYPES.NONE,
+      _closeWithoutSaving: false,
+      _savingBookmarkManually: false,
+      _saving: false,
+      _deleting: false,
+      postDetectedLocalDate: null,
+      postDetectedLocalTime: null,
+      postDetectedLocalTimezone: null,
+      prefilledDatetime: null,
+      userTimezone: this.currentUser.resolvedTimezone(this.currentUser),
+      showOptions: false,
+    });
+
+    this.registerOnCloseHandler(this._onModalClose.bind(this));
+
+    this._loadBookmarkOptions();
+    this._bindKeyboardShortcuts();
+
+    if (this.editingExistingBookmark) {
+      this._initializeExistingBookmarkData();
+    }
+
+    this._loadPostLocalDates();
+  },
+
+  @on("didInsertElement")
+  _prepareUI() {
+    later(() => {
+      if (this.site.isMobileDevice) {
+        document.getElementById("bookmark-name").blur();
+      }
+    });
+
+    // we want to make sure the options panel opens so the user
+    // knows they have set these options previously.
+    if (this.autoDeletePreference) {
+      this.toggleOptionsPanel();
+    }
+  },
+
+  _initializeExistingBookmarkData() {
+    if (this.existingBookmarkHasReminder) {
+      this.set("prefilledDatetime", this.model.reminderAt);
+
+      let parsedDatetime = parseCustomDatetime(
+        this.prefilledDatetime,
+        null,
+        this.userTimezone
+      );
+
+      this.set("selectedDatetime", parsedDatetime);
+    }
+  },
+
+  _loadBookmarkOptions() {
+    this.set(
+      "autoDeletePreference",
+      this.model.autoDeletePreference || this._preferredDeleteOption() || 0
+    );
+  },
+
+  _preferredDeleteOption() {
+    let preferred = localStorage.bookmarkDeleteOption;
+    if (preferred && preferred !== "") {
+      preferred = parseInt(preferred, 10);
+    }
+    return preferred;
+  },
+
+  _bindKeyboardShortcuts() {
+    KeyboardShortcuts.pause();
+
+    this._mousetrap = new Mousetrap();
+    Object.keys(BOOKMARK_BINDINGS).forEach((shortcut) => {
+      this._mousetrap.bind(shortcut, () => {
+        let binding = BOOKMARK_BINDINGS[shortcut];
+        this.send(binding.handler);
+        return false;
+      });
+    });
+  },
+
+  _loadPostLocalDates() {
+    let postEl = document.querySelector(
+      `[data-post-id="${this.model.postId}"]`
+    );
+    let localDateEl;
+    if (postEl) {
+      localDateEl = postEl.querySelector(".discourse-local-date");
+    }
+
+    if (localDateEl) {
+      this.setProperties({
+        postDetectedLocalDate: localDateEl.dataset.date,
+        postDetectedLocalTime: localDateEl.dataset.time,
+        postDetectedLocalTimezone: localDateEl.dataset.timezone,
+      });
+    }
+  },
+
+  _saveBookmark() {
+    let reminderAt;
+    if (this.selectedReminderType) {
+      reminderAt = this.selectedDatetime;
+    }
+
+    const reminderAtISO = reminderAt ? reminderAt.toISOString() : null;
+
+    if (this.selectedReminderType === TIME_SHORTCUT_TYPES.CUSTOM) {
+      if (!reminderAt) {
+        return Promise.reject(I18n.t("bookmarks.invalid_custom_datetime"));
+      }
+    }
+
+    localStorage.bookmarkDeleteOption = this.autoDeletePreference;
+
+    let reminderType;
+    if (this.selectedReminderType === TIME_SHORTCUT_TYPES.NONE) {
+      reminderType = null;
+    } else if (
+      this.selectedReminderType === TIME_SHORTCUT_TYPES.LAST_CUSTOM ||
+      this.selectedReminderType === TIME_SHORTCUT_TYPES.POST_LOCAL_DATE
+    ) {
+      reminderType = TIME_SHORTCUT_TYPES.CUSTOM;
+    } else {
+      reminderType = this.selectedReminderType;
+    }
+
+    const data = {
+      reminder_type: reminderType,
+      reminder_at: reminderAtISO,
+      name: this.model.name,
+      post_id: this.model.postId,
+      id: this.model.id,
+      auto_delete_preference: this.autoDeletePreference,
+    };
+
+    if (this.editingExistingBookmark) {
+      return ajax(`/bookmarks/${this.model.id}`, {
+        type: "PUT",
+        data,
+      }).then((response) => {
+        this._executeAfterSave(response, reminderAtISO);
+      });
+    } else {
+      return ajax("/bookmarks", { type: "POST", data }).then((response) => {
+        this._executeAfterSave(response, reminderAtISO);
+      });
+    }
+  },
+
+  _executeAfterSave(response, reminderAtISO) {
+    if (!this.afterSave) {
+      return;
+    }
+    this.afterSave({
+      reminderAt: reminderAtISO,
+      reminderType: this.selectedReminderType,
+      autoDeletePreference: this.autoDeletePreference,
+      id: this.model.id || response.id,
+      name: this.model.name,
+    });
+  },
+
+  _deleteBookmark() {
+    return ajax("/bookmarks/" + this.model.id, {
+      type: "DELETE",
+    }).then((response) => {
+      if (this.afterDelete) {
+        this.afterDelete(response.topic_bookmarked);
+      }
+    });
+  },
+
+  _postLocalDate() {
+    let parsedPostLocalDate = parseCustomDatetime(
+      this.postDetectedLocalDate,
+      this.postDetectedLocalTime,
+      this.userTimezone,
+      this.postDetectedLocalTimezone
+    );
+
+    if (!this.postDetectedLocalTime) {
+      return startOfDay(parsedPostLocalDate);
+    }
+
+    return parsedPostLocalDate;
+  },
+
+  _handleSaveError(e) {
+    this._savingBookmarkManually = false;
+    if (typeof e === "string") {
+      bootbox.alert(e);
+    } else {
+      popupAjaxError(e);
+    }
+  },
+
+  _onModalClose(initiatedByCloseButton) {
+    // we want to close without saving if the user already saved
+    // manually or deleted the bookmark, as well as when the modal
+    // is just closed with the X button
+    this._closeWithoutSaving =
+      this._closeWithoutSaving || initiatedByCloseButton;
+
+    if (!this._closeWithoutSaving && !this._savingBookmarkManually) {
+      this._saveBookmark().catch((e) => this._handleSaveError(e));
+    }
+    if (this.onCloseWithoutSaving && this._closeWithoutSaving) {
+      this.onCloseWithoutSaving();
+    }
+  },
+
+  willDestroyElement() {
+    this._super(...arguments);
+    this._mousetrap.reset();
+    KeyboardShortcuts.unpause();
+  },
+
+  showExistingReminderAt: notEmpty("model.reminderAt"),
+  showDelete: notEmpty("model.id"),
+  userHasTimezoneSet: notEmpty("userTimezone"),
+  editingExistingBookmark: and("model", "model.id"),
+  existingBookmarkHasReminder: and("model", "model.reminderAt"),
+
+  @discourseComputed("postDetectedLocalDate", "postDetectedLocalTime")
+  showPostLocalDate(postDetectedLocalDate, postDetectedLocalTime) {
+    if (!postDetectedLocalTime || !postDetectedLocalDate) {
+      return;
+    }
+
+    let postLocalDateTime = this._postLocalDate();
+    if (postLocalDateTime < now(this.userTimezone)) {
+      return;
+    }
+
+    return true;
+  },
+
+  @discourseComputed()
+  autoDeletePreferences: () => {
+    return Object.keys(AUTO_DELETE_PREFERENCES).map((key) => {
+      return {
+        id: AUTO_DELETE_PREFERENCES[key],
+        name: I18n.t(`bookmarks.auto_delete_preference.${key.toLowerCase()}`),
+      };
+    });
+  },
+
+  @discourseComputed()
+  customTimeShortcutOptions() {
+    let customOptions = [];
+
+    if (this.showPostLocalDate) {
+      customOptions.push({
+        icon: "globe-americas",
+        id: TIME_SHORTCUT_TYPES.POST_LOCAL_DATE,
+        label: "bookmarks.reminders.post_local_date",
+        time: this._postLocalDate(),
+        timeFormatted: this._postLocalDate().format(
+          I18n.t("dates.long_no_year")
+        ),
+        hidden: false,
+      });
+    }
+
+    return customOptions;
+  },
+
+  @discourseComputed()
+  additionalTimeShortcutOptions() {
+    let additional = [];
+
+    if (
+      !laterToday(this.userTimezone).isSame(
+        tomorrow(this.userTimezone),
+        "date"
+      ) &&
+      now(this.userTimezone).hour() < LATER_TODAY_CUTOFF_HOUR
+    ) {
+      additional.push(TIME_SHORTCUT_TYPES.LATER_TODAY);
+    }
+
+    if (now(this.userTimezone).day() < MOMENT_THURSDAY) {
+      additional.push(TIME_SHORTCUT_TYPES.LATER_THIS_WEEK);
+    }
+
+    return additional;
+  },
+
+  @discourseComputed("model.reminderAt")
+  existingReminderAtFormatted(existingReminderAt) {
+    return formattedReminderTime(existingReminderAt, this.userTimezone);
+  },
+
+  @action
+  saveAndClose() {
+    if (this._saving || this._deleting) {
+      return;
+    }
+
+    this._saving = true;
+    this._savingBookmarkManually = true;
+    return this._saveBookmark()
+      .then(() => this.closeModal())
+      .catch((e) => this._handleSaveError(e))
+      .finally(() => (this._saving = false));
+  },
+
+  @action
+  toggleOptionsPanel() {
+    if (this.showOptions) {
+      $(".bookmark-options-panel").slideUp("fast");
+    } else {
+      $(".bookmark-options-panel").slideDown("fast");
+    }
+    this.toggleProperty("showOptions");
+  },
+
+  @action
+  delete() {
+    if (!this.model.id) {
+      return;
+    }
+
+    this._deleting = true;
+    let deleteAction = () => {
+      this._closeWithoutSaving = true;
+      this._deleteBookmark()
+        .then(() => {
+          this._deleting = false;
+          this.closeModal();
+        })
+        .catch((e) => this._handleSaveError(e));
+    };
+
+    if (this.existingBookmarkHasReminder) {
+      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), (result) => {
+        if (result) {
+          deleteAction();
+        }
+      });
+    } else {
+      deleteAction();
+    }
+  },
+
+  @action
+  closeWithoutSavingBookmark() {
+    this._closeWithoutSaving = true;
+    this.closeModal();
+  },
+
+  @action
+  onTimeSelected(type, time) {
+    this.setProperties({ selectedReminderType: type, selectedDatetime: time });
+
+    // if the type is custom, we need to wait for the user to click save, as
+    // they could still be adjusting the date and time
+    if (
+      ![TIME_SHORTCUT_TYPES.CUSTOM, TIME_SHORTCUT_TYPES.RELATIVE].includes(type)
+    ) {
+      return this.saveAndClose();
+    }
+  },
+
+  @action
+  selectPostLocalDate(date) {
+    this.setProperties({
+      selectedReminderType: this.reminderTypes.POST_LOCAL_DATE,
+      postLocalDate: date,
+    });
+    return this.saveAndClose();
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/components/bread-crumbs.js b/app/assets/javascripts/discourse/app/components/bread-crumbs.js
index eaff3112b7..a93c9e9a3b 100644
--- a/app/assets/javascripts/discourse/app/components/bread-crumbs.js
+++ b/app/assets/javascripts/discourse/app/components/bread-crumbs.js
@@ -1,7 +1,7 @@
-import { filter } from "@ember/object/computed";
 import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
 import deprecated from "discourse-common/lib/deprecated";
+import discourseComputed from "discourse-common/utils/decorators";
+import { filter } from "@ember/object/computed";
 
 //  A breadcrumb including category drop downs
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/bulk-select-all.js b/app/assets/javascripts/discourse/app/components/bulk-select-all.js
new file mode 100644
index 0000000000..63814b2e36
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/bulk-select-all.js
@@ -0,0 +1,7 @@
+import DButton from "discourse/components/d-button";
+
+export default DButton.extend({
+  click() {
+    $("input.bulk-select:not(checked)").click();
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/components/bulk-select-button.js b/app/assets/javascripts/discourse/app/components/bulk-select-button.js
index 80353b4317..9f46112d23 100644
--- a/app/assets/javascripts/discourse/app/components/bulk-select-button.js
+++ b/app/assets/javascripts/discourse/app/components/bulk-select-button.js
@@ -1,5 +1,5 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
+import { schedule } from "@ember/runloop";
 import showModal from "discourse/lib/show-modal";
 
 export default Component.extend({
@@ -9,13 +9,11 @@ export default Component.extend({
     this._super(...arguments);
 
     schedule("afterRender", () => {
-      let mainOutletPadding =
-        window.getComputedStyle(document.querySelector("#main-outlet"))
-          .paddingTop || 0;
+      let headerHeight =
+        document.querySelector(".d-header-wrap").offsetHeight || 0;
 
-      document.querySelector(
-        ".bulk-select-container"
-      ).style.top = mainOutletPadding;
+      document.querySelector(".bulk-select-container").style.top =
+        headerHeight + 20 + "px";
     });
   },
 
diff --git a/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js b/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js
index e7c48f4032..2fa8609125 100644
--- a/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js
+++ b/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "li",
diff --git a/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.js b/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.js
index e4399e8bfc..5aac7408ce 100644
--- a/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.js
+++ b/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.js
@@ -1,7 +1,7 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
+import { isEmpty } from "@ember/utils";
 
 export default Component.extend({
   tagName: "section",
diff --git a/app/assets/javascripts/discourse/app/components/categories-boxes.js b/app/assets/javascripts/discourse/app/components/categories-boxes.js
index 12be7c835d..25918dbc3a 100644
--- a/app/assets/javascripts/discourse/app/components/categories-boxes.js
+++ b/app/assets/javascripts/discourse/app/components/categories-boxes.js
@@ -1,7 +1,7 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
+import { isEmpty } from "@ember/utils";
 
 export default Component.extend({
   tagName: "section",
diff --git a/app/assets/javascripts/discourse/app/components/categories-only.js b/app/assets/javascripts/discourse/app/components/categories-only.js
index 9be4c383a5..002ddf82e3 100644
--- a/app/assets/javascripts/discourse/app/components/categories-only.js
+++ b/app/assets/javascripts/discourse/app/components/categories-only.js
@@ -1,7 +1,7 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
-import { action } from "@ember/object";
 
 export default Component.extend({
   tagName: "",
diff --git a/app/assets/javascripts/discourse/app/components/category-permission-row.js b/app/assets/javascripts/discourse/app/components/category-permission-row.js
index 881f33a9ba..7b745eb9ae 100644
--- a/app/assets/javascripts/discourse/app/components/category-permission-row.js
+++ b/app/assets/javascripts/discourse/app/components/category-permission-row.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
-import Component from "@ember/component";
+import { alias, equal } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
+import I18n from "I18n";
 import PermissionType from "discourse/models/permission-type";
-import { equal, alias } from "@ember/object/computed";
 
 const EVERYONE = "everyone";
 
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
index e299da8b54..d8371808f2 100644
--- a/app/assets/javascripts/discourse/app/components/category-read-only-banner.js
+++ b/app/assets/javascripts/discourse/app/components/category-read-only-banner.js
@@ -1,6 +1,6 @@
 import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
 import { and } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   @discourseComputed
diff --git a/app/assets/javascripts/discourse/app/components/cdn-img.js b/app/assets/javascripts/discourse/app/components/cdn-img.js
index 385a2c98bc..218ad3653d 100644
--- a/app/assets/javascripts/discourse/app/components/cdn-img.js
+++ b/app/assets/javascripts/discourse/app/components/cdn-img.js
@@ -1,6 +1,6 @@
-import { getURLWithCDN } from "discourse-common/lib/get-url";
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import { getURLWithCDN } from "discourse-common/lib/get-url";
 import { htmlSafe } from "@ember/template";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/choose-message.js b/app/assets/javascripts/discourse/app/components/choose-message.js
index 3665923f9e..09d9a9123c 100644
--- a/app/assets/javascripts/discourse/app/components/choose-message.js
+++ b/app/assets/javascripts/discourse/app/components/choose-message.js
@@ -1,10 +1,10 @@
+import Component from "@ember/component";
+import discourseDebounce from "discourse-common/lib/debounce";
 import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
-import Component from "@ember/component";
-import discourseDebounce from "discourse/lib/debounce";
-import { searchForTerm } from "discourse/lib/search";
 import { observes } from "discourse-common/utils/decorators";
+import { searchForTerm } from "discourse/lib/search";
 
 export default Component.extend({
   loading: null,
@@ -30,31 +30,38 @@ export default Component.extend({
     this.set("loading", false);
   },
 
-  search: discourseDebounce(function (title) {
-    const currentTopicId = this.currentTopicId;
+  search(title) {
+    discourseDebounce(
+      this,
+      function () {
+        const currentTopicId = this.currentTopicId;
 
-    if (isEmpty(title)) {
-      this.setProperties({ messages: null, loading: false });
-      return;
-    }
+        if (isEmpty(title)) {
+          this.setProperties({ messages: null, loading: false });
+          return;
+        }
 
-    searchForTerm(title, {
-      typeFilter: "private_messages",
-      searchForId: true,
-      restrictToArchetype: "private_message",
-    }).then((results) => {
-      if (results && results.posts && results.posts.length > 0) {
-        this.set(
-          "messages",
-          results.posts
-            .mapBy("topic")
-            .filter((t) => t.get("id") !== currentTopicId)
-        );
-      } else {
-        this.setProperties({ messages: null, loading: false });
-      }
-    });
-  }, 300),
+        searchForTerm(title, {
+          typeFilter: "private_messages",
+          searchForId: true,
+          restrictToArchetype: "private_message",
+        }).then((results) => {
+          if (results && results.posts && results.posts.length > 0) {
+            this.set(
+              "messages",
+              results.posts
+                .mapBy("topic")
+                .filter((t) => t.get("id") !== currentTopicId)
+            );
+          } else {
+            this.setProperties({ messages: null, loading: false });
+          }
+        });
+      },
+      title,
+      300
+    );
+  },
 
   actions: {
     chooseMessage(message) {
diff --git a/app/assets/javascripts/discourse/app/components/choose-topic.js b/app/assets/javascripts/discourse/app/components/choose-topic.js
index 84070125c2..6786c94106 100644
--- a/app/assets/javascripts/discourse/app/components/choose-topic.js
+++ b/app/assets/javascripts/discourse/app/components/choose-topic.js
@@ -1,9 +1,9 @@
-import { isEmpty } from "@ember/utils";
-import { next } from "@ember/runloop";
-import Component from "@ember/component";
-import discourseDebounce from "discourse/lib/debounce";
-import { searchForTerm } from "discourse/lib/search";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { isEmpty } from "@ember/utils";
+import { next, schedule } from "@ember/runloop";
+import { searchForTerm } from "discourse/lib/search";
 
 export default Component.extend({
   loading: null,
@@ -39,12 +39,33 @@ export default Component.extend({
     }
   },
 
+  didInsertElement() {
+    this._super(...arguments);
+    schedule("afterRender", () => {
+      $("#choose-topic-title").keydown((e) => {
+        if (e.keyCode === 13) {
+          return false;
+        }
+      });
+    });
+  },
+
+  willDestroyElement() {
+    this._super(...arguments);
+    $("#choose-topic-title").off("keydown");
+  },
+
   @observes("topicTitle")
   topicTitleChanged() {
+    if (this.oldTopicTitle === this.topicTitle) {
+      return;
+    }
+
     this.setProperties({
       loading: true,
       noResults: true,
       selectedTopicId: null,
+      oldTopicTitle: this.topicTitle,
     });
 
     this.search(this.topicTitle);
@@ -64,37 +85,49 @@ export default Component.extend({
     this.set("loading", false);
   },
 
-  search: discourseDebounce(function (title) {
-    if (!this.element || this.isDestroying || this.isDestroyed) {
-      return;
-    }
+  search(title) {
+    discourseDebounce(
+      this,
+      function () {
+        if (!this.element || this.isDestroying || this.isDestroyed) {
+          return;
+        }
 
-    if (isEmpty(title) && isEmpty(this.additionalFilters)) {
-      this.setProperties({ topics: null, loading: false });
-      return;
-    }
+        if (isEmpty(title) && isEmpty(this.additionalFilters)) {
+          this.setProperties({ topics: null, loading: false });
+          return;
+        }
 
-    const currentTopicId = this.currentTopicId;
-    const titleWithFilters = `${title} ${this.additionalFilters}`;
-    let searchParams = {};
+        const currentTopicId = this.currentTopicId;
+        const titleWithFilters = `${title} ${this.additionalFilters}`;
+        let searchParams = {};
 
-    if (!isEmpty(title)) {
-      searchParams.typeFilter = "topic";
-      searchParams.restrictToArchetype = "regular";
-      searchParams.searchForId = true;
-    }
+        if (!isEmpty(title)) {
+          searchParams.typeFilter = "topic";
+          searchParams.restrictToArchetype = "regular";
+          searchParams.searchForId = true;
+        }
 
-    searchForTerm(titleWithFilters, searchParams).then((results) => {
-      if (results && results.posts && results.posts.length > 0) {
-        this.set(
-          "topics",
-          results.posts.mapBy("topic").filter((t) => t.id !== currentTopicId)
-        );
-      } else {
-        this.setProperties({ topics: null, loading: false });
-      }
-    });
-  }, 300),
+        searchForTerm(titleWithFilters, searchParams).then((results) => {
+          if (results && results.posts && results.posts.length > 0) {
+            this.set(
+              "topics",
+              results.posts
+                .mapBy("topic")
+                .filter((t) => t.id !== currentTopicId)
+            );
+            if (this.topics.length === 1) {
+              this.send("chooseTopic", this.topics[0]);
+            }
+          } else {
+            this.setProperties({ topics: null, loading: false });
+          }
+        });
+      },
+      title,
+      300
+    );
+  },
 
   actions: {
     chooseTopic(topic) {
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 4d7c617e1a..96c26dddaa 100644
--- a/app/assets/javascripts/discourse/app/components/color-picker-choice.js
+++ b/app/assets/javascripts/discourse/app/components/color-picker-choice.js
@@ -1,6 +1,6 @@
+import Component from "@ember/component";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
 
 export default Component.extend({
   tagName: "button",
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 11ec4c28b3..851738c158 100644
--- a/app/assets/javascripts/discourse/app/components/composer-action-title.js
+++ b/app/assets/javascripts/discourse/app/components/composer-action-title.js
@@ -1,15 +1,15 @@
-import I18n from "I18n";
-import { alias } from "@ember/object/computed";
-import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
 import {
-  PRIVATE_MESSAGE,
-  CREATE_TOPIC,
   CREATE_SHARED_DRAFT,
-  REPLY,
+  CREATE_TOPIC,
   EDIT,
   EDIT_SHARED_DRAFT,
+  PRIVATE_MESSAGE,
+  REPLY,
 } from "discourse/models/composer";
+import Component from "@ember/component";
+import I18n from "I18n";
+import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
 const TITLES = {
diff --git a/app/assets/javascripts/discourse/app/components/composer-body.js b/app/assets/javascripts/discourse/app/components/composer-body.js
index b6b60aa5f3..0879ffef2f 100644
--- a/app/assets/javascripts/discourse/app/components/composer-body.js
+++ b/app/assets/javascripts/discourse/app/components/composer-body.js
@@ -1,19 +1,15 @@
-import {
-  run,
-  cancel,
-  schedule,
-  later,
-  debounce,
-  throttle,
-} from "@ember/runloop";
+import { cancel, later, run, schedule, throttle } from "@ember/runloop";
+import discourseComputed, {
+  bind,
+  observes,
+} from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Composer from "discourse/models/composer";
-import afterTransition from "discourse/lib/after-transition";
-import positioningWorkaround from "discourse/lib/safari-hacks";
-import { headerHeight } from "discourse/components/site-header";
 import KeyEnterEscape from "discourse/mixins/key-enter-escape";
-import { iOSWithVisualViewport } from "discourse/lib/utilities";
+import afterTransition from "discourse/lib/after-transition";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { headerHeight } from "discourse/components/site-header";
+import positioningWorkaround from "discourse/lib/safari-hacks";
 
 const START_EVENTS = "touchstart mousedown";
 const DRAG_EVENTS = "touchmove mousemove";
@@ -45,7 +41,7 @@ export default Component.extend(KeyEnterEscape, {
 
   @discourseComputed("composer.action")
   prefixedComposerAction(action) {
-    return `composer-action-${action}`;
+    return action ? `composer-action-${action}` : "";
   },
 
   @discourseComputed("currentUser.primary_group_name")
@@ -76,7 +72,7 @@ export default Component.extend(KeyEnterEscape, {
         return;
       }
 
-      debounce(this, this.debounceMove, 300);
+      discourseDebounce(this, this.debounceMove, 300);
     });
   },
 
@@ -118,6 +114,7 @@ export default Component.extend(KeyEnterEscape, {
 
     const performDrag = (event) => {
       $composer.trigger("div-resizing");
+      this.appEvents.trigger("composer:div-resizing");
       $composer.addClass("clear-transitions");
       const currentMousePos = mouseYPos(event);
       let size = origComposerSize + (lastMousePos - currentMousePos);
@@ -148,14 +145,16 @@ export default Component.extend(KeyEnterEscape, {
       lastMousePos = mouseYPos(event);
       $document.on(DRAG_EVENTS, throttledPerformDrag);
       $document.on(END_EVENTS, endDrag);
+      this.appEvents.trigger("composer:resize-started");
     });
 
-    if (iOSWithVisualViewport()) {
+    if (this._visualViewportResizing()) {
       this.viewportResize();
       window.visualViewport.addEventListener("resize", this.viewportResize);
     }
   },
 
+  @bind
   viewportResize() {
     const composerVH = window.visualViewport.height * 0.01,
       doc = document.documentElement;
@@ -163,26 +162,34 @@ export default Component.extend(KeyEnterEscape, {
     doc.style.setProperty("--composer-vh", `${composerVH}px`);
 
     const viewportWindowDiff =
-      window.innerHeight - window.visualViewport.height;
+      this.windowInnerHeight - window.visualViewport.height;
 
-    viewportWindowDiff
+    viewportWindowDiff > 0
       ? 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
+    doc.style.setProperty(
+      "--composer-ipad-padding",
+      `${viewportWindowDiff < 75 ? viewportWindowDiff : 0}px`
+    );
+  },
 
-    if (viewportWindowDiff < 75) {
-      doc.style.setProperty(
-        "--composer-ipad-padding",
-        `${viewportWindowDiff}px`
-      );
-    } else {
-      doc.style.setProperty("--composer-ipad-padding", "0px");
-    }
+  _visualViewportResizing() {
+    return (
+      (this.capabilities.isIpadOS || this.site.mobileView) &&
+      window.visualViewport !== undefined
+    );
   },
 
   didInsertElement() {
     this._super(...arguments);
+
+    if (this._visualViewportResizing()) {
+      this.set("windowInnerHeight", window.innerHeight);
+    }
+
     this.setupComposerResizeEvents();
 
     const resize = () => run(() => this.resize());
@@ -203,7 +210,7 @@ export default Component.extend(KeyEnterEscape, {
   willDestroyElement() {
     this._super(...arguments);
     this.appEvents.off("composer:resize", this, this.resize);
-    if (iOSWithVisualViewport()) {
+    if (this._visualViewportResizing()) {
       window.visualViewport.removeEventListener("resize", this.viewportResize);
     }
   },
diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index ed64d0f2c9..c1be68eda5 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -1,62 +1,79 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import { run, debounce, later, next, schedule, throttle } from "@ember/runloop";
-import Component from "@ember/component";
-import userSearch from "discourse/lib/user-search";
+import {
+  authorizesOneOrMoreImageExtensions,
+  displayErrorForUpload,
+  getUploadMarkdown,
+  validateUploadedFiles,
+} from "discourse/lib/uploads";
+import {
+  cacheShortUploadUrl,
+  resolveAllShortUrls,
+} from "pretty-text/upload-short-url";
+import {
+  caretPosition,
+  clipboardHelpers,
+  formatUsername,
+  inCodeBlock,
+  tinyAvatar,
+} from "discourse/lib/utilities";
 import discourseComputed, {
   observes,
   on,
 } from "discourse-common/utils/decorators";
 import {
-  linkSeenMentions,
-  fetchUnseenMentions,
-} from "discourse/lib/link-mentions";
-import {
-  linkSeenHashtags,
   fetchUnseenHashtags,
+  linkSeenHashtags,
 } from "discourse/lib/link-hashtags";
+import {
+  fetchUnseenMentions,
+  linkSeenMentions,
+} from "discourse/lib/link-mentions";
+import { later, next, run, schedule, throttle } from "@ember/runloop";
+import Component from "@ember/component";
 import Composer from "discourse/models/composer";
-import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
-import { findRawTemplate } from "discourse-common/lib/raw-templates";
-import { iconHTML } from "discourse-common/lib/icon-library";
-import {
-  tinyAvatar,
-  formatUsername,
-  clipboardHelpers,
-  caretPosition,
-  inCodeBlock,
-} from "discourse/lib/utilities";
-import putCursorAtEnd from "discourse/lib/put-cursor-at-end";
-import {
-  validateUploadedFiles,
-  authorizesOneOrMoreImageExtensions,
-  getUploadMarkdown,
-  displayErrorForUpload,
-} from "discourse/lib/uploads";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
-
-import {
-  cacheShortUploadUrl,
-  resolveAllShortUrls,
-} from "pretty-text/upload-short-url";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
+import getURL from "discourse-common/lib/get-url";
+import { iconHTML } from "discourse-common/lib/icon-library";
 import { isTesting } from "discourse-common/config/environment";
 import { loadOneboxes } from "discourse/lib/load-oneboxes";
+import putCursorAtEnd from "discourse/lib/put-cursor-at-end";
+import userSearch from "discourse/lib/user-search";
 
 const REBUILD_SCROLL_MAP_EVENTS = ["composer:resized", "composer:typed-reply"];
 
-const uploadHandlers = [];
+let uploadHandlers = [];
 export function addComposerUploadHandler(extensions, method) {
   uploadHandlers.push({
     extensions,
     method,
   });
 }
+export function cleanUpComposerUploadHandler() {
+  uploadHandlers = [];
+}
 
-const uploadMarkdownResolvers = [];
+let uploadProcessorQueue = [];
+let uploadProcessorActions = {};
+export function addComposerUploadProcessor(queueItem, actionItem) {
+  uploadProcessorQueue.push(queueItem);
+  Object.assign(uploadProcessorActions, actionItem);
+}
+export function cleanUpComposerUploadProcessor() {
+  uploadProcessorQueue = [];
+  uploadProcessorActions = {};
+}
+
+let uploadMarkdownResolvers = [];
 export function addComposerUploadMarkdownResolver(resolver) {
   uploadMarkdownResolvers.push(resolver);
 }
+export function cleanUpComposerUploadMarkdownResolver() {
+  uploadMarkdownResolvers = [];
+}
 
 export default Component.extend({
   classNameBindings: ["showToolbar:toolbar-visible", ":wmd-controls"],
@@ -73,7 +90,13 @@ export default Component.extend({
     const filename = uploadFilenamePlaceholder
       ? uploadFilenamePlaceholder
       : clipboard;
-    return `[${I18n.t("uploading_filename", { filename })}]() `;
+
+    let placeholder = `[${I18n.t("uploading_filename", { filename })}]()\n`;
+    if (!this._cursorIsOnEmptyLine()) {
+      placeholder = `\n${placeholder}`;
+    }
+
+    return placeholder;
   },
 
   @discourseComputed("composer.requiredCategoryMissing")
@@ -239,7 +262,9 @@ export default Component.extend({
     if (replyLength < 1) {
       reason = I18n.t("composer.error.post_missing");
     } else if (missingReplyCharacters > 0) {
-      reason = I18n.t("composer.error.post_length", { min: minimumPostLength });
+      reason = I18n.t("composer.error.post_length", {
+        count: minimumPostLength,
+      });
       const tl = this.get("currentUser.trust_level");
       if (tl === 0 || tl === 1) {
         reason +=
@@ -536,10 +561,14 @@ export default Component.extend({
 
   _warnMentionedGroups($preview) {
     schedule("afterRender", () => {
-      var found = this.warnedGroupMentions || [];
+      let found = this.warnedGroupMentions || [];
       $preview.find(".mention-group.notify").each((idx, e) => {
+        if (this._isInQuote(e)) {
+          return;
+        }
+
         const $e = $(e);
-        var name = $e.data("name");
+        let name = $e.data("name");
         if (found.indexOf(name) === -1) {
           this.groupsMentioned([
             {
@@ -622,12 +651,34 @@ export default Component.extend({
 
     const $element = $(this.element);
 
+    $.blueimp.fileupload.prototype.processActions = uploadProcessorActions;
+
     $element.fileupload({
       url: getURL(`/uploads.json?client_id=${this.messageBus.clientId}`),
       dataType: "json",
       pasteZone: $element,
+      processQueue: uploadProcessorQueue,
     });
 
+    $element
+      .on("fileuploadprocess", (e, data) => {
+        this.appEvents.trigger(
+          "composer:insert-text",
+          `[${I18n.t("processing_filename", {
+            filename: data.files[data.index].name,
+          })}]()\n`
+        );
+      })
+      .on("fileuploadprocessalways", (e, data) => {
+        this.appEvents.trigger(
+          "composer:replace-text",
+          `[${I18n.t("processing_filename", {
+            filename: data.files[data.index].name,
+          })}]()\n`,
+          ""
+        );
+      });
+
     $element.on("fileuploadpaste", (e) => {
       this._pasted = true;
 
@@ -858,6 +909,42 @@ export default Component.extend({
     this.send("togglePreview");
   },
 
+  _isInQuote(element) {
+    let parent = element.parentElement;
+    while (parent && !this._isPreviewRoot(parent)) {
+      if (this._isQuote(parent)) {
+        return true;
+      }
+
+      parent = parent.parentElement;
+    }
+
+    return false;
+  },
+
+  _isPreviewRoot(element) {
+    return (
+      element.tagName === "DIV" &&
+      element.classList.contains("d-editor-preview")
+    );
+  },
+
+  _isQuote(element) {
+    return element.tagName === "ASIDE" && element.classList.contains("quote");
+  },
+
+  _cursorIsOnEmptyLine() {
+    const textArea = this.element.querySelector(".d-editor-input");
+    const selectionStart = textArea.selectionStart;
+    if (selectionStart === 0) {
+      return true;
+    } else if (textArea.value.charAt(selectionStart - 1) === "\n") {
+      return true;
+    } else {
+      return false;
+    }
+  },
+
   actions: {
     importQuote(toolbarEvent) {
       this.importQuote(toolbarEvent);
@@ -905,7 +992,7 @@ export default Component.extend({
       // Paint mentions
       const unseenMentions = linkSeenMentions($preview, this.siteSettings);
       if (unseenMentions.length) {
-        debounce(
+        discourseDebounce(
           this,
           this._renderUnseenMentions,
           $preview,
@@ -920,7 +1007,7 @@ export default Component.extend({
       // Paint category and tag hashtags
       const unseenHashtags = linkSeenHashtags($preview);
       if (unseenHashtags.length > 0) {
-        debounce(this, this._renderUnseenHashtags, $preview, 450);
+        discourseDebounce(this, this._renderUnseenHashtags, $preview, 450);
       }
 
       // Paint oneboxes
@@ -947,7 +1034,7 @@ export default Component.extend({
         }
       };
 
-      debounce(this, paintFunc, 450);
+      discourseDebounce(this, paintFunc, 450);
 
       // Short upload urls need resolution
       resolveAllShortUrls(ajax, this.siteSettings, $preview[0]);
diff --git a/app/assets/javascripts/discourse/app/components/composer-message.js b/app/assets/javascripts/discourse/app/components/composer-message.js
index 21b68a0fae..2fd8055775 100644
--- a/app/assets/javascripts/discourse/app/components/composer-message.js
+++ b/app/assets/javascripts/discourse/app/components/composer-message.js
@@ -1,6 +1,6 @@
+import Component from "@ember/component";
 import deprecated from "discourse-common/lib/deprecated";
 import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
 import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.js b/app/assets/javascripts/discourse/app/components/composer-messages.js
index 3273da6b16..a2ae8b9e41 100644
--- a/app/assets/javascripts/discourse/app/components/composer-messages.js
+++ b/app/assets/javascripts/discourse/app/components/composer-messages.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
-import { not } from "@ember/object/computed";
-import EmberObject from "@ember/object";
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
 import LinkLookup from "discourse/lib/link-lookup";
+import { not } from "@ember/object/computed";
+import { scheduleOnce } from "@ember/runloop";
 
 let _messagesCache = {};
 
diff --git a/app/assets/javascripts/discourse/app/components/composer-title.js b/app/assets/javascripts/discourse/app/components/composer-title.js
index 06e132bae8..04979bfda2 100644
--- a/app/assets/javascripts/discourse/app/components/composer-title.js
+++ b/app/assets/javascripts/discourse/app/components/composer-title.js
@@ -1,13 +1,14 @@
-import I18n from "I18n";
 import { alias, or } from "@ember/object/computed";
-import { debounce, next, schedule } from "@ember/runloop";
-import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { next, schedule } from "@ember/runloop";
+import Component from "@ember/component";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { isTesting } from "discourse-common/config/environment";
 import { load } from "pretty-text/oneboxer";
 import { lookupCache } from "pretty-text/oneboxer-cache";
-import { ajax } from "discourse/lib/ajax";
-import { isTesting } from "discourse-common/config/environment";
-import EmberObject from "@ember/object";
 import putCursorAtEnd from "discourse/lib/put-cursor-at-end";
 
 export default Component.extend({
@@ -22,7 +23,7 @@ export default Component.extend({
     }
 
     if (this.get("composer.titleLength") > 0) {
-      debounce(this, this._titleChanged, 10);
+      discourseDebounce(this, this._titleChanged, 10);
     }
   },
 
@@ -43,11 +44,11 @@ export default Component.extend({
       reason = I18n.t("composer.error.title_missing");
     } else if (missingTitleChars > 0) {
       reason = I18n.t("composer.error.title_too_short", {
-        min: minimumTitleLength,
+        count: minimumTitleLength,
       });
     } else if (titleLength > this.siteSettings.max_topic_title_length) {
       reason = I18n.t("composer.error.title_too_long", {
-        max: this.siteSettings.max_topic_title_length,
+        count: this.siteSettings.max_topic_title_length,
       });
     }
 
@@ -83,7 +84,7 @@ export default Component.extend({
         this._checkForUrl()
       );
     } else {
-      debounce(this, this._checkForUrl, 500);
+      discourseDebounce(this, this._checkForUrl, 500);
     }
   },
 
@@ -148,20 +149,36 @@ export default Component.extend({
 
   _updatePost(html) {
     if (html) {
+      const frag = document.createRange().createContextualFragment(html),
+        composer = this.composer;
+
       this.set("autoPosted", true);
       this.set("composer.featuredLink", this.get("composer.title"));
 
-      const $h = $(html),
-        heading = $h.find("h3").length > 0 ? $h.find("h3") : $h.find("h4"),
-        composer = this.composer;
-
       composer.appendText(this.get("composer.title"), null, { block: true });
 
-      if (heading.length > 0 && heading.text().length > 0) {
-        this.changeTitle(heading.text());
+      if (frag.querySelector(".twitterstatus")) {
+        this.set("composer.title", "");
+        return;
+      }
+
+      const heading = frag.querySelector("h3, h4");
+
+      const title =
+        (heading && heading.textContent) ||
+        (frag.firstElementChild && frag.firstElementChild.title);
+
+      if (title) {
+        this.changeTitle(title);
       } else {
-        const firstTitle = $h.attr("title") || $h.find("[title]").attr("title");
-        if (firstTitle && firstTitle.length > 0) {
+        const firstTitle =
+          (frag.firstChild &&
+            frag.firstChild.attributes &&
+            frag.firstChild.attributes.title) ||
+          (frag.querySelector("[title]") &&
+            frag.querySelector("[title]").attributes.title);
+
+        if (firstTitle) {
           this.changeTitle(firstTitle);
         }
       }
diff --git a/app/assets/javascripts/discourse/app/components/composer-toggles.js b/app/assets/javascripts/discourse/app/components/composer-toggles.js
index 16b1773bb1..b60019c52c 100644
--- a/app/assets/javascripts/discourse/app/components/composer-toggles.js
+++ b/app/assets/javascripts/discourse/app/components/composer-toggles.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "",
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 2f6f81e675..fd7babb76d 100644
--- a/app/assets/javascripts/discourse/app/components/composer-user-selector.js
+++ b/app/assets/javascripts/discourse/app/components/composer-user-selector.js
@@ -1,13 +1,12 @@
-import I18n from "I18n";
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import putCursorAtEnd from "discourse/lib/put-cursor-at-end";
 
 export default Component.extend({
-  showSelector: true,
-  shouldHide: false,
-  defaultUsernameCount: 0,
+  init() {
+    this._super(...arguments);
+    this.set("_groups", []);
+  },
 
   didInsertElement() {
     this._super(...arguments);
@@ -17,78 +16,37 @@ export default Component.extend({
     }
   },
 
-  @observes("usernames")
-  _checkWidth() {
-    let width = 0;
-    const $acWrap = $(this.element).find(".ac-wrap");
-    const limit = $acWrap.width();
-    this.set("defaultUsernameCount", 0);
-
-    $acWrap
-      .find(".item")
-      .toArray()
-      .forEach((item) => {
-        width += $(item).outerWidth(true);
-        const result = width < limit;
-
-        if (result) {
-          this.incrementProperty("defaultUsernameCount");
-        }
-        return result;
-      });
-
-    if (width >= limit) {
-      this.set("shouldHide", true);
-    } else {
-      this.set("shouldHide", false);
+  @discourseComputed("recipients")
+  splitRecipients(recipients) {
+    if (Array.isArray(recipients)) {
+      return recipients;
     }
+    return recipients ? recipients.split(",").filter(Boolean) : [];
   },
 
-  @observes("shouldHide")
-  _setFocus() {
-    const selector =
-      "#reply-control #reply-title, #reply-control .d-editor-input";
-
-    if (this.shouldHide) {
-      $(selector).on("focus.composer-user-selector", () => {
-        this.set("showSelector", false);
-        this.appEvents.trigger("composer:resize");
-      });
-    } else {
-      $(selector).off("focus.composer-user-selector");
-    }
-  },
-
-  @discourseComputed("usernames")
-  splitUsernames(usernames) {
-    return usernames.split(",");
-  },
-
-  @discourseComputed("splitUsernames", "defaultUsernameCount")
-  limitedUsernames(splitUsernames, count) {
-    return splitUsernames.slice(0, count).join(", ");
-  },
-
-  @discourseComputed("splitUsernames", "defaultUsernameCount")
-  hiddenUsersCount(splitUsernames, count) {
-    return `${splitUsernames.length - count} ${I18n.t("more")}`;
+  _updateGroups(selected, newGroups) {
+    const groups = [];
+    this._groups.forEach((existing) => {
+      if (selected.includes(existing)) {
+        groups.addObject(existing);
+      }
+    });
+    newGroups.forEach((newGroup) => {
+      if (!groups.includes(newGroup)) {
+        groups.addObject(newGroup);
+      }
+    });
+    this.setProperties({
+      _groups: groups,
+      hasGroups: groups.length > 0,
+    });
   },
 
   actions: {
-    toggleSelector() {
-      this.set("showSelector", true);
-
-      schedule("afterRender", () => {
-        $(this.element).find("input").focus();
-      });
-    },
-
-    triggerResize() {
-      this.appEvents.trigger("composer:resize");
-      const $this = $(this.element).find(".ac-wrap");
-      if ($this.height() >= 150) {
-        $this.scrollTop($this.height());
-      }
+    updateRecipients(selected, content) {
+      const newGroups = content.filterBy("isGroup").mapBy("id");
+      this._updateGroups(selected, newGroups);
+      this.set("recipients", selected.join(","));
     },
   },
 });
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 d4249354cc..c3dc936c49 100644
--- a/app/assets/javascripts/discourse/app/components/conditional-loading-section.js
+++ b/app/assets/javascripts/discourse/app/components/conditional-loading-section.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Component from "@ember/component";
+import I18n from "I18n";
 export default Component.extend({
   classNames: ["conditional-loading-section"],
 
diff --git a/app/assets/javascripts/discourse/app/components/conditional-loading-spinner.js b/app/assets/javascripts/discourse/app/components/conditional-loading-spinner.js
index f581c30a57..22ebf1ddaa 100644
--- a/app/assets/javascripts/discourse/app/components/conditional-loading-spinner.js
+++ b/app/assets/javascripts/discourse/app/components/conditional-loading-spinner.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   classNameBindings: [
diff --git a/app/assets/javascripts/discourse/app/components/copy-button.js b/app/assets/javascripts/discourse/app/components/copy-button.js
new file mode 100644
index 0000000000..8eae4c3cdd
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/copy-button.js
@@ -0,0 +1,19 @@
+import Component from "@ember/component";
+import { action } from "@ember/object";
+
+export default Component.extend({
+  tagName: "",
+
+  @action
+  copy() {
+    const target = document.querySelector(this.selector);
+    target.select();
+    target.setSelectionRange(0, target.value.length);
+    try {
+      document.execCommand("copy");
+      if (this.copied) {
+        this.copied();
+      }
+    } catch (err) {}
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/components/count-i18n.js b/app/assets/javascripts/discourse/app/components/count-i18n.js
index 7c3ed90373..1d5a1fa228 100644
--- a/app/assets/javascripts/discourse/app/components/count-i18n.js
+++ b/app/assets/javascripts/discourse/app/components/count-i18n.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Component from "@ember/component";
+import I18n from "I18n";
 
 export default Component.extend({
   tagName: "span",
diff --git a/app/assets/javascripts/discourse/app/components/create-account.js b/app/assets/javascripts/discourse/app/components/create-account.js
index 265a126032..84cc94a70f 100644
--- a/app/assets/javascripts/discourse/app/components/create-account.js
+++ b/app/assets/javascripts/discourse/app/components/create-account.js
@@ -2,7 +2,24 @@ import Component from "@ember/component";
 import cookie from "discourse/lib/cookie";
 
 export default Component.extend({
-  classNames: ["create-account"],
+  classNames: ["create-account-body"],
+
+  userInputFocus(event) {
+    let label = event.target.parentElement.previousElementSibling;
+    if (!label.classList.contains("value-entered")) {
+      label.classList.toggle("value-entered");
+    }
+  },
+
+  userInputFocusOut(event) {
+    let label = event.target.parentElement.previousElementSibling;
+    if (
+      event.target.value.length === 0 &&
+      label.classList.contains("value-entered")
+    ) {
+      label.classList.toggle("value-entered");
+    }
+  },
 
   didInsertElement() {
     this._super(...arguments);
@@ -11,6 +28,21 @@ export default Component.extend({
       this.set("email", cookie("email"));
     }
 
+    let userTextFields = document.getElementsByClassName("user-fields")[0];
+
+    if (userTextFields) {
+      userTextFields = userTextFields.getElementsByClassName(
+        "ember-text-field"
+      );
+    }
+
+    if (userTextFields) {
+      for (let element of userTextFields) {
+        element.addEventListener("focus", this.userInputFocus);
+        element.addEventListener("focusout", this.userInputFocusOut);
+      }
+    }
+
     $(this.element).on("keydown.discourse-create-account", (e) => {
       if (!this.disabled && e.keyCode === 13) {
         e.preventDefault();
@@ -36,5 +68,20 @@ export default Component.extend({
 
     $(this.element).off("keydown.discourse-create-account");
     $(this.element).off("click.dropdown-user-field-label");
+
+    let userTextFields = document.getElementsByClassName("user-fields")[0];
+
+    if (userTextFields) {
+      userTextFields = userTextFields.getElementsByClassName(
+        "ember-text-field"
+      );
+    }
+
+    if (userTextFields) {
+      for (let element of userTextFields) {
+        element.removeEventListener("focus", this.userInputFocus);
+        element.removeEventListener("focusout", this.userInputFocusOut);
+      }
+    }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/create-invite-uploader.js b/app/assets/javascripts/discourse/app/components/create-invite-uploader.js
new file mode 100644
index 0000000000..79fe2a1c95
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/create-invite-uploader.js
@@ -0,0 +1,111 @@
+import Component from "@ember/component";
+import getUrl from "discourse-common/lib/get-url";
+import discourseComputed from "discourse-common/utils/decorators";
+import {
+  displayErrorForUpload,
+  validateUploadedFiles,
+} from "discourse/lib/uploads";
+
+export default Component.extend({
+  tagName: "",
+
+  data: null,
+  uploading: false,
+  progress: 0,
+  uploaded: null,
+
+  @discourseComputed("messageBus.clientId")
+  clientId() {
+    return this.messageBus && this.messageBus.clientId;
+  },
+
+  @discourseComputed("data", "uploading")
+  submitDisabled(data, uploading) {
+    return !data || uploading;
+  },
+
+  didInsertElement() {
+    this._super(...arguments);
+
+    this.setProperties({
+      data: null,
+      uploading: false,
+      progress: 0,
+      uploaded: null,
+    });
+
+    const $upload = $("#csv-file");
+
+    $upload.fileupload({
+      url: getUrl("/invites/upload_csv.json") + "?client_id=" + this.clientId,
+      dataType: "json",
+      dropZone: null,
+      replaceFileInput: false,
+      autoUpload: false,
+    });
+
+    $upload.on("fileuploadadd", (e, data) => {
+      this.set("data", data);
+    });
+
+    $upload.on("fileuploadsubmit", (e, data) => {
+      const isValid = validateUploadedFiles(data.files, {
+        user: this.currentUser,
+        siteSettings: this.siteSettings,
+        bypassNewUserRestriction: true,
+        csvOnly: true,
+      });
+
+      data.formData = { type: "csv" };
+      this.setProperties({ progress: 0, uploading: isValid });
+
+      return isValid;
+    });
+
+    $upload.on("fileuploadprogress", (e, data) => {
+      const progress = parseInt((data.loaded / data.total) * 100, 10);
+      this.set("progress", progress);
+    });
+
+    $upload.on("fileuploaddone", (e, data) => {
+      const upload = data.result;
+      this.set("uploaded", upload);
+      this.reset();
+    });
+
+    $upload.on("fileuploadfail", (e, data) => {
+      if (data.errorThrown !== "abort") {
+        displayErrorForUpload(data, this.siteSettings);
+      }
+      this.reset();
+    });
+  },
+
+  willDestroyElement() {
+    this._super(...arguments);
+
+    if (this.messageBus) {
+      this.messageBus.unsubscribe("/uploads/csv");
+    }
+
+    const $upload = $(this.element);
+
+    try {
+      $upload.fileupload("destroy");
+    } catch (e) {
+      /* wasn't initialized yet */
+    } finally {
+      $upload.off();
+    }
+  },
+
+  reset() {
+    this.setProperties({
+      data: null,
+      uploading: false,
+      progress: 0,
+    });
+
+    document.getElementById("csv-file").value = "";
+  },
+});
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 54c1057afb..0dbd17ef3a 100644
--- a/app/assets/javascripts/discourse/app/components/create-topics-notice.js
+++ b/app/assets/javascripts/discourse/app/components/create-topics-notice.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
+import I18n from "I18n";
 import LivePostCounts from "discourse/models/live-post-counts";
+import { alias } from "@ember/object/computed";
 import { htmlSafe } from "@ember/template";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/csv-uploader.js b/app/assets/javascripts/discourse/app/components/csv-uploader.js
deleted file mode 100644
index fcc98c0847..0000000000
--- a/app/assets/javascripts/discourse/app/components/csv-uploader.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
-import UploadMixin from "discourse/mixins/upload";
-import { on } from "@ember/object/evented";
-import bootbox from "bootbox";
-
-export default Component.extend(UploadMixin, {
-  type: "csv",
-  tagName: "span",
-  uploadUrl: "/invites/upload_csv",
-  i18nPrefix: "user.invited.bulk_invite",
-
-  validateUploadedFilesOptions() {
-    return { csvOnly: true };
-  },
-
-  @discourseComputed("uploading")
-  uploadButtonText(uploading) {
-    return uploading ? I18n.t("uploading") : I18n.t(`${this.i18nPrefix}.text`);
-  },
-
-  @discourseComputed("uploading")
-  uploadButtonDisabled(uploading) {
-    // https://github.com/emberjs/ember.js/issues/10976#issuecomment-132417731
-    return uploading ? true : null;
-  },
-
-  uploadDone() {
-    bootbox.alert(I18n.t(`${this.i18nPrefix}.success`));
-  },
-
-  uploadOptions() {
-    return { autoUpload: false };
-  },
-
-  _init: on("didInsertElement", function () {
-    const $upload = $(this.element);
-
-    $upload.on("fileuploadadd", (e, data) => {
-      bootbox.confirm(
-        I18n.t(`${this.i18nPrefix}.confirmation_message`),
-        I18n.t("cancel"),
-        I18n.t("go_ahead"),
-        (result) => (result ? data.submit() : data.abort())
-      );
-    });
-  }),
-});
diff --git a/app/assets/javascripts/discourse/app/components/d-button.js b/app/assets/javascripts/discourse/app/components/d-button.js
index 20f76b8ccb..5c76b4e686 100644
--- a/app/assets/javascripts/discourse/app/components/d-button.js
+++ b/app/assets/javascripts/discourse/app/components/d-button.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
-import { notEmpty, empty, equal } from "@ember/object/computed";
-import { computed } from "@ember/object";
+import { empty, equal, notEmpty } from "@ember/object/computed";
 import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
 import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+import { computed } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "button",
@@ -16,8 +16,11 @@ export default Component.extend({
   label: null,
   translatedLabel: null,
   ariaLabel: null,
+  ariaExpanded: null,
+  ariaControls: null,
   translatedAriaLabel: null,
   forwardEvent: false,
+  preventFocus: false,
 
   isLoading: computed({
     set(key, value) {
@@ -38,6 +41,8 @@ export default Component.extend({
     "isDisabled:disabled",
     "computedTitle:title",
     "computedAriaLabel:aria-label",
+    "computedAriaExpanded:aria-expanded",
+    "ariaControls:aria-controls",
     "tabindex",
     "type",
   ],
@@ -90,6 +95,16 @@ export default Component.extend({
     return computedLabel;
   },
 
+  @discourseComputed("ariaExpanded")
+  computedAriaExpanded(ariaExpanded) {
+    if (ariaExpanded === true) {
+      return "true";
+    }
+    if (ariaExpanded === false) {
+      return "false";
+    }
+  },
+
   click(event) {
     let { action } = this;
 
@@ -119,4 +134,10 @@ export default Component.extend({
 
     return false;
   },
+
+  mouseDown(event) {
+    if (this.preventFocus) {
+      event.preventDefault();
+    }
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/components/d-document.js b/app/assets/javascripts/discourse/app/components/d-document.js
index bd66be79a4..8cb0675945 100644
--- a/app/assets/javascripts/discourse/app/components/d-document.js
+++ b/app/assets/javascripts/discourse/app/components/d-document.js
@@ -1,10 +1,10 @@
 import Component from "@ember/component";
-import { inject as service } from "@ember/service";
-import { bind } from "discourse-common/utils/decorators";
-import logout from "discourse/lib/logout";
 import I18n from "I18n";
-import { setLogoffCallback } from "discourse/lib/ajax";
+import { bind } from "discourse-common/utils/decorators";
 import bootbox from "bootbox";
+import logout from "discourse/lib/logout";
+import { inject as service } from "@ember/service";
+import { setLogoffCallback } from "discourse/lib/ajax";
 
 export default Component.extend({
   tagName: "",
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index 2ac5201c80..345777759f 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -1,36 +1,42 @@
-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";
-import Mousetrap from "mousetrap";
-
-import discourseComputed, {
-  on,
-  observes,
-} from "discourse-common/utils/decorators";
-import { categoryHashtagTriggerRule } from "discourse/lib/category-hashtags";
-import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
-import { getRegister } from "discourse-common/lib/get-owner";
-import { findRawTemplate } from "discourse-common/lib/raw-templates";
-import { siteDir } from "discourse/lib/text-direction";
+import { ajax } from "discourse/lib/ajax";
 import {
-  determinePostReplaceSelection,
-  clipboardHelpers,
-  safariHacksDisabled,
   caretPosition,
+  clipboardHelpers,
+  determinePostReplaceSelection,
   inCodeBlock,
+  safariHacksDisabled,
 } from "discourse/lib/utilities";
-import toMarkdown from "discourse/lib/to-markdown";
-import deprecated from "discourse-common/lib/deprecated";
-import { wantsNewWindow } from "discourse/lib/intercept-click";
-import { translations } from "pretty-text/emoji/data";
+import discourseComputed, {
+  observes,
+  on,
+} from "discourse-common/utils/decorators";
 import { emojiSearch, isSkinTonableEmoji } from "pretty-text/emoji";
 import { emojiUrlFor, generateCookFunction } from "discourse/lib/text";
-import showModal from "discourse/lib/show-modal";
+import { later, next, schedule, scheduleOnce } from "@ember/runloop";
+import Component from "@ember/component";
+import I18n from "I18n";
+import Mousetrap from "mousetrap";
 import { Promise } from "rsvp";
-import { isTesting } from "discourse-common/config/environment";
 import { SKIP } from "discourse/lib/autocomplete";
+import { categoryHashtagTriggerRule } from "discourse/lib/category-hashtags";
+import deprecated from "discourse-common/lib/deprecated";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
+import { getRegister } from "discourse-common/lib/get-owner";
 import { isEmpty } from "@ember/utils";
+import { isTesting } from "discourse-common/config/environment";
+import { linkSeenHashtags } from "discourse/lib/link-hashtags";
+import { linkSeenMentions } from "discourse/lib/link-mentions";
+import { loadOneboxes } from "discourse/lib/load-oneboxes";
+import loadScript from "discourse/lib/load-script";
+import { resolveCachedShortUrls } from "pretty-text/upload-short-url";
+import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
+import { inject as service } from "@ember/service";
+import showModal from "discourse/lib/show-modal";
+import { siteDir } from "discourse/lib/text-direction";
+import toMarkdown from "discourse/lib/to-markdown";
+import { translations } from "pretty-text/emoji/data";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
 
 // Our head can be a static string or a function that returns a string
 // based on input (like for numbered lists).
@@ -75,22 +81,24 @@ class Toolbar {
     ];
 
     this.addButton({
-      trimLeading: true,
       id: "bold",
       group: "fontStyles",
       icon: "bold",
       label: getButtonLabel("composer.bold_label", "B"),
       shortcut: "B",
+      preventFocus: true,
+      trimLeading: true,
       perform: (e) => e.applySurround("**", "**", "bold_text"),
     });
 
     this.addButton({
-      trimLeading: true,
       id: "italic",
       group: "fontStyles",
       icon: "italic",
       label: getButtonLabel("composer.italic_label", "I"),
       shortcut: "I",
+      preventFocus: true,
+      trimLeading: true,
       perform: (e) => e.applySurround("*", "*", "italic_text"),
     });
 
@@ -99,16 +107,18 @@ class Toolbar {
         id: "link",
         group: "insertions",
         shortcut: "K",
+        preventFocus: true,
         trimLeading: true,
         sendAction: (event) => this.context.send("showLinkModal", event),
       });
     }
 
     this.addButton({
-      id: "quote",
+      id: "blockquote",
       group: "insertions",
       icon: "quote-right",
       shortcut: "Shift+9",
+      preventFocus: true,
       perform: (e) =>
         e.applyList("> ", "blockquote_text", {
           applyEmptyLines: true,
@@ -120,6 +130,8 @@ class Toolbar {
       id: "code",
       group: "insertions",
       shortcut: "Shift+C",
+      preventFocus: true,
+      trimLeading: true,
       action: (...args) => this.context.send("formatCode", args),
     });
 
@@ -129,6 +141,7 @@ class Toolbar {
       icon: "list-ul",
       shortcut: "Shift+8",
       title: "composer.ulist_title",
+      preventFocus: true,
       perform: (e) => e.applyList("* ", "list_item"),
     });
 
@@ -138,6 +151,7 @@ class Toolbar {
       icon: "list-ol",
       shortcut: "Shift+7",
       title: "composer.olist_title",
+      preventFocus: true,
       perform: (e) =>
         e.applyList(
           (i) => (!i ? "1. " : `${parseInt(i, 10) + 1}. `),
@@ -152,6 +166,7 @@ class Toolbar {
         icon: "exchange-alt",
         shortcut: "Shift+6",
         title: "composer.toggle_direction",
+        preventFocus: true,
         perform: (e) => e.toggleDirection(),
       });
     }
@@ -174,6 +189,7 @@ class Toolbar {
       perform: button.perform || function () {},
       trimLeading: button.trimLeading,
       popupMenu: button.popupMenu || false,
+      preventFocus: button.preventFocus || false,
     };
 
     if (button.sendAction) {
@@ -184,7 +200,7 @@ class Toolbar {
     if (button.shortcut) {
       const mac = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
       const mod = mac ? "Meta" : "Ctrl";
-      var shortcutTitle = `${mod}+${button.shortcut}`;
+      let shortcutTitle = `${mod}+${button.shortcut}`;
 
       // Mac users are used to glyphs for shortcut keys
       if (mac) {
@@ -268,12 +284,14 @@ export default Component.extend({
 
     scheduleOnce("afterRender", this, this._readyNow);
 
-    const mouseTrap = Mousetrap(this.element.querySelector(".d-editor-input"));
+    this._mouseTrap = new Mousetrap(
+      this.element.querySelector(".d-editor-input")
+    );
     const shortcuts = this.get("toolbar.shortcuts");
 
     Object.keys(shortcuts).forEach((sc) => {
       const button = shortcuts[sc];
-      mouseTrap.bind(sc, () => {
+      this._mouseTrap.bind(sc, () => {
         button.action(button);
         return false;
       });
@@ -311,7 +329,6 @@ export default Component.extend({
       this.appEvents.on("composer:insert-text", this, "_insertText");
       this.appEvents.on("composer:replace-text", this, "_replaceText");
     }
-    this._mouseTrap = mouseTrap;
 
     if (isTesting()) {
       this.element.addEventListener("paste", this.paste.bind(this));
@@ -334,10 +351,7 @@ export default Component.extend({
       this.appEvents.off("composer:replace-text", this, "_replaceText");
     }
 
-    const mouseTrap = this._mouseTrap;
-    Object.keys(this.get("toolbar.shortcuts")).forEach((sc) =>
-      mouseTrap.unbind(sc)
-    );
+    this._mouseTrap.reset();
     $(this.element.querySelector(".d-editor-preview")).off("click.preview");
 
     if (isTesting()) {
@@ -389,8 +403,42 @@ export default Component.extend({
       }
 
       this.set("preview", cooked);
+
+      if (this.siteSettings.enable_diffhtml_preview) {
+        const cookedElement = document.createElement("div");
+        cookedElement.innerHTML = cooked;
+
+        linkSeenHashtags($(cookedElement));
+        linkSeenMentions($(cookedElement), this.siteSettings);
+        resolveCachedShortUrls(this.siteSettings, cookedElement);
+        loadOneboxes(
+          cookedElement,
+          ajax,
+          null,
+          null,
+          this.siteSettings.max_oneboxes_per_post,
+          false,
+          true
+        );
+
+        loadScript("/javascripts/diffhtml.min.js").then(() => {
+          // changing the contents of the preview element between two uses of
+          // diff.innerHTML did not apply the diff correctly
+          window.diff.release(this.element.querySelector(".d-editor-preview"));
+          window.diff.innerHTML(
+            this.element.querySelector(".d-editor-preview"),
+            cookedElement.innerHTML,
+            {
+              parser: {
+                rawElements: ["script", "noscript", "style", "template"],
+              },
+            }
+          );
+        });
+      }
+
       schedule("afterRender", () => {
-        if (this._state !== "inDOM") {
+        if (this._state !== "inDOM" || !this.element) {
           return;
         }
         const $preview = $(this.element.querySelector(".d-editor-preview"));
@@ -415,7 +463,7 @@ export default Component.extend({
     if (isTesting()) {
       this._updatePreview();
     } else {
-      debounce(this, this._updatePreview, 30);
+      discourseDebounce(this, this._updatePreview, 30);
     }
   },
 
@@ -542,7 +590,10 @@ export default Component.extend({
             }
           }
 
-          const options = emojiSearch(term, { maxResults: 5 });
+          const options = emojiSearch(term, {
+            maxResults: 5,
+            diversity: this.emojiStore.diversity,
+          });
 
           return resolve(options);
         })
@@ -565,7 +616,7 @@ export default Component.extend({
   },
 
   _getSelected(trimLeading, opts) {
-    if (!this.ready) {
+    if (!this.ready || !this.element) {
       return;
     }
 
@@ -600,18 +651,24 @@ export default Component.extend({
     }
   },
 
-  _selectText(from, length) {
-    schedule("afterRender", () => {
+  _selectText(from, length, opts = { scroll: true }) {
+    next(() => {
+      if (!this.element) {
+        return;
+      }
+
       const textarea = this.element.querySelector("textarea.d-editor-input");
       const $textarea = $(textarea);
-      const oldScrollPos = $textarea.scrollTop();
-      if (!this.capabilities.isIOS || safariHacksDisabled()) {
-        $textarea.focus();
-      }
       textarea.selectionStart = from;
       textarea.selectionEnd = from + length;
-      next(() => $textarea.trigger("change"));
-      $textarea.scrollTop(oldScrollPos);
+      $textarea.trigger("change");
+      if (opts.scroll) {
+        const oldScrollPos = $textarea.scrollTop();
+        if (!this.capabilities.isIOS || safariHacksDisabled()) {
+          $textarea.focus();
+        }
+        $textarea.scrollTop(oldScrollPos);
+      }
     });
   },
 
@@ -848,7 +905,19 @@ export default Component.extend({
       text = text.substring(0, text.length - 1);
     }
 
-    let rows = text.split("\n");
+    text = text.split("");
+    let cell = false;
+    text.forEach((char, index) => {
+      if (char === "\n" && cell) {
+        text[index] = "\r";
+      }
+      if (char === '"') {
+        text[index] = "";
+        cell = !cell;
+      }
+    });
+
+    let rows = text.join("").replace(/\r/g, "<br>").split("\n");
 
     if (rows.length > 1) {
       const columns = rows.map((r) => r.split("\t").length);
@@ -996,7 +1065,8 @@ export default Component.extend({
       const selected = this._getSelected(button.trimLeading);
       const toolbarEvent = {
         selected,
-        selectText: (from, length) => this._selectText(from, length),
+        selectText: (from, length) =>
+          this._selectText(from, length, { scroll: false }),
         applySurround: (head, tail, exampleKey, opts) =>
           this._applySurround(selected, head, tail, exampleKey, opts),
         applyList: (head, exampleKey, opts) =>
diff --git a/app/assets/javascripts/discourse/app/components/d-modal-body.js b/app/assets/javascripts/discourse/app/components/d-modal-body.js
index 3b519a8db6..fada62686d 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal-body.js
+++ b/app/assets/javascripts/discourse/app/components/d-modal-body.js
@@ -1,5 +1,5 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
+import { scheduleOnce } from "@ember/runloop";
 export default Component.extend({
   classNames: ["modal-body"],
   fixed: false,
@@ -56,13 +56,18 @@ export default Component.extend({
         "fixed",
         "subtitle",
         "rawSubtitle",
-        "dismissable"
+        "dismissable",
+        "headerClass"
       )
     );
   },
 
   _clearFlash() {
-    $("#modal-alert").hide().removeClass("alert-error", "alert-success");
+    const modalAlert = document.getElementById("modal-alert");
+    if (modalAlert) {
+      modalAlert.style.display = "none";
+      modalAlert.classList.remove("alert-info", "alert-error", "alert-success");
+    }
   },
 
   _flash(msg) {
diff --git a/app/assets/javascripts/discourse/app/components/d-modal.js b/app/assets/javascripts/discourse/app/components/d-modal.js
index 63e9e755df..8bb6568242 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal.js
+++ b/app/assets/javascripts/discourse/app/components/d-modal.js
@@ -1,8 +1,9 @@
-import afterTransition from "discourse/lib/after-transition";
+import { computed } from "@ember/object";
+import Component from "@ember/component";
 import I18n from "I18n";
+import afterTransition from "discourse/lib/after-transition";
 import { next } from "@ember/runloop";
 import { on } from "discourse-common/utils/decorators";
-import Component from "@ember/component";
 
 export default Component.extend({
   classNameBindings: [
@@ -12,10 +13,17 @@ export default Component.extend({
     "modalStyle",
     "hasPanels",
   ],
-  attributeBindings: ["data-keyboard", "aria-modal"],
+  attributeBindings: [
+    "data-keyboard",
+    "aria-modal",
+    "role",
+    "ariaLabelledby:aria-labelledby",
+  ],
   dismissable: true,
   title: null,
   subtitle: null,
+  role: "dialog",
+  headerClass: null,
 
   init() {
     this._super(...arguments);
@@ -33,13 +41,17 @@ export default Component.extend({
   // Inform screenreaders of the modal
   "aria-modal": "true",
 
+  ariaLabelledby: computed("title", function () {
+    return this.title ? "discourse-modal-title" : null;
+  }),
+
   @on("didInsertElement")
   setUp() {
     $("html").on("keyup.discourse-modal", (e) => {
       //only respond to events when the modal is visible
       if (!this.element.classList.contains("hidden")) {
         if (e.which === 27 && this.dismissable) {
-          next(() => $(".modal-header button.modal-close").click());
+          next(() => this.attrs.closeModal("initiatedByESC"));
         }
 
         if (e.which === 13 && this.triggerClickOnEnter(e)) {
@@ -118,6 +130,8 @@ export default Component.extend({
       this.set("dismissable", true);
     }
 
+    this.set("headerClass", data.headerClass || null);
+
     if (this.element) {
       const autofocusInputs = this.element.querySelectorAll(
         ".modal-body input[autofocus]"
diff --git a/app/assets/javascripts/discourse/app/components/d-navigation-item.js b/app/assets/javascripts/discourse/app/components/d-navigation-item.js
new file mode 100644
index 0000000000..bb32a38490
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-navigation-item.js
@@ -0,0 +1,17 @@
+import Component from "@ember/component";
+import { computed } from "@ember/object";
+import { inject as service } from "@ember/service";
+
+export default Component.extend({
+  tagName: "li",
+
+  route: null,
+
+  router: service(),
+
+  attributeBindings: ["ariaCurrent:aria-current", "title"],
+
+  ariaCurrent: computed("router.currentRouteName", "route", function () {
+    return this.router.currentRouteName === this.route ? "page" : null;
+  }),
+});
diff --git a/app/assets/javascripts/discourse/app/components/d-navigation.js b/app/assets/javascripts/discourse/app/components/d-navigation.js
index 824ece2590..6d00181e9e 100644
--- a/app/assets/javascripts/discourse/app/components/d-navigation.js
+++ b/app/assets/javascripts/discourse/app/components/d-navigation.js
@@ -1,9 +1,9 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import NavItem from "discourse/models/nav-item";
-import { inject as service } from "@ember/service";
 import Component from "@ember/component";
 import FilterModeMixin from "discourse/mixins/filter-mode";
+import NavItem from "discourse/models/nav-item";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
+import { inject as service } from "@ember/service";
 
 export default Component.extend(FilterModeMixin, {
   router: service(),
@@ -22,6 +22,12 @@ export default Component.extend(FilterModeMixin, {
     return category && this.currentUser;
   },
 
+  // don't show tag notification menu on tag intersections
+  @discourseComputed("tagNotification", "additionalTags")
+  showTagNotifications(tagNotification, additionalTags) {
+    return tagNotification && !additionalTags;
+  },
+
   @discourseComputed("category", "createTopicDisabled")
   categoryReadOnlyBanner(category, createTopicDisabled) {
     if (category && this.currentUser && createTopicDisabled) {
@@ -73,10 +79,20 @@ export default Component.extend(FilterModeMixin, {
     return !additionalTags && !category && tagId !== "none";
   },
 
-  @discourseComputed("filterType", "category", "noSubcategories", "tag.id")
-  navItems(filterType, category, noSubcategories, tagId) {
-    const currentRouteQueryParams = this.get("router.currentRoute.queryParams");
-
+  @discourseComputed(
+    "filterType",
+    "category",
+    "noSubcategories",
+    "tag.id",
+    "router.currentRoute.queryParams"
+  )
+  navItems(
+    filterType,
+    category,
+    noSubcategories,
+    tagId,
+    currentRouteQueryParams
+  ) {
     return NavItem.buildList(category, {
       filterType,
       noSubcategories,
diff --git a/app/assets/javascripts/discourse/app/components/date-input.js b/app/assets/javascripts/discourse/app/components/date-input.js
index 7c8cd58989..9cb022d024 100644
--- a/app/assets/javascripts/discourse/app/components/date-input.js
+++ b/app/assets/javascripts/discourse/app/components/date-input.js
@@ -1,11 +1,19 @@
-import { Promise } from "rsvp";
-import I18n from "I18n";
-import { schedule } from "@ember/runloop";
-import { action } from "@ember/object";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import I18n from "I18n";
+import { Promise } from "rsvp";
+import { action } from "@ember/object";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
-import discourseComputed, { on } from "discourse-common/utils/decorators";
+import { schedule } from "@ember/runloop";
+
+function isInputDateSupported() {
+  const input = document.createElement("input");
+  const value = "a";
+  input.setAttribute("type", "date");
+  input.setAttribute("value", value);
+  return input.value !== value;
+}
 
 export default Component.extend({
   classNames: ["d-date-input"],
@@ -13,10 +21,12 @@ export default Component.extend({
   _picker: null,
 
   @discourseComputed("site.mobileView")
-  inputType(mobileView) {
-    return mobileView ? "date" : "text";
+  inputType() {
+    return this.useNativePicker ? "date" : "text";
   },
 
+  useNativePicker: isInputDateSupported(),
+
   click(event) {
     event.stopPropagation();
   },
@@ -32,7 +42,7 @@ export default Component.extend({
       let promise;
       const container = document.getElementById(this.containerId);
 
-      if (this.site.mobileView) {
+      if (this.useNativePicker) {
         promise = this._loadNativePicker(container);
       } else {
         promise = this._loadPikadayPicker(container);
diff --git a/app/assets/javascripts/discourse/app/components/date-picker.js b/app/assets/javascripts/discourse/app/components/date-picker.js
index f54b48da8d..a3a1cd6ddf 100644
--- a/app/assets/javascripts/discourse/app/components/date-picker.js
+++ b/app/assets/javascripts/discourse/app/components/date-picker.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
-import { schedule } from "@ember/runloop";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import I18n from "I18n";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
-import discourseComputed, { on } from "discourse-common/utils/decorators";
+import { schedule } from "@ember/runloop";
 
 const DATE_FORMAT = "YYYY-MM-DD";
 
diff --git a/app/assets/javascripts/discourse/app/components/date-time-input.js b/app/assets/javascripts/discourse/app/components/date-time-input.js
index 01d4d20ab1..2093b71c6e 100644
--- a/app/assets/javascripts/discourse/app/components/date-time-input.js
+++ b/app/assets/javascripts/discourse/app/components/date-time-input.js
@@ -1,5 +1,5 @@
+import { action, computed } from "@ember/object";
 import Component from "@ember/component";
-import { computed, action } from "@ember/object";
 
 export default Component.extend({
   classNames: ["d-date-time-input"],
diff --git a/app/assets/javascripts/discourse/app/components/desktop-notification-config.js b/app/assets/javascripts/discourse/app/components/desktop-notification-config.js
index 56984dfa8a..29bf5bcfec 100644
--- a/app/assets/javascripts/discourse/app/components/desktop-notification-config.js
+++ b/app/assets/javascripts/discourse/app/components/desktop-notification-config.js
@@ -1,18 +1,18 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { or } from "@ember/object/computed";
-import Component from "@ember/component";
-import KeyValueStore from "discourse/lib/key-value-store";
 import {
-  context,
   confirmNotification,
+  context,
 } from "discourse/lib/desktop-notifications";
 import {
-  subscribe as subscribePushNotification,
-  unsubscribe as unsubscribePushNotification,
   isPushNotificationsSupported,
   keyValueStore as pushNotificationKeyValueStore,
   userSubscriptionKey as pushNotificationUserSubscriptionKey,
+  subscribe as subscribePushNotification,
+  unsubscribe as unsubscribePushNotification,
 } from "discourse/lib/push-notifications";
+import Component from "@ember/component";
+import KeyValueStore from "discourse/lib/key-value-store";
+import discourseComputed from "discourse-common/utils/decorators";
+import { or } from "@ember/object/computed";
 
 const keyValueStore = new KeyValueStore(context);
 
diff --git a/app/assets/javascripts/discourse/app/components/discourse-banner.js b/app/assets/javascripts/discourse/app/components/discourse-banner.js
index baf54cfdc2..738211dde2 100644
--- a/app/assets/javascripts/discourse/app/components/discourse-banner.js
+++ b/app/assets/javascripts/discourse/app/components/discourse-banner.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   hide: false,
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 acbb88021a..4085d56d2f 100644
--- a/app/assets/javascripts/discourse/app/components/discourse-linked-text.js
+++ b/app/assets/javascripts/discourse/app/components/discourse-linked-text.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Component from "@ember/component";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/discourse-root.js b/app/assets/javascripts/discourse/app/components/discourse-root.js
new file mode 100644
index 0000000000..49a5fe660e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/discourse-root.js
@@ -0,0 +1,10 @@
+import Component from "@ember/component";
+
+let componentArgs = { tagName: "div" };
+
+// TODO: Once we've moved to Ember CLI completely we can remove this.
+if (!Ember.FEATURES.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE) {
+  componentArgs = { tagName: "" };
+}
+
+export default Component.extend(componentArgs);
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 f692e3a2fb..278ec36c7b 100644
--- a/app/assets/javascripts/discourse/app/components/discourse-tag-bound.js
+++ b/app/assets/javascripts/discourse/app/components/discourse-tag-bound.js
@@ -1,6 +1,6 @@
-import getURL from "discourse-common/lib/get-url";
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
 
 export default Component.extend({
   tagName: "a",
diff --git a/app/assets/javascripts/discourse/app/components/discourse-topic.js b/app/assets/javascripts/discourse/app/components/discourse-topic.js
index dcfbc4b21a..784c8fdb8d 100644
--- a/app/assets/javascripts/discourse/app/components/discourse-topic.js
+++ b/app/assets/javascripts/discourse/app/components/discourse-topic.js
@@ -1,22 +1,16 @@
-import { alias } from "@ember/object/computed";
 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";
 import ClickTrack from "discourse/lib/click-track";
-import Scrolling from "discourse/mixins/scrolling";
+import Component from "@ember/component";
+import DiscourseURL from "discourse/lib/url";
 import MobileScrollDirection from "discourse/mixins/mobile-scroll-direction";
+import Scrolling from "discourse/mixins/scrolling";
+import { alias } from "@ember/object/computed";
+import { highlightPost } from "discourse/lib/utilities";
 import { observes } from "discourse-common/utils/decorators";
 
 const MOBILE_SCROLL_DIRECTION_CHECK_THROTTLE = 300;
 
-function highlight(postNumber) {
-  const $contents = $(`#post_${postNumber} .topic-body`);
-
-  $contents.addClass("highlighted");
-  $contents.on("animationend", () => $contents.removeClass("highlighted"));
-}
-
 export default Component.extend(
   AddArchetypeClass,
   Scrolling,
@@ -29,8 +23,6 @@ export default Component.extend(
       "topic.is_warning",
       "topic.category.read_restricted:read_restricted",
       "topic.deleted:deleted-topic",
-      "topic.categoryClass",
-      "topic.tagClasses",
     ],
     menuVisible: true,
     SHORT_POST: 1200,
@@ -58,7 +50,7 @@ export default Component.extend(
     },
 
     _highlightPost(postNumber) {
-      scheduleOnce("afterRender", null, highlight, postNumber);
+      scheduleOnce("afterRender", null, highlightPost, postNumber);
     },
 
     _hideTopicInHeader() {
diff --git a/app/assets/javascripts/discourse/app/components/discovery-topics-list.js b/app/assets/javascripts/discourse/app/components/discovery-topics-list.js
index dad15d1d9d..8665981311 100644
--- a/app/assets/javascripts/discourse/app/components/discovery-topics-list.js
+++ b/app/assets/javascripts/discourse/app/components/discovery-topics-list.js
@@ -1,6 +1,6 @@
+import { observes, on } from "discourse-common/utils/decorators";
 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";
 import UrlRefresh from "discourse/mixins/url-refresh";
 import { inject as service } from "@ember/service";
@@ -38,9 +38,17 @@ const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
   actions: {
     loadMore() {
       this.documentTitle.updateContextCount(0);
-      this.model.loadMore().then((hasMoreResults) => {
+      this.model.loadMore().then(({ moreTopicsUrl, newTopics } = {}) => {
+        if (
+          newTopics &&
+          newTopics.length &&
+          this.autoAddTopicsToBulkSelect &&
+          this.bulkSelectEnabled
+        ) {
+          this.addTopicsToBulkSelect(newTopics);
+        }
         schedule("afterRender", () => this.saveScrollPosition());
-        if (hasMoreResults && $(window).height() >= $(document).height()) {
+        if (moreTopicsUrl && $(window).height() >= $(document).height()) {
           this.send("loadMore");
         }
       });
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 7a6c85d776..8bd8b8eda8 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-general.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-general.js
@@ -1,12 +1,12 @@
-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";
+import { cancel, later } from "@ember/runloop";
+import Category from "discourse/models/category";
 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";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
+import { isEmpty } from "@ember/utils";
+import { not } from "@ember/object/computed";
 
 export default buildCategoryPanel("general", {
   init() {
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-panel.js b/app/assets/javascripts/discourse/app/components/edit-category-panel.js
index 02f7a28424..e20bc7baab 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-panel.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-panel.js
@@ -1,5 +1,5 @@
-import { equal } from "@ember/object/computed";
 import Component from "@ember/component";
+import { equal } from "@ember/object/computed";
 const EditCategoryPanel = Component.extend({});
 
 export default EditCategoryPanel;
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-security.js b/app/assets/javascripts/discourse/app/components/edit-category-security.js
index 6f9e9309a3..e99352e4b1 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-security.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-security.js
@@ -1,5 +1,5 @@
-import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import PermissionType from "discourse/models/permission-type";
+import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import discourseComputed from "discourse-common/utils/decorators";
 import { not } from "@ember/object/computed";
 
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 b18e84d5c0..bfcfa19cd5 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-settings.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-settings.js
@@ -1,10 +1,11 @@
-import I18n from "I18n";
-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 { SEARCH_PRIORITIES } from "discourse/lib/constants";
+import { and, empty } from "@ember/object/computed";
 import Group from "discourse/models/group";
+import I18n from "I18n";
+import { SEARCH_PRIORITIES } from "discourse/lib/constants";
+import { buildCategoryPanel } from "discourse/components/edit-category-panel";
+import discourseComputed from "discourse-common/utils/decorators";
+import { setting } from "discourse/lib/computed";
+import { action } from "@ember/object";
 
 const categorySortCriteria = [];
 export function addCategorySortCriteria(criteria) {
@@ -126,4 +127,15 @@ export default buildCategoryPanel("settings", {
       { name: I18n.t("category.sort_descending"), value: false },
     ];
   },
+
+  @discourseComputed
+  hiddenRelativeIntervals() {
+    return ["mins"];
+  },
+
+  @action
+  onAutoCloseDurationChange(minutes) {
+    let hours = minutes ? minutes / 60 : null;
+    this.set("category.auto_close_hours", hours);
+  },
 });
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 0ead526caa..45721b4370 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-tab.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-tab.js
@@ -1,11 +1,11 @@
+import Component from "@ember/component";
+import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import { scheduleOnce } from "@ember/runloop";
-import Component from "@ember/component";
-import { propertyEqual } from "discourse/lib/computed";
-import getURL from "discourse-common/lib/get-url";
 import { empty } from "@ember/object/computed";
-import DiscourseURL from "discourse/lib/url";
+import getURL from "discourse-common/lib/get-url";
+import { propertyEqual } from "discourse/lib/computed";
+import { scheduleOnce } from "@ember/runloop";
 import { underscore } from "@ember/string";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-tags.js b/app/assets/javascripts/discourse/app/components/edit-category-tags.js
index 862e874ce4..f9dc2d914b 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-tags.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-tags.js
@@ -1,4 +1,4 @@
-import { empty, and } from "@ember/object/computed";
+import { and, empty } from "@ember/object/computed";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 
 export default buildCategoryPanel("tags", {
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js
index eeac5335b0..b4d8d7a721 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js
@@ -1,6 +1,6 @@
-import { schedule } from "@ember/runloop";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import { observes } from "discourse-common/utils/decorators";
+import { schedule } from "@ember/runloop";
 
 export default buildCategoryPanel("topic-template", {
   // Modals are defined using the singleton pattern.
diff --git a/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js b/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js
index fd3652d5cc..cb3ad39523 100644
--- a/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js
+++ b/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js
@@ -1,31 +1,68 @@
-import { equal, or, readOnly } from "@ember/object/computed";
-import { schedule } from "@ember/runloop";
-import Component from "@ember/component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import {
-  PUBLISH_TO_CATEGORY_STATUS_TYPE,
-  OPEN_STATUS_TYPE,
-  DELETE_STATUS_TYPE,
-  CLOSE_STATUS_TYPE,
   BUMP_TYPE,
+  CLOSE_AFTER_LAST_POST_STATUS_TYPE,
+  CLOSE_STATUS_TYPE,
   DELETE_REPLIES_TYPE,
+  DELETE_STATUS_TYPE,
+  OPEN_STATUS_TYPE,
+  PUBLISH_TO_CATEGORY_STATUS_TYPE,
 } from "discourse/controllers/edit-topic-timer";
+import { FORMAT } from "select-kit/components/future-date-input-selector";
+import discourseComputed from "discourse-common/utils/decorators";
+import { equal, or, readOnly } from "@ember/object/computed";
+import I18n from "I18n";
+import { action } from "@ember/object";
+import Component from "@ember/component";
+import { isEmpty } from "@ember/utils";
+import { now, startOfDay, thisWeekend } from "discourse/lib/time-utils";
+import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
+import Mousetrap from "mousetrap";
 
 export default Component.extend({
-  selection: readOnly("topicTimer.status_type"),
-  autoOpen: equal("selection", OPEN_STATUS_TYPE),
-  autoClose: equal("selection", CLOSE_STATUS_TYPE),
-  autoDelete: equal("selection", DELETE_STATUS_TYPE),
-  autoBump: equal("selection", BUMP_TYPE),
-  publishToCategory: equal("selection", PUBLISH_TO_CATEGORY_STATUS_TYPE),
-  autoDeleteReplies: equal("selection", DELETE_REPLIES_TYPE),
-  showTimeOnly: or("autoOpen", "autoDelete", "autoBump"),
-  showFutureDateInput: or(
-    "showTimeOnly",
-    "publishToCategory",
-    "autoClose",
-    "autoDeleteReplies"
+  statusType: readOnly("topicTimer.status_type"),
+  autoOpen: equal("statusType", OPEN_STATUS_TYPE),
+  autoClose: equal("statusType", CLOSE_STATUS_TYPE),
+  autoCloseAfterLastPost: equal(
+    "statusType",
+    CLOSE_AFTER_LAST_POST_STATUS_TYPE
   ),
+  autoDelete: equal("statusType", DELETE_STATUS_TYPE),
+  autoBump: equal("statusType", BUMP_TYPE),
+  publishToCategory: equal("statusType", PUBLISH_TO_CATEGORY_STATUS_TYPE),
+  autoDeleteReplies: equal("statusType", DELETE_REPLIES_TYPE),
+  showTimeOnly: or("autoOpen", "autoDelete", "autoBump"),
+  showFutureDateInput: or("showTimeOnly", "publishToCategory", "autoClose"),
+  useDuration: or(
+    "isBasedOnLastPost",
+    "autoDeleteReplies",
+    "autoCloseAfterLastPost"
+  ),
+  duration: null,
+
+  init() {
+    this._super(...arguments);
+
+    KeyboardShortcuts.pause();
+    this._mousetrap = new Mousetrap();
+
+    this.set("duration", this.initialDuration);
+  },
+
+  get initialDuration() {
+    if (!this.useDuration || !this.topicTimer.duration_minutes) {
+      return null;
+    } else if (this.durationType === "days") {
+      return this.topicTimer.duration_minutes / 60 / 24;
+    } else {
+      return this.topicTimer.duration_minutes / 60;
+    }
+  },
+
+  willDestroyElement() {
+    this._super(...arguments);
+    this._mousetrap.reset();
+    KeyboardShortcuts.unpause();
+  },
 
   @discourseComputed("autoDeleteReplies")
   durationType(autoDeleteReplies) {
@@ -39,26 +76,127 @@ export default Component.extend({
     }
   },
 
-  @observes("selection")
-  _updateBasedOnLastPost() {
-    if (!this.autoClose) {
-      schedule("afterRender", () => {
-        this.set("topicTimer.based_on_last_post", false);
-      });
+  @discourseComputed()
+  customTimeShortcutOptions() {
+    return [
+      {
+        icon: "bed",
+        id: "this_weekend",
+        label: "topic.auto_update_input.this_weekend",
+        time: thisWeekend(),
+        timeFormatKey: "dates.time_short_day",
+      },
+      {
+        icon: "far-clock",
+        id: "two_weeks",
+        label: "topic.auto_update_input.two_weeks",
+        time: startOfDay(now().add(2, "weeks")),
+        timeFormatKey: "dates.long_no_year",
+      },
+      {
+        icon: "far-calendar-plus",
+        id: "six_months",
+        label: "topic.auto_update_input.six_months",
+        time: startOfDay(now().add(6, "months")),
+        timeFormatKey: "dates.long_no_year",
+      },
+    ];
+  },
+
+  @discourseComputed
+  hiddenTimeShortcutOptions() {
+    return ["none", "start_of_next_business_week"];
+  },
+
+  isCustom: equal("timerType", "custom"),
+  isBasedOnLastPost: equal("statusType", "close_after_last_post"),
+
+  @discourseComputed(
+    "topicTimer.updateTime",
+    "topicTimer.duration_minutes",
+    "useDuration"
+  )
+  executeAt(updateTime, duration, useDuration) {
+    if (useDuration) {
+      return moment().add(parseFloat(duration), "minutes").format(FORMAT);
+    } else {
+      return updateTime;
     }
   },
 
-  didReceiveAttrs() {
-    this._super(...arguments);
+  @discourseComputed(
+    "isBasedOnLastPost",
+    "topicTimer.duration_minutes",
+    "topic.last_posted_at"
+  )
+  willCloseImmediately(isBasedOnLastPost, duration, lastPostedAt) {
+    if (isBasedOnLastPost && duration) {
+      let closeDate = moment(lastPostedAt);
+      closeDate = closeDate.add(duration, "minutes");
+      return closeDate < moment();
+    }
+  },
 
-    // TODO: get rid of this hack
-    schedule("afterRender", () => {
-      if (!this.get("topicTimer.status_type")) {
-        this.set(
-          "topicTimer.status_type",
-          this.get("timerTypes.firstObject.id")
-        );
+  @discourseComputed("isBasedOnLastPost", "topic.last_posted_at")
+  willCloseI18n(isBasedOnLastPost, lastPostedAt) {
+    if (isBasedOnLastPost) {
+      const diff = Math.round(
+        (new Date() - new Date(lastPostedAt)) / (1000 * 60 * 60)
+      );
+      return I18n.t("topic.auto_close_momentarily", { count: diff });
+    }
+  },
+
+  @discourseComputed("durationType")
+  durationLabel(durationType) {
+    return I18n.t(`topic.topic_status_update.num_of_${durationType}`);
+  },
+
+  @discourseComputed(
+    "statusType",
+    "isCustom",
+    "topicTimer.updateTime",
+    "willCloseImmediately",
+    "topicTimer.category_id",
+    "useDuration",
+    "topicTimer.duration_minutes"
+  )
+  showTopicTimerInfo(
+    statusType,
+    isCustom,
+    updateTime,
+    willCloseImmediately,
+    categoryId,
+    useDuration,
+    duration
+  ) {
+    if (!statusType || willCloseImmediately) {
+      return false;
+    }
+
+    if (statusType === PUBLISH_TO_CATEGORY_STATUS_TYPE && isEmpty(categoryId)) {
+      return false;
+    }
+
+    if (isCustom && updateTime) {
+      if (moment(updateTime) < moment()) {
+        return false;
       }
-    });
+    } else if (useDuration) {
+      return duration;
+    }
+
+    return updateTime;
+  },
+
+  @action
+  onTimeSelected(type, time) {
+    this.set("timerType", type);
+    this.onChangeInput(type, time);
+  },
+
+  @action
+  durationChanged(newDurationMins) {
+    this.set("topicTimer.duration_minutes", newDurationMins);
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/email-dropdown.js b/app/assets/javascripts/discourse/app/components/email-dropdown.js
index 173d12d74b..f28cacf82e 100644
--- a/app/assets/javascripts/discourse/app/components/email-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/email-dropdown.js
@@ -1,7 +1,7 @@
 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";
+import I18n from "I18n";
+import { inject as service } from "@ember/service";
 
 export default DropdownSelectBoxComponent.extend({
   router: service(),
diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker.js b/app/assets/javascripts/discourse/app/components/emoji-picker.js
index b13c18f6a4..7989384446 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker.js
@@ -1,17 +1,18 @@
-import { observes, bind } from "discourse-common/utils/decorators";
-import { htmlSafe } from "@ember/template";
-import { emojiUnescape, emojiUrlFor } from "discourse/lib/text";
 import { action, computed } from "@ember/object";
-import { inject as service } from "@ember/service";
-import { schedule, later } from "@ember/runloop";
-import Component from "@ember/component";
-import { createPopper } from "@popperjs/core";
+import { bind, observes } from "discourse-common/utils/decorators";
 import {
+  emojiSearch,
   extendedEmojiList,
   isSkinTonableEmoji,
-  emojiSearch,
 } from "pretty-text/emoji";
-import { safariHacksDisabled, escapeExpression } from "discourse/lib/utilities";
+import { emojiUnescape, emojiUrlFor } from "discourse/lib/text";
+import { escapeExpression, safariHacksDisabled } from "discourse/lib/utilities";
+import { later, schedule } from "@ember/runloop";
+import Component from "@ember/component";
+import { createPopper } from "@popperjs/core";
+import { htmlSafe } from "@ember/template";
+import { inject as service } from "@ember/service";
+import { underscore } from "@ember/string";
 
 function customEmojis() {
   const list = extendedEmojiList();
@@ -149,6 +150,7 @@ export default Component.extend({
     ].map((name, index) => {
       return {
         name,
+        title: `emoji_picker.${underscore(name)}_tone`,
         icon: index + 1 === this.selectedDiversity ? "check" : "",
       };
     });
@@ -222,6 +224,7 @@ export default Component.extend({
     if (event.target.value) {
       results.innerHTML = emojiSearch(event.target.value.toLowerCase(), {
         maxResults: 10,
+        diversity: this.emojiStore.diversity,
       })
         .map(this._replaceEmoji)
         .join("");
diff --git a/app/assets/javascripts/discourse/app/components/emoji-uploader.js b/app/assets/javascripts/discourse/app/components/emoji-uploader.js
index d94117682a..371137e4fa 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/emoji-uploader.js
@@ -1,8 +1,8 @@
-import { notEmpty } 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";
+import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
+import { notEmpty } from "@ember/object/computed";
 
 const DEFAULT_GROUP = "default";
 
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 ac1f6fae46..86a15b910b 100644
--- a/app/assets/javascripts/discourse/app/components/expanding-text-area.js
+++ b/app/assets/javascripts/discourse/app/components/expanding-text-area.js
@@ -1,7 +1,7 @@
+import { observes, on } from "discourse-common/utils/decorators";
 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";
+import { schedule } from "@ember/runloop";
 
 export default TextArea.extend({
   @on("didInsertElement")
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 b1fe079c60..a409fec15d 100644
--- a/app/assets/javascripts/discourse/app/components/flag-action-type.js
+++ b/app/assets/javascripts/discourse/app/components/flag-action-type.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { and, not, equal } from "@ember/object/computed";
+import { and, equal, not } from "@ember/object/computed";
 import Component from "@ember/component";
+import I18n from "I18n";
 import { MAX_MESSAGE_LENGTH } from "discourse/models/post-action-type";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   classNames: ["flag-action-type"],
diff --git a/app/assets/javascripts/discourse/app/components/flag-selection.js b/app/assets/javascripts/discourse/app/components/flag-selection.js
index 6f731dd0e8..1c43f4b005 100644
--- a/app/assets/javascripts/discourse/app/components/flag-selection.js
+++ b/app/assets/javascripts/discourse/app/components/flag-selection.js
@@ -1,5 +1,5 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
+import { next } from "@ember/runloop";
 import { observes } from "discourse-common/utils/decorators";
 
 // Mostly hacks because `flag.hbs` didn't use `radio-button`
@@ -12,7 +12,10 @@ export default Component.extend({
       return;
     }
 
-    this.element.querySelector("#radio_" + nameKey).checked = "true";
+    const selector = this.element.querySelector("#radio_" + nameKey);
+    if (selector) {
+      selector.checked = "true";
+    }
   },
 
   @observes("nameKey")
diff --git a/app/assets/javascripts/discourse/app/components/flat-button.js b/app/assets/javascripts/discourse/app/components/flat-button.js
index 927d19a2c4..8f8ac08a14 100644
--- a/app/assets/javascripts/discourse/app/components/flat-button.js
+++ b/app/assets/javascripts/discourse/app/components/flat-button.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Component from "@ember/component";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/footer-nav.js b/app/assets/javascripts/discourse/app/components/footer-nav.js
index ab87708bac..9a99c1b4fc 100644
--- a/app/assets/javascripts/discourse/app/components/footer-nav.js
+++ b/app/assets/javascripts/discourse/app/components/footer-nav.js
@@ -1,9 +1,9 @@
-import { throttle } from "@ember/runloop";
-import MountWidget from "discourse/components/mount-widget";
+import { isAppWebview, postRNWebviewMessage } from "discourse/lib/utilities";
 import MobileScrollDirection from "discourse/mixins/mobile-scroll-direction";
+import MountWidget from "discourse/components/mount-widget";
 import Scrolling from "discourse/mixins/scrolling";
 import { observes } from "discourse-common/utils/decorators";
-import { isAppWebview, postRNWebviewMessage } from "discourse/lib/utilities";
+import { throttle } from "@ember/runloop";
 
 const MOBILE_SCROLL_DIRECTION_CHECK_THROTTLE = 150;
 
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 9457e900b3..5dfed3af56 100644
--- a/app/assets/javascripts/discourse/app/components/future-date-input.js
+++ b/app/assets/javascripts/discourse/app/components/future-date-input.js
@@ -1,41 +1,30 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import { equal, and, empty, or } from "@ember/object/computed";
+import { and, empty, equal } from "@ember/object/computed";
+import { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { FORMAT } from "select-kit/components/future-date-input-selector";
-import { PUBLISH_TO_CATEGORY_STATUS_TYPE } from "discourse/controllers/edit-topic-timer";
+import I18n from "I18n";
 
 export default Component.extend({
   selection: null,
   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"),
+  labelClasses: null,
 
   init() {
     this._super(...arguments);
 
     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({
-          selection: "pick_date_and_time",
-          date: datetime.format("YYYY-MM-DD"),
-          time: datetime.format("HH:mm"),
-        });
-        this._updateInput();
-      }
+      const datetime = moment(this.input);
+      this.setProperties({
+        selection: "pick_date_and_time",
+        date: datetime.format("YYYY-MM-DD"),
+        time: datetime.format("HH:mm"),
+      });
+      this._updateInput();
     }
   },
 
@@ -58,49 +47,6 @@ export default Component.extend({
     }
   },
 
-  @observes("isBasedOnLastPost")
-  _updateBasedOnLastPost() {
-    this.set("basedOnLastPost", this.isBasedOnLastPost);
-  },
-
-  @observes("duration")
-  _updateDuration() {
-    this.attrs.onChangeDuration &&
-      this.attrs.onChangeDuration(parseInt(this.duration, 0));
-  },
-
-  @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);
 
@@ -108,65 +54,4 @@ export default Component.extend({
       this.set("displayLabel", I18n.t(this.label));
     }
   },
-
-  @discourseComputed(
-    "statusType",
-    "input",
-    "isCustom",
-    "date",
-    "time",
-    "willCloseImmediately",
-    "categoryId",
-    "displayNumberInput",
-    "duration"
-  )
-  showTopicStatusInfo(
-    statusType,
-    input,
-    isCustom,
-    date,
-    time,
-    willCloseImmediately,
-    categoryId,
-    displayNumberInput,
-    duration
-  ) {
-    if (!statusType || willCloseImmediately) {
-      return false;
-    }
-
-    if (statusType === PUBLISH_TO_CATEGORY_STATUS_TYPE && isEmpty(categoryId)) {
-      return false;
-    }
-
-    if (isCustom) {
-      if (date) {
-        return moment(`${date}${time ? " " + time : ""}`).isAfter(moment());
-      }
-      return time;
-    } else if (displayNumberInput) {
-      return duration;
-    } else {
-      return input;
-    }
-  },
-
-  @discourseComputed("isBasedOnLastPost", "input", "lastPostedAt")
-  willCloseImmediately(isBasedOnLastPost, input, lastPostedAt) {
-    if (isBasedOnLastPost && input) {
-      let closeDate = moment(lastPostedAt);
-      closeDate = closeDate.add(input, "hours");
-      return closeDate < moment();
-    }
-  },
-
-  @discourseComputed("isBasedOnLastPost", "lastPostedAt")
-  willCloseI18n(isBasedOnLastPost, lastPostedAt) {
-    if (isBasedOnLastPost) {
-      const diff = Math.round(
-        (new Date() - new Date(lastPostedAt)) / (1000 * 60 * 60)
-      );
-      return I18n.t("topic.auto_close_immediate", { count: diff });
-    }
-  },
 });
diff --git a/app/assets/javascripts/discourse/app/components/global-notice.js b/app/assets/javascripts/discourse/app/components/global-notice.js
index 00fdb98350..9dc041b863 100644
--- a/app/assets/javascripts/discourse/app/components/global-notice.js
+++ b/app/assets/javascripts/discourse/app/components/global-notice.js
@@ -1,10 +1,10 @@
-import getURL from "discourse-common/lib/get-url";
-import { bind } from "discourse-common/utils/decorators";
-import I18n from "I18n";
-import Component from "@ember/component";
-import LogsNotice from "discourse/services/logs-notice";
 import EmberObject, { computed } from "@ember/object";
 import cookie, { removeCookie } from "discourse/lib/cookie";
+import Component from "@ember/component";
+import I18n from "I18n";
+import LogsNotice from "discourse/services/logs-notice";
+import { bind } from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
 
 const _pluginNotices = [];
 
@@ -72,7 +72,9 @@ export default Component.extend({
         removeCookie("dosp", { path: "/" });
         notices.push(
           Notice.create({
-            text: I18n.t("forced_anonymous"),
+            text: this.siteSettings.login_required
+              ? I18n.t("forced_anonymous_login_required")
+              : I18n.t("forced_anonymous"),
             id: "forced-anonymous",
           })
         );
diff --git a/app/assets/javascripts/discourse/app/components/google-search.js b/app/assets/javascripts/discourse/app/components/google-search.js
index 527ffdfd12..1e5e062258 100644
--- a/app/assets/javascripts/discourse/app/components/google-search.js
+++ b/app/assets/javascripts/discourse/app/components/google-search.js
@@ -1,7 +1,7 @@
-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";
+import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
 
 export default Component.extend({
   classNames: ["google-search-form"],
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 fa2897df18..9c316932c0 100644
--- a/app/assets/javascripts/discourse/app/components/group-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/group-card-contents.js
@@ -1,11 +1,11 @@
 import { alias, gt } from "@ember/object/computed";
-import Component from "@ember/component";
-import { setting } from "discourse/lib/computed";
-import discourseComputed from "discourse-common/utils/decorators";
 import CardContentsBase from "discourse/mixins/card-contents-base";
 import CleansUp from "discourse/mixins/cleans-up";
-import { groupPath } from "discourse/lib/url";
+import Component from "@ember/component";
 import { Promise } from "rsvp";
+import discourseComputed from "discourse-common/utils/decorators";
+import { groupPath } from "discourse/lib/url";
+import { setting } from "discourse/lib/computed";
 
 const maxMembersToDisplay = 10;
 
@@ -81,17 +81,15 @@ export default Component.extend(CardContentsBase, CleansUp, {
     },
 
     messageGroup() {
-      this.createNewMessageViaParams(this.get("group.name"));
+      this.createNewMessageViaParams({
+        recipients: this.get("group.name"),
+        hasGroups: true,
+      });
     },
 
     showGroup(group) {
       this.showGroup(group);
       this._close();
     },
-
-    showUser(user) {
-      this.showUser(user);
-      this._close();
-    },
   },
 });
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 0c60c695d4..5a53a6f740 100644
--- a/app/assets/javascripts/discourse/app/components/group-flair-inputs.js
+++ b/app/assets/javascripts/discourse/app/components/group-flair-inputs.js
@@ -1,16 +1,16 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
 import discourseComputed, {
-  on,
   observes,
+  on,
 } from "discourse-common/utils/decorators";
-import { debounce } from "@ember/runloop";
 import Component from "@ember/component";
-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 I18n from "I18n";
 import { action } from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
+import { convertIconClass } from "discourse-common/lib/icon-library";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { escapeExpression } from "discourse/lib/utilities";
+import getURL from "discourse-common/lib/get-url";
+import { htmlSafe } from "@ember/template";
 
 export default Component.extend({
   classNames: ["group-flair-inputs"],
@@ -34,7 +34,7 @@ export default Component.extend({
   @observes("model.flair_icon")
   _loadSVGIcon(flairIcon) {
     if (flairIcon) {
-      debounce(this, this._loadIcon, 1000);
+      discourseDebounce(this, this._loadIcon, 1000);
     }
   },
 
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 52ca1587e4..8e7332663e 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,6 +1,6 @@
+import Component from "@ember/component";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
 
 export default Component.extend({
   tagName: "",
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 2c92af9c0c..0a92d4bd84 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,9 +1,9 @@
+import Component from "@ember/component";
+import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 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";
-import DiscourseURL from "discourse/lib/url";
 
 export default Component.extend({
   saving: null,
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 f4cb9ad287..8b74a485bc 100644
--- a/app/assets/javascripts/discourse/app/components/group-member-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/group-member-dropdown.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
 import { computed } from "@ember/object";
 
 export default DropdownSelectBoxComponent.extend({
@@ -11,7 +11,56 @@ export default DropdownSelectBoxComponent.extend({
     showFullTitle: false,
   },
 
-  content: computed("member.owner", function () {
+  contentBulk() {
+    const items = [];
+
+    items.push({
+      id: "removeMembers",
+      name: I18n.t("groups.members.remove_members"),
+      description: I18n.t("groups.members.remove_members_description"),
+      icon: "user-times",
+    });
+
+    if (this.bulkSelection.some((m) => !m.owner)) {
+      items.push({
+        id: "makeOwners",
+        name: I18n.t("groups.members.make_owners"),
+        description: I18n.t("groups.members.make_owners_description"),
+        icon: "shield-alt",
+      });
+    }
+
+    if (this.bulkSelection.some((m) => m.owner)) {
+      items.push({
+        id: "removeOwners",
+        name: I18n.t("groups.members.remove_owners"),
+        description: I18n.t("groups.members.remove_owners_description"),
+        icon: "shield-alt",
+      });
+    }
+
+    if (this.bulkSelection.some((m) => !m.primary)) {
+      items.push({
+        id: "setPrimary",
+        name: I18n.t("groups.members.make_all_primary"),
+        description: I18n.t("groups.members.make_all_primary_description"),
+        icon: "id-card",
+      });
+    }
+
+    if (this.bulkSelection.some((m) => m.primary)) {
+      items.push({
+        id: "unsetPrimary",
+        name: I18n.t("groups.members.remove_all_primary"),
+        description: I18n.t("groups.members.remove_all_primary_description"),
+        icon: "id-card",
+      });
+    }
+
+    return items;
+  },
+
+  contentSingle() {
     const items = [
       {
         id: "removeMember",
@@ -45,6 +94,39 @@ export default DropdownSelectBoxComponent.extend({
       }
     }
 
+    if (this.currentUser.staff) {
+      if (this.member.primary) {
+        items.push({
+          id: "removePrimary",
+          name: I18n.t("groups.members.remove_primary"),
+          description: I18n.t("groups.members.remove_primary_description", {
+            username: this.get("member.username"),
+          }),
+          icon: "id-card",
+        });
+      } else {
+        items.push({
+          id: "makePrimary",
+          name: I18n.t("groups.members.make_primary"),
+          description: I18n.t("groups.members.make_primary_description", {
+            username: this.get("member.username"),
+          }),
+          icon: "id-card",
+        });
+      }
+    }
+
     return items;
-  }),
+  },
+
+  content: computed(
+    "bulkSelection.[]",
+    "member.owner",
+    "member.primary",
+    function () {
+      return this.bulkSelection !== undefined
+        ? this.contentBulk()
+        : this.contentSingle();
+    }
+  ),
 });
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 bb7df0ea9c..46329bba2d 100644
--- a/app/assets/javascripts/discourse/app/components/group-membership-button.js
+++ b/app/assets/javascripts/discourse/app/components/group-membership-button.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
 import Component from "@ember/component";
+import I18n from "I18n";
+import bootbox from "bootbox";
+import cookie from "discourse/lib/cookie";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
-import bootbox from "bootbox";
-import cookie from "discourse/lib/cookie";
 
 export default Component.extend({
   classNames: ["group-membership-button"],
@@ -35,9 +35,13 @@ export default Component.extend({
   },
 
   removeFromGroup() {
-    this.model
+    const model = this.model;
+    model
       .removeMember(this.currentUser)
-      .then(() => this.model.set("is_group_user", false))
+      .then(() => {
+        model.set("is_group_user", false);
+        this.appEvents.trigger("group:leave", model);
+      })
       .catch(popupAjaxError)
       .finally(() => this.set("updatingMembership", false));
   },
@@ -52,6 +56,7 @@ export default Component.extend({
           .addMembers(this.currentUser.get("username"))
           .then(() => {
             model.set("is_group_user", true);
+            this.appEvents.trigger("group:join", model);
           })
           .catch(popupAjaxError)
           .finally(() => {
diff --git a/app/assets/javascripts/discourse/app/components/group-post.js b/app/assets/javascripts/discourse/app/components/group-post.js
index 49d3227046..72df8e3c02 100644
--- a/app/assets/javascripts/discourse/app/components/group-post.js
+++ b/app/assets/javascripts/discourse/app/components/group-post.js
@@ -1,10 +1,38 @@
-import getURL from "discourse-common/lib/get-url";
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
+import { prioritizeNameInUx } from "discourse/lib/settings";
+import { propertyEqual } from "discourse/lib/computed";
 
 export default Component.extend({
+  classNameBindings: [
+    ":user-stream-item",
+    ":item",
+    "moderatorAction",
+    "primaryGroup",
+  ],
+
   @discourseComputed("post.url")
   postUrl(url) {
     return getURL(url);
   },
+  moderatorAction: propertyEqual(
+    "post.post_type",
+    "site.post_types.moderator_action"
+  ),
+
+  @discourseComputed("post.user")
+  name() {
+    if (prioritizeNameInUx(this.post.user.name)) {
+      return this.post.user.name;
+    }
+    return this.post.user.username;
+  },
+
+  @discourseComputed("post.user")
+  primaryGroup() {
+    if (this.post.user.primary_group_name) {
+      return `group-${this.post.user.primary_group_name}`;
+    }
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/components/group-selector.js b/app/assets/javascripts/discourse/app/components/group-selector.js
index 2516de122c..651dfb7ade 100644
--- a/app/assets/javascripts/discourse/app/components/group-selector.js
+++ b/app/assets/javascripts/discourse/app/components/group-selector.js
@@ -1,11 +1,11 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import Component from "@ember/component";
 import discourseComputed, {
-  on,
   observes,
+  on,
 } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
+import I18n from "I18n";
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
+import { isEmpty } from "@ember/utils";
 
 export default Component.extend({
   @discourseComputed("placeholderKey")
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 fd60e3686b..b063865786 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,7 +1,8 @@
-import I18n from "I18n";
 import Component from "@ember/component";
-import { or } from "@ember/object/computed";
+import I18n from "I18n";
+import { NotificationLevels } from "discourse/lib/notification-levels";
 import discourseComputed from "discourse-common/utils/decorators";
+import { or } from "@ember/object/computed";
 
 export default Component.extend({
   init() {
@@ -46,6 +47,8 @@ export default Component.extend({
       { name: I18n.t("groups.alias_levels.owners_mods_and_admins"), value: 4 },
       { name: I18n.t("groups.alias_levels.everyone"), value: 99 },
     ];
+
+    this.watchingNotificationLevel = NotificationLevels.WATCHING;
   },
 
   membersVisibilityLevel: or(
@@ -63,6 +66,11 @@ export default Component.extend({
     "aliasLevelOptions.firstObject.value"
   ),
 
+  defaultNotificationLevel: or(
+    "model.default_notification_level",
+    "watchingNotificationLevel"
+  ),
+
   @discourseComputed(
     "siteSettings.email_in",
     "model.automatic",
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 fb00e15c13..7603df532c 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,7 +1,8 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import I18n from "I18n";
 import { computed } from "@ember/object";
+import { not } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tokenSeparator: "|",
@@ -21,6 +22,8 @@ export default Component.extend({
     ];
   },
 
+  canEdit: not("model.automatic"),
+
   groupTrustLevel: computed(
     "model.grant_trust_level",
     "trustLevelOptions",
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 e6c2af54ba..d2a439ed54 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,12 +1,12 @@
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
+import EmberObject from "@ember/object";
+import Group from "discourse/models/group";
 import I18n from "I18n";
+import discourseDebounce from "discourse-common/lib/debounce";
 import { isEmpty } from "@ember/utils";
 import { not } from "@ember/object/computed";
-import Component from "@ember/component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import Group from "discourse/models/group";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import discourseDebounce from "discourse/lib/debounce";
-import EmberObject from "@ember/object";
 
 export default Component.extend({
   disableSave: null,
@@ -64,40 +64,46 @@ export default Component.extend({
     );
   },
 
-  checkGroupName: discourseDebounce(function () {
-    if (isEmpty(this.nameInput)) {
-      return;
-    }
-
-    Group.checkName(this.nameInput)
-      .then((response) => {
-        const validationName = "uniqueNameValidation";
-
-        if (response.available) {
-          this.set(
-            validationName,
-            EmberObject.create({
-              ok: true,
-              reason: I18n.t("admin.groups.new.name.available"),
-            })
-          );
-
-          this.set("disableSave", false);
-          this.set("model.name", this.nameInput);
-        } else {
-          let reason;
-
-          if (response.errors) {
-            reason = response.errors.join(" ");
-          } else {
-            reason = I18n.t("admin.groups.new.name.not_available");
-          }
-
-          this.set(validationName, this._failedInputValidation(reason));
+  checkGroupName() {
+    discourseDebounce(
+      this,
+      function () {
+        if (isEmpty(this.nameInput)) {
+          return;
         }
-      })
-      .catch(popupAjaxError);
-  }, 500),
+
+        Group.checkName(this.nameInput)
+          .then((response) => {
+            const validationName = "uniqueNameValidation";
+
+            if (response.available) {
+              this.set(
+                validationName,
+                EmberObject.create({
+                  ok: true,
+                  reason: I18n.t("admin.groups.new.name.available"),
+                })
+              );
+
+              this.set("disableSave", false);
+              this.set("model.name", this.nameInput);
+            } else {
+              let reason;
+
+              if (response.errors) {
+                reason = response.errors.join(" ");
+              } else {
+                reason = I18n.t("admin.groups.new.name.not_available");
+              }
+
+              this.set(validationName, this._failedInputValidation(reason));
+            }
+          })
+          .catch(popupAjaxError);
+      },
+      500
+    );
+  },
 
   _failedInputValidation(reason) {
     this.set("disableSave", true);
diff --git a/app/assets/javascripts/discourse/app/components/groups-info.js b/app/assets/javascripts/discourse/app/components/groups-info.js
index 9390d17e4e..f7ff39a99f 100644
--- a/app/assets/javascripts/discourse/app/components/groups-info.js
+++ b/app/assets/javascripts/discourse/app/components/groups-info.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "span",
diff --git a/app/assets/javascripts/discourse/app/components/hidden-details.js b/app/assets/javascripts/discourse/app/components/hidden-details.js
new file mode 100644
index 0000000000..a06ed1ee91
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/hidden-details.js
@@ -0,0 +1,9 @@
+import Component from "@ember/component";
+import { action } from "@ember/object";
+
+export default Component.extend({
+  @action
+  expand() {
+    this.set("expanded", true);
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/components/highlight-search.js b/app/assets/javascripts/discourse/app/components/highlight-search.js
index 7864b6ef98..b0f8cc5e9c 100644
--- a/app/assets/javascripts/discourse/app/components/highlight-search.js
+++ b/app/assets/javascripts/discourse/app/components/highlight-search.js
@@ -1,6 +1,6 @@
+import { observes, on } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import highlightSearch from "discourse/lib/highlight-search";
-import { observes, on } from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "span",
diff --git a/app/assets/javascripts/discourse/app/components/highlight-text.js b/app/assets/javascripts/discourse/app/components/highlight-text.js
index 2f37f89e9b..6199140de3 100644
--- a/app/assets/javascripts/discourse/app/components/highlight-text.js
+++ b/app/assets/javascripts/discourse/app/components/highlight-text.js
@@ -1,5 +1,5 @@
-import highlightSearch from "discourse/components/highlight-search";
 import deprecated from "discourse-common/lib/deprecated";
+import highlightSearch from "discourse/components/highlight-search";
 
 export default highlightSearch.extend({
   init() {
diff --git a/app/assets/javascripts/discourse/app/components/html-with-links.js b/app/assets/javascripts/discourse/app/components/html-with-links.js
new file mode 100644
index 0000000000..d14b7dc7c7
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/html-with-links.js
@@ -0,0 +1,23 @@
+import {
+  openLinkInNewTab,
+  shouldOpenInNewTab,
+} from "discourse/lib/click-track";
+import Component from "@ember/component";
+
+export default Component.extend({
+  didInsertElement() {
+    this._super(...arguments);
+    $(this.element).on("click.discourse-open-tab", "a", (event) => {
+      if (event.target && event.target.tagName === "A") {
+        if (shouldOpenInNewTab(event.target.href)) {
+          openLinkInNewTab(event.target);
+        }
+      }
+    });
+  },
+
+  willDestroyElement() {
+    this._super(...arguments);
+    $(this.element).off("click.discourse-open-tab", "a");
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/components/ignored-user-list.js b/app/assets/javascripts/discourse/app/components/ignored-user-list.js
index a7a2d3d515..e355a898ed 100644
--- a/app/assets/javascripts/discourse/app/components/ignored-user-list.js
+++ b/app/assets/javascripts/discourse/app/components/ignored-user-list.js
@@ -1,7 +1,7 @@
 import Component from "@ember/component";
+import User from "discourse/models/user";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
-import User from "discourse/models/user";
 
 export default Component.extend({
   item: null,
diff --git a/app/assets/javascripts/discourse/app/components/image-uploader.js b/app/assets/javascripts/discourse/app/components/image-uploader.js
index c292d20641..441ec4b743 100644
--- a/app/assets/javascripts/discourse/app/components/image-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/image-uploader.js
@@ -1,11 +1,11 @@
-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";
 import Component from "@ember/component";
 import UploadMixin from "discourse/mixins/upload";
-import lightbox from "discourse/lib/lightbox";
 import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+import { getURLWithCDN } from "discourse-common/lib/get-url";
+import { isEmpty } from "@ember/utils";
+import lightbox from "discourse/lib/lightbox";
+import { next } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Component.extend(UploadMixin, {
diff --git a/app/assets/javascripts/discourse/app/components/images-uploader.js b/app/assets/javascripts/discourse/app/components/images-uploader.js
index 7f6a70c15d..beeff06ccf 100644
--- a/app/assets/javascripts/discourse/app/components/images-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/images-uploader.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import I18n from "I18n";
 import UploadMixin from "discourse/mixins/upload";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend(UploadMixin, {
   type: "avatar",
diff --git a/app/assets/javascripts/discourse/app/components/invite-link-panel.js b/app/assets/javascripts/discourse/app/components/invite-link-panel.js
index 27c2d53fd3..aedea4fedf 100644
--- a/app/assets/javascripts/discourse/app/components/invite-link-panel.js
+++ b/app/assets/javascripts/discourse/app/components/invite-link-panel.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
+import { and, readOnly } from "@ember/object/computed";
 import Component from "@ember/component";
 import Group from "discourse/models/group";
-import { and, readOnly } from "@ember/object/computed";
+import I18n from "I18n";
+import Invite from "discourse/models/invite";
 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"),
@@ -90,7 +90,7 @@ export default Component.extend({
         model.setProperties({
           saving: false,
           finished: true,
-          inviteLink: result,
+          inviteLink: result.link,
         });
 
         if (userInvitedController) {
diff --git a/app/assets/javascripts/discourse/app/components/invite-panel.js b/app/assets/javascripts/discourse/app/components/invite-panel.js
index 9b289189d8..dd55ebeed2 100644
--- a/app/assets/javascripts/discourse/app/components/invite-panel.js
+++ b/app/assets/javascripts/discourse/app/components/invite-panel.js
@@ -1,14 +1,14 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { isEmpty } from "@ember/utils";
 import EmberObject, { action } from "@ember/object";
 import { alias, and, equal, readOnly } from "@ember/object/computed";
 import Component from "@ember/component";
-import { emailValid } from "discourse/lib/utilities";
 import Group from "discourse/models/group";
+import I18n from "I18n";
 import Invite from "discourse/models/invite";
-import { i18n } from "discourse/lib/computed";
+import discourseComputed from "discourse-common/utils/decorators";
+import { emailValid } from "discourse/lib/utilities";
 import { getNativeContact } from "discourse/lib/pwa-utils";
+import { i18n } from "discourse/lib/computed";
+import { isEmpty } from "@ember/utils";
 
 export default Component.extend({
   tagName: null,
@@ -20,9 +20,9 @@ export default Component.extend({
   isStaff: readOnly("currentUser.staff"),
   isAdmin: readOnly("currentUser.admin"),
 
-  // If this isn't defined, it will proxy to the user topic on the preferences
-  // page which is wrong.
-  emailOrUsername: null,
+  // invitee is either a user, group or email
+  invitee: null,
+  isInviteeGroup: false,
   hasCustomMessage: false,
   customMessage: null,
   inviteIcon: "envelope",
@@ -41,7 +41,7 @@ export default Component.extend({
 
   @discourseComputed(
     "isAdmin",
-    "emailOrUsername",
+    "invitee",
     "invitingToTopic",
     "isPrivateTopic",
     "groupIds",
@@ -50,7 +50,7 @@ export default Component.extend({
   )
   disabled(
     isAdmin,
-    emailOrUsername,
+    invitee,
     invitingToTopic,
     isPrivateTopic,
     groupIds,
@@ -60,24 +60,22 @@ export default Component.extend({
     if (saving) {
       return true;
     }
-    if (isEmpty(emailOrUsername)) {
+    if (isEmpty(invitee)) {
       return true;
     }
 
-    const emailTrimmed = emailOrUsername.trim();
-
     // when inviting to forum, email must be valid
-    if (!invitingToTopic && !emailValid(emailTrimmed)) {
+    if (!invitingToTopic && !emailValid(invitee)) {
       return true;
     }
 
     // normal users (not admin) can't invite users to private topic via email
-    if (!isAdmin && isPrivateTopic && emailValid(emailTrimmed)) {
+    if (!isAdmin && isPrivateTopic && emailValid(invitee)) {
       return true;
     }
 
     // when inviting to private topic via email, group name must be specified
-    if (isPrivateTopic && isEmpty(groupIds) && emailValid(emailTrimmed)) {
+    if (isPrivateTopic && isEmpty(groupIds) && emailValid(invitee)) {
       return true;
     }
 
@@ -90,7 +88,7 @@ export default Component.extend({
 
   @discourseComputed(
     "isAdmin",
-    "emailOrUsername",
+    "invitee",
     "inviteModel.saving",
     "isPrivateTopic",
     "groupIds",
@@ -98,7 +96,7 @@ export default Component.extend({
   )
   disabledCopyLink(
     isAdmin,
-    emailOrUsername,
+    invitee,
     saving,
     isPrivateTopic,
     groupIds,
@@ -110,24 +108,22 @@ export default Component.extend({
     if (saving) {
       return true;
     }
-    if (isEmpty(emailOrUsername)) {
+    if (isEmpty(invitee)) {
       return true;
     }
 
-    const email = emailOrUsername.trim();
-
     // email must be valid
-    if (!emailValid(email)) {
+    if (!emailValid(invitee)) {
       return true;
     }
 
     // normal users (not admin) can't invite users to private topic via email
-    if (!isAdmin && isPrivateTopic && emailValid(email)) {
+    if (!isAdmin && isPrivateTopic && emailValid(invitee)) {
       return true;
     }
 
     // when inviting to private topic via email, group name must be specified
-    if (isPrivateTopic && isEmpty(groupIds) && emailValid(email)) {
+    if (isPrivateTopic && isEmpty(groupIds) && emailValid(invitee)) {
       return true;
     }
 
@@ -179,7 +175,7 @@ export default Component.extend({
   // Show Groups? (add invited user to private group)
   @discourseComputed(
     "isGroupOwnerOrAdmin",
-    "emailOrUsername",
+    "invitee",
     "isPrivateTopic",
     "isPM",
     "invitingToTopic",
@@ -187,7 +183,7 @@ export default Component.extend({
   )
   showGroups(
     isGroupOwnerOrAdmin,
-    emailOrUsername,
+    invitee,
     isPrivateTopic,
     isPM,
     invitingToTopic,
@@ -197,20 +193,20 @@ export default Component.extend({
       isGroupOwnerOrAdmin &&
       canInviteViaEmail &&
       !isPM &&
-      (emailValid(emailOrUsername) || isPrivateTopic || !invitingToTopic)
+      (emailValid(invitee) || isPrivateTopic || !invitingToTopic)
     );
   },
 
-  @discourseComputed("emailOrUsername")
-  showCustomMessage(emailOrUsername) {
-    return this.inviteModel === this.currentUser || emailValid(emailOrUsername);
+  @discourseComputed("invitee")
+  showCustomMessage(invitee) {
+    return this.inviteModel === this.currentUser || emailValid(invitee);
   },
 
   // Instructional text for the modal.
   @discourseComputed(
     "isPM",
     "invitingToTopic",
-    "emailOrUsername",
+    "invitee",
     "isPrivateTopic",
     "isAdmin",
     "canInviteViaEmail"
@@ -218,14 +214,14 @@ export default Component.extend({
   inviteInstructions(
     isPM,
     invitingToTopic,
-    emailOrUsername,
+    invitee,
     isPrivateTopic,
     isAdmin,
     canInviteViaEmail
   ) {
     if (!canInviteViaEmail) {
       // can't invite via email, only existing users
-      return I18n.t("topic.invite_reply.sso_enabled");
+      return I18n.t("topic.invite_reply.discourse_connect_enabled");
     } else if (isPM) {
       // inviting to a message
       return I18n.t("topic.invite_private.email_or_username");
@@ -236,9 +232,9 @@ export default Component.extend({
         return I18n.t("topic.invite_reply.to_username");
       } else {
         // when inviting to a topic, display instructions based on provided entity
-        if (isEmpty(emailOrUsername)) {
+        if (isEmpty(invitee)) {
           return I18n.t("topic.invite_reply.to_topic_blank");
-        } else if (emailValid(emailOrUsername)) {
+        } else if (emailValid(invitee)) {
           this.set("inviteIcon", "envelope");
           return I18n.t("topic.invite_reply.to_topic_email");
         } else {
@@ -257,18 +253,18 @@ export default Component.extend({
     return isPrivateTopic ? "required" : "optional";
   },
 
-  @discourseComputed("isPM", "emailOrUsername", "invitingExistingUserToTopic")
-  successMessage(isPM, emailOrUsername, invitingExistingUserToTopic) {
-    if (this.hasGroups) {
+  @discourseComputed("isPM", "invitee", "invitingExistingUserToTopic")
+  successMessage(isPM, invitee, invitingExistingUserToTopic) {
+    if (this.isInviteeGroup) {
       return I18n.t("topic.invite_private.success_group");
     } else if (isPM) {
       return I18n.t("topic.invite_private.success");
     } else if (invitingExistingUserToTopic) {
       return I18n.t("topic.invite_reply.success_existing_email", {
-        emailOrUsername,
+        invitee,
       });
-    } else if (emailValid(emailOrUsername)) {
-      return I18n.t("topic.invite_reply.success_email", { emailOrUsername });
+    } else if (emailValid(invitee)) {
+      return I18n.t("topic.invite_reply.success_email", { invitee });
     } else {
       return I18n.t("topic.invite_reply.success_username");
     }
@@ -295,7 +291,8 @@ export default Component.extend({
   // Reset the modal to allow a new user to be invited.
   reset() {
     this.setProperties({
-      emailOrUsername: null,
+      invitee: null,
+      isInviteeGroup: false,
       hasCustomMessage: false,
       customMessage: null,
       invitingExistingUserToTopic: false,
@@ -320,6 +317,11 @@ export default Component.extend({
     });
   },
 
+  @action
+  sendCloseModal() {
+    this.attrs.close();
+  },
+
   @action
   createInvite() {
     if (this.disabled) {
@@ -346,9 +348,9 @@ export default Component.extend({
       model.setProperties({ saving: false, error: true });
     };
 
-    if (this.hasGroups) {
+    if (this.isInviteeGroup) {
       return this.inviteModel
-        .createGroupInvite(this.emailOrUsername.trim())
+        .createGroupInvite(this.invitee.trim())
         .then((data) => {
           model.setProperties({ saving: false, finished: true });
           this.get("inviteModel.details.allowed_groups").pushObject(
@@ -359,7 +361,7 @@ export default Component.extend({
         .catch(onerror);
     } else {
       return this.inviteModel
-        .createInvite(this.emailOrUsername.trim(), groupIds, this.customMessage)
+        .createInvite(this.invitee.trim(), groupIds, this.customMessage)
         .then((result) => {
           model.setProperties({ saving: false, finished: true });
           if (!this.invitingToTopic && userInvitedController) {
@@ -379,7 +381,7 @@ export default Component.extend({
             this.appEvents.trigger("post-stream:refresh", { force: true });
           } else if (
             this.invitingToTopic &&
-            emailValid(this.emailOrUsername.trim()) &&
+            emailValid(this.invitee.trim()) &&
             result &&
             result.user
           ) {
@@ -391,7 +393,7 @@ export default Component.extend({
   },
 
   @action
-  generateInvitelink() {
+  generateInviteLink() {
     if (this.disabled) {
       return;
     }
@@ -407,12 +409,12 @@ export default Component.extend({
     }
 
     return model
-      .generateInviteLink(this.emailOrUsername.trim(), groupIds, topicId)
+      .generateInviteLink(this.invitee.trim(), groupIds, topicId)
       .then((result) => {
         model.setProperties({
           saving: false,
           finished: true,
-          inviteLink: result,
+          inviteLink: result.link,
         });
 
         if (userInvitedController) {
@@ -465,7 +467,27 @@ export default Component.extend({
   @action
   searchContact() {
     getNativeContact(this.capabilities, ["email"], false).then((result) => {
-      this.set("emailOrUsername", result[0].email[0]);
+      this.set("invitee", result[0].email[0]);
     });
   },
+
+  @action
+  updateInvitee(selected, content) {
+    let invitee = content.findBy("id", selected[0]);
+    if (!invitee && content.length) {
+      invitee =
+        typeof content[0] === "string" ? { id: content[0] } : content[0];
+    }
+    if (invitee) {
+      this.setProperties({
+        invitee: invitee.id.trim(),
+        isInviteeGroup: invitee.isGroup || false,
+      });
+    } else {
+      this.setProperties({
+        invitee: null,
+        isInviteeGroup: false,
+      });
+    }
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/components/json-editor.js b/app/assets/javascripts/discourse/app/components/json-editor.js
new file mode 100644
index 0000000000..9708afe9eb
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/json-editor.js
@@ -0,0 +1,70 @@
+import { action } from "@ember/object";
+import Component from "@ember/component";
+import { create } from "virtual-dom";
+import discourseComputed from "discourse-common/utils/decorators";
+import { iconNode } from "discourse-common/lib/icon-library";
+import loadScript from "discourse/lib/load-script";
+import { schedule } from "@ember/runloop";
+
+export default Component.extend({
+  className: "json-editor-holder",
+  editor: null,
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+
+    loadScript("/javascripts/jsoneditor.js").then(() => {
+      schedule("afterRender", () => {
+        let { JSONEditor } = window;
+
+        JSONEditor.defaults.options.theme = "bootstrap4";
+        JSONEditor.defaults.iconlibs = {
+          discourseIcons: DiscourseJsonSchemaEditorIconlib,
+        };
+        JSONEditor.defaults.options.iconlib = "discourseIcons";
+
+        const el = document.querySelector("#json-editor-holder");
+        this.editor = new JSONEditor(el, {
+          schema: this.model.jsonSchema,
+          disable_array_delete_all_rows: true,
+          disable_array_delete_last_row: true,
+          disable_array_reorder: true,
+          disable_array_copy: true,
+          disable_edit_json: true,
+          disable_properties: true,
+          disable_collapse: true,
+          show_errors: "always",
+          startval: this.model.value ? JSON.parse(this.model.value) : null,
+        });
+      });
+    });
+  },
+
+  @discourseComputed("model.settingName")
+  settingName(name) {
+    return name.replace(/\_/g, " ");
+  },
+
+  @action
+  saveChanges() {
+    const fieldValue = JSON.stringify(this.editor.getValue());
+    this.saveChangesCallback(fieldValue);
+    this.editor.destroy();
+  },
+});
+
+class DiscourseJsonSchemaEditorIconlib {
+  constructor() {
+    this.mapping = {
+      delete: "times",
+      add: "plus",
+    };
+  }
+
+  getIcon(key) {
+    if (!this.mapping[key]) {
+      return;
+    }
+    return create(iconNode(this.mapping[key]));
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/latest-topic-list-item.js b/app/assets/javascripts/discourse/app/components/latest-topic-list-item.js
index 5e48bd6ac2..d6cb6347a5 100644
--- a/app/assets/javascripts/discourse/app/components/latest-topic-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/latest-topic-list-item.js
@@ -1,17 +1,13 @@
-import Component from "@ember/component";
 import {
-  showEntrance,
   navigateToTopic,
+  showEntrance,
 } from "discourse/components/topic-list-item";
+import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   attributeBindings: ["topic.id:data-topic-id"],
-  classNameBindings: [
-    ":latest-topic-list-item",
-    "topic.archived",
-    "topic.visited",
-    "topic.pinned",
-  ],
+  classNameBindings: [":latest-topic-list-item", "unboundClassNames"],
 
   showEntrance,
   navigateToTopic,
@@ -27,4 +23,27 @@ export default Component.extend({
 
   // Can be overwritten by plugins to handle clicks on other parts of the row
   unhandledRowClick() {},
+
+  @discourseComputed("topic")
+  unboundClassNames(topic) {
+    let classes = [];
+
+    if (topic.get("category")) {
+      classes.push("category-" + topic.get("category.fullSlug"));
+    }
+
+    if (topic.get("tags")) {
+      topic.get("tags").forEach((tagName) => classes.push("tag-" + tagName));
+    }
+
+    ["liked", "archived", "bookmarked", "pinned", "closed", "visited"].forEach(
+      (name) => {
+        if (topic.get(name)) {
+          classes.push(name);
+        }
+      }
+    );
+
+    return classes.join(" ");
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/components/link-to-input.js b/app/assets/javascripts/discourse/app/components/link-to-input.js
index 6a988c8c9a..b3b9b70432 100644
--- a/app/assets/javascripts/discourse/app/components/link-to-input.js
+++ b/app/assets/javascripts/discourse/app/components/link-to-input.js
@@ -1,5 +1,5 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
+import { schedule } from "@ember/runloop";
 export default Component.extend({
   showInput: false,
 
diff --git a/app/assets/javascripts/discourse/app/components/links-redirect.js b/app/assets/javascripts/discourse/app/components/links-redirect.js
index e74b6d9f14..45996d88ec 100644
--- a/app/assets/javascripts/discourse/app/components/links-redirect.js
+++ b/app/assets/javascripts/discourse/app/components/links-redirect.js
@@ -1,5 +1,5 @@
-import Component from "@ember/component";
 import ClickTrack from "discourse/lib/click-track";
+import Component from "@ember/component";
 
 export default Component.extend({
   didInsertElement() {
diff --git a/app/assets/javascripts/discourse/app/components/login-buttons.js b/app/assets/javascripts/discourse/app/components/login-buttons.js
index b321aaf6f8..ca8c628671 100644
--- a/app/assets/javascripts/discourse/app/components/login-buttons.js
+++ b/app/assets/javascripts/discourse/app/components/login-buttons.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 import { findAll } from "discourse/models/login-method";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/login-modal.js b/app/assets/javascripts/discourse/app/components/login-modal.js
index 2e3207e6df..52f0acef04 100644
--- a/app/assets/javascripts/discourse/app/components/login-modal.js
+++ b/app/assets/javascripts/discourse/app/components/login-modal.js
@@ -1,6 +1,6 @@
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import cookie from "discourse/lib/cookie";
+import { schedule } from "@ember/runloop";
 
 export default Component.extend({
   didInsertElement() {
diff --git a/app/assets/javascripts/discourse/app/components/mobile-nav.js b/app/assets/javascripts/discourse/app/components/mobile-nav.js
index 197743242d..8648020a20 100644
--- a/app/assets/javascripts/discourse/app/components/mobile-nav.js
+++ b/app/assets/javascripts/discourse/app/components/mobile-nav.js
@@ -1,6 +1,8 @@
-import { next } from "@ember/runloop";
+import { on } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import { on, observes } from "discourse-common/utils/decorators";
+import { next } from "@ember/runloop";
+import { inject as service } from "@ember/service";
+import deprecated from "discourse-common/lib/deprecated";
 
 export default Component.extend({
   @on("init")
@@ -12,6 +14,11 @@ export default Component.extend({
         this.set("classNames", classes);
       }
     }
+    if (this.currentPath) {
+      deprecated("{{mobile-nav}} no longer requires the currentPath property", {
+        since: "2.7.0.beta4",
+      });
+    }
   },
 
   tagName: "ul",
@@ -19,13 +26,18 @@ export default Component.extend({
 
   classNames: ["mobile-nav"],
 
-  @observes("currentPath")
-  currentPathChanged() {
+  router: service(),
+
+  currentRouteChanged() {
     this.set("expanded", false);
     next(() => this._updateSelectedHtml());
   },
 
   _updateSelectedHtml() {
+    if (!this.element || this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
     const active = this.element.querySelector(".active");
     if (active && active.innerHTML) {
       this.set("selectedHtml", active.innerHTML);
@@ -36,6 +48,11 @@ export default Component.extend({
     this._super(...arguments);
 
     this._updateSelectedHtml();
+    this.router.on("routeDidChange", this, this.currentRouteChanged);
+  },
+
+  willDestroyElement() {
+    this.router.off("routeDidChange", this, this.currentRouteChanged);
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/app/components/modal-tab.js b/app/assets/javascripts/discourse/app/components/modal-tab.js
index 07977aff2c..ed87097b6e 100644
--- a/app/assets/javascripts/discourse/app/components/modal-tab.js
+++ b/app/assets/javascripts/discourse/app/components/modal-tab.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
 import Component from "@ember/component";
+import I18n from "I18n";
+import discourseComputed from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
 import { propertyEqual } from "discourse/lib/computed";
-import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "li",
diff --git a/app/assets/javascripts/discourse/app/components/mount-widget.js b/app/assets/javascripts/discourse/app/components/mount-widget.js
index 5d8b319f8e..f0f7e66e4a 100644
--- a/app/assets/javascripts/discourse/app/components/mount-widget.js
+++ b/app/assets/javascripts/discourse/app/components/mount-widget.js
@@ -1,11 +1,11 @@
 import { cancel, scheduleOnce } from "@ember/runloop";
-import Component from "@ember/component";
 import { diff, patch } from "virtual-dom";
-import { WidgetClickHook } from "discourse/widgets/hooks";
 import { queryRegistry, traverseCustomWidgets } from "discourse/widgets/widget";
-import { getRegister } from "discourse-common/lib/get-owner";
+import Component from "@ember/component";
 import DirtyKeys from "discourse/lib/dirty-keys";
+import { WidgetClickHook } from "discourse/widgets/hooks";
 import { camelize } from "@ember/string";
+import { getRegister } from "discourse-common/lib/get-owner";
 
 let _cleanCallbacks = {};
 export function addWidgetCleanCallback(widgetName, fn) {
diff --git a/app/assets/javascripts/discourse/app/components/nav-item.js b/app/assets/javascripts/discourse/app/components/nav-item.js
index d8afc6b39c..54e0562ec0 100644
--- a/app/assets/javascripts/discourse/app/components/nav-item.js
+++ b/app/assets/javascripts/discourse/app/components/nav-item.js
@@ -1,9 +1,9 @@
+import Component from "@ember/component";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject as service } from "@ember/service";
-import Component from "@ember/component";
-/* You might be looking for navigation-item. */
 import { iconHTML } from "discourse-common/lib/icon-library";
+/* You might be looking for navigation-item. */
+import { inject as service } from "@ember/service";
 
 export default Component.extend({
   tagName: "li",
diff --git a/app/assets/javascripts/discourse/app/components/navigation-bar.js b/app/assets/javascripts/discourse/app/components/navigation-bar.js
index 45041bc4cb..5c354a80f5 100644
--- a/app/assets/javascripts/discourse/app/components/navigation-bar.js
+++ b/app/assets/javascripts/discourse/app/components/navigation-bar.js
@@ -1,9 +1,9 @@
-import { next } from "@ember/runloop";
-import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
-import { renderedConnectorsFor } from "discourse/lib/plugin-connectors";
 import FilterModeMixin from "discourse/mixins/filter-mode";
+import { next } from "@ember/runloop";
+import { renderedConnectorsFor } from "discourse/lib/plugin-connectors";
 
 export default Component.extend(FilterModeMixin, {
   tagName: "ul",
@@ -52,7 +52,7 @@ export default Component.extend(FilterModeMixin, {
   },
 
   ensureDropClosed() {
-    if (!this.expanded) {
+    if (this.expanded) {
       this.set("expanded", false);
     }
     $(window).off("click.navigation-bar");
diff --git a/app/assets/javascripts/discourse/app/components/navigation-item.js b/app/assets/javascripts/discourse/app/components/navigation-item.js
index d5768eb202..29b95a405c 100644
--- a/app/assets/javascripts/discourse/app/components/navigation-item.js
+++ b/app/assets/javascripts/discourse/app/components/navigation-item.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import FilterModeMixin from "discourse/mixins/filter-mode";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend(FilterModeMixin, {
   tagName: "li",
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 e9cf6a936d..d19abc998d 100644
--- a/app/assets/javascripts/discourse/app/components/notification-consent-banner.js
+++ b/app/assets/javascripts/discourse/app/components/notification-consent-banner.js
@@ -1,6 +1,6 @@
+import DesktopNotificationConfig from "discourse/components/desktop-notification-config";
 import discourseComputed from "discourse-common/utils/decorators";
 import { keyValueStore as pushNotificationKeyValueStore } from "discourse/lib/push-notifications";
-import DesktopNotificationConfig from "discourse/components/desktop-notification-config";
 
 const userDismissedPromptKey = "dismissed-prompt";
 
diff --git a/app/assets/javascripts/discourse/app/components/plugin-connector.js b/app/assets/javascripts/discourse/app/components/plugin-connector.js
index 34dcb9ce4e..abf6d89f11 100644
--- a/app/assets/javascripts/discourse/app/components/plugin-connector.js
+++ b/app/assets/javascripts/discourse/app/components/plugin-connector.js
@@ -1,8 +1,8 @@
+import { computed, defineProperty } from "@ember/object";
 import Component from "@ember/component";
-import { defineProperty, computed } from "@ember/object";
-import deprecated from "discourse-common/lib/deprecated";
-import { buildArgsWithDeprecations } from "discourse/lib/plugin-connectors";
 import { afterRender } from "discourse-common/utils/decorators";
+import { buildArgsWithDeprecations } from "discourse/lib/plugin-connectors";
+import deprecated from "discourse-common/lib/deprecated";
 
 let _decorators = {};
 
diff --git a/app/assets/javascripts/discourse/app/components/plugin-outlet.js b/app/assets/javascripts/discourse/app/components/plugin-outlet.js
index 1fd1f402f7..410b070a1b 100644
--- a/app/assets/javascripts/discourse/app/components/plugin-outlet.js
+++ b/app/assets/javascripts/discourse/app/components/plugin-outlet.js
@@ -1,4 +1,7 @@
-import Component from "@ember/component";
+import {
+  buildArgsWithDeprecations,
+  renderedConnectorsFor,
+} from "discourse/lib/plugin-connectors";
 /**
    A plugin outlet is an extension point for templates where other templates can
    be inserted by plugins.
@@ -30,10 +33,7 @@ import Component from "@ember/component";
    The list of disabled plugins is returned via the `Site` singleton.
 
 **/
-import {
-  renderedConnectorsFor,
-  buildArgsWithDeprecations,
-} from "discourse/lib/plugin-connectors";
+import Component from "@ember/component";
 
 export default Component.extend({
   tagName: "span",
diff --git a/app/assets/javascripts/discourse/app/components/popup-input-tip.js b/app/assets/javascripts/discourse/app/components/popup-input-tip.js
index f15a50c227..9d02aeff01 100644
--- a/app/assets/javascripts/discourse/app/components/popup-input-tip.js
+++ b/app/assets/javascripts/discourse/app/components/popup-input-tip.js
@@ -1,7 +1,7 @@
 import { alias, not } from "@ember/object/computed";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default Component.extend({
   classNameBindings: [":popup-tip", "good", "bad", "lastShownAt::hide"],
@@ -28,7 +28,7 @@ export default Component.extend({
   @observes("lastShownAt")
   bounce() {
     if (this.lastShownAt) {
-      var $elem = $(this.element);
+      let $elem = $(this.element);
       if (!this.animateAttribute) {
         this.animateAttribute = $elem.css("left") === "auto" ? "right" : "left";
       }
@@ -51,7 +51,7 @@ export default Component.extend({
   },
 
   bounceLeft($elem) {
-    for (var i = 0; i < 5; i++) {
+    for (let i = 0; i < 5; i++) {
       $elem
         .animate({ left: "+=" + this.bouncePixels }, this.bounceDelay)
         .animate({ left: "-=" + this.bouncePixels }, this.bounceDelay);
@@ -59,7 +59,7 @@ export default Component.extend({
   },
 
   bounceRight($elem) {
-    for (var i = 0; i < 5; i++) {
+    for (let i = 0; i < 5; i++) {
       $elem
         .animate({ right: "-=" + this.bouncePixels }, this.bounceDelay)
         .animate({ right: "+=" + this.bouncePixels }, this.bounceDelay);
diff --git a/app/assets/javascripts/discourse/app/components/preference-checkbox.js b/app/assets/javascripts/discourse/app/components/preference-checkbox.js
index f38ed1f6c0..d138f58e19 100644
--- a/app/assets/javascripts/discourse/app/components/preference-checkbox.js
+++ b/app/assets/javascripts/discourse/app/components/preference-checkbox.js
@@ -1,6 +1,6 @@
+import Component from "@ember/component";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
 
 export default Component.extend({
   classNames: ["controls"],
diff --git a/app/assets/javascripts/discourse/app/components/pwa-install-banner.js b/app/assets/javascripts/discourse/app/components/pwa-install-banner.js
index 86e91ab2b3..9f29c72cf3 100644
--- a/app/assets/javascripts/discourse/app/components/pwa-install-banner.js
+++ b/app/assets/javascripts/discourse/app/components/pwa-install-banner.js
@@ -1,5 +1,5 @@
-import Component from "@ember/component";
 import discourseComputed, { bind, on } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
 
 const USER_DISMISSED_PROMPT_KEY = "dismissed-pwa-install-banner";
 
diff --git a/app/assets/javascripts/discourse/app/components/quote-button.js b/app/assets/javascripts/discourse/app/components/quote-button.js
index 08b0d52ed9..45ba617836 100644
--- a/app/assets/javascripts/discourse/app/components/quote-button.js
+++ b/app/assets/javascripts/discourse/app/components/quote-button.js
@@ -1,18 +1,18 @@
-import { schedule } from "@ember/runloop";
-import Component from "@ember/component";
-import discourseDebounce from "discourse/lib/debounce";
-import toMarkdown from "discourse/lib/to-markdown";
 import {
-  selectedText,
-  selectedElement,
   postUrl,
+  selectedElement,
+  selectedText,
 } from "discourse/lib/utilities";
-import { getAbsoluteURL } from "discourse-common/lib/get-url";
+import Component from "@ember/component";
 import { INPUT_DELAY } from "discourse-common/config/environment";
-import { action } from "@ember/object";
-import discourseComputed from "discourse-common/utils/decorators";
 import Sharing from "discourse/lib/sharing";
+import { action } from "@ember/object";
 import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { getAbsoluteURL } from "discourse-common/lib/get-url";
+import { schedule } from "@ember/runloop";
+import toMarkdown from "discourse/lib/to-markdown";
 
 function getQuoteTitle(element) {
   const titleEl = element.querySelector(".title");
@@ -183,10 +183,9 @@ export default Component.extend({
 
     const { isWinphone, isAndroid } = this.capabilities;
     const wait = isWinphone || isAndroid ? INPUT_DELAY : 25;
-    const onSelectionChanged = discourseDebounce(
-      () => this._selectionChanged(),
-      wait
-    );
+    const onSelectionChanged = () => {
+      discourseDebounce(this, this._selectionChanged, wait);
+    };
 
     $(document)
       .on("mousedown.quote-button", (e) => {
diff --git a/app/assets/javascripts/discourse/app/components/radio-button.js b/app/assets/javascripts/discourse/app/components/radio-button.js
index 40a3abf07c..c7411a860a 100644
--- a/app/assets/javascripts/discourse/app/components/radio-button.js
+++ b/app/assets/javascripts/discourse/app/components/radio-button.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "input",
diff --git a/app/assets/javascripts/discourse/app/components/related-messages.js b/app/assets/javascripts/discourse/app/components/related-messages.js
index 9d78fcee9e..daa1a058be 100644
--- a/app/assets/javascripts/discourse/app/components/related-messages.js
+++ b/app/assets/javascripts/discourse/app/components/related-messages.js
@@ -1,6 +1,6 @@
-import getURL from "discourse-common/lib/get-url";
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
 
 export default Component.extend({
   tagName: "",
diff --git a/app/assets/javascripts/discourse/app/components/relative-time-picker.js b/app/assets/javascripts/discourse/app/components/relative-time-picker.js
new file mode 100644
index 0000000000..cb23e50cad
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/relative-time-picker.js
@@ -0,0 +1,190 @@
+import discourseComputed, { on } from "discourse-common/utils/decorators";
+import { isBlank } from "@ember/utils";
+import Component from "@ember/component";
+import I18n from "I18n";
+import { action } from "@ember/object";
+
+export default Component.extend({
+  tagName: "",
+  selectedInterval: "mins",
+  durationMinutes: null,
+  durationHours: null,
+  duration: null,
+  hiddenIntervals: null,
+
+  @on("init")
+  cloneDuration() {
+    let mins = this.durationMinutes;
+    let hours = this.durationHours;
+
+    if (hours && mins) {
+      throw new Error(
+        "relative-time needs initial duration in hours OR minutes, both are not supported"
+      );
+    }
+
+    if (hours) {
+      this._setInitialDurationFromHours(hours);
+    } else {
+      this._setInitialDurationFromMinutes(mins);
+    }
+  },
+
+  @on("init")
+  setHiddenIntervals() {
+    this.hiddenIntervals = this.hiddenIntervals || [];
+  },
+
+  _roundedDuration(duration) {
+    let rounded = parseFloat(duration.toFixed(2));
+
+    // showing 2.00 instead of just 2 in the input is weird
+    if (rounded % 1 === 0) {
+      return parseInt(rounded, 10);
+    }
+
+    return rounded;
+  },
+
+  _setInitialDurationFromHours(hours) {
+    if (hours >= 8760) {
+      this.setProperties({
+        duration: this._roundedDuration(hours / 365 / 24),
+        selectedInterval: "years",
+      });
+    } else if (hours >= 730) {
+      this.setProperties({
+        duration: this._roundedDuration(hours / 30 / 24),
+        selectedInterval: "months",
+      });
+    } else if (hours >= 24) {
+      this.setProperties({
+        duration: this._roundedDuration(hours / 24),
+        selectedInterval: "days",
+      });
+    } else if (hours < 1) {
+      this.setProperties({
+        duration: this._roundedDuration(hours * 60),
+        selectedInterval: "mins",
+      });
+    } else {
+      this.setProperties({
+        duration: hours,
+        selectedInterval: "hours",
+      });
+    }
+  },
+
+  _setInitialDurationFromMinutes(mins) {
+    if (mins >= 525600) {
+      this.setProperties({
+        duration: this._roundedDuration(mins / 365 / 60 / 24),
+        selectedInterval: "years",
+      });
+    } else if (mins >= 43800) {
+      this.setProperties({
+        duration: this._roundedDuration(mins / 30 / 60 / 24),
+        selectedInterval: "months",
+      });
+    } else if (mins >= 1440) {
+      this.setProperties({
+        duration: this._roundedDuration(mins / 60 / 24),
+        selectedInterval: "days",
+      });
+    } else if (mins >= 60) {
+      this.setProperties({
+        duration: this._roundedDuration(mins / 60),
+        selectedInterval: "hours",
+      });
+    } else {
+      this.setProperties({
+        duration: mins,
+        selectedInterval: "mins",
+      });
+    }
+  },
+
+  @discourseComputed("selectedInterval")
+  durationMin(selectedInterval) {
+    return selectedInterval === "mins" ? 1 : 0.1;
+  },
+
+  @discourseComputed("selectedInterval")
+  durationStep(selectedInterval) {
+    return selectedInterval === "mins" ? 1 : 0.05;
+  },
+
+  @discourseComputed("duration")
+  intervals(duration) {
+    const count = duration ? parseFloat(duration) : 0;
+
+    return [
+      {
+        id: "mins",
+        name: I18n.t("relative_time_picker.minutes", { count }),
+      },
+      {
+        id: "hours",
+        name: I18n.t("relative_time_picker.hours", { count }),
+      },
+      {
+        id: "days",
+        name: I18n.t("relative_time_picker.days", { count }),
+      },
+      {
+        id: "months",
+        name: I18n.t("relative_time_picker.months", { count }),
+      },
+      {
+        id: "years",
+        name: I18n.t("relative_time_picker.years", { count }),
+      },
+    ].filter((interval) => !this.hiddenIntervals.includes(interval.id));
+  },
+
+  @discourseComputed("selectedInterval", "duration")
+  calculatedMinutes(interval, duration) {
+    if (isBlank(duration)) {
+      return null;
+    }
+    duration = parseFloat(duration);
+
+    let mins = 0;
+
+    switch (interval) {
+      case "mins":
+        // we round up here in case the user manually inputted a step < 1
+        mins = Math.ceil(duration);
+        break;
+      case "hours":
+        mins = duration * 60;
+        break;
+      case "days":
+        mins = duration * 60 * 24;
+        break;
+      case "months":
+        mins = duration * 60 * 24 * 30; // less accurate because of varying days in months
+        break;
+      case "years":
+        mins = duration * 60 * 24 * 365; // least accurate because of varying days in months/years
+        break;
+    }
+
+    return mins;
+  },
+
+  @action
+  onChangeInterval(newInterval) {
+    this.set("selectedInterval", newInterval);
+    if (this.onChange) {
+      this.onChange(this.calculatedMinutes);
+    }
+  },
+
+  @action
+  onChangeDuration() {
+    if (this.onChange) {
+      this.onChange(this.calculatedMinutes);
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-bundled-action.js b/app/assets/javascripts/discourse/app/components/reviewable-bundled-action.js
index 6a84b18eec..27b3942f43 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-bundled-action.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-bundled-action.js
@@ -1,11 +1,21 @@
-import { gt, alias } from "@ember/object/computed";
+import { alias, gt } from "@ember/object/computed";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import { isRTL } from "discourse/lib/text-direction";
+
 export default Component.extend({
   tagName: "",
 
   multiple: gt("bundle.actions.length", 1),
   first: alias("bundle.actions.firstObject"),
 
+  @discourseComputed()
+  placement() {
+    const vertical = this.site.mobileView ? "top" : "bottom",
+      horizontal = isRTL() ? "end" : "start";
+    return `${vertical}-${horizontal}`;
+  },
+
   actions: {
     performById(id) {
       this.attrs.performAction(this.get("bundle.actions").findBy("id", id));
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.js b/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.js
index 8405fc041a..b8fef00b17 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.js
@@ -1,7 +1,7 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Component.extend({
   tagName: "",
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-conversation-post.js b/app/assets/javascripts/discourse/app/components/reviewable-conversation-post.js
index 4cad0417be..375bac5343 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-conversation-post.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-conversation-post.js
@@ -1,5 +1,5 @@
-import { gte } from "@ember/object/computed";
 import Component from "@ember/component";
+import { gte } from "@ember/object/computed";
 export default Component.extend({
   showUsername: gte("index", 1),
 });
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-histories.js b/app/assets/javascripts/discourse/app/components/reviewable-histories.js
index 9b7e1fb10a..b50025f33d 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-histories.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-histories.js
@@ -1,5 +1,5 @@
-import { filterBy } from "@ember/object/computed";
 import Component from "@ember/component";
+import { filterBy } from "@ember/object/computed";
 export default Component.extend({
   filteredHistories: filterBy("histories", "created", false),
 });
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js
index 39cfd92faa..bf436f4a07 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-item.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.js
@@ -1,17 +1,25 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import Category from "discourse/models/category";
-import optionalService from "discourse/lib/optional-service";
-import showModal from "discourse/lib/show-modal";
-import { dasherize } from "@ember/string";
-import { set } from "@ember/object";
+import Component from "@ember/component";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
+import { dasherize } from "@ember/string";
+import discourseComputed from "discourse-common/utils/decorators";
+import optionalService from "discourse/lib/optional-service";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { set } from "@ember/object";
+import showModal from "discourse/lib/show-modal";
 
 let _components = {};
 
+const pluginReviewableParams = {};
+
+export function addPluginReviewableParam(reviewableType, param) {
+  pluginReviewableParams[reviewableType]
+    ? pluginReviewableParams[reviewableType].push(param)
+    : (pluginReviewableParams[reviewableType] = [param]);
+}
+
 export default Component.extend({
   adminTools: optionalService(),
   tagName: "",
@@ -106,10 +114,23 @@ export default Component.extend({
     let performAction = () => {
       let version = reviewable.get("version");
       this.set("updating", true);
+
+      const data = {
+        send_email: reviewable.sendEmail,
+        reject_reason: reviewable.rejectReason,
+      };
+
+      (pluginReviewableParams[reviewable.type] || []).forEach((param) => {
+        if (reviewable[param]) {
+          data[param] = reviewable[param];
+        }
+      });
+
       return ajax(
         `/review/${reviewable.id}/perform/${action.id}?version=${version}`,
         {
           type: "PUT",
+          data,
         }
       )
         .then((result) => {
@@ -117,7 +138,10 @@ export default Component.extend({
 
           // "fast track" to update the current user's reviewable count before the message bus finds out.
           if (performResult.reviewable_count !== undefined) {
-            this.currentUser.set("reviewable_count", result.reviewable_count);
+            this.currentUser.set(
+              "reviewable_count",
+              performResult.reviewable_count
+            );
           }
 
           if (this.attrs.remove) {
@@ -222,12 +246,30 @@ export default Component.extend({
       }
 
       let msg = action.get("confirm_message");
+      let requireRejectReason = action.get("require_reject_reason");
+      let customModal = action.get("custom_modal");
       if (msg) {
         bootbox.confirm(msg, (answer) => {
           if (answer) {
             return this._performConfirmed(action);
           }
         });
+      } else if (requireRejectReason) {
+        showModal("reject-reason-reviewable", {
+          title: "review.reject_reason.title",
+          model: this.reviewable,
+        }).setProperties({
+          performConfirmed: this._performConfirmed.bind(this),
+          action,
+        });
+      } else if (customModal) {
+        showModal(customModal, {
+          title: `review.${customModal}.title`,
+          model: this.reviewable,
+        }).setProperties({
+          performConfirmed: this._performConfirmed.bind(this),
+          action,
+        });
       } else {
         return this._performConfirmed(action);
       }
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.js b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/reviewable-flagged-post.js
rename to app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
index 7e57c8ed62..84c27f152f 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
@@ -1,8 +1,8 @@
+import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { gt } from "@ember/object/computed";
-import Component from "@ember/component";
-import { longDate } from "discourse/lib/formatter";
 import { historyHeat } from "discourse/widgets/post-edits-indicator";
+import { longDate } from "discourse/lib/formatter";
 import showModal from "discourse/lib/show-modal";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-score.js b/app/assets/javascripts/discourse/app/components/reviewable-score.js
index 2cf3ba72d3..5ca9a262e7 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-score.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-score.js
@@ -1,6 +1,6 @@
+import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { gt } from "@ember/object/computed";
-import Component from "@ember/component";
 
 export default Component.extend({
   tagName: "",
diff --git a/app/assets/javascripts/discourse/app/components/save-controls.js b/app/assets/javascripts/discourse/app/components/save-controls.js
index b0f5f84f3e..73e0e0ba74 100644
--- a/app/assets/javascripts/discourse/app/components/save-controls.js
+++ b/app/assets/javascripts/discourse/app/components/save-controls.js
@@ -1,6 +1,6 @@
+import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { or } from "@ember/object/computed";
-import Component from "@ember/component";
 
 export default Component.extend({
   classNames: ["controls", "save-button"],
diff --git a/app/assets/javascripts/discourse/app/components/scroll-tracker.js b/app/assets/javascripts/discourse/app/components/scroll-tracker.js
index 7fb7b398e1..228a50d1a2 100644
--- a/app/assets/javascripts/discourse/app/components/scroll-tracker.js
+++ b/app/assets/javascripts/discourse/app/components/scroll-tracker.js
@@ -1,6 +1,6 @@
-import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import Scrolling from "discourse/mixins/scrolling";
+import { next } from "@ember/runloop";
 
 export default Component.extend(Scrolling, {
   didReceiveAttrs() {
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 a5bb6c089f..612766c807 100644
--- a/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js
+++ b/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js
@@ -1,11 +1,14 @@
-import { debounce, next, scheduleOnce } from "@ember/runloop";
+import { cloak, uncloak } from "discourse/widgets/post-stream";
+import { 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";
+import discourseDebounce from "discourse-common/lib/debounce";
 import { isWorkaroundActive } from "discourse/lib/safari-hacks";
 import offsetCalculator from "discourse/lib/offset-calculator";
 import { inject as service } from "@ember/service";
 
+const DEBOUNCE_DELAY = 50;
+
 function findTopView($posts, viewportTop, postsWrapperTop, min, max) {
   if (max < min) {
     return min;
@@ -39,12 +42,14 @@ export default MountWidget.extend({
     return this.getProperties(
       "posts",
       "canCreatePost",
+      "filteredPostsCount",
       "multiSelect",
       "gaps",
       "selectedQuery",
       "selectedPostsCount",
       "searchService",
-      "showReadIndicator"
+      "showReadIndicator",
+      "streamFilters"
     );
   },
 
@@ -309,13 +314,13 @@ export default MountWidget.extend({
   },
 
   _debouncedScroll() {
-    debounce(this, this._scrollTriggered, 10);
+    discourseDebounce(this, this._scrollTriggered, DEBOUNCE_DELAY);
   },
 
   didInsertElement() {
     this._super(...arguments);
-    const debouncedScroll = () => debounce(this, this._scrollTriggered, 10);
-
+    const debouncedScroll = () =>
+      discourseDebounce(this, this._scrollTriggered, DEBOUNCE_DELAY);
     this._previouslyNearby = {};
 
     this.appEvents.on("post-stream:refresh", this, "_debouncedScroll");
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 15aad708d0..86d11e1bf0 100644
--- a/app/assets/javascripts/discourse/app/components/search-advanced-options.js
+++ b/app/assets/javascripts/discourse/app/components/search-advanced-options.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
+import Category from "discourse/models/category";
 import Component from "@ember/component";
+import I18n from "I18n";
 import { action } from "@ember/object";
 import { escapeExpression } from "discourse/lib/utilities";
-import Category from "discourse/models/category";
 
 const REGEXP_BLOCKS = /(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/g;
 
diff --git a/app/assets/javascripts/discourse/app/components/tag-heading.js b/app/assets/javascripts/discourse/app/components/search-result-entries.js
similarity index 98%
rename from app/assets/javascripts/discourse/app/components/tag-heading.js
rename to app/assets/javascripts/discourse/app/components/search-result-entries.js
index 0e6d50b17d..44494409ab 100644
--- a/app/assets/javascripts/discourse/app/components/tag-heading.js
+++ b/app/assets/javascripts/discourse/app/components/search-result-entries.js
@@ -1,4 +1,5 @@
 import Component from "@ember/component";
+
 export default Component.extend({
   tagName: "",
 });
diff --git a/app/assets/javascripts/discourse/app/components/search-result-entry.js b/app/assets/javascripts/discourse/app/components/search-result-entry.js
new file mode 100644
index 0000000000..44494409ab
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-result-entry.js
@@ -0,0 +1,5 @@
+import Component from "@ember/component";
+
+export default Component.extend({
+  tagName: "",
+});
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 2c78a6736d..cad882f85c 100644
--- a/app/assets/javascripts/discourse/app/components/search-text-field.js
+++ b/app/assets/javascripts/discourse/app/components/search-text-field.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
+import I18n from "I18n";
 import TextField from "discourse/components/text-field";
 import { applySearchAutocomplete } from "discourse/lib/search";
 
 export default TextField.extend({
-  autocomplete: "discourse",
+  autocomplete: "discourse-search",
 
   @discourseComputed("searchService.searchContextEnabled")
   placeholder(searchContextEnabled) {
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 8467026b06..3f0c40b381 100644
--- a/app/assets/javascripts/discourse/app/components/second-factor-form.js
+++ b/app/assets/javascripts/discourse/app/components/second-factor-form.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import I18n from "I18n";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   @discourseComputed("secondFactorMethod")
diff --git a/app/assets/javascripts/discourse/app/components/second-factor-input.js b/app/assets/javascripts/discourse/app/components/second-factor-input.js
index f1a2ac9fcd..b1da9e9d0e 100644
--- a/app/assets/javascripts/discourse/app/components/second-factor-input.js
+++ b/app/assets/javascripts/discourse/app/components/second-factor-input.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   @discourseComputed("secondFactorMethod")
diff --git a/app/assets/javascripts/discourse/app/components/share-panel.js b/app/assets/javascripts/discourse/app/components/share-panel.js
index 5dc0012d12..af0fb62147 100644
--- a/app/assets/javascripts/discourse/app/components/share-panel.js
+++ b/app/assets/javascripts/discourse/app/components/share-panel.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
-import { escapeExpression } from "discourse/lib/utilities";
-import discourseComputed from "discourse-common/utils/decorators";
+import I18n from "I18n";
 import Sharing from "discourse/lib/sharing";
+import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
+import { escapeExpression } from "discourse/lib/utilities";
+import { isEmpty } from "@ember/utils";
 import { later } from "@ember/runloop";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/share-popup.js b/app/assets/javascripts/discourse/app/components/share-popup.js
index b62f08dc2c..a2d9decc13 100644
--- a/app/assets/javascripts/discourse/app/components/share-popup.js
+++ b/app/assets/javascripts/discourse/app/components/share-popup.js
@@ -1,13 +1,13 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import { scheduleOnce, later } from "@ember/runloop";
-import Component from "@ember/component";
-import { wantsNewWindow } from "discourse/lib/intercept-click";
-import { longDateNoYear } from "discourse/lib/formatter";
 import discourseComputed, { bind } from "discourse-common/utils/decorators";
+import { later, scheduleOnce } from "@ember/runloop";
+import Component from "@ember/component";
+import I18n from "I18n";
 import Sharing from "discourse/lib/sharing";
-import { nativeShare } from "discourse/lib/pwa-utils";
 import { alias } from "@ember/object/computed";
+import { isEmpty } from "@ember/utils";
+import { longDateNoYear } from "discourse/lib/formatter";
+import { nativeShare } from "discourse/lib/pwa-utils";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
 
 export default Component.extend({
   elementId: "share-link",
@@ -56,7 +56,7 @@ export default Component.extend({
   },
 
   _showUrl($target, url) {
-    const $currentTargetOffset = $target.offset();
+    const currentTargetOffset = $target.offset();
     const $this = $(this.element);
 
     if (isEmpty(url)) {
@@ -69,7 +69,7 @@ export default Component.extend({
     }
 
     const shareLinkWidth = $this.width();
-    let x = $currentTargetOffset.left - shareLinkWidth / 2;
+    let x = currentTargetOffset.left - shareLinkWidth / 2;
     if (x < 25) {
       x = 25;
     }
@@ -78,15 +78,18 @@ export default Component.extend({
     }
 
     const header = $(".d-header");
-    let y = $currentTargetOffset.top - ($this.height() + 20);
+    let y = currentTargetOffset.top - ($this.height() + 20);
     if (y < header.offset().top + header.height()) {
-      y = $currentTargetOffset.top + 10;
+      y = currentTargetOffset.top + 10;
     }
 
-    $this.css({ top: "" + y + "px" });
+    this.element.style.top = `${y}px`;
 
     if (!this.site.mobileView) {
-      $this.css({ left: "" + x + "px" });
+      this.element.style.left = `${x}px`;
+      if (document.documentElement.classList.contains("rtl")) {
+        this.element.style.right = "unset";
+      }
     }
     this.set("link", url);
     this.set("visible", true);
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 927f259d10..a68fe3c1eb 100644
--- a/app/assets/javascripts/discourse/app/components/shared-draft-controls.js
+++ b/app/assets/javascripts/discourse/app/components/shared-draft-controls.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import I18n from "I18n";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "",
@@ -21,11 +21,15 @@ export default Component.extend({
       bootbox.confirm(I18n.t("shared_drafts.confirm_publish"), (result) => {
         if (result) {
           this.set("publishing", true);
-          let destId = this.get("topic.destination_category_id");
+          const destinationCategoryId = this.topic.destination_category_id;
           this.topic
             .publish()
             .then(() => {
-              this.set("topic.category_id", destId);
+              this.topic.setProperties({
+                category_id: destinationCategoryId,
+                destination_category_id: undefined,
+                is_shared_draft: false,
+              });
             })
             .finally(() => {
               this.set("publishing", false);
diff --git a/app/assets/javascripts/discourse/app/components/signup-cta.js b/app/assets/javascripts/discourse/app/components/signup-cta.js
index 6008bf3b46..944e536311 100644
--- a/app/assets/javascripts/discourse/app/components/signup-cta.js
+++ b/app/assets/javascripts/discourse/app/components/signup-cta.js
@@ -1,5 +1,5 @@
-import { later } from "@ember/runloop";
 import Component from "@ember/component";
+import { later } from "@ember/runloop";
 import { on } from "@ember/object/evented";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js
index ffeaebadd4..eac53665d6 100644
--- a/app/assets/javascripts/discourse/app/components/site-header.js
+++ b/app/assets/javascripts/discourse/app/components/site-header.js
@@ -1,385 +1,425 @@
-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";
 import PanEvents, {
-  SWIPE_VELOCITY,
   SWIPE_DISTANCE_THRESHOLD,
+  SWIPE_VELOCITY,
   SWIPE_VELOCITY_THRESHOLD,
 } from "discourse/mixins/pan-events";
+import { cancel, later, schedule } from "@ember/runloop";
+import Docking from "discourse/mixins/docking";
+import MountWidget from "discourse/components/mount-widget";
+import Mousetrap from "mousetrap";
+import RerenderOnDoNotDisturbChange from "discourse/mixins/rerender-on-do-not-disturb-change";
+import { observes } from "discourse-common/utils/decorators";
 import { topicTitleDecorators } from "discourse/components/topic-title";
 
-const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
-  widget: "header",
-  docAt: null,
-  dockedHeader: null,
-  _animate: false,
-  _isPanning: false,
-  _panMenuOrigin: "right",
-  _panMenuOffset: 0,
-  _scheduledMovingAnimation: null,
-  _scheduledRemoveAnimate: null,
-  _topic: null,
+const SiteHeaderComponent = MountWidget.extend(
+  Docking,
+  PanEvents,
+  RerenderOnDoNotDisturbChange,
+  {
+    widget: "header",
+    docAt: null,
+    dockedHeader: null,
+    _animate: false,
+    _isPanning: false,
+    _panMenuOrigin: "right",
+    _panMenuOffset: 0,
+    _scheduledMovingAnimation: null,
+    _scheduledRemoveAnimate: null,
+    _topic: null,
+    _mousetrap: null,
 
-  @observes(
-    "currentUser.unread_notifications",
-    "currentUser.unread_high_priority_notifications",
-    "currentUser.reviewable_count"
-  )
-  notificationsChanged() {
-    this.queueRerender();
-  },
+    @observes(
+      "currentUser.unread_notifications",
+      "currentUser.unread_high_priority_notifications",
+      "currentUser.reviewable_count"
+    )
+    notificationsChanged() {
+      this.queueRerender();
+    },
 
-  _animateOpening($panel) {
-    $panel.css({ right: "", left: "" });
-    this._panMenuOffset = 0;
-  },
-
-  _animateClosing($panel, menuOrigin, windowWidth) {
-    $panel.css(menuOrigin, -windowWidth);
-    this._animate = true;
-    schedule("afterRender", () => {
-      this.eventDispatched("dom:clean", "header");
+    _animateOpening($panel) {
+      $panel.css({ right: "", left: "" });
       this._panMenuOffset = 0;
-    });
-  },
+    },
 
-  _isRTL() {
-    return $("html").css("direction") === "rtl";
-  },
+    _animateClosing($panel, menuOrigin, windowWidth) {
+      $panel.css(menuOrigin, -windowWidth);
+      this._animate = true;
+      schedule("afterRender", () => {
+        this.eventDispatched("dom:clean", "header");
+        this._panMenuOffset = 0;
+      });
+    },
 
-  _leftMenuClass() {
-    return this._isRTL() ? ".user-menu" : ".hamburger-panel";
-  },
+    _isRTL() {
+      return $("html").css("direction") === "rtl";
+    },
 
-  _leftMenuAction() {
-    return this._isRTL() ? "toggleUserMenu" : "toggleHamburger";
-  },
+    _leftMenuClass() {
+      return this._isRTL() ? ".user-menu" : ".hamburger-panel";
+    },
 
-  _rightMenuAction() {
-    return this._isRTL() ? "toggleHamburger" : "toggleUserMenu";
-  },
+    _leftMenuAction() {
+      return this._isRTL() ? "toggleUserMenu" : "toggleHamburger";
+    },
 
-  _handlePanDone(offset, event) {
-    const $window = $(window);
-    const windowWidth = $window.width();
-    const $menuPanels = $(".menu-panel");
-    const menuOrigin = this._panMenuOrigin;
-    this._shouldMenuClose(event, menuOrigin)
-      ? (offset += SWIPE_VELOCITY)
-      : (offset -= SWIPE_VELOCITY);
-    $menuPanels.each((idx, panel) => {
-      const $panel = $(panel);
-      const $headerCloak = $(".header-cloak");
-      $panel.css(menuOrigin, -offset);
-      $headerCloak.css("opacity", Math.min(0.5, (300 - offset) / 600));
-      if (offset > windowWidth) {
-        this._animateClosing($panel, menuOrigin, windowWidth);
-      } else if (offset <= 0) {
-        this._animateOpening($panel);
-      } else {
-        //continue to open or close menu
-        this._scheduledMovingAnimation = window.requestAnimationFrame(() =>
-          this._handlePanDone(offset, event)
-        );
-      }
-    });
-  },
+    _rightMenuAction() {
+      return this._isRTL() ? "toggleHamburger" : "toggleUserMenu";
+    },
 
-  _shouldMenuClose(e, menuOrigin) {
-    // menu should close after a pan either:
-    // if a user moved the panel closed past a threshold and away and is NOT swiping back open
-    // if a user swiped to close fast enough regardless of distance
-    if (menuOrigin === "right") {
-      return (
-        (e.deltaX > SWIPE_DISTANCE_THRESHOLD &&
-          e.velocityX > -SWIPE_VELOCITY_THRESHOLD) ||
-        e.velocityX > 0
-      );
-    } else {
-      return (
-        (e.deltaX < -SWIPE_DISTANCE_THRESHOLD &&
-          e.velocityX < SWIPE_VELOCITY_THRESHOLD) ||
-        e.velocityX < 0
-      );
-    }
-  },
-
-  panStart(e) {
-    const center = e.center;
-    const $centeredElement = $(document.elementFromPoint(center.x, center.y));
-    if (
-      ($centeredElement.hasClass("panel-body") ||
-        $centeredElement.hasClass("header-cloak") ||
-        $centeredElement.parents(".panel-body").length) &&
-      (e.direction === "left" || e.direction === "right")
-    ) {
-      e.originalEvent.preventDefault();
-      this._isPanning = true;
-    } else {
-      this._isPanning = false;
-    }
-  },
-
-  panEnd(e) {
-    if (!this._isPanning) {
-      return;
-    }
-    this._isPanning = false;
-    $(".menu-panel").each((idx, panel) => {
-      const $panel = $(panel);
-      let offset = $panel.css("right");
-      if (this._panMenuOrigin === "left") {
-        offset = $panel.css("left");
-      }
-      offset = Math.abs(parseInt(offset, 10));
-      this._handlePanDone(offset, e);
-    });
-  },
-
-  panMove(e) {
-    if (!this._isPanning) {
-      return;
-    }
-    const $menuPanels = $(".menu-panel");
-    $menuPanels.each((idx, panel) => {
-      const $panel = $(panel);
-      const $headerCloak = $(".header-cloak");
-      if (this._panMenuOrigin === "right") {
-        const pxClosed = Math.min(0, -e.deltaX + this._panMenuOffset);
-        $panel.css("right", pxClosed);
-        $headerCloak.css("opacity", Math.min(0.5, (300 + pxClosed) / 600));
-      } else {
-        const pxClosed = Math.min(0, e.deltaX + this._panMenuOffset);
-        $panel.css("left", pxClosed);
-        $headerCloak.css("opacity", Math.min(0.5, (300 + pxClosed) / 600));
-      }
-    });
-  },
-
-  dockCheck(info) {
-    const $header = $("header.d-header");
-
-    if (this.docAt === null) {
-      if (!($header && $header.length === 1)) {
-        return;
-      }
-      this.docAt = $header.offset().top;
-    }
-
-    const $body = $("body");
-    const offset = info.offset();
-    if (offset >= this.docAt) {
-      if (!this.dockedHeader) {
-        $body.addClass("docked");
-        this.dockedHeader = true;
-      }
-    } else {
-      if (this.dockedHeader) {
-        $body.removeClass("docked");
-        this.dockedHeader = false;
-      }
-    }
-  },
-
-  setTopic(topic) {
-    this.eventDispatched("dom:clean", "header");
-    this._topic = topic;
-    this.queueRerender();
-  },
-
-  willRender() {
-    if (this.get("currentUser.staff")) {
-      $("body").addClass("staff");
-    }
-  },
-
-  didInsertElement() {
-    this._super(...arguments);
-    $(window).on("resize.discourse-menu-panel", () => this.afterRender());
-
-    this.appEvents.on("header:show-topic", this, "setTopic");
-    this.appEvents.on("header:hide-topic", this, "setTopic");
-
-    this.dispatch("notifications:changed", "user-notifications");
-    this.dispatch("header:keyboard-trigger", "header");
-    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.get("currentUser.read_first_notification") &&
-          !this.get("currentUser.enforcedSecondFactor")
-        ) {
-          this.eventDispatched(
-            "header:dismiss-first-notification-mask",
-            "header"
+    _handlePanDone(offset, event) {
+      const $window = $(window);
+      const windowWidth = $window.width();
+      const $menuPanels = $(".menu-panel");
+      const menuOrigin = this._panMenuOrigin;
+      this._shouldMenuClose(event, menuOrigin)
+        ? (offset += SWIPE_VELOCITY)
+        : (offset -= SWIPE_VELOCITY);
+      $menuPanels.each((idx, panel) => {
+        const $panel = $(panel);
+        const $headerCloak = $(".header-cloak");
+        $panel.css(menuOrigin, -offset);
+        $headerCloak.css("opacity", Math.min(0.5, (300 - offset) / 600));
+        if (offset > windowWidth) {
+          this._animateClosing($panel, menuOrigin, windowWidth);
+        } else if (offset <= 0) {
+          this._animateOpening($panel);
+        } else {
+          //continue to open or close menu
+          this._scheduledMovingAnimation = window.requestAnimationFrame(() =>
+            this._handlePanDone(offset, event)
           );
         }
-      };
-      // TODO: re-enable event listener
-      //      document.addEventListener("click", this._dismissFirstNotification, {
-      //        once: true
-      //      });
-    }
-  },
+      });
+    },
 
-  _cleanDom() {
-    // For performance, only trigger a re-render if any menu panels are visible
-    if (this.element.querySelector(".menu-panel")) {
-      this.eventDispatched("dom:clean", "header");
-    }
-  },
-
-  willDestroyElement() {
-    this._super(...arguments);
-    $("body").off("keydown.header");
-    $(window).off("resize.discourse-menu-panel");
-
-    this.appEvents.off("header:show-topic", this, "setTopic");
-    this.appEvents.off("header:hide-topic", this, "setTopic");
-    this.appEvents.off("dom:clean", this, "_cleanDom");
-
-    cancel(this._scheduledRemoveAnimate);
-    window.cancelAnimationFrame(this._scheduledMovingAnimation);
-
-    document.removeEventListener("click", this._dismissFirstNotification);
-  },
-
-  buildArgs() {
-    return {
-      topic: this._topic,
-      canSignUp: this.canSignUp,
-    };
-  },
-
-  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) {
-        this._animate = true;
+    _shouldMenuClose(e, menuOrigin) {
+      // menu should close after a pan either:
+      // if a user moved the panel closed past a threshold and away and is NOT swiping back open
+      // if a user swiped to close fast enough regardless of distance
+      if (menuOrigin === "right") {
+        return (
+          (e.deltaX > SWIPE_DISTANCE_THRESHOLD &&
+            e.velocityX > -SWIPE_VELOCITY_THRESHOLD) ||
+          e.velocityX > 0
+        );
+      } else {
+        return (
+          (e.deltaX < -SWIPE_DISTANCE_THRESHOLD &&
+            e.velocityX < SWIPE_VELOCITY_THRESHOLD) ||
+          e.velocityX < 0
+        );
       }
-      return;
-    }
+    },
 
-    const $window = $(window);
-    const windowWidth = $window.width();
-
-    const headerWidth = $("#main-outlet .container").width() || 1100;
-    const remaining = (windowWidth - headerWidth) / 2;
-    const viewMode = remaining < 50 ? "slide-in" : "drop-down";
-
-    $menuPanels.each((idx, panel) => {
-      const $panel = $(panel);
-      const $headerCloak = $(".header-cloak");
-      let width = parseInt($panel.attr("data-max-width"), 10) || 300;
-      if (windowWidth - width < 50) {
-        width = windowWidth - 50;
-      }
-      if (this._panMenuOffset) {
-        this._panMenuOffset = -width;
+    panStart(e) {
+      const center = e.center;
+      const $centeredElement = $(document.elementFromPoint(center.x, center.y));
+      if (
+        ($centeredElement.hasClass("panel-body") ||
+          $centeredElement.hasClass("header-cloak") ||
+          $centeredElement.parents(".panel-body").length) &&
+        (e.direction === "left" || e.direction === "right")
+      ) {
+        e.originalEvent.preventDefault();
+        this._isPanning = true;
+      } else {
+        this._isPanning = false;
       }
+    },
 
-      $panel.removeClass("drop-down slide-in").addClass(viewMode);
-      if (this._animate || this._panMenuOffset !== 0) {
-        $headerCloak.css("opacity", 0);
-        if (
-          this.site.mobileView &&
-          $panel.parent(this._leftMenuClass()).length > 0
-        ) {
-          this._panMenuOrigin = "left";
-          $panel.css("left", -windowWidth);
-        } else {
-          this._panMenuOrigin = "right";
-          $panel.css("right", -windowWidth);
+    panEnd(e) {
+      if (!this._isPanning) {
+        return;
+      }
+      this._isPanning = false;
+      $(".menu-panel").each((idx, panel) => {
+        const $panel = $(panel);
+        let offset = $panel.css("right");
+        if (this._panMenuOrigin === "left") {
+          offset = $panel.css("left");
         }
+        offset = Math.abs(parseInt(offset, 10));
+        this._handlePanDone(offset, e);
+      });
+    },
+
+    panMove(e) {
+      if (!this._isPanning) {
+        return;
       }
+      const $menuPanels = $(".menu-panel");
+      $menuPanels.each((idx, panel) => {
+        const $panel = $(panel);
+        const $headerCloak = $(".header-cloak");
+        if (this._panMenuOrigin === "right") {
+          const pxClosed = Math.min(0, -e.deltaX + this._panMenuOffset);
+          $panel.css("right", pxClosed);
+          $headerCloak.css("opacity", Math.min(0.5, (300 + pxClosed) / 600));
+        } else {
+          const pxClosed = Math.min(0, e.deltaX + this._panMenuOffset);
+          $panel.css("left", pxClosed);
+          $headerCloak.css("opacity", Math.min(0.5, (300 + pxClosed) / 600));
+        }
+      });
+    },
 
-      const $panelBody = $(".panel-body", $panel);
+    dockCheck(info) {
+      const $header = $("header.d-header");
 
-      // We use a mutationObserver to check for style changes, so it's important
-      // we don't set it if it doesn't change. Same goes for the $panelBody!
-      const style = $panel.prop("style");
-
-      if (viewMode === "drop-down") {
-        const $buttonPanel = $("header ul.icons");
-        if ($buttonPanel.length === 0) {
+      if (this.docAt === null) {
+        if (!($header && $header.length === 1)) {
           return;
         }
+        this.docAt = $header.offset().top;
+      }
 
-        // These values need to be set here, not in the css file - this is to deal with the
-        // possibility of the window being resized and the menu changing from .slide-in to .drop-down.
-        if (style.top !== "100%" || style.height !== "auto") {
-          $panel.css({ top: "100%", height: "auto" });
+      const $body = $("body");
+      const offset = info.offset();
+      if (offset >= this.docAt) {
+        if (!this.dockedHeader) {
+          $body.addClass("docked");
+          this.dockedHeader = true;
         }
-
-        $("body").addClass("drop-down-mode");
       } else {
-        if (this.site.mobileView) {
-          $headerCloak.show();
+        if (this.dockedHeader) {
+          $body.removeClass("docked");
+          this.dockedHeader = false;
         }
+      }
+    },
 
-        const menuTop = this.site.mobileView ? headerTop() : headerHeight();
+    setTopic(topic) {
+      this.eventDispatched("dom:clean", "header");
+      this._topic = topic;
+      this.queueRerender();
+    },
 
-        const winHeightOffset = 16;
-        let initialWinHeight = window.innerHeight
-          ? window.innerHeight
-          : $(window).height();
-        const winHeight = initialWinHeight - winHeightOffset;
+    willRender() {
+      if (this.get("currentUser.staff")) {
+        $("body").addClass("staff");
+      }
+    },
 
-        let height;
-        if (this.site.mobileView) {
-          height = winHeight - menuTop;
-        }
+    didInsertElement() {
+      this._super(...arguments);
+      $(window).on("resize.discourse-menu-panel", () => this.afterRender());
 
-        const isIPadApp = document.body.classList.contains("footer-nav-ipad"),
-          heightProp = isIPadApp ? "max-height" : "height",
-          iPadOffset = 10;
+      this.appEvents.on("header:show-topic", this, "setTopic");
+      this.appEvents.on("header:hide-topic", this, "setTopic");
 
-        if (isIPadApp) {
-          height = winHeight - menuTop - iPadOffset;
-        }
+      this.dispatch("notifications:changed", "user-notifications");
+      this.dispatch("header:keyboard-trigger", "header");
+      this.dispatch("search-autocomplete:after-complete", "search-term");
+      this.dispatch("user-menu:navigation", "user-menu");
 
-        if ($panelBody.prop("style").height !== "100%") {
-          $panelBody.height("100%");
-        }
-        if (style.top !== menuTop + "px" || style[heightProp] !== height) {
-          $panel.css({ top: menuTop + "px", [heightProp]: height });
-          $(".header-cloak").css({ top: menuTop + "px" });
-        }
-        $("body").removeClass("drop-down-mode");
+      this.appEvents.on("dom:clean", this, "_cleanDom");
+
+      if (
+        this.currentUser &&
+        !this.get("currentUser.read_first_notification")
+      ) {
+        document.body.classList.add("unread-first-notification");
       }
 
-      $panel.width(width);
-      if (this._animate) {
-        $panel.addClass("animate");
-        $headerCloak.addClass("animate");
-        this._scheduledRemoveAnimate = later(() => {
-          $panel.removeClass("animate");
-          $headerCloak.removeClass("animate");
-        }, 200);
+      // Allow first notification to be dismissed on a click anywhere
+      if (
+        this.currentUser &&
+        !this.get("currentUser.read_first_notification") &&
+        !this.get("currentUser.enforcedSecondFactor")
+      ) {
+        this._dismissFirstNotification = (e) => {
+          if (document.body.classList.contains("unread-first-notification")) {
+            document.body.classList.remove("unread-first-notification");
+          }
+          if (
+            !e.target.closest("#current-user") &&
+            !e.target.closest(".ring-backdrop") &&
+            this.currentUser &&
+            !this.get("currentUser.read_first_notification") &&
+            !this.get("currentUser.enforcedSecondFactor")
+          ) {
+            this.eventDispatched(
+              "header:dismiss-first-notification-mask",
+              "header"
+            );
+          }
+        };
+        document.addEventListener("click", this._dismissFirstNotification, {
+          once: true,
+        });
       }
-      $panel.css({ right: "", left: "" });
-      $headerCloak.css("opacity", 0.5);
-      this._animate = false;
-    });
-  },
-});
+
+      const header = document.querySelector("header.d-header");
+      this._mousetrap = new Mousetrap(header);
+      this._mousetrap.bind(["right", "left"], (e) => {
+        const activeTab = document.querySelector(".glyphs .menu-link.active");
+
+        if (activeTab) {
+          let focusedTab = document.activeElement;
+          if (!focusedTab.dataset.tabNumber) {
+            focusedTab = activeTab;
+          }
+
+          this.appEvents.trigger("user-menu:navigation", {
+            key: e.key,
+            tabNumber: Number(focusedTab.dataset.tabNumber),
+          });
+        }
+      });
+    },
+
+    _cleanDom() {
+      // For performance, only trigger a re-render if any menu panels are visible
+      if (this.element.querySelector(".menu-panel")) {
+        this.eventDispatched("dom:clean", "header");
+      }
+    },
+
+    willDestroyElement() {
+      this._super(...arguments);
+
+      $(window).off("resize.discourse-menu-panel");
+
+      this.appEvents.off("header:show-topic", this, "setTopic");
+      this.appEvents.off("header:hide-topic", this, "setTopic");
+      this.appEvents.off("dom:clean", this, "_cleanDom");
+
+      cancel(this._scheduledRemoveAnimate);
+      window.cancelAnimationFrame(this._scheduledMovingAnimation);
+
+      this._mousetrap.reset();
+
+      document.removeEventListener("click", this._dismissFirstNotification);
+    },
+
+    buildArgs() {
+      return {
+        topic: this._topic,
+        canSignUp: this.canSignUp,
+      };
+    },
+
+    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) {
+          this._animate = true;
+        }
+        return;
+      }
+
+      const $window = $(window);
+      const windowWidth = $window.width();
+
+      const headerWidth = $("#main-outlet .container").width() || 1100;
+      const remaining = (windowWidth - headerWidth) / 2;
+      const viewMode = remaining < 50 ? "slide-in" : "drop-down";
+
+      $menuPanels.each((idx, panel) => {
+        const $panel = $(panel);
+        const $headerCloak = $(".header-cloak");
+        let width = parseInt($panel.attr("data-max-width"), 10) || 300;
+        if (windowWidth - width < 50) {
+          width = windowWidth - 50;
+        }
+        if (this._panMenuOffset) {
+          this._panMenuOffset = -width;
+        }
+
+        $panel.removeClass("drop-down slide-in").addClass(viewMode);
+        if (this._animate || this._panMenuOffset !== 0) {
+          $headerCloak.css("opacity", 0);
+          if (
+            this.site.mobileView &&
+            $panel.parent(this._leftMenuClass()).length > 0
+          ) {
+            this._panMenuOrigin = "left";
+            $panel.css("left", -windowWidth);
+          } else {
+            this._panMenuOrigin = "right";
+            $panel.css("right", -windowWidth);
+          }
+        }
+
+        const $panelBody = $(".panel-body", $panel);
+
+        // We use a mutationObserver to check for style changes, so it's important
+        // we don't set it if it doesn't change. Same goes for the $panelBody!
+        const style = $panel.prop("style");
+
+        if (viewMode === "drop-down") {
+          const $buttonPanel = $("header ul.icons");
+          if ($buttonPanel.length === 0) {
+            return;
+          }
+
+          // These values need to be set here, not in the css file - this is to deal with the
+          // possibility of the window being resized and the menu changing from .slide-in to .drop-down.
+          if (style.top !== "100%" || style.height !== "auto") {
+            $panel.css({ top: "100%", height: "auto" });
+          }
+
+          $("body").addClass("drop-down-mode");
+        } else {
+          if (this.site.mobileView) {
+            $headerCloak.show();
+          }
+
+          const menuTop = this.site.mobileView ? headerTop() : headerHeight();
+
+          const winHeightOffset = 16;
+          let initialWinHeight = window.innerHeight
+            ? window.innerHeight
+            : $(window).height();
+          const winHeight = initialWinHeight - winHeightOffset;
+
+          let height;
+          if (this.site.mobileView) {
+            height = winHeight - menuTop;
+          }
+
+          const isIPadApp = document.body.classList.contains("footer-nav-ipad"),
+            heightProp = isIPadApp ? "max-height" : "height",
+            iPadOffset = 10;
+
+          if (isIPadApp) {
+            height = winHeight - menuTop - iPadOffset;
+          }
+
+          if ($panelBody.prop("style").height !== "100%") {
+            $panelBody.height("100%");
+          }
+          if (style.top !== menuTop + "px" || style[heightProp] !== height) {
+            $panel.css({ top: menuTop + "px", [heightProp]: height });
+            $(".header-cloak").css({ top: menuTop + "px" });
+          }
+          $("body").removeClass("drop-down-mode");
+        }
+
+        $panel.width(width);
+        if (this._animate) {
+          $panel.addClass("animate");
+          $headerCloak.addClass("animate");
+          this._scheduledRemoveAnimate = later(() => {
+            $panel.removeClass("animate");
+            $headerCloak.removeClass("animate");
+          }, 200);
+        }
+        $panel.css({ right: "", left: "" });
+        $headerCloak.css("opacity", 0.5);
+        this._animate = false;
+      });
+    },
+  }
+);
 
 export default SiteHeaderComponent.extend({
   classNames: ["d-header-wrap"],
diff --git a/app/assets/javascripts/discourse/app/components/slow-mode-info.js b/app/assets/javascripts/discourse/app/components/slow-mode-info.js
index 178291630d..41171f0feb 100644
--- a/app/assets/javascripts/discourse/app/components/slow-mode-info.js
+++ b/app/assets/javascripts/discourse/app/components/slow-mode-info.js
@@ -1,9 +1,9 @@
-import { durationTextFromSeconds } from "discourse/helpers/slow-mode";
 import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
 import Topic from "discourse/models/topic";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
+import { durationTextFromSeconds } from "discourse/helpers/slow-mode";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Component.extend({
   @discourseComputed("topic.slow_mode_seconds")
@@ -11,9 +11,9 @@ export default Component.extend({
     return durationTextFromSeconds(seconds);
   },
 
-  @discourseComputed("user", "topic.slow_mode_seconds", "topic.closed")
-  showSlowModeNotice(user, seconds, closed) {
-    return user && seconds > 0 && !closed;
+  @discourseComputed("topic.slow_mode_seconds", "topic.closed")
+  showSlowModeNotice(seconds, closed) {
+    return seconds > 0 && !closed;
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/components/software-update-prompt.js b/app/assets/javascripts/discourse/app/components/software-update-prompt.js
new file mode 100644
index 0000000000..73424b6513
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/software-update-prompt.js
@@ -0,0 +1,59 @@
+import getURL from "discourse-common/lib/get-url";
+import { cancel, later } from "@ember/runloop";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
+import { action } from "@ember/object";
+import { isTesting } from "discourse-common/config/environment";
+
+export default Component.extend({
+  tagName: "",
+
+  showPrompt: false,
+  _timeoutHandler: null,
+
+  @discourseComputed
+  rootUrl() {
+    return getURL("/");
+  },
+
+  @on("init")
+  initSubscribtions() {
+    this.messageBus.subscribe("/refresh_client", () => {
+      this.session.requiresRefresh = true;
+    });
+
+    this.messageBus.subscribe("/global/asset-version", (version) => {
+      if (this.session.assetVersion !== version) {
+        this.session.requiresRefresh = true;
+      }
+
+      if (!this._timeoutHandler && this.session.requiresRefresh) {
+        if (isTesting()) {
+          this.set("showPrompt", true);
+        } else {
+          // Since we can do this transparently for people browsing the forum
+          // hold back the message 24 hours.
+          this._timeoutHandler = later(() => {
+            this.set("showPrompt", true);
+          }, 1000 * 60 * 24 * 60);
+        }
+      }
+    });
+  },
+
+  @action
+  refreshPage() {
+    document.location.reload();
+  },
+
+  @action
+  dismiss() {
+    this.set("showPrompt", false);
+  },
+
+  @on("willDestroyElement")
+  _resetTimeoutHandler() {
+    this._timeoutHandler && cancel(this._timeoutHandler);
+    this._timeoutHandler = null;
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/components/suggested-topics.js b/app/assets/javascripts/discourse/app/components/suggested-topics.js
index cf34847a1b..f601c1d84d 100644
--- a/app/assets/javascripts/discourse/app/components/suggested-topics.js
+++ b/app/assets/javascripts/discourse/app/components/suggested-topics.js
@@ -1,10 +1,10 @@
-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";
 import Component from "@ember/component";
-import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import I18n from "I18n";
 import Site from "discourse/models/site";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
 
 export default Component.extend({
   tagName: "",
diff --git a/app/assets/javascripts/discourse/app/components/table-header-toggle.js b/app/assets/javascripts/discourse/app/components/table-header-toggle.js
index e94d260c86..0ab184a1e4 100644
--- a/app/assets/javascripts/discourse/app/components/table-header-toggle.js
+++ b/app/assets/javascripts/discourse/app/components/table-header-toggle.js
@@ -1,6 +1,6 @@
+import Component from "@ember/component";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/tag-drop-link.js b/app/assets/javascripts/discourse/app/components/tag-drop-link.js
index c3875ce884..d487376c02 100644
--- a/app/assets/javascripts/discourse/app/components/tag-drop-link.js
+++ b/app/assets/javascripts/discourse/app/components/tag-drop-link.js
@@ -1,6 +1,7 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
 
 export default Component.extend({
   tagName: "a",
@@ -14,11 +15,15 @@ export default Component.extend({
 
   @discourseComputed("tagId", "category")
   href(tagId, category) {
+    let path;
+
     if (category) {
-      return "/tags" + category.url + "/" + tagId;
+      path = "/tags" + category.path + "/" + tagId;
     } else {
-      return "/tag/" + tagId;
+      path = "/tag/" + tagId;
     }
+
+    return getURL(path);
   },
 
   @discourseComputed("tagId")
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 cc51816677..8bf218f1cb 100644
--- a/app/assets/javascripts/discourse/app/components/tag-groups-form.js
+++ b/app/assets/javascripts/discourse/app/components/tag-groups-form.js
@@ -1,11 +1,11 @@
+import Component from "@ember/component";
+import Group from "discourse/models/group";
 import I18n from "I18n";
+import PermissionType from "discourse/models/permission-type";
+import bootbox from "bootbox";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
-import Component from "@ember/component";
-import { bufferedProperty } from "discourse/mixins/buffered-content";
-import PermissionType from "discourse/models/permission-type";
-import Group from "discourse/models/group";
-import bootbox from "bootbox";
 
 export default Component.extend(bufferedProperty("model"), {
   tagName: "",
@@ -23,14 +23,12 @@ export default Component.extend(bufferedProperty("model"), {
   },
 
   @discourseComputed(
-    "buffered.isSaving",
     "buffered.name",
     "buffered.tag_names",
     "buffered.permissions"
   )
-  savingDisabled(isSaving, name, tagNames, permissions) {
+  cannotSave(name, tagNames, permissions) {
     return (
-      isSaving ||
       isEmpty(name) ||
       isEmpty(tagNames) ||
       (!this.everyoneSelected(permissions) &&
@@ -107,6 +105,8 @@ export default Component.extend(bufferedProperty("model"), {
       this.allGroups.forEach((group) => {
         if (groupIds.includes(group.id)) {
           updatedPermissions[group.name] = PermissionType.FULL;
+        } else {
+          delete updatedPermissions[group.name];
         }
       });
 
@@ -114,6 +114,11 @@ export default Component.extend(bufferedProperty("model"), {
     },
 
     save() {
+      if (this.cannotSave) {
+        bootbox.alert(I18n.t("tagging.groups.cannot_save"));
+        return false;
+      }
+
       const attrs = this.buffered.getProperties(
         "name",
         "tag_names",
diff --git a/app/assets/javascripts/discourse/app/components/tag-info.js b/app/assets/javascripts/discourse/app/components/tag-info.js
index 0aef4eedb6..5749eb283e 100644
--- a/app/assets/javascripts/discourse/app/components/tag-info.js
+++ b/app/assets/javascripts/discourse/app/components/tag-info.js
@@ -1,12 +1,12 @@
+import { and, reads } from "@ember/object/computed";
+import Component from "@ember/component";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
+import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
+import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
-import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
-import { reads, and } from "@ember/object/computed";
-import { isEmpty } from "@ember/utils";
-import bootbox from "bootbox";
 
 export default Component.extend({
   tagName: "",
diff --git a/app/assets/javascripts/discourse/app/components/tag-list.js b/app/assets/javascripts/discourse/app/components/tag-list.js
index 72853d4bb7..52b3c41df3 100644
--- a/app/assets/javascripts/discourse/app/components/tag-list.js
+++ b/app/assets/javascripts/discourse/app/components/tag-list.js
@@ -1,8 +1,8 @@
+import Category from "discourse/models/category";
+import Component from "@ember/component";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { sort } from "@ember/object/computed";
-import Component from "@ember/component";
-import Category from "discourse/models/category";
 
 export default Component.extend({
   classNameBindings: [
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 0dbfc3233b..1f1da87149 100644
--- a/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
 import { computed } from "@ember/object";
 
 export default DropdownSelectBoxComponent.extend({
diff --git a/app/assets/javascripts/discourse/app/components/tap-tile.js b/app/assets/javascripts/discourse/app/components/tap-tile.js
index b384ff7d71..8671cc1ad2 100644
--- a/app/assets/javascripts/discourse/app/components/tap-tile.js
+++ b/app/assets/javascripts/discourse/app/components/tap-tile.js
@@ -1,13 +1,26 @@
+import { reads } from "@ember/object/computed";
 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"],
+
+  attributeBindings: ["role", "ariaPressed", "tabIndex"],
+
+  role: "button",
+
+  tabIndex: 0,
+
+  ariaPressed: reads("active"),
+
   click() {
     this.onChange(this.tileId);
   },
diff --git a/app/assets/javascripts/discourse/app/components/text-field.js b/app/assets/javascripts/discourse/app/components/text-field.js
index 1a90c69340..d3fd889b12 100644
--- a/app/assets/javascripts/discourse/app/components/text-field.js
+++ b/app/assets/javascripts/discourse/app/components/text-field.js
@@ -1,8 +1,9 @@
+import { cancel, next } from "@ember/runloop";
+import { isLTR, isRTL, siteDir } from "discourse/lib/text-direction";
 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";
-import { next, debounce, cancel } from "@ember/runloop";
+import discourseDebounce from "discourse-common/lib/debounce";
 
 const DEBOUNCE_MS = 500;
 
@@ -14,6 +15,7 @@ export default TextField.extend({
     "maxLength",
     "dir",
     "aria-label",
+    "aria-controls",
   ],
 
   init() {
@@ -38,7 +40,11 @@ export default TextField.extend({
       }
       if (this.onChange) {
         cancel(this._timer);
-        this._timer = debounce(this, this._debouncedChange, DEBOUNCE_MS);
+        this._timer = discourseDebounce(
+          this,
+          this._debouncedChange,
+          DEBOUNCE_MS
+        );
       }
     }
   },
diff --git a/app/assets/javascripts/discourse/app/components/time-input.js b/app/assets/javascripts/discourse/app/components/time-input.js
index 0163ee1dd9..35b8c8d782 100644
--- a/app/assets/javascripts/discourse/app/components/time-input.js
+++ b/app/assets/javascripts/discourse/app/components/time-input.js
@@ -1,6 +1,6 @@
-import { isPresent } from "@ember/utils";
-import { computed, action } from "@ember/object";
+import { action, computed } from "@ember/object";
 import Component from "@ember/component";
+import { isPresent } from "@ember/utils";
 
 function convertMinutes(num) {
   return { hours: Math.floor(num / 60), minutes: num % 60 };
diff --git a/app/assets/javascripts/discourse/app/components/time-shortcut-picker.js b/app/assets/javascripts/discourse/app/components/time-shortcut-picker.js
new file mode 100644
index 0000000000..69d4a436d5
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/time-shortcut-picker.js
@@ -0,0 +1,278 @@
+import {
+  START_OF_DAY_HOUR,
+  laterToday,
+  now,
+  parseCustomDatetime,
+} from "discourse/lib/time-utils";
+import {
+  TIME_SHORTCUT_TYPES,
+  defaultShortcutOptions,
+  specialShortcutOptions,
+} from "discourse/lib/time-shortcut";
+import discourseComputed, {
+  observes,
+  on,
+} from "discourse-common/utils/decorators";
+
+import Component from "@ember/component";
+import I18n from "I18n";
+import { action } from "@ember/object";
+import { and, equal } from "@ember/object/computed";
+
+const BINDINGS = {
+  "l t": {
+    handler: "selectShortcut",
+    args: [TIME_SHORTCUT_TYPES.LATER_TODAY],
+  },
+  "l w": {
+    handler: "selectShortcut",
+    args: [TIME_SHORTCUT_TYPES.LATER_THIS_WEEK],
+  },
+  "n d": {
+    handler: "selectShortcut",
+    args: [TIME_SHORTCUT_TYPES.TOMORROW],
+  },
+  "n w": {
+    handler: "selectShortcut",
+    args: [TIME_SHORTCUT_TYPES.NEXT_WEEK],
+  },
+  "n b w": {
+    handler: "selectShortcut",
+    args: [TIME_SHORTCUT_TYPES.START_OF_NEXT_BUSINESS_WEEK],
+  },
+  "n m": {
+    handler: "selectShortcut",
+    args: [TIME_SHORTCUT_TYPES.NEXT_MONTH],
+  },
+  "c r": { handler: "selectShortcut", args: [TIME_SHORTCUT_TYPES.CUSTOM] },
+  "n r": { handler: "selectShortcut", args: [TIME_SHORTCUT_TYPES.NONE] },
+};
+
+export default Component.extend({
+  tagName: "",
+
+  userTimezone: null,
+
+  onTimeSelected: null,
+
+  selectedShortcut: null,
+  selectedTime: null,
+  selectedDate: null,
+  selectedDatetime: null,
+  prefilledDatetime: null,
+
+  additionalOptionsToShow: null,
+  hiddenOptions: null,
+  customOptions: null,
+
+  lastCustomDate: null,
+  lastCustomTime: null,
+  parsedLastCustomDatetime: null,
+  customDate: null,
+  customTime: null,
+
+  defaultCustomReminderTime: `0${START_OF_DAY_HOUR}:00`,
+
+  @on("init")
+  _setupPicker() {
+    this.setProperties({
+      customTime: this.defaultCustomReminderTime,
+      userTimezone: this.currentUser.resolvedTimezone(this.currentUser),
+      additionalOptionsToShow: this.additionalOptionsToShow || [],
+      hiddenOptions: this.hiddenOptions || [],
+      customOptions: this.customOptions || [],
+    });
+
+    if (this.prefilledDatetime) {
+      this.parsePrefilledDatetime();
+    }
+
+    this._bindKeyboardShortcuts();
+  },
+
+  @observes("prefilledDatetime")
+  prefilledDatetimeChanged() {
+    if (this.prefilledDatetime) {
+      this.parsePrefilledDatetime();
+    } else {
+      this.setProperties({
+        customDate: null,
+        customTime: null,
+        selectedShortcut: null,
+      });
+    }
+  },
+
+  willDestroyElement() {
+    this._super(...arguments);
+    this.mousetrap.unbind(Object.keys(BINDINGS));
+  },
+
+  parsePrefilledDatetime() {
+    let parsedDatetime = parseCustomDatetime(
+      this.prefilledDatetime,
+      null,
+      this.userTimezone
+    );
+
+    if (parsedDatetime.isSame(laterToday())) {
+      return this.set("selectedShortcut", TIME_SHORTCUT_TYPES.LATER_TODAY);
+    }
+
+    this.setProperties({
+      customDate: parsedDatetime.format("YYYY-MM-DD"),
+      customTime: parsedDatetime.format("HH:mm"),
+      selectedShortcut: TIME_SHORTCUT_TYPES.CUSTOM,
+    });
+  },
+
+  _loadLastUsedCustomDatetime() {
+    let lastTime = localStorage.lastCustomTime;
+    let lastDate = localStorage.lastCustomDate;
+
+    if (lastTime && lastDate) {
+      let parsed = parseCustomDatetime(lastDate, lastTime, this.userTimezone);
+
+      if (!parsed.isValid() || parsed < now(this.userTimezone)) {
+        return;
+      }
+
+      this.setProperties({
+        lastCustomDate: lastDate,
+        lastCustomTime: lastTime,
+        parsedLastCustomDatetime: parsed,
+      });
+    }
+  },
+
+  _bindKeyboardShortcuts() {
+    Object.keys(BINDINGS).forEach((shortcut) => {
+      this.mousetrap.bind(shortcut, () => {
+        let binding = BINDINGS[shortcut];
+        this.send(binding.handler, ...binding.args);
+        return false;
+      });
+    });
+  },
+
+  customDatetimeSelected: equal("selectedShortcut", TIME_SHORTCUT_TYPES.CUSTOM),
+  relativeTimeSelected: equal("selectedShortcut", TIME_SHORTCUT_TYPES.RELATIVE),
+  customDatetimeFilled: and("customDate", "customTime"),
+
+  @observes("customDate", "customTime")
+  customDatetimeChanged() {
+    if (!this.customDatetimeFilled) {
+      return;
+    }
+    this.selectShortcut(TIME_SHORTCUT_TYPES.CUSTOM);
+  },
+
+  @discourseComputed(
+    "additionalOptionsToShow",
+    "hiddenOptions",
+    "customOptions",
+    "userTimezone"
+  )
+  options(additionalOptionsToShow, hiddenOptions, customOptions, userTimezone) {
+    this._loadLastUsedCustomDatetime();
+
+    let options = defaultShortcutOptions(userTimezone);
+
+    if (additionalOptionsToShow.length > 0) {
+      options.forEach((opt) => {
+        if (additionalOptionsToShow.includes(opt.id)) {
+          opt.hidden = false;
+        }
+      });
+    }
+
+    customOptions.forEach((opt) => {
+      if (!opt.timeFormatted && opt.time) {
+        opt.timeFormatted = opt.time.format(I18n.t(opt.timeFormatKey));
+      }
+    });
+
+    options = options.concat(customOptions);
+    options.sort((a, b) => {
+      if (a.time < b.time) {
+        return -1;
+      }
+      if (a.time > b.time) {
+        return 1;
+      }
+      return 0;
+    });
+
+    let specialOptions = specialShortcutOptions();
+
+    if (this.lastCustomDate && this.lastCustomTime) {
+      let lastCustom = specialOptions.findBy(
+        "id",
+        TIME_SHORTCUT_TYPES.LAST_CUSTOM
+      );
+      lastCustom.time = this.parsedLastCustomDatetime;
+      lastCustom.timeFormatted = this.parsedLastCustomDatetime.format(
+        I18n.t("dates.long_no_year")
+      );
+      lastCustom.hidden = false;
+    }
+
+    options = options.concat(specialOptions);
+
+    if (hiddenOptions.length > 0) {
+      options.forEach((opt) => {
+        if (hiddenOptions.includes(opt.id)) {
+          opt.hidden = true;
+        }
+      });
+    }
+
+    return options;
+  },
+
+  @action
+  relativeTimeChanged(relativeTimeMins) {
+    let dateTime = now(this.userTimezone).add(relativeTimeMins, "minutes");
+
+    this.set("selectedDatetime", dateTime);
+
+    if (this.onTimeSelected) {
+      this.onTimeSelected(TIME_SHORTCUT_TYPES.RELATIVE, dateTime);
+    }
+  },
+
+  @action
+  selectShortcut(type) {
+    if (this.options.filterBy("hidden").mapBy("id").includes(type)) {
+      return;
+    }
+
+    let dateTime = null;
+    if (type === TIME_SHORTCUT_TYPES.CUSTOM) {
+      this.set("customTime", this.customTime || this.defaultCustomReminderTime);
+      const customDatetime = parseCustomDatetime(
+        this.customDate,
+        this.customTime,
+        this.userTimezone
+      );
+
+      if (customDatetime.isValid() && this.customDate) {
+        dateTime = customDatetime;
+
+        localStorage.lastCustomTime = this.customTime;
+        localStorage.lastCustomDate = this.customDate;
+      }
+    } else {
+      dateTime = this.options.findBy("id", type).time;
+    }
+
+    this.setProperties({
+      selectedShortcut: type,
+      selectedDatetime: dateTime,
+    });
+
+    if (this.onTimeSelected) {
+      this.onTimeSelected(type, dateTime);
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/components/top-period-buttons.js b/app/assets/javascripts/discourse/app/components/top-period-buttons.js
index 3ff48e71fb..f1f637385d 100644
--- a/app/assets/javascripts/discourse/app/components/top-period-buttons.js
+++ b/app/assets/javascripts/discourse/app/components/top-period-buttons.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   classNames: ["top-title-buttons"],
diff --git a/app/assets/javascripts/discourse/app/components/topic-entrance.js b/app/assets/javascripts/discourse/app/components/topic-entrance.js
index c5cc0ca115..2b73f4de6e 100644
--- a/app/assets/javascripts/discourse/app/components/topic-entrance.js
+++ b/app/assets/javascripts/discourse/app/components/topic-entrance.js
@@ -1,9 +1,9 @@
+import CleansUp from "discourse/mixins/cleans-up";
+import Component from "@ember/component";
+import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { scheduleOnce } from "@ember/runloop";
-import Component from "@ember/component";
-import DiscourseURL from "discourse/lib/url";
-import CleansUp from "discourse/mixins/cleans-up";
 
 function entranceDate(dt, showTime) {
   const today = new Date();
diff --git a/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js
index 429c4ea186..270f488b6f 100644
--- a/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { alias, or, and } from "@ember/object/computed";
+import { alias, and, or } from "@ember/object/computed";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 import { getTopicFooterButtons } from "discourse/lib/register-topic-footer-button";
 
 export default Component.extend({
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 59d433da15..3019433078 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list-item.js
@@ -1,13 +1,14 @@
-import I18n from "I18n";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
-import { schedule } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+import { RUNTIME_OPTIONS } from "discourse-common/lib/raw-handlebars-helpers";
+import { alias } from "@ember/object/computed";
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
-import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { on } from "@ember/object/evented";
+import { schedule } from "@ember/runloop";
 import { topicTitleDecorators } from "discourse/components/topic-title";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
 
 export function showEntrance(e) {
   let target = $(e.target);
@@ -49,7 +50,15 @@ export default Component.extend({
   renderTopicListItem() {
     const template = findRawTemplate("list/topic-list-item");
     if (template) {
-      this.set("topicListItemContents", template(this).htmlSafe());
+      this.set(
+        "topicListItemContents",
+        template(this, RUNTIME_OPTIONS).htmlSafe()
+      );
+      schedule("afterRender", () => {
+        if (this.selected && this.selected.includes(this.topic)) {
+          this.element.querySelector("input.bulk-select").checked = true;
+        }
+      });
     }
   },
 
@@ -226,12 +235,6 @@ export default Component.extend({
     return this.unhandledRowClick(e, topic);
   },
 
-  actions: {
-    toggleBookmark() {
-      this.topic.toggleBookmark().finally(() => this.renderTopicListItem());
-    },
-  },
-
   unhandledRowClick() {},
 
   navigateToTopic,
diff --git a/app/assets/javascripts/discourse/app/components/topic-list.js b/app/assets/javascripts/discourse/app/components/topic-list.js
index 178fe9c82d..761208516f 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list.js
@@ -1,9 +1,10 @@
 import { alias, reads } from "@ember/object/computed";
-import { schedule } from "@ember/runloop";
-import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
 import LoadMore from "discourse/mixins/load-more";
+import discourseDebounce from "discourse-common/lib/debounce";
 import { on } from "@ember/object/evented";
+import { schedule } from "@ember/runloop";
 
 export default Component.extend(LoadMore, {
   tagName: "table",
@@ -73,7 +74,17 @@ export default Component.extend(LoadMore, {
 
     let scrollTo = this.session.get("topicListScrollPosition");
     if (scrollTo && scrollTo >= 0) {
-      schedule("afterRender", () => $(window).scrollTop(scrollTo + 1));
+      schedule("afterRender", () => {
+        discourseDebounce(
+          this,
+          function () {
+            if (this.element && !this.isDestroying && !this.isDestroyed) {
+              $(window).scrollTop(scrollTo + 1);
+            }
+          },
+          0
+        );
+      });
     }
   },
 
@@ -152,9 +163,9 @@ export default Component.extend(LoadMore, {
   },
 
   click(e) {
-    var self = this;
-    var onClick = function (sel, callback) {
-      var target = $(e.target).closest(sel);
+    let self = this;
+    let onClick = function (sel, callback) {
+      let target = $(e.target).closest(sel);
 
       if (target.length === 1) {
         callback.apply(self, [target]);
@@ -167,10 +178,12 @@ export default Component.extend(LoadMore, {
     });
 
     onClick("button.bulk-select-all", function () {
+      this.updateAutoAddTopicsToBulkSelect(true);
       $("input.bulk-select:not(:checked)").click();
     });
 
     onClick("button.bulk-clear-all", function () {
+      this.updateAutoAddTopicsToBulkSelect(false);
       $("input.bulk-select:checked").click();
     });
 
@@ -179,4 +192,21 @@ export default Component.extend(LoadMore, {
       this.rerender();
     });
   },
+
+  keyDown(e) {
+    if (e.key === "Enter" || e.key === " ") {
+      let onKeyDown = (sel, callback) => {
+        let target = $(e.target).closest(sel);
+
+        if (target.length === 1) {
+          callback.apply(this, [target]);
+        }
+      };
+
+      onKeyDown("th.sortable", (e2) => {
+        this.changeSort(e2.data("sort-order"));
+        this.rerender();
+      });
+    }
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/components/topic-navigation.js b/app/assets/javascripts/discourse/app/components/topic-navigation.js
index 1db8312fe2..5b58ff9147 100644
--- a/app/assets/javascripts/discourse/app/components/topic-navigation.js
+++ b/app/assets/javascripts/discourse/app/components/topic-navigation.js
@@ -1,13 +1,14 @@
-import EmberObject from "@ember/object";
-import { debounce, later } from "@ember/runloop";
-import Component from "@ember/component";
-import { observes } from "discourse-common/utils/decorators";
-import showModal from "discourse/lib/show-modal";
 import PanEvents, {
-  SWIPE_VELOCITY,
   SWIPE_DISTANCE_THRESHOLD,
+  SWIPE_VELOCITY,
   SWIPE_VELOCITY_THRESHOLD,
 } from "discourse/mixins/pan-events";
+import Component from "@ember/component";
+import EmberObject from "@ember/object";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { later } from "@ember/runloop";
+import { observes } from "discourse-common/utils/decorators";
+import showModal from "discourse/lib/show-modal";
 
 const MIN_WIDTH_TIMELINE = 924,
   MIN_HEIGHT_TIMELINE = 325;
@@ -53,7 +54,7 @@ export default Component.extend(PanEvents, {
   },
 
   _checkSize() {
-    debounce(this, this._performCheckSize, 300, true);
+    discourseDebounce(this, this._performCheckSize, 300, true);
   },
 
   // we need to store this so topic progress has something to init with
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 3efeaeee2d..78600182a1 100644
--- a/app/assets/javascripts/discourse/app/components/topic-post-badges.js
+++ b/app/assets/javascripts/discourse/app/components/topic-post-badges.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Component from "@ember/component";
+import I18n from "I18n";
 
 export default Component.extend({
   tagName: "span",
diff --git a/app/assets/javascripts/discourse/app/components/topic-progress.js b/app/assets/javascripts/discourse/app/components/topic-progress.js
index 1fa674c713..a6fea0ea89 100644
--- a/app/assets/javascripts/discourse/app/components/topic-progress.js
+++ b/app/assets/javascripts/discourse/app/components/topic-progress.js
@@ -1,8 +1,8 @@
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
 import I18n from "I18n";
 import { alias } from "@ember/object/computed";
 import { scheduleOnce } from "@ember/runloop";
-import Component from "@ember/component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default Component.extend({
   elementId: "topic-progress-wrapper",
@@ -151,10 +151,7 @@ export default Component.extend({
 
     const $html = $("html");
     const offset = window.pageYOffset || $html.scrollTop();
-    const progressHeight = this.site.mobileView
-      ? 0
-      : $("#topic-progress").outerHeight();
-    const maximumOffset = $("#topic-bottom").offset().top + progressHeight;
+    const maximumOffset = $("#topic-bottom").offset().top;
     const windowHeight = $(window).height();
     let composerHeight = $("#reply-control").height() || 0;
     const isDocked = offset >= maximumOffset - windowHeight + composerHeight;
@@ -185,6 +182,10 @@ export default Component.extend({
       "margin-bottom",
       !isDocked && composerHeight > draftComposerHeight ? "0px" : ""
     );
+    this.appEvents.trigger("topic-progress:docked-status-changed", {
+      docked: isDocked,
+      element: this.element,
+    });
   },
 
   click(e) {
diff --git a/app/assets/javascripts/discourse/app/components/topic-status.js b/app/assets/javascripts/discourse/app/components/topic-status.js
index 9ff136b192..a370849c8c 100644
--- a/app/assets/javascripts/discourse/app/components/topic-status.js
+++ b/app/assets/javascripts/discourse/app/components/topic-status.js
@@ -1,6 +1,6 @@
+import Component from "@ember/component";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/topic-timeline.js b/app/assets/javascripts/discourse/app/components/topic-timeline.js
index e10377c30e..09fbfcd78a 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timeline.js
+++ b/app/assets/javascripts/discourse/app/components/topic-timeline.js
@@ -1,6 +1,6 @@
-import { next } from "@ember/runloop";
-import MountWidget from "discourse/components/mount-widget";
 import Docking from "discourse/mixins/docking";
+import MountWidget from "discourse/components/mount-widget";
+import { next } from "@ember/runloop";
 import { observes } from "discourse-common/utils/decorators";
 import optionalService from "discourse/lib/optional-service";
 import outletHeights from "discourse/lib/header-outlet-height";
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 da3ce4e7e2..0b467f6395 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timer-info.js
+++ b/app/assets/javascripts/discourse/app/components/topic-timer-info.js
@@ -1,30 +1,52 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 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 Component from "@ember/component";
 import { DELETE_REPLIES_TYPE } from "discourse/controllers/edit-topic-timer";
+import I18n from "I18n";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
+import { iconHTML } from "discourse-common/lib/icon-library";
 import { isTesting } from "discourse-common/config/environment";
 
 export default Component.extend({
-  classNames: ["topic-status-info"],
+  classNames: ["topic-timer-info"],
   _delayedRerender: null,
   clockIcon: `${iconHTML("far-clock")}`.htmlSafe(),
-  trashCanIcon: `${iconHTML("trash-alt")}`.htmlSafe(),
-  trashCanTitle: I18n.t("post.controls.remove_timer"),
+  trashLabel: I18n.t("post.controls.remove_timer"),
   title: null,
   notice: null,
   showTopicTimer: null,
+  showTopicTimerModal: null,
+  removeTopicTimer: null,
+
+  @on("didReceiveAttrs")
+  setupRenderer() {
+    this.renderTopicTimer();
+  },
+
+  @on("willDestroyElement")
+  cancelDelayedRenderer() {
+    if (this._delayedRerender) {
+      cancel(this._delayedRerender);
+    }
+  },
 
   @discourseComputed
-  canRemoveTimer() {
+  canModifyTimer() {
     return this.currentUser && this.currentUser.get("canManageTopic");
   },
 
-  @discourseComputed("canRemoveTimer", "removeTopicTimer")
-  showTrashCan(canRemoveTimer, removeTopicTimer) {
-    return canRemoveTimer && removeTopicTimer;
+  @discourseComputed("canModifyTimer", "removeTopicTimer")
+  showTrashCan(canModifyTimer, removeTopicTimer) {
+    return canModifyTimer && removeTopicTimer;
+  },
+
+  @discourseComputed("canModifyTimer", "showTopicTimerModal")
+  showEdit(canModifyTimer, showTopicTimerModal) {
+    return canModifyTimer && showTopicTimerModal;
+  },
+
+  additionalOpts() {
+    return {};
   },
 
   renderTopicTimer() {
@@ -39,6 +61,10 @@ export default Component.extend({
       return;
     }
 
+    if (this.isDestroyed) {
+      return;
+    }
+
     const topicStatus = this.topicClosed ? "close" : "open";
     const topicStatusKnown = this.topicClosed !== undefined;
     if (topicStatusKnown && topicStatus === this.statusType) {
@@ -49,25 +75,13 @@ export default Component.extend({
     const duration = moment.duration(statusUpdateAt - moment());
     const minutesLeft = duration.asMinutes();
     if (minutesLeft > 0 || isDeleteRepliesType || this.basedOnLastPost) {
-      let rerenderDelay = 1000;
-      if (minutesLeft > 2160) {
-        rerenderDelay = 12 * 60 * 60000;
-      } else if (minutesLeft > 1410) {
-        rerenderDelay = 60 * 60000;
-      } else if (minutesLeft > 90) {
-        rerenderDelay = 30 * 60000;
-      } else if (minutesLeft > 2) {
-        rerenderDelay = 60000;
-      }
-      let durationHours = parseInt(this.duration, 0) || 0;
-
-      if (isDeleteRepliesType) {
-        durationHours *= 24;
-      }
+      let durationMinutes = parseInt(this.durationMinutes, 0) || 0;
 
       let options = {
         timeLeft: duration.humanize(true),
-        duration: moment.duration(durationHours, "hours").humanize(),
+        duration: moment
+          .duration(durationMinutes, "minutes")
+          .humanize({ s: 60, m: 60, h: 24 }),
       };
 
       const categoryId = this.categoryId;
@@ -83,6 +97,7 @@ export default Component.extend({
         );
       }
 
+      options = Object.assign(options, this.additionalOpts());
       this.setProperties({
         title: `${moment(this.executeAt).format("LLLL")}`.htmlSafe(),
         notice: `${I18n.t(this._noticeKey(), options)}`.htmlSafe(),
@@ -93,45 +108,36 @@ export default Component.extend({
       if (!isTesting()) {
         this._delayedRerender = later(() => {
           this.renderTopicTimer();
-        }, rerenderDelay);
+        }, this.rerenderDelay(minutesLeft));
       }
     } else {
       this.set("showTopicTimer", null);
     }
   },
 
-  didReceiveAttrs() {
-    this._super(...arguments);
-    this.renderTopicTimer();
-  },
-
-  didInsertElement() {
-    this._super(...arguments);
-
-    if (this.removeTopicTimer) {
-      $(this.element).on(
-        "click.topic-timer-remove",
-        "button",
-        this.removeTopicTimer
-      );
+  rerenderDelay(minutesLeft) {
+    if (minutesLeft > 2160) {
+      return 12 * 60 * 60000;
+    } else if (minutesLeft > 1410) {
+      return 60 * 60000;
+    } else if (minutesLeft > 90) {
+      return 30 * 60000;
+    } else if (minutesLeft > 2) {
+      return 60000;
     }
-  },
 
-  willDestroyElement() {
-    $(this.element).off("click.topic-timer-remove", this.removeTopicTimer);
-
-    if (this._delayedRerender) {
-      cancel(this._delayedRerender);
-    }
+    return 1000;
   },
 
   _noticeKey() {
-    const statusType = this.statusType;
-
-    if (this.basedOnLastPost) {
-      return `topic.status_update_notice.auto_${statusType}_based_on_last_post`;
-    } else {
-      return `topic.status_update_notice.auto_${statusType}`;
+    let statusType = this.statusType;
+    if (statusType === "silent_close") {
+      statusType = "close";
     }
+    if (this.basedOnLastPost && statusType === "close") {
+      statusType = "close_after_last_post";
+    }
+
+    return `topic.status_update_notice.auto_${statusType}`;
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/user-avatar-flair.js b/app/assets/javascripts/discourse/app/components/user-avatar-flair.js
new file mode 100644
index 0000000000..faf749278b
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-avatar-flair.js
@@ -0,0 +1,41 @@
+import MountWidget from "discourse/components/mount-widget";
+import { observes } from "discourse-common/utils/decorators";
+import autoGroupFlairForUser from "discourse/lib/avatar-flair";
+
+export default MountWidget.extend({
+  widget: "avatar-flair",
+
+  @observes("user")
+  _rerender() {
+    this.queueRerender();
+  },
+
+  buildArgs() {
+    if (!this.user) {
+      return;
+    }
+
+    if (
+      this.user.primary_group_flair_url ||
+      this.user.primary_group_flair_bg_color
+    ) {
+      return {
+        primary_group_flair_url: this.user.primary_group_flair_url,
+        primary_group_flair_bg_color: this.user.primary_group_flair_bg_color,
+        primary_group_flair_color: this.user.primary_group_flair_color,
+        primary_group_name: this.user.primary_group_name,
+      };
+    } else {
+      const autoFlairAttrs = autoGroupFlairForUser(this.site, this.user);
+      if (autoFlairAttrs) {
+        return {
+          primary_group_flair_url: autoFlairAttrs.primary_group_flair_url,
+          primary_group_flair_bg_color:
+            autoFlairAttrs.primary_group_flair_bg_color,
+          primary_group_flair_color: autoFlairAttrs.primary_group_flair_color,
+          primary_group_name: autoFlairAttrs.primary_group_name,
+        };
+      }
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/components/user-badge.js b/app/assets/javascripts/discourse/app/components/user-badge.js
index f2647da215..ae21334c03 100644
--- a/app/assets/javascripts/discourse/app/components/user-badge.js
+++ b/app/assets/javascripts/discourse/app/components/user-badge.js
@@ -1,8 +1,8 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
-  tagName: "span",
+  tagName: "",
 
   @discourseComputed("count")
   showGrantCount(count) {
@@ -12,7 +12,7 @@ export default Component.extend({
   @discourseComputed("badge", "user")
   badgeUrl() {
     // NOTE: I tried using a link-to helper here but the queryParams mean it fails
-    var username = this.get("user.username_lower") || "";
+    let username = this.get("user.username_lower") || "";
     username = username !== "" ? "?username=" + username : "";
     return this.get("badge.url") + username;
   },
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 93001a1299..99811350d0 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -1,16 +1,16 @@
-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";
 import EmberObject, { set } from "@ember/object";
-import Component from "@ember/component";
+import { alias, and, gt, gte, not, or } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import User from "discourse/models/user";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
-import { durationTiny } from "discourse/lib/formatter";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import CardContentsBase from "discourse/mixins/card-contents-base";
 import CleansUp from "discourse/mixins/cleans-up";
+import Component from "@ember/component";
+import I18n from "I18n";
+import User from "discourse/models/user";
+import { durationTiny } from "discourse/lib/formatter";
+import { getURLWithCDN } from "discourse-common/lib/get-url";
+import { isEmpty } from "@ember/utils";
 import { prioritizeNameInUx } from "discourse/lib/settings";
 
 export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
@@ -20,9 +20,10 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   classNameBindings: [
     "visible:show",
     "showBadges",
-    "user.card_background::no-bg",
+    "user.card_background_upload_url::no-bg",
     "isFixed:fixed",
     "usernameClass",
+    "primaryGroup",
   ],
   allowBackgrounds: setting("allow_profile_backgrounds"),
   showBadges: setting("enable_badges"),
@@ -88,7 +89,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   usernameClass: (username) => (username ? `user-card-${username}` : ""),
 
   @discourseComputed("username", "topicPostCount")
-  togglePostsLabel(username, count) {
+  filterPostsLabel(username, count) {
     return I18n.t("topic.filter_to", { username, count });
   },
 
@@ -157,6 +158,11 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     thisElem.style.backgroundImage = bg;
   },
 
+  @discourseComputed("user.primary_group_name")
+  primaryGroup(primaryGroup) {
+    return `group-${primaryGroup}`;
+  },
+
   _showCallback(username, $target) {
     this._positionCard($target);
     this.setProperties({ visible: true, loading: true });
@@ -210,8 +216,8 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
       this._close();
     },
 
-    togglePosts() {
-      this.togglePosts(this.user);
+    filterPosts() {
+      this.filterPosts(this.user);
       this._close();
     },
 
diff --git a/app/assets/javascripts/discourse/app/components/user-field.js b/app/assets/javascripts/discourse/app/components/user-field.js
index 08db97b9cb..aedfa0de48 100644
--- a/app/assets/javascripts/discourse/app/components/user-field.js
+++ b/app/assets/javascripts/discourse/app/components/user-field.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 
 export default Component.extend({
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 71525ea57f..a5f19d13e0 100644
--- a/app/assets/javascripts/discourse/app/components/user-flag-percentage.js
+++ b/app/assets/javascripts/discourse/app/components/user-flag-percentage.js
@@ -1,6 +1,6 @@
+import Component from "@ember/component";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
 
 export default Component.extend({
   tagName: "",
diff --git a/app/assets/javascripts/discourse/app/components/user-info.js b/app/assets/javascripts/discourse/app/components/user-info.js
index 051d8a3b0b..024825ed78 100644
--- a/app/assets/javascripts/discourse/app/components/user-info.js
+++ b/app/assets/javascripts/discourse/app/components/user-info.js
@@ -1,7 +1,8 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
+import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 import { userPath } from "discourse/lib/url";
+import { prioritizeNameInUx } from "discourse/lib/settings";
 
 export function normalize(name) {
   return name.replace(/[\-\_ \.]/g, "").toLowerCase();
@@ -24,4 +25,9 @@ export default Component.extend({
       return name;
     }
   },
+
+  @discourseComputed("user.name")
+  nameFirst(name) {
+    return prioritizeNameInUx(name);
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/components/user-link.js b/app/assets/javascripts/discourse/app/components/user-link.js
index 71737d6235..fc3978a50b 100644
--- a/app/assets/javascripts/discourse/app/components/user-link.js
+++ b/app/assets/javascripts/discourse/app/components/user-link.js
@@ -1,5 +1,5 @@
-import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
+import { alias } from "@ember/object/computed";
 export default Component.extend({
   tagName: "a",
   attributeBindings: ["href", "data-user-card"],
diff --git a/app/assets/javascripts/discourse/app/components/user-notification-schedule-day.js b/app/assets/javascripts/discourse/app/components/user-notification-schedule-day.js
new file mode 100644
index 0000000000..4dc0ea0076
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-notification-schedule-day.js
@@ -0,0 +1,7 @@
+import Component from "@ember/component";
+import { i18n } from "discourse/lib/computed";
+
+export default Component.extend({
+  tagName: "",
+  dayLabel: i18n("day", "user.notification_schedule.%@"),
+});
diff --git a/app/assets/javascripts/discourse/app/components/user-notification-schedule.js b/app/assets/javascripts/discourse/app/components/user-notification-schedule.js
new file mode 100644
index 0000000000..45d72d7c11
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-notification-schedule.js
@@ -0,0 +1,139 @@
+import EmberObject, { action } from "@ember/object";
+import Component from "@ember/component";
+import I18n from "I18n";
+import discourseComputed from "discourse-common/utils/decorators";
+
+const DAYS = [
+  "monday",
+  "tuesday",
+  "wednesday",
+  "thursday",
+  "friday",
+  "saturday",
+  "sunday",
+];
+
+const Day = EmberObject.extend({
+  id: null,
+  startTimeOptions: null,
+  model: null,
+
+  @action
+  onChangeStartTime(val) {
+    this.startingTimeChangedForDay(val);
+  },
+
+  @action
+  onChangeEndTime(val) {
+    this.set(`model.user_notification_schedule.day_${this.id}_end_time`, val);
+  },
+
+  @discourseComputed(
+    "model.user_notification_schedule.day_{0,1,2,3,4,5,6}_start_time"
+  )
+  startTimeValue(schedule) {
+    return schedule[`day_${this.id}_start_time`];
+  },
+
+  @discourseComputed(
+    "model.user_notification_schedule.day_{0,1,2,3,4,5,6}_start_time"
+  )
+  endTimeOptions(schedule) {
+    return this.buildEndTimeOptionsFor(schedule[`day_${this.id}_start_time`]);
+  },
+
+  @discourseComputed(
+    "model.user_notification_schedule.day_{0,1,2,3,4,5,6}_end_time"
+  )
+  endTimeValue(schedule) {
+    return schedule[`day_${this.id}_end_time`];
+  },
+
+  startingTimeChangedForDay(val) {
+    val = parseInt(val, 10);
+    this.model.set(`user_notification_schedule.day_${this.id}_start_time`, val);
+    if (
+      val !== "-1" &&
+      this.model.user_notification_schedule[`day_${this.id}_end_time`] <= val
+    ) {
+      this.model.set(
+        `user_notification_schedule.day_${this.id}_end_time`,
+        val + 30
+      );
+    }
+  },
+
+  buildEndTimeOptionsFor(startTime) {
+    startTime = parseInt(startTime, 10);
+    if (startTime === -1) {
+      return null;
+    }
+    return this.buildTimeOptions(startTime + 30, {
+      includeNone: false,
+      showMidnight: true,
+    });
+  },
+});
+
+export default Component.extend({
+  days: null,
+
+  didInsertElement() {
+    this._super(...arguments);
+    this.set(
+      "startTimeOptions",
+      this.buildTimeOptions(0, {
+        includeNone: true,
+        showMidnight: false,
+      })
+    );
+
+    this.set("days", []);
+
+    DAYS.forEach((day, index) => {
+      this.days.pushObject(
+        Day.create({
+          id: index,
+          day,
+          model: this.model,
+          buildTimeOptions: this.buildTimeOptions,
+          startTimeOptions: this.startTimeOptions,
+        })
+      );
+    });
+  },
+
+  buildTimeOptions(startAt, opts = { includeNone: false, showMidnight: true }) {
+    let timeOptions = [];
+
+    if (opts.includeNone) {
+      timeOptions.push({
+        name: I18n.t("user.notification_schedule.none"),
+        value: -1,
+      });
+    }
+
+    for (let timeInMin = startAt; timeInMin <= 1440; timeInMin += 30) {
+      let hours = Math.floor(timeInMin / 60);
+      let minutes = timeInMin % 60;
+
+      if (minutes === 0) {
+        minutes = "00";
+      }
+      if (hours === 24) {
+        if (opts.showMidnight) {
+          timeOptions.push({
+            name: I18n.t("user.notification_schedule.midnight"),
+            value: 1440,
+          });
+        }
+        break;
+      }
+      timeOptions.push({
+        name: moment().set("hour", hours).set("minute", minutes).format("LT"),
+        value: timeInMin,
+      });
+    }
+    return timeOptions;
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/components/user-selector.js b/app/assets/javascripts/discourse/app/components/user-selector.js
index b47aff691c..cc90f9a849 100644
--- a/app/assets/javascripts/discourse/app/components/user-selector.js
+++ b/app/assets/javascripts/discourse/app/components/user-selector.js
@@ -1,8 +1,9 @@
-import { isEmpty } from "@ember/utils";
-import { bind, on, observes } from "discourse-common/utils/decorators";
+import { bind, observes, on } from "discourse-common/utils/decorators";
 import TextField from "discourse/components/text-field";
-import userSearch from "discourse/lib/user-search";
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
+import { isEmpty } from "@ember/utils";
+import userSearch from "discourse/lib/user-search";
+import deprecated from "discourse-common/lib/deprecated";
 
 export default TextField.extend({
   autocorrect: false,
@@ -12,6 +13,14 @@ export default TextField.extend({
   single: false,
   fullWidthWrap: false,
 
+  @on("init")
+  deprecateComponent() {
+    deprecated(
+      "`{{user-selector}}` is deprecated. Please use `{{email-group-user-chooser}}` instead.",
+      { since: "2.7", dropFrom: "2.8" }
+    );
+  },
+
   @bind
   _paste(event) {
     let pastedText = "";
diff --git a/app/assets/javascripts/discourse/app/components/user-stat.js b/app/assets/javascripts/discourse/app/components/user-stat.js
index 61003fa8c5..bc33c00a5d 100644
--- a/app/assets/javascripts/discourse/app/components/user-stat.js
+++ b/app/assets/javascripts/discourse/app/components/user-stat.js
@@ -1,5 +1,5 @@
-import { equal } from "@ember/object/computed";
 import Component from "@ember/component";
+import { equal } from "@ember/object/computed";
 export default Component.extend({
   classNames: ["user-stat"],
   type: "number",
diff --git a/app/assets/javascripts/discourse/app/components/user-stream-item.js b/app/assets/javascripts/discourse/app/components/user-stream-item.js
index cb6b3a5a51..68cfb4816f 100644
--- a/app/assets/javascripts/discourse/app/components/user-stream-item.js
+++ b/app/assets/javascripts/discourse/app/components/user-stream-item.js
@@ -1,9 +1,11 @@
 import Component from "@ember/component";
-import { propertyEqual } from "discourse/lib/computed";
-import { computed } from "@ember/object";
 import { actionDescription } from "discourse/widgets/post-small-action";
+import { computed } from "@ember/object";
+import { propertyEqual } from "discourse/lib/computed";
 
 export default Component.extend({
+  tagName: "li",
+
   classNameBindings: [
     ":user-stream-item",
     ":item", // DEPRECATED: 'item' class
diff --git a/app/assets/javascripts/discourse/app/components/user-stream.js b/app/assets/javascripts/discourse/app/components/user-stream.js
index 72a0b533f3..3d1c1e6b9e 100644
--- a/app/assets/javascripts/discourse/app/components/user-stream.js
+++ b/app/assets/javascripts/discourse/app/components/user-stream.js
@@ -1,18 +1,20 @@
-import I18n from "I18n";
-import { schedule } from "@ember/runloop";
-import Component from "@ember/component";
-import LoadMore from "discourse/mixins/load-more";
 import ClickTrack from "discourse/lib/click-track";
-import Post from "discourse/models/post";
+import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import Draft from "discourse/models/draft";
-import { popupAjaxError } from "discourse/lib/ajax-error";
+import I18n from "I18n";
+import LoadMore from "discourse/mixins/load-more";
+import Post from "discourse/models/post";
+import bootbox from "bootbox";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { observes } from "discourse-common/utils/decorators";
 import { on } from "@ember/object/evented";
-import bootbox from "bootbox";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { schedule } from "@ember/runloop";
 
 export default Component.extend(LoadMore, {
+  tagName: "ul",
+
   _initialize: on("init", function () {
     const filter = this.get("stream.filter");
     if (filter) {
diff --git a/app/assets/javascripts/discourse/app/components/user-summary-category-search.js b/app/assets/javascripts/discourse/app/components/user-summary-category-search.js
index 3a5441ff6b..35c21644e9 100644
--- a/app/assets/javascripts/discourse/app/components/user-summary-category-search.js
+++ b/app/assets/javascripts/discourse/app/components/user-summary-category-search.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   tagName: "",
diff --git a/app/assets/javascripts/discourse/app/components/user-summary-topics-list.js b/app/assets/javascripts/discourse/app/components/user-summary-topics-list.js
index 18fc5e896a..f02063e03a 100644
--- a/app/assets/javascripts/discourse/app/components/user-summary-topics-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-summary-topics-list.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 // should be kept in sync with 'UserSummary::MAX_SUMMARY_RESULTS'
 const MAX_SUMMARY_RESULTS = 6;
diff --git a/app/assets/javascripts/discourse/app/controllers/about.js b/app/assets/javascripts/discourse/app/controllers/about.js
index 9e05f5e9f9..26f3761bfd 100644
--- a/app/assets/javascripts/discourse/app/controllers/about.js
+++ b/app/assets/javascripts/discourse/app/controllers/about.js
@@ -1,7 +1,7 @@
+import Controller from "@ember/controller";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { gt } from "@ember/object/computed";
-import Controller from "@ember/controller";
 
 export default Controller.extend({
   faqOverriden: gt("siteSettings.faq_url.length", 0),
diff --git a/app/assets/javascripts/discourse/app/controllers/account-created-edit-email.js b/app/assets/javascripts/discourse/app/controllers/account-created-edit-email.js
index 04c1dc7499..c3a20cc06d 100644
--- a/app/assets/javascripts/discourse/app/controllers/account-created-edit-email.js
+++ b/app/assets/javascripts/discourse/app/controllers/account-created-edit-email.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
 import { changeEmail } from "discourse/lib/user-activation";
+import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
diff --git a/app/assets/javascripts/discourse/app/controllers/activation-edit.js b/app/assets/javascripts/discourse/app/controllers/activation-edit.js
index 29620f3c14..ee57b1b1fd 100644
--- a/app/assets/javascripts/discourse/app/controllers/activation-edit.js
+++ b/app/assets/javascripts/discourse/app/controllers/activation-edit.js
@@ -1,8 +1,8 @@
-import discourseComputed from "discourse-common/utils/decorators";
 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";
+import discourseComputed from "discourse-common/utils/decorators";
+import { extractError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(ModalFunctionality, {
   login: controller(),
diff --git a/app/assets/javascripts/discourse/app/controllers/application.js b/app/assets/javascripts/discourse/app/controllers/application.js
index fb6b103bcb..e2ed3cdd19 100644
--- a/app/assets/javascripts/discourse/app/controllers/application.js
+++ b/app/assets/javascripts/discourse/app/controllers/application.js
@@ -1,7 +1,7 @@
+import { isAppWebview, isiOSPWA } from "discourse/lib/utilities";
+import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import { inject as service } from "@ember/service";
-import Controller from "@ember/controller";
-import { isAppWebview, isiOSPWA } from "discourse/lib/utilities";
 
 export default Controller.extend({
   showTop: true,
@@ -13,7 +13,7 @@ export default Controller.extend({
     return (
       !this.siteSettings.invite_only &&
       this.siteSettings.allow_new_registrations &&
-      !this.siteSettings.enable_sso
+      !this.siteSettings.enable_discourse_connect
     );
   },
 
diff --git a/app/assets/javascripts/discourse/app/controllers/associate-account-confirm.js b/app/assets/javascripts/discourse/app/controllers/associate-account-confirm.js
index b817ae4324..6afae9f1d7 100644
--- a/app/assets/javascripts/discourse/app/controllers/associate-account-confirm.js
+++ b/app/assets/javascripts/discourse/app/controllers/associate-account-confirm.js
@@ -1,7 +1,7 @@
 import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
   actions: {
diff --git a/app/assets/javascripts/discourse/app/controllers/auth-token.js b/app/assets/javascripts/discourse/app/controllers/auth-token.js
index 6637ea3b1a..2d8c91157a 100644
--- a/app/assets/javascripts/discourse/app/controllers/auth-token.js
+++ b/app/assets/javascripts/discourse/app/controllers/auth-token.js
@@ -1,7 +1,7 @@
-import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
+import { next } from "@ember/runloop";
 import { userPath } from "discourse/lib/url";
 
 export default Controller.extend(ModalFunctionality, {
diff --git a/app/assets/javascripts/discourse/app/controllers/avatar-selector.js b/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
index 099919cbce..965207f83c 100644
--- a/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
+++ b/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
@@ -1,8 +1,8 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { allowsImages } from "discourse/lib/uploads";
+import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { setting } from "discourse/lib/computed";
 
@@ -11,6 +11,11 @@ export default Controller.extend(ModalFunctionality, {
   gravatarBaseUrl: setting("gravatar_base_url"),
   gravatarLoginUrl: setting("gravatar_login_url"),
 
+  @discourseComputed("selected", "uploading")
+  submitDisabled(selected, uploading) {
+    return selected === "logo" || uploading;
+  },
+
   @discourseComputed(
     "siteSettings.selectable_avatars_enabled",
     "siteSettings.selectable_avatars"
@@ -22,12 +27,20 @@ export default Controller.extend(ModalFunctionality, {
   },
 
   @discourseComputed(
+    "user.use_logo_small_as_avatar",
     "user.avatar_template",
     "user.system_avatar_template",
     "user.gravatar_avatar_template"
   )
-  selected(avatarTemplate, systemAvatarTemplate, gravatarAvatarTemplate) {
-    if (avatarTemplate === systemAvatarTemplate) {
+  selected(
+    useLogo,
+    avatarTemplate,
+    systemAvatarTemplate,
+    gravatarAvatarTemplate
+  ) {
+    if (useLogo) {
+      return "logo";
+    } else if (avatarTemplate === systemAvatarTemplate) {
       return "system";
     } else if (avatarTemplate === gravatarAvatarTemplate) {
       return "gravatar";
diff --git a/app/assets/javascripts/discourse/app/controllers/badges/index.js b/app/assets/javascripts/discourse/app/controllers/badges/index.js
index f685625408..265b5cd3e6 100644
--- a/app/assets/javascripts/discourse/app/controllers/badges/index.js
+++ b/app/assets/javascripts/discourse/app/controllers/badges/index.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
 
 function badgeKey(badge) {
   let pos = badge.get("badge_grouping.position");
diff --git a/app/assets/javascripts/discourse/app/controllers/badges/show.js b/app/assets/javascripts/discourse/app/controllers/badges/show.js
index ae33c40c81..4cab9625da 100644
--- a/app/assets/javascripts/discourse/app/controllers/badges/show.js
+++ b/app/assets/javascripts/discourse/app/controllers/badges/show.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
 import Controller, { inject as controller } from "@ember/controller";
-import EmberObject from "@ember/object";
-import Badge from "discourse/models/badge";
-import UserBadge from "discourse/models/user-badge";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import Badge from "discourse/models/badge";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
+import UserBadge from "discourse/models/user-badge";
 
 export default Controller.extend({
   application: controller(),
diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
index 0eb85d6195..6b57d740c7 100644
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/app/controllers/bookmark.js
@@ -1,103 +1,18 @@
-import I18n from "I18n";
-import { schedule, next } from "@ember/runloop";
-import { and, or } from "@ember/object/computed";
-import { action } from "@ember/object";
-import { isPresent, isEmpty } from "@ember/utils";
 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";
-import { formattedReminderTime, REMINDER_TYPES } from "discourse/lib/bookmark";
-import { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";
-import bootbox from "bootbox";
-
-// 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 LATER_TODAY_MAX_HOUR = 18;
-const MOMENT_MONDAY = 1;
-const MOMENT_THURSDAY = 4;
-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] },
-  "d d": { handler: "delete" },
-};
+import { action } from "@ember/object";
 
 export default Controller.extend(ModalFunctionality, {
-  loading: false,
-  errorMessage: null,
-  selectedReminderType: null,
-  _closeWithoutSaving: false,
-  _savingBookmarkManually: false,
-  onCloseWithoutSaving: null,
-  customReminderDate: null,
-  customReminderTime: null,
-  lastCustomReminderDate: null,
-  lastCustomReminderTime: null,
-  postDetectedLocalDate: null,
-  postDetectedLocalTime: null,
-  mouseTrap: null,
-  userTimezone: null,
-  showOptions: false,
-
   onShow() {
     this.setProperties({
-      errorMessage: null,
-      selectedReminderType: REMINDER_TYPES.NONE,
-      _closeWithoutSaving: false,
-      _savingBookmarkManually: false,
-      customReminderDate: null,
-      customReminderTime: this._defaultCustomReminderTime(),
-      lastCustomReminderDate: null,
-      lastCustomReminderTime: null,
-      postDetectedLocalDate: null,
-      postDetectedLocalTime: null,
-      userTimezone: this.currentUser.resolvedTimezone(this.currentUser),
-      showOptions: false,
       model: this.model || {},
+      allowSave: true,
     });
+  },
 
-    this._loadBookmarkOptions();
-    this._bindKeyboardShortcuts();
-    this._loadLastUsedCustomReminderDatetime();
-
-    if (this._editingExistingBookmark()) {
-      this._initializeExistingBookmarkData();
-    }
-
-    schedule("afterRender", () => {
-      if (this.site.isMobileDevice) {
-        document.getElementById("bookmark-name").blur();
-      }
-    });
+  @action
+  registerOnCloseHandler(handlerFn) {
+    this.set("onCloseHandler", handlerFn);
   },
 
   /**
@@ -105,462 +20,8 @@ export default Controller.extend(ModalFunctionality, {
    * clicks the save or cancel button to mimic browser behaviour.
    */
   onClose(opts = {}) {
-    if (opts.initiatedByCloseButton) {
-      this._closeWithoutSaving = true;
-    }
-
-    this._unbindKeyboardShortcuts();
-    this._restoreGlobalShortcuts();
-    if (!this._closeWithoutSaving && !this._savingBookmarkManually) {
-      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);
-
-      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"),
-        selectedReminderType: REMINDER_TYPES.CUSTOM,
-      });
-    }
-  },
-
-  _editingExistingBookmark() {
-    return isPresent(this.model) && isPresent(this.model.id);
-  },
-
-  _existingBookmarkHasReminder() {
-    return isPresent(this.model) && isPresent(this.model.reminderAt);
-  },
-
-  _loadBookmarkOptions() {
-    this.set(
-      "autoDeletePreference",
-      this.model.autoDeletePreference || this._preferredDeleteOption() || 0
-    );
-
-    // 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.autoDeletePreference) {
-      next(() => this.toggleOptionsPanel());
-    }
-  },
-
-  _preferredDeleteOption() {
-    let preferred = localStorage.bookmarkDeleteOption;
-    if (preferred && preferred !== "") {
-      preferred = parseInt(preferred, 10);
-    }
-    return preferred;
-  },
-
-  _loadLastUsedCustomReminderDatetime() {
-    let lastTime = localStorage.lastCustomBookmarkReminderTime;
-    let lastDate = localStorage.lastCustomBookmarkReminderDate;
-
-    if (lastTime && lastDate) {
-      let parsed = this._parseCustomDateTime(lastDate, lastTime);
-
-      // can't set reminders in the past
-      if (parsed < this.now()) {
-        return;
-      }
-
-      this.setProperties({
-        lastCustomReminderDate: lastDate,
-        lastCustomReminderTime: lastTime,
-        parsedLastCustomReminderDatetime: parsed,
-      });
-    }
-  },
-
-  _bindKeyboardShortcuts() {
-    KeyboardShortcuts.pause(GLOBAL_SHORTCUTS_TO_PAUSE);
-    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);
-  },
-
-  _restoreGlobalShortcuts() {
-    KeyboardShortcuts.unpause(GLOBAL_SHORTCUTS_TO_PAUSE);
-  },
-
-  @discourseComputed("model.reminderAt")
-  showExistingReminderAt(existingReminderAt) {
-    return isPresent(existingReminderAt);
-  },
-
-  @discourseComputed("model.id")
-  showDelete(id) {
-    return isPresent(id);
-  },
-
-  @discourseComputed("selectedReminderType")
-  customDateTimeSelected(selectedReminderType) {
-    return selectedReminderType === REMINDER_TYPES.CUSTOM;
-  },
-
-  @discourseComputed()
-  reminderTypes: () => {
-    return REMINDER_TYPES;
-  },
-
-  @discourseComputed()
-  autoDeletePreferences: () => {
-    return Object.keys(AUTO_DELETE_PREFERENCES).map((key) => {
-      return {
-        id: AUTO_DELETE_PREFERENCES[key],
-        name: I18n.t(`bookmarks.auto_delete_preference.${key.toLowerCase()}`),
-      };
-    });
-  },
-
-  showLastCustom: and("lastCustomReminderTime", "lastCustomReminderDate"),
-
-  showPostLocalDate: or(
-    "model.postDetectedLocalDate",
-    "model.postDetectedLocalTime"
-  ),
-
-  get showLaterToday() {
-    let later = this.laterToday();
-    return (
-      !later.isSame(this.tomorrow(), "date") &&
-      this.now().hour() < LATER_TODAY_CUTOFF_HOUR
-    );
-  },
-
-  get showLaterThisWeek() {
-    return this.now().day() < MOMENT_THURSDAY;
-  },
-
-  @discourseComputed("parsedLastCustomReminderDatetime")
-  lastCustomFormatted(parsedLastCustomReminderDatetime) {
-    return parsedLastCustomReminderDatetime.format(
-      I18n.t("dates.long_no_year")
-    );
-  },
-
-  @discourseComputed("model.reminderAt")
-  existingReminderAtFormatted(existingReminderAt) {
-    return formattedReminderTime(existingReminderAt, this.userTimezone);
-  },
-
-  get startNextBusinessWeekLabel() {
-    if (this.now().day() === MOMENT_MONDAY) {
-      return I18n.t("bookmarks.reminders.start_of_next_business_week_alt");
-    }
-    return I18n.t("bookmarks.reminders.start_of_next_business_week");
-  },
-
-  get startNextBusinessWeekFormatted() {
-    return this.nextWeek()
-      .day(MOMENT_MONDAY)
-      .format(I18n.t("dates.long_no_year"));
-  },
-
-  get laterTodayFormatted() {
-    return this.laterToday().format(I18n.t("dates.time"));
-  },
-
-  get tomorrowFormatted() {
-    return this.tomorrow().format(I18n.t("dates.time_short_day"));
-  },
-
-  get nextWeekFormatted() {
-    return this.nextWeek().format(I18n.t("dates.long_no_year"));
-  },
-
-  get laterThisWeekFormatted() {
-    return this.laterThisWeek().format(I18n.t("dates.time_short_day"));
-  },
-
-  get nextMonthFormatted() {
-    return this.nextMonth().format(I18n.t("dates.long_no_year"));
-  },
-
-  get postLocalDateFormatted() {
-    return this.postLocalDate().format(I18n.t("dates.long_no_year"));
-  },
-
-  @discourseComputed("userTimezone")
-  userHasTimezoneSet(userTimezone) {
-    return !isEmpty(userTimezone);
-  },
-
-  _saveBookmark() {
-    const reminderAt = this._reminderAt();
-    const reminderAtISO = reminderAt ? reminderAt.toISOString() : null;
-
-    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;
-    }
-
-    localStorage.bookmarkDeleteOption = this.autoDeletePreference;
-
-    let reminderType;
-    if (this.selectedReminderType === REMINDER_TYPES.NONE) {
-      reminderType = null;
-    } else if (
-      this.selectedReminderType === REMINDER_TYPES.LAST_CUSTOM ||
-      this.selectedReminderType === REMINDER_TYPES.POST_LOCAL_DATE
-    ) {
-      reminderType = REMINDER_TYPES.CUSTOM;
-    } else {
-      reminderType = this.selectedReminderType;
-    }
-
-    const data = {
-      reminder_type: reminderType,
-      reminder_at: reminderAtISO,
-      name: this.model.name,
-      post_id: this.model.postId,
-      id: this.model.id,
-      auto_delete_preference: this.autoDeletePreference,
-    };
-
-    if (this._editingExistingBookmark()) {
-      return ajax("/bookmarks/" + this.model.id, {
-        type: "PUT",
-        data,
-      }).then(() => {
-        if (this.afterSave) {
-          this.afterSave({
-            reminderAt: reminderAtISO,
-            reminderType: this.selectedReminderType,
-            autoDeletePreference: this.autoDeletePreference,
-            id: this.model.id,
-            name: this.model.name,
-          });
-        }
-      });
-    } else {
-      return ajax("/bookmarks", { type: "POST", data }).then((response) => {
-        if (this.afterSave) {
-          this.afterSave({
-            reminderAt: reminderAtISO,
-            reminderType: this.selectedReminderType,
-            autoDeletePreference: this.autoDeletePreference,
-            id: response.id,
-            name: this.model.name,
-          });
-        }
-      });
-    }
-  },
-
-  _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() {
-    return `0${START_OF_DAY_HOUR}:00`;
-  },
-
-  _reminderAt() {
-    if (!this.selectedReminderType) {
-      return;
-    }
-
-    switch (this.selectedReminderType) {
-      case REMINDER_TYPES.LATER_TODAY:
-        return this.laterToday();
-      case REMINDER_TYPES.NEXT_BUSINESS_DAY:
-        return this.nextBusinessDay();
-      case REMINDER_TYPES.TOMORROW:
-        return this.tomorrow();
-      case REMINDER_TYPES.NEXT_WEEK:
-        return this.nextWeek();
-      case REMINDER_TYPES.START_OF_NEXT_BUSINESS_WEEK:
-        return this.nextWeek().day(MOMENT_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 || this._defaultCustomReminderTime()
-        );
-        const customDateTime = this._parseCustomDateTime(
-          this.customReminderDate,
-          this.customReminderTime
-        );
-        if (!customDateTime.isValid()) {
-          this.setProperties({
-            customReminderTime: null,
-            customReminderDate: null,
-          });
-          return;
-        }
-        return customDateTime;
-      case REMINDER_TYPES.LAST_CUSTOM:
-        return this.parsedLastCustomReminderDatetime;
-      case REMINDER_TYPES.POST_LOCAL_DATE:
-        return this.postLocalDate();
-    }
-  },
-
-  nextWeek() {
-    return this.startOfDay(this.now().add(7, "days"));
-  },
-
-  nextMonth() {
-    return this.startOfDay(this.now().add(1, "month"));
-  },
-
-  postLocalDate() {
-    let parsedPostLocalDate = this._parseCustomDateTime(
-      this.model.postDetectedLocalDate,
-      this.model.postDetectedLocalTime
-    );
-
-    if (!this.model.postDetectedLocalTime) {
-      return this.startOfDay(parsedPostLocalDate);
-    }
-
-    return parsedPostLocalDate;
-  },
-
-  tomorrow() {
-    return this.startOfDay(this.now().add(1, "day"));
-  },
-
-  startOfDay(momentDate) {
-    return momentDate.hour(START_OF_DAY_HOUR).startOf("hour");
-  },
-
-  now() {
-    return moment.tz(this.userTimezone);
-  },
-
-  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.startOf("hour")
-      : later.add(30, "minutes").startOf("hour");
-  },
-
-  laterThisWeek() {
-    if (!this.showLaterThisWeek) {
-      return;
-    }
-    return this.startOfDay(this.now().add(2, "days"));
-  },
-
-  _handleSaveError(e) {
-    this._savingBookmarkManually = false;
-    if (typeof e === "string") {
-      bootbox.alert(e);
-    } else {
-      popupAjaxError(e);
-    }
-  },
-
-  @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) {
-      return;
-    }
-
-    this._saving = true;
-    this._savingBookmarkManually = true;
-    return this._saveBookmark()
-      .then(() => this.send("closeModal"))
-      .catch((e) => this._handleSaveError(e))
-      .finally(() => (this._saving = false));
-  },
-
-  @action
-  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();
-    }
-  },
-
-  @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();
+    if (this.onCloseHandler) {
+      this.onCloseHandler(opts.initiatedByCloseButton);
     }
   },
 });
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 70808d469c..0a8655986f 100644
--- a/app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js
+++ b/app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js
@@ -1,7 +1,7 @@
+import Controller, { inject as controller } from "@ember/controller";
 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";
 import { topicLevels } from "discourse/lib/notification-levels";
 
 // Support for changing the notification level of various topics
diff --git a/app/assets/javascripts/discourse/app/controllers/change-owner.js b/app/assets/javascripts/discourse/app/controllers/change-owner.js
index df39e86c95..fe2a7c537c 100644
--- a/app/assets/javascripts/discourse/app/controllers/change-owner.js
+++ b/app/assets/javascripts/discourse/app/controllers/change-owner.js
@@ -1,23 +1,23 @@
+import Controller, { inject } from "@ember/controller";
+import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import Topic from "discourse/models/topic";
+import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
-import { alias } from "@ember/object/computed";
 import { next } from "@ember/runloop";
-import Controller, { inject } from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import DiscourseURL from "discourse/lib/url";
-import Topic from "discourse/models/topic";
 
 export default Controller.extend(ModalFunctionality, {
   topicController: inject("topic"),
 
   saving: false,
-  new_user: null,
+  newOwner: null,
 
   selectedPostsCount: alias("topicController.selectedPostsCount"),
   selectedPostsUsername: alias("topicController.selectedPostsUsername"),
 
-  @discourseComputed("saving", "new_user")
+  @discourseComputed("saving", "newOwner")
   buttonDisabled(saving, newUser) {
     return saving || isEmpty(newUser);
   },
@@ -25,7 +25,7 @@ export default Controller.extend(ModalFunctionality, {
   onShow() {
     this.setProperties({
       saving: false,
-      new_user: "",
+      newOwner: null,
     });
   },
 
@@ -35,7 +35,7 @@ export default Controller.extend(ModalFunctionality, {
 
       const options = {
         post_ids: this.get("topicController.selectedPostIds"),
-        username: this.new_user,
+        username: this.newOwner,
       };
 
       Topic.changeOwners(this.get("topicController.model.id"), options).then(
@@ -57,5 +57,9 @@ export default Controller.extend(ModalFunctionality, {
 
       return false;
     },
+
+    updateNewOwner(selected) {
+      this.set("newOwner", selected.firstObject);
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/change-post-notice.js b/app/assets/javascripts/discourse/app/controllers/change-post-notice.js
index b8bfbdfa6a..ffcbbaa175 100644
--- a/app/assets/javascripts/discourse/app/controllers/change-post-notice.js
+++ b/app/assets/javascripts/discourse/app/controllers/change-post-notice.js
@@ -1,9 +1,9 @@
 import Controller from "@ember/controller";
-import { action } from "@ember/object";
-import { isEmpty } from "@ember/utils";
-import discourseComputed from "discourse-common/utils/decorators";
-import { cookAsync } from "discourse/lib/text";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { action } from "@ember/object";
+import { cookAsync } from "discourse/lib/text";
+import discourseComputed from "discourse-common/utils/decorators";
+import { isEmpty } from "@ember/utils";
 
 export default Controller.extend(ModalFunctionality, {
   post: null,
diff --git a/app/assets/javascripts/discourse/app/controllers/change-timestamp.js b/app/assets/javascripts/discourse/app/controllers/change-timestamp.js
index acc39aef15..8e41d3aa04 100644
--- a/app/assets/javascripts/discourse/app/controllers/change-timestamp.js
+++ b/app/assets/javascripts/discourse/app/controllers/change-timestamp.js
@@ -1,11 +1,11 @@
+import Controller, { inject } from "@ember/controller";
+import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import Topic from "discourse/models/topic";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
-import Controller, { inject } from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import DiscourseURL from "discourse/lib/url";
-import Topic from "discourse/models/topic";
 
 // Modal related to changing the timestamp of posts
 export default Controller.extend(ModalFunctionality, {
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 7feb149ddb..626f339d14 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -1,36 +1,38 @@
-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";
-import { cancel, debounce, run } from "@ember/runloop";
-import { inject as service } from "@ember/service";
+import Composer, { SAVE_ICONS, SAVE_LABELS } from "discourse/models/composer";
 import Controller, { inject } from "@ember/controller";
-import DiscourseURL from "discourse/lib/url";
-import { buildQuote } from "discourse/lib/quote";
-import Draft from "discourse/models/draft";
-import discourseComputed, {
-  observes,
-  on,
-} from "discourse-common/utils/decorators";
-import { getOwner } from "discourse-common/lib/get-owner";
-import { escapeExpression } from "discourse/lib/utilities";
+import EmberObject, { action, computed } from "@ember/object";
+import { alias, and, or, reads } from "@ember/object/computed";
 import {
   authorizesOneOrMoreExtensions,
   uploadIcon,
 } from "discourse/lib/uploads";
-import { emojiUnescape } from "discourse/lib/text";
-import { shortDate } from "discourse/lib/formatter";
-import Composer, { SAVE_LABELS, SAVE_ICONS } from "discourse/models/composer";
-import { Promise } from "rsvp";
-import { isTesting } from "discourse-common/config/environment";
-import EmberObject, { computed, action } from "@ember/object";
-import deprecated from "discourse-common/lib/deprecated";
-import bootbox from "bootbox";
-import showModal from "discourse/lib/show-modal";
+import { cancel, run } from "@ember/runloop";
 import {
   cannotPostAgain,
   durationTextFromSeconds,
 } from "discourse/helpers/slow-mode";
+import discourseComputed, {
+  observes,
+  on,
+} from "discourse-common/utils/decorators";
+import DiscourseURL from "discourse/lib/url";
+import Draft from "discourse/models/draft";
+import I18n from "I18n";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { Promise } from "rsvp";
+import bootbox from "bootbox";
+import { buildQuote } from "discourse/lib/quote";
+import deprecated from "discourse-common/lib/deprecated";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { emojiUnescape } from "discourse/lib/text";
+import { escapeExpression } from "discourse/lib/utilities";
+import { getOwner } from "discourse-common/lib/get-owner";
+import getURL from "discourse-common/lib/get-url";
+import { isEmpty } from "@ember/utils";
+import { isTesting } from "discourse-common/config/environment";
+import { inject as service } from "@ember/service";
+import { shortDate } from "discourse/lib/formatter";
+import showModal from "discourse/lib/show-modal";
 
 function loadDraft(store, opts) {
   let promise = Promise.resolve();
@@ -224,21 +226,31 @@ export default Controller.extend({
 
   isWhispering: or("replyingToWhisper", "model.whisper"),
 
-  @discourseComputed("model.action", "isWhispering")
-  saveIcon(modelAction, isWhispering) {
+  @discourseComputed("model.action", "isWhispering", "model.privateMessage")
+  saveIcon(modelAction, isWhispering, privateMessage) {
     if (isWhispering) {
       return "far-eye-slash";
     }
+    if (privateMessage && modelAction === Composer.REPLY) {
+      return "envelope";
+    }
 
     return SAVE_ICONS[modelAction];
   },
 
-  @discourseComputed("model.action", "isWhispering", "model.editConflict")
-  saveLabel(modelAction, isWhispering, editConflict) {
+  @discourseComputed(
+    "model.action",
+    "isWhispering",
+    "model.editConflict",
+    "model.privateMessage"
+  )
+  saveLabel(modelAction, isWhispering, editConflict, privateMessage) {
     if (editConflict) {
       return "composer.overwrite_edit";
     } else if (isWhispering) {
       return "composer.create_whisper";
+    } else if (privateMessage && modelAction === Composer.REPLY) {
+      return "composer.create_pm";
     }
 
     return SAVE_LABELS[modelAction];
@@ -441,8 +453,25 @@ export default Controller.extend({
       const post = this.get("model.post");
       const $links = $("a[href]", $preview);
       $links.each((idx, l) => {
-        const href = $(l).prop("href");
+        const href = l.href;
         if (href && href.length) {
+          // skip links in quotes
+          for (let element = l; element; element = element.parentElement) {
+            if (
+              element.tagName === "DIV" &&
+              element.classList.contains("d-editor-preview")
+            ) {
+              break;
+            }
+
+            if (
+              element.tagName === "ASIDE" &&
+              element.classList.contains("quote")
+            ) {
+              return true;
+            }
+          }
+
           const [warn, info] = linkLookup.check(post, href);
 
           if (warn) {
@@ -544,9 +573,7 @@ export default Controller.extend({
     },
 
     cancel() {
-      const differentDraftContext =
-        this.get("topic.id") !== this.get("model.topic.id");
-      this.cancelComposer(differentDraftContext);
+      this.cancelComposer();
     },
 
     save(ignore, event) {
@@ -663,8 +690,13 @@ export default Controller.extend({
           topic.user_last_posted_at
         )
       ) {
+        const canPostAt = new moment(topic.user_last_posted_at).add(
+          topic.slow_mode_seconds,
+          "seconds"
+        );
+        const timeLeft = moment().diff(canPostAt, "seconds");
         const message = I18n.t("composer.slow_mode.error", {
-          duration: durationTextFromSeconds(topic.slow_mode_seconds),
+          timeLeft: durationTextFromSeconds(timeLeft),
         });
 
         bootbox.alert(message);
@@ -688,7 +720,8 @@ export default Controller.extend({
       }
 
       if (currentTopic.id !== composer.get("topic.id")) {
-        const message = I18n.t("composer.posting_not_on_topic");
+        const message =
+          "<h1>" + I18n.t("composer.posting_not_on_topic") + "</h1>";
 
         let buttons = [
           {
@@ -726,7 +759,7 @@ export default Controller.extend({
       }
     }
 
-    var staged = false;
+    let staged = false;
 
     // TODO: This should not happen in model
     const imageSizes = {};
@@ -777,6 +810,10 @@ export default Controller.extend({
           this.appEvents.trigger("post:highlight", result.payload.post_number);
         }
 
+        if (this.get("model.draftKey") === Composer.NEW_TOPIC_KEY) {
+          this.currentUser.set("has_topic_draft", false);
+        }
+
         if (result.responseJson.route_to) {
           this.destroyDraft();
           if (result.responseJson.message) {
@@ -794,7 +831,10 @@ export default Controller.extend({
         const post = result.target;
 
         if (post && !staged && options.jump !== false) {
-          DiscourseURL.routeTo(post.url, { skipIfOnScreen: true });
+          DiscourseURL.routeTo(post.url, {
+            keepFilter: true,
+            skipIfOnScreen: true,
+          });
         }
       })
       .catch((error) => {
@@ -901,13 +941,7 @@ export default Controller.extend({
           }
         }
 
-        // If it's a different draft, cancel it and try opening again.
-        const differentDraftContext =
-          opts.post && composerModel.topic
-            ? composerModel.topic.id !== opts.post.topic_id
-            : true;
-
-        return this.cancelComposer(differentDraftContext)
+        return this.cancelComposer()
           .then(() => this.open(opts))
           .then(resolve, reject);
       }
@@ -986,6 +1020,7 @@ export default Controller.extend({
       composerModel.setProperties({
         composeState: Composer.OPEN,
         isWarning: false,
+        hasTargetGroups: opts.hasGroups,
       });
 
       if (!this.model.targetRecipients) {
@@ -1008,7 +1043,7 @@ export default Controller.extend({
         this.model.set("categoryId", opts.topicCategoryId);
       }
 
-      if (opts.topicTags && !this.site.mobileView && this.site.can_tag_topics) {
+      if (opts.topicTags && this.site.can_tag_topics) {
         let tags = escapeExpression(opts.topicTags)
           .split(",")
           .slice(0, this.siteSettings.max_tags_per_topic);
@@ -1035,18 +1070,19 @@ export default Controller.extend({
     return false;
   },
 
-  destroyDraft() {
+  destroyDraft(draftSequence = null) {
     const key = this.get("model.draftKey");
     if (key) {
-      if (key === "new_topic") {
-        this.send("clearTopicDraft");
+      if (key === Composer.NEW_TOPIC_KEY) {
+        this.currentUser.set("has_topic_draft", false);
       }
 
       if (this._saveDraftPromise) {
         return this._saveDraftPromise.then(() => this.destroyDraft());
       }
 
-      return Draft.clear(key, this.get("model.draftSequence")).then(() =>
+      const sequence = draftSequence || this.get("model.draftSequence");
+      return Draft.clear(key, sequence).then(() =>
         this.appEvents.trigger("draft:destroyed", key)
       );
     } else {
@@ -1076,9 +1112,12 @@ export default Controller.extend({
           {
             label: I18n.t("drafts.abandon.yes_value"),
             class: "btn-danger",
+            icon: iconHTML("far-trash-alt"),
             callback: () => {
-              data.draft = null;
-              resolve(data);
+              this.destroyDraft(data.draft_sequence).finally(() => {
+                data.draft = null;
+                resolve(data);
+              });
             },
           },
         ]);
@@ -1089,7 +1128,7 @@ export default Controller.extend({
     }
   },
 
-  cancelComposer(differentDraft = false) {
+  cancelComposer() {
     this.skipAutoSave = true;
 
     if (this._saveDraftDebounce) {
@@ -1101,10 +1140,8 @@ export default Controller.extend({
         const controller = showModal("discard-draft", {
           model: this.model,
           modalClass: "discard-draft-modal",
-          title: "post.abandon.title",
         });
         controller.setProperties({
-          differentDraft,
           onDestroyDraft: () => {
             this.destroyDraft()
               .then(() => {
@@ -1116,15 +1153,16 @@ export default Controller.extend({
               });
           },
           onSaveDraft: () => {
-            // cancel composer without destroying draft on new draft context
-            if (differentDraft) {
-              this.model.clearState();
-              this.close();
-              resolve();
+            this._saveDraft();
+            if (this.model.draftKey === Composer.NEW_TOPIC_KEY) {
+              this.currentUser.set("has_topic_draft", true);
             }
-
-            reject();
+            this.model.clearState();
+            this.close();
+            resolve();
           },
+          // needed to resume saving drafts if composer stays open
+          onDismissModal: () => reject(),
         });
       } else {
         // it is possible there is some sort of crazy draft with no body ... just give up on it
@@ -1162,7 +1200,11 @@ export default Controller.extend({
         // in test debounce is Ember.run, this will cause
         // an infinite loop
         if (!isTesting()) {
-          this._saveDraftDebounce = debounce(this, this._saveDraft, 2000);
+          this._saveDraftDebounce = discourseDebounce(
+            this,
+            this._saveDraft,
+            2000
+          );
         }
       } else {
         this._saveDraftPromise = model.saveDraft().finally(() => {
@@ -1188,7 +1230,7 @@ export default Controller.extend({
       if (Date.now() - this._lastDraftSaved > 15000) {
         this._saveDraft();
       } else {
-        let method = isTesting() ? run : debounce;
+        let method = isTesting() ? run : discourseDebounce;
         this._saveDraftDebounce = method(this, this._saveDraft, 2000);
       }
     }
@@ -1208,19 +1250,22 @@ export default Controller.extend({
   @discourseComputed("model.category", "model.tags", "lastValidatedAt")
   tagValidation(category, tags, lastValidatedAt) {
     const tagsArray = tags || [];
-    if (
-      this.site.can_tag_topics &&
-      !this.currentUser.staff &&
-      category &&
-      category.minimum_required_tags > tagsArray.length
-    ) {
-      return EmberObject.create({
-        failed: true,
-        reason: I18n.t("composer.error.tags_missing", {
-          count: category.minimum_required_tags,
-        }),
-        lastShownAt: lastValidatedAt,
-      });
+    if (this.site.can_tag_topics && !this.currentUser.staff && category) {
+      if (
+        category.minimum_required_tags > tagsArray.length ||
+        (category.required_tag_groups &&
+          category.min_tags_from_required_group > tagsArray.length)
+      ) {
+        return EmberObject.create({
+          failed: true,
+          reason: I18n.t("composer.error.tags_missing", {
+            count:
+              category.minimum_required_tags ||
+              category.min_tags_from_required_group,
+          }),
+          lastShownAt: lastValidatedAt,
+        });
+      }
     }
   },
 
diff --git a/app/assets/javascripts/discourse/app/controllers/convert-to-public-topic.js b/app/assets/javascripts/discourse/app/controllers/convert-to-public-topic.js
index ba53b1a54b..4fb7c1eee7 100644
--- a/app/assets/javascripts/discourse/app/controllers/convert-to-public-topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/convert-to-public-topic.js
@@ -1,6 +1,6 @@
 import Controller from "@ember/controller";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(ModalFunctionality, {
   publicCategoryId: null,
diff --git a/app/assets/javascripts/discourse/app/controllers/create-account.js b/app/assets/javascripts/discourse/app/controllers/create-account.js
index d0976f6104..6dc0fa372e 100644
--- a/app/assets/javascripts/discourse/app/controllers/create-account.js
+++ b/app/assets/javascripts/discourse/app/controllers/create-account.js
@@ -1,27 +1,29 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import { A } from "@ember/array";
-import { isEmpty } from "@ember/utils";
-import { notEmpty } from "@ember/object/computed";
 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";
+import cookie, { removeCookie } from "discourse/lib/cookie";
 import discourseComputed, {
   observes,
   on,
 } from "discourse-common/utils/decorators";
-import { emailValid } from "discourse/lib/utilities";
-import PasswordValidation from "discourse/mixins/password-validation";
-import UsernameValidation from "discourse/mixins/username-validation";
+import { A } from "@ember/array";
+import EmberObject, { action } from "@ember/object";
+import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 import NameValidation from "discourse/mixins/name-validation";
-import UserFieldsValidation from "discourse/mixins/user-fields-validation";
-import { userPath } from "discourse/lib/url";
-import { findAll } from "discourse/models/login-method";
-import EmberObject from "@ember/object";
-import User from "discourse/models/user";
+import PasswordValidation from "discourse/mixins/password-validation";
 import { Promise } from "rsvp";
-import cookie, { removeCookie } from "discourse/lib/cookie";
+import User from "discourse/models/user";
+import UserFieldsValidation from "discourse/mixins/user-fields-validation";
+import UsernameValidation from "discourse/mixins/username-validation";
+import { ajax } from "discourse/lib/ajax";
+import { emailValid } from "discourse/lib/utilities";
+import { findAll } from "discourse/models/login-method";
+import discourseDebounce from "discourse-common/lib/debounce";
+import getURL from "discourse-common/lib/get-url";
+import { isEmpty } from "@ember/utils";
+import { notEmpty } from "@ember/object/computed";
+import { setting } from "discourse/lib/computed";
+import { userPath } from "discourse/lib/url";
+import { wavingHandURL } from "discourse/lib/waving-hand-url";
 
 export default Controller.extend(
   ModalFunctionality,
@@ -57,6 +59,8 @@ export default Controller.extend(
         accountEmail: "",
         accountUsername: "",
         accountPassword: "",
+        serverAccountEmail: null,
+        serverEmailValidation: null,
         authOptions: null,
         complete: false,
         formSubmitted: false,
@@ -77,15 +81,25 @@ export default Controller.extend(
       return false;
     },
 
-    @discourseComputed("userFields", "hasAtLeastOneLoginButton")
-    modalBodyClasses(userFields, hasAtLeastOneLoginButton) {
+    @discourseComputed()
+    wavingHandURL: () => wavingHandURL(),
+
+    @discourseComputed(
+      "userFields",
+      "hasAtLeastOneLoginButton",
+      "hasAuthOptions"
+    )
+    modalBodyClasses(userFields, hasAtLeastOneLoginButton, hasAuthOptions) {
       const classes = [];
       if (userFields) {
         classes.push("has-user-fields");
       }
-      if (hasAtLeastOneLoginButton) {
+      if (hasAtLeastOneLoginButton && !hasAuthOptions) {
         classes.push("has-alt-auth");
       }
+      if (!this.canCreateLocal) {
+        classes.push("no-local-logins");
+      }
       return classes.join(" ");
     },
 
@@ -122,13 +136,27 @@ export default Controller.extend(
     },
 
     // Check the email address
-    @discourseComputed("accountEmail", "rejectedEmails.[]")
-    emailValidation(email, rejectedEmails) {
+    @discourseComputed(
+      "serverAccountEmail",
+      "serverEmailValidation",
+      "accountEmail",
+      "rejectedEmails.[]"
+    )
+    emailValidation(
+      serverAccountEmail,
+      serverEmailValidation,
+      email,
+      rejectedEmails
+    ) {
       const failedAttrs = {
         failed: true,
         element: document.querySelector("#new-account-email"),
       };
 
+      if (serverAccountEmail === email && serverEmailValidation) {
+        return serverEmailValidation;
+      }
+
       // If blank, fail without a reason
       if (isEmpty(email)) {
         return EmberObject.create(
@@ -138,7 +166,7 @@ export default Controller.extend(
         );
       }
 
-      if (rejectedEmails.includes(email)) {
+      if (rejectedEmails.includes(email) || !emailValid(email)) {
         return EmberObject.create(
           Object.assign(failedAttrs, {
             reason: I18n.t("user.email.invalid"),
@@ -160,18 +188,48 @@ export default Controller.extend(
         });
       }
 
-      if (emailValid(email)) {
-        return EmberObject.create({
-          ok: true,
-          reason: I18n.t("user.email.ok"),
-        });
+      return EmberObject.create({
+        ok: true,
+        reason: I18n.t("user.email.ok"),
+      });
+    },
+
+    @action
+    checkEmailAvailability() {
+      if (
+        !this.emailValidation.ok ||
+        this.serverAccountEmail === this.accountEmail
+      ) {
+        return;
       }
 
-      return EmberObject.create(
-        Object.assign(failedAttrs, {
-          reason: I18n.t("user.email.invalid"),
+      return User.checkEmail(this.accountEmail)
+        .then((result) => {
+          if (result.failed) {
+            this.setProperties({
+              serverAccountEmail: this.accountEmail,
+              serverEmailValidation: EmberObject.create({
+                failed: true,
+                element: document.querySelector("#new-account-email"),
+                reason: result.errors[0],
+              }),
+            });
+          } else {
+            this.setProperties({
+              serverAccountEmail: this.accountEmail,
+              serverEmailValidation: EmberObject.create({
+                ok: true,
+                reason: I18n.t("user.email.ok"),
+              }),
+            });
+          }
         })
-      );
+        .catch(() => {
+          this.setProperties({
+            serverAccountEmail: null,
+            serverEmailValidation: null,
+          });
+        });
     },
 
     @discourseComputed(
@@ -212,7 +270,7 @@ export default Controller.extend(
         // If email is valid and username has not been entered yet,
         // or email and username were filled automatically by 3rd parth auth,
         // then look for a registered username that matches the email.
-        this.fetchExistingUsername();
+        discourseDebounce(this, this.fetchExistingUsername, 500);
       }
     },
 
@@ -351,7 +409,7 @@ export default Controller.extend(
 
     actions: {
       externalLogin(provider) {
-        this.login.send("externalLogin", provider);
+        this.login.send("externalLogin", provider, { signup: true });
       },
 
       createAccount() {
diff --git a/app/assets/javascripts/discourse/app/controllers/create-invite-bulk.js b/app/assets/javascripts/discourse/app/controllers/create-invite-bulk.js
new file mode 100644
index 0000000000..0ebeb09992
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/controllers/create-invite-bulk.js
@@ -0,0 +1,24 @@
+import Controller from "@ember/controller";
+import { action } from "@ember/object";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+
+export default Controller.extend(ModalFunctionality, {
+  data: null,
+
+  onShow() {
+    this.set("data", null);
+  },
+
+  onClose() {
+    if (this.data) {
+      this.data.abort();
+      this.set("data", null);
+    }
+  },
+
+  @action
+  submit(data) {
+    this.set("data", data);
+    data.submit();
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/controllers/create-invite.js b/app/assets/javascripts/discourse/app/controllers/create-invite.js
new file mode 100644
index 0000000000..3237366b04
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/controllers/create-invite.js
@@ -0,0 +1,218 @@
+import Controller from "@ember/controller";
+import { action } from "@ember/object";
+import { equal } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
+import { extractError } from "discourse/lib/ajax-error";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { getNativeContact } from "discourse/lib/pwa-utils";
+import Group from "discourse/models/group";
+import Invite from "discourse/models/invite";
+import I18n from "I18n";
+
+export default Controller.extend(
+  ModalFunctionality,
+  bufferedProperty("invite"),
+  {
+    allGroups: null,
+
+    invite: null,
+    invites: null,
+
+    showAdvanced: false,
+    inviteToTopic: false,
+    limitToEmail: false,
+    autogenerated: false,
+
+    type: "link",
+
+    onShow() {
+      Group.findAll().then((groups) => {
+        this.set("allGroups", groups.filterBy("automatic", false));
+      });
+
+      this.setProperties({
+        invite: null,
+        invites: null,
+        showAdvanced: false,
+        inviteToTopic: false,
+        limitToEmail: false,
+        autogenerated: false,
+      });
+
+      this.setInvite(Invite.create());
+    },
+
+    onClose() {
+      if (this.autogenerated) {
+        this.invite
+          .destroy()
+          .then(() => this.invites && this.invites.removeObject(this.invite));
+      }
+    },
+
+    setInvite(invite) {
+      this.setProperties({
+        invite,
+        type: invite.email ? "email" : "link",
+      });
+    },
+
+    setAutogenerated(value) {
+      if (this.invites && (this.autogenerated || !this.invite.id) && !value) {
+        this.invites.unshiftObject(this.invite);
+      }
+
+      this.set("autogenerated", value);
+    },
+
+    save(opts) {
+      const data = { ...this.buffered.buffer };
+
+      if (data.groupIds !== undefined) {
+        data.group_ids = data.groupIds;
+        delete data.groupIds;
+      }
+
+      if (data.topicId !== undefined) {
+        data.topic_id = data.topicId;
+        delete data.topicId;
+        delete data.topicTitle;
+      }
+
+      if (this.type === "link") {
+        if (this.buffered.get("email")) {
+          data.email = "";
+          data.custom_message = "";
+        }
+      } else if (this.type === "email") {
+        if (this.buffered.get("max_redemptions_allowed") > 1) {
+          data.max_redemptions_allowed = 1;
+        }
+
+        if (opts.sendEmail) {
+          data.send_email = true;
+          if (this.inviteToTopic) {
+            data.invite_to_topic = true;
+          }
+        } else {
+          data.skip_email = true;
+        }
+      }
+
+      return this.invite
+        .save(data)
+        .then(() => {
+          this.rollbackBuffer();
+          this.setAutogenerated(opts.autogenerated);
+          if (!this.autogenerated) {
+            if (this.type === "email" && opts.sendEmail) {
+              this.send("closeModal");
+            } else {
+              this.appEvents.trigger("modal-body:flash", {
+                text: opts.copy
+                  ? I18n.t("user.invited.invite.invite_copied")
+                  : I18n.t("user.invited.invite.invite_saved"),
+                messageClass: "success",
+              });
+            }
+          }
+        })
+        .catch((e) =>
+          this.appEvents.trigger("modal-body:flash", {
+            text: extractError(e),
+            messageClass: "error",
+          })
+        );
+    },
+
+    isLink: equal("type", "link"),
+    isEmail: equal("type", "email"),
+
+    @discourseComputed(
+      "currentUser.staff",
+      "siteSettings.invite_link_max_redemptions_limit",
+      "siteSettings.invite_link_max_redemptions_limit_users"
+    )
+    maxRedemptionsAllowedLimit(staff, staffLimit, usersLimit) {
+      return staff ? staffLimit : usersLimit;
+    },
+
+    @discourseComputed("buffered.expires_at")
+    expiresAtLabel(expires_at) {
+      const expiresAt = moment(expires_at);
+
+      return expiresAt.isBefore()
+        ? I18n.t("user.invited.invite.expired_at_time", {
+            time: expiresAt.format("LLL"),
+          })
+        : I18n.t("user.invited.invite.expires_in_time", {
+            time: moment.duration(expiresAt - moment()).humanize(),
+          });
+    },
+
+    @discourseComputed("currentUser.staff", "currentUser.groups")
+    canInviteToGroup(staff, groups) {
+      return staff || groups.any((g) => g.owner);
+    },
+
+    @discourseComputed("type", "buffered.email")
+    disabled(type, email) {
+      if (type === "email") {
+        return !email;
+      }
+
+      return false;
+    },
+
+    @discourseComputed("buffered.hasBufferedChanges", "invite.email", "type")
+    changed(hasBufferedChanges, inviteEmail, type) {
+      return hasBufferedChanges || (inviteEmail ? "email" : "link") !== type;
+    },
+
+    @discourseComputed("currentUser.staff", "type")
+    hasAdvanced(staff, type) {
+      return staff || type === "email";
+    },
+
+    @action
+    copied() {
+      if (this.type === "email" && !this.buffered.get("email")) {
+        return this.appEvents.trigger("modal-body:flash", {
+          text: I18n.t("user.invited.invite.blank_email"),
+          messageClass: "error",
+        });
+      }
+
+      this.save({ sendEmail: false, copy: true });
+    },
+
+    @action
+    toggleLimitToEmail() {
+      const limitToEmail = !this.limitToEmail;
+      this.setProperties({
+        limitToEmail,
+        type: limitToEmail ? "email" : "link",
+      });
+    },
+
+    @action
+    saveInvite(sendEmail) {
+      this.appEvents.trigger("modal-body:clearFlash");
+
+      this.save({ sendEmail });
+    },
+
+    @action
+    searchContact() {
+      getNativeContact(this.capabilities, ["email"], false).then((result) => {
+        this.set("buffered.email", result[0].email[0]);
+      });
+    },
+
+    @action
+    toggleAdvanced() {
+      this.toggleProperty("showAdvanced");
+    },
+  }
+);
diff --git a/app/assets/javascripts/discourse/app/controllers/delete-topic-confirm.js b/app/assets/javascripts/discourse/app/controllers/delete-topic-confirm.js
index f3e06c43f3..fb8de28430 100644
--- a/app/assets/javascripts/discourse/app/controllers/delete-topic-confirm.js
+++ b/app/assets/javascripts/discourse/app/controllers/delete-topic-confirm.js
@@ -1,8 +1,8 @@
+import Controller, { inject } from "@ember/controller";
 import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { action } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
-import Controller, { inject } from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 // Modal that displays confirmation text when user deletes a topic
 // The modal will display only if the topic exceeds a certain amount of views
diff --git a/app/assets/javascripts/discourse/app/controllers/discard-draft.js b/app/assets/javascripts/discourse/app/controllers/discard-draft.js
index 32633aec29..eecd880f54 100644
--- a/app/assets/javascripts/discourse/app/controllers/discard-draft.js
+++ b/app/assets/javascripts/discourse/app/controllers/discard-draft.js
@@ -1,40 +1,19 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend(ModalFunctionality, {
-  differentDraft: null,
-
-  @discourseComputed()
-  keyPrefix() {
-    return this.model.action === "edit" ? "post.abandon_edit" : "post.abandon";
-  },
-
-  @discourseComputed("keyPrefix")
-  descriptionKey(keyPrefix) {
-    return `${keyPrefix}.confirm`;
-  },
-
-  @discourseComputed("keyPrefix")
-  discardKey(keyPrefix) {
-    return `${keyPrefix}.yes_value`;
-  },
-
-  @discourseComputed("keyPrefix", "differentDraft")
-  saveKey(keyPrefix, differentDraft) {
-    return differentDraft
-      ? `${keyPrefix}.no_save_draft`
-      : `${keyPrefix}.no_value`;
-  },
-
   actions: {
-    _destroyDraft() {
+    destroyDraft() {
       this.onDestroyDraft();
       this.send("closeModal");
     },
-    _saveDraft() {
+    saveDraftAndClose() {
       this.onSaveDraft();
       this.send("closeModal");
     },
+    dismissModal() {
+      this.onDismissModal();
+      this.send("closeModal");
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery.js b/app/assets/javascripts/discourse/app/controllers/discovery.js
index c50bca76d3..9f2993a6ae 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery.js
@@ -1,7 +1,7 @@
-import { alias, not, equal } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
-import DiscourseURL from "discourse/lib/url";
+import { alias, equal, not } from "@ember/object/computed";
 import Category from "discourse/models/category";
+import DiscourseURL from "discourse/lib/url";
 import { observes } from "discourse-common/utils/decorators";
 import { inject as service } from "@ember/service";
 
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/categories.js b/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
index a213a32efb..b286fd4fda 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
@@ -1,8 +1,8 @@
+import DiscoveryController from "discourse/controllers/discovery";
+import { inject as controller } from "@ember/controller";
+import { dasherize } from "@ember/string";
 import discourseComputed from "discourse-common/utils/decorators";
 import { reads } from "@ember/object/computed";
-import { inject as controller } from "@ember/controller";
-import DiscoveryController from "discourse/controllers/discovery";
-import { dasherize } from "@ember/string";
 
 const subcategoryStyleComponentNames = {
   rows: "categories_only",
@@ -19,15 +19,6 @@ export default DiscoveryController.extend({
 
   canEdit: reads("currentUser.staff"),
 
-  @discourseComputed("model.categories.[].featuredTopics.length")
-  latestTopicOnly() {
-    return (
-      this.get("model.categories").find(
-        (c) => c.get("featuredTopics.length") > 1
-      ) === undefined
-    );
-  },
-
   @discourseComputed("model.parentCategory")
   categoryPageStyle(parentCategory) {
     let style = this.site.mobileView
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
index 679ada3505..6e33eb20fc 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
@@ -1,25 +1,25 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import {
   alias,
-  not,
-  gt,
   empty,
-  notEmpty,
   equal,
+  gt,
+  not,
+  notEmpty,
   readOnly,
 } from "@ember/object/computed";
-import { inject as controller } from "@ember/controller";
-import DiscoveryController from "discourse/controllers/discovery";
 import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
-import { endWith } from "discourse/lib/computed";
-import showModal from "discourse/lib/show-modal";
-import { userPath } from "discourse/lib/url";
-import TopicList from "discourse/models/topic-list";
+import DiscoveryController from "discourse/controllers/discovery";
+import I18n from "I18n";
 import Topic from "discourse/models/topic";
+import TopicList from "discourse/models/topic-list";
+import { inject as controller } from "@ember/controller";
+import deprecated from "discourse-common/lib/deprecated";
+import discourseComputed from "discourse-common/utils/decorators";
+import { endWith } from "discourse/lib/computed";
 import { routeAction } from "discourse/helpers/route-action";
 import { inject as service } from "@ember/service";
-import deprecated from "discourse-common/lib/deprecated";
+import showModal from "discourse/lib/show-modal";
+import { userPath } from "discourse/lib/url";
 
 const controllerOpts = {
   discovery: controller(),
diff --git a/app/assets/javascripts/discourse/app/controllers/do-not-disturb.js b/app/assets/javascripts/discourse/app/controllers/do-not-disturb.js
new file mode 100644
index 0000000000..cafa0483ef
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/controllers/do-not-disturb.js
@@ -0,0 +1,31 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { action } from "@ember/object";
+import { extractError } from "discourse/lib/ajax-error";
+
+export default Controller.extend(ModalFunctionality, {
+  duration: null,
+
+  @action
+  setDuration(duration) {
+    this.set("duration", duration);
+    this.save();
+  },
+
+  save() {
+    this.currentUser
+      .enterDoNotDisturbFor(this.duration)
+      .then(() => {
+        this.send("closeModal");
+      })
+      .catch((e) => {
+        this.flash(extractError(e), "error");
+      });
+  },
+
+  @action
+  navigateToNotificationSchedule() {
+    this.transitionToRoute("preferences.notifications", this.currentUser);
+    this.send("closeModal");
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/controllers/edit-category-tabs.js b/app/assets/javascripts/discourse/app/controllers/edit-category-tabs.js
index cff351a23a..bbfa66193d 100644
--- a/app/assets/javascripts/discourse/app/controllers/edit-category-tabs.js
+++ b/app/assets/javascripts/discourse/app/controllers/edit-category-tabs.js
@@ -1,12 +1,13 @@
-import I18n from "I18n";
-import Controller from "@ember/controller";
+import { and, readOnly } from "@ember/object/computed";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
+import Category from "discourse/models/category";
+import Controller from "@ember/controller";
+import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+import { NotificationLevels } from "discourse/lib/notification-levels";
+import PermissionType from "discourse/models/permission-type";
 import bootbox from "bootbox";
 import { extractError } from "discourse/lib/ajax-error";
-import DiscourseURL from "discourse/lib/url";
-import { readOnly } from "@ember/object/computed";
-import PermissionType from "discourse/models/permission-type";
-import { NotificationLevels } from "discourse/lib/notification-levels";
 import { underscore } from "@ember/string";
 
 export default Controller.extend({
@@ -14,11 +15,12 @@ export default Controller.extend({
   saving: false,
   deleting: false,
   panels: null,
-  hiddenTooltip: true,
+  showTooltip: false,
   createdCategory: false,
   expandedMenu: false,
   mobileView: readOnly("site.mobileView"),
   parentParams: null,
+  showDeleteReason: and("showTooltip", "model.cannot_delete_reason"),
 
   @on("init")
   _initPanels() {
@@ -106,6 +108,7 @@ export default Controller.extend({
               notification_level: NotificationLevels.REGULAR,
             });
             this.site.updateCategory(model);
+            this.transitionToRoute("editCategory", Category.slugFor(model));
           }
         })
         .catch((error) => {
@@ -141,7 +144,7 @@ export default Controller.extend({
     },
 
     toggleDeleteTooltip() {
-      this.toggleProperty("hiddenTooltip");
+      this.toggleProperty("showTooltip");
     },
 
     goBack() {
diff --git a/app/assets/javascripts/discourse/app/controllers/edit-slow-mode.js b/app/assets/javascripts/discourse/app/controllers/edit-slow-mode.js
index 4cf17bf239..66a0a0a038 100644
--- a/app/assets/javascripts/discourse/app/controllers/edit-slow-mode.js
+++ b/app/assets/javascripts/discourse/app/controllers/edit-slow-mode.js
@@ -1,12 +1,12 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import discourseComputed from "discourse-common/utils/decorators";
-import I18n from "I18n";
-import Topic from "discourse/models/topic";
 import { fromSeconds, toSeconds } from "discourse/helpers/slow-mode";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { equal } from "@ember/object/computed";
+import Controller from "@ember/controller";
+import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import Topic from "discourse/models/topic";
 import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
+import { equal, or } from "@ember/object/computed";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(ModalFunctionality, {
   selectedSlowMode: null,
@@ -14,31 +14,53 @@ export default Controller.extend(ModalFunctionality, {
   minutes: null,
   seconds: null,
   saveDisabled: false,
+  enabledUntil: null,
   showCustomSelect: equal("selectedSlowMode", "custom"),
+  durationIsSet: or("hours", "minutes", "seconds"),
 
   init() {
     this._super(...arguments);
 
     this.set("slowModes", [
+      {
+        id: "600",
+        name: I18n.t("topic.slow_mode_update.durations.10_minutes"),
+      },
       {
         id: "900",
         name: I18n.t("topic.slow_mode_update.durations.15_minutes"),
       },
+      {
+        id: "1800",
+        name: I18n.t("topic.slow_mode_update.durations.30_minutes"),
+      },
+      {
+        id: "2700",
+        name: I18n.t("topic.slow_mode_update.durations.45_minutes"),
+      },
       {
         id: "3600",
         name: I18n.t("topic.slow_mode_update.durations.1_hour"),
       },
+      {
+        id: "7200",
+        name: I18n.t("topic.slow_mode_update.durations.2_hours"),
+      },
       {
         id: "14400",
         name: I18n.t("topic.slow_mode_update.durations.4_hours"),
       },
       {
-        id: "86400",
-        name: I18n.t("topic.slow_mode_update.durations.1_day"),
+        id: "28800",
+        name: I18n.t("topic.slow_mode_update.durations.8_hours"),
       },
       {
-        id: "604800",
-        name: I18n.t("topic.slow_mode_update.durations.1_week"),
+        id: "43200",
+        name: I18n.t("topic.slow_mode_update.durations.12_hours"),
+      },
+      {
+        id: "86400",
+        name: I18n.t("topic.slow_mode_update.durations.24_hours"),
       },
       {
         id: "custom",
@@ -65,9 +87,9 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  @discourseComputed("hours", "minutes", "seconds")
-  submitDisabled(hours, minutes, seconds) {
-    return this.saveDisabled || !(hours || minutes || seconds);
+  @discourseComputed("saveDisabled", "durationIsSet", "enabledUntil")
+  submitDisabled(saveDisabled, durationIsSet, enabledUntil) {
+    return saveDisabled || !durationIsSet || !enabledUntil;
   },
 
   _setFromSeconds(seconds) {
@@ -99,7 +121,7 @@ export default Controller.extend(ModalFunctionality, {
       this._parseValue(this.seconds)
     );
 
-    Topic.setSlowMode(this.model.id, seconds)
+    Topic.setSlowMode(this.model.id, seconds, this.enabledUntil)
       .catch(popupAjaxError)
       .then(() => {
         this.set("model.slow_mode_seconds", seconds);
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 784a6d0705..96ce3817ef 100644
--- a/app/assets/javascripts/discourse/app/controllers/edit-topic-timer.js
+++ b/app/assets/javascripts/discourse/app/controllers/edit-topic-timer.js
@@ -1,14 +1,15 @@
-import I18n from "I18n";
-import { alias } from "@ember/object/computed";
 import EmberObject, { setProperties } from "@ember/object";
 import Controller from "@ember/controller";
-import discourseComputed from "discourse-common/utils/decorators";
+import { FORMAT } from "select-kit/components/future-date-input-selector";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import TopicTimer from "discourse/models/topic-timer";
+import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 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 CLOSE_AFTER_LAST_POST_STATUS_TYPE = "close_after_last_post";
 export const OPEN_STATUS_TYPE = "open";
 export const PUBLISH_TO_CATEGORY_STATUS_TYPE = "publish_to_category";
 export const DELETE_STATUS_TYPE = "delete";
@@ -28,6 +29,16 @@ export default Controller.extend(ModalFunctionality, {
           closed ? "topic.temp_open.title" : "topic.auto_close.title"
         ),
       },
+    ];
+
+    if (!closed) {
+      types.push({
+        id: CLOSE_AFTER_LAST_POST_STATUS_TYPE,
+        name: I18n.t("topic.auto_close_after_last_post.title"),
+      });
+    }
+
+    types.push(
       {
         id: OPEN_STATUS_TYPE,
         name: I18n.t(
@@ -41,8 +52,9 @@ export default Controller.extend(ModalFunctionality, {
       {
         id: BUMP_TYPE,
         name: I18n.t("topic.auto_bump.title"),
-      },
-    ];
+      }
+    );
+
     if (this.currentUser.get("staff")) {
       types.push(
         {
@@ -60,34 +72,35 @@ export default Controller.extend(ModalFunctionality, {
 
   topicTimer: alias("model.topic_timer"),
 
-  _setTimer(time, duration, statusType, basedOnLastPost, categoryId) {
+  _setTimer(time, durationMinutes, statusType, basedOnLastPost, categoryId) {
     this.set("loading", true);
 
-    TopicTimer.updateStatus(
+    TopicTimer.update(
       this.get("model.id"),
       time,
       basedOnLastPost,
       statusType,
       categoryId,
-      duration
+      durationMinutes
     )
       .then((result) => {
-        if (time || duration) {
+        if (time || durationMinutes) {
           this.send("closeModal");
 
           setProperties(this.topicTimer, {
             execute_at: result.execute_at,
-            duration: result.duration,
+            duration_minutes: result.duration_minutes,
             category_id: result.category_id,
           });
 
           this.set("model.closed", result.closed);
         } else {
-          this.set("model.topic_timer", EmberObject.create({}));
+          this.set(
+            "model.topic_timer",
+            EmberObject.create({ status_type: this.defaultStatusType })
+          );
 
-          this.setProperties({
-            selection: null,
-          });
+          this.send("onChangeInput", null, null);
         }
       })
       .catch(popupAjaxError)
@@ -106,26 +119,45 @@ export default Controller.extend(ModalFunctionality, {
       }
     }
 
-    this.send("onChangeInput", time);
+    this.send("onChangeInput", null, time);
+
+    if (!this.get("topicTimer.status_type")) {
+      this.send("onChangeStatusType", this.defaultStatusType);
+    }
+
+    if (
+      this.get("topicTimer.status_type") === CLOSE_STATUS_TYPE &&
+      this.get("topicTimer.based_on_last_post")
+    ) {
+      this.send("onChangeStatusType", CLOSE_AFTER_LAST_POST_STATUS_TYPE);
+    }
+  },
+
+  @discourseComputed("publicTimerTypes")
+  defaultStatusType(publicTimerTypes) {
+    return publicTimerTypes[0].id;
   },
 
   actions: {
     onChangeStatusType(value) {
-      this.set("topicTimer.status_type", value);
+      this.setProperties({
+        "topicTimer.based_on_last_post":
+          CLOSE_AFTER_LAST_POST_STATUS_TYPE === value,
+        "topicTimer.status_type": value,
+      });
     },
 
-    onChangeInput(value) {
-      this.set("topicTimer.updateTime", value);
-    },
-
-    onChangeDuration(value) {
-      this.set("topicTimer.duration", value);
+    onChangeInput(_type, time) {
+      if (moment.isMoment(time)) {
+        time = time.format(FORMAT);
+      }
+      this.set("topicTimer.updateTime", time);
     },
 
     saveTimer() {
       if (
         !this.get("topicTimer.updateTime") &&
-        !this.get("topicTimer.duration")
+        !this.get("topicTimer.duration_minutes")
       ) {
         this.flash(
           I18n.t("topic.topic_status_update.time_frame_required"),
@@ -134,17 +166,48 @@ export default Controller.extend(ModalFunctionality, {
         return;
       }
 
+      if (
+        this.get("topicTimer.duration_minutes") &&
+        !this.get("topicTimer.updateTime")
+      ) {
+        if (this.get("topicTimer.duration_minutes") <= 0) {
+          this.flash(
+            I18n.t("topic.topic_status_update.min_duration"),
+            "alert-error"
+          );
+          return;
+        }
+
+        // cannot be more than 20 years
+        if (this.get("topicTimer.duration_minutes") > 20 * 365 * 1440) {
+          this.flash(
+            I18n.t("topic.topic_status_update.max_duration"),
+            "alert-error"
+          );
+          return;
+        }
+      }
+
+      let statusType = this.get("topicTimer.status_type");
+      if (statusType === CLOSE_AFTER_LAST_POST_STATUS_TYPE) {
+        statusType = CLOSE_STATUS_TYPE;
+      }
+
       this._setTimer(
         this.get("topicTimer.updateTime"),
-        this.get("topicTimer.duration"),
-        this.get("topicTimer.status_type"),
+        this.get("topicTimer.duration_minutes"),
+        statusType,
         this.get("topicTimer.based_on_last_post"),
         this.get("topicTimer.category_id")
       );
     },
 
     removeTimer() {
-      this._setTimer(null, null, this.get("topicTimer.status_type"));
+      let statusType = this.get("topicTimer.status_type");
+      if (statusType === CLOSE_AFTER_LAST_POST_STATUS_TYPE) {
+        statusType = CLOSE_STATUS_TYPE;
+      }
+      this._setTimer(null, null, statusType);
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/email-login.js b/app/assets/javascripts/discourse/app/controllers/email-login.js
index 575110d295..166f9fd8c3 100644
--- a/app/assets/javascripts/discourse/app/controllers/email-login.js
+++ b/app/assets/javascripts/discourse/app/controllers/email-login.js
@@ -1,11 +1,11 @@
-import getURL from "discourse-common/lib/get-url";
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
+import DiscourseURL from "discourse/lib/url";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import { ajax } from "discourse/lib/ajax";
-import DiscourseURL from "discourse/lib/url";
-import { popupAjaxError } from "discourse/lib/ajax-error";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
 import { getWebauthnCredential } from "discourse/lib/webauthn";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
   lockImageUrl: getURL("/images/lock.svg"),
diff --git a/app/assets/javascripts/discourse/app/controllers/exception.js b/app/assets/javascripts/discourse/app/controllers/exception.js
index badf33afc8..0057782817 100644
--- a/app/assets/javascripts/discourse/app/controllers/exception.js
+++ b/app/assets/javascripts/discourse/app/controllers/exception.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
-import { equal, gte, none, alias } from "@ember/object/computed";
-import { schedule } from "@ember/runloop";
-import Controller from "@ember/controller";
+import { alias, equal, gte, none } from "@ember/object/computed";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
+import Controller from "@ember/controller";
+import I18n from "I18n";
+import { schedule } from "@ember/runloop";
 
 const ButtonBackBright = {
     classes: "btn-primary",
diff --git a/app/assets/javascripts/discourse/app/controllers/feature-topic-on-profile.js b/app/assets/javascripts/discourse/app/controllers/feature-topic-on-profile.js
index 622b5823bf..946a455106 100644
--- a/app/assets/javascripts/discourse/app/controllers/feature-topic-on-profile.js
+++ b/app/assets/javascripts/discourse/app/controllers/feature-topic-on-profile.js
@@ -1,8 +1,8 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import { none } from "@ember/object/computed";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(ModalFunctionality, {
   newFeaturedTopic: null,
diff --git a/app/assets/javascripts/discourse/app/controllers/feature-topic.js b/app/assets/javascripts/discourse/app/controllers/feature-topic.js
index b646cec500..f723df6f3b 100644
--- a/app/assets/javascripts/discourse/app/controllers/feature-topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/feature-topic.js
@@ -1,11 +1,11 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller, { inject } from "@ember/controller";
-import { ajax } from "discourse/lib/ajax";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { categoryLinkHTML } from "discourse/helpers/category-link";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
+import { categoryLinkHTML } from "discourse/helpers/category-link";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend(ModalFunctionality, {
   topicController: inject("topic"),
@@ -47,6 +47,11 @@ export default Controller.extend(ModalFunctionality, {
     return I18n.t(name, { categoryLink, until });
   },
 
+  @discourseComputed("model.details.can_pin_unpin_topic")
+  canPinGlobally(canPinUnpinTopic) {
+    return this.currentUser.canManageTopic && canPinUnpinTopic;
+  },
+
   @discourseComputed("categoryLink")
   pinMessage(categoryLink) {
     return I18n.t("topic.feature_topic.pin", { categoryLink });
diff --git a/app/assets/javascripts/discourse/app/controllers/flag.js b/app/assets/javascripts/discourse/app/controllers/flag.js
index 22cc684081..4872698dc6 100644
--- a/app/assets/javascripts/discourse/app/controllers/flag.js
+++ b/app/assets/javascripts/discourse/app/controllers/flag.js
@@ -1,15 +1,15 @@
+import ActionSummary from "discourse/models/action-summary";
+import Controller from "@ember/controller";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
+import { MAX_MESSAGE_LENGTH } from "discourse/models/post-action-type";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { Promise } from "rsvp";
+import User from "discourse/models/user";
 import discourseComputed from "discourse-common/utils/decorators";
 import { not } from "@ember/object/computed";
-import EmberObject from "@ember/object";
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import ActionSummary from "discourse/models/action-summary";
-import { MAX_MESSAGE_LENGTH } from "discourse/models/post-action-type";
 import optionalService from "discourse/lib/optional-service";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import I18n from "I18n";
-import User from "discourse/models/user";
-import { Promise } from "rsvp";
 
 export default Controller.extend(ModalFunctionality, {
   adminTools: optionalService(),
@@ -266,6 +266,17 @@ export default Controller.extend(ModalFunctionality, {
       this.set("model.hidden", true);
     },
 
+    flagForReview() {
+      const notifyModeratorsID = 7;
+      const notifyModerators = this.flagsAvailable.find(
+        (f) => f.id === notifyModeratorsID
+      );
+      this.set("selected", notifyModerators);
+
+      this.send("createFlag", { queue_for_review: true });
+      this.set("model.hidden", true);
+    },
+
     changePostActionType(action) {
       this.set("selected", action);
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/forgot-password.js b/app/assets/javascripts/discourse/app/controllers/forgot-password.js
index 3da342f8f4..8a7d814a7b 100644
--- a/app/assets/javascripts/discourse/app/controllers/forgot-password.js
+++ b/app/assets/javascripts/discourse/app/controllers/forgot-password.js
@@ -1,13 +1,13 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
-import { ajax } from "discourse/lib/ajax";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { ajax } from "discourse/lib/ajax";
+import cookie from "discourse/lib/cookie";
+import discourseComputed from "discourse-common/utils/decorators";
 import { escapeExpression } from "discourse/lib/utilities";
 import { extractError } from "discourse/lib/ajax-error";
 import getURL from "discourse-common/lib/get-url";
-import cookie from "discourse/lib/cookie";
+import { isEmpty } from "@ember/utils";
 
 export default Controller.extend(ModalFunctionality, {
   offerHelp: null,
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 032b438c8e..a7ba222f8c 100644
--- a/app/assets/javascripts/discourse/app/controllers/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
@@ -1,20 +1,20 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import { or } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
-import { ajax } from "discourse/lib/ajax";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import {
-  translateResults,
-  searchContextDescription,
   getSearchKey,
   isValidSearchTerm,
+  searchContextDescription,
+  translateResults,
 } from "discourse/lib/search";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Category from "discourse/models/category";
-import { escapeExpression } from "discourse/lib/utilities";
-import { setTransient } from "discourse/lib/page-tracker";
 import Composer from "discourse/models/composer";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
+import { escapeExpression } from "discourse/lib/utilities";
+import { isEmpty } from "@ember/utils";
+import { or } from "@ember/object/computed";
 import { scrollTop } from "discourse/mixins/scroll-top";
+import { setTransient } from "discourse/lib/page-tracker";
 
 const SortOrders = [
   { name: I18n.t("search.relevance"), id: 0 },
@@ -77,9 +77,9 @@ export default Controller.extend({
 
   @discourseComputed("context", "context_id")
   searchContextDescription(context, id) {
-    var name = id;
+    let name = id;
     if (context === "category") {
-      var category = Category.findById(id);
+      let category = Category.findById(id);
       if (!category) {
         return;
       }
@@ -322,7 +322,7 @@ export default Controller.extend({
     },
 
     loadMore() {
-      var page = this.page;
+      let page = this.page;
       if (
         this.get("model.grouped_search_result.more_full_page_results") &&
         !this.loading &&
diff --git a/app/assets/javascripts/discourse/app/controllers/grant-badge.js b/app/assets/javascripts/discourse/app/controllers/grant-badge.js
index 0375df7c30..a0f060aef5 100644
--- a/app/assets/javascripts/discourse/app/controllers/grant-badge.js
+++ b/app/assets/javascripts/discourse/app/controllers/grant-badge.js
@@ -1,12 +1,12 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller, { inject } from "@ember/controller";
-import { extractError } from "discourse/lib/ajax-error";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import Badge from "discourse/models/badge";
+import GrantBadgeController from "discourse/mixins/grant-badge-controller";
+import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 import UserBadge from "discourse/models/user-badge";
 import { all } from "rsvp";
+import discourseComputed from "discourse-common/utils/decorators";
+import { extractError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(ModalFunctionality, GrantBadgeController, {
   topicController: inject("topic"),
diff --git a/app/assets/javascripts/discourse/app/controllers/group-activity-posts.js b/app/assets/javascripts/discourse/app/controllers/group-activity-posts.js
index b5a702386f..3e73979ca8 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-activity-posts.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-activity-posts.js
@@ -1,6 +1,6 @@
 import Controller, { inject as controller } from "@ember/controller";
-import { observes } from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
+import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   group: controller(),
diff --git a/app/assets/javascripts/discourse/app/controllers/group-activity.js b/app/assets/javascripts/discourse/app/controllers/group-activity.js
index 36a5ada86b..d00fe154e9 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-activity.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-activity.js
@@ -1,5 +1,5 @@
-import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
+import { inject as service } from "@ember/service";
 export default Controller.extend({
   router: service(),
   queryParams: ["category_id"],
diff --git a/app/assets/javascripts/discourse/app/controllers/group-add-members.js b/app/assets/javascripts/discourse/app/controllers/group-add-members.js
index ed6258c45a..333060a2a5 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-add-members.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-add-members.js
@@ -1,25 +1,23 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
-import { extractError } from "discourse/lib/ajax-error";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 import { emailValid } from "discourse/lib/utilities";
-import I18n from "I18n";
+import { extractError } from "discourse/lib/ajax-error";
+import { isEmpty } from "@ember/utils";
+import { reads } from "@ember/object/computed";
 
 export default Controller.extend(ModalFunctionality, {
   loading: false,
   setAsOwner: false,
   notifyUsers: false,
   usernamesAndEmails: null,
-  usernames: null,
-  emails: null,
+  emailsPresent: reads("emails.length"),
 
   onShow() {
     this.setProperties({
-      usernamesAndEmails: "",
-      usernames: [],
-      emails: [],
+      usernamesAndEmails: [],
       setAsOwner: false,
       notifyUsers: false,
     });
@@ -30,15 +28,8 @@ export default Controller.extend(ModalFunctionality, {
     return loading || !usernamesAndEmails || !(usernamesAndEmails.length > 0);
   },
 
-  @discourseComputed("usernamesAndEmails")
-  emailsPresent() {
-    this._splitEmailsAndUsernames();
-    return this.emails.length;
-  },
-
   @discourseComputed("usernamesAndEmails")
   notifyUsersDisabled() {
-    this._splitEmailsAndUsernames();
     return this.usernames.length === 0 && this.emails.length > 0;
   },
 
@@ -47,6 +38,16 @@ export default Controller.extend(ModalFunctionality, {
     return I18n.t("groups.add_members.title", { group_name: fullName || name });
   },
 
+  @discourseComputed("usernamesAndEmails.[]")
+  emails(usernamesAndEmails) {
+    return usernamesAndEmails.filter(emailValid).join(",");
+  },
+
+  @discourseComputed("usernamesAndEmails.[]")
+  usernames(usernamesAndEmails) {
+    return usernamesAndEmails.reject(emailValid).join(",");
+  },
+
   @action
   addMembers() {
     this.set("loading", true);
@@ -89,16 +90,4 @@ export default Controller.extend(ModalFunctionality, {
       .catch((error) => this.flash(extractError(error), "error"))
       .finally(() => this.set("loading", false));
   },
-
-  _splitEmailsAndUsernames() {
-    let emails = [];
-    let usernames = [];
-
-    this.usernamesAndEmails.split(",").forEach((u) => {
-      emailValid(u) ? emails.push(u) : usernames.push(u);
-    });
-
-    this.set("emails", emails.join(","));
-    this.set("usernames", usernames.join(","));
-  },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/group-index.js b/app/assets/javascripts/discourse/app/controllers/group-index.js
index fa04f694ac..847fdcece2 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-index.js
@@ -1,9 +1,10 @@
 import Controller, { inject as controller } from "@ember/controller";
-import { gt } 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";
+import { ajax } from "discourse/lib/ajax";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { gt } from "@ember/object/computed";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
   application: controller(),
@@ -16,12 +17,21 @@ export default Controller.extend({
   filterInput: null,
 
   loading: false,
+  isBulk: false,
   showActions: false,
 
+  bulkSelection: null,
+
   @observes("filterInput")
-  _setFilter: discourseDebounce(function () {
-    this.set("filter", this.filterInput);
-  }, 500),
+  _setFilter() {
+    discourseDebounce(
+      this,
+      function () {
+        this.set("filter", this.filterInput);
+      },
+      500
+    );
+  },
 
   @observes("order", "asc", "filter")
   _filtersChanged() {
@@ -45,6 +55,10 @@ export default Controller.extend({
           this.model.members.length >= this.model.user_count,
         loading: false,
       });
+
+      if (this.refresh) {
+        this.set("bulkSelection", []);
+      }
     });
   },
 
@@ -91,6 +105,68 @@ export default Controller.extend({
       case "removeOwner":
         this.removeOwner(member);
         break;
+      case "makePrimary":
+        member
+          .setPrimaryGroup(this.model.id)
+          .then(() => member.set("primary", true));
+        break;
+      case "removePrimary":
+        member.setPrimaryGroup(null).then(() => member.set("primary", false));
+        break;
+    }
+  },
+
+  @action
+  actOnSelection(selection, actionId) {
+    if (!selection || selection.length === 0) {
+      return;
+    }
+
+    switch (actionId) {
+      case "removeMembers":
+        return ajax(`/groups/${this.model.id}/members.json`, {
+          type: "DELETE",
+          data: { user_ids: selection.map((u) => u.id).join(",") },
+        }).then(() => {
+          this.model.findMembers(this.memberParams, true);
+          this.set("isBulk", false);
+        });
+
+      case "makeOwners":
+        return ajax(`/admin/groups/${this.model.id}/owners.json`, {
+          type: "PUT",
+          data: {
+            group: { usernames: selection.map((u) => u.username).join(",") },
+          },
+        }).then(() => {
+          selection.forEach((s) => s.set("owner", true));
+          this.set("isBulk", false);
+        });
+
+      case "removeOwners":
+        return ajax(`/admin/groups/${this.model.id}/owners.json`, {
+          type: "DELETE",
+          data: {
+            group: { usernames: selection.map((u) => u.username).join(",") },
+          },
+        }).then(() => {
+          selection.forEach((s) => s.set("owner", false));
+          this.set("isBulk", false);
+        });
+
+      case "setPrimary":
+      case "unsetPrimary":
+        const primary = actionId === "setPrimary";
+        return ajax(`/admin/groups/${this.model.id}/primary.json`, {
+          type: "PUT",
+          data: {
+            group: { usernames: selection.map((u) => u.username).join(",") },
+            primary,
+          },
+        }).then(() => {
+          selection.forEach((s) => s.set("primary", primary));
+          this.set("isBulk", false);
+        });
     }
   },
 
@@ -118,4 +194,33 @@ export default Controller.extend({
         .catch(popupAjaxError);
     }
   },
+
+  @action
+  toggleBulkSelect() {
+    this.setProperties({
+      isBulk: !this.isBulk,
+      bulkSelection: [],
+    });
+  },
+
+  @action
+  bulkSelectAll() {
+    $("input.bulk-select:not(:checked)").click();
+  },
+
+  @action
+  bulkClearAll() {
+    $("input.bulk-select:checked").click();
+  },
+
+  @action
+  selectMember(member, e) {
+    this.set("bulkSelection", this.bulkSelection || []);
+
+    if (e.target.checked) {
+      this.bulkSelection.pushObject(member);
+    } else {
+      this.bulkSelection.removeObject(member);
+    }
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/group-manage-categories.js b/app/assets/javascripts/discourse/app/controllers/group-manage-categories.js
index 88b101f43c..239a2eab23 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-manage-categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-manage-categories.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   @discourseComputed(
diff --git a/app/assets/javascripts/discourse/app/controllers/group-manage-tags.js b/app/assets/javascripts/discourse/app/controllers/group-manage-tags.js
index c55b45bde3..70fbe2b8bf 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-manage-tags.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-manage-tags.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   @discourseComputed(
diff --git a/app/assets/javascripts/discourse/app/controllers/group-manage.js b/app/assets/javascripts/discourse/app/controllers/group-manage.js
index fd7042334b..de7cea1512 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-manage.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-manage.js
@@ -1,10 +1,7 @@
-import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  router: service(),
-
   @discourseComputed("model.automatic")
   tabs(automatic) {
     const defaultTabs = [
diff --git a/app/assets/javascripts/discourse/app/controllers/group-messages.js b/app/assets/javascripts/discourse/app/controllers/group-messages.js
index 9d96320419..1c0ee0801d 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-messages.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-messages.js
@@ -1,5 +1,2 @@
-import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
-export default Controller.extend({
-  router: service(),
-});
+export default Controller.extend({});
diff --git a/app/assets/javascripts/discourse/app/controllers/group-requests.js b/app/assets/javascripts/discourse/app/controllers/group-requests.js
index a9f7e8dfd8..73da360192 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-requests.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-requests.js
@@ -1,8 +1,8 @@
 import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
+import discourseDebounce from "discourse-common/lib/debounce";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import discourseDebounce from "discourse/lib/debounce";
 
 export default Controller.extend({
   application: controller(),
@@ -17,9 +17,15 @@ export default Controller.extend({
   loading: false,
 
   @observes("filterInput")
-  _setFilter: discourseDebounce(function () {
-    this.set("filter", this.filterInput);
-  }, 500),
+  _setFilter() {
+    discourseDebounce(
+      this,
+      function () {
+        this.set("filter", this.filterInput);
+      },
+      500
+    );
+  },
 
   @observes("order", "desc", "filter")
   _filtersChanged() {
diff --git a/app/assets/javascripts/discourse/app/controllers/group.js b/app/assets/javascripts/discourse/app/controllers/group.js
index 9cc9b218d9..ba0b0ed434 100644
--- a/app/assets/javascripts/discourse/app/controllers/group.js
+++ b/app/assets/javascripts/discourse/app/controllers/group.js
@@ -1,11 +1,9 @@
-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";
-import { inject as service } from "@ember/service";
-import { readOnly } from "@ember/object/computed";
-import deprecated from "discourse-common/lib/deprecated";
+import EmberObject, { action } from "@ember/object";
+import I18n from "I18n";
 import bootbox from "bootbox";
+import deprecated from "discourse-common/lib/deprecated";
+import discourseComputed from "discourse-common/utils/decorators";
 
 const Tab = EmberObject.extend({
   init() {
@@ -23,8 +21,7 @@ export default Controller.extend({
   counts: null,
   showing: "members",
   destroying: null,
-  router: service(),
-  currentPath: readOnly("router.currentRouteName"),
+  showTooltip: false,
 
   @discourseComputed(
     "showMessages",
@@ -135,20 +132,32 @@ export default Controller.extend({
 
   @action
   messageGroup() {
-    this.send("createNewMessageViaParams", this.get("model.name"));
+    this.send("createNewMessageViaParams", {
+      recipients: this.get("model.name"),
+      hasGroups: true,
+    });
   },
 
   @action
   destroyGroup() {
     this.set("destroying", true);
 
+    const model = this.model;
+    let message = I18n.t("admin.groups.delete_confirm");
+
+    if (model.has_messages && model.message_count > 0) {
+      message = I18n.t("admin.groups.delete_with_messages_confirm", {
+        count: model.message_count,
+      });
+    }
+
     bootbox.confirm(
-      I18n.t("admin.groups.delete_confirm"),
+      message,
       I18n.t("no_value"),
       I18n.t("yes_value"),
       (confirmed) => {
         if (confirmed) {
-          this.model
+          model
             .destroy()
             .then(() => this.transitionToRoute("groups.index"))
             .catch((error) => {
@@ -164,6 +173,11 @@ export default Controller.extend({
     );
   },
 
+  @action
+  toggleDeleteTooltip() {
+    this.toggleProperty("showTooltip");
+  },
+
   actions: {
     destroy() {
       deprecated("Use `destroyGroup` action instead of `destroy`.", {
diff --git a/app/assets/javascripts/discourse/app/controllers/groups-index.js b/app/assets/javascripts/discourse/app/controllers/groups-index.js
index de488fb53d..fdc3f90900 100644
--- a/app/assets/javascripts/discourse/app/controllers/groups-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/groups-index.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
 import Controller, { inject as controller } from "@ember/controller";
-import { debounce } from "@ember/runloop";
+import I18n from "I18n";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 import { action } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
-import { INPUT_DELAY } from "discourse-common/config/environment";
+import discourseDebounce from "discourse-common/lib/debounce";
 
 export default Controller.extend({
   application: controller(),
@@ -45,7 +45,7 @@ export default Controller.extend({
 
   @action
   onFilterChanged(filter) {
-    debounce(this, this._debouncedFilter, filter, INPUT_DELAY);
+    discourseDebounce(this, this._debouncedFilter, filter, INPUT_DELAY);
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/controllers/groups-new.js b/app/assets/javascripts/discourse/app/controllers/groups-new.js
index ed2a25e936..ebb683bdc4 100644
--- a/app/assets/javascripts/discourse/app/controllers/groups-new.js
+++ b/app/assets/javascripts/discourse/app/controllers/groups-new.js
@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import I18n from "I18n";
 import { action } from "@ember/object";
-import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import bootbox from "bootbox";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export function popupAutomaticMembershipAlert(group_id, email_domains) {
   if (!email_domains) {
@@ -37,6 +38,16 @@ export function popupAutomaticMembershipAlert(group_id, email_domains) {
 export default Controller.extend({
   saving: null,
 
+  @discourseComputed("model.ownerUsernames")
+  splitOwnerUsernames(owners) {
+    return owners && owners.length ? owners.split(",") : [];
+  },
+
+  @discourseComputed("model.usernames")
+  splitUsernames(usernames) {
+    return usernames && usernames.length ? usernames.split(",") : [];
+  },
+
   @action
   save() {
     this.set("saving", true);
@@ -55,4 +66,14 @@ export default Controller.extend({
       .catch(popupAjaxError)
       .finally(() => this.set("saving", false));
   },
+
+  @action
+  updateOwnerUsernames(selected) {
+    this.set("model.ownerUsernames", selected.join(","));
+  },
+
+  @action
+  updateUsernames(selected) {
+    this.set("model.usernames", selected.join(","));
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/history.js b/app/assets/javascripts/discourse/app/controllers/history.js
index e80e265d3e..b6fd92cc7e 100644
--- a/app/assets/javascripts/discourse/app/controllers/history.js
+++ b/app/assets/javascripts/discourse/app/controllers/history.js
@@ -1,23 +1,23 @@
-import I18n from "I18n";
+import { alias, equal, gt, not, or } from "@ember/object/computed";
 import discourseComputed, {
-  on,
   observes,
+  on,
 } from "discourse-common/utils/decorators";
-import { alias, gt, not, or, equal } from "@ember/object/computed";
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import { propertyGreaterThan, propertyLessThan } from "discourse/lib/computed";
-import { sanitizeAsync } from "discourse/lib/text";
-import { iconHTML } from "discourse-common/lib/icon-library";
-import Post from "discourse/models/post";
 import Category from "discourse/models/category";
-import { computed } from "@ember/object";
+import Controller from "@ember/controller";
+import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import Post from "discourse/models/post";
 import bootbox from "bootbox";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import { computed } from "@ember/object";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { sanitizeAsync } from "discourse/lib/text";
 
 function customTagArray(fieldName) {
   return computed(fieldName, function () {
-    var val = this.get(fieldName);
+    let val = this.get(fieldName);
     if (!val) {
       return val;
     }
@@ -194,7 +194,7 @@ export default Controller.extend(ModalFunctionality, {
     if (displayingInline) {
       return this.isEitherRevisionHidden ? "hidden-revision-either" : null;
     } else {
-      var result = [];
+      let result = [];
       if (prevHidden) {
         result.push("hidden-revision-previous");
       }
@@ -227,7 +227,7 @@ export default Controller.extend(ModalFunctionality, {
   @discourseComputed("model.category_id_changes")
   previousCategory(changes) {
     if (changes) {
-      var category = Category.findById(changes["previous"]);
+      let category = Category.findById(changes["previous"]);
       return categoryBadgeHTML(category, { allowUncategorized: true });
     }
   },
@@ -235,7 +235,7 @@ export default Controller.extend(ModalFunctionality, {
   @discourseComputed("model.category_id_changes")
   currentCategory(changes) {
     if (changes) {
-      var category = Category.findById(changes["current"]);
+      let category = Category.findById(changes["current"]);
       return categoryBadgeHTML(category, { allowUncategorized: true });
     }
   },
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 c8d7afcbbe..b142e3741c 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,8 +1,8 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import User from "discourse/models/user";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(ModalFunctionality, {
   loading: false,
@@ -29,5 +29,9 @@ export default Controller.extend(ModalFunctionality, {
           .finally(() => this.set("loading", false));
       });
     },
+
+    updateIgnoredUsername(selected) {
+      this.set("ignoredUsername", selected.firstObject);
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/ignore-duration.js b/app/assets/javascripts/discourse/app/controllers/ignore-duration.js
index 8382e90cea..ad141ae22a 100644
--- a/app/assets/javascripts/discourse/app/controllers/ignore-duration.js
+++ b/app/assets/javascripts/discourse/app/controllers/ignore-duration.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
diff --git a/app/assets/javascripts/discourse/app/controllers/insert-hyperlink.js b/app/assets/javascripts/discourse/app/controllers/insert-hyperlink.js
index d57eec38b4..42c3deeb32 100644
--- a/app/assets/javascripts/discourse/app/controllers/insert-hyperlink.js
+++ b/app/assets/javascripts/discourse/app/controllers/insert-hyperlink.js
@@ -1,10 +1,11 @@
-import { isEmpty } from "@ember/utils";
-import { cancel, debounce, schedule } from "@ember/runloop";
+import { cancel, schedule } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { searchForTerm } from "discourse/lib/search";
 import { bind } from "discourse-common/utils/decorators";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { isEmpty } from "@ember/utils";
 import { prefixProtocol } from "discourse/lib/url";
+import { searchForTerm } from "discourse/lib/search";
 
 export default Controller.extend(ModalFunctionality, {
   _debounced: null,
@@ -177,7 +178,7 @@ export default Controller.extend(ModalFunctionality, {
       }
     },
     search() {
-      this._debounced = debounce(this, this.triggerSearch, 400);
+      this._debounced = discourseDebounce(this, this.triggerSearch, 400);
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/invites-show.js b/app/assets/javascripts/discourse/app/controllers/invites-show.js
index 8e142efdcc..3c3658b06f 100644
--- a/app/assets/javascripts/discourse/app/controllers/invites-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/invites-show.js
@@ -1,18 +1,20 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
 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 Controller, { inject as controller } from "@ember/controller";
 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";
+import I18n from "I18n";
+import NameValidation from "discourse/mixins/name-validation";
+import PasswordValidation from "discourse/mixins/password-validation";
+import UserFieldsValidation from "discourse/mixins/user-fields-validation";
+import UsernameValidation from "discourse/mixins/username-validation";
+import { ajax } from "discourse/lib/ajax";
+import { extractError } from "discourse/lib/ajax-error";
+import discourseComputed from "discourse-common/utils/decorators";
+import { emailValid } from "discourse/lib/utilities";
+import { findAll as findLoginMethods } from "discourse/models/login-method";
+import getUrl from "discourse-common/lib/get-url";
+import { isEmpty } from "@ember/utils";
+import { wavingHandURL } from "discourse/lib/waving-hand-url";
 
 export default Controller.extend(
   PasswordValidation,
@@ -20,13 +22,19 @@ export default Controller.extend(
   NameValidation,
   UserFieldsValidation,
   {
+    queryParams: ["t"],
+
+    createAccount: controller(),
+
     invitedBy: readOnly("model.invited_by"),
     email: alias("model.email"),
+    hiddenEmail: alias("model.hidden_email"),
     accountUsername: alias("model.username"),
     passwordRequired: notEmpty("accountPassword"),
     successMessage: null,
     errorMessage: null,
     userFields: null,
+    authOptions: null,
     inviteImageUrl: getUrl("/images/envelope.svg"),
     isInviteLink: readOnly("model.is_invite_link"),
     submitDisabled: or(
@@ -44,6 +52,25 @@ export default Controller.extend(
       this.rejectedEmails = [];
     },
 
+    authenticationComplete(options) {
+      const props = {
+        accountUsername: options.username,
+        accountName: options.name,
+        authOptions: EmberObject.create(options),
+      };
+
+      if (this.isInviteLink) {
+        props.email = options.email;
+      }
+
+      this.setProperties(props);
+    },
+
+    @discourseComputed
+    discourseConnectEnabled() {
+      return this.siteSettings.enable_discourse_connect;
+    },
+
     @discourseComputed
     welcomeTitle() {
       return I18n.t("invites.welcome_to", {
@@ -61,6 +88,33 @@ export default Controller.extend(
       return findLoginMethods().length > 0;
     },
 
+    @discourseComputed
+    externalAuthsOnly() {
+      return (
+        !this.siteSettings.enable_local_logins &&
+        this.externalAuthsEnabled &&
+        !this.siteSettings.enable_discourse_connect
+      );
+    },
+
+    @discourseComputed("externalAuthsOnly", "discourseConnectEnabled")
+    showSocialLoginAvailable(externalAuthsOnly, discourseConnectEnabled) {
+      return !externalAuthsOnly && !discourseConnectEnabled;
+    },
+
+    @discourseComputed(
+      "externalAuthsOnly",
+      "authOptions",
+      "emailValidation.failed"
+    )
+    shouldDisplayForm(externalAuthsOnly, authOptions, emailValidationFailed) {
+      return (
+        (this.siteSettings.enable_local_logins ||
+          (externalAuthsOnly && authOptions && !emailValidationFailed)) &&
+        !this.siteSettings.enable_discourse_connect
+      );
+    },
+
     @discourseComputed
     fullnameRequired() {
       return (
@@ -68,8 +122,27 @@ export default Controller.extend(
       );
     },
 
-    @discourseComputed("email", "rejectedEmails.[]")
-    emailValidation(email, rejectedEmails) {
+    @discourseComputed(
+      "email",
+      "rejectedEmails.[]",
+      "authOptions.email",
+      "authOptions.email_valid",
+      "hiddenEmail"
+    )
+    emailValidation(
+      email,
+      rejectedEmails,
+      externalAuthEmail,
+      externalAuthEmailValid,
+      hiddenEmail
+    ) {
+      if (hiddenEmail) {
+        return EmberObject.create({
+          ok: true,
+          reason: I18n.t("user.email.ok"),
+        });
+      }
+
       // If blank, fail without a reason
       if (isEmpty(email)) {
         return EmberObject.create({
@@ -84,6 +157,28 @@ export default Controller.extend(
         });
       }
 
+      if (externalAuthEmail) {
+        const provider = this.createAccount.authProviderDisplayName(
+          this.get("authOptions.auth_provider")
+        );
+
+        if (externalAuthEmail === email && externalAuthEmailValid) {
+          return EmberObject.create({
+            ok: true,
+            reason: I18n.t("user.email.authenticated", {
+              provider,
+            }),
+          });
+        } else {
+          return EmberObject.create({
+            failed: true,
+            reason: I18n.t("user.email.invite_auth_email_invalid", {
+              provider,
+            }),
+          });
+        }
+      }
+
       if (emailValid(email)) {
         return EmberObject.create({
           ok: true,
@@ -97,6 +192,12 @@ export default Controller.extend(
       });
     },
 
+    @discourseComputed
+    wavingHandURL: () => wavingHandURL(),
+
+    @discourseComputed
+    ssoPath: () => getUrl("/session/sso"),
+
     actions: {
       submit() {
         const userFields = this.userFields;
@@ -107,17 +208,24 @@ export default Controller.extend(
           });
         }
 
+        const data = {
+          username: this.accountUsername,
+          name: this.accountName,
+          password: this.accountPassword,
+          user_custom_fields: userCustomFields,
+          timezone: moment.tz.guess(),
+        };
+
+        if (this.isInviteLink) {
+          data.email = this.email;
+        } else {
+          data.email_token = this.t;
+        }
+
         ajax({
           url: `/invites/show/${this.get("model.token")}.json`,
           type: "PUT",
-          data: {
-            email: this.email,
-            username: this.accountUsername,
-            name: this.accountName,
-            password: this.accountPassword,
-            user_custom_fields: userCustomFields,
-            timezone: moment.tz.guess(),
-          },
+          data,
         })
           .then((result) => {
             if (result.success) {
@@ -154,9 +262,18 @@ export default Controller.extend(
             }
           })
           .catch((error) => {
-            throw new Error(error);
+            this.set("errorMessage", extractError(error));
           });
       },
+
+      externalLogin(provider) {
+        provider.doLogin({
+          signup: true,
+          params: {
+            origin: window.location.href,
+          },
+        });
+      },
     },
   }
 );
diff --git a/app/assets/javascripts/discourse/app/controllers/json-schema-editor.js b/app/assets/javascripts/discourse/app/controllers/json-schema-editor.js
new file mode 100644
index 0000000000..db1f37686c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/controllers/json-schema-editor.js
@@ -0,0 +1,13 @@
+import { action } from "@ember/object";
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+
+export default Controller.extend(ModalFunctionality, {
+  editor: null,
+
+  @action
+  saveChanges(value) {
+    this.set("model.value", value);
+    this.send("closeModal");
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/controllers/jump-to-post.js b/app/assets/javascripts/discourse/app/controllers/jump-to-post.js
index a2aa1a0692..dab3ced52b 100644
--- a/app/assets/javascripts/discourse/app/controllers/jump-to-post.js
+++ b/app/assets/javascripts/discourse/app/controllers/jump-to-post.js
@@ -1,7 +1,7 @@
-import { alias } from "@ember/object/computed";
-import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { alias } from "@ember/object/computed";
+import { next } from "@ember/runloop";
 
 export default Controller.extend(ModalFunctionality, {
   model: null,
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 ebf2632ac3..f717a0fe79 100644
--- a/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 const KEY = "keyboard_shortcuts_help";
diff --git a/app/assets/javascripts/discourse/app/controllers/login.js b/app/assets/javascripts/discourse/app/controllers/login.js
index 94468d4bae..fe6b32b757 100644
--- a/app/assets/javascripts/discourse/app/controllers/login.js
+++ b/app/assets/javascripts/discourse/app/controllers/login.js
@@ -1,23 +1,24 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-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, 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";
-import showModal from "discourse/lib/show-modal";
-import { setting } from "discourse/lib/computed";
-import { findAll } from "discourse/models/login-method";
-import { escape } from "pretty-text/sanitizer";
-import { escapeExpression, areCookiesEnabled } from "discourse/lib/utilities";
-import { extractError } from "discourse/lib/ajax-error";
-import { SECOND_FACTOR_METHODS } from "discourse/models/user";
-import { getWebauthnCredential } from "discourse/lib/webauthn";
-import bootbox from "bootbox";
+import { alias, not, or, readOnly } from "@ember/object/computed";
+import { areCookiesEnabled, escapeExpression } from "discourse/lib/utilities";
 import cookie, { removeCookie } from "discourse/lib/cookie";
+import { next, schedule } from "@ember/runloop";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { SECOND_FACTOR_METHODS } from "discourse/models/user";
+import { ajax } from "discourse/lib/ajax";
+import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
+import { escape } from "pretty-text/sanitizer";
+import { extractError } from "discourse/lib/ajax-error";
+import { findAll } from "discourse/models/login-method";
+import getURL from "discourse-common/lib/get-url";
+import { getWebauthnCredential } from "discourse/lib/webauthn";
+import { isEmpty } from "@ember/utils";
+import { setting } from "discourse/lib/computed";
+import showModal from "discourse/lib/show-modal";
+import { wavingHandURL } from "discourse/lib/waving-hand-url";
 
 // This is happening outside of the app via popup
 const AuthErrors = [
@@ -45,6 +46,8 @@ export default Controller.extend(ModalFunctionality, {
   loginRequired: alias("application.loginRequired"),
   secondFactorMethod: SECOND_FACTOR_METHODS.TOTP,
 
+  noLoginLocal: not("canLoginLocal"),
+
   resetForm() {
     this.setProperties({
       loggingIn: false,
@@ -62,20 +65,41 @@ export default Controller.extend(ModalFunctionality, {
     return showSecondFactor || showSecurityKey ? "hidden" : "";
   },
 
+  @discourseComputed()
+  wavingHandURL: () => wavingHandURL(),
+
   @discourseComputed("showSecondFactor", "showSecurityKey")
   secondFactorClass(showSecondFactor, showSecurityKey) {
     return showSecondFactor || showSecurityKey ? "" : "hidden";
   },
 
-  @discourseComputed("awaitingApproval", "hasAtLeastOneLoginButton")
-  modalBodyClasses(awaitingApproval, hasAtLeastOneLoginButton) {
-    const classes = ["login-modal"];
+  @discourseComputed(
+    "awaitingApproval",
+    "hasAtLeastOneLoginButton",
+    "showSecondFactor",
+    "canLoginLocal",
+    "showSecurityKey"
+  )
+  modalBodyClasses(
+    awaitingApproval,
+    hasAtLeastOneLoginButton,
+    showSecondFactor,
+    canLoginLocal,
+    showSecurityKey
+  ) {
+    const classes = ["login-modal-body"];
     if (awaitingApproval) {
       classes.push("awaiting-approval");
     }
-    if (hasAtLeastOneLoginButton) {
+    if (hasAtLeastOneLoginButton && !showSecondFactor && !showSecurityKey) {
       classes.push("has-alt-auth");
     }
+    if (!canLoginLocal) {
+      classes.push("no-local-login");
+    }
+    if (showSecondFactor || showSecurityKey) {
+      classes.push("second-factor");
+    }
     return classes.join(" ");
   },
 
@@ -84,9 +108,9 @@ export default Controller.extend(ModalFunctionality, {
     return showSecondFactor || showSecurityKey;
   },
 
-  @discourseComputed("canLoginLocalWithEmail")
-  hasAtLeastOneLoginButton(canLoginLocalWithEmail) {
-    return findAll().length > 0 || canLoginLocalWithEmail;
+  @discourseComputed()
+  hasAtLeastOneLoginButton() {
+    return findAll().length > 0;
   },
 
   @discourseComputed("loggingIn")
@@ -103,9 +127,9 @@ export default Controller.extend(ModalFunctionality, {
 
   showSpinner: readOnly("loggingIn"),
 
-  @discourseComputed("canLoginLocalWithEmail", "processingEmailLink")
-  showLoginWithEmailLink(canLoginLocalWithEmail, processingEmailLink) {
-    return canLoginLocalWithEmail && !processingEmailLink;
+  @discourseComputed("canLoginLocalWithEmail")
+  showLoginWithEmailLink(canLoginLocalWithEmail) {
+    return canLoginLocalWithEmail;
   },
 
   actions: {
@@ -141,8 +165,6 @@ export default Controller.extend(ModalFunctionality, {
               (result.security_key_enabled || result.totp_enabled) &&
               !this.secondFactorRequired
             ) {
-              document.getElementById("modal-alert").style.display = "none";
-
               this.setProperties({
                 otherMethodAllowed: result.multiple_second_factor_methods,
                 secondFactorRequired: true,
@@ -245,13 +267,15 @@ export default Controller.extend(ModalFunctionality, {
       return false;
     },
 
-    externalLogin(loginMethod) {
+    externalLogin(loginMethod, { signup = false } = {}) {
       if (this.loginDisabled) {
         return;
       }
 
       this.set("loggingIn", true);
-      loginMethod.doLogin().catch(() => this.set("loggingIn", false));
+      loginMethod
+        .doLogin({ signup: signup })
+        .catch(() => this.set("loggingIn", false));
     },
 
     createAccount() {
@@ -282,7 +306,7 @@ export default Controller.extend(ModalFunctionality, {
       }
 
       if (isEmpty(this.loginName)) {
-        this.flash(I18n.t("login.blank_username"), "error");
+        this.flash(I18n.t("login.blank_username"), "info");
         return;
       }
 
@@ -392,7 +416,7 @@ export default Controller.extend(ModalFunctionality, {
     }
 
     const skipConfirmation =
-      options && this.siteSettings.external_auth_skip_create_confirm;
+      options && this.siteSettings.auth_skip_create_confirm;
 
     const createAccountController = this.createAccount;
     createAccountController.setProperties({
@@ -403,6 +427,8 @@ export default Controller.extend(ModalFunctionality, {
       skipConfirmation,
     });
 
-    showModal("createAccount", { modalClass: "create-account" });
+    next(() => {
+      showModal("createAccount", { modalClass: "create-account" });
+    });
   },
 });
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 1337ecad3d..ad4df9e79e 100644
--- a/app/assets/javascripts/discourse/app/controllers/move-to-topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/move-to-topic.js
@@ -1,13 +1,13 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import { alias, equal } from "@ember/object/computed";
-import { next } from "@ember/runloop";
 import Controller, { inject } from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { movePosts, mergeTopic } from "discourse/models/topic";
+import { alias, equal } from "@ember/object/computed";
+import { mergeTopic, movePosts } from "discourse/models/topic";
 import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 import discourseComputed from "discourse-common/utils/decorators";
 import { extractError } from "discourse/lib/ajax-error";
+import { isEmpty } from "@ember/utils";
+import { next } from "@ember/runloop";
 
 export default Controller.extend(ModalFunctionality, {
   topicName: null,
@@ -80,7 +80,7 @@ export default Controller.extend(ModalFunctionality, {
       categoryId: null,
       topicName: "",
       tags: null,
-      participants: null,
+      participants: [],
     });
 
     const isPrivateMessage = this.get("model.isPrivateMessage");
@@ -133,7 +133,7 @@ export default Controller.extend(ModalFunctionality, {
       } else if (type === "existingMessage") {
         mergeOptions = {
           destination_topic_id: this.selectedTopicId,
-          participants: this.participants,
+          participants: this.participants.join(","),
           archetype: "private_message",
         };
         moveOptions = Object.assign(
diff --git a/app/assets/javascripts/discourse/app/controllers/navigation/categories.js b/app/assets/javascripts/discourse/app/controllers/navigation/categories.js
index 5d7d3dafa1..a36e1d837c 100644
--- a/app/assets/javascripts/discourse/app/controllers/navigation/categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/navigation/categories.js
@@ -1,15 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { inject } from "@ember/controller";
 import NavigationDefaultController from "discourse/controllers/navigation/default";
+import { inject } from "@ember/controller";
 
 export default NavigationDefaultController.extend({
   discoveryCategories: inject("discovery/categories"),
-
-  @discourseComputed(
-    "discoveryCategories.model",
-    "discoveryCategories.model.draft"
-  )
-  draft() {
-    return this.get("discoveryCategories.model.draft");
-  },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/navigation/category.js b/app/assets/javascripts/discourse/app/controllers/navigation/category.js
index 0ddadd933f..2ff17f2a08 100644
--- a/app/assets/javascripts/discourse/app/controllers/navigation/category.js
+++ b/app/assets/javascripts/discourse/app/controllers/navigation/category.js
@@ -1,6 +1,6 @@
-import { none, and } from "@ember/object/computed";
-import NavigationDefaultController from "discourse/controllers/navigation/default";
+import { and, none } from "@ember/object/computed";
 import FilterModeMixin from "discourse/mixins/filter-mode";
+import NavigationDefaultController from "discourse/controllers/navigation/default";
 
 export default NavigationDefaultController.extend(FilterModeMixin, {
   showingParentCategory: none("category.parentCategory"),
diff --git a/app/assets/javascripts/discourse/app/controllers/navigation/default.js b/app/assets/javascripts/discourse/app/controllers/navigation/default.js
index 880869324e..2e6fd002a2 100644
--- a/app/assets/javascripts/discourse/app/controllers/navigation/default.js
+++ b/app/assets/javascripts/discourse/app/controllers/navigation/default.js
@@ -1,13 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller, { inject as controller } from "@ember/controller";
 import FilterModeMixin from "discourse/mixins/filter-mode";
 
 export default Controller.extend(FilterModeMixin, {
   discovery: controller(),
-  discoveryTopics: controller("discovery/topics"),
-
-  @discourseComputed("discoveryTopics.model", "discoveryTopics.model.draft")
-  draft: function () {
-    return this.get("discoveryTopics.model.draft");
-  },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/password-reset.js b/app/assets/javascripts/discourse/app/controllers/password-reset.js
index ac6f7a69ec..9e7b9ede5a 100644
--- a/app/assets/javascripts/discourse/app/controllers/password-reset.js
+++ b/app/assets/javascripts/discourse/app/controllers/password-reset.js
@@ -1,12 +1,12 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
+import DiscourseURL, { userPath } from "discourse/lib/url";
 import { alias, or, readOnly } from "@ember/object/computed";
 import Controller from "@ember/controller";
-import discourseComputed from "discourse-common/utils/decorators";
-import DiscourseURL, { userPath } from "discourse/lib/url";
-import { ajax } from "discourse/lib/ajax";
+import I18n from "I18n";
 import PasswordValidation from "discourse/mixins/password-validation";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
 import { getWebauthnCredential } from "discourse/lib/webauthn";
 
 export default Controller.extend(PasswordValidation, {
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences.js b/app/assets/javascripts/discourse/app/controllers/preferences.js
index 9d96320419..1c0ee0801d 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences.js
@@ -1,5 +1,2 @@
-import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
-export default Controller.extend({
-  router: service(),
-});
+export default Controller.extend({});
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
index f033cdc1f7..d78d084324 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
@@ -1,22 +1,15 @@
-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";
-import { iconHTML } from "discourse-common/lib/icon-library";
-import CanCheckEmails from "discourse/mixins/can-check-emails";
-import discourseComputed from "discourse-common/utils/decorators";
+import { gt, not, or } from "@ember/object/computed";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import showModal from "discourse/lib/show-modal";
-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 CanCheckEmails from "discourse/mixins/can-check-emails";
+import Controller from "@ember/controller";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
 import bootbox from "bootbox";
-
-// Number of tokens shown by default.
-const DEFAULT_AUTH_TOKENS_COUNT = 2;
+import discourseComputed from "discourse-common/utils/decorators";
+import { findAll } from "discourse/models/login-method";
+import getURL from "discourse-common/lib/get-url";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(CanCheckEmails, {
   init() {
@@ -33,10 +26,6 @@ export default Controller.extend(CanCheckEmails, {
   newTitleInput: null,
   newPrimaryGroupInput: null,
 
-  passwordProgress: null,
-
-  showAllAuthTokens: false,
-
   revoking: null,
 
   cannotDeleteAccount: not("currentUser.can_delete_account"),
@@ -65,17 +54,6 @@ export default Controller.extend(CanCheckEmails, {
     );
   },
 
-  @discourseComputed("model.is_anonymous")
-  canChangePassword(isAnonymous) {
-    if (isAnonymous) {
-      return false;
-    } else {
-      return (
-        !this.siteSettings.enable_sso && this.siteSettings.enable_local_logins
-      );
-    }
-  },
-
   @discourseComputed("model.associated_accounts")
   associatedAccountsLoaded(associatedAccounts) {
     return typeof associatedAccounts !== "undefined";
@@ -146,28 +124,6 @@ export default Controller.extend(CanCheckEmails, {
     return findAll().length > 0;
   },
 
-  @discourseComputed("showAllAuthTokens", "model.user_auth_tokens")
-  authTokens(showAllAuthTokens, tokens) {
-    tokens.sort((a, b) => {
-      if (a.is_active) {
-        return -1;
-      } else if (b.is_active) {
-        return 1;
-      } else {
-        return b.seen_at.localeCompare(a.seen_at);
-      }
-    });
-
-    return showAllAuthTokens
-      ? tokens
-      : tokens.slice(0, DEFAULT_AUTH_TOKENS_COUNT);
-  },
-
-  canShowAllAuthTokens: gt(
-    "model.user_auth_tokens.length",
-    DEFAULT_AUTH_TOKENS_COUNT
-  ),
-
   actions: {
     save() {
       this.set("saved", false);
@@ -204,31 +160,6 @@ export default Controller.extend(CanCheckEmails, {
         });
     },
 
-    changePassword() {
-      if (!this.passwordProgress) {
-        this.set(
-          "passwordProgress",
-          I18n.t("user.change_password.in_progress")
-        );
-        return this.model
-          .changePassword()
-          .then(() => {
-            // password changed
-            this.setProperties({
-              changePasswordProgress: false,
-              passwordProgress: I18n.t("user.change_password.success"),
-            });
-          })
-          .catch(() => {
-            // password failed to change
-            this.setProperties({
-              changePasswordProgress: false,
-              passwordProgress: I18n.t("user.change_password.error"),
-            });
-          });
-      }
-    },
-
     delete() {
       this.set("deleting", true);
       const message = I18n.t("user.delete_account_confirm"),
@@ -281,32 +212,6 @@ export default Controller.extend(CanCheckEmails, {
         .finally(() => this.set(`revoking.${account.name}`, false));
     },
 
-    toggleShowAllAuthTokens() {
-      this.toggleProperty("showAllAuthTokens");
-    },
-
-    revokeAuthToken(token) {
-      ajax(
-        userPath(
-          `${this.get("model.username_lower")}/preferences/revoke-auth-token`
-        ),
-        {
-          type: "POST",
-          data: token ? { token_id: token.id } : {},
-        }
-      )
-        .then(() => {
-          if (!token) {
-            logout();
-          } // All sessions revoked
-        })
-        .catch(popupAjaxError);
-    },
-
-    showToken(token) {
-      showModal("auth-token", { model: token });
-    },
-
     connectAccount(method) {
       method.doLogin({ reconnect: true });
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/categories.js b/app/assets/javascripts/discourse/app/controllers/preferences/categories.js
index 64d41aa9ca..862aedd323 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/categories.js
@@ -1,6 +1,6 @@
+import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import { or } from "@ember/object/computed";
-import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/email.js b/app/assets/javascripts/discourse/app/controllers/preferences/email.js
index 16772da45f..8a2380807a 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/email.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/email.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import { empty, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
-import { propertyEqual } from "discourse/lib/computed";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
+import discourseComputed from "discourse-common/utils/decorators";
 import { emailValid } from "discourse/lib/utilities";
+import { propertyEqual } from "discourse/lib/computed";
 
 export default Controller.extend({
   queryParams: ["new"],
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/emails.js b/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
index 1672e4a6d1..2709ebe99e 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import { equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
+import { equal } from "@ember/object/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 const EMAIL_LEVELS = {
@@ -62,7 +62,7 @@ export default Controller.extend({
 
   @discourseComputed()
   frequencyEstimate() {
-    var estimate = this.get("model.mailing_list_posts_per_day");
+    let estimate = this.get("model.mailing_list_posts_per_day");
     if (!estimate || estimate < 2) {
       return I18n.t("user.mailing_list_mode.few_per_day");
     } else {
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
index 8973272382..6e45ac746f 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
@@ -1,22 +1,22 @@
-import I18n from "I18n";
 import Controller, { inject } from "@ember/controller";
-import discourseComputed from "discourse-common/utils/decorators";
-import { listThemes, setLocalTheme } from "discourse/lib/theme-selector";
+import {
+  iOSWithVisualViewport,
+  isiPad,
+  safariHacksDisabled,
+  setDefaultHomepage,
+} from "discourse/lib/utilities";
 import {
   listColorSchemes,
   loadColorSchemeStylesheet,
   updateColorSchemeCookie,
 } from "discourse/lib/color-scheme-picker";
+import { listThemes, setLocalTheme } from "discourse/lib/theme-selector";
+import { not, reads } from "@ember/object/computed";
+import I18n from "I18n";
+import { computed } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { reload } from "discourse/helpers/page-reloader";
-import {
-  safariHacksDisabled,
-  isiPad,
-  iOSWithVisualViewport,
-  setDefaultHomepage,
-} from "discourse/lib/utilities";
-import { computed } from "@ember/object";
-import { reads } from "@ember/object/computed";
 
 const USER_HOMES = {
   1: "latest",
@@ -33,7 +33,6 @@ const TITLE_COUNT_MODES = ["notifications", "contextual"];
 export default Controller.extend({
   currentThemeId: -1,
   previewingColorScheme: false,
-  selectedColorSchemeId: null,
   selectedDarkColorSchemeId: null,
   preferencesController: inject("preferences"),
   makeColorSchemeDefault: true,
@@ -41,10 +40,7 @@ export default Controller.extend({
   init() {
     this._super(...arguments);
 
-    this.setProperties({
-      selectedColorSchemeId: this.session.userColorSchemeId,
-      selectedDarkColorSchemeId: this.session.userDarkSchemeId,
-    });
+    this.set("selectedDarkColorSchemeId", this.session.userDarkSchemeId);
   },
 
   @discourseComputed("makeThemeDefault")
@@ -151,6 +147,26 @@ export default Controller.extend({
     "user.color_schemes.default_description"
   ),
 
+  @discourseComputed(
+    "userSelectableThemes",
+    "userSelectableColorSchemes",
+    "themeId"
+  )
+  currentSchemeCanBeSelected(userThemes, userColorSchemes, themeId) {
+    if (!userThemes || !themeId) {
+      return false;
+    }
+
+    const theme = userThemes.findBy("id", themeId);
+    if (!theme) {
+      return false;
+    }
+
+    return userColorSchemes.findBy("id", theme.color_scheme_id);
+  },
+
+  showColorSchemeNoneItem: not("currentSchemeCanBeSelected"),
+
   @discourseComputed("model.user_option.theme_ids", "themeId")
   showThemeSetDefault(userOptionThemes, selectedTheme) {
     return !userOptionThemes || userOptionThemes[0] !== selectedTheme;
@@ -216,6 +232,15 @@ export default Controller.extend({
     },
   }),
 
+  selectedColorSchemeId: computed({
+    set(key, value) {
+      return value;
+    },
+    get() {
+      return this.session.userColorSchemeId;
+    },
+  }),
+
   actions: {
     save() {
       this.set("saved", false);
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js b/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
index e231d043f9..55b6304d35 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
@@ -15,6 +15,7 @@ export default Controller.extend({
       "like_notification_frequency",
       "allow_private_messages",
       "enable_allowed_pm_users",
+      "user_notification_schedule",
     ];
 
     this.likeNotificationFrequencies = [
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
index 5f92bd20d5..fb31cf3392 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
@@ -1,14 +1,14 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
-import discourseComputed from "discourse-common/utils/decorators";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { cookAsync } from "discourse/lib/text";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import showModal from "discourse/lib/show-modal";
-import { readOnly } from "@ember/object/computed";
 import bootbox from "bootbox";
+import { cookAsync } from "discourse/lib/text";
+import discourseComputed from "discourse-common/utils/decorators";
+import { isEmpty } from "@ember/utils";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { readOnly } from "@ember/object/computed";
+import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend({
   init() {
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 c1746d4ed9..946903a568 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
@@ -1,15 +1,15 @@
-import I18n from "I18n";
-import { alias } from "@ember/object/computed";
-import Controller from "@ember/controller";
-import discourseComputed from "discourse-common/utils/decorators";
-import { iconHTML } from "discourse-common/lib/icon-library";
-import CanCheckEmails from "discourse/mixins/can-check-emails";
 import DiscourseURL, { userPath } from "discourse/lib/url";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { findAll } from "discourse/models/login-method";
+import CanCheckEmails from "discourse/mixins/can-check-emails";
+import Controller from "@ember/controller";
+import I18n from "I18n";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
-import showModal from "discourse/lib/show-modal";
+import { alias } from "@ember/object/computed";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
+import { findAll } from "discourse/models/login-method";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend(CanCheckEmails, {
   loading: false,
@@ -131,7 +131,8 @@ export default Controller.extend(CanCheckEmails, {
           link: true,
         },
         {
-          label: `${iconHTML("ban")}${I18n.t("user.second_factor.disable")}`,
+          icon: iconHTML("ban"),
+          label: I18n.t("user.second_factor.disable"),
           class: "btn-danger btn-icon-text",
           callback: () => {
             this.model
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/security.js b/app/assets/javascripts/discourse/app/controllers/preferences/security.js
new file mode 100644
index 0000000000..c1e7dc52c0
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/security.js
@@ -0,0 +1,114 @@
+import Controller from "@ember/controller";
+import { gt } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import logout from "discourse/lib/logout";
+import showModal from "discourse/lib/show-modal";
+import { userPath } from "discourse/lib/url";
+import CanCheckEmails from "discourse/mixins/can-check-emails";
+import I18n from "I18n";
+
+// Number of tokens shown by default.
+const DEFAULT_AUTH_TOKENS_COUNT = 2;
+
+export default Controller.extend(CanCheckEmails, {
+  passwordProgress: null,
+
+  showAllAuthTokens: false,
+
+  @discourseComputed("model.is_anonymous")
+  canChangePassword(isAnonymous) {
+    if (isAnonymous) {
+      return false;
+    } else {
+      return (
+        !this.siteSettings.enable_discourse_connect &&
+        this.siteSettings.enable_local_logins
+      );
+    }
+  },
+
+  @discourseComputed("showAllAuthTokens", "model.user_auth_tokens")
+  authTokens(showAllAuthTokens, tokens) {
+    tokens.sort((a, b) => {
+      if (a.is_active) {
+        return -1;
+      } else if (b.is_active) {
+        return 1;
+      } else {
+        return b.seen_at.localeCompare(a.seen_at);
+      }
+    });
+
+    return showAllAuthTokens
+      ? tokens
+      : tokens.slice(0, DEFAULT_AUTH_TOKENS_COUNT);
+  },
+
+  canShowAllAuthTokens: gt(
+    "model.user_auth_tokens.length",
+    DEFAULT_AUTH_TOKENS_COUNT
+  ),
+
+  actions: {
+    save() {
+      this.set("saved", false);
+
+      return this.model
+        .then(() => this.set("saved", true))
+        .catch(popupAjaxError);
+    },
+
+    changePassword() {
+      if (!this.passwordProgress) {
+        this.set(
+          "passwordProgress",
+          I18n.t("user.change_password.in_progress")
+        );
+        return this.model
+          .changePassword()
+          .then(() => {
+            // password changed
+            this.setProperties({
+              changePasswordProgress: false,
+              passwordProgress: I18n.t("user.change_password.success"),
+            });
+          })
+          .catch(() => {
+            // password failed to change
+            this.setProperties({
+              changePasswordProgress: false,
+              passwordProgress: I18n.t("user.change_password.error"),
+            });
+          });
+      }
+    },
+
+    toggleShowAllAuthTokens() {
+      this.toggleProperty("showAllAuthTokens");
+    },
+
+    revokeAuthToken(token) {
+      ajax(
+        userPath(
+          `${this.get("model.username_lower")}/preferences/revoke-auth-token`
+        ),
+        {
+          type: "POST",
+          data: token ? { token_id: token.id } : {},
+        }
+      )
+        .then(() => {
+          if (!token) {
+            logout();
+          } // All sessions revoked
+        })
+        .catch(popupAjaxError);
+    },
+
+    showToken(token) {
+      showModal("auth-token", { model: token });
+    },
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/tags.js b/app/assets/javascripts/discourse/app/controllers/preferences/tags.js
index bc959ca441..bc74ec007a 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/tags.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/tags.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/username.js b/app/assets/javascripts/discourse/app/controllers/preferences/username.js
index 819121724a..6fbeb232c0 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/username.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/username.js
@@ -1,13 +1,13 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import { empty, or } from "@ember/object/computed";
-import Controller from "@ember/controller";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { setting, propertyEqual } from "discourse/lib/computed";
 import DiscourseURL, { userPath } from "discourse/lib/url";
-import { popupAjaxError } from "discourse/lib/ajax-error";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { empty, or } from "@ember/object/computed";
+import { propertyEqual, setting } from "discourse/lib/computed";
+import Controller from "@ember/controller";
+import I18n from "I18n";
 import User from "discourse/models/user";
 import bootbox from "bootbox";
+import { isEmpty } from "@ember/utils";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
   taken: false,
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/users.js b/app/assets/javascripts/discourse/app/controllers/preferences/users.js
index f4b1173c02..cdaf9ee0ac 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/users.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/users.js
@@ -1,14 +1,20 @@
-import { makeArray } from "discourse-common/lib/helpers";
-import { alias, gte, or, and } from "@ember/object/computed";
 import { action, computed } from "@ember/object";
+import { alias, and, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseComputed from "discourse-common/utils/decorators";
+import { makeArray } from "discourse-common/lib/helpers";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
   ignoredUsernames: alias("model.ignored_usernames"),
-  userIsMemberOrAbove: gte("model.trust_level", 2),
-  ignoredEnabled: or("userIsMemberOrAbove", "model.staff"),
+
+  @discourseComputed("model.trust_level")
+  userCanIgnore(trustLevel) {
+    return trustLevel >= this.siteSettings.min_trust_level_to_allow_ignore;
+  },
+
+  ignoredEnabled: or("userCanIgnore", "model.staff"),
+
   allowPmUsersEnabled: and(
     "model.user_option.enable_allowed_pm_users",
     "model.user_option.allow_private_messages"
diff --git a/app/assets/javascripts/discourse/app/controllers/publish-page.js b/app/assets/javascripts/discourse/app/controllers/publish-page.js
index 046685511e..f237944de4 100644
--- a/app/assets/javascripts/discourse/app/controllers/publish-page.js
+++ b/app/assets/javascripts/discourse/app/controllers/publish-page.js
@@ -1,7 +1,7 @@
+import { action, computed } from "@ember/object";
+import { equal, not } from "@ember/object/computed";
 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";
 
@@ -122,6 +122,9 @@ export default Controller.extend(ModalFunctionality, StateHelpers, {
   @action
   onChangePublic(isPublic) {
     this.publishedPage.set("public", isPublic);
-    this.publish();
+
+    if (this.showUnpublish) {
+      this.publish();
+    }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/raw-email.js b/app/assets/javascripts/discourse/app/controllers/raw-email.js
index 887af55d52..b2a5a8ec1e 100644
--- a/app/assets/javascripts/discourse/app/controllers/raw-email.js
+++ b/app/assets/javascripts/discourse/app/controllers/raw-email.js
@@ -1,8 +1,8 @@
-import { equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
+import IncomingEmail from "admin/models/incoming-email";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import Post from "discourse/models/post";
-import IncomingEmail from "admin/models/incoming-email";
+import { equal } from "@ember/object/computed";
 
 // This controller handles displaying of raw email
 export default Controller.extend(ModalFunctionality, {
diff --git a/app/assets/javascripts/discourse/app/controllers/reject-reason-reviewable.js b/app/assets/javascripts/discourse/app/controllers/reject-reason-reviewable.js
new file mode 100644
index 0000000000..c1b4b7239e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/controllers/reject-reason-reviewable.js
@@ -0,0 +1,22 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { action } from "@ember/object";
+
+export default Controller.extend(ModalFunctionality, {
+  rejectReason: null,
+  sendEmail: false,
+
+  onShow() {
+    this.setProperties({ rejectReason: null, sendEmail: false });
+  },
+
+  @action
+  perform() {
+    this.model.setProperties({
+      rejectReason: this.rejectReason,
+      sendEmail: this.sendEmail,
+    });
+    this.send("closeModal");
+    this.performConfirmed(this.action);
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/controllers/rename-tag.js b/app/assets/javascripts/discourse/app/controllers/rename-tag.js
index 64a17026d7..1c5f1d618f 100644
--- a/app/assets/javascripts/discourse/app/controllers/rename-tag.js
+++ b/app/assets/javascripts/discourse/app/controllers/rename-tag.js
@@ -1,37 +1,33 @@
-import discourseComputed from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
+import BufferedContent from "discourse/mixins/buffered-content";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import BufferedContent from "discourse/mixins/buffered-content";
+import discourseComputed from "discourse-common/utils/decorators";
 import { extractError } from "discourse/lib/ajax-error";
-import { oneWay } from "@ember/object/computed";
 
 export default Controller.extend(ModalFunctionality, BufferedContent, {
-  tagId: oneWay("model.id"),
+  newTag: null,
 
-  @discourseComputed("tagId", "model.id")
-  renameDisabled(inputTagName, currentTagName) {
+  @discourseComputed("newTag", "model.id")
+  renameDisabled(newTag, currentTag) {
     const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g");
-    const newTagName = inputTagName
-      ? inputTagName.replace(filterRegexp, "").trim()
-      : "";
-
-    return newTagName.length === 0 || newTagName === currentTagName;
+    newTag = newTag ? newTag.replace(filterRegexp, "").trim() : "";
+    return newTag.length === 0 || newTag === currentTag;
   },
 
-  actions: {
-    performRename() {
-      this.model
-        .update({ id: this.get("tagId") })
-        .then((result) => {
-          this.send("closeModal");
+  @action
+  performRename() {
+    this.model
+      .update({ id: this.newTag })
+      .then((result) => {
+        this.send("closeModal");
 
-          if (result.responseJson.tag) {
-            this.transitionToRoute("tag.show", result.responseJson.tag.id);
-          } else {
-            this.flash(extractError(result.responseJson.errors[0]), "error");
-          }
-        })
-        .catch((error) => this.flash(extractError(error), "error"));
-    },
+        if (result.responseJson.tag) {
+          this.transitionToRoute("tag.show", result.responseJson.tag.id);
+        } else {
+          this.flash(extractError(result.responseJson.errors[0]), "error");
+        }
+      })
+      .catch((error) => this.flash(extractError(error), "error"));
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/reorder-categories.js b/app/assets/javascripts/discourse/app/controllers/reorder-categories.js
index 969c46f9da..333108eefd 100644
--- a/app/assets/javascripts/discourse/app/controllers/reorder-categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/reorder-categories.js
@@ -1,24 +1,24 @@
-import { sort } from "@ember/object/computed";
-import Evented from "@ember/object/evented";
-import EmberObjectProxy from "@ember/object/proxy";
-import Controller from "@ember/controller";
-import { ajax } from "discourse/lib/ajax";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import BufferedProxy from "ember-buffered-proxy/proxy";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
+import BufferedMixin from "ember-buffered-proxy/mixin";
+import BufferedProxy from "ember-buffered-proxy/proxy";
+import Controller from "@ember/controller";
+import EmberObjectProxy from "@ember/object/proxy";
+import Evented from "@ember/object/evented";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { sort } from "@ember/object/computed";
 
 export default Controller.extend(ModalFunctionality, Evented, {
   init() {
     this._super(...arguments);
-
     this.categoriesSorting = ["position"];
   },
 
-  @discourseComputed("site.categories")
+  @discourseComputed("site.categories.[]")
   categoriesBuffered(categories) {
-    const bufProxy = EmberObjectProxy.extend(BufferedProxy);
-    return categories.map((c) => bufProxy.create({ content: c }));
+    const bufProxy = EmberObjectProxy.extend(BufferedMixin || BufferedProxy);
+    return (categories || []).map((c) => bufProxy.create({ content: c }));
   },
 
   categoriesOrdered: sort("categoriesBuffered", "categoriesSorting"),
@@ -135,7 +135,7 @@ export default Controller.extend(ModalFunctionality, Evented, {
         type: "POST",
         data: { mapping: JSON.stringify(data) },
       })
-        .then(() => this.send("closeModal"))
+        .then(() => window.location.reload())
         .catch(popupAjaxError);
     },
   },
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 32c6170a93..0d3b52f77f 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,11 +1,11 @@
+import Controller from "@ember/controller";
+import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
-import { alias } from "@ember/object/computed";
-import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import DiscourseURL from "discourse/lib/url";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
   loading: false,
diff --git a/app/assets/javascripts/discourse/app/controllers/review-index.js b/app/assets/javascripts/discourse/app/controllers/review-index.js
index cca820a456..2c70242dcd 100644
--- a/app/assets/javascripts/discourse/app/controllers/review-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/review-index.js
@@ -1,6 +1,6 @@
+import Controller from "@ember/controller";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import Controller from "@ember/controller";
 import { isPresent } from "@ember/utils";
 
 export default Controller.extend({
@@ -11,6 +11,7 @@ export default Controller.extend({
     "category_id",
     "topic_id",
     "username",
+    "reviewed_by",
     "from_date",
     "to_date",
     "sort_order",
@@ -24,6 +25,7 @@ export default Controller.extend({
   topic_id: null,
   filtersExpanded: false,
   username: "",
+  reviewed_by: "",
   from_date: null,
   to_date: null,
   sort_order: null,
@@ -47,7 +49,7 @@ export default Controller.extend({
 
   @discourseComputed
   priorities() {
-    return ["low", "medium", "high"].map((priority) => {
+    return ["any", "low", "medium", "high"].map((priority) => {
       return {
         id: priority,
         name: I18n.t(`review.filters.priority.${priority}`),
@@ -100,7 +102,12 @@ export default Controller.extend({
       let newList = this.reviewables.reject((reviewable) => {
         return ids.indexOf(reviewable.id) !== -1;
       });
-      this.set("reviewables", newList);
+
+      if (newList.length === 0) {
+        this.send("refreshRoute");
+      } else {
+        this.set("reviewables", newList);
+      }
     },
 
     resetTopic() {
@@ -147,6 +154,7 @@ export default Controller.extend({
         status: this.filterStatus,
         category_id: this.filterCategoryId,
         username: this.filterUsername,
+        reviewed_by: this.filterReviewedBy,
         from_date: isPresent(this.filterFromDate)
           ? this.filterFromDate.toISOString(true).split("T")[0]
           : null,
@@ -167,5 +175,13 @@ export default Controller.extend({
     toggleFilters() {
       this.toggleProperty("filtersExpanded");
     },
+
+    updateFilterReviewedBy(selected) {
+      this.set("filterReviewedBy", selected.firstObject);
+    },
+
+    updateFilterUsername(selected) {
+      this.set("filterUsername", selected.firstObject);
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/review-settings.js b/app/assets/javascripts/discourse/app/controllers/review-settings.js
index 353fc33e81..8ca69c8853 100644
--- a/app/assets/javascripts/discourse/app/controllers/review-settings.js
+++ b/app/assets/javascripts/discourse/app/controllers/review-settings.js
@@ -1,8 +1,8 @@
 import Controller from "@ember/controller";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
   saving: false,
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 6674abff6d..d6b48db673 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,11 +1,11 @@
-import I18n from "I18n";
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
 import {
   bufferToBase64,
-  stringToBuffer,
   isWebauthnSupported,
+  stringToBuffer,
 } from "discourse/lib/webauthn";
+import Controller from "@ember/controller";
+import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 // model for this controller is user
 export default Controller.extend(ModalFunctionality, {
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 2a5a6a4c63..bdc1f3511d 100644
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
+++ b/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
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 f87c90c392..01afb54af7 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,9 +1,9 @@
+import Controller from "@ember/controller";
 import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import { alias } from "@ember/object/computed";
 import { later } from "@ember/runloop";
-import Controller from "@ember/controller";
-import { SECOND_FACTOR_METHODS } from "discourse/models/user";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
   loading: false,
diff --git a/app/assets/javascripts/discourse/app/controllers/share-topic.js b/app/assets/javascripts/discourse/app/controllers/share-topic.js
new file mode 100644
index 0000000000..c4ad16f19b
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/controllers/share-topic.js
@@ -0,0 +1,119 @@
+import Controller from "@ember/controller";
+import { action } from "@ember/object";
+import { getAbsoluteURL } from "discourse-common/lib/get-url";
+import discourseComputed from "discourse-common/utils/decorators";
+import { ajax } from "discourse/lib/ajax";
+import { extractError } from "discourse/lib/ajax-error";
+import Sharing from "discourse/lib/sharing";
+import showModal from "discourse/lib/show-modal";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import I18n from "I18n";
+
+export default Controller.extend(
+  ModalFunctionality,
+  bufferedProperty("invite"),
+  {
+    onShow() {
+      this.set("showNotifyUsers", false);
+    },
+
+    @discourseComputed("topic.shareUrl")
+    topicUrl(url) {
+      return url ? getAbsoluteURL(url) : null;
+    },
+
+    @discourseComputed(
+      "topic.{isPrivateMessage,invisible,category.read_restricted}"
+    )
+    sources(topic) {
+      const privateContext =
+        this.siteSettings.login_required ||
+        (topic && topic.isPrivateMessage) ||
+        (topic && topic.invisible) ||
+        topic.category.read_restricted;
+
+      return Sharing.activeSources(
+        this.siteSettings.share_links,
+        privateContext
+      );
+    },
+
+    @action
+    copied() {
+      return this.appEvents.trigger("modal-body:flash", {
+        text: I18n.t("topic.share.copied"),
+        messageClass: "success",
+      });
+    },
+
+    @action
+    onChangeUsers(usernames) {
+      this.set("users", usernames.uniq());
+    },
+
+    @action
+    share(source) {
+      this.set("showNotifyUsers", false);
+      Sharing.shareSource(source, {
+        title: this.topic.title,
+        url: this.topicUrl,
+      });
+    },
+
+    @action
+    toggleNotifyUsers() {
+      if (this.showNotifyUsers) {
+        this.set("showNotifyUsers", false);
+      } else {
+        this.setProperties({
+          showNotifyUsers: true,
+          users: [],
+        });
+      }
+    },
+
+    @action
+    notifyUsers() {
+      if (this.users.length === 0) {
+        return;
+      }
+
+      ajax(`/t/${this.topic.id}/invite-notify`, {
+        type: "POST",
+        data: { usernames: this.users },
+      })
+        .then(() => {
+          this.setProperties({ showNotifyUsers: false });
+          this.appEvents.trigger("modal-body:flash", {
+            text: I18n.t("topic.share.notify_users.success", {
+              count: this.users.length,
+              username: this.users[0],
+            }),
+            messageClass: "success",
+          });
+        })
+        .catch((error) => {
+          this.appEvents.trigger("modal-body:flash", {
+            text: extractError(error),
+            messageClass: "error",
+          });
+        });
+    },
+
+    @action
+    inviteUsers() {
+      this.set("showNotifyUsers", false);
+      const controller = showModal("create-invite");
+      controller.setProperties({
+        showAdvanced: true,
+        inviteToTopic: true,
+      });
+      controller.buffered.setProperties({
+        topicId: this.topic.id,
+        topicTitle: this.topic.title,
+      });
+      controller.save({ autogenerated: true });
+    },
+  }
+);
diff --git a/app/assets/javascripts/discourse/app/controllers/static.js b/app/assets/javascripts/discourse/app/controllers/static.js
index f0228e7dc0..b86a70cd54 100644
--- a/app/assets/javascripts/discourse/app/controllers/static.js
+++ b/app/assets/javascripts/discourse/app/controllers/static.js
@@ -1,13 +1,14 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { equal } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+import { equal, or } from "@ember/object/computed";
 import { userPath } from "discourse/lib/url";
 
 export default Controller.extend({
   application: controller(),
 
   showLoginButton: equal("model.path", "login"),
+  anyButtons: or("showLoginButton", "showSignupButton"),
 
   @discourseComputed("model.path")
   bodyClass: (path) => `static-${path}`,
diff --git a/app/assets/javascripts/discourse/app/controllers/tag-show.js b/app/assets/javascripts/discourse/app/controllers/tag-show.js
index 5d19259d6b..0bf4cec6a9 100644
--- a/app/assets/javascripts/discourse/app/controllers/tag-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/tag-show.js
@@ -1,12 +1,13 @@
-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";
 import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
-import NavItem from "discourse/models/nav-item";
 import FilterModeMixin from "discourse/mixins/filter-mode";
-import { queryParams } from "discourse/controllers/discovery-sortable";
+import I18n from "I18n";
+import NavItem from "discourse/models/nav-item";
+import Topic from "discourse/models/topic";
+import { alias } from "@ember/object/computed";
 import bootbox from "bootbox";
+import { queryParams } from "discourse/controllers/discovery-sortable";
 import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend(BulkTopicSelection, FilterModeMixin, {
@@ -28,11 +29,6 @@ export default Controller.extend(BulkTopicSelection, FilterModeMixin, {
   q: null,
   showInfo: false,
 
-  @discourseComputed("list", "list.draft")
-  createTopicLabel(list, listDraft) {
-    return listDraft ? "topic.open_draft" : "topic.create";
-  },
-
   @discourseComputed(
     "canCreateTopic",
     "category",
@@ -68,7 +64,7 @@ export default Controller.extend(BulkTopicSelection, FilterModeMixin, {
 
   @discourseComputed("category")
   showTagFilter() {
-    return this.siteSettings.show_filter_by_tag;
+    return true;
   },
 
   loadMoreTopics() {
@@ -109,11 +105,43 @@ export default Controller.extend(BulkTopicSelection, FilterModeMixin, {
     return this.isFilterPage(filter, "unread") && topicsLength > 0;
   },
 
+  @discourseComputed("list.filter", "list.topics.length")
+  showResetNew(filter, topicsLength) {
+    return this.isFilterPage(filter, "new") && topicsLength > 0;
+  },
+
+  @discourseComputed("list.filter", "list.topics.length")
+  showDismissAtTop(filter, topicsLength) {
+    return (
+      (this.isFilterPage(filter, "new") ||
+        this.isFilterPage(filter, "unread")) &&
+      topicsLength >= 15
+    );
+  },
+
   actions: {
     dismissReadPosts() {
       showModal("dismiss-read", { title: "topics.bulk.dismiss_read" });
     },
 
+    resetNew() {
+      const tracked =
+        (this.router.currentRoute.queryParams["f"] ||
+          this.router.currentRoute.queryParams["filter"]) === "tracked";
+
+      Topic.resetNew(
+        this.category,
+        !this.noSubcategories,
+        tracked,
+        this.tag
+      ).then(() =>
+        this.send(
+          "refresh",
+          tracked ? { skipResettingParams: ["filter", "f"] } : {}
+        )
+      );
+    },
+
     changeSort(order) {
       if (order === this.order) {
         this.toggleProperty("ascending");
diff --git a/app/assets/javascripts/discourse/app/controllers/tags-index.js b/app/assets/javascripts/discourse/app/controllers/tags-index.js
index 7ce3acdb46..30dfdd40c2 100644
--- a/app/assets/javascripts/discourse/app/controllers/tags-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/tags-index.js
@@ -1,11 +1,11 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import { alias, notEmpty } from "@ember/object/computed";
 import Controller from "@ember/controller";
-import showModal from "discourse/lib/show-modal";
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend({
   sortedByCount: true,
@@ -71,8 +71,10 @@ export default Controller.extend({
             return;
           }
 
-          const joinedTags = tags.slice(0, displayN).join(", ");
-          var more = Math.max(0, tags.length - displayN);
+          const joinedTags = tags
+            .slice(0, displayN)
+            .join(I18n.t("tagging.tag_list_joiner"));
+          const more = Math.max(0, tags.length - displayN);
 
           const tagsString =
             more === 0
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 98a56d80e1..a11b760d84 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
@@ -1,10 +1,10 @@
+import { alias, empty } from "@ember/object/computed";
+import Controller, { inject as controller } from "@ember/controller";
 import I18n from "I18n";
-import { empty, alias } from "@ember/object/computed";
-import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { Promise } from "rsvp";
 import Topic from "discourse/models/topic";
 import bootbox from "bootbox";
-import { Promise } from "rsvp";
 
 const _buttons = [];
 
@@ -31,14 +31,27 @@ function addBulkButton(action, key, opts) {
 addBulkButton("showChangeCategory", "change_category", {
   icon: "pencil-alt",
   class: "btn-default",
+  buttonVisible: (topics) => !topics.some((t) => t.isPrivateMessage),
 });
 addBulkButton("closeTopics", "close_topics", {
   icon: "lock",
   class: "btn-default",
+  buttonVisible: (topics) => !topics.some((t) => t.isPrivateMessage),
 });
 addBulkButton("archiveTopics", "archive_topics", {
   icon: "folder",
   class: "btn-default",
+  buttonVisible: (topics) => !topics.some((t) => t.isPrivateMessage),
+});
+addBulkButton("archiveMessages", "archive_topics", {
+  icon: "folder",
+  class: "btn-default",
+  buttonVisible: (topics) => topics.some((t) => t.isPrivateMessage),
+});
+addBulkButton("moveMessagesToInbox", "move_messages_to_inbox", {
+  icon: "folder",
+  class: "btn-default",
+  buttonVisible: (topics) => topics.some((t) => t.isPrivateMessage),
 });
 addBulkButton("showNotificationLevel", "notification_level", {
   icon: "d-regular",
@@ -51,40 +64,57 @@ addBulkButton("resetRead", "reset_read", {
 addBulkButton("unlistTopics", "unlist_topics", {
   icon: "far-eye-slash",
   class: "btn-default",
-  buttonVisible: (topics) => topics.some((t) => t.visible),
+  buttonVisible: (topics) =>
+    topics.some((t) => t.visible) && !topics.some((t) => t.isPrivateMessage),
 });
 addBulkButton("relistTopics", "relist_topics", {
   icon: "far-eye",
   class: "btn-default",
-  buttonVisible: (topics) => topics.some((t) => !t.visible),
+  buttonVisible: (topics) =>
+    topics.some((t) => !t.visible) && !topics.some((t) => t.isPrivateMessage),
 });
 addBulkButton("showTagTopics", "change_tags", {
   icon: "tag",
   class: "btn-default",
   enabledSetting: "tagging_enabled",
+  buttonVisible: function () {
+    return this.currentUser.staff;
+  },
 });
 addBulkButton("showAppendTagTopics", "append_tags", {
   icon: "tag",
   class: "btn-default",
   enabledSetting: "tagging_enabled",
+  buttonVisible: function () {
+    return this.currentUser.staff;
+  },
 });
 addBulkButton("removeTags", "remove_tags", {
   icon: "tag",
   class: "btn-default",
   enabledSetting: "tagging_enabled",
+  buttonVisible: function () {
+    return this.currentUser.staff;
+  },
 });
 addBulkButton("deleteTopics", "delete", {
   icon: "trash-alt",
   class: "btn-danger",
+  buttonVisible: function () {
+    return this.currentUser.staff;
+  },
 });
 
 // Modal for performing bulk actions on topics
 export default Controller.extend(ModalFunctionality, {
-  tags: null,
+  userPrivateMessages: controller("user-private-messages"),
 
+  tags: null,
   emptyTags: empty("tags"),
   categoryId: alias("model.category.id"),
   processedTopicCount: 0,
+  isGroup: alias("userPrivateMessages.isGroup"),
+  groupFilter: alias("userPrivateMessages.groupFilter"),
 
   onShow() {
     const topics = this.get("model.topics");
@@ -94,7 +124,7 @@ export default Controller.extend(ModalFunctionality, {
         if (b.enabledSetting && !this.siteSettings[b.enabledSetting]) {
           return false;
         }
-        return b.buttonVisible(topics);
+        return b.buttonVisible.call(this, topics);
       })
     );
     this.set("modal.modalClass", "topic-bulk-actions-modal small");
@@ -103,7 +133,10 @@ export default Controller.extend(ModalFunctionality, {
 
   perform(operation) {
     this.set("processedTopicCount", 0);
-    this.send("changeBulkTemplate", "modal/bulk-progress");
+    if (this.get("model.topics").length > 20) {
+      this.send("changeBulkTemplate", "modal/bulk-progress");
+    }
+
     this.set("loading", true);
 
     return this._processChunks(operation)
@@ -197,7 +230,7 @@ export default Controller.extend(ModalFunctionality, {
     },
 
     showAppendTagTopics() {
-      this.set("tags", "");
+      this.set("tags", null);
       this.set("action", "appendTags");
       this.set("label", "append_tags");
       this.set("title", "choose_append_tags");
@@ -230,6 +263,22 @@ export default Controller.extend(ModalFunctionality, {
       );
     },
 
+    archiveMessages() {
+      let params = { type: "archive_messages" };
+      if (this.isGroup) {
+        params.group = this.groupFilter;
+      }
+      this.performAndRefresh(params);
+    },
+
+    moveMessagesToInbox() {
+      let params = { type: "move_messages_to_inbox" };
+      if (this.isGroup) {
+        params.group = this.groupFilter;
+      }
+      this.performAndRefresh(params);
+    },
+
     unlistTopics() {
       this.forEachPerformed({ type: "unlist" }, (t) => t.set("visible", false));
     },
@@ -255,7 +304,16 @@ export default Controller.extend(ModalFunctionality, {
     },
 
     removeTags() {
-      this.performAndRefresh({ type: "remove_tags" });
+      bootbox.confirm(
+        I18n.t("topics.bulk.confirm_remove_tags", {
+          count: this.get("model.topics").length,
+        }),
+        (result) => {
+          if (result) {
+            this.performAndRefresh({ type: "remove_tags" });
+          }
+        }
+      );
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index 5c3c16f6df..fcadfa4fef 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -1,31 +1,31 @@
-import I18n from "I18n";
-import { isPresent, isEmpty } from "@ember/utils";
-import { or, and, not, alias } from "@ember/object/computed";
-import EmberObject from "@ember/object";
-import { next, schedule, later } from "@ember/runloop";
 import Controller, { inject as controller } from "@ember/controller";
-import { bufferedProperty } from "discourse/mixins/buffered-content";
-import Composer from "discourse/models/composer";
 import DiscourseURL, { userPath } from "discourse/lib/url";
+import { alias, and, not, or } from "@ember/object/computed";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { isEmpty, isPresent } from "@ember/utils";
+import { later, next, schedule } from "@ember/runloop";
+import { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";
+import Composer from "discourse/models/composer";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
 import Post from "discourse/models/post";
-import { buildQuote } from "discourse/lib/quote";
+import { Promise } from "rsvp";
 import QuoteState from "discourse/lib/quote-state";
 import Topic from "discourse/models/topic";
-import discourseDebounce from "discourse/lib/debounce";
-import isElementInViewport from "discourse/lib/is-element-in-viewport";
-import { ajax } from "discourse/lib/ajax";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { extractLinkMeta } from "discourse/lib/render-topic-featured-link";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { spinnerHTML } from "discourse/helpers/loading-spinner";
-import showModal from "discourse/lib/show-modal";
 import TopicTimer from "discourse/models/topic-timer";
-import { Promise } from "rsvp";
-import { escapeExpression } from "discourse/lib/utilities";
-import { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";
-import { inject as service } from "@ember/service";
+import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import { buildQuote } from "discourse/lib/quote";
 import { deepMerge } from "discourse-common/lib/object";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { escapeExpression } from "discourse/lib/utilities";
+import { extractLinkMeta } from "discourse/lib/render-topic-featured-link";
+import isElementInViewport from "discourse/lib/is-element-in-viewport";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
+import showModal from "discourse/lib/show-modal";
+import { spinnerHTML } from "discourse/helpers/loading-spinner";
 
 let customPostMessageCallbacks = {};
 
@@ -52,7 +52,7 @@ export default Controller.extend(bufferedProperty("model"), {
   multiSelect: false,
   selectedPostIds: null,
   editingTopic: false,
-  queryParams: ["filter", "username_filters"],
+  queryParams: ["filter", "username_filters", "replies_to_post_number"],
   loadedAllPosts: or(
     "model.postStream.loadedAllPosts",
     "model.postStream.loadingLastPost"
@@ -64,8 +64,10 @@ export default Controller.extend(bufferedProperty("model"), {
   _progressIndex: null,
   hasScrolled: null,
   username_filters: null,
+  replies_to_post_number: null,
   filter: null,
   quoteState: null,
+  currentPostId: null,
 
   init() {
     this._super(...arguments);
@@ -110,10 +112,9 @@ export default Controller.extend(bufferedProperty("model"), {
     }
   },
 
-  @discourseComputed("model.postStream.loaded", "model.category_id")
-  showSharedDraftControls(loaded, categoryId) {
-    let draftCat = this.site.shared_drafts_category_id;
-    return loaded && draftCat && categoryId && draftCat === categoryId;
+  @discourseComputed("model.postStream.loaded", "model.is_shared_draft")
+  showSharedDraftControls(loaded, isSharedDraft) {
+    return loaded && isSharedDraft;
   },
 
   @discourseComputed("site.mobileView", "model.posts_count")
@@ -338,7 +339,7 @@ export default Controller.extend(bufferedProperty("model"), {
           this.appEvents.trigger("composer:insert-block", quotedText);
         } else if (composer.get("model.viewDraft")) {
           const model = composer.get("model");
-          model.set("reply", model.get("reply") + quotedText);
+          model.set("reply", model.get("reply") + "\n" + quotedText);
           composer.send("openIfDraft");
         } else {
           composer.open(composerOpts);
@@ -360,6 +361,7 @@ export default Controller.extend(bufferedProperty("model"), {
         return;
       }
 
+      this.set("currentPostId", post.id);
       const postNumber = post.get("post_number");
       const topic = this.model;
       topic.set("currentPost", postNumber);
@@ -421,14 +423,40 @@ export default Controller.extend(bufferedProperty("model"), {
       }
     },
 
-    toggleSummary() {
+    showSummary() {
       return this.get("model.postStream")
-        .toggleSummary()
+        .showSummary()
         .then(() => {
           this.updateQueryParams();
         });
     },
 
+    cancelFilter(nearestPost = null) {
+      const postStream = this.get("model.postStream");
+
+      if (!nearestPost) {
+        const loadedPost = postStream.findLoadedPost(this.currentPostId);
+        if (loadedPost) {
+          nearestPost = loadedPost.post_number;
+        } else {
+          postStream.findPostsByIds([this.currentPostId]).then((arr) => {
+            nearestPost = arr[0].post_number;
+          });
+        }
+      }
+
+      postStream.cancelFilter();
+      postStream
+        .refresh({
+          nearPost: nearestPost,
+          forceLoad: true,
+        })
+        .then(() => {
+          DiscourseURL.routeTo(this.model.urlForPostNumber(nearestPost));
+          this.updateQueryParams();
+        });
+    },
+
     removeAllowedUser(user) {
       return this.get("model.details")
         .removeAllowedUser(user)
@@ -685,9 +713,9 @@ export default Controller.extend(bufferedProperty("model"), {
       if (!this.currentUser) {
         return bootbox.alert(I18n.t("bookmarks.not_bookmarked"));
       } else if (post) {
-        return post.toggleBookmark();
+        return this._togglePostBookmark(post);
       } else {
-        return this.model.toggleBookmark().then((changedIds) => {
+        return this._toggleTopicBookmark(this.model).then((changedIds) => {
           if (!changedIds) {
             return;
           }
@@ -726,6 +754,7 @@ export default Controller.extend(bufferedProperty("model"), {
     jumpTop() {
       DiscourseURL.routeTo(this.get("model.firstPostUrl"), {
         skipIfOnScreen: false,
+        keepFilter: true,
       });
     },
 
@@ -736,6 +765,7 @@ export default Controller.extend(bufferedProperty("model"), {
       DiscourseURL.routeTo(this.get("model.lastPostUrl"), {
         skipIfOnScreen: false,
         jumpEnd,
+        keepFilter: true,
       });
     },
 
@@ -746,6 +776,7 @@ export default Controller.extend(bufferedProperty("model"), {
       );
       DiscourseURL.routeTo(this.get("model.lastPostUrl"), {
         jumpEnd: true,
+        keepFilter: true,
       });
     },
 
@@ -867,9 +898,9 @@ export default Controller.extend(bufferedProperty("model"), {
       });
     },
 
-    toggleParticipant(user) {
+    filterParticipant(user) {
       this.get("model.postStream")
-        .toggleParticipant(user.get("username"))
+        .filterParticipant(user.username)
         .then(() => this.updateQueryParams);
     },
 
@@ -1071,13 +1102,7 @@ export default Controller.extend(bufferedProperty("model"), {
     },
 
     removeTopicTimer(statusType, topicTimer) {
-      TopicTimer.updateStatus(
-        this.get("model.id"),
-        null,
-        null,
-        statusType,
-        null
-      )
+      TopicTimer.update(this.get("model.id"), null, null, statusType, null)
         .then(() => this.set(`model.${topicTimer}`, EmberObject.create({})))
         .catch((error) => popupAjaxError(error));
     },
@@ -1141,15 +1166,123 @@ export default Controller.extend(bufferedProperty("model"), {
     const post = postStream.findLoadedPost(postId);
 
     if (post) {
-      DiscourseURL.routeTo(topic.urlForPostNumber(post.get("post_number")));
+      DiscourseURL.routeTo(topic.urlForPostNumber(post.get("post_number")), {
+        keepFilter: true,
+      });
     } else {
       // need to load it
       postStream.findPostsByIds([postId]).then((arr) => {
-        DiscourseURL.routeTo(topic.urlForPostNumber(arr[0].get("post_number")));
+        DiscourseURL.routeTo(
+          topic.urlForPostNumber(arr[0].get("post_number")),
+          {
+            keepFilter: true,
+          }
+        );
       });
     }
   },
 
+  _togglePostBookmark(post) {
+    return new Promise((resolve) => {
+      let modalController = showModal("bookmark", {
+        model: {
+          postId: post.id,
+          id: post.bookmark_id,
+          reminderAt: post.bookmark_reminder_at,
+          autoDeletePreference: post.bookmark_auto_delete_preference,
+          name: post.bookmark_name,
+        },
+        title: post.bookmark_id
+          ? "post.bookmarks.edit"
+          : "post.bookmarks.create",
+        modalClass: "bookmark-with-reminder",
+      });
+      modalController.setProperties({
+        onCloseWithoutSaving: () => {
+          resolve({ closedWithoutSaving: true });
+          post.appEvents.trigger("post-stream:refresh", { id: post.id });
+        },
+        afterSave: (savedData) => {
+          post.createBookmark(savedData);
+          resolve({ closedWithoutSaving: false });
+        },
+        afterDelete: (topicBookmarked) => {
+          post.deleteBookmark(topicBookmarked);
+        },
+      });
+    });
+  },
+
+  _toggleTopicBookmark() {
+    if (this.model.bookmarking) {
+      return Promise.resolve();
+    }
+    this.model.set("bookmarking", true);
+    const bookmark = !this.model.bookmarked;
+    let posts = this.model.postStream.posts;
+
+    return this.model.firstPost().then((firstPost) => {
+      const toggleBookmarkOnServer = () => {
+        if (bookmark) {
+          return this._togglePostBookmark(firstPost).then((opts) => {
+            this.model.set("bookmarking", false);
+            if (opts && opts.closedWithoutSaving) {
+              return;
+            }
+            return this.model.afterTopicBookmarked(firstPost);
+          });
+        } else {
+          return this.model
+            .deleteBookmark()
+            .then(() => {
+              this.model.toggleProperty("bookmarked");
+              this.model.set("bookmark_reminder_at", null);
+              let clearedBookmarkProps = {
+                bookmarked: false,
+                bookmark_id: null,
+                bookmark_name: null,
+                bookmark_reminder_at: null,
+              };
+              if (posts) {
+                const updated = [];
+                posts.forEach((post) => {
+                  if (post.bookmarked) {
+                    post.setProperties(clearedBookmarkProps);
+                    updated.push(post.id);
+                  }
+                });
+                firstPost.setProperties(clearedBookmarkProps);
+                return updated;
+              }
+            })
+            .catch(popupAjaxError)
+            .finally(() => this.model.set("bookmarking", false));
+        }
+      };
+
+      const unbookmarkedPosts = [];
+      if (!bookmark && posts) {
+        posts.forEach(
+          (post) => post.bookmarked && 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()
+          );
+        } else {
+          toggleBookmarkOnServer().then(resolve);
+        }
+      });
+    });
+  },
+
   togglePinnedState() {
     this.send("togglePinnedForUser");
   },
@@ -1500,15 +1633,22 @@ export default Controller.extend(bufferedProperty("model"), {
     );
   },
 
-  _scrollToPost: discourseDebounce(function (postNumber) {
-    const $post = $(`.topic-post article#post_${postNumber}`);
+  _scrollToPost(postNumber) {
+    discourseDebounce(
+      this,
+      function () {
+        const $post = $(`.topic-post article#post_${postNumber}`);
 
-    if ($post.length === 0 || isElementInViewport($post)) {
-      return;
-    }
+        if ($post.length === 0 || isElementInViewport($post)) {
+          return;
+        }
 
-    $("html, body").animate({ scrollTop: $post.offset().top }, 1000);
-  }, 500),
+        $("html, body").animate({ scrollTop: $post.offset().top }, 1000);
+      },
+      postNumber,
+      500
+    );
+  },
 
   unsubscribe() {
     // never unsubscribe when navigating from topic to topic
diff --git a/app/assets/javascripts/discourse/app/controllers/upload-selector.js b/app/assets/javascripts/discourse/app/controllers/upload-selector.js
index 8963016eb9..6ccf7f4fbb 100644
--- a/app/assets/javascripts/discourse/app/controllers/upload-selector.js
+++ b/app/assets/javascripts/discourse/app/controllers/upload-selector.js
@@ -1,14 +1,13 @@
-import I18n from "I18n";
-import { equal } from "@ember/object/computed";
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import discourseComputed from "discourse-common/utils/decorators";
 import {
   allowsAttachments,
   authorizedExtensions,
-  authorizesAllExtensions,
   uploadIcon,
 } from "discourse/lib/uploads";
+import Controller from "@ember/controller";
+import I18n from "I18n";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import discourseComputed from "discourse-common/utils/decorators";
+import { equal } from "@ember/object/computed";
 
 export default Controller.extend(ModalFunctionality, {
   imageUrl: null,
@@ -16,11 +15,9 @@ export default Controller.extend(ModalFunctionality, {
   remote: equal("selection", "remote"),
   selection: "local",
 
-  uploadTranslate(key) {
-    if (allowsAttachments(this.currentUser.staff, this.siteSettings)) {
-      key += "_with_attachments";
-    }
-    return `upload_selector.${key}`;
+  @discourseComputed()
+  allowAdditionalFormats() {
+    return allowsAttachments(this.currentUser.staff, this.siteSettings);
   },
 
   @discourseComputed()
@@ -28,22 +25,26 @@ export default Controller.extend(ModalFunctionality, {
     return uploadIcon(this.currentUser.staff, this.siteSettings);
   },
 
-  @discourseComputed()
-  title() {
-    return this.uploadTranslate("title");
+  @discourseComputed("allowAdditionalFormats")
+  title(allowAdditionalFormats) {
+    const suffix = allowAdditionalFormats ? "_with_attachments" : "";
+    return `upload_selector.title${suffix}`;
   },
 
-  @discourseComputed("selection")
-  tip(selection) {
-    const authorized_extensions = authorizesAllExtensions(
+  @discourseComputed("selection", "allowAdditionalFormats")
+  tip(selection, allowAdditionalFormats) {
+    const suffix = allowAdditionalFormats ? "_with_attachments" : "";
+    return I18n.t(`upload_selector.${selection}_tip${suffix}`);
+  },
+
+  @discourseComputed()
+  supportedFormats() {
+    const extensions = authorizedExtensions(
       this.currentUser.staff,
       this.siteSettings
-    )
-      ? ""
-      : `(${authorizedExtensions(this.currentUser.staff, this.siteSettings)})`;
-    return I18n.t(this.uploadTranslate(`${selection}_tip`), {
-      authorized_extensions,
-    });
+    );
+
+    return `(${extensions})`;
   },
 
   actions: {
@@ -56,7 +57,7 @@ export default Controller.extend(ModalFunctionality, {
         const imageUrl = this.imageUrl || "";
         const toolbarEvent = this.toolbarEvent;
 
-        if (imageUrl.match(/\.(jpg|jpeg|png|gif|heic|heif)$/)) {
+        if (imageUrl.match(/\.(jpg|jpeg|png|gif|heic|heif|webp)$/)) {
           toolbarEvent.addText(`![](${imageUrl})`);
         } else {
           toolbarEvent.addText(imageUrl);
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 ab19fc5d57..a561911938 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
 import Controller, { inject } from "@ember/controller";
-import { Promise } from "rsvp";
-import { action } from "@ember/object";
-import discourseComputed from "discourse-common/utils/decorators";
 import Bookmark from "discourse/models/bookmark";
+import I18n from "I18n";
+import { Promise } from "rsvp";
+import EmberObject, { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   application: inject(),
@@ -100,9 +100,19 @@ export default Controller.extend({
     this.model.more_bookmarks_url = response.more_bookmarks_url;
 
     if (response.bookmarks) {
-      this.content.pushObjects(
-        response.bookmarks.map((bookmark) => Bookmark.create(bookmark))
-      );
+      const bookmarkModels = response.bookmarks.map((bookmark) => {
+        const bookmarkModel = Bookmark.create(bookmark);
+        bookmarkModel.topicStatus = EmberObject.create({
+          closed: bookmark.closed,
+          archived: bookmark.archived,
+          is_warning: bookmark.is_warning,
+          pinned: false,
+          unpinned: false,
+          invisible: bookmark.invisible,
+        });
+        return bookmarkModel;
+      });
+      this.content.pushObjects(bookmarkModels);
     }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity.js b/app/assets/javascripts/discourse/app/controllers/user-activity.js
index ac945e469b..c62f5bc72e 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-activity.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-activity.js
@@ -1,22 +1,20 @@
+import Controller, { inject as controller } from "@ember/controller";
 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";
+import bootbox from "bootbox";
 import { exportUserArchive } from "discourse/lib/export-csv";
 import { observes } from "discourse-common/utils/decorators";
-import bootbox from "bootbox";
 
 export default Controller.extend({
   application: controller(),
   user: controller(),
-  router: service(),
   userActionType: null,
 
   canDownloadPosts: alias("user.viewingSelf"),
 
   @observes("userActionType", "model.stream.itemsLoaded")
   _showFooter: function () {
-    var showFooter;
+    let showFooter;
     if (this.userActionType) {
       const stat = (this.get("model.stats") || []).find(
         (s) => s.action_type === this.userActionType
diff --git a/app/assets/javascripts/discourse/app/controllers/user-badges.js b/app/assets/javascripts/discourse/app/controllers/user-badges.js
index 3b8cfdb9c2..a4d55048f9 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-badges.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-badges.js
@@ -1,5 +1,5 @@
-import { alias, sort } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
+import { alias, sort } from "@ember/object/computed";
 
 export default Controller.extend({
   user: controller(),
diff --git a/app/assets/javascripts/discourse/app/controllers/user-card.js b/app/assets/javascripts/discourse/app/controllers/user-card.js
index 9bc2a40c62..af91ee22d4 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-card.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-card.js
@@ -1,13 +1,13 @@
 import Controller, { inject as controller } from "@ember/controller";
-import DiscourseURL, { userPath, groupPath } from "discourse/lib/url";
+import DiscourseURL, { groupPath, userPath } from "discourse/lib/url";
 
 export default Controller.extend({
   topic: controller(),
 
   actions: {
-    togglePosts(user) {
+    filterPosts(user) {
       const topicController = this.topic;
-      topicController.send("toggleParticipant", user);
+      topicController.send("filterParticipant", user);
     },
 
     showUser(user) {
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 6becdb6d4e..3028bd2ce2 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
@@ -1,23 +1,24 @@
-import I18n from "I18n";
-import { equal, reads } from "@ember/object/computed";
 import Controller from "@ember/controller";
-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";
+import { action } from "@ember/object";
+import { equal, reads } from "@ember/object/computed";
 import bootbox from "bootbox";
+import { INPUT_DELAY } from "discourse-common/config/environment";
+import discourseDebounce from "discourse-common/lib/debounce";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import showModal from "discourse/lib/show-modal";
+import Invite from "discourse/models/invite";
+import I18n from "I18n";
 
 export default Controller.extend({
   user: null,
   model: null,
   filter: null,
-  totalInvites: null,
   invitesCount: null,
   canLoadMore: true,
   invitesLoading: false,
   reinvitedAll: false,
-  rescindedAll: false,
+  removedAll: false,
   searchTerm: null,
 
   init() {
@@ -26,43 +27,44 @@ export default Controller.extend({
   },
 
   @observes("searchTerm")
-  _searchTermChanged: discourseDebounce(function () {
-    Invite.findInvitedBy(
-      this.user,
-      this.filter,
-      this.searchTerm
-    ).then((invites) => this.set("model", invites));
-  }, INPUT_DELAY),
+  _searchTermChanged() {
+    discourseDebounce(
+      this,
+      function () {
+        Invite.findInvitedBy(
+          this.user,
+          this.filter,
+          this.searchTerm
+        ).then((invites) => this.set("model", invites));
+      },
+      INPUT_DELAY
+    );
+  },
 
   inviteRedeemed: equal("filter", "redeemed"),
+  inviteExpired: equal("filter", "expired"),
   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.model.invites.length > 0 &&
       this.currentUser.staff
     );
   },
 
   canInviteToForum: reads("currentUser.can_invite_to_forum"),
   canBulkInvite: reads("currentUser.admin"),
-  canSendInviteLink: reads("currentUser.staff"),
 
-  @discourseComputed("totalInvites", "inviteLinks")
-  showSearch(totalInvites, inviteLinks) {
-    return totalInvites >= 10 && !inviteLinks;
+  @discourseComputed("invitesCount.total")
+  showSearch(invitesCountTotal) {
+    return invitesCountTotal > 0;
   },
 
   @discourseComputed("invitesCount.total", "invitesCount.pending")
   pendingLabel(invitesCountTotal, invitesCountPending) {
-    if (invitesCountTotal > 50) {
+    if (invitesCountTotal > 0) {
       return I18n.t("user.invited.pending_tab_with_count", {
         count: invitesCountPending,
       });
@@ -71,9 +73,20 @@ export default Controller.extend({
     }
   },
 
+  @discourseComputed("invitesCount.total", "invitesCount.expired")
+  expiredLabel(invitesCountTotal, invitesCountExpired) {
+    if (invitesCountTotal > 0) {
+      return I18n.t("user.invited.expired_tab_with_count", {
+        count: invitesCountExpired,
+      });
+    } else {
+      return I18n.t("user.invited.expired_tab");
+    }
+  },
+
   @discourseComputed("invitesCount.total", "invitesCount.redeemed")
   redeemedLabel(invitesCountTotal, invitesCountRedeemed) {
-    if (invitesCountTotal > 50) {
+    if (invitesCountTotal > 0) {
       return I18n.t("user.invited.redeemed_tab_with_count", {
         count: invitesCountRedeemed,
       });
@@ -82,74 +95,83 @@ 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,
+  @action
+  createInvite() {
+    const controller = showModal("create-invite");
+    controller.set("invites", this.model.invites);
+    controller.save({ autogenerated: true });
+  },
+
+  @action
+  createInviteCsv() {
+    showModal("create-invite-bulk");
+  },
+
+  @action
+  editInvite(invite) {
+    const controller = showModal("create-invite");
+    controller.set("showAdvanced", true);
+    controller.setInvite(invite);
+  },
+
+  @action
+  destroyInvite(invite) {
+    invite.destroy();
+    this.model.invites.removeObject(invite);
+  },
+
+  @action
+  destroyAllExpired() {
+    bootbox.confirm(I18n.t("user.invited.remove_all_confirm"), (confirm) => {
+      if (confirm) {
+        Invite.destroyAllExpired()
+          .then(() => {
+            this.set("removedAll", true);
+            this.send("triggerRefresh");
+          })
+          .catch(popupAjaxError);
+      }
+    });
+  },
+
+  @action
+  reinvite(invite) {
+    invite.reinvite();
+    return false;
+  },
+
+  @action
+  reinviteAll() {
+    bootbox.confirm(I18n.t("user.invited.reinvite_all_confirm"), (confirm) => {
+      if (confirm) {
+        Invite.reinviteAll()
+          .then(() => this.set("reinvitedAll", true))
+          .catch(popupAjaxError);
+      }
+    });
+  },
+
+  @action
+  loadMore() {
+    const model = this.model;
+
+    if (this.canLoadMore && !this.invitesLoading) {
+      this.set("invitesLoading", true);
+      Invite.findInvitedBy(
+        this.user,
+        this.filter,
+        this.searchTerm,
+        model.invites.length
+      ).then((invite_model) => {
+        this.set("invitesLoading", false);
+        model.invites.pushObjects(invite_model.invites);
+        if (
+          invite_model.invites.length === 0 ||
+          invite_model.invites.length < this.siteSettings.invites_per_page
+        ) {
+          this.set("canLoadMore", false);
+        }
       });
-    } else {
-      return I18n.t("user.invited.links_tab");
     }
   },
-
-  actions: {
-    rescind(invite) {
-      invite.rescind();
-      return false;
-    },
-
-    rescindAll() {
-      bootbox.confirm(I18n.t("user.invited.rescind_all_confirm"), (confirm) => {
-        if (confirm) {
-          Invite.rescindAll()
-            .then(() => {
-              this.set("rescindedAll", true);
-            })
-            .catch(popupAjaxError);
-        }
-      });
-    },
-
-    reinvite(invite) {
-      invite.reinvite();
-      return false;
-    },
-
-    reinviteAll() {
-      bootbox.confirm(
-        I18n.t("user.invited.reinvite_all_confirm"),
-        (confirm) => {
-          if (confirm) {
-            Invite.reinviteAll()
-              .then(() => this.set("reinvitedAll", true))
-              .catch(popupAjaxError);
-          }
-        }
-      );
-    },
-
-    loadMore() {
-      const model = this.model;
-
-      if (this.canLoadMore && !this.invitesLoading) {
-        this.set("invitesLoading", true);
-        Invite.findInvitedBy(
-          this.user,
-          this.filter,
-          this.searchTerm,
-          model.invites.length
-        ).then((invite_model) => {
-          this.set("invitesLoading", false);
-          model.invites.pushObjects(invite_model.invites);
-          if (
-            invite_model.invites.length === 0 ||
-            invite_model.invites.length < this.siteSettings.invites_per_page
-          ) {
-            this.set("canLoadMore", false);
-          }
-        });
-      }
-    },
-  },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/user-notifications.js b/app/assets/javascripts/discourse/app/controllers/user-notifications.js
index 27da855d1b..3f2b3a4734 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-notifications.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-notifications.js
@@ -1,14 +1,10 @@
 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";
+import { ajax } from "discourse/lib/ajax";
 
 export default Controller.extend({
   application: controller(),
   queryParams: ["filter"],
-  router: service(),
-  currentPath: readOnly("router._router.currentPath"),
   filter: "all",
 
   @observes("model.canLoadMore")
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 ce7663e334..222b819c77 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
@@ -1,15 +1,14 @@
-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";
 import Controller, { inject as controller } from "@ember/controller";
+import { action } from "@ember/object";
+import { alias, and, equal } from "@ember/object/computed";
+import I18n from "I18n";
 import Topic from "discourse/models/topic";
 import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   userTopicsList: controller("user-topics-list"),
   user: controller(),
-  router: service(),
 
   pmView: false,
   viewingSelf: alias("user.viewingSelf"),
@@ -28,19 +27,9 @@ export default Controller.extend({
     return bulkSelectEnabled && selected && selected.length > 0;
   },
 
-  @discourseComputed("hasSelection", "pmView", "archive")
-  canMoveToInbox(hasSelection, pmView, archive) {
-    return hasSelection && (pmView === "archive" || archive);
-  },
-
-  @discourseComputed("hasSelection", "pmView", "archive")
-  canArchive(hasSelection, pmView, archive) {
-    return hasSelection && pmView !== "archive" && !archive;
-  },
-
   bulkOperation(operation) {
     const selected = this.selected;
-    var params = { type: operation };
+    let params = { type: operation };
     if (this.isGroup) {
       params.group = this.groupFilter;
     }
@@ -59,21 +48,14 @@ export default Controller.extend({
     );
   },
 
-  actions: {
-    changeGroupNotificationLevel(notificationLevel) {
-      this.group.setNotification(notificationLevel, this.get("user.model.id"));
-    },
-    archive() {
-      this.bulkOperation("archive_messages");
-    },
-    toInbox() {
-      this.bulkOperation("move_messages_to_inbox");
-    },
-    toggleBulkSelect() {
-      this.toggleProperty("bulkSelectEnabled");
-    },
-    selectAll() {
-      $("input.bulk-select:not(checked)").click();
-    },
+  @action
+  changeGroupNotificationLevel(notificationLevel) {
+    this.group.setNotification(notificationLevel, this.get("user.model.id"));
+  },
+
+  @action
+  toggleBulkSelect() {
+    this.selected.clear();
+    this.toggleProperty("bulkSelectEnabled");
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/user-summary.js b/app/assets/javascripts/discourse/app/controllers/user-summary.js
index 5a2863e2ba..fbfe0985df 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-summary.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-summary.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { alias } from "@ember/object/computed";
 import Controller, { inject } from "@ember/controller";
+import { alias } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 import { durationTiny } from "discourse/lib/formatter";
 
 // should be kept in sync with 'UserSummary::MAX_BADGES'
diff --git a/app/assets/javascripts/discourse/app/controllers/user-topics-list.js b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
index 1480d4633e..1196916ebd 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
@@ -1,5 +1,5 @@
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Controller, { inject as controller } from "@ember/controller";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 // Lists of topics on a user's page.
 export default Controller.extend({
diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index 0376d6a787..5bb235bac7 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -1,19 +1,21 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { isEmpty } from "@ember/utils";
-import { alias, or, gt, not, and } from "@ember/object/computed";
-import EmberObject, { set, computed } from "@ember/object";
-import { inject as service } from "@ember/service";
 import Controller, { inject } from "@ember/controller";
+import EmberObject, { computed, set } from "@ember/object";
+import { and, equal, gt, not, or } from "@ember/object/computed";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import User from "discourse/models/user";
+import I18n from "I18n";
+import bootbox from "bootbox";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { isEmpty } from "@ember/utils";
 import optionalService from "discourse/lib/optional-service";
 import { prioritizeNameInUx } from "discourse/lib/settings";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend(CanCheckEmails, {
-  indexStream: false,
   router: service(),
   userNotifications: inject("user-notifications"),
-  currentPath: alias("router._router.currentPath"),
   adminTools: optionalService(),
 
   @discourseComputed("model.username")
@@ -32,17 +34,19 @@ export default Controller.extend(CanCheckEmails, {
     return !isEmpty(background.toString());
   },
 
+  isSummaryRoute: equal("router.currentRouteName", "user.summary"),
+
   @discourseComputed(
     "model.profile_hidden",
-    "indexStream",
+    "isSummaryRoute",
     "viewingSelf",
     "forceExpand"
   )
-  collapsedInfo(profileHidden, indexStream, viewingSelf, forceExpand) {
+  collapsedInfo(profileHidden, isSummaryRoute, viewingSelf, forceExpand) {
     if (profileHidden) {
       return true;
     }
-    return (!indexStream || viewingSelf) && !forceExpand;
+    return (!isSummaryRoute || viewingSelf) && !forceExpand;
   },
   canMuteOrIgnoreUser: or("model.can_ignore_user", "model.can_mute_user"),
   hasGivenFlags: gt("model.number_of_flags_given", 0),
@@ -52,6 +56,15 @@ export default Controller.extend(CanCheckEmails, {
   hasReceivedWarnings: gt("model.warnings_received_count", 0),
   hasRejectedPosts: gt("model.number_of_rejected_posts", 0),
 
+  collapsedInfoState: computed("collapsedInfo", function () {
+    return {
+      isExpanded: !this.collapsedInfo,
+      icon: this.collapsedInfo ? "angle-double-down" : "angle-double-up",
+      label: this.collapsedInfo ? "expand_profile" : "collapse_profile",
+      action: this.collapsedInfo ? "expandProfile" : "collapseProfile",
+    };
+  }),
+
   showStaffCounters: or(
     "hasGivenFlags",
     "hasFlaggedPosts",
@@ -88,6 +101,11 @@ export default Controller.extend(CanCheckEmails, {
     return viewingSelf;
   },
 
+  @discourseComputed("viewingSelf")
+  showRead(viewingSelf) {
+    return viewingSelf;
+  },
+
   @discourseComputed("viewingSelf", "currentUser.admin")
   showPrivateMessages(viewingSelf, isAdmin) {
     return (
@@ -136,6 +154,13 @@ export default Controller.extend(CanCheckEmails, {
     }
   },
 
+  @discourseComputed("model.primary_group_name")
+  primaryGroup(group) {
+    if (group) {
+      return `group-${group}`;
+    }
+  },
+
   userNotificationLevel: computed(
     "currentUser.ignored_ids",
     "model.ignored",
@@ -168,7 +193,57 @@ export default Controller.extend(CanCheckEmails, {
     },
 
     adminDelete() {
-      this.adminTools.deleteUser(this.get("model.id"));
+      const userId = this.get("model.id");
+      const message = I18n.t("admin.user.delete_confirm");
+      const location = document.location.pathname;
+
+      const performDestroy = (block) => {
+        bootbox.dialog(I18n.t("admin.user.deleting_user"));
+        let formData = { context: location };
+        if (block) {
+          formData["block_email"] = true;
+          formData["block_urls"] = true;
+          formData["block_ip"] = true;
+        }
+        formData["delete_posts"] = true;
+
+        this.adminTools
+          .deleteUser(userId, formData)
+          .then((data) => {
+            if (data.deleted) {
+              document.location = getURL("/admin/users/list/active");
+            } else {
+              bootbox.alert(I18n.t("admin.user.delete_failed"));
+            }
+          })
+          .catch(() => bootbox.alert(I18n.t("admin.user.delete_failed")));
+      };
+
+      const buttons = [
+        {
+          label: I18n.t("composer.cancel"),
+          class: "btn",
+          link: true,
+        },
+        {
+          label:
+            `${iconHTML("exclamation-triangle")} ` +
+            I18n.t("admin.user.delete_and_block"),
+          class: "btn btn-danger",
+          callback: function () {
+            performDestroy(true);
+          },
+        },
+        {
+          label: I18n.t("admin.user.delete_dont_block"),
+          class: "btn btn-primary",
+          callback: function () {
+            performDestroy(false);
+          },
+        },
+      ];
+
+      bootbox.dialog(message, buttons, { classes: "delete-user-modal" });
     },
 
     updateNotificationLevel(level) {
diff --git a/app/assets/javascripts/discourse/app/controllers/users.js b/app/assets/javascripts/discourse/app/controllers/users.js
index 52ec79863d..fe78c4caa2 100644
--- a/app/assets/javascripts/discourse/app/controllers/users.js
+++ b/app/assets/javascripts/discourse/app/controllers/users.js
@@ -1,8 +1,9 @@
-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 { action } from "@ember/object";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { equal } from "@ember/object/computed";
 import { longDate } from "discourse/lib/formatter";
+import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   application: controller(),
@@ -12,6 +13,7 @@ export default Controller.extend({
   asc: null,
   name: "",
   group: null,
+  nameInput: null,
   exclude_usernames: null,
   isLoading: false,
 
@@ -20,6 +22,8 @@ export default Controller.extend({
   loadUsers(params) {
     this.set("isLoading", true);
 
+    this.set("nameInput", params.name);
+
     this.store
       .find("directoryItem", params)
       .then((model) => {
@@ -28,7 +32,6 @@ export default Controller.extend({
           model,
           lastUpdatedAt: lastUpdatedAt ? longDate(lastUpdatedAt) : null,
           period: params.period,
-          nameInput: params.name,
         });
       })
       .finally(() => {
@@ -36,19 +39,22 @@ export default Controller.extend({
       });
   },
 
-  @observes("nameInput")
-  _setName: discourseDebounce(function () {
-    this.set("name", this.nameInput);
-  }, 500),
+  @action
+  onFilterChanged(filter) {
+    discourseDebounce(this, this._setName, filter, 500);
+  },
+
+  _setName(name) {
+    this.set("name", name);
+  },
 
   @observes("model.canLoadMore")
-  _showFooter: function () {
+  _showFooter() {
     this.set("application.showFooter", !this.get("model.canLoadMore"));
   },
 
-  actions: {
-    loadMore() {
-      this.model.loadMore();
-    },
+  @action
+  loadMore() {
+    this.model.loadMore();
   },
 });
diff --git a/app/assets/javascripts/discourse/app/helpers/application.js b/app/assets/javascripts/discourse/app/helpers/application.js
index 98341b942f..629a20648a 100644
--- a/app/assets/javascripts/discourse/app/helpers/application.js
+++ b/app/assets/javascripts/discourse/app/helpers/application.js
@@ -1,12 +1,12 @@
-import I18n from "I18n";
-import { registerUnbound } from "discourse-common/lib/helpers";
 import {
-  longDate,
   autoUpdatingRelativeAge,
+  longDate,
   number,
 } from "discourse/lib/formatter";
-import { htmlSafe } from "@ember/template";
+import I18n from "I18n";
 import { escapeExpression } from "discourse/lib/utilities";
+import { htmlSafe } from "@ember/template";
+import { registerUnbound } from "discourse-common/lib/helpers";
 
 registerUnbound("raw-date", (dt) => htmlSafe(longDate(new Date(dt))));
 
diff --git a/app/assets/javascripts/discourse/app/helpers/bound-avatar-template.js b/app/assets/javascripts/discourse/app/helpers/bound-avatar-template.js
index b08e483b2e..8e054d8ce5 100644
--- a/app/assets/javascripts/discourse/app/helpers/bound-avatar-template.js
+++ b/app/assets/javascripts/discourse/app/helpers/bound-avatar-template.js
@@ -1,6 +1,6 @@
-import { isEmpty } from "@ember/utils";
-import { htmlHelper } from "discourse-common/lib/helpers";
 import { avatarImg } from "discourse/lib/utilities";
+import { htmlHelper } from "discourse-common/lib/helpers";
+import { isEmpty } from "@ember/utils";
 
 export default htmlHelper((avatarTemplate, size) => {
   if (isEmpty(avatarTemplate)) {
diff --git a/app/assets/javascripts/discourse/app/helpers/bound-avatar.js b/app/assets/javascripts/discourse/app/helpers/bound-avatar.js
index 6504dc1c08..627ca00017 100644
--- a/app/assets/javascripts/discourse/app/helpers/bound-avatar.js
+++ b/app/assets/javascripts/discourse/app/helpers/bound-avatar.js
@@ -1,8 +1,8 @@
-import { get } from "@ember/object";
-import { isEmpty } from "@ember/utils";
-import { htmlHelper } from "discourse-common/lib/helpers";
-import { avatarImg } from "discourse/lib/utilities";
 import { addExtraUserClasses } from "discourse/helpers/user-avatar";
+import { avatarImg } from "discourse/lib/utilities";
+import { get } from "@ember/object";
+import { htmlHelper } from "discourse-common/lib/helpers";
+import { isEmpty } from "@ember/utils";
 
 export default htmlHelper((user, size) => {
   if (isEmpty(user)) {
diff --git a/app/assets/javascripts/discourse/app/helpers/bound-category-link.js b/app/assets/javascripts/discourse/app/helpers/bound-category-link.js
index 4c86867061..bd62003221 100644
--- a/app/assets/javascripts/discourse/app/helpers/bound-category-link.js
+++ b/app/assets/javascripts/discourse/app/helpers/bound-category-link.js
@@ -1,4 +1,4 @@
-import { htmlHelper } from "discourse-common/lib/helpers";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
+import { htmlHelper } from "discourse-common/lib/helpers";
 
 export default htmlHelper(categoryLinkHTML);
diff --git a/app/assets/javascripts/discourse/app/helpers/category-link.js b/app/assets/javascripts/discourse/app/helpers/category-link.js
index b26560a008..289b0407d9 100644
--- a/app/assets/javascripts/discourse/app/helpers/category-link.js
+++ b/app/assets/javascripts/discourse/app/helpers/category-link.js
@@ -1,13 +1,13 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import { get } from "@ember/object";
 import { helperContext, registerUnbound } from "discourse-common/lib/helpers";
-import { isRTL } from "discourse/lib/text-direction";
-import { iconHTML } from "discourse-common/lib/icon-library";
 import Category from "discourse/models/category";
+import I18n from "I18n";
 import Site from "discourse/models/site";
 import { escapeExpression } from "discourse/lib/utilities";
+import { get } from "@ember/object";
+import getURL from "discourse-common/lib/get-url";
 import { htmlSafe } from "@ember/template";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { isRTL } from "discourse/lib/text-direction";
 
 let _renderer = defaultCategoryLinkRenderer;
 
@@ -16,7 +16,7 @@ export function replaceCategoryLinkRenderer(fn) {
 }
 
 function categoryStripe(color, classes) {
-  var style = color ? "style='background-color: #" + color + ";'" : "";
+  let style = color ? "style='background-color: #" + color + ";'" : "";
   return "<span class='" + classes + "' " + style + "></span>";
 }
 
@@ -65,7 +65,7 @@ export function categoryBadgeHTML(category, opts) {
 }
 
 export function categoryLinkHTML(category, options) {
-  var categoryOptions = {};
+  let categoryOptions = {};
 
   // TODO: This is a compatibility layer with the old helper structure.
   // Can be removed once we migrate to `registerUnbound` fully
diff --git a/app/assets/javascripts/discourse/app/helpers/cold-age-class.js b/app/assets/javascripts/discourse/app/helpers/cold-age-class.js
index 06f269e3b6..ff696982cc 100644
--- a/app/assets/javascripts/discourse/app/helpers/cold-age-class.js
+++ b/app/assets/javascripts/discourse/app/helpers/cold-age-class.js
@@ -1,4 +1,4 @@
-import { registerUnbound, helperContext } from "discourse-common/lib/helpers";
+import { helperContext, registerUnbound } from "discourse-common/lib/helpers";
 
 function daysSinceEpoch(dt) {
   // 1000 * 60 * 60 * 24 = days since epoch
diff --git a/app/assets/javascripts/discourse/app/helpers/dash-if-empty.js b/app/assets/javascripts/discourse/app/helpers/dash-if-empty.js
index b6741cad28..502998ee87 100644
--- a/app/assets/javascripts/discourse/app/helpers/dash-if-empty.js
+++ b/app/assets/javascripts/discourse/app/helpers/dash-if-empty.js
@@ -1,4 +1,4 @@
-import { isEmpty } from "@ember/utils";
 import { htmlHelper } from "discourse-common/lib/helpers";
+import { isEmpty } from "@ember/utils";
 
 export default htmlHelper((str) => (isEmpty(str) ? "&mdash;" : str));
diff --git a/app/assets/javascripts/discourse/app/helpers/dir-span.js b/app/assets/javascripts/discourse/app/helpers/dir-span.js
index e2fb6f9f48..022b2de52f 100644
--- a/app/assets/javascripts/discourse/app/helpers/dir-span.js
+++ b/app/assets/javascripts/discourse/app/helpers/dir-span.js
@@ -1,6 +1,6 @@
-import { registerUnbound, helperContext } from "discourse-common/lib/helpers";
-import { isRTL } from "discourse/lib/text-direction";
+import { helperContext, registerUnbound } from "discourse-common/lib/helpers";
 import { htmlSafe } from "@ember/template";
+import { isRTL } from "discourse/lib/text-direction";
 
 function setDir(text) {
   let content = text ? text : "";
diff --git a/app/assets/javascripts/discourse/app/helpers/discourse-tag.js b/app/assets/javascripts/discourse/app/helpers/discourse-tag.js
index 21780387f1..09cb84518d 100644
--- a/app/assets/javascripts/discourse/app/helpers/discourse-tag.js
+++ b/app/assets/javascripts/discourse/app/helpers/discourse-tag.js
@@ -1,6 +1,6 @@
+import { htmlSafe } from "@ember/template";
 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 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 9b23365208..ea9a82a304 100644
--- a/app/assets/javascripts/discourse/app/helpers/discourse-tags.js
+++ b/app/assets/javascripts/discourse/app/helpers/discourse-tags.js
@@ -1,6 +1,6 @@
+import { htmlSafe } from "@ember/template";
 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 htmlSafe(renderTags(topic, params));
diff --git a/app/assets/javascripts/discourse/app/helpers/editable-value.js b/app/assets/javascripts/discourse/app/helpers/editable-value.js
index ae67cedf5e..32763daaf4 100644
--- a/app/assets/javascripts/discourse/app/helpers/editable-value.js
+++ b/app/assets/javascripts/discourse/app/helpers/editable-value.js
@@ -1,5 +1,5 @@
-import { get } from "@ember/object";
 import Helper from "@ember/component/helper";
+import { get } from "@ember/object";
 
 export function formatCurrency([reviewable, fieldId]) {
   // The field `category_id` corresponds to `category`
diff --git a/app/assets/javascripts/discourse/app/helpers/format-age.js b/app/assets/javascripts/discourse/app/helpers/format-age.js
index 21bfeb423b..0eef634130 100644
--- a/app/assets/javascripts/discourse/app/helpers/format-age.js
+++ b/app/assets/javascripts/discourse/app/helpers/format-age.js
@@ -1,6 +1,6 @@
 import { autoUpdatingRelativeAge, durationTiny } from "discourse/lib/formatter";
-import { registerUnbound } from "discourse-common/lib/helpers";
 import { htmlSafe } from "@ember/template";
+import { registerUnbound } from "discourse-common/lib/helpers";
 
 registerUnbound("format-age", function (dt) {
   dt = new Date(dt);
diff --git a/app/assets/javascripts/discourse/app/helpers/format-date.js b/app/assets/javascripts/discourse/app/helpers/format-date.js
index a68468076b..1798b23e02 100644
--- a/app/assets/javascripts/discourse/app/helpers/format-date.js
+++ b/app/assets/javascripts/discourse/app/helpers/format-date.js
@@ -1,13 +1,13 @@
-import { registerUnbound } from "discourse-common/lib/helpers";
 import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
 import { htmlSafe } from "@ember/template";
+import { registerUnbound } from "discourse-common/lib/helpers";
 
 /**
   Display logic for dates. It is unbound in Ember but will use jQuery to
   update the dates on a regular interval.
 **/
 registerUnbound("format-date", function (val, params) {
-  var leaveAgo,
+  let leaveAgo,
     format = "medium",
     title = true;
 
@@ -22,7 +22,7 @@ registerUnbound("format-date", function (val, params) {
   }
 
   if (val) {
-    var date = new Date(val);
+    let date = new Date(val);
     return htmlSafe(
       autoUpdatingRelativeAge(date, {
         format: format,
diff --git a/app/assets/javascripts/discourse/app/helpers/format-username.js b/app/assets/javascripts/discourse/app/helpers/format-username.js
index 2e6904a799..6388a900fb 100644
--- a/app/assets/javascripts/discourse/app/helpers/format-username.js
+++ b/app/assets/javascripts/discourse/app/helpers/format-username.js
@@ -1,4 +1,4 @@
-import { registerUnbound } from "discourse-common/lib/helpers";
 import { formatUsername } from "discourse/lib/utilities";
+import { registerUnbound } from "discourse-common/lib/helpers";
 
 export default registerUnbound("format-username", formatUsername);
diff --git a/app/assets/javascripts/discourse/app/helpers/icon-or-image.js b/app/assets/javascripts/discourse/app/helpers/icon-or-image.js
index b8b02bdf00..3ad6d53604 100644
--- a/app/assets/javascripts/discourse/app/helpers/icon-or-image.js
+++ b/app/assets/javascripts/discourse/app/helpers/icon-or-image.js
@@ -1,6 +1,6 @@
-import { isEmpty } from "@ember/utils";
+import { convertIconClass, iconHTML } from "discourse-common/lib/icon-library";
 import { htmlHelper } from "discourse-common/lib/helpers";
-import { iconHTML, convertIconClass } from "discourse-common/lib/icon-library";
+import { isEmpty } from "@ember/utils";
 
 export default htmlHelper(function ({ icon, image }) {
   if (!isEmpty(image)) {
diff --git a/app/assets/javascripts/discourse/app/helpers/inline-date.js b/app/assets/javascripts/discourse/app/helpers/inline-date.js
index 16adc0c068..166ca2ad22 100644
--- a/app/assets/javascripts/discourse/app/helpers/inline-date.js
+++ b/app/assets/javascripts/discourse/app/helpers/inline-date.js
@@ -1,5 +1,5 @@
-import { relativeAge } from "discourse/lib/formatter";
 import { registerHelper } from "discourse-common/lib/helpers";
+import { relativeAge } from "discourse/lib/formatter";
 
 registerHelper("inline-date", function ([dt]) {
   // TODO: Remove this in 1.13 or greater
diff --git a/app/assets/javascripts/discourse/app/helpers/loading-spinner.js b/app/assets/javascripts/discourse/app/helpers/loading-spinner.js
index 5f15403d05..5188c61990 100644
--- a/app/assets/javascripts/discourse/app/helpers/loading-spinner.js
+++ b/app/assets/javascripts/discourse/app/helpers/loading-spinner.js
@@ -1,13 +1,13 @@
 import { htmlHelper } from "discourse-common/lib/helpers";
 
 function renderSpinner(cssClass) {
-  var html = "<div class='spinner";
+  let html = "<div class='spinner";
   if (cssClass) {
     html += " " + cssClass;
   }
   return html + "'></div>";
 }
-var spinnerHTML = renderSpinner();
+let spinnerHTML = renderSpinner();
 
 export default htmlHelper((params) => {
   const hash = params.hash;
diff --git a/app/assets/javascripts/discourse/app/helpers/node.js b/app/assets/javascripts/discourse/app/helpers/node.js
index 79f8f73eae..5bc02d6b88 100644
--- a/app/assets/javascripts/discourse/app/helpers/node.js
+++ b/app/assets/javascripts/discourse/app/helpers/node.js
@@ -1,5 +1,5 @@
+import { longDate, number, relativeAge } from "discourse/lib/formatter";
 import { h } from "virtual-dom";
-import { relativeAge, longDate, number } from "discourse/lib/formatter";
 
 export function dateNode(dt) {
   if (typeof dt === "string") {
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 52901c500f..18ba68c6fa 100644
--- a/app/assets/javascripts/discourse/app/helpers/raw-plugin-outlet.js
+++ b/app/assets/javascripts/discourse/app/helpers/raw-plugin-outlet.js
@@ -1,6 +1,6 @@
-import { rawConnectorsFor } from "discourse/lib/plugin-connectors";
 import RawHandlebars from "discourse-common/lib/raw-handlebars";
 import { htmlSafe } from "@ember/template";
+import { rawConnectorsFor } from "discourse/lib/plugin-connectors";
 
 RawHandlebars.registerHelper("raw-plugin-outlet", function (args) {
   const connectors = rawConnectorsFor(args.hash.name);
diff --git a/app/assets/javascripts/discourse/app/helpers/raw.js b/app/assets/javascripts/discourse/app/helpers/raw.js
index 0c1ba6cf53..c9dd07f8b4 100644
--- a/app/assets/javascripts/discourse/app/helpers/raw.js
+++ b/app/assets/javascripts/discourse/app/helpers/raw.js
@@ -1,6 +1,21 @@
-import { registerUnbound, helperContext } from "discourse-common/lib/helpers";
+import { helperContext, registerUnbound } from "discourse-common/lib/helpers";
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
 import { htmlSafe } from "@ember/template";
+import { RUNTIME_OPTIONS } from "discourse-common/lib/raw-handlebars-helpers";
+import { buildResolver } from "discourse-common/resolver";
+
+let resolver;
+
+function lookupView(templateName) {
+  if (!resolver) {
+    resolver = buildResolver("discourse").create();
+  }
+
+  return resolver.customResolve({
+    type: "raw-view",
+    fullNameWithoutType: templateName,
+  });
+}
 
 function renderRaw(ctx, template, templateName, params) {
   params = jQuery.extend({}, params);
@@ -8,12 +23,10 @@ function renderRaw(ctx, template, templateName, params) {
 
   let context = helperContext();
   if (!params.view) {
-    const module = `discourse/raw-views/${templateName}`;
-    if (requirejs.entries[module]) {
-      const viewClass = requirejs(module, null, null, true);
-      if (viewClass && viewClass.default) {
-        params.view = viewClass.default.create(params, context);
-      }
+    const viewClass = lookupView(templateName);
+
+    if (viewClass) {
+      params.view = viewClass.create(params, context);
     }
 
     if (!params.view) {
@@ -21,7 +34,7 @@ function renderRaw(ctx, template, templateName, params) {
     }
   }
 
-  return htmlSafe(template(params));
+  return htmlSafe(template(params, RUNTIME_OPTIONS));
 }
 
 registerUnbound("raw", function (templateName, params) {
diff --git a/app/assets/javascripts/discourse/app/helpers/replace-emoji.js b/app/assets/javascripts/discourse/app/helpers/replace-emoji.js
index 56f8c6e2f8..3109cf2900 100644
--- a/app/assets/javascripts/discourse/app/helpers/replace-emoji.js
+++ b/app/assets/javascripts/discourse/app/helpers/replace-emoji.js
@@ -1,6 +1,6 @@
-import { registerUnbound } from "discourse-common/lib/helpers";
 import { emojiUnescape } from "discourse/lib/text";
 import { htmlSafe } from "@ember/template";
+import { registerUnbound } from "discourse-common/lib/helpers";
 
 registerUnbound("replace-emoji", (text, options) => {
   return htmlSafe(emojiUnescape(text, options));
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 85820f729f..0bd3e1aa81 100644
--- a/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
+++ b/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
@@ -1,7 +1,7 @@
+import { EDITED } from "discourse/models/reviewable-history";
 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";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
 export default htmlHelper(function (rh) {
diff --git a/app/assets/javascripts/discourse/app/helpers/reviewable-status.js b/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
index 3eaebe847e..4fe4ef2445 100644
--- a/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
+++ b/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
@@ -1,13 +1,13 @@
+import {
+  APPROVED,
+  DELETED,
+  IGNORED,
+  PENDING,
+  REJECTED,
+} from "discourse/models/reviewable";
 import I18n from "I18n";
 import { htmlHelper } from "discourse-common/lib/helpers";
 import { iconHTML } from "discourse-common/lib/icon-library";
-import {
-  PENDING,
-  APPROVED,
-  REJECTED,
-  IGNORED,
-  DELETED,
-} from "discourse/models/reviewable";
 
 function dataFor(status) {
   switch (status) {
diff --git a/app/assets/javascripts/discourse/app/helpers/shorten-url.js b/app/assets/javascripts/discourse/app/helpers/shorten-url.js
index 5b7012a339..4a35906190 100644
--- a/app/assets/javascripts/discourse/app/helpers/shorten-url.js
+++ b/app/assets/javascripts/discourse/app/helpers/shorten-url.js
@@ -1,7 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 
 registerUnbound("shorten-url", function (url) {
-  var matches = url.match(/\//g);
+  let matches = url.match(/\//g);
 
   if (matches && matches.length === 3) {
     url = url.replace(/\/$/, "");
diff --git a/app/assets/javascripts/discourse/app/helpers/theme-helpers.js b/app/assets/javascripts/discourse/app/helpers/theme-helpers.js
index 354d69d1d0..477b89b1b0 100644
--- a/app/assets/javascripts/discourse/app/helpers/theme-helpers.js
+++ b/app/assets/javascripts/discourse/app/helpers/theme-helpers.js
@@ -1,6 +1,7 @@
+import { registerUnbound } from "discourse-common/lib/helpers";
 import I18n from "I18n";
-import { helperContext, registerUnbound } from "discourse-common/lib/helpers";
 import deprecated from "discourse-common/lib/deprecated";
+import { getSetting as getThemeSetting } from "discourse/lib/theme-settings-store";
 
 registerUnbound("theme-i18n", (themeId, key, params) => {
   return I18n.t(`theme_translations.${themeId}.${key}`, params);
@@ -18,5 +19,6 @@ registerUnbound("theme-setting", (themeId, key, hash) => {
       { since: "v2.2.0.beta8", dropFrom: "v2.3.0" }
     );
   }
-  return helperContext().themeSettings.getSetting(themeId, key);
+
+  return getThemeSetting(themeId, key);
 });
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 31f3e8cdaa..44df2cb02f 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,6 @@
+import { htmlSafe } from "@ember/template";
 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 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 dcc9f6c2e8..2a8bb170e8 100644
--- a/app/assets/javascripts/discourse/app/helpers/topic-link.js
+++ b/app/assets/javascripts/discourse/app/helpers/topic-link.js
@@ -1,5 +1,5 @@
-import { registerUnbound } from "discourse-common/lib/helpers";
 import { htmlSafe } from "@ember/template";
+import { registerUnbound } from "discourse-common/lib/helpers";
 
 registerUnbound("topic-link", (topic, args) => {
   const title = topic.get("fancyTitle");
diff --git a/app/assets/javascripts/discourse/app/helpers/user-avatar.js b/app/assets/javascripts/discourse/app/helpers/user-avatar.js
index 85cb4d1398..20af1a2c02 100644
--- a/app/assets/javascripts/discourse/app/helpers/user-avatar.js
+++ b/app/assets/javascripts/discourse/app/helpers/user-avatar.js
@@ -1,8 +1,9 @@
-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 I18n from "I18n";
+import { get } from "@ember/object";
 import { htmlSafe } from "@ember/template";
+import { prioritizeNameInUx } from "discourse/lib/settings";
+import { registerUnbound } from "discourse-common/lib/helpers";
 
 let _customAvatarHelpers;
 
@@ -59,7 +60,10 @@ function renderAvatar(user, options) {
         // if a description has been provided
         if (description && description.length > 0) {
           // preprend the username before the description
-          title = displayName + " - " + description;
+          title = I18n.t("user.avatar.name_and_description", {
+            name: displayName,
+            description,
+          });
         }
       }
     }
diff --git a/app/assets/javascripts/discourse/app/helpers/user-status.js b/app/assets/javascripts/discourse/app/helpers/user-status.js
index 1f84c11a0d..da2f3bd7d2 100644
--- a/app/assets/javascripts/discourse/app/helpers/user-status.js
+++ b/app/assets/javascripts/discourse/app/helpers/user-status.js
@@ -1,7 +1,7 @@
 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";
+import { htmlHelper } from "discourse-common/lib/helpers";
+import { iconHTML } from "discourse-common/lib/icon-library";
 
 export default htmlHelper((user, args) => {
   if (!user) {
diff --git a/app/assets/javascripts/discourse/app/helpers/value-entered.js b/app/assets/javascripts/discourse/app/helpers/value-entered.js
new file mode 100644
index 0000000000..4a6907ae23
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/helpers/value-entered.js
@@ -0,0 +1,11 @@
+import { registerUnbound } from "discourse-common/lib/helpers";
+
+registerUnbound("value-entered", function (value) {
+  if (!value) {
+    return "";
+  } else if (value.length > 0) {
+    return "value-entered";
+  } else {
+    return "";
+  }
+});
diff --git a/app/assets/javascripts/discourse/app/index.html b/app/assets/javascripts/discourse/app/index.html
new file mode 100644
index 0000000000..848e92b3d1
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/index.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+
+<bootstrap-content key="html-tag">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Discourse - Ember CLI</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <bootstrap-content key="before-script-load">
+    {{content-for "before-script-load"}}
+
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/discourse.js"></script>
+    <script src="{{rootURL}}assets/admin.js"></script>
+
+    <bootstrap-content key="head">
+    {{content-for "head"}}
+  </head>
+  <body>
+    <bootstrap-content key="body">
+    {{content-for "body"}}
+
+    <section id='main'>
+    </section>
+
+    <div id='offscreen-content'>
+    </div>
+
+    <bootstrap-content key="hidden-login-form">
+    <bootstrap-content key="preloaded">
+
+    <script src="{{rootURL}}assets/scripts/start-app.js"></script>
+    <script src="{{rootURL}}assets/scripts/discourse-boot.js"></script>
+
+    <bootstrap-content key="body-footer">
+    {{content-for "body-footer"}}
+  </body>
+</html>
diff --git a/app/assets/javascripts/discourse/app/initializers/animated-images.js b/app/assets/javascripts/discourse/app/initializers/animated-images.js
new file mode 100644
index 0000000000..d19331b255
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/initializers/animated-images.js
@@ -0,0 +1,144 @@
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { prefersReducedMotion } from "discourse/lib/utilities";
+import { withPluginApi } from "discourse/lib/plugin-api";
+
+let _gifClickHandlers = {};
+
+function _pauseAnimation(img, opts = {}) {
+  let canvas = document.createElement("canvas");
+  canvas.width = img.width;
+  canvas.height = img.height;
+  canvas.getContext("2d").drawImage(img, 0, 0, img.width, img.height);
+  canvas.setAttribute("aria-hidden", "true");
+  canvas.setAttribute("role", "presentation");
+
+  if (opts.manualPause) {
+    img.classList.add("manually-paused");
+  }
+  img.parentNode.classList.add("paused-animated-image");
+  img.parentNode.insertBefore(canvas, img);
+}
+
+function _resumeAnimation(img) {
+  if (img.previousSibling && img.previousSibling.nodeName === "CANVAS") {
+    img.previousSibling.remove();
+  }
+  img.parentNode.classList.remove("paused-animated-image");
+}
+
+function animatedImgs() {
+  return document.querySelectorAll("img.animated:not(.manually-paused)");
+}
+
+export default {
+  name: "animated-images-pause-on-click",
+
+  initialize() {
+    withPluginApi("0.8.7", (api) => {
+      function _cleanUp() {
+        Object.values(_gifClickHandlers || {}).forEach((handler) => {
+          handler.removeEventListener("click", _handleEvent);
+          handler.removeEventListener("load", _handleEvent);
+        });
+
+        _gifClickHandlers = {};
+      }
+
+      function _handleEvent(event) {
+        const img = event.target;
+        if (img && !img.previousSibling) {
+          _pauseAnimation(img, { manualPause: true });
+        } else {
+          _resumeAnimation(img);
+        }
+      }
+
+      function _attachCommands(post, helper) {
+        if (!helper) {
+          return;
+        }
+
+        let images = post.querySelectorAll("img.animated");
+
+        images.forEach((img) => {
+          // skip for edge case of multiple animated images in same block
+          if (img.parentNode.querySelectorAll("img").length > 1) {
+            return;
+          }
+
+          if (_gifClickHandlers[img.src]) {
+            _gifClickHandlers[img.src].removeEventListener(
+              "click",
+              _handleEvent
+            );
+            _gifClickHandlers[img.src].removeEventListener(
+              "load",
+              _handleEvent
+            );
+            delete _gifClickHandlers[img.src];
+          }
+
+          _gifClickHandlers[img.src] = img;
+          img.addEventListener("click", _handleEvent, false);
+
+          if (prefersReducedMotion()) {
+            img.addEventListener("load", _handleEvent, false);
+          }
+
+          const wrapper = document.createElement("div"),
+            overlay = document.createElement("div");
+
+          img.parentNode.insertBefore(wrapper, img);
+          wrapper.classList.add("pausable-animated-image");
+          wrapper.appendChild(img);
+
+          overlay.classList.add("animated-image-overlay");
+          overlay.setAttribute("aria-hidden", "true");
+          overlay.setAttribute("role", "presentation");
+          overlay.innerHTML = `${iconHTML("pause")}${iconHTML("play")}`;
+          wrapper.appendChild(overlay);
+        });
+      }
+
+      api.decorateCookedElement(_attachCommands, {
+        onlyStream: true,
+        id: "animated-images-pause-on-click",
+      });
+
+      api.cleanupStream(_cleanUp);
+
+      // paused on load when prefers-reduced-motion is active, no need for blur/focus events
+      if (!prefersReducedMotion()) {
+        window.addEventListener("blur", this.blurEvent);
+        window.addEventListener("focus", this.focusEvent);
+      }
+    });
+  },
+
+  blurEvent() {
+    animatedImgs().forEach((img) => {
+      if (
+        img.parentNode.querySelectorAll("img").length === 1 &&
+        !img.previousSibling
+      ) {
+        _pauseAnimation(img);
+      }
+    });
+  },
+
+  focusEvent() {
+    animatedImgs().forEach((img) => {
+      if (
+        img.parentNode.querySelectorAll("img").length === 1 &&
+        img.previousSibling
+      ) {
+        _resumeAnimation(img);
+      }
+    });
+  },
+
+  teardown() {
+    window.removeEventListener("blur", this.blurEvent);
+    window.removeEventListener("focus", this.focusEvent);
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/asset-version.js b/app/assets/javascripts/discourse/app/initializers/asset-version.js
deleted file mode 100644
index 203f6d4af8..0000000000
--- a/app/assets/javascripts/discourse/app/initializers/asset-version.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import I18n from "I18n";
-import { later } from "@ember/runloop";
-import bootbox from "bootbox";
-
-//  Subscribe to "asset-version" change events via the Message Bus
-export default {
-  name: "asset-version",
-  after: "message-bus",
-
-  initialize(container) {
-    let timeout;
-    const messageBus = container.lookup("message-bus:main");
-    if (!messageBus) {
-      return;
-    }
-
-    let session = container.lookup("session:main");
-    messageBus.subscribe("/refresh_client", () => {
-      session.requiresRefresh = true;
-    });
-
-    messageBus.subscribe("/global/asset-version", function (version) {
-      if (session.assetVersion !== version) {
-        session.requiresRefresh = true;
-      }
-
-      if (!timeout && session.requiresRefresh) {
-        // Since we can do this transparently for people browsing the forum
-        // hold back the message 24 hours.
-        timeout = later(() => {
-          bootbox.confirm(I18n.t("assets_changed_confirm"), function (result) {
-            if (result) {
-              document.location.reload();
-            }
-          });
-        }, 1000 * 60 * 24 * 60);
-      }
-    });
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/initializers/auth-complete.js b/app/assets/javascripts/discourse/app/initializers/auth-complete.js
index 261f51e41b..13029e4044 100644
--- a/app/assets/javascripts/discourse/app/initializers/auth-complete.js
+++ b/app/assets/javascripts/discourse/app/initializers/auth-complete.js
@@ -13,10 +13,14 @@ export default {
 
     if (lastAuthResult) {
       const router = container.lookup("router:main");
+
       router.one("didTransition", () => {
+        const controllerName =
+          router.currentPath === "invites.show" ? "invites-show" : "login";
+
         next(() => {
-          let loginController = container.lookup("controller:login");
-          loginController.authenticationComplete(JSON.parse(lastAuthResult));
+          let controller = container.lookup(`controller:${controllerName}`);
+          controller.authenticationComplete(JSON.parse(lastAuthResult));
         });
       });
     }
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 b08e3a291f..fa2ca51902 100644
--- a/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
+++ b/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
@@ -1,10 +1,10 @@
 import {
-  registerHelpers,
   createHelperContext,
+  registerHelpers,
 } from "discourse-common/lib/helpers";
+import Handlebars from "handlebars";
 import RawHandlebars from "discourse-common/lib/raw-handlebars";
 import { registerRawHelpers } from "discourse-common/lib/raw-handlebars-helpers";
-import Handlebars from "handlebars";
 import { setOwner } from "@ember/application";
 
 export function autoLoadModules(container, registry) {
@@ -19,7 +19,6 @@ export function autoLoadModules(container, registry) {
 
   let context = {
     siteSettings: container.lookup("site-settings:main"),
-    themeSettings: container.lookup("service:theme-settings"),
     keyValueStore: container.lookup("key-value-store:main"),
     capabilities: container.lookup("capabilities:main"),
     currentUser: container.lookup("current-user:main"),
diff --git a/app/assets/javascripts/discourse/app/initializers/click-interceptor.js b/app/assets/javascripts/discourse/app/initializers/click-interceptor.js
index ca7ec48380..9f8adfd7a7 100644
--- a/app/assets/javascripts/discourse/app/initializers/click-interceptor.js
+++ b/app/assets/javascripts/discourse/app/initializers/click-interceptor.js
@@ -1,5 +1,5 @@
-import interceptClick from "discourse/lib/intercept-click";
 import DiscourseURL from "discourse/lib/url";
+import interceptClick from "discourse/lib/intercept-click";
 
 export default {
   name: "click-interceptor",
diff --git a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
index a3326d2b47..b11925807c 100644
--- a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
+++ b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
@@ -1,14 +1,14 @@
-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";
+import { Promise } from "rsvp";
 import { guidFor } from "@ember/object/internals";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 // http://github.com/feross/clipboard-copy
 function clipboardCopy(text) {
-  // Use the Async Clipboard API when available. Requires a secure browsing
-  // context (i.e. HTTPS)
+  // 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
@@ -63,6 +63,8 @@ export default {
   name: "copy-codeblocks",
 
   initialize(container) {
+    const siteSettings = container.lookup("site-settings:main");
+
     withPluginApi("0.8.7", (api) => {
       function _cleanUp() {
         Object.values(_copyCodeblocksClickHandlers || {}).forEach((handler) =>
@@ -86,7 +88,15 @@ export default {
         const code = button.nextSibling;
 
         if (code) {
-          clipboardCopy(code.innerText.trim()).then(() => {
+          // replace any weird whitespace characters with a proper '\u20' whitespace
+          const text = code.innerText
+            .replace(
+              /[\f\v\u00a0\u1680\u2000-\u200a\u202f\u205f\u3000\ufeff]/g,
+              " "
+            )
+            .trim();
+
+          clipboardCopy(text).then(() => {
             button.classList.add("copied");
             const state = button.innerHTML;
             button.innerHTML = I18n.t("copy_codeblock.copied");
@@ -112,7 +122,6 @@ export default {
           return;
         }
 
-        const siteSettings = container.lookup("site-settings:main");
         if (!siteSettings.show_copy_button_on_codeblocks) {
           return;
         }
diff --git a/app/assets/javascripts/discourse/app/initializers/d-popover.js b/app/assets/javascripts/discourse/app/initializers/d-popover.js
index 9564f81aee..d3a96f2490 100644
--- a/app/assets/javascripts/discourse/app/initializers/d-popover.js
+++ b/app/assets/javascripts/discourse/app/initializers/d-popover.js
@@ -1,7 +1,7 @@
 import {
-  showPopover,
-  hidePopover,
   POPOVER_SELECTORS,
+  hidePopover,
+  showPopover,
 } from "discourse/lib/d-popover";
 
 export default {
diff --git a/app/assets/javascripts/discourse/app/initializers/ember-link-component-extension.js b/app/assets/javascripts/discourse/app/initializers/ember-link-component-extension.js
new file mode 100644
index 0000000000..807b58e39f
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/initializers/ember-link-component-extension.js
@@ -0,0 +1,9 @@
+export default {
+  name: "ember-link-component-extensions",
+
+  initialize() {
+    Ember.LinkComponent.reopen({
+      attributeBindings: ["name"],
+    });
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/enable-emoji.js b/app/assets/javascripts/discourse/app/initializers/enable-emoji.js
index 4a056a2532..965ff5a82c 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 "discourse/lib/preload-store";
+import { registerEmoji } from "pretty-text/emoji";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 export default {
   name: "enable-emoji",
diff --git a/app/assets/javascripts/discourse/app/initializers/ensure-max-image-dimensions.js b/app/assets/javascripts/discourse/app/initializers/ensure-max-image-dimensions.js
index dd08190e66..66f6b92519 100644
--- a/app/assets/javascripts/discourse/app/initializers/ensure-max-image-dimensions.js
+++ b/app/assets/javascripts/discourse/app/initializers/ensure-max-image-dimensions.js
@@ -16,15 +16,18 @@ export default {
 
     const site = container.lookup("site:main");
     if (site.mobileView) {
-      width = $(window).width() - 20;
+      width = window.innerWidth - 20;
     }
 
-    const style = "max-width:" + width + "px;" + "max-height:" + height + "px;";
+    let styles = `max-width:${width}px; max-height:${height}px;`;
 
-    $(
-      '<style id="image-sizing-hack">#reply-control .d-editor-preview img:not(.thumbnail):not(.ytp-thumbnail-image), .cooked img:not(.thumbnail):not(.ytp-thumbnail-image) {' +
-        style +
-        "}</style>"
-    ).appendTo("head");
+    if (siteSettings.disable_image_size_calculations) {
+      styles = "max-width: 100%; height: auto;";
+    }
+
+    const styleTag = document.createElement("style");
+    styleTag.id = "image-sizing-hack";
+    styleTag.innerHTML = `#reply-control .d-editor-preview img:not(.thumbnail):not(.ytp-thumbnail-image):not(.emoji), .cooked img:not(.thumbnail):not(.ytp-thumbnail-image):not(.emoji) {${styles}}`;
+    document.head.appendChild(styleTag);
   },
 };
diff --git a/app/assets/javascripts/discourse/app/initializers/inject-objects.js b/app/assets/javascripts/discourse/app/initializers/inject-objects.js
index abcf14a574..533e9134af 100644
--- a/app/assets/javascripts/discourse/app/initializers/inject-objects.js
+++ b/app/assets/javascripts/discourse/app/initializers/inject-objects.js
@@ -1,6 +1,9 @@
-// backwards compatibility for plugins that depend on this initializer
+import { setDefaultOwner } from "discourse-common/lib/get-owner";
 
 export default {
   name: "inject-objects",
-  initialize() {},
+  initialize(container, app) {
+    // This is required for Ember CLI tests to work
+    setDefaultOwner(app.__container__);
+  },
 };
diff --git a/app/assets/javascripts/discourse/app/initializers/jquery-plugins.js b/app/assets/javascripts/discourse/app/initializers/jquery-plugins.js
index ffeeefee41..7bcf4275f9 100644
--- a/app/assets/javascripts/discourse/app/initializers/jquery-plugins.js
+++ b/app/assets/javascripts/discourse/app/initializers/jquery-plugins.js
@@ -3,7 +3,7 @@ import bootbox from "bootbox";
 
 export default {
   name: "jquery-plugins",
-  initialize: function () {
+  initialize() {
     // Settings for bootbox
     bootbox.animate(false);
     bootbox.backdrop(true);
diff --git a/app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js
index 59f0b2f8b8..b5dda8a237 100644
--- a/app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js
@@ -1,10 +1,14 @@
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 import Mousetrap from "mousetrap";
+import bindGlobal from "mousetrap-global-bind";
 
 export default {
   name: "keyboard-shortcuts",
 
   initialize(container) {
+    // Ensure mousetrap-global-bind is executed
+    void bindGlobal;
+
     KeyboardShortcuts.init(Mousetrap, container);
     KeyboardShortcuts.bindEvents();
   },
diff --git a/app/assets/javascripts/discourse/app/initializers/live-development.js b/app/assets/javascripts/discourse/app/initializers/live-development.js
index e5b96a8544..e65724073e 100644
--- a/app/assets/javascripts/discourse/app/initializers/live-development.js
+++ b/app/assets/javascripts/discourse/app/initializers/live-development.js
@@ -1,39 +1,35 @@
 import DiscourseURL from "discourse/lib/url";
-import { currentThemeIds, refreshCSS } from "discourse/lib/theme-selector";
-import { isDevelopment } from "discourse-common/config/environment";
 import Handlebars from "handlebars";
+import { isDevelopment } from "discourse-common/config/environment";
+import { refreshCSS } from "discourse/lib/theme-selector";
 
 //  Use the message bus for live reloading of components for faster development.
 export default {
   name: "live-development",
   initialize(container) {
     const messageBus = container.lookup("message-bus:main");
+    const session = container.lookup("session:main");
 
-    if (
-      window.history &&
-      window.location.search.indexOf("?preview_theme_id=") === 0
-    ) {
-      // force preview theme id to always be carried along
-      const themeId = parseInt(
-        window.location.search.slice(18).split("&")[0],
-        10
-      );
-      if (!isNaN(themeId)) {
-        const patchState = function (f) {
-          const patched = window.history[f];
+    // Preserve preview_theme_id=## and pp=async-flamegraph parameters across pages
+    const params = new URLSearchParams(window.location.search);
+    const previewThemeId = params.get("preview_theme_id");
+    const flamegraph = params.get("pp") === "async-flamegraph";
+    if (flamegraph || previewThemeId !== null) {
+      ["replaceState", "pushState"].forEach((funcName) => {
+        const originalFunc = window.history[funcName];
 
-          window.history[f] = function (stateObj, name, url) {
-            if (url.indexOf("preview_theme_id=") === -1) {
-              const joiner = url.indexOf("?") === -1 ? "?" : "&";
-              url = `${url}${joiner}preview_theme_id=${themeId}`;
-            }
+        window.history[funcName] = (stateObj, name, rawUrl) => {
+          const url = new URL(rawUrl, window.location);
+          if (previewThemeId !== null) {
+            url.searchParams.set("preview_theme_id", previewThemeId);
+          }
+          if (flamegraph) {
+            url.searchParams.set("pp", "async-flamegraph");
+          }
 
-            return patched.call(window.history, stateObj, name, url);
-          };
+          return originalFunc.call(window.history, stateObj, name, url.href);
         };
-        patchState("replaceState");
-        patchState("pushState");
-      }
+      });
     }
 
     // Custom header changes
@@ -53,34 +49,36 @@ export default {
     }
 
     // Observe file changes
-    messageBus.subscribe("/file-change", function (data) {
-      if (Handlebars.compile && !Ember.TEMPLATES.empty) {
-        // hbs notifications only happen in dev
-        Ember.TEMPLATES.empty = Handlebars.compile("<div></div>");
-      }
-      data.forEach((me) => {
-        if (me === "refresh") {
-          // Refresh if necessary
-          document.location.reload(true);
-        } else {
-          const themeIds = currentThemeIds();
-          $("link").each(function () {
-            if (me.hasOwnProperty("theme_id") && me.new_href) {
-              const target = $(this).data("target");
-              const themeId = $(this).data("theme-id");
-              if (
-                themeIds.indexOf(me.theme_id) !== -1 &&
-                target === me.target &&
-                (!themeId || themeId === me.theme_id)
-              ) {
-                refreshCSS(this, null, me.new_href);
-              }
-            } else if (this.href.match(me.name) && (me.hash || me.new_href)) {
-              refreshCSS(this, me.hash, me.new_href);
-            }
-          });
+    messageBus.subscribe(
+      "/file-change",
+      function (data) {
+        if (Handlebars.compile && !Ember.TEMPLATES.empty) {
+          // hbs notifications only happen in dev
+          Ember.TEMPLATES.empty = Handlebars.compile("<div></div>");
         }
-      });
-    });
+        data.forEach((me) => {
+          if (me === "refresh") {
+            // Refresh if necessary
+            document.location.reload(true);
+          } else {
+            $("link").each(function () {
+              if (me.hasOwnProperty("theme_id") && me.new_href) {
+                const target = $(this).data("target");
+                const themeId = $(this).data("theme-id");
+                if (
+                  target === me.target &&
+                  (!themeId || themeId === me.theme_id)
+                ) {
+                  refreshCSS(this, null, me.new_href);
+                }
+              } else if (this.href.match(me.name) && (me.hash || me.new_href)) {
+                refreshCSS(this, me.hash, me.new_href);
+              }
+            });
+          }
+        });
+      },
+      session.mbLastFileChangeId
+    );
   },
 };
diff --git a/app/assets/javascripts/discourse/app/initializers/localization.js b/app/assets/javascripts/discourse/app/initializers/localization.js
index 266aaf7066..0c0657075c 100644
--- a/app/assets/javascripts/discourse/app/initializers/localization.js
+++ b/app/assets/javascripts/discourse/app/initializers/localization.js
@@ -31,7 +31,7 @@ export default {
 
       const segs = k.split(".");
 
-      let node = I18n.translations[I18n.locale];
+      let node = I18n.translations[I18n.locale] || {};
       let i = 0;
 
       for (; i < segs.length - 1; i++) {
diff --git a/app/assets/javascripts/discourse/app/initializers/logout.js b/app/assets/javascripts/discourse/app/initializers/logout.js
index bff6d40ccb..cedb695a36 100644
--- a/app/assets/javascripts/discourse/app/initializers/logout.js
+++ b/app/assets/javascripts/discourse/app/initializers/logout.js
@@ -1,6 +1,6 @@
 import I18n from "I18n";
-import logout from "discourse/lib/logout";
 import bootbox from "bootbox";
+import logout from "discourse/lib/logout";
 
 let _showingLogout = false;
 
diff --git a/app/assets/javascripts/discourse/app/initializers/message-bus.js b/app/assets/javascripts/discourse/app/initializers/message-bus.js
index 5f44db1273..13ccf4601b 100644
--- a/app/assets/javascripts/discourse/app/initializers/message-bus.js
+++ b/app/assets/javascripts/discourse/app/initializers/message-bus.js
@@ -1,8 +1,8 @@
-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";
 import { isProduction, isTesting } from "discourse-common/config/environment";
+// Initialize the message bus to receive messages.
+import getURL from "discourse-common/lib/get-url";
+import { handleLogoff } from "discourse/lib/ajax";
+import userPresent from "discourse/lib/user-presence";
 
 const LONG_POLL_AFTER_UNSEEN_TIME = 1200000; // 20 minutes
 const CONNECTIVITY_ERROR_CLASS = "message-bus-offline";
diff --git a/app/assets/javascripts/discourse/app/initializers/onebox-decorators.js b/app/assets/javascripts/discourse/app/initializers/onebox-decorators.js
new file mode 100644
index 0000000000..5b157b2e03
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/initializers/onebox-decorators.js
@@ -0,0 +1,57 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+
+let _showMoreClickPostsElements = [];
+
+function decorateGithubOneboxBody(element) {
+  const containers = element.querySelectorAll(
+    ".onebox.githubcommit .show-more-container, .onebox.githubpullrequest .show-more-container, .onebox.githubissue .show-more-container"
+  );
+
+  if (containers.length) {
+    _showMoreClickPostsElements.push(element);
+    element.addEventListener("click", _handleClick, false);
+  }
+}
+
+function _handleClick(event) {
+  if (!event.target.classList.contains("show-more")) {
+    return;
+  }
+
+  event.preventDefault();
+
+  const showMoreContainer = event.target.parentNode;
+  const bodyContainer = showMoreContainer.parentNode;
+
+  showMoreContainer.classList.add("hidden");
+  bodyContainer.querySelector(".excerpt.hidden").classList.remove("hidden");
+
+  return false;
+}
+
+function _cleanUp() {
+  (_showMoreClickPostsElements || []).forEach((element) => {
+    element.removeEventListener("click", _handleClick);
+  });
+
+  _showMoreClickPostsElements = [];
+}
+
+export default {
+  name: "onebox-decorators",
+
+  initialize() {
+    withPluginApi("0.8.42", (api) => {
+      api.decorateCookedElement(
+        (element) => {
+          decorateGithubOneboxBody(element);
+        },
+        {
+          id: "onebox-github-body",
+        }
+      );
+
+      api.cleanupStream(_cleanUp);
+    });
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/opengraph-tag-updater.js b/app/assets/javascripts/discourse/app/initializers/opengraph-tag-updater.js
new file mode 100644
index 0000000000..66ab52a817
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/initializers/opengraph-tag-updater.js
@@ -0,0 +1,20 @@
+import { getAbsoluteURL } from "discourse-common/lib/get-url";
+
+export default {
+  name: "opengraph-tag-updater",
+
+  initialize(container) {
+    // workaround for Safari on iOS 14.3
+    // seems it has started using opengraph tags when sharing
+    let appEvents = container.lookup("service:app-events");
+    const ogTitle = document.querySelector("meta[property='og:title']"),
+      ogUrl = document.querySelector("meta[property='og:url']");
+
+    if (ogTitle && ogUrl) {
+      appEvents.on("page:changed", (data) => {
+        ogTitle.setAttribute("content", data.title);
+        ogUrl.setAttribute("content", getAbsoluteURL(data.url));
+      });
+    }
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/page-tracking.js b/app/assets/javascripts/discourse/app/initializers/page-tracking.js
index 80a462d5e8..13858cbc24 100644
--- a/app/assets/javascripts/discourse/app/initializers/page-tracking.js
+++ b/app/assets/javascripts/discourse/app/initializers/page-tracking.js
@@ -1,9 +1,9 @@
-import { cleanDOM } from "discourse/lib/clean-dom";
 import {
-  startPageTracking,
-  resetPageTracking,
   googleTagManagerPageChanged,
+  resetPageTracking,
+  startPageTracking,
 } from "discourse/lib/page-tracker";
+import { cleanDOM } from "discourse/lib/clean-dom";
 import { viewTrackingRequired } from "discourse/lib/ajax";
 
 export default {
diff --git a/app/assets/javascripts/discourse/app/initializers/post-decorations.js b/app/assets/javascripts/discourse/app/initializers/post-decorations.js
index bdc1354636..4d3465833c 100644
--- a/app/assets/javascripts/discourse/app/initializers/post-decorations.js
+++ b/app/assets/javascripts/discourse/app/initializers/post-decorations.js
@@ -1,7 +1,13 @@
+import { later } from "@ember/runloop";
+import I18n from "I18n";
 import highlightSyntax from "discourse/lib/highlight-syntax";
 import lightbox from "discourse/lib/lightbox";
-import { setupLazyLoading } from "discourse/lib/lazy-load-images";
+import { iconHTML } from "discourse-common/lib/icon-library";
 import { setTextDirections } from "discourse/lib/text-direction";
+import {
+  nativeLazyLoading,
+  setupLazyLoading,
+} from "discourse/lib/lazy-load-images";
 import { withPluginApi } from "discourse/lib/plugin-api";
 
 export default {
@@ -32,7 +38,11 @@ export default {
         });
       }
 
-      setupLazyLoading(api);
+      if (siteSettings.disable_image_size_calculations) {
+        nativeLazyLoading(api);
+      } else {
+        setupLazyLoading(api);
+      }
 
       api.decorateCooked(
         ($elem) => {
@@ -75,6 +85,58 @@ export default {
           { id: "safari-video-poster", afterAdopt: true, onlyStream: true }
         );
       }
+
+      const oneboxTypes = {
+        amazon: "discourse-amazon",
+        githubblob: "fab-github",
+        githubcommit: "fab-github",
+        githubpullrequest: "fab-github",
+        githubissue: "fab-github",
+        githubfile: "fab-github",
+        githubgist: "fab-github",
+        twitterstatus: "fab-twitter",
+        wikipedia: "fab-wikipedia-w",
+      };
+
+      api.decorateCookedElement(
+        (elem) => {
+          elem.querySelectorAll(".onebox").forEach((onebox) => {
+            Object.entries(oneboxTypes).forEach(([key, value]) => {
+              if (onebox.classList.contains(key)) {
+                onebox
+                  .querySelector(".source")
+                  .insertAdjacentHTML("afterbegin", iconHTML(value));
+              }
+            });
+          });
+        },
+        { id: "onebox-source-icons" }
+      );
+
+      api.decorateCookedElement(
+        (element) => {
+          element
+            .querySelectorAll(".video-container")
+            .forEach((videoContainer) => {
+              const video = videoContainer.getElementsByTagName("video")[0];
+              video.addEventListener("loadeddata", () => {
+                later(() => {
+                  if (video.videoWidth === 0 || video.videoHeight === 0) {
+                    const notice = document.createElement("div");
+                    notice.className = "notice";
+                    notice.innerHTML =
+                      iconHTML("exclamation-triangle") +
+                      " " +
+                      I18n.t("cannot_render_video");
+
+                    videoContainer.appendChild(notice);
+                  }
+                }, 500);
+              });
+            });
+        },
+        { id: "discourse-video-codecs" }
+      );
     });
   },
 };
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 f1631979a9..22b54a695f 100644
--- a/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
+++ b/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
@@ -4,9 +4,7 @@ export default {
   name: "register-service-worker",
 
   initialize(container) {
-    const isSecured =
-      document.location.protocol === "https:" ||
-      location.hostname === "localhost";
+    const isSecured = document.location.protocol === "https:";
 
     if (isSecured && "serviceWorker" in navigator) {
       let { serviceWorkerURL } = container.lookup("session:main");
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 941ad849ea..2e93d643ea 100644
--- a/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
+++ b/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
@@ -1,15 +1,15 @@
 import EmberObject, { set } from "@ember/object";
 // Subscribes to user events on the message bus
 import {
-  init as initDesktopNotifications,
-  onNotification,
   alertChannel,
   disable as disableDesktopNotifications,
+  init as initDesktopNotifications,
+  onNotification,
 } from "discourse/lib/desktop-notifications";
 import {
+  isPushNotificationsEnabled,
   register as registerPushNotifications,
   unsubscribe as unsubscribePushNotifications,
-  isPushNotificationsEnabled,
 } from "discourse/lib/push-notifications";
 import { isTesting } from "discourse-common/config/environment";
 
@@ -113,6 +113,10 @@ export default {
         user.notification_channel_position
       );
 
+      bus.subscribe(`/do-not-disturb/${user.get("id")}`, (data) => {
+        user.updateDoNotDisturbStatus(data.ends_at);
+      });
+
       const site = container.lookup("site:main");
       const siteSettings = container.lookup("site-settings:main");
       const router = container.lookup("router:main");
@@ -130,7 +134,7 @@ export default {
 
       if (!isTesting()) {
         bus.subscribe(alertChannel(user), (data) =>
-          onNotification(data, siteSettings)
+          onNotification(data, siteSettings, user)
         );
         initDesktopNotifications(bus, appEvents);
 
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 362f358a5a..6cbc34c546 100644
--- a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
@@ -1,7 +1,7 @@
 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";
+import { registerTopicFooterButton } from "discourse/lib/register-topic-footer-button";
+import showModal from "discourse/lib/show-modal";
 
 const SHARE_PRIORITY = 1000;
 const BOOKMARK_PRIORITY = 900;
@@ -25,39 +25,10 @@ export default {
       },
       title: "topic.share.help",
       action() {
-        const panels = [
-          {
-            id: "share",
-            title: "topic.share.extended_title",
-            model: {
-              topic: this.topic,
-            },
-          },
-        ];
-
-        if (this.canInviteTo && !this.inviteDisabled) {
-          let invitePanelTitle;
-
-          if (this.isPM) {
-            invitePanelTitle = "topic.invite_private.title";
-          } else if (this.invitingToTopic) {
-            invitePanelTitle = "topic.invite_reply.title";
-          } else {
-            invitePanelTitle = "user.invited.create";
-          }
-
-          panels.push({
-            id: "invite",
-            title: invitePanelTitle,
-            model: {
-              inviteModel: this.topic,
-            },
-          });
-        }
-
-        showModal("share-and-invite", {
-          modalClass: "share-and-invite",
-          panels,
+        const controller = showModal("share-topic");
+        controller.setProperties({
+          allowInvites: this.canInviteTo && !this.inviteDisabled,
+          topic: this.topic,
         });
       },
       dropdown() {
diff --git a/app/assets/javascripts/discourse/app/initializers/webview-background.js b/app/assets/javascripts/discourse/app/initializers/webview-background.js
index b3946c5495..72993a75fe 100644
--- a/app/assets/javascripts/discourse/app/initializers/webview-background.js
+++ b/app/assets/javascripts/discourse/app/initializers/webview-background.js
@@ -1,5 +1,5 @@
-import { later } from "@ember/runloop";
 import { isAppWebview, postRNWebviewMessage } from "discourse/lib/utilities";
+import { later } from "@ember/runloop";
 
 // Send bg color to webview so iOS status bar matches site theme
 export default {
diff --git a/app/assets/javascripts/discourse/app/lib/after-transition.js b/app/assets/javascripts/discourse/app/lib/after-transition.js
index 16c57b53cf..70edaaf843 100644
--- a/app/assets/javascripts/discourse/app/lib/after-transition.js
+++ b/app/assets/javascripts/discourse/app/lib/after-transition.js
@@ -4,7 +4,7 @@
 
   SO: http://stackoverflow.com/questions/9943435/css3-animation-end-techniques
 **/
-var dummy = document.createElement("div"),
+let dummy = document.createElement("div"),
   eventNameHash = {
     webkit: "webkitTransitionEnd",
     Moz: "transitionend",
@@ -12,8 +12,8 @@ var dummy = document.createElement("div"),
     ms: "MSTransitionEnd",
   };
 
-var transitionEnd = (function () {
-  var retValue;
+let transitionEnd = (function () {
+  let retValue;
   retValue = "transitionend";
   Object.keys(eventNameHash).some(function (vendor) {
     if (vendor + "TransitionProperty" in dummy.style) {
diff --git a/app/assets/javascripts/discourse/app/lib/ajax.js b/app/assets/javascripts/discourse/app/lib/ajax.js
index 79fba4949c..36330cabf3 100644
--- a/app/assets/javascripts/discourse/app/lib/ajax.js
+++ b/app/assets/javascripts/discourse/app/lib/ajax.js
@@ -1,11 +1,11 @@
+import { Promise } from "rsvp";
+import Session from "discourse/models/session";
+import Site from "discourse/models/site";
+import User from "discourse/models/user";
 import getURL from "discourse-common/lib/get-url";
+import { isTesting } from "discourse-common/config/environment";
 import { run } from "@ember/runloop";
 import userPresent from "discourse/lib/user-presence";
-import Session from "discourse/models/session";
-import { Promise } from "rsvp";
-import Site from "discourse/models/site";
-import { isTesting } from "discourse-common/config/environment";
-import User from "discourse/models/user";
 
 let _trackView = false;
 let _transientHeader = null;
diff --git a/app/assets/javascripts/discourse/app/lib/autocomplete.js b/app/assets/javascripts/discourse/app/lib/autocomplete.js
index b9b32f6ff5..d95cc46e52 100644
--- a/app/assets/javascripts/discourse/app/lib/autocomplete.js
+++ b/app/assets/javascripts/discourse/app/lib/autocomplete.js
@@ -1,8 +1,10 @@
+import { cancel, later } from "@ember/runloop";
+import { caretPosition, setCaretPosition } from "discourse/lib/utilities";
 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";
+import { createPopper } from "@popperjs/core";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { iconHTML } from "discourse-common/lib/icon-library";
 
 /**
   This is a jQuery plugin to support autocompleting values in our text fields.
@@ -13,6 +15,7 @@ import Site from "discourse/models/site";
 export const SKIP = "skip";
 export const CANCELLED_STATUS = "__CANCELLED";
 const allowedLettersRegex = /[\s\t\[\{\(\/]/;
+let _autoCompletePopper;
 
 const keys = {
   backSpace: 8,
@@ -82,6 +85,10 @@ export default function (options) {
     return this;
   }
 
+  if (options && typeof options.preserveKey === "undefined") {
+    options.preserveKey = true;
+  }
+
   const disabled = options && options.disabled;
   let wrap = null;
   let autocompleteOptions = null;
@@ -92,11 +99,26 @@ export default function (options) {
   let div = null;
   let prevTerm = null;
 
+  // By default, when the autcomplete popup is rendered it has the
+  // first suggestion 'selected', and pressing enter key inserts
+  // the first suggestion into the input box.
+  // If you want to stop that behavior, i.e. have the popup renders
+  // with no suggestions selected, set the `autoSelectFirstSuggestion`
+  // option to false.
+  // With this option set to false, users will have to select
+  // a suggestion via the up/down arrow keys and then press enter
+  // to insert it.
+  if (!("autoSelectFirstSuggestion" in options)) {
+    options.autoSelectFirstSuggestion = true;
+  }
+
   // input is handled differently
-  const isInput = this[0].tagName === "INPUT" && !options.treatAsTextarea;
+  const isInput = me[0].tagName === "INPUT" && !options.treatAsTextarea;
   let inputSelectedItems = [];
 
   function closeAutocomplete() {
+    _autoCompletePopper && _autoCompletePopper.destroy();
+
     if (div) {
       div.hide().remove();
     }
@@ -104,10 +126,11 @@ export default function (options) {
     completeStart = null;
     autocompleteOptions = null;
     prevTerm = null;
+    _autoCompletePopper = null;
   }
 
   function addInputSelectedItem(item, triggerChangeCallback) {
-    var transformed,
+    let transformed,
       transformedItem = item;
 
     if (options.transformComplete) {
@@ -163,7 +186,7 @@ export default function (options) {
       });
   }
 
-  var completeTerm = function (term) {
+  let completeTerm = async function (term) {
     if (term) {
       if (isInput) {
         me.val("");
@@ -173,19 +196,23 @@ export default function (options) {
         addInputSelectedItem(term, true);
       } else {
         if (options.transformComplete) {
-          term = options.transformComplete(term);
+          term = await options.transformComplete(term);
         }
 
         if (term) {
-          var text = me.val();
+          let text = me.val();
           text =
             text.substring(0, completeStart) +
-            (options.key || "") +
+            (options.preserveKey ? options.key || "" : "") +
             term +
             " " +
             text.substring(completeEnd + 1, text.length);
           me.val(text);
-          setCaretPosition(me[0], completeStart + 1 + term.length);
+          let newCaretPos = completeStart + 1 + term.length;
+          if (options.key) {
+            newCaretPos++;
+          }
+          setCaretPosition(me[0], newCaretPos);
 
           if (options && options.afterComplete) {
             options.afterComplete(text);
@@ -224,7 +251,7 @@ export default function (options) {
       options.updateData ? this.attr("name") : this.attr("name") + "-renamed"
     );
 
-    var vals = this.val().split(",");
+    let vals = this.val().split(",");
     vals.forEach((x) => {
       if (x !== "") {
         if (options.reverseTransform) {
@@ -273,9 +300,13 @@ export default function (options) {
 
     div = $(options.template({ options: autocompleteOptions }));
 
-    var ul = div.find("ul");
-    selectedOption = 0;
-    markSelected();
+    let ul = div.find("ul");
+    if (options.autoSelectFirstSuggestion) {
+      selectedOption = 0;
+      markSelected();
+    } else {
+      selectedOption = -1;
+    }
     ul.find("li").click(function () {
       selectedOption = ul.find("li").index(this);
       completeTerm(autocompleteOptions[selectedOption]);
@@ -284,31 +315,6 @@ export default function (options) {
       }
       return false;
     });
-    var pos = null;
-    var vOffset = 0;
-    var hOffset = 0;
-
-    if (isInput) {
-      pos = {
-        left: 0,
-        top: 0,
-      };
-      vOffset = BELOW;
-      hOffset = 0;
-    } else {
-      pos = me.caretPosition({
-        pos: completeStart + 1,
-      });
-
-      hOffset = 10;
-      if (options.treatAsTextarea) {
-        vOffset = -32;
-      }
-    }
-
-    div.css({
-      left: "-1000px",
-    });
 
     if (options.appendSelector) {
       me.parents(options.appendSelector).append(div);
@@ -316,6 +322,38 @@ export default function (options) {
       me.parent().append(div);
     }
 
+    if (isInput || options.treatAsTextarea) {
+      _autoCompletePopper && _autoCompletePopper.destroy();
+      _autoCompletePopper = createPopper(me[0], div[0], {
+        placement: "bottom-start",
+        strategy: "fixed",
+        modifiers: [
+          {
+            name: "offset",
+            options: {
+              offset: [0, 2],
+            },
+          },
+        ],
+      });
+      return _autoCompletePopper;
+    }
+
+    let vOffset = 0;
+    let hOffset = 0;
+    let pos = me.caretPosition({
+      pos: completeStart + 1,
+    });
+
+    hOffset = 10;
+    if (options.treatAsTextarea) {
+      vOffset = -32;
+    }
+
+    div.css({
+      left: "-1000px",
+    });
+
     if (!isInput && !options.treatAsTextarea) {
       vOffset = div.height();
 
@@ -338,9 +376,9 @@ export default function (options) {
       }
     }
 
-    var mePos = me.position();
+    let mePos = me.position();
 
-    var borderTop = parseInt(me.css("border-top-width"), 10) || 0;
+    let borderTop = parseInt(me.css("border-top-width"), 10) || 0;
 
     let left = mePos.left + pos.left + hOffset;
     if (left < 0) {
@@ -422,7 +460,7 @@ export default function (options) {
 
   $(this).on("keyup.autocomplete", function (e) {
     if (options.debounced) {
-      debounce(this, performAutocomplete, e, INPUT_DELAY);
+      discourseDebounce(this, performAutocomplete, e, INPUT_DELAY);
     } else {
       performAutocomplete(e);
     }
@@ -450,7 +488,7 @@ export default function (options) {
 
     if (completeStart === null && cp > 0) {
       if (key === options.key) {
-        var prevChar = me.val().charAt(cp - 2);
+        let prevChar = me.val().charAt(cp - 2);
         if (
           checkTriggerRule() &&
           (!prevChar || allowedLettersRegex.test(prevChar))
@@ -466,7 +504,7 @@ export default function (options) {
   }
 
   $(this).on("keydown.autocomplete", function (e) {
-    var c, i, initial, prev, prevIsGood, stopFound, term, total, userToComplete;
+    let c, i, initial, prev, prevIsGood, stopFound, term, total, userToComplete;
     let cp;
 
     if (e.ctrlKey || e.altKey || e.metaKey) {
@@ -549,9 +587,10 @@ export default function (options) {
 
       // Keyboard codes! So 80's.
       switch (e.which) {
-        case keys.enter:
         case keys.tab:
+        case keys.enter:
           if (!autocompleteOptions) {
+            closeAutocomplete();
             return true;
           }
           if (
@@ -584,6 +623,7 @@ export default function (options) {
           markSelected();
           return false;
         case keys.backSpace:
+          autocompleteOptions = null;
           completeEnd = cp;
           cp--;
 
@@ -607,6 +647,7 @@ export default function (options) {
           updateAutoComplete(dataSource(term, options));
           return true;
         default:
+          autocompleteOptions = null;
           completeEnd = cp;
           return true;
       }
diff --git a/app/assets/javascripts/discourse/app/lib/avatar-flair.js b/app/assets/javascripts/discourse/app/lib/avatar-flair.js
new file mode 100644
index 0000000000..5e6ee0e30c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/avatar-flair.js
@@ -0,0 +1,66 @@
+let _autoGroupFlair, _noAutoFlair;
+
+export default function autoGroupFlairForUser(site, user) {
+  if (!_autoGroupFlair) {
+    initializeAutoGroupFlair(site);
+  }
+
+  if (_noAutoFlair) {
+    // No automatic groups have flair.
+    return null;
+  }
+
+  if (user.admin && _autoGroupFlair.admins) {
+    return _autoGroupFlair.admins;
+  }
+
+  if (user.moderator && _autoGroupFlair.moderators) {
+    return _autoGroupFlair.moderators;
+  }
+
+  if (_autoGroupFlair.staff && (user.admin || user.moderator)) {
+    return _autoGroupFlair.staff;
+  }
+
+  let trustLevel = user.trust_level || user.trustLevel;
+
+  if (trustLevel) {
+    for (let i = trustLevel; i >= 0; i--) {
+      if (_autoGroupFlair[`trust_level_${i}`]) {
+        return _autoGroupFlair[`trust_level_${i}`];
+      }
+    }
+  }
+}
+
+export function resetFlair() {
+  _autoGroupFlair = null;
+  _noAutoFlair = null;
+}
+
+function initializeAutoGroupFlair(site) {
+  _autoGroupFlair = {};
+  _noAutoFlair = true;
+
+  [
+    "admins",
+    "moderators",
+    "staff",
+    "trust_level_0",
+    "trust_level_1",
+    "trust_level_2",
+    "trust_level_3",
+    "trust_level_4",
+  ].forEach((groupName) => {
+    const group = site.groups.findBy("name", groupName);
+    if (group && group.flair_url) {
+      _noAutoFlair = false;
+      _autoGroupFlair[groupName] = {
+        primary_group_flair_url: group.flair_url,
+        primary_group_flair_bg_color: group.flair_bg_color,
+        primary_group_flair_color: group.flair_color,
+        primary_group_name: group.name.replace(/_/g, " "),
+      };
+    }
+  });
+}
diff --git a/app/assets/javascripts/discourse/app/lib/bookmark.js b/app/assets/javascripts/discourse/app/lib/bookmark.js
index 8fd496083c..3ed24cfb11 100644
--- a/app/assets/javascripts/discourse/app/lib/bookmark.js
+++ b/app/assets/javascripts/discourse/app/lib/bookmark.js
@@ -16,17 +16,3 @@ export function formattedReminderTime(reminderAt, timezone) {
     date_time: reminderAtDate.format(I18n.t("dates.long_with_year")),
   });
 }
-
-export const REMINDER_TYPES = {
-  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",
-  POST_LOCAL_DATE: "post_local_date",
-};
diff --git a/app/assets/javascripts/discourse/app/lib/category-hashtags.js b/app/assets/javascripts/discourse/app/lib/category-hashtags.js
index 2aa56c3bbc..18cf98b899 100644
--- a/app/assets/javascripts/discourse/app/lib/category-hashtags.js
+++ b/app/assets/javascripts/discourse/app/lib/category-hashtags.js
@@ -1,7 +1,7 @@
 export const SEPARATOR = ":";
 import {
-  caretRowCol,
   caretPosition,
+  caretRowCol,
   inCodeBlock,
 } from "discourse/lib/utilities";
 
@@ -15,8 +15,8 @@ export function replaceSpan($elem, categorySlug, categoryLink, type) {
 export function categoryHashtagTriggerRule(textarea, opts) {
   const result = caretRowCol(textarea);
   const row = result.rowNum;
-  var col = result.colNum;
-  var line = textarea.value.split("\n")[row - 1];
+  let col = result.colNum;
+  let line = textarea.value.split("\n")[row - 1];
 
   if (opts && opts.backSpace) {
     col = col - 1;
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 460e4770cb..ef84ac811f 100644
--- a/app/assets/javascripts/discourse/app/lib/category-tag-search.js
+++ b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
@@ -1,11 +1,11 @@
-import getURL from "discourse-common/lib/get-url";
-import discourseDebounce from "discourse/lib/debounce";
+import { cancel, later } from "@ember/runloop";
 import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
 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";
+import { SEPARATOR } from "discourse/lib/category-hashtags";
+import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";
+import discourseDebounce from "discourse-common/lib/debounce";
+import getURL from "discourse-common/lib/get-url";
 import { isTesting } from "discourse-common/config/environment";
 
 let cache = {};
@@ -27,38 +27,47 @@ function searchTags(term, categories, limit) {
       isTesting() ? 50 : 5000
     );
 
-    const debouncedSearch = discourseDebounce((q, cats, resultFunc) => {
-      oldSearch = $.ajax(getURL("/tags/filter/search"), {
-        type: "GET",
-        cache: true,
-        data: { limit: limit, q },
-      });
-
-      var returnVal = CANCELLED_STATUS;
-
-      oldSearch
-        .then((r) => {
-          const categoryNames = cats.map((c) => c.model.get("name"));
-
-          const tags = r.results.map((tag) => {
-            const tagName = tag.text;
-
-            return {
-              name: tagName,
-              text: categoryNames.includes(tagName)
-                ? `${tagName}${TAG_HASHTAG_POSTFIX}`
-                : tagName,
-              count: tag.count,
-            };
+    const debouncedSearch = (q, cats, resultFunc) => {
+      discourseDebounce(
+        this,
+        function () {
+          oldSearch = $.ajax(getURL("/tags/filter/search"), {
+            type: "GET",
+            cache: true,
+            data: { limit: limit, q },
           });
 
-          returnVal = cats.concat(tags);
-        })
-        .always(() => {
-          oldSearch = null;
-          resultFunc(returnVal);
-        });
-    }, 300);
+          let returnVal = CANCELLED_STATUS;
+
+          oldSearch
+            .then((r) => {
+              const categoryNames = cats.map((c) => c.model.get("name"));
+
+              const tags = r.results.map((tag) => {
+                const tagName = tag.text;
+
+                return {
+                  name: tagName,
+                  text: categoryNames.includes(tagName)
+                    ? `${tagName}${TAG_HASHTAG_POSTFIX}`
+                    : tagName,
+                  count: tag.count,
+                };
+              });
+
+              returnVal = cats.concat(tags);
+            })
+            .always(() => {
+              oldSearch = null;
+              resultFunc(returnVal);
+            });
+        },
+        q,
+        cats,
+        resultFunc,
+        300
+      );
+    };
 
     debouncedSearch(term, categories, (result) => {
       cancel(clearPromise);
@@ -82,8 +91,8 @@ export function search(term, siteSettings) {
   }
 
   const limit = 5;
-  var categories = Category.search(term, { limit });
-  var numOfCategories = categories.length;
+  let categories = Category.search(term, { limit });
+  let numOfCategories = categories.length;
 
   categories = categories.map((category) => {
     return { model: category, text: Category.slugFor(category, SEPARATOR, 2) };
diff --git a/app/assets/javascripts/discourse/app/lib/click-track.js b/app/assets/javascripts/discourse/app/lib/click-track.js
index a3524c760e..28744e2911 100644
--- a/app/assets/javascripts/discourse/app/lib/click-track.js
+++ b/app/assets/javascripts/discourse/app/lib/click-track.js
@@ -1,14 +1,14 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import { later } from "@ember/runloop";
-import { ajax } from "discourse/lib/ajax";
 import DiscourseURL from "discourse/lib/url";
-import { wantsNewWindow } from "discourse/lib/intercept-click";
-import { selectedText } from "discourse/lib/utilities";
+import I18n from "I18n";
 import { Promise } from "rsvp";
-import { isTesting } from "discourse-common/config/environment";
 import User from "discourse/models/user";
+import { ajax } from "discourse/lib/ajax";
 import bootbox from "bootbox";
+import getURL from "discourse-common/lib/get-url";
+import { isTesting } from "discourse-common/config/environment";
+import { later } from "@ember/runloop";
+import { selectedText } from "discourse/lib/utilities";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
 
 export function isValidLink($link) {
   // .hashtag == category/tag link
diff --git a/app/assets/javascripts/discourse/app/lib/color-scheme-picker.js b/app/assets/javascripts/discourse/app/lib/color-scheme-picker.js
index 5ddb5be9fd..2370a91ba6 100644
--- a/app/assets/javascripts/discourse/app/lib/color-scheme-picker.js
+++ b/app/assets/javascripts/discourse/app/lib/color-scheme-picker.js
@@ -1,6 +1,6 @@
+import cookie, { removeCookie } from "discourse/lib/cookie";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import cookie, { removeCookie } from "discourse/lib/cookie";
 
 export function listColorSchemes(site, options = {}) {
   let schemes = site.get("user_color_schemes");
diff --git a/app/assets/javascripts/discourse/app/lib/computed.js b/app/assets/javascripts/discourse/app/lib/computed.js
index f1640b18d2..b0cd28c7eb 100644
--- a/app/assets/javascripts/discourse/app/lib/computed.js
+++ b/app/assets/javascripts/discourse/app/lib/computed.js
@@ -1,6 +1,6 @@
-import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { computed } from "@ember/object";
+import getURL from "discourse-common/lib/get-url";
 import { htmlSafe as htmlSafeTemplateHelper } from "@ember/template";
 
 function addonFmt(str, formats) {
diff --git a/app/assets/javascripts/discourse/app/lib/desktop-notifications.js b/app/assets/javascripts/discourse/app/lib/desktop-notifications.js
index 2ec39fde56..5e6053b43b 100644
--- a/app/assets/javascripts/discourse/app/lib/desktop-notifications.js
+++ b/app/assets/javascripts/discourse/app/lib/desktop-notifications.js
@@ -1,11 +1,11 @@
-import I18n from "I18n";
-import { later } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
 import KeyValueStore from "discourse/lib/key-value-store";
-import { formatUsername } from "discourse/lib/utilities";
 import { Promise } from "rsvp";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
+import { formatUsername } from "discourse/lib/utilities";
+import { later } from "@ember/runloop";
 
 let primaryTab = false;
 let liveEnabled = false;
@@ -136,7 +136,7 @@ function isIdle() {
 }
 
 // Call-in point from message bus
-function onNotification(data, siteSettings) {
+function onNotification(data, siteSettings, user) {
   if (!liveEnabled) {
     return;
   }
@@ -146,6 +146,9 @@ function onNotification(data, siteSettings) {
   if (!isIdle()) {
     return;
   }
+  if (user.isInDoNotDisturb()) {
+    return;
+  }
   if (keyValueStore.getItem("notifications-disabled")) {
     return;
   }
diff --git a/app/assets/javascripts/discourse/app/lib/discourse-location.js b/app/assets/javascripts/discourse/app/lib/discourse-location.js
index 0dff2254c3..f026de6b91 100644
--- a/app/assets/javascripts/discourse/app/lib/discourse-location.js
+++ b/app/assets/javascripts/discourse/app/lib/discourse-location.js
@@ -66,6 +66,7 @@ const DiscourseLocation = EmberObject.extend({
     let url = withoutPrefix(this.location.pathname);
     const search = this.location.search || "";
     url += search;
+    url = url.replace(/\/\//g, "/"); // remove extra slashes
     return url;
   },
 
diff --git a/app/assets/javascripts/discourse/app/lib/export-csv.js b/app/assets/javascripts/discourse/app/lib/export-csv.js
index d1dda9cef2..b259fcc865 100644
--- a/app/assets/javascripts/discourse/app/lib/export-csv.js
+++ b/app/assets/javascripts/discourse/app/lib/export-csv.js
@@ -1,7 +1,7 @@
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import bootbox from "bootbox";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 function exportEntityByType(type, entity, args) {
   return ajax("/export_csv/export_entity.json", {
diff --git a/app/assets/javascripts/discourse/app/lib/eyeline.js b/app/assets/javascripts/discourse/app/lib/eyeline.js
index 9190bf05dc..f7f318865d 100644
--- a/app/assets/javascripts/discourse/app/lib/eyeline.js
+++ b/app/assets/javascripts/discourse/app/lib/eyeline.js
@@ -1,5 +1,5 @@
-import { isTesting } from "discourse-common/config/environment";
 import AppEvents from "discourse/services/app-events";
+import { isTesting } from "discourse-common/config/environment";
 
 let _skipUpdate;
 let _rootElement;
diff --git a/app/assets/javascripts/discourse/app/lib/formatter.js b/app/assets/javascripts/discourse/app/lib/formatter.js
index 6415fa08a5..850da25625 100644
--- a/app/assets/javascripts/discourse/app/lib/formatter.js
+++ b/app/assets/javascripts/discourse/app/lib/formatter.js
@@ -1,5 +1,5 @@
-import { helperContext } from "discourse-common/lib/helpers";
 import I18n from "I18n";
+import { helperContext } from "discourse-common/lib/helpers";
 
 export function shortDate(date) {
   return moment(date).format(I18n.t("dates.medium.date_year"));
@@ -170,7 +170,10 @@ export function durationTiny(distance, ageOpts) {
 
 function relativeAgeTiny(date, ageOpts) {
   const format = "tiny";
-  const distance = Math.round((new Date() - date) / 1000);
+  let distance = Math.round((new Date() - date) / 1000);
+  if (distance < 0) {
+    distance = Math.round((date - new Date()) / 1000);
+  }
   const dividedDistance = Math.round(distance / 60.0);
   const distanceInMinutes = dividedDistance < 1 ? 1 : dividedDistance;
 
diff --git a/app/assets/javascripts/discourse/app/lib/highlight-syntax.js b/app/assets/javascripts/discourse/app/lib/highlight-syntax.js
index 4ca0162c09..3a1a5d9b86 100644
--- a/app/assets/javascripts/discourse/app/lib/highlight-syntax.js
+++ b/app/assets/javascripts/discourse/app/lib/highlight-syntax.js
@@ -1,5 +1,5 @@
-import loadScript from "discourse/lib/load-script";
 import deprecated from "discourse-common/lib/deprecated";
+import loadScript from "discourse/lib/load-script";
 
 /*global hljs:true */
 let _moreLanguages = [];
diff --git a/app/assets/javascripts/discourse/app/lib/intercept-click.js b/app/assets/javascripts/discourse/app/lib/intercept-click.js
index fc25322a02..7c807456b2 100644
--- a/app/assets/javascripts/discourse/app/lib/intercept-click.js
+++ b/app/assets/javascripts/discourse/app/lib/intercept-click.js
@@ -21,23 +21,23 @@ export default function interceptClick(e) {
     return;
   }
 
-  const $currentTarget = $(e.currentTarget),
-    href = $currentTarget.attr("href");
+  const currentTarget = e.currentTarget;
+  const href = currentTarget.getAttribute("href");
 
   if (
     !href ||
     href === "#" ||
-    $currentTarget.attr("target") ||
-    $currentTarget.data("ember-action") ||
-    $currentTarget.data("auto-route") ||
-    $currentTarget.data("share-url") ||
-    $currentTarget.hasClass("widget-link") ||
-    $currentTarget.hasClass("raw-link") ||
-    $currentTarget.hasClass("mention") ||
-    (!$currentTarget.hasClass("d-link") &&
-      !$currentTarget.data("user-card") &&
-      $currentTarget.hasClass("ember-view")) ||
-    $currentTarget.hasClass("lightbox") ||
+    currentTarget.getAttribute("target") ||
+    currentTarget.dataset.emberAction ||
+    currentTarget.dataset.autoRoute ||
+    currentTarget.dataset.shareUrl ||
+    currentTarget.classList.contains("widget-link") ||
+    currentTarget.classList.contains("raw-link") ||
+    currentTarget.classList.contains("mention") ||
+    (!currentTarget.classList.contains("d-link") &&
+      !currentTarget.dataset.userCard &&
+      currentTarget.classList.contains("ember-view")) ||
+    currentTarget.classList.contains("lightbox") ||
     href.indexOf("mailto:") === 0 ||
     (href.match(/^http[s]?:\/\//i) &&
       !href.match(new RegExp("^https?:\\/\\/" + window.location.hostname, "i")))
diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
index dabad15316..dbe5dbb685 100644
--- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -1,13 +1,14 @@
-import { later, run, throttle, schedule } from "@ember/runloop";
-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 { INPUT_DELAY } from "discourse-common/config/environment";
+import { isAppWebview } from "discourse/lib/utilities";
+import { later, run, schedule, throttle } from "@ember/runloop";
 import {
   nextTopicUrl,
   previousTopicUrl,
 } from "discourse/lib/topic-list-tracker";
+import Composer from "discourse/models/composer";
+import DiscourseURL from "discourse/lib/url";
+import { INPUT_DELAY } from "discourse-common/config/environment";
+import { ajax } from "discourse/lib/ajax";
+import { minimumOffset } from "discourse/lib/offset-calculator";
 
 const DEFAULT_BINDINGS = {
   "!": { postAction: "showFlags" },
@@ -19,9 +20,13 @@ const DEFAULT_BINDINGS = {
   ".": { click: ".alert.alert-info.clickable", anonymous: true }, // show incoming/updated topics
   b: { handler: "toggleBookmark" },
   c: { handler: "createTopic" },
-  C: { handler: "focusComposer" },
+  "shift+c": { handler: "focusComposer" },
   "ctrl+f": { handler: "showPageSearch", anonymous: true },
   "command+f": { handler: "showPageSearch", anonymous: true },
+  "command+left": { handler: "webviewKeyboardBack", anonymous: true },
+  "command+[": { handler: "webviewKeyboardBack", anonymous: true },
+  "command+right": { handler: "webviewKeyboardForward", anonymous: true },
+  "command+]": { handler: "webviewKeyboardForward", anonymous: true },
   "mod+p": { handler: "printTopic", anonymous: true },
   d: { postAction: "deletePost" },
   e: { postAction: "editPost" },
@@ -95,7 +100,7 @@ function preventKeyboardEvent(event) {
 
 export default {
   init(keyTrapper, container) {
-    this.keyTrapper = keyTrapper;
+    this.keyTrapper = new keyTrapper();
     this.container = container;
     this._stopCallback();
 
@@ -117,12 +122,22 @@ export default {
   },
 
   teardown() {
-    this.keyTrapper.reset();
-    this.keyTrapper = null;
+    if (this.keyTrapper) {
+      this.keyTrapper.reset();
+      this.keyTrapper = null;
+    }
     this.container = null;
   },
 
+  isTornDown() {
+    return this.keyTrapper == null || this.container == null;
+  },
+
   bindKey(key, binding = null) {
+    if (this.isTornDown()) {
+      return;
+    }
+
     if (!binding) {
       binding = DEFAULT_BINDINGS[key];
     }
@@ -150,11 +165,29 @@ export default {
   // for cases when you want to disable global keyboard shortcuts
   // so that you can override them (e.g. inside a modal)
   pause(combinations) {
+    if (this.isTornDown()) {
+      return;
+    }
+
+    if (!combinations) {
+      this.keyTrapper.paused = true;
+      return;
+    }
+
     combinations.forEach((combo) => this.keyTrapper.unbind(combo));
   },
 
   // restore global shortcuts that you have paused
   unpause(combinations) {
+    if (this.isTornDown()) {
+      return;
+    }
+
+    if (!combinations) {
+      this.keyTrapper.paused = false;
+      return;
+    }
+
     combinations.forEach((combo) => this.bindKey(combo));
   },
 
@@ -169,6 +202,8 @@ export default {
    * - 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
+   * - click      - allows to provide a selector on which a click event
+   *                will be triggered, eg: { click: ".topic.last .title" }
    **/
   addShortcut(shortcut, callback, opts = {}) {
     // we trim but leave whitespace between characters, as shortcuts
@@ -183,7 +218,7 @@ export default {
   //   'c': createTopic
   // }
   unbind(combinations) {
-    this.pause(Object.keys(combinations));
+    Object.keys(combinations).forEach((combo) => this.keyTrapper.unbind(combo));
   },
 
   toggleBookmark(event) {
@@ -731,20 +766,21 @@ export default {
   },
 
   _stopCallback() {
-    const oldStopCallback = this.keyTrapper.prototype.stopCallback;
+    const prototype = Object.getPrototypeOf(this.keyTrapper);
+    const oldStopCallback = prototype.stopCallback;
+
+    prototype.stopCallback = function (e, element, combo, sequence) {
+      if (this.paused) {
+        return true;
+      }
 
-    this.keyTrapper.prototype.stopCallback = function (
-      e,
-      element,
-      combo,
-      sequence
-    ) {
       if (
         (combo === "ctrl+f" || combo === "command+f") &&
         element.id === "search-term"
       ) {
         return false;
       }
+
       return oldStopCallback.call(this, e, element, combo, sequence);
     };
   },
@@ -768,4 +804,16 @@ export default {
   toggleAdminActions() {
     this.appEvents.trigger("topic:toggle-actions");
   },
+
+  webviewKeyboardBack() {
+    if (isAppWebview()) {
+      window.history.back();
+    }
+  },
+
+  webviewKeyboardForward() {
+    if (isAppWebview()) {
+      window.history.forward();
+    }
+  },
 };
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 9f60bf9260..46390d0504 100644
--- a/app/assets/javascripts/discourse/app/lib/lazy-load-images.js
+++ b/app/assets/javascripts/discourse/app/lib/lazy-load-images.js
@@ -121,3 +121,20 @@ export function setupLazyLoading(api) {
     }
   );
 }
+
+export function nativeLazyLoading(api) {
+  api.decorateCookedElement(
+    (post) =>
+      forEachImage(post, (img) => {
+        img.loading = "lazy";
+        if (img.dataset.smallUpload) {
+          img.style = `background-image: url(${img.dataset.smallUpload}); background-size: cover;`;
+        }
+      }),
+    {
+      onlyStream: true,
+      id: "discourse-lazy-load-after-adopt",
+      afterAdopt: true,
+    }
+  );
+}
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox.js b/app/assets/javascripts/discourse/app/lib/lightbox.js
index 7bd934db2e..28563fb06d 100644
--- a/app/assets/javascripts/discourse/app/lib/lightbox.js
+++ b/app/assets/javascripts/discourse/app/lib/lightbox.js
@@ -1,13 +1,13 @@
-import I18n from "I18n";
-import loadScript from "discourse/lib/load-script";
 import {
   escapeExpression,
   isAppWebview,
   postRNWebviewMessage,
 } from "discourse/lib/utilities";
+import I18n from "I18n";
+import User from "discourse/models/user";
+import loadScript from "discourse/lib/load-script";
 import { renderIcon } from "discourse-common/lib/icon-library";
 import { spinnerHTML } from "discourse/helpers/loading-spinner";
-import User from "discourse/models/user";
 
 export default function (elem, siteSettings) {
   if (!elem) {
diff --git a/app/assets/javascripts/discourse/app/lib/link-hashtags.js b/app/assets/javascripts/discourse/app/lib/link-hashtags.js
index 202b9bb1b8..1d6f275a7c 100644
--- a/app/assets/javascripts/discourse/app/lib/link-hashtags.js
+++ b/app/assets/javascripts/discourse/app/lib/link-hashtags.js
@@ -1,7 +1,6 @@
-import { schedule } from "@ember/runloop";
+import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";
 import { ajax } from "discourse/lib/ajax";
 import { replaceSpan } from "discourse/lib/category-hashtags";
-import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";
 
 const categoryHashtags = {};
 const tagHashtags = {};
@@ -15,23 +14,25 @@ export function linkSeenHashtags($elem) {
 
   const slugs = [...$hashtags.map((_, hashtag) => hashtag.innerText.substr(1))];
 
-  schedule("afterRender", () => {
-    $hashtags.each((index, hashtag) => {
-      let slug = slugs[index];
-      const hasTagSuffix = slug.endsWith(TAG_HASHTAG_POSTFIX);
-      if (hasTagSuffix) {
-        slug = slug.substr(0, slug.length - TAG_HASHTAG_POSTFIX.length);
-      }
+  $hashtags.each((index, hashtag) => {
+    let slug = slugs[index];
+    const hasTagSuffix = slug.endsWith(TAG_HASHTAG_POSTFIX);
+    if (hasTagSuffix) {
+      slug = slug.substr(0, slug.length - TAG_HASHTAG_POSTFIX.length);
+    }
 
-      if (categoryHashtags[slug] && !hasTagSuffix) {
-        replaceSpan($(hashtag), slug, categoryHashtags[slug]);
-      } else if (tagHashtags[slug]) {
-        replaceSpan($(hashtag), slug, tagHashtags[slug]);
-      }
-    });
+    const lowerSlug = slug.toLowerCase();
+    if (categoryHashtags[lowerSlug] && !hasTagSuffix) {
+      replaceSpan($(hashtag), slug, categoryHashtags[lowerSlug]);
+    } else if (tagHashtags[lowerSlug]) {
+      replaceSpan($(hashtag), slug, tagHashtags[lowerSlug]);
+    }
   });
 
-  return slugs.uniq().filter((slug) => !checkedHashtags.has(slug));
+  return slugs
+    .map((slug) => slug.toLowerCase())
+    .uniq()
+    .filter((slug) => !checkedHashtags.has(slug));
 }
 
 export function fetchUnseenHashtags(slugs) {
diff --git a/app/assets/javascripts/discourse/app/lib/link-lookup.js b/app/assets/javascripts/discourse/app/lib/link-lookup.js
index 0d742da85f..84bf8d12a0 100644
--- a/app/assets/javascripts/discourse/app/lib/link-lookup.js
+++ b/app/assets/javascripts/discourse/app/lib/link-lookup.js
@@ -1,6 +1,10 @@
-const _warned = {};
+let _warned = {};
 const NO_RESULT = [false, null];
 
+export function reset() {
+  _warned = {};
+}
+
 export default class LinkLookup {
   constructor(links) {
     this._links = links;
@@ -11,7 +15,10 @@ export default class LinkLookup {
       return NO_RESULT;
     }
 
-    const normalized = href.replace(/^https?:\/\//, "").replace(/\/$/, "");
+    const normalized = href
+      .toLowerCase()
+      .replace(/^https?:\/\//, "")
+      .replace(/\/$/, "");
     if (_warned[normalized]) {
       return NO_RESULT;
     }
diff --git a/app/assets/javascripts/discourse/app/lib/link-mentions.js b/app/assets/javascripts/discourse/app/lib/link-mentions.js
index 915c683fc3..577a60c4db 100644
--- a/app/assets/javascripts/discourse/app/lib/link-mentions.js
+++ b/app/assets/javascripts/discourse/app/lib/link-mentions.js
@@ -1,8 +1,7 @@
-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";
 import { formatUsername } from "discourse/lib/utilities";
+import getURL from "discourse-common/lib/get-url";
+import { userPath } from "discourse/lib/url";
 
 let maxGroupMention;
 
@@ -42,23 +41,21 @@ const checked = {};
 const cannotSee = [];
 
 function updateFound($mentions, usernames) {
-  schedule("afterRender", function () {
-    $mentions.each((i, e) => {
-      const $e = $(e);
-      const username = usernames[i];
-      if (found[username.toLowerCase()]) {
-        replaceSpan($e, username, { cannot_see: cannotSee[username] });
-      } else if (mentionableGroups[username]) {
-        replaceSpan($e, username, {
-          group: true,
-          mentionable: mentionableGroups[username],
-        });
-      } else if (foundGroups[username]) {
-        replaceSpan($e, username, { group: true });
-      } else if (checked[username]) {
-        $e.addClass("mention-tested");
-      }
-    });
+  $mentions.each((i, e) => {
+    const $e = $(e);
+    const username = usernames[i];
+    if (found[username.toLowerCase()]) {
+      replaceSpan($e, username, { cannot_see: cannotSee[username] });
+    } else if (mentionableGroups[username]) {
+      replaceSpan($e, username, {
+        group: true,
+        mentionable: mentionableGroups[username],
+      });
+    } else if (foundGroups[username]) {
+      replaceSpan($e, username, { group: true });
+    } else if (checked[username]) {
+      $e.addClass("mention-tested");
+    }
   });
 }
 
diff --git a/app/assets/javascripts/discourse/app/lib/load-oneboxes.js b/app/assets/javascripts/discourse/app/lib/load-oneboxes.js
index c07d6abb48..0be10658ec 100644
--- a/app/assets/javascripts/discourse/app/lib/load-oneboxes.js
+++ b/app/assets/javascripts/discourse/app/lib/load-oneboxes.js
@@ -1,5 +1,5 @@
+import { LOADING_ONEBOX_CSS_CLASS, load } from "pretty-text/oneboxer";
 import { applyInlineOneboxes } from "pretty-text/inline-oneboxer";
-import { load, LOADING_ONEBOX_CSS_CLASS } from "pretty-text/oneboxer";
 
 export function loadOneboxes(
   container,
@@ -7,7 +7,8 @@ export function loadOneboxes(
   topicId,
   categoryId,
   maxOneboxes,
-  refresh
+  refresh,
+  offline
 ) {
   const oneboxes = {};
   const inlineOneboxes = {};
@@ -22,36 +23,42 @@ export function loadOneboxes(
   container
     .querySelectorAll(`a.onebox, a.inline-onebox-loading`)
     .forEach((link) => {
-      const text = link.textContent;
-      const isInline = link.getAttribute("class") === "inline-onebox-loading";
-      const m = isInline ? inlineOneboxes : oneboxes;
+      const isInline = link.classList.contains("inline-onebox-loading");
+
+      // maps URLs to their link elements
+      const map = isInline ? inlineOneboxes : oneboxes;
 
       if (loadedOneboxes < maxOneboxes) {
-        if (m[text] === undefined) {
-          m[text] = [];
+        if (map[link.href] === undefined) {
+          map[link.href] = [];
           loadedOneboxes++;
         }
-        m[text].push(link);
+        map[link.href].push(link);
       } else {
-        if (m[text] !== undefined) {
-          m[text].push(link);
+        if (map[link.href] !== undefined) {
+          map[link.href].push(link);
         } else if (isInline) {
           link.classList.remove("inline-onebox-loading");
         }
       }
     });
 
-  let newBoxes = 0;
-
   if (Object.keys(oneboxes).length > 0) {
-    _loadOneboxes(oneboxes, ajax, newBoxes, topicId, categoryId, refresh);
+    _loadOneboxes({
+      oneboxes,
+      ajax,
+      topicId,
+      categoryId,
+      refresh,
+      offline,
+    });
   }
 
   if (Object.keys(inlineOneboxes).length > 0) {
     _loadInlineOneboxes(inlineOneboxes, ajax, topicId, categoryId);
   }
 
-  return newBoxes;
+  return Object.keys(oneboxes).length + Object.keys(inlineOneboxes).length;
 }
 
 function _loadInlineOneboxes(inline, ajax, topicId, categoryId) {
@@ -61,18 +68,24 @@ function _loadInlineOneboxes(inline, ajax, topicId, categoryId) {
   });
 }
 
-function _loadOneboxes(oneboxes, ajax, count, topicId, categoryId, refresh) {
+function _loadOneboxes({
+  oneboxes,
+  ajax,
+  topicId,
+  categoryId,
+  refresh,
+  offline,
+}) {
   Object.values(oneboxes).forEach((onebox) => {
-    onebox.forEach((o) => {
+    onebox.forEach((elem) => {
       load({
-        elem: o,
-        refresh,
+        elem,
         ajax,
-        categoryId: categoryId,
-        topicId: topicId,
+        categoryId,
+        topicId,
+        refresh,
+        offline,
       });
-
-      count++;
     });
   });
 }
diff --git a/app/assets/javascripts/discourse/app/lib/load-script.js b/app/assets/javascripts/discourse/app/lib/load-script.js
index 004be25f8b..9eebebff36 100644
--- a/app/assets/javascripts/discourse/app/lib/load-script.js
+++ b/app/assets/javascripts/discourse/app/lib/load-script.js
@@ -1,8 +1,8 @@
 import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
-import { run } from "@ember/runloop";
-import { ajax } from "discourse/lib/ajax";
 import { PUBLIC_JS_VERSIONS } from "discourse/lib/public-js-versions";
 import { Promise } from "rsvp";
+import { ajax } from "discourse/lib/ajax";
+import { run } from "@ember/runloop";
 
 const _loaded = {};
 const _loading = {};
diff --git a/app/assets/javascripts/discourse/app/lib/lock-on.js b/app/assets/javascripts/discourse/app/lib/lock-on.js
index 941e7d4a98..b8a86ae2f6 100644
--- a/app/assets/javascripts/discourse/app/lib/lock-on.js
+++ b/app/assets/javascripts/discourse/app/lib/lock-on.js
@@ -1,5 +1,5 @@
-import { minimumOffset } from "discourse/lib/offset-calculator";
 import { bind } from "discourse-common/utils/decorators";
+import { minimumOffset } from "discourse/lib/offset-calculator";
 
 // Dear traveller, you are entering a zone where we are at war with the browser.
 // The browser is insisting on positioning scrollTop per the location it was in
@@ -41,7 +41,14 @@ export default class LockOn {
     }
 
     const { top } = element.getBoundingClientRect();
-    const offset = top + window.scrollY;
+    let offset = top + window.scrollY;
+    if (this.options.originalTopOffset) {
+      // if element's original top offset is in the bottom half of the viewport
+      // jump to it, otherwise respect the offset
+      if (window.innerHeight / 2.25 > this.options.originalTopOffset) {
+        return offset - this.options.originalTopOffset;
+      }
+    }
 
     return offset - minimumOffset();
   }
@@ -118,6 +125,11 @@ export default class LockOn {
       this.previousTop = top;
     }
 
+    // Stop early when maintaining the original offset
+    if (this.options.originalTopOffset) {
+      return this.clearLock();
+    }
+
     // Stop after a little while
     if (Date.now() - this.startedAt > LOCK_DURATION_MS) {
       return this.clearLock();
diff --git a/app/assets/javascripts/discourse/app/lib/logout.js b/app/assets/javascripts/discourse/app/lib/logout.js
index e1d73befef..637d85764d 100644
--- a/app/assets/javascripts/discourse/app/lib/logout.js
+++ b/app/assets/javascripts/discourse/app/lib/logout.js
@@ -1,6 +1,6 @@
 import getURL from "discourse-common/lib/get-url";
-import { isEmpty } from "@ember/utils";
 import { helperContext } from "discourse-common/lib/helpers";
+import { isEmpty } from "@ember/utils";
 
 export default function logout({ redirect } = {}) {
   const ctx = helperContext();
diff --git a/app/assets/javascripts/discourse/app/lib/mobile.js b/app/assets/javascripts/discourse/app/lib/mobile.js
index e7c1543948..a35cfcee6d 100644
--- a/app/assets/javascripts/discourse/app/lib/mobile.js
+++ b/app/assets/javascripts/discourse/app/lib/mobile.js
@@ -27,7 +27,7 @@ const Mobile = {
         localStorage.removeItem("mobileView");
       }
       if (localStorage.mobileView) {
-        var savedValue = localStorage.mobileView === "true";
+        let savedValue = localStorage.mobileView === "true";
         if (savedValue !== this.mobileView) {
           this.reloadPage(savedValue);
         }
diff --git a/app/assets/javascripts/discourse/app/lib/page-visible.js b/app/assets/javascripts/discourse/app/lib/page-visible.js
index 7733a9d747..0771a2f3c0 100644
--- a/app/assets/javascripts/discourse/app/lib/page-visible.js
+++ b/app/assets/javascripts/discourse/app/lib/page-visible.js
@@ -1,5 +1,5 @@
 // for android we test webkit
-var hiddenProperty =
+let hiddenProperty =
   document.hidden !== undefined
     ? "hidden"
     : document.webkitHidden !== undefined
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 8bdce675b9..21c7142637 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -1,76 +1,79 @@
-import deprecated from "discourse-common/lib/deprecated";
-import { addDecorator } from "discourse/widgets/post-cooked";
-import { addPluginOutletDecorator } from "discourse/components/plugin-connector";
-import { addTopicTitleDecorator } from "discourse/components/topic-title";
-import DiscourseBanner from "discourse/components/discourse-banner";
-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";
-import { addWidgetCleanCallback } from "discourse/components/mount-widget";
-import { addGlobalNotice } from "discourse/components/global-notice";
-import {
-  createWidget,
-  reopenWidget,
-  decorateWidget,
-  changeSetting,
-  queryRegistry,
-} from "discourse/widgets/widget";
-import {
-  preventCloak,
-  addPostTransformCallback,
-} from "discourse/widgets/post-stream";
-import { h } from "virtual-dom";
-import { addPopupMenuOptionsCallback } from "discourse/controllers/composer";
-import { extraConnectorClass } from "discourse/lib/plugin-connectors";
-import { addPostSmallActionIcon } from "discourse/widgets/post-small-action";
-import { registerTopicFooterButton } from "discourse/lib/register-topic-footer-button";
-import { addDiscoveryQueryParam } from "discourse/controllers/discovery-sortable";
-import { addTagsHtmlCallback } from "discourse/lib/render-tags";
-import { addUserMenuGlyph } from "discourse/widgets/user-menu";
-import { addPostClassesCallback } from "discourse/widgets/post";
-import {
-  attachAdditionalPanel,
-  addToHeaderIcons,
-} from "discourse/widgets/header";
-import {
-  registerIconRenderer,
-  replaceIcon,
-  iconNode,
-} from "discourse-common/lib/icon-library";
-import { replaceTagRenderer } from "discourse/lib/render-tag";
-import { addNavItem } from "discourse/models/nav-item";
-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";
 import ComposerEditor, {
   addComposerUploadHandler,
   addComposerUploadMarkdownResolver,
+  addComposerUploadProcessor,
 } from "discourse/components/composer-editor";
-import { addCategorySortCriteria } from "discourse/components/edit-category-settings";
+import { addButton, removeButton } from "discourse/widgets/post-menu";
 import {
   addExtraIconRenderer,
   replaceCategoryLinkRenderer,
 } from "discourse/helpers/category-link";
-import Composer from "discourse/models/composer";
-import { on } from "@ember/object/evented";
-import { addQuickAccessProfileItem } from "discourse/widgets/quick-access-profile";
-import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
-import { addFeaturedLinkMetaDecorator } from "discourse/lib/render-topic-featured-link";
-import { getOwner } from "discourse-common/lib/get-owner";
-import { addAdvancedSearchOptions } from "discourse/components/search-advanced-options";
+import {
+  addPostTransformCallback,
+  preventCloak,
+} from "discourse/widgets/post-stream";
 import {
   addSaveableUserField,
   addSaveableUserOptionField,
 } from "discourse/models/user";
+import {
+  addToHeaderIcons,
+  attachAdditionalPanel,
+} from "discourse/widgets/header";
+import {
+  changeSetting,
+  createWidget,
+  decorateWidget,
+  queryRegistry,
+  reopenWidget,
+} from "discourse/widgets/widget";
+import {
+  iconNode,
+  registerIconRenderer,
+  replaceIcon,
+} from "discourse-common/lib/icon-library";
+import Composer from "discourse/models/composer";
+import DiscourseBanner from "discourse/components/discourse-banner";
+import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
+import Sharing from "discourse/lib/sharing";
+import { addAdvancedSearchOptions } from "discourse/components/search-advanced-options";
+import { addCategorySortCriteria } from "discourse/components/edit-category-settings";
+import { addDecorator } from "discourse/widgets/post-cooked";
+import { addDiscoveryQueryParam } from "discourse/controllers/discovery-sortable";
+import { addFeaturedLinkMetaDecorator } from "discourse/lib/render-topic-featured-link";
+import { addGTMPageChangedCallback } from "discourse/lib/page-tracker";
+import { addGlobalNotice } from "discourse/components/global-notice";
+import { addNavItem } from "discourse/models/nav-item";
+import { addPluginOutletDecorator } from "discourse/components/plugin-connector";
+import { addPluginReviewableParam } from "discourse/components/reviewable-item";
+import { addPopupMenuOptionsCallback } from "discourse/controllers/composer";
+import { addPostClassesCallback } from "discourse/widgets/post";
+import { addPostSmallActionIcon } from "discourse/widgets/post-small-action";
+import { addQuickAccessProfileItem } from "discourse/widgets/quick-access-profile";
+import { addTagsHtmlCallback } from "discourse/lib/render-tags";
+import { addToolbarCallback } from "discourse/components/d-editor";
+import { addTopicTitleDecorator } from "discourse/components/topic-title";
+import { addUserMenuGlyph } from "discourse/widgets/user-menu";
+import { addUsernameSelectorDecorator } from "discourse/helpers/decorate-username-selector";
+import { addWidgetCleanCallback } from "discourse/components/mount-widget";
+import deprecated from "discourse-common/lib/deprecated";
+import { disableNameSuppression } from "discourse/widgets/poster-name";
+import { extraConnectorClass } from "discourse/lib/plugin-connectors";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { h } from "virtual-dom";
+import { includeAttributes } from "discourse/lib/transform-post";
+import { modifySelectKit } from "select-kit/mixins/plugin-api";
+import { on } from "@ember/object/evented";
+import { registerCustomAvatarHelper } from "discourse/helpers/user-avatar";
+import { registerCustomPostMessageCallback as registerCustomPostMessageCallback1 } from "discourse/controllers/topic";
+import { registerHighlightJSLanguage } from "discourse/lib/highlight-syntax";
+import { registerTopicFooterButton } from "discourse/lib/register-topic-footer-button";
+import { replaceFormatter } from "discourse/lib/utilities";
+import { replaceTagRenderer } from "discourse/lib/render-tag";
+import { setNewCategoryDefaultColors } from "discourse/routes/new-category";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.11.1";
+const PLUGIN_API_VERSION = "0.11.3";
 
 class PluginApi {
   constructor(version, container) {
@@ -737,10 +740,10 @@ class PluginApi {
    * example:
    *
    * api.addUserMenuGlyph({
-   *    label: 'awesome.label',
+   *    title: 'awesome.label',
    *    className: 'my-class',
    *    icon: 'my-icon',
-   *    href: `/some/path`
+   *    data: { url: `/some/path` },
    * });
    *
    */
@@ -931,6 +934,31 @@ class PluginApi {
     addComposerUploadHandler(extensions, method);
   }
 
+  /**
+   * Registers a pre-processor for file uploads
+   * See https://github.com/blueimp/jQuery-File-Upload/wiki/Options#file-processing-options
+   * Your theme/plugin will also need to load https://github.com/blueimp/jQuery-File-Upload/blob/v10.13.0/js/jquery.fileupload-process.js
+   * for this hook to work.
+   *
+   * Useful for transforming to-be uploaded files client-side
+   *
+   * Example:
+   *
+   * api.addComposerUploadProcessor({action: 'myFileTransformation'}, {
+   *    myFileTransformation: function (data, options) {
+   *      let p = new Promise((resolve, reject) => {
+   *        let file = data.files[data.index];
+   *        console.log(`Transforming ${file.name}`);
+   *        // do work...
+   *        resolve(data);
+   *      });
+   *      return p;
+   * });
+   */
+  addComposerUploadProcessor(queueItem, actionItem) {
+    addComposerUploadProcessor(queueItem, actionItem);
+  }
+
   /**
    * Registers a function to generate Markdown after a file has been uploaded.
    *
@@ -1221,17 +1249,34 @@ class PluginApi {
   addSaveableUserOptionField(fieldName) {
     addSaveableUserOptionField(fieldName);
   }
-}
+  addPluginReviewableParam(reviewableType, param) {
+    addPluginReviewableParam(reviewableType, param);
+  }
 
-let _pluginv01;
+  /**
+   * Change the default category background and text colors in the
+   * category creation modal.
+   *
+   * ```
+   * api.setNewCategoryDefaultColors(
+   *   'FFFFFF', // background color
+   *   '000000'  // text color
+   *  )
+   * ```
+   *
+   **/
+  setNewCategoryDefaultColors(backgroundColor, textColor) {
+    setNewCategoryDefaultColors(backgroundColor, textColor);
+  }
+}
 
 // from http://stackoverflow.com/questions/6832596/how-to-compare-software-version-number-using-js-only-number
 function cmpVersions(a, b) {
-  var i, diff;
-  var regExStrip0 = /(\.0+)+$/;
-  var segmentsA = a.replace(regExStrip0, "").split(".");
-  var segmentsB = b.replace(regExStrip0, "").split(".");
-  var l = Math.min(segmentsA.length, segmentsB.length);
+  let i, diff;
+  let regExStrip0 = /(\.0+)+$/;
+  let segmentsA = a.replace(regExStrip0, "").split(".");
+  let segmentsB = b.replace(regExStrip0, "").split(".");
+  let l = Math.min(segmentsA.length, segmentsB.length);
 
   for (i = 0; i < l; i++) {
     diff = parseInt(segmentsA[i], 10) - parseInt(segmentsB[i], 10);
@@ -1244,16 +1289,24 @@ function cmpVersions(a, b) {
 
 function getPluginApi(version) {
   version = version.toString();
+
   if (cmpVersions(version, PLUGIN_API_VERSION) <= 0) {
-    if (!_pluginv01) {
-      _pluginv01 = new PluginApi(version, getOwner(this));
+    const owner = getOwner(this);
+    let pluginApi = owner.lookup("plugin-api:main");
+
+    if (!pluginApi) {
+      pluginApi = new PluginApi(version, owner);
+      owner.registry.register("plugin-api:main", pluginApi, {
+        instantiate: false,
+      });
     }
 
     // We are recycling the compatible object, but let's update to the higher version
-    if (_pluginv01.version < version) {
-      _pluginv01.version = version;
+    if (pluginApi.version < version) {
+      pluginApi.version = version;
     }
-    return _pluginv01;
+
+    return pluginApi;
   } else {
     // eslint-disable-next-line no-console
     console.warn(`Plugin API v${version} is not supported`);
@@ -1306,7 +1359,3 @@ function decorate(klass, evt, cb, id) {
   });
   klass.reopen(mixin);
 }
-
-export function resetPluginApi() {
-  _pluginv01 = null;
-}
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-connectors.js b/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
index a722b7cd60..16b7fafdb3 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
@@ -1,6 +1,6 @@
 import Site from "discourse/models/site";
-import deprecated from "discourse-common/lib/deprecated";
 import { buildRawConnectorCache } from "discourse-common/lib/raw-templates";
+import deprecated from "discourse-common/lib/deprecated";
 
 let _connectorCache;
 let _rawConnectorCache;
diff --git a/app/assets/javascripts/discourse/app/lib/public-js-versions.js b/app/assets/javascripts/discourse/app/lib/public-js-versions.js
index ba845fe8a7..8ec95682a3 100644
--- a/app/assets/javascripts/discourse/app/lib/public-js-versions.js
+++ b/app/assets/javascripts/discourse/app/lib/public-js-versions.js
@@ -3,9 +3,11 @@
 
 export const PUBLIC_JS_VERSIONS = {
   "ace/ace.js": "ace.js/1.4.12/ace.js",
-  "Chart.min.js": "chart.js/2.9.3/Chart.min.js",
+  "jsoneditor.js": "@json-editor/json-editor/2.5.2/jsoneditor.js",
+  "Chart.min.js": "chart.js/2.9.4/Chart.min.js",
   "chartjs-plugin-datalabels.min.js":
     "chartjs-plugin-datalabels/0.7.0/chartjs-plugin-datalabels.min.js",
+  "diffhtml.min.js": "diffhtml/1.0.0-beta.18/diffhtml.min.js",
   "jquery.magnific-popup.min.js":
     "magnific-popup/1.1.0/jquery.magnific-popup.min.js",
   "pikaday.js": "pikaday/1.8.0/pikaday.js",
diff --git a/app/assets/javascripts/discourse/app/lib/push-notifications.js b/app/assets/javascripts/discourse/app/lib/push-notifications.js
index 40d4f27a2c..7d1012ba36 100644
--- a/app/assets/javascripts/discourse/app/lib/push-notifications.js
+++ b/app/assets/javascripts/discourse/app/lib/push-notifications.js
@@ -1,5 +1,5 @@
-import { ajax } from "discourse/lib/ajax";
 import KeyValueStore from "discourse/lib/key-value-store";
+import { ajax } from "discourse/lib/ajax";
 
 export const keyValueStore = new KeyValueStore("discourse_push_notifications_");
 
@@ -53,7 +53,7 @@ export function isPushNotificationsSupported(mobileView) {
   if (
     !(
       "serviceWorker" in navigator &&
-      ServiceWorkerRegistration &&
+      typeof ServiceWorkerRegistration !== "undefined" &&
       typeof Notification !== "undefined" &&
       "showNotification" in ServiceWorkerRegistration.prototype &&
       "PushManager" in window
@@ -75,6 +75,7 @@ export function isPushNotificationsSupported(mobileView) {
 export function isPushNotificationsEnabled(user, mobileView) {
   return (
     user &&
+    !user.isInDoNotDisturb() &&
     isPushNotificationsSupported(mobileView) &&
     keyValueStore.getItem(userSubscriptionKey(user))
   );
diff --git a/app/assets/javascripts/discourse/app/lib/put-cursor-at-end.js b/app/assets/javascripts/discourse/app/lib/put-cursor-at-end.js
index a8c483e479..8286036b4f 100644
--- a/app/assets/javascripts/discourse/app/lib/put-cursor-at-end.js
+++ b/app/assets/javascripts/discourse/app/lib/put-cursor-at-end.js
@@ -1,5 +1,5 @@
-import positioningWorkaround from "discourse/lib/safari-hacks";
 import { isAppleDevice } from "discourse/lib/utilities";
+import positioningWorkaround from "discourse/lib/safari-hacks";
 
 export default function (element) {
   if (isAppleDevice() && positioningWorkaround.touchstartEvent) {
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 27f6130c10..cdafab891f 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,6 +1,6 @@
 import I18n from "I18n";
-import error from "@ember/error";
 import { computed } from "@ember/object";
+import error from "@ember/error";
 
 let _topicFooterButtons = {};
 
diff --git a/app/assets/javascripts/discourse/app/lib/render-tag.js b/app/assets/javascripts/discourse/app/lib/render-tag.js
index fbc7ab62c8..d545ad10bc 100644
--- a/app/assets/javascripts/discourse/app/lib/render-tag.js
+++ b/app/assets/javascripts/discourse/app/lib/render-tag.js
@@ -1,6 +1,6 @@
-import getURL from "discourse-common/lib/get-url";
 import User from "discourse/models/user";
 import { escapeExpression } from "discourse/lib/utilities";
+import getURL from "discourse-common/lib/get-url";
 import { helperContext } from "discourse-common/lib/helpers";
 
 let _renderer = defaultRenderTag;
diff --git a/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js b/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js
index 13d83c0064..5c3f0b4b24 100644
--- a/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js
+++ b/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js
@@ -1,6 +1,6 @@
+import User from "discourse/models/user";
 import { h } from "virtual-dom";
 import { renderIcon } from "discourse-common/lib/icon-library";
-import User from "discourse/models/user";
 
 const _decorators = [];
 
diff --git a/app/assets/javascripts/discourse/app/lib/reports-loader.js b/app/assets/javascripts/discourse/app/lib/reports-loader.js
index 675f296ef9..afd0b132ee 100644
--- a/app/assets/javascripts/discourse/app/lib/reports-loader.js
+++ b/app/assets/javascripts/discourse/app/lib/reports-loader.js
@@ -1,6 +1,5 @@
-import { run } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
-const { debounce } = run;
+import discourseDebounce from "discourse-common/lib/debounce";
 
 let _queue = [];
 let _processing = 0;
@@ -33,7 +32,7 @@ export default {
 
     _queue.push({ runnable: () => callback, type, params });
 
-    debounce(this, this._processQueue, DEBOUNCING_DELAY);
+    discourseDebounce(this, this._processQueue, DEBOUNCING_DELAY);
   },
 
   _processQueue() {
@@ -50,7 +49,7 @@ export default {
 
     // if queue has still jobs after splice, we request a future processing
     if (_queue.length > 0) {
-      debounce(this, this._processQueue, DEBOUNCING_DELAY);
+      discourseDebounce(this, this._processQueue, DEBOUNCING_DELAY);
     }
 
     let reports = {};
@@ -79,7 +78,7 @@ export default {
       .finally(() => {
         _processing--;
 
-        debounce(this, this._processQueue, DEBOUNCING_DELAY);
+        discourseDebounce(this, this._processQueue, DEBOUNCING_DELAY);
       });
   },
 
diff --git a/app/assets/javascripts/discourse/app/lib/safari-hacks.js b/app/assets/javascripts/discourse/app/lib/safari-hacks.js
index 03e286d605..1bea1a5f07 100644
--- a/app/assets/javascripts/discourse/app/lib/safari-hacks.js
+++ b/app/assets/javascripts/discourse/app/lib/safari-hacks.js
@@ -1,11 +1,11 @@
-import { later } from "@ember/runloop";
-import discourseDebounce from "discourse/lib/debounce";
 import {
-  safariHacksDisabled,
   iOSWithVisualViewport,
+  safariHacksDisabled,
 } from "discourse/lib/utilities";
 import { INPUT_DELAY } from "discourse-common/config/environment";
+import discourseDebounce from "discourse-common/lib/debounce";
 import { helperContext } from "discourse-common/lib/helpers";
+import { later } from "@ember/runloop";
 
 // TODO: remove calcHeight once iOS 13 adoption > 90%
 // In iOS 13 and up we use visualViewport API to calculate height
@@ -93,7 +93,7 @@ function positioningWorkaround($fixedElement) {
   const fixedElement = $fixedElement[0];
   const oldHeight = fixedElement.style.height;
 
-  var originalScrollTop = 0;
+  let originalScrollTop = 0;
   let lastTouchedElement = null;
 
   positioningWorkaround.blur = function (evt) {
@@ -114,7 +114,7 @@ function positioningWorkaround($fixedElement) {
     }
   };
 
-  var blurredNow = function (evt) {
+  let blurredNow = function (evt) {
     // we cannot use evt.relatedTarget to get the last focused element in safari iOS
     // document.activeElement is also unreliable (iOS does not mark buttons as focused)
     // so instead, we store the last touched element and check against it
@@ -145,9 +145,11 @@ function positioningWorkaround($fixedElement) {
     positioningWorkaround.blur(evt);
   };
 
-  var blurred = discourseDebounce(blurredNow, INPUT_DELAY);
+  let blurred = function (evt) {
+    discourseDebounce(this, blurredNow, evt, INPUT_DELAY);
+  };
 
-  var positioningHack = function (evt) {
+  let positioningHack = function (evt) {
     let _this = this;
 
     if (evt === undefined) {
@@ -201,7 +203,7 @@ function positioningWorkaround($fixedElement) {
     }, delay);
   };
 
-  var lastTouched = function (evt) {
+  let lastTouched = function (evt) {
     if (evt && evt.target) {
       lastTouchedElement = evt.target;
     }
@@ -214,16 +216,22 @@ function positioningWorkaround($fixedElement) {
     }
   }
 
-  const checkForInputs = discourseDebounce(function () {
-    attachTouchStart(fixedElement, lastTouched);
+  const checkForInputs = function () {
+    discourseDebounce(
+      this,
+      function () {
+        attachTouchStart(fixedElement, lastTouched);
 
-    $fixedElement.find("input[type=text],textarea").each(function () {
-      attachTouchStart(this, positioningHack);
-    });
-  }, 100);
+        $fixedElement.find("input[type=text],textarea").each(function () {
+          attachTouchStart(this, positioningHack);
+        });
+      },
+      100
+    );
+  };
 
   positioningWorkaround.touchstartEvent = function (element) {
-    var triggerHack = positioningHack.bind(element);
+    let triggerHack = positioningHack.bind(element);
     triggerHack();
   };
 
diff --git a/app/assets/javascripts/discourse/app/lib/screen-track.js b/app/assets/javascripts/discourse/app/lib/screen-track.js
index 5ef5798967..0e17697f0e 100644
--- a/app/assets/javascripts/discourse/app/lib/screen-track.js
+++ b/app/assets/javascripts/discourse/app/lib/screen-track.js
@@ -1,6 +1,6 @@
 import { ajax } from "discourse/lib/ajax";
-import { isTesting } from "discourse-common/config/environment";
 import { bind } from "discourse-common/utils/decorators";
+import { isTesting } from "discourse-common/config/environment";
 
 // We use this class to track how long posts in a topic are on the screen.
 const PAUSE_UNLESS_SCROLLED = 1000 * 60 * 3;
@@ -11,11 +11,18 @@ const AJAX_FAILURE_DELAYS = [5000, 10000, 20000, 40000];
 const ALLOWED_AJAX_FAILURES = [405, 429, 500, 501, 502, 503, 504];
 
 export default class {
-  constructor(topicTrackingState, siteSettings, session, currentUser) {
+  constructor(
+    topicTrackingState,
+    siteSettings,
+    session,
+    currentUser,
+    appEvents
+  ) {
     this.topicTrackingState = topicTrackingState;
     this.siteSettings = siteSettings;
     this.session = session;
     this.currentUser = currentUser;
+    this.appEvents = appEvents;
     this.reset();
     this._consolidatedTimings = [];
   }
@@ -139,15 +146,16 @@ export default class {
     this._ajaxFailures = this._ajaxFailures || 0;
 
     const { timings, topicTime, topicId } = this._consolidatedTimings.pop();
+    const data = {
+      timings: timings,
+      topic_time: topicTime,
+      topic_id: topicId,
+    };
 
     this._inProgress = true;
 
     ajax("/topics/timings", {
-      data: {
-        timings: timings,
-        topic_time: topicTime,
-        topic_id: topicId,
-      },
+      data,
       cache: false,
       type: "POST",
       headers: {
@@ -162,6 +170,7 @@ export default class {
           const postNumbers = Object.keys(timings).map((v) => parseInt(v, 10));
           topicController.readPosts(topicId, postNumbers);
         }
+        this.appEvents.trigger("topic:timings-sent", data);
       })
       .catch((e) => {
         if (ALLOWED_AJAX_FAILURES.indexOf(e.jqXHR.status) > -1) {
diff --git a/app/assets/javascripts/discourse/app/lib/search.js b/app/assets/javascripts/discourse/app/lib/search.js
index fe5d7a6cf0..e5b2002f0b 100644
--- a/app/assets/javascripts/discourse/app/lib/search.js
+++ b/app/assets/javascripts/discourse/app/lib/search.js
@@ -1,19 +1,19 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import EmberObject from "@ember/object";
-import { ajax } from "discourse/lib/ajax";
-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";
-import { userPath } from "discourse/lib/url";
-import { emojiUnescape } from "discourse/lib/text";
-import User from "discourse/models/user";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
 import Post from "discourse/models/post";
 import Topic from "discourse/models/topic";
-import { escapeExpression } from "discourse/lib/utilities";
+import User from "discourse/models/user";
+import { ajax } from "discourse/lib/ajax";
 import { deepMerge } from "discourse-common/lib/object";
+import { emojiUnescape } from "discourse/lib/text";
+import { escapeExpression } from "discourse/lib/utilities";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
+import getURL from "discourse-common/lib/get-url";
+import { isEmpty } from "@ember/utils";
+import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
+import { userPath } from "discourse/lib/url";
+import userSearch from "discourse/lib/user-search";
 
 export function translateResults(results, opts) {
   opts = opts || {};
@@ -220,6 +220,7 @@ export function applySearchAutocomplete(
         key: "#",
         width: "100%",
         treatAsTextarea: true,
+        autoSelectFirstSuggestion: false,
         transformComplete(obj) {
           return obj.text;
         },
@@ -240,6 +241,7 @@ export function applySearchAutocomplete(
           key: "@",
           width: "100%",
           treatAsTextarea: true,
+          autoSelectFirstSuggestion: false,
           transformComplete: (v) => v.username || v.name,
           dataSource: (term) => userSearch({ term, includeGroups: true }),
           afterComplete,
diff --git a/app/assets/javascripts/discourse/app/lib/settings.js b/app/assets/javascripts/discourse/app/lib/settings.js
index 2de9fb7f35..fe3da6cfd3 100644
--- a/app/assets/javascripts/discourse/app/lib/settings.js
+++ b/app/assets/javascripts/discourse/app/lib/settings.js
@@ -7,3 +7,11 @@ export function prioritizeNameInUx(name) {
     !siteSettings.prioritize_username_in_ux && name && name.trim().length > 0
   );
 }
+
+export function emojiBasePath() {
+  let siteSettings = helperContext().siteSettings;
+
+  return siteSettings.external_emoji_url === ""
+    ? "/images/emoji"
+    : siteSettings.external_emoji_url;
+}
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 c2056a7a15..200714b4f3 100644
--- a/app/assets/javascripts/discourse/app/lib/static-route-builder.js
+++ b/app/assets/javascripts/discourse/app/lib/static-route-builder.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import DiscourseRoute from "discourse/routes/discourse";
-import StaticPage from "discourse/models/static-page";
 import DiscourseURL, { jumpToElement } from "discourse/lib/url";
+import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
+import StaticPage from "discourse/models/static-page";
 
 const configs = {
   faq: "faq_url",
diff --git a/app/assets/javascripts/discourse/app/lib/text-direction.js b/app/assets/javascripts/discourse/app/lib/text-direction.js
index 013cbdaed4..b3da0964b6 100644
--- a/app/assets/javascripts/discourse/app/lib/text-direction.js
+++ b/app/assets/javascripts/discourse/app/lib/text-direction.js
@@ -29,3 +29,7 @@ export function siteDir() {
   }
   return _siteDir;
 }
+
+export function isDocumentRTL() {
+  return siteDir() === "rtl";
+}
diff --git a/app/assets/javascripts/discourse/app/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js
index a46500e5d4..f12acbfab7 100644
--- a/app/assets/javascripts/discourse/app/lib/text.js
+++ b/app/assets/javascripts/discourse/app/lib/text.js
@@ -1,14 +1,14 @@
-import { getURLWithCDN } from "discourse-common/lib/get-url";
 import PrettyText, { buildOptions } from "pretty-text/pretty-text";
-import { performEmojiUnescape, buildEmojiUrl } from "pretty-text/emoji";
+import { buildEmojiUrl, performEmojiUnescape } from "pretty-text/emoji";
 import AllowLister from "pretty-text/allow-lister";
-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";
-import { helperContext } from "discourse-common/lib/helpers";
 import Session from "discourse/models/session";
+import { formatUsername } from "discourse/lib/utilities";
+import { getURLWithCDN } from "discourse-common/lib/get-url";
+import { helperContext } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
+import loadScript from "discourse/lib/load-script";
+import { sanitize as textSanitize } from "pretty-text/sanitizer";
 
 function getOpts(opts) {
   let context = helperContext();
@@ -21,6 +21,7 @@ function getOpts(opts) {
       customEmojiTranslation: context.site.custom_emoji_translation,
       siteSettings: context.siteSettings,
       formatUsername,
+      watchedWordsReplacements: context.site.watched_words_replace,
     },
     opts
   );
@@ -89,6 +90,7 @@ function emojiOptions() {
     emojiSet: siteSettings.emoji_set,
     enableEmojiShortcuts: siteSettings.enable_emoji_shortcuts,
     inlineEmoji: siteSettings.enable_inline_emoji_translation,
+    emojiCDNUrl: siteSettings.external_emoji_url,
   };
 }
 
diff --git a/app/assets/javascripts/discourse/app/lib/theme-selector.js b/app/assets/javascripts/discourse/app/lib/theme-selector.js
index 8b9f194bbd..32326b4a88 100644
--- a/app/assets/javascripts/discourse/app/lib/theme-selector.js
+++ b/app/assets/javascripts/discourse/app/lib/theme-selector.js
@@ -1,6 +1,6 @@
+import cookie, { removeCookie } from "discourse/lib/cookie";
 import I18n from "I18n";
 import deprecated from "discourse-common/lib/deprecated";
-import cookie, { removeCookie } from "discourse/lib/cookie";
 
 const keySelector = "meta[name=discourse_theme_ids]";
 
diff --git a/app/assets/javascripts/discourse/app/lib/theme-settings-store.js b/app/assets/javascripts/discourse/app/lib/theme-settings-store.js
new file mode 100644
index 0000000000..6503d6b932
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/theme-settings-store.js
@@ -0,0 +1,47 @@
+import { get } from "@ember/object";
+
+const originalSettings = {};
+const settings = {};
+
+export function registerSettings(
+  themeId,
+  settingsObject,
+  { force = false } = {}
+) {
+  if (settings[themeId] && !force) {
+    return;
+  }
+  originalSettings[themeId] = Object.assign({}, settingsObject);
+  const s = {};
+  Object.keys(settingsObject).forEach((key) => {
+    Object.defineProperty(s, key, {
+      enumerable: true,
+      get() {
+        return settingsObject[key];
+      },
+      set(newVal) {
+        settingsObject[key] = newVal;
+      },
+    });
+  });
+  settings[themeId] = s;
+}
+
+export function getSetting(themeId, settingKey) {
+  if (settings[themeId]) {
+    return get(settings[themeId], settingKey);
+  }
+  return null;
+}
+
+export function getObjectForTheme(themeId) {
+  return settings[themeId];
+}
+
+export function resetSettings() {
+  Object.keys(originalSettings).forEach((themeId) => {
+    Object.keys(originalSettings[themeId]).forEach((key) => {
+      settings[themeId][key] = originalSettings[themeId][key];
+    });
+  });
+}
diff --git a/app/assets/javascripts/discourse/app/lib/time-shortcut.js b/app/assets/javascripts/discourse/app/lib/time-shortcut.js
new file mode 100644
index 0000000000..ddb4af4493
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/time-shortcut.js
@@ -0,0 +1,109 @@
+import {
+  MOMENT_MONDAY,
+  laterThisWeek,
+  laterToday,
+  nextBusinessWeekStart,
+  nextMonth,
+  nextWeek,
+  now,
+  tomorrow,
+} from "discourse/lib/time-utils";
+import I18n from "I18n";
+
+export const TIME_SHORTCUT_TYPES = {
+  LATER_TODAY: "later_today",
+  TOMORROW: "tomorrow",
+  NEXT_WEEK: "next_week",
+  NEXT_MONTH: "next_month",
+  CUSTOM: "custom",
+  RELATIVE: "relative",
+  LAST_CUSTOM: "last_custom",
+  NONE: "none",
+  START_OF_NEXT_BUSINESS_WEEK: "start_of_next_business_week",
+  LATER_THIS_WEEK: "later_this_week",
+  POST_LOCAL_DATE: "post_local_date",
+};
+
+export function defaultShortcutOptions(timezone) {
+  return [
+    {
+      icon: "angle-right",
+      id: TIME_SHORTCUT_TYPES.LATER_TODAY,
+      label: "time_shortcut.later_today",
+      time: laterToday(timezone),
+      timeFormatted: laterToday(timezone).format(I18n.t("dates.time")),
+      hidden: true,
+    },
+    {
+      icon: "far-sun",
+      id: TIME_SHORTCUT_TYPES.TOMORROW,
+      label: "time_shortcut.tomorrow",
+      time: tomorrow(timezone),
+      timeFormatted: tomorrow(timezone).format(I18n.t("dates.time_short_day")),
+    },
+    {
+      icon: "angle-double-right",
+      id: TIME_SHORTCUT_TYPES.LATER_THIS_WEEK,
+      label: "time_shortcut.later_this_week",
+      time: laterThisWeek(timezone),
+      timeFormatted: laterThisWeek(timezone).format(
+        I18n.t("dates.time_short_day")
+      ),
+      hidden: true,
+    },
+    {
+      icon: "briefcase",
+      id: TIME_SHORTCUT_TYPES.START_OF_NEXT_BUSINESS_WEEK,
+      label:
+        now(timezone).day() === MOMENT_MONDAY
+          ? "time_shortcut.start_of_next_business_week_alt"
+          : "time_shortcut.start_of_next_business_week",
+      time: nextBusinessWeekStart(timezone),
+      timeFormatted: nextBusinessWeekStart(timezone).format(
+        I18n.t("dates.long_no_year")
+      ),
+    },
+    {
+      icon: "far-clock",
+      id: TIME_SHORTCUT_TYPES.NEXT_WEEK,
+      label: "time_shortcut.next_week",
+      time: nextWeek(timezone),
+      timeFormatted: nextWeek(timezone).format(I18n.t("dates.long_no_year")),
+    },
+    {
+      icon: "far-calendar-plus",
+      id: TIME_SHORTCUT_TYPES.NEXT_MONTH,
+      label: "time_shortcut.next_month",
+      time: nextMonth(timezone),
+      timeFormatted: nextMonth(timezone).format(I18n.t("dates.long_no_year")),
+    },
+  ];
+}
+
+export function specialShortcutOptions() {
+  return [
+    {
+      icon: "undo",
+      id: TIME_SHORTCUT_TYPES.LAST_CUSTOM,
+      label: "time_shortcut.last_custom",
+      time: null,
+      timeFormatted: null,
+      hidden: true,
+    },
+    {
+      icon: "calendar-alt",
+      id: TIME_SHORTCUT_TYPES.CUSTOM,
+      label: "time_shortcut.custom",
+      time: null,
+      timeFormatted: null,
+      isCustomTimeShortcut: true,
+    },
+    {
+      icon: "ban",
+      id: TIME_SHORTCUT_TYPES.NONE,
+      label: "time_shortcut.none",
+      time: null,
+      timeFormatted: null,
+    },
+  ];
+}
diff --git a/app/assets/javascripts/discourse/app/lib/time-utils.js b/app/assets/javascripts/discourse/app/lib/time-utils.js
new file mode 100644
index 0000000000..25976725cb
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/time-utils.js
@@ -0,0 +1,71 @@
+import { isPresent } from "@ember/utils";
+
+export const START_OF_DAY_HOUR = 8;
+export const LATER_TODAY_CUTOFF_HOUR = 17;
+export const LATER_TODAY_MAX_HOUR = 18;
+export const MOMENT_MONDAY = 1;
+export const MOMENT_THURSDAY = 4;
+export const MOMENT_SATURDAY = 6;
+
+export function now(timezone) {
+  return moment.tz(timezone);
+}
+
+export function startOfDay(momentDate, startOfDayHour = START_OF_DAY_HOUR) {
+  return momentDate.hour(startOfDayHour).startOf("hour");
+}
+
+export function tomorrow(timezone) {
+  return startOfDay(now(timezone).add(1, "day"));
+}
+
+export function thisWeekend(timezone) {
+  return startOfDay(now(timezone).day(MOMENT_SATURDAY));
+}
+
+export function laterToday(timezone) {
+  let later = now(timezone).add(3, "hours");
+  if (later.hour() >= LATER_TODAY_MAX_HOUR) {
+    return later.hour(LATER_TODAY_MAX_HOUR).startOf("hour");
+  }
+  return later.minutes() < 30
+    ? later.startOf("hour")
+    : later.add(30, "minutes").startOf("hour");
+}
+
+export function laterThisWeek(timezone) {
+  return startOfDay(now(timezone).add(2, "days"));
+}
+
+export function nextWeek(timezone) {
+  return startOfDay(now(timezone).add(7, "days"));
+}
+
+export function nextMonth(timezone) {
+  return startOfDay(now(timezone).add(1, "month"));
+}
+
+export function nextBusinessWeekStart(timezone) {
+  return nextWeek(timezone).day(MOMENT_MONDAY);
+}
+
+export function parseCustomDatetime(
+  date,
+  time,
+  currentTimezone,
+  parseTimezone = null
+) {
+  // If we are called without a valid date use today
+  date = date || new Date().toISOString().split("T")[0];
+
+  let dateTime = isPresent(time) ? `${date} ${time}` : date;
+  parseTimezone = parseTimezone || currentTimezone;
+
+  let parsed = moment.tz(dateTime, parseTimezone);
+
+  if (parseTimezone !== currentTimezone) {
+    parsed = parsed.tz(currentTimezone);
+  }
+
+  return parsed;
+}
diff --git a/app/assets/javascripts/discourse/app/lib/to-markdown.js b/app/assets/javascripts/discourse/app/lib/to-markdown.js
index 88459e3d24..5f2b6cf98a 100644
--- a/app/assets/javascripts/discourse/app/lib/to-markdown.js
+++ b/app/assets/javascripts/discourse/app/lib/to-markdown.js
@@ -113,7 +113,18 @@ export class Tag {
   }
 
   static allowedTags() {
-    return ["ins", "del", "small", "big", "kbd", "ruby", "rt", "rb", "rp"];
+    return [
+      "ins",
+      "del",
+      "small",
+      "big",
+      "kbd",
+      "ruby",
+      "rt",
+      "rb",
+      "rp",
+      "mark",
+    ];
   }
 
   static block(name, prefix, suffix) {
diff --git a/app/assets/javascripts/discourse/app/lib/transform-post.js b/app/assets/javascripts/discourse/app/lib/transform-post.js
index 0af2e5f9a4..44dbe1d5cd 100644
--- a/app/assets/javascripts/discourse/app/lib/transform-post.js
+++ b/app/assets/javascripts/discourse/app/lib/transform-post.js
@@ -81,6 +81,7 @@ export function transformBasicPost(post) {
     userCustomFields: post.user_custom_fields,
     readCount: post.readers_count,
     canPublishPage: false,
+    trustLevel: post.trust_level,
   };
 
   _additionalAttributes.forEach((a) => (postAtts[a] = post[a]));
@@ -101,6 +102,10 @@ export default function transformPost(
   const postTypes = site.post_types;
   const topic = post.topic;
   const details = topic.get("details");
+  const filteredUpwardsPostID = topic.get("postStream.filterUpwardsPostID");
+  const filteredRepliesPostNumber = topic.get(
+    "postStream.filterRepliesToPostNumber"
+  );
 
   const postAtts = transformBasicPost(post);
 
@@ -131,9 +136,13 @@ export default function transformPost(
   postAtts.isWarning = topic.is_warning;
   postAtts.links = post.get("internalLinks");
   postAtts.replyDirectlyBelow =
-    nextPost && nextPost.reply_to_post_number === post.post_number;
+    nextPost &&
+    nextPost.reply_to_post_number === post.post_number &&
+    post.post_number !== filteredRepliesPostNumber;
   postAtts.replyDirectlyAbove =
-    prevPost && post.reply_to_post_number === prevPost.post_number;
+    prevPost &&
+    post.id !== filteredUpwardsPostID &&
+    post.reply_to_post_number === prevPost.post_number;
   postAtts.linkCounts = post.link_counts;
   postAtts.actionCode = post.action_code;
   postAtts.actionCodeWho = post.action_code_who;
@@ -163,6 +172,7 @@ export default function transformPost(
   }
 
   const showTopicMap =
+    _additionalAttributes.indexOf("topicMap") !== -1 ||
     showPMMap ||
     (post.post_number === 1 &&
       topic.archetype === "regular" &&
diff --git a/app/assets/javascripts/discourse/app/lib/update-tab-count.js b/app/assets/javascripts/discourse/app/lib/update-tab-count.js
index db574730a9..918c51f2f5 100644
--- a/app/assets/javascripts/discourse/app/lib/update-tab-count.js
+++ b/app/assets/javascripts/discourse/app/lib/update-tab-count.js
@@ -18,7 +18,7 @@ function renderIcon(canvas, img, count) {
 
   canvas.height = canvas.width = img.width;
   let ctx = canvas.getContext("2d");
-  ctx.font = `bold ${fontSize}px Helvetica, Arial, sans-serif`;
+  ctx.font = `bold ${fontSize}px Arial, sans-serif`;
 
   if (count) {
     ctx.globalAlpha = 0.4;
diff --git a/app/assets/javascripts/discourse/app/lib/uploads.js b/app/assets/javascripts/discourse/app/lib/uploads.js
index 92e2677e9e..947035431e 100644
--- a/app/assets/javascripts/discourse/app/lib/uploads.js
+++ b/app/assets/javascripts/discourse/app/lib/uploads.js
@@ -1,6 +1,6 @@
 import I18n from "I18n";
-import { isAppleDevice } from "discourse/lib/utilities";
 import bootbox from "bootbox";
+import { isAppleDevice } from "discourse/lib/utilities";
 
 function isGUID(value) {
   return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(
@@ -118,7 +118,7 @@ function validateUploadedFile(file, opts) {
   return true;
 }
 
-const IMAGES_EXTENSIONS_REGEX = /(png|jpe?g|gif|svg|ico|heic|heif)/i;
+const IMAGES_EXTENSIONS_REGEX = /(png|jpe?g|gif|svg|ico|heic|heif|webp)/i;
 
 function extensionsToArray(exts) {
   return exts
@@ -182,7 +182,7 @@ export function authorizedExtensions(staff, siteSettings) {
 
 function authorizedImagesExtensions(staff, siteSettings) {
   return authorizesAllExtensions(staff, siteSettings)
-    ? "png, jpg, jpeg, gif, svg, ico, heic, heif"
+    ? "png, jpg, jpeg, gif, svg, ico, heic, heif, webp"
     : imagesExtensions(staff, siteSettings).join(", ");
 }
 
diff --git a/app/assets/javascripts/discourse/app/lib/url.js b/app/assets/javascripts/discourse/app/lib/url.js
index 919e369ee1..ec875d4033 100644
--- a/app/assets/javascripts/discourse/app/lib/url.js
+++ b/app/assets/javascripts/discourse/app/lib/url.js
@@ -1,16 +1,16 @@
-import { isEmpty } from "@ember/utils";
-import EmberObject from "@ember/object";
-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";
-import User from "discourse/models/user";
 import getURL, { withoutPrefix } from "discourse-common/lib/get-url";
+import { next, schedule } from "@ember/runloop";
+import EmberObject from "@ember/object";
+import LockOn from "discourse/lib/lock-on";
 import Session from "discourse/models/session";
+import User from "discourse/models/user";
+import { defaultHomepage } from "discourse/lib/utilities";
+import { isEmpty } from "@ember/utils";
+import offsetCalculator from "discourse/lib/offset-calculator";
 import { setOwner } from "@ember/application";
 
 const rewrites = [];
-const TOPIC_REGEXP = /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/;
+export const TOPIC_URL_REGEXP = /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/;
 
 // We can add links here that have server side responses but not client side.
 const SERVER_SIDE_ONLY = [
@@ -27,7 +27,7 @@ const SERVER_SIDE_ONLY = [
   /\.json$/,
   /^\/admin\/upgrade$/,
   /^\/logs($|\/)/,
-  /^\/admin\/logs\/watched_words\/action\/[^\/]+\/download$/,
+  /^\/admin\/customize\/watched_words\/action\/[^\/]+\/download$/,
   /^\/pub\//,
   /^\/invites\//,
   /^\/styleguide/,
@@ -146,6 +146,7 @@ const DiscourseURL = EmberObject.extend({
       }
 
       lockon = new LockOn(selector, {
+        originalTopOffset: opts.originalTopOffset,
         finished() {
           _transitioning = false;
           lockon = null;
@@ -246,7 +247,7 @@ const DiscourseURL = EmberObject.extend({
       return this.replaceState(path);
     }
 
-    const oldPath = window.location.pathname;
+    const oldPath = `${window.location.pathname}${window.location.search}`;
     path = path.replace(/(https?\:)?\/\/[^\/]+/, "");
 
     // Rewrite /my/* urls
@@ -347,11 +348,11 @@ const DiscourseURL = EmberObject.extend({
     same topic, use replaceState and instruct our controller to load more posts.
   **/
   navigatedToPost(oldPath, path, routeOpts) {
-    const newMatches = TOPIC_REGEXP.exec(path);
+    const newMatches = TOPIC_URL_REGEXP.exec(path);
     const newTopicId = newMatches ? newMatches[2] : null;
 
     if (newTopicId) {
-      const oldMatches = TOPIC_REGEXP.exec(oldPath);
+      const oldMatches = TOPIC_URL_REGEXP.exec(oldPath);
       const oldTopicId = oldMatches ? oldMatches[2] : null;
 
       // If the topic_id is the same
@@ -369,7 +370,9 @@ const DiscourseURL = EmberObject.extend({
           opts.nearPost = topicController.get("model.highest_post_number");
         }
 
-        opts.cancelSummary = true;
+        if (!routeOpts.keepFilter) {
+          opts.cancelFilter = true;
+        }
 
         postStream.refresh(opts).then(() => {
           const closest = postStream.closestPostNumberFor(opts.nearPost || 1);
@@ -493,4 +496,23 @@ export function prefixProtocol(url) {
     : url;
 }
 
+export function getCategoryAndTagUrl(category, subcategories, tag) {
+  let url;
+
+  if (category) {
+    url = category.path;
+    if (!subcategories) {
+      url += "/none";
+    }
+  }
+
+  if (tag) {
+    url = url
+      ? "/tags" + url + "/" + tag.toLowerCase()
+      : "/tag/" + tag.toLowerCase();
+  }
+
+  return getURL(url || "/");
+}
+
 export default _urlInstance;
diff --git a/app/assets/javascripts/discourse/app/lib/user-search.js b/app/assets/javascripts/discourse/app/lib/user-search.js
index 8c3caa5143..980d92a417 100644
--- a/app/assets/javascripts/discourse/app/lib/user-search.js
+++ b/app/assets/javascripts/discourse/app/lib/user-search.js
@@ -1,12 +1,12 @@
-import { isTesting } from "discourse-common/config/environment";
-import discourseDebounce from "discourse/lib/debounce";
+import { cancel, later } from "@ember/runloop";
 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";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { emailValid } from "discourse/lib/utilities";
+import { isTesting } from "discourse-common/config/environment";
+import { userPath } from "discourse/lib/url";
 
-var cache = {},
+let cache = {},
   cacheKey,
   cacheTime,
   currentTerm,
@@ -23,7 +23,7 @@ function performSearch(
   groupMembersOf,
   resultsFn
 ) {
-  var cached = cache[term];
+  let cached = cache[term];
   if (cached) {
     resultsFn(cached);
     return;
@@ -52,7 +52,7 @@ function performSearch(
     },
   });
 
-  var returnVal = CANCELLED_STATUS;
+  let returnVal = CANCELLED_STATUS;
 
   oldSearch
     .then(function (r) {
@@ -81,14 +81,39 @@ function performSearch(
     });
 }
 
-var debouncedSearch = discourseDebounce(performSearch, 300);
+let debouncedSearch = function (
+  term,
+  topicId,
+  categoryId,
+  includeGroups,
+  includeMentionableGroups,
+  includeMessageableGroups,
+  allowedUsers,
+  groupMembersOf,
+  resultsFn
+) {
+  discourseDebounce(
+    this,
+    performSearch,
+    term,
+    topicId,
+    categoryId,
+    includeGroups,
+    includeMentionableGroups,
+    includeMessageableGroups,
+    allowedUsers,
+    groupMembersOf,
+    resultsFn,
+    300
+  );
+};
 
 function organizeResults(r, options) {
   if (r === CANCELLED_STATUS) {
     return r;
   }
 
-  var exclude = options.exclude || [],
+  let exclude = options.exclude || [],
     limit = options.limit || 5,
     users = [],
     emails = [],
@@ -157,7 +182,7 @@ export default function userSearch(options) {
     options.term = options.term.substring(1);
   }
 
-  var term = options.term || "",
+  let term = options.term || "",
     includeGroups = options.includeGroups,
     includeMentionableGroups = options.includeMentionableGroups,
     includeMessageableGroups = options.includeMessageableGroups,
diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index 5d0b5c9f3c..5cb6976d5d 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -1,10 +1,9 @@
-import I18n from "I18n";
-import { escape } from "pretty-text/sanitizer";
-import toMarkdown from "discourse/lib/to-markdown";
-import Handlebars from "handlebars";
 import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
-import { helperContext } from "discourse-common/lib/helpers";
+import Handlebars from "handlebars";
 import { deepMerge } from "discourse-common/lib/object";
+import { escape } from "pretty-text/sanitizer";
+import { helperContext } from "discourse-common/lib/helpers";
+import toMarkdown from "discourse/lib/to-markdown";
 
 let _defaultHomepage;
 
@@ -59,7 +58,13 @@ export function avatarUrl(template, size) {
 
 export function getRawSize(size) {
   const pixelRatio = window.devicePixelRatio || 1;
-  return size * Math.min(3, Math.max(1, Math.round(pixelRatio)));
+  let rawSize = 1;
+  if (pixelRatio > 1.1 && pixelRatio < 2.1) {
+    rawSize = 2;
+  } else if (pixelRatio >= 2.1) {
+    rawSize = 3;
+  }
+  return size * rawSize;
 }
 
 export function avatarImg(options, customGetURL) {
@@ -91,7 +96,7 @@ export function tinyAvatar(avatarTemplate, options) {
 }
 
 export function postUrl(slug, topicId, postNumber) {
-  var url = getURL("/t/");
+  let url = getURL("/t/");
   if (slug) {
     url += slug + "/";
   } else {
@@ -104,6 +109,25 @@ export function postUrl(slug, topicId, postNumber) {
   return url;
 }
 
+export function highlightPost(postNumber) {
+  const container = document.querySelector(`#post_${postNumber}`);
+  if (!container) {
+    return;
+  }
+  const element = container.querySelector(".topic-body");
+  if (!element || element.classList.contains("highlighted")) {
+    return;
+  }
+
+  element.classList.add("highlighted");
+
+  const removeHighlighted = function () {
+    element.classList.remove("highlighted");
+    element.removeEventListener("animationend", removeHighlighted);
+  };
+  element.addEventListener("animationend", removeHighlighted);
+}
+
 export function emailValid(email) {
   // see:  http://stackoverflow.com/questions/46155/validate-email-address-in-javascript
   const re = /^[a-zA-Z0-9!#$%&'*+\/=?\^_`{|}~\-]+(?:\.[a-zA-Z0-9!#$%&'\*+\/=?\^_`{|}~\-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?$/;
@@ -165,11 +189,11 @@ export function selectedElement() {
 
 // Determine the row and col of the caret in an element
 export function caretRowCol(el) {
-  var cp = caretPosition(el);
-  var rows = el.value.slice(0, cp).split("\n");
-  var rowNum = rows.length;
+  let cp = caretPosition(el);
+  let rows = el.value.slice(0, cp).split("\n");
+  let rowNum = rows.length;
 
-  var colNum =
+  let colNum =
     cp -
     rows.splice(0, rowNum - 1).reduce(function (sum, row) {
       return sum + row.length + 1;
@@ -180,7 +204,7 @@ export function caretRowCol(el) {
 
 // Determine the position of the caret in an element
 export function caretPosition(el) {
-  var r, rc, re;
+  let r, rc, re;
   if (el.selectionStart) {
     return el.selectionStart;
   }
@@ -202,7 +226,7 @@ export function caretPosition(el) {
 
 // Set the caret's position
 export function setCaretPosition(ctrl, pos) {
-  var range;
+  let range;
   if (ctrl.setSelectionRange) {
     ctrl.focus();
     ctrl.setSelectionRange(pos, pos);
@@ -396,7 +420,7 @@ export function areCookiesEnabled() {
   // see: https://github.com/Modernizr/Modernizr/blob/400db4043c22af98d46e1d2b9cbc5cb062791192/feature-detects/cookies.js
   try {
     document.cookie = "cookietest=1";
-    var ret = document.cookie.indexOf("cookietest=") !== -1;
+    let ret = document.cookie.indexOf("cookietest=") !== -1;
     document.cookie = "cookietest=1; expires=Thu, 01-Jan-1970 00:00:01 GMT";
     return ret;
   } catch (e) {
@@ -409,6 +433,10 @@ export function isiOSPWA() {
   return window.matchMedia("(display-mode: standalone)").matches && caps.isIOS;
 }
 
+export function prefersReducedMotion() {
+  return window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+}
+
 export function isAppWebview() {
   return window.ReactNativeWebView !== undefined;
 }
@@ -419,40 +447,6 @@ export function postRNWebviewMessage(prop, value) {
   }
 }
 
-function reportToLogster(name, error) {
-  const data = {
-    message: `${name} theme/component is throwing errors`,
-    stacktrace: error.stack,
-  };
-
-  Ember.$.ajax(getURL("/logs/report_js_error"), {
-    data,
-    type: "POST",
-    cache: false,
-  });
-}
-// this function is used in lib/theme_javascript_compiler.rb
-export function rescueThemeError(name, error, api) {
-  /* eslint-disable-next-line no-console */
-  console.error(`"${name}" error:`, error);
-  reportToLogster(name, error);
-
-  const currentUser = api.getCurrentUser();
-  if (!currentUser || !currentUser.admin) {
-    return;
-  }
-
-  const path = getURL(`/admin/customize/themes`);
-  const message = I18n.t("themes.broken_theme_alert", {
-    theme: name,
-    path: `<a href="${path}">${path}</a>`,
-  });
-  const alertDiv = document.createElement("div");
-  alertDiv.classList.add("broken-theme-alert");
-  alertDiv.innerHTML = `⚠️ ${message}`;
-  document.body.prepend(alertDiv);
-}
-
 const CODE_BLOCKS_REGEX = /^(    |\t).*|`[^`]+`|^```[^]*?^```|\[code\][^]*?\[\/code\]/gm;
 //                        |      ^     |   ^   |      ^      |           ^           |
 //                               |         |          |                  |
diff --git a/app/assets/javascripts/discourse/app/lib/waving-hand-url.js b/app/assets/javascripts/discourse/app/lib/waving-hand-url.js
new file mode 100644
index 0000000000..8078cb0c29
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/waving-hand-url.js
@@ -0,0 +1,11 @@
+import { helperContext } from "discourse-common/lib/helpers";
+import { emojiBasePath } from "discourse/lib/settings";
+import getURL from "discourse-common/lib/get-url";
+
+export function wavingHandURL() {
+  const emojiSet = helperContext().siteSettings.emoji_set;
+
+  // random number between 2 -6 to render multiple skin tone waving hands
+  const random = Math.floor(Math.random() * (7 - 2) + 2);
+  return getURL(`${emojiBasePath()}/${emojiSet}/wave/${random}.png`);
+}
diff --git a/app/assets/javascripts/discourse/app/mapping-router.js b/app/assets/javascripts/discourse/app/mapping-router.js
index 51bf14322b..39ab250c8f 100644
--- a/app/assets/javascripts/discourse/app/mapping-router.js
+++ b/app/assets/javascripts/discourse/app/mapping-router.js
@@ -1,9 +1,9 @@
 import EmberRouter from "@ember/routing/router";
-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";
+import { defaultHomepage } from "discourse/lib/utilities";
 import getURL from "discourse-common/lib/get-url";
+import { isTesting } from "discourse-common/config/environment";
+import { rewritePath } from "discourse/lib/url";
 
 const BareRouter = EmberRouter.extend({
   location: isTesting() ? "none" : "discourse-location",
@@ -113,7 +113,7 @@ export function mapRoutes() {
   // can define admin routes.
   Object.keys(requirejs._eak_seen).forEach(function (key) {
     if (/route-map$/.test(key)) {
-      var module = requirejs(key, null, null, true);
+      let module = requirejs(key, null, null, true);
       if (!module || !module.default) {
         throw new Error(key + " must export a route map.");
       }
@@ -141,3 +141,11 @@ export function mapRoutes() {
     this.route("unknown", { path: "*path" });
   });
 }
+
+export function registerRouter(registry) {
+  registry.unregister("router:main");
+  let router = mapRoutes();
+
+  registry.register("router:main", router);
+  return router;
+}
diff --git a/app/assets/javascripts/discourse/app/mixins/add-archetype-class.js b/app/assets/javascripts/discourse/app/mixins/add-archetype-class.js
index 723826790c..3105319490 100644
--- a/app/assets/javascripts/discourse/app/mixins/add-archetype-class.js
+++ b/app/assets/javascripts/discourse/app/mixins/add-archetype-class.js
@@ -1,4 +1,4 @@
-import { on, observes } from "discourse-common/utils/decorators";
+import { observes, on } from "discourse-common/utils/decorators";
 
 // Mix this in to a view that has a `archetype` property to automatically
 // add it to the body as the view is entered / left / model is changed.
diff --git a/app/assets/javascripts/discourse/app/mixins/buffered-content.js b/app/assets/javascripts/discourse/app/mixins/buffered-content.js
index 6dd9f09be4..2b13f7d1d1 100644
--- a/app/assets/javascripts/discourse/app/mixins/buffered-content.js
+++ b/app/assets/javascripts/discourse/app/mixins/buffered-content.js
@@ -1,12 +1,13 @@
+import BufferedMixin from "ember-buffered-proxy/mixin";
+import BufferedProxy from "ember-buffered-proxy/proxy";
 import EmberObjectProxy from "@ember/object/proxy";
 import Mixin from "@ember/object/mixin";
 import { computed } from "@ember/object";
-import BufferedProxy from "ember-buffered-proxy/proxy";
 
 export function bufferedProperty(property) {
   const mixin = {
     buffered: computed(property, function () {
-      return EmberObjectProxy.extend(BufferedProxy).create({
+      return EmberObjectProxy.extend(BufferedMixin || BufferedProxy).create({
         content: this.get(property),
       });
     }),
diff --git a/app/assets/javascripts/discourse/app/mixins/bulk-topic-selection.js b/app/assets/javascripts/discourse/app/mixins/bulk-topic-selection.js
index 279fe79fa3..7ba734c65d 100644
--- a/app/assets/javascripts/discourse/app/mixins/bulk-topic-selection.js
+++ b/app/assets/javascripts/discourse/app/mixins/bulk-topic-selection.js
@@ -1,11 +1,15 @@
-import { alias } from "@ember/object/computed";
-import { NotificationLevels } from "discourse/lib/notification-levels";
-import { on } from "discourse-common/utils/decorators";
 import Mixin from "@ember/object/mixin";
+import { NotificationLevels } from "discourse/lib/notification-levels";
 import Topic from "discourse/models/topic";
+import { alias } from "@ember/object/computed";
+import { on } from "discourse-common/utils/decorators";
+import { inject as service } from "@ember/service";
 
 export default Mixin.create({
+  router: service(),
+
   bulkSelectEnabled: false,
+  autoAddTopicsToBulkSelect: false,
   selected: null,
 
   canBulkSelect: alias("currentUser.staff"),
@@ -52,5 +56,13 @@ export default Mixin.create({
         );
       });
     },
+
+    updateAutoAddTopicsToBulkSelect(newVal) {
+      this.set("autoAddTopicsToBulkSelect", newVal);
+    },
+
+    addTopicsToBulkSelect(topics) {
+      this.selected.pushObjects(topics);
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/mixins/can-check-emails.js b/app/assets/javascripts/discourse/app/mixins/can-check-emails.js
index e856d615c9..d76250124f 100644
--- a/app/assets/javascripts/discourse/app/mixins/can-check-emails.js
+++ b/app/assets/javascripts/discourse/app/mixins/can-check-emails.js
@@ -1,4 +1,4 @@
-import { and, alias, or } from "@ember/object/computed";
+import { alias, and, or } from "@ember/object/computed";
 import { propertyEqual, setting } from "discourse/lib/computed";
 import Mixin from "@ember/object/mixin";
 
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 0a996f8056..2b67cd1bde 100644
--- a/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
+++ b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
@@ -1,12 +1,12 @@
 import { alias, match } from "@ember/object/computed";
 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";
 import Mixin from "@ember/object/mixin";
+import afterTransition from "discourse/lib/after-transition";
 import { escapeExpression } from "discourse/lib/utilities";
 import headerOutletHeights from "discourse/lib/header-outlet-height";
 import { inject as service } from "@ember/service";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
 
 export default Mixin.create({
   router: service(),
diff --git a/app/assets/javascripts/discourse/app/mixins/cleans-up.js b/app/assets/javascripts/discourse/app/mixins/cleans-up.js
index 753dad027c..054f770def 100644
--- a/app/assets/javascripts/discourse/app/mixins/cleans-up.js
+++ b/app/assets/javascripts/discourse/app/mixins/cleans-up.js
@@ -1,5 +1,5 @@
-import { on } from "@ember/object/evented";
 import Mixin from "@ember/object/mixin";
+import { on } from "@ember/object/evented";
 
 // Include this mixin if you want to be notified when the dom should be
 // cleaned (usually on route change.)
diff --git a/app/assets/javascripts/discourse/app/mixins/docking.js b/app/assets/javascripts/discourse/app/mixins/docking.js
index 302ac24af8..76ccd3a3f7 100644
--- a/app/assets/javascripts/discourse/app/mixins/docking.js
+++ b/app/assets/javascripts/discourse/app/mixins/docking.js
@@ -1,5 +1,6 @@
 import Mixin from "@ember/object/mixin";
-import { later, debounce } from "@ember/runloop";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { cancel, later } from "@ember/runloop";
 
 const helper = {
   offset() {
@@ -11,11 +12,13 @@ const helper = {
 
 export default Mixin.create({
   queueDockCheck: null,
+  _initialTimer: null,
+  _queuedTimer: null,
 
   init() {
     this._super(...arguments);
     this.queueDockCheck = () => {
-      debounce(this, this.safeDockCheck, 5);
+      this._queuedTimer = discourseDebounce(this, this.safeDockCheck, 5);
     };
   },
 
@@ -33,11 +36,17 @@ export default Mixin.create({
     $(document).bind("touchmove.discourse-dock", this.queueDockCheck);
 
     // dockCheck might happen too early on full page refresh
-    later(this, this.safeDockCheck, 50);
+    this._initialTimer = later(this, this.safeDockCheck, 50);
   },
 
   willDestroyElement() {
     this._super(...arguments);
+
+    if (this._queuedTimer) {
+      cancel(this._queuedTimer);
+    }
+
+    cancel(this._initialTimer);
     $(window).unbind("scroll.discourse-dock", this.queueDockCheck);
     $(document).unbind("touchmove.discourse-dock", this.queueDockCheck);
   },
diff --git a/app/assets/javascripts/discourse/app/mixins/filter-mode.js b/app/assets/javascripts/discourse/app/mixins/filter-mode.js
index ebf59bb1a8..22f3060968 100644
--- a/app/assets/javascripts/discourse/app/mixins/filter-mode.js
+++ b/app/assets/javascripts/discourse/app/mixins/filter-mode.js
@@ -1,6 +1,6 @@
+import Category from "discourse/models/category";
 import Mixin from "@ember/object/mixin";
 import { computed } from "@ember/object";
-import Category from "discourse/models/category";
 
 export default Mixin.create({
   filterModeInternal: computed(
diff --git a/app/assets/javascripts/discourse/app/mixins/grant-badge-controller.js b/app/assets/javascripts/discourse/app/mixins/grant-badge-controller.js
index a1820399f6..6858d44096 100644
--- a/app/assets/javascripts/discourse/app/mixins/grant-badge-controller.js
+++ b/app/assets/javascripts/discourse/app/mixins/grant-badge-controller.js
@@ -1,8 +1,8 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { empty } from "@ember/object/computed";
+import Mixin from "@ember/object/mixin";
 import UserBadge from "discourse/models/user-badge";
 import { convertIconClass } from "discourse-common/lib/icon-library";
-import Mixin from "@ember/object/mixin";
+import discourseComputed from "discourse-common/utils/decorators";
+import { empty } from "@ember/object/computed";
 
 export default Mixin.create({
   @discourseComputed("allBadges.[]", "userBadges.[]")
diff --git a/app/assets/javascripts/discourse/app/mixins/key-enter-escape.js b/app/assets/javascripts/discourse/app/mixins/key-enter-escape.js
index dfa120a5a7..5c80b74b7d 100644
--- a/app/assets/javascripts/discourse/app/mixins/key-enter-escape.js
+++ b/app/assets/javascripts/discourse/app/mixins/key-enter-escape.js
@@ -3,6 +3,10 @@ import { isiPad } from "discourse/lib/utilities";
 // A mixin where hitting ESC calls `cancelled` and ctrl+enter calls `save.
 export default {
   keyDown(e) {
+    if (document.body.classList.contains("modal-open")) {
+      return;
+    }
+
     if (e.which === 27) {
       this.cancelled();
       return false;
diff --git a/app/assets/javascripts/discourse/app/mixins/load-more.js b/app/assets/javascripts/discourse/app/mixins/load-more.js
index 421cb16d2c..4b2f5d4f76 100644
--- a/app/assets/javascripts/discourse/app/mixins/load-more.js
+++ b/app/assets/javascripts/discourse/app/mixins/load-more.js
@@ -1,7 +1,7 @@
 import Eyeline from "discourse/lib/eyeline";
+import Mixin from "@ember/object/mixin";
 import Scrolling from "discourse/mixins/scrolling";
 import { on } from "discourse-common/utils/decorators";
-import Mixin from "@ember/object/mixin";
 
 // Provides the ability to load more items for a view which is scrolled to the bottom.
 export default Mixin.create(Scrolling, {
diff --git a/app/assets/javascripts/discourse/app/mixins/mobile-scroll-direction.js b/app/assets/javascripts/discourse/app/mixins/mobile-scroll-direction.js
index 556831fb33..467fea56d6 100644
--- a/app/assets/javascripts/discourse/app/mixins/mobile-scroll-direction.js
+++ b/app/assets/javascripts/discourse/app/mixins/mobile-scroll-direction.js
@@ -1,5 +1,6 @@
-import { debounce } from "@ember/runloop";
 import Mixin from "@ember/object/mixin";
+import discourseDebounce from "discourse-common/lib/debounce";
+
 // Small buffer so that very tiny scrolls don't trigger mobile header switch
 const MOBILE_SCROLL_TOLERANCE = 5;
 
@@ -47,9 +48,13 @@ export default Mixin.create({
     // If the user reaches the very bottom of the topic, we only want to reset
     // this scroll direction after a second scrolldown. This is a nicer event
     // similar to what Safari and Chrome do.
-    debounce(() => {
-      this._bottomHit = 1;
-    }, 1000);
+    discourseDebounce(
+      this,
+      function () {
+        this._bottomHit = 1;
+      },
+      1000
+    );
 
     if (this._bottomHit === 1) {
       this.set("mobileScrollDirection", null);
diff --git a/app/assets/javascripts/discourse/app/mixins/modal-functionality.js b/app/assets/javascripts/discourse/app/mixins/modal-functionality.js
index bc728628a4..6287199a75 100644
--- a/app/assets/javascripts/discourse/app/mixins/modal-functionality.js
+++ b/app/assets/javascripts/discourse/app/mixins/modal-functionality.js
@@ -1,5 +1,5 @@
-import showModal from "discourse/lib/show-modal";
 import Mixin from "@ember/object/mixin";
+import showModal from "discourse/lib/show-modal";
 
 export default Mixin.create({
   flash(text, messageClass) {
diff --git a/app/assets/javascripts/discourse/app/mixins/name-validation.js b/app/assets/javascripts/discourse/app/mixins/name-validation.js
index 61b8c62344..52623f537e 100644
--- a/app/assets/javascripts/discourse/app/mixins/name-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/name-validation.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import discourseComputed from "discourse-common/utils/decorators";
-import Mixin from "@ember/object/mixin";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
+import Mixin from "@ember/object/mixin";
+import discourseComputed from "discourse-common/utils/decorators";
+import { isEmpty } from "@ember/utils";
 
 export default Mixin.create({
   @discourseComputed()
diff --git a/app/assets/javascripts/discourse/app/mixins/open-composer.js b/app/assets/javascripts/discourse/app/mixins/open-composer.js
index d3ee21fbcc..8b21b283a1 100644
--- a/app/assets/javascripts/discourse/app/mixins/open-composer.js
+++ b/app/assets/javascripts/discourse/app/mixins/open-composer.js
@@ -39,7 +39,12 @@ export default Mixin.create({
     });
   },
 
-  openComposerWithMessageParams(recipients, topicTitle, topicBody) {
+  openComposerWithMessageParams({
+    recipients = [],
+    topicTitle = "",
+    topicBody = "",
+    hasGroups = false,
+  } = {}) {
     this.controllerFor("composer").open({
       action: Composer.PRIVATE_MESSAGE,
       recipients,
@@ -47,6 +52,7 @@ export default Mixin.create({
       topicBody,
       archetypeId: "private_message",
       draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY,
+      hasGroups: hasGroups,
     });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/mixins/password-validation.js b/app/assets/javascripts/discourse/app/mixins/password-validation.js
index 6511ec4bde..feb020cbf7 100644
--- a/app/assets/javascripts/discourse/app/mixins/password-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/password-validation.js
@@ -1,8 +1,8 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import discourseComputed from "discourse-common/utils/decorators";
-import Mixin from "@ember/object/mixin";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
+import Mixin from "@ember/object/mixin";
+import discourseComputed from "discourse-common/utils/decorators";
+import { isEmpty } from "@ember/utils";
 
 export default Mixin.create({
   rejectedPasswords: null,
diff --git a/app/assets/javascripts/discourse/app/mixins/rerender-on-do-not-disturb-change.js b/app/assets/javascripts/discourse/app/mixins/rerender-on-do-not-disturb-change.js
new file mode 100644
index 0000000000..dd73d650f1
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/mixins/rerender-on-do-not-disturb-change.js
@@ -0,0 +1,36 @@
+import { cancel, later } from "@ember/runloop";
+import Mixin from "@ember/object/mixin";
+import { isTesting } from "discourse-common/config/environment";
+
+export default Mixin.create({
+  _listenToDoNotDisturbLoop: null,
+
+  listenForDoNotDisturbChanges() {
+    if (this.currentUser && !this.currentUser.isInDoNotDisturb()) {
+      this.queueRerender();
+    } else {
+      cancel(this._listenToDoNotDisturbLoop);
+      this._listenToDoNotDisturbLoop = later(
+        this,
+        () => {
+          this.listenForDoNotDisturbChanges();
+        },
+        10000
+      );
+    }
+  },
+
+  didInsertElement() {
+    this._super(...arguments);
+
+    this.appEvents.on("do-not-disturb:changed", () => this.queueRerender());
+    if (!isTesting()) {
+      this.listenForDoNotDisturbChanges();
+    }
+  },
+
+  willDestroyElement() {
+    this._super(...arguments);
+    cancel(this._listenToDoNotDisturbLoop);
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/mixins/scroll-top.js b/app/assets/javascripts/discourse/app/mixins/scroll-top.js
index 0e0ffc58f7..8ca49c218e 100644
--- a/app/assets/javascripts/discourse/app/mixins/scroll-top.js
+++ b/app/assets/javascripts/discourse/app/mixins/scroll-top.js
@@ -1,8 +1,6 @@
-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 { isTesting } from "discourse-common/config/environment";
+import { scheduleOnce } from "@ember/runloop";
 
 const context = {
   _scrollTop() {
@@ -20,14 +18,4 @@ function scrollTop() {
   scheduleOnce("afterRender", context, context._scrollTop);
 }
 
-export default Mixin.create({
-  didInsertElement() {
-    deprecated(
-      "The `ScrollTop` mixin is deprecated. Replace it with a `{{d-section}}` component"
-    );
-    this._super(...arguments);
-    scrollTop();
-  },
-});
-
 export { scrollTop };
diff --git a/app/assets/javascripts/discourse/app/mixins/scrolling.js b/app/assets/javascripts/discourse/app/mixins/scrolling.js
index 67b5fb81f6..2f0a588e21 100644
--- a/app/assets/javascripts/discourse/app/mixins/scrolling.js
+++ b/app/assets/javascripts/discourse/app/mixins/scrolling.js
@@ -1,6 +1,6 @@
-import { scheduleOnce } from "@ember/runloop";
-import discourseDebounce from "discourse/lib/debounce";
 import Mixin from "@ember/object/mixin";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { scheduleOnce } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 
 /**
@@ -41,14 +41,18 @@ const Scrolling = Mixin.create({
       if (microLib.activeTransition) {
         return;
       }
+
       return scheduleOnce("afterRender", this, "scrolled");
     };
 
     if (opts.debounce) {
-      onScrollMethod = discourseDebounce(onScrollMethod, opts.debounce);
+      let debouncedScrollMethod = () => {
+        discourseDebounce(this, onScrollMethod, opts.debounce);
+      };
+      ScrollingDOMMethods.bindOnScroll(debouncedScrollMethod, opts.name);
+    } else {
+      ScrollingDOMMethods.bindOnScroll(onScrollMethod, opts.name);
     }
-
-    ScrollingDOMMethods.bindOnScroll(onScrollMethod, opts.name);
   },
 
   screenNotFull: () => ScrollingDOMMethods.screenNotFull(),
diff --git a/app/assets/javascripts/discourse/app/mixins/singleton.js b/app/assets/javascripts/discourse/app/mixins/singleton.js
index 6bed17037e..7aabd44c35 100644
--- a/app/assets/javascripts/discourse/app/mixins/singleton.js
+++ b/app/assets/javascripts/discourse/app/mixins/singleton.js
@@ -67,7 +67,7 @@ const Singleton = Mixin.create({
 
   // Returns OR sets a property on the singleton instance.
   currentProp(property, value) {
-    var instance = this.current();
+    let instance = this.current();
     if (!instance) {
       return;
     }
diff --git a/app/assets/javascripts/discourse/app/mixins/upload.js b/app/assets/javascripts/discourse/app/mixins/upload.js
index 1298f498e4..b626f6c994 100644
--- a/app/assets/javascripts/discourse/app/mixins/upload.js
+++ b/app/assets/javascripts/discourse/app/mixins/upload.js
@@ -1,14 +1,14 @@
-import I18n from "I18n";
-import { warn } from "@ember/debug";
 import {
   displayErrorForUpload,
   validateUploadedFiles,
 } from "discourse/lib/uploads";
-import getUrl from "discourse-common/lib/get-url";
-import { on } from "@ember/object/evented";
+import I18n from "I18n";
 import Mixin from "@ember/object/mixin";
 import bootbox from "bootbox";
 import { deepMerge } from "discourse-common/lib/object";
+import getUrl from "discourse-common/lib/get-url";
+import { on } from "@ember/object/evented";
+import { warn } from "@ember/debug";
 
 export default Mixin.create({
   uploading: false,
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 6aeb2470ff..1a503dfcc2 100644
--- a/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
@@ -1,8 +1,8 @@
-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 EmberObject from "@ember/object";
 import I18n from "I18n";
+import Mixin from "@ember/object/mixin";
+import { isEmpty } from "@ember/utils";
 
 export default Mixin.create({
   @on("init")
diff --git a/app/assets/javascripts/discourse/app/mixins/username-validation.js b/app/assets/javascripts/discourse/app/mixins/username-validation.js
index 09d13d2b29..b8f14bc818 100644
--- a/app/assets/javascripts/discourse/app/mixins/username-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/username-validation.js
@@ -1,20 +1,34 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import discourseDebounce from "discourse/lib/debounce";
-import { setting } from "discourse/lib/computed";
-import discourseComputed from "discourse-common/utils/decorators";
-import Mixin from "@ember/object/mixin";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
+import Mixin from "@ember/object/mixin";
 import User from "discourse/models/user";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { isEmpty } from "@ember/utils";
+import { observes } from "discourse-common/utils/decorators";
+import { setting } from "discourse/lib/computed";
+
+function failedResult(attrs) {
+  let result = EmberObject.create({
+    shouldCheck: false,
+    failed: true,
+    element: document.querySelector("#new-account-username"),
+  });
+  result.setProperties(attrs);
+  return result;
+}
+
+function validResult(attrs) {
+  let result = EmberObject.create({ ok: true });
+  result.setProperties(attrs);
+  return result;
+}
 
 export default Mixin.create({
   uniqueUsernameValidation: null,
-
   maxUsernameLength: setting("max_username_length"),
-
   minUsernameLength: setting("min_username_length"),
 
-  fetchExistingUsername: discourseDebounce(function () {
+  fetchExistingUsername() {
     User.checkUsername(null, this.accountEmail).then((result) => {
       if (
         result.suggestion &&
@@ -27,120 +41,74 @@ export default Mixin.create({
         });
       }
     });
-  }, 500),
-
-  @discourseComputed("accountUsername")
-  basicUsernameValidation(accountUsername) {
-    const failedAttrs = {
-      failed: true,
-      element: document.querySelector("#new-account-username"),
-    };
-    this.set("uniqueUsernameValidation", null);
-
-    if (accountUsername && accountUsername === this.prefilledUsername) {
-      return EmberObject.create({
-        ok: true,
-        reason: I18n.t("user.username.prefilled"),
-      });
-    }
-
-    // If blank, fail without a reason
-    if (isEmpty(accountUsername)) {
-      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(
-        Object.assign(failedAttrs, {
-          reason: I18n.t("user.username.too_short"),
-        })
-      );
-    }
-
-    // If too long
-    if (accountUsername.length > this.maxUsernameLength) {
-      return EmberObject.create(
-        Object.assign(failedAttrs, {
-          reason: I18n.t("user.username.too_long"),
-        })
-      );
-    }
-
-    this.checkUsernameAvailability();
-    // Let's check it out asynchronously
-    return EmberObject.create(
-      Object.assign(failedAttrs, {
-        reason: I18n.t("user.username.checking"),
-      })
-    );
   },
 
-  shouldCheckUsernameAvailability() {
-    return (
-      !isEmpty(this.accountUsername) &&
-      this.accountUsername.length >= this.minUsernameLength
-    );
+  @observes("accountUsername")
+  triggerValidation() {
+    let { accountUsername } = this;
+
+    let result = this.basicUsernameValidation(accountUsername);
+    if (result.shouldCheck) {
+      discourseDebounce(this, this.checkUsernameAvailability, 500);
+    }
+    this.set("usernameValidation", result);
   },
 
-  checkUsernameAvailability: discourseDebounce(function () {
-    if (this.shouldCheckUsernameAvailability()) {
-      return User.checkUsername(this.accountUsername, this.accountEmail).then(
-        (result) => {
-          this.set("isDeveloper", false);
-          if (result.available) {
-            if (result.is_developer) {
-              this.set("isDeveloper", true);
-            }
+  basicUsernameValidation(username) {
+    if (username && username === this.prefilledUsername) {
+      return validResult({ reason: I18n.t("user.username.prefilled") });
+    }
+
+    if (isEmpty(username)) {
+      return failedResult({ message: I18n.t("user.username.required") });
+    }
+
+    if (username.length < this.siteSettings.min_username_length) {
+      return failedResult({ reason: I18n.t("user.username.too_short") });
+    }
+
+    if (username.length > this.maxUsernameLength) {
+      return failedResult({ reason: I18n.t("user.username.too_long") });
+    }
+
+    return failedResult({
+      shouldCheck: true,
+      reason: I18n.t("user.username.checking"),
+    });
+  },
+
+  checkUsernameAvailability() {
+    return User.checkUsername(this.accountUsername, this.accountEmail).then(
+      (result) => {
+        this.set("isDeveloper", false);
+        if (result.available) {
+          if (result.is_developer) {
+            this.set("isDeveloper", true);
+          }
+          return this.set(
+            "usernameValidation",
+            validResult({ reason: I18n.t("user.username.available") })
+          );
+        } else {
+          if (result.suggestion) {
             return this.set(
-              "uniqueUsernameValidation",
-              EmberObject.create({
-                ok: true,
-                reason: I18n.t("user.username.available"),
+              "usernameValidation",
+              failedResult({
+                reason: I18n.t("user.username.not_available", result),
               })
             );
           } else {
-            const failedAttrs = {
-              failed: true,
-              element: document.querySelector("#new-account-username"),
-            };
-
-            if (result.suggestion) {
-              return this.set(
-                "uniqueUsernameValidation",
-                EmberObject.create(
-                  Object.assign(failedAttrs, {
-                    reason: I18n.t("user.username.not_available", result),
-                  })
-                )
-              );
-            } else {
-              return this.set(
-                "uniqueUsernameValidation",
-                EmberObject.create(
-                  Object.assign(failedAttrs, {
-                    reason: result.errors
-                      ? result.errors.join(" ")
-                      : I18n.t("user.username.not_available_no_suggestion"),
-                  })
-                )
-              );
-            }
+            return this.set(
+              "usernameValidation",
+              failedResult({
+                reason: result.errors
+                  ? result.errors.join(" ")
+                  : I18n.t("user.username.not_available_no_suggestion"),
+              })
+            );
           }
         }
-      );
-    }
-  }, 500),
-
-  // Actually wait for the async name check before we're 100% sure we're good to go
-  @discourseComputed("uniqueUsernameValidation", "basicUsernameValidation")
-  usernameValidation() {
-    const basicValidation = this.basicUsernameValidation;
-    const uniqueUsername = this.uniqueUsernameValidation;
-    return uniqueUsername ? uniqueUsername : basicValidation;
+      }
+    );
   },
 });
diff --git a/app/assets/javascripts/discourse/app/models/action-summary.js b/app/assets/javascripts/discourse/app/models/action-summary.js
index 7680d13110..6c76700a06 100644
--- a/app/assets/javascripts/discourse/app/models/action-summary.js
+++ b/app/assets/javascripts/discourse/app/models/action-summary.js
@@ -1,6 +1,6 @@
-import { or } from "@ember/object/computed";
-import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
+import { ajax } from "discourse/lib/ajax";
+import { or } from "@ember/object/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default RestModel.extend({
@@ -53,6 +53,7 @@ export default RestModel.extend({
         message: opts.message,
         is_warning: opts.isWarning,
         take_action: opts.takeAction,
+        queue_for_review: opts.queue_for_review,
         flag_topic: this.flagTopic ? true : false,
       },
       returnXHR: true,
diff --git a/app/assets/javascripts/discourse/app/models/archetype.js b/app/assets/javascripts/discourse/app/models/archetype.js
index bd4eedffe0..fb48513fbc 100644
--- a/app/assets/javascripts/discourse/app/models/archetype.js
+++ b/app/assets/javascripts/discourse/app/models/archetype.js
@@ -1,6 +1,6 @@
 import { gt, not } from "@ember/object/computed";
-import { propertyEqual } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";
+import { propertyEqual } from "discourse/lib/computed";
 
 export default RestModel.extend({
   hasOptions: gt("options.length", 0),
diff --git a/app/assets/javascripts/discourse/app/models/badge-grouping.js b/app/assets/javascripts/discourse/app/models/badge-grouping.js
index cd9b1cd037..e681d4f025 100644
--- a/app/assets/javascripts/discourse/app/models/badge-grouping.js
+++ b/app/assets/javascripts/discourse/app/models/badge-grouping.js
@@ -1,6 +1,6 @@
 import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import RestModel from "discourse/models/rest";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default RestModel.extend({
   @discourseComputed("name")
diff --git a/app/assets/javascripts/discourse/app/models/badge.js b/app/assets/javascripts/discourse/app/models/badge.js
index 894f3fb09d..f9493129a5 100644
--- a/app/assets/javascripts/discourse/app/models/badge.js
+++ b/app/assets/javascripts/discourse/app/models/badge.js
@@ -1,14 +1,15 @@
-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";
-import { ajax } from "discourse/lib/ajax";
 import BadgeGrouping from "discourse/models/badge-grouping";
-import RestModel from "discourse/models/rest";
+import EmberObject from "@ember/object";
 import { Promise } from "rsvp";
+import RestModel from "discourse/models/rest";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
+import { alias, none } from "@ember/object/computed";
 
 const Badge = RestModel.extend({
   newBadge: none("id"),
+  image: alias("image_url"),
 
   @discourseComputed
   url() {
diff --git a/app/assets/javascripts/discourse/app/models/bookmark.js b/app/assets/javascripts/discourse/app/models/bookmark.js
index 0c416b15ba..b18402dbd2 100644
--- a/app/assets/javascripts/discourse/app/models/bookmark.js
+++ b/app/assets/javascripts/discourse/app/models/bookmark.js
@@ -1,16 +1,16 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
 import Category from "discourse/models/category";
-import User from "discourse/models/user";
-import { fancyTitle } from "discourse/lib/topic-fancy-title";
-import { longDate } from "discourse/lib/formatter";
-import { none } from "@ember/object/computed";
-import { computed } from "@ember/object";
-import { ajax } from "discourse/lib/ajax";
+import I18n from "I18n";
 import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
+import User from "discourse/models/user";
+import Topic from "discourse/models/topic";
+import { ajax } from "discourse/lib/ajax";
+import { computed } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 import { formattedReminderTime } from "discourse/lib/bookmark";
+import getURL from "discourse-common/lib/get-url";
+import { longDate } from "discourse/lib/formatter";
+import { none } from "@ember/object/computed";
 
 export const AUTO_DELETE_PREFERENCES = {
   NEVER: 0,
@@ -36,6 +36,20 @@ const Bookmark = RestModel.extend({
     });
   },
 
+  togglePin() {
+    if (this.newBookmark) {
+      return Promise.resolve();
+    }
+
+    return ajax(this.url + "/toggle_pin", {
+      type: "PUT",
+    });
+  },
+
+  pinAction() {
+    return this.pinned ? "unpin" : "pin";
+  },
+
   @discourseComputed("highest_post_number", "url")
   lastPostUrl(highestPostNumber) {
     return this.urlForPostNumber(highestPostNumber);
@@ -75,11 +89,6 @@ const Bookmark = RestModel.extend({
     });
   },
 
-  @discourseComputed("title")
-  fancyTitle(title) {
-    return fancyTitle(title, this.siteSettings.support_mixed_text_direction);
-  },
-
   @discourseComputed("created_at")
   createdAt(created_at) {
     return new Date(created_at);
@@ -116,6 +125,15 @@ const Bookmark = RestModel.extend({
     ).capitalize();
   },
 
+  @discourseComputed("linked_post_number", "title", "topic_id")
+  topicLink(linked_post_number, title, topic_id) {
+    return Topic.create({
+      id: topic_id,
+      fancy_title: title,
+      linked_post_number,
+    });
+  },
+
   loadItems(params) {
     let url = `/u/${this.user.username}/bookmarks.json`;
 
diff --git a/app/assets/javascripts/discourse/app/models/category-list.js b/app/assets/javascripts/discourse/app/models/category-list.js
index cf4d89534d..b7a44e042c 100644
--- a/app/assets/javascripts/discourse/app/models/category-list.js
+++ b/app/assets/javascripts/discourse/app/models/category-list.js
@@ -1,10 +1,11 @@
-import I18n from "I18n";
 import ArrayProxy from "@ember/array/proxy";
-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";
+import I18n from "I18n";
+import PreloadStore from "discourse/lib/preload-store";
 import Site from "discourse/models/site";
+import Topic from "discourse/models/topic";
+import { ajax } from "discourse/lib/ajax";
+import { number } from "discourse/lib/formatter";
 
 const CategoryList = ArrayProxy.extend({
   init() {
@@ -50,9 +51,14 @@ CategoryList.reopenClass({
         case "week":
         case "month":
           const stat = c[`topics_${statPeriod}`];
-          const unit = I18n.t(statPeriod);
           if (stat > 0) {
-            c.stat = `<span class="value">${stat}</span> / <span class="unit">${unit}</span>`;
+            const unit = I18n.t(`categories.topic_stat_unit.${statPeriod}`);
+
+            c.stat = I18n.t("categories.topic_stat", {
+              count: stat, // only used to correctly pluralize the string
+              number: `<span class="value">${number(stat)}</span>`,
+              unit: `<span class="unit">${unit}</span>`,
+            });
 
             c.statTitle = I18n.t(
               `categories.topic_stat_sentence_${statPeriod}`,
@@ -61,13 +67,11 @@ CategoryList.reopenClass({
               }
             );
 
-            c[
-              "pick" + statPeriod[0].toUpperCase() + statPeriod.slice(1)
-            ] = true;
+            c.pickAll = false;
             break;
           }
         default:
-          c.stat = `<span class="value">${c.topics_all_time}</span>`;
+          c.stat = `<span class="value">${number(c.topics_all_time)}</span>`;
           c.statTitle = I18n.t("categories.topic_sentence", {
             count: c.topics_all_time,
           });
@@ -75,6 +79,13 @@ CategoryList.reopenClass({
           break;
       }
 
+      if (Site.currentProp("mobileView")) {
+        c.statTotal = I18n.t("categories.topic_stat_all_time", {
+          count: c.topics_all_time,
+          number: `<span class="value">${number(c.topics_all_time)}</span>`,
+        });
+      }
+
       const record = Site.current().updateCategory(c);
       record.setupGroupsAndPermissions();
       categories.pushObject(record);
@@ -101,9 +112,6 @@ CategoryList.reopenClass({
           categories: this.categoriesFrom(store, result),
           can_create_category: result.category_list.can_create_category,
           can_create_topic: result.category_list.can_create_topic,
-          draft_key: result.category_list.draft_key,
-          draft: result.category_list.draft,
-          draft_sequence: result.category_list.draft_sequence,
         });
       }
     );
diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index 33c9afd2ed..4de28e476d 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -1,13 +1,13 @@
-import getURL from "discourse-common/lib/get-url";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
-import { get } from "@ember/object";
-import { ajax } from "discourse/lib/ajax";
-import RestModel from "discourse/models/rest";
-import PermissionType from "discourse/models/permission-type";
 import { NotificationLevels } from "discourse/lib/notification-levels";
+import PermissionType from "discourse/models/permission-type";
+import RestModel from "discourse/models/rest";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
+import { ajax } from "discourse/lib/ajax";
+import { get } from "@ember/object";
 import { getOwner } from "discourse-common/lib/get-owner";
+import getURL from "discourse-common/lib/get-url";
 
 const STAFF_GROUP_NAME = "staff";
 
@@ -128,8 +128,13 @@ const Category = RestModel.extend({
   },
 
   @discourseComputed("name")
-  url() {
-    return getURL(`/c/${Category.slugFor(this)}/${this.id}`);
+  path() {
+    return `/c/${Category.slugFor(this)}/${this.id}`;
+  },
+
+  @discourseComputed("path")
+  url(path) {
+    return getURL(path);
   },
 
   @discourseComputed
@@ -199,6 +204,8 @@ const Category = RestModel.extend({
         custom_fields: this.custom_fields,
         topic_template: this.topic_template,
         all_topics_wiki: this.all_topics_wiki,
+        allow_unlimited_owner_edits_on_first_post: this
+          .allow_unlimited_owner_edits_on_first_post,
         allowed_tags: this.allowed_tags,
         allowed_tag_groups: this.allowed_tag_groups,
         allow_global_tags: this.allow_global_tags,
@@ -312,7 +319,7 @@ const Category = RestModel.extend({
   },
 });
 
-var _uncategorized;
+let _uncategorized;
 
 Category.reopenClass({
   slugEncoded() {
@@ -490,24 +497,12 @@ Category.reopenClass({
     return ajax(`/c/${id}/show.json`);
   },
 
-  reloadBySlug(slug, parentSlug) {
-    return parentSlug
-      ? ajax(`/c/${parentSlug}/${slug}/find_by_slug.json`)
-      : ajax(`/c/${slug}/find_by_slug.json`);
-  },
-
   reloadBySlugPath(slugPath) {
     return ajax(`/c/${slugPath}/find_by_slug.json`);
   },
 
   reloadCategoryWithPermissions(params, store, site) {
-    if (params.slug && params.slug.match(/^\d+-category/)) {
-      const id = parseInt(params.slug, 10);
-      return this.reloadById(id).then((result) =>
-        this._includePermissions(result.category, store, site)
-      );
-    }
-    return this.reloadBySlug(params.slug, params.parentSlug).then((result) =>
+    return this.reloadBySlugPath(params.slug).then((result) =>
       this._includePermissions(result.category, store, site)
     );
   },
@@ -520,7 +515,7 @@ Category.reopenClass({
   },
 
   search(term, opts) {
-    var limit = 5;
+    let limit = 5;
 
     if (opts) {
       if (opts.limit === 0) {
@@ -541,8 +536,8 @@ Category.reopenClass({
 
     const categories = Category.listByActivity();
     const length = categories.length;
-    var i;
-    var data = [];
+    let i;
+    let data = [];
 
     const done = () => {
       return data.length === limit;
diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index bf594f253c..b36abfb524 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -1,28 +1,28 @@
-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";
+import { and, equal, not, or, reads } from "@ember/object/computed";
 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_REGEXP } from "discourse/lib/quote";
-import Draft from "discourse/models/draft";
 import discourseComputed, {
   observes,
   on,
 } from "discourse-common/utils/decorators";
 import {
+  emailValid,
   escapeExpression,
   tinyAvatar,
-  emailValid,
 } from "discourse/lib/utilities";
-import { propertyNotEqual } from "discourse/lib/computed";
+import Draft from "discourse/models/draft";
+import I18n from "I18n";
 import { Promise } from "rsvp";
+import { QUOTE_REGEXP } from "discourse/lib/quote";
+import RestModel from "discourse/models/rest";
 import Site from "discourse/models/site";
+import Topic from "discourse/models/topic";
 import User from "discourse/models/user";
-import deprecated from "discourse-common/lib/deprecated";
 import bootbox from "bootbox";
+import deprecated from "discourse-common/lib/deprecated";
+import { isEmpty } from "@ember/utils";
+import { propertyNotEqual } from "discourse/lib/computed";
+import { throwAjaxError } from "discourse/lib/ajax-error";
 
 // The actions the composer can take
 export const CREATE_TOPIC = "createTopic",
@@ -78,6 +78,7 @@ const CLOSED = "closed",
     action: "action",
     title: "title",
     categoryId: "categoryId",
+    tags: "tags",
     archetypeId: "archetypeId",
     whisper: "whisper",
     metaData: "metaData",
@@ -150,8 +151,23 @@ const Composer = RestModel.extend({
 
   @discourseComputed("category")
   minimumRequiredTags(category) {
-    return category && category.minimum_required_tags > 0
-      ? category.minimum_required_tags
+    if (category) {
+      if (category.required_tag_groups) {
+        return category.min_tags_from_required_group;
+      } else {
+        return category.minimum_required_tags > 0
+          ? category.minimum_required_tags
+          : null;
+      }
+    }
+
+    return null;
+  },
+
+  @discourseComputed("category")
+  requiredTagGroups(category) {
+    return category && category.required_tag_groups
+      ? category.required_tag_groups
       : null;
   },
 
@@ -311,7 +327,7 @@ const Composer = RestModel.extend({
     if (topic) {
       options.topicLink = {
         href: topic.url,
-        anchor: topic.fancy_title || escapeExpression(topicTitle),
+        anchor: topic.fancyTitle || escapeExpression(topicTitle),
       };
     }
 
@@ -464,7 +480,7 @@ const Composer = RestModel.extend({
 
   @discourseComputed("metaData")
   hasMetaData(metaData) {
-    return metaData ? isEmpty(Ember.keys(metaData)) : false;
+    return metaData ? isEmpty(Object.keys(metaData)) : false;
   },
 
   replyDirty: propertyNotEqual("reply", "originalText"),
@@ -536,6 +552,11 @@ const Composer = RestModel.extend({
       return reply.length;
     }
 
+    const commentsRegexp = /<!--(.*?)-->/gm;
+    while (commentsRegexp.test(reply)) {
+      reply = reply.replace(commentsRegexp, "");
+    }
+
     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
diff --git a/app/assets/javascripts/discourse/app/models/draft.js b/app/assets/javascripts/discourse/app/models/draft.js
index 25bddd8329..5406c7f9b8 100644
--- a/app/assets/javascripts/discourse/app/models/draft.js
+++ b/app/assets/javascripts/discourse/app/models/draft.js
@@ -1,5 +1,5 @@
-import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
 
 const Draft = EmberObject.extend();
 
diff --git a/app/assets/javascripts/discourse/app/models/group-history.js b/app/assets/javascripts/discourse/app/models/group-history.js
index 2b8fb34b21..ef1c6787f1 100644
--- a/app/assets/javascripts/discourse/app/models/group-history.js
+++ b/app/assets/javascripts/discourse/app/models/group-history.js
@@ -1,6 +1,6 @@
 import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import RestModel from "discourse/models/rest";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default RestModel.extend({
   @discourseComputed("action")
diff --git a/app/assets/javascripts/discourse/app/models/group.js b/app/assets/javascripts/discourse/app/models/group.js
index 6c6a662f01..429dcd0595 100644
--- a/app/assets/javascripts/discourse/app/models/group.js
+++ b/app/assets/javascripts/discourse/app/models/group.js
@@ -1,14 +1,14 @@
-import EmberObject from "@ember/object";
-import { equal } from "@ember/object/computed";
-import { isEmpty } from "@ember/utils";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { ajax } from "discourse/lib/ajax";
 import Category from "discourse/models/category";
+import EmberObject from "@ember/object";
 import GroupHistory from "discourse/models/group-history";
+import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import Topic from "discourse/models/topic";
 import User from "discourse/models/user";
-import { Promise } from "rsvp";
+import { ajax } from "discourse/lib/ajax";
+import { equal } from "@ember/object/computed";
+import { isEmpty } from "@ember/utils";
 
 const Group = RestModel.extend({
   user_count: 0,
@@ -56,6 +56,7 @@ const Group = RestModel.extend({
       members.pushObjects(
         result.members.map((member) => {
           member.owner = ownerIds.has(member.id);
+          member.primary = member.primary_group_name === this.name;
           return User.create(member);
         })
       );
@@ -234,6 +235,8 @@ const Group = RestModel.extend({
       default_notification_level: this.default_notification_level,
       membership_request_template: this.membership_request_template,
       publish_read_state: this.publish_read_state,
+      allow_unknown_sender_topic_replies: this
+        .allow_unknown_sender_topic_replies,
     };
 
     ["muted", "regular", "watching", "tracking", "watching_first_post"].forEach(
diff --git a/app/assets/javascripts/discourse/app/models/invite.js b/app/assets/javascripts/discourse/app/models/invite.js
index aa72a55e8e..7ad702f223 100644
--- a/app/assets/javascripts/discourse/app/models/invite.js
+++ b/app/assets/javascripts/discourse/app/models/invite.js
@@ -1,18 +1,28 @@
 import EmberObject from "@ember/object";
+import { alias } from "@ember/object/computed";
+import { Promise } from "rsvp";
+import discourseComputed from "discourse-common/utils/decorators";
+import Topic from "discourse/models/topic";
+import User from "discourse/models/user";
 import { ajax } from "discourse/lib/ajax";
+import { isNone } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { userPath } from "discourse/lib/url";
-import { Promise } from "rsvp";
-import { isNone } from "@ember/utils";
-import User from "discourse/models/user";
 
 const Invite = EmberObject.extend({
-  rescind() {
-    ajax("/invites", {
+  save(data) {
+    const promise = this.id
+      ? ajax(`/invites/${this.id}`, { type: "PUT", data })
+      : ajax("/invites", { type: "POST", data });
+
+    return promise.then((result) => this.setProperties(result));
+  },
+
+  destroy() {
+    return ajax("/invites", {
       type: "DELETE",
       data: { id: this.id },
-    });
-    this.set("rescinded", true);
+    }).then(() => this.set("destroyed", true));
   },
 
   reinvite() {
@@ -23,6 +33,24 @@ const Invite = EmberObject.extend({
       .then(() => this.set("reinvited", true))
       .catch(popupAjaxError);
   },
+
+  @discourseComputed("invite_key")
+  shortKey(key) {
+    return key.substr(0, 4) + "...";
+  },
+
+  @discourseComputed("groups")
+  groupIds(groups) {
+    return groups ? groups.map((group) => group.id) : [];
+  },
+
+  @discourseComputed("topics.firstObject")
+  topic(topicData) {
+    return topicData ? Topic.create(topicData) : null;
+  },
+
+  topicId: alias("topics.firstObject.id"),
+  topicTitle: alias("topics.firstObject.title"),
 });
 
 Invite.reopenClass({
@@ -48,14 +76,7 @@ Invite.reopenClass({
     }
     data.offset = offset || 0;
 
-    let path;
-    if (filter === "links") {
-      path = userPath(`${user.username_lower}/invite_links.json`);
-    } else {
-      path = userPath(`${user.username_lower}/invited.json`);
-    }
-
-    return ajax(path, {
+    return ajax(userPath(`${user.username_lower}/invited.json`), {
       data,
     }).then((result) => {
       result.invites = result.invites.map((i) => Invite.create(i));
@@ -63,22 +84,12 @@ Invite.reopenClass({
     });
   },
 
-  findInvitedCount(user) {
-    if (!user) {
-      Promise.resolve();
-    }
-
-    return ajax(
-      userPath(`${user.username_lower}/invited_count.json`)
-    ).then((result) => EmberObject.create(result.counts));
-  },
-
   reinviteAll() {
     return ajax("/invites/reinvite-all", { type: "POST" });
   },
 
-  rescindAll() {
-    return ajax("/invites/rescind-all", { type: "POST" });
+  destroyAllExpired() {
+    return ajax("/invites/destroy-all-expired", { type: "POST" });
   },
 });
 
diff --git a/app/assets/javascripts/discourse/app/models/live-post-counts.js b/app/assets/javascripts/discourse/app/models/live-post-counts.js
index a95565e602..bac51ff825 100644
--- a/app/assets/javascripts/discourse/app/models/live-post-counts.js
+++ b/app/assets/javascripts/discourse/app/models/live-post-counts.js
@@ -1,5 +1,5 @@
-import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
 
 const LivePostCounts = EmberObject.extend({});
 
diff --git a/app/assets/javascripts/discourse/app/models/login-method.js b/app/assets/javascripts/discourse/app/models/login-method.js
index 3b1ca37b2a..efe7c438bc 100644
--- a/app/assets/javascripts/discourse/app/models/login-method.js
+++ b/app/assets/javascripts/discourse/app/models/login-method.js
@@ -1,11 +1,11 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
-import { updateCsrfToken } from "discourse/lib/ajax";
+import I18n from "I18n";
 import { Promise } from "rsvp";
 import Session from "discourse/models/session";
 import Site from "discourse/models/site";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
+import { updateCsrfToken } from "discourse/lib/ajax";
 
 const LoginMethod = EmberObject.extend({
   @discourseComputed
@@ -18,12 +18,7 @@ const LoginMethod = EmberObject.extend({
     return this.pretty_name_override || I18n.t(`login.${this.name}.name`);
   },
 
-  @discourseComputed
-  message() {
-    return this.message_override || I18n.t(`login.${this.name}.message`);
-  },
-
-  doLogin({ reconnect = false, params = {} } = {}) {
+  doLogin({ reconnect = false, signup = false, params = {} } = {}) {
     if (this.customLogin) {
       this.customLogin();
       return Promise.resolve();
@@ -40,6 +35,10 @@ const LoginMethod = EmberObject.extend({
       params["reconnect"] = true;
     }
 
+    if (signup) {
+      params["signup"] = true;
+    }
+
     const paramKeys = Object.keys(params);
     if (paramKeys.length > 0) {
       authUrl += "?";
diff --git a/app/assets/javascripts/discourse/app/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js
index 3b36b6cdd2..0293fbddf8 100644
--- a/app/assets/javascripts/discourse/app/models/nav-item.js
+++ b/app/assets/javascripts/discourse/app/models/nav-item.js
@@ -1,15 +1,15 @@
-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";
 import Category from "discourse/models/category";
 import EmberObject from "@ember/object";
-import { reads } from "@ember/object/computed";
-import deprecated from "discourse-common/lib/deprecated";
+import I18n from "I18n";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
-import { getOwner } from "discourse-common/lib/get-owner";
 import { deepMerge } from "discourse-common/lib/object";
+import deprecated from "discourse-common/lib/deprecated";
+import discourseComputed from "discourse-common/utils/decorators";
+import { emojiUnescape } from "discourse/lib/text";
+import { getOwner } from "discourse-common/lib/get-owner";
+import getURL from "discourse-common/lib/get-url";
+import { reads } from "@ember/object/computed";
 
 const NavItem = EmberObject.extend({
   @discourseComputed("name")
@@ -75,12 +75,13 @@ const NavItem = EmberObject.extend({
     "name",
     "category",
     "tagId",
+    "noSubcategories",
     "topicTrackingState.messageCount"
   )
-  count(name, category, tagId) {
+  count(name, category, tagId, noSubcategories) {
     const state = this.topicTrackingState;
     if (state) {
-      return state.lookupCount(name, category, tagId);
+      return state.lookupCount(name, category, tagId, noSubcategories);
     }
   },
 });
@@ -176,7 +177,7 @@ NavItem.reopenClass({
       return null;
     }
 
-    var args = { name: filterType, hasIcon: filterType === "unread" };
+    let args = { name: filterType, hasIcon: filterType === "unread" };
     if (opts.category) {
       args.category = opts.category;
     }
@@ -300,6 +301,10 @@ export function customNavItemHref(cb) {
   NavItem.customNavItemHrefs.push(cb);
 }
 
+export function clearCustomNavItemHref() {
+  NavItem.customNavItemHrefs.clear();
+}
+
 export function addNavItem(item) {
   NavItem.extraNavItemDescriptors.push(item);
 }
diff --git a/app/assets/javascripts/discourse/app/models/permission-type.js b/app/assets/javascripts/discourse/app/models/permission-type.js
index 696f162034..17df7bd9df 100644
--- a/app/assets/javascripts/discourse/app/models/permission-type.js
+++ b/app/assets/javascripts/discourse/app/models/permission-type.js
@@ -1,6 +1,6 @@
+import EmberObject from "@ember/object";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import EmberObject from "@ember/object";
 
 export function buildPermissionDescription(id) {
   return I18n.t("permission_types." + PermissionType.DESCRIPTION_KEYS[id]);
diff --git a/app/assets/javascripts/discourse/app/models/post-action-type.js b/app/assets/javascripts/discourse/app/models/post-action-type.js
index 35a93b54c5..9b40783c0a 100644
--- a/app/assets/javascripts/discourse/app/models/post-action-type.js
+++ b/app/assets/javascripts/discourse/app/models/post-action-type.js
@@ -1,5 +1,5 @@
-import { not } from "@ember/object/computed";
 import RestModel from "discourse/models/rest";
+import { not } from "@ember/object/computed";
 
 export const MAX_MESSAGE_LENGTH = 500;
 
diff --git a/app/assets/javascripts/discourse/app/models/post-stream.js b/app/assets/javascripts/discourse/app/models/post-stream.js
index 42e5da69fe..2c0777538d 100644
--- a/app/assets/javascripts/discourse/app/models/post-stream.js
+++ b/app/assets/javascripts/discourse/app/models/post-stream.js
@@ -1,17 +1,19 @@
-import I18n from "I18n";
-import { get } from "@ember/object";
-import { isEmpty } from "@ember/utils";
-import { or, not, and } from "@ember/object/computed";
-import { ajax } from "discourse/lib/ajax";
+import { and, not, or } from "@ember/object/computed";
 import DiscourseURL from "discourse/lib/url";
-import RestModel from "discourse/models/rest";
+import I18n from "I18n";
 import PostsWithPlaceholders from "discourse/lib/posts-with-placeholders";
-import discourseComputed from "discourse-common/utils/decorators";
-import { loadTopicView } from "discourse/models/topic";
 import { Promise } from "rsvp";
+import RestModel from "discourse/models/rest";
 import User from "discourse/models/user";
+import { ajax } from "discourse/lib/ajax";
 import { deepMerge } from "discourse-common/lib/object";
 import deprecated from "discourse-common/lib/deprecated";
+import discourseComputed from "discourse-common/utils/decorators";
+import { get } from "@ember/object";
+import { highlightPost } from "discourse/lib/utilities";
+import { isEmpty } from "@ember/utils";
+import { loadTopicView } from "discourse/models/topic";
+import { schedule } from "@ember/runloop";
 
 export default RestModel.extend({
   _identityMap: null,
@@ -27,6 +29,8 @@ export default RestModel.extend({
   stagingPost: null,
   postsWithPlaceholders: null,
   timelineLookup: null,
+  filterRepliesToPostNumber: null,
+  filterUpwardsPostID: null,
 
   init() {
     this._identityMap = {};
@@ -42,6 +46,9 @@ export default RestModel.extend({
       stream: [],
       userFilters: [],
       summary: false,
+      filterRepliesToPostNumber:
+        parseInt(this.get("topic.replies_to_post_number"), 10) || false,
+      filterUpwardsPostID: false,
       loaded: false,
       loadingAbove: false,
       loadingBelow: false,
@@ -117,10 +124,16 @@ export default RestModel.extend({
     Returns a JS Object of current stream filter options. It should match the query
     params for the stream.
   **/
-  @discourseComputed("summary", "userFilters.[]")
-  streamFilters(summary) {
+  @discourseComputed(
+    "summary",
+    "userFilters.[]",
+    "filterRepliesToPostNumber",
+    "filterUpwardsPostID"
+  )
+  streamFilters() {
     const result = {};
-    if (summary) {
+
+    if (this.summary) {
       result.filter = "summary";
     }
 
@@ -129,6 +142,14 @@ export default RestModel.extend({
       result.username_filters = userFilters.join(",");
     }
 
+    if (this.filterRepliesToPostNumber) {
+      result.replies_to_post_number = this.filterRepliesToPostNumber;
+    }
+
+    if (this.filterUpwardsPostID) {
+      result.filter_upwards_post_id = this.filterUpwardsPostID;
+    }
+
     return result;
   },
 
@@ -200,49 +221,84 @@ export default RestModel.extend({
   },
 
   cancelFilter() {
-    this.set("summary", false);
-    this.userFilters.clear();
+    this.setProperties({
+      userFilters: [],
+      summary: false,
+      filterRepliesToPostNumber: false,
+      filterUpwardsPostID: false,
+      mixedHiddenPosts: false,
+    });
   },
 
-  toggleSummary() {
-    this.userFilters.clear();
-    this.toggleProperty("summary");
-    const opts = {};
-
-    if (!this.summary) {
-      opts.filter = "none";
-    }
-
-    return this.refresh(opts).then(() => {
-      if (this.summary) {
-        this.jumpToSecondVisible();
+  refreshAndJumptoSecondVisible() {
+    return this.refresh({}).then(() => {
+      if (this.posts && this.posts.length > 1) {
+        DiscourseURL.jumpToPost(this.posts[1].get("post_number"));
       }
     });
   },
 
-  jumpToSecondVisible() {
-    const posts = this.posts;
-    if (posts.length > 1) {
-      const secondPostNum = posts[1].get("post_number");
-      DiscourseURL.jumpToPost(secondPostNum);
-    }
+  showSummary() {
+    this.cancelFilter();
+    this.set("summary", true);
+    return this.refreshAndJumptoSecondVisible();
   },
 
   // Filter the stream to a particular user.
-  toggleParticipant(username) {
-    const userFilters = this.userFilters;
-    this.set("summary", false);
+  filterParticipant(username) {
+    this.cancelFilter();
+    this.userFilters.addObject(username);
+    return this.refreshAndJumptoSecondVisible();
+  },
 
-    let jump = false;
-    if (userFilters.includes(username)) {
-      userFilters.removeObject(username);
-    } else {
-      userFilters.addObject(username);
-      jump = true;
-    }
-    return this.refresh().then(() => {
-      if (jump) {
-        this.jumpToSecondVisible();
+  filterReplies(postNumber, postId) {
+    this.cancelFilter();
+    this.set("filterRepliesToPostNumber", postNumber);
+    this.appEvents.trigger("post-stream:filter-replies", {
+      topic_id: this.get("topic.id"),
+      post_number: postNumber,
+      post_id: postId,
+    });
+    return this.refresh({ refreshInPlace: true }).then(() => {
+      const element = document.querySelector(`#post_${postNumber}`);
+
+      // order is important, we need to get the offset before triggering a refresh
+      const originalTopOffset = element
+        ? element.getBoundingClientRect().top
+        : null;
+
+      this.appEvents.trigger("post-stream:refresh");
+      DiscourseURL.jumpToPost(postNumber, {
+        originalTopOffset,
+      });
+
+      const replyPostNumbers = this.posts.mapBy("post_number");
+      replyPostNumbers.splice(0, 2);
+      schedule("afterRender", () => {
+        replyPostNumbers.forEach((postNum) => {
+          highlightPost(postNum);
+        });
+      });
+    });
+  },
+
+  filterUpwards(postID) {
+    this.cancelFilter();
+    this.set("filterUpwardsPostID", postID);
+    this.appEvents.trigger("post-stream:filter-upwards", {
+      topic_id: this.get("topic.id"),
+      post_id: postID,
+    });
+    return this.refresh({ refreshInPlace: true }).then(() => {
+      this.appEvents.trigger("post-stream:refresh");
+
+      if (this.posts && this.posts.length > 1) {
+        const postNumber = this.posts[1].get("post_number");
+        DiscourseURL.jumpToPost(postNumber, { skipIfOnScreen: true });
+
+        schedule("afterRender", () => {
+          highlightPost(postNumber);
+        });
       }
     });
   },
@@ -255,9 +311,9 @@ export default RestModel.extend({
     opts = opts || {};
     opts.nearPost = parseInt(opts.nearPost, 10);
 
-    if (opts.cancelSummary) {
-      this.set("summary", false);
-      delete opts.cancelSummary;
+    if (opts.cancelFilter) {
+      this.cancelFilter();
+      delete opts.cancelFilter;
     }
 
     const topic = this.topic;
@@ -273,7 +329,9 @@ export default RestModel.extend({
     }
 
     // TODO: if we have all the posts in the filter, don't go to the server for them.
-    this.set("loadingFilter", true);
+    if (!opts.refreshInPlace) {
+      this.set("loadingFilter", true);
+    }
     this.set("loadingNearPost", opts.nearPost);
 
     opts = deepMerge(opts, this.streamFilters);
@@ -327,13 +385,13 @@ export default RestModel.extend({
           } else {
             delete this.get("gaps.before")[postId];
           }
-          this.stream.arrayContentDidChange();
           this.postsWithPlaceholders.arrayContentDidChange(
             origIdx,
             0,
             posts.length
           );
           post.set("hasGap", false);
+          this.gapExpanded();
         });
       }
     }
@@ -350,12 +408,22 @@ export default RestModel.extend({
       stream.pushObjects(gap);
       return this.appendMore().then(() => {
         delete this.get("gaps.after")[postId];
-        this.stream.arrayContentDidChange();
+        this.gapExpanded();
       });
     }
     return Promise.resolve();
   },
 
+  gapExpanded() {
+    this.appEvents.trigger("post-stream:refresh");
+
+    // resets the reply count in posts-filtered-notice
+    // because once a gap has been expanded that count is no longer exact
+    if (this.streamFilters && this.streamFilters.replies_to_post_number) {
+      this.set("streamFilters.mixedHiddenPosts", true);
+    }
+  },
+
   // Appends the next window of posts to the stream. Call it when scrolling downwards.
   appendMore() {
     // Make sure we can append more posts
diff --git a/app/assets/javascripts/discourse/app/models/post.js b/app/assets/javascripts/discourse/app/models/post.js
index 911cca18b6..77e1967f2e 100644
--- a/app/assets/javascripts/discourse/app/models/post.js
+++ b/app/assets/javascripts/discourse/app/models/post.js
@@ -1,23 +1,22 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject, { get } from "@ember/object";
-import { isEmpty } from "@ember/utils";
-import { equal, and, or, not } from "@ember/object/computed";
-import { ajax } from "discourse/lib/ajax";
-import RestModel from "discourse/models/rest";
-import { popupAjaxError } from "discourse/lib/ajax-error";
+import { and, equal, not, or } from "@ember/object/computed";
 import ActionSummary from "discourse/models/action-summary";
-import { propertyEqual } from "discourse/lib/computed";
-import { postUrl } from "discourse/lib/utilities";
-import { cookAsync } from "discourse/lib/text";
-import { userPath } from "discourse/lib/url";
 import Composer from "discourse/models/composer";
+import I18n from "I18n";
 import { Promise } from "rsvp";
+import RestModel from "discourse/models/rest";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
-import showModal from "discourse/lib/show-modal";
+import { ajax } from "discourse/lib/ajax";
+import { cookAsync } from "discourse/lib/text";
+import discourseComputed from "discourse-common/utils/decorators";
 import { fancyTitle } from "discourse/lib/topic-fancy-title";
+import { isEmpty } from "@ember/utils";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { postUrl } from "discourse/lib/utilities";
+import { propertyEqual } from "discourse/lib/computed";
 import { resolveShareUrl } from "discourse/helpers/share-url";
+import { userPath } from "discourse/lib/url";
 
 const Post = RestModel.extend({
   @discourseComputed("url")
@@ -304,54 +303,24 @@ const Post = RestModel.extend({
     return ajax(`/posts/${this.id}/unhide`, { type: "PUT" });
   },
 
-  toggleBookmark() {
-    let postEl = document.querySelector(`[data-post-id="${this.id}"]`);
-    let localDateEl = null;
-    if (postEl) {
-      localDateEl = postEl.querySelector(".discourse-local-date");
-    }
-
-    return new Promise((resolve) => {
-      let controller = showModal("bookmark", {
-        model: {
-          postId: this.id,
-          id: this.bookmark_id,
-          reminderAt: this.bookmark_reminder_at,
-          autoDeletePreference: this.bookmark_auto_delete_preference,
-          name: this.bookmark_name,
-          postDetectedLocalDate: localDateEl ? localDateEl.dataset.date : null,
-          postDetectedLocalTime: localDateEl ? localDateEl.dataset.time : null,
-        },
-        title: this.bookmark_id
-          ? "post.bookmarks.edit"
-          : "post.bookmarks.create",
-        modalClass: "bookmark-with-reminder",
-      });
-      controller.setProperties({
-        onCloseWithoutSaving: () => {
-          resolve({ closedWithoutSaving: true });
-          this.appEvents.trigger("post-stream:refresh", { id: this.id });
-        },
-        afterSave: (savedData) => {
-          this.setProperties({
-            "topic.bookmarked": true,
-            bookmarked: true,
-            bookmark_reminder_at: savedData.reminderAt,
-            bookmark_reminder_type: savedData.reminderType,
-            bookmark_auto_delete_preference: savedData.autoDeletePreference,
-            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.clearBookmark();
-          this.appEvents.trigger("page:bookmark-post-toggled", this);
-        },
-      });
+  createBookmark(data) {
+    this.setProperties({
+      "topic.bookmarked": true,
+      bookmarked: true,
+      bookmark_reminder_at: data.reminderAt,
+      bookmark_reminder_type: data.reminderType,
+      bookmark_auto_delete_preference: data.autoDeletePreference,
+      bookmark_name: data.name,
+      bookmark_id: data.id,
     });
+    this.appEvents.trigger("page:bookmark-post-toggled", this);
+    this.appEvents.trigger("post-stream:refresh", { id: this.id });
+  },
+
+  deleteBookmark(bookmarked) {
+    this.set("topic.bookmarked", bookmarked);
+    this.clearBookmark();
+    this.appEvents.trigger("page:bookmark-post-toggled", this);
   },
 
   clearBookmark() {
@@ -431,7 +400,7 @@ Post.reopenClass({
     return ajax("/posts/merge_posts", {
       type: "PUT",
       data: { post_ids },
-    });
+    }).catch(popupAjaxError);
   },
 
   loadRevision(postId, version) {
diff --git a/app/assets/javascripts/discourse/app/models/rest.js b/app/assets/javascripts/discourse/app/models/rest.js
index 10f3d04b03..26219a9c48 100644
--- a/app/assets/javascripts/discourse/app/models/rest.js
+++ b/app/assets/javascripts/discourse/app/models/rest.js
@@ -1,8 +1,8 @@
-import { warn } from "@ember/debug";
-import { equal } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { Promise } from "rsvp";
+import { equal } from "@ember/object/computed";
 import { getOwner } from "discourse-common/lib/get-owner";
+import { warn } from "@ember/debug";
 
 const RestModel = EmberObject.extend({
   isNew: equal("__state", "new"),
diff --git a/app/assets/javascripts/discourse/app/models/result-set.js b/app/assets/javascripts/discourse/app/models/result-set.js
index 4e7866f86f..644e75638b 100644
--- a/app/assets/javascripts/discourse/app/models/result-set.js
+++ b/app/assets/javascripts/discourse/app/models/result-set.js
@@ -1,6 +1,6 @@
 import ArrayProxy from "@ember/array/proxy";
-import discourseComputed from "discourse-common/utils/decorators";
 import { Promise } from "rsvp";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default ArrayProxy.extend({
   loading: false,
diff --git a/app/assets/javascripts/discourse/app/models/reviewable-history.js b/app/assets/javascripts/discourse/app/models/reviewable-history.js
index bb143b712c..90484cc666 100644
--- a/app/assets/javascripts/discourse/app/models/reviewable-history.js
+++ b/app/assets/javascripts/discourse/app/models/reviewable-history.js
@@ -1,5 +1,5 @@
-import { equal } from "@ember/object/computed";
 import RestModel from "discourse/models/rest";
+import { equal } from "@ember/object/computed";
 
 export const CREATED = 0;
 export const TRANSITIONED_TO = 1;
diff --git a/app/assets/javascripts/discourse/app/models/reviewable.js b/app/assets/javascripts/discourse/app/models/reviewable.js
index a305241457..47c095bb46 100644
--- a/app/assets/javascripts/discourse/app/models/reviewable.js
+++ b/app/assets/javascripts/discourse/app/models/reviewable.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { ajax } from "discourse/lib/ajax";
-import RestModel from "discourse/models/rest";
 import Category from "discourse/models/category";
+import I18n from "I18n";
 import { Promise } from "rsvp";
+import RestModel from "discourse/models/rest";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export const PENDING = 0;
 export const APPROVED = 1;
diff --git a/app/assets/javascripts/discourse/app/models/site.js b/app/assets/javascripts/discourse/app/models/site.js
index 24e483db42..fa59e1cc21 100644
--- a/app/assets/javascripts/discourse/app/models/site.js
+++ b/app/assets/javascripts/discourse/app/models/site.js
@@ -1,15 +1,15 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject, { get } from "@ember/object";
-import { isEmpty } from "@ember/utils";
 import { alias, sort } from "@ember/object/computed";
 import Archetype from "discourse/models/archetype";
 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 "discourse/lib/preload-store";
+import RestModel from "discourse/models/rest";
+import Singleton from "discourse/mixins/singleton";
+import TrustLevel from "discourse/models/trust-level";
 import deprecated from "discourse-common/lib/deprecated";
+import discourseComputed from "discourse-common/utils/decorators";
 import { getOwner } from "discourse-common/lib/get-owner";
+import { isEmpty } from "@ember/utils";
 
 const Site = RestModel.extend({
   isReadOnly: alias("is_readonly"),
diff --git a/app/assets/javascripts/discourse/app/models/static-page.js b/app/assets/javascripts/discourse/app/models/static-page.js
index 6d39b9c59c..38e373dffa 100644
--- a/app/assets/javascripts/discourse/app/models/static-page.js
+++ b/app/assets/javascripts/discourse/app/models/static-page.js
@@ -1,6 +1,6 @@
 import EmberObject from "@ember/object";
-import { ajax } from "discourse/lib/ajax";
 import { Promise } from "rsvp";
+import { ajax } from "discourse/lib/ajax";
 
 const StaticPage = EmberObject.extend();
 
diff --git a/app/assets/javascripts/discourse/app/models/store.js b/app/assets/javascripts/discourse/app/models/store.js
index 7f18d2262d..d1783c08ef 100644
--- a/app/assets/javascripts/discourse/app/models/store.js
+++ b/app/assets/javascripts/discourse/app/models/store.js
@@ -1,11 +1,11 @@
 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 Category from "discourse/models/category";
 import { Promise } from "rsvp";
+import RestModel from "discourse/models/rest";
+import ResultSet from "discourse/models/result-set";
+import { ajax } from "discourse/lib/ajax";
+import { getRegister } from "discourse-common/lib/get-owner";
+import { underscore } from "@ember/string";
 
 let _identityMap;
 
@@ -114,9 +114,9 @@ export default EmberObject.extend({
   },
 
   find(type, findArgs, opts) {
-    var adapter = this.adapterFor(type);
+    let adapter = this.adapterFor(type);
     return adapter.find(this, type, findArgs, opts).then((result) => {
-      var hydrated = this._hydrateFindResults(result, type, findArgs, opts);
+      let hydrated = this._hydrateFindResults(result, type, findArgs, opts);
 
       if (result.extras) {
         hydrated.set("extras", result.extras);
@@ -139,7 +139,7 @@ export default EmberObject.extend({
     hydrated.set(
       "content",
       hydrated.get("content").map((item) => {
-        var staleItem = stale.content.findBy(primaryKey, item.get(primaryKey));
+        let staleItem = stale.content.findBy(primaryKey, item.get(primaryKey));
         if (staleItem) {
           staleItem.setProperties(item);
         } else {
diff --git a/app/assets/javascripts/discourse/app/models/tag-group.js b/app/assets/javascripts/discourse/app/models/tag-group.js
index d34ddcf7d2..e34e5cae71 100644
--- a/app/assets/javascripts/discourse/app/models/tag-group.js
+++ b/app/assets/javascripts/discourse/app/models/tag-group.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import RestModel from "discourse/models/rest";
 import PermissionType from "discourse/models/permission-type";
+import RestModel from "discourse/models/rest";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default RestModel.extend({
   @discourseComputed("permissions")
diff --git a/app/assets/javascripts/discourse/app/models/tag.js b/app/assets/javascripts/discourse/app/models/tag.js
index 03946c9b67..5f514f8db1 100644
--- a/app/assets/javascripts/discourse/app/models/tag.js
+++ b/app/assets/javascripts/discourse/app/models/tag.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import RestModel from "discourse/models/rest";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default RestModel.extend({
   @discourseComputed("count", "pm_count")
diff --git a/app/assets/javascripts/discourse/app/models/topic-details.js b/app/assets/javascripts/discourse/app/models/topic-details.js
index ce2f98363b..c96e73c383 100644
--- a/app/assets/javascripts/discourse/app/models/topic-details.js
+++ b/app/assets/javascripts/discourse/app/models/topic-details.js
@@ -1,16 +1,12 @@
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
-import { ajax } from "discourse/lib/ajax";
+import RestModel from "discourse/models/rest";
 import User from "discourse/models/user";
-import getURL from "discourse-common/lib/get-url";
+import { ajax } from "discourse/lib/ajax";
 
 /**
   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.
 **/
-import { NotificationLevels } from "discourse/lib/notification-levels";
-import RestModel from "discourse/models/rest";
 
 const TopicDetails = RestModel.extend({
   loaded: false,
@@ -35,34 +31,6 @@ const TopicDetails = RestModel.extend({
     this.set("loaded", true);
   },
 
-  @discourseComputed("notification_level", "notifications_reason_id")
-  notificationReasonText(level, reason) {
-    if (typeof level !== "number") {
-      level = 1;
-    }
-
-    let localeString = `topic.notifications.reasons.${level}`;
-    if (typeof reason === "number") {
-      const tmp = localeString + "_" + reason;
-      // some sane protection for missing translations of edge cases
-      if (I18n.lookup(tmp, { locale: "en" })) {
-        localeString = tmp;
-      }
-    }
-
-    if (
-      User.currentProp("mailing_list_mode") &&
-      level > NotificationLevels.MUTED
-    ) {
-      return I18n.t("topic.notifications.reasons.mailing_list_mode");
-    } else {
-      return I18n.t(localeString, {
-        username: User.currentProp("username_lower"),
-        basePath: getURL(""),
-      });
-    }
-  },
-
   updateNotifications(level) {
     return ajax(`/t/${this.get("topic.id")}/notifications`, {
       type: "POST",
diff --git a/app/assets/javascripts/discourse/app/models/topic-list.js b/app/assets/javascripts/discourse/app/models/topic-list.js
index 45020da87f..da291e8b52 100644
--- a/app/assets/javascripts/discourse/app/models/topic-list.js
+++ b/app/assets/javascripts/discourse/app/models/topic-list.js
@@ -1,13 +1,13 @@
-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";
-import RestModel from "discourse/models/rest";
-import { getOwner } from "discourse-common/lib/get-owner";
 import { Promise } from "rsvp";
+import RestModel from "discourse/models/rest";
 import Session from "discourse/models/session";
-import { isEmpty } from "@ember/utils";
 import User from "discourse/models/user";
+import { ajax } from "discourse/lib/ajax";
+import { getOwner } from "discourse-common/lib/get-owner";
+import getURL from "discourse-common/lib/get-url";
+import { isEmpty } from "@ember/utils";
+import { notEmpty } from "@ember/object/computed";
 
 function extractByKey(collection, klass) {
   const retval = {};
@@ -108,7 +108,7 @@ const TopicList = RestModel.extend({
           });
 
           Session.currentProp("topicList", this);
-          return this.more_topics_url;
+          return { moreTopicsUrl: this.more_topics_url, newTopics };
         }
       });
     } else {
@@ -184,9 +184,6 @@ TopicList.reopenClass({
     json.inserted = json.inserted || [];
     json.can_create_topic = json.topic_list.can_create_topic;
     json.more_topics_url = json.topic_list.more_topics_url;
-    json.draft_key = json.topic_list.draft_key;
-    json.draft_sequence = json.topic_list.draft_sequence;
-    json.draft = json.topic_list.draft;
     json.for_period = json.topic_list.for_period;
     json.loaded = true;
     json.per_page = json.topic_list.per_page;
diff --git a/app/assets/javascripts/discourse/app/models/topic-timer.js b/app/assets/javascripts/discourse/app/models/topic-timer.js
index e6d108a608..7ba6a8bab9 100644
--- a/app/assets/javascripts/discourse/app/models/topic-timer.js
+++ b/app/assets/javascripts/discourse/app/models/topic-timer.js
@@ -1,16 +1,16 @@
-import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
+import { ajax } from "discourse/lib/ajax";
 
 const TopicTimer = RestModel.extend({});
 
 TopicTimer.reopenClass({
-  updateStatus(
+  update(
     topicId,
     time,
     basedOnLastPost,
     statusType,
     categoryId,
-    duration
+    durationMinutes
   ) {
     let data = {
       time,
@@ -23,8 +23,8 @@ TopicTimer.reopenClass({
     if (categoryId) {
       data.category_id = categoryId;
     }
-    if (duration) {
-      data.duration = duration;
+    if (durationMinutes) {
+      data.duration_minutes = durationMinutes;
     }
 
     return ajax({
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 4d209f5fee..b00e8427ba 100644
--- a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
@@ -1,12 +1,12 @@
 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 "discourse/lib/preload-store";
 import Category from "discourse/models/category";
+import DiscourseURL from "discourse/lib/url";
+import { NotificationLevels } from "discourse/lib/notification-levels";
+import PreloadStore from "discourse/lib/preload-store";
 import User from "discourse/models/user";
 import { deepEqual } from "discourse-common/lib/object";
-import DiscourseURL from "discourse/lib/url";
+import { isEmpty } from "@ember/utils";
 
 function isNew(topic) {
   return (
@@ -55,17 +55,24 @@ const TopicTrackingState = EmberObject.extend({
     const tracker = this;
 
     const process = (data) => {
-      if (data.message_type === "muted") {
-        tracker.trackMutedTopic(data.topic_id);
+      if (["muted", "unmuted"].includes(data.message_type)) {
+        tracker.trackMutedOrUnmutedTopic(data);
         return;
       }
 
-      tracker.pruneOldMutedTopics();
+      tracker.pruneOldMutedAndUnmutedTopics();
 
       if (tracker.isMutedTopic(data.topic_id)) {
         return;
       }
 
+      if (
+        this.siteSettings.mute_all_categories_by_default &&
+        !tracker.isUnmutedTopic(data.topic_id)
+      ) {
+        return;
+      }
+
       if (data.message_type === "delete") {
         tracker.removeTopic(data.topic_id);
         tracker.incrementMessageCount();
@@ -99,19 +106,7 @@ const TopicTrackingState = EmberObject.extend({
       }
 
       if (data.message_type === "dismiss_new") {
-        Object.keys(tracker.states).forEach((k) => {
-          const topic = tracker.states[k];
-          if (
-            !data.payload.category_id ||
-            topic.category_id === parseInt(data.payload.category_id, 0)
-          ) {
-            tracker.states[k] = Object.assign({}, topic, {
-              is_seen: true,
-            });
-          }
-        });
-        tracker.notifyPropertyChange("states");
-        tracker.incrementMessageCount();
+        tracker.dismissNewTopic(data);
       }
 
       if (["new_topic", "unread", "read"].includes(data.message_type)) {
@@ -166,26 +161,58 @@ const TopicTrackingState = EmberObject.extend({
     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);
+  unmutedTopics() {
+    return (this.currentUser && this.currentUser.unmuted_topics) || [];
   },
 
-  pruneOldMutedTopics() {
+  trackMutedOrUnmutedTopic(data) {
+    let topics, key;
+    if (data.message_type === "muted") {
+      key = "muted_topics";
+      topics = this.mutedTopics();
+    } else {
+      key = "unmuted_topics";
+      topics = this.unmutedTopics();
+    }
+    topics = topics.concat({
+      topicId: data.topic_id,
+      createdAt: Date.now(),
+    });
+    this.currentUser && this.currentUser.set(key, topics);
+  },
+
+  dismissNewTopic(data) {
+    data.payload.topic_ids.forEach((k) => {
+      const topic = this.states[`t${k}`];
+      this.states[`t${k}`] = Object.assign({}, topic, {
+        is_seen: true,
+      });
+    });
+    this.notifyPropertyChange("states");
+    this.incrementMessageCount();
+  },
+
+  pruneOldMutedAndUnmutedTopics() {
     const now = Date.now();
     let mutedTopics = this.mutedTopics().filter(
       (mutedTopic) => now - mutedTopic.createdAt < 60000
     );
-    this.currentUser && this.currentUser.set("muted_topics", mutedTopics);
+    let unmutedTopics = this.unmutedTopics().filter(
+      (unmutedTopic) => now - unmutedTopic.createdAt < 60000
+    );
+    this.currentUser &&
+      this.currentUser.set("muted_topics", mutedTopics) &&
+      this.currentUser.set("unmuted_topics", unmutedTopics);
   },
 
   isMutedTopic(topicId) {
     return !!this.mutedTopics().findBy("topicId", topicId);
   },
 
+  isUnmutedTopic(topicId) {
+    return !!this.unmutedTopics().findBy("topicId", topicId);
+  },
+
   updateSeen(topicId, highestSeen) {
     if (!topicId || !highestSeen) {
       return;
@@ -263,7 +290,7 @@ const TopicTrackingState = EmberObject.extend({
     if (split.length >= 4) {
       filter = split[split.length - 1];
       // c/cat/subcat/6/l/latest
-      var category = Category.findSingleBySlug(
+      let category = Category.findSingleBySlug(
         split.splice(1, split.length - 4).join("/")
       );
       this.set("filterCategory", category);
@@ -438,8 +465,10 @@ const TopicTrackingState = EmberObject.extend({
     return new Set(result);
   },
 
-  countCategoryByState(type, categoryId, tagId) {
-    const subcategoryIds = this.getSubCategoryIds(categoryId);
+  countCategoryByState(type, categoryId, tagId, noSubcategories) {
+    const subcategoryIds = noSubcategories
+      ? new Set([categoryId])
+      : this.getSubCategoryIds(categoryId);
     const mutedCategoryIds =
       this.currentUser && this.currentUser.muted_category_ids;
     let filter = type === "new" ? isNew : isUnread;
@@ -457,12 +486,17 @@ const TopicTrackingState = EmberObject.extend({
     ).length;
   },
 
-  countNew(categoryId, tagId) {
-    return this.countCategoryByState("new", categoryId, tagId);
+  countNew(categoryId, tagId, noSubcategories) {
+    return this.countCategoryByState("new", categoryId, tagId, noSubcategories);
   },
 
-  countUnread(categoryId, tagId) {
-    return this.countCategoryByState("unread", categoryId, tagId);
+  countUnread(categoryId, tagId, noSubcategories) {
+    return this.countCategoryByState(
+      "unread",
+      categoryId,
+      tagId,
+      noSubcategories
+    );
   },
 
   forEachTracked(fn) {
@@ -520,20 +554,20 @@ const TopicTrackingState = EmberObject.extend({
     return sum;
   },
 
-  lookupCount(name, category, tagId) {
+  lookupCount(name, category, tagId, noSubcategories) {
     if (name === "latest") {
       return (
-        this.lookupCount("new", category, tagId) +
-        this.lookupCount("unread", category, tagId)
+        this.lookupCount("new", category, tagId, noSubcategories) +
+        this.lookupCount("unread", category, tagId, noSubcategories)
       );
     }
 
     let categoryId = category ? get(category, "id") : null;
 
     if (name === "new") {
-      return this.countNew(categoryId, tagId);
+      return this.countNew(categoryId, tagId, noSubcategories);
     } else if (name === "unread") {
-      return this.countUnread(categoryId, tagId);
+      return this.countUnread(categoryId, tagId, noSubcategories);
     } else {
       const categoryName = name.split("/")[1];
       if (categoryName) {
diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index 5c05172f35..37be80796c 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -1,27 +1,26 @@
-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";
-import { ajax } from "discourse/lib/ajax";
-import { flushMap } from "discourse/models/store";
-import RestModel from "discourse/models/rest";
-import { propertyEqual, fmt } from "discourse/lib/computed";
-import { longDate } from "discourse/lib/formatter";
+import { alias, and, equal, notEmpty, or } from "@ember/object/computed";
+import { fmt, propertyEqual } from "discourse/lib/computed";
 import ActionSummary from "discourse/models/action-summary";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { emojiUnescape } from "discourse/lib/text";
-import PreloadStore from "discourse/lib/preload-store";
-import { userPath } from "discourse/lib/url";
-import { fancyTitle } from "discourse/lib/topic-fancy-title";
-import discourseComputed from "discourse-common/utils/decorators";
 import Category from "discourse/models/category";
-import Session from "discourse/models/session";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
+import PreloadStore from "discourse/lib/preload-store";
 import { Promise } from "rsvp";
+import RestModel from "discourse/models/rest";
+import Session from "discourse/models/session";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
-import bootbox from "bootbox";
+import { ajax } from "discourse/lib/ajax";
 import { deepMerge } from "discourse-common/lib/object";
+import discourseComputed from "discourse-common/utils/decorators";
+import { emojiUnescape } from "discourse/lib/text";
+import { fancyTitle } from "discourse/lib/topic-fancy-title";
+import { flushMap } from "discourse/models/store";
+import getURL from "discourse-common/lib/get-url";
+import { longDate } from "discourse/lib/formatter";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 import { resolveShareUrl } from "discourse/helpers/share-url";
+import { userPath } from "discourse/lib/url";
 
 export function loadTopicView(topic, args) {
   const data = deepMerge({}, args);
@@ -59,25 +58,16 @@ const Topic = RestModel.extend({
 
   @discourseComputed("posters.[]")
   lastPoster(posters) {
-    let user;
     if (posters && posters.length > 0) {
       const latest = posters.filter(
         (p) => p.extras && p.extras.indexOf("latest") >= 0
       )[0];
-      user = latest;
+      return latest || posters.firstObject;
     }
-    return user || posters.firstObject;
   },
 
-  @discourseComputed("lastPoster")
-  lastPosterUser(poster) {
-    return poster.user;
-  },
-
-  @discourseComputed("lastPoster")
-  lastPosterGroup(poster) {
-    return poster.primary_group;
-  },
+  lastPosterUser: alias("lastPoster.user"),
+  lastPosterGroup: alias("lastPoster.primary_group"),
 
   @discourseComputed("posters.[]", "participants.[]", "allowed_user_count")
   featuredUsers(posters, participants, allowedUserCount) {
@@ -211,7 +201,11 @@ const Topic = RestModel.extend({
     });
   },
 
-  invisible: not("visible"),
+  @discourseComputed("visible")
+  invisible(visible) {
+    return visible !== undefined ? !visible : undefined;
+  },
+
   deleted: notEmpty("deleted_at"),
 
   @discourseComputed("id")
@@ -224,13 +218,6 @@ const Topic = RestModel.extend({
     return Category.findById(categoryId);
   },
 
-  categoryClass: fmt("category.fullSlug", "category-%@"),
-
-  @discourseComputed("tags")
-  tagClasses(tags) {
-    return tags && tags.map((t) => `tag-${t}`).join(" ");
-  },
-
   @discourseComputed("url")
   shareUrl(url) {
     const user = User.current();
@@ -404,73 +391,8 @@ const Topic = RestModel.extend({
     }
   },
 
-  toggleBookmark() {
-    if (this.bookmarking) {
-      return Promise.resolve();
-    }
-    this.set("bookmarking", true);
-    const bookmark = !this.bookmarked;
-    let posts = this.postStream.posts;
-
-    return this.firstPost().then((firstPost) => {
-      const toggleBookmarkOnServer = () => {
-        if (bookmark) {
-          return firstPost.toggleBookmark().then((opts) => {
-            this.set("bookmarking", false);
-            if (opts.closedWithoutSaving) {
-              return;
-            }
-            return this.afterTopicBookmarked(firstPost);
-          });
-        } else {
-          return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" })
-            .then(() => {
-              this.toggleProperty("bookmarked");
-              this.set("bookmark_reminder_at", null);
-              let clearedBookmarkProps = {
-                bookmarked: false,
-                bookmark_id: null,
-                bookmark_name: null,
-                bookmark_reminder_at: null,
-              };
-              if (posts) {
-                const updated = [];
-                posts.forEach((post) => {
-                  if (post.bookmarked) {
-                    post.setProperties(clearedBookmarkProps);
-                    updated.push(post.id);
-                  }
-                });
-                firstPost.setProperties(clearedBookmarkProps);
-                return updated;
-              }
-            })
-            .catch(popupAjaxError)
-            .finally(() => this.set("bookmarking", false));
-        }
-      };
-
-      const unbookmarkedPosts = [];
-      if (!bookmark && posts) {
-        posts.forEach(
-          (post) => post.bookmarked && 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()
-          );
-        } else {
-          toggleBookmarkOnServer().then(resolve);
-        }
-      });
-    });
+  deleteBookmark() {
+    return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" });
   },
 
   createGroupInvite(group) {
@@ -488,9 +410,9 @@ const Topic = RestModel.extend({
   },
 
   generateInviteLink(email, group_ids, topic_id) {
-    return ajax("/invites/link", {
+    return ajax("/invites", {
       type: "POST",
-      data: { email, group_ids, topic_id },
+      data: { email, skip_email: true, group_ids, topic_id },
     });
   },
 
@@ -685,6 +607,12 @@ Topic.reopenClass({
     MUTED: 0,
   },
 
+  munge(json) {
+    // ensure we are not overriding category computed property
+    delete json.category;
+    return json;
+  },
+
   createActionSummary(result) {
     if (result.actions_summary) {
       const lookup = EmberObject.create();
@@ -719,6 +647,10 @@ Topic.reopenClass({
       // The title can be cleaned up server side
       props.title = result.basic_topic.title;
       props.fancy_title = result.basic_topic.fancy_title;
+      if (topic.is_shared_draft) {
+        props.destination_category_id = props.category_id;
+        delete props.category_id;
+      }
       topic.setProperties(props);
     });
   },
@@ -824,12 +756,16 @@ Topic.reopenClass({
     });
   },
 
-  resetNew(category, include_subcategories, tracked = false) {
+  resetNew(category, include_subcategories, tracked = false, tag = false) {
     const data = { tracked };
     if (category) {
       data.category_id = category.id;
       data.include_subcategories = include_subcategories;
     }
+    if (tag) {
+      data.tag_id = tag.id;
+    }
+
     return ajax("/topics/reset-new", { type: "PUT", data });
   },
 
@@ -837,8 +773,10 @@ Topic.reopenClass({
     return ajax(`/t/id_for/${slug}`);
   },
 
-  setSlowMode(topicId, seconds) {
+  setSlowMode(topicId, seconds, enabledUntil) {
     const data = { seconds };
+    data.enabled_until = enabledUntil;
+
     return ajax(`/t/${topicId}/slow_mode`, { type: "PUT", data });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/models/user-action-stat.js b/app/assets/javascripts/discourse/app/models/user-action-stat.js
index 2ebde268b3..77394fe394 100644
--- a/app/assets/javascripts/discourse/app/models/user-action-stat.js
+++ b/app/assets/javascripts/discourse/app/models/user-action-stat.js
@@ -1,6 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import RestModel from "discourse/models/rest";
 import UserAction from "discourse/models/user-action";
+import discourseComputed from "discourse-common/utils/decorators";
 import { i18n } from "discourse/lib/computed";
 
 export default RestModel.extend({
diff --git a/app/assets/javascripts/discourse/app/models/user-action.js b/app/assets/javascripts/discourse/app/models/user-action.js
index 5599e56c8b..2c3762c726 100644
--- a/app/assets/javascripts/discourse/app/models/user-action.js
+++ b/app/assets/javascripts/discourse/app/models/user-action.js
@@ -1,11 +1,11 @@
+import { and, equal, or } from "@ember/object/computed";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
-import { or, equal, and } from "@ember/object/computed";
+import Category from "discourse/models/category";
 import RestModel from "discourse/models/rest";
+import User from "discourse/models/user";
 import UserActionGroup from "discourse/models/user-action-group";
 import { postUrl } from "discourse/lib/utilities";
 import { userPath } from "discourse/lib/url";
-import Category from "discourse/models/category";
-import User from "discourse/models/user";
 
 const UserActionTypes = {
   likes_given: 1,
diff --git a/app/assets/javascripts/discourse/app/models/user-badge.js b/app/assets/javascripts/discourse/app/models/user-badge.js
index 832730a1b1..0aaff3f561 100644
--- a/app/assets/javascripts/discourse/app/models/user-badge.js
+++ b/app/assets/javascripts/discourse/app/models/user-badge.js
@@ -1,10 +1,10 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { ajax } from "discourse/lib/ajax";
 import Badge from "discourse/models/badge";
+import EmberObject from "@ember/object";
 import { Promise } from "rsvp";
 import Topic from "discourse/models/topic";
-import EmberObject from "@ember/object";
 import User from "discourse/models/user";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
 
 const UserBadge = EmberObject.extend({
   @discourseComputed
@@ -27,7 +27,7 @@ UserBadge.reopenClass({
     if (json.users === undefined) {
       json.users = [];
     }
-    var users = {};
+    let users = {};
     json.users.forEach(function (userJson) {
       users[userJson.id] = User.create(userJson);
     });
@@ -36,7 +36,7 @@ UserBadge.reopenClass({
     if (json.topics === undefined) {
       json.topics = [];
     }
-    var topics = {};
+    let topics = {};
     json.topics.forEach(function (topicJson) {
       topics[topicJson.id] = Topic.create(topicJson);
     });
@@ -45,13 +45,13 @@ UserBadge.reopenClass({
     if (json.badges === undefined) {
       json.badges = [];
     }
-    var badges = {};
+    let badges = {};
     Badge.createFromJson(json).forEach(function (badge) {
       badges[badge.get("id")] = badge;
     });
 
     // Create UserBadge object(s).
-    var userBadges = [];
+    let userBadges = [];
     if ("user_badge" in json) {
       userBadges = [json.user_badge];
     } else {
@@ -61,9 +61,9 @@ UserBadge.reopenClass({
     }
 
     userBadges = userBadges.map(function (userBadgeJson) {
-      var userBadge = UserBadge.create(userBadgeJson);
+      let userBadge = UserBadge.create(userBadgeJson);
 
-      var grantedAtDate = Date.parse(userBadge.get("granted_at"));
+      let grantedAtDate = Date.parse(userBadge.get("granted_at"));
       userBadge.set("grantedAt", grantedAtDate);
 
       userBadge.set("badge", badges[userBadge.get("badge_id")]);
@@ -102,7 +102,7 @@ UserBadge.reopenClass({
     if (!username) {
       return Promise.resolve([]);
     }
-    var url = "/user-badges/" + username + ".json";
+    let url = "/user-badges/" + username + ".json";
     if (options && options.grouped) {
       url += "?grouped=true";
     }
diff --git a/app/assets/javascripts/discourse/app/models/user-draft.js b/app/assets/javascripts/discourse/app/models/user-draft.js
index 0bf9a1116c..44874e9b1e 100644
--- a/app/assets/javascripts/discourse/app/models/user-draft.js
+++ b/app/assets/javascripts/discourse/app/models/user-draft.js
@@ -1,13 +1,13 @@
+import {
+  NEW_PRIVATE_MESSAGE_KEY,
+  NEW_TOPIC_KEY,
+} from "discourse/models/composer";
 import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
 import RestModel from "discourse/models/rest";
+import User from "discourse/models/user";
+import discourseComputed from "discourse-common/utils/decorators";
 import { postUrl } from "discourse/lib/utilities";
 import { userPath } from "discourse/lib/url";
-import User from "discourse/models/user";
-import {
-  NEW_TOPIC_KEY,
-  NEW_PRIVATE_MESSAGE_KEY,
-} from "discourse/models/composer";
 
 export default RestModel.extend({
   @discourseComputed("draft_username")
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 6be4816502..90864e13ff 100644
--- a/app/assets/javascripts/discourse/app/models/user-drafts-stream.js
+++ b/app/assets/javascripts/discourse/app/models/user-drafts-stream.js
@@ -1,16 +1,16 @@
+import {
+  NEW_PRIVATE_MESSAGE_KEY,
+  NEW_TOPIC_KEY,
+} from "discourse/models/composer";
 import { A } from "@ember/array";
-import discourseComputed from "discourse-common/utils/decorators";
-import { ajax } from "discourse/lib/ajax";
-import { url } from "discourse/lib/computed";
+import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import UserDraft from "discourse/models/user-draft";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
 import { emojiUnescape } from "discourse/lib/text";
-import { Promise } from "rsvp";
-import {
-  NEW_TOPIC_KEY,
-  NEW_PRIVATE_MESSAGE_KEY,
-} from "discourse/models/composer";
 import { escapeExpression } from "discourse/lib/utilities";
+import { url } from "discourse/lib/computed";
 
 export default RestModel.extend({
   loaded: false,
diff --git a/app/assets/javascripts/discourse/app/models/user-posts-stream.js b/app/assets/javascripts/discourse/app/models/user-posts-stream.js
index 825feff035..b152630bc1 100644
--- a/app/assets/javascripts/discourse/app/models/user-posts-stream.js
+++ b/app/assets/javascripts/discourse/app/models/user-posts-stream.js
@@ -1,9 +1,9 @@
-import { on } from "discourse-common/utils/decorators";
-import { ajax } from "discourse/lib/ajax";
-import { url } from "discourse/lib/computed";
-import UserAction from "discourse/models/user-action";
-import { Promise } from "rsvp";
 import EmberObject from "@ember/object";
+import { Promise } from "rsvp";
+import UserAction from "discourse/models/user-action";
+import { ajax } from "discourse/lib/ajax";
+import { on } from "discourse-common/utils/decorators";
+import { url } from "discourse/lib/computed";
 
 export default EmberObject.extend({
   loaded: false,
diff --git a/app/assets/javascripts/discourse/app/models/user-stream.js b/app/assets/javascripts/discourse/app/models/user-stream.js
index 14ff2fb401..b66c95d516 100644
--- a/app/assets/javascripts/discourse/app/models/user-stream.js
+++ b/app/assets/javascripts/discourse/app/models/user-stream.js
@@ -1,12 +1,12 @@
+import discourseComputed, { on } from "discourse-common/utils/decorators";
 import { A } from "@ember/array";
-import { ajax } from "discourse/lib/ajax";
-import { url } from "discourse/lib/computed";
+import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import UserAction from "discourse/models/user-action";
+import { ajax } from "discourse/lib/ajax";
 import { emojiUnescape } from "discourse/lib/text";
-import { Promise } from "rsvp";
-import discourseComputed, { on } from "discourse-common/utils/decorators";
 import { escapeExpression } from "discourse/lib/utilities";
+import { url } from "discourse/lib/computed";
 
 export default RestModel.extend({
   loaded: false,
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index f2b78e35ad..6d09211cd1 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -1,35 +1,35 @@
-import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import { A } from "@ember/array";
-import { isEmpty } from "@ember/utils";
-import { gt, equal, or } from "@ember/object/computed";
-import EmberObject, { get, 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";
-import { longDate } from "discourse/lib/formatter";
-import discourseComputed from "discourse-common/utils/decorators";
-import Badge from "discourse/models/badge";
-import UserBadge from "discourse/models/user-badge";
-import UserActionStat from "discourse/models/user-action-stat";
-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 "discourse/lib/preload-store";
-import { defaultHomepage, escapeExpression } from "discourse/lib/utilities";
-import { userPath } from "discourse/lib/url";
-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";
-import { getOwner } from "discourse-common/lib/get-owner";
+import EmberObject, { computed, get, getProperties } from "@ember/object";
 import cookie, { removeCookie } from "discourse/lib/cookie";
+import { defaultHomepage, escapeExpression } from "discourse/lib/utilities";
+import { equal, gt, or } from "@ember/object/computed";
+import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
+import { A } from "@ember/array";
+import Badge from "discourse/models/badge";
+import Bookmark from "discourse/models/bookmark";
+import Category from "discourse/models/category";
+import Group from "discourse/models/group";
+import I18n from "I18n";
+import { NotificationLevels } from "discourse/lib/notification-levels";
+import PreloadStore from "discourse/lib/preload-store";
+import { Promise } from "rsvp";
+import RestModel from "discourse/models/rest";
+import Singleton from "discourse/mixins/singleton";
+import Site from "discourse/models/site";
+import UserAction from "discourse/models/user-action";
+import UserActionStat from "discourse/models/user-action-stat";
+import UserBadge from "discourse/models/user-badge";
+import UserDraftsStream from "discourse/models/user-drafts-stream";
+import UserPostsStream from "discourse/models/user-posts-stream";
+import UserStream from "discourse/models/user-stream";
+import { ajax } from "discourse/lib/ajax";
+import deprecated from "discourse-common/lib/deprecated";
+import discourseComputed from "discourse-common/utils/decorators";
+import { emojiUnescape } from "discourse/lib/text";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { isEmpty } from "@ember/utils";
+import { longDate } from "discourse/lib/formatter";
+import { url } from "discourse/lib/computed";
+import { userPath } from "discourse/lib/url";
 
 export const SECOND_FACTOR_METHODS = {
   TOTP: 1,
@@ -59,6 +59,7 @@ let userFields = [
   "watching_first_post_tags",
   "date_of_birth",
   "primary_group_id",
+  "user_notification_schedule",
 ];
 
 export function addSaveableUserField(fieldName) {
@@ -341,7 +342,7 @@ const User = RestModel.extend({
       data[s] = this.get(`user_option.${s}`);
     });
 
-    var updatedState = {};
+    let updatedState = {};
 
     ["muted", "regular", "watched", "tracked", "watched_first_post"].forEach(
       (s) => {
@@ -415,8 +416,11 @@ const User = RestModel.extend({
       type: "DELETE",
       data: { email },
     }).then(() => {
-      this.secondary_emails.removeObject(email);
-      this.unconfirmed_emails.removeObject(email);
+      if (this.unconfirmed_emails.includes(email)) {
+        this.unconfirmed_emails.removeObject(email);
+      } else {
+        this.secondary_emails.removeObject(email);
+      }
     });
   },
 
@@ -710,9 +714,9 @@ const User = RestModel.extend({
   },
 
   generateInviteLink(email, group_ids, topic_id) {
-    return ajax("/invites/link", {
+    return ajax("/invites", {
       type: "POST",
-      data: { email, group_ids, topic_id },
+      data: { email, skip_email: true, group_ids, topic_id },
     });
   },
 
@@ -721,7 +725,7 @@ const User = RestModel.extend({
     max_redemptions_allowed,
     expires_at
   ) {
-    return ajax("/invites/link", {
+    return ajax("/invites", {
       type: "POST",
       data: { group_ids, max_redemptions_allowed, expires_at },
     });
@@ -754,7 +758,7 @@ const User = RestModel.extend({
 
   @discourseComputed("can_delete_account")
   canDeleteAccount(canDeleteAccount) {
-    return !this.siteSettings.enable_sso && canDeleteAccount;
+    return !this.siteSettings.enable_discourse_connect && canDeleteAccount;
   },
 
   delete: function () {
@@ -958,6 +962,44 @@ const User = RestModel.extend({
       return muted_ids.filter((existing_id) => existing_id !== id);
     }
   },
+
+  setPrimaryGroup(primaryGroupId) {
+    return ajax(`/admin/users/${this.id}/primary_group`, {
+      type: "PUT",
+      data: { primary_group_id: primaryGroupId },
+    });
+  },
+
+  enterDoNotDisturbFor(duration) {
+    return ajax({
+      url: "/do-not-disturb.json",
+      type: "POST",
+      data: { duration },
+    }).then((response) => {
+      return this.updateDoNotDisturbStatus(response.ends_at);
+    });
+  },
+
+  leaveDoNotDisturb() {
+    return ajax({
+      url: "/do-not-disturb.json",
+      type: "DELETE",
+    }).then(() => {
+      this.updateDoNotDisturbStatus(null);
+    });
+  },
+
+  updateDoNotDisturbStatus(ends_at) {
+    this.set("do_not_disturb_until", ends_at);
+    this.appEvents.trigger("do-not-disturb:changed", this.do_not_disturb_until);
+  },
+
+  isInDoNotDisturb() {
+    return (
+      this.do_not_disturb_until &&
+      new Date(this.do_not_disturb_until) >= new Date()
+    );
+  },
 });
 
 User.reopenClass(Singleton, {
@@ -1005,6 +1047,10 @@ User.reopenClass(Singleton, {
     });
   },
 
+  checkEmail(email) {
+    return ajax(userPath("check_email"), { data: { email } });
+  },
+
   groupStats(stats) {
     const responses = UserActionStat.create({
       count: 0,
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 330fbe2554..95e181f500 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
@@ -1,18 +1,18 @@
-import PreloadStore from "discourse/lib/preload-store";
-import I18n from "I18n";
-import Session from "discourse/models/session";
-import RSVP from "rsvp";
 import {
-  setEnvironment,
-  isTesting,
-  isProduction,
   isDevelopment,
+  isProduction,
+  isTesting,
+  setEnvironment,
 } from "discourse-common/config/environment";
-import { setupURL, setupS3CDN } from "discourse-common/lib/get-url";
+import { setupS3CDN, setupURL } from "discourse-common/lib/get-url";
+import I18n from "I18n";
+import PreloadStore from "discourse/lib/preload-store";
+import RSVP from "rsvp";
+import Session from "discourse/models/session";
 import deprecated from "discourse-common/lib/deprecated";
+import { setDefaultOwner } from "discourse-common/lib/get-owner";
 import { setIconList } from "discourse-common/lib/icon-library";
 import { setURLContainer } from "discourse/lib/url";
-import { setDefaultOwner } from "discourse-common/lib/get-owner";
 
 export default {
   name: "discourse-bootstrap",
@@ -26,23 +26,29 @@ export default {
     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 */
-        }
-      });
+    let setupData;
+    const setupDataElement = document.getElementById("data-discourse-setup");
+    if (setupDataElement) {
+      setupData = setupDataElement.dataset;
     }
 
+    let preloaded;
+    const preloadedDataElement = document.getElementById("data-preloaded");
+    if (preloadedDataElement) {
+      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 */
+      }
+    });
+
     let baseUrl = setupData.baseUrl;
     Object.defineProperty(app, "BaseUrl", {
       get() {
@@ -77,6 +83,10 @@ export default {
     session.disableCustomCSS = setupData.disableCustomCss === "true";
     session.markdownItURL = setupData.markdownItUrl;
 
+    if (setupData.mbLastFileChangeId) {
+      session.mbLastFileChangeId = parseInt(setupData.mbLastFileChangeId, 10);
+    }
+
     if (setupData.safeMode) {
       session.safe_mode = setupData.safeMode;
     }
@@ -94,8 +104,11 @@ export default {
       parseInt(setupData.userColorSchemeId, 10) || null;
     session.userDarkSchemeId = parseInt(setupData.userDarkSchemeId, 10) || -1;
 
-    if (isDevelopment()) {
-      setIconList(JSON.parse(setupData.svgIconList));
+    let iconList = setupData.svgIconList;
+    if (isDevelopment() && iconList) {
+      setIconList(
+        typeof iconList === "string" ? JSON.parse(iconList) : iconList
+      );
     }
 
     if (setupData.s3BaseUrl) {
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 aada8bab6b..654d525cc2 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
@@ -1,9 +1,9 @@
+import DiscoverySortableController from "discourse/controllers/discovery-sortable";
+import Site from "discourse/models/site";
+import TagShowRoute from "discourse/routes/tag-show";
+import User from "discourse/models/user";
 import buildCategoryRoute from "discourse/routes/build-category-route";
 import buildTopicRoute from "discourse/routes/build-topic-route";
-import DiscoverySortableController from "discourse/controllers/discovery-sortable";
-import TagShowRoute from "discourse/routes/tag-show";
-import Site from "discourse/models/site";
-import User from "discourse/models/user";
 
 export default {
   after: "inject-discourse-objects",
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 14ae8e272f..b3e19dba60 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
@@ -1,52 +1,59 @@
-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 SearchService from "discourse/services/search";
 import TopicTrackingState, {
   startTracking,
 } from "discourse/models/topic-tracking-state";
-import ScreenTrack from "discourse/lib/screen-track";
-import Site from "discourse/models/site";
-import User from "discourse/models/user";
+import DiscourseLocation from "discourse/lib/discourse-location";
+import KeyValueStore from "discourse/lib/key-value-store";
 import MessageBus from "message-bus-client";
+import ScreenTrack from "discourse/lib/screen-track";
+import SearchService from "discourse/services/search";
+import Session from "discourse/models/session";
+import Site from "discourse/models/site";
+import Store from "discourse/models/store";
+import User from "discourse/models/user";
 
 const ALL_TARGETS = ["controller", "component", "route", "model", "adapter"];
 
+export function registerObjects(container, app) {
+  if (app.__registeredObjects__) {
+    // don't run registrations twice.
+    return;
+  }
+  app.__registeredObjects__ = true;
+
+  app.register("store:main", Store);
+  app.register("service:store", Store);
+
+  // backwards compatibility: remove when plugins have updated
+  app.appEvents = container.lookup("service:app-events");
+
+  // TODO: This should be included properly
+  app.register("message-bus:main", MessageBus, { instantiate: false });
+
+  const siteSettings = app.SiteSettings;
+  app.register("site-settings:main", siteSettings, { instantiate: false });
+}
+
 export default {
   name: "inject-discourse-objects",
   after: "discourse-bootstrap",
 
   initialize(container, app) {
+    registerObjects(container, app);
+
+    let siteSettings = container.lookup("site-settings:main");
+
     ALL_TARGETS.forEach((t) =>
       app.inject(t, "appEvents", "service:app-events")
     );
 
-    // 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);
-      ALL_TARGETS.forEach((t) => app.inject(t, "store", "service:store"));
-    }
-
-    app.register("message-bus:main", MessageBus, { instantiate: false });
-
-    ALL_TARGETS.concat("service").forEach((t) =>
-      app.inject(t, "messageBus", "message-bus:main")
-    );
-
-    const siteSettings = app.SiteSettings;
-    app.register("site-settings:main", siteSettings, { instantiate: false });
-    ALL_TARGETS.concat("service").forEach((t) =>
-      app.inject(t, "siteSettings", "site-settings:main")
-    );
-
     const currentUser = User.current();
     app.register("current-user:main", currentUser, { instantiate: false });
     app.currentUser = currentUser;
 
+    ALL_TARGETS.forEach((t) =>
+      app.inject(t, "topicTrackingState", "topic-tracking-state:main")
+    );
+
     const topicTrackingState = TopicTrackingState.create({
       messageBus: MessageBus,
       siteSettings,
@@ -55,43 +62,54 @@ export default {
     app.register("topic-tracking-state:main", topicTrackingState, {
       instantiate: false,
     });
-    ALL_TARGETS.forEach((t) =>
-      app.inject(t, "topicTrackingState", "topic-tracking-state:main")
-    );
 
     const site = Site.current();
     app.register("site:main", site, { instantiate: false });
-    ALL_TARGETS.forEach((t) => app.inject(t, "site", "site:main"));
-
-    app.register("search-service:main", SearchService);
-    ALL_TARGETS.forEach((t) =>
-      app.inject(t, "searchService", "search-service:main")
-    );
 
     const session = Session.current();
     app.register("session:main", session, { instantiate: false });
-    ALL_TARGETS.forEach((t) => app.inject(t, "session", "session:main"));
-    app.inject("service", "session", "session:main");
 
     // TODO: Automatically register this service
     const screenTrack = new ScreenTrack(
       topicTrackingState,
       siteSettings,
       session,
-      currentUser
+      currentUser,
+      app.appEvents
     );
     app.register("service:screen-track", screenTrack, { instantiate: false });
 
+    app.register("location:discourse-location", DiscourseLocation);
+
+    const keyValueStore = new KeyValueStore("discourse_");
+    app.register("key-value-store:main", keyValueStore, { instantiate: false });
+    app.register("search-service:main", SearchService);
+
+    ALL_TARGETS.forEach((t) => app.inject(t, "store", "service:store"));
+
+    ALL_TARGETS.concat("service").forEach((t) =>
+      app.inject(t, "messageBus", "message-bus:main")
+    );
+
+    ALL_TARGETS.concat("service").forEach((t) =>
+      app.inject(t, "siteSettings", "site-settings:main")
+    );
+
+    ALL_TARGETS.forEach((t) => app.inject(t, "site", "site:main"));
+
+    ALL_TARGETS.forEach((t) =>
+      app.inject(t, "searchService", "search-service:main")
+    );
+
+    ALL_TARGETS.forEach((t) => app.inject(t, "session", "session:main"));
+    app.inject("service", "session", "session:main");
+
     if (currentUser) {
       ["component", "route", "controller", "service"].forEach((t) => {
         app.inject(t, "currentUser", "current-user:main");
       });
     }
 
-    app.register("location:discourse-location", DiscourseLocation);
-
-    const keyValueStore = new KeyValueStore("discourse_");
-    app.register("key-value-store:main", keyValueStore, { instantiate: false });
     ALL_TARGETS.forEach((t) =>
       app.inject(t, "keyValueStore", "key-value-store:main")
     );
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js b/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
index 7dc0bbf712..d064dd3b32 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
@@ -1,21 +1,26 @@
 import Application from "@ember/application";
-import { mapRoutes } from "discourse/mapping-router";
+import { isLegacyEmber } from "discourse-common/config/environment";
+import { registerRouter } from "discourse/mapping-router";
+
+let originalBuildInstance;
 
 export default {
   name: "map-routes",
   after: "inject-discourse-objects",
 
   initialize(container, app) {
-    app.unregister("router:main");
-    app.register("router:main", mapRoutes());
+    let router = registerRouter(app);
+    container.registry.register("router:main", router);
 
-    // HACK to fix: https://github.com/emberjs/ember.js/issues/10310
-    const originalBuildInstance =
-      originalBuildInstance || Application.prototype.buildInstance;
+    if (isLegacyEmber()) {
+      // HACK to fix: https://github.com/emberjs/ember.js/issues/10310
+      originalBuildInstance =
+        originalBuildInstance || Application.prototype.buildInstance;
 
-    Application.prototype.buildInstance = function () {
-      this.buildRegistry();
-      return originalBuildInstance.apply(this);
-    };
+      Application.prototype.buildInstance = function () {
+        this.buildRegistry();
+        return originalBuildInstance.apply(this);
+      };
+    }
   },
 };
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js b/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js
index 27b511eb53..d3f6dbe3c6 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js
@@ -3,8 +3,8 @@ export default {
 
   initialize: function () {
     $('script[type="text/x-handlebars"]').each(function () {
-      var $this = $(this);
-      var name = $this.attr("name") || $this.data("template-name");
+      let $this = $(this);
+      let name = $this.attr("name") || $this.data("template-name");
 
       if (window.console) {
         window.console.log(
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/theme-errors-handler.js b/app/assets/javascripts/discourse/app/pre-initializers/theme-errors-handler.js
new file mode 100644
index 0000000000..05a9a0e153
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/pre-initializers/theme-errors-handler.js
@@ -0,0 +1,56 @@
+import { isTesting } from "discourse-common/config/environment";
+import { getAndClearThemeErrors } from "discourse/app";
+import PreloadStore from "discourse/lib/preload-store";
+import getURL from "discourse-common/lib/get-url";
+import I18n from "I18n";
+
+export default {
+  name: "theme-errors-handler",
+  after: "inject-discourse-objects",
+
+  initialize(container) {
+    const currentUser = container.lookup("current-user:main");
+    if (isTesting()) {
+      return;
+    }
+    renderErrorNotices(currentUser);
+    document.addEventListener("discourse-theme-error", () =>
+      renderErrorNotices(currentUser)
+    );
+  },
+};
+
+function reportToLogster(name, error) {
+  const data = {
+    message: `${name} theme/component is throwing errors`,
+    stacktrace: error.stack,
+  };
+
+  Ember.$.ajax(getURL("/logs/report_js_error"), {
+    data,
+    type: "POST",
+    cache: false,
+  });
+}
+
+function renderErrorNotices(currentUser) {
+  getAndClearThemeErrors().forEach(([themeId, error]) => {
+    const name =
+      PreloadStore.get("activatedThemes")[themeId] || `(theme-id: ${themeId})`;
+    /* eslint-disable-next-line no-console */
+    console.error(`An error occurred in the "${name}" theme/component:`, error);
+    reportToLogster(name, error);
+    if (!currentUser || !currentUser.admin) {
+      return;
+    }
+    const path = getURL("/admin/customize/themes");
+    const message = I18n.t("themes.broken_theme_alert", {
+      theme: name,
+      path: `<a href="${path}">${path}</a>`,
+    });
+    const alertDiv = document.createElement("div");
+    alertDiv.classList.add("broken-theme-alert");
+    alertDiv.innerHTML = `⚠️ ${message}`;
+    document.body.prepend(alertDiv);
+  });
+}
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 b93a87bb9e..5a9573090b 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,6 +1,6 @@
-import I18n from "I18n";
-import { or, and } from "@ember/object/computed";
+import { and, or } from "@ember/object/computed";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 
 export default EmberObject.extend({
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 1484e812cc..063306869b 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,7 +1,6 @@
+import EmberObject from "@ember/object";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import EmberObject from "@ember/object";
-import { fmt } from "discourse/lib/computed";
 
 export default EmberObject.extend({
   tagName: "td",
@@ -38,5 +37,10 @@ export default EmberObject.extend({
     return "";
   },
 
-  likesHeat: fmt("ratioText", "heatmap-%@"),
+  @discourseComputed("ratioText")
+  likesHeat(ratioText) {
+    if (ratioText && ratioText.length) {
+      return `heatmap-${ratioText}`;
+    }
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/raw-views/list/visited-line.js b/app/assets/javascripts/discourse/app/raw-views/list/visited-line.js
index 254631f1dd..569137bd5b 100644
--- a/app/assets/javascripts/discourse/app/raw-views/list/visited-line.js
+++ b/app/assets/javascripts/discourse/app/raw-views/list/visited-line.js
@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default EmberObject.extend({
   @discourseComputed
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 9e2ec5fb2f..379799fb6f 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,8 +1,12 @@
-import I18n from "I18n";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
+import { and } from "@ember/object/computed";
 
 export default EmberObject.extend({
+  sortable: null,
+  ariaPressed: and("sortable", "isSorting"),
+
   @discourseComputed
   localizedName() {
     if (this.forceName) {
@@ -45,4 +49,13 @@ export default EmberObject.extend({
 
     return name.join(" ");
   },
+
+  @discourseComputed
+  ariaSort() {
+    if (this.isSorting) {
+      return this.parent.ascending ? "ascending" : "descending";
+    } else {
+      return "none";
+    }
+  },
 });
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 646f22b4d3..f3b554ecf1 100644
--- a/app/assets/javascripts/discourse/app/raw-views/topic-status.js
+++ b/app/assets/javascripts/discourse/app/raw-views/topic-status.js
@@ -1,6 +1,6 @@
+import EmberObject from "@ember/object";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import EmberObject from "@ember/object";
 
 export default EmberObject.extend({
   showDefault: null,
@@ -58,6 +58,14 @@ export default EmberObject.extend({
       results.push({ icon: "far-eye-slash", key: "unlisted" });
     }
 
+    if (
+      this.showPrivateMessageIcon &&
+      topic.isPrivateMessage &&
+      !topic.is_warning
+    ) {
+      results.push({ icon: "envelope", key: "personal_message" });
+    }
+
     results.forEach((result) => {
       result.title = I18n.t(`topic_statuses.${result.key}.help`);
       if (
diff --git a/app/assets/javascripts/discourse/app/routes/about.js b/app/assets/javascripts/discourse/app/routes/about.js
index 4a9897ce70..efc663e0a4 100644
--- a/app/assets/javascripts/discourse/app/routes/about.js
+++ b/app/assets/javascripts/discourse/app/routes/about.js
@@ -1,6 +1,6 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
   model() {
diff --git a/app/assets/javascripts/discourse/app/routes/account-created.js b/app/assets/javascripts/discourse/app/routes/account-created.js
index c3c22c7dad..04944f2195 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 "discourse/lib/preload-store";
+import Route from "@ember/routing/route";
 
 export default Route.extend({
   setupController(controller) {
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 5352b1ff7c..2bce5afc37 100644
--- a/app/assets/javascripts/discourse/app/routes/app-route-map.js
+++ b/app/assets/javascripts/discourse/app/routes/app-route-map.js
@@ -22,16 +22,9 @@ export default function () {
   this.route("topicBySlugOrId", { path: "/t/:slugOrId", resetNamespace: true });
 
   this.route("newCategory", { path: "/new-category" });
-  this.route("editCategory", { path: "/c/:slug/edit" }, function () {
+  this.route("editCategory", { path: "/c/*slug/edit" }, function () {
     this.route("tabs", { path: "/:tab" });
   });
-  this.route(
-    "editChildCategory",
-    { path: "/c/:parentSlug/:slug/edit" },
-    function () {
-      this.route("tabs", { path: "/:tab" });
-    }
-  );
 
   this.route("discovery", { path: "/", resetNamespace: true }, function () {
     // top
@@ -132,6 +125,7 @@ export default function () {
           });
           this.route("pending");
           this.route("drafts");
+          this.route("read");
         }
       );
 
@@ -164,6 +158,7 @@ export default function () {
 
       this.route("preferences", { resetNamespace: true }, function () {
         this.route("account");
+        this.route("security");
         this.route("profile");
         this.route("emails");
         this.route("notifications");
diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js
index 8c8a21c80a..dc2f265082 100644
--- a/app/assets/javascripts/discourse/app/routes/application.js
+++ b/app/assets/javascripts/discourse/app/routes/application.js
@@ -1,19 +1,19 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import DiscourseRoute from "discourse/routes/discourse";
-import { ajax } from "discourse/lib/ajax";
-import { setting } from "discourse/lib/computed";
-import logout from "discourse/lib/logout";
-import showModal from "discourse/lib/show-modal";
-import OpenComposer from "discourse/mixins/open-composer";
+import DiscourseURL, { userPath } from "discourse/lib/url";
 import Category from "discourse/models/category";
-import mobile from "discourse/lib/mobile";
+import Composer from "discourse/models/composer";
+import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
+import OpenComposer from "discourse/mixins/open-composer";
+import { ajax } from "discourse/lib/ajax";
+import bootbox from "bootbox";
 import { findAll } from "discourse/models/login-method";
 import { getOwner } from "discourse-common/lib/get-owner";
-import DiscourseURL, { userPath } from "discourse/lib/url";
-import Composer from "discourse/models/composer";
+import getURL from "discourse-common/lib/get-url";
+import logout from "discourse/lib/logout";
+import mobile from "discourse/lib/mobile";
 import { inject as service } from "@ember/service";
-import bootbox from "bootbox";
+import { setting } from "discourse/lib/computed";
+import showModal from "discourse/lib/show-modal";
 
 function unlessReadOnly(method, message) {
   return function () {
@@ -230,8 +230,18 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
       );
     },
 
-    createNewMessageViaParams(recipients, title, body) {
-      this.openComposerWithMessageParams(recipients, title, body);
+    createNewMessageViaParams({
+      recipients = [],
+      topicTitle = "",
+      topicBody = "",
+      hasGroups = false,
+    } = {}) {
+      this.openComposerWithMessageParams({
+        recipients,
+        topicTitle,
+        topicBody,
+        hasGroups,
+      });
     },
   },
 
@@ -243,30 +253,32 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
   },
 
   handleShowLogin() {
-    if (this.siteSettings.enable_sso) {
+    if (this.siteSettings.enable_discourse_connect) {
       const returnPath = encodeURIComponent(window.location.pathname);
       window.location = getURL("/session/sso?return_path=" + returnPath);
     } else {
-      this._autoLogin("login", "login-modal", () =>
-        this.controllerFor("login").resetForm()
-      );
+      this._autoLogin("login", "login-modal", {
+        notAuto: () => this.controllerFor("login").resetForm(),
+      });
     }
   },
 
   handleShowCreateAccount() {
-    if (this.siteSettings.enable_sso) {
+    if (this.siteSettings.enable_discourse_connect) {
       const returnPath = encodeURIComponent(window.location.pathname);
       window.location = getURL("/session/sso?return_path=" + returnPath);
     } else {
-      this._autoLogin("createAccount", "create-account");
+      this._autoLogin("createAccount", "create-account", { signup: true });
     }
   },
 
-  _autoLogin(modal, modalClass, notAuto) {
+  _autoLogin(modal, modalClass, { notAuto = null, signup = false } = {}) {
     const methods = findAll();
 
     if (!this.siteSettings.enable_local_logins && methods.length === 1) {
-      this.controllerFor("login").send("externalLogin", methods[0]);
+      this.controllerFor("login").send("externalLogin", methods[0], {
+        signup: signup,
+      });
     } else {
       showModal(modal);
       this.controllerFor("modal").set("modalClass", modalClass);
diff --git a/app/assets/javascripts/discourse/app/routes/associate-account.js b/app/assets/javascripts/discourse/app/routes/associate-account.js
index c14075811c..ca1277f750 100644
--- a/app/assets/javascripts/discourse/app/routes/associate-account.js
+++ b/app/assets/javascripts/discourse/app/routes/associate-account.js
@@ -1,8 +1,8 @@
-import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
-import showModal from "discourse/lib/show-modal";
+import { next } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import showModal from "discourse/lib/show-modal";
 
 export default DiscourseRoute.extend({
   beforeModel() {
diff --git a/app/assets/javascripts/discourse/app/routes/badges-index.js b/app/assets/javascripts/discourse/app/routes/badges-index.js
index f11e5ca124..63b2cac55a 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 I18n from "I18n";
-import DiscourseRoute from "discourse/routes/discourse";
 import Badge from "discourse/models/badge";
+import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 import PreloadStore from "discourse/lib/preload-store";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/badges-show.js b/app/assets/javascripts/discourse/app/routes/badges-show.js
index 1174938c38..81a05ddeaa 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 DiscourseRoute from "discourse/routes/discourse";
 import PreloadStore from "discourse/lib/preload-store";
+import UserBadge from "discourse/models/user-badge";
 import { hash } from "rsvp";
 
 export default DiscourseRoute.extend({
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 e19026692e..b56971fdae 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
@@ -6,7 +6,6 @@ export default function (filter) {
   return DiscourseRoute.extend({
     actions: {
       didTransition() {
-        this.controllerFor("user").set("indexStream", true);
         this.controllerFor("user-posts")._showFooter();
         return true;
       },
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 84959b9a6b..5b77d14f82 100644
--- a/app/assets/javascripts/discourse/app/routes/build-category-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-category-route.js
@@ -1,61 +1,26 @@
-import I18n from "I18n";
-import DiscourseRoute from "discourse/routes/discourse";
+import { Promise, all } from "rsvp";
+import {
+  changeSort,
+  queryParams,
+  resetParams,
+} from "discourse/controllers/discovery-sortable";
 import {
   filterQueryParams,
   findTopicList,
 } from "discourse/routes/build-topic-route";
-import {
-  changeSort,
-  resetParams,
-  queryParams,
-} from "discourse/controllers/discovery-sortable";
-import TopicList from "discourse/models/topic-list";
-import PermissionType from "discourse/models/permission-type";
-import CategoryList from "discourse/models/category-list";
 import Category from "discourse/models/category";
-import { Promise, all } from "rsvp";
+import CategoryList from "discourse/models/category-list";
+import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
+import PermissionType from "discourse/models/permission-type";
+import TopicList from "discourse/models/topic-list";
 
 // A helper function to create a category route with parameters
 export default (filterArg, params) => {
   return DiscourseRoute.extend({
     queryParams,
 
-    serialize(modelParams) {
-      if (!modelParams.category_slug_path_with_id) {
-        if (modelParams.id === "none") {
-          const category_slug_path_with_id = [
-            modelParams.parentSlug,
-            modelParams.slug,
-          ].join("/");
-          const category = Category.findBySlugPathWithID(
-            category_slug_path_with_id
-          );
-          this.replaceWith("discovery.categoryNone", {
-            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,
-            modelParams.slug,
-            modelParams.id,
-          ]
-            .filter((x) => x)
-            .join("/");
-        }
-      }
-
-      return modelParams;
-    },
-
     model(modelParams) {
-      modelParams = this.serialize(modelParams);
-
       const category = Category.findBySlugPathWithID(
         modelParams.category_slug_path_with_id
       );
@@ -88,12 +53,11 @@ export default (filterArg, params) => {
       const { category, modelParams } = model;
 
       if (
+        (!params || params.no_subcategories === undefined) &&
         category.default_list_filter === "none" &&
-        filterArg === "default" &&
-        modelParams &&
-        modelParams.id !== "all"
+        filterArg === "default"
       ) {
-        this.replaceWith("discovery.categoryNone", {
+        return this.replaceWith("discovery.categoryNone", {
           category,
           category_slug_path_with_id: modelParams.category_slug_path_with_id,
         });
@@ -137,11 +101,14 @@ export default (filterArg, params) => {
     },
 
     _retrieveTopicList(category, transition, modelParams) {
-      const listFilter = `c/${Category.slugFor(category)}/${
-          category.id
-        }/l/${this.filter(category)}`,
-        findOpts = filterQueryParams(modelParams, params),
-        extras = { cached: this.isPoppedState(transition) };
+      const findOpts = filterQueryParams(modelParams, params);
+      const extras = { cached: this.isPoppedState(transition) };
+
+      let listFilter = `c/${Category.slugFor(category)}/${category.id}`;
+      if (findOpts.no_subcategories) {
+        listFilter += "/none";
+      }
+      listFilter += `/l/${this.filter(category)}`;
 
       return findTopicList(
         this.store,
@@ -190,7 +157,7 @@ export default (filterArg, params) => {
         canCreateTopic: canCreateTopic,
       });
 
-      var topicOpts = {
+      let topicOpts = {
         model: topics,
         category,
         period:
@@ -239,18 +206,6 @@ export default (filterArg, params) => {
     },
 
     actions: {
-      error(err) {
-        const json = err.jqXHR.responseJSON;
-        if (json && json.extras && json.extras.html) {
-          this.controllerFor("discovery").set(
-            "errorHtml",
-            err.jqXHR.responseJSON.extras.html
-          );
-        } else {
-          this.replaceWith("exception");
-        }
-      },
-
       setNotification(notification_level) {
         this.currentModel.setNotification(notification_level);
       },
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 ba7d099bbd..102e3cf585 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,7 +1,7 @@
 import I18n from "I18n";
+import UserAction from "discourse/models/user-action";
 import UserTopicListRoute from "discourse/routes/user-topic-list";
 import { findOrResetCachedTopicList } from "discourse/lib/cached-topic-list";
-import UserAction from "discourse/models/user-action";
 
 // A helper to build a user topic list route
 export default (viewName, path, channel) => {
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 b526c6af46..6a20e58d0f 100644
--- a/app/assets/javascripts/discourse/app/routes/build-topic-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-topic-route.js
@@ -1,17 +1,17 @@
-import { isEmpty } from "@ember/utils";
-import I18n from "I18n";
-import DiscourseRoute from "discourse/routes/discourse";
 import {
   changeSort,
-  resetParams,
   queryParams,
+  resetParams,
 } from "discourse/controllers/discovery-sortable";
-import { defaultHomepage } from "discourse/lib/utilities";
-import Session from "discourse/models/session";
+import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 import { Promise } from "rsvp";
+import Session from "discourse/models/session";
 import Site from "discourse/models/site";
-import { inject as service } from "@ember/service";
 import { deepEqual } from "discourse-common/lib/object";
+import { defaultHomepage } from "discourse/lib/utilities";
+import { isEmpty } from "@ember/utils";
+import { inject as service } from "@ember/service";
 
 // A helper to build a topic route for a filter
 function filterQueryParams(params, defaultParams) {
diff --git a/app/assets/javascripts/discourse/app/routes/discourse.js b/app/assets/javascripts/discourse/app/routes/discourse.js
index aff1f6b222..3625b6ef52 100644
--- a/app/assets/javascripts/discourse/app/routes/discourse.js
+++ b/app/assets/javascripts/discourse/app/routes/discourse.js
@@ -1,6 +1,7 @@
-import { once } from "@ember/runloop";
 import Composer from "discourse/models/composer";
+import Draft from "discourse/models/draft";
 import Route from "@ember/routing/route";
+import { once } from "@ember/runloop";
 import { seenUser } from "discourse/lib/user-presence";
 
 const DiscourseRoute = Route.extend({
@@ -42,23 +43,6 @@ const DiscourseRoute = Route.extend({
     refreshTitle() {
       once(this, this._refreshTitleOnce);
     },
-
-    clearTopicDraft() {
-      // perhaps re-delegate this to root controller in all cases?
-      // TODO also poison the store so it does not come back from the
-      // dead
-      if (this.get("controller.list.draft")) {
-        this.set("controller.list.draft", null);
-      }
-
-      if (this.controllerFor("discovery/categories").get("model.draft")) {
-        this.controllerFor("discovery/categories").set("model.draft", null);
-      }
-
-      if (this.controllerFor("discovery/topics").get("model.draft")) {
-        this.controllerFor("discovery/topics").set("model.draft", null);
-      }
-    },
   },
 
   redirectIfLoginRequired() {
@@ -68,20 +52,24 @@ const DiscourseRoute = Route.extend({
     }
   },
 
-  openTopicDraft(model) {
+  openTopicDraft() {
     const composer = this.controllerFor("composer");
 
     if (
       composer.get("model.action") === Composer.CREATE_TOPIC &&
-      composer.get("model.draftKey") === model.draft_key
+      composer.get("model.draftKey") === Composer.NEW_TOPIC_KEY
     ) {
       composer.set("model.composeState", Composer.OPEN);
     } else {
-      composer.open({
-        action: Composer.CREATE_TOPIC,
-        draft: model.draft,
-        draftKey: model.draft_key,
-        draftSequence: model.draft_sequence,
+      Draft.get(Composer.NEW_TOPIC_KEY).then((data) => {
+        if (data.draft) {
+          composer.open({
+            action: Composer.CREATE_TOPIC,
+            draft: data.draft,
+            draftKey: Composer.NEW_TOPIC_KEY,
+            draftSequence: data.draft_sequence,
+          });
+        }
       });
     }
   },
diff --git a/app/assets/javascripts/discourse/app/routes/discovery-categories.js b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
index 606664ef30..96e241de49 100644
--- a/app/assets/javascripts/discourse/app/routes/discovery-categories.js
+++ b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
@@ -1,16 +1,16 @@
-import I18n from "I18n";
-import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
-import DiscourseRoute from "discourse/routes/discourse";
-import showModal from "discourse/lib/show-modal";
-import OpenComposer from "discourse/mixins/open-composer";
 import CategoryList from "discourse/models/category-list";
-import { defaultHomepage } from "discourse/lib/utilities";
+import DiscourseRoute from "discourse/routes/discourse";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
+import OpenComposer from "discourse/mixins/open-composer";
+import PreloadStore from "discourse/lib/preload-store";
+import Site from "discourse/models/site";
 import TopicList from "discourse/models/topic-list";
 import { ajax } from "discourse/lib/ajax";
-import PreloadStore from "discourse/lib/preload-store";
+import { defaultHomepage } from "discourse/lib/utilities";
 import { hash } from "rsvp";
-import Site from "discourse/models/site";
+import { next } from "@ember/runloop";
+import showModal from "discourse/lib/show-modal";
 
 const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
   renderTemplate() {
@@ -64,9 +64,6 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
           topics: TopicList.topicsFrom(this.store, topicsList),
           can_create_category: categoriesList.can_create_category,
           can_create_topic: categoriesList.can_create_topic,
-          draft_key: categoriesList.draft_key,
-          draft: categoriesList.draft,
-          draft_sequence: categoriesList.draft_sequence,
         });
       }
       // Otherwise, return the ajax result
@@ -80,9 +77,6 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
           topics: TopicList.topicsFrom(this.store, result),
           can_create_category: result.category_list.can_create_category,
           can_create_topic: result.category_list.can_create_topic,
-          draft_key: result.category_list.draft_key,
-          draft: result.category_list.draft,
-          draft_sequence: result.category_list.draft_sequence,
         });
       });
     });
@@ -118,9 +112,8 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
     },
 
     createTopic() {
-      const model = this.controllerFor("discovery/categories").get("model");
-      if (model.draft) {
-        this.openTopicDraft(model);
+      if (this.get("currentUser.has_topic_draft")) {
+        this.openTopicDraft();
       } else {
         this.openComposer(this.controllerFor("discovery/categories"));
       }
diff --git a/app/assets/javascripts/discourse/app/routes/discovery.js b/app/assets/javascripts/discourse/app/routes/discovery.js
index a99efc3ca1..8c69cf10f2 100644
--- a/app/assets/javascripts/discourse/app/routes/discovery.js
+++ b/app/assets/javascripts/discourse/app/routes/discovery.js
@@ -4,8 +4,8 @@
 **/
 import DiscourseRoute from "discourse/routes/discourse";
 import OpenComposer from "discourse/mixins/open-composer";
-import { scrollTop } from "discourse/mixins/scroll-top";
 import User from "discourse/models/user";
+import { scrollTop } from "discourse/mixins/scroll-top";
 import { setTopicList } from "discourse/lib/topic-list-tracker";
 
 export default DiscourseRoute.extend(OpenComposer, {
@@ -59,9 +59,8 @@ export default DiscourseRoute.extend(OpenComposer, {
     },
 
     createTopic() {
-      const model = this.controllerFor("discovery/topics").get("model");
-      if (model.draft) {
-        this.openTopicDraft(model);
+      if (this.get("currentUser.has_topic_draft")) {
+        this.openTopicDraft();
       } else {
         this.openComposer(this.controllerFor("discovery/topics"));
       }
diff --git a/app/assets/javascripts/discourse/app/routes/edit-category-tabs.js b/app/assets/javascripts/discourse/app/routes/edit-category-tabs.js
index 07f8c7243d..64b18a9518 100644
--- a/app/assets/javascripts/discourse/app/routes/edit-category-tabs.js
+++ b/app/assets/javascripts/discourse/app/routes/edit-category-tabs.js
@@ -13,6 +13,7 @@ export default DiscourseRoute.extend({
     controller.setProperties({
       parentParams,
       selectedTab: transition.to.params.tab,
+      showTooltip: false,
     });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/edit-category.js b/app/assets/javascripts/discourse/app/routes/edit-category.js
index ae8136c4a0..f9ebcf1255 100644
--- a/app/assets/javascripts/discourse/app/routes/edit-category.js
+++ b/app/assets/javascripts/discourse/app/routes/edit-category.js
@@ -1,6 +1,6 @@
-import I18n from "I18n";
-import DiscourseRoute from "discourse/routes/discourse";
 import Category from "discourse/models/category";
+import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   model(params) {
diff --git a/app/assets/javascripts/discourse/app/routes/edit-child-category-index.js b/app/assets/javascripts/discourse/app/routes/edit-child-category-index.js
deleted file mode 100644
index 43c73864de..0000000000
--- a/app/assets/javascripts/discourse/app/routes/edit-child-category-index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import DiscourseRoute from "discourse/routes/discourse";
-
-export default DiscourseRoute.extend({
-  afterModel() {
-    const params = this.paramsFor("editChildCategory");
-    this.replaceWith(`/c/${params.parentSlug}/${params.slug}/edit/general`);
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/routes/edit-child-category-tabs.js b/app/assets/javascripts/discourse/app/routes/edit-child-category-tabs.js
deleted file mode 100644
index 402bed4910..0000000000
--- a/app/assets/javascripts/discourse/app/routes/edit-child-category-tabs.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import DiscourseRoute from "discourse/routes/discourse";
-
-export default DiscourseRoute.extend({
-  model() {
-    return this.modelFor("editChildCategory");
-  },
-
-  renderTemplate() {
-    this.render("edit-category-tabs", {
-      controller: "edit-category-tabs",
-      model: this.currentModel,
-    });
-
-    this.controllerFor("editCategory.tabs").set(
-      "parentParams",
-      this.paramsFor("editChildCategory")
-    );
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/routes/edit-child-category.js b/app/assets/javascripts/discourse/app/routes/edit-child-category.js
deleted file mode 100644
index ae8136c4a0..0000000000
--- a/app/assets/javascripts/discourse/app/routes/edit-child-category.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import I18n from "I18n";
-import DiscourseRoute from "discourse/routes/discourse";
-import Category from "discourse/models/category";
-
-export default DiscourseRoute.extend({
-  model(params) {
-    return Category.reloadCategoryWithPermissions(
-      params,
-      this.store,
-      this.site
-    );
-  },
-
-  titleToken() {
-    return I18n.t("category.edit_dialog_title", {
-      categoryName: this.currentModel.name,
-    });
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/routes/email-login.js b/app/assets/javascripts/discourse/app/routes/email-login.js
index b2e466977a..a83a484d3a 100644
--- a/app/assets/javascripts/discourse/app/routes/email-login.js
+++ b/app/assets/javascripts/discourse/app/routes/email-login.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/forgot-password.js b/app/assets/javascripts/discourse/app/routes/forgot-password.js
index fe42fbd9d3..932c63b7bb 100644
--- a/app/assets/javascripts/discourse/app/routes/forgot-password.js
+++ b/app/assets/javascripts/discourse/app/routes/forgot-password.js
@@ -1,6 +1,6 @@
-import { next } from "@ember/runloop";
-import { defaultHomepage } from "discourse/lib/utilities";
 import buildStaticRoute from "discourse/routes/build-static-route";
+import { defaultHomepage } from "discourse/lib/utilities";
+import { next } from "@ember/runloop";
 
 const ForgotPasswordRoute = buildStaticRoute("password-reset");
 
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 126b5a076e..3c4fe84715 100644
--- a/app/assets/javascripts/discourse/app/routes/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/routes/full-page-search.js
@@ -1,13 +1,13 @@
-import I18n from "I18n";
-import DiscourseRoute from "discourse/routes/discourse";
-import { ajax } from "discourse/lib/ajax";
 import {
-  translateResults,
   getSearchKey,
   isValidSearchTerm,
+  translateResults,
 } from "discourse/lib/search";
-import PreloadStore from "discourse/lib/preload-store";
 import { getTransient, setTransient } from "discourse/lib/page-tracker";
+import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
+import PreloadStore from "discourse/lib/preload-store";
+import { ajax } from "discourse/lib/ajax";
 import { escapeExpression } from "discourse/lib/utilities";
 
 export default DiscourseRoute.extend({
@@ -30,7 +30,7 @@ export default DiscourseRoute.extend({
 
   model(params) {
     const cached = getTransient("lastSearch");
-    var args = { q: params.q };
+    let args = { q: params.q };
     if (params.context_id && !args.skip_context) {
       args.search_context = {
         type: params.context,
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 767f3e028e..0c805e51cc 100644
--- a/app/assets/javascripts/discourse/app/routes/group-activity-posts.js
+++ b/app/assets/javascripts/discourse/app/routes/group-activity-posts.js
@@ -1,6 +1,6 @@
+import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
 import { get } from "@ember/object";
-import DiscourseRoute from "discourse/routes/discourse";
 
 export function buildGroupPage(type) {
   return DiscourseRoute.extend({
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 2169f7adc2..31e5fde47c 100644
--- a/app/assets/javascripts/discourse/app/routes/group-activity-topics.js
+++ b/app/assets/javascripts/discourse/app/routes/group-activity-topics.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   showFooter: true,
diff --git a/app/assets/javascripts/discourse/app/routes/group-index.js b/app/assets/javascripts/discourse/app/routes/group-index.js
index 2db84a909e..fdd634dfa6 100644
--- a/app/assets/javascripts/discourse/app/routes/group-index.js
+++ b/app/assets/javascripts/discourse/app/routes/group-index.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
-import showModal from "discourse/lib/show-modal";
+import I18n from "I18n";
 import { action } from "@ember/object";
+import showModal from "discourse/lib/show-modal";
 
 export default DiscourseRoute.extend({
   titleToken() {
diff --git a/app/assets/javascripts/discourse/app/routes/group-manage-categories.js b/app/assets/javascripts/discourse/app/routes/group-manage-categories.js
index e6e30185b6..2523e5f8f5 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage-categories.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage-categories.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   showFooter: true,
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 f8fa57bf59..ad993fb5cd 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage-interaction.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage-interaction.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   showFooter: true,
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 cbe7a8c08a..4cdd9bd0cc 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage-logs.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage-logs.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   titleToken() {
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 f65567c50f..b448f86756 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage-membership.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage-membership.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   showFooter: true,
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 e1a76ac829..1edb6d39d7 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage-profile.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage-profile.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   showFooter: true,
diff --git a/app/assets/javascripts/discourse/app/routes/group-manage-tags.js b/app/assets/javascripts/discourse/app/routes/group-manage-tags.js
index b86cd6264f..6e2523485c 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage-tags.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage-tags.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   showFooter: true,
diff --git a/app/assets/javascripts/discourse/app/routes/group-manage.js b/app/assets/javascripts/discourse/app/routes/group-manage.js
index 12d266476c..db7ef9a8bc 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   showFooter: true,
diff --git a/app/assets/javascripts/discourse/app/routes/group-messages.js b/app/assets/javascripts/discourse/app/routes/group-messages.js
index 5b4296bca5..ffd83a263c 100644
--- a/app/assets/javascripts/discourse/app/routes/group-messages.js
+++ b/app/assets/javascripts/discourse/app/routes/group-messages.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   titleToken() {
diff --git a/app/assets/javascripts/discourse/app/routes/group-permissions.js b/app/assets/javascripts/discourse/app/routes/group-permissions.js
index d907b4e148..82ba93cac9 100644
--- a/app/assets/javascripts/discourse/app/routes/group-permissions.js
+++ b/app/assets/javascripts/discourse/app/routes/group-permissions.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { buildPermissionDescription } from "discourse/models/permission-type";
 
diff --git a/app/assets/javascripts/discourse/app/routes/group-requests.js b/app/assets/javascripts/discourse/app/routes/group-requests.js
index 42ddf67a99..0c87f2cb5e 100644
--- a/app/assets/javascripts/discourse/app/routes/group-requests.js
+++ b/app/assets/javascripts/discourse/app/routes/group-requests.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   titleToken() {
diff --git a/app/assets/javascripts/discourse/app/routes/groups-index.js b/app/assets/javascripts/discourse/app/routes/groups-index.js
index 6140931110..41684664ea 100644
--- a/app/assets/javascripts/discourse/app/routes/groups-index.js
+++ b/app/assets/javascripts/discourse/app/routes/groups-index.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   titleToken() {
diff --git a/app/assets/javascripts/discourse/app/routes/groups-new.js b/app/assets/javascripts/discourse/app/routes/groups-new.js
index 1a4e5ce849..fe375c5459 100644
--- a/app/assets/javascripts/discourse/app/routes/groups-new.js
+++ b/app/assets/javascripts/discourse/app/routes/groups-new.js
@@ -1,6 +1,6 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import Group from "discourse/models/group";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   showFooter: true,
diff --git a/app/assets/javascripts/discourse/app/routes/invites-show.js b/app/assets/javascripts/discourse/app/routes/invites-show.js
index a2546f2d1d..7a044a0e37 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 I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 import PreloadStore from "discourse/lib/preload-store";
 import { deepMerge } from "discourse-common/lib/object";
 
@@ -17,4 +17,16 @@ export default DiscourseRoute.extend({
       return {};
     }
   },
+
+  setupController(controller, model) {
+    this._super(...arguments);
+
+    if (model.user_fields) {
+      controller.userFields.forEach((userField) => {
+        if (model.user_fields[userField.field.id]) {
+          userField.value = model.user_fields[userField.field.id];
+        }
+      });
+    }
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/login.js b/app/assets/javascripts/discourse/app/routes/login.js
index 88dc645f30..bc6766c1a3 100644
--- a/app/assets/javascripts/discourse/app/routes/login.js
+++ b/app/assets/javascripts/discourse/app/routes/login.js
@@ -1,6 +1,6 @@
-import { next } from "@ember/runloop";
 import buildStaticRoute from "discourse/routes/build-static-route";
 import { defaultHomepage } from "discourse/lib/utilities";
+import { next } from "@ember/runloop";
 
 const LoginRoute = buildStaticRoute("login");
 
diff --git a/app/assets/javascripts/discourse/app/routes/new-category.js b/app/assets/javascripts/discourse/app/routes/new-category.js
index 0ff104ea25..d988839158 100644
--- a/app/assets/javascripts/discourse/app/routes/new-category.js
+++ b/app/assets/javascripts/discourse/app/routes/new-category.js
@@ -1,7 +1,15 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
-import { SEARCH_PRIORITIES } from "discourse/lib/constants";
+import I18n from "I18n";
 import { Promise } from "rsvp";
+import { SEARCH_PRIORITIES } from "discourse/lib/constants";
+
+let _newCategoryColor = "0088CC",
+  _newCategoryTextColor = "FFFFFF";
+
+export function setNewCategoryDefaultColors(backgroundColor, textColor) {
+  _newCategoryColor = backgroundColor;
+  _newCategoryTextColor = textColor;
+}
 
 export default DiscourseRoute.extend({
   model() {
@@ -16,8 +24,8 @@ export default DiscourseRoute.extend({
 
   newCategoryWithPermissions(group_permissions) {
     return this.store.createRecord("category", {
-      color: "0088CC",
-      text_color: "FFFFFF",
+      color: _newCategoryColor,
+      text_color: _newCategoryTextColor,
       group_permissions,
       available_groups: this.site.groups.map((g) => g.name),
       allow_badges: true,
diff --git a/app/assets/javascripts/discourse/app/routes/new-message.js b/app/assets/javascripts/discourse/app/routes/new-message.js
index be40e45592..aec1774cc4 100644
--- a/app/assets/javascripts/discourse/app/routes/new-message.js
+++ b/app/assets/javascripts/discourse/app/routes/new-message.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
-import User from "discourse/models/user";
 import Group from "discourse/models/group";
+import I18n from "I18n";
+import User from "discourse/models/user";
 import bootbox from "bootbox";
 import cookie from "discourse/lib/cookie";
+import { next } from "@ember/runloop";
 
 export default DiscourseRoute.extend({
   beforeModel(transition) {
@@ -20,12 +20,11 @@ export default DiscourseRoute.extend({
             .then((user) => {
               if (user.can_send_private_message_to_user) {
                 next(() =>
-                  e.send(
-                    "createNewMessageViaParams",
-                    user.username,
-                    params.title,
-                    params.body
-                  )
+                  e.send("createNewMessageViaParams", {
+                    recipients: user.username,
+                    topicTitle: params.title,
+                    topicBody: params.body,
+                  })
                 );
               } else {
                 bootbox.alert(
@@ -40,12 +39,11 @@ export default DiscourseRoute.extend({
             .then((result) => {
               if (result.messageable) {
                 next(() =>
-                  e.send(
-                    "createNewMessageViaParams",
-                    groupName,
-                    params.title,
-                    params.body
-                  )
+                  e.send("createNewMessageViaParams", {
+                    recipients: groupName,
+                    topicTitle: params.title,
+                    topicBody: params.body,
+                  })
                 );
               } else {
                 bootbox.alert(
@@ -55,7 +53,10 @@ export default DiscourseRoute.extend({
             })
             .catch(() => bootbox.alert(I18n.t("generic_error")));
         } else {
-          e.send("createNewMessageViaParams", null, params.title, params.body);
+          e.send("createNewMessageViaParams", {
+            topicTitle: params.title,
+            topicBody: params.body,
+          });
         }
       });
     } else {
diff --git a/app/assets/javascripts/discourse/app/routes/new-topic.js b/app/assets/javascripts/discourse/app/routes/new-topic.js
index 538254dff0..abf30681a7 100644
--- a/app/assets/javascripts/discourse/app/routes/new-topic.js
+++ b/app/assets/javascripts/discourse/app/routes/new-topic.js
@@ -1,7 +1,7 @@
-import { next } from "@ember/runloop";
-import DiscourseRoute from "discourse/routes/discourse";
 import Category from "discourse/models/category";
+import DiscourseRoute from "discourse/routes/discourse";
 import cookie from "discourse/lib/cookie";
+import { next } from "@ember/runloop";
 
 export default DiscourseRoute.extend({
   beforeModel(transition) {
diff --git a/app/assets/javascripts/discourse/app/routes/password-reset.js b/app/assets/javascripts/discourse/app/routes/password-reset.js
index dca1f8ac0d..9ab12b4442 100644
--- a/app/assets/javascripts/discourse/app/routes/password-reset.js
+++ b/app/assets/javascripts/discourse/app/routes/password-reset.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 import PreloadStore from "discourse/lib/preload-store";
 import { ajax } from "discourse/lib/ajax";
-import { userPath } from "discourse/lib/url";
 import { deepMerge } from "discourse-common/lib/object";
+import { userPath } from "discourse/lib/url";
 
 export default DiscourseRoute.extend({
   titleToken() {
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-account.js b/app/assets/javascripts/discourse/app/routes/preferences-account.js
index 7e2fee5b55..a56664daf6 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences-account.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences-account.js
@@ -1,6 +1,6 @@
-import showModal from "discourse/lib/show-modal";
-import UserBadge from "discourse/models/user-badge";
 import RestrictedUserRoute from "discourse/routes/restricted-user";
+import UserBadge from "discourse/models/user-badge";
+import showModal from "discourse/lib/show-modal";
 
 export default RestrictedUserRoute.extend({
   showFooter: true,
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-security.js b/app/assets/javascripts/discourse/app/routes/preferences-security.js
new file mode 100644
index 0000000000..bfec0d17c4
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/routes/preferences-security.js
@@ -0,0 +1,5 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  showFooter: true,
+});
diff --git a/app/assets/javascripts/discourse/app/routes/review-index.js b/app/assets/javascripts/discourse/app/routes/review-index.js
index 13d10724f2..b4d15e68e1 100644
--- a/app/assets/javascripts/discourse/app/routes/review-index.js
+++ b/app/assets/javascripts/discourse/app/routes/review-index.js
@@ -32,6 +32,7 @@ export default DiscourseRoute.extend({
       filterPriority: meta.priority,
       reviewableTypes: meta.reviewable_types,
       filterUsername: meta.username,
+      filterReviewedBy: meta.reviewed_by,
       filterFromDate: isPresent(meta.from_date) ? moment(meta.from_date) : null,
       filterToDate: isPresent(meta.to_date) ? moment(meta.to_date) : null,
       filterSortOrder: meta.sort_order,
diff --git a/app/assets/javascripts/discourse/app/routes/review.js b/app/assets/javascripts/discourse/app/routes/review.js
index dbb1204369..573150584d 100644
--- a/app/assets/javascripts/discourse/app/routes/review.js
+++ b/app/assets/javascripts/discourse/app/routes/review.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   titleToken() {
diff --git a/app/assets/javascripts/discourse/app/routes/signup.js b/app/assets/javascripts/discourse/app/routes/signup.js
index 2130250a0e..89a6a04c7a 100644
--- a/app/assets/javascripts/discourse/app/routes/signup.js
+++ b/app/assets/javascripts/discourse/app/routes/signup.js
@@ -1,11 +1,11 @@
-import { next } from "@ember/runloop";
 import buildStaticRoute from "discourse/routes/build-static-route";
+import { next } from "@ember/runloop";
 
 const SignupRoute = buildStaticRoute("signup");
 
 SignupRoute.reopen({
   beforeModel() {
-    var canSignUp = this.controllerFor("application").get("canSignUp");
+    let canSignUp = this.controllerFor("application").get("canSignUp");
 
     if (!this.siteSettings.login_required) {
       this.replaceWith("discovery.latest").then((e) => {
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 e7e27caa3d..8df2516fb6 100644
--- a/app/assets/javascripts/discourse/app/routes/tag-groups-new.js
+++ b/app/assets/javascripts/discourse/app/routes/tag-groups-new.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   showFooter: true,
diff --git a/app/assets/javascripts/discourse/app/routes/tag-groups.js b/app/assets/javascripts/discourse/app/routes/tag-groups.js
index e0d9ff6798..53e95088e1 100644
--- a/app/assets/javascripts/discourse/app/routes/tag-groups.js
+++ b/app/assets/javascripts/discourse/app/routes/tag-groups.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   showFooter: true,
diff --git a/app/assets/javascripts/discourse/app/routes/tag-show.js b/app/assets/javascripts/discourse/app/routes/tag-show.js
index 565c4ca23f..d45e093d53 100644
--- a/app/assets/javascripts/discourse/app/routes/tag-show.js
+++ b/app/assets/javascripts/discourse/app/routes/tag-show.js
@@ -1,21 +1,21 @@
-import { makeArray } from "discourse-common/lib/helpers";
-import I18n from "I18n";
-import DiscourseRoute from "discourse/routes/discourse";
-import Composer from "discourse/models/composer";
-import showModal from "discourse/lib/show-modal";
 import {
   filterQueryParams,
   findTopicList,
 } from "discourse/routes/build-topic-route";
 import {
-  resetParams,
   queryParams,
+  resetParams,
 } from "discourse/controllers/discovery-sortable";
-import PermissionType from "discourse/models/permission-type";
 import Category from "discourse/models/category";
+import Composer from "discourse/models/composer";
+import DiscourseRoute from "discourse/routes/discourse";
 import FilterModeMixin from "discourse/mixins/filter-mode";
+import I18n from "I18n";
+import PermissionType from "discourse/models/permission-type";
 import { escapeExpression } from "discourse/lib/utilities";
+import { makeArray } from "discourse-common/lib/helpers";
 import { setTopicList } from "discourse/lib/topic-list-tracker";
+import showModal from "discourse/lib/show-modal";
 
 export default DiscourseRoute.extend(FilterModeMixin, {
   navMode: "latest",
@@ -95,7 +95,7 @@ export default DiscourseRoute.extend(FilterModeMixin, {
     }
 
     return findTopicList(this.store, this.topicTrackingState, filter, params, {
-      cached: true,
+      cached: this.isPoppedState(transition),
     }).then((list) => {
       if (list.topic_list.tags && list.topic_list.tags.length === 1) {
         // Update name of tag (case might be different)
@@ -180,18 +180,16 @@ export default DiscourseRoute.extend(FilterModeMixin, {
     },
 
     createTopic() {
-      const controller = this.controllerFor("tag.show");
-
-      if (controller.get("list.draft")) {
-        this.openTopicDraft(controller.get("list"));
+      if (this.get("currentUser.has_topic_draft")) {
+        this.openTopicDraft();
       } else {
+        const controller = this.controllerFor("tag.show");
         const composerController = this.controllerFor("composer");
         composerController
           .open({
             categoryId: controller.get("category.id"),
             action: Composer.CREATE_TOPIC,
-            draftKey: controller.get("list.draft_key"),
-            draftSequence: controller.get("list.draft_sequence"),
+            draftKey: Composer.NEW_TOPIC_KEY,
           })
           .then(() => {
             // Pre-fill the tags input field
diff --git a/app/assets/javascripts/discourse/app/routes/tags-index.js b/app/assets/javascripts/discourse/app/routes/tags-index.js
index d33acb9bbf..12409d9576 100644
--- a/app/assets/javascripts/discourse/app/routes/tags-index.js
+++ b/app/assets/javascripts/discourse/app/routes/tags-index.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 import Tag from "discourse/models/tag";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/topic-by-slug-or-id.js b/app/assets/javascripts/discourse/app/routes/topic-by-slug-or-id.js
index 539aa4b4e4..0cfe24473f 100644
--- a/app/assets/javascripts/discourse/app/routes/topic-by-slug-or-id.js
+++ b/app/assets/javascripts/discourse/app/routes/topic-by-slug-or-id.js
@@ -1,5 +1,5 @@
-import DiscourseRoute from "discourse/routes/discourse";
 import Topic, { ID_CONSTRAINT } from "discourse/models/topic";
+import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 
 export default DiscourseRoute.extend({
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 d2818b12fc..35fd8b40dc 100644
--- a/app/assets/javascripts/discourse/app/routes/topic-from-params.js
+++ b/app/assets/javascripts/discourse/app/routes/topic-from-params.js
@@ -1,9 +1,9 @@
-import { isEmpty } from "@ember/utils";
-import { schedule } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import Draft from "discourse/models/draft";
+import { isEmpty } from "@ember/utils";
 import { isTesting } from "discourse-common/config/environment";
+import { schedule } from "@ember/runloop";
 
 // This route is used for retrieving a topic based on params
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/topic.js b/app/assets/javascripts/discourse/app/routes/topic.js
index 2653598c89..ae9974569f 100644
--- a/app/assets/javascripts/discourse/app/routes/topic.js
+++ b/app/assets/javascripts/discourse/app/routes/topic.js
@@ -1,11 +1,11 @@
-import { get } from "@ember/object";
-import { isEmpty } from "@ember/utils";
 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 { setTopicId } from "discourse/lib/topic-list-tracker";
+import { get } from "@ember/object";
+import { isEmpty } from "@ember/utils";
 import { inject as service } from "@ember/service";
+import { setTopicId } from "discourse/lib/topic-list-tracker";
 import showModal from "discourse/lib/show-modal";
 
 const SCROLL_DELAY = 500;
@@ -105,7 +105,7 @@ const TopicRoute = DiscourseRoute.extend({
       });
     },
 
-    showTopicStatusUpdate() {
+    showTopicTimerModal() {
       const model = this.modelFor("topic");
 
       const topicTimer = model.get("topic_timer");
diff --git a/app/assets/javascripts/discourse/app/routes/unknown.js b/app/assets/javascripts/discourse/app/routes/unknown.js
index 3365d463ee..5f74049896 100644
--- a/app/assets/javascripts/discourse/app/routes/unknown.js
+++ b/app/assets/javascripts/discourse/app/routes/unknown.js
@@ -1,10 +1,11 @@
-import { ajax } from "discourse/lib/ajax";
-import DiscourseURL from "discourse/lib/url";
 import DiscourseRoute from "discourse/routes/discourse";
+import DiscourseURL from "discourse/lib/url";
+import { ajax } from "discourse/lib/ajax";
 
 export default DiscourseRoute.extend({
-  model(params, transition) {
-    const path = params.path;
+  model(_, transition) {
+    const path = transition.intent.url;
+
     return ajax("/permalink-check.json", {
       data: { path },
     }).then((results) => {
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-likes-given.js b/app/assets/javascripts/discourse/app/routes/user-activity-likes-given.js
index 4b599e9718..6c3ef6b002 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-likes-given.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-likes-given.js
@@ -1,5 +1,5 @@
-import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 import UserAction from "discourse/models/user-action";
+import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["likes_given"],
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-pending.js b/app/assets/javascripts/discourse/app/routes/user-activity-pending.js
index 2f22c7e549..e5b5633164 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-pending.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-pending.js
@@ -1,5 +1,5 @@
-import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 import UserAction from "discourse/models/user-action";
+import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES.pending,
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-read.js b/app/assets/javascripts/discourse/app/routes/user-activity-read.js
new file mode 100644
index 0000000000..1cfd2c9856
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-read.js
@@ -0,0 +1,12 @@
+import UserAction from "discourse/models/user-action";
+import UserTopicListRoute from "discourse/routes/user-topic-list";
+
+export default UserTopicListRoute.extend({
+  userActionType: UserAction.TYPES.topics,
+
+  model() {
+    return this.store.findFiltered("topicList", {
+      filter: "read",
+    });
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-replies.js b/app/assets/javascripts/discourse/app/routes/user-activity-replies.js
index d1fe8bf264..ec530a4acd 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-replies.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-replies.js
@@ -1,5 +1,5 @@
-import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 import UserAction from "discourse/models/user-action";
+import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["posts"],
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-topics.js b/app/assets/javascripts/discourse/app/routes/user-activity-topics.js
index 108193cb09..3e736f3514 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-topics.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-topics.js
@@ -1,5 +1,5 @@
-import UserTopicListRoute from "discourse/routes/user-topic-list";
 import UserAction from "discourse/models/user-action";
+import UserTopicListRoute from "discourse/routes/user-topic-list";
 
 export default UserTopicListRoute.extend({
   userActionType: UserAction.TYPES.topics,
diff --git a/app/assets/javascripts/discourse/app/routes/user-badges.js b/app/assets/javascripts/discourse/app/routes/user-badges.js
index c2b02b3b95..3f2d04421a 100644
--- a/app/assets/javascripts/discourse/app/routes/user-badges.js
+++ b/app/assets/javascripts/discourse/app/routes/user-badges.js
@@ -1,6 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
-import ViewingActionType from "discourse/mixins/viewing-action-type";
 import UserBadge from "discourse/models/user-badge";
+import ViewingActionType from "discourse/mixins/viewing-action-type";
 
 export default DiscourseRoute.extend(ViewingActionType, {
   model() {
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 88d93a5509..fbc69250a9 100644
--- a/app/assets/javascripts/discourse/app/routes/user-invited-show.js
+++ b/app/assets/javascripts/discourse/app/routes/user-invited-show.js
@@ -1,13 +1,8 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import Invite from "discourse/models/invite";
-import showModal from "discourse/lib/show-modal";
-import { getAbsoluteURL } from "discourse-common/lib/get-url";
 
 export default DiscourseRoute.extend({
   model(params) {
-    Invite.findInvitedCount(this.modelFor("user")).then((result) =>
-      this.set("invitesCount", result)
-    );
     this.inviteFilter = params.filter;
     return Invite.findInvitedBy(this.modelFor("user"), params.filter);
   },
@@ -21,63 +16,16 @@ export default DiscourseRoute.extend({
   setupController(controller, model) {
     controller.setProperties({
       model,
+      invitesCount: model.counts,
       user: this.controllerFor("user").get("model"),
       filter: this.inviteFilter,
       searchTerm: "",
-      totalInvites: model.invites.length,
-      invitesCount: this.invitesCount,
     });
   },
 
   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"),
-          },
-        });
-        panels.reverse();
-      }
-
-      showModal("share-and-invite", {
-        modalClass: "share-and-invite",
-        panels,
-      });
-    },
-
-    editInvite(inviteKey) {
-      const inviteLink = getAbsoluteURL(`/invites/${inviteKey}`);
-      this.currentUser.setProperties({ finished: true, inviteLink });
-      const panels = [
-        {
-          id: "invite-link",
-          title: "user.invited.invite_link.title",
-          model: {
-            inviteModel: this.currentUser,
-            userInvitedShow: this.controllerFor("user-invited-show"),
-          },
-        },
-      ];
-
-      showModal("share-and-invite", {
-        modalClass: "share-and-invite",
-        panels,
-      });
+    triggerRefresh() {
+      this.refresh();
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications-edits.js b/app/assets/javascripts/discourse/app/routes/user-notifications-edits.js
index 134da934da..8be7b15b7b 100644
--- a/app/assets/javascripts/discourse/app/routes/user-notifications-edits.js
+++ b/app/assets/javascripts/discourse/app/routes/user-notifications-edits.js
@@ -1,5 +1,5 @@
-import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 import UserAction from "discourse/models/user-action";
+import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["edits"],
diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications-likes-received.js b/app/assets/javascripts/discourse/app/routes/user-notifications-likes-received.js
index 7206e7705d..1bfaa46b84 100644
--- a/app/assets/javascripts/discourse/app/routes/user-notifications-likes-received.js
+++ b/app/assets/javascripts/discourse/app/routes/user-notifications-likes-received.js
@@ -1,5 +1,5 @@
-import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 import UserAction from "discourse/models/user-action";
+import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["likes_received"],
diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications-mentions.js b/app/assets/javascripts/discourse/app/routes/user-notifications-mentions.js
index 0c212babc7..2d8c2622da 100644
--- a/app/assets/javascripts/discourse/app/routes/user-notifications-mentions.js
+++ b/app/assets/javascripts/discourse/app/routes/user-notifications-mentions.js
@@ -1,5 +1,5 @@
-import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 import UserAction from "discourse/models/user-action";
+import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["mentions"],
diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications-responses.js b/app/assets/javascripts/discourse/app/routes/user-notifications-responses.js
index 271373e0b1..52604ccdc5 100644
--- a/app/assets/javascripts/discourse/app/routes/user-notifications-responses.js
+++ b/app/assets/javascripts/discourse/app/routes/user-notifications-responses.js
@@ -1,5 +1,5 @@
-import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 import UserAction from "discourse/models/user-action";
+import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["replies"],
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 1ce81b56cf..3cbda900f1 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,6 +1,6 @@
-import I18n from "I18n";
-import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
+import EmberObject from "@ember/object";
+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/routes/user-private-messages.js b/app/assets/javascripts/discourse/app/routes/user-private-messages.js
index b9e22f7782..bedaa51e07 100644
--- a/app/assets/javascripts/discourse/app/routes/user-private-messages.js
+++ b/app/assets/javascripts/discourse/app/routes/user-private-messages.js
@@ -1,6 +1,6 @@
+import Composer from "discourse/models/composer";
 import DiscourseRoute from "discourse/routes/discourse";
 import Draft from "discourse/models/draft";
-import Composer from "discourse/models/composer";
 
 export default DiscourseRoute.extend({
   renderTemplate() {
@@ -29,6 +29,10 @@ export default DiscourseRoute.extend({
   },
 
   actions: {
+    refresh() {
+      this.refresh();
+    },
+
     willTransition: function () {
       this._super(...arguments);
       this.controllerFor("user").set("pmView", null);
diff --git a/app/assets/javascripts/discourse/app/routes/user-summary.js b/app/assets/javascripts/discourse/app/routes/user-summary.js
index a381287101..d7fefead28 100644
--- a/app/assets/javascripts/discourse/app/routes/user-summary.js
+++ b/app/assets/javascripts/discourse/app/routes/user-summary.js
@@ -11,10 +11,4 @@ export default DiscourseRoute.extend({
 
     return user.summary();
   },
-
-  actions: {
-    didTransition() {
-      this.controllerFor("user").set("indexStream", true);
-    },
-  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user.js b/app/assets/javascripts/discourse/app/routes/user.js
index c95ead4969..5a3435eb72 100644
--- a/app/assets/javascripts/discourse/app/routes/user.js
+++ b/app/assets/javascripts/discourse/app/routes/user.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 import User from "discourse/models/user";
 
 export default DiscourseRoute.extend({
@@ -11,14 +11,6 @@ export default DiscourseRoute.extend({
   },
 
   actions: {
-    willTransition(transition) {
-      // will reset the indexStream when transitioning to routes that aren't "indexStream"
-      // otherwise the "header" will jump
-      const isIndexStream = transition.targetName === "user.summary";
-      this.controllerFor("user").set("indexStream", isIndexStream);
-      return true;
-    },
-
     undoRevokeApiKey(key) {
       key.undoRevoke();
     },
diff --git a/app/assets/javascripts/discourse/app/routes/users.js b/app/assets/javascripts/discourse/app/routes/users.js
index 4dad9ebbe6..c055d4e2cc 100644
--- a/app/assets/javascripts/discourse/app/routes/users.js
+++ b/app/assets/javascripts/discourse/app/routes/users.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   queryParams: {
diff --git a/app/assets/javascripts/discourse/app/services/app-events.js b/app/assets/javascripts/discourse/app/services/app-events.js
index 9e738afecb..b6ab57b068 100644
--- a/app/assets/javascripts/discourse/app/services/app-events.js
+++ b/app/assets/javascripts/discourse/app/services/app-events.js
@@ -1,6 +1,6 @@
-import deprecated from "discourse-common/lib/deprecated";
 import Evented from "@ember/object/evented";
 import Service from "@ember/service";
+import deprecated from "discourse-common/lib/deprecated";
 
 let _events = {};
 
@@ -21,6 +21,15 @@ export function clearAppEventsCache(container) {
 }
 
 export default Service.extend(Evented, {
+  init() {
+    this._super(...arguments);
+
+    // A hack because we don't make `current user` properly via container in testing mode
+    if (this.currentUser) {
+      this.currentUser.appEvents = this;
+    }
+  },
+
   on() {
     if (arguments.length === 2) {
       let [name, fn] = arguments;
diff --git a/app/assets/javascripts/discourse/app/services/document-title.js b/app/assets/javascripts/discourse/app/services/document-title.js
index c4f9e54b36..c8b90105f0 100644
--- a/app/assets/javascripts/discourse/app/services/document-title.js
+++ b/app/assets/javascripts/discourse/app/services/document-title.js
@@ -82,6 +82,11 @@ export default Service.extend({
 
     let displayCount = this._displayCount();
     let dynamicFavicon = this.currentUser && this.currentUser.dynamic_favicon;
+
+    if (this.currentUser && this.currentUser.isInDoNotDisturb()) {
+      document.title = title;
+      return;
+    }
     if (displayCount > 0 && !dynamicFavicon) {
       title = `(${displayCount}) ${title}`;
     }
diff --git a/app/assets/javascripts/discourse/app/services/logs-notice.js b/app/assets/javascripts/discourse/app/services/logs-notice.js
index a3334aadc8..6c77e7c6b8 100644
--- a/app/assets/javascripts/discourse/app/services/logs-notice.js
+++ b/app/assets/javascripts/discourse/app/services/logs-notice.js
@@ -1,13 +1,13 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import EmberObject from "@ember/object";
 import discourseComputed, {
-  on,
   observes,
+  on,
 } from "discourse-common/utils/decorators";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
 import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
+import getURL from "discourse-common/lib/get-url";
 import { htmlSafe } from "@ember/template";
+import { isEmpty } from "@ember/utils";
 
 const LOGS_NOTICE_KEY = "logs-notice-text";
 
diff --git a/app/assets/javascripts/discourse/app/services/theme-settings.js b/app/assets/javascripts/discourse/app/services/theme-settings.js
deleted file mode 100644
index 88cc4f736d..0000000000
--- a/app/assets/javascripts/discourse/app/services/theme-settings.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { get } from "@ember/object";
-import Service from "@ember/service";
-
-export default Service.extend({
-  settings: null,
-
-  init() {
-    this._super(...arguments);
-    this._settings = {};
-  },
-
-  registerSettings(themeId, settingsObject) {
-    this._settings[themeId] = settingsObject;
-  },
-
-  getSetting(themeId, settingsKey) {
-    if (this._settings[themeId]) {
-      return get(this._settings[themeId], settingsKey);
-    }
-    return null;
-  },
-
-  getObjectForTheme(themeId) {
-    return this._settings[themeId];
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/styles/.gitkeep b/app/assets/javascripts/discourse/app/styles/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/discourse/app/templates/about.hbs b/app/assets/javascripts/discourse/app/templates/about.hbs
index 2659b0ebac..a9466b2b36 100644
--- a/app/assets/javascripts/discourse/app/templates/about.hbs
+++ b/app/assets/javascripts/discourse/app/templates/about.hbs
@@ -72,36 +72,42 @@
             <tbody>
               <tr>
                 <th>&nbsp;</th>
+                <th>{{i18n "about.stat.last_day"}}</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_last_day}}</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_last_day}}</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_last_day}}</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_last_day}}</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_last_day}}</td>
                 <td>{{number model.stats.likes_7_days}}</td>
                 <td>{{number model.stats.likes_30_days}}</td>
                 <td>{{number model.stats.like_count}}</td>
diff --git a/app/assets/javascripts/discourse/app/templates/application.hbs b/app/assets/javascripts/discourse/app/templates/application.hbs
index 2f44d80833..8b3ecd788e 100644
--- a/app/assets/javascripts/discourse/app/templates/application.hbs
+++ b/app/assets/javascripts/discourse/app/templates/application.hbs
@@ -1,41 +1,44 @@
-{{d-document}}
-{{plugin-outlet name="above-site-header" tagName=""}}
-{{site-header canSignUp=canSignUp
-              showCreateAccount=(route-action "showCreateAccount")
-              showLogin=(route-action "showLogin")
-              showKeyboard=(route-action "showKeyboardShortcutsHelp")
-              toggleMobileView=(route-action "toggleMobileView")
-              toggleAnonymous=(route-action "toggleAnonymous")
-              logout=(route-action "logout")}}
+{{#discourse-root}}
+  {{d-document}}
+  {{plugin-outlet name="above-site-header" tagName=""}}
+  {{site-header canSignUp=canSignUp
+                showCreateAccount=(route-action "showCreateAccount")
+                showLogin=(route-action "showLogin")
+                showKeyboard=(route-action "showKeyboardShortcutsHelp")
+                toggleMobileView=(route-action "toggleMobileView")
+                toggleAnonymous=(route-action "toggleAnonymous")
+                logout=(route-action "logout")}}
+  {{software-update-prompt id="software-update-prompt"}}
 
-{{plugin-outlet name="below-site-header" tagName="" args=(hash currentPath=router._router.currentPath)}}
+  {{plugin-outlet name="below-site-header" tagName="" args=(hash currentPath=router._router.currentPath)}}
 
-<div id="main-outlet" class="wrap" role="main">
-  {{plugin-outlet name="above-main-container" tagName=""}}
-  <div class="container">
-    {{#if showTop}}
-      {{custom-html name="top"}}
-    {{/if}}
-    {{notification-consent-banner}}
-    {{pwa-install-banner}}
-    {{global-notice}}
-    {{create-topics-notice}}
-    {{plugin-outlet name="top-notices" tagName="" args=(hash currentPath=router._router.currentPath)}}
+  <div id="main-outlet" class="wrap" role="main">
+    {{plugin-outlet name="above-main-container" tagName=""}}
+    <div class="container">
+      {{#if showTop}}
+        {{custom-html name="top"}}
+      {{/if}}
+      {{notification-consent-banner}}
+      {{pwa-install-banner}}
+      {{global-notice}}
+      {{create-topics-notice}}
+      {{plugin-outlet name="top-notices" tagName="" args=(hash currentPath=router._router.currentPath)}}
+    </div>
+    {{outlet}}
+    {{outlet "user-card"}}
   </div>
-  {{outlet}}
-  {{outlet "user-card"}}
-</div>
 
-{{plugin-outlet name="above-footer" tagName="" args=(hash showFooter=showFooter)}}
-{{#if showFooter}}
-  {{custom-html name="footer" triggerAppEvent="true"}}
-{{/if}}
-{{plugin-outlet name="below-footer" tagName="" args=(hash showFooter=showFooter)}}
+  {{plugin-outlet name="above-footer" tagName="" args=(hash showFooter=showFooter)}}
+  {{#if showFooter}}
+    {{custom-html name="footer" triggerAppEvent="true"}}
+  {{/if}}
+  {{plugin-outlet name="below-footer" tagName="" args=(hash showFooter=showFooter)}}
 
-{{outlet "modal"}}
-{{topic-entrance}}
-{{outlet "composer"}}
+  {{outlet "modal"}}
+  {{topic-entrance}}
+  {{outlet "composer"}}
 
-{{#if showFooterNav}}
-  {{footer-nav}}
-{{/if}}
+  {{#if showFooterNav}}
+    {{footer-nav}}
+  {{/if}}
+{{/discourse-root}}
diff --git a/app/assets/javascripts/discourse/app/templates/badges/show.hbs b/app/assets/javascripts/discourse/app/templates/badges/show.hbs
index 04bed72539..cc33f81d62 100644
--- a/app/assets/javascripts/discourse/app/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/badges/show.hbs
@@ -52,7 +52,7 @@
       {{#unless canLoadMore}}
         {{#if canShowOthers}}
           <div class="clearfix">
-            <a id="show-others-with-badge-link" href={{model.url}} class="btn">{{i18n "badges.others_count" count=othersCount}}</a>
+            <a id="show-others-with-badge-link" href={{model.url}} class="btn btn-default">{{i18n "badges.others_count" count=othersCount}}</a>
           </div>
         {{/if}}
       {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs b/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
index a311180f53..454aa33103 100644
--- a/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
@@ -5,7 +5,9 @@
              class="btn-primary resend"}}
 {{/unless}}
 
-{{d-button action=editActivationEmail
-           label="login.change_email"
-           icon="pencil-alt"
-           class="edit-email"}}
+{{#if canEditEmail}}
+  {{d-button action=editActivationEmail
+            label="login.change_email"
+            icon="pencil-alt"
+            class="edit-email"}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs b/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
index 6d49d71a4d..1c6e64243c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
@@ -26,7 +26,7 @@
                 {{/if}}
               </td>
             {{/if}}
-            <td class="main-link">
+            <td class="main-link" role="rowheader">
               <span class="link-top-line">
                 <div class="bookmark-metadata">
                   {{#if bookmark.name}}
@@ -41,8 +41,13 @@
                   {{/if}}
                 </div>
 
-                {{topic-status topic=bookmark}}
-                {{topic-link bookmark}}
+                <div class="bookmark-status-with-link">
+                  {{#if bookmark.pinned}}
+                    {{d-icon "thumbtack" class="bookmark-pinned"}}
+                  {{/if}}
+                  {{topic-status topic=bookmark.topicStatus}}
+                  {{topic-link bookmark.topicLink}}
+                </div>
               </span>
               {{#if bookmark.excerpt}}
                 {{!-- template-lint-disable  --}}
@@ -69,6 +74,7 @@
               bookmark=bookmark
               removeBookmark=(action "removeBookmark")
               editBookmark=(action "editBookmark")
+              togglePinBookmark=(action "togglePinBookmark")
               }}
             </td>
           </tr>
diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
new file mode 100644
index 0000000000..f974890068
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
@@ -0,0 +1,59 @@
+{{#conditional-loading-spinner condition=loading}}
+  {{#if errorMessage}}
+    <div class="control-group">
+      <div class="controls">
+        <div class="alert alert-error">{{errorMessage}}</div>
+      </div>
+    </div>
+  {{/if}}
+
+  <div class="control-group bookmark-name-wrap">
+    {{input id="bookmark-name" value=model.name name="bookmark-name" class="bookmark-name" enter=(action "saveAndClose") placeholder=(i18n "post.bookmarks.name_placeholder") maxlength="100"}}
+    {{d-button icon="cog" action=(action "toggleOptionsPanel") class="bookmark-options-button"}}
+  </div>
+
+  <div class="bookmark-options-panel">
+    <label class="control-label" for="bookmark_auto_delete_preference">{{i18n "bookmarks.auto_delete_preference.label"}}</label>
+    {{combo-box
+    content=autoDeletePreferences
+    value=autoDeletePreference
+    class="bookmark-option-selector"
+    onChange=(action (mut autoDeletePreference))
+    }}
+  </div>
+
+  {{#if showExistingReminderAt }}
+    <div class="alert alert-info existing-reminder-at-alert">
+      {{d-icon "far-clock"}}
+      <span>{{i18n "bookmarks.reminders.existing_reminder" at_date_time=existingReminderAtFormatted}}</span>
+    </div>
+  {{/if}}
+
+  <div class="control-group">
+    <label class="control-label">
+      {{i18n "post.bookmarks.set_reminder"}}
+    </label>
+
+    {{#if userHasTimezoneSet}}
+      {{time-shortcut-picker
+        prefilledDatetime=prefilledDatetime
+        onTimeSelected=(action "onTimeSelected")
+        customOptions=customTimeShortcutOptions
+        additionalOptionsToShow=additionalTimeShortcutOptions
+        mousetrap=_mousetrap
+      }}
+    {{else}}
+      <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=(base-path))}}</div>
+    {{/if}}
+  </div>
+
+  <div class="control-group">
+    {{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 id="delete-bookmark" icon="trash-alt" class="btn-danger" action=(action "delete")}}
+      </div>
+    {{/if}}
+  </div>
+{{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
index 374f9a3d71..354e4de4ec 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
@@ -15,12 +15,22 @@
 {{/each}}
 
 {{#if siteSettings.tagging_enabled}}
-  {{#unless additionalTags}}
-    {{!-- the tag filter doesn't work with tag intersections, so hide it --}}
-    {{#if siteSettings.show_filter_by_tag}}
-      {{tag-drop firstCategory=category tagId=tag.id}}
-    {{/if}}
-  {{/unless}}
+  {{#if additionalTags}}
+    {{tags-intersection-chooser
+      currentCategory=category
+      mainTag=tag.id
+      additionalTags=additionalTags
+      options=(hash
+        categoryId=category.id
+      )
+    }}
+  {{else}}
+    {{tag-drop
+      currentCategory=category
+      noSubcategories=noSubcategories
+      tagId=tag.id
+    }}
+  {{/if}}
 {{/if}}
 
 {{plugin-outlet name="bread-crumbs-right" connectorTagName="li" tagName=""}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/bulk-select-button.hbs b/app/assets/javascripts/discourse/app/templates/components/bulk-select-button.hbs
index 9a950ed741..bdc803ae47 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bulk-select-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bulk-select-button.hbs
@@ -1,5 +1,5 @@
 {{#if selected}}
   <div id="bulk-select">
-    {{d-button class="btn-default" action=(action "showBulkActions") icon="wrench"}}
+    {{d-button class="btn-default bulk-select-btn" action=(action "showBulkActions") icon="wrench"}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
index 16861c98f0..0c68d4efb1 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
@@ -10,6 +10,7 @@
                 class="logo"
                 width=c.uploaded_logo.width
                 height=c.uploaded_logo.height
+                alt=""
               }}
             {{/if}}
           {{/unless}}
@@ -34,6 +35,7 @@
           {{/if}}
         </div>
       {{/unless}}
+      {{plugin-outlet name="category-box-below-each-category" connectorTagName="" tagName="" args=(hash category=c)}}
     </div>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
index 2886564e60..e4247e0259 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
@@ -9,6 +9,7 @@
               class="logo"
               width=c.uploaded_logo.width
               height=c.uploaded_logo.height
+              alt=""
             }}
           {{/if}}
         </div>
@@ -59,7 +60,8 @@
                         src=sc.uploaded_logo.url
                         class="logo"
                         width=sc.uploaded_logo.width
-                        height=sc.uploaded_logo.height}}
+                        height=sc.uploaded_logo.height
+                        alt=""}}
                   </span>
                   {{category-link sc hideParent="true"}}
                 </a>
@@ -68,6 +70,7 @@
           {{/if}}
         {{/unless}}
       </div>
+      {{plugin-outlet name="category-box-below-each-category" connectorTagName="" tagName="" args=(hash category=c)}}
     </div>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
index 9243d15028..b62e4a8fb5 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
@@ -1,3 +1,2 @@
 {{categories-only categories=categories
-                  latestTopicOnly=latestTopicOnly
                   showTopics="true"}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
index 9de2a6a09b..43cec199dc 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
@@ -11,6 +11,7 @@
       src=category.uploaded_logo.url
       class="category-logo"
       width=category.uploaded_logo.width
-      height=category.uploaded_logo.height}}
+      height=category.uploaded_logo.height
+      alt=""}}
   {{/if}}
 </a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs b/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
index 9e58abd2bf..3537d414e3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
@@ -1,5 +1,5 @@
 {{#if src}}
   <div class="{{class}} aspect-image" style={{style}}>
-    <img src={{cdnSrc}} width={{width}} height={{height}}>
+    <img src={{cdnSrc}} width={{width}} height={{height}} alt={{alt}}>
   </div>
 {{/if}}
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 1551e4aff4..2924226408 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
@@ -8,6 +8,8 @@
   tabindex=tabindex
   topic=model.topic
   post=model.post
+  whisper=model.whisper
+  noBump=model.noBump
 }}
 
 <span class="action-title">
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 cd4bac7c5c..ac9ac22d34 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
@@ -2,24 +2,31 @@
   {{plugin-outlet name="before-composer-toggles"}}
 
   {{#if site.mobileView}}
-    {{flat-button
-      class="toggle-toolbar"
+    {{d-button
+      class="btn-flat toggle-toolbar btn-mini-toggle"
       icon="bars"
       action=toggleToolbar
-      title=toggleToolbarTitle}}
+      title=toggleToolbarTitle
+      ariaLabel=toggleToolbarTitle
+      preventFocus=true
+    }}
   {{/if}}
 
-  {{flat-button
-    class="toggler"
+  {{d-button
+    class="btn-flat toggler toggle-minimize btn-mini-toggle"
     icon=toggleIcon
     action=toggleComposer
-    title=toggleTitle}}
+    title=toggleTitle
+    ariaLabel=toggleTitle
+  }}
 
   {{#unless site.mobileView}}
-    {{flat-button
-      class="toggle-fullscreen"
+    {{d-button
+      class="btn-flat toggle-fullscreen btn-mini-toggle"
       icon=fullscreenIcon
       action=toggleFullscreen
-      title=fullscreenTitle}}
+      title=fullscreenTitle
+      ariaLabel=fullscreenTitle
+    }}
   {{/unless}}
-</div>
\ No newline at end of file
+</div>
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 8b4170f9f2..b18046a5d7 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
@@ -1,22 +1,13 @@
-{{#if showSelector}}
-  {{user-selector
+{{email-group-user-chooser
+  id="private-message-users"
+  tabindex="1"
+  value=splitRecipients
+  onChange=(action "updateRecipients")
+  options=(hash
     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"
-    canReceiveUpdates=true
-  }}
-{{else}}
-  <a href {{action "toggleSelector"}}>
-    <div class="ac-wrap composer-user-selector-limited">
-      <span>{{limitedUsernames}}</span>
-      <span class="btn btn-primary">{{hiddenUsersCount}}</span>
-    </div>
-  </a>
-{{/if}}
+    filterPlaceholder="composer.users_placeholder"
+    includeMessageableGroups=true
+    allowEmails=currentUser.can_send_private_email_messages
+    autoWrap=true
+  )
+}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/copy-button.hbs b/app/assets/javascripts/discourse/app/templates/components/copy-button.hbs
new file mode 100644
index 0000000000..7ec679ab93
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/copy-button.hbs
@@ -0,0 +1 @@
+{{d-button class="btn-default" icon="copy" action=(action "copy")}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-invite-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/create-invite-uploader.hbs
new file mode 100644
index 0000000000..acc33b06b8
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/create-invite-uploader.hbs
@@ -0,0 +1,5 @@
+{{yield (hash data=data
+              uploading=uploading
+              progress=progress
+              uploaded=uploaded
+              submitDisabled=submitDisabled)}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
index af83ebbb10..fa23799d61 100644
--- a/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
@@ -4,4 +4,4 @@
       {{message}}
     </div>
   </div>
-{{/unless}}
\ No newline at end of file
+{{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/csv-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/csv-uploader.hbs
deleted file mode 100644
index 4d03e30953..0000000000
--- a/app/assets/javascripts/discourse/app/templates/components/csv-uploader.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<label class="btn" disabled={{uploadButtonDisabled}}>
-  {{d-icon "upload"}}&nbsp;{{uploadButtonText}}
-  <input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".csv">
-</label>
-{{#if uploading}}
-  <span>{{i18n "upload_selector.uploading"}} {{uploadProgress}}%</span>
-{{/if}}
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 eb54feb5cd..e9df77f00e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
@@ -22,7 +22,9 @@
               translatedTitle=b.title
               label=b.label
               icon=b.icon
-              class=b.className}}
+              class=b.className
+              preventFocus=b.preventFocus
+            }}
           {{/if}}
         {{/each}}
 
@@ -49,7 +51,11 @@
   </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">
+      {{#unless siteSettings.enable_diffhtml_preview}}
+        {{html-safe preview}}
+      {{/unless}}
+    </div>
     {{plugin-outlet name="editor-preview" classNames="d-editor-plugin" args=outletArgs}}
   </div>
 </div>
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 b676b34e12..6b57bd1c21 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
@@ -1,14 +1,14 @@
 <div class="modal-outer-container">
   <div class="modal-middle-container">
     <div class="modal-inner-container">
-      <div class="modal-header">
+      <div class="modal-header {{headerClass}}">
         {{#if dismissable}}
           {{d-button icon="times" action=(route-action "closeModal" "initiatedByCloseButton") class="btn-flat modal-close close" title="modal.close"}}
         {{/if}}
 
         {{#if title}}
           <div class="title">
-            <h3>{{title}}</h3>
+            <h3 id="discourse-modal-title">{{title}}</h3>
 
             {{#if subtitle}}
               <p>{{subtitle}}</p>
@@ -23,7 +23,8 @@
                 panel=panel
                 panelsLength=panels.length
                 selectedPanel=selectedPanel
-                onSelectPanel=onSelectPanel}}
+                onSelectPanel=onSelectPanel
+              }}
             {{/each}}
           </ul>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs
new file mode 100644
index 0000000000..b5b04eb673
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs
@@ -0,0 +1,3 @@
+{{#link-to route}}
+  {{yield}}
+{{/link-to}}
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 c9b4d4b345..5919b91f98 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
@@ -5,71 +5,75 @@
   {{navigation-bar navItems=navItems filterMode=filterMode category=category}}
 {{/unless}}
 
-{{#if showCategoryAdmin}}
-  {{categories-admin-dropdown
-    onChange=(action "selectCategoryAdminDropdownAction")
-    options=(hash
-      triggerOnChangeOnTab=false
-    )
-  }}
-{{/if}}
+<div class="navigation-controls">
 
-{{#if category}}
-  {{#unless tag}}
-    {{!-- don't show category notification menu on tag pages --}}
-    {{#if showCategoryNotifications}}
-      {{category-notifications-button
-        value=category.notification_level
-        category=category
-        onChange=(action "changeCategoryNotificationLevel")
-      }}
-    {{/if}}
-  {{/unless}}
-{{/if}}
+  {{#if showCategoryAdmin}}
+    {{categories-admin-dropdown
+      onChange=(action "selectCategoryAdminDropdownAction")
+      options=(hash
+        triggerOnChangeOnTab=false
+      )
+    }}
+  {{/if}}
 
-{{#if tag}}
-  {{#if tagNotification}}
-    {{#unless additionalTags}}
-      {{!-- don't show tag notification menu on tag intersections --}}
-      {{tag-notifications-button
-        onChange=changeTagNotificationLevel
-        value=tagNotification.notification_level
-      }}
+  {{#if category}}
+    {{#unless tag}}
+      {{!-- don't show category edit button on tag pages --}}
+      {{#if showCategoryEdit}}
+        {{d-button
+          class="btn-default edit-category"
+          action=editCategory
+          icon="wrench"
+          label="category.edit"}}
+      {{/if}}
     {{/unless}}
   {{/if}}
-{{/if}}
 
-{{plugin-outlet name="before-create-topic-button"
-  args=(hash
-    canCreateTopic=canCreateTopic
-    createTopicDisabled=createTopicDisabled
-    createTopicLabel=createTopicLabel)
-}}
-
-{{create-topic-button
-  canCreateTopic=canCreateTopic
-  action=(action "clickCreateTopicButton")
-  disabled=createTopicButtonDisabled
-  label=createTopicLabel
-  btnClass=createTopicClass
-  canCreateTopicOnTag=canCreateTopicOnTag
-}}
-
-{{#if category}}
-  {{#unless tag}}
-    {{!-- don't show category edit button on tag pages --}}
-    {{#if showCategoryEdit}}
-      {{d-button
-        class="btn-default edit-category"
-        action=editCategory
-        icon="wrench"
-        label="category.edit"}}
+  {{#if tag}}
+    {{#if showToggleInfo}}
+      {{d-button icon="tag" class="btn-default" label="tagging.info" action=toggleInfo id="show-tag-info"}}
     {{/if}}
-  {{/unless}}
-{{/if}}
-
-{{#if tag}}
-  {{#if showToggleInfo}}
-    {{d-button icon="tag" class="btn-default" label="tagging.info" action=toggleInfo id="show-tag-info"}}
   {{/if}}
-{{/if}}
+
+  {{plugin-outlet name="before-create-topic-button" tagName=""
+    args=(hash
+      canCreateTopic=canCreateTopic
+      createTopicDisabled=createTopicDisabled
+      createTopicLabel=createTopicLabel)
+  }}
+
+  {{create-topic-button
+    canCreateTopic=canCreateTopic
+    action=(action "clickCreateTopicButton")
+    disabled=createTopicButtonDisabled
+    label=createTopicLabel
+    btnClass=createTopicClass
+    canCreateTopicOnTag=canCreateTopicOnTag
+  }}
+
+  {{#if category}}
+    {{#unless tag}}
+      {{!-- don't show category notification menu on tag pages --}}
+      {{#if showCategoryNotifications}}
+        {{category-notifications-button
+          value=category.notification_level
+          category=category
+          onChange=(action "changeCategoryNotificationLevel")
+        }}
+      {{/if}}
+    {{/unless}}
+  {{/if}}
+
+  {{#if tag}}
+    {{#unless category}}
+      {{!-- don't show tag notification menu on category pages --}}
+      {{#if showTagNotifications}}
+        {{tag-notifications-button
+          onChange=changeTagNotificationLevel
+          value=tagNotification.notification_level
+        }}
+      {{/if}}
+    {{/unless}}
+  {{/if}}
+
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-input.hbs b/app/assets/javascripts/discourse/app/templates/components/date-input.hbs
index b86c460441..65b7f6962f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/date-input.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/date-input.hbs
@@ -6,4 +6,6 @@
   input=(action "onChangeDate")
 }}
 
-<div class="picker-container"></div>
+{{#unless useGlobalPickerContainer}}
+  <div class="picker-container"></div>
+{{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs b/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs
index 0ec475f571..912e85951f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs
@@ -3,6 +3,7 @@
     date=date
     relativeDate=relativeDate
     onChange=(action "onChangeDate")
+    useGlobalPickerContainer=useGlobalPickerContainer
   }}
 {{/unless}}
 
@@ -19,12 +20,13 @@
     date=date
     relativeDate=relativeDate
     onChange=(action "onChangeDate")
+    useGlobalPickerContainer=useGlobalPickerContainer
   }}
 {{/if}}
 
 {{#if clearable}}
   {{d-button
-    class="clear-date-time"
+    class="btn-default clear-date-time"
     icon="times"
     action=(action "onClear")
   }}
diff --git a/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs b/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
index d7eb83adb9..2285c9ee33 100644
--- a/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
@@ -1 +1 @@
-{{tagRecord.id}}
\ No newline at end of file
+{{tagRecord.id}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs
index e5ec4c44d1..9bdf5744d4 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs
@@ -9,7 +9,7 @@
   {{category-name-fields category=category tagName=""}}
 
   {{#if canSelectParentCategory}}
-    <section class="field">
+    <section class="field parent-category">
       <label>{{i18n "category.parent"}}</label>
       {{category-chooser
         value=category.parent_category_id
@@ -27,7 +27,7 @@
   {{/if}}
 
   {{#if subCategories}}
-    <section class="field">
+    <section class="field subcategories">
       <label>{{i18n "categories.subcategories"}}</label>
       {{#each subCategories as |s|}}
         {{category-badge s hideParent="true"}}
@@ -36,7 +36,7 @@
   {{/if}}
 
   {{#if showDescription}}
-    <section class="field">
+    <section class="field description">
       <label>{{i18n "category.description"}}</label>
       {{#if category.description}}
         {{html-safe category.description}}
@@ -50,8 +50,13 @@
     </section>
   {{/if}}
 
-  {{#unless noCategoryStyle}}
-    <section class="field">
+  <section class="field category-colors">
+    {{#if noCategoryStyle}}
+      <label>
+        {{d-icon "exclamation-triangle"}}
+        {{i18n "category.colors_disabled"}}
+      </label>
+    {{else}}
       <label>{{i18n "category.badge_colors"}}</label>
       <div class="category-color-editor">
         {{html-safe categoryBadgePreview}}
@@ -66,12 +71,12 @@
 
         <div class="input-prepend input-append">
           <span class="color-title">{{i18n "category.foreground_color"}}:</span>
-          <div class="colorpicker-wrapper">
+          <div class="colorpicker-wrapper 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>
-    </section>
-  {{/unless}}
+    {{/if}}
+  </section>
 </form>
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
index e55962d806..b18e438548 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
@@ -1,4 +1,4 @@
-<section class="field">
+<section class="field category-logo">
   <label>{{i18n "category.logo"}}</label>
   {{image-uploader
     imageUrl=logoImageUrl
@@ -8,7 +8,7 @@
     class="no-repeat contain-image"}}
 </section>
 
-<section class="field">
+<section class="field category-background-image">
   <label>{{i18n "category.background_image"}}</label>
   {{image-uploader
     imageUrl=backgroundImageUrl
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 33e59c3a3b..78c3414a36 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
@@ -9,13 +9,13 @@
   {{/if}}
 
   {{#unless showPositionInput}}
-    <section class="field">
+    <section class="field position-disabled">
       {{i18n "category.position_disabled"}}
       <a href={{get-url "/admin/site_settings/category/basic"}}>{{i18n "category.position_disabled_click"}}</a>
     </section>
   {{/unless}}
 
-  <section class="field">
+  <section class="field num-featured-topics">
     <label for="category-number-featured-topics">
       {{#if category.parent_category_id}}
         {{i18n "category.subcategory_num_featured_topics"}}
@@ -26,7 +26,7 @@
     {{text-field value=category.num_featured_topics id="category-number-featured-topics" type="number"}}
   </section>
 
-  <section class="field">
+  <section class="field search-priority">
     <label for="category-search-priority">
       {{i18n "category.search_priority.label"}}
     </label>
@@ -54,7 +54,7 @@
   {{/if}}
 
   {{#if siteSettings.topic_featured_link_enabled}}
-    <section class="field">
+    <section class="field topic-featured-link-allowed">
       <div class="allowed-topic-featured-link-category">
         <label class="checkbox-label">
           {{input type="checkbox" checked=category.topic_featured_link_allowed}}
@@ -64,25 +64,32 @@
     </section>
   {{/if}}
 
-  <section class="field">
+  <section class="field navigate-to-first-post-after-read">
     <label>
       {{input type="checkbox" checked=category.navigate_to_first_post_after_read}}
       {{i18n "category.navigate_to_first_post_after_read"}}
     </label>
   </section>
 
-  <section class="field">
+  <section class="field all-topics-wiki">
     <label>
       {{input type="checkbox" checked=category.all_topics_wiki}}
       {{i18n "category.all_topics_wiki"}}
     </label>
   </section>
+
+  <section class="field allow-unlimited-owner-edits-on-first-post">
+    <label>
+      {{input type="checkbox" checked=category.allow_unlimited_owner_edits_on_first_post}}
+      {{i18n "category.allow_unlimited_owner_edits_on_first_post"}}
+    </label>
+  </section>
 </section>
 
 <section>
   <h3>{{i18n "category.settings_sections.moderation"}}</h3>
   {{#if siteSettings.enable_category_group_moderation}}
-    <section class="field">
+    <section class="field reviewable-by-group">
       <label for="reviewable-by-group">
         {{i18n "category.reviewable_by_group"}}
       </label>
@@ -95,26 +102,32 @@
     </section>
   {{/if}}
 
-  <section class="field">
+  <section class="field require-topic-approval">
     <label>
       {{input type="checkbox" checked=category.custom_fields.require_topic_approval}}
       {{i18n "category.require_topic_approval"}}
     </label>
   </section>
 
-  <section class="field">
+  <section class="field require-reply-approval">
     <label>
       {{input type="checkbox" checked=category.custom_fields.require_reply_approval}}
       {{i18n "category.require_reply_approval"}}
     </label>
   </section>
 
-  <section class="field">
+  <section class="field auto-close">
     <div class="control-group">
       <label for="topic-auto-close">
         {{i18n "topic.auto_close.label"}}
       </label>
-      {{text-field value=category.auto_close_hours id="topic-auto-close" type="number"}}
+      <div class="category-topic-auto-close-hours">
+        {{relative-time-picker
+            id="topic-auto-close"
+            durationHours=category.auto_close_hours
+            hiddenIntervals=hiddenRelativeIntervals
+            onChange=(action "onAutoCloseDurationChange")}}
+      </div>
       <label>
         {{input type="checkbox" checked=category.auto_close_based_on_last_post}}
         {{i18n "topic.auto_close.based_on_last_post"}}
@@ -131,7 +144,7 @@
     </section>
   {{/if}}
 
-  <section class="field">
+  <section class="field num-auto-bump-daily">
     <label for="category-number-daily-bump">
       {{i18n "category.num_auto_bump_daily"}}
     </label>
@@ -176,7 +189,7 @@
     </div>
   </section>
 
-  <section class="field">
+  <section class="field sort-order">
     <label for="category-sort-order">
       {{i18n "category.sort_order"}}
     </label>
@@ -205,7 +218,7 @@
     </div>
   </section>
 
-  <section class="field">
+  <section class="field default-filter">
     <label for="category-default-filter">
       {{i18n "category.default_list_filter"}}
     </label>
@@ -264,7 +277,7 @@
   <h3>{{i18n "category.settings_sections.email"}}</h3>
 
   {{#if emailInEnabled}}
-    <section class="field">
+    <section class="field category-email-in">
       <label for="category-email-in">
         {{d-icon "far-envelope"}}
         {{i18n "category.email_in"}}
@@ -272,14 +285,14 @@
       {{text-field id="category-email-in" class="email-in" value=category.email_in}}
     </section>
 
-    <section class="field">
+    <section class="field email-in-allow-strangers">
       <label>
         {{input type="checkbox" checked=category.email_in_allow_strangers}}
         {{i18n "category.email_in_allow_strangers"}}
       </label>
     </section>
 
-    <section class="field">
+    <section class="field mailinglist-mirror">
       <label>
         {{input type="checkbox" checked=category.mailinglist_mirror}}
         {{i18n "category.mailinglist_mirror"}}
@@ -290,7 +303,7 @@
   {{/if}}
 
   {{#unless emailInEnabled}}
-    <section class="field">
+    <section class="field email-in-disabled">
       {{i18n "category.email_in_disabled"}}
       <a href={{get-url "/admin/site_settings/category/email"}}>{{i18n "category.email_in_disabled_click"}}</a>
     </section>
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
index 3eb4b61c50..b8dc211c2c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
@@ -1,4 +1,4 @@
-<section class="field">
+<section class="field allowed-tags">
   <label for="category-allowed-tags">{{i18n "category.tags_allowed_tags"}}</label>
   {{tag-chooser
     id="category-allowed-tags"
@@ -13,7 +13,7 @@
   }}
 </section>
 
-<section class="field">
+<section class="field allowed-tag-groups">
   <label for="category-allowed-tag-groups">{{i18n "category.tags_allowed_tag_groups"}}</label>
   {{tag-group-chooser
     id="category-allowed-tag-groups"
@@ -22,27 +22,27 @@
   {{#link-to "tagGroups" class="manage-tag-groups"}}{{i18n "category.manage_tag_groups_link"}}{{/link-to}}
 </section>
 
-<section class="field">
+<section class="field allow-global-tags">
   <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">
+<section class="field tags-tab-description">
   {{i18n "category.tags_tab_description"}}
 </section>
 
-<section class="field">
+<section class="field required-tag-group-description">
   {{i18n "category.required_tag_group_description"}}
 </section>
 
 <section class="field with-items">
-  <section class="field-item">
+  <section class="field-item min-tags-from-required-group">
     <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">
+  <section class="field-item required-tag-group">
     <label>{{i18n "category.required_tag_group_label"}}</label>
     {{tag-group-chooser
       id="category-required-tag-group"
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
index 0303a494a6..f2b4aca37c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
@@ -4,12 +4,12 @@
       class="timer-type"
       onChange=onChangeStatusType
       content=timerTypes
-      value=selection
+      value=statusType
     }}
   </div>
   {{#if publishToCategory}}
     <div class="control-group">
-      <label>{{i18n "topic.topic_status_update.publish_to"}}</label>
+      <label class="control-label">{{i18n "topic.topic_status_update.publish_to"}}</label>
       {{category-chooser
         value=topicTimer.category_id
         excludeCategoryId=excludeCategoryId
@@ -18,20 +18,35 @@
     </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
+    <label class="control-label">{{i18n "topic.topic_status_update.when"}}</label>
+    {{time-shortcut-picker
+      prefilledDatetime=topicTimer.execute_at
+      onTimeSelected=onTimeSelected
+      customOptions=customTimeShortcutOptions
+      hiddenOptions=hiddenTimeShortcutOptions
+      mousetrap=_mousetrap
+    }}
+  {{/if}}
+  {{#if useDuration}}
+    <div class="controls">
+      <label class="control-label">Duration</label>
+      {{relative-time-picker onChange=(action "durationChanged") durationMinutes=(readonly topicTimer.duration_minutes)}}
+    </div>
+  {{/if}}
+  {{#if willCloseImmediately}}
+    <div class="warning">
+      {{d-icon "exclamation-triangle"}}
+      {{willCloseI18n}}
+    </div>
+  {{/if}}
+  {{#if showTopicTimerInfo}}
+    <div class="alert alert-info modal-topic-timer-info">
+      {{topic-timer-info
+        statusType=statusType
+        executeAt=executeAt
         basedOnLastPost=topicTimer.based_on_last_post
-        onChangeInput=onChangeInput
-        onChangeDuration=onChangeDuration
+        durationMinutes=topicTimer.duration_minutes
         categoryId=topicTimer.category_id
-        lastPostedAt=model.last_posted_at
-        isBasedOnDuration=autoDeleteReplies
-        durationType=durationType
       }}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-group-sections.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-group-sections.hbs
index 581c54d34f..82ada7fe25 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-group-sections.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-group-sections.hbs
@@ -8,7 +8,7 @@
   <div class="section-group">
     {{replace-emoji ":grinning:" (hash lazy=true)}}
     {{replace-emoji ":smiley:" (hash lazy=true)}}
-    {{replace-emoji ":smile:" (hash lazy=true)}}
+    {{replace-emoji ":grinning_face_with_smiling_eyes:" (hash lazy=true)}}
     {{replace-emoji ":grin:" (hash lazy=true)}}
     {{replace-emoji ":laughing:" (hash lazy=true)}}
     {{replace-emoji ":sweat_smile:" (hash lazy=true)}}
@@ -78,6 +78,7 @@
     {{replace-emoji ":flushed:" (hash lazy=true)}}
     {{replace-emoji ":pleading_face:" (hash lazy=true)}}
     {{replace-emoji ":frowning:" (hash lazy=true)}}
+    {{replace-emoji ":frowning_face_with_open_mouth:" (hash lazy=true)}}
     {{replace-emoji ":anguished:" (hash lazy=true)}}
     {{replace-emoji ":fearful:" (hash lazy=true)}}
     {{replace-emoji ":cold_sweat:" (hash lazy=true)}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
index f5873c44a1..68b2c0865c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
@@ -7,7 +7,7 @@
         </button>
       {{/if}}
 
-      {{emoji-group-buttons onCategorySelection=(action "onCategorySelection")}}
+      {{emoji-group-buttons onCategorySelection=(action "onCategorySelection") tagName=""}}
 
       {{#each-in customEmojis as |group emojis|}}
         <button type="button" data-section={{concat "custom-" group}} {{action "onCategorySelection" (concat "custom-" group)}} class="btn btn-default category-button emoji">
@@ -84,7 +84,7 @@
             {{d-button
               icon=diversityScale.icon
               class=(concat "diversity-scale " diversityScale.name)
-              title=(concat "emoji_picker." diversityScale.name "_tone")
+              title=diversityScale.title
               action=(action "onDiversitySelection" index)
             }}
           {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
index 937d05c1d5..c6a04a2d69 100644
--- a/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
@@ -2,11 +2,4 @@
 <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>
-    <a href={{topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
-  </div>
-{{else}}
-  <a href={{topic.lastPostUrl}} class="last-posted-at">{{format-age topic.last_posted_at}}</a>
-{{/if}}
+<a href={{topic.lastPostUrl}} class="last-posted-at">{{format-age topic.last_posted_at}}</a>
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 43c7e421e0..bb629c4527 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
@@ -1,26 +1,24 @@
 <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
-        includeNow=includeNow
-        clearable=clearable
-        onChangeInput=onChangeInput
-        onChange=(action (mut selection))
-        options=(hash
-          none="topic.auto_update_input.none"
-        )
-      }}
-    </div>
-  {{/unless}}
+  <div class="control-group">
+    <label class={{labelClasses}}>{{displayLabel}}</label>
+    {{future-date-input-selector
+      minimumResultsForSearch=-1
+      statusType=statusType
+      value=(readonly selection)
+      input=(readonly input)
+      includeDateTime=includeDateTime
+      includeWeekend=includeWeekend
+      includeFarFuture=includeFarFuture
+      includeMidFuture=includeMidFuture
+      includeNow=includeNow
+      clearable=clearable
+      onChangeInput=onChangeInput
+      onChange=(action (mut selection))
+      options=(hash
+        none="topic.auto_update_input.none"
+      )
+    }}
+  </div>
 
   {{#if displayDateAndTimePicker}}
     <div class="control-group">
@@ -37,32 +35,4 @@
       {{input placeholder="--:--" type="time" class="time-input" value=time disabled=timeInputDisabled}}
     </div>
   {{/if}}
-
-  {{#if displayNumberInput}}
-    <div class="control-group">
-      <label>
-        {{durationLabel}}
-        {{text-field value=duration type="number"}}
-      </label>
-    </div>
-
-    {{#if willCloseImmediately}}
-      <div class="warning">
-        {{d-icon "exclamation-triangle"}}
-        {{willCloseI18n}}
-      </div>
-    {{/if}}
-  {{/if}}
-
-  {{#if showTopicStatusInfo}}
-    <div class="alert alert-info">
-      {{topic-timer-info
-        statusType=statusType
-        executeAt=executeAt
-        basedOnLastPost=basedOnLastPost
-        duration=duration
-        categoryId=categoryId
-      }}
-    </div>
-  {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/google-search.hbs b/app/assets/javascripts/discourse/app/templates/components/google-search.hbs
index cbe90dcbce..16b84de567 100644
--- a/app/assets/javascripts/discourse/app/templates/components/google-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/google-search.hbs
@@ -1,6 +1,6 @@
 <div>
   <form action="//google.com/search" id="google-search">
-    <input type="text" name="q" value={{searchTerm}}>
+    <input type="text" name="q" aria-label={{i18n "search.search_google"}} value={{searchTerm}}>
     <input name="as_sitesearch" value={{siteUrl}} type="hidden">
     <button class="btn btn-primary" type="submit">{{i18n "search.search_google_button"}}</button>
   </form>
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 8638d6d7e4..42d032eb68 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
@@ -55,7 +55,7 @@
       <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>
+            <a {{action "close"}} href={{user.path}} 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/app/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs
index f198b7bb63..94f140f845 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
@@ -2,13 +2,13 @@
   <label class="control-label" for="flair_url">{{i18n "groups.flair_url"}}</label>
 
   <div class="radios">
-    <label class="radio-label" for="avatar-flair">
-      {{radio-button name="avatar-flair" value="icon" selection=model.flair_type}}
+    <label class="radio-label" for="avatar-flair-icon">
+      {{radio-button name="avatar-flair-icon" id="avatar-flair-icon" 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}}
+    <label class="radio-label" for="avatar-flair-image">
+      {{radio-button name="avatar-flair-image" id="avatar-flair-image" value="image" selection=model.flair_type}}
       <b>{{i18n "groups.flair_type.image"}}</b>
     </label>
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs
index f4c4ef7a93..d439d39c87 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs
@@ -1,6 +1,3 @@
 {{#if value}}
-  {{#d-button class="btn-default group-manage-logs-filter" action=(action "clearFilter") actionParam=type}}
-    <span>{{label}}</span>: {{filterText}}
-    {{d-icon "times-circle"}}
-  {{/d-button}}
+  {{d-button class="btn-default group-manage-logs-filter" action=(action "clearFilter") actionParam=type icon="times-circle" translatedLabel=(concat label ": " filterText)}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs
index d835fb97c6..79466b9d98 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs
@@ -1,33 +1,23 @@
 <tr class="group-manage-logs-row">
   <td>
-    {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.action key="action")}}
-      {{log.actionTitle}}
-    {{/d-button}}
+    {{d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.action key="action") translatedLabel=log.actionTitle}}
   </td>
 
   <td>
     <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}}
-    {{/d-button}}
+    {{d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.acting_user.username key="acting_user") translatedLabel=log.acting_user.username}}
   </td>
 
   <td>
     {{#if log.target_user}}
       <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}}
-      {{/d-button}}
+      {{d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.target_user.username key="target_user") translatedLabel=log.target_user.username}}
     {{/if}}
   </td>
 
   <td>
     {{#if log.subject}}
-      {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.subject key="subject")}}
-        {{log.subject}}
-      {{/d-button}}
+      {{d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.subject key="subject") translatedLabel=log.subject}}
     {{/if}}
   </td>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs
index a01cf4d384..11b4167c70 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs
@@ -1,11 +1,9 @@
 <div class="control-group buttons">
-  {{#d-button action=(action "save")
+  {{d-button action=(action "save")
     disabled=saving
     class="btn btn-primary group-manage-save"
+    translatedLabel=savingText
   }}
-    {{savingText}}
-  {{/d-button}}
-
   {{#if saved}}
     <span>{{i18n "saved"}}</span>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs
index ad8d9a2da6..8f2b8353fe 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs
@@ -1,6 +1,6 @@
 {{#if canJoinGroup}}
   {{d-button action=(action "joinGroup")
-      class="group-index-join"
+      class="btn-default group-index-join"
       icon="user-plus"
       label="groups.join"
       disabled=updatingMembership}}
@@ -12,7 +12,7 @@
       disabled=updatingMembership}}
 {{else if canRequestMembership}}
   {{d-button action=(action "showRequestMembershipForm")
-      class="group-index-request"
+      class="btn-default group-index-request"
       disabled=loading
       icon="user-plus"
       label="groups.request"}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs
index 316c8882ab..8b37b67c40 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/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"}}
   {{#if site.mobileView}}
     <li>
       {{#link-to "groups.index"}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-post.hbs b/app/assets/javascripts/discourse/app/templates/components/group-post.hbs
index 25c500b782..9e65838e70 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-post.hbs
@@ -12,10 +12,11 @@
       </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}}
+    {{#if post.user}}
+      <div class="group-member-info names">
+        <span class="name">{{name}}</span>
+        {{#if post.user.title}}<span class="user-title">{{post.user.title}}</span>{{/if}}
+        {{plugin-outlet name="group-post-additional-member-info" noTags=true args=(hash user=post.user)}}
       </div>
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-email-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-email-fields.hbs
index 555282097f..386935c16c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-form-email-fields.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/groups-form-email-fields.hbs
@@ -68,4 +68,15 @@
       {{i18n "groups.manage.email.mailboxes.none_found"}}
     {{/if}}
   </div>
+
+  <div class="control-group">
+    <label class="control-label">{{i18n "groups.manage.email.settings.title"}}</label>
+  </div>
+  <div class="control-group">
+    <label class="control-group-inline" for="allow_unknown_sender_topic_replies">
+      {{input type="checkbox" name="allow_unknown_sender_topic_replies" id="allow_unknown_sender_topic_replies" checked=model.allow_unknown_sender_topic_replies}}
+      <span>{{i18n "groups.manage.email.settings.allow_unknown_sender_topic_replies"}}</span>
+    </label>
+    <p>{{i18n "groups.manage.email.settings.allow_unknown_sender_topic_replies_hint"}}</p>
+  </div>
 {{/if}}
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 12bcf7b137..82725adc49 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
@@ -94,10 +94,11 @@
   <label>{{i18n "groups.notification_level"}}</label>
 
   {{notifications-button
-    value=model.default_notification_level
+    value=defaultNotificationLevel
     class="groups-form-default-notification-level"
     options=(hash
       i18nPrefix="groups.notifications"
     )
+    onChange=(action (mut model.default_notification_level))
   }}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
index 03a6813bf2..bce462add0 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
@@ -1,3 +1,45 @@
+<div class="control-group">
+  <label class="control-label">{{i18n "groups.manage.membership.access"}}</label>
+
+  <label>
+    {{input type="checkbox"
+        class="group-form-public-admission"
+        checked=model.public_admission
+        disabled=disablePublicSetting}}
+
+    {{i18n "groups.public_admission"}}
+  </label>
+
+  <label>
+    {{input type="checkbox"
+        class="group-form-public-exit"
+        checked=model.public_exit}}
+
+    {{i18n "groups.public_exit"}}
+  </label>
+
+  <label>
+    {{input type="checkbox"
+        class="group-form-allow-membership-requests"
+        checked=model.allow_membership_requests
+        disabled=disableMembershipRequestSetting}}
+
+    {{i18n "groups.allow_membership_requests"}}
+  </label>
+
+  {{#if model.allow_membership_requests}}
+    <div>
+      <label for="membership-request-template">
+        {{i18n "groups.membership_request_template"}}
+      </label>
+
+      {{expanding-text-area name="membership-request-template"
+          class="group-form-membership-request-template input-xxlarge"
+          value=model.membership_request_template}}
+    </div>
+  {{/if}}
+</div>
+
 {{#if model.can_admin_group}}
   <div class="control-group">
     <label class="control-label">{{i18n "admin.groups.manage.membership.automatic"}}</label>
@@ -41,48 +83,23 @@
 
       {{i18n "admin.groups.manage.membership.primary_group"}}
     </label>
+  </div>
 
+  <div class="control-group">
+    <label class="control-label" for="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"}}
+    </div>
   </div>
 {{/if}}
 
-<div class="control-group">
-  <label class="control-label">{{i18n "groups.manage.membership.access"}}</label>
-
-  <label>
-    {{input type="checkbox"
-        class="group-form-public-admission"
-        checked=model.public_admission
-        disabled=disablePublicSetting}}
-
-    {{i18n "groups.public_admission"}}
-  </label>
-
-  <label>
-    {{input type="checkbox"
-        class="group-form-public-exit"
-        checked=model.public_exit}}
-
-    {{i18n "groups.public_exit"}}
-  </label>
-
-  <label>
-    {{input type="checkbox"
-        class="group-form-allow-membership-requests"
-        checked=model.allow_membership_requests
-        disabled=disableMembershipRequestSetting}}
-
-    {{i18n "groups.allow_membership_requests"}}
-  </label>
-
-  {{#if model.allow_membership_requests}}
-    <div>
-      <label for="membership-request-template">
-        {{i18n "groups.membership_request_template"}}
-      </label>
-
-      {{expanding-text-area name="membership-request-template"
-          class="group-form-membership-request-template input-xxlarge"
-          value=model.membership_request_template}}
-    </div>
-  {{/if}}
-</div>
+{{#if canEdit}}
+  <div class="control-group">
+    {{group-flair-inputs model=model}}
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs
index d9590bbb21..e8ef91e4a2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs
@@ -19,20 +19,6 @@
         class="input-xxlarge group-form-full-name"
         value=model.full_name}}
   </div>
-
-  {{#if this.currentUser.can_create_group}}
-    <div class="control-group">
-      <label class="control-label" for="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"}}
-      </div>
-    </div>
-  {{/if}}
 {{/if}}
 
 <div class="control-group">
@@ -40,12 +26,14 @@
   {{d-editor value=model.bio_raw class="group-form-bio input-xxlarge"}}
 </div>
 
-{{#if canEdit}}
-  {{yield}}
-
+{{#if model.automatic}}
   <div class="control-group">
     {{group-flair-inputs model=model}}
   </div>
+{{/if}}
+
+{{#if canEdit}}
+  {{yield}}
 
   {{plugin-outlet name="group-edit" args=(hash group=model)}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/hidden-details.hbs b/app/assets/javascripts/discourse/app/templates/components/hidden-details.hbs
new file mode 100644
index 0000000000..b7dc645453
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/hidden-details.hbs
@@ -0,0 +1,9 @@
+{{#unless expanded}}
+  {{d-button
+    action=(action "expand")
+    class="btn-link"
+    label=label}}
+{{/unless}}
+{{#if expanded}}
+  <span class="description" aria-live="assertive">{{details}}</span>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/html-with-links.hbs b/app/assets/javascripts/discourse/app/templates/components/html-with-links.hbs
new file mode 100644
index 0000000000..889d9eeadc
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/html-with-links.hbs
@@ -0,0 +1 @@
+{{yield}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs b/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
index 73e122024d..44f88763ec 100644
--- a/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
@@ -6,4 +6,4 @@
   {{/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>{{d-button action=(action "newIgnoredUser") class="btn-default" icon="plus" label="user.user_notifications.add_ignored_user"}}</div>
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
index 17f2e30bfb..75bbb20e4a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs
@@ -26,7 +26,7 @@
       <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}}
+      {{input type="number" value=maxRedemptionAllowed class="max-redemptions-allowed-input" min="1" max=siteSettings.invite_link_max_redemptions_limit}}
     </div>
 
     <div class="invite-link-expires-at">
diff --git a/app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs
index 8a655640e9..f78860493d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs
@@ -7,7 +7,7 @@
 <div class="body">
   {{#if inviteModel.finished}}
     {{#if inviteModel.inviteLink}}
-      {{generated-invite-link link=inviteModel.inviteLink email=emailOrUsername}}
+      {{generated-invite-link link=inviteModel.inviteLink email=invitee}}
     {{else}}
       <div class="success-message">
         {{html-safe successMessage}}
@@ -18,24 +18,23 @@
       <label class="instructions">{{inviteInstructions}}</label>
       <div class="invite-user-input-wrapper">
         {{#if allowExistingMembers}}
-          {{user-selector
-            fullWidthWrap=true
-            single=true
-            allowAny=true
-            excludeCurrentUser=true
-            includeMessageableGroups=isPM
-            hasGroups=hasGroups
-            usernames=emailOrUsername
-            placeholderKey=placeholderKey
-            allowEmails=canInviteViaEmail
+          {{email-group-user-chooser
             class="invite-user-input"
-            autocomplete="discourse"
-            value=emailOrUsername
+            value=invitee
+            onChange=(action "updateInvitee")
+            options=(hash
+              maximum=1
+              allowEmails=canInviteViaEmail
+              excludeCurrentUser=true
+              includeMessageableGroups=isPM
+              filterPlaceholder=placeholderKey
+              fullWidthWrap=true
+            )
           }}
         {{else}}
           {{text-field
             class="email-or-username-input"
-            value=emailOrUsername
+            value=invitee
             placeholderKey="topic.invite_reply.email_placeholder"}}
         {{/if}}
         {{#if capabilities.hasContactPicker}}
@@ -88,7 +87,7 @@
   {{#if inviteModel.finished}}
     {{d-button
       class="btn-primary"
-      action=(route-action "closeModal")
+      action=(action "sendCloseModal")
       label="close"}}
   {{else}}
     {{d-button
@@ -100,7 +99,7 @@
     {{#if showCopyInviteButton}}
       {{d-button
         icon="link"
-        action=(action "generateInvitelink")
+        action=(action "generateInviteLink")
         class="btn-primary generate-invite-link"
         disabled=disabledCopyLink
         label="user.invited.generate_link"}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs
index b6980b39d5..fe70b9cdb9 100644
--- a/app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs
@@ -45,13 +45,12 @@
         {{i18n "ip_lookup.other_accounts"}}
         <strong>{{totalOthersWithSameIP}}</strong>
         {{#if other_accounts.length}}
-          {{#d-button
+          {{d-button
             class="btn-danger pull-right"
             action=(action "deleteOtherAccounts")
             icon="exclamation-triangle"
+            translatedLabel=(i18n "ip_lookup.delete_other_accounts" count=otherAccountsToDelete)
           }}
-            {{i18n "ip_lookup.delete_other_accounts" count=otherAccountsToDelete}}
-          {{/d-button}}
         {{/if}}
       </dt>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/json-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/json-editor.hbs
new file mode 100644
index 0000000000..3c21d434dd
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/json-editor.hbs
@@ -0,0 +1,12 @@
+{{#d-modal-body rawTitle=(i18n "admin.site_settings.json_schema.modal_title" name=settingName)}}
+
+  <div id="json-editor-holder"></div>
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button
+    class="btn-primary"
+    action=(action "saveChanges")
+    label="save"
+  }}
+</div>
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 f89043711a..754d9fdd47 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
@@ -2,6 +2,7 @@
   {{#user-link user=topic.lastPosterUser}}
     {{avatar topic.lastPosterUser imageSize="large"}}
   {{/user-link}}
+  {{user-avatar-flair user=topic.lastPosterUser}}
   {{#if topic.lastPosterGroup}}
     {{avatar-flair
       flairURL=topic.lastPosterGroup.flair_url
diff --git a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
index c81a7745ea..bc2bc0aba9 100644
--- a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
@@ -10,12 +10,3 @@
     {{b.title}}
   </button>
 {{/each}}
-
-{{#if showLoginWithEmailLink}}
-  {{d-button
-    action=emailLogin
-    label="email_login.button_label"
-    disabled=processingEmailLink
-    icon="far-envelope"
-    class="login-with-email-button"}}
-{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs b/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
index 58e4b1a693..dbf5cc2922 100644
--- a/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
@@ -32,7 +32,7 @@
       {{#if showTopics}}
         <td class="latest">
           {{#each category.featuredTopics as |t|}}
-            {{featured-topic topic=t latestTopicOnly=latestTopicOnly}}
+            {{featured-topic topic=t}}
           {{/each}}
         </td>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
new file mode 100644
index 0000000000..10b6ef9435
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
@@ -0,0 +1,9 @@
+<div class="relative-time-picker">
+  {{input class="relative-time-duration" min=durationMin step=durationStep type="number" value=duration onChange=(action "onChangeDuration")}}
+  {{combo-box
+    content=intervals
+    value=selectedInterval
+    class="relative-time-intervals"
+    onChange=(action "onChangeInterval")
+  }}
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs
index 1455e3f4e0..c40ac432c3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs
@@ -8,6 +8,7 @@
     options=(hash
       icon=bundle.icon
       disabled=reviewableUpdating
+      placement=placement
     )
   }}
 {{else}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs
index 3302312732..553f12d588 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs
@@ -1,12 +1,6 @@
 <div class="flagged-post-header">
   {{reviewable-topic-link reviewable=reviewable tagName=""}}
-  {{#if hasEdits}}
-    <a href {{action "showEditHistory"}}
-      class="has-edits {{historyClass}}"
-      title="{{i18n "post.last_edited_on"}} {{editedDate}}">
-      {{d-icon "pencil-alt"}}
-    </a>
-  {{/if}}
+  {{reviewable-post-edits reviewable=reviewable tagName=""}}
 </div>
 
 <div class="post-contents-wrapper">
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
new file mode 100644
index 0000000000..e6f758133c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
@@ -0,0 +1,7 @@
+{{#if hasEdits}}
+  <a href {{action "showEditHistory"}}
+    class="has-edits {{historyClass}}"
+    title={{i18n "post.last_edited_on" dateTime=editedDate}}>
+    {{d-icon "pencil-alt"}}
+  </a>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-post.hbs
new file mode 100644
index 0000000000..27310675a1
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-post.hbs
@@ -0,0 +1,19 @@
+<div class="flagged-post-header">
+  {{reviewable-topic-link reviewable=reviewable tagName=""}}
+  {{reviewable-post-edits reviewable=reviewable tagName=""}}
+</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">
+      {{#if reviewable.blank_post}}
+        <p>{{i18n "review.deleted_post"}}</p>
+      {{else}}
+        {{html-safe reviewable.cooked}}
+      {{/if}}
+    </div>
+    {{yield}}
+  </div>
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs
index 2860b51b82..4b9a0d8e86 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs
@@ -1,7 +1,7 @@
 <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">{{html-safe reviewable.topic.fancyTitle}}</a>
     {{category-badge reviewable.category}}
     {{reviewable-tags tags=reviewable.topic_tags tagName=""}}
   {{else if (has-block)}}
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 f7476919c2..9e246ed2c6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs
@@ -34,6 +34,10 @@
       </div>
     {{/if}}
 
+    {{reviewable-field classes="reviewable-user-details reject-reason"
+                       name=(i18n "review.user.reject_reason")
+                       value=reviewable.reject_reason}}
+
     {{#each userFields as |f|}}
       {{reviewable-field classes="reviewable-user-details user-field"
                          name=f.name
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
index c717b704d2..03b0a9a4d8 100644
--- a/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
@@ -7,6 +7,7 @@
     </label>
     <div class="controls">
       {{user-chooser
+        id="search-posted-by"
         value=searchedTerms.username
         onChange=(action "onChangeSearchTermForUsername")
         options=(hash
@@ -20,6 +21,7 @@
     <label class="control-label" for="search-in-category">{{i18n "search.advanced.in_category.label"}}</label>
     <div class="controls">
       {{search-advanced-category-chooser
+        id="search-in-category"
         value=searchedTerms.category.id
         onChange=(action "onChangeSearchTermForCategory")
       }}
@@ -33,6 +35,7 @@
       <label class="control-label" for="search-with-tags">{{i18n "search.advanced.with_tags.label"}}</label>
       <div class="controls">
         {{tag-chooser
+          id="search-with-tags"
           tags=searchedTerms.tags
           allowCreate=false
           everyTag=true
@@ -57,66 +60,76 @@
 
 <div class="container advanced-search-topics-posts-group">
   <div class="control-group pull-left">
-    <label class="control-label" for="search-in-options">{{i18n "search.advanced.filters.label"}}</label>
     <div class="controls">
-      {{#if currentUser}}
-        <section class="field">
-          <label>
+      <fieldset class="grouped-control">
+        <legend class="grouped-control-label" for="search-in-options">{{i18n "search.advanced.filters.label"}}</legend>
+
+        {{#if currentUser}}
+          <div class="grouped-control-field">
             {{input
+              id="matching-title-only"
               type="checkbox"
               class="in-title"
               checked=searchedTerms.special.in.title
               click=(action "onChangeSearchTermForSpecialInTitle" value="target.checked")
             }}
-            {{i18n "search.advanced.filters.title"}}
-          </label>
-          <label>
+            <label for="matching-title-only">
+              {{i18n "search.advanced.filters.title"}}
+            </label>
+          </div>
+
+          <div class="grouped-control-field">
             {{input
+              id="matching-liked"
               type="checkbox"
               class="in-likes"
               checked=searchedTerms.special.in.likes
               click=(action "onChangeSearchTermForSpecialInLikes" value="target.checked")
             }}
-            {{i18n "search.advanced.filters.likes"}}
-          </label>
-          <label>
+            <label for="matching-liked">{{i18n "search.advanced.filters.likes"}}</label>
+          </div>
+
+          <div class="grouped-control-field">
             {{input
+              id="matching-in-messages"
               type="checkbox"
               class="in-private"
               checked=searchedTerms.special.in.personal
               click=(action "onChangeSearchTermForSpecialInPersonal" value="target.checked")
             }}
-            {{i18n "search.advanced.filters.private"}}
-          </label>
-          <label>
+            <label for="matching-in-messages">{{i18n "search.advanced.filters.private"}}</label>
+          </div>
+
+          <div class="grouped-control-field">
             {{input
+              id="matching-seen"
               type="checkbox"
               class="in-seen"
               checked=searchedTerms.special.in.seen
               click=(action "onChangeSearchTermForSpecialInSeen" value="target.checked")
             }}
-            {{i18n "search.advanced.filters.seen"}}
-          </label>
-        </section>
-      {{/if}}
-      {{combo-box
-        id="in"
-        valueProperty="value"
-        content=inOptions
-        value=searchedTerms.in
-        onChange=(action "onChangeSearchTermForIn")
-        options=(hash
-          none="user.locale.any"
-          clearable=true
-        )
-      }}
+            <label for="matching-seen">{{i18n "search.advanced.filters.seen"}}</label>
+          </div>
+        {{/if}}
+        {{combo-box
+          id="in"
+          valueProperty="value"
+          content=inOptions
+          value=searchedTerms.in
+          onChange=(action "onChangeSearchTermForIn")
+          options=(hash
+            none="user.locale.any"
+            clearable=true
+          )
+        }}
+      </fieldset>
     </div>
   </div>
   <div class="control-group pull-left">
     <label class="control-label" for="search-status-options">{{i18n "search.advanced.statuses.label"}}</label>
     <div class="controls">
       {{combo-box
-        id="status"
+        id="search-status-options"
         valueProperty="value"
         content=statusOptions
         value=searchedTerms.status
@@ -179,7 +192,7 @@
   </div>
 
   <div class="count-group control-group pull-left">
-    <label class="control-label">{{i18n "search.advanced.views.label"}}</label>
+    <label class="control-label" for="search-min-views">{{i18n "search.advanced.views.label"}}</label>
     <div class="count pull-left">
       <div class="controls">
         {{input
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-result-entries.hbs b/app/assets/javascripts/discourse/app/templates/components/search-result-entries.hbs
new file mode 100644
index 0000000000..ebc30486f3
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/search-result-entries.hbs
@@ -0,0 +1,5 @@
+<div class="fps-result-entries">
+  {{#each posts as |post|}}
+    {{search-result-entry post=post bulkSelectEnabled=bulkSelectEnabled selected=selected}}
+  {{/each}}
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs b/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
new file mode 100644
index 0000000000..652820e589
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
@@ -0,0 +1,66 @@
+<div class="fps-result">
+  <div class="author">
+    <a href={{post.userPath}} data-user-card={{post.username}}>
+      {{avatar post imageSize="large"}}
+    </a>
+  </div>
+
+  <div class="fps-topic">
+    <div class="topic">
+      {{#if bulkSelectEnabled}}
+        {{track-selected selectedList=selected selectedId=post.topic class="bulk-select"}}
+      {{/if}}
+
+      <a href={{post.url}} {{action "logClick" post.topic_id}} class="search-link">
+        {{raw "topic-status" topic=post.topic showPrivateMessageIcon=true}}
+        <span class="topic-title">
+          {{#if post.useTopicTitleHeadline}}
+            {{html-safe post.topicTitleHeadline}}
+          {{else}}
+            {{#highlight-search highlight=q}}
+              {{html-safe post.topic.fancyTitle}}
+            {{/highlight-search}}
+          {{/if}}
+        </span>
+      </a>
+
+      <div class="search-category">
+        {{#if post.topic.category.parentCategory}}
+          {{category-link post.topic.category.parentCategory}}
+        {{/if}}
+        {{category-link post.topic.category hideParent=true}}
+        {{#if post.topic}}
+          {{discourse-tags post.topic}}
+        {{/if}}
+        {{plugin-outlet name="full-page-search-category" args=(hash post=post)}}
+      </div>
+    </div>
+
+    <div class="blurb container">
+      <span class="date">
+        {{format-date post.created_at format="tiny"}}
+        {{#if post.blurb}}
+          <span class="separator">-</span>
+        {{/if}}
+      </span>
+
+      {{#if post.blurb}}
+        {{#if siteSettings.use_pg_headlines_for_excerpt}}
+          {{html-safe post.blurb}}
+        {{else}}
+          {{#highlight-search highlight=highlightQuery}}
+            {{html-safe post.blurb}}
+          {{/highlight-search}}
+        {{/if}}
+      {{/if}}
+    </div>
+
+    {{#if showLikeCount}}
+      {{#if post.like_count}}
+        <span class="like-count">
+          <span class="value">{{post.like_count}}</span> {{d-icon "heart"}}
+        </span>
+      {{/if}}
+    {{/if}}
+  </div>
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs
index 03bc3de807..4501449c1b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs
@@ -2,7 +2,7 @@
   {{#if publishing}}
     {{i18n "shared_drafts.publishing"}}
   {{else}}
-    {{html-safe (i18n "shared_drafts.notice" category=topic.category.name)}}
+    {{i18n "shared_drafts.notice"}}
 
     <div class="publish-field">
       <label>{{i18n "shared_drafts.destination_category"}}</label>
diff --git a/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs b/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
index f6587b4043..9fbbf93fa6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
@@ -1,10 +1,10 @@
 <div class="signup-cta alert alert-info">
   {{#if session.hideSignupCta}}
-    <p>
+    <h3>
       {{i18n "signup_cta.hidden_for_session"}}
-    </p>
+    </h3>
   {{else}}
-    <p>{{replace-emoji (i18n "signup_cta.intro")}}</p>
+    <h3>{{replace-emoji (i18n "signup_cta.intro")}}</h3>
     <p>{{replace-emoji (i18n "signup_cta.value_prop")}}</p>
 
     <div class="buttons">
@@ -13,5 +13,4 @@
       <a href {{action "neverShow"}}>{{i18n "signup_cta.hide_forever"}}</a>
     </div>
   {{/if}}
-  <div class="clearfix"></div>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs b/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs
index 21ae5a3cd6..530ead3e8a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs
@@ -13,4 +13,4 @@
       {{/if}}
     </h3>
   </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs b/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs
new file mode 100644
index 0000000000..db9627812e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs
@@ -0,0 +1,9 @@
+<div class="software-update-prompt {{if showPrompt "require-software-refresh"}}">
+  <div class="wrap">
+    <div class="update-prompt-main-content" aria-live="polite">
+      <span role="button" onclick={{action "refreshPage"}} class="update-prompt-message">{{d-icon "redo"}} {{html-safe (i18n "software_update_prompt.message")}}</span>
+      <span class="update-prompt-dismiss"><span aria-label={{i18n "software_update_prompt.dismiss"}} role="button" onclick={{action "dismiss"}}>{{d-icon "times"}}</span></span>
+    </div>
+  </div>
+</div>
+
diff --git a/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs
index 0ec8ec2b05..0a45db7ab3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs
@@ -20,3 +20,5 @@
     {{html-safe browseMoreMessage}}
   </h3>
 </div>
+
+{{plugin-outlet name="below-suggested-topics" args=(hash topic=topic)}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
index 38a950ba19..2291f06dd9 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
@@ -89,16 +89,18 @@
     </div>
   </section>
 
-  {{d-button
-    class="btn-default"
-    action=(action "save")
-    disabled=savingDisabled
-    label="tagging.groups.save"}}
+  <div class="tag-group-controls">
+    {{d-button
+      class="btn-default"
+      action=(action "save")
+      disabled=buffered.isSaving
+      label="tagging.groups.save"}}
 
-  {{d-button
-    class="btn-danger"
-    action=(action "destroy")
-    disabled=buffered.isNew
-    icon="far-trash-alt"
-    label="tagging.groups.delete"}}
+    {{d-button
+      class="btn-danger"
+      action=(action "destroy")
+      disabled=buffered.isNew
+      icon="far-trash-alt"
+      label="tagging.groups.delete"}}
+  </div>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-heading.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-heading.hbs
deleted file mode 100644
index ec791283cc..0000000000
--- a/app/assets/javascripts/discourse/app/templates/components/tag-heading.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-<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>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
index ddbfc6b295..5fc813c0f6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
@@ -2,7 +2,10 @@
   {{#if tagInfo}}
     <div class="tag-name">
       {{discourse-tag tagInfo.name tagName="div" size="large"}}
+
       {{#if canAdminTag}}
+        {{plugin-outlet name="tag-custom-settings" args=(hash tag=tagInfo) connectorTagName="" tagName="section"}}
+
         {{d-button class="btn-default" action=(action "renameTag") icon="pencil-alt" label="tagging.rename_tag" id="rename-tag"}}
         {{d-button class="btn-default" action=(action "toggleEditControls") icon="cog" label="tagging.edit_synonyms" id="edit-synonyms"}}
         {{#if deleteAction}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs b/app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs
index df17a2fd98..1789711e15 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs
@@ -1,2 +1,4 @@
-{{d-icon icon}}
+{{#if icon}}
+  {{d-icon icon}}
+{{/if}}
 {{ yield }}
diff --git a/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs
new file mode 100644
index 0000000000..d8b03ffa42
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs
@@ -0,0 +1,33 @@
+{{#tap-tile-grid activeTile=selectedShortcut as |grid|}}
+  {{#each options as |option|}}
+    {{#unless option.hidden}}
+      {{#tap-tile icon=option.icon tileId=option.id activeTile=grid.activeTile onChange=(action "selectShortcut")}}
+        <div class="tap-tile-title">{{i18n option.label}}</div>
+        <div class="tap-tile-date">{{option.timeFormatted}}</div>
+      {{/tap-tile}}
+    {{/unless}}
+
+    {{#if option.isCustomTimeShortcut}}
+      {{#if customDatetimeSelected}}
+        <div class="control-group custom-date-time-wrap custom-input-wrap">
+          <div class="tap-tile-date-input">
+            {{d-icon "calendar-alt"}}
+            {{date-picker-future
+            value=customDate
+            onSelect=(action (mut customDate))
+            id="custom-date"
+            }}
+          </div>
+          <div class="tap-tile-time-input">
+            {{d-icon "far-clock"}}
+            {{input placeholder="--:--" id="custom-time" type="time" class="time-input" value=customTime}}
+          </div>
+        </div>
+        <div class="control-group custom-date-time-wrap custom-relative-wrap">
+          <label class="control-label">{{i18n "relative_time_picker.relative"}}</label>
+          {{relative-time-picker onChange=(action "relativeTimeChanged")}}
+        </div>
+      {{/if}}
+    {{/if}}
+  {{/each}}
+{{/tap-tile-grid}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs
index a9686092d9..770688531e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs
@@ -1,5 +1,3 @@
 {{#each periods as |p|}}
-  {{#d-button action=(action "changePeriod") class="btn-default" actionParam=p}}
-    {{period-title p}}
-  {{/d-button}}
+  {{d-button action=(action "changePeriod") class="btn-default" actionParam=p translatedLabel=(period-title p)}}
 {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs
index 9872c066aa..c6e9c5cae2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
-{{#d-button action=(action "enterTop") class="full jump-top"}}
+{{#d-button action=(action "enterTop") class="btn-default full jump-top"}}
   {{d-icon "step-backward"}} {{html-safe topDate}}
 {{/d-button}}
 
-{{#d-button action=(action "enterBottom") class="full jump-bottom"}}
+{{#d-button action=(action "enterBottom") class="btn-default full jump-bottom"}}
   {{html-safe bottomDate}} {{d-icon "step-forward"}}
 {{/d-button}}
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 e92d28c892..c672c8ccaa 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
@@ -10,7 +10,7 @@
     toggleClosed=toggleClosed
     toggleArchived=toggleArchived
     toggleVisibility=toggleVisibility
-    showTopicStatusUpdate=showTopicStatusUpdate
+    showTopicTimerModal=showTopicTimerModal
     showFeatureTopic=showFeatureTopic
     showChangeTimestamp=showChangeTimestamp
     resetBumpDate=resetBumpDate
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
index 5fbbf9cde6..d524cdaffb 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
@@ -45,3 +45,15 @@
     {{raw "list/visited-line" lastVisitedTopic=lastVisitedTopic topic=topic}}
   {{/each}}
 </tbody>
+
+{{plugin-outlet
+  name="after-topic-list-body"
+  args=(hash
+    topics=topics
+    selected=selected
+    bulkSelectEnabled=bulkSelectEnabled
+    lastVisitedTopic=lastVisitedTopic
+    discoveryList=discoveryList
+    hideCategory=hideCategory)
+  tagName=""
+  connectorTagName=""}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
index 8a546ab791..df46dad342 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
@@ -3,10 +3,25 @@
     <span title={{title}}>
       {{clockIcon}} {{notice}}
     </span>
-    {{#if showTrashCan}}
-      <button type="button" class="btn topic-timer-remove no-text" title={{trashCanTitle}}>
-        {{trashCanIcon}}
-      </button>
-    {{/if}}
+    <div class="topic-timer-modify">
+      {{#if showEdit}}
+        {{~d-button
+          ariaLabel="post.controls.edit_timer"
+          title="post.controls.edit_timer"
+          icon="pencil-alt"
+          class="btn topic-timer-edit no-text"
+          action=showTopicTimerModal
+        ~}}
+      {{/if}}
+      {{#if showTrashCan}}
+        {{~d-button
+          ariaLabel="post.controls.remove_timer"
+          title="post.controls.remove_timer"
+          icon="trash-alt"
+          class="btn topic-timer-remove no-text"
+          action=removeTopicTimer
+        ~}}
+      {{/if}}
+    </div>
   </h3>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-badge.hbs b/app/assets/javascripts/discourse/app/templates/components/user-badge.hbs
index 89c7dd8b70..5d89b20eb6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-badge.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-badge.hbs
@@ -1,4 +1,4 @@
-<a href={{this.badgeUrl}}>
+<a class="user-card-badge-link" href={{this.badgeUrl}}>
   {{#badge-button badge=@badge}}
     {{#if this.showGrantCount}}
       <span class="count">(&times;&nbsp;{{@count}})</span>
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 28e08da19e..f6f6c475ca 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
@@ -27,13 +27,9 @@
           {{else}}
             <a href={{this.user.path}} {{action "showUser" this.user}} class="card-huge-avatar">{{bound-avatar this.user "huge"}}</a>
           {{/if}}
-          {{#if this.user.primary_group_name}}
-            {{avatar-flair
-            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}}
+
+          {{user-avatar-flair user=this.user}}
+
           {{plugin-outlet name="user-card-avatar-flair" args=(hash user=this.user) tagName="div"}}
         </div>
         <div class="names">
@@ -81,9 +77,9 @@
             <li>
               {{d-button
               class="btn-default"
-              action=(action "togglePosts" this.user)
+              action=(action "filterPosts" this.user)
               icon="filter"
-              translatedLabel=this.togglePostsLabel}}
+              translatedLabel=this.filterPostsLabel}}
             </li>
           {{/if}}
           {{#if this.hasUserFilters}}
@@ -142,7 +138,11 @@
             </div>
           {{else}}
             {{#if this.user.bio_excerpt}}
-              <div class="bio">{{html-safe this.user.bio_excerpt}}</div>
+              <div class="bio">
+                {{#html-with-links}}
+                  {{html-safe this.user.bio_excerpt}}
+                {{/html-with-links}}
+              </div>
             {{/if}}
           {{/if}}
         </div>
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 ced515393c..07c80f41e3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
@@ -1,20 +1,14 @@
 <div class="user-image">
   <div class="user-image-inner">
     <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}}
-    {{/if}}
+    {{user-avatar-flair user=@user}}
   </div>
 </div>
 
 <div class="user-detail">
   <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>
+    <span class={{if nameFirst "name bold" "username bold"}}><a href={{this.userPath}} data-user-card={{@user.username}}>{{if nameFirst this.name (format-username @user.username)}}</a></span>
+    <span class={{if nameFirst "username margin" "name margin"}}><a href={{this.userPath}} data-user-card={{@user.username}}>{{if nameFirst (format-username @user.username) this.name}}</a></span>
     {{plugin-outlet name="after-user-name" connectorTagName="span" args=(hash user=user)}}
   </div>
   <div class="title">{{@user.title}}</div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule-day.hbs b/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule-day.hbs
new file mode 100644
index 0000000000..b03f167228
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule-day.hbs
@@ -0,0 +1,22 @@
+<tr class="day {{dayLabel}}">
+  <td class="day-label">{{dayLabel}}</td>
+  <td class="starts-at">
+    {{combo-box
+      valueProperty="value"
+      content=startTimeOptions
+      value=startTimeValue
+      onChange=onChangeStartTime
+    }}
+  </td>
+  {{#if endTimeOptions}}
+    <td class="to">{{i18n "user.notification_schedule.to"}}</td>
+    <td class="ends-at">
+      {{combo-box
+        valueProperty="value"
+        content=endTimeOptions
+        value=endTimeValue
+        onChange=onChangeEndTime
+      }}
+    </td>
+  {{/if}}
+</tr>
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule.hbs b/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule.hbs
new file mode 100644
index 0000000000..acc1486e76
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule.hbs
@@ -0,0 +1,26 @@
+<div class="control-group notification-schedule">
+  <label class="control-label">{{i18n "user.notification_schedule.title"}}</label>
+  {{preference-checkbox
+      labelKey="user.notification_schedule.label"
+      checked=model.user_notification_schedule.enabled}}
+
+  {{#if model.user_notification_schedule.enabled}}
+    <div class="instruction">{{i18n "user.notification_schedule.tip"}}</div>
+
+    <table class="notification-schedule-table">
+      <tbody class="notification-schedule-tbody">
+        {{#each days as |day|}}
+          {{user-notification-schedule-day
+            day=day.day
+            startTimeOptions=day.startTimeOptions
+            startTimeValue=day.startTimeValue
+            onChangeStartTime=day.onChangeStartTime
+            endTimeOptions=day.endTimeOptions
+            endTimeValue=day.endTimeValue
+            onChangeEndTime=day.onChangeEndTime
+          }}
+        {{/each}}
+      </tbody>
+    </table>
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs b/app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs
index f2965aabb0..e8b53b6b8d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs
@@ -1,11 +1,5 @@
 <div class="user-profile-avatar">
   {{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}}
-  {{/if}}
+  {{user-avatar-flair user=@user}}
   {{plugin-outlet name="user-profile-avatar-flair" args=(hash model=@user) tagName="div"}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
index 0d53c253b1..d06cbcdd5b 100644
--- a/app/assets/javascripts/discourse/app/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer.hbs
@@ -25,14 +25,13 @@
                 {{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="unlist">({{i18n "composer.unlist"}})</span>
                   {{/if}}
-                  {{#if model.noBump}}
-                    <span class="no-bump">{{d-icon "anchor"}}</span>
+                  {{#if isWhispering}}
+                    {{#if model.noBump}}
+                      <span class="no-bump">{{d-icon "anchor"}}</span>
+                    {{/if}}
                   {{/if}}
                 {{/unless}}
 
@@ -52,11 +51,13 @@
             {{#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"}}
+                  {{composer-user-selector
+                    topicId=topicModel.id
+                    recipients=model.targetRecipients
+                    hasGroups=model.hasTargetGroups
+                    focusTarget=focusTarget
+                    class="users-input"
+                  }}
                   {{#if showWarning}}
                     <label class="add-warning">
                       {{input type="checkbox" checked=model.isWarning tabindex="3"}}
@@ -93,6 +94,7 @@
                     options=(hash
                       categoryId=model.categoryId
                       minimum=model.minimumRequiredTags
+                      requiredTagGroups=model.requiredTagGroups
                     )
                   }}
                   {{popup-input-tip validation=tagValidation}}
@@ -127,6 +129,7 @@
                           afterRefresh=(action "afterRefresh")
                           focusTarget=focusTarget}}
 
+        {{plugin-outlet name="composer-after-composer-editor" connectorTagName="" args=(hash model=model)}}
         <div class="submit-panel">
           {{plugin-outlet name="composer-fields-below" args=(hash model=model)}}
 
@@ -190,6 +193,8 @@
           </div>
 
           {{#if site.mobileView}}
+            {{plugin-outlet name="composer-mobile-buttons-bottom" connectorTagName="" args=(hash model=model)}}
+
             {{#if allowUpload}}
               <a class="btn btn-default no-text mobile-file-upload {{if isUploading "hidden"}}"  aria-label={{i18n "composer.upload_title"}}>
                 {{d-icon uploadIcon}}
@@ -201,10 +206,16 @@
             </a>
 
             {{#if showPreview}}
-              {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
+              {{d-button action=(action "togglePreview") class="hide-preview" ariaLabel="composer.hide_preview" icon="pencil-alt"}}
             {{/if}}
           {{else}}
-            <a href {{action "togglePreview"}} class="toggle-preview">{{html-safe toggleText}}</a>
+            {{d-button
+              action=(action "togglePreview")
+              translatedTitle=toggleText
+              translatedAriaLabel=toggleText
+              icon="angle-double-left"
+              class=(concat "btn-flat btn-mini-toggle toggle-preview " (unless showPreview "active"))
+              }}
           {{/if}}
 
         </div>
diff --git a/app/assets/javascripts/discourse/app/templates/discovery.hbs b/app/assets/javascripts/discourse/app/templates/discovery.hbs
index 6358886107..3e0a36511e 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery.hbs
@@ -1,41 +1,39 @@
-{{#if errorHtml}}
-  {{html-safe errorHtml}}
-{{else}}
+<div class="container">
+  {{discourse-banner user=currentUser banner=site.banner}}
+  {{#unless viewingCategoriesList}}
+    {{category-read-only-banner category=category readOnly=navigationCategory.cannotCreateTopicOnCategory}}
+  {{/unless}}
+</div>
+
+{{plugin-outlet name="discovery-list-controls-above"}}
+
+<div class="list-controls">
   <div class="container">
-    {{discourse-banner user=currentUser banner=site.banner}}
-    {{#unless viewingCategoriesList}}
-      {{category-read-only-banner category=category readOnly=navigationCategory.cannotCreateTopicOnCategory}}
-    {{/unless}}
+    {{outlet "navigation-bar"}}
   </div>
+</div>
 
-  <div class="list-controls">
-    <div class="container">
-      {{outlet "navigation-bar"}}
-    </div>
-  </div>
+{{conditional-loading-spinner condition=loading}}
 
-  {{conditional-loading-spinner condition=loading}}
+{{plugin-outlet name="discovery-above"}}
 
-  {{plugin-outlet name="discovery-above"}}
-
-  <div class="container list-container {{if loading "hidden"}}">
-    <div class="row">
-      <div class="full-width">
-        <div id="header-list-area">
-          {{outlet "header-list-container"}}
-        </div>
-      </div>
-    </div>
-    <div class="row">
-      <div class="full-width">
-        <div id="list-area">
-          {{plugin-outlet name="discovery-list-container-top"
-                          args=(hash category=category listLoading=loading)}}
-          {{outlet "list-container"}}
-        </div>
+<div class="container list-container {{if loading "hidden"}}">
+  <div class="row">
+    <div class="full-width">
+      <div id="header-list-area">
+        {{outlet "header-list-container"}}
       </div>
     </div>
   </div>
+  <div class="row">
+    <div class="full-width">
+      <div id="list-area">
+        {{plugin-outlet name="discovery-list-container-top"
+                        args=(hash category=category listLoading=loading)}}
+        {{outlet "list-container"}}
+      </div>
+    </div>
+  </div>
+</div>
 
-  {{plugin-outlet name="discovery-below"}}
-{{/if}}
+{{plugin-outlet name="discovery-below"}}
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
index 6a5c91b8b8..c50a673874 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
@@ -1,6 +1,9 @@
+{{plugin-outlet name="above-discovery-categories" tagName="" args=(hash categories=model.categories categoryPageStyle=categoryPageStyle topics=model.topics)}}
+
 {{#discovery-categories refresh=(action "refresh")}}
   {{component categoryPageStyle
               categories=model.categories
-              latestTopicOnly=latestTopicOnly
               topics=model.topics}}
 {{/discovery-categories}}
+
+{{plugin-outlet name="below-discovery-categories" tagName="" args=(hash categories=model.categories categoryPageStyle=categoryPageStyle topics=model.topics)}}
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
index d91143e38a..ca4e8cbe82 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
@@ -36,7 +36,14 @@
 
 {{bulk-select-button selected=selected action=(action "refresh") category=category}}
 
-{{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount as |discoveryTopicList|}}
+{{#discovery-topics-list
+  model=model
+  refresh=(action "refresh")
+  incomingCount=topicTrackingState.incomingCount
+  autoAddTopicsToBulkSelect=autoAddTopicsToBulkSelect
+  bulkSelectEnabled=bulkSelectEnabled
+  addTopicsToBulkSelect=(action "addTopicsToBulkSelect")
+  as |discoveryTopicList|}}
   {{#if top}}
     <div class="top-lists">
       {{period-chooser period=period action=(action "changePeriod") fullDay=false}}
@@ -61,6 +68,7 @@
       canBulkSelect=canBulkSelect
       changeSort=(route-action "changeSort")
       toggleBulkSelect=(action "toggleBulkSelect")
+      updateAutoAddTopicsToBulkSelect=(action "updateAutoAddTopicsToBulkSelect")
       hideCategory=model.hideCategory
       order=order
       ascending=ascending
diff --git a/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs b/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
index 4a2b132ccc..b5a7afc0cc 100644
--- a/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
+++ b/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
@@ -34,6 +34,12 @@
     {{/each}}
   </div>
 
+  {{#if showDeleteReason}}
+    <div class="edit-category-delete-warning">
+      <p class="warning">{{html-safe model.cannot_delete_reason}}</p>
+    </div>
+  {{/if}}
+
   <div class="edit-category-footer">
     {{d-button id="save-category" class="btn-primary" disabled=disabled action=(action "saveCategory") label=saveLabel}}
 
@@ -54,10 +60,6 @@
           icon="question-circle"
           label="category.delete"
         }}
-
-        <div class="cannot-delete-reason {{if hiddenTooltip "hidden" ""}}">
-          {{html-safe model.cannot_delete_reason}}
-        </div>
       </div>
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
index f95bc36dc7..d1858fad5d 100644
--- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
@@ -4,8 +4,15 @@
   <div class="search-advanced">
     {{#unless site.mobileView}}
       <div class="search-bar">
-        {{search-text-field value=searchTerm class="full-page-search search no-blur search-query" enter=(action "search") hasAutofocus=hasAutofocus}}
-        {{d-button action=(action "search") icon="search" class="btn-primary search-cta" disabled=searchButtonDisabled}}
+        {{search-text-field
+          value=searchTerm
+          class="full-page-search search no-blur search-query"
+          aria-label=(i18n "search.full_page_title")
+          enter=(action "search")
+          hasAutofocus=hasAutofocus
+          aria-controls="search-result-count"
+        }}
+        {{d-button action=(action "search") icon="search" class="btn-primary search-cta" ariaLabel="search.search_button" disabled=searchButtonDisabled}}
       </div>
     {{/unless}}
 
@@ -48,7 +55,7 @@
       </div>
 
       <div class="search-info">
-        <div class="result-count">
+        <div class="result-count" id="search-result-count" aria-live="polite">
           {{html-safe resultCountLabel}}
         </div>
         <div class="sort-by">
@@ -72,74 +79,7 @@
     {{else}}
       <div class="search-results">
         {{#load-more selector=".fps-result" action=(action "loadMore")}}
-          {{#each model.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">
-                  {{#if bulkSelectEnabled}}
-                    {{track-selected selectedList=selected selectedId=result.topic class="bulk-select"}}
-                  {{/if}}
-
-                  <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">
-                      {{#if result.useTopicTitleHeadline}}
-                        {{html-safe result.topicTitleHeadline}}
-                      {{else}}
-                        {{#highlight-search highlight=q}}
-                          {{html-safe result.topic.fancyTitle}}
-                        {{/highlight-search}}
-                      {{/if}}
-                    </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 isPrivateMessage=isPrivateMessage}}
-                    {{/each}}
-                    {{plugin-outlet name="full-page-search-category" args=(hash result=result)}}
-                  </div>
-                </div>
-
-                <div class="blurb container">
-                  <span class="date">
-                    {{format-age result.created_at}}
-                    {{#if result.blurb}}
-                      -
-                    {{/if}}
-                  </span>
-
-                  {{#if result.blurb}}
-                    {{#if siteSettings.use_pg_headlines_for_excerpt}}
-                      {{html-safe result.blurb}}
-                    {{else}}
-                      {{#highlight-search highlight=highlightQuery}}
-                        {{html-safe result.blurb}}
-                      {{/highlight-search}}
-                    {{/if}}
-                  {{/if}}
-                </div>
-
-                {{#if showLikeCount}}
-                  {{#if result.like_count}}
-                    <span class="like-count">
-                      {{result.like_count}} {{d-icon "heart"}}
-                    </span>
-                  {{/if}}
-                {{/if}}
-              </div>
-            </div>
-          {{/each}}
+          {{search-result-entries posts=model.posts bulkSelectEnabled=bulkSelectEnabled selected=selected}}
 
           {{#conditional-loading-spinner condition=loading }}
             {{#unless hasResults}}
@@ -193,7 +133,7 @@
     {{#if site.mobileView}}
       <div class="search-bar">
         {{search-text-field value=searchTerm class="full-page-search search no-blur search-query" enter=(action "search") hasAutofocus=hasAutofocus}}
-        {{d-button action=(action "search") icon="search" class="btn-primary search-cta" disabled=searchButtonDisabled}}
+        {{d-button action=(action "search") icon="search" class="btn-primary search-cta" ariaLabel="search.search_button" disabled=searchButtonDisabled}}
       </div>
     {{/if}}
 
@@ -203,9 +143,9 @@
         <span>{{i18n "search.advanced.title"}}</span>
       </div>
     {{else}}
-      <span class="search-advanced-title">
+      <h1 class="search-advanced-title">
         {{i18n "search.advanced.title"}}
-      </span>
+      </h1>
     {{/if}}
 
     {{#if site.mobileView}}
diff --git a/app/assets/javascripts/discourse/app/templates/group-activity-posts.hbs b/app/assets/javascripts/discourse/app/templates/group-activity-posts.hbs
index f134929e6c..8e833dc151 100644
--- a/app/assets/javascripts/discourse/app/templates/group-activity-posts.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-activity-posts.hbs
@@ -1,7 +1,7 @@
 {{#load-more selector=".user-stream-item" action=(action "loadMore")}}
   <div class="user-stream">
     {{#each model as |post|}}
-      {{group-post post=post class="user-stream-item item"}}
+      {{group-post post=post}}
     {{else}}
       <div>{{i18n emptyText}}</div>
     {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/group-index.hbs b/app/assets/javascripts/discourse/app/templates/group-index.hbs
index 973f0aa4ce..d5a7770478 100644
--- a/app/assets/javascripts/discourse/app/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-index.hbs
@@ -12,9 +12,9 @@
     <div class="group-members-manage">
       {{#if canManageGroup}}
         {{d-button icon="plus"
-        action=(route-action "showAddMembersModal")
-        label="groups.manage.add_members"
-        class="group-members-add"}}
+          action=(route-action "showAddMembersModal")
+          label="groups.manage.add_members"
+        class="btn-default group-members-add"}}
       {{/if}}
     </div>
   </div>
@@ -23,26 +23,54 @@
     {{#load-more selector=".group-members tr" action=(action "loadMore")}}
       <table class="group-members">
         <thead>
-          {{table-header-toggle order=order asc=asc field="username_lower" labelKey="username"}}
-          <th class="group-owner">{{i18n "groups.members.owner"}}</th>
-          {{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>
+          <tr>
+            <th class="bulk-select">
+              {{#if canManageGroup}}
+                {{flat-button class="bulk-select" icon="list" action=(action "toggleBulkSelect") title="topics.bulk.toggle"}}
+              {{/if}}
+            </th>
+            {{#if isBulk}}
+              <th class="bulk-select-buttons">
+                {{d-button action=(action "bulkSelectAll") label="topics.bulk.select_all"}}
+                {{d-button action=(action "bulkClearAll") label="topics.bulk.clear_all"}}
+              </th>
+            {{/if}}
+            {{table-header-toggle order=order asc=asc field="username_lower" labelKey="username" class="username"}}
+            <th class="group-owner"></th>
+            {{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>
+              {{#if isBulk}}
+                {{group-member-dropdown
+                  bulkSelection=bulkSelection
+                  canAdminGroup=model.can_admin_group
+                  onChange=(action "actOnSelection" bulkSelection)
+                }}
+              {{/if}}
+            </th>
+          </tr>
         </thead>
 
         <tbody>
           {{#each model.members as |m|}}
             <tr>
-              <td class="avatar">
+              {{#if isBulk}}
+                <td class="bulk-select">
+                  {{input type="checkbox" class="bulk-select" click=(action "selectMember" m)}}
+                </td>
+              {{/if}}
+
+              <td class="avatar" colspan="2">
                 {{user-info user=m skipName=skipName}}
               </td>
 
               <td class="group-owner">
                 {{#if m.owner}}
-                  <strong class="group-owner-label">
-                    {{d-icon "shield-alt"}}
-                  </strong>
+                  {{d-icon "shield-alt"}} {{i18n "groups.members.owner"}}<br>
+                {{/if}}
+                {{#if m.primary}}
+                  {{i18n "groups.members.primary"}}
                 {{/if}}
               </td>
               <td>
diff --git a/app/assets/javascripts/discourse/app/templates/group.hbs b/app/assets/javascripts/discourse/app/templates/group.hbs
index 1867f80f52..2ea514c60d 100644
--- a/app/assets/javascripts/discourse/app/templates/group.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group.hbs
@@ -1,26 +1,67 @@
 {{plugin-outlet name="before-group-container" args=(hash group=model)}}
 
 <div class="container group {{model.name}}">
+  {{#if showTooltip}}
+    <div class="group-delete-tooltip">
+      <p>{{i18n "admin.groups.delete_automatic_group"}}</p>
+    </div>
+  {{/if}}
+
   <div class="group-details-container">
     <div class="group-info">
       {{#if model.flair_url}}
-        <span class="group-avatar-flair">
+        <div class="group-avatar-flair">
           {{avatar-flair
             flairURL=model.flair_url
             flairBgColor=model.flair_bg_color
             flairColor=model.flair_color
             groupName=model.name
           }}
-        </span>
+        </div>
       {{/if}}
 
-      <span>
+      <div class="group-info-names">
         <span class="group-info-name">{{groupName}}</span>
 
-        <div>
-          {{#if model.full_name}}<span class="group-info-full-name">{{model.name}}</span>{{/if}}
-        </div>
-      </span>
+        {{#if model.full_name}}<div class="group-info-full-name">{{model.name}}</div>{{/if}}
+      </div>
+
+      <div class="group-details-button">
+        {{group-membership-button
+          tagName=""
+          model=model
+          showLogin=(route-action "showLogin")
+        }}
+
+        {{#if currentUser.admin}}
+          {{#if model.automatic}}
+            {{d-button
+              action=(action "toggleDeleteTooltip")
+              class="btn-default"
+              icon="question-circle"
+              label="admin.groups.delete"
+            }}
+          {{else}}
+            {{d-button
+              action=(action "destroy")
+              disabled=destroying
+              icon="trash-alt"
+              class="btn-danger"
+              label="admin.groups.delete"
+            }}
+          {{/if}}
+        {{/if}}
+
+        {{#if displayGroupMessageButton}}
+          {{d-button
+            action=(action "messageGroup")
+            class="btn-primary group-message-button"
+            icon="envelope"
+            label="groups.message"
+          }}
+        {{/if}}
+      </div>
+
       {{plugin-outlet name="group-details-after" args=(hash model=model)}}
     </div>
 
@@ -31,40 +72,15 @@
         <p>{{html-safe model.bio_cooked}}</p>
       </div>
     {{/if}}
-
-    <div class="group-details-button">
-      {{group-membership-button
-        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"
-        }}
-      {{/if}}
-
-      {{#if currentUser.admin}}
-        {{d-button
-          action=(action "destroy")
-          disabled=destroying
-          icon="trash-alt"
-          class="btn-danger"
-          label="admin.groups.delete"
-        }}
-      {{/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>
diff --git a/app/assets/javascripts/discourse/app/templates/group/activity.hbs b/app/assets/javascripts/discourse/app/templates/group/activity.hbs
index c8f26f44af..78f7130174 100644
--- a/app/assets/javascripts/discourse/app/templates/group/activity.hbs
+++ b/app/assets/javascripts/discourse/app/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"}}
     {{#if model.can_see_members}}
       {{group-activity-filter filter="posts" categoryId=category_id}}
       {{group-activity-filter filter="topics" categoryId=category_id}}
diff --git a/app/assets/javascripts/discourse/app/templates/group/manage.hbs b/app/assets/javascripts/discourse/app/templates/group/manage.hbs
index de09c82655..478eb75a4f 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage.hbs
+++ b/app/assets/javascripts/discourse/app/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}}
+  {{#mobile-nav class="activity-nav" desktopClass="action-list activity-list nav-stacked"}}
     {{#each tabs as |tab|}}
       <li>
         {{#link-to tab.route model.name}}
diff --git a/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs
index 604ac18524..8560c2f1ae 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs
@@ -1,4 +1,7 @@
 <form class="groups-form form-vertical groups-notifications-form">
+
+  {{plugin-outlet name="before-manage-group-tags" args=(hash model=model) tagName=""}}
+
   <div class="control-group">
     <label class="control-label">{{i18n "groups.manage.tags.long_title"}}</label>
     <div>{{i18n "groups.manage.tags.description"}}</div>
diff --git a/app/assets/javascripts/discourse/app/templates/group/messages.hbs b/app/assets/javascripts/discourse/app/templates/group/messages.hbs
index 2a05efd124..69e370971c 100644
--- a/app/assets/javascripts/discourse/app/templates/group/messages.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/messages.hbs
@@ -1,5 +1,5 @@
 <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"}}
     <li>
       {{#link-to "group.messages.inbox" model.name}}
         {{i18n "user.messages.inbox"}}
diff --git a/app/assets/javascripts/discourse/app/templates/groups/index.hbs b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
index 5abcf07eeb..dce8efb676 100644
--- a/app/assets/javascripts/discourse/app/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
@@ -1,3 +1,5 @@
+{{plugin-outlet name="before-groups-index-container" tagName=""}}
+
 {{#d-section pageClass="groups"}}
   <div class="groups-header">
     {{#if currentUser.can_create_group}}
@@ -100,3 +102,5 @@
   {{/conditional-loading-spinner}}
 
 {{/d-section}}
+
+{{plugin-outlet name="after-groups-index-container" tagName=""}}
diff --git a/app/assets/javascripts/discourse/app/templates/groups/new.hbs b/app/assets/javascripts/discourse/app/templates/groups/new.hbs
index 0a923cf3aa..fbb44248f0 100644
--- a/app/assets/javascripts/discourse/app/templates/groups/new.hbs
+++ b/app/assets/javascripts/discourse/app/templates/groups/new.hbs
@@ -8,19 +8,29 @@
       <div class="control-group">
         <label class="control-label" for="owner-selector">{{i18n "admin.groups.add_owners"}}</label>
 
-        {{user-selector usernames=model.ownerUsernames
-            class="input-xxlarge"
-            placeholderKey="groups.selector_placeholder"
-            id="owner-selector"}}
+        {{email-group-user-chooser
+          class="input-xxlarge"
+          id="owner-selector"
+          value=splitOwnerUsernames
+          onChange=(action "updateOwnerUsernames")
+          options=(hash
+            filterPlaceholder="groups.selector_placeholder"
+          )
+        }}
       </div>
 
       <div class="control-group">
         <label class="control-label" for="member-selector">{{i18n "groups.members.title"}}</label>
 
-        {{user-selector usernames=model.usernames
-            class="input-xxlarge"
-            placeholderKey="groups.selector_placeholder"
-            id="member-selector"}}
+        {{email-group-user-chooser
+          class="input-xxlarge"
+          id="member-selector"
+          value=splitUsernames
+          onChange=(action "updateUsernames")
+          options=(hash
+            filterPlaceholder="groups.selector_placeholder"
+          )
+        }}
       </div>
     {{/groups-form-profile-fields}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/invites.hbs b/app/assets/javascripts/discourse/app/templates/invites.hbs
index e2147cab02..c24cd68950 100644
--- a/app/assets/javascripts/discourse/app/templates/invites.hbs
+++ b/app/assets/javascripts/discourse/app/templates/invites.hbs
@@ -1 +1 @@
-{{outlet}}
\ No newline at end of file
+{{outlet}}
diff --git a/app/assets/javascripts/discourse/app/templates/invites/show.hbs b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
index 8739fc3924..a38a7116c6 100644
--- a/app/assets/javascripts/discourse/app/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
@@ -1,5 +1,9 @@
 <div class="container invites-show clearfix">
-  <h2>{{welcomeTitle}}</h2>
+  <div class="login-welcome-header">
+    <h1 class="login-title">{{welcomeTitle}}</h1>
+    <img src={{wavingHandURL}} alt="" class="waving-hand">
+    <p class="login-subheader">{{i18n "create_account.subheader_title"}}</p>
+  </div>
 
   <div class="two-col">
     <div class="col-image">
@@ -17,73 +21,107 @@
         <p>{{user-info user=invitedBy}}</p>
 
         {{#unless isInviteLink}}
-          <p>
+          <p class="email-message">
             {{html-safe yourEmailMessage}}
-            {{#if externalAuthsEnabled}}
+            {{#if showSocialLoginAvailable}}
               {{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"}}
+        {{#if externalAuthsOnly}}
+          {{! authOptions are present once the user has followed the OmniAuth flow (e.g. twitter/google/etc) }}
+          {{#if authOptions}}
+            {{#unless isInviteLink}}
               {{input-tip validation=emailValidation id="account-email-validation"}}
-              <div class="instructions">{{i18n "user.email.instructions"}}</div>
-            </div>
+            {{/unless}}
+          {{else}}
+            {{login-buttons externalLogin=(action "externalLogin")}}
           {{/if}}
+        {{/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"}}
-            {{input-tip validation=usernameValidation id="username-validation"}}
-            <div class="instructions">{{i18n "user.username.instructions"}}</div>
-          </div>
+        {{#if discourseConnectEnabled}}
+          <a class="btn btn-primary discourse-connect raw-link" href={{ssoPath}}>
+            {{i18n "continue"}}
+          </a>
+        {{/if}}
 
-          {{#if fullnameRequired}}
-            <div class="input name-input">
-              <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>
-            {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
-            {{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"}}
+        {{#if shouldDisplayForm}}
+          <form>
+            {{#if isInviteLink}}
+              <div class="input email-input">
+                <label for="new-account-email">
+                  {{i18n "user.email.title"}}
+                  <span class="required">*</span>
+                </label>
+                {{input type="email" value=email id="new-account-email" name="email" autofocus="autofocus" disabled=externalAuthsOnly}}
+                {{input-tip validation=emailValidation id="account-email-validation"}}
+                <div class="instructions">{{i18n "user.email.instructions"}}</div>
               </div>
+            {{/if}}
+
+            <div class="input username-input">
+              <label for="new-account-username">
+                {{i18n "user.username.title"}}
+                <span class="required">*</span>
+              </label>
+              {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
+              {{input-tip validation=usernameValidation id="username-validation"}}
+              <div class="instructions">{{i18n "user.username.instructions"}}</div>
             </div>
-          </div>
 
-          {{#if userFields}}
-            <div class="user-fields">
-              {{#each userFields as |f|}}
-                {{user-field field=f.field value=f.value}}
-              {{/each}}
-            </div>
-          {{/if}}
+            {{#if fullnameRequired}}
+              <div class="input name-input">
+                <label for="new-account-name">
+                  {{i18n "invites.name_label"}}
+                  {{#if siteSettings.full_name_required}}
+                    <span class="required">*</span>
+                  {{/if}}
+                </label>
+                {{input value=accountName id="new-account-name" name="name"}}
+                <div class="instructions">{{nameInstructions}}</div>
+              </div>
+            {{/if}}
 
-          {{d-button
-            class="btn-primary"
-            action=(action "submit")
-            type="submit"
-            disabled=submitDisabled
-            label="invites.accept_invite"
-          }}
+            {{#unless externalAuthsOnly}}
+              <div class="input password-input">
+                <label for="new-account-password">
+                  {{i18n "invites.password_label"}}
+                  <span class="required">*</span>
+                </label>
+                {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
+                {{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"}}
+                  </div>
+                </div>
+              </div>
+            {{/unless}}
 
-          {{#if errorMessage}}
-            <br><br>
-            <div class="alert alert-error">{{errorMessage}}</div>
-          {{/if}}
-        </form>
+            {{#if userFields}}
+              <div class="user-fields">
+                {{#each userFields as |f|}}
+                  {{user-field field=f.field value=f.value}}
+                {{/each}}
+              </div>
+            {{/if}}
+
+            {{d-button
+              class="btn-primary"
+              action=(action "submit")
+              type="submit"
+              disabled=submitDisabled
+              label="invites.accept_invite"
+            }}
+
+            {{#if errorMessage}}
+              <br><br>
+              <div class="alert alert-error">{{errorMessage}}</div>
+            {{/if}}
+          </form>
+        {{/if}}
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/list/posts-count-column.hbr b/app/assets/javascripts/discourse/app/templates/list/posts-count-column.hbr
index fb6642f0f0..4c847ddb11 100644
--- a/app/assets/javascripts/discourse/app/templates/list/posts-count-column.hbr
+++ b/app/assets/javascripts/discourse/app/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}}'>
+  <button class="btn-link posts-map badge-posts {{view.likesHeat}}">
     {{raw-plugin-outlet name="topic-list-before-reply-count"}}
     {{number topic.replyCount noTitle="true" ariaLabel=view.title}}
-  </a>
+  </button>
 </{{view.tagName}}>
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 03ea153bb0..605e192211 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
@@ -13,7 +13,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.
 --}}
-<td class='main-link clearfix' colspan="1">
+<td class='main-link clearfix' colspan="1" role="rowheader">
   {{~raw-plugin-outlet name="topic-list-before-link"}}
   <span class='link-top-line'>
     {{~raw-plugin-outlet name="topic-list-before-status"}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs
index 9243d15028..b62e4a8fb5 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs
@@ -1,3 +1,2 @@
 {{categories-only categories=categories
-                  latestTopicOnly=latestTopicOnly
                   showTopics="true"}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
index be9b156b45..d10e5bf1c5 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
@@ -1,7 +1,7 @@
 {{#if selectedHtml}}
   <li>
     <a href {{action "toggleExpanded"}} class="expander">
-      <span>{{html-safe selectedHtml}}</span>
+      <span class="selection">{{html-safe selectedHtml}}</span>
       {{d-icon "caret-down"}}
     </a>
   </li>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/parent-category-row.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/parent-category-row.hbs
index 7e1e3e6642..a830a77a54 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/parent-category-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/parent-category-row.hbs
@@ -40,28 +40,18 @@
       </tbody>
     </table>
     <footer class="clearfix category-topics-count">
-      <figure title={{i18n "all_time_desc"}}>
+      <div class="category-stat">
         <a href={{category.url}}>
-          {{number category.topics_all_time}}
-          <figcaption>{{i18n "all_time"}}</figcaption>
+          {{html-safe category.statTotal}}
         </a>
-      </figure>
-      {{#if category.pickMonth}}
-        <figure title={{i18n "month_desc"}}>
+      </div>
+      {{#unless category.pickAll}}
+        <div class="category-stat">
           <a href={{category.url}}>
-            {{number category.topics_month}}
-            <figcaption>/ {{i18n "month"}}</figcaption>
+            {{html-safe category.stat}}
           </a>
-        </figure>
-      {{/if}}
-      {{#if category.pickWeek}}
-        <figure title={{i18n "week_desc"}}>
-          <a href={{category.url}}>
-            {{number category.topics_week}}
-            <figcaption>/ {{i18n "week"}}</figcaption>
-          </a>
-        </figure>
-      {{/if}}
+        </div>
+      {{/unless}}
     </footer>
   </div>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/categories.hbs
index 6a5c91b8b8..282c608b75 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/discovery/categories.hbs
@@ -1,6 +1,5 @@
 {{#discovery-categories refresh=(action "refresh")}}
   {{component categoryPageStyle
               categories=model.categories
-              latestTopicOnly=latestTopicOnly
               topics=model.topics}}
 {{/discovery-categories}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
index d9b2df6cd0..cb6635347c 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
@@ -1,3 +1,24 @@
+{{#if showDismissAtTop}}
+  <div class="row dismiss-container-top">
+    {{#if showDismissRead}}
+      {{d-button
+        class="btn-default dismiss-read"
+        id="dismiss-topics-top"
+        action=(action "dismissReadPosts")
+        title="topics.bulk.dismiss_tooltip"
+        label="topics.bulk.dismiss_button"}}
+    {{/if}}
+    {{#if showResetNew}}
+      {{d-button
+        class="btn-default dismiss-read"
+        id="dismiss-new-top"
+        action=(action "resetNew")
+        icon="check"
+        label="topics.bulk.dismiss_new"}}
+    {{/if}}
+  </div>
+{{/if}}
+
 {{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount as |discoveryTopicList|}}
   {{#if top}}
     <div class="top-lists">
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
index 5ef942e30c..a0c6c8ce58 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
@@ -8,19 +8,12 @@
 
   <div class="group-members-manage">
     {{#if canManageGroup}}
-      {{#if currentUser.admin}}
-        {{group-members-dropdown
-          groupName=model.full_name
-          showAddMembersModal=(route-action "showAddMembersModal")
-        }}
-      {{else}}
-        {{d-button
-          icon="plus"
-          label="groups.manage.add_members"
-          class="group-members-add"
-          action=(route-action "showAddMembersModal")
-        }}
-      {{/if}}
+      {{d-button
+        icon="plus"
+        label="groups.manage.add_members"
+        class="group-members-add"
+        action=(route-action "showAddMembersModal")
+      }}
     {{/if}}
   </div>
 
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
index 201bc81630..79aa1fabd1 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
@@ -1,43 +1,31 @@
 {{#login-modal loginName=loginName loginPassword=loginPassword secondFactorToken=secondFactorToken action=(action "login")}}
   {{plugin-outlet name="login-before-modal-body" tagName=""}}
-  {{#d-modal-body title="login.title" class=modalBodyClasses}}
+  {{#d-modal-body class=modalBodyClasses}}
+    <div class="login-welcome-header">
+      <h1 class="login-title">{{i18n "login.header_title"}}</h1> <img src={{wavingHandURL}} alt="" class="waving-hand">
+      <p class="login-subheader">{{i18n "login.subheader_title"}}</p>
+    </div>
     {{#if showLoginButtons}}
-      {{login-buttons
-        showLoginWithEmailLink=showLoginWithEmailLink
-        processingEmailLink=processingEmailLink
-        emailLogin=(action "emailLogin")
-        externalLogin=(action "externalLogin")}}
+      {{login-buttons externalLogin=(action "externalLogin")}}
     {{/if}}
 
     {{#if canLoginLocal}}
       <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>
-                  {{text-field value=loginName type="email" placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" disabled=showSecondFactor}}
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <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}}
-                </td>
-              </tr>
-              <tr>
-                <td></td>
-                <td>
-                  <a href id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n "forgot_password.action"}}</a>
-                </td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="input-group">
+            {{input value=loginName class=(value-entered loginName) type="email" id="login-account-name" autocorrect="off" autocapitalize="off" disabled=showSecondFactor autofocus="autofocus"}}
+            <label class="alt-placeholder" for="login-account-name">{{i18n "login.email_placeholder"}}</label>
+            {{#if showLoginWithEmailLink}}
+              <a href id="email-login-link" {{action (unless processingEmailLink "emailLogin")}}>
+                {{i18n "email_login.login_link"}}
+              </a>
+            {{/if}}
+          </div>
+          <div class="input-group">
+            {{input value=loginPassword class=(value-entered loginPassword) type="password" id="login-account-password" maxlength="200" disabled=showSecondFactor}}
+            <label class="alt-placeholder" for="login-account-password">{{i18n "login.password"}}</label>
+            <a href id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n "forgot_password.action"}}</a>
+          </div>
         </div>
         {{#second-factor-form
           secondFactorMethod=secondFactorMethod
@@ -75,9 +63,7 @@
       {{/unless}}
 
       {{#if showSignupLink}}
-        {{#d-button class="btn-large" id="new-account-link" action=(route-action "showCreateAccount")}}
-          {{i18n "create_account.title"}}
-        {{/d-button}}
+        {{d-button class="btn-large" id="new-account-link" action=(route-action "showCreateAccount") label="create_account.title"}}
       {{/if}}
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/users.hbs b/app/assets/javascripts/discourse/app/templates/mobile/users.hbs
index e7f3884e52..05c929f113 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/users.hbs
@@ -11,7 +11,12 @@
             {{lastUpdatedAt}}
           </div>
         {{/if}}
-        {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name no-blur"}}
+        {{input
+          value=(readonly nameInput)
+          input=(action "onFilterChanged" value="target.value")
+          placeholderKey="directory.filter_name"
+          class="filter-name no-blur"
+        }}
       </div>
 
       {{#conditional-loading-spinner condition=model.loading}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
index 67429842ef..fe52ecf0be 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
@@ -8,27 +8,33 @@
       {{/each}}
     </div>
   {{else}}
+    {{#if user.use_logo_small_as_avatar}}
+      <div class="avatar-choice">
+        {{radio-button id="logo-small" name="logo" value="logo" selection=selected}}
+        <label class="radio" for="logo-small">{{bound-avatar-template siteSettings.site_logo_small_url "large"}} {{html-safe (i18n "user.change_avatar.logo_small")}}</label>
+      </div>
+    {{/if}}
     <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>
     </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>
-
-      {{d-button action=(action "refreshGravatar")
-                 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" gravatarName=gravatarName}}</p>
-      {{/if}}
-    </div>
     {{#if allowAvatarUpload}}
       <div class="avatar-choice">
-        {{radio-button id="uploaded-avatar" name="avatar" value="uploaded" selection=selected}}
+        {{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>
+
+        {{d-button action=(action "refreshGravatar")
+                   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" gravatarName=gravatarName}}</p>
+        {{/if}}
+      </div>
+      <div class="avatar-choice">
+        {{radio-button id="uploaded-avatar" name="avatar" value="custom" selection=selected}}
         <label class="radio" for="uploaded-avatar">
           {{#if user.custom_avatar_template}}
             {{bound-avatar-template user.custom_avatar_template "large"}}
@@ -50,7 +56,7 @@
 
 {{#unless siteSettings.selectable_avatars_enabled}}
   <div class="modal-footer">
-    {{d-button action=(action "saveAvatarSelection") class="btn-primary" disabled=uploading label="save"}}
+    {{d-button action=(action "saveAvatarSelection") class="btn-primary" disabled=submitDisabled label="save"}}
     {{d-modal-cancel close=(route-action "closeModal")}}
   </div>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
index 14f3bc88c9..b50137ab30 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
@@ -1,122 +1,8 @@
 {{#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>
-      </div>
-    {{/if}}
-
-    <div class="control-group bookmark-name-wrap">
-      {{input id="bookmark-name" value=model.name name="bookmark-name" class="bookmark-name" enter=(action "saveAndClose") placeholder=(i18n "post.bookmarks.name_placeholder") maxlength="100"}}
-      {{d-button icon="cog" action=(action "toggleOptionsPanel") class="bookmark-options-button"}}
-    </div>
-
-    <div class="bookmark-options-panel">
-      <label class="control-label" for="bookmark_auto_delete_preference">{{i18n "bookmarks.auto_delete_preference.label"}}</label>
-      {{combo-box
-        content=autoDeletePreferences
-        value=autoDeletePreference
-        class="bookmark-option-selector"
-        onChange=(action (mut autoDeletePreference))
-      }}
-    </div>
-
-    {{#if showExistingReminderAt }}
-      <div class="alert alert-info existing-reminder-at-alert">
-        {{d-icon "far-clock"}}
-        <span>{{i18n "bookmarks.reminders.existing_reminder" at_date_time=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 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">{{startNextBusinessWeekLabel}}</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}}
-          {{#if showPostLocalDate}}
-            {{#tap-tile icon="globe-americas" tileId=reminderTypes.POST_LOCAL_DATE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.post_local_date"}}</div>
-              <div class="tap-tile-date">{{postLocalDateFormatted}}</div>
-            {{/tap-tile}}
-          {{/if}}
-          {{#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))
-                  id="bookmark-custom-date"
-                }}
-              </div>
-              <div class="tap-tile-time-input">
-                {{d-icon "far-clock"}}
-                {{input placeholder="--:--" id="bookmark-custom-time" 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=(base-path))}}</div>
-      {{/if}}
-    </div>
-
-    <div class="control-group">
-      {{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 id="delete-bookmark" icon="trash-alt" class="btn-danger" action=(action "delete")}}
-        </div>
-      {{/if}}
-    </div>
-  {{/conditional-loading-spinner}}
+  {{bookmark model=model
+    afterSave=afterSave
+    afterDelete=afterDelete
+    onCloseWithoutSaving=onCloseWithoutSaving
+    registerOnCloseHandler=(action "registerOnCloseHandler")
+    closeModal=(action "closeModal")}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
index 26e9d7df3c..5a40fd7938 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
@@ -1,13 +1,15 @@
-{{#each notificationLevels as |level|}}
-  <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>
-    </label>
-  </div>
-{{/each}}
+<div class="bulk-notification-list">
+  {{#each notificationLevels as |level|}}
+    <div class="controls">
+      <label class="radio notification-level-radio">
+        {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
+        <div class="description">{{html-safe level.description}}</div>
+      </label>
+    </div>
+  {{/each}}
+</div>
 
 {{d-button
   disabled=disabled
   action=(action "changeNotificationLevel")
-  label="topics.bulk.notification_level"}}
+  label="topics.bulk.change_notification_level"}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
index 0e06efcf1b..e56941d0cf 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
@@ -9,10 +9,15 @@
 
   <form>
     <label></label>
-    {{user-selector single="true"
-                    usernames=new_user
-                    placeholderKey="topic.change_owner.placeholder"
-                    autocomplete="discourse"}}
+    {{email-group-user-chooser
+      value=newOwner
+      autofocus=true
+      onChange=(action "updateNewOwner")
+      options=(hash
+        maximum=1
+        filterPlaceholder="topic.change_owner.placeholder"
+      )
+    }}
   </form>
 {{/d-modal-body}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
index a353fb0f88..2e206501c5 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
@@ -1,168 +1,176 @@
 {{#create-account email=accountEmail disabled=submitDisabled action=(action "createAccount")}}
   {{#unless complete}}
     {{plugin-outlet name="create-account-before-modal-body"}}
-    {{#d-modal-body title="create_account.title" class=modalBodyClasses}}
-
-      {{#unless hasAuthOptions}}
-        {{login-buttons externalLogin=(action "externalLogin")}}
-      {{/unless}}
+    {{#d-modal-body class=modalBodyClasses}}
 
       {{#if skipConfirmation}}
         {{loading-spinner size="large"}}
       {{/if}}
 
-      {{#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>
-                    {{#if emailValidated}}
-                      <span class="value">{{accountEmail}}</span>
-                    {{else}}
-                      {{input type="email" value=accountEmail id="new-account-email" name="email" autofocus="autofocus"}}
-                    {{/if}}
-                  </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>
-
-                <tr class="input">
-                  <td class="label"><label for="new-account-username">{{i18n "user.username.title"}}</label></td>
-                  <td>
-                    {{#if usernameDisabled}}
-                      <span class="value">{{accountUsername}}</span>
-                    {{else}}
-                      {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
-                    {{/if}}
-                  </td>
-                </tr>
-                <tr class="instructions">
-                  <td></td>
-                  {{input-tip validation=usernameValidation id="username-validation"}}
-                  <td><label>{{i18n "user.username.instructions"}}</label></td>
-                </tr>
-
-                {{#if fullnameRequired}}
-                  <tr class="input">
-                    <td class="label">
-                      <label for="new-account-name">{{i18n "user.name.title"}}</label>
-                    </td>
-                    <td>
-                      {{#if nameDisabled}}
-                        <span class="value">{{accountName}}</span>
-                      {{else}}
-                        {{text-field value=accountName id="new-account-name"}}
-                      {{/if}}
-                    </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}}
-                    </td>
-                  </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>
-                    {{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}}
-
-                {{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 class="create-account-form">
+        <div class="login-welcome-header">
+          <h1 class="login-title">{{i18n "create_account.header_title"}}</h1> <img src={{wavingHandURL}} alt="" class="waving-hand">
+          <p class="login-subheader">{{i18n "create_account.subheader_title"}}</p>
         </div>
-      {{/if}}
-    {{/d-modal-body}}
-
-    {{#if showCreateForm}}
-      <div class="modal-footer">
-        {{d-button
-          class="btn-large btn-primary"
-          action=(action "createAccount")
-          disabled=submitDisabled
-          label="create_account.title"
-          isLoading=formSubmitted
-        }}
-
         {{#unless hasAuthOptions}}
-          {{#d-button class="btn-large" id="login-link" action=(route-action "showLogin") disabled=formSubmitted}}
-            {{i18n "log_in"}}
-          {{/d-button}}
+          <div class="create-account-login-buttons">
+            {{login-buttons externalLogin=(action "externalLogin")}}
+          </div>
         {{/unless}}
+        {{#if showCreateForm}}
 
-        <div class="disclaimer">{{html-safe disclaimerHtml}}</div>
+          <div class="login-form">
+
+            <form>
+              <div class="input-group create-account-email">
+                {{#if emailValidated}}
+                  <span class="value">{{accountEmail}}</span>
+                {{else}}
+                  {{input type="email" value=accountEmail id="new-account-email" name="email" class=(value-entered accountEmail) autofocus="autofocus" focusOut=(action "checkEmailAvailability")}}
+                  <label class="alt-placeholder" for="new-account-email">
+                    {{i18n "user.email.title"}}
+                    {{~#if userFields~}}
+                      <span class="required">*</span>
+                    {{/if}}
+                  </label>
+                {{/if}}
+                {{input-tip validation=emailValidation id="account-email-validation"}}
+                <label class="more-info" for="new-account-email">{{i18n "user.email.instructions"}}</label>
+              </div>
+
+              <div class="input-group">
+                {{#if usernameDisabled}}
+                  <span class="value">{{accountUsername}}</span>
+                {{else}}
+                  {{input value=accountUsername class=(value-entered accountUsername) id="new-account-username" name="username" maxlength=maxUsernameLength
+                  autocomplete="discourse"}}
+                  <label class="alt-placeholder" for="new-account-username">
+                    {{i18n "user.username.title"}}
+                    {{~#if userFields~}}
+                      <span class="required">*</span>
+                    {{/if}}
+                  </label>
+                {{/if}}
+
+                {{input-tip validation=usernameValidation id="username-validation"}}
+                <label class="more-info" for="new-account-username">{{i18n "user.username.instructions"}}</label>
+              </div>
+
+              <div class="input-group">
+                {{#if fullnameRequired}}
+
+                  {{#if nameDisabled}}
+                    <span class="value">{{accountName}}</span>
+                  {{else}}
+                    {{text-field value=accountName id="new-account-name" class=(value-entered accountName)}}
+                    <label class="alt-placeholder" for="new-account-name">
+                      {{i18n "user.name.title"}}
+                      {{#if siteSettings.full_name_required}}
+                        {{~#if userFields~}}
+                          <span class="required">*</span>
+                        {{/if}}
+                      {{/if}}
+                    </label>
+                  {{/if}}
+
+                  {{input-tip validation=nameValidation}}
+                  <label class="more-info" for="new-account-name">{{nameInstructions}}</label>
+                {{/if}}
+              </div>
+
+              {{plugin-outlet
+              name="create-account-before-password"
+                noTags=true
+                args=(hash
+                  accountName=accountName
+                  accountUsername=accountUsername
+                  accountPassword=accountPassword
+                  userFields=userFields
+                  authOptions=authOptions
+                )
+              }}
+
+              <div class="input-group">
+                {{#if passwordRequired}}
+                  {{password-field value=accountPassword class=(value-entered accountPassword) type="password" id="new-account-password" autocomplete="current-password" capsLockOn=capsLockOn}}
+                  <label class="alt-placeholder" for="new-account-password">
+                    {{i18n "user.password.title"}}
+                    {{~#if userFields~}}
+                      <span class="required">*</span>
+                    {{/if}}
+                  </label>
+
+                  {{input-tip validation=passwordValidation}}
+                  <label class="more-info" for="new-account-password">{{passwordInstructions}}</label>
+                  <div class="caps-lock-warning {{unless capsLockOn " hidden"}}">
+                    {{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}
+                  </div>
+                {{/if}}
+
+                <div class="password-confirmation">
+                  <label for="new-account-password-confirmation">{{i18n "user.password_confirmation.title"}}</label>
+                  {{honeypot-input id="new-account-confirmation" autocomplete="new-password" value=accountHoneypot}}
+                  {{input value=accountChallenge id="new-account-challenge"}}
+                </div>
+              </div>
+
+              {{#if requireInviteCode }}
+                <div class="input-group">
+                  {{input value=inviteCode class=(value-entered inviteCode) id="inviteCode"}}
+                  <label class="alt-placeholder" for="invite-code">{{i18n "user.invite_code.title"}}</label>
+                  <label class="more-info" for="invite-code">{{i18n "user.invite_code.instructions"}}</label>
+                </div>
+              {{/if}}
+
+              {{plugin-outlet
+                name="create-account-after-password"
+                noTags=true
+                args=(hash
+                  accountName=accountName
+                  accountUsername=accountUsername
+                  accountPassword=accountPassword
+                  userFields=userFields
+                )
+              }}
+
+              {{#if userFields}}
+                <div class="user-fields">
+                  {{#each userFields as |f|}}
+                    <div class="input-group">
+                      {{!-- adding the value-entered class here to
+                      be able to detect if the user field has a value
+                      entered --}}
+                      {{user-field field=f.field value=f.value
+                      class=(value-entered f.value)}}
+                    </div>
+                  {{/each}}
+                </div>
+              {{/if}}
+            </form>
+          </div>
+
+          <div class="modal-footer">
+            {{d-button
+              class="btn-large btn-primary"
+              action=(action "createAccount")
+              disabled=submitDisabled
+              label="create_account.title"
+              isLoading=formSubmitted
+            }}
+
+            {{#unless hasAuthOptions}}
+              {{d-button class="btn-large" id="login-link" action=(route-action "showLogin") disabled=formSubmitted label="log_in"}}
+            {{/unless}}
+
+            <div class="disclaimer">
+              {{html-safe disclaimerHtml}}
+            </div>
+          </div>
+
+          {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
+
+        {{/if}}
       </div>
-
-      {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
-    {{/if}}
+    {{/d-modal-body}}
   {{/unless}}
 {{/create-account}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-invite-bulk.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-invite-bulk.hbs
new file mode 100644
index 0000000000..3973a3912e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-invite-bulk.hbs
@@ -0,0 +1,28 @@
+{{#create-invite-uploader as |status|}}
+  {{#d-modal-body title="user.invited.bulk_invite.text"}}
+    {{#if status.uploaded}}
+      {{i18n "user.invited.bulk_invite.success"}}
+    {{else}}
+      {{html-safe (i18n "user.invited.bulk_invite.instructions")}}
+
+      <input id="csv-file" disabled={{status.uploading}} type="file" accept=".csv">
+    {{/if}}
+  {{/d-modal-body}}
+
+  <div class="modal-footer">
+    {{#unless status.uploaded}}
+      {{d-button
+        icon=(if isEmail "envelope" "link")
+        translatedLabel=(if status.uploading (i18n "user.invited.bulk_invite.progress" progress=status.progress)
+                                             (i18n "user.invited.bulk_invite.text"))
+        class="btn-primary"
+        action=(action "submit" status.data)
+        disabled=status.submitDisabled
+      }}
+    {{/unless}}
+
+    {{d-button label="close"
+              class="btn-primary"
+              action=(route-action "closeModal")}}
+  </div>
+{{/create-invite-uploader}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
new file mode 100644
index 0000000000..941531c263
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
@@ -0,0 +1,142 @@
+{{#d-modal-body title=(if invite.id "user.invited.invite.edit_title" "user.invited.invite.new_title")}}
+  <form>
+    <div class="input-group invite-link">
+      <label for="invite-link">{{i18n "user.invited.invite.instructions"}}</label>
+      <div class="invite-input-with-button">
+        {{input
+          name="invite-link"
+          class="invite-link"
+          value=invite.link
+          readonly=true
+        }}
+        {{copy-button selector="input.invite-link" copied=(action "copied")}}
+      </div>
+    </div>
+
+    <p>{{expiresAtLabel}}</p>
+
+    <div class="input-group invite-type">
+      {{input type="checkbox" id="invite-type" checked=limitToEmail click=(action "toggleLimitToEmail")}}
+      <label for="invite-type">{{i18n "user.invited.invite.restrict_email"}}</label>
+
+      {{#if isEmail}}
+        <div class="invite-input-with-button">
+          {{input
+            id="invite-email"
+            value=buffered.email
+            placeholderKey="topic.invite_reply.email_placeholder"
+          }}
+          {{#if capabilities.hasContactPicker}}
+            {{d-button
+              icon="address-book"
+              action=(action "searchContact")
+              class="btn-primary open-contact-picker"
+            }}
+          {{/if}}
+        </div>
+      {{/if}}
+    </div>
+
+    {{#if isLink}}
+      <div class="input-group invite-max-redemptions">
+        <label for="invite-max-redemptions">{{i18n "user.invited.invite.max_redemptions_allowed"}}</label>
+        {{input
+          id="invite-max-redemptions"
+          type="number"
+          value=buffered.max_redemptions_allowed
+          min="1"
+          max=maxRedemptionsAllowedLimit
+        }}
+      </div>
+    {{/if}}
+
+    {{#if isEmail}}
+      {{#if showAdvanced}}
+        <div class="input-group invite-custom-message">
+          <label for="invite-message">{{i18n "user.invited.invite.custom_message"}}</label>
+          {{textarea id="invite-message" value=buffered.custom_message}}
+        </div>
+      {{/if}}
+    {{/if}}
+
+    {{#if showAdvanced}}
+      {{#if currentUser.staff}}
+        <div class="input-group invite-to-topic">
+          {{choose-topic
+            selectedTopicId=buffered.topicId
+            topicTitle=buffered.topicTitle
+            additionalFilters="status:public"
+            label="user.invited.invite.invite_to_topic"
+          }}
+        </div>
+      {{else if buffered.topicTitle}}
+        <div class="input-group">
+          <label for="invite-topic">{{i18n "user.invited.invite.invite_to_topic"}}</label>
+          {{input
+            name="invite-topic"
+            class="invite-topic"
+            value=buffered.topicTitle
+            readonly=true
+          }}
+        </div>
+      {{/if}}
+    {{/if}}
+
+    {{#if showAdvanced}}
+      {{#if canInviteToGroup}}
+        <div class="input-group invite-to-groups">
+          <label>{{i18n "user.invited.invite.add_to_groups"}}</label>
+          {{group-chooser
+            content=allGroups
+            value=buffered.groupIds
+            labelProperty="name"
+            onChange=(action (mut buffered.groupIds))
+          }}
+        </div>
+      {{/if}}
+    {{/if}}
+
+    {{#if showAdvanced}}
+      {{#if currentUser.staff}}
+        <div class="input-group invite-expires-at">
+          {{future-date-input
+            displayLabel=(i18n "user.invited.invite.expires_at")
+            includeDateTime=true
+            includeMidFuture=true
+            clearable=true
+            onChangeInput=(action (mut buffered.expires_at))
+          }}
+        </div>
+      {{/if}}
+    {{/if}}
+  </form>
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button
+    icon="link"
+    label="user.invited.invite.save_invite"
+    class="btn-primary save-invite"
+    action=(action "saveInvite")
+    disabled=disabled
+  }}
+
+  {{#if isEmail}}
+    {{d-button
+      icon="envelope"
+      label=(if invite.emailed "user.invited.reinvite" "user.invited.invite.send_invite_email")
+      class="btn-primary send-invite"
+      action=(action "saveInvite" true)
+      disabled=disabled
+    }}
+  {{/if}}
+
+  {{#if hasAdvanced}}
+    {{d-button
+      action=(action "toggleAdvanced")
+      class="btn-default show-advanced"
+      icon="cog"
+      title=(if showAdvanced "user.invited.invite.hide_advanced" "user.invited.invite.show_advanced")
+    }}
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/delete-topic-confirm.hbs b/app/assets/javascripts/discourse/app/templates/modal/delete-topic-confirm.hbs
index 3184aad17f..5c52f7ac8f 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/delete-topic-confirm.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/delete-topic-confirm.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  <p>{{i18n "post.controls.delete_topic_confirm_modal" minViews=siteSettings.min_topic_views_for_delete_confirm}}</p>
+  <p>{{i18n "post.controls.delete_topic_confirm_modal" count=siteSettings.min_topic_views_for_delete_confirm}}</p>
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/app/templates/modal/discard-draft.hbs b/app/assets/javascripts/discourse/app/templates/modal/discard-draft.hbs
index 37720352a1..46c706cbc4 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/discard-draft.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/discard-draft.hbs
@@ -1,10 +1,11 @@
-{{#d-modal-body}}
+{{#d-modal-body headerClass="hidden"}}
   <div class="instructions">
-    {{i18n descriptionKey}}
+    {{i18n "post.cancel_composer.confirm"}}
   </div>
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button label=discardKey class="btn-danger" action=(action "_destroyDraft")}}
-  {{d-button label=saveKey action=(action "_saveDraft")}}
+  {{d-button icon="far-trash-alt" label="post.cancel_composer.discard" class="btn-danger discard-draft" action=(action "destroyDraft")}}
+  {{d-button label="post.cancel_composer.save_draft" class="save-draft" action=(action "saveDraftAndClose")}}
+  {{d-button label="post.cancel_composer.keep_editing" class="keep-editing" action=(action "dismissModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs b/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs
new file mode 100644
index 0000000000..6a31d7d559
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs
@@ -0,0 +1,20 @@
+{{#d-modal-body title="do_not_disturb.title"}}
+  {{#tap-tile-grid activeTile=duration as |grid|}}
+    {{#tap-tile class="do-not-disturb-tile" tileId="30" activeTile=grid.activeTile onChange=(action "setDuration")}}
+      {{i18n "do_not_disturb.options.half_hour"}}
+    {{/tap-tile}}
+    {{#tap-tile class="do-not-disturb-tile" tileId="60" activeTile=grid.activeTile onChange=(action "setDuration")}}
+      {{i18n "do_not_disturb.options.one_hour"}}
+    {{/tap-tile}}
+    {{#tap-tile class="do-not-disturb-tile" tileId="120" activeTile=grid.activeTile onChange=(action "setDuration")}}
+      {{i18n "do_not_disturb.options.two_hours"}}
+    {{/tap-tile}}
+    {{#tap-tile class="do-not-disturb-tile" tileId="tomorrow" activeTile=grid.activeTile onChange=(action "setDuration")}}
+      {{i18n "do_not_disturb.options.tomorrow"}}
+    {{/tap-tile}}
+  {{/tap-tile-grid}}
+
+  <a href {{ action navigateToNotificationSchedule }}>
+    {{i18n "do_not_disturb.set_schedule"}}
+  </a>
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/edit-slow-mode.hbs b/app/assets/javascripts/discourse/app/templates/modal/edit-slow-mode.hbs
index 956db77d76..19f54b2c0e 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/edit-slow-mode.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/edit-slow-mode.hbs
@@ -25,6 +25,18 @@
       {{input value=seconds type="number" class="input-small"}}
     </div>
   {{/if}}
+
+  <div class="control-group">
+    {{future-date-input
+      class="enabled-until"
+      label="topic.slow_mode_update.enabled_until"
+      labelClasses="slow-mode-label"
+      includeFarFuture=false
+      clearable=true
+      input=enabledUntil
+      onChangeInput=(action (mut enabledUntil))
+    }}
+  </div>
 {{/d-modal-body}}
 
 <div class="modal-footer">
@@ -42,4 +54,4 @@
                disabled=submitDisabled
                label="topic.slow_mode_update.remove"}}
   {{/if}}
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/app/templates/modal/edit-topic-timer.hbs
index cc3fffea50..60386d1d9c 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/edit-topic-timer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/edit-topic-timer.hbs
@@ -1,26 +1,25 @@
-{{#d-modal-body title="topic.topic_status_update.title" autoFocus="false"}}
+{{#d-modal-body title="topic.topic_status_update.title" autoFocus="false" id="topic-timer-modal"}}
   {{edit-topic-timer-form
     topic=model
     topicTimer=topicTimer
     timerTypes=publicTimerTypes
-    updateTime=updateTime
     onChangeStatusType=(action "onChangeStatusType")
     onChangeInput=(action "onChangeInput")
-    onChangeDuration=(action "onChangeDuration")
   }}
+
+  <div class="modal-footer control-group edit-topic-timer-buttons">
+    {{d-button class="btn-primary"
+        disabled=saveDisabled
+        label="topic.topic_status_update.save"
+        action=(action "saveTimer")}}
+
+    {{conditional-loading-spinner size="small" condition=loading}}
+
+    {{#if topicTimer.execute_at}}
+      {{d-button class="pull-right btn-danger"
+          action=(action "removeTimer")
+          label="topic.topic_status_update.remove"}}
+    {{/if}}
+  </div>
 {{/d-modal-body}}
 
-<div class="modal-footer">
-  {{d-button class="btn-primary"
-      disabled=saveDisabled
-      label="topic.topic_status_update.save"
-      action=(action "saveTimer")}}
-
-  {{conditional-loading-spinner size="small" condition=loading}}
-
-  {{#if topicTimer.execute_at}}
-    {{d-button class="pull-right btn-danger"
-        action=(action "removeTimer")
-        label="topic.topic_status_update.remove"}}
-  {{/if}}
-</div>
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 fddb84f15a..dc280e179d 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs
@@ -71,39 +71,26 @@
         </p>
       </div>
     </div>
-    <div class="feature-section">
-      <div class="desc">
-        <p>
-          {{#conditional-loading-spinner size="small" condition=loading}}
-            {{#if pinnedGloballyCount}}
-              {{html-safe (i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount)}}
-            {{else}}
-              {{html-safe (i18n "topic.feature_topic.not_pinned_globally")}}
-            {{/if}}
-          {{/conditional-loading-spinner}}
-        </p>
-        <p>
-          {{i18n "topic.feature_topic.global_pin_note"}}
-        </p>
-        {{#if site.isMobileDevice}}
+    {{#if canPinGlobally}}
+      <div class="feature-section">
+        <div class="desc">
           <p>
-            {{i18n "topic.feature_topic.pin_globally"}}
+            {{#conditional-loading-spinner size="small" condition=loading}}
+              {{#if pinnedGloballyCount}}
+                {{html-safe (i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount)}}
+              {{else}}
+                {{html-safe (i18n "topic.feature_topic.not_pinned_globally")}}
+              {{/if}}
+            {{/conditional-loading-spinner}}
           </p>
-          <p class="with-validation">
-            {{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}}
+          <p>
+            {{i18n "topic.feature_topic.global_pin_note"}}
           </p>
-        {{else}}
-          <p class="with-validation">
-            {{i18n "topic.feature_topic.pin_globally"}}
-            <span>
-              {{d-icon "far-clock"}}
+          {{#if site.isMobileDevice}}
+            <p>
+              {{i18n "topic.feature_topic.pin_globally"}}
+            </p>
+            <p class="with-validation">
               {{future-date-input
                 class="pin-until"
                 includeFarFuture=true
@@ -112,14 +99,29 @@
                 onChangeInput=(action (mut model.pinnedGloballyUntil))
               }}
               {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
-            </span>
+            </p>
+          {{else}}
+            <p class="with-validation">
+              {{i18n "topic.feature_topic.pin_globally"}}
+              <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>
+            {{d-button action=(action "pinGlobally") icon="thumbtack" label="topic.feature.pin_globally" class="btn-primary"}}
           </p>
-        {{/if}}
-        <p>
-          {{d-button action=(action "pinGlobally") icon="thumbtack" label="topic.feature.pin_globally" class="btn-primary"}}
-        </p>
+        </div>
       </div>
-    </div>
+    {{/if}}
   {{/if}}
   {{#if currentUser.staff}}
     <div class="feature-section">
@@ -147,7 +149,7 @@
           {{#if model.isBanner}}
             {{d-button action=(action "removeBanner") icon="thumbtack" label="topic.feature.remove_banner" class="btn-primary"}}
           {{else}}
-            {{d-button action=(action "makeBanner") icon="thumbtack" label="topic.feature.make_banner" class="btn-primary"}}
+            {{d-button action=(action "makeBanner") icon="thumbtack" label="topic.feature.make_banner" class="btn-primary make-banner"}}
           {{/if}}
         </p>
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/flag.hbs b/app/assets/javascripts/discourse/app/templates/modal/flag.hbs
index 3b2284ccba..0cea23d91f 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/flag.hbs
@@ -40,6 +40,13 @@
         performAction=(action "takeAction")
         reviewableUpdating=submitDisabled
     }}
+
+    {{d-button
+      class="btn-danger"
+      action=(action "flagForReview")
+      icon="exclamation-triangle"
+      label="flagging.flag_for_review"
+    }}
   {{/if}}
 
   {{#if showDeleteSpammer}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs b/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs
index 1222da13bc..5e0e9cd718 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs
@@ -8,12 +8,16 @@
         {{i18n "groups.add_members.description"}}
       </p>
 
-      {{user-selector
-          class="input-xxlarge"
-          usernames=usernamesAndEmails
+      {{email-group-user-chooser
+        class="input-xxlarge"
+        value=usernamesAndEmails
+        id="group-add-members-user-selector"
+        onChange=(action (mut usernamesAndEmails))
+        options=(hash
           allowEmails=true
-          placeholderKey="groups.add_members.input_placeholder"
-          id="group-add-members-user-selector"}}
+          filterPlaceholder="groups.add_members.input_placeholder"
+        )
+      }}
     </div>
 
     {{#if model.can_admin_group}}
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 379f8bc893..84bef934e3 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
@@ -1,10 +1,14 @@
 {{#d-modal-body title="user.user_notifications.ignore_duration_title" autoFocus="false"}}
   <div class="controls tracking-controls">
     <label>{{d-icon "far-eye-slash" class="icon"}} {{i18n "user.user_notifications.ignore_duration_username"}}</label>
-    {{user-selector excludeCurrentUser=true
-                    single=true
-                    class="user-selector"
-                    usernames=ignoredUsername}}
+    {{email-group-user-chooser
+      value=ignoredUsername
+      onChange=(action "updateIgnoredUsername")
+      options=(hash
+        excludeCurrentUser=true
+        maximum=1
+      )
+    }}
   </div>
   {{future-date-input
     label="user.user_notifications.ignore_duration_when"
diff --git a/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
index 31e5c46980..c589e643bf 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
@@ -1,5 +1,5 @@
-<form {{action "ok" on="submit"}}>
-  {{#d-modal-body title="composer.link_dialog_title" class="insert-link"}}
+{{#d-modal-body title="composer.link_dialog_title" class="insert-link"}}
+  <form id="insert-hyperlink-form" {{action "ok" on="submit"}}>
     <div class="inputs">
       {{text-field
         value=linkUrl
@@ -18,7 +18,8 @@
               class="search-link"
               href={{result.url}}
               onclick={{action "linkClick"}}
-              data-title={{result.fancy_title}}>
+              data-title={{result.fancy_title}}
+            >
               {{topic-status topic=result disableActions=true}}
               {{replace-emoji result.fancy_title}}
               <div class="search-category">
@@ -36,10 +37,21 @@
     <div class="inputs">
       {{text-field value=linkText placeholderKey="composer.link_optional_text" class="link-text"}}
     </div>
-  {{/d-modal-body}}
+  </form>
+{{/d-modal-body}}
 
-  <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>
+<div class="modal-footer">
+  {{d-button
+    class="btn-primary"
+    label="composer.modal_ok"
+    action=(action "ok")
+    type="submit"
+    form="insert-hyperlink-form"
+  }}
+
+  {{d-button
+    class="btn-danger"
+    label="composer.modal_cancel"
+    action=(action "cancel")
+  }}
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/json-schema-editor.hbs b/app/assets/javascripts/discourse/app/templates/modal/json-schema-editor.hbs
new file mode 100644
index 0000000000..adeea5a5ed
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/modal/json-schema-editor.hbs
@@ -0,0 +1 @@
+{{json-editor model=this.model saveChangesCallback=(action "saveChanges") tagName=""}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/modal/login.hbs
index ca9faa98d9..6de18a9980 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/login.hbs
@@ -1,85 +1,93 @@
 {{#login-modal loginName=loginName loginPassword=loginPassword secondFactorToken=secondFactorToken action=(action "login")}}
   {{plugin-outlet name="login-before-modal-body" tagName=""}}
-  {{#d-modal-body title="login.title" class=modalBodyClasses}}
+  {{#d-modal-body class=modalBodyClasses}}
 
     {{#if canLoginLocal}}
-      <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>{{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>{{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>
-              </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></td>
-              </tr>
-            </tbody>
-          </table>
+      <div class="login-left-side">
+        <div class="login-welcome-header">
+          <h1 class="login-title">{{i18n "login.header_title"}}</h1> <img src={{wavingHandURL}} alt="" class="waving-hand">
+          <p class="login-subheader">{{i18n "login.subheader_title"}}</p>
         </div>
-        {{#second-factor-form
-          secondFactorMethod=secondFactorMethod
-          secondFactorToken=secondFactorToken
-          class=secondFactorClass
-          backupEnabled=backupEnabled
-          isLogin=true}}
-          {{#if showSecurityKey}}
-            {{#security-key-form
-              allowedCredentialIds=securityKeyAllowedCredentialIds
-              challenge=securityKeyChallenge
-              showSecurityKey=showSecurityKey
-              showSecondFactor=showSecondFactor
-              secondFactorMethod=secondFactorMethod
-              otherMethodAllowed=otherMethodAllowed
-              action=(action "authenticateSecurityKey")}}
-            {{/security-key-form}}
-          {{else}}
-            {{second-factor-input value=secondFactorToken inputId="login-second-factor" secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
+        <form id="login-form" method="post">
+          <div id="credentials" class={{credentialsClass}}>
+            <div class="input-group">
+              {{input value=loginName type="email" id="login-account-name" class=(value-entered loginName) autocomplete="username" autocorrect="off" autocapitalize="off" disabled=showSecondFactor autofocus="autofocus"}}
+              <label class="alt-placeholder" for="login-account-name">{{i18n "login.email_placeholder"}}</label>
+              {{#if showLoginWithEmailLink}}
+                <a href class={{if loginName "" "no-login-filled"}} id="email-login-link" {{action (unless processingEmailLink "emailLogin")}}>
+                  {{i18n "email_login.login_link"}}
+                </a>
+              {{/if}}
+            </div>
+            <div class="input-group">
+              {{input value=loginPassword type="password" class=(value-entered loginPassword) id="login-account-password" autocomplete="current-password" maxlength="200" capsLockOn=capsLockOn disabled=disableLoginFields}}
+              <label class="alt-placeholder" for="login-account-password">{{i18n "login.password"}}</label>
+              <a href id="forgot-password-link" {{action "forgotPassword"}}>{{i18n "forgot_password.action"}}</a>
+              <div class="caps-lock-warning {{unless capsLockOn "hidden"}}">{{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}</div>
+            </div>
+          </div>
+          {{#second-factor-form
+            secondFactorMethod=secondFactorMethod
+            secondFactorToken=secondFactorToken
+            class=secondFactorClass
+            backupEnabled=backupEnabled
+            isLogin=true}}
+            {{#if showSecurityKey}}
+              {{#security-key-form
+                allowedCredentialIds=securityKeyAllowedCredentialIds
+                challenge=securityKeyChallenge
+                showSecurityKey=showSecurityKey
+                showSecondFactor=showSecondFactor
+                secondFactorMethod=secondFactorMethod
+                otherMethodAllowed=otherMethodAllowed
+                action=(action "authenticateSecurityKey")}}
+              {{/security-key-form}}
+            {{else}}
+              {{second-factor-input value=secondFactorToken inputId="login-second-factor" secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
+            {{/if}}
+          {{/second-factor-form}}
+        </form>
+        <div class="modal-footer">
+          {{#if canLoginLocal}}
+            {{#unless showSecurityKey }}
+              {{d-button
+                action=(action "login")
+                id="login-button"
+                form="login-form"
+                icon="unlock"
+                label=loginButtonLabel
+                disabled=loginDisabled
+                class="btn btn-large btn-primary"}}
+            {{/unless}}
+
+            {{#if showSignupLink}}
+              {{d-button
+                class="btn-large"
+                id="new-account-link"
+                action=(action "createAccount")
+                label="create_account.title"}}
+            {{/if}}
           {{/if}}
-        {{/second-factor-form}}
-      </form>
+          {{conditional-loading-spinner condition=showSpinner size="small"}}
+        </div>
+      </div>
     {{/if}}
     {{#if showLoginButtons}}
-      {{login-buttons
-        showLoginWithEmailLink=showLoginWithEmailLink
-        processingEmailLink=processingEmailLink
-        emailLogin=(action "emailLogin")
-        externalLogin=(action "externalLogin")}}
+      {{#if noLoginLocal}}
+        <div class="login-left-side">
+          <div class="login-welcome-header">
+            <h1 class="login-title">{{i18n "login.header_title"}}</h1> <img src={{wavingHandURL}} alt="" class="waving-hand">
+            <p class="login-subheader">{{i18n "login.subheader_title"}}</p>
+          </div>
+        </div>
+      {{/if}}
+
+      <div class="login-right-side">
+        {{login-buttons externalLogin=(action "externalLogin")}}
+      </div>
     {{/if}}
   {{/d-modal-body}}
 
-  <div class="modal-footer">
-    {{#if canLoginLocal}}
-      {{#unless showSecurityKey }}
-        {{d-button
-          action=(action "login")
-          id="login-button"
-          form="login-form"
-          icon="unlock"
-          label=loginButtonLabel
-          disabled=loginDisabled
-          class="btn btn-large btn-primary"}}
-      {{/unless}}
-
-      {{#if showSignupLink}}
-        {{d-button
-          class="btn-large"
-          id="new-account-link"
-          action=(action "createAccount")
-          label="create_account.title"}}
-      {{/if}}
-    {{/if}}
-
-    {{conditional-loading-spinner condition=showSpinner size="small"}}
-  </div>
-
   {{plugin-outlet name="login-after-modal-footer" tagName=""}}
 
   <div class={{alertClass}} id="login-alert">{{alert}}</div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs
index 6386cecd2a..9a867e9f81 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs
@@ -36,7 +36,11 @@
         {{choose-message currentTopicId=model.id selectedTopicId=selectedTopicId}}
 
         <label>{{i18n "topic.move_to_new_message.participants"}}</label>
-        {{user-selector usernames=participants class="participant-selector"}}
+        {{email-group-user-chooser
+          class="participant-selector"
+          value=participants
+          onChange=(action (mut participants))
+        }}
       </form>
     {{/if}}
 
@@ -110,7 +114,5 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{#d-button class="btn-primary" disabled=buttonDisabled action=(action "performMove")}}
-    {{d-icon "sign-out-alt"}} {{buttonTitle}}
-  {{/d-button}}
+  {{d-button class="btn-primary" disabled=buttonDisabled action=(action "performMove") icon="sign-out-alt" translatedLabel=buttonTitle}}
 </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 9cd9a56087..94e16b22fa 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
@@ -23,7 +23,7 @@
           <p class="description">
             {{input
               type="checkbox"
-              checked=publishedPage.public
+              checked=(readonly publishedPage.public)
               click=(action "onChangePublic" value="target.checked")
             }}
             {{i18n "topic.publish_page.public_description"}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs b/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs
new file mode 100644
index 0000000000..ca82a2f7cc
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs
@@ -0,0 +1,17 @@
+{{#d-modal-body class="explain-reviewable"}}
+  {{textarea value=rejectReason}}
+  <div class="control-group">
+    <label>
+      {{input type="checkbox"
+        class="inline"
+        checked=sendEmail
+      }}
+      {{i18n "review.reject_reason.send_email"}}
+    </label>
+  </div>
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button icon="trash-alt" class="btn-danger" action=(action "perform") label="admin.user.delete"}}
+  {{d-button action=(route-action "closeModal") label="cancel"}}
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/rename-tag.hbs b/app/assets/javascripts/discourse/app/templates/modal/rename-tag.hbs
index ed4b9af204..0ce71cba7d 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/rename-tag.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/rename-tag.hbs
@@ -3,13 +3,19 @@
     {{i18n "tagging.rename_instructions"}}
   </label>
   <div class="controls">
-    {{input value=tagId maxlength=siteSettings.max_tag_length}}
+    {{input
+      value=(readonly model.id)
+      maxlength=siteSettings.max_tag_length
+      input=(action (mut newTag) value="target.value")
+    }}
   </div>
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button class="btn-primary"
-             action=(action "performRename")
-             label="tagging.rename_tag"
-             disabled=renameDisabled}}
+  {{d-button
+    class="btn-primary"
+    action=(action "performRename")
+    label="tagging.rename_tag"
+    disabled=renameDisabled
+  }}
 </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 d0d1207d75..e93efb1105 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
@@ -1,10 +1,13 @@
 {{#d-modal-body}}
-  <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>
+  <form class="form-horizontal">
+    <div class="input-group">
+      <label for="security-key-name">{{i18n "user.second_factor.security_key.edit_description"}}</label>
+      {{input name="security-key-name" type="text" value=model.name}}
+    </div>
+  </form>
+{{/d-modal-body}}
+
+<div class="modal-footer">
   {{d-button
     action=(action "editSecurityKey")
     class="btn-primary"
@@ -12,9 +15,9 @@
   }}
   {{d-button
     action=(action "disableSecurityKey")
-    class="btn-danger"
+    class="btn-danger no-text"
     icon="trash-alt"
     aria-label="user.second_factor.disable"
     title="user.second_factor.disable"
   }}
-{{/d-modal-body}}
+</div>
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 a7a4f60a29..a5fa63f586 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
@@ -1,10 +1,13 @@
 {{#d-modal-body}}
-  <div class="form-horizontal">
-    {{input type="text" value=model.name}}
-  </div>
-  <div class="second-factor instructions">
-    {{i18n "user.second_factor.edit_description"}}
-  </div>
+  <form class="form-horizontal">
+    <div class="input-group">
+      <label for="authenticator-name">{{i18n "user.second_factor.edit_description"}}</label>
+      {{input name="authenticator-name" type="text" value=model.name}}
+    </div>
+  </form>
+{{/d-modal-body}}
+
+<div class="modal-footer">
   {{d-button
     action=(action "editSecondFactor")
     class="btn-primary"
@@ -12,9 +15,9 @@
   }}
   {{d-button
     action=(action "disableSecondFactor")
-    class="btn-danger"
+    class="btn-danger no-text"
     icon="trash-alt"
     aria-label="user.second_factor.disable"
     title="user.second_factor.disable"
   }}
-{{/d-modal-body}}
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
new file mode 100644
index 0000000000..75f5a31270
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
@@ -0,0 +1,61 @@
+{{#d-modal-body title="topic.share.title"}}
+  <form>
+    <div class="input-group invite-link">
+      <label for="invite-link">{{i18n "topic.share.instructions"}}</label>
+      <div class="invite-input-with-button">
+        {{input
+          name="invite-link"
+          class="invite-link"
+          value=topicUrl
+          readonly=true
+        }}
+        {{copy-button selector="input.invite-link" copied=(action "copied")}}
+      </div>
+    </div>
+
+    <div class="sources">
+      {{#each sources as |s|}}
+        {{share-source source=s title=topic.title action=(action "share")}}
+      {{/each}}
+
+      {{d-button
+        class="btn-primary"
+        label="topic.share.notify_users.title"
+        icon="hand-point-right"
+        action=(action "toggleNotifyUsers")
+      }}
+
+      {{#if allowInvites}}
+        {{d-button
+          class="btn-primary"
+          label="topic.share.invite_users"
+          icon="user-plus"
+          action=(action "inviteUsers")
+        }}
+      {{/if}}
+    </div>
+
+    {{#if showNotifyUsers}}
+      <div class="input-group invite-users">
+        <label for="invite-users">{{i18n "topic.share.notify_users.instructions"}}</label>
+        <div class="invite-input-with-button">
+          {{user-chooser
+            value=users
+            onChange=(action "onChangeUsers")
+            options=(hash
+                     topicId=topic.id
+                     maximum=(unless currentUser.staff 1)
+                     excludeCurrentUser=true
+                    )
+          }}
+          {{d-button
+            icon="check"
+            class="btn-primary"
+            disabled=(if users false true)
+            action=(action "notifyUsers")
+          }}
+        </div>
+      </div>
+    {{/if}}
+  </form>
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/upload-selector.hbs b/app/assets/javascripts/discourse/app/templates/modal/upload-selector.hbs
index 51dbfba2f2..4e90b90883 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/upload-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/upload-selector.hbs
@@ -6,6 +6,9 @@
       <div class="inputs">
         <input type="file" id="filename-input" multiple><br>
         <span class="description">{{tip}}</span>
+        {{#if allowAdditionalFormats}}
+          {{hidden-details label="upload_selector.supported_formats" details=supportedFormats}}
+        {{/if}}
       </div>
     {{/if}}
   </div>
@@ -16,6 +19,9 @@
       <div class="inputs">
         {{input value=imageUrl placeholder="http://example.com/image.png"}}
         <span class="description">{{tip}}</span>
+        {{#if allowAdditionalFormats}}
+          {{hidden-details label="upload_selector.supported_formats" details=supportedFormats}}
+        {{/if}}
       </div>
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/app/templates/navigation/categories.hbs
index b0f90e30a9..e3953ae91c 100644
--- a/app/assets/javascripts/discourse/app/templates/navigation/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/navigation/categories.hbs
@@ -5,6 +5,6 @@
     createCategory=(route-action "createCategory")
     reorderCategories=(route-action "reorderCategories")
     canCreateTopic=canCreateTopic
-    hasDraft=draft
+    hasDraft=currentUser.has_topic_draft
     createTopic=(route-action "createTopic")}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/app/templates/navigation/category.hbs b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
index 9e6b65acbc..94b8df91aa 100644
--- a/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
@@ -1,32 +1,38 @@
-{{#d-section class="navigation-container"}}
-  {{add-category-tag-classes category=category}}
+{{add-category-tag-classes category=category tagName=""}}
 
-  <section class="category-heading">
-    {{#if category.uploaded_logo.url}}
-      {{cdn-img
-        src=category.uploaded_logo.url
-        class="category-logo"
-        width=category.uploaded_logo.width
-        height=category.uploaded_logo.height}}
-      {{#if category.description}}
-        <p>{{dir-span category.description}}</p>
-      {{/if}}
+<section class="category-heading">
+  {{#if category.uploaded_logo.url}}
+    {{cdn-img
+      src=category.uploaded_logo.url
+      class="category-logo"
+      width=category.uploaded_logo.width
+      height=category.uploaded_logo.height
+      alt=""
+    }}
+
+    {{#if category.description}}
+      <p>{{dir-span category.description}}</p>
     {{/if}}
+  {{/if}}
 
-    {{plugin-outlet name="category-heading" args=(hash category=category)}}
-  </section>
+  {{plugin-outlet name="category-heading" args=(hash category=category)}}
+</section>
 
-  <div class="category-navigation">
-    {{d-navigation
-      category=category
-      filterMode=filterMode
-      noSubcategories=noSubcategories
-      canCreateTopic=canCreateTopic
-      createTopic=(route-action "createTopic")
-      createTopicDisabled=cannotCreateTopicOnCategory
-      hasDraft=draft
-      editCategory=(route-action "editCategory" category)}}
+{{#d-section class="navigation-container category-navigation"}}
+  {{d-navigation
+    category=category
+    filterMode=filterMode
+    noSubcategories=noSubcategories
+    canCreateTopic=canCreateTopic
+    createTopic=(route-action "createTopic")
+    createTopicDisabled=cannotCreateTopicOnCategory
+    hasDraft=currentUser.has_topic_draft
+    editCategory=(route-action "editCategory" category)
+  }}
 
-    {{plugin-outlet name="category-navigation" args=(hash category=category)}}
-  </div>
+  {{plugin-outlet
+    name="category-navigation"
+    args=(hash category=category)
+    tagName=""
+  }}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/app/templates/navigation/default.hbs b/app/assets/javascripts/discourse/app/templates/navigation/default.hbs
index d1bf784c4f..8ce72b8ebe 100644
--- a/app/assets/javascripts/discourse/app/templates/navigation/default.hbs
+++ b/app/assets/javascripts/discourse/app/templates/navigation/default.hbs
@@ -2,6 +2,6 @@
   {{d-navigation
     filterMode=filterMode
     canCreateTopic=canCreateTopic
-    hasDraft=draft
+    hasDraft=currentUser.has_topic_draft
     createTopic=(route-action "createTopic")}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-email.hbs b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
index 5dd2eb1826..661ea0eece 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
@@ -43,14 +43,13 @@
 
       <div class="control-group">
         <div class="controls">
-          {{#d-button
+          {{d-button
             class="btn-primary"
             action=(action "saveEmail")
             type="submit"
             disabled=saveDisabled
+            translatedLabel=saveButtonText
           }}
-            {{saveButtonText}}
-          {{/d-button}}
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-username.hbs b/app/assets/javascripts/discourse/app/templates/preferences-username.hbs
index c7c59b17d0..c16dfddb89 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-username.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-username.hbs
@@ -8,7 +8,7 @@
     </div>
 
     <div class="control-group">
-      <label class="control-label">{{i18n "user.username.title"}}</label>
+      <label for="change_username" 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>
@@ -24,15 +24,13 @@
 
     <div class="control-group">
       <div class="controls">
-        {{#d-button
+        {{d-button
           class="btn-primary"
           action=(action "changeUsername")
           type="submit"
           disabled=saveDisabled
+          translatedLabel=saveButtonText
         }}
-          {{saveButtonText}}
-        {{/d-button}}
-
         {{#if saved}}{{i18n "saved"}}{{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences.hbs b/app/assets/javascripts/discourse/app/templates/preferences.hbs
index b5e31ddec6..45f82f56c9 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences.hbs
@@ -1,10 +1,15 @@
 {{#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}}
+  {{#mobile-nav class="preferences-nav" desktopClass="preferences-list action-list nav-stacked"}}
     <li class="nav-account">
       {{#link-to "preferences.account"}}
         {{i18n "user.preferences_nav.account"}}
       {{/link-to}}
     </li>
+    <li class="nav-security">
+      {{#link-to "preferences.security"}}
+        {{i18n "user.preferences_nav.security"}}
+      {{/link-to}}
+    </li>
     <li class="nav-profile">
       {{#link-to "preferences.profile"}}
         {{i18n "user.preferences_nav.profile"}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
index 182a11d7b1..daad557a38 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
@@ -3,7 +3,7 @@
   <div class="controls">
     <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"}}
+      {{#link-to "preferences.username" name=(i18n "user.username.edit") class="btn btn-default btn-small btn-icon pad-left no-text"}}
         {{d-icon "pencil-alt"}}
       {{/link-to}}
     {{/if}}
@@ -15,7 +15,7 @@
   {{/if}}
 </div>
 
-{{#unless siteSettings.sso_overrides_avatar}}
+{{#unless siteSettings.discourse_connect_overrides_avatar}}
   <div class="control-group pref-avatar">
     <label class="control-label" id="profile-picture">{{i18n "user.avatar.title"}}</label>
     <div class="controls">
@@ -26,22 +26,6 @@
   </div>
 {{/unless}}
 
-{{#if canEditName}}
-  <div class="control-group pref-name">
-    <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>
-      {{/if}}
-    </div>
-    <div class="instructions">
-      {{nameInstructions}}
-    </div>
-  </div>
-{{/if}}
-
 {{#if canCheckEmails}}
   <div class="control-group pref-email">
     <label class="control-label">{{i18n "user.email.title"}}</label>
@@ -94,8 +78,8 @@
       {{/if}}
 
       <div class="instructions">
-        {{#if siteSettings.sso_overrides_email}}
-          {{i18n "user.email.sso_override_instructions"}}
+        {{#if siteSettings.auth_overrides_email}}
+          {{i18n "user.email.auth_override_instructions"}}
         {{/if}}
         {{i18n "user.email.instructions"}}
       </div>
@@ -107,40 +91,6 @@
   </div>
 {{/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>
-
-      {{passwordProgress}}
-    </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>
-        {{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}}
-    </div>
-  </div>
-{{/if}}
-
 {{#if canUpdateAssociatedAccounts}}
   <div class="control-group pref-associated-accounts">
     <label class="control-label">{{i18n "user.associated_accounts.title"}}</label>
@@ -181,6 +131,22 @@
   </div>
 {{/if}}
 
+{{#if canEditName}}
+  <div class="control-group pref-name">
+    <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>
+      {{/if}}
+    </div>
+    <div class="instructions">
+      {{nameInstructions}}
+    </div>
+  </div>
+{{/if}}
+
 {{#if canSelectTitle}}
   <div class="control-group pref-title">
     <label class="control-label">{{i18n "user.title.title"}}</label>
@@ -207,47 +173,6 @@
   </div>
 {{/if}}
 
-{{#if canCheckEmails}}
-  <div class="control-group pref-auth-tokens">
-    <label class="control-label">{{i18n "user.auth_tokens.title"}}</label>
-
-    <div class="auth-tokens">
-      {{#each authTokens as |token|}}
-        <div class="row auth-token">
-          <div class="auth-token-icon">{{d-icon token.icon}}</div>
-          {{#unless token.is_active}}
-            {{auth-token-dropdown token=token
-                                  revokeAuthToken=(action "revokeAuthToken")
-                                  showToken=(action "showToken")}}
-          {{/unless}}
-          <div class="auth-token-first">
-            {{html-safe (i18n "user.auth_tokens.device_location" device=token.device ip=token.client_ip location=token.location)}}
-          </div>
-          <div class="auth-token-second">
-            {{#if token.is_active}}
-              {{html-safe (i18n "user.auth_tokens.browser_active" browser=token.browser)}}
-            {{else}}
-              {{html-safe (i18n "user.auth_tokens.browser_last_seen" browser=token.browser date=(format-date token.seen_at))}}
-            {{/if}}
-          </div>
-        </div>
-      {{/each}}
-    </div>
-
-    {{#if canShowAllAuthTokens}}
-      <a href {{action "toggleShowAllAuthTokens"}}>
-        {{#if showAllAuthTokens}}
-          {{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}}
-        {{/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>
-  </div>
-{{/if}}
-
 {{plugin-outlet name="user-preferences-account" args=(hash model=model save=(action "save"))}}
 
 <br>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
index d51e6de26f..4c07cafbdb 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
@@ -21,22 +21,22 @@
 {{/if}}
 
 {{#if showColorSchemeSelector}}
-  <div class="control-group color-scheme">
-    <label class="control-label">{{i18n "user.color_scheme"}}</label>
+  <fieldset class="control-group color-scheme">
+    <legend class="control-label">{{i18n "user.color_scheme"}}</legend>
     <div class="control-subgroup light-color-scheme">
       {{#if showDarkColorSchemeSelector}}
         <div class="instructions">{{i18n "user.color_schemes.regular" }}</div>
       {{/if}}
       <div class="controls">
         {{combo-box
-                content=userSelectableColorSchemes
-                value=selectedColorSchemeId
-                onChange=(action "loadColorScheme")
-                options=(hash
-                  translatedNone=selectedColorSchemeNoneLabel
-                )
-
-              }}
+          content=userSelectableColorSchemes
+          value=selectedColorSchemeId
+          onChange=(action "loadColorScheme")
+          options=(hash
+            translatedNone=selectedColorSchemeNoneLabel
+            autoInsertNoneItem=showColorSchemeNoneItem
+          )
+        }}
       </div>
     </div>
     {{#if showDarkColorSchemeSelector}}
@@ -64,7 +64,7 @@
         {{preference-checkbox labelKey="user.color_scheme_default_on_all_devices" checked=makeColorSchemeDefault}}
       </div>
     {{/if}}
-  </div>
+  </fieldset>
 {{/if}}
 
 {{#if showDarkModeToggle}}
@@ -77,9 +77,10 @@
 {{/if}}
 
 <div class="control-group text-size">
-  <label class="control-label">{{i18n "user.text_size.title"}}</label>
+  <label for="text-size-selector" class="control-label">{{i18n "user.text_size.title"}}</label>
   <div class="controls">
     {{combo-box
+      id="text-size-selector"
       valueProperty="value"
       content=textSizes
       value=textSize
@@ -95,10 +96,12 @@
 
 {{#if siteSettings.allow_user_locale}}
   <div class="control-group pref-locale">
-    <label class="control-label">{{i18n "user.locale.title"}}</label>
+    <label for="locale-selector" class="control-label">{{i18n "user.locale.title"}}</label>
     <div class="controls">
       {{combo-box
+        id="locale-selector"
         valueProperty="value"
+        langProperty="value"
         content=availableLocales
         value=model.locale
         onChange=(action (mut model.locale))
@@ -115,9 +118,10 @@
 {{/if}}
 
 <div class="control-group home">
-  <label class="control-label">{{i18n "user.home"}}</label>
+  <label for="home-selector" class="control-label">{{i18n "user.home"}}</label>
   <div class="controls">
     {{combo-box
+      id="home-selector"
       content=userSelectableHome
       valueProperty="value"
       value=homepageId
@@ -126,8 +130,8 @@
   </div>
 </div>
 
-<div class="control-group other">
-  <label class="control-label">{{i18n "user.other_settings"}}</label>
+<fieldset class="control-group other">
+  <legend class="control-label">{{i18n "user.other_settings"}}</legend>
 
   {{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"}}
@@ -143,7 +147,7 @@
   {{/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>
+    <label for="user-title-count-mode">{{i18n "user.title_count_mode.title"}}</label>
     {{combo-box
       valueProperty="value"
       content=titleCountModes
@@ -153,7 +157,7 @@
     }}
   </div>
   {{preference-checkbox labelKey="user.skip_new_user_tips.description" checked=model.user_option.skip_new_user_tips  class="pref-new-user-tips"}}
-</div>
+</fieldset>
 
 {{plugin-outlet name="user-preferences-interface" args=(hash model=model save=(action "save"))}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs
index ad3b52e8a3..7cf61081b9 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs
@@ -52,6 +52,8 @@
   </div>
 {{/unless}}
 
+{{user-notification-schedule model=model}}
+
 {{#if siteSettings.enable_personal_messages}}
   <div class="control-group private-messages">
     <label class="control-label">{{i18n "user.private_messages"}}</label>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
index 66e2a81afe..9fafb612f4 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
@@ -14,7 +14,7 @@
     onChange=(action (mut model.user_option.timezone))
     class="input-xxlarge"
   }}
-  {{d-button icon="globe" label="user.use_current_timezone" action=(action "useCurrentTimezone") }}
+  {{d-button class="btn-default" icon="globe" label="user.use_current_timezone" action=(action "useCurrentTimezone") }}
 </div>
 
 {{#if model.can_change_location}}
@@ -104,4 +104,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-{{save-controls model=model action=(action "save") saved=saved}}
\ No newline at end of file
+{{save-controls model=model action=(action "save") saved=saved}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
new file mode 100644
index 0000000000..ec39332ed6
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
@@ -0,0 +1,80 @@
+{{#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>
+
+      {{passwordProgress}}
+    </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>
+        {{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}}
+    </div>
+  </div>
+{{/if}}
+
+{{#if canCheckEmails}}
+  <div class="control-group pref-auth-tokens">
+    <label class="control-label">{{i18n "user.auth_tokens.title"}}</label>
+
+    <div class="auth-tokens">
+      {{#each authTokens as |token|}}
+        <div class="row auth-token">
+          <div class="auth-token-icon">{{d-icon token.icon}}</div>
+          {{#unless token.is_active}}
+            {{auth-token-dropdown token=token
+                                  revokeAuthToken=(action "revokeAuthToken")
+                                  showToken=(action "showToken")}}
+          {{/unless}}
+          <div class="auth-token-first">
+            {{html-safe (i18n "user.auth_tokens.device_location" device=token.device ip=token.client_ip location=token.location)}}
+          </div>
+          <div class="auth-token-second">
+            {{#if token.is_active}}
+              {{html-safe (i18n "user.auth_tokens.browser_active" browser=token.browser)}}
+            {{else}}
+              {{html-safe (i18n "user.auth_tokens.browser_last_seen" browser=token.browser date=(format-date token.seen_at))}}
+            {{/if}}
+          </div>
+        </div>
+      {{/each}}
+    </div>
+
+    {{#if canShowAllAuthTokens}}
+      <a href {{action "toggleShowAllAuthTokens"}}>
+        {{#if showAllAuthTokens}}
+          {{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}}
+        {{/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>
+  </div>
+{{/if}}
+
+{{plugin-outlet name="user-preferences-security" args=(hash model=model save=(action "save"))}}
+
+<br>
+
+{{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/app/templates/review-index.hbs b/app/assets/javascripts/discourse/app/templates/review-index.hbs
index c5a0fad889..488c0dbc1d 100644
--- a/app/assets/javascripts/discourse/app/templates/review-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/review-index.hbs
@@ -58,21 +58,37 @@
         }}
       </div>
 
+      <div class="reviewable-filter topic-filter">
+        {{i18n "review.filtered_reviewed_by"}}
+        {{email-group-user-chooser
+          value=filterReviewedBy
+          onChange=(action "updateFilterReviewedBy")
+          options=(hash
+            maximum=1
+            excludeCurrentUser=false
+            fullWidthWrap=true
+          )
+        }}
+      </div>
+
       <div class="reviewable-filter topic-filter">
         {{i18n "review.filtered_user"}}
-        {{user-selector
-          excludeCurrentUser=false
-          usernames=filterUsername
-          fullWidthWrap=true
-          single=true
+        {{email-group-user-chooser
+          value=filterUsername
+          onChange=(action "updateFilterUsername")
           class="user-selector"
-          canReceiveUpdates=true}}
+          options=(hash
+            maximum=1
+            excludeCurrentUser=false
+            fullWidthWrap=true
+          )
+        }}
       </div>
 
       {{#if filterTopic}}
         <div class="reviewable-filter topic-filter">
           {{i18n "review.filtered_topic"}}
-          {{d-button label="review.show_all_topics" icon="times" action=(action "resetTopic")}}
+          {{d-button class="btn-default" label="review.show_all_topics" icon="times" action=(action "resetTopic")}}
         </div>
       {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/static.hbs b/app/assets/javascripts/discourse/app/templates/static.hbs
index dbfe466381..2584bcdfd1 100644
--- a/app/assets/javascripts/discourse/app/templates/static.hbs
+++ b/app/assets/javascripts/discourse/app/templates/static.hbs
@@ -8,12 +8,16 @@
 
       {{plugin-outlet name="below-static" tagName=""}}
 
-      {{#if showSignupButton}}
-        {{d-button action=(route-action "showCreateAccount") class="btn-primary sign-up-button" label="sign_up"}}
-      {{/if}}
+      {{#if anyButtons}}
+        <div class="body-page-button-container">
+          {{#if showSignupButton}}
+            {{d-button action=(route-action "showCreateAccount") class="btn-primary sign-up-button" label="sign_up"}}
+          {{/if}}
 
-      {{#if showLoginButton}}
-        {{d-button action=(route-action "showLogin") class="btn-primary login-button" icon="user" label="log_in"}}
+          {{#if showLoginButton}}
+            {{d-button action=(route-action "showLogin") class="btn-primary login-button" icon="user" label="log_in"}}
+          {{/if}}
+        </div>
       {{/if}}
     </div>
   {{/watch-read}}
diff --git a/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs
index 51a1f5a1b6..937ff10b87 100644
--- a/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs
@@ -1,3 +1,3 @@
 <div class="tag-group-content">
   <p class="about">{{i18n "tagging.groups.about"}}</p>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/tags.hbs b/app/assets/javascripts/discourse/app/templates/tags.hbs
index 471f92ae13..f1017e6758 100644
--- a/app/assets/javascripts/discourse/app/templates/tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags.hbs
@@ -1,3 +1,3 @@
 {{#d-section pageClass="tags" tagName=""}}
   {{outlet}}
-{{/d-section}}
\ No newline at end of file
+{{/d-section}}
diff --git a/app/assets/javascripts/discourse/app/templates/tags/index.hbs b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
index be37746670..d4ba0f5a88 100644
--- a/app/assets/javascripts/discourse/app/templates/tags/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
@@ -11,6 +11,8 @@
   </div>
 </div>
 
+{{plugin-outlet name="tags-below-title" tagName="div" args=(hash model=model)}}
+
 <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>
@@ -19,14 +21,16 @@
 
 <hr>
 
-{{#each model.extras.categories as |category|}}
-  {{tag-list tags=category.tags sortProperties=sortProperties categoryId=category.id}}
-{{/each}}
+<div class="all-tag-lists">
+  {{#each model.extras.categories as |category|}}
+    {{tag-list tags=category.tags sortProperties=sortProperties categoryId=category.id}}
+  {{/each}}
 
-{{#each model.extras.tag_groups as |tagGroup|}}
-  {{tag-list tags=tagGroup.tags sortProperties=sortProperties tagGroupName=tagGroup.name}}
-{{/each}}
+  {{#each model.extras.tag_groups as |tagGroup|}}
+    {{tag-list tags=tagGroup.tags sortProperties=sortProperties tagGroupName=tagGroup.name}}
+  {{/each}}
 
-{{#if model}}
-  {{tag-list tags=model sortProperties=sortProperties titleKey=otherTagsTitleKey}}
-{{/if}}
+  {{#if model}}
+    {{tag-list tags=model sortProperties=sortProperties titleKey=otherTagsTitleKey}}
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/tags/show.hbs b/app/assets/javascripts/discourse/app/templates/tags/show.hbs
index a064771eb2..14b37fac1d 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 tagName="" pageClass="tags" bodyClass=(concat "tag-" tag.id (if category.slug (concat " category-" category.slug)) "")}}
+{{#d-section tagName="" pageClass="tags" bodyClass=(concat "tag-" tag.id (if category.slug (concat " category-" category.slug)) ""  (if additionalTags " tags-intersection"))}}
   <div class="container">
     {{discourse-banner user=currentUser banner=site.banner}}
   </div>
@@ -6,20 +6,10 @@
   <div class="list-controls">
     <div class="container">
       <section class="navigation-container tag-navigation">
-
-        {{#if showTagFilter}}
-          {{#if additionalTags}}
-            {{!-- Tag intersections don't work with the tag filter, so show the tag heading instead --}}
-            {{tag-heading tag=tag additionalTags=additionalTags}}
-          {{/if}}
-        {{else}}
-          {{tag-heading tag=tag additionalTags=additionalTags}}
-        {{/if}}
-
         {{d-navigation
           filterMode=filterMode
           canCreateTopic=canCreateTopic
-          hasDraft=draft
+          hasDraft=currentUser.has_topic_draft
           createTopic=(route-action "createTopic")
           category=category
           tag=tag
@@ -30,7 +20,13 @@
           canCreateTopicOnTag=canCreateTopicOnTag
           changeTagNotificationLevel=(action "changeTagNotificationLevel")
           toggleInfo=(action "toggleInfo")
-          }}
+        }}
+
+        {{plugin-outlet
+          name="tag-navigation"
+          args=(hash category=category tag=tag)
+          tagName=""
+        }}
       </section>
     </div>
   </div>
@@ -39,7 +35,31 @@
     {{tag-info tag=tag list=list deleteAction=(action "deleteTag")}}
   {{/if}}
 
-  {{plugin-outlet name="discovery-list-container-top"}}
+  {{plugin-outlet name="discovery-list-container-top" args=(hash category=category)}}
+
+  {{#if showDismissAtTop}}
+    <div class="row dismiss-container-top">
+      {{#if showDismissRead}}
+        {{d-button
+          class="btn-default dismiss-read"
+          id="dismiss-topics"
+          action=(action "dismissReadPosts")
+          title="topics.bulk.dismiss_tooltip"
+          label="topics.bulk.dismiss_button"
+        }}
+      {{/if}}
+
+      {{#if showResetNew}}
+        {{d-button
+          class="btn-default dismiss-read"
+          action=(action "resetNew")
+          id="dismiss-new"
+          icon="check"
+          label="topics.bulk.dismiss_new"
+        }}
+      {{/if}}
+    </div>
+  {{/if}}
 
   <div class="container list-container">
     <div class="row">
@@ -47,21 +67,37 @@
         <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")}}
+              {{#discovery-topics-list
+                model=list
+                refresh=(action "refresh")
+                autoAddTopicsToBulkSelect=autoAddTopicsToBulkSelect
+                bulkSelectEnabled=bulkSelectEnabled
+                addTopicsToBulkSelect=(action "addTopicsToBulkSelect")
+                as |discoveryTopicList|
+              }}
+                {{bulk-select-button
+                  selected=selected
+                  action=(action "refresh")
+                  category=category
+                }}
+
                 {{topic-list
                   topics=list.topics
                   canBulkSelect=canBulkSelect
                   toggleBulkSelect=(action "toggleBulkSelect")
                   bulkSelectEnabled=bulkSelectEnabled
+                  updateAutoAddTopicsToBulkSelect=(action "updateAutoAddTopicsToBulkSelect")
                   selected=selected
                   showPosters=true
                   order=order
                   ascending=ascending
                   changeSort=(action "changeSort")
+                  onScroll=discoveryTopicList.saveScrollPosition
+                  scrollOnLoad=true
                 }}
               {{/discovery-topics-list}}
             {{/if}}
+
             <footer class="topic-list-bottom">
               {{#if showDismissRead}}
                 {{d-button
@@ -69,7 +105,18 @@
                   id="dismiss-topics"
                   action=(action "dismissReadPosts")
                   title="topics.bulk.dismiss_tooltip"
-                  label="topics.bulk.dismiss_button"}}
+                  label="topics.bulk.dismiss_button"
+                }}
+              {{/if}}
+
+              {{#if showResetNew}}
+                {{d-button
+                  class="btn-default dismiss-read"
+                  action=(action "resetNew")
+                  id="dismiss-new"
+                  icon="check"
+                  label="topics.bulk.dismiss_new"
+                }}
               {{/if}}
 
               {{#footer-message education=footerEducation message=footerMessage}}
@@ -83,5 +130,6 @@
       </div>
     </div>
   </div>
+
   {{plugin-outlet name="discovery-below"}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/app/templates/topic-list-header-column.hbr b/app/assets/javascripts/discourse/app/templates/topic-list-header-column.hbr
index 912acc400a..cb4b746d1b 100644
--- a/app/assets/javascripts/discourse/app/templates/topic-list-header-column.hbr
+++ b/app/assets/javascripts/discourse/app/templates/topic-list-header-column.hbr
@@ -1,4 +1,4 @@
-<th data-sort-order='{{order}}' class='{{view.className}}' {{#if ariaLabel}}aria-label='{{ariaLabel}}'{{/if}}>
+<th data-sort-order='{{order}}' class='{{view.className}}' scope="col" {{#if ariaLabel}}aria-label='{{ariaLabel}}'{{/if}} {{#if sortable}}tabindex="0" role="button" aria-pressed='{{view.ariaPressed}}' {{#if view.ariaSort}}aria-sort='{{view.ariaSort}}'{{/if}} {{/if}}>
   {{~#if canBulkSelect}}
     {{~#if showBulkToggle}}
       {{raw "flat-button" class="bulk-select" icon="list" title="topics.bulk.toggle"}}
diff --git a/app/assets/javascripts/discourse/app/templates/topic-list-header.hbr b/app/assets/javascripts/discourse/app/templates/topic-list-header.hbr
index ed554fa15f..2f785f6065 100644
--- a/app/assets/javascripts/discourse/app/templates/topic-list-header.hbr
+++ b/app/assets/javascripts/discourse/app/templates/topic-list-header.hbr
@@ -1,3 +1,4 @@
+{{~raw-plugin-outlet name="topic-list-header-before"~}}
 {{#if bulkSelectEnabled}}
   <th class="bulk-select">
     {{#if canBulkSelect}}
@@ -18,3 +19,4 @@
 {{/if}}
 {{raw "topic-list-header-column" sortable=sortable number='true' order='views' name='views'}}
 {{raw "topic-list-header-column" sortable=sortable number='true' order='activity' name='activity'}}
+{{~raw-plugin-outlet name="topic-list-header-after"~}}
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 0366359855..f6fda7edfb 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -1,6 +1,7 @@
 {{#discourse-topic multiSelect=multiSelect enteredAt=enteredAt topic=model hasScrolled=hasScrolled}}
   {{#if model}}
     {{add-category-tag-classes category=model.category tags=model.tags}}
+    {{add-topic-status-classes topic=model}}
     <div class="container">
       {{discourse-banner user=currentUser banner=site.banner overlay=hasScrolled hide=model.errorLoading}}
     </div>
@@ -10,7 +11,7 @@
     {{shared-draft-controls topic=model}}
   {{/if}}
 
-  {{plugin-outlet name="topic-above-post-stream" args=(hash model=model)}}
+  {{plugin-outlet name="topic-above-post-stream" args=(hash model=model editFirstPost=(action "editFirstPost"))}}
 
   {{#if model.postStream.loaded}}
     {{#if model.postStream.firstPostPresent}}
@@ -129,6 +130,8 @@
         }}
       </div>
 
+      {{plugin-outlet name="above-timeline" tagName=""}}
+
       {{#topic-navigation class="topic-navigation" topic=model jumpToDate=(action "jumpToDate") jumpToIndex=(action "jumpToIndex") as |info|}}
         {{#if info.renderTimeline}}
           {{topic-timeline
@@ -152,7 +155,7 @@
             toggleClosed=(action "toggleClosed")
             toggleArchived=(action "toggleArchived")
             toggleVisibility=(action "toggleVisibility")
-            showTopicStatusUpdate=(route-action "showTopicStatusUpdate")
+            showTopicTimerModal=(route-action "showTopicTimerModal")
             showFeatureTopic=(route-action "showFeatureTopic")
             showChangeTimestamp=(route-action "showChangeTimestamp")
             resetBumpDate=(action "resetBumpDate")
@@ -176,7 +179,7 @@
               toggleClosed=(action "toggleClosed")
               toggleArchived=(action "toggleArchived")
               toggleVisibility=(action "toggleVisibility")
-              showTopicStatusUpdate=(route-action "showTopicStatusUpdate")
+              showTopicTimerModal=(route-action "showTopicTimerModal")
               showFeatureTopic=(route-action "showFeatureTopic")
               showChangeTimestamp=(route-action "showChangeTimestamp")
               resetBumpDate=(action "resetBumpDate")
@@ -200,9 +203,11 @@
                 canCreatePost=model.details.can_create_post
                 multiSelect=multiSelect
                 selectedPostsCount=selectedPostsCount
+                filteredPostsCount=model.postStream.filteredPostsCount
                 selectedQuery=selectedQuery
                 gaps=model.postStream.gaps
                 showReadIndicator=model.show_read_indicator
+                streamFilters=model.postStream.streamFilters
                 showFlags=(action "showPostFlags")
                 editPost=(action "editPost")
                 showHistory=(route-action "showHistory")
@@ -222,7 +227,8 @@
                 unhidePost=(action "unhidePost")
                 replyToPost=(action "replyToPost")
                 toggleWiki=(action "toggleWiki")
-                toggleSummary=(action "toggleSummary")
+                showSummary=(action "showSummary")
+                cancelFilter=(action "cancelFilter")
                 removeAllowedUser=(action "removeAllowedUser")
                 removeAllowedGroup=(action "removeAllowedGroup")
                 topVisibleChanged=(action "topVisibleChanged")
@@ -288,15 +294,16 @@
                 </div>
               {{/if}}
 
-              {{slow-mode-info topic=model user=currentUser}}
+              {{slow-mode-info topic=model user=currentUser tagName=""}}
 
               {{topic-timer-info
                   topicClosed=model.closed
                   statusType=model.topic_timer.status_type
                   executeAt=model.topic_timer.execute_at
                   basedOnLastPost=model.topic_timer.based_on_last_post
-                  duration=model.topic_timer.duration
+                  durationMinutes=model.topic_timer.duration_minutes
                   categoryId=model.topic_timer.category_id
+                  showTopicTimerModal=(route-action "showTopicTimerModal")
                   removeTopicTimer=(action "removeTopicTimer" model.topic_timer.status_type "topic_timer")}}
 
               {{#if showSelectedPostsAtBottom}}
@@ -342,7 +349,7 @@
             toggleClosed=(action "toggleClosed")
             toggleArchived=(action "toggleArchived")
             toggleVisibility=(action "toggleVisibility")
-            showTopicStatusUpdate=(route-action "showTopicStatusUpdate")
+            showTopicTimerModal=(route-action "showTopicTimerModal")
             showFeatureTopic=(route-action "showFeatureTopic")
             showChangeTimestamp=(route-action "showChangeTimestamp")
             resetBumpDate=(action "resetBumpDate")
diff --git a/app/assets/javascripts/discourse/app/templates/user-card.hbs b/app/assets/javascripts/discourse/app/templates/user-card.hbs
index 5475c39817..fc75dbece5 100644
--- a/app/assets/javascripts/discourse/app/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-card.hbs
@@ -5,7 +5,7 @@
 {{user-card-contents
   topic=topic.model
   showUser=(action "showUser")
-  togglePosts=(action "togglePosts")
+  filterPosts=(action "filterPosts")
   composePrivateMessage=(route-action "composePrivateMessage")
   createNewMessageViaParams=(route-action "createNewMessageViaParams")}}
 
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 2079edb3e2..2ff2fa8694 100644
--- a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
@@ -2,35 +2,36 @@
   {{#if canInviteToForum}}
     {{#load-more class="user-content" selector=".user-invite-list tr" action=(action "loadMore")}}
       <section>
-        <h2>{{i18n "user.invited.title"}}</h2>
-
         {{#if model.can_see_invite_details}}
           <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="expired" i18nLabel=expiredLabel}}
                 {{nav-item route="userInvited.show" routeParam="redeemed" i18nLabel=redeemedLabel}}
-                {{#if canSendInviteLink}}
-                  {{nav-item route="userInvited.show" routeParam="links" i18nLabel=linksLabel}}
-                {{/if}}
               </ul>
             </nav>
 
             <div class="pull-right">
-              {{d-button icon="plus" action=(route-action "showInvite") label="user.invited.create"}}
+              {{d-button class="btn-default" icon="plus" action=(action "createInvite") label="user.invited.create"}}
               {{#if canBulkInvite}}
-                {{csv-uploader uploading=uploading}}
+                {{d-button class="btn-default" icon="upload" action=(action "createInviteCsv") label="user.invited.bulk_invite.text"}}
               {{/if}}
               {{#if showBulkActionButtons}}
-                {{#if rescindedAll}}
-                  {{i18n "user.invited.rescinded_all"}}
-                {{else}}
-                  {{d-button icon="times" action=(action "rescindAll") label="user.invited.rescind_all"}}
+                {{#if inviteExpired}}
+                  {{#if removedAll}}
+                    {{i18n "user.invited.removed_all"}}
+                  {{else}}
+                    {{d-button icon="times" action=(action "destroyAllExpired") label="user.invited.remove_all"}}
+                  {{/if}}
                 {{/if}}
-                {{#if reinvitedAll}}
-                  {{i18n "user.invited.reinvited_all"}}
-                {{else}}
-                  {{d-button icon="sync" action=(action "reinviteAll") label="user.invited.reinvite_all"}}
+
+                {{#if invitePending}}
+                  {{#if reinvitedAll}}
+                    {{i18n "user.invited.reinvited_all"}}
+                  {{else}}
+                    {{d-button class="btn-default" icon="sync" action=(action "reinviteAll") label="user.invited.reinvite_all"}}
+                  {{/if}}
                 {{/if}}
               {{/if}}
             </div>
@@ -44,10 +45,10 @@
         {{/if}}
 
         {{#if model.invites}}
-          <table class="table user-invite-list">
-            <tbody>
-              <tr>
-                {{#if inviteRedeemed}}
+          {{#if inviteRedeemed}}
+            <table class="table user-invite-list">
+              <thead>
+                <tr>
                   <th>{{i18n "user.invited.user"}}</th>
                   <th>{{i18n "user.invited.redeemed_at"}}</th>
                   {{#if model.can_see_invite_details}}
@@ -56,25 +57,13 @@
                     <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}}
+                    <th>{{i18n "user.invited.invited_via"}}</th>
                   {{/if}}
-                {{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 inviteRedeemed}}
+                </tr>
+              </thead>
+              <tbody>
+                {{#each model.invites as |invite|}}
+                  <tr>
                     <td>
                       {{#link-to "user" invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}}
                       {{#link-to "user" invite.user}}{{invite.user.username}}{{/link-to}}
@@ -90,50 +79,69 @@
                           /
                         <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}}
+                      <td>{{html-safe invite.invite_source}}</td>
                     {{/if}}
-                  {{else if invitePending}}
-                    <td>{{invite.email}}</td>
-                    <td>{{format-date invite.updated_at}}</td>
-                    <td>
-                      {{#if invite.expired}}
-                        <div>{{i18n "user.invited.expired"}}</div>
-                      {{/if}}
-                      {{#if invite.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>
-                      {{else}}
-                        {{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}}
+              </tbody>
+            </table>
+          {{else}}
+            <table class="table user-invite-list">
+              <thead>
+                <tr>
+                  <th>{{i18n "user.invited.invited_via"}}</th>
+                  <th>{{i18n "user.invited.sent"}}</th>
+                  <th>{{i18n "user.invited.expires_at"}}</th>
+                  <th></th>
                 </tr>
-              {{/each}}
-            </tbody>
-          </table>
-          {{conditional-loading-spinner condition=invitesLoading}}
+              </thead>
+              <tbody>
+                {{#each model.invites as |invite|}}
+                  <tr>
+                    <td class="invite-type">
+                      <div class="label">{{i18n "user.invited.invited_via"}}</div>
+                      {{#if invite.email}}
+                        {{d-icon "envelope"}} {{invite.email}}
+                      {{else}}
+                        {{d-icon "link"}} {{i18n "user.invited.invited_via_link" key=invite.shortKey count=invite.redemption_count max=invite.max_redemptions_allowed}}
+                      {{/if}}
 
+                      {{#each invite.groups as |g|}}
+                        <p class="invite-extra"><a href="/g/{{g.name}}">{{d-icon "users"}} {{g.name}}</a></p>
+                      {{/each}}
+
+                      {{#if invite.topic}}
+                        <p class="invite-extra"><a href={{invite.topic.url}}>{{d-icon "file"}} {{invite.topic.title}}</a></p>
+                      {{/if}}
+                    </td>
+
+                    <td class="invite-updated-at">
+                      <div class="label">{{i18n "user.invited.sent"}}</div>
+                      {{format-date invite.updated_at}}
+                    </td>
+
+                    <td class="invite-expires-at">
+                      <div class="label">{{i18n "user.invited.expires_at"}}</div>
+                      {{#if inviteExpired}}
+                        {{raw-date invite.expires_at}}
+                      {{else if invite.expired}}
+                        {{i18n "user.invited.expired"}}
+                      {{else}}
+                        {{raw-date invite.expires_at}}
+                      {{/if}}
+                    </td>
+
+                    <td class="invite-actions">
+                      {{d-button class="btn-default" icon="pencil-alt" action=(action "editInvite" invite) title="user.invited.edit"}}
+                      {{d-button icon="trash-alt" class="cancel" action=(action "destroyInvite" invite) title=(if invite.destroyed "user.invited.removed" "user.invited.remove")}}
+                    </td>
+                  </tr>
+                {{/each}}
+              </tbody>
+            </table>
+          {{/if}}
+
+          {{conditional-loading-spinner condition=invitesLoading}}
         {{else}}
           <div class="user-invite-none">
             {{#if canBulkInvite}}
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index 882963d8be..0b6f752bf9 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -1,5 +1,5 @@
 {{plugin-outlet name="above-user-profile" tagName="" args=(hash model=model)}}
-<div class="container {{if viewingSelf "viewing-self"}} {{if model.profile_hidden "profile-hidden"}}">
+<div class="container {{if viewingSelf "viewing-self"}} {{if model.profile_hidden "profile-hidden"}} {{primaryGroup}}">
   {{#d-section class="user-main"}}
     <section class="{{if collapsedInfo "collapsed-info"}} about {{if hasProfileBackgroundUrl "has-background" "no-background"}}" >
       {{#unless collapsedInfo}}
@@ -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"}}<span class="d-button-label">{{i18n "admin.user.show_admin_profile"}}</span></a></li>
               {{/if}}
               {{plugin-outlet name="user-profile-controls"
                               tagName=""
@@ -76,15 +76,14 @@
 
               {{#if canExpandProfile}}
                 <li>
-                  {{#if collapsedInfo}}
-                    <a {{action "expandProfile"}} href class="btn btn-default">
-                      {{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"}}
-                    </a>
-                  {{/if}}
+                  {{d-button
+                    ariaExpanded=collapsedInfoState.isExpanded
+                    ariaControls="collapsed-info-panel"
+                    class="btn-default"
+                    label=(concat "user." collapsedInfoState.label)
+                    icon=collapsedInfoState.icon
+                    action=(action collapsedInfoState.action)
+                  }}
                 </li>
               {{/if}}
             </ul>
@@ -144,7 +143,9 @@
                 </div>
               {{/if}}
               {{#if isNotSuspendedOrIsStaff}}
-                {{html-safe model.bio_cooked}}
+                {{#html-with-links}}
+                  {{html-safe model.bio_cooked}}
+                {{/html-with-links}}
               {{/if}}
             </div>
 
@@ -169,7 +170,7 @@
           </div>
         </div>
         {{#unless collapsedInfo}}
-          <div class='secondary'>
+          <div class='secondary' id='collapsed-info-panel'>
             <dl>
               {{#if model.created_at}}
                 <div><dt>{{i18n 'user.created'}}</dt><dd>{{bound-date model.created_at}}</dd></div>
@@ -225,7 +226,7 @@
     </section>
     <div class='user-content-wrapper'>
       <section class="user-primary-navigation">
-        {{#mobile-nav class='main-nav' desktopClass="nav nav-pills user-nav" currentPath=currentPath}}
+        {{#mobile-nav class='main-nav' desktopClass="nav nav-pills user-nav"}}
           {{#unless model.profile_hidden}}
             <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>
diff --git a/app/assets/javascripts/discourse/app/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
index 6ccc09bd66..40b558bee1 100644
--- a/app/assets/javascripts/discourse/app/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
@@ -1,39 +1,42 @@
 {{#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}}
-    <li>
-      {{#link-to "userActivity.index"}}{{i18n "user.filters.all"}}{{/link-to}}
-    </li>
-    <li>
-      {{#link-to "userActivity.topics"}}{{i18n "user_action_groups.4"}}{{/link-to}}
-    </li>
-    <li>
-      {{#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>
-    {{/if}}
-    <li>
-      {{#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}}
-    {{plugin-outlet
-      name="user-activity-bottom"
-      connectorTagName="li"
-      args=(hash model=model)
-    }}
-  {{/mobile-nav}}
+  <nav role="navigation">
+    {{#mobile-nav class="activity-nav" desktopClass="action-list activity-list nav-stacked"}}
+      {{#d-navigation-item route="userActivity.index"}}{{i18n "user.filters.all"}}{{/d-navigation-item}}
+      {{#d-navigation-item route="userActivity.topics"}}{{i18n "user_action_groups.4"}}{{/d-navigation-item}}
+      {{#d-navigation-item route="userActivity.replies"}}{{i18n "user_action_groups.5"}}{{/d-navigation-item}}
+
+      {{#if user.showRead}}
+        {{#d-navigation-item route="userActivity.read" title=(i18n "user.read_help")}}
+          {{i18n "user.read"}}
+        {{/d-navigation-item}}
+      {{/if}}
+
+      {{#if user.showDrafts}}
+        {{#d-navigation-item route="userActivity.drafts"}}
+          {{i18n "user_action_groups.15"}}
+        {{/d-navigation-item}}
+      {{/if}}
+
+      {{#d-navigation-item route="userActivity.likesGiven"}}{{i18n "user_action_groups.1"}}{{/d-navigation-item}}
+
+      {{#if user.showBookmarks}}
+        {{#d-navigation-item route="userActivity.bookmarks"}}{{i18n "user_action_groups.3"}}{{/d-navigation-item}}
+      {{/if}}
+
+      {{plugin-outlet
+        name="user-activity-bottom"
+        connectorTagName="li"
+        args=(hash model=model)
+      }}
+    {{/mobile-nav}}
+  </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>
 {{/if}}
+
 <section class="user-content">
   {{outlet}}
 </section>
diff --git a/app/assets/javascripts/discourse/app/templates/user/messages.hbs b/app/assets/javascripts/discourse/app/templates/user/messages.hbs
index 41c19141fd..004b58b4eb 100644
--- a/app/assets/javascripts/discourse/app/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/messages.hbs
@@ -5,7 +5,7 @@
     {{/if}}
   {{/unless}}
 
-  {{#mobile-nav class="messages-nav" desktopClass="nav-stacked action-list" currentPath=currentPath}}
+  {{#mobile-nav class="messages-nav" desktopClass="nav-stacked action-list"}}
     <li class="noGlyph">
       {{#link-to "userPrivateMessages.index" model}}
         {{i18n "user.messages.inbox"}}
@@ -59,11 +59,8 @@
   <div class="list-actions">
     {{#unless site.mobileView}}
       {{#if showToggleBulkSelect}}
-        {{d-button
-          class="btn-default bulk-select"
-          action=(action "toggleBulkSelect")
-          title="user.messages.bulk_select"
-          icon="list"}}
+        {{d-button icon="list" class="btn-default bulk-select" title="topics.bulk.toggle" action=(action "toggleBulkSelect")}}
+        {{bulk-select-button selected=selected action=(route-action "refresh")}}
       {{/if}}
     {{/unless}}
 
@@ -77,24 +74,9 @@
       {{/if}}
     {{/if}}
 
-    {{#if canArchive}}
-      {{d-button
-        class="btn-default btn-archive"
-        action=(action "archive")
-        label="user.messages.move_to_archive"}}
-    {{/if}}
-
-    {{#if canMoveToInbox}}
-      {{d-button
-        class="btn-default btn-to-inbox"
-        action=(action "toInbox")
-        label="user.messages.move_to_inbox"}}
-    {{/if}}
-
     {{#if bulkSelectEnabled}}
-      {{d-button
+      {{bulk-select-all
         class="btn-default btn-select-all"
-        action=(action "selectAll")
         label="user.messages.select_all"}}
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
index 5a79a5f4c8..eb71076d8c 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
@@ -1,5 +1,5 @@
 {{#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"}}
     <li>
       {{#link-to "userNotifications.index"}}
         {{i18n "user.filters.all"}}
@@ -27,6 +27,10 @@
         {{i18n "user_action_groups.11"}}
       {{/link-to}}
     </li>
+    {{plugin-outlet
+      name="user-notifications-bottom"
+      connectorTagName="li"
+      args=(hash model=model)}}
   {{/mobile-nav}}
 
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/app/templates/users.hbs b/app/assets/javascripts/discourse/app/templates/users.hbs
index b406e63a75..77446fbc76 100644
--- a/app/assets/javascripts/discourse/app/templates/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/users.hbs
@@ -19,7 +19,12 @@
                 {{i18n "directory.total_rows" count=model.totalRows}}
               {{/if}}
             </span>
-            {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name no-blur"}}
+            {{input
+              value=(readonly nameInput)
+              input=(action "onFilterChanged" value="target.value")
+              placeholderKey="directory.filter_name"
+              class="filter-name no-blur"
+            }}
           </div>
         </div>
 
diff --git a/app/assets/javascripts/discourse/app/widgets/actions-summary.js b/app/assets/javascripts/discourse/app/widgets/actions-summary.js
index faefd2c559..16f6be54ed 100644
--- a/app/assets/javascripts/discourse/app/widgets/actions-summary.js
+++ b/app/assets/javascripts/discourse/app/widgets/actions-summary.js
@@ -1,10 +1,10 @@
-import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
-import { createWidget } from "discourse/widgets/widget";
 import { avatarFor } from "discourse/widgets/post";
+import { createWidget } from "discourse/widgets/widget";
+import getURL from "discourse-common/lib/get-url";
 import { h } from "virtual-dom";
-import { userPath } from "discourse/lib/url";
 import hbs from "discourse/widgets/hbs-compiler";
+import { userPath } from "discourse/lib/url";
 
 export function smallUserAtts(user) {
   return {
diff --git a/app/assets/javascripts/discourse/app/widgets/avatar-flair.js b/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
index 4e1c5f0696..450b8bb40f 100644
--- a/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
+++ b/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
@@ -1,5 +1,5 @@
+import { convertIconClass, iconNode } from "discourse-common/lib/icon-library";
 import { createWidget } from "discourse/widgets/widget";
-import { iconNode, convertIconClass } from "discourse-common/lib/icon-library";
 import { escapeExpression } from "discourse/lib/utilities";
 
 createWidget("avatar-flair", {
@@ -29,7 +29,7 @@ createWidget("avatar-flair", {
   },
 
   buildAttributes(attrs) {
-    var style = "";
+    let style = "";
     if (!this.isIcon(attrs)) {
       style +=
         "background-image: url(" +
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 f923e8e0cd..5dd5c2c314 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,6 +1,6 @@
+import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import I18n from "I18n";
 import { createWidgetFrom } from "discourse/widgets/widget";
-import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import { formatUsername } from "discourse/lib/utilities";
 
 createWidgetFrom(
diff --git a/app/assets/javascripts/discourse/app/widgets/button.js b/app/assets/javascripts/discourse/app/widgets/button.js
index 82e706a7d0..6b08400e45 100644
--- a/app/assets/javascripts/discourse/app/widgets/button.js
+++ b/app/assets/javascripts/discourse/app/widgets/button.js
@@ -1,8 +1,8 @@
+import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
-import { iconNode } from "discourse-common/lib/icon-library";
 import { h } from "virtual-dom";
-import DiscourseURL from "discourse/lib/url";
+import { iconNode } from "discourse-common/lib/icon-library";
 
 export const ButtonClass = {
   tagName: "button.widget-button.btn",
@@ -31,13 +31,29 @@ export const ButtonClass = {
   buildAttributes() {
     const attrs = this.attrs;
     const attributes = {};
+    let title = attrs.translatedTitle;
 
-    if (attrs.title) {
-      const title = I18n.t(attrs.title, attrs.titleOptions);
+    if (!title && attrs.title) {
+      title = I18n.t(attrs.title, attrs.titleOptions);
+    }
+
+    if (title) {
       attributes["aria-label"] = title;
       attributes.title = title;
     }
 
+    if (attrs.role) {
+      attributes["role"] = attrs.role;
+    }
+
+    if (attrs.tabAttrs) {
+      const tab = attrs.tabAttrs;
+      attributes["aria-selected"] = tab["aria-selected"];
+      attributes["tabindex"] = tab["tabindex"];
+      attributes["aria-controls"] = tab["aria-controls"];
+      attributes["id"] = attrs.id;
+    }
+
     if (attrs.disabled) {
       attributes.disabled = "true";
     }
@@ -51,22 +67,40 @@ export const ButtonClass = {
     return attributes;
   },
 
+  _buildIcon(attrs) {
+    const icon = iconNode(attrs.icon, { class: attrs.iconClass });
+    if (attrs["aria-label"]) {
+      icon.properties.attributes["role"] = "img";
+      icon.properties.attributes["aria-hidden"] = false;
+    }
+    return icon;
+  },
+
   html(attrs) {
     const contents = [];
     const left = !attrs.iconRight;
     if (attrs.icon && left) {
-      contents.push(iconNode(attrs.icon, { class: attrs.iconClass }));
+      contents.push(this._buildIcon(attrs));
     }
     if (attrs.label) {
       contents.push(
         h("span.d-button-label", I18n.t(attrs.label, attrs.labelOptions))
       );
     }
+    if (attrs.translatedLabel) {
+      contents.push(
+        h(
+          "span.d-button-label",
+          attrs.translatedLabel.toString(),
+          attrs.translatedLabelOptions
+        )
+      );
+    }
     if (attrs.contents) {
       contents.push(attrs.contents);
     }
     if (attrs.icon && !left) {
-      contents.push(iconNode(attrs.icon, { class: attrs.iconClass }));
+      contents.push(this._buildIcon(attrs));
     }
 
     return contents;
diff --git a/app/assets/javascripts/discourse/app/widgets/component-connector.js b/app/assets/javascripts/discourse/app/widgets/component-connector.js
index db52456adc..8799d2770f 100644
--- a/app/assets/javascripts/discourse/app/widgets/component-connector.js
+++ b/app/assets/javascripts/discourse/app/widgets/component-connector.js
@@ -1,5 +1,5 @@
-import { scheduleOnce } from "@ember/runloop";
 import { getOwner } from "@ember/application";
+import { scheduleOnce } from "@ember/runloop";
 
 export default class ComponentConnector {
   constructor(widget, componentName, opts, trackedProperties) {
diff --git a/app/assets/javascripts/discourse/app/widgets/connector.js b/app/assets/javascripts/discourse/app/widgets/connector.js
index 25c6e8e852..7e08a18e23 100644
--- a/app/assets/javascripts/discourse/app/widgets/connector.js
+++ b/app/assets/javascripts/discourse/app/widgets/connector.js
@@ -1,5 +1,5 @@
-import { next } from "@ember/runloop";
 import { getOwner } from "@ember/application";
+import { next } from "@ember/runloop";
 
 export default class Connector {
   constructor(widget, opts) {
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 2f395a75ed..72c8dc6269 100644
--- a/app/assets/javascripts/discourse/app/widgets/custom-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/custom-notification-item.js
@@ -1,6 +1,6 @@
+import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import I18n from "I18n";
 import { createWidgetFrom } from "discourse/widgets/widget";
-import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import { formatUsername } from "discourse/lib/utilities";
 import { iconNode } from "discourse-common/lib/icon-library";
 
diff --git a/app/assets/javascripts/discourse/app/widgets/decorator-helper.js b/app/assets/javascripts/discourse/app/widgets/decorator-helper.js
index 7c67d99ed9..fcd58cba03 100644
--- a/app/assets/javascripts/discourse/app/widgets/decorator-helper.js
+++ b/app/assets/javascripts/discourse/app/widgets/decorator-helper.js
@@ -1,7 +1,7 @@
 import Connector from "discourse/widgets/connector";
-import { h } from "virtual-dom";
 import PostCooked from "discourse/widgets/post-cooked";
 import RawHtml from "discourse/widgets/raw-html";
+import { h } from "virtual-dom";
 
 class DecoratorHelper {
   constructor(widget, attrs, state) {
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 a935121d13..a5e3a35ff9 100644
--- a/app/assets/javascripts/discourse/app/widgets/default-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/default-notification-item.js
@@ -1,19 +1,19 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import { wantsNewWindow } from "discourse/lib/intercept-click";
-import RawHtml from "discourse/widgets/raw-html";
-import { createWidget } from "discourse/widgets/widget";
-import { h } from "virtual-dom";
-import { emojiUnescape } from "discourse/lib/text";
+import DiscourseURL, { userPath } from "discourse/lib/url";
+import { ajax, setTransientHeader } from "discourse/lib/ajax";
 import {
-  postUrl,
   escapeExpression,
   formatUsername,
+  postUrl,
 } from "discourse/lib/utilities";
-import DiscourseURL, { userPath } from "discourse/lib/url";
-import { iconNode } from "discourse-common/lib/icon-library";
-import { ajax, setTransientHeader } from "discourse/lib/ajax";
+import I18n from "I18n";
+import RawHtml from "discourse/widgets/raw-html";
+import { createWidget } from "discourse/widgets/widget";
+import { emojiUnescape } from "discourse/lib/text";
 import getURL from "discourse-common/lib/get-url";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
+import { isEmpty } from "@ember/utils";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
 
 export const DefaultNotificationItem = createWidget(
   "default-notification-item",
@@ -99,7 +99,13 @@ export const DefaultNotificationItem = createWidget(
     },
 
     icon(notificationName) {
-      return iconNode(`notification.${notificationName}`);
+      let icon = iconNode(`notification.${notificationName}`);
+      icon.properties.attributes["aria-label"] = I18n.t(
+        `notifications.titles.${notificationName}`
+      );
+      icon.properties.attributes["aria-hidden"] = false;
+      icon.properties.attributes["role"] = "img";
+      return icon;
     },
 
     notificationTitle(notificationName) {
diff --git a/app/assets/javascripts/discourse/app/widgets/do-not-disturb.js b/app/assets/javascripts/discourse/app/widgets/do-not-disturb.js
new file mode 100644
index 0000000000..956104bbc3
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/widgets/do-not-disturb.js
@@ -0,0 +1,48 @@
+import I18n from "I18n";
+import { createWidget } from "discourse/widgets/widget";
+import { dateNode } from "discourse/helpers/node";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
+import showModal from "discourse/lib/show-modal";
+
+export default createWidget("do-not-disturb", {
+  tagName: "li.do-not-disturb",
+  saving: false,
+
+  html() {
+    if (this.currentUser.isInDoNotDisturb()) {
+      return [
+        h("button.btn-flat.do-not-disturb-inner-container", [
+          iconNode("toggle-on"),
+          h("span.do-not-disturb-label", [
+            h("span", I18n.t("do_not_disturb.label")),
+            dateNode(this.currentUser.do_not_disturb_until),
+          ]),
+        ]),
+      ];
+    } else {
+      return [
+        h("button.btn-flat.do-not-disturb-inner-container", [
+          iconNode("toggle-off"),
+          h("span.do-not-disturb-label", I18n.t("do_not_disturb.label")),
+        ]),
+      ];
+    }
+  },
+
+  click() {
+    if (this.saving) {
+      return;
+    }
+
+    this.saving = true;
+    if (this.currentUser.do_not_disturb_until) {
+      return this.currentUser.leaveDoNotDisturb().then(() => {
+        this.saving = false;
+      });
+    } else {
+      this.saving = false;
+      return showModal("do-not-disturb");
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/widgets/embedded-post.js b/app/assets/javascripts/discourse/app/widgets/embedded-post.js
index 7e00cf04db..a723373454 100644
--- a/app/assets/javascripts/discourse/app/widgets/embedded-post.js
+++ b/app/assets/javascripts/discourse/app/widgets/embedded-post.js
@@ -1,8 +1,8 @@
-import PostCooked from "discourse/widgets/post-cooked";
 import DecoratorHelper from "discourse/widgets/decorator-helper";
+import DiscourseURL from "discourse/lib/url";
+import PostCooked from "discourse/widgets/post-cooked";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
-import DiscourseURL from "discourse/lib/url";
 import hbs from "discourse/widgets/hbs-compiler";
 
 createWidget("post-link-arrow", {
diff --git a/app/assets/javascripts/discourse/app/widgets/emoji.js b/app/assets/javascripts/discourse/app/widgets/emoji.js
index 3c2b5e3b32..d1185ae9d5 100644
--- a/app/assets/javascripts/discourse/app/widgets/emoji.js
+++ b/app/assets/javascripts/discourse/app/widgets/emoji.js
@@ -1,6 +1,6 @@
-import { createWidget } from "discourse/widgets/widget";
-import { emojiUrlFor, emojiUnescape } from "discourse/lib/text";
+import { emojiUnescape, emojiUrlFor } from "discourse/lib/text";
 import RawHtml from "discourse/widgets/raw-html";
+import { createWidget } from "discourse/widgets/widget";
 import { escapeExpression } from "discourse/lib/utilities";
 
 export function replaceEmoji(str) {
diff --git a/app/assets/javascripts/discourse/app/widgets/footer-nav.js b/app/assets/javascripts/discourse/app/widgets/footer-nav.js
index 0d57be4973..1a61ad34cc 100644
--- a/app/assets/javascripts/discourse/app/widgets/footer-nav.js
+++ b/app/assets/javascripts/discourse/app/widgets/footer-nav.js
@@ -1,5 +1,5 @@
-import { createWidget } from "discourse/widgets/widget";
 import { isAppWebview, postRNWebviewMessage } from "discourse/lib/utilities";
+import { createWidget } from "discourse/widgets/widget";
 
 createWidget("footer-nav", {
   tagName: "div.footer-nav-widget",
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 c005ec0a4f..03b3fea88a 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,6 +1,6 @@
+import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import I18n from "I18n";
 import { createWidgetFrom } from "discourse/widgets/widget";
-import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 
 createWidgetFrom(
   DefaultNotificationItem,
diff --git a/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js b/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
index 3c7de57033..8ef945c88b 100644
--- a/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
+++ b/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
@@ -1,9 +1,9 @@
-import getURL from "discourse-common/lib/get-url";
+import Category from "discourse/models/category";
 import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
+import getURL from "discourse-common/lib/get-url";
 import { h } from "virtual-dom";
 import { number } from "discourse/lib/formatter";
-import Category from "discourse/models/category";
 
 createWidget("hamburger-category", {
   tagName: "li.category-link",
diff --git a/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
index b13a698a4e..ed042a99f3 100644
--- a/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
@@ -1,12 +1,12 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import { later } from "@ember/runloop";
-import { createWidget, applyDecorators } from "discourse/widgets/widget";
-import { h } from "virtual-dom";
 import DiscourseURL, { userPath } from "discourse/lib/url";
-import { ajax } from "discourse/lib/ajax";
-import { wantsNewWindow } from "discourse/lib/intercept-click";
+import { applyDecorators, createWidget } from "discourse/widgets/widget";
+import I18n from "I18n";
 import { NotificationLevels } from "discourse/lib/notification-levels";
+import { ajax } from "discourse/lib/ajax";
+import getURL from "discourse-common/lib/get-url";
+import { h } from "virtual-dom";
+import { later } from "@ember/runloop";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
 
 const flatten = (array) => [].concat.apply([], array);
 
@@ -129,9 +129,7 @@ export default createWidget("hamburger-menu", {
         count: this.lookupCount("unread"),
       });
 
-      // Staff always see the review link.
-      // Non-staff will see it if there are items to review
-      if (currentUser.staff || currentUser.reviewable_count) {
+      if (currentUser.can_review) {
         links.push({
           route: siteSettings.reviewable_default_topics
             ? "review.topics"
@@ -341,7 +339,7 @@ export default createWidget("hamburger-menu", {
   refreshReviewableCount(state) {
     const { currentUser } = this;
 
-    if (state.loading || !currentUser) {
+    if (state.loading || !currentUser || !currentUser.can_review) {
       return;
     }
 
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 d5099ea66f..3a8b1806c4 100644
--- a/app/assets/javascripts/discourse/app/widgets/header-topic-info.js
+++ b/app/assets/javascripts/discourse/app/widgets/header-topic-info.js
@@ -1,13 +1,13 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
 import { applyDecorators, createWidget } from "discourse/widgets/widget";
+import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+import RawHtml from "discourse/widgets/raw-html";
+import { avatarImg } from "discourse/widgets/post";
+import getURL from "discourse-common/lib/get-url";
 import { h } from "virtual-dom";
 import { iconNode } from "discourse-common/lib/icon-library";
-import DiscourseURL from "discourse/lib/url";
-import RawHtml from "discourse/widgets/raw-html";
 import renderTags from "discourse/lib/render-tags";
 import { topicFeaturedLinkNode } from "discourse/lib/render-topic-featured-link";
-import { avatarImg } from "discourse/widgets/post";
 
 createWidget("topic-header-participant", {
   tagName: "span",
@@ -223,7 +223,9 @@ export default createWidget("header-topic-info", {
   jumpToTopPost() {
     const topic = this.attrs.topic;
     if (topic) {
-      DiscourseURL.routeTo(topic.get("firstPostUrl"));
+      DiscourseURL.routeTo(topic.get("firstPostUrl"), {
+        keepFilter: true,
+      });
     }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index 11a8a03849..0a5eba5f0f 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -1,17 +1,17 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import { get } from "@ember/object";
-import { schedule } from "@ember/runloop";
-import { createWidget } from "discourse/widgets/widget";
-import { iconNode } from "discourse-common/lib/icon-library";
-import { avatarImg } from "discourse/widgets/post";
 import DiscourseURL, { userPath } from "discourse/lib/url";
-import { wantsNewWindow } from "discourse/lib/intercept-click";
-import { applySearchAutocomplete } from "discourse/lib/search";
-import { ajax } from "discourse/lib/ajax";
+import I18n from "I18n";
 import { addExtraUserClasses } from "discourse/helpers/user-avatar";
-import { scrollTop } from "discourse/mixins/scroll-top";
+import { ajax } from "discourse/lib/ajax";
+import { applySearchAutocomplete } from "discourse/lib/search";
+import { avatarImg } from "discourse/widgets/post";
+import { createWidget } from "discourse/widgets/widget";
+import { get } from "@ember/object";
+import getURL from "discourse-common/lib/get-url";
 import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
+import { schedule } from "@ember/runloop";
+import { scrollTop } from "discourse/mixins/scroll-top";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
 
 const _extraHeaderIcons = [];
 
@@ -60,70 +60,78 @@ createWidget("header-notifications", {
     const contents = [
       avatarImg(
         this.settings.avatarSize,
-        addExtraUserClasses(user, avatarAttrs)
+        Object.assign(
+          {
+            alt: "user.avatar.header_title",
+          },
+          addExtraUserClasses(user, avatarAttrs)
+        )
       ),
     ];
 
-    const unreadNotifications = user.get("unread_notifications");
-    if (!!unreadNotifications) {
-      contents.push(
-        this.attach("link", {
-          action: attrs.action,
-          className: "badge-notification unread-notifications",
-          rawLabel: unreadNotifications,
-          omitSpan: true,
-          title: "notifications.tooltip.regular",
-          titleOptions: { count: unreadNotifications },
-        })
-      );
-    }
-
-    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")
-      ) {
-        if (!attrs.active && attrs.ringBackdrop) {
-          contents.push(h("span.ring"));
-          contents.push(h("span.ring-backdrop-spotlight"));
-          contents.push(
-            h(
-              "span.ring-backdrop",
-              {},
-              h("h1.ring-first-notification", {}, [
-                h("span", {}, I18n.t("user.first_notification")),
-                h("span", {}, [
-                  I18n.t("user.skip_new_user_tips.not_first_time"),
-                  " ",
-                  this.attach("link", {
-                    action: "skipNewUserTips",
-                    className: "skip-new-user-tips",
-                    label: "user.skip_new_user_tips.skip_link",
-                    title: "user.skip_new_user_tips.description",
-                    omitSpan: true,
-                  }),
-                ]),
-              ])
-            )
-          );
-        }
+    if (user.isInDoNotDisturb()) {
+      contents.push(h("div.do-not-disturb-background", iconNode("moon")));
+    } else {
+      const unreadNotifications = user.get("unread_notifications");
+      if (!!unreadNotifications) {
+        contents.push(
+          this.attach("link", {
+            action: attrs.action,
+            className: "badge-notification unread-notifications",
+            rawLabel: unreadNotifications,
+            omitSpan: true,
+            title: "notifications.tooltip.regular",
+            titleOptions: { count: unreadNotifications },
+          })
+        );
       }
 
-      // add the counter for the unread high priority
-      contents.push(
-        this.attach("link", {
-          action: attrs.action,
-          className: "badge-notification unread-high-priority-notifications",
-          rawLabel: unreadHighPriority,
-          omitSpan: true,
-          title: "notifications.tooltip.high_priority",
-          titleOptions: { count: unreadHighPriority },
-        })
-      );
-    }
+      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")
+        ) {
+          if (!attrs.active && attrs.ringBackdrop) {
+            contents.push(h("span.ring"));
+            contents.push(h("span.ring-backdrop-spotlight"));
+            contents.push(
+              h(
+                "span.ring-backdrop",
+                {},
+                h("h1.ring-first-notification", {}, [
+                  h("span", {}, I18n.t("user.first_notification")),
+                  h("span", {}, [
+                    I18n.t("user.skip_new_user_tips.not_first_time"),
+                    " ",
+                    this.attach("link", {
+                      action: "skipNewUserTips",
+                      className: "skip-new-user-tips",
+                      label: "user.skip_new_user_tips.skip_link",
+                      title: "user.skip_new_user_tips.description",
+                      omitSpan: true,
+                    }),
+                  ]),
+                ])
+              )
+            );
+          }
+        }
 
+        // add the counter for the unread high priority
+        contents.push(
+          this.attach("link", {
+            action: attrs.action,
+            className: "badge-notification unread-high-priority-notifications",
+            rawLabel: unreadHighPriority,
+            omitSpan: true,
+            title: "notifications.tooltip.high_priority",
+            titleOptions: { count: unreadHighPriority },
+          })
+        );
+      }
+    }
     return contents;
   },
 });
@@ -143,8 +151,10 @@ createWidget(
           "a.icon",
           {
             attributes: {
-              href: attrs.user.get("path"),
-              title: attrs.user.get("name"),
+              "aria-haspopup": true,
+              "aria-expanded": attrs.active,
+              href: attrs.user.path,
+              title: attrs.user.name || attrs.user.username,
               "data-auto-route": true,
             },
           },
@@ -174,6 +184,8 @@ createWidget(
           "a.icon.btn-flat",
           {
             attributes: {
+              "aria-expanded": attrs.active,
+              "aria-haspopup": true,
               href: attrs.href,
               "data-auto-route": true,
               title,
@@ -438,7 +450,7 @@ export default createWidget("header", {
     if (this.site.mobileView) {
       const searchService = this.register.lookup("search-service:main");
       const context = searchService.get("searchContext");
-      var params = "";
+      let params = "";
 
       if (context) {
         params = `?context=${context.type}&context_id=${context.id}&skip_context=${this.state.skipSearchContext}`;
@@ -574,6 +586,9 @@ export default createWidget("header", {
 
   headerDismissFirstNotificationMask() {
     // Dismiss notifications
+    if (document.body.classList.contains("unread-first-notification")) {
+      document.body.classList.remove("unread-first-notification");
+    }
     this.store
       .findStale(
         "notification",
diff --git a/app/assets/javascripts/discourse/app/widgets/home-logo.js b/app/assets/javascripts/discourse/app/widgets/home-logo.js
index 8fb0a4ef71..971d74f948 100644
--- a/app/assets/javascripts/discourse/app/widgets/home-logo.js
+++ b/app/assets/javascripts/discourse/app/widgets/home-logo.js
@@ -1,10 +1,10 @@
-import getURL from "discourse-common/lib/get-url";
+import DiscourseURL from "discourse/lib/url";
+import Session from "discourse/models/session";
 import { createWidget } from "discourse/widgets/widget";
+import getURL from "discourse-common/lib/get-url";
 import { h } from "virtual-dom";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
-import DiscourseURL from "discourse/lib/url";
-import Session from "discourse/models/session";
 
 export default createWidget("home-logo", {
   tagName: "div.title",
diff --git a/app/assets/javascripts/discourse/app/widgets/invitee-accepted-notification-item.js b/app/assets/javascripts/discourse/app/widgets/invitee-accepted-notification-item.js
index 26fc48f971..0b0b181aba 100644
--- a/app/assets/javascripts/discourse/app/widgets/invitee-accepted-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/invitee-accepted-notification-item.js
@@ -1,5 +1,5 @@
-import { createWidgetFrom } from "discourse/widgets/widget";
 import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
+import { createWidgetFrom } from "discourse/widgets/widget";
 import { userPath } from "discourse/lib/url";
 
 createWidgetFrom(
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 6901f3b6a2..9257687fb4 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,8 +1,8 @@
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
-import { createWidgetFrom } from "discourse/widgets/widget";
 import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
+import I18n from "I18n";
+import { createWidgetFrom } from "discourse/widgets/widget";
 import { escapeExpression } from "discourse/lib/utilities";
+import { isEmpty } from "@ember/utils";
 import { userPath } from "discourse/lib/url";
 
 createWidgetFrom(
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 46d5db1231..97b62d4eba 100644
--- a/app/assets/javascripts/discourse/app/widgets/liked-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/liked-notification-item.js
@@ -1,6 +1,6 @@
+import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import I18n from "I18n";
 import { createWidgetFrom } from "discourse/widgets/widget";
-import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import { formatUsername } from "discourse/lib/utilities";
 
 createWidgetFrom(DefaultNotificationItem, "liked-notification-item", {
diff --git a/app/assets/javascripts/discourse/app/widgets/link.js b/app/assets/javascripts/discourse/app/widgets/link.js
index 63452b0520..3d69dfcd41 100644
--- a/app/assets/javascripts/discourse/app/widgets/link.js
+++ b/app/assets/javascripts/discourse/app/widgets/link.js
@@ -1,10 +1,10 @@
-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";
-import { iconNode } from "discourse-common/lib/icon-library";
-import { h } from "virtual-dom";
 import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+import { createWidget } from "discourse/widgets/widget";
+import getURL from "discourse-common/lib/get-url";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
 
 export default createWidget("link", {
   tagName: "a",
@@ -65,7 +65,20 @@ export default createWidget("link", {
 
     const result = [];
     if (attrs.icon) {
-      result.push(iconNode(attrs.icon));
+      if (attrs["aria-label"]) {
+        let icon = iconNode(attrs.icon);
+
+        icon.properties.attributes["aria-label"] = I18n.t(
+          attrs["aria-label"],
+          attrs.ariaLabelOptions
+        );
+
+        icon.properties.attributes["role"] = "img";
+        icon.properties.attributes["aria-hidden"] = false;
+        result.push(icon);
+      } else {
+        result.push(iconNode(attrs.icon));
+      }
       result.push(" ");
     }
 
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 f47cea3eda..93dc02b7fb 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,6 +1,6 @@
+import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import I18n from "I18n";
 import { createWidgetFrom } from "discourse/widgets/widget";
-import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import { groupPath } from "discourse/lib/url";
 
 createWidgetFrom(
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 62a8503027..cd270077db 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,6 +1,6 @@
+import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import I18n from "I18n";
 import { createWidgetFrom } from "discourse/widgets/widget";
-import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import { userPath } from "discourse/lib/url";
 
 createWidgetFrom(
diff --git a/app/assets/javascripts/discourse/app/widgets/menu-panel.js b/app/assets/javascripts/discourse/app/widgets/menu-panel.js
index 4a07f37a68..5c9872bb72 100644
--- a/app/assets/javascripts/discourse/app/widgets/menu-panel.js
+++ b/app/assets/javascripts/discourse/app/widgets/menu-panel.js
@@ -1,6 +1,6 @@
-import hbs from "discourse/widgets/hbs-compiler";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
+import hbs from "discourse/widgets/hbs-compiler";
 
 createWidget("menu-links", {
   buildClasses(attrs) {
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 bc1b4369c5..dd56714c1b 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
@@ -1,6 +1,6 @@
+import { ButtonClass } from "discourse/widgets/button";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
-import { ButtonClass } from "discourse/widgets/button";
 
 createWidget(
   "post-admin-menu-button",
diff --git a/app/assets/javascripts/discourse/app/widgets/post-cooked.js b/app/assets/javascripts/discourse/app/widgets/post-cooked.js
index 94a61f66e3..bbc669ac22 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-cooked.js
@@ -1,10 +1,10 @@
+import highlightHTML, { unhighlightHTML } from "discourse/lib/highlight-html";
 import I18n from "I18n";
-import { iconHTML } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
+import highlightSearch from "discourse/lib/highlight-search";
+import { iconHTML } from "discourse-common/lib/icon-library";
 import { isValidLink } from "discourse/lib/click-track";
 import { number } from "discourse/lib/formatter";
-import highlightSearch from "discourse/lib/highlight-search";
-import highlightHTML, { unhighlightHTML } from "discourse/lib/highlight-html";
 import { spinnerHTML } from "discourse/helpers/loading-spinner";
 
 let _beforeAdoptDecorators = [];
@@ -95,6 +95,11 @@ export default class PostCooked {
       return;
     }
     let siteSettings = this.decoratorHelper.widget.siteSettings;
+
+    if (siteSettings.disable_image_size_calculations) {
+      return;
+    }
+
     const maxImageWidth = siteSettings.max_image_width;
     const maxImageHeight = siteSettings.max_image_height;
 
@@ -252,13 +257,16 @@ export default class PostCooked {
       let icon = iconHTML("arrow-up");
       navLink = `<a href='${this._urlForPostNumber(
         postNumber
-      )}' title='${quoteTitle}' class='back'>${icon}</a>`;
+      )}' title='${quoteTitle}' class='btn-flat back'>${icon}</a>`;
     }
 
     // Only add the expand/contract control if it's not a full post
     let expandContract = "";
+    const isExpanded = $aside.data("expanded") === true;
     if (!$aside.data("full")) {
-      expandContract = iconHTML(desc, { title: "post.expand_collapse" });
+      let icon = iconHTML(desc, { title: "post.expand_collapse" });
+      const quoteId = $aside.find("blockquote").attr("id");
+      expandContract = `<button aria-controls="${quoteId}" aria-expanded="${isExpanded}" class="quote-toggle btn-flat">${icon}</button>`;
       $(".title", $aside).css("cursor", "pointer");
     }
     if (this.ignoredUsers && this.ignoredUsers.length > 0) {
@@ -277,9 +285,14 @@ export default class PostCooked {
       return;
     }
 
-    $quotes.each((i, e) => {
+    $quotes.each((index, e) => {
       const $aside = $(e);
       if ($aside.data("post")) {
+        const quoteId = `quote-id-${$aside.data("topic")}-${$aside.data(
+          "post"
+        )}-${index}`;
+        $aside.find("blockquote").attr("id", quoteId);
+
         this._updateQuoteElements($aside, "chevron-down");
         const $title = $(".title", $aside);
 
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 5a69e4c338..741f9705b4 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
@@ -1,8 +1,6 @@
 import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
-import { iconNode } from "discourse-common/lib/icon-library";
 import { longDate } from "discourse/lib/formatter";
-import { h } from "virtual-dom";
 
 function mult(val) {
   return 60 * 50 * 1000 * val;
@@ -45,32 +43,24 @@ export default createWidget("post-edits-indicator", {
       className = `${className || ""} wiki`.trim();
 
       if (attrs.version > 1) {
-        title = `${I18n.t("post.last_edited_on")} ${date}`;
+        title = I18n.t("post.wiki_last_edited_on", { dateTime: date });
       } else {
         title = I18n.t("post.wiki.about");
       }
     } else {
-      title = `${I18n.t("post.last_edited_on")} ${date}`;
+      title = I18n.t("post.last_edited_on", { dateTime: date });
     }
 
-    const contents = [
-      attrs.version > 1 ? attrs.version - 1 : "",
-      " ",
-      iconNode(icon),
-    ];
-
-    return h(
-      "a",
-      {
-        className,
-        attributes: { title, href: "#" },
-      },
-      contents
-    );
+    return this.attach("flat-button", {
+      icon,
+      translatedTitle: title,
+      className,
+      action: "onPostEditsIndicatorClick",
+      translatedLabel: attrs.version > 1 ? attrs.version - 1 : "",
+    });
   },
 
-  click(e) {
-    e.preventDefault();
+  onPostEditsIndicatorClick() {
     if (this.attrs.wiki && this.attrs.version === 1) {
       this.sendWidgetAction("editPost");
     } else if (this.attrs.canViewEditHistory) {
diff --git a/app/assets/javascripts/discourse/app/widgets/post-gap.js b/app/assets/javascripts/discourse/app/widgets/post-gap.js
index d1a3b060f4..6fc769bbe4 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-gap.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-gap.js
@@ -29,6 +29,9 @@ export default createWidget("post-gap", {
       args
     ).then(() => {
       state.loading = false;
+      this.appEvents.trigger("post-stream:gap-expanded", {
+        post_id: this.model.id,
+      });
     });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/widgets/post-links.js b/app/assets/javascripts/discourse/app/widgets/post-links.js
index 36ea35513b..54d437b6cd 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-links.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-links.js
@@ -1,6 +1,6 @@
-import { iconNode } from "discourse-common/lib/icon-library";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
 import { replaceEmoji } from "discourse/widgets/emoji";
 
 export default createWidget("post-links", {
diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 17002ce893..85841705cb 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -1,11 +1,11 @@
-import { next, run } from "@ember/runloop";
 import { applyDecorators, createWidget } from "discourse/widgets/widget";
-import { smallUserAtts } from "discourse/widgets/actions-summary";
-import { h } from "virtual-dom";
-import showModal from "discourse/lib/show-modal";
+import { next, run } from "@ember/runloop";
 import { Promise } from "rsvp";
-import { isTesting } from "discourse-common/config/environment";
 import { formattedReminderTime } from "discourse/lib/bookmark";
+import { h } from "virtual-dom";
+import { isTesting } from "discourse-common/config/environment";
+import showModal from "discourse/lib/show-modal";
+import { smallUserAtts } from "discourse/widgets/actions-summary";
 
 const LIKE_ACTION = 2;
 const VIBRATE_DURATION = 5;
@@ -233,11 +233,18 @@ registerButton("wiki-edit", (attrs) => {
 
 registerButton("replies", (attrs, state, siteSettings) => {
   const replyCount = attrs.replyCount;
-
   if (!replyCount) {
     return;
   }
 
+  let action = "toggleRepliesBelow",
+    icon = state.repliesShown ? "chevron-up" : "chevron-down";
+
+  if (siteSettings.enable_filtered_replies_view) {
+    action = "toggleFilteredRepliesView";
+    icon = state.filteredRepliesShown ? "chevron-up" : "chevron-down";
+  }
+
   // Omit replies if the setting `suppress_reply_directly_below` is enabled
   if (
     replyCount === 1 &&
@@ -248,14 +255,18 @@ registerButton("replies", (attrs, state, siteSettings) => {
   }
 
   return {
-    action: "toggleRepliesBelow",
+    action,
+    icon,
     className: "show-replies",
-    icon: state.repliesShown ? "chevron-up" : "chevron-down",
     titleOptions: { count: replyCount },
-    title: "post.has_replies",
+    title: siteSettings.enable_filtered_replies_view
+      ? state.filteredRepliesShown
+        ? "post.view_all_posts"
+        : "post.filtered_replies_hint"
+      : "post.has_replies",
     labelOptions: { count: replyCount },
-    label: "post.has_replies",
-    iconRight: true,
+    label: attrs.mobileView ? "post.has_replies_count" : "post.has_replies",
+    iconRight: !siteSettings.enable_filtered_replies_view || attrs.mobileView,
   };
 });
 
@@ -553,6 +564,15 @@ export default createWidget("post-menu", {
       postControls.push(repliesButton);
     }
 
+    const extraPostControls = applyDecorators(
+      this,
+      "extra-post-controls",
+      attrs,
+      state
+    );
+
+    postControls.push(extraPostControls);
+
     const extraControls = applyDecorators(this, "extra-controls", attrs, state);
     const beforeExtraControls = applyDecorators(
       this,
@@ -574,8 +594,11 @@ export default createWidget("post-menu", {
 
     const contents = [
       h(
-        "nav.post-controls.clearfix" +
-          (this.state.collapsed ? ".collapsed" : ".expanded"),
+        "nav.post-controls" +
+          (this.state.collapsed ? ".collapsed" : ".expanded") +
+          (siteSettings.enable_filtered_replies_view
+            ? ".replies-button-visible"
+            : ""),
         postControls
       ),
     ];
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 824c72bea1..be5066e3d8 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
@@ -1,18 +1,18 @@
 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";
-import { h } from "virtual-dom";
-import { avatarFor } from "discourse/widgets/post";
-import { userPath } from "discourse/lib/url";
 import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
+import { avatarFor } from "discourse/widgets/post";
 import { computed } from "@ember/object";
+import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
+import { userPath } from "discourse/lib/url";
 
 export function actionDescriptionHtml(actionCode, createdAt, username) {
   const dt = new Date(createdAt);
   const when = autoUpdatingRelativeAge(dt, { format: "medium-with-ago" });
 
-  var who = "";
+  let who = "";
   if (username) {
     if (actionCode === "invited_group" || actionCode === "removed_group") {
       who = `<a class="mention-group" href="/g/${username}">@${username}</a>`;
diff --git a/app/assets/javascripts/discourse/app/widgets/post-stream.js b/app/assets/javascripts/discourse/app/widgets/post-stream.js
index c4d32dacc6..ead46aeb4e 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-stream.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-stream.js
@@ -1,9 +1,14 @@
-import { debounce } from "@ember/runloop";
-import { createWidget } from "discourse/widgets/widget";
-import transformPost from "discourse/lib/transform-post";
+import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
 import { addWidgetCleanCallback } from "discourse/components/mount-widget";
+import { avatarFor } from "discourse/widgets/post";
+import { createWidget } from "discourse/widgets/widget";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
 import { isTesting } from "discourse-common/config/environment";
+import transformPost from "discourse/lib/transform-post";
 
 let transformCallbacks = null;
 export function postTransformCallbacks(transformed) {
@@ -41,7 +46,7 @@ export function cloak(post, component) {
   _heights[post.id] = $post.outerHeight();
 
   component.dirtyKeys.keyDirty(`post-${post.id}`);
-  debounce(component, "queueRerender", 1000);
+  discourseDebounce(component, "queueRerender", 1000);
 }
 
 export function uncloak(post, component) {
@@ -58,22 +63,139 @@ addWidgetCleanCallback("post-stream", () => {
   _heights = {};
 });
 
+createWidget("posts-filtered-notice", {
+  buildKey: (attrs) => `posts-filtered-notice-${attrs.id}`,
+
+  buildClasses() {
+    return ["posts-filtered-notice"];
+  },
+
+  html(attrs) {
+    const filters = attrs.streamFilters;
+
+    if (filters.filter_upwards_post_id || filters.mixedHiddenPosts) {
+      return [
+        h(
+          "span.filtered-replies-viewing",
+          I18n.t("post.filtered_replies.viewing_subset")
+        ),
+        this.attach("filter-show-all", attrs),
+      ];
+    } else if (filters.replies_to_post_number) {
+      const sourcePost = attrs.posts.findBy(
+        "post_number",
+        filters.replies_to_post_number
+      );
+
+      return [
+        h(
+          "span.filtered-replies-viewing",
+          I18n.t("post.filtered_replies_viewing", {
+            count: sourcePost.reply_count,
+          })
+        ),
+        h("span.filtered-user-row", [
+          h(
+            "span.filtered-avatar",
+            avatarFor.call(this, "small", {
+              template: sourcePost.avatar_template,
+              username: sourcePost.username,
+              url: sourcePost.usernameUrl,
+            })
+          ),
+          this.attach("filter-jump-to-post", {
+            username: sourcePost.username,
+            postNumber: filters.replies_to_post_number,
+          }),
+        ]),
+        this.attach("filter-show-all", attrs),
+      ];
+    } else if (filters.filter && filters.filter === "summary") {
+      return [
+        h(
+          "span.filtered-replies-viewing",
+          I18n.t("post.filtered_replies.viewing_summary")
+        ),
+        this.attach("filter-show-all", attrs),
+      ];
+    } else if (filters.username_filters) {
+      const firstUserPost = attrs.posts[1],
+        userPostsCount = parseInt(attrs.filteredPostsCount, 10) - 1;
+      return [
+        h(
+          "span.filtered-replies-viewing",
+          I18n.t("post.filtered_replies.viewing_posts_by", {
+            post_count: userPostsCount,
+          })
+        ),
+        h(
+          "span.filtered-avatar",
+          avatarFor.call(this, "small", {
+            template: firstUserPost.avatar_template,
+            username: firstUserPost.username,
+            url: firstUserPost.usernameUrl,
+          })
+        ),
+        this.attach("poster-name", firstUserPost),
+        this.attach("filter-show-all", attrs),
+      ];
+    }
+
+    return [];
+  },
+});
+
+createWidget("filter-jump-to-post", {
+  tagName: "a.filtered-jump-to-post",
+  buildKey: (attrs) => `jump-to-post-${attrs.id}`,
+
+  html(attrs) {
+    return I18n.t("post.filtered_replies.post_number", {
+      username: attrs.username,
+      post_number: attrs.postNumber,
+    });
+  },
+
+  click() {
+    DiscourseURL.jumpToPost(this.attrs.postNumber);
+  },
+});
+
+createWidget("filter-show-all", {
+  tagName: "a.filtered-replies-show-all",
+  buildKey: (attrs) => `filtered-show-all-${attrs.id}`,
+
+  buildClasses() {
+    return ["btn", "btn-primary"];
+  },
+
+  html() {
+    return [iconNode("arrows-alt-v"), I18n.t("post.filtered_replies.show_all")];
+  },
+
+  click() {
+    this.sendWidgetAction("cancelFilter");
+    this.appEvents.trigger(
+      "post-stream:filter-show-all",
+      this.attrs.streamFilters
+    );
+  },
+});
+
 export default createWidget("post-stream", {
   tagName: "div.post-stream",
 
   html(attrs) {
-    const posts = attrs.posts || [];
-    const postArray = posts.toArray();
-
-    const result = [];
-
-    const before = attrs.gaps && attrs.gaps.before ? attrs.gaps.before : {};
-    const after = attrs.gaps && attrs.gaps.after ? attrs.gaps.after : {};
+    const posts = attrs.posts || [],
+      postArray = posts.toArray(),
+      result = [],
+      before = attrs.gaps && attrs.gaps.before ? attrs.gaps.before : {},
+      after = attrs.gaps && attrs.gaps.after ? attrs.gaps.after : {},
+      mobileView = this.site.mobileView;
 
     let prevPost;
     let prevDate;
 
-    const mobileView = this.site.mobileView;
     for (let i = 0; i < postArray.length; i++) {
       const post = postArray[i];
 
@@ -156,6 +278,21 @@ export default createWidget("post-stream", {
 
       prevPost = post;
     }
+
+    if (
+      attrs.streamFilters &&
+      Object.keys(attrs.streamFilters).length &&
+      (Object.keys(before).length > 0 || Object.keys(after).length > 0)
+    ) {
+      result.push(
+        this.attach("posts-filtered-notice", {
+          posts: postArray,
+          streamFilters: attrs.streamFilters,
+          filteredPostsCount: attrs.filteredPostsCount,
+        })
+      );
+    }
+
     return result;
   },
 });
diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index 7d8d0d3f6a..9a02a73f2d 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -1,25 +1,26 @@
-import 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";
-import { createWidget, applyDecorators } from "discourse/widgets/widget";
-import RawHtml from "discourse/widgets/raw-html";
-import { iconNode } from "discourse-common/lib/icon-library";
-import { transformBasicPost } from "discourse/lib/transform-post";
-import { postTransformCallbacks } from "discourse/widgets/post-stream";
-import { h } from "virtual-dom";
-import DiscourseURL from "discourse/lib/url";
-import { dateNode } from "discourse/helpers/node";
+import { applyDecorators, createWidget } from "discourse/widgets/widget";
 import {
-  translateSize,
   avatarUrl,
   formatUsername,
+  translateSize,
 } from "discourse/lib/utilities";
-import hbs from "discourse/widgets/hbs-compiler";
-import { relativeAgeMediumSpan } from "discourse/lib/formatter";
-import { prioritizeNameInUx } from "discourse/lib/settings";
+import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
+import DecoratorHelper from "discourse/widgets/decorator-helper";
+import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+import PostCooked from "discourse/widgets/post-cooked";
 import { Promise } from "rsvp";
+import RawHtml from "discourse/widgets/raw-html";
 import bootbox from "bootbox";
+import { dateNode } from "discourse/helpers/node";
+import { h } from "virtual-dom";
+import hbs from "discourse/widgets/hbs-compiler";
+import { iconNode } from "discourse-common/lib/icon-library";
+import { postTransformCallbacks } from "discourse/widgets/post-stream";
+import { prioritizeNameInUx } from "discourse/lib/settings";
+import { relativeAgeMediumSpan } from "discourse/lib/formatter";
+import { transformBasicPost } from "discourse/lib/transform-post";
+import autoGroupFlairForUser from "discourse/lib/avatar-flair";
 
 function transformWithCallbacks(post) {
   let transformed = transformBasicPost(post);
@@ -37,17 +38,21 @@ export function avatarImg(wanted, attrs) {
   }
 
   let title;
-
   if (!attrs.hideTitle) {
     title = attrs.name || formatUsername(attrs.username);
   }
 
+  let alt = "";
+  if (attrs.alt) {
+    alt = I18n.t(attrs.alt);
+  }
+
   let className =
     "avatar" + (attrs.extraClasses ? " " + attrs.extraClasses : "");
 
   const properties = {
     attributes: {
-      alt: "",
+      alt,
       width: size,
       height: size,
       src: getURLWithCDN(url),
@@ -120,18 +125,16 @@ createWidget("select-post", {
 createWidget("reply-to-tab", {
   tagName: "a.reply-to-tab",
   buildKey: (attrs) => `reply-to-tab-${attrs.id}`,
-
+  title: "post.in_reply_to",
   defaultState() {
     return { loading: false };
   },
 
   html(attrs, state) {
-    if (state.loading) {
-      return I18n.t("loading");
-    }
+    const icon = state.loading ? h("div.spinner.small") : iconNode("share");
 
     return [
-      iconNode("share"),
+      icon,
       " ",
       avatarImg("small", {
         template: attrs.replyToAvatarTemplate,
@@ -185,6 +188,11 @@ createWidget("post-avatar", {
 
     if (attrs.primary_group_flair_url || attrs.primary_group_flair_bg_color) {
       result.push(this.attach("avatar-flair", attrs));
+    } else {
+      const autoFlairAttrs = autoGroupFlairForUser(this.site, attrs);
+      if (autoFlairAttrs) {
+        result.push(this.attach("avatar-flair", autoFlairAttrs));
+      }
     }
 
     result.push(h("div.poster-avatar-extra"));
@@ -405,7 +413,12 @@ createWidget("post-contents", {
       result.push(this.attach("expand-post-button", attrs));
     }
 
-    const extraState = { state: { repliesShown: !!state.repliesBelow.length } };
+    const extraState = {
+      state: {
+        repliesShown: !!state.repliesBelow.length,
+        filteredRepliesShown: state.filteredRepliesShown,
+      },
+    };
     result.push(this.attach("post-menu", attrs, extraState));
 
     const repliesBelow = state.repliesBelow;
@@ -436,6 +449,30 @@ createWidget("post-contents", {
     return lastWikiEdit ? lastWikiEdit : createdAt;
   },
 
+  toggleFilteredRepliesView() {
+    const post = this.findAncestorModel(),
+      controller = this.register.lookup("controller:topic"),
+      currentFilterPostNumber = post.get(
+        "topic.postStream.filterRepliesToPostNumber"
+      );
+
+    if (
+      currentFilterPostNumber &&
+      currentFilterPostNumber === post.post_number
+    ) {
+      controller.send("cancelFilter", currentFilterPostNumber);
+      this.state.filteredRepliesShown = false;
+    } else {
+      this.state.filteredRepliesShown = true;
+      post
+        .get("topic.postStream")
+        .filterReplies(post.post_number, post.id)
+        .then(() => {
+          controller.updateQueryParams();
+        });
+    }
+  },
+
   toggleRepliesBelow(goToPost = "false") {
     if (this.state.repliesBelow.length) {
       this.state.repliesBelow = [];
@@ -455,7 +492,7 @@ createWidget("post-contents", {
         this.state.repliesBelow = posts.map((p) => {
           let result = transformWithCallbacks(p);
           result.shareUrl = `${topicUrl}/${p.post_number}`;
-          result.asPost = this.store.createRecord("post", p);
+          result.asPost = this.store.createRecord("post", result);
           return result;
         });
       });
@@ -617,6 +654,17 @@ createWidget("post-article", {
   toggleReplyAbove(goToPost = "false") {
     const replyPostNumber = this.attrs.reply_to_post_number;
 
+    if (this.siteSettings.enable_filtered_replies_view) {
+      const post = this.findAncestorModel();
+      const controller = this.register.lookup("controller:topic");
+      return post
+        .get("topic.postStream")
+        .filterUpwards(this.attrs.id)
+        .then(() => {
+          controller.updateQueryParams();
+        });
+    }
+
     // jump directly on mobile
     if (this.attrs.mobileView) {
       const topicUrl = this._getTopicUrl();
@@ -640,8 +688,10 @@ createWidget("post-article", {
         .find("post-reply-history", { postId: this.attrs.id })
         .then((posts) => {
           this.state.repliesAbove = posts.map((p) => {
-            p.shareUrl = `${topicUrl}/${p.post_number}`;
-            return transformWithCallbacks(p);
+            let result = transformWithCallbacks(p);
+            result.shareUrl = `${topicUrl}/${p.post_number}`;
+            result.asPost = this.store.createRecord("post", result);
+            return result;
           });
         });
     }
diff --git a/app/assets/javascripts/discourse/app/widgets/poster-name.js b/app/assets/javascripts/discourse/app/widgets/poster-name.js
index da553bf9b5..441fda53fd 100644
--- a/app/assets/javascripts/discourse/app/widgets/poster-name.js
+++ b/app/assets/javascripts/discourse/app/widgets/poster-name.js
@@ -1,9 +1,9 @@
-import getURL from "discourse-common/lib/get-url";
+import { applyDecorators, createWidget } from "discourse/widgets/widget";
 import I18n from "I18n";
-import { iconNode } from "discourse-common/lib/icon-library";
-import { createWidget, applyDecorators } from "discourse/widgets/widget";
-import { h } from "virtual-dom";
 import { formatUsername } from "discourse/lib/utilities";
+import getURL from "discourse-common/lib/get-url";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
 import { prioritizeNameInUx } from "discourse/lib/settings";
 
 let sanitizeName = function (name) {
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 13784716e0..435df6c0de 100644
--- a/app/assets/javascripts/discourse/app/widgets/private-message-map.js
+++ b/app/assets/javascripts/discourse/app/widgets/private-message-map.js
@@ -1,11 +1,11 @@
-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";
-import { h } from "virtual-dom";
 import { avatarFor, avatarImg } from "discourse/widgets/post";
-import hbs from "discourse/widgets/hbs-compiler";
+import I18n from "I18n";
 import bootbox from "bootbox";
+import { createWidget } from "discourse/widgets/widget";
+import getURL from "discourse-common/lib/get-url";
+import { h } from "virtual-dom";
+import hbs from "discourse/widgets/hbs-compiler";
+import { makeArray } from "discourse-common/lib/helpers";
 
 createWidget("pm-remove-group-link", {
   tagName: "a.remove-invited.no-text.btn-icon.btn",
@@ -187,7 +187,7 @@ export default createWidget("private-message-map", {
         this.attach("button", {
           action: "showInvite",
           icon: "plus",
-          className: "btn.no-text.btn-icon",
+          className: "btn btn-default no-text btn-icon",
         })
       );
     }
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 fdeb7e0a86..4931ed9763 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js
@@ -1,23 +1,42 @@
-import { h } from "virtual-dom";
+import RawHtml from "discourse/widgets/raw-html";
+import { iconHTML } from "discourse-common/lib/icon-library";
 import QuickAccessPanel from "discourse/widgets/quick-access-panel";
 import UserAction from "discourse/models/user-action";
 import { ajax } from "discourse/lib/ajax";
-import { createWidgetFrom } from "discourse/widgets/widget";
+import { createWidget, createWidgetFrom } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
 import { postUrl } from "discourse/lib/utilities";
+import I18n from "I18n";
 
 const ICON = "bookmark";
 
+createWidget("no-quick-access-bookmarks", {
+  html() {
+    return h("div.empty-state", [
+      h("span.empty-state-title", I18n.t("user.no_bookmarks_title")),
+      h(
+        "div.empty-state-body",
+        new RawHtml({
+          html:
+            "<p>" +
+            I18n.t("user.no_bookmarks_body", {
+              icon: iconHTML(ICON),
+            }).htmlSafe() +
+            "</p>",
+        })
+      ),
+    ]);
+  },
+});
+
 createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
   buildKey: () => "quick-access-bookmarks",
+  emptyStateWidget: "no-quick-access-bookmarks",
 
   showAllHref() {
     return `${this.attrs.path}/activity/bookmarks`;
   },
 
-  emptyStatePlaceholderItem() {
-    return h("li.read", this.state.emptyStatePlaceholderItemText);
-  },
-
   findNewItems() {
     return this.loadBookmarksWithReminders();
   },
@@ -30,6 +49,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
         bookmark.topic_id,
         bookmark.post_number || bookmark.linked_post_number
       ),
+      title: bookmark.name,
       content: bookmark.title,
       username: bookmark.post_user_username,
     });
@@ -47,12 +67,6 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
       cache: "false",
     }).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) {
-        this.state.emptyStatePlaceholderItemText = result.no_results_help;
-      }
       return result.bookmarks;
     });
   },
@@ -65,10 +79,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
         filter: UserAction.TYPES.bookmarks,
         no_results_help_key: "user_activity.no_bookmarks",
       },
-    }).then(({ user_actions, no_results_help }) => {
-      // The empty state help text for bookmarks page is localized on the
-      // server.
-      this.state.emptyStatePlaceholderItemText = no_results_help;
+    }).then(({ user_actions }) => {
       return user_actions;
     });
   },
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-item.js b/app/assets/javascripts/discourse/app/widgets/quick-access-item.js
index f21fbf971b..61e7668ff1 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-item.js
@@ -1,9 +1,9 @@
-import { h } from "virtual-dom";
 import RawHtml from "discourse/widgets/raw-html";
 import { createWidget } from "discourse/widgets/widget";
 import { emojiUnescape } from "discourse/lib/text";
-import { iconNode } from "discourse-common/lib/icon-library";
 import { escapeExpression } from "discourse/lib/utilities";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
 
 /**
  * This helper widget tries to enforce a consistent look and behavior for any
@@ -19,7 +19,7 @@ import { escapeExpression } from "discourse/lib/utilities";
  *   read
  *   username
  */
-createWidget("quick-access-item", {
+export default createWidget("quick-access-item", {
   tagName: "li",
 
   buildClasses(attrs) {
@@ -33,7 +33,7 @@ createWidget("quick-access-item", {
     return result;
   },
 
-  html({ href, icon }) {
+  html({ href, title, icon }) {
     let content = this._contentHtml();
 
     if (href) {
@@ -44,7 +44,7 @@ createWidget("quick-access-item", {
       }
     }
 
-    return h("a", { attributes: this._linkAttributes(href) }, [
+    return h("a", { attributes: this._linkAttributes(href, title) }, [
       iconNode(icon),
       new RawHtml({
         html: `<div>${this._usernameHtml()}${content}</div>`,
@@ -60,8 +60,8 @@ createWidget("quick-access-item", {
     }
   },
 
-  _linkAttributes(href) {
-    return { href };
+  _linkAttributes(href, title) {
+    return { href, title };
   },
 
   _contentHtml() {
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-messages.js b/app/assets/javascripts/discourse/app/widgets/quick-access-messages.js
index 2f8db2d8d0..b2da0ab43a 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-messages.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-messages.js
@@ -1,6 +1,11 @@
+import RawHtml from "discourse/widgets/raw-html";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { h } from "virtual-dom";
 import QuickAccessPanel from "discourse/widgets/quick-access-panel";
-import { createWidgetFrom } from "discourse/widgets/widget";
+import { createWidget, createWidgetFrom } from "discourse/widgets/widget";
 import { postUrl } from "discourse/lib/utilities";
+import getURL from "discourse-common/lib/get-url";
+import I18n from "I18n";
 
 const ICON = "notification.private_message";
 
@@ -20,9 +25,29 @@ function toItem(message) {
   };
 }
 
+createWidget("no-quick-access-messages", {
+  html() {
+    return h("div.empty-state", [
+      h("span.empty-state-title", I18n.t("user.no_messages_title")),
+      h(
+        "div.empty-state-body",
+        new RawHtml({
+          html:
+            "<p>" +
+            I18n.t("user.no_messages_body", {
+              aboutUrl: getURL("/about"),
+              icon: iconHTML("envelope"),
+            }).htmlSafe() +
+            "</p>",
+        })
+      ),
+    ]);
+  },
+});
+
 createWidgetFrom(QuickAccessPanel, "quick-access-messages", {
   buildKey: () => "quick-access-messages",
-  emptyStatePlaceholderItemKey: "choose_topic.none_found",
+  emptyStateWidget: "no-quick-access-messages",
 
   showAllHref() {
     return `${this.attrs.path}/messages`;
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-notifications.js b/app/assets/javascripts/discourse/app/widgets/quick-access-notifications.js
index 39d8e14a7b..e2b6ab0c14 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-notifications.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-notifications.js
@@ -1,10 +1,41 @@
-import { ajax } from "discourse/lib/ajax";
-import { createWidgetFrom } from "discourse/widgets/widget";
+import RawHtml from "discourse/widgets/raw-html";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import getURL from "discourse-common/lib/get-url";
 import QuickAccessPanel from "discourse/widgets/quick-access-panel";
+import { ajax } from "discourse/lib/ajax";
+import { createWidget, createWidgetFrom } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import I18n from "I18n";
+
+const ICON = "bell";
+
+createWidget("no-quick-access-notifications", {
+  html() {
+    return h("div.empty-state", [
+      h("span.empty-state-title", I18n.t("user.no_notifications_title")),
+      h(
+        "div.empty-state-body",
+        new RawHtml({
+          html:
+            "<p>" +
+            I18n.t("user.no_notifications_body", {
+              preferencesUrl: getURL("/my/preferences/notifications"),
+              icon: iconHTML(ICON),
+            }).htmlSafe() +
+            "</p>",
+        })
+      ),
+    ]);
+  },
+});
 
 createWidgetFrom(QuickAccessPanel, "quick-access-notifications", {
   buildKey: () => "quick-access-notifications",
-  emptyStatePlaceholderItemKey: "notifications.empty",
+  emptyStateWidget: "no-quick-access-notifications",
+
+  buildAttributes() {
+    return { tabindex: -1 };
+  },
 
   markReadRequest() {
     return ajax("/notifications/mark-read", { type: "PUT" });
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 7b75486881..e87ec97bbb 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
@@ -1,8 +1,8 @@
 import I18n from "I18n";
+import { Promise } from "rsvp";
 import Session from "discourse/models/session";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
-import { Promise } from "rsvp";
 
 /**
  * This tries to enforce a consistent flow of fetching, caching, refreshing,
@@ -14,7 +14,8 @@ import { Promise } from "rsvp";
  */
 export default createWidget("quick-access-panel", {
   tagName: "div.quick-access-panel",
-  emptyStatePlaceholderItemKey: "",
+  emptyStatePlaceholderItemKey: null,
+  emptyStateWidget: null,
 
   buildKey: () => {
     throw Error('Cannot attach abstract widget "quick-access-panel".');
@@ -40,6 +41,19 @@ export default createWidget("quick-access-panel", {
     return Promise.resolve([]);
   },
 
+  buildId() {
+    return this.key;
+  },
+
+  buildAttributes() {
+    const attributes = this.attrs;
+    attributes["aria-labelledby"] = attributes.currentQuickAccess;
+    attributes["tabindex"] = "0";
+    attributes["role"] = "tabpanel";
+
+    return attributes;
+  },
+
   newItemsLoaded() {},
 
   itemHtml(item) {}, // eslint-disable-line no-unused-vars
@@ -47,6 +61,8 @@ export default createWidget("quick-access-panel", {
   emptyStatePlaceholderItem() {
     if (this.emptyStatePlaceholderItemKey) {
       return h("li.read", I18n.t(this.emptyStatePlaceholderItemKey));
+    } else if (this.emptyStateWidget) {
+      return this.attach(this.emptyStateWidget);
     } else {
       return "";
     }
@@ -63,7 +79,7 @@ export default createWidget("quick-access-panel", {
   },
 
   refreshNotifications(state) {
-    if (this.loading) {
+    if (state.loading) {
       return;
     }
 
@@ -95,18 +111,24 @@ export default createWidget("quick-access-panel", {
       return [h("div.spinner-container", h("div.spinner"))];
     }
 
-    let bottomItems = [];
     const items = this.getItems().length
       ? this.getItems().map((item) => this.itemHtml(item))
       : [this.emptyStatePlaceholderItem()];
 
+    let bottomItems = [];
+
     if (!this.hideBottomItems()) {
+      const tab = I18n.t(this.attrs.titleKey).toLowerCase();
+
       bottomItems.push(
         // intentionally a link so it can be ctrl clicked
         this.attach("link", {
           title: "view_all",
+          titleOptions: { tab },
           icon: "chevron-down",
           className: "btn btn-default btn-icon no-text show-all",
+          "aria-label": "view_all",
+          ariaLabelOptions: { tab },
           href: this.showAllHref(),
         })
       );
@@ -118,7 +140,7 @@ export default createWidget("quick-access-panel", {
           title: "user.dismiss_notifications_tooltip",
           icon: "check",
           label: "user.dismiss",
-          className: "notifications-dismiss",
+          className: "btn btn-default notifications-dismiss",
           action: "dismissNotifications",
         })
       );
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 5b32c40954..5ad69f6e9c 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
@@ -1,7 +1,8 @@
 import I18n from "I18n";
+import { Promise } from "rsvp";
+import QuickAccessItem from "discourse/widgets/quick-access-item";
 import QuickAccessPanel from "discourse/widgets/quick-access-panel";
 import { createWidgetFrom } from "discourse/widgets/widget";
-import { Promise } from "rsvp";
 
 const _extraItems = [];
 
@@ -9,6 +10,19 @@ export function addQuickAccessProfileItem(item) {
   _extraItems.push(item);
 }
 
+createWidgetFrom(QuickAccessItem, "logout-item", {
+  tagName: "li.logout",
+
+  html() {
+    return this.attach("flat-button", {
+      action: "logout",
+      content: I18n.t("user.log_out"),
+      icon: "sign-out-alt",
+      label: "user.log_out",
+    });
+  },
+});
+
 createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
   tagName: "div.quick-access-panel.quick-access-profile",
 
@@ -24,7 +38,8 @@ createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
   },
 
   itemHtml(item) {
-    return this.attach("quick-access-item", item);
+    const widgetType = item.widget || "quick-access-item";
+    return this.attach(widgetType, item);
   },
 
   _getItems() {
@@ -35,7 +50,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
     items = items.concat(_extraItems);
 
     if (this.attrs.showLogoutButton) {
-      items.push(this._logOutButton());
+      items.push({ widget: "logout-item" });
     }
     return items;
   },
@@ -79,6 +94,8 @@ createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
         className: "preferences",
       }
     );
+    defaultItems.push({ widget: "do-not-disturb" });
+
     return defaultItems;
   },
 
@@ -100,15 +117,6 @@ createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
     }
   },
 
-  _logOutButton() {
-    return {
-      action: "logout",
-      className: "logout",
-      content: I18n.t("user.log_out"),
-      icon: "sign-out-alt",
-    };
-  },
-
   _showToggleAnonymousButton() {
     return (
       (this.siteSettings.allow_anonymous_posting &&
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 461b93b2e8..3230051e1f 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu-controls.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu-controls.js
@@ -1,8 +1,8 @@
 import I18n from "I18n";
-import { get } from "@ember/object";
-import { searchContextDescription } from "discourse/lib/search";
-import { h } from "virtual-dom";
 import { createWidget } from "discourse/widgets/widget";
+import { get } from "@ember/object";
+import { h } from "virtual-dom";
+import { searchContextDescription } from "discourse/lib/search";
 
 createWidget("search-term", {
   tagName: "input",
@@ -23,6 +23,7 @@ createWidget("search-term", {
       value: attrs.value || "",
       autocomplete: "discourse",
       placeholder: attrs.contextEnabled ? "" : I18n.t("search.title"),
+      "aria-label": I18n.t("search.title"),
     };
   },
 
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 d1981adf80..57b89ef894 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
@@ -1,11 +1,12 @@
+import { escapeExpression, formatUsername } from "discourse/lib/utilities";
 import I18n from "I18n";
-import { avatarImg } from "discourse/widgets/post";
-import { dateNode } from "discourse/helpers/node";
 import RawHtml from "discourse/widgets/raw-html";
+import { avatarImg } from "discourse/widgets/post";
 import { createWidget } from "discourse/widgets/widget";
+import { dateNode } from "discourse/helpers/node";
+import { emojiUnescape } from "discourse/lib/text";
 import { h } from "virtual-dom";
 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";
 
@@ -128,6 +129,12 @@ createSearchResult({
 
     userTitles.push(h("span.username", formatUsername(u.username)));
 
+    if (u.custom_data) {
+      u.custom_data.forEach((row) =>
+        userTitles.push(h("span.custom-field", `${row.name}: ${row.value}`))
+      );
+    }
+
     const userResultContents = [
       avatarImg("small", {
         template: u.avatar_template,
@@ -151,7 +158,14 @@ createSearchResult({
       h(
         "span.topic-title",
         { attributes: { "data-topic-id": topic.id } },
-        new Highlighted(topic.fancyTitle, term)
+        this.siteSettings.use_pg_headlines_for_excerpt &&
+          result.topic_title_headline
+          ? new RawHtml({
+              html: `<span>${emojiUnescape(
+                result.topic_title_headline
+              )}</span>`,
+            })
+          : new Highlighted(topic.fancyTitle, term)
       ),
     ];
 
diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js
index 1b3585c72f..28d8ce506b 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js
@@ -1,11 +1,11 @@
-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";
-import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
-import { createWidget } from "discourse/widgets/widget";
-import { h } from "virtual-dom";
+import { isValidSearchTerm, searchForTerm } from "discourse/lib/search";
 import DiscourseURL from "discourse/lib/url";
+import { createWidget } from "discourse/widgets/widget";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { get } from "@ember/object";
+import getURL from "discourse-common/lib/get-url";
+import { h } from "virtual-dom";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 const searchData = {};
 
@@ -284,7 +284,7 @@ export default createWidget("search-menu", {
     searchData.noResults = false;
     this.searchService().set("highlightTerm", searchData.term);
     searchData.loading = true;
-    debounce(SearchHelper, SearchHelper.perform, this, 400);
+    discourseDebounce(SearchHelper, SearchHelper.perform, this, 400);
   },
 
   moreOfType(type) {
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 90906385bc..b97801eee4 100644
--- a/app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js
+++ b/app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js
@@ -17,12 +17,12 @@ createWidget("toggle-summary-description", {
           (attrs.topicPostsCount * MIN_POST_READ_TIME) / 60
         )
       );
-      return I18n.t("summary.description_time", {
+      return I18n.messageFormat("summary.description_time_MF", {
         replyCount: attrs.topicReplyCount,
         readingTime,
       });
     }
-    return I18n.t("summary.description", { replyCount: attrs.topicReplyCount });
+    return I18n.t("summary.description", { count: attrs.topicReplyCount });
   },
 
   html(attrs) {
@@ -39,7 +39,7 @@ export default createWidget("toggle-topic-summary", {
       this.attach("button", {
         className: "btn btn-primary",
         label: attrs.topicSummaryEnabled ? "summary.disable" : "summary.enable",
-        action: "toggleSummary",
+        action: attrs.topicSummaryEnabled ? "cancelFilter" : "showSummary",
       }),
     ];
   },
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 a022ac3b40..07c4fb02f8 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
@@ -1,4 +1,4 @@
-import { createWidget, applyDecorators } from "discourse/widgets/widget";
+import { applyDecorators, createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 
 createWidget("admin-menu-button", {
@@ -52,7 +52,7 @@ createWidget("topic-admin-menu-button", {
       result.push(
         this.attach("button", {
           className:
-            "popup-menu-button toggle-admin-menu" +
+            "btn-default popup-menu-button toggle-admin-menu" +
             (attrs.addKeyboardTargetClass ? " keyboard-target-admin-menu" : ""),
           title: "topic_admin_menu",
           icon: "wrench",
@@ -200,23 +200,29 @@ export default createWidget("topic-admin-menu", {
 
     if (this.get("currentUser.canManageTopic")) {
       this.addActionButton({
-        className: "topic-admin-status-update",
+        className: "admin-topic-timer-update",
         buttonClass: "popup-menu-btn",
-        action: "showTopicStatusUpdate",
+        action: "showTopicTimerModal",
         icon: "far-clock",
         label: "actions.timed_update",
       });
+    }
 
-      if (!isPrivateMessage && (topic.get("visible") || featured)) {
-        this.addActionButton({
-          className: "topic-admin-pin",
-          buttonClass: "popup-menu-btn",
-          action: "showFeatureTopic",
-          icon: "thumbtack",
-          label: featured ? "actions.unpin" : "actions.pin",
-        });
-      }
+    if (
+      details.get("can_pin_unpin_topic") &&
+      !isPrivateMessage &&
+      (topic.get("visible") || featured)
+    ) {
+      this.addActionButton({
+        className: "topic-admin-pin",
+        buttonClass: "popup-menu-btn",
+        action: "showFeatureTopic",
+        icon: "thumbtack",
+        label: featured ? "actions.unpin" : "actions.pin",
+      });
+    }
 
+    if (this.get("currentUser.canManageTopic")) {
       if (this.currentUser.get("staff")) {
         this.addActionButton({
           className: "topic-admin-change-timestamp",
@@ -250,7 +256,7 @@ export default createWidget("topic-admin-menu", {
       }
     }
 
-    if (this.get("currentUser.canManageTopic")) {
+    if (details.get("can_toggle_topic_visibility")) {
       this.addActionButton({
         className: "topic-admin-visible",
         buttonClass: "popup-menu-btn",
@@ -258,7 +264,9 @@ export default createWidget("topic-admin-menu", {
         icon: visible ? "far-eye-slash" : "far-eye",
         label: visible ? "actions.invisible" : "actions.visible",
       });
+    }
 
+    if (this.get("currentUser.canManageTopic")) {
       if (details.get("can_convert_topic")) {
         this.addActionButton({
           className: "topic-admin-convert",
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-map.js b/app/assets/javascripts/discourse/app/widgets/topic-map.js
index dc4f053b6f..be9bf14d84 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-map.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-map.js
@@ -1,9 +1,10 @@
+import { avatarFor, avatarImg } from "discourse/widgets/post";
+import { dateNode, numberNode } from "discourse/helpers/node";
 import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
-import { avatarImg, avatarFor } from "discourse/widgets/post";
-import { dateNode, numberNode } from "discourse/helpers/node";
 import { replaceEmoji } from "discourse/widgets/emoji";
+import autoGroupFlairForUser from "discourse/lib/avatar-flair";
 
 const LINKS_SHOWN = 5;
 
@@ -61,6 +62,11 @@ createWidget("topic-participant", {
 
     if (attrs.primary_group_flair_url || attrs.primary_group_flair_bg_color) {
       linkContents.push(this.attach("avatar-flair", attrs));
+    } else {
+      const autoFlairAttrs = autoGroupFlairForUser(this.site, attrs);
+      if (autoFlairAttrs) {
+        linkContents.push(this.attach("avatar-flair", autoFlairAttrs));
+      }
     }
 
     return h(
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-status.js b/app/assets/javascripts/discourse/app/widgets/topic-status.js
index 28363d1a6f..9a1b460db6 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-status.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-status.js
@@ -1,9 +1,9 @@
 import I18n from "I18n";
-import { createWidget } from "discourse/widgets/widget";
-import { iconNode } from "discourse-common/lib/icon-library";
-import { h } from "virtual-dom";
-import { escapeExpression } from "discourse/lib/utilities";
 import TopicStatusIcons from "discourse/helpers/topic-status-icons";
+import { createWidget } from "discourse/widgets/widget";
+import { escapeExpression } from "discourse/lib/utilities";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
 
 export default createWidget("topic-status", {
   tagName: "div.topic-statuses",
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
index ba21c6eb8d..18f8573a83 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
@@ -1,14 +1,14 @@
-import I18n from "I18n";
-import { later } from "@ember/runloop";
-import { createWidget } from "discourse/widgets/widget";
 import ComponentConnector from "discourse/widgets/component-connector";
-import { h } from "virtual-dom";
-import { relativeAge } from "discourse/lib/formatter";
-import { iconNode } from "discourse-common/lib/icon-library";
+import I18n from "I18n";
 import RawHtml from "discourse/widgets/raw-html";
+import { createWidget } from "discourse/widgets/widget";
+import { deepMerge } from "discourse-common/lib/object";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
+import { later } from "@ember/runloop";
+import { relativeAge } from "discourse/lib/formatter";
 import renderTags from "discourse/lib/render-tags";
 import renderTopicFeaturedLink from "discourse/lib/render-topic-featured-link";
-import { deepMerge } from "discourse-common/lib/object";
 
 const SCROLLER_HEIGHT = 50;
 const LAST_READ_HEIGHT = 20;
diff --git a/app/assets/javascripts/discourse/app/widgets/user-menu.js b/app/assets/javascripts/discourse/app/widgets/user-menu.js
index 79379340f7..09cda2bb12 100644
--- a/app/assets/javascripts/discourse/app/widgets/user-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/user-menu.js
@@ -13,6 +13,13 @@ const QuickAccess = {
   PROFILE: "profile",
 };
 
+const Titles = {
+  bookmarks: "user.bookmarks",
+  messages: "user.private_messages",
+  notifications: "user.notifications",
+  profile: "user.preferences",
+};
+
 let extraGlyphs;
 
 export function addUserMenuGlyph(glyph) {
@@ -23,47 +30,92 @@ export function addUserMenuGlyph(glyph) {
 createWidget("user-menu-links", {
   tagName: "div.menu-links-header",
 
+  _tabAttrs(quickAccessType) {
+    return {
+      "aria-controls": `quick-access-${quickAccessType}`,
+      "aria-selected": "false",
+      tabindex: "-1",
+    };
+  },
+
+  // TODO: Remove when 2.7 gets released.
+  _structureAsTab(extraGlyph) {
+    const glyph = extraGlyph;
+    // Assume glyph is a button if it has a data-url field.
+    if (!glyph.data || !glyph.data.url) {
+      glyph.title = glyph.label;
+      glyph.data = { url: glyph.href };
+
+      glyph.label = null;
+      glyph.href = null;
+    }
+
+    if (glyph.className) {
+      glyph.className += " menu-link";
+    } else {
+      glyph.className = "menu-link";
+    }
+
+    glyph.role = "tab";
+    glyph.tabAttrs = this._tabAttrs(glyph.actionParam);
+
+    return glyph;
+  },
+
   profileGlyph() {
     return {
-      label: "user.preferences",
-      className: "user-preferences-link",
+      title: Titles["profile"],
+      className: "user-preferences-link menu-link",
+      id: QuickAccess.PROFILE,
       icon: "user",
-      href: `${this.attrs.path}/summary`,
       action: UserMenuAction.QUICK_ACCESS,
       actionParam: QuickAccess.PROFILE,
+      data: { url: `${this.attrs.path}/summary` },
+      role: "tab",
+      tabAttrs: this._tabAttrs(QuickAccess.PROFILE),
     };
   },
 
   notificationsGlyph() {
     return {
-      label: "user.notifications",
-      className: "user-notifications-link",
+      title: Titles["notifications"],
+      className: "user-notifications-link menu-link",
+      id: QuickAccess.NOTIFICATIONS,
       icon: "bell",
-      href: `${this.attrs.path}/notifications`,
       action: UserMenuAction.QUICK_ACCESS,
       actionParam: QuickAccess.NOTIFICATIONS,
+      data: { url: `${this.attrs.path}/notifications` },
+      role: "tab",
+      tabAttrs: this._tabAttrs(QuickAccess.NOTIFICATIONS),
     };
   },
 
   bookmarksGlyph() {
     return {
+      title: Titles["bookmarks"],
       action: UserMenuAction.QUICK_ACCESS,
       actionParam: QuickAccess.BOOKMARKS,
-      label: "user.bookmarks",
-      className: "user-bookmarks-link",
+      className: "user-bookmarks-link menu-link",
+      id: QuickAccess.BOOKMARKS,
       icon: "bookmark",
-      href: `${this.attrs.path}/activity/bookmarks`,
+      data: { url: `${this.attrs.path}/activity/bookmarks` },
+      "aria-label": "user.bookmarks",
+      role: "tab",
+      tabAttrs: this._tabAttrs(QuickAccess.BOOKMARKS),
     };
   },
 
   messagesGlyph() {
     return {
+      title: Titles["messages"],
       action: UserMenuAction.QUICK_ACCESS,
       actionParam: QuickAccess.MESSAGES,
-      label: "user.private_messages",
-      className: "user-pms-link",
+      className: "user-pms-link menu-link",
+      id: QuickAccess.MESSAGES,
       icon: "envelope",
-      href: `${this.attrs.path}/messages`,
+      data: { url: `${this.attrs.path}/messages` },
+      role: "tab",
+      tabAttrs: this._tabAttrs(QuickAccess.MESSAGES),
     };
   },
 
@@ -74,15 +126,17 @@ createWidget("user-menu-links", {
     return this.attach("link", link);
   },
 
-  glyphHtml(glyph) {
+  glyphHtml(glyph, idx) {
     if (this.isActive(glyph)) {
       glyph = this.markAsActive(glyph);
     }
-    return this.attach("link", $.extend(glyph, { hideLabel: true }));
+    glyph.data["tab-number"] = `${idx}`;
+
+    return this.attach("flat-button", glyph);
   },
 
   html() {
-    const glyphs = [];
+    const glyphs = [this.notificationsGlyph()];
 
     if (extraGlyphs) {
       extraGlyphs.forEach((g) => {
@@ -90,12 +144,14 @@ createWidget("user-menu-links", {
           g = g(this);
         }
         if (g) {
-          glyphs.push(g);
+          const structuredGlyph = this._structureAsTab(g);
+          Titles[structuredGlyph.actionParam] =
+            structuredGlyph.title || structuredGlyph.label;
+          glyphs.push(structuredGlyph);
         }
       });
     }
 
-    glyphs.push(this.notificationsGlyph());
     glyphs.push(this.bookmarksGlyph());
 
     if (this.siteSettings.enable_personal_messages || this.currentUser.staff) {
@@ -104,10 +160,11 @@ createWidget("user-menu-links", {
 
     glyphs.push(this.profileGlyph());
 
-    return h("ul.menu-links-row", [
+    return h("div.menu-links-row", [
       h(
-        "li.glyphs",
-        glyphs.map((l) => this.glyphHtml(l))
+        "div.glyphs",
+        { attributes: { "aria-label": "Menu links", role: "tablist" } },
+        glyphs.map((l, index) => this.glyphHtml(l, index))
       ),
     ]);
   },
@@ -117,6 +174,7 @@ createWidget("user-menu-links", {
     // the full page.
     definition.action = null;
     definition.actionParam = null;
+    definition.url = definition.data.url;
 
     if (definition.className) {
       definition.className += " active";
@@ -124,6 +182,9 @@ createWidget("user-menu-links", {
       definition.className = "active";
     }
 
+    definition.tabAttrs["tabindex"] = "0";
+    definition.tabAttrs["aria-selected"] = "true";
+
     return definition;
   },
 
@@ -144,9 +205,29 @@ export default createWidget("user-menu", {
     showLogoutButton: true,
   },
 
+  userMenuNavigation(nav) {
+    const maxTabNumber = document.querySelectorAll(".glyphs button").length - 1;
+    const isLeft = nav.key === "ArrowLeft";
+
+    let nextTab = isLeft ? nav.tabNumber - 1 : nav.tabNumber + 1;
+
+    if (isLeft && nextTab < 0) {
+      nextTab = maxTabNumber;
+    }
+
+    if (!isLeft && nextTab > maxTabNumber) {
+      nextTab = 0;
+    }
+
+    document
+      .querySelector(`.menu-link[role='tab'][data-tab-number='${nextTab}']`)
+      .focus();
+  },
+
   defaultState() {
     return {
       currentQuickAccess: QuickAccess.NOTIFICATIONS,
+      titleKey: Titles["notifications"],
       hasUnread: false,
       markUnread: null,
     };
@@ -154,14 +235,14 @@ export default createWidget("user-menu", {
 
   panelContents() {
     const path = this.currentUser.get("path");
-    const { currentQuickAccess } = this.state;
+    const { currentQuickAccess, titleKey } = this.state;
 
     const result = [
       this.attach("user-menu-links", {
         path,
         currentQuickAccess,
       }),
-      this.quickAccessPanel(path),
+      this.quickAccessPanel(path, titleKey, currentQuickAccess),
     ];
 
     return result;
@@ -214,15 +295,18 @@ export default createWidget("user-menu", {
   quickAccess(type) {
     if (this.state.currentQuickAccess !== type) {
       this.state.currentQuickAccess = type;
+      this.state.titleKey = Titles[type];
     }
   },
 
-  quickAccessPanel(path) {
+  quickAccessPanel(path, titleKey, currentQuickAccess) {
     const { showLogoutButton } = this.settings;
     // This deliberately does NOT fallback to a default quick access panel.
     return this.attach(`quick-access-${this.state.currentQuickAccess}`, {
       path,
       showLogoutButton,
+      titleKey,
+      currentQuickAccess,
     });
   },
 });
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 d5b05fbe8c..cd36811af9 100644
--- a/app/assets/javascripts/discourse/app/widgets/user-notifications-large.js
+++ b/app/assets/javascripts/discourse/app/widgets/user-notifications-large.js
@@ -1,8 +1,10 @@
 import { createWidget } from "discourse/widgets/widget";
-import { h } from "virtual-dom";
 import { dateNode } from "discourse/helpers/node";
+import { h } from "virtual-dom";
 
 createWidget("large-notification-item", {
+  tagName: "li",
+
   buildClasses(attrs) {
     const result = ["item", "notification", "large-notification"];
     if (!attrs.get("read")) {
@@ -21,7 +23,10 @@ createWidget("large-notification-item", {
         `${notificationName.dasherize()}-notification-item`,
         attrs,
         {},
-        { fallbackWidgetName: "default-notification-item" }
+        {
+          fallbackWidgetName: "default-notification-item",
+          tagName: "div",
+        }
       ),
       h("span.time", dateNode(attrs.created_at)),
     ];
@@ -29,6 +34,8 @@ createWidget("large-notification-item", {
 });
 
 export default createWidget("user-notifications-large", {
+  tagName: "ul.notifications.large-notifications",
+
   html(attrs) {
     const notifications = attrs.notifications;
     const username = notifications.findArgs.username;
diff --git a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
index 47b7f875d5..605082d87a 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
@@ -1,8 +1,8 @@
 import I18n from "I18n";
+import { createPopper } from "@popperjs/core";
 import { createWidget } from "discourse/widgets/widget";
 import hbs from "discourse/widgets/hbs-compiler";
 import { schedule } from "@ember/runloop";
-import { createPopper } from "@popperjs/core";
 
 /*
 
diff --git a/app/assets/javascripts/discourse/app/widgets/widget.js b/app/assets/javascripts/discourse/app/widgets/widget.js
index a00ccc8af7..59253a0938 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget.js
@@ -1,28 +1,28 @@
-import I18n from "I18n";
 import {
+  WidgetChangeHook,
   WidgetClickHook,
-  WidgetDoubleClickHook,
   WidgetClickOutsideHook,
-  WidgetKeyUpHook,
-  WidgetKeyDownHook,
-  WidgetMouseDownOutsideHook,
+  WidgetDoubleClickHook,
   WidgetDragHook,
   WidgetInputHook,
-  WidgetChangeHook,
-  WidgetMouseUpHook,
+  WidgetKeyDownHook,
+  WidgetKeyUpHook,
   WidgetMouseDownHook,
+  WidgetMouseDownOutsideHook,
   WidgetMouseMoveHook,
-  WidgetMouseOverHook,
   WidgetMouseOutHook,
-  WidgetTouchStartHook,
+  WidgetMouseOverHook,
+  WidgetMouseUpHook,
   WidgetTouchEndHook,
+  WidgetTouchStartHook,
 } from "discourse/widgets/hooks";
-import { h } from "virtual-dom";
 import DecoratorHelper from "discourse/widgets/decorator-helper";
+import I18n from "I18n";
 import { Promise } from "rsvp";
-import { isProduction } from "discourse-common/config/environment";
-import { get } from "@ember/object";
 import { deepMerge } from "discourse-common/lib/object";
+import { get } from "@ember/object";
+import { h } from "virtual-dom";
+import { isProduction } from "discourse-common/config/environment";
 
 const _registry = {};
 
@@ -265,6 +265,11 @@ export default class Widget {
       const result = new WidgetClass(attrs, this.register, opts);
       result.parentWidget = this;
       result.dirtyKeys = this.dirtyKeys;
+
+      if (otherOpts.tagName) {
+        result.tagName = otherOpts.tagName;
+      }
+
       return result;
     } else {
       throw new Error(
diff --git a/app/assets/javascripts/discourse/config/environment.js b/app/assets/javascripts/discourse/config/environment.js
new file mode 100644
index 0000000000..f9672557d9
--- /dev/null
+++ b/app/assets/javascripts/discourse/config/environment.js
@@ -0,0 +1,52 @@
+"use strict";
+
+module.exports = function (environment) {
+  let ENV = {
+    modulePrefix: "discourse",
+    environment,
+    rootURL: process.env.DISCOURSE_RELATIVE_URL_ROOT || "/",
+    locationType: "auto",
+    historySupportMiddleware: false,
+    EmberENV: {
+      FEATURES: {
+        // Here you can enable experimental features on an ember canary build
+        // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
+      },
+      EXTEND_PROTOTYPES: {
+        // Prevent Ember Data from overriding Date.parse.
+        Date: false,
+      },
+    },
+
+    APP: {
+      // Here you can pass flags/options to your application instance
+      // when it is created
+    },
+  };
+
+  if (environment === "development") {
+    // ENV.APP.LOG_RESOLVER = true;
+    // ENV.APP.LOG_ACTIVE_GENERATION = true;
+    // ENV.APP.LOG_TRANSITIONS = true;
+    // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
+    // ENV.APP.LOG_VIEW_LOOKUPS = true;
+  }
+
+  if (environment === "test") {
+    // Testem prefers this...
+    ENV.locationType = "none";
+
+    // keep test console output quieter
+    ENV.APP.LOG_ACTIVE_GENERATION = false;
+    ENV.APP.LOG_VIEW_LOOKUPS = false;
+
+    ENV.APP.rootElement = "#ember-testing";
+    ENV.APP.autoboot = false;
+  }
+
+  if (environment === "production") {
+    // here you can enable a production-specific feature
+  }
+
+  return ENV;
+};
diff --git a/app/assets/javascripts/discourse/config/optional-features.json b/app/assets/javascripts/discourse/config/optional-features.json
new file mode 100644
index 0000000000..b5f4e8fa7b
--- /dev/null
+++ b/app/assets/javascripts/discourse/config/optional-features.json
@@ -0,0 +1,5 @@
+{
+  "application-template-wrapper": false,
+  "default-async-observers": true,
+  "jquery-integration": true
+}
diff --git a/app/assets/javascripts/discourse/config/targets.js b/app/assets/javascripts/discourse/config/targets.js
new file mode 100644
index 0000000000..09a137eb7a
--- /dev/null
+++ b/app/assets/javascripts/discourse/config/targets.js
@@ -0,0 +1,18 @@
+"use strict";
+
+const browsers = [
+  "last 1 Chrome versions",
+  "last 1 Firefox versions",
+  "last 1 Safari versions",
+];
+
+const isCI = !!process.env.CI;
+const isProduction = process.env.EMBER_ENV === "production";
+
+if (isCI || isProduction) {
+  browsers.push("ie 11");
+}
+
+module.exports = {
+  browsers,
+};
diff --git a/app/assets/javascripts/discourse/ember-cli-build.js b/app/assets/javascripts/discourse/ember-cli-build.js
new file mode 100644
index 0000000000..137b9a29af
--- /dev/null
+++ b/app/assets/javascripts/discourse/ember-cli-build.js
@@ -0,0 +1,59 @@
+"use strict";
+
+const EmberApp = require("ember-cli/lib/broccoli/ember-app");
+const resolve = require("path").resolve;
+const mergeTrees = require("broccoli-merge-trees");
+const concat = require("broccoli-concat");
+const prettyTextEngine = require("./lib/pretty-text-engine");
+const { createI18nTree } = require("./lib/translation-plugin");
+const discourseScss = require("./lib/discourse-scss");
+const funnel = require("broccoli-funnel");
+const AssetRev = require("broccoli-asset-rev");
+
+module.exports = function (defaults) {
+  let discourseRoot = resolve("../../../..");
+  let vendorJs = discourseRoot + "/vendor/assets/javascripts/";
+
+  let app = new EmberApp(defaults, {
+    autoRun: false,
+    "ember-qunit": {
+      insertContentForTestBody: false,
+    },
+  });
+
+  // Ember CLI does this by default for the app tree, but for our extra bundles we
+  // need to do it ourselves in production mode.
+  const isProduction = EmberApp.env().includes("production");
+  function digest(tree) {
+    return isProduction ? new AssetRev(tree) : tree;
+  }
+
+  // WARNING: We should only import scripts here if they are not in NPM.
+  // For example: our very specific version of bootstrap-modal.
+  app.import(vendorJs + "bootbox.js");
+  app.import(vendorJs + "bootstrap-modal.js");
+  app.import(vendorJs + "jquery.ui.widget.js");
+  app.import(vendorJs + "jquery.fileupload.js");
+  app.import(vendorJs + "jquery.autoellipsis-1.0.10.js");
+
+  let adminVendor = funnel(vendorJs, {
+    files: ["resumable.js"],
+  });
+
+  return mergeTrees([
+    discourseScss(`${discourseRoot}/app/assets/stylesheets`, "testem.scss"),
+    createI18nTree(discourseRoot, vendorJs),
+    app.toTree(),
+    funnel(`${discourseRoot}/public/javascripts`, { destDir: "javascripts" }),
+    funnel(`${vendorJs}/highlightjs`, {
+      files: ["highlight-test-bundle.min.js"],
+      destDir: "assets/highlightjs",
+    }),
+    digest(
+      concat(mergeTrees([app.options.adminTree, adminVendor]), {
+        outputFile: `assets/admin.js`,
+      })
+    ),
+    digest(prettyTextEngine(vendorJs, "discourse-markdown")),
+  ]);
+};
diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js
new file mode 100644
index 0000000000..f8dc77a277
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js
@@ -0,0 +1,307 @@
+"use strict";
+
+const bent = require("bent");
+const getJSON = bent("json");
+const { encode } = require("html-entities");
+const cleanBaseURL = require("clean-base-url");
+const path = require("path");
+const fs = require("fs");
+
+// via https://stackoverflow.com/a/6248722/165668
+function generateUID() {
+  let firstPart = (Math.random() * 46656) | 0; // eslint-disable-line no-bitwise
+  let secondPart = (Math.random() * 46656) | 0; // eslint-disable-line no-bitwise
+  firstPart = ("000" + firstPart.toString(36)).slice(-3);
+  secondPart = ("000" + secondPart.toString(36)).slice(-3);
+  return firstPart + secondPart;
+}
+
+const IGNORE_PATHS = [
+  /\/ember-cli-live-reload\.js$/,
+  /\/session\/[^\/]+\/become$/,
+];
+
+function htmlTag(buffer, bootstrap) {
+  let classList = "";
+  if (bootstrap.html_classes) {
+    classList = ` class="${bootstrap.html_classes}"`;
+  }
+  buffer.push(`<html lang="${bootstrap.html_lang}"${classList}>`);
+}
+
+function head(buffer, bootstrap) {
+  if (bootstrap.csrf_token) {
+    buffer.push(`<meta name="csrf-param" content="authenticity_token">`);
+    buffer.push(`<meta name="csrf-token" content="${bootstrap.csrf_token}">`);
+  }
+  if (bootstrap.theme_ids) {
+    buffer.push(
+      `<meta name="discourse_theme_ids" content="${bootstrap.theme_ids}">`
+    );
+  }
+
+  let setupData = "";
+  Object.keys(bootstrap.setup_data).forEach((sd) => {
+    let val = bootstrap.setup_data[sd];
+    if (val) {
+      if (Array.isArray(val)) {
+        val = JSON.stringify(val);
+      } else {
+        val = val.toString();
+      }
+      setupData += ` data-${sd.replace(/\_/g, "-")}="${encode(val)}"`;
+    }
+  });
+  buffer.push(`<meta id="data-discourse-setup"${setupData} />`);
+
+  (bootstrap.stylesheets || []).forEach((s) => {
+    let attrs = [];
+    if (s.media) {
+      attrs.push(`media="${s.media}"`);
+    }
+    if (s.target) {
+      attrs.push(`data-target="${s.target}"`);
+    }
+    if (s.theme_id) {
+      attrs.push(`data-theme-id="${s.theme_id}"`);
+    }
+    let link = `<link rel="stylesheet" type="text/css" href="${
+      s.href
+    }" ${attrs.join(" ")}></script>\n`;
+    buffer.push(link);
+  });
+
+  bootstrap.plugin_js.forEach((src) =>
+    buffer.push(`<script src="${src}"></script>`)
+  );
+
+  buffer.push(bootstrap.theme_html.translations);
+  buffer.push(bootstrap.theme_html.js);
+  buffer.push(bootstrap.theme_html.head_tag);
+  buffer.push(bootstrap.html.before_head_close);
+}
+
+function localeScript(buffer, bootstrap) {
+  buffer.push(`<script src="${bootstrap.locale_script}"></script>`);
+}
+
+function beforeScriptLoad(buffer, bootstrap) {
+  buffer.push(bootstrap.html.before_script_load);
+  localeScript(buffer, bootstrap);
+  (bootstrap.extra_locales || []).forEach((l) =>
+    buffer.push(`<script src="${l}"></script>`)
+  );
+}
+
+function body(buffer, bootstrap) {
+  buffer.push(bootstrap.theme_html.header);
+  buffer.push(bootstrap.html.header);
+}
+
+function bodyFooter(buffer, bootstrap, headers) {
+  buffer.push(bootstrap.theme_html.body_tag);
+  buffer.push(bootstrap.html.before_body_close);
+
+  let v = generateUID();
+  buffer.push(`
+		<script async type="text/javascript" id="mini-profiler" src="/mini-profiler-resources/includes.js?v=${v}" data-css-url="/mini-profiler-resources/includes.css?v=${v}" data-version="${v}" data-path="/mini-profiler-resources/" data-horizontal-position="left" data-vertical-position="top" data-trivial="false" data-children="false" data-max-traces="20" data-controls="false" data-total-sql-count="false" data-authorized="true" data-toggle-shortcut="alt+p" data-start-hidden="false" data-collapse-results="true" data-html-container="body" data-hidden-custom-fields="x" data-ids="${headers["x-miniprofiler-ids"]}"></script>
+	`);
+}
+
+function hiddenLoginForm(buffer, bootstrap) {
+  if (!bootstrap.preloaded.currentUser) {
+    buffer.push(`
+      <form id='hidden-login-form' method="post" action="${bootstrap.login_path}" style="display: none;">
+        <input name="username" type="text"     id="signin_username">
+        <input name="password" type="password" id="signin_password">
+        <input name="redirect" type="hidden">
+        <input type="submit" id="signin-button">
+      </form>
+    `);
+  }
+}
+
+function preloaded(buffer, bootstrap) {
+  buffer.push(
+    `<div class="hidden" id="data-preloaded" data-preloaded="${encode(
+      JSON.stringify(bootstrap.preloaded)
+    )}"></div>`
+  );
+}
+
+const BUILDERS = {
+  "html-tag": htmlTag,
+  "before-script-load": beforeScriptLoad,
+  head: head,
+  body: body,
+  "hidden-login-form": hiddenLoginForm,
+  preloaded: preloaded,
+  "body-footer": bodyFooter,
+  "locale-script": localeScript,
+};
+
+function replaceIn(bootstrap, template, id, headers) {
+  let buffer = [];
+  BUILDERS[id](buffer, bootstrap, headers);
+  let contents = buffer.filter((b) => b && b.length > 0).join("\n");
+
+  return template.replace(`<bootstrap-content key="${id}">`, contents);
+}
+
+function applyBootstrap(bootstrap, template, headers) {
+  Object.keys(BUILDERS).forEach((id) => {
+    template = replaceIn(bootstrap, template, id, headers);
+  });
+  return template;
+}
+
+function buildFromBootstrap(assetPath, proxy, baseURL, req, headers) {
+  // eslint-disable-next-line
+  return new Promise((resolve, reject) => {
+    fs.readFile(
+      path.join(process.cwd(), "dist", assetPath),
+      "utf8",
+      (err, template) => {
+        let url = `${proxy}${baseURL}bootstrap.json`;
+        let queryLoc = req.url.indexOf("?");
+        if (queryLoc !== -1) {
+          url += req.url.substr(queryLoc);
+        }
+
+        getJSON(url, null, req.headers)
+          .then((json) => {
+            resolve(applyBootstrap(json.bootstrap, template, headers));
+          })
+          .catch((e) => {
+            reject(
+              `Could not get ${proxy}${baseURL}bootstrap.json\n\n${e.toString()}`
+            );
+          });
+      }
+    );
+  });
+}
+
+async function handleRequest(assetPath, proxy, baseURL, req, res) {
+  if (assetPath.endsWith("tests/index.html")) {
+    return;
+  }
+
+  if (assetPath.endsWith("index.html")) {
+    try {
+      // Avoid Ember CLI's proxy if doing a GET, since Discourse depends on some non-XHR
+      // GET requests to work.
+      if (req.method === "GET") {
+        let url = `${proxy}${req.path}`;
+
+        let queryLoc = req.url.indexOf("?");
+        if (queryLoc !== -1) {
+          url += req.url.substr(queryLoc);
+        }
+
+        req.headers["X-Discourse-Ember-CLI"] = "true";
+        let get = bent("GET", [200, 301, 302, 303, 307, 308, 404, 403, 500]);
+        let response = await get(url, null, req.headers);
+        res.set(response.headers);
+        if (response.headers["x-discourse-bootstrap-required"] === "true") {
+          req.headers["X-Discourse-Asset-Path"] = req.path;
+          let json = await buildFromBootstrap(
+            assetPath,
+            proxy,
+            baseURL,
+            req,
+            response.headers
+          );
+          return res.send(json);
+        }
+        res.status(response.status);
+        res.send(await response.text());
+      }
+    } catch (e) {
+      res.send(`
+                <html>
+                  <h1>Discourse Build Error</h1>
+                  <pre><code>${e.toString()}</code></pre>
+                </html>
+              `);
+    }
+  }
+}
+
+module.exports = {
+  name: require("./package").name,
+
+  isDevelopingAddon() {
+    return true;
+  },
+
+  serverMiddleware(config) {
+    let proxy = config.options.proxy;
+    let app = config.app;
+    let options = config.options;
+
+    if (!proxy) {
+      // eslint-disable-next-line
+      console.error(`
+Discourse can't be run without a \`--proxy\` setting, because it needs a Rails application
+to serve API requests. For example:
+
+  yarn run ember serve --proxy "http://localhost:3000"\n`);
+      throw "--proxy argument is required";
+    }
+
+    let watcher = options.watcher;
+
+    let baseURL =
+      options.rootURL === ""
+        ? "/"
+        : cleanBaseURL(options.rootURL || options.baseURL);
+
+    app.use(async (req, res, next) => {
+      try {
+        const results = await watcher;
+        if (this.shouldHandleRequest(req, options)) {
+          let assetPath = req.path.slice(baseURL.length);
+          let isFile = false;
+
+          try {
+            isFile = fs
+              .statSync(path.join(results.directory, assetPath))
+              .isFile();
+          } catch (err) {}
+
+          if (!isFile) {
+            assetPath = "index.html";
+          }
+          await handleRequest(assetPath, proxy, baseURL, req, res);
+        }
+      } finally {
+        if (!res.headersSent) {
+          return next();
+        }
+      }
+    });
+  },
+
+  shouldHandleRequest(req) {
+    let acceptHeaders = req.headers.accept || [];
+    let hasHTMLHeader = acceptHeaders.indexOf("text/html") !== -1;
+    if (req.method !== "GET") {
+      return false;
+    }
+    if (!hasHTMLHeader) {
+      return false;
+    }
+
+    if (IGNORE_PATHS.some((ip) => ip.test(req.path))) {
+      return false;
+    }
+
+    if (req.path.endsWith(".json")) {
+      return false;
+    }
+
+    let baseURLRegexp = new RegExp(`^/`);
+    return baseURLRegexp.test(req.path);
+  },
+};
diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/package.json b/app/assets/javascripts/discourse/lib/bootstrap-json/package.json
new file mode 100644
index 0000000000..c79e0bc382
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/bootstrap-json/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "bootstrap-json",
+  "keywords": [
+    "ember-addon"
+  ],
+  "ember-addon": {
+    "before": [
+      "serve-files-middleware",
+      "history-support-middleware",
+      "proxy-server-middleware"
+    ]
+  }
+}
diff --git a/app/assets/javascripts/discourse/lib/discourse-scss.js b/app/assets/javascripts/discourse/lib/discourse-scss.js
new file mode 100644
index 0000000000..fd85183147
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/discourse-scss.js
@@ -0,0 +1,44 @@
+const Plugin = require("broccoli-plugin");
+const sass = require("sass");
+const fs = require("fs");
+const concat = require("broccoli-concat");
+
+let built = false;
+
+class DiscourseScss extends Plugin {
+  constructor(inputNodes, inputFile, options) {
+    super(inputNodes, {
+      ...options,
+      persistentOutput: true,
+    });
+
+    this.inputFile = inputFile;
+  }
+
+  build() {
+    // We could get fancy eventually and do this based on whether the css changes
+    // but this is just used for tests right now.
+    if (built) {
+      return;
+    }
+
+    let file = this.inputPaths[0] + "/" + this.inputFile;
+
+    let result = sass.renderSync({
+      file,
+      includePaths: this.inputPaths,
+    });
+
+    fs.writeFileSync(
+      `${this.outputPath}/` + this.inputFile.replace(".scss", ".css"),
+      result.css
+    );
+    built = true;
+  }
+}
+
+module.exports = function scss(path, file) {
+  return concat(new DiscourseScss([path], file), {
+    outputFile: `assets/${file.replace(".scss", ".css")}`,
+  });
+};
diff --git a/app/assets/javascripts/discourse/lib/pretty-text-engine.js b/app/assets/javascripts/discourse/lib/pretty-text-engine.js
new file mode 100644
index 0000000000..f52ca30b2b
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/pretty-text-engine.js
@@ -0,0 +1,21 @@
+const babel = require("broccoli-babel-transpiler");
+const mergeTrees = require("broccoli-merge-trees");
+const funnel = require("broccoli-funnel");
+const path = require("path");
+const concat = require("broccoli-concat");
+
+module.exports = function prettyTextEngine(vendorJs, engine) {
+  let engineTree = babel(`../pretty-text/engines/${engine}`, {
+    plugins: ["@babel/plugin-transform-modules-amd"],
+    moduleIds: true,
+
+    getModuleId(name) {
+      return `pretty-text/engines/${engine}/${path.basename(name)}`;
+    },
+  });
+
+  let markdownIt = funnel(vendorJs, { files: ["markdown-it.js"] });
+  return concat(mergeTrees([engineTree, markdownIt]), {
+    outputFile: `assets/${engine}.js`,
+  });
+};
diff --git a/app/assets/javascripts/discourse/lib/translation-plugin.js b/app/assets/javascripts/discourse/lib/translation-plugin.js
new file mode 100644
index 0000000000..5b9d06693e
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/translation-plugin.js
@@ -0,0 +1,93 @@
+const Plugin = require("broccoli-plugin");
+const Yaml = require("js-yaml");
+const fs = require("fs");
+const concat = require("broccoli-concat");
+const mergeTrees = require("broccoli-merge-trees");
+
+let built = false;
+
+class TranslationPlugin extends Plugin {
+  constructor(inputNodes, inputFile, options) {
+    super(inputNodes, {
+      ...options,
+      persistentOutput: true,
+    });
+
+    this.inputFile = inputFile;
+  }
+
+  build() {
+    // We could get fancy eventually and do this based on whether the yaml
+    // or vendor files change but in practice we should't need exact up to date
+    // translations in admin.
+    if (built) {
+      return;
+    }
+
+    let file = this.inputPaths[0] + "/" + this.inputFile;
+
+    let yaml = fs.readFileSync(file, { encoding: "UTF-8" });
+    let parsed = Yaml.load(yaml);
+
+    let extras = {
+      en: {
+        admin: parsed.en.admin_js.admin,
+      },
+    };
+
+    delete parsed.en.admin_js;
+    delete parsed.en.wizard_js;
+
+    let contents = `
+      I18n.locale = 'en';
+      I18n.translations = ${JSON.stringify(parsed)};
+      I18n.extras = ${JSON.stringify(extras)};
+      I18n._compiledMFs = {};
+    `;
+
+    fs.writeFileSync(
+      `${this.outputPath}/` + this.inputFile.replace(".yml", ".js"),
+      contents
+    );
+    built = true;
+  }
+}
+
+module.exports = function translatePlugin(...params) {
+  return new TranslationPlugin(...params);
+};
+
+module.exports.createI18nTree = function (discourseRoot, vendorJs) {
+  let en = new TranslationPlugin(
+    [discourseRoot + "/config/locales"],
+    "client.en.yml"
+  );
+
+  return concat(
+    mergeTrees([
+      vendorJs,
+      discourseRoot + "/app/assets/javascripts/locales",
+      discourseRoot + "/lib/javascripts",
+      en,
+    ]),
+    {
+      inputFiles: [
+        "i18n.js",
+        "moment.js",
+        "moment-timezone-with-data.js",
+        "messageformat-lookup.js",
+        "client.en.js",
+      ],
+      headerFiles: [
+        "i18n.js",
+        "moment.js",
+        "moment-timezone-with-data.js",
+        "messageformat-lookup.js",
+      ],
+      footerFiles: ["client.en.js"],
+      outputFile: `assets/test-i18n.js`,
+    }
+  );
+};
+
+module.exports.TranslationPlugin = TranslationPlugin;
diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
new file mode 100644
index 0000000000..b35b0edb3c
--- /dev/null
+++ b/app/assets/javascripts/discourse/package.json
@@ -0,0 +1,70 @@
+{
+  "name": "discourse",
+  "version": "0.0.0",
+  "private": true,
+  "description": "Small description for discourse-frontend goes here",
+  "repository": "",
+  "license": "MIT",
+  "author": "",
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
+  "scripts": {
+    "build": "ember build",
+    "start": "ember serve",
+    "test": "ember test"
+  },
+  "devDependencies": {
+    "@ember/optional-features": "^1.1.0",
+    "@ember/test-helpers": "^2.2.0",
+    "@glimmer/component": "^1.0.0",
+    "@popperjs/core": "^2.4.4",
+    "admin": "^1.0.0",
+    "bent": "^7.3.12",
+    "broccoli-asset-rev": "^3.0.0",
+    "discourse-common": "^1.0.0",
+    "discourse-hbr": "^1.0.0",
+    "discourse-widget-hbs": "^1.0.0",
+    "ember-auto-import": "^1.10.1",
+    "ember-buffered-proxy": "^2.0.0-beta.0",
+    "ember-cli": "~3.25.3",
+    "ember-cli-app-version": "^4.0.0",
+    "ember-cli-babel": "^7.23.1",
+    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-htmlbars": "^4.2.0",
+    "ember-cli-inject-live-reload": "^2.0.1",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-terser": "^4.0.1",
+    "ember-export-application-global": "^2.0.1",
+    "ember-load-initializers": "^2.1.1",
+    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^5.1.2",
+    "ember-source": "~3.15.0",
+    "html-entities": "^2.1.0",
+    "js-yaml": "^4.0.0",
+    "loader.js": "^4.7.0",
+    "message-bus-client": "^3.3.0",
+    "mousetrap": "^1.6.5",
+    "mousetrap-global-bind": "^1.1.0",
+    "pretender": "^3.4.3",
+    "pretty-text": "^1.0.0",
+    "qunit": "^2.14.0",
+    "qunit-dom": "^1.6.0",
+    "sass": "^1.32.8",
+    "select-kit": "^1.0.0",
+    "sinon": "^9.2.0",
+    "virtual-dom": "^2.1.1"
+  },
+  "engines": {
+    "node": "8.* || >= 10.*"
+  },
+  "ember": {
+    "edition": "default"
+  },
+  "ember-addon": {
+    "paths": [
+      "lib/bootstrap-json"
+    ]
+  }
+}
diff --git a/app/assets/javascripts/discourse/public/assets/scripts/discourse-boot.js b/app/assets/javascripts/discourse/public/assets/scripts/discourse-boot.js
new file mode 100644
index 0000000000..a4811cab76
--- /dev/null
+++ b/app/assets/javascripts/discourse/public/assets/scripts/discourse-boot.js
@@ -0,0 +1,182 @@
+(function () {
+  // TODO: These are needed to load plugins because @ember has its own loader.
+  // We should find a nicer way to do this.
+  const EMBER_MODULES = {
+    "@ember/application": {
+      default: Ember.Application,
+      setOwner: Ember.setOwner,
+      getOwner: Ember.getOwner,
+    },
+    "@ember/array": {
+      default: Ember.Array,
+      A: Ember.A,
+      isArray: Ember.isArray,
+    },
+    "@ember/array/proxy": {
+      default: Ember.ArrayProxy,
+    },
+    "@ember/component": {
+      default: Ember.Component,
+    },
+    "@ember/component/helper": {
+      default: Ember.Helper,
+    },
+    "@ember/component/text-field": {
+      default: Ember.TextField,
+    },
+    "@ember/component/text-area": {
+      default: Ember.TextArea,
+    },
+    "@ember/controller": {
+      default: Ember.Controller,
+      inject: Ember.inject.controller,
+    },
+    "@ember/debug": {
+      warn: Ember.warn,
+    },
+    "@ember/error": {
+      default: Ember.error,
+    },
+    "@ember/object": {
+      action: Ember._action,
+      default: Ember.Object,
+      get: Ember.get,
+      getProperties: Ember.getProperties,
+      set: Ember.set,
+      setProperties: Ember.setProperties,
+      computed: Ember.computed,
+      defineProperty: Ember.defineProperty,
+    },
+    "@ember/object/computed": {
+      alias: Ember.computed.alias,
+      and: Ember.computed.and,
+      bool: Ember.computed.bool,
+      collect: Ember.computed.collect,
+      deprecatingAlias: Ember.computed.deprecatingAlias,
+      empty: Ember.computed.empty,
+      equal: Ember.computed.equal,
+      filter: Ember.computed.filter,
+      filterBy: Ember.computed.filterBy,
+      gt: Ember.computed.gt,
+      gte: Ember.computed.gte,
+      intersect: Ember.computed.intersect,
+      lt: Ember.computed.lt,
+      lte: Ember.computed.lte,
+      map: Ember.computed.map,
+      mapBy: Ember.computed.mapBy,
+      match: Ember.computed.match,
+      max: Ember.computed.max,
+      min: Ember.computed.min,
+      none: Ember.computed.none,
+      not: Ember.computed.not,
+      notEmpty: Ember.computed.notEmpty,
+      oneWay: Ember.computed.oneWay,
+      or: Ember.computed.or,
+      readOnly: Ember.computed.readOnly,
+      reads: Ember.computed.reads,
+      setDiff: Ember.computed.setDiff,
+      sort: Ember.computed.sort,
+      sum: Ember.computed.sum,
+      union: Ember.computed.union,
+      uniq: Ember.computed.uniq,
+      uniqBy: Ember.computed.uniqBy,
+    },
+    "@ember/object/internals": {
+      guidFor: Ember.guidFor,
+    },
+    "@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,
+    },
+    "@ember/routing/route": { default: Ember.Route },
+    "@ember/routing/router": { default: Ember.Router },
+    "@ember/runloop": {
+      bind: Ember.run.bind,
+      cancel: Ember.run.cancel,
+      debounce: Ember.testing ? Ember.run : Ember.run.debounce,
+      later: Ember.run.later,
+      next: Ember.run.next,
+      once: Ember.run.once,
+      run: Ember.run,
+      schedule: Ember.run.schedule,
+      scheduleOnce: Ember.run.scheduleOnce,
+      throttle: Ember.run.throttle,
+    },
+    "@ember/service": {
+      default: Ember.Service,
+      inject: Ember.inject.service,
+    },
+    "@ember/string": {
+      w: Ember.String.w,
+      dasherize: Ember.String.dasherize,
+      decamelize: Ember.String.decamelize,
+      camelize: Ember.String.camelize,
+      classify: Ember.String.classify,
+      underscore: Ember.String.underscore,
+      capitalize: Ember.String.capitalize,
+    },
+    "@ember/template": {
+      htmlSafe: Ember.String.htmlSafe,
+    },
+    "@ember/utils": {
+      isBlank: Ember.isBlank,
+      isEmpty: Ember.isEmpty,
+      isNone: Ember.isNone,
+      isPresent: Ember.isPresent,
+    },
+    jquery: { default: $ },
+    rsvp: {
+      asap: Ember.RSVP.asap,
+      all: Ember.RSVP.all,
+      allSettled: Ember.RSVP.allSettled,
+      race: Ember.RSVP.race,
+      hash: Ember.RSVP.hash,
+      hashSettled: Ember.RSVP.hashSettled,
+      rethrow: Ember.RSVP.rethrow,
+      defer: Ember.RSVP.defer,
+      denodeify: Ember.RSVP.denodeify,
+      resolve: Ember.RSVP.resolve,
+      reject: Ember.RSVP.reject,
+      map: Ember.RSVP.map,
+      filter: Ember.RSVP.filter,
+      default: Ember.RSVP,
+      Promise: Ember.RSVP.Promise,
+      EventTarget: Ember.RSVP.EventTarget,
+    },
+  };
+  Object.keys(EMBER_MODULES).forEach((mod) => {
+    define(mod, () => EMBER_MODULES[mod]);
+  });
+
+  // TODO: Remove this and have resolver find the templates
+  const prefix = "discourse/templates/";
+  const adminPrefix = "admin/templates/";
+  let len = prefix.length;
+  Object.keys(requirejs.entries).forEach(function (key) {
+    if (key.indexOf(prefix) === 0) {
+      Ember.TEMPLATES[key.substr(len)] = require(key).default;
+    } else if (key.indexOf(adminPrefix) === 0) {
+      Ember.TEMPLATES[key] = require(key).default;
+    }
+  });
+
+  define("I18n", ["exports"], function (exports) {
+    return I18n;
+  });
+  window.__widget_helpers = require("discourse-widget-hbs/helpers").default;
+
+  // TODO: Eliminate this global
+  window.virtualDom = require("virtual-dom");
+
+  let element = document.querySelector(
+    `meta[name="discourse/config/environment"]`
+  );
+  const config = JSON.parse(
+    decodeURIComponent(element.getAttribute("content"))
+  );
+  const event = new CustomEvent("discourse-booted", { detail: config });
+  document.dispatchEvent(event);
+})();
diff --git a/app/assets/javascripts/discourse/public/assets/scripts/start-app.js b/app/assets/javascripts/discourse/public/assets/scripts/start-app.js
new file mode 100644
index 0000000000..0ef18aff86
--- /dev/null
+++ b/app/assets/javascripts/discourse/public/assets/scripts/start-app.js
@@ -0,0 +1,5 @@
+document.addEventListener("discourse-booted", (e) => {
+  const config = e.detail;
+  const app = require(`${config.modulePrefix}/app`)["default"].create(config);
+  app.start();
+});
diff --git a/app/assets/javascripts/discourse/testem.js b/app/assets/javascripts/discourse/testem.js
new file mode 100644
index 0000000000..b6be26b359
--- /dev/null
+++ b/app/assets/javascripts/discourse/testem.js
@@ -0,0 +1,18 @@
+module.exports = {
+  test_page: "tests/index.html?hidepassed",
+  disable_watching: true,
+  launch_in_ci: ["Chrome"],
+  launch_in_dev: ["Chrome"],
+  browser_args: {
+    Chrome: [
+      // --no-sandbox is needed when running Chrome inside a container
+      process.env.CI || process.env.EMBER_CLI ? "--no-sandbox" : null,
+      "--headless",
+      "--disable-dev-shm-usage",
+      "--disable-software-rasterizer",
+      "--mute-audio",
+      "--remote-debugging-port=4201",
+      "--window-size=1440,900",
+    ].filter(Boolean),
+  },
+};
diff --git a/app/assets/javascripts/discourse/tests/acceptance/about-test.js b/app/assets/javascripts/discourse/tests/acceptance/about-test.js
index 92a8f3e333..b51cd5a572 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/about-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/about-test.js
@@ -1,6 +1,6 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("About", function () {
   test("viewing", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/account-created-test.js b/app/assets/javascripts/discourse/tests/acceptance/account-created-test.js
index 2d8433a0e0..fab4de4e04 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/account-created-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/account-created-test.js
@@ -1,11 +1,11 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit, click, fillIn, currentRouteName } from "@ember/test-helpers";
-import { test } from "qunit";
+import { click, currentRouteName, fillIn, visit } from "@ember/test-helpers";
 import PreloadStore from "discourse/lib/preload-store";
+import { test } from "qunit";
 
 acceptance("Account Created", function () {
   test("account created - message", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-badges-show-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-badges-show-test.js
new file mode 100644
index 0000000000..3da3a7a480
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-badges-show-test.js
@@ -0,0 +1,101 @@
+import {
+  acceptance,
+  exists,
+  query,
+} from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+
+acceptance("Admin - Badges - Show", function (needs) {
+  needs.user();
+  test("new badge page", async function (assert) {
+    await visit("/admin/badges/new");
+    assert.ok(
+      !query("input#badge-icon").checked,
+      "radio button for selecting an icon is off initially"
+    );
+    assert.ok(
+      !query("input#badge-image").checked,
+      "radio button for uploading an image is off initially"
+    );
+    assert.ok(!exists(".icon-picker"), "icon picker is not visible");
+    assert.ok(!exists(".image-uploader"), "image uploader is not visible");
+
+    await click("input#badge-icon");
+    assert.ok(
+      exists(".icon-picker"),
+      "icon picker is visible after clicking the select icon radio button"
+    );
+    assert.ok(!exists(".image-uploader"), "image uploader remains hidden");
+
+    await click("input#badge-image");
+    assert.ok(
+      !exists(".icon-picker"),
+      "icon picker is hidden after clicking the upload image radio button"
+    );
+    assert.ok(
+      exists(".image-uploader"),
+      "image uploader becomes visible after clicking the upload image radio button"
+    );
+  });
+
+  test("existing badge that has an icon", async function (assert) {
+    await visit("/admin/badges/1");
+    assert.ok(
+      query("input#badge-icon").checked,
+      "radio button for selecting an icon is on"
+    );
+    assert.ok(
+      !query("input#badge-image").checked,
+      "radio button for uploading an image is off"
+    );
+    assert.ok(exists(".icon-picker"), "icon picker is visible");
+    assert.ok(!exists(".image-uploader"), "image uploader is not visible");
+    assert.equal(query(".icon-picker").textContent.trim(), "fa-rocket");
+  });
+
+  test("existing badge that has an image URL", async function (assert) {
+    await visit("/admin/badges/2");
+    assert.ok(
+      !query("input#badge-icon").checked,
+      "radio button for selecting an icon is off"
+    );
+    assert.ok(
+      query("input#badge-image").checked,
+      "radio button for uploading an image is on"
+    );
+    assert.ok(!exists(".icon-picker"), "icon picker is not visible");
+    assert.ok(exists(".image-uploader"), "image uploader is visible");
+    assert.ok(
+      query(".image-uploader a.lightbox").href.endsWith(
+        "/assets/some-image.png"
+      ),
+      "image uploader shows the right image"
+    );
+  });
+
+  test("existing badge that has both an icon and image URL", async function (assert) {
+    await visit("/admin/badges/3");
+    assert.ok(
+      !query("input#badge-icon").checked,
+      "radio button for selecting an icon is off because image overrides icon"
+    );
+    assert.ok(
+      query("input#badge-image").checked,
+      "radio button for uploading an image is on because image overrides icon"
+    );
+    assert.ok(!exists(".icon-picker"), "icon picker is not visible");
+    assert.ok(exists(".image-uploader"), "image uploader is visible");
+    assert.ok(
+      query(".image-uploader a.lightbox").href.endsWith(
+        "/assets/some-image.png"
+      ),
+      "image uploader shows the right image"
+    );
+
+    await click("input#badge-icon");
+    assert.ok(exists(".icon-picker"), "icon picker is becomes visible");
+    assert.ok(!exists(".image-uploader"), "image uploader bcomes hidden");
+    assert.equal(query(".icon-picker").textContent.trim(), "fa-rocket");
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-emails-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-emails-test.js
index 326895c9a5..0b2342b9dc 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-emails-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-emails-test.js
@@ -1,5 +1,5 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { fillIn, click, visit } from "@ember/test-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
 const EMAIL = `
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-install-theme-modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-install-theme-modal-test.js
new file mode 100644
index 0000000000..8c85c6e625
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-install-theme-modal-test.js
@@ -0,0 +1,118 @@
+import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
+import { click, fillIn, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+import I18n from "I18n";
+
+acceptance("Admin - Themes - Install modal", function (needs) {
+  needs.user();
+  test("closing the modal resets the modal inputs", async function (assert) {
+    const urlInput = ".install-theme-content .repo input";
+    const branchInput = ".install-theme-content .branch input";
+    const privateRepoCheckbox = ".install-theme-content .check-private input";
+    const publicKey = ".install-theme-content .public-key textarea";
+
+    const themeUrl = "git@github.com:discourse/discourse.git";
+    await visit("/admin/customize/themes");
+
+    await click(".create-actions .btn-primary");
+    await click("#remote");
+    await fillIn(urlInput, themeUrl);
+    await click(".install-theme-content .inputs .advanced-repo");
+    await fillIn(branchInput, "tests-passed");
+    await click(privateRepoCheckbox);
+    assert.equal(query(urlInput).value, themeUrl, "url input is filled");
+    assert.equal(
+      query(branchInput).value,
+      "tests-passed",
+      "branch input is filled"
+    );
+    assert.ok(
+      query(privateRepoCheckbox).checked,
+      "private repo checkbox is checked"
+    );
+    assert.ok(query(publicKey), "shows public key");
+
+    await click(".modal-footer .d-modal-cancel");
+
+    await click(".create-actions .btn-primary");
+    await click("#remote");
+    assert.equal(query(urlInput).value, "", "url input is reset");
+    assert.equal(query(branchInput).value, "", "branch input is reset");
+    assert.ok(
+      !query(privateRepoCheckbox).checked,
+      "private repo checkbox unchecked"
+    );
+    assert.notOk(query(publicKey), "hide public key");
+  });
+
+  test("show public key for valid ssh theme urls", async function (assert) {
+    const urlInput = ".install-theme-content .repo input";
+    const privateRepoCheckbox = ".install-theme-content .check-private input";
+    const publicKey = ".install-theme-content .public-key textarea";
+
+    // Supports backlog repo ssh url format
+    const themeUrl =
+      "discourse@discourse.git.backlog.com:/TEST_THEME/test-theme.git";
+    await visit("/admin/customize/themes");
+
+    await click(".create-actions .btn-primary");
+    await click("#remote");
+    await fillIn(urlInput, themeUrl);
+    await click(".install-theme-content .inputs .advanced-repo");
+    await click(privateRepoCheckbox);
+    assert.equal(query(urlInput).value, themeUrl, "url input is filled");
+    assert.ok(
+      query(privateRepoCheckbox).checked,
+      "private repo checkbox is checked"
+    );
+    assert.ok(query(publicKey), "shows public key");
+
+    // Supports AWS CodeCommit style repo URLs
+    await fillIn(
+      urlInput,
+      "ssh://someID@git-codecommit.us-west-2.amazonaws.com/v1/repos/test-repo.git"
+    );
+    assert.ok(query(publicKey), "shows public key");
+
+    await fillIn(urlInput, "https://github.com/discourse/discourse.git");
+    assert.notOk(query(publicKey), "does not show public key for https urls");
+
+    await fillIn(urlInput, "git@github.com:discourse/discourse.git");
+    assert.ok(query(publicKey), "shows public key for valid github repo url");
+  });
+
+  test("modal can be auto-opened with the right query params", async function (assert) {
+    await visit("/admin/customize/themes?repoUrl=testUrl&repoName=testName");
+    assert.ok(query(".admin-install-theme-modal"), "modal is visible");
+    assert.equal(
+      query(".install-theme code").textContent.trim(),
+      "testUrl",
+      "repo url is visible"
+    );
+  });
+
+  test("installed themes are matched with the popular list by URL", async function (assert) {
+    await visit("/admin/customize/themes");
+    await click(".create-actions .btn-primary");
+
+    assert.notOk(
+      query(
+        '.popular-theme-item[data-name="Graceful"] .popular-theme-buttons button'
+      ),
+      "no install button is shown for installed themes"
+    );
+    assert.equal(
+      query(
+        '.popular-theme-item[data-name="Graceful"] .popular-theme-buttons'
+      ).textContent.trim(),
+      I18n.t("admin.customize.theme.installed")
+    );
+
+    assert.ok(
+      query(
+        '.popular-theme-item[data-name="Minima"] .popular-theme-buttons button'
+      ),
+      "install button is shown for not installed themes"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-search-log-term-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-search-log-term-test.js
index 8baa169fe1..b4a9df1cde 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-search-log-term-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-search-log-term-test.js
@@ -1,6 +1,6 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Admin - Search Log Term", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-search-logs-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-search-logs-test.js
index 42e64263e0..9b19b29b6b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-search-logs-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-search-logs-test.js
@@ -1,4 +1,4 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js
index cdba86ee70..af086ac6d9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js
@@ -1,18 +1,18 @@
-import {
-  fillIn,
-  click,
-  triggerKeyEvent,
-  visit,
-  currentURL,
-} from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
   count,
-  queryAll,
   exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
+import {
+  click,
+  currentURL,
+  fillIn,
+  triggerKeyEvent,
+  visit,
+} from "@ember/test-helpers";
 import siteSettingFixture from "discourse/tests/fixtures/site-settings";
+import { test } from "qunit";
 
 acceptance("Admin - Site Settings", function (needs) {
   let updatedTitle;
@@ -56,7 +56,7 @@ acceptance("Admin - Site Settings", function (needs) {
 
     assert.equal(
       queryAll(".row.setting .setting-label h3 a").attr("href"),
-      "/admin/logs/staff_action_logs?filters=%7B%22subject%22%3A%22title%22%2C%22action_name%22%3A%22change_site_setting%22%7D",
+      "/admin/logs/staff_action_logs?filters=%7B%22subject%22%3A%22title%22%2C%22action_name%22%3A%22change_site_setting%22%7D&force_refresh=true",
       "it links to the staff action log"
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js
index 25ab4ae46b..5cfcb3b7ec 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js
@@ -1,13 +1,17 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { fillIn, click, visit, currentURL } from "@ember/test-helpers";
+import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
 acceptance("Admin - Site Texts", function (needs) {
   needs.user();
+  needs.settings({
+    available_locales: JSON.stringify([{ name: "English", value: "en" }]),
+    default_locale: "en",
+  });
 
   test("search for a key", async function (assert) {
     await visit("/admin/customize/site_texts");
@@ -31,7 +35,7 @@ acceptance("Admin - Site Texts", function (needs) {
   });
 
   test("edit and revert a site text by key", async function (assert) {
-    await visit("/admin/customize/site_texts/site.test");
+    await visit("/admin/customize/site_texts/site.test?locale=en");
 
     assert.equal(queryAll(".title h3").text(), "site.test");
     assert.ok(!exists(".saved"));
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js
index b615a126b3..05a8a86dee 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js
@@ -1,11 +1,11 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit, click, fillIn } from "@ember/test-helpers";
-import { test } from "qunit";
+import { click, fillIn, visit } from "@ember/test-helpers";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("Admin - Suspend User", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-user-badges-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-user-badges-test.js
index 72edb00493..fa36848fe2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-user-badges-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-user-badges-test.js
@@ -1,6 +1,6 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Admin - Users Badges", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-user-emails-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-user-emails-test.js
index 273f7031ce..400d03e5c8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-user-emails-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-user-emails-test.js
@@ -1,7 +1,7 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import I18n from "I18n";
+import { test } from "qunit";
 
 function assertNoSecondary(assert) {
   assert.equal(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js
index e7096a6da1..731c77c216 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js
@@ -1,7 +1,7 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("Admin - User Index", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js
index 6d71d40227..86d4bbee41 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js
@@ -1,11 +1,11 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import I18n from "I18n";
+import { test } from "qunit";
 
 acceptance("Admin - Users List", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js
index 3a2d4cc462..1a3162e242 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js
@@ -1,18 +1,22 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { fillIn, click, visit } from "@ember/test-helpers";
+import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
 acceptance("Admin - Watched Words", function (needs) {
   needs.user();
 
   test("list words in groups", async function (assert) {
-    await visit("/admin/logs/watched_words/action/block");
+    await visit("/admin/customize/watched_words/action/block");
+
+    assert.ok(
+      !exists(".watched-words-list"),
+      "Don't show bad words by default."
+    );
 
-    assert.ok(exists(".watched-words-list"));
     assert.ok(
       !exists(".watched-words-list .watched-word"),
       "Don't show bad words by default."
@@ -47,7 +51,7 @@ acceptance("Admin - Watched Words", function (needs) {
   });
 
   test("add words", async function (assert) {
-    await visit("/admin/logs/watched_words/action/block");
+    await visit("/admin/customize/watched_words/action/block");
 
     click(".show-words-checkbox");
     fillIn(".watched-word-form input", "poutine");
@@ -64,7 +68,7 @@ acceptance("Admin - Watched Words", function (needs) {
   });
 
   test("remove words", async function (assert) {
-    await visit("/admin/logs/watched_words/action/block");
+    await visit("/admin/customize/watched_words/action/block");
     await click(".show-words-checkbox");
 
     let word = null;
diff --git a/app/assets/javascripts/discourse/tests/acceptance/auth-complete-test.js b/app/assets/javascripts/discourse/tests/acceptance/auth-complete-test.js
index c480166ba5..c2a71a4adf 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/auth-complete-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/auth-complete-test.js
@@ -1,5 +1,5 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit, currentRouteName } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import { currentRouteName, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
 acceptance("Auth Complete", function (needs) {
@@ -29,7 +29,7 @@ acceptance("Auth Complete", function (needs) {
     );
 
     assert.ok(
-      exists("#discourse-modal div.create-account"),
+      exists("#discourse-modal div.create-account-body"),
       "it shows the registration modal"
     );
   });
@@ -41,7 +41,7 @@ acceptance("Auth Complete", function (needs) {
     assert.equal(currentRouteName(), "login", "it redirects to the login page");
 
     assert.ok(
-      exists("#discourse-modal div.create-account"),
+      exists("#discourse-modal div.create-account-body"),
       "it shows the registration modal"
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/badges-test.js b/app/assets/javascripts/discourse/tests/acceptance/badges-test.js
index 6292d3e0c6..6eaaf10431 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/badges-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/badges-test.js
@@ -1,7 +1,7 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Badges", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js b/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js
index 36af34e88f..daf77fffde 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js
@@ -1,19 +1,20 @@
-import { click, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import I18n from "I18n";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import {
   acceptance,
+  exists,
   loggedInUser,
   queryAll,
-  exists,
 } from "discourse/tests/helpers/qunit-helpers";
+import { click, fillIn, visit } from "@ember/test-helpers";
+import I18n from "I18n";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
+import topicFixtures from "discourse/tests/fixtures/topic";
 
-async function openBookmarkModal() {
-  if (exists(".topic-post:first-child button.show-more-actions")) {
-    await click(".topic-post:first-child button.show-more-actions");
+async function openBookmarkModal(postNumber = 1) {
+  if (exists(`#post_${postNumber} button.show-more-actions`)) {
+    await click(`#post_${postNumber} button.show-more-actions`);
   }
-  await click(".topic-post:first-child button.bookmark");
+  await click(`#post_${postNumber} button.bookmark`);
 }
 
 async function openEditBookmarkModal() {
@@ -24,7 +25,28 @@ acceptance("Bookmarking", function (needs) {
   needs.user();
   let steps = [];
 
-  needs.hooks.beforeEach(() => (steps = []));
+  needs.hooks.beforeEach(function () {
+    steps = [];
+  });
+
+  const topicResponse = topicFixtures["/t/280/1.json"];
+  topicResponse.post_stream.posts[0].cooked += `<span data-date="2036-01-15" data-time="00:35:00" class="discourse-local-date cooked-date past" data-timezone="Europe/London">
+  <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">January 15, 2036 12:35 AM</span>
+  </span>
+</span>`;
+
+  topicResponse.post_stream.posts[1].cooked += `<span data-date="2021-01-15" data-time="00:35:00" class="discourse-local-date cooked-date past" data-timezone="Europe/London">
+  <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">Today 10:30 AM</span>
+  </span>
+</span>`;
 
   needs.pretender((server, helper) => {
     function handleRequest(request) {
@@ -37,6 +59,7 @@ acceptance("Bookmarking", function (needs) {
     server.delete("/bookmarks/999", () =>
       helper.response({ success: "OK", topic_bookmarked: false })
     );
+    server.get("/t/280.json", () => helper.response(topicResponse));
   });
 
   test("Bookmarks modal opening", async function (assert) {
@@ -194,15 +217,53 @@ acceptance("Bookmarking", function (needs) {
       "it should prefill the bookmark name"
     );
     assert.equal(
-      queryAll("#bookmark-custom-date > input").val(),
+      queryAll("#custom-date > input").val(),
       tomorrow,
       "it should prefill the bookmark date"
     );
     assert.equal(
-      queryAll("#bookmark-custom-time").val(),
+      queryAll("#custom-time").val(),
       "08:00",
       "it should prefill the bookmark time"
     );
     assert.deepEqual(steps, ["tomorrow"]);
   });
+
+  test("Using a post date for the reminder date", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    let postDate = moment.tz(
+      "2036-01-15",
+      loggedInUser().resolvedTimezone(loggedInUser())
+    );
+    let postDateFormatted = postDate.format("YYYY-MM-DD");
+    await openBookmarkModal();
+    await fillIn("input#bookmark-name", "Test name");
+    await click("#tap_tile_post_local_date");
+
+    await openEditBookmarkModal();
+    assert.equal(
+      queryAll("#bookmark-name").val(),
+      "Test name",
+      "it should prefill the bookmark name"
+    );
+    assert.equal(
+      queryAll("#custom-date > input").val(),
+      postDateFormatted,
+      "it should prefill the bookmark date"
+    );
+    assert.equal(
+      queryAll("#custom-time").val(),
+      "10:35",
+      "it should prefill the bookmark time"
+    );
+  });
+
+  test("Cannot use the post date for a reminder when the post date is in the past", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await openBookmarkModal(2);
+    assert.notOk(
+      exists("#tap_tile_post_local_date"),
+      "it does not show the local date tile"
+    );
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-banner-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-banner-test.js
index 1c9846c8a9..ad04cefe06 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-banner-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-banner-test.js
@@ -1,11 +1,11 @@
 import {
-  queryAll,
   acceptance,
+  queryAll,
   visible,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import DiscoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";
+import { test } from "qunit";
 
 acceptance("Category Banners", function (needs) {
   needs.user();
@@ -27,7 +27,7 @@ acceptance("Category Banners", function (needs) {
         id: 5,
         name: "test read only without banner",
         slug: "test-read-only-without-banner",
-        permission: null,
+        permission: 1,
       },
       {
         id: 6,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-chooser-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-chooser-test.js
index bd7ef8217d..81d2b9abdf 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-chooser-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-chooser-test.js
@@ -1,7 +1,7 @@
 import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("CategoryChooser", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js
index c8a6e043ce..020aa1fde3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js
@@ -1,8 +1,8 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import I18n from "I18n";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("Category Edit - security", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
index 7f7ff5fd2f..d498531b47 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
@@ -1,13 +1,13 @@
 import {
-  queryAll,
   acceptance,
+  queryAll,
   visible,
 } from "discourse/tests/helpers/qunit-helpers";
-import { click, fillIn, visit, currentURL } from "@ember/test-helpers";
-import { test } from "qunit";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
 import DiscourseURL from "discourse/lib/url";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 import sinon from "sinon";
+import { test } from "qunit";
 
 acceptance("Category Edit", function (needs) {
   needs.user();
@@ -27,7 +27,7 @@ acceptance("Category Edit", function (needs) {
     await fillIn("input.category-name", "testing");
     assert.equal(queryAll(".badge-category").text(), "testing");
 
-    await fillIn("#edit-text-color", "#ff0000");
+    await fillIn(".edit-text-color input", "ff0000");
 
     await click(".edit-category-topic-template");
     await fillIn(".d-editor-input", "this is the new topic template");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-new-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-new-test.js
index c5496f56cb..e13661ce1b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-new-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-new-test.js
@@ -1,9 +1,9 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { fillIn, click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import I18n from "I18n";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
 import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
 import sinon from "sinon";
+import { test } from "qunit";
 
 acceptance("Category New", function (needs) {
   needs.user();
@@ -17,6 +17,12 @@ acceptance("Category New", function (needs) {
 
     await click("#save-category");
 
+    assert.equal(
+      currentURL(),
+      "/c/testing/edit/general",
+      "it transitions to the category edit route"
+    );
+
     assert.equal(
       queryAll(".edit-category-title h2").text(),
       I18n.t("category.edit_dialog_title", {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/click-track-test.js b/app/assets/javascripts/discourse/tests/acceptance/click-track-test.js
index 8b7585ad8c..9829cc7512 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/click-track-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/click-track-test.js
@@ -1,5 +1,5 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { click, visit, currentURL } from "@ember/test-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { click, currentURL, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
 acceptance("Click Track", function (needs) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
index 518faf8c27..36cf8cc521 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
@@ -1,18 +1,18 @@
-import { click, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import I18n from "I18n";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import {
   acceptance,
-  updateCurrentUser,
-  queryAll,
   exists,
+  queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { _clearSnapshots } from "select-kit/components/composer-actions";
-import { toggleCheckDraftPopup } from "discourse/controllers/composer";
+import { click, fillIn, visit } from "@ember/test-helpers";
 import Draft from "discourse/models/draft";
+import I18n from "I18n";
 import { Promise } from "rsvp";
+import { _clearSnapshots } from "select-kit/components/composer-actions";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 import sinon from "sinon";
+import { test } from "qunit";
+import { toggleCheckDraftPopup } from "discourse/controllers/composer";
 
 acceptance("Composer Actions", function (needs) {
   needs.user();
@@ -62,7 +62,9 @@ acceptance("Composer Actions", function (needs) {
     await composerActions.selectRowByValue("reply_as_private_message");
 
     assert.equal(
-      queryAll(".users-input .item:nth-of-type(1)").text(),
+      queryAll("#private-message-users .selected-name:nth-of-type(1)")
+        .text()
+        .trim(),
       "codinghorror"
     );
     assert.ok(
@@ -108,11 +110,25 @@ acceptance("Composer Actions", function (needs) {
       "test replying as whisper to topic when initially not a whisper"
     );
 
+    assert.ok(
+      queryAll(".composer-actions svg.d-icon-far-eye-slash").length === 0,
+      "whisper icon is not visible"
+    );
+    assert.ok(
+      queryAll(".composer-actions svg.d-icon-share").length === 1,
+      "reply icon is visible"
+    );
+
     await composerActions.expand();
     await composerActions.selectRowByValue("toggle_whisper");
 
     assert.ok(
-      queryAll(".composer-fields .whisper .d-icon-far-eye-slash").length === 1
+      queryAll(".composer-actions svg.d-icon-far-eye-slash").length === 1,
+      "whisper icon is visible"
+    );
+    assert.ok(
+      queryAll(".composer-actions svg.d-icon-share").length === 0,
+      "reply icon is not visible"
     );
   });
 
@@ -164,7 +180,7 @@ acceptance("Composer Actions", function (needs) {
     await composerActions.selectRowByValue("reply_as_new_group_message");
 
     const items = [];
-    queryAll(".users-input .item").each((_, item) =>
+    queryAll("#private-message-users .selected-name").each((_, item) =>
       items.push(item.textContent.trim())
     );
 
@@ -275,25 +291,75 @@ acceptance("Composer Actions", function (needs) {
     await click("article#post_3 button.reply");
 
     assert.ok(
-      queryAll(".composer-fields .no-bump").length === 0,
-      "no-bump text is not visible"
+      queryAll(".composer-actions svg.d-icon-anchor").length === 0,
+      "no-bump icon is not visible"
+    );
+    assert.ok(
+      queryAll(".composer-actions svg.d-icon-share").length === 1,
+      "reply icon is visible"
     );
 
     await composerActions.expand();
     await composerActions.selectRowByValue("toggle_topic_bump");
 
     assert.ok(
-      queryAll(".composer-fields .no-bump").length === 1,
+      queryAll(".composer-actions svg.d-icon-anchor").length === 1,
       "no-bump icon is visible"
     );
+    assert.ok(
+      queryAll(".composer-actions svg.d-icon-share").length === 0,
+      "reply icon is not visible"
+    );
 
     await composerActions.expand();
     await composerActions.selectRowByValue("toggle_topic_bump");
 
     assert.ok(
-      queryAll(".composer-fields .no-bump").length === 0,
+      queryAll(".composer-actions svg.d-icon-anchor").length === 0,
       "no-bump icon is not visible"
     );
+    assert.ok(
+      queryAll(".composer-actions svg.d-icon-share").length === 1,
+      "reply icon is visible"
+    );
+  });
+
+  test("replying to post - whisper and no bump", async function (assert) {
+    const composerActions = selectKit(".composer-actions");
+
+    await visit("/t/internationalization-localization/280");
+    await click("article#post_3 button.reply");
+
+    assert.ok(
+      queryAll(".composer-actions svg.d-icon-far-eye-slash").length === 0,
+      "whisper icon is not visible"
+    );
+    assert.ok(
+      queryAll(".composer-fields .whisper .d-icon-anchor").length === 0,
+      "no-bump icon is not visible"
+    );
+    assert.ok(
+      queryAll(".composer-actions svg.d-icon-share").length === 1,
+      "reply icon is visible"
+    );
+
+    await composerActions.expand();
+    await composerActions.selectRowByValue("toggle_topic_bump");
+    await composerActions.expand();
+    await composerActions.selectRowByValue("toggle_whisper");
+
+    assert.ok(
+      queryAll(".composer-actions svg.d-icon-far-eye-slash").length === 1,
+      "whisper icon is visible"
+    );
+    assert.ok(
+      queryAll(".composer-fields .no-bump .d-icon-anchor").length === 1,
+      "no-bump icon is visible"
+    );
+    assert.ok(
+      queryAll(".composer-actions svg.d-icon-share").length === 0,
+      "reply icon is not visible"
+    );
   });
 
   test("replying to post as staff", async function (assert) {
@@ -348,7 +414,9 @@ acceptance("Composer Actions", function (needs) {
     await composerActions.selectRowByValue("reply_as_private_message");
 
     assert.equal(
-      queryAll(".users-input .item:nth-of-type(1)").text(),
+      queryAll("#private-message-users .selected-name:nth-of-type(1)")
+        .text()
+        .trim(),
       "uwe_keim"
     );
     assert.ok(
@@ -424,6 +492,10 @@ acceptance("Composer Actions With New Topic Draft", function (needs) {
         queryAll("#reply-control .btn-primary.create .d-button-label").text(),
         I18n.t("composer.create_shared_draft")
       );
+      assert.ok(
+        queryAll(".composer-actions svg.d-icon-far-clipboard").length === 1,
+        "shared draft icon is visible"
+      );
 
       assert.ok(queryAll("#reply-control.composing-shared-draft").length === 1);
       await click(".modal-footer .btn.btn-default");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js
index 63f8fbbc60..1413cd5c16 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js
@@ -1,4 +1,8 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import {
+  acceptance,
+  query,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
@@ -28,7 +32,7 @@ async function writeInComposer(assert) {
   await fillIn(".d-editor-input", "[test|attachment](upload://asdsad.png)");
 }
 
-acceptance("Composer Attachment", function (needs) {
+acceptance("Composer Attachment - Cooking", function (needs) {
   needs.user();
   needs.pretender(pretender);
 
@@ -54,3 +58,198 @@ acceptance("Composer Attachment - Secure Media Enabled", function (needs) {
     );
   });
 });
+
+acceptance("Composer Attachment - Upload Placeholder", function (needs) {
+  needs.user();
+
+  test("should insert a newline before and after an image when pasting into an empty composer", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+    const image = createImage("avatar.png", "/images/avatar.png?1", 200, 300);
+
+    await queryAll(".wmd-controls").trigger("fileuploadsend", image);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "[Uploading: avatar.png...]()\n"
+    );
+
+    await queryAll(".wmd-controls").trigger("fileuploaddone", image);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "![avatar|200x300](/images/avatar.png?1)\n"
+    );
+  });
+
+  test("should insert a newline after an image when pasting into a blank line", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+    await fillIn(".d-editor-input", "The image:\n");
+
+    const image = createImage("avatar.png", "/images/avatar.png?1", 200, 300);
+    await queryAll(".wmd-controls").trigger("fileuploadsend", image);
+
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "The image:\n[Uploading: avatar.png...]()\n"
+    );
+
+    await queryAll(".wmd-controls").trigger("fileuploaddone", image);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "The image:\n![avatar|200x300](/images/avatar.png?1)\n"
+    );
+  });
+
+  test("should insert a newline before and after an image when pasting into a non blank line", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+    await fillIn(".d-editor-input", "The image:");
+
+    const image = createImage("avatar.png", "/images/avatar.png?1", 200, 300);
+    await queryAll(".wmd-controls").trigger("fileuploadsend", image);
+
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "The image:\n[Uploading: avatar.png...]()\n"
+    );
+
+    await queryAll(".wmd-controls").trigger("fileuploaddone", image);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "The image:\n![avatar|200x300](/images/avatar.png?1)\n"
+    );
+  });
+
+  test("should insert a newline before and after an image when pasting with cursor in the middle of the line", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+    await fillIn(".d-editor-input", "The image Text after the image.");
+    const textArea = query(".d-editor-input");
+    textArea.selectionStart = 10;
+    textArea.selectionEnd = 10;
+
+    const image = createImage("avatar.png", "/images/avatar.png?1", 200, 300);
+    await queryAll(".wmd-controls").trigger("fileuploadsend", image);
+
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "The image \n[Uploading: avatar.png...]()\nText after the image."
+    );
+
+    await queryAll(".wmd-controls").trigger("fileuploaddone", image);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "The image \n![avatar|200x300](/images/avatar.png?1)\nText after the image."
+    );
+  });
+
+  test("should insert a newline before and after an image when pasting with text selected", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+    const image = createImage("avatar.png", "/images/avatar.png?1", 200, 300);
+    await fillIn(
+      ".d-editor-input",
+      "The image [paste here] Text after the image."
+    );
+    const textArea = query(".d-editor-input");
+    textArea.selectionStart = 10;
+    textArea.selectionEnd = 23;
+
+    await queryAll(".wmd-controls").trigger("fileuploadsend", image);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "The image \n[Uploading: avatar.png...]()\n Text after the image."
+    );
+
+    await queryAll(".wmd-controls").trigger("fileuploaddone", image);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "The image \n![avatar|200x300](/images/avatar.png?1)\n Text after the image."
+    );
+  });
+
+  test("pasting several images", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+
+    const image1 = createImage("test.png", "/images/avatar.png?1", 200, 300);
+    const image2 = createImage("test.png", "/images/avatar.png?2", 100, 200);
+    const image3 = createImage("image.png", "/images/avatar.png?3", 300, 400);
+    const image4 = createImage("image.png", "/images/avatar.png?4", 300, 400);
+
+    await queryAll(".wmd-controls").trigger("fileuploadsend", image1);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "[Uploading: test.png...]()\n"
+    );
+
+    await queryAll(".wmd-controls").trigger("fileuploadsend", image2);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "[Uploading: test.png...]()\n[Uploading: test.png(1)...]()\n"
+    );
+
+    await queryAll(".wmd-controls").trigger("fileuploadsend", image4);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "[Uploading: test.png...]()\n[Uploading: test.png(1)...]()\n[Uploading: image.png...]()\n"
+    );
+
+    await queryAll(".wmd-controls").trigger("fileuploadsend", image3);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "[Uploading: test.png...]()\n[Uploading: test.png(1)...]()\n[Uploading: image.png...]()\n[Uploading: image.png(1)...]()\n"
+    );
+
+    await queryAll(".wmd-controls").trigger("fileuploaddone", image2);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "[Uploading: test.png...]()\n![test|100x200](/images/avatar.png?2)\n[Uploading: image.png...]()\n[Uploading: image.png(1)...]()\n"
+    );
+
+    await queryAll(".wmd-controls").trigger("fileuploaddone", image3);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "[Uploading: test.png...]()\n![test|100x200](/images/avatar.png?2)\n[Uploading: image.png...]()\n![image|300x400](/images/avatar.png?3)\n"
+    );
+
+    await queryAll(".wmd-controls").trigger("fileuploaddone", image1);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "![test|200x300](/images/avatar.png?1)\n![test|100x200](/images/avatar.png?2)\n[Uploading: image.png...]()\n![image|300x400](/images/avatar.png?3)\n"
+    );
+  });
+
+  test("should accept files with unescaped characters", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+
+    const image = createImage("ima++ge.png", "/images/avatar.png?4", 300, 400);
+
+    await queryAll(".wmd-controls").trigger("fileuploadsend", image);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "[Uploading: ima++ge.png...]()\n"
+    );
+
+    await queryAll(".wmd-controls").trigger("fileuploaddone", image);
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "![ima++ge|300x400](/images/avatar.png?4)\n"
+    );
+  });
+
+  function createImage(name, url, width, height) {
+    const file = new Blob([""], { type: "image/png" });
+    file.name = name;
+    return {
+      files: [file],
+      result: {
+        original_filename: name,
+        thumbnail_width: width,
+        thumbnail_height: height,
+        url: url,
+      },
+    };
+  }
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-edit-conflict-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-edit-conflict-test.js
index ec0d7b4c02..6eb7be8235 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-edit-conflict-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-edit-conflict-test.js
@@ -1,7 +1,7 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import I18n from "I18n";
+import { test } from "qunit";
 
 acceptance("Composer - Edit conflict", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js
index c825cbd1ae..3cc5eb98eb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js
@@ -1,7 +1,7 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
 import { test } from "qunit";
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-onebox-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-onebox-test.js
index 7e48fae369..cc8ea8eece 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-onebox-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-onebox-test.js
@@ -1,4 +1,4 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
@@ -41,3 +41,42 @@ This is another test <a href=\"http://www.example.com/has-title.html\" class=\"i
     );
   });
 });
+
+acceptance("Composer - Inline Onebox", function (needs) {
+  needs.user();
+  needs.settings({
+    max_oneboxes_per_post: 2,
+    enable_markdown_linkify: true,
+    markdown_linkify_tlds: "com",
+  });
+
+  let requestsCount;
+
+  needs.pretender((server, helper) => {
+    server.get("/inline-onebox", () => {
+      ++requestsCount;
+      return helper.response({ "inline-oneboxes": [] });
+    });
+  });
+
+  test("Uses cached inline onebox", async function (assert) {
+    requestsCount = 0;
+
+    await visit("/t/internationalization-localization/280");
+    await click("#topic-footer-buttons .btn.create");
+
+    await fillIn(".d-editor-input", `Test www.example.com/page`);
+    assert.equal(requestsCount, 1);
+    assert.equal(
+      queryAll(".d-editor-preview").html().trim(),
+      '<p>Test <a href="http://www.example.com/page" class="inline-onebox-loading">www.example.com/page</a></p>'
+    );
+
+    await fillIn(".d-editor-input", `Test www.example.com/page Test`);
+    assert.equal(requestsCount, 1);
+    assert.equal(
+      queryAll(".d-editor-preview").html().trim(),
+      '<p>Test <a href="http://www.example.com/page">www.example.com/page</a> Test</p>'
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-tags-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-tags-test.js
index 47feb7c70a..5363c3edd3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-tags-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-tags-test.js
@@ -1,11 +1,13 @@
-import { click, fillIn, visit, currentURL } from "@ember/test-helpers";
-import { test } from "qunit";
-import Category from "discourse/models/category";
 import {
   acceptance,
+  queryAll,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import I18n from "I18n";
+import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
+import Category from "discourse/models/category";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("Composer - Tags", function (needs) {
   needs.user();
@@ -50,6 +52,45 @@ acceptance("Composer - Tags", function (needs) {
 
     await click("#reply-control button.create");
     assert.equal(currentURL(), "/");
+    assert.equal(
+      queryAll(".popup-tip.bad").text().trim(),
+      I18n.t("composer.error.tags_missing", { count: 1 }),
+      "it should display the right alert"
+    );
+
+    const tags = selectKit(".mini-tag-chooser");
+    await tags.expand();
+    await tags.selectRowByValue("monkey");
+
+    await click("#reply-control button.create");
+    assert.notEqual(currentURL(), "/");
+  });
+
+  test("users do not bypass min required tags in tag group validation rule", async function (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).setProperties({
+      required_tag_groups: ["support tags"],
+      min_tags_from_required_group: 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(), "/");
+    assert.equal(
+      queryAll(".popup-tip.bad").text().trim(),
+      I18n.t("composer.error.tags_missing", { count: 1 }),
+      "it should display the right alert"
+    );
 
     const tags = selectKit(".mini-tag-chooser");
     await tags.expand();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index 738c770ad3..f60b38f3d6 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -1,27 +1,43 @@
-import { click, fillIn, visit, currentURL } from "@ember/test-helpers";
-import { skip, test } from "qunit";
-import I18n from "I18n";
-import { run } from "@ember/runloop";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import {
   acceptance,
-  invisible,
-  visible,
-  queryAll,
   exists,
+  invisible,
+  queryAll,
+  updateCurrentUser,
+  visible,
 } from "discourse/tests/helpers/qunit-helpers";
-import { toggleCheckDraftPopup } from "discourse/controllers/composer";
+import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
+import { skip, test } from "qunit";
 import Draft from "discourse/models/draft";
+import I18n from "I18n";
+import { NEW_TOPIC_KEY } from "discourse/models/composer";
 import { Promise } from "rsvp";
+import { run } from "@ember/runloop";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 import sinon from "sinon";
+import { toggleCheckDraftPopup } from "discourse/controllers/composer";
+import LinkLookup from "discourse/lib/link-lookup";
 
 acceptance("Composer", function (needs) {
   needs.user();
   needs.settings({ enable_whispers: true });
+  needs.site({ can_tag_topics: true });
   needs.pretender((server, helper) => {
     server.post("/uploads/lookup-urls", () => {
       return helper.response([]);
     });
+    server.get("/posts/419", () => {
+      return helper.response({ id: 419 });
+    });
+    server.get("/u/is_local_username", () => {
+      return helper.response({
+        valid: [],
+        valid_groups: ["staff"],
+        mentionable_groups: [{ name: "staff", user_count: 30 }],
+        cannot_see: [],
+        max_users_notified_per_group_mention: 100,
+      });
+    });
   });
 
   skip("Tests the Composer controls", async function (assert) {
@@ -102,102 +118,6 @@ acceptance("Composer", function (needs) {
     assert.ok(!exists(".bootbox.modal"), "the confirmation can be cancelled");
   });
 
-  test("Composer upload placeholder", async function (assert) {
-    await visit("/");
-    await click("#create-topic");
-
-    const file1 = new Blob([""], { type: "image/png" });
-    file1.name = "test.png";
-    const data1 = {
-      files: [file1],
-      result: {
-        original_filename: "test.png",
-        thumbnail_width: 200,
-        thumbnail_height: 300,
-        url: "/images/avatar.png?1",
-      },
-    };
-
-    const file2 = new Blob([""], { type: "image/png" });
-    file2.name = "test.png";
-    const data2 = {
-      files: [file2],
-      result: {
-        original_filename: "test.png",
-        thumbnail_width: 100,
-        thumbnail_height: 200,
-        url: "/images/avatar.png?2",
-      },
-    };
-
-    const file3 = new Blob([""], { type: "image/png" });
-    file3.name = "image.png";
-    const data3 = {
-      files: [file3],
-      result: {
-        original_filename: "image.png",
-        thumbnail_width: 300,
-        thumbnail_height: 400,
-        url: "/images/avatar.png?3",
-      },
-    };
-
-    const file4 = new Blob([""], { type: "image/png" });
-    file4.name = "ima++ge.png";
-    const data4 = {
-      files: [file4],
-      result: {
-        original_filename: "ima++ge.png",
-        thumbnail_width: 300,
-        thumbnail_height: 400,
-        url: "/images/avatar.png?3",
-      },
-    };
-
-    await queryAll(".wmd-controls").trigger("fileuploadsend", data1);
-    assert.equal(
-      queryAll(".d-editor-input").val(),
-      "[Uploading: test.png...]() "
-    );
-
-    await queryAll(".wmd-controls").trigger("fileuploadsend", data2);
-    assert.equal(
-      queryAll(".d-editor-input").val(),
-      "[Uploading: test.png...]() [Uploading: test.png(1)...]() "
-    );
-
-    await queryAll(".wmd-controls").trigger("fileuploadsend", data4);
-    assert.equal(
-      queryAll(".d-editor-input").val(),
-      "[Uploading: test.png...]() [Uploading: test.png(1)...]() [Uploading: ima++ge.png...]() ",
-      "should accept files with unescaped characters"
-    );
-
-    await queryAll(".wmd-controls").trigger("fileuploadsend", data3);
-    assert.equal(
-      queryAll(".d-editor-input").val(),
-      "[Uploading: test.png...]() [Uploading: test.png(1)...]() [Uploading: ima++ge.png...]() [Uploading: image.png...]() "
-    );
-
-    await queryAll(".wmd-controls").trigger("fileuploaddone", data2);
-    assert.equal(
-      queryAll(".d-editor-input").val(),
-      "[Uploading: test.png...]() ![test|100x200](/images/avatar.png?2) [Uploading: ima++ge.png...]() [Uploading: image.png...]() "
-    );
-
-    await queryAll(".wmd-controls").trigger("fileuploaddone", data3);
-    assert.equal(
-      queryAll(".d-editor-input").val(),
-      "[Uploading: test.png...]() ![test|100x200](/images/avatar.png?2) [Uploading: ima++ge.png...]() ![image|300x400](/images/avatar.png?3) "
-    );
-
-    await queryAll(".wmd-controls").trigger("fileuploaddone", data1);
-    assert.equal(
-      queryAll(".d-editor-input").val(),
-      "![test|200x300](/images/avatar.png?1) ![test|100x200](/images/avatar.png?2) [Uploading: ima++ge.png...]() ![image|300x400](/images/avatar.png?3) "
-    );
-  });
-
   test("Create a topic with server side errors", async function (assert) {
     await visit("/");
     await click("#create-topic");
@@ -291,12 +211,22 @@ acceptance("Composer", function (needs) {
     await click(".topic-post:nth-of-type(1) button.show-more-actions");
     await click(".topic-post:nth-of-type(1) button.edit");
 
-    await click(".modal-footer button:nth-of-type(2)");
-
-    assert.ok(!visible(".discard-draft-modal.modal"));
+    await click(".modal-footer button.keep-editing");
+    assert.ok(invisible(".discard-draft-modal.modal"));
     assert.equal(
       queryAll(".d-editor-input").val(),
-      "this is the content of my reply"
+      "this is the content of my reply",
+      "composer does not switch when using Keep Editing button"
+    );
+
+    await click(".topic-post:nth-of-type(1) button.edit");
+    await click(".modal-footer button.save-draft");
+    assert.ok(invisible(".discard-draft-modal.modal"));
+
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      queryAll(".topic-post:nth-of-type(1) .cooked > p").text(),
+      "composer has contents of post to be edited"
     );
   });
 
@@ -320,6 +250,37 @@ acceptance("Composer", function (needs) {
     );
   });
 
+  test("Discard draft modal works when switching topics", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click("#topic-footer-buttons .btn.create");
+    await fillIn(".d-editor-input", "this is the content of the first reply");
+
+    await visit("/t/this-is-a-test-topic/9");
+    assert.equal(currentURL(), "/t/this-is-a-test-topic/9");
+    await click("#topic-footer-buttons .btn.create");
+    assert.ok(
+      exists(".discard-draft-modal.modal"),
+      "it pops up the discard drafts modal"
+    );
+
+    await click(".modal-footer button.keep-editing");
+
+    assert.ok(invisible(".discard-draft-modal.modal"));
+    await click("#topic-footer-buttons .btn.create");
+    assert.ok(
+      exists(".discard-draft-modal.modal"),
+      "it pops up the modal again"
+    );
+
+    await click(".modal-footer button.discard-draft");
+
+    assert.equal(
+      queryAll(".d-editor-input").val(),
+      "",
+      "discards draft and reset composer textarea"
+    );
+  });
+
   test("Create an enqueued Reply", async function (assert) {
     await visit("/t/internationalization-localization/280");
 
@@ -413,7 +374,7 @@ acceptance("Composer", function (needs) {
       "it pops up a confirmation dialog"
     );
 
-    await click(".modal-footer button:nth-of-type(1)");
+    await click(".modal-footer button.discard-draft");
     assert.equal(
       queryAll(".d-editor-input").val().indexOf("This is the second post."),
       0,
@@ -450,7 +411,7 @@ acceptance("Composer", function (needs) {
     await menu.selectRowByValue("toggleWhisper");
 
     assert.ok(
-      queryAll(".composer-fields .whisper .d-icon-far-eye-slash").length === 1,
+      queryAll(".composer-actions svg.d-icon-far-eye-slash").length === 1,
       "it sets the post type to whisper"
     );
 
@@ -458,7 +419,7 @@ acceptance("Composer", function (needs) {
     await menu.selectRowByValue("toggleWhisper");
 
     assert.ok(
-      queryAll(".composer-fields .whisper .d-icon-far-eye-slash").length === 0,
+      queryAll(".composer-actions svg.d-icon-far-eye-slash").length === 0,
       "it removes the whisper mode"
     );
 
@@ -524,7 +485,7 @@ acceptance("Composer", function (needs) {
     );
 
     assert.ok(
-      queryAll(".composer-fields .whisper .d-icon-far-eye-slash").length === 1,
+      queryAll(".composer-actions svg.d-icon-far-eye-slash").length === 1,
       "it sets the post type to whisper"
     );
 
@@ -570,7 +531,7 @@ acceptance("Composer", function (needs) {
       exists(".discard-draft-modal.modal"),
       "it pops up a confirmation dialog"
     );
-    await click(".modal-footer button:nth-of-type(1)");
+    await click(".modal-footer button.discard-draft");
     assert.equal(
       queryAll(".d-editor-input").val().indexOf("This is the first post."),
       0,
@@ -590,10 +551,16 @@ acceptance("Composer", function (needs) {
       "it pops up a confirmation dialog"
     );
     assert.equal(
-      queryAll(".modal-footer button:nth-of-type(2)").text().trim(),
-      I18n.t("post.abandon.no_value")
+      queryAll(".modal-footer button.save-draft").text().trim(),
+      I18n.t("post.cancel_composer.save_draft"),
+      "has save draft button"
     );
-    await click(".modal-footer button:nth-of-type(1)");
+    assert.equal(
+      queryAll(".modal-footer button.keep-editing").text().trim(),
+      I18n.t("post.cancel_composer.keep_editing"),
+      "has keep editing button"
+    );
+    await click(".modal-footer button.save-draft");
     assert.equal(
       queryAll(".d-editor-input").val().indexOf("This is the second post."),
       0,
@@ -615,14 +582,20 @@ acceptance("Composer", function (needs) {
       "it pops up a confirmation dialog"
     );
     assert.equal(
-      queryAll(".modal-footer button:nth-of-type(2)").text().trim(),
-      I18n.t("post.abandon.no_save_draft")
+      queryAll(".modal-footer button.save-draft").text().trim(),
+      I18n.t("post.cancel_composer.save_draft"),
+      "has save draft button"
     );
-    await click(".modal-footer button:nth-of-type(2)");
+    assert.equal(
+      queryAll(".modal-footer button.keep-editing").text().trim(),
+      I18n.t("post.cancel_composer.keep_editing"),
+      "has keep editing button"
+    );
+    await click(".modal-footer button.save-draft");
     assert.equal(
       queryAll(".d-editor-input").val(),
       "",
-      "it populates the input with the post text"
+      "it clears the composer input"
     );
   });
 
@@ -713,7 +686,9 @@ acceptance("Composer", function (needs) {
       await click(".modal .btn-default");
 
       assert.equal(
-        queryAll(".users-input .item:nth-of-type(1)").text(),
+        queryAll("#private-message-users .selected-name:nth-of-type(1)")
+          .text()
+          .trim(),
         "codinghorror"
       );
     } finally {
@@ -721,6 +696,29 @@ acceptance("Composer", function (needs) {
     }
   });
 
+  test("Loads tags and category from draft payload", async function (assert) {
+    updateCurrentUser({ has_topic_draft: true });
+
+    sinon.stub(Draft, "get").returns(
+      Promise.resolve({
+        draft:
+          '{"reply":"Hey there","action":"createTopic","title":"Draft topic","categoryId":2,"tags":["fun", "times"],"archetypeId":"regular","metaData":null,"composerTime":25269,"typingTime":8100}',
+        draft_sequence: 0,
+        draft_key: NEW_TOPIC_KEY,
+      })
+    );
+
+    await visit("/latest");
+    assert.equal(
+      queryAll("#create-topic").text().trim(),
+      I18n.t("topic.open_draft")
+    );
+
+    await click("#create-topic");
+    assert.equal(selectKit(".category-chooser").header().value(), "2");
+    assert.equal(selectKit(".mini-tag-chooser").header().value(), "fun,times");
+  });
+
   test("Deleting the text content of the first post in a private message", async function (assert) {
     await visit("/t/34");
 
@@ -745,6 +743,38 @@ acceptance("Composer", function (needs) {
     );
   };
 
+  test("reply button has envelope icon when replying to private message", async function (assert) {
+    await visit("/t/34");
+    await click("article#post_3 button.reply");
+    assert.equal(
+      queryAll(".save-or-cancel button.create").text().trim(),
+      I18n.t("composer.create_pm"),
+      "reply button says Message"
+    );
+    assert.ok(
+      queryAll(".save-or-cancel button.create svg.d-icon-envelope").length ===
+        1,
+      "reply button has envelope icon"
+    );
+  });
+
+  test("edit button when editing a post in a PM", async function (assert) {
+    await visit("/t/34");
+    await click("article#post_3 button.show-more-actions");
+    await click("article#post_3 button.edit");
+
+    assert.equal(
+      queryAll(".save-or-cancel button.create").text().trim(),
+      I18n.t("composer.save_edit"),
+      "save button says Save Edit"
+    );
+    assert.ok(
+      queryAll(".save-or-cancel button.create svg.d-icon-pencil-alt").length ===
+        1,
+      "save button has pencil icon"
+    );
+  });
+
   test("Image resizing buttons", async function (assert) {
     await visit("/");
     await click("#create-topic");
@@ -790,7 +820,7 @@ acceptance("Composer", function (needs) {
     await click(
       queryAll(
         ".button-wrapper[data-image-index='0'] .scale-btn[data-scale='50']"
-      )
+      )[0]
     );
     assertImageResized(assert, uploads);
 
@@ -800,7 +830,7 @@ acceptance("Composer", function (needs) {
     await click(
       queryAll(
         ".button-wrapper[data-image-index='3'] .scale-btn[data-scale='50']"
-      )
+      )[0]
     );
     assertImageResized(assert, uploads);
 
@@ -810,7 +840,7 @@ acceptance("Composer", function (needs) {
     await click(
       queryAll(
         ".button-wrapper[data-image-index='4'] .scale-btn[data-scale='75']"
-      )
+      )[0]
     );
     assertImageResized(assert, uploads);
 
@@ -819,7 +849,7 @@ acceptance("Composer", function (needs) {
     await click(
       queryAll(
         ".button-wrapper[data-image-index='5'] .scale-btn[data-scale='50']"
-      )
+      )[0]
     );
     assertImageResized(assert, uploads);
 
@@ -828,7 +858,7 @@ acceptance("Composer", function (needs) {
     await click(
       queryAll(
         ".button-wrapper[data-image-index='6'] .scale-btn[data-scale='75']"
-      )
+      )[0]
     );
     assertImageResized(assert, uploads);
 
@@ -837,7 +867,7 @@ acceptance("Composer", function (needs) {
     await click(
       queryAll(
         ".button-wrapper[data-image-index='8'] .scale-btn[data-scale='75']"
-      )
+      )[0]
     );
     assertImageResized(assert, uploads);
 
@@ -846,7 +876,7 @@ acceptance("Composer", function (needs) {
     await click(
       queryAll(
         ".button-wrapper[data-image-index='9'] .scale-btn[data-scale='75']"
-      )
+      )[0]
     );
     assertImageResized(assert, uploads);
 
@@ -864,4 +894,44 @@ acceptance("Composer", function (needs) {
       "it does not unescapes script tags in code blocks"
     );
   });
+
+  skip("Shows duplicate_link notice", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click("#topic-footer-buttons .create");
+
+    this.container.lookup("controller:composer").set(
+      "linkLookup",
+      new LinkLookup({
+        "github.com": {
+          domain: "github.com",
+          username: "system",
+          posted_at: "2021-01-01T12:00:00.000Z",
+          post_number: 1,
+        },
+      })
+    );
+
+    await fillIn(".d-editor-input", "[](https://discourse.org)");
+    assert.equal(find(".composer-popup").length, 0);
+
+    await fillIn(".d-editor-input", "[quote][](https://github.com)[/quote]");
+    assert.equal(find(".composer-popup").length, 0);
+
+    await fillIn(".d-editor-input", "[](https://github.com)");
+    assert.equal(find(".composer-popup").length, 1);
+  });
+
+  test("Shows the 'group_mentioned' notice", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click("#topic-footer-buttons .create");
+
+    await fillIn(".d-editor-input", "[quote]\n@staff\n[/quote]");
+    assert.notOk(
+      exists(".composer-popup"),
+      "Doesn't show the 'group_mentioned' notice in a quote"
+    );
+
+    await fillIn(".d-editor-input", "@staff");
+    assert.ok(exists(".composer-popup"), "Shows the 'group_mentioned' notice");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-topic-links-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-topic-links-test.js
index 32e8badb2b..02307c2698 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-topic-links-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-topic-links-test.js
@@ -1,7 +1,7 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
@@ -52,6 +52,17 @@ acceptance("Composer topic featured links", function (needs) {
     );
   });
 
+  test("YouTube onebox with title", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+    await fillIn("#reply-title", "https://www.youtube.com/watch?v=dQw4w9WgXcQ");
+    assert.equal(
+      queryAll(".title-input input").val(),
+      "Rick Astley - Never Gonna Give You Up (Video)",
+      "title is from the oneboxed article"
+    );
+  });
+
   test("no onebox result", async function (assert) {
     await visit("/");
     await click("#create-topic");
@@ -135,6 +146,24 @@ acceptance("Composer topic featured links", function (needs) {
       "title is unchanged"
     );
   });
+
+  test("blank title for Twitter link", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+    await fillIn(
+      "#reply-title",
+      "https://twitter.com/discourse/status/1357664660724482048"
+    );
+    assert.ok(
+      queryAll(".d-editor-preview").html().trim().indexOf("onebox") > 0,
+      "it pastes the link into the body and previews it"
+    );
+    assert.ok(
+      exists(".d-editor-textarea-wrapper .popup-tip.good"),
+      "the body is now good"
+    );
+    assert.blank(queryAll(".title-input input").val(), "title is blank");
+  });
 });
 
 acceptance(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-uncategorized-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-uncategorized-test.js
index 6d7ec8cbac..f9b8c1be32 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-uncategorized-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-uncategorized-test.js
@@ -1,11 +1,11 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance(
   "Composer disabled, uncategorized not allowed when any topic_template present",
diff --git a/app/assets/javascripts/discourse/tests/acceptance/create-account-external-test.js b/app/assets/javascripts/discourse/tests/acceptance/create-account-external-test.js
index 0c24d119c7..e679bfcb0c 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/create-account-external-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/create-account-external-test.js
@@ -1,6 +1,6 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Create Account - external auth", function (needs) {
   needs.hooks.beforeEach(() => {
@@ -24,7 +24,7 @@ acceptance("Create Account - external auth", function (needs) {
     await visit("/");
 
     assert.ok(
-      exists("#discourse-modal div.create-account"),
+      exists("#discourse-modal div.create-account-body"),
       "it shows the registration modal"
     );
 
@@ -32,11 +32,11 @@ acceptance("Create Account - external auth", function (needs) {
   });
 
   test("when skip is enabled", async function (assert) {
-    this.siteSettings.external_auth_skip_create_confirm = true;
+    this.siteSettings.auth_skip_create_confirm = true;
     await visit("/");
 
     assert.ok(
-      exists("#discourse-modal div.create-account"),
+      exists("#discourse-modal div.create-account-body"),
       "it shows the registration modal"
     );
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js b/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
index 60d24324e6..c85cb272c5 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
@@ -1,7 +1,7 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
@@ -64,7 +64,7 @@ acceptance("Create Account - User Fields", function (needs) {
     await click(".modal-footer .btn-primary");
     assert.equal(queryAll("#modal-alert")[0].style.display, "");
 
-    await fillIn(".user-field input[type=text]:first", "Barky");
+    await fillIn(".user-field input[type=text]:nth-of-type(1)", "Barky");
     await click(".user-field input[type=checkbox]");
 
     await click(".modal-footer .btn-primary");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js
new file mode 100644
index 0000000000..1aed75b4ad
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js
@@ -0,0 +1,195 @@
+import { click, fillIn, visit } from "@ember/test-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import I18n from "I18n";
+
+acceptance("Invites - Create & Edit Invite Modal", function (needs) {
+  let deleted;
+
+  needs.user();
+  needs.pretender((server, helper) => {
+    const inviteData = {
+      id: 1,
+      invite_key: "52641ae8878790bc7b79916247cfe6ba",
+      link: "http://example.com/invites/52641ae8878790bc7b79916247cfe6ba",
+      max_redemptions_allowed: 1,
+      redemption_count: 0,
+      created_at: "2021-01-26T12:00:00.000Z",
+      updated_at: "2021-01-26T12:00:00.000Z",
+      expires_at: "2121-01-26T12:00:00.000Z",
+      expired: false,
+      topics: [],
+      groups: [],
+    };
+
+    server.post("/invites", () => helper.response(inviteData));
+    server.put("/invites/1", () => helper.response(inviteData));
+
+    server.delete("/invites", () => {
+      deleted = true;
+      return helper.response({});
+    });
+  });
+  needs.hooks.beforeEach(() => {
+    deleted = false;
+  });
+
+  test("basic functionality", async function (assert) {
+    await visit("/u/eviltrout/invited/pending");
+    await click(".invite-controls .btn:first-child");
+    assert.equal(
+      find("input.invite-link")[0].value,
+      "http://example.com/invites/52641ae8878790bc7b79916247cfe6ba",
+      "shows an invite link when modal is opened"
+    );
+
+    await click(".modal-footer .show-advanced");
+    await assert.ok(
+      find(".invite-to-groups").length > 0,
+      "shows advanced options"
+    );
+    await assert.ok(
+      find(".invite-to-topic").length > 0,
+      "shows advanced options"
+    );
+    await assert.ok(
+      find(".invite-expires-at").length > 0,
+      "shows advanced options"
+    );
+
+    await click(".modal-close");
+    assert.ok(deleted, "deletes the invite if not saved");
+  });
+
+  test("saving", async function (assert) {
+    await visit("/u/eviltrout/invited/pending");
+    await click(".invite-controls .btn:first-child");
+
+    assert.ok(
+      find("tbody tr").length === 0,
+      "does not show invite before saving"
+    );
+
+    await click(".btn-primary");
+
+    assert.ok(
+      find("tbody tr").length === 1,
+      "adds invite to list after saving"
+    );
+
+    await click(".modal-close");
+    assert.notOk(deleted, "does not delete invite on close");
+  });
+
+  test("copying saves invite", async function (assert) {
+    await visit("/u/eviltrout/invited/pending");
+    await click(".invite-controls .btn:first-child");
+
+    await click(".invite-link .btn");
+
+    await click(".modal-close");
+    assert.notOk(deleted, "does not delete invite on close");
+  });
+
+  test("copying an email invite without an email shows error message", async function (assert) {
+    await visit("/u/eviltrout/invited/pending");
+    await click(".invite-controls .btn:first-child");
+
+    await click("#invite-type");
+    await click(".invite-link .btn");
+    assert.equal(
+      find("#modal-alert").text(),
+      I18n.t("user.invited.invite.blank_email")
+    );
+  });
+});
+
+acceptance("Invites - Link Invites", function (needs) {
+  needs.user();
+  needs.pretender((server, helper) => {
+    const inviteData = {
+      id: 1,
+      invite_key: "52641ae8878790bc7b79916247cfe6ba",
+      link: "http://example.com/invites/52641ae8878790bc7b79916247cfe6ba",
+      max_redemptions_allowed: 1,
+      redemption_count: 0,
+      created_at: "2021-01-26T12:00:00.000Z",
+      updated_at: "2021-01-26T12:00:00.000Z",
+      expires_at: "2121-01-26T12:00:00.000Z",
+      expired: false,
+      topics: [],
+      groups: [],
+    };
+
+    server.post("/invites", () => helper.response(inviteData));
+    server.put("/invites/1", () => helper.response(inviteData));
+    server.delete("/invites", () => helper.response({}));
+  });
+
+  test("invite links", async function (assert) {
+    await visit("/u/eviltrout/invited/pending");
+    await click(".invite-controls .btn:first-child");
+
+    assert.ok(
+      find("#invite-max-redemptions").length,
+      "shows max redemptions field"
+    );
+  });
+});
+
+acceptance("Invites - Email Invites", function (needs) {
+  let lastRequest;
+
+  needs.user();
+  needs.pretender((server, helper) => {
+    const inviteData = {
+      id: 1,
+      invite_key: "52641ae8878790bc7b79916247cfe6ba",
+      link: "http://example.com/invites/52641ae8878790bc7b79916247cfe6ba",
+      email: "test@example.com",
+      emailed: false,
+      custom_message: null,
+      created_at: "2021-01-26T12:00:00.000Z",
+      updated_at: "2021-01-26T12:00:00.000Z",
+      expires_at: "2121-01-26T12:00:00.000Z",
+      expired: false,
+      topics: [],
+      groups: [],
+    };
+
+    server.post("/invites", () => helper.response(inviteData));
+
+    server.put("/invites/1", (request) => {
+      lastRequest = request;
+      return helper.response(inviteData);
+    });
+  });
+  needs.hooks.beforeEach(() => {
+    lastRequest = null;
+  });
+
+  test("invite email", async function (assert) {
+    await visit("/u/eviltrout/invited/pending");
+    await click(".invite-controls .btn:first-child");
+
+    await click("#invite-type");
+
+    assert.ok(find("#invite-email").length, "shows email field");
+
+    await fillIn("#invite-email", "test@example.com");
+    assert.ok(find(".save-invite").length, "shows save without email button");
+    await click(".save-invite");
+    assert.ok(
+      lastRequest.requestBody.indexOf("skip_email=true") !== -1,
+      "sends skip_email to server"
+    );
+
+    await fillIn("#invite-email", "test2@example.com");
+    assert.ok(find(".send-invite").length, "shows save and send email button");
+    await click(".send-invite");
+    assert.ok(
+      lastRequest.requestBody.indexOf("send_email=true") !== -1,
+      "sends send_email to server"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/custom-html-set-test.js b/app/assets/javascripts/discourse/tests/acceptance/custom-html-set-test.js
index fd58172d05..8266f7a9df 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/custom-html-set-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/custom-html-set-test.js
@@ -1,12 +1,12 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import { setCustomHTML } from "discourse/helpers/custom-html";
 import PreloadStore from "discourse/lib/preload-store";
+import { setCustomHTML } from "discourse/helpers/custom-html";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("CustomHTML set", function () {
   test("has no custom HTML in the top", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js
index ecc7e0d752..bb79868cc8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js
@@ -1,8 +1,8 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import Ember from "ember";
 import hbs from "htmlbars-inline-precompile";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("CustomHTML template", function (needs) {
   needs.hooks.beforeEach(() => {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js b/app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js
index d1e6f31fb1..ac67b052df 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js
@@ -1,11 +1,11 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("Dashboard", function (needs) {
   needs.user();
@@ -127,6 +127,13 @@ acceptance("Dashboard", function (needs) {
       "its set the value of the filter from the query params"
     );
   });
+
+  test("new features", async function (assert) {
+    await visit("/admin");
+
+    assert.ok(exists(".dashboard-new-features"));
+    assert.ok(exists(".dashboard-new-features .new-features-release-notes"));
+  });
 });
 
 acceptance("Dashboard: dashboard_visible_tabs", function (needs) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/do-not-disturb-test.js b/app/assets/javascripts/discourse/tests/acceptance/do-not-disturb-test.js
new file mode 100644
index 0000000000..fea8383dee
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/do-not-disturb-test.js
@@ -0,0 +1,70 @@
+import {
+  acceptance,
+  exists,
+  queryAll,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+
+acceptance("Do not disturb", function (needs) {
+  needs.user();
+  needs.pretender((server, helper) => {
+    server.post("/do-not-disturb.json", () => {
+      let now = new Date();
+      now.setHours(now.getHours() + 1);
+      return helper.response({ ends_at: now });
+    });
+    server.delete("/do-not-disturb.json", () =>
+      helper.response({ success: true })
+    );
+  });
+
+  test("when turned off, it is turned on from modal", async function (assert) {
+    updateCurrentUser({ do_not_disturb_until: null });
+
+    await visit("/");
+    await click(".header-dropdown-toggle.current-user");
+    await click(".menu-links-row .user-preferences-link");
+
+    await click(".do-not-disturb");
+
+    assert.ok(exists(".do-not-disturb-modal"), "modal to choose time appears");
+
+    let tiles = queryAll(".do-not-disturb-tile");
+    assert.ok(tiles.length === 4, "There are 4 duration choices");
+
+    await click(tiles[0]);
+
+    assert.ok(
+      queryAll(".do-not-disturb-modal")[0].style.display === "none",
+      "modal is hidden"
+    );
+
+    assert.ok(
+      exists(".header-dropdown-toggle .do-not-disturb-background"),
+      "moon icon is present in header"
+    );
+  });
+
+  test("when turned on, it can be turned off", async function (assert) {
+    let now = new Date();
+    now.setHours(now.getHours() + 1);
+    updateCurrentUser({ do_not_disturb_until: now });
+
+    await visit("/");
+    await click(".header-dropdown-toggle.current-user");
+    await click(".menu-links-row .user-preferences-link");
+    assert.equal(
+      queryAll(".do-not-disturb .relative-date")[0].textContent,
+      "1h"
+    );
+
+    await click(".do-not-disturb");
+
+    assert.ok(
+      queryAll(".do-not-disturb-background").length === 0,
+      "The active moon icons are removed"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/email-notice-test.js b/app/assets/javascripts/discourse/tests/acceptance/email-notice-test.js
index 087efa0e3e..a4bdd4e8fa 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/email-notice-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/email-notice-test.js
@@ -1,10 +1,10 @@
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
-  updateCurrentUser,
   exists,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Email Disabled Banner", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/emoji-picker-test.js b/app/assets/javascripts/discourse/tests/acceptance/emoji-picker-test.js
index 11467f6a7a..fdaaabb1f2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/emoji-picker-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/emoji-picker-test.js
@@ -1,7 +1,7 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
diff --git a/app/assets/javascripts/discourse/tests/acceptance/emoji-test.js b/app/assets/javascripts/discourse/tests/acceptance/emoji-test.js
index ca23c0cf03..9d5a8cd7bc 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/emoji-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/emoji-test.js
@@ -1,4 +1,4 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
@@ -13,7 +13,7 @@ acceptance("Emoji", function (needs) {
     await fillIn(".d-editor-input", "this is an emoji :blonde_woman:");
     assert.equal(
       queryAll(".d-editor-preview:visible").html().trim(),
-      `<p>this is an emoji <img src="/images/emoji/emoji_one/blonde_woman.png?v=${v}" title=":blonde_woman:" class="emoji" alt=":blonde_woman:"></p>`
+      `<p>this is an emoji <img src="/images/emoji/google_classic/blonde_woman.png?v=${v}" title=":blonde_woman:" class="emoji" alt=":blonde_woman:"></p>`
     );
   });
 
@@ -24,7 +24,7 @@ acceptance("Emoji", function (needs) {
     await fillIn(".d-editor-input", "this is an emoji :blonde_woman:t5:");
     assert.equal(
       queryAll(".d-editor-preview:visible").html().trim(),
-      `<p>this is an emoji <img src="/images/emoji/emoji_one/blonde_woman/5.png?v=${v}" title=":blonde_woman:t5:" class="emoji" alt=":blonde_woman:t5:"></p>`
+      `<p>this is an emoji <img src="/images/emoji/google_classic/blonde_woman/5.png?v=${v}" title=":blonde_woman:t5:" class="emoji" alt=":blonde_woman:t5:"></p>`
     );
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/encoded-category-test.js b/app/assets/javascripts/discourse/tests/acceptance/encoded-category-test.js
index 773a54ef8b..9e5a80bead 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/encoded-category-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/encoded-category-test.js
@@ -1,7 +1,7 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import DiscoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Encoded Sub Category Discovery", function (needs) {
   needs.settings({
diff --git a/app/assets/javascripts/discourse/tests/acceptance/enforce-second-factor-test.js b/app/assets/javascripts/discourse/tests/acceptance/enforce-second-factor-test.js
index 735b49fb3e..86ce29be17 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/enforce-second-factor-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/enforce-second-factor-test.js
@@ -1,10 +1,21 @@
-import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
-  updateCurrentUser,
   queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import { click, settled, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+
+async function catchAbortedTransition() {
+  try {
+    await visit("/u/eviltrout/summary");
+  } catch (e) {
+    if (e.message !== "TransitionAborted") {
+      throw e;
+    }
+  }
+  await settled();
+}
 
 acceptance("Enforce Second Factor", function (needs) {
   needs.user();
@@ -21,7 +32,7 @@ acceptance("Enforce Second Factor", function (needs) {
     await visit("/u/eviltrout/preferences/second-factor");
     this.siteSettings.enforce_second_factor = "staff";
 
-    await visit("/u/eviltrout/summary");
+    await catchAbortedTransition();
 
     assert.equal(
       queryAll(".control-label").text(),
@@ -45,7 +56,7 @@ acceptance("Enforce Second Factor", function (needs) {
     await visit("/u/eviltrout/preferences/second-factor");
     this.siteSettings.enforce_second_factor = "all";
 
-    await visit("/u/eviltrout/summary");
+    await catchAbortedTransition();
 
     assert.equal(
       queryAll(".control-label").text(),
@@ -70,7 +81,7 @@ acceptance("Enforce Second Factor", function (needs) {
     this.siteSettings.enforce_second_factor = "all";
     this.siteSettings.allow_anonymous_posting = true;
 
-    await visit("/u/eviltrout/summary");
+    await catchAbortedTransition();
 
     assert.notEqual(
       queryAll(".control-label").text(),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js b/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js
index f5cd5c413e..253a7b28fa 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js
@@ -1,11 +1,11 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 import userFixtures from "discourse/tests/fixtures/user-fixtures";
 
 async function openFlagModal() {
@@ -72,12 +72,12 @@ acceptance("flagging", function (needs) {
         full_name: null,
       });
     });
-    server.put("admin/users/5/silence", () => {
+    server.put("/admin/users/5/silence", () => {
       return helper.response({
         silenced: true,
       });
     });
-    server.post("post_actions", () => {
+    server.post("/post_actions", () => {
       return helper.response({
         response: true,
       });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/forgot-password-test.js b/app/assets/javascripts/discourse/tests/acceptance/forgot-password-test.js
index 09cda1e425..92df2514a1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/forgot-password-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/forgot-password-test.js
@@ -1,11 +1,11 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import I18n from "I18n";
+import { test } from "qunit";
 
 let userFound = false;
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js
index 70898fd78a..f9a6ef3242 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js
@@ -1,12 +1,13 @@
-import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import I18n from "I18n";
 import {
   acceptance,
-  updateCurrentUser,
   count,
   queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
+import I18n from "I18n";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("Group Members - Anonymous", function () {
   test("Viewing Members as anon user", async function (assert) {
@@ -34,6 +35,12 @@ acceptance("Group Members - Anonymous", function () {
 acceptance("Group Members", function (needs) {
   needs.user();
 
+  needs.pretender((server, helper) => {
+    server.put("/admin/groups/47/owners.json", () => {
+      return helper.response({ success: true });
+    });
+  });
+
   test("Viewing Members as a group owner", async function (assert) {
     updateCurrentUser({ moderator: false, admin: false });
 
@@ -61,4 +68,18 @@ acceptance("Group Members", function (needs) {
       "it should display the right filter placehodler"
     );
   });
+
+  test("Shows bulk actions", async function (assert) {
+    await visit("/g/discourse");
+
+    assert.ok(count("button.bulk-select") > 0);
+    await click("button.bulk-select");
+
+    await click(queryAll("input.bulk-select")[0]);
+    await click(queryAll("input.bulk-select")[1]);
+
+    const memberDropdown = selectKit(".group-member-dropdown");
+    await memberDropdown.expand();
+    await memberDropdown.selectRowByValue("makeOwners");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js
index 5a07bdba70..573b606da3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js
@@ -1,11 +1,11 @@
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
-  updateCurrentUser,
   count,
   queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Managing Group Category Notification Defaults", function () {
   test("As an anonymous user", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-interaction-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-interaction-test.js
index 244ae75e8f..e5bf10edbb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-interaction-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-interaction-test.js
@@ -1,10 +1,10 @@
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
-  updateCurrentUser,
   queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Managing Group Interaction Settings", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-logs-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-logs-test.js
index 0573a88d90..6ae37982a5 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-logs-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-logs-test.js
@@ -1,4 +1,4 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js
index a130efdc46..afef5e560c 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js
@@ -1,11 +1,11 @@
-import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
-  updateCurrentUser,
   queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("Managing Group Membership", function (needs) {
   needs.user();
@@ -50,6 +50,11 @@ acceptance("Managing Group Membership", function (needs) {
       "it should disable group allow_membership_request input"
     );
 
+    assert.ok(
+      queryAll(".group-flair-inputs").length === 1,
+      "it should display avatar flair inputs"
+    );
+
     await click(".group-form-public-admission");
     await click(".group-form-allow-membership-requests");
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js
index dc4bdba41f..7a0ced0802 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js
@@ -1,11 +1,11 @@
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
-  updateCurrentUser,
   count,
   queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Managing Group Profile", function () {
   test("As an anonymous user", async function (assert) {
@@ -24,10 +24,6 @@ acceptance("Managing Group Profile", function (needs) {
   test("As an admin", async function (assert) {
     await visit("/g/discourse/manage/profile");
 
-    assert.ok(
-      queryAll(".group-flair-inputs").length === 1,
-      "it should display avatar flair inputs"
-    );
     assert.ok(
       queryAll(".group-form-bio").length === 1,
       "it should display group bio input"
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js
index 248f56d0a2..f309023e6d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js
@@ -1,11 +1,11 @@
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
-  updateCurrentUser,
   count,
   queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Managing Group Tag Notification Defaults", function () {
   test("As an anonymous user", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js
index 40b321f1be..3c91365f64 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js
@@ -1,4 +1,4 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
@@ -91,7 +91,7 @@ acceptance("Group Requests", function (needs) {
         .text()
         .trim()
         .replace(/\s+/g, " "),
-      "eviltrout Robin Ward"
+      "Robin Ward eviltrout"
     );
     assert.equal(
       queryAll(".group-members tr:first-child td:nth-child(3)").text().trim(),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-test.js
index 4405e6e163..4b400eb7fd 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-test.js
@@ -1,12 +1,12 @@
 import {
-  queryAll,
   acceptance,
   count,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import I18n from "I18n";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 function setupGroupPretender(server, helper) {
   server.post("/groups/Macdonald/request_membership", () => {
@@ -215,10 +215,12 @@ acceptance("Group - Authenticated", function (needs) {
 
     assert.ok(count("#reply-control") === 1, "it opens the composer");
     assert.equal(
-      queryAll(".ac-wrap .item").text(),
+      queryAll("#private-message-users .selected-name").text().trim(),
       "discourse",
       "it prefills the group name"
     );
+
+    assert.ok(!exists(".add-warning"), "groups can't receive warnings");
   });
 
   test("Admin viewing group messages when there are no messages", async function (assert) {
@@ -261,6 +263,18 @@ acceptance("Group - Authenticated", function (needs) {
       "Awesome Team",
       "it should display the group name"
     );
+
+    await click(".group-details-button button.btn-danger");
+
+    assert.equal(
+      queryAll(".bootbox .modal-body").html(),
+      I18n.t("admin.groups.delete_with_messages_confirm", {
+        count: 2,
+      }),
+      "it should warn about orphan messages"
+    );
+
+    await click(".modal-footer .btn-default");
   });
 
   test("Moderator Viewing Group", async function (assert) {
@@ -280,7 +294,7 @@ acceptance("Group - Authenticated", function (needs) {
 
     await click(".group-add-members-modal .modal-close");
 
-    const memberDropdown = selectKit(".group-member-dropdown:first");
+    const memberDropdown = selectKit(".group-member-dropdown:nth-of-type(1)");
     await memberDropdown.expand();
 
     assert.equal(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/groups-index-test.js b/app/assets/javascripts/discourse/tests/acceptance/groups-index-test.js
index 42da9a3b4c..e1bc069f20 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/groups-index-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/groups-index-test.js
@@ -1,12 +1,12 @@
-import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
-  invisible,
   count,
-  queryAll,
   exists,
+  invisible,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
+import { test } from "qunit";
 
 acceptance("Groups", function () {
   test("Browsing Groups", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/groups-new-test.js b/app/assets/javascripts/discourse/tests/acceptance/groups-new-test.js
index 38eb83822d..421add93b5 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/groups-new-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/groups-new-test.js
@@ -1,7 +1,7 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import I18n from "I18n";
+import { test } from "qunit";
 
 acceptance("New Group - Anonymous", function () {
   test("As an anon user", async function (assert) {
@@ -74,5 +74,12 @@ acceptance("New Group - Authenticated", function (needs) {
       0,
       "it should disable the membership requests checkbox"
     );
+
+    assert.ok(
+      queryAll(".groups-form-default-notification-level .selected-name .name")
+        .text()
+        .trim() === I18n.t("groups.notifications.watching.title"),
+      "it has a default selection for notification level"
+    );
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
index 93b3e8b74e..d073b44942 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
@@ -1,27 +1,28 @@
-import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
-  updateCurrentUser,
   queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
+import { test } from "qunit";
 
-acceptance("Opening the hamburger menu with some reviewables", function (
-  needs
-) {
-  needs.user();
-  needs.pretender((server, helper) => {
-    server.get("/review/count.json", () => helper.response({ count: 3 }));
-  });
-  test("As a staff member", async function (assert) {
-    updateCurrentUser({ moderator: true, admin: false });
+acceptance(
+  "Opening the hamburger menu with some reviewables",
+  function (needs) {
+    needs.user();
+    needs.pretender((server, helper) => {
+      server.get("/review/count.json", () => helper.response({ count: 3 }));
+    });
+    test("As a staff member", async function (assert) {
+      updateCurrentUser({ moderator: true, admin: false });
 
-    await visit("/");
-    await click(".hamburger-dropdown");
+      await visit("/");
+      await click(".hamburger-dropdown");
 
-    assert.equal(
-      queryAll(".review .badge-notification.reviewables").text(),
-      "3"
-    );
-  });
-});
+      assert.equal(
+        queryAll(".review .badge-notification.reviewables").text(),
+        "3"
+      );
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/hashtags-test.js b/app/assets/javascripts/discourse/tests/acceptance/hashtags-test.js
index 726397c9b5..fd71dbb5db 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/hashtags-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/hashtags-test.js
@@ -1,4 +1,4 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
@@ -27,14 +27,17 @@ acceptance("Category and Tag Hashtags", function (needs) {
 
 this is a tag hashtag #monkey
 
-category vs tag: #bug vs #bug::tag`
+category vs tag: #bug vs #bug::tag
+
+uppercase hashtag works too #BUG, #BUG::tag`
     );
 
     assert.equal(
       queryAll(".d-editor-preview:visible").html().trim(),
       `<p>this is a category hashtag <a href="/c/bugs" class="hashtag">#<span>bug</span></a></p>
 <p>this is a tag hashtag <a href="/tag/monkey" class="hashtag">#<span>monkey</span></a></p>
-<p>category vs tag: <a href="/c/bugs" class="hashtag">#<span>bug</span></a> vs <a href="/tag/bug" class="hashtag">#<span>bug</span></a></p>`
+<p>category vs tag: <a href="/c/bugs" class="hashtag">#<span>bug</span></a> vs <a href="/tag/bug" class="hashtag">#<span>bug</span></a></p>
+<p>uppercase hashtag works too <a href="/c/bugs" class="hashtag">#<span>BUG</span></a>, <a href="/tag/bug" class="hashtag">#<span>BUG</span></a></p>`
     );
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js b/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
index bd877437dc..73ec2d4c00 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
@@ -1,16 +1,80 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import PreloadStore from "discourse/lib/preload-store";
+import I18n from "I18n";
+import { test } from "qunit";
 
-acceptance("Invite Accept", function (needs) {
+function setAuthenticationData(hooks, json) {
+  hooks.beforeEach(() => {
+    const node = document.createElement("meta");
+    node.dataset.authenticationData = JSON.stringify(json);
+    node.id = "data-authentication";
+    document.querySelector("head").appendChild(node);
+  });
+  hooks.afterEach(() => {
+    document
+      .querySelector("head")
+      .removeChild(document.getElementById("data-authentication"));
+  });
+}
+
+function preloadInvite({ link = false } = {}) {
+  const info = {
+    invited_by: {
+      id: 123,
+      username: "foobar",
+      avatar_template: "/user_avatar/localhost/neil/{size}/25_1.png",
+      name: "foobar",
+      title: "team",
+    },
+    username: "invited",
+  };
+
+  if (link) {
+    info.email = "null";
+    info.is_invite_link = true;
+  } else {
+    info.email = "foobar@example.com";
+    info.is_invite_link = false;
+  }
+
+  PreloadStore.store("invite_info", info);
+}
+
+acceptance("Invite accept", function (needs) {
   needs.settings({ full_name_required: true });
 
-  test("Invite Acceptance Page", async function (assert) {
+  test("email invite link", async function (assert) {
+    PreloadStore.store("invite_info", {
+      invited_by: {
+        id: 123,
+        username: "foobar",
+        avatar_template: "/user_avatar/localhost/neil/{size}/25_1.png",
+        name: "foobar",
+        title: "team",
+      },
+      email: "foobar@example.com",
+      username: "invited",
+      is_invite_link: false,
+    });
+
+    await visit("/invites/myvalidinvitetoken");
+
+    assert.ok(
+      queryAll(".col-form")
+        .text()
+        .includes(I18n.t("invites.social_login_available")),
+      "shows social login hint"
+    );
+
+    assert.ok(!exists("#new-account-email"), "hides the email input");
+  });
+
+  test("invite link", async function (assert) {
     PreloadStore.store("invite_info", {
       invited_by: {
         id: 123,
@@ -83,4 +147,216 @@ acceptance("Invite Accept", function (needs) {
       "submit is enabled"
     );
   });
+
+  test("invite name is required only if full name is required", async function (assert) {
+    preloadInvite();
+    await visit("/invites/myvalidinvitetoken");
+    assert.ok(exists(".name-input .required"), "Full name is required");
+  });
 });
+
+acceptance("Invite accept when local login is disabled", function (needs) {
+  needs.settings({ enable_local_logins: false });
+
+  test("invite link", async function (assert) {
+    preloadInvite({ link: true });
+
+    await visit("/invites/myvalidinvitetoken");
+
+    assert.ok(exists(".btn-social.facebook"), "shows Facebook login button");
+    assert.ok(!exists("form"), "does not display the form");
+  });
+
+  test("email invite link", async function (assert) {
+    preloadInvite();
+    await visit("/invites/myvalidinvitetoken");
+
+    assert.ok(exists(".btn-social.facebook"), "shows Facebook login button");
+    assert.ok(!exists("form"), "does not display the form");
+  });
+});
+
+acceptance(
+  "Invite accept when DiscourseConnect SSO is enabled and local login is disabled",
+  function (needs) {
+    needs.settings({
+      enable_local_logins: false,
+      enable_discourse_connect: true,
+    });
+
+    test("invite link", async function (assert) {
+      preloadInvite({ link: true });
+
+      await visit("/invites/myvalidinvitetoken");
+
+      assert.ok(
+        !exists(".btn-social.facebook"),
+        "does not show Facebook login button"
+      );
+      assert.ok(!exists("form"), "does not display the form");
+      assert.ok(
+        !exists(".email-message"),
+        "does not show the email message with the prefilled email"
+      );
+      assert.ok(exists(".discourse-connect"), "shows the Continue button");
+    });
+
+    test("email invite link", async function (assert) {
+      preloadInvite();
+
+      await visit("/invites/myvalidinvitetoken");
+
+      assert.ok(
+        !exists(".btn-social.facebook"),
+        "does not show Facebook login button"
+      );
+      assert.ok(!exists("form"), "does not display the form");
+      assert.ok(
+        exists(".email-message"),
+        "shows the email message with the prefilled email"
+      );
+      assert.ok(exists(".discourse-connect"), "shows the Continue button");
+      assert.ok(
+        queryAll(".email-message").text().includes("foobar@example.com")
+      );
+    });
+  }
+);
+
+acceptance(
+  "Invite accept when DiscourseConnect SSO is enabled and local login is enabled (bad config)",
+  function (needs) {
+    needs.settings({
+      enable_local_logins: true,
+      enable_discourse_connect: true,
+    });
+
+    test("invite link", async function (assert) {
+      preloadInvite({ link: true });
+
+      await visit("/invites/myvalidinvitetoken");
+      assert.ok(!exists("form"), "does not display the form");
+    });
+  }
+);
+
+acceptance("Invite link with authentication data", function (needs) {
+  needs.settings({ enable_local_logins: false });
+
+  setAuthenticationData(needs.hooks, {
+    auth_provider: "facebook",
+    email: "blah@example.com",
+    email_valid: true,
+    username: "foobar",
+    name: "barfoo",
+  });
+
+  test("form elements and buttons are correct ", async function (assert) {
+    preloadInvite({ link: true });
+
+    await visit("/invites/myvalidinvitetoken");
+
+    assert.ok(
+      !exists(".btn-social.facebook"),
+      "does not show Facebook login button"
+    );
+
+    assert.ok(!exists("#new-account-password"), "does not show password field");
+
+    assert.ok(
+      exists("#new-account-email[disabled]"),
+      "email field is disabled"
+    );
+
+    assert.equal(
+      queryAll("#account-email-validation").text().trim(),
+      I18n.t("user.email.authenticated", { provider: "Facebook" })
+    );
+
+    assert.equal(
+      queryAll("#new-account-username").val(),
+      "foobar",
+      "username is prefilled"
+    );
+
+    assert.equal(
+      queryAll("#new-account-name").val(),
+      "barfoo",
+      "name is prefilled"
+    );
+  });
+});
+
+acceptance("Email Invite link with authentication data", function (needs) {
+  needs.settings({ enable_local_logins: false });
+
+  setAuthenticationData(needs.hooks, {
+    auth_provider: "facebook",
+    email: "blah@example.com",
+    email_valid: true,
+    username: "foobar",
+    name: "barfoo",
+  });
+
+  test("email invite link with authentication data when email does not match", async function (assert) {
+    preloadInvite();
+
+    await visit("/invites/myvalidinvitetoken");
+
+    assert.equal(
+      queryAll("#account-email-validation").text().trim(),
+      I18n.t("user.email.invite_auth_email_invalid", { provider: "Facebook" })
+    );
+
+    assert.ok(!exists("form"), "does not display the form");
+  });
+});
+
+acceptance(
+  "Email Invite link with valid authentication data",
+  function (needs) {
+    needs.settings({ enable_local_logins: false });
+
+    setAuthenticationData(needs.hooks, {
+      auth_provider: "facebook",
+      email: "foobar@example.com",
+      email_valid: true,
+      username: "foobar",
+      name: "barfoo",
+    });
+
+    test("confirm form and buttons", async function (assert) {
+      preloadInvite();
+
+      await visit("/invites/myvalidinvitetoken");
+
+      assert.ok(
+        !exists(".btn-social.facebook"),
+        "does not show Facebook login button"
+      );
+
+      assert.ok(
+        !exists("#new-account-password"),
+        "does not show password field"
+      );
+      assert.ok(!exists("#new-account-email"), "does not show email field");
+
+      assert.equal(
+        queryAll("#account-email-validation").text().trim(),
+        I18n.t("user.email.authenticated", { provider: "Facebook" })
+      );
+
+      assert.equal(
+        queryAll("#new-account-username").val(),
+        "foobar",
+        "username is prefilled"
+      );
+
+      assert.equal(
+        queryAll("#new-account-name").val(),
+        "barfoo",
+        "name is prefilled"
+      );
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js b/app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js
index 8bc3b810e8..814e727756 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js
@@ -1,7 +1,7 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { fillIn, click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import { click, fillIn, visit } from "@ember/test-helpers";
 import PreloadStore from "discourse/lib/preload-store";
+import { test } from "qunit";
 
 acceptance("Accept Invite - User Fields", function (needs) {
   needs.site({
@@ -59,7 +59,7 @@ acceptance("Accept Invite - User Fields", function (needs) {
       "submit is still disabled due to lack of user fields"
     );
 
-    await fillIn(".user-field input[type=text]:first", "Barky");
+    await fillIn(".user-field input[type=text]:nth-of-type(1)", "Barky");
 
     assert.ok(
       exists(".invites-show .btn-primary:disabled"),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/jump-to-test.js b/app/assets/javascripts/discourse/tests/acceptance/jump-to-test.js
index 5d72e2e2b7..3afb2a1bab 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/jump-to-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/jump-to-test.js
@@ -1,5 +1,5 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { click, fillIn, visit, currentURL } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
 acceptance("Jump to", function (needs) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js b/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js
index f9bdf7bd58..7228638e78 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js
@@ -1,6 +1,6 @@
-import { triggerKeyEvent, visit, currentURL } from "@ember/test-helpers";
-import { test } from "qunit";
+import { currentURL, triggerKeyEvent, visit } from "@ember/test-helpers";
 import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
 
 acceptance("Keyboard Shortcuts", function (needs) {
   needs.pretender((server, helper) => {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-redirect-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-redirect-test.js
index 6d3b26ff95..2731a37854 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-redirect-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-redirect-test.js
@@ -1,6 +1,6 @@
-import { visit, currentRouteName } from "@ember/test-helpers";
-import { test } from "qunit";
+import { currentRouteName, visit } from "@ember/test-helpers";
 import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
 
 acceptance("Login redirect - anonymous", function () {
   test("redirects login to default homepage", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-required-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-required-test.js
index 06d5106001..283ad78737 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-required-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-required-test.js
@@ -1,9 +1,9 @@
 import {
-  exists,
   acceptance,
+  exists,
   invisible,
 } from "discourse/tests/helpers/qunit-helpers";
-import { click, visit, currentRouteName } from "@ember/test-helpers";
+import { click, currentRouteName, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
 acceptance("Login Required", function (needs) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-hide-email-address-taken-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-hide-email-address-taken-test.js
index 4c05406c6c..fdb7114bf3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-hide-email-address-taken-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-hide-email-address-taken-test.js
@@ -1,7 +1,7 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import I18n from "I18n";
+import { test } from "qunit";
 
 acceptance("Login with email - hide email address taken", function (needs) {
   needs.settings({
@@ -19,7 +19,7 @@ acceptance("Login with email - hide email address taken", function (needs) {
     await visit("/");
     await click("header .login-button");
     await fillIn("#login-account-name", "someuser@example.com");
-    await click(".login-with-email-button");
+    await click("#email-login-link");
 
     assert.equal(
       queryAll(".alert-success").html().trim(),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-no-social-logins-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-no-social-logins-test.js
index 474db0e4fa..f92715e089 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-no-social-logins-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-no-social-logins-test.js
@@ -1,7 +1,7 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
@@ -15,7 +15,7 @@ acceptance("Login with email - no social logins", function (needs) {
     await visit("/");
     await click("header .login-button");
 
-    assert.ok(exists(".login-with-email-button"));
+    assert.ok(exists("#email-login-link"));
   });
 
   test("with login with email disabled", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-disabled-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-disabled-test.js
index 7a38f54f9d..bafce73460 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-disabled-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-disabled-test.js
@@ -1,4 +1,4 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
@@ -18,7 +18,7 @@ acceptance("Login with email disabled", function (needs) {
     );
 
     assert.notOk(
-      exists(".login-with-email-button"),
+      exists("#email-login-link"),
       "it displays the login with email button"
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js
index bca7b367e0..ad9edeeffa 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js
@@ -1,11 +1,11 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { fillIn, click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
+import { click, fillIn, visit } from "@ember/test-helpers";
 import I18n from "I18n";
+import { test } from "qunit";
 
 acceptance("Login with email", function (needs) {
   needs.settings({
@@ -30,12 +30,12 @@ acceptance("Login with email", function (needs) {
     );
 
     assert.ok(
-      exists(".login-with-email-button"),
+      exists("#email-login-link"),
       "it displays the login with email button"
     );
 
     await fillIn("#login-account-name", "someuser");
-    await click(".login-with-email-button");
+    await click("#email-login-link");
 
     assert.equal(
       queryAll(".alert-error").html(),
@@ -46,7 +46,7 @@ acceptance("Login with email", function (needs) {
     );
 
     await fillIn("#login-account-name", "someuser@gmail.com");
-    await click(".login-with-email-button");
+    await click("#email-login-link");
 
     assert.equal(
       queryAll(".alert-error").html(),
@@ -60,7 +60,7 @@ acceptance("Login with email", function (needs) {
 
     userFound = true;
 
-    await click(".login-with-email-button");
+    await click("#email-login-link");
 
     assert.equal(
       queryAll(".alert-success").html().trim(),
@@ -71,7 +71,7 @@ acceptance("Login with email", function (needs) {
     await visit("/");
     await click("header .login-button");
     await fillIn("#login-account-name", "someuser@gmail.com");
-    await click(".login-with-email-button");
+    await click("#email-login-link");
 
     assert.equal(
       queryAll(".alert-success").html().trim(),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/mobile-discovery-test.js b/app/assets/javascripts/discourse/tests/acceptance/mobile-discovery-test.js
index 106a1fb2e6..700554d1d3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/mobile-discovery-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/mobile-discovery-test.js
@@ -1,6 +1,6 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Topic Discovery - Mobile", function (needs) {
   needs.mobileView();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/mobile-sign-in-test.js b/app/assets/javascripts/discourse/tests/acceptance/mobile-sign-in-test.js
index 8a6449de51..3b84b022b0 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/mobile-sign-in-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/mobile-sign-in-test.js
@@ -1,4 +1,4 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js b/app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js
index 903a89d09b..bd888676fd 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js
@@ -1,6 +1,6 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("User Directory - Mobile", function (needs) {
   needs.mobileView();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/modal-test.js
index 6864a68c89..f4ca0364a2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/modal-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/modal-test.js
@@ -1,14 +1,14 @@
-import { click, triggerKeyEvent, visit } from "@ember/test-helpers";
-import { skip, test } from "qunit";
-import I18n from "I18n";
-import { run } from "@ember/runloop";
 import {
   acceptance,
   controllerFor,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import showModal from "discourse/lib/show-modal";
+import { click, triggerKeyEvent, visit } from "@ember/test-helpers";
+import { skip, test } from "qunit";
+import I18n from "I18n";
 import hbs from "htmlbars-inline-precompile";
+import { run } from "@ember/runloop";
+import showModal from "discourse/lib/show-modal";
 
 acceptance("Modal", function (needs) {
   let _translations;
@@ -139,7 +139,7 @@ acceptance("Modal Keyboard Events", function (needs) {
     await visit("/t/internationalization-localization/280");
 
     await click(".toggle-admin-menu");
-    await click(".topic-admin-status-update button");
+    await click(".admin-topic-timer-update button");
     await triggerKeyEvent(".d-modal", "keyup", 13);
 
     assert.ok(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/new-message-test.js b/app/assets/javascripts/discourse/tests/acceptance/new-message-test.js
index adef980eb0..b5ef162d4f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/new-message-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/new-message-test.js
@@ -1,10 +1,10 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("New Message - Anonymous", function () {
   test("accessing new-message route when logged out", async function (assert) {
@@ -36,7 +36,9 @@ acceptance("New Message - Authenticated", function (needs) {
       "it pre-fills message body"
     );
     assert.equal(
-      queryAll(".users-input .item:nth-of-type(1)").text().trim(),
+      queryAll("#private-message-users .selected-name:nth-of-type(1)")
+        .text()
+        .trim(),
       "charlie",
       "it selects correct username"
     );
diff --git a/app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js
index 34292f54ad..1d5a9bdbf6 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js
@@ -1,11 +1,11 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("New Topic - Anonymous", function () {
   test("accessing new-topic route when logged out", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/notifications-filter-test.js b/app/assets/javascripts/discourse/tests/acceptance/notifications-filter-test.js
index 7bceb89507..14ccee5afc 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/notifications-filter-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/notifications-filter-test.js
@@ -1,7 +1,7 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Notifications filter", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/opengraph-tag-updater-test.js b/app/assets/javascripts/discourse/tests/acceptance/opengraph-tag-updater-test.js
new file mode 100644
index 0000000000..ab3a72e1e9
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/opengraph-tag-updater-test.js
@@ -0,0 +1,32 @@
+import { click, visit } from "@ember/test-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+
+acceptance("Opengraph Tag Updater", function (needs) {
+  needs.pretender((server, helper) => {
+    server.get("/about", () => {
+      return helper.response({});
+    });
+  });
+
+  test("updates OG title and URL", async function (assert) {
+    await visit("/");
+    await click("#toggle-hamburger-menu");
+    await click("a.about-link");
+
+    assert.equal(
+      document
+        .querySelector("meta[property='og:title']")
+        .getAttribute("content"),
+      document.title,
+      "it should update OG title"
+    );
+    assert.ok(
+      document
+        .querySelector("meta[property='og:url']")
+        .getAttribute("content")
+        .endsWith("/about"),
+      "it should update OG URL"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/page-publishing-test.js b/app/assets/javascripts/discourse/tests/acceptance/page-publishing-test.js
index 11d8e71e1e..cc77008f4f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/page-publishing-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/page-publishing-test.js
@@ -1,4 +1,4 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/password-reset-test.js b/app/assets/javascripts/discourse/tests/acceptance/password-reset-test.js
index 331900f93b..9ddee1bee9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/password-reset-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/password-reset-test.js
@@ -1,15 +1,15 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit, click, fillIn } from "@ember/test-helpers";
-import { test } from "qunit";
+import { click, fillIn, visit } from "@ember/test-helpers";
+import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import PreloadStore from "discourse/lib/preload-store";
 import { parsePostData } from "discourse/tests/helpers/create-pretender";
-import DiscourseURL from "discourse/lib/url";
 import sinon from "sinon";
+import { test } from "qunit";
 
 acceptance("Password Reset", function (needs) {
   needs.pretender((server, helper) => {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js b/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js
index 875c316ba1..1558b244ee 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js
@@ -1,11 +1,11 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import I18n from "I18n";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Personal Message", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js
index ba4bc64e52..b2831ec7d0 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js
@@ -1,17 +1,17 @@
 import { triggerKeyEvent, visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { withPluginApi } from "discourse/lib/plugin-api";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
-import KeyboardShortcutInitializer from "discourse/initializers/keyboard-shortcuts";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import sinon from "sinon";
+import { test } from "qunit";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 acceptance("Plugin Keyboard Shortcuts - Logged In", function (needs) {
   needs.user();
-  needs.hooks.beforeEach(function () {
-    KeyboardShortcutInitializer.initialize(this.container);
-  });
+
   test("a plugin can add a keyboard shortcut", async function (assert) {
+    // Initialize the app (required in the legacy testing env)
+    await visit("/");
+
     withPluginApi("0.8.38", (api) => {
       api.addKeyboardShortcut("]", () => {
         $("#qunit-fixture").html(
@@ -30,11 +30,11 @@ acceptance("Plugin Keyboard Shortcuts - Logged In", function (needs) {
   });
 });
 
-acceptance("Plugin Keyboard Shortcuts - Anonymous", function (needs) {
-  needs.hooks.beforeEach(function () {
-    KeyboardShortcutInitializer.initialize(this.container);
-  });
+acceptance("Plugin Keyboard Shortcuts - Anonymous", function () {
   test("a plugin can add a keyboard shortcut with an option", async function (assert) {
+    // Initialize the app (required in the legacy testing env)
+    await visit("/");
+
     let spy = sinon.spy(KeyboardShortcuts, "_bindToPath");
     withPluginApi("0.8.38", (api) => {
       api.addKeyboardShortcut("]", () => {}, {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
index 35ff37a03a..c7028c7acb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
@@ -1,9 +1,9 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit, click } from "@ember/test-helpers";
-import { test } from "qunit";
-import { extraConnectorClass } from "discourse/lib/plugin-connectors";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
 import { action } from "@ember/object";
+import { extraConnectorClass } from "discourse/lib/plugin-connectors";
 import hbs from "htmlbars-inline-precompile";
+import { test } from "qunit";
 
 const PREFIX = "javascripts/single-test/connectors";
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js
index 4ebef80da5..99f0e800c8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js
@@ -1,12 +1,12 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import { withPluginApi } from "discourse/lib/plugin-api";
 import hbs from "htmlbars-inline-precompile";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 const PREFIX = "javascripts/single-test/connectors";
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js
index 77d19c53f9..640916bfee 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js
@@ -1,8 +1,8 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { clearCache } from "discourse/lib/plugin-connectors";
 import hbs from "htmlbars-inline-precompile";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 const HELLO = "javascripts/multi-test/connectors/user-profile-primary/hello";
 const GOODBYE =
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js
index c6d92a5f06..edd4504072 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js
@@ -1,7 +1,7 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 const CONNECTOR =
   "javascripts/single-test/connectors/user-profile-primary/hello";
diff --git a/app/assets/javascripts/discourse/tests/acceptance/post-admin-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/post-admin-menu-test.js
index 2b0817fb9b..e69edbb5ad 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/post-admin-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/post-admin-menu-test.js
@@ -1,5 +1,5 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit, click } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
 acceptance("Post - Admin Menu - Anonymous", function () {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js b/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
index 5b3cc7cb4e..a4ee8a6d23 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
@@ -1,20 +1,20 @@
-import {
-  visit,
-  currentURL,
-  currentRouteName,
-  click,
-  fillIn,
-} from "@ember/test-helpers";
-import { test } from "qunit";
-import I18n from "I18n";
 import {
   acceptance,
-  updateCurrentUser,
-  queryAll,
   exists,
+  queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
+import {
+  click,
+  currentRouteName,
+  currentURL,
+  fillIn,
+  visit,
+} from "@ember/test-helpers";
+import I18n from "I18n";
 import User from "discourse/models/user";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 function preferencesPretender(server, helper) {
   server.post("/u/second_factors.json", () => {
@@ -95,18 +95,18 @@ acceptance("User Preferences", function (needs) {
       queryAll(".saved").remove();
     };
 
-    fillIn(".pref-name input[type=text]", "Jon Snow");
+    await fillIn(".pref-name input[type=text]", "Jon Snow");
     await savePreferences();
 
-    click(".preferences-nav .nav-profile a");
-    fillIn("#edit-location", "Westeros");
+    await click(".preferences-nav .nav-profile a");
+    await fillIn("#edit-location", "Westeros");
     await savePreferences();
 
-    click(".preferences-nav .nav-emails a");
-    click(".pref-activity-summary input[type=checkbox]");
+    await click(".preferences-nav .nav-emails a");
+    await click(".pref-activity-summary input[type=checkbox]");
     await savePreferences();
 
-    click(".preferences-nav .nav-notifications a");
+    await click(".preferences-nav .nav-notifications a");
     await selectKit(
       ".control-group.notifications .combo-box.duration"
     ).expand();
@@ -115,8 +115,8 @@ acceptance("User Preferences", function (needs) {
     ).selectRowByValue(1440);
     await savePreferences();
 
-    click(".preferences-nav .nav-categories a");
-    fillIn(".tracking-controls .category-selector", "faq");
+    await click(".preferences-nav .nav-categories a");
+    await fillIn(".tracking-controls .category-selector input", "faq");
     await savePreferences();
 
     assert.ok(
@@ -124,9 +124,9 @@ acceptance("User Preferences", function (needs) {
       "tags tab isn't there when tags are disabled"
     );
 
-    click(".preferences-nav .nav-interface a");
-    click(".control-group.other input[type=checkbox]:first");
-    savePreferences();
+    await click(".preferences-nav .nav-interface a");
+    await click(".control-group.other input[type=checkbox]:nth-of-type(1)");
+    await savePreferences();
 
     assert.ok(
       !exists(".preferences-nav .nav-apps a"),
@@ -175,15 +175,19 @@ acceptance("User Preferences", function (needs) {
       "it has the connected accounts section"
     );
     assert.ok(
-      queryAll(".pref-associated-accounts table tr:first td:first")
+      queryAll(
+        ".pref-associated-accounts table tr:nth-of-type(1) td:nth-of-type(1)"
+      )
         .html()
         .indexOf("Facebook") > -1,
       "it lists facebook"
     );
 
-    await click(".pref-associated-accounts table tr:first td:last button");
+    await click(
+      ".pref-associated-accounts table tr:nth-of-type(1) td:last-child button"
+    );
 
-    queryAll(".pref-associated-accounts table tr:first td:last button")
+    queryAll(".pref-associated-accounts table tr:nth-of-type(1) td:last button")
       .html()
       .indexOf("Connect") > -1;
   });
@@ -286,28 +290,29 @@ acceptance("Second Factor Backups", function (needs) {
   });
 });
 
-acceptance("Avatar selector when selectable avatars is enabled", function (
-  needs
-) {
-  needs.user();
-  needs.settings({ selectable_avatars_enabled: true });
-  needs.pretender((server, helper) => {
-    server.get("/site/selectable-avatars.json", () =>
-      helper.response([
-        "https://www.discourse.org",
-        "https://meta.discourse.org",
-      ])
-    );
-  });
+acceptance(
+  "Avatar selector when selectable avatars is enabled",
+  function (needs) {
+    needs.user();
+    needs.settings({ selectable_avatars_enabled: true });
+    needs.pretender((server, helper) => {
+      server.get("/site/selectable-avatars.json", () =>
+        helper.response([
+          "https://www.discourse.org",
+          "https://meta.discourse.org",
+        ])
+      );
+    });
 
-  test("selectable avatars", async function (assert) {
-    await visit("/u/eviltrout/preferences");
-    await click(".pref-avatar .btn");
-    assert.ok(
-      exists(".selectable-avatars", "opens the avatar selection modal")
-    );
-  });
-});
+    test("selectable avatars", async function (assert) {
+      await visit("/u/eviltrout/preferences");
+      await click(".pref-avatar .btn");
+      assert.ok(
+        exists(".selectable-avatars", "opens the avatar selection modal")
+      );
+    });
+  }
+);
 
 acceptance("User Preferences when badges are disabled", function (needs) {
   needs.user();
@@ -324,47 +329,6 @@ acceptance("User Preferences when badges are disabled", function (needs) {
     );
     assert.ok(exists(".user-preferences"), "it shows the preferences");
   });
-
-  test("recently connected devices", async function (assert) {
-    await visit("/u/eviltrout/preferences");
-
-    assert.equal(
-      queryAll(".auth-tokens > .auth-token:first .auth-token-device")
-        .text()
-        .trim(),
-      "Linux Computer",
-      "it should display active token first"
-    );
-
-    assert.equal(
-      queryAll(".pref-auth-tokens > a:first").text().trim(),
-      I18n.t("user.auth_tokens.show_all", { count: 3 }),
-      "it should display two tokens"
-    );
-    assert.ok(
-      queryAll(".pref-auth-tokens .auth-token").length === 2,
-      "it should display two tokens"
-    );
-
-    await click(".pref-auth-tokens > a:first");
-
-    assert.ok(
-      queryAll(".pref-auth-tokens .auth-token").length === 3,
-      "it should display three tokens"
-    );
-
-    await click(".auth-token-dropdown:first button");
-    await click("li[data-value='notYou']");
-
-    assert.ok(queryAll(".d-modal:visible").length === 1, "modal should appear");
-
-    await click(".modal-footer .btn-primary");
-
-    assert.ok(
-      queryAll(".pref-password.highlighted").length === 1,
-      "it should highlight password preferences"
-    );
-  });
 });
 
 acceptance(
@@ -392,7 +356,9 @@ acceptance(
         "clear button not present"
       );
 
-      const selectTopicBtn = queryAll(".feature-topic-on-profile-btn:first");
+      const selectTopicBtn = queryAll(
+        ".feature-topic-on-profile-btn:nth-of-type(1)"
+      )[0];
       assert.ok(exists(selectTopicBtn), "feature topic button is present");
 
       await click(selectTopicBtn);
@@ -402,7 +368,9 @@ acceptance(
         "topic picker modal is open"
       );
 
-      const topicRadioBtn = queryAll('input[name="choose_topic_id"]:first');
+      const topicRadioBtn = queryAll(
+        'input[name="choose_topic_id"]:nth-of-type(1)'
+      )[0];
       assert.ok(exists(topicRadioBtn), "Topic options are prefilled");
       await click(topicRadioBtn);
 
@@ -479,3 +447,76 @@ acceptance(
     });
   }
 );
+
+acceptance("Ignored users", function (needs) {
+  needs.user();
+  needs.settings({ min_trust_level_to_allow_ignore: 1 });
+
+  test("when trust level < min level to ignore", async function (assert) {
+    await visit(`/u/eviltrout/preferences/users`);
+    await updateCurrentUser({ trust_level: 0, moderator: false, admin: false });
+
+    assert.ok(
+      !exists(".user-ignore"),
+      "it does not show the list of ignored users"
+    );
+  });
+
+  test("when trust level >= min level to ignore", async function (assert) {
+    await visit(`/u/eviltrout/preferences/users`);
+    await updateCurrentUser({ trust_level: 1 });
+    assert.ok(exists(".user-ignore"), "it shows the list of ignored users");
+  });
+
+  test("staff can always see ignored users", async function (assert) {
+    await visit(`/u/eviltrout/preferences/users`);
+    await updateCurrentUser({ moderator: true });
+    assert.ok(exists(".user-ignore"), "it shows the list of ignored users");
+  });
+});
+
+acceptance("Security", function (needs) {
+  needs.user();
+  needs.pretender(preferencesPretender);
+
+  test("recently connected devices", async function (assert) {
+    await visit("/u/eviltrout/preferences/security");
+
+    assert.equal(
+      queryAll(".auth-tokens > .auth-token:nth-of-type(1) .auth-token-device")
+        .text()
+        .trim(),
+      "Linux Computer",
+      "it should display active token first"
+    );
+
+    assert.equal(
+      queryAll(".pref-auth-tokens > a:nth-of-type(1)").text().trim(),
+      I18n.t("user.auth_tokens.show_all", { count: 3 }),
+      "it should display two tokens"
+    );
+    assert.ok(
+      queryAll(".pref-auth-tokens .auth-token").length === 2,
+      "it should display two tokens"
+    );
+
+    await click(".pref-auth-tokens > a:nth-of-type(1)");
+
+    assert.ok(
+      queryAll(".pref-auth-tokens .auth-token").length === 3,
+      "it should display three tokens"
+    );
+
+    await click(".auth-token-dropdown button:nth-of-type(1)");
+    await click("li[data-value='notYou']");
+
+    assert.ok(queryAll(".d-modal:visible").length === 1, "modal should appear");
+
+    await click(".modal-footer .btn-primary");
+
+    assert.ok(
+      queryAll(".pref-password.highlighted").length === 1,
+      "it should highlight password preferences"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js b/app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js
index f8337a3f21..24d8055fb7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js
@@ -1,11 +1,11 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import compile from "handlebars-compiler";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import {
   addRawTemplate,
   removeRawTemplate,
 } from "discourse-common/lib/raw-templates";
+import { compile } from "handlebars";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 const CONNECTOR =
   "javascripts/raw-test/connectors/topic-list-before-status/lala";
diff --git a/app/assets/javascripts/discourse/tests/acceptance/redirect-to-top-test.js b/app/assets/javascripts/discourse/tests/acceptance/redirect-to-top-test.js
index f698cfe2f4..542e31b22a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/redirect-to-top-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/redirect-to-top-test.js
@@ -1,10 +1,10 @@
-import { visit, currentRouteName } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import { currentRouteName, visit } from "@ember/test-helpers";
 import DiscoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";
+import { test } from "qunit";
 
 acceptance("Redirect to Top", function (needs) {
   needs.pretender((server, helper) => {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/reports-test.js b/app/assets/javascripts/discourse/tests/acceptance/reports-test.js
index f09734ee4e..14928dafe2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/reports-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/reports-test.js
@@ -1,6 +1,6 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Reports", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/review-test.js b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
index 4ec8ebb675..ad7041a207 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/review-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
@@ -1,7 +1,8 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit, click, fillIn } from "@ember/test-helpers";
-import { test } from "qunit";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { click, fillIn, visit } from "@ember/test-helpers";
+import I18n from "I18n";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("Review", function (needs) {
   needs.user();
@@ -35,6 +36,33 @@ acceptance("Review", function (needs) {
     );
   });
 
+  test("Reject user", async function (assert) {
+    await visit("/review");
+    await click(
+      `${user} .reviewable-actions button[data-name="Delete User..."]`
+    );
+    await click(`${user} li[data-value="reject_user_delete"]`);
+    assert.ok(
+      queryAll(".reject-reason-reviewable-modal:visible .title")
+        .html()
+        .includes(I18n.t("review.reject_reason.title")),
+      "it opens reject reason modal when user is rejected"
+    );
+
+    await click(".modal-footer button[aria-label='cancel']");
+
+    await click(
+      `${user} .reviewable-actions button[data-name="Delete User..."]`
+    );
+    await click(`${user} li[data-value="reject_user_block"]`);
+    assert.ok(
+      queryAll(".reject-reason-reviewable-modal:visible .title")
+        .html()
+        .includes(I18n.t("review.reject_reason.title")),
+      "it opens reject reason modal when user is rejected and blocked"
+    );
+  });
+
   test("Settings", async function (assert) {
     await visit("/review/settings");
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
index f22827afa8..48f0d1f9ed 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
@@ -1,14 +1,14 @@
-import { triggerKeyEvent, visit, fillIn, click } from "@ember/test-helpers";
+import {
+  acceptance,
+  exists,
+  queryAll,
+  selectDate,
+  visible,
+  waitFor,
+} from "discourse/tests/helpers/qunit-helpers";
+import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
 import { skip, test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import {
-  selectDate,
-  acceptance,
-  waitFor,
-  visible,
-  queryAll,
-  exists,
-} from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Search - Full Page", function (needs) {
   needs.user();
@@ -105,12 +105,26 @@ acceptance("Search - Full Page", function (needs) {
     assert.ok(queryAll(".fps-topic").length === 0, "has no results");
     assert.ok(queryAll(".no-results-suggestion .google-search-form"));
 
-    await fillIn(".search-query", "posts");
+    await fillIn(".search-query", "discourse");
     await click(".search-cta");
 
     assert.ok(queryAll(".fps-topic").length === 1, "has one post");
   });
 
+  test("search for personal messages", async function (assert) {
+    await visit("/search");
+
+    await fillIn(".search-query", "discourse in:personal");
+    await click(".search-cta");
+
+    assert.ok(queryAll(".fps-topic").length === 1, "has one post");
+
+    assert.ok(
+      queryAll(".topic-status .personal_message").length === 1,
+      "shows the right icon"
+    );
+  });
+
   test("escape search term", async function (assert) {
     await visit("/search");
     await fillIn(".search-query", "@<script>prompt(1337)</script>gmail.com");
@@ -146,7 +160,9 @@ acceptance("Search - Full Page", function (needs) {
         '"autocomplete" popup has an entry for "admin"'
       );
 
-      await click(".search-advanced-options .autocomplete ul li a:first");
+      await click(
+        ".search-advanced-options .autocomplete ul li a:nth-of-type(1)"
+      );
 
       assert.ok(
         exists('.search-advanced-options span:contains("admin")'),
@@ -294,7 +310,7 @@ acceptance("Search - Full Page", function (needs) {
 
   test("update status through advanced search ui", async function (assert) {
     const statusSelector = selectKit(
-      ".search-advanced-options .select-kit#status"
+      ".search-advanced-options .select-kit#search-status-options"
     );
 
     await visit("/search");
@@ -317,7 +333,7 @@ acceptance("Search - Full Page", function (needs) {
 
   test("doesn't update status filter header if wrong value entered through searchbox", async function (assert) {
     const statusSelector = selectKit(
-      ".search-advanced-options .select-kit#status"
+      ".search-advanced-options .select-kit#search-status-options"
     );
 
     await visit("/search");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-mobile-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-mobile-test.js
index bad0576f3c..0f302c2ca9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-mobile-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-mobile-test.js
@@ -1,7 +1,7 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
@@ -28,7 +28,7 @@ acceptance("Search - Mobile", function (needs) {
       "it should expand advanced search filters"
     );
 
-    await fillIn(".search-query", "posts");
+    await fillIn(".search-query", "discourse");
     await click(".search-cta");
 
     assert.ok(queryAll(".fps-topic").length === 1, "has one post");
@@ -42,7 +42,7 @@ acceptance("Search - Mobile", function (needs) {
 
     assert.equal(
       queryAll("input.full-page-search").val(),
-      "posts",
+      "discourse",
       "it does not reset input when hitting search icon again"
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
index d7b7b82077..00bd5bc22d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
@@ -1,12 +1,12 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { click, triggerKeyEvent, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
 import searchFixtures from "discourse/tests/fixtures/search-fixtures";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("Search - Anonymous", function (needs) {
   let calledEmpty = false;
diff --git a/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-desktop-test.js b/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-desktop-test.js
deleted file mode 100644
index 1030da6231..0000000000
--- a/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-desktop-test.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import {
-  queryAll,
-  exists,
-  acceptance,
-} from "discourse/tests/helpers/qunit-helpers";
-import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
-
-acceptance("Share and Invite modal - desktop", function (needs) {
-  needs.user();
-
-  test("Topic footer button", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-
-    assert.ok(
-      exists("#topic-footer-button-share-and-invite"),
-      "the button exists"
-    );
-
-    await click("#topic-footer-button-share-and-invite");
-
-    assert.ok(exists(".share-and-invite.modal"), "it shows the modal");
-
-    assert.ok(
-      exists(".share-and-invite.modal .modal-tab.share"),
-      "it shows the share tab"
-    );
-
-    assert.ok(
-      exists(".share-and-invite.modal .modal-tab.share.is-active"),
-      "it activates the share tab by default"
-    );
-
-    assert.ok(
-      exists(".share-and-invite.modal .modal-tab.invite"),
-      "it shows the invite tab"
-    );
-
-    assert.equal(
-      queryAll(".share-and-invite.modal .modal-panel.share .title").text(),
-      "Topic: Internationalization / localization",
-      "it shows the topic title"
-    );
-
-    assert.ok(
-      queryAll(".share-and-invite.modal .modal-panel.share .topic-share-url")
-        .val()
-        .includes("/t/internationalization-localization/280?u=eviltrout"),
-      "it shows the topic sharing url"
-    );
-
-    assert.ok(
-      queryAll(".share-and-invite.modal .social-link").length > 1,
-      "it shows social sources"
-    );
-
-    await click(".share-and-invite.modal .modal-tab.invite");
-
-    assert.ok(
-      exists(
-        ".share-and-invite.modal .modal-panel.invite .send-invite:disabled"
-      ),
-      "send invite button is disabled"
-    );
-
-    assert.ok(
-      exists(
-        ".share-and-invite.modal .modal-panel.invite .generate-invite-link:disabled"
-      ),
-      "generate invite button is disabled"
-    );
-  });
-
-  test("Post date link", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await click("#post_2 .post-info.post-date a");
-
-    assert.ok(exists("#share-link"), "it shows the share modal");
-  });
-});
-
-acceptance("Share url with badges disabled - desktop", function (needs) {
-  needs.user();
-  needs.settings({ enable_badges: false });
-  test("topic footer button - badges disabled - desktop", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await click("#topic-footer-button-share-and-invite");
-
-    assert.notOk(
-      queryAll(".share-and-invite.modal .modal-panel.share .topic-share-url")
-        .val()
-        .includes("?u=eviltrout"),
-      "it doesn't add the username param when badges are disabled"
-    );
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-mobile-test.js b/app/assets/javascripts/discourse/tests/acceptance/share-topic-test.js
similarity index 52%
rename from app/assets/javascripts/discourse/tests/acceptance/share-and-invite-mobile-test.js
rename to app/assets/javascripts/discourse/tests/acceptance/share-topic-test.js
index ee21e0e23f..ed50a785c4 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-mobile-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/share-topic-test.js
@@ -1,11 +1,54 @@
-import {
-  queryAll,
-  exists,
-  acceptance,
-} from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
+import {
+  acceptance,
+  exists,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
+
+acceptance("Share and Invite modal", function (needs) {
+  needs.user();
+
+  test("Topic footer button", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    assert.ok(
+      exists("#topic-footer-button-share-and-invite"),
+      "the button exists"
+    );
+
+    await click("#topic-footer-button-share-and-invite");
+
+    assert.ok(exists(".share-topic-modal"), "it shows the modal");
+
+    assert.ok(
+      queryAll("input.invite-link")
+        .val()
+        .includes("/t/internationalization-localization/280?u=eviltrout"),
+      "it shows the topic sharing url"
+    );
+
+    assert.ok(queryAll(".social-link").length > 1, "it shows social sources");
+
+    assert.ok(
+      exists(".btn-primary[aria-label='Notify']"),
+      "it shows the notify button"
+    );
+
+    assert.ok(
+      exists(".btn-primary[aria-label='Invite']"),
+      "it shows the invite button"
+    );
+  });
+
+  test("Post date link", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click("#post_2 .post-info.post-date a");
+
+    assert.ok(exists("#share-link"), "it shows the share modal");
+  });
+});
 
 acceptance("Share and Invite modal - mobile", function (needs) {
   needs.user();
@@ -23,67 +66,19 @@ acceptance("Share and Invite modal - mobile", function (needs) {
     await subject.expand();
     await subject.selectRowByValue("share-and-invite");
 
-    assert.ok(exists(".share-and-invite.modal"), "it shows the modal");
-
-    assert.ok(
-      exists(".share-and-invite.modal .modal-tab.share"),
-      "it shows the share tab"
-    );
-
-    assert.ok(
-      exists(".share-and-invite.modal .modal-tab.share.is-active"),
-      "it activates the share tab by default"
-    );
-
-    assert.ok(
-      exists(".share-and-invite.modal .modal-tab.invite"),
-      "it shows the invite tab"
-    );
-
-    assert.equal(
-      queryAll(".share-and-invite.modal .modal-panel.share .title").text(),
-      "Topic: Internationalization / localization",
-      "it shows the topic title"
-    );
-
-    assert.ok(
-      queryAll(".share-and-invite.modal .modal-panel.share .topic-share-url")
-        .val()
-        .includes("/t/internationalization-localization/280?u=eviltrout"),
-      "it shows the topic sharing url"
-    );
-
-    assert.ok(
-      queryAll(".share-and-invite.modal .social-link").length > 1,
-      "it shows social sources"
-    );
-  });
-
-  test("Post date link", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await click("#post_2 .post-info.post-date a");
-
-    assert.ok(exists("#share-link"), "it shows the share modal");
+    assert.ok(exists(".share-topic-modal"), "it shows the modal");
   });
 });
 
-acceptance("Share url with badges disabled - mobile", function (needs) {
+acceptance("Share url with badges disabled - desktop", function (needs) {
   needs.user();
-  needs.mobileView();
-  needs.settings({
-    enable_badges: false,
-  });
-  test("topic footer button - badges disabled - mobile", async function (assert) {
+  needs.settings({ enable_badges: false });
+  test("topic footer button - badges disabled - desktop", async function (assert) {
     await visit("/t/internationalization-localization/280");
-
-    const subject = selectKit(".topic-footer-mobile-dropdown");
-    await subject.expand();
-    await subject.selectRowByValue("share-and-invite");
+    await click("#topic-footer-button-share-and-invite");
 
     assert.notOk(
-      queryAll(".share-and-invite.modal .modal-panel.share .topic-share-url")
-        .val()
-        .includes("?u=eviltrout"),
+      queryAll("input.invite-link").val().includes("?u=eviltrout"),
       "it doesn't add the username param when badges are disabled"
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/shared-drafts-test.js b/app/assets/javascripts/discourse/tests/acceptance/shared-drafts-test.js
index a69f3bec8e..493d361eb5 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/shared-drafts-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/shared-drafts-test.js
@@ -1,10 +1,10 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("Shared Drafts", function () {
-  test("Viewing", async function (assert) {
+  test("Viewing and publishing", async function (assert) {
     await visit("/t/some-topic/9");
     assert.ok(queryAll(".shared-draft-controls").length === 1);
     let categoryChooser = selectKit(".shared-draft-controls .category-chooser");
@@ -15,4 +15,20 @@ acceptance("Shared Drafts", function () {
 
     assert.ok(queryAll(".shared-draft-controls").length === 0);
   });
+
+  test("Updating category", async function (assert) {
+    await visit("/t/some-topic/9");
+    assert.ok(queryAll(".shared-draft-controls").length === 1);
+
+    await click(".edit-topic");
+
+    let categoryChooser = selectKit(".edit-topic-title .category-chooser");
+    await categoryChooser.expand();
+    await categoryChooser.selectRowByValue(7);
+
+    await click(".edit-controls .btn-primary");
+
+    categoryChooser = selectKit(".shared-draft-controls .category-chooser");
+    assert.equal(categoryChooser.header().value(), "7");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sign-in-test.js b/app/assets/javascripts/discourse/tests/acceptance/sign-in-test.js
index ed467e7eef..9b6136663a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sign-in-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sign-in-test.js
@@ -1,7 +1,7 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { skip, test } from "qunit";
@@ -154,10 +154,6 @@ acceptance("Signing In", function () {
       "the username validation is bad"
     );
     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(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/static-test.js b/app/assets/javascripts/discourse/tests/acceptance/static-test.js
index d955e08fe3..55fa797140 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/static-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/static-test.js
@@ -1,6 +1,6 @@
-import { visit, currentRouteName } from "@ember/test-helpers";
-import { test } from "qunit";
 import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import { currentRouteName, visit } from "@ember/test-helpers";
+import { test } from "qunit";
 
 acceptance("Static", function () {
   test("Static Pages", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/tag-groups-test.js b/app/assets/javascripts/discourse/tests/acceptance/tag-groups-test.js
index 03131de6ce..27c30938fc 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/tag-groups-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/tag-groups-test.js
@@ -1,7 +1,11 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import {
+  acceptance,
+  exists,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("Tag Groups", function (needs) {
   needs.user();
@@ -46,7 +50,7 @@ acceptance("Tag Groups", function (needs) {
 
     await click(".tag-group-content .btn.btn-default");
 
-    await click(".tag-chooser .choice:first");
+    await click(".tag-chooser .choice:nth-of-type(1)");
     assert.ok(!queryAll(".tag-group-content .btn.btn-danger")[0].disabled);
   });
 
@@ -62,8 +66,6 @@ acceptance("Tag Groups", function (needs) {
     await tags.selectRowByValue("monkey");
 
     await click("#visible-permission");
-    assert.ok(queryAll(".tag-group-content .btn.btn-default:disabled").length);
-
     await groups.expand();
     await groups.selectRowByIndex(1);
     await groups.selectRowByIndex(0);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/tags-intersection-test.js b/app/assets/javascripts/discourse/tests/acceptance/tags-intersection-test.js
index f05a989c63..fe9be3e372 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/tags-intersection-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/tags-intersection-test.js
@@ -1,4 +1,4 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
@@ -36,7 +36,7 @@ acceptance("Tags intersection", function (needs) {
 
     assert.ok(exists(".mini-tag-chooser"), "The tag selector appears");
     assert.equal(
-      $(".mini-tag-chooser").text().trim(),
+      $(".composer-fields .mini-tag-chooser").text().trim(),
       "first, second",
       "populates the tags when clicking 'New topic'"
     );
diff --git a/app/assets/javascripts/discourse/tests/acceptance/tags-test.js b/app/assets/javascripts/discourse/tests/acceptance/tags-test.js
index 663aedc781..8fece74151 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/tags-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/tags-test.js
@@ -1,15 +1,106 @@
-import { click, visit, currentURL } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
-  updateCurrentUser,
   acceptance,
-  queryAll,
   exists,
+  invisible,
+  queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import { click, currentURL, visit } from "@ember/test-helpers";
+import { test } from "qunit";
 
 acceptance("Tags", function (needs) {
   needs.user();
 
+  needs.pretender((server, helper) => {
+    server.get("/tag/test/notifications", () =>
+      helper.response({
+        tag_notification: { id: "test", notification_level: 2 },
+      })
+    );
+
+    server.get("/tag/test/l/unread.json", () =>
+      helper.response({
+        users: [
+          {
+            id: 42,
+            username: "foo",
+            name: "Foo",
+            avatar_template: "/user_avatar/localhost/foo/{size}/10265_2.png",
+          },
+        ],
+        primary_groups: [],
+        topic_list: {
+          can_create_topic: true,
+          draft: null,
+          draft_key: "new_topic",
+          per_page: 30,
+          top_tags: [],
+          tags: [{ id: 42, name: "test", topic_count: 1, staff: false }],
+          topics: [
+            {
+              id: 42,
+              title: "Hello world",
+              fancy_title: "Hello world",
+              slug: "hello-world",
+              posts_count: 1,
+              reply_count: 1,
+              highest_post_number: 1,
+              created_at: "2020-01-01T00:00:00.000Z",
+              last_posted_at: "2020-01-01T00:00:00.000Z",
+              bumped: true,
+              bumped_at: "2020-01-01T00:00:00.000Z",
+              archetype: "regular",
+              unseen: false,
+              last_read_post_number: 1,
+              unread: 0,
+              new_posts: 1,
+              pinned: false,
+              unpinned: null,
+              visible: true,
+              closed: true,
+              archived: false,
+              notification_level: 3,
+              bookmarked: false,
+              liked: true,
+              tags: ["test"],
+              views: 42,
+              like_count: 42,
+              has_summary: false,
+              last_poster_username: "foo",
+              pinned_globally: false,
+              featured_link: null,
+              posters: [],
+            },
+          ],
+        },
+      })
+    );
+
+    server.put("/topics/bulk", () => helper.response({}));
+
+    server.get("/tags/c/faq/4/test/l/latest.json", () => {
+      return helper.response({
+        users: [],
+        primary_groups: [],
+        topic_list: {
+          can_create_topic: true,
+          draft: null,
+          draft_key: "new_topic",
+          draft_sequence: 1,
+          per_page: 30,
+          tags: [
+            {
+              id: 1,
+              name: "planters",
+              topic_count: 1,
+            },
+          ],
+          topics: [],
+        },
+      });
+    });
+  });
+
   test("list the tags", async function (assert) {
     await visit("/tags");
 
@@ -19,6 +110,18 @@ acceptance("Tags", function (needs) {
       "shows the eviltrout tag"
     );
   });
+
+  test("dismiss notifications", async function (assert) {
+    await visit("/tag/test/l/unread");
+    await click("button.dismiss-read");
+    await click(".dismiss-read-modal button.btn-primary");
+    assert.ok(invisible(".dismiss-read-modal"));
+  });
+
+  test("hide tag notifications menu", async function (assert) {
+    await visit("/tags/c/faq/4/test");
+    assert.ok(invisible(".tag-notifications-button"));
+  });
 });
 
 acceptance("Tags listed by group", function (needs) {
@@ -102,7 +205,7 @@ acceptance("Tags listed by group", function (needs) {
       "shown in given order and with tags that are not in a group"
     );
     assert.deepEqual(
-      $(".tag-list:first .discourse-tag")
+      $(".tag-list:nth-of-type(1) .discourse-tag")
         .toArray()
         .map((i) => {
           return $(i).text();
@@ -111,7 +214,7 @@ acceptance("Tags listed by group", function (needs) {
       "shows the tags in default sort (by count)"
     );
     assert.deepEqual(
-      $(".tag-list:first .discourse-tag")
+      $(".tag-list:nth-of-type(1) .discourse-tag")
         .toArray()
         .map((i) => {
           return $(i).attr("href");
@@ -302,7 +405,7 @@ acceptance("Tag info", function (needs) {
       "delete UI is visible"
     );
 
-    await click(".unlink-synonym:first");
+    await click(".unlink-synonym:nth-of-type(1)");
     assert.ok(
       queryAll(".tag-info .synonyms-list .tag-box").length === 1,
       "removed a synonym"
@@ -312,7 +415,7 @@ acceptance("Tag info", function (needs) {
   test("composer will not set tags if user cannot create them", async function (assert) {
     await visit("/tag/planters");
     await click("#create-topic");
-    const composer = this.container.lookup("controller:composer");
-    assert.equal(composer.model.tags, null);
+    let composer = this.owner.lookup("controller:composer");
+    assert.equal(composer.get("model").tags, null);
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-admin-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-admin-menu-test.js
index ed8dde1117..cba99e8f8f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-admin-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-admin-menu-test.js
@@ -1,6 +1,6 @@
 import {
-  exists,
   acceptance,
+  exists,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-anonymous-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-anonymous-test.js
index f131b7620f..d07cac2381 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-anonymous-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-anonymous-test.js
@@ -1,10 +1,10 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Topic - Anonymous", function () {
   test("Enter a Topic", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-bulk-actions-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-bulk-actions-test.js
new file mode 100644
index 0000000000..c285eda16b
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-bulk-actions-test.js
@@ -0,0 +1,124 @@
+import {
+  acceptance,
+  invisible,
+  queryAll,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+import I18n from "I18n";
+
+acceptance("Topic - Bulk Actions", function (needs) {
+  needs.user();
+  needs.settings({ tagging_enabled: true });
+  needs.pretender((server, helper) => {
+    server.put("/topics/bulk", () => {
+      return helper.response({
+        topic_ids: [],
+      });
+    });
+  });
+
+  test("bulk select - modal", async function (assert) {
+    updateCurrentUser({ moderator: true });
+    await visit("/latest");
+    await click("button.bulk-select");
+
+    await click(queryAll("input.bulk-select")[0]);
+    await click(queryAll("input.bulk-select")[1]);
+
+    await click(".bulk-select-btn");
+
+    assert.ok(
+      queryAll("#discourse-modal-title")
+        .html()
+        .includes(I18n.t("topics.bulk.actions")),
+      "it opens bulk-select modal"
+    );
+
+    assert.ok(
+      queryAll(".bulk-buttons")
+        .html()
+        .includes(I18n.t("topics.bulk.change_category")),
+      "it shows an option to change category"
+    );
+
+    assert.ok(
+      queryAll(".bulk-buttons")
+        .html()
+        .includes(I18n.t("topics.bulk.close_topics")),
+      "it shows an option to close topics"
+    );
+
+    assert.ok(
+      queryAll(".bulk-buttons")
+        .html()
+        .includes(I18n.t("topics.bulk.archive_topics")),
+      "it shows an option to archive topics"
+    );
+
+    assert.ok(
+      queryAll(".bulk-buttons")
+        .html()
+        .includes(I18n.t("topics.bulk.notification_level")),
+      "it shows an option to update notification level"
+    );
+
+    assert.ok(
+      queryAll(".bulk-buttons")
+        .html()
+        .includes(I18n.t("topics.bulk.reset_read")),
+      "it shows an option to reset read"
+    );
+
+    assert.ok(
+      queryAll(".bulk-buttons")
+        .html()
+        .includes(I18n.t("topics.bulk.unlist_topics")),
+      "it shows an option to unlist topics"
+    );
+
+    assert.ok(
+      queryAll(".bulk-buttons")
+        .html()
+        .includes(I18n.t("topics.bulk.change_tags")),
+      "it shows an option to replace tags"
+    );
+
+    assert.ok(
+      queryAll(".bulk-buttons")
+        .html()
+        .includes(I18n.t("topics.bulk.append_tags")),
+      "it shows an option to append tags"
+    );
+
+    assert.ok(
+      queryAll(".bulk-buttons")
+        .html()
+        .includes(I18n.t("topics.bulk.remove_tags")),
+      "it shows an option to remove all tags"
+    );
+
+    assert.ok(
+      queryAll(".bulk-buttons").html().includes(I18n.t("topics.bulk.delete")),
+      "it shows an option to delete topics"
+    );
+  });
+
+  test("bulk select - delete topics", async function (assert) {
+    updateCurrentUser({ moderator: true });
+    await visit("/latest");
+    await click("button.bulk-select");
+
+    await click(queryAll("input.bulk-select")[0]);
+    await click(queryAll("input.bulk-select")[1]);
+
+    await click(".bulk-select-btn");
+    await click(".modal-body button[aria-label='Delete Topics']");
+
+    assert.ok(
+      invisible(".topic-bulk-actions-modal"),
+      "it closes the bulk select modal"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-discovery-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-discovery-test.js
index f82c20f42a..05131a7243 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-discovery-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-discovery-test.js
@@ -1,14 +1,14 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  publishToMessageBus,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import DiscourseURL from "discourse/lib/url";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import MessageBus from "message-bus-client";
 import sinon from "sinon";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Topic Discovery", function (needs) {
   needs.settings({
@@ -22,7 +22,7 @@ acceptance("Topic Discovery", function (needs) {
     assert.ok(exists(".topic-list .topic-list-item"), "has topics");
 
     assert.equal(
-      queryAll("a[data-user-card=eviltrout]:first img.avatar").attr("title"),
+      queryAll("a[data-user-card=eviltrout] img.avatar").attr("title"),
       "Evil Trout - Most Posts",
       "it shows user's full name in avatar title"
     );
@@ -94,19 +94,16 @@ acceptance("Topic Discovery", function (needs) {
       "shows the topic unread"
     );
 
-    // Mimic a messagebus message
-    MessageBus.callbacks.filterBy("channel", "/latest").map((c) =>
-      c.func({
-        message_type: "read",
+    publishToMessageBus("/latest", {
+      message_type: "read",
+      topic_id: 11995,
+      payload: {
+        highest_post_number: 1,
+        last_read_post_number: 2,
+        notification_level: 1,
         topic_id: 11995,
-        payload: {
-          highest_post_number: 1,
-          last_read_post_number: 2,
-          notification_level: 1,
-          topic_id: 11995,
-        },
-      })
-    );
+      },
+    });
 
     await visit("/"); // We're already there, but use this to wait for re-render
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js
index 5893d33da6..070ee1aace 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js
@@ -1,10 +1,10 @@
 import {
   acceptance,
-  updateCurrentUser,
   queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
-import { skip, test } from "qunit";
+import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 acceptance("Topic - Edit timer", function (needs) {
@@ -16,7 +16,7 @@ acceptance("Topic - Edit timer", function (needs) {
         execute_at: new Date(
           new Date().getTime() + 1 * 60 * 60 * 1000
         ).toISOString(),
-        duration: 1,
+        duration_minutes: 1440,
         based_on_last_post: false,
         closed: false,
         category_id: null,
@@ -24,150 +24,83 @@ acceptance("Topic - Edit timer", function (needs) {
     );
   });
 
-  test("default", async function (assert) {
-    updateCurrentUser({ moderator: true });
-    const futureDateInputSelector = selectKit(".future-date-input-selector");
-
-    await visit("/t/internationalization-localization");
-    await click(".toggle-admin-menu");
-    await click(".topic-admin-status-update button");
-
-    assert.equal(
-      futureDateInputSelector.header().label(),
-      "Select a timeframe"
-    );
-    assert.equal(futureDateInputSelector.header().value(), null);
-  });
-
   test("autoclose - specific time", async function (assert) {
     updateCurrentUser({ moderator: true });
-    const futureDateInputSelector = selectKit(".future-date-input-selector");
-
     await visit("/t/internationalization-localization");
     await click(".toggle-admin-menu");
-    await click(".topic-admin-status-update button");
+    await click(".admin-topic-timer-update button");
 
-    await futureDateInputSelector.expand();
-    await futureDateInputSelector.selectRowByValue("next_week");
-
-    assert.ok(futureDateInputSelector.header().label().includes("Next week"));
-    assert.equal(futureDateInputSelector.header().value(), "next_week");
+    await click("#tap_tile_next_week");
 
     const regex = /will automatically close in/g;
-    const html = queryAll(".future-date-input .topic-status-info")
+    const html = queryAll(".edit-topic-timer-modal .topic-timer-info")
       .html()
       .trim();
     assert.ok(regex.test(html));
   });
 
-  skip("autoclose", async function (assert) {
+  test("autoclose", async function (assert) {
     updateCurrentUser({ moderator: true });
-    const futureDateInputSelector = selectKit(".future-date-input-selector");
 
     await visit("/t/internationalization-localization");
     await click(".toggle-admin-menu");
-    await click(".topic-admin-status-update button");
+    await click(".admin-topic-timer-update button");
 
-    await futureDateInputSelector.expand();
-    await futureDateInputSelector.selectRowByValue("next_week");
-
-    assert.ok(futureDateInputSelector.header().label().includes("Next week"));
-    assert.equal(futureDateInputSelector.header().value(), "next_week");
+    await click("#tap_tile_next_week");
 
     const regex1 = /will automatically close in/g;
-    const html1 = queryAll(".future-date-input .topic-status-info")
+    const html1 = queryAll(".edit-topic-timer-modal .topic-timer-info")
       .html()
       .trim();
     assert.ok(regex1.test(html1));
 
-    await futureDateInputSelector.expand();
-    await futureDateInputSelector.selectRowByValue("pick_date_and_time");
-
-    await fillIn(".future-date-input .date-picker", "2099-11-24");
-
-    assert.ok(
-      futureDateInputSelector.header().label().includes("Pick date and time")
-    );
-    assert.equal(
-      futureDateInputSelector.header().value(),
-      "pick_date_and_time"
-    );
+    await click("#tap_tile_custom");
+    await fillIn(".tap-tile-date-input .date-picker", "2099-11-24");
 
     const regex2 = /will automatically close in/g;
-    const html2 = queryAll(".future-date-input .topic-status-info")
+    const html2 = queryAll(".edit-topic-timer-modal .topic-timer-info")
       .html()
       .trim();
     assert.ok(regex2.test(html2));
 
-    await futureDateInputSelector.expand();
-    await futureDateInputSelector.selectRowByValue("set_based_on_last_post");
+    const timerType = selectKit(".select-kit.timer-type");
+    await timerType.expand();
+    await timerType.selectRowByValue("close_after_last_post");
 
-    await fillIn(".future-date-input input[type=number]", "2");
+    const interval = selectKit(".select-kit.relative-time-intervals");
+    await interval.expand();
+    await interval.selectRowByValue("hours");
+    await fillIn(".relative-time-duration", "2");
 
-    assert.ok(
-      futureDateInputSelector
-        .header()
-        .label()
-        .includes("Close based on last post")
-    );
-    assert.equal(
-      futureDateInputSelector.header().value(),
-      "set_based_on_last_post"
-    );
-
-    const regex3 = /This topic will close.*after the last reply/g;
-    const html3 = queryAll(".future-date-input .topic-status-info")
-      .html()
-      .trim();
+    const regex3 = /last post in the topic is already/g;
+    const html3 = queryAll(".edit-topic-timer-modal .warning").html().trim();
     assert.ok(regex3.test(html3));
   });
 
   test("close temporarily", async function (assert) {
     updateCurrentUser({ moderator: true });
     const timerType = selectKit(".select-kit.timer-type");
-    const futureDateInputSelector = selectKit(".future-date-input-selector");
 
     await visit("/t/internationalization-localization");
     await click(".toggle-admin-menu");
-    await click(".topic-admin-status-update button");
+    await click(".admin-topic-timer-update button");
 
     await timerType.expand();
     await timerType.selectRowByValue("open");
 
-    assert.equal(
-      futureDateInputSelector.header().label(),
-      "Select a timeframe"
-    );
-    assert.equal(futureDateInputSelector.header().value(), null);
-
-    await futureDateInputSelector.expand();
-    await futureDateInputSelector.selectRowByValue("next_week");
-
-    assert.ok(futureDateInputSelector.header().label().includes("Next week"));
-    assert.equal(futureDateInputSelector.header().value(), "next_week");
+    await click("#tap_tile_next_week");
 
     const regex1 = /will automatically open in/g;
-    const html1 = queryAll(".future-date-input .topic-status-info")
+    const html1 = queryAll(".edit-topic-timer-modal .topic-timer-info")
       .html()
       .trim();
     assert.ok(regex1.test(html1));
 
-    await futureDateInputSelector.expand();
-    await futureDateInputSelector.selectRowByValue("pick_date_and_time");
-
-    await fillIn(".future-date-input .date-picker", "2099-11-24");
-
-    assert.equal(
-      futureDateInputSelector.header().label(),
-      "Pick date and time"
-    );
-    assert.equal(
-      futureDateInputSelector.header().value(),
-      "pick_date_and_time"
-    );
+    await click("#tap_tile_custom");
+    await fillIn(".tap-tile-date-input .date-picker", "2099-11-24");
 
     const regex2 = /will automatically open in/g;
-    const html2 = queryAll(".future-date-input .topic-status-info")
+    const html2 = queryAll(".edit-topic-timer-modal .topic-timer-info")
       .html()
       .trim();
     assert.ok(regex2.test(html2));
@@ -177,11 +110,10 @@ acceptance("Topic - Edit timer", function (needs) {
     updateCurrentUser({ moderator: true });
     const timerType = selectKit(".select-kit.timer-type");
     const categoryChooser = selectKit(".modal-body .category-chooser");
-    const futureDateInputSelector = selectKit(".future-date-input-selector");
 
     await visit("/t/internationalization-localization");
     await click(".toggle-admin-menu");
-    await click(".topic-admin-status-update button");
+    await click(".admin-topic-timer-update button");
 
     await timerType.expand();
     await timerType.selectRowByValue("publish_to_category");
@@ -189,34 +121,59 @@ acceptance("Topic - Edit timer", function (needs) {
     assert.equal(categoryChooser.header().label(), "uncategorized");
     assert.equal(categoryChooser.header().value(), null);
 
-    assert.equal(
-      futureDateInputSelector.header().label(),
-      "Select a timeframe"
-    );
-    assert.equal(futureDateInputSelector.header().value(), null);
-
     await categoryChooser.expand();
     await categoryChooser.selectRowByValue("7");
 
-    await futureDateInputSelector.expand();
-    await futureDateInputSelector.selectRowByValue("next_week");
-
-    assert.ok(futureDateInputSelector.header().label().includes("Next week"));
-    assert.equal(futureDateInputSelector.header().value(), "next_week");
+    await click("#tap_tile_next_week");
 
     const regex = /will be published to #dev/g;
-    const text = queryAll(".future-date-input .topic-status-info")
+    const text = queryAll(".edit-topic-timer-modal .topic-timer-info")
       .text()
       .trim();
     assert.ok(regex.test(text));
   });
 
+  test("schedule - last custom date and time", async function (assert) {
+    updateCurrentUser({ moderator: true });
+
+    await visit("/t/internationalization-localization");
+    await click(".toggle-admin-menu");
+    await click(".admin-topic-timer-update button");
+
+    await click("#tap_tile_custom");
+    await click(".modal-close");
+
+    await click(".toggle-admin-menu");
+    await click(".admin-topic-timer-update button");
+
+    assert.notOk(
+      exists("#tap_tile_last_custom"),
+      "it does not show last custom if the custom date and time was not filled and valid"
+    );
+
+    await click("#tap_tile_custom");
+    await fillIn(".tap-tile-date-input .date-picker", "2099-11-24");
+    await fillIn("#custom-time", "10:30");
+    await click(".edit-topic-timer-buttons button.btn-primary");
+
+    await click(".toggle-admin-menu");
+    await click(".admin-topic-timer-update button");
+
+    assert.ok(
+      exists("#tap_tile_last_custom"),
+      "it show last custom because the custom date and time was valid"
+    );
+    let text = queryAll("#tap_tile_last_custom").text().trim();
+    const regex = /Nov 24, 10:30 am/g;
+    assert.ok(regex.test(text));
+  });
+
   test("TL4 can't auto-delete", async function (assert) {
     updateCurrentUser({ moderator: false, admin: false, trust_level: 4 });
 
     await visit("/t/internationalization-localization");
     await click(".toggle-admin-menu");
-    await click(".topic-admin-status-update button");
+    await click(".admin-topic-timer-update button");
 
     const timerType = selectKit(".select-kit.timer-type");
 
@@ -228,29 +185,18 @@ acceptance("Topic - Edit timer", function (needs) {
   test("auto delete", async function (assert) {
     updateCurrentUser({ moderator: true });
     const timerType = selectKit(".select-kit.timer-type");
-    const futureDateInputSelector = selectKit(".future-date-input-selector");
 
     await visit("/t/internationalization-localization");
     await click(".toggle-admin-menu");
-    await click(".topic-admin-status-update button");
+    await click(".admin-topic-timer-update button");
 
     await timerType.expand();
     await timerType.selectRowByValue("delete");
 
-    assert.equal(
-      futureDateInputSelector.header().label(),
-      "Select a timeframe"
-    );
-    assert.equal(futureDateInputSelector.header().value(), null);
-
-    await futureDateInputSelector.expand();
-    await futureDateInputSelector.selectRowByValue("two_weeks");
-
-    assert.ok(futureDateInputSelector.header().label().includes("Two Weeks"));
-    assert.equal(futureDateInputSelector.header().value(), "two_weeks");
+    await click("#tap_tile_two_weeks");
 
     const regex = /will be automatically deleted/g;
-    const html = queryAll(".future-date-input .topic-status-info")
+    const html = queryAll(".edit-topic-timer-modal .topic-timer-info")
       .html()
       .trim();
     assert.ok(regex.test(html));
@@ -258,22 +204,18 @@ acceptance("Topic - Edit timer", function (needs) {
 
   test("Inline delete timer", async function (assert) {
     updateCurrentUser({ moderator: true });
-    const futureDateInputSelector = selectKit(".future-date-input-selector");
 
     await visit("/t/internationalization-localization");
     await click(".toggle-admin-menu");
-    await click(".topic-admin-status-update button");
-    await futureDateInputSelector.expand();
-    await futureDateInputSelector.selectRowByValue("next_week");
-    await click(".modal-footer button.btn-primary");
+    await click(".admin-topic-timer-update button");
+    await click("#tap_tile_next_week");
+    await click(".edit-topic-timer-buttons button.btn-primary");
 
-    const removeTimerButton = queryAll(
-      ".topic-status-info .topic-timer-remove"
-    );
+    const removeTimerButton = queryAll(".topic-timer-info .topic-timer-remove");
     assert.equal(removeTimerButton.attr("title"), "remove timer");
 
-    await click(".topic-status-info .topic-timer-remove");
-    const topicStatusInfo = queryAll(".topic-status-info .topic-timer-remove");
-    assert.equal(topicStatusInfo.length, 0);
+    await click(".topic-timer-info .topic-timer-remove");
+    const topicTimerInfo = queryAll(".topic-timer-info .topic-timer-remove");
+    assert.equal(topicTimerInfo.length, 0);
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-footer-buttons-mobile-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-footer-buttons-mobile-test.js
index 1950e23d2c..bbf42fdf7d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-footer-buttons-mobile-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-footer-buttons-mobile-test.js
@@ -1,10 +1,10 @@
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import I18n from "I18n";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { withPluginApi } from "discourse/lib/plugin-api";
-import { clearTopicFooterButtons } from "discourse/lib/register-topic-footer-button";
 import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { clearTopicFooterButtons } from "discourse/lib/register-topic-footer-button";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 let _test;
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-list-tracker-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-list-tracker-test.js
index 4b3cb170e9..72d747d044 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-list-tracker-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-list-tracker-test.js
@@ -1,11 +1,11 @@
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import {
   nextTopicUrl,
   previousTopicUrl,
   setTopicId,
 } from "discourse/lib/topic-list-tracker";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Topic list tracking", function () {
   test("Navigation", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-move-posts-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-move-posts-test.js
index fba4550cd2..442b109dcd 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-move-posts-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-move-posts-test.js
@@ -1,7 +1,7 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import I18n from "I18n";
+import { test } from "qunit";
 
 acceptance("Topic move posts", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js
index 8b36d5211a..b345fb36a1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js
@@ -1,7 +1,7 @@
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Topic Notifications button", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-quote-button-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-quote-button-test.js
index 56686feec7..912c5a6135 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-quote-button-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-quote-button-test.js
@@ -1,11 +1,11 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import I18n from "I18n";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 function selectText(selector) {
   const range = document.createRange();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
index 77d92442ad..32fd762985 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
@@ -1,17 +1,22 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
   visible,
 } from "discourse/tests/helpers/qunit-helpers";
-import { click, triggerKeyEvent, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
+import {
+  click,
+  fillIn,
+  settled,
+  triggerKeyEvent,
+  visit,
+} from "@ember/test-helpers";
 import I18n from "I18n";
-import { withPluginApi } from "discourse/lib/plugin-api";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
+import { test } from "qunit";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
-function selectText(selector) {
+async function selectText(selector) {
   const range = document.createRange();
   const node = document.querySelector(selector);
   range.selectNodeContents(node);
@@ -19,6 +24,7 @@ function selectText(selector) {
   const selection = window.getSelection();
   selection.removeAllRanges();
   selection.addRange(range);
+  await settled();
 }
 
 acceptance("Topic", function (needs) {
@@ -61,22 +67,25 @@ acceptance("Topic", function (needs) {
       "it fills composer with the ring string"
     );
 
-    const targets = queryAll(".item span", ".composer-fields");
+    const targets = queryAll(
+      "#private-message-users .selected-name",
+      ".composer-fields"
+    );
 
     assert.equal(
-      $(targets[0]).text(),
+      $(targets[0]).text().trim(),
       "someguy",
       "it fills up the composer with the right user to start the PM to"
     );
 
     assert.equal(
-      $(targets[1]).text(),
+      $(targets[1]).text().trim(),
       "test",
       "it fills up the composer with the right user to start the PM to"
     );
 
     assert.equal(
-      $(targets[2]).text(),
+      $(targets[2]).text().trim(),
       "Group",
       "it fills up the composer with the right group to start the PM to"
     );
@@ -140,7 +149,7 @@ acceptance("Topic", function (needs) {
     await click(".topic-post:nth-of-type(1) button.show-post-admin-menu");
     await click(".btn.wiki");
 
-    assert.ok(queryAll("a.wiki").length === 1, "it shows the wiki icon");
+    assert.ok(queryAll("button.wiki").length === 1, "it shows the wiki icon");
   });
 
   test("Visit topic routes", async function (assert) {
@@ -169,9 +178,8 @@ acceptance("Topic", function (needs) {
 
     await click("#topic-title .submit-edit");
 
-    assert.equal(
-      queryAll(".fancy-title").html().trim(),
-      `emojis title <img width=\"20\" height=\"20\" src="/images/emoji/emoji_one/bike.png?v=${v}" title="bike" alt="bike" class="emoji"> <img width=\"20\" height=\"20\" src="/images/emoji/emoji_one/blonde_woman/6.png?v=${v}" title="blonde_woman:t6" alt="blonde_woman:t6" class="emoji">`,
+    assert.ok(
+      queryAll(".fancy-title").html().trim().indexOf("bike.png") !== -1,
       "it displays the new title with emojis"
     );
   });
@@ -184,10 +192,9 @@ acceptance("Topic", function (needs) {
 
     await click("#topic-title .submit-edit");
 
-    assert.equal(
-      queryAll(".fancy-title").html().trim(),
-      `emojis title <img width=\"20\" height=\"20\" src="/images/emoji/emoji_one/man_farmer.png?v=${v}" title="man_farmer" alt="man_farmer" class="emoji"><img width=\"20\" height=\"20\" src="/images/emoji/emoji_one/pray.png?v=${v}" title="pray" alt="pray" class="emoji">`,
-      "it displays the new title with escaped unicode emojis"
+    assert.ok(
+      queryAll(".fancy-title").html().trim().indexOf("man_farmer.png") !== -1,
+      "it displays the new title with emojis"
     );
   });
 
@@ -200,10 +207,12 @@ acceptance("Topic", function (needs) {
 
     await click("#topic-title .submit-edit");
 
-    assert.equal(
-      queryAll(".fancy-title").html().trim(),
-      `Test<img width=\"20\" height=\"20\" src="/images/emoji/emoji_one/slightly_smiling_face.png?v=${v}" title="slightly_smiling_face" alt="slightly_smiling_face" class="emoji">Title`,
-      "it displays the new title with escaped unicode emojis"
+    assert.ok(
+      queryAll(".fancy-title")
+        .html()
+        .trim()
+        .indexOf("slightly_smiling_face.png") !== -1,
+      "it displays the new title with emojis"
     );
   });
 
@@ -251,31 +260,6 @@ acceptance("Topic", function (needs) {
     assert.ok(exists(".category-moderator"), "it has a class applied");
     assert.ok(exists(".d-icon-shield-alt"), "it shows an icon");
   });
-});
-
-acceptance("Topic featured links", function (needs) {
-  needs.user();
-  needs.settings({
-    topic_featured_link_enabled: true,
-    max_topic_title_length: 80,
-  });
-  test("remove featured link", async function (assert) {
-    await visit("/t/-/299/1");
-    assert.ok(
-      exists(".title-wrapper .topic-featured-link"),
-      "link is shown with topic title"
-    );
-
-    await click(".title-wrapper .edit-topic");
-    assert.ok(
-      exists(".title-wrapper .remove-featured-link"),
-      "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");
-  });
 
   test("Converting to a public topic", async function (assert) {
     await visit("/t/test-pm/34");
@@ -298,7 +282,7 @@ acceptance("Topic featured links", function (needs) {
 
     await click(".toggle-admin-menu");
     await click(".topic-admin-pin .btn");
-    await click(".btn-primary:last");
+    await click(".make-banner");
 
     await click(".toggle-admin-menu");
     await click(".topic-admin-visible .btn");
@@ -358,7 +342,7 @@ acceptance("Topic featured links", function (needs) {
 
   test("Quoting a quote keeps the original poster name", async function (assert) {
     await visit("/t/internationalization-localization/280");
-    selectText("#post_5 blockquote");
+    await selectText("#post_5 blockquote");
     await click(".quote-button .insert-quote");
 
     assert.ok(
@@ -370,7 +354,7 @@ acceptance("Topic featured links", function (needs) {
 
   test("Quoting a quote of a different topic keeps the original topic title", async function (assert) {
     await visit("/t/internationalization-localization/280");
-    selectText("#post_9 blockquote");
+    await selectText("#post_9 blockquote");
     await click(".quote-button .insert-quote");
 
     assert.ok(
@@ -384,7 +368,7 @@ acceptance("Topic featured links", function (needs) {
 
   test("Quoting a quote with the Reply button keeps the original poster name", async function (assert) {
     await visit("/t/internationalization-localization/280");
-    selectText("#post_5 blockquote");
+    await selectText("#post_5 blockquote");
     await click(".reply");
 
     assert.ok(
@@ -396,7 +380,7 @@ acceptance("Topic featured links", function (needs) {
 
   test("Quoting a quote with replyAsNewTopic keeps the original poster name", async function (assert) {
     await visit("/t/internationalization-localization/280");
-    selectText("#post_5 blockquote");
+    await selectText("#post_5 blockquote");
     await triggerKeyEvent(document, "keypress", "j".charCodeAt(0));
     await triggerKeyEvent(document, "keypress", "t".charCodeAt(0));
 
@@ -409,7 +393,7 @@ acceptance("Topic featured links", function (needs) {
 
   test("Quoting by selecting text can mark the quote as full", async function (assert) {
     await visit("/t/internationalization-localization/280");
-    selectText("#post_5 .cooked");
+    await selectText("#post_5 .cooked");
     await click(".quote-button .insert-quote");
 
     assert.ok(
@@ -420,6 +404,36 @@ acceptance("Topic featured links", function (needs) {
   });
 });
 
+acceptance("Topic featured links", function (needs) {
+  needs.user();
+  needs.settings({
+    topic_featured_link_enabled: true,
+    max_topic_title_length: 80,
+  });
+
+  test("remove featured link", async function (assert) {
+    await visit("/t/-/299/1");
+    assert.ok(
+      exists(".title-wrapper .topic-featured-link"),
+      "link is shown with topic title"
+    );
+
+    await click(".title-wrapper .edit-topic");
+    assert.ok(
+      exists(".title-wrapper .remove-featured-link"),
+      "link to remove featured link"
+    );
+
+    // TODO: decide if we want to test this, test is flaky so it
+    // was commented out.
+    // If not fixed by May 2021, delete this code block
+    //
+    //await click(".title-wrapper .remove-featured-link");
+    //await click(".title-wrapper .submit-edit");
+    //assert.ok(!exists(".title-wrapper .topic-featured-link"), "link is gone");
+  });
+});
+
 acceptance("Topic with title decorated", function (needs) {
   needs.user();
   needs.hooks.beforeEach(() => {
@@ -429,6 +443,7 @@ acceptance("Topic with title decorated", function (needs) {
       });
     });
   });
+
   test("Decorate topic title", async function (assert) {
     await visit("/t/internationalization-localization/280");
 
@@ -445,3 +460,66 @@ acceptance("Topic with title decorated", function (needs) {
     );
   });
 });
+
+acceptance("Topic pinning/unpinning as an admin", function (needs) {
+  needs.user({ admin: true });
+
+  test("Admin pinning topic", async function (assert) {
+    await visit("/t/topic-for-group-moderators/2480");
+
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-pin .btn");
+
+    assert.ok(
+      exists(".feature-topic .btn-primary"),
+      "it should show the 'Pin Topic' button"
+    );
+
+    assert.ok(
+      exists(".make-banner"),
+      "it should show the 'Banner Topic' button"
+    );
+  });
+});
+
+acceptance("Topic pinning/unpinning as a staff member", function (needs) {
+  needs.user({ moderator: true, admin: false, trust_level: 2 });
+
+  test("Staff pinning topic", async function (assert) {
+    await visit("/t/topic-for-group-moderators/2480");
+
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-pin .btn");
+
+    assert.ok(
+      exists(".feature-topic .btn-primary"),
+      "it should show the 'Pin Topic' button"
+    );
+
+    assert.ok(
+      exists(".make-banner"),
+      "it should show the 'Banner Topic' button"
+    );
+  });
+});
+
+acceptance("Topic pinning/unpinning as a group moderator", function (needs) {
+  needs.user({ moderator: false, admin: false, trust_level: 1 });
+
+  test("Group category moderator pinning topic", async function (assert) {
+    await visit("/t/topic-for-group-moderators/2480");
+
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-pin .btn");
+
+    assert.ok(
+      exists(".feature-topic .btn-primary"),
+      "it should show the 'Pin Topic' button"
+    );
+
+    assert.ok(
+      !exists(".make-banner"),
+      "it should not show the 'Banner Topic' button"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/unknown-test.js b/app/assets/javascripts/discourse/tests/acceptance/unknown-test.js
index aa2e5e3931..3f8dba03be 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/unknown-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/unknown-test.js
@@ -1,11 +1,33 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit, currentURL } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import { click, currentURL, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
+acceptance("Category 404", function (needs) {
+  needs.pretender((server, helper) => {
+    server.get("/c/category-does-not-exist/find_by_slug.json", () => {
+      return helper.response(404, {
+        errors: ["The requested URL or resource could not be found."],
+        error_type: "not_found",
+        extras: { html: "<div class='page-not-found'>not found</div>" },
+      });
+    });
+  });
+  test("Navigating to a bad category link does not break the router", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    await click('[data-for-test="category-404"]');
+    assert.equal(currentURL(), "/404");
+
+    // See that we can navigate away
+    await click("#site-logo");
+    assert.equal(currentURL(), "/");
+  });
+});
+
 acceptance("Unknown", function (needs) {
   const urls = {
-    "viewtopic.php": "/t/internationalization-localization/280",
-    "not-the-url-for-faq": "/faq",
+    "/viewtopic.php?f=8&t=280": "/t/internationalization-localization/280",
+    "/another-url-for-faq": "/faq",
   };
 
   needs.pretender((server, helper) => {
@@ -37,7 +59,7 @@ acceptance("Unknown", function (needs) {
   });
 
   test("Permalink URL to a static page", async function (assert) {
-    await visit("/not-the-url-for-faq");
+    await visit("/another-url-for-faq");
     assert.equal(currentURL(), "/faq");
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-anonymous-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-anonymous-test.js
index 78b6339456..5e86c5c869 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-anonymous-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-anonymous-test.js
@@ -1,10 +1,10 @@
-import { visit, currentURL, currentRouteName } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
   count,
   exists,
 } from "discourse/tests/helpers/qunit-helpers";
+import { currentRouteName, currentURL, visit } from "@ember/test-helpers";
+import { test } from "qunit";
 
 acceptance("User Anonymous", function () {
   test("Root URL", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-bookmarks-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-bookmarks-test.js
index a86878a1e1..79c6dd90e1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-bookmarks-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-bookmarks-test.js
@@ -1,13 +1,13 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
-import userFixtures from "discourse/tests/fixtures/user-fixtures";
 import { cloneJSON } from "discourse-common/lib/object";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
+import userFixtures from "discourse/tests/fixtures/user-fixtures";
 
 acceptance("User's bookmarks", function (needs) {
   needs.user();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js
index 4785de3e12..2e9281f368 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js
@@ -1,8 +1,8 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit, click } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
+import User from "discourse/models/user";
 import { test } from "qunit";
 import userFixtures from "discourse/tests/fixtures/user-fixtures";
-import User from "discourse/models/user";
 
 acceptance("User Card - Show Local Time", function (needs) {
   needs.user();
@@ -17,7 +17,7 @@ acceptance("User Card - Show Local Time", function (needs) {
     User.current().changeTimezone("Australia/Brisbane");
 
     await visit("/t/internationalization-localization/280");
-    await click('a[data-user-card="charlie"]:first');
+    await click('a[data-user-card="charlie"]');
 
     assert.not(
       exists(".user-card .local-time"),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-drafts-stream-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-drafts-stream-test.js
index 7938bef36e..2f39a4cfde 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-drafts-stream-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-drafts-stream-test.js
@@ -1,9 +1,9 @@
 import {
-  queryAll,
   acceptance,
+  queryAll,
   visible,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit, click } from "@ember/test-helpers";
+import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
 acceptance("User Drafts", function (needs) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-interface-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-interface-test.js
index 644f06b36c..d2ad0e4ef6 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-interface-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-interface-test.js
@@ -1,14 +1,15 @@
 import {
-  queryAll,
-  exists,
   acceptance,
+  exists,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit, click } from "@ember/test-helpers";
-import { test } from "qunit";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
-import Site from "discourse/models/site";
-import Session from "discourse/models/session";
+import { click, visit } from "@ember/test-helpers";
 import cookie, { removeCookie } from "discourse/lib/cookie";
+import I18n from "I18n";
+import Session from "discourse/models/session";
+import Site from "discourse/models/site";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 
 acceptance("User Preferences - Interface", function (needs) {
   needs.user();
@@ -60,7 +61,7 @@ acceptance("User Preferences - Interface", function (needs) {
 
   test("does not show option to disable dark mode by default", async function (assert) {
     await visit("/u/eviltrout/preferences/interface");
-    assert.equal($(".control-group.dark-mode").length, 0);
+    assert.ok(!exists(".control-group.dark-mode"), "option not visible");
   });
 
   test("shows light/dark color scheme pickers", async function (assert) {
@@ -71,8 +72,65 @@ acceptance("User Preferences - Interface", function (needs) {
     ]);
 
     await visit("/u/eviltrout/preferences/interface");
-    assert.ok($(".light-color-scheme").length, "has regular dropdown");
-    assert.ok($(".dark-color-scheme").length, "has dark color scheme dropdown");
+    assert.ok(exists(".light-color-scheme"), "has regular dropdown");
+    assert.ok(exists(".dark-color-scheme"), "has dark color scheme dropdown");
+  });
+
+  test("shows light color scheme default option when theme's color scheme is not user selectable", async function (assert) {
+    let site = Site.current();
+    site.set("user_themes", [
+      { theme_id: 1, name: "Cool Theme", color_scheme_id: null },
+    ]);
+
+    site.set("user_color_schemes", [{ id: 2, name: "Cool Breeze" }]);
+
+    await visit("/u/eviltrout/preferences/interface");
+    assert.ok(exists(".light-color-scheme"), "has regular dropdown");
+
+    assert.equal(
+      selectKit(".light-color-scheme .select-kit").header().value(),
+      null
+    );
+    assert.equal(
+      selectKit(".light-color-scheme .select-kit").header().label(),
+      I18n.t("user.color_schemes.default_description")
+    );
+  });
+
+  test("shows no default option for light scheme when theme's color scheme is user selectable", async function (assert) {
+    let meta = document.createElement("meta");
+    meta.name = "discourse_theme_ids";
+    meta.content = "2";
+    document.getElementsByTagName("head")[0].appendChild(meta);
+
+    let site = Site.current();
+    site.set("user_themes", [
+      { theme_id: 1, name: "Cool Theme", color_scheme_id: 2, default: true },
+      {
+        theme_id: 2,
+        name: "Some Other Theme",
+        color_scheme_id: 3,
+        default: false,
+      },
+    ]);
+
+    site.set("user_color_schemes", [
+      { id: 2, name: "Cool Breeze" },
+      { id: 3, name: "Dark Night" },
+    ]);
+
+    await visit("/u/eviltrout/preferences/interface");
+
+    assert.ok(exists(".light-color-scheme"), "has regular dropdown");
+    assert.equal(selectKit(".theme .select-kit").header().value(), 2);
+
+    await selectKit(".light-color-scheme .select-kit").expand();
+    assert.equal(
+      queryAll(".light-color-scheme .select-kit .select-kit-row").length,
+      2
+    );
+
+    document.querySelector("meta[name='discourse_theme_ids']").remove();
   });
 });
 
@@ -93,7 +151,7 @@ acceptance(
       await visit("/u/eviltrout/preferences/interface");
 
       assert.ok(
-        $(".control-group.dark-mode").length,
+        exists(".control-group.dark-mode"),
         "it has the option to disable dark mode"
       );
     });
@@ -103,7 +161,7 @@ acceptance(
       site.set("user_color_schemes", []);
 
       await visit("/u/eviltrout/preferences/interface");
-      assert.equal($(".control-group.color-scheme").length, 0);
+      assert.ok(!exists(".control-group.color-scheme"));
     });
 
     test("light color scheme picker", async function (assert) {
@@ -111,14 +169,28 @@ acceptance(
       site.set("user_color_schemes", [{ id: 2, name: "Cool Breeze" }]);
 
       await visit("/u/eviltrout/preferences/interface");
-      assert.ok($(".light-color-scheme").length, "has regular picker dropdown");
-      assert.equal(
-        $(".dark-color-scheme").length,
-        0,
+      assert.ok(exists(".light-color-scheme"), "has regular picker dropdown");
+      assert.ok(
+        !exists(".dark-color-scheme"),
         "does not have a dark color scheme picker"
       );
     });
 
+    test("light color scheme defaults to custom scheme selected by user", async function (assert) {
+      let site = Site.current();
+      let session = Session.current();
+      session.userColorSchemeId = 2;
+      site.set("user_color_schemes", [{ id: 2, name: "Cool Breeze" }]);
+
+      await visit("/u/eviltrout/preferences/interface");
+      assert.ok(exists(".light-color-scheme"), "has light scheme dropdown");
+      assert.equal(
+        queryAll(".light-color-scheme .selected-name").data("value"),
+        session.userColorSchemeId,
+        "user's selected color scheme is selected value in light scheme dropdown"
+      );
+    });
+
     test("light and dark color scheme pickers", async function (assert) {
       let site = Site.current();
       let session = Session.current();
@@ -138,18 +210,15 @@ acceptance(
       };
 
       await visit("/u/eviltrout/preferences/interface");
-      assert.ok($(".light-color-scheme").length, "has regular dropdown");
-      assert.ok(
-        $(".dark-color-scheme").length,
-        "has dark color scheme dropdown"
-      );
+      assert.ok(exists(".light-color-scheme"), "has regular dropdown");
+      assert.ok(exists(".dark-color-scheme"), "has dark color scheme dropdown");
       assert.equal(
-        $(".dark-color-scheme .selected-name").data("value"),
+        queryAll(".dark-color-scheme .selected-name").data("value"),
         session.userDarkSchemeId,
         "sets site default as selected dark scheme"
       );
-      assert.equal(
-        $(".control-group.dark-mode").length,
+      assert.ok(
+        !exists(".control-group.dark-mode"),
         0,
         "it does not show disable dark mode checkbox"
       );
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-notifications-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-notifications-test.js
new file mode 100644
index 0000000000..10dd6b8e8c
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-notifications-test.js
@@ -0,0 +1,108 @@
+import {
+  acceptance,
+  exists,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
+
+acceptance("User notification schedule", function (needs) {
+  needs.user();
+
+  test("the schedule interface is hidden until enabled", async function (assert) {
+    await visit("/u/eviltrout/preferences/notifications");
+
+    assert.ok(
+      !exists(".notification-schedule-table"),
+      "notification schedule is hidden"
+    );
+    await click(".control-group.notification-schedule input");
+    assert.ok(
+      exists(".notification-schedule-table"),
+      "notification schedule is visible"
+    );
+  });
+
+  test("By default every day is selected 8:00am - 5:00pm", async function (assert) {
+    await visit("/u/eviltrout/preferences/notifications");
+    await click(".control-group.notification-schedule input");
+
+    [
+      "Monday",
+      "Tuesday",
+      "Wednesday",
+      "Thursday",
+      "Friday",
+      "Saturday",
+      "Sunday",
+    ].forEach((day) => {
+      assert.equal(
+        selectKit(`.day.${day} .starts-at .combobox`).header().label(),
+        "8:00 AM",
+        "8am is selected"
+      );
+      assert.equal(
+        selectKit(`.day.${day} .starts-at .combobox`).header().value(),
+        "480",
+        "8am is 480"
+      );
+      assert.equal(
+        selectKit(`.day.${day} .ends-at .combobox`).header().label(),
+        "5:00 PM",
+        "5am is selected"
+      );
+      assert.equal(
+        selectKit(`.day.${day} .ends-at .combobox`).header().value(),
+        "1020",
+        "5pm is 1020"
+      );
+    });
+  });
+
+  test("If 'none' is selected for the start time, end time dropdown is removed", async function (assert) {
+    await visit("/u/eviltrout/preferences/notifications");
+    await click(".control-group.notification-schedule input");
+
+    await selectKit(".day.Monday .combobox").expand();
+    await selectKit(".day.Monday .combobox").selectRowByValue(-1);
+
+    assert.equal(
+      selectKit(".day.Monday .starts-at .combobox").header().value(),
+      "-1",
+      "set monday input to none"
+    );
+    assert.equal(
+      selectKit(".day.Monday .starts-at .combobox").header().label(),
+      "None",
+      "set monday label to none"
+    );
+    assert.equal(
+      queryAll(".day.Monday .select-kit.single-select").length,
+      1,
+      "The end time input is hidden"
+    );
+  });
+
+  test("If start time is after end time, end time gets bumped 30 minutes past start time", async function (assert) {
+    await visit("/u/eviltrout/preferences/notifications");
+    await click(".control-group.notification-schedule input");
+
+    await selectKit(".day.Tuesday .starts-at .combobox").expand();
+    await selectKit(".day.Tuesday .starts-at .combobox").selectRowByValue(
+      "1350"
+    );
+
+    assert.equal(
+      selectKit(".day.Tuesday .ends-at .combobox").header().value(),
+      "1380",
+      "End time is 30 past start time"
+    );
+
+    await selectKit(".day.Tuesday .ends-at .combobox").expand();
+    assert.ok(
+      !selectKit(".day.Tuesday .ends-at .combobox").rowByValue(1350).exists(),
+      "End time options are limited to + 30 past start time"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-test.js
index d72318b95d..ae7603bf4d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-test.js
@@ -1,10 +1,10 @@
-import { visit, currentRouteName, click } from "@ember/test-helpers";
-import { test } from "qunit";
 import {
   acceptance,
   exists,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
+import { click, currentRouteName, visit } from "@ember/test-helpers";
+import { test } from "qunit";
 
 acceptance("User Routes", function (needs) {
   needs.user();
@@ -15,7 +15,13 @@ acceptance("User Routes", function (needs) {
     );
   });
   test("Invalid usernames", async function (assert) {
-    await visit("/u/eviltrout%2F..%2F..%2F/summary");
+    try {
+      await visit("/u/eviltrout%2F..%2F..%2F/summary");
+    } catch (e) {
+      if (e.message !== "TransitionAborted") {
+        throw e;
+      }
+    }
 
     assert.equal(currentRouteName(), "exception-unknown");
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/users-test.js b/app/assets/javascripts/discourse/tests/acceptance/users-test.js
index 79469bf2c8..72899463c2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/users-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/users-test.js
@@ -1,6 +1,6 @@
-import { exists, acceptance } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
 
 acceptance("User Directory", function () {
   test("Visit Page", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/core_plugins_tests.js b/app/assets/javascripts/discourse/tests/core_plugins_tests.js
new file mode 100644
index 0000000000..f9c99ce034
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/core_plugins_tests.js
@@ -0,0 +1,4 @@
+//= require_tree ./acceptance
+//= require_tree ./integration
+//= require_tree ./unit
+//= require ./plugin_tests
diff --git a/app/assets/javascripts/discourse/tests/fixtures/about.js b/app/assets/javascripts/discourse/tests/fixtures/about.js
index 4c7de6a87a..ec7a96fdff 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/about.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/about.js
@@ -16,12 +16,12 @@ export default {
         active_users_30_days: 2026,
         like_count: 499135,
         likes_7_days: 3449,
-        likes_30_days: 12313
+        likes_30_days: 12313,
       },
       description:
         "Discussion about the next-generation open source Discourse forum software",
       title: "QUnit Discourse Tests",
-      locale: "en_US",
+      locale: "en",
       version: "2.2.0.beta8",
       https: true,
       admins: [
@@ -32,7 +32,7 @@ export default {
           avatar_template:
             "/user_avatar/meta.discourse.org/sam/{size}/102149_2.png",
           title: "co-founder",
-          last_seen_at: "2030-01-15T13:30:43.272Z"
+          last_seen_at: "2030-01-15T13:30:43.272Z",
         },
         {
           id: 32,
@@ -41,7 +41,7 @@ export default {
           avatar_template:
             "/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png",
           title: "co-founder",
-          last_seen_at: "2030-01-15T13:21:56.592Z"
+          last_seen_at: "2030-01-15T13:21:56.592Z",
         },
         {
           id: 19,
@@ -50,8 +50,8 @@ export default {
           avatar_template:
             "/user_avatar/meta.discourse.org/eviltrout/{size}/5275_2.png",
           title: "co-founder",
-          last_seen_at: "2030-01-14T18:03:08.232Z"
-        }
+          last_seen_at: "2030-01-14T18:03:08.232Z",
+        },
       ],
       moderators: [
         {
@@ -61,7 +61,7 @@ export default {
           avatar_template:
             "/user_avatar/meta.discourse.org/sam/{size}/102149_2.png",
           title: "co-founder",
-          last_seen_at: "2030-01-15T13:30:43.272Z"
+          last_seen_at: "2030-01-15T13:30:43.272Z",
         },
         {
           id: 32,
@@ -70,7 +70,7 @@ export default {
           avatar_template:
             "/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png",
           title: "co-founder",
-          last_seen_at: "2030-01-15T13:21:56.592Z"
+          last_seen_at: "2030-01-15T13:21:56.592Z",
         },
         {
           id: 19,
@@ -79,9 +79,9 @@ export default {
           avatar_template:
             "/user_avatar/meta.discourse.org/eviltrout/{size}/5275_2.png",
           title: "co-founder",
-          last_seen_at: "2030-01-14T18:03:08.232Z"
-        }
-      ]
-    }
-  }
+          last_seen_at: "2030-01-14T18:03:08.232Z",
+        },
+      ],
+    },
+  },
 };
diff --git a/app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js b/app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js
index eff532d496..ee4ce84b42 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js
@@ -1703,5 +1703,30 @@ export default {
         granted_by_id: -1
       }
     ]
+  },
+
+  "/admin/badges.json": {
+    admin_badges: {
+      triggers: []
+    },
+    badge_groupings: [],
+    badges: [
+      {
+        id: 1,
+        name: "Only icon",
+        icon: "fa-rocket",
+      },
+      {
+        id: 2,
+        name: "Only image",
+        image_url: "/assets/some-image.png",
+      },
+      {
+        id: 3,
+        name: "Both image and icon",
+        icon: "fa-rocket",
+        image_url: "/assets/some-image.png",
+      },
+    ]
   }
 };
diff --git a/app/assets/javascripts/discourse/tests/fixtures/category-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/category-fixtures.js
index c8625b03f4..1ee9cf607e 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/category-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/category-fixtures.js
@@ -38,5 +38,14 @@ export default {
       allow_badges: true,
       custom_fields: {}
     }
+  },
+  "/c/11/show.json": {
+    category: {
+      id: 11,
+      name: "testing",
+      color: "0088CC",
+      text_color: "FFFFFF",
+      slug: "testing"
+    }
   }
 };
diff --git a/app/assets/javascripts/discourse/tests/fixtures/dashboard-new-features.js b/app/assets/javascripts/discourse/tests/fixtures/dashboard-new-features.js
new file mode 100644
index 0000000000..fe9d50b791
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/fixtures/dashboard-new-features.js
@@ -0,0 +1,32 @@
+export default {
+  "/admin/dashboard/new-features.json": {
+    new_features: [
+      {
+        id: 1,
+        user_id: 127,
+        emoji: "😎",
+        title: "New color palettes",
+        description:
+          "New light and dark color palettes that adhere to Web Content Accessibility Guidelines. ",
+        tier: [],
+        link: "https://meta.discourse.org",
+        created_at: "2021-01-18T19:59:29.666Z",
+        updated_at: "2021-01-19T19:33:16.150Z",
+      },
+      {
+        id: 7,
+        user_id: 127,
+        emoji: "👱‍♀️",
+        title: "Suspend users quickly",
+        description:
+          "Staff can now suspend or silence a user immediately, without needing to visit the review queue or admin page. ",
+        tier: [],
+        link: "",
+        created_at: "2021-01-19T19:20:09.757Z",
+        updated_at: "2021-01-19T19:20:09.757Z",
+      }
+    ],
+    release_notes_link:
+      "https://meta.discourse.org/c/feature/announcements?tags=release-notes\u0026before=0",
+  },
+};
diff --git a/app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js
index f1a7867be6..615fe75086 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js
@@ -46,7 +46,9 @@ export default {
       is_group_owner: true,
       mentionable: true,
       messageable: true,
-      can_see_members: true
+      can_see_members: true,
+      has_messages: true,
+      message_count: 2
     },
     extras: {
       visible_group_names: ["discourse"]
diff --git a/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js
index 1f80714c4d..9c6069291a 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js
@@ -1,823 +1,63 @@
 export default {
   "/search.json": {
-    users: [
+    posts: [
       {
-        id: 19,
-        username: "eviltrout",
-        uploaded_avatar_id: 5275,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/eviltrout/{size}/5275_1.png"
+        id: 10,
+        name: "system",
+        username: "system",
+        avatar_template: "/letter_avatar_proxy/v4/letter/s/bcef8e/{size}.png",
+        created_at: "2020-12-22T05:50:15.898Z",
+        like_count: 0,
+        blurb:
+          "The first paragraph of this pinned topic will be visible as a welcome message to all new visitors on your homepage. It’s important! Edit this into a brief description of your community: Who is it for? What can they find here? Why should they come here? Where can they read more (links, resources, ...",
+        post_number: 1,
+        topic_id: 7,
       },
-      {
-        id: 8617,
-        username: "Mittineague",
-        uploaded_avatar_id: 40997,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/mittineague/{size}/40997_1.png"
-      },
-      {
-        id: 12662,
-        username: "singmajesty",
-        uploaded_avatar_id: 36342,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/singmajesty/{size}/36342_1.png"
-      },
-      {
-        id: 6626,
-        username: "riking",
-        uploaded_avatar_id: 40212,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/riking/{size}/40212_1.png"
-      },
-      {
-        id: 8300,
-        username: "cpradio",
-        uploaded_avatar_id: 4970,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/cpradio/{size}/4970_1.png"
-      },
-      {
-        id: 2602,
-        username: "georgekaplan59",
-        uploaded_avatar_id: 31197,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/georgekaplan59/{size}/31197_1.png"
-      },
-      {
-        id: 754,
-        username: "danneu",
-        uploaded_avatar_id: 6540,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/danneu/{size}/6540_1.png"
-      },
-      {
-        id: 1995,
-        username: "zogstrip",
-        uploaded_avatar_id: 8630,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/zogstrip/{size}/8630_1.png"
-      },
-      {
-        id: 1,
-        username: "sam",
-        uploaded_avatar_id: 5243,
-        avatar_template: "/user_avatar/meta.discourse.org/sam/{size}/5243_1.png"
-      },
-      {
-        id: 8810,
-        username: "fantasticfears",
-        uploaded_avatar_id: 36351,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/fantasticfears/{size}/36351_1.png"
-      },
-      {
-        id: 14446,
-        username: "ladydanger",
-        uploaded_avatar_id: null,
-        avatar_template:
-          "/letter_avatar/ladydanger/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
-      },
-      {
-        id: 14474,
-        username: "dnatoli_redbubble",
-        uploaded_avatar_id: null,
-        avatar_template:
-          "/letter_avatar/dnatoli_redbubble/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
-      },
-      {
-        id: 14514,
-        username: "adelsmee",
-        uploaded_avatar_id: 40445,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/adelsmee/{size}/40445_1.png"
-      },
-      {
-        id: 32,
-        username: "codinghorror",
-        uploaded_avatar_id: 5297,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297_1.png"
-      },
-      {
-        id: 14448,
-        username: "snjqi188",
-        uploaded_avatar_id: null,
-        avatar_template:
-          "/letter_avatar/snjqi188/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
-      },
-      {
-        id: 14657,
-        username: "Alex_Flom",
-        uploaded_avatar_id: 41037,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/alex_flom/{size}/41037_1.png"
-      },
-      {
-        id: 14353,
-        username: "Simon_Cossar",
-        uploaded_avatar_id: 40130,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/simon_cossar/{size}/40130_1.png"
-      },
-      {
-        id: 14184,
-        username: "takaminacchan",
-        uploaded_avatar_id: 39685,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/takaminacchan/{size}/39685_1.png"
-      },
-      {
-        id: 9931,
-        username: "Frank",
-        uploaded_avatar_id: null,
-        avatar_template:
-          "/letter_avatar/frank/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
-      },
-      {
-        id: 8364,
-        username: "codetricity",
-        uploaded_avatar_id: 3773,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/codetricity/{size}/3773_1.png"
-      },
-      {
-        id: 4949,
-        username: "brodock",
-        uploaded_avatar_id: 13541,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/brodock/{size}/13541_1.png"
-      },
-      {
-        id: 14,
-        username: "clay",
-        uploaded_avatar_id: 5265,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/clay/{size}/5265_1.png"
-      },
-      {
-        id: 8385,
-        username: "zchrykng",
-        uploaded_avatar_id: 18517,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/zchrykng/{size}/18517_1.png"
-      },
-      {
-        id: 3520,
-        username: "arlyxiao",
-        uploaded_avatar_id: 11206,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/arlyxiao/{size}/11206_1.png"
-      },
-      {
-        id: 3493,
-        username: "richp10",
-        uploaded_avatar_id: 11160,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/richp10/{size}/11160_1.png"
-      },
-      {
-        id: 2395,
-        username: "lookingsideways",
-        uploaded_avatar_id: 9290,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/lookingsideways/{size}/9290_1.png"
-      },
-      {
-        id: 2477,
-        username: "billybonks",
-        uploaded_avatar_id: 9430,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/billybonks/{size}/9430_1.png"
-      },
-      {
-        id: 7301,
-        username: "jasonwhat",
-        uploaded_avatar_id: null,
-        avatar_template:
-          "/letter_avatar/jasonwhat/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
-      },
-      {
-        id: 1819,
-        username: "stephan",
-        uploaded_avatar_id: 8327,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/stephan/{size}/8327_1.png"
-      },
-      {
-        id: 2,
-        username: "neil",
-        uploaded_avatar_id: 5245,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/neil/{size}/5245_1.png"
-      },
-      {
-        id: 2471,
-        username: "robconery",
-        uploaded_avatar_id: 9418,
-        avatar_template:
-          "/user_avatar/meta.discourse.org/robconery/{size}/9418_1.png"
-      }
     ],
-    topic_list: {
+    topics: [
+      {
+        id: 7,
+        title: "Welcome to Discourse",
+        fancy_title: "Welcome to Discourse",
+        slug: "welcome-to-discourse",
+        posts_count: 1,
+        reply_count: 0,
+        highest_post_number: 1,
+        created_at: "2020-12-22T05:50:15.837Z",
+        last_posted_at: "2020-12-22T05:50:15.898Z",
+        bumped: true,
+        bumped_at: "2020-12-22T05:50:15.898Z",
+        archetype: "regular",
+        unseen: false,
+        pinned: true,
+        unpinned: null,
+        excerpt:
+          "The first paragraph of this pinned topic will be visible as a welcome message to all new visitors on your homepage. It’s important! \nEdit this into a brief description of your community: \n\nWho is it for?\nWhat can they fi&hellip;",
+        visible: true,
+        closed: false,
+        archived: false,
+        bookmarked: null,
+        liked: null,
+        category_id: 1,
+      },
+    ],
+    users: [],
+    categories: [],
+    groups: [],
+    grouped_search_result: {
+      more_posts: null,
+      more_users: null,
+      more_categories: null,
+      term: "discourse",
+      search_log_id: 2,
+      more_full_page_results: null,
       can_create_topic: false,
-      draft: null,
-      draft_key: "new_topic",
-      draft_sequence: null,
-      per_page: 30,
-      topics: [
-        {
-          id: 9318,
-          title: "Discourse has a new Markdown Parser!",
-          fancy_title: "Discourse has a new Markdown Parser!",
-          slug: "discourse-has-a-new-markdown-parser",
-          posts_count: 1,
-          reply_count: 0,
-          highest_post_number: 1,
-          image_url: null,
-          created_at: "2013-08-24T18:08:06.063Z",
-          last_posted_at: "2013-08-24T18:08:06.259Z",
-          bumped: true,
-          bumped_at: "2015-03-09T04:54:43.977Z",
-          unseen: false,
-          linked_post_number: 1,
-          pinned: false,
-          unpinned: null,
-          excerpt:
-            '...0 lines of Javascript code! An inline example Let\'s say you want to replace all occurances of "evil trout" with a link that says "EVIL TROUT IS AWESOME": Discourse.Dialect.on("register", function(event) {...',
-          visible: true,
-          closed: false,
-          archived: false,
-          bookmarked: null,
-          liked: null,
-          views: 2645,
-          like_count: 21,
-          has_summary: false,
-          archetype: "regular",
-          last_poster_username: "eviltrout",
-          category_id: 7,
-          pinned_globally: false,
-          posters: [
-            {
-              extras: "latest single",
-              description: "Original Poster, Most Recent Poster",
-              user_id: 19
-            }
-          ]
-        },
-        {
-          id: 21792,
-          title: "Adding custom emoji/emoticons via a plugin",
-          fancy_title: "Adding custom emoji/emoticons via a plugin",
-          slug: "adding-custom-emoji-emoticons-via-a-plugin",
-          posts_count: 34,
-          reply_count: 24,
-          highest_post_number: 35,
-          image_url: null,
-          created_at: "2014-11-03T21:48:48.283Z",
-          last_posted_at: "2014-12-23T12:45:11.245Z",
-          bumped: true,
-          bumped_at: "2014-12-23T12:45:11.245Z",
-          unseen: false,
-          linked_post_number: 1,
-          pinned: false,
-          unpinned: null,
-          excerpt:
-            "...plugin that executes the following method to register a new emoji: Discourse.Dialect.registerEmoji('trout', 'http://cdn.eviltrout.com/images/trout-square.jpg'); Here's a sample plugin that adds a :trout: e...",
-          visible: true,
-          closed: false,
-          archived: false,
-          bookmarked: null,
-          liked: null,
-          views: 1260,
-          like_count: 25,
-          has_summary: false,
-          archetype: "regular",
-          last_poster_username: "cpradio",
-          category_id: 22,
-          pinned_globally: false,
-          posters: [
-            {
-              extras: null,
-              description: "Original Poster",
-              user_id: 19
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 8617
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 12662
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 6626
-            },
-            {
-              extras: "latest",
-              description: "Most Recent Poster",
-              user_id: 8300
-            }
-          ]
-        },
-        {
-          id: 3071,
-          title: "Would it be possible to make Slug localizable?",
-          fancy_title: "Would it be possible to make Slug localizable?",
-          slug: "would-it-be-possible-to-make-slug-localizable",
-          posts_count: 12,
-          reply_count: 7,
-          highest_post_number: 12,
-          image_url: null,
-          created_at: "2013-02-14T11:48:21.474Z",
-          last_posted_at: "2014-09-18T14:38:59.064Z",
-          bumped: true,
-          bumped_at: "2014-09-18T14:38:59.064Z",
-          unseen: false,
-          linked_post_number: 10,
-          pinned: false,
-          unpinned: null,
-          excerpt:
-            "...in `block (2 levels) in &lt; top (required) &gt; ' 3) Slug replaces symbols Failure/Error: Slug.for('evil#trout').should == 'evil-trout' expected: \"evil-trout\" got: \"evil-number-trout\" (using ==) # ./spec/compon...",
-          visible: true,
-          closed: false,
-          archived: false,
-          bookmarked: null,
-          liked: null,
-          views: 766,
-          like_count: 5,
-          has_summary: false,
-          archetype: "regular",
-          last_poster_username: "fantasticfears",
-          category_id: 17,
-          pinned_globally: false,
-          posters: [
-            {
-              extras: null,
-              description: "Original Poster",
-              user_id: 2602
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 754
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 1995
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 1
-            },
-            {
-              extras: "latest",
-              description: "Most Recent Poster",
-              user_id: 8810
-            }
-          ]
-        },
-        {
-          id: 26875,
-          title: "Rails Girls SoC Banter",
-          fancy_title: "Rails Girls SoC Banter",
-          slug: "rails-girls-soc-banter",
-          posts_count: 48,
-          reply_count: 30,
-          highest_post_number: 48,
-          image_url: null,
-          created_at: "2015-03-27T11:26:09.903Z",
-          last_posted_at: "2015-07-13T23:11:31.481Z",
-          bumped: true,
-          bumped_at: "2015-07-13T23:11:31.481Z",
-          unseen: false,
-          linked_post_number: 42,
-          pinned: false,
-          unpinned: null,
-          excerpt:
-            '...e inserted by plugins. ## Usage If you handlebars template has: ```handlebars {{plugin-outlet "evil-trout"}} ``` Then any handlebars files you create in the `connectors/evil-trout` directory will automatic...',
-          visible: true,
-          closed: false,
-          archived: false,
-          bookmarked: null,
-          liked: null,
-          views: 1224,
-          like_count: 81,
-          has_summary: false,
-          archetype: "regular",
-          last_poster_username: "snjqi188",
-          category_id: 7,
-          pinned_globally: false,
-          posters: [
-            {
-              extras: null,
-              description: "Original Poster",
-              user_id: 14446
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 14474
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 14514
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 32
-            },
-            {
-              extras: "latest",
-              description: "Most Recent Poster",
-              user_id: 14448
-            }
-          ]
-        },
-        {
-          id: 31001,
-          title:
-            "Beginner's Guide to Creating Discourse Plugins Part 2: Plugin Outlets",
-          fancy_title:
-            "Beginner&rsquo;s Guide to Creating Discourse Plugins Part 2: Plugin Outlets",
-          slug:
-            "beginners-guide-to-creating-discourse-plugins-part-2-plugin-outlets",
-          posts_count: 1,
-          reply_count: 0,
-          highest_post_number: 1,
-          image_url: null,
-          created_at: "2015-07-12T17:48:27.322Z",
-          last_posted_at: "2015-07-12T17:48:27.403Z",
-          bumped: true,
-          bumped_at: "2015-07-13T04:18:14.901Z",
-          unseen: false,
-          linked_post_number: 1,
-          pinned: false,
-          unpinned: null,
-          excerpt:
-            '...nectors/ &lt; outlet name &gt; in it. For example, if your handlebars template has: {{plugin-outlet "evil-trout"}} Then any handlebars files you create in the connectors/evil-trout directory will automatically b...',
-          visible: true,
-          closed: false,
-          archived: false,
-          bookmarked: null,
-          liked: null,
-          views: 220,
-          like_count: 16,
-          has_summary: false,
-          archetype: "regular",
-          last_poster_username: "eviltrout",
-          category_id: 10,
-          pinned_globally: false,
-          posters: [
-            {
-              extras: "latest single",
-              description: "Original Poster, Most Recent Poster",
-              user_id: 19
-            }
-          ]
-        },
-        {
-          id: 29176,
-          title:
-            "How can I add some custom html to the bottom of the categories page?",
-          fancy_title:
-            "How can I add some custom html to the bottom of the categories page?",
-          slug:
-            "how-can-i-add-some-custom-html-to-the-bottom-of-the-categories-page",
-          posts_count: 12,
-          reply_count: 10,
-          highest_post_number: 13,
-          image_url: null,
-          created_at: "2015-05-23T19:08:35.447Z",
-          last_posted_at: "2015-05-25T08:16:25.989Z",
-          bumped: true,
-          bumped_at: "2015-05-25T08:16:25.989Z",
-          unseen: false,
-          linked_post_number: 12,
-          pinned: false,
-          unpinned: null,
-          excerpt:
-            '...e inserted by plugins. ## Usage If you handlebars template has: ```handlebars {{plugin-outlet "evil-trout"}} ``` Then any handlebars files you create in the `connectors/evil-trout` directory will automatic...',
-          visible: true,
-          closed: false,
-          archived: false,
-          bookmarked: null,
-          liked: null,
-          views: 190,
-          like_count: 8,
-          has_summary: false,
-          archetype: "regular",
-          last_poster_username: "sam",
-          category_id: 6,
-          pinned_globally: false,
-          posters: [
-            {
-              extras: null,
-              description: "Original Poster",
-              user_id: 14657
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 6626
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 8617
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 14353
-            },
-            {
-              extras: "latest",
-              description: "Most Recent Poster",
-              user_id: 1
-            }
-          ]
-        },
-        {
-          id: 26192,
-          title: "403 when embedding a DigitalOcean droplet",
-          fancy_title: "403 when embedding a DigitalOcean droplet",
-          slug: "403-when-embedding-a-digital-ocean-droplet",
-          posts_count: 7,
-          reply_count: 3,
-          highest_post_number: 7,
-          image_url: null,
-          created_at: "2015-03-10T21:22:19.206Z",
-          last_posted_at: "2015-03-11T22:31:04.520Z",
-          bumped: true,
-          bumped_at: "2015-03-11T22:31:04.520Z",
-          unseen: false,
-          linked_post_number: 4,
-          pinned: false,
-          unpinned: null,
-          excerpt:
-            "Yes I am Robin as well as Evil Trout smile :smile: If you followed those instructions and are getting access errors, you might want to d...",
-          visible: true,
-          closed: false,
-          archived: false,
-          bookmarked: null,
-          liked: null,
-          views: 232,
-          like_count: 2,
-          has_summary: false,
-          archetype: "regular",
-          last_poster_username: "codinghorror",
-          category_id: 6,
-          pinned_globally: false,
-          posters: [
-            {
-              extras: null,
-              description: "Original Poster",
-              user_id: 14184
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 19
-            },
-            {
-              extras: "latest",
-              description: "Most Recent Poster",
-              user_id: 32
-            }
-          ]
-        },
-        {
-          id: 20883,
-          title: "S3 competitor integration",
-          fancy_title: "S3 competitor integration",
-          slug: "s3-competitor-integration",
-          posts_count: 3,
-          reply_count: 1,
-          highest_post_number: 3,
-          image_url:
-            "https://discourse-cdn.global.ssl.fastly.net/meta/images/emoji/twitter/smile.png?v=1",
-          created_at: "2014-10-07T13:37:19.628Z",
-          last_posted_at: "2014-10-07T18:46:22.493Z",
-          bumped: true,
-          bumped_at: "2014-10-07T18:46:22.493Z",
-          unseen: false,
-          linked_post_number: 3,
-          pinned: false,
-          unpinned: null,
-          excerpt:
-            "I have seem some of your testing 'stuff' (evil trout's actually). And it looks like a HUUUUUUUUGGGE time sink (ice pick to the eyeballs). but...I believ...",
-          visible: true,
-          closed: false,
-          archived: false,
-          bookmarked: null,
-          liked: null,
-          views: 141,
-          like_count: 2,
-          has_summary: false,
-          archetype: "regular",
-          last_poster_username: "Frank",
-          category_id: 2,
-          pinned_globally: false,
-          posters: [
-            {
-              extras: "latest",
-              description: "Original Poster, Most Recent Poster",
-              user_id: 9931
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 1995
-            }
-          ]
-        },
-        {
-          id: 13534,
-          title: "Blogging Platforms, Ghost, and Discourse",
-          fancy_title: "Blogging Platforms, Ghost, and Discourse",
-          slug: "blogging-platforms-ghost-and-discourse",
-          posts_count: 18,
-          reply_count: 13,
-          highest_post_number: 18,
-          image_url: null,
-          created_at: "2014-03-08T15:46:35.174Z",
-          last_posted_at: "2014-03-26T18:25:45.895Z",
-          bumped: true,
-          bumped_at: "2014-03-26T18:25:45.895Z",
-          unseen: false,
-          linked_post_number: 1,
-          pinned: false,
-          unpinned: null,
-          excerpt:
-            "...urse, do you mean that the blog comments for Ghost will be driven by Discourse, similar to the Evil Trout blog ? What about using Discourse as the blog platform itself, not as the comment engine at the end...",
-          visible: true,
-          closed: false,
-          archived: false,
-          bookmarked: null,
-          liked: null,
-          views: 2182,
-          like_count: 17,
-          has_summary: false,
-          archetype: "regular",
-          last_poster_username: "codetricity",
-          category_id: 17,
-          pinned_globally: false,
-          posters: [
-            {
-              extras: "latest",
-              description: "Original Poster, Most Recent Poster",
-              user_id: 8364
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 4949
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 14
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 32
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 8385
-            }
-          ]
-        },
-        {
-          id: 4859,
-          title: "All of the site functions based on ajax?",
-          fancy_title: "All of the site functions based on ajax?",
-          slug: "all-of-the-site-functions-based-on-ajax",
-          posts_count: 28,
-          reply_count: 20,
-          highest_post_number: 28,
-          image_url: null,
-          created_at: "2013-03-18T08:59:46.135Z",
-          last_posted_at: "2013-10-18T20:22:30.677Z",
-          bumped: true,
-          bumped_at: "2013-10-18T20:22:30.677Z",
-          unseen: false,
-          linked_post_number: 21,
-          pinned: false,
-          unpinned: null,
-          excerpt:
-            "please see evil trouts blog post http://eviltrout.com/2013/02/27/adding-to-discourse-part-1.html",
-          visible: true,
-          closed: false,
-          archived: false,
-          bookmarked: null,
-          liked: null,
-          views: 1629,
-          like_count: 17,
-          has_summary: false,
-          archetype: "regular",
-          last_poster_username: "jasonwhat",
-          category_id: 17,
-          pinned_globally: false,
-          posters: [
-            {
-              extras: null,
-              description: "Original Poster",
-              user_id: 3520
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 3493
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 2395
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 2477
-            },
-            {
-              extras: "latest",
-              description: "Most Recent Poster",
-              user_id: 7301
-            }
-          ]
-        },
-        {
-          id: 7220,
-          title: "Javascript dependencies",
-          fancy_title: "Javascript dependencies",
-          slug: "javascript-dependencies",
-          posts_count: 8,
-          reply_count: 5,
-          highest_post_number: 8,
-          image_url: null,
-          created_at: "2013-06-06T11:11:18.522Z",
-          last_posted_at: "2013-06-07T18:43:51.449Z",
-          bumped: true,
-          bumped_at: "2013-06-07T18:43:51.449Z",
-          unseen: false,
-          linked_post_number: 3,
-          pinned: false,
-          unpinned: null,
-          excerpt:
-            "...ould be in vendor directory of one of the gems Ahh I need to look at Gemfile Ahh I need to use Evil Trouts bundle open handlebars trick. I am completely against this new best practice, its inconsistent wit...",
-          visible: true,
-          closed: false,
-          archived: false,
-          bookmarked: null,
-          liked: null,
-          views: 1010,
-          like_count: 0,
-          has_summary: false,
-          archetype: "regular",
-          last_poster_username: "eviltrout",
-          category_id: 7,
-          pinned_globally: false,
-          posters: [
-            {
-              extras: null,
-              description: "Original Poster",
-              user_id: 1819
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 2
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 1
-            },
-            {
-              extras: null,
-              description: "Frequent Poster",
-              user_id: 2471
-            },
-            {
-              extras: "latest",
-              description: "Most Recent Poster",
-              user_id: 19
-            }
-          ]
-        }
-      ]
-    }
+      error: null,
+      post_ids: [10],
+      user_ids: [],
+      category_ids: [],
+      group_ids: [],
+    },
   },
   "search/query": {
     posts: [
@@ -856,44 +96,44 @@ export default {
             id: 2,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 3,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 4,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 5,
             count: 0,
             hidden: true,
-            can_act: false
+            can_act: false,
           },
           {
             id: 6,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 7,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 8,
             count: 0,
             hidden: false,
-            can_act: false
-          }
+            can_act: false,
+          },
         ],
         moderator: false,
         admin: false,
@@ -908,7 +148,7 @@ export default {
         can_view_edit_history: true,
         wiki: false,
         blurb:
-          "I've gotten vagrant up and running with a development environment but it's taking forever to load. For example http://192.168.10.200:3000/ takes..."
+          "I've gotten vagrant up and running with a development environment but it's taking forever to load. For example http://192.168.10.200:3000/ takes...",
       },
       {
         id: 48887,
@@ -946,44 +186,44 @@ export default {
             id: 2,
             count: 15,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 3,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 4,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 5,
             count: 0,
             hidden: true,
-            can_act: false
+            can_act: false,
           },
           {
             id: 6,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 7,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 8,
             count: 0,
             hidden: false,
-            can_act: false
-          }
+            can_act: false,
+          },
         ],
         moderator: true,
         admin: true,
@@ -998,7 +238,7 @@ export default {
         can_view_edit_history: true,
         wiki: true,
         blurb:
-          "So you want to set up Discourse on Ubuntu to hack on and develop with? We'll assume that you don't have Ruby/Rails/Postgre/Redis installed on your Ubuntu system..."
+          "So you want to set up Discourse on Ubuntu to hack on and develop with? We'll assume that you don't have Ruby/Rails/Postgre/Redis installed on your Ubuntu system...",
       },
       {
         id: 53437,
@@ -1036,44 +276,44 @@ export default {
             id: 2,
             count: 13,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 3,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 4,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 5,
             count: 0,
             hidden: true,
-            can_act: false
+            can_act: false,
           },
           {
             id: 6,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 7,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 8,
             count: 0,
             hidden: false,
-            can_act: false
-          }
+            can_act: false,
+          },
         ],
         moderator: true,
         admin: true,
@@ -1088,7 +328,7 @@ export default {
         can_view_edit_history: true,
         wiki: true,
         blurb:
-          "So you want to set up Discourse on Mac OS X to hack on and develop with? We'll assume that you don't have Ruby/Rails/Postgre/Redis installed on your Mac. Let's be..."
+          "So you want to set up Discourse on Mac OS X to hack on and develop with? We'll assume that you don't have Ruby/Rails/Postgre/Redis installed on your Mac. Let's be...",
       },
       {
         id: 38398,
@@ -1125,44 +365,44 @@ export default {
             id: 2,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 3,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 4,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 5,
             count: 0,
             hidden: true,
-            can_act: false
+            can_act: false,
           },
           {
             id: 6,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 7,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 8,
             count: 0,
             hidden: false,
-            can_act: false
-          }
+            can_act: false,
+          },
         ],
         moderator: false,
         admin: false,
@@ -1177,7 +417,7 @@ export default {
         can_view_edit_history: true,
         wiki: false,
         blurb:
-          "...ed to do is go to /admin/docker , refresh once, hit upgrade, and test it out. What is the preferred development environment these days? I have Vagrant up and running as recommended in Discourse as Your F..."
+          "...ed to do is go to /admin/docker , refresh once, hit upgrade, and test it out. What is the preferred development environment these days? I have Vagrant up and running as recommended in Discourse as Your F...",
       },
       {
         id: 4782,
@@ -1214,44 +454,44 @@ export default {
             id: 2,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 3,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 4,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 5,
             count: 0,
             hidden: true,
-            can_act: false
+            can_act: false,
           },
           {
             id: 6,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 7,
             count: 0,
             hidden: false,
-            can_act: false
+            can_act: false,
           },
           {
             id: 8,
             count: 0,
             hidden: false,
-            can_act: false
-          }
+            can_act: false,
+          },
         ],
         moderator: false,
         admin: false,
@@ -1266,8 +506,8 @@ export default {
         can_view_edit_history: true,
         wiki: false,
         blurb:
-          "Is there any trick to getting a dev instance to send email? I managed to get a copy set up and running, but when I sign up, the email n..."
-      }
+          "Is there any trick to getting a dev instance to send email? I managed to get a copy set up and running, but when I sign up, the email n...",
+      },
     ],
     topics: [
       {
@@ -1299,7 +539,7 @@ export default {
         category_id: 7,
         pinned_globally: false,
         posters: [],
-        tags: ["dev", "slow"]
+        tags: ["dev", "slow"],
       },
       {
         id: 14727,
@@ -1331,7 +571,7 @@ export default {
         last_poster_username: null,
         category_id: 10,
         pinned_globally: false,
-        posters: []
+        posters: [],
       },
       {
         id: 15772,
@@ -1365,7 +605,7 @@ export default {
         last_poster_username: null,
         category_id: 10,
         pinned_globally: false,
-        posters: []
+        posters: [],
       },
       {
         id: 12170,
@@ -1395,7 +635,7 @@ export default {
         last_poster_username: null,
         category_id: 7,
         pinned_globally: false,
-        posters: []
+        posters: [],
       },
       {
         id: 2507,
@@ -1425,8 +665,8 @@ export default {
         last_poster_username: null,
         category_id: 7,
         pinned_globally: false,
-        posters: []
-      }
+        posters: [],
+      },
     ],
     users: [
       {
@@ -1434,36 +674,36 @@ export default {
         username: "dev",
         uploaded_avatar_id: null,
         avatar_template:
-          "/letter_avatar/dev/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
+          "/letter_avatar/dev/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png",
       },
       {
         id: 13166,
         username: "devon",
         uploaded_avatar_id: 37175,
         avatar_template:
-          "/user_avatar/meta.discourse.org/devon/{size}/37175_1.png"
+          "/user_avatar/meta.discourse.org/devon/{size}/37175_1.png",
       },
       {
         id: 12979,
         username: "devlesedi",
         uploaded_avatar_id: null,
         avatar_template:
-          "/letter_avatar/devlesedi/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
+          "/letter_avatar/devlesedi/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png",
       },
       {
         id: 13381,
         username: "devwizard",
         uploaded_avatar_id: null,
         avatar_template:
-          "/letter_avatar/devwizard/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
+          "/letter_avatar/devwizard/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png",
       },
       {
         id: 5993,
         username: "devmach",
         uploaded_avatar_id: null,
         avatar_template:
-          "/letter_avatar/devmach/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
-      }
+          "/letter_avatar/devmach/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png",
+      },
     ],
     categories: [
       {
@@ -1481,8 +721,8 @@ export default {
         topic_url: "/t/category-definition-for-dev/1026",
         read_restricted: false,
         permission: null,
-        notification_level: null
-      }
+        notification_level: null,
+      },
     ],
     grouped_search_result: {
       term: "dev",
@@ -1491,7 +731,7 @@ export default {
       more_categories: null,
       post_ids: [3833, 48887, 53437, 38398, 4782],
       user_ids: [3229, 13166, 12979, 13381, 5993],
-      category_ids: [7]
-    }
-  }
+      category_ids: [7],
+    },
+  },
 };
diff --git a/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
index 16519bb0a7..bdcbe345ce 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
@@ -31,7 +31,8 @@ export default {
       akismet_review_count: 0,
       title_count_mode: "notifications",
       timezone: "Australia/Brisbane",
-      skip_new_user_tips: false
+      skip_new_user_tips: false,
+      can_review: true
     }
   }
 };
diff --git a/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js
index 84746aa976..2f7ca15793 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js
@@ -576,7 +576,6 @@ export default {
           custom_url: null,
           pretty_name_override: null,
           title_override: null,
-          message_override: null,
           frame_width: 580,
           frame_height: 400,
           can_connect: true,
diff --git a/app/assets/javascripts/discourse/tests/fixtures/site-settings.js b/app/assets/javascripts/discourse/tests/fixtures/site-settings.js
index ef9a4ce1d0..c35e10b069 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/site-settings.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/site-settings.js
@@ -14,7 +14,7 @@ export default {
       {
         setting: "contact_email",
         description:
-          "Email address of key contact responsible for this site. Used for critical notifications, as well as on the /about contact form for urgent matters.",
+          "Email address of key contact responsible for this site. Used for critical notifications and displayed on the /about page for urgent matters.",
         default: "",
         value: "",
         category: "required",
diff --git a/app/assets/javascripts/discourse/tests/fixtures/topic.js b/app/assets/javascripts/discourse/tests/fixtures/topic.js
index 2f4a97a684..95debff3a2 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/topic.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/topic.js
@@ -374,7 +374,7 @@ export default {
           uploaded_avatar_id: 40181,
           created_at: "2013-02-05T21:32:47.649Z",
           cooked:
-            '<p>The application strings <a href="https://github.com/discourse/discourse/blob/master/config/locales/en.yml" rel="nofollow">are externalized</a>, so localization should be entirely possible with enough translation effort.</p>',
+            '<p>The application strings <a href="https://github.com/discourse/discourse/blob/master/config/locales/en.yml" rel="nofollow">are externalized</a>, so localization should be entirely possible with enough translation effort.</p><p>Link for unknown-test: <a href="/c/category-does-not-exist/99999" data-for-test="category-404">link</a></p>',
           post_number: 2,
           post_type: 1,
           updated_at: "2013-02-06T10:15:27.965Z",
@@ -2205,6 +2205,8 @@ export default {
     details: {
       can_publish_page: true,
       can_invite_via_email: true,
+      can_toggle_topic_visibility: true,
+      can_pin_unpin_topic: true,
       auto_close_at: null,
       auto_close_hours: null,
       auto_close_based_on_last_post: false,
@@ -4031,6 +4033,7 @@ export default {
     archetype: "regular",
     slug: "this-is-a-test-topic",
     category_id: 24,
+    is_shared_draft: true,
     word_count: 15,
     deleted_at: null,
     user_id: 1,
@@ -5592,8 +5595,10 @@ export default {
       can_review_topic: true,
       can_close_topic: true,
       can_archive_topic: true,
+      can_toggle_topic_visibility: true,
       can_split_merge_topic: true,
       can_edit_staff_notes: true,
+      can_pin_unpin_topic: true,
       can_moderate_category: true,
       participants: [
         {
diff --git a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js
index d88adf7792..717142ebaf 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js
@@ -7,7 +7,7 @@ export default {
         granted_at: "2014-05-16T02:39:38.388Z",
         badge_id: 4,
         user_id: 19,
-        granted_by_id: -1
+        granted_by_id: -1,
       },
       {
         id: 40673,
@@ -17,15 +17,15 @@ export default {
         badge_id: 23,
         user_id: 19,
         granted_by_id: -1,
-        topic_id: 3153
+        topic_id: 3153,
       },
       {
         id: 5868,
         granted_at: "2014-05-16T02:39:38.380Z",
         badge_id: 3,
         user_id: 19,
-        granted_by_id: -1
-      }
+        granted_by_id: -1,
+      },
     ],
     badges: [
       {
@@ -41,7 +41,7 @@ export default {
         enabled: true,
         badge_grouping_id: 4,
         system: true,
-        badge_type_id: 1
+        badge_type_id: 1,
       },
       {
         id: 23,
@@ -56,7 +56,7 @@ export default {
         enabled: true,
         badge_grouping_id: 2,
         system: true,
-        badge_type_id: 1
+        badge_type_id: 1,
       },
       {
         id: 3,
@@ -71,13 +71,13 @@ export default {
         enabled: true,
         badge_grouping_id: 4,
         system: true,
-        badge_type_id: 2
-      }
+        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 }
+      { id: 3, name: "Bronze", sort_order: 7 },
     ],
     users: [
       {
@@ -85,15 +85,15 @@ export default {
         username: "eviltrout",
         uploaded_avatar_id: null,
         avatar_template:
-          "/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
+          "/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
       },
       {
         id: -1,
         username: "system",
         uploaded_avatar_id: null,
         avatar_template:
-          "/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
-      }
+          "/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
+      },
     ],
     topics: [
       {
@@ -102,12 +102,12 @@ export default {
         fancy_title:
           "Is it better for Discourse to use JavaScript or CoffeeScript?",
         slug: "is-it-better-for-discourse-to-use-javascript-or-coffeescript",
-        posts_count: 56
-      }
+        posts_count: 56,
+      },
     ],
     user: {
       user_option: {
-        text_size_seq: 1
+        text_size_seq: 1,
       },
       id: 19,
       username: "eviltrout",
@@ -120,8 +120,8 @@ export default {
         {
           name: "facebook",
           description: "robin.ward@example.com",
-          can_revoke: true
-        }
+          can_revoke: true,
+        },
       ],
       last_posted_at: "2015-05-07T15:23:35.074Z",
       last_seen_at: "2015-05-13T14:34:23.188Z",
@@ -147,7 +147,7 @@ export default {
         { action_type: 7, count: 949, id: null },
         { action_type: 9, count: 42, id: null },
         { action_type: 3, count: 8, id: null },
-        { action_type: 11, count: 20, id: null }
+        { action_type: 11, count: 20, id: null },
       ],
       can_send_private_messages: true,
       can_send_private_message_to_user: false,
@@ -161,7 +161,7 @@ export default {
       notification_count: 3244,
       has_title_badges: true,
       custom_fields: {},
-      user_fields: { "1": "33" },
+      user_fields: { 1: "33" },
       pending_count: 0,
       post_count: 1987,
       can_be_deleted: false,
@@ -196,7 +196,7 @@ export default {
         username: "sam",
         uploaded_avatar_id: null,
         avatar_template:
-          "/letter_avatar/sam/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
+          "/letter_avatar/sam/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
       },
       custom_groups: [
         {
@@ -208,7 +208,7 @@ export default {
           visible: true,
           automatic_membership_email_domains: null,
           primary_group: false,
-          title: null
+          title: null,
         },
         {
           id: 47,
@@ -219,8 +219,8 @@ export default {
           visible: true,
           automatic_membership_email_domains: null,
           primary_group: false,
-          title: null
-        }
+          title: null,
+        },
       ],
       featured_user_badge_ids: [5870, 40673, 5868],
       card_badge: {
@@ -237,7 +237,7 @@ export default {
         enabled: false,
         badge_grouping_id: 8,
         system: false,
-        badge_type_id: 3
+        badge_type_id: 3,
       },
       user_auth_tokens: [
         {
@@ -250,7 +250,7 @@ export default {
           icon: "fab-linux",
           created_at: "2018-09-08T21:22:56.225Z",
           seen_at: "2018-09-08T21:22:56.512Z",
-          is_active: false
+          is_active: false,
         },
         {
           id: 3,
@@ -262,7 +262,7 @@ export default {
           icon: "fab-linux",
           created_at: "2018-09-08T21:33:41.616Z",
           seen_at: "2018-09-08T21:33:42.209Z",
-          is_active: true
+          is_active: true,
         },
         {
           id: 6,
@@ -274,10 +274,27 @@ export default {
           icon: "fab-windows",
           created_at: "2018-09-07T21:44:41.616Z",
           seen_at: "2018-09-08T21:44:42.209Z",
-          is_active: false
-        }
-      ]
-    }
+          is_active: false,
+        },
+      ],
+      user_notification_schedule: {
+        enabled: false,
+        day_0_start_time: 480,
+        day_0_end_time: 1020,
+        day_1_start_time: 480,
+        day_1_end_time: 1020,
+        day_2_start_time: 480,
+        day_2_end_time: 1020,
+        day_3_start_time: 480,
+        day_3_end_time: 1020,
+        day_4_start_time: 480,
+        day_4_end_time: 1020,
+        day_5_start_time: 480,
+        day_5_end_time: 1020,
+        day_6_start_time: 480,
+        day_6_end_time: 1020,
+      },
+    },
   },
   "/u/eviltrout/card.json": {
     user_badges: [
@@ -286,7 +303,7 @@ export default {
         granted_at: "2014-05-16T02:39:38.388Z",
         badge_id: 4,
         user_id: 19,
-        granted_by_id: -1
+        granted_by_id: -1,
       },
       {
         id: 40673,
@@ -296,15 +313,15 @@ export default {
         badge_id: 23,
         user_id: 19,
         granted_by_id: -1,
-        topic_id: 3153
+        topic_id: 3153,
       },
       {
         id: 5868,
         granted_at: "2014-05-16T02:39:38.380Z",
         badge_id: 3,
         user_id: 19,
-        granted_by_id: -1
-      }
+        granted_by_id: -1,
+      },
     ],
     badges: [
       {
@@ -320,7 +337,7 @@ export default {
         enabled: true,
         badge_grouping_id: 4,
         system: true,
-        badge_type_id: 1
+        badge_type_id: 1,
       },
       {
         id: 23,
@@ -335,7 +352,7 @@ export default {
         enabled: true,
         badge_grouping_id: 2,
         system: true,
-        badge_type_id: 1
+        badge_type_id: 1,
       },
       {
         id: 3,
@@ -350,13 +367,13 @@ export default {
         enabled: true,
         badge_grouping_id: 4,
         system: true,
-        badge_type_id: 2
-      }
+        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 }
+      { id: 3, name: "Bronze", sort_order: 7 },
     ],
     users: [
       {
@@ -364,15 +381,15 @@ export default {
         username: "eviltrout",
         uploaded_avatar_id: null,
         avatar_template:
-          "/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
+          "/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
       },
       {
         id: -1,
         username: "system",
         uploaded_avatar_id: null,
         avatar_template:
-          "/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
-      }
+          "/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
+      },
     ],
     user: {
       id: 19,
@@ -395,8 +412,8 @@ export default {
         '<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]
-    }
+      featured_user_badge_ids: [5870, 40673, 5868],
+    },
   },
   "/u/eviltrout/bookmarks.json": {
     user_bookmark_list: {
@@ -424,10 +441,10 @@ export default {
           post_user_username: "someguy",
           post_user_name: "Some Guy",
           post_user_avatar_template:
-            "/letter_avatar/someguy/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
-        }
-      ]
-    }
+            "/letter_avatar/someguy/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
+        },
+      ],
+    },
   },
   "/user_actions.json": {
     user_actions: [
@@ -457,7 +474,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -487,7 +504,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -517,7 +534,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 6,
@@ -545,7 +562,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -573,7 +590,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -601,7 +618,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -629,7 +646,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -657,7 +674,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -685,7 +702,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -713,7 +730,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -741,7 +758,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 6,
@@ -769,7 +786,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -797,7 +814,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -825,7 +842,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -853,7 +870,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -881,7 +898,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -911,7 +928,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -938,7 +955,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 6,
@@ -966,7 +983,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 6,
@@ -994,7 +1011,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -1022,7 +1039,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: true,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -1050,7 +1067,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -1080,7 +1097,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -1108,7 +1125,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 6,
@@ -1138,7 +1155,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -1168,7 +1185,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 6,
@@ -1196,7 +1213,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -1225,7 +1242,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -1255,7 +1272,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -1285,7 +1302,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -1313,7 +1330,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -1343,7 +1360,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -1373,7 +1390,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -1403,7 +1420,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -1433,7 +1450,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -1461,7 +1478,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -1489,7 +1506,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -1519,7 +1536,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -1549,7 +1566,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -1579,7 +1596,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 5,
@@ -1607,7 +1624,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -1635,7 +1652,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -1663,7 +1680,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -1693,7 +1710,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -1723,7 +1740,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -1751,7 +1768,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 6,
@@ -1777,7 +1794,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -1805,7 +1822,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -1833,7 +1850,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -1861,7 +1878,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -1891,7 +1908,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 7,
@@ -1919,7 +1936,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 1,
@@ -1947,7 +1964,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -1975,7 +1992,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -2003,7 +2020,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -2031,7 +2048,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -2059,7 +2076,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -2087,7 +2104,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 6,
@@ -2113,7 +2130,7 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
+        edit_reason: null,
       },
       {
         action_type: 2,
@@ -2139,9 +2156,9 @@ export default {
         deleted: false,
         hidden: false,
         moderator_action: false,
-        edit_reason: null
-      }
-    ]
+        edit_reason: null,
+      },
+    ],
   },
   "/topics/created-by/eviltrout.json": {
     users: [
@@ -2149,56 +2166,56 @@ export default {
         id: 19,
         username: "eviltrout",
         avatar_template:
-          "//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon"
+          "//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon",
       },
       {
         id: 5460,
         username: "ned",
-        avatar_template: "/images/avatar.png"
+        avatar_template: "/images/avatar.png",
       },
       {
         id: 402,
         username: "thebrianbarlow",
-        avatar_template: "/images/avatar.png"
+        avatar_template: "/images/avatar.png",
       },
       {
         id: 5707,
         username: "trident",
-        avatar_template: "/images/avatar.png"
+        avatar_template: "/images/avatar.png",
       },
       {
         id: 32,
         username: "codinghorror",
-        avatar_template: "/images/avatar.png"
+        avatar_template: "/images/avatar.png",
       },
       {
         id: 1995,
         username: "zogstrip",
-        avatar_template: "/images/avatar.png"
+        avatar_template: "/images/avatar.png",
       },
       {
         id: 2702,
         username: "ryanflorence",
-        avatar_template: "/images/avatar.png"
+        avatar_template: "/images/avatar.png",
       },
       {
         id: 9,
         username: "tms",
         avatar_template:
-          "//www.gravatar.com/avatar/3981cd271c302f5cba628c6b6d2b32ee.png?s={size}&r=pg&d=identicon"
+          "//www.gravatar.com/avatar/3981cd271c302f5cba628c6b6d2b32ee.png?s={size}&r=pg&d=identicon",
       },
       {
         id: 1,
         username: "sam",
         avatar_template:
-          "//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon"
+          "//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon",
       },
       {
         id: 2636,
         username: "lonnon",
         avatar_template:
-          "//www.gravatar.com/avatar/9489ef302fbff6c19bba507d09f8cd1d.png?s={size}&r=pg&d=identicon"
-      }
+          "//www.gravatar.com/avatar/9489ef302fbff6c19bba507d09f8cd1d.png?s={size}&r=pg&d=identicon",
+      },
     ],
     topic_list: {
       can_create_topic: false,
@@ -2238,9 +2255,9 @@ export default {
             {
               extras: "latest",
               description: "Most Recent Poster",
-              user_id: 32
-            }
-          ]
+              user_id: 32,
+            },
+          ],
         },
         {
           id: 9318,
@@ -2270,9 +2287,9 @@ export default {
             {
               extras: "latest",
               description: "Original Poster, Most Recent Poster",
-              user_id: 19
-            }
-          ]
+              user_id: 19,
+            },
+          ],
         },
         {
           id: 7019,
@@ -2302,11 +2319,11 @@ export default {
             {
               extras: "latest",
               description: "Original Poster, Most Recent Poster",
-              user_id: 19
+              user_id: 19,
             },
             { extras: null, description: "Most Posts", user_id: 1995 },
-            { extras: null, description: "Frequent Poster", user_id: 2702 }
-          ]
+            { extras: null, description: "Frequent Poster", user_id: 2702 },
+          ],
         },
         {
           id: 4650,
@@ -2337,8 +2354,8 @@ export default {
             { extras: null, description: "Most Posts", user_id: 9 },
             { extras: null, description: "Frequent Poster", user_id: 1995 },
             { extras: null, description: "Frequent Poster", user_id: 32 },
-            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
-          ]
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 },
+          ],
         },
         {
           id: 4960,
@@ -2371,9 +2388,9 @@ export default {
             {
               extras: "latest",
               description: "Most Recent Poster",
-              user_id: 1995
-            }
-          ]
+              user_id: 1995,
+            },
+          ],
         },
         {
           id: 2918,
@@ -2403,13 +2420,13 @@ export default {
             {
               extras: "latest",
               description: "Original Poster, Most Recent Poster",
-              user_id: 19
+              user_id: 19,
             },
-            { extras: null, description: "Most Posts", user_id: 2636 }
-          ]
-        }
-      ]
-    }
+            { extras: null, description: "Most Posts", user_id: 2636 },
+          ],
+        },
+      ],
+    },
   },
   "/u/charlie.json": {
     user_badges: [
@@ -2419,8 +2436,8 @@ export default {
         count: 1,
         badge_id: 3,
         user_id: 5,
-        granted_by_id: -1
-      }
+        granted_by_id: -1,
+      },
     ],
     badges: [
       {
@@ -2439,8 +2456,8 @@ export default {
         system: true,
         slug: "regular",
         manually_grantable: false,
-        badge_type_id: 2
-      }
+        badge_type_id: 2,
+      },
     ],
     badge_types: [{ id: 2, name: "Silver", sort_order: 8 }],
     users: [
@@ -2450,7 +2467,7 @@ export default {
         name: null,
         avatar_template: "/letter_avatar_proxy/v3/letter/c/d6d6ee/{size}.png",
         moderator: false,
-        admin: false
+        admin: false,
       },
       {
         id: -1,
@@ -2458,8 +2475,8 @@ export default {
         name: "system",
         avatar_template: "/user_avatar/localhost/system/{size}/2_2.png",
         moderator: true,
-        admin: true
-      }
+        admin: true,
+      },
     ],
     user: {
       id: 5,
@@ -2544,7 +2561,7 @@ export default {
           allow_membership_requests: false,
           full_name: null,
           default_notification_level: 3,
-          membership_request_template: null
+          membership_request_template: null,
         },
         {
           id: 11,
@@ -2571,7 +2588,7 @@ export default {
           allow_membership_requests: false,
           full_name: null,
           default_notification_level: 3,
-          membership_request_template: null
+          membership_request_template: null,
         },
         {
           id: 12,
@@ -2598,7 +2615,7 @@ export default {
           allow_membership_requests: false,
           full_name: null,
           default_notification_level: 3,
-          membership_request_template: null
+          membership_request_template: null,
         },
         {
           id: 13,
@@ -2625,14 +2642,14 @@ export default {
           allow_membership_requests: false,
           full_name: null,
           default_notification_level: 3,
-          membership_request_template: null
-        }
+          membership_request_template: null,
+        },
       ],
       group_users: [
         { group_id: 10, user_id: 5, notification_level: 3 },
         { group_id: 11, user_id: 5, notification_level: 3 },
         { group_id: 12, user_id: 5, notification_level: 3 },
-        { group_id: 13, user_id: 5, notification_level: 3 }
+        { group_id: 13, user_id: 5, notification_level: 3 },
       ],
       featured_user_badge_ids: [17],
       user_option: {
@@ -2661,9 +2678,9 @@ export default {
         homepage_id: null,
         hide_profile_and_presence: false,
         text_size: "normal",
-        text_size_seq: 0
-      }
-    }
+        text_size_seq: 0,
+      },
+    },
   },
   "/u/charlie/card.json": {
     user_badges: [
@@ -2673,8 +2690,8 @@ export default {
         count: 1,
         badge_id: 3,
         user_id: 5,
-        granted_by_id: -1
-      }
+        granted_by_id: -1,
+      },
     ],
     badges: [
       {
@@ -2693,8 +2710,8 @@ export default {
         system: true,
         slug: "regular",
         manually_grantable: false,
-        badge_type_id: 2
-      }
+        badge_type_id: 2,
+      },
     ],
     badge_types: [{ id: 2, name: "Silver", sort_order: 8 }],
     users: [
@@ -2704,7 +2721,7 @@ export default {
         name: null,
         avatar_template: "/letter_avatar_proxy/v3/letter/c/d6d6ee/{size}.png",
         moderator: false,
-        admin: false
+        admin: false,
       },
       {
         id: -1,
@@ -2712,8 +2729,8 @@ export default {
         name: "system",
         avatar_template: "/user_avatar/localhost/system/{size}/2_2.png",
         moderator: true,
-        admin: true
-      }
+        admin: true,
+      },
     ],
     user: {
       id: 5,
@@ -2740,8 +2757,8 @@ export default {
       primary_group_flair_bg_color: null,
       primary_group_flair_color: null,
       staged: false,
-      featured_user_badge_ids: [17]
-    }
+      featured_user_badge_ids: [17],
+    },
   },
   "/u/charlie/summary.json": {
     topics: [],
@@ -2762,8 +2779,8 @@ export default {
         system: true,
         slug: "regular",
         manually_grantable: false,
-        badge_type_id: 2
-      }
+        badge_type_id: 2,
+      },
     ],
     badge_types: [{ id: 2, name: "Silver", sort_order: 8 }],
     users: [
@@ -2773,7 +2790,7 @@ export default {
         name: null,
         avatar_template: "/letter_avatar_proxy/v3/letter/c/d6d6ee/{size}.png",
         moderator: false,
-        admin: false
+        admin: false,
       },
       {
         id: -1,
@@ -2781,8 +2798,8 @@ export default {
         name: "system",
         avatar_template: "/user_avatar/localhost/system/{size}/2_2.png",
         moderator: true,
-        admin: true
-      }
+        admin: true,
+      },
     ],
     user_summary: {
       likes_given: 0,
@@ -2807,11 +2824,11 @@ export default {
           count: 1,
           badge_id: 3,
           user_id: 5,
-          granted_by_id: -1
-        }
+          granted_by_id: -1,
+        },
       ],
-      top_categories: []
-    }
+      top_categories: [],
+    },
   },
   "/u/%E3%83%A9%E3%82%A4%E3%82%AA%E3%83%B3.json": {
     user_badges: [],
@@ -2857,7 +2874,7 @@ export default {
       second_factor_enabled: false,
       second_factor_backup_enabled: false,
       associated_accounts: [],
-      locale: "en_US",
+      locale: "en",
       muted_category_ids: [],
       regular_category_ids: [],
       watched_tags: [],
@@ -2886,8 +2903,8 @@ export default {
           icon: "fab-linux",
           created_at: "2019-06-26T08:41:18.436Z",
           seen_at: "2019-06-26T09:24:24.683Z",
-          is_active: true
-        }
+          is_active: true,
+        },
       ],
       invited_by: null,
       groups: [
@@ -2914,7 +2931,7 @@ export default {
           allow_membership_requests: false,
           full_name: null,
           default_notification_level: 3,
-          membership_request_template: null
+          membership_request_template: null,
         },
         {
           id: 11,
@@ -2939,12 +2956,12 @@ export default {
           allow_membership_requests: false,
           full_name: null,
           default_notification_level: 3,
-          membership_request_template: null
-        }
+          membership_request_template: null,
+        },
       ],
       group_users: [
         { group_id: 10, user_id: 2, notification_level: 3, owner: false },
-        { group_id: 11, user_id: 2, notification_level: 3, owner: false }
+        { group_id: 11, user_id: 2, notification_level: 3, owner: false },
       ],
       featured_user_badge_ids: [],
       user_option: {
@@ -2975,9 +2992,9 @@ export default {
         hide_profile_and_presence: false,
         text_size: "normal",
         text_size_seq: 0,
-        title_count_mode: "notifications"
-      }
-    }
+        title_count_mode: "notifications",
+      },
+    },
   },
   "/u/%E3%83%A9%E3%82%A4%E3%82%AA%E3%83%B3/summary.json": {
     topics: [],
@@ -2999,7 +3016,7 @@ export default {
       most_liked_users: [],
       most_replied_to_users: [],
       badges: [],
-      top_categories: []
-    }
-  }
+      top_categories: [],
+    },
+  },
 };
diff --git a/app/assets/javascripts/discourse/tests/fixtures/watched-words-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/watched-words-fixtures.js
index 6ac2eaa9a4..8fca803089 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/watched-words-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/watched-words-fixtures.js
@@ -1,5 +1,5 @@
 export default {
-  "/admin/logs/watched_words.json": {
+  "/admin/customize/watched_words.json": {
     actions: ["block", "censor", "require_approval", "flag"],
     words: [
       { id: 1, word: "liquorice", action: "block" },
diff --git a/app/assets/javascripts/discourse/tests/helpers/component-test.js b/app/assets/javascripts/discourse/tests/helpers/component-test.js
index e2edd2ead6..e44e71b858 100644
--- a/app/assets/javascripts/discourse/tests/helpers/component-test.js
+++ b/app/assets/javascripts/discourse/tests/helpers/component-test.js
@@ -1,15 +1,23 @@
+import { TestModuleForComponent, render } from "@ember/test-helpers";
+import MessageBus from "message-bus-client";
 import EmberObject from "@ember/object";
-import createStore from "discourse/tests/helpers/create-store";
-import { autoLoadModules } from "discourse/initializers/auto-load-modules";
+import { setupRenderingTest as EmberSetupRenderingTest } from "ember-qunit";
+import Session from "discourse/models/session";
+import Site from "discourse/models/site";
 import TopicTrackingState from "discourse/models/topic-tracking-state";
 import User from "discourse/models/user";
-import Site from "discourse/models/site";
-import Session from "discourse/models/session";
+import { autoLoadModules } from "discourse/initializers/auto-load-modules";
+import createStore from "discourse/tests/helpers/create-store";
 import { currentSettings } from "discourse/tests/helpers/site-settings";
 import { test } from "qunit";
-import { TestModuleForComponent } from "@ember/test-helpers";
+
+const LEGACY_ENV = !EmberSetupRenderingTest;
 
 export function setupRenderingTest(hooks) {
+  if (!LEGACY_ENV) {
+    return EmberSetupRenderingTest.apply(this, arguments);
+  }
+
   let testModule;
 
   hooks.before(function () {
@@ -40,57 +48,91 @@ export default function (name, opts) {
     return;
   }
 
-  test(name, function (assert) {
+  if (typeof opts.template === "string" && !LEGACY_ENV) {
+    let testName = QUnit.config.currentModule.name + " " + name;
+    // eslint-disable-next-line
+    console.warn(
+      `${testName} skipped; template must be compiled and not a string`
+    );
+    return;
+  }
+
+  test(name, async function (assert) {
     this.site = Site.current();
     this.session = Session.current();
 
-    this.registry.register("site-settings:main", currentSettings(), {
-      instantiate: false,
-    });
-    this.registry.register("capabilities:main", EmberObject);
-    this.registry.register("site:main", this.site, { instantiate: false });
-    this.registry.register("session:main", this.session, {
-      instantiate: false,
-    });
-    this.registry.injection("component", "siteSettings", "site-settings:main");
-    this.registry.injection("component", "appEvents", "service:app-events");
-    this.registry.injection("component", "capabilities", "capabilities:main");
-    this.registry.injection("component", "site", "site:main");
-    this.registry.injection("component", "session", "session:main");
-
-    this.siteSettings = currentSettings();
-    autoLoadModules(this.container, this.registry);
-
-    const store = createStore();
-    if (!opts.anonymous) {
-      const currentUser = User.create({ username: "eviltrout" });
-      this.currentUser = currentUser;
-      this.registry.register("current-user:main", this.currentUser, {
+    let owner = LEGACY_ENV ? this.registry : this.owner;
+    let store;
+    if (LEGACY_ENV) {
+      this.registry.register("site-settings:main", currentSettings(), {
         instantiate: false,
       });
-      this.registry.injection("component", "currentUser", "current-user:main");
-      this.registry.register(
+      this.registry.register("capabilities:main", EmberObject);
+      this.registry.register("message-bus:main", MessageBus, {
+        instantiate: false,
+      });
+      this.registry.register("site:main", this.site, { instantiate: false });
+      this.registry.register("session:main", this.session, {
+        instantiate: false,
+      });
+      this.registry.injection(
+        "component",
+        "siteSettings",
+        "site-settings:main"
+      );
+      this.registry.injection("component", "appEvents", "service:app-events");
+      this.registry.injection("component", "capabilities", "capabilities:main");
+      this.registry.injection("component", "site", "site:main");
+      this.registry.injection("component", "session", "session:main");
+      this.registry.injection("component", "messageBus", "message-bus:main");
+
+      this.siteSettings = currentSettings();
+      store = createStore();
+      this.registry.register("service:store", store, { instantiate: false });
+    } else {
+      this.container = owner;
+      store = this.container.lookup("service:store");
+    }
+    autoLoadModules(this.container, this.registry);
+
+    if (!opts.anonymous) {
+      const currentUser = User.create({
+        username: "eviltrout",
+        timezone: "Australia/Brisbane",
+      });
+      this.currentUser = currentUser;
+
+      owner.unregister("current-user:main");
+      owner.register("current-user:main", currentUser, {
+        instantiate: false,
+      });
+      if (LEGACY_ENV) {
+        owner.injection("component", "currentUser", "current-user:main");
+      } else {
+        owner.inject("component", "currentUser", "current-user:main");
+      }
+      owner.unregister("topic-tracking-state:main");
+      owner.register(
         "topic-tracking-state:main",
         TopicTrackingState.create({ currentUser }),
         { instantiate: false }
       );
     }
 
-    this.registry.register("service:store", store, { instantiate: false });
-
     if (opts.beforeEach) {
       opts.beforeEach.call(this, store);
     }
 
+    $.fn.autocomplete = function () {};
     andThen(() => {
-      return this.render(opts.template);
+      return LEGACY_ENV ? this.render(opts.template) : render(opts.template);
     });
 
     andThen(() => {
       return opts.test.call(this, assert);
-    }).finally(() => {
+    }).finally(async () => {
       if (opts.afterEach) {
-        andThen(() => {
+        await andThen(() => {
           return opts.afterEach.call(opts);
         });
       }
diff --git a/app/assets/javascripts/discourse/tests/helpers/create-pretender.js b/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
index 2a2431afd0..7cbea9ca99 100644
--- a/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
+++ b/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
@@ -1,5 +1,6 @@
-import User from "discourse/models/user";
 import Pretender from "pretender";
+import User from "discourse/models/user";
+import getURL from "discourse-common/lib/get-url";
 
 export function parsePostData(query) {
   const result = {};
@@ -39,7 +40,15 @@ const helpers = { response, success, parsePostData };
 
 export let fixturesByUrl;
 
-export default new Pretender();
+const instance = new Pretender();
+
+const oldRegister = instance.register;
+instance.register = (...args) => {
+  args[1] = getURL(args[1]);
+  return oldRegister.call(instance, ...args);
+};
+
+export default instance;
 
 export function pretenderHelpers() {
   return { parsePostData, response, success };
@@ -69,8 +78,6 @@ export function applyDefaultHandlers(pretender) {
     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);
   });
@@ -81,8 +88,6 @@ export function applyDefaultHandlers(pretender) {
     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);
   });
@@ -144,6 +149,15 @@ export function applyDefaultHandlers(pretender) {
     return response({ email: "eviltrout@example.com" });
   });
 
+  pretender.get("/u/is_local_username", () =>
+    response({
+      valid: [],
+      valid_groups: [],
+      mentionable_groups: [],
+      cannot_see: [],
+    })
+  );
+
   pretender.get("/u/eviltrout.json", () => {
     const json = fixturesByUrl["/u/eviltrout.json"];
     json.user.can_edit = loggedIn();
@@ -179,14 +193,17 @@ export function applyDefaultHandlers(pretender) {
     });
   });
 
-  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 }] });
+    return response({
+      invites: [],
+      can_see_invite_details: true,
+      counts: {
+        pending: 0,
+        expired: 0,
+        redeemed: 0,
+        total: 0,
+      },
+    });
   });
 
   pretender.get("/topics/private-messages/eviltrout.json", () => {
@@ -219,31 +236,15 @@ export function applyDefaultHandlers(pretender) {
   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",
-          },
-        ],
-      });
+    if (request.queryParams.q === "discourse") {
+      return response(fixturesByUrl["/search.json"]);
+    } else if (request.queryParams.q === "discourse in:personal") {
+      const fixtures = fixturesByUrl["/search.json"];
+      fixtures.topics.firstObject.archetype = "private_message";
+      return response(fixtures);
+    } else {
+      return response({});
     }
-
-    return response({});
   });
 
   pretender.put("/u/eviltrout.json", () => response({ user: {} }));
@@ -297,14 +298,24 @@ export function applyDefaultHandlers(pretender) {
     });
   });
 
+  // TODO: Remove this old path when no longer using old ember
   pretender.get("/post_replies", () => {
     return response({ post_replies: [{ id: 1234, cooked: "wat" }] });
   });
 
+  pretender.get("/posts/:id/replies", () => {
+    return response([{ id: 1234, cooked: "wat" }]);
+  });
+
+  // TODO: Remove this old path when no longer using old ember
   pretender.get("/post_reply_histories", () => {
     return response({ post_reply_histories: [{ id: 1234, cooked: "wat" }] });
   });
 
+  pretender.get("/posts/:id/reply-history", () => {
+    return response([{ id: 1234, cooked: "wat" }]);
+  });
+
   pretender.get("/categories_and_latest", () =>
     response(fixturesByUrl["/categories_and_latest.json"])
   );
@@ -313,6 +324,10 @@ export function applyDefaultHandlers(pretender) {
     response(fixturesByUrl["/c/1/show.json"])
   );
 
+  pretender.get("/c/1-category/find_by_slug.json", () =>
+    response(fixturesByUrl["/c/1/show.json"])
+  );
+
   pretender.put("/categories/:category_id", (request) => {
     const category = parsePostData(request.requestBody);
     category.id = parseInt(request.params.category_id, 10);
@@ -324,17 +339,13 @@ export function applyDefaultHandlers(pretender) {
     return response({ category });
   });
 
-  pretender.post("/categories", () => {
-    return response({
-      category: {
-        id: 11,
-        name: "testing",
-        color: "0088CC",
-        text_color: "FFFFFF",
-        slug: "testing",
-      },
-    });
-  });
+  pretender.post("/categories", () =>
+    response(fixturesByUrl["/c/11/show.json"])
+  );
+
+  pretender.get("/c/testing/find_by_slug.json", () =>
+    response(fixturesByUrl["/c/11/show.json"])
+  );
 
   pretender.get("/draft.json", (request) => {
     if (request.queryParams.draft_key === "new_topic") {
@@ -452,6 +463,10 @@ export function applyDefaultHandlers(pretender) {
     return response({ available: true });
   });
 
+  pretender.get("/u/check_email", function () {
+    return response({ success: "OK" });
+  });
+
   pretender.post("/u", () => response({ success: true }));
 
   pretender.get("/login.html", () => [200, {}, "LOGIN PAGE"]);
@@ -493,7 +508,7 @@ export function applyDefaultHandlers(pretender) {
     });
   });
 
-  pretender.get("groups", () => {
+  pretender.get("/groups", () => {
     return response(200, fixturesByUrl["/groups.json"]);
   });
 
@@ -501,7 +516,7 @@ export function applyDefaultHandlers(pretender) {
     return response(200, fixturesByUrl["/groups.json?username=eviltrout"]);
   });
 
-  pretender.get("groups/search.json", () => {
+  pretender.get("/groups/search.json", () => {
     return response(200, []);
   });
 
@@ -660,9 +675,15 @@ export function applyDefaultHandlers(pretender) {
 
   pretender.get("/admin/customize/site_texts", (request) => {
     if (request.queryParams.overridden) {
-      return response(200, { site_texts: [overridden] });
+      return response(200, {
+        site_texts: [overridden],
+        extras: { locale: "en" },
+      });
     } else {
-      return response(200, { site_texts: [siteText, overridden] });
+      return response(200, {
+        site_texts: [siteText, overridden],
+        extras: { locale: "en" },
+      });
     }
   });
 
@@ -680,6 +701,28 @@ export function applyDefaultHandlers(pretender) {
     return response(200, { site_text: result });
   });
 
+  pretender.get("/admin/themes", () => {
+    return response(200, {
+      themes: [
+        {
+          id: 1,
+          name: "Graceful Renamed",
+          remote_theme: {
+            remote_url: "https://github.com/discourse/graceful.git",
+          },
+        },
+      ],
+      extras: {},
+    });
+  });
+
+  pretender.post("/admin/themes/generate_key_pair", () => {
+    return response(200, {
+      private_key: "privateKey",
+      public_key: "publicKey",
+    });
+  });
+
   pretender.get("/tag_groups", () => response(200, { tag_groups: [] }));
 
   pretender.get("/admin/users/1.json", () => {
@@ -735,12 +778,12 @@ export function applyDefaultHandlers(pretender) {
     });
   });
 
-  pretender.get("/admin/logs/watched_words", () => {
-    return response(200, fixturesByUrl["/admin/logs/watched_words.json"]);
+  pretender.get("/admin/customize/watched_words", () => {
+    return response(200, fixturesByUrl["/admin/customize/watched_words.json"]);
   });
-  pretender.delete("/admin/logs/watched_words/:id.json", success);
+  pretender.delete("/admin/customize/watched_words/:id.json", success);
 
-  pretender.post("/admin/logs/watched_words.json", (request) => {
+  pretender.post("/admin/customize/watched_words.json", (request) => {
     const result = parsePostData(request.requestBody);
     result.id = new Date().getTime();
     return response(200, result);
@@ -772,6 +815,13 @@ export function applyDefaultHandlers(pretender) {
     });
   });
 
+  pretender.get("/color-scheme-stylesheet/2/1.json", () => {
+    return response(200, {
+      color_scheme_id: 2,
+      new_href: "/stylesheets/color_definitions_scheme_name_2_hash.css",
+    });
+  });
+
   pretender.get("/inline-onebox", (request) => {
     if (
       request.queryParams.urls.includes("http://www.example.com/has-title.html")
@@ -805,6 +855,16 @@ export function applyDefaultHandlers(pretender) {
       ];
     }
 
+    if (
+      request.queryParams.url === "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+    ) {
+      return [
+        200,
+        { "Content-Type": "application/html" },
+        '<img src="https://i.ytimg.com/vi/dQw4w9WgXcQ/maxresdefault.jpg" width="480" height="360" title="Rick Astley - Never Gonna Give You Up (Video)">',
+      ];
+    }
+
     if (request.queryParams.url.indexOf("/internal-page.html") > -1) {
       return [
         200,
@@ -832,6 +892,36 @@ export function applyDefaultHandlers(pretender) {
   `,
       ];
     }
+
+    if (
+      request.queryParams.url ===
+      "https://twitter.com/discourse/status/1357664660724482048"
+    ) {
+      return [
+        200,
+        { "Content-Type": "application/html" },
+        `
+        <aside class="onebox twitterstatus">
+          <header class="source">
+              <a href="https://twitter.com/discourse/status/1357664660724482048" target="_blank" rel="nofollow ugc noopener">twitter.com</a>
+          </header>
+          <article class="onebox-body">
+            <img src="https://pbs.twimg.com/media/EtdhY-ZXYAAKyvo.jpg:large" class="thumbnail onebox-avatar">
+        <h4><a href="https://twitter.com/discourse/status/1357664660724482048" target="_blank" rel="nofollow ugc noopener">Discourse (discourse)</a></h4>
+        <div class="tweet"> Too busy to keep up with release notes? https://t.co/FQtGI5VrMl</div>
+        <div class="date">
+          <a href="https://twitter.com/discourse/status/1357664660724482048" target="_blank" rel="nofollow ugc noopener">4:17 AM - 5 Feb 2021</a>
+            <span class="like">8</span>
+            <span class="retweet">1</span>
+        </div>
+          </article>
+          <div class="onebox-metadata"></div>
+          <div style="clear: both"></div>
+        </aside>
+        `,
+      ];
+    }
+
     return [404, { "Content-Type": "application/html" }, ""];
   });
 }
diff --git a/app/assets/javascripts/discourse/tests/helpers/create-store.js b/app/assets/javascripts/discourse/tests/helpers/create-store.js
index 80eb23704c..ad15ffd4fa 100644
--- a/app/assets/javascripts/discourse/tests/helpers/create-store.js
+++ b/app/assets/javascripts/discourse/tests/helpers/create-store.js
@@ -1,6 +1,6 @@
-import Store from "discourse/models/store";
-import RestAdapter from "discourse/adapters/rest";
 import KeyValueStore from "discourse/lib/key-value-store";
+import RestAdapter from "discourse/adapters/rest";
+import Store from "discourse/models/store";
 import TopicListAdapter from "discourse/adapters/topic-list";
 import TopicTrackingState from "discourse/models/topic-tracking-state";
 import { buildResolver } from "discourse-common/resolver";
diff --git a/app/assets/javascripts/discourse/tests/helpers/fixture-pretender.js b/app/assets/javascripts/discourse/tests/helpers/fixture-pretender.js
index 32ad7ef595..465984b1ce 100644
--- a/app/assets/javascripts/discourse/tests/helpers/fixture-pretender.js
+++ b/app/assets/javascripts/discourse/tests/helpers/fixture-pretender.js
@@ -9,8 +9,12 @@ export default function (helpers) {
       if (fixture && fixture.default) {
         const obj = fixture.default;
         Object.keys(obj).forEach((url) => {
+          let fixtureUrl = url;
+          if (fixtureUrl[0] !== "/") {
+            fixtureUrl = "/" + fixtureUrl;
+          }
           fixturesByUrl[url] = obj[url];
-          this.get(url, () => response(obj[url]));
+          this.get(fixtureUrl, () => response(obj[url]));
         });
       }
     }
diff --git a/app/assets/javascripts/discourse/tests/helpers/html-helper.js b/app/assets/javascripts/discourse/tests/helpers/html-helper.js
deleted file mode 100644
index e9997908db..0000000000
--- a/app/assets/javascripts/discourse/tests/helpers/html-helper.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export function stringToHTML(string) {
-  const parser = new DOMParser();
-  const doc = parser.parseFromString(string, "text/html");
-  return doc.body.firstChild;
-}
diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
index d84e32a5eb..7a28a0b684 100644
--- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
+++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
@@ -1,50 +1,61 @@
-import { Promise } from "rsvp";
-import { isEmpty } from "@ember/utils";
-import { later } from "@ember/runloop";
-import sessionFixtures from "discourse/tests/fixtures/session-fixtures";
-import HeaderComponent from "discourse/components/site-header";
-import { forceMobile, resetMobile } from "discourse/lib/mobile";
-import { resetPluginApi } from "discourse/lib/plugin-api";
+import QUnit, { module } from "qunit";
+import MessageBus from "message-bus-client";
 import {
   clearCache as clearOutletCache,
   resetExtraClasses,
 } from "discourse/lib/plugin-connectors";
-import { clearHTMLCache } from "discourse/helpers/custom-html";
-import { flushMap } from "discourse/models/store";
 import { clearRewrites, setURLContainer } 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 { resetUsernameDecorators } from "discourse/helpers/decorate-username-selector";
-import { resetCache as resetOneboxCache } from "pretty-text/oneboxer";
-import { resetCustomPostMessageCallbacks } from "discourse/controllers/topic";
-import { _clearSnapshots } from "select-kit/components/composer-actions";
-import User from "discourse/models/user";
-import { mapRoutes } from "discourse/mapping-router";
 import {
   currentSettings,
   mergeSettings,
 } from "discourse/tests/helpers/site-settings";
+import { forceMobile, resetMobile } from "discourse/lib/mobile";
+import { getApplication, getContext } from "@ember/test-helpers";
 import { getOwner, setDefaultOwner } from "discourse-common/lib/get-owner";
-import { setTopicList } from "discourse/lib/topic-list-tracker";
-import { moduleFor } from "ember-qunit";
-import QUnit, { module } from "qunit";
-import siteFixtures from "discourse/tests/fixtures/site-fixtures";
+import { later, run } from "@ember/runloop";
+import { moduleFor, setupApplicationTest } from "ember-qunit";
+import HeaderComponent from "discourse/components/site-header";
+import { Promise } from "rsvp";
 import Site from "discourse/models/site";
+import User from "discourse/models/user";
+import { _clearSnapshots } from "select-kit/components/composer-actions";
+import { clearHTMLCache } from "discourse/helpers/custom-html";
 import createStore from "discourse/tests/helpers/create-store";
-import { getApplication } from "@ember/test-helpers";
 import deprecated from "discourse-common/lib/deprecated";
+import { flushMap } from "discourse/models/store";
+import { initSearchData } from "discourse/widgets/search-menu";
+import { isEmpty } from "@ember/utils";
+import { mapRoutes } from "discourse/mapping-router";
+import { resetCustomPostMessageCallbacks } from "discourse/controllers/topic";
+import { resetDecorators } from "discourse/widgets/widget";
+import { resetCache as resetOneboxCache } from "pretty-text/oneboxer";
+import { resetDecorators as resetPluginOutletDecorators } from "discourse/components/plugin-connector";
+import { resetDecorators as resetPostCookedDecorators } from "discourse/widgets/post-cooked";
+import { resetTopicTitleDecorators } from "discourse/components/topic-title";
+import { resetUsernameDecorators } from "discourse/helpers/decorate-username-selector";
+import { resetWidgetCleanCallbacks } from "discourse/components/mount-widget";
+import sessionFixtures from "discourse/tests/fixtures/session-fixtures";
+import { setTopicList } from "discourse/lib/topic-list-tracker";
 import sinon from "sinon";
+import siteFixtures from "discourse/tests/fixtures/site-fixtures";
+import { clearResolverOptions } from "discourse-common/resolver";
+import { clearCustomNavItemHref } from "discourse/models/nav-item";
+import {
+  cleanUpComposerUploadHandler,
+  cleanUpComposerUploadMarkdownResolver,
+  cleanUpComposerUploadProcessor,
+} from "discourse/components/composer-editor";
+
+const LEGACY_ENV = !setupApplicationTest;
 
 export function currentUser() {
   return User.create(sessionFixtures["/session/current.json"].current_user);
 }
 
 export function updateCurrentUser(properties) {
-  User.current().setProperties(properties);
+  run(() => {
+    User.current().setProperties(properties);
+  });
 }
 
 // Note: do not use this in acceptance tests. Use `loggedIn: true` instead
@@ -106,11 +117,23 @@ export function discourseModule(name, options) {
       hooks.beforeEach(function () {
         this.container = getOwner(this);
         this.registry = this.container.registry;
-
         this.owner = this.container;
         this.siteSettings = currentSettings();
+        clearResolverOptions();
       });
 
+      this.getController = function (controllerName, properties) {
+        let controller = this.container.lookup(`controller:${controllerName}`);
+        if (!LEGACY_ENV) {
+          controller.application = {};
+        }
+        controller.siteSettings = this.siteSettings;
+        if (properties) {
+          controller.setProperties(properties);
+        }
+        return controller;
+      };
+
       this.moduleName = name;
 
       options.call(this, hooks);
@@ -195,16 +218,27 @@ export function acceptance(name, optionsOrCallback) {
 
       clearOutletCache();
       clearHTMLCache();
-      resetPluginApi();
 
       if (siteChanges) {
         resetSite(currentSettings(), siteChanges);
       }
 
-      getApplication().reset();
+      if (LEGACY_ENV) {
+        getApplication().__registeredObjects__ = false;
+        getApplication().reset();
+      }
       this.container = getOwner(this);
+      if (LEGACY_ENV && loggedIn) {
+        updateCurrentUser({
+          appEvents: this.container.lookup("service:app-events"),
+        });
+      }
+
       setURLContainer(this.container);
       setDefaultOwner(this.container);
+      if (!this.owner) {
+        this.owner = this.container;
+      }
 
       if (options.beforeEach) {
         options.beforeEach.call(this);
@@ -223,7 +257,6 @@ export function acceptance(name, optionsOrCallback) {
       resetExtraClasses();
       clearOutletCache();
       clearHTMLCache();
-      resetPluginApi();
       clearRewrites();
       initSearchData();
       resetDecorators();
@@ -233,16 +266,24 @@ export function acceptance(name, optionsOrCallback) {
       resetUsernameDecorators();
       resetOneboxCache();
       resetCustomPostMessageCallbacks();
+      clearCustomNavItemHref();
       setTopicList(null);
       _clearSnapshots();
       setURLContainer(null);
       setDefaultOwner(null);
+      cleanUpComposerUploadHandler();
+      cleanUpComposerUploadProcessor();
+      cleanUpComposerUploadMarkdownResolver();
       app._runInitializer("instanceInitializers", (initName, initializer) => {
         if (initializer && initializer.teardown) {
           initializer.teardown(this.container);
         }
       });
-      app.reset();
+
+      if (LEGACY_ENV) {
+        app.__registeredObjects__ = false;
+        app.reset();
+      }
 
       // We do this after reset so that the willClearRender will have already fired
       resetWidgetCleanCallbacks();
@@ -284,10 +325,23 @@ export function acceptance(name, optionsOrCallback) {
   if (callback) {
     // New, preferred way
     module(name, function (hooks) {
+      needs.hooks = hooks;
       hooks.beforeEach(setup.beforeEach);
       hooks.afterEach(setup.afterEach);
-      needs.hooks = hooks;
       callback(needs);
+
+      if (!LEGACY_ENV && getContext) {
+        setupApplicationTest(hooks);
+
+        hooks.beforeEach(function () {
+          // This hack seems necessary to allow `DiscourseURL` to use the testing router
+          let ctx = getContext();
+          this.container.registry.unregister("router:main");
+          this.container.registry.register("router:main", ctx.owner.router, {
+            instantiate: false,
+          });
+        });
+      }
     });
   } else {
     // Old way
@@ -365,8 +419,13 @@ export async function selectDate(selector, date) {
   });
 }
 
-export function queryAll() {
-  return window.find(...arguments);
+export function queryAll(selector, context) {
+  context = context || "#ember-testing";
+  return $(selector, context);
+}
+
+export function query() {
+  return document.querySelector("#ember-testing").querySelector(...arguments);
 }
 
 export function invisible(selector) {
@@ -389,3 +448,9 @@ export function count(selector) {
 export function exists(selector) {
   return count(selector) > 0;
 }
+
+export function publishToMessageBus(channelPath, ...args) {
+  MessageBus.callbacks
+    .filterBy("channel", channelPath)
+    .map((c) => c.func(...args));
+}
diff --git a/app/assets/javascripts/discourse/tests/helpers/review-pretender.js b/app/assets/javascripts/discourse/tests/helpers/review-pretender.js
index dd7f925992..0af2e904a4 100644
--- a/app/assets/javascripts/discourse/tests/helpers/review-pretender.js
+++ b/app/assets/javascripts/discourse/tests/helpers/review-pretender.js
@@ -24,7 +24,7 @@ export default function (helpers) {
           created_at: "2019-01-14T19:49:53.571Z",
           username: "newbie",
           email: "newbie@example.com",
-          bundled_action_ids: ["approve", "reject"],
+          bundled_action_ids: ["approve", "reject", "reject_user"],
         },
         {
           id: 4321,
@@ -58,6 +58,12 @@ export default function (helpers) {
           id: "reject",
           action_ids: ["reject"],
         },
+        {
+          id: "reject_user",
+          icon: "user-times",
+          label: "Delete User...",
+          action_ids: ["reject_user_delete", "reject_user_block"],
+        },
       ],
       actions: [
         {
@@ -70,6 +76,23 @@ export default function (helpers) {
           label: "Reject",
           icon: "far-thumbs-down",
         },
+        {
+          id: "reject_user_delete",
+          icon: "user-times",
+          button_class: null,
+          label: "Delete User",
+          description: "The user will be deleted from the forum.",
+          require_reject_reason: true,
+        },
+        {
+          id: "reject_user_block",
+          icon: "ban",
+          button_class: null,
+          label: "Delete and Block User",
+          description:
+            "The user will be deleted, and we'll block their IP and email address.",
+          require_reject_reason: true,
+        },
       ],
       reviewable_scores: [{ id: 1 }, { id: 2 }],
       users: [{ id: 1, username: "eviltrout" }],
diff --git a/app/assets/javascripts/discourse/tests/helpers/select-kit-helper.js b/app/assets/javascripts/discourse/tests/helpers/select-kit-helper.js
index a8a4377b48..9632ad6665 100644
--- a/app/assets/javascripts/discourse/tests/helpers/select-kit-helper.js
+++ b/app/assets/javascripts/discourse/tests/helpers/select-kit-helper.js
@@ -1,7 +1,7 @@
-import { queryAll, exists } from "discourse/tests/helpers/qunit-helpers";
-import { moduleForComponent } from "ember-qunit";
+import { click, fillIn, triggerEvent } from "@ember/test-helpers";
+import { exists, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { isEmpty } from "@ember/utils";
-import { click, fillIn } from "@ember/test-helpers";
+import { moduleForComponent } from "ember-qunit";
 
 function checkSelectKitIsNotExpanded(selector) {
   if (queryAll(selector).hasClass("is-expanded")) {
@@ -57,7 +57,7 @@ async function selectKitSelectNoneRow(selector) {
 
 async function selectKitSelectRowByIndex(index, selector) {
   checkSelectKitIsNotCollapsed(selector);
-  await click(queryAll(`${selector} .select-kit-row`).eq(index));
+  await click(queryAll(`${selector} .select-kit-row`)[index]);
 }
 
 async function keyboardHelper(value, target, selector) {
@@ -80,7 +80,7 @@ async function keyboardHelper(value, target, selector) {
     };
 
     await triggerEvent(
-      target,
+      target[0],
       "keydown",
       mapping[value] || { keyCode: value.charCodeAt(0) }
     );
@@ -211,6 +211,10 @@ export default function selectKit(selector) {
       return queryAll(selector).hasClass("is-hidden");
     },
 
+    isDisabled() {
+      return queryAll(selector).hasClass("is-disabled");
+    },
+
     header() {
       return headerHelper(queryAll(selector).find(".select-kit-header"));
     },
@@ -286,7 +290,7 @@ export default function selectKit(selector) {
       await click(
         queryAll(selector)
           .find(".select-kit-header")
-          .find(`[data-value="${value}"]`)
+          .find(`[data-value="${value}"]`)[0]
       );
     },
 
diff --git a/app/assets/javascripts/discourse/tests/helpers/site-settings.js b/app/assets/javascripts/discourse/tests/helpers/site-settings.js
index d84b53e4c7..3726d18108 100644
--- a/app/assets/javascripts/discourse/tests/helpers/site-settings.js
+++ b/app/assets/javascripts/discourse/tests/helpers/site-settings.js
@@ -29,7 +29,7 @@ const ORIGINAL_SETTINGS = {
   enable_twitter_logins: true,
   enable_facebook_logins: true,
   enable_github_logins: true,
-  enable_sso: false,
+  enable_discourse_connect: false,
   min_username_length: 3,
   max_username_length: 20,
   min_password_length: 8,
@@ -89,7 +89,7 @@ const ORIGINAL_SETTINGS = {
     "apache|bash|cs|cpp|css|coffeescript|diff|xml|http|ini|json|java|javascript|makefile|markdown|nginx|objectivec|ruby|perl|php|python|sql|handlebars",
   enable_emoji: true,
   enable_emoji_shortcuts: true,
-  emoji_set: "emoji_one",
+  emoji_set: "google_classic",
   enable_emoji_shortcuts: true,
   enable_inline_emoji_translation: false,
   desktop_category_page_style: "categories_and_latest_topics",
@@ -97,6 +97,7 @@ const ORIGINAL_SETTINGS = {
   enable_personal_messages: true,
   unicode_usernames: false,
   secure_media: false,
+  external_emoji_url: "",
 };
 
 let siteSettings = Object.assign({}, ORIGINAL_SETTINGS);
diff --git a/app/assets/javascripts/discourse/tests/helpers/widget-test.js b/app/assets/javascripts/discourse/tests/helpers/widget-test.js
index 91f8daaa48..ed1514e0d4 100644
--- a/app/assets/javascripts/discourse/tests/helpers/widget-test.js
+++ b/app/assets/javascripts/discourse/tests/helpers/widget-test.js
@@ -1,6 +1,6 @@
-import { moduleForComponent } from "ember-qunit";
-import componentTest from "discourse/tests/helpers/component-test";
 import { addPretenderCallback } from "discourse/tests/helpers/qunit-helpers";
+import componentTest from "discourse/tests/helpers/component-test";
+import { moduleForComponent } from "ember-qunit";
 
 export function moduleForWidget(name, options = {}) {
   let fullName = `widget:${name}`;
diff --git a/app/assets/javascripts/discourse/tests/index.html b/app/assets/javascripts/discourse/tests/index.html
new file mode 100644
index 0000000000..2a70fa65af
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/index.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Discourse Tests</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta property="og:title" content="Discourse Tests">
+    <meta property="og:url" content="{{rootURL}}">
+
+    {{content-for "head"}}
+    {{content-for "test-head"}}
+
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/testem.css">
+
+    {{content-for "head-footer"}}
+    {{content-for "test-head-footer"}}
+
+    <style>
+      #ember-testing * {
+        -webkit-transition: none !important;
+        -moz-transition: none !important;
+        -o-transition: none !important;
+        transition: none !important;
+      }
+    </style>
+
+    <script src="{{rootURL}}assets/test-i18n.js"></script>
+  </head>
+  <body>
+    {{content-for "body"}}
+    {{content-for "test-body"}}
+
+    <script src="/testem.js" integrity=""></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/test-support.js"></script>
+    <script src="{{rootURL}}assets/discourse.js"></script>
+    <script src="{{rootURL}}assets/discourse-markdown.js"></script>
+    <script src="{{rootURL}}assets/admin.js"></script>
+    <script src="{{rootURL}}assets/tests.js"></script>
+    <script src="{{rootURL}}assets/scripts/discourse-boot.js"></script>
+
+    {{content-for "body-footer"}}
+    {{content-for "test-body-footer"}}
+  </body>
+</html>
diff --git a/app/assets/javascripts/discourse/tests/integration/components/ace-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/ace-editor-test.js
index 83f94cc4c9..30105cf388 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/ace-editor-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/ace-editor-test.js
@@ -1,17 +1,18 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule("Integration | Component | ace-editor", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("css editor", {
     skip: true,
-    template: '{{ace-editor mode="css"}}',
+    template: hbs`{{ace-editor mode="css"}}`,
     test(assert) {
       assert.expect(1);
       assert.ok(queryAll(".ace_editor").length, "it renders the ace editor");
@@ -20,7 +21,7 @@ discourseModule("Integration | Component | ace-editor", function (hooks) {
 
   componentTest("html editor", {
     skip: true,
-    template: '{{ace-editor mode="html" content="<b>wat</b>"}}',
+    template: hbs`{{ace-editor mode="html" content="<b>wat</b>"}}`,
     test(assert) {
       assert.expect(1);
       assert.ok(queryAll(".ace_editor").length, "it renders the ace editor");
@@ -29,7 +30,7 @@ discourseModule("Integration | Component | ace-editor", function (hooks) {
 
   componentTest("sql editor", {
     skip: true,
-    template: '{{ace-editor mode="sql" content="SELECT * FROM users"}}',
+    template: hbs`{{ace-editor mode="sql" content="SELECT * FROM users"}}`,
     test(assert) {
       assert.expect(1);
       assert.ok(queryAll(".ace_editor").length, "it renders the ace editor");
@@ -38,8 +39,9 @@ discourseModule("Integration | Component | ace-editor", function (hooks) {
 
   componentTest("disabled editor", {
     skip: true,
-    template:
-      '{{ace-editor mode="sql" content="SELECT * FROM users" disabled=true}}',
+    template: hbs`
+      {{ace-editor mode="sql" content="SELECT * FROM users" disabled=true}}
+    `,
     test(assert) {
       const $ace = queryAll(".ace_editor");
       assert.expect(3);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/activation-controls-test.js b/app/assets/javascripts/discourse/tests/integration/components/activation-controls-test.js
new file mode 100644
index 0000000000..f8a1668a10
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/activation-controls-test.js
@@ -0,0 +1,27 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+
+discourseModule(
+  "Integration | Component | activation-controls",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    componentTest("hides change email button", {
+      template: hbs`{{activation-controls}}`,
+      beforeEach() {
+        this.siteSettings.enable_local_logins = false;
+        this.siteSettings.email_editable = false;
+      },
+
+      test(assert) {
+        assert.equal(queryAll("button.edit-email").length, 0);
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/admin-report-test.js b/app/assets/javascripts/discourse/tests/integration/components/admin-report-test.js
index 878c007942..284f5dcd5c 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/admin-report-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/admin-report-test.js
@@ -1,19 +1,20 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   exists,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
-import pretender from "discourse/tests/helpers/create-pretender";
 import { click } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
+import pretender from "discourse/tests/helpers/create-pretender";
 
 discourseModule("Integration | Component | admin-report", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("default", {
-    template: "{{admin-report dataSourceName='signups'}}",
+    template: hbs`{{admin-report dataSourceName='signups'}}`,
 
     async test(assert) {
       assert.ok(exists(".admin-report.signups"));
@@ -79,7 +80,7 @@ discourseModule("Integration | Component | admin-report", function (hooks) {
   });
 
   componentTest("options", {
-    template: "{{admin-report dataSourceName='signups' reportOptions=options}}",
+    template: hbs`{{admin-report dataSourceName='signups' reportOptions=options}}`,
 
     beforeEach() {
       this.set("options", {
@@ -103,7 +104,7 @@ discourseModule("Integration | Component | admin-report", function (hooks) {
   });
 
   componentTest("switch modes", {
-    template: "{{admin-report dataSourceName='signups' showFilteringUI=true}}",
+    template: hbs`{{admin-report dataSourceName='signups' showFilteringUI=true}}`,
 
     async test(assert) {
       await click(".mode-btn.chart");
@@ -114,7 +115,7 @@ discourseModule("Integration | Component | admin-report", function (hooks) {
   });
 
   componentTest("timeout", {
-    template: "{{admin-report dataSourceName='signups_timeout'}}",
+    template: hbs`{{admin-report dataSourceName='signups_timeout'}}`,
 
     test(assert) {
       assert.ok(exists(".alert-error.timeout"), "it displays a timeout error");
@@ -122,7 +123,7 @@ discourseModule("Integration | Component | admin-report", function (hooks) {
   });
 
   componentTest("no data", {
-    template: "{{admin-report dataSourceName='posts'}}",
+    template: hbs`{{admin-report dataSourceName='posts'}}`,
 
     test(assert) {
       assert.ok(exists(".no-data"), "it displays a no data alert");
@@ -130,7 +131,7 @@ discourseModule("Integration | Component | admin-report", function (hooks) {
   });
 
   componentTest("exception", {
-    template: "{{admin-report dataSourceName='signups_exception'}}",
+    template: hbs`{{admin-report dataSourceName='signups_exception'}}`,
 
     test(assert) {
       assert.ok(exists(".alert-error.exception"), "it displays an error");
@@ -154,7 +155,7 @@ discourseModule("Integration | Component | admin-report", function (hooks) {
       });
     },
 
-    template: "{{admin-report dataSourceName='signups_rate_limited'}}",
+    template: hbs`{{admin-report dataSourceName='signups_rate_limited'}}`,
 
     test(assert) {
       assert.ok(
@@ -165,7 +166,7 @@ discourseModule("Integration | Component | admin-report", function (hooks) {
   });
 
   componentTest("not found", {
-    template: "{{admin-report dataSourceName='not_found'}}",
+    template: hbs`{{admin-report dataSourceName='not_found'}}`,
 
     test(assert) {
       assert.ok(
diff --git a/app/assets/javascripts/discourse/tests/integration/components/badge-title-test.js b/app/assets/javascripts/discourse/tests/integration/components/badge-title-test.js
index 8f8ee9e9ac..64317f85ed 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/badge-title-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/badge-title-test.js
@@ -1,18 +1,20 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
 import EmberObject from "@ember/object";
-import pretender from "discourse/tests/helpers/create-pretender";
 import { click } from "@ember/test-helpers";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import pretender from "discourse/tests/helpers/create-pretender";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 discourseModule("Integration | Component | badge-title", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("badge title", {
-    template:
-      "{{badge-title selectableUserBadges=selectableUserBadges user=user}}",
+    template: hbs`
+      {{badge-title selectableUserBadges=selectableUserBadges user=user}}
+    `,
 
     beforeEach() {
       this.set("subject", selectKit());
diff --git a/app/assets/javascripts/discourse/tests/integration/components/bookmark-test.js b/app/assets/javascripts/discourse/tests/integration/components/bookmark-test.js
new file mode 100644
index 0000000000..b7ac8761a1
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/bookmark-test.js
@@ -0,0 +1,157 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  fakeTime,
+  query,
+} from "discourse/tests/helpers/qunit-helpers";
+import sinon from "sinon";
+
+let clock = null;
+
+function mockMomentTz(dateString, timezone) {
+  clock = fakeTime(dateString, timezone, true);
+}
+
+discourseModule("Integration | Component | bookmark", function (hooks) {
+  setupRenderingTest(hooks);
+
+  let template =
+    '{{bookmark model=model afterSave=afterSave afterDelete=afterDelete onCloseWithoutSaving=onCloseWithoutSaving registerOnCloseHandler=(action "registerOnCloseHandler") closeModal=(action "closeModal")}}';
+
+  hooks.beforeEach(function () {
+    this.actions.registerOnCloseHandler = () => {};
+    this.actions.closeModal = () => {};
+    this.setProperties({
+      model: {},
+      afterSave: () => {},
+      afterDelete: () => {},
+      onCloseWithoutSaving: () => {},
+    });
+  });
+
+  hooks.afterEach(function () {
+    if (clock) {
+      clock.restore();
+    }
+    sinon.restore();
+  });
+
+  componentTest("show later this week option if today is < Thursday", {
+    template,
+    skip: true,
+
+    beforeEach() {
+      mockMomentTz("2019-12-10T08:00:00", this.currentUser._timezone);
+    },
+
+    test(assert) {
+      assert.ok(exists("#tap_tile_later_this_week"), "it has later this week");
+    },
+  });
+
+  componentTest(
+    "does not show later this week option if today is >= Thursday",
+    {
+      template,
+      skip: true,
+
+      beforeEach() {
+        mockMomentTz("2019-12-13T08:00:00", this.currentUser._timezone);
+      },
+
+      test(assert) {
+        assert.notOk(
+          exists("#tap_tile_later_this_week"),
+          "it does not have later this week"
+        );
+      },
+    }
+  );
+
+  componentTest("later today does not show if later today is tomorrow", {
+    template,
+    skip: true,
+
+    beforeEach() {
+      mockMomentTz("2019-12-11T22:00:00", this.currentUser._timezone);
+    },
+
+    test(assert) {
+      assert.notOk(
+        exists("#tap_tile_later_today"),
+        "it does not have later today"
+      );
+    },
+  });
+
+  componentTest("later today shows if it is after 5pm but before 6pm", {
+    template,
+    skip: true,
+
+    beforeEach() {
+      mockMomentTz("2019-12-11T14:30:00", this.currentUser._timezone);
+    },
+
+    test(assert) {
+      assert.ok(exists("#tap_tile_later_today"), "it does have later today");
+    },
+  });
+
+  componentTest("later today does not show if it is after 5pm", {
+    template,
+    skip: true,
+
+    beforeEach() {
+      mockMomentTz("2019-12-11T17:00:00", this.currentUser._timezone);
+    },
+
+    test(assert) {
+      assert.notOk(
+        exists("#tap_tile_later_today"),
+        "it does not have later today"
+      );
+    },
+  });
+
+  componentTest("later today does show if it is before the end of the day", {
+    template,
+    skip: true,
+
+    beforeEach() {
+      mockMomentTz("2019-12-11T13:00:00", this.currentUser._timezone);
+    },
+
+    test(assert) {
+      assert.ok(exists("#tap_tile_later_today"), "it does have later today");
+    },
+  });
+
+  componentTest("prefills the custom reminder type date and time", {
+    template,
+    skip: true,
+
+    beforeEach() {
+      let name = "test";
+      let reminderAt = "2020-05-15T09:45:00";
+      this.model = { id: 1, name, reminderAt };
+    },
+
+    test(assert) {
+      assert.equal(query("#bookmark-name").value, "test");
+      assert.equal(query("#custom-date > .date-picker").value, "2020-05-15");
+      assert.equal(query("#custom-time").value, "09:45");
+    },
+  });
+
+  componentTest("defaults to 08:00 for custom time", {
+    template,
+    skip: true,
+
+    async test(assert) {
+      await click("#tap_tile_custom");
+      assert.equal(query("#custom-time").value, "08:00");
+    },
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/cook-text-test.js b/app/assets/javascripts/discourse/tests/integration/components/cook-text-test.js
index 0477ecb84f..05e87b8236 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/cook-text-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/cook-text-test.js
@@ -1,10 +1,11 @@
-import {
-  queryAll,
-  discourseModule,
-} from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 import pretender from "discourse/tests/helpers/create-pretender";
 import { resetCache } from "pretty-text/upload-short-url";
 
@@ -12,7 +13,7 @@ discourseModule("Integration | Component | cook-text", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("renders markdown", {
-    template: '{{cook-text "_foo_" class="post-body"}}',
+    template: hbs`{{cook-text "_foo_" class="post-body"}}`,
 
     test(assert) {
       const html = queryAll(".post-body")[0].innerHTML.trim();
@@ -21,7 +22,7 @@ discourseModule("Integration | Component | cook-text", function (hooks) {
   });
 
   componentTest("resolves short URLs", {
-    template: `{{cook-text "![an image](upload://a.png)" class="post-body"}}`,
+    template: hbs`{{cook-text "![an image](upload://a.png)" class="post-body"}}`,
 
     beforeEach() {
       pretender.post("/uploads/lookup-urls", () => {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-button-test.js
index a79aeceb87..8c6eed65a3 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/d-button-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-button-test.js
@@ -1,18 +1,20 @@
-import {
-  discourseModule,
-  exists,
-  queryAll,
-} from "discourse/tests/helpers/qunit-helpers";
-import I18n from "I18n";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  exists,
+  query,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import I18n from "I18n";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule("Integration | Component | d-button", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("icon only button", {
-    template: '{{d-button icon="plus" tabindex="3"}}',
+    template: hbs`{{d-button icon="plus" tabindex="3"}}`,
 
     test(assert) {
       assert.ok(
@@ -32,7 +34,7 @@ discourseModule("Integration | Component | d-button", function (hooks) {
   });
 
   componentTest("icon and text button", {
-    template: '{{d-button icon="plus" label="topic.create"}}',
+    template: hbs`{{d-button icon="plus" label="topic.create"}}`,
 
     test(assert) {
       assert.ok(
@@ -51,7 +53,7 @@ discourseModule("Integration | Component | d-button", function (hooks) {
   });
 
   componentTest("text only button", {
-    template: '{{d-button label="topic.create"}}',
+    template: hbs`{{d-button label="topic.create"}}`,
 
     test(assert) {
       assert.ok(
@@ -66,7 +68,7 @@ discourseModule("Integration | Component | d-button", function (hooks) {
   });
 
   componentTest("form attribute", {
-    template: '{{d-button form="login-form"}}',
+    template: hbs`{{d-button form="login-form"}}`,
 
     test(assert) {
       assert.ok(exists("button[form=login-form]"), "it has the form attribute");
@@ -74,7 +76,7 @@ discourseModule("Integration | Component | d-button", function (hooks) {
   });
 
   componentTest("link-styled button", {
-    template: '{{d-button display="link"}}',
+    template: hbs`{{d-button display="link"}}`,
 
     test(assert) {
       assert.ok(
@@ -85,7 +87,7 @@ discourseModule("Integration | Component | d-button", function (hooks) {
   });
 
   componentTest("isLoading button", {
-    template: "{{d-button isLoading=isLoading}}",
+    template: hbs`{{d-button isLoading=isLoading}}`,
 
     beforeEach() {
       this.set("isLoading", true);
@@ -115,7 +117,7 @@ discourseModule("Integration | Component | d-button", function (hooks) {
   });
 
   componentTest("disabled button", {
-    template: "{{d-button disabled=disabled}}",
+    template: hbs`{{d-button disabled=disabled}}`,
 
     beforeEach() {
       this.set("disabled", true);
@@ -134,8 +136,7 @@ discourseModule("Integration | Component | d-button", function (hooks) {
   });
 
   componentTest("aria-label", {
-    template:
-      "{{d-button ariaLabel=ariaLabel translatedAriaLabel=translatedAriaLabel}}",
+    template: hbs`{{d-button ariaLabel=ariaLabel translatedAriaLabel=translatedAriaLabel}}`,
 
     beforeEach() {
       I18n.translations[I18n.locale].js.test = { fooAriaLabel: "foo" };
@@ -159,7 +160,7 @@ discourseModule("Integration | Component | d-button", function (hooks) {
   });
 
   componentTest("title", {
-    template: "{{d-button title=title translatedTitle=translatedTitle}}",
+    template: hbs`{{d-button title=title translatedTitle=translatedTitle}}`,
 
     beforeEach() {
       I18n.translations[I18n.locale].js.test = { fooTitle: "foo" };
@@ -182,7 +183,7 @@ discourseModule("Integration | Component | d-button", function (hooks) {
   });
 
   componentTest("label", {
-    template: "{{d-button label=label translatedLabel=translatedLabel}}",
+    template: hbs`{{d-button label=label translatedLabel=translatedLabel}}`,
 
     beforeEach() {
       I18n.translations[I18n.locale].js.test = { fooLabel: "foo" };
@@ -204,4 +205,33 @@ discourseModule("Integration | Component | d-button", function (hooks) {
       assert.equal(queryAll("button .d-button-label").text(), "bar");
     },
   });
+
+  componentTest("aria-expanded", {
+    template: hbs`{{d-button ariaExpanded=ariaExpanded}}`,
+
+    test(assert) {
+      assert.equal(query("button").ariaExpanded, null);
+
+      this.set("ariaExpanded", true);
+      assert.equal(query("button").getAttribute("aria-expanded"), "true");
+
+      this.set("ariaExpanded", false);
+      assert.equal(query("button").getAttribute("aria-expanded"), "false");
+
+      this.set("ariaExpanded", "false");
+      assert.equal(query("button").getAttribute("aria-expanded"), null);
+
+      this.set("ariaExpanded", "true");
+      assert.equal(query("button").getAttribute("aria-expanded"), null);
+    },
+  });
+
+  componentTest("aria-controls", {
+    template: hbs`{{d-button ariaControls=ariaControls}}`,
+
+    test(assert) {
+      this.set("ariaControls", "foo-bar");
+      assert.equal(query("button").getAttribute("aria-controls"), "foo-bar");
+    },
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
index c116dab8af..f088f40f68 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
@@ -1,26 +1,27 @@
+import { click, fillIn, settled } from "@ember/test-helpers";
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import I18n from "I18n";
-import { next } from "@ember/runloop";
-import { clearToolbarCallbacks } from "discourse/components/d-editor";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
-import { withPluginApi } from "discourse/lib/plugin-api";
-import formatTextWithSelection from "discourse/tests/helpers/d-editor-helper";
 import {
-  setTextareaSelection,
   getTextareaSelection,
+  setTextareaSelection,
 } from "discourse/tests/helpers/textarea-selection-helper";
-import { fillIn, click } from "@ember/test-helpers";
+import I18n from "I18n";
+import { clearToolbarCallbacks } from "discourse/components/d-editor";
+import formatTextWithSelection from "discourse/tests/helpers/d-editor-helper";
+import hbs from "htmlbars-inline-precompile";
+import { next } from "@ember/runloop";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 discourseModule("Integration | Component | d-editor", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("preview updates with markdown", {
-    template: "{{d-editor value=value}}",
+    template: hbs`{{d-editor value=value}}`,
 
     async test(assert) {
       assert.ok(queryAll(".d-editor-button-bar").length);
@@ -35,7 +36,7 @@ discourseModule("Integration | Component | d-editor", function (hooks) {
   });
 
   componentTest("preview sanitizes HTML", {
-    template: "{{d-editor value=value}}",
+    template: hbs`{{d-editor value=value}}`,
 
     async test(assert) {
       await fillIn(".d-editor-input", `"><svg onload="prompt(/xss/)"></svg>`);
@@ -44,7 +45,7 @@ discourseModule("Integration | Component | d-editor", function (hooks) {
   });
 
   componentTest("updating the value refreshes the preview", {
-    template: "{{d-editor value=value}}",
+    template: hbs`{{d-editor value=value}}`,
 
     beforeEach() {
       this.set("value", "evil trout");
@@ -56,7 +57,9 @@ discourseModule("Integration | Component | d-editor", function (hooks) {
         "<p>evil trout</p>"
       );
 
-      await this.set("value", "zogstrip");
+      this.set("value", "zogstrip");
+      await settled();
+
       assert.equal(
         queryAll(".d-editor-preview").html().trim(),
         "<p>zogstrip</p>"
@@ -72,7 +75,7 @@ discourseModule("Integration | Component | d-editor", function (hooks) {
 
   function testCase(title, testFunc) {
     componentTest(title, {
-      template: "{{d-editor value=value}}",
+      template: hbs`{{d-editor value=value}}`,
       beforeEach() {
         this.set("value", "hello world.");
       },
@@ -85,7 +88,7 @@ discourseModule("Integration | Component | d-editor", function (hooks) {
 
   function composerTestCase(title, testFunc) {
     componentTest(title, {
-      template: "{{d-editor value=value composerEvents=true}}",
+      template: hbs`{{d-editor value=value composerEvents=true}}`,
       beforeEach() {
         this.set("value", "hello world.");
       },
@@ -97,33 +100,33 @@ discourseModule("Integration | Component | d-editor", function (hooks) {
     });
   }
 
-  testCase(`selecting the space before a word`, async function (
-    assert,
-    textarea
-  ) {
-    textarea.selectionStart = 5;
-    textarea.selectionEnd = 7;
+  testCase(
+    `selecting the space before a word`,
+    async function (assert, textarea) {
+      textarea.selectionStart = 5;
+      textarea.selectionEnd = 7;
 
-    await click(`button.bold`);
+      await click(`button.bold`);
 
-    assert.equal(this.value, `hello **w**orld.`);
-    assert.equal(textarea.selectionStart, 8);
-    assert.equal(textarea.selectionEnd, 9);
-  });
+      assert.equal(this.value, `hello **w**orld.`);
+      assert.equal(textarea.selectionStart, 8);
+      assert.equal(textarea.selectionEnd, 9);
+    }
+  );
 
-  testCase(`selecting the space after a word`, async function (
-    assert,
-    textarea
-  ) {
-    textarea.selectionStart = 0;
-    textarea.selectionEnd = 6;
+  testCase(
+    `selecting the space after a word`,
+    async function (assert, textarea) {
+      textarea.selectionStart = 0;
+      textarea.selectionEnd = 6;
 
-    await click(`button.bold`);
+      await click(`button.bold`);
 
-    assert.equal(this.value, `**hello** world.`);
-    assert.equal(textarea.selectionStart, 2);
-    assert.equal(textarea.selectionEnd, 7);
-  });
+      assert.equal(this.value, `**hello** world.`);
+      assert.equal(textarea.selectionStart, 2);
+      assert.equal(textarea.selectionEnd, 7);
+    }
+  );
 
   testCase(`bold button with no selection`, async function (assert, textarea) {
     await click(`button.bold`);
@@ -149,37 +152,37 @@ discourseModule("Integration | Component | d-editor", function (hooks) {
     assert.equal(textarea.selectionEnd, 11);
   });
 
-  testCase(`bold with a multiline selection`, async function (
-    assert,
-    textarea
-  ) {
-    this.set("value", "hello\n\nworld\n\ntest.");
+  testCase(
+    `bold with a multiline selection`,
+    async function (assert, textarea) {
+      this.set("value", "hello\n\nworld\n\ntest.");
 
-    textarea.selectionStart = 0;
-    textarea.selectionEnd = 12;
+      textarea.selectionStart = 0;
+      textarea.selectionEnd = 12;
 
-    await click(`button.bold`);
-    assert.equal(this.value, `**hello**\n\n**world**\n\ntest.`);
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 20);
+      await click(`button.bold`);
+      assert.equal(this.value, `**hello**\n\n**world**\n\ntest.`);
+      assert.equal(textarea.selectionStart, 0);
+      assert.equal(textarea.selectionEnd, 20);
 
-    await click(`button.bold`);
-    assert.equal(this.value, `hello\n\nworld\n\ntest.`);
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 12);
-  });
+      await click(`button.bold`);
+      assert.equal(this.value, `hello\n\nworld\n\ntest.`);
+      assert.equal(textarea.selectionStart, 0);
+      assert.equal(textarea.selectionEnd, 12);
+    }
+  );
 
-  testCase(`italic button with no selection`, async function (
-    assert,
-    textarea
-  ) {
-    await click(`button.italic`);
-    const example = I18n.t(`composer.italic_text`);
-    assert.equal(this.value, `hello world.*${example}*`);
+  testCase(
+    `italic button with no selection`,
+    async function (assert, textarea) {
+      await click(`button.italic`);
+      const example = I18n.t(`composer.italic_text`);
+      assert.equal(this.value, `hello world.*${example}*`);
 
-    assert.equal(textarea.selectionStart, 13);
-    assert.equal(textarea.selectionEnd, 13 + example.length);
-  });
+      assert.equal(textarea.selectionStart, 13);
+      assert.equal(textarea.selectionEnd, 13 + example.length);
+    }
+  );
 
   testCase(`italic button with a selection`, async function (assert, textarea) {
     textarea.selectionStart = 6;
@@ -196,28 +199,28 @@ discourseModule("Integration | Component | d-editor", function (hooks) {
     assert.equal(textarea.selectionEnd, 11);
   });
 
-  testCase(`italic with a multiline selection`, async function (
-    assert,
-    textarea
-  ) {
-    this.set("value", "hello\n\nworld\n\ntest.");
+  testCase(
+    `italic with a multiline selection`,
+    async function (assert, textarea) {
+      this.set("value", "hello\n\nworld\n\ntest.");
 
-    textarea.selectionStart = 0;
-    textarea.selectionEnd = 12;
+      textarea.selectionStart = 0;
+      textarea.selectionEnd = 12;
 
-    await click(`button.italic`);
-    assert.equal(this.value, `*hello*\n\n*world*\n\ntest.`);
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 16);
+      await click(`button.italic`);
+      assert.equal(this.value, `*hello*\n\n*world*\n\ntest.`);
+      assert.equal(textarea.selectionStart, 0);
+      assert.equal(textarea.selectionEnd, 16);
 
-    await click(`button.italic`);
-    assert.equal(this.value, `hello\n\nworld\n\ntest.`);
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 12);
-  });
+      await click(`button.italic`);
+      assert.equal(this.value, `hello\n\nworld\n\ntest.`);
+      assert.equal(textarea.selectionStart, 0);
+      assert.equal(textarea.selectionEnd, 12);
+    }
+  );
 
   componentTest("advanced code", {
-    template: "{{d-editor value=value}}",
+    template: hbs`{{d-editor value=value}}`,
     beforeEach() {
       this.siteSettings.code_formatting_style = "4-spaces-indent";
       this.set(
@@ -252,7 +255,7 @@ discourseModule("Integration | Component | d-editor", function (hooks) {
   });
 
   componentTest("code button", {
-    template: "{{d-editor value=value}}",
+    template: hbs`{{d-editor value=value}}`,
     beforeEach() {
       this.siteSettings.code_formatting_style = "4-spaces-indent";
     },
@@ -337,7 +340,7 @@ third line`
   });
 
   componentTest("code fences", {
-    template: "{{d-editor value=value}}",
+    template: hbs`{{d-editor value=value}}`,
     beforeEach() {
       this.set("value", "");
     },
@@ -450,7 +453,7 @@ third line`
   });
 
   componentTest("quote button - empty lines", {
-    template: "{{d-editor value=value composerEvents=true}}",
+    template: hbs`{{d-editor value=value composerEvents=true}}`,
     beforeEach() {
       this.set("value", "one\n\ntwo\n\nthree");
     },
@@ -459,19 +462,19 @@ third line`
 
       textarea.selectionStart = 0;
 
-      await click("button.quote");
+      await click("button.blockquote");
 
       assert.equal(this.value, "> one\n> \n> two\n> \n> three");
       assert.equal(textarea.selectionStart, 0);
       assert.equal(textarea.selectionEnd, 25);
 
-      await click("button.quote");
+      await click("button.blockquote");
       assert.equal(this.value, "one\n\ntwo\n\nthree");
     },
   });
 
   componentTest("quote button - selecting empty lines", {
-    template: "{{d-editor value=value composerEvents=true}}",
+    template: hbs`{{d-editor value=value composerEvents=true}}`,
     beforeEach() {
       this.set("value", "one\n\n\n\ntwo");
     },
@@ -481,7 +484,7 @@ third line`
       textarea.selectionStart = 6;
       textarea.selectionEnd = 10;
 
-      await click("button.quote");
+      await click("button.blockquote");
       assert.equal(this.value, "one\n\n\n> \n> two");
     },
   });
@@ -490,12 +493,12 @@ third line`
     textarea.selectionStart = 6;
     textarea.selectionEnd = 9;
 
-    await click("button.quote");
+    await click("button.blockquote");
     assert.equal(this.value, "hello\n\n> wor\n\nld.");
     assert.equal(textarea.selectionStart, 7);
     assert.equal(textarea.selectionEnd, 12);
 
-    await click("button.quote");
+    await click("button.blockquote");
 
     assert.equal(this.value, "hello\n\nwor\n\nld.");
     assert.equal(textarea.selectionStart, 7);
@@ -504,24 +507,24 @@ third line`
     textarea.selectionStart = 15;
     textarea.selectionEnd = 15;
 
-    await click("button.quote");
+    await click("button.blockquote");
     assert.equal(this.value, "hello\n\nwor\n\nld.\n\n> Blockquote");
   });
 
-  testCase(`bullet button with no selection`, async function (
-    assert,
-    textarea
-  ) {
-    const example = I18n.t("composer.list_item");
+  testCase(
+    `bullet button with no selection`,
+    async function (assert, textarea) {
+      const example = I18n.t("composer.list_item");
 
-    await click(`button.bullet`);
-    assert.equal(this.value, `hello world.\n\n* ${example}`);
-    assert.equal(textarea.selectionStart, 14);
-    assert.equal(textarea.selectionEnd, 16 + example.length);
+      await click(`button.bullet`);
+      assert.equal(this.value, `hello world.\n\n* ${example}`);
+      assert.equal(textarea.selectionStart, 14);
+      assert.equal(textarea.selectionEnd, 16 + example.length);
 
-    await click(`button.bullet`);
-    assert.equal(this.value, `hello world.\n\n${example}`);
-  });
+      await click(`button.bullet`);
+      assert.equal(this.value, `hello world.\n\n${example}`);
+    }
+  );
 
   testCase(`bullet button with a selection`, async function (assert, textarea) {
     textarea.selectionStart = 6;
@@ -538,25 +541,25 @@ third line`
     assert.equal(textarea.selectionEnd, 12);
   });
 
-  testCase(`bullet button with a multiple line selection`, async function (
-    assert,
-    textarea
-  ) {
-    this.set("value", "* Hello\n\nWorld\n\nEvil");
+  testCase(
+    `bullet button with a multiple line selection`,
+    async function (assert, textarea) {
+      this.set("value", "* Hello\n\nWorld\n\nEvil");
 
-    textarea.selectionStart = 0;
-    textarea.selectionEnd = 20;
+      textarea.selectionStart = 0;
+      textarea.selectionEnd = 20;
 
-    await click(`button.bullet`);
-    assert.equal(this.value, "Hello\n\nWorld\n\nEvil");
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 18);
+      await click(`button.bullet`);
+      assert.equal(this.value, "Hello\n\nWorld\n\nEvil");
+      assert.equal(textarea.selectionStart, 0);
+      assert.equal(textarea.selectionEnd, 18);
 
-    await click(`button.bullet`);
-    assert.equal(this.value, "* Hello\n\n* World\n\n* Evil");
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 24);
-  });
+      await click(`button.bullet`);
+      assert.equal(this.value, "* Hello\n\n* World\n\n* Evil");
+      assert.equal(textarea.selectionStart, 0);
+      assert.equal(textarea.selectionEnd, 24);
+    }
+  );
 
   testCase(`list button with no selection`, async function (assert, textarea) {
     const example = I18n.t("composer.list_item");
@@ -605,10 +608,10 @@ third line`
   });
 
   componentTest("clicking the toggle-direction changes dir from ltr to rtl", {
-    template: "{{d-editor value=value}}",
+    template: hbs`{{d-editor value=value}}`,
     beforeEach() {
       this.siteSettings.support_mixed_text_direction = true;
-      this.siteSettings.default_locale = "en_US";
+      this.siteSettings.default_locale = "en";
     },
 
     async test(assert) {
@@ -619,10 +622,10 @@ third line`
   });
 
   componentTest("clicking the toggle-direction changes dir from ltr to rtl", {
-    template: "{{d-editor value=value}}",
+    template: hbs`{{d-editor value=value}}`,
     beforeEach() {
       this.siteSettings.support_mixed_text_direction = true;
-      this.siteSettings.default_locale = "en_US";
+      this.siteSettings.default_locale = "en";
     },
 
     async test(assert) {
@@ -633,26 +636,26 @@ third line`
     },
   });
 
-  testCase(`doesn't jump to bottom with long text`, async function (
-    assert,
-    textarea
-  ) {
-    let longText = "hello world.";
-    for (let i = 0; i < 8; i++) {
-      longText = longText + longText;
+  testCase(
+    `doesn't jump to bottom with long text`,
+    async function (assert, textarea) {
+      let longText = "hello world.";
+      for (let i = 0; i < 8; i++) {
+        longText = longText + longText;
+      }
+      this.set("value", longText);
+
+      $(textarea).scrollTop(0);
+      textarea.selectionStart = 3;
+      textarea.selectionEnd = 3;
+
+      await click("button.bold");
+      assert.equal($(textarea).scrollTop(), 0, "it stays scrolled up");
     }
-    this.set("value", longText);
-
-    $(textarea).scrollTop(0);
-    textarea.selectionStart = 3;
-    textarea.selectionEnd = 3;
-
-    await click("button.bold");
-    assert.equal($(textarea).scrollTop(), 0, "it stays scrolled up");
-  });
+  );
 
   componentTest("emoji", {
-    template: "{{d-editor value=value}}",
+    template: hbs`{{d-editor value=value}}`,
     beforeEach() {
       // Test adding a custom button
       withPluginApi("0.1", (api) => {
@@ -703,14 +706,15 @@ third line`
     assert.equal(this.value, "red yellow blue");
   });
 
-  function paste(element, text) {
+  async function paste(element, text) {
     let e = new Event("paste");
     e.clipboardData = { getData: () => text };
     element.dispatchEvent(e);
+    await settled();
   }
 
   componentTest("paste table", {
-    template: "{{d-editor value=value composerEvents=true}}",
+    template: hbs`{{d-editor value=value composerEvents=true}}`,
     beforeEach() {
       this.set("value", "");
       this.siteSettings.enable_rich_text_paste = true;
@@ -723,6 +727,20 @@ third line`
     },
   });
 
+  componentTest("paste a different table", {
+    template: hbs`{{d-editor value=value composerEvents=true}}`,
+    beforeEach() {
+      this.set("value", "");
+      this.siteSettings.enable_rich_text_paste = true;
+    },
+
+    async test(assert) {
+      let element = queryAll(".d-editor")[0];
+      await paste(element, '\ta\tb\n1\t"2\n2.5"\t3');
+      assert.equal(this.value, "||a|b|\n|---|---|---|\n|1|2<br>2.5|3|\n");
+    },
+  });
+
   (() => {
     // Tests to check cursor/selection after replace-text event.
     const BEFORE = "red green blue";
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-icon-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-icon-test.js
index 4f1f69ee0d..319157d629 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/d-icon-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-icon-test.js
@@ -1,16 +1,17 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule("Integration | Component | d-icon", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("default", {
-    template: '<div class="test">{{d-icon "bars"}}</div>',
+    template: hbs`<div class="test">{{d-icon "bars"}}</div>`,
 
     test(assert) {
       const html = queryAll(".test").html().trim();
@@ -22,7 +23,7 @@ discourseModule("Integration | Component | d-icon", function (hooks) {
   });
 
   componentTest("with replacement", {
-    template: '<div class="test">{{d-icon "d-watching"}}</div>',
+    template: hbs`<div class="test">{{d-icon "d-watching"}}</div>`,
 
     test(assert) {
       const html = queryAll(".test").html().trim();
diff --git a/app/assets/javascripts/discourse/tests/integration/components/date-input-test.js b/app/assets/javascripts/discourse/tests/integration/components/date-input-test.js
index abc1246b0e..6da694557d 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/date-input-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/date-input-test.js
@@ -1,26 +1,17 @@
-import {
-  discourseModule,
-  queryAll,
-} from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
-import { click } from "@ember/test-helpers";
+import { discourseModule, query } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 function dateInput() {
-  return queryAll(".date-picker");
+  return query(".date-picker");
 }
 
 function setDate(date) {
   this.set("date", date);
 }
 
-async function pika(year, month, day) {
-  await click(
-    `.pika-button.pika-day[data-pika-year="${year}"][data-pika-month="${month}"][data-pika-day="${day}"]`
-  );
-}
-
 function noop() {}
 
 const DEFAULT_DATE = moment("2019-01-29");
@@ -29,19 +20,19 @@ discourseModule("Integration | Component | date-input", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("default", {
-    template: `{{date-input date=date}}`,
+    template: hbs`{{date-input date=date}}`,
 
     beforeEach() {
       this.setProperties({ date: DEFAULT_DATE });
     },
 
     test(assert) {
-      assert.equal(dateInput().val(), "January 29, 2019");
+      assert.equal(dateInput().value, "2019-01-29");
     },
   });
 
   componentTest("prevents mutations", {
-    template: `{{date-input date=date onChange=onChange}}`,
+    template: hbs`{{date-input date=date onChange=onChange}}`,
 
     beforeEach() {
       this.setProperties({ date: DEFAULT_DATE });
@@ -49,15 +40,15 @@ discourseModule("Integration | Component | date-input", function (hooks) {
     },
 
     async test(assert) {
-      await click(dateInput());
-      await pika(2019, 0, 2);
+      dateInput().value = "2019-01-02";
+      dateInput().dispatchEvent(new Event("change"));
 
       assert.ok(this.date.isSame(DEFAULT_DATE));
     },
   });
 
   componentTest("allows mutations through actions", {
-    template: `{{date-input date=date onChange=onChange}}`,
+    template: hbs`{{date-input date=date onChange=onChange}}`,
 
     beforeEach() {
       this.setProperties({ date: DEFAULT_DATE });
@@ -65,10 +56,10 @@ discourseModule("Integration | Component | date-input", function (hooks) {
     },
 
     async test(assert) {
-      await click(dateInput());
-      await pika(2019, 0, 2);
+      dateInput().value = "2019-02-02";
+      dateInput().dispatchEvent(new Event("change"));
 
-      assert.ok(this.date.isSame(moment("2019-01-02")));
+      assert.ok(this.date.isSame(moment("2019-02-02")));
     },
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js
index e9d035f879..cb316517ec 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js
@@ -1,46 +1,45 @@
-import {
-  discourseModule,
-  queryAll,
-} from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import { discourseModule, query } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 function fromDateInput() {
-  return queryAll(".from.d-date-time-input .date-picker")[0];
+  return query(".from.d-date-time-input .date-picker");
 }
 
 function fromTimeInput() {
-  return queryAll(".from.d-date-time-input .d-time-input .combo-box-header")[0];
+  return query(".from.d-date-time-input .d-time-input .combo-box-header");
 }
 
 function toDateInput() {
-  return queryAll(".to.d-date-time-input .date-picker")[0];
+  return query(".to.d-date-time-input .date-picker");
 }
 
 function toTimeInput() {
-  return queryAll(".to.d-date-time-input .d-time-input .combo-box-header")[0];
+  return query(".to.d-date-time-input .d-time-input .combo-box-header");
 }
 
 const DEFAULT_DATE_TIME = moment("2019-01-29 14:45");
 
-discourseModule("Integration | Component | date-time-input-range", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | date-time-input-range",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("default", {
-    template: `{{date-time-input-range from=from to=to}}`,
+    componentTest("default", {
+      template: hbs`{{date-time-input-range from=from to=to}}`,
 
-    beforeEach() {
-      this.setProperties({ from: DEFAULT_DATE_TIME, to: null });
-    },
+      beforeEach() {
+        this.setProperties({ from: DEFAULT_DATE_TIME, to: null });
+      },
 
-    test(assert) {
-      assert.equal(fromDateInput().value, "January 29, 2019");
-      assert.equal(fromTimeInput().dataset.name, "14:45");
-      assert.equal(toDateInput().value, "");
-      assert.equal(toTimeInput().dataset.name, "--:--");
-    },
-  });
-});
+      test(assert) {
+        assert.equal(fromDateInput().value, "2019-01-29");
+        assert.equal(fromTimeInput().dataset.name, "14:45");
+        assert.equal(toDateInput().value, "");
+        assert.equal(toTimeInput().dataset.name, "--:--");
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-test.js b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-test.js
index b010643c0b..57a7136e7a 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-test.js
@@ -1,66 +1,59 @@
-import {
-  discourseModule,
-  exists,
-  queryAll,
-} from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
-import { click } from "@ember/test-helpers";
+import {
+  discourseModule,
+  exists,
+  query,
+} from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 function dateInput() {
-  return queryAll(".date-picker")[0];
+  return query(".date-picker");
 }
 
 function timeInput() {
-  return queryAll(".d-time-input .combo-box-header")[0];
+  return query(".d-time-input .combo-box-header");
 }
 
 function setDate(date) {
   this.set("date", date);
 }
 
-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 = moment("2019-01-29 14:45");
 
 discourseModule("Integration | Component | date-time-input", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("default", {
-    template: `{{date-time-input date=date}}`,
+    template: hbs`{{date-time-input date=date}}`,
 
     beforeEach() {
       this.setProperties({ date: DEFAULT_DATE_TIME });
     },
 
     test(assert) {
-      assert.equal(dateInput().value, "January 29, 2019");
+      assert.equal(dateInput().value, "2019-01-29");
       assert.equal(timeInput().dataset.name, "14:45");
     },
   });
 
   componentTest("prevents mutations", {
-    template: `{{date-time-input date=date}}`,
+    template: hbs`{{date-time-input date=date}}`,
 
     beforeEach() {
       this.setProperties({ date: DEFAULT_DATE_TIME });
     },
 
     async test(assert) {
-      await click(dateInput());
-      await pika(2019, 0, 2);
+      dateInput().value = "2019-01-02";
 
       assert.ok(this.date.isSame(DEFAULT_DATE_TIME));
     },
   });
 
   componentTest("allows mutations through actions", {
-    template: `{{date-time-input date=date onChange=onChange}}`,
+    template: hbs`{{date-time-input date=date onChange=onChange}}`,
 
     beforeEach() {
       this.setProperties({ date: DEFAULT_DATE_TIME });
@@ -68,15 +61,15 @@ discourseModule("Integration | Component | date-time-input", function (hooks) {
     },
 
     async test(assert) {
-      await click(dateInput());
-      await pika(2019, 0, 2);
+      dateInput().value = "2019-01-02";
+      dateInput().dispatchEvent(new Event("change"));
 
       assert.ok(this.date.isSame(moment("2019-01-02 14:45")));
     },
   });
 
   componentTest("can hide time", {
-    template: `{{date-time-input date=date showTime=false}}`,
+    template: hbs`{{date-time-input date=date showTime=false}}`,
 
     beforeEach() {
       this.setProperties({ date: DEFAULT_DATE_TIME });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/group-list-setting-test.js b/app/assets/javascripts/discourse/tests/integration/components/group-list-setting-test.js
new file mode 100644
index 0000000000..ef1340f54f
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/group-list-setting-test.js
@@ -0,0 +1,69 @@
+import EmberObject from "@ember/object";
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import hbs from "htmlbars-inline-precompile";
+
+discourseModule(
+  "Integration | Component | group-list site-setting",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    componentTest("default", {
+      template: hbs`{{site-setting setting=setting}}`,
+
+      beforeEach() {
+        this.site.groups = [
+          {
+            id: 1,
+            name: "Donuts",
+          },
+          {
+            id: 2,
+            name: "Cheese cake",
+          },
+        ];
+
+        this.set(
+          "setting",
+          EmberObject.create({
+            allowsNone: undefined,
+            category: "foo",
+            default: "",
+            description: "Choose groups",
+            overridden: false,
+            placeholder: null,
+            preview: null,
+            secret: false,
+            setting: "foo_bar",
+            type: "group_list",
+            validValues: undefined,
+            value: "1",
+          })
+        );
+      },
+
+      async test(assert) {
+        const subject = selectKit(".list-setting");
+
+        assert.equal(
+          subject.header().value(),
+          "1",
+          "it selects the setting's value"
+        );
+
+        await subject.expand();
+        await subject.selectRowByValue("2");
+
+        assert.equal(
+          subject.header().value(),
+          "1,2",
+          "it allows to select a setting from the list of choices"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/group-membership-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/group-membership-button-test.js
new file mode 100644
index 0000000000..69f9247521
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/group-membership-button-test.js
@@ -0,0 +1,89 @@
+import {
+  discourseModule,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+
+discourseModule(
+  "Integration | Component | group-membership-button",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    componentTest("canJoinGroup", {
+      template: hbs`{{group-membership-button model=model}}`,
+
+      beforeEach() {
+        this.set("model", { public_admission: false, is_group_user: true });
+      },
+
+      async test(assert) {
+        assert.ok(
+          queryAll(".group-index-join").length === 0,
+          "can't join group if public_admission is false"
+        );
+
+        this.set("model.public_admission", true);
+        assert.ok(
+          queryAll(".group-index-join").length === 0,
+          "can't join group if user is already in the group"
+        );
+
+        this.set("model.is_group_user", false);
+        assert.ok(
+          queryAll(".group-index-join").length,
+          "allowed to join group"
+        );
+      },
+    });
+
+    componentTest("canLeaveGroup", {
+      template: hbs`{{group-membership-button model=model}}`,
+      beforeEach() {
+        this.set("model", { public_exit: false, is_group_user: false });
+      },
+      async test(assert) {
+        assert.ok(
+          queryAll(".group-index-leave").length === 0,
+          "can't leave group if public_exit is false"
+        );
+
+        this.set("model.public_exit", true);
+        assert.ok(
+          queryAll(".group-index-leave").length === 0,
+          "can't leave group if user is not in the group"
+        );
+
+        this.set("model.is_group_user", true);
+        assert.ok(
+          queryAll(".group-index-leave").length === 1,
+          "allowed to leave group"
+        );
+      },
+    });
+
+    componentTest("canRequestMembership", {
+      template: hbs`{{group-membership-button model=model}}`,
+      beforeEach() {
+        this.set("model", {
+          allow_membership_requests: true,
+          is_group_user: true,
+        });
+      },
+
+      async test(assert) {
+        assert.ok(
+          queryAll(".group-index-request").length === 0,
+          "can't request for membership if user is already in the group"
+        );
+        this.set("model.is_group_user", false);
+        assert.ok(
+          queryAll(".group-index-request").length,
+          "allowed to request for group membership"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/hidden-details-test.js b/app/assets/javascripts/discourse/tests/integration/components/hidden-details-test.js
new file mode 100644
index 0000000000..4c44c36698
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/hidden-details-test.js
@@ -0,0 +1,35 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  exists,
+  query,
+} from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import I18n from "I18n";
+
+discourseModule("Integration | Component | hidden-details", function (hooks) {
+  setupRenderingTest(hooks);
+
+  componentTest("Shows a link and turns link into details on click", {
+    template: hbs`{{hidden-details label=label details=details}}`,
+
+    beforeEach() {
+      this.set("label", "label");
+      this.set("details", "details");
+    },
+
+    async test(assert) {
+      assert.ok(exists(".btn-link"));
+      assert.ok(query(".btn-link span").innerText === I18n.t("label"));
+      assert.notOk(exists(".description"));
+
+      await click(".btn-link");
+
+      assert.notOk(exists(".btn-link"));
+      assert.ok(exists(".description"));
+      assert.ok(query(".description").innerText === "details");
+    },
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/highlighted-code-test.js b/app/assets/javascripts/discourse/tests/integration/components/highlighted-code-test.js
index 4f748269cc..cb726a5ffb 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/highlighted-code-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/highlighted-code-test.js
@@ -1,10 +1,11 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
 
 const LONG_CODE_BLOCK = "puts a\n".repeat(15000);
 
@@ -12,11 +13,11 @@ discourseModule("Integration | Component | highlighted-code", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("highlighting code", {
-    template: "{{highlighted-code lang='ruby' code=code}}",
+    template: hbs`{{highlighted-code lang='ruby' code=code}}`,
 
     beforeEach() {
       this.session.highlightJsPath =
-        "assets/highlightjs/highlight-test-bundle.min.js";
+        "/assets/highlightjs/highlight-test-bundle.min.js";
       this.set("code", "def test; end");
     },
 
@@ -29,11 +30,11 @@ discourseModule("Integration | Component | highlighted-code", function (hooks) {
   });
 
   componentTest("large code blocks are not highlighted", {
-    template: "{{highlighted-code lang='ruby' code=code}}",
+    template: hbs`{{highlighted-code lang='ruby' code=code}}`,
 
     beforeEach() {
       this.session.highlightJsPath =
-        "assets/highlightjs/highlight-test-bundle.min.js";
+        "/assets/highlightjs/highlight-test-bundle.min.js";
       this.set("code", LONG_CODE_BLOCK);
     },
 
diff --git a/app/assets/javascripts/discourse/tests/integration/components/html-safe-helper-test.js b/app/assets/javascripts/discourse/tests/integration/components/html-safe-helper-test.js
index 27e71cee90..2c99c13279 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/html-safe-helper-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/html-safe-helper-test.js
@@ -1,13 +1,14 @@
-import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule("Integration | Component | html-safe-helper", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("default", {
-    template: "{{html-safe string}}",
+    template: hbs`{{html-safe string}}`,
 
     beforeEach() {
       this.set("string", "<p class='cookies'>biscuits</p>");
diff --git a/app/assets/javascripts/discourse/tests/integration/components/iframed-html-test.js b/app/assets/javascripts/discourse/tests/integration/components/iframed-html-test.js
index d2ca70ba61..f829c61f5e 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/iframed-html-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/iframed-html-test.js
@@ -1,16 +1,17 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule("Integration | Component | iframed-html", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("appends the html into the iframe", {
-    template: `{{iframed-html html="<h1 id='find-me'>hello</h1>" className='this-is-an-iframe'}}`,
+    template: hbs`{{iframed-html html="<h1 id='find-me'>hello</h1>" className='this-is-an-iframe'}}`,
 
     async test(assert) {
       const iframe = queryAll("iframe.this-is-an-iframe");
diff --git a/app/assets/javascripts/discourse/tests/integration/components/image-uploader-test.js b/app/assets/javascripts/discourse/tests/integration/components/image-uploader-test.js
index d1b5b74b72..61af90d0fd 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/image-uploader-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/image-uploader-test.js
@@ -1,18 +1,20 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
 import { click } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule("Integration | Component | image-uploader", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("with image", {
-    template:
-      "{{image-uploader imageUrl='/images/avatar.png' placeholderUrl='/not/used.png'}}",
+    template: hbs`
+      {{image-uploader imageUrl='/images/avatar.png' placeholderUrl='/not/used.png'}}
+    `,
 
     async test(assert) {
       assert.equal(
@@ -44,7 +46,7 @@ discourseModule("Integration | Component | image-uploader", function (hooks) {
   });
 
   componentTest("without image", {
-    template: "{{image-uploader}}",
+    template: hbs`{{image-uploader}}`,
 
     test(assert) {
       assert.equal(
@@ -68,7 +70,7 @@ discourseModule("Integration | Component | image-uploader", function (hooks) {
   });
 
   componentTest("with placeholder", {
-    template: "{{image-uploader placeholderUrl='/images/avatar.png'}}",
+    template: hbs`{{image-uploader placeholderUrl='/images/avatar.png'}}`,
 
     test(assert) {
       assert.equal(
diff --git a/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js b/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js
new file mode 100644
index 0000000000..8d161d2022
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js
@@ -0,0 +1,56 @@
+import { set } from "@ember/object";
+import { click, fillIn } from "@ember/test-helpers";
+import User from "discourse/models/user";
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import pretender from "discourse/tests/helpers/create-pretender";
+import {
+  discourseModule,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import hbs from "htmlbars-inline-precompile";
+
+discourseModule("Integration | Component | invite-panel", function (hooks) {
+  setupRenderingTest(hooks);
+
+  componentTest("shows the invite link after it is generated", {
+    template: hbs`{{invite-panel panel=panel}}`,
+
+    beforeEach() {
+      pretender.get("/u/search/users", () => {
+        return [200, { "Content-Type": "application/json" }, { users: [] }];
+      });
+
+      pretender.post("/invites", () => {
+        return [
+          200,
+          { "Content-Type": "application/json" },
+          {
+            link: "http://example.com/invites/92c297e886a0ca03089a109ccd6be155",
+          },
+        ];
+      });
+
+      set(this.currentUser, "details", { can_invite_via_email: true });
+      this.set("panel", {
+        id: "invite",
+        model: { inviteModel: User.create(this.currentUser) },
+      });
+    },
+
+    async test(assert) {
+      const input = selectKit(".invite-user-input");
+      await input.expand();
+      await fillIn(".invite-user-input .filter-input", "eviltrout@example.com");
+      await input.selectRowByValue("eviltrout@example.com");
+      assert.ok(queryAll(".send-invite:disabled").length === 0);
+      await click(".generate-invite-link");
+      assert.equal(
+        find(".invite-link-input")[0].value,
+        "http://example.com/invites/92c297e886a0ca03089a109ccd6be155"
+      );
+    },
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/load-more-test.js b/app/assets/javascripts/discourse/tests/integration/components/load-more-test.js
index a9d2138b52..9ff074d046 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/load-more-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/load-more-test.js
@@ -1,17 +1,19 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import { configureEyeline } from "discourse/lib/eyeline";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import { configureEyeline } from "discourse/lib/eyeline";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule("Integration | Component | load-more", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("updates once after initialization", {
-    template: `
+    template: hbs`
       {{#load-more selector=".numbers tr" action=loadMore}}
         <table class="numbers"><tr></tr></table>
-      {{/load-more}}`,
+      {{/load-more}}
+    `,
 
     beforeEach() {
       this.set("loadMore", () => this.set("loadedMore", true));
diff --git a/app/assets/javascripts/discourse/tests/integration/components/relative-time-picker-test.js b/app/assets/javascripts/discourse/tests/integration/components/relative-time-picker-test.js
new file mode 100644
index 0000000000..e0ed34fb08
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/relative-time-picker-test.js
@@ -0,0 +1,120 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import { discourseModule, query } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+
+discourseModule(
+  "Integration | Component | relative-time-picker",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+    });
+
+    componentTest("prefills and preselects minutes", {
+      template: hbs`{{relative-time-picker durationMinutes="5"}}`,
+
+      test(assert) {
+        const prefilledDuration = query(".relative-time-duration").value;
+        assert.equal(this.subject.header().value(), "mins");
+        assert.equal(prefilledDuration, 5);
+      },
+    });
+
+    componentTest("prefills and preselects hours based on translated minutes", {
+      template: hbs`{{relative-time-picker durationMinutes="90"}}`,
+
+      test(assert) {
+        const prefilledDuration = query(".relative-time-duration").value;
+        assert.equal(this.subject.header().value(), "hours");
+        assert.equal(prefilledDuration, 1.5);
+      },
+    });
+
+    componentTest("prefills and preselects days based on translated minutes", {
+      template: hbs`{{relative-time-picker durationMinutes="2880"}}`,
+
+      test(assert) {
+        const prefilledDuration = query(".relative-time-duration").value;
+        assert.equal(this.subject.header().value(), "days");
+        assert.equal(prefilledDuration, 2);
+      },
+    });
+
+    componentTest(
+      "prefills and preselects months based on translated minutes",
+      {
+        template: hbs`{{relative-time-picker durationMinutes="129600"}}`,
+
+        test(assert) {
+          const prefilledDuration = query(".relative-time-duration").value;
+          assert.equal(this.subject.header().value(), "months");
+          assert.equal(prefilledDuration, 3);
+        },
+      }
+    );
+
+    componentTest("prefills and preselects years based on translated minutes", {
+      template: hbs`{{relative-time-picker durationMinutes="525600"}}`,
+
+      test(assert) {
+        const prefilledDuration = query(".relative-time-duration").value;
+        assert.equal(this.subject.header().value(), "years");
+        assert.equal(prefilledDuration, 1);
+      },
+    });
+
+    componentTest("prefills and preselects hours", {
+      template: hbs`{{relative-time-picker durationHours="5"}}`,
+
+      test(assert) {
+        const prefilledDuration = query(".relative-time-duration").value;
+        assert.equal(this.subject.header().value(), "hours");
+        assert.equal(prefilledDuration, 5);
+      },
+    });
+
+    componentTest("prefills and preselects minutes based on translated hours", {
+      template: hbs`{{relative-time-picker durationHours="0.5"}}`,
+
+      test(assert) {
+        const prefilledDuration = query(".relative-time-duration").value;
+        assert.equal(this.subject.header().value(), "mins");
+        assert.equal(prefilledDuration, 30);
+      },
+    });
+
+    componentTest("prefills and preselects days based on translated hours", {
+      template: hbs`{{relative-time-picker durationHours="48"}}`,
+
+      test(assert) {
+        const prefilledDuration = query(".relative-time-duration").value;
+        assert.equal(this.subject.header().value(), "days");
+        assert.equal(prefilledDuration, 2);
+      },
+    });
+
+    componentTest("prefills and preselects months based on translated hours", {
+      template: hbs`{{relative-time-picker durationHours="2160"}}`,
+
+      test(assert) {
+        const prefilledDuration = query(".relative-time-duration").value;
+        assert.equal(this.subject.header().value(), "months");
+        assert.equal(prefilledDuration, 3);
+      },
+    });
+
+    componentTest("prefills and preselects years based on translated hours", {
+      template: hbs`{{relative-time-picker durationHours="17520"}}`,
+
+      test(assert) {
+        const prefilledDuration = query(".relative-time-duration").value;
+        assert.equal(this.subject.header().value(), "years");
+        assert.equal(prefilledDuration, 2);
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/secret-value-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/secret-value-list-test.js
index 44a80873ae..6e5fb866e3 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/secret-value-list-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/secret-value-list-test.js
@@ -1,105 +1,107 @@
+import { click, fillIn } from "@ember/test-helpers";
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import I18n from "I18n";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
-import { fillIn, click } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
 
-discourseModule("Integration | Component | secret-value-list", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | secret-value-list",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("adding a value", {
-    template: "{{secret-value-list values=values}}",
+    componentTest("adding a value", {
+      template: hbs`{{secret-value-list values=values}}`,
 
-    async test(assert) {
-      this.set("values", "firstKey|FirstValue\nsecondKey|secondValue");
+      async test(assert) {
+        this.set("values", "firstKey|FirstValue\nsecondKey|secondValue");
 
-      await fillIn(".new-value-input.key", "thirdKey");
-      await click(".add-value-btn");
+        await fillIn(".new-value-input.key", "thirdKey");
+        await click(".add-value-btn");
 
-      assert.ok(
-        queryAll(".values .value").length === 2,
-        "it doesn't add the value to the list if secret is missing"
-      );
+        assert.ok(
+          queryAll(".values .value").length === 2,
+          "it doesn't add the value to the list if secret is missing"
+        );
 
-      await fillIn(".new-value-input.key", "");
-      await fillIn(".new-value-input.secret", "thirdValue");
-      await click(".add-value-btn");
+        await fillIn(".new-value-input.key", "");
+        await fillIn(".new-value-input.secret", "thirdValue");
+        await click(".add-value-btn");
 
-      assert.ok(
-        queryAll(".values .value").length === 2,
-        "it doesn't add the value to the list if key is missing"
-      );
+        assert.ok(
+          queryAll(".values .value").length === 2,
+          "it doesn't add the value to the list if key is missing"
+        );
 
-      await fillIn(".new-value-input.key", "thirdKey");
-      await fillIn(".new-value-input.secret", "thirdValue");
-      await click(".add-value-btn");
+        await fillIn(".new-value-input.key", "thirdKey");
+        await fillIn(".new-value-input.secret", "thirdValue");
+        await click(".add-value-btn");
 
-      assert.ok(
-        queryAll(".values .value").length === 3,
-        "it adds the value to the list of values"
-      );
+        assert.ok(
+          queryAll(".values .value").length === 3,
+          "it adds the value to the list of values"
+        );
 
-      assert.deepEqual(
-        this.values,
-        "firstKey|FirstValue\nsecondKey|secondValue\nthirdKey|thirdValue",
-        "it adds the value to the list of values"
-      );
-    },
-  });
+        assert.deepEqual(
+          this.values,
+          "firstKey|FirstValue\nsecondKey|secondValue\nthirdKey|thirdValue",
+          "it adds the value to the list of values"
+        );
+      },
+    });
 
-  componentTest("adding an invalid value", {
-    template: "{{secret-value-list values=values}}",
+    componentTest("adding an invalid value", {
+      template: hbs`{{secret-value-list values=values}}`,
 
-    async test(assert) {
-      await fillIn(".new-value-input.key", "someString");
-      await fillIn(".new-value-input.secret", "keyWithAPipe|Hidden");
-      await click(".add-value-btn");
+      async test(assert) {
+        await fillIn(".new-value-input.key", "someString");
+        await fillIn(".new-value-input.secret", "keyWithAPipe|Hidden");
+        await click(".add-value-btn");
 
-      assert.ok(
-        queryAll(".values .value").length === 0,
-        "it doesn't add the value to the list of values"
-      );
+        assert.ok(
+          queryAll(".values .value").length === 0,
+          "it doesn't add the value to the list of values"
+        );
 
-      assert.deepEqual(
-        this.values,
-        undefined,
-        "it doesn't add the value to the list of values"
-      );
+        assert.deepEqual(
+          this.values,
+          undefined,
+          "it doesn't add the value to the list of values"
+        );
 
-      assert.ok(
-        queryAll(".validation-error")
-          .html()
-          .indexOf(I18n.t("admin.site_settings.secret_list.invalid_input")) >
-          -1,
-        "it shows validation error"
-      );
-    },
-  });
+        assert.ok(
+          queryAll(".validation-error")
+            .html()
+            .indexOf(I18n.t("admin.site_settings.secret_list.invalid_input")) >
+            -1,
+          "it shows validation error"
+        );
+      },
+    });
 
-  componentTest("removing a value", {
-    template: "{{secret-value-list values=values}}",
+    componentTest("removing a value", {
+      template: hbs`{{secret-value-list values=values}}`,
 
-    async test(assert) {
-      this.set("values", "firstKey|FirstValue\nsecondKey|secondValue");
+      async test(assert) {
+        this.set("values", "firstKey|FirstValue\nsecondKey|secondValue");
 
-      await click(".values .value[data-index='0'] .remove-value-btn");
+        await click(".values .value[data-index='0'] .remove-value-btn");
 
-      assert.ok(
-        queryAll(".values .value").length === 1,
-        "it removes the value from the list of values"
-      );
+        assert.ok(
+          queryAll(".values .value").length === 1,
+          "it removes the value from the list of values"
+        );
 
-      assert.equal(
-        this.values,
-        "secondKey|secondValue",
-        "it removes the expected value"
-      );
-    },
-  });
-});
+        assert.equal(
+          this.values,
+          "secondKey|secondValue",
+          "it removes the expected value"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/api-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/api-test.js
index 5a4876dfc9..d8c99d06b6 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/api-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/api-test.js
@@ -1,16 +1,17 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
 import selectKit, {
-  setDefaultState,
   DEFAULT_CONTENT,
+  setDefaultState,
 } from "discourse/tests/helpers/select-kit-helper";
-import { withPluginApi } from "discourse/lib/plugin-api";
 import { clearCallbacks } from "select-kit/mixins/plugin-api";
+import hbs from "htmlbars-inline-precompile";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 discourseModule("Integration | Component | select-kit:api", function (hooks) {
   setupRenderingTest(hooks);
@@ -28,7 +29,7 @@ discourseModule("Integration | Component | select-kit:api", function (hooks) {
   });
 
   componentTest("modifySelectKit(identifier).appendContent", {
-    template: `
+    template: hbs`
       {{combo-box value=value content=content onChange=onChange}}
       {{single-select value=value content=content onChange=onChange}}
     `,
@@ -63,7 +64,7 @@ discourseModule("Integration | Component | select-kit:api", function (hooks) {
   });
 
   componentTest("modifySelectKit(identifier).prependContent", {
-    template: `
+    template: hbs`
       {{combo-box value=value content=content onChange=onChange}}
       {{single-select value=value content=content onChange=onChange}}
     `,
@@ -98,7 +99,7 @@ discourseModule("Integration | Component | select-kit:api", function (hooks) {
   });
 
   componentTest("modifySelectKit(identifier).onChange", {
-    template: `
+    template: hbs`
       <div id="test"></div>
       {{combo-box value=value content=content onChange=onChange}}
     `,
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js
index a7ca05875e..c695a350b5 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js
@@ -1,22 +1,12 @@
-import createStore from "discourse/tests/helpers/create-store";
-import I18n from "I18n";
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import I18n from "I18n";
+import createStore from "discourse/tests/helpers/create-store";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 
-function template(options = []) {
-  return `
-    {{category-chooser
-      value=value
-      options=(hash
-        ${options.join("\n")}
-      )
-    }}
-  `;
-}
-
 discourseModule(
   "Integration | Component | select-kit/category-chooser",
   function (hooks) {
@@ -27,7 +17,11 @@ discourseModule(
     });
 
     componentTest("with value", {
-      template: template(),
+      template: hbs`
+        {{category-chooser
+          value=value
+        }}
+      `,
 
       beforeEach() {
         this.set("value", 2);
@@ -40,7 +34,15 @@ discourseModule(
     });
 
     componentTest("with excludeCategoryId", {
-      template: template(["excludeCategoryId=2"]),
+      template: hbs`
+        {{category-chooser
+          value=value
+          options=(hash
+            excludeCategoryId=2
+          )
+        }}
+      `,
+
       async test(assert) {
         await this.subject.expand();
 
@@ -49,7 +51,14 @@ discourseModule(
     });
 
     componentTest("with scopedCategoryId", {
-      template: template(["scopedCategoryId=2"]),
+      template: hbs`
+        {{category-chooser
+          value=value
+          options=(hash
+            scopedCategoryId=2
+          )
+        }}
+      `,
 
       async test(assert) {
         await this.subject.expand();
@@ -81,7 +90,14 @@ discourseModule(
     });
 
     componentTest("with allowUncategorized=null", {
-      template: template(["allowUncategorized=null"]),
+      template: hbs`
+        {{category-chooser
+          value=value
+          options=(hash
+            allowUncategorized=null
+          )
+        }}
+      `,
 
       beforeEach() {
         this.siteSettings.allow_uncategorized_topics = false;
@@ -94,7 +110,15 @@ discourseModule(
     });
 
     componentTest("with allowUncategorized=null rootNone=true", {
-      template: template(["allowUncategorized=null", "none=true"]),
+      template: hbs`
+        {{category-chooser
+          value=value
+          options=(hash
+            allowUncategorized=null
+            none=true
+          )
+        }}
+      `,
 
       beforeEach() {
         this.siteSettings.allow_uncategorized_topics = false;
@@ -107,7 +131,15 @@ discourseModule(
     });
 
     componentTest("with disallowed uncategorized, none", {
-      template: template(["allowUncategorized=null", "none='test.root'"]),
+      template: hbs`
+        {{category-chooser
+          value=value
+          options=(hash
+            allowUncategorized=null
+            none="test.root"
+          )
+        }}
+      `,
 
       beforeEach() {
         I18n.translations[I18n.locale].js.test = { root: "root none label" };
@@ -121,7 +153,14 @@ discourseModule(
     });
 
     componentTest("with allowed uncategorized", {
-      template: template(["allowUncategorized=true"]),
+      template: hbs`
+        {{category-chooser
+          value=value
+          options=(hash
+            allowUncategorized=true
+          )
+        }}
+      `,
 
       beforeEach() {
         this.siteSettings.allow_uncategorized_topics = true;
@@ -134,7 +173,15 @@ discourseModule(
     });
 
     componentTest("with allowed uncategorized and none=true", {
-      template: template(["allowUncategorized=true", "none=true"]),
+      template: hbs`
+        {{category-chooser
+          value=value
+          options=(hash
+            allowUncategorized=true
+            none=true
+          )
+        }}
+      `,
 
       beforeEach() {
         this.siteSettings.allow_uncategorized_topics = true;
@@ -147,7 +194,15 @@ discourseModule(
     });
 
     componentTest("with allowed uncategorized and none", {
-      template: template(["allowUncategorized=true", "none='test.root'"]),
+      template: hbs`
+        {{category-chooser
+          value=value
+          options=(hash
+            allowUncategorized=true
+            none="test.root"
+          )
+        }}
+      `,
 
       beforeEach() {
         I18n.translations[I18n.locale].js.test = { root: "root none label" };
@@ -161,7 +216,11 @@ discourseModule(
     });
 
     componentTest("filter is case insensitive", {
-      template: template(),
+      template: hbs`
+        {{category-chooser
+          value=value
+        }}
+      `,
 
       async test(assert) {
         await this.subject.expand();
@@ -179,11 +238,11 @@ discourseModule(
     });
 
     componentTest("filter works with non english characters", {
-      template: `
-      {{category-chooser
-        value=value
-      }}
-    `,
+      template: hbs`
+        {{category-chooser
+          value=value
+        }}
+      `,
 
       beforeEach() {
         const store = createStore();
@@ -203,12 +262,12 @@ discourseModule(
     });
 
     componentTest("decodes entities in row title", {
-      template: `
-      {{category-chooser
-        value=value
-        options=(hash scopedCategoryId=1)
-      }}
-    `,
+      template: hbs`
+        {{category-chooser
+          value=value
+          options=(hash scopedCategoryId=1)
+        }}
+      `,
 
       beforeEach() {
         const store = createStore();
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-drop-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-drop-test.js
index 39c13b7f22..c72b67f972 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-drop-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-drop-test.js
@@ -1,17 +1,18 @@
-import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers";
-import I18n from "I18n";
-import DiscourseURL from "discourse/lib/url";
-import Category from "discourse/models/category";
+import {
+  ALL_CATEGORIES_ID,
+  NO_CATEGORIES_ID,
+} from "select-kit/components/category-drop";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
-import {
-  NO_CATEGORIES_ID,
-  ALL_CATEGORIES_ID,
-} from "select-kit/components/category-drop";
+import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers";
+import Category from "discourse/models/category";
+import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 import { set } from "@ember/object";
 import sinon from "sinon";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 function initCategories(context) {
   const categories = context.site.categoriesList;
@@ -34,326 +35,410 @@ function initCategoriesWithParentCategory(context) {
   });
 }
 
-function template(options = []) {
-  return `
-    {{category-drop
-      category=category
-      categories=categories
-      parentCategory=parentCategory
-      options=(hash
-        ${options.join("\n")}
-      )
-    }}
-  `;
-}
+discourseModule(
+  "Integration | Component | select-kit/category-drop",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-discourseModule("Integration | Component | select-kit/category-drop", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+    });
 
-  hooks.beforeEach(function () {
-    this.set("subject", selectKit());
-  });
-
-  componentTest("caretUpIcon", {
-    template: `
+    componentTest("caretUpIcon", {
+      template: hbs`
       {{category-drop
         category=value
         categories=content
       }}
     `,
 
-    async test(assert) {
-      const $header = this.subject.header().el();
+      async test(assert) {
+        const $header = this.subject.header().el();
 
-      assert.ok(
-        exists($header.find(`.d-icon-caret-right`)),
-        "it uses the correct default icon"
-      );
-    },
-  });
+        assert.ok(
+          exists($header.find(`.d-icon-caret-right`)),
+          "it uses the correct default icon"
+        );
+      },
+    });
 
-  componentTest("none", {
-    template: `
+    componentTest("none", {
+      template: hbs`
       {{category-drop
         category=value
         categories=content
       }}
     `,
 
-    async test(assert) {
-      const text = this.subject.header().label();
-      assert.equal(
-        text,
-        I18n.t("category.all").toLowerCase(),
-        "it uses the noneLabel"
-      );
-    },
-  });
+      async test(assert) {
+        const text = this.subject.header().label();
+        assert.equal(
+          text,
+          I18n.t("category.all").toLowerCase(),
+          "it uses the noneLabel"
+        );
+      },
+    });
 
-  componentTest("[not staff - TL0] displayCategoryDescription", {
-    template: template(),
+    componentTest("[not staff - TL0] displayCategoryDescription", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+      }}
+    `,
 
-    beforeEach() {
-      set(this.currentUser, "staff", false);
-      set(this.currentUser, "trust_level", 0);
+      beforeEach() {
+        set(this.currentUser, "staff", false);
+        set(this.currentUser, "trust_level", 0);
 
-      initCategories(this);
-    },
+        initCategories(this);
+      },
 
-    async test(assert) {
-      await this.subject.expand();
+      async test(assert) {
+        await this.subject.expand();
 
-      const row = this.subject.rowByValue(this.category.id);
-      assert.ok(
-        exists(row.el().find(".category-desc")),
-        "it shows category description for newcomers"
-      );
-    },
-  });
+        const row = this.subject.rowByValue(this.category.id);
+        assert.ok(
+          exists(row.el().find(".category-desc")),
+          "it shows category description for newcomers"
+        );
+      },
+    });
 
-  componentTest("[not staff - TL1] displayCategoryDescription", {
-    template: template(),
+    componentTest("[not staff - TL1] displayCategoryDescription", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+      }}
+    `,
 
-    beforeEach() {
-      set(this.currentUser, "moderator", false);
-      set(this.currentUser, "admin", false);
-      set(this.currentUser, "trust_level", 1);
-      initCategories(this);
-    },
+      beforeEach() {
+        set(this.currentUser, "moderator", false);
+        set(this.currentUser, "admin", false);
+        set(this.currentUser, "trust_level", 1);
+        initCategories(this);
+      },
 
-    async test(assert) {
-      await this.subject.expand();
+      async test(assert) {
+        await this.subject.expand();
 
-      const row = this.subject.rowByValue(this.category.id);
-      assert.ok(
-        !exists(row.el().find(".category-desc")),
-        "it doesn't shows category description for TL0+"
-      );
-    },
-  });
+        const row = this.subject.rowByValue(this.category.id);
+        assert.ok(
+          !exists(row.el().find(".category-desc")),
+          "it doesn't shows category description for TL0+"
+        );
+      },
+    });
 
-  componentTest("[staff - TL0] displayCategoryDescription", {
-    template: template(),
+    componentTest("[staff - TL0] displayCategoryDescription", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+      }}
+    `,
 
-    beforeEach() {
-      set(this.currentUser, "moderator", true);
-      set(this.currentUser, "trust_level", 0);
+      beforeEach() {
+        set(this.currentUser, "moderator", true);
+        set(this.currentUser, "trust_level", 0);
 
-      initCategories(this);
-    },
+        initCategories(this);
+      },
 
-    async test(assert) {
-      await this.subject.expand();
+      async test(assert) {
+        await this.subject.expand();
 
-      const row = this.subject.rowByValue(this.category.id);
-      assert.ok(
-        !exists(row.el().find(".category-desc")),
-        "it doesn't show category description for staff"
-      );
-    },
-  });
+        const row = this.subject.rowByValue(this.category.id);
+        assert.ok(
+          !exists(row.el().find(".category-desc")),
+          "it doesn't show category description for staff"
+        );
+      },
+    });
 
-  componentTest("hideParentCategory (default: false)", {
-    template: template(),
+    componentTest("hideParentCategory (default: false)", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+      }}
+    `,
 
-    beforeEach() {
-      initCategories(this);
-    },
+      beforeEach() {
+        initCategories(this);
+      },
 
-    async test(assert) {
-      await this.subject.expand();
+      async test(assert) {
+        await this.subject.expand();
 
-      const row = this.subject.rowByValue(this.category.id);
-      assert.equal(row.value(), this.category.id);
-      assert.equal(this.category.parent_category_id, null);
-    },
-  });
+        const row = this.subject.rowByValue(this.category.id);
+        assert.equal(row.value(), this.category.id);
+        assert.equal(this.category.parent_category_id, null);
+      },
+    });
 
-  componentTest("hideParentCategory (true)", {
-    template: template(["hideParentCategory=true"]),
-
-    beforeEach() {
-      initCategoriesWithParentCategory(this);
-    },
-
-    async test(assert) {
-      await this.subject.expand();
-
-      const parentRow = this.subject.rowByValue(this.parentCategory.id);
-      assert.notOk(parentRow.exists(), "the parent row is not showing");
-
-      const childCategory = this.categories.firstObject;
-      const childCategoryId = childCategory.id;
-      const childRow = this.subject.rowByValue(childCategoryId);
-      assert.ok(childRow.exists(), "the child row is showing");
-
-      const $categoryStatus = childRow.el().find(".category-status");
-      assert.ok($categoryStatus.text().trim().match(/^spec/));
-    },
-  });
-
-  componentTest("allow_uncategorized_topics (true)", {
-    template: template(),
-
-    beforeEach() {
-      this.siteSettings.allow_uncategorized_topics = true;
-      initCategories(this);
-    },
-
-    async test(assert) {
-      await this.subject.expand();
-
-      const uncategorizedCategoryId = this.site.uncategorized_category_id;
-      const row = this.subject.rowByValue(uncategorizedCategoryId);
-      assert.ok(row.exists(), "the uncategorized row is showing");
-    },
-  });
-
-  componentTest("allow_uncategorized_topics (false)", {
-    template: template(),
-
-    beforeEach() {
-      this.siteSettings.allow_uncategorized_topics = false;
-      initCategories(this);
-    },
-
-    async test(assert) {
-      await this.subject.expand();
-
-      const uncategorizedCategoryId = this.site.uncategorized_category_id;
-      const row = this.subject.rowByValue(uncategorizedCategoryId);
-      assert.notOk(row.exists(), "the uncategorized row is not showing");
-    },
-  });
-
-  componentTest("countSubcategories (default: false)", {
-    template: template(),
-
-    beforeEach() {
-      initCategories(this);
-    },
-
-    async test(assert) {
-      await this.subject.expand();
-
-      const category = Category.findById(7);
-      const row = this.subject.rowByValue(category.id);
-      const topicCount = row.el().find(".topic-count").text().trim();
-
-      assert.equal(
-        topicCount,
-        "× 481",
-        "it doesn't include the topic count of subcategories"
-      );
-    },
-  });
-
-  componentTest("countSubcategories (true)", {
-    template: template(["countSubcategories=true"]),
-
-    beforeEach() {
-      initCategories(this);
-    },
-
-    async test(assert) {
-      await this.subject.expand();
-
-      const category = Category.findById(7);
-      const row = this.subject.rowByValue(category.id);
-      const topicCount = row.el().find(".topic-count").text().trim();
-
-      assert.equal(
-        topicCount,
-        "× 584",
-        "it includes the topic count of subcategories"
-      );
-    },
-  });
-
-  componentTest("shortcuts:default", {
-    template: template(),
-
-    beforeEach() {
-      initCategories(this);
-      this.set("category", null);
-    },
-
-    async test(assert) {
-      await this.subject.expand();
-
-      assert.equal(
-        this.subject.rowByIndex(0).value(),
-        this.categories.firstObject.id,
-        "Shortcuts are not prepended when no category is selected"
-      );
-    },
-  });
-
-  componentTest("shortcuts:category is set", {
-    template: template(),
-
-    beforeEach() {
-      initCategories(this);
-    },
-
-    async test(assert) {
-      await this.subject.expand();
-
-      assert.equal(this.subject.rowByIndex(0).value(), ALL_CATEGORIES_ID);
-    },
-  });
-
-  componentTest("shortcuts with parentCategory/subCategory=true:default", {
-    template: template(["subCategory=true"]),
-
-    beforeEach() {
-      initCategoriesWithParentCategory(this);
-    },
-
-    async test(assert) {
-      await this.subject.expand();
-
-      assert.equal(this.subject.rowByIndex(0).value(), NO_CATEGORIES_ID);
-    },
-  });
-
-  componentTest(
-    "shortcuts with parentCategory/subCategory=true:category is selected",
-    {
-      template: template(["subCategory=true"]),
+    componentTest("hideParentCategory (true)", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+        options=(hash
+          hideParentCategory=true
+        )
+      }}
+    `,
 
       beforeEach() {
         initCategoriesWithParentCategory(this);
-        this.set("category", this.categories.firstObject);
+      },
+
+      async test(assert) {
+        await this.subject.expand();
+
+        const parentRow = this.subject.rowByValue(this.parentCategory.id);
+        assert.notOk(parentRow.exists(), "the parent row is not showing");
+
+        const childCategory = this.categories.firstObject;
+        const childCategoryId = childCategory.id;
+        const childRow = this.subject.rowByValue(childCategoryId);
+        assert.ok(childRow.exists(), "the child row is showing");
+
+        const $categoryStatus = childRow.el().find(".category-status");
+        assert.ok($categoryStatus.text().trim().match(/^spec/));
+      },
+    });
+
+    componentTest("allow_uncategorized_topics (true)", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+      }}
+    `,
+
+      beforeEach() {
+        this.siteSettings.allow_uncategorized_topics = true;
+        initCategories(this);
+      },
+
+      async test(assert) {
+        await this.subject.expand();
+
+        const uncategorizedCategoryId = this.site.uncategorized_category_id;
+        const row = this.subject.rowByValue(uncategorizedCategoryId);
+        assert.ok(row.exists(), "the uncategorized row is showing");
+      },
+    });
+
+    componentTest("allow_uncategorized_topics (false)", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+      }}
+    `,
+
+      beforeEach() {
+        this.siteSettings.allow_uncategorized_topics = false;
+        initCategories(this);
+      },
+
+      async test(assert) {
+        await this.subject.expand();
+
+        const uncategorizedCategoryId = this.site.uncategorized_category_id;
+        const row = this.subject.rowByValue(uncategorizedCategoryId);
+        assert.notOk(row.exists(), "the uncategorized row is not showing");
+      },
+    });
+
+    componentTest("countSubcategories (default: false)", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+      }}
+    `,
+
+      beforeEach() {
+        initCategories(this);
+      },
+
+      async test(assert) {
+        await this.subject.expand();
+
+        const category = Category.findById(7);
+        const row = this.subject.rowByValue(category.id);
+        const topicCount = row.el().find(".topic-count").text().trim();
+
+        assert.equal(
+          topicCount,
+          "× 481",
+          "it doesn't include the topic count of subcategories"
+        );
+      },
+    });
+
+    componentTest("countSubcategories (true)", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+        options=(hash
+          countSubcategories=true
+        )
+      }}
+    `,
+
+      beforeEach() {
+        initCategories(this);
+      },
+
+      async test(assert) {
+        await this.subject.expand();
+
+        const category = Category.findById(7);
+        const row = this.subject.rowByValue(category.id);
+        const topicCount = row.el().find(".topic-count").text().trim();
+
+        assert.equal(
+          topicCount,
+          "× 584",
+          "it includes the topic count of subcategories"
+        );
+      },
+    });
+
+    componentTest("shortcuts:default", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+      }}
+    `,
+
+      beforeEach() {
+        initCategories(this);
+        this.set("category", null);
+      },
+
+      async test(assert) {
+        await this.subject.expand();
+
+        assert.equal(
+          this.subject.rowByIndex(0).value(),
+          this.categories.firstObject.id,
+          "Shortcuts are not prepended when no category is selected"
+        );
+      },
+    });
+
+    componentTest("shortcuts:category is set", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+      }}
+    `,
+
+      beforeEach() {
+        initCategories(this);
       },
 
       async test(assert) {
         await this.subject.expand();
 
         assert.equal(this.subject.rowByIndex(0).value(), ALL_CATEGORIES_ID);
-        assert.equal(this.subject.rowByIndex(1).value(), NO_CATEGORIES_ID);
       },
-    }
-  );
+    });
 
-  componentTest("category url", {
-    template: template(),
+    componentTest("shortcuts with parentCategory/subCategory=true:default", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+        options=(hash
+          subCategory=true
+        )
+      }}
+    `,
 
-    beforeEach() {
-      initCategoriesWithParentCategory(this);
-      sinon.stub(DiscourseURL, "routeTo");
-    },
+      beforeEach() {
+        initCategoriesWithParentCategory(this);
+      },
 
-    async test(assert) {
-      await this.subject.expand();
-      await this.subject.selectRowByValue(26);
+      async test(assert) {
+        await this.subject.expand();
 
-      assert.ok(
-        DiscourseURL.routeTo.calledWith("/c/feature/spec/26"),
-        "it builds a correct URL"
-      );
-    },
-  });
-});
+        assert.equal(this.subject.rowByIndex(0).value(), NO_CATEGORIES_ID);
+      },
+    });
+
+    componentTest(
+      "shortcuts with parentCategory/subCategory=true:category is selected",
+      {
+        template: hbs`
+        {{category-drop
+          category=category
+          categories=categories
+          parentCategory=parentCategory
+          options=(hash
+            subCategory=true
+          )
+        }}
+      `,
+
+        beforeEach() {
+          initCategoriesWithParentCategory(this);
+          this.set("category", this.categories.firstObject);
+        },
+
+        async test(assert) {
+          await this.subject.expand();
+
+          assert.equal(this.subject.rowByIndex(0).value(), ALL_CATEGORIES_ID);
+          assert.equal(this.subject.rowByIndex(1).value(), NO_CATEGORIES_ID);
+        },
+      }
+    );
+
+    componentTest("category url", {
+      template: hbs`
+      {{category-drop
+        category=category
+        categories=categories
+        parentCategory=parentCategory
+      }}
+    `,
+
+      beforeEach() {
+        initCategoriesWithParentCategory(this);
+        sinon.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"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js
index 37bc4cac73..8b68b09a1c 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js
@@ -1,9 +1,10 @@
-import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers";
 import { click } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 const DEFAULT_CONTENT = [
   { id: 1, name: "foo" },
@@ -24,17 +25,17 @@ const setDefaultState = (ctx, options) => {
   ctx.setProperties(properties);
 };
 
-discourseModule("Integration | Component | select-kit/combo-box", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | select-kit/combo-box",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  hooks.beforeEach(function () {
-    this.set("subject", selectKit());
-  });
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+    });
 
-  componentTest("options.clearable", {
-    template: `
+    componentTest("options.clearable", {
+      template: hbs`
       {{combo-box
         value=value
         content=content
@@ -43,36 +44,36 @@ discourseModule("Integration | Component | select-kit/combo-box", function (
       }}
     `,
 
-    beforeEach() {
-      setDefaultState(this, {
-        clearable: true,
-        onChange: (value) => {
-          this.set("value", value);
-        },
-      });
-    },
+      beforeEach() {
+        setDefaultState(this, {
+          clearable: true,
+          onChange: (value) => {
+            this.set("value", value);
+          },
+        });
+      },
 
-    async test(assert) {
-      const $header = this.subject.header();
+      async test(assert) {
+        const $header = this.subject.header();
 
-      assert.ok(
-        exists($header.el().find(".btn-clear")),
-        "it shows the clear button"
-      );
-      assert.equal($header.value(), DEFAULT_VALUE);
+        assert.ok(
+          exists($header.el().find(".btn-clear")),
+          "it shows the clear button"
+        );
+        assert.equal($header.value(), DEFAULT_VALUE);
 
-      await click($header.el().find(".btn-clear"));
+        await click($header.el().find(".btn-clear")[0]);
 
-      assert.notOk(
-        exists($header.el().find(".btn-clear")),
-        "it hides the clear button"
-      );
-      assert.equal($header.value(), null);
-    },
-  });
+        assert.notOk(
+          exists($header.el().find(".btn-clear")),
+          "it hides the clear button"
+        );
+        assert.equal($header.value(), null);
+      },
+    });
 
-  componentTest("options.{caretUpIcon,caretDownIcon}", {
-    template: `
+    componentTest("options.{caretUpIcon,caretDownIcon}", {
+      template: hbs`
       {{combo-box
         value=value
         content=content
@@ -83,27 +84,28 @@ discourseModule("Integration | Component | select-kit/combo-box", function (
       }}
     `,
 
-    beforeEach() {
-      setDefaultState(this, {
-        caretUpIcon: "pencil-alt",
-        caretDownIcon: "trash-alt",
-      });
-    },
+      beforeEach() {
+        setDefaultState(this, {
+          caretUpIcon: "pencil-alt",
+          caretDownIcon: "trash-alt",
+        });
+      },
 
-    async test(assert) {
-      const $header = this.subject.header().el();
+      async test(assert) {
+        const $header = this.subject.header().el();
 
-      assert.ok(
-        exists($header.find(`.d-icon-${this.caretDownIcon}`)),
-        "it uses the icon provided"
-      );
+        assert.ok(
+          exists($header.find(`.d-icon-${this.caretDownIcon}`)),
+          "it uses the icon provided"
+        );
 
-      await this.subject.expand();
+        await this.subject.expand();
 
-      assert.ok(
-        exists($header.find(`.d-icon-${this.caretUpIcon}`)),
-        "it uses the icon provided"
-      );
-    },
-  });
-});
+        assert.ok(
+          exists($header.find(`.d-icon-${this.caretUpIcon}`)),
+          "it uses the icon provided"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/dropdown-select-box-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/dropdown-select-box-test.js
index 124c31a5c7..e2e2129a15 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/dropdown-select-box-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/dropdown-select-box-test.js
@@ -1,7 +1,8 @@
-import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 const DEFAULT_CONTENT = [
@@ -36,7 +37,7 @@ discourseModule(
     });
 
     componentTest("selection behavior", {
-      template: `
+      template: hbs`
       {{dropdown-select-box
         value=value
         content=content
@@ -60,7 +61,7 @@ discourseModule(
     });
 
     componentTest("options.showFullTitle=false", {
-      template: `
+      template: hbs`
       {{dropdown-select-box
         value=value
         content=content
@@ -88,14 +89,14 @@ discourseModule(
 
         assert.equal(
           this.subject.header().el().attr("title"),
-          "[en_US.test_none]",
+          "[en.test_none]",
           "it adds a title attribute to the button"
         );
       },
     });
 
     componentTest("options.showFullTitle=true", {
-      template: `
+      template: hbs`
       {{dropdown-select-box
         value=value
         content=content
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/email-group-user-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/email-group-user-chooser-test.js
new file mode 100644
index 0000000000..78b122d60d
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/email-group-user-chooser-test.js
@@ -0,0 +1,64 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+
+discourseModule(
+  "Integration | Component | select-kit/email-group-user-chooser",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+      this.setProperties({
+        value: [],
+        onChange() {},
+      });
+    });
+
+    componentTest("autofocus option set to true", {
+      template: hbs`{{email-group-user-chooser
+        value=value
+        onChange=onChange
+        options=(hash
+          autofocus=true
+        )
+      }}`,
+
+      async test(assert) {
+        this.subject;
+        assert.ok(
+          this.subject.header().el()[0].classList.contains("is-focused"),
+          "select-kit header has is-focused class"
+        );
+        assert.ok(
+          this.subject.filter().el()[0].querySelector(".filter-input")
+            .autofocus,
+          "filter input has autofocus attribute"
+        );
+      },
+    });
+
+    componentTest("without autofocus", {
+      template: hbs`{{email-group-user-chooser
+        value=value
+        onChange=onChange
+      }}`,
+
+      async test(assert) {
+        this.subject;
+        assert.ok(
+          !this.subject.header().el()[0].classList.contains("is-focused"),
+          "select-kit header doesn't have is-focused class"
+        );
+        assert.ok(
+          !this.subject.filter().el()[0].querySelector(".filter-input")
+            .autofocus,
+          "filter input doesn't have autofocus attribute"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-selector-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-selector-test.js
new file mode 100644
index 0000000000..0bc0e7ce6e
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-selector-test.js
@@ -0,0 +1,75 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  fakeTime,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import I18n from "I18n";
+
+discourseModule(
+  "Integration | Component | select-kit/future-date-input-selector",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+      this.clock = fakeTime("2021-05-03T08:00:00", "UTC", true); // Monday
+    });
+
+    hooks.afterEach(function () {
+      this.clock.restore();
+    });
+
+    componentTest("shows default options", {
+      skip: true,
+      template: hbs`{{future-date-input-selector}}`,
+
+      async test(assert) {
+        await this.subject.expand();
+
+        const options = getOptions();
+        const expected = [
+          I18n.t("topic.auto_update_input.later_today"),
+          I18n.t("topic.auto_update_input.tomorrow"),
+          I18n.t("topic.auto_update_input.next_week"),
+          I18n.t("topic.auto_update_input.two_weeks"),
+          I18n.t("topic.auto_update_input.next_month"),
+          I18n.t("topic.auto_update_input.two_months"),
+          I18n.t("topic.auto_update_input.three_months"),
+          I18n.t("topic.auto_update_input.four_months"),
+          I18n.t("topic.auto_update_input.six_months"),
+        ];
+        assert.deepEqual(options, expected);
+      },
+    });
+
+    componentTest("doesn't show 'Next Week' on Sundays", {
+      skip: true,
+      template: hbs`{{future-date-input-selector}}`,
+
+      beforeEach() {
+        this.clock = fakeTime("2021-05-02T08:00:00", "UTC", true); // Sunday
+      },
+
+      async test(assert) {
+        await this.subject.expand();
+
+        const options = getOptions();
+        const nextWeek = I18n.t("topic.auto_update_input.next_week");
+        assert.not(options.includes(nextWeek));
+      },
+    });
+
+    function getOptions() {
+      return Array.from(
+        queryAll(`ul.select-kit-collection li span.name`).map((_, span) =>
+          span.innerText.trim()
+        )
+      );
+    }
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/list-setting-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/list-setting-test.js
index 45a1806847..adda7e2fc5 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/list-setting-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/list-setting-test.js
@@ -1,46 +1,41 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 
-function template(options = []) {
-  return `
-    {{list-setting
-      value=value
-      choices=choices
-      options=(hash
-        ${options.join("\n")}
-      )
-    }}
-  `;
-}
+discourseModule(
+  "Integration | Component | select-kit/list-setting",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-discourseModule("Integration | Component | select-kit/list-setting", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+    });
 
-  hooks.beforeEach(function () {
-    this.set("subject", selectKit());
-  });
+    componentTest("default", {
+      template: hbs`
+      {{list-setting
+        value=value
+        choices=choices
+      }}
+    `,
 
-  componentTest("default", {
-    template: template(),
+      beforeEach() {
+        this.set("value", ["bold", "italic"]);
+        this.set("choices", ["bold", "italic", "underline"]);
+      },
 
-    beforeEach() {
-      this.set("value", ["bold", "italic"]);
-      this.set("choices", ["bold", "italic", "underline"]);
-    },
+      async test(assert) {
+        assert.equal(this.subject.header().name(), "bold,italic");
+        assert.equal(this.subject.header().value(), "bold,italic");
 
-    async test(assert) {
-      assert.equal(this.subject.header().name(), "bold,italic");
-      assert.equal(this.subject.header().value(), "bold,italic");
+        await this.subject.expand();
 
-      await this.subject.expand();
-
-      assert.equal(this.subject.rows().length, 1);
-      assert.equal(this.subject.rowByIndex(0).value(), "underline");
-    },
-  });
-});
+        assert.equal(this.subject.rows().length, 1);
+        assert.equal(this.subject.rowByIndex(0).value(), "underline");
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/mini-tag-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/mini-tag-chooser-test.js
index bd1431e25b..012e8ed3aa 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/mini-tag-chooser-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/mini-tag-chooser-test.js
@@ -1,12 +1,13 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import I18n from "I18n";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 discourseModule(
   "Integration | Component | select-kit/mini-tag-chooser",
@@ -18,7 +19,7 @@ discourseModule(
     });
 
     componentTest("displays tags", {
-      template: `{{mini-tag-chooser value=value}}`,
+      template: hbs`{{mini-tag-chooser value=value}}`,
 
       beforeEach() {
         this.set("value", ["foo", "bar"]);
@@ -30,7 +31,7 @@ discourseModule(
     });
 
     componentTest("create a tag", {
-      template: `{{mini-tag-chooser value=value}}`,
+      template: hbs`{{mini-tag-chooser value=value}}`,
 
       beforeEach() {
         this.set("value", ["foo", "bar"]);
@@ -51,7 +52,7 @@ discourseModule(
     });
 
     componentTest("max_tags_per_topic", {
-      template: `{{mini-tag-chooser value=value}}`,
+      template: hbs`{{mini-tag-chooser value=value}}`,
 
       beforeEach() {
         this.set("value", ["foo", "bar"]);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js
index 1ac0a366c0..c6939fd3f1 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js
@@ -1,21 +1,10 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 
-function template(options = []) {
-  return `
-    {{multi-select
-      value=value
-      content=content
-      options=(hash
-        ${options.join("\n")}
-      )
-    }}
-  `;
-}
-
 const DEFAULT_CONTENT = [
   { id: 1, name: "foo" },
   { id: 2, name: "bar" },
@@ -33,42 +22,48 @@ const setDefaultState = (ctx, options) => {
   ctx.setProperties(properties);
 };
 
-discourseModule("Integration | Component | select-kit/multi-select", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | select-kit/multi-select",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  hooks.beforeEach(function () {
-    this.set("subject", selectKit());
-  });
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+    });
 
-  componentTest("content", {
-    template: template(),
+    componentTest("content", {
+      template: hbs`
+      {{multi-select
+        value=value
+        content=content
+      }}
+    `,
 
-    beforeEach() {
-      setDefaultState(this);
-    },
+      beforeEach() {
+        setDefaultState(this);
+      },
 
-    async test(assert) {
-      await this.subject.expand();
+      async test(assert) {
+        await this.subject.expand();
 
-      const content = this.subject.displayedContent();
-      assert.equal(content.length, 3, "it shows rows");
-      assert.equal(
-        content[0].name,
-        this.content.firstObject.name,
-        "it has the correct name"
-      );
-      assert.equal(
-        content[0].id,
-        this.content.firstObject.id,
-        "it has the correct value"
-      );
-      assert.equal(
-        this.subject.header().value(),
-        null,
-        "it doesn't set a value from the content"
-      );
-    },
-  });
-});
+        const content = this.subject.displayedContent();
+        assert.equal(content.length, 3, "it shows rows");
+        assert.equal(
+          content[0].name,
+          this.content.firstObject.name,
+          "it has the correct name"
+        );
+        assert.equal(
+          content[0].id,
+          this.content.firstObject.id,
+          "it has the correct value"
+        );
+        assert.equal(
+          this.subject.header().value(),
+          null,
+          "it doesn't set a value from the content"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/notifications-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/notifications-button-test.js
index 6783f1edc3..39592a80ba 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/notifications-button-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/notifications-button-test.js
@@ -1,10 +1,11 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
 import selectKit, {
   setDefaultState,
 } from "discourse/tests/helpers/select-kit-helper";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule(
   "Integration | Component | select-kit/notifications-button",
@@ -16,7 +17,7 @@ discourseModule(
     });
 
     componentTest("default", {
-      template: `
+      template: hbs`
       {{notifications-button
         value=value
         options=(hash
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/pinned-options-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/pinned-options-test.js
index 561d33661c..567dfae951 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/pinned-options-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/pinned-options-test.js
@@ -1,9 +1,10 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import Topic from "discourse/models/topic";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 const buildTopic = function (pinned = true) {
   return Topic.create({
@@ -24,7 +25,7 @@ discourseModule(
     });
 
     componentTest("unpinning", {
-      template: "{{pinned-options value=topic.pinned topic=topic}}",
+      template: hbs`{{pinned-options value=topic.pinned topic=topic}}`,
 
       beforeEach() {
         this.siteSettings.automatically_unpin_topics = false;
@@ -42,7 +43,7 @@ discourseModule(
     });
 
     componentTest("pinning", {
-      template: "{{pinned-options value=topic.pinned topic=topic}}",
+      template: hbs`{{pinned-options value=topic.pinned topic=topic}}`,
 
       beforeEach() {
         this.siteSettings.automatically_unpin_topics = false;
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js
index fc6acb6002..73ba8bed09 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js
@@ -1,24 +1,10 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import I18n from "I18n";
-
-function template(options = []) {
-  return `
-    {{single-select
-      value=value
-      content=content
-      nameProperty=nameProperty
-      valueProperty=valueProperty
-      onChange=onChange
-      options=(hash
-        ${options.join("\n")}
-      )
-    }}
-  `;
-}
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 const DEFAULT_CONTENT = [
   { id: 1, name: "foo" },
@@ -44,103 +30,134 @@ const setDefaultState = (ctx, options) => {
   ctx.setProperties(properties);
 };
 
-discourseModule("Integration | Component | select-kit/single-select", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | select-kit/single-select",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  hooks.beforeEach(function () {
-    this.set("subject", selectKit());
-  });
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+    });
 
-  componentTest("content", {
-    template: "{{single-select content=content}}",
+    componentTest("content", {
+      template: hbs`{{single-select content=content}}`,
 
-    beforeEach() {
-      setDefaultState(this);
-    },
+      beforeEach() {
+        setDefaultState(this);
+      },
 
-    async test(assert) {
-      await this.subject.expand();
+      async test(assert) {
+        await this.subject.expand();
 
-      const content = this.subject.displayedContent();
-      assert.equal(content.length, 3, "it shows rows");
-      assert.equal(
-        content[0].name,
-        this.content.firstObject.name,
-        "it has the correct name"
-      );
-      assert.equal(
-        content[0].id,
-        this.content.firstObject.id,
-        "it has the correct value"
-      );
-      assert.equal(
-        this.subject.header().value(),
-        null,
-        "it doesn't set a value from the content"
-      );
-    },
-  });
+        const content = this.subject.displayedContent();
+        assert.equal(content.length, 3, "it shows rows");
+        assert.equal(
+          content[0].name,
+          this.content.firstObject.name,
+          "it has the correct name"
+        );
+        assert.equal(
+          content[0].id,
+          this.content.firstObject.id,
+          "it has the correct value"
+        );
+        assert.equal(
+          this.subject.header().value(),
+          null,
+          "it doesn't set a value from the content"
+        );
+      },
+    });
 
-  componentTest("value", {
-    template: template(),
+    componentTest("value", {
+      template: hbs`
+      {{single-select
+        value=value
+        content=content
+        nameProperty=nameProperty
+        valueProperty=valueProperty
+        onChange=onChange
+      }}
+    `,
 
-    beforeEach() {
-      setDefaultState(this);
-    },
+      beforeEach() {
+        setDefaultState(this);
+      },
 
-    test(assert) {
-      assert.equal(
-        this.subject.header().value(this.content),
-        1,
-        "it selects the correct content to display"
-      );
-    },
-  });
+      test(assert) {
+        assert.equal(
+          this.subject.header().value(this.content),
+          1,
+          "it selects the correct content to display"
+        );
+      },
+    });
 
-  componentTest("options.filterable", {
-    template: template(["filterable=filterable"]),
+    componentTest("options.filterable", {
+      template: hbs`
+      {{single-select
+        value=value
+        content=content
+        nameProperty=nameProperty
+        valueProperty=valueProperty
+        onChange=onChange
+        options=(hash
+          filterable=filterable
+        )
+      }}
+    `,
 
-    beforeEach() {
-      setDefaultState(this, { filterable: true });
-    },
+      beforeEach() {
+        setDefaultState(this, { filterable: true });
+      },
 
-    async test(assert) {
-      await this.subject.expand();
-      assert.ok(this.subject.filter().exists(), "it shows the filter");
+      async test(assert) {
+        await this.subject.expand();
+        assert.ok(this.subject.filter().exists(), "it shows the filter");
 
-      const filter = this.subject.displayedContent()[1].name;
-      await this.subject.fillInFilter(filter);
-      assert.equal(
-        this.subject.displayedContent()[0].name,
-        filter,
-        "it filters the list"
-      );
-    },
-  });
+        const filter = this.subject.displayedContent()[1].name;
+        await this.subject.fillInFilter(filter);
+        assert.equal(
+          this.subject.displayedContent()[0].name,
+          filter,
+          "it filters the list"
+        );
+      },
+    });
 
-  componentTest("options.limitMatches", {
-    template: template(["limitMatches=limitMatches", "filterable=filterable"]),
+    componentTest("options.limitMatches", {
+      template: hbs`
+      {{single-select
+        value=value
+        content=content
+        nameProperty=nameProperty
+        valueProperty=valueProperty
+        onChange=onChange
+        options=(hash
+          limitMatches=limitMatches
+          filterable=filterable
+        )
+      }}
+    `,
 
-    beforeEach() {
-      setDefaultState(this, { limitMatches: 1, filterable: true });
-    },
+      beforeEach() {
+        setDefaultState(this, { limitMatches: 1, filterable: true });
+      },
 
-    async test(assert) {
-      await this.subject.expand();
-      await this.subject.fillInFilter("ba");
+      async test(assert) {
+        await this.subject.expand();
+        await this.subject.fillInFilter("ba");
 
-      assert.equal(
-        this.subject.displayedContent().length,
-        1,
-        "it returns only 1 result"
-      );
-    },
-  });
+        assert.equal(
+          this.subject.displayedContent().length,
+          1,
+          "it returns only 1 result"
+        );
+      },
+    });
 
-  componentTest("valueAttribute (deprecated)", {
-    template: `
+    componentTest("valueAttribute (deprecated)", {
+      template: hbs`
       {{single-select
         value=value
         content=content
@@ -148,169 +165,286 @@ discourseModule("Integration | Component | select-kit/single-select", function (
       }}
     `,
 
-    beforeEach() {
-      this.set("value", "normal");
+      beforeEach() {
+        this.set("value", "normal");
 
-      const content = [
-        { name: "Smallest", value: "smallest" },
-        { name: "Smaller", value: "smaller" },
-        { name: "Normal", value: "normal" },
-        { name: "Larger", value: "larger" },
-        { name: "Largest", value: "largest" },
-      ];
-      this.set("content", content);
-    },
+        const content = [
+          { name: "Smallest", value: "smallest" },
+          { name: "Smaller", value: "smaller" },
+          { name: "Normal", value: "normal" },
+          { name: "Larger", value: "larger" },
+          { name: "Largest", value: "largest" },
+        ];
+        this.set("content", content);
+      },
 
-    async test(assert) {
-      await this.subject.expand();
+      async test(assert) {
+        await this.subject.expand();
 
-      assert.equal(this.subject.selectedRow().value(), this.value);
-    },
-  });
+        assert.equal(this.subject.selectedRow().value(), this.value);
+      },
+    });
 
-  componentTest("none:string", {
-    template: template(['none="test.none"']),
+    componentTest("none:string", {
+      template: hbs`
+      {{single-select
+        value=value
+        content=content
+        nameProperty=nameProperty
+        valueProperty=valueProperty
+        onChange=onChange
+        options=(hash
+          none="test.none"
+        )
+      }}
+    `,
 
-    beforeEach() {
-      I18n.translations[I18n.locale].js.test = { none: "(default)" };
-      setDefaultState(this, { value: 1 });
-    },
+      beforeEach() {
+        I18n.translations[I18n.locale].js.test = { none: "(default)" };
+        setDefaultState(this, { value: 1 });
+      },
 
-    async test(assert) {
-      await this.subject.expand();
+      async test(assert) {
+        await this.subject.expand();
 
-      const noneRow = this.subject.rowByIndex(0);
-      assert.equal(noneRow.value(), null);
-      assert.equal(noneRow.name(), I18n.t("test.none"));
-    },
-  });
+        const noneRow = this.subject.rowByIndex(0);
+        assert.equal(noneRow.value(), null);
+        assert.equal(noneRow.name(), I18n.t("test.none"));
+      },
+    });
 
-  componentTest("none:object", {
-    template: template(["none=none"]),
+    componentTest("none:object", {
+      template: hbs`
+      {{single-select
+        value=value
+        content=content
+        nameProperty=nameProperty
+        valueProperty=valueProperty
+        onChange=onChange
+        options=(hash
+          none=none
+        )
+      }}
+    `,
 
-    beforeEach() {
-      setDefaultState(this, { none: { value: null, name: "(default)" } });
-    },
+      beforeEach() {
+        setDefaultState(this, { none: { value: null, name: "(default)" } });
+      },
 
-    async test(assert) {
-      await this.subject.expand();
+      async test(assert) {
+        await this.subject.expand();
 
-      const noneRow = this.subject.rowByIndex(0);
-      assert.equal(noneRow.value(), null);
-      assert.equal(noneRow.name(), "(default)");
-    },
-  });
+        const noneRow = this.subject.rowByIndex(0);
+        assert.equal(noneRow.value(), null);
+        assert.equal(noneRow.name(), "(default)");
+      },
+    });
 
-  componentTest("content is a basic array", {
-    template: template(['none="test.none"']),
+    componentTest("content is a basic array", {
+      template: hbs`
+      {{single-select
+        value=value
+        content=content
+        nameProperty=nameProperty
+        valueProperty=valueProperty
+        onChange=onChange
+        options=(hash
+          none="test.none"
+        )
+      }}
+    `,
 
-    beforeEach() {
-      I18n.translations[I18n.locale].js.test = { none: "(default)" };
-      setDefaultState(this, {
-        nameProperty: null,
-        valueProperty: null,
-        value: "foo",
-        content: ["foo", "bar", "baz"],
-      });
-    },
+      beforeEach() {
+        I18n.translations[I18n.locale].js.test = { none: "(default)" };
+        setDefaultState(this, {
+          nameProperty: null,
+          valueProperty: null,
+          value: "foo",
+          content: ["foo", "bar", "baz"],
+        });
+      },
 
-    async test(assert) {
-      await this.subject.expand();
+      async test(assert) {
+        await this.subject.expand();
 
-      const noneRow = this.subject.rowByIndex(0);
-      assert.equal(noneRow.value(), I18n.t("test.none"));
-      assert.equal(noneRow.name(), I18n.t("test.none"));
-      assert.equal(this.value, "foo");
+        const noneRow = this.subject.rowByIndex(0);
+        assert.equal(noneRow.value(), I18n.t("test.none"));
+        assert.equal(noneRow.name(), I18n.t("test.none"));
+        assert.equal(this.value, "foo");
 
-      await this.subject.selectRowByIndex(0);
+        await this.subject.selectRowByIndex(0);
 
-      assert.equal(this.value, null);
-    },
-  });
+        assert.equal(this.value, null);
+      },
+    });
 
-  componentTest("selected value can be 0", {
-    template: template(),
+    componentTest("selected value can be 0", {
+      template: hbs`
+      {{single-select
+        value=value
+        content=content
+        nameProperty=nameProperty
+        valueProperty=valueProperty
+        onChange=onChange
+      }}
+    `,
 
-    beforeEach() {
-      setDefaultState(this, {
-        value: 1,
-        content: [
-          { id: 0, name: "foo" },
-          { id: 1, name: "bar" },
-        ],
-      });
-    },
+      beforeEach() {
+        setDefaultState(this, {
+          value: 1,
+          content: [
+            { id: 0, name: "foo" },
+            { id: 1, name: "bar" },
+          ],
+        });
+      },
 
-    async test(assert) {
-      assert.equal(this.subject.header().value(), 1);
+      async test(assert) {
+        assert.equal(this.subject.header().value(), 1);
 
-      await this.subject.expand();
-      await this.subject.selectRowByValue(0);
+        await this.subject.expand();
+        await this.subject.selectRowByValue(0);
 
-      assert.equal(this.subject.header().value(), 0);
-    },
-  });
+        assert.equal(this.subject.header().value(), 0);
+      },
+    });
 
-  componentTest("prevents propagating click event on header", {
-    template:
-      "{{#d-button icon='times' action=onClick}}{{single-select options=(hash preventsClickPropagation=true) value=value content=content}}{{/d-button}}",
+    componentTest("prevents propagating click event on header", {
+      template: hbs`
+      {{#d-button icon='times' action=onClick}}
+        {{single-select
+          options=(hash preventsClickPropagation=true)
+          value=value
+          content=content
+        }}
+      {{/d-button}}
+    `,
 
-    beforeEach() {
-      this.setProperties({
-        onClick: () => this.set("value", "foo"),
-        content: DEFAULT_CONTENT,
-        value: DEFAULT_VALUE,
-      });
-    },
+      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);
-    },
-  });
+      async test(assert) {
+        assert.equal(this.value, DEFAULT_VALUE);
+        await this.subject.expand();
+        assert.equal(this.value, DEFAULT_VALUE);
+      },
+    });
 
-  componentTest("labelProperty", {
-    template:
-      '{{single-select labelProperty="foo" value=value content=content}}',
+    componentTest("labelProperty", {
+      template: hbs`
+      {{single-select
+        labelProperty="foo"
+        value=value
+        content=content
+      }}
+    `,
 
-    beforeEach() {
-      this.setProperties({
-        content: [{ id: 1, name: "john", foo: "JACKSON" }],
-        value: 1,
-      });
-    },
+      beforeEach() {
+        this.setProperties({
+          content: [{ id: 1, name: "john", foo: "JACKSON" }],
+          value: 1,
+        });
+      },
 
-    async test(assert) {
-      assert.equal(this.subject.header().label(), "JACKSON");
+      async test(assert) {
+        assert.equal(this.subject.header().label(), "JACKSON");
 
-      await this.subject.expand();
+        await this.subject.expand();
 
-      const row = this.subject.rowByValue(1);
+        const row = this.subject.rowByValue(1);
 
-      assert.equal(row.label(), "JACKSON");
-    },
-  });
+        assert.equal(row.label(), "JACKSON");
+      },
+    });
 
-  componentTest("titleProperty", {
-    template:
-      '{{single-select titleProperty="foo" value=value content=content}}',
+    componentTest("titleProperty", {
+      template: hbs`
+      {{single-select
+        titleProperty="foo"
+        value=value
+        content=content
+      }}
+    `,
 
-    beforeEach() {
-      this.setProperties({
-        content: [{ id: 1, name: "john", foo: "JACKSON" }],
-        value: 1,
-      });
-    },
+      beforeEach() {
+        this.setProperties({
+          content: [{ id: 1, name: "john", foo: "JACKSON" }],
+          value: 1,
+        });
+      },
 
-    async test(assert) {
-      assert.equal(this.subject.header().title(), "JACKSON");
+      async test(assert) {
+        assert.equal(this.subject.header().title(), "JACKSON");
 
-      await this.subject.expand();
+        await this.subject.expand();
 
-      const row = this.subject.rowByValue(1);
+        const row = this.subject.rowByValue(1);
 
-      assert.equal(row.title(), "JACKSON");
-    },
-  });
-});
+        assert.equal(row.title(), "JACKSON");
+      },
+    });
+
+    componentTest("langProperty", {
+      template: hbs`{{single-select langProperty="foo" value=value content=content}}`,
+
+      beforeEach() {
+        this.setProperties({
+          content: [{ id: 1, name: "john", foo: "be" }],
+          value: null,
+        });
+      },
+
+      async test(assert) {
+        assert.equal(
+          this.subject.header().el()[0].querySelector(".selected-name").lang,
+          ""
+        );
+
+        await this.subject.expand();
+
+        const row = this.subject.rowByValue(1);
+        assert.equal(row.el()[0].lang, "be");
+
+        await this.subject.selectRowByValue(1);
+
+        assert.equal(
+          this.subject.header().el()[0].querySelector(".selected-name").lang,
+          "be"
+        );
+      },
+    });
+
+    componentTest("name", {
+      template: hbs`{{single-select value=value content=content}}`,
+
+      beforeEach() {
+        this.setProperties({
+          content: [{ id: 1, name: "john" }],
+          value: null,
+        });
+      },
+
+      async test(assert) {
+        assert.equal(
+          this.subject.header().el()[0].getAttribute("name"),
+          I18n.t("select_kit.select_to_filter")
+        );
+
+        await this.subject.expand();
+        await this.subject.selectRowByValue(1);
+
+        assert.equal(
+          this.subject.header().el()[0].getAttribute("name"),
+          I18n.t("select_kit.filter_by", {
+            name: this.content.firstObject.name,
+          })
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.js
index fc4aa2a88f..9947bac92f 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.js
@@ -1,98 +1,91 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
 import I18n from "I18n";
 import Site from "discourse/models/site";
-import { set } from "@ember/object";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 import pretender from "discourse/tests/helpers/create-pretender";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { set } from "@ember/object";
 
 function initTags(context) {
   const categories = context.site.categoriesList;
-  const parentCategory = categories.findBy("id", 2);
-  const childCategories = categories.filter(
-    (c) => c.parentCategory === parentCategory
-  );
+  const category = categories.findBy("id", 2);
 
   // top_tags
   context.setProperties({
-    firstCategory: parentCategory,
-    secondCategory: childCategories.firstObject,
+    currentCategory: category,
     tagId: "jeff",
   });
 }
 
-function template(options = []) {
-  return `
-    {{tag-drop
-      firstCategory=firstCategory
-      secondCategory=secondCategory
-      tagId=tagId
-      options=(hash
-        ${options.join("\n")}
-      )
-    }}
-  `;
-}
+discourseModule(
+  "Integration | Component | select-kit/tag-drop",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-discourseModule("Integration | Component | select-kit/tag-drop", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
 
-  hooks.beforeEach(function () {
-    this.set("subject", selectKit());
+      const site = Site.current();
+      set(site, "top_tags", ["jeff", "neil", "arpit", "régis"]);
 
-    const site = Site.current();
-    set(site, "top_tags", ["jeff", "neil", "arpit", "régis"]);
+      const response = (object) => {
+        return [200, { "Content-Type": "application/json" }, object];
+      };
 
-    const response = (object) => {
-      return [200, { "Content-Type": "application/json" }, object];
-    };
-
-    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 }],
-        });
-      } else if (params.queryParams.q === "dav") {
-        return response({
-          results: [{ id: "David", text: "David", count: 2, pm_count: 0 }],
-        });
-      }
+      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 }],
+          });
+        } else if (params.queryParams.q === "dav") {
+          return response({
+            results: [{ id: "David", text: "David", count: 2, pm_count: 0 }],
+          });
+        }
+      });
     });
-  });
 
-  componentTest("default", {
-    template: template(["tagId=tagId"]),
+    componentTest("default", {
+      template: hbs`
+      {{tag-drop
+        currentCategory=currentCategory
+        tagId=tagId
+        options=(hash
+          tagId=tagId
+        )
+      }}
+    `,
 
-    beforeEach() {
-      initTags(this);
-    },
+      beforeEach() {
+        initTags(this);
+      },
 
-    async test(assert) {
-      await this.subject.expand();
+      async test(assert) {
+        await this.subject.expand();
 
-      assert.ok(true);
-      // const row = this.subject.rowByValue(this.category.id);
-      // assert.ok(
-      //   exists(row.el().find(".category-desc")),
-      //   "it shows category description for newcomers"
-      // );
+        assert.ok(true);
+        // const row = this.subject.rowByValue(this.category.id);
+        // assert.ok(
+        //   exists(row.el().find(".category-desc")),
+        //   "it shows category description for newcomers"
+        // );
 
-      const content = this.subject.displayedContent();
+        const content = this.subject.displayedContent();
 
-      assert.equal(
-        content[0].name,
-        I18n.t("tagging.selector_no_tags"),
-        "it has the translated label for no-tags"
-      );
-      assert.equal(
-        content[1].name,
-        I18n.t("tagging.selector_all_tags"),
-        "it has the correct label for all-tags"
-      );
-    },
-  });
-});
+        assert.equal(
+          content[0].name,
+          I18n.t("tagging.selector_no_tags"),
+          "it has the translated label for no-tags"
+        );
+        assert.equal(
+          content[1].name,
+          I18n.t("tagging.selector_all_tags"),
+          "it has the correct label for all-tags"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js
index 61ceaf1736..c6e1e9f463 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js
@@ -1,20 +1,27 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import I18n from "I18n";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import I18n from "I18n";
 import Topic from "discourse/models/topic";
+import {
+  discourseModule,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
-const buildTopic = function (level, archetype = "regular") {
+const buildTopic = function (opts) {
   return Topic.create({
     id: 4563,
   }).updateFromJson({
     title: "Qunit Test Topic",
     details: {
-      notification_level: level,
+      notification_level: opts.level,
+      notifications_reason_id: opts.reason || null,
     },
-    archetype,
+    archetype: opts.archetype || "regular",
+    category_id: opts.category_id || null,
+    tags: opts.tags || [],
   });
 };
 
@@ -31,11 +38,15 @@ discourseModule(
     });
 
     componentTest("the header has a localized title", {
-      template:
-        "{{topic-notifications-button notificationLevel=topic.details.notification_level topic=topic}}",
+      template: hbs`
+        {{topic-notifications-button
+          notificationLevel=topic.details.notification_level
+          topic=topic
+        }}
+      `,
 
       beforeEach() {
-        this.set("topic", buildTopic(1));
+        this.set("topic", buildTopic({ level: 1 }));
       },
 
       async test(assert) {
@@ -45,7 +56,7 @@ discourseModule(
           "it has the correct label"
         );
 
-        await this.set("topic", buildTopic(2));
+        await this.set("topic", buildTopic({ level: 2 }));
 
         assert.equal(
           selectKit().header().label(),
@@ -56,12 +67,19 @@ discourseModule(
     });
 
     componentTest("the header has a localized title", {
-      template:
-        "{{topic-notifications-button notificationLevel=topic.details.notification_level topic=topic}}",
+      template: hbs`
+        {{topic-notifications-button
+          notificationLevel=topic.details.notification_level
+          topic=topic
+        }}
+      `,
 
       beforeEach() {
         I18n.translations.en.js.topic.notifications.tracking_pm.title = `${originalTranslation} PM`;
-        this.set("topic", buildTopic(2, "private_message"));
+        this.set(
+          "topic",
+          buildTopic({ level: 2, archetype: "private_message" })
+        );
       },
 
       test(assert) {
@@ -72,5 +90,194 @@ discourseModule(
         );
       },
     });
+
+    componentTest("notification reason text - user mailing list mode", {
+      template: hbs`
+        {{topic-notifications-button
+          notificationLevel=topic.details.notification_level
+          topic=topic
+        }}
+      `,
+
+      beforeEach() {
+        this.currentUser.set("mailing_list_mode", true);
+        this.set("topic", buildTopic({ level: 2 }));
+      },
+
+      test(assert) {
+        assert.equal(
+          queryAll(".topic-notifications-button .text").text(),
+          I18n.t("topic.notifications.reasons.mailing_list_mode"),
+          "mailing_list_mode enabled for the user shows unique text"
+        );
+      },
+    });
+
+    componentTest("notification reason text - bad notification reason", {
+      template: hbs`
+        {{topic-notifications-button
+          notificationLevel=topic.details.notification_level
+          topic=topic
+        }}
+      `,
+
+      beforeEach() {
+        this.set("topic", buildTopic({ level: 2 }));
+      },
+
+      test(assert) {
+        this.set("topic", buildTopic({ level: 3, reason: 999 }));
+
+        assert.equal(
+          queryAll(".topic-notifications-button .text").text(),
+          I18n.t("topic.notifications.reasons.3"),
+          "fallback to regular level translation if reason does not exist"
+        );
+      },
+    });
+
+    componentTest("notification reason text - user tracking category", {
+      template: hbs`
+        {{topic-notifications-button
+          notificationLevel=topic.details.notification_level
+          topic=topic
+        }}
+      `,
+
+      beforeEach() {
+        this.currentUser.set("tracked_category_ids", [88]);
+        this.set("topic", buildTopic({ level: 2, reason: 8, category_id: 88 }));
+      },
+
+      test(assert) {
+        assert.equal(
+          queryAll(".topic-notifications-button .text").text(),
+          I18n.t("topic.notifications.reasons.2_8"),
+          "use 2_8 notification if user is still tracking category"
+        );
+      },
+    });
+
+    componentTest(
+      "notification reason text - user no longer tracking category",
+      {
+        template: hbs`
+        {{topic-notifications-button
+          notificationLevel=topic.details.notification_level
+          topic=topic
+        }}
+      `,
+
+        beforeEach() {
+          this.currentUser.set("tracked_category_ids", []);
+          this.set(
+            "topic",
+            buildTopic({ level: 2, reason: 8, category_id: 88 })
+          );
+        },
+
+        test(assert) {
+          assert.equal(
+            queryAll(".topic-notifications-button .text").text(),
+            I18n.t("topic.notifications.reasons.2_8_stale"),
+            "use _stale notification if user is no longer tracking category"
+          );
+        },
+      }
+    );
+
+    componentTest("notification reason text - user watching category", {
+      template: hbs`
+        {{topic-notifications-button
+          notificationLevel=topic.details.notification_level
+          topic=topic
+        }}
+      `,
+
+      beforeEach() {
+        this.currentUser.set("watched_category_ids", [88]);
+        this.set("topic", buildTopic({ level: 3, reason: 6, category_id: 88 }));
+      },
+
+      test(assert) {
+        assert.equal(
+          queryAll(".topic-notifications-button .text").text(),
+          I18n.t("topic.notifications.reasons.3_6"),
+          "use 3_6 notification if user is still watching category"
+        );
+      },
+    });
+
+    componentTest(
+      "notification reason text - user no longer watching category",
+      {
+        template: hbs`
+        {{topic-notifications-button
+          notificationLevel=topic.details.notification_level
+          topic=topic
+        }}
+      `,
+
+        beforeEach() {
+          this.currentUser.set("watched_category_ids", []);
+          this.set(
+            "topic",
+            buildTopic({ level: 3, reason: 6, category_id: 88 })
+          );
+        },
+
+        test(assert) {
+          assert.equal(
+            queryAll(".topic-notifications-button .text").text(),
+            I18n.t("topic.notifications.reasons.3_6_stale"),
+            "use _stale notification if user is no longer watching category"
+          );
+        },
+      }
+    );
+
+    componentTest("notification reason text - user watching tag", {
+      template: hbs`
+        {{topic-notifications-button
+          notificationLevel=topic.details.notification_level
+          topic=topic
+        }}
+      `,
+
+      beforeEach() {
+        this.currentUser.set("watched_tags", ["test"]);
+        this.set("topic", buildTopic({ level: 3, reason: 10, tags: ["test"] }));
+      },
+
+      test(assert) {
+        assert.equal(
+          queryAll(".topic-notifications-button .text").text(),
+          I18n.t("topic.notifications.reasons.3_10"),
+          "use 3_10 notification if user is still watching tag"
+        );
+      },
+    });
+
+    componentTest("notification reason text - user no longer watching tag", {
+      template: hbs`
+        {{topic-notifications-button
+          notificationLevel=topic.details.notification_level
+          topic=topic
+        }}
+      `,
+
+      beforeEach() {
+        this.currentUser.set("watched_tags", []);
+        this.set("topic", buildTopic({ level: 3, reason: 10, tags: ["test"] }));
+      },
+
+      test(assert) {
+        assert.equal(
+          queryAll(".topic-notifications-button .text").text(),
+          I18n.t("topic.notifications.reasons.3_10_stale"),
+          "use _stale notification if user is no longer watching tag"
+        );
+      },
+    });
   }
 );
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-options-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-options-test.js
index a274b44f3b..41be156071 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-options-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-options-test.js
@@ -1,10 +1,11 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import I18n from "I18n";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import I18n from "I18n";
 import Topic from "discourse/models/topic";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 const buildTopic = function (archetype) {
   return Topic.create({
@@ -38,8 +39,12 @@ discourseModule(
     setupRenderingTest(hooks);
 
     componentTest("regular topic notification level descriptions", {
-      template:
-        "{{topic-notifications-options value=topic.details.notification_level topic=topic}}",
+      template: hbs`
+        {{topic-notifications-options
+          value=topic.details.notification_level
+          topic=topic
+        }}
+      `,
 
       beforeEach() {
         this.set("topic", buildTopic("regular"));
@@ -67,8 +72,12 @@ discourseModule(
     });
 
     componentTest("PM topic notification level descriptions", {
-      template:
-        "{{topic-notifications-options value=topic.details.notification_level topic=topic}}",
+      template: hbs`
+        {{topic-notifications-options
+          value=topic.details.notification_level
+          topic=topic
+        }}
+      `,
 
       beforeEach() {
         this.set("topic", buildTopic("private_message"));
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/user-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/user-chooser-test.js
index f6233da364..54dee26254 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/user-chooser-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/user-chooser-test.js
@@ -1,40 +1,42 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 
-discourseModule("Integration | Component | select-kit/user-chooser", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | select-kit/user-chooser",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  hooks.beforeEach(function () {
-    this.set("subject", selectKit());
-  });
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+    });
 
-  componentTest("displays usernames", {
-    template: `{{user-chooser value=value}}`,
+    componentTest("displays usernames", {
+      template: hbs`{{user-chooser value=value}}`,
 
-    beforeEach() {
-      this.set("value", ["bob", "martin"]);
-    },
+      beforeEach() {
+        this.set("value", ["bob", "martin"]);
+      },
 
-    async test(assert) {
-      assert.equal(this.subject.header().name(), "bob,martin");
-    },
-  });
+      async test(assert) {
+        assert.equal(this.subject.header().name(), "bob,martin");
+      },
+    });
 
-  componentTest("can remove a username", {
-    template: `{{user-chooser value=value}}`,
+    componentTest("can remove a username", {
+      template: hbs`{{user-chooser value=value}}`,
 
-    beforeEach() {
-      this.set("value", ["bob", "martin"]);
-    },
+      beforeEach() {
+        this.set("value", ["bob", "martin"]);
+      },
 
-    async test(assert) {
-      await this.subject.deselectItem("bob");
-      assert.equal(this.subject.header().name(), "martin");
-    },
-  });
-});
+      async test(assert) {
+        await this.subject.deselectItem("bob");
+        assert.equal(this.subject.header().name(), "martin");
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/simple-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/simple-list-test.js
index a9d3236d23..1dabaf5c20 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/simple-list-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/simple-list-test.js
@@ -1,17 +1,18 @@
+import { click, fillIn, triggerKeyEvent } from "@ember/test-helpers";
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
-import { click, triggerKeyEvent, fillIn } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule("Integration | Component | simple-list", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("adding a value", {
-    template: "{{simple-list values=values}}",
+    template: hbs`{{simple-list values=values}}`,
 
     beforeEach() {
       this.set("values", "vinkas\nosama");
@@ -48,7 +49,7 @@ discourseModule("Integration | Component | simple-list", function (hooks) {
   });
 
   componentTest("removing a value", {
-    template: "{{simple-list values=values}}",
+    template: hbs`{{simple-list values=values}}`,
 
     beforeEach() {
       this.set("values", "vinkas\nosama");
@@ -71,7 +72,7 @@ discourseModule("Integration | Component | simple-list", function (hooks) {
   });
 
   componentTest("delimiter support", {
-    template: "{{simple-list values=values inputDelimiter='|'}}",
+    template: hbs`{{simple-list values=values inputDelimiter='|'}}`,
 
     beforeEach() {
       this.set("values", "vinkas|osama");
diff --git a/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js b/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
new file mode 100644
index 0000000000..73eacaf5f5
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
@@ -0,0 +1,57 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import pretender from "discourse/tests/helpers/create-pretender";
+import hbs from "htmlbars-inline-precompile";
+
+discourseModule("Integration | Component | site-header", function (hooks) {
+  setupRenderingTest(hooks);
+
+  componentTest("first notification mask", {
+    template: hbs`{{site-header}}`,
+
+    beforeEach() {
+      this.set("currentUser.unread_high_priority_notifications", 1);
+      this.set("currentUser.read_first_notification", false);
+    },
+
+    async test(assert) {
+      assert.ok(
+        queryAll(".ring-backdrop").length === 1,
+        "there is the first notification mask"
+      );
+
+      // Click anywhere
+      await click("header.d-header");
+
+      assert.ok(
+        queryAll(".ring-backdrop").length === 0,
+        "it hides the first notification mask"
+      );
+    },
+  });
+
+  componentTest("do not call authenticated endpoints as anonymous", {
+    template: hbs`{{site-header}}`,
+    anonymous: true,
+
+    async test(assert) {
+      assert.ok(
+        queryAll(".ring-backdrop").length === 0,
+        "there is no first notification mask for anonymous users"
+      );
+
+      pretender.get("/notifications", () => {
+        assert.ok(false, "it should not try to refresh notifications");
+        return [403, { "Content-Type": "application/json" }, {}];
+      });
+
+      // Click anywhere
+      await click("header.d-header");
+    },
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/slow-mode-info-test.js b/app/assets/javascripts/discourse/tests/integration/components/slow-mode-info-test.js
new file mode 100644
index 0000000000..632d2d6363
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/slow-mode-info-test.js
@@ -0,0 +1,81 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  exists,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+
+discourseModule("Integration | Component | slow-mode-info", function (hooks) {
+  setupRenderingTest(hooks);
+
+  componentTest("doesn't render if the topic is closed", {
+    template: "{{slow-mode-info topic=topic}}",
+
+    beforeEach() {
+      this.set("topic", { slow_mode_seconds: 3600, closed: true });
+    },
+
+    test(assert) {
+      assert.ok(!exists(".slow-mode-heading"), "it doesn't render the notice");
+    },
+  });
+
+  componentTest("doesn't render if the slow mode is disabled", {
+    template: "{{slow-mode-info topic=topic}}",
+
+    beforeEach() {
+      this.set("topic", { slow_mode_seconds: 0, closed: false });
+    },
+
+    test(assert) {
+      assert.ok(!exists(".slow-mode-heading"), "it doesn't render the notice");
+    },
+  });
+
+  componentTest("renders if slow mode is enabled", {
+    template: "{{slow-mode-info topic=topic}}",
+
+    beforeEach() {
+      this.set("topic", { slow_mode_seconds: 3600, closed: false });
+    },
+
+    test(assert) {
+      assert.ok(queryAll(".slow-mode-heading").length === 1);
+    },
+  });
+
+  componentTest("staff and TL4 users can disable slow mode", {
+    template: "{{slow-mode-info topic=topic user=user}}",
+
+    beforeEach() {
+      this.setProperties({
+        topic: { slow_mode_seconds: 3600, closed: false },
+        user: { canManageTopic: true },
+      });
+    },
+
+    test(assert) {
+      assert.ok(queryAll(".slow-mode-remove").length === 1);
+    },
+  });
+
+  componentTest("regular users can't disable slow mode", {
+    template: "{{slow-mode-info topic=topic user=user}}",
+
+    beforeEach() {
+      this.setProperties({
+        topic: { slow_mode_seconds: 3600, closed: false },
+        user: { canManageTopic: false },
+      });
+    },
+
+    test(assert) {
+      assert.ok(
+        !exists(".slow-mode-remove"),
+        "it doesn't let you disable slow mode"
+      );
+    },
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/text-field-test.js b/app/assets/javascripts/discourse/tests/integration/components/text-field-test.js
index 3a5b612c58..91b419be43 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/text-field-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/text-field-test.js
@@ -1,19 +1,20 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import sinon from "sinon";
 import I18n from "I18n";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
 import { fillIn } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
+import sinon from "sinon";
 
 discourseModule("Integration | Component | text-field", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("renders correctly with no properties set", {
-    template: `{{text-field}}`,
+    template: hbs`{{text-field}}`,
 
     test(assert) {
       assert.ok(queryAll("input[type=text]").length);
@@ -21,7 +22,7 @@ discourseModule("Integration | Component | text-field", function (hooks) {
   });
 
   componentTest("support a placeholder", {
-    template: `{{text-field placeholderKey="placeholder.i18n.key"}}`,
+    template: hbs`{{text-field placeholderKey="placeholder.i18n.key"}}`,
 
     beforeEach() {
       sinon.stub(I18n, "t").returnsArg(0);
@@ -37,7 +38,7 @@ discourseModule("Integration | Component | text-field", function (hooks) {
   });
 
   componentTest("sets the dir attribute to ltr for Hebrew text", {
-    template: `{{text-field value='זהו שם עברי עם מקום עברי'}}`,
+    template: hbs`{{text-field value='זהו שם עברי עם מקום עברי'}}`,
     beforeEach() {
       this.siteSettings.support_mixed_text_direction = true;
     },
@@ -48,7 +49,7 @@ discourseModule("Integration | Component | text-field", function (hooks) {
   });
 
   componentTest("sets the dir attribute to ltr for English text", {
-    template: `{{text-field value='This is a ltr title'}}`,
+    template: hbs`{{text-field value='This is a ltr title'}}`,
     beforeEach() {
       this.siteSettings.support_mixed_text_direction = true;
     },
@@ -59,7 +60,7 @@ discourseModule("Integration | Component | text-field", function (hooks) {
   });
 
   componentTest("supports onChange", {
-    template: `{{text-field class="tf-test" value=value onChange=changed}}`,
+    template: hbs`{{text-field class="tf-test" value=value onChange=changed}}`,
     beforeEach() {
       this.called = false;
       this.newValue = null;
@@ -79,7 +80,7 @@ discourseModule("Integration | Component | text-field", function (hooks) {
   });
 
   componentTest("supports onChangeImmediate", {
-    template: `{{text-field class="tf-test" value=value onChangeImmediate=changed}}`,
+    template: hbs`{{text-field class="tf-test" value=value onChangeImmediate=changed}}`,
     beforeEach() {
       this.called = false;
       this.newValue = null;
diff --git a/app/assets/javascripts/discourse/tests/integration/components/themes-list-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/themes-list-item-test.js
new file mode 100644
index 0000000000..0dc7fea9c4
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/themes-list-item-test.js
@@ -0,0 +1,111 @@
+import I18n from "I18n";
+import Theme from "admin/models/theme";
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+
+discourseModule("Integration | Component | themes-list-item", function (hooks) {
+  setupRenderingTest(hooks);
+  componentTest("default theme", {
+    template: hbs`{{themes-list-item theme=theme}}`,
+    beforeEach() {
+      this.set("theme", Theme.create({ name: "Test", default: true }));
+    },
+
+    test(assert) {
+      assert.expect(1);
+      assert.equal(
+        queryAll(".d-icon-check").length,
+        1,
+        "shows default theme icon"
+      );
+    },
+  });
+
+  componentTest("pending updates", {
+    template: hbs`{{themes-list-item theme=theme}}`,
+    beforeEach() {
+      this.set(
+        "theme",
+        Theme.create({ name: "Test", remote_theme: { commits_behind: 6 } })
+      );
+    },
+
+    test(assert) {
+      assert.expect(1);
+      assert.equal(
+        queryAll(".d-icon-sync").length,
+        1,
+        "shows pending update icon"
+      );
+    },
+  });
+
+  componentTest("broken theme", {
+    template: hbs`{{themes-list-item theme=theme}}`,
+    beforeEach() {
+      this.set(
+        "theme",
+        Theme.create({
+          name: "Test",
+          theme_fields: [{ name: "scss", type_id: 1, error: "something" }],
+        })
+      );
+    },
+
+    test(assert) {
+      assert.expect(1);
+      assert.equal(
+        queryAll(".d-icon-exclamation-circle").length,
+        1,
+        "shows broken theme icon"
+      );
+    },
+  });
+
+  componentTest("with children", {
+    template: hbs`{{themes-list-item theme=theme}}`,
+
+    beforeEach() {
+      this.childrenList = [1, 2, 3, 4, 5].map((num) =>
+        Theme.create({ name: `Child ${num}`, component: true })
+      );
+
+      this.set(
+        "theme",
+        Theme.create({
+          name: "Test",
+          childThemes: this.childrenList,
+          default: true,
+        })
+      );
+    },
+
+    test(assert) {
+      assert.expect(2);
+      assert.deepEqual(
+        queryAll(".components")
+          .text()
+          .trim()
+          .split(",")
+          .map((n) => n.trim())
+          .join(","),
+        this.childrenList
+          .splice(0, 4)
+          .map((theme) => theme.get("name"))
+          .join(","),
+        "lists the first 4 children"
+      );
+      assert.deepEqual(
+        queryAll(".others-count").text().trim(),
+        I18n.t("admin.customize.theme.and_x_more", { count: 1 }),
+        "shows count of remaining children"
+      );
+    },
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/themes-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/themes-list-test.js
new file mode 100644
index 0000000000..3ab035c5f3
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/themes-list-test.js
@@ -0,0 +1,154 @@
+import Theme, { COMPONENTS, THEMES } from "admin/models/theme";
+import I18n from "I18n";
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+
+discourseModule("Integration | Component | themes-list", function (hooks) {
+  setupRenderingTest(hooks);
+  componentTest("current tab is themes", {
+    template: hbs`{{themes-list themes=themes components=components currentTab=currentTab}}`,
+    beforeEach() {
+      this.themes = [1, 2, 3, 4, 5].map((num) =>
+        Theme.create({ name: `Theme ${num}` })
+      );
+      this.components = [1, 2, 3, 4, 5].map((num) =>
+        Theme.create({
+          name: `Child ${num}`,
+          component: true,
+          parentThemes: [this.themes[num - 1]],
+          parent_themes: [1, 2, 3, 4, 5],
+        })
+      );
+      this.setProperties({
+        themes: this.themes,
+        components: this.components,
+        currentTab: THEMES,
+      });
+    },
+
+    test(assert) {
+      assert.equal(
+        queryAll(".themes-tab").hasClass("active"),
+        true,
+        "themes tab is active"
+      );
+      assert.equal(
+        queryAll(".components-tab").hasClass("active"),
+        false,
+        "components tab is not active"
+      );
+
+      assert.equal(
+        queryAll(".inactive-indicator").index(),
+        -1,
+        "there is no inactive themes separator when all themes are inactive"
+      );
+      assert.equal(
+        queryAll(".themes-list-item").length,
+        5,
+        "displays all themes"
+      );
+
+      [2, 3].forEach((num) => this.themes[num].set("user_selectable", true));
+      this.themes[4].set("default", true);
+      this.set("themes", this.themes);
+      const names = [4, 2, 3, 0, 1].map((num) => this.themes[num].get("name")); // default theme always on top, followed by user-selectable ones and then the rest
+      assert.deepEqual(
+        Array.from(queryAll(".themes-list-item .name")).map((node) =>
+          node.innerText.trim()
+        ),
+        names,
+        "sorts themes correctly"
+      );
+      assert.equal(
+        queryAll(".inactive-indicator").index(),
+        3,
+        "the separator is in the right location"
+      );
+
+      this.themes.forEach((theme) => theme.set("user_selectable", true));
+      this.set("themes", this.themes);
+      assert.equal(
+        queryAll(".inactive-indicator").index(),
+        -1,
+        "there is no inactive themes separator when all themes are user-selectable"
+      );
+
+      this.set("themes", []);
+      assert.equal(
+        queryAll(".themes-list-item").length,
+        1,
+        "shows one entry with a message when there is nothing to display"
+      );
+      assert.equal(
+        queryAll(".themes-list-item span.empty").text().trim(),
+        I18n.t("admin.customize.theme.empty"),
+        "displays the right message"
+      );
+    },
+  });
+
+  componentTest("current tab is components", {
+    template: hbs`{{themes-list themes=themes components=components currentTab=currentTab}}`,
+    beforeEach() {
+      this.themes = [1, 2, 3, 4, 5].map((num) =>
+        Theme.create({ name: `Theme ${num}` })
+      );
+      this.components = [1, 2, 3, 4, 5].map((num) =>
+        Theme.create({
+          name: `Child ${num}`,
+          component: true,
+          parentThemes: [this.themes[num - 1]],
+          parent_themes: [1, 2, 3, 4, 5],
+        })
+      );
+      this.setProperties({
+        themes: this.themes,
+        components: this.components,
+        currentTab: COMPONENTS,
+      });
+    },
+
+    test(assert) {
+      assert.equal(
+        queryAll(".components-tab").hasClass("active"),
+        true,
+        "components tab is active"
+      );
+      assert.equal(
+        queryAll(".themes-tab").hasClass("active"),
+        false,
+        "themes tab is not active"
+      );
+
+      assert.equal(
+        queryAll(".inactive-indicator").index(),
+        -1,
+        "there is no separator"
+      );
+      assert.equal(
+        queryAll(".themes-list-item").length,
+        5,
+        "displays all components"
+      );
+
+      this.set("components", []);
+      assert.equal(
+        queryAll(".themes-list-item").length,
+        1,
+        "shows one entry with a message when there is nothing to display"
+      );
+      assert.equal(
+        queryAll(".themes-list-item span.empty").text().trim(),
+        I18n.t("admin.customize.theme.empty"),
+        "displays the right message"
+      );
+    },
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/time-input-test.js b/app/assets/javascripts/discourse/tests/integration/components/time-input-test.js
index 07f5e896ab..3a4da4eaf3 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/time-input-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/time-input-test.js
@@ -1,8 +1,9 @@
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 function setTime(time) {
   this.setProperties(time);
@@ -16,7 +17,7 @@ discourseModule("Integration | Component | time-input", function (hooks) {
   });
 
   componentTest("default", {
-    template: `{{time-input hours=hours minutes=minutes}}`,
+    template: hbs`{{time-input hours=hours minutes=minutes}}`,
 
     beforeEach() {
       this.setProperties({ hours: "14", minutes: "58" });
@@ -28,7 +29,7 @@ discourseModule("Integration | Component | time-input", function (hooks) {
   });
 
   componentTest("prevents mutations", {
-    template: `{{time-input hours=hours minutes=minutes}}`,
+    template: hbs`{{time-input hours=hours minutes=minutes}}`,
 
     beforeEach() {
       this.setProperties({ hours: "14", minutes: "58" });
@@ -42,7 +43,7 @@ discourseModule("Integration | Component | time-input", function (hooks) {
   });
 
   componentTest("allows mutations through actions", {
-    template: `{{time-input hours=hours minutes=minutes onChange=onChange}}`,
+    template: hbs`{{time-input hours=hours minutes=minutes onChange=onChange}}`,
 
     beforeEach() {
       this.setProperties({ hours: "14", minutes: "58" });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/topic-list-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/topic-list-item-test.js
new file mode 100644
index 0000000000..e890958a8f
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/topic-list-item-test.js
@@ -0,0 +1,42 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import Topic from "discourse/models/topic";
+import hbs from "htmlbars-inline-precompile";
+
+discourseModule("Integration | Component | topic-list-item", function (hooks) {
+  setupRenderingTest(hooks);
+
+  componentTest("checkbox is rendered checked if topic is in selected array", {
+    template: hbs`{{topic-list-item
+        topic=topic
+        bulkSelectEnabled=true
+        selected=selected
+      }}
+      {{topic-list-item
+        topic=topic2
+        bulkSelectEnabled=true
+        selected=selected
+      }}`,
+
+    beforeEach() {
+      const topic = Topic.create({ id: 24234 });
+      const topic2 = Topic.create({ id: 24235 });
+      this.setProperties({
+        topic,
+        topic2,
+        selected: [topic],
+      });
+    },
+
+    async test(assert) {
+      const checkboxes = queryAll("input.bulk-select");
+      assert.ok(checkboxes[0].checked);
+      assert.ok(!checkboxes[1].checked);
+    },
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/topic-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/topic-list-test.js
new file mode 100644
index 0000000000..971e7488ba
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/topic-list-test.js
@@ -0,0 +1,70 @@
+import { click } from "@ember/test-helpers";
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import Topic from "discourse/models/topic";
+import hbs from "htmlbars-inline-precompile";
+
+discourseModule("Integration | Component | topic-list", function (hooks) {
+  setupRenderingTest(hooks);
+
+  componentTest("bulk select", {
+    template: hbs`{{topic-list
+        canBulkSelect=true
+        toggleBulkSelect=toggleBulkSelect
+        bulkSelectEnabled=bulkSelectEnabled
+        autoAddTopicsToBulkSelect=autoAddTopicsToBulkSelect
+        updateAutoAddTopicsToBulkSelect=updateAutoAddTopicsToBulkSelect
+        topics=topics
+        selected=selected
+      }}`,
+
+    beforeEach() {
+      const topic = Topic.create({ id: 24234 });
+      const topic2 = Topic.create({ id: 24235 });
+      this.setProperties({
+        topics: [topic, topic2],
+        selected: [],
+        bulkSelectEnabled: false,
+        autoAddTopicsToBulkSelect: false,
+
+        toggleBulkSelect() {
+          this.toggleProperty("bulkSelectEnabled");
+        },
+
+        updateAutoAddTopicsToBulkSelect(newVal) {
+          this.set("autoAddTopicsToBulkSelect", newVal);
+        },
+      });
+    },
+
+    async test(assert) {
+      assert.equal(this.selected.length, 0, "defaults to 0");
+      await click("button.bulk-select");
+      assert.ok(this.bulkSelectEnabled, "bulk select is enabled");
+
+      await click("button.bulk-select-all");
+      assert.equal(
+        this.selected.length,
+        2,
+        "clicking Select All selects all loaded topics"
+      );
+      assert.ok(
+        this.autoAddTopicsToBulkSelect,
+        "clicking Select All turns on the autoAddTopicsToBulkSelect flag"
+      );
+
+      await click("button.bulk-clear-all");
+      assert.equal(
+        this.selected.length,
+        0,
+        "clicking Clear All deselects all topics"
+      );
+      assert.ok(
+        !this.autoAddTopicsToBulkSelect,
+        "clicking Clear All turns off the autoAddTopicsToBulkSelect flag"
+      );
+    },
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js
new file mode 100644
index 0000000000..7b81e20913
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js
@@ -0,0 +1,184 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import { resetFlair } from "discourse/lib/avatar-flair";
+
+function setupSiteGroups(that) {
+  that.site.groups = [
+    {
+      id: 1,
+      name: "admins",
+      flair_url: "fa-bars",
+      flair_bg_color: "CC000A",
+      flair_color: "FFFFFA",
+    },
+    {
+      id: 2,
+      name: "staff",
+      flair_url: "fa-bars",
+      flair_bg_color: "CC0005",
+      flair_color: "FFFFF5",
+    },
+    {
+      id: 3,
+      name: "trust_level_1",
+      flair_url: "fa-dice-one",
+      flair_bg_color: "CC0001",
+      flair_color: "FFFFF1",
+    },
+    {
+      id: 4,
+      name: "trust_level_2",
+      flair_url: "fa-dice-two",
+      flair_bg_color: "CC0002",
+      flair_color: "FFFFF2",
+    },
+  ];
+}
+
+discourseModule(
+  "Integration | Component | user-avatar-flair",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    componentTest("avatar flair for admin user", {
+      template: hbs`{{user-avatar-flair user=args}}`,
+      beforeEach() {
+        resetFlair();
+        this.set("args", {
+          admin: true,
+          moderator: false,
+          trust_level: 2,
+        });
+        setupSiteGroups(this);
+      },
+      afterEach() {
+        resetFlair();
+      },
+      test(assert) {
+        assert.ok(queryAll(".avatar-flair").length, "it has the tag");
+        assert.ok(queryAll("svg.d-icon-bars").length, "it has the svg icon");
+        assert.equal(
+          queryAll(".avatar-flair").attr("style"),
+          "background-color: #CC000A; color: #FFFFFA; ",
+          "it has styles"
+        );
+      },
+    });
+
+    componentTest("avatar flair for moderator user with fallback to staff", {
+      template: hbs`{{user-avatar-flair user=args}}`,
+      beforeEach() {
+        resetFlair();
+        this.set("args", {
+          admin: false,
+          moderator: true,
+          trust_level: 2,
+        });
+        setupSiteGroups(this);
+      },
+      afterEach() {
+        resetFlair();
+      },
+      test(assert) {
+        assert.ok(queryAll(".avatar-flair").length, "it has the tag");
+        assert.ok(queryAll("svg.d-icon-bars").length, "it has the svg icon");
+        assert.equal(
+          queryAll(".avatar-flair").attr("style"),
+          "background-color: #CC0005; color: #FFFFF5; ",
+          "it has styles"
+        );
+      },
+    });
+
+    componentTest("avatar flair for trust level", {
+      template: hbs`{{user-avatar-flair user=args}}`,
+      beforeEach() {
+        resetFlair();
+        this.set("args", {
+          admin: false,
+          moderator: false,
+          trust_level: 2,
+        });
+        setupSiteGroups(this);
+      },
+      afterEach() {
+        resetFlair();
+      },
+      test(assert) {
+        assert.ok(queryAll(".avatar-flair").length, "it has the tag");
+        assert.ok(
+          queryAll("svg.d-icon-dice-two").length,
+          "it has the svg icon"
+        );
+        assert.equal(
+          queryAll(".avatar-flair").attr("style"),
+          "background-color: #CC0002; color: #FFFFF2; ",
+          "it has styles"
+        );
+      },
+    });
+
+    componentTest("avatar flair for trust level with fallback", {
+      template: hbs`{{user-avatar-flair user=args}}`,
+      beforeEach() {
+        resetFlair();
+        this.set("args", {
+          admin: false,
+          moderator: false,
+          trust_level: 3,
+        });
+        setupSiteGroups(this);
+      },
+      afterEach() {
+        resetFlair();
+      },
+      test(assert) {
+        assert.ok(queryAll(".avatar-flair").length, "it has the tag");
+        assert.ok(
+          queryAll("svg.d-icon-dice-two").length,
+          "it has the svg icon"
+        );
+        assert.equal(
+          queryAll(".avatar-flair").attr("style"),
+          "background-color: #CC0002; color: #FFFFF2; ",
+          "it has styles"
+        );
+      },
+    });
+
+    componentTest("avatar flair for primary group flair", {
+      template: hbs`{{user-avatar-flair user=args}}`,
+      beforeEach() {
+        resetFlair();
+        this.set("args", {
+          admin: false,
+          moderator: false,
+          trust_level: 3,
+          primary_group_flair_url: "fa-times",
+          primary_group_flair_bg_color: "123456",
+          primary_group_flair_color: "B0B0B0",
+          primary_group_name: "Band Geeks",
+        });
+        setupSiteGroups(this);
+      },
+      afterEach() {
+        resetFlair();
+      },
+      test(assert) {
+        assert.ok(queryAll(".avatar-flair").length, "it has the tag");
+        assert.ok(queryAll("svg.d-icon-times").length, "it has the svg icon");
+        assert.equal(
+          queryAll(".avatar-flair").attr("style"),
+          "background-color: #123456; color: #B0B0B0; ",
+          "it has styles"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js
index 35d44053f5..f22fc3b17c 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js
@@ -1,10 +1,11 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
 
 function paste(element, text) {
   let e = new Event("paste");
@@ -16,7 +17,7 @@ discourseModule("Integration | Component | user-selector", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("pasting a list of usernames", {
-    template: `{{user-selector usernames=usernames class="test-selector"}}`,
+    template: hbs`{{user-selector usernames=usernames class="test-selector"}}`,
 
     beforeEach() {
       this.set("usernames", "evil,trout");
@@ -46,7 +47,7 @@ discourseModule("Integration | Component | user-selector", function (hooks) {
   });
 
   componentTest("excluding usernames", {
-    template: `{{user-selector usernames=usernames excludedUsernames=excludedUsernames class="test-selector"}}`,
+    template: hbs`{{user-selector usernames=usernames excludedUsernames=excludedUsernames class="test-selector"}}`,
 
     beforeEach() {
       this.set("usernames", "mark");
diff --git a/app/assets/javascripts/discourse/tests/integration/components/value-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/value-list-test.js
index 84795c9c62..cd02aa0a20 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/value-list-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/value-list-test.js
@@ -1,18 +1,19 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
 import { click } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 discourseModule("Integration | Component | value-list", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("adding a value", {
-    template: "{{value-list values=values}}",
+    template: hbs`{{value-list values=values}}`,
 
     skip: true,
 
@@ -39,7 +40,7 @@ discourseModule("Integration | Component | value-list", function (hooks) {
   });
 
   componentTest("removing a value", {
-    template: "{{value-list values=values}}",
+    template: hbs`{{value-list values=values}}`,
 
     beforeEach() {
       this.set("values", "vinkas\nosama");
@@ -66,7 +67,7 @@ discourseModule("Integration | Component | value-list", function (hooks) {
   });
 
   componentTest("selecting a value", {
-    template: "{{value-list values=values choices=choices}}",
+    template: hbs`{{value-list values=values choices=choices}}`,
 
     beforeEach() {
       this.setProperties({
@@ -93,7 +94,7 @@ discourseModule("Integration | Component | value-list", function (hooks) {
   });
 
   componentTest("array support", {
-    template: "{{value-list values=values inputType='array'}}",
+    template: hbs`{{value-list values=values inputType='array'}}`,
 
     beforeEach() {
       this.set("values", ["vinkas", "osama"]);
@@ -120,7 +121,7 @@ discourseModule("Integration | Component | value-list", function (hooks) {
   });
 
   componentTest("delimiter support", {
-    template: "{{value-list values=values inputDelimiter='|'}}",
+    template: hbs`{{value-list values=values inputDelimiter='|'}}`,
 
     beforeEach() {
       this.set("values", "vinkas|osama");
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/actions-summary-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/actions-summary-test.js
index e717e6a3d4..a7ff62bfab 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/actions-summary-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/actions-summary-test.js
@@ -1,34 +1,36 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
 
-discourseModule("Integration | Component | Widget | actions-summary", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | Widget | actions-summary",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("post deleted", {
-    template: '{{mount-widget widget="actions-summary" args=args}}',
-    beforeEach() {
-      this.set("args", {
-        deleted_at: "2016-01-01",
-        deletedByUsername: "eviltrout",
-        deletedByAvatarTemplate: "/images/avatar.png",
-      });
-    },
-    test(assert) {
-      assert.ok(
-        queryAll(".post-action .d-icon-far-trash-alt").length === 1,
-        "it has the deleted icon"
-      );
-      assert.ok(
-        queryAll(".avatar[title=eviltrout]").length === 1,
-        "it has the deleted by avatar"
-      );
-    },
-  });
-});
+    componentTest("post deleted", {
+      template: hbs`{{mount-widget widget="actions-summary" args=args}}`,
+      beforeEach() {
+        this.set("args", {
+          deleted_at: "2016-01-01",
+          deletedByUsername: "eviltrout",
+          deletedByAvatarTemplate: "/images/avatar.png",
+        });
+      },
+      test(assert) {
+        assert.ok(
+          queryAll(".post-action .d-icon-far-trash-alt").length === 1,
+          "it has the deleted icon"
+        );
+        assert.ok(
+          queryAll(".avatar[title=eviltrout]").length === 1,
+          "it has the deleted by avatar"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/avatar-flair-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/avatar-flair-test.js
index 3a5c899ca6..fd3bb7ac7d 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/avatar-flair-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/avatar-flair-test.js
@@ -1,46 +1,48 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
 
-discourseModule("Integration | Component | Widget | avatar-flair", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | Widget | avatar-flair",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("avatar flair with an icon", {
-    template: '{{mount-widget widget="avatar-flair" args=args}}',
-    beforeEach() {
-      this.set("args", {
-        primary_group_flair_url: "fa-bars",
-        primary_group_flair_bg_color: "CC0000",
-        primary_group_flair_color: "FFFFFF",
-      });
-    },
-    test(assert) {
-      assert.ok(queryAll(".avatar-flair").length, "it has the tag");
-      assert.ok(queryAll("svg.d-icon-bars").length, "it has the svg icon");
-      assert.equal(
-        queryAll(".avatar-flair").attr("style"),
-        "background-color: #CC0000; color: #FFFFFF; ",
-        "it has styles"
-      );
-    },
-  });
+    componentTest("avatar flair with an icon", {
+      template: hbs`{{mount-widget widget="avatar-flair" args=args}}`,
+      beforeEach() {
+        this.set("args", {
+          primary_group_flair_url: "fa-bars",
+          primary_group_flair_bg_color: "CC0000",
+          primary_group_flair_color: "FFFFFF",
+        });
+      },
+      test(assert) {
+        assert.ok(queryAll(".avatar-flair").length, "it has the tag");
+        assert.ok(queryAll("svg.d-icon-bars").length, "it has the svg icon");
+        assert.equal(
+          queryAll(".avatar-flair").attr("style"),
+          "background-color: #CC0000; color: #FFFFFF; ",
+          "it has styles"
+        );
+      },
+    });
 
-  componentTest("avatar flair with an image", {
-    template: '{{mount-widget widget="avatar-flair" args=args}}',
-    beforeEach() {
-      this.set("args", {
-        primary_group_flair_url: "/images/avatar.png",
-      });
-    },
-    test(assert) {
-      assert.ok(queryAll(".avatar-flair").length, "it has the tag");
-      assert.ok(queryAll("svg").length === 0, "it does not have an svg icon");
-    },
-  });
-});
+    componentTest("avatar flair with an image", {
+      template: hbs`{{mount-widget widget="avatar-flair" args=args}}`,
+      beforeEach() {
+        this.set("args", {
+          primary_group_flair_url: "/images/avatar.png",
+        });
+      },
+      test(assert) {
+        assert.ok(queryAll(".avatar-flair").length, "it has the tag");
+        assert.ok(queryAll("svg").length === 0, "it does not have an svg icon");
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/button-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/button-test.js
index 196c02b0d6..2606de6fbc 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/button-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/button-test.js
@@ -1,16 +1,18 @@
-import {
-  discourseModule,
-  queryAll,
-} from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  query,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule("Integration | Component | Widget | button", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("icon only button", {
-    template: '{{mount-widget widget="button" args=args}}',
+    template: hbs`{{mount-widget widget="button" args=args}}`,
 
     beforeEach() {
       this.set("args", { icon: "far-smile" });
@@ -29,7 +31,7 @@ discourseModule("Integration | Component | Widget | button", function (hooks) {
   });
 
   componentTest("icon and text button", {
-    template: '{{mount-widget widget="button" args=args}}',
+    template: hbs`{{mount-widget widget="button" args=args}}`,
 
     beforeEach() {
       this.set("args", { icon: "plus", label: "topic.create" });
@@ -52,7 +54,7 @@ discourseModule("Integration | Component | Widget | button", function (hooks) {
   });
 
   componentTest("text only button", {
-    template: '{{mount-widget widget="button" args=args}}',
+    template: hbs`{{mount-widget widget="button" args=args}}`,
 
     beforeEach() {
       this.set("args", { label: "topic.create" });
@@ -69,4 +71,29 @@ discourseModule("Integration | Component | Widget | button", function (hooks) {
       );
     },
   });
+
+  componentTest("translatedLabel", {
+    template: hbs`{{mount-widget widget="button" args=args}}`,
+
+    beforeEach() {
+      this.set("args", { translatedLabel: "foo bar" });
+    },
+
+    test(assert) {
+      assert.equal(query("button span.d-button-label").innerText, "foo bar");
+    },
+  });
+
+  componentTest("translatedTitle", {
+    template: hbs`{{mount-widget widget="button" args=args}}`,
+
+    beforeEach() {
+      this.set("args", { label: "topic.create", translatedTitle: "foo bar" });
+    },
+
+    test(assert) {
+      assert.equal(query("button").title, "foo bar");
+      assert.equal(query("button").getAttribute("aria-label"), "foo bar");
+    },
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/default-notification-item-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/default-notification-item-test.js
index ddf2365ac5..7136ca23b5 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/default-notification-item-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/default-notification-item-test.js
@@ -1,12 +1,14 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
 import EmberObject from "@ember/object";
+import hbs from "htmlbars-inline-precompile";
 import pretender from "discourse/tests/helpers/create-pretender";
+import { settled } from "@ember/test-helpers";
 
 discourseModule(
   "Integration | Component | Widget | default-notification-item",
@@ -14,7 +16,7 @@ discourseModule(
     setupRenderingTest(hooks);
 
     componentTest("sets notification as read on middle click", {
-      template: '{{mount-widget widget="default-notification-item" args=args}}',
+      template: hbs`{{mount-widget widget="default-notification-item" args=args}}`,
       beforeEach() {
         this.set(
           "args",
@@ -59,13 +61,14 @@ discourseModule(
 
         assert.equal(queryAll("li.read").length, 0);
 
-        await $(document).trigger(
+        $(document).trigger(
           $.Event("mouseup", {
             target: queryAll("li")[0],
             button: 1,
             which: 2,
           })
         );
+        await settled();
 
         assert.equal(queryAll("li.read").length, 1);
         assert.equal(requests, 1);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/hamburger-menu-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/hamburger-menu-test.js
index 74fa5b7c08..52fd461819 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/hamburger-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/hamburger-menu-test.js
@@ -1,263 +1,269 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
 import { NotificationLevels } from "discourse/lib/notification-levels";
+import hbs from "htmlbars-inline-precompile";
 
 const topCategoryIds = [2, 3, 1];
 let mutedCategoryIds = [];
 let unreadCategoryIds = [];
 let categoriesByCount = [];
 
-discourseModule("Integration | Component | Widget | hamburger-menu", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | Widget | hamburger-menu",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("prioritize faq", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
+    componentTest("prioritize faq", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
 
-    beforeEach() {
-      this.siteSettings.faq_url = "http://example.com/faq";
-      this.currentUser.set("read_faq", false);
-    },
+      beforeEach() {
+        this.siteSettings.faq_url = "http://example.com/faq";
+        this.currentUser.set("read_faq", false);
+      },
 
-    test(assert) {
-      assert.ok(queryAll(".faq-priority").length);
-      assert.ok(!queryAll(".faq-link").length);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll(".faq-priority").length);
+        assert.ok(!queryAll(".faq-link").length);
+      },
+    });
 
-  componentTest("prioritize faq - user has read", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
+    componentTest("prioritize faq - user has read", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
 
-    beforeEach() {
-      this.siteSettings.faq_url = "http://example.com/faq";
-      this.currentUser.set("read_faq", true);
-    },
+      beforeEach() {
+        this.siteSettings.faq_url = "http://example.com/faq";
+        this.currentUser.set("read_faq", true);
+      },
 
-    test(assert) {
-      assert.ok(!queryAll(".faq-priority").length);
-      assert.ok(queryAll(".faq-link").length);
-    },
-  });
+      test(assert) {
+        assert.ok(!queryAll(".faq-priority").length);
+        assert.ok(queryAll(".faq-link").length);
+      },
+    });
 
-  componentTest("staff menu - not staff", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
+    componentTest("staff menu - not staff", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
 
-    beforeEach() {
-      this.currentUser.set("staff", false);
-    },
+      beforeEach() {
+        this.currentUser.set("staff", false);
+      },
 
-    test(assert) {
-      assert.ok(!queryAll(".admin-link").length);
-    },
-  });
+      test(assert) {
+        assert.ok(!queryAll(".admin-link").length);
+      },
+    });
 
-  componentTest("staff menu - moderator", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
+    componentTest("staff menu - moderator", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
 
-    beforeEach() {
-      this.currentUser.set("moderator", true);
-    },
+      beforeEach() {
+        this.currentUser.set("moderator", true);
+        this.currentUser.set("can_review", true);
+      },
 
-    test(assert) {
-      assert.ok(queryAll(".admin-link").length);
-      assert.ok(queryAll(".review").length);
-      assert.ok(!queryAll(".settings-link").length);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll(".admin-link").length);
+        assert.ok(queryAll(".review").length);
+        assert.ok(!queryAll(".settings-link").length);
+      },
+    });
 
-  componentTest("staff menu - admin", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
+    componentTest("staff menu - admin", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
 
-    beforeEach() {
-      this.currentUser.setProperties({ admin: true });
-    },
+      beforeEach() {
+        this.currentUser.setProperties({ admin: true });
+      },
 
-    test(assert) {
-      assert.ok(queryAll(".settings-link").length);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll(".settings-link").length);
+      },
+    });
 
-  componentTest("logged in links", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
+    componentTest("logged in links", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
 
-    test(assert) {
-      assert.ok(queryAll(".new-topics-link").length);
-      assert.ok(queryAll(".unread-topics-link").length);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll(".new-topics-link").length);
+        assert.ok(queryAll(".unread-topics-link").length);
+      },
+    });
 
-  componentTest("general links", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
-    anonymous: true,
+    componentTest("general links", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
+      anonymous: true,
 
-    test(assert) {
-      assert.ok(queryAll("li[class='']").length === 0);
-      assert.ok(queryAll(".latest-topics-link").length);
-      assert.ok(!queryAll(".new-topics-link").length);
-      assert.ok(!queryAll(".unread-topics-link").length);
-      assert.ok(queryAll(".top-topics-link").length);
-      assert.ok(queryAll(".badge-link").length);
-      assert.ok(queryAll(".category-link").length > 0);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll("li[class='']").length === 0);
+        assert.ok(queryAll(".latest-topics-link").length);
+        assert.ok(!queryAll(".new-topics-link").length);
+        assert.ok(!queryAll(".unread-topics-link").length);
+        assert.ok(queryAll(".top-topics-link").length);
+        assert.ok(queryAll(".badge-link").length);
+        assert.ok(queryAll(".category-link").length > 0);
+      },
+    });
 
-  let maxCategoriesToDisplay;
+    let maxCategoriesToDisplay;
 
-  componentTest("top categories - anonymous", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
-    anonymous: true,
+    componentTest("top categories - anonymous", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
+      anonymous: true,
 
-    beforeEach() {
-      this.siteSettings.header_dropdown_category_count = 8;
-    },
+      beforeEach() {
+        this.siteSettings.header_dropdown_category_count = 8;
+      },
 
-    test(assert) {
-      assert.equal(queryAll(".category-link").length, 8);
-      assert.equal(
-        queryAll(".category-link .category-name").text(),
-        this.site
-          .get("categoriesByCount")
-          .slice(0, 8)
-          .map((c) => c.name)
-          .join("")
-      );
-    },
-  });
+      test(assert) {
+        assert.equal(queryAll(".category-link").length, 8);
+        assert.equal(
+          queryAll(".category-link .category-name").text(),
+          this.site
+            .get("categoriesByCount")
+            .slice(0, 8)
+            .map((c) => c.name)
+            .join("")
+        );
+      },
+    });
 
-  componentTest("top categories - allow_uncategorized_topics", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
-    anonymous: true,
+    componentTest("top categories - allow_uncategorized_topics", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
+      anonymous: true,
 
-    beforeEach() {
-      this.siteSettings.allow_uncategorized_topics = false;
-      this.siteSettings.header_dropdown_category_count = 8;
-    },
+      beforeEach() {
+        this.siteSettings.allow_uncategorized_topics = false;
+        this.siteSettings.header_dropdown_category_count = 8;
+      },
 
-    test(assert) {
-      assert.equal(queryAll(".category-link").length, 8);
-      assert.equal(
-        queryAll(".category-link .category-name").text(),
-        this.site
-          .get("categoriesByCount")
-          .filter((c) => c.name !== "uncategorized")
-          .slice(0, 8)
-          .map((c) => c.name)
-          .join("")
-      );
-    },
-  });
+      test(assert) {
+        assert.equal(queryAll(".category-link").length, 8);
+        assert.equal(
+          queryAll(".category-link .category-name").text(),
+          this.site
+            .get("categoriesByCount")
+            .filter((c) => c.name !== "uncategorized")
+            .slice(0, 8)
+            .map((c) => c.name)
+            .join("")
+        );
+      },
+    });
 
-  componentTest("top categories", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
+    componentTest("top categories", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
 
-    beforeEach() {
-      this.siteSettings.header_dropdown_category_count = 8;
-      maxCategoriesToDisplay = this.siteSettings.header_dropdown_category_count;
-      categoriesByCount = this.site.get("categoriesByCount").slice();
-      categoriesByCount.every((c) => {
-        if (!topCategoryIds.includes(c.id)) {
-          if (mutedCategoryIds.length === 0) {
-            mutedCategoryIds.push(c.id);
-            c.set("notification_level", NotificationLevels.MUTED);
-          } else if (unreadCategoryIds.length === 0) {
-            unreadCategoryIds.push(c.id);
-            for (let i = 0; i < 5; i++) {
-              c.topicTrackingState.states["t123" + i] = {
-                category_id: c.id,
-                last_read_post_number: 1,
-                highest_post_number: 2,
-                notification_level: NotificationLevels.TRACKING,
-              };
+      beforeEach() {
+        this.siteSettings.header_dropdown_category_count = 8;
+        maxCategoriesToDisplay = this.siteSettings
+          .header_dropdown_category_count;
+        categoriesByCount = this.site.get("categoriesByCount").slice();
+        categoriesByCount.every((c) => {
+          if (!topCategoryIds.includes(c.id)) {
+            if (mutedCategoryIds.length === 0) {
+              mutedCategoryIds.push(c.id);
+              c.set("notification_level", NotificationLevels.MUTED);
+            } else if (unreadCategoryIds.length === 0) {
+              unreadCategoryIds.push(c.id);
+              for (let i = 0; i < 5; i++) {
+                c.topicTrackingState.states["t123" + i] = {
+                  category_id: c.id,
+                  last_read_post_number: 1,
+                  highest_post_number: 2,
+                  notification_level: NotificationLevels.TRACKING,
+                };
+              }
+            } else {
+              unreadCategoryIds.splice(0, 0, c.id);
+              for (let i = 0; i < 10; i++) {
+                c.topicTrackingState.states["t321" + i] = {
+                  category_id: c.id,
+                  last_read_post_number: null,
+                };
+              }
+              return false;
             }
-          } else {
-            unreadCategoryIds.splice(0, 0, c.id);
-            for (let i = 0; i < 10; i++) {
-              c.topicTrackingState.states["t321" + i] = {
-                category_id: c.id,
-                last_read_post_number: null,
-              };
-            }
-            return false;
           }
-        }
-        return true;
-      });
-      this.currentUser.set("top_category_ids", topCategoryIds);
-    },
+          return true;
+        });
+        this.currentUser.set("top_category_ids", topCategoryIds);
+      },
 
-    test(assert) {
-      assert.equal(queryAll(".category-link").length, maxCategoriesToDisplay);
+      test(assert) {
+        assert.equal(queryAll(".category-link").length, maxCategoriesToDisplay);
 
-      categoriesByCount = categoriesByCount.filter(
-        (c) => !mutedCategoryIds.includes(c.id)
-      );
-      let ids = [
-        ...unreadCategoryIds,
-        ...topCategoryIds,
-        ...categoriesByCount.map((c) => c.id),
-      ]
-        .uniq()
-        .slice(0, maxCategoriesToDisplay);
+        categoriesByCount = categoriesByCount.filter(
+          (c) => !mutedCategoryIds.includes(c.id)
+        );
+        let ids = [
+          ...unreadCategoryIds,
+          ...topCategoryIds,
+          ...categoriesByCount.map((c) => c.id),
+        ]
+          .uniq()
+          .slice(0, maxCategoriesToDisplay);
 
-      assert.equal(
-        queryAll(".category-link .category-name").text(),
-        ids.map((i) => categoriesByCount.find((c) => c.id === i).name).join("")
-      );
-    },
-  });
+        assert.equal(
+          queryAll(".category-link .category-name").text(),
+          ids
+            .map((i) => categoriesByCount.find((c) => c.id === i).name)
+            .join("")
+        );
+      },
+    });
 
-  componentTest("badges link - disabled", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
+    componentTest("badges link - disabled", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
 
-    beforeEach() {
-      this.siteSettings.enable_badges = false;
-    },
+      beforeEach() {
+        this.siteSettings.enable_badges = false;
+      },
 
-    test(assert) {
-      assert.ok(!queryAll(".badge-link").length);
-    },
-  });
+      test(assert) {
+        assert.ok(!queryAll(".badge-link").length);
+      },
+    });
 
-  componentTest("badges link", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
+    componentTest("badges link", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
 
-    test(assert) {
-      assert.ok(queryAll(".badge-link").length);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll(".badge-link").length);
+      },
+    });
 
-  componentTest("user directory link", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
+    componentTest("user directory link", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
 
-    test(assert) {
-      assert.ok(queryAll(".user-directory-link").length);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll(".user-directory-link").length);
+      },
+    });
 
-  componentTest("user directory link - disabled", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
+    componentTest("user directory link - disabled", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
 
-    beforeEach() {
-      this.siteSettings.enable_user_directory = false;
-    },
+      beforeEach() {
+        this.siteSettings.enable_user_directory = false;
+      },
 
-    test(assert) {
-      assert.ok(!queryAll(".user-directory-link").length);
-    },
-  });
+      test(assert) {
+        assert.ok(!queryAll(".user-directory-link").length);
+      },
+    });
 
-  componentTest("general links", {
-    template: '{{mount-widget widget="hamburger-menu"}}',
+    componentTest("general links", {
+      template: hbs`{{mount-widget widget="hamburger-menu"}}`,
 
-    test(assert) {
-      assert.ok(queryAll(".about-link").length);
-      assert.ok(queryAll(".keyboard-shortcuts-link").length);
-    },
-  });
-});
+      test(assert) {
+        assert.ok(queryAll(".about-link").length);
+        assert.ok(queryAll(".keyboard-shortcuts-link").length);
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/header-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/header-test.js
index b4f74d1746..c099e69261 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/header-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/header-test.js
@@ -1,18 +1,19 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   exists,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
 import { click } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule("Integration | Component | Widget | header", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("rendering basics", {
-    template: '{{mount-widget widget="header"}}',
+    template: hbs`{{mount-widget widget="header"}}`,
     test(assert) {
       assert.ok(queryAll("header.d-header").length);
       assert.ok(queryAll("#site-logo").length);
@@ -20,14 +21,20 @@ discourseModule("Integration | Component | Widget | header", function (hooks) {
   });
 
   componentTest("sign up / login buttons", {
-    template:
-      '{{mount-widget widget="header" showCreateAccount=(action "showCreateAccount") showLogin=(action "showLogin") args=args}}',
+    template: hbs`
+      {{mount-widget
+        widget="header"
+        showCreateAccount=showCreateAccount
+        showLogin=showLogin
+        args=args
+      }}
+    `,
     anonymous: true,
 
     beforeEach() {
       this.set("args", { canSignUp: true });
-      this.on("showCreateAccount", () => (this.signupShown = true));
-      this.on("showLogin", () => (this.loginShown = true));
+      this.set("showCreateAccount", () => (this.signupShown = true));
+      this.set("showLogin", () => (this.loginShown = true));
     },
 
     async test(assert) {
@@ -43,14 +50,20 @@ discourseModule("Integration | Component | Widget | header", function (hooks) {
   });
 
   componentTest("anon when login required", {
-    template:
-      '{{mount-widget widget="header" showCreateAccount=(action "showCreateAccount") showLogin=(action "showLogin") args=args}}',
+    template: hbs`
+      {{mount-widget
+        widget="header"
+        showCreateAccount=showCreateAccount
+        showLogin=showLogin
+        args=args
+      }}
+    `,
     anonymous: true,
 
     beforeEach() {
       this.set("args", { canSignUp: true });
-      this.on("showCreateAccount", () => (this.signupShown = true));
-      this.on("showLogin", () => (this.loginShown = true));
+      this.set("showCreateAccount", () => (this.signupShown = true));
+      this.set("showLogin", () => (this.loginShown = true));
       this.siteSettings.login_required = true;
     },
 
@@ -63,13 +76,19 @@ discourseModule("Integration | Component | Widget | header", function (hooks) {
   });
 
   componentTest("logged in when login required", {
-    template:
-      '{{mount-widget widget="header" showCreateAccount=(action "showCreateAccount") showLogin=(action "showLogin") args=args}}',
+    template: hbs`
+      {{mount-widget
+        widget="header"
+        showCreateAccount=showCreateAccount
+        showLogin=showLogin
+        args=args
+      }}
+    `,
 
     beforeEach() {
       this.set("args", { canSignUp: true });
-      this.on("showCreateAccount", () => (this.signupShown = true));
-      this.on("showLogin", () => (this.loginShown = true));
+      this.set("showCreateAccount", () => (this.signupShown = true));
+      this.set("showLogin", () => (this.loginShown = true));
       this.siteSettings.login_required = true;
     },
 
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/home-logo-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/home-logo-test.js
index 91046ece55..41992f056f 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/home-logo-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/home-logo-test.js
@@ -1,11 +1,12 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
 import Session from "discourse/models/session";
+import hbs from "htmlbars-inline-precompile";
 
 const bigLogo = "/images/d-logo-sketch.png?test";
 const smallLogo = "/images/d-logo-sketch-small.png?test";
@@ -14,240 +15,241 @@ const darkLogo = "/images/d-logo-sketch.png?dark";
 const title = "Cool Forum";
 const prefersDark = "(prefers-color-scheme: dark)";
 
-discourseModule("Integration | Component | Widget | home-logo", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | Widget | home-logo",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("basics", {
-    template: '{{mount-widget widget="home-logo" args=args}}',
-    skip: true,
-    beforeEach() {
-      this.siteSettings.site_logo_url = bigLogo;
-      this.siteSettings.site_logo_small_url = smallLogo;
-      this.siteSettings.title = title;
-      this.set("args", { minimized: false });
-    },
+    componentTest("basics", {
+      template: hbs`{{mount-widget widget="home-logo" args=args}}`,
+      skip: true,
+      beforeEach() {
+        this.siteSettings.site_logo_url = bigLogo;
+        this.siteSettings.site_logo_small_url = smallLogo;
+        this.siteSettings.title = title;
+        this.set("args", { minimized: false });
+      },
 
-    test(assert) {
-      assert.ok(queryAll(".title").length === 1);
+      test(assert) {
+        assert.ok(queryAll(".title").length === 1);
 
-      assert.ok(queryAll("img#site-logo.logo-big").length === 1);
-      assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
-      assert.equal(queryAll("#site-logo").attr("alt"), title);
-    },
-  });
+        assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+        assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
+        assert.equal(queryAll("#site-logo").attr("alt"), title);
+      },
+    });
 
-  componentTest("basics - minimized", {
-    template: '{{mount-widget widget="home-logo" args=args}}',
-    beforeEach() {
-      this.siteSettings.site_logo_url = bigLogo;
-      this.siteSettings.site_logo_small_url = smallLogo;
-      this.siteSettings.title = title;
-      this.set("args", { minimized: true });
-    },
+    componentTest("basics - minimized", {
+      template: hbs`{{mount-widget widget="home-logo" args=args}}`,
+      beforeEach() {
+        this.siteSettings.site_logo_url = bigLogo;
+        this.siteSettings.site_logo_small_url = smallLogo;
+        this.siteSettings.title = title;
+        this.set("args", { minimized: true });
+      },
 
-    test(assert) {
-      assert.ok(queryAll("img.logo-small").length === 1);
-      assert.equal(queryAll("img.logo-small").attr("src"), smallLogo);
-      assert.equal(queryAll("img.logo-small").attr("alt"), title);
-      assert.equal(queryAll("img.logo-small").attr("width"), 36);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll("img.logo-small").length === 1);
+        assert.equal(queryAll("img.logo-small").attr("src"), smallLogo);
+        assert.equal(queryAll("img.logo-small").attr("alt"), title);
+        assert.equal(queryAll("img.logo-small").attr("width"), 36);
+      },
+    });
 
-  componentTest("no logo", {
-    template: '{{mount-widget widget="home-logo" args=args}}',
-    beforeEach() {
-      this.siteSettings.site_logo_url = "";
-      this.siteSettings.site_logo_small_url = "";
-      this.siteSettings.title = title;
-      this.set("args", { minimized: false });
-    },
+    componentTest("no logo", {
+      template: hbs`{{mount-widget widget="home-logo" args=args}}`,
+      beforeEach() {
+        this.siteSettings.site_logo_url = "";
+        this.siteSettings.site_logo_small_url = "";
+        this.siteSettings.title = title;
+        this.set("args", { minimized: false });
+      },
 
-    test(assert) {
-      assert.ok(queryAll("h1#site-text-logo.text-logo").length === 1);
-      assert.equal(queryAll("#site-text-logo").text(), title);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll("h1#site-text-logo.text-logo").length === 1);
+        assert.equal(queryAll("#site-text-logo").text(), title);
+      },
+    });
 
-  componentTest("no logo - minimized", {
-    template: '{{mount-widget widget="home-logo" args=args}}',
-    beforeEach() {
-      this.siteSettings.site_logo_url = "";
-      this.siteSettings.site_logo_small_url = "";
-      this.siteSettings.title = title;
-      this.set("args", { minimized: true });
-    },
+    componentTest("no logo - minimized", {
+      template: hbs`{{mount-widget widget="home-logo" args=args}}`,
+      beforeEach() {
+        this.siteSettings.site_logo_url = "";
+        this.siteSettings.site_logo_small_url = "";
+        this.siteSettings.title = title;
+        this.set("args", { minimized: true });
+      },
 
-    test(assert) {
-      assert.ok(queryAll(".d-icon-home").length === 1);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll(".d-icon-home").length === 1);
+      },
+    });
 
-  componentTest("mobile logo", {
-    template: '{{mount-widget widget="home-logo" args=args}}',
-    beforeEach() {
-      this.siteSettings.site_mobile_logo_url = mobileLogo;
-      this.siteSettings.site_logo_small_url = smallLogo;
-      this.site.mobileView = true;
-    },
+    componentTest("mobile logo", {
+      template: hbs`{{mount-widget widget="home-logo" args=args}}`,
+      beforeEach() {
+        this.siteSettings.site_mobile_logo_url = mobileLogo;
+        this.siteSettings.site_logo_small_url = smallLogo;
+        this.site.mobileView = true;
+      },
 
-    test(assert) {
-      assert.ok(queryAll("img#site-logo.logo-mobile").length === 1);
-      assert.equal(queryAll("#site-logo").attr("src"), mobileLogo);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll("img#site-logo.logo-mobile").length === 1);
+        assert.equal(queryAll("#site-logo").attr("src"), mobileLogo);
+      },
+    });
 
-  componentTest("mobile without logo", {
-    template: '{{mount-widget widget="home-logo" args=args}}',
-    beforeEach() {
-      this.siteSettings.site_logo_url = bigLogo;
-      this.site.mobileView = true;
-    },
+    componentTest("mobile without logo", {
+      template: hbs`{{mount-widget widget="home-logo" args=args}}`,
+      beforeEach() {
+        this.siteSettings.site_logo_url = bigLogo;
+        this.site.mobileView = true;
+      },
 
-    test(assert) {
-      assert.ok(queryAll("img#site-logo.logo-big").length === 1);
-      assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+        assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
+      },
+    });
 
-  componentTest("logo with dark mode alternative", {
-    template: '{{mount-widget widget="home-logo" args=args}}',
-    beforeEach() {
-      this.siteSettings.site_logo_url = bigLogo;
-      this.siteSettings.site_logo_dark_url = darkLogo;
-      Session.currentProp("darkModeAvailable", true);
-    },
-    afterEach() {
-      Session.currentProp("darkModeAvailable", null);
-    },
+    componentTest("logo with dark mode alternative", {
+      template: hbs`{{mount-widget widget="home-logo" args=args}}`,
+      beforeEach() {
+        this.siteSettings.site_logo_url = bigLogo;
+        this.siteSettings.site_logo_dark_url = darkLogo;
+        Session.currentProp("darkModeAvailable", true);
+      },
+      afterEach() {
+        Session.currentProp("darkModeAvailable", null);
+      },
 
-    test(assert) {
-      assert.ok(queryAll("img#site-logo.logo-big").length === 1);
-      assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
+      test(assert) {
+        assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+        assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
 
-      assert.equal(
-        queryAll("picture source").attr("media"),
-        prefersDark,
-        "includes dark mode media attribute"
-      );
-      assert.equal(
-        queryAll("picture source").attr("srcset"),
-        darkLogo,
-        "includes dark mode alternative logo source"
-      );
-    },
-  });
+        assert.equal(
+          queryAll("picture source").attr("media"),
+          prefersDark,
+          "includes dark mode media attribute"
+        );
+        assert.equal(
+          queryAll("picture source").attr("srcset"),
+          darkLogo,
+          "includes dark mode alternative logo source"
+        );
+      },
+    });
 
-  componentTest("mobile logo with dark mode alternative", {
-    template: '{{mount-widget widget="home-logo" args=args}}',
-    beforeEach() {
-      this.siteSettings.site_logo_url = bigLogo;
-      this.siteSettings.site_mobile_logo_url = mobileLogo;
-      this.siteSettings.site_mobile_logo_dark_url = darkLogo;
-      Session.currentProp("darkModeAvailable", true);
+    componentTest("mobile logo with dark mode alternative", {
+      template: hbs`{{mount-widget widget="home-logo" args=args}}`,
+      beforeEach() {
+        this.siteSettings.site_logo_url = bigLogo;
+        this.siteSettings.site_mobile_logo_url = mobileLogo;
+        this.siteSettings.site_mobile_logo_dark_url = darkLogo;
+        Session.currentProp("darkModeAvailable", true);
 
-      this.site.mobileView = true;
-    },
-    afterEach() {
-      Session.currentProp("darkModeAvailable", null);
-    },
+        this.site.mobileView = true;
+      },
+      afterEach() {
+        Session.currentProp("darkModeAvailable", null);
+      },
 
-    test(assert) {
-      assert.equal(queryAll("#site-logo").attr("src"), mobileLogo);
+      test(assert) {
+        assert.equal(queryAll("#site-logo").attr("src"), mobileLogo);
 
-      assert.equal(
-        queryAll("picture source").attr("media"),
-        prefersDark,
-        "includes dark mode media attribute"
-      );
-      assert.equal(
-        queryAll("picture source").attr("srcset"),
-        darkLogo,
-        "includes dark mode alternative logo source"
-      );
-    },
-  });
+        assert.equal(
+          queryAll("picture source").attr("media"),
+          prefersDark,
+          "includes dark mode media attribute"
+        );
+        assert.equal(
+          queryAll("picture source").attr("srcset"),
+          darkLogo,
+          "includes dark mode alternative logo source"
+        );
+      },
+    });
 
-  componentTest("dark mode enabled but no dark logo set", {
-    template: '{{mount-widget widget="home-logo" args=args}}',
-    beforeEach() {
-      this.siteSettings.site_logo_url = bigLogo;
-      this.siteSettings.site_logo_dark_url = "";
-      Session.currentProp("darkModeAvailable", true);
-    },
-    afterEach() {
-      Session.currentProp("darkModeAvailable", null);
-    },
+    componentTest("dark mode enabled but no dark logo set", {
+      template: hbs`{{mount-widget widget="home-logo" args=args}}`,
+      beforeEach() {
+        this.siteSettings.site_logo_url = bigLogo;
+        this.siteSettings.site_logo_dark_url = "";
+        Session.currentProp("darkModeAvailable", true);
+      },
+      afterEach() {
+        Session.currentProp("darkModeAvailable", null);
+      },
 
-    test(assert) {
-      assert.ok(queryAll("img#site-logo.logo-big").length === 1);
-      assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
-      assert.ok(
-        queryAll("picture").length === 0,
-        "does not include alternative logo"
-      );
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+        assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
+        assert.ok(
+          queryAll("picture").length === 0,
+          "does not include alternative logo"
+        );
+      },
+    });
 
-  componentTest("dark logo set but no dark mode", {
-    template: '{{mount-widget widget="home-logo" args=args}}',
-    beforeEach() {
-      this.siteSettings.site_logo_url = bigLogo;
-      this.siteSettings.site_logo_dark_url = darkLogo;
-    },
+    componentTest("dark logo set but no dark mode", {
+      template: hbs`{{mount-widget widget="home-logo" args=args}}`,
+      beforeEach() {
+        this.siteSettings.site_logo_url = bigLogo;
+        this.siteSettings.site_logo_dark_url = darkLogo;
+      },
 
-    test(assert) {
-      assert.ok(queryAll("img#site-logo.logo-big").length === 1);
-      assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
-      assert.ok(
-        queryAll("picture").length === 0,
-        "does not include alternative logo"
-      );
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+        assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
+        assert.ok(
+          queryAll("picture").length === 0,
+          "does not include alternative logo"
+        );
+      },
+    });
 
-  componentTest("dark color scheme and dark logo set", {
-    template: '{{mount-widget widget="home-logo" args=args}}',
-    beforeEach() {
-      this.siteSettings.site_logo_url = bigLogo;
-      this.siteSettings.site_logo_dark_url = darkLogo;
-      Session.currentProp("defaultColorSchemeIsDark", true);
-    },
-    afterEach() {
-      Session.currentProp("defaultColorSchemeIsDark", null);
-    },
-    test(assert) {
-      assert.ok(queryAll("img#site-logo.logo-big").length === 1);
-      assert.equal(
-        queryAll("#site-logo").attr("src"),
-        darkLogo,
-        "uses dark logo"
-      );
-      assert.ok(
-        queryAll("picture").length === 0,
-        "does not add dark mode alternative"
-      );
-    },
-  });
+    componentTest("dark color scheme and dark logo set", {
+      template: hbs`{{mount-widget widget="home-logo" args=args}}`,
+      beforeEach() {
+        this.siteSettings.site_logo_url = bigLogo;
+        this.siteSettings.site_logo_dark_url = darkLogo;
+        Session.currentProp("defaultColorSchemeIsDark", true);
+      },
+      afterEach() {
+        Session.currentProp("defaultColorSchemeIsDark", null);
+      },
+      test(assert) {
+        assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+        assert.equal(
+          queryAll("#site-logo").attr("src"),
+          darkLogo,
+          "uses dark logo"
+        );
+        assert.ok(
+          queryAll("picture").length === 0,
+          "does not add dark mode alternative"
+        );
+      },
+    });
 
-  componentTest("dark color scheme and dark logo not set", {
-    template: '{{mount-widget widget="home-logo" args=args}}',
-    beforeEach() {
-      this.siteSettings.site_logo_url = bigLogo;
-      this.siteSettings.site_logo_dark_url = "";
-      Session.currentProp("defaultColorSchemeIsDark", true);
-    },
-    afterEach() {
-      Session.currentProp("defaultColorSchemeIsDark", null);
-    },
-    test(assert) {
-      assert.ok(queryAll("img#site-logo.logo-big").length === 1);
-      assert.equal(
-        queryAll("#site-logo").attr("src"),
-        bigLogo,
-        "uses regular logo on dark scheme if no dark logo"
-      );
-    },
-  });
-});
+    componentTest("dark color scheme and dark logo not set", {
+      template: hbs`{{mount-widget widget="home-logo" args=args}}`,
+      beforeEach() {
+        this.siteSettings.site_logo_url = bigLogo;
+        this.siteSettings.site_logo_dark_url = "";
+        Session.currentProp("defaultColorSchemeIsDark", true);
+      },
+      afterEach() {
+        Session.currentProp("defaultColorSchemeIsDark", null);
+      },
+      test(assert) {
+        assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+        assert.equal(
+          queryAll("#site-logo").attr("src"),
+          bigLogo,
+          "uses regular logo on dark scheme if no dark logo"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/post-links-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/post-links-test.js
index 43510cf083..614ff999b9 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/post-links-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/post-links-test.js
@@ -1,65 +1,98 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
 import { click } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
 
-discourseModule("Integration | Component | Widget | post-links", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | Widget | post-links",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("duplicate links", {
-    template: '{{mount-widget widget="post-links" args=args}}',
-    beforeEach() {
-      this.set("args", {
-        id: 2,
-        links: [
-          {
-            title: "Evil Trout Link",
-            url: "http://eviltrout.com",
-            reflection: true,
-          },
-          {
-            title: "Evil Trout Link",
-            url: "http://dupe.eviltrout.com",
-            reflection: true,
-          },
-        ],
-      });
-    },
-    test(assert) {
-      assert.equal(
-        queryAll(".post-links a.track-link").length,
-        1,
-        "it hides the dupe link"
-      );
-    },
-  });
+    componentTest("duplicate links", {
+      template: hbs`{{mount-widget widget="post-links" args=args}}`,
+      beforeEach() {
+        this.set("args", {
+          id: 2,
+          links: [
+            {
+              title: "Evil Trout Link",
+              url: "http://eviltrout.com",
+              reflection: true,
+            },
+            {
+              title: "Evil Trout Link",
+              url: "http://dupe.eviltrout.com",
+              reflection: true,
+            },
+          ],
+        });
+      },
+      test(assert) {
+        assert.equal(
+          queryAll(".post-links a.track-link").length,
+          1,
+          "it hides the dupe link"
+        );
+      },
+    });
 
-  componentTest("collapsed links", {
-    template: '{{mount-widget widget="post-links" args=args}}',
-    beforeEach() {
-      this.set("args", {
-        id: 1,
-        links: [
-          { title: "Link 1", url: "http://eviltrout.com?1", reflection: true },
-          { title: "Link 2", url: "http://eviltrout.com?2", reflection: true },
-          { title: "Link 3", url: "http://eviltrout.com?3", reflection: true },
-          { title: "Link 4", url: "http://eviltrout.com?4", reflection: true },
-          { title: "Link 5", url: "http://eviltrout.com?5", reflection: true },
-          { title: "Link 6", url: "http://eviltrout.com?6", reflection: true },
-          { title: "Link 7", url: "http://eviltrout.com?7", reflection: true },
-        ],
-      });
-    },
-    async test(assert) {
-      assert.ok(queryAll(".expand-links").length === 1, "collapsed by default");
-      await click("a.expand-links");
-      assert.equal(queryAll(".post-links a.track-link").length, 7);
-    },
-  });
-});
+    componentTest("collapsed links", {
+      template: hbs`{{mount-widget widget="post-links" args=args}}`,
+      beforeEach() {
+        this.set("args", {
+          id: 1,
+          links: [
+            {
+              title: "Link 1",
+              url: "http://eviltrout.com?1",
+              reflection: true,
+            },
+            {
+              title: "Link 2",
+              url: "http://eviltrout.com?2",
+              reflection: true,
+            },
+            {
+              title: "Link 3",
+              url: "http://eviltrout.com?3",
+              reflection: true,
+            },
+            {
+              title: "Link 4",
+              url: "http://eviltrout.com?4",
+              reflection: true,
+            },
+            {
+              title: "Link 5",
+              url: "http://eviltrout.com?5",
+              reflection: true,
+            },
+            {
+              title: "Link 6",
+              url: "http://eviltrout.com?6",
+              reflection: true,
+            },
+            {
+              title: "Link 7",
+              url: "http://eviltrout.com?7",
+              reflection: true,
+            },
+          ],
+        });
+      },
+      async test(assert) {
+        assert.ok(
+          queryAll(".expand-links").length === 1,
+          "collapsed by default"
+        );
+        await click("a.expand-links");
+        assert.equal(queryAll(".post-links a.track-link").length, 7);
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/post-menu-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/post-menu-test.js
index 2bf649baeb..1e79fae7ca 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/post-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/post-menu-test.js
@@ -1,54 +1,56 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
 import { withPluginApi } from "discourse/lib/plugin-api";
 
-discourseModule("Integration | Component | Widget | post-menu", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | Widget | post-menu",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("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",
-          };
+    componentTest("add extra button", {
+      template: hbs`{{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(
-        queryAll(".actions .extra-buttons .hot-coffee").length === 1,
-        "It renders extra button"
-      );
-    },
-  });
+      },
+      async test(assert) {
+        assert.ok(
+          queryAll(".actions .extra-buttons .hot-coffee").length === 1,
+          "It renders extra button"
+        );
+      },
+    });
 
-  componentTest("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(
-        queryAll(".actions .extra-buttons .hot-coffee").length === 0,
-        "It doesn't removes coffee button"
-      );
-    },
-  });
-});
+    componentTest("remove extra button", {
+      template: hbs`{{mount-widget widget="post-menu" args=args}}`,
+      beforeEach() {
+        this.set("args", {});
+        withPluginApi("0.8", (api) => {
+          api.removePostMenuButton("coffee");
+        });
+      },
+      async test(assert) {
+        assert.ok(
+          queryAll(".actions .extra-buttons .hot-coffee").length === 0,
+          "It doesn't removes coffee button"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/post-stream-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/post-stream-test.js
index 69063f7d2e..b4118cccb4 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/post-stream-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/post-stream-test.js
@@ -1,16 +1,17 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
-import Topic from "discourse/models/topic";
 import Post from "discourse/models/post";
+import Topic from "discourse/models/topic";
+import hbs from "htmlbars-inline-precompile";
 
 function postStreamTest(name, attrs) {
   componentTest(name, {
-    template: `{{mount-widget widget="post-stream" args=(hash posts=posts)}}`,
+    template: hbs`{{mount-widget widget="post-stream" args=(hash posts=posts)}}`,
     beforeEach() {
       const site = this.container.lookup("site:main");
       let posts = attrs.posts.call(this);
@@ -21,136 +22,137 @@ function postStreamTest(name, attrs) {
   });
 }
 
-discourseModule("Integration | Component | Widget | post-stream", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | Widget | post-stream",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  postStreamTest("basics", {
-    posts() {
-      const site = this.container.lookup("site:main");
-      const topic = Topic.create();
-      topic.set("details.created_by", { id: 123 });
-      return [
-        Post.create({
-          topic,
-          id: 1,
-          post_number: 1,
-          user_id: 123,
-          primary_group_name: "trout",
-          avatar_template: "/images/avatar.png",
-        }),
-        Post.create({
-          topic,
-          id: 2,
-          post_number: 2,
-          post_type: site.get("post_types.moderator_action"),
-        }),
-        Post.create({ topic, id: 3, post_number: 3, hidden: true }),
-        Post.create({
-          topic,
-          id: 4,
-          post_number: 4,
-          post_type: site.get("post_types.whisper"),
-        }),
-        Post.create({
-          topic,
-          id: 5,
-          post_number: 5,
-          wiki: true,
-          via_email: true,
-        }),
-        Post.create({
-          topic,
-          id: 6,
-          post_number: 6,
-          via_email: true,
-          is_auto_generated: true,
-        }),
-      ];
-    },
+    postStreamTest("basics", {
+      posts() {
+        const site = this.container.lookup("site:main");
+        const topic = Topic.create();
+        topic.set("details.created_by", { id: 123 });
+        return [
+          Post.create({
+            topic,
+            id: 1,
+            post_number: 1,
+            user_id: 123,
+            primary_group_name: "trout",
+            avatar_template: "/images/avatar.png",
+          }),
+          Post.create({
+            topic,
+            id: 2,
+            post_number: 2,
+            post_type: site.get("post_types.moderator_action"),
+          }),
+          Post.create({ topic, id: 3, post_number: 3, hidden: true }),
+          Post.create({
+            topic,
+            id: 4,
+            post_number: 4,
+            post_type: site.get("post_types.whisper"),
+          }),
+          Post.create({
+            topic,
+            id: 5,
+            post_number: 5,
+            wiki: true,
+            via_email: true,
+          }),
+          Post.create({
+            topic,
+            id: 6,
+            post_number: 6,
+            via_email: true,
+            is_auto_generated: true,
+          }),
+        ];
+      },
 
-    test(assert) {
-      assert.equal(queryAll(".post-stream").length, 1);
-      assert.equal(queryAll(".topic-post").length, 6, "renders all posts");
+      test(assert) {
+        assert.equal(queryAll(".post-stream").length, 1);
+        assert.equal(queryAll(".topic-post").length, 6, "renders all posts");
 
-      // look for special class bindings
-      assert.equal(
-        queryAll(".topic-post:nth-of-type(1).topic-owner").length,
-        1,
-        "it applies the topic owner class"
-      );
-      assert.equal(
-        queryAll(".topic-post:nth-of-type(1).group-trout").length,
-        1,
-        "it applies the primary group class"
-      );
-      assert.equal(
-        queryAll(".topic-post:nth-of-type(1).regular").length,
-        1,
-        "it applies the regular class"
-      );
-      assert.equal(
-        queryAll(".topic-post:nth-of-type(2).moderator").length,
-        1,
-        "it applies the moderator class"
-      );
-      assert.equal(
-        queryAll(".topic-post:nth-of-type(3).post-hidden").length,
-        1,
-        "it applies the hidden class"
-      );
-      assert.equal(
-        queryAll(".topic-post:nth-of-type(4).whisper").length,
-        1,
-        "it applies the whisper class"
-      );
-      assert.equal(
-        queryAll(".topic-post:nth-of-type(5).wiki").length,
-        1,
-        "it applies the wiki class"
-      );
+        // look for special class bindings
+        assert.equal(
+          queryAll(".topic-post:nth-of-type(1).topic-owner").length,
+          1,
+          "it applies the topic owner class"
+        );
+        assert.equal(
+          queryAll(".topic-post:nth-of-type(1).group-trout").length,
+          1,
+          "it applies the primary group class"
+        );
+        assert.equal(
+          queryAll(".topic-post:nth-of-type(1).regular").length,
+          1,
+          "it applies the regular class"
+        );
+        assert.equal(
+          queryAll(".topic-post:nth-of-type(2).moderator").length,
+          1,
+          "it applies the moderator class"
+        );
+        assert.equal(
+          queryAll(".topic-post:nth-of-type(3).post-hidden").length,
+          1,
+          "it applies the hidden class"
+        );
+        assert.equal(
+          queryAll(".topic-post:nth-of-type(4).whisper").length,
+          1,
+          "it applies the whisper class"
+        );
+        assert.equal(
+          queryAll(".topic-post:nth-of-type(5).wiki").length,
+          1,
+          "it applies the wiki class"
+        );
 
-      // it renders an article for the body with appropriate attributes
-      assert.equal(queryAll("article#post_2").length, 1);
-      assert.equal(queryAll('article[data-user-id="123"]').length, 1);
-      assert.equal(queryAll('article[data-post-id="3"]').length, 1);
-      assert.equal(queryAll("article#post_5.via-email").length, 1);
-      assert.equal(queryAll("article#post_6.is-auto-generated").length, 1);
+        // it renders an article for the body with appropriate attributes
+        assert.equal(queryAll("article#post_2").length, 1);
+        assert.equal(queryAll('article[data-user-id="123"]').length, 1);
+        assert.equal(queryAll('article[data-post-id="3"]').length, 1);
+        assert.equal(queryAll("article#post_5.via-email").length, 1);
+        assert.equal(queryAll("article#post_6.is-auto-generated").length, 1);
 
-      assert.equal(
-        queryAll("article:nth-of-type(1) .main-avatar").length,
-        1,
-        "renders the main avatar"
-      );
-    },
-  });
+        assert.equal(
+          queryAll("article:nth-of-type(1) .main-avatar").length,
+          1,
+          "renders the main avatar"
+        );
+      },
+    });
 
-  postStreamTest("deleted posts", {
-    posts() {
-      const topic = Topic.create();
-      topic.set("details.created_by", { id: 123 });
-      return [
-        Post.create({
-          topic,
-          id: 1,
-          post_number: 1,
-          deleted_at: new Date().toString(),
-        }),
-      ];
-    },
+    postStreamTest("deleted posts", {
+      posts() {
+        const topic = Topic.create();
+        topic.set("details.created_by", { id: 123 });
+        return [
+          Post.create({
+            topic,
+            id: 1,
+            post_number: 1,
+            deleted_at: new Date().toString(),
+          }),
+        ];
+      },
 
-    test(assert) {
-      assert.equal(
-        queryAll(".topic-post.deleted").length,
-        1,
-        "it applies the deleted class"
-      );
-      assert.equal(
-        queryAll(".deleted-user-avatar").length,
-        1,
-        "it has the trash avatar"
-      );
-    },
-  });
-});
+      test(assert) {
+        assert.equal(
+          queryAll(".topic-post.deleted").length,
+          1,
+          "it applies the deleted class"
+        );
+        assert.equal(
+          queryAll(".deleted-user-avatar").length,
+          1,
+          "it has the trash avatar"
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/post-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/post-test.js
index 4bd114a1c4..708c59101d 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/post-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/post-test.js
@@ -1,19 +1,20 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
-import I18n from "I18n";
 import EmberObject from "@ember/object";
+import I18n from "I18n";
 import { click } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule("Integration | Component | Widget | post", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("basic elements", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { shareUrl: "/example", post_number: 1 });
     },
@@ -27,7 +28,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("post - links", {
-    template: '{{mount-widget widget="post-contents" args=args}}',
+    template: hbs`{{mount-widget widget="post-contents" args=args}}`,
     beforeEach() {
       this.set("args", {
         cooked:
@@ -45,11 +46,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("wiki", {
-    template:
-      '{{mount-widget widget="post" args=args showHistory=(action "showHistory")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args showHistory=showHistory}}
+    `,
     beforeEach() {
       this.set("args", { wiki: true, version: 2, canViewEditHistory: true });
-      this.on("showHistory", () => (this.historyShown = true));
+      this.set("showHistory", () => (this.historyShown = true));
     },
     async test(assert) {
       await click(".post-info .wiki");
@@ -61,11 +63,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("wiki without revision", {
-    template:
-      '{{mount-widget widget="post" args=args editPost=(action "editPost")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args editPost=editPost}}
+    `,
     beforeEach() {
       this.set("args", { wiki: true, version: 1, canViewEditHistory: true });
-      this.on("editPost", () => (this.editPostCalled = true));
+      this.set("editPost", () => (this.editPostCalled = true));
     },
     async test(assert) {
       await click(".post-info .wiki");
@@ -74,11 +77,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("via-email", {
-    template:
-      '{{mount-widget widget="post" args=args showRawEmail=(action "showRawEmail")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args showRawEmail=showRawEmail}}
+    `,
     beforeEach() {
       this.set("args", { via_email: true, canViewRawEmail: true });
-      this.on("showRawEmail", () => (this.rawEmailShown = true));
+      this.set("showRawEmail", () => (this.rawEmailShown = true));
     },
     async test(assert) {
       await click(".post-info.via-email");
@@ -90,11 +94,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("via-email without permission", {
-    template:
-      '{{mount-widget widget="post" args=args showRawEmail=(action "showRawEmail")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args showRawEmail=showRawEmail}}
+    `,
     beforeEach() {
       this.set("args", { via_email: true, canViewRawEmail: false });
-      this.on("showRawEmail", () => (this.rawEmailShown = true));
+      this.set("showRawEmail", () => (this.rawEmailShown = true));
     },
     async test(assert) {
       await click(".post-info.via-email");
@@ -106,24 +111,26 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("history", {
-    template:
-      '{{mount-widget widget="post" args=args showHistory=(action "showHistory")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args showHistory=showHistory}}
+    `,
     beforeEach() {
       this.set("args", { version: 3, canViewEditHistory: true });
-      this.on("showHistory", () => (this.historyShown = true));
+      this.set("showHistory", () => (this.historyShown = true));
     },
     async test(assert) {
-      await click(".post-info.edits");
+      await click(".post-info.edits button");
       assert.ok(this.historyShown, "clicking the pencil shows the history");
     },
   });
 
   componentTest("history without view permission", {
-    template:
-      '{{mount-widget widget="post" args=args showHistory=(action "showHistory")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args showHistory=showHistory}}
+    `,
     beforeEach() {
       this.set("args", { version: 3, canViewEditHistory: false });
-      this.on("showHistory", () => (this.historyShown = true));
+      this.set("showHistory", () => (this.historyShown = true));
     },
     async test(assert) {
       await click(".post-info.edits");
@@ -135,7 +142,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("whisper", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { isWhisper: true });
     },
@@ -146,7 +153,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("like count button", {
-    template: '{{mount-widget widget="post" model=post args=args}}',
+    template: hbs`{{mount-widget widget="post" model=post args=args}}`,
     beforeEach(store) {
       const topic = store.createRecord("topic", { id: 123 });
       const post = store.createRecord("post", {
@@ -176,7 +183,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest(`like count with no likes`, {
-    template: '{{mount-widget widget="post" model=post args=args}}',
+    template: hbs`{{mount-widget widget="post" model=post args=args}}`,
     beforeEach() {
       this.set("args", { likeCount: 0 });
     },
@@ -186,7 +193,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("share button", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { shareUrl: "http://share-me.example.com" });
     },
@@ -199,12 +206,13 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("liking", {
-    template:
-      '{{mount-widget widget="post-menu" args=args toggleLike=(action "toggleLike")}}',
+    template: hbs`
+      {{mount-widget widget="post-menu" args=args toggleLike=toggleLike}}
+    `,
     beforeEach() {
       const args = { showLike: true, canToggleLike: true };
       this.set("args", args);
-      this.on("toggleLike", () => {
+      this.set("toggleLike", () => {
         args.liked = !args.liked;
         args.likeCount = args.liked ? 1 : 0;
       });
@@ -226,13 +234,14 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("anon liking", {
-    template:
-      '{{mount-widget widget="post-menu" args=args showLogin=(action "showLogin")}}',
+    template: hbs`
+      {{mount-widget widget="post-menu" args=args showLogin=showLogin}}
+    `,
     anonymous: true,
     beforeEach() {
       const args = { showLike: true };
       this.set("args", args);
-      this.on("showLogin", () => (this.loginShown = true));
+      this.set("showLogin", () => (this.loginShown = true));
     },
     async test(assert) {
       assert.ok(!!queryAll(".actions button.like").length);
@@ -250,11 +259,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("edit button", {
-    template:
-      '{{mount-widget widget="post" args=args editPost=(action "editPost")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args editPost=editPost}}
+    `,
     beforeEach() {
       this.set("args", { canEdit: true });
-      this.on("editPost", () => (this.editPostCalled = true));
+      this.set("editPost", () => (this.editPostCalled = true));
     },
     async test(assert) {
       await click("button.edit");
@@ -263,7 +273,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest(`edit button - can't edit`, {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { canEdit: false });
     },
@@ -277,11 +287,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("recover button", {
-    template:
-      '{{mount-widget widget="post" args=args deletePost=(action "deletePost")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args deletePost=deletePost}}
+    `,
     beforeEach() {
       this.set("args", { canDelete: true });
-      this.on("deletePost", () => (this.deletePostCalled = true));
+      this.set("deletePost", () => (this.deletePostCalled = true));
     },
     async test(assert) {
       await click("button.delete");
@@ -290,11 +301,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("delete topic button", {
-    template:
-      '{{mount-widget widget="post" args=args deletePost=(action "deletePost")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args deletePost=deletePost}}
+    `,
     beforeEach() {
       this.set("args", { canDeleteTopic: true });
-      this.on("deletePost", () => (this.deletePostCalled = true));
+      this.set("deletePost", () => (this.deletePostCalled = true));
     },
     async test(assert) {
       await click("button.delete");
@@ -303,7 +315,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest(`delete topic button - can't delete`, {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { canDeleteTopic: false });
     },
@@ -319,7 +331,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   componentTest(
     `delete topic button - can't delete when topic author without permission`,
     {
-      template: '{{mount-widget widget="post" args=args}}',
+      template: hbs`{{mount-widget widget="post" args=args}}`,
       beforeEach() {
         this.set("args", {
           canDeleteTopic: false,
@@ -351,11 +363,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   );
 
   componentTest("recover topic button", {
-    template:
-      '{{mount-widget widget="post" args=args recoverPost=(action "recoverPost")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args recoverPost=recoverPost}}
+    `,
     beforeEach() {
       this.set("args", { canRecoverTopic: true });
-      this.on("recoverPost", () => (this.recovered = true));
+      this.set("recoverPost", () => (this.recovered = true));
     },
     async test(assert) {
       await click("button.recover");
@@ -364,7 +377,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest(`recover topic button - can't recover`, {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { canRecoverTopic: false });
     },
@@ -378,11 +391,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("delete post button", {
-    template:
-      '{{mount-widget widget="post" args=args deletePost=(action "deletePost")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args deletePost=deletePost}}
+    `,
     beforeEach() {
       this.set("args", { canDelete: true, canFlag: true });
-      this.on("deletePost", () => (this.deletePostCalled = true));
+      this.set("deletePost", () => (this.deletePostCalled = true));
     },
     async test(assert) {
       await click(".show-more-actions");
@@ -392,7 +406,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest(`delete post button - can't delete`, {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { canDelete: false });
     },
@@ -406,7 +420,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest(`delete post button - can't delete, can't flag`, {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", {
         canDeleteTopic: false,
@@ -429,11 +443,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("recover post button", {
-    template:
-      '{{mount-widget widget="post" args=args recoverPost=(action "recoverPost")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args recoverPost=recoverPost}}
+    `,
     beforeEach() {
       this.set("args", { canRecover: true });
-      this.on("recoverPost", () => (this.recovered = true));
+      this.set("recoverPost", () => (this.recovered = true));
     },
     async test(assert) {
       await click("button.recover");
@@ -442,7 +457,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest(`recover post button - can't recover`, {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { canRecover: false });
     },
@@ -456,11 +471,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest(`flagging`, {
-    template:
-      '{{mount-widget widget="post" args=args showFlags=(action "showFlags")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args showFlags=showFlags}}
+    `,
     beforeEach() {
       this.set("args", { canFlag: true });
-      this.on("showFlags", () => (this.flagsShown = true));
+      this.set("showFlags", () => (this.flagsShown = true));
     },
     async test(assert) {
       assert.ok(queryAll("button.create-flag").length === 1);
@@ -471,7 +487,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest(`flagging: can't flag`, {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { canFlag: false });
     },
@@ -481,7 +497,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest(`flagging: can't flag when post is hidden`, {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { canFlag: true, hidden: true });
     },
@@ -491,7 +507,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest(`read indicator`, {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { read: true });
     },
@@ -501,7 +517,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest(`unread indicator`, {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { read: false });
     },
@@ -511,7 +527,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("reply directly above (supressed)", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", {
         replyToUsername: "eviltrout",
@@ -530,7 +546,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("reply a few posts above (supressed)", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", {
         replyToUsername: "eviltrout",
@@ -545,7 +561,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("reply directly above", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", {
         replyToUsername: "eviltrout",
@@ -566,11 +582,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("cooked content hidden", {
-    template:
-      '{{mount-widget widget="post" args=args expandHidden=(action "expandHidden")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args expandHidden=expandHidden}}
+    `,
     beforeEach() {
       this.set("args", { cooked_hidden: true });
-      this.on("expandHidden", () => (this.unhidden = true));
+      this.set("expandHidden", () => (this.unhidden = true));
     },
     async test(assert) {
       await click(".topic-body .expand-hidden");
@@ -579,7 +596,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("expand first post", {
-    template: '{{mount-widget widget="post" model=post args=args}}',
+    template: hbs`{{mount-widget widget="post" model=post args=args}}`,
     beforeEach(store) {
       this.set("args", { expandablePost: true });
       this.set("post", store.createRecord("post", { id: 1234 }));
@@ -591,7 +608,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("can't bookmark", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { canBookmark: false });
     },
@@ -602,13 +619,14 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("bookmark", {
-    template:
-      '{{mount-widget widget="post" args=args toggleBookmark=(action "toggleBookmark")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args toggleBookmark=toggleBookmark}}
+    `,
     beforeEach() {
       const args = { canBookmark: true };
 
       this.set("args", args);
-      this.on("toggleBookmark", () => (args.bookmarked = true));
+      this.set("toggleBookmark", () => (args.bookmarked = true));
     },
     async test(assert) {
       assert.equal(queryAll(".post-menu-area .bookmark").length, 1);
@@ -617,7 +635,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("can't show admin menu when you can't manage", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { canManage: false });
     },
@@ -627,7 +645,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("show admin menu", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { canManage: true });
     },
@@ -649,12 +667,13 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("toggle moderator post", {
-    template:
-      '{{mount-widget widget="post" args=args togglePostType=(action "togglePostType")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args togglePostType=togglePostType}}
+    `,
     beforeEach() {
       this.currentUser.set("moderator", true);
       this.set("args", { canManage: true });
-      this.on("togglePostType", () => (this.toggled = true));
+      this.set("togglePostType", () => (this.toggled = true));
     },
     async test(assert) {
       await click(".post-menu-area .show-post-admin-menu");
@@ -669,12 +688,13 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
     },
   });
   componentTest("toggle moderator post", {
-    template:
-      '{{mount-widget widget="post" args=args togglePostType=(action "togglePostType")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args togglePostType=togglePostType}}
+    `,
     beforeEach() {
       this.currentUser.set("moderator", true);
       this.set("args", { canManage: true });
-      this.on("togglePostType", () => (this.toggled = true));
+      this.set("togglePostType", () => (this.toggled = true));
     },
     async test(assert) {
       await click(".post-menu-area .show-post-admin-menu");
@@ -690,11 +710,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("rebake post", {
-    template:
-      '{{mount-widget widget="post" args=args rebakePost=(action "rebakePost")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args rebakePost=rebakePost}}
+    `,
     beforeEach() {
       this.set("args", { canManage: true });
-      this.on("rebakePost", () => (this.baked = true));
+      this.set("rebakePost", () => (this.baked = true));
     },
     async test(assert) {
       await click(".post-menu-area .show-post-admin-menu");
@@ -709,11 +730,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("unhide post", {
-    template:
-      '{{mount-widget widget="post" args=args unhidePost=(action "unhidePost")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args unhidePost=unhidePost}}
+    `,
     beforeEach() {
       this.set("args", { canManage: true, hidden: true });
-      this.on("unhidePost", () => (this.unhidden = true));
+      this.set("unhidePost", () => (this.unhidden = true));
     },
     async test(assert) {
       await click(".post-menu-area .show-post-admin-menu");
@@ -728,12 +750,13 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("change owner", {
-    template:
-      '{{mount-widget widget="post" args=args changePostOwner=(action "changePostOwner")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args changePostOwner=changePostOwner}}
+    `,
     beforeEach() {
       this.currentUser.admin = true;
       this.set("args", { canManage: true });
-      this.on("changePostOwner", () => (this.owned = true));
+      this.set("changePostOwner", () => (this.owned = true));
     },
     async test(assert) {
       await click(".post-menu-area .show-post-admin-menu");
@@ -748,11 +771,12 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("reply", {
-    template:
-      '{{mount-widget widget="post" args=args replyToPost=(action "replyToPost")}}',
+    template: hbs`
+      {{mount-widget widget="post" args=args replyToPost=replyToPost}}
+    `,
     beforeEach() {
       this.set("args", { canCreatePost: true });
-      this.on("replyToPost", () => (this.replied = true));
+      this.set("replyToPost", () => (this.replied = true));
     },
     async test(assert) {
       await click(".post-controls .create");
@@ -761,7 +785,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("reply - without permissions", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { canCreatePost: false });
     },
@@ -771,7 +795,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("replies - no replies", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { replyCount: 0 });
     },
@@ -781,7 +805,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("replies - multiple replies", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.siteSettings.suppress_reply_directly_below = true;
       this.set("args", { replyCount: 2, replyDirectlyBelow: true });
@@ -792,7 +816,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("replies - one below, suppressed", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.siteSettings.suppress_reply_directly_below = true;
       this.set("args", { replyCount: 1, replyDirectlyBelow: true });
@@ -803,7 +827,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("replies - one below, not suppressed", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.siteSettings.suppress_reply_directly_below = false;
       this.set("args", { id: 6654, replyCount: 1, replyDirectlyBelow: true });
@@ -819,7 +843,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("topic map not shown", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { showTopicMap: false });
     },
@@ -829,7 +853,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("topic map - few posts", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", {
         showTopicMap: true,
@@ -854,7 +878,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("topic map - participants", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", {
         showTopicMap: true,
@@ -887,7 +911,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("topic map - links", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", {
         showTopicMap: true,
@@ -926,7 +950,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("topic map - no summary", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", { showTopicMap: true });
     },
@@ -936,11 +960,10 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("topic map - has summary", {
-    template:
-      '{{mount-widget widget="post" args=args toggleSummary=(action "toggleSummary")}}',
+    template: hbs`{{mount-widget widget="post" args=args showSummary=showSummary}}`,
     beforeEach() {
       this.set("args", { showTopicMap: true, hasTopicSummary: true });
-      this.on("toggleSummary", () => (this.summaryToggled = true));
+      this.set("showSummary", () => (this.summaryToggled = true));
     },
     async test(assert) {
       assert.equal(queryAll(".toggle-summary").length, 1);
@@ -951,7 +974,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("pm map", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", {
         showTopicMap: true,
@@ -967,7 +990,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("post notice - with username", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       const twoDaysAgo = new Date();
       twoDaysAgo.setDate(twoDaysAgo.getDate() - 2);
@@ -996,7 +1019,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("post notice - with name", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.siteSettings.display_name_on_posts = true;
       this.siteSettings.prioritize_username_in_ux = false;
@@ -1017,7 +1040,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
   });
 
   componentTest("show group request in post", {
-    template: '{{mount-widget widget="post" args=args}}',
+    template: hbs`{{mount-widget widget="post" args=args}}`,
     beforeEach() {
       this.set("args", {
         username: "foo",
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/poster-name-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/poster-name-test.js
index 6c44623884..b4f685b2e6 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/poster-name-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/poster-name-test.js
@@ -1,79 +1,81 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
 
-discourseModule("Integration | Component | Widget | poster-name", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | Widget | poster-name",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("basic rendering", {
-    template: '{{mount-widget widget="poster-name" args=args}}',
-    beforeEach() {
-      this.set("args", {
-        username: "eviltrout",
-        usernameUrl: "/u/eviltrout",
-        name: "Robin Ward",
-        user_title: "Trout Master",
-      });
-    },
-    test(assert) {
-      assert.ok(queryAll(".names").length);
-      assert.ok(queryAll("span.username").length);
-      assert.ok(queryAll('a[data-user-card="eviltrout"]').length);
-      assert.equal(queryAll(".username a").text(), "eviltrout");
-      assert.equal(queryAll(".full-name a").text(), "Robin Ward");
-      assert.equal(queryAll(".user-title").text(), "Trout Master");
-    },
-  });
+    componentTest("basic rendering", {
+      template: hbs`{{mount-widget widget="poster-name" args=args}}`,
+      beforeEach() {
+        this.set("args", {
+          username: "eviltrout",
+          usernameUrl: "/u/eviltrout",
+          name: "Robin Ward",
+          user_title: "Trout Master",
+        });
+      },
+      test(assert) {
+        assert.ok(queryAll(".names").length);
+        assert.ok(queryAll("span.username").length);
+        assert.ok(queryAll('a[data-user-card="eviltrout"]').length);
+        assert.equal(queryAll(".username a").text(), "eviltrout");
+        assert.equal(queryAll(".full-name a").text(), "Robin Ward");
+        assert.equal(queryAll(".user-title").text(), "Trout Master");
+      },
+    });
 
-  componentTest("extra classes and glyphs", {
-    template: '{{mount-widget widget="poster-name" args=args}}',
-    beforeEach() {
-      this.set("args", {
-        username: "eviltrout",
-        usernameUrl: "/u/eviltrout",
-        staff: true,
-        admin: true,
-        moderator: true,
-        new_user: true,
-        primary_group_name: "fish",
-      });
-    },
-    test(assert) {
-      assert.ok(queryAll("span.staff").length);
-      assert.ok(queryAll("span.admin").length);
-      assert.ok(queryAll("span.moderator").length);
-      assert.ok(queryAll(".d-icon-shield-alt").length);
-      assert.ok(queryAll("span.new-user").length);
-      assert.ok(queryAll("span.fish").length);
-    },
-  });
+    componentTest("extra classes and glyphs", {
+      template: hbs`{{mount-widget widget="poster-name" args=args}}`,
+      beforeEach() {
+        this.set("args", {
+          username: "eviltrout",
+          usernameUrl: "/u/eviltrout",
+          staff: true,
+          admin: true,
+          moderator: true,
+          new_user: true,
+          primary_group_name: "fish",
+        });
+      },
+      test(assert) {
+        assert.ok(queryAll("span.staff").length);
+        assert.ok(queryAll("span.admin").length);
+        assert.ok(queryAll("span.moderator").length);
+        assert.ok(queryAll(".d-icon-shield-alt").length);
+        assert.ok(queryAll("span.new-user").length);
+        assert.ok(queryAll("span.fish").length);
+      },
+    });
 
-  componentTest("disable display name on posts", {
-    template: '{{mount-widget widget="poster-name" args=args}}',
-    beforeEach() {
-      this.siteSettings.display_name_on_posts = false;
-      this.set("args", { username: "eviltrout", name: "Robin Ward" });
-    },
-    test(assert) {
-      assert.equal(queryAll(".full-name").length, 0);
-    },
-  });
+    componentTest("disable display name on posts", {
+      template: hbs`{{mount-widget widget="poster-name" args=args}}`,
+      beforeEach() {
+        this.siteSettings.display_name_on_posts = false;
+        this.set("args", { username: "eviltrout", name: "Robin Ward" });
+      },
+      test(assert) {
+        assert.equal(queryAll(".full-name").length, 0);
+      },
+    });
 
-  componentTest("doesn't render a name if it's similar to the username", {
-    template: '{{mount-widget widget="poster-name" args=args}}',
-    beforeEach() {
-      this.siteSettings.prioritize_username_in_ux = true;
-      this.siteSettings.display_name_on_posts = true;
-      this.set("args", { username: "eviltrout", name: "evil-trout" });
-    },
-    test(assert) {
-      assert.equal(queryAll(".second").length, 0);
-    },
-  });
-});
+    componentTest("doesn't render a name if it's similar to the username", {
+      template: hbs`{{mount-widget widget="poster-name" args=args}}`,
+      beforeEach() {
+        this.siteSettings.prioritize_username_in_ux = true;
+        this.siteSettings.display_name_on_posts = true;
+        this.set("args", { username: "eviltrout", name: "evil-trout" });
+      },
+      test(assert) {
+        assert.equal(queryAll(".second").length, 0);
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/quick-access-item-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/quick-access-item-test.js
index 5834b2cb27..0c3f898556 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/quick-access-item-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/quick-access-item-test.js
@@ -1,10 +1,11 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
 
 const CONTENT_DIV_SELECTOR = "li > a > div";
 
@@ -14,7 +15,7 @@ discourseModule(
     setupRenderingTest(hooks);
 
     componentTest("content attribute is escaped", {
-      template: '{{mount-widget widget="quick-access-item" args=args}}',
+      template: hbs`{{mount-widget widget="quick-access-item" args=args}}`,
 
       beforeEach() {
         this.set("args", { content: "<b>bold</b>" });
@@ -27,7 +28,7 @@ discourseModule(
     });
 
     componentTest("escapedContent attribute is not escaped", {
-      template: '{{mount-widget widget="quick-access-item" args=args}}',
+      template: hbs`{{mount-widget widget="quick-access-item" args=args}}`,
 
       beforeEach() {
         this.set("args", { escapedContent: "&quot;quote&quot;" });
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/small-user-list-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/small-user-list-test.js
index 0f5d8ebbf1..2cccac3306 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/small-user-list-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/small-user-list-test.js
@@ -1,30 +1,32 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
 
-discourseModule("Integration | Component | Widget | small-user-list", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | Widget | small-user-list",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("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(queryAll('[data-user-card="eviltrout"]').length === 1);
-      assert.ok(queryAll('[data-user-card="someone"]').length === 0);
-      assert.ok(queryAll(".unknown").length, "includes unkown user");
-    },
-  });
-});
+    componentTest("renders avatars and support for unknown", {
+      template: hbs`{{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(queryAll('[data-user-card="eviltrout"]').length === 1);
+        assert.ok(queryAll('[data-user-card="someone"]').length === 0);
+        assert.ok(queryAll(".unknown").length, "includes unkown user");
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/software-update-prompt-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/software-update-prompt-test.js
new file mode 100644
index 0000000000..59059a28bb
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/software-update-prompt-test.js
@@ -0,0 +1,44 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import {
+  discourseModule,
+  publishToMessageBus,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import { later } from "@ember/runloop";
+
+discourseModule(
+  "Integration | Component | software-update-prompt",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    componentTest(
+      "software-update-prompt gets correct CSS class after messageBus message",
+      {
+        template: hbs`{{software-update-prompt}}`,
+
+        test(assert) {
+          assert.ok(
+            queryAll("div.software-update-prompt.require-software-refresh")
+              .length === 0,
+            "it does not have the class to show the prompt"
+          );
+
+          publishToMessageBus("/global/asset-version", "somenewversion");
+
+          const done = assert.async();
+          later(() => {
+            assert.ok(
+              queryAll("div.software-update-prompt.require-software-refresh")
+                .length === 1,
+              "it does have the class to show the prompt"
+            );
+            done();
+          }, 10);
+        },
+      }
+    );
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/topic-admin-menu-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/topic-admin-menu-test.js
index 098cce1149..644b3c006e 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/topic-admin-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/topic-admin-menu-test.js
@@ -1,9 +1,10 @@
-import { exists, discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
-import Topic from "discourse/models/topic";
+import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers";
 import Category from "discourse/models/category";
+import Topic from "discourse/models/topic";
+import hbs from "htmlbars-inline-precompile";
 
 const createArgs = (topic) => {
   return {
@@ -15,7 +16,7 @@ const createArgs = (topic) => {
     toggleClosed: () => {},
     toggleArchived: () => {},
     toggleVisibility: () => {},
-    showTopicStatusUpdate: () => {},
+    showTopicTimerModal: () => {},
     showFeatureTopic: () => {},
     showChangeTimestamp: () => {},
     resetBumpDate: () => {},
@@ -30,7 +31,7 @@ discourseModule(
     setupRenderingTest(hooks);
 
     componentTest("topic-admin-menu-button is present for admin/moderators", {
-      template: '{{mount-widget widget="topic-admin-menu-button" args=args}}',
+      template: hbs`{{mount-widget widget="topic-admin-menu-button" args=args}}`,
 
       beforeEach() {
         this.currentUser.setProperties({
@@ -52,7 +53,7 @@ discourseModule(
     componentTest(
       "topic-admin-menu-button hides for non-admin when there is no action",
       {
-        template: '{{mount-widget widget="topic-admin-menu-button" args=args}}',
+        template: hbs`{{mount-widget widget="topic-admin-menu-button" args=args}}`,
 
         beforeEach() {
           this.currentUser.setProperties({
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/topic-participant-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/topic-participant-test.js
index c81534f3e5..57acca0e2c 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/topic-participant-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/topic-participant-test.js
@@ -1,7 +1,8 @@
-import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
+import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 discourseModule(
   "Integration | Component | Widget | topic-participant",
@@ -9,7 +10,7 @@ discourseModule(
     setupRenderingTest(hooks);
 
     componentTest("one post", {
-      template: '{{mount-widget widget="topic-participant" args=args}}',
+      template: hbs`{{mount-widget widget="topic-participant" args=args}}`,
 
       beforeEach() {
         this.set("args", {
@@ -30,7 +31,7 @@ discourseModule(
     });
 
     componentTest("many posts, a primary group with flair", {
-      template: '{{mount-widget widget="topic-participant" args=args}}',
+      template: hbs`{{mount-widget widget="topic-participant" args=args}}`,
 
       beforeEach() {
         this.set("args", {
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/topic-status-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/topic-status-test.js
index 6fce46e765..683a074c06 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/topic-status-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/topic-status-test.js
@@ -1,47 +1,49 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
 import TopicStatusIcons from "discourse/helpers/topic-status-icons";
+import hbs from "htmlbars-inline-precompile";
 
-discourseModule("Integration | Component | Widget | topic-status", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | Widget | topic-status",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("basics", {
-    template: '{{mount-widget widget="topic-status" args=args}}',
-    beforeEach(store) {
-      this.set("args", {
-        topic: store.createRecord("topic", { closed: true }),
-        disableActions: true,
-      });
-    },
-    test(assert) {
-      assert.ok(queryAll(".topic-status .d-icon-lock").length);
-    },
-  });
+    componentTest("basics", {
+      template: hbs`{{mount-widget widget="topic-status" args=args}}`,
+      beforeEach(store) {
+        this.set("args", {
+          topic: store.createRecord("topic", { closed: true }),
+          disableActions: true,
+        });
+      },
+      test(assert) {
+        assert.ok(queryAll(".topic-status .d-icon-lock").length);
+      },
+    });
 
-  componentTest("extendability", {
-    template: '{{mount-widget widget="topic-status" args=args}}',
-    beforeEach(store) {
-      TopicStatusIcons.addObject([
-        "has_accepted_answer",
-        "far-check-square",
-        "solved",
-      ]);
-      this.set("args", {
-        topic: store.createRecord("topic", {
-          has_accepted_answer: true,
-        }),
-        disableActions: true,
-      });
-    },
-    test(assert) {
-      assert.ok(queryAll(".topic-status .d-icon-far-check-square").length);
-    },
-  });
-});
+    componentTest("extendability", {
+      template: hbs`{{mount-widget widget="topic-status" args=args}}`,
+      beforeEach(store) {
+        TopicStatusIcons.addObject([
+          "has_accepted_answer",
+          "far-check-square",
+          "solved",
+        ]);
+        this.set("args", {
+          topic: store.createRecord("topic", {
+            has_accepted_answer: true,
+          }),
+          disableActions: true,
+        });
+      },
+      test(assert) {
+        assert.ok(queryAll(".topic-status .d-icon-far-check-square").length);
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/user-menu-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/user-menu-test.js
index b9f0166214..6654fa504d 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/user-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/user-menu-test.js
@@ -1,232 +1,239 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
-import sinon from "sinon";
-import I18n from "I18n";
 import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
 import { click } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
+import sinon from "sinon";
 
-discourseModule("Integration | Component | Widget | user-menu", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | Widget | user-menu",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("basics", {
-    template: '{{mount-widget widget="user-menu"}}',
+    componentTest("basics", {
+      template: hbs`{{mount-widget widget="user-menu"}}`,
 
-    test(assert) {
-      assert.ok(queryAll(".user-menu").length);
-      assert.ok(queryAll(".user-preferences-link").length);
-      assert.ok(queryAll(".user-notifications-link").length);
-      assert.ok(queryAll(".user-bookmarks-link").length);
-      assert.ok(queryAll(".quick-access-panel").length);
-      assert.ok(queryAll(".notifications-dismiss").length);
-    },
-  });
+      test(assert) {
+        assert.ok(queryAll(".user-menu").length);
+        assert.ok(queryAll(".user-preferences-link").length);
+        assert.ok(queryAll(".user-notifications-link").length);
+        assert.ok(queryAll(".user-bookmarks-link").length);
+        assert.ok(queryAll(".quick-access-panel").length);
+        assert.ok(queryAll(".notifications-dismiss").length);
+      },
+    });
 
-  componentTest("notifications", {
-    template: '{{mount-widget widget="user-menu"}}',
+    componentTest("notifications", {
+      template: hbs`{{mount-widget widget="user-menu"}}`,
 
-    async test(assert) {
-      const $links = queryAll(".quick-access-panel li a");
+      async test(assert) {
+        const $links = queryAll(".quick-access-panel li a");
 
-      assert.equal($links.length, 5);
-      assert.ok($links[0].href.includes("/t/a-slug/123"));
+        assert.equal($links.length, 5);
+        assert.ok($links[0].href.includes("/t/a-slug/123"));
 
-      assert.ok(
-        $links[1].href.includes(
-          "/u/eviltrout/notifications/likes-received?acting_username=aquaman"
-        )
-      );
+        assert.ok(
+          $links[1].href.includes(
+            "/u/eviltrout/notifications/likes-received?acting_username=aquaman"
+          )
+        );
 
-      assert.equal(
-        $links[1].text,
-        `aquaman ${I18n.t("notifications.liked_consolidated_description", {
-          count: 5,
-        })}`
-      );
-
-      assert.ok($links[2].href.includes("/u/test2/messages/group/test"));
-      assert.ok(
-        $links[2].innerHTML.includes(
-          I18n.t("notifications.group_message_summary", {
+        assert.equal(
+          $links[1].text,
+          `aquaman ${I18n.t("notifications.liked_consolidated_description", {
             count: 5,
-            group_name: "test",
-          })
-        )
-      );
+          })}`
+        );
 
-      assert.ok($links[3].href.includes("/u/test1"));
-      assert.ok(
-        $links[3].innerHTML.includes(
-          I18n.t("notifications.invitee_accepted", { username: "test1" })
-        )
-      );
+        assert.ok($links[2].href.includes("/u/test2/messages/group/test"));
+        assert.ok(
+          $links[2].innerHTML.includes(
+            I18n.t("notifications.group_message_summary", {
+              count: 5,
+              group_name: "test",
+            })
+          )
+        );
 
-      assert.ok($links[4].href.includes("/g/test"));
-      assert.ok(
-        $links[4].innerHTML.includes(
-          I18n.t("notifications.membership_request_accepted", {
-            group_name: "test",
-          })
-        )
-      );
+        assert.ok($links[3].href.includes("/u/test1"));
+        assert.ok(
+          $links[3].innerHTML.includes(
+            I18n.t("notifications.invitee_accepted", { username: "test1" })
+          )
+        );
 
-      const routeToStub = sinon.stub(DiscourseURL, "routeTo");
-      await click(".user-notifications-link");
-      assert.ok(
-        routeToStub.calledWith(queryAll(".user-notifications-link")[0].href),
-        "a second click should redirect to the full notifications page"
-      );
-    },
-  });
+        assert.ok($links[4].href.includes("/g/test"));
+        assert.ok(
+          $links[4].innerHTML.includes(
+            I18n.t("notifications.membership_request_accepted", {
+              group_name: "test",
+            })
+          )
+        );
 
-  componentTest("log out", {
-    template: '{{mount-widget widget="user-menu" logout=(action "logout")}}',
+        const routeToStub = sinon.stub(DiscourseURL, "routeTo");
+        await click(".user-notifications-link");
+        assert.ok(
+          routeToStub.calledWith(
+            queryAll(".user-notifications-link").data("url")
+          ),
+          "a second click should redirect to the full notifications page"
+        );
+      },
+    });
 
-    beforeEach() {
-      this.on("logout", () => (this.loggedOut = true));
-    },
+    componentTest("log out", {
+      template: hbs`{{mount-widget widget="user-menu" logout=logout}}`,
 
-    async test(assert) {
-      await click(".user-preferences-link");
-      assert.ok(queryAll(".logout").length);
+      beforeEach() {
+        this.set("logout", () => (this.loggedOut = true));
+      },
 
-      await click(".logout");
-      assert.ok(this.loggedOut);
-    },
-  });
+      async test(assert) {
+        await click(".user-preferences-link");
 
-  componentTest("private messages - disabled", {
-    template: '{{mount-widget widget="user-menu"}}',
-    beforeEach() {
-      this.siteSettings.enable_personal_messages = false;
-    },
+        assert.ok(queryAll(".logout").length);
 
-    test(assert) {
-      assert.ok(!queryAll(".user-pms-link").length);
-    },
-  });
+        await click(".logout button");
+        assert.ok(this.loggedOut);
+      },
+    });
 
-  componentTest("private messages - enabled", {
-    template: '{{mount-widget widget="user-menu"}}',
-    beforeEach() {
-      this.siteSettings.enable_personal_messages = true;
-    },
+    componentTest("private messages - disabled", {
+      template: hbs`{{mount-widget widget="user-menu"}}`,
+      beforeEach() {
+        this.siteSettings.enable_personal_messages = false;
+      },
 
-    async test(assert) {
-      const userPmsLink = queryAll(".user-pms-link")[0];
-      assert.ok(userPmsLink);
-      await click(".user-pms-link");
+      test(assert) {
+        assert.ok(!queryAll(".user-pms-link").length);
+      },
+    });
 
-      const message = queryAll(".quick-access-panel li a")[0];
-      assert.ok(message);
+    componentTest("private messages - enabled", {
+      template: hbs`{{mount-widget widget="user-menu"}}`,
+      beforeEach() {
+        this.siteSettings.enable_personal_messages = true;
+      },
 
-      assert.ok(
-        message.href.includes("/t/bug-can-not-render-emoji-properly/174/2"),
-        "should link to the next unread post"
-      );
-      assert.ok(
-        message.innerHTML.includes("mixtape"),
-        "should include the last poster's username"
-      );
-      assert.ok(
-        message.innerHTML.match(/<img.*class="emoji".*>/),
-        "should correctly render emoji in message title"
-      );
+      async test(assert) {
+        const userPmsLink = queryAll(".user-pms-link").data("url");
+        assert.ok(userPmsLink);
+        await click(".user-pms-link");
 
-      const routeToStub = sinon.stub(DiscourseURL, "routeTo");
-      await click(".user-pms-link");
-      assert.ok(
-        routeToStub.calledWith(userPmsLink.href),
-        "a second click should redirect to the full private messages page"
-      );
-    },
-  });
+        const message = queryAll(".quick-access-panel li a")[0];
+        assert.ok(message);
 
-  componentTest("bookmarks", {
-    template: '{{mount-widget widget="user-menu"}}',
+        assert.ok(
+          message.href.includes("/t/bug-can-not-render-emoji-properly/174/2"),
+          "should link to the next unread post"
+        );
+        assert.ok(
+          message.innerHTML.includes("mixtape"),
+          "should include the last poster's username"
+        );
+        assert.ok(
+          message.innerHTML.match(/<img.*class="emoji".*>/),
+          "should correctly render emoji in message title"
+        );
 
-    async test(assert) {
-      await click(".user-bookmarks-link");
+        const routeToStub = sinon.stub(DiscourseURL, "routeTo");
+        await click(".user-pms-link");
+        assert.ok(
+          routeToStub.calledWith(userPmsLink),
+          "a second click should redirect to the full private messages page"
+        );
+      },
+    });
 
-      const bookmark = queryAll(".quick-access-panel li a")[0];
-      assert.ok(bookmark);
+    componentTest("bookmarks", {
+      template: hbs`{{mount-widget widget="user-menu"}}`,
 
-      assert.ok(bookmark.href.includes("/t/yelling-topic-title/119"));
-      assert.ok(
-        bookmark.innerHTML.includes("someguy"),
-        "should include the last poster's username"
-      );
-      assert.ok(
-        bookmark.innerHTML.match(/<img.*class="emoji".*>/),
-        "should correctly render emoji in bookmark title"
-      );
+      async test(assert) {
+        await click(".user-bookmarks-link");
 
-      const routeToStub = sinon.stub(DiscourseURL, "routeTo");
-      await click(".user-bookmarks-link");
-      assert.ok(
-        routeToStub.calledWith(queryAll(".user-bookmarks-link")[0].href),
-        "a second click should redirect to the full bookmarks page"
-      );
-    },
-  });
+        const bookmark = queryAll(".quick-access-panel li a")[0];
+        assert.ok(bookmark);
 
-  componentTest("anonymous", {
-    template:
-      '{{mount-widget widget="user-menu" toggleAnonymous=(action "toggleAnonymous")}}',
+        assert.ok(bookmark.href.includes("/t/yelling-topic-title/119"));
+        assert.ok(
+          bookmark.innerHTML.includes("someguy"),
+          "should include the last poster's username"
+        );
+        assert.ok(
+          bookmark.innerHTML.match(/<img.*class="emoji".*>/),
+          "should correctly render emoji in bookmark title"
+        );
 
-    beforeEach() {
-      this.currentUser.setProperties({ is_anonymous: false, trust_level: 3 });
-      this.siteSettings.allow_anonymous_posting = true;
-      this.siteSettings.anonymous_posting_min_trust_level = 3;
+        const routeToStub = sinon.stub(DiscourseURL, "routeTo");
+        await click(".user-bookmarks-link");
+        assert.ok(
+          routeToStub.calledWith(queryAll(".user-bookmarks-link").data("url")),
+          "a second click should redirect to the full bookmarks page"
+        );
+      },
+    });
 
-      this.on("toggleAnonymous", () => (this.anonymous = true));
-    },
+    componentTest("anonymous", {
+      template: hbs`
+      {{mount-widget widget="user-menu" toggleAnonymous=toggleAnonymous}}
+    `,
 
-    async test(assert) {
-      await click(".user-preferences-link");
-      assert.ok(queryAll(".enable-anonymous").length);
+      beforeEach() {
+        this.currentUser.setProperties({ is_anonymous: false, trust_level: 3 });
+        this.siteSettings.allow_anonymous_posting = true;
+        this.siteSettings.anonymous_posting_min_trust_level = 3;
 
-      await click(".enable-anonymous");
-      assert.ok(this.anonymous);
-    },
-  });
+        this.set("toggleAnonymous", () => (this.anonymous = true));
+      },
 
-  componentTest("anonymous - disabled", {
-    template: '{{mount-widget widget="user-menu"}}',
+      async test(assert) {
+        await click(".user-preferences-link");
+        assert.ok(queryAll(".enable-anonymous").length);
 
-    beforeEach() {
-      this.siteSettings.allow_anonymous_posting = false;
-    },
+        await click(".enable-anonymous");
+        assert.ok(this.anonymous);
+      },
+    });
 
-    async test(assert) {
-      await click(".user-preferences-link");
-      assert.ok(!queryAll(".enable-anonymous").length);
-    },
-  });
+    componentTest("anonymous - disabled", {
+      template: hbs`{{mount-widget widget="user-menu"}}`,
 
-  componentTest("anonymous - switch back", {
-    template:
-      '{{mount-widget widget="user-menu" toggleAnonymous=(action "toggleAnonymous")}}',
+      beforeEach() {
+        this.siteSettings.allow_anonymous_posting = false;
+      },
 
-    beforeEach() {
-      this.currentUser.setProperties({ is_anonymous: true });
-      this.siteSettings.allow_anonymous_posting = true;
+      async test(assert) {
+        await click(".user-preferences-link");
+        assert.ok(!queryAll(".enable-anonymous").length);
+      },
+    });
 
-      this.on("toggleAnonymous", () => (this.anonymous = false));
-    },
+    componentTest("anonymous - switch back", {
+      template: hbs`
+      {{mount-widget widget="user-menu" toggleAnonymous=toggleAnonymous}}
+    `,
 
-    async test(assert) {
-      await click(".user-preferences-link");
-      assert.ok(queryAll(".disable-anonymous").length);
+      beforeEach() {
+        this.currentUser.setProperties({ is_anonymous: true });
+        this.siteSettings.allow_anonymous_posting = true;
 
-      await click(".disable-anonymous");
-      assert.notOk(this.anonymous);
-    },
-  });
-});
+        this.set("toggleAnonymous", () => (this.anonymous = false));
+      },
+
+      async test(assert) {
+        await click(".user-preferences-link");
+        assert.ok(queryAll(".disable-anonymous").length);
+
+        await click(".disable-anonymous");
+        assert.notOk(this.anonymous);
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/widget-dropdown-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/widget-dropdown-test.js
index 6b6350d9b7..2a39472ec6 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/widget-dropdown-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/widget-dropdown-test.js
@@ -1,13 +1,14 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   exists,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
 import I18n from "I18n";
 import { click } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 const DEFAULT_CONTENT = {
   content: [
@@ -46,7 +47,7 @@ function body() {
   return queryAll("#my-dropdown .widget-dropdown-body")[0];
 }
 
-const TEMPLATE = `
+const TEMPLATE = hbs`
   {{mount-widget
     widget="widget-dropdown"
     args=(hash
@@ -60,79 +61,79 @@ const TEMPLATE = `
     )
 }}`;
 
-discourseModule("Integration | Component | Widget | widget-dropdown", function (
-  hooks
-) {
-  setupRenderingTest(hooks);
+discourseModule(
+  "Integration | Component | Widget | widget-dropdown",
+  function (hooks) {
+    setupRenderingTest(hooks);
 
-  componentTest("dropdown id", {
-    template: TEMPLATE,
+    componentTest("dropdown id", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
-    },
+      beforeEach() {
+        this.setProperties(DEFAULT_CONTENT);
+      },
 
-    test(assert) {
-      assert.ok(exists("#my-dropdown"));
-    },
-  });
+      test(assert) {
+        assert.ok(exists("#my-dropdown"));
+      },
+    });
 
-  componentTest("label", {
-    template: TEMPLATE,
+    componentTest("label", {
+      template: TEMPLATE,
 
-    _translations: I18n.translations,
+      _translations: I18n.translations,
 
-    beforeEach() {
-      I18n.translations = { en: { js: { foo: "FooBaz" } } };
-      this.setProperties(DEFAULT_CONTENT);
-    },
+      beforeEach() {
+        I18n.translations = { en: { js: { foo: "FooBaz" } } };
+        this.setProperties(DEFAULT_CONTENT);
+      },
 
-    afterEach() {
-      I18n.translations = this._translations;
-    },
+      afterEach() {
+        I18n.translations = this._translations;
+      },
 
-    test(assert) {
-      assert.equal(headerLabel(), "FooBaz");
-    },
-  });
+      test(assert) {
+        assert.equal(headerLabel(), "FooBaz");
+      },
+    });
 
-  componentTest("translatedLabel", {
-    template: TEMPLATE,
+    componentTest("translatedLabel", {
+      template: TEMPLATE,
 
-    _translations: I18n.translations,
+      _translations: I18n.translations,
 
-    beforeEach() {
-      I18n.translations = { en: { js: { foo: "FooBaz" } } };
-      this.setProperties(DEFAULT_CONTENT);
-      this.set("translatedLabel", "BazFoo");
-    },
+      beforeEach() {
+        I18n.translations = { en: { js: { foo: "FooBaz" } } };
+        this.setProperties(DEFAULT_CONTENT);
+        this.set("translatedLabel", "BazFoo");
+      },
 
-    afterEach() {
-      I18n.translations = this._translations;
-    },
+      afterEach() {
+        I18n.translations = this._translations;
+      },
 
-    test(assert) {
-      assert.equal(headerLabel(), this.translatedLabel);
-    },
-  });
+      test(assert) {
+        assert.equal(headerLabel(), this.translatedLabel);
+      },
+    });
 
-  componentTest("content", {
-    template: TEMPLATE,
+    componentTest("content", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
-    },
+      beforeEach() {
+        this.setProperties(DEFAULT_CONTENT);
+      },
 
-    async test(assert) {
-      await toggle();
-      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");
-    },
-  });
+      async test(assert) {
+        await toggle();
+        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");
+      },
+    });
 
-  componentTest("onChange action", {
-    template: `
+    componentTest("onChange action", {
+      template: hbs`
       <div id="test"></div>
       {{mount-widget
         widget="widget-dropdown"
@@ -140,209 +141,210 @@ discourseModule("Integration | Component | Widget | widget-dropdown", function (
           id="my-dropdown"
           label=label
           content=content
-          onChange=(action "onChange")
+          onChange=onChange
         )
       }}
     `,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
+      beforeEach() {
+        this.setProperties(DEFAULT_CONTENT);
 
-      this.on(
-        "onChange",
-        (item) => (this._element.querySelector("#test").innerText = item.id)
-      );
-    },
+        this.set(
+          "onChange",
+          (item) => (queryAll("#test")[0].innerText = item.id)
+        );
+      },
 
-    async test(assert) {
-      await toggle();
-      await clickRowById(2);
-      assert.equal(
-        queryAll("#test").text(),
-        2,
-        "it calls the onChange actions"
-      );
-    },
-  });
+      async test(assert) {
+        await toggle();
+        await clickRowById(2);
+        assert.equal(
+          queryAll("#test").text(),
+          2,
+          "it calls the onChange actions"
+        );
+      },
+    });
 
-  componentTest("can be opened and closed", {
-    template: TEMPLATE,
+    componentTest("can be opened and closed", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
-    },
+      beforeEach() {
+        this.setProperties(DEFAULT_CONTENT);
+      },
 
-    async test(assert) {
-      assert.ok(exists("#my-dropdown.closed"));
-      assert.ok(!exists("#my-dropdown .widget-dropdown-body"));
-      await toggle();
-      assert.equal(rowById(2).innerText.trim(), "FooBar");
-      assert.ok(exists("#my-dropdown.opened"));
-      assert.ok(exists("#my-dropdown .widget-dropdown-body"));
-      await toggle();
-      assert.ok(exists("#my-dropdown.closed"));
-      assert.ok(!exists("#my-dropdown .widget-dropdown-body"));
-    },
-  });
+      async test(assert) {
+        assert.ok(exists("#my-dropdown.closed"));
+        assert.ok(!exists("#my-dropdown .widget-dropdown-body"));
+        await toggle();
+        assert.equal(rowById(2).innerText.trim(), "FooBar");
+        assert.ok(exists("#my-dropdown.opened"));
+        assert.ok(exists("#my-dropdown .widget-dropdown-body"));
+        await toggle();
+        assert.ok(exists("#my-dropdown.closed"));
+        assert.ok(!exists("#my-dropdown .widget-dropdown-body"));
+      },
+    });
 
-  componentTest("icon", {
-    template: TEMPLATE,
+    componentTest("icon", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
-      this.set("icon", "times");
-    },
+      beforeEach() {
+        this.setProperties(DEFAULT_CONTENT);
+        this.set("icon", "times");
+      },
 
-    test(assert) {
-      assert.ok(exists(header().querySelector(".d-icon-times")));
-    },
-  });
+      test(assert) {
+        assert.ok(exists(header().querySelector(".d-icon-times")));
+      },
+    });
 
-  componentTest("class", {
-    template: TEMPLATE,
+    componentTest("class", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
-      this.set("class", "activated");
-    },
+      beforeEach() {
+        this.setProperties(DEFAULT_CONTENT);
+        this.set("class", "activated");
+      },
 
-    test(assert) {
-      assert.ok(exists("#my-dropdown.activated"));
-    },
-  });
+      test(assert) {
+        assert.ok(exists("#my-dropdown.activated"));
+      },
+    });
 
-  componentTest("content with translatedLabel", {
-    template: TEMPLATE,
+    componentTest("content with translatedLabel", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
-    },
+      beforeEach() {
+        this.setProperties(DEFAULT_CONTENT);
+      },
 
-    async test(assert) {
-      await toggle();
-      assert.equal(rowById(2).innerText.trim(), "FooBar");
-    },
-  });
+      async test(assert) {
+        await toggle();
+        assert.equal(rowById(2).innerText.trim(), "FooBar");
+      },
+    });
 
-  componentTest("content with label", {
-    template: TEMPLATE,
+    componentTest("content with label", {
+      template: TEMPLATE,
 
-    _translations: I18n.translations,
+      _translations: I18n.translations,
 
-    beforeEach() {
-      I18n.translations = { en: { js: { foo: "FooBaz" } } };
-      this.setProperties(DEFAULT_CONTENT);
-    },
+      beforeEach() {
+        I18n.translations = { en: { js: { foo: "FooBaz" } } };
+        this.setProperties(DEFAULT_CONTENT);
+      },
 
-    afterEach() {
-      I18n.translations = this._translations;
-    },
+      afterEach() {
+        I18n.translations = this._translations;
+      },
 
-    async test(assert) {
-      await toggle();
-      assert.equal(rowById(1).innerText.trim(), "FooBaz");
-    },
-  });
+      async test(assert) {
+        await toggle();
+        assert.equal(rowById(1).innerText.trim(), "FooBaz");
+      },
+    });
 
-  componentTest("content with icon", {
-    template: TEMPLATE,
+    componentTest("content with icon", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
-    },
+      beforeEach() {
+        this.setProperties(DEFAULT_CONTENT);
+      },
 
-    async test(assert) {
-      await toggle();
-      assert.ok(exists(rowById(3).querySelector(".d-icon-times")));
-    },
-  });
+      async test(assert) {
+        await toggle();
+        assert.ok(exists(rowById(3).querySelector(".d-icon-times")));
+      },
+    });
 
-  componentTest("content with html", {
-    template: TEMPLATE,
+    componentTest("content with html", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
-    },
+      beforeEach() {
+        this.setProperties(DEFAULT_CONTENT);
+      },
 
-    async test(assert) {
-      await toggle();
-      assert.equal(rowById(4).innerHTML.trim(), "<span><b>baz</b></span>");
-    },
-  });
+      async test(assert) {
+        await toggle();
+        assert.equal(rowById(4).innerHTML.trim(), "<span><b>baz</b></span>");
+      },
+    });
 
-  componentTest("separator", {
-    template: TEMPLATE,
+    componentTest("separator", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
-    },
+      beforeEach() {
+        this.setProperties(DEFAULT_CONTENT);
+      },
 
-    async test(assert) {
-      await toggle();
-      assert.ok(
-        queryAll(
-          "#my-dropdown .widget-dropdown-item:nth-child(3)"
-        )[0].classList.contains("separator")
-      );
-    },
-  });
+      async test(assert) {
+        await toggle();
+        assert.ok(
+          queryAll(
+            "#my-dropdown .widget-dropdown-item:nth-child(3)"
+          )[0].classList.contains("separator")
+        );
+      },
+    });
 
-  componentTest("hides widget if no content", {
-    template: TEMPLATE,
+    componentTest("hides widget if no content", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties({ content: null, label: "foo" });
-    },
+      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"));
-    },
-  });
+      test(assert) {
+        assert.notOk(exists("#my-dropdown .widget-dropdown-header"));
+        assert.notOk(exists("#my-dropdown .widget-dropdown-body"));
+      },
+    });
 
-  componentTest("headerClass option", {
-    template: TEMPLATE,
+    componentTest("headerClass option", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
-      this.set("options", { headerClass: "btn-small and-text" });
-    },
+      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"));
-    },
-  });
+      test(assert) {
+        assert.ok(header().classList.contains("widget-dropdown-header"));
+        assert.ok(header().classList.contains("btn-small"));
+        assert.ok(header().classList.contains("and-text"));
+      },
+    });
 
-  componentTest("bodyClass option", {
-    template: TEMPLATE,
+    componentTest("bodyClass option", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
-      this.set("options", { bodyClass: "gigantic and-yet-small" });
-    },
+      beforeEach() {
+        this.setProperties(DEFAULT_CONTENT);
+        this.set("options", { bodyClass: "gigantic and-yet-small" });
+      },
 
-    async test(assert) {
-      await toggle();
-      assert.ok(body().classList.contains("widget-dropdown-body"));
-      assert.ok(body().classList.contains("gigantic"));
-      assert.ok(body().classList.contains("and-yet-small"));
-    },
-  });
+      async test(assert) {
+        await toggle();
+        assert.ok(body().classList.contains("widget-dropdown-body"));
+        assert.ok(body().classList.contains("gigantic"));
+        assert.ok(body().classList.contains("and-yet-small"));
+      },
+    });
 
-  componentTest("caret option", {
-    template: TEMPLATE,
+    componentTest("caret option", {
+      template: TEMPLATE,
 
-    beforeEach() {
-      this.setProperties(DEFAULT_CONTENT);
-      this.set("options", { caret: true });
-    },
+      beforeEach() {
+        this.setProperties(DEFAULT_CONTENT);
+        this.set("options", { caret: true });
+      },
 
-    test(assert) {
-      assert.ok(
-        exists("#my-dropdown .widget-dropdown-header .d-icon-caret-down")
-      );
-    },
-  });
-});
+      test(assert) {
+        assert.ok(
+          exists("#my-dropdown .widget-dropdown-header .d-icon-caret-down")
+        );
+      },
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/widget-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/widget-test.js
index 88607997b5..e31e82e83c 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/widget-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/widget-test.js
@@ -1,28 +1,29 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import {
   discourseModule,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
-import componentTest, {
-  setupRenderingTest,
-} from "discourse/tests/helpers/component-test";
 import I18n from "I18n";
-import { next } from "@ember/runloop";
-import { createWidget } from "discourse/widgets/widget";
-import { withPluginApi } from "discourse/lib/plugin-api";
 import { Promise } from "rsvp";
-import hbs from "discourse/widgets/hbs-compiler";
 import { click } from "@ember/test-helpers";
+import { createWidget } from "discourse/widgets/widget";
+import hbs from "htmlbars-inline-precompile";
+import widgetHbs from "discourse/widgets/hbs-compiler";
+import { next } from "@ember/runloop";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 discourseModule("Integration | Component | Widget | base", function (hooks) {
   setupRenderingTest(hooks);
 
   componentTest("widget attributes are passed in via args", {
-    template: `{{mount-widget widget="hello-test" args=args}}`,
+    template: hbs`{{mount-widget widget="hello-test" args=args}}`,
 
     beforeEach() {
       createWidget("hello-test", {
         tagName: "div.test",
-        template: hbs`Hello {{attrs.name}}`,
+        template: widgetHbs`Hello {{attrs.name}}`,
       });
 
       this.set("args", { name: "Robin" });
@@ -34,11 +35,11 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("hbs template - no tagName", {
-    template: `{{mount-widget widget="hbs-test" args=args}}`,
+    template: hbs`{{mount-widget widget="hbs-test" args=args}}`,
 
     beforeEach() {
       createWidget("hbs-test", {
-        template: hbs`<div class='test'>Hello {{attrs.name}}</div>`,
+        template: widgetHbs`<div class='test'>Hello {{attrs.name}}</div>`,
       });
 
       this.set("args", { name: "Robin" });
@@ -50,12 +51,12 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("hbs template - with tagName", {
-    template: `{{mount-widget widget="hbs-test" args=args}}`,
+    template: hbs`{{mount-widget widget="hbs-test" args=args}}`,
 
     beforeEach() {
       createWidget("hbs-test", {
         tagName: "div.test",
-        template: hbs`Hello {{attrs.name}}`,
+        template: widgetHbs`Hello {{attrs.name}}`,
       });
 
       this.set("args", { name: "Robin" });
@@ -67,11 +68,11 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("hbs template - with data attributes", {
-    template: `{{mount-widget widget="hbs-test" args=args}}`,
+    template: hbs`{{mount-widget widget="hbs-test" args=args}}`,
 
     beforeEach() {
       createWidget("hbs-test", {
-        template: hbs`<div class='mydiv' data-my-test='hello world'></div>`,
+        template: widgetHbs`<div class='mydiv' data-my-test='hello world'></div>`,
       });
     },
 
@@ -81,7 +82,7 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("buildClasses", {
-    template: `{{mount-widget widget="classname-test" args=args}}`,
+    template: hbs`{{mount-widget widget="classname-test" args=args}}`,
 
     beforeEach() {
       createWidget("classname-test", {
@@ -104,7 +105,7 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("buildAttributes", {
-    template: `{{mount-widget widget="attributes-test" args=args}}`,
+    template: hbs`{{mount-widget widget="attributes-test" args=args}}`,
 
     beforeEach() {
       createWidget("attributes-test", {
@@ -125,7 +126,7 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("buildId", {
-    template: `{{mount-widget widget="id-test" args=args}}`,
+    template: hbs`{{mount-widget widget="id-test" args=args}}`,
 
     beforeEach() {
       createWidget("id-test", {
@@ -143,13 +144,13 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("widget state", {
-    template: `{{mount-widget widget="state-test"}}`,
+    template: hbs`{{mount-widget widget="state-test"}}`,
 
     beforeEach() {
       createWidget("state-test", {
         tagName: "button.test",
         buildKey: () => `button-test`,
-        template: hbs`{{state.clicks}} clicks`,
+        template: widgetHbs`{{state.clicks}} clicks`,
 
         defaultState() {
           return { clicks: 0 };
@@ -165,19 +166,19 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
       assert.ok(queryAll("button.test").length, "it renders the button");
       assert.equal(queryAll("button.test").text(), "0 clicks");
 
-      await click(queryAll("button"));
+      await click(queryAll("button")[0]);
       assert.equal(queryAll("button.test").text(), "1 clicks");
     },
   });
 
   componentTest("widget update with promise", {
-    template: `{{mount-widget widget="promise-test"}}`,
+    template: hbs`{{mount-widget widget="promise-test"}}`,
 
     beforeEach() {
       createWidget("promise-test", {
         tagName: "button.test",
         buildKey: () => "promise-test",
-        template: hbs`
+        template: widgetHbs`
           {{#if state.name}}
             {{state.name}}
           {{else}}
@@ -199,20 +200,20 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
     async test(assert) {
       assert.equal(queryAll("button.test").text().trim(), "No name");
 
-      await click(queryAll("button"));
+      await click(queryAll("button")[0]);
       assert.equal(queryAll("button.test").text().trim(), "Robin");
     },
   });
 
   componentTest("widget attaching", {
-    template: `{{mount-widget widget="attach-test"}}`,
+    template: hbs`{{mount-widget widget="attach-test"}}`,
 
     beforeEach() {
       createWidget("test-embedded", { tagName: "div.embedded" });
 
       createWidget("attach-test", {
         tagName: "div.container",
-        template: hbs`{{attach widget="test-embedded" attrs=attrs}}`,
+        template: widgetHbs`{{attach widget="test-embedded" attrs=attrs}}`,
       });
     },
 
@@ -223,14 +224,14 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("magic attaching by name", {
-    template: `{{mount-widget widget="attach-test"}}`,
+    template: hbs`{{mount-widget widget="attach-test"}}`,
 
     beforeEach() {
       createWidget("test-embedded", { tagName: "div.embedded" });
 
       createWidget("attach-test", {
         tagName: "div.container",
-        template: hbs`{{test-embedded attrs=attrs}}`,
+        template: widgetHbs`{{test-embedded attrs=attrs}}`,
       });
     },
 
@@ -241,17 +242,17 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("custom attrs to a magic attached widget", {
-    template: `{{mount-widget widget="attach-test"}}`,
+    template: hbs`{{mount-widget widget="attach-test"}}`,
 
     beforeEach() {
       createWidget("testing", {
         tagName: "span.value",
-        template: hbs`{{attrs.value}}`,
+        template: widgetHbs`{{attrs.value}}`,
       });
 
       createWidget("attach-test", {
         tagName: "div.container",
-        template: hbs`{{testing value=(concat "hello" " " "world")}}`,
+        template: widgetHbs`{{testing value=(concat "hello" " " "world")}}`,
       });
     },
 
@@ -262,11 +263,11 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("handlebars d-icon", {
-    template: `{{mount-widget widget="hbs-icon-test" args=args}}`,
+    template: hbs`{{mount-widget widget="hbs-icon-test" args=args}}`,
 
     beforeEach() {
       createWidget("hbs-icon-test", {
-        template: hbs`{{d-icon "arrow-down"}}`,
+        template: widgetHbs`{{d-icon "arrow-down"}}`,
       });
     },
 
@@ -278,11 +279,11 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   componentTest("handlebars i18n", {
     _translations: I18n.translations,
 
-    template: `{{mount-widget widget="hbs-i18n-test" args=args}}`,
+    template: hbs`{{mount-widget widget="hbs-i18n-test" args=args}}`,
 
     beforeEach() {
       createWidget("hbs-i18n-test", {
-        template: hbs`
+        template: widgetHbs`
           <span class='string'>{{i18n "hbs_test0"}}</span>
           <span class='var'>{{i18n attrs.key}}</span>
           <a href title={{i18n "hbs_test0"}}>test</a>
@@ -312,12 +313,12 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("handlebars #each", {
-    template: `{{mount-widget widget="hbs-each-test" args=args}}`,
+    template: hbs`{{mount-widget widget="hbs-each-test" args=args}}`,
 
     beforeEach() {
       createWidget("hbs-each-test", {
         tagName: "ul",
-        template: hbs`
+        template: widgetHbs`
           {{#each attrs.items as |item|}}
             <li>{{item}}</li>
           {{/each}}
@@ -336,12 +337,12 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("widget decorating", {
-    template: `{{mount-widget widget="decorate-test"}}`,
+    template: hbs`{{mount-widget widget="decorate-test"}}`,
 
     beforeEach() {
       createWidget("decorate-test", {
         tagName: "div.decorate",
-        template: hbs`main content`,
+        template: widgetHbs`main content`,
       });
 
       withPluginApi("0.1", (api) => {
@@ -363,12 +364,12 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("widget settings", {
-    template: `{{mount-widget widget="settings-test"}}`,
+    template: hbs`{{mount-widget widget="settings-test"}}`,
 
     beforeEach() {
       createWidget("settings-test", {
         tagName: "div.settings",
-        template: hbs`age is {{settings.age}}`,
+        template: widgetHbs`age is {{settings.age}}`,
         settings: { age: 36 },
       });
     },
@@ -379,12 +380,12 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("override settings", {
-    template: `{{mount-widget widget="ov-settings-test"}}`,
+    template: hbs`{{mount-widget widget="ov-settings-test"}}`,
 
     beforeEach() {
       createWidget("ov-settings-test", {
         tagName: "div.settings",
-        template: hbs`age is {{settings.age}}`,
+        template: widgetHbs`age is {{settings.age}}`,
         settings: { age: 36 },
       });
 
@@ -399,12 +400,12 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
   });
 
   componentTest("get accessor", {
-    template: `{{mount-widget widget="get-accessor-test"}}`,
+    template: hbs`{{mount-widget widget="get-accessor-test"}}`,
 
     beforeEach() {
       createWidget("get-accessor-test", {
         tagName: "div.test",
-        template: hbs`Hello {{transformed.name}}`,
+        template: widgetHbs`Hello {{transformed.name}}`,
         transform() {
           return {
             name: this.get("currentUser.username"),
@@ -417,4 +418,23 @@ discourseModule("Integration | Component | Widget | base", function (hooks) {
       assert.equal(queryAll("div.test").text(), "Hello eviltrout");
     },
   });
+
+  componentTest("tagName", {
+    template: hbs`{{mount-widget widget="tag-name-override-test"}}`,
+
+    beforeEach() {
+      createWidget("test-override", { tagName: "div.not-override" });
+
+      createWidget("tag-name-override-test", {
+        template: widgetHbs`{{attach widget="test-override" attrs=attrs otherOpts=(hash tagName="section.override")}}`,
+      });
+    },
+
+    test(assert) {
+      assert.ok(
+        queryAll("section.override").length,
+        "renders container with overrided tagName"
+      );
+    },
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/plugin_tests.js.erb b/app/assets/javascripts/discourse/tests/plugin_tests.js.erb
index 5709a19399..0bb267961d 100644
--- a/app/assets/javascripts/discourse/tests/plugin_tests.js.erb
+++ b/app/assets/javascripts/discourse/tests/plugin_tests.js.erb
@@ -1,10 +1,10 @@
 <%
   DiscoursePluginRegistry.javascripts.each { |js| require_asset(js) }
   DiscoursePluginRegistry.handlebars.each { |hb| require_asset(hb) }
-  DiscoursePluginRegistry.each_globbed_asset do |f, ext|
+  DiscoursePluginRegistry.each_globbed_asset do |f|
     if File.directory?(f)
       depend_on(f)
-    elsif f.to_s.end_with?(".#{ext}")
+    else
       require_asset(f)
     end
   end
diff --git a/app/assets/javascripts/discourse/tests/setup-tests.js b/app/assets/javascripts/discourse/tests/setup-tests.js
index d4405bc2a8..7742a30bb1 100644
--- a/app/assets/javascripts/discourse/tests/setup-tests.js
+++ b/app/assets/javascripts/discourse/tests/setup-tests.js
@@ -1,41 +1,45 @@
 import {
-  resetSettings,
-  currentSettings,
-} from "discourse/tests/helpers/site-settings";
-import { getOwner, setDefaultOwner } from "discourse-common/lib/get-owner";
-import { setupURL, setupS3CDN } from "discourse-common/lib/get-url";
-import { createHelperContext } from "discourse-common/lib/helpers";
-import { buildResolver } from "discourse-common/resolver";
-import createPretender, {
-  pretenderHelpers,
-  applyDefaultHandlers,
-} from "discourse/tests/helpers/create-pretender";
-import { flushMap } from "discourse/models/store";
-import { ScrollingDOMMethods } from "discourse/mixins/scrolling";
-import {
-  resetSite,
   applyPretender,
   exists,
+  resetSite,
 } from "discourse/tests/helpers/qunit-helpers";
-import PreloadStore from "discourse/lib/preload-store";
-import User from "discourse/models/user";
-import Session from "discourse/models/session";
-import { clearAppEventsCache } from "discourse/services/app-events";
-import QUnit from "qunit";
-import MessageBus from "message-bus-client";
-import deprecated from "discourse-common/lib/deprecated";
-import sinon from "sinon";
+import createPretender, {
+  applyDefaultHandlers,
+  pretenderHelpers,
+} from "discourse/tests/helpers/create-pretender";
+import {
+  currentSettings,
+  resetSettings,
+} from "discourse/tests/helpers/site-settings";
+import { getOwner, setDefaultOwner } from "discourse-common/lib/get-owner";
 import { setApplication, setResolver } from "@ember/test-helpers";
+import { setupS3CDN, setupURL } from "discourse-common/lib/get-url";
+import Application from "../app";
+import MessageBus from "message-bus-client";
+import PreloadStore from "discourse/lib/preload-store";
+import { resetSettings as resetThemeSettings } from "discourse/lib/theme-settings-store";
+import QUnit from "qunit";
+import { ScrollingDOMMethods } from "discourse/mixins/scrolling";
+import Session from "discourse/models/session";
+import User from "discourse/models/user";
 import bootbox from "bootbox";
+import { buildResolver } from "discourse-common/resolver";
+import { clearAppEventsCache } from "discourse/services/app-events";
+import { createHelperContext } from "discourse-common/lib/helpers";
+import deprecated from "discourse-common/lib/deprecated";
+import { flushMap } from "discourse/models/store";
+import { registerObjects } from "discourse/pre-initializers/inject-discourse-objects";
+import { setupApplicationTest } from "ember-qunit";
+import sinon from "sinon";
 
 const Plugin = $.fn.modal;
 const Modal = Plugin.Constructor;
 
 function AcceptanceModal(option, _relatedTarget) {
   return this.each(function () {
-    var $this = $(this);
-    var data = $this.data("bs.modal");
-    var options = $.extend(
+    let $this = $(this);
+    let data = $this.data("bs.modal");
+    let options = $.extend(
       {},
       Modal.DEFAULTS,
       $this.data(),
@@ -55,9 +59,40 @@ function AcceptanceModal(option, _relatedTarget) {
   });
 }
 
-export default function setupTests(app, container) {
+let app;
+let started = false;
+
+function createApplication(config, settings) {
+  app = Application.create(config);
+  setApplication(app);
   setResolver(buildResolver("discourse").create({ namespace: app }));
 
+  let container = app.__registry__.container();
+  app.__container__ = container;
+  setDefaultOwner(container);
+
+  if (!started) {
+    app.start();
+    started = true;
+  }
+
+  app.SiteSettings = settings;
+  registerObjects(container, app);
+  return app;
+}
+
+function setupTestsCommon(application, container, config) {
+  QUnit.config.hidepassed = true;
+
+  // Let's customize QUnit options a bit
+  QUnit.config.urlConfig = QUnit.config.urlConfig.filter(
+    (c) => ["dockcontainer", "nocontainer"].indexOf(c.id) === -1
+  );
+
+  application.rootElement = "#ember-testing";
+  application.setupForTesting();
+  application.injectTestHelpers();
+
   sinon.config = {
     injectIntoThis: false,
     injectInto: null,
@@ -69,13 +104,6 @@ export default function setupTests(app, container) {
   // Stop the message bus so we don't get ajax calls
   MessageBus.stop();
 
-  app.rootElement = "#ember-testing";
-  app.setupForTesting();
-  app.SiteSettings = currentSettings();
-  app.start();
-  bootbox.$body = $("#ember-testing");
-  $.fn.modal = AcceptanceModal;
-
   // disable logster error reporting
   if (window.Logster) {
     window.Logster.enabled = false;
@@ -83,6 +111,8 @@ export default function setupTests(app, container) {
     window.Logster = { enabled: false };
   }
 
+  $.fn.modal = AcceptanceModal;
+
   let server;
 
   Object.defineProperty(window, "server", {
@@ -122,8 +152,31 @@ export default function setupTests(app, container) {
     },
   });
 
+  let setupData;
+  const setupDataElement = document.getElementById("data-discourse-setup");
+  if (setupDataElement) {
+    setupData = setupDataElement.dataset;
+    setupDataElement.remove();
+  }
   QUnit.testStart(function (ctx) {
+    bootbox.$body = $("#ember-testing");
     let settings = resetSettings();
+    resetThemeSettings();
+
+    if (config) {
+      // Ember CLI testing environment
+      app = createApplication(config, settings);
+    }
+
+    const cdn = setupData ? setupData.cdn : null;
+    const baseUri = setupData ? setupData.baseUri : "";
+    setupURL(cdn, "http://localhost:3000", baseUri);
+    if (setupData && setupData.s3BaseUrl) {
+      setupS3CDN(setupData.s3BaseUrl, setupData.s3Cdn);
+    } else {
+      setupS3CDN(null, null);
+    }
+
     server = createPretender;
     server.handlers = [];
     applyDefaultHandlers(server);
@@ -161,10 +214,12 @@ export default function setupTests(app, container) {
 
     applyPretender(ctx.module, server, pretenderHelpers());
 
-    setupURL(null, "http://localhost:3000", "");
-    setupS3CDN(null, null);
-
     Session.resetCurrent();
+    if (setupData) {
+      const session = Session.current();
+      session.markdownItURL = setupData.markdownItUrl;
+      session.highlightJsPath = setupData.highlightJsPath;
+    }
     User.resetCurrent();
     let site = resetSite(settings);
     createHelperContext({
@@ -190,10 +245,12 @@ export default function setupTests(app, container) {
     $(".modal-backdrop").remove();
     flushMap();
 
-    // ensures any event not removed is not leaking between tests
-    // most likely in intialisers, other places (controller, component...)
-    // should be fixed in code
-    clearAppEventsCache(getOwner(this));
+    if (!setupApplicationTest) {
+      // ensures any event not removed is not leaking between tests
+      // most likely in intialisers, other places (controller, component...)
+      // should be fixed in code
+      clearAppEventsCache(getOwner(this));
+    }
 
     MessageBus.unsubscribe("*");
     server = null;
@@ -202,8 +259,8 @@ export default function setupTests(app, container) {
   // Load ES6 tests
   function getUrlParameter(name) {
     name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-    var regex = new RegExp("[\\?&]" + name + "=([^&#]*)");
-    var results = regex.exec(location.search);
+    let regex = new RegExp("[\\?&]" + name + "=([^&#]*)");
+    let results = regex.exec(location.search);
     return results === null
       ? ""
       : decodeURIComponent(results[1].replace(/\+/g, " "));
@@ -214,19 +271,43 @@ export default function setupTests(app, container) {
     ? "/" + getUrlParameter("qunit_single_plugin") + "/"
     : "/plugins/";
 
+  if (getUrlParameter("qunit_disable_auto_start") === "1") {
+    QUnit.config.autostart = false;
+  }
+
   Object.keys(requirejs.entries).forEach(function (entry) {
     let isTest = /\-test/.test(entry);
     let regex = new RegExp(pluginPath);
     let isPlugin = regex.test(entry);
 
-    if (isTest && (!skipCore || isPlugin)) {
+    if (!isTest) {
+      return;
+    }
+
+    if (!skipCore || isPlugin) {
       require(entry, null, null, true);
     }
   });
 
   // forces 0 as duration for all jquery animations
   jQuery.fx.off = true;
-  setApplication(app);
-  setDefaultOwner(container);
+
+  setApplication(application);
+  setDefaultOwner(application.__container__);
   resetSite();
 }
+
+export function setupTestsLegacy(application) {
+  app = application;
+  setResolver(buildResolver("discourse").create({ namespace: app }));
+  setupTestsCommon(application, app.__container__);
+
+  app.SiteSettings = currentSettings();
+  app.start();
+}
+
+export default function setupTests(config) {
+  let settings = resetSettings();
+  app = createApplication(config, settings);
+  setupTestsCommon(app, app.__container__, config);
+}
diff --git a/app/assets/javascripts/discourse/tests/test-helper.js b/app/assets/javascripts/discourse/tests/test-helper.js
new file mode 100644
index 0000000000..299a37c780
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/test-helper.js
@@ -0,0 +1,22 @@
+import config from "../config/environment";
+import { setEnvironment } from "discourse-common/config/environment";
+import { start } from "ember-qunit";
+
+setEnvironment("testing");
+
+document.addEventListener("discourse-booted", () => {
+  let setupTests = require("discourse/tests/setup-tests").default;
+  Ember.ENV.LOG_STACKTRACE_ON_DEPRECATION = false;
+
+  document.write(`
+    <div id="qunit"></div>
+    <div id="qunit-fixture"></div>
+
+    <div id="ember-testing-container" style='position: fixed'>
+      <div id="ember-testing"></div>
+    </div>
+  `);
+
+  setupTests(config.APP);
+  start({ setupTestContainer: false });
+});
diff --git a/app/assets/javascripts/discourse/tests/test_helper.js b/app/assets/javascripts/discourse/tests/test_helper.js
index 610c363a95..9da07daba0 100644
--- a/app/assets/javascripts/discourse/tests/test_helper.js
+++ b/app/assets/javascripts/discourse/tests/test_helper.js
@@ -5,13 +5,13 @@
 //= require jquery.ui.widget
 //= require ember.debug
 //= require message-bus
-//= require qunit/qunit/qunit
+//= require qunit
 //= require ember-qunit
 //= require fake_xml_http_request
 //= require route-recognizer
-//= require pretender/pretender
+//= require pretender
 //= require locales/i18n
-//= require locales/en_US
+//= require locales/en
 //= require discourse-loader
 
 // Our base application
@@ -28,29 +28,12 @@
 //= require ember-template-compiler
 
 // Test helpers
-//= require sinon/pkg/sinon
+//= require sinon
 //= require_tree ./helpers
 //= require break_string
 
-// Finally, the tests themselves
 //= require_tree ./fixtures
-//= require_tree ./acceptance
-//= require_tree ./integration
-//= require_tree ./unit
-//= require_tree ../../admin/tests/admin
-//= require plugin_tests
-//= require setup-tests
+
+//= require ./setup-tests
 //= require test-shims
 //= require jquery.magnific-popup.min.js
-
-document.write(
-  '<div id="ember-testing-container"><div id="ember-testing"></div></div>'
-);
-document.write(
-  "<style>#ember-testing-container { position: absolute; background: white; bottom: 0; right: 0; width: 640px; height: 384px; overflow: auto; z-index: 9999; border: 1px solid #ccc; } #ember-testing { zoom: 50%; }</style>"
-);
-
-let app = window.Discourse;
-app.injectTestHelpers();
-let setupTests = require("discourse/tests/setup-tests").default;
-setupTests(app, app.__container__);
diff --git a/app/assets/javascripts/discourse/tests/test_starter.js b/app/assets/javascripts/discourse/tests/test_starter.js
new file mode 100644
index 0000000000..77b69af2a1
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/test_starter.js
@@ -0,0 +1,11 @@
+// discourse-skip-module
+
+document.write(
+  '<div id="ember-testing-container"><div id="ember-testing"></div></div>'
+);
+document.write(
+  "<style>#ember-testing-container { position: fixed; background: white; bottom: 0; right: 0; width: 640px; height: 384px; overflow: auto; z-index: 9999; border: 1px solid #ccc; transform: translateZ(0)} #ember-testing { zoom: 50%; }</style>"
+);
+
+let setupTestsLegacy = require("discourse/tests/setup-tests").setupTestsLegacy;
+setupTestsLegacy(window.Discourse);
diff --git a/app/assets/javascripts/discourse/tests/theme_qunit_ember_jquery.js b/app/assets/javascripts/discourse/tests/theme_qunit_ember_jquery.js
new file mode 100644
index 0000000000..caccb2d83d
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/theme_qunit_ember_jquery.js
@@ -0,0 +1,6 @@
+// discourse-skip-module
+
+//= require env
+//= require jquery.debug
+//= require ember.debug
+//= require discourse-loader
diff --git a/app/assets/javascripts/discourse/tests/theme_qunit_helper.js b/app/assets/javascripts/discourse/tests/theme_qunit_helper.js
new file mode 100644
index 0000000000..a9c60c90f9
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/theme_qunit_helper.js
@@ -0,0 +1,6 @@
+// discourse-skip-module
+
+//= require_tree ./helpers
+//= require_tree ./fixtures
+//= require ./setup-tests
+//= require test-shims
diff --git a/app/assets/javascripts/discourse/tests/theme_qunit_vendor.js b/app/assets/javascripts/discourse/tests/theme_qunit_vendor.js
new file mode 100644
index 0000000000..3c6865b1e0
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/theme_qunit_vendor.js
@@ -0,0 +1,15 @@
+// discourse-skip-module
+
+//= require qunit
+//= require ember-qunit
+//= require fake_xml_http_request
+//= require route-recognizer
+//= require pretender
+
+// These are not loaded in prod or development
+// But we need them for testing handlebars templates in qunit
+//= require handlebars
+//= require ember-template-compiler
+
+//= require sinon
+//= require break_string
diff --git a/app/assets/javascripts/discourse/tests/unit/components/group-membership-button-test.js b/app/assets/javascripts/discourse/tests/unit/components/group-membership-button-test.js
deleted file mode 100644
index 58e2eb3855..0000000000
--- a/app/assets/javascripts/discourse/tests/unit/components/group-membership-button-test.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import { test } from "qunit";
-import { moduleFor } from "ember-qunit";
-
-// TODO: Convert to a modern *integration* test
-moduleFor("component:group-membership-button");
-
-test("canJoinGroup", function (assert) {
-  this.subject().setProperties({
-    model: { public_admission: false, is_group_user: true },
-  });
-
-  assert.equal(
-    this.subject().get("canJoinGroup"),
-    false,
-    "can't join group if public_admission is false"
-  );
-
-  this.subject().set("model.public_admission", true);
-
-  assert.equal(
-    this.subject().get("canJoinGroup"),
-    false,
-    "can't join group if user is already in the group"
-  );
-
-  this.subject().set("model.is_group_user", false);
-
-  assert.equal(
-    this.subject().get("canJoinGroup"),
-    true,
-    "allowed to join group"
-  );
-});
-
-test("canLeaveGroup", function (assert) {
-  this.subject().setProperties({
-    model: { public_exit: false, is_group_user: false },
-  });
-
-  assert.equal(
-    this.subject().get("canLeaveGroup"),
-    false,
-    "can't leave group if public_exit is false"
-  );
-
-  this.subject().set("model.public_exit", true);
-
-  assert.equal(
-    this.subject().get("canLeaveGroup"),
-    false,
-    "can't leave group if user is not in the group"
-  );
-
-  this.subject().set("model.is_group_user", true);
-
-  assert.equal(
-    this.subject().get("canLeaveGroup"),
-    true,
-    "allowed to leave group"
-  );
-});
-
-test("canRequestMembership", function (assert) {
-  this.subject().setProperties({
-    model: { allow_membership_requests: true, is_group_user: true },
-  });
-
-  assert.equal(
-    this.subject().get("canRequestMembership"),
-    false,
-    "can't request for membership if user is already in the group"
-  );
-
-  this.subject().set("model.is_group_user", false);
-
-  assert.equal(
-    this.subject().get("canRequestMembership"),
-    true,
-    "allowed to request for group membership"
-  );
-});
-
-test("userIsGroupUser", function (assert) {
-  this.subject().setProperties({
-    model: { is_group_user: true },
-  });
-
-  assert.equal(this.subject().get("userIsGroupUser"), true);
-
-  this.subject().set("model.is_group_user", false);
-
-  assert.equal(this.subject().get("userIsGroupUser"), false);
-
-  this.subject().set("model.is_group_user", null);
-
-  assert.equal(this.subject().get("userIsGroupUser"), false);
-});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-show-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-show-test.js
new file mode 100644
index 0000000000..d3a311787c
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-show-test.js
@@ -0,0 +1,47 @@
+import Theme from "admin/models/theme";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+
+discourseModule("Unit | Controller | admin-customize-themes-show", function () {
+  test("can display source url for remote themes", function (assert) {
+    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.getController("admin-customize-themes-show", {
+      model: remoteTheme,
+    });
+
+    assert.deepEqual(
+      controller.get("remoteThemeLink"),
+      repoUrl,
+      "returns theme's repo URL"
+    );
+  });
+
+  test("can display source url for remote theme branches", function (assert) {
+    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.getController("admin-customize-themes-show", {
+      model: remoteTheme,
+    });
+
+    assert.deepEqual(
+      controller.get("remoteThemeLink"),
+      "https://github.com/discourse/discourse-brand-header/tree/beta",
+      "returns theme's repo URL to branch"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-test.js
new file mode 100644
index 0000000000..bdd9136f09
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-test.js
@@ -0,0 +1,49 @@
+import Theme from "admin/models/theme";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+
+discourseModule("Unit | Controller | admin-customize-themes", function () {
+  test("can list themes correctly", function (assert) {
+    const defaultTheme = Theme.create({
+      id: 2,
+      default: true,
+      name: "default",
+    });
+    const userTheme = Theme.create({
+      id: 3,
+      user_selectable: true,
+      name: "name",
+    });
+    const strayTheme1 = Theme.create({ id: 4, name: "stray1" });
+    const strayTheme2 = Theme.create({ id: 5, name: "stray2" });
+    const componentTheme = Theme.create({
+      id: 6,
+      name: "component",
+      component: true,
+    });
+
+    const controller = this.getController("admin-customize-themes", {
+      model: [
+        strayTheme2,
+        strayTheme1,
+        userTheme,
+        defaultTheme,
+        componentTheme,
+      ],
+    });
+
+    assert.deepEqual(
+      controller.get("fullThemes").map((t) => t.get("name")),
+      [strayTheme2, strayTheme1, userTheme, defaultTheme].map((t) =>
+        t.get("name")
+      ),
+      "returns a list of themes without components"
+    );
+
+    assert.deepEqual(
+      controller.get("childThemes").map((t) => t.get("name")),
+      [componentTheme].map((t) => t.get("name")),
+      "separate components from themes"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/admin-user-badges-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/admin-user-badges-test.js
new file mode 100644
index 0000000000..529cc34252
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/admin-user-badges-test.js
@@ -0,0 +1,57 @@
+import Badge from "discourse/models/badge";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+
+discourseModule("Unit | Controller | admin-user-badges", function () {
+  test("grantableBadges", function (assert) {
+    const badgeFirst = Badge.create({
+      id: 3,
+      name: "A Badge",
+      enabled: true,
+      manually_grantable: true,
+    });
+    const badgeMiddle = Badge.create({
+      id: 1,
+      name: "My Badge",
+      enabled: true,
+      manually_grantable: true,
+    });
+    const badgeLast = Badge.create({
+      id: 2,
+      name: "Zoo Badge",
+      enabled: true,
+      manually_grantable: true,
+    });
+    const badgeDisabled = Badge.create({
+      id: 4,
+      name: "Disabled Badge",
+      enabled: false,
+      manually_grantable: true,
+    });
+    const badgeAutomatic = Badge.create({
+      id: 5,
+      name: "Automatic Badge",
+      enabled: true,
+      manually_grantable: false,
+    });
+
+    const controller = this.getController("admin-user-badges", {
+      model: [],
+      badges: [
+        badgeLast,
+        badgeFirst,
+        badgeMiddle,
+        badgeDisabled,
+        badgeAutomatic,
+      ],
+    });
+
+    const sortedNames = [badgeFirst.name, badgeMiddle.name, badgeLast.name];
+    const badgeNames = controller.get("grantableBadges").map(function (badge) {
+      return badge.name;
+    });
+
+    assert.not(badgeNames.includes(badgeDisabled), "excludes disabled badges");
+    assert.deepEqual(badgeNames, sortedNames, "sorts badges by name");
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/avatar-selector-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/avatar-selector-test.js
index 7a88c1e119..a0bd81e134 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/avatar-selector-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/avatar-selector-test.js
@@ -1,18 +1,14 @@
 import EmberObject from "@ember/object";
-import { mapRoutes } from "discourse/mapping-router";
 import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import { registerRouter } from "discourse/mapping-router";
 import { test } from "qunit";
 
 discourseModule("Unit | Controller | avatar-selector", function (hooks) {
   hooks.beforeEach(function () {
-    this.registry.register("router:main", mapRoutes());
+    registerRouter(this.registry);
   });
 
   test("avatarTemplate", function (assert) {
-    const avatarSelectorController = this.owner.lookup(
-      "controller:avatar-selector"
-    );
-
     const user = EmberObject.create({
       avatar_template: "avatar",
       system_avatar_template: "system",
@@ -22,8 +18,9 @@ discourseModule("Unit | Controller | avatar-selector", function (hooks) {
       gravatar_avatar_upload_id: 2,
       custom_avatar_upload_id: 3,
     });
-
-    avatarSelectorController.setProperties({ user });
+    const avatarSelectorController = this.getController("avatar-selector", {
+      user,
+    });
 
     user.set("avatar_template", "system");
     assert.equal(
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/bookmark-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/bookmark-test.js
deleted file mode 100644
index 4b44be5884..0000000000
--- a/app/assets/javascripts/discourse/tests/unit/controllers/bookmark-test.js
+++ /dev/null
@@ -1,262 +0,0 @@
-import sinon from "sinon";
-import {
-  discourseModule,
-  logIn,
-  fakeTime,
-} from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
-import User from "discourse/models/user";
-import KeyboardShortcutInitializer from "discourse/initializers/keyboard-shortcuts";
-import { REMINDER_TYPES } from "discourse/lib/bookmark";
-
-let BookmarkController;
-
-function mockMomentTz(dateString) {
-  fakeTime(dateString, BookmarkController.userTimezone);
-}
-
-discourseModule("Unit | Controller | bookmark", function (hooks) {
-  hooks.beforeEach(function () {
-    logIn();
-    KeyboardShortcutInitializer.initialize(this.container);
-
-    BookmarkController = this.owner.lookup("controller:bookmark");
-    BookmarkController.setProperties({
-      currentUser: User.current(),
-      site: { isMobileDevice: false },
-    });
-    BookmarkController.onShow();
-  });
-
-  hooks.afterEach(function () {
-    sinon.restore();
-  });
-
-  test("showLaterToday when later today is tomorrow do not show", function (assert) {
-    mockMomentTz("2019-12-11T22:00:00");
-
-    assert.equal(BookmarkController.get("showLaterToday"), false);
-  });
-
-  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);
-  });
-
-  test("showLaterToday when now is after the cutoff time (5pm)", function (assert) {
-    mockMomentTz("2019-12-11T17:00:00");
-    assert.equal(BookmarkController.get("showLaterToday"), false);
-  });
-
-  test("showLaterToday when later today is before the end of the day, show", function (assert) {
-    mockMomentTz("2019-12-11T10:00:00");
-
-    assert.equal(BookmarkController.get("showLaterToday"), true);
-  });
-
-  test("nextWeek gets next week correctly", function (assert) {
-    mockMomentTz("2019-12-11T08:00:00");
-
-    assert.equal(
-      BookmarkController.nextWeek().format("YYYY-MM-DD"),
-      "2019-12-18"
-    );
-  });
-
-  test("nextMonth gets next month correctly", function (assert) {
-    mockMomentTz("2019-12-11T08:00:00");
-
-    assert.equal(
-      BookmarkController.nextMonth().format("YYYY-MM-DD"),
-      "2020-01-11"
-    );
-  });
-
-  test("laterThisWeek gets 2 days from now", function (assert) {
-    mockMomentTz("2019-12-10T08:00:00");
-
-    assert.equal(
-      BookmarkController.laterThisWeek().format("YYYY-MM-DD"),
-      "2019-12-12"
-    );
-  });
-
-  test("laterThisWeek returns null if we are at Thursday already", function (assert) {
-    mockMomentTz("2019-12-12T08:00:00");
-
-    assert.equal(BookmarkController.laterThisWeek(), null);
-  });
-
-  test("showLaterThisWeek returns true if < Thursday", function (assert) {
-    mockMomentTz("2019-12-10T08:00:00");
-
-    assert.equal(BookmarkController.showLaterThisWeek, true);
-  });
-
-  test("showLaterThisWeek returns false if > Thursday", function (assert) {
-    mockMomentTz("2019-12-12T08:00:00");
-
-    assert.equal(BookmarkController.showLaterThisWeek, false);
-  });
-  test("tomorrow gets tomorrow correctly", function (assert) {
-    mockMomentTz("2019-12-11T08:00:00");
-
-    assert.equal(
-      BookmarkController.tomorrow().format("YYYY-MM-DD"),
-      "2019-12-12"
-    );
-  });
-
-  test("startOfDay changes the time of the provided date to 8:00am correctly", function (assert) {
-    let dt = moment.tz(
-      "2019-12-11T11:37:16",
-      BookmarkController.currentUser.resolvedTimezone(
-        BookmarkController.currentUser
-      )
-    );
-
-    assert.equal(
-      BookmarkController.startOfDay(dt).format("YYYY-MM-DD HH:mm:ss"),
-      "2019-12-11 08:00:00"
-    );
-  });
-
-  test("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:00:00"
-    );
-  });
-
-  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:00");
-
-    assert.equal(
-      BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
-      "2019-12-11 12:00:00"
-    );
-  });
-
-  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"
-    );
-  });
-
-  test("showLaterToday returns false if >= 5PM", function (assert) {
-    mockMomentTz("2019-12-11T17:00:01");
-    assert.equal(BookmarkController.showLaterToday, false);
-  });
-
-  test("showLaterToday returns false if >= 5PM", function (assert) {
-    mockMomentTz("2019-12-11T17:00:01");
-    assert.equal(BookmarkController.showLaterToday, false);
-  });
-
-  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(
-            BookmarkController.currentUser
-          )
-        )
-        .toString(),
-      "the custom date and time are parsed correctly with default time"
-    );
-  });
-
-  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");
-  });
-
-  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);
-  });
-
-  test("user timezone updates when the modal is shown", function (assert) {
-    User.current().changeTimezone(null);
-    let stub = sinon.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();
-  });
-
-  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);
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js
index 6f0e157434..efaab7dbf7 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js
@@ -1,24 +1,21 @@
-import { test } from "qunit";
 import I18n from "I18n";
 import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
 
 discourseModule("Unit | Controller | create-account", function () {
   test("basicUsernameValidation", async function (assert) {
-    const testInvalidUsername = async function (username, expectedReason) {
-      const controller = await this.owner.lookup("controller:create-account");
+    const testInvalidUsername = async (username, expectedReason) => {
+      const controller = this.getController("create-account");
       controller.set("accountUsername", username);
 
+      let validation = controller.basicUsernameValidation(username);
+      assert.ok(validation.failed, "username should be invalid: " + username);
       assert.equal(
-        controller.get("basicUsernameValidation.failed"),
-        true,
-        "username should be invalid: " + username
-      );
-      assert.equal(
-        controller.get("basicUsernameValidation.reason"),
+        validation.reason,
         expectedReason,
         "username validation reason: " + username + ", " + expectedReason
       );
-    }.bind(this);
+    };
 
     testInvalidUsername("", undefined);
     testInvalidUsername("x", I18n.t("user.username.too_short"));
@@ -33,20 +30,17 @@ discourseModule("Unit | Controller | create-account", function () {
       prefilledUsername: "porkchops",
     });
 
+    let validation = controller.basicUsernameValidation("porkchops");
+    assert.ok(validation.ok, "Prefilled username is valid");
     assert.equal(
-      controller.get("basicUsernameValidation.ok"),
-      true,
-      "Prefilled username is valid"
-    );
-    assert.equal(
-      controller.get("basicUsernameValidation.reason"),
+      validation.reason,
       I18n.t("user.username.prefilled"),
       "Prefilled username is valid"
     );
   });
 
   test("passwordValidation", async function (assert) {
-    const controller = await this.owner.lookup("controller:create-account");
+    const controller = this.getController("create-account");
 
     controller.set("authProvider", "");
     controller.set("accountEmail", "pork@chops.com");
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js
index df1cbc1dcd..ac1d7a6281 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js
@@ -3,7 +3,7 @@ import { test } from "qunit";
 
 discourseModule("Unit | Controller | history", function () {
   test("displayEdit", async function (assert) {
-    const HistoryController = this.owner.lookup("controller:history");
+    const HistoryController = this.getController("history");
 
     HistoryController.setProperties({
       model: { last_revision: 3, current_revision: 3, can_edit: false },
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-account-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-account-test.js
index 35b6fd228b..5209fc8850 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-account-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-account-test.js
@@ -1,25 +1,23 @@
 import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
-import EmberObject from "@ember/object";
 
 discourseModule("Unit | Controller | preferences/account", function () {
   test("updating of associated accounts", function (assert) {
-    const controller = this.owner.lookup("controller:preferences/account");
-    controller.setProperties({
+    const controller = this.getController("preferences/account", {
       siteSettings: {
         enable_google_oauth2_logins: true,
       },
-      model: EmberObject.create({
+      model: {
         id: 70,
         second_factor_enabled: true,
         is_anonymous: true,
-      }),
-      currentUser: EmberObject.create({
+      },
+      currentUser: {
         id: 1234,
-      }),
-      site: EmberObject.create({
+      },
+      site: {
         isMobileDevice: false,
-      }),
+      },
     });
 
     assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-second-factor-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-second-factor-test.js
index 21df63e26f..d4194011fc 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-second-factor-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-second-factor-test.js
@@ -3,15 +3,11 @@ import { test } from "qunit";
 
 discourseModule("Unit | Controller | preferences/second-factor", function () {
   test("displayOAuthWarning when OAuth login methods are enabled", function (assert) {
-    const controller = this.owner.lookup(
-      "controller:preferences/second-factor"
-    );
-    controller.setProperties({
+    const controller = this.getController("preferences/second-factor", {
       siteSettings: {
         enable_google_oauth2_logins: true,
       },
     });
-
     assert.equal(controller.get("displayOAuthWarning"), true);
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/reorder-categories-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/reorder-categories-test.js
index 47c4323d70..2feb422d95 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/reorder-categories-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/reorder-categories-test.js
@@ -1,7 +1,6 @@
+import createStore from "discourse/tests/helpers/create-store";
 import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
-import EmberObject from "@ember/object";
-import createStore from "discourse/tests/helpers/create-store";
 
 discourseModule("Unit | Controller | reorder-categories", function () {
   test("reorder set unique position number", function (assert) {
@@ -12,11 +11,10 @@ discourseModule("Unit | Controller | reorder-categories", function () {
       categories.push(store.createRecord("category", { id: i, position: 0 }));
     }
 
-    const site = EmberObject.create({ categories: categories });
-    const reorderCategoriesController = this.owner.lookup(
-      "controller:reorder-categories"
+    const reorderCategoriesController = this.getController(
+      "reorder-categories",
+      { site: { categories } }
     );
-    reorderCategoriesController.setProperties({ site });
     reorderCategoriesController.reorder();
 
     reorderCategoriesController
@@ -52,14 +50,11 @@ discourseModule("Unit | Controller | reorder-categories", function () {
       slug: "other",
     });
 
-    const categories = [child2, parent, other, child1];
     const expectedOrderSlugs = ["parent", "child2", "child1", "other"];
-
-    const site = EmberObject.create({ categories: categories });
-    const reorderCategoriesController = this.owner.lookup(
-      "controller:reorder-categories"
+    const reorderCategoriesController = this.getController(
+      "reorder-categories",
+      { site: { categories: [child2, parent, other, child1] } }
     );
-    reorderCategoriesController.setProperties({ site });
     reorderCategoriesController.reorder();
 
     assert.deepEqual(
@@ -89,12 +84,10 @@ discourseModule("Unit | Controller | reorder-categories", function () {
       slug: "test",
     });
 
-    const categories = [elem1, elem2, elem3];
-    const site = EmberObject.create({ categories: categories });
-    const reorderCategoriesController = this.owner.lookup(
-      "controller:reorder-categories"
+    const reorderCategoriesController = this.getController(
+      "reorder-categories",
+      { site: { categories: [elem1, elem2, elem3] } }
     );
-    reorderCategoriesController.setProperties({ site });
 
     reorderCategoriesController.actions.change.call(
       reorderCategoriesController,
@@ -136,12 +129,10 @@ discourseModule("Unit | Controller | reorder-categories", function () {
       slug: "test",
     });
 
-    const categories = [elem1, child1, elem2, elem3];
-    const site = EmberObject.create({ categories: categories });
-    const reorderCategoriesController = this.owner.lookup(
-      "controller:reorder-categories"
+    const reorderCategoriesController = this.getController(
+      "reorder-categories",
+      { site: { categories: [elem1, child1, elem2, elem3] } }
     );
-    reorderCategoriesController.setProperties({ site });
 
     reorderCategoriesController.actions.change.call(
       reorderCategoriesController,
@@ -190,12 +181,10 @@ discourseModule("Unit | Controller | reorder-categories", function () {
       slug: "test",
     });
 
-    const categories = [elem1, child1, child2, elem2, elem3];
-    const site = EmberObject.create({ categories: categories });
-    const reorderCategoriesController = this.owner.lookup(
-      "controller:reorder-categories"
+    const reorderCategoriesController = this.getController(
+      "reorder-categories",
+      { site: { categories: [elem1, child1, child2, elem2, elem3] } }
     );
-    reorderCategoriesController.setProperties({ site });
     reorderCategoriesController.reorder();
 
     reorderCategoriesController.actions.moveDown.call(
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js
index b68ad5bfdc..7d4c273281 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js
@@ -1,25 +1,13 @@
-import { moduleFor } from "ember-qunit";
-import { test } from "qunit";
 import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
-import Topic from "discourse/models/topic";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
-import User from "discourse/models/user";
 import { Promise } from "rsvp";
+import Topic from "discourse/models/topic";
+import User from "discourse/models/user";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import { next } from "@ember/runloop";
 import pretender from "discourse/tests/helpers/create-pretender";
-
-moduleFor("controller:topic", "controller:topic", {
-  needs: [
-    "controller:composer",
-    "controller:application",
-    "service:app-events",
-    "service:document-title",
-  ],
-  beforeEach() {
-    this.registry.register("service:screen-track", {}, { instantiate: false });
-    this.registry.injection("controller", "appEvents", "service:app-events");
-  },
-});
+import { settled } from "@ember/test-helpers";
+import { test } from "qunit";
 
 function topicWithStream(streamDetails) {
   let topic = Topic.create();
@@ -27,547 +15,563 @@ function topicWithStream(streamDetails) {
   return topic;
 }
 
-test("editTopic", function (assert) {
-  const model = Topic.create();
-  const controller = this.subject({ model });
-
-  assert.not(controller.get("editingTopic"), "we are not editing by default");
-
-  controller.set("model.details.can_edit", false);
-  controller.send("editTopic");
-
-  assert.not(
-    controller.get("editingTopic"),
-    "calling editTopic doesn't enable editing unless the user can edit"
-  );
-
-  controller.set("model.details.can_edit", true);
-  controller.send("editTopic");
-
-  assert.ok(
-    controller.get("editingTopic"),
-    "calling editTopic enables editing if the user can edit"
-  );
-  assert.equal(controller.get("buffered.title"), model.get("title"));
-  assert.equal(
-    controller.get("buffered.category_id"),
-    model.get("category_id")
-  );
-
-  controller.send("cancelEditingTopic");
-
-  assert.not(
-    controller.get("editingTopic"),
-    "cancelling edit mode reverts the property value"
-  );
-});
-
-test("deleteTopic", function (assert) {
-  const model = Topic.create();
-  let destroyed = false;
-  let modalDisplayed = false;
-  model.destroy = () => {
-    destroyed = true;
-    return Promise.resolve();
-  };
-  const controller = this.subject({
-    model,
-    siteSettings: {
-      min_topic_views_for_delete_confirm: 5,
-    },
-    deleteTopicModal: () => {
-      modalDisplayed = true;
-    },
+discourseModule("Unit | Controller | topic", function (hooks) {
+  hooks.beforeEach(function () {
+    this.registry.register("service:screen-track", {}, { instantiate: false });
+    this.registry.injection("controller", "appEvents", "service:app-events");
+  });
+  hooks.afterEach(function () {
+    this.registry.unregister("service:screen-track");
+    this.registry.unregister("current-user:main");
+    let topic = this.container.lookup("controller:topic");
+    topic.setProperties({
+      selectedPostIds: [],
+      selectedPostUsername: null,
+      currentUser: null,
+    });
   });
 
-  model.set("views", 10000);
-  controller.send("deleteTopic");
-  assert.not(destroyed, "don't destroy popular topic");
-  assert.ok(modalDisplayed, "display confirmation modal for popular topic");
+  test("editTopic", function (assert) {
+    const model = Topic.create();
+    const controller = this.getController("topic", { model });
+    assert.not(controller.get("editingTopic"), "we are not editing by default");
 
-  model.set("views", 3);
-  controller.send("deleteTopic");
-  assert.ok(destroyed, "destroy not popular topic");
-});
+    controller.set("model.details.can_edit", false);
+    controller.send("editTopic");
 
-test("toggleMultiSelect", function (assert) {
-  const model = Topic.create();
-  const controller = this.subject({ model });
+    assert.not(
+      controller.get("editingTopic"),
+      "calling editTopic doesn't enable editing unless the user can edit"
+    );
 
-  assert.not(
-    controller.get("multiSelect"),
-    "multi selection mode is disabled by default"
-  );
+    controller.set("model.details.can_edit", true);
+    controller.send("editTopic");
 
-  controller.get("selectedPostIds").pushObject(1);
-  assert.equal(controller.get("selectedPostIds.length"), 1);
+    assert.ok(
+      controller.get("editingTopic"),
+      "calling editTopic enables editing if the user can edit"
+    );
+    assert.equal(controller.get("buffered.title"), model.get("title"));
+    assert.equal(
+      controller.get("buffered.category_id"),
+      model.get("category_id")
+    );
 
-  controller.send("toggleMultiSelect");
+    controller.send("cancelEditingTopic");
 
-  assert.ok(
-    controller.get("multiSelect"),
-    "calling 'toggleMultiSelect' once enables multi selection mode"
-  );
-  assert.equal(
-    controller.get("selectedPostIds.length"),
-    0,
-    "toggling 'multiSelect' clears 'selectedPostIds'"
-  );
-
-  controller.get("selectedPostIds").pushObject(2);
-  assert.equal(controller.get("selectedPostIds.length"), 1);
-
-  controller.send("toggleMultiSelect");
-
-  assert.not(
-    controller.get("multiSelect"),
-    "calling 'toggleMultiSelect' twice disables multi selection mode"
-  );
-  assert.equal(
-    controller.get("selectedPostIds.length"),
-    0,
-    "toggling 'multiSelect' clears 'selectedPostIds'"
-  );
-});
-
-test("selectedPosts", function (assert) {
-  let model = topicWithStream({ posts: [{ id: 1 }, { id: 2 }, { id: 3 }] });
-  const controller = this.subject({ model });
-
-  controller.set("selectedPostIds", [1, 2, 42]);
-
-  assert.equal(
-    controller.get("selectedPosts.length"),
-    2,
-    "selectedPosts only contains already loaded posts"
-  );
-  assert.not(
-    controller.get("selectedPosts").some((p) => p === undefined),
-    "selectedPosts only contains valid post objects"
-  );
-});
-
-test("selectedAllPosts", function (assert) {
-  let model = topicWithStream({ stream: [1, 2, 3] });
-  const controller = this.subject({ model });
-
-  controller.set("selectedPostIds", [1, 2]);
-
-  assert.not(controller.get("selectedAllPosts"), "not all posts are selected");
-
-  controller.get("selectedPostIds").pushObject(3);
-
-  assert.ok(controller.get("selectedAllPosts"), "all posts are selected");
-
-  controller.get("selectedPostIds").pushObject(42);
-
-  assert.ok(
-    controller.get("selectedAllPosts"),
-    "all posts (including filtered posts) are selected"
-  );
-
-  model.setProperties({
-    "postStream.isMegaTopic": true,
-    posts_count: 1,
+    assert.not(
+      controller.get("editingTopic"),
+      "cancelling edit mode reverts the property value"
+    );
   });
 
-  assert.ok(
-    controller.get("selectedAllPosts"),
-    "it uses the topic's post count for megatopics"
-  );
-});
-
-test("selectedPostsUsername", function (assert) {
-  let model = topicWithStream({
-    posts: [
-      { id: 1, username: "gary" },
-      { id: 2, username: "gary" },
-      { id: 3, username: "lili" },
-    ],
-    stream: [1, 2, 3],
-  });
-  const controller = this.subject({ model });
-  const selectedPostIds = controller.get("selectedPostIds");
-
-  assert.equal(
-    controller.get("selectedPostsUsername"),
-    undefined,
-    "no username when no selected posts"
-  );
-
-  selectedPostIds.pushObject(1);
-
-  assert.equal(
-    controller.get("selectedPostsUsername"),
-    "gary",
-    "username of the selected posts"
-  );
-
-  selectedPostIds.pushObject(2);
-
-  assert.equal(
-    controller.get("selectedPostsUsername"),
-    "gary",
-    "username of all the selected posts when same user"
-  );
-
-  selectedPostIds.pushObject(3);
-
-  assert.equal(
-    controller.get("selectedPostsUsername"),
-    undefined,
-    "no username when more than 1 user"
-  );
-
-  selectedPostIds.replace(2, 1, [42]);
-
-  assert.equal(
-    controller.get("selectedPostsUsername"),
-    undefined,
-    "no username when not already loaded posts are selected"
-  );
-});
-
-test("showSelectedPostsAtBottom", function (assert) {
-  const site = EmberObject.create({ mobileView: false });
-  const model = Topic.create({ posts_count: 3 });
-  const controller = this.subject({ model, site });
-
-  assert.not(controller.get("showSelectedPostsAtBottom"), "false on desktop");
-
-  site.set("mobileView", true);
-
-  assert.not(
-    controller.get("showSelectedPostsAtBottom"),
-    "requires at least 3 posts on mobile"
-  );
-
-  model.set("posts_count", 4);
-
-  assert.ok(
-    controller.get("showSelectedPostsAtBottom"),
-    "true when mobile and more than 3 posts"
-  );
-});
-
-test("canDeleteSelected", function (assert) {
-  const currentUser = User.create({ admin: false });
-  this.registry.register("current-user:main", currentUser, {
-    instantiate: false,
-  });
-  this.registry.injection("controller", "currentUser", "current-user:main");
-  let model = topicWithStream({
-    posts: [
-      { id: 1, can_delete: false },
-      { id: 2, can_delete: true },
-      { id: 3, can_delete: true },
-    ],
-    stream: [1, 2, 3],
-  });
-  const controller = this.subject({ model });
-  const selectedPostIds = controller.get("selectedPostIds");
-
-  assert.not(
-    controller.get("canDeleteSelected"),
-    "false when no posts are selected"
-  );
-
-  selectedPostIds.pushObject(1);
-
-  assert.not(
-    controller.get("canDeleteSelected"),
-    "false when can't delete one of the selected posts"
-  );
-
-  selectedPostIds.replace(0, 1, [2, 3]);
-
-  assert.ok(
-    controller.get("canDeleteSelected"),
-    "true when all selected posts can be deleted"
-  );
-
-  selectedPostIds.pushObject(1);
-
-  assert.not(
-    controller.get("canDeleteSelected"),
-    "false when all posts are selected and user is staff"
-  );
-
-  currentUser.set("admin", true);
-
-  assert.ok(
-    controller.get("canDeleteSelected"),
-    "true when all posts are selected and user is staff"
-  );
-});
-
-test("Can split/merge topic", function (assert) {
-  let model = topicWithStream({
-    posts: [
-      { id: 1, post_number: 1, post_type: 1 },
-      { id: 2, post_number: 2, post_type: 4 },
-      { id: 3, post_number: 3, post_type: 1 },
-    ],
-    stream: [1, 2, 3],
-  });
-  model.set("details.can_move_posts", false);
-  const controller = this.subject({ model });
-  const selectedPostIds = controller.get("selectedPostIds");
-
-  assert.not(
-    controller.get("canMergeTopic"),
-    "can't merge topic when no posts are selected"
-  );
-
-  selectedPostIds.pushObject(1);
-
-  assert.not(
-    controller.get("canMergeTopic"),
-    "can't merge topic when can't move posts"
-  );
-
-  model.set("details.can_move_posts", true);
-
-  assert.ok(controller.get("canMergeTopic"), "can merge topic");
-
-  selectedPostIds.removeObject(1);
-  selectedPostIds.pushObject(2);
-
-  assert.ok(
-    controller.get("canMergeTopic"),
-    "can merge topic when 1st post is not a regular post"
-  );
-
-  selectedPostIds.pushObject(3);
-
-  assert.ok(
-    controller.get("canMergeTopic"),
-    "can merge topic when all posts are selected"
-  );
-});
-
-test("canChangeOwner", function (assert) {
-  const currentUser = User.create({ admin: false });
-  this.registry.register("current-user:main", currentUser, {
-    instantiate: false,
-  });
-  this.registry.injection("controller", "currentUser", "current-user:main");
-
-  let model = topicWithStream({
-    posts: [
-      { id: 1, username: "gary" },
-      { id: 2, username: "lili" },
-    ],
-    stream: [1, 2],
-  });
-  model.set("currentUser", { admin: false });
-  const controller = this.subject({ model });
-  const selectedPostIds = controller.get("selectedPostIds");
-
-  assert.not(
-    controller.get("canChangeOwner"),
-    "false when no posts are selected"
-  );
-
-  selectedPostIds.pushObject(1);
-
-  assert.not(controller.get("canChangeOwner"), "false when not admin");
-
-  currentUser.set("admin", true);
-
-  assert.ok(
-    controller.get("canChangeOwner"),
-    "true when admin and one post is selected"
-  );
-
-  selectedPostIds.pushObject(2);
-
-  assert.not(
-    controller.get("canChangeOwner"),
-    "false when admin but more than 1 user"
-  );
-});
-
-test("canMergePosts", function (assert) {
-  let model = topicWithStream({
-    posts: [
-      { id: 1, username: "gary", can_delete: true },
-      { id: 2, username: "lili", can_delete: true },
-      { id: 3, username: "gary", can_delete: false },
-      { id: 4, username: "gary", can_delete: true },
-    ],
-    stream: [1, 2, 3],
-  });
-  const controller = this.subject({ model });
-  const selectedPostIds = controller.get("selectedPostIds");
-
-  assert.not(
-    controller.get("canMergePosts"),
-    "false when no posts are selected"
-  );
-
-  selectedPostIds.pushObject(1);
-
-  assert.not(
-    controller.get("canMergePosts"),
-    "false when only one post is selected"
-  );
-
-  selectedPostIds.pushObject(2);
-
-  assert.not(
-    controller.get("canMergePosts"),
-    "false when selected posts are from different users"
-  );
-
-  selectedPostIds.replace(1, 1, [3]);
-
-  assert.not(
-    controller.get("canMergePosts"),
-    "false when selected posts can't be deleted"
-  );
-
-  selectedPostIds.replace(1, 1, [4]);
-
-  assert.ok(
-    controller.get("canMergePosts"),
-    "true when all selected posts are deletable and by the same user"
-  );
-});
-
-test("Select/deselect all", function (assert) {
-  let model = topicWithStream({ stream: [1, 2, 3] });
-  const controller = this.subject({ model });
-
-  assert.equal(
-    controller.get("selectedPostsCount"),
-    0,
-    "no posts selected by default"
-  );
-
-  controller.send("selectAll");
-
-  assert.equal(
-    controller.get("selectedPostsCount"),
-    3,
-    "calling 'selectAll' selects all posts"
-  );
-
-  controller.send("deselectAll");
-
-  assert.equal(
-    controller.get("selectedPostsCount"),
-    0,
-    "calling 'deselectAll' deselects all posts"
-  );
-});
-
-test("togglePostSelection", function (assert) {
-  const controller = this.subject();
-  const selectedPostIds = controller.get("selectedPostIds");
-
-  assert.equal(selectedPostIds[0], undefined, "no posts selected by default");
-
-  controller.send("togglePostSelection", { id: 1 });
-
-  assert.equal(
-    selectedPostIds[0],
-    1,
-    "adds the selected post id if not already selected"
-  );
-
-  controller.send("togglePostSelection", { id: 1 });
-
-  assert.equal(
-    selectedPostIds[0],
-    undefined,
-    "removes the selected post id if already selected"
-  );
-});
-
-// test("selectReplies", function(assert) {
-//   const controller = this.subject();
-//   const selectedPostIds = controller.get("selectedPostIds");
-//
-//   assert.equal(selectedPostIds[0], undefined, "no posts selected by default");
-//
-//   controller.send("selectReplies", { id: 42 });
-//
-//   assert.equal(selectedPostIds[0], 42, "selected post #42");
-//   assert.equal(selectedPostIds[1], 45, "selected post #45");
-//   assert.equal(selectedPostIds[2], 100, "selected post #100");
-// });
-
-test("selectBelow", function (assert) {
-  const site = EmberObject.create({
-    post_types: { small_action: 3, whisper: 4 },
-  });
-  let model = topicWithStream({
-    stream: [1, 2, 3, 4, 5, 6, 7, 8],
-    posts: [
-      { id: 5, cooked: "whisper post", post_type: 4 },
-      { id: 6, cooked: "a small action", post_type: 3 },
-      { id: 7, cooked: "", post_type: 4 },
-    ],
-  });
-  const controller = this.subject({ site, model });
-  let selectedPostIds = controller.get("selectedPostIds");
-
-  assert.equal(selectedPostIds[0], undefined, "no posts selected by default");
-
-  controller.send("selectBelow", { id: 3 });
-
-  assert.equal(selectedPostIds[0], 3, "selected post #3");
-  assert.equal(selectedPostIds[1], 4, "also selected 1st post below post #3");
-  assert.equal(selectedPostIds[2], 5, "also selected 2nd post below post #3");
-  assert.equal(selectedPostIds[3], 8, "also selected 3rd post below post #3");
-});
-
-test("topVisibleChanged", function (assert) {
-  let model = topicWithStream({
-    posts: [{ id: 1 }],
-  });
-  const controller = this.subject({ model });
-  const placeholder = new Placeholder("post-placeholder");
-
-  assert.equal(
-    controller.send("topVisibleChanged", {
-      post: placeholder,
-    }),
-    null,
-    "it should work with a post-placehodler"
-  );
-});
-
-test("deletePost - no modal is shown if post does not have replies", function (assert) {
-  pretender.get("/posts/2/reply-ids.json", () => {
-    return [200, { "Content-Type": "application/json" }, []];
-  });
-
-  let destroyed;
-  const post = EmberObject.create({
-    id: 2,
-    post_number: 2,
-    can_delete: true,
-    reply_count: 3,
-    destroy: () => {
+  test("deleteTopic", function (assert) {
+    const model = Topic.create();
+    let destroyed = false;
+    let modalDisplayed = false;
+    model.destroy = () => {
       destroyed = true;
       return Promise.resolve();
-    },
+    };
+    const controller = this.getController("topic", {
+      model,
+      siteSettings: {
+        min_topic_views_for_delete_confirm: 5,
+      },
+      deleteTopicModal: () => {
+        modalDisplayed = true;
+      },
+    });
+
+    model.set("views", 10000);
+    controller.send("deleteTopic");
+    assert.not(destroyed, "don't destroy popular topic");
+    assert.ok(modalDisplayed, "display confirmation modal for popular topic");
+
+    model.set("views", 3);
+    controller.send("deleteTopic");
+    assert.ok(destroyed, "destroy not popular topic");
   });
 
-  const currentUser = EmberObject.create({ moderator: true });
-  let model = topicWithStream({
-    stream: [2, 3, 4],
-    posts: [post, { id: 3 }, { id: 4 }],
+  test("toggleMultiSelect", async function (assert) {
+    const model = Topic.create();
+    const controller = this.getController("topic", { model });
+
+    assert.not(
+      controller.get("multiSelect"),
+      "multi selection mode is disabled by default"
+    );
+
+    controller.get("selectedPostIds").pushObject(1);
+    assert.equal(controller.get("selectedPostIds.length"), 1);
+
+    controller.send("toggleMultiSelect");
+    await settled();
+
+    assert.ok(
+      controller.get("multiSelect"),
+      "calling 'toggleMultiSelect' once enables multi selection mode"
+    );
+    assert.equal(
+      controller.get("selectedPostIds.length"),
+      0,
+      "toggling 'multiSelect' clears 'selectedPostIds'"
+    );
+
+    controller.get("selectedPostIds").pushObject(2);
+    assert.equal(controller.get("selectedPostIds.length"), 1);
+
+    controller.send("toggleMultiSelect");
+    await settled();
+
+    assert.not(
+      controller.get("multiSelect"),
+      "calling 'toggleMultiSelect' twice disables multi selection mode"
+    );
+    assert.equal(
+      controller.get("selectedPostIds.length"),
+      0,
+      "toggling 'multiSelect' clears 'selectedPostIds'"
+    );
   });
-  const controller = this.subject({ model, currentUser });
 
-  const done = assert.async();
-  controller.send("deletePost", post);
+  test("selectedPosts", function (assert) {
+    let model = topicWithStream({ posts: [{ id: 1 }, { id: 2 }, { id: 3 }] });
+    const controller = this.getController("topic", { model });
 
-  next(() => {
-    assert.ok(destroyed, "post was destroyed");
-    done();
+    controller.set("selectedPostIds", [1, 2, 42]);
+
+    assert.equal(
+      controller.get("selectedPosts.length"),
+      2,
+      "selectedPosts only contains already loaded posts"
+    );
+    assert.not(
+      controller.get("selectedPosts").some((p) => p === undefined),
+      "selectedPosts only contains valid post objects"
+    );
+  });
+
+  test("selectedAllPosts", function (assert) {
+    let model = topicWithStream({ stream: [1, 2, 3] });
+    const controller = this.getController("topic", { model });
+
+    controller.set("selectedPostIds", [1, 2]);
+
+    assert.not(
+      controller.get("selectedAllPosts"),
+      "not all posts are selected"
+    );
+
+    controller.get("selectedPostIds").pushObject(3);
+
+    assert.ok(controller.get("selectedAllPosts"), "all posts are selected");
+
+    controller.get("selectedPostIds").pushObject(42);
+
+    assert.ok(
+      controller.get("selectedAllPosts"),
+      "all posts (including filtered posts) are selected"
+    );
+
+    model.setProperties({
+      "postStream.isMegaTopic": true,
+      posts_count: 1,
+    });
+
+    assert.ok(
+      controller.get("selectedAllPosts"),
+      "it uses the topic's post count for megatopics"
+    );
+  });
+
+  test("selectedPostsUsername", function (assert) {
+    let model = topicWithStream({
+      posts: [
+        { id: 1, username: "gary" },
+        { id: 2, username: "gary" },
+        { id: 3, username: "lili" },
+      ],
+      stream: [1, 2, 3],
+    });
+    const controller = this.getController("topic", { model });
+    const selectedPostIds = controller.get("selectedPostIds");
+
+    assert.equal(
+      controller.get("selectedPostsUsername"),
+      undefined,
+      "no username when no selected posts"
+    );
+
+    selectedPostIds.pushObject(1);
+
+    assert.equal(
+      controller.get("selectedPostsUsername"),
+      "gary",
+      "username of the selected posts"
+    );
+
+    selectedPostIds.pushObject(2);
+
+    assert.equal(
+      controller.get("selectedPostsUsername"),
+      "gary",
+      "username of all the selected posts when same user"
+    );
+
+    selectedPostIds.pushObject(3);
+
+    assert.equal(
+      controller.get("selectedPostsUsername"),
+      undefined,
+      "no username when more than 1 user"
+    );
+
+    selectedPostIds.replace(2, 1, [42]);
+
+    assert.equal(
+      controller.get("selectedPostsUsername"),
+      undefined,
+      "no username when not already loaded posts are selected"
+    );
+  });
+
+  test("showSelectedPostsAtBottom", function (assert) {
+    const site = EmberObject.create({ mobileView: false });
+    const model = Topic.create({ posts_count: 3 });
+    const controller = this.getController("topic", { model, site });
+
+    assert.not(controller.get("showSelectedPostsAtBottom"), "false on desktop");
+
+    site.set("mobileView", true);
+
+    assert.not(
+      controller.get("showSelectedPostsAtBottom"),
+      "requires at least 3 posts on mobile"
+    );
+
+    model.set("posts_count", 4);
+
+    assert.ok(
+      controller.get("showSelectedPostsAtBottom"),
+      "true when mobile and more than 3 posts"
+    );
+  });
+
+  test("canDeleteSelected", function (assert) {
+    const currentUser = User.create({ admin: false });
+    this.registry.register("current-user:main", currentUser, {
+      instantiate: false,
+    });
+    this.registry.injection("controller", "currentUser", "current-user:main");
+    let model = topicWithStream({
+      posts: [
+        { id: 1, can_delete: false },
+        { id: 2, can_delete: true },
+        { id: 3, can_delete: true },
+      ],
+      stream: [1, 2, 3],
+    });
+    const controller = this.getController("topic", {
+      model,
+      currentUser,
+    });
+    const selectedPostIds = controller.get("selectedPostIds");
+
+    assert.not(
+      controller.get("canDeleteSelected"),
+      "false when no posts are selected"
+    );
+
+    selectedPostIds.pushObject(1);
+
+    assert.not(
+      controller.get("canDeleteSelected"),
+      "false when can't delete one of the selected posts"
+    );
+
+    selectedPostIds.replace(0, 1, [2, 3]);
+
+    assert.ok(
+      controller.get("canDeleteSelected"),
+      "true when all selected posts can be deleted"
+    );
+
+    selectedPostIds.pushObject(1);
+
+    assert.not(
+      controller.get("canDeleteSelected"),
+      "false when all posts are selected and user is staff"
+    );
+
+    currentUser.set("admin", true);
+
+    assert.ok(
+      controller.get("canDeleteSelected"),
+      "true when all posts are selected and user is staff"
+    );
+  });
+
+  test("Can split/merge topic", function (assert) {
+    let model = topicWithStream({
+      posts: [
+        { id: 1, post_number: 1, post_type: 1 },
+        { id: 2, post_number: 2, post_type: 4 },
+        { id: 3, post_number: 3, post_type: 1 },
+      ],
+      stream: [1, 2, 3],
+    });
+    model.set("details.can_move_posts", false);
+    const controller = this.getController("topic", { model });
+    const selectedPostIds = controller.get("selectedPostIds");
+
+    assert.not(
+      controller.get("canMergeTopic"),
+      "can't merge topic when no posts are selected"
+    );
+
+    selectedPostIds.pushObject(1);
+
+    assert.not(
+      controller.get("canMergeTopic"),
+      "can't merge topic when can't move posts"
+    );
+
+    model.set("details.can_move_posts", true);
+
+    assert.ok(controller.get("canMergeTopic"), "can merge topic");
+
+    selectedPostIds.removeObject(1);
+    selectedPostIds.pushObject(2);
+
+    assert.ok(
+      controller.get("canMergeTopic"),
+      "can merge topic when 1st post is not a regular post"
+    );
+
+    selectedPostIds.pushObject(3);
+
+    assert.ok(
+      controller.get("canMergeTopic"),
+      "can merge topic when all posts are selected"
+    );
+  });
+
+  test("canChangeOwner", function (assert) {
+    const currentUser = User.create({ admin: false });
+    this.registry.register("current-user:main", currentUser, {
+      instantiate: false,
+    });
+    this.registry.injection("controller", "currentUser", "current-user:main");
+
+    let model = topicWithStream({
+      posts: [
+        { id: 1, username: "gary" },
+        { id: 2, username: "lili" },
+      ],
+      stream: [1, 2],
+    });
+    model.set("currentUser", { admin: false });
+    const controller = this.getController("topic", {
+      model,
+      currentUser,
+    });
+    const selectedPostIds = controller.get("selectedPostIds");
+
+    assert.not(
+      controller.get("canChangeOwner"),
+      "false when no posts are selected"
+    );
+
+    selectedPostIds.pushObject(1);
+
+    assert.not(controller.get("canChangeOwner"), "false when not admin");
+
+    currentUser.set("admin", true);
+
+    assert.ok(
+      controller.get("canChangeOwner"),
+      "true when admin and one post is selected"
+    );
+
+    selectedPostIds.pushObject(2);
+
+    assert.not(
+      controller.get("canChangeOwner"),
+      "false when admin but more than 1 user"
+    );
+  });
+
+  test("canMergePosts", function (assert) {
+    let model = topicWithStream({
+      posts: [
+        { id: 1, username: "gary", can_delete: true },
+        { id: 2, username: "lili", can_delete: true },
+        { id: 3, username: "gary", can_delete: false },
+        { id: 4, username: "gary", can_delete: true },
+      ],
+      stream: [1, 2, 3],
+    });
+    const controller = this.getController("topic", {
+      model,
+    });
+    const selectedPostIds = controller.get("selectedPostIds");
+
+    assert.not(
+      controller.get("canMergePosts"),
+      "false when no posts are selected"
+    );
+
+    selectedPostIds.pushObject(1);
+
+    assert.not(
+      controller.get("canMergePosts"),
+      "false when only one post is selected"
+    );
+
+    selectedPostIds.pushObject(2);
+
+    assert.not(
+      controller.get("canMergePosts"),
+      "false when selected posts are from different users"
+    );
+
+    selectedPostIds.replace(1, 1, [3]);
+
+    assert.not(
+      controller.get("canMergePosts"),
+      "false when selected posts can't be deleted"
+    );
+
+    selectedPostIds.replace(1, 1, [4]);
+
+    assert.ok(
+      controller.get("canMergePosts"),
+      "true when all selected posts are deletable and by the same user"
+    );
+  });
+
+  test("Select/deselect all", function (assert) {
+    let model = topicWithStream({ stream: [1, 2, 3] });
+    const controller = this.getController("topic", { model });
+
+    assert.equal(
+      controller.get("selectedPostsCount"),
+      0,
+      "no posts selected by default"
+    );
+
+    controller.send("selectAll");
+
+    assert.equal(
+      controller.get("selectedPostsCount"),
+      3,
+      "calling 'selectAll' selects all posts"
+    );
+
+    controller.send("deselectAll");
+
+    assert.equal(
+      controller.get("selectedPostsCount"),
+      0,
+      "calling 'deselectAll' deselects all posts"
+    );
+  });
+
+  test("togglePostSelection", function (assert) {
+    const controller = this.getController("topic");
+    const selectedPostIds = controller.get("selectedPostIds");
+
+    assert.equal(selectedPostIds[0], undefined, "no posts selected by default");
+
+    controller.send("togglePostSelection", { id: 1 });
+
+    assert.equal(
+      selectedPostIds[0],
+      1,
+      "adds the selected post id if not already selected"
+    );
+
+    controller.send("togglePostSelection", { id: 1 });
+
+    assert.equal(
+      selectedPostIds[0],
+      undefined,
+      "removes the selected post id if already selected"
+    );
+  });
+
+  test("selectBelow", function (assert) {
+    const site = EmberObject.create({
+      post_types: { small_action: 3, whisper: 4 },
+    });
+    let model = topicWithStream({
+      stream: [1, 2, 3, 4, 5, 6, 7, 8],
+      posts: [
+        { id: 5, cooked: "whisper post", post_type: 4 },
+        { id: 6, cooked: "a small action", post_type: 3 },
+        { id: 7, cooked: "", post_type: 4 },
+      ],
+    });
+    const controller = this.getController("topic", { site, model });
+    let selectedPostIds = controller.get("selectedPostIds");
+
+    assert.equal(selectedPostIds[0], undefined, "no posts selected by default");
+
+    controller.send("selectBelow", { id: 3 });
+
+    assert.equal(selectedPostIds[0], 3, "selected post #3");
+    assert.equal(selectedPostIds[1], 4, "also selected 1st post below post #3");
+    assert.equal(selectedPostIds[2], 5, "also selected 2nd post below post #3");
+    assert.equal(selectedPostIds[3], 8, "also selected 3rd post below post #3");
+  });
+
+  test("topVisibleChanged", function (assert) {
+    let model = topicWithStream({
+      posts: [{ id: 1 }],
+    });
+    const controller = this.getController("topic", { model });
+    const placeholder = new Placeholder("post-placeholder");
+
+    assert.equal(
+      controller.send("topVisibleChanged", {
+        post: placeholder,
+      }),
+      null,
+      "it should work with a post-placehodler"
+    );
+  });
+
+  test("deletePost - no modal is shown if post does not have replies", function (assert) {
+    pretender.get("/posts/2/reply-ids.json", () => {
+      return [200, { "Content-Type": "application/json" }, []];
+    });
+
+    let destroyed;
+    const post = EmberObject.create({
+      id: 2,
+      post_number: 2,
+      can_delete: true,
+      reply_count: 3,
+      destroy: () => {
+        destroyed = true;
+        return Promise.resolve();
+      },
+    });
+
+    const currentUser = EmberObject.create({ moderator: true });
+    let model = topicWithStream({
+      stream: [2, 3, 4],
+      posts: [post, { id: 3 }, { id: 4 }],
+    });
+    const controller = this.getController("topic", { model, currentUser });
+
+    const done = assert.async();
+    controller.send("deletePost", post);
+
+    next(() => {
+      assert.ok(destroyed, "post was destroyed");
+      done();
+    });
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js b/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
index 3aa18c8d52..155af39015 100644
--- a/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
@@ -1,12 +1,12 @@
-import { test, module } from "qunit";
-import { setResolverOption, buildResolver } from "discourse-common/resolver";
+import { buildResolver, setResolverOption } from "discourse-common/resolver";
+import { module, test } from "qunit";
 
 let originalTemplates;
 let resolver;
 
 function lookupTemplate(assert, name, expectedTemplate, message) {
-  var parseName = resolver.parseName(name);
-  var result = resolver.resolveTemplate(parseName);
+  let parseName = resolver.parseName(name);
+  let result = resolver.resolveTemplate(parseName);
   assert.equal(result, expectedTemplate, message);
 }
 
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/allow-lister-test.js b/app/assets/javascripts/discourse/tests/unit/lib/allow-lister-test.js
index 683ab4c0fd..0a759c16bc 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/allow-lister-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/allow-lister-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import AllowLister from "pretty-text/allow-lister";
 
 module("Unit | Utility | allowLister", function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/bookmark-test.js b/app/assets/javascripts/discourse/tests/unit/lib/bookmark-test.js
index 4635b46997..79dcb4a6fe 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/bookmark-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/bookmark-test.js
@@ -1,7 +1,7 @@
-import sinon from "sinon";
-import { test, module } from "qunit";
-import { formattedReminderTime } from "discourse/lib/bookmark";
+import { module, test } from "qunit";
 import { fakeTime } from "discourse/tests/helpers/qunit-helpers";
+import { formattedReminderTime } from "discourse/lib/bookmark";
+import sinon from "sinon";
 
 module("Unit | Utility | bookmark", function (hooks) {
   hooks.beforeEach(function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/break-string-test.js b/app/assets/javascripts/discourse/tests/unit/lib/break-string-test.js
deleted file mode 100644
index 35a13b7607..0000000000
--- a/app/assets/javascripts/discourse/tests/unit/lib/break-string-test.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { test, module } from "qunit";
-/* global BreakString:true */
-
-module("Unit | Utility | breakString", function () {
-  test("breakString", function (assert) {
-    const b = (s, hint) => new BreakString(s).break(hint);
-
-    assert.equal(b("hello"), "hello");
-    assert.equal(b("helloworld"), "helloworld");
-    assert.equal(b("HeMans11"), "He<wbr>&#8203;Mans<wbr>&#8203;11");
-    assert.equal(b("he_man"), "he_<wbr>&#8203;man");
-    assert.equal(b("he11111"), "he<wbr>&#8203;11111");
-    assert.equal(b("HRCBob"), "HRC<wbr>&#8203;Bob");
-    assert.equal(
-      b("bobmarleytoo", "Bob Marley Too"),
-      "bob<wbr>&#8203;marley<wbr>&#8203;too"
-    );
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/category-badge-test.js b/app/assets/javascripts/discourse/tests/unit/lib/category-badge-test.js
index 5f59b74e4c..21236dec84 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/category-badge-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/category-badge-test.js
@@ -1,9 +1,9 @@
-import { test } from "qunit";
+import Site from "discourse/models/site";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import createStore from "discourse/tests/helpers/create-store";
 import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import Site from "discourse/models/site";
 import sinon from "sinon";
-import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import { test } from "qunit";
 
 discourseModule("Unit | Utility | category-badge", function () {
   test("categoryBadge without a category", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/click-track-edit-history-test.js b/app/assets/javascripts/discourse/tests/unit/lib/click-track-edit-history-test.js
index ae6b16e66d..f6e875e6a6 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/click-track-edit-history-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/click-track-edit-history-test.js
@@ -1,10 +1,10 @@
-import sinon from "sinon";
-import { module, skip } from "qunit";
-import DiscourseURL from "discourse/lib/url";
-import ClickTrack from "discourse/lib/click-track";
 import { fixture, logIn } from "discourse/tests/helpers/qunit-helpers";
+import { module, skip } from "qunit";
+import ClickTrack from "discourse/lib/click-track";
+import DiscourseURL from "discourse/lib/url";
 import User from "discourse/models/user";
 import pretender from "discourse/tests/helpers/create-pretender";
+import sinon from "sinon";
 
 const track = ClickTrack.trackClick;
 
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/click-track-profile-page-test.js b/app/assets/javascripts/discourse/tests/unit/lib/click-track-profile-page-test.js
index 3bf79ce2c4..1de09ca57a 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/click-track-profile-page-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/click-track-profile-page-test.js
@@ -1,9 +1,9 @@
-import sinon from "sinon";
-import { module, skip } from "qunit";
-import DiscourseURL from "discourse/lib/url";
-import ClickTrack from "discourse/lib/click-track";
 import { fixture, logIn } from "discourse/tests/helpers/qunit-helpers";
+import { module, skip } from "qunit";
+import ClickTrack from "discourse/lib/click-track";
+import DiscourseURL from "discourse/lib/url";
 import pretender from "discourse/tests/helpers/create-pretender";
+import sinon from "sinon";
 
 const track = ClickTrack.trackClick;
 
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/click-track-test.js b/app/assets/javascripts/discourse/tests/unit/lib/click-track-test.js
index d29cd0f770..14b0b66d81 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/click-track-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/click-track-test.js
@@ -1,11 +1,11 @@
-import sinon from "sinon";
-import { skip, test, module } from "qunit";
-import { later } from "@ember/runloop";
-import DiscourseURL from "discourse/lib/url";
-import ClickTrack from "discourse/lib/click-track";
 import { fixture, logIn } from "discourse/tests/helpers/qunit-helpers";
+import { module, skip, test } from "qunit";
+import ClickTrack from "discourse/lib/click-track";
+import DiscourseURL from "discourse/lib/url";
 import User from "discourse/models/user";
+import { later } from "@ember/runloop";
 import pretender from "discourse/tests/helpers/create-pretender";
+import sinon from "sinon";
 
 const track = ClickTrack.trackClick;
 
@@ -154,7 +154,7 @@ module("Unit | Utility | click-track", function (hooks) {
 
     assert.notOk(track(generateClickEventOn("a")));
 
-    var $link = fixture("a").first();
+    let $link = fixture("a").first();
     assert.ok($link.hasClass("no-href"));
     assert.equal($link.data("href"), "http://www.google.com/");
     assert.blank($link.attr("href"));
@@ -178,7 +178,7 @@ module("Unit | Utility | click-track", function (hooks) {
 
   function badgeClickCount(assert, id, expected) {
     track(generateClickEventOn("#" + id));
-    var $badge = $("span.badge", fixture("#" + id).first());
+    let $badge = $("span.badge", fixture("#" + id).first());
     assert.equal(parseInt($badge.html(), 10), expected);
   }
 
@@ -200,7 +200,7 @@ module("Unit | Utility | click-track", function (hooks) {
 
   function testOpenInANewTab(description, clickEventModifier) {
     test(description, async function (assert) {
-      var clickEvent = generateClickEventOn("a");
+      let clickEvent = generateClickEventOn("a");
       clickEventModifier(clickEvent);
       assert.ok(track(clickEvent));
       assert.notOk(clickEvent.defaultPrevented);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js b/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js
index 869336cc81..e8d7cd3db9 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js
@@ -1,18 +1,18 @@
-import sinon from "sinon";
-import { test } from "qunit";
-import I18n from "I18n";
-import EmberObject from "@ember/object";
 import {
-  setting,
+  fmt,
+  htmlSafe,
+  i18n,
   propertyEqual,
   propertyNotEqual,
-  fmt,
-  i18n,
+  setting,
   url,
-  htmlSafe,
 } from "discourse/lib/computed";
-import { setPrefix } from "discourse-common/lib/get-url";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
 import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import { setPrefix } from "discourse-common/lib/get-url";
+import sinon from "sinon";
+import { test } from "qunit";
 
 discourseModule("Unit | Utility | computed", function (hooks) {
   hooks.beforeEach(function () {
@@ -45,7 +45,7 @@ discourseModule("Unit | Utility | computed", function (hooks) {
   });
 
   test("propertyEqual", function (assert) {
-    var t = EmberObject.extend({
+    let t = EmberObject.extend({
       same: propertyEqual("cookies", "biscuits"),
     }).create({
       cookies: 10,
@@ -58,7 +58,7 @@ discourseModule("Unit | Utility | computed", function (hooks) {
   });
 
   test("propertyNotEqual", function (assert) {
-    var t = EmberObject.extend({
+    let t = EmberObject.extend({
       diff: propertyNotEqual("cookies", "biscuits"),
     }).create({
       cookies: 10,
@@ -71,7 +71,7 @@ discourseModule("Unit | Utility | computed", function (hooks) {
   });
 
   test("fmt", function (assert) {
-    var t = EmberObject.extend({
+    let t = EmberObject.extend({
       exclaimyUsername: fmt("username", "!!! %@ !!!"),
       multiple: fmt("username", "mood", "%@ is %@"),
     }).create({
@@ -105,7 +105,7 @@ discourseModule("Unit | Utility | computed", function (hooks) {
   });
 
   test("i18n", function (assert) {
-    var t = EmberObject.extend({
+    let t = EmberObject.extend({
       exclaimyUsername: i18n("username", "!!! %@ !!!"),
       multiple: i18n("username", "mood", "%@ is %@"),
     }).create({
@@ -139,7 +139,7 @@ discourseModule("Unit | Utility | computed", function (hooks) {
   });
 
   test("url", function (assert) {
-    var t, testClass;
+    let t, testClass;
 
     testClass = EmberObject.extend({
       userUrl: url("username", "/u/%@"),
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/emoji-store-test.js b/app/assets/javascripts/discourse/tests/unit/lib/emoji-store-test.js
index 2c49202e7b..fa17f404e6 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/emoji-store-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/emoji-store-test.js
@@ -1,5 +1,5 @@
-import { test } from "qunit";
 import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
 
 discourseModule("Unit | Utility | emoji-emojiStore", function (hooks) {
   hooks.beforeEach(function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/emoji-test.js b/app/assets/javascripts/discourse/tests/unit/lib/emoji-test.js
index 78cc82b272..8c75f8efb8 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/emoji-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/emoji-test.js
@@ -1,8 +1,8 @@
-import { test } from "qunit";
-import { emojiSearch } from "pretty-text/emoji";
-import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
-import { emojiUnescape } from "discourse/lib/text";
 import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import { emojiSearch } from "pretty-text/emoji";
+import { emojiUnescape } from "discourse/lib/text";
+import { test } from "qunit";
+import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
 
 discourseModule("Unit | Utility | emoji", function () {
   test("emojiUnescape", function (assert) {
@@ -32,12 +32,12 @@ discourseModule("Unit | Utility | emoji", function () {
     );
     testUnescape(
       "emoticons :)",
-      `emoticons <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/slight_smile.png?v=${v}' title='slight_smile' alt='slight_smile' class='emoji'>`,
+      `emoticons <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/slight_smile.png?v=${v}' title='slight_smile' alt='slight_smile' class='emoji'>`,
       "emoticons are still supported"
     );
     testUnescape(
       "With emoji :O: :frog: :smile:",
-      `With emoji <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/o.png?v=${v}' title='O' alt='O' class='emoji'> <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/frog.png?v=${v}' title='frog' alt='frog' class='emoji'> <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/smile.png?v=${v}' title='smile' alt='smile' class='emoji'>`,
+      `With emoji <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/o.png?v=${v}' title='O' alt='O' class='emoji'> <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/frog.png?v=${v}' title='frog' alt='frog' class='emoji'> <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/smile.png?v=${v}' title='smile' alt='smile' class='emoji'>`,
       "title with emoji"
     );
     testUnescape(
@@ -47,27 +47,27 @@ discourseModule("Unit | Utility | emoji", function () {
     );
     testUnescape(
       "(:frog:) :)",
-      `(<img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/frog.png?v=${v}' title='frog' alt='frog' class='emoji'>) <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/slight_smile.png?v=${v}' title='slight_smile' alt='slight_smile' class='emoji'>`,
+      `(<img width=\"20\" height=\"20\" src='/images/emoji/google_classic/frog.png?v=${v}' title='frog' alt='frog' class='emoji'>) <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/slight_smile.png?v=${v}' title='slight_smile' alt='slight_smile' class='emoji'>`,
       "non-word characters allowed next to emoji"
     );
     testUnescape(
       ":smile: hi",
-      `<img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/smile.png?v=${v}' title='smile' alt='smile' class='emoji'> hi`,
+      `<img width=\"20\" height=\"20\" src='/images/emoji/google_classic/smile.png?v=${v}' title='smile' alt='smile' class='emoji'> hi`,
       "start of line"
     );
     testUnescape(
       "hi :smile:",
-      `hi <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/smile.png?v=${v}' title='smile' alt='smile' class='emoji'>`,
+      `hi <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/smile.png?v=${v}' title='smile' alt='smile' class='emoji'>`,
       "end of line"
     );
     testUnescape(
       "hi :blonde_woman:t4:",
-      `hi <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/blonde_woman/4.png?v=${v}' title='blonde_woman:t4' alt='blonde_woman:t4' class='emoji'>`,
+      `hi <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/blonde_woman/4.png?v=${v}' title='blonde_woman:t4' alt='blonde_woman:t4' class='emoji'>`,
       "support for skin tones"
     );
     testUnescape(
       "hi :blonde_woman:t4: :blonde_man:t6:",
-      `hi <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/blonde_woman/4.png?v=${v}' title='blonde_woman:t4' alt='blonde_woman:t4' class='emoji'> <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/blonde_man/6.png?v=${v}' title='blonde_man:t6' alt='blonde_man:t6' class='emoji'>`,
+      `hi <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/blonde_woman/4.png?v=${v}' title='blonde_woman:t4' alt='blonde_woman:t4' class='emoji'> <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/blonde_man/6.png?v=${v}' title='blonde_man:t6' alt='blonde_man:t6' class='emoji'>`,
       "support for multiple skin tones"
     );
     testUnescape(
@@ -95,7 +95,7 @@ discourseModule("Unit | Utility | emoji", function () {
     );
     testUnescape(
       "Hello 😊 World",
-      `Hello <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/blush.png?v=${v}' title='blush' alt='blush' class='emoji'> World`,
+      `Hello <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/blush.png?v=${v}' title='blush' alt='blush' class='emoji'> World`,
       "emoji from Unicode emoji"
     );
     testUnescape(
@@ -108,7 +108,7 @@ discourseModule("Unit | Utility | emoji", function () {
     );
     testUnescape(
       "Hello😊World",
-      `Hello<img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/blush.png?v=${v}' title='blush' alt='blush' class='emoji'>World`,
+      `Hello<img width=\"20\" height=\"20\" src='/images/emoji/google_classic/blush.png?v=${v}' title='blush' alt='blush' class='emoji'>World`,
       "emoji from Unicode emoji when inline translation enabled",
       {
         enable_inline_emoji_translation: true,
@@ -124,7 +124,7 @@ discourseModule("Unit | Utility | emoji", function () {
     );
     testUnescape(
       "hi:smile:",
-      `hi<img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/smile.png?v=${v}' title='smile' alt='smile' class='emoji'>`,
+      `hi<img width=\"20\" height=\"20\" src='/images/emoji/google_classic/smile.png?v=${v}' title='smile' alt='smile' class='emoji'>`,
       "emoji when inline translation enabled",
       { enable_inline_emoji_translation: true }
     );
@@ -136,5 +136,18 @@ discourseModule("Unit | Utility | emoji", function () {
 
     // able to find middle of line search
     assert.equal(emojiSearch("check", { maxResults: 3 }).length, 3);
+
+    // appends diversity
+    assert.deepEqual(emojiSearch("woman_artist", { diversity: 5 }), [
+      "woman_artist:t5",
+    ]);
+    assert.deepEqual(emojiSearch("woman_artist", { diversity: 2 }), [
+      "woman_artist:t2",
+    ]);
+
+    // no diversity appended for emojis that can't be diversified
+    assert.deepEqual(emojiSearch("green_apple", { diversity: 3 }), [
+      "green_apple",
+    ]);
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js b/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js
index 23aaa2f37a..71cc9bc95a 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js
@@ -1,14 +1,14 @@
-import { test } from "qunit";
 import {
-  relativeAge,
   autoUpdatingRelativeAge,
-  updateRelativeAge,
-  number,
-  longDate,
   durationTiny,
+  longDate,
+  number,
+  relativeAge,
+  updateRelativeAge,
 } from "discourse/lib/formatter";
 import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import sinon from "sinon";
+import { test } from "qunit";
 
 function formatMins(mins, opts = {}) {
   let dt = new Date(new Date() - mins * 60 * 1000);
@@ -143,7 +143,23 @@ discourseModule("Unit | Utility | formatter", function (hooks) {
     assert.equal(formatDays(500), shortDateYear(500));
     assert.equal(formatDays(365 * 2 + 1), shortDateYear(365 * 2 + 1)); // one leap year
 
-    var originalValue = this.siteSettings.relative_date_duration;
+    assert.equal(formatMins(-1), "1m");
+    assert.equal(formatMins(-2), "2m");
+    assert.equal(formatMins(-60), "1h");
+    assert.equal(formatHours(-4), "4h");
+    assert.equal(formatHours(-23), "23h");
+    assert.equal(formatHours(-23.5), "1d");
+    assert.equal(formatDays(-1), "1d");
+    assert.equal(formatDays(-14), "14d");
+    assert.equal(formatDays(-15), shortDateYear(-15));
+    assert.equal(formatDays(-92), shortDateYear(-92));
+    assert.equal(formatDays(-364), shortDateYear(-364));
+    assert.equal(formatDays(-365), shortDateYear(-365));
+    assert.equal(formatDays(-366), shortDateYear(-366)); // leap year
+    assert.equal(formatDays(-500), shortDateYear(-500));
+    assert.equal(formatDays(-365 * 2 - 1), shortDateYear(-365 * 2 - 1)); // one leap year
+
+    let originalValue = this.siteSettings.relative_date_duration;
     this.siteSettings.relative_date_duration = 7;
     assert.equal(formatDays(7), "7d");
     assert.equal(formatDays(8), shortDate(8));
@@ -187,9 +203,9 @@ discourseModule("Unit | Utility | formatter", function (hooks) {
   });
 
   test("autoUpdatingRelativeAge", function (assert) {
-    var d = moment().subtract(1, "day").toDate();
+    let d = moment().subtract(1, "day").toDate();
 
-    var $elem = $(autoUpdatingRelativeAge(d));
+    let $elem = $(autoUpdatingRelativeAge(d));
     assert.equal($elem.data("format"), "tiny");
     assert.equal($elem.data("time"), d.getTime());
     assert.equal($elem.attr("title"), undefined);
@@ -217,8 +233,8 @@ discourseModule("Unit | Utility | formatter", function (hooks) {
   });
 
   test("updateRelativeAge", function (assert) {
-    var d = new Date();
-    var $elem = $(autoUpdatingRelativeAge(d));
+    let d = new Date();
+    let $elem = $(autoUpdatingRelativeAge(d));
     $elem.data("time", d.getTime() - 2 * 60 * 1000);
 
     updateRelativeAge($elem);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js b/app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js
index 8d95763027..2e26ef3f5e 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js
@@ -1,13 +1,13 @@
-import { test, module } from "qunit";
 import getURL, {
-  setupURL,
-  setupS3CDN,
+  getAbsoluteURL,
   getURLWithCDN,
   isAbsoluteURL,
-  getAbsoluteURL,
   setPrefix,
+  setupS3CDN,
+  setupURL,
   withoutPrefix,
 } from "discourse-common/lib/get-url";
+import { module, test } from "qunit";
 
 module("Unit | Utility | get-url", function () {
   test("isAbsoluteURL", function (assert) {
@@ -37,6 +37,48 @@ module("Unit | Utility | get-url", function () {
     assert.equal(withoutPrefix("/eviltrout/hello"), "/eviltrout/hello");
     assert.equal(withoutPrefix("/eviltrout"), "/eviltrout");
     assert.equal(withoutPrefix("/"), "/");
+
+    setPrefix("/f");
+    assert.equal(withoutPrefix("/faq"), "/faq");
+    assert.equal(withoutPrefix("/f/faq"), "/faq");
+    assert.equal(withoutPrefix("/f"), "");
+  });
+
+  test("withoutPrefix called multiple times on the same path", function (assert) {
+    setPrefix("/eviltrout");
+    assert.equal(withoutPrefix(withoutPrefix("/eviltrout/hello")), "/hello");
+    assert.equal(withoutPrefix(withoutPrefix("/eviltrout/")), "/");
+    assert.equal(withoutPrefix(withoutPrefix("/eviltrout")), "");
+
+    setPrefix("");
+    assert.equal(
+      withoutPrefix(withoutPrefix("/eviltrout/hello")),
+      "/eviltrout/hello"
+    );
+    assert.equal(withoutPrefix(withoutPrefix("/eviltrout")), "/eviltrout");
+    assert.equal(withoutPrefix(withoutPrefix("/")), "/");
+
+    setPrefix(null);
+    assert.equal(
+      withoutPrefix(withoutPrefix("/eviltrout/hello")),
+      "/eviltrout/hello"
+    );
+    assert.equal(withoutPrefix(withoutPrefix("/eviltrout")), "/eviltrout");
+    assert.equal(withoutPrefix(withoutPrefix("/")), "/");
+
+    setPrefix("/f");
+    assert.equal(
+      withoutPrefix(withoutPrefix("/f/t/falco-says-hello")),
+      "/t/falco-says-hello"
+    );
+    assert.equal(
+      withoutPrefix(withoutPrefix("/f/tag/fast-chain-food")),
+      "/tag/fast-chain-food"
+    );
+    assert.equal(
+      withoutPrefix(withoutPrefix("/f/u/falco/summary")),
+      "/u/falco/summary"
+    );
   });
 
   test("getURL with empty paths", function (assert) {
@@ -60,6 +102,12 @@ module("Unit | Utility | get-url", function () {
       "relative url has subfolder"
     );
 
+    assert.equal(
+      getURL("/u/forumadmin"),
+      "/forum/u/forumadmin",
+      "relative url has subfolder even if username contains subfolder"
+    );
+
     assert.equal(
       getURL(""),
       "/forum",
@@ -77,6 +125,18 @@ module("Unit | Utility | get-url", function () {
       "/forum/t/123",
       "does not prefix if the URL is already prefixed"
     );
+
+    setPrefix("/f");
+    assert.equal(
+      getURL("/faq"),
+      "/f/faq",
+      "relative path has subfolder even if it starts with the prefix without trailing slash"
+    );
+    assert.equal(
+      getURL("/f/faq"),
+      "/f/faq",
+      "does not prefix if the URL is already prefixed"
+    );
   });
 
   test("getURLWithCDN on subfolder install with S3", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/highlight-search-test.js b/app/assets/javascripts/discourse/tests/unit/lib/highlight-search-test.js
index 0756899e30..165c53b5de 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/highlight-search-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/highlight-search-test.js
@@ -1,6 +1,6 @@
 import highlightSearch, { CLASS_NAME } from "discourse/lib/highlight-search";
-import { fixture } from "discourse/tests/helpers/qunit-helpers";
 import { module, test } from "qunit";
+import { fixture } from "discourse/tests/helpers/qunit-helpers";
 
 module("Unit | Utility | highlight-search", function () {
   test("highlighting text", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/i18n-test.js b/app/assets/javascripts/discourse/tests/unit/lib/i18n-test.js
index 53d132726e..bbc2635a20 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/i18n-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/i18n-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import I18n from "I18n";
 
 module("Unit | Utility | i18n", function (hooks) {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/icon-library-test.js b/app/assets/javascripts/discourse/tests/unit/lib/icon-library-test.js
index d86a251112..de03fa9c14 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/icon-library-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/icon-library-test.js
@@ -1,9 +1,9 @@
-import { test, module } from "qunit";
 import {
+  convertIconClass,
   iconHTML,
   iconNode,
-  convertIconClass,
 } from "discourse-common/lib/icon-library";
+import { module, test } from "qunit";
 
 module("Unit | Utility | icon-library", function () {
   test("return icon markup", function (assert) {
@@ -24,4 +24,16 @@ module("Unit | Utility | icon-library", function () {
     const iconC = convertIconClass("  fab fa-facebook  ");
     assert.ok(iconHTML(iconC).indexOf("  ") === -1, "trims whitespace");
   });
+
+  test("escape icon names, classes and titles", function (assert) {
+    const html = iconHTML("'<img src='x'>", {
+      translatedtitle: "'<script src='y'>",
+      label: "<iframe src='z'>",
+      class: "'<link href='w'>",
+    });
+    assert.ok(html.includes("&#x27;&lt;img src=&#x27;x&#x27;&gt;"));
+    assert.ok(html.includes("&#x27;&lt;script src=&#x27;y&#x27;&gt;"));
+    assert.ok(html.includes("&lt;iframe src=&#x27;z&#x27;&gt;"));
+    assert.ok(html.includes("&#x27;&lt;link href=&#x27;w&#x27;&gt;"));
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/key-value-store-test.js b/app/assets/javascripts/discourse/tests/unit/lib/key-value-store-test.js
index 51c4bff28e..a2fa6876a9 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/key-value-store-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/key-value-store-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import KeyValueStore from "discourse/lib/key-value-store";
 
 module("Unit | Utility | key-value-store", function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/keyboard-shortcuts-test.js b/app/assets/javascripts/discourse/tests/unit/lib/keyboard-shortcuts-test.js
index 56f77dcf35..fe9b717db1 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/keyboard-shortcuts-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/keyboard-shortcuts-test.js
@@ -1,7 +1,7 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import DiscourseURL from "discourse/lib/url";
-import sinon from "sinon";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
+import sinon from "sinon";
 
 let testMouseTrap;
 
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/link-lookup-test.js b/app/assets/javascripts/discourse/tests/unit/lib/link-lookup-test.js
new file mode 100644
index 0000000000..ee3dd69a9c
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/link-lookup-test.js
@@ -0,0 +1,48 @@
+import LinkLookup, { reset } from "discourse/lib/link-lookup";
+import { module, test } from "qunit";
+import Post from "discourse/models/post";
+
+module("Unit | Utility | link-lookup", function (hooks) {
+  hooks.afterEach(() => reset());
+  hooks.beforeEach(function () {
+    this.post = Post.create();
+    this.linkLookup = new LinkLookup({
+      "en.wikipedia.org/wiki/handheld_game_console": {
+        post_number: 1,
+      },
+    });
+  });
+
+  test("works with https", function (assert) {
+    assert.ok(
+      this.linkLookup.check(
+        this.post,
+        "https://en.wikipedia.org/wiki/handheld_game_console"
+      )[0]
+    );
+  });
+  test("works with http", function (assert) {
+    assert.ok(
+      this.linkLookup.check(
+        this.post,
+        "http://en.wikipedia.org/wiki/handheld_game_console"
+      )[0]
+    );
+  });
+  test("works with trailing slash", function (assert) {
+    assert.ok(
+      this.linkLookup.check(
+        this.post,
+        "https://en.wikipedia.org/wiki/handheld_game_console/"
+      )[0]
+    );
+  });
+  test("works with uppercase characters", function (assert) {
+    assert.ok(
+      this.linkLookup.check(
+        this.post,
+        "https://en.wikipedia.org/wiki/Handheld_game_console"
+      )[0]
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/link-mentions-test.js b/app/assets/javascripts/discourse/tests/unit/lib/link-mentions-test.js
index df3528168c..53c072bdc9 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/link-mentions-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/link-mentions-test.js
@@ -1,8 +1,8 @@
-import { test, module } from "qunit";
 import {
   fetchUnseenMentions,
   linkSeenMentions,
 } from "discourse/lib/link-mentions";
+import { module, test } from "qunit";
 import { Promise } from "rsvp";
 import pretender from "discourse/tests/helpers/create-pretender";
 
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/load-script-test.js b/app/assets/javascripts/discourse/tests/unit/lib/load-script-test.js
index 11e1d2d56a..8fbb43605b 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/load-script-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/load-script-test.js
@@ -1,5 +1,5 @@
-import { skip, test, module } from "qunit";
-import { loadScript, cacheBuster } from "discourse/lib/load-script";
+import { cacheBuster, loadScript } from "discourse/lib/load-script";
+import { module, skip, test } from "qunit";
 import { PUBLIC_JS_VERSIONS as jsVersions } from "discourse/lib/public-js-versions";
 
 module("Unit | Utility | load-script", function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/oneboxer-test.js b/app/assets/javascripts/discourse/tests/unit/lib/oneboxer-test.js
index be8f8dcd2c..7ac11a624a 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/oneboxer-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/oneboxer-test.js
@@ -1,8 +1,7 @@
-import { test, module } from "qunit";
-import { load } from "pretty-text/oneboxer";
-import { ajax } from "discourse/lib/ajax";
 import { failedCache, localCache } from "pretty-text/oneboxer-cache";
-import { stringToHTML } from "discourse/tests/helpers/html-helper";
+import { module, test } from "qunit";
+import { ajax } from "discourse/lib/ajax";
+import { load } from "pretty-text/oneboxer";
 
 function loadOnebox(element) {
   return load({
@@ -35,34 +34,19 @@ module("Unit | Utility | oneboxer", function () {
   });
 
   test("load - successful onebox", async function (assert) {
-    const html = `
-    <aside class="onebox allowlistedgeneric">
-      <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="" 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>
-    `;
-
     let element = document.createElement("A");
     element.setAttribute("href", "http://somegoodurl.com");
 
     await loadOnebox(element);
 
-    assert.equal(
-      localCache["http://somegoodurl.com"].prop("outerHTML"),
-      stringToHTML(html).outerHTML,
+    assert.ok(
+      localCache["http://somegoodurl.com"]
+        .prop("outerHTML")
+        .indexOf("Yet another collaboration tool") !== -1,
       "stores the html of the onebox in a local cache"
     );
-    assert.equal(
-      loadOnebox(element),
-      html.trim(),
+    assert.ok(
+      loadOnebox(element).indexOf("Yet another collaboration tool") !== -1,
       "it returns the html from the cache"
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/parse-bbcode-tag-test.js b/app/assets/javascripts/discourse/tests/unit/lib/parse-bbcode-tag-test.js
index 91eecc3441..ac433caa37 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/parse-bbcode-tag-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/parse-bbcode-tag-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import { parseBBCodeTag } from "pretty-text/engines/discourse-markdown/bbcode-block";
 
 module("Unit | Utility | parseBBCodeTag", function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/preload-store-test.js b/app/assets/javascripts/discourse/tests/unit/lib/preload-store-test.js
index dd0f952b74..abdde2fec6 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/preload-store-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/preload-store-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import PreloadStore from "discourse/lib/preload-store";
 import { Promise } from "rsvp";
 
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js b/app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js
index 401e98a984..f413ffea75 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js
@@ -1,22 +1,23 @@
-import { skip, test, module } from "qunit";
-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 {
   applyCachedInlineOnebox,
   deleteCachedInlineOnebox,
 } from "pretty-text/inline-oneboxer";
+import { module, skip, test } from "qunit";
+import Post from "discourse/models/post";
+import { buildQuote } from "discourse/lib/quote";
+import { deepMerge } from "discourse-common/lib/object";
 import { extractDataAttribute } from "pretty-text/engines/discourse-markdown-it";
 import { registerEmoji } from "pretty-text/emoji";
-import { deepMerge } from "discourse-common/lib/object";
+import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
 
 const rawOpts = {
   siteSettings: {
     enable_emoji: true,
     enable_emoji_shortcuts: true,
     enable_mentions: true,
-    emoji_set: "emoji_one",
+    emoji_set: "google_classic",
+    external_emoji_url: "",
     highlighted_languages: "json|ruby|javascript",
     default_code_lang: "auto",
     enable_markdown_linkify: true,
@@ -669,7 +670,7 @@ eviltrout</p>
 
     assert.cooked(
       "# #category-hashtag",
-      '<h1><span class="hashtag">#category-hashtag</span></h1>',
+      '<h1><a name="category-hashtag-1" class="anchor" href="#category-hashtag-1"></a><span class="hashtag">#category-hashtag</span></h1>',
       "it works within ATX-style headers"
     );
 
@@ -695,7 +696,7 @@ eviltrout</p>
   test("Heading", function (assert) {
     assert.cooked(
       "**Bold**\n----------",
-      "<h2><strong>Bold</strong></h2>",
+      '<h2><a name="bold-1" class="anchor" href="#bold-1"></a><strong>Bold</strong></h2>',
       "It will bold the heading"
     );
   });
@@ -938,7 +939,7 @@ eviltrout</p>
 
     assert.cooked(
       "## a\nb\n```\nc\n```",
-      '<h2>a</h2>\n<p>b</p>\n<pre><code class="lang-auto">c\n</code></pre>',
+      '<h2><a name="a-1" class="anchor" href="#a-1"></a>a</h2>\n<p>b</p>\n<pre><code class="lang-auto">c\n</code></pre>',
       "it handles headings with code blocks after them."
     );
   });
@@ -1485,15 +1486,15 @@ var bar = 'bar';
   test("emoji", function (assert) {
     assert.cooked(
       ":smile:",
-      `<p><img src="/images/emoji/emoji_one/smile.png?v=${v}" title=":smile:" class="emoji only-emoji" alt=":smile:"></p>`
+      `<p><img src="/images/emoji/google_classic/smile.png?v=${v}" title=":smile:" class="emoji only-emoji" alt=":smile:"></p>`
     );
     assert.cooked(
       ":(",
-      `<p><img src="/images/emoji/emoji_one/frowning.png?v=${v}" title=":frowning:" class="emoji only-emoji" alt=":frowning:"></p>`
+      `<p><img src="/images/emoji/google_classic/frowning.png?v=${v}" title=":frowning:" class="emoji only-emoji" alt=":frowning:"></p>`
     );
     assert.cooked(
       "8-)",
-      `<p><img src="/images/emoji/emoji_one/sunglasses.png?v=${v}" title=":sunglasses:" class="emoji only-emoji" alt=":sunglasses:"></p>`
+      `<p><img src="/images/emoji/google_classic/sunglasses.png?v=${v}" title=":sunglasses:" class="emoji only-emoji" alt=":sunglasses:"></p>`
     );
   });
 
@@ -1507,7 +1508,7 @@ var bar = 'bar';
     assert.cookedOptions(
       "test:smile:test",
       { siteSettings: { enable_inline_emoji_translation: true } },
-      `<p>test<img src="/images/emoji/emoji_one/smile.png?v=${v}" title=":smile:" class="emoji" alt=":smile:">test</p>`
+      `<p>test<img src="/images/emoji/google_classic/smile.png?v=${v}" title=":smile:" class="emoji" alt=":smile:">test</p>`
     );
   });
 
@@ -1519,6 +1520,19 @@ var bar = 'bar';
     );
   });
 
+  test("emoji - emojiCDN", function (assert) {
+    assert.cookedOptions(
+      ":smile:",
+      {
+        siteSettings: {
+          emoji_set: "twitter",
+          external_emoji_url: "https://emoji.hosting.service",
+        },
+      },
+      `<p><img src="https://emoji.hosting.service/twitter/smile.png?v=${v}" title=":smile:" class="emoji only-emoji" alt=":smile:"></p>`
+    );
+  });
+
   test("emoji - registerEmoji", function (assert) {
     registerEmoji("foo", "/images/d-logo-sketch.png");
 
@@ -1554,4 +1568,131 @@ var bar = 'bar';
       </div></p>`
     );
   });
+
+  test("typographer arrows", function (assert) {
+    const enabledTypographer = {
+      siteSettings: { enable_markdown_typographer: true },
+    };
+
+    // Replace arrows
+    assert.cookedOptions(
+      "--> <--",
+      enabledTypographer,
+      "<p> \u2192 \u2190 </p>"
+    );
+    assert.cookedOptions("a -> b", enabledTypographer, "<p>a \u2192 b</p>");
+    assert.cookedOptions("a <- b", enabledTypographer, "<p>a \u2190 b</p>");
+    assert.cookedOptions("a --> b", enabledTypographer, "<p>a \u2192 b</p>");
+    assert.cookedOptions("-->", enabledTypographer, "<p> \u2192 </p>");
+    assert.cookedOptions("<--", enabledTypographer, "<p> \u2190 </p>");
+
+    // Don't replace arrows
+    assert.cookedOptions("<!-- an html comment -->", enabledTypographer, "");
+    assert.cookedOptions(
+      "(<--not an arrow)",
+      enabledTypographer,
+      "<p>(&lt;–not an arrow)</p>"
+    );
+    assert.cookedOptions("<-->", enabledTypographer, "<p>&lt;–&gt;</p>");
+    assert.cookedOptions("asd-->", enabledTypographer, "<p>asd–&gt;</p>");
+    assert.cookedOptions(" asd--> ", enabledTypographer, "<p>asd–&gt;</p>");
+    assert.cookedOptions(" asd-->", enabledTypographer, "<p>asd–&gt;</p>");
+    assert.cookedOptions("-->asd", enabledTypographer, "<p>–&gt;asd</p>");
+    assert.cookedOptions(" -->asd ", enabledTypographer, "<p>–&gt;asd</p>");
+    assert.cookedOptions(" -->asd", enabledTypographer, "<p>–&gt;asd</p>");
+  });
+
+  test("default typhographic replacements", function (assert) {
+    const enabledTypographer = {
+      siteSettings: { enable_markdown_typographer: true },
+    };
+
+    assert.cookedOptions("(bad)", enabledTypographer, "<p>(bad)</p>");
+    assert.cookedOptions("+-5", enabledTypographer, "<p>±5</p>");
+    assert.cookedOptions(
+      "test.. test... test..... test?..... test!....",
+      enabledTypographer,
+      "<p>test… test… test… test?.. test!..</p>"
+    );
+    assert.cookedOptions(
+      "!!!!!! ???? ,,",
+      enabledTypographer,
+      "<p>!!! ??? ,</p>"
+    );
+    assert.cookedOptions(
+      "!!!!!! ???? ,,",
+      enabledTypographer,
+      "<p>!!! ??? ,</p>"
+    );
+    assert.cookedOptions("(tm) (TM)", enabledTypographer, "<p>™ ™</p>");
+    assert.cookedOptions("(pa) (PA)", enabledTypographer, "<p>¶ ¶</p>");
+  });
+
+  test("default typhographic replacements - dashes", function (assert) {
+    const enabledTypographer = {
+      siteSettings: { enable_markdown_typographer: true },
+    };
+
+    assert.cookedOptions(
+      "---markdownit --- super---",
+      enabledTypographer,
+      "<p>—markdownit — super—</p>"
+    );
+    assert.cookedOptions(
+      "markdownit---awesome",
+      enabledTypographer,
+      "<p>markdownit—awesome</p>"
+    );
+    assert.cookedOptions("abc ----", enabledTypographer, "<p>abc ----</p>");
+    assert.cookedOptions(
+      "--markdownit -- super--",
+      enabledTypographer,
+      "<p>–markdownit – super–</p>"
+    );
+    assert.cookedOptions(
+      "markdownit--awesome",
+      enabledTypographer,
+      "<p>markdownit–awesome</p>"
+    );
+    assert.cookedOptions("1---2---3", enabledTypographer, "<p>1—2—3</p>");
+    assert.cookedOptions("1--2--3", enabledTypographer, "<p>1–2–3</p>");
+    assert.cookedOptions(
+      "<p>1 – – 3</p>",
+      enabledTypographer,
+      "<p>1 – – 3</p>"
+    );
+  });
+
+  test("disabled typhographic replacements", function (assert) {
+    const enabledTypographer = {
+      siteSettings: { enable_markdown_typographer: true },
+    };
+
+    assert.cookedOptions("(c) (C)", enabledTypographer, "<p>(c) (C)</p>");
+    assert.cookedOptions("(r) (R)", enabledTypographer, "<p>(r) (R)</p>");
+    assert.cookedOptions("(p) (P)", enabledTypographer, "<p>(p) (P)</p>");
+  });
+
+  test("watched words replace", function (assert) {
+    const opts = {
+      watchedWordsReplacements: { fun: "times" },
+    };
+
+    assert.cookedOptions("test fun", opts, "<p>test times</p>");
+  });
+
+  test("watched words replace with bad regex", function (assert) {
+    const maxMatches = 100; // same limit as MD watched-words-replace plugin
+    const opts = {
+      siteSettings: { watched_words_regular_expressions: true },
+      watchedWordsReplacements: { "\\bu?\\b": "you" },
+    };
+
+    assert.cookedOptions(
+      "one",
+      opts,
+      `<p>${"you".repeat(maxMatches)}one</p>`,
+      "does not loop infinitely"
+    );
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/sanitizer-test.js b/app/assets/javascripts/discourse/tests/unit/lib/sanitizer-test.js
index 3025ac81ae..27aac256de 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/sanitizer-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/sanitizer-test.js
@@ -1,5 +1,5 @@
-import { test, module } from "qunit";
 import PrettyText, { buildOptions } from "pretty-text/pretty-text";
+import { module, test } from "qunit";
 import { hrefAllowed } from "pretty-text/sanitizer";
 
 module("Unit | Utility | sanitizer", function () {
@@ -71,7 +71,6 @@ module("Unit | Utility | sanitizer", function () {
     assert.equal(pt.sanitize("<button>press me!</button>"), "press me!");
     assert.equal(pt.sanitize("<canvas>draw me!</canvas>"), "draw me!");
     assert.equal(pt.sanitize("<progress>hello"), "hello");
-    assert.equal(pt.sanitize("<mark>highlight</mark>"), "highlight");
 
     cooked(
       "[the answer](javascript:alert(42))",
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/screen-track-test.js b/app/assets/javascripts/discourse/tests/unit/lib/screen-track-test.js
index c119debdbb..b1a557811d 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/screen-track-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/screen-track-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import ScreenTrack from "discourse/lib/screen-track";
 
 module("Unit | Utility | screen-track", function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/search-test.js b/app/assets/javascripts/discourse/tests/unit/lib/search-test.js
index db46e18992..61f9876011 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/search-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/search-test.js
@@ -1,9 +1,9 @@
-import { test, module } from "qunit";
-import I18n from "I18n";
+import { module, test } from "qunit";
 import {
-  translateResults,
   searchContextDescription,
+  translateResults,
 } from "discourse/lib/search";
+import I18n from "I18n";
 
 module("Unit | Utility | search", function () {
   test("unescapesEmojisInBlurbs", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/sharing-test.js b/app/assets/javascripts/discourse/tests/unit/lib/sharing-test.js
index cf505fba0d..8a1a0afcbe 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/sharing-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/sharing-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import Sharing from "discourse/lib/sharing";
 
 module("Unit | Utility | sharing", function (hooks) {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/text-direction-test.js b/app/assets/javascripts/discourse/tests/unit/lib/text-direction-test.js
index cfc9640b24..ab23021fab 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/text-direction-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/text-direction-test.js
@@ -1,5 +1,5 @@
-import { test, module } from "qunit";
-import { isRTL, isLTR } from "discourse/lib/text-direction";
+import { isLTR, isRTL } from "discourse/lib/text-direction";
+import { module, test } from "qunit";
 
 module("Unit | Utility | text-direction", function () {
   test("isRTL", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/time-utils-test.js b/app/assets/javascripts/discourse/tests/unit/lib/time-utils-test.js
new file mode 100644
index 0000000000..ce174c0f5c
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/time-utils-test.js
@@ -0,0 +1,107 @@
+import {
+  discourseModule,
+  fakeTime,
+} from "discourse/tests/helpers/qunit-helpers";
+
+import {
+  laterThisWeek,
+  laterToday,
+  nextMonth,
+  nextWeek,
+  startOfDay,
+  tomorrow,
+} from "discourse/lib/time-utils";
+import { test } from "qunit";
+
+const timezone = "Australia/Brisbane";
+
+function mockMomentTz(dateString) {
+  fakeTime(dateString, timezone);
+}
+
+discourseModule("Unit | lib | timeUtils", function () {
+  test("nextWeek gets next week correctly", function (assert) {
+    mockMomentTz("2019-12-11T08:00:00");
+
+    assert.equal(nextWeek(timezone).format("YYYY-MM-DD"), "2019-12-18");
+  });
+
+  test("nextMonth gets next month correctly", function (assert) {
+    mockMomentTz("2019-12-11T08:00:00");
+
+    assert.equal(nextMonth(timezone).format("YYYY-MM-DD"), "2020-01-11");
+  });
+
+  test("laterThisWeek gets 2 days from now", function (assert) {
+    mockMomentTz("2019-12-10T08:00:00");
+
+    assert.equal(laterThisWeek(timezone).format("YYYY-MM-DD"), "2019-12-12");
+  });
+
+  test("tomorrow gets tomorrow correctly", function (assert) {
+    mockMomentTz("2019-12-11T08:00:00");
+
+    assert.equal(tomorrow(timezone).format("YYYY-MM-DD"), "2019-12-12");
+  });
+
+  test("startOfDay changes the time of the provided date to 8:00am correctly", function (assert) {
+    let dt = moment.tz("2019-12-11T11:37:16", timezone);
+
+    assert.equal(
+      startOfDay(dt).format("YYYY-MM-DD HH:mm:ss"),
+      "2019-12-11 08:00:00"
+    );
+  });
+
+  test("laterToday gets 3 hours from now and if before half-past, it rounds down", function (assert) {
+    mockMomentTz("2019-12-11T08:13:00");
+
+    assert.equal(
+      laterToday(timezone).format("YYYY-MM-DD HH:mm:ss"),
+      "2019-12-11 11:00:00"
+    );
+  });
+
+  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:00");
+
+    assert.equal(
+      laterToday(timezone).format("YYYY-MM-DD HH:mm:ss"),
+      "2019-12-11 12:00:00"
+    );
+  });
+
+  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(
+      laterToday(timezone).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(
+      laterToday(timezone).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(
+      laterToday(timezone).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(
+      laterToday(timezone).format("YYYY-MM-DD HH:mm:ss"),
+      "2019-12-11 18:00:00",
+      "4:59pm should max to 6pm"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/to-markdown-test.js b/app/assets/javascripts/discourse/tests/unit/lib/to-markdown-test.js
index 1ee3b245a6..ac593a20c9 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/to-markdown-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/to-markdown-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import toMarkdown from "discourse/lib/to-markdown";
 
 module("Unit | Utility | to-markdown", function () {
@@ -226,6 +226,9 @@ module("Unit | Utility | to-markdown", function () {
     html = `Have you tried clicking the <kbd>Help Me!</kbd> button?`;
     assert.equal(toMarkdown(html), html);
 
+    html = `<mark>This is highlighted!</mark>`;
+    assert.equal(toMarkdown(html), html);
+
     html = `Lorem <a href="http://example.com"><del>ipsum \n\n\n dolor</del> sit.</a>`;
     output = `Lorem [<del>ipsum dolor</del> sit.](http://example.com)`;
     assert.equal(toMarkdown(html), output);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/upload-short-url-test.js b/app/assets/javascripts/discourse/tests/unit/lib/upload-short-url-test.js
index 19c66342da..5d1cf7d824 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/upload-short-url-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/upload-short-url-test.js
@@ -1,12 +1,12 @@
-import { test, module } from "qunit";
 import {
   lookupCachedUploadUrl,
-  resolveAllShortUrls,
   resetCache,
+  resolveAllShortUrls,
 } from "pretty-text/upload-short-url";
+import { module, test } from "qunit";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
 import { ajax } from "discourse/lib/ajax";
 import { fixture } from "discourse/tests/helpers/qunit-helpers";
-import pretender, { response } from "discourse/tests/helpers/create-pretender";
 import { settled } from "@ember/test-helpers";
 
 function stubUrls(imageSrcs, attachmentSrcs, otherMediaSrcs) {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js b/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js
index c477c08ebc..02be685e6b 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js
@@ -1,18 +1,18 @@
+import * as Utilities from "discourse/lib/utilities";
+import {
+  allowsAttachments,
+  allowsImages,
+  authorizedExtensions,
+  getUploadMarkdown,
+  isImage,
+  validateUploadedFiles,
+} from "discourse/lib/uploads";
+import I18n from "I18n";
+import User from "discourse/models/user";
+import bootbox from "bootbox";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 import sinon from "sinon";
 import { test } from "qunit";
-import I18n from "I18n";
-import {
-  validateUploadedFiles,
-  authorizedExtensions,
-  isImage,
-  allowsImages,
-  allowsAttachments,
-  getUploadMarkdown,
-} from "discourse/lib/uploads";
-import * as Utilities from "discourse/lib/utilities";
-import User from "discourse/models/user";
-import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import bootbox from "bootbox";
 
 discourseModule("Unit | Utility | uploads", function () {
   test("validateUploadedFiles", function (assert) {
@@ -194,7 +194,7 @@ discourseModule("Unit | Utility | uploads", function () {
 
   test("isImage", function (assert) {
     ["png", "webp", "jpg", "jpeg", "gif", "ico"].forEach((extension) => {
-      var image = "image." + extension;
+      let image = "image." + extension;
       assert.ok(isImage(image), image + " is recognized as an image");
       assert.ok(
         isImage("http://foo.bar/path/to/" + image),
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/url-test.js b/app/assets/javascripts/discourse/tests/unit/lib/url-test.js
index adfb906f51..5781a8383a 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/url-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/url-test.js
@@ -1,9 +1,9 @@
-import sinon from "sinon";
-import { test, module } from "qunit";
-import DiscourseURL, { userPath, prefixProtocol } from "discourse/lib/url";
-import { setPrefix } from "discourse-common/lib/get-url";
-import { logIn } from "discourse/tests/helpers/qunit-helpers";
+import DiscourseURL, { prefixProtocol, userPath } from "discourse/lib/url";
+import { module, test } from "qunit";
 import User from "discourse/models/user";
+import { logIn } from "discourse/tests/helpers/qunit-helpers";
+import { setPrefix } from "discourse-common/lib/get-url";
+import sinon from "sinon";
 
 module("Unit | Utility | url", function () {
   test("isInternal with a HTTP url", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/user-search-test.js b/app/assets/javascripts/discourse/tests/unit/lib/user-search-test.js
index 3d3e2157de..021fee33fc 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/user-search-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/user-search-test.js
@@ -1,7 +1,7 @@
-import { test, module } from "qunit";
-import userSearch from "discourse/lib/user-search";
-import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
+import { module, test } from "qunit";
 import pretender, { response } from "discourse/tests/helpers/create-pretender";
+import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
+import userSearch from "discourse/lib/user-search";
 
 module("Unit | Utility | user-search", function (hooks) {
   hooks.beforeEach(function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
index b38d96d16a..6739b729a7 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
@@ -1,21 +1,21 @@
-import { skip, test } from "qunit";
 import {
-  escapeExpression,
-  emailValid,
-  extractDomainFromUrl,
-  avatarUrl,
-  getRawSize,
   avatarImg,
-  initializeDefaultHomepage,
-  defaultHomepage,
-  setDefaultHomepage,
+  avatarUrl,
   caretRowCol,
-  setCaretPosition,
-  toAsciiPrintable,
-  slugify,
+  defaultHomepage,
+  emailValid,
+  escapeExpression,
+  extractDomainFromUrl,
   fillMissingDates,
+  getRawSize,
   inCodeBlock,
+  initializeDefaultHomepage,
+  setCaretPosition,
+  setDefaultHomepage,
+  slugify,
+  toAsciiPrintable,
 } from "discourse/lib/utilities";
+import { skip, test } from "qunit";
 import Handlebars from "handlebars";
 import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
 
@@ -71,7 +71,7 @@ discourseModule("Unit | Utilities", function () {
   });
 
   test("avatarUrl", function (assert) {
-    var rawSize = getRawSize;
+    let rawSize = getRawSize;
     assert.blank(avatarUrl("", "tiny"), "no template returns blank");
     assert.equal(
       avatarUrl("/fake/template/{size}.png", "tiny"),
@@ -85,7 +85,7 @@ discourseModule("Unit | Utilities", function () {
     );
   });
 
-  var setDevicePixelRatio = function (value) {
+  let setDevicePixelRatio = function (value) {
     if (Object.defineProperty && !window.hasOwnProperty("devicePixelRatio")) {
       Object.defineProperty(window, "devicePixelRatio", { value: 2 });
     } else {
@@ -94,10 +94,10 @@ discourseModule("Unit | Utilities", function () {
   };
 
   test("avatarImg", function (assert) {
-    var oldRatio = window.devicePixelRatio;
+    let oldRatio = window.devicePixelRatio;
     setDevicePixelRatio(2);
 
-    var avatarTemplate = "/path/to/avatar/{size}.png";
+    let avatarTemplate = "/path/to/avatar/{size}.png";
     assert.equal(
       avatarImg({ avatarTemplate: avatarTemplate, size: "tiny" }),
       "<img alt='' width='20' height='20' src='/path/to/avatar/40.png' class='avatar'>",
@@ -164,7 +164,7 @@ discourseModule("Unit | Utilities", function () {
   });
 
   test("caretRowCol", function (assert) {
-    var textarea = document.createElement("textarea");
+    let textarea = document.createElement("textarea");
     const content = document.createTextNode("01234\n56789\n012345");
     textarea.appendChild(content);
     document.body.appendChild(textarea);
diff --git a/app/assets/javascripts/discourse/tests/unit/localization-test.js b/app/assets/javascripts/discourse/tests/unit/localization-test.js
index 55f35738de..f2bf2f3c0f 100644
--- a/app/assets/javascripts/discourse/tests/unit/localization-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/localization-test.js
@@ -1,6 +1,7 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import I18n from "I18n";
 import LocalizationInitializer from "discourse/initializers/localization";
+import { getApplication } from "@ember/test-helpers";
 
 module("initializer:localization", {
   _locale: I18n.locale,
@@ -42,7 +43,7 @@ test("translation overrides", function (assert) {
     "js.composer.reply": "WAT",
     "js.topic.reply.help": "foobar",
   };
-  LocalizationInitializer.initialize(this.registry);
+  LocalizationInitializer.initialize(getApplication());
 
   assert.equal(
     I18n.t("composer.reply"),
@@ -61,7 +62,7 @@ test("skip translation override if parent node is not an object", function (asse
     "js.composer.reply": "WAT",
     "js.composer.reply.help": "foobar",
   };
-  LocalizationInitializer.initialize(this.registry);
+  LocalizationInitializer.initialize(getApplication());
 
   assert.equal(I18n.t("composer.reply.help"), "[fr.composer.reply.help]");
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/mixins/grant-badge-controller-test.js b/app/assets/javascripts/discourse/tests/unit/mixins/grant-badge-controller-test.js
index 7807f8c367..8b939bd9de 100644
--- a/app/assets/javascripts/discourse/tests/unit/mixins/grant-badge-controller-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/mixins/grant-badge-controller-test.js
@@ -1,7 +1,7 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
+import Badge from "discourse/models/badge";
 import Controller from "@ember/controller";
 import GrantBadgeControllerMixin from "discourse/mixins/grant-badge-controller";
-import Badge from "discourse/models/badge";
 
 module("Unit | Mixin | grant-badge-controller", function (hooks) {
   hooks.beforeEach(function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/mixins/setting-object-test.js b/app/assets/javascripts/discourse/tests/unit/mixins/setting-object-test.js
index cc2f92bfe2..a3cca394fc 100644
--- a/app/assets/javascripts/discourse/tests/unit/mixins/setting-object-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/mixins/setting-object-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import EmberObject from "@ember/object";
 import Setting from "admin/mixins/setting-object";
 
diff --git a/app/assets/javascripts/discourse/tests/unit/mixins/singleton-test.js b/app/assets/javascripts/discourse/tests/unit/mixins/singleton-test.js
index 6aaf8c6e1b..0a2e29d0e5 100644
--- a/app/assets/javascripts/discourse/tests/unit/mixins/singleton-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/mixins/singleton-test.js
@@ -1,13 +1,13 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import EmberObject from "@ember/object";
 import Singleton from "discourse/mixins/singleton";
 
 module("Unit | Mixin | singleton", function () {
   test("current", function (assert) {
-    var DummyModel = EmberObject.extend({});
+    let DummyModel = EmberObject.extend({});
     DummyModel.reopenClass(Singleton);
 
-    var current = DummyModel.current();
+    let current = DummyModel.current();
     assert.present(current, "current returns the current instance");
     assert.equal(
       current,
@@ -22,9 +22,9 @@ module("Unit | Mixin | singleton", function () {
   });
 
   test("currentProp reading", function (assert) {
-    var DummyModel = EmberObject.extend({});
+    let DummyModel = EmberObject.extend({});
     DummyModel.reopenClass(Singleton);
-    var current = DummyModel.current();
+    let current = DummyModel.current();
 
     assert.blank(
       DummyModel.currentProp("evil"),
@@ -39,14 +39,14 @@ module("Unit | Mixin | singleton", function () {
   });
 
   test("currentProp writing", function (assert) {
-    var DummyModel = EmberObject.extend({});
+    let DummyModel = EmberObject.extend({});
     DummyModel.reopenClass(Singleton);
 
     assert.blank(
       DummyModel.currentProp("adventure"),
       "by default attributes are blank"
     );
-    var result = DummyModel.currentProp("adventure", "time");
+    let result = DummyModel.currentProp("adventure", "time");
     assert.equal(result, "time", "it returns the new value");
     assert.equal(
       DummyModel.currentProp("adventure"),
@@ -70,7 +70,7 @@ module("Unit | Mixin | singleton", function () {
   });
 
   test("createCurrent", function (assert) {
-    var Shoe = EmberObject.extend({});
+    let Shoe = EmberObject.extend({});
     Shoe.reopenClass(Singleton, {
       createCurrent: function () {
         return Shoe.create({ toes: 5 });
@@ -85,7 +85,7 @@ module("Unit | Mixin | singleton", function () {
   });
 
   test("createCurrent that returns null", function (assert) {
-    var Missing = EmberObject.extend({});
+    let Missing = EmberObject.extend({});
     Missing.reopenClass(Singleton, {
       createCurrent: function () {
         return null;
diff --git a/app/assets/javascripts/discourse/tests/unit/models/badge-test.js b/app/assets/javascripts/discourse/tests/unit/models/badge-test.js
index 1e950b066d..794cf97231 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/badge-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/badge-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import Badge from "discourse/models/badge";
 
 module("Unit | Model | badge", function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/models/category-test.js b/app/assets/javascripts/discourse/tests/unit/models/category-test.js
index 8aac6f2467..2d5f8e0e85 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/category-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/category-test.js
@@ -1,7 +1,7 @@
-import sinon from "sinon";
-import { test, module } from "qunit";
-import createStore from "discourse/tests/helpers/create-store";
+import { module, test } from "qunit";
 import Category from "discourse/models/category";
+import createStore from "discourse/tests/helpers/create-store";
+import sinon from "sinon";
 
 module("Unit | Model | category", function () {
   test("slugFor", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/models/composer-test.js b/app/assets/javascripts/discourse/tests/unit/models/composer-test.js
index 53a0c41e53..11be45dce1 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/composer-test.js
@@ -1,18 +1,18 @@
-import { test } from "qunit";
-import EmberObject from "@ember/object";
 import {
-  discourseModule,
+  CREATE_TOPIC,
+  EDIT,
+  PRIVATE_MESSAGE,
+  REPLY,
+} from "discourse/models/composer";
+import {
   currentUser,
+  discourseModule,
 } from "discourse/tests/helpers/qunit-helpers";
 import AppEvents from "discourse/services/app-events";
-import {
-  EDIT,
-  REPLY,
-  CREATE_TOPIC,
-  PRIVATE_MESSAGE,
-} from "discourse/models/composer";
+import EmberObject from "@ember/object";
 import Post from "discourse/models/post";
 import createStore from "discourse/tests/helpers/create-store";
+import { test } from "qunit";
 
 function createComposer(opts) {
   opts = opts || {};
@@ -47,6 +47,19 @@ discourseModule("Unit | Model | composer", function () {
       2,
       "handles nested quotes correctly"
     );
+    replyLength("<!-- a commnent -->", 0, "remove comments");
+
+    replyLength(
+      "<!-- a comment -->\n more text \n<!-- a comment -->",
+      9,
+      "remove multiple comments"
+    );
+
+    replyLength(
+      "<!-- <!-- a comment --> -->more text",
+      12,
+      "remove multiple comments"
+    );
   });
 
   test("missingReplyCharacters", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/models/email-log-test.js b/app/assets/javascripts/discourse/tests/unit/models/email-log-test.js
index ad7e9a918c..adefc0dc13 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/email-log-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/email-log-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import EmailLog from "admin/models/email-log";
 import { setPrefix } from "discourse-common/lib/get-url";
 
diff --git a/app/assets/javascripts/discourse/tests/unit/models/group-test.js b/app/assets/javascripts/discourse/tests/unit/models/group-test.js
index 4e8d17114e..4b266f7e0c 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/group-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/group-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import Group from "discourse/models/group";
 
 module("Unit | Model | group", function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/models/invite-test.js b/app/assets/javascripts/discourse/tests/unit/models/invite-test.js
index 688aaebd06..10c7530751 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/invite-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/invite-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import Invite from "discourse/models/invite";
 
 module("Unit | Model | invite", function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/models/nav-item-test.js b/app/assets/javascripts/discourse/tests/unit/models/nav-item-test.js
index ead95c535c..329aa30fa6 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/nav-item-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/nav-item-test.js
@@ -1,9 +1,9 @@
-import { test, module } from "qunit";
-import { run } from "@ember/runloop";
-import createStore from "discourse/tests/helpers/create-store";
-import NavItem from "discourse/models/nav-item";
+import { module, test } from "qunit";
 import Category from "discourse/models/category";
+import NavItem from "discourse/models/nav-item";
 import Site from "discourse/models/site";
+import createStore from "discourse/tests/helpers/create-store";
+import { run } from "@ember/runloop";
 
 module("Unit | Model | nav-item", function (hooks) {
   hooks.beforeEach(function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js b/app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js
index 97a93542f3..78151c3355 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js
@@ -1,11 +1,12 @@
-import sinon from "sinon";
-import { test, module } from "qunit";
+import { module, test } from "qunit";
+import AppEvents from "discourse/services/app-events";
 import ArrayProxy from "@ember/array/proxy";
 import Post from "discourse/models/post";
-import createStore from "discourse/tests/helpers/create-store";
-import User from "discourse/models/user";
 import { Promise } from "rsvp";
+import User from "discourse/models/user";
+import createStore from "discourse/tests/helpers/create-store";
 import pretender from "discourse/tests/helpers/create-pretender";
+import sinon from "sinon";
 
 function buildStream(id, stream) {
   const store = createStore();
@@ -14,6 +15,7 @@ function buildStream(id, stream) {
   if (stream) {
     ps.set("stream", stream);
   }
+  ps.appEvents = AppEvents.create();
   return ps;
 }
 
@@ -232,7 +234,7 @@ module("Unit | Model | post-stream", function () {
     postStream.cancelFilter();
     assert.ok(!postStream.get("summary"), "summary is cancelled");
 
-    postStream.toggleParticipant(participant);
+    postStream.filterParticipant(participant);
     postStream.cancelFilter();
     assert.blank(
       postStream.get("userFilters"),
@@ -282,7 +284,7 @@ module("Unit | Model | post-stream", function () {
     );
   });
 
-  test("toggleParticipant", function (assert) {
+  test("filterParticipant", function (assert) {
     const postStream = buildStream(1236);
     sinon.stub(postStream, "refresh").returns(Promise.resolve());
 
@@ -292,16 +294,71 @@ module("Unit | Model | post-stream", function () {
       "by default no participants are toggled"
     );
 
-    postStream.toggleParticipant(participant.username);
+    postStream.filterParticipant(participant.username);
     assert.ok(
       postStream.get("userFilters").includes("eviltrout"),
       "eviltrout is in the filters"
     );
 
-    postStream.toggleParticipant(participant.username);
-    assert.blank(
-      postStream.get("userFilters"),
-      "toggling the participant again removes them"
+    postStream.cancelFilter();
+    assert.blank(postStream.get("userFilters"), "cancelFilter clears");
+  });
+
+  test("filterReplies", function (assert) {
+    const postStream = buildStream(1234),
+      store = postStream.store;
+
+    postStream.appendPost(
+      store.createRecord("post", { id: 2, post_number: 3 })
+    );
+
+    sinon.stub(postStream, "refresh").returns(Promise.resolve());
+
+    assert.equal(
+      postStream.get("filterRepliesToPostNumber"),
+      false,
+      "by default no replies are filtered"
+    );
+
+    postStream.filterReplies(3, 2);
+    assert.equal(
+      postStream.get("filterRepliesToPostNumber"),
+      3,
+      "postNumber is in the filters"
+    );
+
+    postStream.cancelFilter();
+    assert.equal(
+      postStream.get("filterRepliesToPostNumber"),
+      false,
+      "cancelFilter clears"
+    );
+  });
+
+  test("filterUpwards", function (assert) {
+    const postStream = buildStream(1234),
+      store = postStream.store;
+
+    postStream.appendPost(
+      store.createRecord("post", { id: 2, post_number: 3 })
+    );
+
+    sinon.stub(postStream, "refresh").returns(Promise.resolve());
+
+    assert.equal(
+      postStream.get("filterUpwardsPostID"),
+      false,
+      "by default filter is false"
+    );
+
+    postStream.filterUpwards(2);
+    assert.equal(postStream.get("filterUpwardsPostID"), 2, "filter is set");
+
+    postStream.cancelFilter();
+    assert.equal(
+      postStream.get("filterUpwardsPostID"),
+      false,
+      "filter cleared"
     );
   });
 
@@ -327,7 +384,7 @@ module("Unit | Model | post-stream", function () {
     );
     assert.ok(!postStream.get("hasNoFilters"), "now there are filters present");
 
-    postStream.toggleParticipant(participant.username);
+    postStream.filterParticipant(participant.username);
     assert.deepEqual(
       postStream.get("streamFilters"),
       {
@@ -335,6 +392,24 @@ module("Unit | Model | post-stream", function () {
       },
       "streamFilters contains the username we filtered"
     );
+
+    postStream.filterUpwards(2);
+    assert.deepEqual(
+      postStream.get("streamFilters"),
+      {
+        filter_upwards_post_id: 2,
+      },
+      "streamFilters contains only the post ID"
+    );
+
+    postStream.filterReplies(1);
+    assert.deepEqual(
+      postStream.get("streamFilters"),
+      {
+        replies_to_post_number: 1,
+      },
+      "streamFilters contains only the last filter"
+    );
   });
 
   test("loading", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/models/post-test.js b/app/assets/javascripts/discourse/tests/unit/models/post-test.js
index 39b5a58471..82b5e52805 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/post-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/post-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import Post from "discourse/models/post";
 import User from "discourse/models/user";
 import { deepMerge } from "discourse-common/lib/object";
@@ -18,13 +18,13 @@ function buildPost(args) {
 
 module("Unit | Model | post", function () {
   test("defaults", function (assert) {
-    var post = Post.create({ id: 1 });
+    let post = Post.create({ id: 1 });
     assert.blank(post.get("deleted_at"), "it has no deleted_at by default");
     assert.blank(post.get("deleted_by"), "there is no deleted_by by default");
   });
 
   test("new_user", function (assert) {
-    var post = Post.create({ trust_level: 0 });
+    let post = Post.create({ trust_level: 0 });
     assert.ok(post.get("new_user"), "post is from a new user");
 
     post.set("trust_level", 1);
@@ -32,7 +32,7 @@ module("Unit | Model | post", function () {
   });
 
   test("firstPost", function (assert) {
-    var post = Post.create({ post_number: 1 });
+    let post = Post.create({ post_number: 1 });
     assert.ok(post.get("firstPost"), "it's the first post");
 
     post.set("post_number", 10);
@@ -40,7 +40,7 @@ module("Unit | Model | post", function () {
   });
 
   test("updateFromPost", function (assert) {
-    var post = Post.create({
+    let post = Post.create({
       post_number: 1,
       raw: "hello world",
     });
diff --git a/app/assets/javascripts/discourse/tests/unit/models/report-test.js b/app/assets/javascripts/discourse/tests/unit/models/report-test.js
index 2fd60707fd..3324ec0919 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/report-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/report-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import Report from "admin/models/report";
 import { setPrefix } from "discourse-common/lib/get-url";
 
diff --git a/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js b/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js
index 2a6f7a75c0..b549826f1a 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js
@@ -1,8 +1,8 @@
-import sinon from "sinon";
-import { test, module } from "qunit";
-import createStore from "discourse/tests/helpers/create-store";
-import RestModel from "discourse/models/rest";
+import { module, test } from "qunit";
 import RestAdapter from "discourse/adapters/rest";
+import RestModel from "discourse/models/rest";
+import createStore from "discourse/tests/helpers/create-store";
+import sinon from "sinon";
 
 module("Unit | Model | rest-model", function () {
   test("munging", function (assert) {
@@ -15,7 +15,7 @@ module("Unit | Model | rest-model", function () {
       },
     });
 
-    var g = Grape.create({ store, percent: 0.4 });
+    let g = Grape.create({ store, percent: 0.4 });
     assert.equal(g.get("inverse"), 0.6, "it runs `munge` on `create`");
   });
 
diff --git a/app/assets/javascripts/discourse/tests/unit/models/result-set-test.js b/app/assets/javascripts/discourse/tests/unit/models/result-set-test.js
index cf102cc9dd..595e722780 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/result-set-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/result-set-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import ResultSet from "discourse/models/result-set";
 import createStore from "discourse/tests/helpers/create-store";
 
diff --git a/app/assets/javascripts/discourse/tests/unit/models/session-test.js b/app/assets/javascripts/discourse/tests/unit/models/session-test.js
index 30c521afe4..8037876ec9 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/session-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/session-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import Session from "discourse/models/session";
 
 module("Unit | Model | session", function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/models/site-test.js b/app/assets/javascripts/discourse/tests/unit/models/site-test.js
index dd0395eee3..d5e52ada4c 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/site-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/site-test.js
@@ -1,6 +1,6 @@
-import { test, module } from "qunit";
-import createStore from "discourse/tests/helpers/create-store";
+import { module, test } from "qunit";
 import Site from "discourse/models/site";
+import createStore from "discourse/tests/helpers/create-store";
 
 module("Unit | Model | site", function () {
   test("create", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/models/staff-action-log-test.js b/app/assets/javascripts/discourse/tests/unit/models/staff-action-log-test.js
index 1ad43c507a..e76f05fdbe 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/staff-action-log-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/staff-action-log-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import StaffActionLog from "admin/models/staff-action-log";
 
 module("Unit | Model | staff-action-log", function () {
diff --git a/app/assets/javascripts/admin/tests/admin/unit/models/theme-test.js b/app/assets/javascripts/discourse/tests/unit/models/theme-test.js
similarity index 89%
rename from app/assets/javascripts/admin/tests/admin/unit/models/theme-test.js
rename to app/assets/javascripts/discourse/tests/unit/models/theme-test.js
index 05f4dea5c1..94c360d58d 100644
--- a/app/assets/javascripts/admin/tests/admin/unit/models/theme-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/theme-test.js
@@ -1,7 +1,7 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import Theme from "admin/models/theme";
 
-module("model:theme");
+module("Unit | Model | theme");
 
 test("can add an upload correctly", function (assert) {
   let theme = Theme.create();
diff --git a/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js b/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js
index dcd6d9d0dc..5dd146e5eb 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js
@@ -1,21 +1,21 @@
-import { test, module } from "qunit";
-import User from "discourse/models/user";
+import { module, test } from "qunit";
 import Topic from "discourse/models/topic";
+import User from "discourse/models/user";
 
-function buildDetails(id) {
-  const topic = Topic.create({ id: id });
+function buildDetails(id, topicParams = {}) {
+  const topic = Topic.create(Object.assign({ id }, topicParams));
   return topic.get("details");
 }
 
 module("Unit | Model | topic-details", function () {
   test("defaults", function (assert) {
-    var details = buildDetails(1234);
+    let details = buildDetails(1234);
     assert.present(details, "the details are present by default");
     assert.ok(!details.get("loaded"), "details are not loaded by default");
   });
 
   test("updateFromJson", function (assert) {
-    var details = buildDetails(1234);
+    let details = buildDetails(1234);
 
     details.updateFromJson({
       allowed_users: [{ username: "eviltrout" }],
diff --git a/app/assets/javascripts/discourse/tests/unit/models/topic-test.js b/app/assets/javascripts/discourse/tests/unit/models/topic-test.js
index 02fbdbd492..f903fd6b69 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/topic-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/topic-test.js
@@ -1,10 +1,10 @@
-import { test } from "qunit";
-import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
 import Category from "discourse/models/category";
+import EmberObject from "@ember/object";
 import Topic from "discourse/models/topic";
 import User from "discourse/models/user";
 import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-import EmberObject from "@ember/object";
+import { test } from "qunit";
+import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
 
 discourseModule("Unit | Model | topic", function () {
   test("defaults", function (assert) {
@@ -129,7 +129,7 @@ discourseModule("Unit | Model | topic", function () {
 
     assert.equal(
       topic.get("fancyTitle"),
-      `<img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/smile.png?v=${v}' title='smile' alt='smile' class='emoji'> with all <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/slight_smile.png?v=${v}' title='slight_smile' alt='slight_smile' class='emoji'> the emojis <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/pear.png?v=${v}' title='pear' alt='pear' class='emoji'><img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/peach.png?v=${v}' title='peach' alt='peach' class='emoji'>`,
+      `<img width=\"20\" height=\"20\" src='/images/emoji/google_classic/smile.png?v=${v}' title='smile' alt='smile' class='emoji'> with all <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/slight_smile.png?v=${v}' title='slight_smile' alt='slight_smile' class='emoji'> the emojis <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/pear.png?v=${v}' title='pear' alt='pear' class='emoji'><img width=\"20\" height=\"20\" src='/images/emoji/google_classic/peach.png?v=${v}' title='peach' alt='peach' class='emoji'>`,
       "supports emojis"
     );
   });
@@ -159,8 +159,22 @@ discourseModule("Unit | Model | topic", function () {
 
     assert.equal(
       topic.get("escapedExcerpt"),
-      `This is a test topic <img width=\"20\" height=\"20\" src='/images/emoji/emoji_one/smile.png?v=${v}' title='smile' alt='smile' class='emoji'>`,
+      `This is a test topic <img width=\"20\" height=\"20\" src='/images/emoji/google_classic/smile.png?v=${v}' title='smile' alt='smile' class='emoji'>`,
       "supports emojis"
     );
   });
+
+  test("visible & invisible", function (assert) {
+    const topic = Topic.create();
+    assert.equal(topic.visible, undefined);
+    assert.equal(topic.invisible, undefined);
+
+    const visibleTopic = Topic.create({ visible: true });
+    assert.equal(visibleTopic.visible, true);
+    assert.equal(visibleTopic.invisible, false);
+
+    const invisibleTopic = Topic.create({ visible: false });
+    assert.equal(invisibleTopic.visible, false);
+    assert.equal(invisibleTopic.invisible, true);
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js b/app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js
index 2f7b2331a1..56542dfb95 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js
@@ -1,9 +1,9 @@
-import { test, module } from "qunit";
-import TopicTrackingState from "discourse/models/topic-tracking-state";
-import createStore from "discourse/tests/helpers/create-store";
+import { module, test } from "qunit";
 import Category from "discourse/models/category";
 import { NotificationLevels } from "discourse/lib/notification-levels";
+import TopicTrackingState from "discourse/models/topic-tracking-state";
 import User from "discourse/models/user";
+import createStore from "discourse/tests/helpers/create-store";
 import sinon from "sinon";
 
 module("Unit | Model | topic-tracking-state", function (hooks) {
@@ -290,6 +290,7 @@ module("Unit | Model | topic-tracking-state", function (hooks) {
     };
 
     assert.equal(state.countNew(1), 1);
+    assert.equal(state.countNew(1, undefined, true), 0);
     assert.equal(state.countNew(1, "missing-tag"), 0);
     assert.equal(state.countNew(2), 1);
     assert.equal(state.countNew(3), 0);
@@ -327,7 +328,30 @@ module("Unit | Model | topic-tracking-state", function (hooks) {
     assert.equal(state.countNew(4), 0);
   });
 
-  test("mute topic", function (assert) {
+  test("dismissNew", function (assert) {
+    let currentUser = User.create({
+      username: "chuck",
+    });
+
+    const state = TopicTrackingState.create({ currentUser });
+
+    state.states["t112"] = {
+      last_read_post_number: null,
+      id: 112,
+      notification_level: NotificationLevels.TRACKING,
+      category_id: 1,
+      is_seen: false,
+      tags: ["foo"],
+    };
+
+    state.dismissNewTopic({
+      message_type: "dismiss_new",
+      payload: { topic_ids: [112] },
+    });
+    assert.equal(state.states["t112"].is_seen, true);
+  });
+
+  test("mute and unmute topic", function (assert) {
     let currentUser = User.create({
       username: "chuck",
       muted_category_ids: [],
@@ -335,14 +359,19 @@ module("Unit | Model | topic-tracking-state", function (hooks) {
 
     const state = TopicTrackingState.create({ currentUser });
 
-    state.trackMutedTopic(1);
+    state.trackMutedOrUnmutedTopic({ topic_id: 1, message_type: "muted" });
     assert.equal(currentUser.muted_topics[0].topicId, 1);
 
-    state.pruneOldMutedTopics();
+    state.trackMutedOrUnmutedTopic({ topic_id: 2, message_type: "unmuted" });
+    assert.equal(currentUser.unmuted_topics[0].topicId, 2);
+
+    state.pruneOldMutedAndUnmutedTopics();
     assert.equal(state.isMutedTopic(1), true);
+    assert.equal(state.isUnmutedTopic(2), true);
 
     this.clock.tick(60000);
-    state.pruneOldMutedTopics();
+    state.pruneOldMutedAndUnmutedTopics();
     assert.equal(state.isMutedTopic(1), false);
+    assert.equal(state.isUnmutedTopic(2), false);
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js
index 00dd4c0116..50cd70e739 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js
@@ -1,9 +1,9 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import UserAction from "discourse/models/user-action";
 
 module("Unit | Model | user-action", function () {
   test("collapsing likes", function (assert) {
-    var actions = UserAction.collapseStream([
+    let actions = UserAction.collapseStream([
       UserAction.create({
         action_type: UserAction.TYPES.likes_given,
         topic_id: 1,
diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-badge-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-badge-test.js
index 999cbc94d1..28257789e2 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/user-badge-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/user-badge-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import UserBadge from "discourse/models/user-badge";
 import badgeFixtures from "discourse/tests/fixtures/user-badges";
 
diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-drafts-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-drafts-test.js
index a7b8ecc538..118089d644 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/user-drafts-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/user-drafts-test.js
@@ -1,8 +1,8 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 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";
+import UserDraft from "discourse/models/user-draft";
 
 module("Unit | Model | user-draft", function () {
   test("stream", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js
index 698855b3cc..496a383988 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js
@@ -1,11 +1,11 @@
-import { test, module } from "qunit";
-import UserAction from "discourse/models/user-action";
+import { module, test } from "qunit";
 import User from "discourse/models/user";
+import UserAction from "discourse/models/user-action";
 
 module("Unit | Model | user-stream", function () {
   test("basics", function (assert) {
-    var user = User.create({ id: 1, username: "eviltrout" });
-    var stream = user.get("stream");
+    let user = User.create({ id: 1, username: "eviltrout" });
+    let stream = user.get("stream");
     assert.present(stream, "a user has a stream by default");
     assert.equal(
       stream.get("user"),
@@ -25,12 +25,15 @@ module("Unit | Model | user-stream", function () {
   });
 
   test("filterParam", function (assert) {
-    var user = User.create({ id: 1, username: "eviltrout" });
-    var stream = user.get("stream");
+    let user = User.create({ id: 1, username: "eviltrout" });
+    let stream = user.get("stream");
 
     // defaults to posts/topics
     assert.equal(stream.get("filterParam"), "4,5");
 
+    stream.set("filter", UserAction.TYPES.topics);
+    assert.equal(stream.get("filterParam"), "4");
+
     stream.set("filter", UserAction.TYPES.likes_given);
     assert.equal(stream.get("filterParam"), UserAction.TYPES.likes_given);
 
diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-test.js
index 680f6562db..0b95967b12 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/user-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/user-test.js
@@ -1,13 +1,13 @@
-import sinon from "sinon";
-import { test, module } from "qunit";
-import User from "discourse/models/user";
-import Group from "discourse/models/group";
 import * as ajaxlib from "discourse/lib/ajax";
+import { module, test } from "qunit";
+import Group from "discourse/models/group";
+import User from "discourse/models/user";
 import pretender from "discourse/tests/helpers/create-pretender";
+import sinon from "sinon";
 
 module("Unit | Model | user", function () {
   test("staff", function (assert) {
-    var user = User.create({ id: 1, username: "eviltrout" });
+    let user = User.create({ id: 1, username: "eviltrout" });
 
     assert.ok(!user.get("staff"), "user is not staff");
 
@@ -19,7 +19,7 @@ module("Unit | Model | user", function () {
   });
 
   test("searchContext", function (assert) {
-    var user = User.create({ id: 1, username: "EvilTrout" });
+    let user = User.create({ id: 1, username: "EvilTrout" });
 
     assert.deepEqual(
       user.get("searchContext"),
@@ -29,7 +29,7 @@ module("Unit | Model | user", function () {
   });
 
   test("isAllowedToUploadAFile", function (assert) {
-    var user = User.create({ trust_level: 0, admin: true });
+    let user = User.create({ trust_level: 0, admin: true });
     assert.ok(
       user.isAllowedToUploadAFile("image"),
       "admin can always upload a file"
diff --git a/app/assets/javascripts/discourse/tests/unit/services/current-user-test.js b/app/assets/javascripts/discourse/tests/unit/services/current-user-test.js
new file mode 100644
index 0000000000..ca85085335
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/services/current-user-test.js
@@ -0,0 +1,11 @@
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+
+acceptance("current-user", function (needs) {
+  needs.user();
+
+  test("currentUser has appEvents", function (assert) {
+    let currentUser = this.container.lookup("current-user:main");
+    assert.ok(currentUser.appEvents);
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/services/document-title-test.js b/app/assets/javascripts/discourse/tests/unit/services/document-title-test.js
index cae8dccdb6..ffb7d1009f 100644
--- a/app/assets/javascripts/discourse/tests/unit/services/document-title-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/services/document-title-test.js
@@ -1,14 +1,22 @@
-import { test } from "qunit";
 import {
-  discourseModule,
   currentUser,
+  discourseModule,
 } from "discourse/tests/helpers/qunit-helpers";
+import DocumentTitle from "discourse/services/document-title";
+import AppEvents from "discourse/services/app-events";
+import Session from "discourse/models/session";
+import { test } from "qunit";
 
 discourseModule("Unit | Service | document-title", function (hooks) {
   hooks.beforeEach(function () {
-    this.documentTitle = this.container.lookup("service:document-title");
+    const session = Session.current();
+    session.hasFocus = true;
+
+    this.documentTitle = DocumentTitle.create({
+      session,
+      appEvents: AppEvents.create(),
+    });
     this.documentTitle.currentUser = null;
-    this.container.lookup("session:main").hasFocus = true;
   });
 
   hooks.afterEach(function () {
@@ -42,6 +50,22 @@ discourseModule("Unit | Service | document-title", function (hooks) {
     assert.equal(document.title, "test notifications");
   });
 
+  test("it doesn't display notification counts for users in do not disturb", function (assert) {
+    this.documentTitle.currentUser = currentUser();
+
+    const date = new Date();
+    date.setHours(date.getHours() + 1);
+    this.documentTitle.currentUser.do_not_disturb_until = date.toUTCString();
+
+    this.documentTitle.currentUser.dynamic_favicon = false;
+    this.documentTitle.setTitle("test notifications");
+    this.documentTitle.updateNotificationCount(5);
+    assert.equal(document.title, "test notifications");
+    this.documentTitle.setFocus(false);
+    this.documentTitle.updateNotificationCount(6);
+    assert.equal(document.title, "test notifications");
+  });
+
   test("it doesn't increment background context counts when focused", function (assert) {
     this.documentTitle.setTitle("background context");
     this.documentTitle.setFocus(true);
diff --git a/app/assets/javascripts/discourse/tests/unit/services/store-test.js b/app/assets/javascripts/discourse/tests/unit/services/store-test.js
index 1396d5122d..28d676453b 100644
--- a/app/assets/javascripts/discourse/tests/unit/services/store-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/services/store-test.js
@@ -1,4 +1,4 @@
-import { test, module } from "qunit";
+import { module, test } from "qunit";
 import createStore from "discourse/tests/helpers/create-store";
 
 module("Unit | Service | store", function () {
diff --git a/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js b/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js
index 996ed19473..649a68893a 100644
--- a/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js
@@ -1,12 +1,12 @@
-import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { afterRender } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import componentTest from "discourse/tests/helpers/component-test";
-import { moduleForComponent } from "ember-qunit";
+import { afterRender } from "discourse-common/utils/decorators";
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
 
 const fooComponent = Component.extend({
-  layoutName: "foo-component",
-
   classNames: ["foo-component"],
 
   baz: null,
@@ -29,23 +29,25 @@ const fooComponent = Component.extend({
   },
 });
 
-moduleForComponent("utils:decorators", { integration: true });
+discourseModule("utils:decorators", function (hooks) {
+  setupRenderingTest(hooks);
 
-componentTest("afterRender", {
-  template: "{{foo-component baz=baz}}",
+  componentTest("afterRender", {
+    template: hbs`{{foo-component baz=baz}}`,
 
-  beforeEach() {
-    this.registry.register("component:foo-component", fooComponent);
-    this.set("baz", 0);
-  },
+    beforeEach() {
+      this.registry.register("component:foo-component", fooComponent);
+      this.set("baz", 0);
+    },
 
-  test(assert) {
-    assert.ok(exists(document.querySelector(".foo-component")));
-    assert.equal(this.baz, 1);
+    async test(assert) {
+      assert.ok(exists(document.querySelector(".foo-component")));
+      assert.equal(this.baz, 1);
 
-    this.clearRender();
+      await this.clearRender();
 
-    assert.ok(!exists(document.querySelector(".foo-component")));
-    assert.equal(this.baz, 1);
-  },
+      assert.ok(!exists(document.querySelector(".foo-component")));
+      assert.equal(this.baz, 1);
+    },
+  });
 });
diff --git a/app/assets/javascripts/embed-application.js b/app/assets/javascripts/embed-application.js
index 4ba6a082fa..f71ac900ef 100644
--- a/app/assets/javascripts/embed-application.js
+++ b/app/assets/javascripts/embed-application.js
@@ -9,11 +9,11 @@
   }
 
   function clickPostLink(e) {
-    var postId = e.target.getAttribute("data-link-to-post");
+    let postId = e.target.getAttribute("data-link-to-post");
     if (postId) {
-      var postElement = document.getElementById("post-" + postId);
+      let postElement = document.getElementById("post-" + postId);
       if (postElement) {
-        var rect = postElement.getBoundingClientRect();
+        let rect = postElement.getBoundingClientRect();
         if (rect && rect.top) {
           postUp({ type: "discourse-scroll", top: rect.top });
           e.preventDefault();
@@ -25,9 +25,9 @@
 
   window.onload = function () {
     // get state info from data attribute
-    var embedState = document.querySelector("[data-embed-state]");
-    var state = "unknown";
-    var embedId = null;
+    let embedState = document.querySelector("[data-embed-state]");
+    let state = "unknown";
+    let embedId = null;
     if (embedState) {
       state = embedState.getAttribute("data-embed-state");
       embedId = embedState.getAttribute("data-embed-id");
@@ -41,7 +41,7 @@
       embedId,
     });
 
-    var postLinks = document.querySelectorAll("a[data-link-to-post]"),
+    let postLinks = document.querySelectorAll("a[data-link-to-post]"),
       i;
 
     for (i = 0; i < postLinks.length; i++) {
@@ -49,15 +49,15 @@
     }
 
     // Make sure all links in the iframe point to _blank
-    var cookedLinks = document.querySelectorAll(".cooked a");
+    let cookedLinks = document.querySelectorAll(".cooked a");
     for (i = 0; i < cookedLinks.length; i++) {
       cookedLinks[i].target = "_blank";
     }
 
     // Adjust all names
-    var names = document.querySelectorAll(".username a");
+    let names = document.querySelectorAll(".username a");
     for (i = 0; i < names.length; i++) {
-      var username = names[i].innerHTML;
+      let username = names[i].innerHTML;
       if (username) {
         /* global BreakString */
         names[i].innerHTML = new BreakString(username).break();
diff --git a/app/assets/javascripts/google-tag-manager.js b/app/assets/javascripts/google-tag-manager.js
index af136df5ea..90cc8ccaaa 100644
--- a/app/assets/javascripts/google-tag-manager.js
+++ b/app/assets/javascripts/google-tag-manager.js
@@ -2,6 +2,7 @@
 (function () {
   const gtmDataElement = document.getElementById("data-google-tag-manager");
   const dataLayerJson = JSON.parse(gtmDataElement.dataset.dataLayer);
+  const gtmNonce = gtmDataElement.dataset.nonce;
 
   // dataLayer declaration needs to precede the container snippet
   // https://developers.google.com/tag-manager/devguide#adding-data-layer-variables-to-a-page
@@ -12,7 +13,9 @@
   (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
   new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
   j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-  'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+  'https://www.googletagmanager.com/gtm.js?id='+i+dl;
+  j.setAttribute("nonce", gtmNonce);
+  f.parentNode.insertBefore(j,f);
   })(window,document,'script','dataLayer',gtmDataElement.dataset.containerId);
   /* eslint-enable */
 })();
diff --git a/app/assets/javascripts/handlebars-shim.js b/app/assets/javascripts/handlebars-shim.js
index fb191149a1..9d8403d189 100644
--- a/app/assets/javascripts/handlebars-shim.js
+++ b/app/assets/javascripts/handlebars-shim.js
@@ -5,6 +5,10 @@ if (typeof define !== "undefined") {
     if (typeof Handlebars !== "undefined") {
       // eslint-disable-next-line
       __exports__.default = Handlebars;
+      __exports__.compile = function () {
+        // eslint-disable-next-line
+        return Handlebars.compile.apply(this, arguments);
+      };
     }
   });
 
diff --git a/app/assets/javascripts/locales/ar.js.erb b/app/assets/javascripts/locales/ar.js.erb
index c39afcd204..8eccfaf614 100644
--- a/app/assets/javascripts/locales/ar.js.erb
+++ b/app/assets/javascripts/locales/ar.js.erb
@@ -1,3 +1,11 @@
 //= depend_on 'client.ar.yml'
 //= require locales/i18n
 <%= JsLocaleHelper.output_locale(:ar) %>
+
+// original moment.js implementation can be found here:
+// https://github.com/moment/moment/blob/b7ec8e2ec068e03de4f832f28362675bb9e02261/locale/ar.js#L185-L191
+moment.updateLocale("ar", {
+  postformat(string) {
+    return string;
+  }
+});
diff --git a/app/assets/javascripts/locales/en_GB.js.erb b/app/assets/javascripts/locales/en_GB.js.erb
new file mode 100644
index 0000000000..cc7502dcd0
--- /dev/null
+++ b/app/assets/javascripts/locales/en_GB.js.erb
@@ -0,0 +1,6 @@
+//= depend_on 'client.en_GB.yml'
+//= depend_on 'client.en.yml'
+//= require locales/i18n
+
+<% JsLocaleHelper.reloadable_plugins(:en_GB, self) %>
+<%= JsLocaleHelper.output_locale(:en_GB) %>
diff --git a/app/assets/javascripts/locales/en_US.js.erb b/app/assets/javascripts/locales/en_US.js.erb
deleted file mode 100644
index 572777e23c..0000000000
--- a/app/assets/javascripts/locales/en_US.js.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-//= depend_on 'client.en_US.yml'
-//= depend_on 'client.en.yml'
-//= require locales/i18n
-
-<% JsLocaleHelper.reloadable_plugins(:en_US, self) %>
-<%= JsLocaleHelper.output_locale(:en_US) %>
diff --git a/app/assets/javascripts/package.json b/app/assets/javascripts/package.json
new file mode 100644
index 0000000000..d2b43f0a78
--- /dev/null
+++ b/app/assets/javascripts/package.json
@@ -0,0 +1,13 @@
+{
+  "private": true,
+  "workspaces": [
+    "discourse",
+    "admin",
+    "discourse-common",
+    "discourse-hbr",
+    "discourse-widget-hbs",
+    "pretty-text",
+    "select-kit",
+    "truth-helpers"
+  ]
+}
diff --git a/app/assets/javascripts/pretty-text/addon/allow-lister.js b/app/assets/javascripts/pretty-text/addon/allow-lister.js
index 930edc704a..698f64c5d7 100644
--- a/app/assets/javascripts/pretty-text/addon/allow-lister.js
+++ b/app/assets/javascripts/pretty-text/addon/allow-lister.js
@@ -130,6 +130,7 @@ export default class AllowLister {
 // Only add to `default` when you always want your allowlist to occur. In other words,
 // don't change this for a plugin or a feature that can be disabled
 export const DEFAULT_LIST = [
+  "a.anchor",
   "a.attachment",
   "a.hashtag",
   "a.mention",
@@ -190,9 +191,11 @@ export const DEFAULT_LIST = [
   "img[height]",
   "img[title]",
   "img[width]",
+  "img[data-thumbnail]",
   "ins",
   "kbd",
   "li",
+  "mark",
   "ol",
   "ol[start]",
   "p",
diff --git a/app/assets/javascripts/pretty-text/addon/emoji.js b/app/assets/javascripts/pretty-text/addon/emoji.js
index 67a7c2afaf..3ff60de061 100644
--- a/app/assets/javascripts/pretty-text/addon/emoji.js
+++ b/app/assets/javascripts/pretty-text/addon/emoji.js
@@ -1,10 +1,10 @@
 import {
-  emojis,
   aliases,
-  searchAliases,
-  translations,
-  tonableEmojis,
+  emojis,
   replacements,
+  searchAliases,
+  tonableEmojis,
+  translations,
 } from "pretty-text/emoji/data";
 import { IMAGE_VERSION } from "pretty-text/emoji/version";
 
@@ -21,45 +21,12 @@ export function extendedEmojiList() {
 
 const emojiHash = {};
 
-export function buildReplacementsList(emojiReplacements) {
-  return Object.keys(emojiReplacements)
-    .sort()
-    .reverse()
-    .map((emoji) => {
-      return emoji
-        .split("")
-        .map((chr) => {
-          return "\\u" + chr.charCodeAt(0).toString(16).padStart(4, "0");
-        })
-        .join("");
-    })
-    .join("|");
-}
+// https://github.com/mathiasbynens/emoji-regex/blob/main/text.js
+export const emojiReplacementRegex =
+  "\uD83C\uDFF4\uDB40\uDC67\uDB40\uDC62(?:\uDB40\uDC77\uDB40\uDC6C\uDB40\uDC73|\uDB40\uDC73\uDB40\uDC63\uDB40\uDC74|\uDB40\uDC65\uDB40\uDC6E\uDB40\uDC67)\uDB40\uDC7F|(?:\uD83E\uDDD1\uD83C\uDFFF\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFF\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB-\uDFFE])|(?:\uD83E\uDDD1\uD83C\uDFFE\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFE\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB-\uDFFD\uDFFF])|(?:\uD83E\uDDD1\uD83C\uDFFD\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFD\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|(?:\uD83E\uDDD1\uD83C\uDFFC\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFC\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB\uDFFD-\uDFFF])|(?:\uD83E\uDDD1\uD83C\uDFFB\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFB\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFC-\uDFFF])|\uD83D\uDC68(?:\uD83C\uDFFB(?:\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFF])|\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFF]))|\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFC-\uDFFF])|[\u2695\u2696\u2708]\uFE0F|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD]))?|(?:\uD83C[\uDFFC-\uDFFF])\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFF])|\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFF]))|\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83D\uDC68|(?:\uD83D[\uDC68\uDC69])\u200D(?:\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67]))|\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFE])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFE\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFD\uDFFF])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFC\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFD-\uDFFF])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|(?:\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708]|\u200D[\u2695\u2696\u2708])\uFE0F|\u200D(?:(?:\uD83D[\uDC68\uDC69])\u200D(?:\uD83D[\uDC66\uDC67])|\uD83D[\uDC66\uDC67])|\uD83C\uDFFF|\uD83C\uDFFE|\uD83C\uDFFD|\uD83C\uDFFC)?|(?:\uD83D\uDC69(?:\uD83C\uDFFB\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D(?:\uD83D[\uDC68\uDC69])|\uD83D[\uDC68\uDC69])|(?:\uD83C[\uDFFC-\uDFFF])\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D(?:\uD83D[\uDC68\uDC69])|\uD83D[\uDC68\uDC69]))|\uD83E\uDDD1(?:\uD83C[\uDFFB-\uDFFF])\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1)(?:\uD83C[\uDFFB-\uDFFF])|\uD83D\uDC69\u200D\uD83D\uDC69\u200D(?:\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67]))|\uD83D\uDC69(?:\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D(?:\uD83D[\uDC68\uDC69])|\uD83D[\uDC68\uDC69])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFE\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFC\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFB\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD]))|\uD83E\uDDD1(?:\u200D(?:\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFE\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFC\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFB\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD]))|\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC69\u200D\uD83D\uDC69\u200D(?:\uD83D[\uDC66\uDC67])|\uD83D\uDC69\u200D\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67])|(?:\uD83D\uDC41\uFE0F\u200D\uD83D\uDDE8|\uD83E\uDDD1(?:\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708]|\uD83C\uDFFB\u200D[\u2695\u2696\u2708]|\u200D[\u2695\u2696\u2708])|\uD83D\uDC69(?:\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708]|\uD83C\uDFFB\u200D[\u2695\u2696\u2708]|\u200D[\u2695\u2696\u2708])|\uD83D\uDE36\u200D\uD83C\uDF2B|\uD83C\uDFF3\uFE0F\u200D\u26A7|\uD83D\uDC3B\u200D\u2744|(?:(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD4\uDDD6-\uDDDD])(?:\uD83C[\uDFFB-\uDFFF])|\uD83D\uDC6F|\uD83E[\uDD3C\uDDDE\uDDDF])\u200D[\u2640\u2642]|(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)(?:\uFE0F|\uD83C[\uDFFB-\uDFFF])\u200D[\u2640\u2642]|\uD83C\uDFF4\u200D\u2620|(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD4\uDDD6-\uDDDD])\u200D[\u2640\u2642]|[\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u2328\u23CF\u23ED-\u23EF\u23F1\u23F2\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB\u25FC\u2600-\u2604\u260E\u2611\u2618\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u2692\u2694-\u2697\u2699\u269B\u269C\u26A0\u26A7\u26B0\u26B1\u26C8\u26CF\u26D1\u26D3\u26E9\u26F0\u26F1\u26F4\u26F7\u26F8\u2702\u2708\u2709\u270F\u2712\u2714\u2716\u271D\u2721\u2733\u2734\u2744\u2747\u2763\u27A1\u2934\u2935\u2B05-\u2B07\u3030\u303D\u3297\u3299]|\uD83C[\uDD70\uDD71\uDD7E\uDD7F\uDE02\uDE37\uDF21\uDF24-\uDF2C\uDF36\uDF7D\uDF96\uDF97\uDF99-\uDF9B\uDF9E\uDF9F\uDFCD\uDFCE\uDFD4-\uDFDF\uDFF5\uDFF7]|\uD83D[\uDC3F\uDCFD\uDD49\uDD4A\uDD6F\uDD70\uDD73\uDD76-\uDD79\uDD87\uDD8A-\uDD8D\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA\uDECB\uDECD-\uDECF\uDEE0-\uDEE5\uDEE9\uDEF0\uDEF3])\uFE0F|\uD83C\uDFF3\uFE0F\u200D\uD83C\uDF08|\uD83D\uDC69\u200D\uD83D\uDC67|\uD83D\uDC69\u200D\uD83D\uDC66|\uD83D\uDE35\u200D\uD83D\uDCAB|\uD83D\uDE2E\u200D\uD83D\uDCA8|\uD83D\uDC15\u200D\uD83E\uDDBA|\uD83E\uDDD1(?:\uD83C\uDFFF|\uD83C\uDFFE|\uD83C\uDFFD|\uD83C\uDFFC|\uD83C\uDFFB)?|\uD83D\uDC69(?:\uD83C\uDFFF|\uD83C\uDFFE|\uD83C\uDFFD|\uD83C\uDFFC|\uD83C\uDFFB)?|\uD83C\uDDFD\uD83C\uDDF0|\uD83C\uDDF6\uD83C\uDDE6|\uD83C\uDDF4\uD83C\uDDF2|\uD83D\uDC08\u200D\u2B1B|\u2764\uFE0F\u200D(?:\uD83D\uDD25|\uD83E\uDE79)|\uD83D\uDC41\uFE0F|\uD83C\uDFF3\uFE0F|\uD83C\uDDFF(?:\uD83C[\uDDE6\uDDF2\uDDFC])|\uD83C\uDDFE(?:\uD83C[\uDDEA\uDDF9])|\uD83C\uDDFC(?:\uD83C[\uDDEB\uDDF8])|\uD83C\uDDFB(?:\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDEE\uDDF3\uDDFA])|\uD83C\uDDFA(?:\uD83C[\uDDE6\uDDEC\uDDF2\uDDF3\uDDF8\uDDFE\uDDFF])|\uD83C\uDDF9(?:\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDED\uDDEF-\uDDF4\uDDF7\uDDF9\uDDFB\uDDFC\uDDFF])|\uD83C\uDDF8(?:\uD83C[\uDDE6-\uDDEA\uDDEC-\uDDF4\uDDF7-\uDDF9\uDDFB\uDDFD-\uDDFF])|\uD83C\uDDF7(?:\uD83C[\uDDEA\uDDF4\uDDF8\uDDFA\uDDFC])|\uD83C\uDDF5(?:\uD83C[\uDDE6\uDDEA-\uDDED\uDDF0-\uDDF3\uDDF7-\uDDF9\uDDFC\uDDFE])|\uD83C\uDDF3(?:\uD83C[\uDDE6\uDDE8\uDDEA-\uDDEC\uDDEE\uDDF1\uDDF4\uDDF5\uDDF7\uDDFA\uDDFF])|\uD83C\uDDF2(?:\uD83C[\uDDE6\uDDE8-\uDDED\uDDF0-\uDDFF])|\uD83C\uDDF1(?:\uD83C[\uDDE6-\uDDE8\uDDEE\uDDF0\uDDF7-\uDDFB\uDDFE])|\uD83C\uDDF0(?:\uD83C[\uDDEA\uDDEC-\uDDEE\uDDF2\uDDF3\uDDF5\uDDF7\uDDFC\uDDFE\uDDFF])|\uD83C\uDDEF(?:\uD83C[\uDDEA\uDDF2\uDDF4\uDDF5])|\uD83C\uDDEE(?:\uD83C[\uDDE8-\uDDEA\uDDF1-\uDDF4\uDDF6-\uDDF9])|\uD83C\uDDED(?:\uD83C[\uDDF0\uDDF2\uDDF3\uDDF7\uDDF9\uDDFA])|\uD83C\uDDEC(?:\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEE\uDDF1-\uDDF3\uDDF5-\uDDFA\uDDFC\uDDFE])|\uD83C\uDDEB(?:\uD83C[\uDDEE-\uDDF0\uDDF2\uDDF4\uDDF7])|\uD83C\uDDEA(?:\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDED\uDDF7-\uDDFA])|\uD83C\uDDE9(?:\uD83C[\uDDEA\uDDEC\uDDEF\uDDF0\uDDF2\uDDF4\uDDFF])|\uD83C\uDDE8(?:\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDEE\uDDF0-\uDDF5\uDDF7\uDDFA-\uDDFF])|\uD83C\uDDE7(?:\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEF\uDDF1-\uDDF4\uDDF6-\uDDF9\uDDFB\uDDFC\uDDFE\uDDFF])|\uD83C\uDDE6(?:\uD83C[\uDDE8-\uDDEC\uDDEE\uDDF1\uDDF2\uDDF4\uDDF6-\uDDFA\uDDFC\uDDFD\uDDFF])|[#*0-9]\uFE0F\u20E3|\u2764\uFE0F|(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD4\uDDD6-\uDDDD])(?:\uD83C[\uDFFB-\uDFFF])|(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)(?:\uFE0F|\uD83C[\uDFFB-\uDFFF])|\uD83C\uDFF4|(?:[\u270A\u270B]|\uD83C[\uDF85\uDFC2\uDFC7]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66\uDC67\uDC6B-\uDC6D\uDC72\uDC74-\uDC76\uDC78\uDC7C\uDC83\uDC85\uDC8F\uDC91\uDCAA\uDD7A\uDD95\uDD96\uDE4C\uDE4F\uDEC0\uDECC]|\uD83E[\uDD0C\uDD0F\uDD18-\uDD1C\uDD1E\uDD1F\uDD30-\uDD34\uDD36\uDD77\uDDB5\uDDB6\uDDBB\uDDD2\uDDD3\uDDD5])(?:\uD83C[\uDFFB-\uDFFF])|(?:[\u261D\u270C\u270D]|\uD83D[\uDD74\uDD90])(?:\uFE0F|\uD83C[\uDFFB-\uDFFF])|[\u270A\u270B]|\uD83C[\uDF85\uDFC2\uDFC7]|\uD83D[\uDC08\uDC15\uDC3B\uDC42\uDC43\uDC46-\uDC50\uDC66\uDC67\uDC6B-\uDC6D\uDC72\uDC74-\uDC76\uDC78\uDC7C\uDC83\uDC85\uDC8F\uDC91\uDCAA\uDD7A\uDD95\uDD96\uDE2E\uDE35\uDE36\uDE4C\uDE4F\uDEC0\uDECC]|\uD83E[\uDD0C\uDD0F\uDD18-\uDD1C\uDD1E\uDD1F\uDD30-\uDD34\uDD36\uDD77\uDDB5\uDDB6\uDDBB\uDDD2\uDDD3\uDDD5]|\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD4\uDDD6-\uDDDD]|\uD83D\uDC6F|\uD83E[\uDD3C\uDDDE\uDDDF]|[\u231A\u231B\u23E9-\u23EC\u23F0\u23F3\u25FD\u25FE\u2614\u2615\u2648-\u2653\u267F\u2693\u26A1\u26AA\u26AB\u26BD\u26BE\u26C4\u26C5\u26CE\u26D4\u26EA\u26F2\u26F3\u26F5\u26FA\u26FD\u2705\u2728\u274C\u274E\u2753-\u2755\u2757\u2795-\u2797\u27B0\u27BF\u2B1B\u2B1C\u2B50\u2B55]|\uD83C[\uDC04\uDCCF\uDD8E\uDD91-\uDD9A\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF7C\uDF7E-\uDF84\uDF86-\uDF93\uDFA0-\uDFC1\uDFC5\uDFC6\uDFC8\uDFC9\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF8-\uDFFF]|\uD83D[\uDC00-\uDC07\uDC09-\uDC14\uDC16-\uDC3A\uDC3C-\uDC3E\uDC40\uDC44\uDC45\uDC51-\uDC65\uDC6A\uDC79-\uDC7B\uDC7D-\uDC80\uDC84\uDC88-\uDC8E\uDC90\uDC92-\uDCA9\uDCAB-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDDA4\uDDFB-\uDE2D\uDE2F-\uDE34\uDE37-\uDE44\uDE48-\uDE4A\uDE80-\uDEA2\uDEA4-\uDEB3\uDEB7-\uDEBF\uDEC1-\uDEC5\uDED0-\uDED2\uDED5-\uDED7\uDEEB\uDEEC\uDEF4-\uDEFC\uDFE0-\uDFEB]|\uD83E[\uDD0D\uDD0E\uDD10-\uDD17\uDD1D\uDD20-\uDD25\uDD27-\uDD2F\uDD3A\uDD3F-\uDD45\uDD47-\uDD76\uDD78\uDD7A-\uDDB4\uDDB7\uDDBA\uDDBC-\uDDCB\uDDD0\uDDE0-\uDDFF\uDE70-\uDE74\uDE78-\uDE7A\uDE80-\uDE86\uDE90-\uDEA8\uDEB0-\uDEB6\uDEC0-\uDEC2\uDED0-\uDED6]|(?:[#*0-9\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692-\u2697\u2699\u269B\u269C\u26A0\u26A1\u26A7\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDCCF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE02\uDE1A\uDE2F\uDE32-\uDE3A\uDE50\uDE51\uDF00-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFF]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD7A\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA4\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED2\uDED5-\uDED7\uDEE0-\uDEE5\uDEE9\uDEEB\uDEEC\uDEF0\uDEF3-\uDEFC\uDFE0-\uDFEB]|\uD83E[\uDD0C-\uDD3A\uDD3C-\uDD45\uDD47-\uDD78\uDD7A-\uDDCB\uDDCD-\uDDFF\uDE70-\uDE74\uDE78-\uDE7A\uDE80-\uDE86\uDE90-\uDEA8\uDEB0-\uDEB6\uDEC0-\uDEC2\uDED0-\uDED6]|☻|♡)\uFE0F?";
 
-let replacementListCache;
-const unicodeRegexpCache = {};
-
-function replacementList() {
-  if (replacementListCache === undefined) {
-    replacementListCache = buildReplacementsList(replacements);
-  }
-
-  return replacementListCache;
-}
-
-function unicodeRegexp(inlineEmoji) {
-  if (unicodeRegexpCache[inlineEmoji] === undefined) {
-    const emojiExpression = inlineEmoji
-      ? "|:[^\\s:]+(?::t\\d)?:?"
-      : "|\\B:[^\\s:]+(?::t\\d)?:?\\B";
-
-    unicodeRegexpCache[inlineEmoji] = new RegExp(
-      replacementList() + emojiExpression,
-      "g"
-    );
-  }
-
-  return unicodeRegexpCache[inlineEmoji];
+function textEmojiRegex(inlineEmoji) {
+  return inlineEmoji ? /:[^\s:]+(?::t\d)?:?/g : /\B:[^\s:]+(?::t\d)?:?\B/g;
 }
 
 // add all default emojis
@@ -83,7 +50,7 @@ function isReplacableInlineEmoji(string, index, inlineEmoji) {
   return (
     beforeEmoji.length === 0 ||
     /(?:\s|[>.,\/#!$%^&*;:{}=\-_`~()])$/.test(beforeEmoji) ||
-    new RegExp(`(?:${replacementList()})$`).test(beforeEmoji)
+    new RegExp(`(?:${emojiReplacementRegex})$`, "g").test(beforeEmoji)
   );
 }
 
@@ -92,18 +59,17 @@ export function performEmojiUnescape(string, opts) {
     return;
   }
 
-  const inlineEmoji = opts.inlineEmoji;
-  const regexp = unicodeRegexp(inlineEmoji);
   const allTranslations = Object.assign(
     {},
     translations,
     opts.customEmojiTranslation || {}
   );
 
-  return string.replace(regexp, (m, index) => {
+  const replacementFunction = (m, index) => {
     const isEmoticon = opts.enableEmojiShortcuts && !!allTranslations[m];
     const isUnicodeEmoticon = !!replacements[m];
     let emojiVal;
+
     if (isEmoticon) {
       emojiVal = allTranslations[m];
     } else if (isUnicodeEmoticon) {
@@ -123,7 +89,7 @@ export function performEmojiUnescape(string, opts) {
 
     const isReplacable =
       (isEmoticon || hasEndingColon || isUnicodeEmoticon) &&
-      isReplacableInlineEmoji(string, index, inlineEmoji);
+      isReplacableInlineEmoji(string, index, opts.inlineEmoji);
 
     return url && isReplacable
       ? `<img width="20" height="20" src='${url}' ${
@@ -132,20 +98,22 @@ export function performEmojiUnescape(string, opts) {
           opts.lazy ? "loading='lazy' " : ""
         }alt='${emojiVal}' class='${classes}'>`
       : m;
-  });
+  };
+
+  return string
+    .replace(new RegExp(emojiReplacementRegex, "g"), replacementFunction)
+    .replace(textEmojiRegex(opts.inlineEmoji), replacementFunction);
 }
 
 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)) {
+  const replacementFunction = (m, index) => {
+    if (isReplacableInlineEmoji(string, index, opts.inlineEmoji)) {
       if (!!allTranslations[m]) {
         return opts.emojiShortcuts ? `:${allTranslations[m]}:` : m;
       } else if (!!replacements[m]) {
@@ -154,7 +122,11 @@ export function performEmojiEscape(string, opts) {
     }
 
     return m;
-  });
+  };
+
+  return string
+    .replace(new RegExp(emojiReplacementRegex, "g"), replacementFunction)
+    .replace(textEmojiRegex(opts.inlineEmoji), replacementFunction);
 }
 
 export function isCustomEmoji(code, opts) {
@@ -180,6 +152,12 @@ export function buildEmojiUrl(code, opts) {
   }
 
   const noToneMatch = code.match(/([^:]+):?/);
+
+  let emojiBasePath = "/images/emoji";
+  if (opts.emojiCDNUrl) {
+    emojiBasePath = opts.emojiCDNUrl;
+  }
+
   if (
     noToneMatch &&
     !url &&
@@ -187,7 +165,7 @@ export function buildEmojiUrl(code, opts) {
       aliasHash.hasOwnProperty(noToneMatch[1]))
   ) {
     url = opts.getURL(
-      `/images/emoji/${opts.emojiSet}/${code.replace(/:t/, "/")}.png`
+      `${emojiBasePath}/${opts.emojiSet}/${code.replace(/:t/, "/")}.png`
     );
   }
 
@@ -210,6 +188,7 @@ export function emojiExists(code) {
 let toSearch;
 export function emojiSearch(term, options) {
   const maxResults = (options && options["maxResults"]) || -1;
+  const diversity = options && options.diversity;
   if (maxResults === 0) {
     return [];
   }
@@ -227,7 +206,11 @@ export function emojiSearch(term, options) {
   function addResult(t) {
     const val = aliasHash[t] || t;
     if (results.indexOf(val) === -1) {
-      results.push(val);
+      if (diversity && diversity > 1 && isSkinTonableEmoji(val)) {
+        results.push(`${val}:t${diversity}`);
+      } else {
+        results.push(val);
+      }
     }
   }
 
diff --git a/app/assets/javascripts/pretty-text/addon/emoji/data.js b/app/assets/javascripts/pretty-text/addon/emoji/data.js
index f23158ec22..aaf4f4da14 100644
--- a/app/assets/javascripts/pretty-text/addon/emoji/data.js
+++ b/app/assets/javascripts/pretty-text/addon/emoji/data.js
@@ -48,8 +48,7 @@ export const emojis = [
   "rage",
   "pensive",
   "confused",
-  "slightly_frowning_face",
-  "frowning_face",
+  "frowning",
   "persevere",
   "confounded",
   "tired_face",
@@ -60,7 +59,7 @@ export const emojis = [
   "fearful",
   "cold_sweat",
   "hushed",
-  "frowning",
+  "slightly_frowning_face",
   "frowning_face_with_open_mouth",
   "anguished",
   "cry",
@@ -1829,6 +1828,7 @@ export const tonableEmojis = [
   "palms_up_together",
 ];
 export const aliases = {
+  grinning_face_with_smiling_eyes: ["smile"],
   right_anger_bubble: ["anger_right"],
   ballot_box: ["ballot_box_with_ballot"],
   basketball_man: ["basketball_player", "person_with_ball"],
@@ -1920,7 +1920,6 @@ export const aliases = {
     "white_sun_rain_cloud",
     "white_sun_behind_cloud_with_rain",
   ],
-  grinning_face_with_smiling_eyes: ["smile"],
   partly_sunny: ["white_sun_small_cloud", "white_sun_with_small_cloud"],
   open_umbrella: ["umbrella2"],
   hammer_and_wrench: ["tools"],
@@ -1936,8 +1935,8 @@ export const aliases = {
   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"],
+  slightly_frowning_face: ["slight_frown", "slightly_frowning"],
+  frowning: ["frowning2", "white_frowning_face", "frowning_face"],
   zipper_mouth_face: ["zipper_mouth"],
   face_with_head_bandage: ["head_bandage"],
   raised_hand_with_fingers_splayed: ["hand_splayed"],
@@ -2083,7 +2082,7 @@ export const replacements = {
   "😊": "blush",
   "🙂": "slightly_smiling_face",
   "🙃": "upside_down_face",
-  "☺": "slight_smile",
+  "☺": "relaxed",
   "😋": "yum",
   "😌": "relieved",
   "😍": "heart_eyes",
@@ -2115,8 +2114,7 @@ export const replacements = {
   "😡": "rage",
   "😔": "pensive",
   "😕": "confused",
-  "☹️": "slightly_frowning_face",
-  "🙁": "frowning",
+  "🙁": "slightly_frowning_face",
   "😣": "persevere",
   "😖": "confounded",
   "😫": "tired_face",
@@ -3708,7 +3706,7 @@ export const replacements = {
   "🖌": "paintbrush",
   "🔍": "mag",
   "🔎": "mag_right",
-  "❤": "heart",
+  "❤️": "heart",
   "💛": "yellow_heart",
   "💚": "green_heart",
   "💙": "blue_heart",
@@ -3944,7 +3942,6 @@ export const replacements = {
   "🀄": "mahjong",
   "♠": "spades",
   "♣": "clubs",
-  "♥": "heart",
   "♦": "diamonds",
   "🎴": "flower_playing_cards",
   "💭": "thought_balloon",
@@ -4539,19 +4536,18 @@ export const replacements = {
   "👨‍🦼": "man_in_motorized_wheelchair",
   "👩‍🦯": "woman_with_probing_cane",
   "👨‍🦯": "man_with_probing_cane",
-  "🧎‍♀": "woman_kneeling",
-  "🧎‍♂": "man_kneeling",
-  "🧍‍♂": "man_standing",
-  "🧍‍♀": "woman_standing",
-  "🧏‍♀": "deaf_woman",
-  "🧏‍♂": "deaf_man",
+  "🧎‍♀️": "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",
-  "☹": "frowning",
+  "🏳️‍⚧️": "transgender_flag",
+  "☹️": "frowning",
   "☻": "slight_smile",
-  "♡": "heart",
 };
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 e28ec7becf..7235b61514 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
@@ -1,7 +1,7 @@
 import AllowLister from "pretty-text/allow-lister";
-import { sanitize } from "pretty-text/sanitizer";
-import guid from "pretty-text/guid";
 import deprecated from "discourse-common/lib/deprecated";
+import guid from "pretty-text/guid";
+import { sanitize } from "pretty-text/sanitizer";
 
 export const ATTACHMENT_CSS_CLASS = "attachment";
 
@@ -177,7 +177,7 @@ function renderImageOrPlayableMedia(tokens, idx, options, env, slf) {
   const token = tokens[idx];
   const alt = slf.renderInlineAsText(token.children, options, env);
   const split = alt.split("|");
-  const altSplit = [];
+  const altSplit = [split[0]];
 
   // markdown-it supports returning HTML instead of continuing to render the current token
   // see https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer
@@ -195,7 +195,7 @@ function renderImageOrPlayableMedia(tokens, idx, options, env, slf) {
   }
 
   // parsing ![myimage|500x300]() or ![myimage|75%]() or ![myimage|500x300, 75%]
-  for (let i = 0, match, data; i < split.length; ++i) {
+  for (let i = 1, match, data; i < split.length; ++i) {
     if ((match = split[i].match(IMG_SIZE_REGEX)) && match[1] && match[2]) {
       let width = match[1];
       let height = match[2];
@@ -238,6 +238,8 @@ function renderImageOrPlayableMedia(tokens, idx, options, env, slf) {
       }
     } else if ((data = extractDataAttribute(split[i]))) {
       token.attrs.push(data);
+    } else if (split[i] === "thumbnail") {
+      token.attrs.push(["data-thumbnail", "true"]);
     } else {
       altSplit.push(split[i]);
     }
diff --git a/app/assets/javascripts/pretty-text/addon/inline-oneboxer.js b/app/assets/javascripts/pretty-text/addon/inline-oneboxer.js
index cbed77dd4f..010b6a9f06 100644
--- a/app/assets/javascripts/pretty-text/addon/inline-oneboxer.js
+++ b/app/assets/javascripts/pretty-text/addon/inline-oneboxer.js
@@ -3,14 +3,20 @@ const _cache = {};
 export function applyInlineOneboxes(inline, ajax, opts) {
   opts = opts || {};
 
-  Object.keys(inline).forEach((url) => {
+  const urls = Object.keys(inline).filter((url) => !_cache[url]);
+
+  urls.forEach((url) => {
     // cache a blank locally, so we never trigger a lookup
     _cache[url] = {};
   });
 
-  return ajax("/inline-onebox", {
+  if (urls.length === 0) {
+    return;
+  }
+
+  ajax("/inline-onebox", {
     data: {
-      urls: Object.keys(inline),
+      urls,
       category_id: opts.categoryId,
       topic_id: opts.topicId,
     },
diff --git a/app/assets/javascripts/pretty-text/addon/oneboxer.js b/app/assets/javascripts/pretty-text/addon/oneboxer.js
index 00d6867d24..dad766d216 100644
--- a/app/assets/javascripts/pretty-text/addon/oneboxer.js
+++ b/app/assets/javascripts/pretty-text/addon/oneboxer.js
@@ -1,13 +1,13 @@
-import { later } from "@ember/runloop";
 import {
-  localCache,
   failedCache,
-  setLocalCache,
-  setFailedCache,
-  resetLocalCache,
-  resetFailedCache,
+  localCache,
   normalize,
+  resetFailedCache,
+  resetLocalCache,
+  setFailedCache,
+  setLocalCache,
 } from "pretty-text/oneboxer-cache";
+import { later } from "@ember/runloop";
 
 let timeout;
 const loadingQueue = [];
@@ -103,11 +103,12 @@ function loadNext(ajax) {
 // It will insert a loading indicator and remove it when the loading is complete or fails.
 export function load({
   elem,
-  refresh = true,
   ajax,
-  synchronous = false,
-  categoryId,
   topicId,
+  categoryId,
+  refresh = true,
+  offline = false,
+  synchronous = false,
 }) {
   const $elem = $(elem);
 
@@ -134,6 +135,10 @@ export function load({
     if (failed) {
       return;
     }
+
+    if (offline) {
+      return;
+    }
   }
 
   // Add the loading CSS class
diff --git a/app/assets/javascripts/pretty-text/addon/pretty-text.js b/app/assets/javascripts/pretty-text/addon/pretty-text.js
index d6ef5344bb..2143505b51 100644
--- a/app/assets/javascripts/pretty-text/addon/pretty-text.js
+++ b/app/assets/javascripts/pretty-text/addon/pretty-text.js
@@ -33,6 +33,7 @@ export function buildOptions(state) {
     censoredRegexp,
     disableEmojis,
     customEmojiTranslation,
+    watchedWordsReplacements,
   } = state;
 
   let features = {
@@ -82,6 +83,7 @@ export function buildOptions(state) {
       siteSettings.enable_advanced_editor_preview_sync,
     previewing,
     disableEmojis,
+    watchedWordsReplacements,
   };
 
   // note, this will mutate options due to the way the API is designed
diff --git a/app/assets/javascripts/pretty-text/addon/sanitizer.js b/app/assets/javascripts/pretty-text/addon/sanitizer.js
index f29c37b80f..66bdcbf4ce 100644
--- a/app/assets/javascripts/pretty-text/addon/sanitizer.js
+++ b/app/assets/javascripts/pretty-text/addon/sanitizer.js
@@ -1,4 +1,5 @@
 import xss from "xss";
+import escape from "discourse-common/lib/escape";
 
 function attr(name, value) {
   if (value) {
@@ -8,38 +9,7 @@ function attr(name, value) {
   return name;
 }
 
-const ESCAPE_REPLACEMENTS = {
-  "&": "&amp;",
-  "<": "&lt;",
-  ">": "&gt;",
-  '"': "&quot;",
-  "'": "&#x27;",
-  "`": "&#x60;",
-};
-const BAD_CHARS = /[&<>"'`]/g;
-const POSSIBLE_CHARS = /[&<>"'`]/;
-
-function escapeChar(chr) {
-  return ESCAPE_REPLACEMENTS[chr];
-}
-
-export function escape(string) {
-  if (string === null) {
-    return "";
-  } else if (!string) {
-    return string + "";
-  }
-
-  // Force a string conversion as this will be done by the append regardless and
-  // the regex test will do this transparently behind the scenes, causing issues if
-  // an object's to string has escaped characters in it.
-  string = "" + string;
-
-  if (!POSSIBLE_CHARS.test(string)) {
-    return string;
-  }
-  return string.replace(BAD_CHARS, escapeChar);
-}
+export { escape };
 
 export function hrefAllowed(href, extraHrefMatchers) {
   // escape single quotes
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 56a5311c22..2438924601 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,5 @@
-import { debounce } from "@ember/runloop";
 import I18n from "I18n";
+import discourseDebounce from "discourse-common/lib/debounce";
 
 let _cache = {};
 
@@ -173,18 +173,27 @@ function _loadShortUrls(uploads, ajax, siteSettings, opts) {
   );
 }
 
+const SHORT_URL_ATTRIBUTES =
+  "img[data-orig-src], a[data-orig-href], source[data-orig-src]";
+
+export function resolveCachedShortUrls(siteSettings, scope, opts) {
+  let shortUploadElements = scope.querySelectorAll(SHORT_URL_ATTRIBUTES);
+
+  if (shortUploadElements.length > 0) {
+    _loadCachedShortUrls(shortUploadElements, siteSettings, opts);
+  }
+}
+
 export function resolveAllShortUrls(ajax, siteSettings, scope, opts) {
-  const attributes =
-    "img[data-orig-src], a[data-orig-href], source[data-orig-src]";
-  let shortUploadElements = scope.querySelectorAll(attributes);
+  let shortUploadElements = scope.querySelectorAll(SHORT_URL_ATTRIBUTES);
 
   if (shortUploadElements.length > 0) {
     _loadCachedShortUrls(shortUploadElements, siteSettings, opts);
 
-    shortUploadElements = scope.querySelectorAll(attributes);
+    shortUploadElements = scope.querySelectorAll(SHORT_URL_ATTRIBUTES);
     if (shortUploadElements.length > 0) {
       // this is carefully batched so we can do a leading debounce (trigger right away)
-      return debounce(
+      return discourseDebounce(
         null,
         _loadShortUrls,
         shortUploadElements,
diff --git a/app/assets/javascripts/pretty-text/addon/white-lister.js b/app/assets/javascripts/pretty-text/addon/white-lister.js
index 9e2fa6bf10..e07df502e4 100644
--- a/app/assets/javascripts/pretty-text/addon/white-lister.js
+++ b/app/assets/javascripts/pretty-text/addon/white-lister.js
@@ -1,7 +1,7 @@
-import deprecated from "discourse-common/lib/deprecated";
 import AllowLister, {
   DEFAULT_LIST as NEW_DEFAULT_LIST,
 } from "pretty-text/allow-lister";
+import deprecated from "discourse-common/lib/deprecated";
 
 export default class WhiteLister extends AllowLister {
   constructor(options) {
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/anchor.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/anchor.js
new file mode 100644
index 0000000000..4ac19201e6
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/anchor.js
@@ -0,0 +1,53 @@
+export function setup(helper) {
+  if (helper.getOptions().previewing) {
+    return;
+  }
+
+  helper.registerPlugin((md) => {
+    md.core.ruler.push("anchor", (state) => {
+      for (
+        let idx = 0, lvl = 0, headingId = 0;
+        idx < state.tokens.length;
+        idx++
+      ) {
+        if (
+          state.tokens[idx].type === "blockquote_open" ||
+          (state.tokens[idx].type === "bbcode_open" &&
+            state.tokens[idx].tag === "aside")
+        ) {
+          ++lvl;
+        } else if (
+          state.tokens[idx].type === "blockquote_close" ||
+          (state.tokens[idx].type === "bbcode_close" &&
+            state.tokens[idx].tag === "aside")
+        ) {
+          --lvl;
+        }
+
+        if (lvl > 0 || state.tokens[idx].type !== "heading_open") {
+          continue;
+        }
+
+        const linkOpen = new state.Token("link_open", "a", 1);
+        const linkClose = new state.Token("link_close", "a", -1);
+
+        let slug = state.tokens[idx + 1].content
+          .toLowerCase()
+          .replace(/\s+/g, "-")
+          .replace(/[^\w\-]+/g, "")
+          .replace(/\-\-+/g, "-")
+          .replace(/^-+/, "")
+          .replace(/-+$/, "");
+
+        slug = `${slug || "heading"}-${++headingId}`;
+
+        linkOpen.attrSet("name", slug);
+        linkOpen.attrSet("class", "anchor");
+        linkOpen.attrSet("href", "#" + slug);
+
+        state.tokens[idx + 1].children.unshift(linkClose);
+        state.tokens[idx + 1].children.unshift(linkOpen);
+      }
+    });
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
index 4160d7986d..c9d2c714a4 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
@@ -191,7 +191,7 @@ function findInlineCloseTag(state, openTag, start, max) {
 }
 
 function applyBBCode(state, startLine, endLine, silent, md) {
-  var nextLine,
+  let nextLine,
     oldParent,
     oldLineMax,
     rule,
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js
index f643c4f5b8..0280d5d411 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js
@@ -3,6 +3,10 @@ import { censorFn } from "pretty-text/censored-words";
 function recurse(tokens, apply) {
   let i;
   for (i = 0; i < tokens.length; i++) {
+    if (tokens[i].type === "html_raw" && tokens[i].onebox) {
+      continue;
+    }
+
     apply(tokens[i]);
     if (tokens[i].children) {
       recurse(tokens[i].children, apply);
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/custom-typographer-replacements.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/custom-typographer-replacements.js
new file mode 100644
index 0000000000..5ac02093bd
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/custom-typographer-replacements.js
@@ -0,0 +1,103 @@
+// Simple typographic replacements
+//
+// (tm) (TM) → ™
+// +- → ±
+// ... → … (also ?.... → ?.., !.... → !..)
+// ???????? → ???, !!!!! → !!!, `,,` → `,`
+// -- → &ndash;, --- → &mdash;
+// --> <-- -> <- to → ← → ←
+// (pa) (PA) → ¶
+//
+// Disabled replacements:
+//
+// (c) (C) → ©
+// (r) (R) → ®
+// (p) (P) -> §
+
+let RARE_RE = /\+-|\.\.|\?\?\?\?|!!!!|,,|--|-->|<--|->|<-/;
+
+let SCOPED_ABBR_RE = /\((tm|pa)\)/gi;
+let SCOPED_ABBR = {
+  pa: "¶",
+  tm: "™",
+};
+
+function replaceFn(match, name) {
+  return SCOPED_ABBR[name.toLowerCase()];
+}
+
+function replaceScoped(inlineTokens) {
+  let i, token;
+
+  for (i = inlineTokens.length - 1; i >= 0; i--) {
+    token = inlineTokens[i];
+    if (token.type === "text") {
+      token.content = token.content.replace(SCOPED_ABBR_RE, replaceFn);
+    }
+  }
+}
+
+function replaceRare(inlineTokens) {
+  let i,
+    token,
+    inside_autolink = 0;
+
+  for (i = inlineTokens.length - 1; i >= 0; i--) {
+    token = inlineTokens[i];
+
+    if (token.type === "text" && !inside_autolink) {
+      if (RARE_RE.test(token.content)) {
+        token.content = token.content
+          .replace(/\+-/g, "±")
+          // Custom arrows
+          .replace(/(^|\s)-{1,2}>(\s|$)/gm, "\u0020\u2192\u0020")
+          .replace(/(^|\s)<-{1,2}(\s|$)/gm, "\u0020\u2190\u0020")
+          // .., ..., ....... -> …
+          // but ?..... & !..... -> ?.. & !..
+          .replace(/\.{2,}/g, "…")
+          .replace(/([?!])…/g, "$1..")
+          .replace(/([?!]){4,}/g, "$1$1$1")
+          .replace(/,{2,}/g, ",")
+          // em-dash
+          .replace(/(^|[^-])---(?=[^-]|$)/gm, "$1\u2014")
+          // en-dash
+          .replace(/(^|\s)--(?=\s|$)/gm, "$1\u2013")
+          .replace(/(^|[^-\s])--(?=[^-\s]|$)/gm, "$1\u2013");
+      }
+    }
+
+    if (token.type === "link_open" && token.info === "auto") {
+      inside_autolink--;
+    }
+
+    if (token.type === "link_close" && token.info === "auto") {
+      inside_autolink++;
+    }
+  }
+}
+
+function replace(state) {
+  let blkIdx;
+
+  for (blkIdx = state.tokens.length - 1; blkIdx >= 0; blkIdx--) {
+    if (state.tokens[blkIdx].type !== "inline") {
+      continue;
+    }
+
+    if (SCOPED_ABBR_RE.test(state.tokens[blkIdx].content)) {
+      replaceScoped(state.tokens[blkIdx].children);
+    }
+
+    if (RARE_RE.test(state.tokens[blkIdx].content)) {
+      replaceRare(state.tokens[blkIdx].children);
+    }
+  }
+}
+
+export function setup(helper) {
+  helper.registerPlugin((md) => {
+    if (md.options.typographer) {
+      md.core.ruler.at("replacements", replace);
+    }
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
index 56e3f2d910..0806a97b33 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
@@ -322,6 +322,7 @@ export function setup(helper) {
     opts.features.inlineEmoji = !!siteSettings.enable_inline_emoji_translation;
     opts.emojiSet = siteSettings.emoji_set || "";
     opts.customEmoji = state.customEmoji;
+    opts.emojiCDNUrl = siteSettings.external_emoji_url;
   });
 
   helper.registerPlugin((md) => {
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
index cd24628689..069a88c2f3 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
@@ -15,7 +15,7 @@ export default null;
 // based off https://github.com/markdown-it/markdown-it-emoji/blob/master/dist/markdown-it-emoji.js
 //
 export function textReplace(state, callback, skipAllLinks) {
-  var i,
+  let i,
     j,
     l,
     tokens,
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
index 596c45ad7f..e876499a25 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
@@ -5,7 +5,7 @@
 const REGEX = /^<img.*\\?>\s*$/i;
 
 function rule(state, startLine, endLine) {
-  var nextLine,
+  let nextLine,
     token,
     lineText,
     pos = state.bMarks[startLine] + state.tShift[startLine],
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
index 1de6a74a36..5781c9df20 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
@@ -5,7 +5,7 @@
 // this is a freedom patch, so careful, may break on updates
 
 function newline(state, silent) {
-  var token,
+  let token,
     pmax,
     max,
     pos = state.pos;
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js
index edbe4d54bd..173964f17c 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js
@@ -1,5 +1,5 @@
-import { lookupCache } from "pretty-text/oneboxer-cache";
 import { cachedInlineOnebox } from "pretty-text/inline-oneboxer";
+import { lookupCache } from "pretty-text/oneboxer-cache";
 
 const ONEBOX = 1;
 const INLINE = 2;
@@ -81,6 +81,7 @@ function applyOnebox(state, silent) {
               child.type = "html_raw";
               child.content = cached;
               child.inline = true;
+              child.onebox = true;
 
               text.type = "html_raw";
               text.content = "";
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
index a44a0214d7..79c5166769 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
@@ -4,7 +4,7 @@
 // link starts with a space, so we can bypass a onebox
 // this is a freedom patch, so careful, may break on updates
 function paragraph(state, startLine /*, endLine*/) {
-  var content,
+  let content,
     terminate,
     i,
     l,
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 c7e0dc9ca7..a58bf5298f 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
@@ -113,7 +113,7 @@ const rule = {
       if (offTopicQuote) {
         const topicInfo = options.getTopicInfo(topicId);
         if (topicInfo) {
-          var href = topicInfo.href;
+          let href = topicInfo.href;
           if (postNumber > 0) {
             href += "/" + postNumber;
           }
@@ -124,6 +124,7 @@ const rule = {
             title = performEmojiUnescape(topicInfo.title, {
               getURL: options.getURL,
               emojiSet: options.emojiSet,
+              emojiCDNUrl: options.emojiCDNUrl,
               enableEmojiShortcuts: options.enableEmojiShortcuts,
               inlineEmoji: options.inlineEmoji,
             });
@@ -160,6 +161,7 @@ export function setup(helper) {
   helper.registerOptions((opts, siteSettings) => {
     opts.enableEmoji = siteSettings.enable_emoji;
     opts.emojiSet = siteSettings.emoji_set;
+    opts.emojiCDNUrl = siteSettings.external_emoji_url;
     opts.enableEmojiShortcuts = siteSettings.enable_emoji_shortcuts;
     opts.inlineEmoji = siteSettings.enable_inline_emoji_translation;
   });
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 63bf3f7059..8b34244611 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
@@ -90,8 +90,8 @@ export function setup(helper) {
         const imageIndex = token.attrIndex("index-image");
 
         if (scaleIndex !== -1) {
-          var selectedScale = token.attrs[scaleIndex][1];
-          var index = token.attrs[imageIndex][1];
+          let selectedScale = token.attrs[scaleIndex][1];
+          let index = token.attrs[imageIndex][1];
 
           let result = "<span class='image-wrapper'>";
           result += oldRule(tokens, idx, options, env, slf);
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/watched-words-replace.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/watched-words-replace.js
new file mode 100644
index 0000000000..8e27bb99cb
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/watched-words-replace.js
@@ -0,0 +1,158 @@
+function isLinkOpen(str) {
+  return /^<a[>\s]/i.test(str);
+}
+
+function isLinkClose(str) {
+  return /^<\/a\s*>/i.test(str);
+}
+
+function findAllMatches(text, matchers) {
+  const matches = [];
+
+  const maxMatches = 100;
+  let count = 0;
+
+  matchers.forEach((matcher) => {
+    let match;
+    while (
+      (match = matcher.pattern.exec(text)) !== null &&
+      count++ < maxMatches
+    ) {
+      matches.push({
+        index: match.index,
+        text: match[0],
+        replacement: matcher.replacement,
+      });
+    }
+  });
+
+  return matches.sort((a, b) => a.index - b.index);
+}
+
+export function setup(helper) {
+  helper.registerPlugin((md) => {
+    const replacements = md.options.discourse.watchedWordsReplacements;
+    if (!replacements) {
+      return;
+    }
+
+    const matchers = Object.keys(replacements).map((word) => ({
+      pattern: new RegExp(word, "gi"),
+      replacement: replacements[word],
+    }));
+
+    const cache = {};
+
+    md.core.ruler.push("watched-words-replace", (state) => {
+      for (let j = 0, l = state.tokens.length; j < l; j++) {
+        if (state.tokens[j].type !== "inline") {
+          continue;
+        }
+
+        let tokens = state.tokens[j].children;
+
+        let htmlLinkLevel = 0;
+
+        // We scan from the end, to keep position when new tags added.
+        // Use reversed logic in links start/end match
+        for (let i = tokens.length - 1; i >= 0; i--) {
+          const currentToken = tokens[i];
+
+          // Skip content of markdown links
+          if (currentToken.type === "link_close") {
+            i--;
+            while (
+              tokens[i].level !== currentToken.level &&
+              tokens[i].type !== "link_open"
+            ) {
+              i--;
+            }
+            continue;
+          }
+
+          // Skip content of html tag links
+          if (currentToken.type === "html_inline") {
+            if (isLinkOpen(currentToken.content) && htmlLinkLevel > 0) {
+              htmlLinkLevel--;
+            }
+
+            if (isLinkClose(currentToken.content)) {
+              htmlLinkLevel++;
+            }
+          }
+
+          if (htmlLinkLevel > 0) {
+            continue;
+          }
+
+          if (currentToken.type === "text") {
+            const text = currentToken.content;
+            const matches = (cache[text] =
+              cache[text] || findAllMatches(text, matchers));
+
+            // Now split string to nodes
+            const nodes = [];
+            let level = currentToken.level;
+            let lastPos = 0;
+
+            let token;
+            for (let ln = 0; ln < matches.length; ln++) {
+              if (matches[ln].index < lastPos) {
+                continue;
+              }
+
+              if (matches[ln].index > lastPos) {
+                token = new state.Token("text", "", 0);
+                token.content = text.slice(lastPos, matches[ln].index);
+                token.level = level;
+                nodes.push(token);
+              }
+
+              let url = state.md.normalizeLink(matches[ln].replacement);
+              if (state.md.validateLink(url) && /^https?/.test(url)) {
+                token = new state.Token("link_open", "a", 1);
+                token.attrs = [["href", url]];
+                token.level = level++;
+                token.markup = "linkify";
+                token.info = "auto";
+                nodes.push(token);
+
+                token = new state.Token("text", "", 0);
+                token.content = matches[ln].text;
+                token.level = level;
+                nodes.push(token);
+
+                token = new state.Token("link_close", "a", -1);
+                token.level = --level;
+                token.markup = "linkify";
+                token.info = "auto";
+                nodes.push(token);
+              } else {
+                token = new state.Token("text", "", 0);
+                token.content = matches[ln].replacement;
+                token.level = level;
+                nodes.push(token);
+              }
+
+              lastPos = matches[ln].index + matches[ln].text.length;
+            }
+
+            if (lastPos < text.length) {
+              token = new state.Token("text", "", 0);
+              token.content = text.slice(lastPos);
+              token.level = level;
+              nodes.push(token);
+            }
+
+            // replace current node
+            state.tokens[j].children = tokens = md.utils.arrayReplaceAt(
+              tokens,
+              i,
+              nodes
+            );
+          }
+        }
+      }
+    });
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json
index 1eff014e82..03c7d14996 100644
--- a/app/assets/javascripts/pretty-text/package.json
+++ b/app/assets/javascripts/pretty-text/package.json
@@ -15,16 +15,17 @@
     "start": "ember serve"
   },
   "dependencies": {
+    "ember-auto-import": "^1.5.3",
     "ember-cli-babel": "^7.13.0",
     "ember-cli-htmlbars": "^4.2.0",
-    "ember-auto-import": "^1.5.3"
+    "xss": "^1.0.8"
   },
   "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": "~3.25.3",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-eslint": "^5.1.0",
     "ember-cli-inject-live-reload": "^2.0.1",
diff --git a/app/assets/javascripts/pretty-text/yarn.lock b/app/assets/javascripts/pretty-text/yarn.lock
deleted file mode 100644
index f2bd0ee23f..0000000000
--- a/app/assets/javascripts/pretty-text/yarn.lock
+++ /dev/null
@@ -1,10280 +0,0 @@
-# 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"
-
-"@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@^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.9"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
-  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
-
-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.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.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.1, debug@^3.1.0, debug@^3.1.1:
-  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-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.3"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
-  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
-  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-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.6.0:
-  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.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@^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-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.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-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-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.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-
-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.13.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
-  integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
-
-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-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.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
-  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
-  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:
-  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@^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-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.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
-
-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.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:
-  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"
-
-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=
-
-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-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==
-
-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"
-
-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-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-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:
-  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.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"
-
-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:
-  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.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"
-
-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.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==
-
-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.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
-
-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:
-  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/select-kit/addon/components/categories-admin-dropdown.js b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
index 4336ff22a5..da6f133907 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
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
 import { computed } from "@ember/object";
 import { setting } from "discourse/lib/computed";
 
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 8bb8a68815..fa56c7a443 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-chooser.js
@@ -1,9 +1,9 @@
-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";
-import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import { computed, set } from "@ember/object";
+import Category from "discourse/models/category";
+import ComboBoxComponent from "select-kit/components/combo-box";
+import I18n from "I18n";
+import PermissionType from "discourse/models/permission-type";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import { isNone } from "@ember/utils";
 import { setting } from "discourse/lib/computed";
 
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 a7d6e82e06..bb687477f1 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-drop.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-drop.js
@@ -1,11 +1,10 @@
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import { readOnly } from "@ember/object/computed";
-import { computed } from "@ember/object";
-import ComboBoxComponent from "select-kit/components/combo-box";
-import DiscourseURL from "discourse/lib/url";
 import Category from "discourse/models/category";
+import ComboBoxComponent from "select-kit/components/combo-box";
+import DiscourseURL, { getCategoryAndTagUrl } from "discourse/lib/url";
+import I18n from "I18n";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import { computed } from "@ember/object";
+import { readOnly } from "@ember/object/computed";
 
 export const NO_CATEGORIES_ID = "no-categories";
 export const ALL_CATEGORIES_ID = "all-categories";
@@ -107,8 +106,6 @@ export default ComboBoxComponent.extend({
 
   parentCategoryName: readOnly("selectKit.options.parentCategory.name"),
 
-  parentCategoryUrl: readOnly("selectKit.options.parentCategory.url"),
-
   allCategoriesLabel: computed(
     "parentCategoryName",
     "selectKit.options.subCategory",
@@ -123,22 +120,6 @@ export default ComboBoxComponent.extend({
     }
   ),
 
-  allCategoriesUrl: computed(
-    "parentCategoryUrl",
-    "selectKit.options.subCategory",
-    function () {
-      return getURL(
-        this.selectKit.options.subCategory
-          ? `${this.parentCategoryUrl}/all` || "/"
-          : "/"
-      );
-    }
-  ),
-
-  noCategoriesUrl: computed("parentCategoryUrl", function () {
-    return getURL(`${this.parentCategoryUrl}/none`);
-  }),
-
   search(filter) {
     if (filter) {
       let results = Category.search(filter);
@@ -159,27 +140,18 @@ export default ComboBoxComponent.extend({
 
   actions: {
     onChange(categoryId) {
-      let categoryURL;
+      const category =
+        categoryId === ALL_CATEGORIES_ID || categoryId === NO_CATEGORIES_ID
+          ? this.selectKit.options.parentCategory
+          : Category.findById(parseInt(categoryId, 10));
 
-      if (this.tagId && !this.category) {
-        const category = Category.findById(parseInt(categoryId, 10));
-        categoryURL = getURL(
-          `/tags/c/${Category.slugFor(category)}/${
-            category.id
-          }/${this.tagId.toLowerCase()}`
-        );
-      } else if (categoryId === ALL_CATEGORIES_ID) {
-        categoryURL = this.allCategoriesUrl;
-      } else if (categoryId === NO_CATEGORIES_ID) {
-        categoryURL = this.noCategoriesUrl;
-      } else {
-        const category = Category.findById(parseInt(categoryId, 10));
-        categoryURL = category.url;
-      }
-
-      DiscourseURL.routeToUrl(categoryURL);
-
-      return false;
+      DiscourseURL.routeToUrl(
+        getCategoryAndTagUrl(
+          category,
+          categoryId !== NO_CATEGORIES_ID,
+          this.tagId
+        )
+      );
     },
   },
 
diff --git a/app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js b/app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js
index 7daa6c0e4b..5cb7281d89 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js
@@ -1,8 +1,8 @@
-import { readOnly } from "@ember/object/computed";
-import { schedule } from "@ember/runloop";
 import ComboBoxSelectBoxHeaderComponent from "select-kit/components/combo-box/combo-box-header";
 import discourseComputed from "discourse-common/utils/decorators";
 import layout from "select-kit/templates/components/category-drop/category-drop-header";
+import { readOnly } from "@ember/object/computed";
+import { schedule } from "@ember/runloop";
 
 export default ComboBoxSelectBoxHeaderComponent.extend({
   layout,
diff --git a/app/assets/javascripts/select-kit/addon/components/category-notifications-button.js b/app/assets/javascripts/select-kit/addon/components/category-notifications-button.js
index aee957c63c..4b93627ef6 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-notifications-button.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-notifications-button.js
@@ -1,5 +1,5 @@
-import { or } from "@ember/object/computed";
 import NotificationOptionsComponent from "select-kit/components/notifications-button";
+import { or } from "@ember/object/computed";
 
 export default NotificationOptionsComponent.extend({
   pluginApiIdentifiers: ["category-notifications-button"],
diff --git a/app/assets/javascripts/select-kit/addon/components/category-row.js b/app/assets/javascripts/select-kit/addon/components/category-row.js
index cbcb6df4db..dedd8a5c48 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-row.js
@@ -1,11 +1,11 @@
-import { reads, bool } from "@ember/object/computed";
-import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import Category from "discourse/models/category";
-import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import { bool, reads } from "@ember/object/computed";
 import { isEmpty, isNone } from "@ember/utils";
+import Category from "discourse/models/category";
+import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import { computed } from "@ember/object";
-import { setting } from "discourse/lib/computed";
 import layout from "select-kit/templates/components/category-row";
+import { setting } from "discourse/lib/computed";
 
 function htmlToText(encodedString) {
   const elem = document.createElement("textarea");
diff --git a/app/assets/javascripts/select-kit/addon/components/category-selector.js b/app/assets/javascripts/select-kit/addon/components/category-selector.js
index 69f157fe41..1a081f9e9c 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-selector.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-selector.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import { categoryBadgeHTML } from "discourse/helpers/category-link";
-import EmberObject, { get, computed } from "@ember/object";
-import { mapBy } from "@ember/object/computed";
-import { makeArray } from "discourse-common/lib/helpers";
-import MultiSelectComponent from "select-kit/components/multi-select";
+import EmberObject, { computed, get } from "@ember/object";
 import Category from "discourse/models/category";
+import I18n from "I18n";
+import MultiSelectComponent from "select-kit/components/multi-select";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import { makeArray } from "discourse-common/lib/helpers";
+import { mapBy } from "@ember/object/computed";
 
 export default MultiSelectComponent.extend({
   pluginApiIdentifiers: ["category-selector"],
diff --git a/app/assets/javascripts/select-kit/addon/components/color-palettes.js b/app/assets/javascripts/select-kit/addon/components/color-palettes.js
index 417aca4edc..9c419f41b5 100644
--- a/app/assets/javascripts/select-kit/addon/components/color-palettes.js
+++ b/app/assets/javascripts/select-kit/addon/components/color-palettes.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import ComboBoxComponent from "select-kit/components/combo-box";
+import I18n from "I18n";
 
 export default ComboBoxComponent.extend({
   pluginApiIdentifiers: ["color-palettes"],
diff --git a/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js b/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js
index 4ec5a382de..4819db65d0 100644
--- a/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js
@@ -1,6 +1,6 @@
-import { escapeExpression } from "discourse/lib/utilities";
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
 import { computed } from "@ember/object";
+import { escapeExpression } from "discourse/lib/utilities";
 import layout from "select-kit/templates/components/color-palettes/color-palettes-row";
 
 export default SelectKitRowComponent.extend({
diff --git a/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js b/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js
index be48bb3132..6d6378d333 100644
--- a/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js
@@ -1,4 +1,4 @@
-import { reads, and } from "@ember/object/computed";
+import { and, reads } from "@ember/object/computed";
 import SingleSelectHeaderComponent from "select-kit/components/select-kit/single-select-header";
 import { computed } from "@ember/object";
 import layout from "select-kit/templates/components/combo-box/combo-box-header";
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 c453c46918..f3221e25aa 100644
--- a/app/assets/javascripts/select-kit/addon/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/addon/components/composer-actions.js
@@ -1,18 +1,18 @@
-import I18n from "I18n";
-import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import {
-  PRIVATE_MESSAGE,
-  CREATE_TOPIC,
   CREATE_SHARED_DRAFT,
-  REPLY,
+  CREATE_TOPIC,
   EDIT,
+  PRIVATE_MESSAGE,
+  REPLY,
 } from "discourse/models/composer";
+import discourseComputed from "discourse-common/utils/decorators";
 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";
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
 import bootbox from "bootbox";
+import { camelize } from "@ember/string";
+import { equal, gt } from "@ember/object/computed";
+import { isEmpty } from "@ember/utils";
 
 // Component can get destroyed and lose state
 let _topicSnapshot = null;
@@ -30,22 +30,35 @@ export default DropdownSelectBoxComponent.extend({
   pluginApiIdentifiers: ["composer-actions"],
   classNames: ["composer-actions"],
   isEditing: equal("action", EDIT),
+  isInSlowMode: gt("topic.slow_mode_seconds", 0),
 
   selectKitOptions: {
     icon: "iconForComposerAction",
     filterable: false,
     showFullTitle: false,
+    preventHeaderFocus: true,
   },
 
-  iconForComposerAction: computed("action", function () {
-    if (this.isEditing) {
-      return "pencil-alt";
-    } else if (this.action === CREATE_TOPIC) {
+  @discourseComputed("isEditing", "action", "whisper", "noBump", "isInSlowMode")
+  iconForComposerAction(isEditing, action, whisper, noBump, isInSlowMode) {
+    if (action === CREATE_TOPIC) {
       return "plus";
+    } else if (action === PRIVATE_MESSAGE) {
+      return "envelope";
+    } else if (action === CREATE_SHARED_DRAFT) {
+      return "far-clipboard";
+    } else if (whisper) {
+      return "far-eye-slash";
+    } else if (noBump) {
+      return "anchor";
+    } else if (isInSlowMode) {
+      return "hourglass-start";
+    } else if (isEditing) {
+      return "pencil-alt";
     } else {
       return "share";
     }
-  }),
+  },
 
   contentChanged() {
     this.set("seq", this.seq + 1);
@@ -87,7 +100,8 @@ export default DropdownSelectBoxComponent.extend({
     return {};
   },
 
-  content: computed("seq", function () {
+  @discourseComputed("seq")
+  content() {
     let items = [];
 
     if (
@@ -242,7 +256,7 @@ export default DropdownSelectBoxComponent.extend({
     }
 
     return items;
-  }),
+  },
 
   _replyFromExisting(options, post, topic) {
     this.closeComposer();
diff --git a/app/assets/javascripts/select-kit/addon/components/create-color-row.js b/app/assets/javascripts/select-kit/addon/components/create-color-row.js
index 063cc67ba3..e19630287f 100644
--- a/app/assets/javascripts/select-kit/addon/components/create-color-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/create-color-row.js
@@ -1,7 +1,7 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
 import { escapeExpression } from "discourse/lib/utilities";
-import { schedule } from "@ember/runloop";
 import layout from "select-kit/templates/components/create-color-row";
+import { schedule } from "@ember/runloop";
 
 export default SelectKitRowComponent.extend({
   layout,
diff --git a/app/assets/javascripts/select-kit/addon/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
index 68d26db9af..c8115d4850 100644
--- a/app/assets/javascripts/select-kit/addon/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
@@ -1,7 +1,7 @@
 import SingleSelectHeaderComponent from "select-kit/components/select-kit/single-select-header";
 import { computed } from "@ember/object";
-import { readOnly } from "@ember/object/computed";
 import layout from "select-kit/templates/components/dropdown-select-box/dropdown-select-box-header";
+import { readOnly } from "@ember/object/computed";
 
 export default SingleSelectHeaderComponent.extend({
   layout,
diff --git a/app/assets/javascripts/select-kit/addon/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
index 3bb126c0fa..6399da5b2d 100644
--- a/app/assets/javascripts/select-kit/addon/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
@@ -1,6 +1,6 @@
-import { readOnly } from "@ember/object/computed";
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
 import layout from "select-kit/templates/components/dropdown-select-box/dropdown-select-box-row";
+import { readOnly } from "@ember/object/computed";
 
 export default SelectKitRowComponent.extend({
   layout,
diff --git a/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-filter.js b/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-filter.js
new file mode 100644
index 0000000000..0d9002751a
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-filter.js
@@ -0,0 +1,35 @@
+import MultiSelectFilterComponent from "select-kit/components/multi-select/multi-select-filter";
+import { action } from "@ember/object";
+
+export default MultiSelectFilterComponent.extend({
+  classNames: ["email-group-user-chooser-filter"],
+
+  @action
+  onPaste(event) {
+    const data = event.originalEvent.clipboardData;
+
+    if (!data) {
+      return;
+    }
+
+    const recipients = [];
+    data
+      .getData("text")
+      .split(/[, \n]+/)
+      .forEach((recipient) => {
+        recipient = recipient.replace(/^@+/, "").trim();
+        if (recipient.length > 0) {
+          recipients.push(recipient);
+        }
+      });
+
+    if (recipients.length > 0) {
+      event.stopPropagation();
+      event.preventDefault();
+
+      this.selectKit.append(recipients);
+
+      return false;
+    }
+  },
+});
diff --git a/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-header.js b/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-header.js
new file mode 100644
index 0000000000..b25bb6edef
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-header.js
@@ -0,0 +1,76 @@
+import MultiSelectHeaderComponent from "select-kit/components/multi-select/multi-select-header";
+import { computed } from "@ember/object";
+import { gt } from "@ember/object/computed";
+import { isTesting } from "discourse-common/config/environment";
+import layout from "select-kit/templates/components/email-group-user-chooser-header";
+
+export default MultiSelectHeaderComponent.extend({
+  layout,
+  classNames: ["email-group-user-chooser-header"],
+  hasHiddenItems: gt("hiddenItemsCount", 0),
+
+  shownItems: computed("hiddenItemsCount", function () {
+    if (
+      this.selectKit.noneItem === this.selectedContent ||
+      this.hiddenItemsCount === 0
+    ) {
+      return this.selectedContent;
+    }
+    return this.selectedContent.slice(
+      0,
+      this.selectedContent.length - this.hiddenItemsCount
+    );
+  }),
+
+  hiddenItemsCount: computed(
+    "selectedContent.[]",
+    "selectKit.options.autoWrap",
+    "selectKit.isExpanded",
+    function () {
+      if (
+        !this.selectKit.options.autoWrap ||
+        this.selectKit.isExpanded ||
+        this.selectedContent === this.selectKit.noneItem ||
+        this.selectedContent.length <= 1 ||
+        isTesting()
+      ) {
+        return 0;
+      } else {
+        const selectKitHeaderWidth = this.element.offsetWidth;
+        const choices = this.element.querySelectorAll(".selected-name.choice");
+        const input = this.element.querySelector(".filter-input");
+        const alreadyHidden = this.element.querySelector(".x-more-item");
+        if (alreadyHidden) {
+          const hiddenCount = parseInt(
+            alreadyHidden.getAttribute("data-hidden-count"),
+            10
+          );
+          return (
+            hiddenCount +
+            (this.selectedContent.length - (choices.length + hiddenCount))
+          );
+        }
+        if (choices.length === 0 && this.selectedContent.length > 0) {
+          return 0;
+        }
+        let total = choices[0].offsetWidth + input.offsetWidth;
+        let shownItemsCount = 1;
+        let shouldHide = false;
+        for (let i = 1; i < choices.length - 1; i++) {
+          const currentWidth = choices[i].offsetWidth;
+          const nextWidth = choices[i + 1].offsetWidth;
+          const ratio =
+            (total + currentWidth + nextWidth) / selectKitHeaderWidth;
+          if (ratio >= 0.95) {
+            shouldHide = true;
+            break;
+          } else {
+            shownItemsCount++;
+            total += currentWidth;
+          }
+        }
+        return shouldHide ? choices.length - shownItemsCount : 0;
+      }
+    }
+  ),
+});
diff --git a/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-row.js b/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-row.js
new file mode 100644
index 0000000000..5426c82fb7
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-row.js
@@ -0,0 +1,7 @@
+import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
+import layout from "select-kit/templates/components/email-group-user-chooser-row";
+
+export default SelectKitRowComponent.extend({
+  layout,
+  classNames: ["email-group-user-chooser-row"],
+});
diff --git a/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser.js b/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser.js
new file mode 100644
index 0000000000..7923147906
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser.js
@@ -0,0 +1,49 @@
+import UserChooserComponent from "select-kit/components/user-chooser";
+
+export default UserChooserComponent.extend({
+  pluginApiIdentifiers: ["email-group-user-chooser"],
+  classNames: ["email-group-user-chooser"],
+  classNameBindings: ["selectKit.options.fullWidthWrap:full-width-wrap"],
+  valueProperty: "id",
+  nameProperty: "name",
+
+  modifyComponentForRow() {
+    return "email-group-user-chooser-row";
+  },
+
+  selectKitOptions: {
+    headerComponent: "email-group-user-chooser-header",
+    filterComponent: "email-group-user-chooser-filter",
+    fullWidthWrap: false,
+    autoWrap: false,
+  },
+
+  search() {
+    const superPromise = this._super(...arguments);
+    if (!superPromise) {
+      return;
+    }
+    return superPromise.then((results) => {
+      if (!results || results.length === 0) {
+        return;
+      }
+      return results.map((item) => {
+        const reconstructed = {};
+        if (item.username) {
+          reconstructed.id = item.username;
+          if (item.username.includes("@")) {
+            reconstructed.isEmail = true;
+          } else {
+            reconstructed.isUser = true;
+            reconstructed.name = item.name;
+          }
+        } else if (item.name) {
+          reconstructed.id = item.name;
+          reconstructed.name = item.full_name;
+          reconstructed.isGroup = true;
+        }
+        return Object.assign({}, item, reconstructed);
+      });
+    });
+  },
+});
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 291a7c1bb4..cfd208b453 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
@@ -1,10 +1,9 @@
+import ComboBoxComponent from "select-kit/components/combo-box";
+import DatetimeMixin from "select-kit/components/future-date-input-selector/mixin";
 import I18n from "I18n";
 import { computed } from "@ember/object";
 import { equal } from "@ember/object/computed";
 import { isEmpty } from "@ember/utils";
-import ComboBoxComponent from "select-kit/components/combo-box";
-import { CLOSE_STATUS_TYPE } from "discourse/controllers/edit-topic-timer";
-import DatetimeMixin from "select-kit/components/future-date-input-selector/mixin";
 
 const TIMEFRAME_BASE = {
   enabled: () => true,
@@ -54,7 +53,7 @@ export const TIMEFRAMES = [
   buildTimeframe({
     id: "next_week",
     format: "ddd, h a",
-    enabled: (opts) => opts.day !== 7,
+    enabled: (opts) => opts.day !== 0,
     when: (time, timeOfDay) =>
       time.add(1, "week").day(1).hour(timeOfDay).minute(0),
     icon: "briefcase",
@@ -125,11 +124,6 @@ export const TIMEFRAMES = [
     enabled: (opts) => opts.includeDateTime,
     icon: "far-calendar-plus",
   }),
-  buildTimeframe({
-    id: "set_based_on_last_post",
-    enabled: (opts) => opts.includeBasedOnLastPost,
-    icon: "far-clock",
-  }),
 ];
 
 let _timeframeById = null;
@@ -147,7 +141,6 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
   pluginApiIdentifiers: ["future-date-input-selector"],
   classNames: ["future-date-input-selector"],
   isCustom: equal("value", "pick_date_and_time"),
-  isBasedOnLastPost: equal("value", "set_based_on_last_post"),
 
   selectKitOptions: {
     autoInsertNoneItem: false,
@@ -168,7 +161,6 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
       includeMidFuture: this.includeMidFuture || true,
       includeFarFuture: this.includeFarFuture,
       includeDateTime: this.includeDateTime,
-      includeBasedOnLastPost: this.statusType === CLOSE_STATUS_TYPE,
       canScheduleNow: this.includeNow || false,
       canScheduleToday: 24 - now.hour() > 6,
     };
@@ -185,7 +177,7 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
 
   actions: {
     onChange(value) {
-      if (value !== "pick_date_and_time" || !this.isBasedOnLastPost) {
+      if (value !== "pick_date_and_time") {
         const { time } = this._updateAt(value);
         if (time && !isEmpty(value)) {
           this.attrs.onChangeInput &&
diff --git a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/mixin.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/mixin.js
index 66dea89183..c9b64fa531 100644
--- a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/mixin.js
+++ b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/mixin.js
@@ -1,7 +1,7 @@
 import { CLOSE_STATUS_TYPE } from "discourse/controllers/edit-topic-timer";
-import { timeframeDetails } from "select-kit/components/future-date-input-selector";
 import Mixin from "@ember/object/mixin";
 import { isNone } from "@ember/utils";
+import { timeframeDetails } from "select-kit/components/future-date-input-selector";
 
 export default Mixin.create({
   _computeIconsForValue(value) {
diff --git a/app/assets/javascripts/select-kit/addon/components/group-dropdown.js b/app/assets/javascripts/select-kit/addon/components/group-dropdown.js
index 4477618753..365f8c5ad0 100644
--- a/app/assets/javascripts/select-kit/addon/components/group-dropdown.js
+++ b/app/assets/javascripts/select-kit/addon/components/group-dropdown.js
@@ -1,7 +1,7 @@
-import I18n from "I18n";
-import { reads, gte } from "@ember/object/computed";
+import { gte, reads } from "@ember/object/computed";
 import ComboBoxComponent from "select-kit/components/combo-box";
 import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
 import { computed } from "@ember/object";
 import { setting } from "discourse/lib/computed";
 
diff --git a/app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js b/app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js
deleted file mode 100644
index 5d089e1be0..0000000000
--- a/app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import I18n from "I18n";
-import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
-import { action, computed } from "@ember/object";
-
-export default DropdownSelectBoxComponent.extend({
-  classNames: ["group-members-dropdown"],
-
-  selectKitOptions: {
-    icon: "bars",
-    showFullTitle: false,
-  },
-
-  content: computed(function () {
-    const items = [
-      {
-        id: "showAddMembersModal",
-        name: I18n.t("groups.add_members.title", {
-          group_name: this.groupName,
-        }),
-        icon: "user-plus",
-      },
-    ];
-    return items;
-  }),
-
-  @action
-  onChange(id) {
-    this.attrs && this.attrs[id] && this.attrs[id]();
-  },
-});
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 eb053b0396..69b7767b1d 100644
--- a/app/assets/javascripts/select-kit/addon/components/icon-picker.js
+++ b/app/assets/javascripts/select-kit/addon/components/icon-picker.js
@@ -1,13 +1,13 @@
-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,
   disableMissingIconWarning,
   enableMissingIconWarning,
 } from "discourse-common/lib/icon-library";
+import MultiSelectComponent from "select-kit/components/multi-select";
+import { ajax } from "discourse/lib/ajax";
+import { computed } from "@ember/object";
 import { isDevelopment } from "discourse-common/config/environment";
+import { makeArray } from "discourse-common/lib/helpers";
 
 export default MultiSelectComponent.extend({
   pluginApiIdentifiers: ["icon-picker"],
diff --git a/app/assets/javascripts/select-kit/addon/components/list-setting.js b/app/assets/javascripts/select-kit/addon/components/list-setting.js
index f2ee92b603..da9d9f7d4b 100644
--- a/app/assets/javascripts/select-kit/addon/components/list-setting.js
+++ b/app/assets/javascripts/select-kit/addon/components/list-setting.js
@@ -1,8 +1,8 @@
-import MultiSelectComponent from "select-kit/components/multi-select";
 import { MAIN_COLLECTION } from "select-kit/components/select-kit";
+import MultiSelectComponent from "select-kit/components/multi-select";
 import { computed } from "@ember/object";
-import { readOnly } from "@ember/object/computed";
 import { makeArray } from "discourse-common/lib/helpers";
+import { readOnly } from "@ember/object/computed";
 
 export default MultiSelectComponent.extend({
   pluginApiIdentifiers: ["list-setting"],
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 8ed8cff649..bce736ca5e 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
@@ -1,13 +1,13 @@
-import I18n from "I18n";
 import { empty, or } from "@ember/object/computed";
 import ComboBox from "select-kit/components/combo-box";
+import { ERRORS_COLLECTION } from "select-kit/components/select-kit";
+import I18n from "I18n";
 import TagsMixin from "select-kit/mixins/tags";
-import { makeArray } from "discourse-common/lib/helpers";
 import { computed } from "@ember/object";
-import { setting } from "discourse/lib/computed";
+import { makeArray } from "discourse-common/lib/helpers";
 
 const SELECTED_TAGS_COLLECTION = "MINI_TAG_CHOOSER_SELECTED_TAGS";
-import { ERRORS_COLLECTION } from "select-kit/components/select-kit";
+import { setting } from "discourse/lib/computed";
 
 export default ComboBox.extend(TagsMixin, {
   pluginApiIdentifiers: ["mini-tag-chooser"],
@@ -79,7 +79,10 @@ export default ComboBox.extend(TagsMixin, {
   }),
 
   modifyNoSelection() {
-    if (this.selectKit.options.minimum) {
+    if (
+      this.selectKit.options.minimum ||
+      this.selectKit.options.requiredTagGroups
+    ) {
       const minimum = parseInt(this.selectKit.options.minimum, 10);
       if (minimum > 0) {
         return this.defaultItem(
diff --git a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js
index bb9fbac778..e8187c687a 100644
--- a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js
+++ b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js
@@ -1,6 +1,6 @@
+import { empty, reads } from "@ember/object/computed";
 import Component from "@ember/component";
 import { computed } from "@ember/object";
-import { reads, empty } from "@ember/object/computed";
 import layout from "select-kit/templates/components/mini-tag-chooser/selected-collection";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select.js b/app/assets/javascripts/select-kit/addon/components/multi-select.js
index 2c7900fe4a..534f6994dd 100644
--- a/app/assets/javascripts/select-kit/addon/components/multi-select.js
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select.js
@@ -1,9 +1,9 @@
-import deprecated from "discourse-common/lib/deprecated";
 import SelectKitComponent from "select-kit/components/select-kit";
 import { computed } from "@ember/object";
+import deprecated from "discourse-common/lib/deprecated";
 import { isPresent } from "@ember/utils";
-import { makeArray } from "discourse-common/lib/helpers";
 import layout from "select-kit/templates/components/multi-select";
+import { makeArray } from "discourse-common/lib/helpers";
 
 export default SelectKitComponent.extend({
   pluginApiIdentifiers: ["multi-select"],
@@ -29,6 +29,31 @@ export default SelectKitComponent.extend({
     );
   },
 
+  append(values) {
+    const existingItems = values
+      .map((value) => {
+        const defaultItem = this.defaultItem(value, value);
+        const existingItem =
+          this.findValue(this.mainCollection, defaultItem) ||
+          this.findName(this.mainCollection, defaultItem);
+        if (!existingItem) {
+          if (this.validateCreate(value, this.content)) {
+            return value;
+          }
+        } else if (this.validateSelect(existingItem)) {
+          return this.getValue(existingItem);
+        }
+      })
+      .filter(Boolean);
+
+    const newValues = makeArray(this.value).concat(existingItems);
+    const newContent = makeArray(this.selectedContent).concat(
+      makeArray(existingItems)
+    );
+
+    this.selectKit.change(newValues, newContent);
+  },
+
   deselect(item) {
     this.clearErrors();
 
@@ -112,7 +137,17 @@ export default SelectKitComponent.extend({
   }),
 
   _onKeydown(event) {
-    if (event.keyCode === 8) {
+    if (
+      event.code === "Enter" &&
+      event.target.classList.contains("selected-name")
+    ) {
+      event.stopPropagation();
+
+      this.selectKit.deselectByValue(event.target.dataset.value);
+      return false;
+    }
+
+    if (event.code === "Backspace") {
       event.stopPropagation();
 
       const input = this.getFilterInput();
@@ -124,19 +159,14 @@ export default SelectKitComponent.extend({
         if (selected.length) {
           const lastSelected = selected[selected.length - 1];
           if (lastSelected) {
-            if (lastSelected.classList.contains("is-highlighted")) {
+            if (lastSelected === document.activeElement) {
               this.deselect(this.selectedContent.lastObject);
             } else {
-              lastSelected.classList.add("is-highlighted");
+              lastSelected.focus();
             }
           }
         }
       }
-    } else {
-      const selected = this.element.querySelectorAll(
-        ".select-kit-header .choice.select-kit-selected-name"
-      );
-      selected.forEach((s) => s.classList.remove("is-highlighted"));
     }
 
     return true;
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js
index 267e83f273..c7dbe545fd 100644
--- a/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js
@@ -1,7 +1,7 @@
 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";
+const { isEmpty } = Ember;
+import discourseComputed from "discourse-common/utils/decorators";
 import layout from "select-kit/templates/components/select-kit/select-kit-filter";
 
 export default SelectKitFilterComponent.extend({
@@ -15,4 +15,25 @@ export default SelectKitFilterComponent.extend({
     }
     return isEmpty(placeholder) ? "" : I18n.t(placeholder);
   },
+
+  actions: {
+    onPaste(event) {
+      const data = event.originalEvent.clipboardData;
+
+      if (!data) {
+        return;
+      }
+
+      const parts = data.getData("text").split("|").filter(Boolean);
+
+      if (parts.length > 1) {
+        event.stopPropagation();
+        event.preventDefault();
+
+        this.selectKit.append(parts);
+
+        return false;
+      }
+    },
+  },
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js
index e01a0f7ca8..ed3b298da8 100644
--- a/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js
@@ -1,7 +1,7 @@
 import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
 import { computed } from "@ember/object";
-import { makeArray } from "discourse-common/lib/helpers";
 import layout from "select-kit/templates/components/multi-select/multi-select-header";
+import { makeArray } from "discourse-common/lib/helpers";
 
 export default SelectKitHeaderComponent.extend({
   classNames: ["multi-select-header"],
diff --git a/app/assets/javascripts/select-kit/addon/components/notifications-button.js b/app/assets/javascripts/select-kit/addon/components/notifications-button.js
index 5e0788e55a..0935db826b 100644
--- a/app/assets/javascripts/select-kit/addon/components/notifications-button.js
+++ b/app/assets/javascripts/select-kit/addon/components/notifications-button.js
@@ -1,7 +1,7 @@
-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";
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
 
 export default DropdownSelectBoxComponent.extend({
   pluginApiIdentifiers: ["notifications-button"],
diff --git a/app/assets/javascripts/select-kit/addon/components/notifications-button/notifications-button-row.js b/app/assets/javascripts/select-kit/addon/components/notifications-button/notifications-button-row.js
index 25fa2f323f..58cb0aa44c 100644
--- a/app/assets/javascripts/select-kit/addon/components/notifications-button/notifications-button-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/notifications-button/notifications-button-row.js
@@ -1,8 +1,8 @@
-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";
+import I18n from "I18n";
+import { computed } from "@ember/object";
 import { escapeExpression } from "discourse/lib/utilities";
+import { readOnly } from "@ember/object/computed";
 
 export default DropdownSelectBoxRowComponent.extend({
   classNames: ["notifications-button-row"],
diff --git a/app/assets/javascripts/select-kit/addon/components/notifications-filter.js b/app/assets/javascripts/select-kit/addon/components/notifications-filter.js
index aafd2ce447..08b05789be 100644
--- a/app/assets/javascripts/select-kit/addon/components/notifications-filter.js
+++ b/app/assets/javascripts/select-kit/addon/components/notifications-filter.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
 import { computed } from "@ember/object";
 
 export default DropdownSelectBoxComponent.extend({
diff --git a/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js
index 49bfefa581..0787fa62ef 100644
--- a/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import DropdownSelectBoxRowComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-row";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import layout from "select-kit/templates/components/period-chooser/period-chooser-row";
 
diff --git a/app/assets/javascripts/select-kit/addon/components/pinned-button.js b/app/assets/javascripts/select-kit/addon/components/pinned-button.js
index 3b9f79c091..bc1a834bec 100644
--- a/app/assets/javascripts/select-kit/addon/components/pinned-button.js
+++ b/app/assets/javascripts/select-kit/addon/components/pinned-button.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import Component from "@ember/component";
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import layout from "select-kit/templates/components/pinned-button";
 
diff --git a/app/assets/javascripts/select-kit/addon/components/pinned-options.js b/app/assets/javascripts/select-kit/addon/components/pinned-options.js
index f137223f58..94a355baef 100644
--- a/app/assets/javascripts/select-kit/addon/components/pinned-options.js
+++ b/app/assets/javascripts/select-kit/addon/components/pinned-options.js
@@ -1,6 +1,6 @@
-import I18n from "I18n";
+import { action, computed } from "@ember/object";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
-import { computed, action } from "@ember/object";
+import I18n from "I18n";
 
 const UNPINNED = "unpinned";
 const PINNED = "pinned";
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 d76586f50f..3551ce7bb3 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js
@@ -1,26 +1,20 @@
-import { createPopper } from "@popperjs/core";
-import I18n from "I18n";
 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";
-import UtilsMixin from "select-kit/mixins/utils";
-import Mixin from "@ember/object/mixin";
-import { isPresent, isEmpty, isNone } from "@ember/utils";
-import {
-  next,
-  debounce,
-  cancel,
-  throttle,
-  bind,
-  schedule,
-} from "@ember/runloop";
-import { Promise } from "rsvp";
 import PluginApiMixin, {
   applyContentPluginApiCallbacks,
   applyOnChangePluginApiCallbacks,
 } from "select-kit/mixins/plugin-api";
+import { bind, cancel, next, schedule, throttle } from "@ember/runloop";
+import { isEmpty, isNone, isPresent } from "@ember/utils";
+import Component from "@ember/component";
+import I18n from "I18n";
+import Mixin from "@ember/object/mixin";
+import { Promise } from "rsvp";
+import UtilsMixin from "select-kit/mixins/utils";
+import { createPopper } from "@popperjs/core";
+import deprecated from "discourse-common/lib/deprecated";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { guidFor } from "@ember/object/internals";
+import { makeArray } from "discourse-common/lib/helpers";
 
 export const MAIN_COLLECTION = "MAIN_COLLECTION";
 export const ERRORS_COLLECTION = "ERRORS_COLLECTION";
@@ -64,6 +58,7 @@ export default Component.extend(
     multiSelect: false,
     labelProperty: null,
     titleProperty: null,
+    langProperty: null,
 
     init() {
       this._super(...arguments);
@@ -85,12 +80,14 @@ export default Component.extend(
           nameProperty: this.nameProperty,
           labelProperty: this.labelProperty,
           titleProperty: this.titleProperty,
+          langProperty: this.langProperty,
           options: EmberObject.create(),
 
           isLoading: false,
           isHidden: false,
           isExpanded: false,
           isFilterExpanded: false,
+          enterDisabled: false,
           hasSelection: false,
           hasNoContent: true,
           highlighted: null,
@@ -118,6 +115,8 @@ export default Component.extend(
           change: bind(this, this._onChangeWrapper),
           select: bind(this, this.select),
           deselect: bind(this, this.deselect),
+          deselectByValue: bind(this, this.deselectByValue),
+          append: bind(this, this.append),
 
           onOpen: bind(this, this._onOpenWrapper),
           onClose: bind(this, this._onCloseWrapper),
@@ -281,6 +280,7 @@ export default Component.extend(
       preventsClickPropagation: false,
       focusAfterOnChange: true,
       triggerOnChangeOnTab: true,
+      autofocus: false,
     },
 
     autoFilterable: computed("content.[]", "selectKit.filter", function () {
@@ -386,7 +386,7 @@ export default Component.extend(
         cancel(this._searchPromise);
       }
 
-      debounce(this, this._debouncedInput, event.target.value, 200);
+      discourseDebounce(this, this._debouncedInput, event.target.value, 200);
     },
 
     _debouncedInput(filter) {
@@ -546,6 +546,19 @@ export default Component.extend(
       this.selectKit.change(null, null);
     },
 
+    deselectByValue(value) {
+      if (!value) {
+        return;
+      }
+
+      const item = this.itemForValue(value, this.selectedContent);
+      this.deselect(item);
+    },
+
+    append() {
+      // do nothing on general case
+    },
+
     search(filter) {
       let content = this.content || [];
       if (filter) {
@@ -569,64 +582,75 @@ export default Component.extend(
 
     _searchWrapper(filter) {
       this.clearErrors();
-      this.setProperties({ mainCollection: [], "selectKit.isLoading": true });
+      this.setProperties({
+        mainCollection: [],
+        "selectKit.isLoading": true,
+        "selectKit.enterDisabled": true,
+      });
       this._safeAfterRender(() => this.popper && this.popper.update());
 
       let content = [];
 
-      return Promise.resolve(this.search(filter)).then((result) => {
-        content = content.concat(makeArray(result));
-        content = this.selectKit.modifyContent(content).filter(Boolean);
+      return Promise.resolve(this.search(filter))
+        .then((result) => {
+          content = content.concat(makeArray(result));
+          content = this.selectKit.modifyContent(content).filter(Boolean);
 
-        if (this.selectKit.valueProperty) {
-          content = content.uniqBy(this.selectKit.valueProperty);
-        } else {
-          content = content.uniq();
-        }
-
-        if (this.selectKit.options.limitMatches) {
-          content = content.slice(0, this.selectKit.options.limitMatches);
-        }
-
-        const noneItem = this.selectKit.noneItem;
-        if (
-          this.selectKit.options.allowAny &&
-          filter &&
-          this.getName(noneItem) !== filter
-        ) {
-          filter = this.createContentFromInput(filter);
-          if (this.validateCreate(filter, content)) {
-            this.selectKit.set("newItem", this.defaultItem(filter, filter));
-            content.unshift(this.selectKit.newItem);
+          if (this.selectKit.valueProperty) {
+            content = content.uniqBy(this.selectKit.valueProperty);
+          } else {
+            content = content.uniq();
           }
-        }
 
-        const hasNoContent = isEmpty(content);
+          if (this.selectKit.options.limitMatches) {
+            content = content.slice(0, this.selectKit.options.limitMatches);
+          }
 
-        if (
-          this.selectKit.hasSelection &&
-          noneItem &&
-          this.selectKit.options.autoInsertNoneItem
-        ) {
-          content.unshift(noneItem);
-        }
+          const noneItem = this.selectKit.noneItem;
+          if (
+            this.selectKit.options.allowAny &&
+            filter &&
+            this.getName(noneItem) !== filter
+          ) {
+            filter = this.createContentFromInput(filter);
+            if (this.validateCreate(filter, content)) {
+              this.selectKit.set("newItem", this.defaultItem(filter, filter));
+              content.unshift(this.selectKit.newItem);
+            }
+          }
 
-        this.set("mainCollection", content);
+          const hasNoContent = isEmpty(content);
 
-        this.selectKit.setProperties({
-          highlighted:
-            this.singleSelect && this.value
-              ? this.itemForValue(this.value, this.mainCollection)
-              : this.mainCollection.firstObject,
-          isLoading: false,
-          hasNoContent,
+          if (
+            this.selectKit.hasSelection &&
+            noneItem &&
+            this.selectKit.options.autoInsertNoneItem
+          ) {
+            content.unshift(noneItem);
+          }
+
+          this.set("mainCollection", content);
+
+          this.selectKit.setProperties({
+            highlighted:
+              this.singleSelect && this.value
+                ? this.itemForValue(this.value, this.mainCollection)
+                : this.mainCollection.firstObject,
+            isLoading: false,
+            hasNoContent,
+          });
+
+          this._safeAfterRender(() => {
+            this.popper && this.popper.update();
+            this._focusFilter();
+          });
+        })
+        .finally(() => {
+          if (this.isDestroyed || this.isDestroying) {
+            return;
+          }
+          this.set("selectKit.enterDisabled", false);
         });
-
-        this._safeAfterRender(() => {
-          this.popper && this.popper.update();
-          this._focusFilter();
-        });
-      });
     },
 
     _safeAfterRender(fn) {
@@ -763,10 +787,10 @@ export default Component.extend(
 
       if (!this.popper) {
         const anchor = document.querySelector(
-          `[data-select-kit-id=${this.selectKit.uniqueID}-header]`
+          `#${this.selectKit.uniqueID}-header`
         );
         const popper = document.querySelector(
-          `[data-select-kit-id=${this.selectKit.uniqueID}-body]`
+          `#${this.selectKit.uniqueID}-body`
         );
 
         const inModal = $(this.element).parents("#discourse-modal").length;
@@ -776,7 +800,7 @@ export default Component.extend(
           placementStrategy = inModal ? "fixed" : "absolute";
         }
 
-        const verticalOffset = this.multiSelect ? 0 : 3;
+        const verticalOffset = 3;
 
         this.popper = createPopper(anchor, popper, {
           eventsEnabled: false,
@@ -853,11 +877,12 @@ export default Component.extend(
                   }
 
                   const popperElement = data.state.elements.popper;
-                  if (
+                  const topPlacement =
                     popperElement &&
-                    popperElement.getAttribute("data-popper-placement") ===
-                      "top-start"
-                  ) {
+                    popperElement
+                      .getAttribute("data-popper-placement")
+                      .startsWith("top-");
+                  if (topPlacement) {
                     this.element.classList.remove("is-under");
                     this.element.classList.add("is-above");
                   } else {
@@ -867,6 +892,24 @@ export default Component.extend(
 
                   wrapper.style.width = `${this.element.offsetWidth}px`;
                   wrapper.style.height = `${height}px`;
+                  if (placementStrategy === "fixed") {
+                    const rects = this.element.getClientRects()[0];
+
+                    if (rects) {
+                      const bodyRects = body && body.getClientRects()[0];
+
+                      wrapper.style.position = "fixed";
+                      wrapper.style.left = `${rects.left}px`;
+                      if (topPlacement && bodyRects) {
+                        wrapper.style.top = `${rects.top - bodyRects.height}px`;
+                      } else {
+                        wrapper.style.top = `${rects.top}px`;
+                      }
+                      if (isDocumentRTL()) {
+                        wrapper.style.right = "unset";
+                      }
+                    }
+                  }
                 }
               },
             },
@@ -914,7 +957,7 @@ export default Component.extend(
         const input = this.getFilterInput();
         if (!forceHeader && input) {
           input.focus({ preventScroll: true });
-        } else {
+        } else if (!this.selectKit.options.preventHeaderFocus) {
           const headerContainer = this.getHeader();
           headerContainer && headerContainer.focus({ preventScroll: true });
         }
@@ -922,15 +965,11 @@ export default Component.extend(
     },
 
     getFilterInput() {
-      return document.querySelector(
-        `[data-select-kit-id=${this.selectKit.uniqueID}-filter] input`
-      );
+      return document.querySelector(`#${this.selectKit.uniqueID}-filter input`);
     },
 
     getHeader() {
-      return document.querySelector(
-        `[data-select-kit-id=${this.selectKit.uniqueID}-header]`
-      );
+      return document.querySelector(`#${this.selectKit.uniqueID}-header`);
     },
 
     handleDeprecations() {
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js
index 594c0232a5..5ef8061fd8 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js
@@ -1,17 +1,20 @@
 import Component from "@ember/component";
-import { computed } from "@ember/object";
 import { bind } from "@ember/runloop";
+import { computed } from "@ember/object";
 import layout from "select-kit/templates/components/select-kit/select-kit-body";
 
 export default Component.extend({
   layout,
   classNames: ["select-kit-body"],
-  attributeBindings: ["selectKitId:data-select-kit-id"],
-  selectKitId: computed("selectKit.uniqueID", function () {
-    return `${this.selectKit.uniqueID}-body`;
+  attributeBindings: ["role"],
+  classNameBindings: ["emptyBody:empty-body"],
+  emptyBody: computed("selectKit.{filter,hasNoContent}", function () {
+    return !this.selectKit.filter && this.selectKit.hasNoContent;
   }),
   rootEventType: "click",
 
+  role: "listbox",
+
   init() {
     this._super(...arguments);
 
@@ -44,7 +47,7 @@ export default Component.extend({
     }
 
     const headerElement = document.querySelector(
-      `[data-select-kit-id=${this.selectKit.uniqueID}-header]`
+      `#${this.selectKit.uniqueID}-header`
     );
 
     if (headerElement && headerElement.contains(event.target)) {
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
index 729b3d5d67..853b468e10 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
@@ -1,20 +1,19 @@
-import I18n from "I18n";
 import Component from "@ember/component";
+import I18n from "I18n";
+import UtilsMixin from "select-kit/mixins/utils";
+import { computed } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isPresent } from "@ember/utils";
-import { computed } from "@ember/object";
-import { not } from "@ember/object/computed";
-import UtilsMixin from "select-kit/mixins/utils";
 import layout from "select-kit/templates/components/select-kit/select-kit-filter";
+import { not } from "@ember/object/computed";
 
 export default Component.extend(UtilsMixin, {
   layout,
   classNames: ["select-kit-filter"],
   classNameBindings: ["isExpanded:is-expanded"],
-  attributeBindings: ["selectKitId:data-select-kit-id"],
-  selectKitId: computed("selectKit.uniqueID", function () {
-    return `${this.selectKit.uniqueID}-filter`;
-  }),
+  attributeBindings: ["role"],
+
+  role: "searchbox",
 
   isHidden: computed(
     "selectKit.options.{filterable,allowAny,autoFilterable}",
@@ -47,11 +46,23 @@ export default Component.extend(UtilsMixin, {
   },
 
   actions: {
+    onPaste() {},
+
     onInput(event) {
       this.selectKit.onInput(event);
       return true;
     },
 
+    onKeyup(event) {
+      if (event.keyCode === 13 && this.selectKit.enterDisabled) {
+        this.element.querySelector("input").focus();
+        event.preventDefault();
+        event.stopPropagation();
+        return false;
+      }
+      return true;
+    },
+
     onKeydown(event) {
       if (!this.selectKit.onKeydown(event)) {
         return false;
@@ -89,8 +100,15 @@ export default Component.extend(UtilsMixin, {
         return false;
       }
 
-      if (event.keyCode === 13 && !this.selectKit.highlighted) {
+      if (
+        event.keyCode === 13 &&
+        (!this.selectKit.highlighted || this.selectKit.enterDisabled)
+      ) {
         this.element.querySelector("input").focus();
+        if (this.selectKit.enterDisabled) {
+          event.preventDefault();
+          event.stopPropagation();
+        }
         return false;
       }
 
@@ -105,6 +123,7 @@ export default Component.extend(UtilsMixin, {
         this.selectKit.close(event);
         return;
       }
+      this.selectKit.set("highlighted", null);
     },
   },
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
index 83a48f961d..0d389c9455 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
@@ -1,8 +1,8 @@
-import { computed } from "@ember/object";
 import Component from "@ember/component";
 import UtilsMixin from "select-kit/mixins/utils";
-import { schedule } from "@ember/runloop";
+import { computed } from "@ember/object";
 import { makeArray } from "discourse-common/lib/helpers";
+import { schedule } from "@ember/runloop";
 
 export default Component.extend(UtilsMixin, {
   eventType: "click",
@@ -28,8 +28,7 @@ export default Component.extend(UtilsMixin, {
     "ariaOwns:aria-owns",
     "ariaHasPopup:aria-haspopup",
     "ariaIsExpanded:aria-expanded",
-    "selectKitId:data-select-kit-id",
-    "roleButton:role",
+    "headerRole:role",
     "selectedValue:data-value",
     "selectedNames:data-name",
     "buttonTitle:title",
@@ -63,24 +62,27 @@ export default Component.extend(UtilsMixin, {
     return icon.concat(icons).filter(Boolean);
   }),
 
-  selectKitId: computed("selectKit.uniqueID", function () {
-    return `${this.selectKit.uniqueID}-header`;
-  }),
-
   ariaIsExpanded: computed("selectKit.isExpanded", function () {
     return this.selectKit.isExpanded ? "true" : "false";
   }),
 
-  ariaHasPopup: true,
+  ariaHasPopup: "menu",
 
   ariaOwns: computed("selectKit.uniqueID", function () {
-    return `[data-select-kit-id=${this.selectKit.uniqueID}-body]`;
+    return `${this.selectKit.uniqueID}-body`;
   }),
 
-  roleButton: "button",
+  headerRole: "listbox",
 
   tabindex: 0,
 
+  didInsertElement() {
+    this._super(...arguments);
+    if (this.selectKit.options.autofocus) {
+      this.set("isFocused", true);
+    }
+  },
+
   keyUp(event) {
     if (event.keyCode === 32) {
       event.preventDefault();
@@ -178,7 +180,7 @@ export default Component.extend(UtilsMixin, {
 
   _focusFilterInput() {
     const filterContainer = document.querySelector(
-      `[data-select-kit-id=${this.selectKit.uniqueID}-filter]`
+      `#${this.selectKit.uniqueID}-filter`
     );
 
     if (filterContainer) {
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 30ed72ffce..26f8b810bb 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
@@ -1,10 +1,11 @@
-import I18n from "I18n";
+import { action, computed } from "@ember/object";
 import Component from "@ember/component";
-import { computed, action } from "@ember/object";
-import { makeArray } from "discourse-common/lib/helpers";
-import { guidFor } from "@ember/object/internals";
+import I18n from "I18n";
 import UtilsMixin from "select-kit/mixins/utils";
+import { guidFor } from "@ember/object/internals";
 import layout from "select-kit/templates/components/select-kit/select-kit-row";
+import { makeArray } from "discourse-common/lib/helpers";
+import { reads } from "@ember/object/computed";
 
 export default Component.extend(UtilsMixin, {
   layout,
@@ -17,7 +18,10 @@ export default Component.extend(UtilsMixin, {
     "rowValue:data-value",
     "rowName:data-name",
     "ariaLabel:aria-label",
+    "ariaSelected:aria-selected",
     "guid:data-guid",
+    "rowLang:lang",
+    "role",
   ],
   classNameBindings: [
     "isHighlighted",
@@ -43,14 +47,22 @@ export default Component.extend(UtilsMixin, {
     return this.rowValue === this.getValue(this.selectKit.noneItem);
   }),
 
+  role: "option",
+
   guid: computed("item", function () {
     return guidFor(this.item);
   }),
 
+  lang: reads("item.lang"),
+
   ariaLabel: computed("item.ariaLabel", "title", function () {
     return this.getProperty(this.item, "ariaLabel") || this.title;
   }),
 
+  ariaSelected: computed("isSelected", function () {
+    return this.isSelected ? "true" : "false";
+  }),
+
   title: computed("rowTitle", "item.title", "rowName", function () {
     return (
       this.rowTitle || this.getProperty(this.item, "title") || this.rowName
@@ -82,6 +94,7 @@ export default Component.extend(UtilsMixin, {
       rowValue: this.getValue(this.item),
       rowLabel: this.getProperty(this.item, "labelProperty"),
       rowTitle: this.getProperty(this.item, "titleProperty"),
+      rowLang: this.getProperty(this.item, "langProperty"),
     });
   },
 
@@ -115,4 +128,10 @@ export default Component.extend(UtilsMixin, {
     this.selectKit.select(this.rowValue, this.item);
     return false;
   },
+
+  mouseDown(event) {
+    if (this.selectKit.options.preventHeaderFocus) {
+      event.preventDefault();
+    }
+  },
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js b/app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js
index e53294ea78..337f25de5e 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js
@@ -1,8 +1,29 @@
+import { computed } from "@ember/object";
 import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
 import UtilsMixin from "select-kit/mixins/utils";
 import layout from "select-kit/templates/components/select-kit/single-select-header";
+import I18n from "I18n";
 
 export default SelectKitHeaderComponent.extend(UtilsMixin, {
   layout,
   classNames: ["single-select-header"],
+  attributeBindings: ["role", "name"],
+
+  role: "combobox",
+
+  name: computed("selectedContent.name", function () {
+    if (this.selectedContent) {
+      return I18n.t("select_kit.filter_by", {
+        name: this.selectedContent.name,
+      });
+    } else {
+      return I18n.t("select_kit.select_to_filter");
+    }
+  }),
+
+  mouseDown(event) {
+    if (this.selectKit.options.preventHeaderFocus) {
+      event.preventDefault();
+    }
+  },
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-color.js b/app/assets/javascripts/select-kit/addon/components/selected-color.js
index 76232ce625..9b4cbe27b2 100644
--- a/app/assets/javascripts/select-kit/addon/components/selected-color.js
+++ b/app/assets/javascripts/select-kit/addon/components/selected-color.js
@@ -13,6 +13,7 @@ export default SelectedNameComponent.extend({
         el = document.querySelector(`[data-value="${color}"]`);
 
       if (el) {
+        el.style.borderBottom = "2px solid transparent";
         el.style.borderBottomColor = `#${color}`;
       }
     });
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 5b0c512270..0ec2da4077 100644
--- a/app/assets/javascripts/select-kit/addon/components/selected-name.js
+++ b/app/assets/javascripts/select-kit/addon/components/selected-name.js
@@ -1,14 +1,18 @@
-import { computed, get, action } from "@ember/object";
+import { action, 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 layout from "select-kit/templates/components/selected-name";
+import { makeArray } from "discourse-common/lib/helpers";
+import { reads } from "@ember/object/computed";
 
 export default Component.extend(UtilsMixin, {
   tagName: "",
   layout,
   name: null,
   value: null,
+  headerTitle: null,
+  headerLang: null,
+  headerLabel: null,
 
   @action
   onSelectedNameClick() {
@@ -25,12 +29,15 @@ export default Component.extend(UtilsMixin, {
     this.setProperties({
       headerLabel: this.getProperty(this.item, "labelProperty"),
       headerTitle: this.getProperty(this.item, "titleProperty"),
+      headerLang: this.getProperty(this.item, "langProperty"),
       name: this.getName(this.item),
       value:
         this.item === this.selectKit.noneItem ? null : this.getValue(this.item),
     });
   },
 
+  lang: reads("headerLang"),
+
   ariaLabel: computed("item", "sanitizedTitle", function () {
     return this._safeProperty("ariaLabel", this.item) || this.sanitizedTitle;
   }),
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-chooser.js b/app/assets/javascripts/select-kit/addon/components/tag-chooser.js
index 0fcc339c11..64693c62fe 100644
--- a/app/assets/javascripts/select-kit/addon/components/tag-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/tag-chooser.js
@@ -1,6 +1,6 @@
-import { computed } from "@ember/object";
 import MultiSelectComponent from "select-kit/components/multi-select";
 import TagsMixin from "select-kit/mixins/tags";
+import { computed } from "@ember/object";
 import { makeArray } from "discourse-common/lib/helpers";
 
 export default MultiSelectComponent.extend(TagsMixin, {
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 720e8ad64b..db19faa6a7 100644
--- a/app/assets/javascripts/select-kit/addon/components/tag-drop.js
+++ b/app/assets/javascripts/select-kit/addon/components/tag-drop.js
@@ -1,36 +1,35 @@
-import getURL from "discourse-common/lib/get-url";
-import Category from "discourse/models/category";
-import { readOnly, or, equal, gte } from "@ember/object/computed";
+import { equal, gte, readOnly } from "@ember/object/computed";
 import { i18n, setting } from "discourse/lib/computed";
 import ComboBoxComponent from "select-kit/components/combo-box";
-import DiscourseURL from "discourse/lib/url";
+import DiscourseURL, { getCategoryAndTagUrl } from "discourse/lib/url";
 import TagsMixin from "select-kit/mixins/tags";
 import { computed } from "@ember/object";
-import { isEmpty } from "@ember/utils";
 import { makeArray } from "discourse-common/lib/helpers";
+import { MAIN_COLLECTION } from "select-kit/components/select-kit";
 
 export const NO_TAG_ID = "no-tags";
 export const ALL_TAGS_ID = "all-tags";
 export const NONE_TAG_ID = "none";
 
+const MORE_TAGS_COLLECTION = "MORE_TAGS_COLLECTION";
+
 export default ComboBoxComponent.extend(TagsMixin, {
   pluginApiIdentifiers: ["tag-drop"],
-  classNameBindings: ["categoryStyle", "tagClass", "shouldHide:hidden"],
+  classNameBindings: ["categoryStyle", "tagClass"],
   classNames: ["tag-drop"],
   value: readOnly("tagId"),
   tagName: "li",
-  currentCategory: or("secondCategory", "firstCategory"),
-  showFilterByTag: setting("show_filter_by_tag"),
   categoryStyle: setting("category_style"),
   maxTagSearchResults: setting("max_tag_search_results"),
   sortTagsAlphabetically: setting("tags_sort_alphabetically"),
-  shouldHide: computed("showFilterByTag", "content.[]", function () {
-    if (this.showFilterByTag && !isEmpty(this.content)) {
-      return false;
+  maxTagsInFilterList: setting("max_tags_in_filter_list"),
+  shouldShowMoreTags: computed(
+    "maxTagsInFilterList",
+    "topTags.[]",
+    function () {
+      return this.topTags.length > this.maxTagsInFilterList;
     }
-
-    return true;
-  }),
+  ),
 
   selectKitOptions: {
     allowAny: false,
@@ -46,6 +45,26 @@ export default ComboBoxComponent.extend(TagsMixin, {
 
   filterable: gte("content.length", 15),
 
+  init() {
+    this._super(...arguments);
+
+    this.insertAfterCollection(MAIN_COLLECTION, MORE_TAGS_COLLECTION);
+  },
+
+  modifyComponentForCollection(collection) {
+    if (collection === MORE_TAGS_COLLECTION) {
+      return "tag-drop/more-tags-collection";
+    }
+  },
+
+  modifyContentForCollection(collection) {
+    if (collection === MORE_TAGS_COLLECTION) {
+      return {
+        shouldShowMoreTags: this.shouldShowMoreTags,
+      };
+    }
+  },
+
   modifyNoSelection() {
     if (this.noTagsSelected) {
       return this.defaultItem(NO_TAG_ID, this.noTagsLabel);
@@ -70,32 +89,14 @@ export default ComboBoxComponent.extend(TagsMixin, {
     return this.tagId ? `tag-${this.tagId}` : "tag_all";
   }),
 
-  currentCategoryUrl: readOnly("currentCategory.url"),
-
-  allTagsUrl: computed("firstCategory", "secondCategory", function () {
-    if (this.currentCategory) {
-      return getURL(`${this.currentCategoryUrl}?allTags=1`);
-    } else {
-      return getURL("/");
-    }
-  }),
-
-  noTagsUrl: computed("firstCategory", "secondCategory", function () {
-    let url;
-    if (this.currentCategory) {
-      url = `/tags/c/${Category.slugFor(this.currentCategory)}/${
-        this.currentCategory.id
-      }`;
-    } else {
-      url = "/tag";
-    }
-    return getURL(`${url}/${NONE_TAG_ID}`);
-  }),
-
   allTagsLabel: i18n("tagging.selector_all_tags"),
 
   noTagsLabel: i18n("tagging.selector_no_tags"),
 
+  modifyComponentForRow() {
+    return "tag-row";
+  },
+
   shortcuts: computed("tagId", function () {
     const shortcuts = [];
 
@@ -114,24 +115,24 @@ export default ComboBoxComponent.extend(TagsMixin, {
   }),
 
   topTags: computed(
-    "firstCategory",
-    "secondCategory",
+    "currentCategory",
     "site.category_top_tags.[]",
     "site.top_tags.[]",
     function () {
       if (this.currentCategory && this.site.category_top_tags) {
-        return this.site.category_top_tags;
+        return this.site.category_top_tags || [];
       }
 
-      return this.site.top_tags;
+      return this.site.top_tags || [];
     }
   ),
 
   content: computed("topTags.[]", "shortcuts.[]", function () {
-    if (this.sortTagsAlphabetically && this.topTags) {
-      return this.shortcuts.concat(this.topTags.sort());
+    const topTags = this.topTags.slice(0, this.maxTagsInFilterList);
+    if (this.sortTagsAlphabetically && topTags) {
+      return this.shortcuts.concat(topTags.sort());
     } else {
-      return this.shortcuts.concat(makeArray(this.topTags));
+      return this.shortcuts.concat(makeArray(topTags));
     }
   }),
 
@@ -167,32 +168,17 @@ export default ComboBoxComponent.extend(TagsMixin, {
 
   actions: {
     onChange(tagId, tag) {
-      let url;
-
-      switch (tagId) {
-        case ALL_TAGS_ID:
-          url = this.allTagsUrl;
-          break;
-        case NO_TAG_ID:
-          url = this.noTagsUrl;
-          break;
-        default:
-          if (this.currentCategory) {
-            url = `/tags/c/${Category.slugFor(this.currentCategory)}/${
-              this.currentCategory.id
-            }`;
-          } else {
-            url = "/tag";
-          }
-
-          if (tag && tag.targetTagId) {
-            url += `/${tag.targetTagId.toLowerCase()}`;
-          } else {
-            url += `/${tagId.toLowerCase()}`;
-          }
+      if (tagId === NO_TAG_ID) {
+        tagId = NONE_TAG_ID;
+      } else if (tagId === ALL_TAGS_ID) {
+        tagId = null;
+      } else if (tag && tag.targetTagId) {
+        tagId = tag.targetTagId;
       }
 
-      DiscourseURL.routeTo(getURL(url));
+      DiscourseURL.routeToUrl(
+        getCategoryAndTagUrl(this.currentCategory, !this.noSubcategories, tagId)
+      );
     },
   },
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-drop/more-tags-collection.js b/app/assets/javascripts/select-kit/addon/components/tag-drop/more-tags-collection.js
new file mode 100644
index 0000000000..af0865396b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/tag-drop/more-tags-collection.js
@@ -0,0 +1,10 @@
+import Component from "@ember/component";
+import layout from "select-kit/templates/components/tag-drop/more-tags-collection";
+
+export default Component.extend({
+  tagName: "",
+
+  layout,
+
+  collection: null,
+});
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-group-chooser.js b/app/assets/javascripts/select-kit/addon/components/tag-group-chooser.js
index 17676a20e6..5abf91625a 100644
--- a/app/assets/javascripts/select-kit/addon/components/tag-group-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/tag-group-chooser.js
@@ -1,7 +1,7 @@
 import MultiSelectComponent from "select-kit/components/multi-select";
 import TagsMixin from "select-kit/mixins/tags";
-import { makeArray } from "discourse-common/lib/helpers";
 import { computed } from "@ember/object";
+import { makeArray } from "discourse-common/lib/helpers";
 
 export default MultiSelectComponent.extend(TagsMixin, {
   pluginApiIdentifiers: ["tag-group-chooser"],
@@ -55,9 +55,9 @@ export default MultiSelectComponent.extend(TagsMixin, {
 
   _transformJson(context, json) {
     return json.results
-      .sort((a, b) => a.id > b.id)
+      .sort((a, b) => a.name > b.name)
       .map((result) => {
-        return { id: result.text, name: result.text, count: result.count };
+        return { id: result.name, name: result.name, count: result.count };
       });
   },
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/tags-intersection-chooser.js b/app/assets/javascripts/select-kit/addon/components/tags-intersection-chooser.js
new file mode 100644
index 0000000000..78718bd244
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/tags-intersection-chooser.js
@@ -0,0 +1,43 @@
+import DiscourseURL from "discourse/lib/url";
+import MiniTagChooser from "select-kit/components/mini-tag-chooser";
+import { makeArray } from "discourse-common/lib/helpers";
+import { action } from "@ember/object";
+
+export default MiniTagChooser.extend({
+  pluginApiIdentifiers: ["tags-intersection-chooser"],
+  attributeBindings: ["selectKit.options.categoryId:category-id"],
+  classNames: ["tags-intersection-chooser"],
+
+  mainTag: null,
+  additionalTags: null,
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+
+    this.set(
+      "value",
+      makeArray(this.mainTag).concat(makeArray(this.additionalTags))
+    );
+  },
+
+  @action
+  onChange(tags) {
+    if (tags.includes(this.mainTag)) {
+      const remainingTags = tags.filter((t) => t !== this.mainTag);
+
+      if (remainingTags.length >= 1) {
+        DiscourseURL.routeTo(
+          `/tags/intersection/${this.mainTag}/${remainingTags.join("/")}`
+        );
+      } else {
+        DiscourseURL.routeTo("/tags");
+      }
+    } else {
+      if (tags.length >= 2) {
+        DiscourseURL.routeTo(`/tags/intersection/${tags.join("/")}`);
+      } else {
+        DiscourseURL.routeTo("/tags");
+      }
+    }
+  },
+});
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 812166a29e..ce8cb476a9 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,5 +1,5 @@
-import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
 
 export default DropdownSelectBoxComponent.extend({
   pluginApiIdentifiers: ["toolbar-popup-menu-options"],
@@ -9,6 +9,7 @@ export default DropdownSelectBoxComponent.extend({
     showFullTitle: false,
     filterable: false,
     autoFilterable: false,
+    preventHeaderFocus: true,
   },
 
   modifyContent(contents) {
diff --git a/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js b/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
index dd7ada4144..6eb4194225 100644
--- a/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
+++ b/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
@@ -1,5 +1,10 @@
-import Component from "@ember/component";
 import { action, computed } from "@ember/object";
+import I18n from "I18n";
+import { isEmpty } from "@ember/utils";
+import { NotificationLevels } from "discourse/lib/notification-levels";
+import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
+import Component from "@ember/component";
 import layout from "select-kit/templates/components/topic-notifications-button";
 
 export default Component.extend({
@@ -25,4 +30,85 @@ export default Component.extend({
         .finally(() => this.set("isLoading", false));
     }
   },
+
+  @discourseComputed("topic", "topic.details")
+  notificationReasonText(topic, topicDetails) {
+    let level = topicDetails.notification_level;
+    let reason = topicDetails.notifications_reason_id;
+
+    if (typeof level !== "number") {
+      level = 1;
+    }
+
+    let localeString = `topic.notifications.reasons.${level}`;
+    if (typeof reason === "number") {
+      let localeStringWithReason = localeString + "_" + reason;
+
+      if (
+        this._notificationReasonStale(level, reason, topic, this.currentUser)
+      ) {
+        localeStringWithReason += "_stale";
+      }
+
+      // some sane protection for missing translations of edge cases
+      if (I18n.lookup(localeStringWithReason, { locale: "en" })) {
+        localeString = localeStringWithReason;
+      }
+    }
+
+    if (
+      this.currentUser &&
+      this.currentUser.mailing_list_mode &&
+      level > NotificationLevels.MUTED
+    ) {
+      return I18n.t("topic.notifications.reasons.mailing_list_mode");
+    } else {
+      return I18n.t(localeString, {
+        username: this.currentUser && this.currentUser.username_lower,
+        basePath: getURL(""),
+      });
+    }
+  },
+
+  // The user may have changed their category or tag tracking settings
+  // since this topic was tracked/watched based on those settings in the
+  // past. In that case we need to alter the reason message we show them
+  // otherwise it is very confusing for the end user to be told they are
+  // tracking a topic because of a category, when they are no longer tracking
+  // that category.
+  _notificationReasonStale(level, reason, topic, currentUser) {
+    if (!currentUser) {
+      return;
+    }
+
+    let categoryId = topic.category_id;
+    let tags = topic.tags;
+    let watchedCategoryIds = currentUser.watched_category_ids || [];
+    let trackedCategoryIds = currentUser.tracked_category_ids || [];
+    let watchedTags = currentUser.watched_tags || [];
+
+    // 2_8 tracking category
+    if (categoryId) {
+      if (level === 2 && reason === 8) {
+        if (!trackedCategoryIds.includes(categoryId)) {
+          return true;
+        }
+
+        // 3_6 watching category
+      } else if (level === 3 && reason === 6) {
+        if (!watchedCategoryIds.includes(categoryId)) {
+          return true;
+        }
+      }
+    } else if (!isEmpty(tags)) {
+      // 3_10 watching tag
+      if (level === 3 && reason === 10) {
+        if (!tags.some((tag) => watchedTags.includes(tag))) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  },
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/topic-notifications-options.js b/app/assets/javascripts/select-kit/addon/components/topic-notifications-options.js
index 163ea1030b..c261108a97 100644
--- a/app/assets/javascripts/select-kit/addon/components/topic-notifications-options.js
+++ b/app/assets/javascripts/select-kit/addon/components/topic-notifications-options.js
@@ -1,6 +1,6 @@
 import NotificationsButtonComponent from "select-kit/components/notifications-button";
-import { topicLevels } from "discourse/lib/notification-levels";
 import { computed } from "@ember/object";
+import { topicLevels } from "discourse/lib/notification-levels";
 
 export default NotificationsButtonComponent.extend({
   pluginApiIdentifiers: ["topic-notifications-options"],
@@ -13,8 +13,6 @@ export default NotificationsButtonComponent.extend({
     showCaret: true,
   },
 
-  i18nPrefix: "topic.notifications",
-
   i18nPostfix: computed("topic.archetype", function () {
     return this.topic.archetype === "private_message" ? "_pm" : "";
   }),
diff --git a/app/assets/javascripts/select-kit/addon/components/user-chooser.js b/app/assets/javascripts/select-kit/addon/components/user-chooser.js
index 102556ae83..84813221a2 100644
--- a/app/assets/javascripts/select-kit/addon/components/user-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/user-chooser.js
@@ -1,9 +1,9 @@
+import userSearch, {
+  eagerCompleteSearch,
+  skipSearch,
+} from "discourse/lib/user-search";
 import MultiSelectComponent from "select-kit/components/multi-select";
 import { computed } from "@ember/object";
-import userSearch, {
-  skipSearch,
-  eagerCompleteSearch,
-} from "discourse/lib/user-search";
 import { makeArray } from "discourse-common/lib/helpers";
 
 export default MultiSelectComponent.extend({
@@ -24,6 +24,7 @@ export default MultiSelectComponent.extend({
     includeMessageableGroups: false,
     allowEmails: false,
     groupMembersOf: undefined,
+    excludeCurrentUser: false,
   },
 
   content: computed("value.[]", function () {
@@ -50,6 +51,7 @@ export default MultiSelectComponent.extend({
 
   search(filter = "") {
     filter = filter || "";
+    filter = filter.replace(/^@/, "");
     const options = this.selectKit.options;
 
     // prevents doing ajax request for nothing
diff --git a/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js b/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
index 04ac5944a6..6287fc63cf 100644
--- a/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
+++ b/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
@@ -1,14 +1,15 @@
-import I18n from "I18n";
 import DropdownSelectBox from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
+import { computed } from "@ember/object";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
-import { computed } from "@ember/object";
 
 export default DropdownSelectBox.extend({
   classNames: ["user-notifications", "user-notifications-dropdown"],
 
   selectKitOptions: {
     headerIcon: "userNotificationicon",
+    showCaret: true,
   },
 
   userNotificationicon: computed("mainCollection.[]", "value", function () {
diff --git a/app/assets/javascripts/select-kit/addon/mixins/tags.js b/app/assets/javascripts/select-kit/addon/mixins/tags.js
index 180ee41410..b9240bd3f5 100644
--- a/app/assets/javascripts/select-kit/addon/mixins/tags.js
+++ b/app/assets/javascripts/select-kit/addon/mixins/tags.js
@@ -1,11 +1,11 @@
-import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
-import { reads } from "@ember/object/computed";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import Mixin from "@ember/object/mixin";
-import { makeArray } from "discourse-common/lib/helpers";
+import { ajax } from "discourse/lib/ajax";
+import getURL from "discourse-common/lib/get-url";
 import { isEmpty } from "@ember/utils";
+import { makeArray } from "discourse-common/lib/helpers";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { reads } from "@ember/object/computed";
 
 export default Mixin.create({
   searchTags(url, data, callback) {
diff --git a/app/assets/javascripts/select-kit/addon/mixins/utils.js b/app/assets/javascripts/select-kit/addon/mixins/utils.js
index bd0e4080bf..cb1c4244bc 100644
--- a/app/assets/javascripts/select-kit/addon/mixins/utils.js
+++ b/app/assets/javascripts/select-kit/addon/mixins/utils.js
@@ -57,18 +57,26 @@ export default Mixin.create({
   },
 
   findValue(content, item) {
-    const property = get(this.selectKit, "valueProperty");
+    return this._findInContent(content, item, "valueProperty", "getValue");
+  },
+
+  findName(content, item) {
+    return this._findInContent(content, item, "nameProperty", "getName");
+  },
+
+  _findInContent(content, item, type, getter) {
+    const property = get(this.selectKit, type);
 
     if (!property) {
       if (content.indexOf(item) > -1) {
         return item;
       }
     } else if (typeof property === "string") {
-      return content.findBy(property, this.getValue(item));
+      return content.findBy(property, this[getter](item));
     } else {
-      const value = this.getValue(item);
+      const name = this[getter](item);
       return content.find((contentItem) => {
-        return this.getValue(contentItem) === value;
+        return this[getter](contentItem) === name;
       });
     }
   },
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
index 5213bceac9..59504133b9 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
@@ -11,6 +11,7 @@
     class="btn-clear"
     icon="times"
     action=selectKit.onClearSelection
+    ariaLabel="clear_input"
   }}
 {{/if}}
 
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-header.hbs
new file mode 100644
index 0000000000..6225633023
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-header.hbs
@@ -0,0 +1,23 @@
+<div class="choices">
+  {{#each shownItems as |item|}}
+    {{component selectKit.options.selectedNameComponent
+      tabindex=tabindex
+      item=item
+      selectKit=selectKit
+    }}
+  {{/each}}
+  {{#if hasHiddenItems}}
+    <div class="x-more-item" data-hidden-count={{hiddenItemsCount}}>
+      {{i18n "x_more" count=hiddenItemsCount}}
+    </div>
+  {{/if}}
+
+  {{#unless hasReachedMaximumSelection}}
+    <div class="choice input-wrapper">
+      {{component selectKit.options.filterComponent
+        selectKit=selectKit
+        id=(concat selectKit.uniqueID "-filter")
+      }}
+    </div>
+  {{/unless}}
+</div>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-row.hbs
new file mode 100644
index 0000000000..4169de194c
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-row.hbs
@@ -0,0 +1,12 @@
+{{#if item.isUser}}
+  {{avatar item imageSize="tiny"}}
+  <span class="identifier">{{format-username item.id}}</span>
+  <span class="name">{{item.name}}</span>
+{{else if item.isGroup}}
+  {{d-icon "users"}}
+  <span class="identifier">{{item.id}}</span>
+  <span class="name">{{item.full_name}}</span>
+{{else}}
+  {{d-icon "envelope"}}
+  <span class="identifier">{{item.id}}</span>
+{{/if}}
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 5c7b93adf0..8672c07bec 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
@@ -4,9 +4,10 @@
     value=value
     selectedContent=selectedContent
     selectKit=selectKit
+    id=(concat selectKit.uniqueID "-header")
   }}
 
-  {{#select-kit/select-kit-body selectKit=selectKit}}
+  {{#select-kit/select-kit-body selectKit=selectKit id=(concat selectKit.uniqueID "-body")}}
     {{#if selectKit.isLoading}}
       <span class="is-loading">
         {{loading-spinner size="small"}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
index 67b7191840..0b3792d56b 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
@@ -11,6 +11,7 @@
     <div class="choice input-wrapper">
       {{component selectKit.options.filterComponent
         selectKit=selectKit
+        id=(concat selectKit.uniqueID "-filter")
       }}
     </div>
   {{/unless}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
index 30965ec78e..9927703f52 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
@@ -3,13 +3,16 @@
     tabindex=-1
     class="filter-input"
     placeholder=placeholder
-    autocomplete="off"
+    autocomplete="discourse"
     autocorrect="off"
     autocapitalize="off"
+    autofocus=selectKit.options.autofocus
     spellcheck=false
     value=(readonly selectKit.filter)
     input=(action "onInput")
+    paste=(action "onPaste")
     keyDown=(action "onKeydown")
+    keyUp=(action "onKeyup")
   }}
 
   {{#if selectKit.options.filterIcon}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs b/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
index 7fb7650bf1..5a6ffd0466 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
@@ -1,5 +1,5 @@
 {{#if selectKit.options.showFullTitle}}
-  <div {{action "onSelectedNameClick"}} tabindex="0" title={{title}} data-value={{value}} data-name={{name}} class="select-kit-selected-name selected-name choice">
+  <div tabindex="0" role="button" lang={{lang}} {{action "onSelectedNameClick"}} title={{title}} data-value={{value}} data-name={{name}} class="select-kit-selected-name selected-name choice">
     {{#if item.icon}}
       {{d-icon item.icon}}
     {{/if}}
@@ -17,13 +17,14 @@
           icon="times"
           action=selectKit.deselect
           actionParam=item
+          ariaLabel="clear_input"
         }}
       {{/if}}
     {{/if}}
   </div>
 {{else}}
   {{#if item.icon}}
-    <div tabindex="0" class="select-kit-selected-name selected-name choice">
+    <div role="textbox" lang={{lang}} class="select-kit-selected-name selected-name choice">
       {{d-icon item.icon}}
     </div>
   {{/if}}
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 7fac16c9f5..78f88ef5da 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
@@ -4,10 +4,11 @@
     value=value
     selectedContent=selectedContent
     selectKit=selectKit
+    id=(concat selectKit.uniqueID "-header")
   }}
 
-  {{#select-kit/select-kit-body selectKit=selectKit}}
-    {{component selectKit.options.filterComponent selectKit=selectKit}}
+  {{#select-kit/select-kit-body selectKit=selectKit id=(concat selectKit.uniqueID "-body")}}
+    {{component selectKit.options.filterComponent selectKit=selectKit id=(concat selectKit.uniqueID "-filter")}}
 
     {{#if selectKit.isLoading}}
       <span class="is-loading">
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/more-tags-collection.hbs b/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/more-tags-collection.hbs
new file mode 100644
index 0000000000..fe381b427b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/more-tags-collection.hbs
@@ -0,0 +1,5 @@
+{{#if collection.content.shouldShowMoreTags}}
+  <div class="more-tags">
+    {{i18n "select_kit.components.tag_drop.filter_for_more"}}
+  </div>
+{{/if}}
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
index c64cf9dbf2..30b71a5fd1 100644
--- 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
@@ -11,7 +11,7 @@
         showCaret=showCaret
       )
     }}
-    <span class="text">{{html-safe topic.details.notificationReasonText}}</span>
+    <span class="text">{{html-safe notificationReasonText}}</span>
   </p>
 {{else}}
   {{topic-notifications-options
diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json
index d41b4c58fa..92bab1d5c0 100644
--- a/app/assets/javascripts/select-kit/package.json
+++ b/app/assets/javascripts/select-kit/package.json
@@ -24,7 +24,7 @@
     "@glimmer/component": "^1.0.0",
     "babel-eslint": "^10.0.3",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.15.2",
+    "ember-cli": "~3.25.3",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-eslint": "^5.1.0",
     "ember-cli-inject-live-reload": "^2.0.1",
diff --git a/app/assets/javascripts/select-kit/yarn.lock b/app/assets/javascripts/select-kit/yarn.lock
deleted file mode 100644
index f319e6fcc2..0000000000
--- a/app/assets/javascripts/select-kit/yarn.lock
+++ /dev/null
@@ -1,10282 +0,0 @@
-# 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"
-
-"@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@^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.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.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:
-  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-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-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.6.0:
-  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.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@^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-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.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-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-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-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:
-  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@^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-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.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:
-  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"
-
-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=
-
-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-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==
-
-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"
-
-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-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-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:
-  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.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"
-
-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:
-  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.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"
-
-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.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==
-
-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:
-  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/service-worker.js.erb b/app/assets/javascripts/service-worker.js.erb
index f264094817..c03affaa17 100644
--- a/app/assets/javascripts/service-worker.js.erb
+++ b/app/assets/javascripts/service-worker.js.erb
@@ -10,18 +10,104 @@ workbox.setConfig({
 var authUrl = "<%= Discourse.base_path %>/auth/";
 
 var cacheVersion = "1";
+var discourseCacheName = "discourse-" + cacheVersion;
+var externalCacheName = "external-" + cacheVersion;
 
 // Cache all GET requests, so Discourse can be used while offline
+
 workbox.routing.registerRoute(
   function(args) {
-    return !(args.url.origin === location.origin && args.url.pathname.startsWith(authUrl));
+    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,
+    cacheName: discourseCacheName,
     plugins: [
+      new workbox.cacheableResponse.Plugin({
+        statuses: [200] // opaque responses will return status code '0'
+      }), // for s3 secure media signed urls
       new workbox.expiration.Plugin({
         maxAgeSeconds: 7* 24 * 60 * 60, // 7 days
-        maxEntries: 500,
+        maxEntries: 250,
+        purgeOnQuotaError: true, // safe to automatically delete if exceeding the available storage
+      }),
+    ],
+  })
+);
+
+var cdnUrls = [];
+
+<% if GlobalSetting.try(:cdn_cors_enabled) %>
+cdnUrls = ["<%= "#{GlobalSetting.s3_cdn_url}" %>", "<%= "#{GlobalSetting.cdn_url}" %>"].filter(Boolean);
+
+if (cdnUrls.length > 0) {
+  var cdnCacheName = "cdn-" + cacheVersion;
+  var cdnUrl = "<%= "#{GlobalSetting.cdn_url}" %>";
+
+  var appendQueryStringPlugin = {
+    requestWillFetch: function (args) {
+      var request = args.request;
+
+      if (request.url.startsWith(cdnUrl)) {
+        var url = new URL(request.url);
+        // Using this temporary query param to force browsers to redownload images from server.
+        url.searchParams.append('refresh', 'true');
+        return new Request(url.href, request);
+      }
+
+      return request;
+    }
+  };
+
+  workbox.routing.registerRoute(
+    function(args) {
+      var matching = cdnUrls.filter(
+        function(url) {
+          return args.url.href.startsWith(url);
+        }
+      );
+      return matching.length > 0;
+    }, // Match all cdn resources
+    new workbox.strategies.NetworkFirst({ // This will only use the cache when a network request fails
+      cacheName: cdnCacheName,
+      fetchOptions: {
+        mode: 'cors',
+        credentials: 'omit'
+      },
+      plugins: [
+        new workbox.expiration.Plugin({
+          maxAgeSeconds: 7* 24 * 60 * 60, // 7 days
+          maxEntries: 250,
+          purgeOnQuotaError: true, // safe to automatically delete if exceeding the available storage
+        }),
+        appendQueryStringPlugin
+      ],
+    })
+  );
+}
+<% end %>
+
+workbox.routing.registerRoute(
+  function(args) {
+    if (args.url.origin === location.origin) {
+      return false;
+    }
+
+    var matching = cdnUrls.filter(
+      function(url) {
+        return args.url.href.startsWith(url);
+      }
+    );
+    return matching.length === 0;
+  }, // Match all other external resources
+  new workbox.strategies.NetworkFirst({ // This will only use the cache when a network request fails
+    cacheName: externalCacheName,
+    plugins: [
+      new workbox.cacheableResponse.Plugin({
+        statuses: [200] // opaque responses will return status code '0'
+      }),
+      new workbox.expiration.Plugin({
+        maxAgeSeconds: 7* 24 * 60 * 60, // 7 days
+        maxEntries: 250,
         purgeOnQuotaError: true, // safe to automatically delete if exceeding the available storage
       }),
     ],
@@ -100,7 +186,35 @@ self.addEventListener('notificationclick', function(event) {
 self.addEventListener('message', function(event) {
   if('lastAction' in event.data){
     lastAction = event.data.lastAction;
-  }});
+  }
+});
+
+self.addEventListener('pushsubscriptionchange', function(event) {
+  event.waitUntil(
+    Promise.all(
+      fetch('<%= Discourse.base_url %>/push_notifications/subscribe', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' },
+        body: new URLSearchParams({
+          "subscription[endpoint]": event.newSubscription.endpoint,
+          "subscription[keys][auth]": event.newSubscription.toJSON().keys.auth,
+          "subscription[keys][p256dh]": event.newSubscription.toJSON().keys.p256dh,
+          "send_confirmation": false
+        })
+      }),
+      fetch('<%= Discourse.base_url %>/push_notifications/unsubscribe', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' },
+        body: new URLSearchParams({
+          "subscription[endpoint]": event.oldSubscription.endpoint,
+          "subscription[keys][auth]": event.oldSubscription.toJSON().keys.auth,
+          "subscription[keys][p256dh]": event.oldSubscription.toJSON().keys.p256dh
+        })
+      })
+    )
+  );
+});
+
 <% DiscoursePluginRegistry.service_workers.each do |js| %>
 <%=raw "#{File.read(js)}" %>
 <% end %>
diff --git a/app/assets/javascripts/test-shims.js b/app/assets/javascripts/test-shims.js
index f7beba796d..cd109de726 100644
--- a/app/assets/javascripts/test-shims.js
+++ b/app/assets/javascripts/test-shims.js
@@ -46,12 +46,15 @@ define("@ember/test-helpers", () => {
     "currentRouteName",
     "fillIn",
     "setResolver",
+    "triggerEvent",
   ].forEach((attr) => {
     helpers[attr] = function () {
       return window[attr](...arguments);
     };
   });
-  helpers.triggerKeyEvent = window.keyEvent;
+  helpers.triggerKeyEvent = function () {
+    return window.keyEvent(...arguments);
+  };
   return helpers;
 });
 define("pretender", () => {
diff --git a/app/assets/javascripts/truth-helpers/addon/.gitkeep b/app/assets/javascripts/truth-helpers/addon/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/and.js b/app/assets/javascripts/truth-helpers/addon/helpers/and.js
new file mode 100644
index 0000000000..07db1927c4
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/and.js
@@ -0,0 +1,13 @@
+import Helper from "@ember/component/helper";
+import truthConvert from "../utils/truth-convert";
+
+export function and(params) {
+  for (let i = 0, len = params.length; i < len; i++) {
+    if (truthConvert(params[i]) === false) {
+      return params[i];
+    }
+  }
+  return params[params.length - 1];
+}
+
+export default Helper.helper(and);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/eq.js b/app/assets/javascripts/truth-helpers/addon/helpers/eq.js
new file mode 100644
index 0000000000..45d03595b1
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/eq.js
@@ -0,0 +1,7 @@
+import Helper from "@ember/component/helper";
+
+export function eq(params) {
+  return params[0] === params[1];
+}
+
+export default Helper.helper(eq);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/gt.js b/app/assets/javascripts/truth-helpers/addon/helpers/gt.js
new file mode 100644
index 0000000000..c90fc98364
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/gt.js
@@ -0,0 +1,15 @@
+import Helper from "@ember/component/helper";
+
+export function gt([left, right], hash) {
+  if (hash.forceNumber) {
+    if (typeof left !== "number") {
+      left = Number(left);
+    }
+    if (typeof right !== "number") {
+      right = Number(right);
+    }
+  }
+  return left > right;
+}
+
+export default Helper.helper(gt);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/gte.js b/app/assets/javascripts/truth-helpers/addon/helpers/gte.js
new file mode 100644
index 0000000000..e364dc39cd
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/gte.js
@@ -0,0 +1,15 @@
+import Helper from "@ember/component/helper";
+
+export function gte([left, right], hash) {
+  if (hash.forceNumber) {
+    if (typeof left !== "number") {
+      left = Number(left);
+    }
+    if (typeof right !== "number") {
+      right = Number(right);
+    }
+  }
+  return left >= right;
+}
+
+export default Helper.helper(gte);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/lt.js b/app/assets/javascripts/truth-helpers/addon/helpers/lt.js
new file mode 100644
index 0000000000..0546f796e4
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/lt.js
@@ -0,0 +1,15 @@
+import Helper from "@ember/component/helper";
+
+export function lt([left, right], hash) {
+  if (hash.forceNumber) {
+    if (typeof left !== "number") {
+      left = Number(left);
+    }
+    if (typeof right !== "number") {
+      right = Number(right);
+    }
+  }
+  return left < right;
+}
+
+export default Helper.helper(lt);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/lte.js b/app/assets/javascripts/truth-helpers/addon/helpers/lte.js
new file mode 100644
index 0000000000..375a15e839
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/lte.js
@@ -0,0 +1,15 @@
+import Helper from "@ember/component/helper";
+
+export function lte([left, right], hash) {
+  if (hash.forceNumber) {
+    if (typeof left !== "number") {
+      left = Number(left);
+    }
+    if (typeof right !== "number") {
+      right = Number(right);
+    }
+  }
+  return left <= right;
+}
+
+export default Helper.helper(lte);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/not-eq.js b/app/assets/javascripts/truth-helpers/addon/helpers/not-eq.js
new file mode 100644
index 0000000000..8971d1bcd0
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/not-eq.js
@@ -0,0 +1,7 @@
+import Helper from "@ember/component/helper";
+
+export function notEqualHelper(params) {
+  return params[0] !== params[1];
+}
+
+export default Helper.helper(notEqualHelper);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/not.js b/app/assets/javascripts/truth-helpers/addon/helpers/not.js
new file mode 100644
index 0000000000..8b7942e76d
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/not.js
@@ -0,0 +1,13 @@
+import Helper from "@ember/component/helper";
+import truthConvert from "../utils/truth-convert";
+
+export function not(params) {
+  for (let i = 0, len = params.length; i < len; i++) {
+    if (truthConvert(params[i]) === true) {
+      return false;
+    }
+  }
+  return true;
+}
+
+export default Helper.helper(not);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/or.js b/app/assets/javascripts/truth-helpers/addon/helpers/or.js
new file mode 100644
index 0000000000..f0e95747bd
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/or.js
@@ -0,0 +1,13 @@
+import Helper from "@ember/component/helper";
+import truthConvert from "../utils/truth-convert";
+
+export function or(params) {
+  for (let i = 0, len = params.length; i < len; i++) {
+    if (truthConvert(params[i]) === true) {
+      return params[i];
+    }
+  }
+  return params[params.length - 1];
+}
+
+export default Helper.helper(or);
diff --git a/app/assets/javascripts/truth-helpers/addon/utils/truth-convert.js b/app/assets/javascripts/truth-helpers/addon/utils/truth-convert.js
new file mode 100644
index 0000000000..881ce6454c
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/addon/utils/truth-convert.js
@@ -0,0 +1,15 @@
+import { isArray } from "@ember/array";
+import { get } from "@ember/object";
+
+export default function truthConvert(result) {
+  const truthy = result && get(result, "isTruthy");
+  if (typeof truthy === "boolean") {
+    return truthy;
+  }
+
+  if (isArray(result)) {
+    return get(result, "length") !== 0;
+  } else {
+    return !!result;
+  }
+}
diff --git a/app/assets/javascripts/truth-helpers/app/.gitkeep b/app/assets/javascripts/truth-helpers/app/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/truth-helpers/config/ember-try.js b/app/assets/javascripts/truth-helpers/config/ember-try.js
new file mode 100644
index 0000000000..454a1cef3e
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/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/truth-helpers/config/environment.js b/app/assets/javascripts/truth-helpers/config/environment.js
new file mode 100644
index 0000000000..b7238585e6
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/config/environment.js
@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = function (/* environment, appConfig */) {
+  return {};
+};
diff --git a/app/assets/javascripts/truth-helpers/ember-cli-build.js b/app/assets/javascripts/truth-helpers/ember-cli-build.js
new file mode 100644
index 0000000000..81a8a5e9aa
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/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/truth-helpers/index.js b/app/assets/javascripts/truth-helpers/index.js
new file mode 100644
index 0000000000..28c7dca628
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/index.js
@@ -0,0 +1,9 @@
+"use strict";
+
+module.exports = {
+  name: require("./package").name,
+  options: {},
+  isDevelopingAddon() {
+    return true;
+  },
+};
diff --git a/app/assets/javascripts/truth-helpers/package.json b/app/assets/javascripts/truth-helpers/package.json
new file mode 100644
index 0000000000..23dbcb94ea
--- /dev/null
+++ b/app/assets/javascripts/truth-helpers/package.json
@@ -0,0 +1,52 @@
+{
+  "name": "truth-helpers",
+  "version": "1.0.0",
+  "description": "Partial copy of ember truth helpers",
+  "author": "Discourse",
+  "license": "GPL-2.0-only",
+  "keywords": [
+    "ember-addon"
+  ],
+  "repository": "",
+  "scripts": {
+    "build": "ember build",
+    "lint:hbs": "ember-template-lint .",
+    "lint:js": "eslint .",
+    "start": "ember serve"
+  },
+  "dependencies": {
+    "ember-auto-import": "^1.5.3",
+    "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-cli": "~3.25.3",
+    "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/vendor.js b/app/assets/javascripts/vendor.js
index 6ab4a12dca..d001928faa 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -9,7 +9,6 @@
 //= require popper.js
 //= require bootstrap-modal.js
 //= require caret_position
-//= require jquery.ba-resize.js
 //= require jquery.color.js
 //= require jquery.fileupload.js
 //= require jquery.iframe-transport.js
diff --git a/app/assets/javascripts/wizard-application.js b/app/assets/javascripts/wizard-application.js
index 1c7b5c4d53..3c91a3ddef 100644
--- a/app/assets/javascripts/wizard-application.js
+++ b/app/assets/javascripts/wizard-application.js
@@ -1,3 +1,4 @@
+//= require_tree ./truth-helpers/addon
 //= require_tree ./discourse-common/addon
 //= require_tree ./select-kit/addon
 //= require wizard/router
diff --git a/app/assets/javascripts/wizard/components/font-preview.js b/app/assets/javascripts/wizard/components/font-preview.js
index df6d9ef0e9..ef2f73f216 100644
--- a/app/assets/javascripts/wizard/components/font-preview.js
+++ b/app/assets/javascripts/wizard/components/font-preview.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
-import { observes } from "discourse-common/utils/decorators";
 import {
+  chooseDarker,
   createPreviewComponent,
   darkLightDiff,
-  chooseDarker,
 } from "wizard/lib/preview";
+import I18n from "I18n";
+import { observes } from "discourse-common/utils/decorators";
 
 const LOREM = `
 Lorem ipsum dolor sit amet, consectetur adipiscing.
diff --git a/app/assets/javascripts/wizard/components/homepage-preview.js b/app/assets/javascripts/wizard/components/homepage-preview.js
index 8848ebd317..0e61f60f3a 100644
--- a/app/assets/javascripts/wizard/components/homepage-preview.js
+++ b/app/assets/javascripts/wizard/components/homepage-preview.js
@@ -1,9 +1,9 @@
-import { observes } from "discourse-common/utils/decorators";
 import {
-  createPreviewComponent,
   LOREM,
+  createPreviewComponent,
   darkLightDiff,
 } from "wizard/lib/preview";
+import { observes } from "discourse-common/utils/decorators";
 
 export default createPreviewComponent(659, 320, {
   logo: null,
diff --git a/app/assets/javascripts/wizard/components/image-preview-favicon.js b/app/assets/javascripts/wizard/components/image-preview-favicon.js
index 82b0e95cee..12a47e7ed6 100644
--- a/app/assets/javascripts/wizard/components/image-preview-favicon.js
+++ b/app/assets/javascripts/wizard/components/image-preview-favicon.js
@@ -1,5 +1,5 @@
-import { observes } from "discourse-common/utils/decorators";
 import { createPreviewComponent } from "wizard/lib/preview";
+import { observes } from "discourse-common/utils/decorators";
 
 export default createPreviewComponent(371, 124, {
   tab: null,
diff --git a/app/assets/javascripts/wizard/components/image-preview-large-icon.js b/app/assets/javascripts/wizard/components/image-preview-large-icon.js
index 0d7c86a7d6..25ff537125 100644
--- a/app/assets/javascripts/wizard/components/image-preview-large-icon.js
+++ b/app/assets/javascripts/wizard/components/image-preview-large-icon.js
@@ -1,5 +1,5 @@
-import { observes } from "discourse-common/utils/decorators";
 import { createPreviewComponent } from "wizard/lib/preview";
+import { observes } from "discourse-common/utils/decorators";
 
 export default createPreviewComponent(325, 125, {
   ios: null,
diff --git a/app/assets/javascripts/wizard/components/image-preview-logo-small.js b/app/assets/javascripts/wizard/components/image-preview-logo-small.js
index ba55380d15..cc692e2aa8 100644
--- a/app/assets/javascripts/wizard/components/image-preview-logo-small.js
+++ b/app/assets/javascripts/wizard/components/image-preview-logo-small.js
@@ -1,5 +1,5 @@
+import { LOREM, createPreviewComponent, drawHeader } from "wizard/lib/preview";
 import { observes } from "discourse-common/utils/decorators";
-import { createPreviewComponent, drawHeader, LOREM } from "wizard/lib/preview";
 
 export default createPreviewComponent(375, 100, {
   image: null,
diff --git a/app/assets/javascripts/wizard/components/image-preview-logo.js b/app/assets/javascripts/wizard/components/image-preview-logo.js
index acad28063a..c48bfa7ba5 100644
--- a/app/assets/javascripts/wizard/components/image-preview-logo.js
+++ b/app/assets/javascripts/wizard/components/image-preview-logo.js
@@ -1,5 +1,5 @@
-import { observes } from "discourse-common/utils/decorators";
 import { createPreviewComponent, drawHeader } from "wizard/lib/preview";
+import { observes } from "discourse-common/utils/decorators";
 
 export default createPreviewComponent(400, 100, {
   image: null,
diff --git a/app/assets/javascripts/wizard/components/invite-list.js b/app/assets/javascripts/wizard/components/invite-list.js
index 115a25c66f..f01f708884 100644
--- a/app/assets/javascripts/wizard/components/invite-list.js
+++ b/app/assets/javascripts/wizard/components/invite-list.js
@@ -1,6 +1,6 @@
+import Component from "@ember/component";
 import I18n from "I18n";
 import { schedule } from "@ember/runloop";
-import Component from "@ember/component";
 
 export default Component.extend({
   classNames: ["invite-list"],
diff --git a/app/assets/javascripts/wizard/components/radio-button.js b/app/assets/javascripts/wizard/components/radio-button.js
index f1a829cfa1..af16d49236 100644
--- a/app/assets/javascripts/wizard/components/radio-button.js
+++ b/app/assets/javascripts/wizard/components/radio-button.js
@@ -1,6 +1,6 @@
-import { next } from "@ember/runloop";
-import Component from "@ember/component";
 import { observes, on } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
+import { next } from "@ember/runloop";
 
 export default Component.extend({
   tagName: "label",
diff --git a/app/assets/javascripts/wizard/components/theme-preview.js b/app/assets/javascripts/wizard/components/theme-preview.js
index 5e72c3ec3c..7ef561db1f 100644
--- a/app/assets/javascripts/wizard/components/theme-preview.js
+++ b/app/assets/javascripts/wizard/components/theme-preview.js
@@ -1,11 +1,11 @@
-import I18n from "I18n";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import {
+  LOREM,
+  chooseDarker,
   createPreviewComponent,
   darkLightDiff,
-  chooseDarker,
-  LOREM,
 } from "wizard/lib/preview";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import I18n from "I18n";
 
 export default createPreviewComponent(305, 165, {
   logo: null,
diff --git a/app/assets/javascripts/wizard/components/wizard-field-image.js b/app/assets/javascripts/wizard/components/wizard-field-image.js
index 6900a2ec3e..783e203e79 100644
--- a/app/assets/javascripts/wizard/components/wizard-field-image.js
+++ b/app/assets/javascripts/wizard/components/wizard-field-image.js
@@ -1,10 +1,10 @@
-import I18n from "I18n";
 import Component from "@ember/component";
-import getUrl from "discourse-common/lib/get-url";
-import discourseComputed from "discourse-common/utils/decorators";
-import { getToken } from "wizard/lib/ajax";
-import { getOwner } from "discourse-common/lib/get-owner";
+import I18n from "I18n";
 import { dasherize } from "@ember/string";
+import discourseComputed from "discourse-common/utils/decorators";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { getToken } from "wizard/lib/ajax";
+import getUrl from "discourse-common/lib/get-url";
 
 export default Component.extend({
   classNames: ["wizard-image-row"],
diff --git a/app/assets/javascripts/wizard/components/wizard-field.js b/app/assets/javascripts/wizard/components/wizard-field.js
index e7af4bcb62..3a39cb46d5 100644
--- a/app/assets/javascripts/wizard/components/wizard-field.js
+++ b/app/assets/javascripts/wizard/components/wizard-field.js
@@ -1,6 +1,6 @@
 import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
 import { dasherize } from "@ember/string";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   classNameBindings: [":wizard-field", "typeClass", "field.invalid"],
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js b/app/assets/javascripts/wizard/components/wizard-step.js
index c71141d2b0..7baf1ea42f 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js
+++ b/app/assets/javascripts/wizard/components/wizard-step.js
@@ -1,9 +1,9 @@
-import I18n from "I18n";
-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";
+import Component from "@ember/component";
+import I18n from "I18n";
+import getUrl from "discourse-common/lib/get-url";
 import { htmlSafe } from "@ember/template";
+import { schedule } from "@ember/runloop";
 
 jQuery.fn.wiggle = function (times, duration) {
   if (times > 0) {
diff --git a/app/assets/javascripts/wizard/controllers/step.js b/app/assets/javascripts/wizard/controllers/step.js
index 60843b60a8..b03f74ed52 100644
--- a/app/assets/javascripts/wizard/controllers/step.js
+++ b/app/assets/javascripts/wizard/controllers/step.js
@@ -1,4 +1,6 @@
+import getUrl from "discourse-common/lib/get-url";
 import Controller from "@ember/controller";
+
 export default Controller.extend({
   wizard: null,
   step: null,
@@ -7,7 +9,12 @@ export default Controller.extend({
     goNext(response) {
       const next = this.get("step.next");
       if (response.refresh_required) {
-        this.send("refresh");
+        if (this.get("step.id") === "locale") {
+          document.location = getUrl(`/wizard/steps/${next}`);
+          return;
+        } else {
+          this.send("refresh");
+        }
       }
       this.transitionToRoute("step", next);
     },
diff --git a/app/assets/javascripts/wizard/lib/ajax.js b/app/assets/javascripts/wizard/lib/ajax.js
index e5c89e6bb2..ec0dd1c5cd 100644
--- a/app/assets/javascripts/wizard/lib/ajax.js
+++ b/app/assets/javascripts/wizard/lib/ajax.js
@@ -1,7 +1,7 @@
-import { run } from "@ember/runloop";
-import getUrl from "discourse-common/lib/get-url";
 import { Promise } from "rsvp";
+import getUrl from "discourse-common/lib/get-url";
 import jQuery from "jquery";
+import { run } from "@ember/runloop";
 
 let token;
 
diff --git a/app/assets/javascripts/wizard/lib/preview.js b/app/assets/javascripts/wizard/lib/preview.js
index fd17028bee..db9553d035 100644
--- a/app/assets/javascripts/wizard/lib/preview.js
+++ b/app/assets/javascripts/wizard/lib/preview.js
@@ -1,8 +1,8 @@
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
+import { Promise } from "rsvp";
 /*eslint no-bitwise:0 */
 import getUrl from "discourse-common/lib/get-url";
-import { Promise } from "rsvp";
+import { scheduleOnce } from "@ember/runloop";
 
 export const LOREM = `
 Lorem ipsum dolor sit amet,
diff --git a/app/assets/javascripts/wizard/models/step.js b/app/assets/javascripts/wizard/models/step.js
index 3c84dbfa00..527789d299 100644
--- a/app/assets/javascripts/wizard/models/step.js
+++ b/app/assets/javascripts/wizard/models/step.js
@@ -1,7 +1,7 @@
 import EmberObject from "@ember/object";
-import discourseComputed from "discourse-common/utils/decorators";
 import ValidState from "wizard/mixins/valid-state";
 import { ajax } from "wizard/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default EmberObject.extend(ValidState, {
   id: null,
diff --git a/app/assets/javascripts/wizard/models/wizard.js b/app/assets/javascripts/wizard/models/wizard.js
index 1d8cbdbd61..b0bb132c39 100644
--- a/app/assets/javascripts/wizard/models/wizard.js
+++ b/app/assets/javascripts/wizard/models/wizard.js
@@ -1,8 +1,8 @@
+import EmberObject from "@ember/object";
 import Step from "wizard/models/step";
 import WizardField from "wizard/models/wizard-field";
 import { ajax } from "wizard/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
-import EmberObject from "@ember/object";
 
 const Wizard = EmberObject.extend({
   @discourseComputed("steps.length")
diff --git a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js
index ef8b3f0aec..7f935e4fb4 100644
--- a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js
+++ b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js
@@ -1,9 +1,9 @@
-import { test, module } from "qunit";
+import { currentRouteName, visit } from "@ember/test-helpers";
+import { module, test } from "qunit";
 import { run } from "@ember/runloop";
 import startApp from "wizard/test/helpers/start-app";
-import { visit, currentRouteName } from "@ember/test-helpers";
 
-var wizard;
+let wizard;
 module("Acceptance: wizard", {
   beforeEach() {
     wizard = startApp();
diff --git a/app/assets/javascripts/wizard/test/components/invite-list-test.js b/app/assets/javascripts/wizard/test/components/invite-list-test.js
index 6489a45271..c3e988b318 100644
--- a/app/assets/javascripts/wizard/test/components/invite-list-test.js
+++ b/app/assets/javascripts/wizard/test/components/invite-list-test.js
@@ -1,5 +1,5 @@
-import { moduleForComponent } from "ember-qunit";
 import { componentTest } from "wizard/test/helpers/component-test";
+import { moduleForComponent } from "ember-qunit";
 
 moduleForComponent("invite-list", { integration: true });
 
diff --git a/app/assets/javascripts/wizard/test/helpers/start-app.js b/app/assets/javascripts/wizard/test/helpers/start-app.js
index 9c6cfe898e..e49d315bb2 100644
--- a/app/assets/javascripts/wizard/test/helpers/start-app.js
+++ b/app/assets/javascripts/wizard/test/helpers/start-app.js
@@ -1,6 +1,6 @@
-import { run } from "@ember/runloop";
 import Wizard from "wizard/wizard";
 import initializer from "wizard/initializers/load-helpers";
+import { run } from "@ember/runloop";
 
 let app;
 let started = false;
diff --git a/app/assets/javascripts/wizard/test/models/wizard-field-test.js b/app/assets/javascripts/wizard/test/models/wizard-field-test.js
index 876ffd8df9..90eda2bb14 100644
--- a/app/assets/javascripts/wizard/test/models/wizard-field-test.js
+++ b/app/assets/javascripts/wizard/test/models/wizard-field-test.js
@@ -1,6 +1,6 @@
+import WizardField from "wizard/models/wizard-field";
 import { moduleFor } from "ember-qunit";
 import { test } from "qunit";
-import WizardField from "wizard/models/wizard-field";
 
 moduleFor("model:wizard-field");
 
diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index 10812eb6bf..9e9d3f99a8 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -5,11 +5,11 @@
 //= require jquery.debug
 //= require ember.debug
 //= require locales/i18n
-//= require locales/en_US
-//= require route-recognizer/dist/route-recognizer
+//= require locales/en
+//= require route-recognizer
 //= require fake_xml_http_request
-//= require pretender/pretender
-//= require qunit/qunit/qunit
+//= require pretender
+//= require qunit
 //= require ember-qunit
 //= require discourse-loader
 //= require jquery.debug
@@ -25,7 +25,7 @@
 //= require test-shims
 
 // Trick JSHint into allow document.write
-var d = document;
+let d = document;
 d.write(
   '<div id="ember-testing-container"><div id="ember-testing"></div></div>'
 );
@@ -40,14 +40,14 @@ if (window.Logster) {
 }
 Ember.Test.adapter = window.QUnitAdapter.create();
 
-var createPretendServer = requirejs(
+let createPretendServer = requirejs(
   "wizard/test/wizard-pretender",
   null,
   null,
   false
 ).default;
 
-var server;
+let server;
 QUnit.testStart(function () {
   server = createPretendServer();
 });
@@ -56,8 +56,8 @@ QUnit.testDone(function () {
   server.shutdown();
 });
 
-var _testApp = requirejs("wizard/test/helpers/start-app").default();
-var _buildResolver = requirejs("discourse-common/resolver").buildResolver;
+let _testApp = requirejs("wizard/test/helpers/start-app").default();
+let _buildResolver = requirejs("discourse-common/resolver").buildResolver;
 window.setResolver(_buildResolver("wizard").create({ namespace: _testApp }));
 
 Object.keys(requirejs.entries).forEach(function (entry) {
diff --git a/app/assets/javascripts/discourse-common/yarn.lock b/app/assets/javascripts/yarn.lock
similarity index 68%
rename from app/assets/javascripts/discourse-common/yarn.lock
rename to app/assets/javascripts/yarn.lock
index 62a195eaf5..8a153a43a4 100644
--- a/app/assets/javascripts/discourse-common/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -2,690 +2,745 @@
 # 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==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
+  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
   dependencies:
-    "@babel/highlight" "^7.8.3"
+    "@babel/highlight" "^7.12.13"
 
-"@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/compat-data@^7.13.11", "@babel/compat-data@^7.13.12", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4"
+  integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==
 
-"@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==
+"@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.3.4":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.15.tgz#a6d40917df027487b54312202a06812c4f7792d0"
+  integrity sha512-6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ==
   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"
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.9"
+    "@babel/helper-compilation-targets" "^7.13.13"
+    "@babel/helper-module-transforms" "^7.13.14"
+    "@babel/helpers" "^7.13.10"
+    "@babel/parser" "^7.13.15"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.15"
+    "@babel/types" "^7.13.14"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
+    gensync "^1.0.0-beta.2"
     json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
+    semver "^6.3.0"
     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==
+"@babel/generator@^7.13.9":
+  version "7.13.9"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
+  integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
   dependencies:
-    "@babel/types" "^7.9.5"
+    "@babel/types" "^7.13.0"
     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==
+"@babel/helper-annotate-as-pure@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
+  integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.13"
 
-"@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==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
+  integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-explode-assignable-expression" "^7.12.13"
+    "@babel/types" "^7.12.13"
 
-"@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==
+"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.13", "@babel/helper-compilation-targets@^7.13.8":
+  version "7.13.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5"
+  integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==
   dependencies:
-    "@babel/compat-data" "^7.8.6"
-    browserslist "^4.9.1"
-    invariant "^2.2.4"
-    levenary "^1.1.1"
-    semver "^5.5.0"
+    "@babel/compat-data" "^7.13.12"
+    "@babel/helper-validator-option" "^7.12.17"
+    browserslist "^4.14.5"
+    semver "^6.3.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==
+"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.13.11", "@babel/helper-create-class-features-plugin@^7.5.5":
+  version "7.13.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz#30d30a005bca2c953f5653fc25091a492177f4f6"
+  integrity sha512-ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw==
   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-function-name" "^7.12.13"
+    "@babel/helper-member-expression-to-functions" "^7.13.0"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-split-export-declaration" "^7.12.13"
 
-"@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==
+"@babel/helper-create-regexp-features-plugin@^7.12.13":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7"
+  integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
-    regexpu-core "^4.7.0"
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    regexpu-core "^4.7.1"
 
-"@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==
+"@babel/helper-define-polyfill-provider@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz#a640051772045fedaaecc6f0c6c69f02bdd34bf1"
+  integrity sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/types" "^7.8.3"
-    lodash "^4.17.13"
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
 
-"@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==
+"@babel/helper-explode-assignable-expression@^7.12.13":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
+  integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==
   dependencies:
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.13.0"
 
-"@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==
+"@babel/helper-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
+  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
   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.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/types" "^7.12.13"
 
-"@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==
+"@babel/helper-get-function-arity@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
+  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.13"
 
-"@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==
+"@babel/helper-hoist-variables@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz#5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8"
+  integrity sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
 
-"@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==
+"@babel/helper-member-expression-to-functions@^7.13.0", "@babel/helper-member-expression-to-functions@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
+  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.13.12"
 
-"@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==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
+  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.13.12"
 
-"@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==
+"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.13.14":
+  version "7.13.14"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
+  integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
   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-module-imports" "^7.13.12"
+    "@babel/helper-replace-supers" "^7.13.12"
+    "@babel/helper-simple-access" "^7.13.12"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.13"
+    "@babel/types" "^7.13.14"
 
-"@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==
+"@babel/helper-optimise-call-expression@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
+  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.13"
 
-"@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-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
+  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
 
-"@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==
+"@babel/helper-remap-async-to-generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
+  integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==
   dependencies:
-    lodash "^4.17.13"
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-wrap-function" "^7.13.0"
+    "@babel/types" "^7.13.0"
 
-"@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==
+"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
+  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
   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-member-expression-to-functions" "^7.13.12"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.12"
 
-"@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==
+"@babel/helper-simple-access@^7.12.13", "@babel/helper-simple-access@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
+  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
   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/types" "^7.13.12"
 
-"@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==
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
+  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.1"
 
-"@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==
+"@babel/helper-split-export-declaration@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
+  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.13"
 
-"@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-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
 
-"@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==
+"@babel/helper-validator-option@^7.12.17":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
+  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
+
+"@babel/helper-wrap-function@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
+  integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
 
-"@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==
+"@babel/helpers@^7.13.10":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
+  integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.9.0"
-    "@babel/types" "^7.9.0"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.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==
+"@babel/highlight@^7.12.13":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
+  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.9.0"
+    "@babel/helper-validator-identifier" "^7.12.11"
     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/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.13.15", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.15.tgz#8e66775fb523599acb6a289e12929fa5ab0954d8"
+  integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==
 
-"@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==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a"
+  integrity sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==
   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/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
 
-"@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==
+"@babel/plugin-proposal-async-generator-functions@^7.13.15":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz#80e549df273a3b3050431b148c892491df1bcc5b"
+  integrity sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@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==
+"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37"
+  integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==
   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/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@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==
+"@babel/plugin-proposal-decorators@^7.13.5":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.15.tgz#e91ccfef2dc24dd5bd5dcc9fc9e2557c684ecfb8"
+  integrity sha512-ibAMAqUm97yzi+LPgdr5Nqb9CMkeieGHvwPg1ywSGjZrZHQEGqE01HmOio8kxRpA/+VtOHouIVy2FMpBbtltjA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/helper-create-class-features-plugin" "^7.13.11"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-decorators" "^7.12.13"
 
-"@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==
+"@babel/plugin-proposal-dynamic-import@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d"
+  integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@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==
+"@babel/plugin-proposal-export-namespace-from@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d"
+  integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@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==
+"@babel/plugin-proposal-json-strings@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b"
+  integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-json-strings" "^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==
+"@babel/plugin-proposal-logical-assignment-operators@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"
+  integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==
   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/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@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==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"
+  integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@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==
+"@babel/plugin-proposal-numeric-separator@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db"
+  integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@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==
+"@babel/plugin-proposal-object-rest-spread@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a"
+  integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/compat-data" "^7.13.8"
+    "@babel/helper-compilation-targets" "^7.13.8"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.13.0"
 
-"@babel/plugin-syntax-async-generators@^7.8.0":
+"@babel/plugin-proposal-optional-catch-binding@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"
+  integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
+"@babel/plugin-proposal-optional-chaining@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866"
+  integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-proposal-private-methods@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"
+  integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
+  integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-async-generators@^7.8.4":
   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==
+"@babel/plugin-syntax-class-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.8.0":
+"@babel/plugin-syntax-decorators@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648"
+  integrity sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-dynamic-import@^7.8.3":
   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":
+"@babel/plugin-syntax-export-namespace-from@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-json-strings@^7.8.3":
   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":
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   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==
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.0":
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
   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":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   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":
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
   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==
+"@babel/plugin-syntax-top-level-await@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
+  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-syntax-typescript@^7.12.13", "@babel/plugin-syntax-typescript@^7.2.0":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474"
+  integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-arrow-functions@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
+  integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@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==
+"@babel/plugin-transform-async-to-generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
+  integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
   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/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
 
-"@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==
+"@babel/plugin-transform-block-scoped-functions@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
+  integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-block-scoping@^7.12.13", "@babel/plugin-transform-block-scoping@^7.6.2":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61"
+  integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    lodash "^4.17.13"
+    "@babel/helper-plugin-utils" "^7.12.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==
+"@babel/plugin-transform-classes@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b"
+  integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==
   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"
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-split-export-declaration" "^7.12.13"
     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==
+"@babel/plugin-transform-computed-properties@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
+  integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@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==
+"@babel/plugin-transform-destructuring@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz#c5dce270014d4e1ebb1d806116694c12b7028963"
+  integrity sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@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==
+"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
+  integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-duplicate-keys@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
+  integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-exponentiation-operator@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
+  integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-for-of@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
+  integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@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==
+"@babel/plugin-transform-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
+  integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
+  integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-member-expression-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
+  integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3"
+  integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@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==
+"@babel/plugin-transform-modules-commonjs@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b"
+  integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==
   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/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-simple-access" "^7.12.13"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@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==
+"@babel/plugin-transform-modules-systemjs@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
+  integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==
   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/helper-hoist-variables" "^7.13.0"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@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==
+"@babel/plugin-transform-modules-umd@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b"
+  integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@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==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
+  integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-new-target@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
+  integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@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==
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.12.13.tgz#d9b9200a69e03403a813e44a933ad9f4bddfd050"
+  integrity sha512-4QxDMc0lAOkIBSfCrnSGbAJ+4epDBF2XXwcLXuBcG1xl9u7LrktNVD4+LwhL47XuKVPQ7R25e/WdcV+h97HyZA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-object-super@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
+  integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-parameters@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"
+  integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@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==
+"@babel/plugin-transform-property-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
+  integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-regenerator@^7.13.15":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39"
+  integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==
   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==
+"@babel/plugin-transform-reserved-words@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
+  integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-runtime@^7.12.1", "@babel/plugin-transform-runtime@^7.13.9":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz#2eddf585dd066b84102517e10a577f24f76a9cd7"
+  integrity sha512-d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    resolve "^1.8.1"
-    semver "^5.5.1"
+    "@babel/helper-module-imports" "^7.13.12"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    babel-plugin-polyfill-corejs2 "^0.2.0"
+    babel-plugin-polyfill-corejs3 "^0.2.0"
+    babel-plugin-polyfill-regenerator "^0.2.0"
+    semver "^6.3.0"
 
-"@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==
+"@babel/plugin-transform-shorthand-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
+  integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-spread@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
+  integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
 
-"@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==
+"@babel/plugin-transform-sticky-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
+  integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-template-literals@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
+  integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@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==
+"@babel/plugin-transform-typeof-symbol@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
+  integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-typescript@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853"
+  integrity sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ==
   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/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-typescript" "^7.12.13"
 
 "@babel/plugin-transform-typescript@~7.4.0":
   version "7.4.5"
@@ -704,92 +759,108 @@
     "@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==
+"@babel/plugin-transform-unicode-escapes@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74"
+  integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@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==
+"@babel/plugin-transform-unicode-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
+  integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/polyfill@^7.11.5":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96"
+  integrity sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==
   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==
+"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.12.0":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.15.tgz#c8a6eb584f96ecba183d3d414a83553a599f478f"
+  integrity sha512-D4JAPMXcxk69PKe81jRJ21/fP/uYdcTZ3hJDF5QX2HSI9bBxxYw/dumdR6dGumhjxlprHPE4XWoPaqzZUVy2MA==
   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/compat-data" "^7.13.15"
+    "@babel/helper-compilation-targets" "^7.13.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-option" "^7.12.17"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12"
+    "@babel/plugin-proposal-async-generator-functions" "^7.13.15"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-dynamic-import" "^7.13.8"
+    "@babel/plugin-proposal-export-namespace-from" "^7.12.13"
+    "@babel/plugin-proposal-json-strings" "^7.13.8"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.13"
+    "@babel/plugin-proposal-object-rest-spread" "^7.13.8"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.13.8"
+    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
+    "@babel/plugin-proposal-private-methods" "^7.13.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.12.13"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.12.13"
+    "@babel/plugin-transform-arrow-functions" "^7.13.0"
+    "@babel/plugin-transform-async-to-generator" "^7.13.0"
+    "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
+    "@babel/plugin-transform-block-scoping" "^7.12.13"
+    "@babel/plugin-transform-classes" "^7.13.0"
+    "@babel/plugin-transform-computed-properties" "^7.13.0"
+    "@babel/plugin-transform-destructuring" "^7.13.0"
+    "@babel/plugin-transform-dotall-regex" "^7.12.13"
+    "@babel/plugin-transform-duplicate-keys" "^7.12.13"
+    "@babel/plugin-transform-exponentiation-operator" "^7.12.13"
+    "@babel/plugin-transform-for-of" "^7.13.0"
+    "@babel/plugin-transform-function-name" "^7.12.13"
+    "@babel/plugin-transform-literals" "^7.12.13"
+    "@babel/plugin-transform-member-expression-literals" "^7.12.13"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.13.8"
+    "@babel/plugin-transform-modules-systemjs" "^7.13.8"
+    "@babel/plugin-transform-modules-umd" "^7.13.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13"
+    "@babel/plugin-transform-new-target" "^7.12.13"
+    "@babel/plugin-transform-object-super" "^7.12.13"
+    "@babel/plugin-transform-parameters" "^7.13.0"
+    "@babel/plugin-transform-property-literals" "^7.12.13"
+    "@babel/plugin-transform-regenerator" "^7.13.15"
+    "@babel/plugin-transform-reserved-words" "^7.12.13"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.13"
+    "@babel/plugin-transform-spread" "^7.13.0"
+    "@babel/plugin-transform-sticky-regex" "^7.12.13"
+    "@babel/plugin-transform-template-literals" "^7.13.0"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.13"
+    "@babel/plugin-transform-unicode-escapes" "^7.12.13"
+    "@babel/plugin-transform-unicode-regex" "^7.12.13"
+    "@babel/preset-modules" "^0.1.4"
+    "@babel/types" "^7.13.14"
+    babel-plugin-polyfill-corejs2 "^0.2.0"
+    babel-plugin-polyfill-corejs3 "^0.2.0"
+    babel-plugin-polyfill-regenerator "^0.2.0"
+    core-js-compat "^3.9.0"
+    semver "^6.3.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==
+"@babel/preset-modules@^0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
+  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -797,44 +868,50 @@
     "@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==
+"@babel/runtime@7.12.18":
+  version "7.12.18"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.18.tgz#af137bd7e7d9705a412b3caaf991fe6aaa97831b"
+  integrity sha512-BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==
   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==
+"@babel/runtime@^7.12.5", "@babel/runtime@^7.8.4":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
+  integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    regenerator-runtime "^0.13.4"
 
-"@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==
+"@babel/template@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
+  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
   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"
+    "@babel/code-frame" "^7.12.13"
+    "@babel/parser" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.15.tgz#c38bf7679334ddd4028e8e1f7b3aa5019f0dada7"
+  integrity sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.9"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.13.15"
+    "@babel/types" "^7.13.14"
     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==
+"@babel/types@^7.1.6", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.13.14"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
+  integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.9.5"
-    lodash "^4.17.13"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
 "@cnakazawa/watch@^1.0.3":
@@ -868,56 +945,87 @@
     silent-error "^1.1.1"
     util.promisify "^1.0.0"
 
-"@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==
+"@ember/test-helpers@^2.2.0":
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.2.5.tgz#9f915310b79fd6330e8e19857958e5f241c1d0de"
+  integrity sha512-E0GMlkmRb9r3lHa+88gtfZcve+IlAS3yoUsB5QSSTC8oRTGhqzirvsxYAylCj8n40gfoOHdqKEZxncYhVimZwg==
   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"
+    "@ember/test-waiters" "^2.4.3"
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^3.0.3"
+    ember-cli-babel "^7.26.2"
+    ember-cli-htmlbars "^5.7.1"
+    ember-destroyable-polyfill "^2.0.3"
+
+"@ember/test-waiters@^2.4.3":
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-2.4.3.tgz#44c144fad5e3a5858b02604c1df7edea61a52dbf"
+  integrity sha512-2Nq1y5+mbBg2QeP57JaOrhfCCu2tEBr8QA3XrJw6uutnU5heNKIROnh1gskqDg72m8lqocA1UFzpCQIg4XQywQ==
+  dependencies:
+    calculate-cache-key-for-tree "^2.0.0"
+    ember-cli-babel "^7.26.2"
+    ember-cli-typescript "^4.1.0"
+    ember-cli-version-checker "^5.1.2"
+    semver "^7.3.2"
+
+"@embroider/core@0.33.0", "@embroider/core@^0.33.0":
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.33.0.tgz#0fb1752d6e34ea45368e65c42e13220a57ffae76"
+  integrity sha512-Kd3W4vBJCSwskVislwldhuoe1RtdA04lRr2r2ccnPI4msCXxLn292WBaS7/x0LdEu2EMO5ffRDeQva2/xoS4Yg==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.12.3"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-transform-runtime" "^7.12.1"
+    "@babel/runtime" "^7.12.5"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    "@embroider/macros" "0.33.0"
     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"
+    broccoli-node-api "^1.7.0"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.1"
+    broccoli-source "^3.0.0"
     debug "^3.1.0"
+    escape-string-regexp "^4.0.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"
+    handlebars "^4.4.2"
     js-string-escape "^1.0.1"
-    jsdom "^12.0.0"
+    jsdom "^16.4.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"
+    semver "^7.3.2"
     strip-bom "^3.0.0"
     typescript-memoize "^1.0.0-alpha.3"
     walk-sync "^1.1.3"
+    wrap-legacy-hbs-plugin-if-needed "^1.0.1"
 
-"@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==
+"@embroider/macros@0.33.0":
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.33.0.tgz#d5826ea7565bb69b57ba81ed528315fe77acbf9d"
+  integrity sha512-nl/1zRn+Wd3MO8Bb+YPqHmFl/2vwQLTsEB6Zt+K9bWXsM/kA+dPCeeCReLN6PbkMP16xxqtNSIrQ8Y49hnWjpg==
   dependencies:
-    "@babel/core" "^7.2.2"
-    "@babel/traverse" "^7.2.4"
-    "@babel/types" "^7.3.2"
-    "@embroider/core" "0.4.3"
+    "@babel/core" "^7.12.3"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    "@embroider/core" "0.33.0"
+    assert-never "^1.1.0"
+    ember-cli-babel "^7.23.0"
+    lodash "^4.17.10"
     resolve "^1.8.1"
-    semver "^5.6.0"
+    semver "^7.3.2"
 
 "@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==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.0.4.tgz#1c85a5181615a6647f6acfaaed68e28ad7e9626e"
+  integrity sha512-sS4N8wtcKfYdUJ6O3m8nbTut6NjErdz94Ap8VB1ekcg4WSD+7sI7Nmv6kt2rdPoe363nUdjUbRBzHNWhLzraBw==
   dependencies:
     "@glimmer/di" "^0.1.9"
     "@glimmer/env" "^0.1.7"
@@ -931,6 +1039,7 @@
     ember-cli-path-utils "^1.0.0"
     ember-cli-string-utils "^1.1.0"
     ember-cli-typescript "3.0.0"
+    ember-cli-version-checker "^3.1.3"
     ember-compatibility-helpers "^1.1.2"
 
 "@glimmer/di@^0.1.9":
@@ -938,11 +1047,24 @@
   resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280"
   integrity sha1-poeMB6E6LCx2/N5ZilyXY3v8QoA=
 
+"@glimmer/encoder@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.42.2.tgz#d3ba3dc9f1d4fa582d1d18b63da100fc5c664057"
+  integrity sha512-8xkdly0i0BP5HMI0suPB9ly0AnEq8x9Z8j3Gee1HYIovM5VLNtmh7a8HsaHYRs/xHmBEZcqtr8JV89w6F59YMQ==
+  dependencies:
+    "@glimmer/interfaces" "^0.42.2"
+    "@glimmer/vm" "^0.42.2"
+
 "@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.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.42.2.tgz#9cf8d6f8f5eee6bfcfa36919ca68ae716e1f78db"
+  integrity sha512-7LOuQd02cxxNNHChzdHMAU8/qOeQvTro141CU5tXITP7z6aOv2D2gkFdau97lLQiVxezGrh8J7h8GCuF7TEqtg==
+
 "@glimmer/interfaces@^0.47.9":
   version "0.47.9"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.47.9.tgz#4c50b5343815045318bba38915f780ae39f14590"
@@ -950,6 +1072,50 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/low-level@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.42.2.tgz#52c745414d1d04c4245c369bd132c0e786c816ef"
+  integrity sha512-s+Q44SnKdTBTnkgX0deBlVNnNPVas+Pg8xEnwky9VrUqOHKsIZRrPgfVULeC6bIdFXtXOKm5CjTajhb9qnQbXQ==
+
+"@glimmer/program@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.42.2.tgz#fe504679ca4df6251dd5fcf3003699bb51fa41fa"
+  integrity sha512-XpQ6EYzA1VL9ESKoih5XW5JftFmlRvwy3bF/I1ABOa3yLIh8mApEwrRI/sIHK0Nv5s1j0uW4itVF196WxnJXgw==
+  dependencies:
+    "@glimmer/encoder" "^0.42.2"
+    "@glimmer/interfaces" "^0.42.2"
+    "@glimmer/util" "^0.42.2"
+
+"@glimmer/reference@^0.42.1", "@glimmer/reference@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.42.2.tgz#57874e27c825fb7041b5295b5eb153f3f3f92f8f"
+  integrity sha512-XuhbRjr3M9Q/DP892jGxVfPE6jaGGHu5w9ppGMnuTY7Vm/x+A+68MCiaREhDcEwJlzGg4UkfVjU3fdgmUIrc5Q==
+  dependencies:
+    "@glimmer/util" "^0.42.2"
+
+"@glimmer/runtime@^0.42.1":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.42.2.tgz#50e7da5d3cf9144248048a7478be3c489784a4bb"
+  integrity sha512-52LVZJsLKM3GzI3TEmYcw2LdI9Uk0jotISc3w2ozQBWvkKoYxjDNvI/gsjyMpenj4s7FcG2ggOq0x4tNFqm1GA==
+  dependencies:
+    "@glimmer/interfaces" "^0.42.2"
+    "@glimmer/low-level" "^0.42.2"
+    "@glimmer/program" "^0.42.2"
+    "@glimmer/reference" "^0.42.2"
+    "@glimmer/util" "^0.42.2"
+    "@glimmer/vm" "^0.42.2"
+    "@glimmer/wire-format" "^0.42.2"
+
+"@glimmer/syntax@^0.42.1":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.42.2.tgz#89bb3cb787285b84665dc0d8907d94b008e5be9a"
+  integrity sha512-SR26SmF/Mb5o2cc4eLHpOyoX5kwwXP4KRhq4fbWfrvan74xVWA38PLspPCzwGhyVH/JsE7tUEPMjSo2DcJge/Q==
+  dependencies:
+    "@glimmer/interfaces" "^0.42.2"
+    "@glimmer/util" "^0.42.2"
+    handlebars "^4.0.13"
+    simple-html-tokenizer "^0.5.8"
+
 "@glimmer/syntax@^0.47.9":
   version "0.47.9"
   resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.47.9.tgz#f3d141efc97f601928335771721d1f27eb1ed7d2"
@@ -960,6 +1126,11 @@
     handlebars "^4.5.1"
     simple-html-tokenizer "^0.5.9"
 
+"@glimmer/util@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.42.2.tgz#9ca1631e42766ea6059f4b49d0bdfb6095aad2c4"
+  integrity sha512-Heck0baFSaWDanCYtmOcLeaz7v+rSqI8ovS7twrp2/FWEteb3Ze5sWQ2BEuSAG23L/k/lzVwYM/MY7ZugxBpaA==
+
 "@glimmer/util@^0.44.0":
   version "0.44.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9"
@@ -973,6 +1144,22 @@
     "@glimmer/env" "0.1.7"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/vm@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.42.2.tgz#492a4f05eac587c3a37371b3c62593f20bef553d"
+  integrity sha512-D2MNU5glICLqvet5SfVPrv+l6JNK2TR+CdQhch1Ew+btOoqlW+2LIJIF/5wLb1POjIMEkt+78t/7RN0mDFXGzw==
+  dependencies:
+    "@glimmer/interfaces" "^0.42.2"
+    "@glimmer/util" "^0.42.2"
+
+"@glimmer/wire-format@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.42.2.tgz#b95062b594dddeb8bd11cba3a6a0accbfabc9930"
+  integrity sha512-IqUo6mdJ7GRsK7KCyZxrc17ioSg9RBniEnb418ZMQxsV/WBv9NQ359MuClUck2M24z1AOXo4TerUw0U7+pb1/A==
+  dependencies:
+    "@glimmer/interfaces" "^0.42.2"
+    "@glimmer/util" "^0.42.2"
+
 "@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"
@@ -981,18 +1168,18 @@
     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==
+"@nodelib/fs.scandir@2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
+  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
   dependencies:
-    "@nodelib/fs.stat" "2.0.3"
+    "@nodelib/fs.stat" "2.0.4"
     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@2.0.4", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
+  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
 
 "@nodelib/fs.stat@^1.1.2":
   version "1.1.3"
@@ -1000,13 +1187,18 @@
   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==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
+  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
   dependencies:
-    "@nodelib/fs.scandir" "2.1.3"
+    "@nodelib/fs.scandir" "2.1.4"
     fastq "^1.6.0"
 
+"@popperjs/core@^2.4.4":
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
+  integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
+
 "@simple-dom/interface@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
@@ -1017,6 +1209,34 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
+"@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.1":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
+  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
+  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/samsam@^5.3.1":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.1.tgz#375a45fe6ed4e92fca2fb920e007c48232a6507f"
+  integrity sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==
+  dependencies:
+    "@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"
+  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
+  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
+
 "@types/body-parser@*":
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
@@ -1026,49 +1246,40 @@
     "@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==
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.3.tgz#779166b90fda611963a3adbfd00b339d03b747bd"
+  integrity sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==
   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==
+  version "4.2.16"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.16.tgz#f09cc36e18d28274f942e7201147cce34d97e8c8"
+  integrity sha512-vI5iOAsez9+roLS3M3+Xx7w+WRuDtSmF8bQkrbcIJ2sC1PcDgVoA0WGpa+bIrJ+y8zqY2oi//fUctkxtIcXJCw==
 
 "@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==
+  version "3.4.34"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901"
+  integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==
   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==
+"@types/express-serve-static-core@^4.17.18":
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d"
+  integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==
   dependencies:
     "@types/node" "*"
+    "@types/qs" "*"
     "@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==
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
+  integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
   dependencies:
     "@types/body-parser" "*"
-    "@types/express-serve-static-core" "*"
+    "@types/express-serve-static-core" "^4.17.18"
     "@types/qs" "*"
     "@types/serve-static" "*"
 
@@ -1079,41 +1290,52 @@
   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==
+"@types/fs-extra@^8.1.0":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068"
+  integrity sha512-TcUlBem321DFQzBNuz8p0CLLKp0VvF/XH9E4KHNmgwyp4E3AfgI5cjiIVZWlbfThBop2qxFIh4+LeY6hVWWZ2w==
+  dependencies:
+    "@types/node" "*"
+
+"@types/glob@*", "@types/glob@^7.1.1":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
+  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
   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/json-schema@^7.0.5":
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
+  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
 "@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==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21"
+  integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
 
 "@types/node@*":
-  version "13.13.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.4.tgz#1581d6c16e3d4803eb079c87d4ac893ee7501c2c"
-  integrity sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==
+  version "14.14.37"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
+  integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==
 
 "@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==
+  version "6.9.6"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"
+  integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==
 
 "@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":
+"@types/rimraf@^2.0.2", "@types/rimraf@^2.0.3":
   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==
@@ -1122,175 +1344,177 @@
     "@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==
+  version "1.13.9"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e"
+  integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==
   dependencies:
-    "@types/express-serve-static-core" "*"
-    "@types/mime" "*"
+    "@types/mime" "^1"
+    "@types/node" "*"
 
 "@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==
+"@webassemblyjs/ast@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
+  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
   dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
 
-"@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/floating-point-hex-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
+  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
 
-"@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-api-error@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
+  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
 
-"@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-buffer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
+  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
 
-"@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==
+"@webassemblyjs/helper-code-frame@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
+  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
   dependencies:
-    "@webassemblyjs/wast-printer" "1.7.11"
+    "@webassemblyjs/wast-printer" "1.9.0"
 
-"@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-fsm@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
+  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
 
-"@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==
+"@webassemblyjs/helper-module-context@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
+  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
   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/ast" "1.9.0"
 
-"@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==
+"@webassemblyjs/helper-wasm-bytecode@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
+  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
+
+"@webassemblyjs/helper-wasm-section@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
+  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+
+"@webassemblyjs/ieee754@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
+  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
   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==
+"@webassemblyjs/leb128@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
+  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
   dependencies:
-    "@xtuc/long" "4.2.1"
+    "@xtuc/long" "4.2.2"
 
-"@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/utf8@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
+  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
 
-"@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==
+"@webassemblyjs/wasm-edit@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
+  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
   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/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/helper-wasm-section" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-opt" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/wast-printer" "1.9.0"
 
-"@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==
+"@webassemblyjs/wasm-gen@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
+  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
   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/ast" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
 
-"@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==
+"@webassemblyjs/wasm-opt@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
+  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
   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/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
 
-"@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==
+"@webassemblyjs/wasm-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
+  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
   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/ast" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
 
-"@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==
+"@webassemblyjs/wast-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
+  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
   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/ast" "1.9.0"
+    "@webassemblyjs/floating-point-hex-parser" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-code-frame" "1.9.0"
+    "@webassemblyjs/helper-fsm" "1.9.0"
+    "@xtuc/long" "4.2.2"
 
-"@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==
+"@webassemblyjs/wast-printer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
+  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
   dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-    "@xtuc/long" "4.2.1"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
+    "@xtuc/long" "4.2.2"
 
 "@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==
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-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==
+abab@^2.0.3, abab@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
 
 abbrev@1:
   version "1.1.1"
@@ -1305,40 +1529,38 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
     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==
+acorn-globals@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
+  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
   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 "^7.1.1"
+    acorn-walk "^7.1.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==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
-acorn-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-walk@^7.1.1:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn@^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.7, acorn@^6.4.1:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^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==
+acorn@^7.1.1:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+
+acorn@^8.1.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.1.tgz#fb0026885b9ac9f48bac1e185e4af472971149ff"
+  integrity sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g==
 
 after@0.8.2:
   version "0.8.2"
@@ -1350,15 +1572,15 @@ ajv-errors@^1.0.0:
   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-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-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==
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.9.1:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -1372,7 +1594,7 @@ amd-name-resolver@1.2.0:
   dependencies:
     ensure-posix-path "^1.0.1"
 
-amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.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==
@@ -1391,11 +1613,11 @@ ansi-escapes@^3.2.0:
   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==
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
-    type-fest "^0.11.0"
+    type-fest "^0.21.3"
 
 ansi-html@^0.0.7:
   version "0.0.7"
@@ -1435,11 +1657,10 @@ ansi-styles@^3.0.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
     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==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
-    "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
 ansi-to-html@^0.6.6:
@@ -1462,6 +1683,14 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
+anymatch@~3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 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"
@@ -1489,6 +1718,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -1553,14 +1787,15 @@ arraybuffer.slice@~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==
+asn1.js@^5.2.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
+    safer-buffer "^2.1.0"
 
 asn1@~0.2.3:
   version "0.2.4"
@@ -1570,9 +1805,9 @@ asn1@~0.2.3:
     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==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
+  integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
@@ -1615,16 +1850,24 @@ async-disk-cache@^1.2.1:
     rsvp "^3.0.18"
     username-sync "^1.0.2"
 
+async-disk-cache@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-2.1.0.tgz#e0f37b187ed8c41a5991518a9556d206ae2843a2"
+  integrity sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==
+  dependencies:
+    debug "^4.1.1"
+    heimdalljs "^0.2.3"
+    istextorbinary "^2.5.1"
+    mkdirp "^0.5.0"
+    rimraf "^3.0.0"
+    rsvp "^4.8.5"
+    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"
@@ -1650,6 +1893,11 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -1661,9 +1909,9 @@ aws-sign2@~0.7.0:
   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==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 babel-code-frame@^6.26.0:
   version "6.26.0"
@@ -1839,14 +2087,13 @@ babel-helpers@^6.24.1:
     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==
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
+  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
   dependencies:
-    find-cache-dir "^2.1.0"
+    find-cache-dir "^3.3.1"
     loader-utils "^1.4.0"
-    mkdirp "^0.5.3"
-    pify "^4.0.1"
+    make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
 babel-messages@^6.23.0:
@@ -1870,14 +2117,14 @@ babel-plugin-debug-macros@^0.2.0, babel-plugin-debug-macros@^0.2.0-beta.6:
   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==
+babel-plugin-debug-macros@^0.3.3, babel-plugin-debug-macros@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.4.tgz#22961d0cb851a80654cece807a8b4b73d85c6075"
+  integrity sha512-wfel/vb3pXfwIDZUrkoDrn5FHmlWI96PCJ3UCDv2a86poJ3EQrnArNW5KfHSVJ9IOgxHbo748cQt7sDU+0KCEw==
   dependencies:
     semver "^5.3.0"
 
-babel-plugin-dynamic-import-node@^2.3.0:
+babel-plugin-dynamic-import-node@^2.3.3:
   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==
@@ -1891,12 +2138,19 @@ babel-plugin-ember-data-packages-polyfill@^0.1.2:
   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==
+babel-plugin-ember-modules-api-polyfill@^2.6.0:
+  version "2.13.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.13.4.tgz#cf62bc9bfd808c48d810d5194f4329e9453bd603"
+  integrity sha512-uxQPkEQAzCYdwhZk16O9m1R4xtCRNy4oEUTBrccOPfzlIahRZJic/JeP/ZEL0BC6Mfq6r55eOg6gMF/zdFoCvA==
   dependencies:
-    ember-rfc176-data "^0.3.12"
+    ember-rfc176-data "^0.3.13"
+
+babel-plugin-ember-modules-api-polyfill@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.5.0.tgz#27b6087fac75661f779f32e60f94b14d0e9f6965"
+  integrity sha512-pJajN/DkQUnStw0Az8c6khVcMQHgzqWr61lLNtVeu0g61LRW0k9jyK7vaedrHDWGe/Qe8sxG5wpiyW9NsMqFzA==
+  dependencies:
+    ember-rfc176-data "^0.3.17"
 
 babel-plugin-filter-imports@^3.0.0:
   version "3.0.0"
@@ -1906,12 +2160,23 @@ babel-plugin-filter-imports@^3.0.0:
     "@babel/types" "^7.4.0"
     lodash "^4.17.11"
 
-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-htmlbars-inline-precompile@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.2.0.tgz#c4882ea875d0f5683f0d91c1f72e29a4f14b5606"
+  integrity sha512-IUeZmgs9tMUGXYu1vfke5I18yYJFldFGdNFQOWslXTnDWXzpwPih7QFduUqvT+awDpDuNtXpdt5JAf43Q1Hhzg==
 
-babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
+babel-plugin-htmlbars-inline-precompile@^5.0.0:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-5.2.2.tgz#3ebd5c365f5c64ba737c764603c12d6a85ba3024"
+  integrity sha512-ta4FRkdF3iaPwJ4e3bLNa52VuYRSSezYo1ezx/A9sJg+C3ByjroTCXby/zc4oeq0/so+Dbi4jXie6h8f+RowMQ==
+  dependencies:
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    line-column "^1.0.2"
+    magic-string "^0.25.7"
+    parse-static-imports "^1.1.0"
+    string.prototype.matchall "^4.0.4"
+
+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==
@@ -1922,6 +2187,41 @@ babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
     reselect "^3.0.1"
     resolve "^1.4.0"
 
+babel-plugin-module-resolver@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.1.0.tgz#22a4f32f7441727ec1fbf4967b863e1e3e9f33e2"
+  integrity sha512-MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA==
+  dependencies:
+    find-babel-config "^1.2.0"
+    glob "^7.1.6"
+    pkg-up "^3.1.0"
+    reselect "^4.0.0"
+    resolve "^1.13.1"
+
+babel-plugin-polyfill-corejs2@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz#686775bf9a5aa757e10520903675e3889caeedc4"
+  integrity sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg==
+  dependencies:
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.2.0"
+    semver "^6.1.1"
+
+babel-plugin-polyfill-corejs3@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz#f4b4bb7b19329827df36ff56f6e6d367026cb7a2"
+  integrity sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.0"
+    core-js-compat "^3.9.1"
+
+babel-plugin-polyfill-regenerator@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz#853f5f5716f4691d98c84f8069c7636ea8da7ab8"
+  integrity sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.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"
@@ -2285,14 +2585,14 @@ backo2@1.0.2:
   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=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-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-arraybuffer@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
+  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
 
 base64-js@0.0.2:
   version "0.0.2"
@@ -2300,9 +2600,9 @@ base64-js@0.0.2:
   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==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 base64id@2.0.0:
   version "2.0.0"
@@ -2336,12 +2636,14 @@ bcrypt-pbkdf@^1.0.0:
   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=
+bent@^7.3.12:
+  version "7.3.12"
+  resolved "https://registry.yarnpkg.com/bent/-/bent-7.3.12.tgz#e0a2775d4425e7674c64b78b242af4f49da6b035"
+  integrity sha512-T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w==
   dependencies:
-    callsite "1.0.0"
+    bytesish "^0.4.1"
+    caseless "~0.12.0"
+    is-stream "^2.0.0"
 
 big.js@^5.2.2:
   version "5.2.2"
@@ -2353,10 +2655,15 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
-"binaryextensions@1 || 2":
+binary-extensions@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.2.0.tgz#e7c6ba82d4f5f5758c26078fe8eea28881233311"
-  integrity sha512-bHhs98rj/7i/RZpCSJ3uk55pLXOItjIrh2sRQZSM6OoktScX+LxJzvlU+FELp9j3TdcddTmmYArLSGptCTwjuw==
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
+"binaryextensions@1 || 2", binaryextensions@^2.1.2:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22"
+  integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==
 
 bindings@^1.5.0:
   version "1.5.0"
@@ -2380,10 +2687,15 @@ bluebird@^3.1.1, bluebird@^3.4.6, bluebird@^3.5.5:
   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.9"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
-  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+
+bn.js@^5.0.0, bn.js@^5.1.1:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
+  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
 
 body-parser@1.19.0:
   version "1.19.0"
@@ -2419,7 +2731,7 @@ bops@0.0.3:
     base64-js "0.0.2"
     to-utf8 "0.0.1"
 
-bower-config@^1.4.1:
+bower-config@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.3.tgz#3454fecdc5f08e7aa9cc6d556e492be0669689ae"
   integrity sha512-MVyyUk3d1S7d2cl6YISViwJBc2VXCkxF5AUFykvN0PQj5FsUiMNSgAYTso18oRFfyZ6XEtjrgg9MAaufHbOwNw==
@@ -2460,7 +2772,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1:
+braces@^3.0.1, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -2510,18 +2822,19 @@ broccoli-babel-transpiler@^6.5.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==
+broccoli-babel-transpiler@^7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e"
+  integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q==
   dependencies:
-    "@babel/core" "^7.8.3"
-    "@babel/polyfill" "^7.8.3"
+    "@babel/core" "^7.12.0"
+    "@babel/polyfill" "^7.11.5"
     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 "^0.2.1"
     heimdalljs-logger "^0.1.9"
     json-stable-stringify "^1.0.1"
     rsvp "^4.8.4"
@@ -2592,6 +2905,23 @@ broccoli-concat@^3.2.2, broccoli-concat@^3.7.1, broccoli-concat@^3.7.4:
     lodash.uniq "^4.2.0"
     walk-sync "^0.3.2"
 
+broccoli-concat@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.2.4.tgz#78e359ddc540b999d815355163bf3cfb6bd67322"
+  integrity sha512-NgdBIE57r+U/AslBohQr0mCS7PopIWL8dihMI1CzqffQkisAgqWMuddjYmizqRBQlml7crBFaBeUnPDHhf4/RQ==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^4.0.2"
+    ensure-posix-path "^1.0.2"
+    fast-sourcemap-concat "^2.1.0"
+    find-index "^1.1.0"
+    fs-extra "^8.1.0"
+    fs-tree-diff "^2.0.1"
+    lodash.merge "^4.6.2"
+    lodash.omit "^4.1.0"
+    lodash.uniq "^4.2.0"
+
 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"
@@ -2688,6 +3018,22 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
+broccoli-funnel@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.3.tgz#26fd42632471f67a91f4770d1987118087219937"
+  integrity sha512-LPzZ91BwStoHZXdXHQAJeYORl189OrRKM5NdIi86SDU9wZ4s/3lV1PRFOiobDT/jKM10voM7CDzfvicHbCYxAQ==
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^4.0.1"
+    debug "^4.1.1"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^2.0.1"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    path-posix "^1.0.0"
+    walk-sync "^2.0.2"
+
 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"
@@ -2747,7 +3093,15 @@ broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^
     broccoli-plugin "^1.3.0"
     merge-trees "^2.0.0"
 
-broccoli-middleware@^2.1.0:
+broccoli-merge-trees@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c"
+  integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==
+  dependencies:
+    broccoli-plugin "^4.0.2"
+    merge-trees "^2.0.0"
+
+broccoli-middleware@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.1.1.tgz#183635bbef4dc1241533ee001a162f013d776cb9"
   integrity sha512-BK8aPhQpOLsHWiftrqXQr84XsvzUqeaN4PlCQOYg5yM0M+WKAHtX2WFXmicSQZOVgKDyh5aeoNTFkHjBAEBzwQ==
@@ -2757,25 +3111,6 @@ broccoli-middleware@^2.1.0:
     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"
@@ -2798,6 +3133,15 @@ broccoli-output-wrapper@^2.0.0:
   dependencies:
     heimdalljs-logger "^0.1.10"
 
+broccoli-output-wrapper@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-3.2.5.tgz#514b17801c92922a2c2f87fd145df2a25a11bc5f"
+  integrity sha512-bQAtwjSrF4Nu0CK0JOy5OZqw9t5U0zzv2555EA/cF8/a8SLDTIetk9UgrtMVw7qKLKdSpOZ2liZNeZZDaKgayw==
+  dependencies:
+    fs-extra "^8.1.0"
+    heimdalljs-logger "^0.1.10"
+    symlink-or-copy "^1.2.0"
+
 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"
@@ -2817,7 +3161,7 @@ broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.3:
     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:
+broccoli-persistent-filter@^2.1.0, broccoli-persistent-filter@^2.2.1, 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==
@@ -2837,6 +3181,23 @@ broccoli-persistent-filter@^2.1.0, broccoli-persistent-filter@^2.2.1, broccoli-p
     sync-disk-cache "^1.3.3"
     walk-sync "^1.0.0"
 
+broccoli-persistent-filter@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.2.tgz#41da6b9577be09a170ecde185f2c5a6099f99c4e"
+  integrity sha512-CbU95RXXVyy+eJV9XTiHUC7NnsY3EvdVrGzp3YgyvO2bzXZFE5/GzDp4X/VQqX+jsk4qyT1HvMOF0sD1DX68TQ==
+  dependencies:
+    async-disk-cache "^2.0.0"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^4.0.3"
+    fs-tree-diff "^2.0.0"
+    hash-for-dep "^1.5.0"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    promise-map-series "^0.2.1"
+    rimraf "^3.0.0"
+    symlink-or-copy "^1.0.1"
+    sync-disk-cache "^2.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"
@@ -2880,7 +3241,20 @@ broccoli-plugin@^3.1.0:
     rimraf "^2.3.4"
     symlink-or-copy "^1.1.8"
 
-broccoli-slow-trees@^3.0.1:
+broccoli-plugin@^4.0.0, broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.5.tgz#71e5597f31a652c0e0a6bcb7bbdb50142cc5c959"
+  integrity sha512-WA8FQP2EQCBOd1Z6RhXlyTyt/F+sJEwWGTCUrIIBDxHhSURibPW/n0NfwgLdEZSD8/3Ec4B9L3PUqaWxVuVC2A==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-output-wrapper "^3.2.5"
+    fs-merger "^3.1.0"
+    promise-map-series "^0.3.0"
+    quick-temp "^0.1.8"
+    rimraf "^3.0.2"
+    symlink-or-copy "^1.3.1"
+
+broccoli-slow-trees@^3.0.1, broccoli-slow-trees@^3.1.0:
   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==
@@ -2892,10 +3266,15 @@ broccoli-source@^1.1.0:
   resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809"
   integrity sha1-VPDoLItz9GWAy7xPV48LMvyo+Ak=
 
+broccoli-source@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-2.1.2.tgz#e9ae834f143b607e9ec114ade66731500c38b90b"
+  integrity sha512-1lLayO4wfS0c0Sj50VfHJXNWf94FYY0WUhxj0R77thbs6uWI7USiOWFqQV5dRmhAJnoKaGN4WyLGQbgjgiYFwQ==
+
 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==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.1.tgz#fd581b2f3877ca1338f724f6ef70acec8c7e1444"
+  integrity sha512-ZbGVQjivWi0k220fEeIUioN6Y68xjMy0xiLAc0LdieHI99gw+tafU8w0CggBDYVNsJMKUr006AZaM7gNEwCxEg==
   dependencies:
     broccoli-node-api "^1.6.0"
 
@@ -2930,6 +3309,22 @@ broccoli-stew@^3.0.0:
     symlink-or-copy "^1.2.0"
     walk-sync "^1.1.3"
 
+broccoli-terser-sourcemap@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-terser-sourcemap/-/broccoli-terser-sourcemap-4.1.0.tgz#5f37441b64a3b6bfb0c67e9af232259c9576f115"
+  integrity sha512-zkNnjsAbP+M5rG2aMM1EE4BmXPUSxFKmtLUkUs2D1DLTOJQoF1xlOjGWjjKYCFy5tw8t4+tgGJ+HVa2ucJZ8sw==
+  dependencies:
+    async-promise-queue "^1.0.5"
+    broccoli-plugin "^4.0.3"
+    debug "^4.1.0"
+    lodash.defaultsdeep "^4.6.1"
+    matcher-collection "^2.0.1"
+    source-map-url "^0.4.0"
+    symlink-or-copy "^1.3.1"
+    terser "^5.3.0"
+    walk-sync "^2.2.0"
+    workerpool "^6.0.0"
+
 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"
@@ -2947,10 +3342,10 @@ broccoli-uglify-sourcemap@^3.1.0:
     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==
+broccoli@^3.5.0:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.5.1.tgz#371bc63cabe700bae3a2b80cac3e978f94664418"
+  integrity sha512-2Rvl40E6JgALX1JQN5PjCgP1apFAP24vVol+coX5TpVVy0Lsqzl3Mabbe3fVQcu3lMRfPJ6DyBKqBlo52XPSRg==
   dependencies:
     "@types/chai" "^4.2.9"
     "@types/chai-as-promised" "^7.1.2"
@@ -2977,7 +3372,7 @@ broccoli@^3.2.0:
     underscore.string "^3.2.2"
     watch-detector "^1.0.0"
 
-brorand@^1.0.1:
+brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -2987,6 +3382,11 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
+browser-split@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/browser-split/-/browser-split-0.0.1.tgz#7b097574f8e3ead606fb4664e64adfdda2981a93"
+  integrity sha1-ewl1dPjj6tYG+0Zk5krf3aKYGpM=
+
 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"
@@ -3018,26 +3418,28 @@ browserify-des@^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=
+browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
+  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
   dependencies:
-    bn.js "^4.1.0"
+    bn.js "^5.0.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=
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
+  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
   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"
+    bn.js "^5.1.1"
+    browserify-rsa "^4.0.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.5.3"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.5"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
 browserify-zlib@^0.2.0:
   version "0.2.0"
@@ -3054,15 +3456,16 @@ browserslist@^3.2.6:
     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==
+browserslist@^4.14.5, browserslist@^4.16.3:
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.4.tgz#7ebf913487f40caf4637b892b268069951c35d58"
+  integrity sha512-d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ==
   dependencies:
-    caniuse-lite "^1.0.30001043"
-    electron-to-chromium "^1.3.413"
-    node-releases "^1.1.53"
-    pkg-up "^2.0.0"
+    caniuse-lite "^1.0.30001208"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.712"
+    escalade "^3.1.1"
+    node-releases "^1.1.71"
 
 bser@2.1.1:
   version "2.1.1"
@@ -3071,24 +3474,6 @@ bser@2.1.1:
   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"
@@ -3133,6 +3518,11 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
+bytesish@^0.4.1:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/bytesish/-/bytesish-0.4.4.tgz#f3b535a0f1153747427aee27256748cff92347e6"
+  integrity sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ==
+
 cacache@^12.0.2:
   version "12.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
@@ -3189,21 +3579,29 @@ calculate-cache-key-for-tree@^2.0.0:
   dependencies:
     json-stable-stringify "^1.0.1"
 
+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
 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:
+callsites@^3.0.0, callsites@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
+camelize@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
+  integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
+
 can-symlink@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
@@ -3211,10 +3609,10 @@ can-symlink@^1.0.0:
   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==
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001208:
+  version "1.0.30001208"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz#a999014a35cebd4f98c405930a057a0d75352eb9"
+  integrity sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -3269,6 +3667,14 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  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"
@@ -3281,6 +3687,21 @@ charm@^1.0.0:
   dependencies:
     inherits "^2.0.1"
 
+"chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.5.0"
+  optionalDependencies:
+    fsevents "~2.3.1"
+
 chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -3305,12 +3726,10 @@ chownr@^1.1.1:
   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"
+chrome-trace-event@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
 ci-info@^2.0.0:
   version "2.0.0"
@@ -3357,6 +3776,11 @@ clean-css@^3.4.5:
     commander "2.8.x"
     source-map "0.4.x"
 
+clean-stack@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
 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"
@@ -3377,9 +3801,9 @@ cli-cursor@^3.1.0:
     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==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.0.tgz#36c7dc98fb6a9a76bd6238ec3f77e2425627e939"
+  integrity sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==
 
 cli-table3@^0.5.1:
   version "0.5.1"
@@ -3392,9 +3816,9 @@ cli-table3@^0.5.1:
     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=
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.6.tgz#e9d6aa859c7fe636981fd3787378c2a20bce92fc"
+  integrity sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==
   dependencies:
     colors "1.0.3"
 
@@ -3403,6 +3827,11 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
   integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
 
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+
 clone-response@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -3457,6 +3886,11 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -3481,7 +3915,12 @@ commander@2.8.x:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.20.0, commander@^2.6.0, commander@~2.20.3:
+commander@7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff"
+  integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==
+
+commander@^2.20.0, commander@^2.20.3, commander@^2.6.0:
   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==
@@ -3511,7 +3950,7 @@ component-emitter@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:
+component-emitter@^1.2.1, component-emitter@~1.3.0:
   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==
@@ -3556,7 +3995,7 @@ concat-stream@^1.5.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-configstore@^5.0.0:
+configstore@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
   integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
@@ -3588,10 +4027,10 @@ console-control-strings@^1.0.0, console-control-strings@~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==
+console-ui@^3.0.4, console-ui@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-3.1.2.tgz#51aef616ff02013c85ccee6a6d77ef7a94202e7a"
+  integrity sha512-+5j3R4wZJcEYZeXk30whc4ZU/+fWW9JMTNntVuMYpjZJ9n26Cxr0tUBXco1NRjVZRpRVvZ4DDKKKIHNYeUG9Dw==
   dependencies:
     chalk "^2.1.0"
     inquirer "^6"
@@ -3640,16 +4079,16 @@ cookie-signature@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==
 
+cookie@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
+  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
+
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -3672,23 +4111,18 @@ copy-descriptor@^0.1.0:
   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==
+core-js-compat@^3.9.0, core-js-compat@^3.9.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.10.1.tgz#62183a3a77ceeffcc420d907a3e6fc67d9b27f1c"
+  integrity sha512-ZHQTdTPkqvw2CeHiZC970NNJcnwzT6YIueDMASKt+p3WbZsLXOcoD392SkcWhkC0wBBHhlfhqGKKsNCQUozYtg==
   dependencies:
-    browserslist "^4.8.5"
+    browserslist "^4.16.3"
     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==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-object@^3.1.5:
   version "3.1.5"
@@ -3703,12 +4137,12 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   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==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
+  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
   dependencies:
     bn.js "^4.1.0"
-    elliptic "^6.0.0"
+    elliptic "^6.5.3"
 
 create-error-class@^3.0.0:
   version "3.0.2"
@@ -3717,7 +4151,7 @@ create-error-class@^3.0.0:
   dependencies:
     capture-stack-trace "^1.0.0"
 
-create-hash@^1.1.0, create-hash@^1.1.2:
+create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
@@ -3728,7 +4162,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
     ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
   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==
@@ -3752,9 +4186,9 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     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==
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -3782,17 +4216,27 @@ crypto-random-string@^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:
+cssfilter@0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
+  integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=
+
+cssom@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
+  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
+
+cssom@~0.3.6:
   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==
+cssstyle@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
+  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
   dependencies:
-    cssom "0.3.x"
+    cssom "~0.3.6"
 
 cyclist@^1.0.1:
   version "1.0.1"
@@ -3811,14 +4255,14 @@ dashdash@^1.12.0:
   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==
+data-urls@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
+  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
   dependencies:
-    abab "^2.0.0"
-    whatwg-mimetype "^2.2.0"
-    whatwg-url "^7.0.0"
+    abab "^2.0.3"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.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"
@@ -3828,18 +4272,18 @@ debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.
     ms "2.0.0"
 
 debug@^3.0.1, debug@^3.1.0, debug@^3.1.1:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   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==
+debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
   dependencies:
-    ms "^2.1.1"
+    ms "2.1.2"
 
 debug@~3.1.0:
   version "3.1.0"
@@ -3848,6 +4292,18 @@ debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
+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"
+
+decimal.js@^10.2.1:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
+  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
+
 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"
@@ -3877,7 +4333,7 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.2, define-properties@^1.1.3:
+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==
@@ -3961,7 +4417,7 @@ detect-newline@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:
+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==
@@ -3996,30 +4452,35 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+dom-walk@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
+  integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
+
 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==
+domexception@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
+  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
   dependencies:
-    webidl-conversions "^4.0.2"
+    webidl-conversions "^5.0.0"
 
-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==
+dot-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
+  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
   dependencies:
-    no-case "^3.0.3"
-    tslib "^1.10.0"
+    no-case "^3.0.4"
+    tslib "^2.0.3"
 
 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==
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
+  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
   dependencies:
     is-obj "^2.0.0"
 
@@ -4056,67 +4517,93 @@ editions@^1.1.1:
   resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
   integrity sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==
 
+editions@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-2.3.1.tgz#3bc9962f1978e801312fbd0aebfed63b49bfe698"
+  integrity sha512-ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA==
+  dependencies:
+    errlop "^2.0.0"
+    semver "^6.3.0"
+
 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==
+electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.712:
+  version "1.3.712"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.712.tgz#ae467ffe5f95961c6d41ceefe858fc36eb53b38f"
+  integrity sha512-3kRVibBeCM4vsgoHHGKHmPocLqtFAGTrebXxxtgKs87hNUzXrX2NuS3jnBys7IozCnw7viQlozxKkmty2KNfrw==
 
-elliptic@^6.0.0:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
-  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
+elliptic@^6.5.3:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
   dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
     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"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
 
-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==
+ember-auto-import@^1.10.1, ember-auto-import@^1.5.3:
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.11.2.tgz#b6e9a0dddd88a10692830ffa4f5dfd8c137c8919"
+  integrity sha512-Sm0x9qgAQEx+XSYeh5zeKj89Uo0c7XzULZxuziFPxbhtKy/G4pywhBuQ7EgDznTj8IZVxOdfe4ufcUxnJtbSgg==
   dependencies:
     "@babel/core" "^7.1.6"
-    "@babel/preset-env" "^7.0.0"
+    "@babel/preset-env" "^7.10.2"
     "@babel/traverse" "^7.1.6"
     "@babel/types" "^7.1.6"
-    "@embroider/core" "^0.4.3"
+    "@embroider/core" "^0.33.0"
     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"
+    broccoli-node-api "^1.7.0"
+    broccoli-plugin "^4.0.0"
+    broccoli-source "^3.0.0"
     debug "^3.1.0"
-    ember-cli-babel "^6.6.0"
+    ember-cli-babel "^7.0.0"
     enhanced-resolve "^4.0.0"
     fs-extra "^6.0.1"
-    fs-tree-diff "^1.0.0"
+    fs-tree-diff "^2.0.0"
     handlebars "^4.3.1"
     js-string-escape "^1.0.1"
-    lodash "^4.17.10"
+    lodash "^4.17.19"
     mkdirp "^0.5.1"
-    pkg-up "^2.0.0"
-    resolve "^1.7.1"
+    resolve-package-path "^3.1.0"
     rimraf "^2.6.2"
+    semver "^7.3.4"
     symlink-or-copy "^1.2.0"
     typescript-memoize "^1.0.0-alpha.3"
     walk-sync "^0.3.3"
-    webpack "~4.28"
+    webpack "^4.43.0"
 
-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-buffered-proxy@^2.0.0-beta.0:
+  version "2.0.0-beta.0"
+  resolved "https://registry.yarnpkg.com/ember-buffered-proxy/-/ember-buffered-proxy-2.0.0-beta.0.tgz#65be4e2d0dcf40a5a2dab548c84a21aa332555a2"
+  integrity sha512-a0NomdLgQ9xTaSc8PFTiPEwNMwWT9gBuKD+qQ42rwpR3ISMBEtmJkIUHDLdgr1MjxMBj6tnXum4GfKrAl0HHRg==
+  dependencies:
+    ember-cli-babel "^7.11.1"
+    ember-cli-htmlbars "^4.0.5"
+    ember-notify-property-change-polyfill "^0.0.1"
+
+ember-cli-app-version@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-4.0.0.tgz#033057ec5fe4d3ecdf5ac5380d442e2dc9f7526a"
+  integrity sha512-YRH1r4vjA9ZIgTVJ38zWxhtt4SCzIHb0ppEsO/z+JV0ZTQlS3+2dT5RhJWz7O3dyw5FWnlIng+gPRoQEz1umHA==
+  dependencies:
+    ember-cli-babel "^7.22.1"
+    git-repo-info "^2.1.1"
+
+ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, ember-cli-babel-plugin-helpers@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
+  integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
 ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.6.0:
   version "6.18.0"
@@ -4137,35 +4624,36 @@ ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.6.0:
     ember-cli-version-checker "^2.1.2"
     semver "^5.5.0"
 
-ember-cli-babel@^7.11.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==
+ember-cli-babel@^7.0.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.2, ember-cli-babel@^7.7.3:
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.3.tgz#e93ce7ec458208894d10844cf76e41cc06fdbeb6"
+  integrity sha512-ZCs0g99d3kYaHs1+HT33oMY7/K+nLCAAv7dCLxsMzg7cQf55O6Pq4ZKnWEr3IHVs33xbJFnEb9prt1up36QVnw==
   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/core" "^7.12.0"
+    "@babel/helper-compilation-targets" "^7.12.0"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-decorators" "^7.13.5"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-runtime" "^7.13.9"
+    "@babel/plugin-transform-typescript" "^7.13.0"
+    "@babel/polyfill" "^7.11.5"
+    "@babel/preset-env" "^7.12.0"
+    "@babel/runtime" "7.12.18"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-debug-macros "^0.3.4"
     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"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-module-resolver "^3.2.0"
+    broccoli-babel-transpiler "^7.8.0"
     broccoli-debug "^0.6.4"
-    broccoli-funnel "^2.0.1"
-    broccoli-source "^1.1.0"
+    broccoli-funnel "^2.0.2"
+    broccoli-source "^2.1.2"
     clone "^2.1.2"
-    ember-cli-babel-plugin-helpers "^1.1.0"
+    ember-cli-babel-plugin-helpers "^1.1.1"
     ember-cli-version-checker "^4.1.0"
     ensure-posix-path "^1.0.2"
     fixturify-project "^1.10.0"
+    resolve-package-path "^3.1.0"
     rimraf "^3.0.1"
     semver "^5.5.0"
 
@@ -4195,13 +4683,13 @@ ember-cli-get-component-path-option@^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@^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==
+ember-cli-htmlbars@^4.0.5, ember-cli-htmlbars@^4.2.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.5.0.tgz#d299e4f7eba6f30dc723ee086906cc550beb252e"
+  integrity sha512-bYJpK1pqFu9AadDAGTw05g2LMNzY8xTCIqQm7dMJmKEoUpLRFbPf4SfHXrktzDh7Q5iggl6Skzf1M0bPlIxARw==
   dependencies:
     "@ember/edition-utils" "^1.2.0"
-    babel-plugin-htmlbars-inline-precompile "^3.0.1"
+    babel-plugin-htmlbars-inline-precompile "^3.2.0"
     broccoli-debug "^0.6.5"
     broccoli-persistent-filter "^2.3.1"
     broccoli-plugin "^3.1.0"
@@ -4215,6 +4703,28 @@ ember-cli-htmlbars@^4.2.0:
     strip-bom "^4.0.0"
     walk-sync "^2.0.2"
 
+ember-cli-htmlbars@^5.7.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.1.tgz#eb5b88c7d9083bc27665fb5447a9b7503b32ce4f"
+  integrity sha512-9laCgL4tSy48orNoQgQKEHp93MaqAs9ZOl7or5q+8iyGGJHW6sVXIYrVv5/5O9HfV6Ts8/pW1rSoaeKyLUE+oA==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-htmlbars-inline-precompile "^5.0.0"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.3"
+    common-tags "^1.8.0"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^5.1.2"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    json-stable-stringify "^1.0.1"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+    strip-bom "^4.0.0"
+    walk-sync "^2.2.0"
+
 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"
@@ -4284,6 +4794,20 @@ ember-cli-template-lint@^1.0.0-beta.3:
     strip-ansi "^4.0.0"
     walk-sync "^1.1.3"
 
+ember-cli-terser@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-terser/-/ember-cli-terser-4.0.1.tgz#0da0b8f2b09989e8c992b207553ddec1bbb65915"
+  integrity sha512-vvp0uVl8reYeW9EZjSXRPR3Bq7y4u9CYlUdI7j/WzMPDj3/gUHU4Z7CHYOCrftrClQvFfqO2eXmHwDA6F7SLug==
+  dependencies:
+    broccoli-terser-sourcemap "^4.1.0"
+
+ember-cli-test-loader@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-3.0.0.tgz#1c036fc48de36155355fcda3266af63f977826f1"
+  integrity sha512-wfFRBrfO9gaKScYcdQxTfklx9yp1lWK6zv1rZRpkas9z2SHyJojF7NOQRWQgSB3ypm7vfpiF8VsFFVVr7VBzAQ==
+  dependencies:
+    ember-cli-babel "^7.13.2"
+
 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"
@@ -4319,6 +4843,22 @@ ember-cli-typescript@^2.0.2:
     stagehand "^1.0.0"
     walk-sync "^1.0.0"
 
+ember-cli-typescript@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-4.1.0.tgz#2ff17be2e6d26b58c88b1764cb73887e7176618b"
+  integrity sha512-zSuKG8IQuYE3vS+c7V0mHJqwrN/4Wo9Wr50+0NUjnZH3P99ChynczQHu/P7WSifkO6pF6jaxwzf09XzWvG8sVw==
+  dependencies:
+    ansi-to-html "^0.6.6"
+    broccoli-stew "^3.0.0"
+    debug "^4.0.0"
+    execa "^4.0.0"
+    fs-extra "^9.0.1"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^7.3.2"
+    stagehand "^1.0.0"
+    walk-sync "^2.2.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"
@@ -4327,7 +4867,7 @@ ember-cli-uglify@^3.0.0:
     broccoli-uglify-sourcemap "^3.1.0"
     lodash.defaultsdeep "^4.6.0"
 
-ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2:
+ember-cli-version-checker@^2.1.0, 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==
@@ -4344,120 +4884,139 @@ ember-cli-version-checker@^3.0.0, ember-cli-version-checker@^3.0.1, ember-cli-ve
     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==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-4.1.1.tgz#27b938228306cb0dbc4f74e95c536cdd6448e499"
+  integrity sha512-bzEWsTMXUGEJfxcAGWPe6kI7oHEGD3jaxUWDYPTqzqGhNkgPwXTBgoWs9zG1RaSMaOPFnloWuxRcoHi4TrYS3Q==
   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==
+ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-5.1.2.tgz#649c7b6404902e3b3d69c396e054cea964911ab0"
+  integrity sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==
   dependencies:
-    "@babel/core" "^7.7.2"
-    "@babel/plugin-transform-modules-amd" "^7.5.0"
+    resolve-package-path "^3.1.0"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+
+ember-cli@~3.25.3:
+  version "3.25.3"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.25.3.tgz#9ceb694aafbdb48642fab748f970cdec98d6ad39"
+  integrity sha512-fMOjBamGAQ9aC0x8X0uZdtZ+l7/+dp/I1IRDfEE/4Zmmq94SBi5hW4RoO8/OF0OmaCxyIdnsZN43se6bxJ2yOw==
+  dependencies:
+    "@babel/core" "^7.12.10"
+    "@babel/plugin-transform-modules-amd" "^7.12.1"
     amd-name-resolver "^1.3.1"
-    babel-plugin-module-resolver "^3.2.0"
-    bower-config "^1.4.1"
+    babel-plugin-module-resolver "^4.0.0"
+    bower-config "^1.4.3"
     bower-endpoint-parser "0.2.2"
-    broccoli "^3.2.0"
+    broccoli "^3.5.0"
     broccoli-amd-funnel "^2.0.1"
-    broccoli-babel-transpiler "^7.3.0"
+    broccoli-babel-transpiler "^7.8.0"
     broccoli-builder "^0.18.14"
-    broccoli-concat "^3.7.4"
+    broccoli-concat "^4.2.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-middleware "^2.1.1"
+    broccoli-slow-trees "^3.1.0"
     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"
+    chalk "^4.1.0"
     ci-info "^2.0.0"
     clean-base-url "^1.0.0"
     compression "^1.7.4"
-    configstore "^5.0.0"
-    console-ui "^3.1.1"
+    configstore "^5.0.1"
+    console-ui "^3.1.2"
     core-object "^3.1.5"
     dag-map "^2.0.2"
-    diff "^4.0.1"
+    diff "^4.0.2"
     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"
+    ember-source-channel-url "^3.0.0"
+    ensure-posix-path "^1.1.1"
+    execa "^4.1.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"
+    express "^4.17.1"
+    filesize "^6.1.0"
+    find-up "^5.0.0"
+    find-yarn-workspace-root "^2.0.0"
+    fixturify-project "^2.1.0"
+    fs-extra "^9.0.1"
     fs-tree-diff "^2.0.1"
     get-caller-file "^2.0.5"
-    git-repo-info "^2.1.0"
-    glob "^7.1.4"
+    git-repo-info "^2.1.1"
+    glob "^7.1.6"
     heimdalljs "^0.2.6"
-    heimdalljs-fs-monitor "^0.2.3"
+    heimdalljs-fs-monitor "^1.1.0"
     heimdalljs-graph "^1.0.0"
     heimdalljs-logger "^0.1.10"
-    http-proxy "^1.18.0"
+    http-proxy "^1.18.1"
     inflection "^1.12.0"
     is-git-url "^1.0.0"
-    isbinaryfile "^3.0.3"
-    js-yaml "^3.13.1"
+    is-language-code "^2.0.0"
+    isbinaryfile "^4.0.6"
+    js-yaml "^3.14.0"
     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"
+    markdown-it "^12.0.4"
+    markdown-it-terminal "0.2.1"
     minimatch "^3.0.4"
-    morgan "^1.9.1"
+    morgan "^1.10.0"
     nopt "^3.0.6"
-    npm-package-arg "^6.1.1"
+    npm-package-arg "^8.1.0"
     p-defer "^3.0.0"
-    portfinder "^1.0.25"
-    promise-map-series "^0.2.3"
-    promise.prototype.finally "^3.1.1"
+    portfinder "^1.0.28"
+    promise-map-series "^0.3.0"
+    promise.hash.helper "^1.0.7"
     quick-temp "^0.1.8"
-    resolve "^1.12.0"
-    resolve-package-path "^1.2.7"
-    rsvp "^4.8.5"
+    resolve "^1.19.0"
+    resolve-package-path "^3.1.0"
     sane "^4.1.0"
-    semver "^6.3.0"
+    semver "^7.3.4"
     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"
+    sort-package-json "^1.48.0"
+    symlink-or-copy "^1.3.1"
+    temp "0.9.4"
+    testem "^3.2.0"
+    tiny-lr "^2.0.0"
+    tree-sync "^2.1.0"
+    uuid "^8.3.2"
+    walk-sync "^2.2.0"
     watch-detector "^1.0.0"
+    workerpool "^6.0.3"
     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==
+ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.4.tgz#70e0fef7048969141626eed6006f3880df612cd1"
+  integrity sha512-qjzQVtogyYJrSs6I4DuyCDwDCaj5JWBVNPoZDZBk8pt7caNoN0eBYRYJdin95QKaNMQODxTLPWaI4UUDQ1YWhg==
   dependencies:
     babel-plugin-debug-macros "^0.2.0"
-    ember-cli-version-checker "^2.1.1"
+    ember-cli-version-checker "^5.1.1"
+    fs-extra "^9.1.0"
     semver "^5.4.1"
 
+ember-destroyable-polyfill@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.3.tgz#1673ed66609a82268ef270a7d917ebd3647f11e1"
+  integrity sha512-TovtNqCumzyAiW0/OisSkkVK93xnVF4NRU6+FN0ubpfwEOpRrmM2RqDwXI6YAChCgSHON1cz0DfQStpA1Gjuuw==
+  dependencies:
+    ember-cli-babel "^7.22.1"
+    ember-cli-version-checker "^5.1.1"
+    ember-compatibility-helpers "^1.2.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"
@@ -4469,11 +5028,11 @@ ember-export-application-global@^2.0.1:
   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==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.2.tgz#8a47a656c1f64f9b10cecdb4e22a9d52ad9c7efa"
+  integrity sha512-CYR+U/wRxLbrfYN3dh+0Tb6mFaxJKfdyz+wNql6cqTrA0BBi9k6J3AaKXj273TqvEpyyXegQFFkZEiuZdYtgJw==
   dependencies:
-    ember-cli-babel "^7.11.0"
+    ember-cli-babel "^7.13.0"
     ember-cli-typescript "^2.0.2"
 
 ember-maybe-import-regenerator@^0.1.6:
@@ -4486,6 +5045,29 @@ ember-maybe-import-regenerator@^0.1.6:
     ember-cli-babel "^6.0.0-beta.4"
     regenerator-runtime "^0.9.5"
 
+ember-notify-property-change-polyfill@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/ember-notify-property-change-polyfill/-/ember-notify-property-change-polyfill-0.0.1.tgz#636f75e2aaf67e2c56cb13e7139499226fd60d55"
+  integrity sha1-Y2914qr2fixWyxPnE5SZIm/WDVU=
+  dependencies:
+    ember-cli-babel "^6.6.0"
+    ember-cli-version-checker "^2.1.0"
+
+ember-qunit@^5.1.2:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-5.1.4.tgz#bc69f963a0f5409ce33bee1e4d8146b1407147bf"
+  integrity sha512-L8L3TA5UYdsoJl9If88CU6Liu5Kr76uEpXimeJIyjoRX2kI57YWI2/76uiW7UU0qdYfvcmVazgd+MJGj9aB2JA==
+  dependencies:
+    broccoli-funnel "^3.0.3"
+    broccoli-merge-trees "^3.0.2"
+    common-tags "^1.8.0"
+    ember-auto-import "^1.10.1"
+    ember-cli-babel "^7.23.1"
+    ember-cli-test-loader "^3.0.0"
+    resolve-package-path "^3.1.0"
+    silent-error "^1.1.1"
+    validate-peer-dependencies "^1.1.0"
+
 ember-resolver@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-7.0.0.tgz#07ca86b3bae373395b44bba784b8c133f75d61c2"
@@ -4498,10 +5080,10 @@ ember-resolver@^7.0.0:
     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-rfc176-data@^0.3.12, ember-rfc176-data@^0.3.13, ember-rfc176-data@^0.3.17:
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.17.tgz#d4fc6c33abd6ef7b3440c107a28e04417b49860a"
+  integrity sha512-EVzTTKqxv9FZbEh6Ktw56YyWRAA0MijKvl7H8C06wVF+8f/cRRz3dXxa4nkwjzyVwx4rzKGuIGq77hxJAQhWWw==
 
 ember-router-generator@^2.0.0:
   version "2.0.0"
@@ -4526,6 +5108,13 @@ ember-source-channel-url@^2.0.1:
   dependencies:
     got "^8.0.1"
 
+ember-source-channel-url@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-3.0.0.tgz#bcd5be72c63fa0b8c390b3121783b462063e2a1b"
+  integrity sha512-vF/8BraOc66ZxIDo3VuNP7iiDrnXEINclJgSJmqwAAEpg84Zb1DHPI22XTXSDA+E8fW5btPUxu65c3ZXi8AQFA==
+  dependencies:
+    node-fetch "^2.6.0"
+
 ember-source@~3.15.0:
   version "3.15.0"
   resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.15.0.tgz#f6500c6d289ce58231bf1e6695c4974df2be7390"
@@ -4630,56 +5219,56 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   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==
+engine.io-client@~3.5.0:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.1.tgz#b500458a39c0cd197a921e0e759721a746d0bdb9"
+  integrity sha512-oVu9kBkGbcggulyVF0kz6BV3ganqUeqXvD79WOFKa+11oK692w1NyFkuEj4xrkFRpZhn92QOqTk4RQq5LiBXbQ==
   dependencies:
-    component-emitter "1.2.1"
+    component-emitter "~1.3.0"
     component-inherit "0.0.3"
-    debug "~4.1.0"
+    debug "~3.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"
+    parseqs "0.0.6"
+    parseuri "0.0.6"
+    ws "~7.4.2"
     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==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
+  integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
-    base64-arraybuffer "0.1.5"
+    base64-arraybuffer "0.1.4"
     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==
+engine.io@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b"
+  integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==
   dependencies:
     accepts "~1.3.4"
     base64id "2.0.0"
-    cookie "0.3.1"
+    cookie "~0.4.1"
     debug "~4.1.0"
     engine.io-parser "~2.2.0"
-    ws "^7.1.2"
+    ws "~7.4.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==
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
   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:
+ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0, ensure-posix-path@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
   integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
@@ -4689,13 +5278,32 @@ entities@^1.1.2, entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
+entities@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+
+errlop@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/errlop/-/errlop-2.2.0.tgz#1ff383f8f917ae328bebb802d6ca69666a42d21b"
+  integrity sha512-e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw==
+
 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==
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
+  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
   dependencies:
     prr "~1.0.1"
 
+error@^4.3.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/error/-/error-4.4.0.tgz#bf69ff251fb4a279c19adccdaa6b61e90d9bf12a"
+  integrity sha1-v2n/JR+0onnBmtzNqmth6Q2b8So=
+  dependencies:
+    camelize "^1.0.0"
+    string-template "~0.2.0"
+    xtend "~4.0.0"
+
 error@^7.0.0:
   version "7.2.1"
   resolved "https://registry.yarnpkg.com/error/-/error-7.2.1.tgz#eab21a4689b5f684fc83da84a0e390de82d94894"
@@ -4703,22 +5311,27 @@ error@^7.0.0:
   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==
+es-abstract@^1.18.0-next.2:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
+  integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
   dependencies:
+    call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
+    get-intrinsic "^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"
+    has-symbols "^1.0.2"
+    is-callable "^1.2.3"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.2"
+    is-string "^1.0.5"
+    object-inspect "^1.9.0"
     object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.1"
-    string.prototype.trimright "^2.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.0"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -4729,6 +5342,11 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -4739,13 +5357,18 @@ 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=
 
-escodegen@^1.11.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
-  integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+escodegen@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
+  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
   dependencies:
     esprima "^4.0.1"
-    estraverse "^4.2.0"
+    estraverse "^5.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
@@ -4780,7 +5403,7 @@ eslint-plugin-node@^10.0.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-scope@^4.0.0, eslint-scope@^4.0.3:
+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==
@@ -4796,9 +5419,9 @@ eslint-utils@^1.3.1, eslint-utils@^1.4.2:
     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==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint@^5.6.0:
   version "5.16.0"
@@ -4867,28 +5490,28 @@ esprima@~3.0.0:
   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==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
   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==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
-    estraverse "^4.1.0"
+    estraverse "^5.2.0"
 
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.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==
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
 esutils@^2.0.2:
   version "2.0.3"
@@ -4900,6 +5523,13 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
+ev-store@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ev-store/-/ev-store-7.0.0.tgz#1ab0c7f82136505dd74b31d17701cb2be6d26558"
+  integrity sha1-GrDH+CE2UF3XSzHRdwHLK+bSZVg=
+  dependencies:
+    individual "^3.0.0"
+
 eventemitter3@^4.0.0:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
@@ -4911,9 +5541,9 @@ events-to-array@^1.0.1:
   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==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
@@ -4924,9 +5554,9 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     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==
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
+  integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
 
 execa@^1.0.0:
   version "1.0.0"
@@ -4956,6 +5586,21 @@ execa@^2.0.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
+execa@^4.0.0, execa@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.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"
@@ -4986,7 +5631,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-express@^4.10.7, express@^4.16.4:
+express@^4.10.7, express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
   integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
@@ -5065,6 +5710,11 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+extract-stack@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/extract-stack/-/extract-stack-2.0.0.tgz#11367bc865bfcd9bc0db3123e5edb57786f11f9b"
+  integrity sha512-AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ==
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -5075,10 +5725,15 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
+fake-xml-http-request@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.1.2.tgz#f1786720cae50bbb46273035a0173414f3e85e74"
+  integrity sha512-HaFMBi7r+oEC9iJNpc3bvcW7Z7iLmM26hPDmlb0mFwyANSsOQAtJxbdWsXITKOzZUyMYK0zYCv3h5yDj9TsiXg==
+
 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==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^2.2.6:
   version "2.2.7"
@@ -5092,10 +5747,10 @@ fast-glob@^2.2.6:
     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==
+fast-glob@^3.0.3:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
+  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -5135,17 +5790,31 @@ fast-sourcemap-concat@^1.4.0:
     source-map-url "^0.3.0"
     sourcemap-validator "^1.1.0"
 
+fast-sourcemap-concat@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-2.1.0.tgz#12dd36bfc38c804093e4bd1de61dd6216f574211"
+  integrity sha512-L9uADEnnHOeF4U5Kc3gzEs3oFpNCFkiTJXvT+nKmR0zcFqHZJJbszWT7dv4t9558FJRGpCj8UxUpTgz2zwiIZA==
+  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==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
+  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
   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=
+faye-websocket@^0.11.3:
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
+  integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
   dependencies:
     websocket-driver ">=0.5.1"
 
@@ -5187,11 +5856,16 @@ file-uri-to-path@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:
+filesize@^4.1.2:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-4.2.1.tgz#ab1cb2069db5d415911c1a13e144c0e743bc89bc"
   integrity sha512-bP82Hi8VRZX/TUBKfE24iiUGsB/sfm2WUrwTQyAzQrhO3V9IhcBBNBXMyzLY5orACxRyYJ3d2HeRVX+eFv4lmA==
 
+filesize@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00"
+  integrity sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==
+
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -5222,7 +5896,7 @@ finalhandler@1.1.2, finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-babel-config@^1.1.0:
+find-babel-config@^1.1.0, find-babel-config@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
   integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
@@ -5239,6 +5913,15 @@ find-cache-dir@^2.1.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
+find-cache-dir@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
+  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^3.0.2"
+    pkg-dir "^4.1.0"
+
 find-index@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-1.1.1.tgz#4b221f8d46b7f8bea33d8faed953f3ca7a081cbc"
@@ -5258,7 +5941,7 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^4.1.0:
+find-up@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -5266,7 +5949,15 @@ find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-yarn-workspace-root@^1.1.0, find-yarn-workspace-root@^1.2.1:
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+find-yarn-workspace-root@^1.1.0:
   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==
@@ -5274,6 +5965,13 @@ find-yarn-workspace-root@^1.1.0, find-yarn-workspace-root@^1.2.1:
     fs-extra "^4.0.3"
     micromatch "^3.1.4"
 
+find-yarn-workspace-root@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
+  integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
+  dependencies:
+    micromatch "^4.0.2"
+
 findup-sync@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
@@ -5303,6 +6001,15 @@ fixturify-project@^1.10.0:
     fixturify "^1.2.0"
     tmp "^0.0.33"
 
+fixturify-project@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-2.1.1.tgz#a511dd26700c6b64ac271ef4393e7124f153c81f"
+  integrity sha512-sP0gGMTr4iQ8Kdq5Ez0CVJOZOGWqzP5dv/veOTdFNywioKjkNWCHBi1q65DMpcNGUGeoOUWehyji274Q2wRgxA==
+  dependencies:
+    fixturify "^2.1.0"
+    tmp "^0.0.33"
+    type-fest "^0.11.0"
+
 fixturify@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-1.3.0.tgz#163c468093c7c4d90b70cde39fd6325f6528b25d"
@@ -5314,6 +6021,18 @@ fixturify@^1.2.0:
     fs-extra "^7.0.1"
     matcher-collection "^2.0.0"
 
+fixturify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-2.1.0.tgz#a0437faac9b6e4aeb35910a1214df866aeec5d75"
+  integrity sha512-gHq6UCv8DE91EpiaRSzrmvLoRvFOBzI961IQ3gXE5wfmMM1TtApDcZAonG2hnp6GJrVFCxHwP01wSw9VQJiJ1w==
+  dependencies:
+    "@types/fs-extra" "^8.1.0"
+    "@types/minimatch" "^3.0.3"
+    "@types/rimraf" "^2.0.3"
+    fs-extra "^8.1.0"
+    matcher-collection "^2.0.1"
+    walk-sync "^2.0.2"
+
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -5337,9 +6056,16 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
-  integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267"
+  integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==
+
+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -5440,10 +6166,20 @@ fs-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.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==
+fs-extra@^9.0.1, fs-extra@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs-merger@^3.0.1, fs-merger@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.1.0.tgz#f30f74f6c70b2ff7333ec074f3d2f22298152f3b"
+  integrity sha512-RZ9JtqugaE8Rkt7idO5NSwcxEGSDZpLmVFjtVQUm3f+bWun7JAU6fKyU6ZJUeUnKdJwGx8uaro+K4QQfOR7vpA==
   dependencies:
     broccoli-node-api "^1.7.0"
     broccoli-node-info "^2.1.0"
@@ -5462,16 +6198,6 @@ fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5
     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"
@@ -5510,13 +6236,18 @@ fs.realpath@^1.0.0:
   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==
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
   dependencies:
     bindings "^1.5.0"
     nan "^2.12.1"
 
+fsevents@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -5541,16 +6272,25 @@ gauge@~2.7.3:
     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==
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 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-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -5569,9 +6309,9 @@ get-stream@^4.0.0:
     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==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
   dependencies:
     pump "^3.0.0"
 
@@ -5618,7 +6358,7 @@ git-read-pkt-line@0.0.8:
     bops "0.0.3"
     through "~2.2.7"
 
-git-repo-info@^2.1.0:
+git-repo-info@^2.1.1:
   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==
@@ -5650,10 +6390,10 @@ glob-parent@^3.1.0:
     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==
+glob-parent@^5.1.0, glob-parent@~5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
@@ -5705,6 +6445,14 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
+global@^4.3.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
+  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
+  dependencies:
+    min-document "^2.19.0"
+    process "^0.11.10"
+
 globals@^11.1.0, globals@^11.7.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -5715,16 +6463,23 @@ globals@^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==
+globalyzer@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
+  integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==
+
+globby@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.0.tgz#abfcd0630037ae174a88590132c2f6804e291072"
+  integrity sha512-3LifW9M4joGZasyYPz2A1U74zbC/45fvpXUvO/9KbSa+VV0aGZarWkfdgKyR9sExNP0t0x0ss/UMJpNpcaTspw==
   dependencies:
+    "@types/glob" "^7.1.1"
     array-union "^2.1.0"
     dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
+    fast-glob "^3.0.3"
+    glob "^7.1.3"
+    ignore "^5.1.1"
+    merge2 "^1.2.3"
     slash "^3.0.0"
 
 globby@^9.2.0:
@@ -5741,6 +6496,11 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
+globrex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
+  integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
+
 got@^6.7.1:
   version "6.7.1"
   resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
@@ -5782,9 +6542,9 @@ got@^8.0.1:
     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==
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
@@ -5796,10 +6556,10 @@ growly@^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.0, handlebars@^4.7.3:
-  version "4.7.6"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
-  integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
+handlebars@^4.0.13, handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.4.2, handlebars@^4.5.1, handlebars@^4.7.0, handlebars@^4.7.3, handlebars@^4.7.6:
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
+  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
   dependencies:
     minimist "^1.2.5"
     neo-async "^2.6.0"
@@ -5814,11 +6574,11 @@ har-schema@^2.0.0:
   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==
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
   dependencies:
-    ajv "^6.5.5"
+    ajv "^6.12.3"
     har-schema "^2.0.0"
 
 has-ansi@^2.0.0:
@@ -5835,6 +6595,11 @@ has-ansi@^3.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+has-bigints@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
+  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
@@ -5862,10 +6627,10 @@ has-symbol-support-x@^1.4.1:
   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-symbols@^1.0.1, has-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
@@ -5918,12 +6683,13 @@ has@^1.0.3:
     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=
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
   dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
 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"
@@ -5945,11 +6711,14 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     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==
+heimdalljs-fs-monitor@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-1.1.0.tgz#0ad5aa1dac0a30d5940a74edeea3d515e70225e4"
+  integrity sha512-OH1LgPeqRo5kOzN5XhU/I4lUbqDqj0jx4+6vn33RTKcZTFmp/63KWbVrDDlk9iDlQ5j6FxmOeuoWJ2cjLjvNcQ==
   dependencies:
+    callsites "^3.1.0"
+    clean-stack "^2.2.0"
+    extract-stack "^2.0.0"
     heimdalljs "^0.2.3"
     heimdalljs-logger "^0.1.7"
 
@@ -5973,7 +6742,7 @@ heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3, heimdalljs@^0.2.5, heim
   dependencies:
     rsvp "~3.2.1"
 
-hmac-drbg@^1.0.0:
+hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -5997,17 +6766,24 @@ homedir-polyfill@^1.0.1:
   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==
+hosted-git-info@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961"
+  integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==
   dependencies:
-    whatwg-encoding "^1.0.1"
+    lru-cache "^6.0.0"
+
+html-encoding-sniffer@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
+  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
+  dependencies:
+    whatwg-encoding "^1.0.5"
+
+html-entities@^2.1.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488"
+  integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==
 
 http-cache-semantics@3.8.1:
   version "3.8.1"
@@ -6046,12 +6822,12 @@ http-errors@~1.7.2:
     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-parser-js@>=0.5.1:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
+  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
 
-http-proxy@^1.13.1, http-proxy@^1.18.0:
+http-proxy@^1.13.1, http-proxy@^1.18.1:
   version "1.18.1"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
   integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
@@ -6079,6 +6855,11 @@ https@^1.0.0:
   resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
   integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=
 
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
 iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -6087,9 +6868,9 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
     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==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -6101,15 +6882,15 @@ ignore@^4.0.3, ignore@^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==
+ignore@^5.1.1:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
 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==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
@@ -6124,6 +6905,11 @@ indexof@0.0.1:
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
   integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
+individual@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/individual/-/individual-3.0.0.tgz#e7ca4f85f8957b018734f285750dc22ec2f9862d"
+  integrity sha1-58pPhfiVewGHNPKFdQ3CLsL5hi0=
+
 infer-owner@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
@@ -6142,7 +6928,7 @@ inflight@^1.0.4:
     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:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, 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==
@@ -6158,9 +6944,9 @@ inherits@2.0.3:
   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==
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 inline-source-map-comment@^1.0.5:
   version "1.0.5"
@@ -6193,24 +6979,33 @@ inquirer@^6, inquirer@^6.2.2:
     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==
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
   dependencies:
     ansi-escapes "^4.2.1"
-    chalk "^3.0.0"
+    chalk "^4.1.0"
     cli-cursor "^3.1.0"
-    cli-width "^2.0.0"
+    cli-width "^3.0.0"
     external-editor "^3.0.3"
     figures "^3.0.0"
-    lodash "^4.17.15"
+    lodash "^4.17.19"
     mute-stream "0.0.8"
     run-async "^2.4.0"
-    rxjs "^6.5.3"
+    rxjs "^6.6.0"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
+internal-slot@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
+  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
+  dependencies:
+    get-intrinsic "^1.1.0"
+    has "^1.0.3"
+    side-channel "^1.0.4"
+
 into-stream@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
@@ -6219,7 +7014,7 @@ into-stream@^3.1.0:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
-invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -6245,6 +7040,11 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-bigint@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
+  integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
+
 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"
@@ -6252,15 +7052,36 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-boolean-object@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
+  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+  dependencies:
+    call-bind "^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-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
+  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
+
+is-core-module@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
@@ -6299,6 +7120,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.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+
 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"
@@ -6350,13 +7176,28 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
+is-language-code@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-language-code/-/is-language-code-2.0.0.tgz#6f4d59c551d73b98c45cf9f1d3ce65cee060e65b"
+  integrity sha512-6xKmRRcP2YdmMBZMVS3uiJRPQgcMYolkD6hFw2Y4KjqyIyaJlCGxUt56tuu0iIV8q9r8kMEo0Gjd/GFwKrgjbw==
+
+is-negative-zero@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+
+is-number-object@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
+  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -6375,9 +7216,9 @@ is-obj@^2.0.0:
   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=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
+  integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
 is-plain-obj@2.1.0:
   version "2.1.0"
@@ -6396,17 +7237,23 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-potential-custom-element-name@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
+
 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==
+is-regex@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
+  integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
   dependencies:
-    has "^1.0.3"
+    call-bind "^1.0.2"
+    has-symbols "^1.0.1"
 
 is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
   version "1.2.0"
@@ -6423,7 +7270,12 @@ is-stream@^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:
+is-string@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
+  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+
+is-symbol@^1.0.2, is-symbol@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
   integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
@@ -6452,6 +7304,13 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
+is-wsl@^2.2.0:
+  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"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -6467,12 +7326,10 @@ isarray@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"
+isbinaryfile@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
+  integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -6505,6 +7362,15 @@ istextorbinary@2.1.0:
     editions "^1.1.1"
     textextensions "1 || 2"
 
+istextorbinary@^2.5.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.6.0.tgz#60776315fb0fa3999add276c02c69557b9ca28ab"
+  integrity sha512-+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA==
+  dependencies:
+    binaryextensions "^2.1.2"
+    editions "^2.2.0"
+    textextensions "^2.5.0"
+
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
@@ -6514,9 +7380,14 @@ isurl@^1.0.0-alpha5:
     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==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
+
+js-reporters@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-2.0.0.tgz#62ad6a512f1740d3ab4686b0059dd9f57cc0708b"
+  integrity sha512-VJd/86niT7GzsaVc+Yxrs8QPrYl1orzv8bYZPuSOtxU6rk/pv8aOXTcIa7HaANvtvdLMTsZspAiucNQ6T2QFHw==
 
 js-string-escape@^1.0.1:
   version "1.0.1"
@@ -6533,48 +7404,56 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.13.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==
+js-yaml@^3.13.0, js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
+  integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
+  dependencies:
+    argparse "^2.0.1"
+
 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==
+jsdom@^16.4.0:
+  version "16.5.3"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136"
+  integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA==
   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"
+    abab "^2.0.5"
+    acorn "^8.1.0"
+    acorn-globals "^6.0.0"
+    cssom "^0.4.4"
+    cssstyle "^2.3.0"
+    data-urls "^2.0.0"
+    decimal.js "^10.2.1"
+    domexception "^2.0.1"
+    escodegen "^2.0.0"
+    html-encoding-sniffer "^2.0.1"
+    is-potential-custom-element-name "^1.0.0"
+    nwsapi "^2.2.0"
+    parse5 "6.0.1"
+    request "^2.88.2"
+    request-promise-native "^1.0.9"
+    saxes "^5.0.1"
+    symbol-tree "^3.2.4"
+    tough-cookie "^4.0.0"
+    w3c-hr-time "^1.0.2"
+    w3c-xmlserializer "^2.0.0"
+    webidl-conversions "^6.1.0"
     whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.2.0"
-    whatwg-url "^7.0.0"
-    ws "^6.1.0"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.5.0"
+    ws "^7.4.4"
     xml-name-validator "^3.0.0"
 
 jsesc@^1.3.0:
@@ -6647,9 +7526,9 @@ json5@^1.0.1:
     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==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
   dependencies:
     minimist "^1.2.5"
 
@@ -6667,6 +7546,15 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  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"
@@ -6682,6 +7570,11 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+just-extend@^4.0.2:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
+  integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==
+
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
@@ -6722,18 +7615,6 @@ leek@0.0.24:
     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"
@@ -6742,6 +7623,14 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+line-column@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
+  integrity sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=
+  dependencies:
+    isarray "^1.0.0"
+    isobject "^2.0.0"
+
 line-stream@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/line-stream/-/line-stream-0.0.0.tgz#888b7cc7951c6a05ce4d696dd1e6b8262371bb45"
@@ -6756,17 +7645,24 @@ linkify-it@^2.0.0:
   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==
+linkify-it@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8"
+  integrity sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==
+  dependencies:
+    uc.micro "^1.0.1"
 
-loader-runner@^2.3.0:
+livereload-js@^3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-3.3.2.tgz#c88b009c6e466b15b91faa26fd7c99d620e12651"
+  integrity sha512-w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==
+
+loader-runner@^2.4.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:
+loader-utils@^1.2.3, 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==
@@ -6803,6 +7699,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash._baseassign@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
@@ -6884,6 +7787,11 @@ lodash.debounce@^3.1.1:
   dependencies:
     lodash._getnative "^3.0.0"
 
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+
 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"
@@ -6907,6 +7815,11 @@ lodash.foreach@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
   integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
 
+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.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
@@ -6941,11 +7854,6 @@ lodash.restparam@^3.0.0:
   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"
@@ -6971,10 +7879,10 @@ lodash.uniqby@^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.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.6.1, lodash@^4.7.0:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log-symbols@^2.2.0:
   version "2.2.0"
@@ -6990,12 +7898,12 @@ loose-envify@^1.0.0:
   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==
+lower-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
+  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
   dependencies:
-    tslib "^1.10.0"
+    tslib "^2.0.3"
 
 lowercase-keys@1.0.0:
   version "1.0.0"
@@ -7014,6 +7922,20 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+magic-string@^0.25.7:
+  version "0.25.7"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
 make-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -7022,7 +7944,7 @@ make-dir@^2.0.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0:
+make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.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==
@@ -7048,17 +7970,28 @@ map-visit@^1.0.0:
   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=
+markdown-it-terminal@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.2.1.tgz#670fd5ea824a7dcaa1591dcbeef28bf70aff1705"
+  integrity sha512-e8hbK9L+IyFac2qY05R7paP+Fqw1T4pSQW3miK3VeG9QmpqBjg5Qzjv/v6C7YNxSNRS2Kp8hUFtm5lWU9eK4lw==
   dependencies:
     ansi-styles "^3.0.0"
     cardinal "^1.0.0"
     cli-table "^0.3.1"
-    lodash.merge "^4.6.0"
+    lodash.merge "^4.6.2"
     markdown-it "^8.3.1"
 
+markdown-it@^12.0.4:
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.0.4.tgz#eec8247d296327eac3ba9746bdeec9cfcc751e33"
+  integrity sha512-34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q==
+  dependencies:
+    argparse "^2.0.1"
+    entities "~2.1.0"
+    linkify-it "^3.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
 markdown-it@^8.3.1:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
@@ -7070,17 +8003,6 @@ markdown-it@^8.3.1:
     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"
@@ -7088,7 +8010,7 @@ matcher-collection@^1.0.0, matcher-collection@^1.1.1:
   dependencies:
     minimatch "^3.0.2"
 
-matcher-collection@^2.0.0:
+matcher-collection@^2.0.0, matcher-collection@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-2.0.1.tgz#90be1a4cf58d6f2949864f65bb3b0f3e41303b29"
   integrity sha512-daE62nS2ZQsDg9raM0IlZzLmI2u+7ZapXBwdoeBUKAYERPDDIc0qNqA8E0Rp2D+gspKR7BgIFP52GeujaGXWeQ==
@@ -7127,18 +8049,18 @@ media-typer@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==
+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-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=
+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"
@@ -7181,16 +8103,21 @@ merge-trees@^2.0.0:
     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==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+message-bus-client@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/message-bus-client/-/message-bus-client-3.3.0.tgz#ee38ad26fa54f14dce17e65cc466be4e1aa7028b"
+  integrity sha512-dPfGLsxTkw1fNaQ+9nwbB1TXH5NnLXapjGkJtW9fZVsq7fNHaSomiTHZfXJHBibePZ10RH6AuHGemWKqgMtlIA==
 
 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:
+micromatch@^3.1.10, 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==
@@ -7210,12 +8137,12 @@ micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
     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==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
   dependencies:
     braces "^3.0.1"
-    picomatch "^2.0.5"
+    picomatch "^2.2.3"
 
 miller-rabin@^4.0.0:
   version "4.0.1"
@@ -7225,17 +8152,17 @@ miller-rabin@^4.0.0:
     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-db@1.47.0, "mime-db@>= 1.43.0 < 2":
+  version "1.47.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
+  integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==
 
 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==
+  version "2.1.30"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d"
+  integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==
   dependencies:
-    mime-db "1.44.0"
+    mime-db "1.47.0"
 
 mime@1.6.0:
   version "1.6.0"
@@ -7257,12 +8184,19 @@ mimic-response@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
+min-document@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+  integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
+  dependencies:
+    dom-walk "^0.1.0"
+
 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:
+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=
@@ -7316,7 +8250,7 @@ mixin-deep@^1.2.0:
     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:
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -7328,7 +8262,7 @@ mktemp@~0.4.0:
   resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
   integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
 
-morgan@^1.9.1:
+morgan@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
   integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
@@ -7339,6 +8273,16 @@ morgan@^1.9.1:
     on-finished "~2.3.0"
     on-headers "~1.0.2"
 
+mousetrap-global-bind@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mousetrap-global-bind/-/mousetrap-global-bind-1.1.0.tgz#cd7de9222bd0646fa2e010d54c84a74c26a88edd"
+  integrity sha1-zX3pIivQZG+i4BDVTISnTCaojt0=
+
+mousetrap@^1.6.5:
+  version "1.6.5"
+  resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9"
+  integrity sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==
+
 mout@^1.0.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.2.tgz#c9b718a499806a0632cede178e80f436259e777d"
@@ -7366,11 +8310,16 @@ ms@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:
+ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 mustache@^3.0.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.2.1.tgz#89e78a9d207d78f2799b1e95764a25bf71a28322"
@@ -7387,9 +8336,9 @@ mute-stream@0.0.8:
   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==
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -7418,30 +8367,51 @@ negotiator@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==
+neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
+next-tick@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-0.2.2.tgz#75da4a927ee5887e39065880065b7336413b310d"
+  integrity sha1-ddpKkn7liH45BliABltzNkE7MQ0=
 
 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==
+nise@^4.0.4:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-4.1.0.tgz#8fb75a26e90b99202fa1e63f448f58efbcdedaf6"
+  integrity sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==
   dependencies:
-    lower-case "^2.0.1"
-    tslib "^1.10.0"
+    "@sinonjs/commons" "^1.7.0"
+    "@sinonjs/fake-timers" "^6.0.0"
+    "@sinonjs/text-encoding" "^0.7.1"
+    just-extend "^4.0.2"
+    path-to-regexp "^1.7.0"
+
+no-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
+  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
+  dependencies:
+    lower-case "^2.0.2"
+    tslib "^2.0.3"
+
+node-fetch@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
 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:
+node-libs-browser@^2.2.1:
   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==
@@ -7475,21 +8445,27 @@ node-modules-path@^1.0.0:
   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==
+node-notifier@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-9.0.1.tgz#cea837f4c5e733936c7b9005e6545cea825d1af4"
+  integrity sha512-fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg==
   dependencies:
     growly "^1.3.0"
-    is-wsl "^1.1.0"
-    semver "^5.5.0"
+    is-wsl "^2.2.0"
+    semver "^7.3.2"
     shellwords "^0.1.1"
-    which "^1.3.0"
+    uuid "^8.3.0"
+    which "^2.0.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-releases@^1.1.71:
+  version "1.1.71"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
+  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+
+node-watch@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.7.1.tgz#0caaa6a6833b0d533487f953c52a6c787769ba7c"
+  integrity sha512-UWblPYuZYrkCQCW5PxAwYSxaELNBLUckrTBBk8xr1/bUgyOkYYTsUcV4e3ytcazFEOyiRyiUrsG37pu6I0I05g==
 
 nopt@^3.0.6:
   version "3.0.6"
@@ -7505,7 +8481,7 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0:
+normalize-path@^3.0.0, 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==
@@ -7519,14 +8495,13 @@ normalize-url@2.0.1:
     query-string "^5.0.1"
     sort-keys "^2.0.0"
 
-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==
+npm-package-arg@^8.1.0:
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.2.tgz#b868016ae7de5619e729993fbd8d11dc3c52ab62"
+  integrity sha512-6Eem455JsSMJY6Kpd3EyWE+n5hC+g9bSyHr9K9U2zqZb7+02+hObQ2c0+8iDk/mNF+8r1MhY44WypKJAkySIYA==
   dependencies:
-    hosted-git-info "^2.7.1"
-    osenv "^0.1.5"
-    semver "^5.6.0"
+    hosted-git-info "^4.0.1"
+    semver "^7.3.4"
     validate-npm-package-name "^3.0.0"
 
 npm-run-path@^2.0.0:
@@ -7543,6 +8518,13 @@ npm-run-path@^3.0.0:
   dependencies:
     path-key "^3.0.0"
 
+npm-run-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
 npmlog@^4.0.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -7558,7 +8540,7 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-nwsapi@^2.0.9:
+nwsapi@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
@@ -7573,11 +8555,6 @@ object-assign@4.1.1, object-assign@^4.1.0, object-assign@^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"
@@ -7592,12 +8569,12 @@ object-hash@^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-inspect@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
 
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+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==
@@ -7609,23 +8586,24 @@ object-visit@^1.0.0:
   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==
+object.assign@^4.1.0, object.assign@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
+object.getownpropertydescriptors@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"
+  integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
 
 object.pick@^1.3.0:
   version "1.3.0"
@@ -7661,9 +8639,9 @@ onetime@^2.0.0:
     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==
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
@@ -7706,7 +8684,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~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.5:
+osenv@^0.1.3:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -7753,6 +8731,13 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -7774,6 +8759,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-timeout@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
@@ -7822,14 +8814,13 @@ parent-module@^1.0.0:
   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==
+parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
+  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
   dependencies:
-    asn1.js "^4.0.0"
+    asn1.js "^5.2.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"
@@ -7839,24 +8830,25 @@ parse-passwd@^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==
+parse-static-imports@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parse-static-imports/-/parse-static-imports-1.1.0.tgz#ae2f18f18da1a993080ae406a5219455c0bbad5d"
+  integrity sha512-HlxrZcISCblEV0lzXmAHheH/8qEkKgmqkdxyHTPbSqsTUV8GzqmN1L+SSti+VbNPfbBO3bYLPHDiUs2avbAdbA==
 
-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"
+parse5@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-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"
+parseqs@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
+  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
+
+parseuri@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
+  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
 
 parseurl@~1.3.3:
   version "1.3.3"
@@ -7935,6 +8927,13 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
+path-to-regexp@^1.7.0:
+  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"
+
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -7948,9 +8947,9 @@ path-type@^4.0.0:
   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==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
+  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -7963,10 +8962,10 @@ performance-now@^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==
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
+  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
 
 pify@^3.0.0:
   version "3.0.0"
@@ -7997,6 +8996,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+pkg-dir@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.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"
@@ -8004,19 +9010,21 @@ pkg-up@^2.0.0:
   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==
+pkg-up@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
+  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
+  dependencies:
+    find-up "^3.0.0"
 
-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==
+portfinder@^1.0.28:
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
+  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
   dependencies:
     async "^2.6.2"
     debug "^3.1.1"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.5"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
@@ -8038,10 +9046,18 @@ prepend-http@^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==
+pretender@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/pretender/-/pretender-3.4.3.tgz#a3b4160516007075d29127262f3a0063d19896e9"
+  integrity sha512-AlbkBly9R8KR+R0sTCJ/ToOeEoUMtt52QVCetui5zoSmeLOU3S8oobFsyPLm1O2txR6t58qDNysqPnA1vVi8Hg==
+  dependencies:
+    fake-xml-http-request "^2.1.1"
+    route-recognizer "^0.3.3"
+
+printf@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/printf/-/printf-0.6.1.tgz#b9afa3d3b55b7f2e8b1715272479fc756ed88650"
+  integrity sha512-is0ctgGdPJ5951KulgfzvHGwJtZ5ck8l042vRkV6jrkpBzTmb/lueTqguWHy2JfVA+RY6gFVlaZgUS0j7S/dsw==
 
 private@^0.1.6, private@^0.1.8:
   version "0.1.8"
@@ -8075,21 +9091,22 @@ promise-inflight@^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:
+promise-map-series@^0.2.1:
   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"
+promise-map-series@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.3.0.tgz#41873ca3652bb7a042b387d538552da9b576f8a1"
+  integrity sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==
+
+promise.hash.helper@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/promise.hash.helper/-/promise.hash.helper-1.0.7.tgz#2f39d8495df40dcdfbc1d5be9e9e56efeae7f180"
+  integrity sha512-0qhWYyCV9TYDMSooYw1fShIb7R6hsWYja7JLqbeb1MvHqDTvP/uy/R1RsyVqDi6GCiHOI4G5p2Hpr3IA+/l/+Q==
 
 proxy-addr@~2.0.5:
   version "2.0.6"
@@ -8104,7 +9121,7 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-psl@^1.1.28:
+psl@^1.1.28, psl@^1.1.33:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
@@ -8167,9 +9184,11 @@ qs@6.7.0:
   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==
+  version "6.10.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
+  integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+  dependencies:
+    side-channel "^1.0.4"
 
 qs@~6.5.2:
   version "6.5.2"
@@ -8195,6 +9214,11 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
 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"
@@ -8204,7 +9228,27 @@ quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
     rimraf "^2.5.4"
     underscore.string "~3.3.4"
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+qunit-dom@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-1.6.0.tgz#a4bea6a46329d221e4a317d712cb40709107b977"
+  integrity sha512-YwSqcLjQcRI0fUFpaSWwU10KIJPFW5Qh+d3cT5DOgx81dypRuUSiPkKFmBY/CDs/R1KdHRadthkcXg2rqAon8Q==
+  dependencies:
+    broccoli-funnel "^3.0.3"
+    broccoli-merge-trees "^4.2.0"
+    ember-cli-babel "^7.23.0"
+    ember-cli-version-checker "^5.1.1"
+
+qunit@^2.14.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.15.0.tgz#8ba3a3c5d13369ab1740337680600a98a7f8b591"
+  integrity sha512-9ZoOILeyRZzrdvy2m7M4S76bneGD75Bh4B2aot3uKRKZuoEvA9gevvzU339L805Ys0AN2C7cnAV9nIBD5t72IQ==
+  dependencies:
+    commander "7.1.0"
+    js-reporters "2.0.0"
+    node-watch "0.7.1"
+    tiny-glob "0.2.8"
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
@@ -8265,7 +9309,7 @@ rc@^1.0.1, rc@^1.1.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-"readable-stream@2 || 3":
+"readable-stream@2 || 3", readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -8293,6 +9337,13 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
+  dependencies:
+    picomatch "^2.2.1"
+
 recast@^0.18.1:
   version "0.18.10"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
@@ -8318,9 +9369,9 @@ regenerate-unicode-properties@^8.2.0:
     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==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.10.5:
   version "0.10.5"
@@ -8333,9 +9384,9 @@ regenerator-runtime@^0.11.0:
   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==
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
 
 regenerator-runtime@^0.9.5:
   version "0.9.6"
@@ -8352,12 +9403,11 @@ regenerator-transform@^0.10.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==
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
   dependencies:
     "@babel/runtime" "^7.8.4"
-    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -8367,6 +9417,14 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+regexp.prototype.flags@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
+  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -8386,10 +9444,10 @@ regexpu-core@^2.0.0:
     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==
+regexpu-core@^4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
   dependencies:
     regenerate "^1.4.0"
     regenerate-unicode-properties "^8.2.0"
@@ -8419,9 +9477,9 @@ regjsgen@^0.2.0:
   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==
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
 regjsparser@^0.1.4:
   version "0.1.5"
@@ -8431,9 +9489,9 @@ regjsparser@^0.1.4:
     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==
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
+  integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -8451,9 +9509,9 @@ remove-trailing-separator@^1.0.1:
   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==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
 repeat-string@^1.6.1:
   version "1.6.1"
@@ -8467,23 +9525,23 @@ repeating@^2.0.0:
   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==
+request-promise-core@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
+  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
   dependencies:
-    lodash "^4.17.15"
+    lodash "^4.17.19"
 
-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==
+request-promise-native@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
+  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
   dependencies:
-    request-promise-core "1.1.3"
+    request-promise-core "1.1.4"
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@^2.88.0:
+request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -8519,6 +9577,11 @@ reselect@^3.0.1:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
   integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
 
+reselect@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
+  integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
+
 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"
@@ -8532,7 +9595,7 @@ resolve-from@^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:
+resolve-package-path@^1.0.11, resolve-package-path@^1.2.2, resolve-package-path@^1.2.6:
   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==
@@ -8548,6 +9611,14 @@ resolve-package-path@^2.0.0:
     path-root "^0.1.1"
     resolve "^1.13.1"
 
+resolve-package-path@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-3.1.0.tgz#35faaa5d54a9c7dd481eb7c4b2a44410c9c763d8"
+  integrity sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.17.0"
+
 resolve-path@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
@@ -8561,11 +9632,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-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==
+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.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
   dependencies:
+    is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
 responselike@1.0.2:
@@ -8615,7 +9687,7 @@ rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimra
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.1, rimraf@^3.0.2:
+rimraf@^3.0.0, 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==
@@ -8630,6 +9702,11 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
+route-recognizer@^0.3.3:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
+  integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==
+
 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"
@@ -8651,9 +9728,11 @@ run-async@^2.2.0, run-async@^2.4.0:
   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==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
@@ -8662,10 +9741,10 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   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==
+rxjs@^6.4.0, rxjs@^6.6.0:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -8674,10 +9753,10 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   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-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, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-json-parse@~1.0.1:
   version "1.0.1"
@@ -8711,20 +9790,19 @@ sane@^4.0.0, sane@^4.1.0:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-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==
+sass@^1.32.8:
+  version "1.32.8"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc"
+  integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==
   dependencies:
-    xmlchars "^2.1.1"
+    chokidar ">=2.0.0 <4.0.0"
 
-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==
+saxes@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
+  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
   dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
+    xmlchars "^2.2.0"
 
 schema-utils@^1.0.0:
   version "1.0.0"
@@ -8736,12 +9814,13 @@ schema-utils@^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==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
+  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
   dependencies:
-    ajv "^6.12.0"
-    ajv-keywords "^3.4.1"
+    "@types/json-schema" "^7.0.5"
+    ajv "^6.12.4"
+    ajv-keywords "^3.5.2"
 
 semver@7.0.0:
   version "7.0.0"
@@ -8753,11 +9832,18 @@ semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semve
   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:
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, 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==
 
+semver@^7.3.2, semver@^7.3.4:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -8777,10 +9863,12 @@ send@0.17.1:
     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==
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
 
 serve-static@1.14.1:
   version "1.14.1"
@@ -8859,6 +9947,15 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
 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"
@@ -8871,10 +9968,22 @@ silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.1:
   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==
+simple-html-tokenizer@^0.5.8, simple-html-tokenizer@^0.5.9:
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz#4c5186083c164ba22a7b477b7687ac056ad6b1d9"
+  integrity sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og==
+
+sinon@^9.2.0:
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.4.tgz#e55af4d3b174a4443a8762fa8421c2976683752b"
+  integrity sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==
+  dependencies:
+    "@sinonjs/commons" "^1.8.1"
+    "@sinonjs/fake-timers" "^6.0.1"
+    "@sinonjs/samsam" "^5.3.1"
+    diff "^4.0.2"
+    nise "^4.0.4"
+    supports-color "^7.1.0"
 
 slash@^1.0.0:
   version "1.0.0"
@@ -8901,12 +10010,12 @@ slice-ansi@^2.1.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==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
+  integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==
   dependencies:
-    dot-case "^3.0.3"
-    tslib "^1.10.0"
+    dot-case "^3.0.4"
+    tslib "^2.0.3"
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -8943,54 +10052,51 @@ socket.io-adapter@~1.1.0:
   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==
+socket.io-client@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
+  integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==
   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"
+    component-emitter "~1.3.0"
+    debug "~3.1.0"
+    engine.io-client "~3.5.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"
+    parseqs "0.0.6"
+    parseuri "0.0.6"
     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==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6"
+  integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==
   dependencies:
-    component-emitter "1.2.1"
+    component-emitter "~1.3.0"
     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==
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a"
+  integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==
   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==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2"
+  integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==
   dependencies:
     debug "~4.1.0"
-    engine.io "~3.4.0"
+    engine.io "~3.5.0"
     has-binary2 "~1.0.2"
     socket.io-adapter "~1.1.0"
-    socket.io-client "2.3.0"
+    socket.io-client "2.4.0"
     socket.io-parser "~3.4.0"
 
 sort-keys@^2.0.0:
@@ -9005,15 +10111,15 @@ sort-object-keys@^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==
+sort-package-json@^1.48.0:
+  version "1.49.0"
+  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.49.0.tgz#82845ab598501bb35875f326e4768a5ab5f15335"
+  integrity sha512-3YuqFGThwc9X0TZLYohOUJJ/P6uJIVcTeuJOc6ZWw4f1fHpTHIfVysKer4qXtrZ2zvwwU2aEcb555Bo+2fwIgQ==
   dependencies:
     detect-indent "^6.0.0"
     detect-newline "3.1.0"
     git-hooks-list "1.0.3"
-    globby "11.0.0"
+    globby "10.0.0"
     is-plain-obj "2.1.0"
     sort-object-keys "^1.1.3"
 
@@ -9040,7 +10146,7 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@~0.5.12:
+source-map-support@~0.5.12, source-map-support@~0.5.19:
   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==
@@ -9054,9 +10160,9 @@ source-map-url@^0.3.0:
   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=
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
 source-map@0.4.x, source-map@^0.4.2:
   version "0.4.4"
@@ -9082,6 +10188,16 @@ source-map@~0.1.x:
   dependencies:
     amdefine ">=0.0.4"
 
+source-map@~0.7.2:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
+sourcemap-codec@^1.4.4:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
 sourcemap-validator@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/sourcemap-validator/-/sourcemap-validator-1.1.1.tgz#3d7d8a399ccab09c1fedc510d65436e25b1c386b"
@@ -9135,9 +10251,9 @@ sshpk@^1.7.0:
     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==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
     figgy-pudding "^3.5.1"
 
@@ -9203,7 +10319,7 @@ strict-uri-encode@^1.0.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:
+string-template@~0.2.0, 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=
@@ -9235,47 +10351,42 @@ string-width@^3.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==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
+  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
   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==
+string.prototype.matchall@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz#608f255e93e072107f5de066f81a2dfb78cf6b29"
+  integrity sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+    es-abstract "^1.18.0-next.2"
+    has-symbols "^1.0.1"
+    internal-slot "^1.0.3"
+    regexp.prototype.flags "^1.3.1"
+    side-channel "^1.0.4"
 
-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==
+string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
   dependencies:
+    call-bind "^1.0.2"
     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==
+string.prototype.trimstart@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
+  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
   dependencies:
+    call-bind "^1.0.2"
     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"
@@ -9374,18 +10485,18 @@ supports-color@^5.3.0:
     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==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
-symbol-tree@^3.2.2:
+symbol-tree@^3.2.4:
   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:
+symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0, symlink-or-copy@^1.3.1:
   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==
@@ -9401,6 +10512,17 @@ sync-disk-cache@^1.3.3:
     rimraf "^2.2.8"
     username-sync "^1.0.2"
 
+sync-disk-cache@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sync-disk-cache/-/sync-disk-cache-2.1.0.tgz#01e879edc41c34a01fcdda5b39d47dd496e154a6"
+  integrity sha512-vngT2JmkSapgq0z7uIoYtB9kWOOzMihAAYq/D3Pjm/ODOGMgS4r++B+OZ09U4hWR6EaOdy9eqQ7/8ygbH3wehA==
+  dependencies:
+    debug "^4.1.1"
+    heimdalljs "^0.2.6"
+    mkdirp "^0.5.0"
+    rimraf "^3.0.0"
+    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"
@@ -9420,46 +10542,56 @@ tap-parser@^7.0.0:
     js-yaml "^3.2.7"
     minipass "^2.2.0"
 
-tapable@^1.0.0, tapable@^1.1.0:
+tapable@^1.0.0, tapable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-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==
+temp@0.9.4:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.4.tgz#cd20a8580cb63635d0e4e9d4bd989d44286e7620"
+  integrity sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==
   dependencies:
+    mkdirp "^0.5.1"
     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==
+terser-webpack-plugin@^1.4.3:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
+  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
   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"
+    serialize-javascript "^4.0.0"
     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==
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
   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==
+terser@^5.3.0:
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.1.tgz#a48eeac5300c0a09b36854bf90d9c26fb201973c"
+  integrity sha512-yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.7.2"
+    source-map-support "~0.5.19"
+
+testem@^3.2.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-3.4.0.tgz#48ab6b98e96085eeddac1fb46337872b13e9e06c"
+  integrity sha512-09mhy7fQj9o1W1c/Lfcs56FYqhFiZrXZjnOSJn+KxWAdYjbF5yHEuGrg+L5ooBlleCGD9r1TQwKd3+DixskT0Q==
   dependencies:
     backbone "^1.1.2"
     bluebird "^3.4.6"
@@ -9480,9 +10612,9 @@ testem@^2.17.0:
     lodash.uniqby "^4.7.0"
     mkdirp "^0.5.1"
     mustache "^3.0.0"
-    node-notifier "^5.0.1"
+    node-notifier "^9.0.1"
     npmlog "^4.0.0"
-    printf "^0.5.1"
+    printf "^0.6.1"
     rimraf "^2.4.4"
     socket.io "^2.1.0"
     spawn-args "^0.2.0"
@@ -9496,7 +10628,7 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-"textextensions@1 || 2":
+"textextensions@1 || 2", textextensions@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4"
   integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==
@@ -9510,10 +10642,11 @@ through2@^2.0.0:
     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==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
+  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
   dependencies:
+    inherits "^2.0.4"
     readable-stream "2 || 3"
 
 through@^2.3.6:
@@ -9532,21 +10665,29 @@ timed-out@^4.0.0, timed-out@^4.0.1:
   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==
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
+  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
   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==
+tiny-glob@0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.8.tgz#b2792c396cc62db891ffa161fe8b33e76123e531"
+  integrity sha512-vkQP7qOslq63XRX9kMswlby99kyO5OvKptw7AMwBVMjXEI7Tb61eoI5DydyEMOseyGS5anDN1VPoVxEvH01q8w==
+  dependencies:
+    globalyzer "0.1.0"
+    globrex "^0.1.2"
+
+tiny-lr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-2.0.0.tgz#863659d7ce1ed201a117d8197d7f8b9a27bdc085"
+  integrity sha512-f6nh0VMRvhGx4KCeK1lQ/jaL0Zdb5WdR+Jk8q9OSUQnaSDxAEGH1fgqLZ+cMl5EW3F2MGnCsalBO1IsnnogW1Q==
   dependencies:
     body "^5.1.0"
     debug "^3.1.0"
-    faye-websocket "~0.10.0"
-    livereload-js "^2.3.0"
+    faye-websocket "^0.11.3"
+    livereload-js "^3.3.1"
     object-assign "^4.1.0"
     qs "^6.4.0"
 
@@ -9638,7 +10779,7 @@ toidentifier@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:
+tough-cookie@^2.3.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==
@@ -9646,12 +10787,21 @@ tough-cookie@^2.3.3, tough-cookie@^2.4.3, tough-cookie@~2.5.0:
     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=
+tough-cookie@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
+  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
   dependencies:
-    punycode "^2.1.0"
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.1.2"
+
+tr46@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
+  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
+  dependencies:
+    punycode "^2.1.1"
 
 tree-sync@^1.2.2:
   version "1.4.0"
@@ -9664,14 +10814,14 @@ tree-sync@^1.2.2:
     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==
+tree-sync@^2.0.0, tree-sync@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-2.1.0.tgz#31cbbd41f2936f5390b61e8c9d7cb27e75a212fe"
+  integrity sha512-OLWW+Nd99NOM53aZ8ilT/YpEiOo6mXD3F4/wLbARqybSZ3Jb8IxHK5UGVbZaae0wtXAyQshVV+SeqVBik+Fbmw==
   dependencies:
-    debug "^2.2.0"
-    fs-tree-diff "^0.5.6"
-    mkdirp "^0.5.1"
+    debug "^4.1.1"
+    fs-tree-diff "^2.0.1"
+    mkdirp "^0.5.5"
     quick-temp "^0.1.5"
     walk-sync "^0.3.3"
 
@@ -9680,10 +10830,15 @@ trim-right@^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==
+tslib@^1.9.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tslib@^2.0.3:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
+  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
 
 tty-browserify@0.0.0:
   version "0.0.0"
@@ -9709,11 +10864,21 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+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==
+
 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-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
 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"
@@ -9735,11 +10900,9 @@ typedarray@^0.0.6:
   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"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.1.tgz#0a8199aa28f6fe18517f6e9308ef7bfbe9a98d59"
+  integrity sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
@@ -9747,11 +10910,19 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
   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==
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.4.tgz#592588bb9f47ae03b24916e2471218d914955574"
+  integrity sha512-kv7fCkIXyQIilD5/yQy8O+uagsYIOt5cZvs890W40/e/rvjMSzJw81o9Bg0tkURxzZBROtDQhW2LFjOGoK3RZw==
+
+unbox-primitive@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
   dependencies:
-    commander "~2.20.3"
+    function-bind "^1.1.1"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
+    which-boxed-primitive "^1.0.2"
 
 underscore.string@^3.2.2, underscore.string@~3.3.4:
   version "3.3.5"
@@ -9762,9 +10933,9 @@ underscore.string@^3.2.2, underscore.string@~3.3.4:
     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==
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.0.tgz#3ccdcbb824230fc6bf234ad0ddcd83dff4eafe5f"
+  integrity sha512-sCs4H3pCytsb5K7i072FAEC9YlSYFIbosvM0tAKAlpSSUgD7yC1iXSEGdl5XrDKQ1YUB+p/HDzYrSG2H2Vl36g==
 
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
@@ -9820,11 +10991,16 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
-universalify@^0.1.0:
+universalify@^0.1.0, universalify@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -9856,9 +11032,9 @@ upath@^1.1.1:
   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==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
@@ -9910,14 +11086,15 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   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==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b"
+  integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.2"
+    for-each "^0.3.3"
     has-symbols "^1.0.1"
-    object.getownpropertydescriptors "^2.1.0"
+    object.getownpropertydescriptors "^2.1.1"
 
 util@0.10.3:
   version "0.10.3"
@@ -9938,11 +11115,16 @@ utils-merge@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:
+uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
+uuid@^8.3.0, uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 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"
@@ -9950,6 +11132,14 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
+validate-peer-dependencies@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-1.2.0.tgz#22aab93c514f4fda457d36c80685e8b1160d2036"
+  integrity sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA==
+  dependencies:
+    resolve-package-path "^3.1.0"
+    semver "^7.3.2"
+
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -9964,18 +11154,39 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+virtual-dom@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/virtual-dom/-/virtual-dom-2.1.1.tgz#80eda2d481b9ede0c049118cefcb4a05f21d1375"
+  integrity sha1-gO2i1IG57eDASRGM78tKBfIdE3U=
+  dependencies:
+    browser-split "0.0.1"
+    error "^4.3.0"
+    ev-store "^7.0.0"
+    global "^4.3.0"
+    is-object "^1.0.1"
+    next-tick "^0.2.2"
+    x-is-array "0.1.0"
+    x-is-string "0.1.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:
+w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
   integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
   dependencies:
     browser-process-hrtime "^1.0.0"
 
+w3c-xmlserializer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
+  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
+  dependencies:
+    xml-name-validator "^3.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"
@@ -10001,14 +11212,15 @@ walk-sync@^1.0.0, walk-sync@^1.1.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==
+walk-sync@^2.0.0, walk-sync@^2.0.2, walk-sync@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a"
+  integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==
   dependencies:
     "@types/minimatch" "^3.0.3"
     ensure-posix-path "^1.1.0"
     matcher-collection "^2.0.0"
+    minimatch "^3.0.4"
 
 walker@~1.0.5:
   version "1.0.7"
@@ -10027,14 +11239,23 @@ watch-detector@^1.0.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==
+watchpack-chokidar2@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
+  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
   dependencies:
     chokidar "^2.1.8"
+
+watchpack@^1.7.4:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
+  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
+  dependencies:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
+  optionalDependencies:
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.1"
 
 wcwidth@^1.0.1:
   version "1.0.1"
@@ -10043,12 +11264,17 @@ wcwidth@^1.0.1:
   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==
+webidl-conversions@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
+  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
 
-webpack-sources@^1.3.0, webpack-sources@^1.4.0:
+webidl-conversions@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
+  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
+
+webpack-sources@^1.4.0, webpack-sources@^1.4.1:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
   integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
@@ -10056,42 +11282,41 @@ webpack-sources@^1.3.0, webpack-sources@^1.4.0:
     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==
+webpack@^4.43.0:
+  version "4.46.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
+  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
   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"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/wasm-edit" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    acorn "^6.4.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^4.5.0"
+    eslint-scope "^4.0.3"
     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"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.3"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.3"
+    watchpack "^1.7.4"
+    webpack-sources "^1.4.1"
 
 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==
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
   dependencies:
-    http-parser-js ">=0.4.0 <0.4.11"
+    http-parser-js ">=0.5.1"
     safe-buffer ">=5.1.0"
     websocket-extensions ">=0.1.1"
 
@@ -10100,35 +11325,46 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
-whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
+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:
+whatwg-mimetype@^2.3.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==
+whatwg-url@^8.0.0, whatwg-url@^8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3"
+  integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==
   dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^1.0.1"
-    webidl-conversions "^4.0.2"
+    lodash "^4.7.0"
+    tr46 "^2.0.2"
+    webidl-conversions "^6.1.0"
 
-which@^1.2.14, which@^1.2.9, which@^1.3.0:
+which-boxed-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+  dependencies:
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
+
+which@^1.2.14, which@^1.2.9:
   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:
+which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
@@ -10185,6 +11421,21 @@ workerpool@^5.0.1:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2"
   integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ==
 
+workerpool@^6.0.0, workerpool@^6.0.3:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.4.tgz#6a972b6df82e38d50248ee2820aa98e2d0ad3090"
+  integrity sha512-jGWPzsUqzkow8HoAvqaPWTUPCrlPJaJ5tY8Iz7n1uCz3tTp6s3CDG0FF1NsX42WNlkRSW6Mr+CDZGnNoSsKa7g==
+
+wrap-legacy-hbs-plugin-if-needed@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wrap-legacy-hbs-plugin-if-needed/-/wrap-legacy-hbs-plugin-if-needed-1.0.1.tgz#6683eb74747f33e7caea54bb2ed85106ef9006b4"
+  integrity sha512-aJjXe5WwrY0u0dcUgKW3m2SGnxosJ66LLm/QaG0YMHqgA6+J2xwAFZfhSLsQ2BmO5x8PTH+OIxoAXuGz3qBA7A==
+  dependencies:
+    "@glimmer/reference" "^0.42.1"
+    "@glimmer/runtime" "^0.42.1"
+    "@glimmer/syntax" "^0.42.1"
+    "@simple-dom/interface" "^1.4.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -10207,24 +11458,20 @@ write@1.0.3:
   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.4.4, ws@~7.4.2:
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz#383bc9742cb202292c9077ceab6f6047b17f2d59"
+  integrity sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==
 
-ws@^7.1.2:
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d"
-  integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==
+x-is-array@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/x-is-array/-/x-is-array-0.1.0.tgz#de520171d47b3f416f5587d629b89d26b12dc29d"
+  integrity sha1-3lIBcdR7P0FvVYfWKbidJrEtwp0=
 
-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"
+x-is-string@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
+  integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
 
 xdg-basedir@^4.0.0:
   version "4.0.0"
@@ -10236,7 +11483,7 @@ xml-name-validator@^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:
+xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
@@ -10251,21 +11498,34 @@ xmlhttprequest-ssl@~1.5.4:
   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:
+xss@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz#32feb87feb74b3dcd3d404b7a68ababf10700535"
+  integrity sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw==
+  dependencies:
+    commander "^2.20.3"
+    cssfilter "0.0.10"
+
+xtend@^4.0.0, 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==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
 yallist@^3.0.0, yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
 yam@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/yam/-/yam-1.0.0.tgz#7f6c91dc0f5de75a031e6da6b3907c3d25ab0de5"
@@ -10278,3 +11538,8 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
   integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
diff --git a/app/assets/stylesheets/color_definitions.scss b/app/assets/stylesheets/color_definitions.scss
index 72104d80b1..9e4174e47a 100644
--- a/app/assets/stylesheets/color_definitions.scss
+++ b/app/assets/stylesheets/color_definitions.scss
@@ -2,26 +2,6 @@
 // It is compiled to CSS separately from the rest of the app.
 // The source variables come from color_transformations.scss and variables.scss
 
-@import "common/foundation/variables";
-
-// this converts HEX colors to RGBs so they can be used in vanilla CSS
-// i.e.: rgba(var(--primary-low-rgb), 0.5)
-//
-// Note that "rgba(var(--primary-low), 0.5)" will not work,
-// because --primary-low has a HEX color value
-
-@function hexToRGB($hex) {
-  @return red($hex), green($hex), blue($hex);
-}
-
-@function schemeType() {
-  @if is-light-color-scheme() {
-    @return "light";
-  } @else {
-    @return "dark";
-  }
-}
-
 :root {
   --scheme-type: #{schemeType()};
   --primary: #{$primary};
@@ -92,6 +72,7 @@
   --primary-low-mid-or-secondary-low: #{$primary-low-mid-or-secondary-low};
   --primary-or-primary-low-mid: #{$primary-or-primary-low-mid};
   --highlight-low-or-medium: #{$highlight-low-or-medium};
+  --tertiary-or-tertiary-low: #{$tertiary-or-tertiary-low};
   --tertiary-low-or-tertiary-high: #{$tertiary-low-or-tertiary-high};
   --tertiary-med-or-tertiary: #{$tertiary-med-or-tertiary};
   --secondary-or-primary: #{$secondary-or-primary};
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 96ab90c4b6..8a75aa67fd 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,16 +1,15 @@
-@import "font";
+@import "common/font-variables";
 @import "vendor/normalize";
 @import "vendor/normalize-ext";
 @import "vendor/pikaday";
 @import "common/foundation/helpers";
 @import "common/foundation/base";
-@import "common/foundation/mixins";
-@import "common/foundation/variables";
-@import "common/select-kit/*";
-@import "common/components/*";
+@import "common/select-kit/_index";
+@import "common/components/_index";
 @import "common/input_tip";
 @import "common/topic-entrance";
 @import "common/printer-friendly";
-@import "common/base/*";
+@import "common/base/_index";
 @import "common/d-editor";
+@import "common/software-update-prompt";
 @import "common/topic-timeline";
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 980cad669f..e920bb76c9 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -1,7 +1,5 @@
 // Styles for /admin section
 
-@import "common/foundation/variables";
-@import "common/foundation/mixins";
 @import "common/foundation/helpers";
 
 $mobile-breakpoint: 700px;
@@ -206,6 +204,12 @@ $mobile-breakpoint: 700px;
     .reseed {
       float: right;
     }
+    .locale {
+      margin-bottom: 0.5em;
+    }
+    .locale-search {
+      width: 50%;
+    }
   }
   .text-highlight {
     font-weight: bold;
@@ -880,6 +884,47 @@ table#user-badges {
   }
 }
 
+.emoji-value-list {
+  margin-left: 0;
+
+  .emoji-details {
+    display: flex;
+    align-items: center;
+    min-height: 30px;
+    padding: $input-padding;
+    line-height: 1;
+    color: var(--primary);
+    border: 1px solid var(--primary-low);
+
+    .emoji-name {
+      margin-left: 0.5em;
+    }
+
+    &:not(.can-edit) {
+      pointer-events: none;
+      background-color: var(--primary-very-low);
+    }
+  }
+
+  .value-input {
+    flex-direction: row;
+  }
+}
+
+.value .add-emoji-button {
+  display: block;
+  background-color: var(--primary-low);
+  border: none;
+}
+
+.value .add-value-btn,
+.shift-up-value-btn,
+.shift-down-value-btn {
+  @include value-btn;
+  margin-right: 0 !important;
+  margin-left: 0.25em;
+}
+
 .secret-value-list {
   .value {
     flex-flow: row wrap;
diff --git a/app/assets/stylesheets/common/admin/api.scss b/app/assets/stylesheets/common/admin/api.scss
index 7bbb16d5da..b7e19b6665 100644
--- a/app/assets/stylesheets/common/admin/api.scss
+++ b/app/assets/stylesheets/common/admin/api.scss
@@ -100,7 +100,8 @@ table.api-keys {
 
         .value-list,
         .select-kit,
-        input[type="text"] {
+        input[type="text"],
+        input[type="text"].filter-input {
           width: 100%;
           margin: 0;
         }
@@ -225,7 +226,7 @@ table.api-keys {
     display: none;
   }
   input {
-    max-width: calc(100% - 10px;);
+    max-width: calc(100% - 10px);
   }
   .select-kit,
   .select-kit.multi-select {
diff --git a/app/assets/stylesheets/common/admin/badges.scss b/app/assets/stylesheets/common/admin/badges.scss
index 816e21d3c9..d573295cfd 100644
--- a/app/assets/stylesheets/common/admin/badges.scss
+++ b/app/assets/stylesheets/common/admin/badges.scss
@@ -81,6 +81,14 @@
     }
   }
   .form-horizontal {
+    .radios {
+      display: flex;
+
+      .radio-label {
+        margin-right: 1.5em;
+      }
+    }
+
     .ace-wrapper {
       position: relative;
       height: 270px;
diff --git a/app/assets/stylesheets/common/admin/customize-install-theme.scss b/app/assets/stylesheets/common/admin/customize-install-theme.scss
index d7f3077029..939d4be29b 100644
--- a/app/assets/stylesheets/common/admin/customize-install-theme.scss
+++ b/app/assets/stylesheets/common/admin/customize-install-theme.scss
@@ -1,6 +1,22 @@
+.admin-install-theme-modal {
+  .modal-inner-container {
+    width: 100%;
+  }
+}
+
 .install-theme {
-  min-width: 650px;
   display: flex;
+  @include breakpoint(mobile-extra-large) {
+    .install-theme-items {
+      flex: 0 0 150px;
+    }
+    .install-theme-content {
+      flex: 1 1 100%;
+    }
+    .select-kit {
+      width: 100%;
+    }
+  }
 }
 
 .install-theme-items {
@@ -46,6 +62,14 @@
 }
 
 .install-theme-content {
+  width: calc(100% - 20px);
+  input[type="file"] {
+    width: 100%;
+    overflow: hidden; // Chrome needs this
+  }
+}
+
+.install-theme-items + .install-theme-content {
   padding: 0px 0px 10px 20px;
   width: calc(100% - 200px);
 }
@@ -106,3 +130,7 @@
     }
   }
 }
+
+.install-theme-warning {
+  margin-bottom: 10px;
+}
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 0cc24a534b..47a5e43d7c 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -1,40 +1,5 @@
 // Customise area
 
-// email templates
-
-.content-editor {
-  min-height: 500px;
-  float: left;
-  width: 54.054%;
-  margin-left: 1.8018%;
-  p.description {
-    color: var(--primary);
-  }
-  .controls {
-    margin-top: 10px;
-  }
-  textarea.plain {
-    width: 98%;
-    height: 200px;
-  }
-  .d-editor-input {
-    width: 98%;
-    height: 200px;
-  }
-  .ace-wrapper {
-    position: relative;
-    height: 600px;
-    width: 100%;
-  }
-  .ace_editor {
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-  }
-}
-
 .email-template {
   input {
     width: 100%;
@@ -84,11 +49,17 @@
     }
   }
 
-  .field-error {
+  .field-error,
+  .field-warning {
     margin-top: 10px;
     margin-bottom: 10px;
-    background-color: var(--quaternary-low);
-    padding: 5px;
+    background-color: var(--danger-low-mid);
+    padding: 10px;
+    white-space: pre-wrap;
+  }
+
+  .field-warning {
+    background-color: var(--highlight-low);
   }
 
   .admin-container {
@@ -348,6 +319,25 @@
     }
   }
 
+  .editor-information {
+    display: flex;
+    align-items: center;
+    font-size: $font-up-1;
+    margin-bottom: 0.5em;
+
+    .editor-back-button {
+      margin-right: 0.25em;
+    }
+
+    .editor-theme-name-wrapper {
+      margin-left: 0.25em;
+    }
+
+    .editor-theme-name {
+      font-weight: bold;
+    }
+  }
+
   .current-style.maximized {
     position: fixed;
     top: 0;
@@ -355,7 +345,7 @@
     left: 0;
     right: 0;
     z-index: z("fullscreen");
-    background-color: white;
+    background-color: var(--secondary);
     width: 100%;
     padding: 0;
     margin: 0;
@@ -435,7 +425,8 @@
 
     .ace-wrapper {
       position: relative;
-      height: 600px;
+      height: calc(100vh - 450px);
+      min-height: 200px;
       width: 100%;
     }
 
@@ -447,8 +438,7 @@
         width: 100%;
       }
       .admin-footer {
-        position: absolute;
-        bottom: 10px;
+        margin-top: 10px;
       }
       .ace-wrapper {
         height: calc(100vh - 200px);
@@ -501,6 +491,10 @@
         margin-left: auto;
       }
     }
+
+    .admin-controls {
+      display: block;
+    }
   }
   .colors {
     thead th {
@@ -604,16 +598,19 @@
     width: auto;
     margin: 3px 0;
   }
-
-  .public-key {
-    margin-top: 10px;
-    textarea {
-      cursor: auto;
-      height: 150px;
-    }
+}
+.public-key {
+  margin-top: 1em;
+  textarea {
+    cursor: auto;
+    min-height: 220px;
   }
 }
 
+.public-key-note {
+  margin-top: 1em;
+  color: var(--primary-medium);
+}
 // Permalinks
 .permalinks {
   .url,
@@ -847,7 +844,8 @@
   .ace-wrapper {
     position: relative;
     width: 100%;
-    height: 400px;
+    height: calc(100vh - 480px);
+    min-height: 200px;
     .ace_editor {
       position: absolute;
       left: 0;
diff --git a/app/assets/stylesheets/common/admin/dashboard.scss b/app/assets/stylesheets/common/admin/dashboard.scss
index 8d38420b7b..cf1e738385 100644
--- a/app/assets/stylesheets/common/admin/dashboard.scss
+++ b/app/assets/stylesheets/common/admin/dashboard.scss
@@ -612,3 +612,65 @@
     font-size: $font-up-3;
   }
 }
+
+.dashboard-next.general {
+  display: flex;
+  flex-direction: column;
+}
+.dashboard-new-features {
+  &.ordered-first {
+    order: -1;
+  }
+
+  &:not(.ordered-first) {
+    .section-title {
+      margin-top: 1.5em;
+    }
+
+    .new-features-dismiss {
+      display: none;
+    }
+  }
+
+  .section-body {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(360px, 1fr));
+    grid-gap: 1.5em;
+    &.three-or-more-items {
+      grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+    }
+  }
+
+  .section-footer {
+    margin: 1.5em;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    .btn {
+      margin-left: 1em;
+    }
+  }
+}
+
+.admin-new-feature-item {
+  display: flex;
+  align-items: flex-start;
+
+  .new-feature-emoji {
+    font-size: 3.5em;
+    padding-right: 0.5em;
+    padding-left: 0.5em;
+    width: 25%;
+    text-align: center;
+  }
+
+  .new-feature-content {
+    padding-right: 0.5em;
+    width: 75%;
+    .header {
+      font-size: $font-up-1;
+      font-weight: bold;
+      margin-bottom: 0.5em;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/plugins.scss b/app/assets/stylesheets/common/admin/plugins.scss
index caf25e2b6b..8a0061b585 100644
--- a/app/assets/stylesheets/common/admin/plugins.scss
+++ b/app/assets/stylesheets/common/admin/plugins.scss
@@ -6,6 +6,11 @@
       margin-left: auto;
     }
   }
+  td.plugin-name {
+    .name {
+      font-weight: bold;
+    }
+  }
   .grid {
     @media screen and (min-width: 550px) {
       tr {
diff --git a/app/assets/stylesheets/common/admin/staff_logs.scss b/app/assets/stylesheets/common/admin/staff_logs.scss
index cf802eeaed..4c9c995847 100644
--- a/app/assets/stylesheets/common/admin/staff_logs.scss
+++ b/app/assets/stylesheets/common/admin/staff_logs.scss
@@ -132,12 +132,15 @@
   }
   td.subject,
   td.details {
-    max-width: 20vw;
+    max-width: 10vw;
     > div {
       max-height: 100px;
       overflow-y: auto;
     }
   }
+  td.context {
+    word-break: break-all;
+  }
 }
 
 .staff-action-logs-controls {
@@ -327,30 +330,14 @@ table.screened-ip-addresses {
   width: 250px;
   margin-bottom: 1em;
   vertical-align: top;
-}
-
-.admin-watched-words {
-  .clear-all-row {
-    display: flex;
-    margin-top: 10px;
-    justify-content: flex-end;
-    .clear-all {
-      margin-left: 5px;
-    }
+  .replacement {
+    white-space: pre;
+    background-color: var(--tertiary-low);
   }
 }
 
-.watched-word-controls {
-  display: flex;
-  flex-wrap: wrap;
-  margin-bottom: 1em;
-  justify-content: space-between;
-  .download-upload-controls {
-    display: flex;
-  }
-  .download {
-    justify-content: flex-end;
-  }
+.watched-words-uploader {
+  display: inline-block;
 }
 
 .watched-words-list {
@@ -361,40 +348,28 @@ table.screened-ip-addresses {
 .watched-word {
   display: inline-block;
   cursor: pointer;
+
   .d-icon {
     margin-right: 0.25em;
     color: var(--primary-medium);
   }
+
   &:hover .d-icon {
     color: var(--danger);
   }
 }
 
 .watched-word-form {
-  display: inline-block;
   .success-message {
     margin-left: 1em;
   }
 }
 
-.watched-words-uploader {
-  margin-left: 5px;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-  @media screen and (max-width: 500px) {
-    flex: 1 1 100%;
-    margin-top: 0.5em;
-  }
-  .instructions {
-    font-size: $font-down-1;
-    margin-top: 5px;
-  }
-}
-
 .watched-words-detail {
-  .about {
-    margin: 0.5em 0 1em 0;
+  .watched-word-controls,
+  .about,
+  .watched-word-form {
+    margin-bottom: 1em;
   }
 }
 
@@ -402,6 +377,19 @@ table.screened-ip-addresses {
   margin-top: 0;
 }
 
+.watched-word-input {
+  label {
+    display: inline-block;
+    min-width: 150px;
+  }
+  input.watched-word-input-field {
+    min-width: 300px;
+  }
+  input.watched-word-input-replace {
+    min-width: 260px;
+  }
+}
+
 // Search logs
 
 table.search-logs-list {
diff --git a/app/assets/stylesheets/common/admin/users.scss b/app/assets/stylesheets/common/admin/users.scss
index 28a8612c01..42ab09fe09 100644
--- a/app/assets/stylesheets/common/admin/users.scss
+++ b/app/assets/stylesheets/common/admin/users.scss
@@ -151,10 +151,11 @@
     align-items: flex-start;
     .field,
     .value {
-      width: unset;
+      width: 100%;
     }
+
     .select-kit {
-      width: 300px;
+      width: 100%;
     }
   }
 
diff --git a/app/assets/stylesheets/common/base/_index.scss b/app/assets/stylesheets/common/base/_index.scss
new file mode 100644
index 0000000000..4ef29d0a97
--- /dev/null
+++ b/app/assets/stylesheets/common/base/_index.scss
@@ -0,0 +1,54 @@
+@import "_topic-list";
+@import "about";
+@import "activation";
+@import "alert";
+@import "bbcode";
+@import "cat_reorder";
+@import "category-list";
+@import "code_highlighting";
+@import "colorpicker";
+@import "compose";
+@import "composer-user-selector";
+@import "crawler_layout";
+@import "d-icon";
+@import "d-popover";
+@import "directory";
+@import "discourse";
+@import "edit-category";
+@import "edit-topic-timer-modal";
+@import "empty-state";
+@import "ember-select";
+@import "emoji";
+@import "exception";
+@import "explain-reviewable";
+@import "faqs";
+@import "group";
+@import "groups";
+@import "header";
+@import "history";
+@import "lightbox";
+@import "login";
+@import "magnific-popup";
+@import "menu-panel";
+@import "modal";
+@import "not-found";
+@import "onebox";
+@import "popup-menu";
+@import "redirection";
+@import "request_access";
+@import "request-group-membership-form";
+@import "reviewables";
+@import "rtl";
+@import "search-menu";
+@import "search";
+@import "share_link";
+@import "shared-drafts";
+@import "tagging";
+@import "tooltip";
+@import "topic-admin-menu";
+@import "topic-post";
+@import "topic";
+@import "upload";
+@import "user-badges";
+@import "user";
+@import "username_tagsinput";
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 46161547e8..6b77077ae0 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -1,5 +1,100 @@
-.topic-list.shared-drafts {
-  margin-bottom: 1.5em;
+// Topic list navigation & controls
+
+.list-controls {
+  margin-bottom: 0.25em;
+
+  .btn {
+    &:not(:first-child) {
+      margin-left: 0.5em;
+    }
+    .d-button-label {
+      font-size: $font-up-1;
+      font-weight: normal;
+    }
+  }
+
+  .notifications-button {
+    margin-left: 0.5em;
+  }
+
+  a.badge-category {
+    padding: 3px 12px;
+    font-size: $font-up-1;
+  }
+
+  .combo-box .combo-box-header {
+    background: var(--secondary);
+    color: var(--primary);
+    border: 1px solid var(--primary-medium);
+    font-size: $font-0;
+    transition: none;
+    &:focus {
+      border-color: var(--tertiary);
+    }
+  }
+  .select-kit {
+    .select-kit-collection {
+      max-height: 40vh;
+    }
+  }
+}
+
+.navigation-container {
+  width: 100%;
+  --nav-space: 0.75em;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.category-breadcrumb {
+  display: block;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+  > li {
+    // only target the top-level li, not dropdowns
+    display: flex;
+    float: left;
+    margin-right: 0.5em;
+    margin-bottom: 0;
+  }
+}
+
+#navigation-bar {
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 0 var(--nav-space);
+  margin-right: auto;
+}
+
+.navigation-controls {
+  display: flex;
+  align-items: stretch;
+  margin-bottom: var(--nav-space);
+  > * {
+    white-space: nowrap;
+  }
+  .select-kit button {
+    height: 100%; // ensures nested select-kit button matches height of button siblings
+  }
+  .btn {
+    // need to reduce vertical padding for consistent height
+    padding-top: 0.3em;
+    padding-bottom: 0.3em;
+    @include breakpoint(mobile-medium) {
+      font-size: var(--font-down-1);
+    }
+  }
+  @include breakpoint(mobile-large) {
+    .edit-category {
+      .d-button-label {
+        display: none;
+      }
+      .d-icon {
+        margin: 0;
+      }
+    }
+  }
 }
 
 .show-more {
@@ -11,41 +106,43 @@
   }
 }
 
-.list-controls {
-  clear: both;
-  margin-bottom: 5px;
-  .combo-box .combo-box-header {
-    background: var(--secondary);
-    color: var(--primary);
-    border: 1px solid var(--primary-medium);
-    font-size: $font-0;
-    transition: none;
-  }
-  .select-kit {
-    align-self: center;
-    .select-kit-collection {
-      font-size: $font-down-1;
-      max-height: 40vh;
-      .texts,
-      .icons {
-        font-size: $font-up-1;
-      }
-    }
-    &.categories-admin-dropdown,
-    &.tags-admin-dropdown,
-    &.category-notifications-button,
-    &.tag-notifications-button {
-      float: right;
-      button {
-        display: inline-block;
-      }
-    }
-  }
-  .category-heading {
-    max-width: 100%;
+.category-heading {
+  max-width: 100%;
+  p {
+    margin-top: 0;
+    line-height: $line-height-large;
+    font-size: $font-up-3;
   }
 }
 
+.category-logo.aspect-image {
+  width: auto;
+  max-height: 150px;
+}
+
+@supports (--custom: property) {
+  .category-logo.aspect-image {
+    --max-height: 150px;
+    max-height: var(--max-height);
+    width: calc(var(--max-height) * var(--aspect-ratio));
+    max-width: 100%;
+    height: auto;
+
+    img {
+      width: 100%;
+      height: inherit;
+      max-width: initial;
+      max-height: initial;
+    }
+  }
+}
+
+.topic-list.shared-drafts {
+  margin-bottom: 1.5em;
+}
+
+// Topic list body
+
 .topic-list-item.visited,
 .latest-topic-list-item.visited,
 .category-topic-link.visited {
@@ -195,11 +292,15 @@
 
   .num {
     text-align: center;
-    a:not(.badge-posts) {
+
+    a {
       color: inherit;
     }
-    a.badge-posts {
-      font-weight: bold;
+
+    .badge-posts {
+      font-weight: 700;
+      color: inherit;
+      padding: 15px 5px;
     }
   }
 
@@ -217,15 +318,23 @@
 }
 
 .heatmap-high,
-.heatmap-high a {
+.heatmap-high a,
+.heatmap-high .d-icon,
+.heatmap-high .d-button-label {
   color: #fe7a15 !important;
 }
+
 .heatmap-med,
-.heatmap-med a {
+.heatmap-med a,
+.heatmap-med .d-icon,
+.heatmap-med .d-button-label {
   color: #cf7721 !important;
 }
+
 .heatmap-low,
-.heatmap-low a {
+.heatmap-low a,
+.heatmap-low .d-icon,
+.heatmap-low .d-button-label {
   color: #9b764f !important;
 }
 
@@ -266,27 +375,6 @@
   }
 }
 
-ol.category-breadcrumb.hidden {
-  display: none;
-}
-
-ol.category-breadcrumb {
-  display: block;
-  float: left;
-  list-style: none;
-  margin: 0 10px 10px 0;
-  padding: 0;
-
-  li {
-    float: left;
-    margin-right: 5px;
-  }
-
-  .bread-crumbs-right-outlet {
-    float: left;
-  }
-}
-
 .d-icon-thumbtack.unpinned {
   @include fa-rotate(180deg, 1);
 }
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 73d1cfd142..d45b6b3e8d 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -80,7 +80,7 @@
   .category-box-inner {
     box-sizing: border-box;
     width: 100%;
-    padding: 0;
+    padding: 1em;
     display: flex;
     flex-direction: column;
 
@@ -248,7 +248,7 @@
   }
 
   .category-box-heading {
-    padding: 1em 1em 0.5em 1em;
+    margin-bottom: 0.5em;
     a[href] {
       width: 100%;
       color: var(--primary);
@@ -256,7 +256,7 @@
   }
 
   .featured-topics {
-    padding: 0.5em 1em 1em 1em;
+    margin-bottom: 1em;
     ul {
       color: var(--primary-medium);
       list-style: none;
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 78e721198c..a37e875194 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -83,7 +83,7 @@
     .saving-text {
       display: none;
     }
-    .toggler {
+    .toggle-minimize {
       order: 2;
     }
   }
@@ -97,9 +97,7 @@
     margin: 5px 0 10px 0;
     display: flex;
     align-items: center;
-    .d-icon {
-      color: var(--primary-high);
-    }
+
     .reply-details {
       max-width: calc(100% - 175px);
       flex: 1 1 auto;
@@ -108,7 +106,7 @@
       white-space: nowrap;
 
       .d-icon {
-        opacity: 0.8;
+        color: var(--primary-medium);
       }
     }
     .composer-action-title {
@@ -122,6 +120,7 @@
       }
 
       .action-title {
+        line-height: normal;
         @include ellipsis;
       }
 
@@ -151,11 +150,8 @@
     .composer-controls {
       display: flex;
       margin-left: auto;
-      button {
-        padding: 5px 7px;
-        &.toggler {
-          order: 2;
-        }
+      .toggle-minimize {
+        order: 2;
       }
     }
   }
@@ -214,6 +210,13 @@
     .title-input {
       flex: 1 1 100%;
     }
+
+    .archetype-private_message & {
+      // PMs don's have categories, so we need a wider tag input
+      .mini-tag-chooser {
+        width: 100%;
+      }
+    }
   }
 
   .category-input {
@@ -327,7 +330,9 @@
       line-height: normal;
       color: var(--primary-high);
       transition: color 250ms;
-      &:hover {
+      &:hover,
+      &:focus {
+        outline: none;
         color: var(--danger);
       }
     }
@@ -429,13 +434,10 @@ div.ac-wrap div.item a.remove,
 }
 
 div.ac-wrap {
-  overflow: auto;
   max-height: 150px;
   display: flex;
   flex-wrap: wrap;
   align-items: center;
-  background-color: var(--secondary);
-  border: 1px solid var(--primary-medium);
   min-height: 30px;
   box-sizing: border-box;
   div.item {
@@ -458,12 +460,6 @@ div.ac-wrap {
 
   input[type="text"] {
     float: left;
-    display: block;
-    box-shadow: none;
-    border: 0;
-    margin: 0;
-    background: transparent;
-    min-height: unset;
     &.fullwidth-input {
       width: 100%;
     }
@@ -537,3 +533,10 @@ body:not(.ios-safari-composer-hacks) {
     }
   }
 }
+
+.toggle-preview {
+  transition: all 0.33s ease-out;
+  &.active {
+    transform: rotate(180deg);
+  }
+}
diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index af37402c79..942484506d 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -1,7 +1,6 @@
 body.crawler {
   > header {
     width: 100%;
-    position: absolute;
     top: 0;
     z-index: z("max");
     background-color: #fff;
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index bbe8757af6..9f9564657d 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -74,7 +74,7 @@
   .me {
     background-color: var(--highlight-low-or-medium);
     .username a,
-    .name,
+    .name a,
     .title,
     .number,
     .time-read {
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index cc0485062a..8a578e3294 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -132,6 +132,11 @@ label {
     align-self: center;
     margin-right: 4px;
   }
+  a {
+    // flex removes whitespace characters between text nodes and elements
+    // so we need to add it back
+    margin: 0 0.25em;
+  }
 }
 
 input {
@@ -220,13 +225,15 @@ input {
     box-sizing: border-box;
     min-height: 30px;
     &:focus {
-      border-color: var(--tertiary);
-      box-shadow: shadow("focus");
-      outline: 0;
+      @include default-focus;
     }
   }
 }
 
+::placeholder {
+  text-overflow: ellipsis;
+}
+
 .input {
   &-prepend,
   &-append {
@@ -278,9 +285,7 @@ textarea {
   background-color: var(--secondary);
   border: 1px solid var(--primary-medium);
   &:focus {
-    border-color: var(--tertiary);
-    box-shadow: shadow("focus");
-    outline: 0;
+    @include default-focus;
   }
 }
 
@@ -303,7 +308,8 @@ table {
   white-space: nowrap;
   cursor: pointer;
   .discourse-no-touch & {
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: var(--primary-low);
     }
   }
@@ -412,6 +418,86 @@ table {
   }
 }
 
+.d-header .header-dropdown-toggle .do-not-disturb-background {
+  position: absolute;
+  left: 2px;
+  bottom: -1px;
+  z-index: 1002;
+}
+
+.do-not-disturb-background {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 1.25em;
+  background-color: var(--tertiary-med-or-tertiary);
+  border-radius: 50%;
+  height: 1.25em;
+
+  .d-icon.d-icon-moon {
+    display: block;
+    color: var(--tertiary-or-white) !important;
+    line-height: unset;
+    font-size: 0.875em;
+    margin: 0 !important;
+  }
+}
+
+.user-menu .quick-access-panel li.do-not-disturb {
+  display: flex;
+  flex: 0 0 100%;
+  flex-wrap: wrap;
+  align-items: center;
+  background: var(--secondary);
+
+  .do-not-disturb-inner-container {
+    display: flex;
+    width: 100%;
+    align-items: center;
+
+    .do-not-disturb-label {
+      display: flex;
+      align-items: center;
+    }
+
+    .relative-date {
+      text-align: left;
+      font-size: $font-down-3;
+      padding-top: 3px;
+      margin-left: 0.75em;
+      color: var(--primary-medium);
+    }
+
+    .d-icon-toggle-off,
+    .d-icon-toggle-on {
+      padding-top: 0;
+    }
+
+    .d-icon-toggle-on {
+      color: var(--tertiary);
+    }
+  }
+}
+
+.do-not-disturb-modal {
+  .do-not-disturb-choice {
+    display: grid;
+    grid-template-columns: 2em 1fr auto;
+    grid-template-rows: auto auto;
+    align-items: center;
+    cursor: pointer;
+    padding: 0.5em 0;
+
+    &:hover {
+      background-color: var(--tertiary-low);
+    }
+
+    label {
+      margin-bottom: 0;
+    }
+  }
+}
+
 .ring-backdrop-spotlight {
   position: absolute;
   width: 80px;
@@ -770,3 +856,24 @@ table {
   z-index: z("max");
   color: var(--secondary);
 }
+
+.controls {
+  .grouped-control {
+    display: flex;
+    flex-direction: column;
+
+    .grouped-control-label {
+      padding: 0.25em 0;
+    }
+
+    .grouped-control-field {
+      flex: 1 0 auto;
+      display: flex;
+      padding-bottom: 0.25em;
+
+      label {
+        margin: 0;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/edit-category.scss b/app/assets/stylesheets/common/base/edit-category.scss
index dabcc81172..5e34df8a65 100644
--- a/app/assets/stylesheets/common/base/edit-category.scss
+++ b/app/assets/stylesheets/common/base/edit-category.scss
@@ -7,7 +7,7 @@ div.edit-category {
   grid-template-rows: auto auto auto;
   grid-row-gap: 1em;
   grid-column-gap: 1.5em;
-  grid-template-areas: "header header" "sidebar content" "sidebar footer";
+  grid-template-areas: "header header" "sidebar content" "sidebar warning" "sidebar footer";
 
   .edit-category-title {
     grid-area: header;
@@ -123,7 +123,7 @@ div.edit-category {
 
     .select-kit {
       &.tag-chooser {
-        width: $category-settings-width;
+        width: 250px;
 
         .select-kit-filter,
         .filter-input {
@@ -141,37 +141,20 @@ div.edit-category {
     }
   }
 
+  .edit-category-delete-warning {
+    grid-area: warning;
+  }
+
   .edit-category-footer {
     grid-area: footer;
     display: flex;
     justify-content: space-between;
     align-self: start;
     padding: 0 1.5em 2em 0;
+  }
 
-    .disable-info {
-      position: relative;
-      .cannot-delete-reason {
-        position: absolute;
-        bottom: 125%;
-        right: 0px;
-        width: 250px;
-        background: var(--primary);
-        color: var(--secondary);
-        text-align: center;
-        border-radius: 2px;
-        padding: 12px 8px;
-
-        &::after {
-          top: 100%;
-          left: 57%;
-          border: solid transparent;
-          content: " ";
-          position: absolute;
-          border-top-color: var(--primary);
-          border-width: 8px;
-        }
-      }
-    }
+  .category-topic-auto-close-hours {
+    width: 200px;
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss b/app/assets/stylesheets/common/base/edit-topic-timer-modal.scss
similarity index 62%
rename from app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
rename to app/assets/stylesheets/common/base/edit-topic-timer-modal.scss
index 48e36545f5..47c9a68bfb 100644
--- a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
+++ b/app/assets/stylesheets/common/base/edit-topic-timer-modal.scss
@@ -1,20 +1,28 @@
 .edit-topic-timer-modal {
+  .select-kit.combo-box {
+    width: 100%;
+  }
+  .modal-footer {
+    margin: 0;
+    border-top: 0;
+    padding: 10px 0;
+  }
+  .modal-inner-container {
+    box-sizing: border-box;
+    min-width: 310px;
+  }
   .modal-body {
     max-height: none;
-    overflow: visible !important; /* inline JS styles */
-  }
-  .control-group {
-    display: flex;
-    align-items: center;
+    width: 375px;
+    box-sizing: border-box;
 
-    > .d-icon {
-      margin-right: 5px;
+    @media (max-width: 600px) {
+      width: 100%;
+    }
+
+    .control-label {
+      font-weight: 700;
     }
-  }
-  input.date-picker,
-  input[type="time"] {
-    width: 200px;
-    text-align: left;
   }
   .radios {
     margin-bottom: 10px;
@@ -22,12 +30,14 @@
   label {
     display: inline-flex;
     padding-right: 5px;
-    margin-bottom: 0;
     align-items: center;
     input {
       margin-top: 0;
     }
   }
+  .topic-timer-duration {
+    width: 100%;
+  }
   .btn.pull-right {
     margin-right: 10px;
   }
@@ -41,7 +51,7 @@
     .btn-clear {
       display: none;
     }
-    .topic-status-info {
+    .topic-timer-info {
       border: none;
       padding: 0;
       h3 {
@@ -57,6 +67,12 @@
   .pika-single {
     position: absolute !important; /* inline JS styles */
   }
+
+  .modal-topic-timer-info {
+    .topic-timer-info {
+      border-top: 0;
+    }
+  }
 }
 
 // mobile styles
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index ecbdaab49b..a617982c92 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -60,6 +60,7 @@ sup img.emoji {
     width: 100%;
     box-sizing: border-box;
     padding: 0.25em;
+    padding-left: 0.75em;
     height: 100%;
     background: var(--secondary);
 
@@ -101,10 +102,10 @@ sup img.emoji {
   }
 
   .emoji-picker-category-buttons {
-    overflow-y: scroll;
-    width: 60px;
+    overflow-y: auto;
+    width: 50px;
+    padding-left: 0.5em;
     display: flex;
-    justify-content: center;
     flex-wrap: wrap;
     border-right: 1px solid var(--primary-low);
 
@@ -131,7 +132,7 @@ sup img.emoji {
   display: flex;
   width: 100%;
   position: relative;
-  padding: 0.25em;
+  padding: 0.75em;
   border-bottom: 1px solid var(--primary-low);
   box-sizing: border-box;
   align-items: center;
@@ -139,17 +140,17 @@ sup img.emoji {
   .filter {
     flex: 1 0 auto;
     margin: 0;
-    border: 0;
-    padding: 0;
-
-    &:focus {
-      box-shadow: none;
-    }
+    width: calc(100% - 50px);
+    margin-right: 0.5em;
   }
 
   .d-icon {
     color: var(--primary-medium);
-    margin-right: 0.5em;
+    cursor: pointer;
+    padding: 0.25em;
+    &:hover {
+      color: var(--tertiary);
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/empty-state.scss b/app/assets/stylesheets/common/base/empty-state.scss
new file mode 100644
index 0000000000..7c1245a7c2
--- /dev/null
+++ b/app/assets/stylesheets/common/base/empty-state.scss
@@ -0,0 +1,19 @@
+.empty-state {
+  color: var(--primary);
+  margin: 0;
+  padding: 0.5em 1em;
+  display: flex;
+  flex-direction: column;
+
+  .empty-state-title {
+    font-weight: 700;
+    padding: 0;
+    margin: 0;
+    font-size: $font-up-1;
+  }
+
+  .empty-state-body {
+    padding: 0;
+    margin: 0;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/faqs.scss b/app/assets/stylesheets/common/base/faqs.scss
index 49de3c100e..1af108d912 100644
--- a/app/assets/stylesheets/common/base/faqs.scss
+++ b/app/assets/stylesheets/common/base/faqs.scss
@@ -1,5 +1,5 @@
 .body-page {
-  /* intended only for /about /faq, /guidelines, /tos, and /privacy */
+  /* covers /about, /faq, /guidelines, /tos, /privacy, and login-required */
   width: 100%;
   max-width: 700px;
   .about-page & {
@@ -28,3 +28,10 @@
     margin-left: 40px;
   }
 }
+
+.body-page-button-container {
+  display: flex;
+  button {
+    margin-right: 0.75em;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index 3ecab3780b..a8c0577ed2 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -3,11 +3,7 @@
 // For example: .group .user-secondary-navigation
 
 span.mention-group {
-  color: var(--primary-high-or-secondary-low);
-  padding: 2px 4px;
-  border-radius: 8px;
-  font-weight: 600;
-  font-size: $font-down-1;
+  color: var(--primary);
 }
 
 .group-details-container {
@@ -17,6 +13,12 @@ span.mention-group {
   position: relative;
 }
 
+.group-delete-tooltip {
+  background-color: var(--tertiary-low);
+  padding: 0.1em 2.5em 0.1em 1em;
+  margin-bottom: 10px;
+}
+
 .group-outlet {
   position: relative;
 }
@@ -37,7 +39,13 @@ span.mention-group {
 }
 
 .group-info {
-  width: 100%;
+  align-items: flex-start;
+  display: flex;
+  gap: 10px;
+
+  .group-info-names {
+    flex-grow: 1;
+  }
 
   .group-info-name {
     font-size: $font-up-3;
@@ -50,11 +58,6 @@ span.mention-group {
     color: var(--primary-high-or-secondary-low);
   }
 
-  span {
-    display: inline-block;
-    vertical-align: middle;
-  }
-
   $size: 50px;
   $icon-size: $size / 1.8;
 
@@ -77,6 +80,20 @@ span.mention-group {
       width: $icon-size;
     }
   }
+
+  .group-details-button {
+    display: flex;
+    flex-wrap: wrap;
+    button:not(:last-child) {
+      margin-right: 0.5em;
+    }
+  }
+}
+
+.group-nav {
+  .count {
+    margin-left: 5px;
+  }
 }
 
 .group-manage-logs-filter {
@@ -107,39 +124,48 @@ table.group-members {
   width: 100%;
   table-layout: fixed;
 
-  th:first-child {
-    width: 30%;
-    text-align: left;
-  }
-
-  th:last-child {
-    width: 5%;
-  }
-
-  th.group-members-actions {
-    width: 5%;
-  }
-
   th {
     text-align: center;
+
+    &.bulk-select {
+      height: 30px;
+      width: 30px;
+    }
+
+    &.bulk-select-buttons {
+      text-align: left;
+      width: 20%;
+    }
+
+    &.username {
+      text-align: left;
+      width: 30%;
+    }
+
+    &.bulk-select-buttons + .username {
+      width: 10%;
+    }
+
+    &.group-members-actions {
+      width: 5%;
+    }
   }
 
-  tr {
-    .user-info {
-      display: block;
-      .avatar-flair {
-        color: var(--primary);
-      }
-    }
+  td {
+    color: var(--primary-medium);
+    padding: 0.8em 0;
+    text-align: center;
 
-    td:first-child {
+    &.avatar {
       text-align: left;
     }
+  }
 
-    td {
-      text-align: center;
-      color: var(--primary-medium);
-      padding: 0.8em 0;
+  .user-info {
+    display: block;
+
+    .avatar-flair {
+      color: var(--primary);
     }
   }
 }
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index 3d4e0b33ab..dd8f1e8531 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -160,3 +160,13 @@
     }
   }
 }
+
+.group-manage-logs-controls {
+  button {
+    .d-icon {
+      // flip the icon order for the remove button
+      order: 2;
+      margin: 0 0 0 0.45em;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 4c7db280eb..4767a262b9 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -128,8 +128,8 @@
       width: 2.1333em;
       height: 2.1333em;
     }
-    &:hover,
-    &:focus {
+    .discourse-no-touch &:hover,
+    .discourse-no-touch &:focus {
       background-color: var(--primary-low);
       border-top: 1px solid transparent;
       border-left: 1px solid transparent;
diff --git a/app/assets/stylesheets/common/base/history.scss b/app/assets/stylesheets/common/base/history.scss
index 03c37fbf84..b04039880a 100644
--- a/app/assets/stylesheets/common/base/history.scss
+++ b/app/assets/stylesheets/common/base/history.scss
@@ -16,6 +16,7 @@
   .revision-content {
     width: 47.5%;
     float: left;
+    min-height: 1px;
 
     &:nth-of-type(2) {
       margin-left: 5%;
diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss
index de944a2d34..e6d786b72b 100644
--- a/app/assets/stylesheets/common/base/lightbox.scss
+++ b/app/assets/stylesheets/common/base/lightbox.scss
@@ -18,7 +18,7 @@ $meta-element-margin: 6px;
   border: 1px solid var(--primary-low);
 }
 
-.cooked img.d-lazyload {
+.cooked img.d-lazyload:not(.animated) {
   transition: opacity 0.4s 0.75s ease;
 }
 
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 512d008901..7eb3537010 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -12,55 +12,243 @@
   display: none;
 }
 
-#login-form {
-  table {
+#discourse-modal.login-modal-body:not(.has-alt-auth) .modal-inner-container {
+  max-width: 28em; // prevents long alerts from expanding the modal width
+}
+
+.login-modal:not(.hidden).has-alt-auth.no-local-login {
+  min-width: fit-content;
+  background: var(--secondary);
+  #login-buttons:not(.hidden) {
+    .btn.btn-social,
+    .btn {
+      border: 1px solid var(--primary-low-mid);
+      &:hover,
+      &:focus {
+        background: var(--primary-very-low);
+      }
+    }
+  }
+}
+
+// Create Account + Login
+.d-modal.create-account,
+.d-modal.login-modal,
+.invites-show {
+  .modal-inner-container {
+    position: relative;
+  }
+  .modal-body {
+    padding: 0;
+  }
+  .modal-header {
+    border-bottom: none;
+    padding: 0;
+    position: absolute;
+    top: 1em;
+    right: 1em;
+    z-index: z("max");
+  }
+  #modal-alert {
+    box-sizing: border-box;
+    display: inline-block;
+    // if you want to use flexbox here make sure child elements like <b> don't cause line breaks
+    padding: 1em 3.5em 1em 1em; // large right padding to make sure long text isn't under the close button
     width: 100%;
+    max-width: 100%;
+    margin-bottom: 0;
+    min-height: 35px;
   }
-  a {
-    color: var(--primary-high);
+  #modal-alert:empty {
+    display: none;
   }
-  td {
-    padding-right: 5px;
-  }
-  #credentials {
-    tr:first-of-type {
-      margin-bottom: 0.75em;
-    }
-  }
-}
-
-#new-account-link {
-  cursor: pointer;
-}
-
-.login-modal,
-.create-account {
-  tbody {
-    border: none;
-  }
-  tr {
-    border: none;
-  }
-  tr:not(.instructions) {
-    td {
-      padding: 10px 0 0 0;
-    }
-  }
-  td {
-    label,
-    input {
+  .login-welcome-header {
+    z-index: z("modal", "content");
+    display: grid;
+    grid-template-columns: auto 1fr;
+    grid-template-rows: auto 1fr;
+    background: var(--secondary);
+    .login-title {
       margin-bottom: 0;
-      width: 100%;
+    }
+    .login-subheader {
+      align-self: start;
+      margin: 0;
+    }
+    .waving-hand {
+      width: 35px;
+      height: 35px;
+      margin-left: 1em;
+      align-self: center;
+    }
+  }
+  #login-buttons {
+    .btn {
+      background-color: #ffffff;
+      color: #000000;
+      justify-content: flex-start;
+      min-width: fit-content;
+      margin-bottom: 0.5em;
     }
   }
   .modal-footer {
+    .btn-primary {
+      margin-right: 1.5em;
+    }
     .inline-spinner {
       display: inline-flex;
     }
   }
+  .modal-body.no-local-login + .modal-footer {
+    display: none;
+  }
   &.awaiting-approval {
     display: none;
   }
+
+  .no-local-logins {
+    // when third-party auth is available, but not local logins
+    .login-left-side,
+    .login-welcome-header {
+      padding: 3em 1em 3em 3em;
+    }
+  }
+}
+
+// Login Form Styles
+.login-modal:not(.hidden),
+.create-account {
+  #login-form,
+  .login-form {
+    .input-group {
+      position: relative;
+      display: flex;
+      flex-direction: column;
+      margin-bottom: 0.8em;
+      &:last-child {
+        margin-bottom: 2em;
+      }
+      input {
+        padding: 0.75em 0.77em;
+        border-radius: 0.25em;
+        min-width: 250px;
+        box-shadow: none;
+        margin-bottom: 0.25em;
+      }
+      input:focus {
+        outline: none;
+        border: 1px solid var(--tertiary);
+        box-shadow: 0 0 0 2px rgba(var(--tertiary-rgb), 0.25);
+      }
+      label.more-info {
+        color: var(--primary-medium);
+        min-height: 1.4em; // prevents height increase due to tips
+      }
+      label.alt-placeholder {
+        color: var(--primary-medium);
+        font-size: 16px;
+        font-weight: normal;
+        position: absolute;
+        pointer-events: none;
+        left: 1em;
+        top: 10px;
+        box-shadow: 0 0 0 0px rgba(var(--tertiary-rgb), 0);
+        transition: 0.2s ease all;
+      }
+      input:focus + label.alt-placeholder,
+      input.value-entered + label.alt-placeholder {
+        top: -8px;
+        left: calc(1em - 0.25em);
+        background-color: var(--secondary);
+        padding: 0 0.25em 0 0.25em;
+        font-size: $font-down-1;
+        color: var(--primary-medium);
+      }
+      input.alt-placeholder:invalid {
+        color: var(--primary);
+      }
+
+      #email-login-link {
+        transition: opacity 0.5s;
+
+        &.no-login-filled {
+          opacity: 0;
+          visibility: hidden;
+        }
+      }
+
+      #forgot-password-link,
+      #email-login-link {
+        font-size: $font-down-1;
+      }
+
+      .tip:not(:empty) + label.more-info {
+        display: none;
+      }
+    }
+
+    #second-factor {
+      input {
+        width: 100%;
+        padding: 0.75em 0.5em;
+        border-radius: 0.25em;
+        min-width: 250px;
+        box-shadow: none;
+        margin-bottom: 2em;
+      }
+      input:focus {
+        outline: none;
+        border: 1px solid var(--tertiary);
+        box-shadow: 0 0 0 2px rgba(var(--tertiary-rgb), 0.25);
+      }
+    }
+
+    // user fields input groups will
+    // be styled differently
+    .user-fields .input-group {
+      .user-field {
+        &.text {
+          label.control-label {
+            color: var(--primary-medium);
+            font-size: 16px;
+            position: absolute;
+            pointer-events: none;
+            left: 1em;
+            top: 12px;
+            transition: 0.2s ease all;
+            max-width: calc(100% - 2em);
+            white-space: nowrap;
+            display: inline-block;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+          &.value-entered label.control-label,
+          label.control-label.value-entered {
+            top: -8px;
+            left: calc(1em - 0.25em);
+            background-color: var(--secondary);
+            padding: 0 0.25em 0 0.25em;
+            font-size: 14px;
+            color: var(--primary-high);
+          }
+        }
+        .controls .checkbox-label {
+          input[type="checkbox"].ember-checkbox {
+            width: 1em !important;
+            min-width: unset;
+          }
+        }
+      }
+    }
+  }
+}
+
+#login-link,
+#new-account-link {
+  cursor: pointer;
+  padding-left: 0;
+  text-align: left;
+  // the second button can wrap in some locales, and this helps alignment
 }
 
 .create-account {
@@ -69,36 +257,19 @@
     margin-top: 0.5em;
   }
 
-  tr.input span.value {
-    margin-left: 10px;
+  .create-account-body {
+    max-width: 40em;
   }
 
   .user-field {
-    > label {
-      margin-top: 0.75em;
-      margin-bottom: 0;
-      padding-top: 5px;
-    }
-    &:first-of-type > label {
-      margin-top: 0;
-    }
-
     input[type="text"] {
       margin-bottom: 0;
       width: 100%;
     }
-
     .select-kit {
       width: 100%;
     }
-
     .controls {
-      padding-top: 5px;
-      label {
-        width: auto;
-        text-align: left;
-        font-weight: normal;
-      }
       .instructions {
         margin-top: 0.15em;
         color: var(--primary-medium);
@@ -120,6 +291,14 @@
   .two-col {
     position: relative;
     display: flex;
+    margin-top: 5px;
+  }
+
+  #login-buttons {
+    .btn {
+      background-color: var(--primary-low);
+      color: var(--primary);
+    }
   }
 
   .col-image {
@@ -162,15 +341,6 @@
   }
 }
 
-.modal tr.instructions {
-  display: flex;
-  flex-direction: column;
-  margin-top: 0.15em;
-  label {
-    color: var(--primary-medium);
-  }
-}
-
 // alternate login / create new account buttons should be de-emphasized
 
 button#login-link,
@@ -183,9 +353,6 @@ button#new-account-link {
   display: flex;
   flex-wrap: wrap;
   align-items: center;
-  button {
-    margin-right: 1.5em;
-  }
   p {
     margin: 0;
     font-size: $font-0;
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 494119400f..92b6058f7e 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -28,7 +28,7 @@
   background-color: var(--secondary);
   z-index: z("header");
   padding: 0.5em;
-  width: 300px;
+  width: 320px;
   overflow: hidden;
   display: flex;
   flex-direction: column;
@@ -65,6 +65,8 @@
     display: flex;
     flex: 1 0 0%; // safari height fix
     margin-top: 0.5em;
+    flex-wrap: wrap;
+
     .show-all {
       flex: 1 1 auto;
       button {
@@ -91,6 +93,11 @@
 }
 
 .hamburger-panel {
+  a.widget-link {
+    width: 100%;
+    box-sizing: border-box;
+    @include ellipsis;
+  }
   .panel-body {
     overflow-y: auto;
   }
@@ -200,6 +207,9 @@
     border-top: 1px solid var(--primary-low);
     padding-top: 0.75em;
     margin-top: -1px;
+    &:focus {
+      outline: none;
+    }
     h3 {
       padding: 0 0.4em;
       font-weight: bold;
@@ -214,6 +224,12 @@
       color: var(--primary-high);
     }
 
+    .btn-primary {
+      .d-icon {
+        color: var(--secondary);
+      }
+    }
+
     ul {
       display: flex;
       flex-flow: column wrap;
@@ -236,7 +252,7 @@
         color: var(--primary);
       }
 
-      span.double-user, 
+      span.double-user,
       // e.g., "username, username2"
       span.multi-user
       // e.g., "username, username2, and n others"
@@ -247,7 +263,7 @@
         white-space: nowrap;
       }
 
-      span.multi-user 
+      span.multi-user
       // e.g., "username, username2, and n others"
       {
         span.multi-username:nth-of-type(2) {
@@ -276,8 +292,16 @@
 
       a {
         display: flex;
-        padding: 0.25em 0.5em;
+        margin: 0.25em;
+        padding: 0em 0.25em;
+      }
 
+      button {
+        padding: 0.25em 0.5em;
+      }
+
+      a,
+      button {
         > div {
           overflow: hidden; // clears the text from wrapping below icons
           overflow-wrap: anywhere;
@@ -341,19 +365,40 @@
     @include unselectable;
 
     &.quick-access-profile {
+      display: inline;
       li:not(.show-all) a {
         color: var(--primary);
         display: flex;
       }
+      ul button {
+        line-height: 1.4; // match 'ul a' link height
+        width: 100%;
+        display: flex;
+      }
+      @media screen and (max-height: 360px) {
+        // two column grid to avoid scroll
+        ul {
+          display: grid;
+          grid-template-columns: repeat(2, minmax(0, 1fr));
+          grid-gap: 0 1em;
+          a {
+            @include ellipsis;
+          }
+          button {
+            span:not(.relative-date) {
+              @include ellipsis;
+            }
+          }
+        }
+        li:not(.show-all) a {
+          color: var(--primary);
+          display: flex;
+        }
+      }
     }
   }
 }
 
-.user-notifications-link {
-  // keep this in leftmost position consistently
-  order: -1;
-}
-
 div.menu-links-header {
   width: 100%;
   .menu-links-row {
@@ -361,75 +406,76 @@ div.menu-links-header {
     display: flex;
     width: 100%;
     z-index: 2;
+    justify-content: space-between;
 
-    li {
+    .glyphs {
       display: inline-flex;
       align-items: center;
-      flex-wrap: wrap;
+      flex-wrap: nowrap;
+      width: 100%;
+      justify-content: space-between;
+      padding: 0;
 
-      &.glyphs {
-        flex-wrap: nowrap;
-        width: 100%;
-        justify-content: space-between;
-        padding: 0;
+      button {
+        display: flex;
+        flex: 1 1 auto;
+        padding: 0.65em 0.25em 0.75em;
+        justify-content: center;
 
-        a {
-          display: flex;
-          flex: 1 1 auto;
-          padding: 0.65em 0.25em 0.75em;
-          justify-content: center;
-        }
-      }
-
-      a {
-        // 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;
-        &:not(.active):hover {
-          border-bottom: 0;
-          margin-top: -1px;
-        }
-      }
-
-      a.active {
-        border: 1px solid var(--primary-low);
-        border-bottom: 1px solid var(--secondary);
-        position: relative;
-
-        .d-icon {
-          color: var(--primary-high);
-        }
-
-        &:focus,
-        &:hover {
-          background-color: inherit;
+        svg {
+          pointer-events: none;
         }
       }
     }
+
+    button {
+      // 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;
+      &:not(.active):hover {
+        border-bottom: 0;
+        margin-top: -1px;
+      }
+    }
+
+    button.active {
+      border: 1px solid var(--primary-low);
+      border-bottom: 1px solid var(--secondary);
+      position: relative;
+
+      .d-icon {
+        color: var(--primary-high);
+      }
+
+      &:hover {
+        background-color: inherit;
+      }
+    }
   }
-  a:hover,
-  a:focus {
+
+  button:hover,
+  button:focus {
     background-color: var(--highlight-medium);
     outline: none;
   }
-  a {
+  button {
     padding: 0.3em 0.5em;
   }
 
-  li {
+  .glyphs {
     display: table-cell;
     width: auto;
     text-align: center;
   }
-  li:first-child {
+  .glyphs:first-child {
     text-align: left;
   }
 
-  li:last-child {
+  .glyphs:last-child {
     text-align: right;
   }
   .fa,
-  a {
+  button {
     color: var(--primary-med-or-secondary-med);
   }
 }
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 2120796c84..c6649014b2 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -73,7 +73,7 @@
   .modal-close {
     order: 2;
     margin-left: auto;
-    padding-left: 2em;
+
     .close {
       color: var(--primary-high);
     }
@@ -110,21 +110,6 @@
   }
 }
 
-// slide in
-@keyframes slidein {
-  from {
-    transform: translateY(-20%);
-  }
-  to {
-    transform: translateY(0);
-  }
-}
-
-.create-account.in .modal-inner-container,
-.login-modal.in .modal-inner-container {
-  animation: slidein 0.3s;
-}
-
 .inline-modal {
   .modal-inner-container {
     border: 1px solid var(--secondary-medium);
@@ -162,14 +147,22 @@
 }
 
 .modal-footer {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
   padding: 14px 15px 10px;
   border-top: 1px solid var(--primary-low);
+  --btn-bottom-margin: 0.3em;
   .btn {
-    margin: 0 5px 5px 0;
+    margin: 0 0.75em var(--btn-bottom-margin) 0;
     &[href] {
       min-height: unset;
     }
   }
+
+  a {
+    margin-bottom: var(--btn-bottom-margin);
+  }
 }
 
 .modal {
@@ -234,7 +227,6 @@
               align-items: center;
             }
             .discourse-tags {
-              display: inline-block;
               font-size: $font-down-1;
             }
           }
@@ -286,22 +278,32 @@
 }
 
 .reply-where-modal {
-  .modal-footer {
-    a {
-      display: block;
+  max-width: 400px;
+
+  h1 {
+    margin: 0;
+    font-size: $font-up-2;
+  }
+
+  .d-modal-cancel {
+    width: 100%;
+    margin: 0.5em 0;
+  }
+
+  .btn {
+    display: block;
+    text-align: left;
+    font-size: $font-up-1;
+    line-height: $line-height-medium;
+    margin-bottom: 0.75em;
+    font-weight: bold;
+    overflow: hidden;
+    width: 100%;
+    &:first-of-type {
+      margin-top: 0.25em;
     }
-    .d-modal-cancel {
-      margin: 1em 0 0.5em;
-    }
-    .btn {
-      text-align: left;
-      font-size: $font-up-2;
-      line-height: $line-height-medium;
-      margin-bottom: 10px;
-      font-weight: bold;
-      .topic-title {
-        font-weight: normal;
-      }
+    .topic-title {
+      font-weight: normal;
     }
   }
 }
@@ -322,7 +324,7 @@
   }
 }
 
-.delete-posts-progress {
+.admin-delete-user-posts-progress-modal {
   .progress-bar {
     height: 15px;
     position: relative;
@@ -428,8 +430,7 @@
   max-width: 420px;
 }
 
-.change-timestamp,
-.poll-ui-builder {
+.change-timestamp {
   #date-container {
     .pika-single {
       position: relative !important; // overriding another important
@@ -664,6 +665,20 @@
   }
 }
 
+.bulk-notification-list {
+  margin-bottom: 1.5em;
+}
+
+.notification-level-radio {
+  flex-wrap: wrap;
+  align-items: baseline;
+  margin-bottom: 0.5em;
+  .description {
+    width: 100%;
+    margin-top: 0.25em;
+  }
+}
+
 .modal.edit-slow-mode-modal {
   .slow-mode-label {
     display: inline-flex;
@@ -677,3 +692,254 @@
     width: 10%;
   }
 }
+
+.json-schema-editor-modal {
+  h3.card-title {
+    margin-top: 0;
+    label {
+      display: none;
+    }
+  }
+
+  .card .je-object__container {
+    border-bottom: 1px dashed var(--primary-low);
+    padding-bottom: 1em;
+    margin-bottom: 1em;
+    position: relative;
+
+    .card-title label {
+      display: inline-block;
+      font-size: $font-down-1;
+      color: var(--primary-medium);
+    }
+    .form-group {
+      label {
+        display: inline-block;
+        width: 33%;
+      }
+      .form-control {
+        width: 66%;
+      }
+    }
+    .btn-group:last-child {
+      position: absolute;
+      right: 0px;
+      top: 0px;
+      .btn {
+        font-size: $font-down-2;
+      }
+    }
+  }
+
+  .btn-group {
+    margin-top: 0;
+  }
+
+  .json-editor-btn-delete {
+    @extend .btn-danger !optional;
+    @extend .no-text !optional;
+    .d-icon + span {
+      display: none;
+    }
+  }
+
+  .card-body > .btn-group {
+    // !important needed to override inline style :-(
+    display: block !important;
+    text-align: right;
+  }
+}
+
+.json-schema-editor-modal {
+  h3.card-title {
+    margin-top: 0;
+    label {
+      display: none;
+    }
+  }
+
+  .card .je-object__container {
+    border-bottom: 1px dashed var(--primary-low);
+    padding-bottom: 1em;
+    margin-bottom: 1em;
+    position: relative;
+
+    .card-title label {
+      display: inline-block;
+      font-size: $font-down-1;
+      color: var(--primary-medium);
+    }
+    .form-group {
+      label {
+        display: inline-block;
+        width: 33%;
+      }
+      .form-control {
+        width: 66%;
+      }
+    }
+    .btn-group:last-child {
+      position: absolute;
+      right: 0px;
+      top: 0px;
+      .btn {
+        font-size: $font-down-2;
+      }
+    }
+  }
+
+  .btn-group {
+    margin-top: 0;
+  }
+
+  .json-editor-btn-delete {
+    @extend .btn-danger !optional;
+    @extend .no-text !optional;
+    .d-icon + span {
+      display: none;
+    }
+  }
+
+  .card-body > .btn-group {
+    // !important needed to override inline style :-(
+    display: block !important;
+    text-align: right;
+  }
+
+  .table {
+    td {
+      vertical-align: top;
+      padding: 1em 0;
+    }
+    td.compact {
+      .invalid-feedback {
+        margin: 0;
+        font-size: $font-down-1;
+        color: var(--danger);
+      }
+    }
+    input[type="text"] {
+      margin-bottom: 0;
+      width: 95%;
+      &.is-invalid {
+        border-color: var(--danger);
+        outline: 1px solid var(--danger);
+      }
+    }
+  }
+}
+
+.create-invite-modal,
+.share-topic-modal {
+  .input-group {
+    margin-bottom: 1em;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    input[type="text"] {
+      width: 100%;
+    }
+  }
+
+  .invite-type {
+    input[type="checkbox"] {
+      display: inline;
+      vertical-align: middle;
+      margin-top: -1px;
+    }
+
+    label {
+      display: inline-block;
+    }
+  }
+
+  .group-chooser,
+  .user-chooser,
+  .future-date-input-selector {
+    width: 100%;
+  }
+
+  .input-group input[type="text"],
+  .input-group .btn,
+  .user-chooser .select-kit-header,
+  .future-date-input .select-kit-header {
+    height: 34px;
+  }
+
+  .input-group .btn {
+    vertical-align: top;
+  }
+
+  .invite-input-with-button {
+    display: flex;
+
+    .btn {
+      margin-left: 3px;
+    }
+  }
+
+  .future-date-input {
+    .date-picker-wrapper {
+      input {
+        margin: 0;
+      }
+    }
+
+    .control-group:nth-child(2),
+    .control-group:nth-child(3) {
+      display: inline-block;
+      margin-bottom: 0;
+      width: 49%;
+
+      input {
+        margin-bottom: 0;
+        width: 150px;
+      }
+    }
+  }
+
+  .invite-max-redemptions {
+    label {
+      display: inline;
+    }
+
+    input {
+      width: 80px;
+    }
+  }
+
+  .show-advanced {
+    margin-left: auto;
+    margin-right: 0;
+  }
+}
+
+.share-topic-modal {
+  .sources {
+    align-items: center;
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+    margin-bottom: 1em;
+
+    .social-link {
+      font-size: $font-up-6;
+      margin-right: 8px;
+    }
+
+    .btn-primary {
+      border-radius: 4px;
+      height: calc(#{$font-up-6} - 4px);
+      margin-bottom: 2px;
+      margin-right: 8px;
+      padding-left: 8px;
+      padding-right: 8px;
+
+      .d-icon {
+        font-size: $font-up-3;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 07dbe58677..9e3c544036 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -87,7 +87,7 @@ a.loading-onebox {
 
 @mixin onebox-favicon($class, $image) {
   &.#{$class} .source {
-    background: image-url("favicons/#{$image}.png") no-repeat 0% 50%;
+    background: absolute-image-url("/favicons/#{$image}.png") no-repeat 0% 50%;
     background-size: 16px 16px;
     padding-left: 20px;
   }
@@ -105,6 +105,15 @@ aside.onebox {
     display: flex;
     margin-bottom: 1em;
 
+    .d-icon {
+      margin-right: 5px;
+      margin-top: 2px;
+
+      &.d-icon-fab-twitter {
+        color: var(--twitter);
+      }
+    }
+
     a[href] {
       color: var(--primary-med-or-secondary-med);
       text-decoration: none;
@@ -112,15 +121,6 @@ aside.onebox {
   }
 
   @include onebox-favicon("stackexchange", "stackexchange");
-  @include onebox-favicon("twitterstatus", "twitter");
-  @include onebox-favicon("wikipedia", "wikipedia");
-  @include onebox-favicon("githubblob", "github");
-  @include onebox-favicon("githubcommit", "github");
-  @include onebox-favicon("githubpullrequest", "github");
-  @include onebox-favicon("githubissue", "github");
-  @include onebox-favicon("githubfile", "github");
-  @include onebox-favicon("githubgist", "github");
-  @include onebox-favicon("amazon", "amazon");
   @include onebox-favicon("instagram", "instagram");
   @include onebox-favicon("googledocs", "google_branding/logo_drive_48px");
   @include onebox-favicon("googledrive", "google_branding/logo_drive_48px");
@@ -161,6 +161,24 @@ aside.onebox {
       }
     }
 
+    .github-body-container {
+      margin: 1em 0 0 0;
+      color: var(--primary-very-high);
+      max-height: 400px;
+      white-space: pre-wrap;
+      overflow-y: auto;
+      word-break: break-word;
+      font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono",
+        "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace;
+      flex: 1 0 100%;
+      box-sizing: border-box;
+
+      .show-more {
+        // padding on right for larger hitzone
+        padding: 0.5em 1.5em 0em 0.25em;
+      }
+    }
+
     [style*="--aspect-ratio"] > :first-child {
       width: 100%;
     }
@@ -289,7 +307,9 @@ aside.onebox {
 
 @mixin gdocs-logo($type) {
   &.g-#{$type}-logo {
-    background: image-url("favicons/google_branding/logo_#{$type}_48px.png")
+    background: absolute-image-url(
+        "/favicons/google_branding/logo_#{$type}_48px.png"
+      )
       no-repeat;
   }
 }
@@ -316,7 +336,9 @@ aside.onebox {
     width: 128px;
     height: 128px;
     &.g-calendar-logo {
-      background: image-url("favicons/google_branding/logo_calendar_128px.png")
+      background: absolute-image-url(
+          "/favicons/google_branding/logo_calendar_128px.png"
+        )
         no-repeat;
     }
   }
@@ -477,11 +499,6 @@ pre.onebox code {
     max-width: none;
   }
 
-  .github-content {
-    margin: 5px 0 0 0;
-    word-break: break-word;
-  }
-
   .labels span {
     // !important required to override inline style attribute
     background-color: var(--primary-medium) !important;
@@ -523,10 +540,6 @@ pre.onebox code {
   background-color: #bd2c00;
 }
 
-.onebox-body .github-content-right {
-  margin-left: 100px;
-}
-
 //Onebox - Twitter - Status
 aside.onebox.twitterstatus .onebox-body {
   h4 {
@@ -635,7 +648,7 @@ aside.onebox.stackexchange .onebox-body {
     width: 60px;
     height: 50px;
     float: left;
-    background: image-url("favicons/pdf_64px.png") no-repeat;
+    background: absolute-image-url("/favicons/pdf_64px.png") no-repeat;
     background-size: 48px 48px;
     display: inline-block;
   }
@@ -670,6 +683,11 @@ aside.onebox.stackexchange .onebox-body {
       margin-right: 0.5em;
     }
   }
+  &.category-onebox {
+    border: 1px solid var(--primary-low);
+    padding-left: calc(1em - 5px);
+    margin-left: 5px;
+  }
 }
 
 .onebox.gfycat p {
@@ -750,6 +768,26 @@ aside.onebox.stackexchange .onebox-body {
   }
 }
 
+.video-container {
+  .notice {
+    background-color: var(--highlight-medium);
+    padding: 10px 20px;
+    position: absolute;
+    width: calc(100% - 40px);
+    animation: 0.5s fadeIn;
+  }
+}
+
+@keyframes fadeIn {
+  0% {
+    opacity: 0;
+  }
+
+  100% {
+    opacity: 1;
+  }
+}
+
 .onebox-placeholder-container {
   position: relative;
   width: 100%;
@@ -798,3 +836,9 @@ aside.onebox.stackexchange .onebox-body {
     }
   }
 }
+
+aside.onebox.preview-error .site-icon {
+  width: 16px;
+  height: 16px;
+  margin-right: 0.5em;
+}
diff --git a/app/assets/stylesheets/common/base/popup-menu.scss b/app/assets/stylesheets/common/base/popup-menu.scss
index c3524c7393..65a1165dfb 100644
--- a/app/assets/stylesheets/common/base/popup-menu.scss
+++ b/app/assets/stylesheets/common/base/popup-menu.scss
@@ -19,16 +19,20 @@
   }
 
   .btn {
+    justify-content: left;
     text-align: left;
     background: none;
     width: 100%;
     padding: 0.75em;
     border-radius: 0;
+    margin: 0;
 
     .d-icon {
       color: var(--primary-medium);
+      align-self: flex-start;
     }
 
+    &:focus,
     &:hover {
       color: var(--primary);
       background: var(--tertiary-low);
@@ -47,6 +51,7 @@
         color: var(--primary);
       }
 
+      &:focus,
       &:hover {
         .d-icon,
         .d-button-label {
diff --git a/app/assets/stylesheets/common/base/reviewables.scss b/app/assets/stylesheets/common/base/reviewables.scss
index 49c8d980f3..7fbbb1a594 100644
--- a/app/assets/stylesheets/common/base/reviewables.scss
+++ b/app/assets/stylesheets/common/base/reviewables.scss
@@ -188,11 +188,6 @@
     width: auto;
   }
 
-  .refresh {
-    height: 1em;
-    display: flex;
-  }
-
   .score-filter {
     width: 5em;
   }
diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index de3ac13d76..f1b141939c 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -55,10 +55,18 @@
 // This is for the support_mixed_text_direction setting
 .cooked ul[dir="ltr"],
 .d-editor-preview ul[dir="ltr"],
-.cooked ul[dir="rtl"],
-.d-editor-preview ul[dir="rtl"] {
-  padding-right: 40px;
+.rtl .cooked ul[dir="rtl"],
+.rtl .d-editor-preview ul[dir="rtl"] {
   padding-left: 40px;
+  padding-right: 0;
+}
+
+.cooked ul[dir="rtl"],
+.d-editor-preview ul[dir="rtl"],
+.rtl .cooked ul[dir="ltr"],
+.rtl .d-editor-preview ul[dir="ltr"] {
+  padding-left: 0;
+  padding-right: 40px;
 }
 
 // Fixes github oneboxes for RTL sites
@@ -120,3 +128,12 @@
     }
   }
 }
+
+.rtl .ace_placeholder {
+  direction: rtl !important;
+  text-align: right !important;
+
+  [dir="ltr"] {
+    text-align: left !important;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index fc4c6d43d3..4076e019d9 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -68,8 +68,9 @@
         align-items: center;
 
         .discourse-tags {
-          flex-wrap: wrap;
-          display: contents;
+          .discourse-tag {
+            margin-right: 0.25em;
+          }
         }
       }
 
@@ -221,6 +222,11 @@
               font-size: $font-down-1;
             }
 
+            .custom-field {
+              color: var(--primary-high-or-secondary-low);
+              font-size: $font-down-2;
+            }
+
             .name {
               color: var(--primary-high-or-secondary-low);
               font-size: $font-0;
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index e4d85303ac..19a2a82bd8 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -11,7 +11,7 @@
   .search-bar {
     display: flex;
     justify-content: space-between;
-    align-items: center;
+    align-items: stretch;
     margin-bottom: 1em;
 
     .search-query {
@@ -79,11 +79,28 @@
     .search-title {
       display: flex;
       justify-content: flex-start;
-      align-items: flex-start;
+      align-items: stretch;
       flex-wrap: wrap;
+      padding-right: 2.6em; // placeholder for fixed position bulk search button
       button {
         margin: 0 0.5em 0.5em 0;
       }
+
+      .bulk-select-container {
+        order: 2; // last button
+        margin-left: auto;
+        z-index: z("dropdown"); // below composer
+      }
+
+      #bulk-select {
+        position: fixed;
+        right: unset;
+        margin: 0;
+        button {
+          margin: 0;
+          box-shadow: 0 0 0.4em 0.45em var(--secondary); // slight fade behind the button, because it can overlay content
+        }
+      }
     }
 
     .search-notice {
@@ -128,6 +145,7 @@
     }
 
     .search-advanced-title {
+      font-size: $font-up-1;
       background: var(--primary-low);
       padding: 0.358em 1em;
       @include breakpoint(medium) {
@@ -226,6 +244,17 @@
     }
   }
 
+  .discourse-tags {
+    flex-wrap: wrap;
+    display: inline-flex;
+    font-weight: normal;
+
+    .discourse-tag.simple {
+      font-size: $font-down-1;
+      margin-right: 0.25em;
+    }
+  }
+
   input[type="checkbox"] {
     margin-top: 0;
     margin-left: 0;
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index d81201c513..22a1ca6ab4 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -31,20 +31,6 @@
   }
 }
 
-.tag-show-heading {
-  display: inline-flex;
-  flex-wrap: wrap;
-  align-items: center;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: hidden;
-  width: 100%;
-  .d-icon,
-  span {
-    margin: 0 0.25em;
-  }
-}
-
 .topic-category {
   display: flex;
   flex-wrap: wrap;
@@ -63,8 +49,6 @@
 .discourse-tag-count {
   font-size: $font-down-1;
   color: var(--primary-medium);
-  line-height: $line-height-small;
-  vertical-align: middle;
 }
 
 .discourse-tag {
@@ -104,7 +88,6 @@
   &.simple,
   &.simple:visited,
   &.simple:hover {
-    margin-right: 0;
     color: var(--primary-high);
   }
 
@@ -131,7 +114,7 @@
 .discourse-tags,
 .list-tags,
 .search-category {
-  .discourse-tag.simple:not(:last-of-type):after {
+  .discourse-tag.simple:not(:last-child):after {
     content: ", ";
     margin-left: 1px;
   }
@@ -139,7 +122,6 @@
 
 .d-header .topic-header-extra {
   .discourse-tags {
-    display: inline-block;
     font-size: $font-down-1;
   }
   .discourse-tags + .topic-featured-link {
@@ -147,22 +129,25 @@
   }
 }
 
+.discourse-tags {
+  display: inline-flex;
+  flex-wrap: wrap;
+  a {
+    margin-right: 0.25em;
+  }
+}
+
 .fps-result .add-full-page-tags {
   display: inline-block;
 }
 
 .topic-list-item {
   .discourse-tags {
-    display: inline-flex;
     font-weight: normal;
     font-size: $font-down-1;
   }
 }
 
-.categories-list .topic-list-latest .discourse-tags {
-  display: inline-block;
-}
-
 .mobile-view .topic-list-item .discourse-tags {
   display: inline-flex;
   flex-wrap: wrap;
@@ -260,6 +245,9 @@ header .discourse-tag {
       margin-bottom: 10px;
     }
   }
+  .tag-group-controls {
+    display: flex;
+  }
   .group-tags-list .tag-chooser {
     width: 100%;
   }
@@ -314,3 +302,23 @@ section.tag-info {
     }
   }
 }
+
+.tag-navigation {
+  .mini-tag-chooser.tags-intersection-chooser {
+    margin: 0 0.5em 0 0;
+  }
+}
+
+body.tags-intersection {
+  .category-breadcrumb {
+    margin-right: auto;
+  }
+}
+
+.tags-controls {
+  display: flex;
+  h2 {
+    order: -1;
+    margin-right: auto;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 71f7fd146a..bbefe2792b 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -94,6 +94,33 @@ $quote-share-maxwidth: 150px;
   h6 {
     margin: 30px 0 10px;
     line-height: $line-height-medium;
+    a.anchor {
+      &:before {
+        content: svg-uri(
+          '<svg xmlns="http://www.w3.org/2000/svg" width="16px" height="16px" viewBox="0 0 512 512" fill="#{$primary-medium}"><path d="M326.612 185.391c59.747 59.809 58.927 155.698.36 214.59-.11.12-.24.25-.36.37l-67.2 67.2c-59.27 59.27-155.699 59.262-214.96 0-59.27-59.26-59.27-155.7 0-214.96l37.106-37.106c9.84-9.84 26.786-3.3 27.294 10.606.648 17.722 3.826 35.527 9.69 52.721 1.986 5.822.567 12.262-3.783 16.612l-13.087 13.087c-28.026 28.026-28.905 73.66-1.155 101.96 28.024 28.579 74.086 28.749 102.325.51l67.2-67.19c28.191-28.191 28.073-73.757 0-101.83-3.701-3.694-7.429-6.564-10.341-8.569a16.037 16.037 0 0 1-6.947-12.606c-.396-10.567 3.348-21.456 11.698-29.806l21.054-21.055c5.521-5.521 14.182-6.199 20.584-1.731a152.482 152.482 0 0 1 20.522 17.197zM467.547 44.449c-59.261-59.262-155.69-59.27-214.96 0l-67.2 67.2c-.12.12-.25.25-.36.37-58.566 58.892-59.387 154.781.36 214.59a152.454 152.454 0 0 0 20.521 17.196c6.402 4.468 15.064 3.789 20.584-1.731l21.054-21.055c8.35-8.35 12.094-19.239 11.698-29.806a16.037 16.037 0 0 0-6.947-12.606c-2.912-2.005-6.64-4.875-10.341-8.569-28.073-28.073-28.191-73.639 0-101.83l67.2-67.19c28.239-28.239 74.3-28.069 102.325.51 27.75 28.3 26.872 73.934-1.155 101.96l-13.087 13.087c-4.35 4.35-5.769 10.79-3.783 16.612 5.864 17.194 9.042 34.999 9.69 52.721.509 13.906 17.454 20.446 27.294 10.606l37.106-37.106c59.271-59.259 59.271-155.699.001-214.959z"></path></svg>'
+        );
+        line-height: 1.4;
+        margin-left: -20px;
+        padding-right: 4px;
+        position: absolute;
+        opacity: 0;
+        transition: opacity 0.25s;
+      }
+      &:hover {
+        // show when hovering where icon should be
+        &:before {
+          opacity: 1;
+        }
+      }
+    }
+    &:hover {
+      // show when hovering header
+      a.anchor {
+        &:before {
+          opacity: 1;
+        }
+      }
+    }
   }
 
   h1 {
@@ -125,7 +152,8 @@ $quote-share-maxwidth: 150px;
   }
 
   del,
-  ins {
+  ins,
+  mark {
     text-decoration: none;
   }
 
@@ -135,6 +163,9 @@ $quote-share-maxwidth: 150px;
   del {
     background-color: var(--danger-low);
   }
+  mark {
+    background-color: var(--highlight);
+  }
   // Prevents users from breaking posts with tag nesting
   big {
     font-size: 1.5rem;
@@ -247,6 +278,12 @@ blockquote {
   color: var(--primary-low-mid-or-secondary-high);
 }
 
+.quote-controls {
+  .quote-toggle {
+    padding: 0;
+  }
+}
+
 .cooked .highlight {
   background-color: var(--tertiary-low);
   padding: 2px;
@@ -655,6 +692,39 @@ blockquote {
   &.raw-email {
     cursor: pointer;
   }
+  &.edits {
+    .widget-button {
+      display: flex;
+      align-items: center;
+
+      .d-button-label {
+        order: 0;
+        padding-right: 0.25em;
+        color: var(--primary-med-or-secondary-med);
+        transition: color 0.25s;
+      }
+
+      .d-icon {
+        order: 1;
+        transition: color 0.25s;
+        color: var(--primary-med-or-secondary-med);
+      }
+      .discourse-no-touch & {
+        &:hover {
+          .d-button-label {
+            color: var(--primary-high);
+          }
+          .d-icon {
+            color: var(--primary-high);
+          }
+        }
+      }
+      &:focus {
+        @include default-focus;
+        background: transparent;
+      }
+    }
+  }
 }
 
 pre {
@@ -682,6 +752,7 @@ pre {
     font-size: $font-down-2;
     min-height: 0;
     font-size: $font-down-2;
+    opacity: 0.7;
 
     &.copied {
       .d-icon {
@@ -803,6 +874,10 @@ blockquote > *:last-child {
     color: var(--primary-medium);
     min-width: 0; // Allows flex container to shrink
 
+    button {
+      align-self: flex-start;
+    }
+
     .custom-message {
       flex: 1 1 100%;
       text-transform: none;
@@ -825,6 +900,7 @@ blockquote > *:last-child {
 
     > p {
       margin: 0;
+      padding-right: 0.5em;
       line-height: $line-height-medium;
       flex: 1 1;
     }
@@ -1008,12 +1084,42 @@ a.mention-group {
 }
 
 .signup-cta {
+  box-sizing: border-box;
+  max-width: calc(#{$topic-body-width} + 4.5em);
+  padding: 3em 5em 2em 56px; // 45px (topic avatar) + 11px (margin) = 56px
+  @include breakpoint(mobile-extra-large) {
+    padding: 1.5em 1.5em 0.25em;
+  }
+  h3 {
+    margin-bottom: 0.5em;
+  }
   a {
-    float: right;
     text-decoration: underline;
   }
   .buttons {
-    margin-bottom: 1em;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    margin: 1.5em 0 1em;
+    > * {
+      margin-bottom: 0.5em;
+    }
+    .btn {
+      margin-right: 0.5em;
+      white-space: nowrap;
+      &.btn-remind {
+        background: var(--primary-very-low);
+        margin-right: auto;
+        @include hover {
+          background: var(--primary-medium);
+        }
+      }
+      @include breakpoint(mobile-extra-large) {
+        &.btn-primary {
+          margin-right: 100%;
+        }
+      }
+    }
   }
 }
 
@@ -1049,31 +1155,24 @@ a.mention-group {
 }
 
 #topic-footer-buttons {
-  padding: 0.5em 0;
+  margin: var(--below-topic-margin) 0;
+  padding: 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;
-      }
+    align-items: stretch; // aligns items by making them the same height
+    button {
+      margin-right: 0.54em;
+    }
+    > * {
+      margin-bottom: 0.5em; // all immediate children should have a bottom margin in case of wrapping
     }
-
     .topic-admin-menu-button-container {
       display: inline-flex;
-    }
-
-    .topic-admin-menu-button-container > span:not(:empty) {
-      margin: 0 0.5em 0.5em 0;
+      > span {
+        display: flex; // to make this button match siblings behavior, all of its parents need to be flex
+      }
     }
   }
 
@@ -1083,7 +1182,7 @@ a.mention-group {
 
   .pinned-button,
   .topic-notifications-button {
-    margin: 1em 0;
+    margin: 0.5em 0 1em;
 
     .reason {
       color: var(--primary-high);
@@ -1091,8 +1190,19 @@ a.mention-group {
       margin: 0;
       align-items: center;
 
+      .dropdown-select-box {
+        .select-kit-selected-name {
+          width: 100%;
+          overflow: hidden;
+        }
+        .name {
+          @include ellipsis;
+        }
+      }
+
       .text {
         margin-left: 0.5em;
+        line-height: $line-height-medium;
       }
     }
   }
@@ -1109,3 +1219,96 @@ a.mention-group {
   bottom: -2px;
   right: 15px;
 }
+
+.posts-filtered-notice {
+  position: -webkit-sticky;
+  position: sticky;
+  background-color: var(--tertiary-low);
+  bottom: 0;
+  padding: 1em;
+  margin-top: 0.5em;
+  text-align: center;
+  z-index: 2;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  max-width: calc(
+    #{$topic-body-width} + (#{$topic-body-width-padding} * 2) + #{$topic-avatar-width} -
+      (0.8em * 2)
+  );
+
+  .filtered-avatar {
+    margin: 0 0.5em;
+    + .names {
+      flex: inherit;
+    }
+  }
+
+  .filtered-replies-show-all {
+    margin-left: 1em;
+  }
+
+  .filtered-user-row {
+    @include ellipsis;
+  }
+}
+
+.pausable-animated-image {
+  position: relative;
+  display: inline-block;
+
+  > canvas,
+  > .animated-image-overlay {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+  }
+
+  > canvas {
+    background-color: var(--primary-very-low);
+  }
+
+  > .animated-image-overlay {
+    pointer-events: none;
+    text-align: right;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+    > .d-icon {
+      cursor: pointer;
+      padding: 0.5em;
+      margin: 0.5em;
+      background-color: rgba(var(--always-black-rgb), 0.25);
+      color: var(--secondary-or-primary);
+      cursor: pointer;
+      display: none;
+    }
+  }
+
+  img.animated {
+    cursor: pointer;
+  }
+
+  html.no-touch
+    &:not(.paused-animated-image)
+    .animated:hover
+    + .animated-image-overlay
+    .d-icon-pause {
+    display: initial;
+  }
+
+  &.paused-animated-image
+    .animated.manually-paused
+    + .animated-image-overlay
+    .d-icon-play {
+    display: initial;
+  }
+}
+
+.paused-animated-image {
+  img.animated {
+    // need to keep the image hidden but clickable
+    // so the user can resume animation
+    opacity: 0;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index bb36aef0d4..b56d49d6a3 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -16,10 +16,15 @@
   }
 }
 
+[class*="archetype-"] {
+  --below-topic-margin: 0.75em;
+}
+
 .container.posts {
   display: grid;
   grid-template-areas: "posts timeline";
   grid-template-columns: auto auto;
+  margin-bottom: var(--below-topic-margin);
   > .row {
     grid-area: posts;
     max-width: calc(
@@ -62,6 +67,13 @@
   }
 }
 
+@media screen and (max-width: 924px) {
+  .post-stream {
+    // make space for the topic progress bar to dock
+    padding-bottom: 2em;
+  }
+}
+
 .progress-back-container {
   z-index: z("dropdown");
   margin-right: 0;
@@ -72,7 +84,7 @@
   margin-bottom: 0px;
   position: absolute;
   right: 0;
-  top: -2em;
+  top: -120%; // above parent container + some extra space
   .btn {
     margin: 0;
   }
@@ -80,6 +92,7 @@
 
 #topic-progress-wrapper {
   display: flex;
+  right: 9px; // 8px padding on #main-outlet + 1px right border
   .topic-admin-menu-button-container {
     display: flex;
     > span {
@@ -104,6 +117,36 @@
   }
 }
 
+.topic-status-info,
+.topic-timer-info {
+  border-top: 1px solid var(--primary-low);
+  margin: 0;
+  max-width: 758px;
+  &:empty {
+    padding: 0;
+  }
+  span .d-icon {
+    font-size: $font-down-1;
+  }
+  .topic-timer-heading,
+  .slow-mode-heading {
+    display: flex;
+    align-items: center;
+    margin: 0;
+    padding: var(--below-topic-margin) 0;
+  }
+  .slow-mode-remove,
+  .topic-timer-modify {
+    display: flex;
+    margin-left: auto;
+    align-self: flex-start;
+  }
+  button {
+    font-size: $font-down-2;
+    background: transparent;
+  }
+}
+
 .title-wrapper {
   display: flex;
   flex-wrap: wrap;
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 24a318e2fb..6a1fc677e9 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -217,7 +217,6 @@
 
       .btn {
         margin-bottom: 10px;
-        line-height: $line-height-medium;
       }
     }
 
@@ -339,7 +338,9 @@
   }
 }
 
-.user-field {
+.login-form,
+.user-field,
+.invites-show {
   .required {
     vertical-align: top;
     color: var(--danger);
@@ -705,6 +706,10 @@
   }
 }
 
+.large-notifications {
+  margin: 0;
+}
+
 .large-notification {
   display: flex;
   align-items: center;
@@ -784,7 +789,50 @@
 }
 
 .user-invites-page {
+  .user-invite-search {
+    clear: both;
+    margin: 15px 0px -15px 0px;
+  }
+
   .invite-error {
     grid-column: 1 / span 2;
   }
+
+  table.user-invite-list {
+    .invite-type {
+      .d-icon {
+        color: var(--primary-medium);
+      }
+    }
+
+    .invite-extra {
+      font-size: $font-down-1;
+      margin: 0.25em 0;
+
+      a {
+        color: var(--primary-medium);
+      }
+    }
+  }
+}
+
+.notification-schedule {
+  .instruction {
+    margin-top: 12px;
+    margin-bottom: 10px;
+  }
+
+  .notification-schedule-table {
+    .notification-schedule-tbody {
+      border-top-width: 1px;
+      .day {
+        .day-label {
+          padding: 1em 1em 1em 0;
+        }
+        .to {
+          padding: 0 0.5em;
+        }
+      }
+    }
+  }
 }
diff --git a/app/assets/stylesheets/common/base/username_tagsinput.scss b/app/assets/stylesheets/common/base/username_tagsinput.scss
index 4e69515c27..41a462f7c2 100644
--- a/app/assets/stylesheets/common/base/username_tagsinput.scss
+++ b/app/assets/stylesheets/common/base/username_tagsinput.scss
@@ -19,7 +19,6 @@ div.tagsinput span.tag {
   color: #638421;
   margin-right: 5px;
   margin-bottom: 5px;
-  font-family: helvetica;
   font-size: $font-down-1;
 }
 
@@ -31,7 +30,6 @@ div.tagsinput span.tag a {
 }
 div.tagsinput input {
   width: 80px;
-  font-family: helvetica;
   font-size: $font-down-1;
   border: 1px solid transparent;
   padding: 2px 5px;
diff --git a/app/assets/stylesheets/common/components/_index.scss b/app/assets/stylesheets/common/components/_index.scss
new file mode 100644
index 0000000000..57eb631bd2
--- /dev/null
+++ b/app/assets/stylesheets/common/components/_index.scss
@@ -0,0 +1,30 @@
+@import "badges";
+@import "banner";
+@import "bookmark-list";
+@import "bookmark-modal";
+@import "buttons";
+@import "conditional-loading-section";
+@import "convert-to-public-topic-modal";
+@import "date-input";
+@import "date-picker";
+@import "date-time-input-range";
+@import "date-time-input";
+@import "footer-nav";
+@import "group-member-dropdown";
+@import "groups-form-membership-fields";
+@import "hashtag";
+@import "iframed-html";
+@import "ignored-user-list";
+@import "keyboard_shortcuts";
+@import "navs";
+@import "relative-time-picker";
+@import "share-and-invite-modal";
+@import "svg";
+@import "tap-tile";
+@import "time-input";
+@import "time-shortcut-picker";
+@import "user-card";
+@import "user-info";
+@import "user-stream-item";
+@import "user-stream";
+@import "widget-dropdown";
diff --git a/app/assets/stylesheets/common/components/bookmark-list.scss b/app/assets/stylesheets/common/components/bookmark-list.scss
index 5d7d6c51c8..07042a6e64 100644
--- a/app/assets/stylesheets/common/components/bookmark-list.scss
+++ b/app/assets/stylesheets/common/components/bookmark-list.scss
@@ -32,6 +32,17 @@ $mobile-breakpoint: 700px;
       padding-right: 0.5em;
     }
   }
+  .main-link {
+    .bookmark-status-with-link {
+      a.title {
+        padding: 0;
+      }
+    }
+  }
+  .d-icon.bookmark-pinned {
+    font-size: $font-down-2;
+    margin-right: 0.2em;
+  }
   .bookmark-metadata {
     font-size: $font-down-2;
     display: flex;
@@ -58,4 +69,13 @@ $mobile-breakpoint: 700px;
       }
     }
   }
+  .bookmark-status-with-link {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    .topic-statuses {
+      float: none;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index a2ad95ad0e..f97c37a6c2 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -1,6 +1,7 @@
 .bookmark-with-reminder.modal {
   .modal-inner-container {
     box-sizing: border-box;
+    min-width: 310px;
   }
   .modal-body {
     width: 375px;
@@ -31,40 +32,6 @@
     }
   }
 
-  .custom-date-time-wrap {
-    padding: 1em 1em 0.5em;
-    border: 1px solid var(--primary-low);
-    border-top: none;
-    margin-top: -0.667em;
-    background: var(--primary-very-low);
-    .d-icon {
-      padding: 0 0.75em 0 0;
-      color: var(--primary-high);
-      margin-top: -0.5em;
-    }
-
-    .tap-tile-date-input,
-    .tap-tile-time-input {
-      display: flex;
-      align-items: center;
-      input {
-        width: 100%;
-        min-width: unset;
-      }
-    }
-
-    .date-picker,
-    .time-input {
-      text-align: left;
-      padding-top: 5px;
-    }
-
-    .time-input,
-    .date-picker-wrapper {
-      flex: 1 1 auto;
-    }
-  }
-
   .bookmark-name-wrap {
     display: inline-flex;
     width: 100%;
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index e00d5c2876..0c6fd07893 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -13,29 +13,29 @@
   $hover-bg-color: var(--primary-medium),
   $hover-icon-color: var(--primary-low)
 ) {
-  display: inline-block;
-  margin: 0;
-  padding: 6px 12px;
-  min-height: 30px;
-  border: none;
   box-sizing: border-box;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0;
+  padding: 0.53em 0.8em;
+  border: none;
   font-weight: normal;
+  font-size: $font-0;
+  line-height: normal;
   color: $text-color;
   background: $bg-color;
-  font-size: $font-0;
-  line-height: $line-height-small;
-  text-align: center;
   cursor: pointer;
   transition: all 0.25s;
   .d-icon {
     color: $icon-color;
     margin-right: 0.45em;
     transition: color 0.25s;
-    line-height: $line-height-medium; // Match button text line-height
   }
   &.no-text {
     .d-icon {
       margin-right: 0;
+      min-height: 17px;
     }
   }
   @include hover {
@@ -45,6 +45,14 @@
       color: $hover-icon-color;
     }
   }
+  &:focus {
+    outline: none;
+    background: $hover-bg-color;
+    color: $hover-text-color;
+    .d-icon {
+      color: $hover-icon-color;
+    }
+  }
   &[href] {
     color: $text-color;
   }
@@ -155,13 +163,13 @@
 // --------------------------------------------------
 
 .btn-social {
-  .d-icon {
-    color: #fff;
-  }
-  color: #fff;
-  background: #666;
-  &:hover {
-    color: #fff;
+  color: #000;
+  background: #fff;
+  border: 1px solid transparent;
+  &:hover,
+  &:focus {
+    box-shadow: shadow("card");
+    outline: 1px solid #000;
   }
   &[href] {
     color: var(--secondary);
@@ -173,41 +181,64 @@
   &.google_oauth2 {
     background: var(--google);
     color: #333;
-    border: 1px solid var(--primary-low);
     // non-FA SVG icon for Google in login-buttons.hbs
     .d-icon {
       opacity: 0.9;
     }
-    &:hover {
+    &:hover,
+    &:focus {
       color: currentColor;
-      background: var(--google-hover);
     }
   }
+
   &.facebook {
-    background: $facebook;
+    .d-icon {
+      color: $facebook;
+    }
     &:hover {
-      background: var(--facebook-hover);
+      .d-icon {
+        color: $facebook;
+      }
     }
   }
   &.cas {
-    background: var(--cas);
+    .d-icon {
+      color: var(--cas);
+    }
+    &:hover {
+      .d-icon {
+        color: var(--cas);
+      }
+    }
   }
   &.twitter {
-    background: var(--twitter);
+    .d-icon {
+      color: var(--twitter);
+    }
     &:hover {
-      background: var(--twitter-hover);
+      .d-icon {
+        color: var(--twitter);
+      }
     }
   }
   &.github {
-    background: var(--github);
+    .d-icon {
+      color: var(--github);
+    }
     &:hover {
-      background: var(--github-hover);
+      .d-icon {
+        color: var(--github);
+      }
     }
   }
   &.discord {
-    background: var(--discord);
+    .d-icon {
+      color: var(--discord);
+    }
     &:hover {
-      background: var(--discord-hover);
+      .d-icon {
+        color: var(--discord);
+      }
     }
   }
 }
@@ -234,10 +265,12 @@
   line-height: $line-height-small;
 }
 
+// Bonus Buttons
+// --------------------------------------------------
+
 .btn-flat {
   background: transparent;
   border: 0;
-  outline: 0;
   line-height: $line-height-small;
   transition: color 0.25s, background 0.25s;
   .d-icon {
@@ -263,15 +296,39 @@
       }
     }
   }
+
+  &:focus {
+    outline: none;
+    background: var(--primary-medium);
+    color: var(--secondary);
+    .d-icon {
+      color: var(--primary-low);
+    }
+  }
 }
 
 .btn-link {
   background: transparent;
   border: 0;
-  outline: 0;
   padding: 0;
   color: var(--tertiary);
+}
+
+.btn-mini-toggle {
+  padding: 0.4em 0.467em;
+  .d-icon {
+    color: var(--primary-high);
+  }
+  @include hover {
+    background: transparent;
+    .d-icon {
+      color: var(--primary);
+    }
+  }
   &:focus {
-    outline: 1px currentColor dotted;
+    background: var(--primary-low);
+    .d-icon {
+      color: var(--primary);
+    }
   }
 }
diff --git a/app/assets/stylesheets/common/components/date-input.scss b/app/assets/stylesheets/common/components/date-input.scss
index 698e8f5b72..7b09d20b4d 100644
--- a/app/assets/stylesheets/common/components/date-input.scss
+++ b/app/assets/stylesheets/common/components/date-input.scss
@@ -3,6 +3,7 @@
   cursor: pointer;
   flex-direction: column;
   min-width: 140px;
+  flex: 1 0 100%;
 
   .date-picker {
     cursor: pointer;
@@ -27,8 +28,7 @@
     }
 
     &:focus {
-      outline: 1px solid var(--tertiary);
-      outline-offset: 0;
+      @include default-focus;
     }
   }
 
diff --git a/app/assets/stylesheets/common/components/date-time-input.scss b/app/assets/stylesheets/common/components/date-time-input.scss
index 5e0d2af2da..59506297d8 100644
--- a/app/assets/stylesheets/common/components/date-time-input.scss
+++ b/app/assets/stylesheets/common/components/date-time-input.scss
@@ -6,7 +6,7 @@
 
   .date-picker,
   .fields {
-    border: 0;
+    border-color: transparent;
   }
 
   .d-date-time-input {
@@ -15,9 +15,9 @@
   }
 
   .d-time-input {
-    .select-kit.combo-box {
+    .combo-box {
       .select-kit-header {
-        border: none;
+        border-color: transparent;
       }
     }
   }
diff --git a/app/assets/stylesheets/common/components/footer-nav.scss b/app/assets/stylesheets/common/components/footer-nav.scss
index f116d02afe..71ed2f9af5 100644
--- a/app/assets/stylesheets/common/components/footer-nav.scss
+++ b/app/assets/stylesheets/common/components/footer-nav.scss
@@ -18,6 +18,11 @@ body.footer-nav-visible {
     margin-bottom: env(safe-area-inset-bottom);
     padding-bottom: 0px;
   }
+
+  .posts-filtered-notice {
+    transition: all linear 0.1s;
+    bottom: $footer-nav-height + 15;
+  }
 }
 
 .footer-nav {
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index f43114d792..7763081b4b 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -22,8 +22,9 @@
   @extend .clearfix;
 
   > li {
+    display: flex;
     float: left;
-    margin-right: 5px;
+    margin-right: 0.5em;
 
     > a {
       border: none;
diff --git a/app/assets/stylesheets/common/components/relative-time-picker.scss b/app/assets/stylesheets/common/components/relative-time-picker.scss
new file mode 100644
index 0000000000..a2e4eff4e3
--- /dev/null
+++ b/app/assets/stylesheets/common/components/relative-time-picker.scss
@@ -0,0 +1,18 @@
+.relative-time-picker {
+  display: flex;
+  flex-wrap: wrap;
+
+  input[type="text"] {
+    flex: 1;
+  }
+
+  .select-kit {
+    flex: 1;
+    width: auto;
+    margin-left: 5px;
+  }
+
+  &:last-child {
+    margin-right: auto;
+  }
+}
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 20fc011905..ff164eedb9 100644
--- a/app/assets/stylesheets/common/components/share-and-invite-modal.scss
+++ b/app/assets/stylesheets/common/components/share-and-invite-modal.scss
@@ -76,10 +76,6 @@
       margin-bottom: 8px;
     }
 
-    .invite-user-control input.email-or-username-input {
-      line-height: 1.75em;
-    }
-
     .group-access-control {
       .select-kit.multi-select input.filter-input {
         padding-left: 8px;
@@ -98,8 +94,16 @@
       color: var(--secondary-medium);
     }
 
-    .email-or-username-input {
+    .invite-user-input {
       width: 100%;
+
+      .input-wrapper {
+        width: 100%;
+
+        .filter-input {
+          width: 100%;
+        }
+      }
     }
 
     .max-redemptions-allowed {
diff --git a/app/assets/stylesheets/common/components/time-shortcut-picker.scss b/app/assets/stylesheets/common/components/time-shortcut-picker.scss
new file mode 100644
index 0000000000..bc1af733cc
--- /dev/null
+++ b/app/assets/stylesheets/common/components/time-shortcut-picker.scss
@@ -0,0 +1,51 @@
+.custom-date-time-wrap {
+  padding: 1em 1em 0.5em;
+  border: 1px solid var(--primary-low);
+  border-top: none;
+  background: var(--primary-very-low);
+  .d-icon {
+    padding: 0 0.75em 0 0;
+    color: var(--primary-high);
+    margin-top: -0.5em;
+  }
+
+  .caret-icon {
+    margin-top: 0;
+    padding: 0 0 0 5px;
+  }
+
+  .tap-tile-date-input,
+  .tap-tile-time-input {
+    display: flex;
+    align-items: center;
+    input {
+      width: 100%;
+      min-width: unset;
+    }
+  }
+
+  .date-picker,
+  .time-input {
+    text-align: left;
+    padding-top: 5px;
+  }
+
+  .time-input,
+  .date-picker-wrapper {
+    flex: 1 1 auto;
+  }
+
+  &.custom-input-wrap {
+    border-bottom: 0;
+    margin-bottom: 0;
+  }
+
+  &.custom-relative-wrap {
+    .relative-time-picker {
+      display: flex;
+      .select-kit.combo-box {
+        width: 60px;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scss
index 5a28b64747..5f31e02118 100644
--- a/app/assets/stylesheets/common/components/user-card.scss
+++ b/app/assets/stylesheets/common/components/user-card.scss
@@ -48,7 +48,6 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
   .card-content {
     padding: 10px;
     background: rgba(var(--secondary-rgb), 0.85);
-    margin-top: 80px;
     &:after {
       content: "";
       display: block;
@@ -61,11 +60,6 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
       @include line-clamp(2);
     }
   }
-  &.no-bg {
-    .card-content {
-      margin-top: 0;
-    }
-  }
   .card-row:not(.first-row) {
     margin-top: 0.5em;
   }
@@ -239,7 +233,11 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
       border: 1px solid var(--primary-low);
       color: var(--primary);
     }
+    .user-card-badge-link {
+      overflow: hidden;
+    }
     .more-user-badges {
+      flex: 0 0 auto; // this is more important than other badges, so don't allow it to shrink
       a {
         @extend .user-badge;
       }
diff --git a/app/assets/stylesheets/common/components/user-info.scss b/app/assets/stylesheets/common/components/user-info.scss
index dcb26e786b..bd7f95d423 100644
--- a/app/assets/stylesheets/common/components/user-info.scss
+++ b/app/assets/stylesheets/common/components/user-info.scss
@@ -27,13 +27,16 @@
       @include ellipsis;
     }
 
-    .username a {
+    .bold a {
       font-weight: bold;
-      color: var(--primary-high-or-secondary-low);
     }
 
-    .name {
+    .margin a {
       margin-left: 5px;
+    }
+
+    .name a,
+    .username a {
       color: var(--primary-high-or-secondary-low);
     }
 
@@ -62,7 +65,7 @@
       display: block;
     }
 
-    .name {
+    .margin a {
       margin-left: 0;
     }
 
diff --git a/app/assets/stylesheets/common/components/user-stream-item.scss b/app/assets/stylesheets/common/components/user-stream-item.scss
index 7adfd57caa..d027e22e46 100644
--- a/app/assets/stylesheets/common/components/user-stream-item.scss
+++ b/app/assets/stylesheets/common/components/user-stream-item.scss
@@ -10,6 +10,7 @@
     background-color: var(--secondary);
     border-bottom: 1px solid var(--primary-low);
     padding: 1em 0.53em;
+    list-style: none;
 
     &.moderator-action {
       background-color: var(--highlight-medium);
diff --git a/app/assets/stylesheets/common/components/user-stream.scss b/app/assets/stylesheets/common/components/user-stream.scss
index 56ab2a9a15..c1ca00f341 100644
--- a/app/assets/stylesheets/common/components/user-stream.scss
+++ b/app/assets/stylesheets/common/components/user-stream.scss
@@ -1,4 +1,5 @@
 .user-stream {
+  margin: 0;
   &.filter-deleted {
     grid-column-start: 1;
     grid-column-end: 3;
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 73ff05bf8d..68755aff33 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -27,7 +27,11 @@
   }
 
   &.in-focus {
-    border-color: $tertiary;
+    @include default-focus;
+
+    textarea {
+      outline: 0;
+    }
   }
 
   &.disabled {
@@ -95,6 +99,9 @@
   overflow: auto;
   cursor: default;
   -webkit-overflow-scrolling: touch;
+  // the below gives text little space to overflow without being cropped (e.g., Õ in headings)
+  padding-top: 1em;
+  margin-top: -1em;
 }
 
 .d-editor-input,
@@ -107,11 +114,6 @@
   word-wrap: break-word;
   -webkit-appearance: none;
   border-radius: 0;
-  &:focus {
-    box-shadow: none;
-    border: 0;
-    outline: 0;
-  }
 }
 
 .d-editor-input {
@@ -167,12 +169,15 @@
   }
   .d-editor-preview-wrapper {
     max-width: 100%;
-    margin: 10px 0 0 0;
+    margin: 0;
+    padding: 0;
   }
   .d-editor-preview {
     background-color: var(--primary-very-low);
-    padding: 5px;
+    margin-top: 1em;
+    padding: 0.667em;
     &:empty {
+      margin: 0;
       padding: 0;
     }
   }
@@ -263,7 +268,7 @@
   // shared styles for all font sizes
   .btn,
   .btn-default {
-    padding: 0 0.5em;
+    padding: 0.5em;
   }
   .d-editor-spacer {
     margin: 0 0.25em;
diff --git a/app/assets/stylesheets/common/font-variables.scss b/app/assets/stylesheets/common/font-variables.scss
new file mode 100644
index 0000000000..2ff960e7fc
--- /dev/null
+++ b/app/assets/stylesheets/common/font-variables.scss
@@ -0,0 +1,31 @@
+:root {
+  --base-font-size-smallest: 0.815em; // eq. to 13px
+  --base-font-size-smaller: 0.875em; // eq. to 14px
+  --base-font-size: 0.938em; // eq. to 15px
+  --base-font-size-larger: 1.063em; // eq. to 17px
+  --base-font-size-largest: 1.118em; // eq. to 19px
+
+  // Font-size defintions, multiplier ^ (step / interval)
+  --font-up-6: 2.296em;
+  --font-up-5: 2em;
+  --font-up-4: 1.7511em;
+  --font-up-3: 1.5157em;
+  --font-up-2: 1.3195em;
+  --font-up-1: 1.1487em; // 2^(1/5)
+  --font-0: 1em;
+  --font-down-1: 0.8706em; // 2^(-1/5)
+  --font-down-2: 0.7579em; // Smallest size we use based on the 1em base
+  --font-down-3: 0.6599em;
+  --font-down-4: 0.5745em;
+  --font-down-5: 0.5em;
+  --font-down-6: 0.4355em;
+
+  // inputs/textareas in iOS need to be at least 16px to avoid triggering zoom on focus
+  // with base at 15px, the below gives 16.05px
+  --font-size-ios-input: 1.07em;
+
+  // Common line-heights
+  --line-height-small: 1;
+  --line-height-medium: 1.2; // Headings or large text
+  --line-height-large: 1.4; // Normal or small text
+}
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 414f451c62..cdb409a97e 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -1,6 +1,3 @@
-@import "./variables";
-@import "./mixins";
-
 // --------------------------------------------------
 // Base styles for HTML elements
 // --------------------------------------------------
diff --git a/app/assets/stylesheets/common/foundation/color_transformations.scss b/app/assets/stylesheets/common/foundation/color_transformations.scss
index 9272280438..4b1261d170 100644
--- a/app/assets/stylesheets/common/foundation/color_transformations.scss
+++ b/app/assets/stylesheets/common/foundation/color_transformations.scss
@@ -10,38 +10,11 @@ $primary-medium: dark-light-diff($primary, $secondary, 50%, -35%) !default;
 $primary-high: dark-light-diff($primary, $secondary, 30%, -25%) !default;
 $primary-very-high: dark-light-diff($primary, $secondary, 15%, -10%) !default;
 
-//header_primary
-$header_primary-low: dark-light-diff(
-  $header_primary,
-  $header_background,
-  90%,
-  -78%
-) !default;
-$header_primary-low-mid: dark-light-diff(
-  $header_primary,
-  $header_background,
-  70%,
-  -45%
-) !default;
-
-$header_primary-medium: dark-light-diff(
-  $header_primary,
-  $header_background,
-  50%,
-  -35%
-) !default;
-$header_primary-high: dark-light-diff(
-  $header_primary,
-  $header_background,
-  30%,
-  -25%
-) !default;
-$header_primary-very-high: dark-light-diff(
-  $header_primary,
-  $header_background,
-  15%,
-  -10%
-) !default;
+$header_primary-low: blend-header-primary-background(10%) !default;
+$header_primary-low-mid: blend-header-primary-background(35%) !default;
+$header_primary-medium: blend-header-primary-background(55%) !default;
+$header_primary-high: blend-header-primary-background(70%) !default;
+$header_primary-very-high: blend-header-primary-background(90%) !default;
 
 //secondary
 $secondary-low: dark-light-diff($secondary, $primary, 70%, -70%) !default;
@@ -53,7 +26,10 @@ $secondary-very-high: dark-light-diff($secondary, $primary, 7%, -7%) !default;
 $tertiary-low: dark-light-diff($tertiary, $secondary, 85%, -65%) !default;
 $tertiary-medium: dark-light-diff($tertiary, $secondary, 50%, -45%) !default;
 $tertiary-high: dark-light-diff($tertiary, $secondary, 20%, -25%) !default;
-$tertiary-hover: dark-light-diff($tertiary, $secondary, -25%, -25%) !default;
+$tertiary-hover: dark-light-choose(
+  dark-light-diff($tertiary, $secondary, -25%, -25%),
+  dark-light-diff($tertiary, $primary, 20%, 70%)
+) !default;
 
 //quaternary
 $quaternary-low: dark-light-diff($quaternary, $secondary, 70%, -70%) !default;
@@ -123,6 +99,8 @@ $highlight-low-or-medium: dark-light-choose(
   $highlight-medium
 ) !default;
 
+$tertiary-or-tertiary-low: dark-light-choose($tertiary, $tertiary-low) !default;
+
 $tertiary-low-or-tertiary-high: dark-light-choose(
   $tertiary-low,
   $tertiary-high
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index 92fabcf0cc..5a5d79ae5d 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -112,6 +112,12 @@ $breakpoints: (
   appearance: none;
 }
 
+@mixin default-focus() {
+  border-color: var(--tertiary);
+  outline: 1px solid var(--tertiary);
+  outline-offset: 0;
+}
+
 @mixin fa-rotate($degrees, $rotation) {
   -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})";
   -webkit-transform: rotate($degrees);
@@ -168,3 +174,39 @@ $breakpoints: (
 
   @return $string;
 }
+
+// SCSS accepts HEX or RGB colors for rgba($color, 0.5)
+// CSS custom properties only accept RGB
+// Example usage:
+
+// --primary-rgb: #{hexToRGB($primary)};
+// ...
+// rgba(var(--primary-low-rgb), 0.5)
+
+@function hexToRGB($hex) {
+  @return red($hex), green($hex), blue($hex);
+}
+
+@function schemeType() {
+  @if is-light-color-scheme() {
+    @return "light";
+  } @else {
+    @return "dark";
+  }
+}
+
+@function absolute-image-url($path) {
+  // public_image_path is added by the stylesheet importer
+  // it returns a CDN or subfolder path (if applicable).
+  // SCSS will compile (and return the relative path) if public_image_path is missing.
+  @if variable-exists(public_image_path) {
+    @if (str-index("#{$path}", "/plugins") == 1) {
+      $plugin_asset_path: str-replace($public_image_path, "/images", "");
+      @return url("#{$plugin_asset_path}#{$path}");
+    } @else {
+      @return url("#{$public_image_path}#{$path}");
+    }
+  } @else {
+    @return url("#{$path}");
+  }
+}
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 021a689a02..3f4ce8eaf4 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -22,7 +22,7 @@ $google: #ffffff !default;
 $google-hover: darken($google, 5%) !default;
 $instagram: #e1306c !default;
 $instagram-hover: darken($instagram, 15%) !default;
-$facebook: #4267b2 !default;
+$facebook: #1877f2 !default;
 $facebook-hover: darken($facebook, 15%) !default;
 $cas: #70ba61 !default;
 $twitter: #1da1f2 !default;
@@ -42,43 +42,36 @@ $bronze: #cd7f32 !default;
 // Fonts
 // --------------------------------------------------
 
-$base-font-size-smallest: 0.815em !default; // eq. to 13px
-$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: var(--font-family) !default;
+$base-font-size-smallest: var(--base-font-size-smallest) !default;
+$base-font-size-smaller: var(--base-font-size-smaller) !default;
+$base-font-size: var(--base-font-size) !default;
+$base-font-size-larger: var(--base-font-size-larger) !default;
+$base-font-size-largest: var(--base-font-size-largest) !default;
 $heading-font-family: var(--heading-font-family) !default;
 
 // Font-size defintions, multiplier ^ (step / interval)
-$font-up-6: 2.296em;
-$font-up-5: 2em;
-$font-up-4: 1.7511em;
-$font-up-3: 1.5157em;
-$font-up-2: 1.3195em;
-$font-up-1: 1.1487em; // 2^(1/5)
-$font-0: 1em;
-$font-down-1: 0.8706em; // 2^(-1/5)
-$font-down-2: 0.7579em; // Smallest size we use based on the 1em base
-$font-down-3: 0.6599em;
-$font-down-4: 0.5745em;
-$font-down-5: 0.5em;
-$font-down-6: 0.4355em;
+$font-up-6: var(--font-up-6) !default;
+$font-up-5: var(--font-up-5) !default;
+$font-up-4: var(--font-up-4) !default;
+$font-up-3: var(--font-up-3) !default;
+$font-up-2: var(--font-up-2) !default;
+$font-up-1: var(--font-up-1) !default;
+$font-0: var(--font-0);
+$font-down-1: var(--font-down-1) !default;
+$font-down-2: var(--font-down-2) !default;
+$font-down-3: var(--font-down-3) !default;
+$font-down-4: var(--font-down-4) !default;
+$font-down-5: var(--font-down-5) !default;
+$font-down-6: var(--font-down-6) !default;
 
-// inputs/textareas in iOS need to be at least 16px to avoid triggering zoom on focus
-// with base at 15px, the below gives 16.05px
-$font-size-ios-input: 1.07em;
+$font-size-ios-input: var(--font-size-ios-input) !default;
 
 // Common line-heights
-$line-height-small: 1;
-$line-height-medium: 1.2; // Headings or large text
-$line-height-large: 1.4; // Normal or small text
+$line-height-small: var(--line-height-small) !default;
+$line-height-medium: var(--line-height-medium) !default;
+$line-height-large: var(--line-height-large) !default;
 
-// These files don't actually exist. They're injected by Stylesheet::Compiler.
-// --------------------------------------------------
-
-@import "theme_colors";
-@import "plugins_variables";
 @import "common/foundation/math";
 
 // Z-index
@@ -150,7 +143,7 @@ $box-shadow: (
     0 2px 0 rgba(0, 0, 0, 0.2),
     0 0 0 1px dark-light-choose(#fff, #000) inset,
   ),
-  "focus": 0 0 6px 0 $tertiary,
+  "focus": 0 0 3px 0 $tertiary,
   "focus-danger": 0 0 6px 0 $danger,
 );
 
@@ -192,6 +185,10 @@ $box-shadow: (
   @return srgb-scale($primary, $secondary, $percent);
 }
 
+@function blend-header-primary-background($percent) {
+  @return srgb-scale($header_primary, $header_background, $percent);
+}
+
 @function dark-light-diff(
   $adjusted-color,
   $comparison-color,
diff --git a/app/assets/stylesheets/common/input_tip.scss b/app/assets/stylesheets/common/input_tip.scss
index 5a37065b97..8b9e847944 100644
--- a/app/assets/stylesheets/common/input_tip.scss
+++ b/app/assets/stylesheets/common/input_tip.scss
@@ -1,6 +1,3 @@
-@import "foundation/variables";
-@import "foundation/mixins";
-
 .popup-tip {
   position: absolute;
   display: block;
diff --git a/app/assets/stylesheets/common/printer-friendly.scss b/app/assets/stylesheets/common/printer-friendly.scss
index ce0d4687d3..94067f9c02 100644
--- a/app/assets/stylesheets/common/printer-friendly.scss
+++ b/app/assets/stylesheets/common/printer-friendly.scss
@@ -15,7 +15,7 @@
   ._flyout,
   #topic-progress,
   .quote-controls,
-  .topic-status-info,
+  .topic-timer-info,
   div.lazyYT,
   .post-info.edits,
   .post-action,
@@ -35,7 +35,8 @@
   .badge-category-bg,
   .badge-notification.clicks,
   .crawler-nav,
-  .powered-by-link {
+  .powered-by-link,
+  .timeline-container {
     display: none !important;
   }
   /* For readability */
diff --git a/app/assets/stylesheets/common/select-kit/_index.scss b/app/assets/stylesheets/common/select-kit/_index.scss
new file mode 100644
index 0000000000..26789b351c
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/_index.scss
@@ -0,0 +1,27 @@
+@import "categories-admin-dropdown";
+@import "category-chooser";
+@import "category-drop";
+@import "category-row";
+@import "category-selector";
+@import "color-palettes";
+@import "combo-box";
+@import "composer-actions";
+@import "dropdown-select-box";
+@import "email-group-user-chooser";
+@import "future-date-input-selector";
+@import "icon-picker";
+@import "list-setting";
+@import "mini-tag-chooser";
+@import "multi-select";
+@import "notifications-button";
+@import "notifications-filter";
+@import "period-chooser";
+@import "pinned-button";
+@import "select-kit";
+@import "single-select";
+@import "tag-chooser";
+@import "tag-drop";
+@import "toolbar-popup-menu-options";
+@import "topic-notifications-button";
+@import "user-notifications-dropdown";
+@import "user-row";
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index b7398aabac..6e8c3db0e9 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -34,8 +34,7 @@
       font-size: $font-0;
 
       &.is-focused {
-        border: 1px solid var(--tertiary);
-        box-shadow: shadow("focus");
+        @include default-focus;
       }
     }
 
@@ -75,26 +74,14 @@
 
     &.is-highlighted {
       .select-kit-header {
-        border: 1px solid var(--tertiary);
-        box-shadow: shadow("focus");
+        @include default-focus;
       }
     }
 
     &.is-expanded {
       .select-kit-wrapper {
         display: block;
-        border: 1px solid var(--tertiary);
-        box-shadow: shadow("focus");
-      }
-    }
-
-    &.is-expanded.is-above {
-      .select-kit-header {
-        border-radius: 0 0 3px 3px;
-      }
-
-      .select-kit-body {
-        border-radius: 3px 3px 0 0;
+        @include default-focus;
       }
     }
 
diff --git a/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss b/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss
new file mode 100644
index 0000000000..599f95ecf0
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss
@@ -0,0 +1,41 @@
+.select-kit.email-group-user-chooser {
+  &.full-width-wrap {
+    width: unset;
+  }
+
+  .select-kit-row.email-group-user-chooser-row {
+    .identifier {
+      color: var(--primary);
+      white-space: nowrap;
+    }
+    .name {
+      color: var(--primary-high);
+      font-size: $font-down-1;
+      margin-left: 0.5em;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+    .avatar,
+    .d-icon {
+      margin-left: 0;
+      margin-right: 0.5em;
+    }
+  }
+  .select-kit-header {
+    .x-more-item {
+      background: var(--primary-low);
+      padding: 0.25em;
+      flex: 1;
+      align-items: center;
+      display: flex;
+      justify-content: space-between;
+      box-sizing: border-box;
+      margin: 2px 0 0px 3px;
+      float: left;
+      height: 30px;
+      color: inherit;
+      outline: none;
+    }
+  }
+}
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 55e2ee0e63..679708be2d 100644
--- a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
@@ -46,16 +46,6 @@
         &.is-highlighted.is-selected {
           background: var(--tertiary-low);
         }
-
-        .discourse-tag {
-          &:hover {
-            color: var(--primary);
-          }
-        }
-
-        .discourse-tag-count {
-          margin-left: 0.5em;
-        }
       }
 
       .selected-tags {
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index bc28c076ab..7f158fc915 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -21,9 +21,9 @@
       background: var(--secondary);
       border: 1px solid var(--primary-medium);
 
-      &.is-focused {
-        box-shadow: shadow("focus");
-        border-radius: 0;
+      &.is-focused,
+      &:focus {
+        @include default-focus;
       }
     }
 
@@ -41,19 +41,19 @@
     &.is-expanded {
       .select-kit-wrapper {
         display: block;
-        border: 1px solid var(--tertiary);
-        box-shadow: shadow("focus");
-        border-radius: 0;
       }
 
       .multi-select-header {
         border-radius: 0;
-        box-shadow: none;
-        outline: none;
+        @include default-focus;
       }
 
       .select-kit-body {
         border-radius: 0;
+        box-shadow: shadow("dropdown");
+        &.empty-body {
+          visibility: hidden;
+        }
       }
     }
 
@@ -145,6 +145,11 @@
         align-items: center;
         display: flex;
         justify-content: space-between;
+        max-width: calc(100% - 5px);
+
+        .name {
+          @include ellipsis;
+        }
 
         .d-icon {
           color: var(--primary-low-mid);
@@ -157,10 +162,6 @@
         &:hover .d-icon:last-child {
           color: var(--danger);
         }
-
-        &.is-highlighted {
-          box-shadow: 0 0 2px var(--danger), 0 1px 0 rgba(0, 0, 0, 0.05);
-        }
       }
     }
   }
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index a4ffccfc3a..9c504d23d9 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -71,7 +71,10 @@
       color: inherit;
       display: flex;
       outline: none;
-      border-bottom: 2px solid transparent;
+
+      &:focus .d-icon-times {
+        color: var(--danger);
+      }
 
       .d-icon + .name {
         margin-left: 0.5em;
@@ -170,8 +173,9 @@
     }
 
     .discourse-tag,
-    .discourse-tag-count {
-      color: var(--primary);
+    .discourse-tag:visited,
+    .discourse-tag:hover {
+      color: var(--primary-high);
     }
 
     &.create-color-row {
diff --git a/app/assets/stylesheets/common/select-kit/single-select.scss b/app/assets/stylesheets/common/select-kit/single-select.scss
index edb1274160..caf06efb83 100644
--- a/app/assets/stylesheets/common/select-kit/single-select.scss
+++ b/app/assets/stylesheets/common/select-kit/single-select.scss
@@ -9,12 +9,16 @@
     }
   }
 
-  &.is-expanded {
-    .select-kit-header {
-      border-color: var(--tertiary);
-    }
+  &.is-expanded .select-kit-header:not(.btn),
+  .select-kit-header:not(.btn):focus,
+  .select-kit-header:not(.btn):active {
+    @include default-focus;
   }
 
+  .select-kit-header.btn:focus,
+  .select-kit-header.btn:active {
+    outline: none;
+  }
   &.is-disabled {
     .select-kit-header {
       opacity: 0.5;
diff --git a/app/assets/stylesheets/common/select-kit/tag-chooser.scss b/app/assets/stylesheets/common/select-kit/tag-chooser.scss
index cc51e23ef5..409fd3406f 100644
--- a/app/assets/stylesheets/common/select-kit/tag-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/tag-chooser.scss
@@ -1,13 +1,13 @@
 .select-kit {
-  &.multi-select {
-    &.tag-chooser {
-      .select-kit-row {
-        display: flex;
-        align-items: center;
+  &.tag-chooser,
+  &.mini-tag-chooser,
+  &.tag-drop {
+    .select-kit-row {
+      display: flex;
+      align-items: baseline;
 
-        .discourse-tag-count {
-          margin-left: 5px;
-        }
+      .discourse-tag-count {
+        margin-left: 5px;
       }
     }
   }
diff --git a/app/assets/stylesheets/common/select-kit/tag-drop.scss b/app/assets/stylesheets/common/select-kit/tag-drop.scss
index 382c378732..09d456c59b 100644
--- a/app/assets/stylesheets/common/select-kit/tag-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/tag-drop.scss
@@ -10,6 +10,15 @@
           font-weight: 700;
         }
       }
+
+      .more-tags {
+        display: flex;
+        box-sizing: border-box;
+        width: 100%;
+        padding: 0.5em 1em;
+        font-size: $font-down-1;
+        color: var(--primary-low-mid);
+      }
     }
   }
 }
diff --git a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
index def2df8c2f..00994b6a06 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
@@ -7,6 +7,19 @@
         border-radius: 0;
       }
 
+      .select-kit-header {
+        height: 32px;
+        .d-icon {
+          color: var(--primary-medium);
+        }
+
+        &:hover {
+          .d-icon {
+            color: var(--primary-low);
+          }
+        }
+      }
+
       .select-kit-row {
         padding: 0.75em 0.5em;
         border-bottom: 1px solid rgba(var(--primary-low-rgb), 0.5);
diff --git a/app/assets/stylesheets/common/select-kit/user-notifications-dropdown.scss b/app/assets/stylesheets/common/select-kit/user-notifications-dropdown.scss
index a529f38d41..f339b62f0a 100644
--- a/app/assets/stylesheets/common/select-kit/user-notifications-dropdown.scss
+++ b/app/assets/stylesheets/common/select-kit/user-notifications-dropdown.scss
@@ -3,6 +3,10 @@
     &.user-notifications-dropdown {
       text-align: left;
 
+      .d-icon {
+        margin-left: 0;
+      }
+
       .select-kit-body {
         width: 485px;
         max-width: 485px;
diff --git a/app/assets/stylesheets/common/software-update-prompt.scss b/app/assets/stylesheets/common/software-update-prompt.scss
new file mode 100644
index 0000000000..4da4fc4748
--- /dev/null
+++ b/app/assets/stylesheets/common/software-update-prompt.scss
@@ -0,0 +1,57 @@
+.software-update-prompt {
+  position: fixed;
+  flex: 1;
+  right: 0;
+  left: 0;
+  background-color: var(--tertiary-low);
+  color: var(--tertiary);
+  max-height: 0;
+  visibility: hidden;
+  transition: max-height 1s;
+  box-shadow: shadow("header");
+  z-index: z("header") - 10;
+
+  .update-prompt-main-content {
+    display: flex;
+    align-items: center;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+
+  .update-prompt-message {
+    cursor: pointer;
+    padding: 0.75em 0;
+    span {
+      text-decoration: underline;
+    }
+  }
+
+  .update-prompt-dismiss {
+    justify-content: flex-end;
+    display: flex;
+    height: 44px;
+    flex: 1;
+
+    span {
+      cursor: pointer;
+      display: inline;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      padding-left: 20px;
+    }
+  }
+
+  .d-icon {
+    margin-right: 0.33em;
+    font-size: 0.9em;
+  }
+
+  &.require-software-refresh {
+    visibility: visible;
+    overflow: hidden;
+    max-height: 300px;
+    margin-left: auto;
+    margin-right: auto;
+  }
+}
diff --git a/app/assets/stylesheets/common/topic-entrance.scss b/app/assets/stylesheets/common/topic-entrance.scss
index 0ab8c3336e..8e04f2e33f 100644
--- a/app/assets/stylesheets/common/topic-entrance.scss
+++ b/app/assets/stylesheets/common/topic-entrance.scss
@@ -12,10 +12,12 @@
   button.full {
     width: 100%;
     margin-bottom: 5px;
+    flex-wrap: wrap;
 
     .d-icon {
       display: block;
       margin: 2px auto;
+      width: 100%;
       transform: rotate(90deg);
     }
   }
diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index eba6f2b9da..df7d91f6bb 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -6,13 +6,15 @@
   box-sizing: border-box;
   z-index: z("timeline");
   -webkit-transform: translate3d(0, 0, 0);
-
+  transition: margin-bottom 0.25s ease-in;
   &.timeline-docked-bottom {
+    @media screen and (prefers-reduced-motion: no-preference) {
+      margin-bottom: -1.75em; // animate out footer button height
+    }
     .timeline-footer-controls {
       opacity: 0;
       pointer-events: none;
       cursor: default;
-      height: 0px;
     }
   }
 
diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss
index e9213e897b..d302363926 100644
--- a/app/assets/stylesheets/desktop.scss
+++ b/app/assets/stylesheets/desktop.scss
@@ -1,10 +1,9 @@
 @import "common";
 
-@import "desktop/*";
+@import "desktop/_index";
 
 // Import all component-specific files
-@import "desktop/components/*";
+@import "desktop/components/_index";
 
-/* These files doesn't actually exist, they are injected by Stylesheet::Compiler. */
-
-@import "category_backgrounds";
+// Import all admin-specific files
+@import "desktop/admin/_index";
diff --git a/app/assets/stylesheets/desktop/_index.scss b/app/assets/stylesheets/desktop/_index.scss
new file mode 100644
index 0000000000..4e34333d83
--- /dev/null
+++ b/app/assets/stylesheets/desktop/_index.scss
@@ -0,0 +1,18 @@
+@import "admin_customize";
+@import "banner";
+@import "category-list";
+@import "compose";
+@import "discourse";
+@import "edit-category";
+@import "group";
+@import "header";
+@import "history";
+@import "latest-topic-list";
+@import "login";
+@import "menu-panel";
+@import "modal";
+@import "topic-list";
+@import "topic-post";
+@import "topic";
+@import "upload";
+@import "user";
diff --git a/app/assets/stylesheets/desktop/admin/_index.scss b/app/assets/stylesheets/desktop/admin/_index.scss
new file mode 100644
index 0000000000..b45777ec74
--- /dev/null
+++ b/app/assets/stylesheets/desktop/admin/_index.scss
@@ -0,0 +1 @@
+@import "admin_base";
diff --git a/app/assets/stylesheets/desktop/admin/admin_base.scss b/app/assets/stylesheets/desktop/admin/admin_base.scss
new file mode 100644
index 0000000000..c014649b9e
--- /dev/null
+++ b/app/assets/stylesheets/desktop/admin/admin_base.scss
@@ -0,0 +1,15 @@
+.emoji-value-list {
+  .value {
+    .shift-up-value-btn,
+    .shift-down-value-btn {
+      display: none;
+    }
+
+    &:hover {
+      .shift-up-value-btn,
+      .shift-down-value-btn {
+        display: block;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index 3ed65ef0af..4b20068251 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -38,6 +38,7 @@
 
     .value {
       font-size: $font-up-1;
+      font-weight: bold;
     }
     .unit {
       font-size: $font-down-1;
@@ -142,7 +143,6 @@
   }
 
   .discourse-tags {
-    display: inline-block;
     .discourse-tag {
       font-size: $font-down-1;
     }
diff --git a/app/assets/stylesheets/desktop/components/_index.scss b/app/assets/stylesheets/desktop/components/_index.scss
new file mode 100644
index 0000000000..3ae19fc49c
--- /dev/null
+++ b/app/assets/stylesheets/desktop/components/_index.scss
@@ -0,0 +1,3 @@
+@import "user-card";
+@import "user-info";
+@import "user-stream-item";
diff --git a/app/assets/stylesheets/desktop/components/user-card.scss b/app/assets/stylesheets/desktop/components/user-card.scss
index da9d5815b0..597458bf7d 100644
--- a/app/assets/stylesheets/desktop/components/user-card.scss
+++ b/app/assets/stylesheets/desktop/components/user-card.scss
@@ -16,6 +16,7 @@
       flex: 1 1 auto;
     }
     .usercard-controls {
+      max-width: 225px;
       button {
         min-width: 150px;
       }
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index e7706c2c13..8b4970ddc3 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -27,20 +27,24 @@
 }
 
 .edit-title {
+  --overflow-buffer: 1em;
+  // this gives text little space to overflow without being cropped (e.g., Õ in headings)
+
   .d-editor-preview-wrapper {
-    margin-top: -43px;
+    margin-top: calc(-41px - var(--overflow-buffer));
+    padding-top: var(--overflow-buffer);
   }
   &:not(.private-message) {
     .d-editor-preview-wrapper {
       @media screen and (max-width: 955px) {
-        margin-top: -77px;
+        margin-top: calc(-75px - var(--overflow-buffer));
       }
     }
   }
 
   .with-tags {
     .d-editor-preview-wrapper {
-      margin-top: -77px;
+      margin-top: calc(-75px - var(--overflow-buffer));
     }
   }
 }
@@ -133,9 +137,13 @@
   }
 
   ul {
-    list-style: none;
     margin: 0;
-    padding: 0;
+    padding: 0 0 0 1.5em;
+    &.list,
+    &.topics {
+      list-style: none;
+      padding: 0;
+    }
 
     li {
       font-weight: normal;
@@ -202,8 +210,6 @@
         align-items: center;
 
         .discourse-tags {
-          flex-wrap: wrap;
-          display: contents;
           font-size: $font-down-1;
         }
       }
diff --git a/app/assets/stylesheets/desktop/group.scss b/app/assets/stylesheets/desktop/group.scss
index 650949a2f1..fdb331cb14 100644
--- a/app/assets/stylesheets/desktop/group.scss
+++ b/app/assets/stylesheets/desktop/group.scss
@@ -3,9 +3,6 @@
     margin-right: 10px;
   }
 }
-.group-info {
-  margin-bottom: 20px;
-}
 
 .group-navigation {
   width: 15%;
diff --git a/app/assets/stylesheets/desktop/latest-topic-list.scss b/app/assets/stylesheets/desktop/latest-topic-list.scss
index 33aeee78b5..f6f125c438 100644
--- a/app/assets/stylesheets/desktop/latest-topic-list.scss
+++ b/app/assets/stylesheets/desktop/latest-topic-list.scss
@@ -11,6 +11,12 @@
   .more-topics {
     margin-top: 1em;
   }
+
+  .posts-map {
+    font-size: $font-up-1;
+    font-weight: bold;
+    color: var(--primary-medium);
+  }
 }
 
 .latest-topic-list-item {
@@ -53,6 +59,6 @@
   }
 
   .topic-last-activity a {
-    color: var(--primary-med-or-secondary-high);
+    color: var(--primary-low-mid-or-secondary-high);
   }
 }
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 70a882bfc3..2064e07b08 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -3,21 +3,40 @@
 // create account modals
 .login-modal,
 .create-account {
+  .modal-body {
+    &.has-alt-auth {
+      background: var(--tertiary-or-tertiary-low);
+    }
+  }
+  .btn-flat.btn.modal-close svg {
+    color: rgba(var(--primary-rgb), 0.5);
+    &:hover {
+      color: rgba(var(--primary-rgb), 0.85);
+    }
+  }
   #login-buttons:not(.hidden) {
     display: flex;
     flex: 0 1 auto;
     flex-direction: column;
     align-items: stretch;
     min-height: 75px;
-    padding: 0 24px;
     order: 2;
 
+    &:focus-within,
+    &:hover {
+      button:not(:hover):not(:focus) {
+        opacity: 0.75;
+      }
+    }
+
     button {
-      display: flex;
-      text-align: left;
-      margin: 0.35em;
-      white-space: nowrap;
-      align-items: center;
+      margin: 0.35em 0;
+      &:first-of-type {
+        margin-top: 0;
+      }
+      &:last-of-type {
+        margin-bottom: 0;
+      }
       &:lang(zh_CN) {
         min-width: 200px;
       }
@@ -32,57 +51,7 @@
     }
   }
 
-  form {
-    min-width: 300px;
-    max-width: 100%;
-  }
-
-  #modal-alert {
-    max-width: 100%;
-    margin-bottom: 0;
-    padding: 8px 16px;
-  }
-
-  .login-modal {
-    #login-buttons:not(.hidden) {
-      button {
-        &:first-of-type {
-          margin-top: 2.8em;
-        }
-        &:last-of-type {
-          margin-bottom: 3em;
-        }
-      }
-    }
-  }
-
-  .create-account {
-    #login-buttons:not(.hidden) {
-      justify-content: flex-start;
-      padding-top: 2.7em;
-      + .login-form {
-        border-right: 1px solid var(--primary-low); // Only show border when login-form is present
-      }
-    }
-  }
-
-  #login-form {
-    box-sizing: border-box;
-    flex: 1 0 auto;
-    padding: 0 24px;
-    + #login-buttons {
-      border-left: 1px solid var(--primary-low); // Only show border when login-form is present
-    }
-  }
-
-  tr:not(.instructions) {
-    td {
-      display: flex;
-      padding: 5px 0 0 0;
-    }
-  }
-  .tip,
-  td label {
+  .tip {
     display: block;
     overflow: hidden;
     word-wrap: break-word;
@@ -95,25 +64,107 @@
 }
 
 .has-alt-auth {
-  .tip,
-  td label {
+  .tip {
     max-width: 100%;
   }
 }
 
+.login-modal:not(.hidden).has-alt-auth.no-local-login {
+  padding: 0 2em !important;
+  min-width: 350px !important;
+  .login-right-side {
+    width: 100%;
+    padding: 2em 0;
+    #login-buttons:not(.hidden) {
+      width: 80%;
+      .btn.btn-social:first-of-type {
+        margin-top: 2em;
+      }
+      .btn.btn-social,
+      .btn,
+      .login-with-email-button {
+        border: 1px solid var(--primary-low-mid);
+        margin-bottom: 0.5em;
+        &:hover,
+        &:focus {
+          background: var(--primary-very-low) !important;
+        }
+      }
+    }
+  }
+}
+
 // styles used on
 // login modal only
-.d-modal.login-modal {
+.login-modal:not(.hidden) {
+  padding: 0 !important;
+  .login-modal-body.has-alt-auth {
+    min-width: 700px;
+    .login-left-side {
+      align-self: stretch;
+      width: calc(60% - 4em);
+    }
+    .login-right-side {
+      width: 35%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      #login-buttons {
+        button {
+          &.login-with-email-button {
+            border-radius: 4px;
+            .d-icon {
+              color: #000 !important;
+            }
+            &:hover,
+            &:focus {
+              box-shadow: 0 0 0 2px rgba(var(--primary-rgb), 0.25);
+              .d-icon {
+                color: #000 !important;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .login-left-side {
+    background: var(--secondary);
+    width: calc(100% - 4em);
+    display: flex;
+    flex-direction: column;
+    padding: 3em 3em 2.5em;
+    .login-welcome-header {
+      .login-title {
+        line-height: $line-height-small;
+        font-size: $font-up-6;
+      }
+      .login-subheader {
+        font-size: 1.125em !important;
+      }
+    }
+    #credentials {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start !important;
+    }
+    #login-form {
+      margin: 3em 0 1.25em 0;
+    }
+    .modal-footer {
+      display: flex;
+      flex-direction: row;
+      width: 100%;
+      padding: 0;
+      border: 0;
+    }
+  }
+
   .modal-body,
   #credentials {
     display: flex;
     align-items: center;
-    padding: 15px 0;
-
-    tr {
-      display: flex;
-      flex-direction: column;
-    }
 
     &.hidden {
       display: none;
@@ -121,115 +172,191 @@
   }
 }
 
+.login-modal-body.second-factor {
+  max-width: 30em;
+  .login-left-side {
+    width: 100%;
+    #login-form {
+      margin: 2em 0 0 0;
+    }
+  }
+  #new-account-link {
+    display: none;
+  }
+  .modal-footer {
+    margin-top: 1em;
+  }
+}
+
+.login-form {
+  .tip {
+    &:not(:empty) {
+      min-height: 1.75em;
+      &.bad .svg-icon {
+        vertical-align: middle;
+      }
+    }
+  }
+}
+
 // styles used on the
 // create account
 // modal only
 .d-modal.create-account {
-  .modal-body {
-    display: flex;
-    padding: 15px 0;
+  .create-account-body {
+    min-width: 700px !important;
   }
-
-  .create-account-form tr {
+  .modal-body:not(.reorder-categories):not(.poll-ui-builder):not(.poll-breakdown) {
+    max-height: 70vh !important;
+    overflow: hidden;
+  }
+  .has-alt-auth .create-account-form {
+    display: grid;
+    grid-template-columns: 65% 35%;
+    grid-template-rows: auto 1fr;
+    grid-template-areas:
+      "header login-buttons"
+      "form login-buttons"
+      "footer login-buttons";
+  }
+  .create-account-form {
     display: flex;
     flex-direction: column;
-  }
-
-  .login-form {
+    width: 100%;
     position: relative;
+  }
+  .create-account-login-buttons {
+    display: none;
+  }
+  .has-alt-auth .create-account-login-buttons {
+    grid-area: login-buttons;
+    padding: 1em;
     display: flex;
-    overflow: hidden;
-    flex: 1 1 auto;
-
-    &:after,
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    h3 {
+      color: var(--secondary);
+      text-align: center;
+    }
+    #login-buttons {
+      button:first-of-type {
+        margin-top: 0;
+      }
+    }
+  }
+  .modal-body {
+    display: flex;
+    padding: 0;
+  }
+  .modal-footer {
+    grid-area: footer;
+    background-color: var(--secondary);
+    position: relative;
     &:before {
       content: "";
       display: block;
       position: absolute;
       width: 100%;
       pointer-events: none;
-    }
-    &:after {
-      bottom: 0;
-      height: 35px;
-      @media screen and (max-height: 650px) {
-        height: 45px;
-      }
+      top: calc(-1em - 1px);
+      left: 0;
+      height: 1em;
       background-image: linear-gradient(
         to bottom,
         rgba(var(--secondary-rgb), 0),
-        rgba(var(--secondary-rgb), 0.9)
-      );
-    }
-    &:before {
-      top: 0;
-      height: 25px;
-      background-image: linear-gradient(
-        to top,
-        rgba(var(--secondary-rgb), 0),
         rgba(var(--secondary-rgb), 1)
       );
     }
-    form {
-      box-sizing: border-box;
-      padding: 16px 24px;
-      margin-bottom: 0;
-      max-height: 475px;
-      @media screen and (max-height: 650px) {
-        max-height: calc(65vh - 100px);
-        > *:last-child {
-          margin-bottom: 40px;
-        }
-      }
-      overflow-x: hidden;
-      overflow-y: auto;
-    }
+  }
+  .login-welcome-header {
+    grid-area: header;
+    padding: 3em 2em 1em;
 
-    form,
-    table {
-      width: 100%;
+    .login-title {
+      font-size: $font-up-6;
+      line-height: $line-height-medium;
     }
-
-    tr {
-      display: flex;
-      flex-direction: column;
-      margin-top: 0.15em;
-      &.password-confirmation {
-        display: none;
-      }
+    .login-subheader {
+      font-size: 1.125em !important;
+      align-self: start;
     }
   }
 
-  tr.input {
-    input,
-    label {
-      margin-bottom: 0;
+  .modal-body:not(.has-alt-auth) .login-form {
+    &:after {
       width: 100%;
     }
-    .tip {
-      max-width: 340px;
+  }
+
+  .has-alt-auth .login-form,
+  .login-form {
+    background: var(--secondary);
+    padding: 1em 0 0 0;
+    grid-area: form;
+    overflow-y: scroll;
+
+    .input-group {
+      padding: 0 2em;
+      margin-bottom: 1em;
+      input {
+        width: 100%;
+      }
+      input:not(.value-entered):not(:focus) + label.alt-placeholder {
+        top: 12px;
+        left: 3em;
+      }
+      input:focus + label.alt-placeholder,
+      input.value-entered + label.alt-placeholder {
+        top: -8px;
+        left: calc(3em - 0.25em);
+      }
+    }
+    .password-confirmation {
+      display: none;
+    }
+    scrollbar-color: rgba(var(--primary-rgb), 0.5) transparent;
+    &::-webkit-scrollbar {
+      width: 15px;
+    }
+
+    &::-webkit-scrollbar-track {
+      box-shadow: inset 0 0 14px 14px transparent;
+      border: 4px solid transparent;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      box-shadow: inset 0 0 14px 14px rgba(var(--primary-rgb), 0.5);
+      border: 4px solid transparent;
+      border-radius: 14px;
+    }
+
+    /* set button(top and bottom of the scrollbar) */
+    &::-webkit-scrollbar-button {
+      display: none;
     }
   }
 
   .user-fields {
-    margin-bottom: 20px;
+    margin-bottom: 1em;
   }
 
   .user-field {
+    &.text {
+      label.control-label {
+        left: 3em !important;
+        max-width: calc(100% - 6em) !important;
+      }
+      &.value-entered label.control-label,
+      label.control-label.value-entered {
+        left: calc(3em - 0.25em) !important;
+      }
+    }
     display: flex;
     flex-direction: column;
-
     &.confirm {
       margin-top: 5px;
     }
-
-    > label {
-      width: auto;
-    }
-
-    .controls {
-      margin-left: 0;
-    }
   }
 
   .invites-show {
@@ -264,21 +391,6 @@
   }
 }
 
-.login-form {
-  .tip {
-    &:not(:empty) + td {
-      display: none;
-    }
-    &:not(:empty),
-    &:empty + td {
-      min-height: 1.75em;
-      &.bad .svg-icon {
-        vertical-align: middle;
-      }
-    }
-  }
-}
-
 .password-reset,
 .email-login,
 .invites-show {
@@ -294,7 +406,8 @@
   h2 {
     margin-bottom: 12px;
   }
-  input {
+  input:not([type="checkbox"]) {
+    // 80% width on checkboxes messes up the layout for custom fields
     width: 80%;
   }
 }
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index a53ca480fb..6356b420f8 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -101,3 +101,17 @@
     min-width: 450px;
   }
 }
+
+.json-schema-editor-modal {
+  #json-editor-holder {
+    min-width: 500px;
+  }
+}
+
+.create-invite-modal,
+.create-invite-bulk-modal,
+.share-topic-modal {
+  .modal-inner-container {
+    width: 600px;
+  }
+}
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 866a7612d7..db5cf44c08 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -2,33 +2,6 @@
 // Topic lists
 // --------------------------------------------------
 
-// List controls
-// --------------------------------------------------
-
-.list-controls {
-  .nav {
-    float: left;
-    margin-bottom: 10px;
-  }
-
-  .btn {
-    float: right;
-    margin-left: 8px;
-    margin-bottom: 9px;
-    font-size: $font-up-1;
-    font-weight: normal;
-  }
-
-  .search .btn {
-    float: none;
-  }
-
-  a.badge-category {
-    padding: 3px 12px;
-    font-size: $font-up-1;
-  }
-}
-
 // Base list
 // --------------------------------------------------
 
@@ -171,9 +144,15 @@
 // Misc. stuff
 // --------------------------------------------------
 
-#list-area .top-lists h2 {
-  cursor: pointer;
-  margin: 5px 0 10px;
+#list-area .top-lists {
+  h2 {
+    cursor: pointer;
+    margin: 5px 0 10px;
+  }
+
+  .period-chooser .select-kit-body {
+    width: 275px;
+  }
 }
 
 #list-area {
@@ -200,12 +179,11 @@
 #bulk-select {
   position: fixed;
   right: 20px;
-  top: 130px;
   background-color: var(--secondary);
   z-index: z("dropdown");
   @supports (position: sticky) {
     @media screen and (min-width: 1250px) {
-      body:not(.search-page) & {
+      body:not(.search-page):not(.user-messages-page) & {
         position: absolute;
         right: -60px;
         top: 0;
@@ -220,42 +198,21 @@ button.dismiss-read {
   margin-left: 10px;
 }
 
-.category-heading {
-  p {
-    line-height: $line-height-large;
-    font-size: $font-up-3;
+.category-breadcrumb {
+  // only target the top-level li, not dropdowns
+  > li {
+    height: 100%;
+  }
+  .select-kit-header {
+    align-self: stretch;
+    height: 100%;
+    margin-bottom: var(--nav-space);
   }
-}
-
-.category-navigation {
-  clear: both;
 }
 
 .category-logo.aspect-image {
   float: left;
-  margin: 0.25em 1em 0.5em 0;
-
-  img {
-    width: auto;
-    max-height: 150px;
-  }
-}
-
-@supports (--custom: property) {
-  .category-logo.aspect-image {
-    --max-height: 150px;
-    max-height: var(--max-height);
-    max-width: 60%;
-    height: auto;
-    width: calc(var(--max-height) * var(--aspect-ratio));
-
-    img {
-      width: 100%;
-      height: inherit;
-      max-width: initial;
-      max-height: initial;
-    }
-  }
+  margin: 0.33em 2em 2em 0;
 }
 
 /* Tablet (portrait) ----------- */
@@ -269,16 +226,6 @@ button.dismiss-read {
     }
   }
 
-  // new topic just a "+" no text
-  button#create-topic {
-    span {
-      display: none;
-    }
-    .d-icon {
-      margin-right: 0;
-    }
-  }
-
   .topic-list {
     // tighter table header spacing
     th:first-of-type {
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 63d23c1e74..a6ab990641 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -49,11 +49,15 @@ section.post-menu-area {
 
 nav.post-controls {
   padding: 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 
   .actions {
     text-align: right;
-    float: right;
     display: inline-block;
+    margin-left: auto;
+
     .more-actions {
       display: none;
       overflow: hidden;
@@ -166,13 +170,12 @@ nav.post-controls {
       border: none;
       margin-left: 3px;
       &.d-hover,
-      &:focus {
+      &:focus,
+      &:active {
+        outline: none;
         background: var(--primary-low);
         color: var(--primary);
       }
-      &:active {
-        box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.4);
-      }
       &.hidden {
         display: none;
       }
@@ -203,14 +206,20 @@ nav.post-controls {
     font-size: inherit;
     padding: 10px;
     color: var(--primary-medium);
-    &:hover {
+    &:hover,
+    &:focus {
+      outline: none;
       color: var(--primary);
       background: var(--primary-low);
     }
     .d-icon {
-      margin-left: 5px;
+      margin-right: 5px;
       font-size: $font-down-1;
     }
+    .d-button-label + .d-icon {
+      margin-left: 5px;
+      margin-right: 0;
+    }
   }
 }
 
@@ -221,8 +230,11 @@ pre.copy-codeblocks .copy-cmd:not(.copied) {
 }
 
 pre.copy-codeblocks:hover .copy-cmd {
-  opacity: 1;
+  opacity: 0.7;
   visibility: visible;
+  &:hover {
+    opacity: 1;
+  }
 }
 
 .embedded-posts {
@@ -421,6 +433,12 @@ pre.copy-codeblocks:hover .copy-cmd {
 #topic-footer-buttons {
   max-width: calc(690px + (11px * 2) + 45px);
 
+  @media screen and (max-width: 924px) {
+    .topic-footer-main-buttons {
+      margin-top: 1em; // some extra space for the docked progress bar
+    }
+  }
+
   .bookmark {
     .d-icon-bookmark.bookmarked {
       color: var(--tertiary);
@@ -437,8 +455,8 @@ pre.copy-codeblocks:hover .copy-cmd {
 }
 
 .suggested-topics {
-  clear: left;
-  padding: 20px 0 15px 0;
+  margin: 4.5em 0 1em;
+
   table {
     margin-top: 10px;
   }
@@ -599,8 +617,8 @@ blockquote {
       (#{$topic-body-width-padding} * 2)
   );
   @media all and (max-width: 790px) {
-    // 16px is the left + right padding on .wrap in common/base/discourse.scss
-    max-width: calc(100vw - 16px);
+    // 32px is (left + right padding * 2) from .wrap in common/base/discourse.scss
+    max-width: calc(100vw - 32px);
   }
 }
 
@@ -639,7 +657,7 @@ blockquote {
 .selected-posts {
   width: 200px;
   position: fixed;
-  z-index: z("dropdown");
+  z-index: z("dropdown") + 1; // 1 higher than .select-posts
   box-shadow: shadow("card");
   padding: 0.714em;
   margin-bottom: 5px;
@@ -747,10 +765,6 @@ span.highlighted {
   transition: visibility 1s, opacity ease-out 1s;
 }
 
-.signup-cta {
-  width: $topic-body-width;
-}
-
 /* Tablet (portrait) ----------- */
 
 @media all and (max-width: 790px) {
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index bbd65991e0..b483aaa752 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -59,27 +59,8 @@
   }
 }
 
-.topic-status-info {
-  border-top: 1px solid var(--primary-low);
-  padding: 10px 0;
-  max-width: 758px;
-  .topic-timer-heading,
-  .slow-mode-heading {
-    display: flex;
-    align-items: center;
-    margin: 0px;
-  }
-  .topic-timer-remove,
-  .slow-mode-remove {
-    font-size: $font-down-2;
-    background: transparent;
-    margin-left: auto;
-  }
-}
-
 #topic-progress-wrapper {
   position: fixed;
-  right: 2em;
   bottom: 0;
   left: 0;
   margin: 0 auto;
diff --git a/app/assets/stylesheets/desktop/upload.scss b/app/assets/stylesheets/desktop/upload.scss
index 6e13c6b889..5b7b349b42 100644
--- a/app/assets/stylesheets/desktop/upload.scss
+++ b/app/assets/stylesheets/desktop/upload.scss
@@ -3,6 +3,9 @@
     display: inline-block;
     padding-left: 10px;
   }
+  &.modal-body {
+    width: 460px;
+  }
   .radios {
     min-height: 60px;
     display: flex;
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index aed20e9962..b1dd3062d4 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -84,21 +84,26 @@
   margin-right: 0px;
 }
 
-.user-invite-list {
+table.user-invite-list {
   width: 100%;
   margin-top: 15px;
+
   tr {
     td {
       padding: 0.667em;
+
+      &.invite-actions {
+        white-space: nowrap;
+        width: 100px;
+      }
+
+      .label {
+        display: none;
+      }
     }
   }
 }
 
-.user-invite-search {
-  clear: both;
-  margin: 15px 0px -15px 0px;
-}
-
 .user-invite-none {
   padding: 15px 0;
 }
@@ -170,9 +175,12 @@
       padding: 0 0 12px 0;
       float: right;
       text-align: right;
+      max-width: 13.5em;
 
+      li > .select-kit-header, // select-kit
       .btn {
-        min-width: 140px;
+        min-width: 9.5em;
+        width: 100%;
       }
     }
 
@@ -182,19 +190,16 @@
       }
       .controls {
         width: auto;
+        max-width: unset;
 
         > ul {
           display: inline-flex;
           > li {
-            display: inline;
-            margin-left: 12px;
-            .d-button-label {
-              line-height: 1;
-            }
+            display: inline-flex;
+            margin-left: 0.75em;
           }
 
           a {
-            margin-bottom: 10px;
             width: auto;
           }
         }
diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index 31ab141d55..169856775d 100644
--- a/app/assets/stylesheets/embed.scss
+++ b/app/assets/stylesheets/embed.scss
@@ -1,10 +1,7 @@
-@import "font";
 @import "./vendor/normalize";
 @import "./vendor/normalize-ext";
 @import "./common/foundation/base";
-@import "./common/foundation/variables";
 @import "./color_definitions";
-@import "./common/foundation/mixins";
 @import "./common/components/buttons";
 
 article.post {
diff --git a/app/assets/stylesheets/ember_cli.scss b/app/assets/stylesheets/ember_cli.scss
new file mode 100644
index 0000000000..175fe19cf7
--- /dev/null
+++ b/app/assets/stylesheets/ember_cli.scss
@@ -0,0 +1,16 @@
+body.requires-ember-cli {
+  margin: 2rem;
+  font-family: Arial, Helvetica;
+  background-color: white;
+}
+
+pre {
+  background-color: lightgrey;
+}
+
+pre,
+code {
+  padding: 0;
+  margin: 0;
+  padding: 0.5rem;
+}
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index a3202ca43c..5b73a33dd1 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -1,12 +1,8 @@
 @import "common";
 
-@import "mobile/*";
+@import "mobile/_index";
 
 // Import all component-specific files
-@import "mobile/components/*";
+@import "mobile/components/_index";
 
-@import "mobile/select-kit/*";
-
-/* These files doesn't actually exist, they are injected by Stylesheet::Compiler. */
-
-@import "category_backgrounds";
+@import "mobile/select-kit/_index";
diff --git a/app/assets/stylesheets/mobile/_index.scss b/app/assets/stylesheets/mobile/_index.scss
new file mode 100644
index 0000000000..7d5fcaa7da
--- /dev/null
+++ b/app/assets/stylesheets/mobile/_index.scss
@@ -0,0 +1,33 @@
+@import "admin_badges";
+@import "admin_customize";
+@import "admin_emojis";
+@import "admin_report_counters";
+@import "admin_report_table";
+@import "admin_report";
+@import "admin_reports";
+@import "alert";
+@import "banner";
+@import "buttons";
+@import "compose";
+@import "dashboard";
+@import "directory";
+@import "discourse";
+@import "edit-category";
+@import "emoji";
+@import "group";
+@import "header";
+@import "history";
+@import "lightbox";
+@import "login";
+@import "menu-panel";
+@import "modal";
+@import "push-notifications-mobile";
+@import "reviewables";
+@import "ring";
+@import "search";
+@import "topic-list";
+@import "topic-post";
+@import "topic";
+@import "upload";
+@import "user-badges";
+@import "user";
diff --git a/app/assets/stylesheets/mobile/admin_report_table.scss b/app/assets/stylesheets/mobile/admin_report_table.scss
index 29401efd0d..d414b0a8a9 100644
--- a/app/assets/stylesheets/mobile/admin_report_table.scss
+++ b/app/assets/stylesheets/mobile/admin_report_table.scss
@@ -13,6 +13,10 @@
       text-orientation: mixed;
       text-align: right;
       transform: rotate(180deg);
+
+      .emoji {
+        transform: rotate(-180deg);
+      }
     }
 
     .sort-btn {
diff --git a/app/assets/stylesheets/mobile/components/_index.scss b/app/assets/stylesheets/mobile/components/_index.scss
new file mode 100644
index 0000000000..89eb683655
--- /dev/null
+++ b/app/assets/stylesheets/mobile/components/_index.scss
@@ -0,0 +1,3 @@
+@import "topic-footer-mobile-dropdown";
+@import "user-card";
+@import "user-stream-item";
diff --git a/app/assets/stylesheets/mobile/components/user-card.scss b/app/assets/stylesheets/mobile/components/user-card.scss
index 94ec4b19e5..a912aa0e7c 100644
--- a/app/assets/stylesheets/mobile/components/user-card.scss
+++ b/app/assets/stylesheets/mobile/components/user-card.scss
@@ -17,16 +17,15 @@ $avatar_width: 120px;
       box-sizing: border-box;
     }
     .usercard-controls {
+      --usercard-control-margin: 0.25em;
       display: flex;
       flex: 1;
-      margin-top: 1em;
-      max-width: 100%;
+      flex-wrap: wrap;
+      margin: 1em calc(var(--usercard-control-margin) * -1) 0;
       li {
         flex: 1 0 auto;
         min-width: 0;
-        &:nth-child(2) {
-          border-left: 0.5em solid transparent;
-        }
+        margin: 0 var(--usercard-control-margin);
         &:empty {
           display: none;
         }
@@ -55,14 +54,15 @@ $avatar_width: 120px;
   // badges
   .badge-section {
     flex-wrap: wrap;
-    > span {
+    .user-card-badge-link,
+    .more-user-badges {
       display: flex;
       flex: 0 1 50%;
       max-width: 50%; // for text ellipsis
       padding: 2px 0;
       box-sizing: border-box;
-      &:nth-of-type(1),
-      &:nth-of-type(3) {
+      &:nth-child(1),
+      &:nth-child(3) {
         padding-right: 4px;
       }
       a {
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index f3488d634e..e6d6dd4dc3 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -24,7 +24,7 @@
     }
   }
 
-  body.ios-safari-composer-hacks &.open {
+  .keyboard-visible &.open {
     height: calc(var(--composer-vh, 1vh) * 100);
   }
 
@@ -56,7 +56,7 @@
     }
   }
 
-  .toggler {
+  .toggle-minimize {
     .d-icon-chevron-down {
       vertical-align: text-top;
     }
@@ -67,7 +67,7 @@
     padding-bottom: env(safe-area-inset-bottom);
 
     .toggle-toolbar,
-    .toggler {
+    .toggle-minimize {
       top: 8px;
     }
     .draft-text {
diff --git a/app/assets/stylesheets/mobile/dashboard.scss b/app/assets/stylesheets/mobile/dashboard.scss
index 71e8ef6761..8161e79ff2 100644
--- a/app/assets/stylesheets/mobile/dashboard.scss
+++ b/app/assets/stylesheets/mobile/dashboard.scss
@@ -6,4 +6,14 @@
   .navigation a.navigation-link {
     padding: 0.5em;
   }
+  .dashboard-new-features .section-body {
+    grid-template-columns: none;
+  }
+
+  .admin-new-feature-item {
+    .new-feature-emoji {
+      padding-left: 0em;
+      padding-right: 0.25em;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 396337988c..63a05152d9 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -91,10 +91,13 @@ blockquote {
     align-items: center;
     padding: 8px 10px;
     height: 100%;
-    width: 100%;
     box-sizing: border-box;
   }
 
+  .expander .selection {
+    @include ellipsis;
+  }
+
   .expander > .d-icon {
     &:last-of-type {
       margin-left: auto;
diff --git a/app/assets/stylesheets/mobile/group.scss b/app/assets/stylesheets/mobile/group.scss
index e441eb0097..d54562b81a 100644
--- a/app/assets/stylesheets/mobile/group.scss
+++ b/app/assets/stylesheets/mobile/group.scss
@@ -40,3 +40,10 @@
     }
   }
 }
+
+.group-info {
+  flex-wrap: wrap;
+  .group-details-button button {
+    margin-top: 0.5em;
+  }
+}
diff --git a/app/assets/stylesheets/mobile/login.scss b/app/assets/stylesheets/mobile/login.scss
index c6932cb39b..3c729fa272 100644
--- a/app/assets/stylesheets/mobile/login.scss
+++ b/app/assets/stylesheets/mobile/login.scss
@@ -1,77 +1,118 @@
 // shared styles
 // used in both login and
 // create account modals
-.login-modal,
-.create-account {
+.d-modal.login-modal:not(.hidden),
+.d-modal.create-account {
+  .modal-body {
+    padding: 0;
+  }
   &.fixed-modal .modal-inner-container {
     max-width: 350px;
     max-height: 90vh;
+    position: relative;
+    overflow: hidden;
   }
 
   .close {
     padding: 0;
   }
 
+  label {
+    margin: 0;
+  }
+
+  .tip:not(:empty) {
+    min-height: 1.4em; // prevents height jump when tips appear
+  }
+
+  .login-welcome-header {
+    padding: 1.5em 1em;
+    margin: 0 auto;
+  }
+
   #login-buttons:not(.hidden) {
     display: flex;
     flex: 1 0 auto;
     flex-wrap: wrap;
     justify-content: center;
-    width: 102%;
-    padding-bottom: 10px;
-    margin-left: -2%;
+    padding: 1em;
+    margin: 0;
 
-    button {
+    .btn {
+      padding: 0.53em 0.53em 0.53em 0.43em;
+      border: 1px solid var(--primary-low);
       flex: 1 1 47%;
-      max-width: 70%;
-      margin: 1% 0 1% 2%;
-      font-size: $font-0;
+      margin: 0 0.5em 0.5em 0;
       white-space: nowrap;
-      @media screen and (max-width: 360px) {
-        font-size: $font-0;
+      &:last-child {
+        margin-right: 0;
       }
     }
+  }
 
-    + #login-form {
-      border-top: 1px solid var(--primary-low);
+  @media screen and (max-width: 750px) {
+    #login-buttons:not(.hidden) {
+      justify-content: center;
+      .btn {
+        &:nth-child(even) {
+          margin: 0 0 0.5em 0;
+        }
+      }
     }
   }
 
-  form {
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
-  }
+  #login-form,
+  .login-form {
+    padding: 1em;
 
-  table {
-    width: 100%;
-  }
-
-  tr {
-    &.input td label {
-      margin-top: 0.75em;
-    }
-
-    td label {
-      max-width: 280px;
-      display: block;
-      overflow: hidden;
-      word-wrap: break-word;
-    }
-
-    &:not(.instructions) td {
-      padding: 2px 0 0 0;
-    }
-
-    &:not(.password-confirmation) {
+    form {
       display: flex;
+      justify-content: center;
       flex-direction: column;
     }
+
+    .input-group {
+      input {
+        height: 2.5em;
+        margin-bottom: 0.25em;
+      }
+      margin-bottom: 1em;
+      label.alt-placeholder {
+        top: 8px;
+      }
+      input:focus + label,
+      input.value-entered + label.alt-placeholder {
+        top: -10px;
+      }
+      input.alt-placeholder:invalid {
+        color: var(--primary);
+      }
+      label.more-info {
+        color: var(--primary-medium);
+      }
+    }
   }
 
-  .tip {
-    &:not(:empty) + td {
-      display: none;
+  .user-fields .input-group {
+    .text.user-field {
+      label.control-label {
+        top: 8px;
+      }
+      &.value-entered label.control-label,
+      label.control-label.value-entered {
+        top: -10px;
+        left: calc(1em - 0.25em);
+        background-color: var(--secondary);
+        padding: 0 0.25em 0 0.25em;
+        font-size: 14px;
+        color: var(--primary-medium);
+      }
+    }
+    .controls .checkbox-label {
+      align-items: center;
+      input[type="checkbox"].ember-checkbox {
+        height: 15px;
+      }
     }
   }
 
@@ -88,6 +129,7 @@
     box-sizing: border-box;
     margin: 0 auto;
     font-size: $font-down-1;
+    padding: 1.25em;
   }
 
   .alert.alert-error {
@@ -105,38 +147,27 @@
 .d-modal.login-modal {
   #credentials {
     width: 100%;
-    tr {
-      display: flex;
-      flex-direction: column;
-    }
   }
 
   #login-form {
-    margin-bottom: 0.75em;
-    td {
-      padding: 0;
-      width: 100%;
-      margin: 0 auto;
-    }
-
     label {
       float: left;
       display: block;
     }
-    textarea,
-    input,
-    select {
-      font-size: $font-up-1;
-      clear: left;
-      margin-top: 0;
+  }
+}
+
+.d-modal .login-modal {
+  &.second-factor + .modal-footer {
+    #new-account-link {
+      display: none;
     }
   }
+}
 
-  tr {
-    td label {
-      margin-top: 0.75em;
-      padding: 4px 0;
-    }
+.login-modal:not(.hidden).has-alt-auth.no-local-login {
+  #login-buttons:not(.hidden) {
+    width: 100%;
   }
 }
 
@@ -146,24 +177,31 @@
 
 #discourse-modal .create-account .modal-body {
   max-height: 60vh !important;
+  overflow: hidden;
   @media screen and (max-height: 575px) {
     max-height: 50vh !important;
   }
 }
 
+.d-modal.create-account {
+  .create-account-form {
+    overflow-y: auto;
+    .login-welcome-header {
+      width: calc(100% - 2em);
+      position: sticky;
+      position: -webkit-sticky;
+      top: 0;
+      background-color: var(--secondary);
+    }
+  }
+}
+
 .create-account .modal-body {
   display: flex;
   flex-direction: column;
-  tr.instructions {
-    label {
-      color: var(--primary-med-or-secondary-med);
-    }
-  }
-
   #login-buttons {
     border-bottom: 1px solid var(--primary-low);
   }
-
   .login-form {
     margin-bottom: 0.75em;
   }
@@ -178,16 +216,6 @@
   .user-field {
     display: flex;
     flex-direction: column;
-
-    > label {
-      width: auto;
-    }
-    .controls {
-      margin-left: 0;
-      label {
-        line-height: $line-height-medium;
-      }
-    }
   }
 }
 
diff --git a/app/assets/stylesheets/mobile/menu-panel.scss b/app/assets/stylesheets/mobile/menu-panel.scss
index 89837ffb96..ca557b6a15 100644
--- a/app/assets/stylesheets/mobile/menu-panel.scss
+++ b/app/assets/stylesheets/mobile/menu-panel.scss
@@ -26,12 +26,19 @@
 .user-menu .quick-access-panel.quick-access-profile li:not(.show-all) {
   border-bottom: 1px solid var(--primary-low);
 
-  a {
+  a,
+  button {
     // accounts for menu "ears" 4px + border 1px
     padding: 0.75em calc(0.5em + 4px + 1px);
+    @media screen and (max-height: 380px) {
+      // reduce padding to avoid scroll
+      padding-top: 0.5em;
+      padding-bottom: 0.5em;
+    }
   }
 }
 
 .panel-body-contents {
-  padding-bottom: env(safe-area-inset-bottom);
+  // 2em padding very useful for iOS Safari's overlayed bottom nav
+  padding-bottom: calc(env(safe-area-inset-bottom) + 2em);
 }
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 9f52d92778..e030c3d2bf 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -109,3 +109,18 @@
 .modal .modal-body.reorder-categories {
   max-height: calc(100vh - 220px);
 }
+
+.discard-draft-modal {
+  .modal-inner-container {
+    width: 250px;
+  }
+  .modal-footer {
+    justify-content: center;
+    flex-flow: column nowrap;
+    align-items: stretch;
+
+    .btn {
+      margin-right: 0;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/mobile/select-kit/_index.scss b/app/assets/stylesheets/mobile/select-kit/_index.scss
new file mode 100644
index 0000000000..2327d21b0f
--- /dev/null
+++ b/app/assets/stylesheets/mobile/select-kit/_index.scss
@@ -0,0 +1,4 @@
+@import "category-drop";
+@import "dropdown-select-box";
+@import "select-kit";
+@import "tag-drop";
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 0c2a4fab0a..8fe40b772a 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -6,11 +6,6 @@
 // --------------------------------------------------
 
 .list-controls {
-  margin: 10px -3px 5px -3px;
-  .category-breadcrumb.hidden {
-    display: none;
-  }
-
   .container {
     display: flex;
     flex-wrap: wrap;
@@ -20,8 +15,6 @@
       display: flex;
       align-self: stretch;
       align-items: center;
-      margin: 0 3px 10px 3px;
-      order: 10; // always last for consistent placement
     }
   }
 
@@ -34,11 +27,9 @@
     display: flex;
     flex-wrap: wrap;
     width: 100%;
-    margin: 5px 0;
+    margin: 0.5em 0 0;
 
     button {
-      margin: 0 3px;
-
       &.select-kit-header {
         display: flex;
         height: 100%;
@@ -47,38 +38,6 @@
     }
   }
 
-  .select-kit:not(.is-hidden) {
-    display: flex;
-    align-self: stretch;
-    margin-bottom: 10px;
-  }
-
-  .btn:not(.select-kit-header) {
-    margin-bottom: 10px;
-  }
-
-  .categories-admin-dropdown,
-  .tag-notifications-button {
-    order: 2; // after main nav
-  }
-
-  .category-navigation {
-    display: flex;
-    flex-wrap: wrap;
-    width: 100%;
-    .edit-category {
-      @media screen and (max-width: 374px) {
-        // Hide edit label on very tiny screens
-        .d-icon {
-          margin: 0;
-        }
-        .d-button-label {
-          display: none;
-        }
-      }
-    }
-  }
-
   .nav-pills {
     display: flex;
     flex: 1 1 auto;
@@ -86,7 +45,6 @@
     position: relative;
     .navigation-toggle {
       flex: 0 1 auto;
-      margin-bottom: 5px;
     }
     > li {
       margin-right: 0;
@@ -130,6 +88,23 @@
   margin-left: 0;
 }
 
+ol.category-breadcrumb {
+  margin: 0 -3px 5px -3px;
+  display: flex;
+  flex-wrap: wrap;
+  flex: 1 1 100%;
+  li.select-kit {
+    flex: 1 1 33%;
+    margin: 0 3px 5px 3px;
+    .select-kit-header .selected-name {
+      max-width: 80vw;
+      .badge-wrapper {
+        max-width: 100%;
+      }
+    }
+  }
+}
+
 // Base list
 // --------------------------------------------------
 
@@ -379,15 +354,14 @@ tr.category-topic-link {
   > footer {
     border-top: 1px solid var(--primary-low);
     padding: 7px 10px;
-    figure {
+    .category-stat {
       float: left;
-      margin: 3px 7px 0 0;
-      font-weight: bold;
-      font-size: $font-down-1;
-    }
-    figcaption {
-      display: inline;
+      margin: 3px 1em 0 0;
       font-weight: normal;
+      font-size: $font-down-1;
+      .value {
+        font-weight: bold;
+      }
     }
     .btn {
       float: right;
@@ -419,10 +393,6 @@ tr.category-topic-link {
 
 // Misc. stuff
 // --------------------------------------------------
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
 
 .dropdown {
   position: relative;
@@ -431,102 +401,28 @@ tr.category-topic-link {
 .open .dropdown-toggle {
   outline: 0;
 }
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  vertical-align: middle;
-  border-top: 4px solid var(--primary);
-  border-right: 4px solid transparent;
-  border-left: 4px solid transparent;
-  content: "";
-  margin-left: 5px;
-}
 
 .fade.in {
   opacity: 1;
 }
 
-ol.category-breadcrumb {
-  margin: 0 0 5px 0;
-  display: flex;
-  flex-wrap: wrap;
-  flex: 1 1 100%;
-  li.select-kit {
-    flex: 1 1 33%;
-    margin: 0 3px 5px 3px;
-    .select-kit-header .selected-name {
-      max-width: 80vw;
-      .badge-wrapper {
-        max-width: 100%;
-      }
-    }
+.category-heading {
+  p {
+    font-size: $font-up-1;
+    margin-bottom: 0.75em;
   }
 }
 
-.top-lists {
-  h2 {
-    margin-left: 10px;
-  }
-  .topic-list {
-    padding-bottom: 10px;
-  }
-  .btn-default.pull-right {
-    margin-right: 10px;
-  }
-}
-
-.tags-admin-menu {
-  display: none;
-}
-
-.tags-controls {
-  display: flex;
-  h2 {
-    order: -1;
-    margin-right: auto;
-  }
-}
-
-.staff.tags-page #create-topic {
-  clear: right;
-}
-
-.topic-list-bottom h3 {
-  clear: both;
-  padding-top: 10px;
-}
-
 .category-logo.aspect-image {
   display: block;
-  margin: 8px 0;
-
+  margin: 1.5em 0 1em;
   img {
-    width: auto;
     max-width: 100%;
-    max-height: 150px;
-  }
-}
-
-@supports (--custom: property) {
-  .category-logo.aspect-image {
-    --max-height: 150px;
-    max-height: var(--max-height);
-    width: calc(var(--max-height) * var(--aspect-ratio));
-    max-width: 100%;
-    height: auto;
-
-    img {
-      width: 100%;
-      height: inherit;
-      max-width: initial;
-      max-height: initial;
-    }
   }
 }
 
 button.dismiss-read {
-  margin-right: 10px;
+  margin-bottom: 10px;
 }
 
 // base defines extra padding for easier click/top of title field
@@ -540,8 +436,12 @@ td .main-link {
   }
 }
 .topic-list {
-  .posts-map {
-    font-size: $font-up-1;
+  .num.posts-map button {
+    font-size: $font-up-2;
+    padding: 0;
+  }
+  .num.activity a {
+    padding: 0;
   }
   // so the topic excerpt is full width
   // as the containing div is 80%
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 2b8a34217e..0c99340212 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -14,10 +14,6 @@
   padding: 15px 0 8px 0;
 }
 
-.post-stream {
-  padding-bottom: 30px;
-}
-
 span.badge-posts {
   margin-right: 5px;
 }
@@ -35,6 +31,7 @@ span.badge-posts {
     }
     .actions {
       display: flex;
+      justify-content: flex-end;
 
       // Handles the like and flag buttons in the post menu.
       .double-button {
@@ -88,7 +85,6 @@ span.badge-posts {
           .d-icon {
             color: var(--primary-high);
           }
-          margin-left: auto;
         }
         &.has-like {
           .d-icon {
@@ -102,6 +98,25 @@ span.badge-posts {
         }
       }
     }
+    &.replies-button-visible {
+      display: flex;
+      align-items: center;
+      .show-replies {
+        display: flex;
+        font-size: $font-up-1;
+        padding: 10px 8px;
+        + .reply {
+          margin-left: 0;
+        }
+        .d-icon {
+          padding-left: 8px;
+          font-size: $font-down-1;
+        }
+      }
+      .actions {
+        flex-grow: 2;
+      }
+    }
   }
 }
 
@@ -219,15 +234,31 @@ a.reply-to-tab {
     color: var(--tertiary);
   }
 
+  .topic-footer-main-buttons {
+    display: flex;
+    align-items: stretch;
+  }
+
   .topic-footer-mobile-dropdown {
-    margin: 0 0.5em 0.5em 0;
-    width: 160px;
+    margin-right: 0.5em;
+    display: flex;
+  }
+
+  .select-kit-header {
+    height: 100%;
   }
 
   .topic-notifications-button,
   .pinned-button {
     display: flex;
     align-items: center;
+
+    .reason {
+      align-items: flex-start;
+      .select-kit {
+        max-width: 40%;
+      }
+    }
     @include breakpoint(mobile-medium) {
       display: inline-block;
       .reason {
@@ -268,20 +299,6 @@ span.post-count {
   padding: 15px 0;
 }
 
-// mobile has no fixed width on topic-body so overflow: hidden causes problems
-.topic-body {
-  overflow: visible;
-  .cooked {
-    overflow: visible;
-  }
-}
-
-// instead, for mobile we set overflow hidden on the post's #main-outlet
-// this prevents image overflow on deeply nested blockquotes, lists, etc
-[class*="archetype-"] #main-outlet {
-  overflow: hidden;
-}
-
 .quote-button.visible {
   z-index: z("tooltip");
 }
@@ -407,18 +424,6 @@ span.highlighted {
   display: none;
 }
 
-.signup-cta {
-  margin-left: auto;
-  margin-right: auto;
-  width: calc(100% - 50px);
-  a {
-    margin-top: 7px;
-  }
-  button {
-    margin-right: 7px;
-  }
-}
-
 .post-notice {
   margin-bottom: 1em;
   &.old {
@@ -426,3 +431,30 @@ span.highlighted {
     padding-top: 0;
   }
 }
+
+.posts-filtered-notice {
+  padding-right: 10em;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  padding-bottom: unquote("max(0.75em, env(safe-area-inset-bottom))");
+  margin: 1em -9px;
+
+  z-index: 101;
+  .filtered-replies-show-all {
+    position: absolute;
+    right: 2em;
+  }
+
+  .filtered-replies-viewing {
+    text-align: left;
+    width: 100%;
+  }
+
+  .filtered-avatar {
+    margin-left: 0;
+    img.avatar {
+      width: 20px;
+      height: 20px;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 394bd9a39d..5f3f45171d 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -28,30 +28,27 @@
   }
 }
 
-.topic-status-info {
-  padding-left: 10px;
-  border-top: 1px solid var(--primary-low);
-  padding-top: 10px;
-  h3 {
-    margin: 0;
-    display: flex;
-    button {
-      align-self: flex-start;
-    }
-  }
+.progress-back-container {
+  top: -100%; // above parent container + some extra space
 }
 
 #topic-progress-wrapper {
   position: fixed;
-  right: 1em;
+  right: 10px; // match 10px padding on .wrap
   bottom: 0;
   z-index: z("timeline");
   &:not(.docked) {
     margin-bottom: env(safe-area-inset-bottom);
   }
   html.rtl & {
-    right: 0;
-    left: 1em;
+    /**
+     * This should be the other way around, but it has to be "wrong" here
+     * because our RTL CSS is generated using the `rtlit` gem which flips
+     * left to right and right to left, so this will be corrected when it
+     * goes through rtlit.
+     */
+    left: unset;
+    right: 1em;
   }
 }
 
@@ -198,18 +195,6 @@ sub sub {
   }
 }
 
-.edit-topic-timer-modal {
-  .future-date-input {
-    .alert-info {
-      margin: 0 -10px -10px -10px;
-      padding: 10px;
-    }
-  }
-  .btn.pull-right {
-    margin-right: 0;
-  }
-}
-
 .topic-footer-main-buttons {
   display: flex;
   align-items: center;
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index cf8aa99f00..8476352105 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -10,10 +10,12 @@
     grid-column-start: 1;
     grid-row-start: 1;
     grid-column-end: 2;
+    min-width: 120px;
   }
   .user-secondary-navigation {
     grid-column-start: 2;
     grid-row-start: 1;
+    min-width: 120px;
   }
   .user-additional-controls + .user-content,
   .user-secondary-navigation + .user-content {
@@ -305,32 +307,67 @@
 }
 
 .user-invites-page {
+  .user-invite-search input {
+    width: 100%;
+  }
+
   .admin-controls {
     flex-wrap: wrap;
     .pull-right {
       flex: 1 1 100%;
       font-size: $font-down-1;
-      padding: 0;
+      padding: 5px 0;
     }
   }
-  table {
-    tr:first-of-type {
+
+  table.user-invite-list {
+    thead {
       display: none;
     }
+
     tr {
-      display: flex;
-      flex-wrap: wrap;
-      margin-bottom: 1em;
+      display: grid;
+      grid-template-columns: repeat(4, 1fr);
+      padding: 0.25em;
     }
-    td:first-of-type {
-      margin-right: 1em;
-    }
-    td:nth-of-type(n + 3) {
+
+    .label {
       display: block;
-      width: 50%;
-      padding: 0.25em 0 1em 0;
+      color: var(--primary-medium);
+      font-size: $font-down-1;
+      margin: 0.5em 0 0.15em 0;
+    }
+
+    td.invite-type {
+      grid-column-start: 1;
+      grid-column-end: -2;
+      order: 1;
+      vertical-align: middle;
+    }
+
+    td.invite-actions {
+      order: 2;
+      align-self: center;
+      text-align: right;
+
+      button {
+        margin: 0.25em;
+      }
+    }
+
+    td.invite-updated-at {
+      grid-column-start: 1;
+      grid-column-end: 3;
+      order: 3;
+    }
+
+    td.invite-expires-at {
+      grid-column-start: 3;
+      grid-column-end: -1;
+      order: 4;
     }
   }
+
   .user-invite-none {
     margin-top: 1em;
   }
diff --git a/app/assets/stylesheets/publish.scss b/app/assets/stylesheets/publish.scss
index 15bdadfb23..cdd768b751 100644
--- a/app/assets/stylesheets/publish.scss
+++ b/app/assets/stylesheets/publish.scss
@@ -9,7 +9,7 @@
   width: 100%;
   top: 0;
   z-index: z("header");
-  background-color: var(--secondary, $secondary);
+  background-color: var(--header_background);
   box-shadow: 0 2px 4px -1px rgba(0, 0, 0, 0.25);
   position: sticky;
   top: 0;
@@ -25,7 +25,7 @@
       line-height: 1em;
     }
     .published-page-title {
-      color: var(--header_primary, $header_primary);
+      color: var(--header_primary);
       font-size: 2em;
       margin: 0;
       max-height: 1.25em;
@@ -34,8 +34,8 @@
 }
 
 .published-page {
-  background-color: var(--secondary, $secondary);
-  color: var(--primary, $primary);
+  background-color: var(--secondary);
+  color: var(--primary);
 
   blockquote {
     margin-left: 0;
@@ -53,10 +53,10 @@
     margin-right: 1em;
     height: 45px;
     width: 45px;
-    border: 4px solid var(--tertiary-medium, $tertiary-medium);
+    border: 4px solid var(--tertiary-medium);
   }
   .topic-created-at {
-    color: var(--primary-medium, $primary-medium);
+    color: var(--primary-medium);
   }
 }
 
diff --git a/app/assets/stylesheets/test_helper.css b/app/assets/stylesheets/test_helper.scss
similarity index 58%
rename from app/assets/stylesheets/test_helper.css
rename to app/assets/stylesheets/test_helper.scss
index 4d4cef5863..6666bb4c45 100644
--- a/app/assets/stylesheets/test_helper.css
+++ b/app/assets/stylesheets/test_helper.scss
@@ -1,5 +1,4 @@
-@import '/stylesheets/desktop.css';
-@import 'qunit/qunit/qunit.css';
+@import "vendor/qunit";
 
 .modal-backdrop {
   display: none;
diff --git a/app/assets/stylesheets/testem.scss b/app/assets/stylesheets/testem.scss
new file mode 100644
index 0000000000..bb9bf36d5b
--- /dev/null
+++ b/app/assets/stylesheets/testem.scss
@@ -0,0 +1,21 @@
+// styles for Ember CLI testem environment
+
+:root {
+  --font-family: "Arial";
+}
+
+$primary: #222222 !default;
+$secondary: #ffffff !default;
+$tertiary: #0088cc !default;
+$quaternary: #e45735 !default;
+$header_background: #ffffff !default;
+$header_primary: #333333 !default;
+$highlight: #ffff4d !default;
+$danger: #e45735 !default;
+$success: #009900 !default;
+$love: #fa6c8d !default;
+
+@import "common/foundation/variables";
+@import "common/foundation/mixins";
+@import "desktop";
+@import "color_definitions";
diff --git a/app/assets/stylesheets/vendor/pikaday.scss b/app/assets/stylesheets/vendor/pikaday.scss
index 0ec34e0440..74a1f3776b 100644
--- a/app/assets/stylesheets/vendor/pikaday.scss
+++ b/app/assets/stylesheets/vendor/pikaday.scss
@@ -1,6 +1,3 @@
-@import "common/foundation/variables";
-@import "common/foundation/mixins";
-
 /*!
  * Pikaday
  * Copyright © 2014 David Bushell | BSD & MIT license | http://dbushell.com/
@@ -31,7 +28,7 @@ $pd-day-disabled-color: var(--primary) !default;
 $pd-week-color: var(--primary) !default;
 
 // Font
-$pd-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
+$pd-font-family: Arial, sans-serif !default;
 
 
 .pika-single {
diff --git a/app/assets/stylesheets/vendor/qunit.css b/app/assets/stylesheets/vendor/qunit.css
new file mode 100644
index 0000000000..9bf0381ee8
--- /dev/null
+++ b/app/assets/stylesheets/vendor/qunit.css
@@ -0,0 +1,436 @@
+/*!
+ * QUnit 2.8.0
+ * https://qunitjs.com/
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license
+ * https://jquery.org/license
+ *
+ * Date: 2018-11-02T16:17Z
+ */
+
+/** Font Family and Sizes */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult {
+	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
+}
+
+#qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
+#qunit-tests { font-size: smaller; }
+
+
+/** Resets */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
+	margin: 0;
+	padding: 0;
+}
+
+
+/** Header (excluding toolbar) */
+
+#qunit-header {
+	padding: 0.5em 0 0.5em 1em;
+
+	color: #8699A4;
+	background-color: #0D3349;
+
+	font-size: 1.5em;
+	line-height: 1em;
+	font-weight: 400;
+
+	border-radius: 5px 5px 0 0;
+}
+
+#qunit-header a {
+	text-decoration: none;
+	color: #C2CCD1;
+}
+
+#qunit-header a:hover,
+#qunit-header a:focus {
+	color: #FFF;
+}
+
+#qunit-banner {
+	height: 5px;
+}
+
+#qunit-filteredTest {
+	padding: 0.5em 1em 0.5em 1em;
+	color: #366097;
+	background-color: #F4FF77;
+}
+
+#qunit-userAgent {
+	padding: 0.5em 1em 0.5em 1em;
+	color: #FFF;
+	background-color: #2B81AF;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+
+
+/** Toolbar */
+
+#qunit-testrunner-toolbar {
+	padding: 0.5em 1em 0.5em 1em;
+	color: #5E740B;
+	background-color: #EEE;
+}
+
+#qunit-testrunner-toolbar .clearfix {
+	height: 0;
+	clear: both;
+}
+
+#qunit-testrunner-toolbar label {
+	display: inline-block;
+}
+
+#qunit-testrunner-toolbar input[type=checkbox],
+#qunit-testrunner-toolbar input[type=radio] {
+	margin: 3px;
+	vertical-align: -2px;
+}
+
+#qunit-testrunner-toolbar input[type=text] {
+	box-sizing: border-box;
+	height: 1.6em;
+}
+
+.qunit-url-config,
+.qunit-filter,
+#qunit-modulefilter {
+	display: inline-block;
+	line-height: 2.1em;
+}
+
+.qunit-filter,
+#qunit-modulefilter {
+	float: right;
+	position: relative;
+	margin-left: 1em;
+}
+
+.qunit-url-config label {
+	margin-right: 0.5em;
+}
+
+#qunit-modulefilter-search {
+	box-sizing: border-box;
+	width: 400px;
+}
+
+#qunit-modulefilter-search-container:after {
+	position: absolute;
+	right: 0.3em;
+	content: "\25bc";
+	color: black;
+}
+
+#qunit-modulefilter-dropdown {
+	/* align with #qunit-modulefilter-search */
+	box-sizing: border-box;
+	width: 400px;
+	position: absolute;
+	right: 0;
+	top: 50%;
+	margin-top: 0.8em;
+
+	border: 1px solid #D3D3D3;
+	border-top: none;
+	border-radius: 0 0 .25em .25em;
+	color: #000;
+	background-color: #F5F5F5;
+	z-index: 99;
+}
+
+#qunit-modulefilter-dropdown a {
+	color: inherit;
+	text-decoration: none;
+}
+
+#qunit-modulefilter-dropdown .clickable.checked {
+	font-weight: bold;
+	color: #000;
+	background-color: #D2E0E6;
+}
+
+#qunit-modulefilter-dropdown .clickable:hover {
+	color: #FFF;
+	background-color: #0D3349;
+}
+
+#qunit-modulefilter-actions {
+	display: block;
+	overflow: auto;
+
+	/* align with #qunit-modulefilter-dropdown-list */
+	font: smaller/1.5em sans-serif;
+}
+
+#qunit-modulefilter-dropdown #qunit-modulefilter-actions > * {
+	box-sizing: border-box;
+	max-height: 2.8em;
+	display: block;
+	padding: 0.4em;
+}
+
+#qunit-modulefilter-dropdown #qunit-modulefilter-actions > button {
+	float: right;
+	font: inherit;
+}
+
+#qunit-modulefilter-dropdown #qunit-modulefilter-actions > :last-child {
+	/* insert padding to align with checkbox margins */
+	padding-left: 3px;
+}
+
+#qunit-modulefilter-dropdown-list {
+	max-height: 200px;
+	overflow-y: auto;
+	margin: 0;
+	border-top: 2px groove threedhighlight;
+	padding: 0.4em 0 0;
+	font: smaller/1.5em sans-serif;
+}
+
+#qunit-modulefilter-dropdown-list li {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+#qunit-modulefilter-dropdown-list .clickable {
+	display: block;
+	padding-left: 0.15em;
+}
+
+
+/** Tests: Pass/Fail */
+
+#qunit-tests {
+	list-style-position: inside;
+}
+
+#qunit-tests li {
+	padding: 0.4em 1em 0.4em 1em;
+	border-bottom: 1px solid #FFF;
+	list-style-position: inside;
+}
+
+#qunit-tests > li {
+	display: none;
+}
+
+#qunit-tests li.running,
+#qunit-tests li.pass,
+#qunit-tests li.fail,
+#qunit-tests li.skipped,
+#qunit-tests li.aborted {
+	display: list-item;
+}
+
+#qunit-tests.hidepass {
+	position: relative;
+}
+
+#qunit-tests.hidepass li.running,
+#qunit-tests.hidepass li.pass:not(.todo) {
+	visibility: hidden;
+	position: absolute;
+	width:   0;
+	height:  0;
+	padding: 0;
+	border:  0;
+	margin:  0;
+}
+
+#qunit-tests li strong {
+	cursor: pointer;
+}
+
+#qunit-tests li.skipped strong {
+	cursor: default;
+}
+
+#qunit-tests li a {
+	padding: 0.5em;
+	color: #C2CCD1;
+	text-decoration: none;
+}
+
+#qunit-tests li p a {
+	padding: 0.25em;
+	color: #6B6464;
+}
+#qunit-tests li a:hover,
+#qunit-tests li a:focus {
+	color: #000;
+}
+
+#qunit-tests li .runtime {
+	float: right;
+	font-size: smaller;
+}
+
+.qunit-assert-list {
+	margin-top: 0.5em;
+	padding: 0.5em;
+
+	background-color: #FFF;
+
+	border-radius: 5px;
+}
+
+.qunit-source {
+	margin: 0.6em 0 0.3em;
+}
+
+.qunit-collapsed {
+	display: none;
+}
+
+#qunit-tests table {
+	border-collapse: collapse;
+	margin-top: 0.2em;
+}
+
+#qunit-tests th {
+	text-align: right;
+	vertical-align: top;
+	padding: 0 0.5em 0 0;
+}
+
+#qunit-tests td {
+	vertical-align: top;
+}
+
+#qunit-tests pre {
+	margin: 0;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
+#qunit-tests del {
+	color: #374E0C;
+	background-color: #E0F2BE;
+	text-decoration: none;
+}
+
+#qunit-tests ins {
+	color: #500;
+	background-color: #FFCACA;
+	text-decoration: none;
+}
+
+/*** Test Counts */
+
+#qunit-tests b.counts                       { color: #000; }
+#qunit-tests b.passed                       { color: #5E740B; }
+#qunit-tests b.failed                       { color: #710909; }
+
+#qunit-tests li li {
+	padding: 5px;
+	background-color: #FFF;
+	border-bottom: none;
+	list-style-position: inside;
+}
+
+/*** Passing Styles */
+
+#qunit-tests li li.pass {
+	color: #3C510C;
+	background-color: #FFF;
+	border-left: 10px solid #C6E746;
+}
+
+#qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
+#qunit-tests .pass .test-name               { color: #366097; }
+
+#qunit-tests .pass .test-actual,
+#qunit-tests .pass .test-expected           { color: #999; }
+
+#qunit-banner.qunit-pass                    { background-color: #C6E746; }
+
+/*** Failing Styles */
+
+#qunit-tests li li.fail {
+	color: #710909;
+	background-color: #FFF;
+	border-left: 10px solid #EE5757;
+	white-space: pre;
+}
+
+#qunit-tests > li:last-child {
+	border-radius: 0 0 5px 5px;
+}
+
+#qunit-tests .fail                          { color: #000; background-color: #EE5757; }
+#qunit-tests .fail .test-name,
+#qunit-tests .fail .module-name             { color: #000; }
+
+#qunit-tests .fail .test-actual             { color: #EE5757; }
+#qunit-tests .fail .test-expected           { color: #008000; }
+
+#qunit-banner.qunit-fail                    { background-color: #EE5757; }
+
+
+/*** Aborted tests */
+#qunit-tests .aborted { color: #000; background-color: orange; }
+/*** Skipped tests */
+
+#qunit-tests .skipped {
+	background-color: #EBECE9;
+}
+
+#qunit-tests .qunit-todo-label,
+#qunit-tests .qunit-skipped-label {
+	background-color: #F4FF77;
+	display: inline-block;
+	font-style: normal;
+	color: #366097;
+	line-height: 1.8em;
+	padding: 0 0.5em;
+	margin: -0.4em 0.4em -0.4em 0;
+}
+
+#qunit-tests .qunit-todo-label {
+	background-color: #EEE;
+}
+
+/** Result */
+
+#qunit-testresult {
+	color: #2B81AF;
+	background-color: #D2E0E6;
+
+	border-bottom: 1px solid #FFF;
+}
+#qunit-testresult .clearfix {
+	height: 0;
+	clear: both;
+}
+#qunit-testresult .module-name {
+	font-weight: 700;
+}
+#qunit-testresult-display {
+	padding: 0.5em 1em 0.5em 1em;
+	width: 85%;
+	float:left;
+}
+#qunit-testresult-controls {
+	padding: 0.5em 1em 0.5em 1em;
+  width: 10%;
+	float:left;
+}
+
+/** Fixture */
+
+#qunit-fixture {
+	position: absolute;
+	top: -10000px;
+	left: -10000px;
+	width: 1000px;
+	height: 1000px;
+}
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 654163bd48..648a4d736f 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -1,11 +1,8 @@
-@import "wizard_fonts";
 @import "color_definitions";
 @import "vendor/normalize";
 @import "vendor/normalize-ext";
 @import "common/foundation/colors";
-@import "common/foundation/variables";
-@import "common/foundation/mixins";
-@import "common/select-kit/*";
+@import "common/select-kit/_index";
 @import "common/components/svg";
 @import "common/base/modal";
 
@@ -716,7 +713,7 @@ body.wizard {
   line-height: $line-height-large;
   font-size: 15px;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-    Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+    Oxygen-Sans, Ubuntu, Cantarell, Arial, sans-serif;
 
   #wizard-main {
     display: flex;
@@ -825,35 +822,6 @@ body.wizard {
   max-height: 500px;
 }
 
-.wizard-step-emoji {
-  .radio-area {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-
-    input {
-      flex: 1 0 0px;
-    }
-
-    span {
-      flex: 10 0 0;
-    }
-
-    span.extra-label {
-      flex: 20 0 0;
-    }
-  }
-
-  .emoji-preview {
-    margin-left: 1em;
-    img {
-      height: 40px;
-      width: 40px;
-      padding-right: 0.5em;
-    }
-  }
-}
-
 .wizard-step-homepage {
   .field-homepage-style {
     width: 280px;
diff --git a/app/controllers/admin/api_controller.rb b/app/controllers/admin/api_controller.rb
index 7712cc308e..513aa4b480 100644
--- a/app/controllers/admin/api_controller.rb
+++ b/app/controllers/admin/api_controller.rb
@@ -27,7 +27,7 @@ class Admin::ApiController < Admin::AdminController
       memo.tap do |m|
         m[resource] = actions.map do |k, v|
           {
-            id: "#{resource}:#{k}",
+            scope_id: "#{resource}:#{k}",
             key: k,
             name: k.to_s.gsub('_', ' '),
             params: v[:params],
@@ -99,7 +99,7 @@ class Admin::ApiController < Admin::AdminController
 
   def build_scopes
     params.require(:key)[:scopes].to_a.map do |scope_params|
-      resource, action = scope_params[:id].split(':')
+      resource, action = scope_params[:scope_id].split(':')
 
       mapping = ApiKeyScope.scope_mappings.dig(resource.to_sym, action.to_sym)
       raise Discourse::InvalidParameters if mapping.nil? # invalid mapping
diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb
index c49b6aeeb8..f8b3300f99 100644
--- a/app/controllers/admin/backups_controller.rb
+++ b/app/controllers/admin/backups_controller.rb
@@ -72,7 +72,7 @@ class Admin::BackupsController < Admin::AdminController
   def show
     if !EmailBackupToken.compare(current_user.id, params.fetch(:token))
       @error = I18n.t('download_backup_mailer.no_token')
-      return render template: 'admin/backups/show.html.erb', layout: 'no_ember', status: 422
+      return render layout: 'no_ember', status: 422, formats: [:html]
     end
 
     store = BackupRestore::BackupStore.create
diff --git a/app/controllers/admin/badges_controller.rb b/app/controllers/admin/badges_controller.rb
index cfe6460efd..d020699989 100644
--- a/app/controllers/admin/badges_controller.rb
+++ b/app/controllers/admin/badges_controller.rb
@@ -9,7 +9,7 @@ class Admin::BadgesController < Admin::AdminController
       badge_types: BadgeType.all.order(:id).to_a,
       badge_groupings: BadgeGrouping.all.order(:position).to_a,
       badges: Badge.includes(:badge_grouping)
-        .includes(:badge_type)
+        .includes(:badge_type, :image_upload)
         .references(:badge_grouping)
         .order('badge_groupings.position, badge_type_id, badges.name').to_a,
       protected_system_fields: Badge.protected_system_fields,
@@ -43,6 +43,14 @@ class Admin::BadgesController < Admin::AdminController
     badge = Badge.find_by(id: params[:badge_id])
     raise Discourse::InvalidParameters if csv_file.try(:tempfile).nil? || badge.nil?
 
+    if !badge.enabled?
+      render_json_error(
+        I18n.t('badges.mass_award.errors.badge_disabled', badge_name: badge.display_name),
+        status: 422
+      )
+      return
+    end
+
     replace_badge_owners = params[:replace_badge_owners] == 'true'
     BadgeGranter.revoke_all(badge) if replace_badge_owners
 
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index eb246d75e5..38e3fe0f07 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -22,4 +22,18 @@ class Admin::DashboardController < Admin::AdminController
   def problems
     render_json_dump(problems: AdminDashboardData.fetch_problems(check_force_https: request.ssl?))
   end
+
+  def new_features
+    data = {
+      new_features: DiscourseUpdates.new_features,
+      has_unseen_features: DiscourseUpdates.has_unseen_features?(current_user.id),
+      release_notes_link: AdminDashboardGeneralData.fetch_cached_stats["release_notes_link"]
+    }
+    render json: data
+  end
+
+  def mark_new_features_as_seen
+    DiscourseUpdates.mark_new_features_as_seen(current_user.id)
+    render json: success_json
+  end
 end
diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb
index db89c25ebc..249eee87ba 100644
--- a/app/controllers/admin/email_controller.rb
+++ b/app/controllers/admin/email_controller.rb
@@ -143,14 +143,24 @@ class Admin::EmailController < Admin::AdminController
   end
 
   def handle_mail
-    params.require(:email)
+    deprecated_email_param_used = false
+
+    if params[:email_encoded].present?
+      email_raw = Base64.strict_decode64(params[:email_encoded])
+    elsif params[:email].present?
+      deprecated_email_param_used = true
+      email_raw = params[:email]
+    else
+      raise ActionController::ParameterMissing.new("email_encoded or email")
+    end
+
     retry_count = 0
 
     begin
-      Jobs.enqueue(:process_email, mail: params[:email], retry_on_rate_limit: true)
-    rescue JSON::GeneratorError => e
+      Jobs.enqueue(:process_email, mail: email_raw, retry_on_rate_limit: true, source: :handle_mail)
+    rescue JSON::GeneratorError, Encoding::UndefinedConversionError => e
       if retry_count == 0
-        params[:email] = params[:email].force_encoding('iso-8859-1').encode("UTF-8")
+        email_raw = email_raw.force_encoding('iso-8859-1').encode("UTF-8")
         retry_count += 1
         retry
       else
@@ -158,7 +168,13 @@ class Admin::EmailController < Admin::AdminController
       end
     end
 
-    render plain: "email has been received and is queued for processing"
+    # TODO: 2022-05-01 Remove this route once all sites have migrated over
+    # to using the new email_encoded param.
+    if deprecated_email_param_used
+      render plain: "warning: the email parameter is deprecated. all POST requests to this route should be sent with a base64 strict encoded encoded_email parameter instead. email has been received and is queued for processing"
+    else
+      render plain: "email has been received and is queued for processing"
+    end
   end
 
   def raw_email
diff --git a/app/controllers/admin/email_templates_controller.rb b/app/controllers/admin/email_templates_controller.rb
index d1b06c830e..48fffe9483 100644
--- a/app/controllers/admin/email_templates_controller.rb
+++ b/app/controllers/admin/email_templates_controller.rb
@@ -20,6 +20,7 @@ class Admin::EmailTemplatesController < Admin::AdminController
       "system_messages.download_remote_images_disabled",
       "system_messages.email_error_notification",
       "system_messages.email_reject_auto_generated",
+      "system_messages.email_reject_bad_destination_address",
       "system_messages.email_reject_empty",
       "system_messages.email_reject_invalid_access",
       "system_messages.email_reject_parsing",
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 8fdf6c40ca..3c84ff9298 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -1,41 +1,6 @@
 # frozen_string_literal: true
 
 class Admin::GroupsController < Admin::AdminController
-  def bulk
-  end
-
-  def bulk_perform
-    group = Group.find_by(id: params[:group_id].to_i)
-    raise Discourse::NotFound unless group
-    users_added = 0
-
-    users = (params[:users] || []).map { |user| user.downcase!; user }
-    valid_emails = {}
-    valid_usernames = {}
-
-    valid_users = User.joins(:user_emails)
-      .where("username_lower IN (:users) OR lower(user_emails.email) IN (:users)", users: users)
-      .pluck(:id, :username_lower, :"user_emails.email")
-
-    valid_users.map! do |id, username_lower, email|
-      valid_emails[email] = valid_usernames[username_lower] = id
-      id
-    end
-
-    valid_users.uniq!
-    invalid_users = users.reject { |u| valid_emails[u] || valid_usernames[u] }
-    group.bulk_add(valid_users) if valid_users.present?
-    users_added = valid_users.count
-
-    response = success_json.merge(users_not_added: invalid_users)
-
-    if users_added > 0
-      response[:message] = I18n.t('groups.success.bulk_add', count: users_added)
-    end
-
-    render json: response
-  end
-
   def create
     guardian.ensure_can_create_group!
 
@@ -80,6 +45,10 @@ class Admin::GroupsController < Admin::AdminController
     if group.automatic
       can_not_modify_automatic
     else
+      details = { name: group.name }
+      details[:grant_trust_level] = group.grant_trust_level if group.grant_trust_level
+
+      StaffActionLogger.new(current_user).log_custom('delete_group', details)
       group.destroy!
       render json: success_json
     end
@@ -121,15 +90,35 @@ class Admin::GroupsController < Admin::AdminController
     return can_not_modify_automatic if group.automatic
     guardian.ensure_can_edit_group!(group)
 
-    user = User.find(params[:user_id].to_i)
-    group.group_users.where(user_id: user.id).update_all(owner: false)
-    GroupActionLogger.new(current_user, group).log_remove_user_as_group_owner(user)
+    if params[:user_id].present?
+      users = [User.find_by(id: params[:user_id].to_i)]
+    elsif usernames = group_params[:usernames].presence
+      users = User.where(username: usernames.split(","))
+    else
+      raise Discourse::InvalidParameters.new(:user_id)
+    end
+
+    users.each do |user|
+      group.group_users.where(user_id: user.id).update_all(owner: false)
+      GroupActionLogger.new(current_user, group).log_remove_user_as_group_owner(user)
+    end
 
     Group.reset_counters(group.id, :group_users)
 
     render json: success_json
   end
 
+  def set_primary
+    group = Group.find_by(id: params.require(:id))
+    raise Discourse::NotFound unless group
+
+    users = User.where(username: group_params[:usernames].split(","))
+    users.each { |user| guardian.ensure_can_change_primary_group!(user) }
+    users.update_all(primary_group_id: params[:primary] == "true" ? group.id : nil)
+
+    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]
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 5fc2544b48..e9be087108 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -42,7 +42,7 @@ class Admin::ReportsController < Admin::AdminController
           report = Report.find(report_type, args)
 
           if (report_params[:cache]) && report
-            Report.cache(report, 35.minutes)
+            Report.cache(report)
           end
 
           if report.blank?
@@ -80,7 +80,7 @@ class Admin::ReportsController < Admin::AdminController
       raise Discourse::NotFound if report.blank?
 
       if (params[:cache])
-        Report.cache(report, 35.minutes)
+        Report.cache(report)
       end
 
       render_json_dump(report: report)
diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index 2455a5b4b6..b909adf06a 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -6,7 +6,10 @@ class Admin::SiteSettingsController < Admin::AdminController
   end
 
   def index
-    render_json_dump(site_settings: SiteSetting.all_settings, diags: SiteSetting.diags)
+    render_json_dump(
+      site_settings: SiteSetting.all_settings(sanitize_plain_text_settings: true),
+      diags: SiteSetting.diags
+    )
   end
 
   def update
@@ -14,6 +17,12 @@ class Admin::SiteSettingsController < Admin::AdminController
     id = params[:id]
     value = params[id]
     value.strip! if value.is_a?(String)
+
+    new_setting_name = SiteSettings::DeprecatedSettings::SETTINGS.find do |old_name, new_name, _, _|
+      break new_name if old_name == id
+    end
+    id = new_setting_name if new_setting_name
+
     raise_access_hidden_setting(id)
 
     if SiteSetting.type_supervisor.get_type(id) == :uploaded_image_list
diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb
index 4f0226bbb1..313b578a83 100644
--- a/app/controllers/admin/site_texts_controller.rb
+++ b/app/controllers/admin/site_texts_controller.rb
@@ -21,14 +21,13 @@ class Admin::SiteTextsController < Admin::AdminController
 
     query = params[:q] || ""
 
-    locale = params[:locale] || I18n.locale
-    raise Discourse::InvalidParameters.new(:locale) if !I18n.locale_available?(locale)
+    locale = fetch_locale(params[:locale])
 
     if query.blank? && !overridden
       extras[:recommended] = true
-      results = I18n.with_locale(locale) { self.class.preferred_keys.map { |k| record_for(k) } }
+      results = self.class.preferred_keys.map { |k| record_for(key: k, locale: locale) }
     else
-      results = I18n.with_locale(locale) { find_translations(query, overridden) }
+      results = find_translations(query, overridden, locale)
 
       if results.any?
         extras[:regex] = I18n::Backend::DiscourseI18n.create_search_regexp(query, as_string: true)
@@ -53,20 +52,37 @@ class Admin::SiteTextsController < Admin::AdminController
     last = first + per_page
 
     extras[:has_more] = true if results.size > last
-    render_serialized(results[first..last - 1], SiteTextSerializer, root: 'site_texts', rest_serializer: true, extras: extras, overridden_keys: overridden_keys)
+
+    if LocaleSiteSetting.fallback_locale(locale).present?
+      extras[:fallback_locale] = LocaleSiteSetting.fallback_locale(locale)
+    end
+
+    overridden = overridden_keys(locale)
+    render_serialized(
+      results[first..last - 1],
+      SiteTextSerializer,
+      root: 'site_texts',
+      rest_serializer: true,
+      extras: extras,
+      overridden_keys: overridden,
+    )
   end
 
   def show
-    site_text = find_site_text
+    locale = fetch_locale(params[:locale])
+    site_text = find_site_text(locale)
     render_serialized(site_text, SiteTextSerializer, root: 'site_text', rest_serializer: true)
   end
 
   def update
-    site_text = find_site_text
-    value = site_text[:value] = params[:site_text][:value]
+    locale = fetch_locale(params.dig(:site_text, :locale))
+
+    site_text = find_site_text(locale)
+    value = site_text[:value] = params.dig(:site_text, :value)
     id = site_text[:id]
-    old_value = I18n.t(id)
-    translation_override = TranslationOverride.upsert!(I18n.locale, id, value)
+    old_value = I18n.with_locale(locale) { I18n.t(id) }
+
+    translation_override = TranslationOverride.upsert!(locale, id, value)
 
     if translation_override.errors.empty?
       StaffActionLogger.new(current_user).log_site_text_change(id, value, old_value)
@@ -88,11 +104,14 @@ class Admin::SiteTextsController < Admin::AdminController
   end
 
   def revert
-    site_text = find_site_text
+    locale = fetch_locale(params[:locale])
+
+    site_text = find_site_text(locale)
     id = site_text[:id]
-    old_text = I18n.t(id)
-    TranslationOverride.revert!(I18n.locale, id)
-    site_text = find_site_text
+    old_text = I18n.with_locale(locale) { I18n.t(id) }
+    TranslationOverride.revert!(locale, id)
+
+    site_text = find_site_text(locale)
     StaffActionLogger.new(current_user).log_site_text_change(id, site_text[:value], old_text)
     system_badge_id = Badge.find_system_badge_id_from_translation_key(id)
     if system_badge_id.present?
@@ -137,39 +156,42 @@ class Admin::SiteTextsController < Admin::AdminController
     badge_parts[0] == 'badges' && badge_parts[2] == 'name'
   end
 
-  def record_for(key, value = nil)
+  def record_for(key:, value: nil, locale:)
     if key.ends_with?("_MF")
-      override = TranslationOverride.where(translation_key: key, locale: I18n.locale).pluck(:value)
+      override = TranslationOverride.where(translation_key: key, locale: locale).pluck(:value)
       value = override&.first
     end
 
-    value ||= I18n.t(key)
-    { id: key, value: value }
+    value ||= I18n.with_locale(locale) { I18n.t(key) }
+    { id: key, value: value, locale: locale }
   end
 
   PLURALIZED_REGEX = /(.*)\.(zero|one|two|few|many|other)$/
 
-  def find_site_text
+  def find_site_text(locale)
     if self.class.restricted_keys.include?(params[:id])
       raise Discourse::InvalidAccess.new(nil, nil, custom_message: 'email_template_cant_be_modified')
     end
 
-    if I18n.exists?(params[:id]) || TranslationOverride.exists?(locale: I18n.locale, translation_key: params[:id])
-      return record_for(params[:id])
+    if I18n.exists?(params[:id], locale) || TranslationOverride.exists?(locale: locale, translation_key: params[:id])
+      return record_for(key: params[:id], locale: locale)
     end
 
     if PLURALIZED_REGEX.match(params[:id])
-      value = fix_plural_keys($1, {}).fetch($2.to_sym)
-      return record_for(params[:id], value) if value
+      value = fix_plural_keys($1, {}, locale).detect { |plural| plural[0] == $2.to_sym }
+      return record_for(key: params[:id], value: value[1], locale: value[2]) if value
     end
 
     raise Discourse::NotFound
   end
 
-  def find_translations(query, overridden)
+  def find_translations(query, overridden, locale)
     translations = Hash.new { |hash, key| hash[key] = {} }
+    search_results = I18n.with_locale(locale) do
+      I18n.search(query, overridden: overridden)
+    end
 
-    I18n.search(query, overridden: overridden).each do |key, value|
+    search_results.each do |key, value|
       if PLURALIZED_REGEX.match(key)
         translations[$1][$2] = value
       else
@@ -183,30 +205,46 @@ class Admin::SiteTextsController < Admin::AdminController
       next unless I18n.exists?(key, :en)
 
       if value&.is_a?(Hash)
-        value = fix_plural_keys(key, value)
-        value.each do |plural_key, plural_value|
-          results << record_for("#{key}.#{plural_key}", plural_value)
+        fix_plural_keys(key, value, locale).each do |plural|
+          plural_key = plural[0]
+          plural_value = plural[1]
+
+          results << record_for(
+            key: "#{key}.#{plural_key}", value: plural_value, locale: plural.last
+          )
         end
       else
-        results << record_for(key, value)
+        results << record_for(key: key, value: value, locale: locale)
       end
     end
 
     results
   end
 
-  def fix_plural_keys(key, value)
+  def fix_plural_keys(key, value, locale)
     value = value.with_indifferent_access
-    plural_keys = I18n.t('i18n.plural.keys')
+    plural_keys = I18n.with_locale(locale) { I18n.t('i18n.plural.keys') }
     return value if value.keys.size == plural_keys.size && plural_keys.all? { |k| value.key?(k) }
 
     fallback_value = I18n.t(key, locale: :en, default: {})
     plural_keys.map do |k|
-      [k, value[k] || fallback_value[k] || fallback_value[:other]]
-    end.to_h
+      if value[k]
+        [k, value[k], locale]
+      else
+        [k, fallback_value[k] || fallback_value[:other], :en]
+      end
+    end
   end
 
-  def overridden_keys
-    TranslationOverride.where(locale: I18n.locale).pluck(:translation_key)
+  def overridden_keys(locale)
+    TranslationOverride.where(locale: locale).pluck(:translation_key)
+  end
+
+  def fetch_locale(locale_from_params)
+    locale_from_params.tap do |locale|
+      if locale.blank? || !I18n.locale_available?(locale)
+        raise Discourse::InvalidParameters.new(:locale)
+      end
+    end
   end
 end
diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index 43e63136ac..95f9bbe1e1 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -92,8 +92,12 @@ class Admin::ThemesController < Admin::AdminController
         render json: @theme.errors, status: :unprocessable_entity
       end
     elsif remote = params[:remote]
-
-      guardian.ensure_allowed_theme_repo_import!(remote.strip)
+      begin
+        guardian.ensure_allowed_theme_repo_import!(remote.strip)
+      rescue Discourse::InvalidAccess
+        render_json_error I18n.t("themes.import_error.not_allowed_theme", { repo: remote.strip }), status: :forbidden
+        return
+      end
 
       begin
         branch = params[:branch] ? params[:branch] : nil
@@ -124,16 +128,7 @@ class Admin::ThemesController < Admin::AdminController
   end
 
   def index
-    @themes = Theme.order(:name).includes(:child_themes,
-                                          :parent_themes,
-                                          :remote_theme,
-                                          :theme_settings,
-                                          :settings_field,
-                                          :locale_fields,
-                                          :user,
-                                          :color_scheme,
-                                          theme_fields: :upload
-                                          )
+    @themes = Theme.include_relations.order(:name)
     @color_schemes = ColorScheme.all.includes(:theme, color_scheme_colors: :color_scheme).to_a
 
     payload = {
@@ -171,7 +166,7 @@ class Admin::ThemesController < Admin::AdminController
   end
 
   def update
-    @theme = Theme.find_by(id: params[:id])
+    @theme = Theme.include_relations.find_by(id: params[:id])
     raise Discourse::InvalidParameters.new(:id) unless @theme
 
     original_json = ThemeSerializer.new(@theme, root: false).to_json
@@ -209,7 +204,7 @@ class Admin::ThemesController < Admin::AdminController
       if @theme.save
         update_default_theme
 
-        @theme.reload
+        @theme = Theme.include_relations.find(@theme.id)
 
         if (!disables_component && !enables_component) || theme_params.keys.size > 1
           log_theme_change(original_json, @theme)
@@ -245,7 +240,7 @@ class Admin::ThemesController < Admin::AdminController
   end
 
   def show
-    @theme = Theme.find_by(id: params[:id])
+    @theme = Theme.include_relations.find_by(id: params[:id])
     raise Discourse::InvalidParameters.new(:id) unless @theme
 
     render json: ThemeSerializer.new(@theme)
@@ -291,7 +286,7 @@ class Admin::ThemesController < Admin::AdminController
   end
 
   def ban_for_remote_theme!
-    raise Discourse::InvalidAccess if @theme.remote_theme
+    raise Discourse::InvalidAccess if @theme.remote_theme&.is_git?
   end
 
   def add_relative_themes!(kind, ids)
@@ -401,8 +396,10 @@ class Admin::ThemesController < Admin::AdminController
   def handle_switch
     param = theme_params[:component]
     if param.to_s == "false" && @theme.component?
+      raise Discourse::InvalidParameters.new(:component) if @theme.id == SiteSetting.default_theme_id
       @theme.switch_to_theme!
     elsif param.to_s == "true" && !@theme.component?
+      raise Discourse::InvalidParameters.new(:component) if @theme.id == SiteSetting.default_theme_id
       @theme.switch_to_component!
     end
   end
diff --git a/app/controllers/admin/user_fields_controller.rb b/app/controllers/admin/user_fields_controller.rb
index 26fa6a5113..939ba7c69d 100644
--- a/app/controllers/admin/user_fields_controller.rb
+++ b/app/controllers/admin/user_fields_controller.rb
@@ -3,7 +3,7 @@
 class Admin::UserFieldsController < Admin::AdminController
 
   def self.columns
-    [:name, :field_type, :editable, :description, :required, :show_on_profile, :show_on_user_card, :position]
+    %i(name field_type editable description required show_on_profile show_on_user_card position searchable)
   end
 
   def create
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 256da9466b..a880acfd65 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -345,7 +345,7 @@ class Admin::UsersController < Admin::AdminController
       keep_posts: true,
       post_id: params[:post_id]
     )
-    if silencer.silence && message.present?
+    if silencer.silence
       Jobs.enqueue(
         :critical_user_email,
         type: :account_silenced,
@@ -439,12 +439,12 @@ class Admin::UsersController < Admin::AdminController
   end
 
   def sync_sso
-    return render body: nil, status: 404 unless SiteSetting.enable_sso
+    return render body: nil, status: 404 unless SiteSetting.enable_discourse_connect
 
     begin
       sso = DiscourseSingleSignOn.parse("sso=#{params[:sso]}&sig=#{params[:sig]}", secure_session: secure_session)
-    rescue DiscourseSingleSignOn::ParseError => e
-      return render json: failed_json.merge(message: I18n.t("sso.login_error")), status: 422
+    rescue DiscourseSingleSignOn::ParseError
+      return render json: failed_json.merge(message: I18n.t("discourse_connect.login_error")), status: 422
     end
 
     begin
@@ -453,7 +453,7 @@ class Admin::UsersController < Admin::AdminController
     rescue ActiveRecord::RecordInvalid => ex
       render json: failed_json.merge(message: ex.message), status: 403
     rescue DiscourseSingleSignOn::BlankExternalId => ex
-      render json: failed_json.merge(message: I18n.t('sso.blank_id_error')), status: 422
+      render json: failed_json.merge(message: I18n.t('discourse_connect.blank_id_error')), status: 422
     end
   end
 
@@ -489,7 +489,10 @@ class Admin::UsersController < Admin::AdminController
 
   def anonymize
     guardian.ensure_can_anonymize_user!(@user)
-    if user = UserAnonymizer.new(@user, current_user).make_anonymous
+    opts = {}
+    opts[:anonymize_ip] = params[:anonymize_ip] if params[:anonymize_ip].present?
+
+    if user = UserAnonymizer.new(@user, current_user, opts).make_anonymous
       render json: success_json.merge(username: user.username)
     else
       render json: failed_json.merge(user: AdminDetailedUserSerializer.new(user, root: false).as_json)
@@ -502,14 +505,9 @@ class Admin::UsersController < Admin::AdminController
     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!
-      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, serializer_opts).as_json)
-    end
+    Jobs.enqueue(:merge_user, user_id: @user.id, target_user_id: target_user.id, current_user_id: current_user.id)
+    render json: success_json
   end
 
   def reset_bounce_score
diff --git a/app/controllers/admin/watched_words_controller.rb b/app/controllers/admin/watched_words_controller.rb
index b6e013041b..5423c32972 100644
--- a/app/controllers/admin/watched_words_controller.rb
+++ b/app/controllers/admin/watched_words_controller.rb
@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+require 'csv'
+
 class Admin::WatchedWordsController < Admin::AdminController
   skip_before_action :check_xhr, only: [:download]
 
   def index
-    render_json_dump WatchedWordListSerializer.new(WatchedWord.by_action, scope: guardian, root: false)
+    watched_words = WatchedWord.by_action
+    watched_words = watched_words.where.not(action: WatchedWord.actions[:tag]) if !SiteSetting.tagging_enabled
+    render_json_dump WatchedWordListSerializer.new(watched_words, scope: guardian, root: false)
   end
 
   def create
@@ -26,12 +30,20 @@ class Admin::WatchedWordsController < Admin::AdminController
   def upload
     file = params[:file] || params[:files].first
     action_key = params[:action_key].to_sym
+    has_replacement = WatchedWord.has_replacement?(action_key)
 
     Scheduler::Defer.later("Upload watched words") do
       begin
-        File.open(file.tempfile, encoding: "bom|utf-8").each_line do |line|
-          WatchedWord.create_or_update_word(word: line, action_key: action_key) unless line.empty?
+        CSV.foreach(file.tempfile, encoding: "bom|utf-8") do |row|
+          if row[0].present? && (!has_replacement || row[1].present?)
+            WatchedWord.create_or_update_word(
+              word: row[0],
+              replacement: has_replacement ? row[1] : nil,
+              action_key: action_key
+            )
+          end
         end
+
         data = { url: '/ok' }
       rescue => e
         data = failed_json.merge(errors: [e.message])
@@ -48,11 +60,17 @@ class Admin::WatchedWordsController < Admin::AdminController
     action = WatchedWord.actions[name]
     raise Discourse::NotFound if !action
 
-    content = WatchedWord.where(action: action).pluck(:word).join("\n")
+    content = WatchedWord.where(action: action)
+    if WatchedWord.has_replacement?(name)
+      content = content.pluck(:word, :replacement).map(&:to_csv).join
+    else
+      content = content.pluck(:word).join("\n")
+    end
+
     headers['Content-Length'] = content.bytesize.to_s
     send_data content,
-      filename: "#{Discourse.current_hostname}-watched-words-#{name}.txt",
-      content_type: "text/plain"
+      filename: "#{Discourse.current_hostname}-watched-words-#{name}.csv",
+      content_type: "text/csv"
   end
 
   def clear_all
@@ -69,7 +87,7 @@ class Admin::WatchedWordsController < Admin::AdminController
   private
 
   def watched_words_params
-    params.permit(:id, :word, :action_key)
+    params.permit(:id, :word, :replacement, :action_key)
   end
 
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5b6fee01b5..cf444e8709 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -56,12 +56,17 @@ class ApplicationController < ActionController::Base
     SiteSetting.enable_escaped_fragments? && params.key?("_escaped_fragment_")
   end
 
+  def show_browser_update?
+    @show_browser_update ||= CrawlerDetection.show_browser_update?(request.user_agent)
+  end
+  helper_method :show_browser_update?
+
   def use_crawler_layout?
     @use_crawler_layout ||=
       request.user_agent &&
       (request.content_type.blank? || request.content_type.include?('html')) &&
       !['json', 'rss'].include?(params[:format]) &&
-      (has_escaped_fragment? || params.key?("print") ||
+      (has_escaped_fragment? || params.key?("print") || show_browser_update? ||
       CrawlerDetection.crawler?(request.user_agent, request.headers["HTTP_VIA"])
       )
   end
@@ -89,22 +94,44 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def ember_cli_required?
+    Rails.env.development? && ENV['NO_EMBER_CLI'] != '1' && request.headers['X-Discourse-Ember-CLI'] != 'true'
+  end
+
+  def application_layout
+    ember_cli_required? ? "ember_cli" : "application"
+  end
+
   def set_layout
     case request.headers["Discourse-Render"]
     when "desktop"
-      return "application"
+      return application_layout
     when "crawler"
       return "crawler"
     end
 
-    use_crawler_layout? ? 'crawler' : 'application'
+    use_crawler_layout? ? 'crawler' : application_layout
   end
 
   class RenderEmpty < StandardError; end
   class PluginDisabled < StandardError; end
+  class EmberCLIHijacked < StandardError; end
+
+  def catch_ember_cli_hijack
+    yield
+  rescue ActionView::Template::Error => ex
+    raise ex unless ex.cause.is_a?(EmberCLIHijacked)
+    send_ember_cli_bootstrap
+  end
 
   rescue_from RenderEmpty do
-    with_resolved_locale { render 'default/empty' }
+    catch_ember_cli_hijack do
+      with_resolved_locale { render 'default/empty' }
+    end
+  end
+
+  rescue_from EmberCLIHijacked do
+    send_ember_cli_bootstrap
   end
 
   rescue_from ArgumentError do |e|
@@ -125,6 +152,10 @@ class ApplicationController < ActionController::Base
     render_json_error e.message, status: 400
   end
 
+  rescue_from Discourse::SiteSettingMissing do |e|
+    render_json_error I18n.t('site_setting_missing', name: e.message), status: 500
+  end
+
   rescue_from ActionController::RoutingError, PluginDisabled  do
     rescue_discourse_actions(:not_found, 404)
   end
@@ -161,7 +192,7 @@ class ApplicationController < ActionController::Base
         type: :rate_limit,
         status: 429,
         extras: { wait_seconds: retry_time_in_seconds },
-        headers: { 'Retry-After': retry_time_in_seconds }
+        headers: { 'Retry-After': retry_time_in_seconds.to_s }
       )
     end
   end
@@ -281,13 +312,19 @@ class ApplicationController < ActionController::Base
       rescue Discourse::InvalidAccess
         return render plain: message, status: status_code
       end
-      with_resolved_locale do
-        error_page_opts[:layout] = opts[:include_ember] ? 'application' : 'no_ember'
-        render html: build_not_found_page(error_page_opts)
+      catch_ember_cli_hijack do
+        with_resolved_locale do
+          error_page_opts[:layout] = opts[:include_ember] ? 'application' : 'no_ember'
+          render html: build_not_found_page(error_page_opts)
+        end
       end
     end
   end
 
+  def send_ember_cli_bootstrap
+    head 200, content_type: "text/html", "X-Discourse-Bootstrap-Required": true
+  end
+
   # If a controller requires a plugin, it will raise an exception if that plugin is
   # disabled. This allows plugins to be disabled programatically.
   def self.requires_plugin(plugin_name)
@@ -565,6 +602,7 @@ class ApplicationController < ActionController::Base
     store_preloaded("banner", banner_json)
     store_preloaded("customEmoji", custom_emoji)
     store_preloaded("isReadOnly", @readonly_mode.to_s)
+    store_preloaded("activatedThemes", activated_themes_json)
   end
 
   def preload_current_user_data
@@ -690,6 +728,10 @@ class ApplicationController < ActionController::Base
     raise ApplicationController::RenderEmpty.new unless ((request.format && request.format.json?) || request.xhr?)
   end
 
+  def apply_cdn_headers
+    Discourse.apply_cdn_headers(response.headers) if Discourse.is_cdn_request?(request.env, request.method)
+  end
+
   def self.requires_login(arg = {})
     @requires_login_arg = arg
   end
@@ -735,11 +777,11 @@ class ApplicationController < ActionController::Base
   def redirect_to_login
     dont_cache_page
 
-    if SiteSetting.external_auth_immediately && SiteSetting.enable_sso?
+    if SiteSetting.auth_immediately && SiteSetting.enable_discourse_connect?
       # save original URL in a session so we can redirect after login
       session[:destination_url] = destination_url
       redirect_to path('/session/sso')
-    elsif SiteSetting.external_auth_immediately && !SiteSetting.enable_local_logins && Discourse.enabled_authenticators.length == 1 && !cookies[:authentication_data]
+    elsif SiteSetting.auth_immediately && !SiteSetting.enable_local_logins && Discourse.enabled_authenticators.length == 1 && !cookies[:authentication_data]
       # Only one authentication provider, direct straight to it.
       # If authentication_data is present, then we are halfway though registration. Don't redirect offsite
       cookies[:destination_url] = destination_url
@@ -813,16 +855,13 @@ class ApplicationController < ActionController::Base
     @current_user = current_user rescue nil
 
     if !SiteSetting.login_required? || @current_user
-      key = "page_not_found_topics"
-      if @topics_partial = Discourse.redis.get(key)
-        @topics_partial = @topics_partial.html_safe
-      else
+      key = "page_not_found_topics:#{I18n.locale}"
+      @topics_partial = Discourse.cache.fetch(key, expires_in: 10.minutes) do
         category_topic_ids = Category.pluck(:topic_id).compact
         @top_viewed = TopicQuery.new(nil, except_topic_ids: category_topic_ids).list_top_for("monthly").topics.first(10)
         @recent = Topic.includes(:category).where.not(id: category_topic_ids).recent(10)
-        @topics_partial = render_to_string partial: '/exceptions/not_found_topics', formats: [:html]
-        Discourse.redis.setex(key, 10.minutes, @topics_partial)
-      end
+        render_to_string partial: '/exceptions/not_found_topics', formats: [:html]
+      end.html_safe
     end
 
     @container_class = "wrap not-found-container"
@@ -832,7 +871,7 @@ class ApplicationController < ActionController::Base
 
     params[:slug] = params[:slug].first if params[:slug].kind_of?(Array)
     params[:id] = params[:id].first if params[:id].kind_of?(Array)
-    @slug = (params[:slug].presence || params[:id].presence || "").tr('-', ' ')
+    @slug = (params[:slug].presence || params[:id].presence || "").to_s.tr('-', ' ')
 
     render_to_string status: opts[:status], layout: opts[:layout], formats: [:html], template: '/exceptions/not_found'
   end
@@ -884,4 +923,10 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def activated_themes_json
+    ids = @theme_ids&.compact
+    return "{}" if ids.blank?
+    ids = Theme.transform_ids(ids)
+    Theme.where(id: ids).pluck(:id, :name).to_h.to_json
+  end
 end
diff --git a/app/controllers/badges_controller.rb b/app/controllers/badges_controller.rb
index 14ff402160..3b90fce090 100644
--- a/app/controllers/badges_controller.rb
+++ b/app/controllers/badges_controller.rb
@@ -17,7 +17,7 @@ class BadgesController < ApplicationController
     if (params[:only_listable] == "true") || !request.xhr?
       # NOTE: this is sorted client side if needed
       badges = badges.includes(:badge_grouping)
-        .includes(:badge_type)
+        .includes(:badge_type, :image_upload)
         .where(enabled: true, listable: true)
     end
 
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index 7d103ea507..c0645e2ffa 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -6,6 +6,10 @@ class BookmarksController < ApplicationController
   def create
     params.require(:post_id)
 
+    RateLimiter.new(
+      current_user, "create_bookmark", SiteSetting.max_bookmarks_per_day, 1.day.to_i
+    ).performed!
+
     bookmark_manager = BookmarkManager.new(current_user)
     bookmark = bookmark_manager.create(
       post_id: params[:post_id],
@@ -50,4 +54,17 @@ class BookmarksController < ApplicationController
 
     render json: failed_json.merge(errors: bookmark_manager.errors.full_messages), status: 400
   end
+
+  def toggle_pin
+    params.require(:bookmark_id)
+
+    bookmark_manager = BookmarkManager.new(current_user)
+    bookmark_manager.toggle_pin(bookmark_id: params[:bookmark_id])
+
+    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/app/controllers/bootstrap_controller.rb b/app/controllers/bootstrap_controller.rb
index ebd68eebe1..9a52f741a2 100644
--- a/app/controllers/bootstrap_controller.rb
+++ b/app/controllers/bootstrap_controller.rb
@@ -58,8 +58,14 @@ class BootstrapController < ApplicationController
       plugin_test_js: [script_asset_path("plugin_tests")],
       setup_data: client_side_setup_data,
       preloaded: @preloaded,
+      html: create_html,
+      theme_html: create_theme_html,
+      html_classes: html_classes,
+      html_lang: html_lang,
+      login_path: main_app.login_path
     }
     bootstrap[:extra_locales] = extra_locales if extra_locales.present?
+    bootstrap[:csrf_token] = form_authenticity_token if current_user
 
     render_json_dump(bootstrap: bootstrap)
   end
@@ -87,4 +93,39 @@ private
     end
   end
 
+  def create_html
+    html = {}
+    return html unless allow_plugins?
+
+    add_plugin_html(html, :before_body_close)
+    add_plugin_html(html, :before_head_close)
+    add_plugin_html(html, :before_script_load)
+    add_plugin_html(html, :header)
+
+    html
+  end
+
+  def add_plugin_html(html, key)
+    add_if_present(html, key, DiscoursePluginRegistry.build_html("server:#{key.to_s.dasherize}", self))
+  end
+
+  def create_theme_html
+    theme_html = {}
+    return theme_html if customization_disabled?
+
+    theme_view = mobile_view? ? :mobile : :desktop
+
+    add_if_present(theme_html, :body_tag, Theme.lookup_field(theme_ids, theme_view, 'body_tag'))
+    add_if_present(theme_html, :head_tag, Theme.lookup_field(theme_ids, theme_view, 'head_tag'))
+    add_if_present(theme_html, :header, Theme.lookup_field(theme_ids, theme_view, 'header'))
+    add_if_present(theme_html, :translations, Theme.lookup_field(theme_ids, :translations, I18n.locale))
+    add_if_present(theme_html, :js, Theme.lookup_field(theme_ids, :extra_js, nil))
+
+    theme_html
+  end
+
+  def add_if_present(hash, key, val)
+    hash[key] = val if val.present?
+  end
+
 end
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 32ad2df84d..72508092ee 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -204,7 +204,7 @@ class CategoriesController < ApplicationController
 
   def find_by_slug
     params.require(:category_slug)
-    @category = Category.find_by_slug(params[:category_slug], params[:parent_category_slug])
+    @category = Category.find_by_slug_path(params[:category_slug].split('/'))
 
     raise Discourse::NotFound unless @category.present?
 
@@ -258,10 +258,6 @@ class CategoriesController < ApplicationController
       result.topic_list = TopicQuery.new(nil, topic_options).list_top_for(SiteSetting.top_page_default_timeframe.to_sym)
     end
 
-    result.topic_list.draft = result.category_list.draft
-    result.topic_list.draft_key = result.category_list.draft_key
-    result.topic_list.draft_sequence = result.category_list.draft_sequence
-
     render_serialized(result, CategoryAndTopicListsSerializer, root: false)
   end
 
@@ -300,6 +296,7 @@ class CategoriesController < ApplicationController
         :email_in_allow_strangers,
         :mailinglist_mirror,
         :all_topics_wiki,
+        :allow_unlimited_owner_edits_on_first_post,
         :parent_category_id,
         :auto_close_hours,
         :auto_close_based_on_last_post,
diff --git a/app/controllers/do_not_disturb_controller.rb b/app/controllers/do_not_disturb_controller.rb
new file mode 100644
index 0000000000..db24c7167c
--- /dev/null
+++ b/app/controllers/do_not_disturb_controller.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class DoNotDisturbController < ApplicationController
+  requires_login
+
+  def create
+    raise Discourse::InvalidParameters.new(:duration) if params[:duration].blank?
+
+    duration_minutes = (Integer(params[:duration]) rescue false)
+
+    ends_at = duration_minutes ?
+      ends_at_from_minutes(duration_minutes) :
+      ends_at_from_string(params[:duration])
+
+    new_timing = current_user.do_not_disturb_timings.new(starts_at: Time.zone.now, ends_at: ends_at)
+
+    if new_timing.save
+      current_user.publish_do_not_disturb(ends_at: ends_at)
+      render json: { ends_at: ends_at }
+    else
+      render_json_error(new_timing)
+    end
+  end
+
+  def destroy
+    current_user.active_do_not_disturb_timings.destroy_all
+    current_user.publish_do_not_disturb(ends_at: nil)
+    current_user.shelved_notifications.each(&:process)
+    current_user.shelved_notifications.destroy_all
+    render json: success_json
+  end
+
+  private
+
+  def ends_at_from_minutes(duration)
+    duration.minutes.from_now
+  end
+
+  def ends_at_from_string(string)
+    if string == 'tomorrow'
+      Time.now.end_of_day.utc
+    else
+      raise Discourse::InvalidParameters.new(:duration)
+    end
+  end
+end
diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb
index 2a05f7d823..2a063adaed 100644
--- a/app/controllers/embed_controller.rb
+++ b/app/controllers/embed_controller.rb
@@ -12,7 +12,7 @@ class EmbedController < ApplicationController
   layout 'embed'
 
   rescue_from Discourse::InvalidAccess do
-    response.headers['X-Frame-Options'] = "ALLOWALL"
+    response.headers.delete('X-Frame-Options')
     if current_user.try(:admin?)
       @setup_url = "#{Discourse.base_url}/admin/customize/embedding"
       @show_reason = true
@@ -24,7 +24,7 @@ class EmbedController < ApplicationController
   def topics
     discourse_expires_in 1.minute
 
-    response.headers['X-Frame-Options'] = "ALLOWALL"
+    response.headers.delete('X-Frame-Options')
     unless SiteSetting.embed_topics_list?
       render 'embed_topics_error', status: 400
       return
@@ -34,6 +34,10 @@ class EmbedController < ApplicationController
       raise Discourse::InvalidParameters.new(:embed_id) unless @embed_id =~ /^de\-[a-zA-Z0-9]+$/
     end
 
+    if @embed_class = params[:embed_class]
+      raise Discourse::InvalidParameters.new(:embed_class) unless @embed_class =~ /^[a-zA-Z0-9\-_]+$/
+    end
+
     if params.has_key?(:template) && params[:template] == "complete"
       @template = "complete"
     else
@@ -56,7 +60,14 @@ class EmbedController < ApplicationController
     end
 
     topic_query = TopicQuery.new(current_user, list_options)
-    @list = topic_query.list_latest
+    top_period = params[:top_period]&.to_sym
+    valid_top_period = TopTopic.periods.include?(top_period)
+
+    @list = if valid_top_period
+      topic_query.list_top_for(top_period)
+    else
+      topic_query.list_latest
+    end
   end
 
   def comments
@@ -74,6 +85,7 @@ class EmbedController < ApplicationController
       @topic_view = TopicView.new(topic_id,
                                   current_user,
                                   limit: SiteSetting.embed_post_limit,
+                                  only_regular: true,
                                   exclude_first: true,
                                   exclude_deleted_users: true,
                                   exclude_hidden: true)
@@ -156,7 +168,7 @@ class EmbedController < ApplicationController
       end
     end
 
-    response.headers['X-Frame-Options'] = "ALLOWALL"
+    response.headers.delete('X-Frame-Options')
   rescue URI::Error
     raise Discourse::InvalidAccess.new('invalid referer host')
   end
diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index d11efb4b43..361e75cff9 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -9,6 +9,14 @@ class ForumsController < ActionController::Base
   after_action  :add_readonly_header
 
   def status
+    if params[:cluster]
+      if GlobalSetting.cluster_name.nil?
+        return render plain: "cluster name not configured", status: 500
+      elsif GlobalSetting.cluster_name != params[:cluster]
+        return render plain: "cluster name does not match", status: 500
+      end
+    end
+
     if $shutdown # rubocop:disable Style/GlobalVars
       render plain: "shutting down", status: (params[:shutdown_ok] ? 200 : 500)
     else
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index eb7cb2eb5a..9dc1c43a40 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -322,6 +322,8 @@ class GroupsController < ApplicationController
       unless current_user.staff?
         RateLimiter.new(current_user, "public_group_membership", 3, 1.minute).performed!
       end
+    elsif !current_user.has_trust_level?(SiteSetting.min_trust_level_to_allow_invite.to_i)
+      raise Discourse::InvalidAccess
     end
 
     emails = []
@@ -333,15 +335,15 @@ class GroupsController < ApplicationController
     end
 
     if users.empty? && emails.empty?
-      raise Discourse::InvalidParameters.new(
-        'usernames or emails must be present'
-      )
+      raise Discourse::InvalidParameters.new(I18n.t("groups.errors.usernames_or_emails_required"))
     end
+
     if users.length > ADD_MEMBERS_LIMIT
       return render_json_error(
-        I18n.t("groups.errors.adding_too_many_users", limit: ADD_MEMBERS_LIMIT)
+        I18n.t("groups.errors.adding_too_many_users", count: ADD_MEMBERS_LIMIT)
       )
     end
+
     usernames_already_in_group = group.users.where(id: users.map(&:id)).pluck(:username)
     if usernames_already_in_group.present? &&
       usernames_already_in_group.length == users.length &&
@@ -366,7 +368,7 @@ class GroupsController < ApplicationController
       end
 
       emails.each do |email|
-        Invite.invite_by_email(email, current_user, nil, [group.id])
+        Invite.generate(current_user, email: email, group_ids: [group.id])
       end
 
       render json: success_json.merge!(
@@ -579,6 +581,10 @@ class GroupsController < ApplicationController
           messageable_level
           default_notification_level
           bio_raw
+          flair_icon
+          flair_upload_id
+          flair_bg_color
+          flair_color
         }
       else
         default_params = %i{
@@ -616,7 +622,8 @@ class GroupsController < ApplicationController
             :name,
             :grant_trust_level,
             :automatic_membership_email_domains,
-            :publish_read_state
+            :publish_read_state,
+            :allow_unknown_sender_topic_replies
           ])
 
           custom_fields = DiscoursePluginRegistry.editable_group_custom_fields
diff --git a/app/controllers/highlight_js_controller.rb b/app/controllers/highlight_js_controller.rb
index 768c4e7286..655bafd9e8 100644
--- a/app/controllers/highlight_js_controller.rb
+++ b/app/controllers/highlight_js_controller.rb
@@ -3,6 +3,8 @@
 class HighlightJsController < ApplicationController
   skip_before_action :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show]
 
+  before_action :apply_cdn_headers, only: [:show]
+
   def show
 
     no_cookies
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index fb4723c21f..722fa3572e 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -1,166 +1,194 @@
 # frozen_string_literal: true
 
+require 'csv'
+
 class InvitesController < ApplicationController
 
-  requires_login only: [
-    :destroy, :create, :create_invite_link, :rescind_all_invites,
-    :resend_invite, :resend_all_invites, :upload_csv
-  ]
+  requires_login only: [:create, :retrieve, :destroy, :destroy_all_expired, :resend_invite, :resend_all_invites, :upload_csv]
 
   skip_before_action :check_xhr, except: [:perform_accept_invitation]
   skip_before_action :preload_json, except: [:show]
   skip_before_action :redirect_to_login_if_required
 
+  before_action :ensure_invites_allowed, only: [:show, :perform_accept_invitation]
   before_action :ensure_new_registrations_allowed, only: [:show, :perform_accept_invitation]
   before_action :ensure_not_logged_in, only: [:show, :perform_accept_invitation]
 
   def show
     expires_now
 
+    RateLimiter.new(nil, "invites-show-#{request.remote_ip}", 100, 1.minute).performed!
+
     invite = Invite.find_by(invite_key: params[:id])
-    if invite.present? && !invite.expired? && !invite.redeemed?
-      store_preloaded("invite_info", MultiJson.dump(
+    if invite.present? && invite.redeemable?
+      email = Email.obfuscate(invite.email)
+
+      # Show email if the user already authenticated their email
+      if session[:authentication]
+        auth_result = Auth::Result.from_session_data(session[:authentication], user: nil)
+        if invite.email == auth_result.email
+          email = invite.email
+        end
+      end
+
+      hidden_email = email != invite.email
+
+      info = {
         invited_by: UserNameSerializer.new(invite.invited_by, scope: guardian, root: false),
-        email: invite.email,
-        username: UserNameSuggester.suggest(invite.email),
-        is_invite_link: invite.is_invite_link?)
-      )
+        email: email,
+        hidden_email: hidden_email,
+        username: hidden_email ? '' : UserNameSuggester.suggest(invite.email),
+        is_invite_link: invite.is_invite_link?
+      }
+
+      if staged_user = User.where(staged: true).with_email(invite.email).first
+        info[:user_fields] = staged_user.user_fields
+      end
+
+      store_preloaded("invite_info", MultiJson.dump(info))
+
+      secure_session["invite-key"] = invite.invite_key
 
       render layout: 'application'
     else
-      flash.now[:error] = if invite.present? && invite.expired?
-        I18n.t('invite.expired', base_url: Discourse.base_url)
-      elsif invite.present? && invite.redeemed?
-        I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url)
-      else
+      flash.now[:error] = if invite.blank?
         I18n.t('invite.not_found', base_url: Discourse.base_url)
+      elsif invite.redeemed?
+        if invite.is_invite_link?
+          I18n.t('invite.not_found_template_link', site_name: SiteSetting.title, base_url: Discourse.base_url)
+        else
+          I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url)
+        end
+      elsif invite.expired?
+        I18n.t('invite.expired', base_url: Discourse.base_url)
       end
+
       render layout: 'no_ember'
     end
-  end
-
-  def perform_accept_invitation
-    params.require(:id)
-    params.permit(:email, :username, :name, :password, :timezone, user_custom_fields: {})
-    invite = Invite.find_by(invite_key: params[:id])
-
-    if invite.present?
-      begin
-        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
-
-        if user.present? && user.active?
-          topic = invite.topics.first
-          response[:redirect_to] = topic.present? ? path("#{topic.relative_url}") : path("/")
-        elsif user.present?
-          response[:message] = I18n.t('invite.confirm_email')
-        end
-
-        render json: response
-      rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
-        render json: {
-          success: false,
-          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') }
-    end
+  rescue RateLimiter::LimitExceeded => e
+    flash.now[:error] = e.description
+    render layout: 'no_ember'
   end
 
   def create
-    params.require(:email)
-
-    groups = Group.lookup_groups(
-      group_ids: params[:group_ids],
-      group_names: params[:group_names]
-    )
-
-    guardian.ensure_can_invite_to_forum!(groups)
-    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 params[:topic_id].present?
+      topic = Topic.find_by(id: params[:topic_id])
+      raise Discourse::InvalidParameters.new(:topic_id) if topic.blank?
+      guardian.ensure_can_invite_to!(topic)
     end
 
+    if params[:group_ids].present? || params[:group_names].present?
+      groups = Group.lookup_groups(group_ids: params[:group_ids], group_names: params[:group_names])
+    end
+
+    guardian.ensure_can_invite_to_forum!(groups)
+
     begin
-      if Invite.invite_by_email(params[:email], current_user, nil, group_ids, params[:custom_message])
-        render json: success_json
+      invite = Invite.generate(current_user,
+        email: params[:email],
+        skip_email: params[:skip_email],
+        invited_by: current_user,
+        custom_message: params[:custom_message],
+        max_redemptions_allowed: params[:max_redemptions_allowed],
+        topic_id: topic&.id,
+        group_ids: groups&.map(&:id),
+        expires_at: params[:expires_at],
+      )
+
+      if invite.present?
+        render_serialized(invite, InviteSerializer, scope: guardian, root: nil, show_emails: params.has_key?(:email))
       else
         render json: failed_json, status: 422
       end
-    rescue Invite::UserExists, ActiveRecord::RecordInvalid => e
-      render json: { errors: [e.message] }, status: 422
+    rescue Invite::UserExists => e
+      render_json_error(e.message)
+    rescue ActiveRecord::RecordInvalid => e
+      render_json_error(e.record.errors.full_messages.first)
     end
   end
 
-  def create_invite_link
-    params.permit(:email, :max_redemptions_allowed, :expires_at, :group_ids, :group_names, :topic_id)
+  def retrieve
+    params.require(:email)
 
-    is_single_invite = params[:email].present?
-    unless is_single_invite
-      guardian.ensure_can_send_invite_links!(current_user)
+    invite = Invite.find_by(invited_by: current_user, email: params[:email])
+    raise Discourse::InvalidParameters.new(:email) if invite.blank?
+
+    guardian.ensure_can_invite_to_forum!(nil)
+
+    render_serialized(invite, InviteSerializer, scope: guardian, root: nil, show_emails: params.has_key?(:email))
+  end
+
+  def update
+    invite = Invite.find_by(invited_by: current_user, id: params[:id])
+    raise Discourse::InvalidParameters.new(:id) if invite.blank?
+
+    if params[:topic_id].present?
+      topic = Topic.find_by(id: params[:topic_id])
+      raise Discourse::InvalidParameters.new(:topic_id) if topic.blank?
+      guardian.ensure_can_invite_to!(topic)
     end
 
-    groups = Group.lookup_groups(
-      group_ids: params[:group_ids],
-      group_names: params[:group_names]
-    )
-    if !guardian.can_invite_to_forum?(groups)
-      raise StandardError.new I18n.t("invite.cant_invite_to_group")
+    if params[:group_ids].present? || params[:group_names].present?
+      groups = Group.lookup_groups(group_ids: params[:group_ids], group_names: params[:group_names])
     end
-    group_ids = groups.map(&:id)
 
-    if is_single_invite
-      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
+    guardian.ensure_can_invite_to_forum!(groups)
+
+    Invite.transaction do
+      if params.has_key?(:topic_id)
+        invite.topic_invites.destroy_all
+        invite.topic_invites.create!(topic_id: topic.id) if topic.present?
       end
 
-      if params[:topic_id].present?
-        topic = Topic.find_by(id: params[:topic_id])
+      if params.has_key?(:group_ids) || params.has_key?(:group_names)
+        invite.invited_groups.destroy_all
+        groups.each { |group| invite.invited_groups.find_or_create_by!(group_id: group.id) } if groups.present?
+      end
 
-        if topic.present?
-          guardian.ensure_can_invite_to!(topic)
-        else
-          raise Discourse::InvalidParameters.new(:topic_id)
+      if params.has_key?(:email)
+        old_email = invite.email.presence
+        new_email = params[:email].presence
+
+        if new_email
+          if Invite.where.not(id: invite.id).find_by(email: new_email.downcase, invited_by_id: current_user.id)&.redeemable?
+            return render_json_error(I18n.t("invite.invite_exists", email: new_email), status: 409)
+          end
+        end
+
+        if old_email != new_email
+          invite.emailed_status = if new_email && !params[:skip_email]
+            Invite.emailed_status_types[:pending]
+          else
+            Invite.emailed_status_types[:not_required]
+          end
         end
       end
+
+      if params[:send_email]
+        if invite.emailed_status != Invite.emailed_status_types[:pending]
+          begin
+            RateLimiter.new(current_user, "resend-invite-per-hour", 10, 1.hour).performed!
+          rescue RateLimiter::LimitExceeded
+            return render_json_error(I18n.t("rate_limiter.slow_down"))
+          end
+        end
+
+        invite.emailed_status = Invite.emailed_status_types[:pending]
+      end
+
+      begin
+        invite.update!(params.permit(:email, :custom_message, :max_redemptions_allowed, :expires_at))
+      rescue ActiveRecord::RecordInvalid => e
+        return render_json_error(e.record.errors.full_messages.first)
+      end
     end
 
-    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
-      )
+    if invite.emailed_status == Invite.emailed_status_types[:pending]
+      invite.update_column(:emailed_status, Invite.emailed_status_types[:sending])
+      Jobs.enqueue(:invite_email, invite_id: invite.id, invite_to_topic: params[:invite_to_topic])
     end
-    if invite_link.present?
-      render_json_dump(invite_link)
-    else
-      render json: failed_json, status: 422
-    end
-  rescue => e
-    render json: { errors: [e.message] }, status: 422
+
+    render_serialized(invite, InviteSerializer, scope: guardian, root: nil, show_emails: params.has_key?(:email))
   end
 
   def destroy
@@ -168,15 +196,76 @@ class InvitesController < ApplicationController
 
     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 json: success_json
   end
 
-  def rescind_all_invites
-    guardian.ensure_can_rescind_all_invites!(current_user)
+  # For DiscourseConnect SSO, all invite acceptance is done
+  # via the SessionController#sso_login route
+  def perform_accept_invitation
+    params.require(:id)
+    params.permit(:email, :username, :name, :password, :timezone, :email_token, user_custom_fields: {})
+
+    invite = Invite.find_by(invite_key: params[:id])
+
+    if invite.present?
+      begin
+        attrs = {
+          username: params[:username],
+          name: params[:name],
+          password: params[:password],
+          user_custom_fields: params[:user_custom_fields],
+          ip_address: request.remote_ip,
+          session: session
+        }
+
+        if invite.is_invite_link?
+          params.require(:email)
+          attrs[:email] = params[:email]
+        else
+          attrs[:email] = invite.email
+          attrs[:email_token] = params[:email_token] if params[:email_token].present?
+        end
+
+        user = invite.redeem(**attrs)
+      rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved, Invite::UserExists => e
+        return render json: failed_json.merge(message: e.message), status: 412
+      end
+
+      if user.blank?
+        return render json: failed_json.merge(message: I18n.t('invite.not_found_json')), status: 404
+      end
+
+      log_on_user(user) if user.active?
+      user.update_timezone_if_missing(params[:timezone])
+      post_process_invite(user)
+
+      topic = invite.topics.first
+      response = {}
+
+      if user.present? && user.active?
+        response[:redirect_to] = topic.present? ? path(topic.relative_url) : path("/")
+      elsif user.present?
+        response[:message] = I18n.t('invite.confirm_email')
+        cookies[:destination_url] = path(topic.relative_url) if topic.present?
+      end
+
+      render json: success_json.merge(response)
+    else
+      render json: failed_json.merge(message: I18n.t('invite.not_found_json')), status: 404
+    end
+  end
+
+  def destroy_all_expired
+    guardian.ensure_can_destroy_all_invites!(current_user)
+
+    Invite
+      .where(invited_by: current_user)
+      .where('expires_at < ?', Time.zone.now)
+      .find_each { |invite| invite.trash!(current_user) }
 
-    Invite.rescind_all_expired_invites_from(current_user)
     render json: success_json
   end
 
@@ -188,7 +277,6 @@ class InvitesController < ApplicationController
     raise Discourse::InvalidParameters.new(:email) if invite.blank?
     invite.resend_invite
     render json: success_json
-
   rescue RateLimiter::LimitExceeded
     render_json_error(I18n.t("rate_limiter.slow_down"))
   end
@@ -196,52 +284,66 @@ class InvitesController < ApplicationController
   def resend_all_invites
     guardian.ensure_can_resend_all_invites!(current_user)
 
-    Invite.resend_all_invites_from(current_user.id)
+    Invite
+      .left_outer_joins(:invited_users)
+      .where(invited_by: current_user)
+      .where('invites.email IS NOT NULL')
+      .where('invited_users.user_id IS NULL')
+      .group('invites.id')
+      .find_each { |invite| invite.resend_invite }
+
     render json: success_json
   end
 
   def upload_csv
-    require 'csv'
-
     guardian.ensure_can_bulk_invite_to_forum!(current_user)
 
     hijack do
       begin
         file = params[:file] || params[:files].first
 
-        count = 0
+        csv_header = nil
         invites = []
-        max_bulk_invites = SiteSetting.max_bulk_invites
-        CSV.foreach(file.tempfile) do |row|
-          count += 1
-          invites.push(email: row[0], groups: row[1], topic_id: row[2]) if row[0].present?
-          break if count >= max_bulk_invites
+
+        CSV.foreach(file.tempfile, encoding: "bom|utf-8") do |row|
+          # Try to extract a CSV header, if it exists
+          if csv_header.nil?
+            if row[0] == 'email'
+              csv_header = row
+              next
+            else
+              csv_header = ["email", "groups", "topic_id"]
+            end
+          end
+
+          if row[0].present?
+            invites.push(csv_header.zip(row).map.to_h.filter { |k, v| v.present? })
+          end
+
+          break if invites.count >= SiteSetting.max_bulk_invites
         end
 
         if invites.present?
           Jobs.enqueue(:bulk_invite, invites: invites, current_user_id: current_user.id)
-          if count >= max_bulk_invites
-            render json: failed_json.merge(errors: [I18n.t("bulk_invite.max_rows", max_bulk_invites: max_bulk_invites)]), status: 422
+
+          if invites.count >= SiteSetting.max_bulk_invites
+            render json: failed_json.merge(errors: [I18n.t("bulk_invite.max_rows", max_bulk_invites: SiteSetting.max_bulk_invites)]), status: 422
           else
             render json: success_json
           end
         else
           render json: failed_json.merge(errors: [I18n.t("bulk_invite.error")]), status: 422
         end
-      rescue
-        render json: failed_json.merge(errors: [I18n.t("bulk_invite.error")]), status: 422
       end
     end
   end
 
-  def fetch_username
-    params.require(:username)
-    params[:username]
-  end
+  private
 
-  def fetch_email
-    params.require(:email)
-    params[:email]
+  def ensure_invites_allowed
+    if (!SiteSetting.enable_local_logins && Discourse.enabled_auth_providers.count == 0 && !SiteSetting.enable_discourse_connect)
+      raise Discourse::NotFound
+    end
   end
 
   def ensure_new_registrations_allowed
@@ -260,8 +362,6 @@ class InvitesController < ApplicationController
     end
   end
 
-  private
-
   def post_process_invite(user)
     user.enqueue_welcome_message('welcome_invite') if user.send_welcome_message
 
@@ -269,7 +369,7 @@ class InvitesController < ApplicationController
 
     if user.has_password?
       send_activation_email(user) unless user.active
-    elsif !SiteSetting.enable_sso && SiteSetting.enable_local_logins
+    elsif !SiteSetting.enable_discourse_connect && SiteSetting.enable_local_logins
       Jobs.enqueue(:invite_password_instructions_email, username: user.username)
     end
   end
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 910e2ed5d8..f9f41f3d06 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -62,7 +62,7 @@ class ListController < ApplicationController
         if @category.id == SiteSetting.shared_drafts_category.to_i
           # On shared drafts, show the destination category
           list.topics.each do |t|
-            t.includes_destination_category = true
+            t.includes_destination_category = t.shared_draft.present?
           end
         else
           # When viewing a non-shared draft category, find topics whose
@@ -153,7 +153,7 @@ class ListController < ApplicationController
       end
     when :private_messages_group, :private_messages_group_archive
       define_method("#{action}") do
-        group = Group.find_by(name: params[:group_name])
+        group = Group.find_by("LOWER(name) = ?", params[:group_name].downcase)
         raise Discourse::NotFound if !group
         raise Discourse::NotFound unless guardian.can_see_group_messages?(group)
 
@@ -360,7 +360,7 @@ class ListController < ApplicationController
       current_slug = current_slug.split("/").map { |slug| CGI.escape(slug) }.join("/")
     end
     real_slug = @category.full_slug("/")
-    if current_slug != real_slug
+    if CGI.unescape(current_slug) != CGI.unescape(real_slug)
       url = request.fullpath.gsub(current_slug, real_slug)
       if ActionController::Base.config.relative_url_root
         url = url.sub(ActionController::Base.config.relative_url_root, "")
diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index 594fcab99a..47213031d9 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -11,7 +11,7 @@ class MetadataController < ApplicationController
 
   def opensearch
     expires_in 1.minutes
-    render template: "metadata/opensearch.xml"
+    render template: "metadata/opensearch", formats: [:xml]
   end
 
   def app_association_android
@@ -44,6 +44,7 @@ class MetadataController < ApplicationController
     manifest = {
       name: SiteSetting.title,
       short_name: SiteSetting.short_title.presence || SiteSetting.title.truncate(12, separator: ' ', omission: ''),
+      description: SiteSetting.site_description,
       display: display,
       start_url: Discourse.base_path.present? ? "#{Discourse.base_path}/" : '.',
       background_color: "##{ColorScheme.hex_for_name('secondary', scheme_id)}",
@@ -87,7 +88,7 @@ class MetadataController < ApplicationController
         {
           name: I18n.t('js.user.bookmarks'),
           short_name: I18n.t('js.user.bookmarks'),
-          url: "#{Discourse.base_path}/my/bookmarks",
+          url: "#{Discourse.base_path}/my/activity/bookmarks",
           icons: [
             {
               src: "#{icon_url_base}/bookmark.svg",
@@ -123,6 +124,21 @@ class MetadataController < ApplicationController
       manifest[:icons] << icon_entry
     end
 
+    SiteSetting.manifest_screenshots.split('|').each do |image|
+      next unless Discourse.store.has_been_uploaded?(image)
+
+      upload = Upload.find_by(sha1: Upload.extract_sha1(image))
+      next if upload.nil?
+
+      manifest[:screenshots] = [] if manifest.dig(:screenshots).nil?
+
+      manifest[:screenshots] << {
+        src: UrlHelper.absolute(image),
+        sizes: "#{upload.width}x#{upload.height}",
+        type: "image/#{upload.extension}"
+      }
+    end
+
     if current_user && current_user.trust_level >= 1 && SiteSetting.native_app_install_banner_android
       manifest = manifest.merge(
         prefer_related_applications: true,
diff --git a/app/controllers/post_actions_controller.rb b/app/controllers/post_actions_controller.rb
index 594c7062ce..9e75797044 100644
--- a/app/controllers/post_actions_controller.rb
+++ b/app/controllers/post_actions_controller.rb
@@ -16,7 +16,8 @@ class PostActionsController < ApplicationController
       is_warning: params[:is_warning],
       message: params[:message],
       take_action: params[:take_action] == 'true',
-      flag_topic: params[:flag_topic] == 'true'
+      flag_topic: params[:flag_topic] == 'true',
+      queue_for_review: params[:queue_for_review] == 'true'
     )
     result = creator.perform
 
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index cfb25ee909..981bd70621 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -208,6 +208,10 @@ class PostsController < ApplicationController
       edit_reason: params[:post][:edit_reason]
     }
 
+    Post.plugin_permitted_update_params.keys.each do |param|
+      changes[param] = params[:post][param]
+    end
+
     raw_old = params[:post][:raw_old]
     if raw_old.present? && raw_old != post.raw
       return render_json_error(I18n.t('edit_conflict'), status: 409)
@@ -299,13 +303,13 @@ class PostsController < ApplicationController
 
   def destroy
     post = find_post_from_params
+    guardian.ensure_can_delete!(post)
+
     unless guardian.can_moderate_topic?(post.topic)
       RateLimiter.new(current_user, "delete_post_per_min", SiteSetting.max_post_deletions_per_minute, 1.minute).performed!
       RateLimiter.new(current_user, "delete_post_per_day", SiteSetting.max_post_deletions_per_day, 1.day).performed!
     end
 
-    guardian.ensure_can_delete!(post)
-
     destroyer = PostDestroyer.new(current_user, post, context: params[:context])
     destroyer.destroy
 
@@ -320,11 +324,13 @@ class PostsController < ApplicationController
 
   def recover
     post = find_post_from_params
+    guardian.ensure_can_recover_post!(post)
+
     unless guardian.can_moderate_topic?(post.topic)
       RateLimiter.new(current_user, "delete_post_per_min", SiteSetting.max_post_deletions_per_minute, 1.minute).performed!
       RateLimiter.new(current_user, "delete_post_per_day", SiteSetting.max_post_deletions_per_day, 1.day).performed!
     end
-    guardian.ensure_can_recover_post!(post)
+
     destroyer = PostDestroyer.new(current_user, post)
     destroyer.recover
     post.reload
@@ -357,6 +363,8 @@ class PostsController < ApplicationController
     raise Discourse::InvalidParameters.new(:post_ids) if posts.pluck(:id) == params[:post_ids]
     PostMerger.new(current_user, posts).merge
     render body: nil
+  rescue PostMerger::CannotMergeError => e
+    render_json_error(e.message)
   end
 
   # Direct replies to this post
diff --git a/app/controllers/qunit_controller.rb b/app/controllers/qunit_controller.rb
index f042d0a634..8bb951b0fa 100644
--- a/app/controllers/qunit_controller.rb
+++ b/app/controllers/qunit_controller.rb
@@ -1,11 +1,62 @@
 # frozen_string_literal: true
 
 class QunitController < ApplicationController
-  skip_before_action :check_xhr, :preload_json, :redirect_to_login_if_required
+  skip_before_action *%i{
+    check_xhr
+    preload_json
+    redirect_to_login_if_required
+  }
   layout false
 
   # only used in test / dev
   def index
     raise Discourse::InvalidAccess.new if Rails.env.production?
   end
+
+  def theme
+    raise Discourse::NotFound.new if !can_see_theme_qunit?
+
+    param_key = nil
+    @suggested_themes = nil
+    if (id = get_param(:id)).present?
+      theme = Theme.find_by(id: id.to_i)
+      param_key = :id
+    elsif (name = get_param(:name)).present?
+      theme = Theme.find_by(name: name)
+      param_key = :name
+    elsif (url = get_param(:url)).present?
+      theme = RemoteTheme.find_by(remote_url: url)&.theme
+      param_key = :url
+    end
+
+    if param_key && theme.blank?
+      return render plain: "Can't find theme with #{param_key} #{params[param_key].inspect}", status: :not_found
+    end
+
+    if !param_key
+      @suggested_themes = Theme
+        .where(
+          id: ThemeField.where(target_id: Theme.targets[:tests_js]).distinct.pluck(:theme_id)
+        )
+        .order(updated_at: :desc)
+        .pluck(:id, :name)
+      return
+    end
+
+    request.env[:resolved_theme_ids] = [theme.id]
+    request.env[:skip_theme_ids_transformation] = true
+  end
+
+  protected
+
+  def can_see_theme_qunit?
+    return true if !Rails.env.production?
+    current_user&.admin?
+  end
+
+  private
+
+  def get_param(key)
+    params[:"theme_#{key}"] || params[key]
+  end
 end
diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rb
index 65de25b429..f9249991b0 100644
--- a/app/controllers/reviewables_controller.rb
+++ b/app/controllers/reviewables_controller.rb
@@ -24,13 +24,14 @@ class ReviewablesController < ApplicationController
     custom_keys = Reviewable.custom_filters.map(&:first)
     additional_filters = JSON.parse(params.fetch(:additional_filters, {}), symbolize_names: true).slice(*custom_keys)
     filters = {
+      ids: params[:ids],
       status: status,
       category_id: category_id,
       topic_id: topic_id,
       additional_filters: additional_filters.reject { |_, v| v.blank? }
     }
 
-    %i[priority username from_date to_date type sort_order].each do |filter_key|
+    %i[priority username reviewed_by from_date to_date type sort_order].each do |filter_key|
       filters[filter_key] = params[filter_key]
     end
 
@@ -189,10 +190,21 @@ class ReviewablesController < ApplicationController
         return render_json_error(error)
       end
 
+      args.merge!(reject_reason: params[:reject_reason], send_email: params[:send_email] != "false") if reviewable.type == 'ReviewableUser'
+
+      plugin_params = DiscoursePluginRegistry.reviewable_params.select do |reviewable_param|
+        reviewable.type == reviewable_param[:type].to_s.classify
+      end
+      args.merge!(params.slice(*plugin_params.map { |pp| pp[:param] }).permit!)
+
       result = reviewable.perform(current_user, params[:action_id].to_sym, args)
     rescue Reviewable::InvalidAction => e
-      # Consider InvalidAction an InvalidAccess
-      raise Discourse::InvalidAccess.new(e.message)
+      if reviewable.type == 'ReviewableUser' && !reviewable.pending? && reviewable.target.blank?
+        raise Discourse::NotFound.new(e.message, custom_message: "reviewables.already_handled_and_user_not_exist")
+      else
+        # Consider InvalidAction an InvalidAccess
+        raise Discourse::InvalidAccess.new(e.message)
+      end
     rescue Reviewable::UpdateConflict
       return render_json_error(I18n.t('reviewables.conflict'), status: 409)
     end
diff --git a/app/controllers/robots_txt_controller.rb b/app/controllers/robots_txt_controller.rb
index 7de07939a0..ad9b8e5e8c 100644
--- a/app/controllers/robots_txt_controller.rb
+++ b/app/controllers/robots_txt_controller.rb
@@ -8,17 +8,27 @@ class RobotsTxtController < ApplicationController
 
   # NOTE: order is important!
   DISALLOWED_PATHS ||= %w{
+    /admin/
     /auth/
     /assets/browser-update*.js
     /email/
     /session
-    /session/
     /user-api-key
-    /user-api-key/
     /*?api_key*
     /*?*api_key*
   }
 
+  DISALLOWED_WITH_HEADER_PATHS ||= %w{
+    /badges
+    /u/
+    /my
+    /search
+    /tag/*/l
+    /g
+    /t/*/*.rss
+    /c/*.rss
+  }
+
   def index
     if (overridden = SiteSetting.overridden_robots_txt.dup).present?
       overridden.prepend(OVERRIDDEN_HEADER) if guardian.is_admin? && !is_api?
@@ -45,7 +55,8 @@ class RobotsTxtController < ApplicationController
   end
 
   def self.fetch_default_robots_info
-    deny_paths = DISALLOWED_PATHS.map { |p| Discourse.base_path + p }
+    deny_paths_googlebot = DISALLOWED_PATHS.map { |p| Discourse.base_path + p }
+    deny_paths = deny_paths_googlebot + DISALLOWED_WITH_HEADER_PATHS.map { |p| Discourse.base_path + p }
     deny_all = [ "#{Discourse.base_path}/" ]
 
     result = {
@@ -55,17 +66,22 @@ class RobotsTxtController < ApplicationController
 
     if SiteSetting.allowed_crawler_user_agents.present?
       SiteSetting.allowed_crawler_user_agents.split('|').each do |agent|
-        result[:agents] << { name: agent, disallow: deny_paths }
+        paths = agent == "Googlebot" ? deny_paths_googlebot : deny_paths
+        result[:agents] << { name: agent, disallow: paths }
       end
 
       result[:agents] << { name: '*', disallow: deny_all }
-    elsif SiteSetting.blocked_crawler_user_agents.present?
-      result[:agents] << { name: '*', disallow: deny_paths }
-      SiteSetting.blocked_crawler_user_agents.split('|').each do |agent|
-        result[:agents] << { name: agent, disallow: deny_all }
-      end
     else
+
+      if SiteSetting.blocked_crawler_user_agents.present?
+        SiteSetting.blocked_crawler_user_agents.split('|').each do |agent|
+          result[:agents] << { name: agent, disallow: deny_all }
+        end
+      end
+
       result[:agents] << { name: '*', disallow: deny_paths }
+
+      result[:agents] << { name: 'Googlebot', disallow: deny_paths_googlebot }
     end
 
     if SiteSetting.slow_down_crawler_user_agents.present?
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 4a1013dda5..ffd938165a 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -24,9 +24,9 @@ class SessionController < ApplicationController
     session.delete(:destination_url)
     cookies.delete(:destination_url)
 
-    if SiteSetting.enable_sso?
+    if SiteSetting.enable_discourse_connect?
       sso = DiscourseSingleSignOn.generate_sso(return_path, secure_session: secure_session)
-      if SiteSetting.verbose_sso_logging
+      if SiteSetting.verbose_discourse_connect_logging
         Rails.logger.warn("Verbose SSO log: Started SSO process\n\n#{sso.diagnostics}")
       end
       redirect_to sso_url(sso)
@@ -36,7 +36,7 @@ class SessionController < ApplicationController
   end
 
   def sso_provider(payload = nil)
-    if SiteSetting.enable_sso_provider
+    if SiteSetting.enable_discourse_connect_provider
       begin
         if !payload
           params.require(:sso)
@@ -44,15 +44,15 @@ class SessionController < ApplicationController
         end
         sso = SingleSignOnProvider.parse(payload)
       rescue SingleSignOnProvider::BlankSecret
-        render plain: I18n.t("sso.missing_secret"), status: 400
+        render plain: I18n.t("discourse_connect.missing_secret"), status: 400
         return
       rescue SingleSignOnProvider::ParseError => e
-        if SiteSetting.verbose_sso_logging
+        if SiteSetting.verbose_discourse_connect_logging
           Rails.logger.warn("Verbose SSO log: Signature parse error\n\n#{e.message}\n\n#{sso&.diagnostics}")
         end
 
         # Do NOT pass the error text to the client, it would give them the correct signature
-        render plain: I18n.t("sso.login_error"), status: 422
+        render plain: I18n.t("discourse_connect.login_error"), status: 422
         return
       end
 
@@ -138,7 +138,7 @@ class SessionController < ApplicationController
   end
 
   def sso_login
-    raise Discourse::NotFound.new unless SiteSetting.enable_sso
+    raise Discourse::NotFound.new unless SiteSetting.enable_discourse_connect
 
     params.require(:sso)
     params.require(:sig)
@@ -146,32 +146,34 @@ class SessionController < ApplicationController
     begin
       sso = DiscourseSingleSignOn.parse(request.query_string, secure_session: secure_session)
     rescue DiscourseSingleSignOn::ParseError => e
-      if SiteSetting.verbose_sso_logging
+      if SiteSetting.verbose_discourse_connect_logging
         Rails.logger.warn("Verbose SSO log: Signature parse error\n\n#{e.message}\n\n#{sso&.diagnostics}")
       end
 
       # Do NOT pass the error text to the client, it would give them the correct signature
-      return render_sso_error(text: I18n.t("sso.login_error"), status: 422)
+      return render_sso_error(text: I18n.t("discourse_connect.login_error"), status: 422)
     end
 
     if !sso.nonce_valid?
-      if SiteSetting.verbose_sso_logging
+      if SiteSetting.verbose_discourse_connect_logging
         Rails.logger.warn("Verbose SSO log: Nonce has already expired\n\n#{sso.diagnostics}")
       end
-      return render_sso_error(text: I18n.t("sso.timeout_expired"), status: 419)
+      return render_sso_error(text: I18n.t("discourse_connect.timeout_expired"), status: 419)
     end
 
     if ScreenedIpAddress.should_block?(request.remote_ip)
-      if SiteSetting.verbose_sso_logging
+      if SiteSetting.verbose_discourse_connect_logging
         Rails.logger.warn("Verbose SSO log: IP address is blocked #{request.remote_ip}\n\n#{sso.diagnostics}")
       end
-      return render_sso_error(text: I18n.t("sso.unknown_error"), status: 500)
+      return render_sso_error(text: I18n.t("discourse_connect.unknown_error"), status: 500)
     end
 
     return_path = sso.return_path
     sso.expire_nonce!
 
     begin
+      invite = validate_invitiation!(sso)
+
       if user = sso.lookup_or_create_user(request.remote_ip)
 
         if user.suspended?
@@ -179,25 +181,38 @@ class SessionController < ApplicationController
           return
         end
 
-        if SiteSetting.must_approve_users? && !user.approved?
-          if SiteSetting.sso_not_approved_url.present?
-            redirect_to SiteSetting.sso_not_approved_url
+        # users logging in via SSO using an invite do not need to be approved,
+        # they are already pre-approved because they have been invited
+        if SiteSetting.must_approve_users? && !user.approved? && invite.blank?
+          if SiteSetting.discourse_connect_not_approved_url.present?
+            redirect_to SiteSetting.discourse_connect_not_approved_url
           else
-            render_sso_error(text: I18n.t("sso.account_not_approved"), status: 403)
+            render_sso_error(text: I18n.t("discourse_connect.account_not_approved"), status: 403)
           end
           return
+
+        # we only want to redeem the invite if
+        # the user has not already redeemed an invite
+        # (covers the same SSO user visiting an invite link)
+        elsif invite.present? && user.invited_user.blank?
+          redeem_invitation(invite, sso)
+
+          # we directly call user.activate here instead of going
+          # through the UserActivator path because we assume the account
+          # is valid from the SSO provider's POV and do not need to
+          # send an activation email to the user
+          user.activate
+          login_sso_user(sso, user)
+
+          topic = invite.topics.first
+          return_path = topic.present? ? path(topic.relative_url) : path("/")
         elsif !user.active?
           activation = UserActivator.new(user, request, session, cookies)
           activation.finish
           session["user_created_message"] = activation.message
-          redirect_to(users_account_created_path) && (return)
+          return redirect_to(users_account_created_path)
         else
-          if SiteSetting.verbose_sso_logging
-            Rails.logger.warn("Verbose SSO log: User was logged on #{user.username}\n\n#{sso.diagnostics}")
-          end
-          if user.id != current_user&.id
-            log_on_user user
-          end
+          login_sso_user(sso, user)
         end
 
         # If it's not a relative URL check the host
@@ -206,7 +221,7 @@ class SessionController < ApplicationController
             uri = URI(return_path)
             if (uri.hostname == Discourse.current_hostname)
               return_path = uri.to_s
-            elsif !SiteSetting.sso_allows_all_return_paths
+            elsif !SiteSetting.discourse_connect_allows_all_return_paths
               return_path = path("/")
             end
           rescue
@@ -223,11 +238,11 @@ class SessionController < ApplicationController
 
         redirect_to return_path
       else
-        render_sso_error(text: I18n.t("sso.not_found"), status: 500)
+        render_sso_error(text: I18n.t("discourse_connect.not_found"), status: 500)
       end
     rescue ActiveRecord::RecordInvalid => e
 
-      if SiteSetting.verbose_sso_logging
+      if SiteSetting.verbose_discourse_connect_logging
         Rails.logger.warn(<<~EOF)
         Verbose SSO log: Record was invalid: #{e.record.class.name} #{e.record.id}
         #{e.record.errors.to_h}
@@ -245,18 +260,21 @@ class SessionController < ApplicationController
       # If there's a problem with the email we can explain that
       if (e.record.is_a?(User) && e.record.errors[:primary_email].present?)
         if e.record.email.blank?
-          text = I18n.t("sso.no_email")
+          text = I18n.t("discourse_connect.no_email")
         else
-          text = I18n.t("sso.email_error", email: ERB::Util.html_escape(e.record.email))
+          text = I18n.t("discourse_connect.email_error", email: ERB::Util.html_escape(e.record.email))
         end
       end
 
-      render_sso_error(text: text || I18n.t("sso.unknown_error"), status: 500)
-
+      render_sso_error(text: text || I18n.t("discourse_connect.unknown_error"), status: 500)
     rescue DiscourseSingleSignOn::BlankExternalId
-
-      render_sso_error(text: I18n.t("sso.blank_id_error"), status: 500)
-
+      render_sso_error(text: I18n.t("discourse_connect.blank_id_error"), status: 500)
+    rescue Invite::ValidationFailed => e
+      render_sso_error(text: e.message, status: 400)
+    rescue Invite::RedemptionFailed => e
+      render_sso_error(text: I18n.t("discourse_connect.invite_redeem_failed"), status: 412)
+    rescue Invite::UserExists => e
+      render_sso_error(text: e.message, status: 412)
     rescue => e
       message = +"Failed to create or lookup user: #{e}."
       message << "  "
@@ -266,10 +284,17 @@ class SessionController < ApplicationController
 
       Rails.logger.error(message)
 
-      render_sso_error(text: I18n.t("sso.unknown_error"), status: 500)
+      render_sso_error(text: I18n.t("discourse_connect.unknown_error"), status: 500)
     end
   end
 
+  def login_sso_user(sso, user)
+    if SiteSetting.verbose_discourse_connect_logging
+      Rails.logger.warn("Verbose SSO log: User was logged on #{user.username}\n\n#{sso.diagnostics}")
+    end
+    log_on_user(user) if user.id != current_user&.id
+  end
+
   def create
     params.require(:login)
     params.require(:password)
@@ -445,9 +470,9 @@ class SessionController < ApplicationController
   def destroy
     redirect_url = params[:return_url].presence || SiteSetting.logout_redirect.presence
 
-    sso = SiteSetting.enable_sso
+    sso = SiteSetting.enable_discourse_connect
     only_one_authenticator = !SiteSetting.enable_local_logins && Discourse.enabled_authenticators.length == 1
-    if sso || only_one_authenticator
+    if SiteSetting.login_required && (sso || only_one_authenticator)
       # In this situation visiting most URLs will start the auth process again
       # Go to the `/login` page to avoid an immediate redirect
       redirect_url ||= path("/login")
@@ -498,7 +523,7 @@ class SessionController < ApplicationController
     return if user&.admin?
 
     if (check_login_via_email && !SiteSetting.enable_local_logins_via_email) ||
-        SiteSetting.enable_sso ||
+        SiteSetting.enable_discourse_connect ||
         !SiteSetting.enable_local_logins
       raise Discourse::InvalidAccess, "SSO takes over local login or the local login is disallowed."
     end
@@ -612,4 +637,49 @@ class SessionController < ApplicationController
   def sso_url(sso)
     sso.to_url
   end
+
+  # the invite_key will be present if set in InvitesController
+  # when the user visits an /invites/xxxx link; however we do
+  # not want to complete the SSO process of creating a user
+  # and redeeming the invite if the invite is not redeemable or
+  # for the wrong user
+  def validate_invitiation!(sso)
+    invite_key = secure_session["invite-key"]
+    return if invite_key.blank?
+
+    invite = Invite.find_by(invite_key: invite_key)
+
+    if invite.blank?
+      raise Invite::ValidationFailed.new(I18n.t("invite.not_found", base_url: Discourse.base_url))
+    end
+
+    if invite.redeemable?
+      if !invite.is_invite_link? && sso.email != invite.email
+        raise Invite::ValidationFailed.new(I18n.t("invite.not_matching_email"))
+      end
+    elsif invite.expired?
+      raise Invite::ValidationFailed.new(I18n.t('invite.expired', base_url: Discourse.base_url))
+    elsif invite.redeemed?
+      raise Invite::ValidationFailed.new(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
+    end
+
+    invite
+  end
+
+  def redeem_invitation(invite, sso)
+    InviteRedeemer.new(
+      invite: invite,
+      username: sso.username,
+      name: sso.name,
+      ip_address: request.remote_ip,
+      session: session,
+      email: sso.email
+    ).redeem
+    secure_session["invite-key"] = nil
+
+  # note - more specific errors are handled in the sso_login method
+  rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
+    Rails.logger.warn("SSO invite redemption failed: #{e}")
+    raise Invite::RedemptionFailed
+  end
 end
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 16f692569a..63064c7e70 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -7,6 +7,8 @@ class StaticController < ApplicationController
   skip_before_action :preload_json, only: [:brotli_asset, :cdn_asset, :enter, :favicon, :service_worker_asset]
   skip_before_action :handle_theme, only: [:brotli_asset, :cdn_asset, :enter, :favicon, :service_worker_asset]
 
+  before_action :apply_cdn_headers, only: [:brotli_asset, :cdn_asset, :enter, :favicon, :service_worker_asset]
+
   PAGES_WITH_EMAIL_PARAM = ['login', 'password_reset', 'signup']
   MODAL_PAGES = ['password_reset', 'signup']
 
@@ -27,7 +29,7 @@ class StaticController < ApplicationController
     if map.has_key?(@page)
       site_setting_key = map[@page][:redirect]
       url = SiteSetting.get(site_setting_key)
-      return redirect_to(url) unless url.blank?
+      return redirect_to(url) if url.present?
     end
 
     # The /guidelines route ALWAYS shows our FAQ, ignoring the faq_url site setting.
@@ -68,12 +70,8 @@ class StaticController < ApplicationController
       cookies[:email] = { value: params[:email], expires: 1.day.from_now }
     end
 
-    file = "static/#{@page}.#{I18n.locale}"
-    file = "static/#{@page}.en" if lookup_context.find_all("#{file}.html").empty?
-    file = "static/#{@page}"    if lookup_context.find_all("#{file}.html").empty?
-
-    if lookup_context.find_all("#{file}.html").any?
-      render file, layout: !request.xhr?, formats: [:html]
+    if lookup_context.find_all("static/#{@page}").any?
+      render "static/#{@page}", layout: !request.xhr?, formats: [:html]
       return
     end
 
diff --git a/app/controllers/stylesheets_controller.rb b/app/controllers/stylesheets_controller.rb
index 163ed9e430..d9446882a2 100644
--- a/app/controllers/stylesheets_controller.rb
+++ b/app/controllers/stylesheets_controller.rb
@@ -3,6 +3,8 @@
 class StylesheetsController < ApplicationController
   skip_before_action :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :show_source_map, :color_scheme]
 
+  before_action :apply_cdn_headers, only: [:show, :show_source_map, :color_scheme]
+
   def show_source_map
     show_resource(source_map: true)
   end
diff --git a/app/controllers/svg_sprite_controller.rb b/app/controllers/svg_sprite_controller.rb
index 81b970547e..5851e4b564 100644
--- a/app/controllers/svg_sprite_controller.rb
+++ b/app/controllers/svg_sprite_controller.rb
@@ -3,6 +3,8 @@
 class SvgSpriteController < ApplicationController
   skip_before_action :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :search, :svg_icon]
 
+  before_action :apply_cdn_headers, only: [:show, :search, :svg_icon]
+
   requires_login except: [:show, :svg_icon]
 
   def show
diff --git a/app/controllers/tag_groups_controller.rb b/app/controllers/tag_groups_controller.rb
index 58a8f98ba1..9921d7af6d 100644
--- a/app/controllers/tag_groups_controller.rb
+++ b/app/controllers/tag_groups_controller.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class TagGroupsController < ApplicationController
-  requires_login
-  before_action :ensure_staff
+  requires_login except: [:search]
+  before_action :ensure_staff, except: [:search]
 
   skip_before_action :check_xhr, only: [:index, :show, :new]
   before_action :fetch_tag_group, only: [:show, :update, :destroy]
@@ -61,15 +61,21 @@ class TagGroupsController < ApplicationController
   end
 
   def search
-    matches = if params[:q].present?
-      TagGroup.where('lower(name) ILIKE ?', "%#{params[:q].strip}%")
-    else
-      TagGroup.all
+    matches = TagGroup.includes(:tags).visible(guardian).all
+
+    if params[:q].present?
+      matches = matches.where('lower(name) ILIKE ?', "%#{params[:q].strip}%")
+    end
+
+    if params[:names].present?
+      matches = matches.where('lower(NAME) in (?)', params[:names].map(&:downcase))
     end
 
     matches = matches.order('name').limit(params[:limit] || 5)
 
-    render json: { results: matches.map { |x| { id: x.name, text: x.name } } }
+    render json: {
+      results: matches.map { |x| { name: x.name, tag_names: x.tags.base_tags.pluck(:name).sort } }
+    }
   end
 
   private
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index ea4909f38f..e56274d20f 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -7,23 +7,27 @@ class TagsController < ::ApplicationController
   before_action :ensure_tags_enabled
   before_action :ensure_visible, only: [:show, :info]
 
+  def self.show_methods
+    Discourse.anonymous_filters.map { |f| :"show_#{f}" }
+  end
+
   requires_login except: [
     :index,
     :show,
     :tag_feed,
     :search,
     :info,
-    Discourse.anonymous_filters.map { |f| :"show_#{f}" }
-  ].flatten
+    *show_methods
+  ]
 
-  skip_before_action :check_xhr, only: [:tag_feed, :show, :index]
+  skip_before_action :check_xhr, only: [:tag_feed, :show, :index, *show_methods]
 
   before_action :set_category, except: [:index, :update, :destroy,
     :tag_feed, :search, :notifications, :update_notifications, :personal_messages, :info]
 
   before_action :fetch_tag, only: [:info, :create_synonyms, :destroy_synonym]
 
-  after_action :add_noindex_header
+  after_action :add_noindex_header, except: [:index, :show]
 
   def index
     @description_meta = I18n.t("tags.title")
@@ -50,8 +54,12 @@ class TagsController < ::ApplicationController
         .includes(:tags)
 
       category_tag_counts = categories.map do |c|
-        { id: c.id, tags: self.class.tag_counts_json(c.tags.where(target_tag_id: nil)) }
-      end
+        category_tags = self.class.tag_counts_json(
+          DiscourseTagging.filter_visible(c.tags.where(target_tag_id: nil), guardian)
+        )
+        next if category_tags.empty?
+        { id: c.id, tags: category_tags }
+      end.compact
 
       @tags = self.class.tag_counts_json(unrestricted_tags, show_pm_tags: guardian.can_tag_pms?)
       @extras = { categories: category_tag_counts }
@@ -409,8 +417,6 @@ class TagsController < ::ApplicationController
   end
 
   def construct_url_with(action, opts)
-    method = url_method(opts)
-
     page_params =
       case action
       when :prev
@@ -421,13 +427,13 @@ class TagsController < ::ApplicationController
         raise "unreachable"
       end
 
-    if page_params.include?(:category_slug_path_with_id)
-      opts = opts.dup
-      opts.delete(:category)
-    end
+    opts = opts.merge(page_params)
+    opts.delete(:category) if opts.include?(:category_slug_path_with_id)
+
+    method = url_method(opts)
 
     begin
-      url = public_send(method, opts.merge(page_params))
+      url = public_send(method, opts)
     rescue ActionController::UrlGenerationError
       raise Discourse::NotFound
     end
@@ -450,7 +456,8 @@ class TagsController < ::ApplicationController
       search: params[:search],
       q: params[:q]
     )
-    options[:no_subcategories] = true if params[:no_subcategories] == 'true'
+    options[:no_subcategories] = true if params[:no_subcategories] == true || params[:no_subcategories] == 'true'
+    options[:per_page] = params[:per_page].to_i.clamp(1, 30) if params[:per_page].present?
 
     if params[:tag_id] == 'none'
       options.delete(:tags)
diff --git a/app/controllers/theme_javascripts_controller.rb b/app/controllers/theme_javascripts_controller.rb
index 0fb5f526a5..77ad53f05c 100644
--- a/app/controllers/theme_javascripts_controller.rb
+++ b/app/controllers/theme_javascripts_controller.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 class ThemeJavascriptsController < ApplicationController
   DISK_CACHE_PATH = "#{Rails.root}/tmp/javascript-cache"
+  TESTS_DISK_CACHE_PATH = "#{Rails.root}/tmp/javascript-cache/tests"
 
   skip_before_action(
     :check_xhr,
@@ -8,10 +9,10 @@ class ThemeJavascriptsController < ApplicationController
     :preload_json,
     :redirect_to_login_if_required,
     :verify_authenticity_token,
-    only: [:show]
+    only: [:show, :show_tests]
   )
 
-  before_action :is_asset_path, :no_cookies, only: [:show]
+  before_action :is_asset_path, :no_cookies, :apply_cdn_headers, only: [:show, :show_tests]
 
   def show
     raise Discourse::NotFound unless last_modified.present?
@@ -34,6 +35,29 @@ class ThemeJavascriptsController < ApplicationController
     send_file(cache_file, disposition: :inline)
   end
 
+  def show_tests
+    digest = params[:digest]
+    raise Discourse::NotFound if !digest.match?(/^\h{40}$/)
+
+    theme = Theme.find_by(id: params[:theme_id])
+    raise Discourse::NotFound if theme.blank?
+
+    content, content_digest = theme.baked_js_tests_with_digest
+    raise Discourse::NotFound if content.blank? || content_digest != digest
+
+    @cache_file = "#{TESTS_DISK_CACHE_PATH}/#{digest}.js"
+    return render body: nil, status: 304 if not_modified?
+
+    if !File.exist?(@cache_file)
+      FileUtils.mkdir_p(TESTS_DISK_CACHE_PATH)
+      File.write(@cache_file, content)
+    end
+
+    response.headers["Content-Length"] = File.size(@cache_file).to_s
+    set_cache_control_headers
+    send_file(@cache_file, disposition: :inline)
+  end
+
   private
 
   def query
@@ -41,7 +65,13 @@ class ThemeJavascriptsController < ApplicationController
   end
 
   def last_modified
-    @last_modified ||= query.pluck_first(:updated_at)
+    @last_modified ||= begin
+      if params[:action].to_s == "show_tests"
+        File.exist?(@cache_file) ? File.ctime(@cache_file) : nil
+      else
+        query.pluck_first(:updated_at)
+      end
+    end
   end
 
   def not_modified?
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 91063417ee..343178d9a9 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -56,7 +56,7 @@ class TopicsController < ApplicationController
     # arrays are not supported
     params[:page] = params[:page].to_i rescue 1
 
-    opts = params.slice(:username_filters, :filter, :page, :post_number, :show_deleted)
+    opts = params.slice(:username_filters, :filter, :page, :post_number, :show_deleted, :replies_to_post_number, :filter_upwards_post_id)
     username_filters = opts[:username_filters]
 
     opts[:print] = true if params[:print].present?
@@ -168,6 +168,8 @@ class TopicsController < ApplicationController
     topic = Topic.find(params[:id])
     category = Category.find(params[:destination_category_id])
 
+    raise Discourse::InvalidParameters if category.id == SiteSetting.shared_drafts_category.to_i
+
     guardian.ensure_can_publish_topic!(topic, category)
     topic = TopicPublisher.new(topic, current_user, category.id).publish!
 
@@ -317,39 +319,44 @@ class TopicsController < ApplicationController
     guardian.ensure_can_edit!(topic)
 
     if params[:category_id] && (params[:category_id].to_i != topic.category_id.to_i)
-      category = Category.find_by(id: params[:category_id])
-
-      if category || (params[:category_id].to_i == 0)
-        guardian.ensure_can_move_topic_to_category!(category)
+      if topic.shared_draft
+        topic.shared_draft.update(category_id: params[:category_id])
+        params.delete(:category_id)
       else
-        return render_json_error(I18n.t('category.errors.not_found'))
-      end
+        category = Category.find_by(id: params[:category_id])
 
-      if category && topic_tags = (params[:tags] || topic.tags.pluck(:name)).reject { |c| c.empty? }
-        if topic_tags.present?
-          allowed_tags = DiscourseTagging.filter_allowed_tags(
-            guardian,
-            category: category
-          ).map(&:name)
+        if category || (params[:category_id].to_i == 0)
+          guardian.ensure_can_move_topic_to_category!(category)
+        else
+          return render_json_error(I18n.t('category.errors.not_found'))
+        end
 
-          invalid_tags = topic_tags - allowed_tags
+        if category && topic_tags = (params[:tags] || topic.tags.pluck(:name)).reject { |c| c.empty? }
+          if topic_tags.present?
+            allowed_tags = DiscourseTagging.filter_allowed_tags(
+              guardian,
+              category: category
+            ).map(&:name)
 
-          # Do not raise an error on a topic's hidden tags when not modifying tags
-          if params[:tags].blank?
-            invalid_tags.each do |tag_name|
-              if DiscourseTagging.hidden_tag_names.include?(tag_name)
-                invalid_tags.delete(tag_name)
+            invalid_tags = topic_tags - allowed_tags
+
+            # Do not raise an error on a topic's hidden tags when not modifying tags
+            if params[:tags].blank?
+              invalid_tags.each do |tag_name|
+                if DiscourseTagging.hidden_tag_names.include?(tag_name)
+                  invalid_tags.delete(tag_name)
+                end
               end
             end
-          end
 
-          invalid_tags = Tag.where_name(invalid_tags).pluck(:name)
+            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'))
-            else
-              return render_json_error(I18n.t('category.errors.disallowed_topic_tags', tags: invalid_tags.join(", ")))
+            if !invalid_tags.empty?
+              if (invalid_tags & DiscourseTagging.hidden_tag_names).present?
+                return render_json_error(I18n.t('category.errors.disallowed_tags_generic'))
+              else
+                return render_json_error(I18n.t('category.errors.disallowed_topic_tags', tags: invalid_tags.join(", ")))
+              end
             end
           end
         end
@@ -420,6 +427,10 @@ class TopicsController < ApplicationController
       guardian.ensure_can_close_topic!(@topic)
     when 'archived'
       guardian.ensure_can_archive_topic!(@topic)
+    when 'visible'
+      guardian.ensure_can_toggle_topic_visibility!(@topic)
+    when 'pinned'
+      guardian.ensure_can_pin_unpin_topic!(@topic)
     else
       guardian.ensure_can_moderate!(@topic)
     end
@@ -452,7 +463,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
+    params.require(:duration_minutes) if based_on_last_post
 
     topic = Topic.find_by(id: params[:topic_id])
     guardian.ensure_can_moderate!(topic)
@@ -463,21 +474,26 @@ class TopicsController < ApplicationController
     }
 
     options.merge!(category_id: params[:category_id]) if !params[:category_id].blank?
+    options.merge!(duration_minutes: params[:duration_minutes].to_i) if params[:duration_minutes].present?
     options.merge!(duration: params[:duration].to_i) if params[:duration].present?
 
-    topic_status_update = topic.set_or_create_timer(
-      status_type,
-      params[:time],
-      **options
-    )
+    begin
+      topic_timer = topic.set_or_create_timer(
+        status_type,
+        params[:time],
+        **options
+      )
+    rescue ActiveRecord::RecordInvalid => e
+      return render_json_error(e.message)
+    end
 
     if topic.save
       render json: success_json.merge!(
-        execute_at: topic_status_update&.execute_at,
-        duration: topic_status_update&.duration,
-        based_on_last_post: topic_status_update&.based_on_last_post,
+        execute_at: topic_timer&.execute_at,
+        duration_minutes: topic_timer&.duration_minutes,
+        based_on_last_post: topic_timer&.based_on_last_post,
         closed: topic.closed,
-        category_id: topic_status_update&.category_id
+        category_id: topic_timer&.category_id
       )
     else
       render_json_error(topic)
@@ -619,6 +635,39 @@ class TopicsController < ApplicationController
     end
   end
 
+  def invite_notify
+    topic = Topic.find_by(id: params[:topic_id])
+    guardian.ensure_can_see!(topic)
+
+    usernames = params[:usernames]
+    raise Discourse::InvalidParameters.new(:usernames) if !usernames.kind_of?(Array) || (!current_user.staff? && usernames.size > 1)
+
+    users = User.where(username_lower: usernames.map(&:downcase))
+    raise Discourse::InvalidParameters.new(:usernames) if usernames.size != users.size
+
+    topic.rate_limit_topic_invitation(current_user)
+
+    users.find_each do |user|
+      if !user.guardian.can_see_topic?(topic)
+        return render json: failed_json.merge(error: I18n.t('topic_invite.user_cannot_see_topic', username: user.username)), status: 422
+      end
+    end
+
+    users.find_each do |user|
+      last_notification = user.notifications
+        .where(notification_type: Notification.types[:invited_to_topic])
+        .where(topic_id: topic.id)
+        .where(post_number: 1)
+        .where('created_at > ?', 1.hour.ago)
+
+      if !last_notification.exists?
+        topic.create_invite_notification!(user, Notification.types[:invited_to_topic], current_user.username)
+      end
+    end
+
+    render json: success_json
+  end
+
   def invite_group
     group = Group.find_by(name: params[:group])
     raise Discourse::NotFound unless group
@@ -836,7 +885,26 @@ class TopicsController < ApplicationController
   end
 
   def feed
-    @topic_view = TopicView.new(params[:topic_id])
+    raise Discourse::NotFound if !Post.exists?(topic_id: params[:topic_id])
+
+    begin
+      @topic_view = TopicView.new(params[:topic_id])
+    rescue Discourse::NotLoggedIn
+      raise Discourse::NotFound
+    rescue Discourse::InvalidAccess => ex
+
+      deleted = guardian.can_see_topic?(ex.obj, false) ||
+        (!guardian.can_see_topic?(ex.obj) &&
+         ex.obj&.access_topic_via_group &&
+         ex.obj.deleted_at)
+
+      raise Discourse::NotFound.new(
+        nil,
+        check_permalinks: deleted,
+        original_path: ex.obj.relative_url
+      )
+    end
+
     discourse_expires_in 1.minute
     render 'topics/show', formats: [:rss]
   end
@@ -881,29 +949,30 @@ class TopicsController < ApplicationController
   end
 
   def reset_new
-    if params[:category_id].present?
-      category_ids = [params[:category_id]]
-      if params[:include_subcategories] == 'true'
-        category_ids = category_ids.concat(Category.where(parent_category_id: params[:category_id]).pluck(:id))
-      end
-      category_ids.each do |category_id|
-        current_user
-          .category_users
-          .where(category_id: category_id)
-          .first_or_initialize
-          .update!(last_seen_at: Time.zone.now)
-        TopicTrackingState.publish_dismiss_new(current_user.id, category_id)
-      end
-    else
-      if params[:tracked].to_s == "true"
-        topics = TopicQuery.tracked_filter(TopicQuery.new(current_user).new_results, current_user.id)
-        topic_users = topics.map { |topic| { topic_id: topic.id, user_id: current_user.id, last_read_post_number: 0 } }
-        TopicUser.insert_all(topic_users) if !topic_users.empty?
+    topic_scope =
+      if params[:category_id].present?
+        category_ids = [params[:category_id]]
+        if params[:include_subcategories] == 'true'
+          category_ids = category_ids.concat(Category.where(parent_category_id: params[:category_id]).pluck(:id))
+        end
+
+        scope = Topic.where(category_id: category_ids)
+        scope = scope.joins(:tags).where(tags: { name: params[:tag_id] }) if params[:tag_id]
+        scope
+      elsif params[:tag_id].present?
+        Topic.joins(:tags).where(tags: { name: params[:tag_id] })
       else
-        current_user.user_stat.update_column(:new_since, Time.zone.now)
-        TopicTrackingState.publish_dismiss_new(current_user.id)
+        if params[:tracked].to_s == "true"
+          TopicQuery.tracked_filter(TopicQuery.new(current_user).new_results, current_user.id)
+        else
+          current_user.user_stat.update_column(:new_since, Time.zone.now)
+          Topic
+        end
       end
-    end
+
+    dismissed_topic_ids = DismissTopics.new(current_user, topic_scope).perform!
+    TopicTrackingState.publish_dismiss_new(current_user.id, topic_ids: dismissed_topic_ids)
+
     render body: nil
   end
 
@@ -936,9 +1005,20 @@ class TopicsController < ApplicationController
 
   def set_slow_mode
     topic = Topic.find(params[:topic_id])
+    slow_mode_type = TopicTimer.types[:clear_slow_mode]
+    timer = TopicTimer.find_by(topic: topic, status_type: slow_mode_type)
 
     guardian.ensure_can_moderate!(topic)
     topic.update!(slow_mode_seconds: params[:seconds])
+    enabled = params[:seconds].to_i > 0
+
+    time = enabled && params[:enabled_until].present? ? params[:enabled_until] : nil
+
+    topic.set_or_create_timer(
+      slow_mode_type,
+      time,
+      by_user: timer&.user
+    )
 
     head :ok
   end
@@ -1050,7 +1130,8 @@ class TopicsController < ApplicationController
       @topic_view,
       scope: guardian,
       root: false,
-      include_raw: !!params[:include_raw]
+      include_raw: !!params[:include_raw],
+      exclude_suggested_and_related: !!params[:replies_to_post_number] || !!params[:filter_upwards_post_id]
     )
 
     respond_to do |format|
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 814b65ac39..7e4db3e39c 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -8,7 +8,7 @@ class UploadsController < ApplicationController
   skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show, :show_short, :show_secure]
   protect_from_forgery except: :show
 
-  before_action :is_asset_path, only: [:show, :show_short, :show_secure]
+  before_action :is_asset_path, :apply_cdn_headers, only: [:show, :show_short, :show_secure]
 
   SECURE_REDIRECT_GRACE_SECONDS = 5
 
@@ -19,7 +19,7 @@ class UploadsController < ApplicationController
     # 50 characters ought to be enough for the upload type
     type = params.require(:type).parameterize(separator: "_")[0..50]
 
-    if type == "avatar" && !me.admin? && (SiteSetting.sso_overrides_avatar || !SiteSetting.allow_uploaded_avatars)
+    if type == "avatar" && !me.admin? && (SiteSetting.discourse_connect_overrides_avatar || !SiteSetting.allow_uploaded_avatars)
       return render json: failed_json, status: 422
     end
 
diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rb
index b8609190e2..402a38e1d9 100644
--- a/app/controllers/user_api_keys_controller.rb
+++ b/app/controllers/user_api_keys_controller.rb
@@ -23,7 +23,7 @@ class UserApiKeysController < ApplicationController
     unless current_user
       cookies[:destination_url] = request.fullpath
 
-      if SiteSetting.enable_sso?
+      if SiteSetting.enable_discourse_connect?
         redirect_to path('/session/sso')
       else
         redirect_to path('/login')
@@ -115,7 +115,7 @@ class UserApiKeysController < ApplicationController
     unless current_user
       cookies[:destination_url] = request.fullpath
 
-      if SiteSetting.enable_sso?
+      if SiteSetting.enable_discourse_connect?
         redirect_to path('/session/sso')
       else
         redirect_to path('/login')
diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index 583fc81e65..d65baac29c 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -4,6 +4,8 @@ class UserAvatarsController < ApplicationController
 
   skip_before_action :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :show_letter, :show_proxy_letter]
 
+  before_action :apply_cdn_headers, only: [:show, :show_letter, :show_proxy_letter]
+
   def refresh_gravatar
     user = User.find_by(username_lower: params[:username].downcase)
     guardian.ensure_can_edit!(user)
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index 2771e443f1..05d0a69301 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -41,7 +41,7 @@ class UserBadgesController < ApplicationController
         .select(UserBadge.attribute_names.map { |x| "MAX(#{x}) AS #{x}" }, 'COUNT(*) AS "count"')
     end
 
-    user_badges = user_badges.includes(badge: [:badge_grouping, :badge_type])
+    user_badges = user_badges.includes(badge: [:badge_grouping, :badge_type, :image_upload])
       .includes(post: :topic)
       .includes(:granted_by)
 
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index c4b99bb441..2b702962c3 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -26,7 +26,6 @@ class Users::OmniauthCallbacksController < ApplicationController
     auth[:session] = session
 
     authenticator = self.class.find_authenticator(params[:provider])
-    provider = DiscoursePluginRegistry.auth_providers.find { |p| p.name == params[:provider] }
 
     if session.delete(:auth_reconnect) && authenticator.can_connect_existing_user? && current_user
       # Save to redis, with a secret token, then redirect to confirmation screen
@@ -36,12 +35,16 @@ class Users::OmniauthCallbacksController < ApplicationController
     else
       DiscourseEvent.trigger(:before_auth, authenticator, auth)
       @auth_result = authenticator.after_authenticate(auth)
+      @auth_result.user = nil if @auth_result&.user&.staged # Treat staged users the same as unregistered users
       DiscourseEvent.trigger(:after_auth, authenticator, @auth_result)
     end
 
     preferred_origin = request.env['omniauth.origin']
 
-    if SiteSetting.enable_sso_provider && payload = cookies.delete(:sso_payload)
+    if session[:destination_url].present?
+      preferred_origin = session[:destination_url]
+      session.delete(:destination_url)
+    elsif SiteSetting.enable_discourse_connect_provider && payload = cookies.delete(:sso_payload)
       preferred_origin = session_sso_provider_url + "?" + payload
     elsif cookies[:destination_url].present?
       preferred_origin = cookies[:destination_url]
@@ -54,9 +57,7 @@ class Users::OmniauthCallbacksController < ApplicationController
       rescue URI::Error
       end
 
-      if parsed && # Valid
-         (parsed.host == nil || parsed.host == Discourse.current_hostname) && # Local
-         !parsed.path.starts_with?("#{Discourse.base_path}/auth/") # Not /auth URL
+      if valid_origin?(parsed)
         @origin = +"#{parsed.path}"
         @origin << "?#{parsed.query}" if parsed.query
       end
@@ -83,6 +84,14 @@ class Users::OmniauthCallbacksController < ApplicationController
     redirect_to @origin
   end
 
+  def valid_origin?(uri)
+    return false if uri.nil?
+    return false if uri.host.present? && uri.host != Discourse.current_hostname
+    return false if uri.path.start_with?("#{Discourse.base_path}/auth/")
+    return false if uri.path.start_with?("#{Discourse.base_path}/login")
+    true
+  end
+
   def failure
     error_key = params[:message].to_s.gsub(/[^\w-]/, "") || "generic"
     flash[:error] = I18n.t("login.omniauth_error.#{error_key}", default: I18n.t("login.omniauth_error.generic"))
@@ -106,13 +115,22 @@ class Users::OmniauthCallbacksController < ApplicationController
   def complete_response_data
     if @auth_result.user
       user_found(@auth_result.user)
-    elsif SiteSetting.invite_only?
+    elsif invite_required?
       @auth_result.requires_invite = true
     else
       session[:authentication] = @auth_result.session_data
     end
   end
 
+  def invite_required?
+    if SiteSetting.invite_only?
+      path = Discourse.route_for(@origin)
+      return true unless path
+      return true if path[:controller] != "invites" && path[:action] != "show"
+      !Invite.exists?(invite_key: path[:id])
+    end
+  end
+
   def user_found(user)
     if user.has_any_second_factor_methods_enabled?
       @auth_result.omniauth_disallow_totp = true
@@ -120,10 +138,8 @@ class Users::OmniauthCallbacksController < ApplicationController
       return
     end
 
-    # automatically activate/unstage any account if a provider marked the email valid
+    # automatically activate any account if a provider marked the email valid
     if @auth_result.email_valid && @auth_result.email == user.email
-      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 bb64aa0c88..5d7a37e9f9 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, :invited, :invite_links, :check_sso_email
+    :bookmarks, :invited, :check_sso_email, :check_sso_payload
   ]
 
   skip_before_action :check_xhr, only: [
@@ -34,6 +34,7 @@ class UsersController < ApplicationController
   #  once that happens you can't log in with social
   skip_before_action :verify_authenticity_token, only: [:create]
   skip_before_action :redirect_to_login_if_required, only: [:check_username,
+                                                            :check_email,
                                                             :create,
                                                             :account_created,
                                                             :activate_account,
@@ -179,7 +180,7 @@ class UsersController < ApplicationController
     end
   rescue Discourse::InvalidAccess
     if current_user&.staff?
-      render_json_error(I18n.t('errors.messages.sso_overrides_username'))
+      render_json_error(I18n.t('errors.messages.auth_overrides_username'))
     else
       render json: failed_json, status: 403
     end
@@ -210,7 +211,7 @@ class UsersController < ApplicationController
     user = fetch_user_from_params(include_inactive: true)
 
     unless user == current_user
-      guardian.ensure_can_check_sso_email!(user)
+      guardian.ensure_can_check_sso_details!(user)
       StaffActionLogger.new(current_user).log_check_email(user, context: params[:context])
     end
 
@@ -222,6 +223,22 @@ class UsersController < ApplicationController
     render json: failed_json, status: 403
   end
 
+  def check_sso_payload
+    user = fetch_user_from_params(include_inactive: true)
+
+    guardian.ensure_can_check_sso_details!(user)
+    unless user == current_user
+      StaffActionLogger.new(current_user).log_check_email(user, context: params[:context])
+    end
+
+    payload = user&.single_sign_on_record&.last_payload
+    payload = I18n.t("user.email.does_not_exist") if payload.blank?
+
+    render json: { payload: payload }
+  rescue Discourse::InvalidAccess
+    render json: failed_json, status: 403
+  end
+
   def update_primary_email
     if !SiteSetting.enable_secondary_emails
       return render json: failed_json, status: 410
@@ -267,17 +284,13 @@ class UsersController < ApplicationController
     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
+      if change_requests = user.email_change_requests.where(new_email: params[:email]).presence
+        change_requests.destroy_all
+      elsif user.user_emails.where(email: params[:email], primary: false).destroy_all.present?
         DiscourseEvent.trigger(:user_updated, user)
-      elsif
-        user.email_change_requests.where(new_email: params[:email]).destroy_all
+      else
+        return render json: failed_json, status: 428
       end
 
       if current_user.staff? && current_user != user
@@ -386,18 +399,21 @@ class UsersController < ApplicationController
 
   def invited
     if guardian.can_invite_to_forum?
-      offset = params[:offset].to_i || 0
-      filter_by = params[:filter] || "redeemed"
+      filter = 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)
-      elsif filter_by == "redeemed"
-        Invite.find_redeemed_invites_from(inviter, offset)
+      invites = if filter == "pending" && guardian.can_see_invite_details?(inviter)
+        Invite.includes(:topics, :groups).pending(inviter)
+      elsif filter == "expired"
+        Invite.expired(inviter)
+      elsif filter == "redeemed"
+        Invite.redeemed_users(inviter)
       else
-        []
+        Invite.none
       end
 
+      invites = invites.offset(params[:offset].to_i || 0).limit(SiteSetting.invites_per_page)
+
       show_emails = guardian.can_see_invite_emails?(inviter)
       if params[:search].present? && invites.present?
         filter_sql = '(LOWER(users.username) LIKE :filter)'
@@ -405,66 +421,34 @@ class UsersController < ApplicationController
         invites = invites.where(filter_sql, filter: "%#{params[:search].downcase}%")
       end
 
+      pending_count = Invite.pending(inviter).reorder(nil).count.to_i
+      expired_count = Invite.expired(inviter).reorder(nil).count.to_i
+      redeemed_count = Invite.redeemed_users(inviter).reorder(nil).count.to_i
+
       render json: MultiJson.dump(InvitedSerializer.new(
-        OpenStruct.new(invite_list: invites.to_a, show_emails: show_emails, inviter: inviter, type: filter_by),
+        OpenStruct.new(
+          invite_list: invites.to_a,
+          show_emails: show_emails,
+          inviter: inviter,
+          type: filter,
+          counts: {
+            pending: pending_count,
+            expired: expired_count,
+            redeemed: redeemed_count,
+            total: pending_count + expired_count
+          }
+        ),
         scope: guardian,
         root: false
       ))
-    else
-      if current_user&.staff?
-        message = if SiteSetting.enable_sso
-          I18n.t("invite.disabled_errors.sso_enabled")
-        elsif !SiteSetting.enable_local_logins
-          I18n.t("invite.disabled_errors.local_logins_disabled")
-        end
-
-        render_invite_error(message)
-      else
-        render_json_error(I18n.t("invite.disabled_errors.invalid_access"))
+    elsif current_user&.staff?
+      message = if SiteSetting.enable_discourse_connect
+        I18n.t("invite.disabled_errors.discourse_connect_enabled")
       end
-    end
-  end
 
-  def invite_links
-    if guardian.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))
+      render_invite_error(message)
     else
-      if current_user&.staff?
-        message = if SiteSetting.enable_sso
-          I18n.t("invite.disabled_errors.sso_enabled")
-        elsif !SiteSetting.enable_local_logins
-          I18n.t("invite.disabled_errors.local_logins_disabled")
-        end
-
-        render_invite_error(message)
-      else
-        render_json_error(I18n.t("invite.disabled_errors.invalid_access"))
-      end
-    end
-  end
-
-  def invited_count
-    if guardian.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)
-      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, links: links_count,
-                               total: (pending_count.to_i + redeemed_count.to_i) } }
-    else
-      if current_user&.staff?
-        render json: { counts: 0 }
-      else
-        render_json_error(I18n.t("invite.disabled_errors.invalid_access"))
-      end
+      render_json_error(I18n.t("invite.disabled_errors.invalid_access"))
     end
   end
 
@@ -538,6 +522,42 @@ class UsersController < ApplicationController
     render json: checker.check_username(username, email)
   end
 
+  def check_email
+    begin
+      RateLimiter.new(nil, "check-email-#{request.remote_ip}", 10, 1.minute).performed!
+    rescue RateLimiter::LimitExceeded
+      return render json: success_json
+    end
+
+    email = Email.downcase((params[:email] || "").strip)
+
+    if email.blank? || SiteSetting.hide_email_address_taken?
+      return render json: success_json
+    end
+
+    if !(email =~ EmailValidator.email_regex)
+      error = User.new.errors.full_message(:email, I18n.t(:'user.email.invalid'))
+      return render json: failed_json.merge(errors: [error])
+    end
+
+    if !EmailValidator.allowed?(email)
+      error = User.new.errors.full_message(:email, I18n.t(:'user.email.not_allowed'))
+      return render json: failed_json.merge(errors: [error])
+    end
+
+    if ScreenedEmail.should_block?(email)
+      error = User.new.errors.full_message(:email, I18n.t(:'user.email.blocked'))
+      return render json: failed_json.merge(errors: [error])
+    end
+
+    if User.where(staged: false).find_by_email(email).present?
+      error = User.new.errors.full_message(:email, I18n.t(:'errors.messages.taken'))
+      return render json: failed_json.merge(errors: [error])
+    end
+
+    render json: success_json
+  end
+
   def user_from_params_or_current_user
     params[:for_user_id] ? User.find(params[:for_user_id]) : current_user
   end
@@ -647,8 +667,7 @@ class UsersController < ApplicationController
         success: true,
         active: user.active?,
         message: activation.message,
-        user_id: user.id
-      }
+      }.merge(SiteSetting.hide_email_address_taken ? {} : { user_id: user.id })
     elsif SiteSetting.hide_email_address_taken && user.errors[:primary_email]&.include?(I18n.t('errors.messages.taken'))
       session["user_created_message"] = activation.success_message
 
@@ -658,9 +677,8 @@ class UsersController < ApplicationController
 
       render json: {
         success: true,
-        active: user.active?,
-        message: activation.success_message,
-        user_id: user.id
+        active: false,
+        message: activation.success_message
       }
     else
       errors = user.errors.to_hash
@@ -911,7 +929,7 @@ class UsersController < ApplicationController
 
   def account_created
     if current_user.present?
-      if SiteSetting.enable_sso_provider && payload = cookies.delete(:sso_payload)
+      if SiteSetting.enable_discourse_connect_provider && payload = cookies.delete(:sso_payload)
         return redirect_to(session_sso_provider_url + "?" + payload)
       elsif destination_url = cookies.delete(:destination_url)
         return redirect_to(destination_url)
@@ -960,7 +978,7 @@ class UsersController < ApplicationController
         elsif destination_url = cookies[:destination_url]
           cookies[:destination_url] = nil
           return redirect_to(destination_url)
-        elsif SiteSetting.enable_sso_provider && payload = cookies.delete(:sso_payload)
+        elsif SiteSetting.enable_discourse_connect_provider && payload = cookies.delete(:sso_payload)
           return redirect_to(session_sso_provider_url + "?" + payload)
         end
       else
@@ -1041,18 +1059,14 @@ class UsersController < ApplicationController
   def search_users
     term = params[:term].to_s.strip
 
-    topic_id = params[:topic_id]
-    topic_id = topic_id.to_i if topic_id
-
-    category_id = params[:category_id].to_i if category_id.present?
+    topic_id = params[:topic_id].to_i if params[:topic_id].present?
+    category_id = params[:category_id].to_i if params[:category_id].present?
 
     topic_allowed_users = params[:topic_allowed_users] || false
 
     group_names = params[:groups] || []
     group_names << params[:group] if params[:group]
-    if group_names.present?
-      @groups = Group.where(name: group_names)
-    end
+    @groups = Group.where(name: group_names) if group_names.present?
 
     options = {
      topic_allowed_users: topic_allowed_users,
@@ -1060,13 +1074,8 @@ class UsersController < ApplicationController
      groups: @groups
     }
 
-    if topic_id
-      options[:topic_id] = topic_id
-    end
-
-    if category_id
-      options[:category_id] = category_id
-    end
+    options[:topic_id] = topic_id if topic_id
+    options[:category_id] = category_id if category_id
 
     results = UserSearch.new(term, options).search
 
@@ -1075,8 +1084,10 @@ class UsersController < ApplicationController
 
     to_render = { users: results.as_json(only: user_fields, methods: [:avatar_template]) }
 
+    # blank term is only handy for in-topic search of users after @
+    # we do not want group results ever if term is blank
     groups =
-      if current_user
+      if term.present? && current_user
         if params[:include_groups] == 'true'
           Group.visible_groups(current_user)
         elsif params[:include_mentionable_groups] == 'true'
@@ -1086,10 +1097,6 @@ class UsersController < ApplicationController
         end
       end
 
-    # blank term is only handy for in-topic search of users after @
-    # we do not want group results ever if term is blank
-    groups = nil if term.blank?
-
     if groups
       groups = Group.search_groups(term, groups: groups)
       groups = groups.order('groups.name asc')
@@ -1108,39 +1115,45 @@ class UsersController < ApplicationController
     user = fetch_user_from_params
     guardian.ensure_can_edit!(user)
 
-    type = params[:type]
-    upload_id = params[:upload_id]
-
-    if SiteSetting.sso_overrides_avatar
+    if SiteSetting.discourse_connect_overrides_avatar
       return render json: failed_json, status: 422
     end
 
-    if !SiteSetting.allow_uploaded_avatars
-      if type == "uploaded" || type == "custom"
-        return render json: failed_json, status: 422
-      end
+    type = params[:type]
+
+    invalid_type = type.present? && !AVATAR_TYPES_WITH_UPLOAD.include?(type) && type != 'system'
+    if invalid_type
+      return render json: failed_json, status: 422
     end
 
-    upload = Upload.find_by(id: upload_id)
+    if type.blank? || type == 'system'
+      upload_id = nil
+    elsif !SiteSetting.allow_uploaded_avatars
+      return render json: failed_json, status: 422
+    else
+      upload_id = params[:upload_id]
+      upload = Upload.find_by(id: upload_id)
 
-    # old safeguard
-    user.create_user_avatar unless user.user_avatar
-
-    guardian.ensure_can_pick_avatar!(user.user_avatar, upload)
-
-    if AVATAR_TYPES_WITH_UPLOAD.include?(type)
-
-      if !upload
-        return render_json_error I18n.t("avatar.missing")
+      if upload.nil?
+        return render_json_error I18n.t('avatar.missing')
       end
 
-      if type == "gravatar"
+      # old safeguard
+      user.create_user_avatar unless user.user_avatar
+
+      guardian.ensure_can_pick_avatar!(user.user_avatar, upload)
+
+      if type == 'gravatar'
         user.user_avatar.gravatar_upload_id = upload_id
       else
         user.user_avatar.custom_upload_id = upload_id
       end
     end
 
+    if user.is_system_user?
+      SiteSetting.use_site_small_logo_as_system_avatar = false
+    end
+
     user.uploaded_avatar_id = upload_id
     user.save!
     user.user_avatar.save!
@@ -1175,6 +1188,11 @@ class UsersController < ApplicationController
     end
 
     user.uploaded_avatar_id = upload.id
+
+    if user.is_system_user?
+      SiteSetting.use_site_small_logo_as_system_avatar = false
+    end
+
     user.save!
 
     avatar = user.user_avatar || user.create_user_avatar
@@ -1285,7 +1303,7 @@ class UsersController < ApplicationController
   end
 
   def list_second_factors
-    raise Discourse::NotFound if SiteSetting.enable_sso || !SiteSetting.enable_local_logins
+    raise Discourse::NotFound if SiteSetting.enable_discourse_connect || !SiteSetting.enable_local_logins
 
     unless params[:password].empty?
       RateLimiter.new(nil, "login-hr-#{request.remote_ip}", SiteSetting.max_logins_per_ip_per_hour, 1.hour).performed!
@@ -1457,7 +1475,7 @@ class UsersController < ApplicationController
   end
 
   def second_factor_check_confirmed_password
-    raise Discourse::NotFound if SiteSetting.enable_sso || !SiteSetting.enable_local_logins
+    raise Discourse::NotFound if SiteSetting.enable_discourse_connect || !SiteSetting.enable_local_logins
 
     raise Discourse::InvalidAccess.new unless current_user && secure_session_confirmed?
   end
@@ -1618,6 +1636,7 @@ class UsersController < ApplicationController
     permitted.concat UserUpdater::OPTION_ATTR
     permitted.concat UserUpdater::CATEGORY_IDS.keys.map { |k| { k => [] } }
     permitted.concat UserUpdater::TAG_NAMES.keys
+    permitted << UserUpdater::NOTIFICATION_SCHEDULE_ATTRS
 
     result = params
       .permit(permitted, theme_ids: [])
diff --git a/app/controllers/users_email_controller.rb b/app/controllers/users_email_controller.rb
index a41d6cebcd..d808c095df 100644
--- a/app/controllers/users_email_controller.rb
+++ b/app/controllers/users_email_controller.rb
@@ -13,7 +13,9 @@ class UsersEmailController < ApplicationController
 
   skip_before_action :redirect_to_login_if_required, only: [
     :confirm_old_email,
-    :show_confirm_old_email
+    :show_confirm_old_email,
+    :confirm_new_email,
+    :show_confirm_new_email
   ]
 
   before_action :require_login, only: [
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0b994496dc..17092306ab 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -35,6 +35,10 @@ module ApplicationHelper
     google_universal_analytics_json
   end
 
+  def self.google_tag_manager_nonce
+    @gtm_nonce ||= SecureRandom.hex
+  end
+
   def shared_session_key
     if SiteSetting.long_polling_base_url != '/' && current_user
       sk = "shared_session_key"
@@ -207,7 +211,7 @@ module ApplicationHelper
   end
 
   def html_lang
-    SiteSetting.default_locale.sub("_", "-")
+    (request ? I18n.locale.to_s : SiteSetting.default_locale).sub("_", "-")
   end
 
   # Creates open graph and twitter card meta data
@@ -365,6 +369,8 @@ module ApplicationHelper
 
   def loading_admin?
     return false unless defined?(controller)
+    return false if controller.class.name.blank?
+
     controller.class.name.split("::").first == "Admin"
   end
 
@@ -449,15 +455,30 @@ module ApplicationHelper
   end
 
   def theme_lookup(name)
-    Theme.lookup_field(theme_ids, mobile_view? ? :mobile : :desktop, name)
+    Theme.lookup_field(
+      theme_ids,
+      mobile_view? ? :mobile : :desktop,
+      name,
+      skip_transformation: request.env[:skip_theme_ids_transformation].present?
+    )
   end
 
   def theme_translations_lookup
-    Theme.lookup_field(theme_ids, :translations, I18n.locale)
+    Theme.lookup_field(
+      theme_ids,
+      :translations,
+      I18n.locale,
+      skip_transformation: request.env[:skip_theme_ids_transformation].present?
+    )
   end
 
   def theme_js_lookup
-    Theme.lookup_field(theme_ids, :extra_js, nil)
+    Theme.lookup_field(
+      theme_ids,
+      :extra_js,
+      nil,
+      skip_transformation: request.env[:skip_theme_ids_transformation].present?
+    )
   end
 
   def discourse_stylesheet_link_tag(name, opts = {})
@@ -518,6 +539,7 @@ module ApplicationHelper
       if ENV['DEBUG_PRELOADED_APP_DATA']
         setup_data[:debug_preloaded_app_data] = true
       end
+      setup_data[:mb_last_file_change_id] = MessageBus.last_id('/file-change')
     end
 
     if guardian.can_enable_safe_mode? && params["safe_mode"]
@@ -548,7 +570,7 @@ module ApplicationHelper
   def can_sign_up?
     SiteSetting.allow_new_registrations &&
     !SiteSetting.invite_only &&
-    !SiteSetting.enable_sso
+    !SiteSetting.enable_discourse_connect
   end
 
   def rss_creator(user)
@@ -560,4 +582,22 @@ module ApplicationHelper
       end
     end
   end
+
+  def authentication_data
+    return @authentication_data if defined?(@authentication_data)
+
+    @authentication_data = begin
+      value = cookies[:authentication_data]
+      if value
+        cookies.delete(:authentication_data, path: Discourse.base_path("/"))
+      end
+      current_user ? nil : value
+    end
+  end
+
+  def hijack_if_ember_cli!
+    if request.headers["HTTP_X_DISCOURSE_EMBER_CLI"] == "true"
+      raise ApplicationController::EmberCLIHijacked.new
+    end
+  end
 end
diff --git a/app/helpers/common_helper.rb b/app/helpers/common_helper.rb
index 5ce539b47d..3176ef629b 100644
--- a/app/helpers/common_helper.rb
+++ b/app/helpers/common_helper.rb
@@ -8,14 +8,10 @@ module CommonHelper
   end
 
   def render_google_tag_manager_head_code
-    if Rails.env.production? && SiteSetting.gtm_container_id.present?
-      render partial: "common/google_tag_manager_head"
-    end
+    render partial: "common/google_tag_manager_head" if SiteSetting.gtm_container_id.present?
   end
 
   def render_google_tag_manager_body_code
-    if Rails.env.production? && SiteSetting.gtm_container_id.present?
-      render partial: "common/google_tag_manager_body"
-    end
+    render partial: "common/google_tag_manager_body" if SiteSetting.gtm_container_id.present?
   end
 end
diff --git a/app/helpers/qunit_helper.rb b/app/helpers/qunit_helper.rb
new file mode 100644
index 0000000000..98f509c664
--- /dev/null
+++ b/app/helpers/qunit_helper.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module QunitHelper
+  def theme_tests
+    theme = Theme.find_by(id: request.env[:resolved_theme_ids]&.first)
+    return "" if theme.blank?
+
+    _, digest = theme.baked_js_tests_with_digest
+    src = "#{GlobalSetting.cdn_url}" \
+      "#{Discourse.base_path}" \
+      "/theme-javascripts/tests/#{theme.id}-#{digest}.js" \
+      "?__ws=#{Discourse.current_hostname}"
+    "<script src='#{src}'></script>".html_safe
+  end
+end
diff --git a/app/jobs/base.rb b/app/jobs/base.rb
index b69302861a..fdcd1dd55e 100644
--- a/app/jobs/base.rb
+++ b/app/jobs/base.rb
@@ -311,7 +311,7 @@ module Jobs
         hash['queue'] = queue
       end
 
-      klass.client_push(hash)
+      DB.after_commit { klass.client_push(hash) }
     else
       # Otherwise execute the job right away
       opts.delete(:delay_for)
diff --git a/app/jobs/onceoff/fix_invalid_gravatar_uploads.rb b/app/jobs/onceoff/fix_invalid_gravatar_uploads.rb
index bbbc942603..515b805871 100644
--- a/app/jobs/onceoff/fix_invalid_gravatar_uploads.rb
+++ b/app/jobs/onceoff/fix_invalid_gravatar_uploads.rb
@@ -6,7 +6,7 @@ module Jobs
       Upload.where(original_filename: "gravatar.png").find_each do |upload|
         # note, this still feels pretty expensive for a once off
         # we may need to re-evaluate this
-        extension = FastImage.type(Discourse.store.path_for(upload))
+        extension = FastImage.type(Discourse.store.path_for(upload)) rescue nil
         current_extension = upload.extension
 
         if extension.to_s.downcase != current_extension.to_s.downcase
diff --git a/app/jobs/onceoff/fix_post_search_data_after_default_locale_rename.rb b/app/jobs/onceoff/fix_post_search_data_after_default_locale_rename.rb
new file mode 100644
index 0000000000..76e0b10d24
--- /dev/null
+++ b/app/jobs/onceoff/fix_post_search_data_after_default_locale_rename.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Jobs
+  class FixPostSearchDataAfterDefaultLocaleRename < ::Jobs::Onceoff
+    def execute_onceoff(args)
+      return if SearchIndexer::POST_INDEX_VERSION != 4
+
+      sql = <<~SQL
+        UPDATE post_search_data
+           SET locale = 'en'
+         WHERE post_id IN (
+                SELECT post_id
+                  FROM post_search_data
+                 WHERE locale = 'en_US'
+                 LIMIT 100000
+             )
+      SQL
+
+      loop { break if DB.exec(sql) == 0 }
+    end
+  end
+end
diff --git a/app/jobs/onceoff/migrate_badge_image_to_uploads.rb b/app/jobs/onceoff/migrate_badge_image_to_uploads.rb
new file mode 100644
index 0000000000..5585a508c2
--- /dev/null
+++ b/app/jobs/onceoff/migrate_badge_image_to_uploads.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+require 'uri'
+
+module Jobs
+  class MigrateBadgeImageToUploads < ::Jobs::Onceoff
+    def execute_onceoff(args)
+      column_exists = DB.exec(<<~SQL) == 1
+        SELECT 1
+        FROM INFORMATION_SCHEMA.COLUMNS
+        WHERE
+          table_schema = 'public' AND
+          table_name = 'badges' AND
+          column_name = 'image_upload_id'
+      SQL
+      return unless column_exists
+
+      Badge.where.not(image: nil).select(:id, :image_upload_id, :image).each do |badge|
+        if badge.image_upload.present?
+          DB.exec("UPDATE badges SET image = NULL WHERE id = ?", badge.id)
+          next
+        end
+
+        image_url = badge[:image]
+        next if image_url.blank? || image_url !~ URI.regexp
+
+        count = 0
+        file = nil
+        sleep_interval = 5
+
+        loop do
+          url = UrlHelper.absolute_without_cdn(image_url)
+
+          begin
+            file = FileHelper.download(
+              url,
+              max_file_size: [
+                SiteSetting.max_image_size_kb.kilobytes,
+                20.megabytes
+              ].max,
+              tmp_file_name: 'tmp_badge_image_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.error(
+              "Error encountered when trying to download from URL '#{image_url}' " +
+              "for badge '#{badge[:id]}'.\n#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"
+            )
+          end
+
+          count += 1
+          break if file
+
+          logger.warn(
+            "Failed to download image from #{url} for badge '#{badge[:id]}'. Retrying (#{count}/3)..."
+          )
+          break if count >= 3
+          sleep(count * sleep_interval)
+        end
+
+        next if file.blank?
+
+        upload = UploadCreator.new(
+          file,
+          "image_for_badge_#{badge[:id]}",
+          origin: UrlHelper.absolute(image_url)
+        ).create_for(Discourse.system_user.id)
+
+        if upload.errors.count > 0 || upload&.id.blank?
+          logger.error("Failed to create an upload for the image of badge '#{badge[:id]}'. Error: #{upload.errors.full_messages}")
+        else
+          DB.exec("UPDATE badges SET image = NULL, image_upload_id = ? WHERE id = ?", upload.id, badge[:id])
+        end
+      end
+    end
+
+    private
+
+    def logger
+      Rails.logger
+    end
+  end
+end
diff --git a/app/jobs/regular/bulk_invite.rb b/app/jobs/regular/bulk_invite.rb
index a87344f079..3f22282c25 100644
--- a/app/jobs/regular/bulk_invite.rb
+++ b/app/jobs/regular/bulk_invite.rb
@@ -6,25 +6,27 @@ module Jobs
 
     def initialize
       super
-      @logs    = []
-      @sent    = 0
-      @failed  = 0
-      @groups = {}
+
+      @logs         = []
+      @sent         = 0
+      @failed       = 0
+      @groups       = {}
+      @user_fields  = {}
       @valid_groups = {}
     end
 
     def execute(args)
-      invites = args[:invites]
-      raise Discourse::InvalidParameters.new(:invites) if invites.blank?
+      @invites = args[:invites]
+      raise Discourse::InvalidParameters.new(:invites) if @invites.blank?
 
       @current_user = User.find_by(id: args[:current_user_id])
       raise Discourse::InvalidParameters.new(:current_user_id) unless @current_user
+
       @guardian = Guardian.new(@current_user)
-      @total_invites = invites.length
 
-      process_invites(invites)
+      process_invites(@invites)
 
-      if @total_invites > Invite::BULK_INVITE_EMAIL_LIMIT
+      if @invites.length > Invite::BULK_INVITE_EMAIL_LIMIT
         ::Jobs.enqueue(:process_bulk_invite_emails)
       end
     ensure
@@ -87,10 +89,29 @@ module Jobs
       topic
     end
 
+    def get_user_fields(fields)
+      user_fields = {}
+
+      fields.each do |key, value|
+        @user_fields[key] ||= UserField.includes(:user_field_options).where('name ILIKE ?', key).first || :nil
+        next if @user_fields[key] == :nil
+
+        # Automatically correct user field value
+        if @user_fields[key].field_type == "dropdown"
+          value = @user_fields[key].user_field_options.find { |ufo| ufo.value.casecmp?(value) }&.value
+        end
+
+        user_fields[@user_fields[key].id] = value
+      end
+
+      user_fields
+    end
+
     def send_invite(invite)
       email = invite[:email]
       groups = get_groups(invite[:groups])
       topic = get_topic(invite[:topic_id])
+      user_fields = get_user_fields(invite.except(:email, :groups, :topic_id))
 
       begin
         if user = Invite.find_user_by_email(email)
@@ -105,16 +126,34 @@ module Jobs
               end
             end
           end
-        else
-          if @total_invites > Invite::BULK_INVITE_EMAIL_LIMIT
-            invite = Invite.create_invite_by_email(email, @current_user,
-              topic: topic,
-              group_ids: groups.map(&:id),
-              emailed_status: Invite.emailed_status_types[:bulk_pending]
-            )
-          else
-            Invite.invite_by_email(email, @current_user, topic, groups.map(&:id))
+
+          if user_fields.present?
+            user_fields.each do |user_field, value|
+              user.set_user_field(user_field, value)
+            end
+            user.save_custom_fields
           end
+        else
+          if user_fields.present?
+            user = User.where(staged: true).find_by_email(email)
+            user ||= User.new(username: UserNameSuggester.suggest(email), email: email, staged: true)
+            user_fields.each do |user_field, value|
+              user.set_user_field(user_field, value)
+            end
+            user.save!
+          end
+
+          invite_opts = {
+            email: email,
+            topic: topic,
+            group_ids: groups.map(&:id),
+          }
+
+          if @invites.length > Invite::BULK_INVITE_EMAIL_LIMIT
+            invite_opts[:emailed_status] = Invite.emailed_status_types[:bulk_pending]
+          end
+
+          Invite.generate(@current_user, invite_opts)
         end
       rescue => e
         save_log "Error inviting '#{email}' -- #{Rails::Html::FullSanitizer.new.sanitize(e.message)}"
@@ -152,7 +191,7 @@ module Jobs
       group = @groups[group_name]
 
       unless group
-        group = Group.find_by("lower(name) = ?", group_name)
+        group = Group.find_by('lower(name) = ?', group_name)
         @groups[group_name] = group
       end
 
diff --git a/app/jobs/regular/bump_topic.rb b/app/jobs/regular/bump_topic.rb
index e795592393..a8cd9fa35b 100644
--- a/app/jobs/regular/bump_topic.rb
+++ b/app/jobs/regular/bump_topic.rb
@@ -1,22 +1,13 @@
 # frozen_string_literal: true
 
 module Jobs
-  class BumpTopic < ::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
-
+  class BumpTopic < ::Jobs::TopicTimerBase
+    def execute_timer_action(topic_timer, topic)
       if Guardian.new(topic_timer.user).can_create_post_on_topic?(topic)
         topic.add_small_action(Discourse.system_user, "autobumped", nil, bump: true)
       end
+
       topic_timer.trash!(Discourse.system_user)
     end
-
   end
 end
diff --git a/app/jobs/regular/clear_slow_mode.rb b/app/jobs/regular/clear_slow_mode.rb
new file mode 100644
index 0000000000..361cce8746
--- /dev/null
+++ b/app/jobs/regular/clear_slow_mode.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Jobs
+  class ClearSlowMode < ::Jobs::TopicTimerBase
+    def execute_timer_action(topic_timer, topic)
+      topic.update!(slow_mode_seconds: 0)
+      topic_timer.trash!(Discourse.system_user)
+    end
+  end
+end
diff --git a/app/jobs/regular/close_topic.rb b/app/jobs/regular/close_topic.rb
new file mode 100644
index 0000000000..fc5f84c9a9
--- /dev/null
+++ b/app/jobs/regular/close_topic.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Jobs
+  class CloseTopic < ::Jobs::TopicTimerBase
+    def execute_timer_action(topic_timer, topic)
+      silent = @args[:silent]
+      user = topic_timer.user
+
+      if topic.closed?
+        topic_timer.destroy!
+        return
+      end
+
+      if !Guardian.new(user).can_close_topic?(topic)
+        topic_timer.destroy!
+        topic.reload
+
+        if topic_timer.based_on_last_post
+          topic.inherit_auto_close_from_category(timer_type: silent ? :silent_close : :close)
+        end
+
+        return
+      end
+
+      # this handles deleting the topic timer as wel, see TopicStatusUpdater
+      topic.update_status('autoclosed', true, user, { silent: silent })
+
+      MessageBus.publish("/topic/#{topic.id}", reload_topic: true)
+    end
+  end
+end
diff --git a/app/jobs/regular/delete_replies.rb b/app/jobs/regular/delete_replies.rb
index bbc0bec8ff..7208f4e561 100644
--- a/app/jobs/regular/delete_replies.rb
+++ b/app/jobs/regular/delete_replies.rb
@@ -1,28 +1,21 @@
 # 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
-
+  class DeleteReplies < ::Jobs::TopicTimerBase
+    def execute_timer_action(topic_timer, topic)
       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|
+      replies = replies.where("like_count < ?", SiteSetting.skip_auto_delete_reply_likes) if SiteSetting.skip_auto_delete_reply_likes > 0
+
+      replies.where('posts.created_at < ?', topic_timer.duration_minutes.minutes.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
+      topic_timer.execute_at = (replies.minimum(:created_at) || Time.zone.now) + topic_timer.duration_minutes.minutes
       topic_timer.save
     end
 
diff --git a/app/jobs/regular/delete_topic.rb b/app/jobs/regular/delete_topic.rb
index be6ab194e7..af109d8b10 100644
--- a/app/jobs/regular/delete_topic.rb
+++ b/app/jobs/regular/delete_topic.rb
@@ -1,23 +1,17 @@
 # frozen_string_literal: true
 
 module Jobs
-  class DeleteTopic < ::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
-
+  class DeleteTopic < ::Jobs::TopicTimerBase
+    def execute_timer_action(topic_timer, topic)
       if Guardian.new(topic_timer.user).can_delete?(topic)
         first_post = topic.ordered_posts.first
-        PostDestroyer.new(topic_timer.user, first_post, context: I18n.t("topic_statuses.auto_deleted_by_timer")).destroy
+
+        PostDestroyer.new(
+          topic_timer.user, first_post, context: I18n.t("topic_statuses.auto_deleted_by_timer")
+        ).destroy
+
         topic_timer.trash!(Discourse.system_user)
       end
     end
-
   end
 end
diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index 94371eaa33..7b22f0398b 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -115,8 +115,8 @@ module Jobs
     end
 
     def group_webhook_invalid?
-      @web_hook.group_ids.present? && (@arguments[:group_id].present? ||
-        !@web_hook.group_ids.include?(@arguments[:group_id]))
+      @web_hook.group_ids.present? && (@arguments[:group_ids].blank? ||
+        (@web_hook.group_ids & @arguments[:group_ids]).blank?)
     end
 
     def category_webhook_invalid?
diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 5b47f1cd02..4ff6d1a3ff 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -113,24 +113,21 @@ module Jobs
         condition = { trust_level: trust_level }
       end
 
-      if SiteSetting.enable_sso
-        # SSO enabled
-        User.where(condition).includes(:user_profile, :user_stat, :user_emails, :single_sign_on_record, :groups).find_each do |user|
-          user_info_array = get_base_user_array(user)
-          user_info_array = add_single_sign_on(user, user_info_array)
-          user_info_array = add_custom_fields(user, user_info_array, user_field_ids)
-          user_info_array = add_group_names(user, user_info_array)
-          yield user_info_array
-        end
-      else
-        # SSO disabled
-        User.where(condition).includes(:user_profile, :user_stat, :user_emails, :groups).find_each do |user|
-          user_info_array = get_base_user_array(user)
-          user_info_array = add_custom_fields(user, user_info_array, user_field_ids)
-          user_info_array = add_group_names(user, user_info_array)
-          yield user_info_array
-        end
+      includes = [:user_profile, :user_stat, :groups, :user_emails]
+      if SiteSetting.enable_discourse_connect
+        includes << [:single_sign_on_record]
       end
+
+      User.where(condition).includes(*includes).find_each do |user|
+        user_info_array = get_base_user_array(user)
+        if SiteSetting.enable_discourse_connect
+          user_info_array = add_single_sign_on(user, user_info_array)
+        end
+        user_info_array = add_custom_fields(user, user_info_array, user_field_ids)
+        user_info_array = add_group_names(user, user_info_array)
+        yield user_info_array
+      end
+
     end
 
     def staff_action_export
@@ -232,7 +229,7 @@ module Jobs
     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
+        header_array.concat(HEADER_ATTRS_FOR['user_sso']) if SiteSetting.enable_discourse_connect
         user_custom_fields = UserField.all
         if user_custom_fields.present?
           user_custom_fields.each do |custom_field|
@@ -254,11 +251,23 @@ module Jobs
     end
 
     def get_base_user_array(user)
+      # preloading scopes is hard, do this by hand
+      secondary_emails = []
+      primary_email = nil
+
+      user.user_emails.each do |user_email|
+        if user_email.primary?
+          primary_email = user_email.email
+        else
+          secondary_emails << user_email.email
+        end
+      end
+
       [
         user.id,
         escape_comma(user.name),
         user.username,
-        user.email,
+        primary_email,
         escape_comma(user.title),
         user.created_at,
         user.last_seen_at,
@@ -274,7 +283,7 @@ module Jobs
         user.moderator,
         user.ip_address,
         user.staged,
-        user.secondary_emails.join(";"),
+        secondary_emails.join(";"),
         user.user_stat.topics_entered,
         user.user_stat.posts_read_count,
         user.user_stat.time_read,
diff --git a/app/jobs/regular/export_user_archive.rb b/app/jobs/regular/export_user_archive.rb
index e5a8a6b7e7..73ce107426 100644
--- a/app/jobs/regular/export_user_archive.rb
+++ b/app/jobs/regular/export_user_archive.rb
@@ -18,6 +18,9 @@ module Jobs
       badges
       bookmarks
       category_preferences
+      flags
+      likes
+      post_actions
       queued_posts
       visits
     )
@@ -30,6 +33,9 @@ module Jobs
       badges: ['badge_id', 'badge_name', 'granted_at', 'post_id', 'seq', 'granted_manually', 'notification_id', 'featured_rank'],
       bookmarks: ['post_id', 'topic_id', 'post_number', 'link', 'name', 'created_at', 'updated_at', 'reminder_type', 'reminder_at', 'reminder_last_sent_at', 'reminder_set_at', 'auto_delete_preference'],
       category_preferences: ['category_id', 'category_names', 'notification_level', 'dismiss_new_timestamp'],
+      flags: ['id', 'post_id', 'flag_type', 'created_at', 'updated_at', 'deleted_at', 'deleted_by', 'related_post_id', 'targets_topic', 'was_take_action'],
+      likes: ['id', 'post_id', 'topic_id', 'post_number', 'created_at', 'updated_at', 'deleted_at', 'deleted_by'],
+      post_actions: ['id', 'post_id', 'post_action_type', 'created_at', 'updated_at', 'deleted_at', 'deleted_by', 'related_post_id'],
       queued_posts: ['id', 'verdict', 'category_id', 'topic_id', 'post_raw', 'other_json'],
       visits: ['visited_at', 'posts_read', 'mobile', 'time_read'],
     )
@@ -106,7 +112,7 @@ module Jobs
           if upload.persisted?
             user_export.update_columns(upload_id: upload.id)
           else
-            Rails.logger.warn("Failed to upload the file #{zip_filename}")
+            Rails.logger.warn("Failed to upload the file #{zip_filename}: #{upload.errors.full_messages}")
           end
         end
 
@@ -267,6 +273,79 @@ module Jobs
       end
     end
 
+    def flags_export
+      return enum_for(:flags_export) unless block_given?
+
+      PostAction
+        .with_deleted
+        .where(user_id: @current_user.id)
+        .where(post_action_type_id: PostActionType.flag_types.values)
+        .each do |pa|
+        yield [
+          pa.id,
+          pa.post_id,
+          PostActionType.flag_types[pa.post_action_type_id],
+          pa.created_at,
+          pa.updated_at,
+          pa.deleted_at,
+          self_or_other(pa.deleted_by_id),
+          pa.related_post_id,
+          pa.targets_topic,
+          # renamed to 'was_take_action' to avoid possibility of thinking this is a synonym of agreed_at
+          pa.staff_took_action,
+        ]
+      end
+    end
+
+    def likes_export
+      return enum_for(:likes_export) unless block_given?
+      PostAction
+        .with_deleted
+        .where(user_id: @current_user.id)
+        .where(post_action_type_id: PostActionType.types[:like])
+        .each do |pa|
+        post = Post.with_deleted.find_by(id: pa.post_id)
+        yield [
+          pa.id,
+          pa.post_id,
+          post&.topic_id,
+          post&.post_number,
+          pa.created_at,
+          pa.updated_at,
+          pa.deleted_at,
+          self_or_other(pa.deleted_by_id),
+        ]
+      end
+    end
+
+    def include_post_actions?
+      # Most forums should not have post_action records other than flags and likes, but they are possible in historical oddities.
+      PostAction
+        .where(user_id: @current_user.id)
+        .where.not(post_action_type_id: PostActionType.flag_types.values + [PostActionType.types[:like], PostActionType.types[:bookmark]])
+        .exists?
+    end
+
+    def post_actions_export
+      return enum_for(:likes_export) unless block_given?
+      PostAction
+        .with_deleted
+        .where(user_id: @current_user.id)
+        .where.not(post_action_type_id: PostActionType.flag_types.values + [PostActionType.types[:like], PostActionType.types[:bookmark]])
+        .each do |pa|
+        yield [
+          pa.id,
+          pa.post_id,
+          PostActionType.types[pa.post_action_type] || pa.post_action_type,
+          pa.created_at,
+          pa.updated_at,
+          pa.deleted_at,
+          self_or_other(pa.deleted_by_id),
+          pa.related_post_id,
+        ]
+      end
+    end
+
     def queued_posts_export
       return enum_for(:queued_posts_export) unless block_given?
 
@@ -305,7 +384,7 @@ module Jobs
     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
+        header_array.concat(HEADER_ATTRS_FOR['user_sso']) if SiteSetting.enable_discourse_connect
         user_custom_fields = UserField.all
         if user_custom_fields.present?
           user_custom_fields.each do |custom_field|
@@ -337,6 +416,16 @@ module Jobs
       categories.reverse.join("|")
     end
 
+    def self_or_other(user_id)
+      if user_id.nil?
+        nil
+      elsif user_id == @current_user.id
+        'self'
+      else
+        'other'
+      end
+    end
+
     def get_user_archive_fields(user_archive)
       user_archive_array = []
       topic_data = user_archive.topic
@@ -396,7 +485,7 @@ module Jobs
       post = nil
 
       if @current_user
-        post = if upload
+        post = if upload.persisted?
           SystemMessage.create_from_system_user(
             @current_user,
             :csv_export_succeeded,
diff --git a/app/jobs/regular/group_pm_alert.rb b/app/jobs/regular/group_pm_alert.rb
new file mode 100644
index 0000000000..a1058bb733
--- /dev/null
+++ b/app/jobs/regular/group_pm_alert.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Jobs
+  class GroupPmAlert < ::Jobs::Base
+    def execute(args)
+      return unless user = User.find_by(id: args[:user_id])
+      return unless group = Group.find_by(id: args[:group_id])
+      return unless post = Post.find_by(id: args[:post_id])
+      return unless topic = post.topic
+
+      group.set_message_default_notification_levels!(topic, ignore_existing: true)
+
+      alerter = PostAlerter.new
+
+      group.users.where(
+        "group_users.notification_level = :level",
+        level: NotificationLevels.all[:tracking]
+      ).find_each do |u|
+        alerter.notify_group_summary(u, post)
+      end
+
+      notification_data = {
+        notification_type: Notification.types[:invited_to_private_message],
+        topic_id: topic.id,
+        post_number: 1,
+        data: {
+          topic_title: topic.title,
+          display_username: user.username,
+          group_id: group.id
+        }.to_json
+      }
+
+      group.users.where(
+        "group_users.notification_level in (:levels) AND user_id != :id",
+        levels: [NotificationLevels.all[:watching], NotificationLevels.all[:watching_first_post]],
+        id: user.id
+      ).find_each do |u|
+        u.notifications.create!(notification_data)
+      end
+    end
+  end
+end
diff --git a/app/jobs/regular/group_smtp_email.rb b/app/jobs/regular/group_smtp_email.rb
index 7f54d27ddd..ba7afa98e6 100644
--- a/app/jobs/regular/group_smtp_email.rb
+++ b/app/jobs/regular/group_smtp_email.rb
@@ -10,9 +10,23 @@ module Jobs
       group = Group.find_by(id: args[:group_id])
       post = Post.find_by(id: args[:post_id])
       email = args[:email]
-      recipient_user = ::UserEmail.find_by(email: email, primary: true)&.user
 
-      Rails.logger.debug("[IMAP] Sending email for group #{group.name} and post #{post.id}")
+      # There is a rare race condition causing the Imap::Sync class to create
+      # an incoming email and associated post/topic, which then kicks off
+      # the PostAlerter to notify others in the PM about a reply in the topic,
+      # but for the OP which is not necessary (because the person emailing the
+      # IMAP inbox already knows about the OP)
+      #
+      # Basically, we should never be sending this notification for the first
+      # post in a topic.
+      if post.is_first_post?
+        ImapSyncLog.warn("Aborting SMTP email for post #{post.id} in topic #{post.topic_id} to #{email}, the post is the OP and should not send an email.", group)
+        return
+      end
+
+      ImapSyncLog.debug("Sending SMTP email for post #{post.id} in topic #{post.topic_id} to #{email}.", group)
+
+      recipient_user = ::UserEmail.find_by(email: email, primary: true)&.user
       message = GroupSmtpMailer.send_mail(group, email, post)
       Email::Sender.new(message, :group_smtp, recipient_user).send
 
@@ -23,7 +37,12 @@ module Jobs
         topic_id: post.topic_id,
         post_id: post.id,
         raw: message.to_s,
-        message_id: message.message_id
+        subject: message.subject,
+        message_id: message.message_id,
+        to_addresses: message.to,
+        cc_addresses: message.cc,
+        from_address: message.from,
+        created_via: IncomingEmail.created_via_types[:group_smtp]
       )
     end
   end
diff --git a/app/jobs/regular/index_category_for_search.rb b/app/jobs/regular/index_category_for_search.rb
index 396e95320f..50e3970daa 100644
--- a/app/jobs/regular/index_category_for_search.rb
+++ b/app/jobs/regular/index_category_for_search.rb
@@ -3,7 +3,7 @@
 class Jobs::IndexCategoryForSearch < Jobs::Base
   def execute(args)
     category = Category.find_by(id: args[:category_id])
-    raise Discourse::InvalidParameters.new(:category_id) if category.blank?
+    return if category.blank?
 
     SearchIndexer.index(category, force: args[:force] || false)
   end
diff --git a/app/jobs/regular/invite_email.rb b/app/jobs/regular/invite_email.rb
index b8278ff40a..5d0b0e68df 100644
--- a/app/jobs/regular/invite_email.rb
+++ b/app/jobs/regular/invite_email.rb
@@ -11,7 +11,7 @@ module Jobs
       invite = Invite.find_by(id: args[:invite_id])
       return unless invite.present?
 
-      message = InviteMailer.send_invite(invite)
+      message = InviteMailer.send_invite(invite, invite_to_topic: args[:invite_to_topic])
       Email::Sender.new(message, :invite).send
 
       if invite.emailed_status != Invite.emailed_status_types[:not_required]
diff --git a/app/jobs/regular/merge_user.rb b/app/jobs/regular/merge_user.rb
new file mode 100644
index 0000000000..e759b08d18
--- /dev/null
+++ b/app/jobs/regular/merge_user.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Jobs
+  class MergeUser < ::Jobs::Base
+
+    def execute(args)
+      target_user_id = args[:target_user_id]
+      current_user_id = args[:current_user_id]
+
+      user = User.find_by(id: args[:user_id])
+      target_user = User.find_by(id: args[:target_user_id])
+      current_user = User.find_by(id: args[:current_user_id])
+      guardian = Guardian.new(current_user)
+      serializer_opts = { root: false, scope: guardian }
+
+      if user = UserMerger.new(user, target_user, current_user).merge!
+        user_json = AdminDetailedUserSerializer.new(user, serializer_opts).as_json
+        ::MessageBus.publish '/merge_user', { success: 'OK' }.merge(merged: true, user: user_json), user_ids: [current_user.id]
+      else
+        ::MessageBus.publish '/merge_user', { failed: 'FAILED' }.merge(user: AdminDetailedUserSerializer.new(@user, serializer_opts).as_json), user_ids: [current_user.id]
+      end
+    end
+  end
+end
diff --git a/app/jobs/regular/notify_mailing_list_subscribers.rb b/app/jobs/regular/notify_mailing_list_subscribers.rb
index 7cf01bf5d4..3f71efb343 100644
--- a/app/jobs/regular/notify_mailing_list_subscribers.rb
+++ b/app/jobs/regular/notify_mailing_list_subscribers.rb
@@ -65,6 +65,10 @@ module Jobs
         users = users.where(approved: true)
       end
 
+      if SiteSetting.mute_all_categories_by_default
+        users = users.watching_topic_when_mute_categories_by_default(post.topic)
+      end
+
       DiscourseEvent.trigger(:notify_mailing_list_subscribers, users, post)
       users.find_each do |user|
         if Guardian.new(user).can_see?(post)
diff --git a/app/jobs/regular/notify_tag_change.rb b/app/jobs/regular/notify_tag_change.rb
index 16cab8de7b..4b513dd53b 100644
--- a/app/jobs/regular/notify_tag_change.rb
+++ b/app/jobs/regular/notify_tag_change.rb
@@ -7,9 +7,33 @@ module Jobs
 
       if post&.topic&.visible?
         post_alerter = PostAlerter.new
-        post_alerter.notify_post_users(post, User.where(id: args[:notified_user_ids]), include_topic_watchers: !post.topic.private_message?, include_category_watchers: false)
+        post_alerter.notify_post_users(post, excluded_users(args), include_topic_watchers: !post.topic.private_message?, include_category_watchers: false)
         post_alerter.notify_first_post_watchers(post, post_alerter.tag_watchers(post.topic))
       end
     end
+
+    private
+
+    def excluded_users(args)
+      if !args[:diff_tags] || !all_tags_in_hidden_groups?(args)
+        return User.where(id: args[:notified_user_ids])
+      end
+      group_users_join = DB.sql_fragment("LEFT JOIN group_users ON group_users.user_id = users.id AND group_users.group_id IN (:group_ids)", group_ids: tag_group_ids(args))
+      condition = DB.sql_fragment("group_users.id IS NULL OR users.id IN (:notified_user_ids)", notified_user_ids: args[:notified_user_ids])
+      User.joins(group_users_join).where(condition)
+    end
+
+    def all_tags_in_hidden_groups?(args)
+      Tag
+        .where(name: args[:diff_tags])
+        .joins(tag_groups: :tag_group_permissions)
+        .where.not(tag_group_permissions: { group_id: 0 })
+        .distinct
+        .count == args[:diff_tags].count
+    end
+
+    def tag_group_ids(args)
+      Tag.where(name: args[:diff_tags]).joins(tag_groups: :tag_group_permissions).pluck("tag_group_permissions.group_id")
+    end
   end
 end
diff --git a/app/jobs/regular/open_topic.rb b/app/jobs/regular/open_topic.rb
new file mode 100644
index 0000000000..30bddfcb08
--- /dev/null
+++ b/app/jobs/regular/open_topic.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Jobs
+  class OpenTopic < ::Jobs::TopicTimerBase
+    def execute_timer_action(topic_timer, topic)
+      user = topic_timer.user
+
+      if !Guardian.new(user).can_open_topic?(topic) || topic.open?
+        topic_timer.destroy!
+        topic.reload
+
+        topic.inherit_auto_close_from_category(timer_type: :close)
+
+        return
+      end
+
+      # guards against reopening a topic too early if the topic has
+      # been auto closed because of reviewables/reports, this will
+      # just update the existing topic timer and push it down the line
+      if topic.auto_close_threshold_reached?
+        topic.set_or_create_timer(
+          TopicTimer.types[:open],
+          SiteSetting.num_hours_to_close_topic,
+          by_user: Discourse.system_user
+        )
+      else
+
+        # autoclosed, false is just another way of saying open.
+        # this handles deleting the topic timer as wel, see TopicStatusUpdater
+        topic.update_status('autoclosed', false, user)
+      end
+
+      topic.inherit_auto_close_from_category(timer_type: :close)
+
+      MessageBus.publish("/topic/#{topic.id}", reload_topic: true)
+    end
+  end
+end
diff --git a/app/jobs/regular/post_update_topic_tracking_state.rb b/app/jobs/regular/post_update_topic_tracking_state.rb
new file mode 100644
index 0000000000..6eaaeb288b
--- /dev/null
+++ b/app/jobs/regular/post_update_topic_tracking_state.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Jobs
+  class PostUpdateTopicTrackingState < ::Jobs::Base
+
+    def execute(args)
+      post = Post.find_by(id: args[:post_id])
+
+      if post && post.topic
+        TopicTrackingState.publish_unmuted(post.topic)
+        if post.post_number > 1
+          TopicTrackingState.publish_muted(post.topic)
+          TopicTrackingState.publish_unread(post)
+        end
+        TopicTrackingState.publish_latest(post.topic, post.whisper?)
+      end
+    end
+
+  end
+end
diff --git a/app/jobs/regular/process_email.rb b/app/jobs/regular/process_email.rb
index 1a6f9d1db8..2ac10eddd1 100644
--- a/app/jobs/regular/process_email.rb
+++ b/app/jobs/regular/process_email.rb
@@ -6,7 +6,11 @@ module Jobs
     sidekiq_options retry: 3
 
     def execute(args)
-      Email::Processor.process!(args[:mail], retry_on_rate_limit: args[:retry_on_rate_limit] || false)
+      Email::Processor.process!(
+        args[:mail],
+        retry_on_rate_limit: args[:retry_on_rate_limit] || false,
+        source: args[:source]&.to_sym
+      )
     end
 
     sidekiq_retries_exhausted do |msg|
diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index 6ba04d4f5b..b573f0683c 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -29,12 +29,12 @@ module Jobs
         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)
+            post.topic.update_excerpt(post.excerpt_for_topic) if post.is_first_post?
             extract_links(post)
             post.publish_change_to_clients! :revised
           end
diff --git a/app/jobs/regular/publish_topic_to_category.rb b/app/jobs/regular/publish_topic_to_category.rb
index ca0010eae0..b42079dbf6 100644
--- a/app/jobs/regular/publish_topic_to_category.rb
+++ b/app/jobs/regular/publish_topic_to_category.rb
@@ -1,14 +1,8 @@
 # frozen_string_literal: true
 
 module Jobs
-  class PublishTopicToCategory < ::Jobs::Base
-    def execute(args)
-      topic_timer = TopicTimer.find_by(id: args[:topic_timer_id] || args[:topic_status_update_id])
-      return if topic_timer.blank?
-
-      topic = topic_timer.topic
-      return if topic.blank?
-
+  class PublishTopicToCategory < ::Jobs::TopicTimerBase
+    def execute_timer_action(topic_timer, topic)
       return unless Guardian.new(topic_timer.user).can_see?(topic)
 
       TopicTimer.transaction do
diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index 5a6ab648a5..2cfe946982 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -15,6 +15,7 @@ module Jobs
 
       post = Post.find_by(id: @post_id)
       return if post.blank?
+      return if post.topic.blank?
 
       raw = post.raw.dup
       start_raw = raw.dup
@@ -193,6 +194,7 @@ module Jobs
       local_bases = [
         Discourse.base_url,
         Discourse.asset_host,
+        SiteSetting.external_emoji_url.presence
       ].compact.map { |s| normalize_src(s) }
 
       if Discourse.store.has_been_uploaded?(src) || normalize_src(src).start_with?(*local_bases) || src =~ /\A\/[^\/]/i
diff --git a/app/jobs/regular/push_notification.rb b/app/jobs/regular/push_notification.rb
index 6773bf4585..16026323e7 100644
--- a/app/jobs/regular/push_notification.rb
+++ b/app/jobs/regular/push_notification.rb
@@ -4,7 +4,7 @@ module Jobs
   class PushNotification < ::Jobs::Base
     def execute(args)
       notification = args["payload"]
-      notification["url"] = UrlHelper.absolute_without_cdn(notification["post_url"])
+      notification["url"] = UrlHelper.absolute_without_cdn(Discourse.base_path + notification["post_url"])
       notification.delete("post_url")
 
       payload = {
diff --git a/app/jobs/regular/sync_topic_user_bookmarked.rb b/app/jobs/regular/sync_topic_user_bookmarked.rb
new file mode 100644
index 0000000000..2e88f65e24
--- /dev/null
+++ b/app/jobs/regular/sync_topic_user_bookmarked.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Jobs
+  class SyncTopicUserBookmarked < ::Jobs::Base
+    def execute(args = {})
+      topic_id = args[:topic_id]
+
+      DB.exec(<<~SQL, topic_id: topic_id)
+        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 #{topic_id.present? ? "AND topic_users.topic_id = :topic_id" : ""}
+      SQL
+
+      DB.exec(<<~SQL, topic_id: topic_id)
+        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 #{topic_id.present? ? "AND topic_users.topic_id = :topic_id" : ""}
+      SQL
+    end
+  end
+end
diff --git a/app/jobs/regular/toggle_topic_closed.rb b/app/jobs/regular/toggle_topic_closed.rb
index d636360e94..55f7bce88d 100644
--- a/app/jobs/regular/toggle_topic_closed.rb
+++ b/app/jobs/regular/toggle_topic_closed.rb
@@ -1,10 +1,16 @@
 # frozen_string_literal: true
 
 module Jobs
+  # TODO: DEPRECATED - Use OpenTopic and CloseTopic instead.
+  # (martin - 2021-05-01) - Delete once topic timer revamp is completed.
   class ToggleTopicClosed < ::Jobs::Base
     def execute(args)
       topic_timer = TopicTimer.find_by(id: args[:topic_timer_id] || args[:topic_status_update_id])
+
+      # state false is Open Topic
+      # state true is Close Topic
       state = !!args[:state]
+      timer_type = args[:silent] ? :silent_close : :close
 
       if topic_timer.blank? || topic_timer.execute_at > Time.zone.now
         return
@@ -25,16 +31,16 @@ module Jobs
             by_user: Discourse.system_user
           )
         else
-          topic.update_status('autoclosed', state, user)
+          topic.update_status('autoclosed', state, user, { silent: args[:silent] })
         end
 
-        topic.inherit_auto_close_from_category if state == false
+        topic.inherit_auto_close_from_category(timer_type: timer_type) if state == false
       else
         topic_timer.destroy!
         topic.reload
 
         if topic_timer.based_on_last_post
-          topic.inherit_auto_close_from_category
+          topic.inherit_auto_close_from_category(timer_type: timer_type)
         end
       end
     end
diff --git a/app/jobs/regular/topic_timer_base.rb b/app/jobs/regular/topic_timer_base.rb
new file mode 100644
index 0000000000..35b582a97b
--- /dev/null
+++ b/app/jobs/regular/topic_timer_base.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Jobs
+  class TopicTimerBase < ::Jobs::Base
+    def execute(args)
+      @args = args
+
+      topic_timer = TopicTimer.find_by(id: args[:topic_timer_id])
+      return if !topic_timer&.runnable?
+
+      topic = topic_timer.topic
+      if topic.blank?
+        topic_timer.destroy!
+        return
+      end
+
+      execute_timer_action(topic_timer, topic)
+    end
+  end
+end
diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb
index 4c1e3c3ccb..df53f471fd 100644
--- a/app/jobs/regular/user_email.rb
+++ b/app/jobs/regular/user_email.rb
@@ -141,7 +141,8 @@ module Jobs
           email_args[:notification_type] = email_args[:notification_type].to_s
         end
 
-        if user.user_option.mailing_list_mode? &&
+        if !SiteSetting.disable_mailing_list_mode &&
+           user.user_option.mailing_list_mode? &&
            user.user_option.mailing_list_mode_frequency > 0 && # don't catch notifications for users on daily mailing list mode
            (!post.try(:topic).try(:private_message?)) &&
            NOTIFICATIONS_SENT_BY_MAILING_LIST.include?(email_args[:notification_type])
@@ -193,6 +194,8 @@ module Jobs
         email_args[:user_history] = UserHistory.where(id: args[:user_history_id]).first
       end
 
+      email_args[:reject_reason] = args[:reject_reason]
+
       message = EmailLog.unique_email_per_post(post, user) do
         UserNotifications.public_send(type, user, email_args)
       end
diff --git a/app/jobs/scheduled/check_new_features.rb b/app/jobs/scheduled/check_new_features.rb
new file mode 100644
index 0000000000..cca5d9b7d7
--- /dev/null
+++ b/app/jobs/scheduled/check_new_features.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Jobs
+
+  class CheckNewFeatures < ::Jobs::Scheduled
+    every 1.day
+
+    def execute(args)
+      @new_features_json ||= DiscourseUpdates.new_features_payload
+      DiscourseUpdates.update_new_features(@new_features_json)
+    end
+  end
+
+end
diff --git a/app/jobs/scheduled/clean_dismissed_topic_users.rb b/app/jobs/scheduled/clean_dismissed_topic_users.rb
new file mode 100644
index 0000000000..72109ffbfc
--- /dev/null
+++ b/app/jobs/scheduled/clean_dismissed_topic_users.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Jobs
+  class CleanDismissedTopicUsers < ::Jobs::Scheduled
+    every 1.day
+
+    def execute(args)
+      delete_overdue_dismissals!
+      delete_over_the_limit_dismissals!
+    end
+
+    private
+
+    def delete_overdue_dismissals!
+      sql = <<~SQL
+        DELETE FROM dismissed_topic_users dtu1
+        USING dismissed_topic_users dtu2
+        JOIN topics ON topics.id = dtu2.topic_id
+        JOIN users ON users.id = dtu2.user_id
+        JOIN categories ON categories.id = topics.category_id
+        LEFT JOIN user_stats ON user_stats.user_id = users.id
+        LEFT JOIN user_options ON user_options.user_id = users.id
+        WHERE topics.created_at < GREATEST(CASE
+                    WHEN COALESCE(user_options.new_topic_duration_minutes, :default_duration) = :always THEN users.created_at
+                    WHEN COALESCE(user_options.new_topic_duration_minutes, :default_duration) = :last_visit THEN COALESCE(users.previous_visit_at,users.created_at)
+                    ELSE (:now::timestamp - INTERVAL '1 MINUTE' * COALESCE(user_options.new_topic_duration_minutes, :default_duration))
+                 END, users.created_at, :min_date)
+        AND dtu1.id = dtu2.id
+      SQL
+      sql = DB.sql_fragment(sql,
+                            now: DateTime.now,
+                            last_visit: User::NewTopicDuration::LAST_VISIT,
+                            always: User::NewTopicDuration::ALWAYS,
+                            default_duration: SiteSetting.default_other_new_topic_duration_minutes,
+                            min_date: Time.at(SiteSetting.min_new_topics_time).to_datetime)
+      DB.exec(sql)
+    end
+
+    def delete_over_the_limit_dismissals!
+      user_ids = DismissedTopicUser.distinct(:user_id).pluck(:user_id)
+      sql = <<~SQL
+      DELETE FROM dismissed_topic_users
+      WHERE dismissed_topic_users.id NOT IN (
+        SELECT valid_dtu.id FROM users
+        LEFT JOIN dismissed_topic_users valid_dtu ON valid_dtu.user_id = users.id
+        AND valid_dtu.topic_id IN (
+          SELECT topic_id FROM dismissed_topic_users dtu2
+          JOIN topics ON topics.id = dtu2.topic_id
+          WHERE dtu2.user_id = users.id
+          ORDER BY topics.created_at DESC
+          LIMIT :max_new_topics
+        )
+        WHERE users.id IN(:user_ids)
+      )
+      SQL
+      sql = DB.sql_fragment(sql, max_new_topics: SiteSetting.max_new_topics, user_ids: user_ids)
+      DB.exec(sql)
+    end
+  end
+end
diff --git a/app/jobs/scheduled/clean_up_email_change_requests.rb b/app/jobs/scheduled/clean_up_email_change_requests.rb
new file mode 100644
index 0000000000..cd572b5e45
--- /dev/null
+++ b/app/jobs/scheduled/clean_up_email_change_requests.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Jobs
+  class CleanUpEmailChangeRequests < ::Jobs::Scheduled
+    every 1.day
+
+    def execute(args)
+      EmailChangeRequest.where('updated_at < ?', 1.month.ago).delete_all
+    end
+  end
+end
diff --git a/app/jobs/scheduled/clean_up_uploads.rb b/app/jobs/scheduled/clean_up_uploads.rb
index 2b735f61a5..7b3ee54f07 100644
--- a/app/jobs/scheduled/clean_up_uploads.rb
+++ b/app/jobs/scheduled/clean_up_uploads.rb
@@ -43,6 +43,7 @@ module Jobs
         .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")
+        .joins("LEFT JOIN badges b ON b.image_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")
@@ -52,6 +53,7 @@ module Jobs
         .where("tf.upload_id IS NULL")
         .where("ue.upload_id IS NULL")
         .where("g.flair_upload_id IS NULL")
+        .where("b.image_upload_id IS NULL")
         .where("ss.value IS NULL")
 
       if SiteSetting.selectable_avatars.present?
@@ -63,6 +65,7 @@ module Jobs
           encoded_sha = Base62.encode(upload.sha1.hex)
           next if ReviewableQueuedPost.pending.where("payload->>'raw' LIKE '%#{upload.sha1}%' OR payload->>'raw' LIKE '%#{encoded_sha}%'").exists?
           next if Draft.where("data LIKE '%#{upload.sha1}%' OR data LIKE '%#{encoded_sha}%'").exists?
+          next if ThemeSetting.where(data_type: ThemeSetting.types[:upload]).where("value LIKE ?", "%#{upload.sha1}%").exists?
           upload.destroy
         else
           upload.delete
diff --git a/app/jobs/scheduled/enqueue_suspect_users.rb b/app/jobs/scheduled/enqueue_suspect_users.rb
index b88118a3a3..d6f568335c 100644
--- a/app/jobs/scheduled/enqueue_suspect_users.rb
+++ b/app/jobs/scheduled/enqueue_suspect_users.rb
@@ -16,12 +16,19 @@ module Jobs
         .joins(:user_profile, :user_stat)
         .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")
+        .where("user_stats.posts_read_count <= 1 OR user_stats.topics_entered <= 1 OR user_stats.time_read < ?", 1.minute.to_i)
         .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')
+        .joins(
+          <<~SQL
+            LEFT OUTER JOIN (
+              SELECT user_id
+              FROM user_custom_fields
+              WHERE user_custom_fields.name = 'import_id'
+            ) AS ucf ON ucf.user_id = users.id
+          SQL
+        )
+        .where('ucf.user_id IS NULL')
         .limit(10)
 
       users.each do |user|
diff --git a/app/jobs/scheduled/periodical_updates.rb b/app/jobs/scheduled/periodical_updates.rb
index 2ae53c951d..5c5da8bac6 100644
--- a/app/jobs/scheduled/periodical_updates.rb
+++ b/app/jobs/scheduled/periodical_updates.rb
@@ -24,9 +24,6 @@ module Jobs
       args[:max_topic_length] = 500 unless self.class.should_update_long_topics?
       ScoreCalculator.new.calculate(args)
 
-      # Re-run stuff that we missed
-      TopicTimer.ensure_consistency!
-
       # Forces rebake of old posts where needed, as long as no system avatars need updating
       if !SiteSetting.automatically_download_gravatars || !UserAvatar.where("last_gravatar_download_attempt IS NULL").limit(1).first
         problems = Post.rebake_old(SiteSetting.rebake_old_posts_count, priority: :ultra_low)
diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index a016ec2036..19e5a09d65 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -19,8 +19,8 @@ module Jobs
       SiteSetting.pop3_polling_enabled?
     end
 
-    def process_popmail(popmail)
-      Email::Processor.process!(popmail.pop)
+    def process_popmail(mail_string)
+      Email::Processor.process!(mail_string, source: :pop3_poll)
     end
 
     POLL_MAILBOX_TIMEOUT_ERROR_KEY = "poll_mailbox_timeout_error_key"
@@ -38,8 +38,12 @@ module Jobs
 
       pop3.start(SiteSetting.pop3_polling_username, SiteSetting.pop3_polling_password) do |pop|
         pop.each_mail do |p|
-          process_popmail(p)
+          mail_string = p.pop
+          next if mail_too_old?(mail_string)
+          process_popmail(mail_string)
           p.delete if SiteSetting.pop3_polling_delete_from_server?
+        rescue => e
+          Discourse.handle_job_exception(e, error_context(@args, "Failed to process incoming email."))
         end
       end
     rescue Net::OpenTimeout => e
@@ -69,6 +73,15 @@ module Jobs
       Discourse.redis.zcard(POLL_MAILBOX_ERRORS_KEY).to_i
     end
 
+    def mail_too_old?(mail_string)
+      mail = Mail.new(mail_string)
+      date_header = mail.header['Date']
+      return false if date_header.blank?
+
+      date = Time.parse(date_header.to_s)
+      date < 1.week.ago
+    end
+
     def mark_as_errored!
       now = Time.now.to_i
       Discourse.redis.zadd(POLL_MAILBOX_ERRORS_KEY, now, now.to_s)
diff --git a/app/jobs/scheduled/process_shelved_notifications.rb b/app/jobs/scheduled/process_shelved_notifications.rb
new file mode 100644
index 0000000000..d734e51e81
--- /dev/null
+++ b/app/jobs/scheduled/process_shelved_notifications.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Jobs
+  class ProcessShelvedNotifications < ::Jobs::Scheduled
+    every 5.minutes
+
+    def execute(args)
+      sql = <<~SQL
+        SELECT sn.id FROM shelved_notifications as sn
+        INNER JOIN notifications AS notification ON sn.notification_id = notification.id
+        INNER JOIN do_not_disturb_timings AS dndt ON notification.user_id = dndt.user_id
+        AND dndt.ends_at <= :now
+      SQL
+
+      now = Time.zone.now
+      shelved_notification_ids = DB.query_single(sql, now: now)
+      shelved_notifications = ShelvedNotification.where(id: shelved_notification_ids)
+      shelved_notifications.each(&:process)
+      shelved_notifications.destroy_all
+
+      DB.exec("DELETE FROM do_not_disturb_timings WHERE ends_at < :now", now: now)
+    end
+  end
+end
diff --git a/app/jobs/scheduled/process_user_notification_schedules.rb b/app/jobs/scheduled/process_user_notification_schedules.rb
new file mode 100644
index 0000000000..a82db6e2d5
--- /dev/null
+++ b/app/jobs/scheduled/process_user_notification_schedules.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Jobs
+  class ProcessUserNotificationSchedules < ::Jobs::Scheduled
+    every 1.day
+
+    def execute(args)
+      UserNotificationSchedule.enabled.includes(:user).each do |schedule|
+        begin
+          schedule.create_do_not_disturb_timings
+        rescue
+          Rails.logger.warn("Failed to process user_notification_schedule with ID #{schedule.id}")
+        end
+      end
+    end
+  end
+end
diff --git a/app/jobs/scheduled/reindex_search.rb b/app/jobs/scheduled/reindex_search.rb
index 3d6579c78f..26215cdc7a 100644
--- a/app/jobs/scheduled/reindex_search.rb
+++ b/app/jobs/scheduled/reindex_search.rb
@@ -1,201 +1,162 @@
 # frozen_string_literal: true
 
 module Jobs
-  # if locale changes or search algorithm changes we may want to reindex stuff
   class ReindexSearch < ::Jobs::Scheduled
     every 2.hours
 
-    CLEANUP_GRACE_PERIOD = 1.day.ago
-
     def execute(args)
-      @verbose = true if args && Hash === args && args[:verbose]
+      @verbose = args[:verbose]
+      @cleanup_grace_period = 1.day.ago
 
-      rebuild_problem_topics
-      rebuild_problem_posts
-      rebuild_problem_categories
-      rebuild_problem_users
-      rebuild_problem_tags
-      clean_post_search_data
-      clean_topic_search_data
+      rebuild_categories
+      rebuild_tags
+      rebuild_topics
+      rebuild_posts
+      rebuild_users
 
-      @verbose = nil
+      clean_topics
+      clean_posts
     end
 
-    def rebuild_problem_categories(limit: 500)
+    def rebuild_categories(limit: 500, indexer: SearchIndexer)
       category_ids = load_problem_category_ids(limit)
 
-      if @verbose
-        puts "rebuilding #{category_ids.length} categories"
-      end
+      puts "rebuilding #{category_ids.size} categories" if @verbose
 
       category_ids.each do |id|
         category = Category.find_by(id: id)
-        SearchIndexer.index(category, force: true) if category
+        indexer.index(category, force: true) if category
       end
     end
 
-    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
-      end
-    end
-
-    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
-      end
-    end
-
-    def rebuild_problem_posts(limit: 20000, indexer: SearchIndexer, verbose: false)
-      post_ids = load_problem_post_ids(limit)
-      verbose ||= @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
-
-    def rebuild_problem_tags(limit: 10000)
+    def rebuild_tags(limit: 1_000, indexer: SearchIndexer)
       tag_ids = load_problem_tag_ids(limit)
 
-      if @verbose
-        puts "rebuilding #{tag_ids.length} tags"
-      end
+      puts "rebuilding #{tag_ids.size} tags" if @verbose
 
       tag_ids.each do |id|
         tag = Tag.find_by(id: id)
-        SearchIndexer.index(tag, force: true) if tag
+        indexer.index(tag, force: true) if tag
       end
     end
 
-    private
+    def rebuild_topics(limit: 10_000, indexer: SearchIndexer)
+      topic_ids = load_problem_topic_ids(limit)
 
-    def clean_post_search_data
-      puts "cleaning up post search data" if @verbose
+      puts "rebuilding #{topic_ids.size} topics" if @verbose
 
-      PostSearchData
-        .joins("LEFT JOIN posts p ON p.id = post_search_data.post_id")
-        .where("p.raw = ''")
-        .delete_all
-
-      DB.exec(<<~SQL, deleted_at: CLEANUP_GRACE_PERIOD)
-        DELETE FROM post_search_data
-        WHERE post_id IN (
-          SELECT post_id
-          FROM post_search_data
-          LEFT JOIN posts ON post_search_data.post_id = posts.id
-          INNER JOIN topics ON posts.topic_id = topics.id
-          WHERE (topics.deleted_at IS NOT NULL
-          AND topics.deleted_at <= :deleted_at) OR (
-            posts.deleted_at IS NOT NULL AND
-            posts.deleted_at <= :deleted_at
-          )
-
-        )
-      SQL
+      topic_ids.each do |id|
+        topic = Topic.find_by(id: id)
+        indexer.index(topic, force: true) if topic
+      end
     end
 
-    def clean_topic_search_data
+    def rebuild_posts(limit: 20_000, indexer: SearchIndexer)
+      post_ids = load_problem_post_ids(limit)
+
+      puts "rebuilding #{post_ids.size} posts" if @verbose
+
+      post_ids.each do |id|
+        post = Post.find_by(id: id)
+        indexer.index(post, force: true) if post
+      end
+    end
+
+    def rebuild_users(limit: 5_000, indexer: SearchIndexer)
+      user_ids = load_problem_user_ids(limit)
+
+      puts "rebuilding #{user_ids.size} users" if @verbose
+
+      user_ids.each do |id|
+        user = User.find_by(id: id)
+        indexer.index(user, force: true) if user
+      end
+    end
+
+    def clean_topics
       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 (
-        SELECT topic_id
-        FROM topic_search_data
-        INNER JOIN topics ON topic_search_data.topic_id = topics.id
-        WHERE topics.deleted_at IS NOT NULL
-        AND topics.deleted_at <= :deleted_at
-      )
+      # remove search data from deleted topics
+
+      DB.exec(<<~SQL, deleted_at: @cleanup_grace_period)
+        DELETE FROM topic_search_data
+         WHERE topic_id IN (
+          SELECT topic_id
+            FROM topic_search_data
+       LEFT JOIN topics ON topic_id = topics.id
+           WHERE topics.id IS NULL
+              OR (deleted_at IS NOT NULL AND deleted_at <= :deleted_at)
+          )
       SQL
     end
 
-    def load_problem_post_ids(limit)
-      params = {
-        locale: SiteSetting.default_locale,
-        version: SearchIndexer::MIN_POST_REINDEX_VERSION,
-        limit: limit
-      }
+    def clean_posts
+      puts "cleaning up post search data" if @verbose
 
-      DB.query_single(<<~SQL, params)
-        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
-        WHERE pd.post_id IS NULL
-        AND posts.deleted_at IS NULL
-        AND topics.deleted_at IS NULL
-        AND posts.raw != ''
-        ORDER BY posts.id DESC
-        LIMIT :limit
+      # remove search data from deleted/empty posts
+
+      DB.exec(<<~SQL, deleted_at: @cleanup_grace_period)
+        DELETE FROM post_search_data
+         WHERE post_id IN (
+          SELECT post_id
+            FROM post_search_data
+       LEFT JOIN posts ON post_id = posts.id
+            JOIN topics ON posts.topic_id = topics.id
+           WHERE posts.id IS NULL
+              OR posts.raw = ''
+              OR (posts.deleted_at IS NOT NULL AND posts.deleted_at <= :deleted_at)
+              OR (topics.deleted_at IS NOT NULL AND topics.deleted_at <= :deleted_at)
+          )
       SQL
     end
 
     def load_problem_category_ids(limit)
-      Category.joins(:category_search_data)
-        .where('category_search_data.locale != ?
-                OR category_search_data.version != ?', SiteSetting.default_locale, SearchIndexer::CATEGORY_INDEX_VERSION)
-        .order('categories.id asc')
-        .limit(limit)
-        .pluck(:id)
-    end
-
-    def load_problem_topic_ids(limit)
-      Topic.joins(:topic_search_data)
-        .where('topic_search_data.locale != ?
-                OR topic_search_data.version != ?', SiteSetting.default_locale, SearchIndexer::TOPIC_INDEX_VERSION)
-        .order('topics.id desc')
-        .limit(limit)
-        .pluck(:id)
-    end
-
-    def load_problem_user_ids(limit)
-      User.joins(:user_search_data)
-        .where('user_search_data.locale != ?
-                OR user_search_data.version != ?', SiteSetting.default_locale, SearchIndexer::USER_INDEX_VERSION)
-        .order('users.id asc')
+      Category
+        .joins("LEFT JOIN category_search_data ON category_id = categories.id")
+        .where("category_search_data.locale IS NULL OR category_search_data.locale != ? OR category_search_data.version != ?", SiteSetting.default_locale, SearchIndexer::CATEGORY_INDEX_VERSION)
+        .order("categories.id ASC")
         .limit(limit)
         .pluck(:id)
     end
 
     def load_problem_tag_ids(limit)
-      Tag.joins(:tag_search_data)
-        .where('tag_search_data.locale != ?
-                OR tag_search_data.version != ?', SiteSetting.default_locale, SearchIndexer::TAG_INDEX_VERSION)
-        .order('tags.id asc')
+      Tag
+        .joins("LEFT JOIN tag_search_data ON tag_id = tags.id")
+        .where("tag_search_data.locale IS NULL OR tag_search_data.locale != ? OR tag_search_data.version != ?", SiteSetting.default_locale, SearchIndexer::TAG_INDEX_VERSION)
+        .order("tags.id ASC")
         .limit(limit)
         .pluck(:id)
     end
+
+    def load_problem_topic_ids(limit)
+      Topic
+        .joins("LEFT JOIN topic_search_data ON topic_id = topics.id")
+        .where("topic_search_data.locale IS NULL OR topic_search_data.locale != ? OR topic_search_data.version != ?", SiteSetting.default_locale, SearchIndexer::TOPIC_INDEX_VERSION)
+        .order("topics.id DESC")
+        .limit(limit)
+        .pluck(:id)
+    end
+
+    def load_problem_post_ids(limit)
+      Post
+        .joins(:topic)
+        .joins("LEFT JOIN post_search_data ON post_id = posts.id")
+        .where("posts.raw != ''")
+        .where("topics.deleted_at IS NULL")
+        .where("post_search_data.locale IS NULL OR post_search_data.locale != ? OR post_search_data.version != ?", SiteSetting.default_locale, SearchIndexer::POST_INDEX_VERSION)
+        .order("posts.id DESC")
+        .limit(limit)
+        .pluck(:id)
+    end
+
+    def load_problem_user_ids(limit)
+      User
+        .joins("LEFT JOIN user_search_data ON user_id = users.id")
+        .where("user_search_data.locale IS NULL OR user_search_data.locale != ? OR user_search_data.version != ?", SiteSetting.default_locale, SearchIndexer::USER_INDEX_VERSION)
+        .order("users.id ASC")
+        .limit(limit)
+        .pluck(:id)
+    end
+
   end
 end
diff --git a/app/jobs/scheduled/reviewable_priorities.rb b/app/jobs/scheduled/reviewable_priorities.rb
index 7e0f5bbd7e..da4d9c8148 100644
--- a/app/jobs/scheduled/reviewable_priorities.rb
+++ b/app/jobs/scheduled/reviewable_priorities.rb
@@ -14,15 +14,22 @@ class Jobs::ReviewablePriorities < ::Jobs::Scheduled
   end
 
   def execute(args)
-    return unless Reviewable.where('score > 0').count >= self.class.min_reviewables
+    min_priority_threshold = SiteSetting.reviewable_low_priority_threshold
+    reviewable_count = Reviewable.where(
+      "score > ? AND status = ?",
+      min_priority_threshold,
+      Reviewable.statuses[:approved]
+    ).count
+    return if reviewable_count < self.class.min_reviewables
 
-    res = DB.query_single(<<~SQL, target_count: self.class.target_count)
+    res = DB.query_single(<<~SQL, target_count: self.class.target_count, min_priority: min_priority_threshold)
       SELECT COALESCE(PERCENTILE_DISC(0.5) WITHIN GROUP (ORDER BY score), 0.0) AS medium,
         COALESCE(PERCENTILE_DISC(0.85) WITHIN GROUP (ORDER BY score), 0.0) AS high
       FROM (
         SELECT r.score
         FROM reviewables AS r
         INNER JOIN reviewable_scores AS rs ON rs.reviewable_id = r.id
+        WHERE r.score > :min_priority AND r.status = 1
         GROUP BY r.id
         HAVING COUNT(*) >= :target_count
       ) AS x
@@ -32,6 +39,10 @@ class Jobs::ReviewablePriorities < ::Jobs::Scheduled
 
     medium, high = res
 
-    Reviewable.set_priorities(medium: medium, high: high)
+    Reviewable.set_priorities(
+      low: min_priority_threshold,
+      medium: medium,
+      high: high
+    )
   end
 end
diff --git a/app/jobs/scheduled/schedule_backup.rb b/app/jobs/scheduled/schedule_backup.rb
index b64766a030..703a4515c4 100644
--- a/app/jobs/scheduled/schedule_backup.rb
+++ b/app/jobs/scheduled/schedule_backup.rb
@@ -26,12 +26,12 @@ module Jobs
     end
 
     def notify_user(ex)
-      post = SystemMessage.create_from_system_user(
+      SystemMessage.create_from_system_user(
         Discourse.system_user,
         :backup_failed,
+        target_group_names: Group[:admins].name,
         logs: "#{ex}\n" + ex.backtrace.join("\n")
       )
-      post.topic.invite_group(Discourse.system_user, Group[:admins])
     end
   end
 end
diff --git a/app/jobs/scheduled/topic_timer_enqueuer.rb b/app/jobs/scheduled/topic_timer_enqueuer.rb
new file mode 100644
index 0000000000..7fa2889b1f
--- /dev/null
+++ b/app/jobs/scheduled/topic_timer_enqueuer.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Jobs
+
+  # Runs periodically to look through topic timers that are ready to execute,
+  # and enqueues their related jobs.
+  #
+  # Any leftovers will be caught in the next run, because execute_at will
+  # be < now, and topic timers that have run are deleted on completion or
+  # otherwise have their execute_at time modified.
+  class TopicTimerEnqueuer < ::Jobs::Scheduled
+    every 1.minute
+
+    def execute(_args = nil)
+      timers = TopicTimer.pending_timers
+
+      timers.find_each do |timer|
+
+        # the typed job may not enqueue if it has already
+        # been scheduled with enqueue_at
+        timer.enqueue_typed_job
+      end
+    end
+  end
+end
diff --git a/app/mailers/invite_mailer.rb b/app/mailers/invite_mailer.rb
index 050f6e8a7c..6f5f284422 100644
--- a/app/mailers/invite_mailer.rb
+++ b/app/mailers/invite_mailer.rb
@@ -5,7 +5,7 @@ class InviteMailer < ActionMailer::Base
 
   layout 'email_template'
 
-  def send_invite(invite)
+  def send_invite(invite, invite_to_topic: false)
     # Find the first topic they were invited to
     first_topic = invite.topics.order(:created_at).first
 
@@ -19,7 +19,7 @@ class InviteMailer < ActionMailer::Base
       ActionView::Base.full_sanitizer.sanitize(invite.custom_message.gsub(/\n+/, " ").strip) : nil
 
     # If they were invited to a topic
-    if first_topic.present?
+    if invite_to_topic && first_topic.present?
       # get topic excerpt
       topic_excerpt = ""
       if first_topic.excerpt
@@ -36,7 +36,7 @@ class InviteMailer < ActionMailer::Base
                   template: sanitized_message ? 'custom_invite_mailer' : 'invite_mailer',
                   inviter_name: inviter_name,
                   site_domain_name: Discourse.current_hostname,
-                  invite_link: "#{Discourse.base_url}/invites/#{invite.invite_key}",
+                  invite_link: invite.link(with_email_token: true),
                   topic_title: topic_title,
                   topic_excerpt: topic_excerpt,
                   site_description: SiteSetting.site_description,
@@ -47,7 +47,7 @@ class InviteMailer < ActionMailer::Base
                   template: sanitized_message ? 'custom_invite_forum_mailer' : 'invite_forum_mailer',
                   inviter_name: inviter_name,
                   site_domain_name: Discourse.current_hostname,
-                  invite_link: "#{Discourse.base_url}/invites/#{invite.invite_key}",
+                  invite_link: invite.link(with_email_token: true),
                   site_description: SiteSetting.site_description,
                   site_title: SiteSetting.title,
                   user_custom_message: sanitized_message)
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 93ee5e3d88..fa99a5309f 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -37,6 +37,28 @@ class UserNotifications < ActionMailer::Base
                 new_user_tips: tips)
   end
 
+  def post_approved(user, opts = {})
+    post_url = opts.dig(:notification_data_hash, :post_url)
+
+    return if post_url.nil?
+
+    locale = user_locale(user)
+    build_email(user.email,
+      template: 'user_notifications.post_approved',
+      locale: locale,
+      base_url: Discourse.base_url,
+      post_url: post_url
+    )
+  end
+
+  def signup_after_reject(user, opts = {})
+    locale = user_locale(user)
+    build_email(user.email,
+                template: 'user_notifications.signup_after_reject',
+                locale: locale,
+                reject_reason: opts[:reject_reason])
+  end
+
   def suspicious_login(user, opts = {})
     ipinfo = DiscourseIpInfo.get(opts[:client_ip])
     location = ipinfo[:location]
@@ -136,7 +158,6 @@ class UserNotifications < ActionMailer::Base
       template: "user_notifications.account_silenced",
       locale: user_locale(user),
       reason: user_history.details,
-      message: user_history.context,
       silenced_till: I18n.l(user.silenced_till, format: :long)
     )
   end
@@ -151,7 +172,6 @@ class UserNotifications < ActionMailer::Base
       template: "user_notifications.account_suspended",
       locale: user_locale(user),
       reason: user_history.details,
-      message: user_history.context,
       suspended_till: I18n.l(user.suspended_till, format: :long)
     )
   end
diff --git a/app/models/about.rb b/app/models/about.rb
index df2d3ac3d4..3f8118f0a7 100644
--- a/app/models/about.rb
+++ b/app/models/about.rb
@@ -63,54 +63,55 @@ class About
 
   def stats
     @stats ||= {
-       topic_count: Topic.listable_topics.count,
-       post_count: Post.count,
-       user_count: User.real.count,
-       topics_7_days: Topic.listable_topics.where('created_at > ?', 7.days.ago).count,
-       topics_30_days: Topic.listable_topics.where('created_at > ?', 30.days.ago).count,
-       posts_7_days: Post.where('created_at > ?', 7.days.ago).count,
-       posts_30_days: Post.where('created_at > ?', 30.days.ago).count,
-       users_7_days: User.where('created_at > ?', 7.days.ago).count,
-       users_30_days: User.where('created_at > ?', 30.days.ago).count,
-       active_users_7_days: User.where('last_seen_at > ?', 7.days.ago).count,
-       active_users_30_days: User.where('last_seen_at > ?', 30.days.ago).count,
-       like_count: UserAction.where(action_type: UserAction::LIKE).count,
-       likes_7_days: UserAction.where(action_type: UserAction::LIKE).where("created_at > ?", 7.days.ago).count,
-       likes_30_days: UserAction.where(action_type: UserAction::LIKE).where("created_at > ?", 30.days.ago).count
+      topic_count: Topic.listable_topics.count,
+      topics_last_day: Topic.listable_topics.where('created_at > ?', 1.days.ago).count,
+      topics_7_days: Topic.listable_topics.where('created_at > ?', 7.days.ago).count,
+      topics_30_days: Topic.listable_topics.where('created_at > ?', 30.days.ago).count,
+      post_count: Post.count,
+      posts_last_day: Post.where('created_at > ?', 1.days.ago).count,
+      posts_7_days: Post.where('created_at > ?', 7.days.ago).count,
+      posts_30_days: Post.where('created_at > ?', 30.days.ago).count,
+      user_count: User.real.count,
+      users_last_day: User.real.where('created_at > ?', 1.days.ago).count,
+      users_7_days: User.real.where('created_at > ?', 7.days.ago).count,
+      users_30_days: User.real.where('created_at > ?', 30.days.ago).count,
+      active_users_last_day: User.where('last_seen_at > ?', 1.days.ago).count,
+      active_users_7_days: User.where('last_seen_at > ?', 7.days.ago).count,
+      active_users_30_days: User.where('last_seen_at > ?', 30.days.ago).count,
+      like_count: UserAction.where(action_type: UserAction::LIKE).count,
+      likes_last_day: UserAction.where(action_type: UserAction::LIKE).where("created_at > ?", 1.days.ago).count,
+      likes_7_days: UserAction.where(action_type: UserAction::LIKE).where("created_at > ?", 7.days.ago).count,
+      likes_30_days: UserAction.where(action_type: UserAction::LIKE).where("created_at > ?", 30.days.ago).count
     }
   end
 
   def category_moderators
     allowed_cats = Guardian.new(@user).allowed_category_ids
     return [] if allowed_cats.blank?
+
     cats_with_mods = Category.where.not(reviewable_by_group_id: nil).pluck(:id)
+
     category_ids = cats_with_mods & allowed_cats
     return [] if category_ids.blank?
 
     per_cat_limit = category_mods_limit / category_ids.size
     per_cat_limit = 1 if per_cat_limit < 1
-    results = DB.query(<<~SQL, category_ids: category_ids, per_cat_limit: per_cat_limit)
-      SELECT c.id category_id, user_ids
-      FROM categories c
-      CROSS JOIN LATERAL (
-        SELECT ARRAY(
-          SELECT u.id
-          FROM users u
-          JOIN group_users gu
-          ON gu.group_id = c.reviewable_by_group_id AND gu.user_id = u.id
-          ORDER BY last_seen_at DESC
-          LIMIT :per_cat_limit
-        ) AS user_ids
-      ) user_ids
-      WHERE c.id IN (:category_ids)
+
+    results = DB.query(<<~SQL, category_ids: category_ids)
+        SELECT c.id category_id
+             , (ARRAY_AGG(u.id ORDER BY u.last_seen_at DESC))[:#{per_cat_limit}] user_ids
+          FROM categories c
+          JOIN group_users gu ON gu.group_id = c.reviewable_by_group_id
+          JOIN users u ON u.id = gu.user_id
+         WHERE c.id IN (:category_ids)
+      GROUP BY c.id
+      ORDER BY c.position
     SQL
-    moderators = {}
-    User.where(id: results.map(&:user_ids).flatten.uniq).each do |user|
-      moderators[user.id] = user
-    end
-    moderators
+
+    mods = User.where(id: results.map(&:user_ids).flatten.uniq).index_by(&:id)
+
     results.map do |row|
-      CategoryMods.new(row.category_id, row.user_ids.map { |id| moderators[id] })
+      CategoryMods.new(row.category_id, mods.values_at(*row.user_ids))
     end
   end
 
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index 79fe3feac6..7185abb654 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -85,14 +85,12 @@ class AdminDashboardData
       'dashboard.bad_favicon_url',
       'dashboard.poll_pop3_timeout',
       'dashboard.poll_pop3_auth_error',
-      'dashboard.deprecated_api_usage',
-      'dashboard.update_mail_receiver'
     ]
 
     add_problem_check :rails_env_check, :host_names_check, :force_https_check,
                       :ram_check, :google_oauth2_config_check,
                       :facebook_config_check, :twitter_config_check,
-                      :github_config_check, :s3_config_check,
+                      :github_config_check, :s3_config_check, :s3_cdn_check,
                       :image_magick_check, :failing_emails_check,
                       :subfolder_ends_in_slash_check,
                       :pop3_polling_configuration, :email_polling_errored_recently,
@@ -190,6 +188,12 @@ class AdminDashboardData
     nil
   end
 
+  def s3_cdn_check
+    if (GlobalSetting.use_s3? || SiteSetting.enable_s3_uploads) && SiteSetting.Upload.s3_cdn_url.blank?
+      I18n.t('dashboard.s3_cdn_warning')
+    end
+  end
+
   def image_magick_check
     I18n.t('dashboard.image_magick_warning') if SiteSetting.create_thumbnails && !system("command -v convert >/dev/null;")
   end
diff --git a/app/models/api_key_scope.rb b/app/models/api_key_scope.rb
index d691965089..3534785161 100644
--- a/app/models/api_key_scope.rb
+++ b/app/models/api_key_scope.rb
@@ -36,7 +36,7 @@ class ApiKeyScope < ActiveRecord::Base
         users: {
           bookmarks: { actions: %w[users#bookmarks], params: %i[username] },
           sync_sso: { actions: %w[admin/users#sync_sso], params: %i[sso sig] },
-          show: { actions: %w[users#show], params: %i[username external_id] },
+          show: { actions: %w[users#show], params: %i[username external_id external_provider] },
           check_emails: { actions: %w[users#check_emails], params: %i[username] },
           update: { actions: %w[users#update], params: %i[username] },
           log_out: { actions: %w[admin/users#log_out] },
@@ -59,12 +59,18 @@ class ApiKeyScope < ActiveRecord::Base
 
     def scope_mappings
       plugin_mappings = DiscoursePluginRegistry.api_key_scope_mappings
+      return default_mappings if plugin_mappings.empty?
 
-      default_mappings.tap do |mappings|
-        plugin_mappings.each do |mapping|
-          mapping[:urls] = find_urls(mapping[:actions])
+      default_mappings.deep_dup.tap do |mappings|
 
-          mappings.deep_merge!(mapping)
+        plugin_mappings.each do |resource|
+          resource.each_value do |resource_actions|
+            resource_actions.each_value do |action_data|
+              action_data[:urls] = find_urls(action_data[:actions])
+            end
+          end
+
+          mappings.deep_merge!(resource)
         end
       end
     end
diff --git a/app/models/badge.rb b/app/models/badge.rb
index 92e02a50a9..32a52c2754 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 class Badge < ActiveRecord::Base
+  # TODO: Drop in July 2021
+  self.ignored_columns = %w{image}
+
+  include GlobalPath
+
   # NOTE: These badge ids are not in order! They are grouped logically.
   #       When picking an id, *search* for it.
 
@@ -100,6 +105,7 @@ class Badge < ActiveRecord::Base
 
   belongs_to :badge_type
   belongs_to :badge_grouping
+  belongs_to :image_upload, class_name: 'Upload'
 
   has_many :user_badges, dependent: :destroy
 
@@ -236,7 +242,7 @@ class Badge < ActiveRecord::Base
   end
 
   def default_icon=(val)
-    unless self.image
+    if self.image_upload_id.blank?
       self.icon ||= val
       self.icon = val if self.icon == "fa-certificate"
     end
@@ -289,15 +295,25 @@ class Badge < ActiveRecord::Base
     query.blank? && !system?
   end
 
+  def i18n_name
+    @i18n_name ||= self.class.i18n_name(name)
+  end
+
+  def image_url
+    if image_upload_id.present?
+      upload_cdn_path(image_upload.url)
+    end
+  end
+
+  def for_beginners?
+    id == Welcome || (badge_grouping_id == BadgeGrouping::GettingStarted && id != NewUserOfTheMonth)
+  end
+
   protected
 
   def ensure_not_system
     self.id = [Badge.maximum(:id) + 1, 100].max unless id
   end
-
-  def i18n_name
-    @i18n_name ||= self.class.i18n_name(name)
-  end
 end
 
 # == Schema Information
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 1dc75828f7..c4ccd2f24f 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -37,6 +37,7 @@ class Bookmark < ActiveRecord::Base
 
   validate :unique_per_post_for_user
   validate :ensure_sane_reminder_at_time
+  validate :bookmark_limit_not_reached
   validates :name, length: { maximum: 100 }
 
   # we don't care whether the post or topic is deleted,
@@ -65,6 +66,20 @@ class Bookmark < ActiveRecord::Base
     end
   end
 
+  def bookmark_limit_not_reached
+    return if user.bookmarks.count < SiteSetting.max_bookmarks_per_user
+    return if !new_record?
+
+    self.errors.add(
+      :base,
+      I18n.t(
+        "bookmarks.errors.too_many",
+        user_bookmarks_url: "#{Discourse.base_url}/my/activity/bookmarks",
+        limit: SiteSetting.max_bookmarks_per_user
+      )
+    )
+  end
+
   def no_reminder?
     self.reminder_at.blank? && self.reminder_type.blank?
   end
@@ -78,7 +93,7 @@ class Bookmark < ActiveRecord::Base
   end
 
   def clear_reminder!
-    update(
+    update!(
       reminder_at: nil,
       reminder_type: nil,
       reminder_last_sent_at: Time.zone.now,
@@ -135,6 +150,7 @@ end
 #  reminder_last_sent_at  :datetime
 #  reminder_set_at        :datetime
 #  auto_delete_preference :integer          default(0), not null
+#  pinned                 :boolean          default(FALSE)
 #
 # Indexes
 #
diff --git a/app/models/category.rb b/app/models/category.rb
index e62bf40671..e2c6edc9d4 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -343,8 +343,7 @@ class Category < ActiveRecord::Base
     if slug.present?
       # if we don't unescape it first we strip the % from the encoded version
       slug = SiteSetting.slug_generation_method == 'encoded' ? CGI.unescape(self.slug) : self.slug
-      # sanitize the custom slug
-      self.slug = Slug.sanitize(slug)
+      self.slug = Slug.for(slug, '', method: :encoded)
 
       if self.slug.blank?
         errors.add(:slug, :invalid)
@@ -786,7 +785,7 @@ class Category < ActiveRecord::Base
   end
 
   def update_reviewables
-    if SiteSetting.enable_category_group_moderation? && saved_change_to_reviewable_by_group_id?
+    if should_update_reviewables?
       Reviewable.where(category_id: id).update_all(reviewable_by_group_id: reviewable_by_group_id)
     end
   end
@@ -795,16 +794,23 @@ class Category < ActiveRecord::Base
     return nil if slug_path.empty?
     return nil if slug_path.size > SiteSetting.max_category_nesting
 
-    if SiteSetting.slug_generation_method == "encoded"
-      slug_path.map! { |slug| CGI.escape(slug) }
+    slug_path.map! do |slug|
+      if SiteSetting.slug_generation_method == "encoded"
+        CGI.escape(slug.downcase)
+      else
+        slug.downcase
+      end
     end
 
     query =
       slug_path.inject(nil) do |parent_id, slug|
-        Category.where(
-          slug: slug,
-          parent_category_id: parent_id,
-        ).select(:id)
+        category = Category.where(slug: slug, parent_category_id: parent_id)
+
+        if match_id = /^(\d+)-category/.match(slug).presence
+          category = category.or(Category.where(id: match_id[1], parent_category_id: parent_id))
+        end
+
+        category.select(:id)
       end
 
     Category.find_by_id(query)
@@ -908,6 +914,10 @@ class Category < ActiveRecord::Base
 
   private
 
+  def should_update_reviewables?
+    SiteSetting.enable_category_group_moderation? && saved_change_to_reviewable_by_group_id?
+  end
+
   def check_permissions_compatibility(parent_permissions, child_permissions)
     parent_groups = parent_permissions.map(&:first)
 
@@ -951,67 +961,68 @@ end
 #
 # Table name: categories
 #
-#  id                                :integer          not null, primary key
-#  name                              :string(50)       not null
-#  color                             :string(6)        default("0088CC"), not null
-#  topic_id                          :integer
-#  topic_count                       :integer          default(0), not null
-#  created_at                        :datetime         not null
-#  updated_at                        :datetime         not null
-#  user_id                           :integer          not null
-#  topics_year                       :integer          default(0)
-#  topics_month                      :integer          default(0)
-#  topics_week                       :integer          default(0)
-#  slug                              :string           not null
-#  description                       :text
-#  text_color                        :string(6)        default("FFFFFF"), not null
-#  read_restricted                   :boolean          default(FALSE), not null
-#  auto_close_hours                  :float
-#  post_count                        :integer          default(0), not null
-#  latest_post_id                    :integer
-#  latest_topic_id                   :integer
-#  position                          :integer
-#  parent_category_id                :integer
-#  posts_year                        :integer          default(0)
-#  posts_month                       :integer          default(0)
-#  posts_week                        :integer          default(0)
-#  email_in                          :string
-#  email_in_allow_strangers          :boolean          default(FALSE)
-#  topics_day                        :integer          default(0)
-#  posts_day                         :integer          default(0)
-#  allow_badges                      :boolean          default(TRUE), not null
-#  name_lower                        :string(50)       not null
-#  auto_close_based_on_last_post     :boolean          default(FALSE)
-#  topic_template                    :text
-#  contains_messages                 :boolean
-#  sort_order                        :string
-#  sort_ascending                    :boolean
-#  uploaded_logo_id                  :integer
-#  uploaded_background_id            :integer
-#  topic_featured_link_allowed       :boolean          default(TRUE)
-#  all_topics_wiki                   :boolean          default(FALSE), not null
-#  show_subcategory_list             :boolean          default(FALSE)
-#  num_featured_topics               :integer          default(3)
-#  default_view                      :string(50)
-#  subcategory_list_style            :string(50)       default("rows_with_featured_topics")
-#  default_top_period                :string(20)       default("all")
-#  mailinglist_mirror                :boolean          default(FALSE), not null
-#  minimum_required_tags             :integer          default(0), not null
-#  navigate_to_first_post_after_read :boolean          default(FALSE), not null
-#  search_priority                   :integer          default(0)
-#  allow_global_tags                 :boolean          default(FALSE), not null
-#  reviewable_by_group_id            :integer
-#  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")
+#  id                                        :integer          not null, primary key
+#  name                                      :string(50)       not null
+#  color                                     :string(6)        default("0088CC"), not null
+#  topic_id                                  :integer
+#  topic_count                               :integer          default(0), not null
+#  created_at                                :datetime         not null
+#  updated_at                                :datetime         not null
+#  user_id                                   :integer          not null
+#  topics_year                               :integer          default(0)
+#  topics_month                              :integer          default(0)
+#  topics_week                               :integer          default(0)
+#  slug                                      :string           not null
+#  description                               :text
+#  text_color                                :string(6)        default("FFFFFF"), not null
+#  read_restricted                           :boolean          default(FALSE), not null
+#  auto_close_hours                          :float
+#  post_count                                :integer          default(0), not null
+#  latest_post_id                            :integer
+#  latest_topic_id                           :integer
+#  position                                  :integer
+#  parent_category_id                        :integer
+#  posts_year                                :integer          default(0)
+#  posts_month                               :integer          default(0)
+#  posts_week                                :integer          default(0)
+#  email_in                                  :string
+#  email_in_allow_strangers                  :boolean          default(FALSE)
+#  topics_day                                :integer          default(0)
+#  posts_day                                 :integer          default(0)
+#  allow_badges                              :boolean          default(TRUE), not null
+#  name_lower                                :string(50)       not null
+#  auto_close_based_on_last_post             :boolean          default(FALSE)
+#  topic_template                            :text
+#  contains_messages                         :boolean
+#  sort_order                                :string
+#  sort_ascending                            :boolean
+#  uploaded_logo_id                          :integer
+#  uploaded_background_id                    :integer
+#  topic_featured_link_allowed               :boolean          default(TRUE)
+#  all_topics_wiki                           :boolean          default(FALSE), not null
+#  show_subcategory_list                     :boolean          default(FALSE)
+#  num_featured_topics                       :integer          default(3)
+#  default_view                              :string(50)
+#  subcategory_list_style                    :string(50)       default("rows_with_featured_topics")
+#  default_top_period                        :string(20)       default("all")
+#  mailinglist_mirror                        :boolean          default(FALSE), not null
+#  minimum_required_tags                     :integer          default(0), not null
+#  navigate_to_first_post_after_read         :boolean          default(FALSE), not null
+#  search_priority                           :integer          default(0)
+#  allow_global_tags                         :boolean          default(FALSE), not null
+#  reviewable_by_group_id                    :integer
+#  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")
+#  allow_unlimited_owner_edits_on_first_post :boolean          default(FALSE)
 #
 # Indexes
 #
 #  index_categories_on_email_in                (email_in) UNIQUE
-#  index_categories_on_forum_thread_count      (topic_count)
 #  index_categories_on_reviewable_by_group_id  (reviewable_by_group_id)
 #  index_categories_on_search_priority         (search_priority)
+#  index_categories_on_topic_count             (topic_count)
 #  unique_index_categories_on_name             (COALESCE(parent_category_id, '-1'::integer), name) UNIQUE
-#  unique_index_categories_on_slug             (COALESCE(parent_category_id, '-1'::integer), slug) UNIQUE WHERE ((slug)::text <> ''::text)
+#  unique_index_categories_on_slug             (COALESCE(parent_category_id, '-1'::integer), lower((slug)::text)) UNIQUE WHERE ((slug)::text <> ''::text)
 #
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index 306dfa3d39..4144f79b42 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class CategoryList < DraftableList
+class CategoryList
+  include ActiveModel::Serialization
+
   cattr_accessor :preloaded_topic_custom_fields
   self.preloaded_topic_custom_fields = Set.new
 
@@ -33,7 +35,6 @@ class CategoryList < DraftableList
       end
     end
 
-    super(@guardian.user)
   end
 
   def preload_key
@@ -66,6 +67,7 @@ class CategoryList < DraftableList
     @all_topics.each do |t|
       # hint for the serializer
       t.include_last_poster = true if @options[:include_topics]
+      t.dismissed = dismissed_topic?(t)
       @topics_by_id[t.id] = t
     end
 
@@ -75,6 +77,15 @@ class CategoryList < DraftableList
     end
   end
 
+  def dismissed_topic?(topic)
+    if @guardian.current_user
+      @dismissed_topic_users_lookup ||= DismissedTopicUser.lookup_for(@guardian.current_user, @all_topics)
+      @dismissed_topic_users_lookup.include?(topic.id)
+    else
+      false
+    end
+  end
+
   def find_categories
     @categories = Category.includes(
       :uploaded_background,
@@ -89,7 +100,7 @@ class CategoryList < DraftableList
 
     @categories = @categories.to_a
 
-    notification_levels = CategoryUser.notification_levels_for(@guardian)
+    notification_levels = CategoryUser.notification_levels_for(@guardian.user)
     default_notification_level = CategoryUser.default_notification_level
 
     allowed_topic_create = Set.new(Category.topic_create_allowed(@guardian).pluck(:id))
@@ -109,7 +120,7 @@ class CategoryList < DraftableList
           to_delete << c
         end
       end
-      @categories.each { |c| c.subcategory_ids = subcategories[c.id] }
+      @categories.each { |c| c.subcategory_ids = subcategories[c.id] || [] }
       @categories.delete_if { |c| to_delete.include?(c) }
     end
 
@@ -133,7 +144,7 @@ class CategoryList < DraftableList
 
   def prune_empty
     return if SiteSetting.allow_uncategorized_topics
-    @categories.delete_if { |c| c.uncategorized? && c.displayable_topics.blank? }
+    @categories.delete_if { |c| c.uncategorized? }
   end
 
   # Attach some data for serialization to each topic
diff --git a/app/models/category_user.rb b/app/models/category_user.rb
index 04fe4691b0..84d3744db0 100644
--- a/app/models/category_user.rb
+++ b/app/models/category_user.rb
@@ -201,18 +201,24 @@ class CategoryUser < ActiveRecord::Base
     SiteSetting.mute_all_categories_by_default ? notification_levels[:muted] : notification_levels[:regular]
   end
 
-  def self.notification_levels_for(guardian)
-    if guardian.anonymous?
+  def self.notification_levels_for(user)
+    # Anonymous users have all default categories set to regular tracking,
+    # except for default muted categories which stay muted.
+    if user.blank?
       notification_levels = [
         SiteSetting.default_categories_watching.split("|"),
         SiteSetting.default_categories_tracking.split("|"),
         SiteSetting.default_categories_watching_first_post.split("|"),
         SiteSetting.default_categories_regular.split("|")
-      ].flatten.map { |id| [id.to_i, self.notification_levels[:regular]] }
+      ].flatten.map do |id|
+        [id.to_i, self.notification_levels[:regular]]
+      end
 
-      notification_levels += SiteSetting.default_categories_muted.split("|").map { |id| [id.to_i, self.notification_levels[:muted]] }
+      notification_levels += SiteSetting.default_categories_muted.split("|").map do |id|
+        [id.to_i, self.notification_levels[:muted]]
+      end
     else
-      notification_levels = CategoryUser.where(user: guardian.user).pluck(:category_id, :notification_level)
+      notification_levels = CategoryUser.where(user: user).pluck(:category_id, :notification_level)
     end
 
     Hash[*notification_levels.flatten]
diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb
index 19a88ccc58..dd2cf021cc 100644
--- a/app/models/color_scheme.rb
+++ b/app/models/color_scheme.rb
@@ -50,7 +50,7 @@ class ColorScheme < ActiveRecord::Base
       "tertiary" =>          '416376',
       "quaternary" =>        '5e99b9',
       "header_background" => '86bddb',
-      "header_primary" =>    'ffffff',
+      "header_primary" =>    '203243',
       "highlight" =>         '86bddb',
       "danger" =>            'bf3c3c',
       "success" =>           '70db82',
@@ -155,14 +155,15 @@ class ColorScheme < ActiveRecord::Base
   end
 
   attr_accessor :is_base
+  attr_accessor :skip_publish
 
   has_many :color_scheme_colors, -> { order('id ASC') }, dependent: :destroy
 
   alias_method :colors, :color_scheme_colors
 
   before_save :bump_version
-  after_save :publish_discourse_stylesheet
-  after_save :dump_caches
+  after_save_commit :publish_discourse_stylesheet, unless: :skip_publish
+  after_save_commit :dump_caches
   after_destroy :dump_caches
   belongs_to :theme
 
@@ -241,6 +242,7 @@ class ColorScheme < ActiveRecord::Base
     end if params[:colors]
 
     new_color_scheme.colors = colors
+    new_color_scheme.skip_publish if params[:skip_publish]
     new_color_scheme.save
     new_color_scheme
   end
@@ -303,18 +305,27 @@ class ColorScheme < ActiveRecord::Base
 
   def publish_discourse_stylesheet
     if self.id
-      Stylesheet::Manager.clear_color_scheme_cache!
+      self.class.publish_discourse_stylesheets!(self.id)
+    end
+  end
 
-      theme_ids = Theme.where(color_scheme_id: self.id).pluck(:id)
-      if theme_ids.present?
-        Stylesheet::Manager.cache.clear
-        Theme.notify_theme_change(
-          theme_ids,
-          with_scheme: true,
-          clear_manager_cache: false,
-          all_themes: true
-        )
-      end
+  def self.publish_discourse_stylesheets!(id = nil)
+    Stylesheet::Manager.clear_color_scheme_cache!
+
+    theme_ids = []
+    if id
+      theme_ids = Theme.where(color_scheme_id: id).pluck(:id)
+    else
+      theme_ids = Theme.all.pluck(:id)
+    end
+    if theme_ids.present?
+      Stylesheet::Manager.cache.clear
+      Theme.notify_theme_change(
+        theme_ids,
+        with_scheme: true,
+        clear_manager_cache: false,
+        all_themes: true
+      )
     end
   end
 
diff --git a/app/models/concerns/second_factor_manager.rb b/app/models/concerns/second_factor_manager.rb
index 8d2429026e..d1974f9449 100644
--- a/app/models/concerns/second_factor_manager.rb
+++ b/app/models/concerns/second_factor_manager.rb
@@ -54,19 +54,19 @@ module SecondFactorManager
   end
 
   def totp_enabled?
-    !SiteSetting.enable_sso &&
+    !SiteSetting.enable_discourse_connect &&
       SiteSetting.enable_local_logins &&
       self&.user_second_factors.totps.exists?
   end
 
   def backup_codes_enabled?
-    !SiteSetting.enable_sso &&
+    !SiteSetting.enable_discourse_connect &&
       SiteSetting.enable_local_logins &&
       self&.user_second_factors.backup_codes.exists?
   end
 
   def security_keys_enabled?
-    !SiteSetting.enable_sso &&
+    !SiteSetting.enable_discourse_connect &&
       SiteSetting.enable_local_logins &&
       self&.security_keys.where(factor_type: UserSecurityKey.factor_types[:second_factor], enabled: true).exists?
   end
diff --git a/app/models/concerns/trashable.rb b/app/models/concerns/trashable.rb
index 1caf0de765..2a7e51fa81 100644
--- a/app/models/concerns/trashable.rb
+++ b/app/models/concerns/trashable.rb
@@ -4,31 +4,12 @@ module Trashable
   extend ActiveSupport::Concern
 
   included do
-    default_scope { where(with_deleted_scope_sql) }
+    default_scope { where(deleted_at: nil) }
+    scope :with_deleted, -> { unscope(where: :deleted_at) }
 
-    # scope unscoped does not work
     belongs_to :deleted_by, class_name: 'User'
   end
 
-  module ClassMethods
-    def with_deleted
-      # lifted from acts_as_paranoid, works around https://github.com/rails/rails/issues/4306
-      #
-      # with this in place Post.limit(10).with_deleted, will work as expected
-      #
-      scope = self.all
-
-      # must use :send here cause predicates is protected
-      # careful with updates of this API
-      scope.where_clause.send(:predicates).delete(with_deleted_scope_sql)
-      scope
-    end
-
-    def with_deleted_scope_sql
-      all.table[:deleted_at].eq(nil).to_sql
-    end
-  end
-
   def trashed?
     deleted_at.present?
   end
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index 6ec4cd55d5..4abfc61a4a 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -6,11 +6,11 @@ class DiscourseSingleSignOn < SingleSignOn
   class BannedExternalId < StandardError; end
 
   def self.sso_url
-    SiteSetting.sso_url
+    SiteSetting.discourse_connect_url
   end
 
   def self.sso_secret
-    SiteSetting.sso_secret
+    SiteSetting.discourse_connect_secret
   end
 
   def self.generate_sso(return_path = "/", secure_session:)
@@ -31,21 +31,37 @@ class DiscourseSingleSignOn < SingleSignOn
 
   def register_nonce(return_path)
     if nonce
-      @secure_session.set(nonce_key, return_path, expires: SingleSignOn.nonce_expiry_time)
+      if SiteSetting.discourse_connect_csrf_protection
+        @secure_session.set(nonce_key, return_path, expires: SingleSignOn.nonce_expiry_time)
+      else
+        Discourse.cache.write(nonce_key, return_path, expires_in: SingleSignOn.nonce_expiry_time)
+      end
     end
   end
 
   def nonce_valid?
-    nonce && @secure_session[nonce_key].present?
+    if SiteSetting.discourse_connect_csrf_protection
+      nonce && @secure_session[nonce_key].present?
+    else
+      nonce && Discourse.cache.read(nonce_key).present?
+    end
   end
 
   def return_path
-    @secure_session[nonce_key] || "/"
+    if SiteSetting.discourse_connect_csrf_protection
+      @secure_session[nonce_key] || "/"
+    else
+      Discourse.cache.read(nonce_key) || "/"
+    end
   end
 
   def expire_nonce!
     if nonce
-      @secure_session[nonce_key] = nil
+      if SiteSetting.discourse_connect_csrf_protection
+        @secure_session[nonce_key] = nil
+      else
+        Discourse.cache.delete nonce_key
+      end
     end
   end
 
@@ -124,7 +140,7 @@ class DiscourseSingleSignOn < SingleSignOn
     # The user might require approval
     user.create_reviewable
 
-    if bio && (user.user_profile.bio_raw.blank? || SiteSetting.sso_overrides_bio)
+    if bio && (user.user_profile.bio_raw.blank? || SiteSetting.discourse_connect_overrides_bio)
       user.user_profile.bio_raw = bio
       user.user_profile.save!
     end
@@ -174,7 +190,7 @@ class DiscourseSingleSignOn < SingleSignOn
   end
 
   def apply_group_rules(user)
-    if SiteSetting.sso_overrides_groups
+    if SiteSetting.discourse_connect_overrides_groups
       synchronize_groups(user)
       return
     end
@@ -223,7 +239,7 @@ class DiscourseSingleSignOn < SingleSignOn
 
         user = User.create!(user_params)
 
-        if SiteSetting.verbose_sso_logging
+        if SiteSetting.verbose_discourse_connect_logging
           Rails.logger.warn("Verbose SSO log: New User (user_id: #{user.id}) Params: #{user_params} User Params: #{user.attributes} User Errors: #{user.errors.full_messages} Email: #{user.primary_email.attributes} Email Error: #{user.primary_email.errors.full_messages}")
         end
       end
@@ -237,7 +253,7 @@ class DiscourseSingleSignOn < SingleSignOn
             Jobs.enqueue(:download_avatar_from_url,
               url: avatar_url,
               user_id: user.id,
-              override_gravatar: SiteSetting.sso_overrides_avatar
+              override_gravatar: SiteSetting.discourse_connect_overrides_avatar
             )
           end
 
@@ -277,13 +293,13 @@ class DiscourseSingleSignOn < SingleSignOn
   def change_external_attributes_and_override(sso_record, user)
     @email_changed = false
 
-    if SiteSetting.sso_overrides_email && user.email != Email.downcase(email)
+    if SiteSetting.auth_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?
+    if SiteSetting.auth_overrides_username? && username.present?
       if user.username.downcase == username.downcase
         user.username = username # there may be a change of case
       elsif user.username != username
@@ -291,7 +307,7 @@ class DiscourseSingleSignOn < SingleSignOn
       end
     end
 
-    if SiteSetting.sso_overrides_name && user.name != name && name.present?
+    if SiteSetting.auth_overrides_name && user.name != name && name.present?
       user.name = name || User.suggest_name(username.blank? ? email : username)
     end
 
@@ -301,18 +317,18 @@ class DiscourseSingleSignOn < SingleSignOn
 
     avatar_missing = user.uploaded_avatar_id.nil? || !Upload.exists?(user.uploaded_avatar_id)
 
-    if (avatar_missing || avatar_force_update || SiteSetting.sso_overrides_avatar) && avatar_url.present?
+    if (avatar_missing || avatar_force_update || SiteSetting.discourse_connect_overrides_avatar) && avatar_url.present?
       avatar_changed = sso_record.external_avatar_url != avatar_url
 
       if avatar_force_update || avatar_changed || avatar_missing
-        Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id, override_gravatar: SiteSetting.sso_overrides_avatar)
+        Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id, override_gravatar: SiteSetting.discourse_connect_overrides_avatar)
       end
     end
 
     if profile_background_url.present?
       profile_background_missing = user.user_profile.profile_background_upload.blank? || Upload.get_from_url(user.user_profile.profile_background_upload.url).blank?
 
-      if profile_background_missing || SiteSetting.sso_overrides_profile_background
+      if profile_background_missing || SiteSetting.discourse_connect_overrides_profile_background
         profile_background_changed = sso_record.external_profile_background_url != profile_background_url
         if profile_background_changed || profile_background_missing
           Jobs.enqueue(:download_profile_background_from_url,
@@ -326,7 +342,7 @@ class DiscourseSingleSignOn < SingleSignOn
 
     if card_background_url.present?
       card_background_missing = user.user_profile.card_background_upload.blank? || Upload.get_from_url(user.user_profile.card_background_upload.url).blank?
-      if card_background_missing || SiteSetting.sso_overrides_profile_background
+      if card_background_missing || SiteSetting.discourse_connect_overrides_profile_background
         card_background_changed = sso_record.external_card_background_url != card_background_url
         if card_background_changed || card_background_missing
           Jobs.enqueue(:download_profile_background_from_url,
diff --git a/app/models/dismissed_topic_user.rb b/app/models/dismissed_topic_user.rb
new file mode 100644
index 0000000000..d6e368c61f
--- /dev/null
+++ b/app/models/dismissed_topic_user.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class DismissedTopicUser < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :topic
+
+  def self.lookup_for(user, topics)
+    return [] if user.blank? || topics.blank?
+
+    topic_ids = topics.map(&:id)
+    DismissedTopicUser.where(topic_id: topic_ids, user_id: user.id).pluck(:topic_id)
+  end
+end
+
+# == Schema Information
+#
+# Table name: dismissed_topic_users
+#
+#  id         :bigint           not null, primary key
+#  user_id    :integer
+#  topic_id   :integer
+#  created_at :datetime
+#
+# Indexes
+#
+#  index_dismissed_topic_users_on_user_id_and_topic_id  (user_id,topic_id) UNIQUE
+#
diff --git a/app/models/do_not_disturb_timing.rb b/app/models/do_not_disturb_timing.rb
new file mode 100644
index 0000000000..38119c5a87
--- /dev/null
+++ b/app/models/do_not_disturb_timing.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class DoNotDisturbTiming < ActiveRecord::Base
+  belongs_to :user
+
+  validate :ends_at_greater_thans_starts_at
+
+  def ends_at_greater_thans_starts_at
+    if starts_at > ends_at
+      errors.add(:ends_at, :invalid)
+    end
+  end
+end
diff --git a/app/models/draft.rb b/app/models/draft.rb
index 6d34463bee..1371066104 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -132,6 +132,12 @@ class Draft < ActiveRecord::Base
     data if current_sequence == draft_sequence
   end
 
+  def self.has_topic_draft(user)
+    return if !user || !user.id || !User.human_user_id?(user.id)
+
+    Draft.where(user_id: user.id, draft_key: NEW_TOPIC).present?
+  end
+
   def self.clear(user, key, sequence)
     return if !user || !user.id || !User.human_user_id?(user.id)
 
diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb
index b79f3c9256..4afca805e2 100644
--- a/app/models/draft_sequence.rb
+++ b/app/models/draft_sequence.rb
@@ -9,14 +9,21 @@ class DraftSequence < ActiveRecord::Base
 
     return 0 if !User.human_user_id?(user_id)
 
-    h = { user_id: user_id, draft_key: key }
-    c = DraftSequence.find_by(h)
-    c ||= DraftSequence.new(h)
-    c.sequence ||= 0
-    c.sequence += 1
-    c.save!
-    DB.exec("DELETE FROM drafts WHERE user_id = :user_id AND draft_key = :draft_key AND sequence < :sequence", draft_key: key, user_id: user_id, sequence: c.sequence)
-    c.sequence
+    sequence =
+      DB.query_single(<<~SQL, user_id: user_id, draft_key: key).first
+        INSERT INTO draft_sequences (user_id, draft_key, sequence)
+        VALUES (:user_id, :draft_key, 1)
+        ON CONFLICT (user_id, draft_key) DO
+        UPDATE
+        SET sequence = draft_sequences.sequence + 1
+        WHERE draft_sequences.user_id = :user_id
+        AND draft_sequences.draft_key = :draft_key
+        RETURNING sequence
+      SQL
+
+    DB.exec("DELETE FROM drafts WHERE user_id = :user_id AND draft_key = :draft_key AND sequence < :sequence", draft_key: key, user_id: user_id, sequence: sequence)
+
+    sequence
   end
 
   def self.current(user, key)
diff --git a/app/models/draftable_list.rb b/app/models/draftable_list.rb
deleted file mode 100644
index 3a641a72a4..0000000000
--- a/app/models/draftable_list.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class DraftableList
-  include ActiveModel::Serialization
-
-  def initialize(user)
-    @current_user = user
-  end
-
-  def draft_key
-    @draft_key || Draft::NEW_TOPIC
-  end
-
-  def draft_sequence
-    @draft_sequence || DraftSequence.current(@current_user, draft_key)
-  end
-
-  def draft
-    @draft || Draft.get(@current_user, draft_key, draft_sequence) if @current_user
-  end
-
-  def draft_key=(key)
-    @draft_key = key
-  end
-
-  def draft_sequence=(sequence)
-    @draft_sequence = sequence
-  end
-
-  def draft=(draft)
-    @draft = draft
-  end
-end
diff --git a/app/models/email_change_request.rb b/app/models/email_change_request.rb
index be1448ff92..60b0d04183 100644
--- a/app/models/email_change_request.rb
+++ b/app/models/email_change_request.rb
@@ -13,7 +13,7 @@ class EmailChangeRequest < ActiveRecord::Base
   end
 
   def requested_by_admin?
-    self.requested_by.admin? && !self.requested_by_self?
+    self.requested_by&.admin? && !self.requested_by_self?
   end
 
   def requested_by_self?
diff --git a/app/models/email_token.rb b/app/models/email_token.rb
index 4feea3fa5a..8472881b8b 100644
--- a/app/models/email_token.rb
+++ b/app/models/email_token.rb
@@ -72,11 +72,12 @@ class EmailToken < ActiveRecord::Base
         user.save!
         user.create_reviewable unless skip_reviewable
         user.set_automatic_groups
+        DiscourseEvent.trigger(:user_confirmed_email, user)
       end
 
       if user
         if Invite.redeem_from_email(user.email).present?
-          return user.reload
+          user.reload
         end
         user
       end
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index f7c7b70c90..4a9012c307 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -73,7 +73,11 @@ class Emoji
 
   def self.url_for(name)
     name = name.delete_prefix(':').delete_suffix(':').gsub(/(.+):t([1-6])/, '\1/\2')
-    "#{Discourse.base_path}/images/emoji/#{SiteSetting.emoji_set}/#{name}.png?v=#{EMOJI_VERSION}"
+    if SiteSetting.external_emoji_url.blank?
+      "#{Discourse.base_path}/images/emoji/#{SiteSetting.emoji_set}/#{name}.png?v=#{EMOJI_VERSION}"
+    else
+      "#{SiteSetting.external_emoji_url}/#{SiteSetting.emoji_set}/#{name}.png?v=#{EMOJI_VERSION}"
+    end
   end
 
   def self.cache_key(name)
@@ -173,7 +177,6 @@ class Emoji
       end
 
       replacements["\u{2639}"] = 'frowning'
-      replacements["\u{263A}"] = 'slight_smile'
       replacements["\u{263B}"] = 'slight_smile'
       replacements["\u{2661}"] = 'heart'
       replacements["\u{2665}"] = 'heart'
diff --git a/app/models/emoji_set_site_setting.rb b/app/models/emoji_set_site_setting.rb
index 8437e0a307..0fe4772390 100644
--- a/app/models/emoji_set_site_setting.rb
+++ b/app/models/emoji_set_site_setting.rb
@@ -13,7 +13,6 @@ class EmojiSetSiteSetting < EnumSiteSetting
       { name: 'emoji_set.apple_international', value: 'apple' },
       { name: 'emoji_set.google', value: 'google' },
       { name: 'emoji_set.twitter', value: 'twitter' },
-      { name: 'emoji_set.emoji_one', value: 'emoji_one' },
       { name: 'emoji_set.win10', value: 'win10' },
       { name: 'emoji_set.google_classic', value: 'google_classic' },
       { name: 'emoji_set.facebook_messenger', value: 'facebook_messenger' },
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index abd555af0f..fba25eccdc 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -154,6 +154,14 @@ class GlobalSetting
     hash["reaping_frequency"] = connection_reaper_interval if connection_reaper_interval.present?
     hash["advisory_locks"] = !!self.db_advisory_locks
 
+    db_variables = provider.keys.filter { |k| k.to_s.starts_with? 'db_variables_' }
+    if db_variables.length > 0
+      hash["variables"] = {}
+      db_variables.each do |k|
+        hash["variables"][k.slice(('db_variables_'.length)..)] = self.public_send(k)
+      end
+    end
+
     { "production" => hash }
   end
 
@@ -163,6 +171,26 @@ class GlobalSetting
     @message_bus_config = nil
   end
 
+  def self.get_redis_replica_host
+    return redis_replica_host if redis_replica_host.present?
+    redis_slave_host if respond_to?(:redis_slave_host) && redis_slave_host.present?
+  end
+
+  def self.get_redis_replica_port
+    return redis_replica_port if redis_replica_port.present?
+    redis_slave_port if respond_to?(:redis_slave_port) && redis_slave_port.present?
+  end
+
+  def self.get_message_bus_redis_replica_host
+    return message_bus_redis_replica_host if message_bus_redis_replica_host.present?
+    message_bus_redis_slave_host if respond_to?(:message_bus_redis_slave_host) && message_bus_redis_slave_host.present?
+  end
+
+  def self.get_message_bus_redis_replica_port
+    return message_bus_redis_replica_port if message_bus_redis_replica_port.present?
+    message_bus_redis_slave_port if respond_to?(:message_bus_redis_slave_port) && message_bus_redis_slave_port.present?
+  end
+
   def self.redis_config
     @config ||=
       begin
@@ -170,9 +198,9 @@ class GlobalSetting
         c[:host] = redis_host if redis_host
         c[:port] = redis_port if redis_port
 
-        if redis_slave_host && redis_slave_port && defined?(RailsFailover)
-          c[:replica_host] = redis_slave_host
-          c[:replica_port] = redis_slave_port
+        if get_redis_replica_host && get_redis_replica_port && defined?(RailsFailover)
+          c[:replica_host] = get_redis_replica_host
+          c[:replica_port] = get_redis_replica_port
           c[:connector] = RailsFailover::Redis::Connector
         end
 
@@ -194,9 +222,9 @@ class GlobalSetting
         c[:host] = message_bus_redis_host if message_bus_redis_host
         c[:port] = message_bus_redis_port if message_bus_redis_port
 
-        if message_bus_redis_slave_host && message_bus_redis_slave_port
-          c[:replica_host] = message_bus_redis_slave_host
-          c[:replica_port] = message_bus_redis_slave_port
+        if get_message_bus_redis_replica_host && get_message_bus_redis_replica_port
+          c[:replica_host] = get_message_bus_redis_replica_host
+          c[:replica_port] = get_message_bus_redis_replica_port
           c[:connector] = RailsFailover::Redis::Connector
         end
 
diff --git a/app/models/group.rb b/app/models/group.rb
index c673afed46..16c47fd196 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -12,6 +12,7 @@ class Group < ActiveRecord::Base
   include HasCustomFields
   include AnonCacheInvalidator
   include HasDestroyedWebHook
+  include GlobalPath
 
   cattr_accessor :preloaded_custom_field_names
   self.preloaded_custom_field_names = Set.new
@@ -303,7 +304,7 @@ class Group < ActiveRecord::Base
       .where(groups: { id: id })
       .where('topics.archetype <> ?', Archetype.private_message)
       .where('topics.visible')
-      .where(post_type: Post.types[:regular])
+      .where(post_type: [Post.types[:regular], Post.types[:moderator_action]])
 
     if opts[:category_id].present?
       result = result.where('topics.category_id = ?', opts[:category_id].to_i)
@@ -642,10 +643,18 @@ class Group < ActiveRecord::Base
   end
 
   def remove(user)
-    result = self.group_users.where(user: user).each(&:destroy)
-    return false if result.blank?
+    group_user = self.group_users.find_by(user: user)
+    return false if group_user.blank?
+
+    has_webhooks = WebHook.active_web_hooks(:group_user)
+    payload = WebHook.generate_payload(:group_user, group_user, WebHookGroupUserSerializer) if has_webhooks
+    group_user.destroy
     user.update_columns(primary_group_id: nil) if user.primary_group_id == self.id
     DiscourseEvent.trigger(:user_removed_from_group, user, self)
+    WebHook.enqueue_hooks(:group_user, :user_removed_from_group,
+      id: group_user.id,
+      payload: payload
+    ) if has_webhooks
     true
   end
 
@@ -746,11 +755,18 @@ class Group < ActiveRecord::Base
 
   def flair_type
     return :icon if flair_icon.present?
-    return :image if flair_upload_id.present?
+    return :image if flair_upload.present?
   end
 
   def flair_url
-    flair_icon.presence || flair_upload&.short_path
+    case flair_type
+    when :icon
+      flair_icon
+    when :image
+      upload_cdn_path(flair_upload.url)
+    else
+      nil
+    end
   end
 
   [:muted, :regular, :tracking, :watching, :watching_first_post].each do |level|
@@ -838,6 +854,11 @@ class Group < ActiveRecord::Base
     )
   end
 
+  def message_count
+    return 0 unless self.has_messages
+    TopicAllowedGroup.where(group_id: self.id).joins(:topic).count
+  end
+
   protected
 
   def name_format_validator
@@ -1021,6 +1042,10 @@ end
 #  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
 #  smtp_server                        :string
 #  smtp_port                          :integer
 #  smtp_ssl                           :boolean
@@ -1032,13 +1057,10 @@ end
 #  imap_last_uid                      :integer          default(0), not null
 #  email_username                     :string
 #  email_password                     :string
-#  publish_read_state                 :boolean          default(FALSE), not null
-#  members_visibility_level           :integer          default(0), not null
-#  flair_icon                         :string
-#  flair_upload_id                    :integer
 #  imap_last_error                    :text
 #  imap_old_emails                    :integer
 #  imap_new_emails                    :integer
+#  allow_unknown_sender_topic_replies :boolean          default(FALSE)
 #
 # Indexes
 #
diff --git a/app/models/imap_sync_log.rb b/app/models/imap_sync_log.rb
index 46284a18d8..e1073dcd16 100644
--- a/app/models/imap_sync_log.rb
+++ b/app/models/imap_sync_log.rb
@@ -9,16 +9,25 @@ class ImapSyncLog < ActiveRecord::Base
     @levels ||= Enum.new(:debug, :info, :warn, :error)
   end
 
-  def self.log(message, level, group_id = nil)
+  def self.log(message, level, group_id = nil, db = true)
     now = Time.now.strftime("%Y-%m-%d %H:%M:%S.%L")
-    new_log = create(message: message, level: ImapSyncLog.levels[level], group_id: group_id)
-    Rails.logger.send(level, "#{level[0].upcase}, [#{now}] [IMAP] (group_id #{group_id}) #{message}")
+
+    new_log = if db
+      create(message: message, level: ImapSyncLog.levels[level], group_id: group_id)
+    end
+
+    if ENV["DEBUG_IMAP"]
+      Rails.logger.send(:warn, "#{level[0].upcase}, [#{now}] [IMAP] (group_id #{group_id}) #{message}")
+    else
+      Rails.logger.send(level, "#{level[0].upcase}, [#{now}] [IMAP] (group_id #{group_id}) #{message}")
+    end
+
     new_log
   end
 
-  def self.debug(message, group_or_id)
+  def self.debug(message, group_or_id, db: true)
     group_id = group_or_id.is_a?(Integer) ? group_or_id : group_or_id.id
-    log(message, :debug, group_id)
+    log(message, :debug, group_id, db)
   end
 
   def self.info(message, group_or_id)
diff --git a/app/models/incoming_email.rb b/app/models/incoming_email.rb
index c18739ddcf..0eec96f162 100644
--- a/app/models/incoming_email.rb
+++ b/app/models/incoming_email.rb
@@ -6,6 +6,8 @@ class IncomingEmail < ActiveRecord::Base
   belongs_to :post
   belongs_to :group, foreign_key: :imap_group_id, class_name: 'Group'
 
+  validates :created_via, presence: true
+
   scope :errored,  -> { where("NOT is_bounce AND error IS NOT NULL") }
 
   scope :addressed_to, -> (email) do
@@ -28,6 +30,59 @@ class IncomingEmail < ActiveRecord::Base
       )
     SQL
   end
+
+  scope :without_raw, -> { select(self.column_names - ["raw"]) }
+
+  def self.created_via_types
+    @types ||= Enum.new(
+      unknown: 0,
+      handle_mail: 1,
+      pop3_poll: 2,
+      imap: 3,
+      group_smtp: 4
+    )
+  end
+
+  def as_mail_message
+    @mail_message ||= Mail.new(self.raw)
+  end
+
+  def raw_headers
+    as_mail_message.header.raw_source
+  end
+
+  def raw_body
+    as_mail_message.body
+  end
+
+  def to_addresses_split
+    self.to_addresses&.split(";") || []
+  end
+
+  def cc_addresses_split
+    self.cc_addresses&.split(";") || []
+  end
+
+  def to_addresses=(to)
+    if to&.is_a?(Array)
+      to = to.map(&:downcase).join(";")
+    end
+    super(to)
+  end
+
+  def cc_addresses=(cc)
+    if cc&.is_a?(Array)
+      cc = cc.map(&:downcase).join(";")
+    end
+    super(cc)
+  end
+
+  def from_address=(from)
+    if from&.is_a?(Array)
+      from = from.first
+    end
+    super(from)
+  end
 end
 
 # == Schema Information
@@ -54,6 +109,7 @@ end
 #  imap_uid          :integer
 #  imap_sync         :boolean
 #  imap_group_id     :bigint
+#  created_via       :integer          default(0), not null
 #
 # Indexes
 #
diff --git a/app/models/invite.rb b/app/models/invite.rb
index 260a79aeca..2a2c1d8404 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -2,6 +2,9 @@
 
 class Invite < ActiveRecord::Base
   class UserExists < StandardError; end
+  class RedemptionFailed < StandardError; end
+  class ValidationFailed < StandardError; end
+
   include RateLimiter::OnCreateRecord
   include Trashable
 
@@ -25,25 +28,29 @@ class Invite < ActiveRecord::Base
   has_many :groups, through: :invited_groups
   has_many :topic_invites
   has_many :topics, through: :topic_invites, source: :topic
+
   validates_presence_of :invited_by_id
   validates :email, email: true, allow_blank: true
+  validate :ensure_max_redemptions_allowed
+  validate :user_doesnt_already_exist
 
   before_create do
-    self.invite_key ||= SecureRandom.hex
+    self.invite_key ||= SecureRandom.base58(10)
     self.expires_at ||= SiteSetting.invite_expiry_days.days.from_now
   end
 
+  before_save do
+    if will_save_change_to_email?
+      self.email_token = email.present? ? SecureRandom.hex : nil
+    end
+  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
@@ -55,12 +62,21 @@ class Invite < ActiveRecord::Base
 
     if user && user.id != self.invited_users&.first&.user_id
       @email_already_exists = true
-      errors.add(:email)
+      errors.add(:base, I18n.t(
+        "invite.user_exists",
+        email: email,
+        username: user.username,
+        base_path: Discourse.base_path
+      ))
     end
   end
 
   def is_invite_link?
-    max_redemptions_allowed > 1
+    email.blank?
+  end
+
+  def redeemable?
+    !redeemed? && !expired? && !deleted_at? && !destroyed? && link_valid?
   end
 
   def redeemed?
@@ -75,228 +91,152 @@ class Invite < ActiveRecord::Base
     expires_at < Time.zone.now
   end
 
-  # link_valid? indicates whether the invite link can be used to log in to the site
+  def link(with_email_token: false)
+    with_email_token ? "#{Discourse.base_url}/invites/#{invite_key}?t=#{email_token}"
+                     : "#{Discourse.base_url}/invites/#{invite_key}"
+  end
+
   def link_valid?
     invalidated_at.nil?
   end
 
-  def redeem(username: nil, name: nil, password: nil, user_custom_fields: nil, ip_address: nil)
-    if !expired? && !destroyed? && link_valid?
-      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
-
-  def self.invite_by_email(email, invited_by, topic = nil, group_ids = nil, custom_message = nil)
-    create_invite_by_email(email, invited_by,
-      topic: topic,
-      group_ids: group_ids,
-      custom_message: custom_message,
-      emailed_status: emailed_status_types[:pending]
-    )
-  end
-
-  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,
-      emailed_status: emailed_status_types[:not_required]
-    )
-
-    "#{Discourse.base_url}/invites/#{invite.invite_key}" if invite
-  end
-
-  # Create an invite for a user, supplying an optional topic
-  #
-  # Return the previously existing invite if already exists. Returns nil if the invite can't be created.
-  def self.create_invite_by_email(email, invited_by, opts = nil)
+  def self.generate(invited_by, opts = nil)
     opts ||= {}
 
-    topic = opts[:topic]
-    group_ids = opts[:group_ids]
-    custom_message = opts[:custom_message]
-    emailed_status = opts[:emailed_status] || emailed_status_types[:pending]
-    lower_email = Email.downcase(email)
+    email = Email.downcase(opts[:email]) if opts[:email].present?
 
-    if user = find_user_by_email(lower_email)
-      raise UserExists.new(I18n.t("invite.user_exists",
-        email: lower_email,
+    if user = find_user_by_email(email)
+      raise UserExists.new(I18n.t(
+        "invite.user_exists",
+        email: email,
         username: user.username,
         base_path: Discourse.base_path
       ))
     end
 
-    invite = Invite.with_deleted
-      .where(email: lower_email, invited_by_id: invited_by.id)
-      .order('created_at DESC')
-      .first
+    if email.present?
+      invite = Invite
+        .with_deleted
+        .where(email: email, invited_by_id: invited_by.id)
+        .order('created_at DESC')
+        .first
 
-    if invite && (invite.expired? || invite.deleted_at)
-      invite.destroy
-      invite = nil
+      if invite && (invite.expired? || invite.deleted_at)
+        invite.destroy
+        invite = nil
+      end
+    end
+
+    emailed_status = if opts[:skip_email] || invite&.emailed_status == emailed_status_types[:not_required]
+      emailed_status_types[:not_required]
+    elsif opts[:emailed_status].present?
+      opts[:emailed_status]
+    elsif email.present?
+      emailed_status_types[:pending]
+    else
+      emailed_status_types[:not_required]
     end
 
     if invite
-      if invite.emailed_status == Invite.emailed_status_types[:not_required]
-        emailed_status = invite.emailed_status
-      end
-
       invite.update_columns(
         created_at: Time.zone.now,
         updated_at: Time.zone.now,
-        expires_at: SiteSetting.invite_expiry_days.days.from_now,
+        expires_at: opts[:expires_at] || SiteSetting.invite_expiry_days.days.from_now,
         emailed_status: emailed_status
       )
     else
-      create_args = {
-        invited_by: invited_by,
-        email: lower_email,
-        emailed_status: emailed_status
-      }
+      create_args = opts.slice(:email, :moderator, :custom_message, :max_redemptions_allowed)
+      create_args[:invited_by] = invited_by
+      create_args[:email] = email
+      create_args[:emailed_status] = emailed_status
+      create_args[:expires_at] = opts[:expires_at] || SiteSetting.invite_expiry_days.days.from_now
 
-      create_args[:moderator] = true if opts[:moderator]
-      create_args[:custom_message] = custom_message if custom_message
       invite = Invite.create!(create_args)
     end
 
-    if topic && !invite.topic_invites.pluck(:topic_id).include?(topic.id)
-      invite.topic_invites.create!(invite_id: invite.id, topic_id: topic.id)
-      # to correct association
-      topic.reload
+    topic_id = opts[:topic]&.id || opts[:topic_id]
+    if topic_id.present?
+      invite.topic_invites.find_or_create_by!(topic_id: topic_id)
     end
 
+    group_ids = opts[:group_ids]
     if group_ids.present?
-      group_ids = group_ids - invite.invited_groups.pluck(:group_id)
-
       group_ids.each do |group_id|
-        invite.invited_groups.create!(group_id: group_id)
+        invite.invited_groups.find_or_create_by!(group_id: group_id)
       end
     end
 
     if emailed_status == emailed_status_types[:pending]
-      invite.update_column(:emailed_status, Invite.emailed_status_types[:sending])
-      Jobs.enqueue(:invite_email, invite_id: invite.id)
+      invite.update_column(:emailed_status, emailed_status_types[:sending])
+      Jobs.enqueue(:invite_email, invite_id: invite.id, invite_to_topic: opts[:invite_to_topic])
     end
 
     invite.reload
+  end
+
+  def redeem(email: nil, username: nil, name: nil, password: nil, user_custom_fields: nil, ip_address: nil, session: nil, email_token: nil)
+    return if !redeemable?
+
+    if is_invite_link? && UserEmail.exists?(email: email)
+      raise UserExists.new I18n.t("invite_link.email_taken")
+    end
+
+    email = self.email if email.blank? && !is_invite_link?
+    InviteRedeemer.new(
+      invite: self,
+      email: email,
+      username: username,
+      name: name,
+      password: password,
+      user_custom_fields: user_custom_fields,
+      ip_address: ip_address,
+      session: session,
+      email_token: email_token
+    ).redeem
+  end
+
+  def self.redeem_from_email(email)
+    invite = Invite.find_by(email: Email.downcase(email))
+    InviteRedeemer.new(invite: invite, email: invite.email).redeem if invite
     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
 
-  def self.get_group_ids(group_names)
-    group_ids = []
-    if group_names
-      group_names = group_names.split(',')
-      group_names.each { |group_name|
-        group_detail = Group.find_by_name(group_name)
-        group_ids.push(group_detail.id) if group_detail
-      }
-    end
-    group_ids
-  end
-
-  def self.find_all_pending_invites_from(inviter, offset = 0, limit = SiteSetting.invites_per_page)
-    Invite.single_use_invites
+  def self.pending(inviter)
+    Invite.distinct
       .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')
+      .where('redemption_count < max_redemptions_allowed')
+      .where('expires_at > ?', Time.zone.now)
       .order('invites.updated_at DESC')
-      .limit(limit)
-      .offset(offset)
   end
 
-  def self.find_pending_invites_from(inviter, offset = 0)
-    find_all_pending_invites_from(inviter, offset)
+  def self.expired(inviter)
+    Invite.distinct
+      .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_by_id: inviter.id)
+      .where('redemption_count < max_redemptions_allowed')
+      .where('expires_at < ?', Time.zone.now)
+      .order('invites.expires_at ASC')
   end
 
-  def self.find_pending_invites_count(inviter)
-    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)
+  def self.redeemed_users(inviter)
+    InvitedUser
+      .joins("LEFT JOIN invites ON invites.id = invited_users.invite_id")
       .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)
+      .order('invited_users.redeemed_at DESC')
       .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_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)
-    if email_or_username
-      where(
-        '(LOWER(invites.email) LIKE :filter) or (LOWER(users.username) LIKE :filter)',
-        filter: "%#{email_or_username.downcase}%"
-      )
-    else
-      all
-    end
-  end
-
   def self.invalidate_for_email(email)
     i = Invite.find_by(email: Email.downcase(email))
     if i
@@ -306,38 +246,11 @@ class Invite < ActiveRecord::Base
     i
   end
 
-  def self.redeem_from_email(email)
-    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, invalidated_at: nil, 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.single_use_invites
-      .left_outer_joins(:invited_users)
-      .where('invited_users.user_id IS NULL AND invites.email IS NOT NULL AND invited_by_id = ?', user_id)
-      .group('invites.id')
-      .find_each do |invite|
-      invite.resend_invite
-    end
-  end
-
-  def self.rescind_all_expired_invites_from(user)
-    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
-
   def limit_invites_per_day
     RateLimiter.new(invited_by, "invites-per-day", SiteSetting.max_invites_per_day, 1.day.to_i)
   end
@@ -347,11 +260,14 @@ class Invite < ActiveRecord::Base
   end
 
   def ensure_max_redemptions_allowed
-    if self.max_redemptions_allowed.nil? || self.max_redemptions_allowed == 1
-      self.max_redemptions_allowed ||= 1
+    if self.max_redemptions_allowed.nil?
+      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))
+      limit = invited_by&.staff? ? SiteSetting.invite_link_max_redemptions_limit
+                                 : SiteSetting.invite_link_max_redemptions_limit_users
+
+      if !self.max_redemptions_allowed.between?(1, limit)
+        errors.add(:max_redemptions_allowed, I18n.t("invite_link.max_redemptions_limit", max_limit: limit))
       end
     end
   end
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index 997d970711..a6353d1843 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -1,20 +1,18 @@
 # frozen_string_literal: true
 
-InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_custom_fields, :ip_address, keyword_init: true) do
+InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_custom_fields, :ip_address, :session, :email_token, keyword_init: true) do
 
   def redeem
     Invite.transaction do
       if invite_was_redeemed?
         process_invitation
-        return invited_user
+        invited_user
       end
     end
-
-    nil
   end
 
   # extracted from User cause it is very specific to invites
-  def self.create_user_from_invite(email:, invite:, username: nil, name: nil, password: nil, user_custom_fields: nil, ip_address: nil)
+  def self.create_user_from_invite(email:, invite:, username: nil, name: nil, password: nil, user_custom_fields: nil, ip_address: nil, session: nil, email_token: nil)
     user = User.where(staged: true).with_email(email.strip.downcase).first
     user.unstage! if user
 
@@ -61,9 +59,22 @@ InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_
       user.password_required!
     end
 
-    user.save!
+    authenticator = UserAuthenticator.new(user, session, require_password: false)
 
-    if invite.emailed_status != Invite.emailed_status_types[:not_required] && email == invite.email
+    if !authenticator.has_authenticator? && !SiteSetting.enable_local_logins
+      raise ActiveRecord::RecordNotSaved.new(I18n.t("login.incorrect_username_email_or_password"))
+    end
+
+    authenticator.start
+
+    if authenticator.email_valid? && !authenticator.authenticated?
+      raise ActiveRecord::RecordNotSaved.new(I18n.t("login.incorrect_username_email_or_password"))
+    end
+
+    user.save!
+    authenticator.finish
+
+    if invite.emailed_status != Invite.emailed_status_types[:not_required] && email == invite.email && invite.email_token.present? && email_token == invite.email_token
       user.email_tokens.create!(email: user.email)
       user.activate
     end
@@ -100,9 +111,8 @@ InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_
     end
 
     @invited_user_record = InvitedUser.create!(invite_id: invite.id, redeemed_at: Time.zone.now)
-    if invite.is_invite_link? && @invited_user_record.present?
+    if @invited_user_record.present?
       Invite.increment_counter(:redemption_count, invite.id)
-    elsif @invited_user_record.present?
       delete_duplicate_invites
     end
 
@@ -111,7 +121,17 @@ InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_
 
   def get_invited_user
     result = get_existing_user
-    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 ||= InviteRedeemer.create_user_from_invite(
+      email: email,
+      invite: invite,
+      username: username,
+      name: name,
+      password: password,
+      user_custom_fields: user_custom_fields,
+      ip_address: ip_address,
+      session: session,
+      email_token: email_token
+    )
     result.send_welcome_message = false
     result
   end
@@ -145,7 +165,7 @@ InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_
   end
 
   def approve_account_if_needed
-    if invited_user.present? && reviewable_user = ReviewableUser.find_by(target: invited_user)
+    if invited_user.present? && reviewable_user = ReviewableUser.find_by(target: invited_user, status: Reviewable.statuses[:pending])
       reviewable_user.perform(
         invite.invited_by,
         :approve_user,
@@ -165,7 +185,8 @@ InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_
   end
 
   def delete_duplicate_invites
-    Invite.single_use_invites
+    Invite
+      .where('invites.max_redemptions_allowed = 1')
       .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)
diff --git a/app/models/invited_group.rb b/app/models/invited_group.rb
index 063dbf4e20..d00595786d 100644
--- a/app/models/invited_group.rb
+++ b/app/models/invited_group.rb
@@ -15,3 +15,7 @@ end
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #
+# Indexes
+#
+#  index_invited_groups_on_group_id_and_invite_id  (group_id,invite_id) UNIQUE
+#
diff --git a/app/models/invited_user.rb b/app/models/invited_user.rb
index 078878c7e7..efb994372f 100644
--- a/app/models/invited_user.rb
+++ b/app/models/invited_user.rb
@@ -2,7 +2,7 @@
 
 class InvitedUser < ActiveRecord::Base
   belongs_to :user
-  belongs_to :invite
+  belongs_to :invite, -> { unscope(where: :deleted_at) }
 
   validates_presence_of :invite_id
   validates_uniqueness_of :invite_id, scope: :user_id, conditions: -> { where.not(user_id: nil) }
diff --git a/app/models/locale_site_setting.rb b/app/models/locale_site_setting.rb
index 947fe5724a..f541a27f48 100644
--- a/app/models/locale_site_setting.rb
+++ b/app/models/locale_site_setting.rb
@@ -56,7 +56,7 @@ class LocaleSiteSetting < EnumSiteSetting
   end
 
   FALLBACKS ||= {
-    en_US: :en
+    en_GB: :en
   }
 
   def self.fallback_locale(locale)
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 8b731c5a48..b5a07a32e2 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -4,6 +4,8 @@ class Notification < ActiveRecord::Base
   belongs_to :user
   belongs_to :topic
 
+  has_one :shelved_notification
+
   MEMBERSHIP_REQUEST_CONSOLIDATION_WINDOW_HOURS = 24
 
   validates_presence_of :data
@@ -282,7 +284,11 @@ class Notification < ActiveRecord::Base
   end
 
   def send_email
-    NotificationEmailer.process_notification(self) if !skip_send_email
+    return if skip_send_email
+
+    user.do_not_disturb? ?
+      ShelvedNotification.create(notification_id: self.id) :
+      NotificationEmailer.process_notification(self)
   end
 
 end
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index f73db79eb7..228b3dc54b 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -183,7 +183,7 @@ class OptimizedImage < ActiveRecord::Base
     end
   end
 
-  IM_DECODERS ||= /\A(jpe?g|png|ico|gif)\z/i
+  IM_DECODERS ||= /\A(jpe?g|png|ico|gif|webp)\z/i
 
   def self.prepend_decoder!(path, ext_path = nil, opts = nil)
     opts ||= {}
diff --git a/app/models/permalink.rb b/app/models/permalink.rb
index 844678923d..11ea908d9f 100644
--- a/app/models/permalink.rb
+++ b/app/models/permalink.rb
@@ -8,6 +8,8 @@ class Permalink < ActiveRecord::Base
 
   before_validation :normalize_url
 
+  validates :url, uniqueness: true
+
   class Normalizer
     attr_reader :source
 
diff --git a/app/models/post.rb b/app/models/post.rb
index 7033f98abf..306bf38645 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -15,8 +15,9 @@ class Post < ActiveRecord::Base
     "image_url" # TODO(2021-06-01): remove
   ]
 
-  cattr_accessor :plugin_permitted_create_params
+  cattr_accessor :plugin_permitted_create_params, :plugin_permitted_update_params
   self.plugin_permitted_create_params = {}
+  self.plugin_permitted_update_params = {}
 
   # increase this number to force a system wide post rebake
   # Recreate `index_for_rebake_old` when the number is increased
@@ -34,7 +35,7 @@ class Post < ActiveRecord::Base
 
   has_many :post_replies
   has_many :replies, through: :post_replies
-  has_many :post_actions
+  has_many :post_actions, dependent: :destroy
   has_many :topic_links
   has_many :group_mentions, dependent: :destroy
 
@@ -166,6 +167,10 @@ class Post < ActiveRecord::Base
     includes(:post_details).find_by(post_details: { key: key, value: value })
   end
 
+  def self.find_by_number(topic_id, post_number)
+    find_by(topic_id: topic_id, post_number: post_number)
+  end
+
   def whisper?
     post_type == Post.types[:whisper]
   end
@@ -210,6 +215,7 @@ class Post < ActiveRecord::Base
       if topic.private_message?
         opts[:user_ids] = User.human_users.where("admin OR moderator").pluck(:id)
         opts[:user_ids] |= topic.allowed_users.pluck(:id)
+        opts[:user_ids] |= topic.allowed_group_users.pluck(:id)
       else
         opts[:group_ids] = topic.secure_group_ids
       end
@@ -517,7 +523,7 @@ class Post < ActiveRecord::Base
       (topic.present? && (topic.private_message? || topic.category&.read_restricted))
   end
 
-  def hide!(post_action_type_id, reason = nil)
+  def hide!(post_action_type_id, reason = nil, custom_message: nil)
     return if hidden?
 
     reason ||= hidden_at ?
@@ -529,6 +535,7 @@ class Post < ActiveRecord::Base
     self.hidden = true
     self.hidden_at = Time.zone.now
     self.hidden_reason_id = reason
+    self.skip_unique_check = true
     save!
 
     Topic.where(
@@ -548,11 +555,16 @@ class Post < ActiveRecord::Base
         )
       }
 
+      message = custom_message
+      if message.nil?
+        message = hiding_again ? :post_hidden_again : :post_hidden
+      end
+
       Jobs.enqueue_in(
         5.seconds,
         :send_system_message,
         user_id: user.id,
-        message_type: hiding_again ? :post_hidden_again : :post_hidden,
+        message_type: message,
         message_options: options
       )
     end
@@ -946,9 +958,9 @@ class Post < ActiveRecord::Base
     end
   end
 
-  def update_uploads_secure_status
+  def update_uploads_secure_status(source:)
     if Discourse.store.external?
-      self.uploads.each { |upload| upload.update_secure_status }
+      self.uploads.each { |upload| upload.update_secure_status(source: source) }
     end
   end
 
@@ -1174,4 +1186,5 @@ end
 #  index_posts_on_topic_id_and_post_number   (topic_id,post_number) UNIQUE
 #  index_posts_on_topic_id_and_sort_order    (topic_id,sort_order)
 #  index_posts_on_user_id_and_created_at     (user_id,created_at)
+#  index_posts_user_and_likes                (user_id,like_count DESC,created_at DESC) WHERE (post_number > 1)
 #
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index dcac3b290e..c7d28f810f 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -89,6 +89,9 @@ class PostAction < ActiveRecord::Base
     I18n.with_locale(SiteSetting.default_locale) do
       related_post.topic.add_moderator_post(moderator, I18n.t(message_key))
     end
+
+    # archive message for moderators
+    GroupArchivedMessage.archive!(Group[:moderators].id, related_post.topic)
   end
 
   def staff_already_replied?(topic)
diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb
index e56d1f7c49..bd8d58e79b 100644
--- a/app/models/post_analyzer.rb
+++ b/app/models/post_analyzer.rb
@@ -122,6 +122,10 @@ class PostAnalyzer
     cooked_stripped.css("a").each do |l|
       # Don't include @mentions in the link count
       next if link_is_a_mention?(l)
+      # Don't include heading anchor in the link count
+      next if link_is_an_anchor?(l)
+      # Don't include hashtags in the link count
+      next if link_is_a_hashtag?(l)
       @raw_links << l['href'].to_s
     end
 
@@ -144,10 +148,17 @@ class PostAnalyzer
   private
 
   def link_is_a_mention?(l)
-    html_class = l['class']
-    return false if html_class.blank?
     href = l['href'].to_s
-    html_class.to_s['mention'] && href[/^\/u\//] || href[/^\/users\//]
+    l['class'].to_s['mention'] && (href.start_with?("#{Discourse.base_path}/u/") || href.start_with?("#{Discourse.base_path}/users/"))
+  end
+
+  def link_is_an_anchor?(l)
+    l['class'].to_s['anchor'] && l['href'].to_s.start_with?('#')
+  end
+
+  def link_is_a_hashtag?(l)
+    href = l['href'].to_s
+    l['class'].to_s['hashtag'] && (href.start_with?("#{Discourse.base_path}/c/") || href.start_with?("#{Discourse.base_path}/tag/"))
   end
 
 end
diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index 184fd3b9ee..27a352738e 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -71,11 +71,12 @@ class PostMover
     create_temp_table
     delete_invalid_post_timings
     move_each_post
-    notify_users_that_posts_have_moved
+    create_moderator_post_in_original_topic
     update_statistics
     update_user_actions
     update_last_post_stats
     update_upload_security_status
+    update_bookmarks
 
     if moving_all_posts
       @original_topic.update_status('closed', true, @user)
@@ -438,19 +439,6 @@ class PostMover
     UserAction.synchronize_target_topic_ids(posts.map(&:id))
   end
 
-  def notify_users_that_posts_have_moved
-    enqueue_notification_job
-    create_moderator_post_in_original_topic
-  end
-
-  def enqueue_notification_job
-    Jobs.enqueue(
-      :notify_moved_posts,
-      post_ids: post_ids,
-      moved_by_id: user.id
-    )
-  end
-
   def create_moderator_post_in_original_topic
     move_type_str = PostMover.move_types[@move_type].to_s
     move_type_str.sub!("topic", "message") if @move_to_pm
@@ -504,6 +492,15 @@ class PostMover
     end
   end
 
+  def update_bookmarks
+    Bookmark.where(post_id: post_ids).update_all(topic_id: @destination_topic.id)
+
+    DB.after_commit do
+      Jobs.enqueue(:sync_topic_user_bookmarked, topic_id: @original_topic.id)
+      Jobs.enqueue(:sync_topic_user_bookmarked, topic_id: @destination_topic.id)
+    end
+  end
+
   def watch_new_topic
     if @destination_topic.archetype == Archetype.private_message
       if @original_topic.archetype == Archetype.private_message
@@ -538,6 +535,12 @@ class PostMover
   def enqueue_jobs(topic)
     @post_creator.enqueue_jobs if @post_creator
 
+    Jobs.enqueue(
+      :notify_moved_posts,
+      post_ids: post_ids,
+      moved_by_id: user.id
+    )
+
     Jobs.enqueue(
       :delete_inaccessible_notifications,
       topic_id: topic.id
diff --git a/app/models/post_timing.rb b/app/models/post_timing.rb
index 8251d42907..6738687da3 100644
--- a/app/models/post_timing.rb
+++ b/app/models/post_timing.rb
@@ -40,6 +40,8 @@ class PostTiming < ActiveRecord::Base
     # still happen, if it happens we just don't care, its an invalid record anyway
     return if row_count == 0
     Post.where(['topic_id = :topic_id and post_number = :post_number', args]).update_all 'reads = reads + 1'
+
+    return if Topic.exists?(id: args[:topic_id], archetype: Archetype.private_message)
     UserStat.where(user_id: args[:user_id]).update_all 'posts_read_count = posts_read_count + 1'
   end
 
@@ -165,7 +167,7 @@ class PostTiming < ActiveRecord::Base
     if join_table.length > 0
       sql = <<~SQL
       UPDATE post_timings t
-      SET msecs = t.msecs + x.msecs
+      SET msecs = LEAST(t.msecs::bigint + x.msecs, 2^31 - 1)
       FROM (#{join_table.join(" UNION ALL ")}) x
       WHERE x.topic_id = t.topic_id AND
             x.post_number = t.post_number AND
diff --git a/app/models/published_page.rb b/app/models/published_page.rb
index 5322efaea7..8345ae05bb 100644
--- a/app/models/published_page.rb
+++ b/app/models/published_page.rb
@@ -26,18 +26,18 @@ class PublishedPage < ActiveRecord::Base
   def self.publish!(publisher, topic, slug, options = {})
     pp = nil
 
-    transaction do
+    results = 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)
-        return [true, pp]
+        [true, pp]
       end
     end
 
-    [false, pp]
+    results || [false, pp]
   end
 
   def self.unpublish!(publisher, topic)
diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index 93abeca91d..80e515cae7 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -125,6 +125,11 @@ class RemoteTheme < ActiveRecord::Base
       self.last_error_text = nil
     ensure
       self.save!
+      begin
+        importer.cleanup!
+      rescue => e
+        Rails.logger.warn("Failed cleanup remote git #{e}")
+      end
     end
   end
 
@@ -177,6 +182,8 @@ class RemoteTheme < ActiveRecord::Base
       updated_fields << theme.set_field(**opts.merge(value: value))
     end
 
+    theme.convert_settings
+
     # Destroy fields that no longer exist in the remote theme
     field_ids_to_destroy = theme.theme_fields.pluck(:id) - updated_fields.map { |tf| tf&.id }
     ThemeField.where(id: field_ids_to_destroy).destroy_all
diff --git a/app/models/report.rb b/app/models/report.rb
index 9a62774d9e..b0f97d7ae5 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -223,7 +223,8 @@ class Report
     Discourse.cache.read(cache_key(report))
   end
 
-  def self.cache(report, duration)
+  def self.cache(report)
+    duration = report.error == :exception ? 1.minute : 35.minutes
     Discourse.cache.write(cache_key(report), report.as_json, expires_in: duration)
   end
 
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 3fba7ef9c7..0e8af0bcb0 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -6,7 +6,7 @@ class Reviewable < ActiveRecord::Base
   class InvalidAction < StandardError
     def initialize(action_id, klass)
       @action_id, @klass = action_id, klass
-      super("Can't peform `#{action_id}` on #{klass.name}")
+      super("Can't perform `#{action_id}` on #{klass.name}")
     end
   end
 
@@ -95,7 +95,7 @@ class Reviewable < ActiveRecord::Base
   end
 
   def self.types
-    %w[ReviewableFlaggedPost ReviewableQueuedPost ReviewableUser]
+    %w[ReviewableFlaggedPost ReviewableQueuedPost ReviewableUser ReviewablePost]
   end
 
   def self.custom_filters
@@ -175,7 +175,13 @@ class Reviewable < ActiveRecord::Base
         reviewable.save!
       else
         reviewable = find_by(target: target)
-        reviewable.log_history(:transitioned, created_by) if old_status != statuses[:pending]
+
+        if old_status != statuses[:pending]
+          # If we're transitioning back from reviewed to pending, we should recalculate
+          # the score to prevent posts from being hidden.
+          reviewable.recalculate_score
+          reviewable.log_history(:transitioned, created_by)
+        end
       end
     end
 
@@ -213,6 +219,8 @@ class Reviewable < ActiveRecord::Base
     update(score: self.score + rs.score, latest_score: rs.created_at, force_review: force_review)
     topic.update(reviewable_score: topic.reviewable_score + rs.score) if topic
 
+    DiscourseEvent.trigger(:reviewable_score_updated, self)
+
     rs
   end
 
@@ -429,6 +437,7 @@ class Reviewable < ActiveRecord::Base
 
   def self.list_for(
     user,
+    ids: nil,
     status: :pending,
     category_id: nil,
     topic_id: nil,
@@ -437,13 +446,12 @@ class Reviewable < ActiveRecord::Base
     offset: nil,
     priority: nil,
     username: nil,
+    reviewed_by: nil,
     sort_order: nil,
     from_date: nil,
     to_date: nil,
     additional_filters: {}
   )
-    min_score = Reviewable.min_score_for_priority(priority)
-
     order = case sort_order
             when 'score_asc'
               'reviewables.score ASC, reviewables.created_at DESC'
@@ -464,12 +472,30 @@ class Reviewable < ActiveRecord::Base
     result = viewable_by(user, order: order)
 
     result = by_status(result, status)
+    result = result.where(id: ids) if ids
     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 reviewed_by
+      reviewed_by_id = User.find_by_username(reviewed_by)&.id
+      return [] if reviewed_by_id.nil?
+
+      result = result.joins(<<~SQL
+        INNER JOIN(
+          SELECT reviewable_id
+          FROM reviewable_histories
+          WHERE reviewable_history_type = #{ReviewableHistory.types[:transitioned]} AND
+          status <> #{Reviewable.statuses[:pending]} AND created_by_id = #{reviewed_by_id}
+        ) AS rh ON rh.reviewable_id = reviewables.id
+      SQL
+      )
+    end
+
+    min_score = Reviewable.min_score_for_priority(priority)
+
     if min_score > 0 && status == :pending
       result = result.where("reviewables.score >= ? OR reviewables.force_review", min_score)
     elsif min_score > 0
@@ -564,8 +590,6 @@ class Reviewable < ActiveRecord::Base
     SQL
   end
 
-protected
-
   def recalculate_score
     # pending/agreed scores count
     sql = <<~SQL
@@ -607,8 +631,14 @@ protected
     )
 
     self.score = result[0].score
+
+    DiscourseEvent.trigger(:reviewable_score_updated, self)
+
+    self.score
   end
 
+protected
+
   def increment_version!(version = nil)
     version_result = nil
 
@@ -688,6 +718,8 @@ end
 #  latest_score            :datetime
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
+#  force_review            :boolean          default(FALSE), not null
+#  reject_reason           :text
 #
 # Indexes
 #
diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb
index d481ec55ad..dada954b57 100644
--- a/app/models/reviewable_flagged_post.rb
+++ b/app/models/reviewable_flagged_post.rb
@@ -127,7 +127,6 @@ class ReviewableFlaggedPost < Reviewable
 
     create_result(:success, :ignored) do |result|
       result.update_flag_stats = { status: :ignored, user_ids: actions.map(&:user_id) }
-      result.recalculate_score = true
     end
   end
 
@@ -205,7 +204,6 @@ class ReviewableFlaggedPost < Reviewable
 
     create_result(:success, :rejected) do |result|
       result.update_flag_stats = { status: :disagreed, user_ids: actions.map(&:user_id) }
-      result.recalculate_score = true
     end
   end
 
diff --git a/app/models/reviewable_post.rb b/app/models/reviewable_post.rb
new file mode 100644
index 0000000000..8dbb06596b
--- /dev/null
+++ b/app/models/reviewable_post.rb
@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+class ReviewablePost < Reviewable
+  def self.action_aliases
+    { reject_and_silence: :reject_and_suspend }
+  end
+
+  def self.queue_for_review_if_possible(post, created_or_edited_by)
+    return unless SiteSetting.review_every_post
+    return if post.post_type != Post.types[:regular] || post.topic.private_message?
+    return if Reviewable.where(target: post, status: Reviewable.statuses[:pending]).exists?
+    return if created_or_edited_by.bot? || created_or_edited_by.staff? || created_or_edited_by.has_trust_level?(TrustLevel[4])
+    system_user = Discourse.system_user
+
+    needs_review!(
+      target: post,
+      topic: post.topic,
+      created_by: system_user,
+      reviewable_by_moderator: true,
+      potential_spam: false
+    ).tap do |reviewable|
+      reviewable.add_score(
+        system_user,
+        ReviewableScore.types[:needs_approval],
+        force_review: true
+      )
+    end
+  end
+
+  def build_actions(actions, guardian, args)
+    return unless pending?
+
+    if post.trashed? && guardian.can_recover_post?(post)
+      build_action(actions, :approve_and_restore, icon: 'check')
+    elsif post.hidden?
+      build_action(actions, :approve_and_unhide, icon: 'check')
+    else
+      build_action(actions, :approve, icon: 'check')
+    end
+
+    reject = actions.add_bundle(
+      "#{id}-reject", icon: 'times', label: 'reviewables.actions.reject.bundle_title'
+    )
+
+    if post.trashed?
+      build_action(actions, :reject_and_keep_deleted, icon: 'trash-alt', bundle: reject)
+    elsif guardian.can_delete_post_or_topic?(post)
+      build_action(actions, :reject_and_delete, icon: 'trash-alt', bundle: reject)
+    end
+
+    if guardian.can_suspend?(target_created_by)
+      build_action(actions, :reject_and_suspend, icon: 'ban', bundle: reject, client_action: 'suspend')
+      build_action(actions, :reject_and_silence, icon: 'microphone-slash', bundle: reject, client_action: 'silence')
+    end
+  end
+
+  def perform_approve(performed_by, _args)
+    successful_transition :approved, recalculate_score: false
+  end
+
+  def perform_reject_and_keep_deleted(performed_by, _args)
+    successful_transition :rejected, recalculate_score: false
+  end
+
+  def perform_approve_and_restore(performed_by, _args)
+    PostDestroyer.new(performed_by, post).recover
+
+    successful_transition :approved, recalculate_score: false
+  end
+
+  def perform_approve_and_unhide(performed_by, _args)
+    post.unhide!
+
+    successful_transition :approved, recalculate_score: false
+  end
+
+  def perform_reject_and_delete(performed_by, _args)
+    PostDestroyer.new(performed_by, post, reviewable: self).destroy
+
+    successful_transition :rejected, recalculate_score: false
+  end
+
+  def perform_reject_and_suspend(performed_by, _args)
+    successful_transition :rejected, recalculate_score: false
+  end
+
+  private
+
+  def post
+    @post ||= (target || Post.with_deleted.find_by(id: target_id))
+  end
+
+  def build_action(actions, id, icon:, button_class: nil, bundle: nil, client_action: nil, confirm: false)
+    actions.add(id, bundle: bundle) do |action|
+      prefix = "reviewables.actions.#{id}"
+      action.icon = icon
+      action.button_class = button_class
+      action.label = "#{prefix}.title"
+      action.description = "#{prefix}.description"
+      action.client_action = client_action
+      action.confirm_message = "#{prefix}.confirm" if confirm
+    end
+  end
+
+  def successful_transition(to_state, recalculate_score: true)
+    create_result(:success, to_state)  do |result|
+      result.recalculate_score = recalculate_score
+      result.update_flag_stats = { status: to_state, user_ids: [created_by_id] }
+    end
+  end
+end
diff --git a/app/models/reviewable_queued_post.rb b/app/models/reviewable_queued_post.rb
index af0e9860e7..8d108c6707 100644
--- a/app/models/reviewable_queued_post.rb
+++ b/app/models/reviewable_queued_post.rb
@@ -97,7 +97,7 @@ class ReviewableQueuedPost < Reviewable
     Notification.create!(
       notification_type: Notification.types[:post_approved],
       user_id: created_by.id,
-      data: {},
+      data: { post_url: created_post.url }.to_json,
       topic_id: created_post.topic_id,
       post_number: created_post.post_number
     )
diff --git a/app/models/reviewable_user.rb b/app/models/reviewable_user.rb
index d5bbbb077a..93291bfd40 100644
--- a/app/models/reviewable_user.rb
+++ b/app/models/reviewable_user.rb
@@ -27,11 +27,13 @@ class ReviewableUser < Reviewable
     actions.add(:reject_user_delete, bundle: reject) do |a|
       a.icon = 'user-times'
       a.label = "reviewables.actions.reject_user.delete.title"
+      a.require_reject_reason = !is_a_suspect_user?
       a.description = "reviewables.actions.reject_user.delete.description"
     end
     actions.add(:reject_user_block, bundle: reject) do |a|
       a.icon = 'ban'
       a.label = "reviewables.actions.reject_user.block.title"
+      a.require_reject_reason = !is_a_suspect_user?
       a.description = "reviewables.actions.reject_user.block.description"
     end
   end
@@ -59,19 +61,33 @@ class ReviewableUser < Reviewable
     if target.present?
       destroyer = UserDestroyer.new(performed_by)
 
-      if reviewable_scores.any? { |rs| rs.reason == 'suspect_user' }
-        DiscourseEvent.trigger(:suspect_user_deleted, target)
-      end
+      DiscourseEvent.trigger(:suspect_user_deleted, target) if is_a_suspect_user?
 
       begin
+        self.reject_reason = args[:reject_reason]
+
+        if args[:send_email] && SiteSetting.must_approve_users?
+          # Execute job instead of enqueue because user has to exists to send email
+          Jobs::CriticalUserEmail.new.execute({
+            type: :signup_after_reject,
+            user_id: target.id,
+            reject_reason: self.reject_reason
+          })
+        end
+
         delete_args = {}
         delete_args[:block_ip] = true if args[:block_ip]
         delete_args[:block_email] = true if args[:block_email]
+        delete_args[:context] = if performed_by.id == Discourse.system_user.id
+          I18n.t("user.destroy_reasons.reviewable_reject_auto")
+        else
+          I18n.t("user.destroy_reasons.reviewable_reject")
+        end
 
         destroyer.destroy(target, delete_args)
       rescue UserDestroyer::PostsExistError
         # If a user has posts, we won't delete them to preserve their content.
-        # However the reviable record will be "rejected" and they will remain
+        # However the reviewable record will be "rejected" and they will remain
         # unapproved in the database. A staff member can still approve them
         # via the admin.
       end
@@ -93,6 +109,10 @@ class ReviewableUser < Reviewable
     user.approved_by ||= approved_by
     user.approved_at ||= Time.zone.now
   end
+
+  def is_a_suspect_user?
+    reviewable_scores.any? { |rs| rs.reason == 'suspect_user' }
+  end
 end
 
 # == Schema Information
diff --git a/app/models/s3_region_site_setting.rb b/app/models/s3_region_site_setting.rb
index 0f6e03a208..55ae18edd3 100644
--- a/app/models/s3_region_site_setting.rb
+++ b/app/models/s3_region_site_setting.rb
@@ -14,6 +14,7 @@ class S3RegionSiteSetting < EnumSiteSetting
     [
       'ap-northeast-1',
       'ap-northeast-2',
+      'ap-east-1',
       'ap-south-1',
       'ap-southeast-1',
       'ap-southeast-2',
diff --git a/app/models/shelved_notification.rb b/app/models/shelved_notification.rb
new file mode 100644
index 0000000000..79e4bee249
--- /dev/null
+++ b/app/models/shelved_notification.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ShelvedNotification < ActiveRecord::Base
+  belongs_to :notification
+
+  def process
+    NotificationEmailer.process_notification(notification, no_delay: true)
+  end
+end
diff --git a/app/models/site.rb b/app/models/site.rb
index de8cfe0be5..c7c2d7a1c1 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -55,7 +55,7 @@ class Site
 
       by_id = {}
 
-      notification_levels = CategoryUser.notification_levels_for(@guardian)
+      notification_levels = CategoryUser.notification_levels_for(@guardian.user)
       default_notification_level = CategoryUser.default_notification_level
 
       categories.each do |category|
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 866adf3fce..44c23734a0 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -95,7 +95,9 @@ class Tag < ActiveRecord::Base
   end
 
   def self.top_tags(limit_arg: nil, category: nil, guardian: nil)
-    limit = limit_arg || SiteSetting.max_tags_in_filter_list
+    # we add 1 to max_tags_in_filter_list to efficiently know we have more tags
+    # than the limit. Frontend is responsible to enforce limit.
+    limit = limit_arg || (SiteSetting.max_tags_in_filter_list + 1)
     scope_category_ids = (guardian || Guardian.new).allowed_category_ids
 
     if category
@@ -148,11 +150,15 @@ class Tag < ActiveRecord::Base
   end
 
   def self.include_tags?
-    SiteSetting.tagging_enabled && SiteSetting.show_filter_by_tag
+    SiteSetting.tagging_enabled
+  end
+
+  def url
+    "#{Discourse.base_path}/tag/#{UrlHelper.encode_component(self.name)}"
   end
 
   def full_url
-    "#{Discourse.base_url}/tag/#{self.name}"
+    "#{Discourse.base_url}/tag/#{UrlHelper.encode_component(self.name)}"
   end
 
   def index_search
diff --git a/app/models/tag_user.rb b/app/models/tag_user.rb
index 22328e21d2..6870ffbb5b 100644
--- a/app/models/tag_user.rb
+++ b/app/models/tag_user.rb
@@ -192,6 +192,28 @@ class TagUser < ActiveRecord::Base
                  auto_track_tag: TopicUser.notification_reasons[:auto_track_tag])
   end
 
+  def self.notification_levels_for(user)
+    # Anonymous users have all default tags set to regular tracking,
+    # except for default muted tags which stay muted.
+    if user.blank?
+      notification_levels = [
+        SiteSetting.default_tags_watching_first_post.split("|"),
+        SiteSetting.default_tags_watching.split("|"),
+        SiteSetting.default_tags_tracking.split("|")
+      ].flatten.map do |name|
+        [name, self.notification_levels[:regular]]
+      end
+
+      notification_levels += SiteSetting.default_tags_muted.split("|").map do |name|
+        [name, self.notification_levels[:muted]]
+      end
+    else
+      notification_levels = TagUser.where(user: user).joins(:tag).pluck("tags.name", :notification_level)
+    end
+
+    Hash[*notification_levels.flatten]
+  end
+
 end
 
 # == Schema Information
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 57917e0236..fd11e64f97 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
+require_dependency 'global_path'
+require 'csv'
+require 'json_schemer'
+
 class Theme < ActiveRecord::Base
+  include GlobalPath
 
   attr_accessor :child_components
 
@@ -23,6 +28,7 @@ class Theme < ActiveRecord::Base
   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'
+  has_many :extra_scss_fields, -> { where(target_id: Theme.targets[:extra_scss]) }, class_name: 'ThemeField'
 
   validate :component_validations
 
@@ -32,6 +38,19 @@ class Theme < ActiveRecord::Base
     where('user_selectable OR id = ?', SiteSetting.default_theme_id)
   }
 
+  scope :include_relations, -> {
+    includes(:child_themes,
+      :parent_themes,
+      :remote_theme,
+      :theme_settings,
+      :settings_field,
+      :locale_fields,
+      :user,
+      :color_scheme,
+      theme_fields: :upload
+    )
+  }
+
   def notify_color_change(color, scheme: nil)
     scheme ||= color.color_scheme
     changed_colors << color if color
@@ -58,7 +77,7 @@ class Theme < ActiveRecord::Base
       theme_fields.select(&:basic_html_field?).each(&:invalidate_baked!)
     end
 
-    Theme.expire_site_cache! if saved_change_to_user_selectable? || saved_change_to_name?
+    Theme.expire_site_cache! if saved_change_to_color_scheme_id? || saved_change_to_user_selectable? || saved_change_to_name?
     notify_with_scheme = saved_change_to_color_scheme_id?
 
     reload
@@ -122,7 +141,7 @@ class Theme < ActiveRecord::Base
     SvgSprite.expire_cache
   end
 
-  BASE_COMPILER_VERSION = 17
+  BASE_COMPILER_VERSION = 50
   def self.compiler_version
     get_set_cache "compiler_version" do
       dependencies = [
@@ -256,11 +275,11 @@ class Theme < ActiveRecord::Base
     end
   end
 
-  def self.lookup_field(theme_ids, target, field)
+  def self.lookup_field(theme_ids, target, field, skip_transformation: false)
     return if theme_ids.blank?
     theme_ids = [theme_ids] unless Array === theme_ids
 
-    theme_ids = transform_ids(theme_ids)
+    theme_ids = transform_ids(theme_ids) if !skip_transformation
     cache_key = "#{theme_ids.join(",")}:#{target}:#{field}:#{Theme.compiler_version}"
     lookup = @cache[cache_key]
     return lookup.html_safe if lookup
@@ -291,7 +310,7 @@ class Theme < ActiveRecord::Base
   end
 
   def self.targets
-    @targets ||= Enum.new(common: 0, desktop: 1, mobile: 2, settings: 3, translations: 4, extra_scss: 5, extra_js: 6)
+    @targets ||= Enum.new(common: 0, desktop: 1, mobile: 2, settings: 3, translations: 4, extra_scss: 5, extra_js: 6, tests_js: 7)
   end
 
   def self.lookup_target(target_id)
@@ -311,8 +330,7 @@ class Theme < ActiveRecord::Base
     if all_themes
       message = theme_ids.map { |id| refresh_message_for_targets(targets, id) }.flatten
     else
-      parent_ids = Theme.where(id: theme_ids).joins(:parent_themes).pluck(:parent_theme_id).uniq
-      message = refresh_message_for_targets(targets, theme_ids | parent_ids).flatten
+      message = refresh_message_for_targets(targets, theme_ids).flatten
     end
 
     MessageBus.publish('/file-change', message)
@@ -353,6 +371,8 @@ class Theme < ActiveRecord::Base
     if target == :translations
       fields = ThemeField.find_first_locale_fields(theme_ids, I18n.fallbacks[name])
     else
+      target = :mobile if target == :mobile_theme
+      target = :desktop if target == :desktop_theme
       fields = ThemeField.find_by_theme_ids(theme_ids)
         .where(target_id: [Theme.targets[target], Theme.targets[:common]])
       fields = fields.where(name: name.to_s) unless name.nil?
@@ -368,7 +388,7 @@ class Theme < ActiveRecord::Base
   end
 
   def list_baked_fields(target, name)
-    theme_ids = Theme.transform_ids([id])
+    theme_ids = Theme.transform_ids([id], extend: name == :color_definitions)
     self.class.list_baked_fields(theme_ids, target, name)
   end
 
@@ -478,6 +498,16 @@ class Theme < ActiveRecord::Base
     end
   end
 
+  def cached_default_settings
+    Discourse.cache.fetch("default_settings_for_theme_#{self.id}", expires_in: 30.minutes) do
+      settings_hash = {}
+      self.settings.each do |setting|
+        settings_hash[setting.name] = setting.default
+      end
+      settings_hash
+    end
+  end
+
   def build_settings_hash
     hash = {}
     self.settings.each do |setting|
@@ -486,7 +516,7 @@ class Theme < ActiveRecord::Base
 
     theme_uploads = {}
     upload_fields.each do |field|
-      theme_uploads[field.name] = field.upload.url
+      theme_uploads[field.name] = Discourse.store.cdn_url(field.upload.url)
     end
     hash['theme_uploads'] = theme_uploads if theme_uploads.present?
 
@@ -496,6 +526,7 @@ class Theme < ActiveRecord::Base
   def clear_cached_settings!
     DB.after_commit do
       Discourse.cache.delete("settings_for_theme_#{self.id}")
+      Discourse.cache.delete("default_settings_for_theme_#{self.id}")
     end
   end
 
@@ -581,8 +612,105 @@ class Theme < ActiveRecord::Base
     find_disable_action_log&.created_at
   end
 
+  def with_scss_load_paths
+    return yield([]) if self.extra_scss_fields.empty?
+
+    ThemeStore::ZipExporter.new(self).with_export_dir(extra_scss_only: true) do |dir|
+      yield ["#{dir}/stylesheets"]
+    end
+  end
+
+  def scss_variables
+    return if all_theme_variables.empty? && included_settings.empty?
+
+    contents = +""
+
+    all_theme_variables&.each do |field|
+      if field.type_id == ThemeField.types[:theme_upload_var]
+        if upload = field.upload
+          url = upload_cdn_path(upload.url)
+          contents << "$#{field.name}: unquote(\"#{url}\");"
+        end
+      else
+        contents << to_scss_variable(field.name, field.value)
+      end
+    end
+
+    included_settings&.each do |name, value|
+      next if name == "theme_uploads"
+      contents << to_scss_variable(name, value)
+    end
+
+    contents
+  end
+
+  def has_scss(target)
+    name = target == :embedded_theme ? :embedded_scss : :scss
+    list_baked_fields(target, name).count > 0
+  end
+
+  def convert_settings
+    settings.each do |setting|
+      setting_row = ThemeSetting.where(theme_id: self.id, name: setting.name.to_s).first
+
+      if setting_row && setting_row.data_type != setting.type
+        if (setting_row.data_type == ThemeSetting.types[:list] &&
+          setting.type == ThemeSetting.types[:string] &&
+          setting.json_schema.present?)
+          convert_list_to_json_schema(setting_row, setting)
+        else
+          Rails.logger.warn("Theme setting type has changed but cannot be converted. \n\n #{setting.inspect}")
+        end
+      end
+    end
+  end
+
+  def convert_list_to_json_schema(setting_row, setting)
+    schema = setting.json_schema
+    return if !schema
+    keys = schema["items"]["properties"].keys
+    return if !keys
+
+    current_values = CSV.parse(setting_row.value, { col_sep: '|' }).flatten
+    new_values = []
+    current_values.each do |item|
+      parts = CSV.parse(item, { col_sep: ',' }).flatten
+      props = parts.map.with_index { |p, idx| [keys[idx], p] }.to_h
+      new_values << props
+    end
+
+    schemer = JSONSchemer.schema(schema)
+    raise "Schema validation failed" if !schemer.valid?(new_values)
+
+    setting_row.value = new_values.to_json
+    setting_row.data_type = setting.type
+    setting_row.save!
+  end
+
+  def baked_js_tests_with_digest
+    content = theme_fields
+      .where(target_id: Theme.targets[:tests_js])
+      .each(&:ensure_baked!)
+      .map(&:value_baked)
+      .join("\n")
+
+    return [nil, nil] if content.blank?
+
+    content = <<~JS + content
+      (function() {
+        require("discourse/lib/theme-settings-store").registerSettings(#{self.id}, #{cached_default_settings.to_json}, { force: true });
+      })();
+    JS
+    [content, Digest::SHA1.hexdigest(content)]
+  end
+
   private
 
+  def to_scss_variable(name, value)
+    escaped = SassC::Script::Value::String.quote(value, sass: true)
+    "$#{name}: unquote(#{escaped});"
+  end
+
   def find_disable_action_log
     if component? && !enabled?
       @disable_log ||= UserHistory.where(context: id.to_s, action: UserHistory.actions[:disable_theme_component]).order("created_at DESC").first
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index dcf61cc24b..9ed1e64cff 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -20,12 +20,12 @@ class ThemeField < ActiveRecord::Base
     return none unless locale_codes.present?
 
     where(target_id: Theme.targets[:translations], name: locale_codes)
-      .joins(self.sanitize_sql_array([
+      .joins(DB.sql_fragment(
       "JOIN (
         SELECT * FROM (VALUES #{locale_codes.map { "(?)" }.join(",")}) as Y (locale_code, locale_sort_column)
       ) as Y ON Y.locale_code = theme_fields.name",
       *locale_codes.map.with_index { |code, index| [code, index] }
-    ]))
+    ))
       .order("Y.locale_sort_column")
   }
 
@@ -50,6 +50,10 @@ class ThemeField < ActiveRecord::Base
     @theme_var_type_ids ||= [2]
   end
 
+  def self.css_theme_type_ids
+    @css_theme_type_ids ||= [0, 1]
+  end
+
   def self.force_recompilation!
     find_each do |field|
       field.compiler_version = 0
@@ -90,10 +94,32 @@ class ThemeField < ActiveRecord::Base
       node.remove
     end
 
-    doc.css('script[type="text/discourse-plugin"]').each do |node|
-      next unless node['version'].present?
+    doc.css('script[type="text/discourse-plugin"]').each_with_index do |node, index|
+      version = node['version']
+      next if version.blank?
+
+      initializer_name = "theme-field" +
+        "-#{self.id}" +
+        "-#{Theme.targets[self.target_id]}" +
+        "-#{ThemeField.types[self.type_id]}" +
+        "-script-#{index + 1}"
       begin
-        js_compiler.append_plugin_script(node.inner_html, node['version'])
+        js = <<~JS
+          import { withPluginApi } from "discourse/lib/plugin-api";
+
+          export default {
+            name: #{initializer_name.inspect},
+            after: "inject-objects",
+
+            initialize() {
+              withPluginApi(#{version.inspect}, (api) => {
+                #{node.inner_html}
+              });
+            }
+          };
+        JS
+
+        js_compiler.append_module(js, "discourse/initializers/#{initializer_name}", include_variables: true)
       rescue ThemeJavascriptCompiler::CompileError => ex
         errors << ex.message
       end
@@ -128,7 +154,7 @@ class ThemeField < ActiveRecord::Base
     begin
       case extension
       when "js.es6", "js"
-        js_compiler.append_module(content, filename)
+        js_compiler.append_module(content, filename, include_variables: true)
       when "hbs"
         js_compiler.append_ember_template(filename.sub("discourse/templates/", ""), content)
       when "hbr", "raw.hbs"
@@ -281,6 +307,10 @@ class ThemeField < ActiveRecord::Base
     Theme.targets[self.target_id] == :extra_js
   end
 
+  def js_tests_field?
+    Theme.targets[self.target_id] == :tests_js
+  end
+
   def basic_scss_field?
     ThemeField.basic_targets.include?(Theme.targets[self.target_id].to_s) &&
       ThemeField.scss_fields.include?(self.name)
@@ -311,7 +341,7 @@ class ThemeField < ActiveRecord::Base
       self.error = nil unless self.error.present?
       self.compiler_version = Theme.compiler_version
       DB.after_commit { CSP::Extension.clear_theme_extensions_cache! }
-    elsif extra_js_field?
+    elsif extra_js_field? || js_tests_field?
       self.value_baked, self.error = process_extra_js(self.value)
       self.error = nil unless self.error.present?
       self.compiler_version = Theme.compiler_version
@@ -342,12 +372,28 @@ class ThemeField < ActiveRecord::Base
     end
   end
 
-  def compile_scss
-    Stylesheet::Compiler.compile("@import \"common/foundation/variables\"; @import \"common/foundation/mixins\"; @import \"theme_variables\"; @import \"theme_field\";",
-      "theme.scss",
-      theme_field: self.value.dup,
-      theme: self.theme
-    )
+  def compile_scss(prepended_scss = nil)
+    prepended_scss ||= Stylesheet::Importer.new({}).prepended_scss
+
+    self.theme.with_scss_load_paths do |load_paths|
+      Stylesheet::Compiler.compile("#{prepended_scss} #{self.theme.scss_variables.to_s} #{self.value}",
+        "#{Theme.targets[self.target_id]}.scss",
+        theme: self.theme,
+        load_paths: load_paths
+      )
+    end
+  end
+
+  def compiled_css(prepended_scss)
+    css, _source_map = begin
+      compile_scss(prepended_scss)
+    rescue SassC::SyntaxError => e
+      # We don't want to raise a blocking error here
+      # admin theme editor or discourse_theme CLI will show it nonetheless
+      Rails.logger.error "SCSS compilation error: #{e.message}"
+      ["", nil]
+    end
+    css
   end
 
   def ensure_scss_compiles!
@@ -356,6 +402,8 @@ class ThemeField < ActiveRecord::Base
       result = compile_scss
       if contains_optimized_link?(self.value)
         self.error = I18n.t("themes.errors.optimized_link")
+      elsif contains_ember_css_selector?(self.value)
+        self.error = I18n.t("themes.ember_selector_error")
       else
         self.error = nil unless error.nil?
       end
@@ -374,6 +422,10 @@ class ThemeField < ActiveRecord::Base
     OptimizedImage::URL_REGEX.match?(text)
   end
 
+  def contains_ember_css_selector?(text)
+    text.match(/#ember\d+|[.]ember-view/)
+  end
+
   class ThemeFileMatcher
     OPTIONS = %i{name type target}
     # regex: used to match file names to fields (import).
@@ -398,7 +450,7 @@ class ThemeField < ActiveRecord::Base
       hash = {}
       OPTIONS.each do |option|
         plural = :"#{option}s"
-        hash[option] = @allowed_values[plural][0] if @allowed_values[plural] && @allowed_values[plural].length == 1
+        hash[option] = @allowed_values[plural][0] if @allowed_values[plural]&.length == 1
         hash[option] = match[option] if hash[option].nil?
       end
       hash
@@ -433,6 +485,9 @@ class ThemeField < ActiveRecord::Base
     ThemeFileMatcher.new(regex: /^javascripts\/(?<name>.+)$/,
                          targets: :extra_js, names: nil, types: :js,
                          canonical: -> (h) { "javascripts/#{h[:name]}" }),
+    ThemeFileMatcher.new(regex: /^test\/(?<name>.+)$/,
+                         targets: :tests_js, names: nil, types: :js,
+                         canonical: -> (h) { "test/#{h[:name]}" }),
     ThemeFileMatcher.new(regex: /^settings\.ya?ml$/,
                          names: "yaml", types: :yaml, targets: :settings,
                          canonical: -> (h) { "settings.yml" }),
diff --git a/app/models/theme_translation_override.rb b/app/models/theme_translation_override.rb
index 93ba1f2bca..ec639c2731 100644
--- a/app/models/theme_translation_override.rb
+++ b/app/models/theme_translation_override.rb
@@ -4,9 +4,9 @@ class ThemeTranslationOverride < ActiveRecord::Base
   belongs_to :theme
 
   after_commit do
+    theme.theme_fields.where(target_id: Theme.targets[:translations]).update_all(value_baked: nil)
     theme.clear_cached_settings!
     theme.remove_from_cache!
-    theme.theme_fields.where(target_id: Theme.targets[:translations]).update_all(value_baked: nil)
   end
 end
 
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 2977ed9642..2e48bd8677 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -88,7 +88,7 @@ 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.each { |i| i[:url] = UrlHelper.cook_url(i[:url], secure: original.secure?, local: true) }
 
     infos.sort_by! { |i| -i[:width] * i[:height] }
   end
@@ -123,7 +123,7 @@ class Topic < ActiveRecord::Base
     end
 
     raw_url = thumbnail&.optimized_image&.url || image_upload&.url
-    UrlHelper.cook_url(raw_url, secure: image_upload&.secure?)
+    UrlHelper.cook_url(raw_url, secure: image_upload&.secure?, local: true) if raw_url
   end
 
   def featured_users
@@ -132,7 +132,7 @@ class Topic < ActiveRecord::Base
 
   def trash!(trashed_by = nil)
     if deleted_at.nil?
-      update_category_topic_count_by(-1)
+      update_category_topic_count_by(-1) if visible?
       CategoryTagStat.topic_deleted(self) if self.tags.present?
       DiscourseEvent.trigger(:topic_trashed, self)
     end
@@ -142,7 +142,7 @@ class Topic < ActiveRecord::Base
 
   def recover!(recovered_by = nil)
     unless deleted_at.nil?
-      update_category_topic_count_by(1)
+      update_category_topic_count_by(1) if visible?
       CategoryTagStat.topic_recovered(self) if self.tags.present?
       DiscourseEvent.trigger(:topic_recovered, self)
     end
@@ -231,6 +231,7 @@ class Topic < ActiveRecord::Base
   belongs_to :featured_user4, class_name: 'User', foreign_key: :featured_user4_id
 
   has_many :topic_users
+  has_many :dismissed_topic_users
   has_many :topic_links
   has_many :topic_invites
   has_many :invites, through: :topic_invites, source: :invite
@@ -250,6 +251,7 @@ class Topic < ActiveRecord::Base
   # When we want to temporarily attach some data to a forum topic (usually before serialization)
   attr_accessor :user_data
   attr_accessor :category_user_data
+  attr_accessor :dismissed
 
   attr_accessor :posters  # TODO: can replace with posters_summary once we remove old list code
   attr_accessor :participants
@@ -368,26 +370,6 @@ class Topic < ActiveRecord::Base
     self.last_post_user_id ||= user_id
   end
 
-  def inherit_auto_close_from_category
-    if !self.closed &&
-       !@ignore_category_auto_close &&
-       self.category &&
-       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,
-        by_user: Discourse.system_user,
-        based_on_last_post: based_on_last_post,
-        duration: duration
-      )
-    end
-  end
-
   def advance_draft_sequence
     if self.private_message?
       DraftSequence.next!(user, Draft::NEW_PRIVATE_MESSAGE)
@@ -524,7 +506,7 @@ class Topic < ActiveRecord::Base
     end
     if remove_category_ids.present?
       remove_category_ids.uniq!
-      topics = topics.where("topics.category_id NOT IN (?)", remove_category_ids)
+      topics = topics.where("topic_users.notification_level != ? OR topics.category_id NOT IN (?)", TopicUser.notification_levels[:muted], remove_category_ids)
     end
 
     # Remove muted tags
@@ -576,13 +558,17 @@ class Topic < ActiveRecord::Base
   end
 
   def private_message?
-    archetype == Archetype.private_message
+    self.archetype == Archetype.private_message
   end
 
   def regular?
     self.archetype == Archetype.default
   end
 
+  def open?
+    !self.closed?
+  end
+
   MAX_SIMILAR_BODY_LENGTH ||= 200
 
   def self.similar_to(title, raw, user = nil)
@@ -636,11 +622,11 @@ class Topic < ActiveRecord::Base
 
     if raw.present?
       similars
-        .select(sanitize_sql_array(["topics.*, similarity(topics.title, :title) + similarity(p.raw, :raw) AS similarity, p.cooked AS blurb", title: title, raw: raw]))
+        .select(DB.sql_fragment("topics.*, similarity(topics.title, :title) + similarity(p.raw, :raw) AS similarity, p.cooked AS blurb", title: title, raw: raw))
         .where("similarity(topics.title, :title) + similarity(p.raw, :raw) > 0.2", title: title, raw: raw)
     else
       similars
-        .select(sanitize_sql_array(["topics.*, similarity(topics.title, :title) AS similarity, p.cooked AS blurb", title: title]))
+        .select(DB.sql_fragment("topics.*, similarity(topics.title, :title) AS similarity, p.cooked AS blurb", title: title))
         .where("similarity(topics.title, :title) > 0.2", title: title)
     end
   end
@@ -861,6 +847,14 @@ class Topic < ActiveRecord::Base
             Jobs.enqueue(:notify_category_change, post_id: post.id, notified_user_ids: notified_user_ids)
           end
         end
+
+        # when a topic changes category we may need to make uploads
+        # linked to posts secure/not secure depending on whether the
+        # category is private. this is only done if the category
+        # has actually changed to avoid noise.
+        DB.after_commit do
+          Jobs.enqueue(:update_topic_upload_security, topic_id: self.id)
+        end
       end
 
       Category.where(id: new_category.id).update_all("topic_count = topic_count + 1")
@@ -869,13 +863,6 @@ class Topic < ActiveRecord::Base
         CategoryFeaturedTopic.feature_topics_for(old_category) unless @import_mode
         CategoryFeaturedTopic.feature_topics_for(new_category) unless @import_mode || old_category.try(:id) == new_category.id
       end
-
-      # when a topic changes category we may need to make uploads
-      # linked to posts secure/not secure depending on whether the
-      # category is private
-      DB.after_commit do
-        Jobs.enqueue(:update_topic_upload_security, topic_id: self.id)
-      end
     end
 
     true
@@ -902,6 +889,7 @@ class Topic < ActiveRecord::Base
                               action_code: opts[:action_code],
                               no_bump: opts[:bump].blank?,
                               topic_id: self.id,
+                              silent: opts[:silent],
                               skip_validations: true,
                               custom_fields: opts[:custom_fields],
                               import_mode: opts[:import_mode])
@@ -942,6 +930,7 @@ class Topic < ActiveRecord::Base
       group_user = topic_allowed_groups.find_by(group_id: group.id)
       if group_user
         group_user.destroy
+        allowed_groups.reload
         add_small_action(removed_by, "removed_group", group.name)
         return true
       end
@@ -980,42 +969,13 @@ class Topic < ActiveRecord::Base
 
   def invite_group(user, group)
     TopicAllowedGroup.create!(topic_id: id, group_id: group.id)
+    allowed_groups.reload
 
     last_post = posts.order('post_number desc').where('not hidden AND posts.deleted_at IS NULL').first
     if last_post
       Jobs.enqueue(:post_alert, post_id: last_post.id)
       add_small_action(user, "invited_group", group.name)
-
-      group_id = group.id
-
-      group.set_message_default_notification_levels!(self, ignore_existing: true)
-
-      group.users.where(
-        "group_users.notification_level = :level",
-        level: NotificationLevels.all[:tracking],
-        id: user.id
-      ).find_each do |u|
-        PostAlerter.new.notify_group_summary(u, last_post)
-      end
-
-      group.users.where(
-        "group_users.notification_level in (:levels) AND user_id != :id",
-        levels: [NotificationLevels.all[:watching], NotificationLevels.all[:watching_first_post]],
-        id: user.id
-      ).find_each do |u|
-
-        u.notifications.create!(
-          notification_type: Notification.types[:invited_to_private_message],
-          topic_id: self.id,
-          post_number: 1,
-          data: {
-            topic_title: self.title,
-            display_username: user.username,
-            group_id: group_id
-          }.to_json
-        )
-
-      end
+      Jobs.enqueue(:group_pm_alert, user_id: user.id, group_id: group.id, post_id: last_post.id)
     end
 
     true
@@ -1059,22 +1019,18 @@ class Topic < ActiveRecord::Base
         raise NotAllowed.new(I18n.t("topic_invite.sender_does_not_allow_pm"))
       end
 
-      if !target_user.staff? && target_user&.user_option&.enable_allowed_pm_users
-        topic_users = self.topic_allowed_users.pluck(:user_id)
-        allowed_users = AllowedPmUser.where(user: target_user.id, allowed_pm_user_id: topic_users)
-        if (allowed_users - topic_users).size > 0
-          raise NotAllowed.new(I18n.t("topic_invite.receiver_does_not_allow_other_user_pm"))
-        end
-      end
-
       if private_message?
         !!invite_to_private_message(invited_by, target_user, guardian)
       else
         !!invite_to_topic(invited_by, target_user, group_ids, guardian)
       end
     elsif is_email && guardian.can_invite_via_email?(self)
-      !!Invite.invite_by_email(
-        username_or_email, invited_by, self, group_ids, custom_message
+      !!Invite.generate(invited_by,
+        email: username_or_email,
+        topic: self,
+        group_ids: group_ids,
+        custom_message: custom_message,
+        invite_to_topic: true
       )
     end
   end
@@ -1279,6 +1235,45 @@ class Topic < ActiveRecord::Base
     Topic.where("pinned_until < now()").update_all(pinned_at: nil, pinned_globally: false, pinned_until: nil)
   end
 
+  def inherit_auto_close_from_category(timer_type: :close)
+    auto_close_hours = self.category&.auto_close_hours
+
+    if self.open? &&
+       !@ignore_category_auto_close &&
+       auto_close_hours.present? &&
+       public_topic_timer&.execute_at.blank?
+
+      based_on_last_post = self.category.auto_close_based_on_last_post
+      duration_minutes = based_on_last_post ? auto_close_hours * 60 : nil
+
+      # the timer time can be a timestamp or an integer based
+      # on the number of hours
+      auto_close_time = auto_close_hours
+
+      if !based_on_last_post
+        # set auto close to the original time it should have been
+        # when the topic was first created.
+        start_time = self.created_at || Time.zone.now
+        auto_close_time = start_time + auto_close_hours.hours
+
+        # if we have already passed the original close time then
+        # we should not recreate the auto-close timer for the topic
+        return if auto_close_time < Time.zone.now
+
+        # timestamp must be a string for set_or_create_timer
+        auto_close_time = auto_close_time.to_s
+      end
+
+      self.set_or_create_timer(
+        TopicTimer.types[timer_type],
+        auto_close_time,
+        by_user: Discourse.system_user,
+        based_on_last_post: based_on_last_post,
+        duration_minutes: duration_minutes
+      )
+    end
+  end
+
   def public_topic_timer
     @public_topic_timer ||= topic_timers.find_by(deleted_at: nil, public_type: true)
   end
@@ -1287,6 +1282,7 @@ class Topic < ActiveRecord::Base
     options = { status_type: status_type }
     options.merge!(user: by_user) unless TopicTimer.public_types[status_type]
     self.topic_timers.find_by(options)&.trash!(by_user)
+    @public_topic_timer = nil
     nil
   end
 
@@ -1299,33 +1295,59 @@ 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, duration: nil)
-    return delete_topic_timer(status_type, by_user: by_user) if time.blank? && duration.blank?
+  #  * duration: TODO(2021-06-01): DEPRECATED - do not use
+  #  * duration_minutes: The duration of the timer in minutes, which is used if the timer is based
+  #                      on the last post or if the timer type is delete_replies.
+  #  * silent: Affects whether the close topic timer status change will be silent or not.
+  def set_or_create_timer(status_type, time, by_user: nil, based_on_last_post: false, category_id: SiteSetting.uncategorized_category_id, duration: nil, duration_minutes: nil, silent: nil)
+    return delete_topic_timer(status_type, by_user: by_user) if time.blank? && duration_minutes.blank? && duration.blank?
+
+    duration_minutes = duration_minutes ? duration_minutes.to_i : 0
+
+    # TODO(2021-06-01): deprecated - remove this when plugins calling set_or_create_timer
+    # have been fixed to use duration_minutes
+    duration = duration ? duration.to_i : 0
 
     public_topic_timer = !!TopicTimer.public_types[status_type]
     topic_timer_options = { topic: self, public_type: public_topic_timer }
     topic_timer_options.merge!(user: by_user) unless public_topic_timer
+    topic_timer_options.merge!(silent: silent) if silent
     topic_timer = TopicTimer.find_or_initialize_by(topic_timer_options)
     topic_timer.status_type = status_type
 
     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
-      if duration > 0
+      if duration > 0 || duration_minutes > 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 + duration.hours
+
+        # TODO(2021-06-01): deprecated - remove this when plugins calling set_or_create_timer
+        # have been fixed to use duration_minutes
+        if duration > 0
+          duration_minutes = duration * 60
+        end
+
+        topic_timer.duration_minutes = duration_minutes
+        topic_timer.execute_at = last_post_created_at + duration_minutes.minutes
         topic_timer.created_at = last_post_created_at
       end
     elsif topic_timer.status_type == TopicTimer.types[:delete_replies]
-      if duration > 0
+      if duration > 0 || duration_minutes > 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
+
+        # TODO(2021-06-01): deprecated - remove this when plugins calling set_or_create_timer
+        # have been fixed to use duration_minutes
+        if duration > 0
+          duration_minutes = duration * 60 * 24
+        end
+
+        topic_timer.duration_minutes = duration_minutes
+        topic_timer.execute_at = first_reply_created_at + duration_minutes.minutes
         topic_timer.created_at = first_reply_created_at
       end
     else
@@ -1337,10 +1359,9 @@ class Topic < ActiveRecord::Base
         topic_timer.execute_at = num_hours.hours.from_now if num_hours > 0
       else
         timestamp = utc.parse(time)
-        raise Discourse::InvalidParameters unless timestamp
+        raise Discourse::InvalidParameters unless timestamp && timestamp > utc.now
         # a timestamp in client's time zone, like "2015-5-27 12:00"
         topic_timer.execute_at = timestamp
-        topic_timer.errors.add(:execute_at, :invalid) if timestamp < utc.now
       end
     end
 
@@ -1352,6 +1373,8 @@ class Topic < ActiveRecord::Base
       end
 
       if self.persisted?
+        # See TopicTimer.after_save for additional context; the topic
+        # status may be changed by saving.
         topic_timer.save!
       else
         self.topic_timers << topic_timer
@@ -1365,6 +1388,10 @@ class Topic < ActiveRecord::Base
     category && category.read_restricted
   end
 
+  def category_allows_unlimited_owner_edits_on_first_post?
+    category && category.allow_unlimited_owner_edits_on_first_post?
+  end
+
   def acting_user
     @acting_user || user
   end
@@ -1613,8 +1640,9 @@ class Topic < ActiveRecord::Base
   def update_category_topic_count_by(num)
     if category_id.present?
       Category
-        .where(['id = ?', category_id])
-        .update_all("topic_count = topic_count " + (num > 0 ? '+' : '') + "#{num}")
+        .where('id = ?', category_id)
+        .where('topic_id != ? OR topic_id IS NULL', self.id)
+        .update_all("topic_count = topic_count + #{num.to_i}")
     end
   end
 
@@ -1627,6 +1655,55 @@ class Topic < ActiveRecord::Base
       .first
   end
 
+  def incoming_email_addresses(group: nil, received_before: Time.zone.now)
+    email_addresses = Set.new
+
+    # TODO(martin) Look at improving this N1, it will just get slower the
+    # more replies/incoming emails there are for the topic.
+    self.incoming_email.where("created_at <= ?", received_before).each do |incoming_email|
+      to_addresses = incoming_email.to_addresses_split
+      cc_addresses = incoming_email.cc_addresses_split
+      combined_addresses = [to_addresses, cc_addresses].flatten
+
+      # We only care about the emails addressed to the group or CC'd to the
+      # group if the group is present. If combined addresses is empty we do
+      # not need to do this check, and instead can proceed on to adding the
+      # from address.
+      if group.present? && combined_addresses.any?
+        next if combined_addresses.none? { |address| address =~ group.email_username_regex }
+      end
+
+      email_addresses.add(incoming_email.from_address)
+      email_addresses.merge(combined_addresses)
+    end
+
+    email_addresses.subtract([nil, ''])
+    email_addresses.delete(group.email_username) if group.present?
+
+    email_addresses.to_a
+  end
+
+  def create_invite_notification!(target_user, notification_type, username)
+    target_user.notifications.create!(
+      notification_type: notification_type,
+      topic_id: self.id,
+      post_number: 1,
+      data: {
+        topic_title: self.title,
+        display_username: username
+      }.to_json
+    )
+  end
+
+  def rate_limit_topic_invitation(invited_by)
+    RateLimiter.new(
+      invited_by,
+      "topic-invitations-per-day",
+      SiteSetting.max_topic_invitations_per_day,
+      1.day.to_i
+    ).performed!
+  end
+
   private
 
   def invite_to_private_message(invited_by, target_user, guardian)
@@ -1655,7 +1732,7 @@ class Topic < ActiveRecord::Base
     Topic.transaction do
       rate_limit_topic_invitation(invited_by)
 
-      if group_ids
+      if group_ids.present?
         (
           self.category.groups.where(id: group_ids).where(automatic: false) -
           target_user.groups.where(automatic: false)
@@ -1687,29 +1764,6 @@ class Topic < ActiveRecord::Base
   def apply_per_day_rate_limit_for(key, method_name)
     RateLimiter.new(user, "#{key}-per-day", SiteSetting.get(method_name), 1.day.to_i)
   end
-
-  def create_invite_notification!(target_user, notification_type, username)
-    target_user.notifications.create!(
-      notification_type: notification_type,
-      topic_id: self.id,
-      post_number: 1,
-      data: {
-        topic_title: self.title,
-        display_username: username
-      }.to_json
-    )
-  end
-
-  def rate_limit_topic_invitation(invited_by)
-    RateLimiter.new(
-      invited_by,
-      "topic-invitations-per-day",
-      SiteSetting.max_topic_invitations_per_day,
-      1.day.to_i
-    ).performed!
-
-    true
-  end
 end
 
 # == Schema Information
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 575c5370c3..d3ed0f1a31 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -165,7 +165,7 @@ class TopicEmbed < ActiveRecord::Base
             uri.host = original_uri.host
             node[url_param] = uri.to_s
           end
-        rescue URI::Error
+        rescue URI::Error, Addressable::URI::InvalidURIError
           # If there is a mistyped URL, just do nothing
         end
       end
@@ -255,6 +255,9 @@ class TopicEmbed < ActiveRecord::Base
     end
   end
 
+  def self.open(uri, **kwargs)
+    URI.open(uri, **kwargs)
+  end
 end
 
 # == Schema Information
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index 96c9d7270d..516c5f32bc 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -402,10 +402,11 @@ end
 #
 # Indexes
 #
-#  index_forum_thread_links_on_forum_thread_id                      (topic_id)
-#  index_forum_thread_links_on_forum_thread_id_and_post_id_and_url  (topic_id,post_id,url) UNIQUE
-#  index_topic_links_on_extension                                   (extension)
-#  index_topic_links_on_link_post_id_and_reflection                 (link_post_id,reflection)
-#  index_topic_links_on_post_id                                     (post_id)
-#  index_topic_links_on_user_id                                     (user_id)
+#  index_topic_links_on_extension                    (extension)
+#  index_topic_links_on_link_post_id_and_reflection  (link_post_id,reflection)
+#  index_topic_links_on_post_id                      (post_id)
+#  index_topic_links_on_topic_id                     (topic_id)
+#  index_topic_links_on_user_and_clicks              (user_id,clicks DESC,created_at DESC) WHERE ((NOT reflection) AND (NOT quote) AND (NOT internal))
+#  index_topic_links_on_user_id                      (user_id)
+#  unique_post_links                                 (topic_id,post_id,url) UNIQUE
 #
diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index 41bc79f46e..4308d888b8 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class TopicList < DraftableList
+class TopicList
+  include ActiveModel::Serialization
+
   cattr_accessor :preloaded_custom_fields
   self.preloaded_custom_fields = Set.new
 
@@ -52,8 +54,6 @@ class TopicList < DraftableList
     end
 
     @publish_read_state = !!@opts[:publish_read_state]
-
-    super(current_user)
   end
 
   def top_tags
@@ -64,7 +64,13 @@ class TopicList < DraftableList
 
   def preload_key
     if @category
-      "topic_list_#{@category.url.sub(/^\//, '')}/l/#{@filter}"
+      if @opts[:no_subcategories]
+        "topic_list_#{@category.url.sub(/^\//, '')}/none/l/#{@filter}"
+      else
+        "topic_list_#{@category.url.sub(/^\//, '')}/l/#{@filter}"
+      end
+    elsif @tags && @tags.first.present?
+      "topic_list_tag/#{@tags.first.name}/l/#{@filter}"
     else
       "topic_list_#{@filter}"
     end
@@ -80,6 +86,7 @@ class TopicList < DraftableList
 
     # Attach some data for serialization to each topic
     @topic_lookup = TopicUser.lookup_for(@current_user, @topics) if @current_user
+    @dismissed_topic_users_lookup = DismissedTopicUser.lookup_for(@current_user, @topics) if @current_user
 
     post_action_type =
       if @current_user
@@ -115,6 +122,8 @@ class TopicList < DraftableList
         ft.category_user_data = @category_user_lookup[ft.category_id]
       end
 
+      ft.dismissed = @current_user && @dismissed_topic_users_lookup.include?(ft.id)
+
       if ft.user_data && post_action_lookup && actions = post_action_lookup[ft.id]
         ft.user_data.post_action_data = { post_action_type => actions }
       end
diff --git a/app/models/topic_poster.rb b/app/models/topic_poster.rb
index 0975099581..3ff6a1e09e 100644
--- a/app/models/topic_poster.rb
+++ b/app/models/topic_poster.rb
@@ -15,8 +15,13 @@ class TopicPoster < OpenStruct
     }
   end
 
-  # TODO: Remove when old list is removed
-  def [](attr)
-    public_send(attr)
+  def name_and_description
+    if SiteSetting.prioritize_username_in_ux? || user.name.blank?
+      name = user.username
+    else
+      name = user.name
+    end
+
+    I18n.t("js.user.avatar.name_and_description", name: name, description: description)
   end
 end
diff --git a/app/models/topic_posters_summary.rb b/app/models/topic_posters_summary.rb
index 9eb40bf3d5..b7eb2a8647 100644
--- a/app/models/topic_posters_summary.rb
+++ b/app/models/topic_posters_summary.rb
@@ -9,7 +9,8 @@ class TopicPostersSummary
     {
       original_poster: I18n.t(:original_poster),
       most_recent_poster: I18n.t(:most_recent_poster),
-      frequent_poster: I18n.t(:frequent_poster)
+      frequent_poster: I18n.t(:frequent_poster),
+      joiner: I18n.t(:poster_description_joiner)
     }
   end
 
@@ -64,7 +65,7 @@ class TopicPostersSummary
   end
 
   def descriptions_for(user)
-    descriptions_by_id[user.id].join ', '
+    descriptions_by_id[user.id].join(@translations[:joiner])
   end
 
   def shuffle_last_poster_to_back_in(summary)
diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb
index 89da22a24f..2227004d56 100644
--- a/app/models/topic_timer.rb
+++ b/app/models/topic_timer.rb
@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 class TopicTimer < ActiveRecord::Base
+  MAX_DURATION_MINUTES = 20.years.to_i / 60
+
+  self.ignored_columns = [
+    "duration" # TODO(2021-06-01): remove
+  ]
+
   include Trashable
 
   belongs_to :user
@@ -15,9 +21,13 @@ class TopicTimer < ActiveRecord::Base
   validates :status_type, uniqueness: { scope: [:topic_id, :deleted_at, :user_id] }, if: :private_type?
   validates :category_id, presence: true, if: :publishing_to_category?
 
-  validate :ensure_update_will_happen
+  validate :executed_at_in_future?
+  validate :duration_in_range?
 
   scope :scheduled_bump_topics, -> { where(status_type: TopicTimer.types[:bump], deleted_at: nil).pluck(:topic_id) }
+  scope :pending_timers, ->(before_time = Time.now.utc) do
+    where("execute_at <= :before_time AND deleted_at IS NULL", before_time: before_time)
+  end
 
   before_save do
     self.created_at ||= Time.zone.now if execute_at
@@ -27,21 +37,68 @@ class TopicTimer < ActiveRecord::Base
        !attribute_in_database(:execute_at).nil?) ||
        will_save_change_to_user_id?
 
-      # private implementation detail have to use send
+      # TODO(martin - 2021-05-01) - Remove this backwards compatability for outstanding
+      # jobs once they have all been run and after Jobs::TopicTimerEnqueuer is in place
       self.send("cancel_auto_#{self.class.types[status_type]}_job")
     end
   end
 
+  # These actions are in place to make sure the topic is in the correct
+  # state at the point in time where the timer is saved. It does not
+  # guarantee that the topic will be in the correct state when the timer
+  # job is executed, but each timer job handles deleted topics etc. gracefully.
+  #
+  # This is also important for the Open Temporarily and Close Temporarily timers,
+  # which change the topic's status straight away and set a timer to do the
+  # opposite action in the future.
   after_save do
     if (saved_change_to_execute_at? || saved_change_to_user_id?)
-      now = Time.zone.now
-      time = execute_at < now ? now : execute_at
-
-      # private implementation detail have to use send
-      self.send("schedule_auto_#{self.class.types[status_type]}_job", time)
+      if status_type == TopicTimer.types[:silent_close] || status_type == TopicTimer.types[:close]
+        topic.update_status('closed', false, user) if topic.closed?
+      end
+      if status_type == TopicTimer.types[:open]
+        topic.update_status('closed', true, user) if topic.open?
+      end
     end
   end
 
+  def status_type_name
+    self.class.types[status_type]
+  end
+
+  def enqueue_typed_job(time: nil)
+    return if typed_job_scheduled?
+    self.send("schedule_auto_#{status_type_name}_job")
+  end
+
+  # TODO(martin - 2021-05-01) - Remove this backwards compatability for outstanding
+  # jobs once they have all been run and after Jobs::TopicTimerEnqueuer is in place
+  def typed_job_scheduled?
+    scheduled = Jobs.scheduled_for(
+      TopicTimer.type_job_map[status_type_name], topic_timer_id: id
+    ).any?
+
+    if [:close, :silent_close, :open].include?(status_type_name)
+      return scheduled || Jobs.scheduled_for(:toggle_topic_closed, topic_timer_id: id).any?
+    end
+
+    scheduled
+  end
+
+  def self.type_job_map
+    {
+      close: :close_topic,
+      open: :open_topic,
+      publish_to_category: :publish_topic_to_category,
+      delete: :delete_topic,
+      reminder: :topic_reminder,
+      bump: :bump_topic,
+      delete_replies: :delete_replies,
+      silent_close: :close_topic,
+      clear_slow_mode: :clear_slow_mode
+    }
+  end
+
   def self.types
     @types ||= Enum.new(
       close: 1,
@@ -50,28 +107,18 @@ class TopicTimer < ActiveRecord::Base
       delete: 4,
       reminder: 5,
       bump: 6,
-      delete_replies: 7
+      delete_replies: 7,
+      silent_close: 8,
+      clear_slow_mode: 9
     )
   end
 
   def self.public_types
-    @_public_types ||= types.except(:reminder)
+    @_public_types ||= types.except(:reminder, :clear_slow_mode)
   end
 
   def self.private_types
-    @_private_types ||= types.only(:reminder)
-  end
-
-  def self.ensure_consistency!
-    TopicTimer.where("topic_timers.execute_at < ?", Time.zone.now)
-      .find_each do |topic_timer|
-
-      # private implementation detail scoped to class
-      topic_timer.send(
-        "schedule_auto_#{self.types[topic_timer.status_type]}_job",
-        topic_timer.execute_at
-      )
-    end
+    @_private_types ||= types.only(:reminder, :clear_slow_mode)
   end
 
   def public_type?
@@ -82,82 +129,119 @@ class TopicTimer < ActiveRecord::Base
     !!self.class.private_types[self.status_type]
   end
 
+  def runnable?
+    return false if deleted_at.present?
+    return false if execute_at > Time.zone.now
+    true
+  end
+
   private
 
-  def ensure_update_will_happen
-    if created_at && (execute_at < created_at)
-      errors.add(:execute_at, I18n.t(
-        'activerecord.errors.models.topic_timer.attributes.execute_at.in_the_past'
+  def duration_in_range?
+    return if duration_minutes.blank?
+
+    if duration_minutes.to_i <= 0
+      errors.add(:duration_minutes, I18n.t(
+        'activerecord.errors.models.topic_timer.attributes.duration_minutes.cannot_be_zero'
+      ))
+    end
+
+    if duration_minutes.to_i > MAX_DURATION_MINUTES
+      errors.add(:duration_minutes, I18n.t(
+        'activerecord.errors.models.topic_timer.attributes.duration_minutes.exceeds_maximum'
       ))
     end
   end
 
-  def cancel_auto_close_job
-    Jobs.cancel_scheduled_job(:toggle_topic_closed, topic_timer_id: id)
-  end
-  alias_method :cancel_auto_open_job, :cancel_auto_close_job
+  def executed_at_in_future?
+    return if created_at.blank? || (execute_at > created_at)
 
-  def cancel_auto_publish_to_category_job
-    Jobs.cancel_scheduled_job(:publish_topic_to_category, topic_timer_id: id)
-  end
-
-  def cancel_auto_delete_job
-    Jobs.cancel_scheduled_job(:delete_topic, topic_timer_id: id)
-  end
-
-  def cancel_auto_reminder_job
-    Jobs.cancel_scheduled_job(:topic_reminder, topic_timer_id: id)
-  end
-
-  def cancel_auto_bump_job
-    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
-
-  def schedule_auto_open_job(time)
-    topic.update_status('closed', true, user) if topic && !topic.closed
-
-    Jobs.enqueue_at(time, :toggle_topic_closed,
-      topic_timer_id: id,
-      state: false
-    )
-  end
-
-  def schedule_auto_close_job(time)
-    topic.update_status('closed', false, user) if topic&.closed
-
-    Jobs.enqueue_at(time, :toggle_topic_closed,
-      topic_timer_id: id,
-      state: true
-    )
-  end
-
-  def schedule_auto_publish_to_category_job(time)
-    Jobs.enqueue_at(time, :publish_topic_to_category, topic_timer_id: id)
+    errors.add(:execute_at, I18n.t(
+      'activerecord.errors.models.topic_timer.attributes.execute_at.in_the_past'
+    ))
   end
 
   def publishing_to_category?
     self.status_type.to_i == TopicTimer.types[:publish_to_category]
   end
 
-  def schedule_auto_delete_job(time)
-    Jobs.enqueue_at(time, :delete_topic, topic_timer_id: id)
+  # TODO(martin - 2021-05-01) - Remove cancels for toggle_topic_closed once topic timer revamp completed.
+  def cancel_auto_close_job
+    Jobs.cancel_scheduled_job(:toggle_topic_closed, topic_timer_id: id)
+    Jobs.cancel_scheduled_job(:close_topic, topic_timer_id: id)
   end
 
-  def schedule_auto_reminder_job(time)
+  # TODO(martin - 2021-05-01) - Remove cancels for toggle_topic_closed once topic timer revamp completed.
+  def cancel_auto_open_job
+    Jobs.cancel_scheduled_job(:toggle_topic_closed, topic_timer_id: id)
+    Jobs.cancel_scheduled_job(:open_topic, topic_timer_id: id)
+  end
+
+  # TODO(martin - 2021-05-01) - Remove cancels for toggle_topic_closed once topic timer revamp completed.
+  def cancel_auto_silent_close_job
+    Jobs.cancel_scheduled_job(:toggle_topic_closed, topic_timer_id: id)
+    Jobs.cancel_scheduled_job(:close_topic, topic_timer_id: id)
+  end
+
+  def cancel_auto_publish_to_category_job
+    Jobs.cancel_scheduled_job(TopicTimer.type_job_map[:publish_to_category], topic_timer_id: id)
+  end
+
+  def cancel_auto_delete_job
+    Jobs.cancel_scheduled_job(TopicTimer.type_job_map[:delete], topic_timer_id: id)
+  end
+
+  def cancel_auto_reminder_job
+    Jobs.cancel_scheduled_job(TopicTimer.type_job_map[:reminder], topic_timer_id: id)
+  end
+
+  def cancel_auto_bump_job
+    Jobs.cancel_scheduled_job(TopicTimer.type_job_map[:bump], topic_timer_id: id)
+  end
+
+  def cancel_auto_delete_replies_job
+    Jobs.cancel_scheduled_job(TopicTimer.type_job_map[:delete_replies], topic_timer_id: id)
+  end
+
+  def cancel_auto_clear_slow_mode_job
+    Jobs.cancel_scheduled_job(TopicTimer.type_job_map[:clear_slow_mode], topic_timer_id: id)
+  end
+
+  def schedule_auto_delete_replies_job
+    Jobs.enqueue(TopicTimer.type_job_map[:delete_replies], topic_timer_id: id)
+  end
+
+  def schedule_auto_bump_job
+    Jobs.enqueue(TopicTimer.type_job_map[:bump], topic_timer_id: id)
+  end
+
+  def schedule_auto_open_job
+    Jobs.enqueue(TopicTimer.type_job_map[:open], topic_timer_id: id)
+  end
+
+  def schedule_auto_close_job
+    Jobs.enqueue(TopicTimer.type_job_map[:close], topic_timer_id: id)
+  end
+
+  def schedule_auto_silent_close_job
+    Jobs.enqueue(TopicTimer.type_job_map[:close], topic_timer_id: id, silent: true)
+  end
+
+  def schedule_auto_publish_to_category_job
+    Jobs.enqueue(TopicTimer.type_job_map[:publish_to_category], topic_timer_id: id)
+  end
+
+  def schedule_auto_delete_job
+    Jobs.enqueue(TopicTimer.type_job_map[:delete], topic_timer_id: id)
+  end
+
+  def schedule_auto_reminder_job
     # noop, TODO(martin 2021-03-11): Remove this after timers migrated and outstanding jobs cancelled
   end
+
+  def schedule_auto_clear_slow_mode_job
+    Jobs.enqueue(TopicTimer.type_job_map[:clear_slow_mode], topic_timer_id: id)
+  end
 end
 
 # == Schema Information
@@ -176,7 +260,7 @@ end
 #  updated_at         :datetime         not null
 #  category_id        :integer
 #  public_type        :boolean          default(TRUE)
-#  duration           :integer
+#  duration_minutes   :integer
 #
 # Indexes
 #
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index e018d96132..75c2e9d974 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -12,6 +12,7 @@ class TopicTrackingState
   UNREAD_MESSAGE_TYPE = "unread"
   LATEST_MESSAGE_TYPE = "latest"
   MUTED_MESSAGE_TYPE = "muted"
+  UNMUTED_MESSAGE_TYPE = "unmuted"
 
   attr_accessor :user_id,
                 :topic_id,
@@ -104,6 +105,21 @@ class TopicTrackingState
     MessageBus.publish("/latest", message.as_json, user_ids: user_ids)
   end
 
+  def self.publish_unmuted(topic)
+    return if !SiteSetting.mute_all_categories_by_default
+    user_ids = User.watching_topic_when_mute_categories_by_default(topic)
+      .where("users.last_seen_at > ?", 7.days.ago)
+      .order("users.last_seen_at DESC")
+      .limit(100)
+      .pluck(:id)
+    return if user_ids.blank?
+    message = {
+      topic_id: topic.id,
+      message_type: UNMUTED_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,
@@ -199,11 +215,12 @@ class TopicTrackingState
     MessageBus.publish(self.unread_channel_key(user_id), message.as_json, user_ids: [user_id])
   end
 
-  def self.publish_dismiss_new(user_id, category_id = nil)
-    payload = category_id ? { category_id: category_id } : {}
+  def self.publish_dismiss_new(user_id, topic_ids: [])
     message = {
       message_type: "dismiss_new",
-      payload: payload
+      payload: {
+        topic_ids: topic_ids
+      }
     }
     MessageBus.publish(self.unread_channel_key(user_id), message.as_json, user_ids: [user_id])
   end
@@ -213,17 +230,17 @@ class TopicTrackingState
                   WHEN COALESCE(uo.new_topic_duration_minutes, :default_duration) = :always THEN u.created_at
                   WHEN COALESCE(uo.new_topic_duration_minutes, :default_duration) = :last_visit THEN COALESCE(u.previous_visit_at,u.created_at)
                   ELSE (:now::timestamp - INTERVAL '1 MINUTE' * COALESCE(uo.new_topic_duration_minutes, :default_duration))
-               END, us.new_since, :min_date)",
+               END, u.created_at, :min_date)",
                 now: DateTime.now,
                 last_visit: User::NewTopicDuration::LAST_VISIT,
                 always: User::NewTopicDuration::ALWAYS,
                 default_duration: SiteSetting.default_other_new_topic_duration_minutes,
                 min_date: Time.at(SiteSetting.min_new_topics_time).to_datetime
-              ).where_clause.send(:predicates)[0]
+              ).where_clause.ast.to_sql
   end
 
   def self.include_tags_in_report?
-    SiteSetting.tagging_enabled && (@include_tags_in_report || SiteSetting.show_filter_by_tag)
+    SiteSetting.tagging_enabled && @include_tags_in_report
   end
 
   def self.include_tags_in_report=(v)
@@ -297,8 +314,7 @@ class TopicTrackingState
       else
         TopicQuery
           .unread_filter(Topic, -999, staff: opts && opts[:staff])
-          .where_clause.send(:predicates)
-          .join(" AND ")
+          .where_clause.ast.to_sql
           .gsub("-999", ":user_id")
       end
 
@@ -313,9 +329,9 @@ class TopicTrackingState
       if opts[:skip_new]
         "1=0"
       else
-        TopicQuery.new_filter(Topic, "xxx").where_clause.send(:predicates).join(" AND ").gsub!("'xxx'", treat_as_new_topic_clause) +
+        TopicQuery.new_filter(Topic, "xxx").where_clause.ast.to_sql.gsub!("'xxx'", treat_as_new_topic_clause) +
           " AND topics.created_at > :min_new_topic_date" +
-          " AND (category_users.last_seen_at IS NULL OR topics.created_at > category_users.last_seen_at)"
+          " AND dismissed_topic_users.id IS NULL"
       end
 
     select = (opts[:select]) || "
@@ -381,6 +397,7 @@ class TopicTrackingState
     JOIN categories c ON c.id = topics.category_id
     LEFT JOIN topic_users tu ON tu.topic_id = topics.id AND tu.user_id = u.id
     LEFT JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{opts[:user].id}
+    LEFT JOIN dismissed_topic_users ON dismissed_topic_users.topic_id = topics.id AND dismissed_topic_users.user_id = #{opts[:user].id}
     WHERE u.id = :user_id AND
           #{filter_old_unread}
           topics.archetype <> 'private_message' AND
diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb
index bbf6283d07..bcc24d979f 100644
--- a/app/models/topic_user.rb
+++ b/app/models/topic_user.rb
@@ -234,6 +234,8 @@ class TopicUser < ActiveRecord::Base
         first_visited_at: now ,
         last_visited_at: now
       ))
+
+      DiscourseEvent.trigger(:topic_first_visited_by_user, topic_id, user_id)
     end
 
     def track_visit!(topic_id, user_id)
diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb
index 1071d5dd2f..edd2b85084 100644
--- a/app/models/translation_override.rb
+++ b/app/models/translation_override.rb
@@ -5,19 +5,40 @@ require "i18n/i18n_interpolation_keys_finder"
 class TranslationOverride < ActiveRecord::Base
   # Allowlist i18n interpolation keys that can be included when customizing translations
   ALLOWED_CUSTOM_INTERPOLATION_KEYS = {
-    "user_notifications.user_" => %w{
+    [
+      "user_notifications.user_",
+      "user_notifications.only_reply_by_email",
+      "user_notifications.reply_by_email",
+      "user_notifications.visit_link_to_respond",
+      "user_notifications.header_instructions",
+      "user_notifications.pm_participants",
+      "unsubscribe_mailing_list",
+      "unsubscribe_link_and_mail",
+      "unsubscribe_link",
+    ] => %w{
+      topic_title
       topic_title_url_encoded
-      site_title_url_encoded
+      message
+      url
+      post_id
+      topic_id
       context
-
+      username
+      group_name
+      unsubscribe_url
+      subject_pm
+      participants
+      site_description
+      site_title
+      site_title_url_encoded
       site_name
       optional_re
       optional_pm
       optional_cat
       optional_tags
-      topic_title
     }
   }
+
   include ActiveSupport::Deprecation::DeprecatedConstantAccessor
   deprecate_constant 'CUSTOM_INTERPOLATION_KEYS_WHITELIST', 'TranslationOverride::ALLOWED_CUSTOM_INTERPOLATION_KEYS'
 
@@ -107,8 +128,8 @@ class TranslationOverride < ActiveRecord::Base
 
       custom_interpolation_keys = []
 
-      ALLOWED_CUSTOM_INTERPOLATION_KEYS.select do |key, value|
-        if transformed_key.start_with?(key)
+      ALLOWED_CUSTOM_INTERPOLATION_KEYS.select do |keys, value|
+        if keys.any? { |key| transformed_key.start_with?(key) }
           custom_interpolation_keys = value
         end
       end
diff --git a/app/models/trust_level_setting.rb b/app/models/trust_level_setting.rb
index 4660adc580..68b7e2b1d9 100644
--- a/app/models/trust_level_setting.rb
+++ b/app/models/trust_level_setting.rb
@@ -9,7 +9,7 @@ class TrustLevelSetting < EnumSiteSetting
 
   def self.values
     levels = TrustLevel.all
-    @values ||= valid_values.map { |x|
+    valid_values.map { |x|
       {
         name: x.is_a?(Integer) ? "#{x}: #{levels[x.to_i].name}" : x,
         value: x
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 7c713ffb99..0f1902c21b 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -225,7 +225,11 @@ class Upload < ActiveRecord::Base
       end
 
     begin
-      w, h = FastImage.new(path, raise_on_failure: true).size
+      if extension == 'svg'
+        w, h = Discourse::Utils.execute_command("identify", "-format", "%w %h", path, timeout: MAX_IDENTIFY_SECONDS).split(' ') rescue [0, 0]
+      else
+        w, h = FastImage.new(path, raise_on_failure: true).size
+      end
 
       self.width = w || 0
       self.height = h || 0
@@ -312,16 +316,30 @@ class Upload < ActiveRecord::Base
     self.posts.where("cooked LIKE '%/_optimized/%'").find_each(&:rebake!)
   end
 
-  def update_secure_status(secure_override_value: nil)
-    mark_secure = secure_override_value.nil? ? UploadSecurity.new(self).should_be_secure? : secure_override_value
+  def update_secure_status(source: "unknown", override: nil)
+    if override.nil?
+      mark_secure, reason = UploadSecurity.new(self).should_be_secure_with_reason
+    else
+      mark_secure = override
+      reason = "manually overridden"
+    end
 
     secure_status_did_change = self.secure? != mark_secure
-    self.update_column("secure", mark_secure)
+    self.update(secure_params(mark_secure, reason, source))
+
     Discourse.store.update_upload_ACL(self) if Discourse.store.external?
 
     secure_status_did_change
   end
 
+  def secure_params(secure, reason, source = "unknown")
+    {
+      secure: secure,
+      security_last_changed_reason: reason + " | source: #{source}",
+      security_last_changed_at: Time.zone.now
+    }
+  end
+
   def self.migrate_to_new_scheme(limit: nil)
     problems = []
 
@@ -452,27 +470,29 @@ end
 #
 # Table name: uploads
 #
-#  id                     :integer          not null, primary key
-#  user_id                :integer          not null
-#  original_filename      :string           not null
-#  filesize               :integer          not null
-#  width                  :integer
-#  height                 :integer
-#  url                    :string           not null
-#  created_at             :datetime         not null
-#  updated_at             :datetime         not null
-#  sha1                   :string(40)
-#  origin                 :string(1000)
-#  retain_hours           :integer
-#  extension              :string(10)
-#  thumbnail_width        :integer
-#  thumbnail_height       :integer
-#  etag                   :string
-#  secure                 :boolean          default(FALSE), not null
-#  access_control_post_id :bigint
-#  original_sha1          :string
-#  verification_status    :integer          default(1), not null
-#  animated               :boolean
+#  id                           :integer          not null, primary key
+#  user_id                      :integer          not null
+#  original_filename            :string           not null
+#  filesize                     :integer          not null
+#  width                        :integer
+#  height                       :integer
+#  url                          :string           not null
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
+#  sha1                         :string(40)
+#  origin                       :string(1000)
+#  retain_hours                 :integer
+#  extension                    :string(10)
+#  thumbnail_width              :integer
+#  thumbnail_height             :integer
+#  etag                         :string
+#  secure                       :boolean          default(FALSE), not null
+#  access_control_post_id       :bigint
+#  original_sha1                :string
+#  verification_status          :integer          default(1), not null
+#  animated                     :boolean
+#  security_last_changed_at     :datetime
+#  security_last_changed_reason :string
 #
 # Indexes
 #
diff --git a/app/models/user.rb b/app/models/user.rb
index f027593178..e90984675c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -23,7 +23,7 @@ class User < ActiveRecord::Base
   has_many :email_tokens, dependent: :destroy
   has_many :topic_links, dependent: :destroy
   has_many :user_uploads, dependent: :destroy
-  has_many :user_emails, dependent: :destroy
+  has_many :user_emails, dependent: :destroy, autosave: true
   has_many :user_associated_accounts, dependent: :destroy
   has_many :oauth2_user_infos, dependent: :destroy
   has_many :user_second_factors, dependent: :destroy
@@ -37,34 +37,37 @@ class User < ActiveRecord::Base
   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_many :user_custom_fields, dependent: :destroy
 
   has_one :user_option, dependent: :destroy
   has_one :user_avatar, dependent: :destroy
-  has_one :primary_email, -> { where(primary: true)  }, class_name: 'UserEmail', dependent: :destroy
+  has_one :primary_email, -> { where(primary: true)  }, class_name: 'UserEmail', dependent: :destroy, autosave: true, validate: false
   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
   has_one :invited_user, dependent: :destroy
+  has_one :user_notification_schedule, 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
+  has_many :do_not_disturb_timings, 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 :email_logs
   has_many :security_keys, -> {
     where(enabled: true)
   }, class_name: "UserSecurityKey"
@@ -181,6 +184,9 @@ class User < ActiveRecord::Base
   # set to true to optimize creation and save for imports
   attr_accessor :import_mode
 
+  # Cache for user custom fields. Currently it is used to display quick search results
+  attr_accessor :custom_data
+
   scope :with_email, ->(email) do
     joins(:user_emails).where("lower(user_emails.email) IN (?)", email)
   end
@@ -234,6 +240,13 @@ class User < ActiveRecord::Base
     end
   end
 
+  scope :watching_topic_when_mute_categories_by_default, ->(topic) do
+    joins(DB.sql_fragment("LEFT JOIN category_users ON category_users.user_id = users.id AND category_users.category_id = :category_id", category_id: topic.category_id))
+      .joins(DB.sql_fragment("LEFT JOIN topic_users ON topic_users.user_id = users.id AND topic_users.topic_id = :topic_id",  topic_id: topic.id))
+      .joins("LEFT JOIN tag_users ON tag_users.user_id = users.id AND tag_users.tag_id IN (#{topic.tag_ids.join(",").presence || 'NULL'})")
+      .where("category_users.notification_level > 0 OR topic_users.notification_level > 0 OR tag_users.notification_level > 0")
+  end
+
   module NewTopicDuration
     ALWAYS = -1
     LAST_VISIT = -2
@@ -437,7 +450,7 @@ class User < ActiveRecord::Base
   end
 
   def invited_by
-    used_invite = Invite.joins(:invited_users).where("invited_users.user_id = ?", self.id).first
+    used_invite = Invite.with_deleted.joins(:invited_users).where("invited_users.user_id = ?", self.id).first
     used_invite.try(:invited_by)
   end
 
@@ -628,6 +641,10 @@ class User < ActiveRecord::Base
     MessageBus.publish("/notification/#{id}", payload, user_ids: [id])
   end
 
+  def publish_do_not_disturb(ends_at: nil)
+    MessageBus.publish("/do-not-disturb/#{id}", { ends_at: ends_at&.httpdate }, user_ids: [id])
+  end
+
   def password=(password)
     # special case for passwordless accounts
     unless password.blank?
@@ -855,8 +872,19 @@ class User < ActiveRecord::Base
     Digest::MD5.hexdigest(username)[0...15].to_i(16) % length
   end
 
+  def is_system_user?
+    id == Discourse::SYSTEM_USER_ID
+  end
+
   def avatar_template
-    self.class.avatar_template(username, uploaded_avatar_id)
+    use_small_logo = is_system_user? &&
+      SiteSetting.logo_small && SiteSetting.use_site_small_logo_as_system_avatar
+
+    if use_small_logo
+      Discourse.store.cdn_url(SiteSetting.logo_small.url)
+    else
+      self.class.avatar_template(username, uploaded_avatar_id)
+    end
   end
 
   # The following count methods are somewhat slow - definitely don't use them in a loop.
@@ -1153,6 +1181,10 @@ class User < ActiveRecord::Base
     end
   end
 
+  def set_user_field(field_id, value)
+    custom_fields["#{USER_FIELD_PREFIX}#{field_id}"] = value
+  end
+
   def number_of_deleted_posts
     Post.with_deleted
       .where(user_id: self.id)
@@ -1240,15 +1272,24 @@ class User < ActiveRecord::Base
   end
 
   def email
-    primary_email.email
+    primary_email&.email
   end
 
+  # Shortcut to set the primary email of the user.
+  # Automatically removes any identical secondary emails.
   def email=(new_email)
     if primary_email
-      new_record? ? primary_email.email = new_email : primary_email.update(email: new_email)
+      primary_email.email = new_email
     else
-      self.primary_email = UserEmail.new(email: new_email, user: self, primary: true, skip_validate_email: !should_validate_email_address?)
+      build_primary_email email: new_email, skip_validate_email: !should_validate_email_address?
     end
+
+    if secondary_match = user_emails.detect { |ue| !ue.primary && Email.downcase(ue.email) == Email.downcase(new_email) }
+      secondary_match.mark_for_destruction
+      primary_email.skip_validate_unique_email = true
+    end
+
+    new_email
   end
 
   def emails
@@ -1358,6 +1399,23 @@ class User < ActiveRecord::Base
     UrlHelper.encode_component(lower ? username_lower : username)
   end
 
+  def do_not_disturb?
+    active_do_not_disturb_timings.exists?
+  end
+
+  def active_do_not_disturb_timings
+    now = Time.zone.now
+    do_not_disturb_timings.where('starts_at <= ? AND ends_at > ?', now, now)
+  end
+
+  def do_not_disturb_until
+    active_do_not_disturb_timings.maximum(:ends_at)
+  end
+
+  def shelved_notifications
+    ShelvedNotification.joins(:notification).where("notifications.user_id = ?", self.id)
+  end
+
   protected
 
   def badge_grant
@@ -1371,7 +1429,8 @@ class User < ActiveRecord::Base
   end
 
   def index_search
-    SearchIndexer.index(self)
+    # force is needed as user custom fields are updated using SQL and after_save callback is not triggered
+    SearchIndexer.index(self, force: true)
   end
 
   def clear_global_notice_if_needed
@@ -1487,17 +1546,27 @@ class User < ActiveRecord::Base
 
     values = []
 
-    %w{watching watching_first_post tracking regular muted}.each do |s|
-      category_ids = SiteSetting.get("default_categories_#{s}").split("|").map(&:to_i)
+    # The following site settings are used to pre-populate default category
+    # tracking settings for a user:
+    #
+    # * default_categories_watching
+    # * default_categories_tracking
+    # * default_categories_watching_first_post
+    # * default_categories_regular
+    # * default_categories_muted
+    %w{watching watching_first_post tracking regular muted}.each do |setting|
+      category_ids = SiteSetting.get("default_categories_#{setting}").split("|").map(&:to_i)
       category_ids.each do |category_id|
         next if category_id == 0
-        values << "(#{self.id}, #{category_id}, #{CategoryUser.notification_levels[s.to_sym]})"
+        values << {
+          user_id: self.id,
+          category_id: category_id,
+          notification_level: CategoryUser.notification_levels[setting.to_sym]
+        }
       end
     end
 
-    if values.present?
-      DB.exec("INSERT INTO category_users (user_id, category_id, notification_level) VALUES #{values.join(",")}")
-    end
+    CategoryUser.insert_all!(values) if values.present?
   end
 
   def set_default_tags_preferences
@@ -1505,12 +1574,25 @@ class User < ActiveRecord::Base
 
     values = []
 
-    %w{watching watching_first_post tracking muted}.each do |s|
-      tag_names = SiteSetting.get("default_tags_#{s}").split("|")
+    # The following site settings are used to pre-populate default tag
+    # tracking settings for a user:
+    #
+    # * default_tags_watching
+    # * default_tags_tracking
+    # * default_tags_watching_first_post
+    # * default_tags_muted
+    %w{watching watching_first_post tracking muted}.each do |setting|
+      tag_names = SiteSetting.get("default_tags_#{setting}").split("|")
       now = Time.zone.now
 
       Tag.where(name: tag_names).pluck(:id).each do |tag_id|
-        values << { user_id: self.id, tag_id: tag_id, notification_level: TagUser.notification_levels[s.to_sym], created_at: now, updated_at: now }
+        values << {
+          user_id: self.id,
+          tag_id: tag_id,
+          notification_level: TagUser.notification_levels[setting.to_sym],
+          created_at: now,
+          updated_at: now
+        }
       end
     end
 
@@ -1529,11 +1611,14 @@ class User < ActiveRecord::Base
       .where("NOT EXISTS
               (SELECT 1 FROM topic_allowed_users tu JOIN topics t ON t.id = tu.topic_id AND t.user_id > 0 WHERE tu.user_id = users.id LIMIT 1)
             ")
+      .where("NOT EXISTS
+              (SELECT 1 FROM posts p WHERE p.user_id = users.id LIMIT 1)
+            ")
       .limit(200)
       .find_each do |user|
       begin
         destroyer.destroy(user, context: I18n.t(:purge_reason))
-      rescue Discourse::InvalidAccess, UserDestroyer::PostsExistError
+      rescue Discourse::InvalidAccess
         # keep going
       end
     end
@@ -1622,7 +1707,6 @@ class User < ActiveRecord::Base
       )
     SQL
   end
-
 end
 
 # == Schema Information
diff --git a/app/models/user_bookmark_list.rb b/app/models/user_bookmark_list.rb
index df885e609d..59188ff3a0 100644
--- a/app/models/user_bookmark_list.rb
+++ b/app/models/user_bookmark_list.rb
@@ -5,13 +5,17 @@ class UserBookmarkList
 
   PER_PAGE = 20
 
-  attr_reader :bookmarks
+  attr_reader :bookmarks, :per_page
   attr_accessor :more_bookmarks_url
 
   def initialize(user:, guardian:, params:)
     @user = user
     @guardian = guardian
-    @params = params.merge(per_page: PER_PAGE)
+    @params = params
+
+    @params.merge!(per_page: PER_PAGE) if params[:per_page].blank?
+    @params[:per_page] = PER_PAGE if @params[:per_page] > PER_PAGE
+
     @bookmarks = []
   end
 
@@ -21,6 +25,6 @@ class UserBookmarkList
   end
 
   def per_page
-    @per_page ||= PER_PAGE
+    @per_page ||= @params[:per_page]
   end
 end
diff --git a/app/models/user_custom_field.rb b/app/models/user_custom_field.rb
index c38e65467e..22f4d6d55e 100644
--- a/app/models/user_custom_field.rb
+++ b/app/models/user_custom_field.rb
@@ -2,6 +2,8 @@
 
 class UserCustomField < ActiveRecord::Base
   belongs_to :user
+
+  scope :searchable, -> { joins("INNER JOIN user_fields ON user_fields.id = REPLACE(user_custom_fields.name, 'user_field_', '')::INTEGER AND user_fields.searchable IS TRUE AND user_custom_fields.name like 'user_field_%'") }
 end
 
 # == Schema Information
diff --git a/app/models/user_email.rb b/app/models/user_email.rb
index be1a060eed..6ab955c95a 100644
--- a/app/models/user_email.rb
+++ b/app/models/user_email.rb
@@ -4,6 +4,7 @@ class UserEmail < ActiveRecord::Base
   belongs_to :user
 
   attr_accessor :skip_validate_email
+  attr_accessor :skip_validate_unique_email
 
   before_validation :strip_downcase_email
 
@@ -12,7 +13,7 @@ class UserEmail < ActiveRecord::Base
 
   validates :primary, uniqueness: { scope: [:user_id] }, if: [:user_id, :primary]
   validate :user_id_not_changed, if: :primary
-  validate :unique_email
+  validate :unique_email, if: :validate_unique_email?
 
   scope :secondary, -> { where(primary: false) }
 
@@ -30,8 +31,13 @@ class UserEmail < ActiveRecord::Base
     email_changed?
   end
 
+  def validate_unique_email?
+    return false if self.skip_validate_unique_email
+    will_save_change_to_email?
+  end
+
   def unique_email
-    if self.will_save_change_to_email? && self.class.where("lower(email) = ?", email).exists?
+    if self.class.where("lower(email) = ?", email).exists?
       self.errors.add(:email, :taken)
     end
   end
diff --git a/app/models/user_field.rb b/app/models/user_field.rb
index 1fcbd0ed56..9adc5b3131 100644
--- a/app/models/user_field.rb
+++ b/app/models/user_field.rb
@@ -9,9 +9,15 @@ class UserField < ActiveRecord::Base
   has_many :user_field_options, dependent: :destroy
   accepts_nested_attributes_for :user_field_options
 
+  after_save :queue_index_search
+
   def self.max_length
     2048
   end
+
+  def queue_index_search
+    SearchIndexer.queue_users_reindex(UserCustomField.where(name: "user_field_#{self.id}").pluck(:user_id))
+  end
 end
 
 # == Schema Information
@@ -31,4 +37,5 @@ end
 #  show_on_user_card :boolean          default(FALSE), not null
 #  external_name     :string
 #  external_type     :string
+#  searchable        :boolean          default(FALSE), not null
 #
diff --git a/app/models/user_notification_schedule.rb b/app/models/user_notification_schedule.rb
new file mode 100644
index 0000000000..f2346d4e17
--- /dev/null
+++ b/app/models/user_notification_schedule.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class UserNotificationSchedule < ActiveRecord::Base
+  belongs_to :user
+
+  DEFAULT = -> {
+    attrs = { enabled: false }
+    7.times do |n|
+      attrs["day_#{n}_start_time".to_sym] = 480
+      attrs["day_#{n}_end_time".to_sym] = 1020
+    end
+    attrs
+  }.call
+
+  validate :has_valid_times
+  validates :enabled, inclusion: { in: [ true, false ] }
+
+  scope :enabled, -> { where(enabled: true) }
+
+  def create_do_not_disturb_timings(delete_existing: false)
+    destroy_scheduled_timings if delete_existing
+    UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(self)
+  end
+
+  def destroy_scheduled_timings
+    user.do_not_disturb_timings.where(scheduled: true).destroy_all
+  end
+
+  private
+
+  def has_valid_times
+    7.times do |n|
+      start_key = "day_#{n}_start_time"
+      end_key = "day_#{n}_end_time"
+
+      if self[start_key].nil? || self[start_key] > 1410 || self[start_key] < -1
+        errors.add(start_key, "is invalid")
+      end
+
+      if self[end_key].nil? || self[end_key] > 1440
+        errors.add(end_key, "is invalid")
+      end
+
+      if self[start_key] && self[end_key] && self[start_key] > self[end_key]
+        errors.add(start_key, "is after end time")
+      end
+    end
+  end
+end
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index 1c0cfbb52f..2a52d6a33f 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -149,7 +149,7 @@ class UserOption < ActiveRecord::Base
       else
         duration.minutes.ago
       end,
-      user.user_stat.new_since,
+      user.created_at,
       Time.at(SiteSetting.min_new_topics_time).to_datetime
     ]
 
@@ -200,8 +200,6 @@ class UserOption < ActiveRecord::Base
 
 end
 
-# TODO: Drop disable_jump_reply column. Functionality removed April 2019
-
 # == Schema Information
 #
 # Table name: user_options
@@ -212,7 +210,6 @@ end
 #  external_links_in_new_tab        :boolean          default(FALSE), not null
 #  enable_quoting                   :boolean          default(TRUE), not null
 #  dynamic_favicon                  :boolean          default(FALSE), not null
-#  disable_jump_reply               :boolean          default(FALSE), not null
 #  automatically_unpin_topics       :boolean          default(TRUE), not null
 #  digest_after_minutes             :integer
 #  auto_track_topics_after_msecs    :integer
diff --git a/app/models/user_search.rb b/app/models/user_search.rb
index 447f5d4492..7498b230be 100644
--- a/app/models/user_search.rb
+++ b/app/models/user_search.rb
@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-# Searches for a user by username or full text or name (if enabled in SiteSettings)
 class UserSearch
 
   MAX_SIZE_PRIORITY_MENTION ||= 500
 
   def initialize(term, opts = {})
-    @term = term
-    @term_like = "#{term.downcase.gsub("_", "\\_")}%"
+    @term = term.downcase
+    @term_like = @term.gsub("_", "\\_") + "%"
     @topic_id = opts[:topic_id]
     @category_id = opts[:category_id]
     @topic_allowed_users = opts[:topic_allowed_users]
@@ -15,131 +14,129 @@ class UserSearch
     @include_staged_users = opts[:include_staged_users] || false
     @limit = opts[:limit] || 20
     @groups = opts[:groups]
+
+    @topic = Topic.find(@topic_id) if @topic_id
+    @category = Category.find(@category_id) if @category_id
+
     @guardian = Guardian.new(@searching_user)
-    @guardian.ensure_can_see_groups_members! @groups if @groups
-    @guardian.ensure_can_see_category! Category.find(@category_id) if @category_id
-    @guardian.ensure_can_see_topic! Topic.find(@topic_id) if @topic_id
+    @guardian.ensure_can_see_groups_members!(@groups) if @groups
+    @guardian.ensure_can_see_category!(@category) if @category
+    @guardian.ensure_can_see_topic!(@topic) if @topic
   end
 
   def scoped_users
     users = User.where(active: true)
     users = users.where(staged: false) unless @include_staged_users
+    users = users.not_suspended unless @searching_user&.staff?
 
     if @groups
-      users = users.joins("INNER JOIN group_users ON group_users.user_id = users.id")
+      users = users
+        .joins(:group_users)
         .where("group_users.group_id IN (?)", @groups.map(&:id))
     end
 
-    unless @searching_user && @searching_user.staff?
-      users = users.not_suspended
-    end
-
     # Only show users who have access to private topic
-    if @topic_id && @topic_allowed_users == "true"
-      topic = Topic.find_by(id: @topic_id)
-
-      if topic.category && topic.category.read_restricted
-        users = users.includes(:secure_categories)
-          .where("users.admin = TRUE OR categories.id = ?", topic.category.id)
-          .references(:categories)
-      end
-    end
-
-    users.limit(@limit)
-  end
-
-  def filtered_by_term_users
-    users = scoped_users
-
-    if @term.present?
-      if SiteSetting.enable_names? && @term !~ /[_\.-]/
-        query = Search.ts_query(term: @term, ts_config: "simple")
-
-        users = users.includes(:user_search_data)
-          .references(:user_search_data)
-          .where("user_search_data.search_data @@ #{query}")
-          .order(DB.sql_fragment("CASE WHEN username_lower LIKE ? THEN 0 ELSE 1 END ASC", @term_like))
-
-      else
-        users = users.where("username_lower LIKE :term_like", term_like: @term_like)
-      end
+    if @topic_allowed_users == "true" && @topic&.category&.read_restricted
+      users = users
+        .references(:categories)
+        .includes(:secure_categories)
+        .where("users.admin OR categories.id = ?", @topic.category_id)
     end
 
     users
   end
 
+  def filtered_by_term_users
+    if @term.blank?
+      scoped_users
+    elsif SiteSetting.enable_names? && @term !~ /[_\.-]/
+      query = Search.ts_query(term: @term, ts_config: "simple")
+
+      scoped_users
+        .includes(:user_search_data)
+        .where("user_search_data.search_data @@ #{query}")
+        .order(DB.sql_fragment("CASE WHEN username_lower LIKE ? THEN 0 ELSE 1 END ASC", @term_like))
+    else
+      scoped_users.where("username_lower LIKE :term_like", term_like: @term_like)
+    end
+  end
+
   def search_ids
     users = Set.new
 
     # 1. exact username matches
     if @term.present?
-      scoped_users.where(username_lower: @term.downcase)
+      exact_matches = scoped_users.where(username_lower: @term)
+
+      # don't polute mentions with users who haven't shown up in over a year
+      exact_matches = exact_matches.where('last_seen_at > ?', 1.year.ago) if @topic_id || @category_id
+
+      exact_matches
         .limit(@limit)
         .pluck(:id)
         .each { |id| users << id }
-
     end
 
-    return users.to_a if users.length >= @limit
+    return users.to_a if users.size >= @limit
 
     # 2. in topic
     if @topic_id
       in_topic = filtered_by_term_users
-        .where('users.id IN (SELECT p.user_id FROM posts p WHERE topic_id = ?)', @topic_id)
+        .where('users.id IN (SELECT user_id FROM posts WHERE topic_id = ?)', @topic_id)
 
       if @searching_user.present?
         in_topic = in_topic.where('users.id <> ?', @searching_user.id)
       end
 
       in_topic
-        .order('last_seen_at DESC')
-        .limit(@limit - users.length)
+        .order('last_seen_at DESC NULLS LAST')
+        .limit(@limit - users.size)
         .pluck(:id)
         .each { |id| users << id }
     end
 
-    return users.to_a if users.length >= @limit
+    return users.to_a if users.size >= @limit
 
-    secure_category_id = nil
+    # 3. in category
+    secure_category_id =
+      if @category_id
+        DB.query_single(<<~SQL, @category_id).first
+          SELECT id
+            FROM categories
+           WHERE read_restricted
+             AND id = ?
+        SQL
+      elsif @topic_id
+        DB.query_single(<<~SQL, @topic_id).first
+          SELECT id
+            FROM categories
+           WHERE read_restricted
+             AND id IN (SELECT category_id FROM topics WHERE id = ?)
+        SQL
+      end
 
-    if @category_id
-      secure_category_id = DB.query_single(<<~SQL, @category_id).first
-        SELECT id FROM categories
-        WHERE read_restricted AND id = ?
-      SQL
-    elsif @topic_id
-      secure_category_id = DB.query_single(<<~SQL, @topic_id).first
-        SELECT id FROM categories
-        WHERE read_restricted AND id IN (
-          SELECT category_id FROM topics
-          WHERE id = ?
-        )
-      SQL
-    end
-
-    # 3. category matches
     if secure_category_id
-      @searching_user.present?
-
       category_groups = Group.where(<<~SQL, secure_category_id, MAX_SIZE_PRIORITY_MENTION)
         groups.id IN (
-          SELECT group_id FROM category_groups
-          JOIN groups g ON group_id = g.id
-          WHERE
-            category_id = ? AND
-            user_count < ?
+          SELECT group_id
+            FROM category_groups
+            JOIN groups g ON group_id = g.id
+           WHERE category_id = ?
+             AND user_count < ?
         )
       SQL
 
-      category_groups = category_groups.members_visible_groups(@searching_user)
+      if @searching_user.present?
+        category_groups = category_groups.members_visible_groups(@searching_user)
+      end
 
       in_category = filtered_by_term_users
         .where(<<~SQL, category_groups.pluck(:id))
           users.id IN (
             SELECT gu.user_id
-            FROM group_users gu
-            WHERE group_id IN (?)
-            LIMIT 200
+              FROM group_users gu
+             WHERE group_id IN (?)
+             LIMIT 200
           )
           SQL
 
@@ -148,17 +145,19 @@ class UserSearch
       end
 
       in_category
-        .order('last_seen_at DESC')
-        .limit(@limit - users.length)
+        .order('last_seen_at DESC NULLS LAST')
+        .limit(@limit - users.size)
         .pluck(:id)
         .each { |id| users << id }
     end
 
-    return users.to_a if users.length >= @limit
+    return users.to_a if users.size >= @limit
+
     # 4. global matches
     if @term.present?
-      filtered_by_term_users.order('last_seen_at DESC')
-        .limit(@limit - users.length)
+      filtered_by_term_users
+        .order('last_seen_at DESC NULLS LAST')
+        .limit(@limit - users.size)
         .pluck(:id)
         .each { |id| users << id }
     end
diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb
index 4b0fc54899..9edda802f3 100644
--- a/app/models/user_summary.rb
+++ b/app/models/user_summary.rb
@@ -142,11 +142,10 @@ class UserSummary
       .merge(Topic.listable_topics.visible.secured(@guardian))
       .where(user: @user)
       .group('topics.category_id')
-      .order('COUNT(*) DESC')
 
     top_categories = {}
 
-    Category.where(id: post_count_query.limit(MAX_SUMMARY_RESULTS).pluck('category_id'))
+    Category.where(id: post_count_query.order("count(*) DESC").limit(MAX_SUMMARY_RESULTS).pluck('category_id'))
       .pluck(:id, :name, :color, :text_color, :slug, :read_restricted, :parent_category_id)
       .each do |c|
         top_categories[c[0].to_i] = CategoryWithCounts.new(
@@ -168,7 +167,6 @@ class UserSummary
       .where('topics.category_id in (?)', top_categories.keys)
       .where(user: @user)
       .group('topics.category_id')
-      .order('COUNT(*) DESC')
       .pluck('category_id, COUNT(*)')
       .each do |r|
         top_categories[r[0].to_i].topic_count = r[1]
@@ -198,9 +196,13 @@ protected
     user_ids.map do |user_id|
       lookup_hash = lookup[user_id]
 
-      UserWithCount.new(
-        lookup_hash.attributes.merge(count: user_hash[user_id])
-      ) if lookup_hash.present?
+      if lookup_hash.present?
+        primary_group = lookup.primary_groups[user_id]
+
+        UserWithCount.new(
+          lookup_hash.attributes.merge(count: user_hash[user_id], primary_group: primary_group)
+        )
+      end
     end.compact.sort_by { |u| -u[:count] }
   end
 
diff --git a/app/models/watched_word.rb b/app/models/watched_word.rb
index 57cc69f1fc..6c9c0e07a3 100644
--- a/app/models/watched_word.rb
+++ b/app/models/watched_word.rb
@@ -7,17 +7,19 @@ class WatchedWord < ActiveRecord::Base
       block: 1,
       censor: 2,
       require_approval: 3,
-      flag: 4
+      flag: 4,
+      replace: 5,
+      tag: 6,
     )
   end
 
-  MAX_WORDS_PER_ACTION = 1000
+  MAX_WORDS_PER_ACTION = 2000
 
   before_validation do
     self.word = self.class.normalize_word(self.word)
   end
 
-  validates :word,   presence: true, uniqueness: true, length: { maximum: 50 }
+  validates :word,   presence: true, uniqueness: true, length: { maximum: 100 }
   validates :action, presence: true
   validates_each :word do |record, attr, val|
     if WatchedWord.where(action: record.action).count >= MAX_WORDS_PER_ACTION
@@ -37,12 +39,17 @@ class WatchedWord < ActiveRecord::Base
   def self.create_or_update_word(params)
     new_word = normalize_word(params[:word])
     w = WatchedWord.where("word ILIKE ?", new_word).first || WatchedWord.new(word: new_word)
+    w.replacement = params[:replacement] if params[:replacement]
     w.action_key = params[:action_key] if params[:action_key]
     w.action = params[:action] if params[:action]
     w.save
     w
   end
 
+  def self.has_replacement?(action)
+    action == :replace || action == :tag
+  end
+
   def action_key=(arg)
     self.action = self.class.actions[arg.to_sym]
   end
@@ -57,11 +64,12 @@ end
 #
 # Table name: watched_words
 #
-#  id         :integer          not null, primary key
-#  word       :string           not null
-#  action     :integer          not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id          :integer          not null, primary key
+#  word        :string           not null
+#  action      :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  replacement :string
 #
 # Indexes
 #
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index fd889aa18c..ac8dadeb2c 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -57,13 +57,14 @@ class WebHook < ActiveRecord::Base
     end
   end
 
-  def self.enqueue_object_hooks(type, object, event, serializer = nil)
+  def self.enqueue_object_hooks(type, object, event, serializer = nil, opts = {})
     if active_web_hooks(type).exists?
       payload = WebHook.generate_payload(type, object, serializer)
 
-      WebHook.enqueue_hooks(type, event,
-        id: object.id,
-        payload: payload
+      WebHook.enqueue_hooks(type, event, opts.merge(
+                              id: object.id,
+                              payload: payload
+                            )
       )
     end
   end
@@ -110,7 +111,7 @@ class WebHook < ActiveRecord::Base
   private
 
   def self.guardian
-    @guardian ||= Guardian.new(Discourse.system_user)
+    Guardian.new(Discourse.system_user)
   end
 end
 
diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index 442f14cb8c..70f2144f8a 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -12,6 +12,8 @@ class WebHookEventType < ActiveRecord::Base
   SOLVED = 11
   ASSIGN = 12
   USER_BADGE = 13
+  GROUP_USER = 14
+  LIKE = 15
 
   has_and_belongs_to_many :web_hooks
 
diff --git a/app/serializers/admin_badge_serializer.rb b/app/serializers/admin_badge_serializer.rb
index 15f354ef5a..fc75706c59 100644
--- a/app/serializers/admin_badge_serializer.rb
+++ b/app/serializers/admin_badge_serializer.rb
@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
 class AdminBadgeSerializer < BadgeSerializer
-  attributes :query, :trigger, :target_posts, :auto_revoke, :show_posts
+  attributes :query, :trigger, :target_posts, :auto_revoke, :show_posts, :i18n_name
 
   def include_long_description?
     true
   end
+
+  def include_i18n_name?
+    object.system?
+  end
 end
diff --git a/app/serializers/admin_plugin_serializer.rb b/app/serializers/admin_plugin_serializer.rb
index 809773c854..75a0771612 100644
--- a/app/serializers/admin_plugin_serializer.rb
+++ b/app/serializers/admin_plugin_serializer.rb
@@ -3,6 +3,7 @@
 class AdminPluginSerializer < ApplicationSerializer
   attributes :id,
              :name,
+             :about,
              :version,
              :url,
              :admin_route,
@@ -19,6 +20,10 @@ class AdminPluginSerializer < ApplicationSerializer
     object.metadata.name
   end
 
+  def about
+    object.metadata.about
+  end
+
   def version
     object.metadata.version
   end
diff --git a/app/serializers/admin_user_list_serializer.rb b/app/serializers/admin_user_list_serializer.rb
index eab8fe1f41..dd9ce3f6f0 100644
--- a/app/serializers/admin_user_list_serializer.rb
+++ b/app/serializers/admin_user_list_serializer.rb
@@ -106,7 +106,7 @@ class AdminUserListSerializer < BasicUserSerializer
   end
 
   def include_second_factor_enabled?
-    !SiteSetting.enable_sso &&
+    !SiteSetting.enable_discourse_connect &&
       SiteSetting.enable_local_logins &&
       object.has_any_second_factor_methods_enabled?
   end
diff --git a/app/serializers/auth_provider_serializer.rb b/app/serializers/auth_provider_serializer.rb
index 320a2654cf..78cfcffd0b 100644
--- a/app/serializers/auth_provider_serializer.rb
+++ b/app/serializers/auth_provider_serializer.rb
@@ -2,7 +2,7 @@
 
 class AuthProviderSerializer < ApplicationSerializer
 
-  attributes :name, :custom_url, :pretty_name_override, :title_override, :message_override,
+  attributes :name, :custom_url, :pretty_name_override, :title_override,
              :frame_width, :frame_height, :can_connect, :can_revoke,
              :icon
 
@@ -16,8 +16,4 @@ class AuthProviderSerializer < ApplicationSerializer
     object.pretty_name
   end
 
-  def message_override
-    object.message
-  end
-
 end
diff --git a/app/serializers/badge_serializer.rb b/app/serializers/badge_serializer.rb
index d75ef6e1c9..cd837ac1cd 100644
--- a/app/serializers/badge_serializer.rb
+++ b/app/serializers/badge_serializer.rb
@@ -2,7 +2,7 @@
 
 class BadgeSerializer < ApplicationSerializer
   attributes :id, :name, :description, :grant_count, :allow_title,
-             :multiple_grant, :icon, :image, :listable, :enabled, :badge_grouping_id,
+             :multiple_grant, :icon, :image_url, :listable, :enabled, :badge_grouping_id,
              :system, :long_description, :slug, :has_badge, :manually_grantable?
 
   has_one :badge_type
diff --git a/app/serializers/basic_user_serializer.rb b/app/serializers/basic_user_serializer.rb
index 964cb5b3e7..26249bb483 100644
--- a/app/serializers/basic_user_serializer.rb
+++ b/app/serializers/basic_user_serializer.rb
@@ -22,4 +22,28 @@ class BasicUserSerializer < ApplicationSerializer
   def user
     object[:user] || object.try(:user) || object
   end
+
+  def user_is_current_user
+    object.id == scope.user&.id
+  end
+
+  def categories_with_notification_level(lookup_level)
+    category_user_notification_levels.select do |id, level|
+      level == CategoryUser.notification_levels[lookup_level]
+    end.keys
+  end
+
+  def category_user_notification_levels
+    @category_user_notification_levels ||= CategoryUser.notification_levels_for(user)
+  end
+
+  def tags_with_notification_level(lookup_level)
+    tag_user_notification_levels.select do |id, level|
+      level == TagUser.notification_levels[lookup_level]
+    end.keys
+  end
+
+  def tag_user_notification_levels
+    @tag_user_notification_levels ||= TagUser.notification_levels_for(user)
+  end
 end
diff --git a/app/serializers/category_and_topic_lists_serializer.rb b/app/serializers/category_and_topic_lists_serializer.rb
index edea6be090..863164fb10 100644
--- a/app/serializers/category_and_topic_lists_serializer.rb
+++ b/app/serializers/category_and_topic_lists_serializer.rb
@@ -3,7 +3,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 :users, serializer: PosterSerializer, embed: :objects
   has_many :primary_groups, serializer: PrimaryGroupSerializer, embed: :objects
 
   def users
diff --git a/app/serializers/category_detailed_serializer.rb b/app/serializers/category_detailed_serializer.rb
index 483f78f845..6b1e5083b2 100644
--- a/app/serializers/category_detailed_serializer.rb
+++ b/app/serializers/category_detailed_serializer.rb
@@ -26,10 +26,6 @@ class CategoryDetailedSerializer < BasicCategorySerializer
     is_uncategorized
   end
 
-  def include_subcategory_ids?
-    subcategory_ids.present?
-  end
-
   def topics_day
     count_with_subcategories(:topics_day)
   end
diff --git a/app/serializers/category_list_serializer.rb b/app/serializers/category_list_serializer.rb
index 275108bae9..1fe73e2229 100644
--- a/app/serializers/category_list_serializer.rb
+++ b/app/serializers/category_list_serializer.rb
@@ -3,10 +3,7 @@
 class CategoryListSerializer < ApplicationSerializer
 
   attributes :can_create_category,
-             :can_create_topic,
-             :draft,
-             :draft_key,
-             :draft_sequence
+             :can_create_topic
 
   has_many :categories, serializer: CategoryDetailedSerializer, embed: :objects
 
diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index e4428f2e3f..4789df1cba 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -12,6 +12,7 @@ class CategorySerializer < SiteCategorySerializer
              :email_in_allow_strangers,
              :mailinglist_mirror,
              :all_topics_wiki,
+             :allow_unlimited_owner_edits_on_first_post,
              :can_delete,
              :cannot_delete_reason,
              :is_special,
diff --git a/app/serializers/concerns/user_primary_group_mixin.rb b/app/serializers/concerns/user_primary_group_mixin.rb
index 78b921a1a9..184db2b027 100644
--- a/app/serializers/concerns/user_primary_group_mixin.rb
+++ b/app/serializers/concerns/user_primary_group_mixin.rb
@@ -6,7 +6,10 @@ module UserPrimaryGroupMixin
     klass.attributes :primary_group_name,
                      :primary_group_flair_url,
                      :primary_group_flair_bg_color,
-                     :primary_group_flair_color
+                     :primary_group_flair_color,
+                     :admin,
+                     :moderator,
+                     :trust_level
   end
 
   def primary_group_name
@@ -41,4 +44,19 @@ module UserPrimaryGroupMixin
     object&.primary_group&.flair_color.present?
   end
 
+  def include_admin?
+    object&.admin
+  end
+
+  def admin
+    true
+  end
+
+  def include_moderator?
+    object&.moderator
+  end
+
+  def moderator
+    true
+  end
 end
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 1eafd22221..6b6f015876 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -19,6 +19,7 @@ class CurrentUserSerializer < BasicUserSerializer
              :dynamic_favicon,
              :trust_level,
              :can_send_private_email_messages,
+             :can_send_private_messages,
              :can_edit,
              :can_invite_to_forum,
              :no_password,
@@ -27,7 +28,16 @@ class CurrentUserSerializer < BasicUserSerializer
              :redirected_to_top,
              :custom_fields,
              :muted_category_ids,
+             :regular_category_ids,
+             :tracked_category_ids,
+             :watched_first_post_category_ids,
+             :watched_category_ids,
              :muted_tag_ids,
+             :watched_tags,
+             :watching_first_post_tags,
+             :tracked_tags,
+             :muted_tags,
+             :regular_tags,
              :dismissed_banner_key,
              :is_anonymous,
              :reviewable_count,
@@ -49,10 +59,18 @@ class CurrentUserSerializer < BasicUserSerializer
              :title_count_mode,
              :timezone,
              :featured_topic,
-             :skip_new_user_tips
+             :skip_new_user_tips,
+             :do_not_disturb_until,
+             :has_topic_draft,
+             :can_review,
 
   def groups
-    object.visible_groups.pluck(:id, :name).map { |id, name| { id: id, name: name } }
+    owned_group_ids = GroupUser.where(user_id: id, owner: true).pluck(:group_id).to_set
+    object.visible_groups.pluck(:id, :name).map do |id, name|
+      group = { id: id, name: name }
+      group[:owner] = true if owned_group_ids.include?(id)
+      group
+    end
   end
 
   def link_posting_access
@@ -123,6 +141,10 @@ class CurrentUserSerializer < BasicUserSerializer
     scope.can_send_private_messages_to_email?
   end
 
+  def can_send_private_messages
+    scope.can_send_private_message?(Discourse.system_user)
+  end
+
   def can_edit
     true
   end
@@ -173,13 +195,51 @@ class CurrentUserSerializer < BasicUserSerializer
   end
 
   def muted_category_ids
-    CategoryUser.lookup(object, :muted).pluck(:category_id)
+    categories_with_notification_level(:muted)
   end
 
+  def regular_category_ids
+    categories_with_notification_level(:regular)
+  end
+
+  def tracked_category_ids
+    categories_with_notification_level(:tracking)
+  end
+
+  def watched_category_ids
+    categories_with_notification_level(:watching)
+  end
+
+  def watched_first_post_category_ids
+    categories_with_notification_level(:watching_first_post)
+  end
+
+  # this is a weird outlier that is used for topic tracking state which
+  # needs the actual ids, which is why it is duplicated with muted_tags
   def muted_tag_ids
     TagUser.lookup(object, :muted).pluck(:tag_id)
   end
 
+  def muted_tags
+    tags_with_notification_level(:muted)
+  end
+
+  def tracked_tags
+    tags_with_notification_level(:tracking)
+  end
+
+  def watching_first_post_tags
+    tags_with_notification_level(:watching_first_post)
+  end
+
+  def watched_tags
+    tags_with_notification_level(:watching)
+  end
+
+  def regular_tags
+    tags_with_notification_level(:regular)
+  end
+
   def ignored_users
     IgnoredUser.where(user: object.id).joins(:ignored_user).pluck(:username)
   end
@@ -210,6 +270,10 @@ class CurrentUserSerializer < BasicUserSerializer
     Reviewable.list_for(object).count
   end
 
+  def can_review
+    scope.can_see_review_queue?
+  end
+
   def mailing_list_mode
     object.user_option.mailing_list_mode
   end
@@ -227,7 +291,7 @@ class CurrentUserSerializer < BasicUserSerializer
   end
 
   def include_external_id?
-    SiteSetting.enable_sso
+    SiteSetting.enable_discourse_connect
   end
 
   def second_factor_enabled
@@ -237,4 +301,12 @@ class CurrentUserSerializer < BasicUserSerializer
   def featured_topic
     object.user_profile.featured_topic
   end
+
+  def has_topic_draft
+    true
+  end
+
+  def include_has_topic_draft?
+    Draft.has_topic_draft(object)
+  end
 end
diff --git a/app/serializers/emoji_serializer.rb b/app/serializers/emoji_serializer.rb
index d0d440e24d..08e388d09d 100644
--- a/app/serializers/emoji_serializer.rb
+++ b/app/serializers/emoji_serializer.rb
@@ -2,4 +2,9 @@
 
 class EmojiSerializer < ApplicationSerializer
   attributes :name, :url, :group
+
+  def url
+    return nil if object.url.blank?
+    Discourse.store.cdn_url(object.url)
+  end
 end
diff --git a/app/serializers/group_post_serializer.rb b/app/serializers/group_post_serializer.rb
index 29584bb8a6..1176fc3609 100644
--- a/app/serializers/group_post_serializer.rb
+++ b/app/serializers/group_post_serializer.rb
@@ -11,7 +11,8 @@ class GroupPostSerializer < ApplicationSerializer
              :url,
              :category_id,
              :post_number,
-             :topic_id
+             :topic_id,
+             :post_type
 
   has_one :user, serializer: GroupPostUserSerializer, embed: :object
   has_one :topic, serializer: BasicTopicSerializer, embed: :object
diff --git a/app/serializers/group_post_user_serializer.rb b/app/serializers/group_post_user_serializer.rb
index 308535bfb6..9a0337ca51 100644
--- a/app/serializers/group_post_user_serializer.rb
+++ b/app/serializers/group_post_user_serializer.rb
@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
 class GroupPostUserSerializer < BasicUserSerializer
-  attributes :title, :name
+  attributes :title, :name, :primary_group_name
+
+  def primary_group_name
+    object.primary_group.name if object.primary_group
+  end
 end
diff --git a/app/serializers/group_show_serializer.rb b/app/serializers/group_show_serializer.rb
index 53a6f0d93d..1b0bdf8b78 100644
--- a/app/serializers/group_show_serializer.rb
+++ b/app/serializers/group_show_serializer.rb
@@ -25,7 +25,9 @@ class GroupShowSerializer < BasicGroupSerializer
                    :email_password,
                    :imap_last_error,
                    :imap_old_emails,
-                   :imap_new_emails
+                   :imap_new_emails,
+                   :message_count,
+                   :allow_unknown_sender_topic_replies
 
   def self.admin_or_owner_attributes(*attrs)
     attributes(*attrs)
diff --git a/app/serializers/invite_serializer.rb b/app/serializers/invite_serializer.rb
index f66f1c02c7..0d8f0dbf6b 100644
--- a/app/serializers/invite_serializer.rb
+++ b/app/serializers/invite_serializer.rb
@@ -1,12 +1,46 @@
 # frozen_string_literal: true
 
 class InviteSerializer < ApplicationSerializer
-  attributes :id, :email, :updated_at, :expired
+  attributes :id,
+             :invite_key,
+             :link,
+             :email,
+             :emailed,
+             :max_redemptions_allowed,
+             :redemption_count,
+             :custom_message,
+             :created_at,
+             :updated_at,
+             :expires_at,
+             :expired
+
+  has_many :topics, embed: :object, serializer: BasicTopicSerializer
+  has_many :groups, embed: :object, serializer: BasicGroupSerializer
 
   def include_email?
     options[:show_emails] && !object.redeemed?
   end
 
+  def include_emailed?
+    email.present?
+  end
+
+  def emailed
+    object.emailed_status != Invite.emailed_status_types[:not_required]
+  end
+
+  def include_custom_message?
+    email.present?
+  end
+
+  def include_max_redemptions_allowed?
+    email.blank?
+  end
+
+  def include_redemption_count?
+    email.blank?
+  end
+
   def expired
     object.expired?
   end
diff --git a/app/serializers/invited_serializer.rb b/app/serializers/invited_serializer.rb
index 68ced8ba10..a0f76017e4 100644
--- a/app/serializers/invited_serializer.rb
+++ b/app/serializers/invited_serializer.rb
@@ -1,18 +1,12 @@
 # frozen_string_literal: true
 
 class InvitedSerializer < ApplicationSerializer
-  attributes :invites, :can_see_invite_details
+  attributes :invites, :can_see_invite_details, :counts
 
   def invites
-    serializer = if object.type == "pending"
-      InviteSerializer
-    else
-      InvitedUserSerializer
-    end
-
     ActiveModel::ArraySerializer.new(
       object.invite_list,
-      each_serializer: serializer,
+      each_serializer: object.type == "pending" || object.type == "expired" ? InviteSerializer : InvitedUserSerializer,
       scope: scope,
       root: false,
       show_emails: object.show_emails
@@ -23,7 +17,7 @@ class InvitedSerializer < ApplicationSerializer
     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)
+  def counts
+    object.counts
   end
 end
diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb
index 184a2ca474..884884bf7d 100644
--- a/app/serializers/listable_topic_serializer.rb
+++ b/app/serializers/listable_topic_serializer.rb
@@ -75,7 +75,7 @@ class ListableTopicSerializer < BasicTopicSerializer
   def seen
     return true if !scope || !scope.user
     return true if object.user_data && !object.user_data.last_read_post_number.nil?
-    return true if object.category_user_data&.last_seen_at && object.created_at < object.category_user_data.last_seen_at
+    return true if object.dismissed
     return true if object.created_at < scope.user.user_option.treat_as_new_topic_start_date
     false
   end
diff --git a/app/serializers/notification_serializer.rb b/app/serializers/notification_serializer.rb
index 18f0b9fcac..f4b7119b02 100644
--- a/app/serializers/notification_serializer.rb
+++ b/app/serializers/notification_serializer.rb
@@ -44,7 +44,7 @@ class NotificationSerializer < ApplicationSerializer
   end
 
   def include_external_id?
-    SiteSetting.enable_sso
+    SiteSetting.enable_discourse_connect
   end
 
 end
diff --git a/app/serializers/post_revision_serializer.rb b/app/serializers/post_revision_serializer.rb
index 415999e8e9..1791c38304 100644
--- a/app/serializers/post_revision_serializer.rb
+++ b/app/serializers/post_revision_serializer.rb
@@ -190,7 +190,12 @@ class PostRevisionSerializer < ApplicationSerializer
   def all_revisions
     return @all_revisions if @all_revisions
 
-    post_revisions = PostRevision.where(post_id: object.post_id).order(:number).to_a
+    post_revisions = PostRevision
+      .where(post_id: object.post_id)
+      .order(number: :desc)
+      .limit(99)
+      .to_a
+      .reverse
 
     latest_modifications = {
       "raw" => [post.raw],
diff --git a/app/serializers/poster_serializer.rb b/app/serializers/poster_serializer.rb
new file mode 100644
index 0000000000..b578d739fd
--- /dev/null
+++ b/app/serializers/poster_serializer.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class PosterSerializer < BasicUserSerializer
+  include UserPrimaryGroupMixin
+end
diff --git a/app/serializers/reviewable_action_serializer.rb b/app/serializers/reviewable_action_serializer.rb
index 50c5310fcd..fbba925f27 100644
--- a/app/serializers/reviewable_action_serializer.rb
+++ b/app/serializers/reviewable_action_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class ReviewableActionSerializer < ApplicationSerializer
-  attributes :id, :icon, :button_class, :label, :confirm_message, :description, :client_action
+  attributes :id, :icon, :button_class, :label, :confirm_message, :description, :client_action, :require_reject_reason, :custom_modal
 
   def label
     I18n.t(object.label)
@@ -27,4 +27,11 @@ class ReviewableActionSerializer < ApplicationSerializer
     object.client_action.present?
   end
 
+  def include_require_reject_reason?
+    object.require_reject_reason.present?
+  end
+
+  def include_custom_modal?
+    object.custom_modal.present?
+  end
 end
diff --git a/app/serializers/reviewable_post_serializer.rb b/app/serializers/reviewable_post_serializer.rb
new file mode 100644
index 0000000000..9e38edf50d
--- /dev/null
+++ b/app/serializers/reviewable_post_serializer.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class ReviewablePostSerializer < ReviewableSerializer
+  target_attributes :cooked, :raw, :reply_count, :reply_to_post_number
+  attributes :blank_post, :post_updated_at, :post_version
+
+  def post_version
+    object.target&.version
+  end
+
+  def post_updated_at
+    object.target&.updated_at
+  end
+
+  def blank_post
+    true
+  end
+
+  def include_blank_post?
+    object.target.blank?
+  end
+end
diff --git a/app/serializers/reviewable_user_serializer.rb b/app/serializers/reviewable_user_serializer.rb
index abaf56b4c9..5841899cfd 100644
--- a/app/serializers/reviewable_user_serializer.rb
+++ b/app/serializers/reviewable_user_serializer.rb
@@ -2,7 +2,7 @@
 
 class ReviewableUserSerializer < ReviewableSerializer
 
-  attributes :link_admin, :user_fields
+  attributes :link_admin, :user_fields, :reject_reason
 
   payload_attributes(
     :username,
diff --git a/app/serializers/search_result_user_serializer.rb b/app/serializers/search_result_user_serializer.rb
index 9104e53ad1..322a4c4319 100644
--- a/app/serializers/search_result_user_serializer.rb
+++ b/app/serializers/search_result_user_serializer.rb
@@ -2,4 +2,5 @@
 
 class SearchResultUserSerializer < BasicUserSerializer
   attributes :name
+  attributes :custom_data
 end
diff --git a/app/serializers/single_sign_on_record_serializer.rb b/app/serializers/single_sign_on_record_serializer.rb
index f9a9241e73..55af0fb7bc 100644
--- a/app/serializers/single_sign_on_record_serializer.rb
+++ b/app/serializers/single_sign_on_record_serializer.rb
@@ -2,9 +2,9 @@
 
 class SingleSignOnRecordSerializer < ApplicationSerializer
   attributes :user_id, :external_id,
-             :last_payload, :created_at,
-             :updated_at, :external_username,
-             :external_name, :external_avatar_url,
+             :created_at, :updated_at,
+             :external_username, :external_name,
+             :external_avatar_url,
              :external_profile_background_url,
              :external_card_background_url
 end
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index f7915050aa..acf0544136 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -28,7 +28,8 @@ class SiteSerializer < ApplicationSerializer
     :default_dark_color_scheme,
     :censored_regexp,
     :shared_drafts_category_id,
-    :custom_emoji_translation
+    :custom_emoji_translation,
+    :watched_words_replace
   )
 
   has_many :categories, serializer: SiteCategorySerializer, embed: :objects
@@ -61,7 +62,17 @@ class SiteSerializer < ApplicationSerializer
 
   def groups
     cache_anon_fragment("group_names") do
-      object.groups.order(:name).pluck(:id, :name).map { |id, name| { id: id, name: name } }.as_json
+      object.groups.order(:name)
+        .select(:id, :name, :flair_icon, :flair_upload_id, :flair_bg_color, :flair_color)
+        .map do |g|
+          {
+            id: g.id,
+            name: g.name,
+            flair_url: g.flair_url,
+            flair_bg_color: g.flair_bg_color,
+            flair_color: g.flair_color,
+          }
+        end.as_json
     end
   end
 
@@ -172,7 +183,11 @@ class SiteSerializer < ApplicationSerializer
   end
 
   def include_shared_drafts_category_id?
-    scope.can_create_shared_draft?
+    scope.can_see_shared_draft? && SiteSetting.shared_drafts_enabled?
+  end
+
+  def watched_words_replace
+    WordWatcher.word_matcher_regexps(:replace)
   end
 
   private
diff --git a/app/serializers/site_text_serializer.rb b/app/serializers/site_text_serializer.rb
index 8415bc5bc3..0946eb2fb7 100644
--- a/app/serializers/site_text_serializer.rb
+++ b/app/serializers/site_text_serializer.rb
@@ -15,7 +15,7 @@ class SiteTextSerializer < ApplicationSerializer
     if options[:overridden_keys]
       options[:overridden_keys].include?(object[:id])
     else
-      TranslationOverride.exists?(locale: I18n.locale, translation_key: object[:id])
+      TranslationOverride.exists?(locale: object[:locale], translation_key: object[:id])
     end
   end
 
diff --git a/app/serializers/suggested_topics_mixin.rb b/app/serializers/suggested_topics_mixin.rb
index 74d3d65a9c..cfd8f23ce1 100644
--- a/app/serializers/suggested_topics_mixin.rb
+++ b/app/serializers/suggested_topics_mixin.rb
@@ -7,10 +7,12 @@ module SuggestedTopicsMixin
   end
 
   def include_related_messages?
+    return false if @options[:exclude_suggested_and_related]
     object.next_page.nil? && object.related_messages&.topics
   end
 
   def include_suggested_topics?
+    return false if @options[:exclude_suggested_and_related]
     object.next_page.nil? && object.suggested_topics&.topics
   end
 
diff --git a/app/serializers/theme_serializer.rb b/app/serializers/theme_serializer.rb
index e388f6f782..b0edeaa7c4 100644
--- a/app/serializers/theme_serializer.rb
+++ b/app/serializers/theme_serializer.rb
@@ -79,6 +79,10 @@ class ThemeSerializer < BasicThemeSerializer
   def initialize(theme, options = {})
     super
     @errors = []
+
+    object.theme_fields.each do |o|
+      @errors << o.error if o.error
+    end
   end
 
   def child_themes
diff --git a/app/serializers/theme_settings_serializer.rb b/app/serializers/theme_settings_serializer.rb
index 92f41cf681..987003d06a 100644
--- a/app/serializers/theme_settings_serializer.rb
+++ b/app/serializers/theme_settings_serializer.rb
@@ -2,7 +2,7 @@
 
 class ThemeSettingsSerializer < ApplicationSerializer
   attributes :setting, :type, :default, :value, :description, :valid_values,
-             :list_type, :textarea
+             :list_type, :textarea, :json_schema
 
   def setting
     object.name
@@ -53,4 +53,11 @@ class ThemeSettingsSerializer < ApplicationSerializer
     object.type == ThemeSetting.types[:string]
   end
 
+  def json_schema
+    object.json_schema
+  end
+
+  def include_json_schema?
+    object.type == ThemeSetting.types[:string] && object.json_schema.present?
+  end
 end
diff --git a/app/serializers/top_list_serializer.rb b/app/serializers/top_list_serializer.rb
index 195f92217d..291089d9be 100644
--- a/app/serializers/top_list_serializer.rb
+++ b/app/serializers/top_list_serializer.rb
@@ -2,10 +2,7 @@
 
 class TopListSerializer < ApplicationSerializer
 
-  attributes :can_create_topic,
-             :draft,
-             :draft_key,
-             :draft_sequence
+  attributes :can_create_topic
 
   def can_create_topic
     scope.can_create?(Topic)
diff --git a/app/serializers/topic_list_serializer.rb b/app/serializers/topic_list_serializer.rb
index 2766f9c30b..a3ece4822f 100644
--- a/app/serializers/topic_list_serializer.rb
+++ b/app/serializers/topic_list_serializer.rb
@@ -4,9 +4,6 @@ class TopicListSerializer < ApplicationSerializer
 
   attributes :can_create_topic,
              :more_topics_url,
-             :draft,
-             :draft_key,
-             :draft_sequence,
              :for_period,
              :per_page,
              :top_tags,
diff --git a/app/serializers/topic_post_count_serializer.rb b/app/serializers/topic_post_count_serializer.rb
index 8baae1e4d4..08d1c624f4 100644
--- a/app/serializers/topic_post_count_serializer.rb
+++ b/app/serializers/topic_post_count_serializer.rb
@@ -3,7 +3,8 @@
 class TopicPostCountSerializer < BasicUserSerializer
 
   attributes :post_count, :primary_group_name,
-             :primary_group_flair_url, :primary_group_flair_color, :primary_group_flair_bg_color
+             :primary_group_flair_url, :primary_group_flair_color, :primary_group_flair_bg_color,
+             :admin, :moderator, :trust_level,
 
   def id
     object[:user].id
@@ -34,4 +35,24 @@ class TopicPostCountSerializer < BasicUserSerializer
     object[:user]&.primary_group&.flair_color
   end
 
+  def include_admin?
+    object[:user].admin
+  end
+
+  def admin
+    true
+  end
+
+  def include_moderator?
+    object[:user].moderator
+  end
+
+  def moderator
+    true
+  end
+
+  def trust_level
+    object[:user].trust_level
+  end
+
 end
diff --git a/app/serializers/topic_poster_serializer.rb b/app/serializers/topic_poster_serializer.rb
index 41c4b7ba80..6a6bc714f4 100644
--- a/app/serializers/topic_poster_serializer.rb
+++ b/app/serializers/topic_poster_serializer.rb
@@ -2,6 +2,7 @@
 
 class TopicPosterSerializer < ApplicationSerializer
   attributes :extras, :description
-  has_one :user, serializer: BasicUserSerializer
+
+  has_one :user, serializer: PosterSerializer
   has_one :primary_group, serializer: PrimaryGroupSerializer
 end
diff --git a/app/serializers/topic_timer_serializer.rb b/app/serializers/topic_timer_serializer.rb
index 1c736edc0e..b7f3b88788 100644
--- a/app/serializers/topic_timer_serializer.rb
+++ b/app/serializers/topic_timer_serializer.rb
@@ -3,7 +3,7 @@
 class TopicTimerSerializer < ApplicationSerializer
   attributes :id,
              :execute_at,
-             :duration,
+             :duration_minutes,
              :based_on_last_post,
              :status_type,
              :category_id
diff --git a/app/serializers/topic_view_details_serializer.rb b/app/serializers/topic_view_details_serializer.rb
index ef152591c5..0a3077c9ce 100644
--- a/app/serializers/topic_view_details_serializer.rb
+++ b/app/serializers/topic_view_details_serializer.rb
@@ -4,7 +4,6 @@ class TopicViewDetailsSerializer < ApplicationSerializer
 
   def self.can_attributes
     [:can_move_posts,
-     :can_edit,
      :can_delete,
      :can_recover,
      :can_remove_allowed_users,
@@ -21,10 +20,15 @@ class TopicViewDetailsSerializer < ApplicationSerializer
      :can_archive_topic,
      :can_split_merge_topic,
      :can_edit_staff_notes,
+     :can_toggle_topic_visibility,
+     :can_pin_unpin_topic,
      :can_moderate_category]
   end
 
+  # NOTE: `can_edit` is defined as an attribute because we explicitly want
+  # it returned even if it has a value of `false`
   attributes(
+    :can_edit,
     :notification_level,
     :notifications_reason_id,
     *can_attributes,
@@ -87,6 +91,13 @@ class TopicViewDetailsSerializer < ApplicationSerializer
     define_method(ca) { true }
   end
 
+  # NOTE: A Category Group Moderator moving a topic to a different category
+  # may result in the 'can_edit?' result changing from `true` to `false`.
+  # Explictly returning a `false` value is required to update the client UI.
+  def can_edit
+    scope.can_edit?(object.topic)
+  end
+
   def include_can_review_topic?
     scope.can_review_topic?(object.topic)
   end
@@ -95,10 +106,6 @@ class TopicViewDetailsSerializer < ApplicationSerializer
     scope.can_move_posts?(object.topic)
   end
 
-  def include_can_edit?
-    scope.can_edit?(object.topic)
-  end
-
   def include_can_delete?
     scope.can_delete?(object.topic)
   end
@@ -139,6 +146,14 @@ class TopicViewDetailsSerializer < ApplicationSerializer
     !scope.can_edit?(object.topic) && scope.can_edit_tags?(object.topic)
   end
 
+  def include_can_toggle_topic_visibility?
+    scope.can_toggle_topic_visibility?(object.topic)
+  end
+
+  def include_can_pin_unpin_topic?
+    scope.can_pin_unpin_topic?(object.topic)
+  end
+
   def can_perform_action_available_to_group_moderators?
     @can_perform_action_available_to_group_moderators ||= scope.can_perform_action_available_to_group_moderators?(object.topic)
   end
@@ -153,7 +168,9 @@ class TopicViewDetailsSerializer < ApplicationSerializer
   end
 
   def allowed_users
-    object.topic.allowed_users.reject { |user| object.group_allowed_user_ids.include?(user.id) }
+    object.topic.allowed_users.reject do |user|
+      object.group_allowed_user_ids.include?(user.id) && user != scope.user
+    end
   end
 
   def include_allowed_users?
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 5be4ccc4c0..da76ec2497 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -74,7 +74,8 @@ class TopicViewSerializer < ApplicationSerializer
     :show_read_indicator,
     :requested_group_name,
     :thumbnails,
-    :user_last_posted_at
+    :user_last_posted_at,
+    :is_shared_draft
   )
 
   has_one :details, serializer: TopicViewDetailsSerializer, root: false, embed: :objects
@@ -236,11 +237,15 @@ class TopicViewSerializer < ApplicationSerializer
   end
 
   def include_destination_category_id?
-    scope.can_create_shared_draft? &&
-      object.topic.category_id == SiteSetting.shared_drafts_category.to_i &&
-      object.topic.shared_draft.present?
+    scope.can_see_shared_draft? && SiteSetting.shared_drafts_enabled? && object.topic.shared_draft.present?
   end
 
+  def is_shared_draft
+    include_destination_category_id?
+  end
+
+  alias_method :include_is_shared_draft?, :include_destination_category_id?
+
   def include_pending_posts?
     scope.authenticated? && object.queued_posts_enabled
   end
diff --git a/app/serializers/user_bookmark_serializer.rb b/app/serializers/user_bookmark_serializer.rb
index 06b9c1523b..805be599ed 100644
--- a/app/serializers/user_bookmark_serializer.rb
+++ b/app/serializers/user_bookmark_serializer.rb
@@ -14,6 +14,7 @@ class UserBookmarkSerializer < ApplicationSerializer
              :post_id,
              :name,
              :reminder_at,
+             :pinned,
              :title,
              :deleted,
              :hidden,
diff --git a/app/serializers/user_field_serializer.rb b/app/serializers/user_field_serializer.rb
index 0da8f956f4..d897a13e44 100644
--- a/app/serializers/user_field_serializer.rb
+++ b/app/serializers/user_field_serializer.rb
@@ -9,6 +9,7 @@ class UserFieldSerializer < ApplicationSerializer
              :required,
              :show_on_profile,
              :show_on_user_card,
+             :searchable,
              :position,
              :options
 
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 3935ce2052..1c9afecd4e 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -58,7 +58,9 @@ class UserSerializer < UserCardSerializer
                      :can_change_location,
                      :can_change_website,
                      :user_api_keys,
-                     :user_auth_tokens
+                     :user_auth_tokens,
+                     :user_notification_schedule,
+                     :use_logo_small_as_avatar
 
   untrusted_attributes :bio_raw,
                        :bio_cooked,
@@ -67,6 +69,10 @@ class UserSerializer < UserCardSerializer
   ###
   ### ATTRIBUTES
   ###
+  #
+  def user_notification_schedule
+    object.user_notification_schedule || UserNotificationSchedule::DEFAULT
+  end
 
   def mailing_list_posts_per_day
     val = Post.estimate_posts_per_day
@@ -83,15 +89,15 @@ class UserSerializer < UserCardSerializer
   end
 
   def include_group_users?
-    (object.id && object.id == scope.user.try(:id)) || scope.is_admin?
+    user_is_current_user || scope.is_admin?
   end
 
   def include_associated_accounts?
-    (object.id && object.id == scope.user.try(:id))
+    user_is_current_user
   end
 
   def include_second_factor_enabled?
-    (object&.id == scope.user&.id) || scope.is_admin?
+    user_is_current_user || scope.is_admin?
   end
 
   def second_factor_enabled
@@ -99,7 +105,7 @@ class UserSerializer < UserCardSerializer
   end
 
   def include_second_factor_backup_enabled?
-    object&.id == scope.user&.id
+    user_is_current_user
   end
 
   def second_factor_backup_enabled
@@ -107,7 +113,7 @@ class UserSerializer < UserCardSerializer
   end
 
   def include_second_factor_remaining_backup_codes?
-    (object&.id == scope.user&.id) && object.backup_codes_enabled?
+    user_is_current_user && object.backup_codes_enabled?
   end
 
   def second_factor_remaining_backup_codes
@@ -115,15 +121,15 @@ class UserSerializer < UserCardSerializer
   end
 
   def can_change_bio
-    !(SiteSetting.enable_sso && SiteSetting.sso_overrides_bio)
+    !(SiteSetting.enable_discourse_connect && SiteSetting.discourse_connect_overrides_bio)
   end
 
   def can_change_location
-    !(SiteSetting.enable_sso && SiteSetting.sso_overrides_location)
+    !(SiteSetting.enable_discourse_connect && SiteSetting.discourse_connect_overrides_location)
   end
 
   def can_change_website
-    !(SiteSetting.enable_sso && SiteSetting.sso_overrides_website)
+    !(SiteSetting.enable_discourse_connect && SiteSetting.discourse_connect_overrides_website)
   end
 
   def user_api_keys
@@ -201,39 +207,39 @@ class UserSerializer < UserCardSerializer
   ### PRIVATE ATTRIBUTES
   ###
   def muted_tags
-    TagUser.lookup(object, :muted).joins(:tag).pluck('tags.name')
+    tags_with_notification_level(:muted)
   end
 
   def tracked_tags
-    TagUser.lookup(object, :tracking).joins(:tag).pluck('tags.name')
+    tags_with_notification_level(:tracking)
   end
 
   def watching_first_post_tags
-    TagUser.lookup(object, :watching_first_post).joins(:tag).pluck('tags.name')
+    tags_with_notification_level(:watching_first_post)
   end
 
   def watched_tags
-    TagUser.lookup(object, :watching).joins(:tag).pluck('tags.name')
+    tags_with_notification_level(:watching)
   end
 
   def muted_category_ids
-    CategoryUser.lookup(object, :muted).pluck(:category_id)
+    categories_with_notification_level(:muted)
   end
 
   def regular_category_ids
-    CategoryUser.lookup(object, :regular).pluck(:category_id)
+    categories_with_notification_level(:regular)
   end
 
   def tracked_category_ids
-    CategoryUser.lookup(object, :tracking).pluck(:category_id)
+    categories_with_notification_level(:tracking)
   end
 
   def watched_category_ids
-    CategoryUser.lookup(object, :watching).pluck(:category_id)
+    categories_with_notification_level(:watching)
   end
 
   def watched_first_post_category_ids
-    CategoryUser.lookup(object, :watching_first_post).pluck(:category_id)
+    categories_with_notification_level(:watching_first_post)
   end
 
   def muted_usernames
@@ -304,6 +310,10 @@ class UserSerializer < UserCardSerializer
     object.profile_background_upload&.url
   end
 
+  def use_logo_small_as_avatar
+    object.is_system_user? && SiteSetting.logo_small && SiteSetting.use_site_small_logo_as_system_avatar
+  end
+
   private
 
   def custom_field_keys
diff --git a/app/serializers/user_summary_serializer.rb b/app/serializers/user_summary_serializer.rb
index 65d0250de1..dc251b3ed1 100644
--- a/app/serializers/user_summary_serializer.rb
+++ b/app/serializers/user_summary_serializer.rb
@@ -21,7 +21,18 @@ class UserSummarySerializer < ApplicationSerializer
   end
 
   class UserWithCountSerializer < ApplicationSerializer
-    attributes :id, :username, :name, :count, :avatar_template
+    attributes :id,
+               :username,
+               :name,
+               :count,
+               :avatar_template,
+               :admin,
+               :moderator,
+               :trust_level,
+               :primary_group_flair_url,
+               :primary_group_flair_bg_color,
+               :primary_group_flair_color,
+               :primary_group_name
 
     def include_name?
       SiteSetting.enable_names?
@@ -30,6 +41,22 @@ class UserSummarySerializer < ApplicationSerializer
     def avatar_template
       User.avatar_template(object[:username], object[:uploaded_avatar_id])
     end
+
+    def primary_group_flair_url
+      object.primary_group&.flair_url
+    end
+
+    def primary_group_flair_bg_color
+      object.primary_group&.flair_bg_color
+    end
+
+    def primary_group_flair_color
+      object.primary_group&.flair_color
+    end
+
+    def primary_group_name
+      object.primary_group&.name
+    end
   end
 
   class CategoryWithCountsSerializer < ApplicationSerializer
diff --git a/app/serializers/watched_word_list_serializer.rb b/app/serializers/watched_word_list_serializer.rb
index 5cc151c209..ec71b87af2 100644
--- a/app/serializers/watched_word_list_serializer.rb
+++ b/app/serializers/watched_word_list_serializer.rb
@@ -4,7 +4,8 @@ class WatchedWordListSerializer < ApplicationSerializer
   attributes :actions, :words, :regular_expressions, :compiled_regular_expressions
 
   def actions
-    WatchedWord.actions.keys
+    SiteSetting.tagging_enabled ? WatchedWord.actions.keys
+                                : WatchedWord.actions.keys.filter { |k| k != :tag }
   end
 
   def words
@@ -21,7 +22,7 @@ class WatchedWordListSerializer < ApplicationSerializer
 
   def compiled_regular_expressions
     expressions = {}
-    WatchedWord.actions.keys.each do |action|
+    actions.each do |action|
       expressions[action] = WordWatcher.word_matcher_regexp(action)&.source
     end
     expressions
diff --git a/app/serializers/watched_word_serializer.rb b/app/serializers/watched_word_serializer.rb
index a99bfc07a2..0a73b4a2a3 100644
--- a/app/serializers/watched_word_serializer.rb
+++ b/app/serializers/watched_word_serializer.rb
@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
 class WatchedWordSerializer < ApplicationSerializer
-  attributes :id, :word, :action
+  attributes :id, :word, :replacement, :action
 
   def action
     WatchedWord.actions[object.action]
   end
+
+  def include_replacement?
+    WatchedWord.has_replacement?(action)
+  end
 end
diff --git a/app/serializers/web_hook_group_user_serializer.rb b/app/serializers/web_hook_group_user_serializer.rb
new file mode 100644
index 0000000000..342b5a5412
--- /dev/null
+++ b/app/serializers/web_hook_group_user_serializer.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class WebHookGroupUserSerializer < BasicGroupUserSerializer
+  attributes :id,
+             :created_at
+end
diff --git a/app/serializers/web_hook_like_serializer.rb b/app/serializers/web_hook_like_serializer.rb
new file mode 100644
index 0000000000..0a3e74fb08
--- /dev/null
+++ b/app/serializers/web_hook_like_serializer.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+class WebHookLikeSerializer < ApplicationSerializer
+  has_one :post, serializer: WebHookPostSerializer, embed: :objects
+  has_one :user, serializer: BasicUserSerializer, embed: :objects
+end
diff --git a/app/serializers/web_hook_user_serializer.rb b/app/serializers/web_hook_user_serializer.rb
index 32fbde02f5..43200e4fd6 100644
--- a/app/serializers/web_hook_user_serializer.rb
+++ b/app/serializers/web_hook_user_serializer.rb
@@ -34,6 +34,7 @@ class WebHookUserSerializer < UserSerializer
     group_users
     user_auth_tokens
     user_auth_token_logs
+    use_logo_small_as_avatar
   }.each do |attr|
     define_method("include_#{attr}?") do
       false
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index 127eca9d54..96dec02e98 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class BadgeGranter
+  class GrantError < StandardError; end
 
   def self.disable_queue
     @queue_disabled = true
@@ -44,8 +45,8 @@ class BadgeGranter
 
   def grant
     return if @granted_by && !Guardian.new(@granted_by).can_grant_badges?(@user)
-    return unless @badge.enabled?
-    return if @badge.badge_grouping_id == BadgeGrouping::GettingStarted && @badge.id != Badge::NewUserOfTheMonth && @user.user_option.skip_new_user_tips
+    return unless @badge.present? && @badge.enabled?
+    return if @user.blank?
 
     find_by = { badge_id: @badge.id, user_id: @user.id }
 
@@ -76,7 +77,8 @@ class BadgeGranter
           StaffActionLogger.new(@granted_by).log_badge_grant(user_badge)
         end
 
-        unless @badge.badge_type_id == BadgeType::Bronze && user_badge.granted_at < 2.days.ago
+        skip_new_user_tips = @user.user_option.skip_new_user_tips
+        unless self.class.suppress_notification?(@badge, user_badge.granted_at, skip_new_user_tips)
           notification = self.class.send_notification(@user.id, @user.username, @user.effective_locale, @badge)
           user_badge.update!(notification_id: notification.id)
         end
@@ -344,9 +346,10 @@ class BadgeGranter
         ON CONFLICT DO NOTHING
         RETURNING id, user_id, granted_at
       )
-      SELECT w.*, username, locale, (u.admin OR u.moderator) AS staff
+      SELECT w.*, username, locale, (u.admin OR u.moderator) AS staff, uo.skip_new_user_tips
         FROM w
         JOIN users u on u.id = w.user_id
+        JOIN user_options uo ON uo.user_id = w.user_id
     SQL
 
     builder = DB.build(sql)
@@ -374,8 +377,7 @@ class BadgeGranter
       post_ids: post_ids || [-2],
       user_ids: user_ids || [-2]).each do |row|
 
-      # old bronze badges do not matter
-      next if badge.badge_type_id == BadgeType::Bronze && row.granted_at < 2.days.ago
+      next if suppress_notification?(badge, row.granted_at, row.skip_new_user_tips)
       next if row.staff && badge.awarded_for_trust_level?
 
       notification = send_notification(row.user_id, row.username, row.locale, badge)
@@ -389,8 +391,7 @@ class BadgeGranter
 
     badge.reset_grant_count!
   rescue => e
-    Rails.logger.error("Failed to backfill '#{badge.name}' badge: #{opts}")
-    raise e
+    raise GrantError, "Failed to backfill '#{badge.name}' badge: #{opts}. Reason: #{e.message}"
   end
 
   def self.revoke_ungranted_titles!
@@ -449,4 +450,10 @@ class BadgeGranter
     notification
   end
 
+  def self.suppress_notification?(badge, granted_at, skip_new_user_tips)
+    is_old_bronze_badge = badge.badge_type_id == BadgeType::Bronze && granted_at < 2.days.ago
+    skip_beginner_badge = skip_new_user_tips && badge.for_beginners?
+
+    is_old_bronze_badge || skip_beginner_badge
+  end
 end
diff --git a/app/services/destroy_task.rb b/app/services/destroy_task.rb
index 57afc0e3d7..4c5036eca6 100644
--- a/app/services/destroy_task.rb
+++ b/app/services/destroy_task.rb
@@ -81,7 +81,7 @@ class DestroyTask
   def destroy_users
     User.human_users.where(admin: false).find_each do |user|
       begin
-        if UserDestroyer.new(Discourse.system_user).destroy(user, delete_posts: true)
+        if UserDestroyer.new(Discourse.system_user).destroy(user, delete_posts: true, context: "destroy task")
           @io.puts "#{user.username} deleted"
         else
           @io.puts "#{user.username} not deleted"
diff --git a/app/services/dismiss_topics.rb b/app/services/dismiss_topics.rb
new file mode 100644
index 0000000000..595fdf92d1
--- /dev/null
+++ b/app/services/dismiss_topics.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class DismissTopics
+  def initialize(user, topics_scope)
+    @user = user
+    @topics_scope = topics_scope
+  end
+
+  def perform!
+    DismissedTopicUser.insert_all(rows) if rows.present?
+    @rows.map { |row| row[:topic_id] }
+  end
+
+  private
+
+  def rows
+    @rows ||= @topics_scope
+      .joins("LEFT JOIN topic_users ON topic_users.topic_id = topics.id AND topic_users.user_id = #{@user.id}")
+      .where("topics.created_at >= ?", since_date)
+      .where("topic_users.last_read_post_number IS NULL")
+      .where("topics.archetype <> ?", Archetype.private_message)
+      .order("topics.created_at DESC")
+      .limit(SiteSetting.max_new_topics).map do |topic|
+      {
+        topic_id: topic.id,
+        user_id: @user.id,
+        created_at: Time.zone.now
+      }
+    end
+  end
+
+  def since_date
+    new_topic_duration_minutes = @user.user_option&.new_topic_duration_minutes || SiteSetting.default_other_new_topic_duration_minutes
+    setting_date =
+      case new_topic_duration_minutes
+      when User::NewTopicDuration::LAST_VISIT
+        @user.previous_visit_at || @user.created_at
+      when User::NewTopicDuration::ALWAYS
+        @user.created_at
+      else
+        new_topic_duration_minutes.minutes.ago
+      end
+    [setting_date, @user.created_at, Time.at(SiteSetting.min_new_topics_time).to_datetime].max
+  end
+end
diff --git a/app/services/email_settings_validator.rb b/app/services/email_settings_validator.rb
new file mode 100644
index 0000000000..190d8720e2
--- /dev/null
+++ b/app/services/email_settings_validator.rb
@@ -0,0 +1,191 @@
+# frozen_string_literal: true
+
+require 'net/imap'
+require 'net/smtp'
+require 'net/pop'
+
+# Usage:
+#
+# begin
+#   EmailSettingsValidator.validate_imap(host: "imap.test.com", port: 999, username: "test@test.com", password: "password")
+#
+#   # or for specific host preset
+#   EmailSettingsValidator.validate_imap(**{ username: "test@gmail.com", password: "test" }.merge(Email.gmail_imap_settings))
+#
+# rescue *EmailSettingsValidator::FRIENDLY_EXCEPTIONS => err
+#   EmailSettingsValidator.friendly_exception_message(err)
+# end
+class EmailSettingsValidator
+  EXPECTED_EXCEPTIONS = [
+    Net::POPAuthenticationError,
+    Net::IMAP::NoResponseError,
+    Net::SMTPAuthenticationError,
+    Net::SMTPServerBusy,
+    Net::SMTPSyntaxError,
+    Net::SMTPFatalError,
+    Net::SMTPUnknownError,
+    Net::OpenTimeout,
+    Net::ReadTimeout,
+    SocketError,
+    Errno::ECONNREFUSED
+  ]
+
+  def self.friendly_exception_message(exception)
+    case exception
+    when Net::POPAuthenticationError
+      I18n.t("email_settings.pop3_authentication_error")
+    when Net::IMAP::NoResponseError
+
+      # Most of IMAP's errors are lumped under the NoResponseError, including invalid
+      # credentials errors, because it is raised when a "NO" response is
+      # raised from the IMAP server https://datatracker.ietf.org/doc/html/rfc3501#section-7.1.2
+      #
+      # Generally, it should be fairly safe to just return the error message as is.
+      if exception.message.match(/Invalid credentials/)
+        I18n.t("email_settings.imap_authentication_error")
+      else
+        I18n.t("email_settings.imap_no_response_error", message: exception.message.gsub(" (Failure)", ""))
+      end
+    when Net::SMTPAuthenticationError
+      I18n.t("email_settings.smtp_authentication_error")
+    when Net::SMTPServerBusy
+      I18n.t("email_settings.smtp_server_busy_error")
+    when Net::SMTPSyntaxError, Net::SMTPFatalError, Net::SMTPUnknownError
+      I18n.t("email_settings.smtp_unhandled_error", message: exception.message)
+    when SocketError, Errno::ECONNREFUSED
+      I18n.t("email_settings.connection_error")
+    when Net::OpenTimeout, Net::ReadTimeout
+      I18n.t("email_settings.timeout_error")
+    else
+      I18n.t("email_settings.unhandled_error", message: exception.message)
+    end
+  end
+
+  ##
+  # Attempts to authenticate and disconnect a POP3 session and if that raises
+  # an error then it is assumed the credentials or some other settings are wrong.
+  #
+  # @param debug [Boolean] - When set to true, any errors will be logged at a warning
+  #                          level before being re-raised.
+  def self.validate_pop3(
+    host:,
+    port:,
+    username:,
+    password:,
+    ssl: SiteSetting.pop3_polling_ssl,
+    openssl_verify: SiteSetting.pop3_polling_openssl_verify,
+    debug: false
+  )
+    begin
+      pop3 = Net::POP3.new(host, port)
+
+      # Note that we do not allow which verification mode to be specified
+      # like we do for SMTP, we just pick TLS1_2 if the SSL and openSSL verify
+      # options have been enabled.
+      if ssl
+        if openssl_verify
+          pop3.enable_ssl(max_version: OpenSSL::SSL::TLS1_2_VERSION)
+        else
+          pop3.enable_ssl(OpenSSL::SSL::VERIFY_NONE)
+        end
+      end
+
+      # This disconnects itself, unlike SMTP and IMAP.
+      pop3.auth_only(username, password)
+    rescue => err
+      log_and_raise(err, debug)
+    end
+  end
+
+  ##
+  # Attempts to start an SMTP session and if that raises an error then it is
+  # assumed the credentials or other settings are wrong.
+  #
+  # For Gmail, the port should be 587, enable_starttls_auto should be true,
+  # and enable_tls should be false.
+  #
+  # @param domain [String] - Used for HELO, will be the email sender's domain, so often
+  #                          will just be the host e.g. the domain for test@gmail.com is gmail.com.
+  #                          localhost can be used in development mode.
+  #                          See https://datatracker.ietf.org/doc/html/rfc788#section-4
+  # @param debug [Boolean] - When set to true, any errors will be logged at a warning
+  #                          level before being re-raised.
+  def self.validate_smtp(
+    host:,
+    port:,
+    domain:,
+    username:,
+    password:,
+    authentication: GlobalSetting.smtp_authentication,
+    enable_starttls_auto: GlobalSetting.smtp_enable_start_tls,
+    enable_tls: GlobalSetting.smtp_force_tls,
+    openssl_verify_mode: GlobalSetting.smtp_openssl_verify_mode,
+    debug: false
+  )
+    begin
+      if enable_tls && enable_starttls_auto
+        raise ArgumentError, "TLS and STARTTLS are mutually exclusive"
+      end
+
+      if ![:plain, :login, :cram_md5].include?(authentication.to_sym)
+        raise ArgumentError, "Invalid authentication method. Must be plain, login, or cram_md5."
+      end
+
+      smtp = Net::SMTP.new(host, port)
+
+      # These SSL options are cribbed from the Mail gem, which is used internally
+      # by ActionMailer. Unfortunately the mail gem hides this setup in private
+      # methods, e.g. https://github.com/mikel/mail/blob/master/lib/mail/network/delivery_methods/smtp.rb#L112-L147
+      #
+      # Relying on the GlobalSetting options is a good idea here.
+      #
+      # For specific use cases, options should be passed in from higher up. For example
+      # Gmail needs either port 465 and tls enabled, or port 587 and starttls_auto.
+      if openssl_verify_mode.kind_of?(String)
+        openssl_verify_mode = OpenSSL::SSL.const_get("VERIFY_#{openssl_verify_mode.upcase}")
+      end
+      ssl_context = Net::SMTP.default_ssl_context
+      ssl_context.verify_mode = openssl_verify_mode if openssl_verify_mode
+
+      smtp.enable_starttls_auto(ssl_context) if enable_starttls_auto
+      smtp.enable_tls(ssl_context) if enable_tls
+
+      smtp.start(domain, username, password, authentication.to_sym)
+      smtp.finish
+    rescue => err
+      log_and_raise(err, debug)
+    end
+  end
+
+  ##
+  # Attempts to login, logout, and disconnect an IMAP session and if that raises
+  # an error then it is assumed the credentials or some other settings are wrong.
+  #
+  # @param debug [Boolean] - When set to true, any errors will be logged at a warning
+  #                          level before being re-raised.
+  def self.validate_imap(
+    host:,
+    port:,
+    username:,
+    password:,
+    open_timeout: 10,
+    ssl: true,
+    debug: false
+  )
+    begin
+      imap = Net::IMAP.new(host, port: port, ssl: ssl, open_timeout: open_timeout)
+      imap.login(username, password)
+      imap.logout rescue nil
+      imap.disconnect
+    rescue => err
+      log_and_raise(err, debug)
+    end
+  end
+
+  def self.log_and_raise(err, debug)
+    if debug
+      Rails.logger.warn("[EmailSettingsValidator] Error encountered when validating email settings: #{err.message} #{err.backtrace.join("\n")}")
+    end
+    raise err
+  end
+end
diff --git a/app/services/inline_uploads.rb b/app/services/inline_uploads.rb
index a63f0af9c0..59d3c7738a 100644
--- a/app/services/inline_uploads.rb
+++ b/app/services/inline_uploads.rb
@@ -200,7 +200,7 @@ class InlineUploads
   def self.match_img(markdown, external_src: false, uploads: nil)
     markdown.scan(/(<(?!img)[^<>]+\/?>)?(\s*)(<img [^>\n]+>)/i) do |match|
       node = Nokogiri::HTML5::fragment(match[2].strip).children[0]
-      src =  node.attributes["src"]&.value
+      src = node&.attributes&.[]("src")&.value
 
       if src && (matched_uploads(src).present? || external_src)
         upload = uploads&.[](src)
diff --git a/app/services/notification_emailer.rb b/app/services/notification_emailer.rb
index db51246e3d..a1e7f12efa 100644
--- a/app/services/notification_emailer.rb
+++ b/app/services/notification_emailer.rb
@@ -3,10 +3,11 @@
 class NotificationEmailer
 
   class EmailUser
-    attr_reader :notification
+    attr_reader :notification, :no_delay
 
-    def initialize(notification)
+    def initialize(notification, no_delay: false)
       @notification = notification
+      @no_delay = no_delay
     end
 
     def group_mentioned
@@ -37,6 +38,10 @@ class NotificationEmailer
       enqueue :user_watching_first_post
     end
 
+    def post_approved
+      enqueue :post_approved
+    end
+
     def private_message
       enqueue_private(:user_private_message)
     end
@@ -51,16 +56,17 @@ class NotificationEmailer
 
     def self.notification_params(notification, type)
       post_id = (notification.data_hash[:original_post_id] || notification.post_id).to_i
+      notification_type = Notification.types[notification.notification_type]
 
       hash = {
         type: type,
         user_id: notification.user_id,
         notification_id: notification.id,
         notification_data_hash: notification.data_hash,
-        notification_type: Notification.types[notification.notification_type],
+        notification_type: notification_type,
       }
 
-      hash[:post_id] = post_id if post_id > 0
+      hash[:post_id] = post_id if post_id > 0 && notification_type != :post_approved
       hash
     end
 
@@ -98,11 +104,11 @@ class NotificationEmailer
     end
 
     def default_delay
-      SiteSetting.email_time_window_mins.minutes
+      no_delay ? 0 : SiteSetting.email_time_window_mins.minutes
     end
 
     def private_delay
-      SiteSetting.personal_email_time_window_seconds
+      no_delay ? 0 : SiteSetting.personal_email_time_window_seconds
     end
 
     def post_type
@@ -123,10 +129,10 @@ class NotificationEmailer
     @disabled = false
   end
 
-  def self.process_notification(notification)
+  def self.process_notification(notification, no_delay: false)
     return if @disabled
 
-    email_user   = EmailUser.new(notification)
+    email_user   = EmailUser.new(notification, no_delay: no_delay)
     email_method = Notification.types[notification.notification_type]
 
     email_user.public_send(email_method) if email_user.respond_to? email_method
diff --git a/app/services/post_action_notifier.rb b/app/services/post_action_notifier.rb
index 056a58c48d..881af4953f 100644
--- a/app/services/post_action_notifier.rb
+++ b/app/services/post_action_notifier.rb
@@ -110,7 +110,10 @@ class PostActionNotifier
       user_ids << post.user_id
     end
 
-    if post.wiki && post.is_first_post?
+    # Notify all users watching the topic when the OP of a wiki topic is edited
+    # or if the topic category allows unlimited owner edits on the OP.
+    if post.is_first_post? &&
+        (post.wiki? || post.topic.category_allows_unlimited_owner_edits_on_first_post?)
       user_ids.concat(
         TopicUser.watching(post.topic_id)
           .where.not(user_id: post_revision.user_id)
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 9817abebd1..77ef414602 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -70,15 +70,15 @@ class PostAlerter
         mentioned_opts = { user_id: editor.id, original_username: editor.username, display_username: editor.username }
       end
 
-      expand_group_mentions(mentioned_groups, post) do |group, users|
-        users = only_allowed_users(users, post)
-        notified += notify_users(users - notified, :group_mentioned, post, mentioned_opts.merge(group: group))
-      end
-
       if mentioned_users
         mentioned_users = only_allowed_users(mentioned_users, post)
         notified += notify_users(mentioned_users - notified, :mentioned, post, mentioned_opts)
       end
+
+      expand_group_mentions(mentioned_groups, post) do |group, users|
+        users = only_allowed_users(users, post)
+        notified += notify_users(users - notified, :group_mentioned, post, mentioned_opts.merge(group: group))
+      end
     end
 
     # replies
@@ -156,9 +156,20 @@ class PostAlerter
     GroupMention.where(post_id: post.id).destroy_all
     return if mentioned_groups.blank?
 
-    mentioned_groups.each do |group|
-      GroupMention.create(post_id: post.id, group_id: group.id)
-    end
+    now = Time.zone.now
+
+    # insert_all instead of insert_all! since multiple post_alert jobs might be
+    # running concurrently
+    GroupMention.insert_all(
+      mentioned_groups.map do |group|
+        {
+          post_id: post.id,
+          group_id: group.id,
+          created_at: now,
+          updated_at: now,
+        }
+      end
+    )
   end
 
   def unread_posts(user, topic)
@@ -167,12 +178,26 @@ class PostAlerter
                SELECT last_read_post_number FROM topic_users tu
                WHERE tu.user_id = ? AND tu.topic_id = ? ),0)',
                 user.id, topic.id)
-      .where('reply_to_user_id = ? OR exists(
-            SELECT 1 from topic_users tu
-            WHERE tu.user_id = ? AND
-              tu.topic_id = ? AND
-              notification_level = ?
-            )', user.id, user.id, topic.id, TopicUser.notification_levels[:watching])
+      .where('reply_to_user_id = :user_id
+        OR exists(SELECT 1 from topic_users tu
+                  WHERE tu.user_id = :user_id AND
+                    tu.topic_id = :topic_id AND
+                    notification_level = :topic_level)
+        OR exists(SELECT 1 from category_users cu
+                  WHERE cu.user_id = :user_id AND
+                    cu.category_id = :category_id AND
+                    notification_level = :category_level)
+        OR exists(SELECT 1 from tag_users tu
+                  WHERE tu.user_id = :user_id AND
+                    tu.tag_id IN (SELECT tag_id FROM topic_tags WHERE topic_id = :topic_id) AND
+                    notification_level = :tag_level)',
+        user_id: user.id,
+        topic_id: topic.id,
+        category_id: topic.category_id,
+        topic_level: TopicUser.notification_levels[:watching],
+        category_level: CategoryUser.notification_levels[:watching],
+        tag_level: TagUser.notification_levels[:watching]
+      )
       .where(topic_id: topic.id)
   end
 
@@ -416,8 +441,9 @@ class PostAlerter
     if opts[:skip_send_email_to]&.include?(user.email)
       skip_send_email = true
     elsif original_post.via_email && (incoming_email = original_post.incoming_email)
-      skip_send_email = contains_email_address?(incoming_email.to_addresses, user) ||
-        contains_email_address?(incoming_email.cc_addresses, user)
+      skip_send_email =
+        incoming_email.to_addresses_split.include?(user.email) ||
+        incoming_email.cc_addresses_split.include?(user.email)
     else
       skip_send_email = opts[:skip_send_email]
     end
@@ -458,12 +484,9 @@ class PostAlerter
     end
   end
 
-  def contains_email_address?(addresses, user)
-    return false if addresses.blank?
-    addresses.split(";").include?(user.email)
-  end
-
   def push_notification(user, payload)
+    return if user.do_not_disturb?
+
     if user.push_subscriptions.exists?
       Jobs.enqueue(:send_push_notification, user_id: user.id, payload: payload)
     end
@@ -555,9 +578,7 @@ class PostAlerter
   end
 
   def group_notifying_via_smtp(post)
-    return nil if !SiteSetting.enable_smtp ||
-                  post.post_type != Post.types[:regular] ||
-                  post.incoming_email
+    return nil if !SiteSetting.enable_smtp || post.post_type != Post.types[:regular]
 
     post.topic.allowed_groups
       .where.not(smtp_server: nil)
@@ -572,57 +593,64 @@ class PostAlerter
 
     warn_if_not_sidekiq
 
-    # users who interacted with the post by _directly_ emailing the group
-    if group = group_notifying_via_smtp(post)
-      group_email_regex = group.email_username_regex
-      email_addresses = Set[group.email_username]
+    # Users who interacted with the post by _directly_ emailing the group
+    # via the group's email_username. This excludes people who replied via
+    # email to a user_private_message notification email. These people should
+    # not be emailed again by the user_private_message notifications below.
+    emails_to_skip_send = notify_group_direct_emailers(post)
 
-      post.topic.incoming_email.each do |incoming_email|
-        to_addresses = incoming_email.to_addresses&.split(';')
-        cc_addresses = incoming_email.cc_addresses&.split(';')
-
-        next if to_addresses&.none? { |address| address =~ group_email_regex } &&
-                cc_addresses&.none? { |address| address =~ group_email_regex }
-
-        email_addresses.add(incoming_email.from_address)
-        email_addresses.merge(to_addresses) if to_addresses.present?
-        email_addresses.merge(cc_addresses) if cc_addresses.present?
-      end
-
-      email_addresses.subtract([nil, ''])
-
-      if email_addresses.size > 1
-        Jobs.enqueue(:group_smtp_email,
-          group_id: group.id,
-          post_id: post.id,
-          email: email_addresses.to_a - [group.email_username])
-      end
-    end
-
-    # users that aren't part of any mentioned groups
+    # Users that aren't part of any mentioned groups and who did not email
+    # the group directly.
     users = directly_targeted_users(post).reject { |u| notified.include?(u) }
     DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
     users.each do |user|
       notification_level = TopicUser.get(post.topic, user)&.notification_level
       if reply_to_user == user || notification_level == TopicUser.notification_levels[:watching] || user.staged?
-        create_notification(user, Notification.types[:private_message], post, skip_send_email_to: email_addresses)
+        create_notification(user, Notification.types[:private_message], post, skip_send_email_to: emails_to_skip_send)
       end
     end
 
-    # users that are part of all mentioned groups
+    # Users that are part of all mentioned groups
     users = indirectly_targeted_users(post).reject { |u| notified.include?(u) }
     DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
     users.each do |user|
       case TopicUser.get(post.topic, user)&.notification_level
       when TopicUser.notification_levels[:watching]
         # only create a notification when watching the group
-        create_notification(user, Notification.types[:private_message], post, skip_send_email_to: email_addresses)
+        create_notification(user, Notification.types[:private_message], post, skip_send_email_to: emails_to_skip_send)
       when TopicUser.notification_levels[:tracking]
         notify_group_summary(user, post)
       end
     end
   end
 
+  def notify_group_direct_emailers(post)
+    email_addresses = []
+    emails_to_skip_send = []
+    group = group_notifying_via_smtp(post)
+
+    return emails_to_skip_send if group.blank?
+
+    # If the post already has an incoming email, it has been set in the
+    # Email::Receiver or via the GroupSmtpEmail job, and thus it was created
+    # via the IMAP/SMTP flow, so there is no need to notify those involved
+    # in the email chain again.
+    if post.incoming_email.blank?
+      email_addresses = post.topic.incoming_email_addresses(group: group)
+      if email_addresses.any?
+        Jobs.enqueue(:group_smtp_email, group_id: group.id, post_id: post.id, email: email_addresses)
+      end
+    end
+
+    # Add the group's email into the array, because it is used for
+    # skip_send_email_to in the case of user private message notifications
+    # (we do not want the group to be sent any emails from here because it
+    # will make another email for IMAP to pick up in the group's mailbox)
+    emails_to_skip_send = email_addresses.dup if email_addresses.any?
+    emails_to_skip_send << group.email_username
+    emails_to_skip_send
+  end
+
   def notify_post_users(post, notified, include_topic_watchers: true, include_category_watchers: true, include_tag_watchers: true, new_record: false)
     return unless post.topic
 
diff --git a/app/services/push_notification_pusher.rb b/app/services/push_notification_pusher.rb
index 93ae8a4e4e..4e013a8efe 100644
--- a/app/services/push_notification_pusher.rb
+++ b/app/services/push_notification_pusher.rb
@@ -4,25 +4,27 @@ class PushNotificationPusher
   TOKEN_VALID_FOR_SECONDS ||= 5 * 60
 
   def self.push(user, payload)
-    message = {
-      title: I18n.t(
-        "discourse_push_notifications.popup.#{Notification.types[payload[:notification_type]]}",
-        site_title: SiteSetting.title,
-        topic: payload[:topic_title],
-        username: payload[:username]
-      ),
-      body: payload[:excerpt],
-      badge: get_badge,
-      icon: ActionController::Base.helpers.image_url("push-notifications/#{Notification.types[payload[:notification_type]]}.png"),
-      tag: "#{Discourse.current_hostname}-#{payload[:topic_id]}",
-      base_url: Discourse.base_url,
-      url: payload[:post_url],
-      hide_when_active: true
-    }
+    I18n.with_locale(user.effective_locale) do
+      message = {
+        title: I18n.t(
+          "discourse_push_notifications.popup.#{Notification.types[payload[:notification_type]]}",
+          site_title: SiteSetting.title,
+          topic: payload[:topic_title],
+          username: payload[:username]
+        ),
+        body: payload[:excerpt],
+        badge: get_badge,
+        icon: ActionController::Base.helpers.image_url("push-notifications/#{Notification.types[payload[:notification_type]]}.png"),
+        tag: "#{Discourse.current_hostname}-#{payload[:topic_id]}",
+        base_url: Discourse.base_url,
+        url: payload[:post_url],
+        hide_when_active: true
+      }
 
-    subscriptions(user).each do |subscription|
-      subscription = JSON.parse(subscription.data)
-      send_notification(user, subscription, message)
+      subscriptions(user).each do |subscription|
+        subscription = JSON.parse(subscription.data)
+        send_notification(user, subscription, message)
+      end
     end
   end
 
@@ -75,12 +77,21 @@ class PushNotificationPusher
   end
 
   def self.send_notification(user, subscription, message)
+    endpoint = subscription["endpoint"]
+    p256dh = subscription.dig("keys", "p256dh")
+    auth = subscription.dig("keys", "auth")
+
+    if (endpoint.blank? || p256dh.blank? || auth.blank?)
+      unsubscribe(user, subscription)
+      return
+    end
+
     begin
       Webpush.payload_send(
-        endpoint: subscription["endpoint"],
+        endpoint: endpoint,
         message: message.to_json,
-        p256dh: subscription.dig("keys", "p256dh"),
-        auth: subscription.dig("keys", "auth"),
+        p256dh: p256dh,
+        auth: auth,
         vapid: {
           subject: Discourse.base_url,
           public_key: SiteSetting.vapid_public_key,
diff --git a/app/services/search_indexer.rb b/app/services/search_indexer.rb
index 12bdcbc4aa..d8a970f1be 100644
--- a/app/services/search_indexer.rb
+++ b/app/services/search_indexer.rb
@@ -126,12 +126,13 @@ class SearchIndexer
     end
   end
 
-  def self.update_users_index(user_id, username, name)
+  def self.update_users_index(user_id, username, name, custom_fields)
     update_index(
       table: 'user',
       id: user_id,
       a_weight: username,
-      b_weight: name
+      b_weight: name,
+      c_weight: custom_fields
     )
   end
 
@@ -165,6 +166,16 @@ class SearchIndexer
     SQL
   end
 
+  def self.queue_users_reindex(user_ids)
+    return if @disabled
+
+    DB.exec(<<~SQL, user_ids: user_ids, version: REINDEX_VERSION)
+      UPDATE user_search_data
+      SET version = :version
+      WHERE user_search_data.user_id IN (:user_ids)
+    SQL
+  end
+
   def self.queue_post_reindex(topic_id)
     return if @disabled
 
@@ -222,7 +233,10 @@ class SearchIndexer
     end
 
     if User === obj && (obj.saved_change_to_username? || obj.saved_change_to_name? || force)
-      SearchIndexer.update_users_index(obj.id, obj.username_lower || '', obj.name ? obj.name.downcase : '')
+      SearchIndexer.update_users_index(obj.id,
+                                       obj.username_lower || '',
+                                       obj.name ? obj.name.downcase : '',
+                                       obj.user_custom_fields.searchable.map(&:value).join(" "))
     end
 
     if Topic === obj && (obj.saved_change_to_title? || force)
@@ -284,7 +298,11 @@ class SearchIndexer
     def self.scrub(html, strip_diacritics: false)
       return +"" if html.blank?
 
-      document = Nokogiri::HTML5("<div>#{html}</div>", nil, Encoding::UTF_8.to_s)
+      begin
+        document = Nokogiri::HTML5("<div>#{html}</div>", nil, Encoding::UTF_8.to_s)
+      rescue ArgumentError
+        return +""
+      end
 
       nodes = document.css(
         "div.#{CookedPostProcessor::LIGHTBOX_WRAPPER_CSS_CLASS}"
diff --git a/app/services/site_settings_task.rb b/app/services/site_settings_task.rb
index f9d185cdf2..64c80486ff 100644
--- a/app/services/site_settings_task.rb
+++ b/app/services/site_settings_task.rb
@@ -2,7 +2,7 @@
 
 class SiteSettingsTask
   def self.export_to_hash(include_defaults: false, include_hidden: false)
-    site_settings = SiteSetting.all_settings(include_hidden)
+    site_settings = SiteSetting.all_settings(include_hidden: include_hidden)
     h = {}
     site_settings.each do |site_setting|
       next if site_setting[:default] == site_setting[:value] if !include_defaults
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 925ef24e8c..e859f42cbd 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -323,7 +323,7 @@ class StaffActionLogger
     ))
   end
 
-  BADGE_FIELDS ||= %i{id name description long_description icon image badge_type_id
+  BADGE_FIELDS ||= %i{id name description long_description icon image_upload_id badge_type_id
     badge_grouping_id query allow_title multiple_grant listable target_posts
     enabled auto_revoke show_posts system}
 
@@ -811,17 +811,19 @@ class StaffActionLogger
     changes.delete("updated_at")
     old_values = []
     new_values = []
-    changes.each do |k, v|
-      old_values << "#{k}: #{v[0]}"
-      new_values << "#{k}: #{v[1]}"
-    end
+    changes
+      .sort_by { |k, _| k.to_s }
+      .each do |k, v|
+        old_values << "#{k}: #{v[0]}"
+        new_values << "#{k}: #{v[1]}"
+      end
 
     [old_values, new_values]
   end
 
   def params(opts = nil)
     opts ||= {}
-    { acting_user_id: @admin.id, context: opts[:context] }
+    { acting_user_id: @admin.id, context: opts[:context], details: opts[:details] }
   end
 
   def validate_category(category)
diff --git a/app/services/themes_install_task.rb b/app/services/themes_install_task.rb
index 6c601a5889..ac32739a1b 100644
--- a/app/services/themes_install_task.rb
+++ b/app/services/themes_install_task.rb
@@ -2,16 +2,23 @@
 
 class ThemesInstallTask
   def self.install(themes)
-    counts = { installed: 0, updated: 0, errors: 0 }
+    counts = { installed: 0, updated: 0, errors: 0, skipped: 0 }
     log = []
     themes.each do |name, val|
       installer = new(val)
       next if installer.url.nil?
 
       if installer.theme_exists?
-        installer.update
-        log << "#{name}: is already installed. Updating from remote."
-        counts[:updated] += 1
+        if installer.options.fetch(:skip_update, nil)
+          log << "#{name}: is already installed. Skipping update."
+          counts[:skipped] += 1
+        elsif installer.update
+          log << "#{name}: is already installed. Updating from remote."
+          counts[:updated] += 1
+        else
+          log << "#{name}: is already installed, but there was an error updating from remote."
+          counts[:errors] += 1
+        end
       else
         begin
           installer.install
@@ -63,6 +70,7 @@ class ThemesInstallTask
     @remote_theme.update_from_remote
     @theme.save
     add_component_to_all_themes
+    @remote_theme.last_error_text.nil?
   end
 
   def add_component_to_all_themes
diff --git a/app/services/topic_status_updater.rb b/app/services/topic_status_updater.rb
index 795538cbd0..fe0f912ec0 100644
--- a/app/services/topic_status_updater.rb
+++ b/app/services/topic_status_updater.rb
@@ -4,14 +4,14 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
   def update!(status, enabled, opts = {})
     status = Status.new(status, enabled)
 
-    @topic_status_update = topic.public_topic_timer
+    @topic_timer = topic.public_topic_timer
 
     updated = nil
     Topic.transaction do
       updated = change(status, opts)
       if updated
         highest_post_number = topic.highest_post_number
-        create_moderator_post_for(status, opts[:message])
+        create_moderator_post_for(status, opts)
         update_read_state_for(status, highest_post_number)
       end
     end
@@ -46,11 +46,17 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
       UserProfile.remove_featured_topic_from_all_profiles(topic)
     end
 
-    if @topic_status_update
+    if status.visible?
+      topic.update_category_topic_count_by(status.enabled? ? 1 : -1)
+    end
+
+    if @topic_timer
       if status.manually_closing_topic? || status.closing_topic?
         topic.delete_topic_timer(TopicTimer.types[:close])
+        topic.delete_topic_timer(TopicTimer.types[:silent_close])
       elsif status.manually_opening_topic? || status.opening_topic?
         topic.delete_topic_timer(TopicTimer.types[:open])
+        topic.inherit_auto_close_from_category
       end
     end
 
@@ -65,8 +71,9 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
     result
   end
 
-  def create_moderator_post_for(status, message = nil)
-    topic.add_moderator_post(user, message || message_for(status), options_for(status))
+  def create_moderator_post_for(status, opts)
+    message = opts[:message]
+    topic.add_moderator_post(user, message || message_for(status), options_for(status, opts))
     topic.reload
   end
 
@@ -81,21 +88,23 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
   def message_for(status)
     if status.autoclosed?
       locale_key = status.locale_key.dup
-      locale_key << "_lastpost" if @topic_status_update&.based_on_last_post
+      locale_key << "_lastpost" if @topic_timer&.based_on_last_post
       message_for_autoclosed(locale_key)
     end
   end
 
   def message_for_autoclosed(locale_key)
     num_minutes =
-      if @topic_status_update&.based_on_last_post
-        (@topic_status_update.duration || 0).hours
-      elsif @topic_status_update&.created_at
-        Time.zone.now - @topic_status_update.created_at
+      if @topic_timer&.based_on_last_post
+        (@topic_timer.duration_minutes || 0).minutes.to_i
+      elsif @topic_timer&.created_at
+        Time.zone.now - @topic_timer.created_at
       else
         Time.zone.now - topic.created_at
       end
 
+    # all of the results above are in seconds, this brings them
+    # back to the actual minutes integer
     num_minutes = (num_minutes / 1.minute).round
 
     if num_minutes.minutes >= 2.days
@@ -110,9 +119,10 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
     end
   end
 
-  def options_for(status)
+  def options_for(status, opts = {})
     { bump: status.opening_topic?,
       post_type: Post.types[:small_action],
+      silent: opts[:silent],
       action_code: status.action_code }
   end
 
diff --git a/app/services/user_activator.rb b/app/services/user_activator.rb
index 49672b04ff..6a7d8ad1b0 100644
--- a/app/services/user_activator.rb
+++ b/app/services/user_activator.rb
@@ -33,7 +33,7 @@ class UserActivator
 
     if !user.active?
       EmailActivator
-    elsif SiteSetting.must_approve_users? && !(invite.present? && !invite.expired? && !invite.destroyed? && invite.link_valid?)
+    elsif SiteSetting.must_approve_users? && !(invite.present? && invite.redeemable?)
       ApprovalActivator
     else
       LoginActivator
diff --git a/app/services/user_anonymizer.rb b/app/services/user_anonymizer.rb
index 472a1eb715..970d1fff42 100644
--- a/app/services/user_anonymizer.rb
+++ b/app/services/user_anonymizer.rb
@@ -59,11 +59,12 @@ class UserAnonymizer
         )
       end
 
-      @user.user_avatar.try(:destroy)
-      @user.single_sign_on_record.try(:destroy)
-      @user.oauth2_user_infos.try(:destroy_all)
-      @user.user_associated_accounts.try(:destroy_all)
-      @user.api_keys.find_each { |x| x.try(:destroy) }
+      @user.user_avatar&.destroy!
+      @user.single_sign_on_record&.destroy!
+      @user.oauth2_user_infos.destroy_all
+      @user.user_associated_accounts.destroy_all
+      @user.api_keys.destroy_all
+      @user.user_api_keys.destroy_all
       @user.user_emails.secondary.destroy_all
 
       @user_history = log_action
diff --git a/app/services/user_authenticator.rb b/app/services/user_authenticator.rb
index 5db04fa1bc..48d0b8038a 100644
--- a/app/services/user_authenticator.rb
+++ b/app/services/user_authenticator.rb
@@ -2,20 +2,21 @@
 
 class UserAuthenticator
 
-  def initialize(user, session, authenticator_finder = Users::OmniauthCallbacksController)
+  def initialize(user, session, authenticator_finder: Users::OmniauthCallbacksController, require_password: true)
     @user = user
     @session = session
-    if session[:authentication] && session[:authentication].is_a?(Hash)
+    if session&.dig(:authentication) && session[:authentication].is_a?(Hash)
       @auth_result = Auth::Result.from_session_data(session[:authentication], user: user)
     end
     @authenticator_finder = authenticator_finder
+    @require_password = require_password
   end
 
   def start
     if authenticated?
       @user.active = true
       @auth_result.apply_user_attributes!
-    else
+    elsif @require_password
       @user.password_required!
     end
 
@@ -31,7 +32,7 @@ class UserAuthenticator
       authenticator.after_create_account(@user, @auth_result)
       confirm_email
     end
-    @session[:authentication] = @auth_result = nil if @session[:authentication]
+    @session[:authentication] = @auth_result = nil if @session&.dig(:authentication)
   end
 
   def email_valid?
@@ -41,7 +42,7 @@ class UserAuthenticator
   def authenticated?
     return false if !@auth_result
     return false if @auth_result&.email&.downcase != @user.email.downcase
-    return false if @auth_result.email_valid != true # strong check for truth, in case we have another object type
+    return false if !@auth_result.email_valid
     true
   end
 
diff --git a/app/services/user_destroyer.rb b/app/services/user_destroyer.rb
index 51ece7789b..5af6a4dc57 100644
--- a/app/services/user_destroyer.rb
+++ b/app/services/user_destroyer.rb
@@ -32,29 +32,12 @@ class UserDestroyer
       Draft.where(user_id: user.id).delete_all
       Reviewable.where(created_by_id: user.id).delete_all
 
+      category_topic_ids = Category.where("topic_id IS NOT NULL").pluck(:topic_id)
+
       if opts[:delete_posts]
-        user.posts.each do |post|
-
-          # agree with flags
-          if opts[:delete_as_spammer] && reviewable = post.reviewable_flag
-            reviewable.perform(@actor, :agree_and_keep)
-          end
-
-          # block all external urls
-          if opts[:block_urls]
-            post.topic_links.each do |link|
-              next if link.internal
-              next if Oneboxer.engine(link.url) != Onebox::Engine::AllowlistedGenericOnebox
-              ScreenedUrl.watch(link.url, link.domain, ip_address: user.ip_address)&.record_match!
-            end
-          end
-
-          PostDestroyer.new(@actor.staff? ? @actor : Discourse.system_user, post).destroy
-
-          if post.topic && post.is_first_post?
-            Topic.unscoped.where(id: post.topic_id).update_all(user_id: nil)
-          end
-        end
+        agree_with_flags(user) if opts[:delete_as_spammer]
+        block_external_urls(user) if opts[:block_urls]
+        delete_posts(user, category_topic_ids, opts)
       end
 
       user.post_actions.each do |post_action|
@@ -102,6 +85,13 @@ class UserDestroyer
           end
         end
 
+        Invite.where(email: user_emails).each do |invite|
+          # invited_users will be removed by dependent destroy association when user is destroyed
+          invite.invited_groups.destroy_all
+          invite.topic_invites.destroy_all
+          invite.destroy
+        end
+
         unless opts[:quiet]
           if @actor == user
             deleted_by = Discourse.system_user
@@ -110,6 +100,7 @@ class UserDestroyer
             deleted_by = @actor
           end
           StaffActionLogger.new(deleted_by).log_user_deletion(user, opts.slice(:context))
+          Rails.logger.warn("User destroyed without context from: #{caller_locations(14, 1)[0]}") if opts.slice(:context).blank?
         end
         MessageBus.publish "/logout", result.id, user_ids: [result.id]
       end
@@ -125,6 +116,33 @@ class UserDestroyer
 
   protected
 
+  def block_external_urls(user)
+    TopicLink.where(user: user, internal: false).find_each do |link|
+      next if Oneboxer.engine(link.url) != Onebox::Engine::AllowlistedGenericOnebox
+      ScreenedUrl.watch(link.url, link.domain, ip_address: user.ip_address)&.record_match!
+    end
+  end
+
+  def agree_with_flags(user)
+    ReviewableFlaggedPost.where(target_created_by: user).find_each do |reviewable|
+      reviewable.perform(@actor, :agree_and_keep)
+    end
+  end
+
+  def delete_posts(user, category_topic_ids, opts)
+    user.posts.find_each do |post|
+      if post.is_first_post? && category_topic_ids.include?(post.topic_id)
+        post.update!(user: Discourse.system_user)
+      else
+        PostDestroyer.new(@actor.staff? ? @actor : Discourse.system_user, post).destroy
+      end
+
+      if post.topic && post.is_first_post?
+        Topic.unscoped.where(id: post.topic_id).update_all(user_id: nil)
+      end
+    end
+  end
+
   def prepare_for_destroy(user)
     PostAction.where(user_id: user.id).delete_all
     UserAction.where('user_id = :user_id OR target_user_id = :user_id OR acting_user_id = :user_id', user_id: user.id).delete_all
diff --git a/app/services/user_merger.rb b/app/services/user_merger.rb
index d45da9dbee..c322d5f363 100644
--- a/app/services/user_merger.rb
+++ b/app/services/user_merger.rb
@@ -5,6 +5,7 @@ class UserMerger
     @source_user = source_user
     @target_user = target_user
     @acting_user = acting_user
+    @user_id = source_user.id
     @source_primary_email = source_user.email
   end
 
@@ -30,6 +31,9 @@ class UserMerger
   protected
 
   def update_username
+    return if @source_user.username == @target_user.username
+
+    ::MessageBus.publish '/merge_user', { message: I18n.t("admin.user.merge_user.updating_username") }, user_ids: [@acting_user.id] if @acting_user
     UsernameChanger.update_username(user_id: @source_user.id,
                                     old_username: @source_user.username,
                                     new_username: @target_user.username,
@@ -43,6 +47,10 @@ class UserMerger
       .order(:topic_id, :post_number)
       .pluck(:topic_id, :id)
 
+    return if posts.count == 0
+
+    ::MessageBus.publish '/merge_user', { message: I18n.t("admin.user.merge_user.changing_post_ownership") }, user_ids: [@acting_user.id] if @acting_user
+
     last_topic_id = nil
     post_ids = []
 
@@ -70,6 +78,8 @@ class UserMerger
   end
 
   def merge_given_daily_likes
+    ::MessageBus.publish '/merge_user', { message: I18n.t("admin.user.merge_user.merging_given_daily_likes") }, user_ids: [@acting_user.id] if @acting_user
+
     sql = <<~SQL
       INSERT INTO given_daily_likes AS g (user_id, likes_given, given_date, limit_reached)
         SELECT
@@ -102,6 +112,8 @@ class UserMerger
   end
 
   def merge_post_timings
+    ::MessageBus.publish '/merge_user', { message: I18n.t("admin.user.merge_user.merging_post_timings") }, user_ids: [@acting_user.id] if @acting_user
+
     update_user_id(:post_timings, conditions: ["x.topic_id = y.topic_id",
                                                "x.post_number = y.post_number"])
     sql = <<~SQL
@@ -116,6 +128,8 @@ class UserMerger
   end
 
   def merge_user_visits
+    ::MessageBus.publish '/merge_user', { message: I18n.t("admin.user.merge_user.merging_user_visits") }, user_ids: [@acting_user.id] if @acting_user
+
     update_user_id(:user_visits, conditions: "x.visited_at = y.visited_at")
 
     sql = <<~SQL
@@ -132,7 +146,9 @@ class UserMerger
   end
 
   def update_site_settings
-    SiteSetting.all_settings(true).each do |setting|
+    ::MessageBus.publish '/merge_user', { message: I18n.t("admin.user.merge_user.updating_site_settings") }, user_ids: [@acting_user.id] if @acting_user
+
+    SiteSetting.all_settings(include_hidden: true).each do |setting|
       if setting[:type] == "username" && setting[:value] == @source_user.username
         SiteSetting.set_and_log(setting[:setting], @target_user.username)
       end
@@ -140,6 +156,8 @@ class UserMerger
   end
 
   def update_user_stats
+    ::MessageBus.publish '/merge_user', { message: I18n.t("admin.user.merge_user.updating_user_stats") }, user_ids: [@acting_user.id] if @acting_user
+
     # topics_entered
     DB.exec(<<~SQL, target_user_id: @target_user.id)
       UPDATE user_stats
@@ -194,6 +212,8 @@ class UserMerger
   end
 
   def merge_user_attributes
+    ::MessageBus.publish '/merge_user', { message: I18n.t("admin.user.merge_user.merging_user_attributes") }, user_ids: [@acting_user.id] if @acting_user
+
     DB.exec(<<~SQL, source_user_id: @source_user.id, target_user_id: @target_user.id)
       UPDATE users AS t
       SET created_at              = LEAST(t.created_at, s.created_at),
@@ -235,6 +255,8 @@ class UserMerger
   end
 
   def update_user_ids
+    ::MessageBus.publish '/merge_user', { message: I18n.t("admin.user.merge_user.updating_user_ids") }, user_ids: [@acting_user.id] if @acting_user
+
     Category.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
 
     update_user_id(:category_users, conditions: ["x.category_id = y.category_id"])
@@ -244,6 +266,8 @@ class UserMerger
     update_user_id(:draft_sequences, conditions: "x.draft_key = y.draft_key")
     update_user_id(:drafts, conditions: "x.draft_key = y.draft_key")
 
+    update_user_id(:dismissed_topic_users, conditions: "x.topic_id = y.topic_id")
+
     EmailLog.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
 
     GroupHistory.where(acting_user_id: @source_user.id).update_all(acting_user_id: @target_user.id)
@@ -356,6 +380,8 @@ class UserMerger
   end
 
   def delete_source_user
+    ::MessageBus.publish '/merge_user', { message: I18n.t("admin.user.merge_user.deleting_source_user") }, user_ids: [@acting_user.id] if @acting_user
+
     @source_user.reload
 
     @source_user.skip_email_validation = true
@@ -369,7 +395,7 @@ class UserMerger
 
   def log_merge
     logger = StaffActionLogger.new(@acting_user || Discourse.system_user)
-    logger.log_user_merge(@target_user, @source_user.username, @source_primary_email)
+    logger.log_user_merge(@target_user, @source_user.username, @source_primary_email || "")
   end
 
   def update_user_id(table_name, opts = {})
diff --git a/app/services/user_notification_renderer.rb b/app/services/user_notification_renderer.rb
index 64bb497dcf..e66b7d9dec 100644
--- a/app/services/user_notification_renderer.rb
+++ b/app/services/user_notification_renderer.rb
@@ -9,11 +9,10 @@ class UserNotificationRenderer < ActionView::Base
 
   def self.render(*args)
     LOCK.synchronize do
-      @instance ||= UserNotificationRenderer.with_view_paths(
+      @instance ||= UserNotificationRenderer.with_empty_template_cache.with_view_paths(
         Rails.configuration.paths["app/views"]
       )
       @instance.render(*args)
     end
   end
-
 end
diff --git a/app/services/user_notification_schedule_processor.rb b/app/services/user_notification_schedule_processor.rb
new file mode 100644
index 0000000000..7b924b22d4
--- /dev/null
+++ b/app/services/user_notification_schedule_processor.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+class UserNotificationScheduleProcessor
+
+  attr_accessor :schedule, :user, :timezone_name
+
+  def initialize(schedule)
+    @schedule = schedule
+    @user = schedule.user
+    @timezone_name = user.user_option.timezone
+  end
+
+  def create_do_not_disturb_timings
+    local_time = Time.now.in_time_zone(timezone_name)
+
+    create_timings_for(local_time, days: 2)
+  end
+
+  def self.create_do_not_disturb_timings_for(schedule)
+    processor = UserNotificationScheduleProcessor.new(schedule)
+    processor.create_do_not_disturb_timings
+  end
+
+  private
+
+  def create_timings_for(local_time, days: 0, previous_timing: nil)
+    weekday = transform_wday(local_time.wday)
+    start_minute = schedule["day_#{weekday}_start_time"]
+    end_minute = schedule["day_#{weekday}_end_time"]
+
+    previous_timing = find_previous_timing(local_time) if previous_timing.nil? && start_minute != 0
+
+    if start_minute > 0
+      previous_timing.ends_at = utc_time_at_minute(local_time, start_minute - 1)
+      if previous_timing.id
+        previous_timing.save
+      else
+        user.do_not_disturb_timings.find_or_create_by(previous_timing.attributes.except("id"))
+      end
+
+      next_timing = user.do_not_disturb_timings.new(
+        starts_at: utc_time_at_minute(local_time, end_minute),
+        scheduled: true
+      )
+      save_timing_and_continue(local_time, next_timing, days)
+    else
+      save_timing_and_continue(local_time, previous_timing, days)
+    end
+  end
+
+  private
+
+  def find_previous_timing(local_time)
+    # Try and find a previously scheduled dnd timing that we can extend if the
+    # ends_at is at the previous midnight. fallback to a new timing if not.
+    previous = user.do_not_disturb_timings.find_by(
+      ends_at: (local_time - 1.day).end_of_day.utc,
+      scheduled: true
+    )
+    previous || user.do_not_disturb_timings.new(
+      starts_at: local_time.beginning_of_day.utc,
+      scheduled: true
+    )
+  end
+
+  def save_timing_and_continue(local_time, timing, days)
+    if days == 0
+      if timing
+        timing.ends_at = local_time.end_of_day.utc
+        user.do_not_disturb_timings.find_or_create_by(timing.attributes.except("id"))
+      end
+      user.publish_do_not_disturb(ends_at: user.do_not_disturb_until)
+    else
+      create_timings_for(local_time + 1.day, days: days - 1, previous_timing: timing)
+    end
+  end
+
+  def utc_time_at_minute(base_time, total_minutes)
+    hour = total_minutes / 60
+    minute = total_minutes % 60
+    Time.new(base_time.year, base_time.month, base_time.day, hour, minute, 0, base_time.formatted_offset).utc
+  end
+
+  def transform_wday(wday)
+    wday == 0 ? 6 : wday - 1
+  end
+end
diff --git a/app/services/user_silencer.rb b/app/services/user_silencer.rb
index 335175c0d4..fc74af58da 100644
--- a/app/services/user_silencer.rb
+++ b/app/services/user_silencer.rb
@@ -61,6 +61,7 @@ class UserSilencer
           silence_message_params: silence_message_params
         )
 
+        silence_message_params.merge!(post_alert_options: { skip_send_email: true })
         SystemMessage.create(@user, message_type, silence_message_params)
         true
       end
@@ -80,7 +81,7 @@ class UserSilencer
   def unsilence
     @user.silenced_till = nil
     if @user.save
-      DiscourseEvent.trigger(:user_unsilenced, user: @user)
+      DiscourseEvent.trigger(:user_unsilenced, user: @user, by_user: @by_user)
       SystemMessage.create(@user, :unsilenced)
       StaffActionLogger.new(@by_user).log_unsilence_user(@user) if @by_user
     end
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 9471f0c8d8..ce046d6e86 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -49,6 +49,15 @@ class UserUpdater
     :skip_new_user_tips
   ]
 
+  NOTIFICATION_SCHEDULE_ATTRS = -> {
+    attrs = [:enabled]
+    7.times do |n|
+      attrs.push("day_#{n}_start_time".to_sym)
+      attrs.push("day_#{n}_end_time".to_sym)
+    end
+    { user_notification_schedule: attrs }
+  }.call
+
   def initialize(actor, user)
     @user = user
     @guardian = Guardian.new(actor)
@@ -58,15 +67,15 @@ class UserUpdater
   def update(attributes = {})
     user_profile = user.user_profile
     user_profile.dismissed_banner_key = attributes[:dismissed_banner_key] if attributes[:dismissed_banner_key].present?
-    unless SiteSetting.enable_sso && SiteSetting.sso_overrides_bio
+    unless SiteSetting.enable_discourse_connect && SiteSetting.discourse_connect_overrides_bio
       user_profile.bio_raw = attributes.fetch(:bio_raw) { user_profile.bio_raw }
     end
 
-    unless SiteSetting.enable_sso && SiteSetting.sso_overrides_location
+    unless SiteSetting.enable_discourse_connect && SiteSetting.discourse_connect_overrides_location
       user_profile.location = attributes.fetch(:location) { user_profile.location }
     end
 
-    unless SiteSetting.enable_sso && SiteSetting.sso_overrides_website
+    unless SiteSetting.enable_discourse_connect && SiteSetting.discourse_connect_overrides_website
       user_profile.website = format_url(attributes.fetch(:website) { user_profile.website })
     end
 
@@ -82,6 +91,11 @@ class UserUpdater
       user_profile.card_background_upload_id = upload.id
     end
 
+    if attributes[:user_notification_schedule]
+      user_notification_schedule = user.user_notification_schedule || UserNotificationSchedule.new(user: user)
+      user_notification_schedule.assign_attributes(attributes[:user_notification_schedule])
+    end
+
     old_user_name = user.name.present? ? user.name : ""
     user.name = attributes.fetch(:name) { user.name }
 
@@ -170,7 +184,7 @@ class UserUpdater
       end
 
       name_changed = user.name_changed?
-      if (saved = (!save_options || user.user_option.save) && user_profile.save && user.save) &&
+      if (saved = (!save_options || user.user_option.save) && (user_notification_schedule.nil? || user_notification_schedule.save) && user_profile.save && user.save) &&
          (name_changed && old_user_name.casecmp(attributes.fetch(:name)) != 0)
 
         StaffActionLogger.new(@actor).log_name_change(
@@ -184,7 +198,15 @@ class UserUpdater
       return saved
     end
 
-    DiscourseEvent.trigger(:user_updated, user) if saved
+    if saved
+      if user_notification_schedule
+        user_notification_schedule.enabled ?
+          user_notification_schedule.create_do_not_disturb_timings(delete_existing: true) :
+          user_notification_schedule.destroy_scheduled_timings
+      end
+      DiscourseEvent.trigger(:user_updated, user)
+    end
+
     saved
   end
 
diff --git a/app/services/word_watcher.rb b/app/services/word_watcher.rb
index 0a1cad9bae..0c9ac7076e 100644
--- a/app/services/word_watcher.rb
+++ b/app/services/word_watcher.rb
@@ -7,7 +7,12 @@ class WordWatcher
   end
 
   def self.words_for_action(action)
-    WatchedWord.where(action: WatchedWord.actions[action.to_sym]).limit(1000).pluck(:word)
+    words = WatchedWord.where(action: WatchedWord.actions[action.to_sym]).limit(1000)
+    if action.to_sym == :replace || action.to_sym == :tag
+      words.pluck(:word, :replacement).to_h
+    else
+      words.pluck(:word)
+    end
   end
 
   def self.words_for_action_exists?(action)
@@ -26,6 +31,9 @@ class WordWatcher
   def self.word_matcher_regexp(action, raise_errors: false)
     words = get_cached_words(action)
     if words
+      if action.to_sym == :replace || action.to_sym == :tag
+        words = words.keys
+      end
       words = words.map do |w|
         word = word_to_regexp(w)
         word = "(#{word})" if SiteSetting.watched_words_regular_expressions?
@@ -38,11 +46,17 @@ class WordWatcher
       end
       Regexp.new(regexp, Regexp::IGNORECASE)
     end
-  rescue RegexpError => e
+  rescue RegexpError
     raise if raise_errors
     nil # Admin will be alerted via admin_dashboard_data.rb
   end
 
+  def self.word_matcher_regexps(action)
+    if words = get_cached_words(action)
+      words.map { |w, r| [word_to_regexp(w), r] }.to_h
+    end
+  end
+
   def self.word_to_regexp(word)
     if SiteSetting.watched_words_regular_expressions?
       # Strip ruby regexp format if present, we're going to make the whole thing
@@ -102,4 +116,8 @@ class WordWatcher
       false
     end
   end
+
+  def word_matches?(word)
+    Regexp.new(WordWatcher.word_to_regexp(word), Regexp::IGNORECASE).match?(@raw)
+  end
 end
diff --git a/app/views/about/index.html.erb b/app/views/about/index.html.erb
index 22a81ee1ba..2caba68775 100644
--- a/app/views/about/index.html.erb
+++ b/app/views/about/index.html.erb
@@ -61,36 +61,42 @@
       <tr>
         <th>&nbsp;</th>
         <th><%=t 'js.about.stat.all_time' %></th>
+        <th><%=t 'js.about.stat.last_day' %></th>
         <th><%=t 'js.about.stat.last_7_days' %></th>
         <th><%=t 'js.about.stat.last_30_days' %></th>
       </tr>
       <tr>
         <td class='title'><%=t 'js.about.topic_count' %></td>
         <td><%= stats["topic_count"] %></td>
+        <td><%= stats["topics_last_day"] %></td>
         <td><%= stats["topics_7_days"] %></td>
         <td><%= stats["topics_30_days"] %></td>
       </tr>
       <tr>
         <td><%=t 'js.about.post_count' %></td>
         <td><%= stats["post_count"] %></td>
+        <td><%= stats["posts_last_day"] %></td>
         <td><%= stats["posts_7_days"] %></td>
         <td><%= stats["posts_30_days"] %></td>
       </tr>
       <tr>
         <td><%=t 'js.about.user_count' %></td>
         <td><%= stats["user_count"] %></td>
+        <td><%= stats["users_last_day"] %></td>
         <td><%= stats["users_7_days"] %></td>
         <td><%= stats["users_30_days"] %></td>
       </tr>
       <tr>
         <td><%=t 'js.about.active_user_count' %></td>
         <td>&mdash;</td>
+        <td><%= stats["active_users_last_day"] %></td>
         <td><%= stats["active_users_7_days"] %></td>
         <td><%= stats["active_users_30_days"] %></td>
       </tr>
       <tr>
         <td><%=t 'js.about.like_count' %></td>
         <td><%= stats["like_count"] %></td>
+        <td><%= stats["likes_last_day"] %></td>
         <td><%= stats["likes_7_days"] %></td>
         <td><%= stats["likes_30_days"] %></td>
       </tr>
diff --git a/app/views/common/_google_tag_manager_head.html.erb b/app/views/common/_google_tag_manager_head.html.erb
index 8507a92832..f026a79190 100644
--- a/app/views/common/_google_tag_manager_head.html.erb
+++ b/app/views/common/_google_tag_manager_head.html.erb
@@ -1,5 +1,6 @@
 <meta id="data-google-tag-manager"
   data-data-layer="<%= google_tag_manager_json %>"
+  data-nonce="<%= ApplicationHelper.google_tag_manager_nonce %>"
   data-container-id="<%= SiteSetting.gtm_container_id %>" />
 
 <%= preload_script 'google-tag-manager' %>
diff --git a/app/views/email/default_template.html b/app/views/email/default_template.html
index 99b2e94995..53e99ab184 100644
--- a/app/views/email/default_template.html
+++ b/app/views/email/default_template.html
@@ -1,26 +1,49 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="%{html_lang}" xml:lang="%{html_lang}">
+<html
+  xmlns="http://www.w3.org/1999/xhtml"
+  lang="%{html_lang}"
+  xml:lang="%{html_lang}"
+>
+  <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>
 
-<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>
+  <body>
+    <!--[if mso]>
+      <style type="text/css">
+        body,
+        table,
+        td,
+        th,
+        h1,
+        h2,
+        h3 {
+          font-family: Arial, sans-serif !important;
+        }
+      </style>
+    <![endif]-->
 
-<body>
+    %{email_content}
 
-<!--[if mso]>
-<style type="text/css">
-body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !important;}
-</style>
-<![endif]-->
-
-%{email_content}
-
-<!-- prevent Gmail on iOS font size manipulation -->
-<div style="display:none;white-space:nowrap;font:15px courier;line-height:0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-  &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</div>
-
-</body>
+    <!-- prevent Gmail on iOS font size manipulation -->
+    <div
+      style="
+        display: none;
+        white-space: nowrap;
+        font: 15px courier;
+        line-height: 0;
+      "
+    >
+      &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+      &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+      &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+    </div>
+  </body>
 </html>
diff --git a/app/views/embed/topics.html.erb b/app/views/embed/topics.html.erb
index 10b825f727..f7444fa90f 100644
--- a/app/views/embed/topics.html.erb
+++ b/app/views/embed/topics.html.erb
@@ -7,7 +7,7 @@
       </button>
     <%- end %>
   <%- end %>
-  <div class='topics-list' data-embed-state='loaded' <%- if @embed_id %>data-embed-id="<%= @embed_id %>"<%- end %>>
+  <div class='topics-list <%= @embed_class %>' data-embed-state='loaded' <%- if @embed_id %>data-embed-id="<%= @embed_id %>"<%- end %>>
     <%- @list.topics.each do |t| %>
       <div class='topic-list-item'>
         <%- if @template == "complete" %>
@@ -49,7 +49,9 @@
               <div class='topic-column featured-image-column'>
                 <%- if t.image_url.present? %>
                   <div class='topic-featured-image'>
-                    <img src="<%= t.image_url %>">
+                    <a target="_parent" href="<%= t.url %>" class="title raw-link raw-topic-link" data-topic-id="<%= t.id %>">
+                      <img src="<%= t.image_url %>">
+                    </a>
                   </div>
                 <%- end %>
               </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 165ece79e1..205637c2ae 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,3 +1,4 @@
+<%- hijack_if_ember_cli! -%>
 <!DOCTYPE html>
 <html lang="<%= html_lang %>" class="<%= html_classes %>">
   <head>
@@ -60,8 +61,8 @@
 
     <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
 
-    <%- if !current_user && (data = cookies.delete(:authentication_data, path: Discourse.base_path("/"))) %>
-      <meta id="data-authentication" data-authentication-data="<%= data %>">
+    <%- if authentication_data %>
+      <meta id="data-authentication" data-authentication-data="<%= authentication_data %>">
     <%- end %>
   </head>
 
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index 8848af5cf4..4e0a7e7bdd 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -16,7 +16,9 @@
     <%= theme_lookup("head_tag") %>
     <%= render_google_universal_analytics_code %>
     <%= yield :head %>
-
+    <% if show_browser_update? %>
+      <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; } }</style>
+    <% end %>
     <%= build_plugin_html 'server:before-head-close-crawler' %>
   </head>
   <body class="crawler">
@@ -67,6 +69,9 @@
     </footer>
     <%= theme_lookup("footer") %>
     <%= theme_lookup("body_tag") %>
+    <% if show_browser_update? %>
+      <div class="buorg"><div><%= I18n.t("js.browser_update").html_safe %></div></div>
+    <% end %>
   </body>
   <%= yield :after_body %>
 </html>
diff --git a/app/views/layouts/ember_cli.html.erb b/app/views/layouts/ember_cli.html.erb
new file mode 100644
index 0000000000..dd4e070c54
--- /dev/null
+++ b/app/views/layouts/ember_cli.html.erb
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title><%= content_for?(:title) ? yield(:title) : SiteSetting.title %></title>
+
+  <%= stylesheet_link_tag(:ember_cli) %>
+
+</head>
+<body class="requires-ember-cli">
+  <div class='warning'>
+    <h1>Ember CLI is Required in Development Mode</h1>
+
+    <p>To run Ember CLI in development mode, please do the following:</p>
+
+    <pre><code>$ bin/ember-cli</code></pre>
+
+    <p>If it's your first time starting Ember CLI you'll have to run yarn:</p>
+
+    <pre><code>$ cd app/assets/javascripts/discourse && yarn</code></pre>
+
+    <p>Then visit the following URL to use Discourse:</p>
+
+    <a href="http://localhost:4200/">http://localhost:4200</a>
+  </div>
+</body>
+</html>
diff --git a/app/views/layouts/finish_installation.html.erb b/app/views/layouts/finish_installation.html.erb
index 3958fb1179..22c2b04e55 100644
--- a/app/views/layouts/finish_installation.html.erb
+++ b/app/views/layouts/finish_installation.html.erb
@@ -3,8 +3,6 @@
     <%= discourse_stylesheet_link_tag 'wizard', theme_ids: nil %>
     <%= discourse_color_scheme_stylesheets %>
 
-    <%= preload_script 'ember_jquery' %>
-    <%= preload_script 'wizard-vendor' %>
     <%= render partial: "layouts/head" %>
     <title><%= t 'wizard.title' %></title>
   </head>
diff --git a/app/views/layouts/publish.html.erb b/app/views/layouts/publish.html.erb
index 10d9e578a6..e0b0c7b127 100644
--- a/app/views/layouts/publish.html.erb
+++ b/app/views/layouts/publish.html.erb
@@ -5,6 +5,8 @@
     <title><%= @topic.title %> - <%= SiteSetting.title %></title>
     <%= render partial: "layouts/head" %>
     <%= render partial: "common/discourse_publish_stylesheet" %>
+    <%= render_google_tag_manager_head_code %>
+    <%= render_google_universal_analytics_code %>
   </head>
   <body class="<%= @body_classes.to_a.join(' ') %>">
     <%= theme_lookup("header") %>
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 4b7ee6b772..0ada7b7248 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -92,13 +92,9 @@
           </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 %>
+              <a href="<%= Discourse.base_url %>/u/<%= poster.user.username %>" class="<%= poster.extras %>">
+                <img width="25" height="25" src="<%= poster.user.avatar_template.gsub('{size}', '25') %>" class="avatar" title='<%= h(poster.name_and_description) %>' aria-label='<%= h(poster.name_and_description) %>'>
+              </a>
             <% end %>
           </td>
           <td class="replies">
diff --git a/app/views/offline/offline.html.erb b/app/views/offline/offline.html.erb
index 3c6d870fb9..e7696a2601 100644
--- a/app/views/offline/offline.html.erb
+++ b/app/views/offline/offline.html.erb
@@ -6,7 +6,7 @@
   <title><%= SiteSetting.title %></title>
 </head>
 <body>
-<div style="padding:100px 40px; text-align:center; font-family: Helvetica, Arial, sans-serif;">
+<div style="padding:100px 40px; text-align:center; font-family: Arial, sans-serif;">
   <h1 style="font-size: 36px; color: #333;"><%= t 'offline.title' %></h1>
   <p style="margin: 40px; font-size: 18px; color: #555;">
     <%= t 'offline.offline_page_message' %>
diff --git a/app/views/qunit/index.html.erb b/app/views/qunit/index.html.erb
index eef411cfd5..d4d072376e 100644
--- a/app/views/qunit/index.html.erb
+++ b/app/views/qunit/index.html.erb
@@ -2,10 +2,16 @@
 <html>
   <head>
     <title>QUnit Test Runner</title>
-    <%= stylesheet_link_tag "test_helper" %>
-    <%= javascript_include_tag "test_helper" %>
+    <%= discourse_color_scheme_stylesheets %>
+    <%= discourse_stylesheet_link_tag(:desktop, theme_ids: nil) %>
+    <%= discourse_stylesheet_link_tag(:test_helper, theme_ids: nil) %>
+    <%= preload_script "discourse/tests/test_helper" %>
+    <%= preload_script "discourse/tests/core_plugins_tests" %>
+    <%= preload_script "discourse/tests/test_starter" %>
     <%= csrf_meta_tags %>
     <script src="<%= ExtraLocalesController.url('admin') %>"></script>
+    <meta property="og:title" content="">
+    <meta property="og:url" content="">
   </head>
   <body>
     <div id="qunit"></div>
diff --git a/app/views/qunit/theme.html.erb b/app/views/qunit/theme.html.erb
new file mode 100644
index 0000000000..9da3ac49d1
--- /dev/null
+++ b/app/views/qunit/theme.html.erb
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Theme QUnit Test Runner</title>
+    <%= discourse_color_scheme_stylesheets %>
+    <%- if !@suggested_themes %>
+      <%= discourse_stylesheet_link_tag(:desktop, theme_ids: nil) %>
+      <%= discourse_stylesheet_link_tag(:test_helper, theme_ids: nil) %>
+      <%= preload_script "locales/en" %>
+      <%= preload_script "discourse/tests/theme_qunit_ember_jquery" %>
+      <%= preload_script "vendor" %>
+      <%= preload_script "discourse/tests/theme_qunit_vendor" %>
+      <%= preload_script "pretty-text-bundle" %>
+      <%= preload_script "markdown-it-bundle" %>
+      <%= preload_script "application" %>
+      <%- Discourse.find_plugin_js_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, request: request).each do |file| %>
+        <%= preload_script file %>
+      <%- end %>
+      <%= preload_script "admin" %>
+      <%= preload_script "discourse/tests/theme_qunit_helper" %>
+      <%= theme_translations_lookup %>
+      <%= theme_js_lookup %>
+      <%= theme_lookup("head_tag") %>
+      <%= theme_tests %>
+      <%= preload_script_url ExtraLocalesController.url('admin') %>
+      <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
+      <meta property="og:title" content="">
+      <meta property="og:url" content="">
+      <%= preload_script "discourse/tests/test_starter" %>
+    <%- else %>
+      <style>
+        html {
+          font-family: Arial;
+        }
+      </style>
+    <%- end %>
+  </head>
+  <body>
+    <%- if !@suggested_themes %>
+      <div id="qunit"></div>
+      <div id="qunit-fixture"></div>
+    <%- else %>
+      <h2>Theme QUnit Test Runner</h2>
+      <%- if @suggested_themes.size == 0 %>
+        <p>Cannot find any theme tests.</p>
+      <%- else %>
+        <h3>Select a theme/component: </h3>
+        <%- @suggested_themes.each do |(id, name)| %>
+          <h4><%= link_to name, theme_qunit_url(id: id) %></h4>
+        <%- end %>
+      <%- end %>
+    <%- end %>
+  </body>
+</html>
diff --git a/app/views/session/sso_login.html.erb b/app/views/session/sso_login.html.erb
index 985172c4ee..3cf7dac5d8 100644
--- a/app/views/session/sso_login.html.erb
+++ b/app/views/session/sso_login.html.erb
@@ -1,4 +1,4 @@
-<h1><%= t('sso.login_error') %></h1>
+<h1><%= t('discourse_connect.login_error') %></h1>
 
 <br/>
 
diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index 3ff453bb1a..9a267c3cf0 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -15,7 +15,7 @@
 <%- else %>
 <table class="digest-header text-header with-dir" style="background-color:#<%= @header_bgcolor -%>;width:100%;">
   <tr>
-    <td align="center" style="text-align: center;padding: 20px 0; font-family:Helvetica,Arial,sans-serif;">
+    <td align="center" style="text-align: center;padding: 20px 0; font-family:Arial,sans-serif;">
 
   <a href="<%= Discourse.base_url %>" style="color:#<%= @header_color -%>;font-size:22px;text-decoration:none;">
   <%- if logo_url.blank? %>
@@ -30,7 +30,7 @@
 </table>
 <%- end %>
 
-<table class="body digest-content with-dir" style="width:100%;background:#f3f3f3;padding:0;border-spacing:0;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;vertical-align:top;">
+<table class="body digest-content with-dir" style="width:100%;background:#f3f3f3;padding:0;border-spacing:0;font-family:Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;vertical-align:top;">
   <tr>
     <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
       <div class="with-accent-colors">
@@ -43,7 +43,7 @@
         </table>
       </div>
     </td>
-    <td style="vertical-align:top;padding:0;font-family:Helvetica,Arial,sans-serif;">
+    <td style="vertical-align:top;padding:0;font-family:Arial,sans-serif;">
       <table align="center" class="digest-content-header with-accent-colors with-dir" style="border-spacing:0;margin:0;padding:0;vertical-align:top;width:100%">
         <tbody>
           <tr>
@@ -219,11 +219,11 @@
 
 <% if @popular_posts.present? %>
 
-<center class="header-popular-posts" style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding: 20px 0;font-family:Helvetica,Arial,sans-serif;">
+<center class="header-popular-posts" style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding: 20px 0;font-family:Arial,sans-serif;">
   <%=t 'user_notifications.digest.popular_posts' %>
 </center>
 
-<table class="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;">
+<table class="body with-dir" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;vertical-align:top;">
   <tr>
     <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
     <td class="with-dir" align="center" valign="top" style="width:90%;border-collapse:collapse!important;line-height:1.3;margin:0;padding:0;vertical-align:top;">
@@ -297,9 +297,9 @@
 <%= 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;mso-line-height-rule:exactly;line-height:36px;"><%=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: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;">
+<table class="digest-new-topics body with-dir" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;vertical-align:top;">
   <tr>
     <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
     <td align="center" valign="top" style="width:90%;border-collapse:collapse!important;margin:0;padding:0;">
diff --git a/app/views/wizard/qunit.html.erb b/app/views/wizard/qunit.html.erb
index 02c510ae8c..f1e767d9c0 100644
--- a/app/views/wizard/qunit.html.erb
+++ b/app/views/wizard/qunit.html.erb
@@ -2,9 +2,9 @@
 <html>
   <head>
     <title>QUnit Test Runner</title>
-    <%= stylesheet_link_tag "test_helper" %>
+    <%= discourse_stylesheet_link_tag(:test_helper, theme_ids: nil) %>
     <%= discourse_stylesheet_link_tag :wizard, theme_ids: nil %>
-    <%= javascript_include_tag "wizard/test/test_helper" %>
+    <%= preload_script "wizard/test/test_helper" %>
     <%= csrf_meta_tags %>
     <script src="<%= ExtraLocalesController.url("wizard") %>"></script>
   </head>
diff --git a/bin/bundle b/bin/bundle
index 58115ecf30..a71368e323 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,5 +1,114 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../../Gemfile", __FILE__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_version
+    @bundler_version ||=
+      env_var_version || cli_arg_version ||
+        lockfile_version
+  end
+
+  def bundler_requirement
+    return "#{Gem::Requirement.default}.a" unless bundler_version
+
+    bundler_gem_version = Gem::Version.new(bundler_version)
+
+    requirement = bundler_gem_version.approximate_recommendation
+
+    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+
+    requirement += ".a" if bundler_gem_version.prerelease?
+
+    requirement
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end
diff --git a/bin/ember-cli b/bin/ember-cli
new file mode 100755
index 0000000000..3aa799e143
--- /dev/null
+++ b/bin/ember-cli
@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'pathname'
+
+RAILS_ROOT = File.expand_path("../../", Pathname.new(__FILE__).realpath)
+PORT = ENV["UNICORN_PORT"] ||= "3000"
+
+yarn_dir = File.join(RAILS_ROOT, "app/assets/javascripts/discourse")
+
+PROXY =
+  if ARGV.include?("--try")
+    "https://try.discourse.org"
+  else
+    "http://localhost:#{PORT}"
+  end
+
+command =
+  if ARGV.include?("--test")
+    "test"
+  else
+    "server"
+  end
+
+class String
+  def cyan
+    "\e[36m#{self}\e[0m"
+  end
+end
+
+if ARGV.include?("-h") || ARGV.include?("--help")
+  puts "ember-cli OPTIONS"
+  puts "#{"--try".cyan} To proxy try.discourse.org", ""
+  puts "#{"--test".cyan} To run the test suite", ""
+  puts "The rest of the arguments are passed to ember server per:", ""
+  exec "yarn --cwd #{yarn_dir} run ember #{command} --help"
+end
+
+args = ["--cwd", yarn_dir, "run", "ember", command] + ARGV.reject { |a| a == "--try" || a == "--test" }
+
+if !args.include?("--proxy")
+  args << "--proxy"
+  args << PROXY
+end
+
+exec "yarn", *args.to_a.flatten
diff --git a/bin/notify_file_change b/bin/notify_file_change
index 8680b97966..c1053df675 100755
--- a/bin/notify_file_change
+++ b/bin/notify_file_change
@@ -6,7 +6,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd ../tmp && pwd )"
 SOCKET="$DIR"/file_change.sock
 
 if [[ -e "$SOCKET" ]]; then
-  if command -v socat; then
+  if command -v socat &> /dev/null; then
     echo "$1 $2" | socat - UNIX-CONNECT:$SOCKET >/dev/null 2>/dev/null
   else
     echo "$1 $2" | nc -U $SOCKET >/dev/null 2>/dev/null
diff --git a/bin/rails b/bin/rails
index cdc2c4c16b..595d718419 100755
--- a/bin/rails
+++ b/bin/rails
@@ -9,6 +9,7 @@ if !ENV["RAILS_ENV"] && (ARGV[0] == "s" || ARGV[0] == "server")
   end
 
   ENV["RAILS_LOGS_STDOUT"] ||= "1"
+
   exec File.expand_path("unicorn", __dir__)
 end
 
diff --git a/bin/rubocop b/bin/rubocop
new file mode 100755
index 0000000000..d0c4882931
--- /dev/null
+++ b/bin/rubocop
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")
diff --git a/bin/unicorn b/bin/unicorn
index a9b9e04efb..cc241696db 100755
--- a/bin/unicorn
+++ b/bin/unicorn
@@ -6,9 +6,16 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 RAILS_ROOT = File.expand_path("../../", Pathname.new(__FILE__).realpath)
 
+if defined? Bundler
+  STDERR.puts <<~MESSAGE
+    WARNING: Using `bundle exec` to start the server is unnecessary, and will make startup slower. Use `bin/rails s` or `bin/unicorn`.
+  MESSAGE
+end
+
 require 'rubygems'
 require 'bundler/setup'
 require 'digest'
+require 'fileutils'
 
 dev_mode = false
 
@@ -80,6 +87,8 @@ end
 # This is handy if you want to bind a key to restarting unicorn in dev
 
 if dev_mode
+  $unicorn_dev_supervisor_pid = Process.pid # rubocop:disable Style/GlobalVars
+
   restart = true
   while restart
     restart = false
diff --git a/config/application.rb b/config/application.rb
index b4b9efeb8e..3b38209571 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -3,7 +3,7 @@
 # note, we require 2.5.2 and up cause 2.5.1 had some mail bugs we no longer
 # monkey patch, so this avoids people booting with this problem version
 begin
-  if !RUBY_VERSION.match?(/^2\.(([67])|(5\.[2-9]))/)
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5.2")
     STDERR.puts "Discourse requires Ruby 2.5.2 or up"
     exit 1
   end
@@ -55,6 +55,8 @@ require 'pry-rails' if Rails.env.development?
 
 require 'discourse_fonts'
 
+require_relative '../lib/zeitwerk_config.rb'
+
 if defined?(Bundler)
   bundler_groups = [:default]
 
@@ -90,16 +92,6 @@ module Discourse
     # tiny file needed by site settings
     require_dependency 'lib/highlight_js/highlight_js'
 
-    # mocha hates us, active_support/testing/mochaing.rb line 2 is requiring the wrong
-    #  require, patched in source, on upgrade remove this
-    if Rails.env.test? || Rails.env.development?
-      require "mocha/version"
-      require "mocha/deprecation"
-      if Mocha::VERSION == "0.13.3" && Rails::VERSION::STRING == "3.2.12"
-        Mocha::Deprecation.mode = :disabled
-      end
-    end
-
     # we skip it cause we configure it in the initializer
     # the railstie for message_bus would insert it in the
     # wrong position
@@ -119,13 +111,26 @@ module Discourse
     config.autoload_paths += Dir["#{config.root}/app/jobs"]
     config.autoload_paths += Dir["#{config.root}/app/serializers"]
     config.autoload_paths += Dir["#{config.root}/lib"]
-    config.autoload_paths += Dir["#{config.root}/lib/active_record/connection_adapters"]
     config.autoload_paths += Dir["#{config.root}/lib/common_passwords"]
     config.autoload_paths += Dir["#{config.root}/lib/highlight_js"]
     config.autoload_paths += Dir["#{config.root}/lib/i18n"]
     config.autoload_paths += Dir["#{config.root}/lib/validators/"]
 
     Rails.autoloaders.main.ignore(Dir["#{config.root}/app/models/reports"])
+    Rails.autoloaders.main.ignore(Dir["#{config.root}/lib/freedom_patches"])
+
+    def watchable_args
+      files, dirs = super
+
+      # Skip the assets directory. It doesn't contain any .rb files, so watching it
+      # is just slowing things down and raising warnings about node_modules symlinks
+      app_file_extensions = dirs.delete("#{config.root}/app")
+      Dir["#{config.root}/app/*"].reject { |path| path.end_with? "/assets" }.each do |path|
+        dirs[path] = app_file_extensions
+      end
+
+      [files, dirs]
+    end
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
@@ -133,11 +138,6 @@ module Discourse
 
     config.assets.paths += %W(#{config.root}/config/locales #{config.root}/public/javascripts)
 
-    if Rails.env == "development" || Rails.env == "test"
-      config.assets.paths << "#{config.root}/app/assets/javascripts/discourse/tests"
-      config.assets.paths << "#{config.root}/node_modules"
-    end
-
     # Allows us to skip minifincation on some files
     config.assets.skip_minification = []
 
@@ -173,6 +173,10 @@ module Discourse
       confirm-new-email/bootstrap.js
       onpopstate-handler.js
       embed-application.js
+      discourse/tests/theme_qunit_helper.js
+      discourse/tests/theme_qunit_vendor.js
+      discourse/tests/theme_qunit_ember_jquery.js
+      discourse/tests/test_starter.js
     }
 
     # Precompile all available locales
@@ -231,6 +235,9 @@ module Discourse
     # see: http://stackoverflow.com/questions/11894180/how-does-one-correctly-add-custom-sql-dml-in-migrations/11894420#11894420
     config.active_record.schema_format = :sql
 
+    # We use this in development-mode only (see development.rb)
+    config.active_record.use_schema_cache_dump = false
+
     # per https://www.owasp.org/index.php/Password_Storage_Cheat_Sheet
     config.pbkdf2_iterations = 64000
     config.pbkdf2_algorithm = "sha256"
diff --git a/config/boot.rb b/config/boot.rb
index 572d833edd..f3b61fd24c 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -23,8 +23,6 @@ if (ENV['DISABLE_BOOTSNAP'] != '1')
     Bootsnap.setup(
       cache_dir: 'tmp/cache',     # Path to your cache
       load_path_cache: true,      # Should we optimize the LOAD_PATH with a cache?
-      autoload_paths_cache: true, # Should we optimize ActiveSupport autoloads with cache?
-      disable_trace: false,       # Sets `RubyVM::InstructionSequence.compile_option = { trace_instruction: false }`
       compile_cache_iseq: true,   # Should compile Ruby code into ISeq cache?
       compile_cache_yaml: false   # Skip YAML cache for now, cause we were seeing issues with it
     )
diff --git a/config/database.yml b/config/database.yml
index 32be4265b8..be92da494d 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -13,6 +13,9 @@ development:
     ###   - restart sidekiq if you change this setting
     ###   - rebake all to posts using: `RAILS_ENV=production bundle exec rake posts:rebake`
     - "localhost"
+  variables: <%= ENV.filter { |k,v| k.start_with? 'DISCOURSE_DB_VARIABLES_' }
+                    .transform_keys { |k| k.slice(('DISCOURSE_DB_VARIABLES_'.length)..).downcase }
+                    .to_json %>
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index 22ba8dee1c..b7c10ed966 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -92,6 +92,9 @@ smtp_enable_start_tls = true
 # to disable, set to 'none'
 smtp_openssl_verify_mode =
 
+# force implicit TLS as per RFC 8314 3.3
+smtp_force_tls = false
+
 # load MiniProfiler in production, to be used by developers
 load_mini_profiler = true
 
@@ -124,11 +127,11 @@ redis_host = localhost
 # redis server port
 redis_port = 6379
 
-# redis slave server address
-redis_slave_host =
+# redis replica server address
+redis_replica_host =
 
-# redis slave server port
-redis_slave_port = 6379
+# redis replica server port
+redis_replica_port = 6379
 
 # redis database
 redis_db = 0
@@ -151,11 +154,11 @@ message_bus_redis_host = localhost
 # message bus redis server port
 message_bus_redis_port = 6379
 
-# message bus redis slave server address
-message_bus_redis_slave_host =
+# message bus redis replica server address
+message_bus_redis_replica_host =
 
 # message bus redis slave server port
-message_bus_redis_slave_port = 6379
+message_bus_redis_replica_port = 6379
 
 # message bus redis database
 message_bus_redis_db = 0
@@ -329,3 +332,7 @@ enable_email_sync_demon = false
 # this can easily lead to blocking sidekiq
 # on multisites we recommend a far lower number
 max_digests_enqueued_per_30_mins_per_site = 10000
+
+# This cluster name can be passed to the /srv/status route to verify
+# the application cluster is the same one you are expecting
+cluster_name =
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 53025e0065..0c7810dccf 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -7,10 +7,14 @@ Discourse::Application.configure do
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
   # Log error messages when you accidentally call methods on nil.
   config.eager_load = false
 
+  # Use the schema_cache.yml file generated during db:migrate (via db:schema:cache:dump)
+  config.active_record.use_schema_cache_dump = true
+
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 75c3a69512..a523888a8d 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -37,6 +37,10 @@ Discourse::Application.configure do
 
     settings[:openssl_verify_mode] = GlobalSetting.smtp_openssl_verify_mode if GlobalSetting.smtp_openssl_verify_mode
 
+    if GlobalSetting.smtp_force_tls
+      settings[:tls] = true
+    end
+
     config.action_mailer.smtp_settings = settings.reject { |_, y| y.nil? }
   else
     config.action_mailer.delivery_method = :sendmail
@@ -63,4 +67,5 @@ Discourse::Application.configure do
     config.developer_emails = emails.split(",").map(&:downcase).map(&:strip)
   end
 
+  config.active_record.dump_schema_after_migration = false
 end
diff --git a/config/initializers/000-development_reload_warnings.rb b/config/initializers/000-development_reload_warnings.rb
new file mode 100644
index 0000000000..374bb7415f
--- /dev/null
+++ b/config/initializers/000-development_reload_warnings.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# Development helper which prints a warning when you edit a non-autoloaded ruby file.
+# These include initializers, middleware, plugin.rb files, and more.
+# Launch the server with AUTO_RESTART=0 to disable automatic restarts.
+if Rails.env.development? && !Rails.configuration.cache_classes && Discourse.running_in_rack?
+  paths = [
+    *Dir["#{Rails.root}/app/*"].reject { |path| path.end_with? "/assets" },
+    "#{Rails.root}/config",
+    "#{Rails.root}/lib",
+    "#{Rails.root}/plugins"
+  ]
+
+  Listen.to(*paths, only: /\.rb$/) do |modified, added, removed|
+    supervisor_pid = $unicorn_dev_supervisor_pid # rubocop:disable Style/GlobalVars
+    auto_restart = supervisor_pid && ENV["AUTO_RESTART"] != "0"
+
+    files = modified + added + removed
+
+    not_autoloaded = files.filter_map do |file|
+      autoloaded = Rails.autoloaders.main.autoloads.key? file
+      Pathname.new(file).relative_path_from(Rails.root) if !autoloaded
+    end
+
+    if not_autoloaded.length > 0
+      message = auto_restart ? "Restarting server..." : "Server restart required. Automate this by setting AUTO_RESTART=1."
+      STDERR.puts "[DEV]: Edited files which are not autoloaded. #{message}"
+      STDERR.puts not_autoloaded.map { |path| "- #{path}".indent(7) }.join("\n")
+      Process.kill("USR2", supervisor_pid) if auto_restart
+    end
+  end.start
+end
diff --git a/config/initializers/002-freedom_patches.rb b/config/initializers/002-freedom_patches.rb
index 255652ba20..b957e03711 100644
--- a/config/initializers/002-freedom_patches.rb
+++ b/config/initializers/002-freedom_patches.rb
@@ -1,5 +1,13 @@
 # frozen_string_literal: true
 
-Dir["#{Rails.root}/lib/freedom_patches/*.rb"].each do |f|
-  require(f)
+# Multisite freedom patch defines RailsMultisite::DiscoursePatches.config which is used  by 200-first_middlewares.rb
+# Therefore it can not be postponed with .to_prepare
+RUN_WITHOUT_PREPARE = ["#{Rails.root}/lib/freedom_patches/rails_multisite.rb"]
+RUN_WITHOUT_PREPARE.each { |path| require(path) }
+
+Rails.application.reloader.to_prepare do
+  Dir["#{Rails.root}/lib/freedom_patches/*.rb"].each do |f|
+    next if RUN_WITHOUT_PREPARE.any? { |path| path == f }
+    require(f)
+  end
 end
diff --git a/config/initializers/004-message_bus.rb b/config/initializers/004-message_bus.rb
index 924fe6dc71..a566d4658f 100644
--- a/config/initializers/004-message_bus.rb
+++ b/config/initializers/004-message_bus.rb
@@ -98,7 +98,7 @@ MessageBus.on_middleware_error do |env, e|
   if Discourse::InvalidAccess === e
     [403, {}, ["Invalid Access"]]
   elsif RateLimiter::LimitExceeded === e
-    [429, { 'Retry-After' => e.available_in }, [e.description]]
+    [429, { 'Retry-After' => e.available_in.to_s }, [e.description]]
   end
 end
 
diff --git a/config/initializers/006-mini_profiler.rb b/config/initializers/006-mini_profiler.rb
index 86baee2e23..0f808362b4 100644
--- a/config/initializers/006-mini_profiler.rb
+++ b/config/initializers/006-mini_profiler.rb
@@ -3,7 +3,7 @@
 # If Mini Profiler is included via gem
 if Rails.configuration.respond_to?(:load_mini_profiler) && Rails.configuration.load_mini_profiler
   require 'rack-mini-profiler'
-  require 'flamegraph'
+  require 'stackprof'
 
   begin
     require 'memory_profiler'
diff --git a/config/initializers/008-rack-cors.rb b/config/initializers/008-rack-cors.rb
index e54a451657..96ab5ba619 100644
--- a/config/initializers/008-rack-cors.rb
+++ b/config/initializers/008-rack-cors.rb
@@ -25,15 +25,18 @@ class Discourse::Cors
     status, headers, body = @app.call(env)
     headers ||= {}
 
-    Discourse::Cors.apply_headers(cors_origins, env, headers) if cors_origins
+    Discourse::Cors.apply_headers(cors_origins, env, headers)
 
     [status, headers, body]
   end
 
   def self.apply_headers(cors_origins, env, headers)
-    origin = nil
+    request_method = env['REQUEST_METHOD']
 
-    if cors_origins
+    if env['REQUEST_PATH'] =~ /\/(javascripts|assets)\// && Discourse.is_cdn_request?(env, request_method)
+      Discourse.apply_cdn_headers(headers)
+    elsif cors_origins
+      origin = nil
       if origin = env['HTTP_ORIGIN']
         origin = nil unless cors_origins.include?(origin)
       end
@@ -48,6 +51,6 @@ class Discourse::Cors
   end
 end
 
-if GlobalSetting.enable_cors
+if GlobalSetting.enable_cors || GlobalSetting.cdn_url
   Rails.configuration.middleware.insert_before ActionDispatch::Flash, Discourse::Cors
 end
diff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb
index 043ede89b5..942260c85c 100644
--- a/config/initializers/012-web_hook_events.rb
+++ b/config/initializers/012-web_hook_events.rb
@@ -41,6 +41,7 @@ end
   user_logged_in
   user_approved
   user_updated
+  user_confirmed_email
 ).each do |event|
   DiscourseEvent.on(event) do |user|
     WebHook.enqueue_object_hooks(:user, user, event)
@@ -84,8 +85,13 @@ end
   end
 end
 
-DiscourseEvent.on(:reviewable_created) do |reviewable|
-  WebHook.enqueue_object_hooks(:reviewable, reviewable, :reviewable_created, reviewable.serializer)
+%i(
+  reviewable_created
+  reviewable_score_updated
+).each do |event|
+  DiscourseEvent.on(event) do |reviewable|
+    WebHook.enqueue_object_hooks(:reviewable, reviewable, event, reviewable.serializer)
+  end
 end
 
 DiscourseEvent.on(:reviewable_transitioned_to) do |status, reviewable|
@@ -95,3 +101,14 @@ end
 DiscourseEvent.on(:notification_created) do |notification|
   WebHook.enqueue_object_hooks(:notification, notification, :notification_created, NotificationSerializer)
 end
+
+DiscourseEvent.on(:user_added_to_group) do |user, group, options|
+  group_user = GroupUser.find_by(user: user, group: group)
+  WebHook.enqueue_object_hooks(:group_user, group_user, :user_added_to_group, WebHookGroupUserSerializer)
+end
+
+DiscourseEvent.on(:like_created) do |post_action|
+  user = post_action.user
+  group_ids = user.groups.map(&:id)
+  WebHook.enqueue_object_hooks(:like, post_action, :post_liked, WebHookLikeSerializer, group_ids: group_ids)
+end
diff --git a/config/initializers/014-track-setting-changes.rb b/config/initializers/014-track-setting-changes.rb
index fed99a618c..1340d1defe 100644
--- a/config/initializers/014-track-setting-changes.rb
+++ b/config/initializers/014-track-setting-changes.rb
@@ -48,4 +48,9 @@ DiscourseEvent.on(:site_setting_changed) do |name, old_value, new_value|
   if SiteSetting::WATCHED_SETTINGS.include?(name)
     SiteSetting.reset_cached_settings!
   end
+
+  # Make sure medium and high priority thresholds were calculated.
+  if name == :reviewable_low_priority_threshold && Reviewable.min_score_for_priority(:medium) > 0
+    Reviewable.set_priorities(low: new_value)
+  end
 end
diff --git a/config/initializers/100-i18n.rb b/config/initializers/100-i18n.rb
index 739fca222d..4165bd75b6 100644
--- a/config/initializers/100-i18n.rb
+++ b/config/initializers/100-i18n.rb
@@ -5,15 +5,18 @@
 require 'i18n/backend/discourse_i18n'
 require 'i18n/backend/fallback_locale_list'
 
-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!(overrides_enabled: ENV['DISABLE_TRANSLATION_OVERRIDES'] != '1')
+# Requires the `translate_accelerator.rb` freedom patch to be loaded
+Rails.application.reloader.to_prepare do
+  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!(overrides_enabled: ENV['DISABLE_TRANSLATION_OVERRIDES'] != '1')
 
-unless Rails.env.test?
-  MessageBus.subscribe("/i18n-flush") do
-    I18n.reload!
-    ExtraLocalesController.clear_cache!
+  unless Rails.env.test?
+    MessageBus.subscribe("/i18n-flush") do
+      I18n.reload!
+      ExtraLocalesController.clear_cache!
+    end
   end
 end
diff --git a/config/initializers/100-logster.rb b/config/initializers/100-logster.rb
index 099747ae82..bbc23b56bf 100644
--- a/config/initializers/100-logster.rb
+++ b/config/initializers/100-logster.rb
@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 if GlobalSetting.skip_redis?
-  if Rails.logger.respond_to? :chained
-    Rails.logger = Rails.logger.chained.first
+  Rails.application.reloader.to_prepare do
+    if Rails.logger.respond_to? :chained
+      Rails.logger = Rails.logger.chained.first
+    end
   end
   return
 end
@@ -17,13 +19,15 @@ if Rails.env.development? && RUBY_VERSION.match?(/^2\.5\.[23]/)
 end
 
 if Rails.env.development? && !Sidekiq.server? && ENV["RAILS_LOGS_STDOUT"] == "1"
-  console = ActiveSupport::Logger.new(STDOUT)
-  original_logger = Rails.logger.chained.first
-  console.formatter = original_logger.formatter
-  console.level = original_logger.level
+  Rails.application.config.after_initialize do
+    console = ActiveSupport::Logger.new(STDOUT)
+    original_logger = Rails.logger.chained.first
+    console.formatter = original_logger.formatter
+    console.level = original_logger.level
 
-  unless ActiveSupport::Logger.logger_outputs_to?(original_logger, STDOUT)
-    original_logger.extend(ActiveSupport::Logger.broadcast(console))
+    unless ActiveSupport::Logger.logger_outputs_to?(original_logger, STDOUT)
+      original_logger.extend(ActiveSupport::Logger.broadcast(console))
+    end
   end
 end
 
@@ -102,13 +106,13 @@ RailsMultisite::ConnectionManagement.each_connection do
   if (error_rate_per_minute || 0) > 0
     store.register_rate_limit_per_minute(severities, error_rate_per_minute) do |rate|
       MessageBus.publish("/logs_error_rate_exceeded",
-        {
-          rate: rate,
-          duration: 'minute',
-          publish_at: Time.current.to_i
-        },
-        group_ids: [Group::AUTO_GROUPS[:admins]]
-      )
+                          {
+                            rate: rate,
+                            duration: 'minute',
+                            publish_at: Time.current.to_i
+                          },
+                          group_ids: [Group::AUTO_GROUPS[:admins]]
+                        )
     end
   end
 
@@ -117,13 +121,13 @@ RailsMultisite::ConnectionManagement.each_connection do
   if (error_rate_per_hour || 0) > 0
     store.register_rate_limit_per_hour(severities, error_rate_per_hour) do |rate|
       MessageBus.publish("/logs_error_rate_exceeded",
-        {
-          rate: rate,
-          duration: 'hour',
-          publish_at: Time.current.to_i,
-        },
-        group_ids: [Group::AUTO_GROUPS[:admins]]
-      )
+                          {
+                            rate: rate,
+                            duration: 'hour',
+                            publish_at: Time.current.to_i,
+                          },
+                          group_ids: [Group::AUTO_GROUPS[:admins]]
+                        )
     end
   end
 end
diff --git a/config/initializers/400-deprecations.rb b/config/initializers/400-deprecations.rb
new file mode 100644
index 0000000000..39373182d1
--- /dev/null
+++ b/config/initializers/400-deprecations.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+if !GlobalSetting.skip_redis?
+  if GlobalSetting.respond_to?(:redis_slave_host) && GlobalSetting.redis_slave_host.present?
+    Discourse.deprecate("redis_slave_host is deprecated, use redis_replica_host instead", drop_from: "2.8")
+  end
+
+  if GlobalSetting.respond_to?(:redis_slave_port) && GlobalSetting.redis_slave_port.present?
+    Discourse.deprecate("redis_slave_port is deprecated, use redis_replica_port instead", drop_from: "2.8")
+  end
+
+  if GlobalSetting.respond_to?(:message_bus_redis_slave_host) && GlobalSetting.message_bus_redis_slave_host.present?
+    Discourse.deprecate("message_bus_redis_slave_host is deprecated, use message_bus_redis_replica_host", drop_from: "2.8")
+  end
+
+  if GlobalSetting.respond_to?(:message_bus_redis_slave_port) && GlobalSetting.message_bus_redis_slave_port.present?
+    Discourse.deprecate("message_bus_redis_slave_port is deprecated, use message_bus_redis_replica_port", drop_from: "2.8")
+  end
+end
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index e1b7899a7a..ce46d3d653 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -246,6 +246,8 @@ ar:
     topic_admin_menu: "الإجراءات على الموضوع"
     wizard_required: "مرحبًا بك في دِسكورس! هيا بنا نبدأ من <a href='%{url}' data-auto-route='true'>مُرشد الإعداد</a> ✨"
     emails_are_disabled: "عطّل أحد المدراء البريد الصادر على عموم الموقع. لن تُرسل أيّة إخطارات بريد أيًا كان نوعها."
+    software_update_prompt:
+      dismiss: "تجاهل"
     bootstrap_mode_enabled:
       zero: "ضُبط الموقع على الوضع التمهيدي لتسهيل إطلاق موقعك الجديد. سيُمنح كلّ المستخدمين الجدد مستوى الثقة 1 كما وستُفعّل لهم رسائل الخُلاصة عبر البريد تلقائيًا. سيُلغى هذا الوضع تلقائيًا ما إن لا ينضمّ أيّ مستخدم."
       one: "ضُبط الموقع على الوضع التمهيدي لتسهيل إطلاق موقعك الجديد. سيُمنح كلّ المستخدمين الجدد مستوى الثقة 1 كما وستُفعّل لهم رسائل الخُلاصة عبر البريد تلقائيًا. سيُلغى هذا الوضع تلقائيًا ما إن ينضمّ مستخدم واحد."
@@ -349,8 +351,6 @@ ar:
       moderators: "المشرفون"
       stat:
         all_time: "منذ التأسيس"
-        last_7_days: "آخر 7 أيام"
-        last_30_days: "آخر 30 يومًا"
       like_count: "الإعجابات"
       topic_count: "المواضيع"
       post_count: "المشاركات"
@@ -386,13 +386,6 @@ ar:
       search_placeholder: "ابحث في العلامات حسب الاسم أو عنوان الموضوع أو محتوى المشاركة"
       search: "البحث"
       reminders:
-        later_today: "خلال هذا اليوم"
-        tomorrow: "غدًا"
-        next_week: "الأسبوع القادم"
-        later_this_week: "خلال هذا الأسبوع"
-        next_month: "الشهر القادم"
-        custom: "تاريخ ووقت مخصّصين"
-        none: "لا حاجة للتذكير"
         today_with_time: "اليوم الساعة %{time}"
         tomorrow_with_time: "غدًا الساعة %{time}"
         at_time: "بتاريخ %{date_time}"
@@ -406,10 +399,6 @@ ar:
       new_topic: "مسودة موضوع جديد"
       new_private_message: "مسودّة رسالة خاصّة جديدة"
       topic_reply: "مسودة الرد"
-      abandon:
-        confirm: "فتحت مسودّة أخرى في هذا الموضوع فعلًا. أمتأكّد من رميها؟"
-        yes_value: "نعم، لا أريدها"
-        no_value: "لا، أبقِها"
     topic_count_latest:
       zero: "ما من مواضيع جديدة أو محدّثة لمطالعتها"
       one: "طالِع الموضوع الجديد أو المحدّث"
@@ -465,21 +454,50 @@ ar:
       none_found: "لم نجد أيّ رسالة."
       title:
         search: "ابحث عن رسالة"
+        placeholder: "اكتب عنوان الرسالة أو عنوان URL أو المعرف هنا"
     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: "اعرض المُرجأ"
       topic_has_pending:
@@ -489,8 +507,11 @@ ar:
         few: "في هذا الموضوع <b>%{count}</b> مشاركات تنتظر الموافقة"
         many: "في هذا الموضوع <b>%{count}</b> مشاركة تنتظر الموافقة"
         other: "في هذا الموضوع <b>%{count}</b> مشاركة تنتظر الموافقة"
+      title: "مراجعة"
       topic: "الموضوع:"
+      filtered_topic: "لقد تمت تصفيتها إلى محتوى قابل للمراجعة في موضوع واحد."
       filtered_user: "مستخدم"
+      filtered_reviewed_by: "راجَعها"
       show_all_topics: "اعرض كلّ المواضيع"
       deleted_post: "(حُذفت المشاركة)"
       deleted_user: "(حُذف المستخدم)"
@@ -501,14 +522,8 @@ ar:
         email: "البريد الإلكتروني"
         name: "الاسم"
         fields: "الحقول"
+        reject_reason: "سبب"
       user_percentage:
-        summary:
-          zero: "‏%{agreed}، ‏%{disagreed}، ‏%{ignored} ‏(ما من إشارات)"
-          one: "‏%{agreed}، ‏%{disagreed}، ‏%{ignored} ‏(إشارة واحدة بالمُجمل)"
-          two: "‏%{agreed}، ‏%{disagreed}، ‏%{ignored} ‏(إشارتان بالمُجمل)"
-          few: "‏%{agreed}، ‏%{disagreed}، ‏%{ignored} ‏(%{count} إشارات بالمُجمل)"
-          many: "‏%{agreed}، ‏%{disagreed}، ‏%{ignored} ‏(%{count} إشارة بالمُجمل)"
-          other: "‏%{agreed}، ‏%{disagreed}، ‏%{ignored} ‏(%{count} إشارة بالمُجمل)"
         agreed:
           zero: "%{count}% مُوافق عليها"
           one: "%{count}% مُوافق عليها"
@@ -532,6 +547,8 @@ ar:
           other: "%{count}% مُتجاهلة"
       topics:
         topic: "موضوع"
+        reviewable_count: "العد"
+        reported_by: "تم عمل تقرير بواسطة"
         deleted: "[حُذف الموضوع]"
         original: "(الموضوع الأصلي)"
         details: "التفاصيل"
@@ -558,31 +575,58 @@ ar:
         type:
           title: "النوع"
           all: "(كلّ الأنواع)"
+        minimum_score: "الحد الأدنى من النقاط:"
         refresh: "تحديث"
         status: "الحالة"
         category: "تصنيف"
         orders:
+          score: "نقاط"
+          score_asc: "النتيجة (عكسي)"
           created_at: "تاريخ الإنشاء"
           created_at_asc: "تاريخ الإنشاء (بالعكس)"
         priority:
+          title: "الحد الأدنى من الأولوية"
+          any: "(أي)"
+          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: "المستخدم"
+        reviewable_post:
+          title: "مشاركة"
       approval:
         title: "المنشور يحتاج موافقة"
         description: "استلمنا مشاركتك ولكن يجب على أحد المشرفين الموافقة عليها قبل ظهورها. نرجو منك الصبر."
@@ -594,6 +638,26 @@ ar:
           many: "<strong>%{count}</strong> مشاركة تنتظر الموافقة منك."
           other: "<strong>%{count}</strong> مشاركة تنتظر الموافقة منك."
         ok: "حسنًا"
+      example_username: "اسم المستخدم"
+    relative_time_picker:
+      days:
+        zero: "أيام"
+        one: "يوم"
+        two: "أيام"
+        few: "أيام"
+        many: "أيام"
+        other: "أيام"
+    time_shortcut:
+      later_today: "خلال هذا اليوم"
+      next_business_day: "يوم العمل التالي"
+      tomorrow: "غدًا"
+      next_week: "الأسبوع القادم"
+      post_local_date: "تاريخ المشاركة"
+      later_this_week: "خلال هذا الأسبوع"
+      start_of_next_business_week: "الاثنين"
+      start_of_next_business_week_alt: "الاثنين القادم"
+      next_month: "الشهر القادم"
+      custom: "تاريخ ووقت مخصّصين"
     user_action:
       user_posted_topic: "نشر <a href='%{userUrl}'>%{user}</a> ‏<a href='%{topicUrl}'>الموضوع</a>"
       you_posted_topic: "<a href='%{userUrl}'>نشرت</a> ‏<a href='%{topicUrl}'>الموضوع</a>"
@@ -649,9 +713,16 @@ ar:
         description: "يمكنك أيضًا لصق قائمة مفصولة بفواصل إنكليزية."
         usernames: "أدخِل أسماء المستخدمين أو عناوين البريد"
         input_placeholder: "أسماء المستخدمين أو عناوين البريد"
+        notify_users: "إخطار المستخدمين"
       requests:
+        title: "الطلبات"
         reason: "سبب"
+        accept: "قبول"
         accepted: "مقبول"
+        deny: "رفض"
+        denied: "مرفوض"
+        undone: "طلب التراجع"
+        handle: "التعامل مع طلب العضوية"
       manage:
         title: "إدارة"
         name: "الإسم"
@@ -666,6 +737,7 @@ ar:
           notification: اشعار
         email:
           title: "البريد الإلكتروني"
+          status: "مزامنة %{old_emails} / %{total_emails} رسائل البريد الإلكتروني عبر IMAP."
           credentials:
             title: "بيانات الولوج"
             smtp_server: "خادوم SMTP"
@@ -676,8 +748,12 @@ ar:
             imap_ssl: "استعمل SSL لِ‍ IMAP"
             username: "اسم المستخدم"
             password: "كلمة السر"
+          settings:
+            title: "إعدادات"
           mailboxes:
+            synchronized: "صندوق البريد المتزامن"
             none_found: "لم توجد صناديق بريد في حساب البريد الإلكتروني هذا."
+            disabled: "معطّل"
         membership:
           title: العضوية
           access: صلاحية
@@ -685,10 +761,20 @@ ar:
           title: الفئات
           long_title: "الإخطارات المبدئية للفئة"
           description: "حين يُضاف المستخدمون إلى هذه المجموعة، ستُضبط إعدادات إخطارات الفئة لديهم على الآتي. يمكنهم بعدها تغييرها."
+          watched_categories_instructions: "ستراقب آليا كل المواضيع في هذه التصنيفات. ستصل لمجموعة الأعضاء إشعارات بالمنشورات والمشاركات الجديدة، وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
+          tracked_categories_instructions: "ستتابع آليا كل موضوعات هذا القسم. وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
+          watching_first_post_categories_instructions: "سيتم إخطار المستخدمين بأول مشاركة في كل موضوع جديد في هذه التصنيفات."
+          regular_categories_instructions: "إذا تم كتم هذه الفئات، فلن يتم كتمها عن أعضاء المجموعة. سيتم إخطار المستخدمين إذا تم ذكرهم أو رد شخص ما عليهم."
+          muted_categories_instructions: "لن يتم إخطار المستخدمين بأي شيء يتعلق بالمواضيع الجديدة في هذه التصنيفات، ولن يظهروا في التصنيفات أو صفحات الموضوعات الأخيرة."
         tags:
           title: الوسوم
           long_title: "الإخطارات المبدئية للوسوم"
+          description: "عند إضافة مستخدمين إلى هذه المجموعة، سيتم تعيين إعدادات أوسمة الإشعار الخاصة بهم على الإعدادات الافتراضية. بعد ذلك، يمكنهم تغييرها."
+          watched_tags_instructions: "ستراقب آليا كل المواضيع في هذه الأوسمة. ستصل إشعارات لمجموعة الأعضاء بالمنشورات والمشاركات الجديدة، وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
+          tracked_tags_instructions: "ستتابع آليا كل موضوعات هذه الأوسمة. وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
           watching_first_post_tags_instructions: "سيُرسل إخطار للمستخدمين بأولّ مشاركة في كلّ موضوع يحمل هذه الوسوم."
+          regular_tags_instructions: "إذا تم كتم كتم هذه العلامات، فسيتم إلغاء الكتم عن مستخدمين المجموعة. سيتم إخطار المستخدمين إذا تم ذكرهم أو رد شخص ما عليهم."
+          muted_tags_instructions: "لن يتم إخطار المستخدمين بأي شيء يتعلق بالمواضيع الجديدة لهذه الأوسمة، ولن تظهر في الأحدث."
         logs:
           title: "السّجلّات"
           when: "متى"
@@ -739,9 +825,14 @@ ar:
         filter: "رشّح حسب اسم المجموعة"
         owner_groups: "مجموعاتي"
         close_groups: "المجموعات المُغلقة"
+        automatic_groups: "مجموعات تلقائية"
         automatic: "تلقائي"
         closed: "مغلق"
+        public: "عامة"
+        private: "خاص"
+        public_groups: "المجموعات العامة"
         automatic_group: مجموعة تلقائية
+        close_group: المجموعات المُغلقة
         my_groups: "مجموعاتي"
         group_type: "نوع المجموعة"
         is_group_user: "عضو"
@@ -760,6 +851,7 @@ ar:
         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>"
@@ -777,6 +869,7 @@ ar:
         only_admins: "المدراء فقط"
         mods_and_admins: "المدراء والمشرفون فقط"
         members_mods_and_admins: "أعضاء المجموعة والمدراء والمشرفون فقط"
+        owners_mods_and_admins: "مالكو المجموعات، الإداريون والمشرفون فقط"
         everyone: "الكلّ"
       notifications:
         watching:
@@ -784,6 +877,7 @@ ar:
           description: "سنُرسل إليك إخطارًا بكلّ مشاركة جديدة في كلّ رسالة، وسترى عدّادًا للردود الجديدة."
         watching_first_post:
           title: "مراقبة اول منشور"
+          description: "سيتم إعلامك برسائل جديدة في هذه المجموعة ولكن ليس الردود على الرسائل."
         tracking:
           title: "مُتابع"
           description: "سنُرسل إليك إخطارًا إن أشار أحد إلى @اسمك أو ردّ عليك، وسترى عدّادًا للردود الجديدة."
@@ -792,6 +886,7 @@ ar:
           description: "سنُرسل إليك إخطارًا إن أشار أحد إلى @اسمك أو ردّ عليك."
         muted:
           title: "مكتوم"
+          description: "لن يتم إخطارك بأي شيء بخصوص الرسائل من هذه المجموعة."
       flair_url: "الصورة الرمزية المميزة"
       flair_upload_description: "استعمل صورًا مربّعة الشكل مقاسها الأدنى هو 20 بكسل × 20 بكسل."
       flair_bg_color: "لون خلفية الصورة الرمزية"
@@ -832,7 +927,6 @@ ar:
       posts: "المشاركات"
       topics: "المواضيع"
       latest: "آخر المواضيع"
-      latest_by: "الاحدث بـ"
       toggle_ordering: "تبديل التحكم في الترتيب"
       subcategories: "أقسام فرعية"
       muted: "الفئات المكتومة"
@@ -843,6 +937,9 @@ ar:
         few: "%{count} مواضيع"
         many: "%{count} موضوعًا"
         other: "%{count} موضوع"
+      topic_stat_unit:
+        week: "أسبوع"
+        month: "شهر"
       topic_stat_sentence_week:
         zero: "ما من مواضيع جديدة خلال الأسبوع الماضي."
         one: "فُتح موضوع واحد جديد خلال الأسبوع الماضي."
@@ -873,6 +970,7 @@ ar:
       topics_entered: " مواضيع فُتحت"
       post_count: "# المنشورات"
       confirm_delete_other_accounts: "أمتأكّد من حذف هذه الحسابات؟"
+      powered_by: "باستخدام <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "تم النسخ"
     user_fields:
       none: "(اختر خيارًا)"
@@ -900,11 +998,22 @@ ar:
         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: "سنُرسل إليك إخطارًا إن ردّ هذا المستخدم عليك أو اقتبس كلامك أو أشار إليك."
+      notification_schedule:
+        none: "لا شيء"
+        monday: "الاثنين"
+        to: "إلى"
       activity_stream: "النشاط"
+      read: "المقروءة"
       preferences: "التفضيلات"
       feature_topic_on_profile:
         open_search: "اختر موضوعًا جديدًا"
@@ -921,6 +1030,7 @@ ar:
       bookmarks: "العلامات"
       bio: "معلومات عنّي"
       timezone: "المنطقة الزمنية"
+      invited_by: "مدعو من قبل"
       trust_level: "مستوى الثقة"
       notifications: "الإخطارات"
       statistics: "الأحصائيات"
@@ -932,25 +1042,34 @@ ar:
         perm_denied_expl: "رفضت تصريح عرض الإخطارات. اسمح بالإخطارات من إعدادات المتصفّح."
         disable: "عطّل الإخطارات"
         enable: "فعّل الإخطارات"
-        each_browser_note: "ملاحظة: عليك تغيير هذا الإعداد في كل متصفّح تستعمله."
+        each_browser_note: 'ملاحظة: يجب عليك تغيير هذا الإعداد في كل متصفح تستخدمه. سيتم تعطيل جميع الإشعارات في "الرجاء عدم الإزعاج" ، بغض النظر عن هذا الإعداد.'
         consent_prompt: "هل تريد إشعارات مباشرة عندما يرد الأشخاص على مشاركاتك؟"
       dismiss: "تجاهل"
       dismiss_notifications: "تجاهل الكل"
       dismiss_notifications_tooltip: "علّم كلّ الإخطارات غير المقروءة على أنّها مقروءة"
       first_notification: "أوّل إخطار تستلمه! انقره لتبدأ."
       dynamic_favicon: "اعرض الأعداد في أيقونة المتصفّح"
+      skip_new_user_tips:
+        description: "تخطي نصائح وتهيئة المستخدم الجديد والشارات"
+        not_first_time: "ليست المرة الأولى لك؟"
+        skip_link: "تخطي هذه النصائح"
       theme_default_on_all_devices: "اضبط هذه السمة لتكون المبدئية على كلّ أجهزتي"
+      color_scheme_default_on_all_devices: "تعيين مخطط (أنظمة) الألوان الافتراضية على جميع أجهزتي"
       color_scheme: "المخطط اللوني"
       color_schemes:
-        default_description: "المبدئي"
+        disable_dark_scheme: "نفس العادية"
         dark_instructions: "يمكنك معاينة مخطّط الوضع الداكن اللوني بتفعيل الوضع الداكن من جهازك."
         undo: "صفّر"
         regular: "العادي"
         dark: "الوضع الداكن"
         default_dark_scheme: "(مبدئيّات الموقع)"
       dark_mode: "الوضع الداكن"
+      dark_mode_enable: "تمكين نظام الألوان في الوضع المظلم تلقائيًا"
+      text_size_default_on_all_devices: "اجعل هذا الحجم الافتراضي للنص على جميع أجهزتي"
+      allow_private_messages: "السماح للمستخدمين الآخرين بإرسال رسائل خاصة لي"
       external_links_in_new_tab: "افتح كلّ الروابط الخارجي في لسان جديد"
       enable_quoting: "فعل خاصية إقتباس النصوص المظللة"
+      enable_defer: "تمكين التأجيل لوضع علامة على المواضيع الغير مقروءة"
       change: "غيّر"
       featured_topic: "الموضوع المميّز"
       moderator: "‏%{user} مشرف في الموقع"
@@ -961,6 +1080,7 @@ ar:
       suspended_notice: "هذا المستخدم موقوف حتى تاريخ %{date}"
       suspended_permanently: "هذا العضو موقوف."
       suspended_reason: "السبب:"
+      github_profile: "Github"
       email_activity_summary: "خلاصة النشاط"
       mailing_list_mode:
         label: "وضع القائمة البريدية"
@@ -972,6 +1092,7 @@ ar:
         individual_no_echo: "أرسل رسالة لكل منشور جديد عدا منشوراتي"
         many_per_day: "أرسل لي رسالة لكل منشور جديد (تقريبا %{dailyEmailEstimate} يوميا)"
         few_per_day: "أرسل لي رسالة لكل منشور جديد (تقريبا إثنتان يوميا)"
+        warning: "تم تمكين وضع القائمة البريدية. تم تجاوز إعدادات إشعار البريد الإلكتروني."
       tag_settings: "الوسوم"
       watched_tags: "مراقب"
       watched_tags_instructions: "ستراقب آليا كل المواضيع التي تستخدم هذه الأوسمة. ستصلك إشعارات بالمنشورات و الموضوعات الجديدة، وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
@@ -988,6 +1109,9 @@ ar:
       watched_first_post_tags: "مراقبة أول منشور"
       watched_first_post_tags_instructions: "سيصلك إشعار بأول منشور في كل موضوع يستخدم هذة الأوسمة."
       muted_categories: "مكتوم"
+      muted_categories_instructions: "لن يتم إخطار بأي شيء يتعلق بالمواضيع الجديدة في هذه التصنيفات، ولن تظهر في التصيفات أو صفحة الأحدث."
+      muted_categories_instructions_dont_hide: "لن يتم إخطارك بأي شيء حول المواضيع الجديدة في هذه التصنيفات."
+      regular_categories: "عادي"
       regular_categories_instructions: "سترى هذه الفئات في قوائم المواضيع ”الحديثة“ و”النشطة“."
       no_category_access: "كمشرف لديك صلاحيات وصول محدودة للأقسام, الحفظ معطل"
       delete_account: "أحذف الحسابي"
@@ -998,19 +1122,30 @@ ar:
       admin_delete: "احذف"
       users: "المستخدمون"
       muted_users: "المكتومون"
+      muted_users_instructions: "منع جميع الإشعارات والرسائل الخاصة من هؤلاء المستخدمين."
+      allowed_pm_users: "سماح"
+      allowed_pm_users_instructions: "السماح فقط بالرسائل الخاصة لهؤلاء المستخدمين."
+      allow_private_messages_from_specific_users: "السماح لمستخدمين محددين فقط بإرسال رسائل خاصة لي"
+      ignored_users: "تم تجاهله"
+      ignored_users_instructions: "منع جميع المشاركات، الإشعارات والرسائل الخاصة من هؤلاء المستخدمين."
       tracked_topics_link: "إظهار"
       automatically_unpin_topics: "ألغِ تثبيت الموضوعات تلقائيًا متى وصلت آخرها."
       apps: "التطبيقات"
       revoke_access: "اسحب التصريح"
       undo_revoke_access: "تراجَع عن سحب التصريح"
       api_approved: "موافق عليه:"
+      api_last_used_at: "آخر استخدام في:"
+      theme: "الواجهة"
+      save_to_change_theme: 'سيتم تحديث المظهر بعد النقر على "%{save_text}"'
       home: "الصفحة الرئيسية المبدئية"
+      staged: "مهيأ"
       staff_counters:
         flags_given: "البلاغات المفيدة"
         flagged_posts: "المنشورات المبلغ عنها "
         deleted_posts: "المنشورات المحذوفة"
         suspensions: "موقوفون"
         warnings_received: "تحذيرات"
+        rejected_posts: "المشاركات المرفوضة"
       messages:
         all: "الكلّ"
         inbox: "الوارد"
@@ -1025,6 +1160,7 @@ ar:
         tags: "الوسوم"
       preferences_nav:
         account: "الحساب"
+        security: "الأمن"
         profile: "الملف الشخصي"
         emails: "البريد الإلكتروني"
         notifications: "التنبيهات"
@@ -1037,11 +1173,13 @@ ar:
         success: "(تم إرسال الرسالة)"
         in_progress: "(يتم إرسال الرسالة)"
         error: "(خطأ)"
+        emoji: "قفل الرموز التعبيرية"
         action: "أرسِل بريد تصفير كلمة السر"
         set_password: "اضبط كلمة السر"
         choose_new: "اختر كلمة سر جديدة"
         choose: "اختر كلمة سر"
       second_factor_backup:
+        title: "رموز النسخ الاحتياطي لـ الاستيثاق بعوامل عدة"
         regenerate: "أعِد التوليد"
         disable: "عطّل"
         enable: "فعّل"
@@ -1064,6 +1202,11 @@ ar:
           few: "بقيت <strong>%{count}</strong> رموز احتياطية."
           many: "بقيَ <strong>%{count}</strong> رمزًا احتياطيًا."
           other: "بقيَ <strong>%{count}</strong> رمز احتياطي."
+        use: "استخدم رمزًا احتياطيًا"
+        enable_prerequisites: "يجب عليك تمكين طريقة أساسية لـ (الاستيثاق بعوامل عدة) قبل إنشاء الرموز الاحتياطية."
+        codes:
+          title: "تم إنشاء رموز النسخ الاحتياطي"
+          description: "يمكن استخدام كل من هذه الرموز الاحتياطية مرة واحدة فقط. احتفظ بها في مكان آمن وتستطيع الوصول إليها."
       second_factor:
         title: "الاستيثاق بخطوتين"
         enable: "أدِر الاستيثاق بخطوتين"
@@ -1079,17 +1222,35 @@ ar:
         show_key_description: "أدخِل يدويًا"
         short_description: |
           احمِ حسابك برموز أمان تُستعمل لمرة واحدة فقط.
+        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">دائرة الرقابة الداخلية</a> الأجهزة.
         oauth_enabled_warning: "من فضلك خُذ بعين الاعتبار أنّ الولوج الاجتماعي سيُعطّل ما إن تفعّل الاستيثاق بخطوتين على حسابك."
+        use: "استخدم تطبيق Authenticator"
+        enforced_notice: "أنت مطالب بتمكين المصادقة ذات العاملين قبل الوصول إلى هذا الموقع."
         disable: "عطّل"
         disable_confirm: "أمتأكّد من تعطيل كلّ طرائق الاستيثاق بخطوتين؟"
         save: "احفظ"
         edit: "عدّل"
+        edit_title: "تحرير المصادقة"
+        edit_description: "اسم الموثق"
+        enable_security_key_description: |
+          عندما يكون لديك <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">مفتاح أمان الأجهزة</a> ، اضغط على زر التسجيل أدناه.
         totp:
+          title: "المصادقة المعتمدة على الرموز"
           add: "أضِف وسيلة استيثاق"
+          default_name: "مصادقتي"
+          name_and_code_required_error: "يجب عليك تقديم اسم ورمز من تطبيق المصادقة."
         security_key:
+          register: "تسجيل"
+          title: "مفاتيح الأمان"
           add: "أضِف مفتاح أمان"
           default_name: "مفتاح الأمان الأساس"
+          not_allowed_error: "انتهت مهلة عملية تسجيل مفتاح الأمان أو تم إلغاؤها."
+          already_added_error: "لقد سجلت بالفعل مفتاح الأمان هذا. ليس عليك تسجيله مرة أخرى."
+          edit: "تحرير مفتاح الأمان"
           save: "احفظ"
+          edit_description: "اسم مفتاح الأمان"
+          name_required_error: "يجب عليك تقديم اسم لمفتاح الأمان."
       change_about:
         title: "تعديل عني"
         error: "حدث عطل أثناء تغيير هذه القيمة."
@@ -1099,32 +1260,51 @@ ar:
         taken: "معذرةً، اسم المستخدم الذي اخترته محجوز."
         invalid: "اسم المستخدم غير صالح. يمكنه احتواء احرف و ارقام انجليزية فحسب"
       add_email:
+        title: "أضف بريد إلكتروني"
         add: "أضف"
       change_email:
         title: "غيّر البريد الإلكتروني"
         taken: "معذرةً، عنوان البريد غير متاح."
         error: "حدث عطل أثناء تغيير البريد الإلكتروني. ربما هناك من يستخدم هذا العنوان بالفعل؟"
         success: "لقد أرسلنا بريد إلكتروني إلى هذا العنوان. من فضلك اتّبع تعليمات التأكيد."
+        success_via_admin: "لقد أرسلنا بريدًا إلكترونيًا إلى هذا العنوان. سيحتاج المستخدم إلى اتباع تعليمات التأكيد الواردة في البريد الإلكتروني."
         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: "سيتم وضع صورة الخلفية في المنتصف بعرض 590px"
       change_card_background:
         title: "خلفية بطاقة العضو"
         instructions: "سيتم وضع صورة الخلفية في المنتصف بعرض 590px"
+      change_featured_topic:
+        title: "الموضوع المميّز"
+        instructions: "سيكون رابط هذا الموضوع على بطاقة المستخدم والملف الشخصي الخاصين بك."
       email:
         title: "البريد الإلكتروني"
+        primary: "البريد الإلكتروني الأساسي"
+        secondary: "البريد الإلكتروني الثانوي"
         primary_label: "الأساسي"
+        unconfirmed_label: "غير مؤكد"
         resend_label: "أعِد إرسال رسالة التأكيد"
         resending_label: "يُرسل..."
         resent_label: "أُرسل البريد"
         update_email: "غيّر البريد الإلكتروني"
+        set_primary: "تعيين البريد الإلكتروني الأساسي"
+        destroy: "إزالة البريد الإلكتروني"
         add_email: "أضِف بريدًا بديلًا"
+        no_secondary: "لا توجد رسائل في البريد الإلكتروني الثانوي"
         instructions: "لا يظهر للعموم أبدًا."
+        admin_note: "ملاحظة: يشير تغيير المستخدم الإداري للبريد الإلكتروني لمستخدم آخر غير إداري إلى أن المستخدم قد فقد الوصول إلى حساب البريد الإلكتروني الأصلي، لذلك سيتم إرسال بريد إلكتروني لإعادة تعيين كلمة المرور إلى عنوانه الجديد. لن يتغير البريد الإلكتروني للمستخدم حتى يكمل عملية إعادة تعيين كلمة المرور."
         ok: "سنرسل لك بريدا للتأكيد"
         required: "من فضلك أدخِل بريدًا إلكترونيًا"
         invalid: "من فضلك أدخل بريدا إلكترونيا صالحا"
@@ -1139,8 +1319,14 @@ ar:
           other: "سسنُراسلك على بريدك فقط في حال مضت %{count} دقيقة على آخر زيارة لك للموقع."
       associated_accounts:
         title: "الحسابات المرتبطة"
+        connect: "الاتصال"
         revoke: "تعطيل"
         cancel: "ألغِ"
+        not_connected: "(غير متصل)"
+        confirm_modal_title: "قم بتوصيل حساب %{provider}"
+        confirm_description:
+          account_specific: "سيتم استخدام حسابك %{provider} '%{account_description}' للمصادقة."
+          generic: "سيتم استخدام حساب %{provider} الخاص بك للمصادقة."
       name:
         title: "الاسم"
         instructions: "اسمك الكامل (اختياري)"
@@ -1167,6 +1353,9 @@ ar:
         any: "أي"
       password_confirmation:
         title: "أعِد كتابة كلمة السر"
+      invite_code:
+        title: "رمز الدعوة"
+        instructions: "تسجيل الحساب يتطلب رمز الدعوة"
       auth_tokens:
         title: "الأجهزة المستعملة حديثًا"
         details: "تفاصيل"
@@ -1175,8 +1364,10 @@ ar:
         show_all: "اعرض الكلّ (%{count})"
         show_few: "اعرض أقلّ"
         was_this_you: "أكان هذا أنت؟"
+        was_this_you_description: "إذا لم تكن أنت، ننصحك بتغيير كلمة المرور وتسجيل الخروج في كل مكان."
         browser_and_device: "‏%{browser} على %{device}"
         secure_account: "أمّن حسابي"
+        latest_post: "آخر مرة قمت بنشر…"
         device_location: '<span class="auth-token-device">%{device}</span> ‏&ndash;‏ <span title="IP: %{ip}">%{location}</span>'
         browser_active: '‏%{browser} | <span class="active">نشط الآن</span>'
         browser_last_seen: "‏%{browser} |‏ %{date}"
@@ -1192,8 +1383,13 @@ ar:
       enable_physical_keyboard: "فعّل دعم لوحة المفاتيح الفيزيائية على آي‌باد"
       text_size:
         title: "مقاس النصوص"
+        smallest: "أصغر"
+        smaller: "أصغر"
         normal: "عادي"
+        larger: "أكبر"
+        largest: "الأكبر"
       title_count_mode:
+        title: "يعرض عنوان صفحة الخلفية عدد من:"
         notifications: "الإخطارات الجديدة"
         contextual: "محتوى الصفحة الجديد"
       like_notification_frequency:
@@ -1246,8 +1442,19 @@ ar:
         after_10_minutes: "بعد 10 دقائق"
       notification_level_when_replying: "إذا نشرت في موضوع ما، اجعله"
       invited:
-        search: "اكتب للبحث في الدعوات..."
         title: "الدعوات"
+        pending_tab: "قيد الانتظار"
+        pending_tab_with_count: "معلق (%{count})"
+        redeemed_tab: "محررة"
+        redeemed_tab_with_count: "(%{count}) محررة"
+        invited_via: "دعوة"
+        groups: "المجموعات"
+        topic: "موضوع"
+        expires_at: "تنتهي"
+        edit: "عدّل"
+        remove: "أزِل"
+        reinvited: "اعادة ارسال الدعوة"
+        search: "اكتب للبحث في الدعوات..."
         user: "المستخدمين المدعويين"
         none: "ما من دعوات لعرضها."
         truncated:
@@ -1258,39 +1465,33 @@ ar:
           many: "ترى الآن أوّل {count} دعوة فقط."
           other: "ترى الآن أوّل {count} دعوة فقط."
         redeemed: "دعوات محررة"
-        redeemed_tab: "محررة"
-        redeemed_tab_with_count: "(%{count}) محررة"
         redeemed_at: "محررة"
         pending: "دعوات قيد الإنتضار"
-        pending_tab: "قيد الانتظار"
-        pending_tab_with_count: "معلق (%{count})"
         topics_entered: " موضوعات شُوهِدت"
         posts_read_count: "منشورات قرات"
         expired: "الدعوة انتهت صلاحيتها "
-        rescind: "حذف"
-        rescinded: "الدعوة حذفت"
-        rescind_all: "أزِل الدعوات المنقضية"
-        rescinded_all: "أُزيلت كلّ الدعوات المنقضية!"
-        rescind_all_confirm: "أمتأكّد من إزالة كلّ الدعوات المنقضية؟"
-        reinvite: "اعادة ارسال الدعوة"
-        reinvite_all: "أعِد إرسال كلّ الدعوات"
+        remove_all: "أزِل الدعوات المنقضية"
+        removed_all: "أُزيلت كلّ الدعوات المنقضية!"
+        remove_all_confirm: "أمتأكّد من إزالة كلّ الدعوات المنقضية؟"
         reinvite_all_confirm: "أمتأكّد من إعادة إرسال كلّ الدعوات؟"
-        reinvited: "اعادة ارسال الدعوة"
-        reinvited_all: "أُعيد إرسال كلّ الدعوات!"
         time_read: "وقت القراءة"
         days_visited: "أيام الزيارة"
         account_age_days: "عمر الحساب بالأيام"
-        links_tab: "روابط"
-        link_created_at: "أُنشئ في"
-        link_groups: المجموعات
+        create: "دعوة"
+        generate_link: "إنشاء رابط دعوة"
+        link_generated: "إليك رابط الدعوة!"
         valid_for: "رابط الدعوة صالح للبريد الإلكترونيّ هذا فقط: %{email}"
+        single_user: "دعوة عن طريق البريد الإلكتروني"
+        multiple_user: "دعوة عن طريق الرابط"
         invite_link:
+          title: "رابط الدعوة"
           success: "وُلّد رابط الدعوة بنجاح!"
           error: "حدث عُطل أثناء توليد رابط الدعوة"
           max_redemptions_allowed_label: "كم شخصًا يمكنه التسجيل باستعمال هذا الرابط؟"
           expires_at: "متى ينقضي رابط الدعوة هذا؟"
         bulk_invite:
-          success: "رُفع الملف بنجاح. سيصلك إشعارا عبر رسالة عند اكتمال العملية."
+          none: "لا توجد دعوات لعرضها على هذه الصفحة."
+          text: "دعوة مجمعة"
           error: "معذرةً، يجب أن يكون الملف بنسق CSV."
       password:
         title: "كلمة السر"
@@ -1389,8 +1590,10 @@ ar:
         header_title: "الملف الشخصي والرسائل والعلامات والتفضيلات"
       title:
         title: "عنوان"
+        none: "(لا شيء)"
       primary_group:
         title: "المجموعة الأساسية"
+        none: "(لا شيء)"
       filters:
         all: "الكل"
       stream:
@@ -1420,8 +1623,8 @@ ar:
         fixed: "حمل الصفحة"
     modal:
       close: "أغلق"
+      dismiss_error: "تجاهل الخطأ"
     close: "اغلق"
-    assets_changed_confirm: "حُدث الموقع لتوّه. أتريد إنعاش الصفحة ورؤية أحدث إصدارة؟"
     logout: "خرجت بنجاح."
     refresh: "تحديث"
     home: "الصفحة الرئيسية"
@@ -1429,24 +1632,23 @@ ar:
       enabled: "هذا الموقع في وضع القراءة فقط. نأمل أن تواصل تصفّحه إلّا أن الردّ والإعجابات وغيرها من إعجابات ستكون معطّلة حاليًا."
       login_disabled: "تسجيل الدخول معطل في حال كان الموقع في وضع القراءة فقط."
       logout_disabled: "الخروج معطّل طالما الموقع بوضع القراءة فقط."
+    too_few_topics_and_posts_notice_MF: >-
+      لنبدأ المناقشة <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">!</a> هناك {currentTopics, plural, zero {} one {هو <strong>#</strong> الموضوع} two { <strong>#</strong> موضوعا} few { <strong>#</strong> موضوعا} many { <strong>#</strong> موضوعا} other { <strong>#</strong> موضوعا}} و {currentPosts, plural, one {<strong>#</strong> آخر} two {<strong>#</strong> وظيفة} few {<strong>#</strong> وظيفة} many {<strong>#</strong> وظيفة} other {<strong>#</strong> وظيفة}}. يحتاج الزوار إلى المزيد من القراءة والرد عليها - نوصي على الأقل {requiredTopics, plural, one {<strong>#</strong> الموضوع} two {<strong>#</strong> موضوعا} few {<strong>#</strong> موضوعا} many {<strong>#</strong> موضوعا} other {<strong>#</strong> موضوعا}} و {requiredPosts, plural, one {<strong>#</strong> آخر} two {<strong>#</strong> وظيفة} few {<strong>#</strong> وظيفة} many {<strong>#</strong> وظيفة} other {<strong>#</strong> وظيفة}}. فقط الموظفين يمكنهم رؤية هذه الرسالة.
     too_few_topics_notice_MF: >-
       هيًا بنا <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">لنبدأ نقاشًا!</a> هناك حاليًا {currentTopics, plural, zero {} one {موضوع <strong>واحد</strong>} two {موضوعين <strong>اثنين</strong>} few {<strong>#</strong> مواضيع} many {<strong>#</strong> موضوعًا} other {<strong>#</strong> موضوع}}. يحتاج الزوّار إلى أكثر لقراءته والردّ عليه، ولذلك ننصح بوجود {requiredTopics, plural, one {موضوع <strong>واحد</strong>} two {موضوعين <strong>اثنين</strong>} few {<strong>#</strong> مواضيع} many {<strong>#</strong> موضوعًا} other {<strong>#</strong> موضوع}} على الأقل. يرى طاقم الموقع فقط هذه الرسالة.
     too_few_posts_notice_MF: >-
       هيًا بنا <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">لنبدأ نقاشًا!</a> هناك حاليًا {currentPosts, plural, zero {} one {مشاركة <strong>واحدة</strong>} two {مشاركتين <strong>اثنتين</strong>} few {<strong>#</strong> مشاركات} many {<strong>#</strong> مشاركةً} other {<strong>#</strong> مشاركة}}. يحتاج الزوّار إلى أكثر لقراءتها والردّ عليها، ولذلك ننصح بوجود {requiredPosts, plural, one {مشاركة <strong>واحدة</strong>} two {مشاركتين <strong>اثنتين</strong>} few {<strong>#</strong> مشاركات} many {<strong>#</strong> مشاركةً} other {<strong>#</strong> مشاركة}} على الأقل. يرى طاقم الموقع فقط هذه الرسالة.
+    logs_error_rate_notice:
+      reached_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, zero {} one {# خطأ / ساعة} two {# أخطاء / ساعة} few {# أخطاء / ساعة} many {# أخطاء / ساعة} other {# أخطاء / ساعة}}</a> وصلت إلى حد إعداد الموقع {limit, plural, one {# خطأ / ساعة} two {# أخطاء / ساعة} few {# أخطاء / ساعة} many {# أخطاء / ساعة} other {# أخطاء / ساعة}}."
+      reached_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, zero {} one {# خطأ / دقيقة} two {# أخطاء / دقيقة} few {# أخطاء / دقيقة} many {# أخطاء / دقيقة} other {# أخطاء / دقيقة}}</a> وصلت إلى حد إعداد الموقع {limit, plural, one {# خطأ / دقيقة} two {# أخطاء / دقيقة} few {# أخطاء / دقيقة} many {# أخطاء / دقيقة} other {# أخطاء / دقيقة}}."
+      exceeded_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, zero {} one {# خطأ / ساعة} two {# أخطاء / ساعة} few {# أخطاء / ساعة} many {# أخطاء / ساعة} other {# أخطاء / ساعة}}</a> تجاوز حد إعداد الموقع {limit, plural, one {# خطأ / ساعة} two {# أخطاء / ساعة} few {# أخطاء / ساعة} many {# أخطاء / ساعة} other {# أخطاء / ساعة}}."
+      exceeded_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, zero {} one {# خطأ / دقيقة} two {# أخطاء / دقيقة} few {# أخطاء / دقيقة} many {# أخطاء / دقيقة} other {# أخطاء / دقيقة}}</a> تجاوز حد إعداد الموقع {limit, plural, one {# خطأ / دقيقة} two {# أخطاء / دقيقة} few {# أخطاء / دقيقة} many {# أخطاء / دقيقة} other {# أخطاء / دقيقة}}."
     learn_more: "اطّلع على المزيد..."
-    all_time: "المجموع"
-    all_time_desc: "عدد المواضيع المنشأة"
-    year: "عام"
-    year_desc: "المواضيع المكتوبة خلال 365 يوم الماضية"
-    month: "شهر"
-    month_desc: "المواضيع المكتوبة خلال 30 يوم الماضية"
-    week: "أسبوع"
-    week_desc: " المواضيع التي كتبت خلال 7 أيام الماضية"
-    day: "يوم"
     first_post: أوّل مشاركة
     mute: كتم
     unmute: إلغاء الكتم
     last_post: آخر مشاركة
+    local_time: "التوقيت المحلي"
     time_read: المقروءة
     time_read_recently: "حديثًا %{time_read}"
     time_read_tooltip: "إجمالي وقت القراءة هو %{time_read}"
@@ -1463,12 +1665,10 @@ ar:
       sign_up: "إنشاء حساب"
       hide_session: "ذكرني غدا"
       hide_forever: "لا شكرا"
-      hidden_for_session: "لا بأس، سأسلك غدًا. يمكنك دوما استخدام 'تسجيل الدخول' لإنشاء حساب ايضا."
+      intro: "مرحبا! يبدو أنك تستمتع بالمناقشة، لكنك لم تسجل للحصول على حساب جديد حتى الآن."
       value_prop: "حين تسجّل حسابًا نتذكّر بالضبط ما كنت تقرأه، فلا تخشَ من أن تعود ولا ترى ما كان أمامك البتّة. كما وستستلم الإخطارات (هنا وعبر البريد) متى ما ردّ أحدهم عليك. وطبعًا، يمكنك إبداء إعجابك بالمشاركات ومشاركة الجميع الشعور بالرفق. :heartpulse:"
     summary:
       enabled_description: "أنت تطالع ملخّصًا لهذا الموضوع، أي أكثر المنشورات الجديرة بالاهتمام حسب نظرة المجتمع."
-      description: "هناك <b>%{replyCount}</b> من الردود."
-      description_time: "هناك <b>%{replyCount}</b> من الردود، ووقت القراءة المتوقّع هو <b>%{readingTime} من الدّقائق</b>."
       enable: "لخّص هذا الموضوع"
       disable: "اعرض كلّ المشاركات"
     deleted_filter:
@@ -1478,6 +1678,7 @@ ar:
       disable: "اعرض المشاركات المحذوفة"
     private_message_info:
       title: "رسالة"
+      invite: "دعوة الآخرين..."
       edit: "أضِف أو أزِل..."
       remove: "أزِل..."
       add: "أضِف..."
@@ -1492,7 +1693,8 @@ ar:
     trust_level: "مستوى الثقة"
     search_hint: "اسم المستخدم أو البريد إلكتروني أو عنوان الـ IP"
     create_account:
-      title: "إنشاء حساب جديد"
+      header_title: "مرحبًا!"
+      disclaimer: "بالتسجيل، أنت توافق على <a href='%{privacy_link}' target='blank'>سياسة الخصوصية</a> و <a href='%{tos_link}' target='blank'>شروط الخدمة</a>."
       failed: "حدث خطب ما. قد يكون البريد الإلكتروني مسجّلًا بالفعل. جرّب رابط نسيان كلمة السر"
     forgot_password:
       title: "صفّر كلمة السر"
@@ -1511,23 +1713,41 @@ ar:
     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: "تسجيل دخول"
+      header_title: "أهلًا بك من جديد"
+      subheader_title: "لِج إلى حسابك"
       username: "اسم المستخدم"
       password: "كلمة السر"
+      second_factor_title: "الاستيثاق بخطوتين"
       second_factor_description: "من فضلك أدخِل رمز الاستيثاق من التطبيق:"
       second_factor_backup: "لِج باستعمال رمز احتياطي"
-      email_placeholder: "البريد الإلكتروني أو اسم المستخدم"
+      second_factor_backup_title: "النسخ الاحتياطي لـ الاستيثاق بعوامل عدة"
+      second_factor_backup_description: "الرجاء إدخال أحد الرموز الاحتياطية الخاصة بك:"
+      second_factor: "تسجيل الدخول باستخدام تطبيق Authenticator"
+      security_key_description: "عند تجهيز مفتاح الأمان المادي، اضغط على زر المصادقة باستخدام مفتاح الأمان أدناه."
+      security_key_alternative: "جرب طريقة أخرى"
+      security_key_authenticate: "المصادقة باستخدام مفتاح الأمان"
+      security_key_not_allowed_error: "انتهت مهلة عملية تسجيل مفتاح الأمان أو تم إلغاؤها."
+      security_key_no_matching_credential_error: "لا يمكن العثور على بيانات اعتماد مطابقة في مفتاح الأمان المقدم."
+      security_key_support_missing_error: "جهازك الحالي أو متصفحك لا يدعم استخدام مفاتيح الأمان. يرجى استخدام طريقة مختلفة."
       caps_lock_warning: "مفتاح Caps Lock مفعّل"
       error: "خطأ مجهول"
+      cookies_error: "يبدو أن ملفات تعريف الارتباط في متصفّحك معطلة. قد لا تكون قادراً على تسجيل الدخول دون تمكينهم أولاً."
       rate_limit: "رجاء انتظر قبل تسجيل دخول مرة أخرى."
       blank_username: "من فضلك أدخِل بريدك الإلكتروني أو اسم المستخدم."
       blank_username_or_password: "من فضلك أدخِل بريدك الإلكتروني أو اسم المستخدم، وكلمة السر."
       reset_password: "صفّر كلمة السر"
-      logging_in: "تسجيل دخول..."
+      logging_in: "تلج الآن..."
       or: "أو "
       authenticating: "يوثق..."
       awaiting_activation: "ما زال حسابك غير مفعّل، استخدم رابط نسيان كلمة المرور لإرسال بريد إلكتروني تفعيلي آخر."
@@ -1537,11 +1757,13 @@ ar:
       not_allowed_from_ip_address: "لا يمكنك الولوج من عنوان IP هذا."
       admin_not_allowed_from_ip_address: "لا يمكنك تسجيل دخول كمدير من عنوان IP هذا."
       resend_activation_email: "انقر هنا لإرسال رسالة التفعيل مرّة أخرى."
+      omniauth_disallow_totp: "فعّلت المصادقة بخطوتين على حسابك. من فضلك لِج باستعمال كلمة السر."
       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: "عليك تسجل الدخول لتغيير تفضيلاتك الشخصية."
       not_approved: "لم تتمّ الموافقة على حسابك بعد. سيصلك إشعار عبر البريد عندما تكون مستعدا لتسجيل الدخول."
@@ -1562,8 +1784,13 @@ ar:
         title: "عبر GitHub"
       discord:
         name: "دِسكورد"
+        title: "مع ديسكورد"
+      second_factor_toggle:
+        totp: "استخدام تطبيق مصادقة بدلاً من ذلك"
+        backup_code: "استخدام رمز النسخ الاحتياطي بدلاً من ذلك"
     invites:
       accept_title: "دعوة"
+      emoji: "رمز تعبيري مغلف"
       welcome_to: "مرحبًا بك في %{site_name}!"
       invited_by: "دعاك:"
       social_login_available: "يمكنك أيضًا الولوج عبر الشبكات الاجتماعية بهذا البريد."
@@ -1586,10 +1813,14 @@ ar:
       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:
@@ -1654,7 +1885,8 @@ ar:
       default: الإيموجي المخصّصة
     shared_drafts:
       title: "المسودّات المشتركة"
-      notice: "لا يظهر هذا الموضوع إلّا لمن يرى فئة <b>%{category}</b>."
+      destination_category: "وجهة التصنيف"
+      publish: "نشر المسودة المشتركة"
       confirm_publish: "أمتأكّد من نشر هذه المسودّة؟"
       publishing: "ينشر الموضوع..."
     composer:
@@ -1663,7 +1895,6 @@ ar:
       options: "خيارات"
       whisper: "همس"
       unlist: "غير مدرج"
-      blockquote_text: "اقتبس الفقرة"
       add_warning: "هذا تحذير رسمي."
       toggle_whisper: "تبديل الهمس"
       toggle_unlisted: "تبديل الغير مدرج"
@@ -1671,6 +1902,7 @@ ar:
       saved_local_draft_tip: "حُفظ محليا"
       similar_topics: "موضوعك يشابه..."
       drafts_offline: "مسودات محفوظة "
+      edit_conflict: "تعديل التعارض"
       group_mentioned_limit:
         zero: "<b>تحذير!</b> أشرت إلى <a href='%{group_link}'>%{group}</a>، ولكن في هذه المجموعة أعضاء أكثر من حدّ الإشارة الأقصى الذي ضبطته الإدارة، وهو لا مستخدمين. لن يُرسل أيّ إخطار لأحد."
         one: "<b>تحذير!</b> أشرت إلى <a href='%{group_link}'>%{group}</a>، ولكن في هذه المجموعة أعضاء أكثر من حدّ الإشارة الأقصى الذي ضبطته الإدارة، وهو مستخدم واحد. لن يُرسل أيّ إخطار لأحد."
@@ -1692,10 +1924,7 @@ ar:
       reference_topic_title: "ردّ: %{title}"
       error:
         title_missing: "العنوان مطلوب"
-        title_too_short: "العنوان يجب أن يكون علي الاقل %{min} حرف"
-        title_too_long: "العنوان يجب أن لا يزيد عن %{max} حرف"
         post_missing: "لا يمكن أن تكون المشاركة فارغة"
-        post_length: "المنشور يجب أن يكون علي الاقل %{min} حرف"
         try_like: "هل جرّبت نقر زر %{heart}؟"
         category_missing: "عليك اختيار فئة"
         tags_missing:
@@ -1705,18 +1934,21 @@ ar:
           few: "عليك اختيار %{count} وسوم على الأقلّ"
           many: "عليك اختيار %{count} وسمًا على الأقلّ"
           other: "عليك اختيار %{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_placeholder: "ما هو موضوع هذا النقاش في جملة واحدة مختصرة؟"
       title_or_link_placeholder: "اكتب عنوانًا أو ألصِق رابطًا هنا"
       edit_reason_placeholder: "ما سبب التعديل؟"
       topic_featured_link_placeholder: "ضع رابطاً يظهر مع العنوان"
@@ -1729,8 +1961,6 @@ ar:
       saved: "حُفظ!"
       saved_draft: "كنتَ تكتب مسودّة لمشاركة. انقر لمواصلتها."
       uploading: "يرفع..."
-      show_preview: "اعرض المعاينة &raquo;"
-      hide_preview: "&laquo; أخفِ المعاينة"
       quote_post_title: "اقتبِس المشاركة كاملةً"
       bold_label: "B"
       bold_title: "عريض"
@@ -1743,8 +1973,8 @@ ar:
       link_dialog_title: "أضِف الرابط"
       link_optional_text: "عنوان اختياري"
       link_url_placeholder: "ألصِق عنوانًا أو اكتب للبحث في المواضيع"
-      quote_title: "اقتباس فقرة"
-      quote_text: "اقتباس فقرة"
+      blockquote_title: "اقتبس الفقرة"
+      blockquote_text: "اقتبس الفقرة"
       code_title: "نصّ مُنسّق سابقًا"
       code_text: "اضف 4 مسافات اول السطر قبل النص المنسق"
       paste_code_text: "اكتب أو ألصِق الكود هنا"
@@ -1758,6 +1988,10 @@ ar:
       collapse: "صغّر لوحة الكتابة"
       open: "افتح لوحة الكتابة"
       abandon: "أغلِق لوحة الكتابة وأهمِل المسودّة"
+      enter_fullscreen: "لوحة الكتابة تملأ الشاشة"
+      exit_fullscreen: "الخروج من ملء الشاشة"
+      show_toolbar: "عرض شريط أدوات الكتابة"
+      hide_toolbar: "إخفاء شريط أدوات الكتابة"
       modal_ok: "حسنا"
       modal_cancel: "ألغِ"
       cant_send_pm: "معذرةً، لا يمكنك الإرسال إلى %{username}."
@@ -1767,12 +2001,37 @@ ar:
       admin_options_title: "إعدادات طاقم العمل الاختيارية لهذا الموضوع"
       composer_actions:
         reply: رد
+        draft: مسودة
         edit: عدّل
+        reply_to_post:
+          label: الرد على منشور من %{postUsername}
+          desc: الرد على مشاركة محددة
+        reply_as_new_topic:
+          label: الرد كموضوع مرتبط
+          desc: إنشاء موضوع جديد مرتبط بهذا الموضوع
+          confirm: لديك مسودة موضوع جديد تم حفظها، وسيتم استبدالها إذا أنشئت موضوع مرتبط.
+        reply_as_new_group_message:
+          label: الرد برسالة في مجموعة جديدة
+          desc: إنشاء رسالة خاصة جديدة مع نفس المستلمين
         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: "الرد دون تغيير تاريخ الرد الأخير"
+      reload: "إعادة تحميل"
+      ignore: "تجاهل"
     notifications:
       tooltip:
         regular:
@@ -1800,6 +2059,7 @@ ar:
       none: "تعذّر تحميل الإخطارات الآن."
       empty: "ما من إخطارات."
       post_approved: "حصلت مشاركتك على الموافقة"
+      reviewable_items: "البنود التي تحتاج إلى مراجعة"
       mentioned: "‏<span>⁨%{username}⁩</span> ‏%{description}"
       group_mentioned: "‏<span>⁨%{username}⁩</span> ‏%{description}"
       quoted: "‏<span>⁨%{username}⁩</span> ‏%{description}"
@@ -1808,6 +2068,14 @@ ar:
       posted: "‏<span>⁨%{username}⁩</span> ‏%{description}"
       edited: "‏<span>⁨%{username}⁩</span> ‏%{description}"
       liked: "‏<span>⁨%{username}⁩</span> ‏%{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        zero: "<span class='multi-user'>‏%{username} و%{username2} و%{count} آخرون</span> ‏%{description}"
+        one: "<span class='multi-user'>‏%{username} و%{username2} و%{count} آخرون</span> ‏%{description}"
+        two: "<span class='multi-user'>‏%{username} و%{username2} وشخصان آخران</span> ‏%{description}"
+        few: "<span class='multi-user'>‏%{username} و%{username2} و%{count} آخرون</span> ‏%{description}"
+        many: "<span class='multi-user'>‏%{username} و%{username2} و%{count} آخرون</span> ‏%{description}"
+        other: "<span class='multi-user'>‏%{username} و%{username2} و%{count} آخرون</span> ‏%{description}"
       liked_consolidated_description:
         zero: "لم تُعجبه أيّ مشاركة من مشاركاتك"
         one: "أعجبته مشاركة واحدة من مشاركاتك"
@@ -1832,6 +2100,8 @@ ar:
         few: "ثمّة %{count} طلبات عضوية إلى ”%{group_name}“"
         many: "ثمّة %{count} طلب عضوية إلى ”%{group_name}“"
         other: "ثمّة %{count} طلب عضوية إلى ”%{group_name}“"
+      reaction: "‏<span>⁨%{username}⁩</span> ‏%{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       group_message_summary:
         zero: "ما من رسائل في بريد %{group_name} الوارد"
         one: "في بريد %{group_name} الوارد رسالة واحدة"
@@ -1868,10 +2138,7 @@ ar:
       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: "يمكنك أيضا سحب وإفلات الصور أو لصقها في المحرر"
       uploading: "يرفع"
       select_file: "اختر ملفا"
@@ -1905,6 +2172,7 @@ ar:
       or_search_google: "او حاول البحث باستخدام google:"
       search_google: "حاول البحث باستخدام google:"
       search_google_button: "جوجل"
+      search_button: "البحث"
       context:
         user: "ابحث في منشورات @%{username}"
         category: "أبحث في قسم #%{category}"
@@ -1956,6 +2224,8 @@ ar:
             label: نُشرت
             before: قبل
             after: بعد
+        views:
+          label: المشاهدات
         min_views:
           placeholder: الأدنى
         max_views:
@@ -1985,6 +2255,7 @@ ar:
         change_category: "حدد القسم"
         close_topics: "إغلاق الموضوعات"
         archive_topics: "أرشفة الموضوعات"
+        move_messages_to_inbox: "انقلها إلى الوارد"
         notification_level: "الاشعارات"
         choose_new_category: "اختر القسم الجديد للموضوعات:"
         selected:
@@ -2007,8 +2278,6 @@ ar:
         bookmarks: "لا مواضيع معلّمة بعد."
         category: "ما من مواضيع في فئة ”%{category}“."
         top: "ما من مواضيع نشطة."
-        educate:
-          unread: '<p>تظهر المواضيع غير المقروءة هنا.</p><p>تكون المواضيع (مبدئيًا) غير مقروءة وتعرض أعداد <span class="badge new-posts badge-notification">1</span> غير مقروءة إن:</p><ul><li>كتبت الموضوع</li><li>رددت على موضوع</li><li>قرأت الموضوع لمدّة أربع دقائق فأكثر</li></ul><p>أو أنّك ضبطت الموضوع ليُراقب أو يُتابع عبر زرّ التحكّم بالإخطارات أسفل كلّ موضوع.</p><p>إن أردت تعديل هذا السلوك، فزُر <a href="%{userPrefsUrl}">تفضيلاتك</a>.</p>'
       bottom:
         latest: "ما من مواضيع أخرى حديثة."
         posted: "ما من مواضيع أخرى منشورة."
@@ -2016,6 +2285,7 @@ ar:
         new: "ما من مواضيع أخرى جديدة."
         unread: "ما من مواضيع أخرى غير مقروءة."
         category: "ما من مواضيع أخرى في فئة ”%{category}“."
+        tag: "ما من مواضيع أخرى في فئة ”%{tag}“."
         top: "ما من مواضيع أخرى نشطة."
         bookmarks: "ما من مواضيع أخرى عليها علامة."
     topic:
@@ -2104,7 +2374,6 @@ ar:
       read_more_in_category: "أتريد قراءة المزيد؟ تصفح المواضيع الأخرى في %{catLink} أو %{latestLink}."
       read_more: "أتريد قراءة المزيد؟ %{catLink} أو %{latestLink}."
       unread_indicator: "لم يقرأ أيّ عضو بعد آخر مشاركة في هذا الموضوع."
-      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 {}}"
       bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: تصفّح كلّ الفئات
       browse_all_tags: تصفّح كلّ الوسوم
@@ -2115,29 +2384,38 @@ ar:
       slow_mode_update:
         title: "الوضع البطيء"
         select: "لا يمكن للمستخدمين نشر المشاركات في هذا الموضوع إلا مرّة كلّ:"
+        save: "فعّل"
         remove: "عطّل"
+        hours: "الساعات:"
+        minutes: "الدقائق:"
+        seconds: "الثواني:"
         durations:
+          10_minutes: "10 دقيقة"
           15_minutes: "15 دقيقة"
+          30_minutes: "30 دقيقة"
+          45_minutes: "45 دقيقة"
           1_hour: "ساعة واحدة"
+          2_hours: "2 ساعة"
           4_hours: "4 ساعات"
-          1_day: "يوم واحد"
-          1_week: "أسبوع واحد"
-      slow_mode_notice:
-        duration: "عليك الانتظار %{duration} قبل المشاركة في هذا الموضوع"
+          8_hours: "8 ساعات"
+          12_hours: "12 ساعات"
+          24_hours: "24 ساعات"
       topic_status_update:
         save: "ضع مؤقت"
         num_of_hours: "عدد الساعات:"
         remove: "ازل المؤقت"
         publish_to: "انشر في:"
         when: "متى:"
+        time_frame_required: "الرجاء تحديد إطار زمني"
       auto_update_input:
+        none: "تحديد إطار زمني"
+        now: "الآن"
         later_today: "في وقت لاحق اليوم"
         tomorrow: "غداً"
         later_this_week: "في وقت لاحق هذا الاسبوع"
         this_weekend: "هذا الأسبوع"
         next_week: "الاسبوع القادم"
         next_month: "الشهر القادم"
-        one_year: "سنة واحدة"
         forever: "للأبد"
         pick_date_and_time: "اختر التاريخ والوقت"
         set_based_on_last_post: "أغلِقه حسب آخر مشاركة"
@@ -2151,19 +2429,23 @@ ar:
         title: "اغلق الموضوع مؤقتا"
       auto_close:
         title: "اغلق الموضوع بشكل تلقائي"
-        label: "اغلق الموضوع بشكل تلقائي بعد:"
         error: "من فضلك ادخل قيمة صالحة."
         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_close_after_last_post: "سيُغلق هذا الموضوع %{duration} بعد آخر ردّ فيه."
         auto_delete: "هذا الموضوع سوف يحذف تلقائيا %{timeLeft}."
+        auto_bump: "هذا الموضوع سوف يقطّع تلقائيا %{timeLeft}."
         auto_reminder: "سوف يتم تذكيرك بهذا الموضوع %{timeLeft}."
         auto_delete_replies: "تُحذف الردود على هذا الموضوع تلقائيًا بعد %{duration}."
       auto_close_title: "إعدادات الإغلاق الآلي"
@@ -2185,7 +2467,6 @@ ar:
         go: "اذهب"
         jump_bottom: "انتقل لآخر منشور"
         jump_prompt: "انتقل إلى..."
-        jump_prompt_of: "من %{count} منشورات"
         jump_prompt_long: "انتقل إلى..."
         jump_bottom_with_number: "انتقل إلى المشاركة رقم %{post_number}"
         jump_prompt_to_date: "إلى التاريخ"
@@ -2252,6 +2533,8 @@ ar:
         visible: "إضاف إلي القائمة"
         reset_read: "تصفير بيانات القراءة"
         make_public: "اجعل الموضوع للعموم"
+        make_private: "أنشئ رسالة خاصة"
+        reset_bump_date: "إعادة تعيين تاريخ التقطيع"
       feature:
         pin: "تثبيت الموضوع"
         unpin: "إلغاء تثبيت الموضوع"
@@ -2268,6 +2551,7 @@ ar:
         title: "مشاركة"
         extended_title: "شارِك رابطًا"
         help: "شارِك رابط هذا الموضوع"
+        invite_users: "دعوة"
       print:
         title: "اطبع"
         help: "افتح نسخة متوافقة مع الطابعة من هذا الموضوع"
@@ -2335,14 +2619,13 @@ ar:
         username_placeholder: "اسم المستخدم"
         action: "أرسل دعوة"
         help: "دعوة الآخرين إلى هذا الموضوع عبر البريد الإلكتروني أو الإشعارات"
-        to_forum: "سنُرسل بريد إلكترني يتيح لصديقك الانضمام مباشرةً بنقر رابط فيه، تسجيل الدخول غير مطلوب."
-        sso_enabled: "أدخِل اسم المستخدم لمَن تريد دعوته إلى هذا الموضوع."
+        discourse_connect_enabled: "أدخِل اسم المستخدم لمَن تريد دعوته إلى هذا الموضوع."
         to_topic_blank: "أدخِل اسم المستخدم (أو عنوان بريده) لمَن تريد دعوته إلى هذا الموضوع."
         to_topic_email: "لقد أدخلت عنوان بريد إلكترونيّ. سنرسل بريدً إلكترونياً يحتوي دعوة تتيح لصديقك الرّد مباشرة على هذا الموضوع."
         to_topic_username: "لقد أدخلت اسم مستخدم. سنرسل إشعارًا يحتوي رابطًا يدعوهم إلى هذا الموضوع."
         to_username: "أدخِل اسم المستخدم لمَن تريد دعوته. سنُرسل إليه إخطارًا بالرابط الذي يدعوه إلى هذا الموضوع."
         email_placeholder: "name@example.com"
-        success_email: "أرسلنا دعوة إلى <b>%{emailOrUsername}</b> بالبريد. سنُرسل إليك إخطارًا متى قَبِل الدعوة. طالِع لسان الدعوات في صفحة المستخدم عندك لتتابع دعواتك المُرسلة."
+        success_email: "أرسلنا دعوة إلى <b>%{invitee}</b> بالبريد. سنُرسل إليك إخطارًا متى قَبِل الدعوة. طالِع لسان الدعوات في صفحة المستخدم عندك لتتابع دعواتك المُرسلة."
         success_username: "دعونا هذا العضو للمشاركة في هذا الموضوع."
         error: "معذرةً، لم نستطع دعوة هذا الشخص. لربّما دعيته من قبل؟ (معدّل إرسال الدعوات محدود)"
         success_existing_email: "العضو ذو عنوان البريد الإلكتروني <b>%{emailOrUsername}</b> مسجل بالفعل. لقد قمنا بدعوتة للمشاركة بهذا الموضوع."
@@ -2357,10 +2640,13 @@ ar:
           other: "%{count} مشاركة"
         cancel: "ألغِ الترشيح"
       move_to:
+        title: "نقل إلى"
+        action: "نقل إلى"
         error: "حدث عُطل أثناء نقل المشاركات."
       split_topic:
         title: "نقل الى موضوع جديد"
         action: "نقل الى موضوع جديد"
+        topic_name: "عنوان موضوع جديد"
         radio_label: "موضوع جديد"
         error: "حدث عطل أثناء نقل المنشورات إلى موضوع جديد."
         instructions:
@@ -2374,6 +2660,7 @@ ar:
         title: "نقل الى موضوع موجود"
         action: "نقل الى موضوع موجود"
         error: "حدث عطل أثناء نقل المنشورات إلى الموضوع ذاك."
+        radio_label: "الموضوع الحالي"
         instructions:
           zero: "لم تحدّد أيّ مشاركات لنقلها إلى موضوع آخر."
           one: "من فضلك اختر الموضوع لنقل المشاركة هذه إليه."
@@ -2382,8 +2669,11 @@ ar:
           many: "من فضلك اختر الموضوع لنقل المشاركات ال‍ <b>%{count}</b> إليه."
           other: "من فضلك اختر الموضوع لنقل المشاركات ال‍ <b>%{count}</b> إليه."
       move_to_new_message:
+        title: "نقل إلى رسالة جديدة"
+        action: "نقل إلى رسالة جديدة"
         message_title: "عنوان الرسالة الجديدة"
         radio_label: "رسالة جديدة"
+        participants: "المشاركين"
         instructions:
           zero: "تُوشك على كتابة رسالة جديدة ولكنّك لم تحدّد أيّ مشاركة لضخّها بها."
           one: "تُوشك على كتابة رسالة جديدة وضخّها بالمشاركة التي حدّدتها."
@@ -2392,6 +2682,10 @@ ar:
           many: "تُوشك على كتابة رسالة جديدة وضخّها ب‍ <b>%{count}</b> مشاركة حدّدتها."
           other: "تُوشك على كتابة رسالة جديدة وضخّها ب‍ <b>%{count}</b> مشاركة حدّدتها."
       move_to_existing_message:
+        title: "الانتقال إلى الرسالة الموجودة"
+        action: "الانتقال إلى الرسالة الموجودة"
+        radio_label: "الرسالة الحالية"
+        participants: "المشاركين"
         instructions:
           zero: "لم تحدّد أيّ مشاركات لنقلها إلى رسالة أخرى."
           one: "من فضلك اختر الرسالة لنقل المشاركة هذه إليها."
@@ -2404,11 +2698,18 @@ ar:
         action: "ادمج المنشورات المحددة"
         error: "حدث عطل أثناء دمج المنشورات المحدّدة."
       publish_page:
+        title: "الصفحة المنشورة"
+        publish: "نشر"
+        description: "عندما يتم نشر موضوع كصفحة، يمكن مشاركة عنوان URL الرابط الخاص به وسيتم عرضه بتصميم مخصص."
+        slug: "عنوان الرابط"
+        public: "عامة"
         public_description: "يمكن للناس رؤية هذه الصفحة حتّى لو كان الموضوع المرتبط خاصًا."
         publish_url: "نُشرت صفحتك بتاريخ:"
         topic_published: "نُشر موضوعك بتاريخ:"
         preview_url: "ستُنشر صفحتك بتاريخ:"
         invalid_slug: "معذرةً، لا يمكنك نشر هذه الصفحة."
+        unpublish: "إلغاء النشر"
+        unpublished: "تم إلغاء نشر صفحتك ولم يعد الوصول إليها ممكنًا."
         publishing_settings: "إعدادات النشر"
       change_owner:
         title: "غيّر المالك"
@@ -2448,6 +2749,7 @@ ar:
           label: "حددها مع الردود عليها"
           title: "أضِف المشاركة وكلّ الردود عليها إلى التحديد"
         select_below:
+          label: "حدد +أسفل"
           title: "أضِف المشاركة وكلّ ما يليها إلى التحديد"
         delete: احذف المحدد
         cancel: ألغِ التحديد
@@ -2472,13 +2774,13 @@ ar:
       quote_share: "شارِك"
       edit_reason: "السبب:"
       post_number: "المنشور %{number}"
-      wiki_last_edited_on: "آخر تعديل على الـ wiki في "
-      last_edited_on: "آخر تعديل على المنشور في "
+      ignored: "محتوى تم تجاهله"
       reply_as_new_topic: "التعليق على الموضوع الاصلي"
       reply_as_new_private_message: "الرد في رسالة جديدة علي نفس المستلم"
       continue_discussion: "تكملة النقاش من %{postLink}:"
       follow_quote: "انتقل إلى المشاركة المقتبسة هنا"
       show_full: "عرض كامل المنشور"
+      show_hidden: "اعرض المحتوى الذي تم تجاهله."
       deleted_by_author:
         zero: "(سحب الكاتب مشاركته، وستُحذف خلال أقلّ من ساعة ما لم يُوضع عليها إشارة)"
         one: "(سحب الكاتب مشاركته، وستُحذف خلال ساعة واحدة ما لم يُوضع عليها إشارة)"
@@ -2507,6 +2809,7 @@ ar:
         few: "%{count} ردود"
         many: "%{count} ردًا"
         other: "%{count} ردّ"
+      has_replies_count: "%{count}"
       unknown_user: "(مستخدم مجهول أو محذوف)"
       has_likes_title:
         zero: "لم تُعجب هذه المشاركة أحد"
@@ -2523,6 +2826,7 @@ ar:
         few: "أعجبتك أنت و%{count} أشخاص هذه المشاركة"
         many: "أعجبتك أنت و%{count} شخصًا هذه المشاركة"
         other: "أعجبتك أنت و%{count} شخص هذه المشاركة"
+      in_reply_to: "تحميل المنشور الرئيسي"
       errors:
         create: "معذرةً، حدث عُطل أثناء إنشاء المشاركة. من فضلك أعِد المحاولة."
         edit: "عذرا، حدثت مشكلة اثناء تعديل منشورك. من فضلك حاول مجددا."
@@ -2540,17 +2844,6 @@ ar:
         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:
-        title: "أهمِل المسودّة"
-        confirm: "أمتأكّد من التخلي عن المسودّة التي كنت تكتبها؟"
-        no_value: "لا، أبقِها"
-        no_save_draft: "لا، احفظ المسودّة"
-        yes_value: "نعم، لا أريدها"
       via_email: "وصل هذا المنشور عبر البريد"
       via_auto_generated_email: "وصل هذا المنشور عبر بريد مولّد آلياً"
       whisper: "هذا المنشور سري خاص بالمشرفين"
@@ -2596,6 +2889,7 @@ ar:
         convert_to_moderator: "اجعل لون المنشور مميز"
         revert_to_regular: "اجعل لون المنشور عادي"
         rebake: "أعد بناء HTML"
+        publish_page: "الصفحة المنشورة"
         unhide: "إظهار"
         change_owner: "غير الكاتب"
         grant_badge: "منح شارة"
@@ -2609,6 +2903,10 @@ ar:
         delete_topic_confirm_modal_no: "لا، أبقِ الموضوع"
         delete_topic_error: "حدث عُطل أثناء حذف هذا الموضوع"
         delete_topic: "احذف الموضوع"
+        add_post_notice: "إضافة إشعار الموظفين"
+        change_post_notice: "تغيير إشعار الموظفين"
+        delete_post_notice: "حذف إشعار الموظفين"
+        remove_timer: "إزالة الموقت"
       actions:
         people:
           like:
@@ -2672,6 +2970,7 @@ ar:
           revert: "ارجع إلى المراجعة %{revision}"
           edit_wiki: "عدّل هذا الويكي"
           edit_post: "عدّل هذه المشاركة"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "اعرض النسخة المنسقة في عمود واحد مع تمييز الاسطر المضافة و المحذوفة"
@@ -2708,10 +3007,17 @@ ar:
           edit_bookmark:
             name: "حرّر العلامة"
             description: "حرّر اسم العلامة أو غيّر تاريخ التذكير ووقته"
+      filtered_replies:
+        viewing_posts_by: "عرض %{post_count} مشاركات بواسطة"
+        viewing_subset: "بعض الردود مطوية"
+        viewing_summary: "عرض موجز لهذا الموضوع"
+        post_number: "%{username}، نشر #%{post_number}"
+        show_all: "إظهار الكل"
     category:
       can: "قادر علي&hellip;"
       none: "(غير مصنف)"
       all: "كلّ الفئات"
+      choose: "التصنيف&hellip;"
       edit: "عدّل"
       edit_dialog_title: "حرّر: %{categoryName}"
       view: "أظهار المواضيع في القسم"
@@ -2723,8 +3029,14 @@ ar:
       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: "تصنيف جديد"
@@ -2751,6 +3063,17 @@ ar:
       change_in_category_topic: "عدّل الوصف"
       already_used: "هذا اللون تم استخدامه سابقا في قسم آخر"
       security: "الأمن"
+      security_add_group: "إضافة مجموعة"
+      permissions:
+        group: "مجموعة"
+        see: "شاهد"
+        reply: "الرد"
+        create: "إنشاء"
+        no_groups_selected: "لم تُمنح أي مجموعات إمكانية الوصول؛ وسيكون هذا التصنيف مرئي فقط للمشرفين."
+        everyone_has_access: 'هذه التصنيف عام، يمكن للجميع أن مشاهدة، الردود، وإنشاء المشاركات. لتقييد الأذونات، قم بإزالة واحد أو أكثر من الأذونات الممنوحة "الجميع" للمجموعة.'
+        toggle_reply: "تبديل أذونات الرد"
+        toggle_full: "تبديل اذونات الإنشاء"
+        inherited: 'هذا الإذن موروث من "الجميع"'
       special_warning: "تحذير: هذا القسم هو قسم اصلي إعدادات الحماية له لا يمكن تعديلها. إذا لم تكن تريد استخدام هذا القسم، قم بحذفة بدلا من تطويعة لأغراض اخري."
       uncategorized_security_warning: "هذه فئة خاصة إذ تهدف لجمع المواضيع التي ليس لها فئات فيها، ولا يمكنك ضبط إعدادات الحماية عليها."
       uncategorized_general_warning: 'هذه فئة خاصة إذ تُستعمل كفئة مبدئية للمواضيع الجديدة التي لم يُحدّد لها فئة. إن أردت منع هذا السلوك وإجبار المستخدم على اختيار فئة، <a href="%{settingLink}">فمن فضلك عطّل الإعداد هنا</a>. إن أردت تغيير اسم الفئة أو وصفها، فانتقل إلى <a href="%{customizeLink}">التخصيص والمحتوى النصي</a>.'
@@ -2760,42 +3083,54 @@ ar:
       email_in_allow_strangers: "قبول بريد إلكتروني من زوار لا يملكون حسابات"
       email_in_disabled: "عُطّل إرسال المشاركات عبر البريد الإلكترونيّ من إعدادات الموقع. لتفعيل نشر المشاركات الجديدة عبر البريد،"
       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 بشكل إفتراضي"
       subcategory_list_style: "أسلوب عرض قائمة الأقسام الفرعية:"
       sort_order: "رتب قائمة الموضوعات حسب:"
       default_view: "قائمة الموضوعات الإفتراضية"
       default_top_period: "فترة الاكثر مشاهدة الافتراضية"
+      default_list_filter: "تصفية القائمة الافتراضية:"
       allow_badges_label: "السماح بالحصول على الأوسمة في هذا القسم"
       edit_permissions: "عدل التصاريح"
+      reviewable_by_group: "وبالإضافة إلى المشرفين، يمكن أيضا مراجعة محتوى هذا التصنيف عن طريق ما يلي:"
       review_group_name: "اسم المجموعة"
+      require_topic_approval: "يتطلب موافقة المشرف على جميع المواضيع الجديدة"
+      require_reply_approval: "يتطلب موافقة المشرف على جميع الردود الجديدة"
       this_year: "هذه السنة"
+      position: "الموضع في صفحة التصنيفات:"
       default_position: "المكان الافتراضي"
       position_disabled: "سوف تُعرض الاقسام بترتيب نشاطها. للتّحكّم بترتيب الأقسام في القائمة،"
       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: "ستتابع آليا كل موضوعات هذا القسم. ستصلك إشعارات إن أشار أحدهم إلى @اسمك أو رد عليك، وسيظهر عدّاد الردود الجديدة."
         regular:
           title: "منتظم"
           description: "ستستقبل إشعارًا إن أشار أحد إلى @اسمك أو ردّ عليك."
         muted:
           title: "مكتومة"
-          description: "لن يتم إشعارك بأي موضوعات جديدة في هذه الأقسام ولن يتم عرضها في قائمة الموضوعات المنشورة مؤخراً."
       search_priority:
         label: "أولوية البحث"
         options:
           normal: "عادي"
           ignore: "تجاهل"
+          very_low: "منخفض جداً"
+          low: "منخفض"
+          high: "مرتفع"
+          very_high: "عالي جدا"
       sort_options:
         default: "افترضى"
         likes: "الاعجابات"
@@ -2815,15 +3150,29 @@ ar:
         boxes_with_featured_topics: "مربعات مع الموضوعات المميزة"
       settings_sections:
         general: "عام"
+        moderation: "مشرف"
         appearance: "الظهور"
         email: "البريد الإلكتروني"
+      list_filters:
+        all: "جميع المواضيع"
+        none: "لا توجد تصنيفات فرعية"
     flagging:
       title: "شكرا لمساعدتك في إبقاء مجتمعنا متحضرا."
       action: "ابلغ عن المنشور"
+      take_action: "اتخذ اجراء..."
+      take_action_options:
+        default:
+          title: "اتخذ اجراء"
+          details: "الوصول إلى الحد الأقصى للبلاغات دون انتظار بلاغات أكثر من أعضاء الموقع."
+        suspend:
+          title: "عضو موقوف"
+          details: "الوصول إلى الحد الأعلى للبلاغات، و إيقاف حساب المستخدم"
+        silence:
+          title: "كتم المستخدم"
+          details: "الوصول إلى الحد الأعلى للبلاغات، وكتم المستخدم"
       notify_action: "رسالة"
       official_warning: "تحذير رسمي"
       delete_spammer: "احذف ناشر السبام"
-      delete_confirm_MF: "{posts, plural,\n zero {ليس للمستخدم أيّة مشاركات}\n other {}\n}\n{topics, plural,\n zero {\n {posts, plural,\n zero {أو مواضيع.}\n other {ليس للمستخدم أيّة مواضيع.}\n }\n }\n other {{posts, plural, zero{.} other{}}}\n}\nأنت على وشك\n{posts, plural,\n zero {{topics, plural, zero {} other {حذف}}}\n other {حذف}\n}\n{posts, plural,\n zero {}\n one {مشاركة واحدة}\n two {مشاركتين}\n few {# مشاركات}\n many {# مشاركة}\n other {# مشاركة}\n}\n{posts, plural, zero {} other {{topics, plural, zero {} other {و}}}}\n{topics, plural,\n zero {}\n one {موضوع واحد}\n two {موضوعين}\n few {# مواضيع}\n many {# موضوعًا}\n other {# موضوع}\n}\n{posts, plural,\n zero {{topics, plural, zero {} other {له، و}}}\n other {{topics, plural, zero {له، و} other {للمستخدم، و}}}\n}\nإزالة حسابه، ومنع التّسجيل من عنوان IP هذا <b>{ip_address}</b>، وإضافة عنوان البريد الإلكترونيّ <b>{email}</b> إلى قائمة منع دائم. أمتأكّد حقًّا من أنّ هذا المستخدم ناشر سخام؟"
       yes_delete_spammer: "نعم، احذف ناشر السخام"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(مخفي)"
@@ -2910,12 +3259,6 @@ ar:
         title: "هذا الموضوع رسالة شخصية"
         help: "هذا الموضوع رسالة شخصية"
     posts: "منشورات"
-    posts_likes_MF: |
-      {count, plural, zero {ليس في هذا الموضوع أي ردّ} one {في هذا الموضوع ردّ واحد} two {في هذا الموضوع ردّان} few {في هذا الموضوع # ردود} many {في هذا الموضوع # ردًا} other {في هذا الموضوع # ردّ}} {ratio, select,
-      low {ونسبة الإعجاب إلى المشاركة عالية}
-      med {ونسبة الإعجاب إلى المشاركة عالية جدًا}
-      high {ونسبة الإعجاب إلى المشاركة مهولة}
-      other {}}
     original_post: "المنشور الاصلي"
     views: "المشاهدات"
     views_lowercase:
@@ -2951,7 +3294,6 @@ ar:
       many: "المستخدمون"
       other: "المستخدمون"
     category_title: "قسم"
-    history: "تاريخ"
     changed_by: "الكاتب %{author}"
     raw_email:
       title: "البريد الإلكتروني الوارد"
@@ -3049,6 +3391,7 @@ ar:
         this_month: "خلال الشهر"
         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: "انشاء / رد / مشاهدة"
@@ -3056,9 +3399,18 @@ ar:
       readonly: "مشاهدة"
     lightbox:
       download: "تحميل"
+      previous: "السابق (مفتاح السهم الأيسر)"
+      next: "التالي (مفتاح السهم الأيمن)"
+      counter: "%curr% من %total%"
+      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: "الانتقال إلى"
@@ -3095,11 +3447,21 @@ ar:
         dismiss_topics: "%{shortcut} تجاهل الموضوعات"
         log_out: "%{shortcut} الخروج"
       composing:
+        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: "إجراءات"
@@ -3121,9 +3483,12 @@ ar:
         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:
         zero: "لم تُمنح هذه الشارة أيّ مرة"
@@ -3159,6 +3524,8 @@ ar:
         many: "مُنحت لِ‍ %{count}."
         other: "مُنحت لِ‍ %{count}."
       select_badge_for_title: اختر شارة لتستخدمها كلقب لك.
+      none: "(لا شيء)"
+      successfully_granted: "تم منح %{badge} بنجاح لـ %{username}"
       badge_grouping:
         getting_started:
           name: الأساسيات
@@ -3172,11 +3539,17 @@ ar:
           name: النشر
     tagging:
       all_tags: "كلّ الوسوم"
+      other_tags: "وسوم أخرى"
       selector_all_tags: "كلّ الوسوم"
       selector_no_tags: "ما من وسوم"
       changed: "الأوسمة المعدلة:"
       tags: "الوسوم"
       choose_for_topic: "الوسوم الاختيارية"
+      info: "معلومات"
+      default_info: "هذ الوسم ليس مقصورًا على أي تصنيف، وليس له مرادفات."
+      category_restricted: "هذه الوسم مقيد بالتصنيفات التي ليس لديك الصلاحية للوصول إليها."
+      synonyms: "مرادفات"
+      synonyms_description: "عند استخدام الأوسمة التالية، سيتم استبدالها بـ <b>%{base_tag_name}</b>."
       tag_groups_info:
         zero: "ينتمي هذا الوسم إلى المجموعة: %{tag_groups}."
         one: 'ينتمي هذا الوسم إلى المجموعة: %{tag_groups}.'
@@ -3201,6 +3574,7 @@ ar:
         few: "ستتغيّر الأماكن التي تستعمل هذه الوسوم فتستعمل الوسم <b>%{tag_name}</b> بدلها. أمتأكّد من إجراء هذا التغيير؟"
         many: "ستتغيّر الأماكن التي تستعمل هذه الوسوم فتستعمل الوسم <b>%{tag_name}</b> بدلها. أمتأكّد من إجراء هذا التغيير؟"
         other: "ستتغيّر الأماكن التي تستعمل هذه الوسوم فتستعمل الوسم <b>%{tag_name}</b> بدلها. أمتأكّد من إجراء هذا التغيير؟"
+      add_synonyms_failed: "تعذر إضافة الأوسمة التالية كمرادفات: <b>%{tag_names}</b>. تأكد من عدم وجود مرادفات لديهم وليست مرادفات لأوسمة أخرى."
       remove_synonym: "أزِل المترادف"
       delete_synonym_confirm: 'أمتأكّد من حذف المترادف ”%{tag_name}“؟'
       delete_tag: "احذف الوسم"
@@ -3226,6 +3600,9 @@ ar:
       sort_by_name: "الاسم"
       manage_groups: "أدِر مجموعات الوسوم"
       manage_groups_description: "أنشئ مجموعات لتنظيم الأوسمة"
+      upload: "رفع الأوسمة"
+      upload_description: "قم بتحميل ملف csv لإنشاء أوسمة مجمعة"
+      upload_instructions: "واحد لكل سطر، اختياريًا مع مجموعة الأوسمة بهذا التنسيق 'tag_name,tag_group'."
       upload_successful: "نجح رفع الوسوم"
       delete_unused_confirmation:
         zero: "لن يُحذف أيّ وسم."
@@ -3243,6 +3620,7 @@ ar:
         other: "%{tags} و%{count} وسم آخر"
       delete_no_unused_tags: "ما من وسوم غير مستعملة."
       delete_unused: "احذف الوسوم غير المستعملة"
+      delete_unused_description: "احذف جميع الأوسمة غير المرتبطة بأي مواضيع أو رسائل خاصة"
       cancel_delete_unused: "ألغِ"
       filters:
         without_category: "مواضيع %{tag} %{filter}"
@@ -3252,15 +3630,19 @@ ar:
       notifications:
         watching:
           title: "مُراقب"
+          description: "ستراقب آليا كل المواضيع التي تستخدم هذه الأوسمة. ستصلك إشعارات بالمنشورات و الموضوعات الجديدة، وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
         watching_first_post:
           title: "يُراقب فيه أول مشاركة"
+          description: "سيتم إعلامك بمواضيع جديدة في هذا الوسم ولكن ليس الرد على الموضوعات."
         tracking:
           title: "مُتابع"
+          description: "ستتابع آليا كل الموضوعات التي تستخدم هذه الأوسمة. وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
         regular:
           title: "موضوع عادي"
           description: "ستستقبل إشعارًا إن أشار أحد إلى @اسمك أو ردّ على مشاركتك."
         muted:
           title: "مكتوم"
+          description: "لن يتم إخطارك بأي شيء يتعلق بالمواضيع الجديدة بهذ الوسم، ولن تظهر في علامة التبويب \"غير المقروءة\"."
       groups:
         title: "مجموعات الوسوم"
         about: "ضَع الوسوم في مجموعات ليسهُل عليك إدارتها."
@@ -3274,6 +3656,7 @@ ar:
         save: "حفظ"
         delete: "حذف"
         confirm_delete: "أمتأكد من حذف مجموعة الوسوم هذه؟"
+        everyone_can_use: "يمكن للجميع استخدام الأوسمة"
         usable_only_by_groups: "يمكن للعموم رؤية الوسوم ولكن فقط المجموعات الآتية يمكنها استعمالها"
         visible_only_to_groups: "لا تظهر الوسوم إلا للمجموعات الآتية"
       topics:
@@ -3286,15 +3669,29 @@ ar:
           bookmarks: "لم تقم بوضع علامات مرجعية علي اي موضوع بعد."
           top: "ما من مواضيع نشطة."
     invite:
+      custom_message: "اجعل دعوتك شخصية أكثر قليلاً عن طريق كتابة <a href>رسالة مخصصة</a>."
       custom_message_placeholder: "ادخل رسالتك المخصصة"
       custom_message_template_forum: "مرحبا. عليك الانضمام إلى هذا المجتمع!"
       custom_message_template_topic: "مرحبا. أظن أن هذا الموضوع سيسعدك!"
+    forced_anonymous: "بسبب التحميل الشديد، يتم عرض هذا بشكل مؤقت للجميع كما يراه مستخدم سجّل الخروج."
     footer_nav:
       back: "الى الخلف"
+      forward: "إعادة"
       share: "شاركها"
       dismiss: "تجاهل"
     safe_mode:
       enabled: "الوضع الآمن مفعّل، لتخرج منه أغلق نافذة المتصفّح هذه"
+    image_removed: "(تمت إزالة الصورة)"
+    do_not_disturb:
+      title: "فعّل وضع ”عدم الإزعاج“ لمدّة..."
+      label: "عدم الإزعاج"
+      remaining: "%{remaining} متبقي"
+      options:
+        half_hour: "30 دقيقة"
+        one_hour: "1 ساعة"
+        two_hours: "2 ساعة"
+        tomorrow: "حتى الغد"
+        custom: "مخصص"
   admin_js:
     type_to_filter: "اكتب للتّرشيح..."
     admin:
@@ -3303,11 +3700,14 @@ ar:
       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: "يتوفّر تحديث لمشكلات حرجة."
@@ -3318,6 +3718,9 @@ ar:
         version_check_pending: "يبدو أنك قمت بتحديث الموقع مؤخرا. رائع!"
         installed_version: "المثبتة"
         latest_version: "الحديثة"
+        problems_found: "بعض النصائح بناءً على إعدادات موقعك الحالي"
+        new_features:
+          dismiss: "تجاهل"
         last_checked: "آخر فحص"
         refresh_problems: "تحديث"
         no_problems: "لا مشاكل."
@@ -3343,6 +3746,7 @@ ar:
         show_traffic_report: "عرض تقرير مرور مفصل"
         whats_new_in_discourse: ما جديد دِسكورس؟
         general_tab: "عام"
+        moderation_tab: "مشرف"
         security_tab: "الأمن"
         report_filter_any: "أي"
         too_many_requests: لقد نفّذت هذا الإجراء مرّات كثيرة جدًا. من فضلك انتظر قليلًا قبل معاودة المحاولة.
@@ -3358,6 +3762,9 @@ ar:
           view_table: "جدول"
           view_graph: "رسم بياني"
           refresh_report: "تحديث التقرير "
+          daily: اليومية
+          monthly: الشهرية
+          weekly: الأسبوعية
           groups: "كل المجموعات"
           disabled: "هذا التقرير معطّل"
           total: "مجموع الوقت الكلي"
@@ -3383,10 +3790,6 @@ ar:
             available: "اسم المجموعة متاح"
             not_available: "اسم المجموعة غير متاح"
             blank: "يجب تحديد اسم للمجموعة"
-        bulk_add:
-          title: "أضافة متعددة للمجموعة"
-          complete_users_not_added: "هؤلاء الأعضاء لن يتم اضافتهم (تأكد من أن لديهم حسابات)"
-          paste: "الصق قائمة بأسماء الاعضاء أو عناوين البريد الإلكتروني، واحد لكل سطر:"
         manage:
           interaction:
             email: البريد الإلكتروني
@@ -3429,6 +3832,7 @@ ar:
         user: "الاعضاء"
         title: "API"
         created: أُنشئ في
+        updated: تاريخ التحديث
         generate: "إنشاء"
         revoke: "الغاء"
         all_users: "جميع الاعضاء"
@@ -3445,6 +3849,8 @@ ar:
         new_key: مفتاح API جديد
         revoked: سُحب
         continue: استمر
+        scopes:
+          action: اجراء
       web_hooks:
         title: "Webhooks"
         none: "لا يوجد Webhooks حاليا."
@@ -3459,7 +3865,6 @@ ar:
         go_back: "العودة إلي القائمة"
         payload_url: "الURL المستهدف"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "يبدو أنك تحاول إعداد الwebhook علي عنوان محلي. ارسال الاحداث إلي عنوان محلي قد يؤدي إلى حدوث آثار جانبية أو سلوكيات غير متوقعة. استمر؟"
         secret_invalid: "يجب ألا يحتوي الرمز السري على أية فواصل."
         secret_too_short: "يجب أن يكون الرمز السري 12 حرفا على الأقل."
         secret_placeholder: "كلمة اختيارية، تستخدم لتوليد توقيع إلكتروني"
@@ -3601,6 +4006,7 @@ ar:
         save: "احفظ"
         new: "جديد"
         new_style: "واجهة جديدة"
+        install: "ثبّت"
         delete: "أحذف"
         delete_confirm: 'أمتأكّد من حذف ”%{theme_name}“؟'
         color: "لون"
@@ -3710,10 +4116,10 @@ ar:
             text: "تعريفات الألوان"
             title: "أدخِل تعريفات الألوان المخصّصة (للمستخدمين المتقدّمين فقط)"
           head_tag:
-            text: "</head>"
+            text: "</‎head>"
             title: "رقْم HTML الذي سيُدرج قبل وسم ‎</head>‎"
           body_tag:
-            text: "</body>"
+            text: "</‎body>"
             title: "رقْم HTML الذي سيُدرج قبل وسم ‎</body>‎"
         colors:
           select_base:
@@ -3952,26 +4358,18 @@ ar:
         title: "مراقب الكلمات"
         search: "بحث"
         clear_filter: "امسح"
-        show_words: "اظهر الكلمات"
         download: حمل
         clear_all: إلغ إختيار الكل
-        word_count:
-          zero: "ما من كلمات"
-          one: "كلمة واحدة"
-          two: "كلمتان"
-          few: "%{count} كلمات"
-          many: "%{count} كلمة"
-          other: "%{count} كلمة"
         actions:
           block: "احجب"
           censor: "راقب (ضلل)"
           require_approval: "يحتاج لموافقة"
           flag: "علم"
+          replace: "غير"
         action_descriptions:
           require_approval: "المنشورات التي تحتوي على هذه الكلمات تحتاج الى موافقة الطاقم قبل ان يتم رؤيتهم."
           flag: "اسمح للمنشورات التي تحتوي على هذه الكلمات, ولكن علمهم كـ غير مناسب لكي يتمكن المشرف من مراجعتهم."
         form:
-          label: "كلمة جديدة:"
           placeholder_regexp: "تعبير اعتيادي"
           add: "اضف"
           success: "نجاح"
@@ -3996,6 +4394,7 @@ ar:
           active: "النشطون"
           staff: "الطاقم"
           suspended: "موقوف"
+          staged: "مهيأ"
         approved: "موافقة؟"
         titles:
           active: "الأعضاء النشطون"
@@ -4014,6 +4413,8 @@ ar:
         check_email:
           title: "اكشف عنوان البريد الإلكتروني لهذا العضو"
           text: "إظهار"
+        check_sso:
+          text: "إظهار"
       user:
         suspend_failed: "حدث خطب ما أثناء إيقاف هذا المستخدم %{error}"
         unsuspend_failed: "حدث خطب ما أثناء إلغاء إيقاف هذا المستخدم %{error}"
@@ -4021,10 +4422,12 @@ ar:
         suspend_reason_label: "لماذا هل أنت عالق؟ هذا النص <b>سيكون ظاهراً للكل</b> على صفحة تعريف هذا العضو, وسيكون ظاهراً للعضو عندما يحاول تسجل الدخول. احفظها قصيرة."
         suspend_reason_hidden_label: "لماذا انت موقوف؟ هذا النص سيظهر للعضو حين يحاول الولوج. اجعله قصيراً."
         suspend_reason: "سبب"
+        suspend_reason_title: "سبب التوقيف"
         suspend_message: "رسالة بريد الكتروني"
         suspend_message_placeholder: "اختياري. وفر المزيد من المعلومات حول التوقيف و سيتم ارساله عبر البريد الالكتروني الى العضو."
         suspended_by: "محظور من قبل"
         silence_reason: "السبب"
+        silence_modal_title: "كتم المستخدم"
         silence_message: "رسالة بريد الكتروني"
         suspended_until: "(حتى %{until})"
         cant_suspend: "لا يمكن ايقاف هذا العضو"
@@ -4034,7 +4437,6 @@ ar:
         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 {و# موضوع}}. أمتأكد؟"
         silence: "صامت"
         silenced: "صامت؟"
         moderator: "مراقب؟"
@@ -4177,11 +4579,10 @@ ar:
           on_grace_period: "حاليا في فترة مهلة ترقية، لن يتم تخفيض رتب."
           locked_will_not_be_promoted: "مستوى الثفة هذا لن يتم الترقية له نهائيا"
           locked_will_not_be_demoted: "مستوى الثفة هذا لن يتم الخفض له نهائيا"
-        sso:
-          title: "الدخول الموحد"
+        discourse_connect:
           external_id: "ID الخارجي"
-          external_username: "أسم المستخدم"
-          external_name: "الأسم"
+          external_username: "اسم المستخدم"
+          external_name: "الاسم"
           external_email: "البريد الإلكتروني"
           external_avatar_url: "رابط الملف الشخصي"
       user_fields:
@@ -4377,6 +4778,9 @@ ar:
         embed_by_username: "اسم العضو للموضوع المنشأ"
         embed_post_limit: "أقصى عدد مشاركات مضمنة"
         embed_truncate: "بتر المشاركات المضمنة"
+        allowed_embed_selectors: "منتقي CSS للعناصر التي تسمح في التضمينات."
+        blocked_embed_selectors: "منتقي CSS للعناصر التي حذفت من التضمينات."
+        allowed_embed_classnames: "اسماء اصناف المظاهر الجمالية المسموح بها"
         save: "أحفظ الإعدادات المضمنة"
       permalink:
         title: "الرابط الثابت"
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index f01bed8eb8..8dfff29d16 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -31,6 +31,11 @@ be:
       wrap_ago: "%{date} таму"
       tiny:
         half_a_minute: "< 1 хв"
+        less_than_x_minutes:
+          one: "< %{count}хв"
+          few: "< %{count}хв"
+          many: "< %{count}хв"
+          other: "< %{count}хв"
         x_minutes:
           one: "%{count}хв"
           few: "%{count}хв"
@@ -143,10 +148,9 @@ be:
       stats: "статыстыка"
       our_admins: "адміны"
       our_moderators: "мадэратары"
+      moderators: "мадэратары"
       stat:
         all_time: "ўвесь час"
-        last_7_days: "Апошнія 7"
-        last_30_days: "Апошнія 30"
       like_count: "перавагі"
       topic_count: "Тэмы"
       post_count: "Паведамленні"
@@ -161,16 +165,15 @@ be:
         bookmark: "Націсніце каб закласці першы паведамленне ў гэтай тэме"
         unbookmark: "Націсніце каб выдаліць усе закладкі ў гэтай тэме"
     bookmarks:
+      not_bookmarked: "закладка гэты пост"
       remove: "выдаліць закладку"
       save: "Захаваць"
+      no_user_bookmarks: "У вас няма закладак паведамлення; закладкі дазваляюць хутка спасылацца на канкрэтныя пасады."
+      auto_delete_preference:
+        never: "ніколі"
       search: "Пошук"
-      reminders:
-        tomorrow: "заўтра"
     drafts:
       remove: "выдаліць"
-      abandon:
-        yes_value: "Так, пакінуць"
-        no_value: "Не, пачакайце"
     preview: "папярэдні прагляд"
     cancel: "адмена"
     save: "Захаваць змены"
@@ -197,6 +200,7 @@ be:
         total: "агульны"
       delete: "Выдаліць"
       settings:
+        saved: "Захавана"
         save_changes: "Захаваць"
         title: "Налады"
       moderation_history: "Гісторыя мадэрацыі"
@@ -208,10 +212,12 @@ be:
         username: "Імя карыстальніка"
         email: "Электронная пошта"
         name: "Імя"
+        reject_reason: "прычына"
       topics:
         topic: "Тэма"
         reviewable_count: "падлічваць"
         deleted: "[Тэма выдаленая]"
+        details: "дэталі"
       edit: "Рэдагаваць"
       save: "Захаваць"
       cancel: "Адмяніць"
@@ -229,14 +235,27 @@ be:
       statuses:
         pending:
           title: "чакаецца"
+        approved:
+          title: "Адобрана"
         rejected:
           title: "адхілена"
       types:
         reviewable_user:
           title: "Карыстальнік"
+        reviewable_post:
+          title: "Паведамленне"
       approval:
         title: "Паведамленне мае патрэбу ў падцверджанні"
         ok: "Добра"
+      example_username: "username"
+    relative_time_picker:
+      days:
+        one: "дзень"
+        few: "дзён"
+        many: "дзён"
+        other: "дзён"
+    time_shortcut:
+      tomorrow: "заўтра"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'> %{user} <"
       you_posted_topic: "<a href='%{userUrl}'> Вы <"
@@ -252,6 +271,7 @@ be:
       sent_by_user: "Адпраўлена карыстальнікам <a href='%{userUrl}'> %{user} <"
       sent_by_you: "Адпраўлена <a href='%{userUrl}'> Вамі <"
     directory:
+      username: "Імя карыстальніка"
       filter_name: "фільтраваць па імені карыстальніка"
       title: "Карыстальнікі"
       likes_received: "атрымана"
@@ -293,8 +313,16 @@ be:
           credentials:
             username: "Імя карыстальніка"
             password: "Пароль"
+          settings:
+            title: "Налады"
+          mailboxes:
+            disabled: "адключана"
         membership:
           access: доступ
+        categories:
+          title: Катэгорыі
+        tags:
+          title: Цэтлікі
         logs:
           title: "Логі"
           when: "калі"
@@ -303,6 +331,8 @@ be:
           details: "дэталі"
           from: "ад"
           to: "да"
+      permissions:
+        title: "дазволу"
       add: "Дадаць"
       request: "запыт"
       message: "паведамленне"
@@ -372,9 +402,12 @@ be:
       posts: "Паведамленні"
       topics: "Тэмы"
       latest: "Апошнія"
-      latest_by: "апошнія па"
       toggle_ordering: "паказаць"
       subcategories: "Падкатэгорыі"
+      topic_stat_unit:
+        week: "тыдзень"
+        month: "месяц"
+      n_more: "Катэгорыі (%{count} і больш)..."
     ip_lookup:
       title: Пошук IP адрасы
       hostname: Імя хосту
@@ -405,7 +438,10 @@ be:
         ignore_duration_username: "Імя карыстальніка"
         ignore_duration_save: "ігнараваць"
         mute_option: "ігнараваць"
+      notification_schedule:
+        to: "да"
       activity_stream: "Актыўнасць"
+      read: "прачытаныя"
       preferences: "Налады"
       feature_topic_on_profile:
         save: "Захаваць"
@@ -423,17 +459,22 @@ be:
         disable: "адключыць апавяшчэння"
         enable: "ўключыць абвесткі"
       dismiss_notifications_tooltip: "Адзначыць ўсё апавяшчэнні як прачытаныя"
+      color_schemes:
+        undo: "скінуць"
+        regular: "звычайны"
       tag_settings: "Цэтлікі"
       watched_tags_instructions: "Вы будзеце аўтаматычна адсочваць усе новыя тэмы па гэтых цэтліках. Таксама вам будуць прыходзіць паведамленні пра новыя пасты і тэмы, а падлік непрачытаных і новых пастоў адлюструюцца побач з тэмамі."
       tracked_tags_instructions: "Вы будзеце аўтаматычна адсочваць усе тэмы па гэтых цэтліках. Падлік непрачытаных і новых пастоў побач адлюструюцца побач з тэмамі."
       muted_tags: "ігнаруемай"
       muted_tags_instructions: "Вы ня будзеце атрымоўваць паведамленні аб новых тэмах па гэтых цэтліках і яны не адлюструюцца ў спісе апошніх тэмаў."
       muted_categories: "ігнаруемай"
+      regular_categories: "звычайны"
       unread_message_count: "Паведамленні"
       admin_delete: "Выдаліць"
       users: "Карыстальнікі"
       muted_users: "ігнаруемай"
       apps: "Аппы"
+      api_approved: "Адобрана:"
       theme: "тэма"
       messages:
         all: "усе"
@@ -447,6 +488,7 @@ be:
         tags: "Тэгі"
       preferences_nav:
         account: "Аккаўнт"
+        security: "Бяспека"
         profile: "Профіль"
         emails: "Емейлы"
         notifications: "Натыфікацыі"
@@ -571,25 +613,24 @@ be:
         after_5_minutes: "пасля 5 хвілін"
         after_10_minutes: "пасля 10 хвілін"
       invited:
-        search: "шукаць запрашэнні ..."
         title: "Запрашэнні"
+        pending_tab: "прынята......"
+        redeemed_tab: "прынята"
+        groups: "Групы"
+        topic: "Тэма"
+        edit: "Рэдагаваць"
+        remove: "выдаліць"
+        search: "шукаць запрашэнні ..."
         user: "запрошаны карыстальнік"
         redeemed: "Адазваныя запрашэнні"
-        redeemed_tab: "прынята"
         redeemed_at: "прынята"
         pending: "Няпрынятые запрашэнні"
-        pending_tab: "прынята......"
         topics_entered: "Тэмаў прагледжана"
         posts_read_count: "прачытана паведамленняў"
         expired: "Тэрмін дзеяння гэтага запрашэння мінуў."
-        rescind: "выдаліць"
-        rescinded: "запрашэнне удалено"
         time_read: "час чытання"
         days_visited: "дзён наведанае"
         account_age_days: "Ўзрост акаўнта ў днях"
-        links_tab: "Спасылкі"
-        link_created_at: "створаны"
-        link_groups: Групы
       password:
         title: "Пароль"
         too_short: "Пароль занадта кароткі."
@@ -606,6 +647,16 @@ be:
           few: "тэмаў створана"
           many: "тэмаў створана"
           other: "тэмаў створана"
+        likes_received:
+          one: "атрымана"
+          few: "атрымана"
+          many: "атрымана"
+          other: "атрымана"
+        bookmark_count:
+          one: "абранае"
+          few: "закладкі"
+          many: "закладкі"
+          other: "закладкі"
         more_topics: "Больш тэмаў"
         top_categories: "ТОП катэгорый"
         topics: "Тэмы"
@@ -649,18 +700,16 @@ be:
     read_only_mode:
       login_disabled: "Login is disabled while the site is in read only mode."
     learn_more: "даведацца больш ..."
-    year: "год"
-    year_desc: "тэмы, створаныя ў апошнія 365 дзён"
-    month: "месяц"
-    month_desc: "тэмы, створаныя ў апошнія 30 дзён"
-    week: "тыдзень"
-    week_desc: "тэмы, створаныя ў апошнія 7 дзён"
-    day: "дзень"
     first_post: першы паведамленне
     mute: Mute
     unmute: Unmute
     time_read: прачытаныя
     last_reply_lowercase: апошні адказ
+    replies_lowercase:
+      one: адказаць
+      few: адказы
+      many: адказы
+      other: адказы
     signup_cta:
       sign_up: "рэгістрацыя"
       hide_session: "Нагадаць мне заўтра"
@@ -683,7 +732,7 @@ be:
     trust_level: "ўзровень даверу"
     search_hint: "імя карыстальніка, email або IP-адрас"
     create_account:
-      title: "Стварыць новы акаўнт"
+      header_title: "жаданы!"
       failed: "Нешта пайшло не так; хутчэй за ўсё, гэтую электронную пошту ўжо зарэгістравана, паспрабуйце спасылкі Забыўся пароль"
     forgot_password:
       title: "Скід пароля"
@@ -694,11 +743,9 @@ be:
     email_login:
       confirm_title: Працягнуць да %{site_name}
     login:
-      title: "Увайсці"
       username: "Карыстальнік"
       password: "Пароль"
       second_factor_backup_description: "Калі ласка, увядзіце адзін з рэзервовых кодаў:"
-      email_placeholder: "электронная пошта ці імя карыстальніка"
       caps_lock_warning: "Caps Lock уключаны"
       error: "Невядомая памылка"
       reset_password: "скінуць пароль"
@@ -733,6 +780,7 @@ be:
     invites:
       welcome_to: "Сардэчна запрашаем да сайта %{site_name}!"
       name_label: "Назва"
+      password_label: "Пароль"
     password_reset:
       continue: "Працягваюць% {site_name}"
     emoji_set:
@@ -755,16 +803,12 @@ be:
     composer:
       more_emoji: "яшчэ ..."
       options: "Налады"
-      blockquote_text: "цытата"
       posting_not_on_topic: "На якую тэму Вы хочаце адказаць?"
       saved_local_draft_tip: "захавана лакальна"
       similar_topics: "Ваша тэма падобная на ..."
       drafts_offline: "чарнавікі у афлайне"
       error:
         title_missing: "Загаловак неабходна"
-        title_too_short: "Загаловак павінен быць мінімум %{min} сімвалаў"
-        title_too_long: "Загаловак не можа быць менш, чым %{max} сімвалаў"
-        post_length: "Найменшы памер паведамленні павінна быць %{min} сімвалаў"
         category_missing: "Вы павінны выбраць катэгорыю"
       save_edit: "захаваць змены"
       reply_original: "Адказаць у пачатковай тэме"
@@ -784,8 +828,6 @@ be:
       saving: "захаванне"
       saved: "Захавана!"
       uploading: "Запампоўванне..."
-      show_preview: "папярэдні прагляд & raquo;"
-      hide_preview: "« схаваць папярэдні прагляд"
       quote_post_title: "Працытаваць увесь паведамленне цалкам"
       bold_title: "моцнае вылучэнне"
       bold_text: "Моцнае вылучэнне тэксту"
@@ -796,8 +838,8 @@ be:
       link_dialog_title: "ўставіць гіперспасылку"
       link_optional_text: "неабавязкова назву"
       link_url_placeholder: "Устаўце URL адрас альбо тып для пошуку тэмаў"
-      quote_title: "цытата"
-      quote_text: "цытата"
+      blockquote_title: "цытата"
+      blockquote_text: "цытата"
       code_title: "Папярэдне фарматаваны тэкст"
       paste_code_text: "увядзіце ці ўстаўце код тут"
       upload_title: "спампаваць"
@@ -817,6 +859,7 @@ be:
           desc: Напісаць новае асабістае паведамленне
         create_topic:
           label: "Стварыць новую тэму"
+      ignore: "ігнараваць"
     notifications:
       popup:
         mentioned: '% {Імя карыстальніка} згадаў вас у "% {} тэме" -% {SITE_TITLE}'
@@ -836,7 +879,6 @@ be:
       title_with_attachments: "Дадаць малюнак або файл"
       from_my_computer: "З майго прылады"
       from_the_web: "з інтэрнэту"
-      hint: "(Вы таксама можаце перацягваць выявы ў рэдактар, каб іх загрузіць)"
       uploading: "загрузка"
       select_file: "выбраць файл"
       default_image_alt_text: малюнак
@@ -849,6 +891,7 @@ be:
       no_results: "Нічога не знойдзена."
       results_page: "Вынікі пошуку для '%{term}'"
       search_google_button: "Google"
+      search_button: "Пошук"
       context:
         topic: "Пошук у гэтай тэме"
         private_messages: "Пошук паведамленняў"
@@ -859,9 +902,13 @@ be:
         in_group:
           label: У групе
         post:
+          count:
+            label: Паведамленні
           time:
             before: перад
             after: пасля
+        views:
+          label: прагляды
     hamburger_menu: "перайсці да іншага пераліку або катэгорыі тым"
     new_item: "новы"
     go_back: "вярнуцца назад"
@@ -879,6 +926,7 @@ be:
         actions: "масавыя дзеянні"
         close_topics: "Закрыць тэму"
         archive_topics: "Заархіваваныя тэмы"
+        move_messages_to_inbox: "Перамясціць у тэчцы Уваходныя"
         notification_level: "Натыфікацыі"
       none:
         unread: "У вас няма непрачытаных тэм."
@@ -895,6 +943,7 @@ be:
         new: "Больш няма новых тэм."
         unread: "Больш няма непрачытаных тэм."
         category: "Больш няма тым у катэгорыі %{category}."
+        tag: "Больш няма тым у катэгорыі %{tag}."
         top: "There are no more top topics."
         bookmarks: "Тэмы ў закладках адсутнічаюць."
     topic:
@@ -931,6 +980,11 @@ be:
       jump_reply_up: перайсці да больш ранняй адказы
       jump_reply_down: перайсці да больш позняй адказы
       deleted: "Тэма была выдаленая"
+      slow_mode_update:
+        save: "Уключыць"
+        remove: "Адключыць"
+      topic_status_update:
+        when: "калі:"
       auto_update_input:
         tomorrow: "заўтра"
       auto_close:
@@ -1013,6 +1067,11 @@ be:
         username_placeholder: "username"
         email_placeholder: "name@example.com"
       filters:
+        n_posts:
+          one: "%{count} запіс"
+          few: "%{count}запісаў"
+          many: "%{count}запісаў"
+          other: "%{count}запісаў"
         cancel: "прыбраць фільтр"
       split_topic:
         title: "Перанос новай тэмы"
@@ -1031,22 +1090,25 @@ be:
         title: "Змяніць метку часу"
         action: "змяніць метку часу"
     post:
+      quote_share: "Падзяліцца тэмай"
       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:
-        no_value: "Не, пачакайце"
-        yes_value: "Так, пакінуць"
       archetypes:
         save: "Захаваць налады"
       controls:
+        like: "упадабаць гэты пост"
         edit_action: "Рэдагаваць"
         more: "Болей"
         grant_badge: "даць Значок"
         delete_topic: "выдаліць тэму"
       actions:
+        people:
+          like:
+            one: "гэта спадабалася"
+            few: "гэта спадабалася"
+            many: "гэта спадабалася"
+            other: "гэта спадабалася"
         by_you:
           notify_moderators: "Вы пазначылі гэта для мадэрацыі"
       revisions:
@@ -1095,6 +1157,11 @@ be:
       change_in_category_topic: "рэдагаваць апісанне"
       already_used: "Гэты колер ўжо выкарыстоўваецца іншы катэгорыяй"
       security: "Бяспека"
+      permissions:
+        group: "Група"
+        see: "бачыць"
+        reply: "Адказаць"
+        create: "Стварыць"
       images: "Выява"
       email_in: "Custom incoming email address:"
       allow_badges_label: "Дазволіць ўзнагароджваць значкамі ў гэтай катэгорыі"
@@ -1127,6 +1194,13 @@ be:
         email: "Электронная пошта"
     flagging:
       action: "Пазначыць запіс"
+      take_action_options:
+        default:
+          title: "прыняць меры"
+        suspend:
+          title: "прыпыніць карыстальніка"
+        silence:
+          title: "Silence Карыстальнік"
       notify_action: "паведамленне"
       delete_spammer: "выдаліць спамера"
       yes_delete_spammer: "Так, выдаліць спамера"
@@ -1143,9 +1217,18 @@ be:
     replies: "адказы"
     activity: "актыўнасць"
     likes: "перавагі"
+    likes_lowercase:
+      one: "падабайка"
+      few: "перавагі"
+      many: "перавагі"
+      other: "перавагі"
     users: "Карыстальнікі"
+    users_lowercase:
+      one: "карыстальнік"
+      few: "карыстальнікі"
+      many: "карыстальнікі"
+      other: "карыстальнікі"
     category_title: "Катэгорыя"
-    history: "гісторыя"
     changed_by: "%{Author}"
     categories_list: "Спіс катэгорый"
     filters:
@@ -1240,6 +1323,7 @@ be:
       choose_for_topic: "дадатковыя тэгі"
       add_synonyms: "дадаць"
       sort_by: "Сартаваць па:"
+      sort_by_count: "падлічваць"
       sort_by_name: "Імя"
       cancel_delete_unused: "адмяніць"
       notifications:
@@ -1291,6 +1375,7 @@ be:
         no_problems: "Не выяўлена ніякіх праблем."
         moderators: "мадэратары:"
         admins: "адміністратары:"
+        silenced: "глушыцелем:"
         suspended: "прыпыненыя:"
         private_messages_short: "Пвдмл"
         private_messages_title: "Паведамленні"
@@ -1315,6 +1400,9 @@ be:
           7_days_ago: "7 дзён таму"
           30_days_ago: "30 дзён таму"
           all: "Усё"
+          daily: штодня
+          monthly: штомесяц
+          weekly: штотыдзень
           groups: "Усе групы"
           filters:
             group:
@@ -1331,6 +1419,7 @@ be:
         manage:
           interaction:
             email: Электронная пошта
+            incoming_email: "Custom incoming email address"
             visibility_levels:
               public: "Усе"
         title: "Групы"
@@ -1357,6 +1446,8 @@ be:
         description: Апісанне
         save: Захаваць
         continue: Працягнуць
+        scopes:
+          action: дзеянне
       web_hooks:
         create: "стварыць"
         save: "стварыць..."
@@ -1450,6 +1541,7 @@ be:
           revert_confirm: "Ці ўпэўненыя вы, што хочаце вярнуць вашы змены?"
         theme:
           theme: "тэма"
+          customize_desc: "Кастамізаваць:"
           create: "стварыць"
           create_type: "тып"
           create_name: "Назва"
@@ -1462,6 +1554,7 @@ be:
           installed: "устаноўленая"
           install_popular: "папулярны"
           about_theme: "Аб тэме"
+          version: "версія:"
           enable: "Уключыць"
           disable: "Адключыць"
           add: "Дадаць"
@@ -1584,6 +1677,7 @@ be:
             delete_topic: "выдаліць тэму"
             recover_topic: "адмяніць выдаленне тэмы"
             delete_post: "выдаліць паведамленне"
+            impersonate: "ўвасобіцца"
             anonymize_user: "ананімны карыстальнік"
             change_category_settings: "змяніць налады катэгорыі"
             delete_category: "выдаліць катэгорыю"
@@ -1654,11 +1748,13 @@ be:
           active: "Актыўныя карыстальнікі"
           new: "Новыя карыстальнікі"
           staff: "персанал"
+          moderators: "мадэратары"
       user:
         suspend_reason: "прычына"
         silence_reason: "прычына"
         silence_modal_title: "Silence Карыстальнік"
         delete_all_posts: "прычына..."
+        silenced: "глушыцелем?"
         moderator: "Мадэратар?"
         admin: "Адмін?"
         suspended: "Прыпынена?"
@@ -1736,7 +1832,7 @@ be:
           flagged_posts: "абскарджаны паведамлення"
           likes_given: "упадабаныя"
           likes_received: "атрыманыя перавагі"
-        sso:
+        discourse_connect:
           external_id: "знешні ID"
           external_username: "Імя карыстальніка"
           external_name: "Імя"
@@ -1750,6 +1846,8 @@ be:
         delete: "выдаліць"
         cancel: "адмяніць"
         options: "Налады"
+        required:
+          enabled: "абавязковыя"
         field_types:
           text: "тэкставае поле"
           confirm: "пацвярджэнне"
@@ -1772,6 +1870,8 @@ be:
         uploaded_image_list:
           upload:
             label: "Загрузіць"
+        selectable_avatars:
+          title: "Спіс аватараў карыстальнікі могуць выбраць"
         categories:
           all_results: "усе"
           required: "абавязковыя"
@@ -1850,6 +1950,8 @@ be:
         add_host: "дадаць Хост"
         embed_by_username: "Імя карыстальніка для стварэння тэмы"
         embed_post_limit: "Максімальную колькасць паведамленняў для ўстаўкі"
+        embed_truncate: "Абрэзаць укаранёныя паведамленні"
+        allowed_embed_classnames: "Дазволеныя імёны класаў CSS"
       permalink:
         title: "Сталыя спасылкі"
         url: "URL спасылка"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 47a5bac712..e441d7067c 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -153,6 +153,8 @@ bg:
     topic_admin_menu: "действия по темата"
     wizard_required: "Добре дошли във вашия нов Discourse! Нека започнем с <a href='%{url}' data-auto-route='true'>съветника за настройка</a> ✨"
     emails_are_disabled: "Всички изходящи имейли са изцяло забранени от администратора. Няма да бъдат изпращани никакви имейл известия."
+    software_update_prompt:
+      dismiss: "Отмени"
     bootstrap_mode_disabled: "Режимът на стартиране ще бъде изключен в следващите 24 часа. "
     themes:
       default_description: "По подразбиране"
@@ -241,8 +243,6 @@ bg:
       moderators: "Модератори"
       stat:
         all_time: "От началото"
-        last_7_days: "Последните 7"
-        last_30_days: "Последните 30"
       like_count: "Харесвания"
       topic_count: "Теми"
       post_count: "Публикации"
@@ -267,17 +267,10 @@ bg:
       no_timezone: 'Не може да получавате напомняния, защото не сте настроили своята часова зона. Може да го направите <a href="%{basePath}/my/preferences/profile">във Вашия профил</a>.'
       invalid_custom_datetime: "Въведените дата и час не са валидни. Опитайте отново."
       list_permission_denied: "Нямате право да преглеждате отметките на този потребител."
+      auto_delete_preference:
+        never: "Никога"
       search: "Търсене"
       reminders:
-        later_today: "По-късно днес"
-        next_business_day: "Следващия работен ден"
-        tomorrow: "Утре"
-        next_week: "Следваща седмица"
-        later_this_week: "По-късно тази седмица"
-        start_of_next_business_week_alt: "Следващия понеделник"
-        next_month: "Следващия месец"
-        custom: "Друга дата и час"
-        none: "Без напомняне"
         today_with_time: "днес в %{time}"
         tomorrow_with_time: "утре в %{time}"
         at_time: "на %{date_time}"
@@ -287,9 +280,6 @@ bg:
       new_topic: "Проект на нова тема"
       new_private_message: "Чернова на лично съобщение"
       topic_reply: "Проект на отговор"
-      abandon:
-        yes_value: "Да, напусни"
-        no_value: "Не, запази"
     topic_count_unread:
       one: "Виж %{count} непрочетена тема"
       other: "Виж %{count} непрочетени теми"
@@ -356,6 +346,7 @@ bg:
         email: "Имейл"
         name: "Име"
         fields: "Полета"
+        reject_reason: "Причина"
       user_percentage:
         agreed:
           one: "%{count}% са съгласни"
@@ -411,6 +402,8 @@ bg:
       types:
         reviewable_user:
           title: "Потребител"
+        reviewable_post:
+          title: "Публикация"
       approval:
         title: "Публикацията изисква одобрение"
         description: "Ние получихме вашата публикация, но тя трябва да бъде одобрена от модератора преди да бъде показана. Моля, проявете търпение."
@@ -418,6 +411,20 @@ bg:
           one: "Имате <strong>%{count}</strong> чакаща публикация."
           other: "Имате <strong>%{count}</strong> чакащи публикации."
         ok: "Ок"
+      example_username: "потребителско име "
+    relative_time_picker:
+      days:
+        one: "ден"
+        other: "дни "
+    time_shortcut:
+      later_today: "По-късно днес"
+      next_business_day: "Следващия работен ден"
+      tomorrow: "Утре"
+      next_week: "Следваща седмица"
+      later_this_week: "По-късно тази седмица"
+      start_of_next_business_week_alt: "Следващия понеделник"
+      next_month: "Следващия месец"
+      custom: "Друга дата и час"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a> публикува <a href='%{topicUrl}'>тази тема</a>"
       you_posted_topic: "<a href='%{userUrl}'>Вие</a> публикувахте <a href='%{topicUrl}'>тази тема</a>"
@@ -433,6 +440,7 @@ bg:
       sent_by_user: "Изпратено от <a href='%{userUrl}'>%{user}</a>"
       sent_by_you: "Изпратено от <a href='%{userUrl}'>Вас</a>"
     directory:
+      username: "Потребителско име"
       filter_name: "филтър по потребитилско име"
       title: "Потребители"
       likes_given: "Дадени"
@@ -482,9 +490,15 @@ bg:
           credentials:
             username: "Потребителско име"
             password: "Парола"
+          settings:
+            title: "Настройки"
         membership:
           title: Членство
           access: Достъп
+        categories:
+          title: Категории
+        tags:
+          title: Етикети
         logs:
           title: "Логове"
           when: "Кога"
@@ -495,6 +509,8 @@ bg:
           details: "Детайли "
           from: "От"
           to: "До"
+      permissions:
+        title: "Позволения "
       public_admission: "Разрешено е на потребителите да се присъединяват към групата свободно (Изисква се публично видима група)"
       public_exit: "Разрешено е на потребителите да напуската групата свободно"
       empty:
@@ -612,18 +628,21 @@ bg:
       posts: "Публикации"
       topics: "Теми"
       latest: "Последни"
-      latest_by: "последни от"
       toggle_ordering: "включете контрол на подредбата"
       subcategories: "Подкатегории"
       topic_sentence:
         one: "%{count} тема"
         other: "%{count} теми"
+      topic_stat_unit:
+        week: "седмица"
+        month: "месец"
       topic_stat_sentence_week:
         one: "%{count}нова тема през последната седмица."
         other: "%{count}нови теми през последната седмица."
       topic_stat_sentence_month:
         one: "%{count}нова тема през последния месец."
         other: "%{count}през последния месец."
+      n_more: "Категории (още %{count})..."
     ip_lookup:
       title: Търсене по IP адрес
       hostname: Хост
@@ -668,7 +687,11 @@ bg:
         add_ignored_user: "Добавете ..."
         mute_option: "Заглушен"
         normal_option: "Нормален"
+      notification_schedule:
+        none: "Без"
+        to: "до"
       activity_stream: "Активност"
+      read: "Прочетени"
       preferences: "Настройки"
       feature_topic_on_profile:
         open_search: "Изберете нова тема"
@@ -695,13 +718,14 @@ bg:
         perm_denied_expl: "Вие сте забранили известията. Моля разрешете ги чрез настройките на браузъра си."
         disable: "Деактивиране на Известията"
         enable: "Активиране на Известията"
-        each_browser_note: "Забележка: Трябва да промените тази настройка при всички браузъри, които използвате."
         consent_prompt: "Искате ли известявания в реално време, когато хората отговарят на вашите публикации?"
       dismiss: "Отмени"
       dismiss_notifications: "Отмени всички"
       dismiss_notifications_tooltip: "Маркирайте всички непрочетени известия, като прочетени"
       first_notification: "Вашето първо известие! Изберете го за да започнете."
       theme_default_on_all_devices: "Направи тази тема стандарт на всичките ми устройства"
+      color_schemes:
+        regular: "Редовен"
       external_links_in_new_tab: "Отваряй всички външни връзки в нов раздел."
       enable_quoting: "Включи отговор с цитат при маркиран текст."
       change: "промени"
@@ -711,6 +735,7 @@ bg:
       admin_tooltip: "Този потребител е админ"
       suspended_notice: "Този потребител е отстранен до %{date}."
       suspended_reason: "Причина:"
+      github_profile: "GitHub"
       email_activity_summary: "Сумарна активност"
       mailing_list_mode:
         label: "Режим Бюлетин"
@@ -735,6 +760,7 @@ bg:
       watched_first_post_tags: "Наблюдавайки Първа Публикация"
       watched_first_post_tags_instructions: "Ще бъдете уведомени за първата публикация във всяка нова тема с тези етикети."
       muted_categories: "Заглушен"
+      regular_categories: "Редовен"
       no_category_access: "Като модератор имате ограничен достъп до категориите, запазването е изключено."
       delete_account: "Изтрий моя профил"
       delete_account_confirm: "Сигурни ли сте, че искате да изтриете вашия акаунт? Акаунтът не може да бъде възстановен !"
@@ -750,6 +776,7 @@ bg:
       revoke_access: "Прекратяване на достъпа"
       undo_revoke_access: "Отмяна прекратяване на достъпа"
       api_approved: "Одобрени:"
+      staged: "Поставен"
       staff_counters:
         flags_given: "полезни сигнали"
         flagged_posts: "публикации със сигнали"
@@ -770,6 +797,7 @@ bg:
         tags: "Етикети"
       preferences_nav:
         account: "Профил"
+        security: "Сигурност"
         profile: "Профил"
         emails: "Имейли"
         notifications: "Известия"
@@ -922,36 +950,32 @@ bg:
         after_5_minutes: "след 5 минути"
         after_10_minutes: "след 10 минути"
       invited:
-        search: "търсете покани"
         title: "Покани"
+        pending_tab: "Чакащи"
+        pending_tab_with_count: "Чакащи (%{count})"
+        redeemed_tab: "Взети"
+        redeemed_tab_with_count: "Взети (%{count})"
+        invited_via: "Покана"
+        groups: "Групи"
+        topic: "Тема"
+        edit: "Редактирай"
+        remove: "Премахване"
+        reinvited: "Поканата е изпратена отново"
+        search: "търсете покани"
         user: "Поканени потребители"
         truncated:
           one: "Показване на първата покана."
           other: "Показване на пъврите %{count} покани."
         redeemed: "Взети покани"
-        redeemed_tab: "Взети"
-        redeemed_tab_with_count: "Взети (%{count})"
         redeemed_at: "Взети"
         pending: "Изчакващи покани"
-        pending_tab: "Чакащи"
-        pending_tab_with_count: "Чакащи (%{count})"
         topics_entered: "Прегледани теми"
         posts_read_count: "Прочетени публикации"
         expired: "Тази покана е изтекла."
-        rescind: "Премахване"
-        rescinded: "Поканата е премахната"
-        reinvite: "Изпратете отново"
-        reinvite_all: "Препрати всички покани"
-        reinvited: "Поканата е изпратена отново"
-        reinvited_all: "Всички покани са препратени!"
         time_read: "Време за прочитане"
         days_visited: "Дни Посетена"
         account_age_days: "Период на акаунта в дни"
-        links_tab: "Връзки"
-        link_created_at: "Създадени"
-        link_groups: Групи
-        bulk_invite:
-          success: "Файлът е качен успешно. Ще бъдете информирани чрез съобщение, когато процесът завърши."
+        create: "Покана"
       password:
         title: "Парола"
         too_short: "Вашата парола е твърде кратка."
@@ -970,6 +994,12 @@ bg:
         post_count:
           one: "Създадена публикация"
           other: "Създадени публикации "
+        likes_given:
+          one: "дадени"
+          other: "дадени"
+        likes_received:
+          one: "получени"
+          other: "получени"
         days_visited:
           one: "Посетен ден"
           other: "Посетени дни"
@@ -1040,7 +1070,6 @@ bg:
       close: "затвори"
       dismiss_error: "Отхвърли грешката"
     close: "Затвори"
-    assets_changed_confirm: "Страницата беше обновена. Презаредете, за да видите последната версия."
     logout: "Вие бяхте отписан."
     refresh: "Опресни"
     home: "Начало"
@@ -1049,15 +1078,6 @@ bg:
       login_disabled: "Влизането е изключено, докато страницата е в режим само за четене."
       logout_disabled: "Излизане от сайта е временно спряно, докато е пуснат режим \"само за четене\"."
     learn_more: "научете повече..."
-    all_time: "общо"
-    all_time_desc: "общо създадени теми"
-    year: "година"
-    year_desc: "теми създадени през последните 365 дни"
-    month: "месец"
-    month_desc: "теми, създадени през последните 30 дни"
-    week: "седмица"
-    week_desc: "теми създадени през последните 7 дни"
-    day: "ден"
     first_post: Първа публикация
     mute: Заглушаване
     unmute: Премахване на заглушаване
@@ -1074,13 +1094,10 @@ bg:
       sign_up: "Регистрирай се"
       hide_session: "Напомни ми утре"
       hide_forever: "не благодаря"
-      hidden_for_session: "Добре, Ще ви питам отново утре. През това време можете да използвате бутона \"Влизане\" или да си създадете нов потребител."
       intro: "Здравейте! Изглежда, че следите дискусията, но все още не сте създали собствен профил."
       value_prop: "Когато създадете профил, ще отбелязваме това, което сте чели, така че да можете да продължите от там, откъдето сте спрели. Можете също така да получавате известия тук и по електронната поща, когато има нови мнения. Също така ще може да маркирате любимите си публикации."
     summary:
       enabled_description: "В момента гледате резюме на тази тема: най-интересните публикации определени от общността."
-      description: "Има <b>%{replyCount}</b> отговора."
-      description_time: "В момента има <b>%{replyCount}</b> отговора прочетени за <b>%{readingTime} минути</b>."
       enable: "Обобщи Тази Тема"
       disable: "Покажи всички публикации"
     deleted_filter:
@@ -1090,6 +1107,8 @@ bg:
       disable: "Покажи изтритите публикации"
     private_message_info:
       title: "Съобщение"
+      invite: "Поканете други..."
+      add: "Добавете ..."
       leave_message: "Сигурни ли сте, че искате да оставите това съобщение?"
       remove_allowed_user: "Сигурни ли сте, че искате да премахнете %{name} от това съобщение?"
       remove_allowed_group: "Сигурни ли сте, че искате да премахнете %{name} от това съобщение?"
@@ -1102,7 +1121,6 @@ bg:
     search_hint: "потребителско име, имейл или IP адрес"
     create_account:
       disclaimer: "С регистрацията си се съгласявате с <a href='%{privacy_link}' target='blank'>политиката за повелителност</a> и <a href='%{tos_link}' target='blank'>условията за ползване</a>."
-      title: "Създай нов профил"
       failed: "Нещо се случи, вероятно вече има регистрация с този имейл адрес, опитайте с линка за забравена парола."
     forgot_password:
       title: "Възстановяване на парола"
@@ -1123,10 +1141,8 @@ bg:
       complete_email_not_found: "Няма акаунт който да съвпада с <b>%{email}</b>"
       confirm_title: Продължете към %{site_name}
     login:
-      title: "Вход"
       username: "Потребител"
       password: "Парола"
-      email_placeholder: "имейл или потребителско име"
       caps_lock_warning: "Включен е Caps Lock"
       error: "Непозната грешка"
       cookies_error: "Браузърът ви не приема бисквитки. Влизането Ви може да е възпрепятствано, докато не активирате бисквитките."
@@ -1172,6 +1188,7 @@ bg:
       accept_invite: "Приеми поканата."
       success: "Профилът ви е създаден и вече сте влезли в него."
       name_label: "Име"
+      password_label: "Парола"
     password_reset:
       continue: "Продължете към %{site_name}"
     emoji_set:
@@ -1200,7 +1217,6 @@ bg:
       options: "Опции"
       whisper: "шепот"
       unlist: "скрити"
-      blockquote_text: "Текстов блок"
       add_warning: "Това е официално предупреждение."
       toggle_whisper: "Включи шепот"
       posting_not_on_topic: "На коя тема искате да отговорите ?"
@@ -1209,9 +1225,6 @@ bg:
       drafts_offline: "чернови офлайн"
       error:
         title_missing: "Заглавието е задължително"
-        title_too_short: "Заглавието трябва да е минимум %{min} символа"
-        title_too_long: "Заглавието не може да е повече от %{max} символа"
-        post_length: "Публикацията трябва да е най-малко %{min} символа."
         category_missing: "Трябва да изберете категория"
       save_edit: "Запази редакцията"
       reply_original: "Отговори на Оригинална Тема"
@@ -1230,8 +1243,6 @@ bg:
       saving: "Запаметяване"
       saved: "Запазено!"
       uploading: "Качва се..."
-      show_preview: "покажи прегледa &raquo;"
-      hide_preview: "&laquo; скрий прегледa"
       quote_post_title: "Цитирай цялата публикация"
       bold_title: "Удебелен"
       bold_text: "удебелен текст"
@@ -1241,8 +1252,8 @@ bg:
       link_description: "добави описание на връзката тук"
       link_dialog_title: "Добави хипервръзка"
       link_optional_text: "заглавие по избор"
-      quote_title: "Текстов блок"
-      quote_text: "Текстов блок"
+      blockquote_title: "Текстов блок"
+      blockquote_text: "Текстов блок"
       code_title: "Форматиран текст"
       code_text: "Избутай текста с 4 интервала"
       paste_code_text: "въведете или поставете кода тук"
@@ -1286,10 +1297,7 @@ bg:
       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: "вие можете винаги да привлачите или поставите картинки върху вашия редактора"
       uploading: "Качване "
       select_file: "Избери файл"
@@ -1313,6 +1321,7 @@ bg:
       or_search_google: "Или вместо това опитайте търсене с Гугъл:"
       search_google: "Опитайте вместо това търсене с Гугъл:"
       search_google_button: "Google"
+      search_button: "Търсене"
       context:
         user: "Търсете публикация от @%{username}"
         category: "Търсене за категория #%{category}"
@@ -1335,10 +1344,14 @@ bg:
           pinned: са закачени
           all_tags: Всички по-горни етикети
         post:
+          count:
+            label: Публикации
           time:
             label: Публикувано
             before: преди
             after: след
+        views:
+          label: Преглеждания
     hamburger_menu: "Отиди към друг списък с теми или друга категория "
     new_item: "нови"
     go_back: "Назад "
@@ -1362,6 +1375,7 @@ bg:
         actions: "Групови действия "
         close_topics: "Затвори темите"
         archive_topics: "Архивирай темите"
+        move_messages_to_inbox: "Премести във входящи"
         notification_level: "Известия"
         choose_new_category: "Избери нова категория за тези теми:"
         selected:
@@ -1380,8 +1394,6 @@ bg:
         bookmarks: "Все още нямате теми в Отметки."
         category: "Няма теми в категория %{category}."
         top: "Няма топ теми."
-        educate:
-          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: "Няма повече теми в Последни."
         posted: "Няма повече публикувани теми."
@@ -1389,6 +1401,7 @@ bg:
         new: "Няма повече нови теми."
         unread: "Няма повече непрочетени теми."
         category: "Няма повече теми в %{category}"
+        tag: "Няма повече теми в %{tag}"
         top: "Няма повече топ теми."
         bookmarks: "Няма теми в Отметки"
     topic:
@@ -1444,12 +1457,16 @@ bg:
       toggle_information: "Показване / скриване на подробна информация за дадена тема "
       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: виж последните теми
       jump_reply_up: към по ранен отговор
       jump_reply_down: към по-късен отговор
       deleted: "Темата беше изтрита"
+      slow_mode_update:
+        save: "Позволи"
+        remove: "Деактивиране"
+      topic_status_update:
+        when: "Кога:"
       auto_update_input:
         none: "Избери времева рамка"
         later_today: "По-късно днес"
@@ -1457,18 +1474,14 @@ bg:
         later_this_week: "По-късно тази седмица"
         this_weekend: "Този уикенд"
         next_week: "Следваща седмица"
-        two_weeks: "Две седмиц"
         next_month: "Следващия месец"
-        three_months: "Три месеца"
-        six_months: "Шест месеца"
-        one_year: "Една година"
         forever: "Завинаги"
       auto_close:
         error: "Моля, въведете валидна стойност."
         based_on_last_post: "Не затваряйте преди последната публикация да бъде поне толкова стара."
       status_update_notice:
         auto_close: "Тази тема ще се затвори автоматично след %{timeLeft}."
-        auto_close_based_on_last_post: "Тази тема ще се затвори %{duration} след последния отговор. "
+        auto_close_after_last_post: "Тази тема ще се затвори %{duration} след последния отговор. "
       auto_close_title: "Настройки за автоматично затваряне"
       timeline:
         back: "Назад"
@@ -1553,6 +1566,7 @@ bg:
         title: "Споделяне"
         extended_title: "Сподели линк"
         help: "споделете връзка към тази тема"
+        invite_users: "Покана"
       print:
         title: "Печат"
       flag_topic:
@@ -1598,14 +1612,13 @@ bg:
         username_placeholder: "потребителско име"
         action: "Изпрати покана"
         help: "поканете другите да се присъединят към тази тема чрез имейл или уведомление"
-        to_forum: "Изпратихме кратък имейл, който позволява на Вашия приятел, да се включи в разговора, само с едно натискане върху връзката. Не се изисква вход в системата."
-        sso_enabled: "Въведете потребителското име на човека който желаете да поканите към в тема."
+        discourse_connect_enabled: "Въведете потребителското име на човека който желаете да поканите към в тема."
         to_topic_blank: "Въведете потребителско име или имейл адрес на човека който желаете да поканите към тази тема."
         to_topic_email: "Вие въведохте имейл адрес. Ние ще изпратим имейл чрез която вашият приятел може да отговори веднака на тази тема."
         to_topic_username: "Въведохте потребителско име. Ние ще изпратим напомняне с връзка която го кани в тази тема."
         to_username: "Въведете потребителското име на човека който искате да поканите. Ние ще му изпратим напомняне с връзка която го кани в тази тема."
         email_placeholder: "name@example.com"
-        success_email: "Изпратихте покана на <b>%{emailOrUsername}</b>. Ще Ви уведомим, когато поканата е използвана. Проверявайте раздела с покани на Вашата потребителска страница, за да следите на Вашите покани."
+        success_email: "Изпратихте покана на <b>%{invitee}</b>. Ще Ви уведомим, когато поканата е използвана. Проверявайте раздела с покани на Вашата потребителска страница, за да следите на Вашите покани."
         success_username: "Ние поканихме този потребител да се присъедини темата."
         error: "Съжаляваме, не можем да поканим този човек. Вероятно вече е потребител? ( Поканите са ограничени)"
       login_reply: "Влезте, за да отговорите "
@@ -1663,9 +1676,9 @@ bg:
           one: Вие избрахте <b>%{count}</b> публикация.
           other: "Вие избрахте <b>%{count}</b> публикации. "
     post:
+      quote_share: "Споделяне"
       edit_reason: "Причина: "
       post_number: "публикация %{number} "
-      last_edited_on: "публикацията последно е редактирана на "
       reply_as_new_topic: "Отговори като свързана тема"
       continue_discussion: "Продължаване на дискусията от %{postLink}: "
       follow_quote: "отиди на цитираната публикация "
@@ -1673,6 +1686,7 @@ bg:
       deleted_by_author:
         one: "(публикация оттеглена от автора, ще бъде автоматично изтрита след %{count} час, освен, ако не бъде сигнализирана)"
         other: "(публикация оттеглена от автора, ще бъде автоматично изтрита след %{count} часа, освен, ако не бъде сигнализирана) "
+      collapse: "намали"
       expand_collapse: "разшири/намали "
       gap:
         one: "покажи %{count} скрит отговор"
@@ -1697,15 +1711,6 @@ bg:
         image_upload_not_allowed_for_new_user: "Съжаляваме, новите потребители не могат да качват снимки."
         attachment_upload_not_allowed_for_new_user: "Съжаляваме, новите потребители не могат да прикачват файлове."
         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: "този пост е отбелязан като таен за модераторите"
       wiki:
@@ -1836,6 +1841,10 @@ bg:
       change_in_category_topic: "Редактирай Описанието "
       already_used: "Този цвят вече е използван за друга категория. "
       security: "Сигурност"
+      permissions:
+        group: "Група"
+        see: "Виж"
+        reply: "Отговорете"
       special_warning: "Внимание: Тази категория е предварително семена категория и настройките й за сигурност не могат да се променят. Ако не искате да използвате тази категория, изтрийте темата си, вместо да я местите в категорията по предназначение."
       uncategorized_security_warning: "Тази категория е специална. Тя е предназначен като обща зона за теми, които нямат категория. Като такава, тя не може да има настройки за сигурност."
       images: "Изображения"
@@ -1861,7 +1870,6 @@ bg:
       notifications:
         watching:
           title: "Наблюдаване"
-          description: "Вие ще наблюдавате всички нови теми в тези категории. Ще бъдете информирани за всеки нов пост във всяка тема, и броят на отговорите ще ви бъде показан."
         watching_first_post:
           title: "Наблюдаване на Първа Публикация"
         tracking:
@@ -1871,12 +1879,12 @@ bg:
           description: "Ще ви уведобим, ако някой ви отговори или спомене вашето @име"
         muted:
           title: "Заглушени"
-          description: "Вие никога няма да бъде уведомен за нови теми в тези категории, и те няма да се появят в най-нови."
       search_priority:
         options:
           normal: "Нормален"
           high: "Висок"
       sort_options:
+        default: "по подразбиране"
         likes: "Харесвания"
         views: "Преглеждания"
         posts: "Публикации"
@@ -1897,6 +1905,12 @@ bg:
     flagging:
       title: "Благодарим ви, че помагате да поддържаме дискусията цивилизована!"
       action: "Сигнализирай публикацията "
+      take_action_options:
+        default:
+          title: "Предприеми действие "
+          details: "Достигнете границата от сигнали веднага, вместо да чакате за още сигнали от общността"
+        suspend:
+          title: "Отстрани потребител"
       notify_action: "Съобщение"
       official_warning: "Официално предупреждение"
       delete_spammer: "Изтрий спамера "
@@ -1948,12 +1962,6 @@ bg:
       unlisted:
         help: "Тази тема е скрита; не се появява в списъка с теми и може да бъде достъпна само с директен линк."
     posts: "Публикации"
-    posts_likes_MF: |
-      Тази тема има {count, plural, one {1 reply} other {# replies}} {ratio, select,
-      low {with a high like to post ratio}
-      med {with a very high like to post ratio}
-      high {with an extremely high like to post ratio}
-      other {}}
     original_post: "Оригинална публикация"
     views: "Прегледи"
     views_lowercase:
@@ -1970,7 +1978,6 @@ bg:
       one: "потребител"
       other: "потребители"
     category_title: "Категория"
-    history: "История"
     changed_by: "от %{author}"
     raw_email:
       title: "Входяща поща"
@@ -2135,8 +2142,13 @@ bg:
       choose_for_topic: "етикети по желание"
       add_synonyms: "Добави"
       delete_tag: "Изтрийте таг"
+      sort_by: "Сортирай по:"
+      sort_by_count: "брой"
+      sort_by_name: "име"
       manage_groups_description: "Дефинирай групи за организране на етикетите"
       cancel_delete_unused: "Отмени"
+      filters:
+        without_category: "%{filter} %{tag} теми"
       notifications:
         watching:
           title: "Наблюдаване"
@@ -2176,6 +2188,9 @@ bg:
       back: "Назад"
       share: "Споделяне"
       dismiss: "Отмени"
+    do_not_disturb:
+      options:
+        custom: "По избор"
   admin_js:
     type_to_filter: "филтрирай..."
     admin:
@@ -2197,6 +2212,8 @@ bg:
         version_check_pending: "Изглежда, че скоро сте обновили версията. Това е чудесно!"
         installed_version: "Инсталирани"
         latest_version: "Последни"
+        new_features:
+          dismiss: "Отмени"
         last_checked: "Последна проверка"
         refresh_problems: "Обнови"
         no_problems: "Не бяха открити проблеми."
@@ -2223,6 +2240,9 @@ bg:
           all: "Всички"
           view_table: "таблица"
           refresh_report: "Обнови доклада"
+          daily: Дневно
+          monthly: Месечно
+          weekly: Седмично
           groups: "Всички групи"
           filters:
             group:
@@ -2233,9 +2253,6 @@ bg:
         latest_changes: "Последни промени: моля обновявайте често! "
         by: "от"
       groups:
-        bulk_add:
-          title: "Масово добавяне в група"
-          paste: "Поставете списък с потребители или мейли, по един на линия:"
         manage:
           interaction:
             email: Имейл
@@ -2280,6 +2297,8 @@ bg:
         description: Описание
         save: Запази
         continue: Напред
+        scopes:
+          action: Действие
       web_hooks:
         save: "Запази"
         destroy: "Изтрий"
@@ -2390,6 +2409,7 @@ bg:
           revert: "Върни промените"
           revert_confirm: "Сигурен ли си, че искаш да върнеш промените?"
         theme:
+          customize_desc: "Персонализация:"
           create_type: "Тип"
           create_name: "Име"
           edit: "Редактирай"
@@ -2400,6 +2420,7 @@ bg:
           installed: "Инсталирани"
           install_popular: "Популярни"
           about_theme: "Относно"
+          version: "Версия:"
           enable: "Позволи"
           disable: "Деактивиране"
           add: "Добави"
@@ -2478,6 +2499,7 @@ bg:
         delivery_method: "Метод за доставяне "
         preview_digest_desc: "Преглед на съдържанието на имейлите, изпратени до неактивните потребители."
         refresh: "Опресни"
+        sending_email: "Изпраща се имейл..."
         format: "Формат"
         html: "html"
         text: "текст"
@@ -2531,6 +2553,7 @@ bg:
           do_nothing: "Не прави нищо "
         staff_actions:
           all: "всички подкатегории"
+          filter: "Филтер:"
           title: "Действия на персонала"
           clear_filters: "Покажи всичко "
           staff_user: "Потребител"
@@ -2630,7 +2653,6 @@ bg:
         title: "Наблюдавани думи"
         search: "търсене"
         clear_filter: "Изчисти"
-        show_words: "покажи думите"
         download: Изтегли
         clear_all: Изчисти всички
         actions:
@@ -2657,6 +2679,7 @@ bg:
           active: "Активни"
           staff: "Персонал"
           suspended: "Отстранени"
+          staged: "Поставен"
         approved: "Одобрен?"
         titles:
           active: "Активни потребители"
@@ -2675,6 +2698,8 @@ bg:
         check_email:
           title: "Разкрий имейла на този потребител"
           text: "Покажи"
+        check_sso:
+          text: "Покажи "
       user:
         suspend_failed: "Нещо се обърка при отстраняването на този потребител %{error}"
         unsuspend_failed: "Нещо се обърка при отстраняването на този потребител %{error} "
@@ -2785,12 +2810,11 @@ bg:
           on_grace_period: "В момента, в промоционален гратисен период, няма да бъде понижен. "
           locked_will_not_be_promoted: "Нивото на доверие е заключено. Никога няма да се насърчава. "
           locked_will_not_be_demoted: "Нивото на доверие е заключено. Никога няма да се понижават. "
-        sso:
-          title: "Single Sign On"
+        discourse_connect:
           external_id: "Външно ID "
           external_username: "Потребителско име"
-          external_name: "Име "
-          external_email: "Имейл "
+          external_name: "Име"
+          external_email: "Имейл"
           external_avatar_url: "URL до аватара"
       user_fields:
         title: "User Fields"
@@ -2973,6 +2997,8 @@ bg:
         embed_by_username: "Потребител за създаване на темата"
         embed_post_limit: "Максимален брой публикации за вграждане."
         embed_truncate: "Изтрий вградените постове"
+        allowed_embed_selectors: "Избор на CSS елементи които са разрешени за вграждане"
+        blocked_embed_selectors: "Избор на CSS елементи които не са разрешени за вграждане"
         save: "Запамети настройките за вграждане"
       permalink:
         title: "Постоянни адреси"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index a3e61ed21e..2537ef93c5 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -179,6 +179,8 @@ bs_BA:
     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."
+    software_update_prompt:
+      dismiss: "Odpusti"
     bootstrap_mode_disabled: "Bootstrap način rada će biti isključen u toku 24 sata."
     themes:
       default_description: "Uobičajen"
@@ -240,6 +242,10 @@ bs_BA:
     now: "upravo sada"
     read_more: "pročitaj više"
     more: "Više"
+    x_more:
+      one: "Još %{count}"
+      few: "Još %{count}"
+      other: "Još %{count}"
     less: "Manje"
     never: "nikada"
     every_30_minutes: "svakih 30 minuta"
@@ -269,8 +275,6 @@ bs_BA:
       moderators: "Moderators"
       stat:
         all_time: "Ukupno vrijeme"
-        last_7_days: "Zadnjih 7"
-        last_30_days: "Zadnjih 30"
       like_count: "Sviđanja"
       topic_count: "Tema"
       post_count: "Objave"
@@ -305,17 +309,6 @@ bs_BA:
       search_placeholder: "Pretražite zabilješke po imenu, naslovu teme ili sadržaju objave"
       search: "Pretraži"
       reminders:
-        later_today: "Na kraju dana"
-        next_business_day: "Sljedeći radni dan"
-        tomorrow: "Sutra"
-        next_week: "Sljedeće sedmice"
-        later_this_week: "Kasnije ove sedmice"
-        start_of_next_business_week: "Ponedjeljak"
-        start_of_next_business_week_alt: "Sljedeći ponedjeljak"
-        next_month: "Sljedeći mjesec"
-        custom: "Precizirano vrijeme i datum"
-        last_custom: "Posljednji"
-        none: "Podsjetnik nije potreban"
         today_with_time: "danas u %{time}"
         tomorrow_with_time: "sutra u %{time}"
         at_time: "na %{date_time}"
@@ -328,9 +321,7 @@ bs_BA:
       new_private_message: "Nova skica privatne poruke"
       topic_reply: "skica odgovora"
       abandon:
-        confirm: "Već ste otvorili drugu skicu u ovoj temi. Dali ste sigurni da ju želite napustiti?"
-        yes_value: "Da, odustani"
-        no_value: "Ne, sačuvaj"
+        yes_value: "Odbaci"
     topic_count_latest:
       one: "Pogledajte %{count} novu ili ažuriranu temu"
       few: "Pogledajte %{count} nove ili ažurirane teme"
@@ -430,6 +421,7 @@ bs_BA:
       topic: "Tema:"
       filtered_topic: "Filtrirali ste sadržaj koji se može pregledati u jednoj temi."
       filtered_user: "User"
+      filtered_reviewed_by: "Pregledao je"
       show_all_topics: "(pokaži sve teme)"
       deleted_post: "(post izbrisan)"
       deleted_user: "(korisnik izbrisan)"
@@ -440,11 +432,8 @@ bs_BA:
         email: "Email"
         name: "Ime"
         fields: "Polja"
+        reject_reason: "Reason"
       user_percentage:
-        summary:
-          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"
@@ -492,7 +481,8 @@ bs_BA:
           created_at_asc: "Napravijeno kod (preokrenuti)"
         priority:
           title: "Minimalni prioritet"
-          low: "(bilo koji)"
+          any: "(bilo koji)"
+          low: "Nisko"
           medium: "Srednije"
           high: "Visoko"
       conversation:
@@ -530,6 +520,8 @@ bs_BA:
           title: "Post na čekanju"
         reviewable_user:
           title: "User"
+        reviewable_post:
+          title: "Objava"
       approval:
         title: "Post treba odobrenje"
         description: "Primili smo Vaš novi post ali on treba biti odobren od strane moderatora prije nego bude javno dostupan. Molimo za strpljenje."
@@ -538,6 +530,22 @@ bs_BA:
           few: "Imate <strong>%{count}</strong> na čekanju."
           other: "Imate <strong>%{count}</strong> na čekanju."
         ok: "OK"
+      example_username: "korisničko ime"
+    relative_time_picker:
+      days:
+        one: "dan"
+        few: "days"
+        other: "days"
+    time_shortcut:
+      later_today: "Na kraju dana"
+      next_business_day: "Sljedeći radni dan"
+      tomorrow: "Sutra"
+      next_week: "Sljedeće sedmice"
+      later_this_week: "Kasnije ove sedmice"
+      start_of_next_business_week: "Ponedjeljak"
+      start_of_next_business_week_alt: "Sljedeći ponedjeljak"
+      next_month: "Sljedeći mjesec"
+      custom: "Precizirano vrijeme i datum"
     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>"
@@ -553,6 +561,7 @@ bs_BA:
       sent_by_user: "Poslao <a href='%{userUrl}'>%{user}</a>"
       sent_by_you: "Poslali <a href='%{userUrl}'>vi</a>"
     directory:
+      username: "Ime"
       filter_name: "filtiraj korisnike"
       title: "Korisnici"
       likes_given: "Dato"
@@ -624,6 +633,8 @@ bs_BA:
             imap_ssl: "Koristi SSL za IMAP"
             username: "Ime"
             password: "Lozinka"
+          settings:
+            title: "Postavke"
           mailboxes:
             synchronized: "Sinkronizirani poštanski sandučić"
             none_found: "Na ovom računu e-pošte nisu pronađeni poštanski sandučići."
@@ -798,7 +809,6 @@ bs_BA:
       posts: "Odgovori"
       topics: "Teme"
       latest: "Zadnje"
-      latest_by: "zadnje od"
       toggle_ordering: "toggle ordering control"
       subcategories: "Podkategorije"
       muted: "Prigušene kategorije"
@@ -806,6 +816,9 @@ bs_BA:
         one: "%{count} tema"
         few: "%{count} teme"
         other: "%{count} tema"
+      topic_stat_unit:
+        week: "sedmica"
+        month: "mjesec"
       topic_stat_sentence_week:
         one: "%{count} nova tema u protekloj sedmici."
         few: "%{count} nove teme u protekloj sedmici."
@@ -814,6 +827,7 @@ bs_BA:
         one: "%{count} nova tema u posljednjih mjesec dana."
         few: "%{count} nove teme u posljednjih mjesec dana."
         other: "%{count} novih tema u zadnjih mjesec dana."
+      n_more: "Kategorije (još %{count})..."
     ip_lookup:
       title: forenzika IP adrese
       hostname: Hostname
@@ -867,7 +881,12 @@ bs_BA:
         mute_option_title: "Nećete primati nikakve obavijesti koje se odnose na ovog korisnika."
         normal_option: "Normalno"
         normal_option_title: "Bićete obaviješteni ako vam ovaj korisnik odgovori , citira vas ili vas spomene."
+      notification_schedule:
+        none: "Ništa"
+        monday: "Ponedjeljak"
+        to: "ka"
       activity_stream: "Aktivnost"
+      read: "Čitaj"
       preferences: "Postavke"
       feature_topic_on_profile:
         open_search: "Odaberi Novu temu"
@@ -896,7 +915,6 @@ bs_BA:
         perm_denied_expl: "Odbili ste dozvolu za slanje notifikacija. Omogućite ih kroz postavke vašeg pretraživača."
         disable: "Isključi obavjesti"
         enable: "Uključi obavijesti"
-        each_browser_note: "Napomena: Ovu opciju morate promjeniti na svakom pregledniku."
         consent_prompt: "Da li želite uživo obavjesti kada neko odgovori na vaše objave? "
       dismiss: "Odpusti"
       dismiss_notifications: "Odpusti sve"
@@ -908,6 +926,9 @@ bs_BA:
         not_first_time: "Nije ti prvi put?"
         skip_link: "Preskoči ove savjete"
       theme_default_on_all_devices: "Postavi ovu temu kao zadanu na svim mojim uređajima"
+      color_schemes:
+        undo: "Resetovati"
+        regular: "Redovne"
       dark_mode: "Tamni način"
       dark_mode_enable: "Omogućite automatski tamnu šemu boja"
       text_size_default_on_all_devices: "Učinite ovo standardnom veličinom teksta na svim mojim uređajima"
@@ -925,6 +946,7 @@ bs_BA:
       suspended_notice: "Ovaj korisnike je suspendovan sve do %{date}."
       suspended_permanently: "Ovaj korisnik je suspendovan."
       suspended_reason: "Razlog: "
+      github_profile: "GitHub"
       email_activity_summary: "Sažetak aktivnosti"
       mailing_list_mode:
         label: "Mejling lista - način rada"
@@ -1003,6 +1025,7 @@ bs_BA:
         tags: "Oznake"
       preferences_nav:
         account: "Račun"
+        security: "Security"
         profile: "Profil"
         emails: "Email-i"
         notifications: "Obavijesti"
@@ -1117,7 +1140,6 @@ bs_BA:
         set_primary: "Postavi primarnu e-poštu"
         destroy: "Ukloni e-poštu"
         add_email: "Dodaj zamjensku e-poštu"
-        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."
@@ -1251,46 +1273,39 @@ bs_BA:
         after_10_minutes: "poslije 10 minuta"
       notification_level_when_replying: "Kada objavim objavu u temi, postavi tu temu u"
       invited:
-        search: "kucaj da potražiš pozivnice..."
         title: "Pozivnice"
+        pending_tab: "Na čekanju"
+        pending_tab_with_count: "Na čekanju (%{count})"
+        redeemed_tab: "Iskorišteno"
+        redeemed_tab_with_count: "Iskorišteno (%{count})"
+        invited_via: "Pozivnica"
+        groups: "Grupe"
+        topic: "Topic"
+        expires_at: "Ističe"
+        edit: "Izmijeni"
+        remove: "Ukloni"
+        reinvited: "Pozivnica ponovo poslata"
+        search: "kucaj da potražiš pozivnice..."
         user: "Pozvan korisnik"
-        sent: "Zadnje poslano"
         none: "Nema pozivnica za prikazati"
         truncated:
           one: "Prikaz prve pozivnice."
           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_at: "Iskorišteno"
         pending: "Pozivnice na čekanju"
-        pending_tab: "Na čekanju"
-        pending_tab_with_count: "Na čekanju (%{count})"
         topics_entered: "Pogledane Teme"
         posts_read_count: "Pročitane objave"
         expired: "Ova pozivnica je istekla."
-        rescind: "Ukloni"
-        rescinded: "Pozivnica uklonjena"
-        rescind_all: "Ukloni istekle pozivnice"
-        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"
-        reinvite_all: "Pošalji ponovno sve pozivnice"
+        remove_all: "Ukloni istekle pozivnice"
+        removed_all: "Uklonjeni su svi istekli pozivi!"
+        remove_all_confirm: "Jeste li sigurni da želite ukloniti sve pozivnice koje su istekle?"
         reinvite_all_confirm: "Da li ste sigurni da želite poslati ponovno sve pozivnice?"
-        reinvited: "Pozivnica ponovo poslata"
-        reinvited_all: "Sve pozivnice su ponovo poslate!"
         time_read: "Vrijeme čitanja"
         days_visited: "Dani posjete"
         account_age_days: "Starost korisničkog računa u danima"
-        source: "Pozvan putem"
-        links_tab: "Linkovi"
-        links_tab_with_count: "Linkovi (%{count})"
-        link_url: "Link"
-        link_created_at: "Stvoreno"
-        link_redemption_stats: "Opozivi"
-        link_groups: Grupa
-        link_expires_at: Ističe
+        create: "Invite"
         valid_for: "Link pozvinice je validan jedino za ovu e-mail adresu: %{email}"
         invite_link:
           title: "Link pozivnice"
@@ -1300,9 +1315,7 @@ bs_BA:
           expires_at: "Kada će ovaj link za pozivnicu isteći?"
         bulk_invite:
           text: "Skupna pozivnica"
-          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."
       password:
         title: "Lozinka"
         too_short: "Vaša lozinka je prekratka."
@@ -1411,7 +1424,6 @@ bs_BA:
       close: "zatvori"
       dismiss_error: "Odbaci grešku"
     close: "Zatvori"
-    assets_changed_confirm: "Ovaj sajt je upravo unaprijeđen. Osvježiti odmah stranicu za novu verziju?"
     logout: "Izlogovani ste."
     refresh: "Osvježi"
     home: "Naslovnica"
@@ -1424,15 +1436,6 @@ bs_BA:
     too_few_topics_notice_MF: >-
       Hajde da <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">započnemo diskusiju!</a> Tamo {currentTopics, plural, one {je <strong>#</strong> tema} few {su <strong>#</strong> teme} other {su <strong>#</strong> teme}}. Posjetiteljima je potrebno više sadržaja za čitati i odgovoriti na — preporučujemo barem {requiredTopics, plural, one {<strong>#</strong> tema} few {<strong>#</strong> teme} other {<strong>#</strong> teme}}. Samo osoblje može vidjeti ovu poruku.
     learn_more: "saznaj više..."
-    all_time: "ukupno"
-    all_time_desc: "ukupno kreiranih tema"
-    year: "godina"
-    year_desc: "teme otvorene u zadnjih 365 dana"
-    month: "mjesec"
-    month_desc: "teme otvorene u zadnjih 30 dana"
-    week: "sedmica"
-    week_desc: "teme otvorene u zadnjih 7 dana"
-    day: "dan"
     first_post: Prva objava
     mute: Utišaj
     unmute: Normalno
@@ -1451,13 +1454,10 @@ bs_BA:
       sign_up: "Učlani se"
       hide_session: "Podsjeti me sutra"
       hide_forever: "ne hvala"
-      hidden_for_session: "Dobro, pitat ću te sutra. Uvijek možete koristiti \"Prijavi se\" za izradu računa."
       intro: "Zdravo! Čini se da uživate u raspravi, ali još se niste prijavili za račun."
       value_prop: "Kada stvorite račun, sjećamo se točno onoga što ste pročitali, pa se uvijek vraćate na mjesto gdje ste stali. Također dobivate obavijesti, ovdje i putem e-pošte, kad god vam netko odgovara. I možete lajkati :heartpulse: tuđe postove i reagirati na iste reakcijama."
     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>."
       enable: "Napravi sažetak ove teme"
       disable: "Prikaži sve objave"
     deleted_filter:
@@ -1467,6 +1467,9 @@ bs_BA:
       disable: "Prikaži obrisane objave"
     private_message_info:
       title: "Privatna poruka"
+      invite: "Pozovi Ostale..."
+      edit: "Dodaj ili ukloni..."
+      add: "Dodaj"
       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?"
@@ -1478,8 +1481,8 @@ bs_BA:
     trust_level: "Nivo povjerenja"
     search_hint: "ime"
     create_account:
+      header_title: "Dobrodošao!"
       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: "Stvori novi 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:
       title: "Resetovanje lozinke"
@@ -1509,7 +1512,6 @@ bs_BA:
       logging_in_as: Prijavite se kao %{email}
       confirm_button: Završi prijavu
     login:
-      title: "Prijava"
       username: "Korisnik"
       password: "Lozinka"
       second_factor_description: "Molimo da unesete kod za ovjeru autentičnosti sa vaše aplikacije:"
@@ -1522,7 +1524,6 @@ bs_BA:
       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č."
       security_key_support_missing_error: "Vaš trenutni uređaj ili preglednik ne podržava korištenje sigurnosnih ključeva. Molimo koristite drugačiju metodu."
-      email_placeholder: "email ili korisnik"
       caps_lock_warning: "Uključena su vam velika slova"
       error: "Nepoznata greška"
       cookies_error: "Čini se da je vaš preglednik onemogućio cookies. Možda se nećete moći prijaviti bez da ih prvo omogućite."
@@ -1578,6 +1579,7 @@ bs_BA:
       accept_invite: "Prihvati pozivnicu"
       success: "Vaš račun je napravljen i sada ste prijavljeni."
       name_label: "Ime"
+      password_label: "Lozinka"
       optional_description: "(opciono)"
     password_reset:
       continue: "Nastavi ka %{site_name}"
@@ -1619,8 +1621,6 @@ bs_BA:
     date_time_picker:
       from: Od
       to: Ka
-      errors:
-        to_before_from: "Ciljani datum mora biti kasniji od početnog datuma."
     emoji_picker:
       filter_placeholder: Pretraži emotikone
       smileys_&_emotion: Smeješci i osječaj
@@ -1642,7 +1642,6 @@ bs_BA:
       default: Sopstveni emotikoni
     shared_drafts:
       title: "Dijeljene skice"
-      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?"
@@ -1653,7 +1652,6 @@ bs_BA:
       options: "Opcije"
       whisper: "šapat"
       unlist: "nelistan"
-      blockquote_text: "Citiranje"
       add_warning: "Ovo je zvanično upozorenje."
       toggle_whisper: " Prekidač za Šapat"
       toggle_unlisted: "Prekidač za Listan"
@@ -1673,10 +1671,7 @@ bs_BA:
       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 duži 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"
         topic_template_not_modified: "Molimo da dodate detalje i specifikacije za vašu temu tako što ćete izmijeniti template teme."
@@ -1706,8 +1701,6 @@ bs_BA:
       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"
       quote_post_title: "Citiraj cjeli post"
       bold_label: "B"
       bold_title: "Bold"
@@ -1719,8 +1712,8 @@ bs_BA:
       link_description: "ubaci opis linka"
       link_dialog_title: "Unesi Link"
       link_optional_text: "naslov neobavezan"
-      quote_title: "\"Blockquote\" izdvojeni citat"
-      quote_text: "\"Blockquote\" izdvojeni citat"
+      blockquote_title: "Citiranje"
+      blockquote_text: "Citiranje"
       code_title: "Formatiran Tekst"
       code_text: "Unapred formatirani tekst za 4 razmaka"
       paste_code_text: "ukucaj ili zalijepi kod ovdje"
@@ -1765,10 +1758,10 @@ bs_BA:
           label: "Nova tema"
         shared_draft:
           label: "Dijeljena skica"
-          desc: "Skiciraj temu koja će biti vidljiva samo administratorima"
         toggle_topic_bump:
           label: "Toggle topic bump"
           desc: "Odgovori bez izmjene zadnjeg datuma odgovora"
+      ignore: "Zanemari"
     notifications:
       tooltip:
         regular:
@@ -1792,6 +1785,11 @@ bs_BA:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} and %{count} ostali</span> %{description}"
+        few: "<span class='multi-user'>%{username}, %{username2} i ostalih %{count}</span> %{description}"
+        other: "<span class='multi-user'>%{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"
@@ -1806,6 +1804,8 @@ bs_BA:
       granted_badge: "Zasluženo '%{description}'"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Nova tema</span> %{description}"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</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"
@@ -1848,10 +1848,7 @@ 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}"
       local_tip: "Izaberi slike sa svog uređaja"
-      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"
       select_file: "Izaberi fajl"
@@ -1882,6 +1879,7 @@ bs_BA:
       or_search_google: "Ili umjesto toga probaj pretražiti pomoću Google-a:"
       search_google: "Probaj umjesto toga pretražiti pomoću Google-a:"
       search_google_button: "Google"
+      search_button: "Pretraži"
       context:
         user: "Traži postove od @%{username}"
         category: "Traži #%{category} kategoriju"
@@ -1925,10 +1923,14 @@ bs_BA:
           noreplies: imaju nula odgovora
           single_user: sadrži jednog korisnika
         post:
+          count:
+            label: Objave
           time:
             label: Objavljeno
             before: prije
             after: poslije
+        views:
+          label: Pogledano
     hamburger_menu: "idi ka drugoj temi, listi ili kategoriji"
     new_item: "novo"
     go_back: "go back"
@@ -1954,6 +1956,7 @@ bs_BA:
         change_category: "Postavi kategoriju"
         close_topics: "Zatvori teme"
         archive_topics: "Arhiviraj teme"
+        move_messages_to_inbox: "Idi u inbox"
         notification_level: "Obavijesti"
         choose_new_category: "Izaberi novu kategoriju za temu:"
         selected:
@@ -1973,8 +1976,6 @@ bs_BA:
         bookmarks: "Još nemate zabilježenih tema."
         category: "Nema tema u %{category}."
         top: "Nema top tema."
-        educate:
-          unread: '<p>Vaše nepročitane teme se ovdje pojavljuju.</p><p>Načelno, teme su smatrane nepročitanim i prikazivat će brojač nepročitanih poruka<span class="badge new-posts badge-notification">1</span> ukoliko ste:</p><ul><li>Kreirali temu</li><li>Odgovorili na temu</li><li>Čitali temu duže od 4 minuta</li></ul><p>Ili ako ste explicitno označili temu za Praćenje ili Posmatrane preko kontrole obavještenja na dnu svake od tema.</p><p>Posjetite vaše <a href="%{userPrefsUrl}">postavke</a> ukoliko želite da to izmijenite.</p>'
       bottom:
         latest: "Nema više aktuelnih tema."
         posted: "There are no more posted topics."
@@ -1982,6 +1983,7 @@ bs_BA:
         new: "Nema više novih tema."
         unread: "Nema više nepročitanih tema."
         category: "Nema više %{category} tema."
+        tag: "Nema više %{tag} tema."
         top: "Nema više top tema."
         bookmarks: "U zabilješkama više nema spremljenih tema."
     topic:
@@ -2049,12 +2051,14 @@ bs_BA:
       toggle_information: "uključi detalje teme"
       read_more_in_category: "Želite dalje čitati? Pregledajte druge teme u %{catLink} ili %{latestLink}."
       read_more: "Želite li dalje čitati? %{catLink} Ili %{latestLink}."
-      read_more_MF: "Postoj{ UNREAD, plural, =0 {} one {i <a href='{basePath}/unread'>1 nepročitana</a> } few {e <a href='{basePath}/unread'># nepročitane</a> } other {i <a href='{basePath}/unread'># nepročitanih</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{i } false {i } other{}} <a href='{basePath}/new'>1 nova</a> tema} few {} other { {BOTH, select, true{i } false {e } other{}} <a href='{basePath}/new'># novih</a> tema} } preostalih za čitati, ili {CATEGORY, select, true {pogledajte ostale teme u {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Pregledaj sve kategorije
       view_latest_topics: pogledaj najnovije teme
       jump_reply_up: jump to earlier reply
       jump_reply_down: jump to later reply
       deleted: "Ova tema je obrisana"
+      slow_mode_update:
+        save: "Omogući"
+        remove: "Onemogući"
       topic_status_update:
         title: "Trajanje teme"
         save: "Podesi tajmer"
@@ -2062,7 +2066,7 @@ bs_BA:
         remove: "Ukloni tajmer"
         publish_to: "Objavi u:"
         when: "Kada:"
-        time_frame_required: Odaberite vremenski okvir
+        time_frame_required: "Odaberite vremenski okvir"
       auto_update_input:
         none: "Označi vremenski period"
         later_today: "Na kraju dana"
@@ -2070,13 +2074,7 @@ bs_BA:
         later_this_week: "Kasnije ove sedmice"
         this_weekend: "Ovog vikenda"
         next_week: "Sljedeće sedmice"
-        two_weeks: "Dvije sedmice"
         next_month: "Sljedeći mjesec"
-        two_months: "Dva mjeseca"
-        three_months: "Tri mjeseca"
-        four_months: "Četiri Mjeseca"
-        six_months: "Šest mjeseci"
-        one_year: "Godina"
         forever: "Zauvijek"
         pick_date_and_time: "Odaberi datum i vrijeme"
         set_based_on_last_post: "Zatvori koristeći za bazu zadnju objavu"
@@ -2090,7 +2088,6 @@ bs_BA:
         title: "Privremeno zatvori"
       auto_close:
         title: "Automatski zatvori temu"
-        label: "Automatsko zatvaranje teme nakon sati:"
         error: "Molim unesite ispravnu vrijednost."
         based_on_last_post: "Ne zatvaraj temu sve dok zadnja objava u temi nije barem ovoliko stara."
       auto_delete:
@@ -2103,7 +2100,7 @@ bs_BA:
         auto_open: "Ova tema će biti automatski otvorena za %{timeLeft}"
         auto_close: "Ova tema će biti automatski zatvorena za %{timeLeft}"
         auto_publish_to_category: "Ova tema će biti objavljena u <a href=%{categoryUrl}>#%{categoryName}</a> za %{timeLeft}."
-        auto_close_based_on_last_post: "Ova tema će se biti zatvorena %{duration} nakon zadnjeg odgovora."
+        auto_close_after_last_post: "Ova tema će se biti zatvorena %{duration} nakon zadnjeg odgovora."
         auto_delete: "Ova tema će biti automatski izbrisana za %{timeLeft}"
         auto_bump: "Ova tema će biti automatski bumped %{timeLeft}."
         auto_reminder: "Bit će te obaviješteni o ovoj temi za %{timeLeft}"
@@ -2123,7 +2120,6 @@ bs_BA:
         go: "idi"
         jump_bottom: "idi na posljednju objavu"
         jump_prompt: "skoči na..."
-        jump_prompt_of: "od %{count} objava"
         jump_prompt_long: "Skoči na ..."
         jump_bottom_with_number: "skoči na post %{post_number}"
         jump_prompt_to_date: "do datuma"
@@ -2207,6 +2203,7 @@ bs_BA:
         title: "Dijeli"
         extended_title: "Dijeli link"
         help: "podjeli link do ove teme"
+        invite_users: "Invite"
       print:
         title: "Print"
         help: "Otvori printersku verziju ove teme"
@@ -2260,14 +2257,13 @@ bs_BA:
         username_placeholder: "korisničko ime"
         action: "Email pozivnica"
         help: "pošalji pozivnicu svojim prijateljima tako da i oni mogu odgovoriti na ovu temu. Bey registracije."
-        to_forum: "We'll send a brief email allowing your friend to immediately join by clicking a link, no login required."
-        sso_enabled: "Unesite korisničko ime osobe koju želite da pozovete u ovu temu."
+        discourse_connect_enabled: "Unesite korisničko ime osobe koju želite da pozovete u ovu temu."
         to_topic_blank: "Unesite korisničko ime ili e-mail adresu osobe koju želite da pozovete u ovu temu."
         to_topic_email: "Unijeli ste e-mail adresu. Poslat ćemo e-mailom pozivnicu koja će omogućiti vašem prijatelju da odmah odgovori na ovu temu."
         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>%{invitee}</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."
@@ -2370,11 +2366,10 @@ bs_BA:
         other: "(tema povučena od strane autora, automatski će biti obrisana u %{count} sati osim ako nije označena)"
     post:
       quote_reply: "Citiraj"
+      quote_share: "Dijeli"
       edit_reason: "Razlog: "
       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}:"
@@ -2419,14 +2414,8 @@ bs_BA:
         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."
-      abandon_edit:
-        no_value: "Ne, sačuvaj"
-        no_save_draft: "Ne, spasi sastav"
-      abandon:
-        confirm: "Da li ste sigurni da želite otkazati vaš post?"
-        no_value: "Ne, sačuvaj"
-        no_save_draft: "Ne,spasi skicu"
-        yes_value: "Da, odustani"
+      cancel_composer:
+        discard: "Odbaci"
       via_email: "this post arrived via email"
       via_auto_generated_email: "ova objava je došla preko automatski generisanog email-a"
       whisper: "ova objava je privatni šapat za moderatore "
@@ -2594,6 +2583,11 @@ bs_BA:
       change_in_category_topic: "Edit Description"
       already_used: "This color has been used by another category"
       security: "Security"
+      permissions:
+        group: "Grupa"
+        see: "Vidi"
+        reply: "Odgovori"
+        create: "napravi"
       special_warning: "Upozorenje: Ova kategorija je pre-seeded kategorija i sigurnosne postavke se ne mogu uređivati. Ako ne želite koristiti ovu kategoriju, izbrišite je umjesto da je prenamijenite."
       images: "Images"
       email_in: "Custom incoming email address:"
@@ -2625,13 +2619,11 @@ bs_BA:
       notifications:
         watching:
           title: "Motrenje"
-          description: "Automatski ćete gledati sve teme u ovim kategorijama. Bićete obaviješteni o svakom novom postu u svakoj temi, a broj novih odgovora će biti prikazan."
         watching_first_post:
           title: "Pratiti prve objave"
           description: "Bićete obaviješteni o novim temama u ovoj kategoriji, ali ne i odgovorima na teme."
         tracking:
           title: "Praćenje"
-          description: "Automatski ćete pratiti sve teme u ovim kategorijama. Bit ćete obaviješteni ako netko spominje vaše @korisničko-ime ili vam nešto odgovori, a prikazat će se i broj novih odgovora."
         regular:
           title: "Normalno"
           description: "Dobiti ćete obavjest kada neko spomene tvoje @korisničko-ime ili odgovori na tvoj post."
@@ -2671,6 +2663,14 @@ bs_BA:
     flagging:
       title: "Zašto prijavljujete ovaj post?"
       action: "Prijavi objavu"
+      take_action_options:
+        default:
+          title: "Poduzmi Akciju"
+          details: "Dođite odmah do praga za oznake, umjesto da čekate još oznaka od zajednice."
+        suspend:
+          title: "Suspend User"
+        silence:
+          title: "Stišaj korisnika"
       notify_action: "Privatna Poruka"
       official_warning: "Oficonalno upozorenje"
       delete_spammer: "Obriši Spamera"
@@ -2745,12 +2745,6 @@ bs_BA:
         title: "Ova tema je lična poruka"
         help: "Ova tema je lična poruka"
     posts: "Odgovori"
-    posts_likes_MF: |
-      This topic has {count, plural, one {1 post} other {# posts}} {ratio, select,
-      low {with a high like to post ratio}
-      med {with a very high like to post ratio}
-      high {with an extremely high like to post ratio}
-      other {}}
     original_post: "Originalni Odgovor"
     views: "Pregledi"
     views_lowercase:
@@ -2774,7 +2768,6 @@ bs_BA:
       few: "korisnika"
       other: "korisnika"
     category_title: "Kategorija"
-    history: "Historija"
     changed_by: "od %{author}"
     raw_email:
       title: "Dolazna email"
@@ -3106,6 +3099,10 @@ bs_BA:
     safe_mode:
       enabled: "Bezbedan režim je omogućen, da biste izašli iz bezbednog režima, zatvorite ovaj prozor pregledača"
     image_removed: "(slika uklonjena)"
+    do_not_disturb:
+      remaining: "%{remaining} preostalo"
+      options:
+        custom: "Custom"
   admin_js:
     type_to_filter: "kucaj da sortiraš..."
     admin:
@@ -3133,6 +3130,8 @@ bs_BA:
         installed_version: "Installed"
         latest_version: "Zadnje"
         problems_found: "Neki saveti na osnovu vaših trenutnih postavki sajta"
+        new_features:
+          dismiss: "Odpusti"
         last_checked: "Zadnje pogledani"
         refresh_problems: "Osvježi"
         no_problems: "No problems were found."
@@ -3222,10 +3221,6 @@ bs_BA:
             available: "Ime grupe je dostupno"
             not_available: "Naziv grupe nije dostupan"
             blank: "Naziv grupe ne može biti prazan"
-        bulk_add:
-          title: "Dodaj u grupu"
-          complete_users_not_added: "Ovi korisnici nisu dodani (provjerite imaju li račun):"
-          paste: "Zalijepite popis korisničkih imena ili e-poruka, po jedan u retku:"
         add_members:
           as_owner: "Postavite korisnika kao vlasnike ove grupe"
         manage:
@@ -3250,7 +3245,6 @@ bs_BA:
             effects: Efekti
             trust_levels_none: "Ništa"
             automatic_membership_email_domains: "Korisnici koji se registriraju s email domenom koja točno odgovora jednoj na ovom popisu biti će automatski dodani u ovu grupu:"
-            automatic_membership_user_count: "%{count} korisnika ima nove domene e-pošte i bit će dodani u grupu."
             primary_group: "Automatski postavi kao primarnu grupu"
         name_placeholder: "Ime grupe, bez razmaka, ista pravila kao za korisničko ime"
         primary: "Primary Group"
@@ -3295,9 +3289,11 @@ bs_BA:
         all_api_keys: Svi API ključevi
         user_mode: Korisnički nivo
         impersonate_all_users: Impersonaliziraj bilo kojeg korisnika
+        single_user: "Jedan korisnik"
         save: Sačuvaj
         continue: Nastavi
         scopes:
+          action: Djelo
           descriptions:
             users:
               bookmarks: Poredak korisničkih zabilješki. Ispostavlja podsjetnike za zabilješke koristeći ICS format.
@@ -3342,7 +3338,6 @@ bs_BA:
           details: "Kada postoji novi odgovor, uredite, obrišite ili oporavite."
         user_event:
           name: "Korisnički događaj"
-          details: "Kada se korisnik prijavi, odjavi se, kreira, odobrava ili ažurira."
         group_event:
           name: "Grupni događaj"
           details: "Kada se grupa kreira, ažurira ili uništava."
@@ -3917,31 +3912,20 @@ bs_BA:
         title: "Pogledane Rijeći"
         search: "pretaži"
         clear_filter: "Clear"
-        show_words: "pokazuju reči"
-        one_word_per_line: "Jedna riječ po retku"
         download: Skinuti
         clear_all: Očisti sve
-        clear_all_confirm_block: "Jeste li sigurni da želite izbrisati sve riječi koje ste gledali za akciju Blok?"
-        clear_all_confirm_censor: "Jeste li sigurni da želite izbrisati sve riječi koje ste gledali za Censor akciju?"
-        clear_all_confirm_flag: "Jeste li sigurni da želite izbrisati sve riječi koje ste gledali za radnju Flag?"
-        clear_all_confirm_require_approval: "Jeste li sigurni da želite izbrisati sve riječi koje ste gledali za radnju Zahtijevanje odobrenja?"
-        word_count:
-          one: "%{count} riječ"
-          few: "%{count} riječi"
-          other: "%{count} riječi"
         actions:
           block: "Block"
           censor: "Censor"
           require_approval: "Zahtjeva Dozvolu"
           flag: "Prijava"
+          replace: "Zamijeni"
         action_descriptions:
           block: "Spriječite postavljanje postova koji sadrže ove riječi. Korisnik će vidjeti poruku o pogrešci kada pokuša da pošalje svoj post."
           censor: "Dopustite poruke koje sadrže te riječi, ali ih zamijenite znakovima koji kriju cenzurirane riječi."
           require_approval: "Postovi koji sadrže ove riječi će zahtijevati odobrenje osoblja prije nego što se mogu vidjeti."
           flag: "Dozvoli objave koje sadrže ove riječi, ali prijavi ih kao neadekvatne kako bi ih moderatori mogli analizirati gledajući na kontekst i značenje"
         form:
-          label: "Nova Rijeć"
-          placeholder: "punu riječ ili * kao zamjenski znak"
           placeholder_regexp: "regularni izraz"
           add: "Dodaj"
           success: "Uspjeh"
@@ -3991,6 +3975,8 @@ bs_BA:
         check_email:
           title: "Reveal this user's email address"
           text: "Show"
+        check_sso:
+          text: "Show"
       user:
         suspend_failed: "Something went wrong suspending this user %{error}"
         unsuspend_failed: "Something went wrong unsuspending this user %{error}"
@@ -3998,6 +3984,7 @@ bs_BA:
         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."
         suspend_reason: "Reason"
+        suspend_reason_title: "Razlog suspenzije"
         suspend_message: "Email Message"
         suspend_message_placeholder: "Opciono, pružite više informacija o suspenziji i on će biti poslan e-poštom korisniku."
         suspended_by: "Suspended by"
@@ -4147,10 +4134,9 @@ bs_BA:
           on_grace_period: "Currently in promotion grace period, will not be demoted."
           locked_will_not_be_promoted: "Trust level locked. Will never be promoted."
           locked_will_not_be_demoted: "Trust level locked. Will never be demoted."
-        sso:
-          title: "Single Sign On"
+        discourse_connect:
           external_id: "External ID"
-          external_username: "Nadimak"
+          external_username: "Ime"
           external_name: "Ime"
           external_email: "Email"
           external_avatar_url: "Avatar URL"
@@ -4289,7 +4275,6 @@ bs_BA:
         icon: Icon
         image: Slika
         icon_help: "Unesite ime ikone fonta Awesome (upotrebite prefiks „daleko“ za regularne ikone i „fab-“ za ikone marke)"
-        image_help: "Unesite URL slike (nadjačava polje ikone ako su obje postavljene)"
         query: Badge Query (SQL)
         target_posts: Query targets posts
         auto_revoke: Run revocation query daily
@@ -4346,8 +4331,12 @@ bs_BA:
         add_host: "Dodaj host"
         settings: "Postavke ugrađivanja"
         crawling_settings: "Postavke Crawlera"
+        embed_post_limit: "Maximum number of posts to embed"
         embed_title_scrubber: "Regular expression korišten za čistku naslova objava"
         embed_truncate: "Skrati embedovane objave"
+        allowed_embed_selectors: "CSS selector za elemente koji su dozvoljeni u embeds"
+        blocked_embed_selectors: "CSS selector za elemente koji su odstranjeni sa embeds"
+        allowed_embed_classnames: "Dopuštena CSS class imena"
         save: "Sačuvaj Embedding postavke"
       permalink:
         title: "Permalink-ovi"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index c37a3ce056..4eae0af18b 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -157,6 +157,8 @@ ca:
     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."
+    software_update_prompt:
+      dismiss: "Descarta-ho"
     bootstrap_mode_disabled: "El mode d'arrencada serà desactivat d'aquí a 24 hores."
     themes:
       default_description: "Per defecte"
@@ -217,6 +219,9 @@ ca:
     now: "ara mateix"
     read_more: "llegeix més"
     more: "Més"
+    x_more:
+      one: "%{count} Més"
+      other: "%{count} Més"
     less: "Menys"
     never: "mai"
     every_30_minutes: "cada 30 minuts"
@@ -245,8 +250,6 @@ ca:
       moderators: "Moderadors"
       stat:
         all_time: "Sempre"
-        last_7_days: "Darrers 7"
-        last_30_days: "Darrers 30"
       like_count: "'M'agrada'"
       topic_count: "Temes"
       post_count: "Publicacions"
@@ -267,6 +270,7 @@ ca:
       remove: "Elimina preferit"
       confirm_clear: "Esteu segur que voleu eliminar tots els preferits d'aquest tema?"
       save: "Desa"
+      no_user_bookmarks: "No teniu publicacions en els preferits. Els preferits us permeten referir-vos fàcilment a publicacions específiques. "
       auto_delete_preference:
         never: "Mai"
         when_reminder_sent: "Una vegada enviat el recordatori"
@@ -274,17 +278,6 @@ ca:
       search_placeholder: "Cerqueu preferits per nom, títol del tema o contingut de la publicació"
       search: "Cerca"
       reminders:
-        later_today: "Més tard avui"
-        next_business_day: "El pròxim dia feiner"
-        tomorrow: "Demà"
-        next_week: "La setmana que ve"
-        later_this_week: "Més avant aquesta setmana"
-        start_of_next_business_week: "Dilluns"
-        start_of_next_business_week_alt: "Dilluns vinent"
-        next_month: "El mes que ve"
-        custom: "Data i hora personalitzades"
-        last_custom: "Darrer"
-        none: "No cal cap recordatori"
         today_with_time: "avui a les %{time}"
         tomorrow_with_time: "demà a les %{time}"
         at_time: "%{date_time}"
@@ -298,9 +291,7 @@ ca:
       new_private_message: "Esborrany de nou missatge privat"
       topic_reply: "Esborrany de resposta"
       abandon:
-        confirm: "Ja heu obert un altre esborrany en aquest tema. Esteu segur que voleu abandonar-lo?"
-        yes_value: "Sí, abandona"
-        no_value: "No, segueix"
+        yes_value: "Descarta"
     topic_count_latest:
       one: "Vegeu %{count} tema nou o actualitzat"
       other: "Vegeu %{count} temes nous o actualitzats"
@@ -396,6 +387,7 @@ ca:
       topic: "Tema:"
       filtered_topic: "Heu filtrat a contingut revisable en un sol tema."
       filtered_user: "Usuari"
+      filtered_reviewed_by: "Revisat per"
       show_all_topics: "mostra tots els temes"
       deleted_post: "(publicació suprimida)"
       deleted_user: "(usuari suprimit)"
@@ -406,10 +398,8 @@ ca:
         email: "Correu electrònic"
         name: "Nom"
         fields: "Camps"
+        reject_reason: "Motiu"
       user_percentage:
-        summary:
-          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"
@@ -452,7 +442,8 @@ ca:
           created_at_asc: "Creat (invers)"
         priority:
           title: "Prioritat mínima"
-          low: "(qualsevol)"
+          any: "(qualsevol)"
+          low: "Baixa"
           medium: "Mitjana"
           high: "Alta"
       conversation:
@@ -490,6 +481,8 @@ ca:
           title: "Publicació en cua"
         reviewable_user:
           title: "Usuari"
+        reviewable_post:
+          title: "Publicació"
       approval:
         title: "Cal aprovar la publicació"
         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."
@@ -497,6 +490,21 @@ ca:
           one: "Teniu <strong>%{count}</strong> publicació pendent."
           other: "Teniu <strong>%{count}</strong> publicacions pendents."
         ok: "D'acord"
+      example_username: "nom d'usuari"
+    relative_time_picker:
+      days:
+        one: "dia"
+        other: "dies"
+    time_shortcut:
+      later_today: "Més tard avui"
+      next_business_day: "El pròxim dia feiner"
+      tomorrow: "Demà"
+      next_week: "La setmana que ve"
+      later_this_week: "Més avant aquesta setmana"
+      start_of_next_business_week: "Dilluns"
+      start_of_next_business_week_alt: "Dilluns vinent"
+      next_month: "El mes que ve"
+      custom: "Data i hora personalitzades"
     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>"
@@ -512,6 +520,7 @@ ca:
       sent_by_user: "Enviat per <a href='%{userUrl}'>%{user}</a>"
       sent_by_you: "Enviat per <a href='%{userUrl}'>vós</a>"
     directory:
+      username: "Nom d'usuari"
       filter_name: "filtra per usuari"
       title: "Usuaris"
       likes_given: "Lliurat"
@@ -581,9 +590,17 @@ ca:
             imap_ssl: "Utilitza SSL per a SMTP"
             username: "Nom d'usuari"
             password: "Contrasenya"
+          settings:
+            title: "Configuració"
+          mailboxes:
+            disabled: "desactivat"
         membership:
           title: Membres
           access: Accés
+        categories:
+          title: Categories
+        tags:
+          title: Etiquetes
         logs:
           title: "Registres"
           when: "Quan"
@@ -594,6 +611,8 @@ ca:
           details: "Detalls"
           from: "De"
           to: "A"
+      permissions:
+        title: "Permisos"
       public_admission: "Permet als usuaris d'unir-se al grup lliurement (cal que el grup sigui visible públicament)"
       public_exit: "Permet que els usuaris abandonin el grup lliurement"
       empty:
@@ -723,18 +742,21 @@ ca:
       posts: "Publicacions"
       topics: "Temes"
       latest: "Més recents"
-      latest_by: "més recent per"
       toggle_ordering: "commuta el control de l'ordre"
       subcategories: "Subcategories"
       topic_sentence:
         one: "%{count} tema"
         other: "%{count} temes"
+      topic_stat_unit:
+        week: "setmana"
+        month: "mes"
       topic_stat_sentence_week:
         one: "%{count} tema nou la setmana passada."
         other: "%{count} temes nous la setmana passada. "
       topic_stat_sentence_month:
         one: "%{count} tema nou el mes passat."
         other: "%{count} temes nous el mes passat. "
+      n_more: "Categories (%{count} més)..."
     ip_lookup:
       title: Explora adreça IP
       hostname: Nom d'amfitrió
@@ -785,7 +807,12 @@ ca:
         mute_option_title: "No rebreu cap notificació relacionada amb aquest usuari."
         normal_option: "Normal"
         normal_option_title: "Sereu notificat si l'usuari us respon, us cita o us menciona."
+      notification_schedule:
+        none: "Cap"
+        monday: "Dilluns"
+        to: "a"
       activity_stream: "Activitat"
+      read: "Llegit"
       preferences: "Preferències"
       feature_topic_on_profile:
         save: "Desa"
@@ -809,7 +836,6 @@ ca:
         perm_denied_expl: "Heu denegat el permís per a les notificacions. Les podeu permetre en les preferències del vostre navegador."
         disable: "Desactiva les notificacions"
         enable: "Activa les notificacions"
-        each_browser_note: "Nota: cal canviar aquesta configuració en cada navegador que feu servir."
         consent_prompt: "Voleu notificacions en directe quan algú respon a les vostres publicacions?"
       dismiss: "Descarta-ho"
       dismiss_notifications: "Descarta-ho tot"
@@ -818,7 +844,6 @@ ca:
       dynamic_favicon: "Mostra recomptes en la icona del navegador"
       theme_default_on_all_devices: "Fes que aquesta sigui l'aparença predeterminada en tots els meus dispositius"
       color_schemes:
-        default_description: "Per defecte"
         disable_dark_scheme: "Igual que habitualment"
         dark_instructions: "Podeu previsualitzar l’esquema de colors del mode fosc alternant el mode fosc del dispositiu."
         undo: "Restableix"
@@ -842,6 +867,7 @@ ca:
       suspended_notice: "Aquest usuari és suspès fins a %{date}."
       suspended_permanently: "Aquest usuari és suspès."
       suspended_reason: "Motiu:"
+      github_profile: "GitHub"
       email_activity_summary: "Resum d'activitat"
       mailing_list_mode:
         label: "Mode de llista de correu"
@@ -914,6 +940,7 @@ ca:
         tags: "Etiquetes"
       preferences_nav:
         account: "Compte"
+        security: "Seguretat"
         profile: "Perfil"
         emails: "Correus"
         notifications: "Notificacions"
@@ -1003,6 +1030,8 @@ ca:
       change_card_background:
         title: "Fons de la targeta d'usuari"
         instructions: "Les imatges de fons se centraran i tindran una amplada per defecte de 590px."
+      change_featured_topic:
+        title: "Tema destacat"
       email:
         title: "Correu electrònic"
         primary: "Adreça de correu primària"
@@ -1014,7 +1043,6 @@ ca:
         set_primary: "Estableix el correu electrònic principal"
         destroy: "Elimina el correu electrònic"
         add_email: "Afegeix un correu electrònic alternatiu"
-        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ó"
@@ -1141,46 +1169,41 @@ ca:
         after_10_minutes: "al cap de 10 minuts"
       notification_level_when_replying: "Quan jo publiqui en un tema nou, estableix aquest tema a"
       invited:
-        search: "escriu aquí per a cercar invitacions..."
         title: "Invitacions"
+        pending_tab: "Pendents"
+        pending_tab_with_count: "Pendents (%{count})"
+        redeemed_tab: "Acceptada"
+        redeemed_tab_with_count: "Acceptades (%{count})"
+        invited_via: "Invitació"
+        groups: "Grups"
+        topic: "Tema"
+        edit: "Edita"
+        remove: "Elimina"
+        reinvited: "Invitació reenviada"
+        search: "escriu aquí per a cercar invitacions..."
         user: "Usuari convidat"
-        sent: "Darrer enviat"
         none: "Cap invitació per a mostrar."
         truncated:
           one: "Mostrant la primera invitació."
           other: "Mostrant les primeres %{count} invitacions."
         redeemed: "Invitacions acceptades"
-        redeemed_tab: "Acceptada"
-        redeemed_tab_with_count: "Acceptades (%{count})"
         redeemed_at: "Acceptada"
         pending: "Invitacions pendents"
-        pending_tab: "Pendents"
-        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"
-        rescinded_all: "Totes les invitacions expirades eliminades!"
-        rescind_all_confirm: "Esteu segur que voleu eliminar totes les invitacions expirades?"
-        reinvite: "Reenvia la invitació"
-        reinvite_all: "Reenvia totes les invitacions"
+        removed_all: "Totes les invitacions expirades eliminades!"
+        remove_all_confirm: "Esteu segur que voleu eliminar totes les invitacions expirades?"
         reinvite_all_confirm: "Esteu segur que voleu reenviar totes les invitacions?"
-        reinvited: "Invitació reenviada"
-        reinvited_all: "Totes les invitacions reenviades!"
         time_read: "Temps de lectura"
         days_visited: "Dies visitats"
         account_age_days: "Antiguitat del compte en dies"
-        links_tab: "Enllaços"
-        link_created_at: "Creat"
-        link_groups: Grups
+        create: "Convida"
         valid_for: "L'enllaç d'invitació només és vàlid per a aquesta adreça de correu: %{email}"
         invite_link:
           success: "Enllaç d'invitació generat emb èxit!"
         bulk_invite:
-          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. "
       password:
         title: "Contrasenya"
         too_short: "La contrasenya és massa curta."
@@ -1279,7 +1302,6 @@ ca:
     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ó."
     refresh: "Actualitza"
     home: "Pàgina principal"
@@ -1293,15 +1315,6 @@ ca:
       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}}."
     learn_more: "per a saber-ne més..."
-    all_time: "total"
-    all_time_desc: "total de temes creats"
-    year: "any"
-    year_desc: "temes creats durant els darrers 365 dies"
-    month: "mes"
-    month_desc: "temes creats durant els darrers 30 dies"
-    week: "setmana"
-    week_desc: "temes creats durant els darrers 7 dies"
-    day: "dia"
     first_post: Primera publicació
     mute: Silencia
     unmute: Desfés el silenciament
@@ -1318,13 +1331,10 @@ ca:
       sign_up: "Registre"
       hide_session: "Recorda-m'ho demà"
       hide_forever: "no, gràcies"
-      hidden_for_session: "D'acord, us ho demanarem demà. Sempre podeu fer servir també <i>Inicia la sessió</i> per a crear un compte."
       intro: "Bon dia! Sembla que gaudiu de la discussió, però no heu registrat un compte."
       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>."
       enable: "Resumeix aquest tema"
       disable: "Mostra totes les publicacions"
     deleted_filter:
@@ -1334,6 +1344,7 @@ ca:
       disable: "Mostra publicacions suprimides"
     private_message_info:
       title: "Missatge"
+      add: "Afegeix..."
       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?"
@@ -1345,8 +1356,8 @@ ca:
     trust_level: "Nivell de confiança"
     search_hint: "nom d'usuari, adreça electrònica o adreça IP"
     create_account:
+      header_title: "Benvingut!"
       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:
       title: "Restabliment de contrasenya"
@@ -1375,7 +1386,6 @@ ca:
       logging_in_as: Iniciant sessió com a %{email}
       confirm_button: Acaba l'inici de sessió
     login:
-      title: "Inicia la sessió"
       username: "Usuari"
       password: "Contrasenya"
       second_factor_description: "Introduïu el codi d'autenticació de la vostra aplicació:"
@@ -1388,7 +1398,6 @@ ca:
       security_key_not_allowed_error: "El procés d'autenticació de claus de seguretat ha arribat al límit de temps o s'ha cancel·lat. "
       security_key_no_matching_credential_error: "No s'ha trobat cap credencial coincident amb la clau de seguretat proporcionada."
       security_key_support_missing_error: "El vostre dispositiu o navegador actual no admet l'ús de claus de seguretat. Utilitzeu un mètode diferent."
-      email_placeholder: "correu electrònic o nom d'usuari"
       caps_lock_warning: "El bloqueig de majúscula és activat"
       error: "Error desconegut"
       cookies_error: "Sembla que el vostre navegador té les galetes desactivades. És possible que no pugueu iniciar sessió sense activar-les primer."
@@ -1444,6 +1453,7 @@ ca:
       accept_invite: "Accepta la invitació"
       success: "S'ha creat el compte i ara heu iniciat la sessió."
       name_label: "Nom"
+      password_label: "Contrasenya"
       optional_description: "(opcional)"
     password_reset:
       continue: "Continua a %{site_name}"
@@ -1451,7 +1461,6 @@ ca:
       apple_international: "Apple/Internacional"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (abans EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1484,8 +1493,6 @@ ca:
     date_time_picker:
       from: De
       to: A
-      errors:
-        to_before_from: "La data final ha de ser posterior a la data inicial."
     emoji_picker:
       filter_placeholder: Cerca un emoji
       smileys_&_emotion: Emoticones
@@ -1507,7 +1514,6 @@ 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>."
       destination_category: "Categoria de destinació"
       publish: "Publica l'esborrany compartit"
       confirm_publish: "Esteu segur que voleu publicar aquest esborrany?"
@@ -1518,7 +1524,6 @@ ca:
       options: "Opcions"
       whisper: "xiuxiueig"
       unlist: "invisible"
-      blockquote_text: "Bloc de citació"
       add_warning: "Aquest és un avís oficial."
       toggle_whisper: "Commuta el xiuxiueig"
       toggle_unlisted: "Commuta invisible"
@@ -1537,10 +1542,7 @@ ca:
       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"
         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}?"
         category_missing: "Heu de triar una categoria"
         topic_template_not_modified: "Afegiu detalls i especificacions al tema editant la plantilla."
@@ -1570,8 +1572,6 @@ ca:
       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ó"
       quote_post_title: "Cita tota la publicació"
       bold_label: "B"
       bold_title: "Negreta"
@@ -1584,8 +1584,8 @@ ca:
       link_dialog_title: "Insereix un enllaç"
       link_optional_text: "títol opcional"
       link_url_placeholder: "Enganxeu un URL o escriviu per a cercar temes"
-      quote_title: "Bloc de citació"
-      quote_text: "Bloc de citació"
+      blockquote_title: "Bloc de citació"
+      blockquote_text: "Bloc de citació"
       code_title: "Text preformatat"
       code_text: "Text amb sagnat preformatat de 4 espais"
       paste_code_text: "escriviu o enganxeu el codi aquí"
@@ -1630,10 +1630,10 @@ ca:
           label: "Tema nou"
         shared_draft:
           label: "Esborrany compartit"
-          desc: "Esborrany d'un tema que sols serà visible a l'equip responsable"
         toggle_topic_bump:
           label: "Commuta l'elevació del tema"
           desc: "Respon sense canviar la data més recent de resposta"
+      ignore: "Ignora"
     notifications:
       tooltip:
         regular:
@@ -1655,6 +1655,10 @@ ca:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} i %{count} altre</span> %{description}"
+        other: "<span class='multi-user'>%{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'"
@@ -1669,6 +1673,8 @@ ca:
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Tema nou</span> %{description}"
       membership_request_accepted: "Membre acceptat en '%{group_name}'"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       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}"
@@ -1710,10 +1716,7 @@ 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} "
       local_tip: "seleccioneu imatges des del vostre dispositiu"
-      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"
       select_file: "Tria un fitxer"
@@ -1743,6 +1746,7 @@ ca:
       or_search_google: "O proveu de cercar amb Google:"
       search_google: "Prova de cercar amb Google:"
       search_google_button: "Google"
+      search_button: "Cerca"
       context:
         user: "Cerca publicacions de @%{username}"
         category: "Cerca en la categoria #%{category} "
@@ -1785,16 +1789,19 @@ ca:
           noreplies: tenen zero respostes
           single_user: contenen un únic usuari
         post:
+          count:
+            label: Publicacions
           time:
             label: Publicat
             before: abans de
             after: després de
+        views:
+          label: Vistes
     hamburger_menu: "vés a una altra llista de temes o categories"
     new_item: "nous"
     go_back: "vés enrere"
     not_logged_in_user: "pàgina d'usuari amb resum de l'activitat actual i preferències "
     current_user: "vés a la meva pàgina d'usuari"
-    view_all: "mostra-ho tot"
     topics:
       new_messages_marker: "darrera visita"
       bulk:
@@ -1815,6 +1822,7 @@ ca:
         change_category: "Defineix categoria"
         close_topics: "Tanca temes"
         archive_topics: "Arxiva temes"
+        move_messages_to_inbox: "Mou a la safata d'entrada"
         notification_level: "Notificacions"
         choose_new_category: "Seleccioneu la categoria nova per als temes:"
         selected:
@@ -1833,8 +1841,6 @@ ca:
         bookmarks: "Encara no heu marcat temes com a preferits."
         category: "No hi ha temes de %{category}."
         top: "No hi ha temes principals."
-        educate:
-          unread: '<p>Els vostres temes nous són aquí.</p><p>Per defecte, els temes es consideren sense llegir i mostraran recomptes de no llegits <span class="badge new-posts badge-notification">1</span> si:</p><ul><li>heu creat el tema</li><li>heu respost al tema</li><li>heu llegit el tema durant més de 4 minuts</li></ul><p>o si heu marcat explícitament el tema com a vigilat amb el control de notificació a baix de cada tema.</p><p>Visiteu les vostres <a href="%{userPrefsUrl}">preferències</a> per a canviar-ho.</p>'
       bottom:
         latest: "No hi ha més temes recents."
         posted: "No hi ha més temes publicats."
@@ -1842,6 +1848,7 @@ ca:
         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}."
+        tag: "No hi ha més temes de %{tag}."
         top: "No hi ha més temes destacats."
         bookmarks: "No hi ha més temes marcats com a preferits."
     topic:
@@ -1903,12 +1910,14 @@ ca:
       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}."
       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 {}}"
       browse_all_categories: Navega per totes les categories
       view_latest_topics: mira els temes més recents
       jump_reply_up: salta a la resposta anterior
       jump_reply_down: salta a la resposta posterior
       deleted: "El tema ha estat suprimit"
+      slow_mode_update:
+        save: "Activa"
+        remove: "Desactiva"
       topic_status_update:
         title: "Temporitzador de tema"
         save: "Estableix el temporitzador"
@@ -1916,7 +1925,7 @@ ca:
         remove: "Elimina el temporitzador"
         publish_to: "Publica en:"
         when: "Quan:"
-        time_frame_required: Seleccioneu un període de temps
+        time_frame_required: "Seleccioneu un període de temps"
       auto_update_input:
         none: "Seleccioneu un període de temps"
         later_today: "Més tard avui"
@@ -1924,13 +1933,7 @@ ca:
         later_this_week: "Més avant aquesta setmana"
         this_weekend: "Aquest cap de setmana"
         next_week: "La setmana que ve"
-        two_weeks: "Dues setmanes"
         next_month: "El mes que ve"
-        two_months: "Dos mesos"
-        three_months: "Tres mesos"
-        four_months: "Quatre mesos"
-        six_months: "Sis mesos"
-        one_year: "Un any"
         forever: "Sempre"
         pick_date_and_time: "Trieu data i hora"
         set_based_on_last_post: "Tanca d'acord amb la darrera publicació"
@@ -1944,7 +1947,6 @@ ca:
         title: "Tanca temporalment"
       auto_close:
         title: "Tanca el tema automàticament"
-        label: "Hores per al tancament automàtic del tema:"
         error: "Introduïu un valor vàlid."
         based_on_last_post: "No el tanquis fins que la darrera publicació del tema tingui almenys aquesta edat."
       auto_delete:
@@ -1957,7 +1959,7 @@ ca:
         auto_open: "Aquest tema s'obrirà automàticament %{timeLeft}"
         auto_close: "El tema es tancarà automàticament %{timeLeft}."
         auto_publish_to_category: "Aquest tema serà publicat en <a href=%{categoryUrl}>#%{categoryName}</a>%{timeLeft}"
-        auto_close_based_on_last_post: "Aquest tema es tancarà %{duration} després de la darrera resposta."
+        auto_close_after_last_post: "Aquest tema es tancarà %{duration} després de la darrera resposta."
         auto_delete: "Aquest tema serà suprimit automàticament %{timeLeft}"
         auto_bump: "Aquest tema serà elevat automàticament %{timeLeft}."
         auto_reminder: "Rebreu un recordatori sobre aquest tema %{timeLeft}"
@@ -1976,7 +1978,6 @@ ca:
         go: "vés"
         jump_bottom: "salta a la darrera publicació"
         jump_prompt: "salta a..."
-        jump_prompt_of: "de %{count} publicacions"
         jump_prompt_long: "Salta a..."
         jump_bottom_with_number: "salta a la publicació %{post_number}"
         jump_prompt_to_date: "fins a la data"
@@ -2060,6 +2061,7 @@ ca:
         title: "Comparteix"
         extended_title: "Comparteix un enllaç"
         help: "comparteix un enllaç a aquest tema"
+        invite_users: "Convida"
       print:
         title: "Imprimeix"
         help: "Obre una versió imprimible d'aquest tema"
@@ -2111,14 +2113,13 @@ ca:
         username_placeholder: "nom d'usuari"
         action: "Envia la invitació"
         help: "Convida altres a aquest tema per correu o amb notificacions."
-        to_forum: "Enviarem un breu correu electrònic al vostre contacte amb una autorització per a unir-s'hi immediatament en fer clic en un enllaç. No cal iniciar sessió."
-        sso_enabled: "Introduïu el nom d'usuari de la persona a qui voleu convidar a aquest tema."
+        discourse_connect_enabled: "Introduïu el nom d'usuari de la persona a qui voleu convidar a aquest tema."
         to_topic_blank: "Escriviu el nom d'usuari o l'adreça electrònica de la persona a qui voleu convidar a aquest tema."
         to_topic_email: "Heu introduït una adreça de correu electrònic. Us enviarem una invitació que permetrà al vostre contacte respondre immediatament a aquest tema."
         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>%{invitee}</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."
@@ -2213,11 +2214,10 @@ ca:
         other: "(tema abandonat per l'autor, serà suprimit automàticament en %{count} hores llevat que sigui senyalat amb bandera)"
     post:
       quote_reply: "Cita"
+      quote_share: "Comparteix"
       edit_reason: "Motiu:"
       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}:"
@@ -2257,16 +2257,8 @@ ca:
         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."
-      abandon_edit:
-        confirm: "Esteu segur que voleu descartar els canvis?"
-        no_value: "No, segueix"
-        no_save_draft: "No, desa l'esborrany"
-        yes_value: "Sí, descarta l'edició"
-      abandon:
-        confirm: "Esteu segur que voleu abandonar la vostra publicació?"
-        no_value: "No, segueix"
-        no_save_draft: "No, desa l'esborrany"
-        yes_value: "Sí, abandona"
+      cancel_composer:
+        discard: "Descarta"
       via_email: "aquesta publicació ha arribat per correu electrònic"
       via_auto_generated_email: "aquesta publicació ha arribat per correu electrònic generat automàticament"
       whisper: "aquesta publicació és un xiuxiueig privat per a moderadors"
@@ -2421,6 +2413,11 @@ ca:
       change_in_category_topic: "Edita la descripció"
       already_used: "Aquest color ha estat utilitzat per una altra categoria"
       security: "Seguretat"
+      permissions:
+        group: "Grup"
+        see: "Mira"
+        reply: "Respon"
+        create: "Crea"
       special_warning: "Atenció: aquesta és una categoria preconfigurada i no se'n pot editar la configuració de seguretat. Si no voleu fer servir aquesta categoria, suprimiu-la en comptes de reutilitzar-la."
       uncategorized_security_warning: "Aquesta categoria és especial. Es tracta d'una àrea de manteniment per a temes que no tenen cap categoria; no pot tenir configuració de seguretat."
       uncategorized_general_warning: 'Aquesta categoria és especial. S''utilitza com a categoria per defecte per a temes nous que no tinguin una categoria seleccionada. Si voleu evitar aquest comportament i forçar la selecció de categories, <a href="%{settingLink}">desactiveu la configuració aquí</a>. Si voleu canviar el nom o la descripció, aneu a <a href="%{customizeLink}">Personalitza / Contingut de text</a> .'
@@ -2456,19 +2453,16 @@ ca:
       notifications:
         watching:
           title: "Vigilant"
-          description: "Vigilareu automàticament tots els temes en aquestes categories. Us notificarem de cada publicació nova en cada tema i us mostrarem un recompte de respostes noves."
         watching_first_post:
           title: "Vigilant la primera publicació"
           description: "Sereu notificat de temes nous en aquesta categoria però no de les respostes als temes."
         tracking:
           title: "Seguint"
-          description: "Automàticament seguireu tots els temes nous en aquestes categories. Sereu notificat si algú us @menciona o us respon, i se us mostrarà un recompte de respostes noves."
         regular:
           title: "Normal"
           description: "Sereu notificat si algú us @menciona o us respon."
         muted:
           title: "Silenciat"
-          description: "No us notificarem mai res sobre temes nous en aquestes categories i no apareixeran en més recents."
       search_priority:
         label: "Prioritat de cerca"
         options:
@@ -2503,10 +2497,17 @@ ca:
     flagging:
       title: "Gràcies per ajudar a mantenir endreçada la comunitat!"
       action: "Marca la publicació amb bandera "
+      take_action_options:
+        default:
+          title: "Actua"
+          details: "Arriba al límit de banderes immediatament, més que no pas esperar més banderes de la comunitat"
+        suspend:
+          title: "Suspèn l'usuari"
+        silence:
+          title: "Usuari silenciat"
       notify_action: "Missatge"
       official_warning: "Avís oficial"
       delete_spammer: "Suprimeix generador de brossa"
-      delete_confirm_MF: "Esteu a punt de suprimir {POSTS, plural, one {<b>1</b> publicació} other {<b>#</b> publicacions}} and {TOPICS, plural, one {<b>1</b> tema} other {<b>#</b> temes}} d'aquest usuari, suprimir el seu compte, blocar identificacions des de l'adreça IP <b>{ip_address}</b> i afegir l'adreça de correu electrònic <b>{email}</b> a una llista de bloqueig permanent. Esteu segur que aquest usuari realment genera brossa?"
       yes_delete_spammer: "Sí, suprimeix generador de brossa"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(amagat)"
@@ -2573,12 +2574,6 @@ ca:
         title: "Aquest tema és un missatge personal"
         help: "Aquest tema és un missatge personal"
     posts: "Publicacions"
-    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ó}
-      med {amb una proporció molt alta de 'm'agrada' per publicació}
-      high {amb una proporció extremament alta de 'm'agrada' per publicació}
-      other {}}
     original_post: "Publicació original"
     views: "Vistes"
     views_lowercase:
@@ -2598,7 +2593,6 @@ ca:
       one: "usuari"
       other: "usuaris"
     category_title: "Categoria"
-    history: "Historial"
     changed_by: "per %{author}"
     raw_email:
       title: "Correu entrant"
@@ -2871,6 +2865,10 @@ ca:
       dismiss: "Descarta-ho"
     safe_mode:
       enabled: "El mode segur està activat. Per a sortir-ne tanqueu aquesta finestra del navegador."
+    do_not_disturb:
+      remaining: "%{remaining} restant"
+      options:
+        custom: "Personalitzat"
   admin_js:
     type_to_filter: "escriu per a filtrar..."
     admin:
@@ -2898,6 +2896,8 @@ ca:
         installed_version: "Instal·lat"
         latest_version: "Més recents"
         problems_found: "Uns quants consells basats en la configuració actual del lloc web."
+        new_features:
+          dismiss: "Descarta-ho"
         last_checked: "Comprovat per darrera vegada"
         refresh_problems: "Actualitza"
         no_problems: "No s'han trobat problemes."
@@ -2950,6 +2950,9 @@ ca:
           view_table: "taula"
           view_graph: "gràfica"
           refresh_report: "Actualitza el report"
+          daily: Diàriament
+          monthly: Mensualment
+          weekly: Setmanalment
           groups: "Tots els grups"
           disabled: "Aquest report és desactivat."
           totals_for_sample: "Totals per mostra"
@@ -2980,10 +2983,6 @@ ca:
             available: "El nom de grup és disponible"
             not_available: "El nom de grup no és disponible"
             blank: "El nom de grup no pot restar en blanc"
-        bulk_add:
-          title: "Afegeix a grup massivament"
-          complete_users_not_added: "Aquests usuaris no han estat afegits (assegureu-vos que tenen un compte)"
-          paste: "Enganxeu una llista de noms d'usuaris o de correus, un per línia:"
         add_members:
           as_owner: "Estableix usuaris com a propietaris d'aquest grup"
         manage:
@@ -3058,6 +3057,8 @@ ca:
         new_key: Nova clau d’API
         revoked: Revocat
         continue: Continua
+        scopes:
+          action: Acció
       web_hooks:
         title: "Webhooks"
         none: "Ara no hi ha webhooks."
@@ -3072,7 +3073,6 @@ ca:
         go_back: "Torna a la llista"
         payload_url: "URL de càrrega útil"
         payload_url_placeholder: "https://exemple.com/postreceive"
-        warn_local_payload_url: "Sembla que esteu provant de fer un webhook a un URL local. L'esdeveniment lliurat a una adreça local pot provocar efectes secundaris o comportaments inesperats. Continuem?"
         secret_invalid: "El secret no ha de tenir cap espai en blanc"
         secret_too_short: "El secret hauria de tenir un mínim de 12 caràcters."
         secret_placeholder: "Una cadena opcional, emprada per a generar una signatura"
@@ -3100,7 +3100,6 @@ ca:
           details: "Quan hi ha una resposta nova, editada, suprimida o recuperada."
         user_event:
           name: "Esdeveniment d'usuari"
-          details: "Quan un usuari inicia sessió, tanca sessió, és creat, aprovat o actualitzat."
         group_event:
           name: "Esdeveniment de grup"
           details: "Quan un grup és creat, actualitzat o destruït"
@@ -3681,30 +3680,20 @@ ca:
         title: "Paraules vigilades"
         search: "cerca"
         clear_filter: "Neteja"
-        show_words: "mostra paraules"
-        one_word_per_line: "Una paraula per línia"
         download: Descarrega
         clear_all: Neteja-ho tot
-        clear_all_confirm_block: "Esteu segur que voleu esborrar totes les paraules vigilades per a l’acció de 'Bloca'?"
-        clear_all_confirm_censor: "Esteu segur que voleu esborrar totes les paraules vigilades per a l’acció de 'Censura'?"
-        clear_all_confirm_flag: "Esteu segur que voleu esborrar totes les paraules vigilades per a l’acció de 'Marca amb bandera'?"
-        clear_all_confirm_require_approval: "Esteu segur que voleu esborrar totes les paraules vigilades per a l’acció de 'Requereix aprovació'?"
-        word_count:
-          one: "%{count} paraula"
-          other: "%{count} paraules"
         actions:
           block: "Bloca"
           censor: "Censura"
           require_approval: "Requereix aprovació"
           flag: "Bandera"
+          replace: "Reemplaça"
         action_descriptions:
           block: "Impedeix que es publiquin texts que continguin aquestes paraules. L'usuari veurà un missatge d'error quan intenti enviar la publicació. "
           censor: "Permet publicacions que contenen aquestes paraules, però reemplaça-les amb caràcters que amaguin les paraules censurades."
           require_approval: "Les publicacions que continguin aquestes paraules requeriran aprovació per l'equip responsable abans que puguin ser vistes. "
           flag: "Permet publicacions que contenen aquestes paraules, però senyala-les amb bandera com a inapropiades de manera que els moderadors puguin revisar-les"
         form:
-          label: "Paraula nova:"
-          placeholder: "paraula completa o * com a comodí"
           placeholder_regexp: "expressió regular"
           add: "Afegeix"
           success: "Èxit"
@@ -3758,6 +3747,8 @@ ca:
         check_email:
           title: "Mostra l'adreça de correu d'aquest usuari"
           text: "Mostra"
+        check_sso:
+          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}"
@@ -3765,6 +3756,7 @@ ca:
         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. "
         suspend_reason: "Motiu"
+        suspend_reason_title: "Raó de la suspensió"
         suspend_message: "Missatge de correu"
         suspend_message_placeholder: "Opcionalment, doneu més informació sobre la suspensió i s'enviarà per correu a l'usuari."
         suspended_by: "Suspès per"
@@ -3790,7 +3782,6 @@ ca:
         clear_penalty_history:
           title: "Neteja l'historial de penalitzacions"
           description: "els usuaris amb penalitzacions no poden assolir el nivell de confiança 3"
-        delete_all_posts_confirm_MF: "Esteu a punt de suprimir {POSTS, plural, one {1 publicació} other {# publicacions}} i {TOPICS, plural, one {1 tema} other {# temes}}. Esteu segur?"
         silence: "Silencia"
         unsilence: "Desfés el silenciament"
         silenced: "Silenciat?"
@@ -3921,8 +3912,7 @@ ca:
           on_grace_period: "Actualment en període de gràcia de promoció. No serà degradat. "
           locked_will_not_be_promoted: "Nivell de confiança blocat. No serà promogut mai. "
           locked_will_not_be_demoted: "Nivell de confiança blocat. No es degradarà mai."
-        sso:
-          title: "Single Sign On (SSO)"
+        discourse_connect:
           external_id: "ID extern"
           external_username: "Nom d'usuari"
           external_name: "Nom"
@@ -4065,7 +4055,6 @@ ca:
         icon: Icona
         image: Imatge
         icon_help: "Introduïu un nom d'icona Awesome Font (feu servir el prefix \"far-\" per a les icones normals i \"fab-\" per a les icones de marca)"
-        image_help: "Introduïu l'URL de la imatge (sobreescriu el camp de la icona si es defineixen tots dos). "
         query: Consulta d'insígnies (SQL)
         target_posts: La consulta té publicacions com a objectiu
         auto_revoke: Executa la consulta de revocacions diàriament
@@ -4127,6 +4116,9 @@ ca:
         embed_post_limit: "Nombre màxim de publicacions que s'incrusten "
         embed_title_scrubber: "Expressió regular emprada per a depurar el títol de les publicacions"
         embed_truncate: "Trunca les publicacions incrustades"
+        allowed_embed_selectors: "Selector de CSS per a elements permesos en les incrustacions"
+        blocked_embed_selectors: "Selector de CSS per a elements que han estat eliminats de les incrustacions"
+        allowed_embed_classnames: "Noms permesos de classes de CSS"
         save: "Desa la configuració d'incrustacions"
       permalink:
         title: "Enllaços permanents"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 45109f7219..e30634ffe2 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -28,7 +28,10 @@ cs:
         millions: "%{number}M"
     dates:
       time: "H:mm"
+      time_with_zone: "kk:mm (z)"
+      time_short_day: "ddd, kk:mm"
       timeline_date: "MMM YYYY"
+      long_no_year: "D. MMM, k:mm"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. M. YYYY, H:mm"
@@ -127,6 +130,11 @@ cs:
           few: "před %{count} dny"
           many: "před %{count} dny"
           other: "před %{count} dny"
+        x_months:
+          one: "před %{count} měsícem"
+          few: "před %{count} měsíci"
+          many: "před %{count} měsíci"
+          other: "před %{count} měsíci"
       later:
         x_days:
           one: "za %{count} den"
@@ -147,8 +155,12 @@ cs:
       next_month: "Další měsíc"
       placeholder: datum
     share:
+      topic_html: 'Téma: <span class="topic-title">%{topicTitle}</span>'
       post: "příspěvek #%{postNumber}"
       close: "zavřít"
+      twitter: "Sdílet na Twitteru"
+      facebook: "Sdílet na Facebooku"
+      email: "Odeslat e-mailem"
       url: "Zkopírujte a sdílejte URL adresu."
     action_codes:
       public_topic: "Téma zveřejněno %{when}"
@@ -181,12 +193,21 @@ cs:
       banner:
         enabled: "vytvořil(a) tento banner %{when}. Bude se zobrazovat nahoře na každé stránce, dokud nebude uživatelem odmítnut."
         disabled: "odstranil(a) tento banner %{when}. Už se nebude zobrazovat na každé stránce nahoře."
+      forwarded: "přeposlat výše uvedený e-mail"
     topic_admin_menu: "Akce tématu."
     wizard_required: "Vítejte ve vašem novém Discourse! Začněte s <a href='%{url}' data-auto-route='true'>nastavením pomocí průvodce</a> ✨"
     emails_are_disabled: "Všechny odchozí emaily byly administrátorem vypnuty. Žádné odchozí emaily nebudou odeslány."
+    software_update_prompt:
+      dismiss: "Označit jako přečtené"
+    bootstrap_mode_enabled:
+      one: "Aby spuštění vaší webové stránky bylo jednodušší, tak se nachází v bootstrap režimu. Všichni noví uživatelé dostanou vernostní úroveň 1 a mohou mít zapnuté denní emailové shrnutí. Toto se automaticky vypne, když %{count} uživatelů se připojí."
+      few: "Aby se váš web jednodušeji rozjel, nachází se v režimu bootstrap. Všichni noví uživatelé začínají s důveryhodností 1 a mají povolené denní odesílání souhrnných emailů. Tento režim se automaticky vypne, jakmile se zaregistruje alespoň %{count} uživatelů."
+      many: "Aby se váš web jednodušeji rozjel, nachází se v režimu bootstrap. Všichni noví uživatelé začínají s důveryhodností 1 a mají povolené denní odesílání souhrnných emailů. Tento režim se automaticky vypne, jakmile se zaregistruje alespoň %{count} uživatelů."
+      other: "Aby se váš web jednodušeji rozjel, nachází se v režimu bootstrap. Všichni noví uživatelé začínají s důveryhodností 1 a mají povolené denní odesílání souhrnných emailů. Tento režim se automaticky vypne, jakmile se zaregistruje alespoň %{count} uživatelů."
     bootstrap_mode_disabled: "Režim bootstrap bude deaktivován v následujících 24 hodinách."
     themes:
       default_description: "Výchozí"
+      broken_theme_alert: "Vaše stránka nemusí fungovat, protože šablona / komponenta %{theme} má chyby. Vypněte ji na %{path}."
     s3:
       regions:
         ap_northeast_1: "Asia Pacific (Tokyo)"
@@ -194,16 +215,22 @@ cs:
         ap_south_1: "Asia Pacific (Bombaj)"
         ap_southeast_1: "Asia Pacific (Singapur)"
         ap_southeast_2: "Asia Pacific (Sydney)"
+        ca_central_1: "Kanada (střední)"
         cn_north_1: "Čína (Peking)"
         cn_northwest_1: "Čína (Ningxia)"
         eu_central_1: "EU (Frankfurt)"
+        eu_north_1: "EU (Stockholm)"
         eu_west_1: "EU (Irsko)"
         eu_west_2: "EU (Londýn)"
         eu_west_3: "EU (Paříž)"
+        sa_east_1: "Jižní Amerika (São Paulo)"
         us_east_1: "Východ USA (S. Virginie)"
         us_east_2: "Východ USA (Ohio)"
+        us_gov_east_1: "AWS GovCloud (US-East)"
+        us_gov_west_1: "AWS GovCloud (US-West)"
         us_west_1: "Západ USA (S. Kalifornie)"
         us_west_2: "Západ USA (Oregon)"
+    clear_input: "Vymazat vstup"
     edit: "upravit název a kategorii příspěvku"
     expand: "Rozšířit"
     not_implemented: "Tato funkce ještě nebyla naprogramována, omlouváme se."
@@ -212,6 +239,7 @@ cs:
     submit: "Odeslat"
     generic_error: "Bohužel nastala chyba."
     generic_error_with_reason: "Nastala chyba: %{error}"
+    go_ahead: "Pokračuj"
     sign_up: "Registrace"
     log_in: "Přihlásit se"
     age: "Věk"
@@ -231,6 +259,7 @@ cs:
     privacy: "Soukromí"
     tos: "Podmínky používání"
     rules: "Pravidla"
+    conduct: "Kodex chování"
     mobile_view: "Mobilní verze"
     desktop_view: "Plná verze"
     you: "Vy"
@@ -238,6 +267,11 @@ cs:
     now: "právě teď"
     read_more: "číst dále"
     more: "Více"
+    x_more:
+      one: "%{count} Více"
+      few: "%{count} další"
+      many: "%{count} Více"
+      other: "%{count} Více"
     less: "Méně"
     never: "nikdy"
     every_30_minutes: "každých 30 minut"
@@ -268,8 +302,6 @@ cs:
       moderators: "Moderátoři"
       stat:
         all_time: "Za celou dobu"
-        last_7_days: "Posledních 7"
-        last_30_days: "Posledních 30"
       like_count: "Líbí se"
       topic_count: "Témata"
       post_count: "Příspěvky"
@@ -283,27 +315,43 @@ cs:
       help:
         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"
+        unbookmark_with_reminder: "Kliknutím odstraníte všechny záložky a připomenutí v tomto tématu. Máte nastavenou upomínku %{reminder_at} pro toto téma."
     bookmarks:
+      created: "Tento příspěvek jste přidali do záložek. %{name}"
       not_bookmarked: "přidat záložku k příspěvku"
+      created_with_reminder: "Tento příspěvek jste označili záložkou s připomenutím %{date}. %{name}"
       remove: "Odstranit záložku"
+      delete: "Smazat záložku"
+      confirm_delete: "Opravdu chcete tuto záložku smazat? Připomenutí bude také smazáno."
       confirm_clear: "Opravdu chcete odstranit všechny své záložky z tohoto tématu?"
       save: "Uložit"
+      no_timezone: 'Zatím jste nenastavili časové pásmo. Nebudete moci nastavit připomenutí. Nastavte si ho <a href="%{basePath}/my/preferences/profile">ve svém profilu</a>.'
+      invalid_custom_datetime: "Zadané datum a čas jsou neplatné, zkuste to prosím znovu."
+      list_permission_denied: "Nemáte oprávnění k zobrazení záložek tohoto uživatele."
+      no_user_bookmarks: "Nemáte žádné záložky; záložky vám umožňují rychle odkazovat na konkrétní příspěvky."
+      auto_delete_preference:
+        label: "Automaticky smazat"
+        never: "Nikdy"
+        when_reminder_sent: "Jakmile je připomenutí odesláno"
+        on_owner_reply: "Po odpovědi na toto téma"
+      search_placeholder: "Hledat záložky podle názvu, názvu tématu nebo obsahu příspěvku"
       search: "Vyhledat"
       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"
+        today_with_time: "dnes v %{time}"
+        tomorrow_with_time: "zítra v %{time}"
+        at_time: "v %{date_time}"
+        existing_reminder: "Máte nastavenou připomínku pro tuto záložku, která bude odeslána %{at_date_time}"
+    copy_codeblock:
+      copied: "zkopírováno!"
     drafts:
       resume: "Pokračovat"
       remove: "Odstranit"
+      remove_confirmation: "Opravdu chcete tento koncept smazat?"
       new_topic: "Nový koncept tématu"
       new_private_message: "Nový koncept soukromé zprávy"
       topic_reply: "Koncept odpovědi"
       abandon:
-        yes_value: "Ano, zahodit"
-        no_value: "Nezahazovat"
+        yes_value: "Zahodit"
     topic_count_latest:
       one: "Zobrazit %{count} nové nebo upravené téma"
       few: "Zobrazit %{count} nová nebo upravená témata"
@@ -321,6 +369,7 @@ cs:
       other: "Zobrazit %{count} nových témat"
     preview: "ukázka"
     cancel: "zrušit"
+    deleting: "Mazání ..."
     save: "Uložit změny"
     saving: "Ukládám..."
     saved: "Uloženo!"
@@ -341,6 +390,8 @@ cs:
     banner:
       close: "Odmítnout tento banner."
       edit: "Editujte tento banner >>"
+    pwa:
+      install_banner: "Chcete <a href>nainstalovat %{title} na toto zařízení?</a>"
     choose_topic:
       none_found: "Žádná témata nenalezena."
     review:
@@ -349,40 +400,119 @@ cs:
         total: "Celkem"
       delete: "Smazat"
       settings:
+        saved: "Uloženo"
         save_changes: "Uložit změny"
         title: "Nastavení"
       moderation_history: "Historie moderování"
       topic: "Téma:"
       filtered_user: "Uživatel"
+      filtered_reviewed_by: "Zkontroloval"
       user:
         username: "Uživatelské jméno"
         email: "Email"
         name: "Jméno"
+        reject_reason: "Reason"
       topics:
         topic: "Témata"
+        deleted: "[Téma smazáno]"
+        original: "(původní téma)"
         details: "podrobnosti"
+        unique_users:
+          one: "%{count} uživatel"
+          few: "%{count} uživatelé"
+          many: "%{count} uživatelů"
+          other: "%{count} uživatelů"
+      replies:
+        one: "%{count} odpověď"
+        few: "%{count} odpovědi"
+        many: "%{count} odpovědí"
+        other: "%{count} odpovědí"
       edit: "Upravit"
       save: "Uložit"
       cancel: "Zrušit"
+      new_topic: "Schválení této položky vytvoří nové téma"
       filters:
+        all_categories: "(všechny kategorie)"
         type:
           title: "Typ"
+          all: "(všechny typy)"
+        minimum_score: "Minimální skóre:"
         refresh: "Obnovit"
+        status: "Stav"
         category: "Kategorie"
+        orders:
+          score: "Skóre"
+          score_asc: "Skóre (obráceně)"
+          created_at: "Vytvořeno v"
+          created_at_asc: "Vytvořeno v (obráceně)"
+        priority:
+          title: "Minimální priorita"
+          any: "(libovolný)"
+          medium: "Střední"
+          high: "Vysoká"
+      conversation:
+        view_full: "zobrazit celou konverzaci"
       scores:
+        about: "Toto skóre je vypočítáno na základě důvěryhodnosti oznamovatele, přesnost jeho předchozích označení a prioritu oznamované položky."
+        score: "Skóre"
+        date: "Datum"
         type: "Typ"
+        status: "Stav"
+        submitted_by: "Odeslal"
+        reviewed_by: "Zkontroloval"
       statuses:
         pending:
           title: "Čeká na schválení"
+        approved:
+          title: "Schváleno"
         rejected:
           title: "Odmítnutých"
+        ignored:
+          title: "Ignorováno"
+        deleted:
+          title: "Smazáno"
+        reviewed:
+          title: "(vše zkontrolováno)"
+        all:
+          title: "(vše)"
       types:
+        reviewable_flagged_post:
+          title: "Nahlášený příspěvek"
+          flagged_by: "Nahlásil"
+        reviewable_queued_topic:
+          title: "Téma ve frontě"
+        reviewable_queued_post:
+          title: "Příspěvek ve frontě"
         reviewable_user:
           title: "Uživatel"
+        reviewable_post:
+          title: "Příspěvek"
       approval:
         title: "Příspěvek potřebuje schválení"
         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"
+      example_username: "uživatelské jméno"
+      reject_reason:
+        title: "Proč odmítáte tohoto uživatele?"
+        send_email: "Odeslat e-mail o odmítnutí"
+    relative_time_picker:
+      days:
+        one: "den"
+        few: "dní"
+        many: "dní"
+        other: "dnů"
+      relative: "Relativní"
+    time_shortcut:
+      later_today: "Později dnes"
+      next_business_day: "Následující pracovní den"
+      tomorrow: "Zítra"
+      next_week: "Příští týden"
+      post_local_date: "Datum v příspěvku"
+      later_this_week: "Později tento týden"
+      start_of_next_business_week: "Pondělí"
+      start_of_next_business_week_alt: "Příští pondělí"
+      next_month: "Další měsíc"
+      custom: "Vlastní datum a čas"
     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>"
@@ -398,6 +528,7 @@ cs:
       sent_by_user: "Posláno uživatelem <a href='%{userUrl}'>%{user}</a>"
       sent_by_you: "Posláno <a href='%{userUrl}'>vámi</a>"
     directory:
+      username: "Uživatelské jméno"
       filter_name: "Filtrovat podle uživatelského jména"
       title: "Uživatelé"
       likes_given: "Rozdáno"
@@ -448,9 +579,15 @@ cs:
           credentials:
             username: "Uživatelské jméno"
             password: "Heslo"
+          settings:
+            title: "Nastavení"
         membership:
           title: Členství
           access: Přístup
+        categories:
+          title: Kategorie
+        tags:
+          title: Štítky
         logs:
           title: "Logy"
           when: "Když"
@@ -461,11 +598,16 @@ cs:
           details: "Podrobnosti"
           from: "Od"
           to: "Komu"
+      permissions:
+        title: "Oprávnění"
+        none: "K této skupině nejsou přiřazeny žádné kategorie."
+        description: "Členové této skupiny mají přístup k těmto kategoriím"
       public_admission: "Povolit uživatelům volný přístup do skupiny (skupina musí být veřejně viditelná)"
       public_exit: "Povolit uživatelům volně opustit skupinu"
       empty:
         posts: "V této skupině není od žádného člena ani jeden příspěvek."
         members: "V této skupině není žádny uživatel."
+        requests: "Nebyly nalezeny žádné žádosti o členství pro tuto skupinu."
         mentions: "O této skupině nepadla žádná zmínka."
         messages: "Pro tuto skupinu není žádná zpráva."
         topics: "V této skupině není od žádného člena ani jedno téma."
@@ -475,6 +617,8 @@ cs:
       leave: "Opustit skupinu"
       request: "Požádat o členství ve skupině"
       message: "Zpráva"
+      confirm_leave: "Opravdu chcete opustit tuto skupinu?"
+      allow_membership_requests: "Povolit uživatelům odesílat žádosti o členství vlastníkům skupiny (vyžaduje veřejně viditelnou skupinu)"
       membership_request_template: "Šablona, která se uživatelům zobrazí při odesílání žádosti o členství"
       membership_request:
         submit: "Odeslat požadavek"
@@ -522,7 +666,23 @@ cs:
         make_owner_description: "Udělat z <b>%{username}</b> vlastníka této skupiny"
         remove_owner: "Odstranit vlastníka"
         remove_owner_description: "Odstranit <b>%{username}</b> z role vlastníka této skupiny"
+        make_primary: "Nastavit jako primární"
+        make_primary_description: "Nastavit jako primární skupinu pro <b>%{username}</b>"
+        remove_primary: "Odebrat jako primární"
+        remove_primary_description: "Odeberte to jako primární skupinu pro <b>%{username}</b>"
+        remove_members: "Odebrat členy"
+        remove_members_description: "Odebrat vybrané uživatele z této skupiny"
+        make_owners: "Nastavit jako vlastníky"
+        make_owners_description: "Nastavit vybrané uživatele jako vlastníky této skupiny"
+        remove_owners: "Odebrat vlastníky"
+        remove_owners_description: "Odebrat vybrané uživatele jako vlastníky této skupiny"
+        make_all_primary: "Nastavit všechny jako primární"
+        make_all_primary_description: "Nastavit jako primární skupinu pro všechny vybrané uživatele"
+        remove_all_primary: "Odebrat jako primární"
+        remove_all_primary_description: "Odebrat tuto skupinu jako primární"
         owner: "Vlastník"
+        primary: "Primární"
+        forbidden: "Nejste oprávněni prohlížet členy."
       topics: "Témata"
       posts: "Odpovědi"
       mentions: "Zmínění"
@@ -535,6 +695,7 @@ cs:
         only_admins: "Pouze správci"
         mods_and_admins: "Pouze moderátoři a správci"
         members_mods_and_admins: "Pouze členové skupiny, moderátoři a správci"
+        owners_mods_and_admins: "Pouze vlastníci skupiny, moderátoři a správci"
         everyone: "Kdokoliv"
       notifications:
         watching:
@@ -542,6 +703,7 @@ cs:
           description: "Budete informováni o každém novém příspěvku v každné zprávě a také se vám zobrazí počet nepřečtených příspěvků."
         watching_first_post:
           title: "Hlídané první příspěvky"
+          description: "Budete upozorněni na nové zprávy v této skupině, ale ne odpovědi na zprávy."
         tracking:
           title: "Sledování"
           description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek a zobrazí se vám počet nových odpovědí."
@@ -550,13 +712,18 @@ cs:
           description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek."
         muted:
           title: "Ztišený"
+          description: "Nebudete upozorněni na žádné zprávy v této skupině."
       flair_url: "Avatar Flair obrázek"
+      flair_upload_description: "Používejte čtvercové obrázky ne menší než 20px do 20px."
       flair_bg_color: "Avatar Flair barva pozadí"
       flair_bg_color_placeholder: "(Volitelné) Hex kód barvy"
       flair_color: "Avatar Flair barva"
       flair_color_placeholder: "(Volitelné) Hex kód barvy"
       flair_preview_icon: "Náhled ikony"
       flair_preview_image: "Náhled obrázku"
+      flair_type:
+        icon: "Vyberte ikonu"
+        image: "Nahrát obrázek"
     user_action_groups:
       "1": "Rozdaných 'líbí se'"
       "2": "Obdržených 'líbí se'"
@@ -586,14 +753,18 @@ cs:
       posts: "Příspěvky"
       topics: "Témata"
       latest: "Aktuální"
-      latest_by: "latest by"
       toggle_ordering: "Přepnout editaci pořadí"
       subcategories: "Podkategorie"
+      muted: "Ztlumené kategorie"
       topic_sentence:
         one: "%{count} téma"
         few: "%{count} témata"
         many: "%{count} témat"
         other: "%{count} témat"
+      topic_stat_unit:
+        week: "týden"
+        month: "měsíc"
+      n_more: "Kategorie (%{count} dalších)..."
     ip_lookup:
       title: Vyhledávání podle IP adresy
       hostname: Hostname
@@ -613,6 +784,7 @@ cs:
       copied: "zkopírováno"
     user_fields:
       none: "(zvolit možnost)"
+      required: 'Zadejte hodnotu pro "%{name}"'
     user:
       said: "%{username}:"
       profile: "Profil"
@@ -628,14 +800,32 @@ cs:
       private_messages: "Zprávy"
       user_notifications:
         filters:
+          filter_by: "Filtrovat podle"
           all: "Všechny"
           read: "Přečtená"
           unread: "Nepřečtená"
+        ignore_duration_title: "Ignorovat uživatele"
         ignore_duration_username: "Uživatelské jméno"
+        ignore_duration_when: "Doba trvání:"
         ignore_duration_save: "ignorovat"
+        ignore_duration_note: "Vezměte prosím na vědomí, že všechny ignorování se automaticky odstraní po uplynutí doby trvání ignorování."
+        ignore_duration_time_frame_required: "Vyberte prosím časové období"
+        ignore_no_users: "Nemáte žádné ignorované uživatele."
+        ignore_option: "Ignorováno"
+        ignore_option_title: "Nebudete dostávat oznámení týkající se tohoto uživatele a všechna jejich témata a odpovědi budou skryty."
+        add_ignored_user: "Přidat..."
         mute_option: "Ztišené"
+        mute_option_title: "Nebudete dostávat žádná oznámení týkající se tohoto uživatele."
         normal_option: "Normální"
+        normal_option_title: "Budete upozorněni, pokud vám tento uživatel odpoví, cituje vás nebo vás zmiňuje."
+      notification_schedule:
+        title: "Harmonogram oznámení"
+        label: "Povolit vlastní harmonogram oznámení"
+        none: "Žádná"
+        monday: "Pondělí"
+        to: "komu"
       activity_stream: "Aktivita"
+      read: "Přečteno"
       preferences: "Nastavení"
       feature_topic_on_profile:
         save: "Uložit"
@@ -658,16 +848,19 @@ cs:
         perm_denied_expl: "Máte zakázané upozornění. Povolte upozornění v nastavení vašeho prohlížeče."
         disable: "Vypnout upozornění"
         enable: "Povolit upozornění"
-        each_browser_note: "Poznámka: Musíš změnit tuto volbu v každém prohlížeči, který používáš."
         consent_prompt: "Chcete dostávat upozornění v reálném čase, když někdo odpoví na vaše příspěvky?"
       dismiss: "Označit jako přečtené"
       dismiss_notifications: "Označit vše jako přečtené"
       dismiss_notifications_tooltip: "Označit všechny nepřečtené notifikace jako přečtené"
       first_notification: "Vaše první notifikace! Klikněte zde a začněte."
+      color_schemes:
+        undo: "obnovit výchozí"
+        regular: "Běžný"
       allow_private_messages: "Povolit ostatním uživatelům, aby mi mohli zasílat osobní zprávy"
       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"
+      featured_topic: "Doporučené téma"
       moderator: "%{user} je moderátor"
       admin: "%{user} je administrátor"
       moderator_tooltip: "Tento uživatel je moderátor"
@@ -676,6 +869,7 @@ cs:
       suspended_notice: "Uživatel je suspendován do %{date}."
       suspended_permanently: "Tento uživatel je suspendován."
       suspended_reason: "Důvod: "
+      github_profile: "GitHub"
       email_activity_summary: "Souhrn aktivit"
       mailing_list_mode:
         label: "Režim elektronická pošta"
@@ -705,6 +899,7 @@ cs:
       watched_first_post_tags_instructions: "Budete informováni o prvním novém příspěvku v každém novém tématu s těmito štítky."
       muted_categories: "Ztišené"
       muted_categories_instructions: "Nebudete upozorněni na nic o nových tématech v těchto kategoriích ty se neobjeví v přehledu kategorií či v aktuálních,"
+      regular_categories: "Běžný"
       no_category_access: "Jako moderátor máte omezený přístup ke kategorii bez možnosti ukládat změny."
       delete_account: "Smazat můj účet"
       delete_account_confirm: "Jste si jisti, že chcete trvale odstranit svůj účet? Tuto akci nelze vrátit zpět!"
@@ -714,6 +909,7 @@ cs:
       admin_delete: "Smazat"
       users: "Uživatelé"
       muted_users: "Ztišení"
+      ignored_users: "Ignorováno"
       tracked_topics_link: "Zobrazit"
       automatically_unpin_topics: "Atomaticky odepni téma jakmile se dostanu na konec."
       apps: "Aplikace"
@@ -730,6 +926,7 @@ cs:
         deleted_posts: "smazaných příspěvků"
         suspensions: "vyloučení"
         warnings_received: "varování"
+        rejected_posts: "zamítnuté příspěvky"
       messages:
         all: "Všechny"
         inbox: "Doručené"
@@ -744,6 +941,7 @@ cs:
         tags: "Štítek"
       preferences_nav:
         account: "Účet"
+        security: "Zabezpečení"
         profile: "Profil"
         emails: "Emaily"
         notifications: "Upozornění"
@@ -756,11 +954,13 @@ cs:
         success: "(email odeslán)"
         in_progress: "(odesílám)"
         error: "(chyba)"
+        emoji: "uzamknout emoji"
         action: "Odeslat email na obnovu hesla"
         set_password: "Nastavit heslo"
         choose_new: "Zvolte si nové heslo"
         choose: "Vyber si heslo"
       second_factor_backup:
+        title: "Dvoufaktorové záložní kódy"
         regenerate: "Vytvořit znovu"
         disable: "Vypnout"
         enable: "Zapnout"
@@ -768,21 +968,56 @@ 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"
+        download_backup_codes: "Stáhnout záložní kódy"
+        use: "Použít záložní kód"
+        enable_prerequisites: "Před vytvořením záložních kódů musíte povolit primární dvoufaktorovou metodu."
         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é."
       second_factor:
+        title: "Dvoufaktorové ověření"
+        enable: "Správa dvoufaktorového ověřování"
+        disable_all: "Zakázat vše"
+        forgot_password: "Zapomněli jste heslo?"
         confirm_password_description: "Prosíme před dalším krokem potvrďte své heslo"
         name: "Jméno"
         label: "Kód"
         rate_limit: "Prosím počkejete před tím, než vyskoušíte další ověřovací kód."
+        enable_description: |
+          Naskenujte tento QR kód v podporované aplikaci (<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>) a zadejte ověřovací kód.
         disable_description: "Zadejte prosím ověřovací kód z vaší aplikace"
         show_key_description: "Vložit ručně"
+        short_description: |
+          Chraňte svůj účet jednorázovými bezpečnostními kódy.
+        extended_description: |
+          Dvoufaktorové ověření zvyšuje zabezpečení vašeho účtu tím, že vyžaduje jednorázový kód navíc k vašemu heslu. Kódy mohou být generovány 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> zařízeních.
+        oauth_enabled_warning: "Vezměte prosím na vědomí, že přihlášení pomocí sociálních sítí bude zakázáno, jakmile bude dvoufaktorové ověřování na vašem účtu povoleno."
+        use: "Použijte ověřovací aplikaci"
+        enforced_notice: "Před přístupem na tento web musíte povolit dvoufaktorové ověřování."
         disable: "Vypnout"
+        disable_confirm: "Opravdu chcete zakázat všechny dvoufaktorové metody?"
         save: "Uložit"
         edit: "Upravit"
+        edit_title: "Upravit autentifikátor"
+        edit_description: "Jméno autentifikátoru"
+        enable_security_key_description: |
+          Když máte připravený <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">hardwarový bezpečnostní klíč</a> , stiskněte tlačítko Registrace níže.
+        totp:
+          title: "Ověření založené na tokenech"
+          add: "Přidat autentifikátor"
+          default_name: "Můj autentifikátor"
+          name_and_code_required_error: "Musíte zadat jméno a kód z vaší ověřovací aplikace."
         security_key:
+          register: "Registrovat"
+          title: "Bezpečnostní klíče"
+          add: "Přidat bezpečnostní klíč"
+          default_name: "Hlavní bezpečnostní klíč"
+          not_allowed_error: "Proces registrace bezpečnostního klíče buď vypršel, nebo byl zrušen."
+          already_added_error: "Tento bezpečnostní klíč jste již zaregistrovali. Není nutné jej znovu zaregistrovat."
+          edit: "Upravit bezpečnostní klíč"
           save: "Uložit"
+          edit_description: "Název bezpečnostního klíče"
+          name_required_error: "Musíte zadat název bezpečnostního klíče."
       change_about:
         title: "Změna o mně"
         error: "Došlo k chybě při pokusu změnit tuto hodnotu."
@@ -792,28 +1027,44 @@ cs:
         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:
+        title: "Přidat e-mail"
         add: "přidat"
       change_email:
         title: "Změnit emailovou adresu"
         taken: "Tato emailová adresa není k dispozici."
         error: "Nastala chyba při změně emailové adresy. Není tato adresa již používaná?"
         success: "Na zadanou adresu jsme zaslali email. Následujte, prosím, instrukce v tomto emailu."
+        success_via_admin: "Na tuto adresu jsme odeslali e-mail. Uživatel bude muset postupovat podle instrukcí v e-mailu."
         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: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a> na základě"
+        gravatar_title: "Změňte si svůj avatar na webové stránce %{gravatarName}"
+        gravatar_failed: "Nemohli jsme najít %{gravatarName} s touto e-mailovou adresou."
+        refresh_gravatar_title: "Aktualizovat %{gravatarName}"
         letter_based: "Systémem přidělený profilový obrázek"
         uploaded_avatar: "Vlastní obrázek"
         uploaded_avatar_empty: "Přidat vlastní obrázek"
         upload_title: "Nahrát obrázek"
         image_is_not_a_square: "Varování: Ořízli jsme váš obrázek; šířka a délka nebyla stejná."
+      change_profile_background:
+        title: "Záhlaví profilu"
+        instructions: "Záhlaví profilu bude vycentrována a má výchozí šířku 1110px."
       change_card_background:
         title: "Pozadí uživatelské karty"
         instructions: "Obrázky pozadí jsou zarovnány a mají výchozí šířku 590px. "
+      change_featured_topic:
+        title: "Doporučené téma"
+        instructions: "Odkaz na toto téma bude na vaší uživatelské kartě a profilu."
       email:
         title: "Emailová adresa"
         primary: "Hlavní email"
         secondary: "Záložní emailové adresy"
         primary_label: "primární"
+        unconfirmed_label: "nepotvrzený"
+        resend_label: "znovu odeslat potvrzovací e-mail"
+        resending_label: "odesílání..."
+        resent_label: "e-mail odeslán"
         update_email: "Změnit emailovou adresu"
         no_secondary: "Žádné záložní emailové adresy"
         instructions: "Nikdy nebude zveřejněno."
@@ -924,8 +1175,18 @@ cs:
         after_10_minutes: "po 10 minutách"
       notification_level_when_replying: "Když přidám příspěvek k tématu, nastav toto téma na:"
       invited:
-        search: "pište pro hledání v pozvánkách..."
         title: "Pozvánky"
+        pending_tab: "Čeká na schválení"
+        pending_tab_with_count: "Nevyřízeno (%{count})"
+        redeemed_tab: "Uplatněno"
+        redeemed_tab_with_count: "Vyřízeno (%{count})"
+        invited_via: "Pozvání"
+        groups: "Skupiny"
+        topic: "Témata"
+        edit: "Upravit"
+        remove: "Odstranit"
+        reinvited: "Pozvánka byla opětovně odeslána."
+        search: "pište pro hledání v pozvánkách..."
         user: "Pozvaný uživatel"
         none: "Nejsou žádné pozvánky k zobrazení."
         truncated:
@@ -934,33 +1195,20 @@ cs:
           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_at: "Uplatněno"
         pending: "Nevyřízené pozvánky"
-        pending_tab: "Čeká na schválení"
-        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á."
-        rescind: "Smazat"
-        rescinded: "Pozvánka odstraněna"
-        reinvite: "Znovu poslat pozvánku"
-        reinvite_all: "Znovu poslat všechny pozvánky"
         reinvite_all_confirm: "Opravdu chcete znovu poslat všechny pozvánky?"
-        reinvited: "Pozvánka byla opětovně odeslána."
-        reinvited_all: "Všechny pozvánky byly opětovně odeslány!"
         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: "Pozvat"
         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:
-          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:
         title: "Heslo"
@@ -1076,7 +1324,6 @@ cs:
     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."
     refresh: "Obnovit"
     home: "Domů"
@@ -1085,15 +1332,6 @@ cs:
       login_disabled: "Přihlášení je zakázáno jelikož je stránka v režimu jen pro čtení."
       logout_disabled: "Odhlášení je zakázáno zatímco je stránka v režimu jen pro čtení."
     learn_more: "více informací..."
-    all_time: "celkem"
-    all_time_desc: "témat vytvořeno"
-    year: "rok"
-    year_desc: "témata za posledních 365 dní"
-    month: "měsíc"
-    month_desc: "témata za posledních 30 dní"
-    week: "týden"
-    week_desc: "témata za posledních 7 dní"
-    day: "den"
     first_post: První příspěvek
     mute: Ignorovat
     unmute: Zrušit ignorování
@@ -1112,13 +1350,10 @@ cs:
       sign_up: "Registrovat se"
       hide_session: "Připomenout mi zítra"
       hide_forever: "děkuji, ne"
-      hidden_for_session: "Dobrá, zeptám se tě zítra. Pro založení účtu můžeš také vždy použít 'Přihlásit se'."
       intro: "Zdravíčko! Vypadá to, že si užíváte naše diskuze, ale ještě nemáte vlastní účet."
       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>."
       enable: "Přepnout na \"nejlepší příspěvky\""
       disable: "Přepnout na normální zobrazení"
     deleted_filter:
@@ -1128,6 +1363,7 @@ cs:
       disable: "Zobrazit smazané příspěvky"
     private_message_info:
       title: "Zpráva"
+      add: "Přidat..."
       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?"
@@ -1139,7 +1375,7 @@ cs:
     trust_level: "Důvěryhodnost"
     search_hint: "uživatelské jméno, email nebo IP adresa"
     create_account:
-      title: "Vytvořit nový účet"
+      header_title: "Vítejte!"
       failed: "Něco se nepovedlo, možná je tato e-mailová adresa již použita. Zkuste použít formulář pro obnovení hesla."
     forgot_password:
       title: "Obnovení hesla"
@@ -1156,6 +1392,7 @@ cs:
     email_login:
       link_label: "Chci odkaz na login do emailu"
       button_label: "přes email"
+      emoji: "uzamknout emoji"
       complete_username: "Pokud je tu účet, který používá uživatelské jméno <b>%{username}</b>, měl by vám za chvilku přijít email s přihlašovacím odkazem."
       complete_email: "Pokud je tu účet s emailovou adresou <b>%{email}</b>, měl by vám za chvilku přijít email s přihlašovacím odkazem."
       complete_username_found: "Našli jsme účet s uživatelským jménem <b>%{username}</b>, za chvilku by měl přijít email s přihlašovacím odkazem."
@@ -1164,12 +1401,11 @@ cs:
       complete_email_not_found: "Nebyl nalezen účet s emailem <b>%{email}</b>"
       confirm_title: Pokračovat na %{site_name}
     login:
-      title: "Přihlásit se"
       username: "Uživatel"
       password: "Heslo"
+      second_factor_title: "Dvoufaktorové ověření"
       second_factor_description: "Prosím zadejte autentikační kód z vaší aplikace:"
       second_factor_backup_description: "Prosíme zadejte jeden ze svých záložních kódů:"
-      email_placeholder: "emailová adresa nebo uživatelské jméno"
       caps_lock_warning: "zapnutý Caps Lock"
       error: "Neznámá chyba"
       rate_limit: "Počkejte před dalším pokusem se přihlásit."
@@ -1219,6 +1455,7 @@ cs:
       accept_invite: "Přijmout pozvání"
       success: "Váš účet byl vytvořen a nyní jste přihlášeni."
       name_label: "Jméno"
+      password_label: "Heslo"
       optional_description: "(volitelné)"
     password_reset:
       continue: "Pokračovat na %{site_name}"
@@ -1275,7 +1512,6 @@ 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>"
       destination_category: "Cílová kategorie"
       publish: "Zveřejnit sdílený koncept"
       confirm_publish: "Určitě chceš zveřejnit tento koncept?"
@@ -1286,7 +1522,6 @@ cs:
       options: "Možnosti"
       whisper: "šeptat"
       unlist: "neviditelné"
-      blockquote_text: "Bloková citace"
       add_warning: "Toto je oficiální varování."
       toggle_whisper: "Přepnout šeptání"
       toggle_unlisted: "Přepnout neviditelné"
@@ -1305,9 +1540,6 @@ cs:
       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ý"
         category_missing: "Musíte vybrat kategorii"
       save_edit: "Uložit změnu"
       overwrite_edit: "Přepsat úpravu"
@@ -1333,8 +1565,6 @@ cs:
       saving: "Ukládám"
       saved: "Uloženo!"
       uploading: "Nahrávám..."
-      show_preview: "zobrazit náhled &raquo;"
-      hide_preview: "&laquo; skrýt náhled"
       quote_post_title: "Citovat celý příspěvek"
       bold_label: "B"
       bold_title: "Tučně"
@@ -1346,8 +1576,8 @@ cs:
       link_description: "sem vložte popis odkazu"
       link_dialog_title: "Vložit odkaz"
       link_optional_text: "volitelný popis"
-      quote_title: "Bloková citace"
-      quote_text: "Bloková citace"
+      blockquote_title: "Bloková citace"
+      blockquote_text: "Bloková citace"
       code_title: "Ukázka kódu"
       code_text: "odsadit předformátovaný text o 4 mezery"
       paste_code_text: "napište nebo vložte kód tady"
@@ -1391,10 +1621,10 @@ cs:
           label: "Nové téma"
         shared_draft:
           label: "Sdílený koncept"
-          desc: "Navrhnout téma, které uvidí pouze redakce"
         toggle_topic_bump:
           label: "Přepnout zvýraznění tématu"
           desc: "Odpovědět bez ovlivnění data poslední odpovědi"
+      ignore: "ignorovat"
     notifications:
       tooltip:
         regular:
@@ -1418,6 +1648,12 @@ cs:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} a %{count} další</span> %{description}"
+        few: "<span class='multi-user'>%{username}, %{username2} a %{count} další</span> %{description}"
+        many: "<span class='multi-user'>%{username}, %{username2} a %{count} dalších</span> %{description}"
+        other: "<span class='multi-user'>%{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}"
@@ -1428,6 +1664,8 @@ cs:
       granted_badge: "Získáno '%{description}'"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Nové téma</span> %{description}"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</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}"
@@ -1451,10 +1689,7 @@ 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}"
       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}"
-      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"
       select_file: "Vyberte soubor"
@@ -1486,6 +1721,7 @@ cs:
       or_search_google: "Nebo zkuste vyhledávat pomocí Google:"
       search_google: "Zkuste vyhledávat pomocí Google:"
       search_google_button: "Google"
+      search_button: "Vyhledat"
       context:
         user: "Vyhledat příspěvky od @%{username}"
         category: "Hledat v kategorii #%{category}"
@@ -1527,10 +1763,14 @@ cs:
           noreplies: jsou bez odpovědi
           single_user: obsahují jen jednoho uživatele
         post:
+          count:
+            label: Příspěvky
           time:
             label: Přidáno
             before: před
             after: po
+        views:
+          label: Zobrazení
     hamburger_menu: "jít na jiný seznam témat nebo kategorii"
     new_item: "nové"
     go_back: "jít zpět"
@@ -1556,6 +1796,7 @@ cs:
         change_category: "Nastavit kategorii"
         close_topics: "Zavřít téma"
         archive_topics: "Archivovat témata"
+        move_messages_to_inbox: "Přesunout do doručených"
         notification_level: "Upozornění"
         choose_new_category: "Zvolte novou kategorii pro témata:"
         selected:
@@ -1576,8 +1817,6 @@ cs:
         bookmarks: "V tématech nemáte žádné záložky."
         category: "V kategorii %{category} nejsou žádná témata."
         top: "Nejsou tu žádná populární témata."
-        educate:
-          unread: '<p>Zde se zobrazují vaše nepřečtená témata.</p><p>Podle výchozího nastavení jsou za nepřečtená témata, u kterých se zobrazuje počet nepřečtení <span class="badge new-posts badge-notification">1</span>, považována ta, která jste:</p><ul><li>Vytvořil toto téma</li><li>Odpověděli v tématu</li><li>Četl téma více než 4 minuty</li></ul><p>Nebo pokud jste nastavil téma jako Hlídané či Sledované pomocí nabídky na spodu každého tématu.</p><p>Toto chování můžete změnit v <a href="%{userPrefsUrl}">nastavení</a>.</p>'
       bottom:
         latest: "Nejsou tu žádná další témata z poslední doby."
         posted: "Nejsou tu žádná další zaslaná témata k přečtení."
@@ -1585,6 +1824,7 @@ cs:
         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."
+        tag: "V kategorii %{tag} 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:
@@ -1658,12 +1898,14 @@ cs:
       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_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
       jump_reply_up: přejít na předchozí odpověď
       jump_reply_down: přejít na následující odpověď
       deleted: "Téma bylo smazáno"
+      slow_mode_update:
+        save: "Zapnout"
+        remove: "Vypnout"
       topic_status_update:
         title: "Časovač tématu"
         save: "Nastavit časovač "
@@ -1671,6 +1913,7 @@ cs:
         remove: "Odstranit časovač"
         publish_to: "Publikovat v:"
         when: "Když:"
+        time_frame_required: "Vyberte prosím časové období"
       auto_update_input:
         none: "Vyberte časové období"
         later_today: "Později během dnešního dne"
@@ -1678,11 +1921,7 @@ cs:
         later_this_week: "Později během tohoto týdne"
         this_weekend: "Tento týden"
         next_week: "Další týden"
-        two_weeks: "Dva týdny"
         next_month: "Další měsíc"
-        three_months: "Tři měsíce"
-        six_months: "Šest měsíců"
-        one_year: "Jeden rok"
         forever: "Navždy"
         pick_date_and_time: "Vyberte datum a čas"
         set_based_on_last_post: "Zavřít na základě posledního příspěvku"
@@ -1696,7 +1935,6 @@ cs:
         title: "Zavřít dočasně"
       auto_close:
         title: "Automaticky zavřít téma"
-        label: "Automaticky zavřít téma za:"
         error: "Prosím zadejte platnou hodnotu."
         based_on_last_post: "Neuzavírejte téma dokud poslední příspěvek v tomto tématu není alespoň takto starý."
       auto_delete:
@@ -1707,7 +1945,7 @@ cs:
         auto_open: "Toto téma se automaticky otevře %{timeLeft}."
         auto_close: "Toto téma se automaticky zavře %{timeLeft}."
         auto_publish_to_category: "Toto téma bude zveřejněno v <a href=%{categoryUrl}>%{categoryName}</a>%{timeLeft}# ."
-        auto_close_based_on_last_post: "Toto téma se zavře %{duration} po poslední odpovědi."
+        auto_close_after_last_post: "Toto téma se zavře %{duration} po poslední odpovědi."
         auto_delete: "Toto téma bude automaticky smazáno %{timeLeft}."
         auto_reminder: "Toto téma ti připomeneme %{timeLeft}."
       auto_close_title: "Nastavení automatického zavření"
@@ -1727,7 +1965,7 @@ cs:
         go: "go"
         jump_bottom: "na poslední příspěvek"
         jump_prompt: "přejít na..."
-        jump_prompt_of: "%{count} příspěvků"
+        jump_prompt_long: "Přejít na..."
         jump_bottom_with_number: "Skočit na příspěvěk %{post_number}"
         jump_prompt_to_date: "do data"
         jump_prompt_or: "nebo"
@@ -1809,6 +2047,7 @@ cs:
       share:
         title: "Sdílet"
         help: "sdílet odkaz na toto téma"
+        invite_users: "Pozvat"
       print:
         title: "Tisk"
         help: "Otevři verzi tématu určenou k tisku"
@@ -1861,14 +2100,13 @@ cs:
         username_placeholder: "uživatelské jméno"
         action: "Poslat pozvánku"
         help: "pozval ostatní do tohoto tématu pomocí emailu nebo notifikací"
-        to_forum: "Pošleme krátký email dovolující vašemu příteli se okamžitě zapojit s pomocí kliknutí na odkaz. Nebude potřeba registrace."
-        sso_enabled: "Zadej uživatelské jméno člověka, kterého chceš pozvat do tohoto tématu."
+        discourse_connect_enabled: "Zadej uživatelské jméno člověka, kterého chceš pozvat do tohoto tématu."
         to_topic_blank: "Zadej uživatelské jméno a email člověka, kterého chceš pozvat do tohoto tématu."
         to_topic_email: "Zadal jste emailovou adresu. Pošleme na ni pozvánku, s jejíž pomocí bude moci váš kamarád ihned odpovědět do tohoto tématu."
         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>%{invitee}</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."
@@ -1949,10 +2187,9 @@ cs:
           other: "Máte označeno <b>%{count}</b> příspěvků."
     post:
       quote_reply: "Cituj"
+      quote_share: "Sdílet"
       edit_reason: "Důvod: "
       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}:"
@@ -1997,12 +2234,8 @@ cs:
         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."
-      abandon_edit:
-        no_value: "Nezahazovat"
-      abandon:
-        confirm: "Opravdu chcete svůj příspěvek zahodit?"
-        no_value: "Nezahazovat"
-        yes_value: "Ano, zahodit"
+      cancel_composer:
+        discard: "Zahodit"
       via_email: "tento příspěvek byl přijat přes email"
       via_auto_generated_email: "tento příspěvek byl přijat přes automaticky generovaný email"
       whisper: "tento příspěvek je soukromé šeptání pro moderátory"
@@ -2055,6 +2288,11 @@ cs:
         delete_topic: "smazat téma"
       actions:
         people:
+          like:
+            one: "se líbí"
+            few: "se líbí"
+            many: "se líbí"
+            other: "se líbí"
           like_capped:
             one: "a jednomu dalšímu se to líbí"
             few: "a %{count} dalším se to líbí"
@@ -2151,6 +2389,11 @@ cs:
       change_in_category_topic: "navštivte téma kategorie pro editaci jejího popisu"
       already_used: "Tato barva je již použita jinou kategorií"
       security: "Zabezpečení"
+      permissions:
+        group: "Skupina"
+        see: "Prohlížet"
+        reply: "Odpovědět"
+        create: "Vytvořit"
       special_warning: "Varování: Tato kategorie je přednastavená a její nastavení bezpečnosti nelze změnit. Pokud tuto kategorii nechcete používat, tak ji smažte a nesnažte se ji měnit."
       images: "Obrázky"
       email_in: "Vlastní příchozí emailová adresa:"
@@ -2182,22 +2425,20 @@ cs:
       notifications:
         watching:
           title: "Hlídání"
-          description: "Budete automaticky sledovat všechna témata v těchto kategoriích. Budete upozorněni na každý nový příspěvek v každém tématu a zobrazí se počet nových odpovědí."
         watching_first_post:
           title: "Hlídání prvního příspěvku"
         tracking:
           title: "Sledování"
-          description: "Budete automaticky sledovat všechna nová témata v těchto kategoriích. Budete upozorněni, pokud někdo zmíní vaše @jméno nebo vám odpoví, a zobrazí se počet nových odpovědí."
         regular:
           title: "Normální"
           description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek."
         muted:
           title: "Ztišený"
-          description: "Nikdy nebudete dostávat upozornění na nová témata v těchto kategoriích a neobjeví se v aktuálních."
       search_priority:
         options:
           normal: "Normální"
           ignore: "ignorovat"
+          high: "Vysoká"
       sort_options:
         default: "výchozí"
         likes: "Líbí se"
@@ -2221,10 +2462,17 @@ cs:
     flagging:
       title: "Děkujeme, že pomáháte udržovat komunitu zdvořilou!"
       action: "Nahlásit příspěvek"
+      take_action_options:
+        default:
+          title: "Zakročit"
+          details: "Ihned dosáhni vlaječky prahu, než aby jsi čekal na více komunitních vlaječek"
+        suspend:
+          title: "Suspend User"
+        silence:
+          title: "ztišit uživatele"
       notify_action: "Zpráva"
       official_warning: "Oficiální varování"
       delete_spammer: "Odstranit spamera"
-      delete_confirm_MF: "Chystáte se odstranit {POSTS, plural, one {<b>1</b> příspěvek} other {<b>#</b> příspěvků}} a {TOPICS, plural, one {<b>1</b> téma} other {<b>#</b> témat}} od tohoto uživatele, smazat jeho účet, zablokovat přihlášení z jejich IP adresy <b>{ip_address}</b>, a přidat jejich emailovou adresu <b>{email}</b> na seznam permanentně blokovaných. Jste si jistí, že je tento uživatel opravdu spamer?"
       yes_delete_spammer: "Ano, odstranit spamera"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(skrytý)"
@@ -2298,12 +2546,6 @@ 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_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ů}
-      med {s velmi vysokým počtem lajků}
-      high {s extrémně vysokým počtem lajků}
-      other {}}
     original_post: "Původní příspěvek"
     views: "Zobrazení"
     views_lowercase:
@@ -2331,7 +2573,6 @@ cs:
       many: "uživatelů"
       other: "uživatelů"
     category_title: "Kategorie"
-    history: "Historie"
     changed_by: "od uživatele %{author}"
     raw_email:
       title: "Příchozí email"
@@ -2423,6 +2664,7 @@ cs:
       readonly: "Prohlížet"
     lightbox:
       download: "stáhnout"
+      counter: "%curr% z %total%"
     keyboard_shortcuts_help:
       title: "Klávesové zkratky"
       jump_to:
@@ -2601,6 +2843,10 @@ cs:
       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"
+    do_not_disturb:
+      remaining: "%{remaining} zbývá"
+      options:
+        custom: "Přizpůsobené"
   admin_js:
     type_to_filter: "text pro filtrování..."
     admin:
@@ -2624,6 +2870,8 @@ cs:
         version_check_pending: "Že tys nedávno provedl aktualizaci. Báječné!"
         installed_version: "Nainstalováno"
         latest_version: "Poslední verze"
+        new_features:
+          dismiss: "Označit jako přečtené"
         last_checked: "Naposledy zkontrolováno"
         refresh_problems: "Obnovit"
         no_problems: "Nenalezeny žádné problémy."
@@ -2656,6 +2904,9 @@ cs:
           view_table: "tabulka"
           view_graph: "graf"
           refresh_report: "Obnovit hlášení"
+          daily: Denně
+          monthly: Měsíčně
+          weekly: Týdně
           groups: "Všechny skupiny"
           filters:
             group:
@@ -2676,10 +2927,6 @@ cs:
             available: "Název skupiny je k dispozici"
             not_available: "Název skupiny není k dispozici"
             blank: "Název skupiny nemůže být prázdný"
-        bulk_add:
-          title: "Hromadné přidání do skupiny"
-          complete_users_not_added: "Tito uživatelé nebyli přidáni (ujistěte se, že mají účet):"
-          paste: "Vložte seznam uživatelských jmen a e-mailů, jeden záznam na řádek:"
         manage:
           interaction:
             email: Email
@@ -2729,6 +2976,8 @@ cs:
         description: Popis
         save: Uložit
         continue: Pokračovat
+        scopes:
+          action: Akce
       web_hooks:
         title: "Webhooks"
         none: "Právě tu nejsou žádné webhooks."
@@ -2743,7 +2992,6 @@ cs:
         go_back: "Zpět na seznam"
         payload_url: "Payload URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Zdá se, že se snažíš nastavit webhook k lokální url. Doručená událost na lokální adresu může způsobit vedlejší účinek nebo neočekávané chování. Chceš pokračovat? "
         secret_invalid: "Heslo nesmí obsahovat žádné prázdné znaky."
         secret_too_short: "Heslo by mělo mít alespoň 12 znaků."
         secret_placeholder: "Volitelný řetězec využívaný k vytvoření podpisu"
@@ -2769,7 +3017,6 @@ cs:
           details: "Pokud je zde nová odpověď, uprav, smaž nebo odeber."
         user_event:
           name: "Uživatelské události"
-          details: "Pokud se uživatel přihlásí, odhlásí, je vytvořený, schválen nebo aktualizovaný."
         delivery_status:
           title: "Stav doručení"
           inactive: "Neaktivní"
@@ -2946,6 +3193,7 @@ cs:
           install_popular: "Populární"
           about_theme: "O fóru"
           license: "Licence"
+          version: "Verze Discourse:"
           enable: "Zapnout"
           disable: "Vypnout"
           update_to_latest: "Aktualizovat na nejnovější"
@@ -3217,14 +3465,8 @@ cs:
         title: "Sledovaná slova"
         search: "hledat"
         clear_filter: "Zrušit"
-        show_words: "zobrazit slova"
         download: Stáhnout
         clear_all: Vymazat vše
-        word_count:
-          one: "%{count} slovo"
-          few: "%{count} slova"
-          many: "%{count} slov"
-          other: "%{count} slov"
         actions:
           block: "Zablokovat"
           censor: "Cenzurovat "
@@ -3236,8 +3478,6 @@ cs:
           require_approval: "Příspěvky obsahující tato slova budou vyžadovat schválení zaměstnanců před schválením."
           flag: "Povolit příspěvky obsahující tato slova, ale oflagovat je jako nevhodně, aby je mohli moderátoři kontrolovat."
         form:
-          label: "Nové slovo:"
-          placeholder: "celé slovo nebo* jako zástupný znak"
           placeholder_regexp: "obvyklý výraz"
           add: "přidat"
           success: "Úspěch"
@@ -3282,6 +3522,8 @@ cs:
         check_email:
           title: "Odhal emailovou adresu tohoto uživatele"
           text: "Zobrazit"
+        check_sso:
+          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}"
@@ -3289,6 +3531,7 @@ cs:
         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ý."
         suspend_reason: "Reason"
+        suspend_reason_title: "Důvod vyloučení"
         suspend_message: "e-mailová zpráva"
         suspend_message_placeholder: "Případě poskytněte více informací o pozastavení, které budou poslány na uživatelův email."
         suspended_by: "Suspended by"
@@ -3307,7 +3550,6 @@ cs:
         penalty_post_delete: "Smazat příspěvek"
         penalty_post_edit: "Upravit příspěvek"
         penalty_post_none: "Nic nedělat"
-        delete_all_posts_confirm_MF: "Chystáte se smazat {POSTS, plural, one {1 příspěvek} other {# příspěvků}} and {TOPICS, plural, one {1 téma} other {# témat}}. Jste si jistí?"
         silence: "Ztišit"
         unsilence: "odmlčet "
         silenced: "Ztišený? "
@@ -3442,8 +3684,7 @@ cs:
           on_grace_period: "Currently in promotion grace period, will not be demoted."
           locked_will_not_be_promoted: "Úroveň důvěryhodnosti uzamčena. Nikdy nebude povýšen."
           locked_will_not_be_demoted: "Úroveň důvěryhodnosti uzamčena. Nikdy nebude degradován."
-        sso:
-          title: "Jednorázové přihlášení"
+        discourse_connect:
           external_id: "Externí ID"
           external_username: "Uživatelské jméno"
           external_name: "Jméno"
@@ -3631,6 +3872,9 @@ cs:
         embed_post_limit: "Maximální počet příspěvků k zabudování"
         embed_title_scrubber: "Běžný výraz užívaný k vyčištění názvů příspěvků"
         embed_truncate: "Useknout zabudované příspěvky"
+        allowed_embed_selectors: "Volba CSS pro prvky, které jsou povoleny ve vložení."
+        blocked_embed_selectors: "Volba CSS pro prvky, které jsou odstraněny z vložení."
+        allowed_embed_classnames: "Povolená jména CSS tříd"
         save: "Uložit nastavení zabudování"
       permalink:
         title: "Trvalé odkazy"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 4fd39e5d27..a4e653ed6c 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -26,7 +26,10 @@ da:
         millions: "%{number}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "hh:mm a (z)"
+      time_short_day: "ddd, h:mm a"
       timeline_date: "MMM YYYY"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "D. MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY HH:mm"
@@ -47,29 +50,29 @@ da:
           one: "%{count}s"
           other: "%{count}s"
         less_than_x_minutes:
-          one: "&lt;%{count}m"
+          one: "< %{count}m"
           other: "< %{count}m"
         x_minutes:
           one: "%{count}m"
           other: "%{count}m"
         about_x_hours:
           one: "%{count}t"
-          other: "%{count}h"
+          other: "%{count}t"
         x_days:
           one: "%{count}d"
           other: "%{count}d"
         x_months:
-          one: "%{count}mon"
-          other: "%{count}mdr"
+          one: "%{count}måned"
+          other: "%{count}måneder"
         about_x_years:
-          one: "%{count}å"
-          other: "%{count}å"
+          one: "%{count}år"
+          other: "%{count}år"
         over_x_years:
           one: "> %{count}å"
-          other: "> %{count}å"
+          other: "> %{count}år"
         almost_x_years:
-          one: "%{count}å"
-          other: "%{count}å"
+          one: "%{count}år"
+          other: "%{count}år"
         date_month: "D. MMM"
         date_year: "MMM 'YY"
       medium:
@@ -116,13 +119,17 @@ da:
       topic_html: 'Emne: <span class="topic-title">%{topicTitle}</span>'
       post: "indlæg #%{postNumber}"
       close: "luk"
+      twitter: "Del på Twitter"
+      facebook: "Del på Facebook"
+      email: "Send via e-mail"
+      url: "Kopiér og del URL"
     action_codes:
       public_topic: "offentliggjorde dette emne %{when}"
       private_topic: "gjorde dette emne til en privat besked %{when}"
       split_topic: "delte dette emne op %{when}"
       invited_user: "Inviterede %{who} %{when}"
       invited_group: "inviterede %{who} %{when}"
-      user_left: "%{who}fjernede sig selv fra denne besked %{when}"
+      user_left: "%{who} fjernede sig selv fra denne besked %{when}"
       removed_user: "fjernede %{who} %{when}"
       removed_group: "fjernede %{who} %{when}"
       autobumped: "automatisk 'bumpet' %{when}"
@@ -134,7 +141,7 @@ da:
         disabled: "åbnet %{when}"
       archived:
         enabled: "arkiveret %{when}"
-        disabled: " fjernet fra arkivet %{when}"
+        disabled: "fjernet fra arkivet %{when}"
       pinned:
         enabled: "fastgjort %{when}"
         disabled: "frigjort %{when}"
@@ -143,12 +150,20 @@ da:
         disabled: "frigjort %{when}"
       visible:
         enabled: "listet %{when}"
-        disabled: "aflistet %{when}"
+        disabled: "unoteret %{when}"
       banner:
         enabled: "lavede dette til et banner %{when}. Emnet bliver vist på toppen af alle sider indtil det bliver afskediget af brugeren."
         disabled: "fjernede banneret %{when}. Det vil ikke længere vises i toppen af alle sider."
+      forwarded: "videresendte ovenstående e-mail"
+    topic_admin_menu: "emnehandlinger"
     wizard_required: "Velkommen til din nye Discourse! Lad os komme i gang med <a href='%{url}' data-auto-route='true'>konfigurationsguiden</a> ✨"
     emails_are_disabled: "Alle udgående emails er blevet globalt deaktiveret af en administrator. Ingen email notifikationer af nogen slags vil blive sendt."
+    software_update_prompt:
+      message: "Vi har opdateret dette websted, <span>genindlæs venligst siden</span>, ellers vil du kunne opleve uventet opførsel eller begrændset funktionalitet."
+      dismiss: "Ignorer Alle"
+    bootstrap_mode_enabled:
+      one: "For at gøre lanceringen af dit nye forum lettere er du i \"bootstrap-tilstand\". Alle nye brugere tildeles tillidsniveau 1 og har dagligt email resume aktiveret. Dette deaktiveres automatisk, når %{count} bruger er tilsluttet."
+      other: "For at gøre lanceringen af dit nye forum lettere er du i bootstrap-tilstand. Alle nye brugere tildeles tillidsniveau 1 og har dagligt email resume aktiveret. Dette deaktiveres automatisk, når %{count} brugere er tilsluttet."
     bootstrap_mode_disabled: "Bootstrap-tilstand deaktiveres inden for 24 timer."
     themes:
       default_description: "Standard"
@@ -157,30 +172,31 @@ da:
       regions:
         ap_northeast_1: "Asien (Tokyo)"
         ap_northeast_2: "Asien (Seoul)"
-        ap_south_1: "Asien (Mumbai)"
+        ap_south_1: "Asien og Stillehavsområdet (Mumbai)"
         ap_southeast_1: "Asien (Singapore)"
         ap_southeast_2: "Asien (Sydney)"
         ca_central_1: "Canada (Central)"
         cn_north_1: "Kina (Beijing)"
-        cn_northwest_1: "Kina (Ninghsia)"
+        cn_northwest_1: "Kina (Ningxia)"
         eu_central_1: "EU (Frankfurt)"
         eu_north_1: "EU (Stockholm)"
         eu_west_1: "EU (Irland)"
         eu_west_2: "EU (London)"
         eu_west_3: "EU (Paris)"
-        sa_east_1: "Syd Amerika (São Paulo)"
+        sa_east_1: "Sydamerika (São Paulo)"
         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)"
         us_west_1: "US West (N. California)"
         us_west_2: "US West (Oregon)"
+    clear_input: "Ryd input"
     edit: "redigér titel og kategori for dette emne"
     expand: "Udvid"
-    not_implemented: "Beklager! Denne feature er ikke blevet implementeret endnu."
+    not_implemented: "Beklager! Denne funktion er ikke blevet implementeret endnu."
     no_value: "Nej"
     yes_value: "Ja"
-    submit: "Færdiggør"
+    submit: "Udfør"
     generic_error: "Beklager, der opstod en fejl."
     generic_error_with_reason: "Der opstod en fejl: %{error}"
     go_ahead: "Fortsæt"
@@ -190,25 +206,28 @@ da:
     joined: "Tilmeldt"
     admin_title: "Admin"
     show_more: "vis mere"
-    show_help: "indstillinger"
+    show_help: "muligheder"
     links: "Links"
     links_lowercase:
       one: "link"
       other: "links"
-    faq: "FAQ"
+    faq: "OSS"
     guidelines: "Retningslinier"
     privacy_policy: "Privatlivspolitik"
     privacy: "Privatliv"
     tos: "Servicevilkår"
     rules: "Regler"
-    conduct: "Retningslinjer"
-    mobile_view: "Vis på mobil"
-    desktop_view: "Vis på computer"
+    conduct: "Adfærdskodeks"
+    mobile_view: "Mobil visning"
+    desktop_view: "Computervisning"
     you: "Dig"
     or: "eller"
-    now: "lige sket"
+    now: "lige nu"
     read_more: "læs mere"
     more: "Mere"
+    x_more:
+      one: "%{count} Mere"
+      other: "%{count} Flere"
     less: "Mindre"
     never: "aldrig"
     every_30_minutes: "hver halve time"
@@ -231,14 +250,15 @@ da:
     about:
       simple_title: "Om"
       title: "Om %{title}"
-      stats: "Hjemmeside statistikker"
+      stats: "Webstedsstatistikker"
       our_admins: "Vores Administratorer"
       our_moderators: "Vores Moderatorer"
       moderators: "Moderatorer"
       stat:
         all_time: "Altid"
-        last_7_days: "Seneste 7"
-        last_30_days: "Seneste 30"
+        last_day: "Seneste 24 timer"
+        last_7_days: "Seneste 7 dage"
+        last_30_days: "Seneste 30 dage"
       like_count: "Synes godt om"
       topic_count: "Emner"
       post_count: "Indlæg"
@@ -252,29 +272,44 @@ da:
       help:
         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"
+        unbookmark_with_reminder: "Klik for at fjerne alle bogmærker og påmindelser i dette emne. Du har en påmindelse sat %{reminder_at} for dette emne."
     bookmarks:
-      not_bookmarked: "bogmærke dette indlæg"
+      created: "Du har sat et bogmærke for dette indlæg. %{name}"
+      not_bookmarked: "bogmærk dette indlæg"
+      created_with_reminder: "Du har sat et bogmærke med en påmindelse for dette indlæg %{date}. %{name}"
       remove: "Fjern bogmærke"
+      delete: "Slet Bogmærke"
+      confirm_delete: "Er du sikker på, at du vil slette dette bogmærke? Påmindelsen vil også blive slettet."
       confirm_clear: "Er du sikker på, at du vil rydde alle dine bogmærker fra dette emne?"
       save: "Gem"
+      no_timezone: 'Du har ikke indstillet en tidszone endnu. Du vil ikke være i stand til at indstille påmindelser. Konfigurer dette <a href="%{basePath}/my/preferences/profile">i din profil</a>.'
+      invalid_custom_datetime: "Dato og klokkeslæt du angav er ugyldigt, prøv venligst igen."
+      list_permission_denied: "Du har ikke tilladelse til at se denne brugers bogmærker."
+      no_user_bookmarks: "Du har ingen bogmærkede indlæg; bogmærker giver dig mulighed for hurtigt at henvise til bestemte indlæg."
+      auto_delete_preference:
+        label: "Slet automatisk"
+        never: "Aldrig"
+        when_reminder_sent: "Når påmindelsen er sendt"
+        on_owner_reply: "Efter at jeg har svaret på dette emne"
+      search_placeholder: "Søg i bogmærker efter navn, emnetitel eller indlægs indhold"
       search: "Søg"
       reminders:
-        later_today: "Senere i dag"
-        tomorrow: "I morgen"
-        next_week: "Næste uge"
-        later_this_week: "Senere på ugen"
-        next_month: "Næste Månede"
-        custom: "Valgfri dato og tid"
+        today_with_time: "i dag kl. %{time}"
+        tomorrow_with_time: "i morgen kl. %{time}"
+        at_time: "kl. %{date_time}"
+        existing_reminder: "Du har en påmindelse sat for dette bogmærke, som vil blive sendt %{at_date_time}"
+    copy_codeblock:
+      copied: "kopieret!"
     drafts:
       resume: "Genoptag"
       remove: "Fjern"
+      remove_confirmation: "Er du sikker på, at du vil offentliggøre dette udkast?"
       new_topic: "Nyt emne-kladde"
       new_private_message: "Ny kladde til privat besked"
-      topic_reply: "Udkast svar"
+      topic_reply: "Udkast til svar"
       abandon:
-        confirm: "Du har allerede åbnet et andet udkast til dette emne. Er du sikker på, at du vil opgive det?"
-        yes_value: "Ja, opgiv"
-        no_value: "Nej, behold"
+        yes_value: "Kassér"
+        no_value: "Genoptag redigering"
     topic_count_latest:
       one: "Se %{count} nyt eller opdateret emne"
       other: "Se %{count} nye eller opdaterede emner"
@@ -286,14 +321,15 @@ da:
       other: "Se %{count} nye emner"
     preview: "forhåndsvising"
     cancel: "annullér"
+    deleting: "Sletter..."
     save: "Gem ændringer"
     saving: "Gemmer…"
     saved: "Gemt!"
-    upload: "Upload"
-    uploading: "Uploader…"
-    uploading_filename: "Uploader: %{filename} ..."
+    upload: "Overfør"
+    uploading: "Overfører…"
+    uploading_filename: "Overfører: %{filename} ..."
     clipboard: "udklipsholder"
-    uploaded: "Uploadet!"
+    uploaded: "Overført!"
     pasting: "Indsætter..."
     enable: "Aktivér"
     disable: "Deaktivér"
@@ -304,8 +340,10 @@ da:
     switch_to_anon: "Gå i anonym tilstand"
     switch_from_anon: "Afslut anonym tilstand"
     banner:
-      close: "Afvis dette banner."
+      close: "Fjern dette banner."
       edit: "Rediger dette banner >>"
+    pwa:
+      install_banner: "Vil du <a href>installere %{title} på denne enhed?</a>"
     choose_topic:
       none_found: "Ingen emner fundet."
       title:
@@ -315,30 +353,30 @@ da:
       none_found: "Ingen beskeder fundet."
       title:
         search: "Søg efter en besked"
-        placeholder: "indtaste beskeds titel, url eller id her"
+        placeholder: "indtast beskeds titel, url eller id her"
     review:
-      order_by: "Filtrér efter"
+      order_by: "Sorter efter"
       in_reply_to: "som svar til"
       explain:
         why: "forklar hvorfor dette punkt endte i køen"
-        title: "Gennemgåelig Scoring"
+        title: "Scoring, der kan gennemgås"
         formula: "Formular"
-        subtotal: "Subtotal"
+        subtotal: "Mellemtotal"
         total: "Total"
         min_score_visibility: "Minimum score for synlighed"
-        score_to_hide: "Score for 'skjul indlæg'"
+        score_to_hide: "Score for at Skjule Indlæg"
         take_action_bonus:
           name: "tog handling"
-          title: "Når et personale medlem vælger at tage handling, får denne markering en bonus"
+          title: "Når en medarbejder vælger at tage handling, får denne markering en bonus"
         user_accuracy_bonus:
           name: "bruger nøjagtighed"
-          title: "Brugere, hvis markeringer er historisk aftalt med, får en bonus."
+          title: "Brugere, hvis markeringer historisk er blevet bekræftet/godkendt, får en bonus."
         trust_level_bonus:
           name: "tillidsniveau"
-          title: "Punkter, der kan gennemgås som er oprettet af brugere af højere tillidsniveau, har en højere score."
+          title: "Punkter til gennemgang, som er oprettet af brugere med højere tillidsniveau, har en højere score."
         type_bonus:
-          name: "type bonus"
-          title: "Visse gennemgåelige typer kan tildeles en bonus af personale medlemmer, for at gøre dem til en højere prioritet."
+          name: "skriv bonus"
+          title: "Visse gennemgåelige typer kan tildeles en bonus af medarbejdere, for at give dem til en højere prioritet."
       claim_help:
         optional: "Du kan gøre krav på dette punkt, for at forhindre andre i at gennemgå det."
         required: "Du skal kræve punkter, før du kan gennemgå dem."
@@ -358,7 +396,7 @@ da:
           title: "Prioriteter, der kan gennemgås"
       moderation_history: "Moderationshistorik"
       view_all: "Se alle"
-      grouped_by_topic: "Grupperet efter emne"
+      grouped_by_topic: "Grupperet efter Emne"
       none: "Der er ingen punkter at gennemgå."
       view_pending: "vis afventende"
       topic_has_pending:
@@ -368,18 +406,22 @@ da:
       topic: "Emne:"
       filtered_topic: "Du har filtreret til indhold der kan andmeldes i ét enkelt emne."
       filtered_user: "Bruger"
+      filtered_reviewed_by: "Gennemgået Af"
       show_all_topics: "vis alle emner"
       deleted_post: "(indlæg slettet)"
       deleted_user: "(bruger slettet)"
       user:
+        bio: "Biografi"
+        website: "Hjemmeside"
         username: "Brugernavn"
         email: "Email"
         name: "Navn"
         fields: "Felter"
+        reject_reason: "Årsag"
       user_percentage:
         summary:
-          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} samlet markering)"
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} samlede markeringer)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (af sidste flagmarkering)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (af de sidste %{count} flagmarkerede)"
         agreed:
           one: "%{count}% er enige"
           other: "%{count}% er enige"
@@ -387,14 +429,14 @@ da:
           one: "%{count}% er uenig"
           other: "%{count}% er uenige"
         ignored:
-          one: "%{count}% ignorerer"
-          other: "%{count}% ignorerer"
+          one: "%{count}% ignorerert"
+          other: "%{count}% ignoreret"
       topics:
         topic: "Emne"
-        reviewable_count: "Tælle"
+        reviewable_count: "Antal"
         reported_by: "Rapporteret af"
         deleted: "[Emne slettet]"
-        original: "(originalt emne)"
+        original: "(oprindeligt indlæg)"
         details: "detaljer"
         unique_users:
           one: "%{count} bruger"
@@ -405,29 +447,31 @@ da:
       edit: "Rediger"
       save: "Gem"
       cancel: "Afbryd"
-      new_topic: "Godkendelse af dette punkt opretter et nyt emne"
+      new_topic: "Godkendelse af dette opretter et nyt emne"
       filters:
         all_categories: "(alle kategorier)"
         type:
           title: "Type"
           all: "(alle typer)"
-        minimum_score: "Minimum score:"
+        minimum_score: "Minimums score:"
         refresh: "Opdatér"
         status: "Status"
         category: "Kategori"
         orders:
           score: "Score"
+          score_asc: "Score (omvendt)"
           created_at: "Oprettet kl"
           created_at_asc: "Oprettet kl (omvendt)"
         priority:
-          title: "Minimum prioritet"
-          low: "(enhver)"
+          title: "Minimums prioritet"
+          any: "(enhver)"
+          low: "Lav"
           medium: "Medium"
           high: "Høj"
       conversation:
         view_full: "vis fuld samtale"
       scores:
-        about: "Denne score beregnes på baggrund af reporterens tillidsniveau, nøjagtigheden af deres tidligere markeringer og prioriteten for punktet som rapporteres."
+        about: "Denne score er beregnet på baggrund af anmelders tillidsniveau, nøjagtigheden af deres tidligere markeringer og prioriteten for det som rapporteres."
         score: "Score"
         date: "Dato"
         type: "Type"
@@ -458,14 +502,50 @@ da:
         reviewable_queued_post:
           title: "Indlæg i kø"
         reviewable_user:
-          title: "bruger"
+          title: "Bruger"
+        reviewable_post:
+          title: "Indlæg"
       approval:
         title: "Indlæg afventer godkendelse"
         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> afventende indlæg."
         ok: "OK"
+      example_username: "brugernavn"
+      reject_reason:
+        title: "Hvorfor afviser du denne bruger?"
+        send_email: "Send afvisningsmail"
+    relative_time_picker:
+      minutes:
+        one: "minut"
+        other: "minutter"
+      hours:
+        one: "time"
+        other: "timer"
+      days:
+        one: "dag"
+        other: "dage"
+      months:
+        one: "måned"
+        other: "måneder"
+      years:
+        one: "år"
+        other: "år"
+      relative: "Relativ"
+    time_shortcut:
+      later_today: "Senere i dag"
+      next_business_day: "Næste hverdag"
+      tomorrow: "I morgen"
+      next_week: "Næste uge"
+      post_local_date: "Dato i indlæg"
+      later_this_week: "Senere denne uge"
+      start_of_next_business_week: "Mandag"
+      start_of_next_business_week_alt: "Næste mandag"
+      next_month: "Næste måned"
+      custom: "Brugerdefineret dato og tid"
+      relative: "Relativ tid"
+      none: "Ikke nødvendig"
     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>"
@@ -481,6 +561,7 @@ da:
       sent_by_user: "Sendt af <a href='%{userUrl}'>%{user}</a>"
       sent_by_you: "Sendt af <a href='%{userUrl}'>dig</a>"
     directory:
+      username: "Brugernavn"
       filter_name: "filtrér efter brugernavn"
       title: "Brugere"
       likes_given: "Givet"
@@ -497,6 +578,7 @@ da:
       days_visited_long: "Besøgsdage"
       posts_read: "Læste"
       posts_read_long: "Indlæg læst"
+      last_updated: "Sidst opdateret:"
       total_rows:
         one: "%{count} bruger"
         other: "%{count} brugere"
@@ -510,14 +592,21 @@ da:
     groups:
       member_added: "Tilføjet"
       member_requested: "Anmodet kl"
+      add_members:
+        title: "Tilføj medlemmer til %{group_name}"
+        description: "Du kan også indsætte en kommasepareret liste."
+        usernames: "Indtast brugernavne eller e-mail adresser"
+        input_placeholder: "Brugernavne eller e-mail adresser"
+        notify_users: "Giv brugerne besked"
       requests:
         title: "Anmodninger"
-        reason: "Grund"
-        accept: "Accepter"
+        reason: "Begrundelse"
+        accept: "Acceptér"
         accepted: "accepteret"
         deny: "Nægt"
         denied: "Nægtet"
-        undone: "anmodning fortrydt"
+        undone: "anmodning fortrudt"
+        handle: "håndter medlemskabsanmodning"
       manage:
         title: "Administrér"
         name: "Navn"
@@ -532,26 +621,60 @@ da:
           notification: Notifikation
         email:
           title: "Email"
+          status: "Synkroniserede %{old_emails} / %{total_emails} e-mails via IMAP."
           credentials:
+            title: "Legitimationsoplysninger"
+            smtp_server: "SMTP-server"
+            smtp_port: "SMTP-port"
+            smtp_ssl: "Brug SSL til SMTP"
+            imap_server: "IMAP-server"
+            imap_port: "IMAP-port"
+            imap_ssl: "Brug SSL til IMAP"
             username: "Brugernavn"
             password: "Adgangskode"
+          settings:
+            title: "Indstillinger"
+            allow_unknown_sender_topic_replies: "Tillad emnesvar fra ukendte afsendere"
+            allow_unknown_sender_topic_replies_hint: "Tillader ukendte afsendere at svare på gruppeemner. Hvis dette ikke er aktiveret, opretter svar fra e-mail-adresser, der ikke allerede er inkluderet i IMAP-e-mail-tråden eller er inviteret til emnet, et nyt emne."
           mailboxes:
+            synchronized: "Synkroniseret postkasse"
+            none_found: "Ingen postkasser blev fundet i denne e-mail-konto."
             disabled: "deaktiveret"
         membership:
           title: Medlemskab
           access: Adgang
+        categories:
+          title: Kategorier
+          long_title: "Kategori standard notifikationer"
+          description: "Når brugere føjes til denne gruppe, indstilles deres kategoriunderretningsindstillinger til disse standardindstillinger. Bagefter kan de ændre dem."
+          watched_categories_instructions: "Overvåg automatisk alle emner i disse kategorier. Gruppemedlemmer vil blive underrettet om alle nye stillinger og emner, og en optælling af nye stillinger vil også blive vist ved siden af emnet."
+          tracked_categories_instructions: "Spor automatisk alle emner i disse kategorier. En optælling af nye indlæg vises ved siden af emnet."
+          watching_first_post_categories_instructions: "Brugere vil blive underrettet om det første indlæg i hvert nyt emne i disse kategorier."
+          regular_categories_instructions: "Hvis disse kategorier sættes til Stille!, vil de ikke længere være Stille! for gruppemedlemmer. Brugere vil blive underrettet, hvis de er nævnt, eller nogen svarer dem."
+          muted_categories_instructions: "Brugere vil ikke blive underrettet om nogen nye emner i disse kategorier, og de vil ikke blive vist på siderne kategorier eller seneste emner."
+        tags:
+          title: Mærker
+          long_title: "Mærker standard notifikationer"
+          description: "Når brugere føjes til denne gruppe, indstilles deres mærke-underretningsindstillinger til disse standardindstillinger. Bagefter kan de ændre dem."
+          watched_tags_instructions: "Overvåg automatisk alle emner med disse mærker. Gruppemedlemmer vil blive underrettet om alle nye stillinger og emner, og en optælling af nye stillinger vil også blive vist ved siden af emnet."
+          tracked_tags_instructions: "Spor automatisk alle emner med disse mærker. En optælling af nye indlæg vises ved siden af emnet."
+          watching_first_post_tags_instructions: "Brugere vil blive underrettet om det første indlæg i hvert nyt emne med disse mærker."
+          regular_tags_instructions: "Hvis disse mærker sættes til Stille!, vil de ikke længere være Stille! for gruppemedlemmer. Brugere vil blive underrettet, hvis de er nævnt, eller nogen svarer dem."
+          muted_tags_instructions: "Du vil ikke få besked om nye emner med disse mærker, og de vil ikke fremgå af 'seneste'."
         logs:
           title: "Logs"
           when: "Når"
           action: "Handling"
           acting_user: "Fungerende bruger"
           target_user: "Målbruger"
-          subject: "Subjekt"
+          subject: "Emne"
           details: "Detaljer"
           from: "Fra"
           to: "Til"
       permissions:
         title: "Tilladelser"
+        none: "Der er ingen kategorier tilknyttet denne gruppe."
+        description: "Medlemmer af denne gruppe har adgang til disse kategorier"
       public_admission: "Tillad brugere frit at tilmelde sig gruppen (Kræver at det er en offentlig synlig gruppe)"
       public_exit: "Tillad brugere frit at forlade gruppen"
       empty:
@@ -561,41 +684,42 @@ da:
         mentions: "Denne gruppe bliver ikke nævnt nogen steder."
         messages: "Der er ingen beskeder til denne gruppe."
         topics: "Der er ingen emner skrevet af medlemmer i denne gruppe."
-        logs: "Der er ingen logning for denne gruppe."
+        logs: "Der er ingen logs for denne gruppe."
       add: "Tilføj"
       join: "Tilslut"
       leave: "Forlad"
-      request: "Forespørgsel"
+      request: "Anmod om medlemskab"
       message: "Besked"
       confirm_leave: "Er du sikker på, at du vil forlade gruppen?"
+      allow_membership_requests: "Tillad brugere at sende medlemskabsanmodninger til gruppeejere (kræver offentligt synlig gruppe)"
       membership_request_template: "Brugerdefineret skabelon, der skal vises til brugere, når der sendes en medlemskabsanmodning"
       membership_request:
-        submit: "Send forespørgsel"
+        submit: "Send Admodning"
         title: "Anmod om medlemskab af gruppen @%{group_name}"
         reason: "Fortæl gruppeejerne, hvorfor du tilhører denne gruppe"
       membership: "Medlemskab"
       name: "Navn"
       group_name: "Gruppe navn"
       user_count: "Brugere"
-      bio: "Om Grupper"
+      bio: "Om Gruppen"
       selector_placeholder: "indtast brugernavn"
       owner: "ejer"
       index:
         title: "Grupper"
-        all: "Alle grupper"
+        all: "Alle Grupper"
         empty: "Der er ingen synlige grupper"
         filter: "Filtrer efter gruppe type"
         owner_groups: "Grupper, jeg ejer"
         close_groups: "Lukkede Grupper"
-        automatic_groups: "Automatiske grupper"
+        automatic_groups: "Automatiske Grupper"
         automatic: "Automatisk"
         closed: "Lukket"
         public: "Offentlig"
         private: "Privat"
-        public_groups: "Offentlige grupper"
-        automatic_group: Automatisk gruppe
+        public_groups: "Offentlige Grupper"
+        automatic_group: Automatisk Gruppe
         close_group: Luk Gruppe
-        my_groups: "Mine grupper"
+        my_groups: "Mine Grupper"
         group_type: "Gruppe type"
         is_group_user: "Bruger"
         is_group_owner: "Ejer"
@@ -609,11 +733,26 @@ da:
         filter_placeholder: "brugernavn"
         remove_member: "Fjern Bruger"
         remove_member_description: "Fjern <b>%{username}</b> fra denne gruppe"
-        make_owner: "Lav Ejer"
+        make_owner: "Gør til ejer"
         make_owner_description: "Gør <b>%{username}</b> til ejer af denne gruppe"
         remove_owner: "Fjern som Ejer"
         remove_owner_description: "Fjern <b>%{username}</b> som ejer af denne gruppe"
+        make_primary: "Gør til Primær"
+        make_primary_description: "Gør dette til den primære gruppe for <b>%{username}</b>"
+        remove_primary: "Fjern som primær"
+        remove_primary_description: "Fjern denne som den primære gruppe for <b>%{username}</b>"
+        remove_members: "Fjern Medlemmer"
+        remove_members_description: "Fjern valgte brugere fra denne gruppe"
+        make_owners: "Gør til ejere"
+        make_owners_description: "Gør valgte brugere til ejere af denne gruppe"
+        remove_owners: "Fjern Ejere"
+        remove_owners_description: "Fjern valgte brugere som ejere af denne gruppe"
+        make_all_primary: "Gør Alle Primære"
+        make_all_primary_description: "Gør dette til den primære gruppe for alle valgte brugere"
+        remove_all_primary: "Fjern som primær"
+        remove_all_primary_description: "Fjern denne gruppe som primær"
         owner: "Ejer"
+        primary: "Primær"
         forbidden: "Du har ikke tilladelse til at se medlemmerne."
       topics: "Emner"
       posts: "Indlæg"
@@ -621,45 +760,49 @@ da:
       messages: "Beskeder"
       notification_level: "Standard notifikationsniveau for gruppebeskeder"
       alias_levels:
-        mentionable: "Hvem kan @gruppenavn denne gruppe?"
-        messageable: "Hvem kan sende en besked til denne gruppe?"
+        mentionable: "Hvem kan @nævne denne gruppe?"
+        messageable: "Hvem kan skrive til denne gruppe?"
         nobody: "Ingen"
-        only_admins: "Kun administratore"
-        mods_and_admins: "Kun moderatore og administratore"
-        members_mods_and_admins: "Kun gruppe medlemmer, moderatore og administratore"
+        only_admins: "Kun administratorer"
+        mods_and_admins: "Kun moderatorer og administratorer"
+        members_mods_and_admins: "Kun gruppe medlemmer, moderatorer og administratorer"
         owners_mods_and_admins: "Kun gruppe ejere, moderatorer og administratorer"
         everyone: "Alle"
       notifications:
         watching:
-          title: "Kigger"
-          description: "Du får beskeder om hvert nyt indlæg i hver besked og antallet af nye svar bliver vist."
+          title: "Overvåger"
+          description: "Du får besked om hvert nyt indlæg i hver besked og antallet af nye svar vil blive vist."
         watching_first_post:
-          title: "Ser på første indlæg"
-          description: "Du bliver underrettet om nye beskeder i denne gruppe, men ikke svar på beskeder."
+          title: "Overvåger første indlæg"
+          description: "Du bliver underrettet om nye beskeder i denne gruppe, men ikke svar på beskederne."
         tracking:
           title: "Følger"
-          description: "Du får besked hvis nogen nævner dit @navn eller svarer dig og antallet af nye svar bliver vist."
+          description: "Du får besked hvis nogen nævner dit @navn eller svarer dig og antallet af nye svar vil blive vist."
         regular:
           title: "Normal"
-          description: "Du får besked hvis nogen nævner dit @navn "
+          description: "Du får besked hvis nogen nævner dit @navn eller svarer dig."
         muted:
-          title: "Tavs"
-          description: "Du bliver ikke underrettet om noget om beskeder i denne gruppe."
+          title: "Stille!"
+          description: "Du bliver ikke underrettet om noget vedr. beskeder i denne gruppe."
       flair_url: "Avatar Flair-billede"
+      flair_upload_description: "Brug firkantede billeder, der ikke er mindre end 20x20 pixels."
       flair_bg_color: "Avatar Flair-baggrundsfarve"
       flair_bg_color_placeholder: "(Valgfrit) Hex farveværdi"
       flair_color: "Avatar Flair-farve"
       flair_color_placeholder: "(Valgfrit) Hex farveværdi"
       flair_preview_icon: "Forhåndsvisning af ikonet"
       flair_preview_image: "Forhåndsvisning af billede"
+      flair_type:
+        icon: "Vælg et ikon"
+        image: "Overfør et billede"
     user_action_groups:
-      "1": "Likes givet"
-      "2": "Likes modtaget"
+      "1": "Synes godt om"
+      "2": "Syntes godt om"
       "3": "Bogmærker"
       "4": "Emner"
       "5": "Svar"
       "6": "Svar"
-      "7": "Referencer"
+      "7": "Omtaler"
       "9": "Citater"
       "11": "Ændringer"
       "12": "Sendte indlæg"
@@ -673,7 +816,7 @@ da:
       category: "Kategori"
       category_list: "Vis liste over kategorier"
       reorder:
-        title: "Ret kategoriernes rækkefølge "
+        title: "Ret kategoriernes rækkefølge"
         title_long: "Omorganiser listen over kategorier"
         save: "Gem rækkefølge"
         apply_all: "Anvend"
@@ -681,18 +824,28 @@ da:
       posts: "Indlæg"
       topics: "Emner"
       latest: "Seneste"
-      latest_by: "seneste af"
       toggle_ordering: "vis/skjul rækkefølgeskifter"
       subcategories: "Underkategorier:"
+      muted: "Lydløse kategorier"
       topic_sentence:
         one: "%{count} emne"
         other: "%{count} emner"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "uge"
+        month: "måned"
+      topic_stat_all_time:
+        one: "%{number} i alt"
+        other: "%{number} i alt"
       topic_stat_sentence_week:
         one: "%{count} nyt emne i den sidste uge."
         other: "%{count} nye emner i den sidste uge."
       topic_stat_sentence_month:
         one: "%{count} nyt emne den sidste måned."
         other: "%{count} nye emner i den sidste måned."
+      n_more: "Kategorier (%{count} mere) ..."
     ip_lookup:
       title: IP-adresse opslag
       hostname: Værtsnavn
@@ -707,43 +860,62 @@ da:
       read_time: "læse tid"
       topics_entered: "emner besøgt"
       post_count: "# indlæg"
-      confirm_delete_other_accounts: "Er du sikker på, at du vil slette disse kontoer?"
+      confirm_delete_other_accounts: "Er du sikker på, at du vil slette disse konti?"
       powered_by: "bruger <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "kopieret"
     user_fields:
       none: "(vælg en indstilling)"
+      required: 'Indtast venligst en værdi for "%{name}"'
     user:
       said: "%{username}:"
       profile: "Profil"
-      mute: "Mute"
+      mute: "Ignorer"
       edit: "Redigér indstillinger"
       download_archive:
         button_text: "Hent alle"
-        confirm: "Er du sikker på, at du vil downloade dine indlæg?"
-        success: "Downloaden er startet. Du vil blive notificeret via en besked, når processen er færdig."
-        rate_limit_error: "Indlæg kan downloades en gang om dagen, prøv igen i morgen."
+        confirm: "Er du sikker på, at du vil hente dine indlæg?"
+        success: "Hentningen er startet. Du vil blive notificeret via en besked, når processen er færdig."
+        rate_limit_error: "Indlæg kan hentes én gang om dagen, prøv igen i morgen."
       new_private_message: "Ny Besked"
       private_message: "Besked"
       private_messages: "Beskeder"
       user_notifications:
         filters:
+          filter_by: "Filtrer efter"
           all: "Alle"
           read: "Læste"
-          unread: "Ulæst"
+          unread: "Ulæste"
+        ignore_duration_title: "Ignorer Bruger"
         ignore_duration_username: "Brugernavn"
         ignore_duration_when: "Varighed:"
         ignore_duration_save: "Ignorér"
-        ignore_duration_note: "Bemærk, at al ignorering fjernes automatisk, når ignoreringens varighed udløber."
+        ignore_duration_note: "Bemærk, at al ignorering automatisk fjernes, når ignoreringens varighed udløber."
         ignore_duration_time_frame_required: "Vælg en tidsramme"
         ignore_no_users: "Du har ingen ignorerede brugere."
         ignore_option: "Ignoreret"
-        ignore_option_title: "Du modtager ikke notifikationer relateret til denne bruger, og alle deres emner og svar vil blive skjult."
+        ignore_option_title: "Du modtager ikke notifikationer relateret til denne bruger, og alle emner og svar, vil blive skjult."
         add_ignored_user: "Tilføj..."
-        mute_option: "Lydløs"
+        mute_option: "Stille!"
         mute_option_title: "Du vil ikke modtage nogen notifikationer relateret til denne bruger."
         normal_option: "Normal"
         normal_option_title: "Du vil blive underrettet, hvis denne bruger svarer dig, citerer dig eller nævner dig."
+      notification_schedule:
+        title: "Tidsplan for notifikation"
+        label: "Aktiver brugerdefineret meddelelsesplan"
+        tip: "Uden for disse timer vil du automatisk blive sat til 'forstyr ikke '."
+        midnight: "Midnat"
+        none: "Ingen"
+        monday: "Mandag"
+        tuesday: "Tirsdag"
+        wednesday: "Onsdag"
+        thursday: "Torsdag"
+        friday: "Fredag"
+        saturday: "Lørdag"
+        sunday: "Søndag"
+        to: "til"
       activity_stream: "Aktivitet"
+      read: "Læs"
+      read_help: "Nyligt læste emner"
       preferences: "Indstillinger"
       feature_topic_on_profile:
         open_search: "Vælg et nyt emne"
@@ -752,9 +924,11 @@ da:
         save: "Gem"
         clear:
           title: "Ryd"
+          warning: "Er du sikker på, at du vil rydde dit fremhævede emne?"
+      use_current_timezone: "Brug den aktuelle tidszone"
       profile_hidden: "Denne brugers offentlige profil er skjult."
       expand_profile: "Udvid"
-      collapse_profile: "Fald sammen"
+      collapse_profile: "Fold sammen"
       bookmarks: "Bogmærker"
       bio: "Om mig"
       timezone: "Tidszone"
@@ -770,58 +944,81 @@ da:
         perm_denied_expl: "Du nægtede adgang for notifikationer. Tillad notifikationer via indstillingerne i din browser."
         disable: "Deaktiver notifikationer"
         enable: "Aktiver notifikationer"
-        each_browser_note: "Bemærk: Du skal ændre indstillingen i alle dine browsere."
+        each_browser_note: 'Bemærk: Du skal ændre denne indstilling i hver browser, du bruger. Alle meddelelser deaktiveres, når de er i "forstyr ikke", uanset denne indstilling.'
         consent_prompt: "Ønsker du live notifikationer, når folk svarer på dine indlæg?"
-      dismiss: "Afvist"
-      dismiss_notifications: "Afvis alle"
+      dismiss: "Ignorer Alle"
+      dismiss_notifications: "Skjul Alle"
       dismiss_notifications_tooltip: "Marker alle ulæste notifikationer som læst"
+      no_messages_title: "Du har ingen meddelelser"
+      no_messages_body: >
+        Har du brug for at have en direkte personlig samtale med nogen, uden for det normale samtale flow? Send dem en besked ved at vælge deres avatar og bruge %{icon} meddelelsesknappen.<br><br> Hvis du har brug for hjælp, kan du <a href='%{aboutUrl}'>sende en besked til en medarbejder</a>.
       first_notification: "Din første notifikation! Vælg den for at begynde."
       dynamic_favicon: "Vis tællinger på browser-ikonet"
+      skip_new_user_tips:
+        description: "Spring nye bruger-onboarding tips og emblemer over"
+        not_first_time: "Ikke din første gang?"
+        skip_link: "Spring disse tips over"
       theme_default_on_all_devices: "Gør dette til standard temaet på alle mine enheder"
+      color_scheme_default_on_all_devices: "Sæt standard farveskema(er) på alle mine enheder"
+      color_scheme: "Farveskema"
+      color_schemes:
+        default_description: "Tema standard"
+        disable_dark_scheme: "Samme som almindelig"
+        dark_instructions: "Du kan forhåndsvise farvesammensætningen for mørk tilstand ved at skifte din enheds mørke tilstand."
+        undo: "Nulstil"
+        regular: "Almindelig"
+        dark: "Mørk tilstand"
+        default_dark_scheme: "(standard for websted)"
+      dark_mode: "Mørk Tilstand"
+      dark_mode_enable: "Aktivér automatisk farveskema i mørk tilstand"
       text_size_default_on_all_devices: "Gør dette til standard tekststørrelse på alle mine enheder"
-      allow_private_messages: "Tillad andre brugere at send mig personlige beskeder"
+      allow_private_messages: "Tillad andre brugere at sende mig personlige beskeder"
       external_links_in_new_tab: "Åbn alle eksterne links i en ny fane"
       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_tooltip: "Denne bruger er moderator"
-      admin_tooltip: "Denne bruger er administrator"
+      featured_topic: "Fremhævet emne"
+      moderator: "%{user} er en moderator"
+      admin: "%{user} er en admin"
+      moderator_tooltip: "Denne bruger er en moderator"
+      admin_tooltip: "Denne bruger er en administrator"
       silenced_tooltip: "Denne bruger er mådeholdt (silenced)"
       suspended_notice: "Denne bruger er suspenderet indtil %{date}."
-      suspended_permanently: "Denne bruger er udelukket."
+      suspended_permanently: "Denne bruger er suspenderet."
       suspended_reason: "Begrundelse: "
+      github_profile: "GitHub"
       email_activity_summary: "Resumé over aktivitet"
       mailing_list_mode:
         label: "Mailing list tilstand"
         enabled: "Aktiverer mailing list tilstand"
         instructions: |
-          Denne indstillilng har indflydelse på opsummeringen af aktiviteter.<br />
-          Fravalgte / 'muted' emner og kategorier fer ikke inkluderet i disse mails.
+          Denne indstillilng tilsidesætter aktivitetsoversigten.<br />
+          Ignorede emner og kategorier er 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)"
-        few_per_day: "Send mig en email or hvert nyt indlæg (cirka 2 om dagen)"
+        few_per_day: "Send mig en email for hvert nyt indlæg (cirka 2 om dagen)"
         warning: "Mailing liste tilstand aktiveret. Email notifikation indstillinger tilsidesættes."
-      tag_settings: "Tags"
-      watched_tags: "Følger"
-      watched_tags_instructions: "Du vil automatisk følge alle emner med disse tags. Du bliver informeret om alle nye indlæg og emner og antallet af nye indlæg bliver vises ved emnet."
+      tag_settings: "Mærker"
+      watched_tags: "Overvågede"
+      watched_tags_instructions: "Du vil automatisk følge alle emner med disse mærker. Du bliver informeret om alle nye indlæg og emner og antallet af nye indlæg bliver vises ved emnet."
       tracked_tags: "Sporet"
-      tracked_tags_instructions: "Du tracker automatisk alle emner med disse tags. Antallet af nye indlæg bliver vises ved hvert emne."
+      tracked_tags_instructions: "Du følger automatisk alle emner med disse mærker. Antallet af nye indlæg bliver vises ved hvert emne."
       muted_tags: "Lydløs / 'muted'"
-      muted_tags_instructions: "Du vil ikke få besked om nye emner med disse tags, og de vil ikke fremgå af 'seneste'."
-      watched_categories: "Overvåget"
+      muted_tags_instructions: "Du vil ikke få besked om nye emner med disse mærker, og de vil ikke fremgå af 'seneste'."
+      watched_categories: "Overvågede"
       watched_categories_instructions: "Du overvåger automatisk alle emner i disse kategorier. Du får besked om alle nye indlæg og emner, og antallet af nye indlæg vises ved hvert emne."
-      tracked_categories: "Fulgt"
-      tracked_categories_instructions: "Du tracker automatisk alle emner i disse kategorier. Antallet af nye indlæg vises ved hvert emne."
-      watched_first_post_categories: "Ser første indlæg"
+      tracked_categories: "Følger"
+      tracked_categories_instructions: "Du følger automatisk alle emner i disse kategorier. Antallet af nye indlæg vises ved hvert emne."
+      watched_first_post_categories: "Overvåger Første Indlæg"
       watched_first_post_categories_instructions: "Du vil blive adviseret om alle første indlæg, i emner, under disse kategorier"
       watched_first_post_tags: "Ser Første Indlæg"
-      watched_first_post_tags_instructions: "Du får besked om første indlæg i hvert nyt emne med disse tags."
-      muted_categories: "Ignoreret"
-      muted_categories_instructions: "Du vil ikke blive underrettet om noget om nye emner i disse kategorier, og de vises ikke på kategorierne eller de seneste sider."
-      muted_categories_instructions_dont_hide: "Du vil ikke blive underrettet om noget om nye emner i disse kategorier."
+      watched_first_post_tags_instructions: "Du får besked om første indlæg i hvert nyt emne med disse mærker."
+      muted_categories: "Stille!"
+      muted_categories_instructions: "Du vil ikke blive underrettet om noget vedr. nye emner i disse kategorier, og de vises ikke på siderne \"kategori\" eller \"seneste\"."
+      muted_categories_instructions_dont_hide: "Du vil ikke blive underrettet om noget vedr. nye emner i disse kategorier."
+      regular_categories: "Almindelig"
+      regular_categories_instructions: "Du vil se disse kategorier i “seneste” og “Top” emnelister."
       no_category_access: "Som moderator har du begrænset kategori-adgang, at gemme er slået fra. "
       delete_account: "Slet min konto"
       delete_account_confirm: "Er du sikker på du vil slette din konto permanent? Dette kan ikke fortrydes!"
@@ -830,138 +1027,200 @@ da:
       unread_message_count: "Beskeder"
       admin_delete: "Slet"
       users: "Brugere"
-      muted_users: "Ignoreret"
-      ignored_users: "Ignoreret"
+      muted_users: "Stille!"
+      muted_users_instructions: "Undertryk alle notifikationer og PM'er fra disse brugere."
+      allowed_pm_users: "Tilladt"
+      allowed_pm_users_instructions: "Tillad kun PM'er fra disse brugere."
+      allow_private_messages_from_specific_users: "Tillad kun bestemte brugere at sende mig personlige beskeder"
+      ignored_users: "Ignorerede"
+      ignored_users_instructions: "Undertryk alle indlæg, meddelelser og PM'er fra disse brugere."
       tracked_topics_link: "Vis"
-      automatically_unpin_topics: "Automatisk stop med at følge emner, når jeg når til bunden."
+      automatically_unpin_topics: "Stop automatisk med at følge emner, når jeg når til bunden."
       apps: "Apps"
       revoke_access: "Tilbagekald adgang"
-      undo_revoke_access: "Revider tilbagekald adgang"
+      undo_revoke_access: "Fortryd Tilbagekald adgang"
       api_approved: "Godkendt:"
       api_last_used_at: "Sidst brugt:"
       theme: "Tema"
-      home: "Standard hjemmeside"
+      save_to_change_theme: 'Tema vil blive opdateret efter du har trykket på“%{save_text}„'
+      home: "Standard startside"
       staged: "Iscenesat"
       staff_counters:
-        flags_given: "hjælpsomme markeringer"
+        flags_given: "hjælpsomme rapporteringer"
         flagged_posts: "markerede indlæg"
         deleted_posts: "slettede indlæg"
         suspensions: "suspenderinger"
         warnings_received: "advarsler"
+        rejected_posts: "afviste indlæg"
       messages:
         all: "Alle"
         inbox: "Indbakke"
         sent: "Sendt"
         archive: "Arkiv"
-        groups: "Mine grupper"
+        groups: "Mine Grupper"
         bulk_select: "Vælg beskeder"
         move_to_inbox: "Flyt til Indbakke"
         move_to_archive: "Arkiv"
-        failed_to_move: "Kunne ikke flytte valgt beskeder (måske problemer med netværket)"
+        failed_to_move: "Kunne ikke flytte valgte beskeder (måske er dit netværket nede)"
         select_all: "Vælg alle"
-        tags: "Tags"
+        tags: "Mærker"
       preferences_nav:
         account: "Konto"
+        security: "Sikkerhed"
         profile: "Profil"
         emails: "E-mail"
         notifications: "Notifikationer"
         categories: "Kategorier"
         users: "Brugere"
-        tags: "Tags"
+        tags: "Mærker"
         interface: "Grænseflade"
         apps: "Apps"
       change_password:
         success: "(e-mail sendt)"
         in_progress: "(sender e-mail)"
         error: "(fejl)"
+        emoji: "lås emoji"
         action: "Send e-mail til nulstilling af adgangskode"
         set_password: "Skriv password"
         choose_new: "Vælg et nyt kodeord"
         choose: "Vælg et kodeord"
       second_factor_backup:
+        title: "To-faktor backup koder"
         regenerate: "Regenerér"
         disable: "Deaktiver"
         enable: "Aktiver"
         enable_long: "Aktivér backup koder"
+        manage:
+          one: "Administrér backup koder. Du har <strong>%{count}</strong> backup kode tilbage."
+          other: "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"
+        copied_to_clipboard: "Kopieret til udklipsholder"
+        download_backup_codes: "Hent backup koder"
+        remaining_codes:
+          one: "Du har <strong>%{count}</strong> backup kode tilbage."
+          other: "Du har <strong>%{count}</strong> backup koder tilbage."
         use: "Brug en backup kode"
+        enable_prerequisites: "Du skal aktivere en primær to-faktor-metrode, før du kan generere backup koder."
         codes:
-          title: "backup koder genereret"
+          title: "Backup Koder Genereret"
           description: "Hver af disse backup koder kan kun bruges én gang. Opbevar dem et sted der er sikkert men tilgængeligt."
       second_factor:
+        title: "To-faktor godkendelse"
+        enable: "Administrer To-faktor godkendelse"
+        disable_all: "Deaktiver alle"
         forgot_password: "Glemt kodeord?"
         confirm_password_description: "Bekræft dit kodeord for at fortsætte"
         name: "Navn"
         label: "Kode"
         rate_limit: "Vent venligst, før du prøver en anden godkendelseskode."
         enable_description: |
-          Scan denne QR-kode i en understøttet 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" target="_blank">iOS</a> ), og indtast din godkendelseskode.
+          Scan denne QR-kode i en understøttet 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" target="_blank">iOS</a>), og indtast din godkendelseskode.
         disable_description: "Indtast godkendelseskoden fra din app"
         show_key_description: "Indtast manuelt"
         short_description: |
           Beskyt din konto med engangs-sikkerhedskoder.
+        extended_description: |
+          To-faktor godkendelse tilføjer ekstra sikkerhed til din konto ved at kræve en engangstoken ud over dit adgangskode. Tokens kan genereres på <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android-</a> og <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS-</a> enheder.
+        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: "Deaktivér"
+        disable_confirm: "Er du sikker på, at du vil deaktivere alle to-faktor metoder?"
         save: "Gem"
         edit: "Rediger"
+        edit_title: "Rediger godkendelsesenhed"
+        edit_description: "Navn på godkendelsesenhed"
+        enable_security_key_description: |
+          Når du har din <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">hardware-sikkerhedsnøgle</a> forberedt, tryk på Register knappen nedenfor.
         totp:
           title: "Token-baserede autentificatorer"
+          add: "Tilføj godkendelsesenhed"
           default_name: "Min autentifikator"
+          name_and_code_required_error: "Du skal angive et navn og koden fra din godkendelsesapp."
         security_key:
           register: "Registrer"
           title: "Sikkerhedsnøgler"
+          add: "Tilføj Sikkerhedsnøgle"
+          default_name: "Hoved sikkerhedsnøgle"
+          not_allowed_error: "Registreringsprocessen for sikkerhedsnøgle fik enten timeout eller blev annulleret."
+          already_added_error: "Du har allerede registreret denne sikkerhedsnøgle. Du behøver ikke at registrere det igen."
+          edit: "Rediger Sikkerhedsnøgle"
           save: "Gem"
+          edit_description: "Navn på sikkerhedsnøgle"
+          name_required_error: "Du skal angive et navn til din sikkerhedsnøgle."
       change_about:
         title: "Skift “Om mig”"
-        error: "Der opstod en fejl i ændringen af denne værdi."
+        error: "Der opstod en fejl ved ændringen af denne værdi."
       change_username:
         title: "Skift brugernavn"
         confirm: "Er du helt sikker på, at du vil ændre dit brugernavn?"
-        taken: "Beklager, det brugernavn er optaget."
+        taken: "Beklager, det brugernavn er taget."
         invalid: "Det brugernavn er ugyldigt. Det må kun bestå af bogstaver og tal."
       add_email:
+        title: "Tilføj e-mail"
         add: "tilføj"
       change_email:
         title: "Skift e-mail-adresse"
-        taken: "Beklager, den e-mail-adresse er optaget af en anden bruger."
+        taken: "Beklager, denne e-mail er ikke tilgængelig."
         error: "Der opstod en fejl i forbindelse med skift af din e-mail-adresse. Måske er adressen allerede i brug?"
         success: "Vi har sendt en e-mail til din nye adresse. Klik på linket i mail’en for at aktivere din nye e-mail-adresse."
-        success_staff: "Vi har sendt en email til din nuværende adresse. Følg bekræftelsesinstruktionerne."
+        success_via_admin: "Vi har sendt en e-mail til den adressen. Brugeren skal følge bekræftelsesinstruktionerne i e-mailen."
+        success_staff: "Vi har sendt en email til din nuværende adresse. Følg venligst bekræftelsesinstruktionerne."
       change_avatar:
         title: "Skift dit profilbillede"
-        letter_based: "System tildelt profilbillede"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, baseret på"
+        gravatar_title: "Skift din avatar på %{gravatarName}'s hjemmeside"
+        gravatar_failed: "Vi kunne ikke finde et %{gravatarName} med den e-mail-adresse."
+        refresh_gravatar_title: "Opdater din %{gravatarName}"
+        letter_based: "Systemtildelt profilbillede"
         uploaded_avatar: "Brugerdefineret profil billede"
         uploaded_avatar_empty: "Tilføj et brugerdefineret profil billede"
-        upload_title: "Upload dit profil billede"
-        image_is_not_a_square: "Advarsel: vi har klippet i billedet; bredde og højde var ikke ens."
+        upload_title: "Overfør dit profil billede"
+        image_is_not_a_square: "Advarsel: vi har beskåret billedet; bredde og højde var ikke ens."
+        logo_small: "Webstedets lille logo. Anvendes som standard."
+      change_profile_background:
+        title: "Profiloverskrift"
+        instructions: "Profiloverskrifter vil blive centreret og har en standardbredde på 1110px."
       change_card_background:
         title: "Brugerkort-Baggrund"
         instructions: "Baggrunds billeder vil blive centreret og have en standard bredde på 590px."
+      change_featured_topic:
+        title: "Fremhævet emne"
+        instructions: "Et link til dette emne findes på dit brugerkort og din profil."
       email:
         title: "E-mail"
         primary: "Primær email"
         secondary: "Sekundære emails"
         primary_label: "Primær"
+        unconfirmed_label: "ubekræftet"
+        resend_label: "Gensend bekræftelses e-mail"
+        resending_label: "sender ..."
+        resent_label: "e-mail sendt"
         update_email: "Skift e-mail-adresse"
-        sso_override_instructions: "Email kan opdateres fra SSO-udbyderen."
+        set_primary: "Indstil primær e-mail"
+        destroy: "Fjern e-mail"
+        add_email: "Tilføj alternativ e-mail"
+        auth_override_instructions: "E-mail kan opdateres fra godkendelsesudbyderen."
         no_secondary: "Ingen sekundære emails"
         instructions: "Vis aldrig offentligt"
+        admin_note: "Bemærk: En administratorbruger, der skifter en anden ikke-admin-brugers e-mail, indikerer, at brugeren har mistet adgang til deres oprindelige e-mail-konto, så en nulstil-adgangskode-e-mail vil blive sendt til brugerens nye adresse. Brugerens e-mail ændres ikke, før de har afsluttet processen med nulstilling af adgangskode."
         ok: "Vi vil sende dig en bekræftelses email"
+        required: "Indtast venligst en e-mail-adresse"
         invalid: "Indtast venligst en gyldig email adresse"
         authenticated: "Din email er blevet bekræftet af %{provider}"
+        invite_auth_email_invalid: "Din invitations e-mail matcher ikke den godkendte e-mail 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."
       associated_accounts:
         title: "Tilknyttede konti"
-        connect: "Opret forbindelse"
-        revoke: "Fratag"
+        connect: "Forbind"
+        revoke: "Tilbagekald"
         cancel: "Afbryd"
         not_connected: "(ikke forbundet)"
-        confirm_modal_title: "Tilslut %{provider}-konto"
+        confirm_modal_title: "Forbind %{provider}-konto"
         confirm_description:
           account_specific: "Din %{provider}-konto '%{account_description}' vil blive brugt til godkendelse."
           generic: "Din %{provider}-konto vil blive brugt til godkendelse."
@@ -969,12 +1228,13 @@ da:
         title: "Navn"
         instructions: "Dit fulde navn (valgfrit)"
         instructions_required: "Dit fulde navn"
+        required: "Indtast venligst et navn"
         too_short: "Dit navn er for kort"
         ok: "Dit navn ser fint ud"
       username:
         title: "Brugernavn"
         instructions: "unikt, ingen mellemrum, kort"
-        short_instructions: "Folk kan benævne dig som @%{username}"
+        short_instructions: "Folk kan nævne dig som @%{username}"
         available: "Dit brugernavn er tilgængeligt"
         not_available: "Ikke ledigt. Prøv %{suggestion}?"
         not_available_no_suggestion: "Ikke tilgængelig"
@@ -982,13 +1242,18 @@ da:
         too_long: "Dit brugernavn er for langt"
         checking: "Kontrollerer om brugernavnet er ledigt…"
         prefilled: "E-mail svarer til dette registrerede brugernavn"
+        required: "Indtast venligst et brugernavn"
+        edit: "Redigér brugernavn"
       locale:
-        title: "sprog"
-        instructions: "Brugerinterface sprog. Det skifter når de reloader siden."
+        title: "Sprog"
+        instructions: "Brugergrænseflade sprog. Det skifter når du genindlæser siden."
         default: "(standard)"
         any: "alle"
       password_confirmation:
         title: "Gentag adgangskode"
+      invite_code:
+        title: "Invitations kode"
+        instructions: "Kontoregistrering kræver en invitationskode"
       auth_tokens:
         title: "Nyligt brugte enheder"
         details: "Detaljer"
@@ -1000,19 +1265,23 @@ da:
         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}"
         secure_account: "Gør min konto sikker"
-        latest_post: "Du sendte sidst ..."
+        latest_post: "Du sendte sidst…"
+        device_location: '<span class="auth-token-device">%{device}</span> &ndash; <span title="IP: %{ip}">%{location}</span>'
+        browser_active: '%{browser} | <span class="active">aktiv nu</span>'
+        browser_last_seen: "%{browser} | %{date}"
       last_posted: "Sidste indlæg"
       last_emailed: "Sidste e-mail"
       last_seen: "Sidst set"
       created: "Oprettet"
       log_out: "Log ud"
       location: "Sted"
-      website: "Site"
+      website: "Websted"
       email_settings: "E-mail"
       hide_profile_and_presence: "Skjul min offentlige profil og tilstedeværelsesfunktioner"
-      enable_physical_keyboard: "Aktivér fysisk tastaturstøtte på iPad"
+      enable_physical_keyboard: "Aktivér understøttelse af fysisk tastatur på iPad"
       text_size:
         title: "Skriftstørrelse"
+        smallest: "Mindste"
         smaller: "Mindre"
         normal: "Normal"
         larger: "Større"
@@ -1022,14 +1291,14 @@ da:
         notifications: "Nye notifikationer"
         contextual: "Nyt side indhold"
       like_notification_frequency:
-        title: "Giv besked når liked"
+        title: "Giv besked når andre 'Synes godt godt'"
         always: "Altid"
-        first_time_and_daily: "Første gang et indlæg likes og dagligt"
-        first_time: "Første gang et indlæg likes"
+        first_time_and_daily: "Første gang et indlæg markeres med 'Synes godt om' og dagligt"
+        first_time: "Første gang et indlæg markeres med 'Synes godt om'"
         never: "Aldrig"
       email_previous_replies:
         title: "Inkluder tidligere svar i bunden af emails"
-        unless_emailed: "medmindre tidligere sendt"
+        unless_emailed: "medmindre det er sendt tidligere"
         always: "altid"
         never: "aldrig"
       email_digests:
@@ -1045,7 +1314,7 @@ da:
         always: "altid"
         only_when_away: "kun når du er væk"
         never: "aldrig"
-      email_messages_level: "Send mig en email når nogen sender mig en besked"
+      email_messages_level: "Send mig en e-mail, når nogen sender beskeder til mig"
       include_tl0_in_digests: "Inkluder indhold fra nye brugere i opsummerende mails"
       email_in_reply_to: "Inkluder et uddrag af svaret indlæg i emails"
       other_settings: "Andre"
@@ -1071,53 +1340,96 @@ da:
         after_10_minutes: "efter 10 minutter"
       notification_level_when_replying: "Når jeg skriver i et emne, sæt emnet som"
       invited:
-        search: "tast for at søge invitationer…"
         title: "Invitationer"
+        pending_tab: "Afventende"
+        pending_tab_with_count: "Ventende (%{count})"
+        expired_tab: "Udløbet"
+        expired_tab_with_count: "Udløbet (%{count})"
+        redeemed_tab: "Indløst"
+        redeemed_tab_with_count: "Indløst (%{count})"
+        invited_via: "Invitation"
+        invited_via_link: "link %{key} (%{count} / %{max} indløst)"
+        groups: "Grupper"
+        topic: "Emne"
+        sent: "Oprettet/Senest Sendt"
+        expires_at: "Udløber"
+        edit: "Redigér"
+        remove: "Fjern"
+        copy_link: "Hent Link"
+        reinvite: "Gensend E-Mail"
+        reinvited: "Invitation gensendt"
+        removed: "Fjernet"
+        search: "tast for at søge invitationer…"
         user: "Inviteret bruger"
         none: "Ingen invitationer at vise."
         truncated:
           one: "Viser den første invitation."
           other: "Viser de første %{count} invitationer."
         redeemed: "Brugte invitationer"
-        redeemed_tab: "Indløst"
-        redeemed_tab_with_count: "Indløst (%{count})"
         redeemed_at: "Invitation brugt"
         pending: "Afventende invitationer"
-        pending_tab: "Afventende"
-        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"
-        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"
+        remove_all: "Fjern Udløbne Invitationer"
+        removed_all: "Alle udløbne invitationer er fjernet!"
+        remove_all_confirm: "Er du sikker på, at du vil fjerne alle udløbne invitationer?"
         reinvite_all: "Gensend alle invitationer"
         reinvite_all_confirm: "Er du sikker på, at du vil sende alle invitationer igen?"
-        reinvited: "Invitation gensendt"
         reinvited_all: "Alle invitationerne er gensendt!"
         time_read: "Læsetid"
         days_visited: "Besøgsdage"
         account_age_days: "Kontoens alder i dage"
-        links_tab: "Links"
-        link_created_at: "Oprettet"
-        link_groups: grupper
+        create: "Invitér"
+        generate_link: "Opret invitations-link"
+        link_generated: "Her er dit invitations-link!"
         valid_for: "Imvitationslinket er kun gyldigt for emailadressen: %{email}"
+        single_user: "Inviter via e-mail"
+        multiple_user: "Inviter via link"
         invite_link:
+          title: "Invitations Link"
           success: "Invitiationslinket blev genereret!"
+          error: "Der opstod en fejl under generering af Invitationslink"
+          max_redemptions_allowed_label: "Hvor mange mennesker har lov til at registrere sig ved hjælp af dette link?"
+          expires_at: "Hvornår udløber dette invitationslink?"
+        invite:
+          new_title: "Opret Invitation"
+          edit_title: "Rediger Invitation"
+          instructions: "Del dette link for øjeblikkeligt at give adgang til dette websted:"
+          copy_link: "kopier link"
+          expires_in_time: "Udløber om %{time}."
+          expired_at_time: "Udløbet %{time}."
+          show_advanced: "Vis Avancerede Indstillinger"
+          hide_advanced: "Skjul Avancerede Indstillinger"
+          max_redemptions_allowed: "Maks. antal anvendelser:"
+          add_to_groups: "Tilføj til grupper:"
+          invite_to_topic: "Send til emne ved første login:"
+          expires_at: "Udløber efter:"
+          custom_message: "Valgfri personlig meddelelse:"
+          send_invite_email: "Gem og send e-mail"
+          save_invite: "Gem Invitation"
+          invite_saved: "Invitation gemt."
+          invite_copied: "Inviteringslink kopieret."
+          blank_email: "Invitationslink ikke kopieret. E-mail-adresse er påkrævet."
         bulk_invite:
-          success: "Fil uploaded successfuldt, du vil blive meddelt via en beskede når processen er fuldendt."
+          none: "Ingen invitationer at vise på denne side."
+          text: "Masseinvitation"
+          instructions: |
+            <p>Invitér en liste over brugere for at få dit fællesskab i gang hurtigt. Forbered en <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">CSV-fil</a> indeholdende mindst en række pr. e-mail-adresse på brugere, du vil invitere. Følgende kommasepareret information kan gives, hvis du ønsker at tilføje personer til grupper eller sende dem til et bestemt emne første gang de logger på.</p>
+            <pre>john@smith.com,første_gruppe_navn; anden_gruppe_navn,emne_id</pre>
+            <p>Hver e-mailadresse i din overførte CSV-fil vil blive sendt en invitation og du vil være i stand til at administrere det senere.</p>
+          progress: "Overført %{progress}%..."
+          success: "Filen blev overført. Du får besked via besked, når processen er fuldført."
           error: "Desværre, filen skal være CSV format."
-          confirmation_message: "Du er ved at sende email invitationer til alle i den uploadede fil."
       password:
         title: "Adgangskode"
         too_short: "Din adgangskode er for kort."
-        common: "Den adgangskode er for udbredt."
+        common: "Denne adgangskode er for almindelig."
         same_as_username: "Dit password er det samme som dit brugernavn."
         same_as_email: "Dit password er det samme som din email adresse."
         ok: "Din adgangskode ser fin ud."
         instructions: "mindst %{count} tegn"
+        required: "Indtast venligst en adgangskode"
       summary:
         title: "Statistik"
         stats: "Statistik"
@@ -1140,7 +1452,7 @@ da:
           other: "dage besøgt"
         topics_entered:
           one: "emne set"
-          other: "emner vist"
+          other: "emner set"
         posts_read:
           one: "Indlæg læst"
           other: "Indlæg læst"
@@ -1153,15 +1465,15 @@ da:
         top_topics: "Top emner"
         no_topics: "Ingen emner endnu."
         more_topics: "Flere emner"
-        top_badges: "Top badges"
-        no_badges: "Ingen 'badges' endnu."
-        more_badges: "Flere badges"
+        top_badges: "Top emblemer"
+        no_badges: "Ingen 'emblemer' endnu."
+        more_badges: "Flere emblemer"
         top_links: "Top Links"
         no_links: "Ingen links, endnu"
-        most_liked_by: "Mest Populære"
-        most_liked_users: "Most Liked"
+        most_liked_by: "Flest 'Synes godt om' mig"
+        most_liked_users: "Flest 'Synes godt om' andre"
         most_replied_to_users: "Flest har responderet"
-        no_likes: "Ingen likes, endnu."
+        no_likes: "Ingen 'Synes godt om', endnu."
         top_categories: "Topkategorier"
         topics: "Emner"
         replies: "Svar"
@@ -1172,18 +1484,20 @@ da:
       avatar:
         title: "Profilbillede"
         header_title: "profil, beskeder, bogmærker og indstillinger."
+        name_and_description: "%{name} - %{description}"
+        edit: "Rediger Profilbillede"
       title:
         title: "Titel"
         none: "(ingen)"
       primary_group:
-        title: "Primær gruppe"
+        title: "Primær Gruppe"
         none: "(ingen)"
       filters:
         all: "Alle"
       stream:
         posted_by: "Skrevet af"
         sent_by: "Sendt af"
-        private_message: "besked"
+        private_message: "meddelelse"
         the_topic: "emnet"
     loading: "Indlæser…"
     errors:
@@ -1195,10 +1509,10 @@ da:
         unknown: "Fejl"
         not_found: "Side ikke fundet"
       desc:
-        network: "Tjek din internetforbindelse."
-        network_fixed: "Det ser ud som om den er tilbage."
+        network: "Tjek venligst din forbindelse."
+        network_fixed: "Det ser ud som om forbindelsen er tilbage."
         server: "Fejlkode: %{status}"
-        forbidden: "Du har ikke tilladelser til at se det"
+        forbidden: "Du har ikke tilladelser til at se dette"
         not_found: "Ups, programmet forsøgte at indlæse en URL der ikke eksisterer."
         unknown: "Noget gik galt."
       buttons:
@@ -1207,33 +1521,37 @@ da:
         fixed: "Indlæs side"
     modal:
       close: "luk"
+      dismiss_error: "Skjul fejl"
     close: "Luk"
-    assets_changed_confirm: "Dette site er lige blevet opdateret. Vil du opdatere nu til den seneste version?"
+    assets_changed_confirm: "Dette websted har lige modtaget en softwareopgradering. Indlæs den nyeste version nu?"
     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."
-      logout_disabled: "Log ud er deaktiveret mens websitet er i læs kun tilstand"
-    learn_more: "Læs mere…"
-    all_time: "i alt"
-    all_time_desc: "emner oprettet i alt"
-    year: "år"
-    year_desc: "Indlæg oprettet i de seneste 365 dage"
-    month: "måned"
-    month_desc: "Indlæg oprettet i de seneste 30 dage"
-    week: "uge"
-    week_desc: "Indlæg oprettet i de seneste 7 dage"
-    day: "dag"
+      enabled: "Dette websted er i skrivebeskyttet tilstand lige nu. Fortsæt endelig med at kigge, men der kan ikke svares, sendes 'Synes godt om' eller andet indtil videre."
+      login_disabled: "Login er deaktiveret, mens webstedet er i skrivebeskyttet tilstand."
+      logout_disabled: "Log ud er deaktiveret mens webstedet er i skrivebeskyttet tilstand."
+    too_few_topics_and_posts_notice_MF: >-
+      Lad os <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">starte diskussionen!</a> Der {currentTopics, plural, one {er <strong>#</strong> emne} other {er <strong>#</strong> emner}} og {currentPosts, plural, one {<strong>#</strong> indlæg} other {<strong>#</strong> indlæg}}. Besøgende har brug for mere at læse og svare på — vi anbefaler i det mindste {requiredTopics, plural, one {<strong>#</strong> emne} other {<strong>#</strong> emner}} og {requiredPosts, plural, one {<strong>#</strong> indlæg} other {<strong>#</strong> indlæg}}. Kun medarbejdere kan se denne besked.
+    too_few_topics_notice_MF: >-
+      Lad os <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">starte diskussionen!</a> Der {currentTopics, plural, one {er <strong>#</strong> emne} other {er <strong>#</strong> emner}}. Besøgende har brug for mere at læse og svare på — vi anbefaler i det mindste {requiredTopics, plural, one {<strong>#</strong> emne} other {<strong>#</strong> emner}}. Kun medarbejdere kan se denne besked.
+    too_few_posts_notice_MF: >-
+      Lad os <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">starte diskussionen!</a> Der {currentPosts, plural, one {er <strong>#</strong> indlæg} other {er <strong>#</strong> indlæg}}. Besøgende har brug for mere at læse og svare på — vi anbefaler i det mindste {requiredPosts, plural, one {<strong>#</strong> indlæg} other {<strong>#</strong> indlæg}}. Kun administratorer kan se denne besked.
+    logs_error_rate_notice:
+      reached_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, one {# fejl/minut} other {# fejl/minut}}</a> har overskredet webstedsindstillingsgrænsen på {limit, plural, one {# fejl / minut} other {# fejl/minut}}."
+      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# fejl/minut} other {# fejl/minut}}</a> har nået webstedets indstillingsgrænse på {limit, plural, one {# fejl/minut} other {# fejl/minut}}."
+      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# fejl/time} other {# fejl/time}}</a> har overskredet webstedets indstillingsgrænse på {limit, plural, one {# fejl/time} other {# fejl/time}}."
+      exceeded_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, one {# fejl/minut} other {# fejl/minut}}</a> overskredet webstedsindstillingsgrænsen på {limit, plural, one {# fejl / minut} other {# fejl/minut}}."
+    learn_more: "lær mere..."
     first_post: Første indlæg
-    mute: Mute
+    mute: Ignorer
     unmute: Unmute
     last_post: Sendt
+    local_time: "Lokal Tid"
     time_read: Læste
     time_read_recently: "%{time_read} for nylig"
-    time_read_tooltip: "%{time_read} samlet læst tid"
-    time_read_recently_tooltip: "%{time_read} samlet tid læst (%{recent_time_read} i de sidste 60 dage)"
+    time_read_tooltip: "%{time_read} samlet læsetid"
+    time_read_recently_tooltip: "%{time_read} samlet læsetid (%{recent_time_read} i de sidste 60 dage)"
     last_reply_lowercase: seneste svar
     replies_lowercase:
       one: svar
@@ -1242,83 +1560,108 @@ da:
       sign_up: "Tilmeld dig"
       hide_session: "Mind mig om det i morgen"
       hide_forever: "nej tak"
-      hidden_for_session: "OK, jeg spørger dig i morgen. Du kan altid bruge 'Log ind' til at oprette en konto."
       intro: "Hej! Det ser ud til, at du nyder diskussionen, men du har ikke tilmeldt dig en konto endnu."
-      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:"
+      value_prop: "Når du opretter en konto, husker vi præcis, hvad du har læst, så du altid kommer tilbage, hvor du slap. Du får også meddelelser, her og via e-mail, 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:
+        one: "Der er <b>%{count}</b> svar."
+        other: "Der er <b>%{count}</b> svar."
+      description_time_MF: "Der {replyCount, plural, one {er <b>#</b> svar} other {er <b>#</b> svar}} med en anslået læsetid på <b>{readingTime, plural, one {# minut} other {# minutter}}</b>."
       enable: "Opsummér dette emne"
       disable: "Vis alle indlæg"
     deleted_filter:
       enabled_description: "Dette emne indeholder slettede indlæg, som er blevet skjult."
-      disabled_description: "Slettede indlæg bliver vist. "
+      disabled_description: "Slettede indlæg i emnet bliver vist."
       enable: "Skjul Slettede Indlæg"
       disable: "Vis Slettede Indlæg"
     private_message_info:
       title: "Besked"
+      invite: "Inviter Andre..."
+      edit: "Tilføj eller fjern ..."
+      remove: "Fjern..."
+      add: "Tilføj..."
       leave_message: "Vil du virkelig forlade denne besked?"
-      remove_allowed_user: "Ønsker du virkelig at fjerne %{name} fra denne samtale?"
+      remove_allowed_user: "Ønsker du virkelig at fjerne %{name} fra denne besked?"
       remove_allowed_group: "Er du sikker på du vil fjerne %{name} fra denne besked?"
     email: "E-mail"
     username: "Brugernavn"
     last_seen: "Sidst set"
     created: "Oprettet"
-    created_lowercase: "Oprettet"
+    created_lowercase: "oprettet"
     trust_level: "Tillidsniveau"
     search_hint: "brugernavn, email eller IP adresse"
     create_account:
+      header_title: "Velkommen!"
+      subheader_title: "Lad os oprette din konto"
       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"
+      title: "Opret din konto"
       failed: "Noget gik galt. Måske er e-mail-adressen allerede registreret – prøv “Jeg har glemt min adgangskode”-linket"
     forgot_password:
       title: "Nulstil kodeord"
       action: "Jeg har glemt min adgangskode"
       invite: "Skriv brugernavn eller e-mail-adresse, så sender vi dig en mail så du kan nulstille din adgangskode."
       reset: "Nulstil adgangskode"
-      complete_username: "Hvis en konto matcher brugernavnet <b>%{username}</b>, vil du om lidt modtage en email med instruktioner om hvordan man nulstiller passwordet."
-      complete_email: "Hvis en konto matcher <b>%{email}</b>, vil du om lidt modtage en email med instruktioner om hvordan man nulstiller passwordet."
-      complete_username_not_found: "Ingen kontoer passer til brugernavnet <b>%{username}</b>"
-      complete_email_not_found: "Ingen kontoer svarer til <b>%{email}</b>"
+      complete_username: "Hvis en konto findes med brugernavnet <b>%{username}</b>, vil du om lidt modtage en email med instruktioner om hvordan du nulstiller passwordet."
+      complete_email: "Hvis en konto findes med <b>%{email}</b>, vil du om lidt modtage en email med instruktioner om hvordan man nulstiller passwordet."
+      complete_username_found: "Vi fandt en konto, der matcher brugernavnet <b>%{username}</b>. Du vil snart modtage en email med instruktioner om hvordan du nulstiller din adgangskode."
+      complete_email_found: "Vi fandt en konto, der matcher <b>%{email}</b>. Du vil snart modtage en email med instruktioner om hvordan du nulstiller din adgangskode."
+      complete_username_not_found: "Ingen konto anvender brugernavnet <b>%{username}</b>"
+      complete_email_not_found: "Ingen konto anvender <b>%{email}</b>"
       help: "Email ikke modtaget? Sørg for først at checke din spam-mappe. <p> Ikke sikker på, hvilken emailadresse du brugte? Indtast en emailadresse, så fortæller vi dig, om den findes her. </p><p> Hvis du ikke længere har adgang til emailadressen på din konto, skal du kontakte <a href='%{basePath}/about'>vores hjælpsomme hjælperteam.</a> </p>"
       button_ok: "OK"
       button_help: "Hjælp"
     email_login:
-      link_label: "Email mig et login link "
+      link_label: "Email mig et login link"
       button_label: "med email"
-      complete_username: "Hvis en konto matcher brugernavnet <b>%{username}</b> , vil du snart modtage en email med et login link."
-      complete_email: "Hvis en konto matcher <b>%{email}</b> , vil du snart modtage en email med et login link."
-      complete_username_found: "Vi fandt en konto, der matcher brugernavnet <b>%{username}</b> , du vil snart modtage en email med et login link."
-      complete_email_found: "Vi fandt en konto, der matcher <b>%{email}</b> , du vil snart modtage en email med et login link."
-      complete_username_not_found: "Ingen kontoer passer til brugernavnet <b>%{username}</b>"
-      complete_email_not_found: "Ingen kontoer svarer til <b>%{email}</b>"
+      login_link: "Spring adgangskoden over; send mig et login link"
+      emoji: "lås emoji"
+      complete_username: "Hvis en konto findes med brugernavnet <b>%{username}</b>, vil du snart modtage en email med et login link."
+      complete_email: "Hvis en konto findes med <b>%{email}</b>, vil du snart modtage en email med et login link."
+      complete_username_found: "Vi fandt en konto, der anvender brugernavnet <b>%{username}</b>, du vil snart modtage en email med et login link."
+      complete_email_found: "Vi fandt en konto, der anvender <b>%{email}</b>, du vil snart modtage en email med et login link."
+      complete_username_not_found: "Ingen konto anvender brugernavnet <b>%{username}</b>"
+      complete_email_not_found: "Ingen konto anvender <b>%{email}</b>"
       confirm_title: Fortsæt til %{site_name}
       logging_in_as: Logger ind som %{email}
-      confirm_button: Afslut login
+      confirm_button: Gennemfør login
     login:
+      header_title: "Velkommen tilbage"
+      subheader_title: "Log ind med din konto"
       title: "Log ind"
       username: "Bruger"
       password: "Adgangskode"
-      second_factor_description: "Indtast godkendelseskoden fra din app:"
-      second_factor_backup_description: "Indtast en af dine backup koder:"
-      email_placeholder: "e-mail eller brugernavn"
-      caps_lock_warning: "Caps Lock er sat til"
+      second_factor_title: "To-faktor godkendelse"
+      second_factor_description: "Indtast venligst godkendelseskoden fra din app:"
+      second_factor_backup: "Log ind ved hjælp af en backup kode"
+      second_factor_backup_title: "To-faktor backup"
+      second_factor_backup_description: "Indtast venligst en af dine backup koder:"
+      second_factor: "Log ind ved hjælp af Authenticator app"
+      security_key_description: "Når du har forberedt din fysiske sikkerhedsnøgle, skal du trykke på knappen Godkend med sikkerhedsnøgle nedenfor."
+      security_key_alternative: "Prøv en anden måde"
+      security_key_authenticate: "Godkend med sikkerhedsnøgle"
+      security_key_not_allowed_error: "Godkendelsesprocessen for sikkerhedsnøgle fik enten timeout eller blev annulleret."
+      security_key_no_matching_credential_error: "Ingen matchende legitimationsoplysninger kunne findes i den angivne sikkerhedsnøgle."
+      security_key_support_missing_error: "Din aktuelle enhed eller browser understøtter ikke brugen af sikkerhedsnøgler. Brug en anden metode."
+      email_placeholder: "E-mail / Brugernavn"
+      caps_lock_warning: "Caps Lock er slået til"
       error: "Ukendt fejl"
-      cookies_error: "Din browser ser ud til at have deaktiveret cookies. Du kan muligvis ikke lave et log ind, uden at aktivere dem først."
+      cookies_error: "Din browser ser ud til at have cookies deaktiveret. Du kan muligvis ikke logge ind uden at aktivere dem først."
       rate_limit: "Vent venligst, før du prøver at logge på igen."
-      blank_username: "Indtast din email eller brugernavn."
-      blank_username_or_password: "Skriv din email adresse eller brugernavn og dit password"
+      blank_username: "Indtast venligst din e-mail eller dit brugernavn."
+      blank_username_or_password: "Indtast venligst din e-mail eller dit brugernavn og adgangskode."
       reset_password: "Nulstil adgangskode"
       logging_in: "Logger ind..."
       or: "Eller"
-      authenticating: "Logger ind…"
+      authenticating: "Godkender..."
       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_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."
+      omniauth_disallow_totp: "Din konto har tofaktorgodkendelse aktiveret. Log venligst ind med dit kodeord."
       resend_title: "Gensend Aktiverings-e-mail"
       change_email: "Skift e-mailadresse"
       provide_new_email: "Angiv en ny adresse og vi fremsender din bekræftelses-e-mail påny. "
@@ -1326,7 +1669,7 @@ da:
       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."
+      preferences: "Du skal være logget ind for at ændre dine præferencer."
       not_approved: "Din konto er endnu ikke blevet godkendt. Du får besked via e-mail når du kan logge ind."
       google_oauth2:
         name: "Google"
@@ -1346,6 +1689,9 @@ da:
       discord:
         name: "Discord"
         title: "med Discord"
+      second_factor_toggle:
+        totp: "Brug en godkendelsesapp i stedet"
+        backup_code: "Brug en backup kode i stedet"
     invites:
       accept_title: "Invitation"
       welcome_to: "Velkommen til %{site_name}!"
@@ -1355,6 +1701,7 @@ da:
       accept_invite: "Accepter Invitation"
       success: "Din konto er blevet oprettet, og du er nu logget ind."
       name_label: "Navn"
+      password_label: "Adgangskode"
       optional_description: "(valgfri)"
     password_reset:
       continue: "Fortsæt til %{site_name}"
@@ -1373,29 +1720,47 @@ da:
       categories_boxes: "Kasser med underkategorier"
       categories_boxes_with_topics: "Kasser med udvalgte emner"
     shortcut_modifier_key:
-      shift: "Skift"
+      shift: "Shift"
       ctrl: "Ctrl"
       alt: "Alt"
-      enter: "Indtast"
+      enter: "Enter"
     conditional_loading_section:
-      loading: Loader...
+      loading: Indlæser…
+    category_row:
+      topic_count:
+        one: "%{count} emne i denne kategori"
+        other: "%{count} emner i denne kategori"
+      plus_subcategories_title:
+        one: "%{name} og en underkategori"
+        other: "%{name} og %{count} underkategorier"
+      plus_subcategories:
+        one: "+ %{count} underkategori"
+        other: "+ %{count} underkategorier"
     select_kit:
+      filter_by: "Filtrer efter: %{name}"
+      select_to_filter: "Vælg en værdi, der skal filtreres"
       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}'"
       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."
+      invalid_selection_length:
+        one: "Der skal mindst vælges %{count} karakter."
+        other: "Der skal mindst vælges %{count} karakterer."
+      components:
+        tag_drop:
+          filter_for_more: Filtrer for mere...
+        categories_admin_dropdown:
+          title: "Administrer kategorier"
     date_time_picker:
       from: Fra
       to: Til
-      errors:
-        to_before_from: "Til dato skal være senere end fra dato."
     emoji_picker:
       filter_placeholder: Søg efter humørikon
       smileys_&_emotion: Smilys og følelser
@@ -1406,18 +1771,18 @@ da:
       activities: Aktiviteter
       objects: Objekter
       symbols: Symboler
-      flags: Markeringer
+      flags: Flag
       recent: For nylig brugt
       default_tone: Ingen hudfarve
       light_tone: Lys hudfarve
       medium_light_tone: Medium lys hudfarve
       medium_tone: Medium hudfarve
       medium_dark_tone: Medium mørk hudfarve
-      dark_tone: Mørk skin tone
+      dark_tone: Mørk hudfarve
       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 udgive delte kladder."
       destination_category: "Destinations-kategori"
       publish: "Offentliggør delt kladde"
       confirm_publish: "Er du sikker på, at du vil offentliggøre dette udkast?"
@@ -1428,7 +1793,6 @@ da:
       options: "Indstillinger"
       whisper: "hvisken"
       unlist: "Ikke listede"
-      blockquote_text: "Citatblok"
       add_warning: "Dette er en officiel advarsel."
       toggle_whisper: "Slå hvisken til/fra"
       toggle_unlisted: "Slå listning til/fra"
@@ -1437,25 +1801,38 @@ da:
       similar_topics: "Dit emne minder om…"
       drafts_offline: "kladder offline"
       edit_conflict: "rediger konflikt"
+      group_mentioned_limit:
+        one: "<b>Advarsel!</b> Du nævnte <a href='%{group_link}'>%{group}</a> , men denne gruppe har flere medlemmer end administratorens opsatte omtale-grænse på %{count} bruger. Ingen bliver underrettet."
+        other: "<b>Advarsel!</b> Du nævnte <a href='%{group_link}'>%{group}</a> , men denne gruppe har flere medlemmer end administratorens opsatte omtale-grænse på %{count} 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?"
       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."
+        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 denne 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}"
+      reference_topic_title: "SV: %{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:
+          one: "Titlen skal være på mindst %{count} tegn"
+          other: "Titlen skal være på mindst %{count} tegn"
+        title_too_long:
+          one: "Titlen skal være kortere end %{count} tegn."
+          other: "Titlen skal være kortere end %{count} tegn."
         post_missing: "Indlæg kan ikke være tomt"
-        post_length: "Indlægget skal være på mindst %{min} tegn."
+        post_length:
+          one: "Indlægget skal være på mindst %{count} tegn."
+          other: "Indlægget skal være på mindst %{count} tegn."
         try_like: "Har du prøvet %{heart}knappen?"
         category_missing: "Du skal vælge en kategori."
+        tags_missing:
+          one: "Du skal vælge mindst %{count}-mærke"
+          other: "Du skal vælge mindst %{count}-mærker"
+        topic_template_not_modified: "Tilføj venligst detaljer og specifikationer til dit emne ved at redigere emneskabelonen."
       save_edit: "Gem ændringer"
       overwrite_edit: "Overskriv redigering"
-      reply_original: "Svar til det oprindelige emne"
+      reply_original: "Svar på det oprindelige emne"
       reply_here: "Svar her"
       reply: "Svar"
       cancel: "Annullér"
@@ -1465,9 +1842,9 @@ da:
       create_shared_draft: "Opret delt kladde"
       edit_shared_draft: "Rediger delt kladde"
       title: "Eller tryk Ctrl+Enter"
-      users_placeholder: "Tilføj bruger"
+      users_placeholder: "Tilføj en bruger"
       title_placeholder: "Hvad handler diskussionen om i korte træk?"
-      title_or_link_placeholder: "Skriv titlen eller indsæt et link her"
+      title_or_link_placeholder: "Skriv titel eller indsæt et link her"
       edit_reason_placeholder: "hvorfor redigerer du?"
       topic_featured_link_placeholder: "Indtast link som vises med titel."
       remove_featured_link: "Fjern link fra emne."
@@ -1477,27 +1854,27 @@ da:
       view_new_post: "Se dit nye indlæg."
       saving: "Gemmer."
       saved: "Gemt!"
-      uploading: "Uploader…"
-      show_preview: "forhåndsvisning &raquo;"
-      hide_preview: "&laquo; skjul forhåndsvisning"
+      saved_draft: "Indlægs udkast i gang. Tryk for at fortsætte."
+      uploading: "Overfører…"
       quote_post_title: "Citér hele indlægget"
-      bold_label: "B"
+      bold_label: "F"
       bold_title: "Fed"
       bold_text: "fed skrift"
-      italic_label: "I"
+      italic_label: "K"
       italic_title: "Kursiv"
       italic_text: "kursiv skrift"
       link_title: "Link"
       link_description: "skriv linkets beskrivelse her"
       link_dialog_title: "Indsæt link"
       link_optional_text: "evt. titel"
-      quote_title: "Citatblok"
-      quote_text: "Citatblok"
+      link_url_placeholder: "Indsæt en URL eller skriv for at søge i emner"
+      blockquote_title: "Citatblok"
+      blockquote_text: "Citatblok"
       code_title: "Præformateret tekst"
       code_text: "indryk præformateret tekst med 4 mellemrum"
       paste_code_text: "skriv eller indsæt kode her"
-      upload_title: "Billede"
-      upload_description: "skriv billedets beskrivelse her"
+      upload_title: "Overfør"
+      upload_description: "skriv overførsels beskrivelse her"
       olist_title: "Nummereret liste"
       ulist_title: "Punktopstilling"
       list_item: "Listepunkt"
@@ -1520,12 +1897,17 @@ da:
         draft: Kladde
         edit: Rediger
         reply_to_post:
+          label: Svar på et indlæg af %{postUsername}
           desc: Besvar et specifikt indlæg
         reply_as_new_topic:
-          label: Besvar som linket emne
+          label: Besvar som sammenkædet emne
           desc: Opret et nyt emne, der er knyttet til dette emne
+          confirm: Du har gemt et nyt emneudkast, som overskrives, hvis du opretter et sammenkædet emne.
+        reply_as_new_group_message:
+          label: Svar som ny gruppemeddelelse
+          desc: Opret en ny privat besked med de samme modtagere
         reply_as_private_message:
-          label: Ny besked
+          label: Ny meddelelse
           desc: Opret en ny privat besked
         reply_to_topic:
           label: Besvar emne
@@ -1534,26 +1916,31 @@ da:
           label: Slå hvisken til/fra
           desc: Hvisken er kun synlige for hjælperteam medlemmer
         create_topic:
-          label: "Nyt emne"
+          label: "Nyt Emne"
         shared_draft:
           label: "Delt Kladde"
-          desc: "Lav en kladde til et emne, der kun er synligt for hjælperteam"
+          desc: "Lav en udkast til et emne, der kun er synligt for tilladte brugere"
         toggle_topic_bump:
           label: "Slå emne 'bump' til/fra"
           desc: "Svar uden at ændre den seneste svardato"
+      reload: "Genindlæs"
+      ignore: "Ignorér"
     notifications:
       tooltip:
         regular:
           one: "%{count} uset notifikation"
           other: "%{count} usete notifikationer"
         message:
-          one: "%{count} ulæst besked"
-          other: "%{count} ulæste beskeder"
+          one: "%{count} ulæst meddelelse"
+          other: "%{count} ulæste meddelelser"
+        high_priority:
+          one: "%{count} ulæst meddelelse med høj prioritet"
+          other: "%{count} ulæste meddelelser med høj prioritet"
       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"
+      reviewable_items: "elementer, der kræver gennemgang"
       mentioned: "<span>%{username}</span> %{description}"
       group_mentioned: "<span>%{username}</span> %{description}"
       quoted: "<span>%{username}</span> %{description}"
@@ -1562,8 +1949,12 @@ da:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} og %{count} anden</span> %{description}"
+        other: "<span class='multi-user'>%{username}, %{username2} og %{count} andre</span> %{description}"
       liked_consolidated_description:
-        one: "kunne godt lide %{count} af dine indlæg"
+        one: "syntes godt om %{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}"
@@ -1572,9 +1963,16 @@ da:
       invitee_accepted: "<span>%{username}</span> accepterede din invitation"
       moved_post: "<span>%{username}</span> flyttede %{description}"
       linked: "<span>%{username}</span> %{description}"
-      granted_badge: "Optjent '%{description}'"
+      granted_badge: "Fortjente '%{description}'"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Nyt emne</span> %{description}"
+      membership_request_accepted: "Medlemskab accepteret i '%{group_name}'"
+      membership_request_consolidated:
+        one: "%{count} åben ansøgning om medlemskab i '%{group_name}“"
+        other: "%{count} åbne ansøgninger om medlemskab i '%{group_name}“"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
+      votes_released: "%{description} - afsluttet"
       group_message_summary:
         one: "%{count} besked i din %{group_name} indbakke"
         other: "%{count} beskeder i din %{group_name} indbakke"
@@ -1589,56 +1987,59 @@ da:
         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"
         quoted: "citeret"
         edited: "redigeret"
-        liked: "nyt like"
+        liked: "nyt 'synes godt om'"
         private_message: "ny privat besked"
         invited_to_private_message: "inviteret til privat besked"
         invitee_accepted: "invitation accepteret"
         posted: "nyt indlæg"
         moved_post: "indlæg flyttet"
         linked: "linket"
-        granted_badge: "badge tildelt"
+        bookmark_reminder: "bogmærke påmindelse"
+        bookmark_reminder_with_name: "bogmærke påmindelse - %{name}"
+        granted_badge: "emblem tildelt"
         invited_to_topic: "inviteret til emne"
         group_mentioned: "nævnt gruppe"
         group_message_summary: "nye gruppe beskeder"
         watching_first_post: "nyt emne"
         topic_reminder: "emne påmindelse"
-        liked_consolidated: "nye likes"
+        liked_consolidated: "nye 'synes godt om'"
         post_approved: "indlæg godkendt"
+        membership_request_consolidated: "nye anmodninger om medlemskab"
+        reaction: "ny reaktion"
+        votes_released: "Afstemningen blev frigivet"
     upload_selector:
       title: "Indsæt billede"
       title_with_attachments: "Tilføj et billede eller en fil"
-      from_my_computer: "Fra min computer"
-      from_the_web: "Fra nettet"
+      from_my_computer: "Fra min enhed"
+      from_the_web: "Fra internettet"
       remote_tip: "link til billede"
-      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}"
-      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"
+      uploading: "Overfører billede"
       select_file: "Vælg fil"
       default_image_alt_text: billede
+      supported_formats: "understøttede formater"
     search:
       sort_by: "Sorter efter"
       relevance: "Relevans"
-      latest_post: "Seneste indlæg"
+      latest_post: "Seneste Indlæg"
       latest_topic: "Seneste Emne"
       most_viewed: "Mest sete"
       most_liked: "Mest likede"
-      select_all: "Vælg alle"
-      clear_all: "Ryd alle"
+      select_all: "Vælg Alle"
+      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>"
       title: "søg efter emner, indlæg, brugere eller kategorier"
-      full_page_title: "søg emner eller indlæg"
+      full_page_title: "søg efter emner eller indlæg"
       no_results: "Ingen resultater fundet."
       no_more_results: "Ikke flere resultater."
       post_format: "#%{post_number} af %{username}"
@@ -1649,11 +2050,13 @@ da:
       or_search_google: "Eller prøv at søge med Google i stedet:"
       search_google: "Prøv at søge med Google i stedet:"
       search_google_button: "Google"
+      search_button: "Søg"
       context:
         user: "Søg i indlæg fra @%{username}"
         category: "Søg i #%{category} kategorien"
+        tag: "Søg i #%{tag} tag"
         topic: "Søg i dette emne"
-        private_messages: "Søg i beskeder"
+        private_messages: "Søg i meddelelser"
       advanced:
         title: Avanceret Søgning
         posted_by:
@@ -1665,41 +2068,55 @@ da:
         with_badge:
           label: Med Badge
         with_tags:
-          label: tagget
+          label: Mærket
         filters:
           label: Returner kun emner / indlæg ...
           title: Kun matchende i titel
           likes: Jeg syntes om
           posted: Jeg skrev i
+          created: Jeg har oprettet
           watching: Jeg overvåger
           tracking: Jeg følger
           private: I mine beskeder
           bookmarks: Jeg bogmærkede
           first: er det allerførste indlæg
           pinned: er fastgjort
-          seen: jeg læser
-          unseen: Jeg har ikke læst
+          seen: Jeg læste
+          unseen: Jeg ikke har læst
           wiki: er wiki
           images: inkludér billede(r)
-          all_tags: Alle ovenstående tags
+          all_tags: Alle ovenstående mærker
         statuses:
           label: Hvor emner
           open: er åbne
           closed: er lukkede
+          public: er offentlige
           archived: er arkiverede
-          noreplies: har ingen svar
+          noreplies: har nul-svar
           single_user: indeholder en enkelt bruger
         post:
+          count:
+            label: Indlæg
+          min:
+            placeholder: minimum
+          max:
+            placeholder: maksimum
           time:
             label: Sendt
             before: før
             after: efter
+        views:
+          label: Visninger
+        min_views:
+          placeholder: minimum
+        max_views:
+          placeholder: maksimum
     hamburger_menu: "gå til en anden emneliste eller kategori"
     new_item: "ny"
     go_back: "gå tilbage"
     not_logged_in_user: "bruger side, med oversigt over aktivitet og indstillinger"
-    current_user: "gå til brugerside"
-    view_all: "vis alle"
+    current_user: "gå til din brugerside"
+    view_all: "vis alle %{tab}"
     topics:
       new_messages_marker: "sidste besøg"
       bulk:
@@ -1709,7 +2126,7 @@ da:
         relist_topics: "Genindlæs emner"
         reset_read: "Nulstil \"læst\""
         delete: "Slet emner"
-        dismiss: "Afvis"
+        dismiss: "Skjul"
         dismiss_read: "Afvis alle ulæste"
         dismiss_button: "Afvis..."
         dismiss_tooltip: "Afvis kun nye indlæg eller stop med at følge emner"
@@ -1720,26 +2137,38 @@ da:
         change_category: "Indstil kategori"
         close_topics: "Luk indlæg"
         archive_topics: "Arkiver Emner"
+        move_messages_to_inbox: "Flyt til indbakke"
         notification_level: "Notifikationer"
+        change_notification_level: "Skift Notifikationsniveau"
         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."
-        change_tags: "Erstat Tags"
-        append_tags: "Tilføj Tags"
-        choose_new_tags: "Vælg nye tags for dette emne"
-        choose_append_tags: "Vælg nye tags til at tilføje emnet:"
-        changed_tags: "Tags for dette emne blev ændret"
+        change_tags: "Erstat Mærker"
+        append_tags: "Tilføj Mærker"
+        choose_new_tags: "Vælg nye mærker for dette emne"
+        choose_append_tags: "Vælg nye mærker til at tilføje emnet:"
+        changed_tags: "Mærker for dette emne blev ændret"
+        remove_tags: "Fjern Alle Mærker"
+        confirm_remove_tags:
+          one: "Alle mærker fjernes fra dette emne. Er du sikker?"
+          other: "Alle mærker fjernes fra <b>%{count}</b> emner. Er du sikker?"
+        progress:
+          one: "Fremskridt: <strong>%{count}</strong> emne"
+          other: "Fremskridt: <strong>%{count}</strong> emner"
       none:
         unread: "Du har ingen ulæste emner."
         new: "Du har ingen nye emner."
         read: "Du har ikke læst nogen emner endnu."
         posted: "Du har ikke skrevet nogen indlæg endnu."
+        ready_to_create: "Klar til "
+        latest: "Du er nu fuldt opdateret!"
         bookmarks: "Du har ingen bogmærkede emner endnu."
         category: "Der er ingen emner i kategorien %{category}."
         top: "Der er ingen top emner"
         educate:
-          unread: '<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">1</span> hvis du:</p><ul><li>Oprettede dette emne</li><li>Svarede dette emne</li><li>Læste emnet i mere end 4 minutter</li></ul><p> Eller hvis du udtrykkeligt sat emnet til Sporet eller Følger via notifikations indstillinger i bunden af hvert emne.</p><p> Tilgå dine <a href="%{userPrefsUrl}">indstillinger</a> for at ændre dette.</p>'
+          new: '<p>Dine nye emner vil blive vist her. Som standard betragtes emner som nye og vil vise en <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> indikator, hvis de blev oprettet inden for de sidste 2 dage.</p><p>Besøg dine <a href="%{userPrefsUrl}">præferencer</a> for at ændre dette.</p>'
+          unread: "<p>Dine ulæste emner vises her.</p><p>Som standard betragtes emner som ulæste og vil vise antal af ulæste <span class=\"badge new-posts badge-notification\">1</span> hvis du:</p><ul><li>Oprettede emnet</li><li>Svarede på emnet</li><li>Læste emnet i mere end 4 minutter</li></ul><p>Eller hvis du udtrykkeligt har indstillet emnet til fulgt eller overvåget via \U0001F514 i hvert emne.</p><p>Besøg dine <a href=\"%{userPrefsUrl}\">præferencer</a> for at ændre dette.</p>"
       bottom:
         latest: "Der er ikke flere populære emner."
         posted: "Der er ikke flere emner."
@@ -1747,6 +2176,7 @@ da:
         new: "Der er ikke flere nye emner."
         unread: "Der er ikke flere ulæste emner."
         category: "Der er ikke flere emner i kategorien %{category}."
+        tag: "Der er ikke flere %{tag} emner."
         top: "Der er ikke flere top emner"
         bookmarks: "Der er ikke flere bogmærkede emner."
     topic:
@@ -1764,11 +2194,18 @@ da:
         title: "Flyt til Indbakke"
         help: "Flyt beskeder tilbage til Indbakke"
       edit_message:
-        help: "Rediger det første indlæg af beskeden"
+        help: "Rediger det første indlæg af meddelelsen"
         title: "Rediger"
       defer:
         help: "Markér som ulæst"
         title: "Udsæt"
+      feature_on_profile:
+        help: "Tilføj et link til dette emne på dit brugerkort og profil"
+        title: "Fremhæv på Profil"
+      remove_from_profile:
+        warning: "Din profil har allerede et fremhævet emne. Hvis du fortsætter, vil dette emne erstatte det eksisterende emne."
+        help: "Fjern linket til dette emne på din brugerprofil"
+        title: "Fjern fra profil"
       list: "Emner"
       new: "nyt emne"
       unread: "ulæste"
@@ -1785,55 +2222,85 @@ da:
         login_required: "Do skal logge på for at se dette emne."
       server_error:
         title: "Emnet kunne ikke indlæses"
-        description: "Beklager, vi kunne ikke indlæse det emne, muligvis grundet et problem med netværksforbindelsen. Prøv venligst igen. Hvis problemet fortæstter, så skriv venligst til os."
+        description: "Beklager, vi kunne ikke indlæse det emne, muligvis grundet et problem med netværksforbindelsen. Prøv venligst igen. Hvis problemet fortsætter, så giv os besked."
       not_found:
-        title: "Emnet findes ikke"
+        title: "Emne ikke fundet"
         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: "du har %{count} ulæst indlæg i dette enme"
+        other: "du har %{count} ulæste indlæg i dette enme"
       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: "du har %{count} ulæst gammelt indlæg i dette enme"
+        other: "du har %{count} ulæste gamle indlæg i dette enme"
       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"
       likes:
-        one: "der er ét like i dette emne"
-        other: "der er %{count} likes i dette emne"
+        one: "der er %{count} \"synes godt om\" i dette emne"
+        other: "der er %{count} \"synes godt om\" 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}."
-      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 {}}"
+      read_more_in_category: "Vil du læse mere? Se andre emner i %{catLink} eller %{latestLink}."
+      read_more: "Vil du læse mere? %{catLink} eller %{latestLink}."
+      unread_indicator: "Intet medlem har læst det sidste indlæg i dette emne endnu."
+      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{og } false {er } other{}} <a href='{basePath}/new'># nyt</a> emne} other { {BOTH, select, true{og } false {er } other{}} <a href='{basePath}/new'># nye</a> emner} } tilbage, eller {CATEGORY, select, true {kig på andre emner i {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Vis alle kategorier
+      browse_all_tags: Gennemse alle mærker
       view_latest_topics: vis seneste emner
+      suggest_create_topic: start en ny samtale?
       jump_reply_up: hop til tidligere svar
       jump_reply_down: hop til senere svar
       deleted: "Emnet er blevet slettet"
+      slow_mode_update:
+        title: "Langsom Tilstand"
+        select: "Brugere må kun skrive i dette emne en gang hver:"
+        description: "For at fremme tankevækkende diskussioner i hurtige eller omstridte diskussioner, skal brugerne vente, før de poster igen i dette emne."
+        save: "Aktiver"
+        enabled_until: "Aktiveret indtil:"
+        remove: "Deaktiver"
+        hours: "Timer:"
+        minutes: "Minutter:"
+        seconds: "Sekunder:"
+        durations:
+          10_minutes: "10 Minutter"
+          15_minutes: "15 Minutter"
+          30_minutes: "30 Minutter"
+          45_minutes: "45 Minutter"
+          1_hour: "1 Time"
+          2_hours: "2 Timer"
+          4_hours: "4 Timer"
+          8_hours: "8 Timer"
+          12_hours: "12 Timer"
+          24_hours: "24 Timer"
+          custom: "Brugerdefineret Varighed"
       topic_status_update:
-        title: "Emne timer"
+        title: "Emne Timer"
         save: "Indstil timerfunktion"
         num_of_hours: "Antal timer:"
+        num_of_days: "Antal dage:"
         remove: "Fjern timerfunktion"
         publish_to: "Udgiv I:"
         when: "Hvornår:"
-        time_frame_required: Vælg en tidsramme
+        time_frame_required: "Vælg venligst en tidsramme"
+        min_duration: "Varigheden skal være større end 0"
+        max_duration: "Varigheden skal være mindre end 20 år"
       auto_update_input:
         none: "Vælg en tidsramme"
+        now: "Nu"
         later_today: "Senere i dag"
         tomorrow: "I morgen"
         later_this_week: "Senere på ugen"
         this_weekend: "Denne weekend"
         next_week: "Næste uge"
-        two_weeks: "To Uger"
-        next_month: "Næste Månede"
+        two_weeks: "To uger"
+        next_month: "Næste Måned"
         two_months: "To måneder"
-        three_months: "Tre Måneder"
+        three_months: "Tre måneder"
         four_months: "Fire måneder"
-        six_months: "Seks Måneder"
+        six_months: "Seks måneder"
         one_year: "Et år"
         forever: "Forevigt"
         pick_date_and_time: "Vælg dato og tid"
@@ -1841,34 +2308,42 @@ da:
       publish_to_category:
         title: "Planlæg Udgivelse"
       temp_open:
-        title: "Åben Midlertidigt"
+        title: "Åbn Midlertidigt"
       auto_reopen:
-        title: "Åben Automatisk Emnet"
+        title: "Åbn Automatisk Emnet"
       temp_close:
         title: "Luk Midlertidigt"
       auto_close:
         title: "Luk Automatisk Emnet"
-        label: "Auto-luk emne, timer:"
+        label: "Luk automatisk emne efter:"
         error: "Indtast venligst en gyldig værdi."
         based_on_last_post: "Luk ikke før det seneste indlæg i emnet er mindst så gammel."
+      auto_close_after_last_post:
+        title: "Luk emne automatisk efter sidste indlæg"
       auto_delete:
         title: "Slet emne automatisk"
       auto_bump:
-        title: "Auto-'bump' emne"
+        title: "Auto-'Bump' emne"
       reminder:
         title: "Påmind mig"
+      auto_delete_replies:
+        title: "Slet svar automatisk"
       status_update_notice:
         auto_open: "Emnet åbner automatisk %{timeLeft}."
         auto_close: "Emnet lukker automatisk %{timeLeft}."
         auto_publish_to_category: "Emnet vil blive udgivet i <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Emnet vil lukke %{duration} efter det sidste svar."
+        auto_close_after_last_post: "Dette emne lukkes %{duration} efter det sidste svar."
         auto_delete: "Dette emne slettes automatisk %{timeLeft}."
         auto_bump: "Dette emne bliver automatisk 'bumped' %{timeLeft}."
         auto_reminder: "Du vil blive mindet om dette emne %{timeLeft}."
+        auto_delete_replies: "Svar på dette emne slettes automatisk efter %{duration}."
       auto_close_title: "Indstillinger for automatisk lukning"
       auto_close_immediate:
         one: "Seneste indlæg i emnet er allerede %{count} time gammelt så emnet bliver lukket med det samme."
         other: "Seneste indlæg i emnet er allerede %{hours} timer gammelt så emnet bliver lukket med det samme."
+      auto_close_momentarily:
+        one: "Seneste indlæg i emnet er allerede %{count} time gammelt så emnet bliver lukket med det samme."
+        other: "Seneste indlæg i emnet er allerede %{count} timer gammelt så emnet bliver lukket med det samme."
       timeline:
         back: "Tilbage"
         back_description: "Tilbage til dit seneste ulæste indlæg"
@@ -1879,8 +2354,10 @@ da:
         go_bottom: "bund"
         go: "start"
         jump_bottom: "Hop til sidste indlæg"
-        jump_prompt: "spring til..."
-        jump_prompt_of: "af %{count} indlæg"
+        jump_prompt: "hop til..."
+        jump_prompt_of:
+          one: "af %{count} indlæg"
+          other: "af %{count} indlæg"
         jump_prompt_long: "Hop til..."
         jump_bottom_with_number: "hop til indlæg %{post_number}"
         jump_prompt_to_date: "til dato"
@@ -1891,7 +2368,7 @@ da:
         title: skift hvor ofte du vil blive notificeret om dette emne
         reasons:
           mailing_list_mode: "Du har maillist mode slået til, så du bliver notificeret omkring svar på dette emne via e-mail"
-          "3_10": "Du får notifikationer fordi du overvåger et tag på dette emne"
+          "3_10": "Du får notifikationer fordi du overvåger et mærke på dette emne"
           "3_6": "Du får notifikationer fordi du overvåger denne kategori."
           "3_5": "Du får notifikationer fordi du overvåger dette emne automatisk."
           "3_2": "Du får notifikationer fordi du overvåger dette emne."
@@ -1900,30 +2377,30 @@ 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": 'You will see a count of new replies because you <a href="%{basePath}/u/%{username}/preferences/notifications">read this topic</a>.'
+          "2": 'Du vil se en optælling af nye svar, fordi du <a href="%{basePath}/u/%{username}/preferences/notifications">læser 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."
           "0_2": "Du får ingen notifikationer for dette emne."
           "0": "Du får ingen notifikationer for dette emne."
         watching_pm:
-          title: "Følger"
+          title: "Overvåger"
           description: "Du vil modtage en notifikation for hvert nyt svar i denne besked, og en optælling af nye svar vil blive vist."
         watching:
           title: "Overvåger"
           description: "Du vil modtage en notifikation for hvert nyt svar i denne tråd, og en optælling af nye svar vil blive vist."
         tracking_pm:
           title: "Følger"
-          description: "En optælling af nye svar vil blive vist for denne besked. Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig."
+          description: "En optælling af nye svar vil blive vist for denne besked. Du vil modtage en notifikation, hvis nogen nævner dit @navn eller svarer dig."
         tracking:
           title: "Følger"
-          description: "En optælling af nye svar vil blive vist for denne tråd. Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig."
+          description: "En optælling af nye svar vil blive vist for dette emne. Du vil modtage en notifikation, hvis nogen nævner dit @navn eller svarer dig."
         regular:
           title: "Normal"
-          description: "Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig."
+          description: "Du vil modtage en notifikation, hvis nogen nævner dit @navn eller svarer dig."
         regular_pm:
           title: "Normal"
-          description: "Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig."
+          description: "Du vil modtage en notifikation, hvis nogen nævner dit @navn eller svarer dig."
         muted_pm:
           title: "Lydløs"
           description: "Du vil aldrig få notifikationer om denne besked."
@@ -1937,6 +2414,7 @@ da:
         open: "Åbn emne"
         close: "Luk emne"
         multi_select: "Vælg indlæg..."
+        slow_mode: "Indstil langsom tilstand"
         timed_update: "Indstil timerfunktion for emne..."
         pin: "Fastgør Emne..."
         unpin: "Fjern fastgøring af Emne..."
@@ -1952,7 +2430,7 @@ da:
         pin: "Fastgør Emne"
         unpin: "Fjern Fastgøring af Emne"
         pin_globally: "Fastgør emne globalt"
-        make_banner: "Gør emnet til en banner"
+        make_banner: "Gør emnet til et banner"
         remove_banner: "Emnet skal ikke være banner længere"
       reply:
         title: "Svar"
@@ -1964,20 +2442,21 @@ da:
         title: "Del"
         extended_title: "Del et link"
         help: "del et link til dette emne"
+        invite_users: "Invitér"
       print:
         title: "Print"
-        help: "Åben en printervenlig udgave at emnet"
+        help: "Åbn en printervenlig udgave at emnet"
       flag_topic:
         title: "Rapportér indlæg"
         help: "gør moderator opmærksom på dette indlæg"
         success_message: "Du har nu rapporteret dette emne til administrator."
       make_public:
         title: "Konverter til offentligt emne"
-        choose_category: "Vælg en kategori til det offentlige emne:"
+        choose_category: "Vælg venligst en kategori til det offentlige emne:"
       feature_topic:
         title: "Fremhæv dette emne"
         pin: "Fastgør dette emne til toppen af kategorien %{categoryLink} indtil"
-        unpin: "Fjern dette emne fra starten af listen i %{categoryLink} kategorien."
+        unpin: "Fjern dette emne fra toppen 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"
@@ -1986,6 +2465,9 @@ da:
           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:
+          one: "Du har allerede %{count} globalt fastgjort emne. 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?"
+          other: "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."
@@ -2006,8 +2488,9 @@ da:
         email_or_username_placeholder: "e-mail-adresse eller brugernavn"
         action: "Invitér"
         success: "Vi har inviteret denne bruger til at være med i denne besked."
-        success_group: "We har inviteret denne gruppe til at deltage i denne besked"
-        error: "Beklager, der skete en fejl, da vi forsøgte at invitere brugeren."
+        success_group: "Vi har inviteret denne gruppe til at deltage i denne besked"
+        error: "Beklager, der opstod en fejl, da vi forsøgte at invitere brugeren."
+        not_allowed: "Beklager, denne bruger kan ikke inviteres."
         group_name: "gruppe navn"
       controls: "Vælg handling"
       invite_reply:
@@ -2015,17 +2498,17 @@ da:
         username_placeholder: "brugernavn"
         action: "Send invitation"
         help: "inviter andre til dette emne via email eller notifikationer"
-        to_forum: "Vi sender din ven en kort e-mail, som gør det muligt at tilmelde sig øjeblikkeligt ved at klikke på et link, uden det er nødvendigt at logge ind."
-        sso_enabled: "Indtast brugernavnet på den person, du gerne vil invitere til dette emne."
+        to_forum: "Vi sender en kort e-mail, der giver din ven mulighed for straks at deltage ved at klikke på et link."
+        discourse_connect_enabled: "Indtast brugernavnet på den person, du gerne vil invitere til dette emne."
         to_topic_blank: "Indtast brugernavnet eller en email adresse på den person, du gerne vil invitere til dette emne."
         to_topic_email: "Du har indtastet en email adresse. Vi vil sende en e-mail invitation, der giver din ven direkte adgang til at svare på dette emne."
         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."
+        email_placeholder: "navn@eksempel.dk"
+        success_email: "Vi sendte en invitation til <b>%{invitee}</b>. Vi underretter dig, når invitationenen er blevet indløst. Tjek fanen invitationer på din brugerside for at holde styr 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 inviteret denne bruger til at deltage i dette emne."
       login_reply: "Log ind for at svare"
       filters:
         n_posts:
@@ -2068,14 +2551,26 @@ da:
         radio_label: "Eksisterende Besked"
         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."
+          one: "Vælg meddelelsen, du gerne vil flytte dette indlæg til."
+          other: "Vælg meddelelsen, du gerne vil flytte disse <b>%{count}-</b> indlæg til."
       merge_posts:
         title: "Flet valgte indlæg"
         action: "flet valgte indlæg"
         error: "Der opstod en fejl med at flette de valgte indlæg."
       publish_page:
+        title: "Udgivelse af side"
+        publish: "Udgiv"
+        description: "Når et emne udgives som en side, kan dets URL-adresse blive delt, og det vil blive vist med brugerdefineret styling."
+        slug: "Alias (Slug)"
         public: "Offentlig"
+        public_description: "Folk kan se siden, selvom det tilknyttede emne er privat."
+        publish_url: "Din side er blevet udgivet:"
+        topic_published: "Dit emne er blevet udgivet:"
+        preview_url: "Din side vil blive udgivet:"
+        invalid_slug: "Beklager, du kan ikke udgive denne side."
+        unpublish: "Fjern udgivelsen"
+        unpublished: "Din side-udgivelse er blevet fjernet og er ikke længere tilgængelig."
+        publishing_settings: "Indstillinger for udgivelse"
       change_owner:
         title: "Skift ejer"
         action: "skift ejerskab"
@@ -2084,6 +2579,9 @@ da:
         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>"
+        instructions_without_old_user:
+          one: "Vælg venligst en ny ejer til indlægget"
+          other: "Vælg venligst en ny ejer til %{count} indlæg"
       change_timestamp:
         title: "Tilpas tidsstempel..."
         action: "ret tidsstempel"
@@ -2095,16 +2593,16 @@ da:
         selected: "valgt (%{count})"
         select_post:
           label: "vælg"
-          title: "Tilføj indlæg til udvalg"
+          title: "Tilføj indlæg til valg"
         selected_post:
           label: "valgte"
-          title: "Klik for at fjerne indlæg fra udvalg"
+          title: "Klik for at fjerne indlæg fra valg"
         select_replies:
           label: "vælg +svar"
-          title: "Tilføj indlæg og alle dets svar til udvalg"
+          title: "Tilføj indlæg og alle dets svar til valg"
         select_below:
           label: "vælg + nedenfor"
-          title: "Tilføj indlæg og alt efter det til udvalg"
+          title: "Tilføj indlæg og alt efter det til valg"
         delete: slet valgte
         cancel: glem valg
         select_all: marker alle
@@ -2117,11 +2615,12 @@ da:
         other: "(emne, der trækkes tilbage af forfatteren, slettes automatisk efter %{count} timer, medmindre det markeres)"
     post:
       quote_reply: "Citér"
-      edit_reason: "Reason: "
+      quote_share: "Del"
+      edit_reason: "Grund: "
       post_number: "indlæg %{number}"
       ignored: "Ignoreret indhold"
-      wiki_last_edited_on: "wiki sidst redigeret den"
-      last_edited_on: "indlæg sidst redigeret den"
+      wiki_last_edited_on: "wiki sidst redigeret den %{dateTime}"
+      last_edited_on: "indlæg sidst redigeret den %{dateTime}"
       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}:"
@@ -2129,9 +2628,9 @@ da:
       show_full: "Vis hele emnet"
       show_hidden: "Vis ignoreret indhold."
       deleted_by_author:
-        one: "(indlæg trukket tilbage af forfatteren, slettes automatisk om %{count} time med mindre det bliver flaget)"
-        other: "(indlæg trukket tilbage af forfatteren, slettes automatisk om %{count} timer med mindre det bliver flaget)"
-      collapse: "fald sammen"
+        one: "(indlæg trukket tilbage af forfatteren, slettes automatisk om %{count} time med mindre det bliver rapporteret)"
+        other: "(indlæg trukket tilbage af forfatteren, slettes automatisk om %{count} timer med mindre det bliver rapporteret)"
+      collapse: "fold sammen"
       expand_collapse: "fold ud/ind"
       locked: "Et hjælperteam medlem har låst dette indlæg fra at blive redigeret"
       gap:
@@ -2142,33 +2641,43 @@ da:
         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_replies_count: "%{count}"
+      unknown_user: "(ukendt/slettet bruger)"
       has_likes_title:
-        one: "%{count} likede dette indlæg"
-        other: "%{count} likede dette indlæg"
-      has_likes_title_only_you: "du likede dette indlæg"
+        one: "%{count} synes godt om dette indlæg"
+        other: "%{count} synes godt om dette indlæg"
+      has_likes_title_only_you: "du synes godt om 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"
+        one: "du og %{count} anden synes godt om dette indlæg"
+        other: "du og %{count} andre synes godt om dette indlæg"
+      filtered_replies_hint:
+        one: "Se dette indlæg og dets svar"
+        other: "Se dette indlæg og dets %{count} svar"
+      filtered_replies_viewing:
+        one: "Viser %{count} svar til"
+        other: "Viser %{count} svar til"
+      in_reply_to: "Indlæs overordnet indlæg"
+      view_all_posts: "Vis alle 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?"
-        too_many_uploads: "Beklager, men du kan kun uploade én fil 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."
-      abandon_edit:
-        no_value: "Nej, behold"
-        no_save_draft: "Nej, gem kladde"
-      abandon:
-        confirm: "Er du sikker på, at du vil droppe dit indlæg?"
-        no_value: "Nej"
-        no_save_draft: "Nej, gem kladde"
-        yes_value: "Ja"
+        upload: "Beklager, der opstod en fejl under overførsel 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 overføre din store fil til en sky-delingstjeneste, og derefter indsætte linket?"
+        too_many_uploads: "Beklager, men du kan kun overføre én fil ad gangen."
+        too_many_dragged_and_dropped_files:
+          one: "Beklager, men du kan kun overføre %{count} fil ad gangen."
+          other: "Beklager, du kan kun overføre %{count} filer ad gangen."
+        upload_not_authorized: "Beklager, filen som du forsøger at overføre, er ikke godkendt (godkendte filendelser: %{authorized_extensions})."
+        image_upload_not_allowed_for_new_user: "Beklager, nye brugere kan ikke overføre billeder."
+        attachment_upload_not_allowed_for_new_user: "Beklager, nye brugere kan ikke overføre vedhæftede filer."
+        attachment_download_requires_login: "Beklager, du skal være logget på for at hente vedhæftede filer."
+      cancel_composer:
+        confirm: "Hvad vil du gerne gøre med dit indlæg?"
+        discard: "Kassér"
+        save_draft: "Gem kladde til senere"
+        keep_editing: "Fortsæt redigering"
       via_email: "dette indlæg blev oprettet via email"
       via_auto_generated_email: "dette indlæg blev oprettet af en auto genereret e-mail"
       whisper: "dette indlæg er en privat hvisken for moderatorer"
@@ -2176,13 +2685,13 @@ da:
         about: "indlægget er en wiki"
       archetypes:
         save: "Gem indstillinger"
-      few_likes_left: "Tak fordi du liker! Du har kun få likes tilbage i dag."
+      few_likes_left: "Tak fordi du spreder kærligheden! Du har kun få 'Synes godt om' tilbage i dag."
       controls:
-        reply: "begynd at skrive et svar på dette indlæg"
-        like: "like dette indlæg"
-        has_liked: "Du liker dette indlæg"
+        reply: "begynd at skrive et svar til dette indlæg"
+        like: "'Synes godt om' dette indlæg"
+        has_liked: "Du synes godt om dette indlæg"
         read_indicator: "medlemmer der har læst dette indlæg"
-        undo_like: "fortryd like"
+        undo_like: "fortryd 'Synes godt om'"
         edit: "redigér dette indlæg"
         edit_action: "Rediger"
         edit_anonymous: "Beklager, du skal være logget ind for at redigere dette indlæg."
@@ -2206,6 +2715,7 @@ da:
         convert_to_moderator: "Tilføj Personale farve"
         revert_to_regular: "Fjern Personale farve"
         rebake: "Gendan HTML"
+        publish_page: "Sideudgivelse"
         unhide: "Vis"
         change_owner: "Skift ejerskab"
         grant_badge: "Tildel Badge"
@@ -2215,14 +2725,32 @@ da:
         unlock_post_description: "tillad senderen at redigere dette indlæg"
         delete_topic_disallowed_modal: "Du har ikke tilladelse til at slette dette emne. Hvis du virkelig ønsker, at det skal være slettet, skal du indsende en markering for moderator opmærksomhed, samt inkludere en begrundelse. "
         delete_topic_disallowed: "du har ikke tilladelse til at slette dette emne"
+        delete_topic_confirm_modal:
+          one: "Dette emne har i øjeblikket over %{count} visning og kan være en populær søgedestination. Er du sikker på, at du helt vil slette dette emne i stedet for at redigere det for at forbedre det?"
+          other: "Dette emne har i øjeblikket over %{count} visninger og kan være et populært søgemål. Er du sikker på, at du helt vil slette dette emne i stedet for at redigere det for at forbedre det?"
+        delete_topic_confirm_modal_yes: "Ja, slet dette emne"
+        delete_topic_confirm_modal_no: "Nej, behold dette emne"
+        delete_topic_error: "Der opstod en fejl under sletning af dette emne"
         delete_topic: "slet emne"
         add_post_notice: "Tilføj Hjælperteam Notits"
+        change_post_notice: "Ændre Personale Meddelelse"
+        delete_post_notice: "Slet Personale Meddelelse"
         remove_timer: "fjern timer"
+        edit_timer: "rediger timer"
       actions:
         people:
+          like:
+            one: "synes godt om dette"
+            other: "synes godt om dette"
+          read:
+            one: "læste dette"
+            other: "læste disse"
           like_capped:
-            one: "og %{count} anden kunne lide dette"
-            other: "og %{count} andre kunne lide dette"
+            one: "og %{count} anden synes godt om dette"
+            other: "og %{count} andre synes godt om dette"
+          read_capped:
+            one: "og %{count} anden læste dette"
+            other: "og %{count} andre læste dette"
         by_you:
           off_topic: "Du flagede dette som off-topic"
           spam: "Du flagede dette som spam"
@@ -2245,6 +2773,7 @@ da:
           last: "Sidste udgave"
           hide: "Skjul udgave"
           show: "Vis udgave"
+          revert: "Vend tilbage til revision %{revision}"
           edit_wiki: "Ret Wiki"
           edit_post: "Ret Indlæg"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
@@ -2270,8 +2799,32 @@ da:
             title: "Vis html-delen af e-mailen"
             button: "HTML"
       bookmarks:
+        create: "Opret bogmærke"
+        edit: "Rediger bogmærke"
         created: "Oprettet"
+        updated: "Opdateret"
         name: "Navn"
+        name_placeholder: "Hvad er dette bogmærke til?"
+        set_reminder: "Påmind mig"
+        actions:
+          delete_bookmark:
+            name: "Slet bogmærke"
+            description: "Fjerner bogmærket fra din profil og stopper alle påmindelser om bogmærket"
+          edit_bookmark:
+            name: "Rediger bogmærke"
+            description: "Rediger bogmærkenavnet eller ændre påmindelsesdato og -tidspunkt"
+          pin_bookmark:
+            name: "Fastgør bogmærke"
+            description: "Fastgør bogmærket. Dette vil få det til at stå øverst på din bogmærkeliste."
+          unpin_bookmark:
+            name: "Frigør bogmærke"
+            description: "Frigør bogmærket. Det vises ikke længere øverst på din bogmærkeliste."
+      filtered_replies:
+        viewing_posts_by: "Viser %{post_count} indlæg af"
+        viewing_subset: "Nogle svar er foldet sammen"
+        viewing_summary: "Viser en oversigt over dette emne"
+        post_number: "%{username}, indlæg #%{post_number}"
+        show_all: "Vis alle"
     category:
       can: "kan&hellip; "
       none: "(ingen kategori)"
@@ -2280,15 +2833,22 @@ da:
       edit: "Rediger"
       edit_dialog_title: "Rediger: %{categoryName}"
       view: "Vis emner i kategori"
+      back: "Tilbage til kategori"
       general: "Overordnet"
       settings: "Indstillinger"
       topic_template: "Skabelon for emne"
-      tags: "Tags"
-      tags_allowed_tags: "Begræns disse tags til denne kategori:"
-      tags_allowed_tag_groups: "Begræns disse tag grupper til denne kategori:"
+      tags: "Mærker"
+      tags_allowed_tags: "Begræns disse mærker til denne kategori:"
+      tags_allowed_tag_groups: "Begræns disse mærkegrupper til denne kategori:"
       tags_placeholder: "(Valgfri) liste af tiladte mærker"
-      tag_groups_placeholder: "(Valgfri) liste af tiladte mærke grupper"
-      allow_global_tags_label: "Tillad også andre tags"
+      tags_tab_description: "Mærker og mærkegrupper, der er angivet ovenfor, vil kun være tilgængelige i denne kategori og andre kategorier, der også angiver dem. De vil ikke være tilgængelige for brug i andre kategorier."
+      tag_groups_placeholder: "(Valgfri) liste af tiladte mærkegrupper"
+      manage_tag_groups_link: "Administrer mærkegrupper"
+      allow_global_tags_label: "Tillad også andre mærker"
+      tag_group_selector_placeholder: "(Valgfrit) Mærkegruppe"
+      required_tag_group_description: "Kræv nye emner skal at have mærke fra en mærkegruppe:"
+      min_tags_from_required_group_label: "Antal Mærker:"
+      required_tag_group_label: "Mærkegruppe:"
       topic_featured_link_allowed: "Tillad fremhævede links i denne kategori"
       delete: "Slet kategori"
       create: "Ny kategori"
@@ -2303,21 +2863,33 @@ da:
       topic: "kategoriemne"
       logo: "Kategori logo billede"
       background_image: "Kategori logo baggrundsbillede"
-      badge_colors: "Mærkefarver"
+      badge_colors: "Emblem farver"
       background_color: "Baggrundsfarve"
       foreground_color: "Tekstfarve"
-      name_placeholder: "Bør være kort og kontant."
-      color_placeholder: "En web-farve"
-      delete_confirm: "Er du sikker på, at du vil slette den kategori?"
-      delete_error: "Der opstod en fejl ved sletning af kategorien."
+      name_placeholder: "Et eller to ord maksimalt"
+      color_placeholder: "Enhver webfarve"
+      delete_confirm: "Er du sikker på, at du vil slette denne kategori?"
+      delete_error: "Der opstod en fejl under sletningen af kategorien."
       list: "Kategoriliste"
       no_description: "Der er ingen beskrivelse for denne kategori."
       change_in_category_topic: "besøg kategoriemnet for at redigere beskrivelsen"
-      already_used: "This color has been used by another category"
+      already_used: "Denne farve er blevet brugt af en anden kategori"
       security: "Sikkerhed"
+      security_add_group: "Tilføj en gruppe"
+      permissions:
+        group: "Gruppe"
+        see: "Se"
+        reply: "Svar"
+        create: "Opret"
+        no_groups_selected: "Ingen grupper har fået adgang; denne kategori vil kun være synlig for personalet."
+        everyone_has_access: 'Denne kategori er offentlig, alle kan se, besvare og oprette indlæg. Hvis du vil begrænse tilladelserne, skal du fjerne en eller flere af de tilladelser, der er tildelt gruppen "alle".'
+        toggle_reply: "Slå Svar tilladelse til/ fra"
+        toggle_full: "Slå Opret tilladelse til/fra"
+        inherited: 'Denne tilladelse er arvet fra "alle"'
       special_warning: "Advarsel: Denne kategori er forud-seedet og sikkerhedsindstillingerne kan ikke redigeres. Hvis du ikke ønsker at bruge denne kategori, bør du slette den snarere end at genbruge den til et andet formål."
       uncategorized_security_warning: "Denne kategori er speciel. Det er beregnet som et opholdsområde for emner, der ikke har nogen kategori; denkan ikke have sikkerheds indstillinger."
       uncategorized_general_warning: 'Denne kategori er speciel. Den bruges som standard kategori for nye emner, der ikke har valgt en kategori. Hvis du vil forhindre denne opførsel og tvinge valg af kategori, <a href="%{settingLink}">skal du deaktivere indstillingen her</a> . Hvis du vil ændre navn eller beskrivelse, skal du gå til <a href="%{customizeLink}">Tilpas / tekst indhold</a> .'
+      pending_permission_change_alert: "Du har ikke tilføjet %{group} til denne kategori. Klik på denne knap for at tilføje dem."
       images: "Billeder"
       email_in: "Brugerindstillet ingående email adresse:"
       email_in_allow_strangers: "Accepter emails fra ikke oprettede brugere"
@@ -2325,15 +2897,19 @@ da:
       email_in_disabled_click: 'aktiver "email ind" indstilligen.'
       mailinglist_mirror: "Kategori spejler en mailing liste"
       show_subcategory_list: "Vis oversigt med subkategorier ovenover emner i denne kategori."
+      read_only_banner: "Bannertekst, når en bruger ikke kan oprette et emne i denne kategori:"
       num_featured_topics: "Antal emner som skal vises på siden med kategorier:"
       subcategory_num_featured_topics: "Antal af fremhævede emner på siden for den overordnede kategori:"
       all_topics_wiki: "Opret nye emne wikier som standard "
+      allow_unlimited_owner_edits_on_first_post: "Tillad ubegrænsede ejeredigeringer på første indlæg"
       subcategory_list_style: "Oversigtsform for subkategori"
       sort_order: "Emneoversigt - sortér efter:"
       default_view: "Standard emneoversigt:"
       default_top_period: "Standardperiode for top:"
-      allow_badges_label: "Tillad af badges bliver tildelt i denne kategori"
+      default_list_filter: "Standard Listefilter:"
+      allow_badges_label: "Tillad at emblemer bliver tildelt i denne kategori"
       edit_permissions: "Redigér tilladelser"
+      reviewable_by_group: "Ud over personalet kan indholdet i denne kategori også gennemgås af:"
       review_group_name: "gruppe navn"
       require_topic_approval: "Kræv moderator godkendelse af alle nye emner"
       require_reply_approval: "Kræv moderator godkendelse af alle nye svar"
@@ -2342,7 +2918,7 @@ da:
       default_position: "Standarposition"
       position_disabled: "Kategorier vil blive vist i rækkefølge efter aktivitet. For at styre rækkefølgen af kategorier i lister, "
       position_disabled_click: 'skal funktionen "fikserede kategori positioner" slås til.'
-      minimum_required_tags: "Minimum antal tags krævet i et emne:"
+      minimum_required_tags: "Minimum antal mærker krævet i et emne:"
       parent: "Overordnet kategori"
       num_auto_bump_daily: "Antal åbne emner, der automatisk 'bump'es dagligt:"
       navigate_to_first_post_after_read: "Navigér til det første indlæg, når emnerne er læst"
@@ -2355,13 +2931,13 @@ da:
           description: "Du vil blive underrettet om nye emner i denne kategori, men ikke svar på emnerne."
         tracking:
           title: "Følger"
-          description: "Du tracker automatisk alle emner i disse kategorier. Du får besked hvis nogen nævner dit @navn eller svarer dig, og antallet af nye svar bliver vist."
+          description: "Du følger automatisk alle emner i disse kategorier. Du får besked hvis nogen nævner dit @navn eller svarer dig, og antallet af nye svar bliver vist."
         regular:
           title: "Normal"
           description: "Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig."
         muted:
-          title: "Ignoreret"
-          description: "Du vil aldrig få besked om noget om nye emner i kategorierne og de vises heller ikke i seneste."
+          title: "Stille!"
+          description: "Du vil ikke få besked om nye emner i denne kategori, og de vil ikke fremgå af 'seneste'."
       search_priority:
         label: "Søgeprioritet"
         options:
@@ -2373,7 +2949,7 @@ da:
           very_high: "Meget høj"
       sort_options:
         default: "standard"
-        likes: "Likes"
+        likes: "Synes godt om"
         op_likes: "\"Synes om\" for oprindeligt indlæg"
         views: "Visninger"
         posts: "Indlæg"
@@ -2396,19 +2972,32 @@ da:
       list_filters:
         all: "alle emner"
         none: "ingen underkategorier"
+      colors_disabled: "Du kan ikke vælge farver, fordi du har en kategoristil af ingen."
     flagging:
       title: "Tak fordi du hjælper med at holde vores forum civiliseret!"
-      action: "Flag indlæg"
-      notify_action: "Besked"
+      action: "Rapporter Indlæg"
+      take_action: "Tag Handling..."
+      take_action_options:
+        default:
+          title: "Tag Handling"
+          details: "Nå rapporteringsgrænsen med det samme i stedet for at vente på flere fællesskabs-rapporteringer"
+        suspend:
+          title: "Suspendér bruger"
+          details: "Nå rapporteringsgrænsen, og suspendér brugeren"
+        silence:
+          title: "Ignorer Bruger"
+          details: "Nå rapporteringsgrænsen, og ignorer brugeren"
+      notify_action: "Meddelelse"
       official_warning: "Officiel Advarsel"
-      delete_spammer: "Slet spammer"
-      delete_confirm_MF: "Du er ved at slette <b>{posts}</b> indlæg og {TOPICS, plural, one {<b>1</b> emne} other {<b>#</b> emner}} oprettet af denne bruger, fjerne deres konto, blokere tilmeldinger fra deres IP-adresse <b>{ip_address}</b> og tilføje deres e-mail-adresse <b>{email}</b> til en permanent blokeringsliste. Er du sikker på, at denne bruger virkelig er en spammer?"
+      delete_spammer: "Slet Spammer"
+      flag_for_review: "Kø Til Gennemgang"
+      delete_confirm_MF: "Du er ved at slette {POSTS, plural, one {<b>#</b> indlæg} other {<b>#</b> indlæg}} og {TOPICS, plural, one {<b>#</b> emne} other {<b>#</b> emner}}, fjerne deres konto, blokere tilmeldinger fra deres IP-adresse <b>{ip_address}</b>og føje deres e-mail-adresse <b>{email}</b> til en permanent blokeringsliste. Er du sikker på, at denne bruger virkelig er en spammer?"
       yes_delete_spammer: "Ja, slet spammer"
-      ip_address_missing: "(Ikke tilgængelig)"
+      ip_address_missing: "(I/T)"
       hidden_email_address: "(skjult)"
       submit_tooltip: "Send privat markeringen"
       take_action_tooltip: "Nå til markerings niveauer med det samme, i stedet for at vente på flere markeringer fra fælleskabet"
-      cant: "Beklager, du kan i øjeblikket ikke flage dette indlæg."
+      cant: "Beklager, du kan i øjeblikket ikke rapportere dette indlæg."
       notify_staff: "Informer staff privat"
       formatted_name:
         off_topic: "Det holder sig ikke til emnet"
@@ -2470,11 +3059,11 @@ da:
         help: "Dette emne er en privat besked"
     posts: "Indlæg"
     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}
-      med {med et meget højt like pr. indlæg forhold}
-      high {med et ekstremt højt like pr. indlæg forhold}
-      other {}}
+      Dette emne har {count, plural, one {# svar} other {# svar}} {ratio, select,
+        low {med et højt forhold i mellem antal 'Synes godt om' og antal indlæg}
+        med {med et meget højt forhold i mellem antal 'Synes godt om' og antal indlæg}
+        high {med et ekstremt højt forhold i mellem antal 'Synes godt om' og antal indlæg}
+        other {}}
     original_post: "Oprindeligt indlæg"
     views: "Visninger"
     views_lowercase:
@@ -2494,7 +3083,6 @@ da:
       one: "bruger"
       other: "brugere"
     category_title: "Kategori"
-    history: "Historik"
     changed_by: "af %{author}"
     raw_email:
       title: "Indgående e-mail"
@@ -2511,17 +3099,17 @@ da:
         help: "de seneste emner"
       read:
         title: "Læste"
-        help: "emner du har læst"
+        help: "emner, du har læst, i den rækkefølge, du sidst læste dem"
       categories:
         title: "Kategorier"
         title_in: "Kategori - %{categoryName}"
         help: "alle emner grupperet efter kategori"
       unread:
-        title: "Ulæst"
+        title: "Ulæste"
         title_with_count:
           one: "Ulæst (%{count})"
           other: "Ulæste (%{count})"
-        help: "emner du følger med i lige nu med ulæste indlæg"
+        help: "emner du overvåger eller følger med i lige nu med ulæste indlæg"
         lower_title_with_count:
           one: "%{count} ulæst"
           other: "%{count} ulæste"
@@ -2529,12 +3117,12 @@ da:
         lower_title_with_count:
           one: "%{count} ny"
           other: "%{count} nye"
-        lower_title: "Ny"
+        lower_title: "nye"
         title: "Nye"
         title_with_count:
           one: "Nye (%{count})"
           other: "Nye (%{count})"
-        help: "Emner oprettet i de seneste par dage"
+        help: "emner oprettet i de seneste par dage"
       posted:
         title: "Mine indlæg"
         help: "emner du har skrevet indlæg i"
@@ -2546,10 +3134,10 @@ da:
         title_with_count:
           one: "%{categoryName} (%{count})"
           other: "%{categoryName} (%{count})"
-        help: "populære emner i kategorien %{categoryName}"
+        help: "seneste emner i kategorien %{categoryName}"
       top:
         title: "Top"
-        help: "de mest aktive emner i det sidse år, måned, uge og dag"
+        help: "de mest aktive emner i det sidse år, måned, uge eller dag"
         all:
           title: "Alt"
         yearly:
@@ -2568,23 +3156,26 @@ da:
         this_month: "Måned"
         this_week: "Uge"
         today: "I dag"
+        other_periods: "se top:"
+    browser_update: 'Desværre, <a href="https://www.discourse.org/faq/#browser">din browser er for gammel til at virke korrekt på dette websted</a>. <a href="https://browsehappy.com">Opgradere venligst din browser</a> for at se vore gode indhold, log ind og svar.'
     permission_types:
       full: "Opret / Besvar / Se"
       create_post: "Besvar / Se"
       readonly: "Se"
     lightbox:
-      download: "download"
+      download: "hent"
       previous: "Forrige (Venstre piletast)"
       next: "Næste (højre piletast)"
       counter: "%curr% af %total%"
       close: "Luk (Esc)"
       content_load_error: '<a href="%url%">Indholdet</a> kunne ikke indlæses.'
       image_load_error: '<a href="%url%">Billedet</a> kunne ikke indlæses.'
+    cannot_render_video: Denne video kan ikke afspilles, fordi din browser ikke understøtter codec.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
       shortcut_delimiter_or: "%{shortcut1} eller %{shortcut2}"
-      shortcut_delimiter_slash: "%{shortcut1} / %{shortcut2}"
+      shortcut_delimiter_slash: "%{shortcut1}/%{shortcut2}"
       shortcut_delimiter_space: "%{shortcut1} %{shortcut2}"
       title: "Tastaturgenveje"
       jump_to:
@@ -2599,6 +3190,8 @@ da:
         profile: "%{shortcut} Profil"
         messages: "%{shortcut} Beskeder"
         drafts: "%{shortcut} Kladder"
+        next: "%{shortcut} Næste Emne"
+        previous: "%{shortcut} Forrige Emne"
       navigation:
         title: "Navigation"
         jump: "%{shortcut} Gå til indlæg #"
@@ -2623,6 +3216,19 @@ da:
         title: "Componerer"
         return: "%{shortcut} Tilbage til forfatter"
         fullscreen: "%{shortcut} Fullscreen composer"
+      bookmarks:
+        title: "Bogmærker"
+        enter: "%{shortcut} Gem og luk"
+        later_today: "%{shortcut} Senere i dag"
+        later_this_week: "%{shortcut} Senere i denne uge"
+        tomorrow: "%{shortcut} I morgen"
+        next_week: "%{shortcut} Næste uge"
+        next_month: "%{shortcut} Næste måned"
+        next_business_week: "%{shortcut} Begyndelsen af næste uge"
+        next_business_day: "%{shortcut} Næste arbejdsdag"
+        custom: "%{shortcut} Brugerdefineret dato og klokkeslæt"
+        none: "%{shortcut} Ingen påmindelse"
+        delete: "%{shortcut} Slet bogmærke"
       actions:
         title: "Handlinger"
         bookmark_topic: "%{shortcut} Slå bogmærk emne til/fra"
@@ -2638,33 +3244,38 @@ da:
         bookmark: "%{shortcut} Bogmærk indlæg"
         edit: "%{shortcut} Redigér indlæg"
         delete: "%{shortcut} Slet indlæg"
-        mark_muted: "Ignorer emnet"
+        mark_muted: "%{shortcut} Gøre emne Stille!"
         mark_regular: "%{shortcut} Almindeligt (standard) emne"
         mark_tracking: "%{shortcut} Følg emne"
         mark_watching: "%{shortcut} Hold øje med emne"
         print: "%{shortcut} Print emne"
         defer: "%{shortcut} Udsæt emne"
+        topic_admin_actions: "%{shortcut} Åbn emneadministratorhandlinger"
+      search_menu:
+        title: "Søg Menuen"
+        prev_next: "%{shortcut} Flyt markeringen op og ned"
+        insert_url: "%{shortcut} Indsæt markering i åben editor"
     badges:
       earned_n_times:
-        one: "Blev tildelt dette badge %{count} gang"
-        other: "Blev tildelt dette badge %{count} gange"
+        one: "Blev tildelt dette emblem %{count} gang"
+        other: "Blev tildelt dette emblem %{count} gange"
       granted_on: "Tildelt %{date}"
-      others_count: "Andre med dette badge (%{count})"
-      title: Badges
-      allow_title: "Du kan bruge denne badge som en titel"
-      multiple_grant: "Du kan tjene dette flere gange"
+      others_count: "Andre med dette emblem (%{count})"
+      title: Emblemer
+      allow_title: "Du kan bruge dette emblem som en titel"
+      multiple_grant: "Du kan optjene dette flere gange"
       badge_count:
-        one: "%{count} Badge"
-        other: "%{count} Badges"
+        one: "%{count} Emblem"
+        other: "%{count} Emblemer"
       more_badges:
         one: "+%{count} Mere"
         other: "+%{count} Flere"
       granted:
         one: "%{count} tildelt"
         other: "%{count} tildelt"
-      select_badge_for_title: Vælg en badge, du vil bruge som din titel
+      select_badge_for_title: Vælg et emblem, du vil bruge som din titel
       none: "(ingen)"
-      successfully_granted: "Vellykket tildelt %{badge} til %{username}"
+      successfully_granted: "Vellykket tildeling af %{badge} til %{username}"
       badge_grouping:
         getting_started:
           name: Sådan kommer du i gang
@@ -2673,77 +3284,104 @@ da:
         trust_level:
           name: Tillidsniveau
         other:
-          name: Andet
+          name: Andre
         posting:
-          name: Sender
+          name: Skriver
     tagging:
-      all_tags: "Alle tags"
-      other_tags: "Andre tags"
-      selector_all_tags: "alle tags"
-      selector_no_tags: "ingen tags"
-      changed: "tags skiftet:"
-      tags: "Tags"
-      choose_for_topic: "valgfri tags"
+      all_tags: "Alle Mærker"
+      other_tags: "Andre Mærker"
+      selector_all_tags: "alle mærker"
+      selector_no_tags: "ingen mærker"
+      changed: "mærker skiftet:"
+      tags: "Mærker"
+      choose_for_topic: "valgfrie mærker"
+      info: "Info"
+      default_info: "Dette mærke er ikke begrænset til nogen kategorier og har ingen synonymer."
+      category_restricted: "Dette mærke er begrænset til kategorier, som du ikke har adgang til."
+      synonyms: "Synonymer"
+      synonyms_description: "Når følgende mærker bruges, vil de blive erstattet med <b>%{base_tag_name}</b>."
+      tag_groups_info:
+        one: 'Dette mærke tilhører gruppen "%{tag_groups}".'
+        other: "Dette mærke tilhører disse grupper: %{tag_groups}."
+      category_restrictions:
+        one: "Den kan kun bruges i denne kategori:"
+        other: "Det kan kun bruges i disse kategorier:"
+      edit_synonyms: "Administrer Synonymer"
+      add_synonyms_label: "Tilføj synonymer:"
       add_synonyms: "Tilføj"
-      delete_tag: "Slet tag"
+      add_synonyms_explanation:
+        one: "Ethvert sted, der aktuelt bruger dette mærke, ændres til at bruge <b>%{tag_name}</b> i stedet for. Er du sikker på, at du vil foretage denne ændring?"
+        other: "Ethvert sted, der aktuelt bruger disse mærker, ændres til at bruge <b>%{tag_name}</b> i stedet for. Er du sikker på, at du vil foretage denne ændring?"
+      add_synonyms_failed: "Følgende mærker kunne ikke tilføjes som synonymer: <b>%{tag_names}</b>. Sørg for, at de ikke har synonymer og ikke er synonymer for et andet mærke."
+      remove_synonym: "Fjern Synonym"
+      delete_synonym_confirm: 'Er du sikker på, at du vil slette synonymet "%{tag_name}"?'
+      delete_tag: "Slet Mærke"
       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?"
-      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:"
+        one: "Er du sikker på, at du vil slette dette mærke og fjerne det fra et emne %{count}, der er tildelt det?"
+        other: "Er du sikker på, at du vil slette dette mærke og fjerne det fra %{count} emner, der er tildelt det?"
+      delete_confirm_no_topics: "Er du sikker på, at du vil slette dette mærke?"
+      delete_confirm_synonyms:
+        one: "Dets synonym slettes også."
+        other: "Dets %{count} synonymer slettes også."
+      rename_tag: "Omdøb Mærke"
+      rename_instructions: "Vælg et nyt navn for det mærke:"
       sort_by: "Sortér efter:"
       sort_by_count: "antal"
       sort_by_name: "navn"
-      manage_groups: "Håndtér tag grupper"
-      manage_groups_description: "Definér grupper til at håndtere tags"
-      upload: "upload tags"
-      upload_description: "Upload en csv-fil for at oprette tags i bulk"
-      upload_instructions: "Én pr. linje, eventuelt med en tag gruppe i formatet 'tagnavn, tag_gruppe'"
-      upload_successful: "Vellykket upload af tags"
+      manage_groups: "Administrer Mærkegrupper"
+      manage_groups_description: "Definere grupper til at organisere mærker"
+      upload: "Overfør Mærker"
+      upload_description: "Overfør en csv-fil for at masseoprette mærker"
+      upload_instructions: "Én pr. linje, eventuelt med en mærkegruppe i formatet 'mærkenavn, mærkegruppe'"
+      upload_successful: "Vellykket overførsel af mærker"
       delete_unused_confirmation:
-        one: "%{count}tag vil blive slettet: %{tags}"
-        other: "%{count} tags bliver slettet: %{tags}"
+        one: "%{count} mærke vil blive slettet: %{tags}"
+        other: "%{count} mærker bliver slettet: %{tags}"
       delete_unused_confirmation_more_tags:
         one: "%{tags} og %{count} mere"
         other: "%{tags} og %{count} mere"
-      delete_unused: "Slet ubrugte tags"
-      delete_unused_description: "Slet alle tags, der ikke er knyttet til nogen emner eller personlige beskeder"
+      delete_no_unused_tags: "Der er ingen ubrugte mærker."
+      tag_list_joiner: ", "
+      delete_unused: "Slet Ubrugte Mærker"
+      delete_unused_description: "Slet alle mærker, der ikke er knyttet til nogen emner eller personlige beskeder"
       cancel_delete_unused: "Afbryd"
       filters:
         without_category: "%{filter} %{tag} emner"
         with_category: "%{filter} %{tag} emner i %{category}"
-        untagged_without_category: "%{filter} utagged emner"
-        untagged_with_category: "%{filter} utaggede emner i %{category}"
+        untagged_without_category: "%{filter} umærkede emner"
+        untagged_with_category: "%{filter} umærkede emner i %{category}"
       notifications:
         watching:
           title: "Overvåger"
-          description: "Du vil automatisk se alle emner med dette tag. Du vil blive underrettet om alle nye indlæg og emner, plus antallet af ulæste og nye indlæg vises også ved siden af emnet."
+          description: "Du vil automatisk se alle emner med dette mærke. Du vil blive underrettet om alle nye indlæg og emner, plus antallet af ulæste og nye indlæg vil blive vist ved siden af emnet."
         watching_first_post:
-          title: "Overvåger første indlæg"
-          description: "Du vil blive underrettet om nye emner i dette tag, men ikke svar på emnerne."
+          title: "Overvåger Første Indlæg"
+          description: "Du vil blive underrettet om nye emner med dette mærke, men ikke svar på emnerne."
         tracking:
           title: "Følger"
-          description: "Du sporer automatisk alle emner med dette tag. Et antal ulæste og nye indlæg vises ved siden af emnet."
+          description: "Du sporer automatisk alle emner med dette mærke. Et antal for ulæste og nye indlæg vises ved siden af emnet."
         regular:
           title: "Almindeligt"
           description: "Du vil blive notificeret if nogen nævner dit You will be notified if someone mentions your @name or replies to your post."
         muted:
           title: "Lydløs"
-          description: "Du vil ikke blive underrettet om noget om nye emner med dette tag, og de vises ikke på din ulæste fane."
+          description: "Du vil ikke blive underrettet om noget vedr. nye emner med dette mærke, og de vises ikke på din ulæste fane."
       groups:
-        title: "Tag grupper"
-        about: "Tilføj tags til grupper for nemmere håndtering."
-        new: "Ny gruppe"
-        tags_label: "Tags i denne gruppe:"
-        parent_tag_label: "Overordnede tag:"
-        parent_tag_description: "Tags fra denne gruppe kan ikke bruges medmindre det overordnede tag er tilstede."
-        one_per_topic_label: "Begræns ét tag per emne fra denne gruppe"
-        new_name: "Ny tag gruppe"
+        title: "Mærkegrupper"
+        about: "Tilføj mærker til grupper for nemmere håndtering."
+        new: "Ny Gruppe"
+        tags_label: "Mærker i denne gruppe:"
+        parent_tag_label: "Overordnede mærke:"
+        parent_tag_description: "Mærker fra denne gruppe kan ikke bruges medmindre det overordnede mærke er tilstede."
+        one_per_topic_label: "Begræns ét mærke per emne fra denne gruppe"
+        new_name: "Ny mærkegruppe"
+        name_placeholder: "Mærkegruppens Navn"
         save: "Gem"
         delete: "Slet"
-        confirm_delete: "Er du sikker du vil slette denne tag gruppe?"
-        everyone_can_use: "Tags kan bruges af alle"
+        confirm_delete: "Er du sikker du vil slette denne mærkegruppe?"
+        everyone_can_use: "Mærker kan bruges af alle"
+        usable_only_by_groups: "Mærker er synlige for alle, men kun følgende grupper kan bruge dem"
+        visible_only_to_groups: "Mærker er kun synlige for følgende grupper"
       topics:
         none:
           unread: "Du har ingen ulæste emner."
@@ -2754,17 +3392,32 @@ da:
           bookmarks: "Du har ikke bogmærket nogen emner endnu."
           top: "Der er ikke nogen populære emner."
     invite:
-      custom_message: "Gør din invitation lidt mere personlig ved at skrive en <a href>brugerdefineret besked</a> ."
-      custom_message_placeholder: "Skriv en personlig besked"
+      custom_message: "Gør din invitation lidt mere personlig ved at skrive en <a href>brugerdefineret meddelelse</a> ."
+      custom_message_placeholder: "Skriv en personlig meddelelse"
+      approval_not_required: "Brugeren vil blive automatisk godkendt, så snart de accepterer denne invitation."
       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."
+    forced_anonymous_login_required: "Webstedet er under ekstrem belastning og kan ikke indlæses på nuværende tidspunkt, prøv igen om et par minutter."
     footer_nav:
       back: "Tilbage"
+      forward: "Fremad"
       share: "Del"
-      dismiss: "Afvis"
+      dismiss: "Skjul"
     safe_mode:
       enabled: "Sikker tilstand er slået til - for at forlade sikker tilstand, så luk dette browservindue"
+    image_removed: "(billede fjernet)"
+    do_not_disturb:
+      title: "Forstyr ikke i ..."
+      label: "Forstyr ikke"
+      remaining: "%{remaining} tilbage"
+      options:
+        half_hour: "30 minutter"
+        one_hour: "1 time"
+        two_hours: "2 timer"
+        tomorrow: "Indtil i morgen"
+        custom: "Tilpasset"
+      set_schedule: "Indstil en Tidsplan for notifikation"
   admin_js:
     type_to_filter: "skriv for at filtrere…"
     admin:
@@ -2773,7 +3426,7 @@ da:
       tags:
         remove_muted_tags_from_latest:
           always: "altid"
-          only_muted: "når de bruges alene eller sammen med andre begrænsede tags"
+          only_muted: "når de bruges alene eller sammen med andre ignorerede mærker"
           never: "aldrig"
       reports:
         title: "Liste over tilgængelige rapporter"
@@ -2792,6 +3445,10 @@ da:
         installed_version: "Installeret"
         latest_version: "Seneste version"
         problems_found: "Nogle råd baseret på dine nuværende sideindstillinger"
+        new_features:
+          title: "\U0001F381 Nye Funktioner"
+          dismiss: "Skjul"
+          learn_more: "Lær mere"
         last_checked: "Sidst kontrolleret"
         refresh_problems: "Opdatér"
         no_problems: "Ingen problemer fundet."
@@ -2804,7 +3461,7 @@ da:
         mobile_title: "Mobil"
         space_used: "%{usedSize} brugt"
         space_used_and_free: "%{usedSize} (%{freeSize} fri)"
-        uploads: "uploads"
+        uploads: "Overførsler"
         backups: "Backups"
         backup_count:
           one: "%{count} backup på %{location}"
@@ -2844,6 +3501,10 @@ da:
           view_table: "tabel"
           view_graph: "graf"
           refresh_report: "Genopfrisk rapporten"
+          daily: Dagligt
+          monthly: Månedligt
+          weekly: Ugentligt
+          dates: "Datoer (UTC)"
           groups: "Alle grupper"
           disabled: "Denne rapport er deaktiveret"
           totals_for_sample: "Totaler for prøve"
@@ -2851,7 +3512,7 @@ da:
           total: "Total tid"
           no_data: "Ingen data at vise."
           trending_search:
-            more: '<a href="%{basePath}/admin/logs/search_logs">Søg logfiler</a>'
+            more: '<a href="%{basePath}/admin/logs/search_logs">Søg logninger</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:
@@ -2860,12 +3521,14 @@ da:
               label: Gruppe
             category:
               label: Kategori
+            include_subcategories:
+              label: "Inkludér Underkategorier"
       commits:
         latest_changes: "Seneste ændringer: opdatér ofte!"
         by: "af"
       groups:
         new:
-          title: "Ny gruppe"
+          title: "Ny Gruppe"
           create: "Opret"
           name:
             too_short: "Gruppenavnet er for kort"
@@ -2874,32 +3537,35 @@ da:
             available: "Gruppenavnet er tilgængeligt"
             not_available: "Gruppenavnet er ikke tilgængelig"
             blank: "Gruppenavnet kan ikke være tomt"
-        bulk_add:
-          title: "Tilføj mange brugere til gruppe"
-          complete_users_not_added: "Disse brugere blev ikke tilføjet (sørg for at sikre, at de har en konto):"
-          paste: "Indsæt en liste brugerne eller emails, én per linje:"
         add_members:
-          as_owner: "Angiv bruger (e) som ejer (e) af denne gruppe"
+          as_owner: "Angiv bruger(e) som ejer(e) af denne gruppe"
         manage:
           interaction:
             email: Email
             incoming_email: "Brugerdefineret indkommende email"
-            incoming_email_placeholder: "indtast email"
+            incoming_email_placeholder: "indtast email adresse"
             visibility: Synlighed
             visibility_levels:
               title: "Hvem kan se denne gruppe?"
               public: "Alle"
               logged_on_users: "Brugere logget på"
+              members: "Gruppeejere, medlemmer og moderatorer"
+              staff: "Gruppejere og moderatorer"
               owners: "Gruppeejere"
               description: "Administratorer kan se alle grupper."
             members_visibility_levels:
               title: "Hvem kan se medlemmer for denne gruppe?"
               description: "Admins kan se medlemmer af alle grupper."
+            publish_read_state: "På gruppemeddelelser offentliggør gruppens læsetilstand"
           membership:
             automatic: Automatisk
             trust_levels_title: "Tillidsniveau der automatisk tildeles medlemmer når de oprettes:"
+            effects: Påvirker
             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_user_count:
+              one: "%{count} bruger har de nye e-mail-domæner og vil blive føjet til gruppen."
+              other: "%{count} brugere har de nye e-mail-domæner og vil blive føjet til gruppen."
             primary_group: "Sæt automatisk som primær gruppe"
         name_placeholder: "Gruppenavn uden mellemrum, samme som reglen for brugernavn"
         primary: "Primær gruppe"
@@ -2911,7 +3577,11 @@ da:
         group_members: "Gruppe medlemmer"
         delete: "Slet"
         delete_confirm: "Slet denne gruppe?"
+        delete_with_messages_confirm:
+          one: "Hvis du sletter denne gruppe, bliver %{count} besked forældreløs, gruppemedlemmer har ikke længere adgang til den.<br><br>Er du sikker?"
+          other: "Hvis du sletter denne gruppe, bliver %{count} beskeder forældreløse, gruppemedlemmer har ikke længere adgang til dem.<br><br>Er du sikker?"
         delete_failed: "Kan ikke slette gruppen. Hvis dette er en automatisk gruppe, kan den ikke ødelægges."
+        delete_automatic_group: Dette er en automatisk gruppe og kan ikke slettes.
         delete_owner_confirm: "Fjern ejer-privilegier for '%{username}'?"
         add: "Tilføj"
         custom: "Brugerdefineret"
@@ -2927,14 +3597,61 @@ da:
         none: "Der er ingen aktive API-nøgler i øjeblikket."
         user: "Bruger"
         title: "API"
+        key: "Nøgle"
         created: Oprettet
+        updated: Opdateret
+        last_used: Sidst Brugt
+        never_used: (aldrig)
         generate: "Generér"
+        undo_revoke: "Fortryd tilbagekaldelse"
         revoke: "Tilbagekald"
         all_users: "Alle brugere"
+        active_keys: "Aktive API-nøgler"
+        manage_keys: Administrer nøgler
         show_details: Detaljer
         description: Beskrivelse
+        no_description: (Ingen beskrivelse)
+        all_api_keys: Alle API-nøgler
+        user_mode: Brugerniveau
+        impersonate_all_users: Efterlign enhver bruger
+        single_user: "Enkelt Bruger"
+        user_placeholder: Indtast brugernavn
+        description_placeholder: Hvad skal denne nøgle bruges til?
         save: Gem
+        new_key: Ny API-nøgle
+        revoked: Tilbagekaldt
+        delete: Slet permanent
+        not_shown_again: Denne nøgle vil ikke blive vist igen. Sørg for at tage en kopi før du fortsætter.
         continue: Fortsæt
+        use_global_key: Global nøgle (tillader alle handlinger)
+        scopes:
+          description: |
+            Når du bruger anvendelsesområder, kan du begrænse en API-nøgle til et bestemt sæt endepunkter.
+            Du kan også definere hvilke parametre der vil blive tilladt. Brug kommaer til at adskille flere værdier.
+          title: Anvendelsesområder
+          resource: Ressource
+          action: Handling
+          allowed_parameters: Tilladte parametre
+          optional_allowed_parameters: Tilladte parametre (valgfrit)
+          any_parameter: (enhver parameter)
+          allowed_urls: Tilladte URL'er
+          descriptions:
+            topics:
+              read: Læs et emne eller et bestemt indlæg i det. RSS understøttes også.
+              write: Opret et nyt emne eller et nyt indlæg i et eksisterende emne.
+              read_lists: Læse emnelister som top, nye, nyeste osv. RSS understøttes også.
+              wordpress: Nødvendigt for at WordPress wp-discourse-plugin fungerer.
+            users:
+              bookmarks: Se liste over brugerbogmærker. Der returneres bogmærkepåmindelser, når du bruger ICS-format.
+              sync_sso: Synkroniser en bruger ved hjælp af DiscourseConnect.
+              show: Hent oplysninger om en bruger.
+              check_emails: Se liste af bruger e-mails.
+              update: Opdater brugerprofiloplysninger.
+              log_out: Log alle sessioner ud for en bruger.
+              anonymize: Anonymiser brugerkonti.
+              delete: Slet brugerkonti.
+            email:
+              receive_emails: Kombiner dette anvendelsesområde med mail-modtageren til at behandle indgående e-mails.
       web_hooks:
         title: "Webhooks"
         none: "Der er ingen webhooks i øjeblikket"
@@ -2948,24 +3665,23 @@ da:
         controls: "Kontrolfunktioner"
         go_back: "Tilbage til oversigt"
         payload_url: "Payload-URL"
-        payload_url_placeholder: "https://example.com/sendmodtag"
-        warn_local_payload_url: "Det ser ud til, at du forsøger at konfigurere webhook'en til en lokal URL. Events som leveres til en lokal adresse kan forårsage bivirkninger eller uventet adfærd. Fortsæt?"
+        payload_url_placeholder: "https://example.dk/postreceive"
         secret_invalid: "Hemmelighed må ikke indeholde mellemrumstegn."
         secret_too_short: "Hemmeligheden bør have mindst 12 tegn."
         secret_placeholder: "En valgfri tekststreng, der bruges til at oprette signatur"
         event_type_missing: "Du er nødt til at konfigurere mindst én eventtype."
         content_type: "Indholdstype"
-        secret: "Hemmelig"
+        secret: "Hemmelighed"
         event_chooser: "Hvilke begivenheder skal udløse denne webhook?"
         wildcard_event: "Send mig alt"
-        individual_event: "Vælg individuelle events"
+        individual_event: "Vælg individuelle begivenheder"
         verify_certificate: "Tjek TLS-certificatet for payload-URL'en"
         active: "Aktiv"
         active_notice: "Vi vil levere detaljer om eventet når det sker."
         categories_filter_instructions: "De relevante webhooks vil kun blive udløst, hvis eventet er relateret med angivne kategorier. Lad stå tom for at udløse webhook for alle kategorier."
         categories_filter: "Udløste kategorier"
-        tags_filter_instructions: "Relevante webhooks udløses kun, hvis begivenheden er relateret til specificerede tags. Lad være tom for at udløse webhooks til alle tags."
-        tags_filter: "Udløste tags"
+        tags_filter_instructions: "Relevante webhooks udløses kun, hvis begivenheden er relateret til angivne mærker. Lad være tom for at udløse webhooks til alle mærker."
+        tags_filter: "Udløste mærker"
         groups_filter_instructions: "De relevante webhooks vil kun blive udløst, hvis eventet er relateret med angivne grupper. Lad stå tom for at udløse webhook for alle grupper."
         groups_filter: "Udløste grupper"
         delete_confirm: "Slet denne webhook?"
@@ -2977,7 +3693,6 @@ da:
           details: "Når der er et nyt svar, redigering, sletning eller gendannelse."
         user_event:
           name: "Bruger-event"
-          details: "Når en bruger logger ind, logger ud, oprettes, godkendes, eller bliver opdateret."
         group_event:
           name: "Gruppebegivenhed"
           details: "Når en gruppe bliver oprettet, opdateret eller ødelagt."
@@ -2985,15 +3700,26 @@ da:
           name: "Kategori begivenhed"
           details: "Når en kategori bliver oprettet, opdateret eller ødelagt."
         tag_event:
-          name: "Tag begivenhed"
-          details: "Når et tag bliver oprettet, opdateret eller ødelagt."
+          name: "Marker begivenhed med Mærke"
+          details: "Når et mærke bliver oprettet, opdateret eller ødelagt."
         reviewable_event:
           name: "Begivenhed, der kan gennemgås"
           details: "Når et nyt punkt er klar til gennemgang, og når dets status opdateres."
+        notification_event:
+          details: "Når en bruger modtager en underretning i deres beskedstrøm."
+        user_badge_event:
+          name: "Emblem Tildelings Begivenhed"
+          details: "Når en bruger modtager et emblem."
+        group_user_event:
+          name: "Gruppe Bruger Begivenhed"
+          details: "Når en bruger tilføjes eller fjernes en gruppe."
+        like_event:
+          name: "'Synes godt om' Begivenhed"
+          details: "Når en bruger 'Synes godt om' et indlæg."
         delivery_status:
           title: "Leveringsstatus"
           inactive: "Inaktiv"
-          failed: "Mislykkedes"
+          failed: "Fejlet"
           successful: "Gennemført"
           disabled: "Deaktiveret"
         events:
@@ -3021,10 +3747,10 @@ da:
           completion: "Tid for fuldførelse"
           actions: "Handlinger"
       plugins:
-        title: "Plugins"
-        installed: "Installerede Plugins"
+        title: "Udvidelser"
+        installed: "Installerede Udvidelser"
         name: "Navn"
-        none_installed: "Du har ikke nogen plugins installeret"
+        none_installed: "Du har ikke nogen udvidelser installeret"
         version: "Version"
         enabled: "Aktiveret?"
         is_enabled: "J"
@@ -3053,12 +3779,12 @@ da:
           filename: "Filnavn"
           size: "Størrelse"
         upload:
-          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}"
+          label: "Overfør"
+          title: "Overfør en backup til denne instans"
+          uploading: "Overfører…"
+          uploading_progress: "Overfører... %{progress}%"
+          success: "'%{filename}' er blevet overført. 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 overført: %{message}"
         operations:
           is_running: "Der kører allerede en operation..."
           failed: "%{operation} gik galt. Kig venligst i logfilerne."
@@ -3070,7 +3796,7 @@ da:
             label: "Backup"
             title: "Start backup"
             confirm: "Vil du starte en ny backup?"
-            without_uploads: "Ja (inkluder ikke uploads)"
+            without_uploads: "Ja (inkluder ikke overførsler)"
           download:
             label: "Download"
             title: "Send e-mail med downloadlink"
@@ -3157,20 +3883,29 @@ da:
           settings: "Indstillinger"
           translations: "Oversættelser"
           extra_scss: "Ekstra SCSS"
+          extra_files: "Ekstra filer"
+          extra_files_upload: "Eksporter tema for at se disse filer."
+          extra_files_remote: "Eksporter tema eller tjek git-arkivet for at se disse filer."
           preview: "Forhåndsvisning"
           show_advanced: "Vis avancerede felter"
           hide_advanced: "Skjul avancerede felter"
           hide_unused_fields: "Skjul ubrugte felter"
           is_default: "Tema er slået til som standard"
           user_selectable: "Tema kan vælges af brugerne"
+          color_scheme_user_selectable: "Farveskema kan vælges af brugere"
+          auto_update: "Opdater automatisk når Discource er blevet opdateret"
           color_scheme: "Farvepalet"
+          default_light_scheme: "Lys (standard)"
           color_scheme_select: "Vælg farver som temaet skal anvende"
           custom_sections: "Tilpassede sektioner:"
           theme_components: "Temakomponenter"
+          add_all_themes: "Tilføj alle temaer"
           convert: "Konverter"
           convert_component_alert: "Er du sikker på, at du vil konvertere denne komponent til tema? Det fjernes som en komponent fra %{relatives}."
           convert_component_tooltip: "Konverter dette komponent til tema"
+          convert_component_alert_generic: "Er du sikker på, at du vil konvertere denne komponent til tema?"
           convert_theme_alert: "Er du sikker på, at du vil konvertere dette tema til komponent? Det fjernes som overordnet fra %{relatives}."
+          convert_theme_alert_generic: "Er du sikker på, at du vil konvertere dette tema til komponent?"
           convert_theme_tooltip: "Konverter dette tema til komponent"
           inactive_themes: "Inaktive temaer:"
           inactive_components: "Ubrugte komponenter:"
@@ -3180,26 +3915,31 @@ da:
           updates_available_tooltip: "Opdateringer er tilgængelige til dette tema"
           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"
-          add_upload: "Tilføj upload"
-          upload_file_tip: "Vælg et aktiv, der skal uploades (png, woff2, osv. ...)"
+          uploads: "Overførsler"
+          no_uploads: "Du kan overføre aktiver tilknyttet dit tema, f.eks. skrifttyper og billeder"
+          add_upload: "Tilføj overførsel"
+          upload_file_tip: "Vælg et aktiv, der skal overføres (png, woff2, osv. ...)"
           variable_name: "SCSS var navn:"
           variable_name_invalid: "Ugyldigt variabelnavn. Kun alfanumerisk tilladt. Skal starte med et bogstav. Skal være unikt."
           variable_name_error:
             invalid_syntax: "Ugyldigt variabelnavn. Kun alfanumerisk tilladt. Skal starte med et bogstav."
             no_overwrite: "Ugyldigt variabelnavn. Må ikke overskrive en eksisterende variabel."
             must_be_unique: "Ugyldigt variabelnavn. Skal være unikt."
-          upload: "Upload"
+          upload: "Overfør"
           select_component: "Vælg et komponent ..."
           unsaved_changes_alert: "Du har ikke gemt dine ændringer endnu, vil du kassere dem og gå videre?"
+          unsaved_parent_themes: "Du har ikke tildelt komponenten til temaer, vil du fortsætte?"
           discard: "Kassér"
           stay: "Bliv"
           css_html: "Tilpasset CSS/HTML"
           edit_css_html: "Redigér CSS/HTML"
           edit_css_html_help: "Du har ikke redigeret i hverken CSS eller HTML"
-          delete_upload_confirm: "Slet denne upload? (Tema CSS kan muligvis stoppe med at virke!)"
+          delete_upload_confirm: "Slet denne overførsel? (Tema CSS kan muligvis stoppe med at virke!)"
+          component_on_themes: "Inkluder komponent i disse temaer"
+          included_components: "Inkluderede komponenter"
+          add_all: "Tilføj alle"
           import_web_tip: "Depot som har temaet"
+          direct_install_tip: "Er du sikker på, at du vil installere <strong>%{name}</strong> fra lageret nedenfor?"
           import_web_advanced: "Avanceret..."
           import_file_tip: ".tar.gz, .zip eller .dcstyle.json fil indeholdende tema"
           is_private: "Temaet er i et privat git-repository"
@@ -3211,10 +3951,12 @@ da:
           install_upload: "Fra din enhed"
           install_git_repo: "Fra et git-repository"
           install_create: "Lav ny"
+          duplicate_remote_theme: "Temakomponenten “%{name}” er allerede installeret. Er du sikker på, at du vil installere en anden kopi?"
           about_theme: "Om"
           license: "Licens"
           version: "Version:"
           authors: "Forfattet af:"
+          creator: "Oprettet af:"
           source_url: "Kilde"
           enable: "Aktiver"
           disable: "Deaktiver"
@@ -3229,6 +3971,7 @@ da:
           check_for_updates: "Tjek efter opdateringer"
           updating: "Opdaterer..."
           up_to_date: "Tema er opdateret, senest tjekket:"
+          has_overwritten_history: "Nuværende temaversion findes ikke længere, fordi Git-historien er blevet overskrevet af et tvangsskub (push)"
           add: "Tilføj"
           theme_settings: "Tema indstillinger"
           no_settings: "Dette tema har ingen indstillinger."
@@ -3238,7 +3981,9 @@ da:
             one: "Temaet er %{count} 'commit' bagud!"
             other: "Temaet er %{count} 'commits' bagud!"
           compare_commits: "(Se nye 'commits')"
+          remote_theme_edits: "Hvis du vil redigere dette tema, skal du <a href='%{repoURL}' target='_blank'>indsende en ændring på dets arkiv (repository)</a>"
           repo_unreachable: "Kunne ikke kontakte Git-repository for dette tema. Fejl besked:"
+          imported_from_archive: "Dette tema blev importeret fra en .zip-fil"
           scss:
             text: "CSS"
             title: "Angiv tilpasset CSS - vi accepterer alle gyldige CSS og SCSS-former"
@@ -3254,6 +3999,18 @@ da:
           embedded_scss:
             text: "Indlejret CSS"
             title: "Angiv tilpasset CSS som leveres med indlejret version af kommentarer"
+          color_definitions:
+            text: "Farvedefinitioner"
+            title: "Indtast brugerdefinerede farvedefinitioner (kun avancerede brugere)"
+            placeholder: |2-
+
+              Brug dette stilark til at tilføje brugerdefinerede farver til listen over CSS brugerdefinerede egenskaber.
+
+              Eksempel:
+
+              %{example}
+
+              Præfiksering af egenskabsnavne anbefales stærkt for at undgå konflikter med plugins og/eller kernen.
           head_tag:
             text: "</head>"
             title: "HTML som vil blive sat ind før tagget </head>"
@@ -3281,6 +4038,10 @@ da:
           primary:
             name: "Primær"
             description: "De fleste tekster, iconer og kanter."
+          primary-medium:
+            name: "primær-medium"
+          primary-low-mid:
+            name: "primær-lav-mid"
           secondary:
             name: "sekundær"
             description: "Hoved baggrunds farven og tekst farven på enkelte knapper."
@@ -3299,6 +4060,12 @@ da:
           highlight:
             name: "fremhæv"
             description: "Baggrundsfarven på fremhævede elementer på siden, såsom emner og indlæg."
+          highlight-high:
+            name: "fremhæv-høj"
+          highlight-medium:
+            name: "fremhæv-medium"
+          highlight-low:
+            name: "fremhæv-lav"
           danger:
             name: "fare"
             description: "Fremhævet farve på handlinger såsom sletning af indlæg og emner."
@@ -3313,8 +4080,14 @@ da:
           warning: "Dette vil tilsidesætte alle relaterede sideindstillinger permanent."
           overridden: Dit websteds standard robots.txt-fil er tilsidesat.
         email_style:
+          title: "E-mail-stil"
+          heading: "Tilpas E-Mail Stil"
           html: "HTML skabelon"
           css: "CSS"
+          reset: "Nulstil til standard"
+          reset_confirm: "Er du sikker på, at du vil nulstille til standard %{fieldName} og miste alle dine ændringer?"
+          save_error_with_reason: "Dine ændringer blev ikke gemt. %{error}"
+          instructions: "Tilpas skabelonen, hvorfra alle html-mails dannes, og formater med CSS."
       email:
         title: "Emails"
         settings: "Indstillinger"
@@ -3352,6 +4125,7 @@ da:
         format: "Format"
         html: "html"
         text: "text"
+        html_preview: "Forhåndsvisning af E-mail"
         last_seen_user: "Sidst sete bruge:"
         no_result: "Ingen resultater for sammenfatning."
         reply_key: "Svarnøgle"
@@ -3461,9 +4235,9 @@ da:
             grant_moderation: "tildel moderation"
             revoke_moderation: "fjern moderation"
             backup_create: "opret backup"
-            deleted_tag: "slettet tag"
-            deleted_unused_tags: "slettede ubrugte tags"
-            renamed_tag: "omdøbt tag"
+            deleted_tag: "slettet mærke"
+            deleted_unused_tags: "slettede ubrugte mærker"
+            renamed_tag: "omdøbte mærke"
             revoke_email: "tilbagekald email"
             lock_trust_level: "lås tillidsniveau"
             unlock_trust_level: "lås tillidsniveau op"
@@ -3478,6 +4252,7 @@ da:
             post_edit: "redigér indlæg"
             post_unlocked: "indlæg ulåst"
             check_personal_message: "check privat besked"
+            disabled_second_factor: "deaktiver To-Faktor Godkendelse"
             topic_published: "emne offentliggjort"
             post_approved: "indlæg godkendt"
             post_rejected: "indlæg afvist"
@@ -3499,6 +4274,22 @@ da:
             change_theme_setting: "ændre temaindstilling"
             disable_theme_component: "deaktivér temakomponent"
             enable_theme_component: "aktiver tema komponent"
+            revoke_title: "Tilbagekald"
+            change_title: "Ændre"
+            api_key_create: "Opret API nøgle"
+            api_key_update: "Opdater API nøgle"
+            api_key_destroy: "Destruer API nøgle"
+            override_upload_secure_status: "tilsidesæt overførsls sikkerheds status"
+            page_published: "side udgivet"
+            page_unpublished: "side ikke udgivet"
+            add_email: "tilføj e-mail"
+            update_email: "opdater e-mail"
+            topic_closed: "emne lukket"
+            topic_opened: "emnet åbnet"
+            topic_archived: "emne arkiveret"
+            topic_unarchived: "emne ikke arkiveret"
+            post_staff_note_create: "tilføj personalenotat"
+            delete_group: "slet gruppe"
         screened_emails:
           title: "Blokerede e-mails"
           description: "Følgende e-mail-adresser kontrolleres når nogen prøver at oprette en konto, og oprettelsen vil enten blive blokeret, eller der vil blive foretaget en anden handling."
@@ -3512,6 +4303,7 @@ da:
           domain: "Domain"
         screened_ips:
           title: "Blokerede IPer"
+          description: 'IP-adresser der overvåges. Brug "Tillad" til at tillade IP-adresser.'
           delete_confirm: "Er du sikker på, at du ønsker at fjerne reglen for %{ip_address}?"
           roll_up_confirm: "Er du sikker på du vil samle alle screenede IP adresser i subnets ?"
           rolled_up_some_subnets: "Har med succes samlet alle IP forbud til disse subnets: %{subnets}"
@@ -3545,37 +4337,41 @@ da:
         title: "Overvågede ord"
         search: "Søg"
         clear_filter: "Ryd"
-        show_words: "Vis ord"
-        one_word_per_line: "Et ord pr. linje"
+        show_words:
+          one: "vis %{count} ord"
+          other: "vis %{count} ord"
         download: Download
         clear_all: Ryd alle
-        clear_all_confirm_block: "Er du sikker på, at du vil rydde alle overvågede ord for Blokér-handlingen?"
-        clear_all_confirm_censor: "Er du sikker på, at du vil rydde alle overvågede ord for Censor-handlingen?"
-        clear_all_confirm_flag: "Er du sikker på, at du vil rydde alle overvågede ord for Markér-handlingen?"
-        clear_all_confirm_require_approval: "Er du sikker på, at du vil rydde alle overvågede ord for Kræv Godkendelse-handlingen?"
-        word_count:
-          one: "%{count} ord"
-          other: "%{count} ord"
+        clear_all_confirm: "Er du sikker på, at du vil rydde alle overvågede ord for %{action}-handlingen?"
         actions:
           block: "Blokér"
           censor: "Censor"
           require_approval: "Kræv godkendelse"
-          flag: "Flag"
+          flag: "Rapportér"
+          replace: "Erstat"
+          tag: "Mærke"
         action_descriptions:
           block: "Undgå, at indlæg, der indeholder disse ord, bliver sendt. Brugeren vil se en fejlmeddelelse, når de prøver at indsende deres post."
           censor: "Tillad indlæg, der indeholder disse ord, men erstat dem med tegn, der skjuler de censurerede ord."
           require_approval: "Indlæg, der indeholder disse ord, kræver godkendelse af hjælperteam, før de kan ses."
           flag: "Tillad indlæg, der indeholder disse ord, men markér dem som upassende, så moderatorer kan gennemgå dem."
+          replace: "Erstat ord i indlæg med andre ord eller links"
         form:
-          label: "Nyt ord:"
-          placeholder: "fuldt ord eller * som jokertegn"
           placeholder_regexp: "almindelig udtryk"
+          replacement_label: "Erstatning"
+          replacement_placeholder: "eksempel eller https://eksempel.dk"
+          tag_label: "Mærke"
+          tag_placeholder: "mærke1,mærke2,mærke3"
           add: "Tilføj"
           success: "Succes"
           exists: "Eksisterer allerede"
           upload: "Tilføj fra fil"
-          upload_successful: "Upload er vellykket. Der er tilføjet ord."
+          upload_successful: "Overførsel er vellykket. Der er tilføjet ord."
         test:
+          button_label: "Test"
+          modal_title: "Test '%{action}' Overvågede Ord"
+          description: "Indtast tekst nedenfor for at kontrollere, om den indeholder overvågede ord"
+          found_matches: "Fundne resultater:"
           no_matches: "Ingen match fundet"
       impersonate:
         title: "Skift personlighed"
@@ -3597,7 +4393,7 @@ da:
           staff: "Personale"
           suspended: "Suspenderet"
           silenced: "Mådeholdt (silenced)"
-          staged: "Iscenesat"
+          staged: "Forhåndsoprettet"
         approved: "Godkendt?"
         titles:
           active: "Aktive brugere"
@@ -3613,11 +4409,14 @@ da:
           moderators: "Moderatorer"
           silenced: "Mådeholdte (silenced) brugere "
           suspended: "Suspenderede brugere"
-          staged: "Iscenesatte brugere"
+          staged: "Forhåndsoprettede brugere"
         not_verified: "Ikke verificeret"
         check_email:
           title: "Vis denne brugers email adresse"
           text: "Vis"
+        check_sso:
+          title: "Afslør SSO payload"
+          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}"
@@ -3625,6 +4424,14 @@ da:
         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."
         suspend_reason: "Begrundelse"
+        suspend_reason_title: "Begrundelse For Suspension"
+        suspend_reasons:
+          not_listening_to_staff: "Ville ikke lytte til personale feedback"
+          consuming_staff_time: "Forbrugte uforholdsmæssigt meget personaletid"
+          combatative: "For kombatativ"
+          in_wrong_place: "På det forkerte sted"
+          no_constructive_purpose: "Intet konstruktivt formål med deres handlinger andet end at skabe uenighed i fællesskabet"
+          custom: "Tilpasset..."
         suspend_message: "Email Besked"
         suspend_message_placeholder: "Angiv eventuelt mere information om suspensionen, og den vil blive sendt til brugeren."
         suspended_by: "Suspenderet af"
@@ -3650,14 +4457,14 @@ da:
         clear_penalty_history:
           title: "Ryd straffehistorie"
           description: "brugere med straffe kan ikke nå TL3"
-        delete_all_posts_confirm_MF: "Du er ved at slette {POSTS, plural, one {1 post} other {# posts}} og {TOPICS, plural, one {1 topic} other {# topics}}. Er du sikker?"
+        delete_all_posts_confirm_MF: "Du er ved at slette {POSTS, plural, one {1 emne} other {# emner}} og {TOPICS, plural, one {1 indlæg} other {# indlæg}}. Er du sikker?"
         silence: "Mådehold (silence)"
         unsilence: "Fjern mådeholdenhed (unsilence)"
         silenced: "Mådeholdt (silenced)?"
         moderator: "Moderator?"
         admin: "Admin?"
         suspended: "Suspenderet?"
-        staged: "Midlertidig?"
+        staged: "Forhåndsoprettet?"
         show_admin_profile: "Admin"
         show_public_profile: "Vis offentlig profil"
         impersonate: "Impersonate"
@@ -3683,11 +4490,12 @@ da:
         private_topics_count: Private emner
         posts_read_count: Læste indlæg
         post_count: Oprettede indlæg
+        second_factor_enabled: To-faktor-godkendelse aktiveret
         topics_entered: Læste emner
-        flags_given_count: Afgivne flag
-        flags_received_count: Modtagne flag
+        flags_given_count: Afgivne rapporteringer
+        flags_received_count: Modtagne rapporteringer
         warnings_received_count: Advarsler modtaget
-        flags_given_received_count: "Flag Givet / Modtaget"
+        flags_given_received_count: "Rapporteringer Givet / Modtaget"
         approve: "Godkend"
         approved_by: "godkendt af"
         approve_success: "Bruger godkendt og e-mail med aktiveringsvejledning sendt."
@@ -3698,11 +4506,35 @@ da:
         anonymize_yes: "Ja, anonymiser denne konto"
         anonymize_failed: "Der var problemer med at anonymisere denne konto."
         delete: "Slet bruger"
+        delete_posts:
+          progress:
+            title: "Fremskridt med sletning af indlæg"
         merge:
+          button: "Flet"
           prompt:
+            title: "Overfør & Slet @%{username}"
+            description: |
+              <p>Vælg en ny ejer til <b>@%{username}'s</b> indhold.</p>
+
+              <p>Alle emner, indlæg, beskeder og andet indhold oprettet af <b>@%{username}</b> overføres.</p>
+            target_username_placeholder: "Brugernavn på ny ejer"
+            transfer_and_delete: "Overfør & Slet @%{username}"
             cancel: "Afbryd"
+          progress:
+            title: "Flet fremgang"
           confirmation:
+            title: "Overfør & Slet @%{username}"
+            description: |
+              <p>Alt <b>@%{username}'s</b> -indhold vil blive overført og tilskrives <b>@%{targetUsername}</b>. Efter indholdet er blevet overført, vil <b>@%{username}'s</b> konto vil blive slettet.</p>
+
+              <p><b>Dette kan ikke fortrydes!</b></p>
+
+              <p>For at fortsætte skriv: <code>%{text}</code></p>
+            text: "overfør @%{username} til @%{targetUsername}"
+            transfer_and_delete: "Overfør & Slet @%{username}"
             cancel: "Afbryd"
+        merging_user: "Fletter bruger..."
+        merge_failed: "Der opstod en fejl under sammenfletning af brugere."
         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:
@@ -3739,13 +4571,14 @@ da:
         deactivate_explanation: "En deaktiveret bruger skal genvalidere deres e-mail."
         suspended_explanation: "En suspenderet bruger kan ikke logge ind."
         silence_explanation: "En mådeholdt (silenced) bruger kan ikke sende indlæg eller starte emner."
-        staged_explanation: "En midlertidig bruger kan kun svare via email i bestemte emner."
+        staged_explanation: "En forhåndsoprettet bruger kan kun svare via email i bestemte emner."
         bounce_score_explanation:
           none: "Ingen \"bounces\" er for nyligt modtaget fra denne email."
           some: "Nogle \"bounces\" er for nyligt modtaget fra denne email."
           threshold_reached: "Modtaget for mange \"bounces\" fra den email."
         trust_level_change_failed: "Der opstod et problem ved ændringen af brugerens tillidsniveau."
         suspend_modal_title: "Suspendér bruger"
+        confirm_cancel_penalty: "Er du sikker på, at du vil kassere straffen?"
         trust_level_2_users: "Tillids niveau 2 brugere"
         trust_level_3_requirements: "Fortrolighedsniveau 3 påkrævet"
         trust_level_locked_tip: "tillidsniveau er låst, systemet kan ikke forfremme eller degradere bruger"
@@ -3781,13 +4614,16 @@ da:
           on_grace_period: "Er i øjeblikket i forfremmelses prøve periode, vil ikke blive degraderet."
           locked_will_not_be_promoted: "Tillidsniveau låst. Vil aldrig blive forfremmet."
           locked_will_not_be_demoted: "Tillidsniveau låst. Vil aldrig blive degraderet."
-        sso:
-          title: "Single Sign On"
-          external_id: "Externt ID"
+        discourse_connect:
+          title: "DiscourseConnect Single Sign On"
+          external_id: "Eksternt ID"
           external_username: "Brugernavn"
           external_name: "Navn"
-          external_email: "Email"
+          external_email: "E-mail"
           external_avatar_url: "Profilbillede URL"
+          last_payload: "Sidste Payload"
+          delete_sso_record: "Slet SSO Registrering"
+          confirm_delete: "Er du sikker på at, du vil slette dette DiscourceConect-Indlæg?"
       user_fields:
         title: "Bruger felter"
         help: "Tilføj felter, som dine brugere kan udfylde"
@@ -3818,6 +4654,10 @@ da:
           title: "Vis på brugers profilkort?"
           enabled: "vist på brugerens profilkort"
           disabled: "ikke vist på brugerens profilkort"
+        searchable:
+          title: "Søgbar?"
+          enabled: "søgbar"
+          disabled: "ikke søgbar"
         field_types:
           text: "Tekstfelt"
           confirm: "Bekræft"
@@ -3832,12 +4672,19 @@ da:
         go_back: "Tilbage til søgning"
         recommended: "Vi anbefaler ændringer i følgende tekst:"
         show_overriden: "Vis kun tilsidesatte"
+        locale: "Sprog:"
+        fallback_locale_warning: "Du redigerer et sprog baseret på %{fallback}. Brugere, der vælger %{fallback}, som deres grænsefladesprog vil ikke kunne se dine ændringer."
         more_than_50_results: "Der er mere end 50 resultater. Begræns din søgning."
       settings:
         show_overriden: "Vis kun tilsidesatte"
+        history: "Vis ændringshistorik"
         reset: "nulstil"
         none: "ingen"
       site_settings:
+        emoji_list:
+          invalid_input: "Humørikon liste bør kun indeholde gyldige humørikon navne, for eksempel: knus"
+          add_emoji_button:
+            label: "Tilføj Humørikon"
         title: "Indstillinger"
         no_results: "Ingen resultater fundet."
         more_than_30_results: "Der er mere end 30 resultater. Foruddefiner din søgning, eller vælg en kategori."
@@ -3847,10 +4694,10 @@ da:
         add_group: "tilføj gruppe"
         uploaded_image_list:
           label: "Rediger liste"
-          empty: "Der er endnu ingen billeder. Upload venligst et."
+          empty: "Der er endnu ingen billeder. Overfør venligst et."
           upload:
-            label: "Upload"
-            title: "Upload billede (r)"
+            label: "Overfør"
+            title: "Overfør billede (r)"
         selectable_avatars:
           title: "Liste over avatarer, som brugere kan vælge imellem"
         categories:
@@ -3878,26 +4725,31 @@ da:
           login: "Brugernavn"
           plugins: "Plugins"
           user_preferences: "Brugerpræferencer"
-          tags: "Tags"
+          tags: "Mærker"
           search: "Søg"
           groups: "Grupper"
           dashboard: "Dashboard"
         secret_list:
           invalid_input: "Inputfelter kan ikke være tomme eller indeholde lodret bjælketegn."
         default_categories:
+          modal_description: "Ønsker du at anvende denne ændring historisk? Dette vil ændre præferencer for %{count} eksisterende brugere."
           modal_yes: "Ja"
+          modal_no: "Nej, anvend kun ændringer fremadrettet"
         simple_list:
           add_item: "Tilføj element..."
+        json_schema:
+          edit: Start Editor
+          modal_title: "Rediger %{name}"
       badges:
-        title: Badges
-        new_badge: Nyt Badge
+        title: Emblemer
+        new_badge: Nyt Emblem
         new: Nye
         name: Navn
-        badge: Badge
+        badge: Emblem
         display_name: Vist navn
         description: Beskrivelse
         long_description: Lang beskrivelse
-        badge_type: Badge Type
+        badge_type: Emblem Type
         badge_grouping: Gruppe
         badge_groupings:
           modal_title: Badge grupperinger
@@ -3911,46 +4763,50 @@ da:
         reason: Grund
         expand: Fold ud &hellip;
         revoke_confirm: Er du sikker på du vil fratage brugeren denne badge ?
-        edit_badges: Rediger Badges
-        grant_badge: Tildel Badge
-        granted_badges: Tildelte Badges
+        edit_badges: Rediger Emblemer
+        grant_badge: Tildel Emblem
+        granted_badges: Tildelte Emblemer
         grant: Givet
-        no_user_badges: "%{name} had ikke feet nogen badges."
-        no_badges: Der er ikke nogen badges, der kan tildeles.
-        none_selected: "Vælg et badge for at komme igang"
-        allow_title: Tillad at bruge denne badge som titel
-        multiple_grant: Kan gives flere gange
-        listable: Vi badges på den offentlige badge side
-        enabled: Aktiver badge
-        icon: Icon
+        no_user_badges: "%{name} er ikke blevet tildelt nogen emblemer."
+        no_badges: Der er ikke nogen emblemer, der kan tildeles.
+        none_selected: "Vælg et emblem for at komme igang"
+        allow_title: Tillad at bruge dette emblem som titel
+        multiple_grant: Kan tildeles flere gange
+        listable: Vis emblemer på den offentlige emblem side
+        enabled: Aktiver emblem
+        icon: Ikon
         image: Billede
+        graphic: Grafik
         icon_help: "Indtast et font Awesome ikonnavn (brug præfikset 'far-' til almindelige ikoner og 'fab-' til mærkeikoner)"
-        image_help: "Indtast billedets URL (tilsidesætter ikonfeltet, hvis begge er indstillet)"
-        query: Badge Forespørgesel (SQL)
-        target_posts: Forespørg mål indlæg
+        image_help: "Overførsel af et billede tilsidesætter ikonfeltet, hvis begge er indstillet."
+        select_an_icon: "Vælg et Ikon"
+        upload_an_image: "Overfør et billede"
+        read_only_setting_help: "Tilpas tekst"
+        query: Emblem Forespørgesel (SQL)
+        target_posts: Forespørgsel rammer indlæg
         auto_revoke: Kør tilbagekaldelses forespørgsel hver dag
-        show_posts: Vis det indlæg der gav et badge på badge siden
-        trigger: Trigger
+        show_posts: Vis det indlæg der gav et emblem på emblemer siden
+        trigger: Udløser
         trigger_type:
           none: "Opdater dagligt"
           post_action: "Når en bruger reagerer på et indlæg"
           post_revision: "Når en bruger redigerer eller opretter et indlæg"
           trust_level_change: "Når en bruger skifter tillidsniveau"
           user_change: "Når en bruger er redigeret eller oprettet"
-          post_processed: "Når indlægget er behandlet"
+          post_processed: "Når et indlæg er blevet behandlet"
         preview:
-          link_text: "Forhåndsvisning af opnåede badges"
+          link_text: "Forhåndsvisning af opnåede emblemer"
           plan_text: "Forhåndsvisning med forespørgsels plan (SQL)"
-          modal_title: "Badge Forespørgesel forhåndsvisning (SQL)"
+          modal_title: "Emblem Forespørgesels-forhåndsvisning (SQL)"
           sql_error_header: "Der var en fejl i forespørgslen"
-          error_help: "Se disse links for hjælp med at skrive badge forespørgsler."
+          error_help: "Se disse links for hjælp med at skrive emblem forespørgsler."
           bad_count_warning:
             header: "ADVARSEL!"
-            text: "Der mangler tildelinger. Dette sker når en SQL query returnerer bruger ID'er eller indlægs IS'er der ikke eksisterer. Dette kan give uventede resultater senere - vær venlig at dobbelt checke din SQL query."
-          no_grant_count: "Ingen badges til tildeling."
+            text: "Der er manglende tildelings eksempler. Dette sker når en emblem (SQL) forespørgsel returnerer bruger ID'er eller indlægs ID'er der ikke eksisterer. Dette kan give uventede resultater senere - vær venlig at dobbelttjekke din SQL forespørgsel."
+          no_grant_count: "Ingen emblemer til tildeling."
           grant_count:
-            one: "<b>%{count}</b> badge til tildeling."
-            other: "<b>%{count}</b> badges til tildeling."
+            one: "<b>%{count}</b> emblem til tildeling."
+            other: "<b>%{count}</b> emblemer til tildeling."
           sample: "Eksempel:"
           grant:
             with: <span class="username">%{username}</span>
@@ -3958,17 +4814,28 @@ da:
             with_post_time: <span class="username">%{username}</span> for indlæg i %{link} klokken <span class="time">%{time}</span>
             with_time: <span class="username">%{username}</span> klokken <span class="time">%{time}</span>
         badge_intro:
-          title: "Vælg en eksisterende badge, eller opret en ny for at komme i gang"
-          what_are_badges_title: "Hvad er badges?"
-          badge_query_examples_title: "Eksempler på badge-forespørgsel"
+          title: "Vælg et eksisterende emblem, eller opret et nyt for at komme i gang"
+          emoji: "kvinde studerende emoji"
+          what_are_badges_title: "Hvad er emblemer?"
+          badge_query_examples_title: "Eksempler på emblem-forespørgsel"
+        mass_award:
+          title: Masseudnævnelse
+          description: Tildel det samme emblem til mange brugere på én gang.
+          no_badge_selected: Vælg venligst et emblem for at komme igang.
+          perform: "Tildel Emblem til Brugere"
+          upload_csv: Overfør en CSV-fil med enten bruger-e-mails eller brugernavne
+          aborted: Overfør venligst en CSV-fil, der indeholder enten bruger-e-mails eller brugernavne
+          success: Din CSV-fil blev modtaget, og brugerne vil modtage deres emblem om kort tid.
+          replace_owners: Fjern emblemet fra tidligere ejere
       emoji:
         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…"
+        uploading: "Overfører…"
         name: "Navn"
         group: "Gruppe"
         image: "Billede"
+        alt: "brugerdefineret humøikons forhåndsvisning"
         delete_confirm: "Er du sikker på du vil slette emojien: %{name} ?"
       embedding:
         get_started: "Hvis du vil indlejre Discourse på et andet website, skal du starte med at tilføje dets server."
@@ -3977,6 +4844,7 @@ da:
         title: "Indlejring"
         host: "Tilladte servere"
         class_name: "Klasse Navn"
+        allowed_paths: "Sti Tilladelsesliste"
         edit: "redigér"
         category: "Opret i kategorien"
         add_host: "Tilføj server"
@@ -3987,9 +4855,14 @@ da:
         embed_post_limit: "Maksimalt antal indlæg der kan indlejres."
         embed_title_scrubber: "Regular expression er brugt til at gøre titler pæne på indlæg"
         embed_truncate: "Beskær de indlejrede indlæg"
+        embed_unlisted: "Importerede emner vil være skjulte, indtil der er et svar."
+        allowed_embed_selectors: "CSS-selektorer for elementer der er tilladte i indlejringer"
+        blocked_embed_selectors: "CSS-selektorer for elementer der fjernes fra indlejringer"
+        allowed_embed_classnames: "Tilladte CSS-klassenavne"
         save: "Gem indlejrings-indstillinger"
       permalink:
         title: "Permalinks"
+        description: "Omdirigeringer der skal anvendes for URL'er der ikke er kendt af forummet."
         url: "URL"
         topic_id: "Emne ID"
         topic_title: "Emne"
@@ -3997,6 +4870,10 @@ da:
         post_title: "Indlæg"
         category_id: "Kategori ID"
         category_title: "Kategori"
+        tag_name: "Mærke navn"
+        external_url: "Ekstern eller Relativ URL"
+        destination: "Destination"
+        copy_to_clipboard: "Kopier Permalink til udklipsholder"
         delete_confirm: Er du sikker på at du vil slette dette permalink?
         form:
           label: "Ny:"
@@ -4019,9 +4896,9 @@ da:
       back: "Tilbage"
       next: "Næste"
       step: "%{current} af %{total}"
-      upload: "Upload"
-      uploading: "Uploader..."
-      upload_error: "Beklager, der opstod en fejl ved upload af filen. Prøv venligst igen."
+      upload: "Overfør"
+      uploading: "Overfører…"
+      upload_error: "Beklager, der opstod en fejl under overførsel af filen. Prøv venligst igen."
       quit: "Måske senere"
       staff_count:
         one: "Dit fællesskab har %{count} personale medlem (dig)."
@@ -4035,5 +4912,6 @@ da:
           regular: "Fast bruger"
       previews:
         topic_title: "Diskussionsemne"
+        font_title: "%{font} Skrifttype"
         share_button: "Del"
         reply_button: "Svar"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index f6b21fa085..43348c349e 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -158,17 +158,21 @@ de:
     topic_admin_menu: "Themen-Administration"
     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."
+    software_update_prompt:
+      message: "Wir haben diese Seite aktualisiert, <span>bitte aktualisiere</span>, da es sonst zu unerwartetem Verhalten kommen kann."
+      dismiss: "Verwerfen"
     bootstrap_mode_enabled:
       one: "Damit du mit deiner Seite einfacher loslegen kannst, befindest du dich im Starthilfe-Modus. Alle neuen Benutzer erhalten die Vertrauensstufe 1 und bekommen eine tägliche E-Mail-Zusammenfassung. Der Modus wird automatisch deaktiviert, sobald sich mehr als %{count} Benutzer registriert hat."
       other: "Damit du mit deiner Seite einfacher loslegen kannst, befindest du dich im Starthilfe-Modus. Alle neuen Benutzer erhalten die Vertrauensstufe 1 und bekommen eine tägliche E-Mail-Zusammenfassung. Der Modus wird automatisch deaktiviert, sobald sich mehr als %{count} Benutzer registriert haben."
     bootstrap_mode_disabled: "Der Starthilfe-Modus wird in den nächsten 24 Stunden deaktiviert."
     themes:
       default_description: "Standard"
-      broken_theme_alert: "Deine Seite funktioniert vielleicht nicht, weil Theme/Komponent %{theme} Fehler hat. Deaktiviere es in %{path}."
+      broken_theme_alert: "Deine Seite funktioniert vielleicht nicht, weil Theme/Komponente %{theme} Fehler hat. Deaktiviere es in %{path}."
     s3:
       regions:
         ap_northeast_1: "Asien-Pazifik (Tokio)"
         ap_northeast_2: "Asien-Pazifik (Seoul)"
+        ap_east_1: "Asien-Pazifik (Hong Kong)"
         ap_south_1: "Asien-Pazifik (Mumbai)"
         ap_southeast_1: "Asien-Pazifik (Singapur)"
         ap_southeast_2: "Asien-Pazifik (Sydney)"
@@ -187,13 +191,14 @@ de:
         us_gov_west_1: "AWS GovCloud (US-West)"
         us_west_1: "USA West (Nordkalifornien)"
         us_west_2: "USA West (Oregon)"
+    clear_input: "Eingabe löschen"
     edit: "Titel und Kategorie dieses Themas ändern"
     expand: "Aufklappen"
     not_implemented: "Entschuldige, diese Funktion wurde noch nicht implementiert!"
     no_value: "Nein"
     yes_value: "Ja"
     submit: "Absenden"
-    generic_error: "Entschuldige, es ist ein Fehler aufgetreten."
+    generic_error: "Entschuldigung, ein Fehler ist aufgetreten."
     generic_error_with_reason: "Ein Fehler ist aufgetreten: %{error}"
     go_ahead: "Fortfahren"
     sign_up: "Registrieren"
@@ -209,7 +214,7 @@ de:
       other: "Links"
     faq: "FAQ"
     guidelines: "Richtlinien"
-    privacy_policy: "Datenschutzrichtlinie"
+    privacy_policy: "Datenschutzerklärung"
     privacy: "Datenschutz"
     tos: "Nutzungsbedingungen"
     rules: "Regeln"
@@ -221,6 +226,9 @@ de:
     now: "gerade eben"
     read_more: "weiterlesen"
     more: "Mehr"
+    x_more:
+      one: "%{count} weiterer"
+      other: "%{count} weitere"
     less: "Weniger"
     never: "nie"
     every_30_minutes: "alle 30 Minuten"
@@ -249,15 +257,16 @@ de:
       moderators: "Moderatoren"
       stat:
         all_time: "Gesamt"
-        last_7_days: "Letzte 7"
-        last_30_days: "Letzte 30"
+        last_day: "Letzte 24 Stunden"
+        last_7_days: "Letzte 7 Tage"
+        last_30_days: "Letzte 30 Tage"
       like_count: "Likes"
       topic_count: "Themen"
       post_count: "Beiträge"
       user_count: "Benutzer"
       active_user_count: "Aktive Benutzer"
       contact: "Kontaktiere uns"
-      contact_info: "Im Falle eines kritischen Problems oder einer dringenden Sache, die diese Website betreffen, kontaktiere uns bitte unter %{contact_info}."
+      contact_info: "Im Falle eines kritischen Problems oder einer dringenden Sache, die diese Website betrifft, kontaktiere uns bitte unter %{contact_info}."
     bookmarked:
       title: "Lesezeichen setzen"
       clear_bookmarks: "Lesezeichen entfernen"
@@ -286,18 +295,6 @@ de:
       search_placeholder: "Lesezeichen nach Namen, Thementitel oder Beitragsinhalt durchsuchen"
       search: "Suche"
       reminders:
-        later_today: "Im Laufe des Tages"
-        next_business_day: "Nächster Arbeitstag"
-        tomorrow: "Morgen"
-        next_week: "Nächste Woche"
-        post_local_date: "Datum im Beitrag"
-        later_this_week: "Später in dieser Woche"
-        start_of_next_business_week: "Montag"
-        start_of_next_business_week_alt: "Am kommenden Montag"
-        next_month: "Nächsten Monat"
-        custom: "Datum und Uhrzeit auswählen"
-        last_custom: "Zuletzt gewählter Termin"
-        none: "Keine Erinnerung erforderlich"
         today_with_time: "heute um %{time}"
         tomorrow_with_time: "morgen um %{time}"
         at_time: "am %{date_time}"
@@ -309,12 +306,12 @@ de:
       remove: "Entfernen"
       remove_confirmation: "Bist du sicher, dass du diese Vorlage löschen möchtest?"
       new_topic: "Neues Thema Entwurf"
-      new_private_message: "Neuer privater Nachrichten Entwurf"
+      new_private_message: "Neuer Entwurf für private Nachrichten"
       topic_reply: "Antwort Entwurf"
       abandon:
-        confirm: "Du hast schon einen anderen Entwurf in diesem Thema geöffnet. Bist du sicher, dass du ihn verwerfen möchtest?"
-        yes_value: "Ja, verwerfen"
-        no_value: "Nein, behalten"
+        confirm: "Du hast einen Entwurf für dieses Thema in Arbeit. Was würdest du gerne damit machen?"
+        yes_value: "Verwerfen"
+        no_value: "Bearbeitung fortsetzen"
     topic_count_latest:
       one: "Zeige %{count} neues oder aktualisiertes Thema"
       other: "Zeige %{count} neue oder aktualisierte Themen"
@@ -333,6 +330,7 @@ de:
     upload: "Hochladen"
     uploading: "Wird hochgeladen…"
     uploading_filename: "wird hochgeladen: %{filename}..."
+    processing_filename: "wird verarbeitet: %{filename}..."
     clipboard: "Zwischenablage"
     uploaded: "Hochgeladen!"
     pasting: "Einfügen..."
@@ -342,10 +340,10 @@ de:
     undo: "Rückgängig machen"
     revert: "Verwerfen"
     failed: "Fehlgeschlagen"
-    switch_to_anon: "Anonymen Modus beginnen"
-    switch_from_anon: "Anonymen Modus beenden"
+    switch_to_anon: "Anonymen Modus aktivieren"
+    switch_from_anon: "Anonymen Modus deaktivieren"
     banner:
-      close: "Diesen Banner ausblenden."
+      close: "Dieses Banner ausblenden."
       edit: "Diesen Ankündigungsbanner bearbeiten >>"
     pwa:
       install_banner: "Möchtest du <a href>%{title} auf diesem Gerät installieren?</a>"
@@ -360,7 +358,7 @@ de:
         search: "Suche nach einer Nachricht"
         placeholder: "Gebe denn Nachrichten Titel, URL oder id hier ein"
     review:
-      order_by: "beauftragt von"
+      order_by: "Sortieren nach"
       in_reply_to: "Antwort auf"
       explain:
         why: "Erkläre, warum dieses Element in der Warteschlange gelandet ist"
@@ -399,7 +397,7 @@ de:
         title: "Einstellungen"
         priorities:
           title: "Überprüfbare Prioritäten"
-      moderation_history: "Moderationshistorie"
+      moderation_history: "Moderationsverlauf"
       view_all: "Alle anzeigen"
       grouped_by_topic: "Gruppiert nach Thema"
       none: "Es sind keine Einträge zur Überprüfung vorhanden."
@@ -411,6 +409,7 @@ de:
       topic: "Thema:"
       filtered_topic: "Du hast nach zu prüfenden Inhalten in einem einzelnen Thema gefiltert."
       filtered_user: "Benutzer"
+      filtered_reviewed_by: "Überprüft von"
       show_all_topics: "Zeige alle Themen"
       deleted_post: "(Beitrag gelöscht)"
       deleted_user: "(Benutzer gelöscht)"
@@ -421,10 +420,11 @@ de:
         email: "E-Mail"
         name: "Name"
         fields: "Felder"
+        reject_reason: "Grund"
       user_percentage:
         summary:
-          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} Meldung insgesamt)"
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} Meldungen insgesamt)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (des letzten Flags)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (der letzten %{count} Flags)"
         agreed:
           one: "%{count}% zugestimmt"
           other: "%{count}% zugestimmt"
@@ -467,13 +467,14 @@ de:
           created_at_asc: "Erstellt am (umgekehrt)"
         priority:
           title: "Minimale Priorität"
-          low: "(irgendein)"
+          any: "(irgendein)"
+          low: "Niedrig"
           medium: "Mittel"
           high: "Hoch"
       conversation:
         view_full: "zeige vollständige Unterhaltung"
       scores:
-        about: "Dieser Wert wird basierend auf der Vertrauensstufe des Meldenden, der Richtigkeit der vorhergehenden Meldungen sowie der Priorität des gemeldeten Elements errechnet."
+        about: "Dieser Wert wird basierend auf der Vertrauensstufe des Meldenden, der Richtigkeit der vorhergehenden Meldungen sowie der Priorität des gemeldeten Elements berechnet."
         score: "Wertung"
         date: "Datum"
         type: "Typ"
@@ -505,6 +506,8 @@ de:
           title: "Beitrag in der Warteschlange"
         reviewable_user:
           title: "Benutzer"
+        reviewable_post:
+          title: "Beitrag"
       approval:
         title: "Beitrag muss genehmigt werden"
         description: "Wir haben deinen neuen Beitrag erhalten. Dieser muss jedoch von einem Moderator genehmigt werden, bevor er angezeigt wird. Bitte habe etwas Geduld."
@@ -513,6 +516,40 @@ de:
           other: "Du hast <strong>%{count}</strong> verbleibende Beiträge."
         ok: "OK"
       example_username: "benutzername"
+      reject_reason:
+        title: "Warum lehnst du diesen Benutzer ab?"
+        send_email: "Ablehnungs-E-Mail senden"
+    relative_time_picker:
+      minutes:
+        one: "Minute"
+        other: "Minuten"
+      hours:
+        one: "Stunde"
+        other: "Stunden"
+      days:
+        one: "Tag"
+        other: "Tage"
+      months:
+        one: "Monat"
+        other: "Monate"
+      years:
+        one: "Jahr"
+        other: "Jahre"
+      relative: "Relativ"
+    time_shortcut:
+      later_today: "Im Laufe des Tages"
+      next_business_day: "Nächster Arbeitstag"
+      tomorrow: "Morgen"
+      next_week: "Nächste Woche"
+      post_local_date: "Datum im Beitrag"
+      later_this_week: "Später in dieser Woche"
+      start_of_next_business_week: "Montag"
+      start_of_next_business_week_alt: "Am kommenden Montag"
+      next_month: "Nächsten Monat"
+      custom: "Datum und Uhrzeit auswählen"
+      relative: "Relative Zeit"
+      none: "Nicht notwendig"
+      last_custom: "Letztes benutzerdefiniertes Datum"
     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"
@@ -599,6 +636,10 @@ de:
             imap_ssl: "SSL für IMAP verwenden"
             username: "Benutzername"
             password: "Passwort"
+          settings:
+            title: "Einstellungen"
+            allow_unknown_sender_topic_replies: "Unbekannte Absender Antworten auf ein Thema erlauben."
+            allow_unknown_sender_topic_replies_hint: "Erlaubt unbekannten Absendern auf Gruppenthemen zu antworten. Wenn dies nicht aktiviert ist, Antworten von E-Mail-Adressen, die nicht bereits im IMAP-E-Mail-Thread enthalten sind oder zum Thema eingeladen werden, werden ein neues Thema erstellen."
           mailboxes:
             synchronized: "Synchronisierte Mailbox"
             none_found: "In diesem E-Mail Konto wurden keine Postfächer gefunden."
@@ -700,7 +741,22 @@ de:
         make_owner_description: "Füge <b>%{username}</b> als Eigentümer dieser Gruppe hinzu"
         remove_owner: "Als Eigentümer entfernen"
         remove_owner_description: "Entferne <b>%{username}</b> als Eigentümer dieser Gruppe"
+        make_primary: "als primär einstellen"
+        make_primary_description: "Dies zur primären Gruppe für <b>%{username}</b> machen"
+        remove_primary: "Als Primär entfernen"
+        remove_primary_description: "Entferne dies als primäre Gruppe für <b>%{username}</b>"
+        remove_members: "Mitglieder entfernen"
+        remove_members_description: "Ausgewählte Benutzer aus dieser Gruppe entfernen"
+        make_owners: "Als Eigentümer hinzufügen"
+        make_owners_description: "Ausgewählte Benutzer Besitzer dieser Gruppe machen"
+        remove_owners: "Besitzer entfernen"
+        remove_owners_description: "Ausgewählte Benutzer als Besitzer dieser Gruppe entfernen"
+        make_all_primary: "Alle als primär machen"
+        make_all_primary_description: "Dies zur primären Gruppe für alle ausgewählten Benutzer machen"
+        remove_all_primary: "Als Primär entfernen"
+        remove_all_primary_description: "Diese Gruppe als primäre Gruppe entfernen"
         owner: "Eigentümer"
+        primary: "Primär"
         forbidden: "Du hast nicht das Recht, die Mitglieder zu sehen."
       topics: "Themen"
       posts: "Beiträge"
@@ -722,7 +778,7 @@ de:
           description: "Du wirst über jeden neuen Beitrag in jeder Nachricht benachrichtigt und die Anzahl neuer Antworten wird angezeigt."
         watching_first_post:
           title: "Ersten Beitrag beobachten"
-          description: "Du wirst über neue Nachrichten in dieser Gruppe informiert, aber nicht über Antworten auf diese Nachrichten. "
+          description: "Du wirst über neue Nachrichten in dieser Gruppe informiert, aber nicht über Antworten auf diese Nachrichten."
         tracking:
           title: "Verfolgen"
           description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet, und die Anzahl neuer Antworten wird angezeigt."
@@ -732,13 +788,13 @@ de:
         muted:
           title: "Stummgeschaltet"
           description: "Du erhältst keine Benachrichtigungen im Zusammenhang mit Nachrichten in dieser Gruppe."
-      flair_url: "Avatar-Hintergrund"
+      flair_url: "Avatar-Flair Bild"
       flair_upload_description: "Verwende quadratische Bilder, die nicht kleiner als 20 x 20 Pixel sind."
-      flair_bg_color: "Avatar-Hintergrundfarbe"
+      flair_bg_color: "Avatar-Flair Hintergrundfarbe"
       flair_bg_color_placeholder: "(Optional) Hex-Farbwert"
-      flair_color: "Avatar-Hintergrundfarbe"
+      flair_color: "Avatar-Flair Farbe"
       flair_color_placeholder: "(Optoinal) Hex-Farbwert"
-      flair_preview_icon: "Vorschau-Icon"
+      flair_preview_icon: "Vorschau Symbol"
       flair_preview_image: "Vorschaubild"
       flair_type:
         icon: "Wähle ein Symbol"
@@ -772,13 +828,21 @@ de:
       posts: "Beiträge"
       topics: "Themen"
       latest: "Aktuelle Themen"
-      latest_by: "neuester Beitrag von"
       toggle_ordering: "Reihenfolge ändern"
       subcategories: "Unterkategorien"
       muted: "Stummgeschaltete Kategorien"
       topic_sentence:
         one: "%{count} Thema"
         other: "%{count} Themen"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "Woche"
+        month: "Monat"
+      topic_stat_all_time:
+        one: "%{number} gesamt"
+        other: "%{number} gesamt"
       topic_stat_sentence_week:
         one: "%{count} neues Thema in der letzten Woche."
         other: "%{count} neue Themen in der letzten Woche."
@@ -833,13 +897,29 @@ de:
         ignore_duration_time_frame_required: "Bitte wähle einen Zeitrahmen aus"
         ignore_no_users: "Du hast keine Benutzer ignoriert."
         ignore_option: "Ignoriert"
-        ignore_option_title: "Du wirst keine Benachrichtigungen zu diesem Benutzer erhalten, und seine Themen und Antworten werden ausgeblendet."
+        ignore_option_title: "Du wirst keine Benachrichtigungen zu dieser Person erhalten und ihre Themen und Antworten werden ausgeblendet."
         add_ignored_user: "Hinzufügen..."
         mute_option: "Stummgeschaltet"
-        mute_option_title: "Du wirst keine Benachrichtigungen zu diesem Benutzer bekommen."
+        mute_option_title: "Du wirst keine Benachrichtigungen zu dieser Person bekommen."
         normal_option: "Normal"
-        normal_option_title: "Du wirst benachrichtigt, wenn dieser Benutzer dir antwortet, dich zitiert oder erwähnt."
+        normal_option_title: "Du wirst benachrichtigt, wenn diese Person dir antwortet, dich zitiert oder erwähnt."
+      notification_schedule:
+        title: "Zeitplan für Benachrichtigungen"
+        label: "Aktiviere den benutzerdefinierten Zeitplan für Benachrichtigungen"
+        tip: "Außerhalb dieser Zeiten wird automatisch der \"Nicht stören\"-Modus aktiviert."
+        midnight: "Mitternacht"
+        none: "keine"
+        monday: "Montag"
+        tuesday: "Dienstag"
+        wednesday: "Mittwoch"
+        thursday: "Donnerstag"
+        friday: "Freitag"
+        saturday: "Samstag"
+        sunday: "Sonntag"
+        to: "bis"
       activity_stream: "Aktivität"
+      read: "Gelesen"
+      read_help: "Kürzlich gelesene Themen"
       preferences: "Einstellungen"
       feature_topic_on_profile:
         open_search: "Wähle ein neues Thema"
@@ -848,7 +928,7 @@ de:
         save: "Speichern"
         clear:
           title: "Filter zurücksetzen"
-          warning: "Willst du wirklich dein Thema entfernen? "
+          warning: "Willst du wirklich dein Thema entfernen?"
       use_current_timezone: "Aktuelle Zeitzone verwenden"
       profile_hidden: "Das öffentliche Profil des Benutzers ist ausgeblendet."
       expand_profile: "Erweitern"
@@ -868,11 +948,20 @@ de:
         perm_denied_expl: "Du hast das Anzeigen von Benachrichtigungen verboten. Aktiviere die Benachrichtigungen über deine Browser-Einstellungen."
         disable: "Benachrichtigungen deaktivieren"
         enable: "Benachrichtigungen aktivieren"
-        each_browser_note: "Hinweis: Du musst diese Einstellung in jedem Browser einzeln ändern."
+        each_browser_note: 'Hinweis: Du musst diese Einstellung in jedem von Dir verwendeten Browser ändern. Alle Benachrichtigungen werden deaktiviert, wenn "Nicht stören" angezeigt wird, unabhängig von dieser Einstellung.'
         consent_prompt: "Möchtest du Live-Benachrichtigungen erhalten, wenn jemand auf deine Beiträge antwortet?"
       dismiss: "Alles gelesen"
       dismiss_notifications: "Alles gelesen"
       dismiss_notifications_tooltip: "Alle ungelesenen Benachrichtigungen als gelesen markieren"
+      no_messages_title: "Du hast keine Nachrichten"
+      no_messages_body: >
+        Benötigst Du ein direktes persönliches Gespräch mit jemandem außerhalb des normalen Gesprächsflusses? Sende ihnen eine Nachricht, indem Sie ihren Avatar auswählst und die %{icon} Nachrichtentaste verwendest.<br><br> Wenn Du Hilfe benötigst, kannst Du <a href='%{aboutUrl}'>Nachricht an einen Mitarbeiter senden</a>.
+      no_bookmarks_title: "Du hast noch nichts mit einem Lesezeichen versehen"
+      no_bookmarks_body: >
+        Beginne Lesezeichen von Beiträgen mit der Schaltfläche %{icon} zu setzen und sie werden hier zum einfachen Nachschlagen aufgeführt. Du kannst auch eine Erinnerung vereinbaren!
+      no_notifications_title: "Du hast noch keine Benachrichtigungen"
+      no_notifications_body: >
+        Du wirst in diesem Panel über für Dich direkt relevante Aktivitäten benachrichtigt einschließlich Antworten auf Deine Themen, wenn jemand mit <b>@mentions</b> Dich erwähnt oder auf Dich antwortet bei Themen, die Du beobachtest. Benachrichtigungen werden auch an Deine E-Mail gesendet, wenn Du dich eine Weile nicht eingeloggt hast. <br><br> Suche nach der %{icon} -Taste, um zu entscheiden, bei welchen Themen, Kategorien und Schlagwörter Du neachrichtigt werden möchtest. Für weiteres schaue in die <a href='%{preferencesUrl}'>Benutzereinstellungen</a>.
       first_notification: "Deine erste Benachrichtigung! Wähle sie aus um fortzufahren."
       dynamic_favicon: "Zeige Anzahl im Browser-Icon"
       skip_new_user_tips:
@@ -880,10 +969,10 @@ de:
         not_first_time: "Nicht dein erstes Mal?"
         skip_link: "Überspringe diese Tipps"
       theme_default_on_all_devices: "Mache dieses Theme zum Standard für alle meine Geräte"
-      color_scheme_default_on_all_devices: "Mache diese Farbschemas zum Standard für alle meine Geräte"
+      color_scheme_default_on_all_devices: "Standard-Farbschema(s) auf allen meinen Geräten festlegen"
       color_scheme: "Farbschema"
       color_schemes:
-        default_description: "Standard"
+        default_description: "Theme Standard"
         disable_dark_scheme: "gleich wie regulär"
         dark_instructions: "Du kannst das dunkle Farbschema ausprobieren, indem du das dunkle Design auf deinem Gerät einschaltest."
         undo: "Zurücksetzen"
@@ -987,6 +1076,7 @@ de:
         tags: "Schlagwörter"
       preferences_nav:
         account: "Konto"
+        security: "Sicherheit"
         profile: "Profil"
         emails: "E-Mails"
         notifications: "Benachrichtigungen"
@@ -1098,6 +1188,7 @@ de:
         uploaded_avatar_empty: "Eigenes Bild hinzufügen"
         upload_title: "Lade dein Bild hoch"
         image_is_not_a_square: "Achtung: Wir haben dein Bild zugeschnitten, weil Höhe und Breite nicht übereingestimmt haben."
+        logo_small: "Das kleine Logo der Website. Es wird standardmäßig verwendet."
       change_profile_background:
         title: "Profil Kopfzeile"
         instructions: "Profil Kopfzeilen werden zentriert und haben eine Standardbreite von 1110px."
@@ -1120,7 +1211,7 @@ de:
         set_primary: "Primäre E-Mail Adresse festlegen"
         destroy: "E-Mail entfernen"
         add_email: "Alternative E-Mail Adresse hinzufügen"
-        sso_override_instructions: "E-Mail kann vom SSO-Provider aktualisiert werden."
+        auth_override_instructions: "E-Mails können vom Authentifizierungsanbieter aktualisiert werden."
         no_secondary: "Keine weiteren E-Mail-Adressen"
         instructions: "Nie öffentlich gezeigt."
         admin_note: "Hinweis: Ein Administrator, der die E-Mail-Adresse eines anderen Nicht-Administratorbenutzers ändert, zeigt an, dass der Benutzer den Zugriff auf sein ursprüngliches E-Mail-Konto verloren hat. Daher wird eine E-Mail zum Zurücksetzen des Kennworts an seine neue Adresse gesendet. Die E-Mail-Adresse des Benutzers ändert sich erst, wenn der Vorgang zum Zurücksetzen des Kennworts abgeschlossen ist."
@@ -1128,6 +1219,7 @@ de:
         required: "Bitte gib eine E-Mail Adresse ein"
         invalid: "Bitte gib eine gültige E-Mail-Adresse ein"
         authenticated: "Deine E-Mail-Adresse wurde von %{provider} bestätigt"
+        invite_auth_email_invalid: "Ihre Einladungs-E-Mail stimmt nicht mit der von %{provider} authentifizierten E-Mail überein"
         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."
@@ -1138,9 +1230,9 @@ de:
         revoke: "Entziehen"
         cancel: "Abbrechen"
         not_connected: "(nicht verbunden)"
-        confirm_modal_title: "Verbinde %{provider} Konto "
+        confirm_modal_title: "Verbinde %{provider} Konto"
         confirm_description:
-          account_specific: "Dein %{provider} Konto '%{account_description}' wird für die Authentifizierung genutzt werden. "
+          account_specific: "Dein %{provider} Konto '%{account_description}' wird für die Authentifizierung genutzt werden."
           generic: "Dein %{provider} Konto wird für die Authentifzierung genutzt werden."
       name:
         title: "Name"
@@ -1161,6 +1253,7 @@ de:
         checking: "Verfügbarkeit wird geprüft…"
         prefilled: "E-Mail-Adresse entspricht diesem registrierten Benutzernamen"
         required: "Bitte einen Benutzernamen eingeben"
+        edit: "Benutzername bearbeiten"
       locale:
         title: "Oberflächensprache"
         instructions: "Die Sprache der Forumsoberfläche. Diese Änderung tritt nach dem Neuladen der Seite in Kraft."
@@ -1257,47 +1350,47 @@ de:
         after_10_minutes: "nach 10 Minuten"
       notification_level_when_replying: "Wenn ich in einem Thema antworte, setze das Thema auf"
       invited:
-        search: "zum Suchen nach Einladungen hier eingeben…"
         title: "Einladungen"
+        pending_tab: "Ausstehend"
+        pending_tab_with_count: "Ausstehend (%{count})"
+        expired_tab: "Abgelaufen"
+        expired_tab_with_count: "Abgelaufen (%{count})"
+        redeemed_tab: "Angenommen"
+        redeemed_tab_with_count: "Angenommen (%{count})"
+        invited_via: "Einladung"
+        invited_via_link: "Link %{key} (%{count} / %{max} eingelöst)"
+        groups: "Gruppen"
+        topic: "Thema"
+        sent: "Erstellt/Zuletzt gesendet"
+        expires_at: "Gültig bis"
+        edit: "Bearbeiten"
+        remove: "Entfernen"
+        copy_link: "Link abrufen"
+        reinvite: "E-Mail erneut senden"
+        reinvited: "Einladung erneut gesendet"
+        removed: "Entfernt"
+        search: "zum Suchen nach Einladungen hier eingeben…"
         user: "Eingeladener Benutzer"
-        sent: "zuletzt gesendet"
         none: "Keine Einladungen anzuzeigen."
         truncated:
           one: "Zeige die erste Einladung."
           other: "Zeige die ersten %{count} Einladungen."
         redeemed: "Angenommene Einladungen"
-        redeemed_tab: "Angenommen"
-        redeemed_tab_with_count: "Angenommen (%{count})"
         redeemed_at: "Angenommen"
         pending: "Ausstehende Einladungen"
-        pending_tab: "Ausstehend"
-        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: "Abgelaufene Einladungen entfernen"
-        rescinded_all: "Alle abgelaufenen Einladungen entfernt!"
-        rescind_all_confirm: "Sollen alle abgelaufenen Einladungen entfernt werden?"
-        reinvite: "Einladung erneut senden"
+        remove_all: "Abgelaufene Einladungen entfernen"
+        removed_all: "Alle abgelaufenen Einladungen entfernt!"
+        remove_all_confirm: "Sollen alle abgelaufenen Einladungen entfernt werden?"
         reinvite_all: "Alle Einladungen erneut senden"
         reinvite_all_confirm: "Bist Du dir sicher alle Einladungen nochmals zu senden?"
-        reinvited: "Einladung erneut gesendet"
-        reinvited_all: "Alle Einladungen erneut gesendet!"
+        reinvited_all: "Alle Einladungen gesendet!"
         time_read: "Lesezeit"
         days_visited: "Besuchstage"
         account_age_days: "Konto-Alter in Tagen"
-        source: "Eingeladen über"
-        links_tab: "Links"
-        links_tab_with_count: "Links (%{count})"
-        link_url: "Link"
-        link_created_at: "Erstellt"
-        link_redemption_stats: "Rücknahmen"
-        link_groups: Gruppen
-        link_expires_at: Gültig bis
         create: "Einladen"
-        copy_link: "Link anzeigen"
         generate_link: "Einladungslink erstellen"
         link_generated: "Hier ist dein Einladungslink!"
         valid_for: "Der Einladungslink ist nur für die Adresse %{email} gültig"
@@ -1309,12 +1402,36 @@ de:
           error: "Beim Erstellen des Einladungslinks ist ein Fehler aufgetreten"
           max_redemptions_allowed_label: "Wie viele Personen dürfen sich über diesen Link registrieren?"
           expires_at: "Wann läuft dieser Einladungslink ab?"
+        invite:
+          new_title: "Einladung erstellen"
+          edit_title: "Einladung bearbeiten"
+          instructions: "Teile diesen Link, um sofort Zugriff auf folgende Seite zu gewähren:"
+          copy_link: "Link kopieren"
+          expires_in_time: "Läuft in %{time} ab."
+          expired_at_time: "Abgelaufen um %{time}."
+          show_advanced: "Erweiterte Optionen anzeigen"
+          hide_advanced: "Erweiterte Optionen ausblenden"
+          restrict_email: "Einladung auf eine E-Mail-Adresse beschränken"
+          max_redemptions_allowed: "Maximale Anzahl an Verwendungen:"
+          add_to_groups: "Zu Gruppen hinzufügen:"
+          invite_to_topic: "Beim ersten Login zum Thema senden:"
+          expires_at: "Verfällt nach:"
+          custom_message: "Optionale persönliche Nachricht:"
+          send_invite_email: "Speichern und E-Mail senden"
+          save_invite: "Einladung speichern"
+          invite_saved: "Einladung gespeichert."
+          invite_copied: "Einladungslink kopiert."
+          blank_email: "Einladungslink nicht kopiert. E-Mailadresse wird benötigt."
         bulk_invite:
           none: "Keine Einladungen, die auf dieser Seite angezeigt werden können."
           text: "Massen-Einladung"
+          instructions: |
+            <p>Lade eine Liste von Benutzern ein, um deine Community schnell in Gang zu bringen. Bereite eine <a href="https://de.wikipedia.org/wiki/CSV_(Dateiformat)" target="_blank">CSV-Datei</a> mit mindestens einer Zeile pro E-Mail-Adresse vor, die du einladen möchtest. Die folgenden kommaseparierten Informationen können zur Verfügung gestellt werden, wenn du Personen zu Gruppen hinzufügen oder sie bei der ersten Anmeldung an ein bestimmtes Thema senden möchtest.</p>
+            <pre>max@mustermann.de,erster_gruppenname;zweiter_gruppenname,topic_id</pre>
+            <p>An jede E-Mail-Adresse in deiner hochgeladenen CSV-Datei wird eine Einladung gesendet. Du kannst diese später verwalten.</p>
+          progress: "Hochgeladen %{progress}%..."
           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."
       password:
         title: "Passwort"
         too_short: "Dein Passwort ist zu kurz."
@@ -1339,11 +1456,11 @@ de:
           one: "gegeben"
           other: "gegeben"
         likes_received:
-          one: "vergeben"
+          one: "erhalten"
           other: "erhalten"
         days_visited:
-          one: "Tag vorbeigekommen"
-          other: "Tage vorbeigekommen"
+          one: "Besuchstag"
+          other: "Besuchstage"
         topics_entered:
           one: "betrachtetes Thema"
           other: "betrachtete Themen"
@@ -1378,6 +1495,8 @@ de:
       avatar:
         title: "Profilbild"
         header_title: "Profil, Nachrichten, Lesezeichen und Einstellungen"
+        name_and_description: "%{name} - %{description}"
+        edit: "Profilbild bearbeiten"
       title:
         title: "Titel"
         none: "(keiner)"
@@ -1415,7 +1534,7 @@ de:
       close: "Schließen"
       dismiss_error: "Fehler ignorieren"
     close: "Schließen"
-    assets_changed_confirm: "Diese Website wurde gerade aktualisiert. Neu laden für die neuste Version?"
+    assets_changed_confirm: "Diese Seite hat gerade ein Software-Upgrade erhalten. Jetzt die neueste Version bekommen?"
     logout: "Du wurdest abgemeldet."
     refresh: "Aktualisieren"
     home: "Startseite"
@@ -1435,15 +1554,6 @@ de:
       exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# Fehler/Stunde} other {# Fehler/Stunde}}</a> hat die Grenze der Webseiten-Einstellung von {limit, plural, one {# Fehler/Stunde} other {# Fehler/Stunde}} überschritten."
       exceeded_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}} überschritten."
     learn_more: "mehr erfahren…"
-    all_time: "gesamt"
-    all_time_desc: "Erstellte Themen"
-    year: "Jahr"
-    year_desc: "Themen, die in den letzten 365 Tagen erstellt wurden"
-    month: "Monat"
-    month_desc: "Themen, die in den letzten 30 Tagen erstellt wurden"
-    week: "Woche"
-    week_desc: "Themen, die in den letzten 7 Tagen erstellt wurden"
-    day: "Tag"
     first_post: Erster Beitrag
     mute: Stummschalten
     unmute: Stummschaltung aufheben
@@ -1461,13 +1571,15 @@ de:
       sign_up: "Registrieren"
       hide_session: "Erinnere mich morgen"
       hide_forever: "Nein danke"
-      hidden_for_session: "In Ordnung, ich frag dich morgen wieder. Du kannst dir auch jederzeit unter „Anmelden“ ein Benutzerkonto erstellen."
+      hidden_for_session: "In Ordnung, wir fragen dich morgen wieder. Du kannst dir auch jederzeit unter „Anmelden“ ein Benutzerkonto erstellen."
       intro: "Hallo! Es sieht so aus, als ob dir diese Diskussion gefällt, aber Du hast bislang noch kein Konto angelegt."
       value_prop: "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:
+        one: "Es gibt <b>%{count}</b> Antwort."
+        other: "Es gibt <b>%{count}</b> Antworten."
+      description_time_MF: "Es gibt {replyCount, plural, one {<b>#</b> Antwort} other {<b>#</b> Antworten}} mit einer geschätzten Lesezeit von <b>{readingTime, plural, one {# Minute} other {# Minuten}}</b>."
       enable: "Zusammenfassung vom Thema erstellen"
       disable: "Alle Beiträge anzeigen"
     deleted_filter:
@@ -1492,8 +1604,10 @@ 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."
-      title: "Neues Benutzerkonto erstellen"
+      header_title: "Willkommen!"
+      subheader_title: "Lass uns dein Konto erstellen"
+      disclaimer: "Mit der Registrierung stimmst du der <a href='%{privacy_link}' target='blank'>Datenschutzerklärung</a> und den <a href='%{tos_link}' target='blank'>Nutzungsbedingungen</a> zu."
+      title: "Erstelle dein Konto"
       failed: "Etwas ist fehlgeschlagen. Vielleicht ist diese E-Mail-Adresse bereits registriert. Versuche den 'Passwort vergessen'-Link."
     forgot_password:
       title: "Passwort zurücksetzen"
@@ -1512,6 +1626,7 @@ de:
     email_login:
       link_label: "Sende mir einen Anmeldelink"
       button_label: "über E-Mail"
+      login_link: "Überspringe das Passwort; Schicke mir einen Login-Link per E-Mail"
       emoji: "Emoji sperren"
       complete_username: "Sofern ein Benutzerkonto mit dem Benutzername <b>%{username}</b> existiert, solltest du in Kürze eine E-Mail mit einem Anmeldelink erhalten."
       complete_email: "Sofern ein Benutzerkonto für <b>%{email}</b> existiert, solltest du in Kürze eine E-Mail mit einem Anmeldelink erhalten."
@@ -1523,6 +1638,8 @@ de:
       logging_in_as: Anmeldung als %{email}
       confirm_button: Anmeldung fertigstellen
     login:
+      header_title: "Willkommen zurück"
+      subheader_title: "Bei deinem Konto anmelden"
       title: "Anmelden"
       username: "Benutzername"
       password: "Passwort"
@@ -1538,7 +1655,7 @@ de:
       security_key_not_allowed_error: "Der Authentifizierungsprozess für den Sicherheitsschlüssel ist abgelaufen oder wurde abgebrochen."
       security_key_no_matching_credential_error: "Im angegebenen Sicherheitsschlüssel wurden keine übereinstimmenden Anmeldeinformationen gefunden."
       security_key_support_missing_error: "Dein aktuelles Gerät oder Browser unterstützt die Verwendung von Sicherheitsschlüsseln nicht. Bitte verwende eine andere Methode."
-      email_placeholder: "E-Mail oder Benutzername"
+      email_placeholder: "E-Mail / Benutzername"
       caps_lock_warning: "Feststelltaste ist aktiviert"
       error: "Unbekannter Fehler"
       cookies_error: "Dein Browser scheint Cookies deaktiviert zu haben. Du kannst dich möglicherweise nicht anmelden, ohne diese zuerst zu aktivieren"
@@ -1591,7 +1708,7 @@ de:
       accept_title: "Einladung"
       emoji: "Umschlag Emoji"
       welcome_to: "Willkommen bei %{site_name}!"
-      invited_by: "Du wurdest eingeladen von: "
+      invited_by: "Du wurdest eingeladen von:"
       social_login_available: "Du wirst dich auch über andere sozialen Netzwerken mit dieser E-Mail-Adresse anmelden können."
       your_email: "Die E-Mail-Adresse deines Benutzerkontos ist <b>%{email}</b>"
       accept_invite: "Einladung annehmen"
@@ -1605,7 +1722,6 @@ de:
       apple_international: "Apple"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (früher EmojiOne)"
       win10: "Windows 10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1634,28 +1750,30 @@ de:
         one: "+ %{count} Unterkategorie"
         other: "+ %{count} Unterkategorien"
     select_kit:
+      filter_by: "Filtern nach: %{name}"
+      select_to_filter: "Wählen Sie einen zu filternden Wert aus"
       default_header_text: Auswählen…
       no_content: Keine Treffer gefunden
       filter_placeholder: Suchen…
       filter_placeholder_with_any: Suchen oder erzeugen
       create: "Erstelle: '%{content}'"
       max_content_reached:
-        one: "Du kannst nur einen Eintrag auswählen."
+        one: "Du kannst nur %{count} Eintrag auswählen."
         other: "Du kannst nur %{count} Einträge auswählen."
       min_content_not_reached:
-        one: "Wähle mindestens einen Eintrag aus."
+        one: "Wähle mindestens %{count} Eintrag aus."
         other: "Wähle mindestens %{count} Einträge aus."
       invalid_selection_length:
         one: "Die Auswahl muss mindestens %{count} Zeichen umfassen."
         other: "Die Auswahl muss aus mindestens %{count} Zeichen bestehen."
       components:
+        tag_drop:
+          filter_for_more: Filtern nach mehr...
         categories_admin_dropdown:
           title: "Kategorien verwalten"
     date_time_picker:
       from: Von
       to: An
-      errors:
-        to_before_from: "Das Datum muss später als das von-Datum sein."
     emoji_picker:
       filter_placeholder: Emoji suchen
       smileys_&_emotion: Smileys und Emotion
@@ -1677,7 +1795,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: "Dieses Thema ist nur für diejenigen sichtbar, die gemeinsame Entwürfe veröffentlichen können."
       destination_category: "Ziel-Kategorie"
       publish: "Gemeinsame Vorlage veröffentlichen"
       confirm_publish: "Bist du sicher, dass du diese Vorlage veröffentlichten möchtest?"
@@ -1688,7 +1806,6 @@ de:
       options: "Optionen"
       whisper: "flüstern"
       unlist: "unsichtbar"
-      blockquote_text: "Blockquote"
       add_warning: "Dies ist eine offizielle Warnung."
       toggle_whisper: "Flüstermodus umschalten"
       toggle_unlisted: "Sichtbarkeit umschalten"
@@ -1701,7 +1818,7 @@ de:
         one: "<b>Warnung!</b> Du erwähnst <a href='%{group_link}'>%{group}</a>, jedoch übersteigt die Mitgliederzahl der Gruppe das vom Administrator konfigurierte Erwähnungslimit von %{count} Benutzer. Deshalb wird niemand benachrichtigt."
         other: "<b>Warnung!</b> Du erwähnst <a href='%{group_link}'>%{group}</a>, jedoch übersteigt die Mitgliederzahl der Gruppe das vom Administrator konfigurierte Erwähnungslimit von %{count} Benutzern. Deshalb wird niemand benachrichtigt."
       group_mentioned:
-        one: "Indem du %{group} erwähnst, bist du dabei, <a href='%{group_link}'>eine Person</a> zu benachrichtigen – bist du dir sicher?"
+        one: "Indem du %{group} erwähnst, bist du dabei, <a href='%{group_link}'>%{count} Person</a> zu benachrichtigen – bist du dir sicher?"
         other: "Indem du %{group} erwähnst, bist du dabei, <a href='%{group_link}'>%{count} Personen</a> zu benachrichtigen – bist du dir sicher?"
       cannot_see_mention:
         category: "Du hast %{username} erwähnt, aber diese Person wird nicht benachrichtigt da sie keinen Zugriff auf diese Kategorie hat. Füge sie einer Gruppe hinzu die Zugriff auf diese Kategorie hat."
@@ -1710,10 +1827,16 @@ de:
       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:
+          one: "Titel muss mindestens %{count} Zeichen lang sein"
+          other: "Titel muss mindestens %{count} Zeichen lang sein"
+        title_too_long:
+          one: "Titel darf maximal %{count} Zeichen lang sein"
+          other: "Titel darf maximal %{count} Zeichen lang sein"
         post_missing: "Beitrag darf nicht leer sein"
-        post_length: "Beitrag muss mindestens %{min} Zeichen lang sein"
+        post_length:
+          one: "Beitrag muss mindestens %{count} Zeichen lang sein"
+          other: "Beitrag muss mindestens %{count} Zeichen lang sein"
         try_like: "Hast du schon die %{heart}-Schaltfläche ausprobiert?"
         category_missing: "Du musst eine Kategorie auswählen"
         tags_missing:
@@ -1746,8 +1869,8 @@ de:
       saved: "Gespeichert!"
       saved_draft: "Beitrags-Entwurf vorhanden. Tippen, um fortzusetzen."
       uploading: "Wird hochgeladen…"
-      show_preview: "Vorschau anzeigen &raquo;"
-      hide_preview: "&laquo; Vorschau ausblenden"
+      show_preview: "Vorschau zeigen"
+      hide_preview: "Vorschau ausblenden"
       quote_post_title: "Ganzen Beitrag zitieren"
       bold_label: "F"
       bold_title: "Fettgedruckt"
@@ -1760,8 +1883,8 @@ de:
       link_dialog_title: "Link einfügen"
       link_optional_text: "Optionaler Titel"
       link_url_placeholder: "Füge eine URL ein oder tippe, um die Themen zu durchsuchen"
-      quote_title: "Zitat"
-      quote_text: "Zitat"
+      blockquote_title: "Blockquote"
+      blockquote_text: "Blockquote"
       code_title: "Vorformatierter Text"
       code_text: "vorformatierten Text mit 4 Leerzeichen einrücken"
       paste_code_text: "Tippe oder füge den Code hier ein"
@@ -1786,7 +1909,7 @@ de:
         title: "Hast du vergessen Empfänger hinzuzufügen?"
         body: "Im Augenblick wird diese Nachricht nur an dich selbst gesendet!"
       slow_mode:
-        error: "Dieses Thema befindet sich im langsamen Modus. Um eine durchdachte Diskussion zu fördern, können Sie nur einmal pro %{duration} posten."
+        error: "Dieses Thema befindet sich im langsamen Modus. Du hast bereits kürzlich gepostet. Du kannst erneut in %{timeLeft}posten."
       admin_options_title: "Optionale Team-Einstellungen für dieses Thema"
       composer_actions:
         reply: Antworten
@@ -1815,7 +1938,7 @@ de:
           label: "Neues Thema"
         shared_draft:
           label: "Gemeinsame Vorlage"
-          desc: "Entwerfe ein Thema, das nur für das Team sichtbar ist."
+          desc: "Entwurf eines Themas, das nur für erlaubte Benutzer sichtbar ist"
         toggle_topic_bump:
           label: "Bump des Themas umschalten"
           desc: "Antworten ohne das Datum der neuesten Antwort zu ändern"
@@ -1865,7 +1988,7 @@ de:
       membership_request_accepted: "Mitgliedschaft akzeptiert in '%{group_name}' "
       membership_request_consolidated:
         one: "%{count} offene Mitgliedschaftsanfrage für '%{group_name}'"
-        other: "%{count} offene Mitgliedschaftanfragen für '%{group_name}'"
+        other: "%{count} offene Mitgliedschaftsanfragen für '%{group_name}'"
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - abgeschlossen"
@@ -1915,14 +2038,15 @@ 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"
       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 auf deinem Gerät gespeicherte Bilder oder Dateien aus"
       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"
       select_file: "Datei auswählen"
       default_image_alt_text: Bild
+      supported_formats: "unterstützte Formate"
     search:
       sort_by: "Sortieren nach"
       relevance: "Relevanz"
@@ -1948,6 +2072,7 @@ de:
       or_search_google: "Oder versuche stattdessen mit Google zu suchen:"
       search_google: "Versuche stattdessen mit Google zu suchen:"
       search_google_button: "Google"
+      search_button: "Suche"
       context:
         user: "Beiträge von @%{username} durchsuchen"
         category: "Kategorie #%{category} durchsuchen"
@@ -2013,7 +2138,7 @@ de:
     go_back: "zurückgehen"
     not_logged_in_user: "Benutzerseite mit einer Zusammenfassung der Benutzeraktivitäten und Einstellungen"
     current_user: "zu deiner Benutzerseite gehen"
-    view_all: "alle ansehen"
+    view_all: "Alle anzeigen %{tab}"
     topics:
       new_messages_marker: "letzter Besuch"
       bulk:
@@ -2034,7 +2159,9 @@ de:
         change_category: "Kategorie auswählen"
         close_topics: "Themen schließen"
         archive_topics: "Themen archivieren"
+        move_messages_to_inbox: "In Posteingang verschieben"
         notification_level: "Benachrichtigungen"
+        change_notification_level: "Benachrichtigungsstufe ändern"
         choose_new_category: "Neue Kategorie für die gewählten Themen:"
         selected:
           one: "Du hast <b>ein</b> Thema ausgewählt."
@@ -2044,7 +2171,10 @@ de:
         choose_new_tags: "Neue Schlagwörter für die gewählten Themen wählen:"
         choose_append_tags: "Wähle neue Schlagwörter, die diesen Themen hinzugefügt werden sollen:"
         changed_tags: "Die Schlagwörter der gewählten Themen wurden geändert."
-        remove_tags: "Tags entfernen"
+        remove_tags: "Alle Tags entfernen"
+        confirm_remove_tags:
+          one: "Alle Tags werden aus diesem Thema entfernt. Sind Sie sicher?"
+          other: "Alle Tags werden aus <b>%{count}</b> Themen entfernt. Sind Sie sicher?"
         progress:
           one: "Fortschritt: <strong>%{count}</strong> Thema"
           other: "Fortschritt: <strong>%{count}</strong> Themen"
@@ -2060,7 +2190,7 @@ de:
         top: "Es gibt keine Top-Themen."
         educate:
           new: '<p>Ihre neuen Themen werden hier angezeigt. Standardmäßig gelten Themen als neu und zeigen einen Indikator <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> an, wenn sie in den letzten 2 Tagen erstellt wurden.</p><p>Besuchen Sie Ihre <a href="%{userPrefsUrl}">Einstellungen</a> , um dies zu ändern.</p>'
-          unread: '<p>Hier werden deine ungelesenen Themen angezeigt.</p><p>Die Anzahl der ungelesenen Beiträge wird standardmäßig als <span class="badge new-posts badge-notification">1</span> neben den Themen angezeigt, wenn du:</p><ul><li>das Thema erstellt hast</li><li>auf das Thema geantwortet hast</li><li>das Thema länger als 4 Minuten gelesen hast</li></ul><p>Außerdem werden jene Themen berücksichtigt, die du in den Benachrichtigungseinstellungen am Ende eines jeden Themas ausdrücklich auf Beobachten oder Verfolgen gesetzt hast.</p><p>Du kannst das in deinen <a href="%{userPrefsUrl}">Einstellungen</a> ändern.</p>'
+          unread: "<p>Hier werden deine ungelesenen Themen angezeigt.</p><p>Die Anzahl der ungelesenen Beiträge wird standardmäßig als <span class=\"badge new-posts badge-notification\">1</span> neben den Themen angezeigt, wenn du:</p><ul><li>das Thema erstellt hast</li><li>auf das Thema geantwortet hast</li><li>das Thema länger als 4 Minuten gelesen hast</li></ul><p>Außerdem werden jene Themen berücksichtigt, die du in den Benachrichtigungseinstellungen eines jeden Themas mittels der \U0001F514 ausdrücklich auf Beobachten oder Verfolgen gesetzt hast.</p><p>Du kannst das in deinen <a href=\"%{userPrefsUrl}\">Einstellungen</a> ändern.</p>"
       bottom:
         latest: "Das waren die aktuellen Themen."
         posted: "Das waren alle Themen."
@@ -2149,21 +2279,27 @@ de:
       slow_mode_update:
         title: "Langsamer Modus"
         select: "Benutzer dürfen nur einmal in diesem Thema schreiben:"
-        description: "Um eine durchdachte Diskussion in schnellen oder umstrittenen Diskussionen zu fördern, müssen Benutzer warten, bevor sie in diesem Thema erneut posten."
+        description: "Um in schnellen oder umstrittenen Diskussionen eine durchdachte Diskussion zu fördern, müssen Benutzer warten, bevor sie in diesem Thema erneut einen Beitrag verfassen können."
         save: "Aktivieren"
+        enabled_until: "Aktiviert bis:"
         remove: "Deaktivieren"
         hours: "Stunden:"
         minutes: "Minuten:"
         seconds: "Sekunden:"
         durations:
+          10_minutes: "10 Minuten"
           15_minutes: "15 Minuten"
+          30_minutes: "30 Minuten"
+          45_minutes: "45 Minuten"
           1_hour: "1 Stunde"
+          2_hours: "2 Stunden"
           4_hours: "4 Stunden"
-          1_day: "1 Tag"
-          1_week: "1 Woche"
+          8_hours: "8 Stunden"
+          12_hours: "12 Stunden"
+          24_hours: "24 Stunden"
           custom: "Benutzerdefinierte Dauer"
       slow_mode_notice:
-        duration: "Du musst zwischen dem Verfassen von Beiträgen %{duration} warten."
+        duration: "Bitte zwischen dem Verfassen von Beiträgen %{duration} warten."
       topic_status_update:
         title: "Zeitschaltuhren"
         save: "Zeitschaltuhr aktivieren"
@@ -2172,7 +2308,9 @@ de:
         remove: "Zeitschaltuhr deaktivieren"
         publish_to: "Veröffentlichen in:"
         when: "Wann:"
-        time_frame_required: Bitte wähle einen Zeitrahmen aus
+        time_frame_required: "Bitte wähle einen Zeitrahmen aus"
+        min_duration: "Die Dauer muss größer als 0 sein"
+        max_duration: "Dauer muss weniger als 20 Jahre betragen"
       auto_update_input:
         none: "Wähle einen Zeitbereich aus"
         now: "Jetzt"
@@ -2201,9 +2339,11 @@ de:
         title: "Vorübergehend schließen"
       auto_close:
         title: "Thema automatisch schließen"
-        label: "Thema automatisch schließen (Stunden):"
+        label: "Thema automatisch schließen nach:"
         error: "Bitte gib einen gültigen Wert ein."
         based_on_last_post: "Nicht schließen, bevor der letzte Beitrag in dem Thema mindestens so alt ist."
+      auto_close_after_last_post:
+        title: "Thema nach dem letzten Beitrag automatisch schließen"
       auto_delete:
         title: "Thema automatisch löschen"
       auto_bump:
@@ -2216,7 +2356,7 @@ de:
         auto_open: "Dieses Thema wird automatisch geöffnet %{timeLeft}."
         auto_close: "Dieses Thema wird automatisch geschlossen %{timeLeft}."
         auto_publish_to_category: "Dieses Thema wird %{timeLeft} in <a href=%{categoryUrl}>#%{categoryName}</a> veröffentlicht."
-        auto_close_based_on_last_post: "Dieses Thema wird %{duration} nach der letzten Antwort geschlossen."
+        auto_close_after_last_post: "Dieses Thema wird %{duration} nach der letzten Antwort schließen."
         auto_delete: "Dieses Thema wird automatisch gelöscht %{timeLeft}."
         auto_bump: "Dieses Thema wird automatisch nach oben verschoben %{timeLeft}."
         auto_reminder: "Du wirst über dieses Thema erinnert %{timeLeft}."
@@ -2225,6 +2365,9 @@ de:
       auto_close_immediate:
         one: "Der letzte Beitrag in diesem Thema ist bereits eine Stunde alt. Das Thema wird daher sofort geschlossen."
         other: "Der letzte Beitrag in diesem Thema ist bereits %{count} Stunden alt. Das Thema wird daher sofort geschlossen."
+      auto_close_momentarily:
+        one: "Der letzte Beitrag im Thema ist bereits %{count} Stunden alt, daher wird das Thema vorübergehend geschlossen."
+        other: "Der letzte Beitrag im Thema ist bereits %{count} Stunden alt, daher wird das Thema kurzzeitig geschlossen."
       timeline:
         back: "Zurück"
         back_description: "Gehe zurück zum letzten ungelesenen Beitrag"
@@ -2236,7 +2379,9 @@ de:
         go: "Los"
         jump_bottom: "springe zum letzten Beitrag"
         jump_prompt: "springe zu..."
-        jump_prompt_of: "von %{count} Beiträgen"
+        jump_prompt_of:
+          one: "von %{count} Beitrag"
+          other: "von %{count} Beiträgen"
         jump_prompt_long: "Zu ... springen"
         jump_bottom_with_number: "springe zu Beitrag %{post_number}"
         jump_prompt_to_date: "zu Datum"
@@ -2248,12 +2393,15 @@ de:
         reasons:
           mailing_list_mode: "Du hast den Mailinglisten-Modus aktiviert, daher wirst du über Antworten zu diesem Thema per E-Mail benachrichtigt"
           "3_10": "Du wirst Benachrichtigungen erhalten, weil du ein Schlagwort an diesem Thema beobachtest."
+          "3_10_stale": "Du wirst Benachrichtigungen erhalten, weil du ein Schlagwort an diesem Thema beobachtet hast."
           "3_6": "Du wirst Benachrichtigungen erhalten, weil du diese Kategorie beobachtest."
+          "3_6_stale": "Du wirst Benachrichtigungen erhalten, weil du diese Kategorie beobachtet hast."
           "3_5": "Du wirst Benachrichtigungen erhalten, weil dieses Thema automatisch von dir beobachtet wird."
           "3_2": "Du wirst Benachrichtigungen erhalten, weil du dieses Thema beobachtest."
           "3_1": "Du wirst Benachrichtigungen erhalten, weil du dieses Thema erstellt hast."
           "3": "Du wirst Benachrichtigungen erhalten, weil du dieses Thema beobachtest."
           "2_8": "Du wirst eine Anzahl neuer Antworten sehen, weil du diese Kategorie verfolgst."
+          "2_8_stale": "Du wirst eine Anzahl neuer Antworten sehen, weil du diese Kategorie verfolgt hast."
           "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/notifications">dieses Thema gelesen</a> hast.'
@@ -2321,6 +2469,15 @@ de:
         title: "Teilen"
         extended_title: "Link teilen"
         help: "teile einen Link zu diesem Thema"
+        instructions: "Link zu diesem Thema teilen:"
+        copied: "Themen-Link kopiert."
+        notify_users:
+          title: "Benachrichtige"
+          instructions: "Folgende Benutzer über dieses Thema benachrichtigen:"
+          success:
+            one: "%{username} erfolgreich zu diesem Thema benachrichtigt."
+            other: "Alle Benutzer wurden erfolgreich über dieses Thema informiert."
+        invite_users: "Einladen"
       print:
         title: "Drucken"
         help: "Öffne eine Druckfreundliche Version dieses Themas"
@@ -2376,14 +2533,14 @@ de:
         username_placeholder: "Benutzername"
         action: "Einladung versenden"
         help: "per E-Mail oder Benachrichtigung weitere Personen zu diesem Thema einladen"
-        to_forum: "Wir senden deinem Freund eine kurze E-Mail, die es ihm ermöglicht, dem Forum sofort beizutreten. Es ist keine Anmeldung erforderlich."
-        sso_enabled: "Gib den Benutzername der Person ein, die du zu diesem Thema einladen willst."
+        to_forum: "Wir senden eine kurze E-Mail, damit dein/e Freund/in sofort beitreten kann, indem die Person auf einen Link klickt."
+        discourse_connect_enabled: "Gib den Benutzernamen der Person ein, die du zu diesem Thema einladen möchtest."
         to_topic_blank: "Gib den Benutzername oder die E-Mail-Adresse der Person ein, die du zu diesem Thema einladen willst."
         to_topic_email: "Du hast eine E-Mail-Adresse eingegeben. Wir werden eine Einladung versenden, die ein direktes Antworten auf dieses Thema ermöglicht."
         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 eine Einladung an <b>%{invitee}</b>gesendet. Wir werden dich benachrichtigen, wenn die Einladung eingelöst wird. Überprüfe die Registerkarte Einladungen auf deiner Benutzerseite, um deine Einladungen zu verfolgen."
         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."
@@ -2497,8 +2654,8 @@ de:
       edit_reason: "Grund: "
       post_number: "Beitrag %{number}"
       ignored: "Ignorierter Inhalt"
-      wiki_last_edited_on: "Wiki zuletzt bearbeitet am"
-      last_edited_on: "Beitrag zuletzt bearbeitet am"
+      wiki_last_edited_on: "Wiki zuletzt bearbeitet am %{dateTime}"
+      last_edited_on: "Beitrag zuletzt bearbeitet am %{dateTime}"
       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}:"
@@ -2521,6 +2678,7 @@ de:
       has_replies:
         one: "%{count} Antwort"
         other: "%{count} Antworten"
+      has_replies_count: "%{count}"
       unknown_user: "(unbekannt/gelöschter Benutzer)"
       has_likes_title:
         one: "dieser Beitrag gefällt %{count} Person"
@@ -2529,11 +2687,19 @@ de:
       has_likes_title_you:
         one: "dir und einer weiteren Person gefällt dieser Beitrag"
         other: "dir und %{count} weiteren Personen gefällt dieser Beitrag"
+      filtered_replies_hint:
+        one: "Diesen Beitrag und seine Antwort ansehen"
+        other: "Diesen Beitrag und seine %{count} Antworten ansehen"
+      filtered_replies_viewing:
+        one: "Zeige %{count} Antwort an"
+        other: "Zeige %{count} Antworten an"
+      in_reply_to: "Übergeordneten Beitrag laden"
+      view_all_posts: "Alle Beiträge anzeigen"
       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 in einen 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:
           one: "Es kann leider nur %{count} Datei gleichzeitig hochgeladen werden."
@@ -2542,17 +2708,11 @@ de:
         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."
-      abandon_edit:
-        confirm: "Sollen die Änderungen verworfen werden?"
-        no_value: "Nein, behalten"
-        no_save_draft: "Nein, speichere den Entwurf"
-        yes_value: "Ja, Änderungen verwerfen"
-      abandon:
-        title: "Entwurf verwerfen"
-        confirm: "Möchtest du deinen Beitrag wirklich verwerfen?"
-        no_value: "Nein, beibehalten"
-        no_save_draft: "Nein, speichere den Entwurf"
-        yes_value: "Ja, verwerfen"
+      cancel_composer:
+        confirm: "Was würdest du gerne mit deinem Beitrag machen?"
+        discard: "Verwerfen"
+        save_draft: "Entwurf für später speichern"
+        keep_editing: "Weiter bearbeiten"
       via_email: "dieser Beitrag ist per E-Mail eingetroffen"
       via_auto_generated_email: "dieser Beitrag ist als automatisch generierte E-Mail eingegangen"
       whisper: "Dieser Beitrag ist Privat für Moderatoren."
@@ -2600,7 +2760,9 @@ de:
         unlock_post_description: "erlaube, dass der Autor den Beitrag bearbeitet"
         delete_topic_disallowed_modal: "Du hast keine Berechtigung, dieses Thema zu löschen. Wenn du wirklich möchtest, dass es gelöscht wird, melde es mit einer Begründung, um einen Moderator darauf aufmerksam zu machen."
         delete_topic_disallowed: "du hast keine Berechtigung, dieses Thema zu löschen"
-        delete_topic_confirm_modal: "Dieses Thema hat derzeit mehr als %{minViews} Aufrufe und kann ein beliebtes Suchziel sein. Sind Sie sicher, dass Sie dieses Thema vollständig löschen wollen, anstatt es zu bearbeiten, um es zu verbessern?"
+        delete_topic_confirm_modal:
+          one: "Dieses Thema hat derzeit mehr als %{count} Aufruf und kann ein beliebtes Suchziel sein. Sind Sie sicher, dass Sie dieses Thema vollständig löschen wollen, anstatt es zu bearbeiten, um es zu verbessern?"
+          other: "Dieses Thema hat derzeit mehr als %{count} Aufrufe und kann ein beliebtes Suchziel sein. Sind Sie sicher, dass Sie dieses Thema vollständig löschen wollen, anstatt es zu bearbeiten, um es zu verbessern?"
         delete_topic_confirm_modal_yes: "Ja, dieses Thema löschen"
         delete_topic_confirm_modal_no: "Nein, dieses Thema behalten"
         delete_topic_error: "Beim Löschen dieses Themas ist ein Fehler aufgetreten"
@@ -2609,6 +2771,7 @@ de:
         change_post_notice: "Team Notiz ändern"
         delete_post_notice: "Team Notiz löschen"
         remove_timer: "Stoppuhr entfernen"
+        edit_timer: "Timer bearbeiten"
       actions:
         people:
           like:
@@ -2685,6 +2848,18 @@ de:
           edit_bookmark:
             name: "Lesezeichen bearbeiten"
             description: "Ändere den Namen des Lesezeichens oder den Erinnerungszeitpunkt."
+          pin_bookmark:
+            name: "Lesezeichen anheften"
+            description: "Das Lesezeichen anheften, damit es oben auf der Liste der Lesezeichen erscheint."
+          unpin_bookmark:
+            name: "Lesezeichen lösen"
+            description: "Löse das Lesezeichen. Es wird nicht mehr oben in Deiner Lesezeichenliste angezeigt."
+      filtered_replies:
+        viewing_posts_by: "Zeige %{post_count} Beiträge von"
+        viewing_subset: "Einige Antworten sind reduziert"
+        viewing_summary: "Eine Zusammenfassung dieses Themas anzeigen"
+        post_number: "%{username}, Beitrag #%{post_number}"
+        show_all: "Alle anzeigen"
     category:
       can: "kann&hellip; "
       none: "(keine Kategorie)"
@@ -2742,10 +2917,10 @@ de:
         reply: "Antworte"
         create: "Erstelle"
         no_groups_selected: "Es wurde keinen Gruppen Zugriff gewährt. Diese Kategorie ist nur für Mitarbeiter sichtbar."
-        everyone_has_access: "Diese Kategorie ist öffentlich, jeder kann Beiträge sehen, beantworten und erstellen. Entferne eine oder mehrere der Berechtigungen, die der Gruppe \"Jeder\" erteilt wurden, um die Berechtigungen einzuschränken."
+        everyone_has_access: 'Diese Kategorie ist öffentlich, jeder kann Beiträge sehen, beantworten und erstellen. Entferne eine oder mehrere der Berechtigungen, die der Gruppe "Jeder" erteilt wurden, um die Berechtigungen einzuschränken.'
         toggle_reply: "Antwortberechtigung umschalten"
         toggle_full: "Erstellungsberechtigung umschalten"
-        inherited: "Diese Berechtigung wird von \"jedem\" vererbt"
+        inherited: 'Diese Berechtigung wird von "jedem" vererbt'
       special_warning: "Warnung: Diese Kategorie wurde bei der Installation angelegt. Die Sicherheitseinstellungen können daher nicht verändert werden. Wenn du diese Kategorie nicht benötigst, dann solltest du sie löschen anstatt sie für andere Zwecke zu verwenden."
       uncategorized_security_warning: "Diese Kategorie ist etwas Spezielles. Sie dient als Bereich für Themen, die keine Kategorie haben und besitzt keine Sicherheitseinstellungen."
       uncategorized_general_warning: 'Diese Kategorie ist etwas Spezielles. Sie wird als Standard-Kategorie für neue Themen genutzt, für die keine Kategorie ausgewählt wurde. Deaktiviere <a href="%{settingLink}">diese Einstellung</a>, wenn dieses Verhalten verhindert und eine Kategoriewahl erzwungen werden soll. Der Name und die Beschreibung können unter <a href="%{customizeLink}">Anpassen / Textinhalte</a> geändert werden.'
@@ -2753,7 +2928,7 @@ de:
       images: "Bilder"
       email_in: "Benutzerdefinierte Adresse für eingehende E-Mails:"
       email_in_allow_strangers: "Akzeptiere E-Mails von anonymen Benutzern."
-      email_in_disabled: "Das Erstellen von neuen Themen per E-Mail ist in den Website-Einstellungen deaktiviert. Um das Erstellen von neuen Themen per E-Mail zu erlauben,"
+      email_in_disabled: "Das Erstellen von neuen Themen per E-Mail ist in den Website-Einstellungen deaktiviert. Um das Erstellen von neuen Themen per E-Mail zu erlauben, "
       email_in_disabled_click: 'aktiviere die Einstellung „email in“.'
       mailinglist_mirror: "Kategorie spiegelt eine Mailingliste"
       show_subcategory_list: "Zeige Liste von Unterkategorien oberhalb von Themen in dieser Kategorie"
@@ -2761,6 +2936,7 @@ de:
       num_featured_topics: "Anzahl der Themen, die auf der Kategorien-Seite angezeigt werden"
       subcategory_num_featured_topics: "Anzahl beworbener Themen, die auf der Seite der übergeordneten Kategorie angezeigt werden:"
       all_topics_wiki: "Mache neue Themen standardmäßig zu Wikis."
+      allow_unlimited_owner_edits_on_first_post: "Zulassen unbegrenzter Besitzerbearbeitungen beim ersten Beitrag"
       subcategory_list_style: "Listenstil für Unterkategorien"
       sort_order: "Themenliste sortieren nach:"
       default_view: "Standard-Themenliste"
@@ -2775,7 +2951,7 @@ de:
       this_year: "dieses Jahr"
       position: "Position auf der Kategorien-Seite:"
       default_position: "Standardposition"
-      position_disabled: "Kategorien werden in der Reihenfolge der Aktivität angezeigt. Um die Reihenfolge von Kategorien in Listen zu steuern,"
+      position_disabled: "Kategorien werden in der Reihenfolge der Aktivität angezeigt. Um die Reihenfolge von Kategorien in Listen zu steuern, "
       position_disabled_click: 'aktiviere die Einstellung „fixed category positions“.'
       minimum_required_tags: "Minimal Anzahl an Schlagwörtern, die ein Thema erfordert"
       parent: "Übergeordnete Kategorie"
@@ -2784,13 +2960,13 @@ de:
       notifications:
         watching:
           title: "Beobachten"
-          description: "Du wirst automatisch alle neuen Themen in diesen Kategorien beobachten. Du wirst über alle neuen Beiträge in allen Themen benachrichtigt und die Anzahl der neuen Antworten wird angezeigt."
+          description: "Du wirst automatisch alle Themen in dieser Kategorie beobachten. Du wirst über alle neuen Beiträge in allen Themen benachrichtigt und die Anzahl der neuen Antworten wird angezeigt."
         watching_first_post:
           title: "Ersten Beitrag beobachten"
           description: "Du wirst über neue Themen in dieser Kategorie benachrichtigt, aber nicht über Antworten auf diese Themen."
         tracking:
           title: "Verfolgen"
-          description: "Du wirst automatisch alle neuen Themen in diesen Kategorien verfolgen. Du wirst benachrichtigt, wenn jemand deinen @name erwähnt oder dir antwortet, und die Anzahl der neuen Antworten wird angezeigt."
+          description: "Du wirst automatisch alle Themen in dieser Kategorie verfolgen. Du wirst benachrichtigt, wenn jemand deinen @name erwähnt oder dir antwortet, und die Anzahl der neuen Antworten wird angezeigt."
         regular:
           title: "Normal"
           description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet."
@@ -2831,6 +3007,7 @@ de:
       list_filters:
         all: "alle Themen"
         none: "keine Unterkategorien"
+      colors_disabled: "Sie können keine Farben auswählen, da Sie keinen Kategoriestil haben."
     flagging:
       title: "Danke für deine Mithilfe!"
       action: "Beitrag melden"
@@ -2848,6 +3025,7 @@ de:
       notify_action: "Nachricht"
       official_warning: "Offizielle Warnung"
       delete_spammer: "Spammer löschen"
+      flag_for_review: "Warteschlange zur Überprüfung"
       delete_confirm_MF: "Du wirst {POSTS, plural, one {<b>einen</b> Beitrag} other {<b>#</b> Beiträge}} und {TOPICS, plural, one {<b>ein</b> Thema} other {<b>#</b> Themen}} von diesem Benutzer löschen, sein Konto entfernen, seine IP-Adresse <b>{ip_address}</b> für Neuanmeldungen sperren und die E-Mail-Adresse <b>{email}</b> auf eine permanente Sperrliste setzen. Bist du dir sicher, dass dieser Benutzer wirklich ein Spammer ist?"
       yes_delete_spammer: "Ja, lösche den Spammer"
       ip_address_missing: "(nicht verfügbar)"
@@ -2916,7 +3094,11 @@ de:
         help: "Dieses Thema ist eine persönliche Nachricht"
     posts: "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 {}}
+      Dieses Thema hat {count, plural, one {# 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"
     views: "Aufrufe"
     views_lowercase:
@@ -2936,7 +3118,7 @@ de:
       one: "Benutzer"
       other: "Benutzer"
     category_title: "Kategorie"
-    history: "Verlauf"
+    history: "Verlauf, letzte 100 Revisionen"
     changed_by: "von %{author}"
     raw_email:
       title: "Eingegangene E-Mail"
@@ -3024,6 +3206,7 @@ de:
       close: "Schließen (Esc)"
       content_load_error: '<a href="%url%">Der Inhalt</a> konnte nicht geladen werden.'
       image_load_error: '<a href="%url%">Das Bild</a> konnte nicht geladen werden.'
+    cannot_render_video: Dieses Video kann nicht gerendert werden, da Dein Browser den Codec nicht unterstützt.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -3183,7 +3366,7 @@ de:
       sort_by_name: "Name"
       manage_groups: "Schlagwort-Gruppen verwalten"
       manage_groups_description: "Gruppen definieren, um Schlagwörter zu organisieren"
-      upload: "Schlagwärter hochladen"
+      upload: "Schlagwörter hochladen"
       upload_description: "Lade eine CSV-Datei hoch, um mehrere Schlagwörter auf einmal zu erstellen"
       upload_instructions: "Eine pro Zeile, optional mit einer Schlagwortgruppe nach dem Schema 'schlagwort_name,schlagwort_gruppe'."
       upload_successful: "Schlagwörter erfolgreich hochgeladen"
@@ -3194,6 +3377,7 @@ de:
         one: "%{tags} und%{count} weiteres"
         other: "%{tags} und %{count} weitere"
       delete_no_unused_tags: "Es gibt keine ungenutzten Schlagwörter."
+      tag_list_joiner: ", "
       delete_unused: "Nicht verwendete Schlagwörter löschen"
       delete_unused_description: "Alle Schlagwörter löschen, die keinem Thema und keiner Nachricht zugewiesen sind."
       cancel_delete_unused: "Abbrechen"
@@ -3234,6 +3418,7 @@ de:
         everyone_can_use: "Schlagwörter können von jedem verwendet werden"
         usable_only_by_groups: "Schlagwörter sind für jeden sichtbar, aber nur die folgenden Gruppen können sie benutzen"
         visible_only_to_groups: "Tags sind nur für folgende Gruppen sichtbar"
+        cannot_save: "Schlagwort-Gruppe kann nicht gespeichert werden. Stelle sicher, dass mindestens ein Schlagwort vorhanden ist, der Name der Schlagwort-Gruppe nicht leer ist und eine Gruppe für die Schlagwort-Berechtigung ausgewählt ist."
       topics:
         none:
           unread: "Du hast keine ungelesenen Themen."
@@ -3246,10 +3431,11 @@ de:
     invite:
       custom_message: "Gestalte deine Einladung etwas persönlicher, indem du eine <a href>eigene Nachricht</a> schreibst."
       custom_message_placeholder: "Gib deine persönliche Nachricht ein"
-      approval_not_required: "Der Benutzer wird automatisch genehmigt, sobald er diese Einladung annimmt."
+      approval_not_required: "Benutzer werden beim Annehmen der Einladung sofort automatisch genehmigt."
       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."
+    forced_anonymous_login_required: "Die Website ist extrem belastet und kann derzeit nicht geladen werden. Versuchen Sie es in ein paar Minuten erneut."
     footer_nav:
       back: "Zurück"
       forward: "Vorwärts"
@@ -3258,6 +3444,17 @@ de:
     safe_mode:
       enabled: "Der geschützte Modus ist aktiviert. Schliesse das Browserfenster um ihn zu verlassen."
     image_removed: "(Bild entfernt)"
+    do_not_disturb:
+      title: "Nicht stören für..."
+      label: "Nicht stören"
+      remaining: "%{remaining} verbleibend"
+      options:
+        half_hour: "30 Minuten"
+        one_hour: "1 Stunde"
+        two_hours: "2 Stunden"
+        tomorrow: "Bis morgen"
+        custom: "Benutzerdefiniert"
+      set_schedule: "Zeitplan für Benachrichtigungen festlegen"
   admin_js:
     type_to_filter: "zum Filtern hier eingeben…"
     admin:
@@ -3285,6 +3482,10 @@ de:
         installed_version: "Installiert"
         latest_version: "Neueste"
         problems_found: "Ein paar Ratschläge basierend auf deinen aktuellen Website-Einstellungen"
+        new_features:
+          title: "\U0001F381 Neue Funktionen"
+          dismiss: "Verwerfen"
+          learn_more: "Mehr erfahren"
         last_checked: "Zuletzt geprüft"
         refresh_problems: "Aktualisieren"
         no_problems: "Es wurden keine Probleme gefunden."
@@ -3373,10 +3574,6 @@ de:
             available: "Gruppenname ist verfügbar"
             not_available: "Gruppenname ist nicht verfügbar"
             blank: "Gruppenname darf nicht leer sein"
-        bulk_add:
-          title: "Mehrere der Gruppe hinzufügen"
-          complete_users_not_added: "Diese Benutzer wurden nicht hinzugefügt (stelle sicher, dass sie ein Konto haben):"
-          paste: "Füge eine Liste an Benutzernamen oder E-Mail-Adressen ein (ein Eintrag je Zeile):"
         add_members:
           as_owner: "Mache Benutzer zu Eigentümern dieser Gruppe"
         manage:
@@ -3403,7 +3600,9 @@ 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_user_count: "%{count} Benutzer haben die neuen E-Mail-Domänen und werden der Gruppe hinzugefügt."
+            automatic_membership_user_count:
+              one: "%{count} Benutzer hat die neuen E-Mail-Domänen und wird der Gruppe hinzugefügt."
+              other: "%{count} Benutzer haben die neuen E-Mail-Domänen und werden der Gruppe hinzugefügt."
             primary_group: "Automatisch als Hauptgruppe festlegen"
         name_placeholder: "Gruppenname, keine Leerzeichen, gleiche Regel wie beim Benutzernamen"
         primary: "Hauptgruppe"
@@ -3415,7 +3614,11 @@ de:
         group_members: "Gruppenmitglieder"
         delete: "Löschen"
         delete_confirm: "Diese Gruppe löschen?"
+        delete_with_messages_confirm:
+          one: "Wenn Sie diese Gruppe löschen, wird %{count} Nachricht verwaist, Gruppenmitglieder haben keinen Zugriff mehr darauf.<br><br>Bist du sicher?"
+          other: "Wenn Sie diese Gruppe löschen, werden %{count} Nachrichten verwaist, Gruppenmitglieder haben keinen Zugriff mehr auf sie.<br><br>Bist du sicher?"
         delete_failed: "Gruppe konnte nicht gelöscht werden. Wenn dies eine automatische Gruppe ist, kann sie nicht gelöscht werden."
+        delete_automatic_group: Dies ist eine automatische Gruppe und kann nicht gelöscht werden.
         delete_owner_confirm: "Eigentümerrechte für '%{username}' entfernen?"
         add: "Hinzufügen"
         custom: "Benutzerdefiniert"
@@ -3427,8 +3630,8 @@ de:
         none_selected: "Wähle eine Gruppe, um loszulegen"
         no_custom_groups: "Erstelle eine neue benutzerdefinierte Gruppe"
       api:
-        generate_master: "Master API Key erzeugen"
-        none: "Es gibt momentan keine aktiven API-Keys"
+        generate_master: "Master API Schlüssel erzeugen"
+        none: "Es gibt momentan keine aktiven API Schlüssel"
         user: "Benutzer"
         title: "API"
         key: "Schlüssel"
@@ -3437,7 +3640,7 @@ de:
         last_used: Zuletzt verwendet
         never_used: (nie)
         generate: "Erzeugen"
-        undo_revoke: "Widerrufen zurückziehen"
+        undo_revoke: "Widerruf rückgängig machen"
         revoke: "Widerrufen"
         all_users: "Alle Benutzer"
         active_keys: "Aktive API Schlüssel"
@@ -3454,7 +3657,7 @@ de:
         save: Speichern
         new_key: Neuer API Schlüssel
         revoked: Widerrufen
-        delete: Endgültig gelöscht
+        delete: Endgültig löschen
         not_shown_again: Dieser Schlüssel wird nicht noch einmal angezeigt. Stelle sicher, dass du eine Kopie hast, bevor du fortfährst.
         continue: Weiter
         use_global_key: Globaler Schlüssel (erlaubt alle Aktionen)
@@ -3477,9 +3680,13 @@ de:
               wordpress: Notwendig, damit das WordPress-WP-Diskurs-Plugin funktioniert.
             users:
               bookmarks: Benutzer-Lesezeichen auflisten. Es gibt Lesezeichenerinnerungen zurück, wenn Sie das ICS-Format verwenden.
-              sync_sso: Synchronisieren Sie einen Benutzer mit SSO.
+              sync_sso: Synchronisiere einen Benutzer mit DiscourseConnect.
               show: Informationen über einen Benutzer abrufen.
               check_emails: Benutzer-E-Mails auflisten.
+              update: Benutzerprofil Informationen aktualisieren.
+              log_out: Alle Sitzungen für einen Benutzer abmelden.
+              anonymize: Benutzerkonten anonymisieren.
+              delete: Benutzerkonten löschen.
             email:
               receive_emails: Kombiniere diesen Bereich mit dem E-Mail-Empfänger, um eingehende E-Mails zu verarbeiten.
       web_hooks:
@@ -3524,7 +3731,7 @@ de:
           details: "Wenn auf einen Beitrag geantwortet wird oder der Beitrag geändert, gelöscht oder wiederhergestellt wird."
         user_event:
           name: "Benutzer Ereignis"
-          details: "Wenn sich ein Benutzer anmeldet, abmeldet, erstellt, genehmigt oder aktualisiert wird."
+          details: "Wenn sich ein Benutzer anmeldet, abmeldet, seine E-Mail bestätigt, erstellt, genehmigt oder aktualisiert wird."
         group_event:
           name: "Gruppen-Ereignis"
           details: "Wenn eine Gruppe erstellt, aktualisiert oder gelöscht wird."
@@ -3543,6 +3750,12 @@ de:
         user_badge_event:
           name: "Abzeichen-Verleihungs-Event"
           details: "Wenn ein Benutzer ein Abzeichen erhält."
+        group_user_event:
+          name: "Gruppenbenutzerereignis"
+          details: "Wenn ein Benutzer in einer Gruppe hinzugefügt oder entfernt wird."
+        like_event:
+          name: "Event liken"
+          details: "Wenn ein Benutzer einen Beitrag mag."
         delivery_status:
           title: "Versandstatus"
           inactive: "Inaktiv"
@@ -3610,7 +3823,7 @@ de:
           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."
+          success: "'%{filename}' wurde 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…"
@@ -3731,7 +3944,9 @@ de:
           convert: "Umwandeln"
           convert_component_alert: "Bist Du sicher, dass du diese Komponente in ein Theme umwandeln möchtest? Sie wird als Komponente entfernt von %{relatives}."
           convert_component_tooltip: "Wandle diese Komponente in ein Theme um"
+          convert_component_alert_generic: "Bist du sicher, dass du diese Komponente in das Theme konvertieren möchten?"
           convert_theme_alert: "Bist Du sicher, dass du dieses Theme in eine Komponente umwandeln möchtest? Sie wird als übergeordnetes Element entfernt von %{relatives}."
+          convert_theme_alert_generic: "Bist du sicher, dass du dieses Theme in Komponente konvertieren möchten?"
           convert_theme_tooltip: "Wandle dieses Theme in eine Komponente um"
           inactive_themes: "Inaktive Themes:"
           inactive_components: "Nicht verwendete Komponenten:"
@@ -3765,17 +3980,20 @@ de:
           included_components: "Enthaltene Komponente"
           add_all: "Alle hinzufügen"
           import_web_tip: "Repository mit dem Theme"
+          direct_install_tip: "Möchtest Du wirklich <strong>%{name}</strong> aus dem unten aufgeführten Repository installieren?"
           import_web_advanced: "Erweitert..."
           import_file_tip: ".tar.gz, .zip, oder .dcstyle.json Datei, die ein Theme enthält"
           is_private: "Theme ist in einem privaten Git-Repository"
           remote_branch: "Branch-Name (optional)"
           public_key: "Gewähre dem folgenden öffentlichen Schlüssel den Zugriff auf das Repository:"
+          public_key_note: "Nach Eingabe einer gültigen privaten Repository-URL wird hier ein SSH-Schlüssel generiert und hier angezeigt."
           install: "Installieren"
           installed: "Installiert"
           install_popular: "Beliebt"
           install_upload: "Von deinem Gerät"
           install_git_repo: "Aus einem Git-Repository"
           install_create: "Neu erstellen"
+          duplicate_remote_theme: "Die Theme-Komponente „%{name}“ ist bereits installiert. Möchtest Du wirklich eine weitere Kopie installieren?"
           about_theme: "Über uns"
           license: "Lizenz"
           version: "Version:"
@@ -3805,8 +4023,9 @@ de:
             one: "Theme liegt %{count} Commit zurück!"
             other: "Theme liegt %{count} Commits zurück!"
           compare_commits: "(Siehe neue Beiträge)"
+          remote_theme_edits: "Wenn Du dieses Template bearbeiten möchtest, musst Du <a href='%{repoURL}' target='_blank'>eine Änderung in seinem Projektarchiv einreichen</a>"
           repo_unreachable: "Das Git-Repository dieses Themes konnte nicht kontaktiert werden. Fehlermeldung:"
-          imported_from_archive: "Das Design wurde von eine .zip Datei importiert"
+          imported_from_archive: "Das Design wurde von einer .zip Datei importiert"
           scss:
             text: "CSS"
             title: "Gib benutzerdefiniertes CSS ein, wir akzeptieren alle gültigen CSS und SCSS-Stile"
@@ -3831,9 +4050,7 @@ de:
 
               Beispiel:
 
-              :root {
-              --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};
-              }
+              %{example}
 
               Eigenschaften sollten mit einem Präfix versehen werden, um Konflikte mit Discourse und Plugins zu vermeiden.
           head_tag:
@@ -3845,6 +4062,8 @@ de:
           yaml:
             text: "YAML"
             title: "Definiere Theme-Einstellungen im YAML-Format"
+          scss_color_variables_warning: "Die Verwendung von Core-SCSS-Farbvariablen in Themes ist veraltet. Bitte verwende stattdessen CSS-benutzerdefinierte Eigenschaften. Siehe <a href=\"https://meta.discourse.org/t/-/77551#color-variables-2\" target=\"_blank\">diese Anleitung</a> für weitere Details."
+          scss_warning_inline: "Die Verwendung von Core-SCSS-Farbvariablen in Themes ist veraltet."
         colors:
           select_base:
             title: "Wähle Basis-Farbschema"
@@ -4116,6 +4335,7 @@ de:
             topic_unarchived: "Thema nicht archiviert"
             post_staff_note_create: "team Notiz hinzufügen"
             post_staff_note_destroy: "team Notiz löschen"
+            delete_group: "Gruppe löschen"
         screened_emails:
           title: "Gefilterte E-Mails"
           description: "Wenn jemand ein Konto erstellt, werden die folgenden E-Mail-Adressen überprüft und es wird die Anmeldung blockiert oder eine andere Aktion ausgeführt."
@@ -4163,31 +4383,34 @@ de:
         title: "Beobachtete Wörter"
         search: "Suchen"
         clear_filter: "Zurücksetzen"
-        show_words: "Wörter anzeigen"
-        one_word_per_line: "Ein Wort pro Zeile"
+        show_words:
+          one: "zeige %{count} Wort"
+          other: "zeige %{count} Wörter"
         download: Herunterladen
         clear_all: Auswahl aufheben
-        clear_all_confirm_block: "Bist du sicher, dass alle Watched Words für die Blockier-Prozedur entfernt werden sollen?"
-        clear_all_confirm_censor: "Bist du sicher, dass alle Watched Words für das Zensieren entfernt werden sollen?"
-        clear_all_confirm_flag: "Bist du sicher, dass alle Watched Words für Meldungen entfernt werden sollen?"
-        clear_all_confirm_require_approval: "Bist du sicher, dass alle Watched Words für die Genehmigung-erforderlich Prozedur entfernt werden sollen?"
-        word_count:
-          one: "%{count} Wort"
-          other: "%{count} Wörter"
+        clear_all_confirm: "Bist Du sicher, dass Du alle beobachteten Wörter für die %{action} Aktion löschen möchtest?"
         actions:
           block: "Blockieren"
           censor: "Zensieren"
           require_approval: "Erfordert Genehmigung"
           flag: "Melden"
+          replace: "Ersetzen"
+          tag: "Schlagwort"
         action_descriptions:
           block: "Verhindert, dass Beiträge mit diesen Wörtern abgeschickt werden. Benutzer werden eine Fehlermeldung sehen, wenn sie ihren Beitrag abschicken."
           censor: "Erlaube Beiträge mit diesen Wörtern, aber ersetze sie mit Zeichen, die die zensierten Wörter verstecken."
           require_approval: "Beiträge mit diesen Wörtern werden eine Genehmigung vom Team erfordern, bevor sie sichtbar sind."
           flag: "Erlaube Beiträge mit diesen Wörtern, aber markiere sie als unangemessen, damit Moderatoren sie überprüfen können."
+          replace: "Wörter in Beiträgen durch andere Wörter oder Links ersetzen"
+          tag: "Markieren Sie Themen automatisch basierend auf dem ersten Beitrag"
         form:
-          label: "Neues Wort:"
-          placeholder: "vollständiges Wort oder * als Platzhalter"
+          label: "Hat Wort oder Wortgruppe"
+          placeholder: "Geben Sie ein Wort oder eine Phrase ein (* ist ein Platzhalter)"
           placeholder_regexp: "regulärer Ausdruck"
+          replacement_label: "Ersatz"
+          replacement_placeholder: "example oder https://example.com"
+          tag_label: "Schlagwort"
+          tag_placeholder: "Schlagwort1, Schlagwort2, Schlagwort3"
           add: "Hinzufügen"
           success: "Erfolg"
           exists: "Existiert bereits"
@@ -4240,6 +4463,9 @@ de:
         check_email:
           title: "E-Mail-Adresse des Benutzers anzeigen"
           text: "Anzeigen"
+        check_sso:
+          title: "SSO-Nutzlast 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}"
@@ -4280,7 +4506,7 @@ de:
         clear_penalty_history:
           title: "Lösche die Strafenhistorie"
           description: "Benutzer mit Strafen können TL3 nicht erreichen"
-        delete_all_posts_confirm_MF: "Du wirst {POSTS, plural, one {einen Beitrag} other {# Beiträge}} und {TOPICS, plural, one {ein Thema} other {# Themen}} löschen. Bist du dir sicher?"
+        delete_all_posts_confirm_MF: "Du wirst {POSTS, plural, one {# Beitrag} other {# Beiträge}} und {TOPICS, plural, one {# Thema} other {# Themen}} löschen. Bist du dir sicher?"
         silence: "Stummschalten"
         unsilence: "Stummschaltung aufheben"
         silenced: "Stummgeschaltet?"
@@ -4312,7 +4538,7 @@ de:
         last_100_days: "in den letzten 100 Tagen"
         private_topics_count: Private Themen
         posts_read_count: Gelesene Beiträge
-        post_count: Erstelle Beiträge
+        post_count: Erstellte Beiträge
         second_factor_enabled: Zwei-Faktor-Authentifizierung aktiviert
         topics_entered: Betrachtete Themen
         flags_given_count: Gemachte Meldungen
@@ -4329,6 +4555,9 @@ de:
         anonymize_yes: "Ja, diesen Benutzer anonymisieren"
         anonymize_failed: "Beim Anonymisieren des Benutzers ist ein Fehler aufgetreten."
         delete: "Benutzer löschen"
+        delete_posts:
+          progress:
+            title: "Fortschritt beim Löschen von Beiträgen"
         merge:
           button: "Zusammenführen"
           prompt:
@@ -4340,6 +4569,8 @@ de:
             target_username_placeholder: "Benutzername des neuen Eigentümers"
             transfer_and_delete: "Übertragen & Löschen @%{username}"
             cancel: "Abbrechen"
+          progress:
+            title: "Fortschritt der Zusammenführung"
           confirmation:
             title: "Übertragen & Löschen @%{username}"
             description: |
@@ -4357,13 +4588,13 @@ de:
         delete_posts_forbidden_because_staff: "Löschen aller Beiträge von Administratoren und Moderatoren ist nicht möglich."
         delete_forbidden:
           one: "Benutzer können nicht gelöscht werden, wenn diese Beiträge haben. Lösche zuerst all dessen Beiträge, bevor du versuchst einen Benutzer zu löschen. (Beiträge, die älter als %{count} Tag sind, können nicht gelöscht werden.)"
-          other: "Benutzer können nicht gelöscht werden, wenn diese Beiträge haben. Lösche zuerst all dessen Beiträge, bevor du versuchst einen Benutzer zu löschen. (Beiträge, die älter als %{count} Tage sind, können nicht gelöscht werden.)"
+          other: "Benutzer können nicht gelöscht werden, wenn sie Beiträge haben. Lösche zuerst alle Beiträge, bevor du versuchst einen Benutzer zu löschen. (Beiträge älter als %{count} Tage können nicht gelöscht werden.)"
         cant_delete_all_posts:
           one: "Nicht alle Beiträge können gelöscht werden. Einige Beiträge sind älter als %{count} Tag (die „delete_user_max_post_age“ Einstellung)."
           other: "Nicht alle Beiträge können gelöscht werden. Einige Beiträge sind älter als %{count} Tage (die „delete_user_max_post_age“ Einstellung)."
         cant_delete_all_too_many_posts:
           one: "Nicht alle Beiträge konnten gelöscht werden, da der Benutzer mehr als %{count} Beitrag hat (die „delete_all_posts_max“ Einstellung)."
-          other: "Nicht alle Beiträge konnten gelöscht werden, da der Benutzer mehr als %{count} Beiträge hat (die „delete_all_posts_max“ Einstellung)."
+          other: "Es können nicht alle Beiträge gelöscht werden, da der Benutzer mehr als %{count} Beiträge hat (siehe „delete_all_posts_max“ Einstellung)."
         delete_confirm: "Es ist grundsätzlich vorzuziehen, Benutzer zu anonymisieren statt sie zu löschen, um zu vermeiden, dass Inhalt aus bestehenden Diskussionen entfernt wird. <br><br>Bist du SICHER, dass du diesen Benutzer löschen möchtest? Dies lässt sich nicht rückgängig machen."
         delete_and_block: "Löschen und diese E-Mail-Adresse und IP-Adresse <b>blockieren</b>"
         delete_dont_block: "Nur löschen"
@@ -4385,7 +4616,7 @@ de:
         reset_bounce_score:
           label: "Zurücksetzen"
           title: "Anzahl unzustellbarer E-Mails auf 0 zurücksetzen"
-        visit_profile: "Besuche die <a href='%{url}'>Benutzer-Einstellungen</a>, um dieses Profil zu bearbeiten"
+        visit_profile: "Besuche die <a href='%{url}'>Benutzer-Einstellungen</a>, um dieses Profil zu bearbeiten."
         deactivate_explanation: "Ein deaktivierter Benutzer muss seine E-Mail-Adresse erneut bestätigen."
         suspended_explanation: "Ein gesperrter Benutzer kann sich nicht anmelden."
         silence_explanation: "Ein stummgeschalteter Benutzer kann keine Beiträge schreiben oder Themen beginnen."
@@ -4400,7 +4631,7 @@ de:
         trust_level_2_users: "Benutzer mit Vertrauensstufe 2"
         trust_level_3_requirements: "Anforderungen für Vertrauensstufe 3"
         trust_level_locked_tip: "Die Vertrauensstufe ist gesperrt. Das System wird den Benutzer nicht befördern oder zurückstufen."
-        trust_level_unlocked_tip: "Vertrauensstufe ist nicht gesperrt. Das System kann den Benutzer befördern oder zurückstufen. "
+        trust_level_unlocked_tip: "Vertrauensstufe ist nicht gesperrt. Das System kann den Benutzer befördern oder zurückstufen."
         lock_trust_level: "Vertrauensstufe sperren"
         unlock_trust_level: "Vertrauensstufe entsperren"
         tl3_requirements:
@@ -4432,16 +4663,16 @@ de:
           on_grace_period: "Wird nicht zurückgestuft. Derzeit gilt die Schonfrist der letzten Beförderung."
           locked_will_not_be_promoted: "Vertrauensstufe ist gesperrt. Wird nie befördert werden."
           locked_will_not_be_demoted: "Vertrauensstufe ist gesperrt. Wird nie zurückgestuft werden."
-        sso:
-          title: "Single Sign-on"
+        discourse_connect:
+          title: "DiscourseConnect Single Sign On"
           external_id: "Externe ID"
           external_username: "Benutzername"
           external_name: "Name"
           external_email: "E-Mail"
-          external_avatar_url: "URL des Profilbilds"
+          external_avatar_url: "Profilbild URL"
           last_payload: "Letzte Nutzlast"
           delete_sso_record: "SSO-Datensatz löschen"
-          confirm_delete: "Sind Sie sicher, dass Sie diesen SSO-Datensatz (Single Sign On) löschen möchten?"
+          confirm_delete: "Bist du sicher, dass du diesen DiscourseConnect-Eintrag löschen möchtest?"
       user_fields:
         title: "Benutzerfelder"
         help: "Füge Felder hinzu, welche deine Benutzer ausfüllen können."
@@ -4472,6 +4703,10 @@ de:
           title: "Auf Benutzerkarte anzeigen?"
           enabled: "Wird auf Benutzerkarte angezeigt"
           disabled: "Wird nicht auf Benutzerkarte angezeigt"
+        searchable:
+          title: "Durchsuchbar?"
+          enabled: "durchsuchbar"
+          disabled: "nicht durchsuchbar"
         field_types:
           text: "Textfeld"
           confirm: "Bestätigung"
@@ -4486,6 +4721,8 @@ de:
         go_back: "Zurück zur Suche"
         recommended: "Wir empfehlen, dass du den folgenden Text an deine Bedürfnisse anpasst:"
         show_overriden: "Nur geänderte Texte anzeigen"
+        locale: "Sprache:"
+        fallback_locale_warning: "Du bearbeitest eine Sprache basierend auf %{fallback}. Benutzer, die %{fallback} als Sprache ihrer Schnittstelle wählen, werden deine Änderungen nicht sehen."
         more_than_50_results: "Es gibt mehr als 50 Ergebnisse. Bitte grenze deine Suche weiter ein."
       settings:
         show_overriden: "Nur geänderte anzeigen"
@@ -4493,6 +4730,10 @@ de:
         reset: "zurücksetzen"
         none: "keine"
       site_settings:
+        emoji_list:
+          invalid_input: "Emoji-Liste sollte nur gültige Emoji-Namen enthalten, z. B.: hugs"
+          add_emoji_button:
+            label: "Emoji hinzufügen"
         title: "Einstellungen"
         no_results: "Keine Ergebnisse gefunden."
         more_than_30_results: "Es gibt mehr als 30 Ergebnisse. Bitte grenze deine Suche weiter ein oder wähle eine Kategorie aus."
@@ -4545,6 +4786,9 @@ de:
           modal_no: "Nein, die Änderung soll sich nur zukünftig auswirken"
         simple_list:
           add_item: "Element hinzufügen..."
+        json_schema:
+          edit: Editor starten
+          modal_title: "%{name} bearbeiten"
       badges:
         title: Abzeichen
         new_badge: Neues Abzeichen
@@ -4581,8 +4825,12 @@ de:
         enabled: Abzeichen aktivieren
         icon: Symbol
         image: Bild
+        graphic: Grafik
         icon_help: "Gib einen Font Awesome Icon Namen ein (benutze für reguläre Icons das Präfix 'far-' und für Marken-Icons 'fab-')"
-        image_help: "Gebe die URL eines Bildes ein (überschreibt Symbol Feld wenn beide aktiv sind)"
+        image_help: "Das Hochladen eines Bildes überschreibt das Symbolfeld, wenn beide gesetzt sind."
+        select_an_icon: "Wähle ein Symbol"
+        upload_an_image: "Lade ein Bild hoch"
+        read_only_setting_help: "Anpassen von Text"
         query: Abzeichen-Abfrage (SQL)
         target_posts: Abfrage betrifft Beiträge
         auto_revoke: Führe die Abfrage zum Widerruf täglich aus
@@ -4639,7 +4887,7 @@ de:
         alt: "benutzerdefinierte Emoji-Vorschau"
         delete_confirm: "Möchtest du wirklich das :%{name}: Emoji löschen?"
       embedding:
-        get_started: "Wenn du Discourse in einer anderen Website einbetten möchtest, beginne mit dem hinzufügen des Host. "
+        get_started: "Wenn du Discourse in einer anderen Website einbetten möchtest, beginne mit dem hinzufügen des Host."
         confirm_delete: "Möchtest du wirklich diesen Host löschen?"
         sample: "Benutze den folgenden HTML code für deine Site um Discourse Beiträge zu erstellen und einzubetten. Ersetze <b>REPLACE_ME</b> mit der URL der Site in die du sie einbetten möchtest."
         title: "Einbettung"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 7b5c051d02..6ee705e766 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -122,6 +122,7 @@ el:
       twitter: "Κοινοποιήστε στο Twitter"
       facebook: "Μοιραστείτε στο Facebook"
       email: "Αποστολή μέσω email"
+      url: "Αντιγραφή και κοινοποίηση διεύθυνσης URL"
     action_codes:
       public_topic: "έκανε αυτό το θέμα δημόσιο στις %{when}"
       private_topic: "έκανε αυτό το θέμα ένα προσωπικό μήνυμα στις %{when}"
@@ -157,6 +158,8 @@ el:
     topic_admin_menu: "ρυθμίσεις θέματος"
     wizard_required: "Καλώς ήλθατε στο νέο σας Discourse! Ας αρχίσουμε με τον <a href='%{url}' data-auto-route='true'>οδηγό εγκατάστασης</a> ✨"
     emails_are_disabled: "Όλα τα εξερχόμενα emails έχουν απενεργοποιηθεί καθολικά από κάποιον διαχειριστή. Δε θα σταλεί καμία ειδοποίηση email."
+    software_update_prompt:
+      dismiss: "Απόρριψη"
     bootstrap_mode_disabled: "Η λειτουργία bootstrap θα απενεργοποιηθεί εντός 24 ωρών."
     themes:
       default_description: "Προεπιλογή"
@@ -217,6 +220,9 @@ el:
     now: "μόλις τώρα"
     read_more: "διαβάστε περισσότερα"
     more: "Περισσότερα"
+    x_more:
+      one: "%{count} Περισσότερο"
+      other: "%{count} Περισσότερο"
     less: "Λιγότερα"
     never: "ποτέ"
     every_30_minutes: "κάθε 30 λεπτά"
@@ -245,8 +251,6 @@ el:
       moderators: "Συντονιστές"
       stat:
         all_time: "Συνολικά"
-        last_7_days: "Τελευταίες 7"
-        last_30_days: "Τελευταίες 30"
       like_count: "Μου αρέσει"
       topic_count: "Θέματα"
       post_count: "Αναρτήσεις"
@@ -282,17 +286,6 @@ el:
       search_placeholder: "Αναζήτηση σελιδοδεικτών με βάση το όνομα, τον τίτλο θέματος ή το περιεχόμενο δημοσίευσης"
       search: "Αναζήτηση"
       reminders:
-        later_today: "Αργότερα σήμερα"
-        next_business_day: "Επόμενη εργάσιμη ημέρα"
-        tomorrow: "Αύριο"
-        next_week: "Την άλλη εβδομάδα"
-        later_this_week: "Αργότερα αυτήν την εβδομάδα"
-        start_of_next_business_week: "Τη Δευτέρα"
-        start_of_next_business_week_alt: "Την επόμενη Δευτέρα"
-        next_month: "Τον άλλο μήνα"
-        custom: "Προσαρμοσμένη ημερομηνία και ώρα"
-        last_custom: "Τελευταία"
-        none: "Δεν απαιτείται υπενθύμιση"
         today_with_time: "σήμερα στις %{time}"
         tomorrow_with_time: "αύριο στις %{time}"
         at_time: "στις %{date_time}"
@@ -306,9 +299,7 @@ el:
       new_private_message: "Νέο προσχέδιο ιδιωτικού μηνύματος"
       topic_reply: "Προσχέδιο απάντησης"
       abandon:
-        confirm: "Έχετε ήδη ανοίξει ένα άλλο προσχέδιο σε αυτό το θέμα. Είστε βέβαιοι ότι θέλετε να το εγκαταλείψετε;"
-        yes_value: "Ναι, εγκαταλείψτε"
-        no_value: "Όχι, κρατήστε το"
+        yes_value: "Απόρριψη"
     topic_count_latest:
       one: "Δείτε %{count} νέο ή ενημερωμένο θέμα"
       other: "Δείτε %{count} νέα ή ενημερωμένα θέματα"
@@ -404,6 +395,7 @@ el:
       topic: "Νήμα:"
       filtered_topic: "Έχετε φιλτράρει σε περιεχόμενο με δυνατότητα ελέγχου σε ένα μόνο θέμα."
       filtered_user: "Χρήστης"
+      filtered_reviewed_by: "Αναθεωρήθηκε από"
       show_all_topics: "εμφάνιση όλων των θεμάτων"
       deleted_post: "(η ανάρτηση διαγράφηκε)"
       deleted_user: "(ο χρήστης διαγράφηκε)"
@@ -414,10 +406,8 @@ el:
         email: "Διεύθυνση Email"
         name: "Όνομα"
         fields: "Πεδία"
+        reject_reason: "Αιτία"
       user_percentage:
-        summary:
-          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} συνολική σημαία)"
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} συνολικές σημαίες)"
         agreed:
           one: "%{count} συμφωνεί"
           other: "%{count} συμφωνούν"
@@ -460,7 +450,8 @@ el:
           created_at_asc: "Δημιουργήθηκε στις (αντίστροφα)"
         priority:
           title: "Ελάχιστη προτεραιότητα"
-          low: "(οποιοδήποτε)"
+          any: "(οποιοδήποτε)"
+          low: "Χαμηλή"
           medium: "Μεσαία"
           high: "Υψηλή"
       conversation:
@@ -498,6 +489,8 @@ el:
           title: "Ανάρτηση σε ουρά"
         reviewable_user:
           title: "Χρήστης"
+        reviewable_post:
+          title: "Ανάρτηση"
       approval:
         title: "Απαιτείται Έγκριση Ανάρτησης"
         description: "Λάβαμε την ανάρτησή σου, αλλά πρέπει πρώτα να εγκριθεί από έναν συντονιστή πριν εμφανιστεί. Παρακαλώ περιμένετε."
@@ -505,6 +498,21 @@ el:
           one: "Έχετε <strong>%{count}</strong> ανάρτηση σε εκκρεμότητα."
           other: "Έχετε <strong>%{count}</strong> αναρτήσεις σε εκκρεμότητα."
         ok: "OK"
+      example_username: "όνομα χρήστη"
+    relative_time_picker:
+      days:
+        one: "ημέρα"
+        other: "ημέρες"
+    time_shortcut:
+      later_today: "Αργότερα σήμερα"
+      next_business_day: "Επόμενη εργάσιμη ημέρα"
+      tomorrow: "Αύριο"
+      next_week: "Την άλλη εβδομάδα"
+      later_this_week: "Αργότερα αυτήν την εβδομάδα"
+      start_of_next_business_week: "Τη Δευτέρα"
+      start_of_next_business_week_alt: "Την επόμενη Δευτέρα"
+      next_month: "Τον άλλο μήνα"
+      custom: "Προσαρμοσμένη ημερομηνία και ώρα"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a> ανάρτησε <a href='%{topicUrl}'>το νήμα </a>"
       you_posted_topic: "<a href='%{userUrl}'>Ανάρτησες</a> αυτό <a href='%{topicUrl}'>το νήμα</a>"
@@ -591,6 +599,8 @@ el:
             imap_ssl: "Χρήση SSL για SMTP"
             username: "Όνομα Χρήστη"
             password: "Κωδικός Πρόσβασης"
+          settings:
+            title: "Ρυθμίσεις"
           mailboxes:
             synchronized: "Συγχρονισμένο γραμματοκιβώτιο"
             none_found: "Δε βρέθηκαν γραμματοκιβώτια σε αυτόν τον λογαριασμό email."
@@ -764,13 +774,15 @@ el:
       posts: "Αναρτήσεις"
       topics: "Νήματα"
       latest: "Πρόσφατες"
-      latest_by: "πρόσφατες από"
       toggle_ordering: "εναλλαγή ταξινόμησης"
       subcategories: "Υποκατηγορίες"
       muted: "Κατηγορίες σε σίγαση"
       topic_sentence:
         one: "%{count} θέμα"
         other: "%{count} νήματα"
+      topic_stat_unit:
+        week: "εβδομάδα"
+        month: "μήνας"
       topic_stat_sentence_week:
         one: "%{count} νέο θέμα την περασμένη εβδομάδα."
         other: "%{count} νέα θέματα την περασμένη εβδομάδα."
@@ -830,7 +842,12 @@ el:
         mute_option_title: "Δε θα λάβετε ειδοποιήσεις σχετικά με αυτόν τον χρήστη."
         normal_option: "Φυσιολογικά"
         normal_option_title: "Θα ειδοποιηθείτε εάν αυτός ο χρήστης σας απαντήσει, σας παραθέσει ή σας αναφέρει."
+      notification_schedule:
+        none: "Κανένα"
+        monday: "Τη Δευτέρα"
+        to: "προς"
       activity_stream: "Δραστηριότητα"
+      read: "Διαβασμένο"
       preferences: "Προτιμήσεις"
       feature_topic_on_profile:
         open_search: "Επιλέξτε ένα νέο θέμα"
@@ -859,7 +876,6 @@ el:
         perm_denied_expl: "Απορρίψατε την άδεια για ειδοποιήσεις. Επιτρέψτε τις ειδοποιήσεις μέσω των ρυθμίσεων του browser σας."
         disable: "Απενεργοποίηση Ειδοποιήσεων"
         enable: "Ενεργοποίηση Ειδοποιήσεων"
-        each_browser_note: "Σημείωση: Θα πρέπει να αλλάξετε αυτή τη ρύθμιση σε κάθε browser που χρησιμοποιείτε."
         consent_prompt: "Θέλετε ζωντανές ειδοποιήσεις όταν οι χρήστες απαντούν στις αναρτήσεις σας;"
       dismiss: "Απόρριψη"
       dismiss_notifications: "Απόρριψη Όλων"
@@ -874,7 +890,6 @@ el:
       color_scheme_default_on_all_devices: "Όρισε προεπιλεγμένο συνδυασμό χρωμάτων σε όλες τις συσκευές μου"
       color_scheme: "Συνδυασμός χρωμάτων"
       color_schemes:
-        default_description: "Προεπιλογή"
         disable_dark_scheme: "Το ίδιο με το κανονικό"
         dark_instructions: "Μπορείτε να κάνετε προεπισκόπηση του συνδυασμού χρωμάτων σκοτεινής λειτουργίας αλλάζοντας τη σκοτεινή λειτουργία της συσκευής σας."
         undo: "Επαναφορά"
@@ -898,6 +913,7 @@ el:
       suspended_notice: "Αυτός ο χρήστης είναι σε αποβολή μέχρι τις %{date}."
       suspended_permanently: "Ο χρήστης είναι αποβλημένος."
       suspended_reason: "Αιτιολογία:"
+      github_profile: "GitHub"
       email_activity_summary: "Περίληψη Ενεργειών"
       mailing_list_mode:
         label: "Λειτουργία ταχυδρομικής λίστας"
@@ -979,6 +995,7 @@ el:
         tags: "Ετικέτες"
       preferences_nav:
         account: "Λογαριασμός"
+        security: "Ασφάλεια"
         profile: "Προφίλ"
         emails: "Emails"
         notifications: "Ειδοποιήσεις"
@@ -1094,7 +1111,6 @@ el:
         set_primary: "Ορισμός πρωτεύοντος email"
         destroy: "Αφαίρεση email"
         add_email: "Προσθήκη εναλλακτικού email"
-        sso_override_instructions: "Το email μπορεί να ενημερωθεί από τον πάροχο SSO."
         no_secondary: "Χωρίς δευτερεύοντα emails"
         instructions: "Ποτέ δεν εμφανίζεται στο κοινό."
         ok: "Για επιβεβαίωση θα σου στείλουμε ένα email"
@@ -1227,45 +1243,38 @@ el:
         after_10_minutes: "μετά από 10 λεπτά"
       notification_level_when_replying: "Όταν αναρτώ σε ένα νήμα, τοποθέτησε αυτό το νήμα σε"
       invited:
-        search: "γράψε για να αναζητήσεις προσκλήσεις..."
         title: "Προσκλήσεις"
+        pending_tab: "Εκρεμείς"
+        pending_tab_with_count: "Εκρεμείς (%{count})"
+        redeemed_tab: "Αποδεκτές"
+        redeemed_tab_with_count: "Αποδεκτές (%{count})"
+        invited_via: "Πρόσκληση"
+        groups: "Ομάδες"
+        topic: "Νήμα"
+        expires_at: "Λήγει"
+        edit: "Επεξεργασία"
+        remove: "Αφαίρεση"
+        reinvited: "Η πρόσκληση στάλθηκε ξανά"
+        search: "γράψε για να αναζητήσεις προσκλήσεις..."
         user: "Προσκεκλημένος Χρήστης"
-        sent: "Απεστάλη τελευταία"
         none: "Δεν υπάρχουν προσκλήσεις για προβολή."
         truncated:
           one: "Δείχνοντας την πρώτη πρόσκληση."
           other: "Προβάλονται οι πρώτες %{count} προσκλήσεις."
         redeemed: "Αποδεκτές Προσκλήσεις"
-        redeemed_tab: "Αποδεκτές"
-        redeemed_tab_with_count: "Αποδεκτές (%{count})"
         redeemed_at: "Αποδεκτές"
         pending: "Εκρεμείς προσκλήσεις"
-        pending_tab: "Εκρεμείς"
-        pending_tab_with_count: "Εκρεμείς (%{count})"
         topics_entered: "Προβεβλημένα Νήματα"
         posts_read_count: "Διαβασμένες Αναρτήσεις"
         expired: "Αυτή η πρόσκληση έχει λήξει."
-        rescind: "Αναίρεση Πρόσκλησης"
-        rescinded: "Η πρόσκληση αναιρέθηκε"
-        rescind_all: "Αφαίρεση ληγμένων προσκλήσεων"
-        rescinded_all: "Όλες οι ληγμένες προσκλήσεις αφαιρέθηκαν!"
-        rescind_all_confirm: "Είστε βέβαιοι ότι θέλετε να αφαιρέσετε όλες τις ληγμένες προσκλήσεις;"
-        reinvite: "Επαναποστολή Πρόσκλησης"
-        reinvite_all: "Επαναποστολή όλων των προσκλήσεων"
+        remove_all: "Αφαίρεση ληγμένων προσκλήσεων"
+        removed_all: "Όλες οι ληγμένες προσκλήσεις αφαιρέθηκαν!"
+        remove_all_confirm: "Είστε βέβαιοι ότι θέλετε να αφαιρέσετε όλες τις ληγμένες προσκλήσεις;"
         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_redemption_stats: "Εξαργυρώσεις"
-        link_groups: Ομάδες
-        link_expires_at: Λήγει
+        create: "Πρόσκληση"
         valid_for: "Ο σύνδεσμος πρόσκλησης είναι έγκυρος μόνο για αυτή τη διεύθυνση email: %{email}"
         invite_link:
           title: "Σύνδεσμος πρόσκλησης"
@@ -1275,9 +1284,7 @@ el:
           expires_at: "Πότε θα λήξει αυτός ο σύνδεσμος πρόσκλησης;"
         bulk_invite:
           text: "Μαζική πρόσκληση"
-          success: "Το αρχείο ανέβηκε. Θα ενημερωθείς με ένα μήνυμα όταν ολοκληρωθεί η διαδικασία."
           error: "Λυπούμαστε, το αρχείο πρέπει να έχει την μορφή CSV."
-          confirmation_message: "Πρόκειται να στείλετε μέσω email προσκλήσεις σε όλους στο επιφορτωμένο αρχείο."
       password:
         title: "Κωδικός Πρόσβασης"
         too_short: "Ο κωδικός πρόσβασης είναι μικρός."
@@ -1378,7 +1385,6 @@ el:
       close: "κλείσιμο"
       dismiss_error: "Παράβλεψη σφάλματος"
     close: "Κλείσιμο"
-    assets_changed_confirm: "Αυτή η ιστοσελίδα μόλις ενημερώθηκε. Να ανανεωθεί τώρα για να φανεί η τελευταία έκδοση;"
     logout: "Αποσυνδέθηκες."
     refresh: "Ανανέωση"
     home: "Αρχική Σελίδα"
@@ -1387,15 +1393,6 @@ el:
       login_disabled: "Η δυνατότητα σύνδεσης έχει απενεργοποιηθεί όσο η ιστοσελίδα είναι σε κατάσταση μόνο ανάγνωσης."
       logout_disabled: "Η αποσύνδεση δεν είναι διαθέσιμη ενώ η ιστοσελίδα είναι σε λειτουργία μόνο ανάγνωσης."
     learn_more: "μάθε περισσότερα..."
-    all_time: "σύνολο"
-    all_time_desc: "συνολικά δημιουργημένα νήματα"
-    year: "έτος"
-    year_desc: "νήματα που έχουν δημιουργηθεί τις τελευταίες 365 ημέρες"
-    month: "μήνας"
-    month_desc: "νήματα που έχουν δημιουργηθεί τις τελευταίες 30 ημέρες"
-    week: "εβδομάδα"
-    week_desc: "νήματα που έχουν δημιουργηθεί τις τελευταίες 7 ημέρες"
-    day: "ημέρα"
     first_post: Πρώτη ανάρτηση
     mute: Σίγαση
     unmute: Αναίρεση σίγασης
@@ -1413,13 +1410,10 @@ el:
       sign_up: "Εγγραφή"
       hide_session: "Υπενθύμιση αύριο"
       hide_forever: "όχι ευχαριστώ"
-      hidden_for_session: "Εντάξει, θα σε ρωτήσω αύριο. Μπορείς πάντα να χρησιμοποιείς τη \"Σύνδεση\" για να δημιουργήσεις ένα λογαριασμό."
       intro: "Γεια! Φαίνεται ότι απολαμβάνεις τη συζήτηση, αλλά δεν έχεις εγγραφεί ακόμα για λογαριασμό."
       value_prop: "Όταν δημιουργείτε έναν λογαριασμό, θυμόμαστε ακριβώς τι έχετε διαβάσει, έτσι ώστε να επιστρέφετε πάντα από εκεί που σταματήσατε. Μπορείτε επίσης να λαμβάνετε ειδοποιήσεις, εδώ και μέσω ηλεκτρονικού ταχυδρομείου, κάθε φορά που κάποιος σας απαντά. Και μπορείτε να σας αρέσουν οι δημοσιεύσεις και να μοιραστείς την αγάπη. :heartpulse:"
     summary:
       enabled_description: "Βλέπεις μια περίληψη αυτού του νήματος: οι πιο ενδιαφέρουσες αναρτήσεις, όπως αυτές καθορίστηκαν από την κοινότητα."
-      description: "Υπάρχουν <b>%{replyCount}</b> απαντήσεις."
-      description_time: "Υπάρχουν <b>%{replyCount}</b> απαντήσεις με εκτιμώμενο χρόνο ανάγνωσης <b>%{readingTime} λεπτών</b>."
       enable: "Σύνοψη του Νήματος"
       disable: "Εμφάνιση όλων των αναρτήσεων"
     deleted_filter:
@@ -1429,6 +1423,9 @@ el:
       disable: "Εμφάνισε τις σβησμένες αναρτήσεις"
     private_message_info:
       title: "Μήνυμα"
+      invite: "Προσκαλέστε άλλους..."
+      edit: "Προσθέστε ή αφαιρέστε..."
+      add: "Προσθήκη..."
       leave_message: "Σίγουρα θελετε να αφήσετε αυτό το μήνυμα;"
       remove_allowed_user: "Θέλεις σίγουρα να αφαιρέσεις τον/την %{name} από αυτή τη συζήτηση;"
       remove_allowed_group: "Θέλεις σίγουρα να αφαιρέσεις τον/την %{name} από αυτό το μήνυμα;"
@@ -1440,8 +1437,8 @@ el:
     trust_level: "Επίπεδο Εμπιστοσύνης"
     search_hint: "όνομα χρήστη, email ή IP διεύθυνση"
     create_account:
+      header_title: "Καλωσόρισες!"
       disclaimer: "Κάνοντας εγγραφή συμφωνείς με την <a href='%{privacy_link}'>πολιτική ιδιωτικότητας</a> και με τους <a href='%{tos_link}'>όρους χρήσης</a>."
-      title: "Δημιουργία Λογαριασμού"
       failed: "Κάτι πήγε στραβά. Ίσως αυτή η διεύθυνση email να είναι ήδη δηλωμένη. Δοκίμασε την λειτουργία «ξέχασα τον κωδικό μου»."
     forgot_password:
       title: "Επαναφορά Κωδικού"
@@ -1471,7 +1468,7 @@ el:
       logging_in_as: Σύνδεση ως %{email}
       confirm_button: Ολοκληρώστε τη σύνδεση
     login:
-      title: "Σύνδεση"
+      subheader_title: "Συνδέσου στον λογαριασμό σου"
       username: "Όνομα Χρήστη"
       password: "Κωδικός Πρόσβασης"
       second_factor_description: "Παρακαλώ εισαγάγετε τον κωδικό ελέγχου ταυτότητας από την εφαρμογή σας:"
@@ -1484,7 +1481,6 @@ el:
       security_key_not_allowed_error: "Η διαδικασία ελέγχου ταυτότητας κλειδιού ασφαλείας είτε έληξε είτε ακυρώθηκε."
       security_key_no_matching_credential_error: "Δε βρέθηκαν διαπιστευτήρια που να ταιριάζουν στο παρεχόμενο κλειδί ασφαλείας."
       security_key_support_missing_error: "Η τρέχουσα συσκευή ή το πρόγραμμα περιήγησής σας δεν υποστηρίζει τη χρήση κλειδιών ασφαλείας. Παρακαλώ χρησιμοποιήστε διαφορετική μέθοδο."
-      email_placeholder: "διεύθυνση email ή όνομα χρήστη"
       caps_lock_warning: "Είναι ενεργά τα ΚΕΦΑΛΑΙΑ"
       error: "Άγνωστο σφάλμα"
       cookies_error: "Το πρόγραμμα περιήγησής σας φαίνεται να έχει απενεργοποιήσει τα cookies. Ίσως να μη μπορείτε να συνδεθείτε χωρίς να τα ενεργοποιήσετε πρώτα."
@@ -1499,6 +1495,7 @@ el:
       awaiting_approval: "Ο λογαριασμός σου δεν έχει εγκριθεί από κανέναν συνεργάτη ακόμη. Θα λάβεις ένα email όταν εγκριθεί."
       requires_invite: "Λυπούμαστε, αλλά η πρόσβαση σε αυτό το φόρουμ είναι δυνατή μόνο με πρόσκληση."
       not_activated: "Δεν γίνεται να συνδεθείς ακόμη. Έχουμε ήδη στείλει ένα email με οδηγίες ενεργοποίησης στη διεύθυνση <b>%{sentTo}</b>. Ακολούθησε τις οδηγίες σε αυτό το μήνυμα για να ενεργοποιήσεις το λογαριασμό σου."
+      not_allowed_from_ip_address: "Δεν μπορείς να συνδεθείς από αυτή τη διεύθυνση IP."
       admin_not_allowed_from_ip_address: "Από αυτή τη διεύθυνση IP δεν επιτρέπεται να συνδεθείς ως διαχειριστής."
       resend_activation_email: "Πάτησε εδώ για να σταλεί ξανά το email ενεργοποίησης."
       resend_title: "Επαναποστολή Email Ενεργοποίησης"
@@ -1541,6 +1538,7 @@ el:
       accept_invite: "Αποδοχή Πρόσκλησης"
       success: "Ο λογαριασμός σας έχει δημιουργηθεί και έχετε συνδεθεί. "
       name_label: "Όνομα"
+      password_label: "Κωδικός Πρόσβασης"
       optional_description: "(προεραιτικό)"
     password_reset:
       continue: "Συνεχίστε στην %{site_name}"
@@ -1548,7 +1546,6 @@ el:
       apple_international: "Apple/Διεθνής"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (πρώην EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1566,6 +1563,16 @@ el:
       enter: "Enter"
     conditional_loading_section:
       loading: Φόρτωση...
+    category_row:
+      topic_count:
+        one: "%{count} θέμα σε αυτήν την κατηγορία"
+        other: "%{count} θέματα σε αυτήν την κατηγορία"
+      plus_subcategories_title:
+        one: "%{name} και μία υποκατηγορία"
+        other: "%{name} και %{count} υποκατηγορίες"
+      plus_subcategories:
+        one: "+ %{count} υποκατηγορία"
+        other: "+ %{count} υποκατηγορίες"
     select_kit:
       default_header_text: Επιλογή...
       no_content: Δεν βρέθηκαν αποτελέσματα
@@ -1578,14 +1585,15 @@ el:
       min_content_not_reached:
         one: "Επιλέξτε τουλάχιστον %{count} στοιχείο."
         other: "Επιλέξτε τουλάχιστον %{count} στοιχεία."
+      invalid_selection_length:
+        one: "Η επιλογή πρέπει να έχει τουλάχιστον %{count} χαρακτήρα."
+        other: "Η επιλογή πρέπει να έχει τουλάχιστον %{count} χαρακτήρες."
       components:
         categories_admin_dropdown:
           title: "Διαχείριση κατηγοριών"
     date_time_picker:
       from: Από
       to: Προς
-      errors:
-        to_before_from: "Η τελική ημερομηνία πρέπει να είναι αργότερα από την αρχική ημερομηνία."
     emoji_picker:
       filter_placeholder: Αναζήτηση για emoji
       smileys_&_emotion: Χαμόγελα και συγκίνηση
@@ -1607,7 +1615,6 @@ el:
       default: Προσαρμοσμένα emojis
     shared_drafts:
       title: "Κοινόχρηστα Προσχέδια"
-      notice: "Αυτό το θέμα είναι ορατό μόνο σε όσους μπορούν να δουν την κατηγορία <b>%{category}</b>."
       destination_category: "Κατηγορία προορισμού"
       publish: "Δημοσίευση κοινόχρηστου προσχεδίου"
       confirm_publish: "Είσαι βέβαιοι πως θέλετε να δημοσιεύσετε αυτό το προσχέδιο;"
@@ -1618,7 +1625,6 @@ el:
       options: "Επιλογές"
       whisper: "ψιθύρισμα"
       unlist: "κρυμμένο"
-      blockquote_text: "Blockquote"
       add_warning: "Αυτή είναι μια επίσημη προειδοποίηση."
       toggle_whisper: "Εναλλαγή Ψιθύρων"
       toggle_unlisted: "Εναλλαγή Κρυφών"
@@ -1637,12 +1643,12 @@ el:
       reference_topic_title: "ΑΠ: %{title}"
       error:
         title_missing: "Απαιτείται τίτλος"
-        title_too_short: "Ο τίτλος πρέπει να έχει τουλάχιστον %{min} χαρακτήρες"
-        title_too_long: "Ο τίτλος δεν μπορεί να έχει πάνω από %{max} χαρακτήρες"
         post_missing: "Η ανάρτηση δε μπορεί να είναι κενή"
-        post_length: "Κάθε ανάρτηση πρέπει να περιέχει τουλάχιστον %{min} χαρακτήρες"
         try_like: "Έχετε δοκιμάσει το κουμπί %{heart};"
         category_missing: "Πρέπει να διαλέξεις μια κατηγορία"
+        tags_missing:
+          one: "Πρέπει να επιλέξετε τουλάχιστον %{count} ετικέτα"
+          other: "Πρέπει να επιλέξετε τουλάχιστον %{count} ετικέτες"
         topic_template_not_modified: "Παρακαλώ προσθέστε λεπτομέρειες στο θέμα σας με την επεξεργασία του προτύπου θέματος."
       save_edit: "Αποθήκευση Επεξεργασίας"
       overwrite_edit: "Αντικατάσταση επεξεργασίας"
@@ -1670,8 +1676,6 @@ el:
       saved: "Αποθηκεύτηκε!"
       saved_draft: "Δημοσίευση προσχεδίου σε εξέλιξη. Πατήστε για να συνεχίσετε."
       uploading: "Ανεβαίνει..."
-      show_preview: "εμφάνιση προεπισκόπησης &raquo;"
-      hide_preview: "&laquo; απόκρυψη προεπισκόπησης"
       quote_post_title: "Παράθεση ολόκληρης την ανάρτησης"
       bold_label: "B"
       bold_title: "Έντονα"
@@ -1684,8 +1688,8 @@ el:
       link_dialog_title: "Εισαγωγή Υπερσύνδεσμου"
       link_optional_text: "προαιρετικός τίτλος"
       link_url_placeholder: "Επικολλήστε μια διεύθυνση URL ή πληκτρολογήστε για να αναζητήσετε θέματα"
-      quote_title: "Μπλοκ Κειμένου"
-      quote_text: "Μπλοκ κειμένου σε παράθεση"
+      blockquote_title: "Blockquote"
+      blockquote_text: "Blockquote"
       code_title: "Προ-διαμορφωμένο κείμενο"
       code_text: "το προ-διαμορφωμένο κείμενο να μπει σε εσοχή με 4 κενά"
       paste_code_text: "πληκτρολογήστε ή επικολλήστε τον κώδικα εδώ"
@@ -1713,6 +1717,7 @@ el:
         draft: Προσχέδιο
         edit: Επεξεργασία
         reply_to_post:
+          label: Απάντηση στην ανάρτηση του %{postUsername}
           desc: Απάντηση σε μια συγκεκριμένη ανάρτηση
         reply_as_new_topic:
           label: Απάντηση ως συνδεδεμένο θέμα
@@ -1734,10 +1739,11 @@ el:
           label: "Νέο Νήμα"
         shared_draft:
           label: "Κοινόχρηστο προσχέδιο"
-          desc: "Προσχέδιο ενός θέματος που θα είναι ορατό μόνο στο προσωπικό"
         toggle_topic_bump:
           label: "Εναλλαγή ώθησης θέματος"
           desc: "Απάντηση χωρίς αλλαγή της τελευταίας ημερομηνίας απάντησης"
+      reload: "Ανανέωση"
+      ignore: "Αγνόηση"
     notifications:
       tooltip:
         regular:
@@ -1762,6 +1768,10 @@ el:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} και %{count} ακόμα</span> %{description}"
+        other: "<span class='multi-user'>%{username}, %{username2} και %{count} ακόμα</span> %{description}"
       liked_consolidated_description:
         one: "μου άρεσε %{count} από τις αναρτήσεις σας"
         other: "μου άρεσαν %{count} από τις αναρτήσεις σας"
@@ -1825,10 +1835,7 @@ el:
       from_my_computer: "Από τη συσκευή μου"
       from_the_web: "Από το διαδίκτυο"
       remote_tip: "υπερσύνδεσμος προς μια εικόνα"
-      remote_tip_with_attachments: "σύνδεσμος σε εικόνα ή αρχείο %{authorized_extensions}"
       local_tip: "επιλογή εικόνων από τη συσκευή σου"
-      local_tip_with_attachments: "επίλεξε εικόνες ή αρχεία από τη συσκευή σου %{authorized_extensions}"
-      hint: "(μπορείς επίσης να τα σύρεις με το ποντίκι στον editor για να τα ανεβάσεις)"
       hint_for_supported_browsers: "μπορείς επίσης να σύρεις ή να επικόλλησεις εικόνες στον editor"
       uploading: "Ανεβαίνει"
       select_file: "Επιλογή Αρχείου"
@@ -1858,6 +1865,7 @@ el:
       or_search_google: "Ή προσπαθήστε να κάνετε αναζήτηση με το Google:"
       search_google: "Προσπαθήστε να κάνετε αναζήτηση με το Google:"
       search_google_button: "Google"
+      search_button: "Αναζήτηση"
       context:
         user: "Ψάξε στις αναρτήσεις του χρήστη @%{username}"
         category: "Αναζήτηση στην κατηγορία #%{category} "
@@ -1902,16 +1910,19 @@ el:
           noreplies: έχουν μηδέν απαντήσεις
           single_user: περιέχουν ένα μόνο χρήστη
         post:
+          count:
+            label: Αναρτήσεις
           time:
             label: Αναρτήθηκε
             before: πριν
             after: μετά
+        views:
+          label: Προβολές
     hamburger_menu: "πήγαινε σε άλλη καταχώρηση νήματος ή κατηγορία"
     new_item: "καινούριο"
     go_back: "επιστροφή"
     not_logged_in_user: "σελίδα λογαριασμού που περιέχει σύνοψη της τρέχουσας δραστηριότητας και τις προτιμήσεις"
     current_user: "πήγαινε στη σελίδα του λογαριασμού σου"
-    view_all: "προβολή όλων"
     topics:
       new_messages_marker: "τελευταία επίσκεψη"
       bulk:
@@ -1932,6 +1943,7 @@ el:
         change_category: "Θέσε Κατηγορία"
         close_topics: "Κλείσιμο Νημάτων"
         archive_topics: "Αρχειοθέτηση Νημάτων"
+        move_messages_to_inbox: "Μετακίνηση στα Εισερχόμενα"
         notification_level: "Ειδοποιήσεις"
         choose_new_category: "Διάλεξε νέα κατηγορία για τα νήματα:"
         selected:
@@ -1950,8 +1962,6 @@ el:
         bookmarks: "Δεν έχεις βάλει σελιδοδείκτη σε κανένα νήμα."
         category: "Δεν υπάρχουν νήματα στην κατηγορία %{category}."
         top: "Δεν υπάρχουν κορυφαία νήματα."
-        educate:
-          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: "Δεν υπάρχουν άλλα πρόσφατα νήματα."
         posted: "Δεν υπάρχουν άλλα αναρτημένα νήματα."
@@ -2028,7 +2038,6 @@ el:
       read_more_in_category: "Θέλεις να διαβάσεις περισσότερα; Βρες άλλα νήματα στο %{catLink} ή %{latestLink}."
       read_more: "Θέλεις να διαβασεις περισσότερα; %{catLink} ή %{latestLink}."
       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: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Περιήγηση σε όλες τις κατηγορίες
       browse_all_tags: Περιηγηθείτε σε όλες τις ετικέτες
@@ -2036,6 +2045,21 @@ el:
       jump_reply_up: μετάβαση στην απάντηση που προηγείται
       jump_reply_down: μετάβαση στην απάντηση που ακολουθεί
       deleted: "Το νήμα έχει διαγραφεί "
+      slow_mode_update:
+        save: "Ενεργοποίηση"
+        remove: "Απενεργοποίηση"
+        hours: "ώρες:"
+        durations:
+          10_minutes: "10 Λεπτά"
+          15_minutes: "15 Λεπτά"
+          30_minutes: "30 Λεπτά"
+          45_minutes: "45 Λεπτά"
+          1_hour: "1 ώρα"
+          2_hours: "2 Ώρες"
+          4_hours: "4 ώρες"
+          8_hours: "8 ώρες"
+          12_hours: "12 ώρες"
+          24_hours: "24 ώρες"
       topic_status_update:
         title: "Χρονοδιακόπτης Νήματος"
         save: "Ρύθμιση Χρονοδιακόπτη"
@@ -2044,7 +2068,7 @@ el:
         remove: "Αφαίρεση Χρονοδιακόπτη"
         publish_to: "Δημοσίευση Σε:"
         when: "Πότε:"
-        time_frame_required: Παρακαλώ επιλέξτε ένα χρονικό πλαίσιο
+        time_frame_required: "Παρακαλώ επιλέξτε ένα χρονικό πλαίσιο"
       auto_update_input:
         none: "Επιλέξτε χρονικό περιθώριο"
         now: "Τώρα"
@@ -2053,13 +2077,7 @@ el:
         later_this_week: "Αργότερα αυτή την εβδομάδα"
         this_weekend: "Αυτό το Σαββατοκύριακο"
         next_week: "Την άλλη εβδομάδα"
-        two_weeks: "Δύο Εβδομάδες"
         next_month: "Τον άλλο μήνα"
-        two_months: "Δύο μήνες"
-        three_months: "Τρεις Μήνες"
-        four_months: "Τέσσερις μήνες"
-        six_months: "Έξη Μήνες"
-        one_year: "Ένα Έτος"
         forever: "Για Πάντα"
         pick_date_and_time: "Επίλεξε ημερομηνία και ώρα"
         set_based_on_last_post: "Κλείσε ανάλογα με την τελευταία ανάρτηση"
@@ -2073,7 +2091,6 @@ el:
         title: "Κλειστό Προσωρινά"
       auto_close:
         title: "Αυτόματο κλείσιμο νήματος"
-        label: "Ώρες αυτόματου κλεισίματος νήματος:"
         error: "Παρακαλώ εισάγετε μια έγκυρη αξία."
         based_on_last_post: "Να μην κλείσει μέχρι η τελευταία ανάρτηση στο νήμα να είναι τόσο παλιά."
       auto_delete:
@@ -2088,7 +2105,7 @@ el:
         auto_open: "Αυτό το νήμα θα ανοίξει αυτόματα σε %{timeLeft}."
         auto_close: "Αυτό το νήμα θα κλείσει αυτόματα σε %{timeLeft}."
         auto_publish_to_category: "Αυτό το νήμα θα αναρτηθεί στην κατηγορία <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Αυτό το νήμα θα κλείσει σε %{duration} μετά την τελευταία απάντηση."
+        auto_close_after_last_post: "Αυτό το νήμα θα κλείσει σε %{duration} μετά την τελευταία απάντηση."
         auto_delete: "Αυτό το νήμα θα διαγραφεί αυτόματα σε %{timeLeft}."
         auto_bump: "Αυτό το θέμα θα ωθηθεί αυτόματα %{timeLeft}."
         auto_reminder: "Θα λάβεις υπενθύμιση σχετικά με αυτό το νήμα σε %{timeLeft}."
@@ -2108,7 +2125,6 @@ el:
         go: "πάμε"
         jump_bottom: "μετάβαση στην τελευταία ανάρτηση"
         jump_prompt: "μετάβαση σε..."
-        jump_prompt_of: "των %{count} αναρτήσεων"
         jump_prompt_long: "Μετάβαση σε..."
         jump_bottom_with_number: "μετάβαση στην ανάρτηση %{post_number}"
         jump_prompt_to_date: "μέχρι σήμερα"
@@ -2192,6 +2208,7 @@ el:
         title: "Κοινοποίηση"
         extended_title: "Μοιραστείτε έναν σύνδεσμο"
         help: "κοινοποίησε έναν σύνδεσμο προς αυτό το νήμα"
+        invite_users: "Πρόσκληση"
       print:
         title: "Εκτύπωση"
         help: "Άνοιξε μια φιλική έκδοση εκτυπωτή αυτού του νήματος"
@@ -2244,14 +2261,13 @@ el:
         username_placeholder: "όνομα χρήστη"
         action: "Αποστολή Πρόσκλησης"
         help: "να προσκληθούν και άλλοι σε αυτό το νήμα με email ή με ειδοποίηση"
-        to_forum: "Θα στείλουμε ένα σύντομο email στον φίλο σας για να συμμετέχει άμεσα κάνοντας κλικ σε ένα σύνδεσμο. Δεν θα χρειαστεί να συνδεθεί."
-        sso_enabled: "Δώσε το όνομα χρήστη του ατόμου που θα ήθελες να προσκαλέσεις σε αυτό το νήμα."
+        discourse_connect_enabled: "Δώσε το όνομα χρήστη του ατόμου που θα ήθελες να προσκαλέσεις σε αυτό το νήμα."
         to_topic_blank: "Δώσε το όνομα χρήστη ή το email του ατόμου που θα ήθελες να προσκαλέσεις σε αυτό το νήμα."
         to_topic_email: "Έδωσες μια διεύθυνση email. Θα στείλουμε μια πρόσκληση που θα επιτρέπει στον παραλήπτη να απαντήσει άμεσα σε αυτό το νήμα."
         to_topic_username: "Έδωσες όνομα χρήστη. Θα στείλουμε ειδοποίηση με ένα σύνδεσμο πρόσκλησης προς αυτό το νήμα."
         to_username: "Δώσε το όνομα χρήστη του ατόμου που θα ήθελες να προσκαλέσεις. Θα στείλουμε ειδοποίηση με ένα σύνδεσμο πρόσκλησης προς αυτό το νήμα."
         email_placeholder: "name@example.com"
-        success_email: "Στείλαμε μια πρόσκληση στον/στην <b>%{emailOrUsername}</b>. Θα σε ειδοποιήσουμε όταν η πρόσκληση γίνει αποδεκτή. Στη σελίδα του προφίλ σου μπορείς να παρακολουθήσεις την εξέλιξη όλων των προσκλήσεών σου."
+        success_email: "Στείλαμε μια πρόσκληση στον/στην <b>%{invitee}</b>. Θα σε ειδοποιήσουμε όταν η πρόσκληση γίνει αποδεκτή. Στη σελίδα του προφίλ σου μπορείς να παρακολουθήσεις την εξέλιξη όλων των προσκλήσεών σου."
         success_username: "Προσκαλέσαμε τον χρήστη να συμμετέχει σε αυτό το νήμα."
         error: "Λυπούμαστε αλλά δεν μπορέσαμε να προσκαλέσουμε αυτό το άτομο. Μήπως έχει ήδη προσκληθεί; (ο ρυθμός αποστολής προσκλήσεων είναι περιορισμένος)"
         success_existing_email: "Ο χρήστης με email <b>%{emailOrUsername}</b> υπάρχει ήδη. Προσκαλέσαμε αυτόν τον χρήστης να συμμετέχει στο νήμα."
@@ -2365,8 +2381,6 @@ el:
       edit_reason: "Αιτία:"
       post_number: "ανάρτηση %{number}"
       ignored: "Περιεχόμενο που αγνοείται"
-      wiki_last_edited_on: "το βίκι επεξεργάστηκε τελευταία φορά στις"
-      last_edited_on: "η ανάρτηση επεξεργάστηκε τελευταία φορά στις"
       reply_as_new_topic: "Απάντηση με διασυνδεδεμένο νήμα"
       reply_as_new_private_message: "Απάντηση ως νέο μήνυμα στον ίδιο παραλήπτη"
       continue_discussion: "Συνέχιση της συζήτησης από το %{postLink}:"
@@ -2407,16 +2421,8 @@ el:
         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: "Ναί, απέρριψέ τη"
+      cancel_composer:
+        discard: "Απόρριψη"
       via_email: "αυτή η ανάρτηση ήρθε μέσω email"
       via_auto_generated_email: "αυτή η ανάρτηση ήρθε μέσω ενός email που δημιουργήθηκε αυτόματα"
       whisper: "αυτή η ανάρτηση είναι εμπιστευτική προς τους συντονιστές"
@@ -2591,6 +2597,11 @@ el:
       change_in_category_topic: "Επεξεργασία Περιγραφής"
       already_used: "Αυτό το χρώμα έχει χρησιμοποιηθεί σε άλλη κατηγορία"
       security: "Ασφάλεια"
+      permissions:
+        group: "Ομάδα"
+        see: "Δες"
+        reply: "Απάντηση"
+        create: "Δημιουργία"
       special_warning: "Προσοχή: Αυτή η κατηγορία είναι pre-seeded και οι ρυθμίσεις προστασίας δεν μπορούν να επεξεργαστούν. Εάν δεν επιθυμείτε να χρησιμοποιήσετε αυτήν την κατηγορία, διαγράψτε την αντί να την επαναχρησιμοποιήσετε."
       uncategorized_security_warning: "Αυτή η κατηγορία είναι ξεχωριστή. Προορίζεται ως περιοχή διατήρησης για θέματα που δεν έχουν κατηγορία. Δε μπορεί να έχει ρυθμίσεις ασφαλείας."
       uncategorized_general_warning: 'Αυτή η κατηγορία είναι ξεχωριστή. Χρησιμοποιείται ως προεπιλεγμένη κατηγορία για νέα θέματα που δεν έχουν επιλεγμένη κατηγορία. Αν θέλετε να αποτρέψετε αυτήν τη συμπεριφορά και να επιβάλετε επιλογή κατηγορίας, <a href="%{settingLink}">παρακαλώ απενεργοποιήστε τη ρύθμιση εδώ</a>. Εάν θέλετε να αλλάξετε το όνομα ή την περιγραφή, μεταβείτε στο <a href="%{customizeLink}">Προσαρμογή/Περιεχόμενο κειμένου</a>.'
@@ -2629,19 +2640,16 @@ el:
       notifications:
         watching:
           title: "Επιτηρείται"
-          description: "Θα επιτηρείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Θα λαμβάνεις ειδοποιήσεις για κάθε νέα ανάρτηση και ένας μετρητής για το πλήθος των νέων απαντήσεων θα εμφανίζεται."
         watching_first_post:
           title: "Επιτήρηση Πρώτης Ανάρτησης"
           description: "Θα ειδοποιηθείτε για νέα θέματα σε αυτήν την κατηγορία αλλά όχι για απαντήσεις στα θέματα."
         tracking:
           title: "Παρακολουθείται"
-          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα και ένας μετρητής για το πλήθος των νέων απαντήσεων θα εμφανίζεται."
         regular:
           title: "Φυσιολογικά"
           description: "Θα ειδοποιείσαι εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα."
         muted:
           title: "Σε σιγή"
-          description: "Δε θα λαμβάνεις ποτέ ειδοποιήσεις για οτιδήποτε σχετικό με τα νέα νήματα σε αυτές τις κατηγορίες και δε θα εμφανίζονται στα τελευταία."
       search_priority:
         label: "Προτεραιότητα αναζήτησης"
         options:
@@ -2679,10 +2687,17 @@ el:
     flagging:
       title: "Ευχαριστούμε για τη συνεισφορά σου!"
       action: "Επισήμανση Ανάρτησης"
+      take_action_options:
+        default:
+          title: "Λάβε Δράση"
+          details: "Να φτάσει αμέσως στο όριο των απαραίτητων ειδοποιήσεων, αντί να περιμένει και άλλες ειδοποιήσεις από την κοινότητα."
+        suspend:
+          title: "Αποβολή Χρήστη."
+        silence:
+          title: "Σίγαση Χρήστη"
       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> και να πρόσθεσεις την διεύθυνση email <b>{email}</b> στην λίστα ανεπιθύμητων. Είσαι βέβαιος πως αυτός ο χρήστης είναι ανεπιθύμητος;"
       yes_delete_spammer: "Ναι, σβήσε τον ανεπιθύμητο χρήστη"
       ip_address_missing: "(μη διαθέσιμο)"
       hidden_email_address: "(κρυφό)"
@@ -2749,17 +2764,6 @@ el:
         title: "Αυτό το θέμα είναι ένα προσωπικό μήνυμα"
         help: "Αυτό το θέμα είναι ένα προσωπικό μήνυμα"
     posts: "Αναρτήσεις"
-    posts_likes_MF: |2
-
-      Αυτό το νήμα έχει {count, plural, one {1 απάντηση} other {# απαντήσεις}} {ratio, select,
-
-      low {με μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
-
-      med {με πολύ μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
-
-      high {με εξαιρετικά μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
-
-      other {}}
     original_post: "Αρχική Ανάρτηση"
     views: "Προβολές"
     views_lowercase:
@@ -2779,7 +2783,6 @@ el:
       one: "χρήστης"
       other: "χρήστες"
     category_title: "Κατηγορία"
-    history: "Ιστορικό"
     changed_by: "του/της %{author}"
     raw_email:
       title: "Εισερχόμενα email"
@@ -3097,6 +3100,16 @@ el:
     safe_mode:
       enabled: "Η λειτουργία ασφαλείας είναι ενεργοποιημένη, για να εξέλθεις από τη λειτουργία ασφαλείας κλείσε το παράθυρο περιήγησης"
     image_removed: "(η εικόνα αφαιρέθηκε)"
+    do_not_disturb:
+      title: "Μην ενοχλείτε για ..."
+      label: "Μην ενοχλείτε"
+      remaining: "%{remaining} απομένει"
+      options:
+        half_hour: "30 λεπτά"
+        one_hour: "1 ώρα"
+        two_hours: "2 ώρες"
+        tomorrow: "Μέχρι αύριο"
+        custom: "Προσαρμοσμένο"
   admin_js:
     type_to_filter: "γράψε εδώ για φιλτράρισμα..."
     admin:
@@ -3124,6 +3137,8 @@ el:
         installed_version: "Εγκατεστημένα"
         latest_version: "Τελευταία"
         problems_found: "Μερικές συμβουλές με βάση τις τρέχουσες ρυθμίσεις του ιστότοπού σας"
+        new_features:
+          dismiss: "Απόρριψη"
         last_checked: "Τελευταίος έλεγχος"
         refresh_problems: "Ανανέωση"
         no_problems: "Δεν βρέθηκε κανένα πρόβλημα."
@@ -3212,10 +3227,6 @@ el:
             available: "Το όνομα ομάδας είναι διαθέσιμο"
             not_available: "Το όνομα ομάδας δεν είναι διαθέσιμο"
             blank: "Το όνομα ομάδας δε μπορεί να είναι κενό"
-        bulk_add:
-          title: "Μαζική Προσθήκη σε Ομάδα"
-          complete_users_not_added: "Αυτοί οι χρήστες δεν προστέθηκαν (βεβαιώσου ότι έχουν λογαριασμό χρήστη):"
-          paste: "Κάνε επικόλληση μια λίστα με ονόματα χρηστών η διευθύνσεις email, ένα σε κάθε σειρά:"
         add_members:
           as_owner: "Ορισμός χρηστών ως ιδιοκτητών αυτής της ομάδας"
         manage:
@@ -3240,7 +3251,6 @@ el:
             effects: Εφέ
             trust_levels_none: "Κανένα"
             automatic_membership_email_domains: "Οι χρήστης των οποίων το email domain ταιριάζει με κάποιο από αυτά της λίστας, θα προστίθενται αυτόματα σε αυτή την ομάδα:"
-            automatic_membership_user_count: "%{count} χρήστες έχουν τους νέους τομείς email και θα προστεθούν στην ομάδα."
             primary_group: "Να οριστεί αυτόματα σαν η κύρια ομάδα"
         name_placeholder: "Όνομα ομάδας, χωρίς κενά, ίδιοι κανόνες με τους κανόνες για το όνομα χρήστη"
         primary: "Κύρια ομάδα"
@@ -3313,7 +3323,6 @@ el:
               wordpress: Απαραίτητο για να λειτουργήσει η προσθήκη WordPress wp-discourse.
             users:
               bookmarks: Λίστα σελιδοδεικτών χρηστών. Επιστρέφει τις υπενθυμίσεις σελιδοδεικτών όταν χρησιμοποιείτε τη μορφή ICS.
-              sync_sso: Συγχρονισμός ενός χρήστη χρησιμοποιώντας SSO.
               show: Λάβετε πληροφορίες σχετικά με έναν χρήστη.
               check_emails: Λίστα emails χρήστη.
       web_hooks:
@@ -3330,7 +3339,6 @@ el:
         go_back: "Πίσω στη λίστα"
         payload_url: "Payload URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Φαίνεται ότι προσπαθείς να εγκαταστήσεις το webhook σε ένα τοπικό url. Το γεγονός που διανέμεται σε μια τοπική διεύθυνση ενδέχεται να προκαλέσει παρενέργειες ή απρόσμενες συμπεριφορές. Συνέχεια;"
         secret_invalid: "Ο μυστικός κωδικός δεν πρέπει να έχει κενούς χαρακτήρες."
         secret_too_short: "Ο μυστικός κωδικός πρέπει να έχει τουλάχιστον 12 χαρακτήρες."
         secret_placeholder: "Χρήση ενός προαιρετικού string, για τη δημιουργία υπογραφής. "
@@ -3358,7 +3366,6 @@ el:
           details: "Όταν υπάρχει μια καινούρια απάντηση, επεξεργασμένη, διαγραμμένη ή ανακτημένη."
         user_event:
           name: "Γεγονός Χρήστη"
-          details: "Όταν ένας χρήστης συνδέεται, αποσυνδέεται, δημιουργείται, εγκρίνεται ή ενημερώνεται."
         group_event:
           name: "Συμβάν ομάδας"
           details: "Όταν μια ομάδα δημιουργείται, ενημερώνεται ή καταστρέφεται."
@@ -3609,6 +3616,7 @@ el:
           install_upload: "Από τη συσκευή σας"
           install_git_repo: "Από ένα αποθετήριο git"
           install_create: "Δημιουργία νέου"
+          duplicate_remote_theme: "Το στοιχείο θέματος «%{name}» είναι ήδη εγκατεστημένο, είστε βέβαιοι ότι θέλετε να εγκαταστήσετε ένα άλλο αντίγραφο;"
           about_theme: "Σχετικά"
           license: "Άδεια Χρήσης"
           version: "Έκδοση:"
@@ -3973,30 +3981,20 @@ el:
         title: "Επιτηρούμενες Λέξεις"
         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} λέξεις"
         actions:
           block: "Αποκλεισμός"
           censor: "Λογοκρισία"
           require_approval: "Απαιτεί Έγκριση"
           flag: "Σήμανση"
+          replace: "Αντικατάσταση"
         action_descriptions:
           block: "Αποτροπή της καταχώρησης αναρτήσεων που περιέχουν αυτές τις λέξεις. Ο χρήστης θα ενημερωθεί με μήνυμα λάθους όταν προσπαθήσει να καταχωρήσει την αναρτηση."
           censor: "Επίτρεψε τις αναρτήσεις με αυτές τις λέξεις, αλλά αντικατέστησε τις λογοκριμένες λέξεις με άλλους χαρακτήρες."
           require_approval: "Οι αναρτήσεις που περιέχουν αυτές τις λέξεις, χρειάζονται έγκριση από το προσωπικό πριν αναρτηθούν."
           flag: "Επίτρεψε τις αναρτήσεις που περιέχουν αυτές τις λέξεις, αλλά επισήμανέ τες ως ανάρμοστες για έλεγχο από συντονιστή."
         form:
-          label: "Νέα Λέξη:"
-          placeholder: "ολόκληρη λέξη ή * ως μπαλαντέρ"
           placeholder_regexp: "regular expression"
           add: "Προσθήκη"
           success: "Επιτυχία"
@@ -4050,6 +4048,8 @@ el:
         check_email:
           title: "Εμφάνισε το email αυτού του χρήστη"
           text: "Εμφάνιση"
+        check_sso:
+          text: "Δείξε"
       user:
         suspend_failed: "Κάποιο λάθος εμφανίστηκε κατά την αποβολή αυτού του χρήστη %{error}"
         unsuspend_failed: "Κάτι πήγε στραβά κατά την αναίρεση της αποβολής αυτού του χρήστη %{error}"
@@ -4057,6 +4057,7 @@ el:
         suspend_reason_label: "Γιατί αποβάλεις τον χρήστη; Αυτό το κείμενο <b>θα είναι ορατό σε όλους</b> στη σελίδα προφίλ αυτού του χρήστη και θα εμφανίζεται στο χρήστη όταν αυτός προσπαθήσει να συνδεθεί. Φρόντισε να είναι σύντομο."
         suspend_reason_hidden_label: "Ποιος είναι ο λόγος της αποβολής; Το κείμενο αυτό θα εμφανίζεται στον χρήστη όταν προσπαθήσει να συνδεθεί. Φροντίστε να είναι σύντομο."
         suspend_reason: "Αιτία"
+        suspend_reason_title: "Αιτιολόγηση Αποβολής"
         suspend_message: "Μήνυμα Email"
         suspend_message_placeholder: "Προεραιτικά συμπληρώστε αναλυτική αιτιολόγηση για τον λόγο αποβολής και αυτή θα σταλεί με email στον χρήστη."
         suspended_by: "Αποβλήθηκε από τον/την"
@@ -4082,7 +4083,6 @@ el:
         clear_penalty_history:
           title: "Καθαρισμός ιστορικού ποινών"
           description: "χρήστες με ποινές δε μπορούν να φτάσουν στο ΕΕ3"
-        delete_all_posts_confirm_MF: "Πρόκειται να διαγράψεις {POSTS, plural, one {1 ανάρτηση} other {# αναρτήσεις}} and {TOPICS, plural, one {1 νήμα} other {# νήματα}}. Είσαι σίγουρος;"
         silence: "Σίγαση"
         unsilence: "Αναίρεση Σίγασης"
         silenced: "Σε Σιγή;"
@@ -4233,11 +4233,10 @@ el:
           on_grace_period: "Δεν θα υποβιβαστεί. Ισχύει ακόμη η περίοδος χάριτος του τελευταίου προβιβασμού."
           locked_will_not_be_promoted: "Το επίπεδο εμπιστοσύνης είναι κλειδωμένο. Δε θα προβιβαστεί ποτέ."
           locked_will_not_be_demoted: "Το επίπεδο εμπιστοσύνης είναι κλειδωμένο. Δεν θα υποβιβαστεί ποτέ. "
-        sso:
-          title: "Single Sign On"
+        discourse_connect:
           external_id: "External ID"
           external_username: "Όνομα Χρήστη"
-          external_name: "Πλήρες Όνομα"
+          external_name: "Όνομα"
           external_email: "Διεύθυνση Email"
           external_avatar_url: "URL Εικόνας Προφίλ"
       user_fields:
@@ -4379,7 +4378,6 @@ el:
         icon: Σύμβολο
         image: Εικόνα
         icon_help: "Εισαγάγετε ένα όνομα εικονιδίου FontAwesome (χρησιμοποιήστε το πρόθεμα «far-» για κανονικά εικονίδια και «fab-» για εικονίδια επωνυμίας)"
-        image_help: "Εισαγάγετε τη διεύθυνση URL της εικόνας (παρακάμπτει το πεδίο εικονιδίου εάν έχουν ρυθμιστεί και τα δύο)"
         query: Ερώτηση παράσημου (SQL)
         target_posts: Το ερώτημα αφορά αναρτήσεις
         auto_revoke: Τρέξε καθημερινά το ερώτημα για την ανάκληση
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ee3e7ac12a..5f6e18e5fd 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -22,35 +22,35 @@ en:
         millions: "%{number}M"
     dates:
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      time: "HH:mm"
+      time: "h:mm a"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      time_with_zone: "HH:mm (z)"
+      time_with_zone: "hh:mm a (z)"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      time_short_day: "ddd, HH:mm"
+      time_short_day: "ddd, h:mm a"
       # 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: "MMM D, h:mm a"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_no_year_no_time: "D MMM"
+      long_no_year_no_time: "MMM D"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      full_no_year_no_time: "Do MMMM"
+      full_no_year_no_time: "MMMM Do"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_with_year: "D MMM YYYY HH:mm"
+      long_with_year: "MMM D, YYYY h:mm a"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_with_year_no_time: "D MMM YYYY"
+      long_with_year_no_time: "MMM D, YYYY"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      full_with_year_no_time: "D MMMM YYYY"
+      full_with_year_no_time: "MMMM Do, YYYY"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_date_with_year: "D MMM 'YY LT"
+      long_date_with_year: "MMM D, 'YY LT"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_date_without_year: "D MMM LT"
+      long_date_without_year: "MMM D, LT"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_date_with_year_without_time: "D MMM 'YY"
+      long_date_with_year_without_time: "MMM D, 'YY"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_date_without_year_with_linebreak: "D MMM <br/>LT"
+      long_date_without_year_with_linebreak: "MMM D <br/>LT"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_date_with_year_with_linebreak: "D MMM 'YY <br/>LT"
+      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
 
       wrap_ago: "%{date} ago"
 
@@ -87,7 +87,7 @@ en:
           one: "%{count}y"
           other: "%{count}y"
         # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-        date_month: "D MMM"
+        date_month: "MMM D"
         # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
         date_year: "MMM 'YY"
       medium:
@@ -101,7 +101,7 @@ en:
           one: "%{count} day"
           other: "%{count} days"
         # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-        date_year: "D MMM 'YY"
+        date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
           one: "%{count} min ago"
@@ -178,6 +178,10 @@ en:
     wizard_required: "Welcome to your new Discourse! Let’s get started with <a href='%{url}' data-auto-route='true'>the setup wizard</a> ✨"
     emails_are_disabled: "All outgoing email has been globally disabled by an administrator. No email notifications of any kind will be sent."
 
+    software_update_prompt:
+      message: "We've updated this site, <span>please refresh</span>, or you may experience unexpected behavior."
+      dismiss: "Dismiss"
+
     bootstrap_mode_enabled:
       one: "To make launching your new site easier, you are in bootstrap mode. All new users will be granted trust level 1 and have daily email summary emails enabled. This will be automatically turned off when %{count} user has joined."
       other: "To make launching your new site easier, you are in bootstrap mode. All new users will be granted trust level 1 and have daily email summary emails enabled. This will be automatically turned off when %{count} users have joined."
@@ -191,6 +195,7 @@ en:
       regions:
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
+        ap_east_1: "Asia Pacific (Hong Kong)"
         ap_south_1: "Asia Pacific (Mumbai)"
         ap_southeast_1: "Asia Pacific (Singapore)"
         ap_southeast_2: "Asia Pacific (Sydney)"
@@ -210,6 +215,7 @@ en:
         us_west_1: "US West (N. California)"
         us_west_2: "US West (Oregon)"
 
+    clear_input: "Clear input"
     edit: "edit the title and category of this topic"
     expand: "Expand"
     not_implemented: "That feature hasn't been implemented yet, sorry!"
@@ -244,6 +250,9 @@ en:
     now: "just now"
     read_more: "read more"
     more: "More"
+    x_more:
+      one: "%{count} More"
+      other: "%{count} More"
     less: "Less"
     never: "never"
     every_30_minutes: "every 30 minutes"
@@ -275,8 +284,9 @@ en:
       moderators: "Moderators"
       stat:
         all_time: "All Time"
-        last_7_days: "Last 7"
-        last_30_days: "Last 30"
+        last_day: "Last 24 hours"
+        last_7_days: "Last 7 days"
+        last_30_days: "Last 30 days"
       like_count: "Likes"
       topic_count: "Topics"
       post_count: "Posts"
@@ -314,18 +324,6 @@ en:
       search_placeholder: "Search bookmarks by name, topic title, or post content"
       search: "Search"
       reminders:
-        later_today: "Later today"
-        next_business_day: "Next business day"
-        tomorrow: "Tomorrow"
-        next_week: "Next week"
-        post_local_date: "Date in post"
-        later_this_week: "Later this week"
-        start_of_next_business_week: "Monday"
-        start_of_next_business_week_alt: "Next Monday"
-        next_month: "Next month"
-        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}"
@@ -342,9 +340,9 @@ en:
       new_private_message: "New private message draft"
       topic_reply: "Draft reply"
       abandon:
-        confirm: "You already opened another draft in this topic. Are you sure you want to abandon it?"
-        yes_value: "Yes, abandon"
-        no_value: "No, keep"
+        confirm: "You have a draft in progress for this topic. What would you like to do with it?"
+        yes_value: "Discard"
+        no_value: "Resume editing"
 
     topic_count_latest:
       one: "See %{count} new or updated topic"
@@ -370,6 +368,7 @@ en:
     upload: "Upload"
     uploading: "Uploading..."
     uploading_filename: "Uploading: %{filename}..."
+    processing_filename: "Processing: %{filename}..."
     clipboard: "clipboard"
     uploaded: "Uploaded!"
 
@@ -457,6 +456,7 @@ en:
       topic: "Topic:"
       filtered_topic: "You have filtered to reviewable content in a single topic."
       filtered_user: "User"
+      filtered_reviewed_by: "Reviewed By"
       show_all_topics: "show all topics"
       deleted_post: "(post deleted)"
       deleted_user: "(user deleted)"
@@ -467,11 +467,12 @@ en:
         email: "Email"
         name: "Name"
         fields: "Fields"
+        reject_reason: "Reason"
 
       user_percentage:
         summary:
-          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} total flag)"
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} total flags)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (of last flag)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (of last %{count} flags)"
         agreed:
           one: "%{count}% agree"
           other: "%{count}% agree"
@@ -516,7 +517,8 @@ en:
 
         priority:
           title: "Minimum Priority"
-          low: "(any)"
+          any: "(any)"
+          low: "Low"
           medium: "Medium"
           high: "High"
 
@@ -557,6 +559,8 @@ en:
           title: "Queued Post"
         reviewable_user:
           title: "User"
+        reviewable_post:
+          title: "Post"
       approval:
         title: "Post Needs Approval"
         description: "We've received your new post but it needs to be approved by a moderator before it will appear. Please be patient."
@@ -565,6 +569,42 @@ en:
           other: "You have <strong>%{count}</strong> posts pending."
         ok: "OK"
       example_username: "username"
+      reject_reason:
+        title: "Why are you rejecting this user?"
+        send_email: "Send rejection email"
+
+    relative_time_picker:
+      minutes:
+        one: "minute"
+        other: "minutes"
+      hours:
+        one: "hour"
+        other: "hours"
+      days:
+        one: "day"
+        other: "days"
+      months:
+        one: "month"
+        other: "months"
+      years:
+        one: "year"
+        other: "years"
+      relative: "Relative"
+
+    time_shortcut:
+      later_today: "Later today"
+      next_business_day: "Next business day"
+      tomorrow: "Tomorrow"
+      next_week: "Next week"
+      post_local_date: "Date in post"
+      later_this_week: "Later this week"
+      start_of_next_business_week: "Monday"
+      start_of_next_business_week_alt: "Next Monday"
+      next_month: "Next month"
+      custom: "Custom date and time"
+      relative: "Relative time"
+      none: "None needed"
+      last_custom: "Last custom datetime"
 
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a> posted <a href='%{topicUrl}'>the topic</a>"
@@ -657,6 +697,10 @@ en:
             imap_ssl: "Use SSL for IMAP"
             username: "Username"
             password: "Password"
+          settings:
+            title: "Settings"
+            allow_unknown_sender_topic_replies: "Allow unknown sender topic replies."
+            allow_unknown_sender_topic_replies_hint: "Allows unknown senders to reply to group topics. If this is not enabled, replies from email addresses not already included on the IMAP email thread or invited to the topic will create a new topic."
           mailboxes:
             synchronized: "Synchronized Mailbox"
             none_found: "No mailboxes were found in this email account."
@@ -758,7 +802,22 @@ en:
         make_owner_description: "Make <b>%{username}</b> an owner of this group"
         remove_owner: "Remove as Owner"
         remove_owner_description: "Remove <b>%{username}</b> as an owner of this group"
+        make_primary: "Make Primary"
+        make_primary_description: "Make this the primary group for <b>%{username}</b>"
+        remove_primary: "Remove as Primary"
+        remove_primary_description: "Remove this as the primary group for <b>%{username}</b>"
+        remove_members: "Remove Members"
+        remove_members_description: "Remove selected users from this group"
+        make_owners: "Make Owners"
+        make_owners_description: "Make selected users owners of this group"
+        remove_owners: "Remove Owners"
+        remove_owners_description: "Remove selected users as owners of this group"
+        make_all_primary: "Make All Primary"
+        make_all_primary_description: "Make this the primary group for all selected users"
+        remove_all_primary: "Remove as Primary"
+        remove_all_primary_description: "Remove this group as primary"
         owner: "Owner"
+        primary: "Primary"
         forbidden: "You're not allowed to view the members."
       topics: "Topics"
       posts: "Posts"
@@ -832,13 +891,21 @@ en:
       posts: "Posts"
       topics: "Topics"
       latest: "Latest"
-      latest_by: "latest by"
       toggle_ordering: "toggle ordering control"
       subcategories: "Subcategories"
       muted: "Muted categories"
       topic_sentence:
         one: "%{count} topic"
         other: "%{count} topics"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "week"
+        month: "month"
+      topic_stat_all_time:
+        one: "%{number} total"
+        other: "%{number} total"
       topic_stat_sentence_week:
         one: "%{count} new topic in the past week."
         other: "%{count} new topics in the past week."
@@ -902,7 +969,23 @@ en:
         mute_option_title: "You will not receive any notifications related to this user."
         normal_option: "Normal"
         normal_option_title: "You will be notified if this user replies to you, quotes you, or mentions you."
+      notification_schedule:
+        title: "Notification Schedule"
+        label: "Enable custom notification schedule"
+        tip: "Outside of these hours you will be put in 'do not disturb' automatically."
+        midnight: "Midnight"
+        none: "None"
+        monday: "Monday"
+        tuesday: "Tuesday"
+        wednesday: "Wednesday"
+        thursday: "Thursday"
+        friday: "Friday"
+        saturday: "Saturday"
+        sunday: "Sunday"
+        to: "to"
       activity_stream: "Activity"
+      read: "Read"
+      read_help: "Recently read topics"
       preferences: "Preferences"
       feature_topic_on_profile:
         open_search: "Select a New Topic"
@@ -931,11 +1014,23 @@ en:
         perm_denied_expl: "You denied permission for notifications. Allow notifications via your browser settings."
         disable: "Disable Notifications"
         enable: "Enable Notifications"
-        each_browser_note: "Note: You have to change this setting on every browser you use."
+        each_browser_note: 'Note: You have to change this setting on every browser you use. All notifications will be disabled when in "do not disturb", regardless of this setting.'
         consent_prompt: "Do you want live notifications when people reply to your posts?"
       dismiss: "Dismiss"
       dismiss_notifications: "Dismiss All"
       dismiss_notifications_tooltip: "Mark all unread notifications as read"
+      no_messages_title: "You don’t have any messages"
+      no_messages_body: >
+        Need to have a direct personal conversation with someone, outside the normal conversational flow? Message them by selecting their avatar and using the %{icon} message button.<br><br>
+        If you need help, you can <a href='%{aboutUrl}'>message a staff member</a>.
+      no_bookmarks_title: "You haven’t bookmarked anything yet"
+      no_bookmarks_body: >
+        Start bookmarking posts with the %{icon} button and they will be listed here for easy reference. You can schedule a reminder too!
+      no_notifications_title: "You don’t have any notifications yet"
+      no_notifications_body: >
+        You will be notified in this panel about activity directly relevant to you, including replies to your topics and posts, when someone <b>@mentions</b> you or quotes you, and replies to topics you are watching. Notifications will also be sent to your email when you haven’t logged in for a while.
+        <br><br>
+        Look for the %{icon} to decide which specific topics, categories and tags you want to be notified about. For more, see your <a href='%{preferencesUrl}'>notification preferences</a>.
       first_notification: "Your first notification! Select it to begin."
       dynamic_favicon: "Show counts on browser icon"
       skip_new_user_tips:
@@ -946,7 +1041,7 @@ en:
       color_scheme_default_on_all_devices: "Set default color scheme(s) on all my devices"
       color_scheme: "Color Scheme"
       color_schemes:
-        default_description: "Default"
+        default_description: "Theme default"
         disable_dark_scheme: "Same as regular"
         dark_instructions: "You can preview the dark mode color scheme by toggling your device's dark mode."
         undo: "Reset"
@@ -1054,6 +1149,7 @@ en:
 
       preferences_nav:
         account: "Account"
+        security: "Security"
         profile: "Profile"
         emails: "Emails"
         notifications: "Notifications"
@@ -1173,6 +1269,7 @@ en:
         uploaded_avatar_empty: "Add a custom picture"
         upload_title: "Upload your picture"
         image_is_not_a_square: "Warning: we've cropped your image; width and height were not equal."
+        logo_small: "Site's small logo. Used by default."
 
       change_profile_background:
         title: "Profile Header"
@@ -1199,7 +1296,7 @@ en:
         set_primary: "Set Primary Email"
         destroy: "Remove Email"
         add_email: "Add Alternate Email"
-        sso_override_instructions: "Email can be updated from SSO provider."
+        auth_override_instructions: "Email can be updated from authentication provider."
         no_secondary: "No secondary emails"
         instructions: "Never shown to the public."
         admin_note: "Note: An admin user changing another non-admin user's email indicates the user has lost access to their original email account, so a reset password email will be sent to their new address. The user's email will not change until they complete the reset password process."
@@ -1207,6 +1304,7 @@ en:
         required: "Please enter an email address"
         invalid: "Please enter a valid email address"
         authenticated: "Your email has been authenticated by %{provider}"
+        invite_auth_email_invalid: "Your invitation email does not match the email 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."
@@ -1242,6 +1340,7 @@ en:
         checking: "Checking username availability..."
         prefilled: "Email matches this registered username"
         required: "Please enter a username"
+        edit: "Edit username"
 
       locale:
         title: "Interface language"
@@ -1352,47 +1451,47 @@ en:
       notification_level_when_replying: "When I post in a topic, set that topic to"
 
       invited:
-        search: "type to search invites..."
         title: "Invites"
+        pending_tab: "Pending"
+        pending_tab_with_count: "Pending (%{count})"
+        expired_tab: "Expired"
+        expired_tab_with_count: "Expired (%{count})"
+        redeemed_tab: "Redeemed"
+        redeemed_tab_with_count: "Redeemed (%{count})"
+        invited_via: "Invitation"
+        invited_via_link: "link %{key} (%{count} / %{max} redeemed)"
+        groups: "Groups"
+        topic: "Topic"
+        sent: "Created/Last Sent"
+        expires_at: "Expires"
+        edit: "Edit"
+        remove: "Remove"
+        copy_link: "Get Link"
+        reinvite: "Resend Email"
+        reinvited: "Invite re-sent"
+        removed: "Removed"
+        search: "type to search invites..."
         user: "Invited User"
-        sent: "Last Sent"
         none: "No invites to display."
         truncated:
           one: "Showing the first invite."
           other: "Showing the first %{count} invites."
         redeemed: "Redeemed Invites"
-        redeemed_tab: "Redeemed"
-        redeemed_tab_with_count: "Redeemed (%{count})"
         redeemed_at: "Redeemed"
         pending: "Pending Invites"
-        pending_tab: "Pending"
-        pending_tab_with_count: "Pending (%{count})"
         topics_entered: "Topics Viewed"
         posts_read_count: "Posts Read"
         expired: "This invite has expired."
-        rescind: "Remove"
-        rescinded: "Invite removed"
-        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"
-        reinvite_all: "Resend all Invites"
+        remove_all: "Remove Expired Invites"
+        removed_all: "All Expired Invites removed!"
+        remove_all_confirm: "Are you sure you want to remove all expired invites?"
+        reinvite_all: "Resend All Invites"
         reinvite_all_confirm: "Are you sure you want to resend all invites?"
-        reinvited: "Invite re-sent"
-        reinvited_all: "All Invites re-sent!"
+        reinvited_all: "All Invites Sent!"
         time_read: "Read Time"
         days_visited: "Days Visited"
         account_age_days: "Account age in days"
-        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: "Invite"
-        copy_link: "Show Link"
         generate_link: "Create Invite Link"
         link_generated: "Here's your invite link!"
         valid_for: "Invite link is only valid for this email address: %{email}"
@@ -1404,12 +1503,47 @@ en:
           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?"
+
+        invite:
+          new_title: "Create Invite"
+          edit_title: "Edit Invite"
+
+          instructions: "Share this link to instantly grant access to this site:"
+          copy_link: "copy link"
+          expires_in_time: "Expires in %{time}."
+          expired_at_time: "Expired at %{time}."
+
+          show_advanced: "Show Advanced Options"
+          hide_advanced: "Hide Advanced Options"
+
+          restrict_email: "Restrict the invite to one email address"
+
+          max_redemptions_allowed: "Max number of uses:"
+
+          add_to_groups: "Add to groups:"
+          invite_to_topic: "Send to topic on first login:"
+          expires_at: "Expire after:"
+          custom_message: "Optional personal message:"
+
+          send_invite_email: "Save and Send Email"
+          save_invite: "Save Invite"
+
+          invite_saved: "Invite saved."
+          invite_copied: "Invite link copied."
+          blank_email: "Invite link not copied. Email address is required."
+
         bulk_invite:
           none: "No invitations to display on this page."
+
           text: "Bulk Invite"
-          success: "File uploaded successfully, you will be notified via message when the process is complete."
+          instructions: |
+            <p>Invite a list of users to get your community going quickly. Prepare a <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">CSV file</a> containing at least one row per email address of users you want to invite. The following comma separated information can be provided if you want to add people to groups or send them to a specific topic the first time they sign in.</p>
+            <pre>john@smith.com,first_group_name;second_group_name,topic_id</pre>
+            <p>Every email address in your uploaded CSV file will be sent an invitation, and you will be able to manage it later.</p>
+
+          progress: "Uploaded %{progress}%..."
+          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."
 
       password:
         title: "Password"
@@ -1476,6 +1610,8 @@ en:
       avatar:
         title: "Profile Picture"
         header_title: "profile, messages, bookmarks and preferences"
+        name_and_description: "%{name} - %{description}"
+        edit: "Edit Profile Picture"
       title:
         title: "Title"
         none: "(none)"
@@ -1516,7 +1652,7 @@ en:
       close: "close"
       dismiss_error: "Dismiss error"
     close: "Close"
-    assets_changed_confirm: "This site was just updated. Refresh now for the latest version?"
+    assets_changed_confirm: "This site just received a software upgrade. Get the latest version now?"
     logout: "You were logged out."
     refresh: "Refresh"
     home: "Home"
@@ -1552,16 +1688,6 @@ en:
 
     learn_more: "learn more..."
 
-    all_time: "total"
-    all_time_desc: "total topics created"
-    year: "year"
-    year_desc: "topics created in the last 365 days"
-    month: "month"
-    month_desc: "topics created in the last 30 days"
-    week: "week"
-    week_desc: "topics created in the last 7 days"
-    day: "day"
-
     first_post: First post
     mute: Mute
     unmute: Unmute
@@ -1580,14 +1706,17 @@ en:
       sign_up: "Sign Up"
       hide_session: "Remind me tomorrow"
       hide_forever: "no thanks"
-      hidden_for_session: "OK, I'll ask you tomorrow. You can always use 'Log In' to create an account, too."
+      hidden_for_session: "OK, we'll ask you tomorrow. You can always use 'Log In' to create an account, too."
       intro: "Hello! Looks like you’re enjoying the discussion, but you haven’t signed up for an account yet."
       value_prop: "When you create an account, we remember exactly what you’ve read, so you always come right back where you left off. You also get notifications, here and via email, whenever someone replies to you. And you can like posts to share the love. :heartpulse:"
 
     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:
+        one: "There is <b>%{count}</b> reply."
+        other: "There are <b>%{count}</b> replies."
+      # keys ending with _MF use message format, see https://meta.discourse.org/t/message-format-support-for-localization/7035 for details
+      description_time_MF: "There {replyCount, plural, one {is <b>#</b> reply} other {are <b>#</b> replies}} with an estimated read time of <b>{readingTime, plural, one {# minute} other {# minutes}}</b>."
       enable: "Summarize This Topic"
       disable: "Show All Posts"
 
@@ -1616,8 +1745,10 @@ en:
     search_hint: "username, email or IP address"
 
     create_account:
+      header_title: "Welcome!"
+      subheader_title: "Let's create your 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>."
-      title: "Create New Account"
+      title: "Create your account"
       failed: "Something went wrong, perhaps this email is already registered, try the forgot password link"
 
     forgot_password:
@@ -1639,6 +1770,7 @@ en:
     email_login:
       link_label: "Email me a login link"
       button_label: "with email"
+      login_link: "Skip the password; email me a login link"
       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."
@@ -1651,7 +1783,9 @@ en:
       confirm_button: Finish Login
 
     login:
-      title: "Log In"
+      header_title: "Welcome back"
+      subheader_title: "Log in to your account"
+      title: "Log in"
       username: "User"
       password: "Password"
       second_factor_title: "Two-Factor Authentication"
@@ -1666,7 +1800,7 @@ en:
       security_key_not_allowed_error: "The security key authentication process either timed out or was cancelled."
       security_key_no_matching_credential_error: "No matching credentials could be found in the provided security key."
       security_key_support_missing_error: "Your current device or browser does not support the use of security keys. Please use a different method."
-      email_placeholder: "email or username"
+      email_placeholder: "Email / Username"
       caps_lock_warning: "Caps Lock is on"
       error: "Unknown error"
       cookies_error: "Your browser seems to have cookies disabled. You might not be able to log in without enabling them first."
@@ -1737,7 +1871,6 @@ en:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (formerly EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1771,6 +1904,8 @@ en:
         other: "+ %{count} subcategories"
 
     select_kit:
+      filter_by: "Filter by: %{name}"
+      select_to_filter: "Select a value to filter"
       default_header_text: Select...
       no_content: No matches found
       filter_placeholder: Search...
@@ -1786,14 +1921,14 @@ en:
         one: "Selection must be at least %{count} character."
         other: "Selection must be at least %{count} characters."
       components:
+        tag_drop:
+          filter_for_more: Filter for more...
         categories_admin_dropdown:
           title: "Manage categories"
 
     date_time_picker:
       from: From
       to: To
-      errors:
-        to_before_from: "To date must be later than from date."
 
     emoji_picker:
       filter_placeholder: Search for emoji
@@ -1817,7 +1952,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 publish shared drafts."
       destination_category: "Destination Category"
       publish: "Publish Shared Draft"
       confirm_publish: "Are you sure you want to publish this draft?"
@@ -1829,7 +1964,6 @@ en:
       options: "Options"
       whisper: "whisper"
       unlist: "unlisted"
-      blockquote_text: "Blockquote"
 
       add_warning: "This is an official warning."
       toggle_whisper: "Toggle Whisper"
@@ -1854,10 +1988,16 @@ en:
 
       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:
+          one: "Title must be at least %{count} character"
+          other: "Title must be at least %{count} characters"
+        title_too_long:
+          one: "Title can't be more than %{count} character"
+          other: "Title can't be more than %{count} characters"
         post_missing: "Post can’t be empty"
-        post_length: "Post must be at least %{min} characters"
+        post_length:
+          one: "Post must be at least %{count} character"
+          other: "Post must be at least %{count} characters"
         try_like: "Have you tried the %{heart} button?"
         category_missing: "You must choose a category"
         tags_missing:
@@ -1892,8 +2032,8 @@ en:
       saved: "Saved!"
       saved_draft: "Post draft in progress. Tap to resume."
       uploading: "Uploading..."
-      show_preview: "show preview &raquo;"
-      hide_preview: "&laquo; hide preview"
+      show_preview: "show preview"
+      hide_preview: "hide preview"
 
       quote_post_title: "Quote whole post"
       bold_label: "B"
@@ -1907,8 +2047,8 @@ en:
       link_dialog_title: "Insert Hyperlink"
       link_optional_text: "optional title"
       link_url_placeholder: "Paste a URL or type to search topics"
-      quote_title: "Blockquote"
-      quote_text: "Blockquote"
+      blockquote_title: "Blockquote"
+      blockquote_text: "Blockquote"
       code_title: "Preformatted text"
       code_text: "indent preformatted text by 4 spaces"
       paste_code_text: "type or paste code here"
@@ -1933,7 +2073,7 @@ en:
         title: "Did you forget to add recipients?"
         body: "Right now this message is only being sent to yourself!"
       slow_mode:
-        error: "This topic is in slow mode. In order to promote thoughtful, considered discussion you may only post once every %{duration}."
+        error: "This topic is in slow mode. You already posted recently; you can post again in %{timeLeft}."
 
       admin_options_title: "Optional staff settings for this topic"
 
@@ -1964,7 +2104,7 @@ en:
           label: "New Topic"
         shared_draft:
           label: "Shared Draft"
-          desc: "Draft a topic that will only be visible to staff"
+          desc: "Draft a topic that will only be visible to allowed users"
         toggle_topic_bump:
           label: "Toggle topic bump"
           desc: "Reply without changing latest reply date"
@@ -2070,14 +2210,15 @@ 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"
       local_tip: "select images from your device"
-      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)"
+      local_tip_with_attachments: "select images or files from your device"
+      hint: "(you can also drag & drop into the editor to upload)"
       hint_for_supported_browsers: "you can also drag and drop or paste images into the editor"
       uploading: "Uploading"
       select_file: "Select File"
       default_image_alt_text: image
+      supported_formats: "supported formats"
 
     search:
       sort_by: "Sort by"
@@ -2104,6 +2245,7 @@ en:
       or_search_google: "Or try searching with Google instead:"
       search_google: "Try searching with Google instead:"
       search_google_button: "Google"
+      search_button: "Search"
 
       context:
         user: "Search posts by @%{username}"
@@ -2172,7 +2314,7 @@ en:
     go_back: "go back"
     not_logged_in_user: "user page with summary of current activity and preferences"
     current_user: "go to your user page"
-    view_all: "view all"
+    view_all: "view all %{tab}"
 
     topics:
       new_messages_marker: "last visit"
@@ -2194,7 +2336,9 @@ en:
         change_category: "Set Category"
         close_topics: "Close Topics"
         archive_topics: "Archive Topics"
+        move_messages_to_inbox: "Move to Inbox"
         notification_level: "Notifications"
+        change_notification_level: "Change Notification Level"
         choose_new_category: "Choose the new category for the topics:"
         selected:
           one: "You have selected <b>%{count}</b> topic."
@@ -2204,7 +2348,10 @@ en:
         choose_new_tags: "Choose new tags for these topics:"
         choose_append_tags: "Choose new tags to append for these topics:"
         changed_tags: "The tags of those topics were changed."
-        remove_tags: "Remove Tags"
+        remove_tags: "Remove All Tags"
+        confirm_remove_tags:
+          one: "All tags will be removed from this topic. Are you sure?"
+          other: "All tags will be removed from <b>%{count}</b> topics. Are you sure?"
         progress:
           one: "Progress: <strong>%{count}</strong> topic"
           other: "Progress: <strong>%{count}</strong> topics"
@@ -2221,7 +2368,7 @@ en:
         top: "There are no top topics."
         educate:
           new: '<p>Your new topics will appear here. By default, topics are considered new and will show a <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> indicator if they were created in the last 2 days.</p><p>Visit your <a href="%{userPrefsUrl}">preferences</a> to change this.</p>'
-          unread: '<p>Your unread topics appear here.</p><p>By default, topics are considered unread and will show unread counts <span class="badge new-posts badge-notification">1</span> if you:</p><ul><li>Created the topic</li><li>Replied to the topic</li><li>Read the topic for more than 4 minutes</li></ul><p>Or if you have explicitly set the topic to Tracked or Watched via the notification control at the bottom of each topic.</p><p>Visit your <a href="%{userPrefsUrl}">preferences</a> to change this.</p>'
+          unread: '<p>Your unread topics appear here.</p><p>By default, topics are considered unread and will show unread counts <span class="badge new-posts badge-notification">1</span> if you:</p><ul><li>Created the topic</li><li>Replied to the topic</li><li>Read the topic for more than 4 minutes</li></ul><p>Or if you have explicitly set the topic to Tracked or Watched via the 🔔 in each topic.</p><p>Visit your <a href="%{userPrefsUrl}">preferences</a> to change this.</p>'
       bottom:
         latest: "There are no more latest topics."
         posted: "There are no more posted topics."
@@ -2306,14 +2453,14 @@ en:
         UNREAD, plural,
         =0 {}
         one {
-        is <a href='{basePath}/unread'>1 unread</a>
+        is <a href='{basePath}/unread'># 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}
+        one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'># 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 {}}"
 
@@ -2333,19 +2480,25 @@ en:
         select: "Users may only post in this topic once every:"
         description: "To promote thoughtful discussion in fast moving or contentious discussions, users must wait before posting again in this topic."
         save: "Enable"
+        enabled_until: "Enabled until:"
         remove: "Disable"
         hours: "Hours:"
         minutes: "Minutes:"
         seconds: "Seconds:"
         durations:
+          10_minutes: "10 Minutes"
           15_minutes: "15 Minutes"
+          30_minutes: "30 Minutes"
+          45_minutes: "45 Minutes"
           1_hour: "1 Hour"
+          2_hours: "2 Hours"
           4_hours: "4 Hours"
-          1_day: "1 Day"
-          1_week: "1 Week"
+          8_hours: "8 Hours"
+          12_hours: "12 Hours"
+          24_hours: "24 Hours"
           custom: "Custom Duration"
       slow_mode_notice:
-        duration: "You need to wait %{duration} between posts in this topic"
+        duration: "Please wait %{duration} between posts in this topic"
       topic_status_update:
         title: "Topic Timer"
         save: "Set Timer"
@@ -2354,7 +2507,9 @@ en:
         remove: "Remove Timer"
         publish_to: "Publish To:"
         when: "When:"
-        time_frame_required: Please select a time frame
+        time_frame_required: "Please select a time frame"
+        min_duration: "Duration must be greater than 0"
+        max_duration: "Duration must be less than 20 years"
       auto_update_input:
         none: "Select a timeframe"
         now: "Now"
@@ -2363,13 +2518,13 @@ en:
         later_this_week: "Later this week"
         this_weekend: "This weekend"
         next_week: "Next week"
-        two_weeks: "Two Weeks"
+        two_weeks: "Two weeks"
         next_month: "Next month"
-        two_months: "Two Months"
-        three_months: "Three Months"
-        four_months: "Four Months"
-        six_months: "Six Months"
-        one_year: "One Year"
+        two_months: "Two months"
+        three_months: "Three months"
+        four_months: "Four months"
+        six_months: "Six months"
+        one_year: "One year"
         forever: "Forever"
         pick_date_and_time: "Pick date and time"
         set_based_on_last_post: "Close based on last post"
@@ -2383,9 +2538,11 @@ en:
         title: "Close Temporarily"
       auto_close:
         title: "Auto-Close Topic"
-        label: "Auto-close topic hours:"
+        label: "Auto-close topic after:"
         error: "Please enter a valid value."
         based_on_last_post: "Don't close until the last post in the topic is at least this old."
+      auto_close_after_last_post:
+        title: "Auto-Close Topic After Last Post"
       auto_delete:
         title: "Auto-Delete Topic"
       auto_bump:
@@ -2399,7 +2556,7 @@ en:
         auto_open: "This topic will automatically open %{timeLeft}."
         auto_close: "This topic will automatically close %{timeLeft}."
         auto_publish_to_category: "This topic will be published to <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "This topic will close %{duration} after the last reply."
+        auto_close_after_last_post: "This topic will close %{duration} after the last reply."
         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}."
@@ -2408,6 +2565,9 @@ en:
       auto_close_immediate:
         one: "The last post in the topic is already %{count} hour old, so the topic will be closed immediately."
         other: "The last post in the topic is already %{count} hours old, so the topic will be closed immediately."
+      auto_close_momentarily:
+        one: "The last post in the topic is already %{count} hour old, so the topic will be closed momentarily."
+        other: "The last post in the topic is already %{count} hours old, so the topic will be closed momentarily."
 
       timeline:
         back: "Back"
@@ -2421,7 +2581,9 @@ en:
         go: "go"
         jump_bottom: "jump to last post"
         jump_prompt: "jump to..."
-        jump_prompt_of: "of %{count} posts"
+        jump_prompt_of:
+          one: "of %{count} post"
+          other: "of %{count} posts"
         jump_prompt_long: "Jump to..."
         jump_bottom_with_number: "jump to post %{post_number}"
         jump_prompt_to_date: "to date"
@@ -2434,12 +2596,15 @@ en:
         reasons:
           mailing_list_mode: "You have mailing list mode enabled, so you will be notified of replies to this topic via email."
           "3_10": "You will receive notifications because you are watching a tag on this topic."
+          "3_10_stale": "You will receive notifications because you were watching a tag on this topic in the past."
           "3_6": "You will receive notifications because you are watching this category."
+          "3_6_stale": "You will receive notifications because you were watching this category in the past."
           "3_5": "You will receive notifications because you started watching this topic automatically."
           "3_2": "You will receive notifications because you are watching this topic."
           "3_1": "You will receive notifications because you created this topic."
           "3": "You will receive notifications because you are watching this topic."
           "2_8": "You will see a count of new replies because you are tracking this category."
+          "2_8_stale": "You will see a count of new replies because you were tracking this category in the past."
           "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>.'
@@ -2512,6 +2677,15 @@ en:
         title: "Share"
         extended_title: "Share a link"
         help: "share a link to this topic"
+        instructions: "Share a link to this topic:"
+        copied: "Topic link copied."
+        notify_users:
+          title: "Notify"
+          instructions: "Notify the following users about this topic:"
+          success:
+            one: "Successfully notified %{username} about this topic."
+            other: "Successfully notified all users about this topic."
+        invite_users: "Invite"
 
       print:
         title: "Print"
@@ -2574,15 +2748,15 @@ en:
         username_placeholder: "username"
         action: "Send Invite"
         help: "invite others to this topic via email or notifications"
-        to_forum: "We'll send a brief email allowing your friend to immediately join by clicking a link, no login required."
-        sso_enabled: "Enter the username of the person you'd like to invite to this topic."
+        to_forum: "We'll send a brief email allowing your friend to immediately join by clicking a link."
+        discourse_connect_enabled: "Enter the username of the person you'd like to invite to this topic."
         to_topic_blank: "Enter the username or email address of the person you'd like to invite to this topic."
         to_topic_email: "You've entered an email address. We'll email an invitation that allows your friend to immediately reply to this topic."
         to_topic_username: "You've entered a username. We'll send a notification with a link inviting them to this topic."
         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>%{invitee}</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."
@@ -2710,8 +2884,8 @@ en:
       edit_reason: "Reason: "
       post_number: "post %{number}"
       ignored: "Ignored content"
-      wiki_last_edited_on: "wiki last edited on"
-      last_edited_on: "post last edited on"
+      wiki_last_edited_on: "wiki last edited on %{dateTime}"
+      last_edited_on: "post last edited on %{dateTime}"
       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}:"
@@ -2736,6 +2910,7 @@ en:
       has_replies:
         one: "%{count} Reply"
         other: "%{count} Replies"
+      has_replies_count: "%{count}"
 
       unknown_user: "(unknown/deleted user)"
       has_likes_title:
@@ -2747,6 +2922,17 @@ en:
         one: "you and %{count} other person liked this post"
         other: "you and %{count} other people liked this post"
 
+      filtered_replies_hint:
+        one: "View this post and its reply"
+        other: "View this post and its %{count} replies"
+
+      filtered_replies_viewing:
+        one: "Viewing %{count} reply to"
+        other: "Viewing %{count} replies to"
+
+      in_reply_to: "Load parent post"
+      view_all_posts: "View all posts"
+
       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."
@@ -2761,18 +2947,11 @@ en:
         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."
 
-      abandon_edit:
-        confirm: "Are you sure you want to discard your changes?"
-        no_value: "No, keep"
-        no_save_draft: "No, save draft"
-        yes_value: "Yes, discard edit"
-
-      abandon:
-        title: "Abandon Draft"
-        confirm: "Are you sure you want to abandon your post?"
-        no_value: "No, keep"
-        no_save_draft: "No, save draft"
-        yes_value: "Yes, abandon"
+      cancel_composer:
+        confirm: "What would you like to do with your post?"
+        discard: "Discard"
+        save_draft: "Save draft for later"
+        keep_editing: "Keep editing"
 
       via_email: "this post arrived via email"
       via_auto_generated_email: "this post arrived via an auto generated email"
@@ -2825,7 +3004,9 @@ en:
         unlock_post_description: "allow the poster to edit this post"
         delete_topic_disallowed_modal: "You don't have permission to delete this topic. If you really want it to be deleted, submit a flag for moderator attention together with reasoning."
         delete_topic_disallowed: "you don't have permission to delete this topic"
-        delete_topic_confirm_modal: "This topic currently has over %{minViews} views and may be a popular search destination. Are you sure you want to delete this topic entirely, instead of editing it to improve it?"
+        delete_topic_confirm_modal:
+          one: "This topic currently has over %{count} view and may be a popular search destination. Are you sure you want to delete this topic entirely, instead of editing it to improve it?"
+          other: "This topic currently has over %{count} views and may be a popular search destination. Are you sure you want to delete this topic entirely, instead of editing it to improve it?"
         delete_topic_confirm_modal_yes: "Yes, delete this topic"
         delete_topic_confirm_modal_no: "No, keep this topic"
         delete_topic_error: "An error occurred while deleting this topic"
@@ -2834,6 +3015,7 @@ en:
         change_post_notice: "Change Staff Notice"
         delete_post_notice: "Delete Staff Notice"
         remove_timer: "remove timer"
+        edit_timer: "edit timer"
 
       actions:
         people:
@@ -2916,6 +3098,19 @@ en:
           edit_bookmark:
             name: "Edit bookmark"
             description: "Edit the bookmark name or change the reminder date and time"
+          pin_bookmark:
+            name: "Pin bookmark"
+            description: "Pin the bookmark. This will make it appear at the top of your bookmarks list."
+          unpin_bookmark:
+            name: "Unpin bookmark"
+            description: "Unpin the bookmark. It will no longer appear at the top of your bookmarks list."
+
+      filtered_replies:
+        viewing_posts_by: "Viewing %{post_count} posts by"
+        viewing_subset: "Some replies are collapsed"
+        viewing_summary: "Viewing a summary of this topic"
+        post_number: "%{username}, post #%{post_number}"
+        show_all: "Show all"
 
     category:
       can: "can&hellip; "
@@ -2974,10 +3169,10 @@ en:
         reply: "Reply"
         create: "Create"
         no_groups_selected: "No groups have been granted access; this category will only be visible to staff."
-        everyone_has_access: "This category is public, everyone can see, reply and create posts. To restrict permissions, remove one or more of the permissions granted to the \"everyone\" group."
+        everyone_has_access: 'This category is public, everyone can see, reply and create posts. To restrict permissions, remove one or more of the permissions granted to the "everyone" group.'
         toggle_reply: "Toggle Reply permission"
         toggle_full: "Toggle Create permission"
-        inherited: "This permission is inherited from \"everyone\""
+        inherited: 'This permission is inherited from "everyone"'
       special_warning: "Warning: This category is a pre-seeded category and the security settings cannot be edited. If you do not wish to use this category, delete it instead of repurposing it."
       uncategorized_security_warning: "This category is special. It is intended as holding area for topics that have no category; it cannot have security settings."
       uncategorized_general_warning: 'This category is special. It is used as the default category for new topics that do not have a category selected. If you want to prevent this behavior and force category selection, <a href="%{settingLink}">please disable the setting here</a>. If you want to change the name or description, go to <a href="%{customizeLink}">Customize / Text Content</a>.'
@@ -2993,6 +3188,7 @@ en:
       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"
+      allow_unlimited_owner_edits_on_first_post: "Allow unlimited owner edits on first post"
       subcategory_list_style: "Subcategory List Style:"
       sort_order: "Topic List Sort By:"
       default_view: "Default Topic List:"
@@ -3016,19 +3212,19 @@ en:
       notifications:
         watching:
           title: "Watching"
-          description: "You will automatically watch all topics in these categories. You will be notified of every new post in every topic, and a count of new replies will be shown."
+          description: "You will automatically watch all topics in this category. You will be notified of every new post in every topic, and a count of new replies will be shown."
         watching_first_post:
           title: "Watching First Post"
           description: "You will be notified of new topics in this category but not replies to the topics."
         tracking:
           title: "Tracking"
-          description: "You will automatically track all topics in these categories. You will be notified if someone mentions your @name or replies to you, and a count of new replies will be shown."
+          description: "You will automatically track all topics in this category. You will be notified if someone mentions your @name or replies to you, and a count of new replies will be shown."
         regular:
           title: "Normal"
           description: "You will be notified if someone mentions your @name or replies to you."
         muted:
           title: "Muted"
-          description: "You will never be notified of anything about new topics in these categories, and they will not appear in latest."
+          description: "You will never be notified of anything about new topics in this category, and they will not appear in latest."
       search_priority:
         label: "Search Priority"
         options:
@@ -3063,6 +3259,7 @@ en:
       list_filters:
         all: "all topics"
         none: "no subcategories"
+      colors_disabled: "You can’t select colors because you have a category style of none."
 
     flagging:
       title: "Thanks for helping to keep our community civil!"
@@ -3081,9 +3278,10 @@ en:
       notify_action: "Message"
       official_warning: "Official Warning"
       delete_spammer: "Delete Spammer"
+      flag_for_review: "Queue For Review"
 
       # keys ending with _MF use message format, see https://meta.discourse.org/t/message-format-support-for-localization/7035 for details
-      delete_confirm_MF: "You are about to delete {POSTS, plural, one {<b>1</b> post} other {<b>#</b> posts}} and {TOPICS, plural, one {<b>1</b> topic} other {<b>#</b> topics}} from this user, remove their account, block signups from their IP address <b>{ip_address}</b>, and add their email address <b>{email}</b> to a permanent block list. Are you sure this user is really a spammer?"
+      delete_confirm_MF: "You are about to delete {POSTS, plural, one {<b>#</b> post} other {<b>#</b> posts}} and {TOPICS, plural, one {<b>#</b> topic} other {<b>#</b> topics}} from this user, remove their account, block signups from their IP address <b>{ip_address}</b>, and add their email address <b>{email}</b> to a permanent block list. Are you sure this user is really a spammer?"
       yes_delete_spammer: "Yes, Delete Spammer"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(hidden)"
@@ -3156,7 +3354,7 @@ en:
 
     # keys ending with _MF use message format, see https://meta.discourse.org/t/message-format-support-for-localization/7035 for details
     posts_likes_MF: |
-      This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
+      This topic has {count, plural, one {# reply} other {# replies}} {ratio, select,
         low {with a high like to post ratio}
         med {with a very high like to post ratio}
         high {with an extremely high like to post ratio}
@@ -3180,7 +3378,7 @@ en:
       one: "user"
       other: "users"
     category_title: "Category"
-    history: "History"
+    history: "History, last 100 revisions"
     changed_by: "by %{author}"
 
     raw_email:
@@ -3275,6 +3473,8 @@ en:
       content_load_error: '<a href="%url%">The content</a> could not be loaded.'
       image_load_error: '<a href="%url%">The image</a> could not be loaded.'
 
+    cannot_render_video: This video cannot be rendered because your browser does not support the codec.
+
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -3447,6 +3647,8 @@ en:
         one: "%{tags} and %{count} more"
         other: "%{tags} and %{count} more"
       delete_no_unused_tags: "There are no unused tags."
+      # Example: "tag1, tag2, tag3"
+      tag_list_joiner: ", "
       delete_unused: "Delete Unused Tags"
       delete_unused_description: "Delete all tags which are not attached to any topics or personal messages"
       cancel_delete_unused: "Cancel"
@@ -3489,6 +3691,7 @@ en:
         everyone_can_use: "Tags can be used by everyone"
         usable_only_by_groups: "Tags are visible to everyone, but only the following groups can use them"
         visible_only_to_groups: "Tags are visible only to the following groups"
+        cannot_save: "Cannot save tag group. Make sure that there is at least one tag present, tag group name is not empty, and a group is selected for tags permission."
 
       topics:
         none:
@@ -3503,11 +3706,12 @@ en:
     invite:
       custom_message: "Make your invite a little bit more personal by writing a <a href>custom message</a>."
       custom_message_placeholder: "Enter your custom message"
-      approval_not_required: "User will be auto-approved as soon as they will accept this invite."
+      approval_not_required: "User will be auto-approved as soon as they accept this invite."
       custom_message_template_forum: "Hey, you should join this forum!"
       custom_message_template_topic: "Hey, I thought you might enjoy this topic!"
 
     forced_anonymous: "Due to extreme load, this is temporarily being shown to everyone as a logged out user would see it."
+    forced_anonymous_login_required: "The site is under extreme load and cannot be loaded at this time, try again in a few minutes."
 
     footer_nav:
       back: "Back"
@@ -3520,6 +3724,18 @@ en:
 
     image_removed: "(image removed)"
 
+    do_not_disturb:
+      title: "Do not disturb for..."
+      label: "Do not disturb"
+      remaining: "%{remaining} remaining"
+      options:
+        half_hour: "30 minutes"
+        one_hour: "1 hour"
+        two_hours: "2 hours"
+        tomorrow: "Until tomorrow"
+        custom: "Custom"
+      set_schedule: "Set a notification schedule"
+
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
     type_to_filter: "type to filter..."
@@ -3552,6 +3768,10 @@ en:
         installed_version: "Installed"
         latest_version: "Latest"
         problems_found: "Some advice based on your current site settings"
+        new_features:
+          title: "🎁 New Features"
+          dismiss: "Dismiss"
+          learn_more: "Learn more"
         last_checked: "Last checked"
         refresh_problems: "Refresh"
         no_problems: "No problems were found."
@@ -3643,10 +3863,6 @@ en:
             available: "Group name is available"
             not_available: "Group name is not available"
             blank: "Group name cannot be blank"
-        bulk_add:
-          title: "Bulk Add to Group"
-          complete_users_not_added: "These users were not added (make sure they have an account):"
-          paste: "Paste a list of usernames or emails, one per line:"
         add_members:
           as_owner: "Set user(s) as owner(s) of this group"
         manage:
@@ -3674,7 +3890,9 @@ 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_user_count: "%{count} users have the new email domains and will be added to the group."
+            automatic_membership_user_count:
+              one: "%{count} user has the new email domains and will be added to the group."
+              other: "%{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"
@@ -3686,7 +3904,11 @@ en:
         group_members: "Group members"
         delete: "Delete"
         delete_confirm: "Delete this group?"
+        delete_with_messages_confirm:
+          one: "Deleting this group will cause %{count} message to be orphaned, group members will no longer have access to it.<br><br>Are you sure?"
+          other: "Deleting this group will cause %{count} messages to be orphaned, group members will no longer have access to them.<br><br>Are you sure?"
         delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed."
+        delete_automatic_group: This is an automatic group and cannot be deleted.
         delete_owner_confirm: "Remove owner privilege for '%{username}'?"
         add: "Add"
         custom: "Custom"
@@ -3749,7 +3971,7 @@ en:
               wordpress: Necessary for the WordPress wp-discourse plugin to work.
             users:
               bookmarks: List user bookmarks. It returns bookmark reminders when using the ICS format.
-              sync_sso: Synchronize a user using SSO.
+              sync_sso: Synchronize a user using DiscourseConnect.
               show: Obtain information about an user.
               check_emails: List user emails.
               update: Update user profile information.
@@ -3773,7 +3995,7 @@ en:
         go_back: "Back to list"
         payload_url: "Payload URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "It seems you are trying to set up the webhook to a local url. Event delivered to a local address may cause side-effect or unexpected behaviours. Continue?"
+        warn_local_payload_url: "It seems you are trying to set up the webhook to a local url. Event delivered to a local address may cause side-effect or unexpected behaviors. Continue?"
         secret_invalid: "Secret must not have any blank characters."
         secret_too_short: "Secret should be at least 12 characters."
         secret_placeholder: "An optional string, used for generating signature"
@@ -3801,7 +4023,7 @@ en:
           details: "When there is a new reply, edit, deleted or recovered."
         user_event:
           name: "User Event"
-          details: "When a user logs in, logs out, is created, approved or updated."
+          details: "When a user logs in, logs out, confirms their email, is created, approved or updated."
         group_event:
           name: "Group Event"
           details: "When a group is created, updated or destroyed."
@@ -3820,6 +4042,12 @@ en:
         user_badge_event:
           name: "Badge Grant Event"
           details: "When a user receives a badge."
+        group_user_event:
+          name: "Group User Event"
+          details: "When a user is added or removed in a group."
+        like_event:
+          name: "Like Event"
+          details: "When a user likes a post."
         delivery_status:
           title: "Delivery Status"
           inactive: "Inactive"
@@ -4013,7 +4241,9 @@ en:
           convert: "Convert"
           convert_component_alert: "Are you sure you want to convert this component to theme? It will be removed as a component from %{relatives}."
           convert_component_tooltip: "Convert this component to theme"
+          convert_component_alert_generic: "Are you sure you want to convert this component to theme?"
           convert_theme_alert: "Are you sure you want to convert this theme to component? It will be removed as a parent from %{relatives}."
+          convert_theme_alert_generic: "Are you sure you want to convert this theme to component?"
           convert_theme_tooltip: "Convert this theme to component"
           inactive_themes: "Inactive themes:"
           inactive_components: "Unused components:"
@@ -4047,17 +4277,20 @@ en:
           included_components: "Included components"
           add_all: "Add all"
           import_web_tip: "Repository containing theme"
+          direct_install_tip: "Are you sure you want to install <strong>%{name}</strong> from the repository listed below?"
           import_web_advanced: "Advanced..."
           import_file_tip: ".tar.gz, .zip, or .dcstyle.json file containing theme"
           is_private: "Theme is in a private git repository"
           remote_branch: "Branch name (optional)"
           public_key: "Grant the following public key access to the repo:"
+          public_key_note: "After entering a valid private repository URL above, an SSH key will be generated and displayed here."
           install: "Install"
           installed: "Installed"
           install_popular: "Popular"
           install_upload: "From your device"
           install_git_repo: "From a git repository"
           install_create: "Create new"
+          duplicate_remote_theme: "The theme component “%{name}” is already installed, are you sure you want to install another copy?"
           about_theme: "About"
           license: "License"
           version: "Version:"
@@ -4087,6 +4320,7 @@ en:
             one: "Theme is %{count} commit behind!"
             other: "Theme is %{count} commits behind!"
           compare_commits: "(See new commits)"
+          remote_theme_edits: "If you want to edit this theme, you must <a href='%{repoURL}' target='_blank'>submit a change on its repository</a>"
           repo_unreachable: "Couldn't contact the Git repository of this theme. Error message:"
           imported_from_archive: "This theme was imported from a .zip file"
           scss:
@@ -4113,9 +4347,7 @@ en:
 
               Example:
 
-              :root {
-                --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};
-              }
+              %{example}
 
               Prefixing the property names is highly recommended to avoid conflicts with plugins and/or core.
           head_tag:
@@ -4127,6 +4359,8 @@ en:
           yaml:
             text: "YAML"
             title: "Define theme settings in YAML format"
+          scss_color_variables_warning: "Using core SCSS color variables in themes is deprecated. Please use CSS custom properties instead. See <a href=\"https://meta.discourse.org/t/-/77551#color-variables-2\" target=\"_blank\">this guide</a> for more details."
+          scss_warning_inline: "Using core SCSS color variables in themes is deprecated."
         colors:
           select_base:
             title: "Select base color palette"
@@ -4406,6 +4640,7 @@ en:
             topic_unarchived: "topic unarchived"
             post_staff_note_create: "add staff note"
             post_staff_note_destroy: "destroy staff note"
+            delete_group: "delete group"
         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."
@@ -4454,31 +4689,34 @@ en:
         title: "Watched Words"
         search: "search"
         clear_filter: "Clear"
-        show_words: "show words"
-        one_word_per_line: "One word per line"
+        show_words:
+          one: "show %{count} word"
+          other: "show %{count} words"
         download: Download
         clear_all: Clear All
-        clear_all_confirm_block: "Are you sure you want to clear all watched words for the Block action?"
-        clear_all_confirm_censor: "Are you sure you want to clear all watched words for the Censor action?"
-        clear_all_confirm_flag: "Are you sure you want to clear all watched words for the Flag action?"
-        clear_all_confirm_require_approval: "Are you sure you want to clear all watched words for the Require Approval action?"
-        word_count:
-          one: "%{count} word"
-          other: "%{count} words"
+        clear_all_confirm: "Are you sure you want to clear all watched words for the %{action} action?"
         actions:
           block: "Block"
           censor: "Censor"
           require_approval: "Require Approval"
           flag: "Flag"
+          replace: "Replace"
+          tag: "Tag"
         action_descriptions:
           block: "Prevent posts containing these words from being posted. The user will see an error message when they try to submit their post."
           censor: "Allow posts containing these words, but replace them with characters that hide the censored words."
           require_approval: "Posts containing these words will require approval by staff before they can be seen."
           flag: "Allow posts containing these words, but flag them as inappropriate so moderators can review them."
+          replace: "Replace words in posts with other words or links"
+          tag: "Automatically tag topics based on first post"
         form:
-          label: "New Word:"
-          placeholder: "full word or * as wildcard"
+          label: "Has word or phrase"
+          placeholder: "Enter word or phrase (* is a wildcard)"
           placeholder_regexp: "regular expression"
+          replacement_label: "Replacement"
+          replacement_placeholder: "example or https://example.com"
+          tag_label: "Tag"
+          tag_placeholder: "tag1,tag2,tag3"
           add: "Add"
           success: "Success"
           exists: "Already exists"
@@ -4533,6 +4771,9 @@ en:
         check_email:
           title: "Reveal this user's email address"
           text: "Show"
+        check_sso:
+          title: "Reveal SSO payload"
+          text: "Show"
 
       user:
         suspend_failed: "Something went wrong suspending this user %{error}"
@@ -4545,7 +4786,7 @@ en:
         suspend_reasons:
           not_listening_to_staff: "Would not listen to staff feedback"
           consuming_staff_time: "Consumed disproportionate amounts of staff time"
-          combatative: "Too combatative"
+          combatative: "Too combative"
           in_wrong_place: "In the wrong place"
           no_constructive_purpose: "No constructive purpose to their actions other than creating dissent within the community"
           custom: "Custom..."
@@ -4576,7 +4817,7 @@ en:
           description: "users with penalties cannot reach TL3"
 
         # keys ending with _MF use message format, see https://meta.discourse.org/t/message-format-support-for-localization/7035 for details
-        delete_all_posts_confirm_MF: "You are about to delete {POSTS, plural, one {1 post} other {# posts}} and {TOPICS, plural, one {1 topic} other {# topics}}. Are you sure?"
+        delete_all_posts_confirm_MF: "You are about to delete {POSTS, plural, one {# post} other {# posts}} and {TOPICS, plural, one {# topic} other {# topics}}. Are you sure?"
         silence: "Silence"
         unsilence: "Unsilence"
         silenced: "Silenced?"
@@ -4625,6 +4866,9 @@ en:
         anonymize_yes: "Yes, anonymize this account"
         anonymize_failed: "There was a problem anonymizing the account."
         delete: "Delete User"
+        delete_posts:
+          progress:
+            title: "Progress of deleting posts"
         merge:
           button: "Merge"
           prompt:
@@ -4637,6 +4881,8 @@ en:
             target_username_placeholder: "Username of new owner"
             transfer_and_delete: "Transfer & Delete @%{username}"
             cancel: "Cancel"
+          progress:
+            title: "Merge progress"
           confirmation:
             title: "Transfer & Delete @%{username}"
             description: |
@@ -4732,8 +4978,8 @@ en:
           on_grace_period: "Currently in promotion grace period, will not be demoted."
           locked_will_not_be_promoted: "Trust level locked. Will never be promoted."
           locked_will_not_be_demoted: "Trust level locked. Will never be demoted."
-        sso:
-          title: "Single Sign On"
+        discourse_connect:
+          title: "DiscourseConnect Single Sign On"
           external_id: "External ID"
           external_username: "Username"
           external_name: "Name"
@@ -4741,7 +4987,7 @@ en:
           external_avatar_url: "Profile Picture URL"
           last_payload: "Last Payload"
           delete_sso_record: "Delete SSO Record"
-          confirm_delete: "Are you sure you would like to delete this single sign on (SSO) record?"
+          confirm_delete: "Are you sure you would like to delete this DiscourseConnect record?"
 
       user_fields:
         title: "User Fields"
@@ -4773,6 +5019,10 @@ en:
           title: "Show on user card?"
           enabled: "shown on user card"
           disabled: "not shown on user card"
+        searchable:
+          title: "Searchable?"
+          enabled: "searchable"
+          disabled: "not searchable"
 
         field_types:
           text: "Text Field"
@@ -4789,6 +5039,8 @@ en:
         go_back: "Back to Search"
         recommended: "We recommend customizing the following text to suit your needs:"
         show_overriden: "Only show overridden"
+        locale: "Language:"
+        fallback_locale_warning: "You are editing a language based on %{fallback}. Users who choose %{fallback} as their interface language won't see your changes."
         more_than_50_results: "There are more than 50 results. Please refine your search."
 
       settings: # used by theme and site settings
@@ -4797,6 +5049,10 @@ en:
         reset: "reset"
         none: "none"
       site_settings:
+        emoji_list:
+          invalid_input: "Emoji list should only contain valid emoji names, eg: hugs"
+          add_emoji_button:
+            label: "Add Emoji"
         title: "Settings"
         no_results: "No results found."
         more_than_30_results: "There are more than 30 results. Please refine your search or select a category."
@@ -4849,6 +5105,9 @@ en:
           modal_no: "No, only apply change going forward"
         simple_list:
           add_item: "Add item..."
+        json_schema:
+          edit: Launch Editor
+          modal_title: "Edit %{name}"
 
       badges:
         title: Badges
@@ -4886,8 +5145,12 @@ en:
         enabled: Enable badge
         icon: Icon
         image: Image
+        graphic: Graphic
         icon_help: "Enter a Font Awesome icon name (use prefix 'far-' for regular icons and 'fab-' for brand icons)"
-        image_help: "Enter the URL of the image (overrides icon field if both are set)"
+        image_help: "Uploading an image overrides icon field if both are set."
+        select_an_icon: "Select an Icon"
+        upload_an_image: "Upload an Image"
+        read_only_setting_help: "Customize text"
         query: Badge Query (SQL)
         target_posts: Query targets posts
         auto_revoke: Run revocation query daily
diff --git a/config/locales/client.en_GB.yml b/config/locales/client.en_GB.yml
new file mode 100644
index 0000000000..1e81f3201d
--- /dev/null
+++ b/config/locales/client.en_GB.yml
@@ -0,0 +1,156 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
+  js:
+    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: "D MMM YYYY HH:mm"
+      long_with_year_no_time: "D MMM YYYY"
+      full_with_year_no_time: "D MMMM YYYY"
+      long_date_with_year: "D MMM 'YY LT"
+      long_date_without_year: "D MMM LT"
+      long_date_with_year_without_time: "D MMM 'YY"
+      long_date_without_year_with_linebreak: "D MMM <br/>LT"
+      long_date_with_year_with_linebreak: "D MMM 'YY <br/>LT"
+      tiny:
+        date_month: "D MMM"
+        date_year: "MMM 'YY"
+      medium:
+        date_year: "D MMM 'YY"
+    groups:
+      manage:
+        email:
+          status: "Synchronised %{old_emails} / %{total_emails} emails via IMAP."
+          mailboxes:
+            synchronized: "Synchronised Mailbox"
+      flair_bg_color: "Avatar Flair Background Colour"
+      flair_bg_color_placeholder: "(Optional) Hex colour value"
+      flair_color: "Avatar Flair Colour"
+      flair_color_placeholder: "(Optional) Hex colour value"
+    categories:
+      reorder:
+        title_long: "Reorganise the category list"
+    ip_lookup:
+      organisation: Organisation
+    user:
+      color_scheme_default_on_all_devices: "Set default colour scheme(s) on all my devices"
+      color_scheme: "Colour Scheme"
+      color_schemes:
+        dark_instructions: "You can preview the dark mode colour scheme by toggling your device's dark mode."
+      dark_mode_enable: "Enable automatic dark mode colour scheme"
+      change_profile_background:
+        instructions: "Profile headers will be centred and have a default width of 1110px."
+      change_card_background:
+        instructions: "Background images will be centred and have a default width of 590px."
+      summary:
+        title: "Summary"
+    read_only_mode:
+      login_disabled: "Login is disabled whilst the site is in read only mode."
+      logout_disabled: "Logout is disabled whilst the site is in read only mode."
+    summary:
+      enable: "Summarise This Topic"
+    composer:
+      italic_text: "emphasised text"
+      collapse: "minimise the composer panel"
+    search:
+      advanced:
+        in_category:
+          label: Categorised
+    topic:
+      automatically_add_to_groups: "This invitation also includes access to these groups:"
+    post:
+      errors:
+        upload_not_authorized: "Sorry, the file you are trying to upload is not authorised (authorised extensions: %{authorized_extensions})."
+      controls:
+        convert_to_moderator: "Add Staff Colour"
+        revert_to_regular: "Remove Staff Colour"
+        delete_topic_error: "An error occurred whilst deleting this topic"
+    category:
+      badge_colors: "Badge colours"
+      background_color: "Background colour"
+      foreground_color: "Foreground colour"
+      color_placeholder: "Any web colour"
+      already_used: "This colour has been used by another category"
+      uncategorized_general_warning: 'This category is special. It is used as the default category for new topics that do not have a category selected. If you want to prevent this behaviour and force category selection, <a href="%{settingLink}">please disable the setting here</a>. If you want to change the name or description, go to <a href="%{customizeLink}">Customise / Text Content</a>.'
+      colors_disabled: "You can’t select colours because you have a category style of none."
+    tagging:
+      manage_groups_description: "Define groups to organise tags"
+  admin_js:
+    admin:
+      dashboard:
+        exception_error: Sorry, an error occurred whilst executing the query
+      api:
+        scopes:
+          descriptions:
+            users:
+              anonymize: Anonymise user accounts.
+      backups:
+        upload:
+          error: "There has been an error whilst uploading '%{filename}': %{message}"
+      invite:
+        button_text: "Send invitations"
+        button_title: "Send invitations"
+      customize:
+        title: "Customise"
+        long_title: "Site customisations"
+        color: "Colour"
+        theme:
+          customize_desc: "Customise:"
+          long_title: "Amend colours, CSS and HTML contents of your site"
+          color_scheme_user_selectable: "Colour scheme can be selected by users"
+          color_scheme: "Colour Palette"
+          color_scheme_select: "Select colours to be used by theme"
+          color_definitions:
+            text: "Colour Definitions"
+            title: "Enter custom colour definitions (advanced users only)"
+        colors:
+          select_base:
+            title: "Select base colour palette"
+          title: "Colours"
+          edit: "Edit colour palettes"
+          long_title: "Colour palettes"
+          about: "Modify the colours used by your themes. Create a new colour palette to start."
+          new_name: "New colour palette"
+          delete_confirm: "Delete this colour palette?"
+          undo_title: "Undo your changes to this colour since the last time it was saved."
+          revert_title: "Reset this colour to Discourse's default colour palette."
+          secondary:
+            description: "The main background colour, and text colour of some buttons."
+          tertiary:
+            description: "Links, some buttons, notifications, and accent colour."
+          header_background:
+            description: "Background colour of the site's header."
+          highlight:
+            description: "The background colour of highlighted elements on the page, such as posts and topics."
+          danger:
+            description: "Highlight colour for actions like deleting posts and topics."
+          love:
+            description: "The like button's colour."
+        email_style:
+          heading: "Customise Email Style"
+          instructions: "Customise the template in which all html emails are rendered, and style using CSS."
+      logs:
+        staff_actions:
+          actions:
+            anonymize_user: "anonymise user"
+      user:
+        anonymize: "Anonymise User"
+        anonymize_confirm: "Are you SURE you want to anonymise this account? This will change the username and email, and reset all profile information."
+        anonymize_yes: "Yes, anonymise this account"
+        anonymize_failed: "There was a problem anonymising the account."
+        merge_failed: "There was an error whilst merging the users."
+        delete_confirm: "It is generally preferable to anonymise users rather than deleting them, to avoid removing content from existing discussions.<br><br>Are you SURE you want to delete this user? This is permanent!"
+      site_text:
+        description: "You can customise any of the text on your forum. Please start by searching below:"
+      badges:
+        read_only_setting_help: "Customise text"
diff --git a/config/locales/client.en_US.yml b/config/locales/client.en_US.yml
deleted file mode 100644
index 889e8c66c9..0000000000
--- a/config/locales/client.en_US.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-en_US:
-  js:
-    dates:
-      # 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"
-      # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      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/
-      full_no_year_no_time: "MMMM Do"
-      # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_with_year: "MMM D, YYYY h:mm a"
-      # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_with_year_no_time: "MMM D, YYYY"
-      # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      full_with_year_no_time: "MMMM Do, YYYY"
-      # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_date_with_year: "MMM D, 'YY LT"
-      # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_date_without_year: "MMM D, LT"
-      # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_date_with_year_without_time: "MMM D, 'YY"
-      # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_date_without_year_with_linebreak: "MMM D <br/>LT"
-      # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
-
-      tiny:
-        # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-        date_month: "MMM D"
-        # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-        date_year: "MMM 'YY"
-      medium:
-        # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-        date_year: "MMM D, 'YY"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 7eaba19b22..45fa1ab855 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -50,16 +50,16 @@ es:
           one: "%{count}s"
           other: "%{count}s"
         less_than_x_minutes:
-          one: "< %{count}m"
+          one: "< %{count} min"
           other: "< %{count} min"
         x_minutes:
-          one: "%{count}m"
+          one: "%{count} min"
           other: "%{count} min"
         about_x_hours:
-          one: "%{count}h"
+          one: "%{count} h"
           other: "%{count} h"
         x_days:
-          one: "%{count}d"
+          one: "%{count} d"
           other: "%{count} d"
         x_months:
           one: "%{count} mes"
@@ -117,12 +117,12 @@ es:
       placeholder: fecha
     share:
       topic_html: 'Tema: <span class="topic-title">%{topicTitle}</span>'
-      post: "publicación #%{postNumber}"
+      post: "publicación núm. %{postNumber}"
       close: "cerrar"
       twitter: "Compartir en Twitter"
       facebook: "Compartir en Facebook"
       email: "Enviar por correo electrónico"
-      url: "Copias y compartir URL"
+      url: "Copiar y compartir la URL"
     action_codes:
       public_topic: "hizo este tema público %{when}"
       private_topic: "hizo este tema un mensaje personal %{when}"
@@ -143,11 +143,11 @@ es:
         enabled: "archivado %{when}"
         disabled: "desarchivado %{when}"
       pinned:
-        enabled: "destacado %{when}"
-        disabled: "sin destacar %{when}"
+        enabled: "fijado %{when}"
+        disabled: "desfijado %{when}"
       pinned_globally:
-        enabled: "destacado globalmente %{when}"
-        disabled: "sin destacar %{when}"
+        enabled: "fijado globalmente %{when}"
+        disabled: "desfijado %{when}"
       visible:
         enabled: "listado %{when}"
         disabled: "quitado de la lista %{when}"
@@ -157,7 +157,10 @@ es:
       forwarded: "reenvió el correo electrónico de arriba"
     topic_admin_menu: "acciones del tema"
     wizard_required: "¡Bienvenido a tu nuevo Discourse! Empezaremos con <a href='%{url}' data-auto-route='true'>el asistente de configuración</a> ✨"
-    emails_are_disabled: "Todos los correos electrónicos salientes han sido deshabilitados globalmente por un administrador. No se enviarán notificaciones por correo electrónico de ningún tipo."
+    emails_are_disabled: "Todos los correos electrónicos salientes han sido desactivados globalmente por un administrador. No se enviarán notificaciones por correo de ningún tipo."
+    software_update_prompt:
+      message: "Hemos actualizado este sitio, <span>por favor actualice</span>, o podría experimentar un comportamiento inesperado."
+      dismiss: "Descartar"
     bootstrap_mode_enabled:
       one: "Para hacer que la inauguración de tu sitio sea más fácil, el modo lanzamiento está activado. Todas las cuentas tendrán nivel de confianza 1 y los mensajes de resumen diarios están activados. Esto se desactivará automáticamente cuando se hayan registrado %{count} usuario."
       other: "Para hacer que la inauguración de tu sitio sea más fácil, el modo lanzamiento está activado. Todas las cuentas tendrán nivel de confianza 1 y los mensajes de resumen diarios están activados. Esto se desactivará automáticamente cuando se hayan registrado %{count} usuarios."
@@ -169,6 +172,7 @@ es:
       regions:
         ap_northeast_1: "Asia-Pacífico (Tokio)"
         ap_northeast_2: "Asia-Pacífico (Seúl)"
+        ap_east_1: "Asia Pacific (Hong Kong)"
         ap_south_1: "Asia Pacific (Mumbai)"
         ap_southeast_1: "Asia-Pacífico (Singapur)"
         ap_southeast_2: "Asia-Pacífico (Sydney)"
@@ -187,6 +191,7 @@ es:
         us_gov_west_1: "AWS GovCloud (EEUU-oeste)"
         us_west_1: "EEUU oeste (norte de California)"
         us_west_2: "EEUU oeste (Oregon)"
+    clear_input: "Borrar"
     edit: "editar el título y la categoría de este tema"
     expand: "Expandir"
     not_implemented: "¡Lo sentimos! Esa característica no se ha implementado todavía."
@@ -194,8 +199,8 @@ es:
     yes_value: "Sí"
     submit: "Enviar"
     generic_error: "Lo sentimos, ha ocurrido un error."
-    generic_error_with_reason: "Ocurrió un error: %{error}"
-    go_ahead: "Adelante"
+    generic_error_with_reason: "Ha ocurrido un error: %{error}"
+    go_ahead: "Continuar"
     sign_up: "Registrarse"
     log_in: "Iniciar sesión"
     age: "Edad"
@@ -210,8 +215,8 @@ es:
     faq: "Preguntas frecuentes"
     guidelines: "Guía"
     privacy_policy: "Política de privacidad"
-    privacy: "Política de privacidad"
-    tos: "Términos de servicio"
+    privacy: "Privacidad"
+    tos: "Términos del servicio"
     rules: "Reglas"
     conduct: "Código de conducta"
     mobile_view: "Versión móvil"
@@ -221,6 +226,9 @@ es:
     now: "justo ahora"
     read_more: "leer más"
     more: "Más"
+    x_more:
+      one: "%{count} más"
+      other: "%{count} más"
     less: "Menos"
     never: "nunca"
     every_30_minutes: "cada 30 minutos"
@@ -235,7 +243,7 @@ es:
       one: "%{count} carácter"
       other: "%{count} caracteres"
     related_messages:
-      title: " Mensajes relacionados"
+      title: "Mensajes relacionados"
       see_all: 'Ver <a href="%{path}">todos los mensajes</a> de @%{username}...'
     suggested_topics:
       title: "Temas sugeridos"
@@ -249,8 +257,9 @@ es:
       moderators: "Moderadores"
       stat:
         all_time: "Todo el tiempo"
-        last_7_days: "Últimos 7"
-        last_30_days: "Últimos 30"
+        last_day: "Últimas 24 horas"
+        last_7_days: "Últimos 7 días"
+        last_30_days: "Últimos 30 días"
       like_count: "Me gusta"
       topic_count: "Temas"
       post_count: "Publicaciones"
@@ -262,16 +271,16 @@ es:
       title: "Marcador"
       clear_bookmarks: "Quitar marcadores"
       help:
-        bookmark: "Haz clic para marcar la primera publicación sobre este tema"
-        unbookmark: "Haz clic para eliminar todos los marcadores en este tema"
+        bookmark: "Haz clic para añadir a marcadores la primera publicación de este tema"
+        unbookmark: "Haz clic para eliminar todos los marcadores de 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"
+      not_bookmarked: "añadir esta publicación a marcadores"
       created_with_reminder: "Has marcado esta publicación con un recordatorio %{date}. %{name}"
       remove: "Eliminar marcador"
       delete: "Borrar marcador"
-      confirm_delete: "¿Seguro que quieres borrar este marcados? El recordatorio también se borrará."
+      confirm_delete: "¿Quieres borrar este marcador? 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>.'
@@ -286,22 +295,10 @@ es:
       search_placeholder: "Buscar marcadores por nombre, título del tema o contenido de la publicación"
       search: "Buscar"
       reminders:
-        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"
-        post_local_date: "Fecha de la publicación"
-        later_this_week: "Esta misma semana"
-        start_of_next_business_week: "Lunes"
-        start_of_next_business_week_alt: "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: "Tiene un recordatorio establecido para este marcador que se enviará %{at_date_time}"
+        existing_reminder: "Tienes un recordatorio para este marcador que se enviará %{at_date_time}"
     copy_codeblock:
       copied: "¡copiado!"
     drafts:
@@ -312,15 +309,15 @@ es:
       new_private_message: "Nuevo borrador de mensaje privado"
       topic_reply: "Borrador de respuesta"
       abandon:
-        confirm: "Ya has abierto otro borrador en este tema. ¿Estás seguro de que quieres abandonarlo?"
-        yes_value: "Sí, abandonar"
-        no_value: "No, mantener"
+        confirm: "Tienes un borrador en curso para este tema. ¿Qué te gustaría hacer?"
+        yes_value: "Descartar"
+        no_value: "Seguir editando"
     topic_count_latest:
       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"
+      other: "Ver %{count} temas sin leer"
     topic_count_new:
       one: "Ver %{count} tema nuevo"
       other: "Ver %{count} temas nuevos"
@@ -333,6 +330,7 @@ es:
     upload: "Subir"
     uploading: "Subiendo..."
     uploading_filename: "Subiendo: %{filename}..."
+    processing_filename: "Procesando: %{filename}..."
     clipboard: "portapapeles"
     uploaded: "¡Subido!"
     pasting: "Pegando..."
@@ -340,7 +338,7 @@ es:
     disable: "Desactivar"
     continue: "Continuar"
     undo: "Deshacer"
-    revert: "Revertir"
+    revert: "Deshacer"
     failed: "Falló"
     switch_to_anon: "Entrar en modo anónimo"
     switch_from_anon: "Salir del modo anónimo"
@@ -353,9 +351,9 @@ es:
       none_found: "No se encontraron temas."
       title:
         search: "Busca un tema"
-        placeholder: "escribe el título, url o ID del tema aquí"
+        placeholder: "escribe el título, url o id del tema aquí"
     choose_message:
-      none_found: "No se encontraron mensajes."
+      none_found: "No se han encontrado mensajes."
       title:
         search: "Busca un mensaje"
         placeholder: "escribe el título, url o ID del mensaje aquí"
@@ -402,15 +400,16 @@ es:
       moderation_history: "Historial de moderación"
       view_all: "Ver todo"
       grouped_by_topic: "Agrupado por tema"
-      none: "No hay artículos para revisar."
+      none: "No hay nada para revisar."
       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 esperando aprobación"
       title: "Revisión"
       topic: "Tema:"
       filtered_topic: "Has filtrado a contenido revisable en un solo tema."
       filtered_user: "Usuario"
+      filtered_reviewed_by: "Revisado por"
       show_all_topics: "mostrar todos los temas"
       deleted_post: "(publicación eliminada)"
       deleted_user: "(usuario eliminado)"
@@ -421,10 +420,11 @@ es:
         email: "Correo electrónico"
         name: "Nombre"
         fields: "Campos"
+        reject_reason: "Motivo"
       user_percentage:
         summary:
-          one: "%{agreed}, %{disagreed}, %{ignored}, (%{count} reporte en total)"
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} reportes totales)"
+          one: "%{agreed}, %{disagreed}, %{ignored}, (del último reporte)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (de los últimos %{count} reportes)"
         agreed:
           one: "%{count}% de acuerdo"
           other: "%{count}% de acuerdo"
@@ -445,12 +445,12 @@ es:
           one: "%{count} usuario"
           other: "%{count} usuarios"
       replies:
-        one: "%{count} respuest"
+        one: "%{count} respuesta"
         other: "%{count} respuestas"
       edit: "Editar"
       save: "Guardar"
       cancel: "Cancelar"
-      new_topic: "Aprobar este elemento creará un tema nuevo"
+      new_topic: "Aprobar este elemento creará un nuevo tema"
       filters:
         all_categories: "(todas las categorías)"
         type:
@@ -467,13 +467,14 @@ es:
           created_at_asc: "Creado el (inverso)"
         priority:
           title: "Prioridad mínima"
-          low: "(cualquiera)"
+          any: "(cualquiera)"
+          low: "Baja"
           medium: "Media"
           high: "Alta"
       conversation:
         view_full: "ver conversación completa"
       scores:
-        about: "Esta puntuación se calcula en función del nivel de confianza de quien lo reporta, la precisión de sus reportes anteriores y la prioridad del elemento que se reporta."
+        about: "Esta puntuación se calcula en función del nivel de confianza de quien reporta, la precisión de sus reportes anteriores y la prioridad del elemento que se reporta."
         score: "Puntuación"
         date: "Fecha"
         type: "Tipo"
@@ -498,28 +499,64 @@ es:
       types:
         reviewable_flagged_post:
           title: "Publicación reportada"
-          flagged_by: "Reportado por"
+          flagged_by: "Reportada por"
         reviewable_queued_topic:
           title: "Tema en cola"
         reviewable_queued_post:
           title: "Publicación en cola"
         reviewable_user:
           title: "Usuario"
+        reviewable_post:
+          title: "Publicación"
       approval:
         title: "La publicación requiere aprobación"
-        description: "Hemos recibido tu nueva publicación, pero debe ser aprobada por un moderador antes de que aparezca. Por favor, sé paciente."
+        description: "Hemos recibido tu nueva publicación, pero debe ser aprobada por un moderador antes de que aparezca. Por favor, ten paciencia."
         pending_posts:
           one: "Tienes <strong>%{count}</strong> publicación pendiente."
           other: "Tienes <strong>%{count}</strong> publicaciones pendientes."
         ok: "OK"
       example_username: "nombre de usuario"
+      reject_reason:
+        title: "¿Por qué estás rechazando a este usuario?"
+        send_email: "Enviar correo electrónico de rechazo"
+    relative_time_picker:
+      minutes:
+        one: "minuto"
+        other: "minutos"
+      hours:
+        one: "hora"
+        other: "horas"
+      days:
+        one: "día"
+        other: "días"
+      months:
+        one: "mes"
+        other: "meses"
+      years:
+        one: "año"
+        other: "años"
+      relative: "Relativo"
+    time_shortcut:
+      later_today: "Hoy más tarde"
+      next_business_day: "Siguiente día hábil"
+      tomorrow: "Mañana"
+      next_week: "La próxima semana"
+      post_local_date: "Fecha en la publicación"
+      later_this_week: "Más tarde esta semana"
+      start_of_next_business_week: "Lunes"
+      start_of_next_business_week_alt: "El próximo lunes"
+      next_month: "El próximo mes"
+      custom: "Fecha y hora personalizadas"
+      relative: "Tiempo relativo"
+      none: "No se necesita"
+      last_custom: "Última fecha y hora personalizada"
     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_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> respondió en <a href='%{topicUrl}'>el tema</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Tú</a> respondiste en <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>"
@@ -540,12 +577,12 @@ es:
       topic_count_long: "Temas creados"
       post_count: "Respuestas"
       post_count_long: "Respuestas publicadas"
-      no_results: "No se encontraron resultados."
+      no_results: "No se han encontrado resultados."
       days_visited: "Visitas"
       days_visited_long: "Días visitados"
       posts_read: "Leídos"
       posts_read_long: "Publicaciones leídas"
-      last_updated: "Última actialización:"
+      last_updated: "Última actualización:"
       total_rows:
         one: "%{count} usuario"
         other: "%{count} usuarios"
@@ -560,11 +597,11 @@ es:
       member_added: "Añadido"
       member_requested: "Solicitado el"
       add_members:
-        title: "Agregar miembros a %{group_name}"
+        title: "Añadir miembros a %{group_name}"
         description: "También puedes pegar una lista separada por comas."
-        usernames: "Ingrese nombres de usuario o direcciones de correo electrónico"
+        usernames: "Introduce nombres de usuario o direcciones de correo electrónico"
         input_placeholder: "Nombres de usuario o correos electrónicos"
-        notify_users: "Notificaciones a usuarios"
+        notify_users: "Notificar usuarios"
       requests:
         title: "Solicitudes"
         reason: "Motivo"
@@ -587,7 +624,7 @@ es:
           posting: Publicando
           notification: Notificación
         email:
-          title: "Email"
+          title: "Correo electrónico"
           status: "Sincronizados %{old_emails} / %{total_emails} correos a través de IMAP."
           credentials:
             title: "Credenciales"
@@ -599,6 +636,10 @@ es:
             imap_ssl: "Usar SSL para IMAP"
             username: "Nombre de usuario"
             password: "Contraseña"
+          settings:
+            title: "Ajustes"
+            allow_unknown_sender_topic_replies: "Permitir respuestas a temas de remitentes desconocidos."
+            allow_unknown_sender_topic_replies_hint: "Permite a remitentes desconocidos responder a temas de grupo. Si esto no está activado, las respuestas de direcciones de correo electrónico no incluidas en el hilo de correo IMAP o invitadas al tema crearán un nuevo tema."
           mailboxes:
             synchronized: "Bandeja de correo sincronizada"
             none_found: "No se han encontrado bandejas de correo para esta cuenta de correo electrónico."
@@ -642,7 +683,7 @@ es:
       public_exit: "Permitir a los usuarios abandonar el grupo libremente"
       empty:
         posts: "No hay publicaciones por miembros de este grupo."
-        members: "No hay miembros en este grupo."
+        members: "Este grupo no tiene miembros."
         requests: "No hay solicitudes de membresía para este grupo."
         mentions: "No hay menciones de este grupo."
         messages: "No hay mensajes para este grupo."
@@ -665,7 +706,7 @@ es:
       group_name: "Nombre del grupo"
       user_count: "Usuarios"
       bio: "Acerca del grupo"
-      selector_placeholder: "Ingresa tu nombre de usuario"
+      selector_placeholder: "introduce tu nombre de usuario"
       owner: "propietario"
       index:
         title: "Grupos"
@@ -695,13 +736,28 @@ es:
         filter_placeholder_admin: "nombre de usuario o correo electrónico"
         filter_placeholder: "nombre de usuario"
         remove_member: "Eliminar miembro"
-        remove_member_description: "Eliminar <b>%{username}</b> de este grupo"
+        remove_member_description: "Quitar a <b>%{username}</b> de este grupo"
         make_owner: "Hacer propietario"
         make_owner_description: "Hacer a <b>%{username}</b> un propietario de este grupo"
         remove_owner: "Eliminar como propietario"
         remove_owner_description: "Eliminar a <b>%{username}</b> como propietario de este grupo"
+        make_primary: "Elegir como principal"
+        make_primary_description: "Hacer de este el grupo principal de <b>%{username}</b>"
+        remove_primary: "Eliminar como principal"
+        remove_primary_description: "Eliminar esto como el grupo principal de <b>%{username}</b>"
+        remove_members: "Quitar miembros"
+        remove_members_description: "Quitar a los usuarios seleccionados de este grupo"
+        make_owners: "Hacer propietarios"
+        make_owners_description: "Convertir a los usuarios seleccionados en propietarios de este grupo"
+        remove_owners: "Quitar propietarios"
+        remove_owners_description: "Quitar a los usuarios seleccionados de propietarios de este grupo"
+        make_all_primary: "Hacer todo primario"
+        make_all_primary_description: "Hacer este grupo el principal de todos los usuarios seleccionados"
+        remove_all_primary: "Quitar como principal"
+        remove_all_primary_description: "Quitar este grupo como principal"
         owner: "Propietario"
-        forbidden: "No tienes permitido ver los miembros."
+        primary: "Principal"
+        forbidden: "No tienes permitido ver los miembros del grupo."
       topics: "Temas"
       posts: "Publicaciones"
       mentions: "Menciones"
@@ -749,7 +805,7 @@ es:
       "3": "Marcadores"
       "4": "Temas"
       "5": "Respuestas"
-      "6": "Reacciones"
+      "6": "Respuestas"
       "7": "Menciones"
       "9": "Citas"
       "11": "Ediciones"
@@ -772,13 +828,21 @@ es:
       posts: "Publicaciones"
       topics: "Temas"
       latest: "Recientes"
-      latest_by: "recientes por"
       toggle_ordering: "cambiar orden"
       subcategories: "Subcategorías"
       muted: "Categorías silenciadas"
       topic_sentence:
         one: "%{count} tema"
         other: "%{count} temas"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "semana"
+        month: "mes"
+      topic_stat_all_time:
+        one: "%{number} en total"
+        other: "%{number} en total"
       topic_stat_sentence_week:
         one: "%{count} nuevo tema en la última semana."
         other: "%{count} temas nuevos en la última semana."
@@ -795,11 +859,11 @@ es:
       phone: Teléfono
       other_accounts: "Otras cuentas con esta dirección IP:"
       delete_other_accounts: "Eliminar %{count}"
-      username: "usuario"
+      username: "nombre de usuario"
       trust_level: "NC"
       read_time: "tiempo de lectura"
-      topics_entered: "temas ingresados"
-      post_count: "nº de publicaciones"
+      topics_entered: "temas visitados"
+      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"
@@ -810,13 +874,13 @@ es:
       said: "%{username}:"
       profile: "Perfil"
       mute: "Silenciar"
-      edit: "Editar Preferencias"
+      edit: "Editar preferencias"
       download_archive:
-        button_text: "Descargar todos"
+        button_text: "Descargar todo"
         confirm: "¿Seguro de que quieres descargar tus publicaciones?"
         success: "Descarga iniciada, se te notificará por mensaje cuando el proceso se haya completado."
         rate_limit_error: "Solo se pueden descargar las publicaciones una vez al día. Por favor, inténtalo de nuevo mañana."
-      new_private_message: "Mensaje nuevo"
+      new_private_message: "Nuevo mensaje"
       private_message: "Mensaje"
       private_messages: "Mensajes"
       user_notifications:
@@ -839,7 +903,23 @@ es:
         mute_option_title: "No recibirás ninguna notificación relacionada con este usuario."
         normal_option: "Normal"
         normal_option_title: "Se te notificará si este usuario te responde, cita o menciona."
+      notification_schedule:
+        title: "Horario de notificaciones"
+        label: "Activar horario personalizado de notificaciones"
+        tip: "Fuera de estas horas, se activará el modo «no molestar» automáticamente."
+        midnight: "Medianoche"
+        none: "Ninguno"
+        monday: "Lunes"
+        tuesday: "Martes"
+        wednesday: "Miércoles"
+        thursday: "Jueves"
+        friday: "Viernes"
+        saturday: "Sábado"
+        sunday: "Domingo"
+        to: "a"
       activity_stream: "Actividad"
+      read: "Leer"
+      read_help: "Temas leídos recientemente"
       preferences: "Preferencias"
       feature_topic_on_profile:
         open_search: "Selecciona un nuevo tema"
@@ -868,22 +948,29 @@ es:
         perm_denied_expl: "Has denegado el permiso para las notificaciones. Configura tu navegador para permitir notificaciones. "
         disable: "Desactivar notificaciones"
         enable: "Activar notificaciones"
-        each_browser_note: "Nota: Tendrás que cambiar esta opción para cada navegador que uses."
+        each_browser_note: 'Nota: hay que cambiar este ajuste en cada navegador que uses. Todas las notificaciones serán desactivadas en el modo «no molestar», independientemente de este ajuste.'
         consent_prompt: "¿Quieres recibir notificaciones en vivo cuando alguien responda a tus mensajes?"
       dismiss: "Descartar"
-      dismiss_notifications: "Descartar todos"
-      dismiss_notifications_tooltip: "Marcar todas las notificaciones no leídas como leídas"
-      first_notification: "¡Tu primera notificación! Selecciónala para comenzar."
+      dismiss_notifications: "Descartar todo"
+      dismiss_notifications_tooltip: "Marcar todas las notificaciones como leídas"
+      no_messages_title: "No tienes ningún mensaje"
+      no_messages_body: >
+        ¿Necesitas tener una conversación personal directamente con una persona fuera de la conversación actual? Mándale un mensaje seleccionando su foto y usando el botón de %{icon} mensaje.<br><br> Si necesitas ayuda, puedes <a href='%{aboutUrl}'>enviar un mensaje a alguien del staff</a>.
+      no_bookmarks_title: "Todavía no has añadido nada a marcadores"
+      no_bookmarks_body: >
+        Añade publicaciones a tus marcadores con el botón %{icon}, y aparecerán aquí para que puedas volver fácilmente a ellos. ¡Hasta programarte recordatorios!
+      no_notifications_title: "No tienes ninguna notificación todavía"
+      first_notification: "¡Tu primera notificación! Selecciónala para empezar."
       dynamic_favicon: "Mostrar número en el icono del navegador"
       skip_new_user_tips:
-        description: "Omitir consejos de bienvenida"
+        description: "Omitir consejos de bienvenida y medallas"
         not_first_time: "¿No es tu primera vez?"
         skip_link: "Saltarse estos consejos"
       theme_default_on_all_devices: "Hacer que este sea el tema por defecto en todos mis dispositivos"
-      color_scheme_default_on_all_devices: "Establecer la combinación de colores como predeterminadas en todos mis dispositivos"
+      color_scheme_default_on_all_devices: "Establecer la combinación de colores como predeterminada en todos mis dispositivos"
       color_scheme: "Combinación de colores"
       color_schemes:
-        default_description: "Predeterminado"
+        default_description: "Tema predeterminado"
         disable_dark_scheme: "Igual que regular"
         dark_instructions: "Puedes previsualizar el esquema de colores del modo oscuro activando o desactivando el modo oscuro de tu dispositivo."
         undo: "Restablecer"
@@ -891,11 +978,11 @@ es:
         dark: "Modo oscuro"
         default_dark_scheme: "(valor predeterminado por el sitio)"
       dark_mode: "Modo oscuro"
-      dark_mode_enable: "Activar modo oscuro automático"
+      dark_mode_enable: "Activar modo oscuro automáticamente"
       text_size_default_on_all_devices: "Hacer que este sea el tamaño por defecto en todos mis dispositivos"
       allow_private_messages: "Permitir que otros usuarios me envíen mensajes privados"
       external_links_in_new_tab: "Abrir todos los enlaces externos en una nueva pestaña"
-      enable_quoting: "Activar respuesta citando el texto resaltado"
+      enable_quoting: "Activar respuesta citando el texto seleccionado"
       enable_defer: "Activar diferir para marcar temas no leídos"
       change: "cambio"
       featured_topic: "Tema destacado"
@@ -906,7 +993,7 @@ es:
       silenced_tooltip: "Este usuario está silenciado"
       suspended_notice: "Este usuario ha sido suspendido hasta %{date}."
       suspended_permanently: "Este usuario está suspendido."
-      suspended_reason: "Causa: "
+      suspended_reason: "Motivo: "
       github_profile: "GitHub"
       email_activity_summary: "Resumen de actividad"
       mailing_list_mode:
@@ -919,7 +1006,7 @@ es:
         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)"
         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."
+        warning: "Modo de lista de correo activado. La configuración de notificaciones por correo electrónico está anulada."
       tag_settings: "Etiquetas"
       watched_tags: "Vigiladas"
       watched_tags_instructions: "Vigilarás automáticamente todos los temas con estas etiquetas. Se te notificarán todas las publicaciones y temas nuevos y aparecerá un contador de publicaciones nuevas al lado del tema."
@@ -940,9 +1027,9 @@ es:
       muted_categories_instructions_dont_hide: "No se te notificará nada acerca de temas nuevos en estas categorías."
       regular_categories: "Habitual"
       regular_categories_instructions: "Verás estas categorías en las listas de temas «Recientes» y «Destacados»."
-      no_category_access: "Como moderador tienes acceso limitado a categorías. Guardar está deshabilitado."
+      no_category_access: "Como moderador, tienes acceso limitado a categorías. Guardar está desactivado."
       delete_account: "Eliminar mi cuenta"
-      delete_account_confirm: "¿Estás seguro de que quieres eliminar permanentemente tu cuenta? ¡Esta acción no puede ser revertida!"
+      delete_account_confirm: "¿Quieres eliminar permanentemente tu cuenta? ¡Esta acción no se puede deshacer!"
       deleted_yourself: "Tu cuenta se ha eliminado exitosamente."
       delete_yourself_not_allowed: "Por favor, contacta a un miembro del staff si deseas que se elimine tu cuenta."
       unread_message_count: "Mensajes"
@@ -952,11 +1039,11 @@ es:
       muted_users_instructions: "Omitir todas las notificaciones y mensajes personales de estos usuarios."
       allowed_pm_users: "Permitidos"
       allowed_pm_users_instructions: "Solo permitir mensajes personales de estos usuarios."
-      allow_private_messages_from_specific_users: "Solo permitir a ciertos usuarios que me envíen mensajes personales."
+      allow_private_messages_from_specific_users: "Solo permitir que ciertos usuarios que me envíen mensajes personales."
       ignored_users: "Ignorados"
       ignored_users_instructions: "Omitir todas las publicaciones, notificaciones y mensajes personales de estos usuarios."
       tracked_topics_link: "Mostrar"
-      automatically_unpin_topics: "Dejar de destacar temas automáticamente cuando los leo por completo."
+      automatically_unpin_topics: "Desfijar temas automáticamente cuando los leo por completo."
       apps: "Aplicaciones"
       revoke_access: "Revocar acceso"
       undo_revoke_access: "Deshacer revocación de acceso"
@@ -987,6 +1074,7 @@ es:
         tags: "Etiquetas"
       preferences_nav:
         account: "Cuenta"
+        security: "Seguridad"
         profile: "Perfil"
         emails: "Correos electrónicos"
         notifications: "Notificaciones"
@@ -1006,10 +1094,10 @@ es:
         choose: "Escoge una contraseña"
       second_factor_backup:
         title: "Códigos de respaldo de la verificación en dos factores"
-        regenerate: "Regenerar"
-        disable: "Habilitar"
-        enable: "Deshabilitar"
-        enable_long: "Habilitar códigos de respaldo"
+        regenerate: "Generar nuevos"
+        disable: "Desactivar"
+        enable: "Activar"
+        enable_long: "Activar códigos de respaldo"
         manage:
           one: "Gestiona tus códigos de respaldo. Te queda <strong>%{count}</strong> código sin usar."
           other: "Gestiona tus códigos de respaldo. Te quedan <strong>%{count}</strong> códigos sin usar."
@@ -1029,7 +1117,7 @@ es:
         title: "Autenticación de dos factores"
         enable: "Gestionar la autenticación de dos factores"
         disable_all: "Desactivar todo"
-        forgot_password: "¿Olvidaste tu contraseña?"
+        forgot_password: "¿Has olvidado tu contraseña?"
         confirm_password_description: "Por favor, confirma tu contraseña para continuar"
         name: "Nombre"
         label: "Código"
@@ -1037,7 +1125,7 @@ es:
         enable_description: |
           Escanea este código QR en una aplicación que lo soporte (<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 introduce el código de autenticación.
         disable_description: "Por favor, ingresa el código de autenticación que aparece en tu aplicación"
-        show_key_description: "Ingresa el código manualmente"
+        show_key_description: "Introducir manualmente"
         short_description: |
           Protege tu cuenta mediante códigos de respaldo de un solo uso.
         extended_description: |
@@ -1045,7 +1133,7 @@ es:
         oauth_enabled_warning: "Ten en cuenta que los inicios de sesión con redes sociales y páginas de terceros se desactivarán para tu cuenta una vez que actives la autenticación de dos factores."
         use: "Usar app Authenticator"
         enforced_notice: "Es obligatorio que actives la autenticación de dos factores antes de acceder al sitio web."
-        disable: "Inhabilitar"
+        disable: "Desactivar"
         disable_confirm: "¿Seguro que quieres desactivar todos los métodos de segundo factor?"
         save: "Guardar"
         edit: "Editar"
@@ -1075,7 +1163,7 @@ es:
       change_username:
         title: "Cambiar nombre de usuario"
         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."
+        taken: "Lo sentimos, ese nombre de usuario ya está en uso."
         invalid: "Este nombre de usuario no es válido. Este solo puede incluir números y letras"
       add_email:
         title: "Añadir correo electrónico"
@@ -1098,6 +1186,7 @@ es:
         uploaded_avatar_empty: "Agrega una foto personalizada"
         upload_title: "Sube tu foto"
         image_is_not_a_square: "Advertencia: hemos recortado tu imagen porque la anchura y la altura no eran iguales."
+        logo_small: "Logotipo pequeño del sitio. Usado por defecto."
       change_profile_background:
         title: "Encabezado de perfil"
         instructions: "Por defecto, los encabezados de perfil estarán centrados y tendrán una anchura de 1110px."
@@ -1120,14 +1209,15 @@ es:
         set_primary: "Establecer como correo primario"
         destroy: "Quitar correo"
         add_email: "Añadir correo alternativo"
-        sso_override_instructions: "El correo electrónico puede actualizarse desde el proveedor de SSO."
+        auth_override_instructions: "El correo electrónico se puede actualizar desde el proveedor de autenticación."
         no_secondary: "Sin correos electrónicos secundarios"
         instructions: "Nunca se mostrará al público."
         admin_note: "Nota: Un usuario administrador que cambia el correo electrónico de otro usuario no administrador indica que el usuario ha perdido el acceso a su cuenta de correo electrónico original, por lo que se enviará un correo electrónico para restablecer la contraseña a su nueva dirección. El correo electrónico del usuario no cambiará hasta que complete el proceso de restablecimiento de contraseña."
-        ok: "Te enviaremos un correo electrónico para confirmar"
+        ok: "Te enviaremos un correo 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}"
+        invite_auth_email_invalid: "Su correo electrónico de invitación no coincide con el correo electrónico 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."
@@ -1161,6 +1251,7 @@ es:
         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"
+        edit: "Editar nombre de usuario"
       locale:
         title: "Idioma de la interfaz"
         instructions: "Idioma de la interfaz. Cambiará cuando recargues la página."
@@ -1187,7 +1278,7 @@ es:
         browser_active: '%{browser} | <span class="active">activo ahora mismo</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Última publicación"
-      last_emailed: "Último correo electrónico enviado"
+      last_emailed: "Último correo enviado"
       last_seen: "Visto por última vez"
       created: "Creado el"
       log_out: "Cerrar sesión"
@@ -1257,48 +1348,48 @@ es:
         after_10_minutes: "después de 10 minutos"
       notification_level_when_replying: "Cuando publique en un tema, cambia el nivel de seguimiento a"
       invited:
-        search: "escribe para buscar invitaciones..."
         title: "Invitaciones"
+        pending_tab: "Pendiente"
+        pending_tab_with_count: "Pendientes (%{count})"
+        expired_tab: "Caducado"
+        expired_tab_with_count: "Caducado (%{count})"
+        redeemed_tab: "Aceptada"
+        redeemed_tab_with_count: "Aceptadas (%{count})"
+        invited_via: "Invitación"
+        invited_via_link: "enlace %{key} (%{count} / %{max} canjeados)"
+        groups: "Grupos"
+        topic: "Tema"
+        sent: "Creado/Último enviado"
+        expires_at: "Caduca"
+        edit: "Editar"
+        remove: "Eliminar"
+        copy_link: "Obtener enlace"
+        reinvite: "Reenviar correo electrónico"
+        reinvited: "Invitación reenviada"
+        removed: "Eliminado"
+        search: "escribe para buscar invitaciones..."
         user: "Usuario invitado"
-        sent: "Última vez enviada"
         none: "Sin invitaciones para mostrar."
         truncated:
           one: "Mostrando la primera invitación."
           other: "Mostrando las primeras %{count} invitaciones."
         redeemed: "Invitaciones aceptadas"
-        redeemed_tab: "Aceptada"
-        redeemed_tab_with_count: "Aceptadas (%{count})"
         redeemed_at: "Aceptada"
         pending: "Invitaciones pendientes"
-        pending_tab: "Pendiente"
-        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 invitaciones caducadas"
-        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"
+        remove_all: "Eliminar invitaciones caducadas"
+        removed_all: "Se han eliminado todas las invitaciones caducadas"
+        remove_all_confirm: "¿Quieres eliminar todas las invitaciones caducadas?"
         reinvite_all: "Reenviar todas las invitaciones"
         reinvite_all_confirm: "¿Estás seguro de que quieres reenviar todas las invitaciones?"
-        reinvited: "Invitación reenviada"
-        reinvited_all: "¡Todas las invitaciones se han reenviado!"
+        reinvited_all: "¡Todas las invitaciones se han enviado!"
         time_read: "Tiempo de lectura"
         days_visited: "Días visitados"
         account_age_days: "Antigüedad de la cuenta en días"
-        source: "Invitado a través de"
-        links_tab: "Enlaces"
-        links_tab_with_count: "Enlaces (%{count})"
-        link_url: "Enlace"
-        link_created_at: "Creado"
-        link_redemption_stats: "Canjes"
-        link_groups: Grupos
-        link_expires_at: Caducidad
         create: "Invitar"
-        copy_link: "Mostrar enlace"
-        generate_link: "Crear enlacew de invitación"
+        generate_link: "Crear enlace de invitación"
         link_generated: "Aquí tienes el enlace"
         valid_for: "El enlace de invitación solo es válido para esta dirección de correo electrónico: %{email}"
         single_user: "Invitar a través de correo electrónico"
@@ -1309,12 +1400,36 @@ es:
           error: "Ha ocurrido un error al generar el enlace de invitación"
           max_redemptions_allowed_label: "¿Cuánta gente puede registrarse con este enlace?"
           expires_at: "¿Cuándo caducará este enlace?"
+        invite:
+          new_title: "Crear invitación"
+          edit_title: "Editar invitación"
+          instructions: "Comparte este enlace para dar acceso instantáneo a este sitio:"
+          copy_link: "copiar enlace"
+          expires_in_time: "Caduca en %{time}."
+          expired_at_time: "Caducó: %{time}."
+          show_advanced: "Mostrar opciones avanzadas"
+          hide_advanced: "Ocultar opciones avanzadas"
+          restrict_email: "Restringir la invitación a una sola dirección de correo"
+          max_redemptions_allowed: "Máximo de usos:"
+          add_to_groups: "Añadir a grupos:"
+          invite_to_topic: "Enviar a tema al entrar por primera vez:"
+          expires_at: "Caducidad:"
+          custom_message: "Mensaje personal opcional:"
+          send_invite_email: "Guardar y enviar correo"
+          save_invite: "Guardar invitación"
+          invite_saved: "Invitación guardada."
+          invite_copied: "Enlace de invitación copiado."
+          blank_email: "No se ha copiado el enlace. La dirección de correo es obligatoria."
         bulk_invite:
           none: "No hay invitaciones para mostrar en esta página."
           text: "Invitaciones masivas"
-          success: "Archivo subido correctamente, se te notificará mediante un mensaje cuando se complete el proceso."
+          instructions: |
+            <p>Invita una lista de usuarios para lanzar rápidamente la comunidad. Prepara un <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">archivo CSV</a> con al menos una fila por cada correo electrónico de los usuarios a los que quieras invitar. Además, se puede añadir en cada fila la siguiente información separada por comas si quieres añadir a los usuarios a grupos o enviarles a un tema específico la primera vez que inicien sesión.</p>
+            <pre>correo@ejemplo.com,primer_nombre_de_un_grupo,segundo_grupo,id_de_tema</pre>
+            <p>Se enviará una invitación por correo a cada una de las direcciones que incluyas en el archivo CSV, que podrás gestionar después.</p>
+          progress: "%{progress}% subido..."
+          success: "Archivo subido con éxito. Se te notificará a través de un mensaje cuando el proceso se complete."
           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."
       password:
         title: "Contraseña"
         too_short: "Tu contraseña es demasiada corta."
@@ -1378,6 +1493,8 @@ es:
       avatar:
         title: "Imagen de perfil"
         header_title: "perfil, mensajes, marcadores y preferencias"
+        name_and_description: "%{name} - %{description}"
+        edit: "Editar foto de perfil"
       title:
         title: "Título"
         none: "(ninguno)"
@@ -1415,14 +1532,14 @@ es:
       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?"
+    assets_changed_confirm: "Se ha recibido una actualización de software. ¿Acualizar ahora?"
     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."
-      logout_disabled: "Cerrar sesión está desactivado mientras el sitio se encuentre en modo de solo lectura."
+      login_disabled: "No se puede iniciar sesión mientras el foro se encuentre en modo de solo lectura."
+      logout_disabled: "No se puede cerrar sesión mientras el sitio se encuentre en modo de solo lectura."
     too_few_topics_and_posts_notice_MF: >-
       <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentTopics, plural, one {<strong>#</strong> tema} other {<strong>#</strong> temas}} y {currentPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicaciones}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredTopics, plural, one {<strong>#</strong> tema} other {<strong>#</strong> temas}} y {requiredPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicaciones}}. Solo los miembros del staff pueden ver este mensaje.
     too_few_topics_notice_MF: >-
@@ -1435,15 +1552,6 @@ es:
       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"
-    year: "año"
-    year_desc: "temas creados en los últimos 365 días"
-    month: "mes"
-    month_desc: "temas creados en los últimos 30 días"
-    week: "semana"
-    week_desc: "temas creados en los últimos 7 días"
-    day: "día"
     first_post: Primera publicación
     mute: Silenciar
     unmute: No silenciar
@@ -1459,15 +1567,17 @@ es:
       other: respuestas
     signup_cta:
       sign_up: "Registrarse"
-      hide_session: "Recúerdame mañana"
+      hide_session: "Recúerdamelo mañana"
       hide_forever: "no, gracias"
-      hidden_for_session: "Vale, te preguntaremos mañana. Recuerda que también puedes usar el botón «Iniciar sesión» para crear una cuenta en cualquier momento."
-      intro: "¡Hola! Parece que estás disfrutando la discusión, pero no has creado una cuenta todavía."
+      hidden_for_session: "Vale, te preguntamos mañana. También puedes darle a «Iniciar sesión» para crear tu cuenta."
+      intro: "¡Hola! Parece que estás disfrutando del tema, pero no has creado una cuenta todavía."
       value_prop: "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:
+        one: "Hay <b>%{count}</b> respuesta."
+        other: "Hay <b>%{count}</b> respuestas."
+      description_time_MF: "Hay {replyCount, plural, one {Hay <b>#</b> respuesta} other {Hay <b>#</b> respuestas}} con un tiempo estimado de lectura de <b>{readingTime, plural, one {# minuto} other {# minutos}}</b>."
       enable: "Resumir este tema"
       disable: "Ver todas las publicaciones"
     deleted_filter:
@@ -1481,9 +1591,9 @@ es:
       edit: "Añadir o quitar..."
       remove: "Quitar..."
       add: "Añadir..."
-      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?"
+      leave_message: "¿Quieres abandonar este mensaje?"
+      remove_allowed_user: "¿Quieres quitar a %{name} de este mensaje?"
+      remove_allowed_group: "¿Quieres quitar a %{name} de este mensaje?"
     email: "Correo electrónico"
     username: "Nombre de usuario"
     last_seen: "Visto por última vez"
@@ -1492,8 +1602,10 @@ es:
     trust_level: "Nivel de confianza"
     search_hint: "usuario, correo electrónico o dirección IP"
     create_account:
+      header_title: "¡Hola!"
+      subheader_title: "Vamos a crear tu cuenta"
       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"
+      title: "Crea tu cuenta"
       failed: "Algo salió mal. Quizás este correo electrónico ya se encuentra registrado. Intenta con el enlace «olvidé la contraseña»"
     forgot_password:
       title: "Restablecer contraseña"
@@ -1512,6 +1624,7 @@ es:
     email_login:
       link_label: "Enviarme un enlace para ingresar por correo electrónico"
       button_label: "con correo electrónico"
+      login_link: "Saltarse la contraseña y enviar por correo un enlace para iniciar sesión"
       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."
@@ -1523,6 +1636,8 @@ es:
       logging_in_as: Iniciando sesión como %{email}
       confirm_button: Finalizar inicio de sesión
     login:
+      header_title: "Bienvenido de vuelta"
+      subheader_title: "Inicia sesión en tu cuenta"
       title: "Iniciar sesión"
       username: "Usuario"
       password: "Contraseña"
@@ -1538,10 +1653,10 @@ es:
       security_key_not_allowed_error: "La autenticación de la clave de seguridad fue cancelada o se agotó el tiempo."
       security_key_no_matching_credential_error: "No se encontraron credenciales que coincidan en la clave de seguridad provista."
       security_key_support_missing_error: "Tu dispositivo o navegador actual no soporta el uso de claves de seguridad. Por favor, utiliza un método diferente."
-      email_placeholder: "correo electrónico o nombre de usuario"
+      email_placeholder: "Correo electrónico / Nombre de Usuario"
       caps_lock_warning: "El bloqueo de mayúsculas está activado"
       error: "Error desconocido"
-      cookies_error: "Parece que tu navegador tiene deshabilitados los cookies. Es posible que no puedas iniciar sesión sin habilitarlos primero."
+      cookies_error: "Parece que tu navegador tiene desactivadas las cookies. Es posible que no puedas iniciar sesión sin activarlas primero."
       rate_limit: "Por favor, espera un poco antes intentar iniciar sesión de nuevo."
       blank_username: "Por favor, ingresa tu correo electrónico o nombre de usuario."
       blank_username_or_password: "Por favor, ingresa tu correo electrónico o nombre de usuario y tu contraseña."
@@ -1605,7 +1720,6 @@ es:
       apple_international: "Apple/Internacional"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (anteriormente EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1627,7 +1741,15 @@ es:
       topic_count:
         one: "%{count} tema en esta categoría"
         other: "%{count} temas en esta categoría"
+      plus_subcategories_title:
+        one: "%{name} y una subcategoría"
+        other: "%{name} y %{count} subcategorías"
+      plus_subcategories:
+        one: "%{count} subcategoría +"
+        other: "%{count} subcategorías +"
     select_kit:
+      filter_by: "Filtrar por: %{name}"
+      select_to_filter: "Selecciona un valor para filtrar"
       default_header_text: Seleccionar...
       no_content: No se encontraron coincidencias
       filter_placeholder: Buscar...
@@ -1643,13 +1765,13 @@ es:
         one: "Selecciona al menos %{count} carácter."
         other: "Selecciona al menos %{count} caracteres."
       components:
+        tag_drop:
+          filter_for_more: Filtrar para más...
         categories_admin_dropdown:
           title: "Gestionar categorías"
     date_time_picker:
       from: Desde
       to: Hasta
-      errors:
-        to_before_from: "La fecha «hasta» debe ser posterior a la fecha «desde»."
     emoji_picker:
       filter_placeholder: Buscar emoji
       smileys_&_emotion: Caras y emociones
@@ -1671,7 +1793,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 solo es visible para aquellos que pueden publicar borradores compartidos."
       destination_category: "Categoría de destino"
       publish: "Publicar borrador compartido"
       confirm_publish: "¿Estás seguro de que quieres publicar este borrador?"
@@ -1682,7 +1804,6 @@ es:
       options: "Opciones"
       whisper: "susurrar"
       unlist: "invisible"
-      blockquote_text: "Cita"
       add_warning: "Esta es una advertencia oficial."
       toggle_whisper: "Activar/desactivar susurro"
       toggle_unlisted: "Visible/Invisible"
@@ -1704,10 +1825,16 @@ es:
       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:
+          one: "El título debe tener al menos %{count} carácter"
+          other: "El título debe tener por lo menos %{count} caracteres"
+        title_too_long:
+          one: "El título no puede tener más de %{count} carácter"
+          other: "El título no puede tener más de %{count} caracteres"
         post_missing: "La publicación no puede estar vacía"
-        post_length: "La publicación debe tener por lo menos %{min} caracteres."
+        post_length:
+          one: "La publicación debe tener por lo menos %{count} carácter"
+          other: "La publicación debe tener por lo menos %{count} caracteres"
         try_like: "¿Has probado el botón %{heart}?"
         category_missing: "Debes escoger una categoría."
         tags_missing:
@@ -1740,8 +1867,8 @@ es:
       saved: "¡Guardado!"
       saved_draft: "Publica el borrador en progreso. Escribe para reanudar."
       uploading: "Subiendo..."
-      show_preview: "mostrar vista previa &raquo;"
-      hide_preview: "&laquo; ocultar vista previa"
+      show_preview: "ver previsualización"
+      hide_preview: "ocultar previsualización"
       quote_post_title: "Citar toda la publicación"
       bold_label: "B"
       bold_title: "Negrita"
@@ -1754,12 +1881,12 @@ es:
       link_dialog_title: "Insertar hipervínculo"
       link_optional_text: "título opcional"
       link_url_placeholder: "Copia una URL o escribe para buscar temas"
-      quote_title: "Cita"
-      quote_text: "Cita"
+      blockquote_title: "Cita"
+      blockquote_text: "Cita"
       code_title: "Texto preformateado"
       code_text: "texto preformateado con sangría de 4 espacios"
       paste_code_text: "escribe o pega el código aquí"
-      upload_title: "Subir"
+      upload_title: "Adjuntar"
       upload_description: "Ingresa una descripción del archivo subido aquí"
       olist_title: "Lista numerada"
       ulist_title: "Lista con viñetas"
@@ -1780,7 +1907,7 @@ es:
         title: "¿Olvidaste añadir destinatarios?"
         body: "¡Vas a enviarte este mensaje solo a ti mismo!"
       slow_mode:
-        error: "Este tema está en modo lento. Para promover un debate considerado y adecuado solo puedes publicar una vez cada %{duration}."
+        error: "Este tema está en modo lento. Hace poco que has publicado, pero podrás volver a hacerlo en %{timeLeft}."
       admin_options_title: "Configuración opcional del administrador para este tema"
       composer_actions:
         reply: Responder
@@ -1809,9 +1936,9 @@ es:
           label: "Crear tema"
         shared_draft:
           label: "Borrador compartido"
-          desc: "Crea un borrador que solo será visible por el staff"
+          desc: "Inicia un tema-borrador que solo será visible por los usuarios permitidos"
         toggle_topic_bump:
-          label: "Alternar bump del tema"
+          label: "Alternar reflote del tema"
           desc: "Responder sin alterar la fecha de última respuesta"
       reload: "Recargar"
       ignore: "Ignorar"
@@ -1909,14 +2036,15 @@ 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 una imagen o archivo"
       local_tip: "selecciona las imágenes de tu dispositivo"
-      local_tip_with_attachments: "selecciona imágenes o archivos de tu dispositivo %{authorized_extensions}"
-      hint: "(también puedes arrastrarlos al editor para subirlos)"
+      local_tip_with_attachments: "selecciona imágenes o archivos de tu dispositivo"
+      hint: "(también puedes arrastrar y soltar al editor para adjuntar)"
       hint_for_supported_browsers: "puedes también arrastrar o pegar imágenes en el editor"
       uploading: "Subiendo"
       select_file: "Selecciona archivo"
       default_image_alt_text: imagen
+      supported_formats: "formatos aceptados"
     search:
       sort_by: "Ordenar por"
       relevance: "Relevancia"
@@ -1942,6 +2070,7 @@ es:
       or_search_google: "O prueba buscar a través de Google:"
       search_google: "Intenta buscar con Google:"
       search_google_button: "Google"
+      search_button: "Buscar"
       context:
         user: "Buscar publicaciones de @%{username}"
         category: "Buscar la categoría #%{category}"
@@ -1971,7 +2100,7 @@ es:
           private: en mis mensajes
           bookmarks: he guardado
           first: son la primera publicación
-          pinned: son destacados
+          pinned: están fijados
           seen: he leído
           unseen: no he leído
           wiki: son tipo wiki
@@ -2007,7 +2136,7 @@ es:
     go_back: "volver"
     not_logged_in_user: "página de usuario con resumen de la actividad y preferencias actuales"
     current_user: "ir a tu página de usuario"
-    view_all: "ver todo"
+    view_all: "ver todos %{tab}"
     topics:
       new_messages_marker: "última visita"
       bulk:
@@ -2028,7 +2157,9 @@ es:
         change_category: "Cambiar categoría"
         close_topics: "Cerrar temas"
         archive_topics: "Archivar temas"
+        move_messages_to_inbox: "Mover a la bandeja de entrada"
         notification_level: "Notificaciones"
+        change_notification_level: "Cambiar nivel de notificación"
         choose_new_category: "Elige la nueva categoría de los temas:"
         selected:
           one: "Has seleccionado <b>%{count}</b> tema."
@@ -2038,7 +2169,10 @@ es:
         choose_new_tags: "Elige etiquetas nuevas para estos temas:"
         choose_append_tags: "Elegir etiquetas nuevas para agregar a estos temas:"
         changed_tags: "Las etiquetas de esos temas fueron cambiadas."
-        remove_tags: "Quitar etiquetas"
+        remove_tags: "Eliminar todas las etiquetas"
+        confirm_remove_tags:
+          one: "Todas las etiquetas se eliminarán de este tema. ¿Estás seguro?"
+          other: "Todas las etiquetas se eliminarán de <b>%{count}</b> temas. ¿Estás seguro?"
         progress:
           one: "Progreso: <strong>%{count}</strong> tema"
           other: "Progreso: <strong>%{count}</strong> temas"
@@ -2054,7 +2188,7 @@ es:
         top: "No hay temas destacados."
         educate:
           new: '<p>Tus nuevos temas aparecerán aquí. Por defecto, los temas se consideran nuevos y mostrarán un <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> indicador si se crearon hace menos de 2 días.</p><p>Visita tus <a href="%{userPrefsUrl}">preferencias</a> para cambiarlo.</p>'
-          unread: '<p>Tus temas sin leer aparecen aquí.</p><p>Por defecto, los temas se consideran sin leer y mostrarán contadores de publicaciones sin leer <span class="badge new-posts badge-notification">1</span> si tu:</p><ul><li>Creaste el tema</li><li>Respondiste al tema</li><li>Leíste el tema por más de 4 minutos</li></ul><p>O si has establecido específicamente el tema como seguido o vigilado a través del control de notificaciones al pie de cada tema.</p><p>Configura tus <a href="%{userPrefsUrl}">preferencias</a> para cambiar esto.</p>'
+          unread: "<p>Los temas sin leer aparecerán aquí.</p><p>Por defecto, se consideran sin leer y tendrán un marcador <span class=\"badge new-posts badge-notification\">1</span> si:</p><ul><li>Has creado el tema</li><li>Has respondido al tema</li><li>Has leído el tema durante más de 4 minutos</li></ul><p>O si has seguido o vigilado el tema a través de la \U0001F514 individualmente en cada tema.</p><p>Visita tus <a href=\"%{userPrefsUrl}\">preferencias</a> para cambiar esto.</p>"
       bottom:
         latest: "No hay más temas recientes."
         posted: "No hay más temas publicados."
@@ -2131,7 +2265,6 @@ es:
       read_more_in_category: "¿Quieres leer más? Consulta otros temas en %{catLink} o %{latestLink}."
       read_more: "¿Quieres leer más? %{catLink} o %{latestLink}."
       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
       browse_all_tags: Ver todas las etiquetas
@@ -2145,19 +2278,25 @@ es:
         select: "Los usuarios solo pueden publicar en este tema una vez cada:"
         description: "Para promover un debate considerado en temas con mucho tráfico o controvertidos, los usuarios deberán esperar antes de volver a publicar en este tema."
         save: "Activar"
+        enabled_until: "Habilitado hasta:"
         remove: "Desactivar"
         hours: "Horas:"
         minutes: "Minutos:"
         seconds: "Segundos:"
         durations:
+          10_minutes: "10 minutos"
           15_minutes: "15 minutos"
+          30_minutes: "30 Minutos"
+          45_minutes: "45 minutos"
           1_hour: "1 hora"
+          2_hours: "2 Horas"
           4_hours: "4 horas"
-          1_day: "1 día"
-          1_week: "1 semana"
+          8_hours: "8 Horas"
+          12_hours: "12 Horas"
+          24_hours: "24 Horas"
           custom: "Otra duración"
       slow_mode_notice:
-        duration: "Debes esperar %{duration} entre respuestas a este tema."
+        duration: "Por favor, espera %{duration} entre respuesta y respuesta a este tema."
       topic_status_update:
         title: "Temporizador de temas"
         save: "Configurar temporizador"
@@ -2165,8 +2304,10 @@ es:
         num_of_days: "Número de días:"
         remove: "Quitar temporizador"
         publish_to: "Publicar en:"
-        when: "Cuando:"
-        time_frame_required: Por favor, selecciona un plazo
+        when: "Cuándo:"
+        time_frame_required: "Por favor, selecciona un plazo"
+        min_duration: "La duración debe ser mayor que 0"
+        max_duration: "La duración debe ser inferior a 20 años"
       auto_update_input:
         none: "Selecciona el plazo"
         now: "Ahora"
@@ -2174,7 +2315,7 @@ es:
         tomorrow: "Mañana"
         later_this_week: "Esta misma semana"
         this_weekend: "Este fin de semana"
-        next_week: "Próxima semana"
+        next_week: "La próxima semana"
         two_weeks: "Dos semanas"
         next_month: "Próximo mes"
         two_months: "Dos meses"
@@ -2194,14 +2335,16 @@ es:
       temp_close:
         title: "Cerrar temporalmente"
       auto_close:
-        title: "Cerrar tema automaticamente"
-        label: "Horas de cierre automático del tema:"
+        title: "Cerrar tema automáticamente"
+        label: "Cerrar tema automáticamente después de:"
         error: "Por favor, ingresa un valor válido."
         based_on_last_post: "No cerrar hasta que la última publicación en el tema tenga por lo menos esta antigüedad."
+      auto_close_after_last_post:
+        title: "Cerrar tema automáticamente después de cierto tiempo de la última publicación"
       auto_delete:
         title: "Eliminar tema automaticamente"
       auto_bump:
-        title: "Hacer bump al tema automaticamente"
+        title: "Reflotar tema automáticamente"
       reminder:
         title: "Recordarme"
       auto_delete_replies:
@@ -2210,15 +2353,18 @@ es:
         auto_open: "Este tema se abrirá automáticamente %{timeLeft}."
         auto_close: "Este tema se cerrará automáticamente %{timeLeft}."
         auto_publish_to_category: "Este tema se publicará en <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Este tema se cerrará %{duration} después de la última respuesta."
+        auto_close_after_last_post: "Este tema se cerrará %{duration} después de la última respuesta."
         auto_delete: "Este tema se eliminará automáticamente %{timeLeft}."
-        auto_bump: "La fecha de este tema se actualizará %{timeLeft}."
+        auto_bump: "Este tema se reflotará automáticamente %{timeLeft}."
         auto_reminder: "Te recordaremos sobre este tema %{timeLeft}."
         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: "La última publicación se realizó hace %{count} hora, por lo que el tema se cerrará inmediatamente."
         other: "La última publicación se realizó hace %{count} horas, por lo que el tema se cerrará inmediatamente."
+      auto_close_momentarily:
+        one: "La última publicación ha sido hace %{count} hora, por lo que el tema se cerrará en unos instantes."
+        other: "La última publicación ha sido hace %{count} horas, por lo que el tema se cerrará en unos instantes."
       timeline:
         back: "Volver"
         back_description: "Volver a la última publicación sin leer"
@@ -2230,7 +2376,9 @@ es:
         go: "ir"
         jump_bottom: "saltar a la última publicación"
         jump_prompt: "saltar a..."
-        jump_prompt_of: "de %{count} publicaciones"
+        jump_prompt_of:
+          one: "de %{count} mensaje"
+          other: "de %{count} mensajes"
         jump_prompt_long: "Saltar a..."
         jump_bottom_with_number: "saltar a la publicación %{post_number}"
         jump_prompt_to_date: "hasta hoy"
@@ -2288,7 +2436,7 @@ es:
         close: "Cerrar tema"
         multi_select: "Seleccionar publicaciones..."
         slow_mode: "Ajustar modo lento"
-        timed_update: "Configurar temporizador de temas..."
+        timed_update: "Configurar temporizador..."
         pin: "Destacar tema..."
         unpin: "Dejar de destacar..."
         unarchive: "Desarchivar tema"
@@ -2298,7 +2446,7 @@ es:
         reset_read: "Restablecer datos de lectura"
         make_public: "Convertir en tema público"
         make_private: "Crear mensaje personal"
-        reset_bump_date: "Resetear fecha de bump"
+        reset_bump_date: "Restablecer fecha de reflote"
       feature:
         pin: "Destacar tema"
         unpin: "Dejar de destacar tema"
@@ -2310,11 +2458,20 @@ es:
         help: "comienza a escribir un mensaje en este tema"
       clear_pin:
         title: "Eliminar destacado"
-        help: "Dejar de descatar este tema para que no aparezca más de primero en tu lista de temas"
+        help: "Desfijar este tema para que no aparezca más de primero en tu lista de temas"
       share:
         title: "Compartir"
         extended_title: "Compartir un enlace"
         help: "comparte el enlace a este tema"
+        instructions: "Comparte el enlace a este tema:"
+        copied: "Enlace al tema copiado."
+        notify_users:
+          title: "Notificar"
+          instructions: "Notificar sobre este tema a los siguientes usuarios:"
+          success:
+            one: "Se ha notificado a %{username} sobre este tema."
+            other: "Se ha notificado a los usuarios sobre este tema."
+        invite_users: "Invitar"
       print:
         title: "Imprimir"
         help: "Abrir una versión imprimible de este tema"
@@ -2332,21 +2489,21 @@ es:
         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 fijados en %{categoryLink}."
         already_pinned:
-          one: "Tema destacado actualmente en %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Temas destacados actualmente en %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          one: "Temas fijados actualmente en %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Temas fijados 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:
-          one: "Ya tienes %{count} tema anclado globalmente. Demasiados temas anclados pueden suponer una carga para usuarios nuevos y anónimos. ¿Seguro que quieres anclar otro tema globalmente?"
-          other: "Ya tienes %{count} temas anclados globalmente. Demasiados temas anclados pueden suponer una carga para usuarios nuevos y anónimos. ¿Seguro que quieres anclar otro tema globalmente?"
+          one: "Ya tienes %{count} tema fijado globalmente. Demasiados temas fijados puede ser una molestia para los usuarios nuevos y anónimos. ¿Quieres fijar otro tema globalmente?"
+          other: "Ya tienes %{count} temas fijados globalmente. Demasiados temas anclados pueden ser una molestia para los usuarios nuevos y anónimos. ¿Quieres fijar otro tema globalmente?"
         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."
+        not_pinned_globally: "No hay temas fijados 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>"
+          one: "Temas fijados globalmente: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Temas fijados 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."
@@ -2370,14 +2527,14 @@ es:
         username_placeholder: "nombre de usuario"
         action: "Enviar invitación"
         help: "invitar a otros a este tema mediante correo electrónico o notificaciones"
-        to_forum: "Enviaremos un correo electrónico breve con un enlace que le que permitirá a tu amigo unirse inmediatamente, sin necesidad de iniciar sesión."
-        sso_enabled: "ingresa el nombre de usuario de la persona a la que quieres invitar a este tema."
+        to_forum: "Enviaremos un correo corto para que la persona pueda unirse inmediatamente haciendo clic en un enlace."
+        discourse_connect_enabled: "Escribe el nombre de usuario o correo electrónico de la persona a la que quieres invitar al tema."
         to_topic_blank: "Ingresa el nombre de usuario o correo electrónico de la persona que desea invitar a este tema."
         to_topic_email: "Ingresaste una dirección de correo electrónico. Nosotros enviaremos una invitación a tu amigo que le permitirá responder inmediatamente a este tema."
         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 a <b>%{invitee}</b>. Te avisaremos cuando se use. Comprueba el estado en la pestaña invitaciones."
         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."
@@ -2398,8 +2555,8 @@ es:
         radio_label: "Tema nuevo"
         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 la publicación que has seleccionado."
-          other: "Estas a punto de crear un tema nuevo y rellenarlo con las <b>%{count}</b> publiacaciones que has seleccionado."
+          one: "Estás a punto de crear un tema nuevo y rellenarlo con la publicación que has seleccionado."
+          other: "Estás a punto de crear un tema nuevo y rellenarlo con las <b>%{count}</b> publiacaciones que has seleccionado."
       merge_topic:
         title: "Mover a un tema existente"
         action: "mover a un tema existente"
@@ -2491,8 +2648,8 @@ es:
       edit_reason: "Motivo:"
       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"
+      wiki_last_edited_on: "wiki editada por última vez el %{dateTime}"
+      last_edited_on: "publicación editada por última vez el %{dateTime}"
       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}:"
@@ -2510,11 +2667,12 @@ es:
         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}. "
+        returning_user: "Hacía tiempo que no veíamos a %{user}, su última publicación fue %{time}."
       unread: "Publicaciones sin leer"
       has_replies:
         one: "%{count} Respuesta"
         other: "%{count} Respuestas"
+      has_replies_count: "%{count}"
       unknown_user: "(desconocido/usuario eliminado)"
       has_likes_title:
         one: "%{count} persona le ha dado Me gusta a este post"
@@ -2523,30 +2681,32 @@ es:
       has_likes_title_you:
         one: "A tí y a una persona le ha gustado este mensaje"
         other: "tú y a otros %{count} les han gustado este mensaje"
+      filtered_replies_hint:
+        one: "Ver esta publicación y su respuesta"
+        other: "Ver esta publicación y sus %{count} respuestas"
+      filtered_replies_viewing:
+        one: "Viendo %{count} respuesta"
+        other: "Viendo %{count} respuestas"
+      in_reply_to: "Cargar publicación principal"
+      view_all_posts: "Ver todas las publicaciones"
       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."
+        upload: "Lo sentimos, se ha producido un error al cargar 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?"
-        too_many_uploads: "Lo sentimos, solo puedes subir un archivo a la vez."
+        too_many_uploads: "Lo sentimos, solo puedes cargar un archivo a la vez."
         too_many_dragged_and_dropped_files:
-          one: "Solo se puede subir archivos de %{count} en 1."
-          other: "Solo se pueden subir %{count} archivos cada vez."
-        upload_not_authorized: "Lo sentimos, el archivo que estás intentando subir no está permitido (extensiones autorizadas: %{authorized_extensions})."
+          one: "Solo se pueden cargar archivos de %{count} en 1."
+          other: "Solo se pueden cargar %{count} archivos cada al mismo tiempo."
+        upload_not_authorized: "Lo sentimos, el archivo que estás intentando cargar 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."
-      abandon_edit:
-        confirm: "¿Estás seguro de que quieres descartar tus cambios?"
-        no_value: "No, permanecer"
-        no_save_draft: "No, guardar borrador"
-        yes_value: "Sí, descartar edición"
-      abandon:
-        title: "Abandonar borrador"
-        confirm: "¿Estás seguro de que deseas abandonar tu publicación?"
-        no_value: "No, permanecer"
-        no_save_draft: "No, guardar borrador"
-        yes_value: "Sí, abandonar"
+      cancel_composer:
+        confirm: "¿Qué te gustaría hacer con tu publicación?"
+        discard: "Descartar"
+        save_draft: "Guardar borrador para más tarde"
+        keep_editing: "Seguir editando"
       via_email: "esta publicación llegó por correo electrónico"
       via_auto_generated_email: "esta publicación llegó a través de un correo electrónico generado automáticamente"
       whisper: "esta publicación es un susurro privado para los moderadores"
@@ -2594,7 +2754,9 @@ es:
         unlock_post_description: "permitir que el usuario que realizó esta publicación la edite"
         delete_topic_disallowed_modal: "No tienes permiso para eliminar este tema. Si de verdad quieres que se elimine, repórtalo y explica tus motivos a los moderadores."
         delete_topic_disallowed: "no tienes permiso para eliminar este tema"
-        delete_topic_confirm_modal: "Este tema tiene más de %{minViews} visitas y podría ser un resultado de búsqueda popular. ¿Seguro que quieres eliminar por completo este tema, en lugar de editarlo o mejorarlo?"
+        delete_topic_confirm_modal:
+          one: "Este tema tiene más de %{count} vista, y puede que sea un destino de búsqueda popular. ¿Eliminarlo por completo, en lugar de editarlo para mejorarlo?"
+          other: "Este tema tiene más de %{count} vistas, y puede que sea un destino de búsqueda popular. ¿Eliminarlo por completo, en lugar de editarlo para mejorarlo?"
         delete_topic_confirm_modal_yes: "Sí, eliminar este tema"
         delete_topic_confirm_modal_no: "No, mantener este tema"
         delete_topic_error: "Ha ocurrido un error al eliminar este tema"
@@ -2603,6 +2765,7 @@ es:
         change_post_notice: "Cambiar aviso del staff"
         delete_post_notice: "Eliminar aviso del staff"
         remove_timer: "quitar temporizador"
+        edit_timer: "editar temporizador"
       actions:
         people:
           like:
@@ -2679,6 +2842,18 @@ es:
           edit_bookmark:
             name: "Editar marcador"
             description: "Editar el nombre del marcador o cambia la fecha y hora del recordatorio"
+          pin_bookmark:
+            name: "Anclar marcador"
+            description: "Anclar el marcador. Esto hará que aparezca al principio de tu lista de marcadores."
+          unpin_bookmark:
+            name: "Desanclar marcador"
+            description: "Desanclar el marcador. Ya no aparecerá siempre arriba de la lista."
+      filtered_replies:
+        viewing_posts_by: "Viendo %{post_count} publicaciones de"
+        viewing_subset: "Algunas respuestas no se muestran"
+        viewing_summary: "Estás viendo un resumen de este tema"
+        post_number: "%{username}, publicación nº %{post_number}"
+        show_all: "Mostrar todas"
     category:
       can: "puede&hellip; "
       none: "(sin categoría)"
@@ -2736,10 +2911,10 @@ es:
         reply: "Responder"
         create: "Crear"
         no_groups_selected: "Ningún grupo tiene acceso. Esta categoría solo será visible por el staff."
-        everyone_has_access: "Esta categoría es pública. Todo el mundo puede ver, responder y crear temas. Para restringir permisos, quita uno o varios permisos del grupo «todos»."
+        everyone_has_access: 'Esta categoría es pública. Todo el mundo puede ver, responder y crear temas. Para restringir permisos, quita uno o varios permisos del grupo «todos».'
         toggle_reply: "Alternar el permiso para responder"
         toggle_full: "Alternar el permiso para crear temas"
-        inherited: "Este permiso está heredado de «todos»"
+        inherited: 'Este permiso está heredado de «todos»'
       special_warning: "Aviso: esta categoría se ajusta por defecto y las opciones de seguridad no pueden ser editadas. Si no deseas utilizarla, elimínala en vez de reutilizarla."
       uncategorized_security_warning: "Esta categoría es especial: se usa para temas que no tienen una categoría asignada y y no puede tener ajustes de seguridad."
       uncategorized_general_warning: 'Esta categoría es especial. Se utiliza como la categoría predeterminada para los temas nuevos que no tienen una categoría seleccionada. Si deseas evitar este comportamiento y forzar la selección de categorías, <a href="%{settingLink}">por favor, desactiva la opción aquí</a>. Si deseas cambiar el nombre o la descripción, ve a <a href="%{customizeLink}">Personalizar / Contenido de texto</a>.'
@@ -2755,6 +2930,7 @@ es:
       num_featured_topics: "Número de temas que se muestran en la página de categorías:"
       subcategory_num_featured_topics: "Número de temas destacados a mostrar en la página principal de categorías:"
       all_topics_wiki: "Hacer que los temas nuevos tengan formato wiki por defecto"
+      allow_unlimited_owner_edits_on_first_post: "Permitir que los autores editen los primeros mensajes de sus temas en cualquier momento."
       subcategory_list_style: "Estilo de lista de subcategorías:"
       sort_order: "Ordenar lista de temas:"
       default_view: "Orden por defecto:"
@@ -2773,24 +2949,24 @@ es:
       position_disabled_click: 'activa la opción «posiciones de categoría fijas».'
       minimum_required_tags: "Número mínimo de etiquetas requeridas en un tema:"
       parent: "Categoría primaria"
-      num_auto_bump_daily: "Número de temas abiertos a los que se le hará bump de diariamente de forma automática:"
+      num_auto_bump_daily: "Número de temas abiertos que se reflotarán diariamente de forma automática:"
       navigate_to_first_post_after_read: "Ir a la primera publicación después de haber leído los temas"
       notifications:
         watching:
           title: "Vigilar"
-          description: "Vigilarás automáticamente todos los temas en estas categorías. Se te notificará de cada publicación nueva en cada tema y se mostrará un contador de respuestas nuevas."
+          description: "Vigilarás automáticamente todos los temas en esta categoría. Se te notificará de cada nueva respuesta en cada tema, y verás un contador de nuevas respuestas."
         watching_first_post:
           title: "Vigilar la primera publicación"
           description: "Se te notificará acerca de los temas nuevos en esta categoría, pero no cuando haya respuestas nuevas a los temas."
         tracking:
           title: "Seguir"
-          description: "Seguirás automáticamente todos los temas en estas categorías. Se te notificará si alguien menciona tu @nombre o te responde y se mostrará un contador de respuestas nuevas."
+          description: "Seguirás todos los temas en esta categoría. Se te notificará si alguien menciona tu @nombre o te responde, y verás un contador con el número de nuevas respuestas de cada tema."
         regular:
           title: "Normal"
           description: "Se te notificará solo si alguien menciona tu @nombre o te responde."
         muted:
           title: "Silenciar"
-          description: "No se te notificará de ningún tema en estas categorías y no aparecerán en la página de mensajes recientes."
+          description: "No recibirás notificaciones sobre novedades de temas en esta categoría, y no aparecerán en la lista de temas recientes."
       search_priority:
         label: "Prioridad de búsqueda"
         options:
@@ -2825,6 +3001,7 @@ es:
       list_filters:
         all: "todos los temas"
         none: "sin subcategoría"
+      colors_disabled: "No puedes seleccionar colores porque tienes no tienes activados los estilos de categoría."
     flagging:
       title: "¡Gracias por ayudar a mantener una comunidad civilizada!"
       action: "Reportar publicación"
@@ -2842,7 +3019,8 @@ es:
       notify_action: "Mensaje"
       official_warning: "Advertencia oficial"
       delete_spammer: "Eliminar spammer"
-      delete_confirm_MF: "Estás a punto de eliminar {POSTS, plural, one {<b>1</b> post} other {<b>#</b> posts}} y {TOPICS, plural, one {<b>1</b> topic} other {<b>#</b> topics}} de este usuario, eliminar su cuenta, bloquear registros desde su dirección IP <b>{ip_address}</b>, y añadir su dirección de correo electrónico <b>{email}</b> a la lista de bloqueo permanente. ¿Estás seguro de que este usuario es un spammer?"
+      flag_for_review: "Mandar a la cola de revisión"
+      delete_confirm_MF: "Estás a punto de eliminar {POSTS, plural, one {<b>#</b> publicación} other {<b>#</b> publicaciones}} y {TOPICS, plural, one {<b>#</b> tema} other {<b>#</b> temas}} de este usuario, también eliminarás su cuenta, bloquearás registros desde su dirección IP <b>{ip_address}</b>, y añadirás su correo electrónico <b>{email}</b> a una lista de bloqueos permanentes. ¿Seguro que el usuario es de verdad un spammer?"
       yes_delete_spammer: "Sí, eliminar spammer"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(oculto)"
@@ -2895,14 +3073,14 @@ es:
       locked_and_archived:
         help: "este tema está cerrado y archivado; ya no acepta respuestas nuevas y no se puede cambiar"
       unpinned:
-        title: "Dejar de destacar"
-        help: "Este tema se ha dejado de destacar para ti; tu lista de temas se mostrará en orden normal"
+        title: "Desfijar"
+        help: "Este tema se ha desfijado para ti; tu lista de temas se mostrará en orden normal"
       pinned_globally:
-        title: "Destacado globalmente"
-        help: "Este tema ha sido destacado globalmente, se mostrará en la parte superior de la página de mensajes recientes y de su categoría."
+        title: "Fijado globalmente"
+        help: "Este tema ha sido fijado globalmente, se mostrará en la parte superior de la página de mensajes recientes y de su categoría."
       pinned:
-        title: "Destacado"
-        help: "Este tema ha sido destacado para ti; se mostrará en la parte superior de su categoría"
+        title: "Fijado"
+        help: "Este tema ha sido fijado para ti; se mostrará en la parte superior de su categoría"
       unlisted:
         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:
@@ -2910,11 +3088,11 @@ es:
         help: "Este tema es un mensaje personal"
     posts: "Publicaciones"
     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}
-        med {con una proporción de me gusta por publicación bastante elevada}
-        high {con una proporción de me gusta por publicación elevadísima}
-        other {}}
+      Este tema tiene {count,  plural, one {# respuesta} other {# respuestas}} {ratio, select,
+       low {con una proporción de me gusta por publicación alta}
+       med {con una proporción de me gusta por publicación muy alta}
+       high {con una proporción de me gusta por publicación extremadamente alta}
+       other {}}
     original_post: "Publicación original"
     views: "Vistas"
     views_lowercase:
@@ -2934,7 +3112,7 @@ es:
       one: "usuario"
       other: "usuarios"
     category_title: "Categoría"
-    history: "Historial"
+    history: "Últimas 100 ediciones"
     changed_by: "por %{author}"
     raw_email:
       title: "Correo electrónicos entrantes"
@@ -3022,6 +3200,7 @@ es:
       close: "Cerrar (Esc)"
       content_load_error: '<a href="%url%">El contenido</a> no se pudo cargar.'
       image_load_error: '<a href="%url%">La imagen</a> no se pudo cargar.'
+    cannot_render_video: Este vídeo no se puede mostrar porque tu navegador no es compatible con el códec.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ","
       shortcut_key_delimiter_plus: "+"
@@ -3192,6 +3371,7 @@ es:
         one: "%{tags} y %{count} más"
         other: "%{tags} y %{count} más"
       delete_no_unused_tags: "No hay etiquetas sin usar."
+      tag_list_joiner: ", "
       delete_unused: "Eliminar etiquetas sin usar"
       delete_unused_description: "Eliminar todas las etiquetas que no estén asociadas a ningún tema o mensaje personal"
       cancel_delete_unused: "Cancelar"
@@ -3232,6 +3412,7 @@ es:
         everyone_can_use: "Todos pueden utilizar las etiquetas"
         usable_only_by_groups: "Las etiquetas son visibles para todo el mundo, pero solo los siguientes grupos las pueden usar"
         visible_only_to_groups: "Las etiquetas sólo son visibles para los siguientes grupos"
+        cannot_save: "No se ha podido guardar el grupo de etiquetas. Asegúrate de que tenga al menos una etiqueta, el nombre no esté vacío y hayas seleccionado un grupo para los permisos."
       topics:
         none:
           unread: "No tienes temas sin leer."
@@ -3244,10 +3425,11 @@ es:
     invite:
       custom_message: "Dale a tu invitación un toque personal escribiendo un <a href>mensaje personalizado</a>."
       custom_message_placeholder: "Ingresa tu mensaje personalizado"
-      approval_not_required: "Se aprobará automáticamente el usuario en cuanto acepte esta invitación."
+      approval_not_required: "El usuario será aprobado automáticamente en cuanto acepte esta invitación."
       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."
+    forced_anonymous_login_required: "El sistema está soportando un pico de carga excepcional y no puede responder en este momento. Inténtalo de nuevo más tarde."
     footer_nav:
       back: "Atrás"
       forward: "Avanzar"
@@ -3256,6 +3438,17 @@ es:
     safe_mode:
       enabled: "El modo seguro está activado, para salir del modo seguro cierra esta ventana del navegador"
     image_removed: "(imagen eliminada)"
+    do_not_disturb:
+      title: "No molestar durante..."
+      label: "No molestar"
+      remaining: "%{remaining} restante"
+      options:
+        half_hour: "30 minutos"
+        one_hour: "1 hora"
+        two_hours: "2 horas"
+        tomorrow: "Hasta mañana"
+        custom: "Personalizado"
+      set_schedule: "Establecer un horario de notificaciones"
   admin_js:
     type_to_filter: "filtrar opciones..."
     admin:
@@ -3269,9 +3462,9 @@ es:
       reports:
         title: "Lista de informes disponibles"
       dashboard:
-        title: "Dashboard"
-        last_updated: "Dashboard actualizado:"
-        discourse_last_updated: "Discourse actualizado:"
+        title: "Panel"
+        last_updated: "Última actualización del panel:"
+        discourse_last_updated: "Última actualización de Discourse:"
         version: "Versión"
         up_to_date: "¡Estás actualizado!"
         critical_available: "Actualización crítica disponible."
@@ -3283,14 +3476,18 @@ es:
         installed_version: "Instalada"
         latest_version: "Última"
         problems_found: "Algunos consejos con base en tus ajustes actuales"
+        new_features:
+          title: "\U0001F381 Novedades"
+          dismiss: "Ocultar"
+          learn_more: "Más información"
         last_checked: "Ultima comprobación"
         refresh_problems: "Refrescar"
-        no_problems: "No se encontró ningún problema."
+        no_problems: "No se ha encontrado ningún problema."
         moderators: "Moderadores:"
         admins: "Administradores:"
         silenced: "Silenciados:"
         suspended: "Suspendidos:"
-        private_messages_short: "Mensajes privados"
+        private_messages_short: "Mensajes"
         private_messages_title: "Mensajes"
         mobile_title: "Móvil"
         space_used: "%{usedSize} usado"
@@ -3334,19 +3531,19 @@ es:
           all: "Todo"
           view_table: "tabla"
           view_graph: "gráfico"
-          refresh_report: "Actualizar reporte"
+          refresh_report: "Actualizar informe"
           daily: Día
           monthly: Mes
           weekly: Semana
           dates: "Fechas (UTC)"
           groups: "Todos los grupos"
-          disabled: "Este reporte está inhabilitado"
+          disabled: "Este reporte está desactivado"
           totals_for_sample: "Total para la muestra"
           average_for_sample: "Promedio por muestra"
           total: "Total en todo el tiempo"
           no_data: "No hay datos que mostrar."
           trending_search:
-            more: '<a href="%{basePath}/admin/logs/search_logs">Buscar registros</a>'
+            more: '<a href="%{basePath}/admin/logs/search_logs">Registros de búsqueda</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:
@@ -3371,10 +3568,6 @@ es:
             available: "El nombre del grupo está disponible"
             not_available: "El nombre del grupo no está disponible"
             blank: "El nombre del grupo no puede estar vacío"
-        bulk_add:
-          title: "Añadir al grupo en masa"
-          complete_users_not_added: "Estos usuarios no se agregaron (asegúrate de que efectivamente tengan una cuenta):"
-          paste: "Pega una lista de nombres de usuario o direcciones de correo electrónico, uno por línea:"
         add_members:
           as_owner: "Convertir usuario(s) en propietario(s) de este grupo"
         manage:
@@ -3401,7 +3594,9 @@ 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."
+            automatic_membership_user_count:
+              one: "%{count} usuario tiene el nuevo dominio de correo y será añadido al grupo"
+              other: "%{count} usuarios tienen el nuevo dominio de correo 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"
@@ -3413,7 +3608,11 @@ es:
         group_members: "Miembros del grupo"
         delete: "Eliminar"
         delete_confirm: "¿Eliminar este grupo?"
+        delete_with_messages_confirm:
+          one: "Al borrar este grupo, %{count} mensaje se quedará huérfano, y los miembros del grupo dejarán de tener acceso a él.<br><br>¿Continuar?"
+          other: "Al borrar este grupo, %{count} mensajes se quedará huérfanos, y los miembros del grupo dejarán de tener acceso a ellos.<br><br>¿Continuar?"
         delete_failed: "No se pudo eliminar el grupo. Si este es un grupo automático, no se puede destruir."
+        delete_automatic_group: Este grupo ha sido creado automáticamente y no puede ser eliminado.
         delete_owner_confirm: "¿Quitar los privilegios de propietario a «%{username}»?"
         add: "Añadir"
         custom: "Personalizado"
@@ -3457,6 +3656,8 @@ es:
         continue: Continuar
         use_global_key: Clave global (permite todas las acciones)
         scopes:
+          description: |
+            Al usar scopes, puedes restringir una clave de API a una lista de endpoints específicos. También puedes definir qué parámetros permitir. Usa comas para separar varios valores.
           title: Scopes
           resource: Recurso
           action: Acción
@@ -3472,9 +3673,15 @@ es:
               wordpress: Necesario para que el plugin para WordPress wp-discourse funcione.
             users:
               bookmarks: Listar marcadores de usuario. Devuelve recordatorios de marcadores cuando se utiliza el formato ICS.
-              sync_sso: Sincronizar usuario usando SSO.
+              sync_sso: Sincroniza un usuario usando DiscourseConnect.
               show: Obtener información sobre un usuario.
               check_emails: Obtener una lista de los correos electrónicos del usuario.
+              update: Actualizar información del perfil de usuario.
+              log_out: Cerrar sesión todas las sesiones del usuario.
+              anonymize: Anonimizar cuentas de usuario.
+              delete: Eliminar cuentas de usuario.
+            email:
+              receive_emails: Combinar este scope con el scope mail-receiver para procesar correos entrantes.
       web_hooks:
         title: "Webhooks"
         none: "Ahora mismo no hay webhooks."
@@ -3487,19 +3694,19 @@ es:
         description: "Descripción"
         controls: "Controles"
         go_back: "Volver a la lista"
-        payload_url: "Payload URL"
+        payload_url: "URL a la que enviar el webhook"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Parece que estás estableciendo el webhook a una url local. El evento enviado a una dirección local podría causar efectos secundarios o comportamientos inesperados. ¿Continuar?"
+        warn_local_payload_url: "Parece que estás intentando configurar el webhook para una URL local. Los eventos enviados a direcciones locales pueden tener efectos colaterales o comportamientos inesperados. ¿Continuar?"
         secret_invalid: "El secreto no puede tener espacios en blanco."
         secret_too_short: "El secreto debería tener al menos 12 caracteres."
         secret_placeholder: "Una cadena opcional, utilizada para generar una firma"
         event_type_missing: "Necesitas establecer al menos un tipo de evento."
         content_type: "Tipo de contenido"
-        secret: "Secret"
+        secret: "Secreto"
         event_chooser: "¿Qué eventos te gustaría que dispararan este webhook?"
-        wildcard_event: "Envíame todo."
+        wildcard_event: "Enviar todos los eventos."
         individual_event: "Seleccionar eventos individuales."
-        verify_certificate: "Comprobar certificado TLS de la payload url"
+        verify_certificate: "Comprobar certificado TLS de la URL destino"
         active: "Activo"
         active_notice: "Enviaremos detalles del evento cuando suceda."
         categories_filter_instructions: "Los webhooks solo se dispararán si el evento está relacionado con las categorías especificadas. Déjalo en blanco para disparar los webhooks con todas las categorías."
@@ -3517,7 +3724,7 @@ es:
           details: "Cuando se publica, edita, elimina o recupera una respuesta."
         user_event:
           name: "Evento de usuario"
-          details: "Cuando un usuario inicia sesión, cierra sesión, es creado, aprobado o actualizado."
+          details: "Cuando un usuario inicia o cierra sesión, confirma su correo, se registra, es aprobado o actualizado."
         group_event:
           name: "Evento de grupo"
           details: "Cuando se crea, actualiza o destruye un grupo."
@@ -3536,6 +3743,12 @@ es:
         user_badge_event:
           name: "Evento por obtención de medalla"
           details: "Cuando un usuario recibe una medalla."
+        group_user_event:
+          name: "Evento de usuario de grupo"
+          details: "Cuando se agrega o elimina un usuario en un grupo."
+        like_event:
+          name: "Evento de me gusta"
+          details: "Cuando un usuario le da me gusta a una publicación."
         delivery_status:
           title: "Estado de entrega"
           inactive: "Inactivo"
@@ -3572,7 +3785,7 @@ es:
         name: "Nombre"
         none_installed: "No tienes plugins instalados."
         version: "Versión"
-        enabled: "¿Habilitados?"
+        enabled: "¿Activado?"
         is_enabled: "S"
         not_enabled: "N"
         change_settings: "Cambiar preferencias"
@@ -3625,7 +3838,7 @@ es:
             title: "Quitar la copia de respaldo"
             confirm: "¿Estás seguro de que quieres destruir esta copia de respaldo?"
           restore:
-            is_disabled: "Restaurar está deshabilitado en la configuración del sitio."
+            is_disabled: "Restaurar está desactivado en la configuración del sitio."
             label: "Restaurar"
             title: "Restaurar la copia de respaldo"
             confirm: "¿Estás seguro de que quieres restaurar esta copia de respaldo?"
@@ -3656,7 +3869,7 @@ es:
         title: "Personalizar"
         long_title: "Personalizaciones del sitio"
         preview: "vista previa"
-        explain_preview: "Ver el sitio con este tema habilitado"
+        explain_preview: "Ver el sitio con este tema activado"
         save: "Guardar"
         new: "Nuevo"
         new_style: "Nuevo estilo"
@@ -3672,7 +3885,7 @@ es:
         theme_owner: "No editable, propiedad de:"
         email_templates:
           title: "Correo electrónico"
-          subject: "Título del correo electrónico"
+          subject: "Asunto"
           multiple_subjects: "Esta plantilla de correo electrónico tiene múltiples asuntos."
           body: "Cuerpo del correo electrónico"
           revert: "Revertir los cambios"
@@ -3683,7 +3896,7 @@ es:
           components: "Componentes"
           theme_name: "Nombre del tema"
           component_name: "Nombre del componente"
-          themes_intro: "Seleccionar un tema existente o instalar uno nuevo para empezar"
+          themes_intro: "Selecciona un tema existente o instala 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"
@@ -3711,9 +3924,9 @@ es:
           show_advanced: "Mostrar campos avanzados"
           hide_advanced: "Ocultar campos avanzados"
           hide_unused_fields: "Ocultar campos sin uso"
-          is_default: "El tema está habilitado por defecto"
+          is_default: "El tema está activado por defecto"
           user_selectable: "El tema puede ser seleccionado por usuarios"
-          color_scheme_user_selectable: "Permitir que esta paleta pueda ser seleccionada por los usuarios"
+          color_scheme_user_selectable: "Permitir que pueda ser seleccionada por los usuarios"
           auto_update: "Actualizar automáticamente junto a Discourse"
           color_scheme: "Paleta de color"
           default_light_scheme: "Claro (predeterminado)"
@@ -3724,12 +3937,14 @@ es:
           convert: "Convertir"
           convert_component_alert: "¿Estás seguro de que quieres convertir este componente en tema? Se eliminará como componente en %{relatives}."
           convert_component_tooltip: "Convertir este componente en tema"
+          convert_component_alert_generic: "¿Seguro que quieres convertir este componente en tema?"
           convert_theme_alert: "¿Estás seguro de que quieres convertir este tema en componente? Se eliminará como primario en %{relatives}."
+          convert_theme_alert_generic: "¿Seguro que quieres convertir este tema en componente?"
           convert_theme_tooltip: "Convertir este tema en componente"
           inactive_themes: "Tema inactivos:"
           inactive_components: "Componentes sin usar:"
           broken_theme_tooltip: "Este tema tiene errores en CSS, HTML o YAML"
-          disabled_component_tooltip: "Este componente ha sido deshabilitado"
+          disabled_component_tooltip: "Este componente ha sido desactivado"
           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."
@@ -3758,27 +3973,30 @@ es:
           included_components: "Componentes incluidos"
           add_all: "Añadir todos"
           import_web_tip: "Repositorio que contiene el tema"
+          direct_install_tip: "¿Seguro que quieres instalar <strong>%{name}</strong> del repositorio listado abajo?"
           import_web_advanced: "Avanzado..."
           import_file_tip: "archivo .tar.gz, .zip o .dcstyle.json que contiene un tema"
           is_private: "El tema está en un repositorio privado de git"
           remote_branch: "Nombre del Branch (opcional)"
           public_key: "Conceda la siguiente clave pública de acceso al repositorio:"
+          public_key_note: "Después de poner una URL de repositorio privado válida, se generará una clave SSH y se mostrará aquí."
           install: "Instalar"
           installed: "Instalado"
           install_popular: "Destacados"
           install_upload: "Desde tu dispositivo"
           install_git_repo: "Desde un repositorio git"
           install_create: "Crear nuevo"
+          duplicate_remote_theme: "El componente de tema «%{name}» ya está instalado, ¿seguro que quieres instalar otra copia?"
           about_theme: "Acerca de"
           license: "Licencia"
           version: "Versión:"
           authors: "Autoría:"
           creator: "Creado por:"
           source_url: "Fuente"
-          enable: "Habilitar"
-          disable: "Inhabilitar"
-          disabled: "Este componente ha sido inhabilitado."
-          disabled_by: "Este componente ha sido inhabilitado por"
+          enable: "Activar"
+          disable: "Desactivar"
+          disabled: "Este componente ha sido desactivado."
+          disabled_by: "Este componente ha sido desactivado 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."
@@ -3788,6 +4006,7 @@ es:
           check_for_updates: "Buscar actualizaciones"
           updating: "Actualizando..."
           up_to_date: "El tema está actualizado. Última comprobación:"
+          has_overwritten_history: "La versión actual del tema ya no existe, porque el historial de Git ha sido sobreescrito por un force push."
           add: "Agregar"
           theme_settings: "Ajustes del tema"
           no_settings: "Este tema no tiene ajustes."
@@ -3797,6 +4016,7 @@ es:
             one: "¡El tema está %{count} commit detrás!"
             other: "¡El tema está %{count} commits detrás!"
           compare_commits: "(Ver nuevos commits)"
+          remote_theme_edits: "Si quieres editar este tema, deberás <a href='%{repoURL}' target='_blank'>proponer un cambio en su repositorio</a>"
           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"
           scss:
@@ -3812,28 +4032,26 @@ es:
             text: "Pie de página"
             title: "Ingresa HTML para mostrar en el pie de página"
           embedded_scss:
-            text: "CSS insertado"
+            text: "CSS incrustado"
             title: "Ingresar CSS personalizado para mostrar en la versión insertada de los comentarios"
           color_definitions:
             text: "Definiciones de color"
             title: "Introducir definiciones de colores personalizadas (para usuarios avanzados)"
             placeholder: |2-
 
-              Usa esta hoja de estilos para añadir colores personalizados a la lista de propiedades personalizadas de CSS.
+              Usa esta hoja de estilos para añadir colores personalizados a la lista de propiedades personalizadas de CSS
 
-              Por ejemplo:
+              Ejemplo:
 
-              :root {
-              --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};
-              }
+              %{example}
 
-              Añadir un prefijo a los nombres de las propiedades es altamente recomendado para evitar conflictos con plugins y el núcleo.
+              Se recomienda poner prefijos a los nombres de propiedad para evitar conflictos con plugins o el core
           head_tag:
             text: "</head>"
-            title: "HTML que será insertado antes de la </head> etiqueta"
+            title: "HTML a insertar antes de la etiqueta </head>"
           body_tag:
             text: "</body>"
-            title: "HTML que será insertado antes de la </body> etiqueta"
+            title: "HTML a insertar antes de la etiqueta </body>"
           yaml:
             text: "YAML"
             title: "Definir ajustes al tema en formato YAML"
@@ -3904,15 +4122,15 @@ es:
           reset: "Restablecer ajustes predeterminados"
           reset_confirm: "¿Estás seguro de que deseas restablecer los ajustes predeterminados de %{fieldName} y perder todos los cambios?"
           save_error_with_reason: "Sus cambios no se guardaron. %{error}"
-          instructions: "Personalizar la plantilla en la que se crean todos los correos html y el estilo utilizando CSS."
+          instructions: "Personaliza la plantilla sobre la que se crean todos los correos HTML, y aplica estilos usando CSS."
       email:
-        title: "Correos electrónicos"
+        title: "Correos"
         settings: "Ajustes"
         templates: "Plantillas"
-        preview_digest: "Vista previa de resumen"
+        preview_digest: "Vista previa resumen"
         advanced_test:
           title: "Prueba avanzada"
-          desc: "Observa cómo Discourse procesa los correos electrónicos recibidos. Para poder procesar correctamente el correo electrónico, por favor, pega acá abajo el mensaje de correo electrónico original completo."
+          desc: "Observa cómo Discourse procesa los correos electrónicos recibidos. Para poder procesar correctamente el correo electrónico, pega aquí abajo un mensaje de correo electrónico original completo."
           email: "Mensaje original"
           run: "Realizar prueba"
           text: "Cuerpo del mensaje seleccionado"
@@ -3925,11 +4143,11 @@ es:
         bounced: "Rebotado"
         received: "Recibidos"
         rejected: "Rechazados"
-        sent_at: "Enviado a"
+        sent_at: "Cuándo"
         time: "Fecha"
         user: "Usuario"
-        email_type: "Tipo de correo electrónico"
-        to_address: "A dirección"
+        email_type: "Tipo de correo"
+        to_address: "Destino"
         test_email_address: "dirección de correo electrónico de prueba"
         send_test: "Enviar correo electrónico de prueba"
         sent_test: "enviado!"
@@ -4089,8 +4307,8 @@ es:
             embeddable_host_update: "actualizar host insertable"
             embeddable_host_destroy: "eliminar host insertable"
             change_theme_setting: "cambiar la configuración del tema"
-            disable_theme_component: "deshabilitar componente de tema"
-            enable_theme_component: "habilitar componente de tema"
+            disable_theme_component: "desactivar componente de tema"
+            enable_theme_component: "activar componente de tema"
             revoke_title: "revocar título"
             change_title: "cambiar título"
             api_key_create: "crear clave API"
@@ -4108,6 +4326,7 @@ es:
             topic_unarchived: "tema desarchivado"
             post_staff_note_create: "añadir aviso del staff"
             post_staff_note_destroy: "destruir nota del staff"
+            delete_group: "eliminar grupo"
         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."
@@ -4139,7 +4358,7 @@ es:
             text: "Agrupar"
             title: "Crea un nuevo rango de entradas para bloquear si hay al menos «min_ban_entries_for_roll_up» entradas."
         search_logs:
-          title: "Buscar registros"
+          title: "Registros de búsqueda"
           term: "Término"
           searches: "Búsquedas"
           click_through_rate: "CTR"
@@ -4155,31 +4374,32 @@ es:
         title: "Palabras vigiladas"
         search: "buscar"
         clear_filter: "Limpiar"
-        show_words: "mostrar palabras"
-        one_word_per_line: "Una palabra por línea"
+        show_words:
+          one: "ver %{count} palabra"
+          other: "ver %{count} palabras"
         download: Descargar
         clear_all: Limpiar todo
-        clear_all_confirm_block: "¿Estás seguro de que quieres quitar todas las palabras agregadas a la acción «bloquear»?"
-        clear_all_confirm_censor: "¿Estás seguro de que quieres quitar todas las palabras agregadas a la acción «censurar»?"
-        clear_all_confirm_flag: "¿Estás seguro de que quieres quitar todas las palabras agregadas a la acción «reportar»?"
-        clear_all_confirm_require_approval: "¿Estás seguro de que quieres quitar todas las palabras agregadas a la acción «requiere aprobación»?"
-        word_count:
-          one: "%{count} palabra"
-          other: "%{count} palabras"
+        clear_all_confirm: "¿Quitar todas las palabras vigiladas para la acción %{action}?"
         actions:
           block: "Bloquear"
           censor: "Censurar"
           require_approval: "Requiere aprobación"
           flag: "Reportar"
+          replace: "Reemplazar"
+          tag: "Etiqueta"
         action_descriptions:
           block: "Impedir la publicación de mensajes que contengan estas palabras. El usuario verá un mensaje de error cuando trate de publicar su mensaje."
           censor: "Permitir mensajes que contengan estas palabras, pero reemplazar estas palabras por caracteres que las censuren."
           require_approval: "Las publicaciones que contengan estas palabras deberán ser aprobadas por el staff antes de que se puedan visualizar."
           flag: "Permitir publicaciones que contengan estas palabras, pero reportar el mensaje como inapropiado para que los moderadores puedan revisarlo."
+          replace: "Reemplazar palabras en publicaciones con otras nuevas o enlaces"
+          tag: "Etiquetas temas automáticamente basándose en su primer mensaje."
         form:
-          label: "Nueva palabra:"
-          placeholder: "palabra completa o * como comodín"
           placeholder_regexp: "expresión regular"
+          replacement_label: "Sustitución"
+          replacement_placeholder: "ejemplo o https://ejemplo.com"
+          tag_label: "Etiqueta"
+          tag_placeholder: "etiqueta1,etiqueta2,etiqueta3"
           add: "Agregar"
           success: "Éxito"
           exists: "Ya existe"
@@ -4199,7 +4419,7 @@ es:
       users:
         title: "Usuarios"
         create: "Agregar usuario administrador"
-        last_emailed: "Último correo electrónico enviado"
+        last_emailed: "Último correo enviado"
         not_found: "Lo sentimos, ese usuario no existe en nuestro sistema."
         id_not_found: "Lo sentimos, esa ID de usuario no existe en nuestro sistema."
         active: "Activados"
@@ -4232,6 +4452,9 @@ es:
         check_email:
           title: "Revelar la dirección de correo electrónico de este usuario"
           text: "Mostrar"
+        check_sso:
+          title: "Mostrar payload de SSO"
+          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}"
@@ -4272,7 +4495,7 @@ es:
         clear_penalty_history:
           title: "Eliminado historial de faltas"
           description: "usuarios con faltas no pueden alcanzar NC3"
-        delete_all_posts_confirm_MF: "Estás a punto de eliminar {POSTS, plural, one {1 post} other {# posts}} y {TOPICS, plural, one {1 topic} other {# topics}}. ¿Estás seguro?"
+        delete_all_posts_confirm_MF: "Estás a punto de eliminar {POSTS, plural, one {# publicación} other {# publicaciones}} y {TOPICS, plural, one {# tema} other {# temas}}. ¿Estás seguro?"
         silence: "Silenciar"
         unsilence: "Dejar de silenciar"
         silenced: "¿Silenciado?"
@@ -4321,6 +4544,9 @@ es:
         anonymize_yes: "Sí, hacer anónima esta cuenta."
         anonymize_failed: "Hubo un problema al hacer anónima la cuenta."
         delete: "Eliminar usuario"
+        delete_posts:
+          progress:
+            title: "Progreso de la eliminación de publicaciones"
         merge:
           button: "Juntar"
           prompt:
@@ -4332,6 +4558,8 @@ es:
             target_username_placeholder: "Nombre de usuario del nuevo dueño"
             transfer_and_delete: "Transferir y eliminar @%{username}"
             cancel: "Cancelar"
+          progress:
+            title: "Progreso de fusión"
           confirmation:
             title: "Transferir y eliminar @%{username}"
             description: |
@@ -4424,8 +4652,8 @@ es:
           on_grace_period: "Actualmente en periodo de gracia de promoción, no será degradado."
           locked_will_not_be_promoted: "Nivel de confianza bloqueado. Nunca será promovido."
           locked_will_not_be_demoted: "Nivel de confianza bloqueado. Nunca será degradado."
-        sso:
-          title: "Inicio de sesión único (SSO)"
+        discourse_connect:
+          title: "DiscourseConnect Single Sign On"
           external_id: "ID externa"
           external_username: "Nombre de usuario"
           external_name: "Nombre"
@@ -4433,10 +4661,10 @@ es:
           external_avatar_url: "URL de la imagen de perfil"
           last_payload: "Último payload"
           delete_sso_record: "Eliminar registro SSO"
-          confirm_delete: "¿Seguro que quieres eliminar este registro de single sign on (SSO)?"
+          confirm_delete: "¿Seguro que quieres eliminar este registro de DiscourseConnect?"
       user_fields:
         title: "Campos de usuario"
-        help: "Añadir campos que tus usuarios pueden llenar."
+        help: "Añade campos que cada usuario puede rellenar."
         create: "Crear campo de usuario"
         untitled: "Sin título"
         name: "Nombre del campo"
@@ -4449,7 +4677,7 @@ es:
         delete_confirm: "¿Estás seguro de que quieres eliminar este campo de usuario?"
         options: "Opciones"
         required:
-          title: "¿Requerido al registrarse?"
+          title: "¿Obligatorio rellenarlo al registrarse?"
           enabled: "requerido"
           disabled: "no requerido"
         editable:
@@ -4464,12 +4692,16 @@ es:
           title: "¿Mostrar en las tarjetas de usuario?"
           enabled: "mostrado en las tarjetas de usuario"
           disabled: "no mostrado en las tarjetas de usuario"
+        searchable:
+          title: "¿Se puede buscar?"
+          enabled: "se puede buscar"
+          disabled: "no se puede buscar"
         field_types:
           text: "Campo de texto"
           confirm: "Confirmación"
           dropdown: "Lista"
       site_text:
-        description: "Puedes personalizar cualquier texto de tu foro. Empieza por buscar debajo:"
+        description: "Puedes personalizar cualquier texto de tu foro. Empieza buscando:"
         search: "Busca el texto que te gustaría editar"
         title: "Texto"
         edit: "editar"
@@ -4478,14 +4710,20 @@ es:
         go_back: "Volver a la búsqueda"
         recommended: "Recomendamos personalizar el siguiente texto para que se ajusten a tus necesidades:"
         show_overriden: "Solo mostrar sobrescritos"
+        locale: "Idioma:"
+        fallback_locale_warning: "Estás editando un idioma basado en %{fallback}. Los usuarios que seleccionen %{fallback} como su idioma de interfaz no verán tus cambios."
         more_than_50_results: "Hay más de 50 resultados. Por favor, afina tu busqueda."
       settings:
-        show_overriden: "Solo mostrar anulados"
+        show_overriden: "Ver solo cambiados"
         history: "Ver historial de cambios"
         reset: "restablecer"
         none: "ninguno"
       site_settings:
-        title: "Ajustes del sitio"
+        emoji_list:
+          invalid_input: "Las listas de emojis solo pueden contener nombres válidos de emojis. Ej.: hugs"
+          add_emoji_button:
+            label: "Añadir Emoticono"
+        title: "Ajustes"
         no_results: "No se encontró ningún resultado."
         more_than_30_results: "Hay más de 30 resultados. Por favor, refina tu búsqueda o selecciona una categoría."
         clear_filter: "Quitar filtros"
@@ -4502,7 +4740,7 @@ es:
           title: "Lista de avatares que los usuarios pueden escoger"
         categories:
           all_results: "Todo"
-          required: "Requerido"
+          required: "Obligatorio"
           branding: "Marca"
           basic: "Ajustes básicos"
           users: "Usuarios"
@@ -4516,7 +4754,7 @@ es:
           spam: "Spam"
           rate_limits: "Límites de velocidad"
           developer: "Desarrollador"
-          embedding: "Insertado"
+          embedding: "Incrustado"
           legal: "Legal"
           api: "API"
           user_api: "API de usuario"
@@ -4524,11 +4762,11 @@ es:
           backups: "Copias de respaldo"
           login: "Inicio de sesión"
           plugins: "Plugins"
-          user_preferences: "Preferencias del usuario"
+          user_preferences: "Preferencias de usuario"
           tags: "Etiquetas"
           search: "Búsqueda"
           groups: "Grupos"
-          dashboard: "Dashboard"
+          dashboard: "Panel"
         secret_list:
           invalid_input: "Los campos no pueden estar vacíos o contener el carácter de barra vertical."
         default_categories:
@@ -4537,10 +4775,13 @@ es:
           modal_no: "No, solo aplicar el cambio a partir de ahora"
         simple_list:
           add_item: "Añadir elemento..."
+        json_schema:
+          edit: Lanzar editor
+          modal_title: "Editar %{name}"
       badges:
         title: Medallas
         new_badge: Nueva medalla
-        new: Nuevo
+        new: Crear nueva
         name: Nombre
         badge: Medalla
         display_name: Nombre que se muestra
@@ -4573,8 +4814,12 @@ es:
         enabled: Activar medalla
         icon: Icono
         image: Imagen
+        graphic: Gráfico
         icon_help: "ingresa un nombre de icono de Font Awesome (usa el prefijo 'far-' para iconos regulares y 'fab-' para iconos de marca)"
-        image_help: "Ingresa la URL de la imagen (sobrescribe el campo del icono si ambos están configurados)"
+        image_help: "Subir una imagen sobreescribirá el campo del icono si ambos tienen valores."
+        select_an_icon: "Seleccionar un icono"
+        upload_an_image: "Subir una imagen"
+        read_only_setting_help: "Personalizar texto"
         query: Consulta de medalla (SQL)
         target_posts: Publicaciones destino de la consulta
         auto_revoke: Ejecutar diariamente la consulta de revocación
@@ -4599,7 +4844,7 @@ es:
           no_grant_count: "No hay medallas para asignar."
           grant_count:
             one: "<b>%{count}</b> medalla para conceder."
-            other: "<b>%{count}</b> medalla para conceder."
+            other: "<b>%{count}</b> medallas para conceder."
           sample: "Muestra:"
           grant:
             with: <span class="username">%{username}</span>
@@ -4612,7 +4857,7 @@ es:
           what_are_badges_title: "¿Qué son las medallas?"
           badge_query_examples_title: "Ejemplos de consultas de medallas"
         mass_award:
-          title: Conceder medalla en masa
+          title: Conceder en masa
           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"
@@ -4634,14 +4879,14 @@ es:
         get_started: "Si quieres insertar Discourse en otro sitio web, empieza por añadir su host."
         confirm_delete: "¿Estás seguro de que quieres eliminar este host?"
         sample: "Usa el siguiente código HTML en tu sitio para crear e insertar temas. Reempalza <b>REPLACE_ME</b> con la URL canónica de la página donde quieres insertar."
-        title: "Insertado"
+        title: "Incrustado"
         host: "Hosts permitidos"
         class_name: "Nombre de clase"
         allowed_paths: "Lista de rutas permitidas"
         edit: "editar"
         category: "Publicar en categoría"
         add_host: "Añadir host"
-        settings: "Ajustes de insertado"
+        settings: "Ajustes de incrustado"
         crawling_settings: "Ajustes de crawlers"
         crawling_description: "Cuando Discourse crea temas para tus publicaciones, si no hay un feed RSS/ATOM presente intentará analizar el contenido de tu HTML. A veces puede ser difícil extraer tu contenido, por lo que damos la posibilidad de especificar las reglas CSS para hacer la extracción más fácil."
         embed_by_username: "Usuario para la creación de temas"
@@ -4649,13 +4894,13 @@ es:
         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."
-        allowed_embed_selectors: "Selector CSS para elementos permitidos en los insertados"
-        blocked_embed_selectors: "Selector CSS para elementos que deben ser eliminados de los insertados"
+        allowed_embed_selectors: "Selector CSS para elementos permitidos en los incrustados"
+        blocked_embed_selectors: "Selector CSS para elementos que deben ser eliminados de los incrustados"
         allowed_embed_classnames: "Clases CSS permitidas"
-        save: "Guardar ajustes de insertado"
+        save: "Guardar ajustes de incrustado"
       permalink:
         title: "Enlaces permanentes"
-        description: "Redirecciones para solicitar URL no conocidas por el foro."
+        description: "Redirecciones para URLs que no existan ya en el foro."
         url: "URL"
         topic_id: "ID del tema"
         topic_title: "Tema"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 81d72e6f9d..752a359939 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -26,7 +26,9 @@ et:
         millions: "%{number}M"
     dates:
       time: "hh:mm"
+      time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
+      long_no_year: "MMM D, HH:mm"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D. MMMM, YYYY hh:mm"
@@ -93,6 +95,9 @@ et:
         x_days:
           one: "%{count} päev tagasi"
           other: "%{count} päeva tagasi"
+        x_months:
+          one: "%{count} kuu tagasi"
+          other: "%{count} kuud tagasi"
       later:
         x_days:
           one: "%{count} päev hiljem"
@@ -107,13 +112,20 @@ et:
       next_month: "Järgmine Kuu"
       placeholder: kuupäev
     share:
+      topic_html: 'Teema: <span class="topic-title">%{topicTitle}</span>'
       post: "post nr%{postNumber}"
       close: "Sulge"
+      twitter: "Jaga Twitteris"
+      facebook: "Jaga Facebookis"
+      email: "Jaga e-mailiga"
+      url: "Kopeeri ja jaga link"
     action_codes:
       public_topic: "muutsin selle teema avalikuks %{when}"
+      private_topic: "tegi selle teema %{when} isiklikuks sõnumiks"
       split_topic: "poolita teema %{when} juurest"
       invited_user: "kutsutud %{who} %{when}"
       invited_group: "kutsusin %{who} %{when}"
+      user_left: "%{who} eemaldas ennast sellest sõnumist %{when}"
       removed_user: "kõrvaldatud %{who} %{when}"
       removed_group: "kõrvaldasin %{who} %{when}"
       autoclosed:
@@ -134,7 +146,15 @@ et:
       visible:
         enabled: "lisatud %{when}"
         disabled: "eemaldatud %{when}"
+      banner:
+        enabled: "tegi sellest bänneri %{when}. See ilmub iga lehe ülaosas, kuni kasutaja selle eemaldab."
+        disabled: "eemaldas selle bänneri %{when}. Seda ei kuvata enam iga lehe ülaosas."
+      forwarded: "edastas ülaltoodud e-kirja"
+    topic_admin_menu: "teema toimingud"
+    wizard_required: "Tere tulemast uude Discourse’i! Alusta <a href='%{url}' data-auto-route='true'>häälestusviisardiga</a> ✨"
     emails_are_disabled: "Kõik väljuvad meilid on administraatori poolt blokeeritud. Ühtegi teavitust meili teel ei saadeta."
+    software_update_prompt:
+      dismiss: "Ignoreeri"
     themes:
       default_description: "Vaikimisi"
     s3:
@@ -154,6 +174,7 @@ et:
         us_east_2: "US Ida (Ohio)"
         us_west_1: "US Lääs (N. California)"
         us_west_2: "US Lääs (Oregon)"
+    clear_input: "Kustuta tekst"
     edit: "muuda teema pealkirja ja foorumit"
     expand: "Näita veel"
     not_implemented: "Seda omadust pole veel rakendatud, vabandame!"
@@ -162,6 +183,7 @@ et:
     submit: "Saada"
     generic_error: "Vabandust, tekkis viga."
     generic_error_with_reason: "Tekkis viga: %{error}"
+    go_ahead: "Jätka"
     sign_up: "Liitu"
     log_in: "Logi sisse"
     age: "Vanus"
@@ -187,12 +209,17 @@ et:
     now: "just nüüd"
     read_more: "loe edasi"
     more: "Veel"
+    x_more:
+      one: "%{count} Veel"
+      other: "Veel %{count}"
     less: "Peida"
     never: "mitte kunagi"
     every_30_minutes: "iga 30 minuti järel"
     every_hour: "iga tund"
     daily: "iga päev"
     weekly: "iga nädal"
+    every_month: "iga kuu"
+    every_six_months: "iga kuue kuu tagant"
     max_of_count: "maksimum %{count}-st"
     alternation: "või"
     character_count:
@@ -200,6 +227,7 @@ et:
       other: "%{count} sümbolit"
     related_messages:
       title: "Seotud sõnumid"
+      see_all: 'Vaata <a href="%{path}">kõiki sõnumeid</a> kasutajalt @%{username}...'
     suggested_topics:
       title: "Soovitatud teemad"
       pm_title: "Soovitatud sõnumid"
@@ -212,8 +240,6 @@ et:
       moderators: "Moderaatorid"
       stat:
         all_time: "Alates algusest"
-        last_7_days: "Viimased 7"
-        last_30_days: "Viimased 30"
       like_count: "Meeldimisi"
       topic_count: "Teemad"
       post_count: "Postitused"
@@ -227,26 +253,39 @@ et:
       help:
         bookmark: "Kliki selle teema esimesele postitusele järjehoidja lisamiseks"
         unbookmark: "Kliki selle teema kõigi järjehoidjate eemaldamiseks"
+        unbookmark_with_reminder: "Klõpsa et eemaldada teemalt kõik järjehoidjad ja meeldetuletused. Sul on siin teemas meeldetuletus %{reminder_at}."
     bookmarks:
+      created: "Oled selle postituse järjehoidjatesse lisanud. %{name}"
       not_bookmarked: "lisa sellele postitusele järjehoidja"
+      created_with_reminder: "Olete selle postituse järjehoidjatesse lisanud meeldetuletusega %{date}. %{name}"
       remove: "Eemalda järjehoidja"
+      delete: "Kustuta järjehoidja"
+      confirm_delete: "Kas soovid selle järjehoidja kustutada? Kustutatakse ka meeldetuletus."
+      confirm_clear: "Kas soovid kindlasti sellest teemast kustutada kõik oma järjehoidjad?"
       save: "Salvesta"
+      invalid_custom_datetime: "Sisestatud kuupäev ja kellaaeg on valed, palun proovi uuesti."
+      list_permission_denied: "Sul pole õigusi selle kasutaja järjehoidjate vaatamiseks."
+      no_user_bookmarks: "Sul pole järjehoidjatesse lisatud postitusi; järjehoidjad võimaldavad kiiresti konkreetsetele postitustele viidata."
+      auto_delete_preference:
+        label: "Kustuta automaatselt"
+        never: "Mitte kunagi"
+        when_reminder_sent: "Kui meeldetuletus on saadetud"
+        on_owner_reply: "Pärast sellele teemale vastamist"
+      search_placeholder: "Otsi järjehoidjaid nime, pealkirja või postituse sisu järgi"
       search: "Otsi"
       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"
+        today_with_time: "täna kell %{time}"
+        tomorrow_with_time: "homme kell %{time}"
+        at_time: "kell %{date_time}"
+    copy_codeblock:
+      copied: "kopeeritud!"
     drafts:
       resume: "Taasta"
       remove: "Eemalda"
+      remove_confirmation: "Oled kindel, et soovid selle mustandi kustutada?"
       new_topic: "Uus teema mustand"
       new_private_message: "Uus privaatsõnumi mustand"
       topic_reply: "Mustandi vastus"
-      abandon:
-        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"
@@ -258,6 +297,7 @@ et:
       other: "Vaata %{count} uut teemat"
     preview: "eelvaade"
     cancel: "tühista"
+    deleting: "Kustutan..."
     save: "Salvesta muudatused"
     saving: "Salvestan..."
     saved: "Salvestatud!"
@@ -278,25 +318,52 @@ et:
     banner:
       close: "Sulge see bänner."
       edit: "Muuda seda bännerit >>"
+    pwa:
+      install_banner: "Kas soovid <a href>sellesse seadmesse %{title} paigaldada?</a>"
     choose_topic:
       none_found: "Teemasid ei leitud."
+      title:
+        search: "Otsi teemat"
+        placeholder: "kirjuta siia teema pealkiri, URL või ID"
     review:
       explain:
         total: "Kokku"
       delete: "Kustuta"
       settings:
+        saved: "Salvestatud"
         save_changes: "Salvesta muudatused"
         title: "Seaded"
+      moderation_history: "Modereerimise ajalugu"
+      view_all: "Vaata kõiki"
+      grouped_by_topic: "Rühmitatud teemade kaupa"
+      none: "Läbivaatamiseks pole ühtegi asja."
+      view_pending: "vaata ootel"
+      title: "Vaata üle"
       topic: "Teema:"
       filtered_user: "Kasutaja"
+      show_all_topics: "näita kõiki teemasid"
+      deleted_post: "(postitus kustutatud)"
+      deleted_user: "(kasutaja kustutatud)"
       user:
+        bio: "Bio"
+        website: "Veebileht"
         username: "Kasutajanimi"
         email: "E-post"
         name: "Nimi"
+        fields: "Väljad"
+        reject_reason: "Põhjus"
       topics:
         topic: "Teema"
         reviewable_count: "Arv"
+        deleted: "[Teema on kustutatud]"
+        original: "(algne teema)"
         details: "üksikasjad"
+        unique_users:
+          one: "%{count} kasutaja"
+          other: "%{count} kasutajat"
+      replies:
+        one: "%{count} vastus"
+        other: "%{count} vastust"
       edit: "Muuda"
       save: "Salvesta"
       cancel: "Tühista"
@@ -305,22 +372,69 @@ et:
         type:
           title: "Liik"
         refresh: "Värskenda"
+        status: "Staatus"
         category: "Foorum"
+        orders:
+          score: "Skoor"
+          score_asc: "Skoor (vastupidine)"
+          created_at: "Loomise aeg"
+          created_at_asc: "Loomise aeg (vastupidine)"
+        priority:
+          medium: "Keskmine"
+          high: "Kõrge"
       scores:
+        score: "Skoor"
         date: "Date"
         type: "Liik"
+        status: "Staatus"
       statuses:
         pending:
           title: "Ootel"
+        approved:
+          title: "Heakskiidetud"
         rejected:
           title: "Tagasi lükatud"
+        ignored:
+          title: "Ignoreeritud"
       types:
         reviewable_user:
           title: "Kasutaja"
+        reviewable_post:
+          title: "Postitus"
       approval:
         title: "Postitus vajab kinnitust"
         description: "Oleme sinu uue postituse kätte saanud, kuid see vajab enne ilmumist moderaatori kinnitust. Palume veidi kannatust. "
         ok: "OK"
+      example_username: "kasutajanimi"
+      reject_reason:
+        title: "Miks sa selle kasutaja tagasi lükkad?"
+        send_email: "Saada tagasilükkamise e-kiri"
+    relative_time_picker:
+      minutes:
+        one: "minut"
+        other: "minutit"
+      hours:
+        one: "tund"
+        other: "tundi"
+      days:
+        one: "päev"
+        other: "päeva"
+      months:
+        one: "kuu"
+        other: "kuud"
+    time_shortcut:
+      later_today: "Täna hiljem"
+      next_business_day: "Järgmisel tööpäeval"
+      tomorrow: "Homme"
+      next_week: "Järgmisel nädalal"
+      post_local_date: "Kuupäev postituses"
+      later_this_week: "Hiljem sel nädalal"
+      start_of_next_business_week: "Esmaspäev"
+      start_of_next_business_week_alt: "Järgmisel esmaspäeval"
+      next_month: "Järgmisel kuul"
+      custom: "Vali kuupäev ja kellaaeg"
+      relative: "Suhteline aeg"
+      none: "Pole vaja"
     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>"
@@ -336,6 +450,7 @@ et:
       sent_by_user: "Saadetud kasutaja <a href='%{userUrl}'>%{user}</a> poolt"
       sent_by_you: "<a href='%{userUrl}'>Sinu </a> saadetud"
     directory:
+      username: "Kasutajanimi"
       filter_name: "filtreeri kasutajanime järgi"
       title: "Kasutajad"
       likes_given: "Antud"
@@ -352,6 +467,7 @@ et:
       days_visited_long: "Päevi külastatud"
       posts_read: "Loetud"
       posts_read_long: "Positusi loetud"
+      last_updated: "Viimati uuendatud:"
       total_rows:
         one: "%{count} kasutaja"
         other: "%{count} kasutajat"
@@ -383,9 +499,19 @@ et:
           credentials:
             username: "Kasutajanimi"
             password: "Parool"
+          settings:
+            title: "Seaded"
+          mailboxes:
+            disabled: "välja lülitatud"
         membership:
           title: Liikmelisus
           access: Juurdepääs
+        categories:
+          title: Kategooriad
+          watching_first_post_categories_instructions: "Kaustajaid teavitatakse esimesest postitusest igas uues teemas nendes kategooriates."
+        tags:
+          title: Sildid
+          long_title: "Siltide vaikemärguanded"
         logs:
           title: "Logid"
           when: "Millal"
@@ -396,10 +522,16 @@ et:
           details: "Detailid"
           from: "Kellelt"
           to: "Kellele"
+      permissions:
+        title: "Õigused"
+        none: "Selle rühmaga pole seotud ühtegi kategooriat."
+        description: "Selle rühma liikmed pääsevad ligi neile kategooriatele"
+      public_admission: "Luba kasutajatel grupiga vabalt liituda (nõuab avalikult nähtavat gruppi)"
       public_exit: "Luba kasutajatel vabalt grupist lahkuda"
       empty:
         posts: "Selle grupi liikmetelt ei ole postitusi."
         members: "Sellel grupil liikmed puuduvad."
+        requests: "Selle grupi jaoks pole liikmeks astumise taotlusi."
         mentions: "Seda gruppi pole mainitud."
         messages: "Sellele grupile teated puuduvad."
         topics: "Selle grupi liikmetelt ei ole teemasid."
@@ -409,8 +541,11 @@ et:
       leave: "Lahku"
       request: "Päring"
       message: "Sõnum"
+      confirm_leave: "Oled kindel, et soovid sellest grupist lahkuda?"
       membership_request:
         submit: "Saada päring"
+        title: "Taotlus liituda grupiga @%{group_name}"
+        reason: "Anna grupi omanikele teada, miks sa sellesse gruppi kuulud"
       membership: "Liikmelisus"
       name: "Nimi"
       group_name: "Grupi nimi"
@@ -451,7 +586,19 @@ et:
         make_owner_description: "Tee <b>%{username}</b> selle grupi omanikuks"
         remove_owner: "Eemalda omanik"
         remove_owner_description: "Eemalda <b>%{username}</b> selle grupi omanikustaatusest"
+        make_primary: "Tee primaarseks"
+        make_primary_description: "Tee sellest <b>%{username}</b> primaarne grupp"
+        remove_primary: "Eemalda kui primaarne"
+        remove_members: "Eemalda liikmed"
+        remove_members_description: "Eemalda valitud kasutajad sellest grupist"
+        make_owners: "Määra omanikuks"
+        make_owners_description: "Tee valitud kasutajatest selle grupi omanikud"
+        remove_owners: "Eemalda omanikud"
+        remove_owners_description: "Eemalda valitud kasutajad selle grupi omanike hulgast"
+        make_all_primary: "Tee kõik primaarseks"
+        remove_all_primary: "Eemalda kui primaarne"
         owner: "Omanik"
+        forbidden: "Sul pole lubatud liikmeid vaadata."
       topics: "Teemat"
       posts: "Postitused"
       mentions: "Mainimisi"
@@ -463,6 +610,7 @@ et:
         only_admins: "Vaid adminid"
         mods_and_admins: "Vaid moderaatorid ja adminnid"
         members_mods_and_admins: "Vaid grupi liikmed, moderaatorid ja adminnid"
+        owners_mods_and_admins: "Ainult grupi omanikud, moderaatorid ja administraatorid"
         everyone: "Igaüks"
       notifications:
         watching:
@@ -470,6 +618,7 @@ et:
           description: "Sind teavitatakse igast uuest postitusest. Ühtlasi kuvatakse uute vastuste arv."
         watching_first_post:
           title: "Vaatan esimest postitust"
+          description: "Sind teavitatakse selle grupi uutest sõnumitest, aga mitte vastustest."
         tracking:
           title: "Jälgin"
           description: "Sind teavitatakse, kui keegi sinu @name mainib või sulle vastab. Ühtlasi kuvatakse uute vastuste arv."
@@ -478,13 +627,18 @@ et:
           description: "Sind teavitatakse, kui keegi sinu @name mainib või sulle vastab."
         muted:
           title: "Vaigistatud"
+          description: "Sind ei teavitata selle grupi sõnumitest."
       flair_url: "Avatari andekuse pilt"
+      flair_upload_description: "Kasuta ruudukujulisi pilte, mis on vähemalt 20 x 20 pikslit suured."
       flair_bg_color: "Avatari andekuse taustavärv"
       flair_bg_color_placeholder: "(Valikuline) Värvi väärtus heksakoodis"
       flair_color: "Avatari andekuse värv"
       flair_color_placeholder: "(Valikuline) Värvi väärtus heksakoodis"
       flair_preview_icon: "Ikooni eelvaatlus"
       flair_preview_image: "Pildi eelvaatlus"
+      flair_type:
+        icon: "Vali ikoon"
+        image: "Lae pilt üles"
     user_action_groups:
       "1": "Meeldimisi antud"
       "2": "Meeldimisi saadud"
@@ -514,12 +668,25 @@ et:
       posts: "Postitust"
       topics: "Teemat"
       latest: "Viimased"
-      latest_by: "viimased kasutajalt"
       toggle_ordering: "lülita järjestus"
       subcategories: "Alamfoorumid"
+      muted: "Vaigistatud kategooriad"
       topic_sentence:
         one: "%{count} teema"
         other: "%{count} teemat"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "nädal"
+        month: "kuu"
+      topic_stat_all_time:
+        one: "%{number} kokku"
+        other: "%{number} kokku"
+      topic_stat_sentence_week:
+        one: "%{count} uus teema viimase nädala jooksul."
+        other: "%{count} uut teemat viimase nädala jooksul."
+      n_more: "Kategooriad (veel %{count})..."
     ip_lookup:
       title: IP-aadressi Otsing
       hostname: Hostinimi
@@ -558,39 +725,60 @@ et:
           unread: "Lugemata"
         ignore_duration_username: "Kasutajanimi"
         ignore_duration_save: "Ignoreeri"
+        ignore_option: "Ignoreeritud"
         mute_option: "Vaigistatud"
         normal_option: "Normaalne"
+      notification_schedule:
+        none: "Pole"
+        monday: "Esmaspäev"
+        to: "kellele"
       activity_stream: "Tegevused"
+      read: "Loetud"
       preferences: "Eelistused"
       feature_topic_on_profile:
         save: "Salvesta"
         clear:
           title: "Puhasta"
+      use_current_timezone: "Kasuta praegust ajavööndit"
       profile_hidden: "Selle kasutaja avalik profiil on peidetud."
       expand_profile: "Näita veel"
       collapse_profile: "Ahenda"
       bookmarks: "Järjehoidjad"
       bio: "Minust"
+      timezone: "Ajavöönd"
       invited_by: "Kasutaja, kes kutsus"
       trust_level: "Usaldustase"
       notifications: "Teavitused"
       statistics: "Statistika"
       desktop_notifications:
+        label: "Reaalajas teavitused"
         not_supported: "See brauser ei toeta teavitusi. Kahju."
         perm_default: "Lülita teavitused sisse"
         perm_denied_btn: "Pole lubatud"
         perm_denied_expl: "Oled teavitused keelanud. Luba teavitused oma brauseri sätetes."
         disable: "Keela teavitused"
         enable: "Luba teavitused"
-        each_browser_note: "Märkus: see säte tuleb muuta igas kasutusel olevas brauseris."
+        consent_prompt: "Kas soovid reaalajas teavitusi, kui inimesed su postitustele vastavad?"
       dismiss: "Ignoreeri"
       dismiss_notifications: "Ignoreeri kõiki"
       dismiss_notifications_tooltip: "Märgi kõik lugemata teavitused loetuks"
       first_notification: "Sinu esimene teavitus! Vali see et alustada."
+      dynamic_favicon: "Kuva arvu brauseri ikoonil"
+      skip_new_user_tips:
+        skip_link: "Jäta need näpunäited vahele"
+      theme_default_on_all_devices: "Määra see kõikides minu seadmetes vaiketeemaks"
+      color_scheme_default_on_all_devices: "Määra vaikimisi värviskeemi(de)ks kõikides minu seadmetes"
+      color_scheme: "Värviskeem"
+      color_schemes:
+        default_description: "Teema vaikimisi"
+        undo: "Lähtesta"
+        regular: "Tavaline"
+      dark_mode: "Tume režiim"
       allow_private_messages: "Luba teistel kasutajatel mulle privaatsõnumeid saata"
       external_links_in_new_tab: "Ava kõik välisviited uuel sakil"
       enable_quoting: "Luba esiletõstetud tekstile tsitaadiga vastata"
       change: "muuda"
+      featured_topic: "Esile tõstetud teema"
       moderator: "%{user} on moderaator"
       admin: "%{user} on admin"
       moderator_tooltip: "See kasutaja on moderaator"
@@ -599,6 +787,7 @@ et:
       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"
       email_activity_summary: "Tegevuste kokkuvõte"
       mailing_list_mode:
         label: "Postiloendi režiim"
@@ -626,6 +815,7 @@ et:
       watched_first_post_tags: "Vaatan esimest postitust"
       watched_first_post_tags_instructions: "Sind teavitatakse esimesest postitusest igas nende siltidega uues teemas."
       muted_categories: "Vaigistatud"
+      regular_categories: "Tavaline"
       delete_account: "Kustuta minu konto"
       delete_account_confirm: "Kas oled kindel, et soovid oma konto jäädavalt kustutada? Seda toimingut ei ole võimalik tagasi võtta!"
       deleted_yourself: "Konto on edukalt kustutatud."
@@ -633,6 +823,10 @@ et:
       admin_delete: "Kustuta"
       users: "Kasutajad"
       muted_users: "Vaigistatud"
+      allowed_pm_users: "Lubatud"
+      allowed_pm_users_instructions: "Lubage PM-id ainult nendelt kasutajatelt."
+      ignored_users: "Ignoreeritud"
+      ignored_users_instructions: "Blokeeri kõik postitused, teavitused ja PM-id nendelt kasutajatelt."
       tracked_topics_link: "Näita"
       automatically_unpin_topics: "Eemalda lõppu jõudmisel teemadelt automaatselt esiletõstmise märgistus."
       apps: "Äpid"
@@ -641,13 +835,16 @@ et:
       api_approved: "Heakskiidetud:"
       api_last_used_at: "Viimati kasutatud:"
       theme: "Teema"
+      save_to_change_theme: 'Teema uuendatakse pärast seda, kui klõpsad "%{save_text}”'
       home: "aikimisi avaleht"
+      staged: "Ettevalmistamisel"
       staff_counters:
         flags_given: "kasulikud tähised"
         flagged_posts: "tähistatud postitused"
         deleted_posts: "kustutatud postitused"
         suspensions: "ajutised peatamised"
         warnings_received: "hoiatused"
+        rejected_posts: "tagasilükatud postitused"
       messages:
         all: "Kõik"
         inbox: "Postkast"
@@ -662,6 +859,7 @@ et:
         tags: "Sildid"
       preferences_nav:
         account: "Konto"
+        security: "Turve"
         profile: "Profiil"
         emails: "E-post"
         notifications: "Teavitused"
@@ -679,11 +877,15 @@ et:
         choose_new: "Vali uus parool"
         choose: "Vali parool"
       second_factor_backup:
+        title: "Kahefaktorilise autentimise varukoodid"
         regenerate: "Genereeri uus"
         disable: "Keela"
         enable: "Luba"
+        enable_long: "Lülita varukoodid sisse"
         copy_to_clipboard: "Kopeeri lõikelauale"
+        copy_to_clipboard_error: "Tõrge kopeerimisel"
         copied_to_clipboard: "Kopeeritud lõikelauale"
+        download_backup_codes: "Lae varukoodid alla"
       second_factor:
         confirm_password_description: "Palun kinnita jätkamiseks oma parooli"
         name: "Nimi"
@@ -704,22 +906,31 @@ et:
         taken: "Vabandust, see kasutajanimi on võetud."
         invalid: "Selline kasutajanimi ei ole lubatud. Kasutada tohib ainult numbreid ja tähti"
       add_email:
+        title: "Lisa meiliaadress"
         add: "lisa"
       change_email:
         title: "Muuda meiliaadressi"
         taken: "Vabandust, see meiliaadress ei ole saadaval."
         error: "Sinu meiliaadressi muutmisel esines tõrge. Äkki on see juba kasutuses?"
         success: "Saatsime sellele aadressile meili. Palun järgi seal olevaid juhiseid."
+        success_via_admin: "Saatsime sellele meiliaadressile kirja. Kasutaja peab järgima kirjas olevaid juhiseid."
       change_avatar:
         title: "Muuda oma profiilipilti"
+        gravatar_title: "Muuda oma avatari %{gravatarName} veebisaidil"
+        gravatar_failed: "Me ei leidnud selle e-posti aadressiga %{gravatarName}'i"
+        refresh_gravatar_title: "Värskenda oma %{gravatarName}"
         letter_based: "Süsteemi poolt määratud profiilipilt"
         uploaded_avatar: "Individuaalne pilt"
         uploaded_avatar_empty: "Lisage individuaalne pilt"
         upload_title: "Lae üles oma pilt"
         image_is_not_a_square: "Hoiatus: lõikasime pilti, kuna laius ja kõrgus ei olnud võrdsed."
+      change_profile_background:
+        title: "Profiili päis"
       change_card_background:
         title: "Kasutajakaardi taustpilt"
         instructions: "Taustapildidd tsentreeritakse ja on vaikimisi 590 pikslit laiad."
+      change_featured_topic:
+        title: "Esile tõstetud teema"
       email:
         title: "Meiliaadress"
         primary: "Peamine e-post"
@@ -727,7 +938,7 @@ et:
         primary_label: "primaarne"
         update_email: "Muuda meiliaadressi"
         no_secondary: "Teist e-posti pole"
-        instructions: "Ära näita kunagi avalikkusele."
+        instructions: "Ei näidata avalikult."
         ok: "Saadame sulle kinnituseks meili"
         invalid: "Sisesta palun korrektne meiliaadress"
         authenticated: "Sinu meil on autenditud %{provider} poolt"
@@ -801,6 +1012,8 @@ et:
         every_hour: "iga tund"
         daily: "igapäevaselt"
         weekly: "iga nädal"
+        every_month: "iga kuu"
+        every_six_months: "iga kuue kuu tagant"
       email_level:
         title: "Teavita mind, kui keegi tsiteerib minu postitust, vastab minu postitusele, mainib minu @kasutajanime või kutsub mind teemaga liituma"
         always: "alati"
@@ -831,41 +1044,38 @@ et:
         after_10_minutes: "pärast 10 minutit"
       notification_level_when_replying: "Kui ma postitan teemasse, vali teemaks"
       invited:
-        search: "kirjuta kutsete otsimiseks..."
         title: "kutsed"
+        pending_tab: "Ootel"
+        pending_tab_with_count: "Ootel (%{count})"
+        redeemed_tab: "Lunastatud"
+        redeemed_tab_with_count: "Lunastatud (%{count})"
+        invited_via: "Kutse"
+        groups: "Grupid"
+        topic: "Teema"
+        edit: "Muuda"
+        remove: "Eemalda"
+        reinvited: "Kutse uuesti saadetud"
+        search: "kirjuta kutsete otsimiseks..."
         user: "Kutsutud kasutaja"
         none: "Pole ühtegi kutset, mida näidata."
         truncated:
           one: "Näitan esimest kutset."
           other: "Näitan esimest %{count} kutset."
         redeemed: "Lunastatud kutsed"
-        redeemed_tab: "Lunastatud"
-        redeemed_tab_with_count: "Lunastatud (%{count})"
         redeemed_at: "Lunastatud"
         pending: "Ootel kutsed"
-        pending_tab: "Ootel"
-        pending_tab_with_count: "Ootel (%{count})"
         topics_entered: "Vaadatud teemasid"
         posts_read_count: "Postitust loetud"
         expired: "See kutse on aegunud."
-        rescind: "Eemalda"
-        rescinded: "Kutse eemaldatud"
-        reinvite: "Saada kutse uuesti"
-        reinvite_all: "Saada kõik kutsed uuesti"
         reinvite_all_confirm: "Oled sa kindel, et soovid kõik kutsed uuesti saata?"
-        reinvited: "Kutse uuesti saadetud"
-        reinvited_all: "Kõik kutsed uuesti saadetud"
         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: "Kutsu"
         valid_for: "Kutse link kehtib vaid meiliaadressile: %{email}"
         invite_link:
           success: "Kutse link edukalt genereeritud!"
         bulk_invite:
-          success: "Fail edukalt üles laetud. Sulle saabub teade, kui protsess on lõpule jõudnud."
           error: "Vabandust, fail peab olema CSV vormingus."
       password:
         title: "Parool"
@@ -964,7 +1174,6 @@ et:
     modal:
       close: "Sulge"
     close: "Sulge"
-    assets_changed_confirm: "See sait on just uuendatud. Värskendan nüüd viimasele versioonile?"
     logout: "Sind logiti välja."
     refresh: "Värskenda"
     home: "Avaleht"
@@ -973,15 +1182,6 @@ et:
       login_disabled: "Sisselogimine on blokeeritud seni, kuni sait on kirjutuskaitstud režiimis."
       logout_disabled: "Väljalogimine on blokeeritud kuni sait on kirjutuskaitstud režiimis."
     learn_more: "uuri veel..."
-    all_time: "kokku"
-    all_time_desc: "kokku teemasid loodud"
-    year: "aasta"
-    year_desc: "teemat loodud viimase 365 päeva jooksul"
-    month: "kuu"
-    month_desc: "teemat loodud viimase 30 päeva jooksul"
-    week: "nädal"
-    week_desc: "teemat loodud viimase 7 päeva jooksul"
-    day: "päev"
     first_post: Esimene postitus
     mute: Vaigista
     unmute: Tühista vaigistus
@@ -995,11 +1195,8 @@ et:
       sign_up: "Liitu"
       hide_session: "Tuleta mulle homme meelde"
       hide_forever: "tänan, ei"
-      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>."
       enable: "Võta see teema kokku"
       disable: "Näita kõiki postitusi"
     deleted_filter:
@@ -1019,7 +1216,7 @@ et:
     trust_level: "Usaldustase"
     search_hint: "kasutajanimi, meil või IP-aadress"
     create_account:
-      title: "Loo uus konto"
+      header_title: "Tere tulemast!"
       failed: "Miski läks valesti - võimalik, et see meiliaadress on juba registreeritud. Proovi viidet unustatud parooli lehele"
     forgot_password:
       title: "Parooli uuendamine"
@@ -1038,10 +1235,8 @@ et:
       complete_email_not_found: "Meiliaadressile <b>%{email}</b> ei vasta ükski konto"
       confirm_title: Edasi saidile %{site_name}
     login:
-      title: "Logi sisse"
       username: "Kasutaja"
       password: "Parool"
-      email_placeholder: "meiliaadress või kasutajanimi"
       caps_lock_warning: "Suurtäherežiim on sees"
       error: "Tundmatu viga"
       rate_limit: "Palun oota veidi enne järgmist sisselogimiskatset."
@@ -1080,13 +1275,14 @@ et:
         title: "GitHub abil"
     invites:
       accept_title: "Kutse"
-      welcome_to: "Teretulemast saidile %{site_name}!"
+      welcome_to: "Tere tulemast lehele %{site_name}!"
       invited_by: "Teid kutsus:"
       social_login_available: "Saate sisse logida ka sotsiaalvõrgustike abil, mis kasutavad seda meiliaadressi."
       your_email: "Teie konto meiliaadress on <b>%{email}</b>."
       accept_invite: "Võta kutse vastu"
       success: "Teie konto on loodud ning olete nüüd sisse logitud."
       name_label: "Nimi"
+      password_label: "Parool"
       optional_description: "(valikuline)"
     password_reset:
       continue: "Edasi saidile %{site_name}"
@@ -1136,7 +1332,6 @@ et:
       options: "Võimalused"
       whisper: "sosista"
       unlist: "eemaldatud"
-      blockquote_text: "Tsitaat"
       add_warning: "See on ametlik hoiatus."
       toggle_whisper: "Lülita sosistamine ümber"
       toggle_unlisted: "Lülita eemaldamine ümber"
@@ -1153,9 +1348,6 @@ et:
         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?"
         category_missing: "Pead valima foorumi"
       save_edit: "Salvesta muudatused"
@@ -1181,8 +1373,6 @@ et:
       saving: "Salvestan"
       saved: "Salvestatud!"
       uploading: "Laen üles..."
-      show_preview: "näita eelvaadet &raquo;"
-      hide_preview: "&laquo; peida eelvaade"
       quote_post_title: "Tsiteeri kogu postitust"
       bold_label: "B"
       bold_title: "Rasvane"
@@ -1194,8 +1384,8 @@ et:
       link_description: "sisesta viite kirjeldus siia"
       link_dialog_title: "Lisa hüperlink"
       link_optional_text: "valikuline pealkiri"
-      quote_title: "Plokktsitaat"
-      quote_text: "Plokktsitaat"
+      blockquote_title: "Tsitaat"
+      blockquote_text: "Tsitaat"
       code_title: "Eelvormindatud tekst"
       code_text: "taanda eelvormindatud tekst 4 tühiku võrra"
       paste_code_text: "kirjuta või kleebi kood siia"
@@ -1225,6 +1415,7 @@ et:
           label: "Uus teema"
         shared_draft:
           label: "Jagatud mustand"
+      ignore: "Ignoreeri"
     notifications:
       tooltip:
         regular:
@@ -1244,6 +1435,7 @@ et:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{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}"
@@ -1253,6 +1445,8 @@ et:
       linked: "<span>%{username}</span> %{description}"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>New Topic</span> %{description}"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       popup:
         mentioned: '%{username} mainis Sind teemas "%{topic}" - %{site_title}'
         group_mentioned: '%{username} mainis Sind teemas "%{topic}" - %{site_title}'
@@ -1268,10 +1462,7 @@ 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}"
       local_tip: "vali pildid oma seadmest"
-      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"
       select_file: "Vali fail"
@@ -1291,6 +1482,7 @@ et:
       no_more_results: "Rohkem vasteid pole."
       post_format: "postituse nr%{post_number} tegi %{username}"
       search_google_button: "Google"
+      search_button: "Otsi"
       context:
         user: "Otsi kasutaja @%{username} postitusi"
         category: "Otsi #%{category} foorumist"
@@ -1329,15 +1521,28 @@ et:
           noreplies: ilma vastusteta
           single_user: on ainult ühe kasutaja postitustega
         post:
+          count:
+            label: Postitust
+          min:
+            placeholder: miinimum
+          max:
+            placeholder: maksimum
           time:
             label: Postitatud
             before: enne
             after: pärast
+        views:
+          label: Vaatamisi
+        min_views:
+          placeholder: miinimum
+        max_views:
+          placeholder: maksimum
     hamburger_menu: "mine teise teemaloetelu või foorumi juurde"
     new_item: "uus"
     go_back: "tagasi"
     not_logged_in_user: "kasutajaleht koos toimingute ja eelistuste kokkuvõttega"
     current_user: "mine oma kasutajalehele"
+    view_all: "vaata kõiki %{tab}"
     topics:
       new_messages_marker: "viimane visiit"
       bulk:
@@ -1357,7 +1562,9 @@ et:
         change_category: "Määra kategooria"
         close_topics: "Sulge Teemad"
         archive_topics: "Arhiveeri Teemad"
+        move_messages_to_inbox: "Liiguta sisendkausta"
         notification_level: "Teavitus"
+        change_notification_level: "Muuda teavituste taset"
         choose_new_category: "Vali teemadele uus foorum:"
         selected:
           one: "Märkisid ära <b>%{count}</b> teema."
@@ -1367,16 +1574,23 @@ et:
         choose_new_tags: "Vali teemadele uued sildid:"
         choose_append_tags: "Vali uued sildid, mida nendele teemadele lisada:"
         changed_tags: "Nende teemade silte on muudetud."
+        remove_tags: "Eemalda kõik sildid"
+        confirm_remove_tags:
+          one: "Sellelt teemalt eemaldatakse kõik sildid. Oled kindel?"
+          other: "<b>%{count}</b> teemalt eemaldatakse kõik sildid. Oled kindel?"
+        progress:
+          one: "Progress: <strong>%{count}</strong> teema"
+          other: "Progress: <strong>%{count}</strong> teemat"
       none:
         unread: "Sul ei ole lugemata teemasid."
         new: "Sul ei ole uusi teemasid."
         read: "Sa ei ole veel ühtegi teemat lugenud."
         posted: "Sa ei ole veel ühtegi teemasse postitanud."
+        ready_to_create: "Valmis "
+        latest: "Kõik loetud!"
         bookmarks: "Sul ei ole veel ühtegi järjehoidjaga teemal."
         category: "Foorumis %{category} teemad puuduvad."
         top: "Tippteemad puuduvad."
-        educate:
-          unread: '<p>Sinu lugemata teemad ilmuvad siia.</p><p>Teemad loetakse vaikimisi mitteloetuteks ja varustatakse lugemata postituste loenduriga <span class="badge new-posts badge-notification">1</span> kui Sa:</p><ul><li>Lõid uue teema</li><li>Vastasid teemasse</li><li>Lugesid teemat kauem kui 4 minutit</li></ul><p>Või kui seadsid teema Jälgitavaks teavituste juhtpaneelil iga teema lõpus.</p><p>Muutmiseks külasta oma <a href="%{userPrefsUrl}">eelistuste</a> lehekülge.</p>'
       bottom:
         latest: "Rohkem värskeid teemasid pole."
         posted: "Rohkem uute postitustega teemasid pole."
@@ -1384,6 +1598,7 @@ et:
         new: "Rohkem uusi teemasid pole."
         unread: "Rohkem lugemata teemasid pole."
         category: "Foorumis %{category} rohkem teemasid pole."
+        tag: "Rohkem %{tag} teemasid pole."
         top: "Rohkem tippteemasid pole."
         bookmarks: "Rohkem järjehoidjaga teemasid pole."
     topic:
@@ -1401,9 +1616,18 @@ et:
         title: "Liiguta Postkasti"
         help: "Liiguta sõnum tagasi Postkasti"
       edit_message:
+        help: "Muuda sõnumi esimest postitust"
         title: "Muuda"
       defer:
+        help: "Märgi mitteloetuks"
         title: "Lükka edasi"
+      feature_on_profile:
+        help: "Lisa selle teema link oma kasutajakaardile ja profiili"
+        title: "Tõsta profiilis esile"
+      remove_from_profile:
+        warning: "Su profiilis on juba esile tõstetud teema. Kui jätkad, asendab see teema olemasoleva."
+        help: "Eemalda oma profiilist selle teema link"
+        title: "Eemalda profiilist"
       list: "Teemad"
       new: "uus teema"
       unread: "lugemata"
@@ -1442,12 +1666,36 @@ et:
       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_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 {}}"
+      unread_indicator: "Ükski liige pole veel selle teema viimast postitust lugenud."
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Vaata kõiki foorumeid
+      browse_all_tags: Sirvi kõiki silte
       view_latest_topics: vaata värskeid teemasid
+      suggest_create_topic: alusta uut vestlust?
       jump_reply_up: hüppa varasema vastuse juurde
       jump_reply_down: hüppa hilisema vastuse juurde
       deleted: "See teema on kustutatud"
+      slow_mode_update:
+        title: "Aeglane režiim"
+        select: "Kasutajad saavad sellesse teemasse postitada ainult sagedusega:"
+        description: "Väga aktiivsete või vaidlusaluste arutelude läbimõeldud arutelu edendamiseks peavad kasutajad enne siia teemasse uuesti postitamist ootama."
+        save: "Lülita sisse"
+        remove: "Lülita välja"
+        hours: "Tunde:"
+        minutes: "Minuteid:"
+        seconds: "Sekundeid:"
+        durations:
+          10_minutes: "10 minutit"
+          15_minutes: "15 minutit"
+          30_minutes: "30 minutit"
+          45_minutes: "45 minutit"
+          1_hour: "1 tund"
+          2_hours: "2 tundi"
+          4_hours: "4 tundi"
+          8_hours: "8 tundi"
+          12_hours: "12 tundi"
+          24_hours: "24 tundi"
+          custom: "Muu kestvus"
       topic_status_update:
         title: "Teema taimer"
         save: "Määra taimer"
@@ -1462,11 +1710,7 @@ et:
         later_this_week: "iljem sel nädalal"
         this_weekend: "Sellel nädalavahetusel"
         next_week: "Järgmisel nädalal"
-        two_weeks: "Kahe nädala pärast"
         next_month: "Järgmisel kuul"
-        three_months: "Kolme kuu pärast"
-        six_months: "Kuue kuu pärast"
-        one_year: "Aasta pärast"
         forever: "Igavesti"
         pick_date_and_time: "Vali kuupäev ja kellaaeg"
       publish_to_category:
@@ -1487,7 +1731,7 @@ et:
         title: "Tuleta mulle meelde"
       status_update_notice:
         auto_close: "See teema sulgub %{timeLeft} pärast ise."
-        auto_close_based_on_last_post: "See teema sulgub %{duration} peale viimast vastust."
+        auto_close_after_last_post: "See teema sulgub %{duration} peale viimast vastust."
       auto_close_title: "Automaatse sulgumise sätted"
       auto_close_immediate:
         one: "Viimane postitus selles teemas on juba %{count} tund aega vana, seega sulgub see teema nüüd."
@@ -1503,7 +1747,7 @@ et:
         go: "mine"
         jump_bottom: "hüppa viimase postituse juurde"
         jump_prompt: "mine..."
-        jump_prompt_of: "%{count} postitusest"
+        jump_prompt_long: "Mine..."
         jump_bottom_with_number: "hüppa postituse %{post_number} juurde"
         jump_prompt_or: "või"
         total: postitusi kokku
@@ -1580,6 +1824,7 @@ et:
       share:
         title: "Jaga"
         help: "jaga viidet sellele teemale"
+        invite_users: "Kutsu"
       print:
         title: "Trüki"
         help: "Ava selle teema prindikõlblik versioon"
@@ -1628,14 +1873,13 @@ et:
         username_placeholder: "kasutajanimi"
         action: "Saada kutse"
         help: "kutsu teisi siia teemasse meili või teavitustega"
-        to_forum: "Saadame su sõbrale lühikese meili koos viitega, mis lubab tal teemaga ühe klikiga liituda, sisselogimist nõudmata."
-        sso_enabled: "Sisesta selle isiku kasutajanimi, keda soovid siia teemasse kutsuda."
+        discourse_connect_enabled: "Sisesta selle isiku kasutajanimi, keda soovid siia teemasse kutsuda."
         to_topic_blank: "Sisesta selle isiku kasutajanimi või meiliaadress, keda soovid siia teemasse kutsuda."
         to_topic_email: "Sisestasid meiliaadressi. Saadame su sõbrale kutse, mis lubab tal kohe sellesse teemasse vastata."
         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>%{invitee}</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"
@@ -1644,6 +1888,9 @@ et:
           one: "%{count} postitus"
           other: "%{count} postitust"
         cancel: "Eemalda filter"
+      move_to:
+        action: "liiguta"
+        error: "Viga postituste liigutamisel."
       split_topic:
         title: "Liiguta uue teema alla"
         action: "liiguta uue teema alla"
@@ -1657,22 +1904,39 @@ et:
         title: "Liiguta olemasolevasse teemasse"
         action: "liiguta olemasolevasse teemasse"
         error: "Postituste sellesse teemasse liigutamisel tekkis viga."
+        radio_label: "Olemasolev teema"
         instructions:
           one: "Vali teema, kuhu soovid selle postituse liigutada."
           other: "Vali teema, kuhu soovid need <b>%{count}</b> postitust liigutada."
       move_to_new_message:
+        title: "Liiguta uude sõnumisse"
+        action: "liiguta uude sõnumisse"
+        message_title: "Uus sõnumi pealkiri"
         radio_label: "Uus sõnum"
+        participants: "Osalejad"
+      move_to_existing_message:
+        participants: "Osalejad"
       merge_posts:
         title: "Ühenda valitud postitused"
         action: "ühenda valitud postitused"
         error: "Valitud postituste ühendamisel tekkis viga."
       publish_page:
+        publish: "Avalda"
         public: "Avalik"
+        unpublish: "Tühista avaldamine"
+        unpublished: "Teie leht on avaldamata ja see pole enam kättesaadav."
+        publishing_settings: "Avaldamise seaded"
       change_owner:
         title: "Muuda omanikku"
         action: "muuda omanikku"
         error: "Postituste omanikuvahetusel tekkis viga."
         placeholder: "uue omaniku kasutajanimi"
+        instructions:
+          one: "Vali kasutaja <b>@%{old_user}</b> postituse jaoks uus omanik"
+          other: "Vali kasutaja <b>@%{old_user}</b> %{count} postituse jaoks uus omanik"
+        instructions_without_old_user:
+          one: "Vali postituse jaoks uus omanik"
+          other: "Vali %{count} postituse jaoks uus omanik"
       change_timestamp:
         title: "Muuda ajatemplit..."
         action: "muuda ajatemplit"
@@ -1687,8 +1951,13 @@ et:
           title: "Lisa postitus valikusse"
         selected_post:
           label: "valitud"
+          title: "Klõpsake postituse valikust eemaldamiseks"
         select_replies:
           label: "vali +vastused"
+          title: "Lisa postitus ja kõik selle vastused valikusse"
+        select_below:
+          label: "vali +allpool"
+          title: "Lisa postitus ja kõik sellest allpool olev valikusse"
         delete: kustuta valitud
         cancel: tühista valimine
         select_all: vali kõik
@@ -1696,29 +1965,41 @@ et:
         description:
           one: Oled valinud <b>%{count}</b> postituse.
           other: "Oled valinud <b>%{count}</b> postitust."
+      deleted_by_author:
+        one: "(teema autori poolt tagasi võetud, eemaldatakse %{count} tunni pärast, kui seda enne lipuga ei märgistata)"
+        other: "(teema autori poolt tagasi võetud, eemaldatakse %{count} tunni pärast, kui seda enne lipuga ei märgistata)"
     post:
       quote_reply: "Tsitaat"
+      quote_share: "Jaga"
       edit_reason: "Põhjus:"
       post_number: "postitus %{number}"
-      wiki_last_edited_on: "viimati muudeti wikit"
-      last_edited_on: "postitus viimati muudetud"
+      ignored: "Eiratud sisu"
+      wiki_last_edited_on: "wikit on viimati muudetud %{dateTime}"
+      last_edited_on: "postitust on viimati muudetud %{dateTime}"
       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}:"
       follow_quote: "mine tsiteeritud postituse juurde"
       show_full: "Näita kogu postitust"
+      show_hidden: "Vaata eiratud sisu."
       deleted_by_author:
         one: "(autori poolt tagasivõetud postitus kustutatakse automaatselt %{count} tunni pärast, kui ei ole tähistatud)"
         other: "(autori poolt tagasivõetud postitus kustutatakse automaatselt %{count} tunni pärast, kui ei ole tähistatud)"
       collapse: "ahenda"
       expand_collapse: "laienda/ahenda"
+      locked: "Meeskonnaliige on selle sõnumi muutmise keelanud."
       gap:
         one: "vaata %{count} peidetud vastust"
         other: "vaata %{count} peidetud vastust"
+      notice:
+        new_user: "See on esimene kord, kui %{user} postitas — tervitame neid meie kogukonda!"
+        returning_user: "%{user} pole mõnda aega siin käinud — nende viimane postitus oli %{time}."
       unread: "Postitus on lugemata"
       has_replies:
         one: "%{count} vastus"
         other: "%{count} vastust"
+      has_replies_count: "%{count}"
+      unknown_user: "(tundmatu/kustutatud kasutaja)"
       has_likes_title:
         one: "Ühele meeldis see postitus"
         other: "%{count}-le meeldis see postitus"
@@ -1726,21 +2007,27 @@ et:
       has_likes_title_you:
         one: "Sulle ja veel ühele inimesele see postitus meeldis"
         other: "Sulle ja veel %{count} inimesele see postitus meeldis"
+      filtered_replies_hint:
+        one: "Vaata postitust ja selle vastust"
+        other: "Vaata postitust ja selle %{count} vastust"
+      filtered_replies_viewing:
+        one: "Vaatad %{count} vastust postitusele"
+        other: "Vaatad %{count} vastust postitusele"
+      in_reply_to: "Lae algne postitus"
+      view_all_posts: "Vaata kõiki postitusi"
       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."
+        file_too_large: "See fail on liiga suur (maksimaalne lubatud suurus on %{max_size_kb}kb). Lae fail üles mõnda pilveteenusesse ja jaga siin linki."
         too_many_uploads: "Vabandame, faile saab üles laadida vaid ühekaupa."
+        too_many_dragged_and_dropped_files:
+          one: "Üles saad laadida %{count} faili korraga."
+          other: "Üles saad laadida %{count} faili korraga."
         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."
-      abandon_edit:
-        no_value: "Ei, hoia alles"
-      abandon:
-        confirm: "Oled kindel, et soovid oma postituse hüljata?"
-        no_value: "Ei, säilita"
-        yes_value: "Jah, hülga"
       via_email: "see postitus saabus meili teel"
       via_auto_generated_email: "see postitus saabus automaatselt genereeritud meili teel"
       whisper: "see postitus on vaikne sosin moderaatoritele"
@@ -1776,6 +2063,10 @@ et:
         lock_post: "Lukusta postitus"
         delete_topic: "kustuta teema"
       actions:
+        people:
+          like:
+            one: "laikis seda"
+            other: "laikis seda"
         by_you:
           off_topic: "Tähistasid selle kui teemavälise"
           spam: "Tähistasid selle kui spämmi"
@@ -1819,14 +2110,29 @@ et:
           html_part:
             button: "HTML"
       bookmarks:
+        edit: "Muuda järjehoidjat"
         created: "Loodud"
         name: "Nimi"
+        actions:
+          delete_bookmark:
+            description: "Eemaldab järjehoidja sinu profiilist ja peatab kõik järjehoidja meeldetuletused"
+          edit_bookmark:
+            name: "Muuda järjehoidjat"
+            description: "Muuda järjehoidja nime või meeldetuletuse kuupäeva ja kellaaega"
+      filtered_replies:
+        viewing_posts_by: "Vaatad %{post_count} sõnumit autorilt"
+        viewing_subset: "Mõned vastused on peidetud"
+        viewing_summary: "Vaatad teema kokkuvõtet"
+        show_all: "Näita kõiki"
     category:
       can: "saab&hellip; "
       none: "(foorum puudub)"
       all: "Kõik foorumid"
+      choose: "kategooria&hellip;"
       edit: "Muuda"
+      edit_dialog_title: "Muuda: %{categoryName}"
       view: "Vaata teemasid foorumis"
+      back: "Tagasi kategooriasse"
       general: "Üldine"
       settings: "Sätted"
       topic_template: "Teema mall"
@@ -1859,40 +2165,65 @@ et:
       change_in_category_topic: "Muuda kirjeldust"
       already_used: "Teine foorum juba kasutab seda värvi"
       security: "Turve"
+      permissions:
+        group: "Grupp"
+        see: "Vaata"
+        reply: "Vasta"
+        create: "Loo"
+        no_groups_selected: "Ühele grupile pole juurdepääsu antud; see kategooria on nähtav ainult meeskonnaliikmetele."
+        everyone_has_access: 'See kategooria on avalik, kõik saavad seda vaadata, vastata ja siia postitusi lisada. Õiguste piiramiseks eemalda "kõik" grupilt õiguseid.'
+        toggle_reply: "Lülita vastamine sisse/välja"
+        toggle_full: "Lülita loomine sisse/välja"
+        inherited: 'Need õigused on päritud grupilt "kõik"'
       special_warning: "Hoiatus: See on eelseadistatud foorum mille turvasätteid muuta ei saa. Kui Sa seda foorumit kasutada ei soovi, kustuta see ümberkohandamise asemel."
+      uncategorized_security_warning: "See kategooria on eriline. Siin on teemad, millel ei ole kategooriat; sellele kategooriale ei saa eraldi õiguseid määrata."
       images: "Pildid"
       email_in: "Sissetuleva meili individuaalne aadress:"
       email_in_allow_strangers: "Aktsepteeri meile kontota anonüümsetelt kasutajatelt"
       email_in_disabled: "Uute teemade avamine meili teel on saidi sätetes välja lülitatud. Avamiseks"
       email_in_disabled_click: 'aktiveeri säte "sissetulev meil".'
       show_subcategory_list: "Näita selles foorumis alamfoorumite nimekirja teemadest üleval pool."
+      read_only_banner: "Bänneri tekst, mis on näha kui kasutaja ei saa sellesse kategooriasse uusi teemasid lisada:"
+      num_featured_topics: "Kategooriate lehel kuvatud teemade arv:"
+      subcategory_num_featured_topics: "Esile tõstetud teemade arv ülem-kategooria lehel:"
+      all_topics_wiki: "Tee uued teemad vaikimisi wikideks"
+      subcategory_list_style: "Alamkategooriate loendi stiil:"
+      sort_order: "Teemade nimekirja sorteerimine:"
+      default_view: "Vaikimisi teemade nimekiri:"
+      default_top_period: "Vaikimisi teemade ajaperiood:"
+      default_list_filter: "Vaikimisi teemade filter:"
       allow_badges_label: "Luba selles foorumis autasustamist märgistega"
       edit_permissions: "Muuda kasutusõigusi"
+      reviewable_by_group: "Lisaks meeskonnaliikmetle saavad selle kategooria sisu üle vaadata ka:"
       review_group_name: "grupi nimi"
+      require_topic_approval: "Nõua moderaatori heakskiitu kõikidele uutele teemadele"
+      require_reply_approval: "Nõua moderaatori heakskiitu kõikidele uutele vastustele"
       this_year: "sel aastal"
+      position: "Asukoht kategooriate lehel:"
       default_position: "Vaikepositsioon"
       position_disabled: "Foorumid kuvatakse aktiivsuse järjekorras. Foorumite järjestuse seadistamiseks loeteludes,"
       position_disabled_click: 'aktiveeri säte "foorumite positsioonid fikseeritud".'
+      minimum_required_tags: "Minimaalne nõutud siltide arv teemas:"
       parent: "Emafoorum"
+      num_auto_bump_daily: "Avatud teemade arv, mida iga päev automaatselt tõsta:"
+      navigate_to_first_post_after_read: "Ava pärast teemade läbi lugemist esimene sõnum"
       notifications:
         watching:
           title: "Vaatlemine"
-          description: "Sa vaatled nendes foorumites kõiki teemasid automaatselt. Sind teavitatakse igast uuest postitusest igas teemas. Ühtlasi kuvatakse uute vastuste arv."
         watching_first_post:
           title: "Vaatan esimest postitust"
         tracking:
           title: "Jälgimine"
-          description: "Sa vaatled kõiki nende foorumite teemasid automaatselt. Sind teavitatakse, kui keegi sinu @name mainib või sulle vastab. Ühtlasi kuvatakse uute vastuste arv."
         regular:
           title: "Normaalne"
           description: "Sind teavitatakse, kui keegi Sinu @name mainib või Sulle vastab."
         muted:
           title: "Vaigistatud"
-          description: "Sind ei teavitata ühestki uuest teemast nendes foorumites, samuti ei ilmu nad viimaste teemade alla."
       search_priority:
         options:
           normal: "Normaalne"
           ignore: "Ignoreeri"
+          high: "Kõrge"
       sort_options:
         default: "vaikimisi"
         likes: "Meeldimisi"
@@ -1912,10 +2243,17 @@ et:
     flagging:
       title: "Täname, et aitad meie kogukonna viisakust säilitada!"
       action: "Tähista postitus"
+      take_action_options:
+        default:
+          title: "Tegutse"
+          details: "Liigu kohe tähise künniseni, ilma kogukonnalt täiendavaid tähiseid ootamata"
+        suspend:
+          title: "Peata kasutaja"
+        silence:
+          title: "Vaigista kasutaja"
       notify_action: "Sõnum"
       official_warning: "Ametlik hoiatus"
       delete_spammer: "Kustuta spämmija"
-      delete_confirm_MF: "Oled kustutamas {POSTS, plural, one {<b>1</b> postitust} other {<b>#</b> postitust}} ja {TOPICS, plural, one {<b>1</b> teemat} other {<b>#</b> teemat}} sellelt kasutajalt, eemaldamas tema kontot, blokeerimas registreerumisi tema IP-aadressilt <b>{ip_address}</b>, ja lisamas tema meiliaddressi <b>{email}</b> püsiva blokeeringu loetellu. Oled kindel, et see kasutaja on tõesti spämmija?"
       yes_delete_spammer: "Jah, kustuta spämmija"
       ip_address_missing: "(asjassepuutumatu)"
       hidden_email_address: "(peidetud)"
@@ -1979,12 +2317,6 @@ et:
       unlisted:
         help: "See teema on salastatud; teda ei kuvata teemade loendites ning on kättesaadav vaid otseviite kaudu"
     posts: "Postitused"
-    posts_likes_MF: |
-      Selles teemas on {count, plural, one {1 vastus} other {# vastust}} {ratio, select,
-      low {kõrge meeldimiste / postituste suhtega}
-      med {väga kõrge meeldimiste / postituste suhtega}
-      high {eriti kõrge meeldimiste / postituste suhtega}
-      other {}}
     original_post: "Algne postitus"
     views: "Vaatamisi"
     views_lowercase:
@@ -2004,7 +2336,6 @@ et:
       one: "kasutaja"
       other: "kasutajad"
     category_title: "Foorum"
-    history: "Ajalugu"
     changed_by: "autor %{author}"
     raw_email:
       title: "Sissetulevad e-kirjad"
@@ -2084,6 +2415,7 @@ et:
       readonly: "Vaata"
     lightbox:
       download: "lae alla"
+      counter: "%curr% %total%st"
     keyboard_shortcuts_help:
       title: "Klaviatuuri kiirvalikud"
       jump_to:
@@ -2230,6 +2562,13 @@ et:
       dismiss: "Ignoreeri"
     safe_mode:
       enabled: "Kaitstud režiim on aktiivne, väljumiseks sulge see brauseri aken."
+    do_not_disturb:
+      remaining: "%{remaining} jäänud"
+      options:
+        half_hour: "30 minutit"
+        one_hour: "1 tund"
+        two_hours: "2 tundi"
+        custom: "Individuaalne"
   admin_js:
     type_to_filter: "filtreerimiseks trüki..."
     admin:
@@ -2252,6 +2591,8 @@ et:
         version_check_pending: "Näib, et oled hiljuti uuendanud. Fantastiline!"
         installed_version: "Paigaldatud"
         latest_version: "Viimased"
+        new_features:
+          dismiss: "Ignoreeri"
         last_checked: "Viimati kontrollitud"
         refresh_problems: "Värskenda"
         no_problems: "Probleeme ei tuvastatud."
@@ -2288,6 +2629,9 @@ et:
           view_table: "tabel"
           view_graph: "diagramm"
           refresh_report: "Värskenda raportit"
+          daily: Igapäevaselt
+          monthly: Igakuiselt
+          weekly: Iganädalaselt
           groups: "Kõik grupid"
           no_data: "Pole andmeid, mida näidata."
           filters:
@@ -2308,9 +2652,6 @@ et:
             available: "Grupi nimi on saadaval"
             not_available: "Grupi nimi pole saadaval"
             blank: "Grupi nimi ei saa olla tühi"
-        bulk_add:
-          title: "Lisa massina gruppi"
-          paste: "Kleebi kas"
         manage:
           interaction:
             email: E-post
@@ -2359,6 +2700,8 @@ et:
         description: Kirjeldus
         save: Salvesta
         continue: Jätka
+        scopes:
+          action: Tegevus
       web_hooks:
         title: "Veebihaagid"
         none: "Hetkel veebihaagid puuduvad."
@@ -2373,7 +2716,6 @@ et:
         go_back: "Tagasi nimekirja"
         payload_url: "Kasuliku lasti URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Näib, et püüad seada veebihaaki lokaalsele URL-le. Lokaalsele aadressile saadetud sündmus võib esile kusuda kõrvalnähte või ootamatusi. Kas jätkame?"
         secret_invalid: "Salavõti ei tohi sisaldada tühikuid."
         secret_too_short: "Salavõti peab olema vähemalt 12 sümbolit pikk."
         secret_placeholder: "Mittekohustuslik tekst, mida kasutatakse allkirja genereerimiseks"
@@ -2517,6 +2859,7 @@ et:
         copy: "Kopeeri"
         copy_to_clipboard: "Kopeeri lõikelauale"
         copied_to_clipboard: "Kopeeritud lõikelauale"
+        copy_to_clipboard_error: "Tõrge kopeerimisel"
         email_templates:
           title: "E-post"
           subject: "Teema"
@@ -2556,6 +2899,7 @@ et:
           install_popular: "Populaarsed"
           about_theme: "Teave"
           license: "Litsents"
+          version: "Versioon:"
           enable: "Luba"
           disable: "Keela"
           updating: "Uuendamine..."
@@ -2805,16 +3149,12 @@ et:
         clear_filter: "Tühjenda"
         download: Lae alla
         clear_all: Puhasta kõik
-        word_count:
-          one: "%{count} sõna"
-          other: "%{count} sõna"
         actions:
           block: "Blokeeri"
           censor: "Tsenseeri"
           require_approval: "Nõua heakskiitu"
           flag: "Tähista"
         form:
-          label: "Uus sõna:"
           placeholder_regexp: "regulaaravaldis"
           add: "isa"
           success: "Korras"
@@ -2840,6 +3180,7 @@ et:
           staff: "Meeskond"
           suspended: "Peatatud"
           silenced: "Vaigistatud"
+          staged: "Ettevalmistamisel"
         approved: "Heakskiidetud?"
         titles:
           active: "Aktiivsed kasutajad"
@@ -2859,12 +3200,15 @@ et:
         check_email:
           title: "Näita selle kasutaja meiliaadressi"
           text: "Näita"
+        check_sso:
+          text: "Näita"
       user:
         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"
+        suspend_reason_title: "Peatamise põhjus"
         suspended_by: "Peatati kasutaja poolt"
         silence_reason: "Põhjus"
         silenced_by: "Vaigistaja"
@@ -2873,7 +3217,6 @@ et:
         delete_all_posts: "Kustuta kõik postitused"
         penalty_post_edit: "Muuda postitust"
         penalty_post_none: "Ära tee midagi"
-        delete_all_posts_confirm_MF: "Sa oled kustutamas {POSTS, plural, one {1 post} other {# posts}} and {TOPICS, plural, one {1 topic} other {# topics}}. Oled Sa kindel?"
         silence: "Vaigista"
         unsilence: "Eemalda vaigistud"
         silenced: "Vaigistatud?"
@@ -2991,12 +3334,11 @@ et:
           on_grace_period: "Hetkel edutamisel halastusperiood, madalamale ei viida."
           locked_will_not_be_promoted: "Usaldustase lukustatud. Ei edutata kunagi."
           locked_will_not_be_demoted: "Usaldustase lukustatud. Ei alandata kunagi."
-        sso:
-          title: "Single Sign On"
+        discourse_connect:
           external_id: "Väline ID"
           external_username: "Kasutajanimi"
           external_name: "Nimi"
-          external_email: "Meiliaadress"
+          external_email: "E-post"
           external_avatar_url: "Profiili pildi URL"
       user_fields:
         title: "Kasutajaväljad"
@@ -3068,7 +3410,7 @@ et:
           onebox: "Onebox"
           seo: "SEO"
           spam: "Spämm"
-          rate_limits: "Suhte piirang"
+          rate_limits: "Kiiruspiirangud"
           developer: "Arendaja"
           embedding: "Manustamised"
           legal: "Õiguslik"
@@ -3178,6 +3520,9 @@ et:
         embed_post_limit: "Maksimaalne postituste arv, mida sängitada"
         embed_title_scrubber: "Regex postituste päiste puhastamiseks"
         embed_truncate: "Lühenda sängitatud postitused"
+        allowed_embed_selectors: "CSS valik elementidele, mida lubada sängitamistes"
+        blocked_embed_selectors: "CSS valik elementidele, mida eemaldada sängitamistes"
+        allowed_embed_classnames: "CSS klasside lubatud nimed"
         save: "Salvesta sängitamise sätted"
       permalink:
         title: "Püsiviited"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index dc58849286..18aa4a5e31 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -56,7 +56,7 @@ fa_IR:
           one: "%{count} دقیقه"
           other: "%{count} دقیقه"
         about_x_hours:
-          one: "%{count} ساعت"
+          one: "%{count} ساعت قبل"
           other: "%{count} ساعت"
         x_days:
           one: "%{count} روز"
@@ -158,6 +158,9 @@ fa_IR:
     topic_admin_menu: "اقدامات موضوع"
     wizard_required: "به دیسکورس خوش آمدید! برای شروع نصب <a href='%{url}' data-auto-route='true'>کلیک کنید</a> ✨"
     emails_are_disabled: "تمام ایمیل های خروجی بصورت کلی توسط مدیر قطع شده است. هیچگونه ایمیل اگاه سازی ارسال نخواهد شد."
+    software_update_prompt:
+      message: "سایت بروز رسانی شده٬ لطفا برای پرهیز از بروز خطای احتمالی صفحه خود را دوباره <span>بارگزاری/ریفرش</span> کنید."
+      dismiss: "مشاهده شد"
     bootstrap_mode_disabled: "حالت خود راه انداز در 24 ساعت آینده غیر‌فعال خواهد شد."
     themes:
       default_description: "پیش‌فرض"
@@ -184,6 +187,7 @@ fa_IR:
         us_gov_west_1: "AWS GovCloud (US-West)"
         us_west_1: "غرب ایالات متحده (کالیفرنیا شمالی)"
         us_west_2: "غرب ایالات متحده (اورگان)"
+    clear_input: "پاک کردن ورودی"
     edit: "موضوع و دسته‌ی این موضوع را ویرایش کنید"
     expand: "باز کردن"
     not_implemented: "آن ویژگی هنوز به کار گرفته نشده، متأسفیم!"
@@ -218,6 +222,9 @@ fa_IR:
     now: "هم‌اکنون"
     read_more: "بیشتر بخوانید"
     more: "بیشتر"
+    x_more:
+      one: "%{count} بیشتر"
+      other: "بیش از %{count}"
     less: "کمتر"
     never: "هرگز"
     every_30_minutes: "هر 30 دقیقه"
@@ -246,8 +253,9 @@ fa_IR:
       moderators: "مدیران"
       stat:
         all_time: "کل"
-        last_7_days: "7 تای آخر"
-        last_30_days: "30 تای آخر"
+        last_day: "۲۴ ساعت گذشته"
+        last_7_days: "۷ روز گذشته"
+        last_30_days: "۳۰ روز گذشته"
       like_count: "پسند‌ها "
       topic_count: "موضوعات"
       post_count: "نوشته‌ها"
@@ -256,7 +264,7 @@ fa_IR:
       contact: "ارتباط با ما"
       contact_info: "در شرایط حساس و مسائل اضطراری مربوط به سایت٬‌ لطفا از طریق %{contact_info} با تماس بگیرید."
     bookmarked:
-      title: "نشانک"
+      title: "ذخیره"
       clear_bookmarks: "پاک کردن نشانک‌ها"
       help:
         bookmark: "کلیک کنید تا به اولین نوشته این موضوع نشانک بزنید"
@@ -283,17 +291,6 @@ fa_IR:
       search_placeholder: "جستجو در نشانک‌ها بر اساس نام، عنوان موضوع یا محتوای نوشته"
       search: "جستجو"
       reminders:
-        later_today: "امروز"
-        next_business_day: "روز کاری بعدی"
-        tomorrow: "فردا"
-        next_week: "هفته بعد"
-        later_this_week: "این هفته"
-        start_of_next_business_week: "دوشنبه"
-        start_of_next_business_week_alt: "دوشنبه بعدی"
-        next_month: "ماه بعد"
-        custom: "درج تاریخ و ساعت"
-        last_custom: "آخرین"
-        none: "هیچ یادآوری لازم نیست"
         today_with_time: "امروز در %{time}"
         tomorrow_with_time: "فردا در %{time}"
         at_time: "در %{date_time}"
@@ -307,9 +304,9 @@ fa_IR:
       new_private_message: "درفت جدید برای پیام"
       topic_reply: "پاسخ درفت"
       abandon:
-        confirm: "شما پیش از این یک پیش نویس در این مبحث باز کرده اید. مطمئنید میخواهید آن را حذف کنید؟"
-        yes_value: "بله، رها کن"
-        no_value: "خیر، نگه دار"
+        confirm: "شما یک پاسخ ذخیره نیمه تمام در این تاپیک دارید. با آن چه می کنید؟"
+        yes_value: "حذف"
+        no_value: "ادامه"
     topic_count_latest:
       one: "%{count} موضوع تازه یا به‌ روز شده."
       other: "%{count} موضوع تازه یا به‌ روز شده."
@@ -328,6 +325,7 @@ fa_IR:
     upload: "بارگذاری"
     uploading: "در حال بارگذاری..."
     uploading_filename: "بارگذاری %{filename}..."
+    processing_filename: "در حال پردازش: %{filename}..."
     clipboard: "کلیپ بورد"
     uploaded: "بارگذاری شد!"
     pasting: "چسباندن..."
@@ -406,6 +404,7 @@ fa_IR:
       topic: "موضوع:"
       filtered_topic: "شما یک مبحث را بر حسب محتوای قابل بازنگری فیلتر کرده‌اید"
       filtered_user: "کاربر"
+      filtered_reviewed_by: "بازبینی شده توسط"
       show_all_topics: "نمایش همه ی مباحث"
       deleted_post: "(نوشته حذف شده)"
       deleted_user: "(کاربر حذف شده)"
@@ -416,10 +415,8 @@ fa_IR:
         email: "ایمیل"
         name: "نام"
         fields: "فیلدها"
+        reject_reason: "دلیل"
       user_percentage:
-        summary:
-          one: "%{agreed}، %{disagreed}، %{ignored}(%{count}پرچم)"
-          other: "%{agreed}، %{disagreed}، %{ignored} (%{count}پرچم)"
         agreed:
           one: "%{count}% موافقت شده"
           other: "%{count}% موافقت شده"
@@ -462,7 +459,8 @@ fa_IR:
           created_at_asc: "ساخته شده (برعکس)"
         priority:
           title: "کمترین اولویت"
-          low: "(هر چی)"
+          any: "(هر چی)"
+          low: "کم"
           medium: "متوسط"
           high: "بالا"
       conversation:
@@ -500,6 +498,8 @@ fa_IR:
           title: "نوشته در صف"
         reviewable_user:
           title: "کاربر"
+        reviewable_post:
+          title: "نوشته"
       approval:
         title: "نوشته نیاز به تایید دارد"
         description: "ما نوشته شما را دریافت کرده ایم ولی قبل از نمایش نیاز به تایید آن توسط یکی از مدیران است. لطفا صبر داشته باشید."
@@ -507,6 +507,40 @@ fa_IR:
           one: "شما <strong>%{count}</strong> نوشته در انتظار دارید"
           other: "شما <strong>%{count}</strong> نوشته در انتظار دارید"
         ok: "باشه"
+      example_username: "نام‌کاربری"
+      reject_reason:
+        title: "چرا این کاربر را رد می‌کنید؟"
+        send_email: "ارسال ایمیل رد شدن"
+    relative_time_picker:
+      minutes:
+        one: "دقیقه"
+        other: "دقیقه‌ها"
+      hours:
+        one: "ساعت"
+        other: "ساعت"
+      days:
+        one: "روز"
+        other: "روز‌ها"
+      months:
+        one: "ماه"
+        other: "ماه‌ها"
+      years:
+        one: "سال"
+        other: "سال"
+      relative: "مرتبط"
+    time_shortcut:
+      later_today: "بعد از امروز"
+      next_business_day: "روز کاری بعدی"
+      tomorrow: "فردا"
+      next_week: "هفته بعد"
+      post_local_date: "تاریخ در پست"
+      later_this_week: "بعد از اين هفته"
+      start_of_next_business_week: "دوشنبه"
+      start_of_next_business_week_alt: "دوشنبه بعدی"
+      next_month: "ماه بعد"
+      custom: "تاریخ و زمان سفارشی"
+      relative: "زمان نسبی"
+      none: "هیچکدام نیازی نیست"
     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> جدید ایجاد کردید."
@@ -554,6 +588,9 @@ fa_IR:
       member_added: "اضافه شده"
       member_requested: "درخواست شده در"
       add_members:
+        title: "اعضا را به %{group_name} اضافه کنید"
+        description: "شما همچنین قابلیت جداسازی در لیست با کاما را دارید."
+        usernames: "نام های کاربری یا آدرس ایمیل ها را وارد کنید"
         input_placeholder: "نام‌کاربری یا ایمیل"
         notify_users: "اطلاع رسانی به کاربران"
       requests:
@@ -580,6 +617,7 @@ fa_IR:
         email:
           title: "ایمیل"
           credentials:
+            title: "اطلاعات ورود"
             smtp_server: "سرور SMTP"
             smtp_port: "درگاه SMTP"
             smtp_ssl: "از SSL برای SMTP استفاده کنید"
@@ -588,6 +626,8 @@ fa_IR:
             imap_ssl: "از SSL برای IMAP استفاده کنید"
             username: "نام‌کاربری"
             password: "رمزعبور"
+          settings:
+            title: "تنظیمات"
           mailboxes:
             disabled: "غیرفعال شده"
         membership:
@@ -595,6 +635,7 @@ fa_IR:
           access: دسترسی
         categories:
           title: دسته‌بندی‌ها
+          tracked_categories_instructions: "پیگیری خودکار تمامی موضوعات در این دسته٬ تعداد پست های جدید در جلوی موضوعات نمایش داده خواهد شد."
         tags:
           title: برچسب‌ها
         logs:
@@ -671,7 +712,9 @@ fa_IR:
         make_owner_description: "دادن مالکیت این گروه به <b>%{username}</b>"
         remove_owner: "حذف توسط مالک"
         remove_owner_description: "حذف کاربر <b>%{username}</b> به عنوان مالک این گروه"
+        remove_members: "اخراج عضو‌ها"
         owner: "مالک"
+        primary: "اصلی"
         forbidden: "شما مجاز به دیدن کاربران نیستید."
       topics: "موضوعات"
       posts: "نوشته‌ها"
@@ -689,7 +732,7 @@ fa_IR:
         everyone: "همه"
       notifications:
         watching:
-          title: "در حال مشاهده"
+          title: "مشاهده"
           description: "در صورت ارسال شدن پست جدید در هر پیام یک اعلان برای شما ارسال می‌شود و تعداد پاسخ‌های جدید در آن نمایش داده می‌شود."
         watching_first_post:
           title: "در حال مشاهده نوشته اول"
@@ -701,7 +744,7 @@ fa_IR:
           title: "معمولی"
           description: "در صورتی که به @نام شما اشاره شود یا پاسخی دریافت کنید اعلانی برای شما ارسال می‌شود."
         muted:
-          title: "بی‌صدا شد"
+          title: "خاموش"
           description: "شما برای هر اتفاقی در ارتباط با پیام های این گروه آگاه سازی می‌گیرید."
       flair_url: "تصویر آواتار"
       flair_bg_color: "رنگ پس زمینه آواتار"
@@ -742,12 +785,17 @@ fa_IR:
       posts: "نوشته‌ها"
       topics: "موضوعات"
       latest: "آخرین"
-      latest_by: "آخرین توسط"
       toggle_ordering: "ضامن کنترل مرتب سازی"
       subcategories: "دسته‌‌بندی‌های فرزند"
       topic_sentence:
         one: "%{count} موضوع"
         other: "%{count} موضوع"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "هفته"
+        month: "ماه"
       topic_stat_sentence_week:
         one: "%{count} مبحث جدید در هفته ی گذشته"
         other: "%{count} مبحث جدید در هفته ی گذشته"
@@ -801,11 +849,26 @@ fa_IR:
         ignore_option: "صرف نظر شده"
         ignore_option_title: "هیچ آگاه سازی از این کاربر دریافت نمی‌کنید و مبحث ها یا نوشته های ایشان برای شما نمایش داده نخواهد شد."
         add_ignored_user: "اضافه کردن ..."
-        mute_option: "بی‌صدا شد"
+        mute_option: "خاموش"
         mute_option_title: "هیچ اگاه سازی از این کاربر دریافت نمیکنید"
         normal_option: "معمولی"
         normal_option_title: "اگر این کاربر به شما پاسخ دهد، از شما نقل قول کند و یا شما را صدا کند، اگاه سازی دریافت میکنید"
+      notification_schedule:
+        title: "زمان‌بندی آگاه‌سازی"
+        label: "فعال سازی زمان‌بندی سفارشی آگاه‌سازی"
+        midnight: "نیمه شب"
+        none: "هیچ کدام"
+        monday: "دوشنبه"
+        tuesday: "سه‌شنبه"
+        wednesday: "چهار شنبه"
+        thursday: "پنج‌شنبه"
+        friday: "جمعه"
+        saturday: "شنبه"
+        sunday: "یک‌شنبه"
+        to: "به"
       activity_stream: "فعالیت"
+      read: "خواندن"
+      read_help: "موضوعات خوانده شده در زمان اخیر"
       preferences: "تنظیمات"
       feature_topic_on_profile:
         open_search: "انتخاب یک موضوع نو"
@@ -833,16 +896,17 @@ fa_IR:
         perm_denied_expl: "شما دسترسی دریافت اعلان را بسته‌اید. در تنظیمات مرورگر خود آن‌را فعال کنید."
         disable: "غیرفعال کردن اعلانات"
         enable: "فعال کردن اعلانات"
-        each_browser_note: "نکته: شما باید این تنظیمات را در هر مرورگری که استفاده میکنید تغییر دهید."
         consent_prompt: "ایا مایلید وقتی دیگران به شما پاسخ میدهند، اگاه سازی زنده دریافت کنید؟"
       dismiss: "نخواستیم"
       dismiss_notifications: "پنهان کردن همه"
       dismiss_notifications_tooltip: "علامت گذاری همه اطلاعیه های خوانده نشده به عنوان خوانده شده"
+      no_messages_title: "پیامی ندارید"
       first_notification: "اولین پیام اطلاع‌رسانی شما! برای شروع آن‌را انتخاب کنید."
       dynamic_favicon: "نمایش تعداد در ایکون بروسر"
       theme_default_on_all_devices: "این قالب، حالت پیش فرض در همه ی دستگاه های من باشد"
       color_schemes:
-        default_description: "پیش‌فرض"
+        undo: "بازنشانی"
+        regular: "عادی"
         dark: "حالت تاریک"
         default_dark_scheme: "(پیش‌فرض سایت)"
       dark_mode: "حالت تاریک"
@@ -879,7 +943,7 @@ fa_IR:
       watched_tags_instructions: "تمام موضوعاتی که دارای این برچسب هستند مشاهده خواهید کرد و گزارش و تعداد نوشته‌ها و موضوعات را کنار موضوع مشاهده خواهید کرد."
       tracked_tags: "پی‌گیری شده"
       tracked_tags_instructions: "شما به صورت خودکار تمام عناوین جدید در این برچسب را پیگیری خواهید کرد. تعداد نوشته های جدید در کنار عنواین نمایش داده می‌شود."
-      muted_tags: "بی‌صدا"
+      muted_tags: "خاموش"
       muted_tags_instructions: "شما از اتفاقات موضوعات جدید این برچسب‌ها آگاه نمیشوید، و آن ها در آخرین ها نمایش داده نمیشوند."
       watched_categories: "تماشا شده"
       watched_categories_instructions: "تمام موضوعاتی که دارای این دسته‌بندی هستند مشاهده و گزارش و تعداد نوشته‌ها و موضوعات را کنار موضوع مشاهده خواهید کرد."
@@ -889,7 +953,7 @@ fa_IR:
       watched_first_post_categories_instructions: "برای اولین پست موضوعات جدید به شما اطلاع‌رسانی می‌شود"
       watched_first_post_tags: "درحال مشاهده نوشته اول"
       watched_first_post_tags_instructions: "از اولین نوشته هر موضوع که شامل این برچسب‌ها باشد مطلع خواهید شد."
-      muted_categories: "بی‌صدا"
+      muted_categories: "خاموش"
       muted_categories_instructions: "شما درباره هیچ اتفاقی در این دسته بندی آگاهسازی دریافت نمیکنید و آن ها در دسته بندی ها و یا صفحه تازه ها نمایش داده نخواهند شد."
       muted_categories_instructions_dont_hide: "شما درباره هیچ اتفاقی در این دسته بندی آگاهسازی دریافت نمیکنید."
       regular_categories: "عادی"
@@ -901,7 +965,7 @@ fa_IR:
       unread_message_count: "پیام‌ها"
       admin_delete: "پاک کردن"
       users: "کاربران"
-      muted_users: "بی‌صدا"
+      muted_users: "خاموش"
       allowed_pm_users: "مجاز"
       ignored_users: "صرف نظر شده"
       tracked_topics_link: "نمایش"
@@ -935,6 +999,7 @@ fa_IR:
         tags: "برچسب‌ها"
       preferences_nav:
         account: "حساب کاربری"
+        security: "امنیت"
         profile: "پروفایل"
         emails: "ایمیل‌ها"
         notifications: "اطلاعیه‌ها"
@@ -947,6 +1012,7 @@ fa_IR:
         success: "(ایمیل ارسال شد)"
         in_progress: "(فرستادن ایمیل)"
         error: "(خطا)"
+        emoji: "قفل ایموجی"
         action: "ارسال ریست رمز عبور به ایمیل "
         set_password: "تغییر رمز‌عبور"
         choose_new: "یک رمز‌عبور جدید وارد کنید"
@@ -964,6 +1030,7 @@ fa_IR:
           title: "کد پشتیبان تولید شد"
           description: "هر کدام از این کدهای پشتیبان فقط یک بار قابل استفاده است. آن ها را در جای امن و قابل دسترسی نگه دارید."
       second_factor:
+        title: "ورود دو مرحله ای"
         disable_all: "غیرفعال کردن همه"
         forgot_password: "فراموشی گذرواژه؟"
         confirm_password_description: "لطفا رمز عبور خود را تایید کنید تا ادامه دهیم."
@@ -1017,6 +1084,7 @@ fa_IR:
         uploaded_avatar_empty: "افزودن تصویر سفارشی"
         upload_title: "تصویرتان را بارگذاری کنید"
         image_is_not_a_square: "اخطار: ما تصویر شما را بریدیم; طول و عرض برابر نبود."
+        logo_small: "لوگو کوچک سایت. به طور پیش‌فرض استفاده می‌شود."
       change_card_background:
         title: "پس زمینه کارت کابر"
         instructions: "تصاویر پس زمینه در مرکز قرار خواهند گرفت و عرض پیشفرض آن 590 پیکسل است"
@@ -1028,13 +1096,14 @@ fa_IR:
         secondary: "آدرس ایمیل ثانویه"
         primary_label: "اصلی"
         update_email: "تغییر ایمیل"
-        sso_override_instructions: "ایمیل را میتوانید از طریق SSO به روزرسانی کنید"
+        auth_override_instructions: "ایمیل را از طریق ارائه دهنده احراز هویت می‌توانید به‌روزرسانی کنید."
         no_secondary: "بدون ایمیل ثانویه"
         instructions: "هرگز به عموم نمایش داده نخواهد شد"
         ok: "برای تایید ایمیلی برایتان ارسال خواهیم کرد."
         required: "لطفا یک آدرس ایمیل وارد کنید"
         invalid: "لطفا یک آدرس ایمیل معتبر وارد کنید"
         authenticated: "ایمیل شما توسط %{provider} تصدیق شد"
+        invite_auth_email_invalid: "ایمیل دعوتنامه شما با ایمیل تایید شده توسط %{provider} تطابق نمی کند"
         frequency_immediately: "اگر به سرعت چیزی را که برایتان ارسال نکردیم نخوانده باشید، بلافاصله برایتان ایمیل ارسال می‌کنیم."
         frequency:
           one: "ما فقط در صورتی برای شما ایمیل میفرستیم که در %{count} دقیقه آخر شما را ندیده باشیم."
@@ -1068,6 +1137,7 @@ fa_IR:
         checking: "بررسی در دسترس بودن نام‌کاربری..."
         prefilled: "ایمیل منطبق است با این نام کاربری ثبت شده "
         required: "لطفاً یک نام کاربری وارد کنید"
+        edit: "ویرایش نام‌کاربری"
       locale:
         title: "زبان رابط‌کاربری"
         instructions: "زبان رابط کاربری. با تازه کردن صفحه تغییر خواهد کرد."
@@ -1089,6 +1159,7 @@ fa_IR:
         browser_and_device: "%{browser} در %{device}"
         secure_account: "از حساب کاربری من محافظت کن"
         latest_post: "آخرین بار شما نوشتید ..."
+        browser_active: '%{browser} | <span class="active"> فعال است</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "آخرین نوشته"
       last_emailed: "آخرین ایمیل فرستاده شده"
@@ -1102,6 +1173,7 @@ fa_IR:
       enable_physical_keyboard: "پشتیبانی کی بورد فیزیکی را در آی پد فعال کن"
       text_size:
         title: "سایز قلم متن"
+        smallest: "کوچکترین"
         smaller: "کوچکتر"
         normal: "معمولی"
         larger: "بزرگتر"
@@ -1160,45 +1232,82 @@ fa_IR:
         after_10_minutes: "پس از 10 دقیقه"
       notification_level_when_replying: "وقتی به یک موضوع پاسخ می‌دهم، وضعیت آن موضوع را تغییر بده به "
       invited:
-        search: "بنویسید تا دعوت‌ها را جستجو کنید..."
         title: "دعوت‌ها"
+        pending_tab: "در انتظار"
+        pending_tab_with_count: "(%{count}) در انتظار"
+        expired_tab: "منقضی شده"
+        expired_tab_with_count: "(%{count}) منقضی شده"
+        redeemed_tab: "استفاده شده"
+        redeemed_tab_with_count: "(%{count}) استفاده شده"
+        invited_via: "دعوت‌نامه"
+        groups: "گروه‌ها"
+        topic: "موضوع"
+        sent: "ایجاد شده/آخرین ارسال"
+        expires_at: "انقضاء"
+        edit: "ویرایش"
+        remove: "پاک کردن"
+        copy_link: "دریافت لینک"
+        reinvite: "ارسال دوباره ایمیل"
+        reinvited: "دعوتنامه دوباره ارسال شد"
+        removed: "پاک شد"
+        search: "بنویسید تا دعوت‌ها را جستجو کنید..."
         user: "کاربر دعوت شده"
         none: "هیچ دعوتنامه ای برای نمایش نیست"
         truncated:
           one: "نمایش %{count} دعوت اول."
           other: "نمایش %{count} دعوت اول."
         redeemed: "دعوت‌نامه‌های استفاده شده"
-        redeemed_tab: "استفاده شده"
-        redeemed_tab_with_count: "(%{count}) استفاده شده"
         redeemed_at: "استفاده شده"
         pending: "دعوت‌های در انتظار"
-        pending_tab: "در انتظار"
-        pending_tab_with_count: "(%{count}) در انتظار"
         topics_entered: "موضوعات بازدید شده"
         posts_read_count: "نوشته‌های خوانده شده"
         expired: "این دعوت منقضی شده است."
-        rescind: "پاک کردن"
-        rescinded: "دعوت حذف شد"
-        rescinded_all: "تمام دعوت نامه های منقضی شده حذف شدند!"
-        rescind_all_confirm: "مطمئنی می‌خواهی تمام دعوتنامه های منقضی شده را پاک کنی؟"
-        reinvite: "ارسال دوباره دعوت"
-        reinvite_all: "ارسال مجدد تمام دعوت‌ها"
+        remove_all: "دعوت‌نامه‌های منقضی شده را پاک کنید"
+        removed_all: "تمام دعوت‌نامه‌های منقضی شده پاک شدن!"
+        remove_all_confirm: "مطمئنی می‌خواهی تمام دعوت‌نامه‌های منقضی شده را پاک کنی؟"
+        reinvite_all: "ارسال دوباره دعوتنامه ها"
         reinvite_all_confirm: "آیا از ارسال مجدد تمامی دعوت‌ها اطمینان دارید؟"
-        reinvited: "دعوتنامه دوباره ارسال شد"
-        reinvited_all: "تمام دعوت‌ها دوباره ارسال شدند!"
+        reinvited_all: "تمامی دعوتنامه ها ارسال شدند!"
         time_read: "زمان خواندن"
         days_visited: "روز های بازدید شده"
         account_age_days: "عمر حساب بر اساس روز"
-        links_tab: "پیوندها"
-        link_created_at: "ساخته شده"
-        link_groups: گروه ها
+        create: "دعوت"
+        generate_link: "ساخت لینک دعوت"
+        link_generated: "این لینک دعوت شماست!"
         valid_for: "لینک دعوت فقط برای این ایمیل معتبر است: %{email}"
+        single_user: "دعوت با ایمیل"
+        multiple_user: "دعوت با لینک"
         invite_link:
+          title: "لینک دعوت"
           success: "لینک دعوت با موفقیت ایجاد شد!"
+          error: "خطایی در هنگام ایجاد لینک رخ داد"
+          max_redemptions_allowed_label: "چه تعداد کاربر اجازه ثبت نام با این لینک را خواهند داشت؟"
+          expires_at: "چه زمانی این لینک منقضی می شود؟"
+        invite:
+          new_title: "ایجاد دعوت‌نامه"
+          edit_title: "ویرایش دعوت‌نامه"
+          instructions: "این لینک را برای ارائه دسترسی فوری به سایت٬ به اشتراک بگذارید:"
+          copy_link: "کپی پیوند"
+          expires_in_time: "در %{time} منقضی می شود."
+          expired_at_time: "منقضی شده در %{time}."
+          show_advanced: "نمایش تنظیمات پیشرفته"
+          hide_advanced: "پنهان کردن تنظیمات پیشرفته"
+          max_redemptions_allowed: "حداکثر تعداد قابل استفاده:"
+          add_to_groups: "افزودن به گروه‌ها:"
+          invite_to_topic: "هدایت به موضوعی خاص بعد از اولین ورود:"
+          expires_at: "انقضا بعد از:"
+          custom_message: "پیام شخصی اختیاری"
+          send_invite_email: "ذخیره و ارسال ایمیل"
+          save_invite: "ذخیره دعوت‌نامه"
+          invite_saved: "دعوتنامه ذخیره شد."
+          invite_copied: "لینک دعوت کپی شد."
+          blank_email: "لینک دعوت کپی نشد. وارد کردن آدرس ایمیل اجباری است."
         bulk_invite:
-          success: "فایل با موفقیت بارگذاری شد٬ وقتی که پروسه تمام شد به شما را از طریق پیام اطلاع می دهیم. "
+          none: "دعوتنامه ای برای نمایش در این صفحه موجود نیست."
+          text: "دعوت به تعداد بالا"
+          progress: "%{progress} ٪ بارگذاری شد ..."
+          success: "بارگزاری با موفقیت انجام شد. اتمام کار از طریق یک پیام به اطلاع شما خواهد رسید."
           error: "با عرض پوزش، نوع فایل باید CSV باشد."
-          confirmation_message: "میخواهید به همه ی افراد فایل اپلود شده دعوتنامه بفرستید"
       password:
         title: "رمزعبور"
         too_short: "رمز عبورتان خیلی کوتاه است"
@@ -1262,6 +1371,8 @@ fa_IR:
       avatar:
         title: "عکس نمایه"
         header_title: "نمایه، پیام‌ها، نشانک‌ها و تنظیمات شخصی"
+        name_and_description: "%{name} - %{description}"
+        edit: "ویرایش تصویر پروفایل"
       title:
         title: "عنوان"
         none: "(هیچی)"
@@ -1299,7 +1410,6 @@ fa_IR:
       close: "بسته"
       dismiss_error: "رد کردن خطا"
     close: "بستن"
-    assets_changed_confirm: "این وب سایت به روز رسانی شده است. برای دیدن آخرین نسخه تازه‌سازی می‌کنید؟"
     logout: "شما از سایت خارج شده‌اید."
     refresh: "تازه کردن"
     home: "خانه"
@@ -1313,17 +1423,8 @@ fa_IR:
       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/hour} other {# errors/hour}}</a> از حد مجاز از {limit, plural, one {# error/hour} other {# errors/hour}} عبور کرده است."
     learn_more: "بیشتر بدانید..."
-    all_time: "مجموع"
-    all_time_desc: "مجموع موضوعات ایجاد شده"
-    year: "سال"
-    year_desc: "موضوعاتی که در 365 روز گذشته ایحاد شده‌اند"
-    month: "ماه"
-    month_desc: "موضوعاتی که در 30 روز گذشته ساخته شده اند"
-    week: "هفته"
-    week_desc: "موضوعاتی که در 7 روز گذشته باز شده‌اند"
-    day: "روز"
     first_post: نوشته نخست
-    mute: بی‌صدا
+    mute: خاموش
     unmute: صدادار
     last_post: ارسال شده
     local_time: "زمان محلی"
@@ -1339,13 +1440,13 @@ fa_IR:
       sign_up: "ثبت نام"
       hide_session: "فردا به من یادآوری کن"
       hide_forever: "نه ممنون"
-      hidden_for_session: "باشه, فردا از شما سؤال میکنم. شما همیشه میتوانید از 'ورود' نیز برای ساخت حساب کاربری استفاده کنید."
       intro: "سلام! :heart_eyes: به نظر میاد شما از بحث لذت می‌برید، اما هنوز برای یک حساب کاربری ثبت نام نکرده‌اید."
       value_prop: "وقتی یک حساب کاربری بسازید، دقیقا به جایی که پیشتر مطالعه می‌کردید برمی‌گردید. در ضمن وقتی کسی به شما پاسخ داد، آگاه‌سازی ایمیلی هم دریافت می‌کنید. و می‌توانید نوشته‌های خوب را لایک کنید و محبت را در فضا توسعه دهید :heartpulse:"
     summary:
       enabled_description: "شما خلاصه ای از این موضوع را می بینید: بالاترین‌ نوشته‌هایی که توسط انجمن انتخاب شده."
-      description: "<b>%{replyCount}</b> پاسخ وجود دارد."
-      description_time: " <b>%{replyCount}</b> پاسخ با زمان برآورد شده <b>%{readingTime} دقیقه</b> برای خواندن وجود دارد."
+      description:
+        one: "<b>%{count}</b> پاسخ داده شده."
+        other: "<b>%{count}</b> پاسخ داده شده."
       enable: "خلاصه‌ی این موضوع"
       disable: "نمایش همه‌ی نوشته‌ها"
     deleted_filter:
@@ -1355,6 +1456,10 @@ fa_IR:
       disable: "نشان دادن نوشته‌های حذف شده"
     private_message_info:
       title: "پیام"
+      invite: "دعوت دیگران"
+      edit: "اضافه یا حذف..."
+      remove: "حذف..."
+      add: "اضافه کردن..."
       leave_message: "واقعا میخواهید این پیام را ترک کنید؟"
       remove_allowed_user: "آیا واقعا می خواهید اسم %{name} از پیام برداشته شود ؟ "
       remove_allowed_group: "آیا از حذف %{name} از این پیام اطمینان دارید؟"
@@ -1366,8 +1471,10 @@ fa_IR:
     trust_level: "سطح اعتماد"
     search_hint: "نام کاربری ، ایمیل یا ای پی "
     create_account:
+      header_title: "خوش آمدید!"
+      subheader_title: "ثبت نام حساب کاربری جدید"
       disclaimer: "با ثبت نام شما با <a href='%{privacy_link}' target='blank'>حریم خصوصی</a> و <a href='%{tos_link}' target='blank'>شرایط و ضوابط استفاده از سرویس </a> موافقت کرده اید."
-      title: "ساختن حساب‌کاربری جدید"
+      title: "ثبت نام"
       failed: "اشتباهی روی داده، شاید این نام کاربری پیش‌تر استفاده شده؛ پیوند فراموشی گذرواژه می‌تواند کمک کند."
     forgot_password:
       title: "باز‌یابی رمز‌عبور"
@@ -1376,6 +1483,8 @@ fa_IR:
       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> "
@@ -1384,6 +1493,8 @@ fa_IR:
     email_login:
       link_label: "یک لینک ورود به من ایمیل کن"
       button_label: "با ایمیل"
+      login_link: "عدم استفاده از رمز; ورود از طریق لینک"
+      emoji: "قفل ایموجی"
       complete_username: "اگر حساب کاربری با نام کاربری <b>%{username}</b> وجود داشته باشد، شما الان یک ایمیل با لینک ورود دریافت می‌کنید."
       complete_email: "اگر حساب کاربری با <b>%{email}</b> وجود داشته باشد، شما الان یک لینک ورود دریافت می‌کنید."
       complete_username_found: "یک حساب کاربری با نام کاربری <b>%{username}</b> پیدا کردیم، شما الان یک ایمیل با لینک ورود دریافت می‌کنید."
@@ -1394,16 +1505,24 @@ fa_IR:
       logging_in_as: ورود با %{email}
       confirm_button: اتمام ورود
     login:
+      header_title: "خوش آمدید"
+      subheader_title: "ورود به حساب کاربری"
       title: "ورود"
       username: "کاربر"
       password: "رمز‌عبور"
+      second_factor_title: "ورود دو مرحله ای"
       second_factor_description: "لطفا کد احراز هویت از اپ را وارد کنید:"
       second_factor_backup: "ورود با استفاده از یک کد پشتیبان"
+      second_factor_backup_title: "پشتیبانگیری از ورود دو مرحله ای"
       second_factor_backup_description: "لطفا یکی از کدهای پشتیبان را وارد کنید:"
+      second_factor: "ورود از طریق اپ کدساز"
+      security_key_description: "وقتی کلید امنیتی فیزیکی خود را آماده کردید٬ دکمه تایید اعتبار زیر را فشار دهید."
       security_key_alternative: "روش دیگری را امتحان کنید"
       security_key_authenticate: "تأیید اعتبار با کلید امنیتی"
       security_key_not_allowed_error: "روند تأیید اعتبار کلید امنیتی به پایان رسیده است یا لغو شده است."
-      email_placeholder: "ایمیل یا نام‌کاربری"
+      security_key_no_matching_credential_error: "هیچ اطلاعات کاربری منطبق با کلید امنیتی پیدا نشد."
+      security_key_support_missing_error: "دستگاه و یا مرورگر فعلی شما امکان استفاده از کلید امنیتی را ندارد. لطفا از روش ورود جایگزین استفاده شود."
+      email_placeholder: "ایمیل / نام کاربری"
       caps_lock_warning: "Caps Lock روشن است"
       error: "خطای ناشناخته"
       cookies_error: "بروسر شما به نظر کوکی را غیرفعال کرده است. بدون فعالسازی آن نمیتوانید ورود کنید."
@@ -1418,8 +1537,10 @@ fa_IR:
       awaiting_approval: "هنوز همکاران حساب کاربری شما را تأیید نکرده‌اند. پس از تأیید، یک ایمیل دریافت خواهید کرد."
       requires_invite: "متأسفیم، دسترسی به این انجمن تنها با دعوت امکان دارد."
       not_activated: "هنوز امکان ورود وجود ندارد. برای شما یک ایمیل فعالسازی به <b>%{sentTo}</b> فرستادیم. برای فعال‌سازی شناسه‌تان لطفاً دستورالعمل ایمیل را دنبال کنید."
+      not_allowed_from_ip_address: "امکان ورود با این آدرس آی پی وجود ندارد."
       admin_not_allowed_from_ip_address: "شما نمی تواند با این آدرس آیپی وارد بخش مدیریت شوید."
       resend_activation_email: "برای ارسال مجدد ایمیل فعالسازی، اینجا را کلیک کنید."
+      omniauth_disallow_totp: "حساب کاربری شما برای ورود دو مرحله ای تنظیم شده است. لطفا با رمز عبور وارد شوید."
       resend_title: "ارسال مجدد ایمیل فعالسازی"
       change_email: "تغییر ایمیل"
       provide_new_email: "یک ایمیل جدید وارد کنید و ما ایمیل فعالسازی را برایتان ارسال می‌کنیم."
@@ -1446,7 +1567,9 @@ fa_IR:
         title: "با گیت‌هاب"
       discord:
         name: "دیسکورد"
+        title: "با دیسکورد"
       second_factor_toggle:
+        totp: "استفاده از روش ورود با اپ کدساز"
         backup_code: "به جای آن از یک کد پشتیبان استفاده کنید"
     invites:
       accept_title: "دعوت‌نامه"
@@ -1457,6 +1580,7 @@ fa_IR:
       accept_invite: "پذیرفتن دعوت"
       success: "حساب‌کاربری شما با موفقیت ایجاد شد و می‌توانید وارد سایت شوید."
       name_label: "نام"
+      password_label: "رمزعبور"
       optional_description: "(اختیاری)"
     password_reset:
       continue: "برو به %{site_name}"
@@ -1482,6 +1606,8 @@ fa_IR:
     conditional_loading_section:
       loading: بارگذاری...
     select_kit:
+      filter_by: "فیلتر توسط: %{name}"
+      select_to_filter: "مقداری برای فیلتر کردن انتخاب کنید"
       default_header_text: انتخاب...
       no_content: چیزی یافت نشد.
       filter_placeholder: جستجو...
@@ -1493,6 +1619,14 @@ fa_IR:
       min_content_not_reached:
         one: "لطفا حداقل %{count} ایتم را انتخاب کنید"
         other: "لطفا حداقل %{count}ایتم را انتخاب کنید"
+      invalid_selection_length:
+        one: "انتخاب باید حداقل %{count} حرفی باشد."
+        other: "انتخاب باید حداقل %{count} حرفی باشد."
+      components:
+        tag_drop:
+          filter_for_more: فیلتر بیشتر
+        categories_admin_dropdown:
+          title: "مدیریت دسته ها"
     date_time_picker:
       from: از طرف
       to: به
@@ -1517,7 +1651,6 @@ fa_IR:
       default: ایموجی های مخصوص
     shared_drafts:
       title: "درفت مشترک"
-      notice: "این موضوع فقط برای افرادی که به دسته بندی <b>%{category}</b>دسترسی دارند نمایش داده می‌شود."
       destination_category: "دسته بندی مقصد"
       publish: "درفت مشترک را منتشر کن"
       confirm_publish: "از انتشار درفت مطمئنید؟"
@@ -1528,7 +1661,6 @@ fa_IR:
       options: "گزینه‌ها"
       whisper: "زمزمه"
       unlist: "از فهرست پاک شده"
-      blockquote_text: "نقل‌قول"
       add_warning: "این یک هشدار رسمی است."
       toggle_whisper: "تغییر وضعیت زمزمه"
       toggle_unlisted: "تغییر وضعیت از لیست خارج شده"
@@ -1544,12 +1676,13 @@ fa_IR:
         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:
+          one: "عنوان باید دست کم %{count} حرفی باشد."
+          other: "عنوان باید دست کم %{count} حرفی باشد"
         post_missing: "فرسته نمی‌تواند خالی باشد."
-        post_length: "نوشته باید دست‌کم %{min} نویسه داشته باشد"
         try_like: "دکمه‌ی %{heart} را امتحان کرده‌اید؟ "
         category_missing: "باید یک دسته‌بندی انتخاب کنید"
       save_edit: "ذخیره ویرایش"
@@ -1577,8 +1710,6 @@ fa_IR:
       saving: "در‌حال ذخیره"
       saved: "ذخیره شد!"
       uploading: "بارگذاری..."
-      show_preview: "نشان دادن پیش‌نمایش &laquo;"
-      hide_preview: "&raquo; پنهان کردن پیش‌نمایش"
       quote_post_title: "نقل‌قول کل نوشته"
       bold_label: "B"
       bold_title: "ضخیم"
@@ -1590,8 +1721,8 @@ fa_IR:
       link_description: "توضیحات لینک را اینجا وارد کنید."
       link_dialog_title: "افزودن پیوند"
       link_optional_text: "عنوان اختیاری"
-      quote_title: "نقل‌قول"
-      quote_text: "نقل‌قول"
+      blockquote_title: "نقل‌قول"
+      blockquote_text: "نقل‌قول"
       code_title: "متن قالب‌بندی شده"
       code_text: "متن قالب‌بندی شده را با 4 فاصله دندانه‌دار کن"
       paste_code_text: "کد را در اینجا بنویسید یا بچسبانید"
@@ -1636,10 +1767,10 @@ fa_IR:
           label: "موضوع جدید"
         shared_draft:
           label: "درفت اشتراکی"
-          desc: "درفت یک مبحث که تنها توسط کارکنان قابل مشاهده است"
         toggle_topic_bump:
           label: "فعالسازی بالا آوردن مبحث در لیست"
           desc: "بدون تغییر زمان اخرین پاسخ، پاسخ دهید."
+      ignore: "چشم پوشی"
     notifications:
       tooltip:
         regular:
@@ -1661,6 +1792,10 @@ fa_IR:
       posted: "<span>%{username}</span>%{description}"
       edited: "<span>%{username}</span>%{description}"
       liked: "<span>%{username}</span>%{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} و %{count} دیگر</span> %{description}"
+        other: "<span class='multi-user'>%{username}, %{username2} و %{count} دیگر</span> %{description}"
       liked_consolidated_description:
         one: "%{count}نوشته ی شما را پسندید"
         other: "%{count}نوشته ی شما را پسندید"
@@ -1675,6 +1810,8 @@ fa_IR:
       topic_reminder: "<span>%{username}</span>%{description}"
       watching_first_post: "<span>مبحث جدید</span>%{description}"
       membership_request_accepted: "عضویت در %{group_name} پذیرفته‌شد"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       group_message_summary:
         one: "%{count}پیام در اینباکس %{group_name}"
         other: "%{count}پیام در اینباکس %{group_name}"
@@ -1716,14 +1853,12 @@ fa_IR:
       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: "شما همچنین میتوانید عکس ها را به داخل ویرایشگر بکشید و رها کنید یا کپی کنید"
       uploading: "در حال بروز‌رسانی "
       select_file: "انتخاب فایل"
       default_image_alt_text: تصویر
+      supported_formats: "فرمت‌های پشتیبانی شده"
     search:
       sort_by: "مرتب سازی بر اساس"
       relevance: "ارتباطات"
@@ -1746,6 +1881,7 @@ fa_IR:
       or_search_google: "یا به‌جای این، جست‌وجو با گوگل را امتحان کنید:"
       search_google: "به‌جای این، جست‌وجو با گوگل را امتحان کنید:"
       search_google_button: "گوگل"
+      search_button: "جسنجو"
       context:
         user: "جستجوی نوشته‌ها با @%{username}"
         category: "جستجوی دسته‌بندی #%{category}"
@@ -1788,6 +1924,12 @@ fa_IR:
           noreplies: پاسخی ندارند
           single_user: یک کاربر دارند
         post:
+          count:
+            label: نوشته‌ها
+          min:
+            placeholder: حداقل
+          max:
+            placeholder: حداکثر
           time:
             label: ارسال شده
             before: قبل از
@@ -1803,7 +1945,6 @@ fa_IR:
     go_back: "برگردید"
     not_logged_in_user: "صفحه کاربر با خلاصه ای از فعالیت های و تنظیمات"
     current_user: "به صفحه‌ی کاربریتان بروید"
-    view_all: "مشاهده همه"
     topics:
       new_messages_marker: "آخرین بازدید"
       bulk:
@@ -1824,6 +1965,7 @@ fa_IR:
         change_category: "تنظیم دسته‌بندی"
         close_topics: "بستن موضوعات"
         archive_topics: "بایگانی موضوعات"
+        move_messages_to_inbox: "انتقال به صندوق دریافت"
         notification_level: "اعلان‌ها"
         choose_new_category: "یک دسته‌بندی جدید برای موضوع انتخاب نمایید"
         selected:
@@ -1834,7 +1976,6 @@ fa_IR:
         choose_new_tags: "انتخاب برچسب‌های جدید برای این موضوعات:"
         choose_append_tags: "انتخاب برچسب‌های جدید برای افزودن به این موضوعات:"
         changed_tags: "انتخاب برچسب برای موضوعاتی که عوض شدند"
-        remove_tags: "حذف برچسب‌ها"
         progress:
           one: "پیشرفت: <strong>%{count}</strong> موضوع"
           other: "پیشرفت: <strong>%{count}</strong> موضوع"
@@ -1847,8 +1988,6 @@ fa_IR:
         bookmarks: "هنوز هیچ موضوع نشانک‌داری ندارید."
         category: "هیچ موضوعی در %{category} نیست."
         top: "موضوع برتری وجود ندارد."
-        educate:
-          unread: '<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>برای خود تغییر دهید.'
       bottom:
         latest: "موضوع تازه‌ی دیگری وجود ندارد."
         posted: "هیچ موضوعات نوشته شده ای وجود ندارد"
@@ -1856,6 +1995,7 @@ fa_IR:
         new: "موضوع تازه‌ی دیگری وجود ندارد."
         unread: "موضوع خوانده نشده‌ی دیگری وجود ندارد."
         category: "هیچ موضوع دیگری در %{category} نیست."
+        tag: "هیچ موضوع دیگری در %{tag} نیست."
         top: "موضوع برتر دیگری وجود ندارد"
         bookmarks: "موضوع نشانک‌دار دیگری وجود ندارد."
     topic:
@@ -1917,20 +2057,28 @@ fa_IR:
       read_more_in_category: "می‌خواهید بیشتر بخوانید؟موضوعات دیگر را در %{catLink} یا %{latestLink} مرور کنید."
       read_more: "می‌خواهید بیشتر بخوانید؟ %{catLink} یا %{latestLink}."
       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 {}}"
       browse_all_categories: جستوجوی همه‌ی دسته‌‌بندی‌ها
       view_latest_topics: مشاهده آخرین موضوع
       jump_reply_up: رفتن به جدید ترین پاسخ
       jump_reply_down: رفتن به پاسخ بعدی
       deleted: "موضوع پاک شده است"
       slow_mode_update:
+        save: "فعال کردن"
         remove: "غیرفعال"
+        hours: "ساعت:"
+        minutes: "دقیقه:"
+        seconds: "ثانیه:"
         durations:
+          10_minutes: "۱۰ دقیقه"
           15_minutes: "۱۵ دقیقه"
+          30_minutes: "۳۰ دقیقه"
+          45_minutes: "۴۵ دقیقه"
           1_hour: "۱ ساعت"
+          2_hours: "۲ ساعت"
           4_hours: "۴ ساعت"
-          1_day: "۱ روز"
-          1_week: "۱ هفته"
+          8_hours: "۸ ساعت"
+          12_hours: "۱۲ ساعت"
+          24_hours: "۲۴ ساعت"
       topic_status_update:
         title: "زمانسنج مبحث"
         save: "تنظیم زمان‌سنج"
@@ -1938,9 +2086,11 @@ fa_IR:
         remove: "حذف زمان‌سنج"
         publish_to: "انتشار در:"
         when: "در زمان:"
-        time_frame_required: یک بازه ی زمانی انتخاب کنید
+        time_frame_required: "یک بازه ی زمانی انتخاب کنید"
+        min_duration: "مدت زمان باید بیشتر از ۰ باشد"
       auto_update_input:
         none: "انتخاب یک دوره‌زمانی"
+        now: "اکنون"
         later_today: "امروز"
         tomorrow: "فردا"
         later_this_week: "این هفته"
@@ -1966,7 +2116,6 @@ fa_IR:
         title: "بستن موقتی"
       auto_close:
         title: "بستن خودکار موضوع"
-        label: "مقدار زمان بسته شدن خودکار موضوع:"
         error: "یک مقدار معتبر وارد کنید."
         based_on_last_post: "تا زمانی آخرین پست موضوع این قدر قدیمی نشده، موضوع را نبند."
       auto_delete:
@@ -1977,7 +2126,7 @@ fa_IR:
         auto_open: "این موضوع به صورت خودکار در %{timeLeft} باز خواهد شد."
         auto_close: "این موضوع به صورت خودکار در %{timeLeft} بسته خواهد شد."
         auto_publish_to_category: "این موضوع در <a href=%{categoryUrl}>#%{categoryName}</a> منتشر می‌شود %{timeLeft}."
-        auto_close_based_on_last_post: "این موضوع در %{duration} بعد از آخرین پاسخ بسته خواهد شد."
+        auto_close_after_last_post: "این موضوع در %{duration} بعد از آخرین پاسخ بسته خواهد شد."
         auto_delete: "این موضوع به صورت خودکار در %{timeLeft} حذف می‌شود"
         auto_bump: "این مطلب %{timeLeft} به صورت خودکار به صدر مطالب آورده می‌شود."
         auto_reminder: "درباره این موضوع به شما یادآوری خواهد شد %{timeLeft}."
@@ -1996,7 +2145,9 @@ fa_IR:
         go: "برو"
         jump_bottom: "پرش به آخرین نوشته"
         jump_prompt: "پرش به..."
-        jump_prompt_of: "از %{count} نوشته"
+        jump_prompt_of:
+          one: "از %{count} نوشته"
+          other: "از %{count} نوشته"
         jump_prompt_long: "برو به ..."
         jump_bottom_with_number: "رفتن به نوشته ی %{post_number}"
         jump_prompt_to_date: "تا تاریخ"
@@ -2044,7 +2195,7 @@ fa_IR:
           title: "بی‌صدا شد"
           description: " در باره این پیام هرگز به شما اطلاع رسانی نخواهید شد"
         muted:
-          title: "بی‌صدا شد"
+          title: "خاموش"
           description: "شما هرگز از چیزی درباره این موضوع آگاه نمیشوید، و آن در آخرین ها نمایش داده نخواهد شد."
       actions:
         title: "عملیات"
@@ -2054,7 +2205,7 @@ fa_IR:
         close: "بستن موضوع"
         multi_select: "انتخاب نوشته‌ها"
         timed_update: "انتخاب شمارنده موضوع"
-        pin: "سنجاق زدن موضوع..."
+        pin: "سنجاق زدن به موضوع..."
         unpin: "برداشتن سنجاق موضوع..."
         unarchive: "موضوع بایگانی نشده"
         archive: "بایگانی کردن موضوع"
@@ -2080,6 +2231,7 @@ fa_IR:
         title: "اشتراک‌گذاری"
         extended_title: "اشتراک‌گذاری یک پیوند"
         help: "اشتراک‌گذاری پیوند این موضوع"
+        invite_users: "دعوت"
       print:
         title: "چاپ"
         help: "باز کردن حالت قابل چاپ موضوع"
@@ -2131,14 +2283,13 @@ fa_IR:
         username_placeholder: "نام‌کاربری"
         action: "ارسال دعوتنامه "
         help: "دعوت دیگران به این موضوع با ایمیل یا اطلاعیه‌ها"
-        to_forum: "ما ایمیلی کوتاه برای شما می فرستیم که دوست شما با کلیک کردن بر روی لینک سریعا ملحق شود، به ورود به سیستم نیازی نیست. "
-        sso_enabled: "نام کاربری کسی را که می خواهید برای این موضوع دعوت کنید را وارد نمایید"
+        discourse_connect_enabled: "نام‌کاربری کسی که می‌خواهید برای این موضوع دعوت کنید را وارد نمایید."
         to_topic_blank: "نام کاربری یا ایمیل کسی را که می خواهید برای این موضوع دعوت کنید را وارد نمایید"
         to_topic_email: "شما یک ایمیل آدرس وارد کردید. ما یک ایمیل خواهیم فرستاد که به دوستان شما اجازه می دهد سریعا به این موضوع پاسخ دهند."
         to_topic_username: "شما نام کاربری شخصی را وارد کرده‌اید. ما این امر را به اطلاع او رسانده و او را به این موضوع دعوت می‌کنیم."
         to_username: "نام کاربری شخصی که می‌خواهید او را دعوت کنید، وارد کنید. ما این امر را به اطلاع او رسانده و او را به این عنوان دعوت می‌کنیم."
         email_placeholder: "name@example.com"
-        success_email: "lما از طریق ایمیل دعوت نامه ارسال کردیم <B> %{emailOrUsername} </ B>. هنگامی که به دعوت شما پاسخ داده شد ما به شما اطلاع خواهیم داد.برای پی گیری به تب دعوت ها در پنل کاربری مراجعه نمایید"
+        success_email: "lما از طریق ایمیل دعوت نامه ارسال کردیم <B> %{invitee} </ B>. هنگامی که به دعوت شما پاسخ داده شد ما به شما اطلاع خواهیم داد.برای پی گیری به تب دعوت ها در پنل کاربری مراجعه نمایید"
         success_username: "ما آن کاربر را برای شرکت در این جستار دعوت کردیم."
         error: "متاسفیم٬‌ ما آن شخص را نمی توانیم دعوت کنیم. شاید قبلا دعوت شده اند. (فراخوان ها تعداد محدودی دارند)"
         success_existing_email: "یک کاربر با رایانامه <b>%{emailOrUsername}</b> وجو دارد. ما آن کاربر را برای شرکت در این مبحث دعوت کردیم."
@@ -2228,8 +2379,6 @@ fa_IR:
       edit_reason: "دلیل:"
       post_number: "نوشته %{number}"
       ignored: "محتوای نادیده گرفته‌شد"
-      wiki_last_edited_on: "دانشنامه آخرین بار در این زمان ویرایش شده"
-      last_edited_on: "نوشته آخرین بار ویرایش شده در"
       reply_as_new_topic: "پاسخگویی به عنوان یک موضوع لینک شده"
       reply_as_new_private_message: "پاسخ به عنوان پیام جدید به همین دریافت کنندگان"
       continue_discussion: "ادامه دادن بحث از %{postLink}:"
@@ -2266,16 +2415,8 @@ fa_IR:
         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: "بله، رها کن"
+      cancel_composer:
+        discard: "دور انداختن"
       via_email: "این نوشته از طریق ایمیل ارسال شده است"
       via_auto_generated_email: "این نوشته با ایمیل خودکار ارسال شده"
       whisper: "این ارسال نجوای خصوصی برای مدیران است"
@@ -2462,18 +2603,15 @@ fa_IR:
       notifications:
         watching:
           title: "در حال تماشا"
-          description: "شما به صورت خودکار تمام موضوعات این دسته‌بندی را مشاهده می‌کنید و از هر نوشته جدید در موضوعات آگاه خواهید شد، همچنین تعداد پاسخ‌های جدید نمایش داده می‌شوند."
         watching_first_post:
           title: "در‌حال مشاهده‌ نوشته‌ی اول"
         tracking:
           title: "پیگیری"
-          description: "شما به صورت خودکار تمام موضوعات این دسته‌بندی را پیگیری خواهید کرد. اگر فردی به صورت @نام به نام شما اشاره کند یا به شما پاسخ دهد، تعداد پاسخ‌ها به شما نمایش داده خواهد شد. "
         regular:
           title: "معمولی"
           description: "در صورتی که فردی با @نام به شما اشاره کند یا به شما پاسخی دهد به شما اطلاع داده خواهد شد."
         muted:
-          title: "بی‌صدا شد"
-          description: "شما هیچ وقت از موضوعات تازه در این دسته‌بندی‌ها مطلع نمی‌شوید, و آن‌ها در فهرست آخرین‌ها نمایش داده نمیشوند."
+          title: "خاموش"
       search_priority:
         label: "اولویت جستجو"
         options:
@@ -2508,10 +2646,15 @@ fa_IR:
     flagging:
       title: "تشکر برای کمک به نگه داشتن جامعه ما بصورت مدنی !"
       action: "پرچم‌گذاری نوشته"
+      take_action_options:
+        default:
+          title: "اقدام"
+          details: "رسیدن سریع به آستانه پرچم، به جای انتظار برای پرچم انجمن"
+        suspend:
+          title: "کاربر تعلیق شده"
       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> موضوع}} از این کاربر هستید، حذف حساب کاربری و جلوگیری از ثبت نام با آیپی <b>{ip_address}</b> و ایمیل <b>{email}</b> که به لیست دائمی سیاه منتقل می‌شوند. ادامه می‌دهید؟"
       yes_delete_spammer: "بله، هرزنگار پاک شود"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(مخفی)"
@@ -2570,7 +2713,7 @@ fa_IR:
         title: "سنجاق سراسری"
         help: "این موضوع به‌صورت سراسری سنجاق شده؛ در بالای آخرین‌ها و دسته‌بندی‌ها نمایش داده می‌شود"
       pinned:
-        title: "سنجاق شد"
+        title: "سنجاق شده"
         help: "این موضوع برای شما سنجاق شده است، و در بالای دسته‌بندی نمایش داده خواهد شد."
       unlisted:
         help: "این موضوع از فهرست خارج شد؛ و در فهرست موضوعات نمایش داده نخواهد شد، و فقط از طریق لینک مستقیم در دسترس خواهد بود. "
@@ -2578,12 +2721,6 @@ fa_IR:
         title: "این تاپیک یک پیام‌خصوصی است"
         help: "این تاپیک یک پیام‌خصوصی است"
     posts: "نوشته‌ها"
-    posts_likes_MF: |
-      این موضوع دارای {count, plural, one {1 پاسخ} other {# پاسخ}} است {ratio, select,
-      low {و مورد پسند دیگران واقع شده است}
-      med {و بسیار مورد پسند دیگران واقع شده است}
-      high {و به شدت مورد پسند دیگران واقع شده است}
-      other {}}
     original_post: "نوشته اصلی"
     views: "نمایش‌ها"
     views_lowercase:
@@ -2603,7 +2740,6 @@ fa_IR:
       one: "کاربران"
       other: "کاربران"
     category_title: "دسته"
-    history: "تاریخچه"
     changed_by: "توسط %{author}"
     raw_email:
       title: "ایمیل دریافتی"
@@ -2685,7 +2821,9 @@ fa_IR:
       download: "دانلود"
       previous: "قبلی (مکان‌نمای چپ)"
       next: "بعدی (مکان‌نمای راست)"
+      counter: "%curr% از %total%"
       close: "بستن (خروج)"
+    cannot_render_video: این ویدیو قابل ارائه نیست، چون مرورگر شما از کدک پشتیبانی نمی‌کند.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -2816,6 +2954,7 @@ fa_IR:
       delete_unused_confirmation_more_tags:
         one: "%{tags} و %{count} بیشتر"
         other: "%{tags}و %{count} بیشتر"
+      tag_list_joiner: "، "
       delete_unused: "پاک کردن برچسب های استفاده نشده"
       delete_unused_description: "پاک کردن همه ی برچسب هایی که به هیچ مبحث یا پیامی تعلق ندارند"
       cancel_delete_unused: "لغو کردن"
@@ -2837,7 +2976,7 @@ fa_IR:
           title: "عادی"
           description: "اگر کسی به صورت @نام به شما اشاره کند، به شما اطلاع داده خواهد شد."
         muted:
-          title: "بی‌صدا شد"
+          title: "خاموش"
       groups:
         title: "برچسب گروه‌ها"
         about: "برای مدیریت راحت‌تر گروه‌ها به آن‌ها برچسب اضافه کنید."
@@ -2870,6 +3009,17 @@ fa_IR:
       dismiss: "نخواستیم"
     safe_mode:
       enabled: "حالت امن فعال شده، برای خروج از حالت امن این پنجره مرورگر را ببندید."
+    do_not_disturb:
+      title: "مزاحم نشود برای..."
+      label: "مزاحم نشوید"
+      remaining: "%{remaining} باقی‌مانده"
+      options:
+        half_hour: "۳۰ دقیقه"
+        one_hour: "۱ ساعت"
+        two_hours: "۲ ساعت"
+        tomorrow: "تا فردا"
+        custom: "سفارشی"
+      set_schedule: "تنظیم زمان‌بندی آگاه‌سازی"
   admin_js:
     type_to_filter: "بنویسید تا فیلتر کنید..."
     admin:
@@ -2896,6 +3046,8 @@ fa_IR:
         installed_version: "نصب"
         latest_version: "آخرین"
         problems_found: "چند توصیه براثاث تنظیمات فعلی سایت شما"
+        new_features:
+          dismiss: "نخواستیم"
         last_checked: " آخرین بررسی"
         refresh_problems: "تازه کردن"
         no_problems: "هیچ مشکلات پیدا نشد."
@@ -2972,10 +3124,6 @@ fa_IR:
             available: "نام گروه در دسترس است"
             not_available: "نام گروه در دسترس نیست"
             blank: "نام گروه نمی‌تواند خالی باشد"
-        bulk_add:
-          title: "اضافه کردن تعداد زیادی به گروه"
-          complete_users_not_added: "این کاربران اضافه نشدند (مطمئن شوید که حساب عضو هستند)"
-          paste: "یک لیست از نام های کاربری و یا ایمیل ها وارد کنید, در هر خط فقط یکی:"
         add_members:
           as_owner: "قراردادن کاربر(ها) به‌عنوان مالک(مالکان) این گروه"
         manage:
@@ -3030,6 +3178,8 @@ fa_IR:
         description: توضیح
         save: ذخیره
         continue: ادامه
+        scopes:
+          action: اقدام
       web_hooks:
         title: "webhook ها"
         none: "در حال حاضر webhook‌ی وجود ندارد"
@@ -3044,7 +3194,6 @@ fa_IR:
         go_back: "بازگشت به فهرست"
         payload_url: "لینک payload"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "به نظر می‌رسد در حال تنظیم webhook در localhost هستید. این کار ممکن است باعث ایجاد خطا‌های غیر منتظره شود. ادامه می‌دهید؟"
         secret_invalid: "رمز نباید شامل کاراکتر فاصله باشد."
         secret_too_short: "رمز باید حداقل 12 کاراکتر باشد."
         secret_placeholder: "یک رشته اختیاری که برای ایجاد امضا استفاده می‌شود."
@@ -3293,6 +3442,7 @@ fa_IR:
           source_url: "منبع"
           enable: "فعال کردن"
           disable: "ازکاراندازی"
+          disabled: "این کامپوننت غیر فعال شده."
           update_to_latest: "به‌روز‌رسانی به آخرین نسخه"
           check_for_updates: "برررسی به‌روز‌رسانی‌ها"
           updating: "در حال به‌روز‌رسانی"
@@ -3320,10 +3470,10 @@ fa_IR:
             text: "کد CSS جاسازی شده"
             title: "کد CSS سفارشی مد نظرتان را اینجا وارد کنید"
           head_tag:
-            text: "</head>"
+            text: "</‎head>"
             title: "کد HTML که قبل از برچسب </head> اضافه می‌شود"
           body_tag:
-            text: "</body>"
+            text: "</‎body>"
             title: "کد HTML که قبل از برچسب </body> اضافه می‌شود"
           yaml:
             text: "YAML"
@@ -3508,6 +3658,7 @@ fa_IR:
             change_name: "تغییر دادن نام"
             approve_user: "کاربر پذیرفته‌شده"
             change_theme_setting: "تغییر دادن تنظیمات قالب"
+            delete_group: "حذف گروه"
         screened_emails:
           title: "ایمیل ها نمایش داده شده"
           description: "وقتی کسی سعی می کند یک حساب جدید ایجاد کند، آدرس‌های ایمیل زیر بررسی و ثبت نام مسدود خواهد شد، و یا برخی از اقدام های دیگر انجام می شود."
@@ -3547,22 +3698,21 @@ fa_IR:
       watched_words:
         search: "جست‌وجو"
         clear_filter: "واضح"
-        show_words: "نمایش واژه‌ها"
         download: دانلود
         clear_all: پاکسازی همه
-        word_count:
-          one: "%{count} واژه"
-          other: "%{count} واژه"
         actions:
           block: "بستن"
           censor: "سانسور"
           require_approval: "نیازمند تصویب"
           flag: "پرچم"
+          replace: "جایگزینی"
+          tag: "برچسب"
         action_descriptions:
           block: "از فرستادن فرسته‌هایی که دارای این واژه‌ها هستند جلوگیری کنید. کاربر هنگام ارسال فرسته با پیام خطا مواجه می‌شود."
           require_approval: "فرسته‌های دارای این واژه‌ها پیش از دیده شدن نیاز به تائید کارکنان دارند."
         form:
-          label: "واژه تازه:"
+          tag_label: "برچسب"
+          tag_placeholder: "برچسب۱,برچسب۲,برچسب۳"
           add: "افزودن"
           success: "موفقیت"
           upload_successful: "بارگذاری با موفقیت انجام شد. واژه‌ها اضافه شدند."
@@ -3606,12 +3756,15 @@ fa_IR:
         check_email:
           title: "ایمیل این کاربران را قابل رویت کن"
           text: "نشان دادن"
+        check_sso:
+          text: "نمایش"
       user:
         suspend_failed: "در جریان به تعلیق درآوردن این کاربر اشتباهی رخ داد. %{error}"
         unsuspend_failed: "در جریان خارج کردن این کاربر از تعلیق، اشتباهی رخ داد %{error}"
         suspend_duration: "کاربر چه مدت در تعلیق خواهد بود؟"
         suspend_reason_label: "شما چرا معلق شده‌اید؟ این متن بر روی صفحه‌ی نمایه‌ی کاربر <b/>برای همه قابل مشاهده خواهد بود<b>، و در هنگام ورود به سیستم نیز به خود کاربر نشان داده خواهد شد. لطفاً خلاصه بنویسید."
         suspend_reason: "دلیل"
+        suspend_reason_title: "دلیل تعلیق شدن"
         suspend_message_placeholder: "به صورت اختیاری اطلاعات بیشتری درمورد تعلیق ارائه دهید تا به رایانامه کاربر ارسال شود."
         suspended_by: "تعلیق شده توسط"
         silence_reason: "دلیل"
@@ -3620,7 +3773,6 @@ fa_IR:
         delete_all_posts: "پاک کردن همه‌ی نوشته‌ها"
         delete_posts_progress: "درحال حذف فرسته‌ها..."
         penalty_post_edit: "ویرایش فرسته"
-        delete_all_posts_confirm_MF: "شما در حال حذف {POSTS, plural, one {1 نوشته} other {# نوشته}} and {TOPICS, plural, one {1 نوشته} other {# موضوع}} هستید. ادامه می‌دهید؟"
         moderator: "مدیر؟ "
         admin: "مدیر ارشد؟"
         suspended: "تعلیق شد؟"
@@ -3736,13 +3888,12 @@ fa_IR:
           on_grace_period: "در حال حاضر در مهلت ارتقا٬ تنزل نخواهد گرفت."
           locked_will_not_be_promoted: "سطح اعتماد بسته شده. دیگر ترفیع درجه نخواهد گرفت."
           locked_will_not_be_demoted: "سطح اعتماد بسته شده. دیگردرجه تنزل نخواهد گرفت."
-        sso:
-          title: "ورود یکپارچه به سیستم"
-          external_id: " شناسه خارجی"
+        discourse_connect:
+          external_id: "شناسه خارجی"
           external_username: "نام‌کاربری"
           external_name: "نام"
           external_email: "ایمیل"
-          external_avatar_url: "لینک تصویر نمایه"
+          external_avatar_url: "نشانی اینترنتی تصویر پروفایل"
       user_fields:
         title: "زمینه‌های کاربر"
         help: "زمینه‌هایی را که کاربرانتان می‌توانند پر کنند اضافه کنید."
@@ -3773,6 +3924,10 @@ fa_IR:
           title: "در کارت کاربر نمایش داده شود؟"
           enabled: "در کارت کاربر نمایش داده شده"
           disabled: "در کارت کاربر نمایش داده نشده"
+        searchable:
+          title: "قابل جستجو؟"
+          enabled: "قابل جستجو"
+          disabled: "قابل جستجو نیست"
         field_types:
           text: "زمینه متنی"
           confirm: "تاییدیه"
@@ -3787,12 +3942,17 @@ fa_IR:
         go_back: "بازگشت به جستجو"
         recommended: "ما پیشنهاد میکنیم این متن را بر اساس نیاز های خود ویرایش کنید:"
         show_overriden: "تنها بازنویسی‌شده‌ها را نمایش بده"
+        locale: "زبان:"
       settings:
         show_overriden: "تنها بازنویسی‌شده‌ها را نمایش بده"
         history: "مشاهده تاریخچه تغییر"
         reset: "بازنشانی"
         none: "هیچی"
       site_settings:
+        emoji_list:
+          invalid_input: "فهرست شکلک‌ها فقط باید حاوی نام‌های شکلک معتبر باشد، به عنوان مثال: آغوش"
+          add_emoji_button:
+            label: "افزودن شکلک"
         title: "تنظیمات"
         no_results: "چیزی یافت نشد."
         clear_filter: "واضح"
@@ -3926,6 +4086,9 @@ fa_IR:
         embed_post_limit: "حداکثر تعداد نوشته‌هایی که میتوان جاساز کرد"
         embed_title_scrubber: "regular expression‌ی که برای بهینه‌سازی عنوان نوشته استفاده می‌شود"
         embed_truncate: "کوتاه کردن نوشته های جاسازی شده"
+        allowed_embed_selectors: "انتخاب کننده CSS برای المان هایی که اجازه دارند جاسازی شوند"
+        blocked_embed_selectors: "انتخاب کننده CSS برای المان هایی که از جاسازی پاک شده اند"
+        allowed_embed_classnames: " دسترسی به کلاس های CSS"
         save: "ذخیره تنظیمات کدهای جاساز"
       permalink:
         title: " پیوند دائمی"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 0b28562e60..6978156f75 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -80,7 +80,7 @@ fi:
           one: "%{count} minuutti"
           other: "%{count} minuuttia"
         x_hours:
-          one: "tunti"
+          one: "%{count} tunti"
           other: "%{count} tuntia"
         x_days:
           one: "%{count} päivä"
@@ -88,10 +88,10 @@ fi:
         date_year: "MMMM YYYY"
       medium_with_ago:
         x_minutes:
-          one: "minuutti sitten"
+          one: "%{count} minuutti sitten"
           other: "%{count} minuuttia sitten"
         x_hours:
-          one: "tunti sitten"
+          one: "%{count} tunti sitten"
           other: "%{count} tuntia sitten"
         x_days:
           one: "%{count} päivä sitten"
@@ -124,40 +124,46 @@ fi:
       email: "Lähetä sähköpostitse"
       url: "Kopioi ja jaa URL"
     action_codes:
-      public_topic: "teki ketjusta julkisen %{when}"
-      private_topic: "muutti ketjun yksityiskeskusteluksi %{when}"
-      split_topic: "pilkkoi tämän ketjun %{when}"
-      invited_user: "kutsui käyttäjän %{who} %{when}"
-      invited_group: "kutsui käyttäjän %{who} %{when}"
+      public_topic: "muutettu ketju julkiseksi %{when}"
+      private_topic: "muutettu yksityseksi keskusteluksi %{when}"
+      split_topic: "ketju jaettu %{when}"
+      invited_user: "kutsuttu käyttäjä %{who} %{when}"
+      invited_group: "kutsuttu käyttäjä %{who} %{when}"
       user_left: "%{who} poisti itsensä tästä yksityiskeskustelusta %{when}"
-      removed_user: "poisti käyttäjän %{who} %{when}"
-      removed_group: "poisti käyttäjän %{who} %{when}"
-      autobumped: "nousi automaattisesti %{when}"
+      removed_user: "poistettu käyttäjä %{who} %{when}"
+      removed_group: "poistettu käyttäjä %{who} %{when}"
+      autobumped: "nostettu automaattisesti %{when}"
       autoclosed:
-        enabled: "sulki %{when}"
-        disabled: "avasi %{when}"
+        enabled: "suljettu %{when}"
+        disabled: "avattu %{when}"
       closed:
-        enabled: "sulki %{when}"
-        disabled: "avasi %{when}"
+        enabled: "suljettu %{when}"
+        disabled: "avattu %{when}"
       archived:
-        enabled: "arkistoi %{when}"
-        disabled: "palautti %{when}"
+        enabled: "arkistoitu %{when}"
+        disabled: "palautettu arkistosta %{when}"
       pinned:
-        enabled: "kiinnitti %{when}"
-        disabled: "poisti kiinnityksen %{when}"
+        enabled: "kiinnitetty %{when}"
+        disabled: "kiinnitys poistettu %{when}"
       pinned_globally:
-        enabled: "kiinnitti koko palstalle %{when}"
-        disabled: "poisti kiinnityksen %{when}"
+        enabled: "kiinnitetty sivuston laajuisesti %{when}"
+        disabled: "kiinnitys poistettu %{when}"
       visible:
-        enabled: "listasi %{when}"
-        disabled: "poisti listauksista %{when}"
+        enabled: "lisätty näkyville %{when}"
+        disabled: "poistettu näkyvistä %{when}"
       banner:
-        enabled: "teki tästä bannerin %{when}. Se näytetään jokaisen sivun ylälaidassa, kunnes käyttäjä kuittaa sen nähdyksi."
-        disabled: "poisti tämän bannerin %{when}. Sitä ei enää näytetä jokaisen sivun ylälaidassa."
-      forwarded: "välitti yllä olevan sähköpostin"
+        enabled: "asetettu banneriksi %{when}. Se näytetään jokaisen sivun ylälaidassa, kunnes käyttäjä kuittaa sen nähdyksi."
+        disabled: "poistettu bannerina näkyvistä %{when}. Sitä ei enää näytetä jokaisen sivun ylälaidassa."
+      forwarded: "välitetty yllä oleva sähköposti"
     topic_admin_menu: "ketjun työkalut"
     wizard_required: "Tervetuloa uuteen Discourseesi! Aloitetaan <a href='%{url}' data-auto-route='true'>ohjattu asennus</a> ✨"
     emails_are_disabled: "Ylläpitäjä on estänyt kaiken lähtevän sähköpostiliikenteen. Mitään sähköposti-ilmoituksia ei lähetetä."
+    software_update_prompt:
+      message: "Sivusto on juuri päivitetty, ole hyvä ja <span>päivitä sivu</span> tai sivusto voi käyttäytyä odottamattomasti."
+      dismiss: "Sulje"
+    bootstrap_mode_enabled:
+      one: "Jotta sivusto saisi lentävämmän lähdön, olet bootstrap-tilassa. Kaikki käyttäjät nousevat heti luottamustasolle 1, ja päivittäiset sähköpostitiivistelmät kytketään päälle. Tila kytkeytyy pois päältä, kun %{count} käyttäjä on liittynyt."
+      other: "Jotta sivusto saisi lentävämmän lähdön, olet bootstrap-tilassa. Kaikki käyttäjät nousevat heti luottamustasolle 1, ja päivittäiset sähköpostitiivistelmät kytketään päälle. Tila kytkeytyy pois päältä, kun %{count} käyttäjää on liittynyt."
     bootstrap_mode_disabled: "Aloitustila poistetaan seuraavan 24 tunnin aikana."
     themes:
       default_description: "Oletus"
@@ -166,6 +172,7 @@ fi:
       regions:
         ap_northeast_1: "Aasia ja Tyynimeri (Tokio)"
         ap_northeast_2: "Aasia ja Tyynimeri (Soul)"
+        ap_east_1: "Aasia ja Tyynimeri (Hong Kong)"
         ap_south_1: "Aasia ja Tyynimeri (Mumbai)"
         ap_southeast_1: "Aasia ja Tyynimeri (Singapore)"
         ap_southeast_2: "Aasia ja Tyynimeri (Sydney)"
@@ -184,6 +191,7 @@ fi:
         us_gov_west_1: "AWS GovCloud (läntinen USA)"
         us_west_1: "Läntinen USA (Pohjois-Kalifornia)"
         us_west_2: "Läntinen USA (Oregon)"
+    clear_input: "Tyhjennä sisältö"
     edit: "muokkaa ketjun otsikkoa ja aluetta"
     expand: "Laajenna"
     not_implemented: "Tätä toimintoa ei ole vielä toteutettu, pahoittelut!"
@@ -203,7 +211,7 @@ fi:
     links: "Linkit"
     links_lowercase:
       one: "linkki"
-      other: "linkit"
+      other: "linkkiä"
     faq: "UKK"
     guidelines: "Ohjeet"
     privacy_policy: "Tietosuojaseloste"
@@ -218,6 +226,9 @@ fi:
     now: "juuri äsken"
     read_more: "lue lisää"
     more: "Lisää"
+    x_more:
+      one: "%{count} muu"
+      other: "%{count} muuta"
     less: "Vähemmän"
     never: "ei koskaan"
     every_30_minutes: "puolen tunnin välein"
@@ -246,8 +257,9 @@ fi:
       moderators: "Valvojat"
       stat:
         all_time: "Yhteensä"
-        last_7_days: "Viimeiset 7"
-        last_30_days: "Viimeiset 30"
+        last_day: "Viimeiset 24 tuntia"
+        last_7_days: "Viimeiset 7 päivää"
+        last_30_days: "Viimeiset 30 päivää"
       like_count: "Tykkäyksiä"
       topic_count: "Ketjuja"
       post_count: "Viestejä"
@@ -271,7 +283,7 @@ fi:
       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>.'
+      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ä."
       no_user_bookmarks: "Kirjanmerkeissäsi ei ole mitään. Kirjanmerkitsemällä viestin löydät sen myöhemmin helposti."
@@ -283,17 +295,6 @@ fi:
       search_placeholder: "Etsi kirjanmerkkejä nimen, ketjun otsikon tai viestin sisällön perusteella"
       search: "Haku"
       reminders:
-        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"
-        start_of_next_business_week: "Maanantaina"
-        start_of_next_business_week_alt: "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}"
@@ -303,13 +304,14 @@ fi:
     drafts:
       resume: "Jatka"
       remove: "Poista"
+      remove_confirmation: "Haluatko varmasti poistaa luonnoksen?"
       new_topic: "Uusi ketjuluonnos"
       new_private_message: "Uusi yksityisviestiluonnos"
       topic_reply: "Vastausluonnos"
       abandon:
-        confirm: "Sinulla on keskeneräinen luonnos tässä ketjussa. Haluatko varmasti hylätä sen?"
-        yes_value: "Kyllä, hylkään"
-        no_value: "Ei, säilytän"
+        confirm: "Sinulla on meneillään luonnos tätä ketjua varten. Mitä haluaisit tehdä sen kanssa?"
+        yes_value: "Hylkää"
+        no_value: "Jatka muokkausta"
     topic_count_latest:
       one: "Katso %{count} uusi tai päivittynyt ketju"
       other: "Katso %{count} uutta tai päivittynyttä ketjua"
@@ -321,12 +323,14 @@ fi:
       other: "Näytä %{count} uutta ketjua"
     preview: "esikatselu"
     cancel: "peruuta"
+    deleting: "Poistetaan..."
     save: "Tallenna muutokset"
     saving: "Tallennetaan..."
     saved: "Tallennettu!"
     upload: "Liitä"
     uploading: "Lähettää..."
     uploading_filename: "Ladataan: %{filename}"
+    processing_filename: "Käsitellään: %{filename}..."
     clipboard: "leikepöytä"
     uploaded: "Lähetetty!"
     pasting: "Liitetään..."
@@ -405,6 +409,7 @@ fi:
       topic: "Ketju:"
       filtered_topic: "Olet suodattanut käsiteltävän sisällön yhdestä ketjusta."
       filtered_user: "Käyttäjä"
+      filtered_reviewed_by: "Käsittelijä"
       show_all_topics: "näytä kaikki ketjut"
       deleted_post: "(viesti poistettu)"
       deleted_user: "(käyttäjä poistettu)"
@@ -415,10 +420,11 @@ fi:
         email: "Sähköposti"
         name: "Nimi"
         fields: "Kentät"
+        reject_reason: "Syy"
       user_percentage:
         summary:
-          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} lippu kaikkiaan)"
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} lippua kaikkiaan)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (edellisestä liputuksesta)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (edellisistä %{count} liputuksesta)"
         agreed:
           one: "%{count}% samaa mieltä"
           other: "%{count}% samaa mieltä"
@@ -461,7 +467,8 @@ fi:
           created_at_asc: "Luotu (käänteinen)"
         priority:
           title: "Vähimmäisprioriteetti"
-          low: "(mikä tahansa)"
+          any: "(kaikki prioriteetit)"
+          low: "Matala"
           medium: "Keskiverto"
           high: "Korkea"
       conversation:
@@ -499,6 +506,8 @@ fi:
           title: "Jonossa oleva viesti"
         reviewable_user:
           title: "Käyttäjä"
+        reviewable_post:
+          title: "Viesti"
       approval:
         title: "Viesti odottaa hyväksyntää"
         description: "Viestisi saapui perille, mutta valvojan on vielä hyväksyttävä se, jotta se näkyy sivustolla. Ole kärsivällinen."
@@ -506,6 +515,41 @@ fi:
           one: "Jonossa on <strong>%{count}</strong> viesti."
           other: "Jonossa on <strong>%{count}</strong> viestiä."
         ok: "OK"
+      example_username: "käyttäjänimi"
+      reject_reason:
+        title: "Miksi olet hylkäämässä kyseistä käyttäjää?"
+        send_email: "Lähetä sähköposti hylkäämisestä"
+    relative_time_picker:
+      minutes:
+        one: "minuutti"
+        other: "minuuttia"
+      hours:
+        one: "tunti"
+        other: "tuntia"
+      days:
+        one: "päivä"
+        other: "päivää"
+      months:
+        one: "kuukausi"
+        other: "kuukautta"
+      years:
+        one: "vuosi"
+        other: "vuotta"
+      relative: "Suhteellinen"
+    time_shortcut:
+      later_today: "Myöhemmin tänään"
+      next_business_day: "Seuraavana arkipäivänä"
+      tomorrow: "Huomenna"
+      next_week: "Ensi viikolla"
+      post_local_date: "Päivämäärä viestissä"
+      later_this_week: "Myöhemmin tällä viikolla"
+      start_of_next_business_week: "Maanantaina"
+      start_of_next_business_week_alt: "Seuraavana maanantaina"
+      next_month: "Ensi kuussa"
+      custom: "Mukautettu päivämäärä ja aika"
+      relative: "Suhteellinen aika"
+      none: "Ei vaadittu"
+      last_custom: "Viimeisin mukautettu päivämäärä"
     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>"
@@ -581,9 +625,25 @@ fi:
           notification: Ilmoitus
         email:
           title: "Sähköposti"
+          status: "Synkronoitu %{old_emails} / %{total_emails} viestiä IMAP:n kautta."
           credentials:
+            title: "Käyttäjätunnukset"
+            smtp_server: "SMTP-palvelin"
+            smtp_port: "SMTP-portti"
+            smtp_ssl: "Käytä SSL-salausta SMTP:lle"
+            imap_server: "IMAP-palvelin"
+            imap_port: "IMAP-portti"
+            imap_ssl: "Käytä SSL-salausta IMAP:lle"
             username: "Käyttäjätunnus"
             password: "Salasana"
+          settings:
+            title: "Asetukset"
+            allow_unknown_sender_topic_replies: "Salli tuntemattomien lähettäjien vastaukset ketjuun."
+            allow_unknown_sender_topic_replies_hint: "Salli tuntemattomien lähettäjien vastata ryhmän aiheisiin. Jos tämä ei ole käytössä, vastaukset sähköpostiosoitteista, joita ei ole jo sisällytetty IMAP-sähköpostiviestiin tai kutsuttu aiheeseen, luovat uuden aiheen."
+          mailboxes:
+            synchronized: "Synkronoitu postilaatikko"
+            none_found: "Tältä sähköpostitililtä ei löytynyt postilaatikoita."
+            disabled: "poistettu käytöstä"
         membership:
           title: Jäsenyys
           access: Pääsy
@@ -596,6 +656,15 @@ fi:
           watching_first_post_categories_instructions: "Käyttäjät saavat ilmoituksen näiden alueiden ketjujen ensimmäisistä viesteistä."
           regular_categories_instructions: "Jos nämä alueet on vaimennettu, vaimennus perutaan ryhmän jäseniltä. Käyttäjälle ilmoitetaan, jos hänet mainitaan tai joku vastaa hänelle."
           muted_categories_instructions: "Käyttäjille ei ilmoiteta millään lailla näiden alueiden uusista ketjuista, eikä niitä näytetä Alueet- eikä Tuoreimmat-listauksissa."
+        tags:
+          title: Tunnisteet
+          long_title: "Tunnisteiden oletusilmoitukset"
+          description: "Kun käyttäjiä lisätään tähän ryhmään, heidän ilmoitusasetukset tunnisteille asetetaan näihin oletusasetuksiin. He voivat muuttaa niitä itse myöhemmin."
+          watched_tags_instructions: "Aseta automaattisesti kaikki ketjut tarkkailuun näillä tunnisteilla. Ryhmän jäsenet saavat ilmoitukset kaikista uusista viesteistä ja ketjuista sekä uusien viestien lukumäärä näytetään ketjun otsikon vieressä."
+          tracked_tags_instructions: "Ketjut, joilla on joku näistä tunnisteista, asetetaan automaattisesti seurantaan. Uusien viestien lukumäärä näytetään ketjun otsikon vieressä."
+          watching_first_post_tags_instructions: "Käyttäjät saavat ilmoituksen jokaisen uuden ketjun ensimmäisestä viestistä näillä tunnisteilla."
+          regular_tags_instructions: "Jos nämä tunnisteet vaimennetaan, niiden vaimennus poistuu ryhmän jäseniltä. Käyttäjät saavat ilmoitukset jos heidät mainitaan tai joku vastaa heille."
+          muted_tags_instructions: "Käyttäjille ei ilmoiteta uusista ketjuista näillä tunnisteilla, eikä niitä näytetä tuoreimmat-listauksessa."
         logs:
           title: "Lokit"
           when: "Milloin"
@@ -606,6 +675,10 @@ fi:
           details: "Yksityiskohdat"
           from: "Mistä"
           to: "Minne"
+      permissions:
+        title: "Käyttöoikeudet"
+        none: "Tähän ryhmään ei ole liitetty alueita."
+        description: "Tämän ryhmän jäsenet voivat käyttää näitä alueita"
       public_admission: "Salli käyttäjien liittyä ryhmään vapaasti (Ryhmän täytyy olla julkinen)"
       public_exit: "Salli käyttäjien poistua ryhmästä vapaasti"
       empty:
@@ -668,7 +741,22 @@ fi:
         make_owner_description: "Tee käyttäjästä <b>%{username}</b> ryhmän isäntä"
         remove_owner: "Peru isännyys"
         remove_owner_description: "Peru käyttäjältä <b>%{username}</b> ryhmän isännyys"
+        make_primary: "Aseta ensisijaiseksi"
+        make_primary_description: "Aseta tämä käyttäjän <b>%{username}</b> ensisijaiseksi ryhmäksi"
+        remove_primary: "Poista ensisijainen ryhmä"
+        remove_primary_description: "Poista tämä käyttäjän <b>%{username}</b> ensisijaisesta ryhmästä"
+        remove_members: "Poista jäsenet"
+        remove_members_description: "Poista valitut käyttäjät tästä ryhmästä"
+        make_owners: "Aseta omistajaksi"
+        make_owners_description: "Aseta valitut käyttäjät ryhmän omistajaksi"
+        remove_owners: "Poista omistajuus"
+        remove_owners_description: "Poista valitut käyttäjät ryhmän omistajista"
+        make_all_primary: "Aseta kaikille ensisijaiseksi"
+        make_all_primary_description: "Aseta tämä ryhmä ensisijaiseksi kaikille valituille käyttäjille"
+        remove_all_primary: "Poista kaikilta ensisijaisuus"
+        remove_all_primary_description: "Poista tämä ryhmä kaikilta ensisijaisena ryhmänä"
         owner: "Isäntä"
+        primary: "Ensisijainen"
         forbidden: "Et voi tarkastella jäseniä."
       topics: "Ketjut"
       posts: "Viestit"
@@ -740,13 +828,21 @@ fi:
       posts: "Viestit"
       topics: "Ketjut"
       latest: "Tuoreimmat"
-      latest_by: "tuorein"
       toggle_ordering: "vaihda järjestystä"
       subcategories: "Tytäralueet"
       muted: "Vaimennetut alueet"
       topic_sentence:
         one: "%{count} ketju"
         other: "%{count} ketjua"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "viikko"
+        month: "kuukausi"
+      topic_stat_all_time:
+        one: "%{number} yhteensä"
+        other: "%{number} yhteensä"
       topic_stat_sentence_week:
         one: "%{count} uusi ketju viimeisimmän viikon aikana"
         other: "%{count} uutta ketjua viimeisimmän viikon aikana"
@@ -793,6 +889,7 @@ fi:
           all: "Kaikki"
           read: "Luetut"
           unread: "Lukematta"
+        ignore_duration_title: "Estetty käyttäjä"
         ignore_duration_username: "Käyttäjätunnus"
         ignore_duration_when: "Kesto:"
         ignore_duration_save: "Sivuuta"
@@ -806,7 +903,23 @@ fi:
         mute_option_title: "Et saa käyttäjään liittyviä ilmoituksia."
         normal_option: "Normaali"
         normal_option_title: "Saat ilmoituksen jos käyttäjä vastaa sinulle, lainaa sinua tai mainitsee sinut."
+      notification_schedule:
+        title: "Ilmoitusten aikataulu"
+        label: "Aseta mukautettu ilmoitusten aikataulu"
+        tip: "Näiden aikojen ulkopuolella sinut asetetaan automaattisesti Älä häiritse -tilaan."
+        midnight: "Keskiyö"
+        none: "Ei mitään"
+        monday: "Maanantai"
+        tuesday: "Tiistai"
+        wednesday: "Keskiviikko"
+        thursday: "Torstai"
+        friday: "Perjantai"
+        saturday: "Lauantai"
+        sunday: "Sunnuntai"
+        to: "-"
       activity_stream: "Toiminta"
+      read: "Luetut"
+      read_help: "Äskettäin luetut aiheet"
       preferences: "Asetukset"
       feature_topic_on_profile:
         open_search: "Valitse uusi ketju"
@@ -835,11 +948,20 @@ fi:
         perm_denied_expl: "Olet kieltänyt ilmoitukset. Salli ilmoitukset selaimesi asetuksista."
         disable: "Poista ilmoitukset käytöstä"
         enable: "Näytä ilmoituksia"
-        each_browser_note: "Huom: Asetus on säädettävä erikseen jokaisessa selaimessa, jota käytät."
+        each_browser_note: 'Huomautus: Tätä asetusta on muutettava jokaisessa käyttämässäsi selaimessa. Kaikki ilmoitukset poistetaan käytöstä, kun ”älä häiritse”-tila on käytössä riippumatta tästä asetuksesta.'
         consent_prompt: "Haluatko liveilmoituksia kun muut vastaavat viesteihisi?"
-      dismiss: "Unohda"
-      dismiss_notifications: "Unohda kaikki"
+      dismiss: "Kuittaa"
+      dismiss_notifications: "Kuittaa kaikki"
       dismiss_notifications_tooltip: "Merkitse kaikki lukemattomat ilmoitukset luetuiksi"
+      no_messages_title: "Sinulla ei ole viestejä"
+      no_messages_body: >
+        Haluatko suoraa henkilökohtaista keskustelua jonkun kanssa normaalin keskusteluvirran ulkopuolella? Lähetä viesti heille napsauttamalla heidän profiilikuvaa ja käyttämällä %{icon} viesti -painiketta.<br><br> Jos tarvitset apua, voit <a href='%{aboutUrl}'>lähettää viestin ylläpidolle</a>.
+      no_bookmarks_title: "Et ole vielä lisännyt mitään kirjanmerkkeihin"
+      no_bookmarks_body: >
+        Aloita kirjanmerkkien lisääminen %{icon} painikkeella ja ne listataan tähän helposti löydettäväksi. Voit ajastaa myös muistutuksen!
+      no_notifications_title: "Sinulla ei ole vielä ilmoituksia"
+      no_notifications_body: >
+        Tässä paneelissa näytetään ilmoituksia sinulle relevantista aktiivisuudesta, kuten omien ketjujesi viestit ja vastaukset, kun joku <b>@mainitsee</b> nimesi tai siteeraa sinua, tai vastaa ketjuihin joita tarkkailet. Ilmoitukset lähetetään sinulle sähköpostitse silloin, kun et ole kirjautunut hetkeen. <br><br> Napsauta %{icon} -painiketta kun haluat ilmoituksia tietystä ketjusta, alueesta tai tunnisteesta. Lisää valintoja löydät <a href='%{preferencesUrl}'>käyttäjäasetuksista</a>.
       first_notification: "Ensimmäinen ilmoitus sinulle! Valitse se niin aloitetaan."
       dynamic_favicon: "Näytä määriä selainkuvakkeessa"
       skip_new_user_tips:
@@ -847,6 +969,18 @@ fi:
         not_first_time: "Ei ole ensikertasi?"
         skip_link: "Ohita nämä vinkit"
       theme_default_on_all_devices: "Tee tästä oletusteema kaikille laitteilleni"
+      color_scheme_default_on_all_devices: "Aseta oletusvärimalli(t) kaikille laitteilleni"
+      color_scheme: "Värimalli"
+      color_schemes:
+        default_description: "Teeman oletus"
+        disable_dark_scheme: "Sama kuin oletus"
+        dark_instructions: "Voit esikatsella tumman tilan värimallia aktivoimalla laitteesi 'dark mode'-asetuksen."
+        undo: "Nollaa"
+        regular: "Tavallinen"
+        dark: "Tumma tila"
+        default_dark_scheme: "(sivuston oletus)"
+      dark_mode: "Tumma tila"
+      dark_mode_enable: "Ota käyttöön automaattinen tumman tilan värimalli"
       text_size_default_on_all_devices: "Tee tästä oletusfonttikoko kaikille laitteilleni"
       allow_private_messages: "Salli toisten käyttäjien lähettää minulle yksityisviestejä"
       external_links_in_new_tab: "Avaa sivuston ulkopuoliset linkit uudessa välilehdessä"
@@ -861,7 +995,8 @@ fi:
       silenced_tooltip: "Käyttäjä on hiljennetty"
       suspended_notice: "Tämä käyttäjätili on hyllytetty %{date} asti."
       suspended_permanently: "Käyttäjä on hyllytetty."
-      suspended_reason: "Syy:"
+      suspended_reason: "Syy: "
+      github_profile: "GitHub"
       email_activity_summary: "Kooste tapahtumista"
       mailing_list_mode:
         label: "Postituslistatila"
@@ -876,13 +1011,13 @@ fi:
         warning: "Postituslistatila käytössä. Sähköposti-ilmoitusasetukset syrjäytetty."
       tag_settings: "Tunnisteet"
       watched_tags: "Tarkkailtavat"
-      watched_tags_instructions: "Ketjut joilla on joku näistä tunnisteista asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista, ja uusien viestien lukumäärä näytetään ketjun otsikon vieressä. "
+      watched_tags_instructions: "Ketjut, joilla on jokin näistä tunnisteista, asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista sekä uusien viestien lukumäärä näytetään ketjun otsikon vieressä."
       tracked_tags: "Seurattavat"
-      tracked_tags_instructions: "Ketjut, joilla on joku näistä tunnisteista, asetetaan automaattisesti seurantaan. Uusien viestien lukumäärä näytetään ketjun otsikon vieressä. "
+      tracked_tags_instructions: "Ketjut, joilla on joku näistä tunnisteista, asetetaan automaattisesti seurantaan. Uusien viestien lukumäärä näytetään ketjun otsikon vieressä."
       muted_tags: "Vaimennettavat"
       muted_tags_instructions: "Et saa ilmoituksia ketjuista, joilla on joku näistä tunnisteista, eivätkä ne näy tuoreimmissa."
       watched_categories: "Tarkkaillut"
-      watched_categories_instructions: "Näiden alueiden kaikki uudet ketjut asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista, ja uusien viestien lukumäärä näytetään ketjun otsikon vieressä. "
+      watched_categories_instructions: "Näiden alueiden kaikki uudet ketjut asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista sekä uusien viestien lukumäärä näytetään ketjun otsikon vieressä."
       tracked_categories: "Seuratut"
       tracked_categories_instructions: "Näiden alueiden ketjut asetetaan automaattisesti seurantaan. Uusien viestien lukumäärä näytetään ketjun yhteydessä."
       watched_first_post_categories: "Tarkkaillaan uusia ketjuja"
@@ -892,6 +1027,8 @@ fi:
       muted_categories: "Vaimennetut"
       muted_categories_instructions: "Et saa minkäänlaisia ilmoituksia näille alueille luoduista uusista ketjuista. Ketjut eivät näy aluelistauksissa eivätkä tuoreimmissa."
       muted_categories_instructions_dont_hide: "Et saa ilmoituksia mistään tämän alueen uusiin ketjuihin liittyvästä."
+      regular_categories: "Normaali"
+      regular_categories_instructions: "Näet nämä luokat Tuoreimmat ja Suosituimmat-luetteloissa."
       no_category_access: "Valvojana sinulla on rajoitetut oikeudet alueisiin, et voi tallentaa."
       delete_account: "Poista tilini"
       delete_account_confirm: "Oletko varma, että haluat lopullisesti poistaa käyttäjätilisi? Tätä toimintoa ei voi perua!"
@@ -902,6 +1039,9 @@ fi:
       users: "Käyttäjät"
       muted_users: "Vaimennetut"
       muted_users_instructions: "Älä näytä ilmoituksia tai vastaanota yksityisviestejä näiltä käyttäjiltä."
+      allowed_pm_users: "Sallittu"
+      allowed_pm_users_instructions: "Salli yksityisviestit vain näiltä käyttäjiltä."
+      allow_private_messages_from_specific_users: "Salli vain tiettyjen käyttäjien lähettää minulle yksityisviestejä."
       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ä"
@@ -936,6 +1076,7 @@ fi:
         tags: "Tunnisteet"
       preferences_nav:
         account: "Tili"
+        security: "Tietoturva"
         profile: "Profiili"
         emails: "Sähköpostit"
         notifications: "Ilmoitukset"
@@ -1034,9 +1175,11 @@ fi:
         taken: "Tämä sähköpostiosoite ei valitettavasti ole saatavilla."
         error: "Sähköpostiosoitteen vaihdossa tapahtui virhe. Ehkäpä sama sähköpostiosoite on jo käytössä?"
         success: "Annettuun osoitteeseen on lähetetty viesti. Seuraa sen ohjeita sähköpostiosoitteen varmentamiseksi."
+        success_via_admin: "Olemme lähettäneet sähköpostia tähän osoitteeseen. Käyttäjän on noudatettava sähköpostissa olevia vahvistusohjeita."
         success_staff: "Lähetimme sähköpostia nykyiseen osoitteeseesi. Noudata vahvistusohjeita."
       change_avatar:
         title: "Vaihda profiilikuvasi"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, perustuen"
         gravatar_title: "Muuta avatariasi %{gravatarName} -sivustolla"
         gravatar_failed: "%{gravatarName}-gravataria ei löytynyt sähköpostiosoitteella."
         refresh_gravatar_title: "Päivitä %{gravatarName}"
@@ -1045,6 +1188,7 @@ fi:
         uploaded_avatar_empty: "Lisää oma kuva"
         upload_title: "Lataa oma kuva"
         image_is_not_a_square: "Varoitus: olemme rajanneet kuvaasti; korkeus ja leveys eivät olleet samoja"
+        logo_small: "Sivuston pieni logo. Käytetään oletuksena."
       change_profile_background:
         title: "Profiilin yläkuva"
         instructions: "Profiilin yläkuva keskitetään ja sen oletusleveys on 1110 px."
@@ -1067,12 +1211,15 @@ fi:
         set_primary: "Aseta ensisijainen sähköpostiosoite"
         destroy: "Poista sähköpostiosoite"
         add_email: "Lisää vaihtoehtoinen sähköpostiosoite"
+        auth_override_instructions: "Sähköpostiosoite voidaan päivittää todennuksen tarjoajalta."
         no_secondary: "Ei toissijaisia sähköpostiosoitteita"
         instructions: "Ei tule julkiseksi."
+        admin_note: "Huomautus: Ylläpitäjä, joka vaihtaa toisen käyttäjän, joka ei ole järjestelmänvalvoja, sähköpostiosoitteen, tarkoittaa, että käyttäjä on menettänyt pääsyn alkuperäiseen sähköpostitiliinsä, joten salasanan vaihtosähköposti lähetetään heidän uuteen osoitteeseen. Käyttäjän sähköpostiosoite vaihtuu vasta, kun salasanan palautusprosessi on suoritettu loppuun."
         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"
+        invite_auth_email_invalid: "Kutsun sähköpostiosoite ei täsmää sähköpostiosoitteen kanssa joka autentikoitiin kohteessa %{provider}"
         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."
@@ -1106,6 +1253,7 @@ fi:
         checking: "Tarkistetaan käyttäjätunnusta..."
         prefilled: "Sähköposti vastaa tätä käyttäjänimeä"
         required: "Syötä käyttäjänimi"
+        edit: "Muokkaa käyttäjänimeä"
       locale:
         title: "Käyttöliittymän kieli"
         instructions: "Käyttöliittymän kieli. Kieli vaihtuu sivun uudelleen lataamisen yhteydessä."
@@ -1128,6 +1276,9 @@ fi:
         browser_and_device: "%{browser} laitteella %{device}"
         secure_account: "Turvaa käyttäjätilini"
         latest_post: "Kirjoitit viimeksi..."
+        device_location: '<span class="auth-token-device">%{device}</span> &ndash; <span title="IP: %{ip}">%{location}</span>'
+        browser_active: '%{browser} | <span class="active">aktiivinen nyt</span>'
+        browser_last_seen: "%{browser} | %{date}"
       last_posted: "Viimeisin viesti"
       last_emailed: "Viimeksi lähetetty sähköpostitse"
       last_seen: "Nähty"
@@ -1140,6 +1291,7 @@ fi:
       enable_physical_keyboard: "Ota käyttöön valmius iPadin fyysiselle näppäimistölle"
       text_size:
         title: "Tekstikoko"
+        smallest: "Pienin"
         smaller: "Pienempi"
         normal: "Normaali"
         larger: "Suurempi"
@@ -1196,58 +1348,90 @@ fi:
         after_4_minutes: "4 minuutin jälkeen"
         after_5_minutes: "5 minuutin jälkeen"
         after_10_minutes: "10 minuutin jälkeen"
-      notification_level_when_replying: "Kun kirjoitan ketjuun, aseta se "
+      notification_level_when_replying: "Kun kirjoitan ketjuun, aseta se"
       invited:
-        search: "kirjoita etsiäksesi kutsuja..."
         title: "Kutsut"
+        pending_tab: "Odottavat"
+        pending_tab_with_count: "Avoimet (%{count})"
+        expired_tab: "Vanhentuneet"
+        expired_tab_with_count: "Vanhentuneet (%{count})"
+        redeemed_tab: "Hyväksytyt"
+        redeemed_tab_with_count: "Hyväksytyt (%{count})"
+        invited_via: "Kutsu"
+        invited_via_link: "linkki %{key} (%{count} / %{max} lunastettu)"
+        groups: "Ryhmät"
+        topic: "Ketju"
+        sent: "Luotu/Viimeksi lähetetty"
+        expires_at: "Vanhenee"
+        edit: "Muokkaa"
+        remove: "Poista"
+        copy_link: "Kopioi linkki"
+        reinvite: "Lähetä uudelleen"
+        reinvited: "Kutsu lähetetty uudestaan"
+        removed: "Poistettu"
+        search: "kirjoita etsiäksesi kutsuja..."
         user: "Kutsuttu käyttäjä"
-        sent: "Lähetettiin viimeksi"
         none: "Ei kutsuja, joita näyttää."
         truncated:
           one: "Näytetään ensimmäinen kutsu."
           other: "Näytetään ensimmäiset %{count} kutsua."
         redeemed: "Hyväksytyt kutsut"
-        redeemed_tab: "Hyväksytyt"
-        redeemed_tab_with_count: "Hyväksytyt (%{count})"
         redeemed_at: "Hyväksytty"
         pending: "Odottavat kutsut"
-        pending_tab: "Odottavat"
-        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 vanhentuneet kutsut"
-        rescinded_all: "Kaikki vanhentuneet kutsut poistettu!"
-        rescind_all_confirm: "Haluatko varmasti poistaa kaikki vanhentuneet kutsut?"
-        reinvite: "Lähetä kutsu uudestaan"
+        remove_all: "Poista vanhentuneet kutsut"
+        removed_all: "Kaikki vanhentuneet kutsut poistettu!"
+        remove_all_confirm: "Haluatko varmasti poistaa kaikki vanhentuneet kutsut?"
         reinvite_all: "Lähetä kaikki kutsut uudestaan"
         reinvite_all_confirm: "Haluatko varmasti lähettää kaikki kutsut uudelleen?"
-        reinvited: "Kutsu lähetetty uudestaan"
         reinvited_all: "Kaikki kutsut lähetettiin uudestaan"
         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: "Kutsu"
+        generate_link: "Luo kutsulinkki"
+        link_generated: "Tässä kutsulinkkisi!"
         valid_for: "Kutsulinkki on käypä tälle sähköpostiosoitteelle: %{email}"
+        single_user: "Kutsu sähköpostitse"
+        multiple_user: "Kutsu linkin avulla"
         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?"
+        invite:
+          new_title: "Luo kutsulinkki"
+          edit_title: "Muokkaa kutsua"
+          instructions: "Jaa tämä linkki, jotta voit välittömästi myöntää pääsyn tälle sivustolle:"
+          copy_link: "kopioi linkki"
+          expires_in_time: "Vanhenee %{time}."
+          expired_at_time: "Vanhentunut %{time}."
+          show_advanced: "Näytä lisäasetukset"
+          hide_advanced: "Piilota lisäasetukset"
+          restrict_email: "Rajoita kutsu yhteen sähköpostiosoitteeseen"
+          max_redemptions_allowed: "Käyttökertojen enimmäismäärä:"
+          add_to_groups: "Lisää ryhmiin:"
+          invite_to_topic: "Lähetä tähän ketjuun ensimmäisellä kirjautumiskerralla:"
+          expires_at: "Vanhenee:"
+          custom_message: "Valinnainen henkilökohtainen viesti:"
+          send_invite_email: "Tallenna ja lähetä sähköposti"
+          save_invite: "Tallenna kutsu"
+          invite_saved: "Kutsu tallennettu."
+          invite_copied: "Kutsulinkki kopioitu."
+          blank_email: "Kutsulinkkiä ei kopioitu. Sähköpostiosoite vaaditaan."
         bulk_invite:
+          none: "Ei kutsuja näytettäväksi tällä sivulla."
           text: "Massakutsu"
-          success: "Tiedoston lähettäminen onnistui. Saat viestin, kun prosessi on valmis."
+          instructions: |
+            <p>Tee luettelo käyttäjistä jotta saat yhteisösi nopeaan kasvuun. Valmistele <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">CSV-tiedosto</a> joka sisältää vähintään yhden rivin, kukin sähköpostiosoite omalla rivillään. Seuraavat pilkuilla erotetut tiedot voidaan antaa, jos haluat lisätä käyttäjiä ryhmiin tai lähettää heidät tiettyyn aiheeseen ensimmäistä kertaa kirjautuessaan sisään.</p>
+            <pre>john @ smith.com, ensimmäisen ryhmän_nimi; toisen_ryhmän_nimi, ketjun_id</pre>
+            <p>Jokaiseen sähköpostiosoitteeseen CSV-tiedostossa lähetetään kutsu ja voit hallita sitä myöhemmin.</p>
+          progress: "Ladattu %{progress}%..."
+          success: "Tiedoston lähettäminen onnistui. Saat ilmoituksen viestillä, kun prosessi on valmis."
           error: "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."
       password:
         title: "Salasana"
         too_short: "Salasanasi on liian lyhyt."
@@ -1311,6 +1495,8 @@ fi:
       avatar:
         title: "Profiilikuva"
         header_title: "profiili, viestit, kirjanmerkit ja asetukset"
+        name_and_description: "%{name} - %{description}"
+        edit: "Muokkaa profiilikuvaa"
       title:
         title: "Titteli"
         none: "(ei mitään)"
@@ -1348,7 +1534,7 @@ fi:
       close: "sulje"
       dismiss_error: "Hylkää virhe"
     close: "Sulje"
-    assets_changed_confirm: "Sivustolla on tehty päivityksiä. Ladataanko uudelleen?"
+    assets_changed_confirm: "Tämä sivusto sai juuri ohjelmistopäivityksen. Hae uusin versio nyt?"
     logout: "Sinut kirjattiin ulos."
     refresh: "Lataa sivu uudelleen"
     home: "Koti"
@@ -1368,15 +1554,6 @@ fi:
       exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# virhe/tunti} other {# virhettä/tunti}}</a> ylitti sivustoasetuskynnyksen {limit, plural, one {# virhe/tunti} other {# virhettä/tunti}}."
       exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# virhe/minuutti} other {# virhettä/minuutti}}</a> ylitti sivustoasetuskynnyksen {limit, plural, one {# virhe/minuutti} other {# virhettä/minuutti}}."
     learn_more: "opi lisää..."
-    all_time: "yhteensä"
-    all_time_desc: "ketjuja aloitettu yhteensä"
-    year: "vuosi"
-    year_desc: "viimeisen 365 päivän aikana aloitetut ketjut"
-    month: "kuukausi"
-    month_desc: "viimeisen 30 päivän aikana aloitetut ketjut"
-    week: "viikko"
-    week_desc: "viimeisen 7 päivän aikana aloitetut ketjut"
-    day: "päivä"
     first_post: Ensimmäinen viesti
     mute: Vaienna
     unmute: Poista vaimennus
@@ -1389,18 +1566,20 @@ fi:
     last_reply_lowercase: edellinen vastaus
     replies_lowercase:
       one: vastaus
-      other: vastauksia
+      other: vastausta
     signup_cta:
       sign_up: "Luo tili"
       hide_session: "Muistuta huomenna"
       hide_forever: "ei kiitos"
-      hidden_for_session: "OK, kysyn huomenna uudestaan. Voit aina myös käyttää 'Kirjaudu sisään' -linkkiä luodaksesi tilin."
+      hidden_for_session: "OK, kysymme sinulta huomenna. Voit aina käyttää 'Kirjaudu sisään'-linkkiä myös tilin luomiseen."
       intro: "Hei! Vaikuttaa siltä, että olet pitänyt keskusteluista, muttet ole luonut käyttäjätiliä."
-      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:"
+      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ä. :heartpulse:"
     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:
+        one: "Ketjussa on <b>%{count}</b> vastaus."
+        other: "Ketjussa on <b>%{count}</b> vastausta."
+      description_time_MF: "Ketjussa {replyCount, plural, one {on <b>#</b> vastaus} other {on <b>#</b> vastausta}} joiden arvioitu lukuaika on <b>{readingTime, plural, one {# minuutti} other {# minuuttia}}</b>."
       enable: "Näytä ketjun tiivistelmä"
       disable: "Näytä kaikki viestit"
     deleted_filter:
@@ -1410,6 +1589,10 @@ fi:
       disable: "Näytä poistetut viestit"
     private_message_info:
       title: "Viesti"
+      invite: "Kutsu muita..."
+      edit: "Lisää tai poista..."
+      remove: "Poista..."
+      add: "Lisää..."
       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?"
@@ -1421,8 +1604,10 @@ fi:
     trust_level: "Luottamustaso"
     search_hint: "käyttäjätunnus, sähköposti tai IP-osoite"
     create_account:
+      header_title: "Tervetuloa!"
+      subheader_title: "Luodaan sinulle käyttäjätili"
       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"
+      title: "Luo tili"
       failed: "Jotain meni pieleen. Ehkäpä tämä sähköpostiosoite on jo rekisteröity, kokeile salasana unohtui -linkkiä."
     forgot_password:
       title: "Salasanan uusiminen"
@@ -1441,6 +1626,7 @@ fi:
     email_login:
       link_label: "Lähetä minulle kirjautumislinkki"
       button_label: "sähköpostilla"
+      login_link: "Ohita salasana; lähetä minulle kirjautumislinkki"
       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."
@@ -1452,11 +1638,15 @@ fi:
       logging_in_as: Kirjaudutaan käyttäjänä %{email}
       confirm_button: Kirjaudu
     login:
+      header_title: "Tervetuloa takaisin"
+      subheader_title: "Kirjaudu sisään tilillesi"
       title: "Kirjaudu"
       username: "Käyttäjä"
       password: "Salasana"
+      second_factor_title: "Kaksivaiheinen tunnistautuminen"
       second_factor_description: "Syötä sovelluksen antama todennuskoodi:"
       second_factor_backup: "Kirjaudu käyttäen varakoodia"
+      second_factor_backup_title: "Kaksivaiheisuuden varakoodit"
       second_factor_backup_description: "Syötä yksi varakoodeistasi:"
       second_factor: "Kirjaudu todentajasovelluksella"
       security_key_description: "Kun fyysinen tunnistautumislaite on kätesi ulottuvilla, klikkaa alla olevaa \"Tunnistaudu tunnistautumislaitteella\" -painiketta."
@@ -1465,7 +1655,7 @@ fi:
       security_key_not_allowed_error: "Tunnistaumislaitteella tunnistautumisprosessi joko vanheni tai peruutettiin."
       security_key_no_matching_credential_error: "Tunnistautumislaitteelta ei löytynyt kelpaavia pääsytietoja."
       security_key_support_missing_error: "Tämä laitteesi tai selaimesi ei tue tunnistaumislaitteita. Käytä muuta tapaa."
-      email_placeholder: "sähköposti tai käyttäjätunnus"
+      email_placeholder: "Sähköposti / Käyttäjätunnus"
       caps_lock_warning: "Caps Lock on päällä"
       error: "Tuntematon virhe"
       cookies_error: "Vaikuttaa siltä, että selaimessasi ei ole evästeet käytössä. Et ehkä pysty kirjautumaan sisään ottamatta niitä käyttöön ensin."
@@ -1480,8 +1670,10 @@ fi:
       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: "Tämä palsta on valitettavasti 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_allowed_from_ip_address: "Tästä IP-osoitteesta ei voi kirjautua."
       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."
+      omniauth_disallow_totp: "Käyttäjätililläsi on kaksivaiheinen tunnistautuminen käytössä. Kirjaudu salasanallasi."
       resend_title: "Lähetä aktivointisähköposti uudelleen"
       change_email: "Vaihda sähköpostiosoitetta"
       provide_new_email: "Anna uusi osoite niin lähetämme sinulle vahvistamissähköpostin."
@@ -1522,6 +1714,7 @@ fi:
       accept_invite: "Hyväksy kutsu"
       success: "Tili luotiin, ja olet nyt kirjautunut sisään."
       name_label: "Nimi"
+      password_label: "Salasana"
       optional_description: "(ei pakollinen)"
     password_reset:
       continue: "Jatka sivustolle %{site_name}"
@@ -1529,7 +1722,6 @@ fi:
       apple_international: "Apple/Kansainvälinen"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (aiemmin EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1537,7 +1729,7 @@ fi:
       categories_only: "Vain alueet"
       categories_with_featured_topics: "Alueet ja esiteltyjä ketjuja"
       categories_and_latest_topics: "Alueet ja tuoreimmat ketjut"
-      categories_and_top_topics: "Alueet ja kuumia ketjuja"
+      categories_and_top_topics: "Alueet ja suosittuja ketjuja"
       categories_boxes: "Laatikot, joissa tytäralueet"
       categories_boxes_with_topics: "Laatikot, joissa esiteltyjä ketjuja"
     shortcut_modifier_key:
@@ -1547,7 +1739,19 @@ fi:
       enter: "Enter"
     conditional_loading_section:
       loading: Ladataan...
+    category_row:
+      topic_count:
+        one: "%{count} ketju tällä alueella"
+        other: "%{count} ketjua tällä alueella"
+      plus_subcategories_title:
+        one: "%{name} ja yksi tytäralue"
+        other: "%{name} ja %{count} tytäraluetta"
+      plus_subcategories:
+        one: "+ %{count} tytäralue"
+        other: "+ %{count} tytäraluetta"
     select_kit:
+      filter_by: "Suodata: %{name}"
+      select_to_filter: "Valitse suodatettava arvo"
       default_header_text: Valitse...
       no_content: Ei osumia
       filter_placeholder: Hae...
@@ -1559,11 +1763,17 @@ fi:
       min_content_not_reached:
         one: "Valitse ainakin %{count} kohde."
         other: "Valitse ainakin %{count} kohdetta."
+      invalid_selection_length:
+        one: "Täytyy valita ainakin %{count} merkki."
+        other: "Täytyy valita ainakin %{count} merkkiä."
+      components:
+        tag_drop:
+          filter_for_more: Näytä lisää...
+        categories_admin_dropdown:
+          title: "Hallinnoi alueita"
     date_time_picker:
       from: Mistä
       to: Vastaanottaja
-      errors:
-        to_before_from: "Päättymispäivän on oltava myöhempi kuin alkamispäivän."
     emoji_picker:
       filter_placeholder: Etsi emojia
       smileys_&_emotion: Hymiöt ja tunteet
@@ -1585,7 +1795,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 voivat julkaista jaettuja luonnoksia."
       destination_category: "Kohdealue"
       publish: "Julkaise jaettu luonnos"
       confirm_publish: "Haluatko varmasti julkaista luonnoksen?"
@@ -1596,7 +1806,6 @@ fi:
       options: "Asetukset"
       whisper: "kuiskaus"
       unlist: "listaamaton"
-      blockquote_text: "Sitaatti"
       add_warning: "Tämä on virallinen varoitus."
       toggle_whisper: "Vaihda kuiskaus"
       toggle_unlisted: "Listauksissa näkyminen"
@@ -1605,6 +1814,9 @@ fi:
       similar_topics: "Tämä ketju vaikuttaa samalta kuin.."
       drafts_offline: "offline luonnokset"
       edit_conflict: "muokkauskonflikti"
+      group_mentioned_limit:
+        one: "<b>Varoitus!</b> Olet maininnut <a href='%{group_link}'>%{group}</a>, mutta ryhmässä on yli %{count} käyttäjä, mikä on ylläpitäjän asettama rajoitus maininnoille. Kukaan ei saa ilmoitusta."
+        other: "<b>Varoitus!</b> Olet maininnut <a href='%{group_link}'>%{group}</a>, mutta ryhmässä on yli %{count} käyttäjää, mikä on ylläpitäjän asettama rajoitus maininnoille. Kukaan ei saa ilmoitusta."
       group_mentioned:
         one: "Jos mainitset ryhmän %{group}, <a href='%{group_link}'>%{count} käyttäjä</a> saa ilmoituksen – oletko varma?"
         other: "Jos mainitset ryhmän %{group}, <a href='%{group_link}'>%{count} käyttäjää</a> saa ilmoituksen – oletko varma?"
@@ -1615,13 +1827,22 @@ fi:
       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:
+          one: "Otsikon täytyy olla vähintään %{count} merkin pituinen"
+          other: "Otsikon täytyy olla vähintään %{count} merkkiä pitkä"
+        title_too_long:
+          one: "Otsikossa saa olla enintään %{count} merkki"
+          other: "Otsikossa saa olla enintään %{count} merkkiä"
         post_missing: "Viesti ei voi olla tyhjä"
-        post_length: "Viestissä täytyy olla vähintään %{min} merkkiä"
+        post_length:
+          one: "Viestin on oltava vähintään %{count} merkin pituinen"
+          other: "Viestin on oltava vähintään %{count} merkkiä pitkä"
         try_like: "Oletko kokeillut %{heart}-nappia?"
         category_missing: "Sinun täytyy valita viestille alue"
-        topic_template_not_modified: "Lisää tietoa ketjunaloitukseesi muokkaamalla ketjusapluunaa."
+        tags_missing:
+          one: "On valittava ainakin %{count} tunniste"
+          other: "On valittava ainakin %{count} tunnistetta"
+        topic_template_not_modified: "Lisää ketjuun tietoja ja yksityiskohtia muokkaamalla mallipohjaa."
       save_edit: "Tallenna"
       overwrite_edit: "Päällekirjoita"
       reply_original: "Vastaa alkuperäiseen ketjuun"
@@ -1629,7 +1850,7 @@ fi:
       reply: "Vastaa"
       cancel: "Peruuta"
       create_topic: "Aloita ketju"
-      create_pm: "Viesti"
+      create_pm: "Lähetä"
       create_whisper: "Kuiskaa"
       create_shared_draft: "Luo jaettu luonnos"
       edit_shared_draft: "Muokkaa jaettua luonnosta"
@@ -1648,8 +1869,8 @@ fi:
       saved: "Tallennettu!"
       saved_draft: "Viestiluonnos kesken. Jatka klikkaamalla."
       uploading: "Lähettää..."
-      show_preview: "näytä esikatselu &raquo;"
-      hide_preview: "&laquo; piilota esikatselu"
+      show_preview: "näytä esikatselu"
+      hide_preview: "piilota esikatselu"
       quote_post_title: "Lainaa koko viesti"
       bold_label: "B"
       bold_title: "Lihavoitu"
@@ -1662,8 +1883,8 @@ fi:
       link_dialog_title: "Lisää linkki"
       link_optional_text: "ei-pakollinen kuvaus"
       link_url_placeholder: "Liitä URL tai etsi ketjua kirjoittamalla"
-      quote_title: "Lainaus"
-      quote_text: "Lainaus"
+      blockquote_title: "Lainaus"
+      blockquote_text: "Sitaatti"
       code_title: "Teksti ilman muotoiluja"
       code_text: "Sisennä teksti neljällä välilyönnillä poistaaksesi automaattisen muotoilun"
       paste_code_text: "kirjoita tai liitä koodia tähän"
@@ -1679,23 +1900,31 @@ fi:
       abandon: "sulje kirjoitusalue ja poista luonnos"
       enter_fullscreen: "siirry koko ruudun kirjoitustilaan"
       exit_fullscreen: "poistu koko ruudun kirjoitustilasta"
+      show_toolbar: "näytä viestikentän työkalurivi"
+      hide_toolbar: "piilota viestikentän työkalurivi"
       modal_ok: "OK"
       modal_cancel: "Peruuta"
       cant_send_pm: "Et voi valitettavasti lähettää viestiä käyttäjälle %{username}."
       yourself_confirm:
         title: "Unohditko lisätä vastaanottajia?"
         body: "Olet lähettämässä viestiä vain itsellesi!"
+      slow_mode:
+        error: "Tämä aihe on hitaassa tilassa. Lähetit viestin äskettäin; voit lähettää uuden %{timeLeft} kuluttua."
       admin_options_title: "Tämän ketjun vain henkilökunnalle näytettävät asetukset"
       composer_actions:
         reply: Vastaa
         draft: Luonnos
         edit: Muokkaa
         reply_to_post:
+          label: Vastaa käytäjän %{postUsername} viestiin
           desc: Vastaa tiettyyn viestiin
         reply_as_new_topic:
           label: Vastaa sivuavassa ketjussa
           desc: Aloita uusi, tähän ketjuun linkittyvä ketju
           confirm: Tallennettuna on yksi sinun ketjunaloitusluonnos, joka poistetaan, jos vastaat uudessa ketjussa.
+        reply_as_new_group_message:
+          label: Vastaa uudessa ryhmäyksityiskeskustelussa
+          desc: Luo uusi yksityiskeskustelu, jossa samat vastaanottajat
         reply_as_private_message:
           label: Uusi viesti
           desc: Aloita uusi yksityiskeskustelu
@@ -1709,18 +1938,20 @@ fi:
           label: "Uusi ketju"
         shared_draft:
           label: "Jaettu luonnos"
-          desc: "Luonnostele ketju, joka näkyy vain henkilökunnalle"
+          desc: "Luonnostele ketju, joka näkyy vain määrätyille käyttäjille"
         toggle_topic_bump:
           label: "Ketjun nosto päälle/pois"
           desc: "Vastaa muuttamatta ketjun viimeisin viesti -aikaleimaa"
+      reload: "Lataa uudelleen"
+      ignore: "Ohita"
     notifications:
       tooltip:
         regular:
-          one: "Uusi ilmoitus"
+          one: "%{count} uusi ilmoitus"
           other: "%{count} uutta ilmoitusta"
         message:
-          one: "Uusi yksityisviesti"
-          other: "%{count} uutta yksityisviestiä"
+          one: "%{count} lukematon viesti"
+          other: "%{count} lukematonta viestiä"
         high_priority:
           one: "%{count} korkean prioriteetin ilmoitus"
           other: "%{count} lukematonta korkean prioriteetin ilmoitusta"
@@ -1737,6 +1968,10 @@ fi:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} ja %{count} muu</span> %{description}"
+        other: "<span class='multi-user'>%{username}, %{username2} ja %{count} muuta</span> %{description}"
       liked_consolidated_description:
         one: "tykkäsi %{count} viestistäsi"
         other: "tykkäsi %{count} viestistäsi"
@@ -1751,6 +1986,12 @@ fi:
       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:
+        one: "%{count} avoin jäsenhakemus ryhmään '%{group_name}'"
+        other: "%{count} avointa jäsenhakemusta ryhmään '%{group_name}'"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
+      votes_released: "%{description} - valmis"
       group_message_summary:
         one: "%{count} viesti ryhmän %{group_name} saapuneissa"
         other: "%{count} viestiä ryhmän %{group_name} saapuneissa"
@@ -1789,20 +2030,23 @@ fi:
         liked_consolidated: "uusia tykkäyksiä"
         post_approved: "viesti hyväksytty"
         membership_request_consolidated: "uusia jäsenhakemuksia"
+        reaction: "uusi reaktio"
+        votes_released: "Ääni vapautui"
     upload_selector:
       title: "Lisää kuva"
       title_with_attachments: "Lisää kuva tai tiedosto"
       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"
       local_tip: "valitse kuvia laitteeltasi"
-      local_tip_with_attachments: "valitse kuvia tai tiedostoja laitteeltasi %{authorized_extensions}"
-      hint: "(voit myös raahata ne editoriin ladataksesi ne sivustolle)"
+      local_tip_with_attachments: "valitse kuvia tai tiedostoja laitteestasi"
+      hint: "(voit myös vetää ja pudottaa editoriin lataamista varten)"
       hint_for_supported_browsers: "voit myös raahata tai liittää kuvia editoriin"
       uploading: "Lähettää"
       select_file: "Valitse tiedosto"
       default_image_alt_text: kuva
+      supported_formats: "tuetut tiedostomuodot"
     search:
       sort_by: "Järjestä"
       relevance: "Osuvuus"
@@ -1828,6 +2072,7 @@ fi:
       or_search_google: "Tai kokeile Google-hakua:"
       search_google: "Kokeile Google-hakua:"
       search_google_button: "Google"
+      search_button: "Hae"
       context:
         user: "Etsi @%{username} viestejä"
         category: "Etsi alueelta #%{category}"
@@ -1872,16 +2117,28 @@ fi:
           noreplies: ei ole vastattu
           single_user: on kirjoittanut vain yksi käyttäjä
         post:
+          count:
+            label: Viestejä
+          min:
+            placeholder: vähintään
+          max:
+            placeholder: enintään
           time:
             label: Kirjoitettu
             before: ennen
             after: jälkeen
+        views:
+          label: Katseluita
+        min_views:
+          placeholder: vähintään
+        max_views:
+          placeholder: enintään
     hamburger_menu: "vaihda ketjulistausta tai siirry toiselle alueelle"
     new_item: "uusi"
     go_back: "mene takaisin"
     not_logged_in_user: "käyttäjäsivu, jossa on tiivistelmä käyttäjän viimeaikaisesta toiminnasta sekä käyttäjäasetukset"
     current_user: "siirry omalle käyttäjäsivullesi"
-    view_all: "katso kaikki"
+    view_all: "näytä kaikki %{tab}"
     topics:
       new_messages_marker: "edellinen vierailu"
       bulk:
@@ -1891,37 +2148,46 @@ fi:
         relist_topics: "Palauta ketjuja listauksiin"
         reset_read: "Palauta lukutila"
         delete: "Poista ketjut"
-        dismiss: "Unohda"
-        dismiss_read: "Unohda lukemattomat"
-        dismiss_button: "Unohda..."
-        dismiss_tooltip: "Unohda uudet viestit tai lopeta ketjujen seuraaminen"
+        dismiss: "Kuittaa"
+        dismiss_read: "Kuittaa luetuiksi"
+        dismiss_button: "Kuittaa..."
+        dismiss_tooltip: "Kuittaa uudet viestit luetuiksi tai lopeta ketjujen seuraaminen"
         also_dismiss_topics: "Älä seuraa näitä ketjuja enää - ne eivät jatkossa näy Lukematta-välilehdellä"
-        dismiss_new: "Unohda uudet"
+        dismiss_new: "Kuittaa luetuksi"
         toggle: "Vaihda useamman ketjun valintaa"
         actions: "Massatoiminnot"
         change_category: "Määritä alue"
         close_topics: "Sulje ketjut"
         archive_topics: "Arkistoi ketjut"
+        move_messages_to_inbox: "Siirry Saapuneet-kansioon"
         notification_level: "Ilmoitukset"
+        change_notification_level: "Muuta ilmoitustasoa"
         choose_new_category: "Valitse uusi alue ketjuille:"
         selected:
-          one: "Olet valinnut <b>yhden</b> ketjun."
+          one: "Olet valinnut <b>%{count}</b> ketjun."
           other: "Olet valinnut <b>%{count}</b> ketjua."
         change_tags: "Korvaa tunnisteet"
         append_tags: "Lisää tunnisteita"
         choose_new_tags: "Valitse tunnisteet näille ketjuille:"
         choose_append_tags: "Valitse ketjuille lisättävät uudet tunnisteet:"
         changed_tags: "Ketjujen tunnisteet muutettiin."
-        remove_tags: "Poista tunnisteita"
+        remove_tags: "Poista kaikki tunnisteet"
+        confirm_remove_tags:
+          one: "Kaikki tunnisteet poistetaan tästä aiheesta. Oletko varma?"
+          other: "Kaikki tunnisteet poistetaan <b>%{count}</b> aiheesta. Oletko varma?"
+        progress:
+          one: "Edetty: <strong>%{count}</strong> ketju"
+          other: "Edetty: <strong>%{count}</strong> ketjua"
       none:
         unread: "Sinulla ei ole ketjuja lukematta."
         new: "Sinulla ei ole uusia ketjuja."
         read: "Et ole lukenut vielä yhtään yhtään ketjua."
         posted: "Et ole kirjoittanut vielä yhteenkään ketjuun."
+        ready_to_create: "Valmis "
         latest: "Olet ajan tasalla!"
         bookmarks: "Et ole vielä merkinnyt kirjanmerkkejä."
         category: "Alueella %{category} ei ole ketjua."
-        top: "Kuumia ketjuja ei ole."
+        top: "Suosittuja ketjuja ei ole."
         educate:
           new: '<p>Sinulle uudet ketjut näytetään tässä. Oletuksena, ketju tulkitaan uudeksi ja sen yhteydessä näytetään <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></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>'
           unread: '<p>Lukemattomia viestejä sisältävät ketjut näytetään tässä.</p><p>Ketjun yhteydessä näytetään lukemattomien viestien lukumäärä <span class="badge new-posts badge-notification">1</span>, jos olet:</p><ul><li>aloittanut ketjun</li><li>vastannut ketjuun</li><li>lukenut ketjua pidempään, kuin 4 minuuttia</li></ul><p>tai, jos olet erikseen merkannut ketjun seurattavaksi tai tarkkailtavaksi ketjun lopusta löytyvästä painikkeesta.</p><p>Voit muuttaa tätä <a href="%{userPrefsUrl}">käyttäjäasetuksistasi</a>.</p>'
@@ -1933,7 +2199,7 @@ fi:
         unread: "Ketjuja ei ole enempää lukematta."
         category: "Alueen %{category} ketjuja ei ole enempää."
         tag: "Tunnisteella %{tag} merkittyjä ketjuja ei ole enempää."
-        top: "Kuumia ketjuja ei ole enempää."
+        top: "Suosittuja ketjuja ei ole enempää."
         bookmarks: "Merkattuja ketjuja ei ole enempää."
     topic:
       filter_to:
@@ -1986,13 +2252,13 @@ fi:
         one: "sinulla on %{count} lukematon 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"
+        one: "sinulla on %{count} vanha viesti lukematta tässä ketjussa"
+        other: "sinulla on %{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"
+        one: "ketjuun on tullut %{count} uusi viesti edellisen lukukerran jälkeen"
+        other: "ketjuun on tullut %{count} uutta viestiä edellisen lukukerran jälkeen"
       likes:
-        one: "tässä ketjussa on yksi tykkäys"
+        one: "tässä ketjussa on %{count} tykkäys"
         other: "tässä ketjussa on %{count} tykkäystä"
       back_to_list: "Takaisin ketjulistaan"
       options: "Ketjun asetukset"
@@ -2012,16 +2278,25 @@ fi:
       deleted: "Tämä ketju on poistettu"
       slow_mode_update:
         title: "Hidas tila"
+        select: "Käyttäjän tulee odottaa ennen toisen viestin lähettämistä:"
+        description: "Jotta keskustelu kiivaasti etenevästä tai tulenarasta aiheesta olisi harkitumpaa, viestin lähettänyt käyttäjä voi lähettää toisen viestin aikaisintaan %{duration} päästä."
+        save: "Ota käyttöön"
+        enabled_until: "Aktiivisena tähän asti:"
         remove: "Poista käytöstä"
         hours: "Tuntia:"
         minutes: "Minuuttia:"
         seconds: "Sekuntia:"
         durations:
+          10_minutes: "10 minuuttia"
           15_minutes: "15 minuuttia"
+          30_minutes: "30 minuuttia"
+          45_minutes: "45 minuuttia"
           1_hour: "1 tunti"
+          2_hours: "2 tuntia"
           4_hours: "4 tuntia"
-          1_day: "1 päivä"
-          1_week: "1 viikko"
+          8_hours: "8 tuntia"
+          12_hours: "12 tuntia"
+          24_hours: "24 tuntia"
           custom: "Valitse kesto"
       slow_mode_notice:
         duration: "Tässä ketjussa on odotettava %{duration} viestien välillä."
@@ -2033,7 +2308,9 @@ fi:
         remove: "Poista ajastin"
         publish_to: "Mihin julkaistaan:"
         when: "Milloin:"
-        time_frame_required: Valitse ajanjakso
+        time_frame_required: "Valitse ajanjakso"
+        min_duration: "Keston on oltava suurempi kuin 0"
+        max_duration: "Keston on oltava alle 20 vuotta"
       auto_update_input:
         none: "Valitse ajanjakso"
         now: "Nyt"
@@ -2042,7 +2319,7 @@ fi:
         later_this_week: "Myöhemmin tällä viikolla"
         this_weekend: "Viikonloppuna"
         next_week: "Ensi viikolla"
-        two_weeks: "Kahden viikon kuluttua"
+        two_weeks: "Kaksi viikkoa"
         next_month: "Ensi kuussa"
         two_months: "Kaksi kuukautta"
         three_months: "Kolme kuukautta"
@@ -2062,9 +2339,11 @@ fi:
         title: "Sulje väliaikaisesti"
       auto_close:
         title: "Sulje ketju automaattisesti"
-        label: "Tunteja automaattiseen sulkeutumiseen:"
+        label: "Sulje ketjut automaattisesti kun on kulunut:"
         error: "Arvo ei kelpaa."
         based_on_last_post: "Älä sulje ennen kuin viimeisin viesti ketjussa on ainakin näin vanha."
+      auto_close_after_last_post:
+        title: "Sulje ketju automaattisesti viimeisen viestin jälkeen"
       auto_delete:
         title: "Poista ketju ajastetusti"
       auto_bump:
@@ -2077,7 +2356,7 @@ fi:
         auto_open: "Ketju avautuu automaattisesti %{timeLeft}."
         auto_close: "Ketju suljetaan ajastetusti %{timeLeft}."
         auto_publish_to_category: "Ketju julkaistaan alueella <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Ketju sulkeutuu %{duration} kuluttua viimeisimmästä viestistä."
+        auto_close_after_last_post: "Ketju sulkeutuu %{duration} kuluttua viimeisimmästä viestistä."
         auto_delete: "Ketju poistetaan ajastetusti %{timeLeft}."
         auto_bump: "Ketjua nostetaan ajastetusti %{timeLeft}."
         auto_reminder: "Sinua muistutetaan tästä ketjusta %{timeLeft}."
@@ -2085,7 +2364,10 @@ fi:
       auto_close_title: "Automaattisen sulkemisen asetukset"
       auto_close_immediate:
         one: "Ketjun viimeisin viesti on jo tunnin vanha, joten ketju suljetaan heti."
-        other: "Ketjun viimeisin viesti on jo %{hours} tuntia vanha, joten ketju suljetaan heti."
+        other: "Ketjun viimeisin viesti on jo %{count} tuntia vanha, joten ketju suljetaan heti."
+      auto_close_momentarily:
+        one: "Ketjun viimeisin viesti on jo %{count} tunnin vanha, joten ketju suljetaan hetkellisesti."
+        other: "Ketjun viimeisin viesti on jo %{count} tuntia vanha, joten ketju suljetaan hetkellisesti."
       timeline:
         back: "Takaisin"
         back_description: "Siirry takaisin ensimmäiseen lukemattomaan viestiin"
@@ -2097,7 +2379,9 @@ fi:
         go: "siirry"
         jump_bottom: "hyppää viimeisimpään viestiin"
         jump_prompt: "hyppää..."
-        jump_prompt_of: "%{count} viestistä"
+        jump_prompt_of:
+          one: "%{count} viestistä"
+          other: "%{count} viestistä"
         jump_prompt_long: "Hyppää..."
         jump_bottom_with_number: "hyppää viestiin %{post_number}"
         jump_prompt_to_date: "päivämäärään"
@@ -2109,12 +2393,15 @@ fi:
         reasons:
           mailing_list_mode: "Olet postituslistatilassa, joten saat sähköpostia tähän ketjuun lähetyistä vastauksista."
           "3_10": "Saat ilmoituksia, koska tarkkailet tähän ketjuun liittyvää tunnistetta."
+          "3_10_stale": "Saat ilmoituksia, koska olet tarkkaillut tähän ketjuun liittyvää tunnistetta aikaisemmin."
           "3_6": "Saat ilmoituksia, koska olet asettanut tämän alueen tarkkailuun."
+          "3_6_stale": "Saat ilmoituksia, koska olet tarkkaillut tätä aluetta aikaisemmin."
           "3_5": "Saat ilmoituksia, koska ketju on asetettu tarkkailuun automaattisesti."
           "3_2": "Saat ilmoituksia, koska olet asettanut ketjun tarkkailuun."
           "3_1": "Saat ilmoituksia, koska aloitit tämän ketjun."
           "3": "Saat ilmoituksia, koska olet asettanut ketjun tarkkailuun."
           "2_8": "Näet uusien vastausten määrän, koska olet asettanut tämän alueen seurantaan."
+          "2_8_stale": "Näet uusien vastauksien määrän, koska olet seurannut tätä aluetta aikaisemmin."
           "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 tätä ketjua</a>.'
@@ -2182,6 +2469,15 @@ fi:
         title: "Jaa"
         extended_title: "Jaa linkki"
         help: "jaa linkki tähän ketjuun"
+        instructions: "Jaa linkki tähän ketjuun:"
+        copied: "Ketjun linkki kopioitu."
+        notify_users:
+          title: "Ilmoita"
+          instructions: "Ilmoita seuraaville käyttäjille tästä ketjusta:"
+          success:
+            one: "Tästä ketjusta ilmoitettiin onnistuneesti käyttäjälle %{username}."
+            other: "Tästä ketjusta ilmoitettiin onnistuneesti kaikille käyttäjille."
+        invite_users: "Kutsu"
       print:
         title: "Tulosta"
         help: "Avaa tulostettava versio tästä ketjusta"
@@ -2237,14 +2533,14 @@ fi:
         username_placeholder: "käyttäjätunnus"
         action: "Lähetä kutsu"
         help: "Kutsu muita tähän ketjuun sähköpostin tai palstan ilmoitusten kautta"
-        to_forum: "Lähetämme lyhyen sähköpostin jonka avulla ystäväsi voi liittyä klikkaamalla linkkiä, sisäänkirjautumista ei tarvita."
-        sso_enabled: "Syötä henkilön käyttäjätunnus, jonka haluaisit kutsua tähän ketjuun."
+        to_forum: "Lähetämme lyhyen sähköpostin jonka avulla ystäväsi voi liittyä napsauttamalla linkkiä."
+        discourse_connect_enabled: "Syötä henkilön käyttäjätunnus, jonka haluaisit kutsua tähän ketjuun."
         to_topic_blank: "Syötä henkilön käyttäjätunnus tai sähköpostiosoite, jonka haluaisit kutsua tähän ketjuun."
         to_topic_email: "Syötit sähköpostiosoitteen. Lähetämme ystävällesi sähköpostin, jonka avulla hän voi heti vastata tähän ketjuun."
         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>%{invitee}</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: "Emme valitettavasti 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."
@@ -2347,18 +2643,19 @@ fi:
         select_all: valitse kaikki
         deselect_all: poista kaikkien valinta
         description:
-          one: Olet valinnut <b>yhden</b> viestin.
+          one: Olet valinnut <b>%{count}</b> viestin.
           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:"
+      quote_share: "Jaa"
+      edit_reason: "Syy: "
       post_number: "viesti %{number}"
       ignored: "Sivuutettua sisältöä"
-      wiki_last_edited_on: "wikiä muokattiin viimeksi"
-      last_edited_on: "viestin viimeisin muokkausaika"
+      wiki_last_edited_on: "wikiä muokattu viimeksi %{dateTime}"
+      last_edited_on: "viestiä muokattu viimeksi %{dateTime}"
       reply_as_new_topic: "Vastaa aihetta sivuavassa ketjussa"
       reply_as_new_private_message: "Vastaa samoille vastaanottajille uudessa yksityisviestiketjussa"
       continue_discussion: "Jatkoa ketjulle %{postLink}:"
@@ -2381,33 +2678,41 @@ fi:
       has_replies:
         one: "%{count} vastaus"
         other: "%{count} vastausta"
+      has_replies_count: "%{count}"
+      unknown_user: "(tuntematon / poistettu käyttäjä)"
       has_likes_title:
         one: "%{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ä"
+        one: "Sinä ja %{count} muuta tykkäsi tästä viestistä"
         other: "Sinä ja %{count} muuta tykkäsi tästä viestistä"
+      filtered_replies_hint:
+        one: "Näytä tämä viesti ja siihen liittyvä vastaus"
+        other: "Näytä tämä viesti ja %{count} siihen liittyvää vastausta"
+      filtered_replies_viewing:
+        one: "Katsellaan %{count} vastausta"
+        other: "Katsellaan %{count} vastausta"
+      in_reply_to: "Lataa emoviesti"
+      view_all_posts: "Näytä kaikki viestit"
       errors:
         create: "Viestin luonti valitettavasti epäonnistui. Ole hyvä ja yritä uudelleen."
         edit: "Viestin muokkaus valitettavasti epäonnistui. Ole hyvä ja yritä uudelleen."
         upload: "Tiedoston lähetys valitettavasti epäonnistui. Ole hyvä ja yritä uudelleen."
         file_too_large: "Tiedosto on valitettavasti liian suuri (enimmäiskoko on %{max_size_kb}kb). Mitäpä jos lataisit suuren tiedostosi johonkin pilvipalveluun ja sitten jakaisit linkin?"
         too_many_uploads: "Voit valitettavasti ladata vain yhden tiedoston kerrallaan."
+        too_many_dragged_and_dropped_files:
+          one: "Pahoittelut, voit ladata vain %{count} tiedostoa kerrallaan."
+          other: "Pahoittelut, voit ladata vain %{count} tiedostoa kerrallaan."
         upload_not_authorized: "Tiedosto jota yrität ladata ei valitettavasti ole sallittu (sallitut laajennukset: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Uudet käyttäjät eivät valitettavasti saa ladata kuvia."
         attachment_upload_not_allowed_for_new_user: "Uudet käyttäjät valitettavasti eivät saa ladata liitteitä."
         attachment_download_requires_login: "Sinun täytyy valitettavasti kirjautua sisään, jotta voit ladata liitetiedostoja itsellesi."
-      abandon_edit:
-        confirm: "Haluatko varmasti hylätä tekemäsi muutokset?"
-        no_value: "Ei, säilytän"
-        no_save_draft: "Ei, tallenna luonnos"
-        yes_value: "Kyllä, hylkää muokkaus"
-      abandon:
-        confirm: "Oletko varma, että haluat hylätä viestisi?"
-        no_value: "Ei, säilytä"
-        no_save_draft: "Ei, tallenna luonnos"
-        yes_value: "Kyllä, hylkää"
+      cancel_composer:
+        confirm: "Mitä haluaisit tehdä viestillesi?"
+        discard: "Hylkää"
+        save_draft: "Tallenna luonnos"
+        keep_editing: "Jatka muokkaamista"
       via_email: "tämä viesti lähetettiin sähköpostitse"
       via_auto_generated_email: "tämä viesti saapui automaattisesti generoituna sähköpostina"
       whisper: "tämä viesti on yksityinen kuiskaus valvojille"
@@ -2433,10 +2738,10 @@ fi:
         delete_replies:
           confirm: "Haluatko poistaa myös tähän viestiin liittyvät vastaukset?"
           direct_replies:
-            one: "Kyllä, ja yksi suora vastaus"
+            one: "Kyllä, ja %{count} suora vastaus"
             other: "Kyllä, ja %{count} suoraa vastausta"
           all_replies:
-            one: "Kyllä, ja yksi vastaus"
+            one: "Kyllä, ja %{count} vastaus"
             other: "Kyllä, ja kaikki %{count} vastausta"
           just_the_post: "Ei, vain tämä viesti"
         admin: "viestin ylläpitotoimet"
@@ -2455,9 +2760,18 @@ fi:
         unlock_post_description: "salli kirjoittajan muokata viestiä"
         delete_topic_disallowed_modal: "Et saa poistaa tätä ketjua. Jos haluat sen poistetuksi, liputa se perustelujen kera, ja valvoja päättää poistamisesta."
         delete_topic_disallowed: "et saa poistaa ketjua"
+        delete_topic_confirm_modal:
+          one: "Ketjua on katseltu yli %{count} kertaa ja se voi olla suosittu hakutulos. Haluatko varmasti poistaa ketjun kokonaan sen sijaan, että muokkaisit sitä paremmaksi?"
+          other: "Ketjua on katseltu yli %{count} kertaa ja se voi olla suosittu hakutulos. Haluatko varmasti poistaa ketjun kokonaan sen sijaan, että muokkaisit sitä paremmaksi?"
+        delete_topic_confirm_modal_yes: "Kyllä, poista ketju"
+        delete_topic_confirm_modal_no: "Ei, säilytä ketju"
+        delete_topic_error: "Ketjua poistettaessa tapahtui virhe"
         delete_topic: "poista ketju"
         add_post_notice: "Lisää henkilökuntanootti"
+        change_post_notice: "Muuta henkilökuntanoottia"
+        delete_post_notice: "Poista henkilökuntanootti"
         remove_timer: "poista ajastin"
+        edit_timer: "muokkaa ajastusta"
       actions:
         people:
           like:
@@ -2534,6 +2848,18 @@ fi:
           edit_bookmark:
             name: "Muokkaa kirjanmerkkiä"
             description: "Muokkaa kirjanmerkin nimeä tai säädä muistutuksen päivämäärää ja kellonaikaa"
+          pin_bookmark:
+            name: "Kiinnitä kirjanmerkki"
+            description: "Kiinnitä kirjanmerkki. Näin se näkyy kirjanmerkkiluettelon yläreunassa."
+          unpin_bookmark:
+            name: "Poista kirjanmerkki"
+            description: "Poista kirjanmerkki. Se ei enää näy kirjanmerkkiluettelon yläosassa."
+      filtered_replies:
+        viewing_posts_by: "Katsellaan %{post_count} viestiä käyttäjältä"
+        viewing_subset: "Jotkut vastaukset eivät ole näkyvillä"
+        viewing_summary: "Katsellaan ketjutiivistelmää"
+        post_number: "%{username}, viesti #%{post_number}"
+        show_all: "Näytä kaikki"
     category:
       can: "voivat&hellip; "
       none: "(ei aluetta)"
@@ -2542,15 +2868,17 @@ fi:
       edit: "Muokkaa"
       edit_dialog_title: "Muokkaa: %{categoryName}"
       view: "Katsele alueen ketjuja"
+      back: "Takaisin alueelle"
       general: "Yleistä"
       settings: "Asetukset"
-      topic_template: "Ketjun sapluuna"
+      topic_template: "Ketjun mallipohja"
       tags: "Tunnisteet"
       tags_allowed_tags: "Rajaa nämä tunnisteet tälle alueelle:"
       tags_allowed_tag_groups: "Rajaa nämä tunnisteryhmät tälle alueelle:"
       tags_placeholder: "(Ei-pakollinen) lista sallituista tunnisteista"
       tags_tab_description: "Yllä määritellyt tunnisteet ja tunnisteryhmät ovat käytössä vain tällä alueella sekä muilla alueilla, jotka samalla tapaa ovat ne määritelleet. Muilla alueilla ne eivät ole käytettävissä."
       tag_groups_placeholder: "(Ei-pakollinen) lista sallituista tunnisteryhmistä"
+      manage_tag_groups_link: "Hallinnoi tunnisteryhmiä"
       allow_global_tags_label: "Salli myös muut tunnisteet"
       tag_group_selector_placeholder: "(Ei-pakollinen) tunnisteryhmä"
       required_tag_group_description: "Edellytä, että uudella ketjulla on tunnisteita tunnisteryhmästä:"
@@ -2582,7 +2910,18 @@ fi:
       change_in_category_topic: "Muokkaa kuvausta"
       already_used: "Tämä väri on jo käytössä toisella alueella"
       security: "Turvallisuus"
-      special_warning: "Varoitus: Tämä on valmiiksi luotu alue, ja sen turvallisuusasetuksia ei voi muuttaa. Jos et näe käyttöä alueelle, älä muuta sen tarkoitusta vaan poista se."
+      security_add_group: "Lisää ryhmä"
+      permissions:
+        group: "Ryhmä"
+        see: "Katselu"
+        reply: "Vastaus"
+        create: "Aloitus"
+        no_groups_selected: "Millekään ryhmällä ei ole myönnetty pääsyä; alue näkyy vain henkilökunnalle."
+        everyone_has_access: 'Tämä alue on julkinen: kaikki voivat lukea, vastata ja aloittaa ketjuja. Voit rajoittaa oikeuksia poistamalla yhden tai useamman ryhmällä "kaikki" annetuista oikeuksista.'
+        toggle_reply: "Muuta vastausoikeutta"
+        toggle_full: "Muuta aloitusoikeutta"
+        inherited: 'Tämä oikeus periytyy ryhmältä "kaikki"'
+      special_warning: "Varoitus: Tämä on asennusvaiheessa luotu alue, eikä sen turvallisuusasetuksia voi muuttaa. Jos et halua käyttää tätä aluetta, älä muuta sen käyttötarkoitusta vaan poista se."
       uncategorized_security_warning: "Tämä alue on erityinen. Se on tarkoitettu säilytyspaikaksi ketjuille, joilla ei ole aluetta; sille ei voi määritellä turvallisuusasetuksia."
       uncategorized_general_warning: 'Tämä alue on erityinen. Se on oletusalue uusille ketjuille, joille ei ole valittu aluetta. Jos et kaipaa tätä ja haluat mieluummin pakottaa valitsemaan alueen, <a href="%{settingLink}">ota asetus pois käytöstä täällä</a>. Jos haluat vaihtaa nimeä tai kuvasta, mene <a href="%{customizeLink}">Mukauta / Tekstit</a>.'
       pending_permission_change_alert: "Et ole lisännyt ryhmää %{group} tälle alueelle; lisää klikkaamalla tätä."
@@ -2597,19 +2936,22 @@ fi:
       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."
+      allow_unlimited_owner_edits_on_first_post: "Salli rajattomat omistajan muokkaukset ensimmäisessä viestissä"
       subcategory_list_style: "Tytäraluelistan tyyli:"
       sort_order: "Ketjulistaus järjestetään:"
       default_view: "Oletuslistaus:"
-      default_top_period: "Kuumat-listauksen oletusajanjakso:"
+      default_top_period: "Suositut-listauksen oletusajanjakso:"
+      default_list_filter: "Oletusluettelosuodatin:"
       allow_badges_label: "Salli ansiomerkkien myöntäminen tältä alueelta"
       edit_permissions: "Muokkaa oikeuksia"
+      reviewable_by_group: "Henkilökunnan lisäksi tämän alueen sisältöä voi käsitellä myös:"
       review_group_name: "ryhmän nimi"
       require_topic_approval: "Edellytä valvojan hyväksyntää kaikille uusille ketjuille"
       require_reply_approval: "Edellytä valvojan hyväksyntää kaikille uusille vastauksille"
       this_year: "tänä vuonna"
       position: "Sijainti alueet-sivulla:"
       default_position: "Oletuspaikka"
-      position_disabled: "Alueet näytetään aktiivisuusjärjestyksessä. Muokataksesi järjestystä,"
+      position_disabled: "Alueet näytetään aktiivisuusjärjestyksessä. Muokataksesi järjestystä, "
       position_disabled_click: 'ota käyttöön "pysyvä aluejärjestys" asetuksista.'
       minimum_required_tags: "Kuinka monta tunnistetta ketjulla täytyy vähintään olla:"
       parent: "Emoalue"
@@ -2618,19 +2960,19 @@ fi:
       notifications:
         watching:
           title: "Tarkkaile"
-          description: "Tarkkailet kaikkia ketjuja näillä alueilla. Saat ilmoituksen jokaisesta uudesta viestistä missä tahansa ketjussa, ja uusien vastausten määrä näytetään."
+          description: "Tarkkailet automaattisesti kaikkia ketjuja näillä alueilla. Saat ilmoituksen jokaisesta uudesta viestistä missä tahansa ketjussa, ja uusien vastausten määrä näytetään."
         watching_first_post:
           title: "Tarkkaile uusia ketjuja"
           description: "Saat ilmoituksia uusista tämän alueen ketjuista, muttet ketjuihin tulevista vastauksista."
         tracking:
           title: "Seuraa"
-          description: "Seuraat kaikkia ketjuja näillä alueilla. Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle, ja uusien vastausten määrä näytetään."
+          description: "Seuraat kaikkia ketjuja näillä alueilla. Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle, sekä uusien vastausten määrä näytetään."
         regular:
           title: "Tavallinen"
           description: "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle."
         muted:
           title: "Vaimennettu"
-          description: "Et saa ilmoituksia uusista ketjuista näillä alueilla, eivätkä ne näy tuoreimmissa."
+          description: "Et saa ilmoituksia uusista ketjuista tällä alueella, eivätkä ne näy tuoreimmissa."
       search_priority:
         label: "Hakuprioriteetti"
         options:
@@ -2665,12 +3007,25 @@ fi:
       list_filters:
         all: "kaikki ketjut"
         none: "ei tytäralueita"
+      colors_disabled: "Et voi valita värejä, koska alueen tyyliksi on asetettu 'ei mikään'"
     flagging:
       title: "Kiitos avustasi yhteisön hyväksi!"
       action: "Liputa viesti"
+      take_action: "Ryhdy toimiin..."
+      take_action_options:
+        default:
+          title: "Ryhdy toimiin"
+          details: "Ylitä lippujen kynnysmäärä välittömästi, odottamatta enempää yhteisön jäsenten liputuksia"
+        suspend:
+          title: "Hyllytä käyttäjä"
+          details: "Ylitä lippujen kynnysmäärä ja hyllytä käyttäjä"
+        silence:
+          title: "Hiljennä käyttäjä"
+          details: "Ylitä lippujen kynnysmäärä ja hiljennä käyttäjä"
       notify_action: "Viesti"
       official_warning: "Virallinen varoitus"
       delete_spammer: "Poista roskapostittaja"
+      flag_for_review: "Tarkastettavien jono"
       delete_confirm_MF: "Olet poistamassa {POSTS, plural, one {<b>1</b> viestin} other {<b>#</b> viestiä}} ja {TOPICS, plural, one {<b>1</b> ketjun} other {<b>#</b> ketjua}} tältä käyttäjältä, poistamassa käyttäjätilin, estämässä uusien tunnusten luonnin IP-osoitteestaan <b>{ip_address}</b> ja lisäämässä sähköpostiosoitteensa <b>{email}</b> pysyvälle estolistalle. Oletko varma, että käyttäjä todella on roskapostittaja?"
       yes_delete_spammer: "Kyllä, poista roskapostittaja"
       ip_address_missing: "-"
@@ -2748,22 +3103,22 @@ fi:
     views: "Katseluita"
     views_lowercase:
       one: "katselu"
-      other: "katselut"
+      other: "katselua"
     replies: "Vastauksia"
     views_long:
-      one: "ketjua on katseltu yhden kerran"
+      one: "ketjua on katseltu %{count} kerran"
       other: "ketjua on katseltu %{number} kertaa"
     activity: "Toiminta"
     likes: "Tykkäykset"
     likes_lowercase:
       one: "tykkäys"
-      other: "tykkäykset"
+      other: "tykkäystä"
     users: "Käyttäjät"
     users_lowercase:
       one: "käyttäjä"
-      other: "käyttäjät"
+      other: "käyttäjää"
     category_title: "Alue"
-    history: "Historia"
+    history: "Historia, viimeiset 100 versiota"
     changed_by: "käyttäjältä %{author}"
     raw_email:
       title: "Saapuva sähköposti"
@@ -2817,7 +3172,7 @@ fi:
           other: "%{categoryName} (%{count})"
         help: "Tuoreimmat alueella %{categoryName}"
       top:
-        title: "Kuumat"
+        title: "Suositut"
         help: "Aktiivisimmat ketjut viimeisen vuoden, kuukauden ja päivän ajalta"
         all:
           title: "Kaikkina aikoina"
@@ -2837,7 +3192,8 @@ fi:
         this_month: "Kuukausi"
         this_week: "Viikko"
         today: "Tänään"
-        other_periods: "katso kuumat:"
+        other_periods: "katso suosituimmat:"
+    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ä"
@@ -2850,6 +3206,7 @@ fi:
       close: "Sulje (Esc)"
       content_load_error: '<a href="%url%">Sisällön</a> lataaminen ei onnistunut.'
       image_load_error: '<a href="%url%">Kuvan</a> lataaminen ei onnistunut.'
+    cannot_render_video: Tätä videota ei voida toistaa, koska selaimesi ei tue tarvittavaa koodekkia.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -2864,11 +3221,13 @@ fi:
         new: "%{shortcut} Uudet"
         unread: "%{shortcut} Lukemattomat"
         categories: "%{shortcut} Alueet"
-        top: "%{shortcut} Kuumat"
+        top: "%{shortcut} Suositut"
         bookmarks: "%{shortcut} Kirjanmerkit"
         profile: "%{shortcut} Käyttäjäprofiili"
         messages: "%{shortcut} Viestit"
         drafts: "%{shortcut} Luonnokset"
+        next: "%{shortcut} Seuraava ketju"
+        previous: "%{shortcut} Edellinen ketju"
       navigation:
         title: "Navigointi"
         jump: "%{shortcut} Siirry viestiin #"
@@ -2886,8 +3245,8 @@ fi:
         show_incoming_updated_topics: "%{shortcut} Näytä päivttyneet ketjut"
         search: "%{shortcut} Haku"
         help: "%{shortcut} Näytä näppäimistöoikotiet"
-        dismiss_new_posts: "%{shortcut} Unohda Uudet/Viestit"
-        dismiss_topics: "%{shortcut} Unohda ketjut"
+        dismiss_new_posts: "%{shortcut} Kuittaa uudet/viestit"
+        dismiss_topics: "%{shortcut} Kuittaa ketjut"
         log_out: "%{shortcut} Kirjaudu ulos"
       composing:
         title: "Kirjoittaminen"
@@ -2895,8 +3254,9 @@ fi:
         fullscreen: "%{shortcut} Koko ruudun kirjoitustila"
       bookmarks:
         title: "Kirjanmerkit"
+        enter: "%{shortcut} Tallenna ja sulje"
         later_today: "%{shortcut} Myöhemmin tänään"
-        later_this_week: "%{shortcut} Myöhemmin tällä viikolla "
+        later_this_week: "%{shortcut} Myöhemmin tällä viikolla"
         tomorrow: "%{shortcut} Huomenna"
         next_week: "%{shortcut} Ensi viikolla"
         next_month: "%{shortcut} Ensi kuussa"
@@ -2933,8 +3293,8 @@ fi:
         insert_url: "%{shortcut} Lisää valittu avoinna olevaan viestieditoriin"
     badges:
       earned_n_times:
-        one: "Ansaitsi tämän ansiomerkin yhden kerran"
-        other: "Ansaitsi tämän ansiomerkin %{count} kertaa"
+        one: "On ansainnut tämän ansiomerkin %{count} kerran"
+        other: "On ansainnut tämän ansiomerkin %{count} kertaa"
       granted_on: "Myönnetty %{date}"
       others_count: "Muita, joilla on tämä ansiomerkki (%{count})"
       title: Ansiomerkit
@@ -2993,8 +3353,8 @@ fi:
       delete_synonym_confirm: 'Haluatko varmasti poistaa synonyymin "%{tag_name}"?'
       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?"
+        one: "Haluatko varmasti poistaa tämän tunnisteen? Tämä poistaa sen myös %{count} ketjulta, jolla tunniste on?"
+        other: "Haluatko varmasti poistaa tämän tunnisteen? Tämä 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."
@@ -3016,6 +3376,8 @@ fi:
       delete_unused_confirmation_more_tags:
         one: "%{tags} ja %{count} muu"
         other: "%{tags} ja %{count} muuta"
+      delete_no_unused_tags: "Käyttämättömiä tunnisteita ei ole."
+      tag_list_joiner: ", "
       delete_unused: "Poista käyttämättömät tunnisteet"
       delete_unused_description: "Poista kaikki tunnisteet jotka eivät ole jonkun ketjun tai yksityiskeskustelun käytössä"
       cancel_delete_unused: "Peru"
@@ -3054,6 +3416,9 @@ fi:
         delete: "Poista"
         confirm_delete: "Oletko varma, että haluat poistaa tämän tunnisteryhmän?"
         everyone_can_use: "Kuka vain voi käyttää tunnisteita"
+        usable_only_by_groups: "Tunnisteet näkyvät kaikille, mutta vain nämä ryhmät voivat käyttää niitä"
+        visible_only_to_groups: "Tunnisteet näkyvät vain näille ryhmille"
+        cannot_save: "Tunnisteryhmää ei voida tallentaa. Varmista, että ryhmässä on vähintään yksi tunniste, ryhmän nimi ei ole tyhjä ja että ryhmä on valittuna tunnisteiden käyttöoikeuksiin."
       topics:
         none:
           unread: "Sinulla ei ole lukemattomia ketjuja."
@@ -3062,19 +3427,34 @@ fi:
           posted: "Et ole kirjoittanut vielä yhteenkään ketjuun."
           latest: "Tuoreimpia ketjuja ei ole."
           bookmarks: "Et ole vielä merkinnyt kirjanmerkkejä."
-          top: "Kuumia ketjuja ei ole."
+          top: "Suosittuja ketjuja ei ole."
     invite:
       custom_message: "Tee kutsusta persoonallisempi kirjoittamalla <a href>yksilöllinen viesti</a>."
       custom_message_placeholder: "Kirjoita henkilökohtainen viestisi"
+      approval_not_required: "Käyttäjä hyväksytään automaattisesti, kun hän hyväksyy tämän kutsun."
       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."
+    forced_anonymous_login_required: "Sivusto on äärimmäisen kuormituksen alla, eikä sitä voi ladata tällä hetkellä. Yritä uudelleen muutaman minuutin kuluttua."
     footer_nav:
       back: "Edellinen"
+      forward: "Seuraava"
       share: "Jaa"
-      dismiss: "Unohda"
+      dismiss: "Sulje"
     safe_mode:
       enabled: "Vikasietotila on nyt päällä, sulje selainikkuna lopettaaksesi"
+    image_removed: "(kuva poistettu)"
+    do_not_disturb:
+      title: "Älä häiritse..."
+      label: "Älä häiritse"
+      remaining: "%{remaining} jäljellä"
+      options:
+        half_hour: "30 minuuttiin"
+        one_hour: "1 tuntiin"
+        two_hours: "2 tuntiin"
+        tomorrow: "ennen huomista"
+        custom: "Mukautettu"
+      set_schedule: "Aseta ilmoitusten aikataulu"
   admin_js:
     type_to_filter: "kirjoita suodattaaksesi..."
     admin:
@@ -3102,6 +3482,10 @@ fi:
         installed_version: "Asennettu"
         latest_version: "Uusin"
         problems_found: "Joitakin suosituksia nykyisiin sivustoasetuksiisi pohjautuen"
+        new_features:
+          title: "\U0001F381 Uudet ominaisuudet"
+          dismiss: "Sulje"
+          learn_more: "Lue lisää"
         last_checked: "Viimeksi tarkistettu"
         refresh_problems: "Päivitä"
         no_problems: "Ongelmia ei löytynyt."
@@ -3154,6 +3538,9 @@ fi:
           view_table: "taulukko"
           view_graph: "graafi"
           refresh_report: "Päivitä raportti"
+          daily: Päivittäin
+          monthly: Kuukausittain
+          weekly: Viikoittain
           dates: "Päivämäärät (UTC)"
           groups: "Kaikki ryhmät"
           disabled: "Raportti ei ole käytössä"
@@ -3187,12 +3574,8 @@ fi:
             available: "Ryhmän nimi on käytettävissä"
             not_available: "Ryhmän nimi ei ole käytettävissä"
             blank: "Ryhmällä on oltava nimi"
-        bulk_add:
-          title: "Liitä ryhmään useita"
-          complete_users_not_added: "Näitä käyttäjiä ei liitetty (varmistu että heillä on käyttäjätili):"
-          paste: "Liitä luettelo käyttäjänimistä tai sähköposteista, yksi per rivi:"
         add_members:
-          as_owner: "Tee käyttäjistä ryhmän isäntiä"
+          as_owner: "Aseta käyttäjä(t) tämän ryhmän omistajaksi"
         manage:
           interaction:
             email: Sähköposti
@@ -3203,6 +3586,8 @@ fi:
               title: "Kuka näkee ryhmän?"
               public: "Kaikki"
               logged_on_users: "Sisäänkirjautuneet käyttäjät"
+              members: "Ryhmän isännät, jäsenet ja valvojat"
+              staff: "Ryhmän isännät ja valvojat"
               owners: "Ryhmän isännät"
               description: "Ylläpitäjät näkevät kaikki ryhmät."
             members_visibility_levels:
@@ -3215,7 +3600,9 @@ 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."
+            automatic_membership_user_count:
+              one: "%{count} käyttäjällä on jokinuusista sähköposti-verkkotunnuksista; heidät lisätään ryhmään."
+              other: "%{count} käyttäjällä on jokinuusista 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ä"
@@ -3227,7 +3614,11 @@ fi:
         group_members: "Ryhmään kuuluvat"
         delete: "Poista"
         delete_confirm: "Poista tämä ryhmä?"
+        delete_with_messages_confirm:
+          one: "Tämän ryhmän poistaminen aiheuttaa %{count} viestin orpoutumisen ja ryhmän jäsenillä ei ole tämän jälkeen pääsyä siihen.<br><br>Oletko varma?"
+          other: "Tämän ryhmän poistaminen aiheuttaa %{count} viestin orpoutumisen ja ryhmän jäsenillä ei ole tämän jälkeen pääsyä siihen.<br><br>Oletko varma?"
         delete_failed: "Ryhmän poistaminen ei onnistu. Jos tämä on automaattinen ryhmä, sitä ei voi poistaa."
+        delete_automatic_group: Tämä on automaattisesti luotu ryhmä eikä sitä voi poistaa.
         delete_owner_confirm: "Peru käyttäjältä '%{username}' isännyys?"
         add: "Lisää"
         custom: "Mukautetut"
@@ -3266,8 +3657,37 @@ fi:
         save: Tallenna
         new_key: Uusi rajapinta-avain
         revoked: Jäädytetty
+        delete: Poista pysyvästi
         not_shown_again: Tätä avainta ei näytetä toista kertaa. Varmistu että otat talteen ennen kuin jatkat.
         continue: Jatka
+        use_global_key: Globaali avain (sallii kaikki toiminnot)
+        scopes:
+          description: |
+            Kun käytät näkyvyysalueita, voit rajoittaa rajapinta-avaimen tiettyyn joukkoon päätepisteitä. Voit myös määritellä mitkä parametrit ovat sallittuja. Erota eri arvot pilkuilla.
+          title: Näkyvyysalueet
+          resource: Resurssi
+          action: Toiminto
+          allowed_parameters: Sallitut parametrit
+          optional_allowed_parameters: Sallitut parametrit (valinnainen)
+          any_parameter: (mikä tahansa parametri)
+          allowed_urls: Sallitut verkko-osoitteet
+          descriptions:
+            topics:
+              read: Lue ketjua tai tiettyä sen viestiä. RSS on myös tuettu.
+              write: Aloita uusi ketju tai kirjoita olemassa olevaan.
+              read_lists: Lue ketjulistauksia kuten suositut, uudet, tuoreimmat jne. RSS on myös tuettu.
+              wordpress: Tarvitaan, jotta WordPress wp-discourse -lisäosa toimii.
+            users:
+              bookmarks: Listaa käyttäjien kirjanmerkit. Palauttaa kirjanmerkkien muistutukset, kun käytetään ICS-muotoa.
+              sync_sso: Synkronoi käyttäjä DiscourseConnectin avulla.
+              show: Nouda tietoja käyttäjästä.
+              check_emails: Luettele käyttäjien sähköpostiosoitteet.
+              update: Päivitä käyttäjäprofiilin tiedot.
+              log_out: Kirjaa ulos kaikista käyttäjän istunnoista.
+              anonymize: Anonymisoi käyttäjätilejä.
+              delete: Poista käyttäjätilejä.
+            email:
+              receive_emails: Yhdistä tämä näkyvyysalue sähköpostivastaanottimen kanssa käsitelläksesi saapuvia sähköpostiviestejä.
       web_hooks:
         title: "Webhookit"
         none: "Webhookeja ei ole nyt."
@@ -3282,7 +3702,7 @@ fi:
         go_back: "Takaisin listaan"
         payload_url: "Tietosisällön URL"
         payload_url_placeholder: "https://esimerkki.fi/saapuva"
-        warn_local_payload_url: "Näyttää, että yrität asettaa webhookin paikalliseen URL:ään. Paikalliseen osoitteeseen toimitetulla tapahtumalla voi olla sivuvaikutuksia tai se voi käyttäytyä odottamattomasti. Jatketaanko?"
+        warn_local_payload_url: "Näyttäisi siltä, että yrität asettaa webhookin paikalliseen URL:ään. Paikalliseen osoitteeseen toimitetulla tapahtumalla voi olla sivuvaikutuksia tai se voi käyttäytyä odottamattomasti. Jatketaanko?"
         secret_invalid: "Salausavaimessa ei voi olla tyhjämerkkejä."
         secret_too_short: "Salausavaimessa tulee olla ainakin 12 merkkiä."
         secret_placeholder: "Ei-pakollinen merkkijono, käytetään luotaessa salausallekirjoitusta"
@@ -3310,7 +3730,7 @@ fi:
           details: "Luodaan uusi vastaus, muokataan, poistetaan tai palautetaan."
         user_event:
           name: "Käyttäjätapahtuma"
-          details: "Kun käyttäjä kirjautuu sisään tai ulos, tai käyttäjä luodaan, hyväksytään tai päivittyy."
+          details: "Kun käyttäjä kirjautuu sisään tai ulos, vahvistaa sähköpostiosoitteensa tai käyttäjä luodaan, hyväksytään tai päivittyy."
         group_event:
           name: "Ryhmätapahtuma"
           details: "Kun ryhmä luodaan, päivitetään tai poistetaan."
@@ -3329,6 +3749,12 @@ fi:
         user_badge_event:
           name: "Ansiomerkinmyöntämistapahtuma"
           details: "Kun käyttäjä saa ansiomerkin."
+        group_user_event:
+          name: "Käyttäjäryhmän tapahtuma"
+          details: "Kun käyttäjä lisätään tai poistetaan ryhmästä."
+        like_event:
+          name: "Tykkää-tapahtuma"
+          details: "Kun käyttäjä tykkää viestistä."
         delivery_status:
           title: "Toimituksen tila"
           inactive: "Ei toiminnassa"
@@ -3497,13 +3923,19 @@ fi:
           settings: "Asetukset"
           translations: "Käännökset"
           extra_scss: "Lisä-SCSS"
+          extra_files: "Lisätiedostot"
+          extra_files_upload: "Vie teema nähdäksesi nämä tiedostot."
+          extra_files_remote: "Vie teema tai katso git-tietovarastosta nähdäksesi nämä tiedostot."
           preview: "Esikatselu"
           show_advanced: "Näytä lisäasetukset"
           hide_advanced: "Piilota lisäasetukset"
           hide_unused_fields: "Piilota tyhjät kentät"
           is_default: "Teema on käytössä oletuksena"
           user_selectable: "Teema on tarjolla käyttäjille"
+          color_scheme_user_selectable: "Käyttäjä voi valita värimallin"
+          auto_update: "Päivitä automaattisesti kun Discoursea päivitetään"
           color_scheme: "Väripaletti"
+          default_light_scheme: "Vaalea (oletus)"
           color_scheme_select: "Valitse teemalle värit"
           custom_sections: "Mukautetut osiot:"
           theme_components: "Teeman komponentit"
@@ -3511,7 +3943,9 @@ fi:
           convert: "Muunna"
           convert_component_alert: "Oletko varma että haluat muuttaa tämän komponentin teemaksi? Se ei sen jälkeen enää ole teemojen %{relatives} komponentti."
           convert_component_tooltip: "Muunna komponentti teemaksi"
+          convert_component_alert_generic: "Haluatko varmasti muuntaa tämän komponentin teemaksi?"
           convert_theme_alert: "Oletko varma että haluat muuttaa tämän teeman komponentiksi? Se ei sen jälkeen enää ole komponenttien %{relatives} emoteema."
+          convert_theme_alert_generic: "Haluatko varmasti muuntaa tämän teeman komponentiksi?"
           convert_theme_tooltip: "Muunna teema komponentiksi"
           inactive_themes: "Teemat, jotka eivät käytössä:"
           inactive_components: "Käyttämättömät komponentit:"
@@ -3545,21 +3979,25 @@ fi:
           included_components: "Sisältää komponentit"
           add_all: "Lisää kaikki"
           import_web_tip: "Tietovarasto, jossa teema on"
+          direct_install_tip: "Oletko varma, että haluat asentaa <strong>%{name}</strong> alla olevasta lähteestä?"
           import_web_advanced: "Lisäasetukset..."
           import_file_tip: ".tar.gz, .zip, tai .dcstyle.json tiedosto, jossa teema on"
           is_private: "Teema on yksityisessä git-tietovarastossa"
           remote_branch: "Haaran nimi (valinnainen)"
           public_key: "Anna repositorioon pääsy seuraavalle julkiselle avaimelle:"
+          public_key_note: "Kun olet syöttänyt kelvollisen yksityisen tietovaraston URL-osoitteen yllä, SSH-avain luodaan ja näytetään tässä."
           install: "Asenna"
           installed: "Asennettu"
           install_popular: "Suosittuja"
           install_upload: "Laitteeltasi"
           install_git_repo: "Git-tietovarastosta"
           install_create: "Luo uusi"
+          duplicate_remote_theme: "Teemakomponentti “%{name}” on jo asennettu. Haluatko varmasti asentaa toisen kopion?"
           about_theme: "Tietoa"
           license: "Lisenssi"
           version: "Versio:"
           authors: "Tekijä:"
+          creator: "Luonut:"
           source_url: "Lähde"
           enable: "Ota käyttöön"
           disable: "Poista käytöstä"
@@ -3574,6 +4012,7 @@ fi:
           check_for_updates: "Hae päivityksiä"
           updating: "Päivitetään..."
           up_to_date: "Teema on ajan tasalla, viimeksi tarkastettu:"
+          has_overwritten_history: "Nykyistä teemaversiota ei enää ole, koska git-historia on pyyhkiytynyt force-puskun seurauksena."
           add: "Lisää"
           theme_settings: "Teeman asetukset"
           no_settings: "Teemalla ei ole asetuksia."
@@ -3581,8 +4020,9 @@ 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 jäljessä!"
           compare_commits: "(Näytä uudet muutokset)"
+          remote_theme_edits: "Jos haluat muokata tätä teemaa, sinun on <a href='%{repoURL}' target='_blank'>lähetettävä muutos sen tietovarastoon</a>"
           repo_unreachable: "Teeman Git-tietovarastoon yhdistäminen epäonnistui. Virheviesti:"
           imported_from_archive: "Tämä teema tuotiin .zip-tiedostosta"
           scss:
@@ -3600,6 +4040,18 @@ fi:
           embedded_scss:
             text: "Upotettu CSS"
             title: "CSS-tyylit, jotka välitetään sulautettujen kommenttien mukana"
+          color_definitions:
+            text: "Värimääritykset"
+            title: "Syötä mukautetut värimääritykset (vain kokeneille käyttäjille)"
+            placeholder: |2-
+
+              Käytä tätä tyylitiedostoa lisätäksesi mukautettuja värejä CSS:n mukautettujen ominaisuuksien luetteloon.
+
+              Esimerkki:
+
+              %{example}
+
+              Etuliitteen lisääminen CSS-kuvauksiin on erittäin suositeltavaa, jotta vältät ristiriidat lisäosien ja/tai ydinsovelluksen kanssa.
           head_tag:
             text: "</head>"
             title: "HTML, joka sijoitetaan ennen </head>-symbolia"
@@ -3609,6 +4061,8 @@ fi:
           yaml:
             text: "YAML"
             title: "Määritä teeman asetukset YAML-muodossa"
+          scss_color_variables_warning: "Ydinsovelluksen SCSS-värimuuttujien käyttäminen teemoissa on vanhentunutta. Suosittelemme käyttämään mukautettuja CSS-ominaisuuksia niiden sijasta. Lue lisää aiheesta <a href=\"https://meta.discourse.org/t/-/77551#color-variables-2\" target=\"_blank\">tästä oppaasta</a>."
+          scss_warning_inline: "Ydinsovelluksen SCSS-värimuuttujien käyttäminen teemoissa on vanhentunutta."
         colors:
           select_base:
             title: "Valitse perusväripaletti"
@@ -3627,6 +4081,10 @@ fi:
           primary:
             name: "ensisijainen väri"
             description: "Useimmat tekstit, ikonit ja reunat."
+          primary-medium:
+            name: "primary-medium"
+          primary-low-mid:
+            name: "primary-low-mid"
           secondary:
             name: "toissijainen väri"
             description: "Pääasiallinen taustaväri ja joidenkin painikkeiden tekstin väri."
@@ -3645,6 +4103,12 @@ fi:
           highlight:
             name: "korostus"
             description: "Korostettujen elementtien, kuten viestien ja ketjujen, taustaväri."
+          highlight-high:
+            name: "highlight-high"
+          highlight-medium:
+            name: "highlight-medium"
+          highlight-low:
+            name: "highlight-low"
           danger:
             name: "vaara"
             description: "Korosteväri toiminnoille, kuten viestien ja ketjujen poistaminen."
@@ -3704,6 +4168,7 @@ fi:
         format: "Muotoilu"
         html: "html"
         text: "teksti"
+        html_preview: "Sähköpostin sisällön esikatselu"
         last_seen_user: "Käyttäjän edellinen kirjautuminen:"
         no_result: "Tuloksia ei löydetty tiivistelmää varten."
         reply_key: "Vastausavain"
@@ -3763,14 +4228,14 @@ fi:
           block: "estä"
           do_nothing: "älä tee mitään"
         staff_actions:
-          all: "kaikki"
+          all: "näytä kaikki"
           filter: "Suodata:"
           title: "Henkilökunnan toimet"
           clear_filters: "Näytä kaikki"
           staff_user: "Käyttäjä"
-          target_user: "Kohteena ollut käyttäjä"
-          subject: "Otsikko"
-          when: "Milloin"
+          target_user: "Kohdekäyttäjä"
+          subject: "Aihe"
+          when: "Ajankohta"
           context: "Konteksti"
           details: "Yksityiskohdat"
           previous_value: "Edellinen"
@@ -3778,16 +4243,16 @@ fi:
           diff: "Ero"
           show: "Näytä"
           modal_title: "Yksityiskohdat"
-          no_previous: "Aiempaa arvoa ei ole."
+          no_previous: "Aikaisempaa arvoa ei ole."
           deleted: "Uutta arvoa ei ole. Tietue poistettiin."
           actions:
             delete_user: "poista käyttäjä"
-            change_trust_level: "vaihda luottamustasoa"
-            change_username: "vaihda käyttäjätunnus"
+            change_trust_level: "muuta luottamustasoa"
+            change_username: "muuta käyttäjänimeä"
             change_site_setting: "muuta sivuston asetusta"
             change_theme: "muuta teemaa"
             delete_theme: "poista teema"
-            change_site_text: "muutos sivuston teksteissä"
+            change_site_text: "muuta sivuston tekstiä"
             suspend_user: "hyllytä käyttäjä"
             unsuspend_user: "poista hyllytys"
             removed_suspend_user: "hyllytä käyttäjä (poistettu)"
@@ -3800,7 +4265,7 @@ fi:
             delete_post: "poista viesti"
             impersonate: "esiinny käyttäjänä"
             anonymize_user: "anonymisoi käyttäjä"
-            roll_up: "Kääri IP estot"
+            roll_up: "Kokoa IP-estot"
             change_category_settings: "muuta alueen asetuksia"
             delete_category: "poista alue"
             create_category: "luo alue"
@@ -3813,9 +4278,9 @@ fi:
             grant_moderation: "myönnä valvojan oikeudet"
             revoke_moderation: "peru valvojan oikeudet"
             backup_create: "luo varmuuskopio"
-            deleted_tag: "poistettu tunniste"
+            deleted_tag: "poista tunniste"
             deleted_unused_tags: "poista käyttämättömät tunnisteet"
-            renamed_tag: "uudelleen nimetty tunniste"
+            renamed_tag: "uudelleennimetty tunniste"
             revoke_email: "peru sähköpostiosoite"
             lock_trust_level: "lukitse luottamustaso"
             unlock_trust_level: "vapauta luottamustaso"
@@ -3830,6 +4295,7 @@ fi:
             post_edit: "viestin muokkaus"
             post_unlocked: "viesti vapautettu"
             check_personal_message: "katso yksityisviesti"
+            disabled_second_factor: "poista kaksivaiheinen todennus käytöstä"
             topic_published: "ketju julkaistu"
             post_approved: "viesti hyväksytty"
             post_rejected: "viesti hylätty"
@@ -3857,6 +4323,18 @@ fi:
             api_key_update: "päivitti rajapinta-avainta"
             api_key_destroy: "tuhosi rajapinta-avaimen"
             override_upload_secure_status: "kävele yli latauksen turvastatuksesta"
+            page_published: "sivu julkaistu"
+            page_unpublished: "sivua ei julkaistu"
+            add_email: "lisää sähköpostiosoite"
+            update_email: "päivitä sähköpostiosoite"
+            destroy_email: "poista sähköpostiosoite"
+            topic_closed: "ketju suljettu"
+            topic_opened: "ketju avattu"
+            topic_archived: "ketju arkistoitu"
+            topic_unarchived: "ketju palautettu arkistosta"
+            post_staff_note_create: "lisätty henkilökunnan muistiinpano"
+            post_staff_note_destroy: "poistettu henkilökunnan muistiinpano"
+            delete_group: "poista ryhmä"
         screened_emails:
           title: "Seulottavat sähköpostiosoitteet"
           description: "Uuden käyttäjätunnuksen luonnin yhteydessä annettua sähköpostiosoitetta verrataan alla olevaan listaan ja tarvittaessa tunnuksen luonti joko estetään tai suoritetaan muita toimenpiteitä."
@@ -3870,6 +4348,7 @@ fi:
           domain: "Verkkotunnus"
         screened_ips:
           title: "Seulottavat IP:t"
+          description: 'IP-osoitteet joita tarkkaillaan. Valitse "Salli" lisätäksesi osoitteen sallittujen listalle.'
           delete_confirm: "Oletko varma, että haluat poistaa tämän säännön osoitteelle %{ip_address}?"
           roll_up_confirm: "Oletko varma, että haluat yhdistää seulottavat IP-osoitteet aliverkoiksi?"
           rolled_up_some_subnets: "Porttikieltojen IP-osoitteet käärittiin onnistuneesti näiksi aliverkoiksi: %{subnets}."
@@ -3903,31 +4382,34 @@ fi:
         title: "Tarkkaillut sanat"
         search: "haku"
         clear_filter: "Tyhjennä"
-        show_words: "näytä sanat"
-        one_word_per_line: "Yksi sana per rivi"
+        show_words:
+          one: "näytä %{count} sana"
+          other: "näytä %{count} sanaa"
         download: Lataa
         clear_all: Tyhjennä kaikki
-        clear_all_confirm_block: "Haluatko varmasti pyyhkiä kaikki estetyt sanat?"
-        clear_all_confirm_censor: "Haluatko varmasti pyyhkiä kaikki sensuroidut sanat?"
-        clear_all_confirm_flag: "Haluatko varmasti pyyhkiä kaikki liputettavat sanat?"
-        clear_all_confirm_require_approval: "Haluatko varmasti pyyhkiä kaikki hyväksyttäviksi vietävät sanat?"
-        word_count:
-          one: "%{count} sana"
-          other: "%{count} sanaa"
+        clear_all_confirm: "Haluatko varmasti tyhjentää kaikki tarkkaillut sanat %{action} -toiminnosta?"
         actions:
           block: "Estä"
           censor: "Sensuroi"
           require_approval: "Vie hyväksyttäväksi"
           flag: "Liputa"
+          replace: "Korvaa"
+          tag: "Merkitse"
         action_descriptions:
           block: "Estä lähettämästä viestiä, jossa esiintyy joku näistä sanoista. Käyttäjälle näytetään virheilmoitus, kun hän yrittää lähettää viestinsä."
           censor: "Salli viesti, jossa esiintyy joku näistä sanoista, mutta korvaa ne merkeillä, jotka piilottavat sensuroidut sanat."
           require_approval: "Viesti, jossa esiintyy joku näistä sanoista, tarvitsee henkilökunnan hyväksynnän ennen sen julkaisemista."
           flag: "Salli viesti, jossa esiintyy joku näistä sanoista, mutta liputa se sopimattomaksi, jotta valvojat voivat tarkastella sitä."
+          replace: "Korvaa sanoja viesteissä vaihtoehtoisilla sanoilla tai linkeillä"
+          tag: "Merkitse automaattisesti ketjuja tunnisteilla ensimmäisen viestin perusteella"
         form:
-          label: "Uusi sana:"
-          placeholder: "kokonainen sana tai * jokerimerkkinä"
+          label: "Sisältää sanan tai lauseen"
+          placeholder: "Syötä sana tai lause (* on jokerimerkki)"
           placeholder_regexp: "säännöllinen lauseke"
+          replacement_label: "Korvaava teksti"
+          replacement_placeholder: "esimerkki tai https://esimerkki.fi"
+          tag_label: "Tunnisteet"
+          tag_placeholder: "tunniste1,tunniste2,tunniste3"
           add: "Lisää"
           success: "Onnistui"
           exists: "On jo olemassa"
@@ -3980,6 +4462,9 @@ fi:
         check_email:
           title: "Paljasta tämän käyttäjän sähköpostiosoite"
           text: "Näytä"
+        check_sso:
+          title: "Näytä SSO payload"
+          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}"
@@ -3987,6 +4472,14 @@ fi:
         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ä."
         suspend_reason: "Syy"
+        suspend_reason_title: "Hyllytyksen syy"
+        suspend_reasons:
+          not_listening_to_staff: "Ei kuunnellut henkilökunnan palautetta"
+          consuming_staff_time: "Kulutti suhteettomasti henkilökunnan aikaa"
+          combatative: "Riidanhaluinen"
+          in_wrong_place: "Väärässä paikassa"
+          no_constructive_purpose: "Toiminta ei ole rakentavaa, aiheuttaa eripuraa yhteisössä"
+          custom: "Mukautettu..."
         suspend_message: "Sähköpostiviesti"
         suspend_message_placeholder: "Voit halutessasi kertoa enemmän hyllytyksen syystä, jolloin kertomus lähetetään käyttäjälle sähköpostitse."
         suspended_by: "Käyttäjän hyllytti"
@@ -4045,6 +4538,7 @@ fi:
         private_topics_count: Yksityisviestit
         posts_read_count: Luettuja viestejä
         post_count: Kirjoitettuja viestejä
+        second_factor_enabled: Kaksivaiheinen tunnistautuminen käytössä
         topics_entered: Katseltuja ketjuja
         flags_given_count: Annettuja lippuja
         flags_received_count: Saatuja lippuja
@@ -4060,7 +4554,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ä"
+        delete_posts:
+          progress:
+            title: "Viestien poistamisen eteneminen"
         merge:
+          button: "Yhdistä"
           prompt:
             title: "Siirrä & poista %{username}"
             description: |
@@ -4070,6 +4568,8 @@ fi:
             target_username_placeholder: "Uuden omistajan käyttäjänim"
             transfer_and_delete: "Siirrä & poista %{username}"
             cancel: "Peru"
+          progress:
+            title: "Yhdistämisen edistyminen"
           confirmation:
             title: "Siirrä & poista %{username}"
             description: |
@@ -4162,13 +4662,16 @@ fi:
           on_grace_period: "Tällä hetkellä siirtymäajalla, ei alenneta"
           locked_will_not_be_promoted: "Luottamustaso lukittu. Ei koskaan ylennetä."
           locked_will_not_be_demoted: "Luottamustaso lukittu. Ei koskaan alenneta."
-        sso:
-          title: "Kertakirjautuminen"
+        discourse_connect:
+          title: "DiscourseConnect Single Sign On"
           external_id: "Ulkopuolinen ID"
           external_username: "Käyttäjätunnus"
           external_name: "Nimi"
-          external_email: "Sähköposti"
-          external_avatar_url: "Profiilikuvan URL"
+          external_email: "Sähköpostiosoite"
+          external_avatar_url: "Profiilikuvan URL-osoite"
+          last_payload: "Viimeisin Payload"
+          delete_sso_record: "Poista SSO Tietue"
+          confirm_delete: "Haluatko varmasti poistaa tämän DiscourseConnect-tietueen?"
       user_fields:
         title: "Käyttäjäkentät"
         help: "Lisää kenttiä jotka käyttäjät voivat täyttää."
@@ -4199,6 +4702,10 @@ fi:
           title: "Näytä käyttäjäkortilla?"
           enabled: "näytä käyttäjäkortilla"
           disabled: "ei näytetä käyttäjäkortilla"
+        searchable:
+          title: "Haettavissa?"
+          enabled: "haettavissa"
+          disabled: "ei haettavissa"
         field_types:
           text: "Tekstikenttä"
           confirm: "Vahvistus"
@@ -4213,12 +4720,19 @@ fi:
         go_back: "Takaisin hakuun"
         recommended: "On suositeltavaa muokata seuraavaa tekstiä tarpeidesi mukaan:"
         show_overriden: "Näytä vain muokatut"
+        locale: "Kieli:"
+        fallback_locale_warning: "Olet muokkaamassa kieltä joka perustuu kieleen %{fallback}. Käyttäjät, jotka valitsevat %{fallback} eivät näe muutoksia."
         more_than_50_results: "Hakutuloksia on yli 50. Rajaa hakuasi."
       settings:
         show_overriden: "Näytä vain muokatut"
+        history: "Näytä muutoshistoria"
         reset: "nollaa"
         none: "ei mitään"
       site_settings:
+        emoji_list:
+          invalid_input: "Emoji-luettelossa tulisi olla vain kelvollisia emojien nimiä, esim. hugs"
+          add_emoji_button:
+            label: "Lisää Emoji"
         title: "Asetukset"
         no_results: "Ei tuloksia."
         more_than_30_results: "Tuloksia on yli 30. Rajaa hakuasi tai valitse luokka."
@@ -4271,6 +4785,9 @@ fi:
           modal_no: "Ei, muutosta sovellettakoon vain tästedes"
         simple_list:
           add_item: "Lisää asia..."
+        json_schema:
+          edit: Käynnistä editori
+          modal_title: "Muokkaa %{name}"
       badges:
         title: Ansiomerkit
         new_badge: Uusi ansiomerkki
@@ -4307,8 +4824,12 @@ fi:
         enabled: Ota ansiomerkki käyttöön
         icon: Ikoni
         image: Kuva
+        graphic: Kuvake
         icon_help: "Anna Font Awesome -ikonin nimi (käytä etuliitetty \"far-\" tavallisista ja \"fab-\" brändi-ikoneista)"
-        image_help: "Syötä kuvan URL (kumoaa ikonikentän, jos molemmat on asetettu)"
+        image_help: "Kuvan lataaminen ohittaa kuvakekentän jos molemmat on asetettu."
+        select_an_icon: "Valitse kuvake"
+        upload_an_image: "Lataa kuva"
+        read_only_setting_help: "Mukauta tekstiä"
         query: Ansiomerkkien haku tietokannasta (SQL)
         target_posts: Tietokantakyselyn kohdeviestit
         auto_revoke: Aja kumoamis-ajo päivittäin
@@ -4367,10 +4888,11 @@ fi:
       embedding:
         get_started: "Jos haluat upottaa Discoursen toiselle sivustolle, aloita lisäämällä isäntä."
         confirm_delete: "Oletko varma, että haluat poistaa tämän isännän?"
-        sample: "Käytä alla olevaa HTML-koodia sivustollasi aloittaaksesi ja upottaaksesi discourse ketjuja. Korvaa <b>REPLACE_ME</b> upotettavan sivun kanonisella URL-osoitteella."
+        sample: "Käytä alla olevaa HTML-koodia sivustollasi jotta voit luoda ja upottaa discourse-ketjuja. Korvaa <b>REPLACE_ME</b> upotettavan sivun kanonisella URL-osoitteella."
         title: "Upottaminen"
         host: "Sallitut isännät"
         class_name: "Luokan nimi"
+        allowed_paths: "Sallittu polkulistaus"
         edit: "muokkaa"
         category: "Julkaise alueelle"
         add_host: "Lisää isäntä"
@@ -4381,9 +4903,14 @@ fi:
         embed_post_limit: "Upotettavien viestien maksimimäärä"
         embed_title_scrubber: "Säännöllinen lauseke, jolla riisutaan viestien otsikkoja"
         embed_truncate: "Typistä upotetut viestit"
+        embed_unlisted: "Tuodut ketjut ovat piilotettuna kunnes niihin vastataan."
+        allowed_embed_selectors: "CSS-valitsin elementeille, jotka ovat sallittuja upotuksissa"
+        blocked_embed_selectors: "CSS-valitsin elementeille, jotka poistetaan upotuksista"
+        allowed_embed_classnames: "Sallitut CSS-luokkien nimet"
         save: "Tallenna upotusasetukset"
       permalink:
         title: "Ikilinkit"
+        description: "Aseta uudelleenohjauksia URL-osoitteille, joita sivusto ei tunne."
         url: "URL"
         topic_id: "Ketjun ID"
         topic_title: "Ketju"
@@ -4391,6 +4918,10 @@ fi:
         post_title: "Viesti"
         category_id: "Alueen ID"
         category_title: "Alue"
+        tag_name: "Tunnisteen nimi"
+        external_url: "Ulkoinen tai suhteellinen URL-osoite"
+        destination: "Kohde"
+        copy_to_clipboard: "Kopioi ikilinkki leikepöydälle"
         delete_confirm: Oletko varma, että haluat poistaa tämän ikilinkin?
         form:
           label: "Uusi:"
@@ -4429,5 +4960,6 @@ fi:
           regular: "Tavallinen käyttäjä"
       previews:
         topic_title: "Keskusteluketju"
+        font_title: "%{font} -fontti"
         share_button: "Jaa"
         reply_button: "Vastaa"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 949f720f2f..9c30248c75 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -121,7 +121,7 @@ fr:
       close: "fermer"
       twitter: "Partager sur Twitter"
       facebook: "Partager sur Facebook"
-      email: "Envoyer par e-mail"
+      email: "Envoyer par courriel"
       url: "Copier et partager l'URL"
     action_codes:
       public_topic: "a rendu ce sujet public %{when}"
@@ -152,12 +152,18 @@ fr:
         enabled: "a rendu ce sujet visible %{when}"
         disabled: "a rendu ce sujet invisible %{when}"
       banner:
-        enabled: "a mis à la une %{when}. Il sera affiché en haut de chaque page jusqu’à ce qu'il soit ignoré par un utilisateur."
+        enabled: "a mis à la une %{when}. Il sera affiché en haut de chaque page jusqu'à ce qu'il soit ignoré par un utilisateur."
         disabled: "a supprimé de la une %{when}. Il ne sera plus affiché en haut de chaque page."
       forwarded: "a transmis le courriel ci-dessus"
     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."
+    software_update_prompt:
+      message: "Nous avons fait une mise à jour du site, nous vous invitons donc à <span>rafraîchir cette page</span> pour éviter d'éventuels dysfonctionnements."
+      dismiss: "Ignorer"
+    bootstrap_mode_enabled:
+      one: "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 %{count} utilisateur."
+      other: "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 %{count} utilisateurs."
     bootstrap_mode_disabled: "Le mode spécial de lancement sera désactivé dans les prochaines 24 heures."
     themes:
       default_description: "Par défaut"
@@ -166,6 +172,7 @@ fr:
       regions:
         ap_northeast_1: "Asie-Pacifique (Tokyo)"
         ap_northeast_2: "Asie-Pacifique (Séoul)"
+        ap_east_1: "Asie-Pacifique (Hong Kong)"
         ap_south_1: "Asie-Pacifique (Bombay)"
         ap_southeast_1: "Asie-Pacifique (Singapour)"
         ap_southeast_2: "Asie-Pacifique (Sydney)"
@@ -184,6 +191,7 @@ fr:
         us_gov_west_1: "AWS GovCloud (US-Ouest)"
         us_west_1: "États-Unis ouest (Californie)"
         us_west_2: "États-Unis ouest (Oregon)"
+    clear_input: "Nettoyer l'entrée"
     edit: "modifier le titre et la catégorie de ce sujet"
     expand: "Développer"
     not_implemented: "Cette fonctionnalité n'est pas encore disponible."
@@ -210,7 +218,7 @@ fr:
     privacy: "Confidentialité"
     tos: "Conditions générales d'utilisation"
     rules: "Règles"
-    conduct: "Charte"
+    conduct: "Code de bonne conduite"
     mobile_view: "Version mobile"
     desktop_view: "Version ordinateur"
     you: "Vous"
@@ -218,6 +226,9 @@ fr:
     now: "à l'instant"
     read_more: "lire la suite"
     more: "Plus"
+    x_more:
+      one: "%{count} autre"
+      other: "%{count} autres"
     less: "Moins"
     never: "jamais"
     every_30_minutes: "toutes les 30 minutes"
@@ -246,8 +257,9 @@ fr:
       moderators: "Modérateurs"
       stat:
         all_time: "Depuis toujours"
-        last_7_days: "Derniers 7 jours"
-        last_30_days: "Derniers 30 jours"
+        last_day: "Ces dernières 24 heures"
+        last_7_days: "Ces 7 derniers jours"
+        last_30_days: "Ces 30 derniers jours"
       like_count: "J'aime"
       topic_count: "Sujets"
       post_count: "Nombre de messages"
@@ -270,7 +282,7 @@ fr:
       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"
+      save: "Enregistrer"
       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."
@@ -278,23 +290,11 @@ fr:
       auto_delete_preference:
         label: "Supprimer automatiquement"
         never: "Jamais"
-        when_reminder_sent: "Une fois le rappel envoyé"
+        when_reminder_sent: "Après l'envoi du rappel"
         on_owner_reply: "Après avoir répondu à ce sujet"
       search_placeholder: "Rechercher des signets par nom, titre de sujet ou contenu de message"
       search: "Recherche"
       reminders:
-        later_today: "Plus tard aujourd'hui"
-        next_business_day: "Prochain jour ouvré"
-        tomorrow: "Demain"
-        next_week: "Semaine prochaine"
-        post_local_date: "Date venant du message"
-        later_this_week: "Plus tard cette semaine"
-        start_of_next_business_week: "Lundi"
-        start_of_next_business_week_alt: "Lundi prochain"
-        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}"
@@ -304,13 +304,14 @@ fr:
     drafts:
       resume: "Reprendre"
       remove: "Supprimer"
+      remove_confirmation: "Êtes-vous sûr de vouloir supprimer ce brouillon ?"
       new_topic: "Nouveau brouillon de sujet"
       new_private_message: "Nouveau brouillon de message direct"
       topic_reply: "Créer un brouillon de réponse"
       abandon:
-        confirm: "Vous avez déjà ouvert un autre brouillon dans ce sujet. Êtes-vous sûr de vouloir l'abandonner ?"
-        yes_value: "Oui, abandonner"
-        no_value: "Non, garder"
+        confirm: "Vous avez un brouillon en cours pour ce sujet. Que voulez-vous en faire ?"
+        yes_value: "Abandonner"
+        no_value: "Reprendre l'édition"
     topic_count_latest:
       one: "Voir %{count} sujet récent ou mis à jour."
       other: "Voir %{count} sujets récents ou mis à jour"
@@ -322,18 +323,20 @@ fr:
       other: "Voir %{count} nouveaux sujets"
     preview: "prévisualiser"
     cancel: "annuler"
-    save: "Sauvegarder"
-    saving: "Sauvegarde en cours…"
-    saved: "Sauvegardé !"
+    deleting: "Suppression…"
+    save: "Enregistrer les modifications"
+    saving: "Enregistrement en cours…"
+    saved: "Enregistré avec succès !"
     upload: "Joindre un fichier"
     uploading: "Envoi en cours…"
     uploading_filename: "Envoi en cours : %{filename}…"
+    processing_filename: "Traitement de : %{filename}…"
     clipboard: "presse-papier"
     uploaded: "Envoyé !"
     pasting: "Coller…"
     enable: "Activer"
     disable: "Désactiver"
-    continue: "Poursuivre"
+    continue: "Continuer"
     undo: "Annuler"
     revert: "Rétablir"
     failed: "Échec"
@@ -348,18 +351,18 @@ fr:
       none_found: "Aucun sujet trouvé."
       title:
         search: "Rechercher un sujet"
-        placeholder: "saisir ici le titre du sujet, son URL ou son ID"
+        placeholder: "saisissez ici le titre du sujet, son URL ou son ID"
     choose_message:
       none_found: "Aucun message trouvé."
       title:
         search: "Rechercher un message"
-        placeholder: "entrez ici l'intitulé du sujet, son URL ou son ID"
+        placeholder: "saisissez 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 de l'élément à vérifier"
+        title: "Notation de l'élément à examiner"
         formula: "Formule"
         subtotal: "Sous-total"
         total: "Total"
@@ -373,15 +376,15 @@ fr:
           title: "Les utilisateurs dont les signalements ont généralement été approuvés obtiennent un bonus."
         trust_level_bonus:
           name: "niveau de confiance"
-          title: "Les éléments à vérifier créés par les utilisateurs ayant un niveau de confiance plus élevé ont un score plus élevé."
+          title: "Les éléments à examiner créés par des utilisateurs au niveau de confiance plus élevé ont un score plus élevé."
         type_bonus:
           name: "indiquer le bonus"
-          title: "Certains types d'éléments à vérifier peuvent se voir attribuer un bonus par les responsables pour en élever la priorité."
+          title: "Certains types d'éléments à examiner 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 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>."
+        optional: "Vous pouvez vous réserver cet élément pour empêcher d'autres responsables de l'examiner."
+        required: "Vous devez réserver un élément avant de l'examiner."
+        claimed_by_you: "Vous avez réservé cet élément et pouvez donc l'examiner."
+        claimed_by_other: "Cet élément ne peut être examiné que par <b>%{username}</b>."
       claim:
         title: "réserver ce sujet"
       unclaim:
@@ -389,23 +392,24 @@ fr:
       awaiting_approval: "En attente d'approbation"
       delete: "Supprimer"
       settings:
-        saved: "Sauvegardé"
-        save_changes: "Sauvegarder"
+        saved: "Enregistré"
+        save_changes: "Enregistrer les modifications"
         title: "Paramètres"
         priorities:
-          title: "Priorités des vérifications"
+          title: "Priorités des éléments à examiner"
       moderation_history: "Historique de modération"
       view_all: "Tout voir"
       grouped_by_topic: "Par sujet"
-      none: "Il n'y a pas d'éléments à vérifier."
+      none: "Il n'y a pas d'éléments à examiner."
       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"
-      title: "Vérification"
+      title: "À examiner"
       topic: "Sujet :"
-      filtered_topic: "Vous avez restreint au contenu vérifiable dans un seul sujet."
+      filtered_topic: "Vous avez restreint à un seul sujet le contenu à examiner."
       filtered_user: "Utilisateur"
+      filtered_reviewed_by: "Examiné par"
       show_all_topics: "afficher tous les sujets"
       deleted_post: "(message supprimé)"
       deleted_user: "(utilisateur supprimé)"
@@ -416,10 +420,11 @@ fr:
         email: "Courriel"
         name: "Nom"
         fields: "Champs"
+        reject_reason: "Raison"
       user_percentage:
         summary:
-          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} signalement en total)"
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} signalements en total)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (du dernier signalement)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (des derniers %{count} signalements)"
         agreed:
           one: "%{count}% accepté"
           other: "%{count}% acceptés"
@@ -443,7 +448,7 @@ fr:
         one: "%{count} réponse"
         other: "%{count} réponses"
       edit: "Modifier"
-      save: "Sauvegarder"
+      save: "Enregistrer"
       cancel: "Annuler"
       new_topic: "Approuver cet élément créera un nouveau sujet"
       filters:
@@ -462,7 +467,8 @@ fr:
           created_at_asc: "Date de création (inverse)"
         priority:
           title: "Priorité minimum"
-          low: "(tous)"
+          any: "(toutes)"
+          low: "Basse"
           medium: "Moyenne"
           high: "Élevée"
       conversation:
@@ -474,7 +480,7 @@ fr:
         type: "Type"
         status: "État"
         submitted_by: "Soumis par"
-        reviewed_by: "Vérifié par"
+        reviewed_by: "Examiné par"
       statuses:
         pending:
           title: "En attente"
@@ -487,7 +493,7 @@ fr:
         deleted:
           title: "Supprimés"
         reviewed:
-          title: "(vérifiés)"
+          title: "(examinés)"
         all:
           title: "(tous)"
       types:
@@ -500,6 +506,8 @@ fr:
           title: "Message en file d'attente"
         reviewable_user:
           title: "Utilisateur"
+        reviewable_post:
+          title: "Message"
       approval:
         title: "Ce message doit être approuvé"
         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."
@@ -507,6 +515,41 @@ fr:
           one: "Vous avez <strong>%{count}</strong> message en attente."
           other: "Vous avez <strong>%{count}</strong> messages en attente."
         ok: "OK"
+      example_username: "nom d'utilisateur"
+      reject_reason:
+        title: "Pourquoi refusez-vous cet utilisateur ?"
+        send_email: "Envoyer le courriel de refus"
+    relative_time_picker:
+      minutes:
+        one: "minute"
+        other: "minutes"
+      hours:
+        one: "heure"
+        other: "heures"
+      days:
+        one: "jour"
+        other: "jours"
+      months:
+        one: "mois"
+        other: "mois"
+      years:
+        one: "année"
+        other: "années"
+      relative: "Relatif"
+    time_shortcut:
+      later_today: "Plus tard dans la journée"
+      next_business_day: "Au prochain jour ouvré"
+      tomorrow: "Demain"
+      next_week: "La semaine prochaine"
+      post_local_date: "À la date dans le message"
+      later_this_week: "Plus tard dans la semaine"
+      start_of_next_business_week: "Lundi"
+      start_of_next_business_week_alt: "Lundi prochain"
+      next_month: "Le mois prochain"
+      custom: "Date et heure personnalisées"
+      relative: "Me le rappeler d'ici"
+      none: "Ne pas me le rappeler"
+      last_custom: "Date et heure personnalisées précédentes"
     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>"
@@ -582,7 +625,7 @@ fr:
           notification: Notification
         email:
           title: "Courriel"
-          status: "Synchronisés %{old_emails} / %{total_emails} courriels via IMAP."
+          status: "%{old_emails} / %{total_emails} courriels synchronisés via IMAP."
           credentials:
             title: "Identifiants"
             smtp_server: "Serveur SMTP"
@@ -593,6 +636,10 @@ fr:
             imap_ssl: "Utiliser SSL pour IMAP"
             username: "Nom d'utilisateur"
             password: "Mot de passe"
+          settings:
+            title: "Paramètres"
+            allow_unknown_sender_topic_replies: "Autoriser des réponses par un expéditeur inconnu."
+            allow_unknown_sender_topic_replies_hint: "Permet aux expéditeurs inconnus de répondre aux sujets du groupe. Si cette option n'est pas activée, les réponses provenant d'adresses courriel qui ne sont pas déjà incluses dans le fil de discussion IMAP ou invitées au sujet créeront un nouveau sujet."
           mailboxes:
             synchronized: "Boîte aux lettres synchronisée"
             none_found: "Aucune boîte aux lettres n'a été trouvée pour ce compte de courriel."
@@ -603,12 +650,21 @@ fr:
         categories:
           title: Catégories
           long_title: "Notifications par défaut de la catégorie"
-          description: "Lorsque des utilisateurs sont ajoutés à ce groupe, leurs paramètres de notification de catégorie seront définis à ces valeurs par défaut. Ensuite, ils pourront les modifier."
+          description: "Lorsque des utilisateurs sont ajoutés à ce groupe, leurs paramètres de notification de catégorie seront définis à ces valeurs par défaut. Ils pourront les modifier par la suite."
           watched_categories_instructions: "Surveiller automatiquement tous les sujets de ces catégories. Les membres du groupe seront notifiés de tous les nouveaux messages et sujets, et le nombre de nouveaux messages apparaîtra à coté de leur sujet."
           tracked_categories_instructions: "Suivre automatiquement tous les sujets dans ces catégories. Le nombre de nouveaux messages apparaîtra à côté de leur sujet."
+          watching_first_post_categories_instructions: "Les utilisateurs seront notifiés du premier message de chaque sujet dans ces catégories."
+          regular_categories_instructions: "Si ces catégories sont mises sous silence, elles ne le seront pas pour les membres de groupe. Les utilisateurs seront avertis s'ils sont mentionnés ou si quelqu'un leur répond."
+          muted_categories_instructions: "Les utilisateurs ne seront pas notifiés des nouveaux sujets dans ces catégories et ces sujets n'apparaîtront pas sur les pages des catégories et des sujets récents."
         tags:
           title: Étiquettes
           long_title: "Notifications par défaut des étiquettes"
+          description: "Lorsque des utilisateurs sont ajoutés à ce groupe, leurs paramètres de notification d'étiquettes seront définis à ces valeurs par défaut. Ils pourront les modifier par la suite."
+          watched_tags_instructions: "Surveiller automatiquement tous les sujets avec ces étiquettes. Les membres du groupe seront notifiés de tous les nouveaux messages et sujets, et le nombre de nouveaux messages apparaîtra à coté de leur sujet."
+          tracked_tags_instructions: "Suivre automatiquement tous les sujets avec ces étiquettes. Le nombre de nouveaux messages apparaîtra à côté de leur sujet."
+          watching_first_post_tags_instructions: "Les utilisateurs seront notifiés du premier message de chaque sujet avec ces étiquettes."
+          regular_tags_instructions: "Si ces étiquettes sont mises sous silence, elles ne le seront pas pour les membres de groupe. Les utilisateurs seront avertis s'ils sont mentionnés ou si quelqu'un leur répond."
+          muted_tags_instructions: "Les utilisateurs ne seront pas notifiés des nouveaux sujets avec ces étiquettes et ces sujets n'apparaîtront pas sur la page des sujets récents."
         logs:
           title: "Journaux"
           when: "Date"
@@ -685,7 +741,22 @@ fr:
         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"
+        make_primary: "Rendre Principal"
+        make_primary_description: "Faire de ce groupe le principal pour <b>%{username}</b>"
+        remove_primary: "Retirer en tant que principal"
+        remove_primary_description: "Retirer ce groupe comme étant principal pour <b>%{username}</b>"
+        remove_members: "Enlever les membres"
+        remove_members_description: "Enlever les utilisateurs sélectionnés de ce groupe"
+        make_owners: "Rendre propriétaires"
+        make_owners_description: "Rendre les utilisateurs sélectionnés propriétaires de ce groupe"
+        remove_owners: "Enlever comme propriétaires"
+        remove_owners_description: "Retirer aux utilisateurs sélectionnés l'attribut propriétaire de ce groupe"
+        make_all_primary: "Rendre Principal pour tous"
+        make_all_primary_description: "En faire le groupe principal pour tous les utilisateurs sélectionnés"
+        remove_all_primary: "Retirer en tant que principal"
+        remove_all_primary_description: "Supprimer ce groupe en tant que principal"
         owner: "Propriétaire"
+        primary: "Principal"
         forbidden: "Vous n'êtes pas autorisé à voir les membres."
       topics: "Sujets"
       posts: "Messages"
@@ -696,9 +767,9 @@ fr:
         mentionable: "Qui peut @mentionner ce groupe ?"
         messageable: "Qui peut envoyer un message à ce groupe ?"
         nobody: "Personne"
-        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 "
+        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: "Seulement les propriétaires du groupe, les modérateurs et les administrateurs"
         everyone: "Tout le monde"
       notifications:
@@ -716,7 +787,7 @@ fr:
           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."
+          description: "Vous ne recevrez aucune notification concernant les messages de ce groupe."
       flair_url: "Image de la vignette d'avatar"
       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"
@@ -751,24 +822,34 @@ fr:
       reorder:
         title: "Réordonner les catégories"
         title_long: "Réorganiser la liste des catégories"
-        save: "Sauvegarder cet ordre"
+        save: "Enregistrer l'ordonnancement"
         apply_all: "Appliquer"
         position: "Position"
       posts: "Messages"
       topics: "Sujets"
       latest: "Récents"
-      latest_by: "dernier sujet de"
       toggle_ordering: "modifier le mode du tri"
       subcategories: "Sous-catégories"
+      muted: "Catégories mises sous silence"
       topic_sentence:
         one: "%{count} sujet"
         other: "%{count} sujets"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "semaine"
+        month: "mois"
+      topic_stat_all_time:
+        one: "%{number} au total"
+        other: "%{number} au total"
       topic_stat_sentence_week:
         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)…"
     ip_lookup:
       title: Localisation de l'adresse IP
       hostname: Nom de l'hôte
@@ -812,23 +893,39 @@ fr:
         ignore_duration_username: "Nom d'utilisateur"
         ignore_duration_when: "Durée :"
         ignore_duration_save: "Ignorer"
-        ignore_duration_note: "Veuillez noter que les utilisateurs ne seront plus ignorés une fois le délai passé."
+        ignore_duration_note: "Veuillez noter que les utilisateurs ne seront plus ignorés une fois le délai écoulé."
         ignore_duration_time_frame_required: "Veuillez sélectionner un intervalle de temps"
-        ignore_no_users: "Vous n'avez aucun utilisateur ignoré."
+        ignore_no_users: "Vous n'ignorez aucun utilisateur."
         ignore_option: "Ignoré"
         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."
+        mute_option_title: "Vous ne recevrez pas de notifications en lien avec cet utilisateur."
         normal_option: "Normal"
         normal_option_title: "Vous serez notifié si cet utilisateur vous répond, vous cite ou vous mentionne."
+      notification_schedule:
+        title: "Planning des notifications"
+        label: "Activer la planification personnalisée des notifications"
+        tip: "Vous basculerez automatiquement en mode \"Ne pas déranger\" en-dehors de ces horaires."
+        midnight: "Minuit"
+        none: "Jamais"
+        monday: "Lundi"
+        tuesday: "Mardi"
+        wednesday: "Mercredi"
+        thursday: "Jeudi"
+        friday: "Vendredi"
+        saturday: "Samedi"
+        sunday: "Dimanche"
+        to: "pour"
       activity_stream: "Activité"
+      read: "Lus"
+      read_help: "Sujets lus récemment"
       preferences: "Préférences"
       feature_topic_on_profile:
         open_search: "Sélectionner un nouveau sujet"
         title: "Sélectionner un sujet"
         search_label: "Rechercher des sujets par titre"
-        save: "Sauvegarder"
+        save: "Enregistrer"
         clear:
           title: "Vider"
           warning: "Êtes-vous sûr de vouloir masquer votre sujet vedette ?"
@@ -851,22 +948,39 @@ 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."
+        each_browser_note: 'Remarque : Vous devez modifier ce paramètre sur chaque navigateur que vous utilisez. Toutes les notifications seront désactivées lorsque vous êtes en mode « Ne pas déranger », quel que soit ce paramètre.'
         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"
+      no_messages_title: "Vous n'avez aucun message"
+      no_messages_body: >
+        Besoin d'échanger directement avec une personne, en-dehors de la conversation principale ? Sélectionnez leur avatar et utilisez le bouton %{icon} pour leur écrire un message.<br><br>Pour obtenir de l'aide, <a href='%{aboutUrl}'>écrivez à un des responsables du site</a>.
+      no_bookmarks_title: "Vous n'avez pas encore créé de signet"
+      no_bookmarks_body: >
+        Le bouton %{icon} vous permet de marquer d'un signet les messages qui vous intéressent particulièrement — ils s'afficheront alors ici, et vous les aurez sous la main. Pour vous organiser, vous pourrez même planifier une alerte associée à un signet&nbsp;!
+      no_notifications_title: "Vous n'avez pas encore reçu de notifications"
+      no_notifications_body: >
+        Des notifications s'afficheront ici pour vous informer de l'activité qui vous concerne directement sur le forum, telle que : des réponses qui vous sont faites, des personnes qui citent vos messages ou qui mentionnent votre <b>@pseudo</b>, et des nouveaux messages publiés dans des sujets que vous suivez. Si vous ne vous êtes pas connecté au forum depuis un moment, vous recevrez aussi ces notifications par courriel.<br><br>Un peu partout sur le forum, le bouton %{icon} vous permettra de choisir les sujets, les catégories et les étiquettes pour lesquels vous recevez des notifications. Vous trouverez aussi des réglages dans la section <a href='%{preferencesUrl}'>Notifications</a> de votre page de préférences.
       first_notification: "Votre première notification ! Cliquez-la pour démarrer."
       dynamic_favicon: "Faire apparaître le compteur sur l'icône du navigateur"
       skip_new_user_tips:
-        description: "Ignorer les badges et conseils d'intégration des nouveaux utilisateurs."
-        not_first_time: "Pas votre première fois ?"
+        description: "Ignorer les badges et les conseils d'intégration des nouveaux utilisateurs."
+        not_first_time: "Vous connaissez déjà ?"
         skip_link: "Ignorer ces conseils"
       theme_default_on_all_devices: "En faire mon thème par défaut sur tous mes périphériques"
+      color_scheme_default_on_all_devices: "Définir comme jeux de couleurs par défaut sur tous mes appareils"
+      color_scheme: "Jeu de couleurs"
       color_schemes:
+        default_description: "Couleur du thème"
+        disable_dark_scheme: "Désactivé"
+        dark_instructions: "Vous pouvez prévisualiser le jeu de couleurs du mode sombre en activant le mode sombre de votre appareil."
+        undo: "Réinitialiser"
+        regular: "Normal"
         dark: "Mode sombre"
+        default_dark_scheme: "(par défaut)"
       dark_mode: "Mode sombre"
-      dark_mode_enable: "Activer le jeu de couleurs automatique du mode sombre"
+      dark_mode_enable: "Activer le mode sombre automatiquement"
       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"
@@ -881,7 +995,8 @@ fr:
       silenced_tooltip: "Cet utilisateur est mis sous silence"
       suspended_notice: "L'utilisateur est suspendu jusqu'au %{date}."
       suspended_permanently: "Cet utilisateur est suspendu."
-      suspended_reason: "Raison :"
+      suspended_reason: "Raison : "
+      github_profile: "GitHub"
       email_activity_summary: "Résumé d'activité"
       mailing_list_mode:
         label: "Liste de diffusion"
@@ -898,25 +1013,27 @@ fr:
       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: "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."
+      tracked_tags_instructions: "Vous suivrez automatiquement tous les sujets avec ces étiquettes. Le nombre de nouveaux messages apparaîtra à côté du sujet."
       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."
+      muted_tags_instructions: "Vous ne recevrez aucune notification concernant les nouveaux sujets avec ces étiquettes et ces sujets n'apparaîtront pas sur la page 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."
       tracked_categories: "Suivies"
-      tracked_categories_instructions: "Vous allez suivre automatiquement tous les sujets dans ces catégories. Le nombre de nouveaux messages apparaîtra à côté du sujet."
+      tracked_categories_instructions: "Vous suivrez automatiquement tous les sujets dans ces catégories. Le nombre de nouveaux messages apparaîtra à côté du sujet."
       watched_first_post_categories: "Surveiller les nouveaux sujets"
       watched_first_post_categories_instructions: "Vous serez notifié du premier message de chaque sujet dans ces catégories."
       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 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."
+      muted_categories_instructions: "Vous ne recevrez aucune notification concernant les nouveaux sujets dans ces catégories et ces sujets n'apparaîtront pas sur les pages des catégories et des sujets récents."
+      muted_categories_instructions_dont_hide: "Vous ne recevrez aucune notification concernant les nouveaux sujets dans ces catégories."
+      regular_categories: "Normal"
+      regular_categories_instructions: "Vous verrez ces catégories dans les listes de sujets « Récents » et « Top »."
+      no_category_access: "Du fait de votre statut de modérateur, votre accès aux catégories est limité. L'enregistrement est désactivé."
       delete_account: "Supprimer mon compte"
       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."
+      delete_yourself_not_allowed: "Veuillez contacter un responsable si vous souhaitez supprimer votre compte."
       unread_message_count: "Messages"
       admin_delete: "Supprimer"
       users: "Utilisateurs"
@@ -924,6 +1041,7 @@ fr:
       muted_users_instructions: "Ignorer toutes les notifications et messages directs provenant de ces utilisateurs."
       allowed_pm_users: "Autorisés"
       allowed_pm_users_instructions: "Autoriser uniquement les messages directs de ces utilisateurs."
+      allow_private_messages_from_specific_users: "Autoriser uniquement des utilisateurs spécifiques à m'envoyer des messages directs"
       ignored_users: "Ignorés"
       ignored_users_instructions: "Ignorer tous les messages, notifications et messages directs provenant de ces utilisateurs."
       tracked_topics_link: "Afficher"
@@ -932,7 +1050,7 @@ fr:
       revoke_access: "Révoquer l'accès"
       undo_revoke_access: "Annuler la révocation d'accès"
       api_approved: "Approuvé :"
-      api_last_used_at: "Dernièrement utilisé le :"
+      api_last_used_at: "Dernière utilisation :"
       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"
@@ -958,6 +1076,7 @@ fr:
         tags: "Étiquettes"
       preferences_nav:
         account: "Compte"
+        security: "Sécurité"
         profile: "Profil"
         emails: "Courriels"
         notifications: "Notifications"
@@ -970,25 +1089,36 @@ fr:
         success: "(courriel envoyé)"
         in_progress: "(courriel en cours d'envoi)"
         error: "(erreur)"
-        emoji: "emoji de cadenas"
+        emoji: "émoji 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"
         choose: "Choisissez un mot de passe"
       second_factor_backup:
-        regenerate: "Regénérer"
+        title: "Codes de secours de la validation en deux étapes"
+        regenerate: "Régénérer"
         disable: "Désactiver"
         enable: "Activer"
         enable_long: "Activer les codes de secours"
+        manage:
+          one: "Gérer les codes de secours. Il vous reste <strong>%{count}</strong> code de secours."
+          other: "Gérer les codes de secours. Il vous reste <strong>%{count}</strong> codes de secours."
         copy_to_clipboard: "Copier dans le presse-papier"
         copy_to_clipboard_error: "Erreur en copiant les données dans le presse-papier"
         copied_to_clipboard: "Copié dans le presse-papier"
         download_backup_codes: "Télécharger les codes de secours"
+        remaining_codes:
+          one: "Il vous reste <strong>%{count}</strong> code de secours."
+          other: "Il vous reste <strong>%{count}</strong> codes de secours."
         use: "Utiliser un code de secours"
+        enable_prerequisites: "Vous devez activer une validation principale en deux étapes avant de générer des codes de secours."
         codes:
           title: "Codes de secours générés"
           description: "Chaque code de secours ne peut être utilisé qu'une seule fois. Garder les dans un endroit sûr mais accessible."
       second_factor:
+        title: "Validation en deux étapes"
+        enable: "Gérer la validation en deux étapes"
+        disable_all: "Tout désactiver"
         forgot_password: "Mot de passe oublié ?"
         confirm_password_description: "Merci de confirmer votre mot de passe pour continuer"
         name: "Nom"
@@ -996,21 +1126,28 @@ fr:
         rate_limit: "Veuillez patienter avant d'essayer un autre code d'identification."
         enable_description: |
           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"
+        disable_description: "Veuillez saisir le code d'authentification généré par l'application"
         show_key_description: "Saisir manuellement"
         short_description: |
           Protéger votre compte avec des codes de sécurité à usage unique.
+        extended_description: |
+          La validation en deux étapes 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 aux réseaux sociaux seront désactivées à l'activation de la validation en deux étapes sur votre compte."
         use: "Utiliser l'application Authenticator"
+        enforced_notice: "Vous devez activer la validation en deux étapes avant d'accéder à ce site."
         disable: "Désactiver"
-        save: "Sauvegarder"
+        disable_confirm: "Êtes-vous sûr de vouloir désactiver toutes les validations en deux étapes ?"
+        save: "Enregistrer"
         edit: "Modifier"
+        edit_title: "Gérer l'application d'authentification"
+        edit_description: "Nom de l'application d'authentification"
         enable_security_key_description: |
           Dès que votre <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">clé de sécurité physique</a> est prête, appuyer sur le bouton Enregistrer ci-dessous.
         totp:
           title: "Authentificateurs à base de jetons"
-          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."
+          add: "Ajouter une application d'authentification"
+          default_name: "Mon application d'authentification"
+          name_and_code_required_error: "Vous devez donner un nom et le code de votre application d'authentification."
         security_key:
           register: "Enregistrer"
           title: "Clés de sécurité"
@@ -1019,7 +1156,7 @@ fr:
           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"
+          save: "Enregistrer"
           edit_description: "Nom de la clé de sécurité"
           name_required_error: "Vous devez donner un nom à votre clé de sécurité."
       change_about:
@@ -1038,6 +1175,7 @@ fr:
         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_via_admin: "Nous avons envoyé un courriel à cette adresse. L'utilisateur devra suivre les instructions de confirmation indiquées dans le courriel."
         success_staff: "Nous avons envoyé un courriel à votre adresse actuelle. Merci de suivre les instructions."
       change_avatar:
         title: "Modifier votre image de profil"
@@ -1050,6 +1188,7 @@ fr:
         uploaded_avatar_empty: "Ajouter un avatar personnalisé"
         upload_title: "Envoyer votre avatar"
         image_is_not_a_square: "Attention : nous avons découpé votre image ; la largeur et la hauteur n'étaient pas égales."
+        logo_small: "Logo du site en petit format. Sera utilisé par défaut."
       change_profile_background:
         title: "Arrière-plan du profil"
         instructions: "Les arrière-plans du profil seront centrés avec une largeur par défaut de 1110 pixels."
@@ -1072,13 +1211,15 @@ fr:
         set_primary: "Définir comme adresse courriel principale"
         destroy: "Supprimer l'adresse courriel"
         add_email: "Ajouter une adresse courriel alternative"
-        sso_override_instructions: "Le courriel peut être mis à jour à partir du fournisseur SSO."
+        auth_override_instructions: "Le courriel peut être mis à jour à partir du fournisseur d'authentification."
         no_secondary: "Aucune adresse courriel secondaire"
-        instructions: "Jamais visible publiquement."
+        instructions: "Ne sera pas visible publiquement."
+        admin_note: "Remarque : un utilisateur administrateur modifiant l'adresse courriel d'un autre utilisateur non administrateur indique que l'utilisateur a perdu l'accès à son compte de messagerie d'origine, donc un courriel de réinitialisation du mot de passe sera envoyé à sa nouvelle adresse. L'adresse courriel de l'utilisateur ne changera pas tant qu'il n'aura pas terminé le processus de réinitialisation du mot de passe."
         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}"
+        invite_auth_email_invalid: "Votre e-mail d'invitation ne correspond pas à l'e-mail authentifié 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."
@@ -1103,7 +1244,7 @@ fr:
       username:
         title: "Nom d'utilisateur"
         instructions: "unique, sans espaces, court"
-        short_instructions: "Les gens peuvent vous mentionner avec @%{username}"
+        short_instructions: "Les utilisateurs peuvent vous mentionner avec @%{username}"
         available: "Votre nom d'utilisateur est disponible"
         not_available: "Indisponible. Essayez %{suggestion} ?"
         not_available_no_suggestion: "Non disponible"
@@ -1112,6 +1253,7 @@ fr:
         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"
+        edit: "Modifier le nom d'utilisateur"
       locale:
         title: "Langue de l'interface"
         instructions: "Langue de l'interface utilisateur. Le changement sera pris en compte après actualisation de la page."
@@ -1133,7 +1275,10 @@ fr:
         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..."
+        latest_post: "Votre dernier message…"
+        device_location: '<span class="auth-token-device">%{device}</span> &ndash; <span title="IP: %{ip}">%{location}</span>'
+        browser_active: '%{browser} | <span class="active">actif</span>'
+        browser_last_seen: "%{browser} | %{date}"
       last_posted: "Dernier message"
       last_emailed: "Dernier courriel reçu"
       last_seen: "Vu"
@@ -1145,7 +1290,7 @@ fr:
       hide_profile_and_presence: "Cacher mon profil public et statistiques"
       enable_physical_keyboard: "Activer le support du clavier physique sur iPad"
       text_size:
-        title: "Taille de texte"
+        title: "Taille du texte"
         smallest: "Très petite"
         smaller: "Petite"
         normal: "Normale"
@@ -1154,7 +1299,7 @@ fr:
       title_count_mode:
         title: "Le titre de la page en arrière-plan affiche le nombre de :"
         notifications: "Nouvelles notifications"
-        contextual: "Nouveau contenu de page"
+        contextual: "Nouveau contenu de la page"
       like_notification_frequency:
         title: "Notifier lors d'un J'aime"
         always: "Toujours"
@@ -1170,8 +1315,8 @@ fr:
         title: "Lorsque je ne visite pas le site, m'envoyer un courriel avec un résumé des sujets et réponses populaires"
         every_30_minutes: "toutes les 30 minutes"
         every_hour: "toutes les heures"
-        daily: "quotidien"
-        weekly: "hebdomadaire"
+        daily: "tous les jours"
+        weekly: "toutes les semaines"
         every_month: "tous les mois"
         every_six_months: "tous les six mois"
       email_level:
@@ -1205,57 +1350,88 @@ fr:
         after_10_minutes: "après 10 minutes"
       notification_level_when_replying: "Quand j'ai répondu dans un sujet, le régler sur"
       invited:
-        search: "commencer à saisir pour rechercher vos invitations…"
         title: "Invitations"
+        pending_tab: "En attente"
+        pending_tab_with_count: "En attente (%{count})"
+        expired_tab: "Expirées"
+        expired_tab_with_count: "Expirées (%{count})"
+        redeemed_tab: "Acceptées"
+        redeemed_tab_with_count: "Invitations acceptées (%{count})"
+        invited_via: "Invitation"
+        invited_via_link: "lien %{key} (%{count} / %{max} utilisés)"
+        groups: "Groupes"
+        topic: "Sujet"
+        sent: "Date de création/d'envoi précédent"
+        expires_at: "Expire le"
+        edit: "Modifier"
+        remove: "Supprimer"
+        copy_link: "Obtenir le lien"
+        reinvite: "Renvoyer un courriel"
+        reinvited: "Invitation renvoyée"
+        removed: "Supprimé"
+        search: "commencer à saisir pour rechercher vos invitations…"
         user: "Utilisateurs"
-        sent: "Derniers envoyés"
         none: "Aucune invitation à afficher."
         truncated:
           one: "Afficher la première invitation."
           other: "Afficher les %{count} premières invitations."
         redeemed: "Invitations acceptées"
-        redeemed_tab: "Acceptées"
-        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})"
         topics_entered: "Sujets consultés"
         posts_read_count: "Messages lus"
         expired: "Cette invitation a expiré."
-        rescind: "Supprimer"
-        rescinded: "Invitation annulée"
-        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"
+        remove_all: "Supprimer les invitations arrivées à expiration"
+        removed_all: "Toutes les invitations arrivées à expiration ont été supprimées !"
+        remove_all_confirm: "Êtes-vous sûr de vouloir supprimer toutes les invitations arrivées à expiration ?"
         reinvite_all: "Renvoyer toutes les invitations"
         reinvite_all_confirm: "Êtes-vous sûr de renvoyer toutes les invitations ?"
-        reinvited: "Invitation renvoyée"
-        reinvited_all: "Invitations renvoyées !"
+        reinvited_all: "Toutes les invitations ont été envoyées !"
         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: "Inviter"
+        generate_link: "Créer un lien d'invitation"
+        link_generated: "Voici votre lien d'invitation !"
         valid_for: "Le lien d'invitation est seulement valide pour cette adresse courriel : %{email}"
+        single_user: "Inviter par courriel"
+        multiple_user: "Inviter par lien"
         invite_link:
           title: "Lien d'invitation"
-          success: "Lien d'invitation généré avec succés !"
+          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 ?"
+        invite:
+          new_title: "Créer une invitation"
+          edit_title: "Modifier l'invitation"
+          instructions: "Partagez ce lien pour donner instantanément accès au site :"
+          copy_link: "copier le lien"
+          expires_in_time: "Expire dans %{time}."
+          expired_at_time: "Expiré à %{time}."
+          show_advanced: "Afficher les options avancées"
+          hide_advanced: "Masquer les options avancées"
+          restrict_email: "Restreindre cette invitation au propriétaire d'une adresse de courriel donnée"
+          max_redemptions_allowed: "Nombre maximum d'utilisations :"
+          add_to_groups: "Ajouter la personne invitée à ces groupes :"
+          invite_to_topic: "À sa première connexion, diriger la personne invitée vers ce sujet :"
+          expires_at: "Ce lien expirera :"
+          custom_message: "Message personnel facultatif :"
+          send_invite_email: "Enregistrer et envoyer le courriel"
+          save_invite: "Enregistrer l'invitation"
+          invite_saved: "Invitation enregistrée."
+          invite_copied: "Lien d'invitation copié."
+          blank_email: "Lien d'invitation non copié. Une adresse courriel est requise."
         bulk_invite:
+          none: "Aucune invitation à afficher sur cette page."
           text: "Invitation en masse"
-          success: "Le fichier a été correctement importé. Vous serez notifié par message direct lorsque le traitement sera terminé."
+          instructions: |
+            <p>Pour mettre votre communauté sur pied rapidement, invitez une liste d'utilisateurs : composez un <a href="https://fr.wikipedia.org/wiki/Fichier_CSV" target="_blank">fichier CSV</a> contenant l'adresse de chaque personne à inviter, en disposant une adresse par ligne. Pour ajouter certaines personnes à des groupes particuliers, ou pour les diriger automatiquement vers un sujet particulier lors de leur première connexion, vous pouvez faire figurer les éléments suivants.</p>
+            <pre>jean@dupont.fr,nom_dun_groupe;nom_dun_autre_groupe,identifiant_numérique_du_sujet</pre>
+            <p>Un courriel d'invitation sera envoyé à chaque adresse contenue dans ce fichier CSV, et vous pourrez modifier son contenu après l'avoir envoyé sur le serveur.</p>
+          progress: "Envoi en cours : %{progress}%…"
+          success: "Le fichier a été téléversé. Une notification vous signalera la fin de son importation effective."
           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é."
       password:
         title: "Mot de passe"
         too_short: "Votre mot de passe est trop court."
@@ -1263,7 +1439,7 @@ fr:
         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."
+        instructions: "au moins %{count} caractères"
         required: "Veuillez entrer un mot de passe"
       summary:
         title: "Résumé"
@@ -1319,6 +1495,8 @@ fr:
       avatar:
         title: "Image de profil"
         header_title: "profil, messages, signets et préférences"
+        name_and_description: "%{name} - %{description}"
+        edit: "Modifier l'image de profil"
       title:
         title: "Titre"
         none: "(aucun)"
@@ -1356,35 +1534,26 @@ fr:
       close: "fermer"
       dismiss_error: "Ignorer l'erreur"
     close: "Fermer"
-    assets_changed_confirm: "Ce site vient d'être mis à jour. Actualiser la page pour accéder à la nouvelle version ?"
+    assets_changed_confirm: "Une mise à jour est disponible pour ce site. Souhaitez-vous obtenir la dernière version ?"
     logout: "Vous avez été déconnecté."
     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."
+      enabled: "Le site est en mode lecture seule. Vous pouvez continuer à 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.
+      <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.
+      <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}}."
-      exceeded_hour_MF: "{relativeAge} – {rate, plural, one {# erreur/heure} other {# erreurs/heure}} a dépassé la limite paramétrée de {limit, plural, one {# erreur/heure} other {# erreurs/heure}}."
-      exceeded_minute_MF: " {relativeAge} – {rate, plural, one {# erreur/heure} other {# erreurs/heure}} a dépassé la limite paramétrée de {limit, plural, one {# erreur/heure} other {# erreurs/heure}}."
+      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erreur/heure} other {# erreurs/heure}}</a> arrive à la limite paramétrée de {limit, plural, one {# erreur/heure} other {# erreurs/heure}}."
+      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erreur/minute} other {# erreurs/minute}}</a> arrive à la limite paramétrée de {limit, plural, one {# erreur/minute} other {# erreurs/minute}}."
+      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erreur/heure} other {# erreurs/heure}}</a> a dépassé la limite paramétrée de {limit, plural, one {# erreur/heure} other {# erreurs/heure}}."
+      exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erreur/minute} other {# erreurs/minute}}</a> a dépassé la limite paramétrée de {limit, plural, one {# erreur/minute} other {# erreurs/minute}}."
     learn_more: "en savoir plus…"
-    all_time: "total"
-    all_time_desc: "nombre total de sujets créés"
-    year: "an"
-    year_desc: "sujets créés durant les 365 derniers jours"
-    month: "mois"
-    month_desc: "sujets créés durant les 30 derniers jours"
-    week: "semaine"
-    week_desc: "sujets créés durant les 7 derniers jours"
-    day: "jour"
     first_post: Premier message
     mute: Désactiver
     unmute: Activer
@@ -1402,13 +1571,15 @@ 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, nous vous demanderons demain. Vous pouvez aussi utiliser le bouton « Se connecter » pour vous créer un compte."
       intro: "Bonjour ! Vous semblez apprécier la discussion, mais n'avez pas encore créé de compte."
       value_prop: "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:
+        one: "Il y a <b>%{count}</b> réponse."
+        other: "Il y a <b>%{count}</b> réponses."
+      description_time_MF: "Il y a {replyCount, plural, one {<b>#</b> réponse} other {<b>#</b> réponses}} avec un temps de lecture estimé à <b>{readingTime, plural, one {# minute} other {# minutes}}</b>."
       enable: "Résumer ce sujet"
       disable: "Afficher tous les messages"
     deleted_filter:
@@ -1418,6 +1589,10 @@ fr:
       disable: "Afficher les messages supprimés"
     private_message_info:
       title: "Message direct"
+      invite: "Inviter d'autres utilisateurs…"
+      edit: "Ajouter ou supprimer…"
+      remove: "Supprimer…"
+      add: "Ajouter…"
       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 ?"
@@ -1429,8 +1604,10 @@ fr:
     trust_level: "Niveau de confiance"
     search_hint: "nom d'utilisateur, courriel ou adresse IP"
     create_account:
+      header_title: "Bienvenue !"
+      subheader_title: "Créons votre compte"
       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"
+      title: "Créer votre 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:
       title: "Réinitialisation du mot de passe"
@@ -1449,7 +1626,8 @@ fr:
     email_login:
       link_label: "M'envoyer un lien de connexion par courriel"
       button_label: "par courriel"
-      emoji: "emoji de cadenas"
+      login_link: "Ignorez le mot de passe ; envoyez-moi un lien de connexion"
+      emoji: "émoji 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 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."
@@ -1460,11 +1638,15 @@ fr:
       logging_in_as: Connexion en tant que %{email}
       confirm_button: Complétez la connexion
     login:
+      header_title: "Ravi de vous revoir"
+      subheader_title: "Connectez-vous à votre compte"
       title: "Se connecter"
       username: "Utilisateur"
       password: "Mot de passe"
-      second_factor_description: "Veuillez saisir le code d'authentification de votre app :"
+      second_factor_title: "Validation en deux étapes"
+      second_factor_description: "Veuillez saisir le code d'authentification généré par votre application :"
       second_factor_backup: "Se connecter avec un code de secours"
+      second_factor_backup_title: "Authentification à deux facteurs (code de secours)"
       second_factor_backup_description: "Veuillez entrer un de vos codes de secours :"
       second_factor: "Se connecter avec une application"
       security_key_description: "Dès que votre clé de sécurité physique est prête, appuyer sur le bouton S'authentifier avec une clé de sécurité ci-dessous."
@@ -1473,8 +1655,8 @@ 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 nom d'utilisateur"
-      caps_lock_warning: "Majuscules vérrouillées"
+      email_placeholder: "Courriel ou nom d'utilisateur"
+      caps_lock_warning: "Majuscules verrouillé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."
@@ -1488,8 +1670,10 @@ fr:
       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_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 courriel"
       provide_new_email: "Donnez une nouvelle adresse et nous allons renvoyer votre courriel de confirmation."
@@ -1522,7 +1706,7 @@ fr:
         backup_code: "Utilisez plutôt un code de secours"
     invites:
       accept_title: "Invitation"
-      emoji: "emoji d'enveloppe"
+      emoji: "émoji 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."
@@ -1530,6 +1714,7 @@ fr:
       accept_invite: "Accepter l'invitation"
       success: "Votre compte a été créé et vous êtes maintenant connecté."
       name_label: "Nom"
+      password_label: "Mot de passe"
       optional_description: "(facultatif)"
     password_reset:
       continue: "Continuer vers %{site_name}"
@@ -1537,7 +1722,6 @@ fr:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (précédemment EmojiOne)"
       win10: "Win10"
       google_classic: "Classique Google"
       facebook_messenger: "Facebook Messenger"
@@ -1555,10 +1739,22 @@ fr:
       enter: "Entrée"
     conditional_loading_section:
       loading: Chargement…
+    category_row:
+      topic_count:
+        one: "%{count} sujet dans cette catégorie"
+        other: "%{count} sujets dans cette catégorie"
+      plus_subcategories_title:
+        one: "%{name} et une sous-catégorie"
+        other: "%{name} et %{count} sous-catégories"
+      plus_subcategories:
+        one: "+ %{count} sous-catégorie"
+        other: "+ %{count} sous-catégories"
     select_kit:
+      filter_by: "Filtrer par : %{name}"
+      select_to_filter: "Sélectionner une valeur à filtrer"
       default_header_text: Sélectionner…
       no_content: Aucune correspondance trouvée
-      filter_placeholder: Rechercher...
+      filter_placeholder: Rechercher…
       filter_placeholder_with_any: Rechercher ou créer…
       create: "Créer : « %{content} »"
       max_content_reached:
@@ -1567,13 +1763,19 @@ fr:
       min_content_not_reached:
         one: "Sélectionner au moins %{count} élément."
         other: "Sélectionner au moins %{count} éléments."
+      invalid_selection_length:
+        one: "La sélection doit contenir au minimum %{count} caractère."
+        other: "La sélection doit contenir au minimum %{count} caractères."
+      components:
+        tag_drop:
+          filter_for_more: et plus encore…
+        categories_admin_dropdown:
+          title: "Gérer les catégories"
     date_time_picker:
       from: De
       to: À
-      errors:
-        to_before_from: "La date de fin doit être postérieure à celle de début."
     emoji_picker:
-      filter_placeholder: Rechercher un emoji
+      filter_placeholder: Rechercher un émoji
       smileys_&_emotion: Frimousses et émotions
       people_&_body: Personnes et corps
       animals_&_nature: Animaux et nature
@@ -1590,29 +1792,31 @@ fr:
       medium_tone: Teint moyen
       medium_dark_tone: Teint légèrement foncé
       dark_tone: Teint foncé
-      default: Emojis personnalisés
+      default: Émojis 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>."
+      notice: "Ce sujet n'est visible que par ceux qui peuvent publier des brouillons partagés."
       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..."
+      publishing: "Sujet en cours de publication…"
     composer:
-      emoji: "Emoji :)"
+      emoji: "Émoji :)"
       more_emoji: "plus…"
       options: "Options"
       whisper: "murmure"
       unlist: "invisible"
-      blockquote_text: "Citation"
       add_warning: "Ceci est un avertissement officiel."
       toggle_whisper: "Basculer murmure"
       toggle_unlisted: "Basculer la visibilité"
       posting_not_on_topic: "À quel sujet voulez-vous répondre ?"
-      saved_local_draft_tip: "sauvegardé en local"
+      saved_local_draft_tip: "enregistré sur votre appareil"
       similar_topics: "Votre sujet est similaire à…"
       drafts_offline: "brouillons hors ligne"
       edit_conflict: "conflit de modification"
+      group_mentioned_limit:
+        one: "<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 %{count} utilisateur configuré par l'administrateur. Personne ne sera notifié."
+        other: "<b>Attention !</b> Vous avez mentionné <a href='%{group_link}'>%{group}</a>, cependant ce groupe a plus de membres que le nombre de mentions limite de %{count} 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 ?"
@@ -1623,14 +1827,23 @@ fr:
       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:
+          one: "Le titre doit avoir au moins %{count} caractère"
+          other: "Le titre doit faire au moins %{count} caractères"
+        title_too_long:
+          one: "Le titre ne doit pas faire plus de %{count} caractère"
+          other: "Le titre ne doit pas dépasser les %{count} caractères"
         post_missing: "Le message ne peut être vide"
-        post_length: "Le message doit avoir au moins %{min} caractères"
+        post_length:
+          one: "Le message doit avoir au moins %{count} caractère"
+          other: "Le message doit faire au moins %{count} caractères"
         try_like: "Avez-vous essayé le bouton %{heart} ?"
         category_missing: "Vous devez choisir une catégorie"
+        tags_missing:
+          one: "Vous devez choisir au moins %{count} étiquette"
+          other: "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"
+      save_edit: "Enregistrer les modifications"
       overwrite_edit: "Écraser la modification"
       reply_original: "Répondre sur le sujet d'origine"
       reply_here: "Répondre ici"
@@ -1642,22 +1855,22 @@ fr:
       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"
+      users_placeholder: "Ajoutez un utilisateur"
       title_placeholder: "Quel est le sujet en une courte phrase ?"
-      title_or_link_placeholder: "Entrez un titre, ou copiez un lien ici"
+      title_or_link_placeholder: "Saisissez un titre, ou copiez un lien ici"
       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 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: "Saisissez votre message ici. Pour le mettre en forme, utilisez du Markdown, du BBCode ou du HTML. Glissez-déposez ou collez des images."
+      reply_placeholder_no_images: "Saisissez votre message ici. Pour le mettre en forme, utilisez du Markdown, du BBCode ou du HTML."
       reply_placeholder_choose_category: "Sélectionner une catégorie avant de rédiger ici."
       view_new_post: "Voir votre nouveau message."
-      saving: "Sauvegarde"
-      saved: "Sauvegardé !"
+      saving: "Enregistrement en cours"
+      saved: "Enregistré avec succès !"
       saved_draft: "Brouillon de message en cours. Appuyer pour reprendre."
       uploading: "Envoi en cours…"
-      show_preview: "afficher la prévisualisation &raquo;"
-      hide_preview: "&laquo; masquer la prévisualisation"
+      show_preview: "afficher l'aperçu"
+      hide_preview: "masquer l'aperçu"
       quote_post_title: "Citer le message en entier"
       bold_label: "G"
       bold_title: "Gras"
@@ -1667,14 +1880,14 @@ fr:
       italic_text: "texte en italique"
       link_title: "Lien"
       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 rechercher des sujets"
-      quote_title: "Citation"
-      quote_text: "Citation"
+      link_dialog_title: "Insérer un lien"
+      link_optional_text: "titre (facultatif)"
+      link_url_placeholder: "Collez une URL, ou recherchez un sujet du forum en commençant à saisir"
+      blockquote_title: "Citation"
+      blockquote_text: "Citation"
       code_title: "Texte préformaté"
       code_text: "texte préformaté indenté par 4 espaces"
-      paste_code_text: "saisir ou coller le code ici"
+      paste_code_text: "saisissez ou collez du code ici"
       upload_title: "Envoi de fichiers"
       upload_description: "saisir ici la description de votre fichier"
       olist_title: "Liste numérotée"
@@ -1687,12 +1900,16 @@ fr:
       abandon: "fermer le panneau d'édition et supprimer le brouillon"
       enter_fullscreen: "utiliser l'éditeur plein écran"
       exit_fullscreen: "sortir de l'éditeur plein écran"
+      show_toolbar: "afficher la barre d'outils de l'éditeur"
+      hide_toolbar: "masquer la barre d'outils de l'éditeur"
       modal_ok: "OK"
       modal_cancel: "Annuler"
       cant_send_pm: "Désolé, vous ne pouvez pas envoyer de message à l'utilisateur %{username}."
       yourself_confirm:
         title: "Avez-vous oublié d'ajouter des destinataires ?"
         body: "Pour le moment, ce message est uniquement envoyé à vous-même !"
+      slow_mode:
+        error: "Ce sujet est en mode ralenti. Vous avez déjà publié un message récemment ; vous pourrez en publier un autre d'ici %{timeLeft}."
       admin_options_title: "Paramètres optionnels pour ce sujet"
       composer_actions:
         reply: Répondre
@@ -1704,7 +1921,7 @@ fr:
         reply_as_new_topic:
           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é.
+          confirm: Vos brouillons contiennent un nouveau sujet en cours d'écriture. Ce brouillon sera perdu si vous créez un sujet lié.
         reply_as_new_group_message:
           label: Répondre en créant un nouveau message de groupe
           desc: Créer un nouveau message direct avec les mêmes destinataires
@@ -1716,15 +1933,17 @@ fr:
           desc: Répondre au sujet, pas à un message spécifique
         toggle_whisper:
           label: Basculer murmure
-          desc: Les mumures ne sont visibles qu'aux responsables
+          desc: Les murmures ne sont visibles qu'aux responsables
         create_topic:
           label: "Nouveau sujet"
         shared_draft:
           label: "Brouillon partagé"
-          desc: "Créer un brouillon de sujet qui ne sera visible qu'aux responsables"
+          desc: "Créer un brouillon de sujet qui sera visible uniquement aux utilisateurs autorisés"
         toggle_topic_bump:
           label: "Basculer l'actualisation du sujet"
           desc: "Répondre sans changer la date de dernière réponse"
+      reload: "Recharger"
+      ignore: "Ignorer"
     notifications:
       tooltip:
         regular:
@@ -1740,7 +1959,7 @@ fr:
       none: "Impossible de charger les notifications pour le moment."
       empty: "Aucune notification trouvée."
       post_approved: "Votre message a été approuvé"
-      reviewable_items: "éléments en attente de vérification"
+      reviewable_items: "éléments en attente d'examen"
       mentioned: "<span>%{username}</span> %{description}"
       group_mentioned: "<span>%{username}</span> %{description}"
       quoted: "<span>%{username}</span> %{description}"
@@ -1749,6 +1968,10 @@ fr:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} et %{count} autre</span> %{description}"
+        other: "<span class='multi-user'>%{username}, %{username2} et %{count} autres</span> %{description}"
       liked_consolidated_description:
         one: "a aimé %{count} de vos messages"
         other: "a aimé %{count} de vos messages"
@@ -1757,12 +1980,18 @@ fr:
       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}"
+      moved_post: "<span>%{username}</span> a déplacé %{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:
+        one: "%{count} demande d'adhésion ouverte pour « %{group_name} »"
+        other: "%{count} demandes d'adhésion ouvertes pour « %{group_name} »"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
+      votes_released: "%{description} - terminé"
       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}"
@@ -1789,7 +2018,7 @@ fr:
         invitee_accepted: "invitation acceptée"
         posted: "nouveau message"
         moved_post: "message déplacé"
-        linked: "linkés"
+        linked: "lien créé"
         bookmark_reminder: "rappel de signet"
         bookmark_reminder_with_name: "rappel de signet - %{name}"
         granted_badge: "badge attribué"
@@ -1801,20 +2030,23 @@ fr:
         liked_consolidated: "nouveaux J'aime"
         post_approved: "message approuvé"
         membership_request_consolidated: "nouvelles demandes d'adhésion"
+        reaction: "nouvelle réaction"
+        votes_released: "Le vote a été libéré"
     upload_selector:
       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"
       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"
-      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)"
+      remote_tip_with_attachments: "indiquez un lien vers une image ou un autre type de fichier disponible en ligne"
+      local_tip: "choisissez des images stockées dans votre appareil"
+      local_tip_with_attachments: "choisissez des images ou d'autres fichiers stockés dans votre appareil"
+      hint: "(vous pouvez aussi glisser-déposer vos fichiers dans le champ de saisie)"
       hint_for_supported_browsers: "vous pouvez aussi glisser-déposer ou coller des images dans l'éditeur"
       uploading: "En cours d'envoi"
       select_file: "Sélectionner un fichier"
       default_image_alt_text: image
+      supported_formats: "formats de fichier acceptés"
     search:
       sort_by: "Trier par"
       relevance: "Pertinence"
@@ -1840,6 +2072,7 @@ fr:
       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_button: "Recherche"
       context:
         user: "Rechercher dans les messages de @%{username}"
         category: "Rechercher dans la catégorie #%{category}"
@@ -1884,16 +2117,28 @@ fr:
           noreplies: n'ont aucune réponse
           single_user: contiennent un unique utilisateur
         post:
+          count:
+            label: Messages
+          min:
+            placeholder: minimum
+          max:
+            placeholder: maximum
           time:
             label: Date
             before: avant
             after: après
+        views:
+          label: Vues
+        min_views:
+          placeholder: minimum
+        max_views:
+          placeholder: maximum
     hamburger_menu: "aller à une autre catégorie ou liste de sujets"
     new_item: "nouveau"
     go_back: "retour"
-    not_logged_in_user: "page utilisateur avec un résumé de l'activité et les préférences "
+    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: "voir les %{tab}"
     topics:
       new_messages_marker: "dernière visite"
       bulk:
@@ -1914,8 +2159,10 @@ fr:
         change_category: "Définir la catégorie"
         close_topics: "Fermer les sujets"
         archive_topics: "Archiver les sujets"
+        move_messages_to_inbox: "Déplacer dans la boîte de réception"
         notification_level: "Notifications"
-        choose_new_category: "Choisissez la nouvelle catégorie pour les sujets :"
+        change_notification_level: "Modifier le niveau de notification"
+        choose_new_category: "Choisissez la nouvelle catégorie pour ces sujets :"
         selected:
           one: "Vous avez sélectionné <b>%{count}</b> sujet."
           other: "Vous avez sélectionné <b>%{count}</b> sujets."
@@ -1924,26 +2171,36 @@ fr:
         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."
-        remove_tags: "Supprimer les étiquettes"
+        remove_tags: "Supprimer toutes les étiquettes"
+        confirm_remove_tags:
+          one: "Toutes les étiquettes seront supprimées de ce sujet. Êtes-vous sûr ?"
+          other: "Toutes les balises seront supprimées des <b>%{count}</b> sujets. Êtes-vous sûr ?"
+        progress:
+          one: "Progression : <strong>%{count}</strong> sujet"
+          other: "Progression : <strong>%{count}</strong> sujets"
       none:
         unread: "Vous n'avez aucun sujet non lu."
         new: "Vous n'avez aucun nouveau sujet."
         read: "Vous n'avez lu aucun sujet pour le moment."
         posted: "Vous n'avez écrit aucun message pour le moment."
+        ready_to_create: "Prêt à "
+        latest: "Vous avez tout lu !"
         bookmarks: "Vous n'avez pas encore mis de signets à des sujets."
         category: "Il n'y a pas de sujets dans %{category}."
         top: "Il n'y a pas de meilleurs sujets."
         educate:
-          unread: '<p>Vos sujets non lus apparaissent ici.</p><p>Par défaut, les sujets considérés comme non lus et qui affichent le nombre de messages non lus <span class="badge new-posts badge-notification">1</span> sont ceux :</p> <ul><li>que vous avez créés</li><li>auxquels vous avez répondus</li><li>que vous avez lus plus de 4 minutes</li></ul><p>ou que vous avez explicitement suivis ou surveillés.</p><p>Vous pouvez modifier cela dans vos <a href="%{userPrefsUrl}">préférences</a>.</p>'
+          new: '<p>Vos nouveaux sujets vont apparaître ici. 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;"></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>'
+          unread: "<p>Vos sujets non lus apparaissent ici.</p><p>Par défaut, les sujets considérés comme non lus et qui affichent le nombre de messages non lus <span class=\"badge new-posts badge-notification\">1</span> sont ceux :</p> <ul><li>que vous avez créés</li><li>auxquels vous avez répondus</li><li>que vous avez lus plus de 4 minutes</li></ul><p>ou que vous avez explicitement suivis ou surveillés via le menu \U0001F514 de chaque sujet.</p><p>Vous pouvez modifier cela dans vos <a href=\"%{userPrefsUrl}\">préférences</a>.</p>"
       bottom:
-        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 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 sujets à lire."
-        bookmarks: "Il n'y a plus de sujets avec des signets."
+        latest: "Il n'y a pas d'autres sujets récents à consulter."
+        posted: "Il n'y a pas d'autres sujets publiés à consulter."
+        read: "Il n'y a pas d'autres sujets déjà lus à consulter."
+        new: "Il n'y a pas d'autres nouveaux sujets à consulter."
+        unread: "Il n'y a pas d'autres sujets non lus à consulter."
+        category: "Il n'y a pas d'autres sujets à consulter dans %{category}."
+        tag: "Il n'y a pas d'autres sujets à consulter dans %{tag}."
+        top: "Il n'y a pas d'autres sujets à consulter dans ce top."
+        bookmarks: "Il n'y a pas d'autres sujets enregistrés dans les signets."
     topic:
       filter_to:
         one: "%{count} message dans le sujet"
@@ -1999,7 +2256,7 @@ fr:
         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 dernière lecture"
       likes:
         one: "%{count} personne a aimé ce sujet"
         other: "%{count} personnes ont aimé ce sujet"
@@ -2010,14 +2267,39 @@ fr:
       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}."
       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 {}}"
+      read_more_MF: "Il reste { UNREAD, plural, =0 {} one { 1 sujet <a href='{basePath}/unread'>non lu</a> } other { # sujets <a href='{basePath}/unread'>non lus</a> } } { NEW, plural, =0 {} one { { BOTH, select, true { et } false {} other {} } 1 <a href='{basePath}/new'>nouveau</a> sujet } other { { BOTH, select, true { et } false {} other {} } # <a href='{basePath}/new'>nouveaux</a> sujets} }, 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
       browse_all_tags: Parcourir toutes les étiquettes
-      view_latest_topics: voir les derniers sujets
+      view_latest_topics: consultez les sujets récents
+      suggest_create_topic: commencer une nouvelle conversation ?
       jump_reply_up: aller à des réponses précédentes
       jump_reply_down: aller à des réponses ultérieures
       deleted: "Ce sujet a été supprimé"
+      slow_mode_update:
+        title: "Mode ralenti"
+        select: "Les utilisateurs ne peuvent publier dans ce sujet qu'une fois tous les :"
+        description: "Afin de favoriser une discussion réfléchie dans des discussions rapides ou controversées, les utilisateurs doivent attendre avant de publier à nouveau dans ce sujet."
+        save: "Activer"
+        enabled_until: "Activé jusqu'au :"
+        remove: "Désactiver"
+        hours: "Heures :"
+        minutes: "Minutes :"
+        seconds: "Secondes :"
+        durations:
+          10_minutes: "10 Minutes"
+          15_minutes: "15 minutes"
+          30_minutes: "30 Minutes"
+          45_minutes: "45 Minutes"
+          1_hour: "1 heure"
+          2_hours: "2 Heures"
+          4_hours: "4 heures"
+          8_hours: "8 Heures"
+          12_hours: "12 Heures"
+          24_hours: "24 Heures"
+          custom: "Durée personnalisée"
+      slow_mode_notice:
+        duration: "Patientez %{duration} avant de publier un nouveau message dans ce sujet"
       topic_status_update:
         title: "Planifier une action"
         save: "Planifier"
@@ -2026,24 +2308,26 @@ fr:
         remove: "Supprimer la planification"
         publish_to: "Publier dans :"
         when: "Quand :"
-        time_frame_required: Veuillez sélectionner un intervalle de temps
+        time_frame_required: "Veuillez sélectionner un intervalle de temps"
+        min_duration: "La durée doit être supérieure à 0"
+        max_duration: "La durée doit être inférieure à 20 ans"
       auto_update_input:
         none: "Sélectionner un intervalle de temps"
         now: "Maintenant"
-        later_today: "Plus tard aujourd'hui"
+        later_today: "Plus tard dans la journée"
         tomorrow: "Demain"
         later_this_week: "Plus tard cette semaine"
         this_weekend: "Ce weekend"
-        next_week: "Semaine prochaine"
-        two_weeks: "Deux semaines"
-        next_month: "Mois prochain"
-        two_months: "Deux mois"
-        three_months: "Trois mois"
-        four_months: "Quatre mois"
-        six_months: "Six mois"
-        one_year: "Une année"
+        next_week: "La semaine prochaine"
+        two_weeks: "Dans deux semaines"
+        next_month: "Le mois prochain"
+        two_months: "Dans deux mois"
+        three_months: "Dans trois mois"
+        four_months: "Dans quatre mois"
+        six_months: "Dans six mois"
+        one_year: "Un an"
         forever: "Toujours"
-        pick_date_and_time: "Sélectionner une date et heure"
+        pick_date_and_time: "Choisir une date et une heure"
         set_based_on_last_post: "Fermer selon le dernier message"
       publish_to_category:
         title: "Planifier la publication"
@@ -2055,22 +2339,24 @@ fr:
         title: "Fermer temporairement"
       auto_close:
         title: "Fermer automatiquement le sujet"
-        label: "Heures de fermeture automatique du sujet :"
+        label: "Fermer automatiquement le sujet après :"
         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_close_after_last_post:
+        title: "Fermer automatiquement le sujet après le dernier message"
       auto_delete:
         title: "Suppression automatique du sujet"
       auto_bump:
         title: "Remonter automatiquement le sujet"
       reminder:
-        title: "Me rappeler"
+        title: "Me le rappeler"
       auto_delete_replies:
         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}."
         auto_publish_to_category: "Ce sujet sera publié dans <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Ce sujet sera fermé %{duration} après la dernière réponse."
+        auto_close_after_last_post: "Ce sujet sera fermé %{duration} après la dernière réponse."
         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}."
@@ -2079,6 +2365,9 @@ fr:
       auto_close_immediate:
         one: "Le dernier message dans ce sujet est déjà vieux de %{count} heure donc le sujet sera immédiatement fermé."
         other: "Le dernier message dans ce sujet est déjà vieux de %{count} heures donc le sujet sera immédiatement fermé."
+      auto_close_momentarily:
+        one: "Le dernier message dans ce sujet est déjà vieux de %{count} heure donc le sujet sera temporairement fermé."
+        other: "Le dernier message dans ce sujet est déjà vieux de %{count} heures donc le sujet sera temporairement fermé."
       timeline:
         back: "Retour"
         back_description: "Revenir au dernier message non lu"
@@ -2090,7 +2379,9 @@ fr:
         go: "aller"
         jump_bottom: "aller au dernier message"
         jump_prompt: "aller à…"
-        jump_prompt_of: "sur %{count} messages"
+        jump_prompt_of:
+          one: "sur %{count} message"
+          other: "sur %{count} messages"
         jump_prompt_long: "Aller à…"
         jump_bottom_with_number: "aller au message %{post_number}"
         jump_prompt_to_date: "à la date"
@@ -2102,15 +2393,18 @@ fr:
         reasons:
           mailing_list_mode: "Vous avez activé la liste de diffusion, vous serez donc notifié des réponses à ce sujet par courriel."
           "3_10": "Vous recevrez des notifications car vous surveillez une étiquette de ce sujet."
+          "3_10_stale": "Vous recevrez des notifications car vous surveilliez déjà une étiquette attribuée à ce sujet."
           "3_6": "Vous recevrez des notifications parce que vous surveillez cette catégorie."
+          "3_6_stale": "Vous recevrez des notifications car vous surveilliez déjà cette catégorie du forum."
           "3_5": "Vous recevrez des notifications parce que vous avez commencé à surveiller ce sujet automatiquement."
           "3_2": "Vous recevrez des notifications car vous surveillez ce sujet."
           "3_1": "Vous recevrez des notifications car vous avez créé ce sujet."
           "3": "Vous recevrez des notifications car vous surveillez ce sujet."
           "2_8": "Vous verrez un compteur de nouvelles réponses car vous suivez cette catégorie."
+          "2_8_stale": "Le nombre de nouvelles réponses vous sera indiqué car vous suiviez déjà 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": 'You will see a count of new replies because you <a href="%{basePath}/u/%{username}/preferences/notifications">read this topic</a>.'
+          "2": 'Vous verrez un nombre 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."
@@ -2136,17 +2430,18 @@ fr:
           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."
+          description: "Vous ne recevrez aucune notification concernant ce message."
         muted:
           title: "Silencieux"
-          description: "Vous ne serez jamais notifié de rien concernant ce sujet, et il n'apparaîtra pas des les derniers sujets."
+          description: "Vous ne recevrez aucune notification concernant ce sujet et il n'apparaîtra pas sur la page des sujets récents."
       actions:
         title: "Actions"
         recover: "Annuler la suppression du sujet"
         delete: "Supprimer le sujet"
         open: "Ouvrir le sujet"
         close: "Fermer le sujet"
-        multi_select: "Sélectionner les messages…"
+        multi_select: "Sélectionner des messages…"
+        slow_mode: "Activer le mode ralenti"
         timed_update: "Planifier une action…"
         pin: "Épingler le sujet…"
         unpin: "Désépingler le sujet…"
@@ -2172,8 +2467,17 @@ fr:
         help: "Retirer l'épingle de ce sujet afin qu'il n'apparaisse plus en tête de votre liste de sujet"
       share:
         title: "Partager"
-        extended_title: "Partager ce lien"
+        extended_title: "Partager un lien"
         help: "partager ce sujet"
+        instructions: "Partager ce sujet avec un lien :"
+        copied: "Le lien vers ce sujet a été copié."
+        notify_users:
+          title: "Notifier"
+          instructions: "Notifier les utilisateurs suivants de l'existence de ce sujet :"
+          success:
+            one: "Une notification a été envoyée à %{username}."
+            other: "Une notification a été envoyée aux utilisateurs sélectionnés."
+        invite_users: "Inviter"
       print:
         title: "Imprimer"
         help: "Ouvrir une version de ce sujet adaptée à l'impression"
@@ -2195,7 +2499,10 @@ fr:
         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>"
-        pin_globally: "Faire apparaître ce sujet en haut de toutes les listes de sujet jusqu'à "
+        pin_globally: "Faire apparaître ce sujet en haut de toutes les listes de sujet jusqu'à"
+        confirm_pin_globally:
+          one: "Vous avez déjà %{count} sujet épinglé globalement. 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 ?"
+          other: "Vous avez déjà %{count} sujets épinglés globalement. 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."
@@ -2226,14 +2533,14 @@ fr:
         username_placeholder: "nom d'utilisateur"
         action: "Envoyer une invitation"
         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_forum: "Votre ami recevra un courriel pour lui permettre de participer avec un simple lien."
+        discourse_connect_enabled: "Saisissez le nom d'utilisateur de la personne que vous souhaitez inviter à participer."
         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_email: "Une invitation a été envoyée à <b>%{invitee}</b>. Vous recevrez une notification si cette invitation est acceptée. Pour faire le suivi de vos invitations, rendez-vous dans l'onglet « invitations » de votre page de profil."
         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."
@@ -2343,17 +2650,18 @@ fr:
         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 :"
+      quote_share: "Partager"
+      edit_reason: "Raison : "
       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"
+      wiki_last_edited_on: "wiki modifié pour la dernière fois le %{dateTime}"
+      last_edited_on: "message modifié pour la dernière fois le %{dateTime}"
       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} :"
       follow_quote: "aller au message cité"
       show_full: "Afficher le message complet"
-      show_hidden: "Visualiser le contenu ignoré."
+      show_hidden: "Afficher le contenu ignoré."
       deleted_by_author:
         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é)"
@@ -2364,12 +2672,13 @@ fr:
         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é !"
+        new_user: "C'est la première fois que %{user} publie un message — accueillons-les 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"
+      has_replies_count: "%{count}"
       unknown_user: "(utilisateur inconnu/supprimé)"
       has_likes_title:
         one: "%{count} personne a aimé ce message"
@@ -2378,33 +2687,39 @@ fr:
       has_likes_title_you:
         one: "vous et %{count} autre personne ont aimé ce message"
         other: "vous et %{count} autres personnes ont aimé ce message"
+      filtered_replies_hint:
+        one: "Voir ce message et sa réponse"
+        other: "Voir ce message et ses %{count} réponses"
+      filtered_replies_viewing:
+        one: "Affichage de %{count} réponse à"
+        other: "Affichage de %{count} réponses à"
+      in_reply_to: "Charger le message parent"
+      view_all_posts: "Afficher tous les messages"
       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."
         too_many_uploads: "Désolé, vous ne pouvez envoyer qu'un seul fichier à la fois."
+        too_many_dragged_and_dropped_files:
+          one: "Désolé, vous ne pouvez envoyer que %{count} fichier à la fois."
+          other: "Désolé, vous ne pouvez envoyer que %{count} 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."
-      abandon_edit:
-        confirm: "Êtes-vous sûr de vouloir annuler vos changements ?"
-        no_value: "Non, garder"
-        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, sauvegarder le brouillon"
-        yes_value: "Oui, abandonner"
+      cancel_composer:
+        confirm: "Que souhaitez-vous faire de votre message ?"
+        discard: "Abandonner"
+        save_draft: "Enregistrer le brouillon pour plus tard"
+        keep_editing: "Continuer à rédiger"
       via_email: "ce message est arrivé par courriel"
       via_auto_generated_email: "ce message est arrivé via un courriel généré automatiquement"
       whisper: "ce message est un murmure privé pour les modérateurs"
       wiki:
         about: "ce message est un wiki"
       archetypes:
-        save: "Sauvegarder les options"
+        save: "Enregistrer les options"
       few_likes_left: "Merci de partager votre amour ! Vous n'avez plus que quelques J'aime à distribuer pour aujourd'hui."
       controls:
         reply: "commencer à répondre à ce message"
@@ -2426,7 +2741,7 @@ fr:
             one: "Oui et %{count} réponse directe"
             other: "Oui et %{count} réponses directes"
           all_replies:
-            one: "Oui et la réponse"
+            one: "Oui et %{count} réponse"
             other: "Oui et les %{count} réponses"
           just_the_post: "Non, uniquement ce message"
         admin: "actions d'administration sur le message"
@@ -2445,9 +2760,18 @@ fr:
         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_confirm_modal:
+          one: "Ce sujet a actuellement plus de %{count} vue et peut être un résultat de recherche populaire. Voulez-vous vraiment supprimer ce sujet au lieu de le modifier pour l'améliorer ?"
+          other: "Ce sujet compte actuellement plus de %{count} vues et peut être un résultat de recherche apprécié. Êtes-vous sûr de vouloir supprimer ce sujet, plutôt que de le modifier pour en améliorer le contenu ?"
+        delete_topic_confirm_modal_yes: "Oui, supprimer ce sujet"
+        delete_topic_confirm_modal_no: "Non, conserver ce sujet"
+        delete_topic_error: "Une erreur s'est produite lors de la suppression de ce sujet"
         delete_topic: "supprimer le sujet"
         add_post_notice: "Afficher une note des responsables"
+        change_post_notice: "Modifier la note pour les responsables"
+        delete_post_notice: "Supprimer la note pour les responsables"
         remove_timer: "supprimer la planification"
+        edit_timer: "modifier le minuteur"
       actions:
         people:
           like:
@@ -2516,7 +2840,7 @@ fr:
         updated: "Mis à jour"
         name: "Nom"
         name_placeholder: "À quoi correspond ce signet ?"
-        set_reminder: "Me rappeler"
+        set_reminder: "Me le rappeler"
         actions:
           delete_bookmark:
             name: "Supprimer le signet"
@@ -2524,6 +2848,18 @@ fr:
           edit_bookmark:
             name: "Modifier le signet"
             description: "Modifier le nom du signet ou changer la date et l'heure du rappel"
+          pin_bookmark:
+            name: "Épingler le signet"
+            description: "Épingler le signet. Ceci permet de le faire figurer au sommet de votre liste de signets."
+          unpin_bookmark:
+            name: "Désépingler le signet"
+            description: "Désépingler le signet. Il n'apparaîtra plus en haut de votre liste de signets."
+      filtered_replies:
+        viewing_posts_by: "Affichage de %{post_count} messages par"
+        viewing_subset: "Certaines réponses sont réduites"
+        viewing_summary: "Affichage d'un résumé de ce sujet"
+        post_number: "%{username}, message #%{post_number}"
+        show_all: "Tout afficher"
     category:
       can: "peut&hellip; "
       none: "(aucune catégorie)"
@@ -2532,6 +2868,7 @@ fr:
       edit: "Modifier"
       edit_dialog_title: "Modifier : %{categoryName}"
       view: "Voir les sujets dans la catégorie"
+      back: "Retour à la catégorie"
       general: "Général"
       settings: "Paramètres"
       topic_template: "Modèle de sujet"
@@ -2541,6 +2878,7 @@ fr:
       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 d'étiquettes autorisées"
+      manage_tag_groups_link: "Gérer les groupes d'étiquettes"
       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 étiquettes d'un groupe d’étiquettes :"
@@ -2550,11 +2888,11 @@ fr:
       delete: "Supprimer la catégorie"
       create: "Nouvelle catégorie"
       create_long: "Créer une nouvelle catégorie"
-      save: "Sauvegarder la catégorie"
+      save: "Enregistrer 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.
+      save_error: Une erreur s'est produite lors de l'enregistrement de la catégorie.
       name: "Nom de la catégorie"
       description: "Description"
       topic: "sujet de la catégorie"
@@ -2572,6 +2910,17 @@ fr:
       change_in_category_topic: "Modifier la description"
       already_used: "Cette couleur est déjà utilisée par une autre catégorie"
       security: "Sécurité"
+      security_add_group: "Ajouter un groupe"
+      permissions:
+        group: "Groupe"
+        see: "Voir"
+        reply: "Répondre"
+        create: "Créer"
+        no_groups_selected: "Aucun groupe n'a été autorisé à accéder ; cette catégorie ne sera visible que par les responsables."
+        everyone_has_access: 'Cette catégorie est publique, tout le monde peut voir, répondre et créer des messages. Pour restreindre les autorisations, supprimez une ou plusieurs des autorisations accordées au groupe « tout le monde ».'
+        toggle_reply: "Modifier la permission de répondre"
+        toggle_full: "Modifier la permission de créer"
+        inherited: 'Cette autorisation est héritée de « tout le monde »'
       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 à 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>.'
@@ -2579,7 +2928,7 @@ fr:
       images: "Images"
       email_in: "Adresse courriel entrant personnalisée :"
       email_in_allow_strangers: "Accepter les courriels d'utilisateurs anonymes sans compte"
-      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: "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."
@@ -2587,6 +2936,7 @@ fr:
       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"
+      allow_unlimited_owner_edits_on_first_post: "Autoriser l'auteur d'un message initial à modifier celui-ci sans limite de nombre."
       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 :"
@@ -2594,13 +2944,14 @@ fr:
       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, le contenu de cette catégorie peut également être examiné par :"
       review_group_name: "nom du groupe"
       require_topic_approval: "Nécessiter l'approbation pour chaque nouveau sujet"
       require_reply_approval: "Nécessiter l'approbation pour chaque nouvelle réponse"
       this_year: "cette année"
       position: "Position sur la page des catégories :"
       default_position: "Position par défaut"
-      position_disabled: "Les catégories seront affichées dans l'ordre d'activité. Pour contrôler l'ordre des catégories dans la liste,"
+      position_disabled: "Les catégories seront affichées dans l'ordre d'activité. Pour contrôler l'ordre des catégories dans la liste, "
       position_disabled_click: 'activez le paramètre « fixed category positions ».'
       minimum_required_tags: "Nombre minimum d'étiquettes requises dans un sujet :"
       parent: "Catégorie parente"
@@ -2609,19 +2960,19 @@ fr:
       notifications:
         watching:
           title: "Surveiller"
-          description: "Vous surveillerez automatiquement tous les sujets dans ces catégories. Vous serez notifié des nouveaux messages dans tous les sujets, et le nombre de nouvelles réponses sera affiché."
+          description: "Vous surveillerez automatiquement tous les sujets de cette catégorie. Vous serez notifié pour tous les nouveaux messages de chaque sujet, et le nombre de nouvelles réponses sera affiché."
         watching_first_post:
           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: "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é."
+          description: "Vous suivrez automatiquement tous les sujets dans cette catégorie. 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 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."
+          description: "Vous ne recevrez aucune notification concernant les nouveaux sujets dans cette catégorie et ces sujets n'apparaîtront pas sur la page des sujets récents."
       search_priority:
         label: "Priorité dans les résultats de recherche"
         options:
@@ -2656,19 +3007,32 @@ fr:
       list_filters:
         all: "tous les sujets"
         none: "aucune sous-catégorie"
+      colors_disabled: "Vous ne pouvez pas sélectionner de couleurs, car vous n'avez pas choisi de style de catégorie."
     flagging:
       title: "Merci de nous aider à garder notre communauté civilisée !"
       action: "Signaler ce message"
+      take_action: "Intervenir…"
+      take_action_options:
+        default:
+          title: "Intervenir"
+          details: "Atteindre le seuil de signalement immédiatement, plutôt que d'attendre plus de signalements de la communauté."
+        suspend:
+          title: "Suspendre l'utilisateur"
+          details: "Atteindre le seuil de signalement et suspendre l'utilisateur"
+        silence:
+          title: "Mettre l'utilisateur sous silence"
+          details: "Atteindre le seuil de signalement et mettre l'utilisateur sous silence"
       notify_action: "Message"
       official_warning: "Avertissement officiel"
       delete_spammer: "Supprimer le spammeur"
-      delete_confirm_MF: "Vous êtes sur le point de supprimer {POSTS, plural, one {<b>1</b> message} other {<b>#</b> messages}} et {TOPICS, plural, one {<b>1</b> sujet} other {<b>#</b> sujets}} de cet utilisateur, supprimer son compte, bloquer les inscriptions depuis son adresse IP <b>{ip_address}</b> et ajouter son adresse courriel <b>{email}</b> à une liste de blocage permanent. Êtes-vous sûr que cet utilisateur est réellement un spammeur ?"
+      flag_for_review: "Mettre en file d'attente pour examen"
+      delete_confirm_MF: "Vous êtes sur le point de supprimer {POSTS, plural, one {<b>#</b> message} other {<b>#</b> messages}} et {TOPICS, plural, one {<b>#</b> sujet} other {<b>#</b> sujets}} de cet utilisateur, supprimer son compte, bloquer les inscriptions depuis son adresse IP <b>{ip_address}</b> et ajouter son adresse courriel <b>{email}</b> à une liste de blocage permanent. Êtes-vous sûr que cet utilisateur est réellement un spammeur ?"
       yes_delete_spammer: "Oui, supprimer le spammeur"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(masqué)"
       submit_tooltip: "Soumettre le signalement privé"
       take_action_tooltip: "Atteindre le seuil de signalement immédiatement, plutôt que d'attendre plus de signalement de la communauté."
-      cant: "Désolé, vous ne pouvez pas signaler ce message pour le moment"
+      cant: "Désolé, vous ne pouvez pas signaler ce message pour le moment."
       notify_staff: "Notifier les responsables de manière privée"
       formatted_name:
         off_topic: "C'est hors-sujet"
@@ -2702,7 +3066,7 @@ fr:
       about: "développer plus de liens pour ce message"
       title:
         one: "%{count} autre"
-        other: "%{count} autres "
+        other: "%{count} autres"
     topic_statuses:
       warning:
         help: "Ceci est un avertissement officiel."
@@ -2730,15 +3094,11 @@ fr:
         help: "Ce sujet est un message direct"
     posts: "Messages"
     posts_likes_MF: |
-      Ce sujet a {count, plural, one {1 réponse} other {# réponses}} {ratio, select,
-
-      low {avec un ratio élevé 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}
-
-      other {}}
+      Ce sujet a {count, plural, one {# réponse} other {# réponses}} {ratio, select,
+       low {avec un ratio élevé 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}
+       other {}}
     original_post: "Message original"
     views: "Vues"
     views_lowercase:
@@ -2758,7 +3118,7 @@ fr:
       one: "utilisateur"
       other: "utilisateurs"
     category_title: "Catégorie"
-    history: "Historique"
+    history: "Historique des 100 dernières modifications"
     changed_by: "par %{author}"
     raw_email:
       title: "Courriel entrant"
@@ -2833,6 +3193,7 @@ 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>. 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"
@@ -2842,9 +3203,10 @@ fr:
       previous: "Précédent (touche flèche gauche)"
       next: "Suivant (touche flèche droite)"
       counter: "%curr% de %total%"
-      close: "Femer (Echap)"
+      close: "Fermer (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.'
+    cannot_render_video: Cette vidéo ne peut pas être lue car votre navigateur ne prend pas en charge le codec requis.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -2892,13 +3254,13 @@ fr:
         fullscreen: "%{shortcut} Éditeur en plein écran"
       bookmarks:
         title: "Gestion des signets"
-        enter: "%{shortcut} Sauvegarder et fermer"
-        later_today: "%{shortcut} Plus tard aujourd'hui"
+        enter: "%{shortcut} Enregistrer et fermer"
+        later_today: "%{shortcut} Plus tard dans la journée"
         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_week: "%{shortcut} Au 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"
@@ -3014,6 +3376,8 @@ fr:
       delete_unused_confirmation_more_tags:
         one: "%{tags} et %{count} de plus"
         other: "%{tags} et %{count} de plus"
+      delete_no_unused_tags: "Il n'y a pas d'étiquettes inutilisées."
+      tag_list_joiner: ", "
       delete_unused: "Supprimer les étiquettes inutilisées"
       delete_unused_description: "Supprimer toutes les étiquettes qui ne sont pas associées à des sujets ou messages directs"
       cancel_delete_unused: "Annuler"
@@ -3031,13 +3395,13 @@ fr:
           description: "Vous serez averti de nouveaux sujets avec cette étiquette mais pas de réponses aux sujets."
         tracking:
           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."
+          description: "Vous suivrez 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 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."
+          description: "Vous ne recevrez aucune notification concernant des nouveaux sujets avec cette étiquette et ces sujets n'apparaîtront pas sur votre page des sujets non lus."
       groups:
         title: "Groupes d'étiquettes"
         about: "Ajoutez les étiquettes à des groupes pour les gérer plus facilement."
@@ -3048,10 +3412,13 @@ fr:
         one_per_topic_label: "Limiter à une étiquette de ce groupe par sujet"
         new_name: "Nouveau groupe d'étiquettes"
         name_placeholder: "Nom du groupe d'étiquettes"
-        save: "Sauvegarder"
+        save: "Enregistrer"
         delete: "Supprimer"
         confirm_delete: "Êtes-vous sûr de vouloir supprimer ce groupe d'étiquettes ?"
         everyone_can_use: "Les étiquettes peuvent être utilisées par tout le monde"
+        usable_only_by_groups: "Les étiquettes sont visibles par tous, mais seuls les groupes suivants peuvent les utiliser"
+        visible_only_to_groups: "Les étiquettes sont uniquement visibles pour les groupes suivants"
+        cannot_save: "Impossible d'enregistrer le groupe d'étiquettes. Assurez-vous qu'au moins une étiquette est présente, que le nom du groupe d'étiquettes n'est pas vide et qu'un groupe est sélectionné pour l'autorisation des étiquettes."
       topics:
         none:
           unread: "Vous n'avez aucun sujet non lu."
@@ -3064,9 +3431,11 @@ fr:
     invite:
       custom_message: "Rendez votre invitation plus personnelle en écrivant un <a href>message personnalisé</a>."
       custom_message_placeholder: "Entrez votre message personnalisé"
+      approval_not_required: "L'utilisateur sera automatiquement approuvé dès qu'il acceptera cette invitation."
       custom_message_template_forum: "Hey, tu devrais rejoindre ce forum !"
       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."
+    forced_anonymous_login_required: "Le site rencontre un nombre très élevé de consultations et ne peut être chargé pour le moment, veuillez réessayer d'ici quelques minutes."
     footer_nav:
       back: "Revenir en arrière"
       forward: "Avancer"
@@ -3075,6 +3444,17 @@ fr:
     safe_mode:
       enabled: "Le mode sans échec est activé ; fermez cette fenêtre de navigateur pour le quitter"
     image_removed: "(image supprimée)"
+    do_not_disturb:
+      title: "Ne pas déranger pendant…"
+      label: "Ne pas déranger"
+      remaining: "Encore %{remaining}"
+      options:
+        half_hour: "30 minutes"
+        one_hour: "1 heure"
+        two_hours: "2 heures"
+        tomorrow: "Jusqu'à demain"
+        custom: "Personnalisé"
+      set_schedule: "Planifier les notifications"
   admin_js:
     type_to_filter: "commencez à taper pour filtrer…"
     admin:
@@ -3097,16 +3477,20 @@ fr:
         updates_available: "Des mises à jour sont disponibles."
         please_upgrade: "Veuillez mettre à jour !"
         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."
+        stale_data: "Une vérification de 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"
+        new_features:
+          title: "\U0001F381 Nouveautés"
+          dismiss: "Ignorer"
+          learn_more: "En savoir plus…"
         last_checked: "Dernière vérification"
         refresh_problems: "Actualiser"
         no_problems: "Aucun problème n'a été trouvé."
         moderators: "Modérateurs :"
-        admins: "Administateurs :"
+        admins: "Administrateurs :"
         silenced: "Mis sous silence :"
         suspended: "Suspendus :"
         private_messages_short: "Msgs"
@@ -3154,6 +3538,9 @@ fr:
           view_table: "tableau"
           view_graph: "graphique"
           refresh_report: "Actualiser le rapport"
+          daily: Quotidien
+          monthly: Mensuel
+          weekly: Hebdomadaire
           dates: "Dates (UTC)"
           groups: "Tous les groupes"
           disabled: "Ce rapport est désactivé"
@@ -3187,10 +3574,6 @@ fr:
             available: "Nom de groupe disponible"
             not_available: "Nom de groupe indisponible"
             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) :"
-          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:
@@ -3203,6 +3586,8 @@ fr:
               title: "Qui peut voir ce groupe ?"
               public: "Tout le monde"
               logged_on_users: "Utilisateurs connectés"
+              members: "Propriétaires, membres et modérateurs de groupes"
+              staff: "Propriétaires et modérateurs de groupes"
               owners: "Propriétaires du groupe"
               description: "Les administrateurs peuvent voir tous les groupes."
             members_visibility_levels:
@@ -3215,7 +3600,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."
+            automatic_membership_user_count:
+              one: "%{count} utilisateur a les nouveaux domaines de courriel et sera ajouté au groupe."
+              other: "%{count} utilisateurs ont les nouveaux domaines de courriel et seront ajoutés au groupe."
             primary_group: "Définir comme groupe principal automatiquement"
         name_placeholder: "Nom du groupe (sans espaces, mêmes règles que pour les noms d'utilisateurs)"
         primary: "Groupe principal"
@@ -3227,7 +3614,11 @@ fr:
         group_members: "Membres du groupe"
         delete: "Supprimer"
         delete_confirm: "Supprimer ce groupe ?"
+        delete_with_messages_confirm:
+          one: "La suppression de ce groupe rendra %{count} message orphelin, les membres du groupe n'y auront plus accès.<br><br>Etes-vous sûr?"
+          other: "La suppression de ce groupe rendra %{count} messages orphelins, les membres du groupe n'y auront plus accès.<br><br>Êtes-vous sûr ?"
         delete_failed: "Impossible de supprimer le groupe. Si c'est un groupe automatique il ne peut être détruit."
+        delete_automatic_group: Ce groupe ne peut pas être supprimé car il est constitué de façon automatique.
         delete_owner_confirm: "Retirer les privilèges de propriétaire pour %{username} ?"
         add: "Ajouter"
         custom: "Personnalisé"
@@ -3240,7 +3631,7 @@ fr:
         no_custom_groups: "Créer un nouveau groupe personnalisé"
       api:
         generate_master: "Générer une clé d'API maître"
-        none: "Il n'y a pas de clés API actives en ce moment."
+        none: "Il n'y a actuellement aucune clé API active."
         user: "Utilisateur"
         title: "API"
         key: "Clé"
@@ -3263,11 +3654,41 @@ fr:
         single_user: "Utilisateur unique"
         user_placeholder: Entrez un nom d'utilisateur
         description_placeholder: À quoi servira cette clé ?
-        save: Sauvegarder
+        save: Enregistrer
         new_key: Nouvelle clé pour l’API
         revoked: Révoquée
+        delete: Supprimer définitivement
         not_shown_again: Cette clé ne sera plus affichée. Assurez-vous d'en avoir fait une copie avant de continuer.
-        continue: Poursuivre
+        continue: Continuer
+        use_global_key: Clé globale (autorise toutes les actions)
+        scopes:
+          description: |
+            En configurant des permissions, vous pouvez restreindre une clé d'API à certaines actions spécifiques.
+            Vous pouvez aussi définir les paramètres autorisés. Utilisez des virgules pour séparer plusieurs valeurs.
+          title: Permissions
+          resource: Ressource
+          action: Action
+          allowed_parameters: Paramètres autorisés
+          optional_allowed_parameters: Paramètres autorisés (facultatif)
+          any_parameter: (tout paramètre)
+          allowed_urls: URL autorisées
+          descriptions:
+            topics:
+              read: Lire un sujet ou un message spécifique qu'il contient. Le RSS est aussi accepté.
+              write: Créer un nouveau sujet ou publier sur un sujet existant.
+              read_lists: Lire les listes de sujets comme top, nouveaux, récents, etc. Le RSS est aussi accepté.
+              wordpress: Nécessaire pour le fonctionnement de l'extension WordPress wp-discourse.
+            users:
+              bookmarks: Lister les signets des utilisateurs. Les rappels de signet sont retournés lorsque le format ICS est utilisé.
+              sync_sso: Synchroniser un utilisateur en utilisant DiscourseConnect.
+              show: Obtenir des informations sur un utilisateur.
+              check_emails: Lister les courriels d'utilisateurs.
+              update: Mettre à jour les informations du profil utilisateur.
+              log_out: Déconnecter toutes les sessions pour un utilisateur.
+              anonymize: Anonymiser les comptes utilisateurs.
+              delete: Supprimer les comptes utilisateurs.
+            email:
+              receive_emails: Combiner ces permissions au service de réception de courriel pour traiter les courriels entrants.
       web_hooks:
         title: "Webhooks"
         none: "Il n'y a aucun Webhook actuellement."
@@ -3275,14 +3696,14 @@ fr:
         detailed_instruction: "Une requête POST sera envoyée à l'URL fournie lorsque l'événement choisi se produira."
         new: "Nouveau Webhook"
         create: "Créer"
-        save: "Sauvegarder"
+        save: "Enregistrer"
         destroy: "Supprimer"
         description: "Description"
         controls: "Contrôles"
         go_back: "Retour à la liste"
         payload_url: "URL cible"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Il semble que vous essayez de configurer le Webhook vers une URL locale. Les événements délivrés à une adresse locale peuvent causer des effets de bords ou des comportements inattendus. Continuer ?"
+        warn_local_payload_url: "Il semble que vous essayiez de configurer le Webhook avec une URL locale. Les événements transmis à une adresse locale peuvent déclencher des effets de bord ou un fonctionnement indésirable. Souhaitez-vous continuer ?"
         secret_invalid: "La clé secrète ne doit pas contenir d'espaces."
         secret_too_short: "La clé secrète doit contenir au moins 12 caractères."
         secret_placeholder: "Une chaîne de caractères facultative pour générer la signature"
@@ -3294,7 +3715,7 @@ fr:
         individual_event: "Sélectionner des événements individuels."
         verify_certificate: "Vérifier le certificat TLS de l'URL cible"
         active: "Actif"
-        active_notice: "Nous delivrerons les détails de l'évènement quand il se produit."
+        active_notice: "Nous délivrerons les détails de l'évènement quand il se produit."
         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."
@@ -3304,31 +3725,37 @@ fr:
         delete_confirm: "Supprimer ce Webhook ?"
         topic_event:
           name: "Événement de sujet"
-          details: "Quand il y a un sujet nouveau, modifié ou supprimé."
+          details: "Lorsqu'un sujet est créé, supprimé, modifié, ou subit une révision."
         post_event:
           name: "Événement de message"
-          details: "Quand il y a une réponse nouvelle, modifiée, supprimée ou rétablie."
+          details: "Lorsqu'une réponse est publiée, modifiée, supprimée ou restaurée."
         user_event:
           name: "Événement d'utilisateur"
-          details: "Quand un utilisateur se connecte, se déconnecte, est créé, approuvé ou mis à jour."
+          details: "Lorsqu'un utilisateur se connecte, se déconnecte, confirme son adresse de courriel, est créé, approuvé ou quand ses informations sont mises à jour."
         group_event:
           name: "Événement de groupe"
-          details: "Quand un groupe est créé, mis à jour ou supprimé."
+          details: "Lorsqu'un groupe est créé, mis à jour ou supprimé."
         category_event:
           name: "Événement de catégorie"
-          details: "Quand une catégorie est créée, mise à jour ou supprimée."
+          details: "Lorsqu'une catégorie est créée, mise à jour ou supprimée."
         tag_event:
           name: "Événement d'étiquette"
-          details: "Quand une étiquette est créée, mise à jour ou supprimée."
+          details: "Lorsqu'une étiquette est créée, mise à jour ou supprimée."
         reviewable_event:
-          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."
+          name: "Événement d'élément à examiner"
+          details: "Lorsqu'un nouvel élément est prêt à être examiné ou que son état est mis à jour."
         notification_event:
           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."
+        group_user_event:
+          name: "Évènement d'appartenance à un groupe"
+          details: "Lorsqu'un utilisateur est ajouté ou supprimé d'un groupe."
+        like_event:
+          name: "Évènement de réaction « J'aime »"
+          details: "Lorsqu'un utilisateur donne un J'aime"
         delivery_status:
           title: "État de l'envoi"
           inactive: "Inactif"
@@ -3393,7 +3820,7 @@ fr:
           size: "Taille"
         upload:
           label: "Envoyer"
-          title: "Envoyer une sauvegarde à cette instance"
+          title: "Envoyer une sauvegarde vers 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."
@@ -3413,21 +3840,21 @@ 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 sauvegarde vous a été envoyé par courriel. "
+            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 ?"
+            confirm: "Êtes-vous certain de vouloir supprimer cette sauvegarde ?"
           restore:
             is_disabled: "La restauration est désactivée dans les paramètres du site."
             label: "Restaurer"
             title: "Restaurer la sauvegarde"
-            confirm: "Êtes-vous sûr de vouloir restaurer cette sauvegarde ?"
+            confirm: "Êtes-vous certain de vouloir restaurer cette sauvegarde ?"
           rollback:
             label: "Revenir en arrière"
             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"
+          local: "Stockage local"
           s3: "S3"
         backup_storage_error: "L'accès à l'emplacement de la sauvegarde a échoué : %{error_message}"
       export_csv:
@@ -3450,7 +3877,7 @@ fr:
         long_title: "Personnalisations du site"
         preview: "prévisualiser"
         explain_preview: "Voir le site avec ce thème activé"
-        save: "Sauvegarder"
+        save: "Enregistrer"
         new: "Nouveau"
         new_style: "Nouveau style"
         install: "Installer"
@@ -3477,11 +3904,11 @@ 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"
+          themes_intro_emoji: "émoji 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é"
-          customize_desc: "Personaliser :"
+          customize_desc: "Personnaliser :"
           title: "Thèmes"
           create: "Créer"
           create_type: "Type"
@@ -3506,17 +3933,22 @@ fr:
           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_user_selectable: "Le jeu de couleurs peut être sélectionné par les utilisateurs"
+          auto_update: "Mettre à jour automatiquement lorsque Discours est mis à jour"
           color_scheme: "Palette de couleurs"
+          default_light_scheme: "Clair (par défaut)"
           color_scheme_select: "Sélectionner les couleurs utilisées par le thème"
           custom_sections: "Sections personnalisées :"
           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 ne sera plus un composant de %{relatives}."
+          convert_component_alert: "Êtes-vous sûr 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 ne sera plus le parent de %{relatives}."
+          convert_component_alert_generic: "Êtes-vous sûr de vouloir convertir ce composant en thème ?"
+          convert_theme_alert: "Êtes-vous sûr de vouloir convertir ce thème en composant ? Il ne sera plus le parent de %{relatives}."
+          convert_theme_alert_generic: "Êtes-vous sûr de vouloir convertir ce thème en composant ?"
           convert_theme_tooltip: "Convertir ce thème en composant"
-          inactive_themes: "Thèmes inactifs : "
+          inactive_themes: "Thèmes inactifs :"
           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é"
@@ -3536,7 +3968,7 @@ fr:
             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_changes_alert: "Vous n'avez pas encore enregistré vos modifications, souhaitez-vous les abandonner et passer à autre chose ?"
           unsaved_parent_themes: "Vous n'avez assigné le composant à aucun thème, voulez-vous continuer ?"
           discard: "Abandonner"
           stay: "Rester"
@@ -3548,17 +3980,20 @@ fr:
           included_components: "Composants inclus"
           add_all: "Tout ajouter"
           import_web_tip: "Dépôt contenant le thème"
+          direct_install_tip: "Êtes-vous sur de vouloir installer <strong>%{name}</strong> depuis le dépôt indiqué ci-dessous ?"
           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é"
           remote_branch: "Nom de branche (optionnel)"
           public_key: "Accorder un accès au dépôt à la clé publique suivante :"
+          public_key_note: "Une clé SSH sera générée et affichée ici après qu'une URL valide pointant vers un dépôt logiciel privé ait été saisie ci-dessus."
           install: "Installer"
           installed: "Installé"
           install_popular: "Populaire"
           install_upload: "Depuis votre appareil"
           install_git_repo: "Depuis un dépôt Git"
           install_create: "Créer un nouveau"
+          duplicate_remote_theme: "Le composant de thème « %{name} » est déjà installé, êtes-vous sûr de vouloir en installer une autre copie ?"
           about_theme: "À propos"
           license: "Licence"
           version: "Version :"
@@ -3578,8 +4013,9 @@ fr:
           check_for_updates: "Vérifier les mises à jour"
           updating: "Mise à jour…"
           up_to_date: "Thème à jour, dernière vérification :"
+          has_overwritten_history: "La version actuelle du thème n'existe plus car l'historique Git a été écrasé par une mise à jour forcée."
           add: "Ajouter"
-          theme_settings: "Paramètres de thème"
+          theme_settings: "Paramètres du thème"
           no_settings: "Ce thème n'a pas de paramètres."
           theme_translations: "Traductions de thème"
           empty: "Aucun élément"
@@ -3587,7 +4023,8 @@ 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 est inaccessible. Message d'erreur : "
+          remote_theme_edits: "Pour modifier ce thème, vous devez <a href='%{repoURL}' target='_blank'>effecteur un changement dans son dépôt</a>"
+          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"
@@ -3604,6 +4041,18 @@ fr:
           embedded_scss:
             text: "CSS intégré"
             title: "Entrez du CSS personnalisé pour la version intégrée des commentaires"
+          color_definitions:
+            text: "Définitions de couleur"
+            title: "Entrez des définitions de couleurs personnalisées (utilisateurs avancés uniquement)"
+            placeholder: |2-
+
+              Utilisez cette feuille de style pour ajouter des couleurs personnalisées à la liste des propriétés personnalisées CSS
+
+              Exemple :
+
+              %{example}
+
+              Il est fortement recommandé de préfixer les noms des propriétés CSS pour éviter tout conflit avec Discourse ou ses extensions.
           head_tag:
             text: "</head>"
             title: "HTML qui sera inséré avant la balise </head>"
@@ -3613,6 +4062,8 @@ fr:
           yaml:
             text: "YAML"
             title: "Définir les paramètres du thème en format YAML"
+          scss_color_variables_warning: "L'utilisation de variables SCSS standard pour définir des couleurs dans un thème est dépréciée, ces variables ne seront plus prises en charge dans des versions ultérieures. Pour obtenir davantage d'informations, nous vous invitons à consulter <a href=\"https://meta.discourse.org/t/-/77551#color-variables-2\" target=\"_blank\">ce guide</a> (en anglais)."
+          scss_warning_inline: "L'utilisation de variables SCSS standard pour définir des couleurs dans un thème est dépréciée."
         colors:
           select_base:
             title: "Sélectionner la palette de couleurs de base"
@@ -3625,12 +4076,16 @@ fr:
           copy_name_prefix: "Copie de"
           delete_confirm: "Supprimer cette palette de couleur ?"
           undo: "annuler"
-          undo_title: "Annulez vos modifications sur cette couleur depuis la dernière fois qu'elle a été sauvegardée."
+          undo_title: "Annuler les modifications que vous avez apportées à cette couleur depuis son dernier enregistrement."
           revert: "rétablir"
           revert_title: "Rétablir la couleur de la palette par défaut de Discourse."
           primary:
             name: "primaire"
             description: "La plupart des textes, icônes et bordures."
+          primary-medium:
+            name: "primary-medium"
+          primary-low-mid:
+            name: "primary-low-mid"
           secondary:
             name: "secondaire"
             description: "Les couleurs principales du fond et du texte de certains boutons."
@@ -3645,10 +4100,16 @@ fr:
             description: "Couleur d'arrière-plan de l'entête du site."
           header_primary:
             name: "primaire de l'entête"
-            description: "Textes et icônes dans l'entête du site. "
+            description: "Textes et icônes dans l'entête du site."
           highlight:
             name: "accentuation"
             description: "La couleur de fond des éléments accentués sur la page, comme les messages et sujets."
+          highlight-high:
+            name: "highlight-high"
+          highlight-medium:
+            name: "highlight-medium"
+          highlight-low:
+            name: "highlight-low"
           danger:
             name: "danger"
             description: "Couleur d'accentuation pour les actions comme la suppression de messages et de sujets."
@@ -3669,8 +4130,8 @@ fr:
           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 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."
+          save_error_with_reason: "Vos modifications n'ont pas pu être sauvegardées. %{error}"
+          instructions: "Personnalisez le modèle depuis lequel tous les courriels HTML sont générés et stylés à l'aide de CSS."
       email:
         title: "Courriels"
         settings: "Paramètres"
@@ -3755,15 +4216,15 @@ fr:
         title: "Journaux"
         action: "Action"
         created_at: "Créé"
-        last_match_at: "Dernière occurence"
-        match_count: "Occurences"
+        last_match_at: "Dernière occurrence"
+        match_count: "Occurrences"
         ip_address: "IP"
         topic_id: "Identifiant du sujet"
         post_id: "Identifiant du message"
         category_id: "Identifiant de la catégorie"
         delete: "Supprimer"
         edit: "Modifier"
-        save: "Sauvegarder"
+        save: "Enregistrer"
         screened_actions:
           block: "bloquer"
           do_nothing: "ne rien faire"
@@ -3822,19 +4283,20 @@ fr:
             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 "
-            unlock_trust_level: "déverouiller le niveau de confiance"
+            lock_trust_level: "verrouiller le niveau de confiance"
+            unlock_trust_level: "déverrouiller le niveau de confiance"
             activate_user: "activer l'utilisateur"
             deactivate_user: "désactiver l'utilisateur"
             change_readonly_mode: "changer le mode de lecteur seule"
             backup_download: "télécharger la sauvegarde"
-            backup_destroy: "détruire la sauvegarde"
-            reviewed_post: "message vérifié"
+            backup_destroy: "supprimer une sauvegarde"
+            reviewed_post: "message examiné"
             custom_staff: "action personnalisée de l'extension"
             post_locked: "message verrouillé"
             post_edit: "message modifié"
             post_unlocked: "message déverrouillé"
             check_personal_message: "vérifier un message direct"
+            disabled_second_factor: "désactiver la validation en deux étapes"
             topic_published: "sujet publié"
             post_approved: "message approuvé"
             post_rejected: "message rejeté"
@@ -3848,11 +4310,11 @@ fr:
             approve_user: "utilisateur approuvé"
             web_hook_create: "créer le Webhook"
             web_hook_update: "mettre à jour le Webhook"
-            web_hook_destroy: "détruire le Webhook"
+            web_hook_destroy: "supprimer un 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é"
+            embeddable_host_create: "créer un nom d'hôte intégrable"
+            embeddable_host_update: "mettre à jour un nom d'hôte intégrable"
+            embeddable_host_destroy: "supprimer un nom d'hôte intégrable"
             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"
@@ -3860,13 +4322,20 @@ fr:
             change_title: "modifier le titre"
             api_key_create: "créer une clé pour l’API"
             api_key_update: "mettre à jour une clé pour l’API"
-            api_key_destroy: "détruire une clé pour l’API"
+            api_key_destroy: "supprimer une clé d’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"
             add_email: "ajouter une adresse courriel"
             update_email: "mettre à jour une adresse courriel"
             destroy_email: "supprimer une adresse courriel"
+            topic_closed: "sujet fermé"
+            topic_opened: "sujet ouvert"
+            topic_archived: "sujet archivé"
+            topic_unarchived: "sujet désarchivé"
+            post_staff_note_create: "ajouter une note pour les responsables"
+            post_staff_note_destroy: "supprimer une note pour les responsables"
+            delete_group: "Supprimer le groupe"
         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."
@@ -3880,6 +4349,7 @@ fr:
           domain: "Domaine"
         screened_ips:
           title: "IP sous surveillance"
+          description: 'Adresses IP qui sont surveillées. Utilisez « Autoriser » pour ajouter des adresses IP à la liste.'
           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éseau ?"
           rolled_up_some_subnets: "Consolidation réussie des adresses IP interdites vers ces plages de sous-réseau : %{subnets}."
@@ -3913,31 +4383,34 @@ fr:
         title: "Mots surveillés"
         search: "recherche"
         clear_filter: "Vider"
-        show_words: "afficher les mots"
-        one_word_per_line: "Un mot par ligne"
+        show_words:
+          one: "afficher %{count} mot"
+          other: "afficher %{count} mots"
         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: "Ê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"
+        clear_all_confirm: "Êtes-vous sûr de vouloir effacer l'ensemble des mots surveillés en rapport à l'action %{action} ?"
         actions:
           block: "Bloquer"
           censor: "Censurer"
           require_approval: "Nécessiter l'approbation"
           flag: "Signaler"
+          replace: "Remplacer"
+          tag: "Étiquette"
         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 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."
+          flag: "Autoriser les messages qui contiennent ces mots, mais les marquer comme étant signalés pour que les modérateurs puissent les examiner."
+          replace: "Remplacer certains mots contenus dans des messages par d'autres mots ou par des liens"
+          tag: "Étiqueter automatiquement les sujets en fonction de leur premier message"
         form:
-          label: "Nouveau mot :"
-          placeholder: "mot complet ou * comme signe générique"
+          label: "Contient le mot ou l'expression"
+          placeholder: "Saisissez un mot ou une expression (* sert de caractère générique)"
           placeholder_regexp: "expression régulière"
+          replacement_label: "Remplacement"
+          replacement_placeholder: "exemple ou https://exemple.com"
+          tag_label: "Étiquette"
+          tag_placeholder: "étiquette1,étiquette2,étiquette3"
           add: "Ajouter"
           success: "Succès"
           exists: "Existe déjà"
@@ -3956,7 +4429,7 @@ fr:
         invalid: "Désolé, vous ne pouvez pas vous faire passer pour cet utilisateur."
       users:
         title: "Utilisateurs"
-        create: "Ajouter un administateur"
+        create: "Ajouter un administrateur"
         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."
@@ -3974,7 +4447,7 @@ fr:
         titles:
           active: "Utilisateurs actifs"
           new: "Nouveaux utilisateurs"
-          pending: "Utilisateur en attente"
+          pending: "Utilisateurs en attente d'examen"
           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)"
@@ -3986,17 +4459,28 @@ fr:
           silenced: "Utilisateurs sous silence"
           suspended: "Utilisateurs suspendus"
           staged: "Utilisateurs distants"
-        not_verified: "Non verifié"
+        not_verified: "Non vérifié"
         check_email:
           title: "Afficher l'adresse courriel de cet utilisateur"
           text: "Afficher"
+        check_sso:
+          title: "Révéler le payload SSO"
+          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_duration: "Combien de temps l'utilisateur sera suspendu ?"
+        suspend_duration: "Combien de temps l'utilisateur sera-t-il 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."
         suspend_reason: "Raison"
+        suspend_reason_title: "Raison de la suspension"
+        suspend_reasons:
+          not_listening_to_staff: "N'écoute pas les remarques des responsables"
+          consuming_staff_time: "A fait perdre un temps excessif aux responsables"
+          combatative: "Trop agressif"
+          in_wrong_place: "Au mauvais endroit"
+          no_constructive_purpose: "Aucun but constructif à ses actions autre que de créer une dissidence au sein de la communauté"
+          custom: "Personnalisé…"
         suspend_message: "Message 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"
@@ -4022,7 +4506,7 @@ fr:
         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"
-        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 ?"
+        delete_all_posts_confirm_MF: "Vous êtes sur le point de supprimer {POSTS, plural, one {# message} other {# messages}} et {TOPICS, plural, one {# sujet} other {# sujets}}. Êtes-vous sûr ?"
         silence: "Mettre sous silence"
         unsilence: "Ne plus mettre sous silence"
         silenced: "Mis sous silence ?"
@@ -4055,6 +4539,7 @@ fr:
         private_topics_count: Sujets privés
         posts_read_count: Messages lus
         post_count: Messages créés
+        second_factor_enabled: Validation en deux étapes activée
         topics_entered: Sujets vus
         flags_given_count: Signalements effectués
         flags_received_count: Signalements reçus
@@ -4070,6 +4555,9 @@ 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"
+        delete_posts:
+          progress:
+            title: "Progression de la suppression des messages"
         merge:
           button: "Fusionner"
           prompt:
@@ -4081,6 +4569,8 @@ fr:
             target_username_placeholder: "Nom d'utilisateur du nouveau propriétaire"
             transfer_and_delete: "Transférer et supprimer @%{username}"
             cancel: "Annuler"
+          progress:
+            title: "Progression de la fusion"
           confirmation:
             title: "Transférer et supprimer @%{username}"
             description: |
@@ -4100,15 +4590,15 @@ fr:
           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 tous les messages. Certains messages  sont plus vieux que %{count} jour. (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)"
-        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_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 courriel et adresse IP."
         delete_dont_block: "Supprimer uniquement"
-        deleting_user: "Suppression de l'utilisateur"
+        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é supprimés avant d'essayer de supprimer l'utilisateur."
         send_activation_email: "Envoyer le courriel d'activation"
@@ -4173,13 +4663,16 @@ fr:
           on_grace_period: "Actuellement en période de grâce, ne sera pas rétrogradé."
           locked_will_not_be_promoted: "Niveau de confiance verrouillé. Ne sera jamais promu."
           locked_will_not_be_demoted: "Niveau de confiance verrouillé. Ne sera jamais rétrogradé."
-        sso:
-          title: "Authentification unique (SSO)"
-          external_id: "ID Externe"
+        discourse_connect:
+          title: "Connexion unique DiscourseConnect"
+          external_id: "ID externe"
           external_username: "Nom d'utilisateur"
           external_name: "Nom"
           external_email: "Courriel"
           external_avatar_url: "URL de l'image de profil"
+          last_payload: "Derniers payload"
+          delete_sso_record: "Supprimer l'enregistrement SSO"
+          confirm_delete: "Êtes-vous sûr de vouloir supprimer cet enregistrement DiscourseConnect ?"
       user_fields:
         title: "Champs utilisateurs"
         help: "Ajoutez des champs que vos utilisateurs pourront remplir."
@@ -4188,7 +4681,7 @@ fr:
         name: "Nom du champ"
         type: "Type du champ"
         description: "Description du champ"
-        save: "Sauvegarder"
+        save: "Enregistrer"
         edit: "Modifier"
         delete: "Supprimer"
         cancel: "Annuler"
@@ -4210,6 +4703,10 @@ fr:
           title: "Afficher sur la carte de l'utilisateur ?"
           enabled: "affiché sur la carte de l'utilisateur"
           disabled: "non affiché sur la carte de l'utilisateur"
+        searchable:
+          title: "Indexable ?"
+          enabled: "indexable"
+          disabled: "non-indexable"
         field_types:
           text: "Zone de texte"
           confirm: "Confirmation"
@@ -4223,13 +4720,20 @@ fr:
         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: "Afficher les textes modifiés uniquement"
+        show_overriden: "Afficher uniquement les textes modifiés"
+        locale: "Langue:"
+        fallback_locale_warning: "Vous modifiez une langue basée sur %{fallback}. Les utilisateurs qui choisissent %{fallback} comme langue d'interface ne verront pas vos modifications."
         more_than_50_results: "Il y a plus de 50 résultats. Veuillez affiner votre recherche."
       settings:
-        show_overriden: "Afficher les paramètres modifiés uniquement"
+        show_overriden: "Afficher uniquement les paramètres modifiés"
+        history: "Afficher l'historique des modifications"
         reset: "rétablir"
         none: "aucun"
       site_settings:
+        emoji_list:
+          invalid_input: "La liste des émojis ne doit contenir que des noms d'émojis valides (ex: hugs)"
+          add_emoji_button:
+            label: "Ajouter émoji"
         title: "Paramètres"
         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."
@@ -4259,7 +4763,7 @@ fr:
           onebox: "Onebox"
           seo: "SEO"
           spam: "Spam"
-          rate_limits: "Limites des taux"
+          rate_limits: "Limites d'utilisation"
           developer: "Développeur"
           embedding: "Externe"
           legal: "Légal"
@@ -4282,6 +4786,9 @@ fr:
           modal_no: "Non, appliquer ce changement à partir de maintenant"
         simple_list:
           add_item: "Ajouter un élément…"
+        json_schema:
+          edit: Lancer l'éditeur
+          modal_title: "Modifier %{name}"
       badges:
         title: Badges
         new_badge: Nouveau badge
@@ -4298,9 +4805,9 @@ fr:
         granted_by: Décerné par
         granted_at: Décerné le
         reason_help: (Lien vers un message ou sujet)
-        save: Sauvegarder
+        save: Enregistrer
         delete: Supprimer
-        delete_confirm: Ëtes-vous sûr de vouloir supprimer ce badge ?
+        delete_confirm: Êtes-vous sûr de vouloir supprimer ce badge ?
         revoke: Retirer
         reason: Raison
         expand: Développer &hellip;
@@ -4318,8 +4825,12 @@ fr:
         enabled: Activer le badge
         icon: Icône
         image: Image
+        graphic: 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 marques)"
-        image_help: "Entrez l'URL de l'image (remplace le champ de l'icône si les deux sont définis)"
+        image_help: "Téléverser une image remplace le champ d'icône si les deux sont définis."
+        select_an_icon: "Sélectionnez une icône"
+        upload_an_image: "Téléverser une image"
+        read_only_setting_help: "Personnaliser le texte"
         query: Requête du badge (SQL)
         target_posts: Requête sur les messages
         auto_revoke: Exécuter la requête de révocation quotidiennement
@@ -4333,7 +4844,7 @@ fr:
           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é"
+          link_text: "Aperçu des badges accordés"
           plan_text: "Aperçu avec le plan de requête"
           modal_title: "Aperçu de la requête du badge"
           sql_error_header: "Il y a une erreur avec la requête."
@@ -4353,7 +4864,7 @@ fr:
             with_time: <span class="username">%{username}</span> à <span class="time">%{time}</span>
         badge_intro:
           title: "Choisissez un badge existant ou créez-en un nouveau pour commencer"
-          emoji: "emoji de femme étudiante"
+          emoji: "émoji de femme étudiante"
           what_are_badges_title: "Que sont les badges ?"
           badge_query_examples_title: "Exemple de requête de badge"
         mass_award:
@@ -4366,15 +4877,15 @@ fr:
           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: "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"
+        title: "Émoji"
+        help: "Ajoutez de nouveaux émojis qui seront disponibles pour tout le monde. (Conseil : glisser-déposer plusieurs fichiers en même temps)"
+        add: "Ajouter un nouvel émoji"
         uploading: "Envoi en cours…"
         name: "Nom"
         group: "Groupe"
         image: "Image"
-        alt: "aperçu de l'emoji personnalisé"
-        delete_confirm: "Êtes-vous sûr de vouloir supprimer l'emoji :%{name}: ?"
+        alt: "aperçu de l'émoji personnalisé"
+        delete_confirm: "Êtes-vous sûr de vouloir supprimer l'émoji :%{name}: ?"
       embedding:
         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 ?"
@@ -4382,8 +4893,9 @@ fr:
         title: "Intégration externe"
         host: "Hôtes autorisés"
         class_name: "Nom de classe"
+        allowed_paths: "Liste des chemins autorisés"
         edit: "modifier"
-        category: "Écrire dans la catégorie"
+        category: "Publier dans la catégorie"
         add_host: "Ajouter un hôte"
         settings: "Paramètres d'intégration externe"
         crawling_settings: "Paramètres des robots d'indexation"
@@ -4393,7 +4905,10 @@ fr:
         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 invisibles jusqu'à la prochaine réponse."
-        save: "Sauvegarder les paramètres d'intégration"
+        allowed_embed_selectors: "Sélecteur CSS pour les éléments autorisés dans les contenus intégrés"
+        blocked_embed_selectors: "Sélecteur CSS pour les éléments qui sont supprimés des contenus intégrés"
+        allowed_embed_classnames: "Classes CSS autorisées"
+        save: "Enregistrer les paramètres d'intégration"
       permalink:
         title: "Permaliens"
         description: "Redirections à appliquer pour les URL non connues par le forum."
@@ -4415,7 +4930,7 @@ fr:
           filter: "Rechercher (URL ou URL externe)"
       reseed:
         action:
-          label: "Remplacement du texte…"
+          label: "Remplacer le texte…"
           title: "Remplacer le texte des catégories et des sujets avec les traductions"
         modal:
           title: "Remplacer le texte"
@@ -4446,5 +4961,6 @@ fr:
           regular: "Utilisateur"
       previews:
         topic_title: "Sujet de discussion"
+        font_title: "Police %{font}"
         share_button: "Partager"
         reply_button: "Répondre"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 7b7426f3a1..8d1148b194 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -25,16 +25,16 @@ gl:
         thousands: "%{number}k"
         millions: "%{number}M"
     dates:
-      time: "h:mm a"
+      time: "HH:mm a"
       time_with_zone: "HH:mm (z)"
-      time_short_day: "ddd, HH:mm"
+      time_short_day: "ddd, HH:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, HH:mm"
+      long_no_year: "D MMM, HH: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"
       long_with_year_no_time: "D MMM, YYYY"
-      full_with_year_no_time: "D MMMM, YYYY"
+      full_with_year_no_time: "Do, 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"
@@ -77,8 +77,8 @@ gl:
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: "%{count} min"
-          other: "%{count} mins"
+          one: "%{count} min."
+          other: "%{count} min."
         x_hours:
           one: "%{count} hora"
           other: "%{count} horas"
@@ -110,28 +110,28 @@ gl:
           one: "%{count} mes despois"
           other: "%{count} meses despois"
         x_years:
-          one: "%{count} anos despois"
+          one: "%{count} ano despois"
           other: "%{count} anos despois"
       previous_month: "Mes anterior"
       next_month: "Mes seguinte"
       placeholder: data
     share:
       topic_html: 'Tema: <span class="topic-title">%{topicTitle}</span>'
-      post: "publicación %{postNumber}"
+      post: "publicación #%{postNumber}"
       close: "pechar"
-      twitter: "Compartir en Twitter"
+      twitter: "Compartir no Twitter"
       facebook: "Compartir no Facebook"
       email: "Enviar por correo"
       url: "Copiar e compartir o URL"
     action_codes:
-      public_topic: "fixo este tema público o %{when}"
-      private_topic: "fixo este tema unha mensaxe privada o %{when}"
-      split_topic: "este tema dividiuse o %{when}"
+      public_topic: "faga este tema público o %{when}"
+      private_topic: "faga deste tema unha mensaxe privada o %{when}"
+      split_topic: "divida tema %{when}"
       invited_user: "convidou a %{who} %{when}"
-      invited_group: "invitou %{who} o %{when}"
-      user_left: "%{who} elimináronse desta mensaxe %{when}"
-      removed_user: "eliminou a %{who} %{when}"
-      removed_group: "eliminou %{who} o %{when}"
+      invited_group: "convidou ao %{who} o %{when}"
+      user_left: "%{who} retiráronse por si mesmos desta mensaxe %{when}"
+      removed_user: "retirou a %{who} %{when}"
+      removed_group: "retirou ao %{who} o %{when}"
       autobumped: "promovido automaticamente %{when}"
       autoclosed:
         enabled: "pechado o %{when}"
@@ -143,32 +143,35 @@ gl:
         enabled: "arquivado o %{when}"
         disabled: "desarquivado o %{when}"
       pinned:
-        enabled: "pegado o %{when}"
-        disabled: "despegado o %{when}"
+        enabled: "fixado o %{when}"
+        disabled: "desprendido o %{when}"
       pinned_globally:
-        enabled: "pegado globalmente o %{when}"
-        disabled: "despegado o %{when}"
+        enabled: "fixado globalmente o %{when}"
+        disabled: "desprendido o %{when}"
       visible:
         enabled: "listado o %{when}"
         disabled: "retirado da lista o %{when}"
       banner:
-        enabled: "fixo disto un báner %{when}. Aparecerá na banda superior de todas as páxinas até que sexa desbotado polo usuario."
+        enabled: "faga disto un báner %{when}. Aparecerá na banda superior de todas as páxinas ata que sexa desbotado polo usuario."
         disabled: "eliminou este báner %{when}. Xa non aparecerá máis na banda superior de todas as páxinas."
-      forwarded: "reenviou o correo electrónico anterior"
+      forwarded: "reenviou a mensaxe de correo anterior"
     topic_admin_menu: "accións do tema"
-    wizard_required: "Este é o novo Discourse! Podes comezar co <a href='%{url}' data-auto-route='true'>asistente de configuración</a> ✨"
-    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."
+    wizard_required: "Este é o novo Discourse! Pode comezar co <a href='%{url}' data-auto-route='true'>asistente de configuración</a> ✨"
+    emails_are_disabled: "Todos as mensaxes de correo saíntes foron desactivadas globalmente por un administrador. Non se enviará ningún tipo de notificación por correo electrónico."
+    software_update_prompt:
+      dismiss: "Desbotar"
     bootstrap_mode_enabled:
-      one: "Para facilitar o lanzamento do seu novo sitio, está en modo de arranque. Todos os novos usuarios recibirán o nivel de confianza 1 e terán activados os correos electrónicos de resumo diario. Isto desactivarase automaticamente cando se una %{count} usuario."
-      other: "Para facilitar o lanzamento do seu novo sitio, está en modo de arranque. Todos os novos usuarios recibirán nivel de confianza 1 e terán activados os correos electrónicos de resumo diario. Isto desactivarase automaticamente cando se unan %{count} usuarios."
+      one: "Para facilitar o lanzamento do seu novo sitio, está en modo de arranque. Todos os novos usuarios recibirán o nivel de confianza 1 e terán activadas as mensaxes de correo de resumo diario. Isto desactivarase automaticamente cando se una %{count} usuario."
+      other: "Para facilitar o lanzamento do seu novo sitio, está en modo de arranque. Todos os novos usuarios recibirán nivel de confianza 1 e terán activadas as mensaxes de correo de resumo diario. Isto desactivarase automaticamente cando se unan %{count} usuarios."
     bootstrap_mode_disabled: "O modo Bootstrap desactivarase nun prazo de 24 horas."
     themes:
       default_description: "Predeterminado"
-      broken_theme_alert: "Pode que o teu sitio non funcione porque o tema ou compoñente %{theme} contén erros. Desactívao en %{path}."
+      broken_theme_alert: "Pode que o seu sitio non funcione porque o tema ou compoñente %{theme} contén erros. Desactíveo en %{path}."
     s3:
       regions:
         ap_northeast_1: "Asia Pacífico (Tokio)"
         ap_northeast_2: "Asia Pacífico (Seúl)"
+        ap_east_1: "Asia Pacífico (Hong Kong)"
         ap_south_1: "Asia Pacífico (Mumbai)"
         ap_southeast_1: "Asia Pacífico (Singapur)"
         ap_southeast_2: "Asia Pacífico (Sidney)"
@@ -187,9 +190,10 @@ gl:
         us_gov_west_1: "AWS GovCloud (EUA-Oeste)"
         us_west_1: "EUA Oeste (N. California)"
         us_west_2: "EUA Oeste (Oregón)"
+    clear_input: "Despexar entrada"
     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."
+    not_implemented: "Sentímolo pero esta funcionalidade non se implementou aínda!"
     no_value: "Non"
     yes_value: "Si"
     submit: "Enviar"
@@ -207,20 +211,23 @@ gl:
     links_lowercase:
       one: "ligazón"
       other: "ligazóns"
-    faq: "FAQ"
+    faq: "PMF"
     guidelines: "Directrices"
-    privacy_policy: "Política de privacidade"
+    privacy_policy: "Normas 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"
+    you: "Vostede"
     or: "ou"
     now: "agora mesmiño"
     read_more: "ler máis"
     more: "Máis"
+    x_more:
+      one: "%{count} Máis"
+      other: "%{count} Máis"
     less: "Menos"
     never: "nunca"
     every_30_minutes: "cada 30 minutos"
@@ -244,39 +251,37 @@ gl:
       simple_title: "Verbo de"
       title: "Verbo de %{title}"
       stats: "Estatísticas do sitio"
-      our_admins: "Administradores"
+      our_admins: "Os administradores"
       our_moderators: "Os moderadores"
       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"
       user_count: "Usuarios"
       active_user_count: "Usuarios activos"
-      contact: "Contacta connosco"
-      contact_info: "No caso dunha incidencia crítica ou asunto urxente que afecte este sitio, contacta connosco en %{contact_info}."
+      contact: "Contacte connosco"
+      contact_info: "No caso dunha incidencia crítica ou asunto urxente que afecte este sitio, contacte connosco en %{contact_info}."
     bookmarked:
       title: "Marcador"
       clear_bookmarks: "Limpar marcadores"
       help:
-        bookmark: "Preme para engadir aos marcadores a publicación inicial deste tema"
-        unbookmark: "Preme para retirar todos os marcadores deste tema"
-        unbookmark_with_reminder: "Preme para eliminar todos os marcadores e recordatorios deste tema. Configuraches o recordatorio %{reminder_at} para este tema."
+        bookmark: "Prema para engadir aos marcadores a publicación inicial deste tema"
+        unbookmark: "Prema para retirar todos os marcadores deste tema"
+        unbookmark_with_reminder: "Prema para eliminar todos os marcadores e recordatorios deste tema. Configurou o recordatorio %{reminder_at} para este tema."
     bookmarks:
       created: "Fixou como marcador esta publicación. %{name}"
       not_bookmarked: "marcar esta publicación"
       created_with_reminder: "Fixou como marcador esta publicación cun recordatorio %{date}. %{name}"
-      remove: "Eliminar marcador"
+      remove: "Retirar marcador"
       delete: "Eliminar marcador"
-      confirm_delete: "Confirmas a eliminación deste marcador? O recordatorio tamén se eliminará."
-      confirm_clear: "Confirmas o borrado de todos os marcadores deste tema?"
+      confirm_delete: "Confirma a eliminación deste marcador? O recordatorio tamén se eliminará."
+      confirm_clear: "Confirma o borrado de todos os marcadores deste tema?"
       save: "Gardar"
-      no_timezone: 'Aínda non configuraches ningún fuso horario. Non poderás estabelecer recordatorios. Configura un <a href="%{basePath}/my/preferences/profile">no teu perfil</a>.'
-      invalid_custom_datetime: "A data e hora que escribiu non é válida, ténteo de novo."
-      list_permission_denied: "Non tes permiso para ver os marcadores deste usuario."
+      no_timezone: 'Aínda non configurous ningunha zona horaria. Non poderá estabelecer recordatorios. Configure un <a href="%{basePath}/my/preferences/profile">no teu perfil</a>.'
+      invalid_custom_datetime: "A data e hora que escribiu non é correcta, ténteo de novo."
+      list_permission_denied: "Non ten permiso para ver os marcadores deste usuario."
       no_user_bookmarks: "Non ten marcadores de publicacións; os marcadores permítenlle facer rapidamente referencia a publicacións específicas."
       auto_delete_preference:
         label: "Eliminar automaticamente"
@@ -286,18 +291,6 @@ gl:
       search_placeholder: "Buscar marcadores por nome, título do tema ou contido da publicación"
       search: "Buscar"
       reminders:
-        later_today: "Hoxe, máis tarde"
-        next_business_day: "O vindeiro día laborable"
-        tomorrow: "Mañá"
-        next_week: "A vindeira semana"
-        post_local_date: "Data na publicación"
-        later_this_week: "Máis tarde esta semana"
-        start_of_next_business_week: "Luns"
-        start_of_next_business_week_alt: "O vindeiro luns"
-        next_month: "O vindeiro mes"
-        custom: "Personalizar data e hora"
-        last_custom: "Último"
-        none: "Non precisa recordatorios"
         today_with_time: "hoxe á(s) %{time}"
         tomorrow_with_time: "mañá á(s) %{time}"
         at_time: "á(s) %{date_time}"
@@ -305,35 +298,36 @@ gl:
     copy_codeblock:
       copied: "copiado!"
     drafts:
-      resume: "Continuar"
-      remove: "Eliminar"
+      resume: "Retomar"
+      remove: "Retirar"
+      remove_confirmation: "Confirma que quere retirar este borrador?"
       new_topic: "Borrador de novo tema"
       new_private_message: "Borrador de nova mensaxe privada"
       topic_reply: "Borrador de resposta"
       abandon:
-        confirm: "Xa tes un borrador aberto neste tema. Confirmas o seu abandono?"
-        yes_value: "Si, abandonar"
-        no_value: "Non, seguir"
+        confirm: "Ten un borrador en curso neste tema. Que lle gustaría facer con iso?"
+        yes_value: "Desbotar"
+        no_value: "Retomar a edición"
     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"
+      one: "Ver %{count} tema pendente"
+      other: "Ver %{count} temas pendentes"
     topic_count_new:
       one: "Ver %{count} tema novo"
       other: "Ver %{count} temas novos"
-    preview: "previsualizar"
+    preview: "visualizar"
     cancel: "cancelar"
     deleting: "Eliminando ..."
     save: "Gardar cambios"
     saving: "Gardando...."
     saved: "Gardado!"
-    upload: "Actualizar"
-    uploading: "Actualizando..."
-    uploading_filename: "Actualizando: %{filename}..."
+    upload: "Cargar"
+    uploading: "Cargando..."
+    uploading_filename: "Cargando: %{filename}..."
     clipboard: "portapapeis"
-    uploaded: "Actualizado!"
+    uploaded: "Cargado!"
     pasting: "A pegar..."
     enable: "Activar"
     disable: "Desactivar"
@@ -341,23 +335,23 @@ gl:
     undo: "Desfacer"
     revert: "Reverter"
     failed: "Fallou"
-    switch_to_anon: "Entrar no Modo anónimo"
-    switch_from_anon: "Saír do Modo anónimo"
+    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>"
+      install_banner: "Quere <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í"
+        placeholder: "escriba 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í"
+        placeholder: "escriba o título da mensaxe, url ou id aquí"
     review:
       order_by: "Ordenar por"
       in_reply_to: "en resposta a"
@@ -369,11 +363,18 @@ gl:
         total: "Total"
         min_score_visibility: "Puntuación mínima para visibilidade"
         score_to_hide: "Puntuación para agochar publicación"
+        take_action_bonus:
+          name: "tomou medidas"
+          title: "Cando un membro do equipo escolle tomar medidas, a alerta recibe unha bonificación."
         user_accuracy_bonus:
           name: "precisión do usuario"
+          title: "Os usuarios con alertas que fosen repetidamente aceptadas reciben unha bonificación."
         trust_level_bonus:
           name: "nivel de confianza"
           title: "Os elementos revisábeis creados por usuarios con maior nivel de confianza teñen unha puntuación superior."
+        type_bonus:
+          name: "tipo de bonificación"
+          title: "O equipo pode asignar unha bonificación a certos tipos revisábeis para facelos de maior prioridade."
       claim_help:
         optional: "Podes reclamar este elemento para evitar que outros o revisen."
         required: "Debes reclamar os elementos antes de revisalos."
@@ -383,12 +384,12 @@ gl:
         title: "reclamar este tema"
       unclaim:
         help: "eliminar esta reclamación"
-      awaiting_approval: "Agardando aprobación"
+      awaiting_approval: "Agardando a aprobación"
       delete: "Eliminar"
       settings:
         saved: "Gardado"
         save_changes: "Gardar os cambios"
-        title: "Axustes"
+        title: "Configuración"
         priorities:
           title: "Prioridades revisábeis"
       moderation_history: "Historial de moderación"
@@ -401,7 +402,9 @@ gl:
         other: "Este tema ten <b>%{count}</b> publicacións agardando aprobación"
       title: "Revisar"
       topic: "Tema:"
+      filtered_topic: "Filtrou o contido revisábel nun único tema."
       filtered_user: "Usuario"
+      filtered_reviewed_by: "Revisado por"
       show_all_topics: "buscar todos os temas"
       deleted_post: "(publicación eliminada)"
       deleted_user: "(usuario eliminado)"
@@ -412,13 +415,24 @@ gl:
         email: "Correo electrónico"
         name: "Nome"
         fields: "Campos"
+        reject_reason: "Razón"
       user_percentage:
         summary:
-          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} denuncia en total)"
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} denuncias en total)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} alertas en total)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} alertas en total)"
+        agreed:
+          one: "%{count}% concordou"
+          other: "%{count}% concordaron"
+        disagreed:
+          one: "%{count}% non concordou"
+          other: "%{count}% non concordaron"
+        ignored:
+          one: "%{count}% ignorou"
+          other: "%{count}% ignoraron"
       topics:
         topic: "Tema"
         reviewable_count: "Número"
+        reported_by: "Recollido por"
         deleted: "[Tema eliminado]"
         original: "(tema orixinal)"
         details: "detalles"
@@ -443,14 +457,19 @@ gl:
         category: "Categoría"
         orders:
           score: "Puntuación"
+          score_asc: "Puntuación (inversa)"
+          created_at: "Creado o"
+          created_at_asc: "Creado o (inverso)"
         priority:
           title: "Prioridade mínima"
-          low: "(calquera)"
+          any: "(calquera)"
+          low: "Baixa"
           medium: "Media"
           high: "Alta"
       conversation:
         view_full: "ver conversa completa"
       scores:
+        about: "A puntuación calcúlase con base no nivel de fiabilidade do informador, a precisión das súas alertas anteriores e a prioridade do elemento que se recolle."
         score: "Puntuación"
         date: "Data"
         type: "Tipo"
@@ -468,40 +487,79 @@ gl:
           title: "Ignorado"
         deleted:
           title: "Eliminado"
+        reviewed:
+          title: "(todas revisadas)"
         all:
           title: "(todo)"
       types:
         reviewable_flagged_post:
-          title: "Publicación denunciada"
-          flagged_by: "Denunciado por"
+          title: "Publicación sinalada"
+          flagged_by: "Sinalado por"
         reviewable_queued_topic:
           title: "Tema na fila de espera"
         reviewable_queued_post:
           title: "Publicación na fila de espera"
         reviewable_user:
           title: "Usuario"
+        reviewable_post:
+          title: "Publicación"
       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."
+        description: "Recibimos a súa nova publicación pero cómpre que sexa aprobada por un moderador antes de aparecer. Teña paciencia."
         pending_posts:
-          one: "Tes <strong>%{count}</strong> publicación pendente."
-          other: "Tes <strong>%{count}</strong> publicacións pendentes."
+          one: "Ten <strong>%{count}</strong> publicación pendente."
+          other: "Ten <strong>%{count}</strong> publicacións pendentes."
         ok: "De acordo"
+      example_username: "nome de usuario"
+      reject_reason:
+        title: "Por que rexeita a este usuario?"
+        send_email: "Enviar correo de rexeitamento"
+    relative_time_picker:
+      minutes:
+        one: "minuto"
+        other: "minutos"
+      hours:
+        one: "hora"
+        other: "horas"
+      days:
+        one: "día"
+        other: "días"
+      months:
+        one: "mes"
+        other: "meses"
+      years:
+        one: "ano"
+        other: "anos"
+      relative: "Relativo"
+    time_shortcut:
+      later_today: "Hoxe, máis tarde"
+      next_business_day: "O vindeiro día laborábel"
+      tomorrow: "Mañá"
+      next_week: "A vindeira semana"
+      post_local_date: "Data na publicación"
+      later_this_week: "Máis tarde, esta semana"
+      start_of_next_business_week: "Luns"
+      start_of_next_business_week_alt: "O vindeiro luns"
+      next_month: "O vindeiro mes"
+      custom: "Personalizar data e hora"
+      relative: "Tempo relativo"
+      none: "Non se necesita"
     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>"
+      you_posted_topic: "<a href='%{userUrl}'>Vostede</a> publicou <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>"
+      you_replied_to_post: "<a href='%{userUrl}'>Vostede</a> respondeu 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>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Vosted</a> respondeu 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>"
+      you_mentioned_user: "<a href='%{user1Url}'>Vostede</a> citou 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>"
+      sent_by_you: "Enviado por <a href='%{userUrl}'>, vaia, vostede mesmo.</a>"
     directory:
+      username: "Nome do usuario"
       filter_name: "filtrar por nome de usuario"
       title: "Usuarios"
       likes_given: "Dados"
@@ -516,34 +574,43 @@ gl:
       no_results: "Non se atoparon resultados."
       days_visited: "Visitas"
       days_visited_long: "Días visitados"
-      posts_read: "Lidas"
+      posts_read: "Lidos"
       posts_read_long: "Publicacións lidas"
       last_updated: "Última actualización:"
       total_rows:
-        one: "Un usuario"
+        one: "%{count} 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_from_group: "Retirar usuario"
         make_user_group_owner: "Facer propietario"
         remove_user_as_group_owner: "Revogar propietario"
     groups:
       member_added: "Engadido"
+      member_requested: "Solicitado o"
+      add_members:
+        title: "Engadir membros a %{group_name}"
+        description: "Tamén pode pegalos nunha lista separada por comas."
+        usernames: "Escriba nomes de usuario e enderezos de correo"
+        input_placeholder: "Nomes de usuario ou enderezos de correo"
+        notify_users: "Notificar os usuarios"
       requests:
         title: "Peticións"
         reason: "Razón"
         accept: "Aceptar"
         accepted: "aceptado"
-        deny: "Denegar"
-        denied: "denegado"
+        deny: "Rexeitar"
+        denied: "rexeitado"
+        undone: "petición retirada"
+        handle: "xestionar a petición de incorporación"
       manage:
         title: "Xestionar"
         name: "Nome"
         full_name: "Nome completo"
         add_members: "Engadir membros"
-        delete_member_confirm: "Queres eliminar a «%{username}» do grupo «%{group}»?"
+        delete_member_confirm: "Quere eliminar a «%{username}» do grupo «%{group}»?"
         profile:
           title: Perfil
         interaction:
@@ -552,54 +619,93 @@ gl:
           notification: Notificación
         email:
           title: "Correo electrónico"
+          status: "Sincronizados os correos %{old_emails} / %{total_emails} vía IMAP."
           credentials:
+            title: "Acreditacións"
+            smtp_server: "Servidor SMTP"
+            smtp_port: "Porto SMTP"
+            smtp_ssl: "Use SSL para SMTP"
+            imap_server: "Servidor SMTP"
+            imap_port: "Porto IMAP"
+            imap_ssl: "Use SSL para IMAP"
             username: "Nome do usuario"
             password: "Contrasinal"
+          settings:
+            title: "Configuración"
+            allow_unknown_sender_topic_replies: "Permitir respostas ao tema de remitente descoñecido."
+            allow_unknown_sender_topic_replies_hint: "Permítelles aos remitentes descoñecidos responder a temas do grupo. Se isto non está activado, as respostas desde enderezos de correo electrónico non incluídos no fío de correo electrónico IMAP ou convidados ao tema crearán un novo tema."
+          mailboxes:
+            synchronized: "Caixa de correo sincronizada"
+            none_found: "Non se atoparon caixas de correo nesta conta de correo electrónico."
+            disabled: "desactivado"
         membership:
-          title: Afiliación
+          title: Incorporación
           access: Acceso
+        categories:
+          title: Categorías
+          long_title: "Notificacións predeterminadas de categoría"
+          description: "Cando se engaden usuarios a este grupo, os axustes de notificacións da súa categoría configuraranse desta maneira predeterminada. Logo, pódense cambiar."
+          watched_categories_instructions: "Automaticamente observará todos os temas destas categorías. Os membros do grupo recibirán unha notificación de todas as novas publicacións e temas e tamén aparecerá un reconto de novas publicacións xunto ao tema."
+          tracked_categories_instructions: "Seguir automaticamente todos os temas destas categorías. Aparecerá un reconto de novas publicacións xunta o tema."
+          watching_first_post_categories_instructions: "Os usuarios recibirán unha notificación da primeira publicación en cada novo tema destas categorías."
+          regular_categories_instructions: "Se se silencian estas categorías, non o estarán para os membros do grupo. Notificaráselles aos usuarios se son mencionados ou alguén lles responde."
+          muted_categories_instructions: "Non se lles notificará aos usuarios nada sobre temas novos destas categorías e non aparecerán nas categorías nin nas páxinas dos últimos temas."
+        tags:
+          title: Etiquetas
+          long_title: "Notificación predeterminadas de etiquetas"
+          description: "Cando se engaden usuarios a este grupo, os axustes de notificacións da súa etiqueta configuraranse desta maneira predeterminada. Logo, pódense cambiar."
+          watched_tags_instructions: "Automaticamente observará todos os temas destas etiquetas. Os membros do grupo recibirán unha notificación de todas as novas publicacións e temas e tamén aparecerá un reconto de novas publicacións xunta o tema."
+          tracked_tags_instructions: "Seguir automaticamente todos os temas con estas etiquetas. O número de novas publicacións aparecerá á beira do tema."
+          watching_first_post_tags_instructions: "Os usuarios recibirán unha notificación da primeira publicación de cada novo tema con estas etiquetas."
+          regular_tags_instructions: "Se se silencian estas etiquetas, non estarán silenciadas para os membros do grupo. Notificaráselles aos usuarios se son mencionados ou alguén lles responde."
+          muted_tags_instructions: "Os usuarios non recibirán ningunha notificación sobre temas novos con estas etiquetas e estes temas non aparecerán en últimos."
         logs:
           title: "Rexistros"
           when: "Cando"
           action: "Acción"
+          acting_user: "Usuario activo"
           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)"
+      permissions:
+        title: "Permisos"
+        none: "Non hai categorías asociadas a este grupo."
+        description: "Os membros deste grupo poden acceder a estas categorías"
+      public_admission: "Permitir que os usuarios se unan ao grupo libremente (require un grupo visíbel 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."
-        requests: "Non hai solicitudes de afiliación para este grupo."
+        requests: "Non hai petición de incorporación a este 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."
+        logs: "Non hai rexistros deste grupo."
       add: "Engadir"
-      join: "Unirse"
+      join: "Participar"
       leave: "Abandonar"
       request: "Petición"
       message: "Mensaxe"
-      confirm_leave: "Confirmas o abandono deste grupo?"
-      allow_membership_requests: "Permitir que os usuarios envíen solicitudes de afiliación aos propietarios do grupo (require un grupo visible ao público)"
-      membership_request_template: "Personalizar o modelo que se amosa aos usuarios cando se envía unha solicitude de afiliación"
+      confirm_leave: "Confirma o abandono deste grupo?"
+      allow_membership_requests: "Permitirlles aos usuarios que envíen peticións de incorporación aos propietarios do grupo (require un grupo visíbel ao público)"
+      membership_request_template: "Personalizar o modelo que se lles amosa aos usuarios cando se envía unha petición de incorporación"
       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"
-      membership: "Afiliación"
+        title: "Petición para participar en%{group_name}"
+        reason: "Permitir que os propietarios do grupo saiban por que pertence a este grupo"
+      membership: "Incorporación"
       name: "Nome"
       group_name: "Nome do grupo"
       user_count: "Usuarios"
-      bio: "Acerca do grupo"
-      selector_placeholder: "escribe o nome do usuario"
+      bio: "Verbo do grupo"
+      selector_placeholder: "escriba o nome do usuario"
       owner: "propietario"
       index:
         title: "Grupos"
         all: "Todos os grupos"
-        empty: "Non hai grupos visibles."
+        empty: "Non hai grupos visiíbeis."
         filter: "Filtrar por tipo de grupo"
         owner_groups: "Grupos dos que son propietario"
         close_groups: "Grupos pechados"
@@ -622,15 +728,30 @@ gl:
       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"
+        filter_placeholder: "nome de usuario"
+        remove_member: "Retirar membro"
+        remove_member_description: "Retirar a <b>%{username}</b> deste grupo"
         make_owner: "Facer propietario"
         make_owner_description: "Facer que <b>%{username}</b> sexa un propietario deste grupo"
-        remove_owner: "Eliminar como propietario"
-        remove_owner_description: "Eliminar a <b>%{username}</b> como propietario deste grupo"
+        remove_owner: "Retirar como propietario"
+        remove_owner_description: "Retirar a <b>%{username}</b> como propietario deste grupo"
+        make_primary: "Facer primario"
+        make_primary_description: "Faga deste o grupo primario para <b>%{username}</b>"
+        remove_primary: "Retirar como primario"
+        remove_primary_description: "Retirar este o grupo como primario para <b>%{username}</b>"
+        remove_members: "Retirar membros"
+        remove_members_description: "Retirar os usuarios seleccionados deste grupo"
+        make_owners: "Facer propietarios"
+        make_owners_description: "Facer dos usuarios seleccionados os propietarios deste grupo"
+        remove_owners: "Retirar propietarios"
+        remove_owners_description: "Retirar os usuarios seleccionados como propietarios deste grupo"
+        make_all_primary: "Facelos a todos primarios"
+        make_all_primary_description: "Facer deste o grupo primario para todos os usuarios seleccionados"
+        remove_all_primary: "Retirar como primario"
+        remove_all_primary_description: "Retirar este grupo como primario"
         owner: "Propietario"
-        forbidden: "Non tes permiso para ver os membros"
+        primary: "Primario"
+        forbidden: "Non ten permiso para ver os membros."
       topics: "Temas"
       posts: "Publicacións"
       mentions: "Mencións"
@@ -647,11 +768,11 @@ gl:
         everyone: "Todos"
       notifications:
         watching:
-          title: "Ver"
-          description: "Notificaráseche cada publicación nova en cada mensaxe e amosarase o número de novas respostas."
+          title: "Observación"
+          description: "Notificaráselle cada publicación nova en todas as mensaxes e tamén amosará o número de novas respostas."
         watching_first_post:
-          title: "Vendo publicación inicial"
-          description: "Recibirás notificacións das novas mensaxes deste grupo pero non das súas respostas."
+          title: "Observando a publicación inicial"
+          description: "Recibirá 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."
@@ -661,18 +782,23 @@ gl:
         muted:
           title: "Silenciado"
           description: "Non recibirás notificación ningunha sobre as mensaxes deste grupo."
+      flair_url: "Imaxe de estilo avatar"
       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_bg_color: "Cor de fondo de estilo avatar"
+      flair_bg_color_placeholder: "(Opcional) Valor de cor hexadecimal"
+      flair_color: "Cor de estilo avatar"
+      flair_color_placeholder: "(Opcional) Valor de cor hexadecimal"
+      flair_preview_icon: "Visualizar icona"
+      flair_preview_image: "Visualizar imaxe"
       flair_type:
         icon: "Seleccionar unha icona"
-        image: "Subir unha imaxe"
+        image: "Cargar unha imaxe"
     user_action_groups:
-      "1": "Gústames dados"
-      "2": "Gústames recibidos"
+      "1": "Gústames"
+      "2": "Gústames"
       "3": "Marcadores"
       "4": "Temas"
-      "5": "Respostas"
+      "5": "Réplicas"
       "6": "Respostas"
       "7": "Mencións"
       "9": "CItas"
@@ -696,18 +822,28 @@ gl:
       posts: "Publicacións"
       topics: "Temas"
       latest: "Últimos"
-      latest_by: "últimos de"
       toggle_ordering: "trocar o control de ordenación"
       subcategories: "Subcategorías"
+      muted: "Categorías silenciadas"
       topic_sentence:
         one: "%{count} tema"
         other: "%{count} temas"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "semana"
+        month: "mes"
+      topic_stat_all_time:
+        one: "%{number} total"
+        other: "%{number} total"
       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"
+        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
@@ -717,16 +853,17 @@ gl:
       phone: Teléfono
       other_accounts: "Outras contas co mesmo enderezo IP:"
       delete_other_accounts: "Eliminar %{count}"
-      username: "nome do usuario"
+      username: "nome de usuario"
       trust_level: "NdeC"
       read_time: "tempo de lectura"
       topics_entered: "temas introducidos"
       post_count: "# publicacións"
       confirm_delete_other_accounts: "Confirma que quere eliminar estas contas?"
+      powered_by: "utitlízase <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "copiado"
     user_fields:
       none: "(seleccione unha opción)"
-      required: 'Introduce un valor para "%{name}"'
+      required: 'Escriba un valor para "%{name}"'
     user:
       said: "%{username}:"
       profile: "Perfil"
@@ -734,9 +871,9 @@ gl:
       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ñá."
+        confirm: "Confirma a descarga das súas publicacións?"
+        success: "Iniciouse a descarga, notificarémoslle cunha mensaxe o remate do proceso."
+        rate_limit_error: "Só se poden descargar as publicacións unha vez por día. Ténteo de novo mañá."
       new_private_message: "Nova mensaxe"
       private_message: "Mensaxe"
       private_messages: "Mensaxes"
@@ -747,19 +884,36 @@ gl:
           read: "Lidos"
           unread: "Sen ler"
         ignore_duration_title: "Ignorar usuario"
-        ignore_duration_username: "Nome do usuario"
+        ignore_duration_username: "Nome de usuario"
         ignore_duration_when: "Duración:"
         ignore_duration_save: "Ignorar"
-        ignore_duration_time_frame_required: "Escribe un marco temporal"
-        ignore_no_users: "Non tes usuarios ignorados."
+        ignore_duration_note: "Teña en conta que todos os ignorados elimínanse automaticamente despois de expirar a duración de ignorado."
+        ignore_duration_time_frame_required: "Seleccione un marco temporal"
+        ignore_no_users: "Non ten 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."
+        ignore_option_title: "Non recibirá notificacións relacionadas con este usuario e todos os seus temas e respostas permanecerán agochados."
         add_ignored_user: "Engadir..."
         mute_option: "Silenciado"
-        mute_option_title: "Non recibirás notificación ningunha relacionada con este usuario."
+        mute_option_title: "Non recibirá notificación ningunha relacionada con este usuario."
         normal_option: "Normal"
-        normal_option_title: "Recibirás unha notificación se este usuario che responde, cita a túa mensaxe ou menciona o teu nome."
+        normal_option_title: "Recibirá unha notificación se este usuario lle responde, cita a súa mensaxe ou menciona o seu nome."
+      notification_schedule:
+        title: "Calendario de notificacións"
+        label: "Activar o calendario personalizado de notificacións"
+        tip: "Fóra destas horas, vostede terá posto automaticamente en «non molestar»"
+        midnight: "Medianoite"
+        none: "Ningunha"
+        monday: "Luns"
+        tuesday: "Martes"
+        wednesday: "Mércores"
+        thursday: "Xoves"
+        friday: "Venres"
+        saturday: "Sábado"
+        sunday: "Domingo"
+        to: "para o"
       activity_stream: "Actividade"
+      read: "Ler"
+      read_help: "Temas lidos recentes"
       preferences: "Preferencias"
       feature_topic_on_profile:
         open_search: "Seleccionar un novo tema"
@@ -768,107 +922,135 @@ gl:
         save: "Gardar"
         clear:
           title: "Borrar"
-          warning: "Confirmas o borrado do teu tema destacado?"
-      use_current_timezone: "Utilizar fuso horario actual"
+          warning: "Confirma o borrado do seu tema de actualidade?"
+      use_current_timezone: "Utilizar zona horaria actual"
       profile_hidden: "O perfil público deste usuario está oculto."
-      expand_profile: "Expandir"
-      collapse_profile: "Reducir"
+      expand_profile: "Despregar"
+      collapse_profile: "Pregar"
       bookmarks: "Marcadores"
       bio: "Verbo de min"
-      timezone: "Fuso horario"
+      timezone: "Zona horaria"
       invited_by: "Convidado por"
       trust_level: "Nivel de confianza"
       notifications: "Notificacións"
       statistics: "Estatísticas"
       desktop_notifications:
-        label: "Notificacións instantáneas"
+        label: "Notificacións ao vivo"
         not_supported: "Este navegador non admite notificacións. Desculpe."
         perm_default: "Acender notificacións"
         perm_denied_btn: "Permiso denegado"
-        perm_denied_expl: "Denegaches o permiso para notificacións no teu navegador. Modifica os axustes para recibir notificacións no teu navegador."
+        perm_denied_expl: "Denegou o permiso para recibir notificacións no navegador. Permita as notificacións na configuración do navegador."
         disable: "Desactivar as notificacións"
         enable: "Activar as notificacións"
-        each_browser_note: "Nota: Tes que cambiar este axuste en cadanseu navegador que utilices."
-        consent_prompt: "Queres recibir notificacións intantáneas cando lean as túas publicacións?"
+        each_browser_note: 'Nota: Ten que cambiar este axuste en todos os navegadores que use. Desactivaranse todas as notificacións cando estea en «non molestar», independentemente deste axuste.'
+        consent_prompt: "Quere recibir notificacións ao vivo cando a xente lea as súas publicacións?"
       dismiss: "Desbotar"
       dismiss_notifications: "Desbotar todo"
       dismiss_notifications_tooltip: "Marcar todas notificacións sen ler como lidas"
-      first_notification: "Xa tes a túa primeira notificación! Selecciónaa para comezar."
-      dynamic_favicon: "Amosar o número na icona do navegador"
+      first_notification: "Xa ten a súa primeira notificación! Selecciónea para comezar."
+      dynamic_favicon: "Amosar conta na icona do navegador"
+      skip_new_user_tips:
+        description: "Saltar consellos e insignias na entrada dos novos usuarios"
+        not_first_time: "Non é a súa primeira vez?"
+        skip_link: "Saltar estes consellos"
       theme_default_on_all_devices: "Facer que este sexa o tema predeterminado en todos os meus dispositivos"
+      color_scheme_default_on_all_devices: "Estabelecer esquema(s) de cores predeterminados en todos os dispositivos"
+      color_scheme: "Esquema de cor"
+      color_schemes:
+        default_description: "Predeterminado"
+        disable_dark_scheme: "O mesmo que o normal"
+        dark_instructions: "Pode visualizar o esquema do modo escuro trocando no seu dispositivo a modo escuro."
+        undo: "Restabelecer"
+        regular: "Normal"
+        dark: "Modo escuro"
+        default_dark_scheme: "(predeterminado do sitio)"
+      dark_mode: "Modo escuro"
+      dark_mode_enable: "Activar o esquema de cores automático en modo escuro"
       text_size_default_on_all_devices: "Facer que este sexa o tamaño de texto predeterminado en todos os meus dispositivos"
       allow_private_messages: "Permitirlles a outros usuarios enviarme mensaxes privadas"
       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"
+      enable_defer: "Activar a opción de diferir para marcar os temas como non lidos"
       change: "cambiar"
-      featured_topic: "Tema destacado"
+      featured_topic: "Tema de actualidade"
       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:"
+      suspended_notice: "Este usuario está suspendido ata o %{date}."
+      suspended_permanently: "Este usuario está suspendido."
+      suspended_reason: "Razón: "
+      github_profile: "Github"
       email_activity_summary: "Resumo da actividade"
       mailing_list_mode:
         label: "Modo de lista de correo"
         enabled: "Activar o modo de lista de correo"
-        individual: "Enviar un correo electrónico por cada nova publicación"
+        instructions: |
+          Este axuste anula o resumo da actividade.<br />
+          Os temas e categorías silenciados non están incluídos nestes correos electrónicos.
+        individual: "Enviarme un correo electrónico por cada nova publicación"
         individual_no_echo: "Enviarme un correo electrónico por cada nova publicación, agás as miñas"
-        many_per_day: "Enviarme un correo electrónico por cada nova publicación  (aproximadamente %{dailyEmailEstimate} por día)"
+        many_per_day: "Enviarme un correo electrónico por cada nova publicación (aproximadamente %{dailyEmailEstimate} por día)"
         few_per_day: "Enviarme un correo electrónico por cada nova publicación (aproximadamente 2 por día)"
         warning: "O modo de lista de correo está activado. Anularanse os axustes da notificación por correo electrónico."
       tag_settings: "Etiquetas"
       watched_tags: "Visto"
-      watched_tags_instructions: "Verás automaticamente todos os temas novos con estas etiquetas. Recibirás notificacións de todas as novas publicacións e temas e aparecerá o número de novas publicacións preto do tema."
+      watched_tags_instructions: "Verá automaticamente todos os temas novos con estas etiquetas. Recibirá notificacións de todas as novas publicacións e temas e aparecerá o número de novas publicacións preto do tema."
       tracked_tags: "Seguido"
-      tracked_tags_instructions: "Seguirás automaticamente todos os temas con estas etiquetas. O número de novas publicacións amosarase preto do tema."
+      tracked_tags_instructions: "Seguirá automaticamente todos os temas con estas etiquetas. O número de novas publicacións amosarase preto do tema."
       muted_tags: "Silenciado"
-      muted_tags_instructions: "Non recibirás notificacións de nada relacionado cos novos temas con estas etiquetas e non aparecerán entre os máis recentes."
+      muted_tags_instructions: "Non recibirá notificacións de nada relacionado cos novos temas con estas etiquetas e non aparecerán entre os máis recentes."
       watched_categories: "Visto"
-      watched_categories_instructions: "Verás automaticamente todos os temas destas categorías. Recibirás notificacións de todas as novas publicacións e temas e aparecerá o número de novas publicacións preto do tema."
+      watched_categories_instructions: "Verá automaticamente todos os temas destas categorías. Recibirá notificacións de todas as novas publicacións e temas e aparecerá o número de novas publicacións preto do tema."
       tracked_categories: "Seguido"
       tracked_categories_instructions: "Seguirás automaticamente todos os temas destas categorías. O número de novas publicacións aparecerá preto do tema."
       watched_first_post_categories: "Vendo publicación inicial"
       watched_first_post_categories_instructions: "Recibirás notificacións da publicación inicial en cada novo tema destas categorías."
-      watched_first_post_tags: "Vendo publicación inicial"
-      watched_first_post_tags_instructions: "Recibirás notificacións da publicación inicial en cada novo tema con estas etiquetas."
+      watched_first_post_tags: "Vendo a publicación inicial"
+      watched_first_post_tags_instructions: "Recibirá notificacións da publicación inicial en cada novo tema con estas etiquetas."
       muted_categories: "Silenciado"
-      muted_categories_instructions: "Non recibirás notificacións de nada relacionado cos novos temas destas categorías e non aparecerán nas categorías nin nas páxinas máis recentes."
-      muted_categories_instructions_dont_hide: "Non recibirás notificacións de nada relacionado cos novos temas nestas categorías."
-      no_category_access: "Como moderador, tes acceso limitado ás categorías e non podes gardar cambios."
+      muted_categories_instructions: "Non recibirá notificacións de nada relacionado cos novos temas destas categorías e non aparecerán nas categorías nin nas páxinas máis recentes."
+      muted_categories_instructions_dont_hide: "Non recibirá notificacións de nada relacionado cos novos temas nestas categorías."
+      regular_categories: "Normal"
+      regular_categories_instructions: "Verá estas categorías nas listas de temas «Últimos» e «Importantes»."
+      no_category_access: "Como moderador, ten acceso limitado ás categorías e non pode gardar cambios."
       delete_account: "Eliminar a miña conta"
-      delete_account_confirm: "Confirmas que queres eliminar definitivamente a túa conta? Esta acción non se pode desfacer!"
-      deleted_yourself: "A túa conta acaba de ser eliminada completamente."
-      delete_yourself_not_allowed: "Ponte en contacto cun membro do equipo para eliminar a túa conta."
+      delete_account_confirm: "Confirma que quere eliminar definitivamente a súa conta? Esta acción non se pode desfacer!"
+      deleted_yourself: "A súa conta acaba de ser eliminada completamente."
+      delete_yourself_not_allowed: "Póñase en contacto cun membro do equipo para eliminar a súa conta."
       unread_message_count: "Mensaxes"
       admin_delete: "Eliminar"
       users: "Usuarios"
       muted_users: "Silenciado"
       muted_users_instructions: "Suprimir todas as notificacións e mensaxes privadas destes usuarios."
+      allowed_pm_users: "Permitidas"
+      allowed_pm_users_instructions: "Permitir só MP destes usuarios."
+      allow_private_messages_from_specific_users: "Permitir só a usuarios específicos que me envíen mensaxes persoais"
       ignored_users: "Ignorado"
       ignored_users_instructions: "Suprimir todas as publicacións, notificacións e mensaxes privadas destes usuarios."
       tracked_topics_link: "Amosar"
-      automatically_unpin_topics: "Despegar os temas automaticamente cando alcance o fondo."
-      apps: "Aplicacións"
+      automatically_unpin_topics: "Desprender os temas automaticamente cando acade o fondo."
+      apps: "Apps"
       revoke_access: "Revogar acceso"
+      undo_revoke_access: "Desfacer a revogación de acceso"
       api_approved: "Aprobado:"
+      api_last_used_at: "Último utilizado o:"
       theme: "Tema"
-      save_to_change_theme: 'Para actualizar o tema, preme "%{save_text}"'
+      save_to_change_theme: 'Para actualizar o tema, prema "%{save_text}"'
       home: "Páxina de inicio predeterminada"
       staged: "Transitorio"
       staff_counters:
-        flags_given: "denuncias útiles"
-        flagged_posts: "publicacións denunciadas"
+        flags_given: "alertas útiles"
+        flagged_posts: "publicacións sinaladas"
         deleted_posts: "publicacións eliminadas"
         suspensions: "suspensións"
         warnings_received: "advertencias"
         rejected_posts: "publicacións rexeitadas"
       messages:
-        all: "Todo"
+        all: "Todas"
         inbox: "Caixa de entrada"
-        sent: "Enviados"
+        sent: "Enviadas"
         archive: "Arquivo"
         groups: "Os meus grupos"
         bulk_select: "Seleccionar mensaxes"
@@ -879,6 +1061,7 @@ gl:
         tags: "Etiquetas"
       preferences_nav:
         account: "Conta"
+        security: "Seguranza"
         profile: "Perfil"
         emails: "Correos electrónicos"
         notifications: "Notificacións"
@@ -886,7 +1069,7 @@ gl:
         users: "Usuarios"
         tags: "Etiquetas"
         interface: "Interface"
-        apps: "Aplicacións"
+        apps: "Apps"
       change_password:
         success: "(correo enviado)"
         in_progress: "(enviando o correo)"
@@ -897,75 +1080,99 @@ gl:
         choose_new: "Elixir un novo contrasinal"
         choose: "Elixir un contrasinal"
       second_factor_backup:
+        title: "Códigos de copia de seguranza de dobre paso"
         regenerate: "Rexenerar"
         disable: "Desactivar"
         enable: "Activar"
         enable_long: "Activar códigos de copia de seguranza"
+        manage:
+          one: "Xestionar os códigos de copia de seguranza. Quédanlle <strong>%{count}</strong> de código de copia de seguranza."
+          other: "Xestionar os códigos de copia de seguranza. Quédanlle <strong>%{count}</strong> de códigos de copia de seguranza."
         copy_to_clipboard: "Copiar ao portapapeis"
-        copy_to_clipboard_error: "Erro ao copiar os datos ao portapapeis"
+        copy_to_clipboard_error: "Produciuse un erro ao copiar os datos ao portapapeis"
         copied_to_clipboard: "Copiado ao portapapeis"
         download_backup_codes: "Descargar códigos de copia de seguranza"
+        remaining_codes:
+          one: "Quédanlle <strong>%{count}</strong> de código de copia de seguranza."
+          other: "Quédanlle <strong>%{count}</strong> de códigos de copia de seguranza."
         use: "Usar un código de copia de seguranza"
+        enable_prerequisites: "Debe activar un método primario de dobre paso antes de xerar os códigos de copia."
         codes:
           title: "Códigos de copia de seguranza xerados"
-          description: "Os códigos de copia de seguranza só poden usarse unha vez. Gárdaos nun lugar seguro pero accesible."
+          description: "Os códigos de copia de seguranza só poden usarse unha vez. Gárdeos nun lugar seguro pero accesíbel."
       second_factor:
-        forgot_password: "Esqueciches o contrasinal?"
-        confirm_password_description: "Confirma o teu contrasinal para continuar"
+        title: "Autenticación de dobre paso"
+        enable: "Xestionar autenticación de dobre paso"
+        disable_all: "Desactivar todos"
+        forgot_password: "Esqueceu o contrasinal?"
+        confirm_password_description: "Confirme o seu contrasinal para continuar"
         name: "Nome"
         label: "Código"
-        rate_limit: "Agarda antes de tentalo con outro código de autenticación."
-        disable_description: "Escribe o código de autenticación da túa aplicación"
-        show_key_description: "Inserir manualmente"
+        rate_limit: "Agarde antes de tentalo con outro código de autenticación."
+        enable_description: |
+          Escanee este código QR nunha aplicación compatíbel (<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 escriba o código de autenticación.
+        disable_description: "Escriba o código de autenticación da súa aplicación"
+        show_key_description: "Introducilo manualmente"
         short_description: |
-          Protexe a túa conta con códigos de seguridade dun só uso.
-        use: "Usar aplicación de autenticador"
+          Protexa a súa conta con códigos de seguranza dun só uso.
+        extended_description: |
+          A autenticación de dobre paso reforza a seguranza da sús conta, ao requirir un código dun só uso ademais do contrasinal. Os tokens pódense xear en 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: "Repare en que a activación na súa conta da autenticación de dobre paso implica a desactivación do inicio de sesión a través de redes sociais."
+        use: "Usar app de autenticador"
+        enforced_notice: "Requírese activar a autenticación de dobre paso para acceder a este sitio."
         disable: "Desactivar"
+        disable_confirm: "Confirma que quere desactivar todos os métodos de dobre paso?"
         save: "Gardar"
         edit: "Editar"
+        edit_title: "Editar autenticador"
+        edit_description: "Nome do autenticador"
+        enable_security_key_description: |
+          Cando teña a súa <a href="https://www.google.com/search?q=hardware+security+key" target="_blank"> clave de equipo seguro</a> preparada, prema o botón Rexistrarse, a seguir.
         totp:
           title: "Autenticadores que usan códigos"
           add: "Engadir autenticador"
           default_name: "O meu autenticador"
-          name_and_code_required_error: "Debes escribir un nome e o código da aplicación de autenticador."
+          name_and_code_required_error: "Debe escribir un nome e o código da app autenticadora."
         security_key:
           register: "Rexistrarse"
-          title: "Chaves de seguranza"
-          add: "Engadir chave de seguranza"
-          default_name: "Chave de seguranza principal"
-          already_added_error: "Xa rexistraches esta chave de seguranza. Non precisas volver rexistrala."
-          edit: "Editar chave de seguranza"
+          title: "Clave de seguranza"
+          add: "Engadir clave de seguranza"
+          default_name: "Clave de seguranza principal"
+          not_allowed_error: "O proceso de rexistro da clave de seguranza esgotou o tempo ou foi anulado."
+          already_added_error: "Xa rexistrou esta clave de seguranza. Non precisa volver rexistrala."
+          edit: "Editar clave de seguranza"
           save: "Gardar"
-          edit_description: "Nome da chave de seguranza"
-          name_required_error: "Debes escribir un nome para a chave de seguranza."
+          edit_description: "Nome da clave de seguranza"
+          name_required_error: "Debe escribir un nome para a clave de seguranza."
       change_about:
         title: "Cambiar «Verbo de min»"
         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?"
+        title: "Cambiar o nome de usuario"
+        confirm: "Confirma o cambio do seu nome de usuario?"
         taken: "Sentímolo pero este nome xa está en uso."
-        invalid: "Este nome de usuario non é válido. Só pode conter números e letras."
+        invalid: "Este nome de usuario non é correcto. Só pode conter 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."
+        error: "Produciuse un erro ao cambiar o correo electrónico. Ese enderezo estará xa ocupado?"
+        success: "Enviamos un correo electrónico a ese enderezo. Siga as instrucións de confirmación."
+        success_via_admin: "Enviouse unha mensaxe de correo a ese enderezo. O usuario deberá seguir as instrucións de confirmación expostas na mensaxe de correo."
+        success_staff: "Enviamos un correo electrónico ao teu enderezo actual. Siga as instrucións de confirmación."
       change_avatar:
-        title: "Cambia a foto do perfil"
+        title: "Cambie 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_title: "Cambie o seu 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}"
+        refresh_gravatar_title: "Actualice o seu %{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."
+        upload_title: "Cargue a súa imaxe"
+        image_is_not_a_square: "Aviso: recortamos a sú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."
@@ -973,7 +1180,8 @@ gl:
         title: "Fondo das fichas dos usuarios"
         instructions: "As imaxes dos fondos centraranse e terán unha largura predeterminada de 590 px."
       change_featured_topic:
-        title: "Tema destacado"
+        title: "Tema de actualidade"
+        instructions: "Na súa tarxeta de usuario e no seu perfil atopará unha ligazón a este tema."
       email:
         title: "Correo electrónico"
         primary: "Correo electrónico principal"
@@ -985,51 +1193,56 @@ gl:
         resent_label: "correo electrónico enviado"
         update_email: "Cambiar o correo electrónico"
         set_primary: "Estabelecer correo electrónico principal"
-        destroy: "Eliminar correo electrónico"
+        destroy: "Retirar correo electrónico"
         add_email: "Engadir correo electrónico alternativo"
+        auth_override_instructions: "O enderezo decorreo pode actualizarse desde un fornecedor de autenticación."
         no_secondary: "Sen correos electrónicos secundarios"
-        instructions: "Non se verá nunca en público"
-        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."
+        instructions: "Non se verá nunca en público."
+        admin_note: "Nota: un usuario administrador que cambia o correo electrónico doutro usuario que non é administrador indica que o usuario perdeu o acceso á súa conta de correo orixinal, polo que se lle enviará un correo electrónico de restabelecemento do contrasinal ao seu novo enderezo. O correo electrónico do usuario non cambiará ata completar o proceso de restabelecemento do contrasinal."
+        ok: "Enviarémoslle un correo electrónico para confirmar"
+        required: "Escriba un enderezo de correo electrónico"
+        invalid: "Introduza un enderezo de correo electrónico correcto"
+        authenticated: "O seu enderezo de correo electrónico foi autenticado por %{provider}"
+        invite_auth_email_invalid: "A súa mensaxe de convite non casa co enderezo de correo autenticado en %{provider}"
+        frequency_immediately: "Enviarémosllee unha mensaxe de correo axiña se non leu sobre o que lle 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."
+          one: "Só lle eviaremos un correo se non o vimos a vostede no último minuto."
+          other: "Só lle eviaremos un correo se non o vimos a vostede 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}"
+        not_connected: "(non conectado)"
+        confirm_modal_title: "Conectar coa 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."
+          account_specific: "Usarase a súa conta «%{account_description}» de %{provider} para a autenticación."
+          generic: "Usarase a súa conta de %{provider} para a autenticación."
       name:
         title: "Nome"
-        instructions: "o teu nome completo (opcional)"
+        instructions: "o seu nome completo (opcional)"
         instructions_required: "Nome completo"
-        required: "Escribe un nome"
+        required: "Escriba un nome"
         too_short: "O nome é curto de mais"
         ok: "O nome parece correcto"
       username:
-        title: "Nome do usuario"
+        title: "Nome de usuario"
         instructions: "exclusivo, sen espazos, curto"
-        short_instructions: "A xente pode mencionarte como @%{username}"
+        short_instructions: "A xente pode mencionalo 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"
+        not_available_no_suggestion: "Non dispoñíbel"
+        too_short: "O nome de usuario é curto de máis"
+        too_long: "O nome de usuario é longo de máis"
+        checking: "Comprobando a dispoñibilidade do nome de usuario..."
+        prefilled: "O correo electrónico coincide co nome de usuario rexistrado"
+        required: "Escriba un nome de usuario"
+        edit: "Editar o nome de usuario"
       locale:
         title: "Idioma da interface"
-        instructions: "Idioma da interface do usuario. Cambiará cando actualices a páxina."
+        instructions: "Idioma da interface do usuario. Cambiará cando actualice a páxina."
         default: "(predeterminado)"
+        any: "calquera"
       password_confirmation:
         title: "O contrasinal outra vez"
       invite_code:
@@ -1038,13 +1251,18 @@ gl:
       auth_tokens:
         title: "Dispositivos usados recentemente"
         details: "Detalles"
-        not_you: "Non es ti?"
+        log_out_all: "Rematar a sesión para todo"
+        not_you: "Non es vostede?"
         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."
+        was_this_you: "Foi vostede?"
+        was_this_you_description: "Se non foi voste, recomendámoslle que cambie o seu contrasinal e saia da sesión."
         browser_and_device: "%{browser} en %{device}"
         secure_account: "Protexer a miña conta"
+        latest_post: "O último que publicou…"
+        device_location: '<span class="auth-token-device">%{device}</span> &ndash; <span title="IP: %{ip}">%{location}</span>'
+        browser_active: '%{browser} | <span class="active">activo agora</span>'
+        browser_last_seen: "%{browser} o %{date}"
       last_posted: "Última publicación"
       last_emailed: "Últimos envíos por correo-e"
       last_seen: "Visto"
@@ -1053,15 +1271,19 @@ gl:
       location: "Localización"
       website: "Sitio web"
       email_settings: "Correo electrónico"
+      hide_profile_and_presence: "Agochar o meu perfil público e as funcionalidades de presenza"
       enable_physical_keyboard: "Activar a compatibilidade do teclado físico no iPad"
       text_size:
         title: "Tamaño do texto"
+        smallest: "O máis pequeno"
         smaller: "Máis pequeno"
         normal: "Normal"
         larger: "Máis grande"
         largest: "Enorme"
       title_count_mode:
+        title: "O título da páxina de fondo presenta a conta de:"
         notifications: "Novas notificacións"
+        contextual: "Contido novo da páxina"
       like_notification_frequency:
         title: "Notificar cando reciba gústames"
         always: "Sempre"
@@ -1074,7 +1296,7 @@ gl:
         always: "sempre"
         never: "nunca"
       email_digests:
-        title: "Cando non veña por aquí, desexo recibir un correo electrónico cun resumo dos temas e respostas máis populares "
+        title: "Cando non veña por aquí, desexo recibir un correo electrónico cun resumo dos temas e respostas máis populares"
         every_30_minutes: "cada 30 minutos"
         every_hour: "cada hora"
         daily: "diariamente"
@@ -1082,8 +1304,9 @@ gl:
         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."
+        title: "Enviar un correo electrónico cando alguén me cite, responda a unha das miñas publicacións, mencione o meu @nomedeusuario ou me convide a un tema."
         always: "sempre"
+        only_when_away: "só cando ausente"
         never: "nunca"
       email_messages_level: "Enviar correo electrónico cando alguén me mande unha mensaxe"
       include_tl0_in_digests: "Incluír contido de novos usuarios nos correos electrónicos de resumo"
@@ -1102,71 +1325,102 @@ gl:
       auto_track_options:
         never: "nunca"
         immediately: "inmediatamente"
-        after_30_seconds: "despois de 30 segundos "
+        after_30_seconds: "despois de 30 segundos"
         after_1_minute: "despois de 1 minuto"
         after_2_minutes: "despois de 2 minutos"
         after_3_minutes: "despois de 3 minutos"
         after_4_minutes: "despois de 4 minutos"
         after_5_minutes: "despois de 5 minutos"
         after_10_minutes: "despois de 10 minutos"
+      notification_level_when_replying: "Cando publico un tema, definilo como"
       invited:
-        search: "escribir para buscar convites..."
         title: "Convites"
+        pending_tab: "Pendente"
+        pending_tab_with_count: "Pendentes (%{count})"
+        expired_tab: "Caducou"
+        expired_tab_with_count: "Caducou (%{count})"
+        redeemed_tab: "Utilizado"
+        redeemed_tab_with_count: "Utilizados (%{count})"
+        invited_via: "Convite"
+        invited_via_link: "ligazón %{key} (%{count} / %{max} rescatadas)"
+        groups: "Grupos"
+        topic: "Tema"
+        sent: "Creado/Último envío"
+        expires_at: "Caduca"
+        edit: "Editar"
+        remove: "Retirar"
+        copy_link: "Obter ligazón"
+        reinvite: "Reenviar por correo"
+        reinvited: "Convite reenviado"
+        removed: "Retirado"
+        search: "escribir para buscar convites..."
         user: "Usuario convidado"
         none: "Non hai convites que amosar."
         truncated:
           one: "Amosando o primeiro convite."
           other: "Amosando os primeiros %{count} convites."
         redeemed: "Convites utilizados"
-        redeemed_tab: "Utilizados"
-        redeemed_tab_with_count: "Utilizados (%{count})"
-        redeemed_at: "Utilizados"
+        redeemed_at: "Utilizado"
         pending: "Convites pendentes"
-        pending_tab: "Pendente"
-        pending_tab_with_count: "Pendentes (%{count})"
         topics_entered: "Temas vistos"
         posts_read_count: "Publicacións lidas"
         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"
+        remove_all: "Retirar os convites caducados"
+        removed_all: "Todos os convites caducados foron retirados!"
+        remove_all_confirm: "Confirma que quere retirar todos os convites caducados?"
         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"
+        reinvite_all_confirm: "Confirma o reenvío de todos os convites?"
+        reinvited_all: "Enviados todos os convites!"
         time_read: "Tempo de lectura"
-        days_visited: "Días visitado"
+        days_visited: "Días desde visita"
         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: "Convidar"
+        generate_link: "Crear ligazón de convite"
+        link_generated: "Aquí ten a ligazón de convite!"
         valid_for: "A ligazón do convite só é válida para este enderezo de correo electrónico: %{email}"
+        single_user: "Convidar por correo electrónico"
+        multiple_user: "Convidar por ligazón"
         invite_link:
           title: "Ligazón do convite"
-          success: "A ligazón do convite xerouse correctamente"
+          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?"
+        invite:
+          new_title: "Crear convite"
+          edit_title: "Editar convite"
+          instructions: "Compartir esta ligazón para conceder acceso a este sitio:"
+          copy_link: "copiar a ligazón"
+          expires_in_time: "Caduca en %{time}"
+          expired_at_time: "Caduca o %{time}."
+          show_advanced: "Amosar opcións avanzadas"
+          hide_advanced: "Agochar opcións avanzadas"
+          max_redemptions_allowed: "Número máximo de usos:"
+          add_to_groups: "Engadir aos grupos:"
+          invite_to_topic: "Enviar ao tema co primeiro inicio de sesión:"
+          expires_at: "Caduca tras:"
+          custom_message: "Mensaxe persoal opcional:"
+          send_invite_email: "Gardar e enviar mensaxe de correo"
+          save_invite: "Gardar convite"
         bulk_invite:
+          none: "Non hai convites que amosar nesta páxina."
           text: "Convite en grupo"
-          success: "O ficheiro enviouse correctamente, notificaráseche por mensaxe cando remate o proceso."
+          instructions: |
+            <p>Convide a unha listaxe de usuarios para que a súa comunidade medre rapidamente. Prepare un <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">ficheiro CSV</a> que conteña unha liña por enderezo de correo de usuario que desexe convidar. Pódese fornecer a seguinte información en campos separados por coma, se quere engadir xente a grupos ou enviarlos a un tema específico antes de eles iniciaren sesión.</p>
+            <pre>john@smith.com,first_group_name;second_group_name,topic_id</pre>
+            <p>Enviaráselle un convite a cada enderezo de correo que conteña o ficheiro CSV que suba e poderá xestionalo máis adiante.</p>
+          progress: "Cargado %{progress}%..."
+          success: "O ficheiro cargouse correctamente. Notificaráselle por mensaxe cando o proceso quede completado."
           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."
-        common: "O contrasinal é demasiado habitual."
-        same_as_username: "O contrasinal é igual ao nome do usuario."
+        too_short: "O seu contrasinal é demasiado curto."
+        common: "Ese contrasinal é demasiado habitual."
+        same_as_username: "O contrasinal é igual ao nome de 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"
+        required: "Escriba un contrasinal"
       summary:
         title: "Resumo"
         stats: "Estatísticas"
@@ -1178,9 +1432,15 @@ gl:
         post_count:
           one: "publicación creada"
           other: "publicacións creadas"
+        likes_given:
+          one: "dado"
+          other: "dados"
         likes_received:
           one: "recibido"
           other: "recibidos"
+        days_visited:
+          one: "día de visitado"
+          other: "días de visitado"
         topics_entered:
           one: "tema visto"
           other: "temas vistos"
@@ -1196,15 +1456,15 @@ gl:
         top_topics: "Temas destacados"
         no_topics: "Aínda sen temas."
         more_topics: "Máis temas"
-        top_badges: "Insignias principais"
+        top_badges: "Insignias destacadas"
         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_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."
+        no_likes: "Aínda sen gústames."
         top_categories: "Categorías destacadas"
         topics: "Temas"
         replies: "Respostas"
@@ -1215,6 +1475,8 @@ gl:
       avatar:
         title: "Imaxe do perfil"
         header_title: "perfil, mensaxes, marcadores e preferencias"
+        name_and_description: "%{name} %{description}"
+        edit: "Editar a imaxe do perfil"
       title:
         title: "Título"
         none: "(ningún)"
@@ -1224,8 +1486,8 @@ gl:
       filters:
         all: "Todo"
       stream:
-        posted_by: "Publicado por"
-        sent_by: "Enviado por"
+        posted_by: "Publicada por"
+        sent_by: "Enviada por"
         private_message: "mensaxe"
         the_topic: "o tema"
     loading: "Cargando..."
@@ -1238,10 +1500,10 @@ gl:
         unknown: "Erro"
         not_found: "Páxina non atopada"
       desc:
-        network: "Por favor, comproba a conexión."
+        network: "Por favor, comprobe a conexión."
         network_fixed: "Parece que xa estamos de volta."
         server: "Código do erro: %{status}"
-        forbidden: "Non tes permiso para ver isto"
+        forbidden: "Non ten permiso para ver isto."
         not_found: "Vaites, o aplicativo tentou cargar unha URL inexistente."
         unknown: "Algo foi mal."
       buttons:
@@ -1252,138 +1514,155 @@ gl:
       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."
+    assets_changed_confirm: "O sitio acaba de recibir unha anovación de software. Obter a última versión agora?"
+    logout: "Pechouselle a sesión."
     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."
       logout_disabled: "O peche de sesión desactívase mentres o sitio está en modo de só lectura."
+    too_few_topics_and_posts_notice_MF: >-
+      Comecemos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/"> a discusión!</a> E {currentTopics, plural, one {hai <strong>#</strong> temas} other {hai <strong>#</strong> temas}} e {currentPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicacións}}. Os visitantes necesitan máis para ler e responder – recomendamos que haxa cando menos {requiredTopics, plural, one {<strong>#</strong> tema} other {<strong>#</strong> temas}} e {requiredPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicacións}}. Soamente o equipo pode ver esta mensaxe.
+    too_few_topics_notice_MF: >-
+      Comecemos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">a discusión!</a> E {currentTopics, plural, one {hai <strong>#</strong> temas} other {hai <strong>#</strong> temas}}. Os visitantes necesitan máis para ler e responder – recomendamos que haxa cando menos {requiredTopics, plural, one {<strong>#</strong> tema} other {<strong>#</strong> temas}}. Soamente o equipo pode ver esta mensaxe.
+    too_few_posts_notice_MF: >-
+      Comecemos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">a discusión!</a> E {currentPosts, plural, one {hai <strong>#</strong> publicación} other {hai <strong>#</strong> publicacións}}. Os visitantes necesitan máis para ler e responder – recomendamos que haxa cando menos {requiredPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicacións}}. Soamente o equipo pode ver esta mensaxe.
+    logs_error_rate_notice:
+      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} other {# errors/hour}}</a> acadou o límite configurado no sitio 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> acadou o límite configurado no sitio de {limit, plural, one {# erro/minuto} other {# erros/minuto}}."
+      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erro/hora} other {# erros/hora}}</a> excedeu o límite configurado do sitio de {limit, plural, one {# erro/hora} other {# erros/hora}}."
+      exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erro/minuto} other {# erros/minuto}}</a> excedeu o límite configurado do sitio de {limit, plural, one {# erro/minuto} other {# erros/minuto}}."
     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"
-    month_desc: "temas creados nos últimos 30 días"
-    week: "semana"
-    week_desc: "temas creados nos últimos 7 días"
-    day: "día"
     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: Lidas
+    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)"
+    time_read_recently_tooltip: "%{time_read} En tempo de lectura total (%{recent_time_read} nos últimos 60 días)"
     last_reply_lowercase: última resposta
     replies_lowercase:
       one: resposta
       other: respostas
     signup_cta:
       sign_up: "Rexistrarse"
-      hide_session: "Lembrarmo mañá"
+      hide_session: "Lémbremo 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."
+      intro: "Ola! Todo indica que goza coa discusión pero aínda non solicitou inscrición dunha conta."
+      value_prop: "Cando crea unha conta, lembramos exactamente o que ten lido, polo que sempre volve onde o deixou. Tamén recibe notificacións, desde aquí e por correo electrónico cando alguén lle responde. E pode amosarlle aprecio ás publicacións para compartir o amor. :heartpulse:"
     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>."
+      enabled_description: "Está vendo un resumo deste tema: as publicacións máis interesantes determinadas pola comunidade."
+      description:
+        one: "Hai <b>%{count}</b> resposta."
+        other: "Hai <b>%{count}</b> respostas."
+      description_time_MF: "Hai {replyCount, plural, one {<b>#</b> resposta} other {<b>#</b> respostas}} que supoñen un tempo estimado de lectura de <b>{readingTime, plural, one {# minuto} other {# minutos}}</b>."
       enable: "Resumir este tema"
       disable: "Amosar todas as publicacións"
     deleted_filter:
       enabled_description: "Este tema contén publicacións eliminadas, que se ocultaron."
-      disabled_description: "Móstranse as publicacións eliminadas do tema."
-      enable: "Ocultar publicacións eliminadas"
+      disabled_description: "Amósanse as publicacións eliminadas do tema."
+      enable: "Agochar as publicacións eliminadas"
       disable: "Amosar as publicacións eliminadas"
     private_message_info:
       title: "Mensaxe"
-      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?"
+      invite: "Convidar a outros..."
+      edit: "Engadir ou retirar..."
+      remove: "Retirar..."
+      add: "Engadir..."
+      leave_message: "Confirma o abandono desta mensaxe?"
+      remove_allowed_user: "Confirma que quere retirar a %{name} desta mensaxe?"
+      remove_allowed_group: "Confirma que quere retirar a %{name} desta mensaxe?"
     email: "Correo electrónico"
-    username: "Nome do usuario"
+    username: "Nome de usuario"
     last_seen: "Visto"
     created: "Creado"
     created_lowercase: "creado"
     trust_level: "Nivel de confianza"
-    search_hint: "nome do usuario, correo-e ou enderezo IP"
+    search_hint: "nome de usuario, enderezo de  correo 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>."
+      header_title: "Dámoslle a benvida!"
+      subheader_title: "Déixenos crear a súa conta"
+      disclaimer: "Ao rexistrarse, acepta a <a href='%{privacy_link}' target='blank'>norma de privacidade</a> e os <a href='%{tos_link}' target='blank'>termos de 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»."
+      failed: "Algo foi mal, quizais este correo electrónico xa está rexistrado, ténteo coa ligazón de «Esqueceume o contrasinal»"
     forgot_password:
       title: "Contrasinal restabelecido"
-      action: "Esquecín o contrasinal"
-      invite: "Introduce o nome do usuario ou correo electrónico, e enviaráseche un correo para restabelecer o contrasinal"
-      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>"
+      action: "Esquecín o meu contrasinal"
+      invite: "Escriba o nome de usuario ou enderezo de correo, e enviaráselle unha mensaxe de correo para restabelecer o contrasinal."
+      reset: "Restabelecer o contrasinal"
+      complete_username: "Se unha conta corresponde ao nome de usuario <b>%{username}</b>, deberá recibir en breve unha mensaxe de correo coas instrucións sobre como restabelecer o seu contrasinal."
+      complete_email: "Se unha conta coincide con <b>%{email}</b>, deberá recibir en breve unha mensaxe de correo con instrucións sobre como restabelecer o seu contrasinal."
+      complete_username_found: "Áchase unha conta co mesmo nome de usuario <b>%{username}</b>. Deberá recibir en breve un correo electrónico coas instrucións sobre como restabelecer o seu contrasinal."
+      complete_email_found: "Áchase unha conta que coincide con <b>%{email}</b>. Deberá recibir en breve un correo electrónico coas instrucións sobre como restabelecer o seu contrasinal."
+      complete_username_not_found: "Non se acha ningunha conta coincidente co nome de 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>"
+      help: "Non recibiu o correo electrónico? Comprobe primeiro a caixa de lixo do correo.<p>Non lembra o enderezo de correo electrónico que usou? Escriba un enderezo de correo electrónico e farémoslles saber se está rexistrado aquí.</p><p>No caso de que xa non teña acceso ao enderezo de correo rexistrado na conta, póñase 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"
+      link_label: "Envíeme ao correo unha ligazón de acceso"
       button_label: "con correo electrónico"
+      login_link: "Saltar o contrasinal; envíeme por correo unha ligazón de inicio de sesión"
       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_username: "Se unha conta corresponde ao nome de usuario <b>%{username}</b>, deberá 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>, deberá 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>, deberá 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>, deberá recibir en breve un correo electrónico cunha ligazón de inicio de sesión."
+      complete_username_not_found: "Ningunha conta coincide co nome de 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}
       confirm_button: Finalizar inicio de sesión
     login:
-      title: "Iniciar sesión"
+      subheader_title: "Iniciar sesión na súa conta"
       username: "Usuario"
       password: "Contrasinal"
-      second_factor_description: "Escribe o código de autenticación da aplicación"
+      second_factor_title: "Autenticación de dobre paso"
+      second_factor_description: "Escriba o código de autenticación da súa app:"
       second_factor_backup: "Iniciar sesión cun código de copia de seguranza"
-      second_factor_backup_description: "Escribe un dos códigos de copia de seguranza"
-      second_factor: "Iniciar sesión cunha aplicación de autenticador"
-      security_key_description: "Cando teñas a chave de seguranza preparada, preme no botón Autenticar con chave de seguranza que se mostra a continuación."
+      second_factor_backup_title: "Copia de seguranza de dobre paso"
+      second_factor_backup_description: "Escriba un dos códigos de copia de seguranza:"
+      second_factor: "Iniciar sesión cunha app autenticadora"
+      security_key_description: "Cando teña a clave de seguranza preparada, prema no botón Autenticar con clave de seguranza que se amosa a continuación."
       security_key_alternative: "Tentalo doutro xeito"
-      security_key_authenticate: "Autenticar con chave de seguranza"
-      security_key_no_matching_credential_error: "As credenciais non coinciden coa chave de seguranza introducida."
-      security_key_support_missing_error: "O teu dispositivo ou navegador actual non admite o uso de chaves de seguranza. Utiliza outro método."
+      security_key_authenticate: "Autenticar con clave de seguranza"
+      security_key_not_allowed_error: "O proceso de autenticación da clave de seguranza esgotou o tempo ou foi cancelado."
+      security_key_no_matching_credential_error: "As credenciais non coinciden coa clave de seguranza introducida."
+      security_key_support_missing_error: "O  seu dispositivo ou navegador actual non admite a utilización de claves de seguranza. Utilice outro método."
       email_placeholder: "correo electrónico ou nome de usuario"
-      caps_lock_warning: " Bloqueo de maiúsculas activado"
+      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..."
-      or: "ou"
+      cookies_error: "Parece que o seu navegador ten os rastros desactivados. É posíbel que non poida iniciar sesión sen activalos primeiro."
+      rate_limit: "Por favor, agarde antes de tentalo outra vez."
+      blank_username: "Escriba o seu enderezo de correo ou nome de usuario."
+      blank_username_or_password: "Escriba o seu enderezo de correo ou nome de usuario e o contrasinal."
+      reset_password: "Restabelecer o contrasinal"
+      logging_in: "Iniciando a sesión..."
+      or: "Ou"
       authenticating: "Autenticando..."
-      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."
+      awaiting_activation: "A súa conta está pendente de se activar, empregue a ligazón de contrasinal esquecido para pedir outro correo de activación."
+      awaiting_approval: "A súa conta non foi aínda aprobada polos membros do equipo. Enviaráselle unha mensaxe cando así o 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."
-      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."
+      not_activated: "Non pode acceder aínda. Antes debemos enviarlle unha mensaxe a <b>%{sentTo}</b>. Por favor, siga as instrucións desta mensaxe para activar a súa conta."
+      not_allowed_from_ip_address: "Non pode iniciar sesión desde este enderezo IP."
+      admin_not_allowed_from_ip_address: "Non pode acceder como administrador desde ese enderezo IP."
+      resend_activation_email: "Prema aquí para enviar outro correo de activación."
+      omniauth_disallow_totp: "A súa conta ten activada a autenticación de dobre paso. Inicie sesión co seu 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."
+      change_email: "Cambiar enderezo de correo"
+      provide_new_email: "Escriba un enderezo novo e reenviarémoslle o correo 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."
-      not_approved: "A túa conta non foi aínda aprobada. Notificaráseche por correo electrónico cando poidas iniciar a sesión."
+      sent_activation_email_again: "Envióuselle outro correo de activación a <b>%{currentEmail}</b>. Pode tardar uns minutos en chegar; asegúrese de revisar a caixa do lixo."
+      sent_activation_email_again_generic: "Enviamos outro correo electrónico de activación. Pode tardar uns minutos en chegar; asegúrese de revisar a caixa do lixo."
+      to_continue: "Por favor, inicie unha sesión"
+      preferences: "Precisa iniciar sesión para cambiar as súas preferencias de usuario."
+      not_approved: "A súa conta non foi aínda aprobada. Notificaráselle por correo electrónico cando poida iniciar a sesión."
       google_oauth2:
         name: "Google"
-        title: "co Google"
+        title: "con Google"
       twitter:
         name: "Twitter"
         title: "co Twitter"
@@ -1395,73 +1674,98 @@ gl:
         title: "co Facebook"
       github:
         name: "GitHub"
-        title: "co GitHub"
+        title: "con GitHub"
       discord:
         name: "Discord"
-        title: "co Discord"
+        title: "con Discord"
       second_factor_toggle:
-        totp: "Usar no seu lugar unha aplicación de autenticador"
+        totp: "Usar unha app autenticadora no seu lugar"
         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:"
-      social_login_available: "Con ese correo electrónico tamén poderás iniciar a sesión a través de calquera rede social."
-      your_email: "O enderezo de correo electrónico da túa conta é <b>%{email}</b>."
+      welcome_to: "Dámoslle a benvida a %{site_name}!"
+      invited_by: "Recibiu o convite de:"
+      social_login_available: "Con ese correo electrónico tamén poderá iniciar a sesión a través de calquera rede social."
+      your_email: "O enderezo de correo electrónico da súa conta é <b>%{email}</b>."
       accept_invite: "Aceptar convite"
-      success: "A túa conta acaba de ser creada e tes a sesión iniciada."
+      success: "A súa conta acaba de ser creada e ten a sesión iniciada."
       name_label: "Nome"
+      password_label: "Contrasinal"
       optional_description: "(opcional)"
     password_reset:
-      continue: "Continuar a %{site_name}"
+      continue: "Continuar en %{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_with_featured_topics: "Categorías con temas de actualidade"
       categories_and_latest_topics: "Categorías e últimos temas"
       categories_and_top_topics: "Categorías e temas destacados"
       categories_boxes: "Caixas con subcategorías"
       categories_boxes_with_topics: "Caixas con temas destacados"
     shortcut_modifier_key:
-      shift: "Maiús."
+      shift: "Maiús"
       ctrl: "Ctrl"
       alt: "Alt"
+      enter: "Intro"
     conditional_loading_section:
       loading: Cargando...
+    category_row:
+      topic_count:
+        one: "%{count} tema nesta categoría"
+        other: "%{count} temas nesta categoría"
+      plus_subcategories_title:
+        one: "%{name} e unha subcategoría"
+        other: "%{name} e %{count} subcategorías"
+      plus_subcategories:
+        one: "+ %{count} subcategoría"
+        other: "+ %{count} subcategorías"
     select_kit:
+      filter_by: "Filtrado por: %{name}"
+      select_to_filter: "Seleccione un valor para filtrar"
       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."
+        one: "Só pode seleccionar %{count} elemento."
+        other: "Só pode seleccionar %{count} elementos."
       min_content_not_reached:
-        one: "Selecciona como mínimo %{count} elemento."
-        other: "Selecciona como mínimo %{count} elementos."
+        one: "Seleccione como mínimo %{count} elemento."
+        other: "Seleccione como mínimo %{count} elementos."
+      invalid_selection_length:
+        one: "A selección debe ter cando menos %{count} carácter."
+        other: "A selección debe ter cando menos %{count} caracteres."
+      components:
+        categories_admin_dropdown:
+          title: "Xestionar categorías"
     date_time_picker:
       from: De
       to: A
     emoji_picker:
       filter_placeholder: Buscar emoji
+      smileys_&_emotion: Emoticonas e emoción
+      people_&_body: Persoas e corpo
       animals_&_nature: Animais e natureza
       food_&_drink: Comida e bebida
+      travel_&_places: Viaxes e lugares
       activities: Actividades
       objects: Obxectos
       symbols: Símbolos
-      flags: Denuncias
+      flags: Alertas
       recent: Usados recentemente
       default_tone: Sen ton de pel
       light_tone: Ton de pel claro
+      medium_light_tone: Tono de pel medio claro
+      medium_tone: Tono de pel medio
+      medium_dark_tone: Tono de pel medio escuro
       dark_tone: Ton de pel escuro
       default: Emojis personalizados
     shared_drafts:
@@ -1469,127 +1773,163 @@ gl:
       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..."
+      confirm_publish: "Confirma a publicación deste borrador?"
+      publishing: "Publicando o tema..."
     composer:
       emoji: "Emoji :)"
       more_emoji: "máis..."
       options: "Opcións"
-      whisper: "bisbar"
-      unlist: "retirado da lista"
-      blockquote_text: "Citación"
+      whisper: "rumor"
+      unlist: "fóra da lista"
       add_warning: "Este é un aviso oficial."
-      toggle_whisper: "Cambiar Bisbar"
-      posting_not_on_topic: "A que tema queres responder?"
+      toggle_whisper: "Trocar rumor"
+      toggle_unlisted: "Trocar fóra da lista"
+      posting_not_on_topic: "A que tema quere responder?"
       saved_local_draft_tip: "gardado localmente"
-      similar_topics: "O teu tema é semellante a..."
+      similar_topics: "O seu tema é semellante a..."
       drafts_offline: "borradores sen conexión"
+      edit_conflict: "conflito de edición"
+      group_mentioned_limit:
+        one: "<b>Aviso!</b> Mencionou a <a href='%{group_link}'>%{group}</a>, con todo, este grupo ten máis membros có límite de mencións configurado polo administrador en %{count} usuario. Ninguén será avisado."
+        other: "<b>Aviso!</b> Mencionou a <a href='%{group_link}'>%{group}</a>, con todo, este grupo ten máis membros có límite de mencións configurado polo administrador en %{count} usuarios. Ninguén será avisado."
       group_mentioned:
-        one: "Ao mencionar %{group}, vas enviar a notificación a <a href='%{group_link}'>%{count} persoa</a>. Estás seguro de querer facelo?"
-        other: "Ao mencionar %{group}, vas enviar a notificación a <a href='%{group_link}'>%{count} persoas</a>. Estás seguro de querer facelo?"
+        one: "Ao mencionar %{group}, vai enviar a notificación a <a href='%{group_link}'>%{count} persoa</a>. Está seguro de querelo facer?"
+        other: "Ao mencionar %{group}, vai enviar a notificación a <a href='%{group_link}'>%{count} persoas</a>. Está seguro de querelo facer?"
       cannot_see_mention:
-        category: "Mencionaches a %{username}, mais non poden recibir notificacións porque non teñen acceso a esta categoría. Debes engadilos a un grupo con acceso a esta categoría."
-        private: "Mencionaches a %{username}, mais non recibirán notificacións porque non poden ver esta mensaxe privada. Debes convidalos a esta mensaxe privada."
+        category: "Mencionou a %{username}, mais non poden recibir notificacións porque non teñen acceso a esta categoría. Debe engadilos a un grupo con acceso a esta categoría."
+        private: "Mencionou a %{username}, mais non recibirán notificacións porque non poden ver esta mensaxe privada. Debe convidalos a esta mensaxe privada."
+      duplicate_link: "Parece que a súa ligazón a <b>%{domain}</b> xa foi publicada no tema por <b>@%{username}</b> e <a href='%{post_url}'>nunha resposta sobre %{ago}</a> Confirma que quere publicala de novo?"
       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"
+        title_too_short:
+          one: "O título debe ter cando menos %{count} carácter"
+          other: "O título debe ter cando menos %{count} caracteres"
+        title_too_long:
+          one: "O título non debe ter máis de %{count} carácter"
+          other: "O título non debe ter máis de %{count} 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"
+        post_length:
+          one: "A publicación debe ter cando menos %{count} carácter"
+          other: "A publicación debe ter cando menos %{count} caracteres"
+        try_like: "Probou o botón %{heart}?"
+        category_missing: "Debe seleccionar unha categoría"
+        tags_missing:
+          one: "Debe seleccionar cando menos %{count} etiqueta"
+          other: "Debe seleccionar cando menos %{count} etiquetas"
+        topic_template_not_modified: "Engada detalles e aspectos específicos ao tema editando o modelo de tema."
       save_edit: "Gardar a edición"
+      overwrite_edit: "Sobrescribir a edición"
       reply_original: "Responder no tema orixinal"
       reply_here: "Responder aquí"
       reply: "Responder"
       cancel: "Cancelar"
       create_topic: "Crear tema"
       create_pm: "Mensaxe"
+      create_whisper: "Rumor"
       create_shared_draft: "Crear borrador compartido"
-      edit_shared_draft: "Editar borrador compartido"
-      title: "Ou preme Ctrl+Intro"
+      edit_shared_draft: "Editar o borrador compartido"
+      title: "Ou prema 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í."
+      title_placeholder: "Sobre que trata a discusión, nunha soa frase?"
+      title_or_link_placeholder: "Escriba o título ou pegue unha ligazón aquí"
+      edit_reason_placeholder: "por que o está editando?"
+      topic_featured_link_placeholder: "Escriba a ligazón amosada co título."
+      remove_featured_link: "Retirar a ligazón do tema."
+      reply_placeholder: "Escriba aquí. Utilice Markdown, BBCode ou HTML para formatar. Arrastre ou pegue as imaxes."
+      reply_placeholder_no_images: "Escriba aquí. Utilice Markdown, BBCode, ou HTML para formatar."
+      reply_placeholder_choose_category: "Seleccione 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"
+      saved_draft: "A publicación do borrador está en proceso. Dea toque para continuar."
+      uploading: "Cargando..."
       quote_post_title: "Citar a publicación enteira"
+      bold_label: "G"
       bold_title: "Grosa"
-      bold_text: "Texto groso"
-      italic_title: "Resalte"
-      italic_text: "texto resaltado"
+      bold_text: "texto groso"
+      italic_label: "C"
+      italic_title: "Recalque"
+      italic_text: "texto recalcado"
       link_title: "Hiperligazón"
       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"
+      link_url_placeholder: "Pegue un URL ou escriba para buscar temas"
+      blockquote_title: "Cita"
+      blockquote_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"
+      code_text: "texto preformatado cun sangrado de 4 espazos"
+      paste_code_text: "escriba un título ou pégueo aquí"
+      upload_title: "Cargar"
+      upload_description: "introducir a descrición da carga aquí"
+      olist_title: "Listaxe numerada"
+      ulist_title: "Listaxe con símbolos"
+      list_item: "Elemento da listaxe"
+      toggle_direction: "Trocar dirección"
+      help: "Axuda para a 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"
-      enter_fullscreen: "abrir panel de composición en pantalla completa"
+      enter_fullscreen: "abrir o panel de composición en pantalla completa"
       exit_fullscreen: "saír do panel de composición en pantalla completa"
+      show_toolbar: "amosar a barra de ferramentas de composición"
+      hide_toolbar: "agochar a barra de ferramentas de composición"
       modal_ok: "De acordo"
       modal_cancel: "Cancelar"
-      cant_send_pm: "Sentímolo pero non podes enviar unha mensaxe a %{username}."
+      cant_send_pm: "Sentímolo pero non pode 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"
+        title: "Esqueceu engadir os destinatarios?"
+        body: "Polo momento, esta mensaxe só a recibe vostede!"
+      admin_options_title: "Configuración opcional do equipo para este tema"
       composer_actions:
         reply: Responder
         draft: Borrador
         edit: Editar
         reply_to_post:
+          label: Responder á publicación 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
+          confirm: Ten gardado un borrador do novo tema, que se sobrescribirá se crea un tema ligado a este.
+        reply_as_new_group_message:
+          label: Responder como nova mensaxe de grupo
+          desc: Crear unha nova mensaxe privada cos mesmos destinatarios
         reply_as_private_message:
           label: Nova mensaxe
           desc: Crear unha nova mensaxe privada
+        reply_to_topic:
+          label: Responder ao tema
+          desc: Responder ao tema, non a ningunha publicación específica
+        toggle_whisper:
+          label: Trocar rumor
+          desc: Os rumores son visíbeis unicamente para os membros do equipo
         create_topic:
           label: "Novo tema"
         shared_draft:
           label: "Borrador compartido"
+          desc: "Facer borrador dun tema que soamente será visíbel por usuarios admitidos"
         toggle_topic_bump:
+          label: "Trocar a promoción do tema"
           desc: "Responder sen cambiar a data da última resposta"
+      reload: "Recargar"
+      ignore: "Ignorar"
     notifications:
       tooltip:
         regular:
-          one: "%{count} notificación sen ver"
-          other: "%{count} notificacións sen ver"
+          one: "%{count} notificación pendente"
+          other: "%{count} notificacións pendentes"
         message:
-          one: "%{count} mensaxe sen ler"
-          other: "%{count} mensaxes sen ler"
+          one: "%{count} mensaxe pendente"
+          other: "%{count} mensaxes pendentes"
         high_priority:
-          one: "%{count} notificación de prioridade alta sen ler"
-          other: "%{count} notificacións de prioridade alta 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"
+          one: "%{count} notificación de prioridade alta pendente"
+          other: "%{count} notificacións de prioridade alta pendentes"
+      title: "notificacións das mencións ao seu @nome, respostas ás sú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"
+      post_approved: "A súa publicación foi aprobada"
       reviewable_items: "elementos que requiren revisión"
       mentioned: "<span>%{username}</span> %{description}"
       group_mentioned: "<span>%{username}</span> %{description}"
@@ -1599,31 +1939,42 @@ gl:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} e %{count} outro</span> %{description}"
+        other: "<span class='multi-user'>%{username}, %{username2} e %{count} outros</span> %{description}"
       liked_consolidated_description:
-        one: "gustoulles %{count} das túas publicacións"
-        other: "gustáronlles %{count} das túas publicacións"
+        one: "gustoulles %{count} das súas publicacións"
+        other: "gustáronlles %{count} das súas publicacións"
       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"
+      invitee_accepted: "<span>%{username}</span> aceptou o seu convite"
       moved_post: "<span>%{username}</span> moveu %{description}"
       linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Gañou «%{description}»"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Novo tema</span> %{description}"
-      membership_request_accepted: "Aceptouse a túa afiliación a \"%{group_name}\""
+      membership_request_accepted: "Aceptouse a súa incorporación a «%{group_name}»"
+      membership_request_consolidated:
+        one: "%{count} solicitudes de adhesión abertas en «%{group_name}»"
+        other: "%{count} solicitudes de adhesión abertas en «%{group_name}»"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
+      votes_released: "%{description} - completado"
       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}'
+        mentioned: '%{username} mencionouno en "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} mencionouno en "%{topic}" - %{site_title}'
+        quoted: '%{username} citouno en "%{topic}" - %{site_title}'
+        replied: '%{username} respondeulle 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}'
+        private_message: '%{username} envioulle unha mensaxe privada sobre «%{topic}» - %{site_title}'
+        linked: '%{username} ligou a súa publicación desde «%{topic}» - %{site_title}'
+        watching_first_post: '%{username} creou un tema novo «%{topic}» - %{site_title}'
         confirm_title: "Notificacións activadas - %{site_title}"
         confirm_body: "Perfecto! As notificacións están activadas."
         custom: "Notificación de %{username} en %{site_title}"
@@ -1638,6 +1989,7 @@ gl:
         invitee_accepted: "convite aceptado"
         posted: "nova publicación"
         moved_post: "publicación movida"
+        linked: "ligado"
         bookmark_reminder: "recordatorio do marcador"
         bookmark_reminder_with_name: "recordatorio do marcador - %{name}"
         granted_badge: "insignia concedida"
@@ -1648,19 +2000,18 @@ gl:
         topic_reminder: "recordatorio do tema"
         liked_consolidated: "novos gústames"
         post_approved: "publicación aprobada"
-        membership_request_consolidated: "novas solicitudes de afiliación"
+        membership_request_consolidated: "novas solicitudes de incorporación"
+        reaction: "nova reacción"
+        votes_released: "O voto foi liberado"
     upload_selector:
       title: "Engadir unha imaxe"
       title_with_attachments: "Engadir imaxe ou ficheiro"
       from_my_computer: "Desde o meu dispositivo"
-      from_the_web: "Desde a web"
+      from_the_web: "Desde a Web"
       remote_tip: "ligazón á imaxe"
-      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}"
-      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"
+      local_tip: "seleccione imaxes do seu dispositivo"
+      hint_for_supported_browsers: "tamén pode arrastrar e soltar ou pegar imaxes no editor"
+      uploading: "Cargando"
       select_file: "Seleccionar ficheiro"
       default_image_alt_text: imaxe
     search:
@@ -1668,36 +2019,39 @@ gl:
       relevance: "Relevancia"
       latest_post: "Últimas publicacións"
       latest_topic: "Último tema"
-      most_viewed: "Máis vistos"
-      most_liked: "Con máis Gústames"
+      most_viewed: "Máis vistas"
+      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"
+      too_short: "O seu termo de busca é curto de máis."
       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 de</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} resultados de</span><span class='term'>%{term}</span>"
       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."
       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:"
+      results_page: "Buscar resultados de «%{term}»"
+      more_results: "Hai máis resultados. Restrinxa os criterios da busca."
+      cant_find: "Non atopa o que busca?"
+      start_new_topic: "Se cadra quere comezar un novo tema?"
+      or_search_google: "Ou probe a buscar con Google:"
+      search_google: "Probe a buscar con Google:"
       search_google_button: "Google"
+      search_button: "Buscar"
       context:
         user: "Buscar publicacións de @%{username}"
         category: "Buscar na categoría #%{category}"
-        tag: "Buscar a etiqueta #%{tag}"
+        tag: "Buscar na etiqueta #%{tag}"
         topic: "Buscar neste tema"
         private_messages: "Buscar mensaxes"
       advanced:
         title: Busca avanzada
         posted_by:
           label: Publicado por
+        in_category:
+          label: Categorizado
         in_group:
           label: No grupo
         with_badge:
@@ -1710,41 +2064,60 @@ gl:
           likes: Gustoume
           posted: Publiquei
           created: Creei
-          watching: Estou vendo
+          watching: Estou observando
           tracking: Estou seguindo
           private: Nas miñas mensaxes
           bookmarks: Marquei
+          first: son a primeirísima publicación
+          pinned: están fixadas
           seen: Lin
           unseen: Non lin
+          wiki: son wiki
           images: incluír imaxe(s)
           all_tags: Todas as etiquetas anteriores
         statuses:
+          label: Onde os temas
           open: están abertos
           closed: están pechados
           public: son públicos
           archived: están arquivados
           noreplies: non teñen respostas
+          single_user: contén un único usuario
         post:
+          count:
+            label: Publicacións
+          min:
+            placeholder: mínimo
+          max:
+            placeholder: máximo
           time:
             label: Publicado
             before: antes
             after: despois
+        views:
+          label: Visualizacións
+        min_views:
+          placeholder: mínimo
+        max_views:
+          placeholder: máximo
     hamburger_menu: "ir a outra lista de temas ou categoría"
     new_item: "novo"
     go_back: "volver"
     not_logged_in_user: "páxina do usuario cun resumo das actividades e preferencias actuais"
-    current_user: "ir á túa páxina do usuario"
-    view_all: "ver todos"
+    current_user: "ir á súa páxina do usuario"
+    view_all: "ver todas %{tab}"
     topics:
+      new_messages_marker: "última visita"
       bulk:
         select_all: "Seleccionar todo"
         clear_all: "Borrar todo"
-        unlist_topics: "Retirar temas da lista"
-        reset_read: "Restabelecer Lidos"
+        unlist_topics: "Retirar temas da listaxe"
+        relist_topics: "Refacer a listaxe de temas"
+        reset_read: "Restabelecer os lidos"
         delete: "Eliminar temas"
         dismiss: "Desbotar"
         dismiss_read: "Desbotar os non lidos"
-        dismiss_button: "Desbotar..."
+        dismiss_button: "Desbotar…"
         dismiss_tooltip: "Desbotar só as publicacións novas ou deixar de seguir temas"
         also_dismiss_topics: "Deter o seguimento destes temas para que non se me amosen como non lidos"
         dismiss_new: "Desbotar novas"
@@ -1753,33 +2126,46 @@ gl:
         change_category: "Estabelecer categoría"
         close_topics: "Pechar temas"
         archive_topics: "Arquivar temas"
+        move_messages_to_inbox: "Mover á caixa de entrada"
         notification_level: "Notificacións"
+        change_notification_level: "Cambiar o nivel de notificacións"
         choose_new_category: "Seleccionar a nova categoría dos temas:"
         selected:
-          one: "Seleccionaches <b>un</b> tema."
-          other: "Seleccionaches <b>%{count}</b> temas."
+          one: "Seleccionou <b>%{count}</b> tema."
+          other: "Seleccionou <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:"
+        choose_new_tags: "Seleccione novas etiquetas para estes temas:"
+        choose_append_tags: "Seleccione novas etiquetas para anexar a estes temas:"
         changed_tags: "As etiquetas deses temas cambiaron."
+        remove_tags: "Retirar etiquetas"
+        confirm_remove_tags:
+          one: "Retiraranse todas as etiquetas deste tema. Está seguro?"
+          other: "Retiraranse todas as etiquetas destes <b>%{count}</b> temas. Está seguro?"
+        progress:
+          one: "Progreso: <strong>%{count}</strong> tema"
+          other: "Progreso: <strong>%{count}</strong> temas"
       none:
-        unread: "Non tes temas sen ler."
-        new: "Non tes novos temas."
-        read: "Aínda non liches ningún tema."
-        posted: "Aínda non publicaches en ningún tema."
-        bookmarks: "Aínda non marcaches este tema."
+        unread: "Non ten temas sen ler."
+        new: "Non ten novos temas."
+        read: "Aínda non leu ningún tema."
+        posted: "Aínda non publicou en ningún tema."
+        ready_to_create: "Listo para "
+        latest: "Están todos vostedes atrapados!"
+        bookmarks: "Aínda non marcou este tema."
         category: "Non hai temas en %{category}."
         top: "Non hai temas destacados."
         educate:
-          unread: '<p>Os teus temas sen ler aparecen aquí.</p><p>De xeito predeterminado, os temas considéranse sen ler e amosarase o número dos non lidos. <span class="badge new-posts badge-notification">1</span> se ti:</p><ul><li>Creaches o tema</li><li>Respondiches o tema</li><li>Liches o tema durante máis de catro minutos</li></ul><p>Ou estabeleciches o tema para ser Seguido ou Visto no control de notificacións na banda inferior de cada tema.</p><p>Vai ás túas <a href="%{userPrefsUrl}">preferencias</a> se queres cambiar isto.</p>'
+          new: '<p>Aquí aparecen os seus temas novos. De xeito predeterminado, os temas considéranse novos e amosarán un indicador de <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>Vexa as súas <a href="%{userPrefsUrl}">preferencias</a> para cambiar este axuste.</p>'
+          unread: "<p>Os seus temas pendentes aparecen aquí.</p><p>De xeito predeterminado, os temas considéranse pendentes e amosarase o número dos non lidos. <span class=\"badge new-posts badge-notification\">1</span> se vostede:</p><ul><li>Creou o tema</li><li>Respondeu ao tema</li><li>Leu o tema durante máis de catro minutos</li></ul><p>Ou estabeleceu explicitamente o tema para ser observado ou seguido con \U0001F514 de cada tema.</p><p>Vaia ás súas <a href=\"%{userPrefsUrl}\">preferencias</a> se quere cambiar isto.</p>"
       bottom:
-        latest: "Non hai máis últimos temas."
+        latest: "Non hai máis temas."
         posted: "Non hai máis temas publicados."
         read: "Non hai máis temas lidos."
         new: "Non hai máis temas novos."
-        unread: "Non hai máis temas sen ler."
+        unread: "Non hai máis temas pendentes de lectura."
         category: "Non hai máis temas en %{category}."
+        tag: "Non hai máis temas en %{tag}."
         top: "Non hai máis temas destacados."
         bookmarks: "Non hai máis temas marcados."
     topic:
@@ -1791,80 +2177,110 @@ gl:
       open_draft: "Abrir borrador"
       private_message: "Iniciar unha mensaxe"
       archive_message:
-        help: "Mover mensaxes ao arquivo"
+        help: "Mover mensaxes ao arquivo persoal"
         title: "Arquivo"
       move_to_inbox:
         title: "Mover á caixa de entrada"
         help: "Mover mensaxes á caixa de entrada"
       edit_message:
-        help: "Editar primeira publicación da mensaxe"
+        help: "Editar a primeira publicación da mensaxe"
         title: "Editar"
       defer:
-        title: "Pospor"
+        help: "Marcar como non lido"
+        title: "Adiar"
+      feature_on_profile:
+        help: "Engadir unha ligazón a este tema na súa tarxeta de usuario e perfil"
+        title: "Funcionalidade no perfil"
       remove_from_profile:
-        warning: "O teu perfil xa ten un tema destacado. Se continúas, este tema substituirá o existente."
-        help: "Eliminar a ligazón a este tema do teu perfil de usuario"
-        title: "Eliminar do perfil"
+        warning: "O seu perfil xa ten un tema de actualidade. Se continúa, este tema substituirá o existente."
+        help: "Retirar a ligazón a este tema do seu perfil de usuario"
+        title: "Retirar do perfil"
       list: "Temas"
       new: "novo tema"
-      unread: "sen ler"
+      unread: "pendente"
       new_topics:
-        one: "Un tema novo"
+        one: "%{count} tema novo"
         other: "%{count} temas novos"
       unread_topics:
-        one: "Un tema sen ler"
-        other: "%{count} temas sen ler"
+        one: "%{count} tema pendente"
+        other: "%{count} temas pendentes"
       title: "Tema"
       invalid_access:
         title: "O tema é privado"
-        description: "Sentímolo pero non tes acceso a este tema."
-        login_required: "Debes iniciar sesión para ver este tema."
+        description: "Desculpe pero non ten acceso a ese tema!"
+        login_required: "Debe iniciar a sesión para ver este tema."
       server_error:
         title: "A carga do tema fallou"
-        description: "Sentímolo pero non podemos cargar este tema, posibelmente debido a problemas de conexión. Ténato de novo e se o problema continúa fáinolo saber."
+        description: "Sentímolo pero non podemos cargar este tema, posibelmente debido a problemas de conexión. Ténteo de novo e se o problema continúa fáganolo saber."
       not_found:
         title: "Non foi posíbel atopar o tema"
-        description: "Sentímolo pero non foi posíbel atopar este tema. Quizais foi eliminado por un moderador."
+        description: "Sentímolo pero non foi posíbel atopar este tema. Sería retirado por un moderador?"
       total_unread_posts:
-        one: "Tes unha publicación sen ler neste tema"
-        other: "Tes %{count} publicacións sen ler neste tema"
+        one: "ten %{count} publicación pendente de lectura neste tema"
+        other: "ten %{count} publicacións pendentes de lectura neste tema"
       unread_posts:
-        one: "Tes unha publicación antiga sen ler neste tema"
-        other: "Tes %{count} publicacións antigas sen ler neste tema"
+        one: "ten %{count} publicación antiga pendente de lectura neste tema"
+        other: "ten %{count} publicacións antigas pendentes de lectura 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"
+        one: "hai unha nova publicación neste tema desde a súa última lectura"
+        other: "hai %{count} novas publicacións neste tema desde a súa última lectura"
       likes:
         one: "hai un gústame neste tema"
         other: "hai %{count} gústames neste tema"
-      back_to_list: "Volver á lista de temas"
+      back_to_list: "Volver á listase de temas"
       options: "Opcións de temas"
-      show_links: "amosar as ligazóns cara este tema"
+      show_links: "amosar as ligazóns a 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: "Quere ler máis? explore outros temas en %{catLink} ou %{latestLink}."
+      read_more: "Quere ler máis? %{catLink} ou %{latestLink}."
       unread_indicator: "Ningún membro leu aínda a última publicación neste 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 {}}"
+      read_more_MF: "Hai { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'># pendente de lectura</a> } other { <a href='{basePath}/unread'># pendentes de lectura</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'># novo</a> tema} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># novos</a> temas} } pendentes ou {CATEGORY, select, true {ver outros temas en {catLink}} false {{latestLink}} other {}}"
       bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Explorar todas as categorías
-      view_latest_topics: ver últimos temas
+      browse_all_tags: Explorar todas as etiquetas
+      view_latest_topics: ver os últimos temas
+      suggest_create_topic: comezar unha nova conversa?
       jump_reply_up: ir a unha resposta anterior
       jump_reply_down: ir a unha resposta posterior
       deleted: "Eliminouse o tema"
+      slow_mode_update:
+        title: "Modo lento"
+        select: "Os usuarios só poden publicar neste tema unha vez cada:"
+        description: "Para promover unha discusión reflexiva en discusións rápidas ou polémicas, os usuarios deben esperar antes de publicar de novo neste tema."
+        save: "Activar"
+        remove: "Desactivar"
+        hours: "Horas:"
+        minutes: "Minutos:"
+        seconds: "Segundos:"
+        durations:
+          10_minutes: "10 minutos"
+          15_minutes: "15 minutos"
+          30_minutes: "30 Minutos"
+          45_minutes: "45 minutos"
+          1_hour: "1 hora"
+          2_hours: "2 Horas"
+          4_hours: "4 horas"
+          8_hours: "8 horas"
+          12_hours: "12 horas"
+          24_hours: "24 horas"
+          custom: "Duración personalizada"
       topic_status_update:
         title: "Temporizador do tema"
         save: "Estabelecer temporizador"
         num_of_hours: "Número de horas:"
         num_of_days: "Número de días:"
-        remove: "Eliminar temporizador"
+        remove: "Retirar temporizador"
         publish_to: "Publicar en:"
         when: "Cando:"
-        time_frame_required: Escribe un marco temporal
+        time_frame_required: "Seleccione un marco temporal"
+        min_duration: "A duración debe ser superior a 0"
+        max_duration: "A duración debe de ser menor de 20 anos"
       auto_update_input:
-        none: "Selecciona un intervalo de tempo"
+        none: "Seleccione un marco temporal"
         now: "Agora"
         later_today: "Hoxe, máis tarde"
         tomorrow: "Mañá"
+        later_this_week: "Máis tarde esta semana"
         this_weekend: "Esta fin de semana"
         next_week: "A vindeira semana"
         two_weeks: "Dúas semanas"
@@ -1875,7 +2291,8 @@ gl:
         six_months: "Seis meses"
         one_year: "Un ano"
         forever: "Sempre"
-        pick_date_and_time: "Escolle unha data e hora"
+        pick_date_and_time: "Escolla unha data e hora"
+        set_based_on_last_post: "Peche baseado na última publicación"
       publish_to_category:
         title: "Programar publicación"
       temp_open:
@@ -1886,184 +2303,201 @@ gl:
         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."
+        label: "Peche automático de tema tras:"
+        error: "Introduza un valor correcto."
+        based_on_last_post: "Non pechar ata que a última publicación do tema teña cando menos esta antigüidade."
+      auto_close_after_last_post:
+        title: "Peche automático do tema despois da última publicación"
       auto_delete:
         title: "Eliminar automaticamente o tema"
       auto_bump:
         title: "Promover automaticamente o tema"
       reminder:
-        title: "Recordarme"
+        title: "Lémbremo"
       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_close_after_last_post: "Este tema pechará %{duration} despois da última resposta."
         auto_delete: "Este tema eliminarase automaticamente en %{timeLeft}."
         auto_bump: "Este tema promoverase automaticamente en %{timeLeft}."
+        auto_reminder: "Lembraráselle este tema en %{timeLeft}"
         auto_delete_replies: "As respostas a este tema eliminaranse automaticamente en %{duration}."
-      auto_close_title: "Axustes do peche automático"
+      auto_close_title: "Configuración do peche automático"
       auto_close_immediate:
         one: "A última publicación deste tema xa ten %{count} hora. O tema pecharase inmediatamente."
         other: "A última publicación deste tema xa ten %{count} horas. O tema pecharase inmediatamente."
+      auto_close_momentarily:
+        one: "A última publicación deste tema xa ten %{count} hora. O tema pecharase axiña."
+        other: "A última publicación deste tema xa ten %{count} horas. O tema pecharase axiña."
       timeline:
         back: "Atrás"
-        back_description: "Volver á última publicación sen ler"
+        back_description: "Volver á última publicación pendente de lectura"
         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: "saltar á última publicación"
+        jump_prompt: "saltar a..."
+        jump_prompt_of:
+          one: "de %{count} publicación"
+          other: "de %{count} publicacións"
+        jump_prompt_long: "Saltar a..."
         jump_bottom_with_number: "ir á publicación %{post_number}"
+        jump_prompt_to_date: "ata a data"
         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
+        title: cambiar a frecuencia coa que recibe notificacións sobre este tema
         reasons:
-          mailing_list_mode: "Tes o modo de lista de correo electrónico activado, de modo que recibirás notificacións das respostas a este tema por correo electrónico."
-          "3_10": "Recibirás notificacións porque estás vendo unha etiqueta neste tema."
-          "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."
-          "3_2": "Recibirás notificacións porque estás vendo este tema."
-          "3_1": "Recibirás notificacións por ser o creador deste tema."
-          "3": "Recibirás notificacións porque estás vendo este tema."
-          "2_8": "Verás o número de novas respostas porque estás a seguir esta categoría."
-          "2_4": "Verás o número de novas respostas porque publicaches unha resposta neste tema."
-          "2_2": "Verás o número de novas respostas porque estás a seguir este tema."
-          "2": 'You will see a count of new replies because you <a href="%{basePath}/u/%{username}/preferences/notifications">read this topic</a>.'
-          "1_2": "Notificarémosche se alguén menciona o teu @nome ou che responde."
-          "1": "Notificarémosche se alguén menciona o teu @nome ou che responde."
-          "0_7": "Estás ignorando todas as notificacións desta categoría."
-          "0_2": "Estás ignorando todas as notificacións deste tema."
-          "0": "Estás ignorando todas as notificacións deste tema."
+          mailing_list_mode: "Ten o modo de lista de correo electrónico activado, de modo que recibirá notificacións das respostas a este tema por correo."
+          "3_10": "Recibirá notificacións porque ten en observación unha etiqueta neste tema."
+          "3_6": "Recibirá notificacións porque ten en observación esta categoría."
+          "3_5": "Recibirá notificacións porque comezou a ter en observación este tema automaticamente."
+          "3_2": "Recibirá notificacións porque está vendo este tema."
+          "3_1": "Recibirá notificacións por ser o creador deste tema."
+          "3": "Recibirá notificacións porque está vendo este tema."
+          "2_8": "Verá o número de novas respostas porque está a seguir esta categoría."
+          "2_4": "Verá o número de novas respostas porque publicou unha resposta neste tema."
+          "2_2": "Verá o número de novas respostas porque está a seguir este tema."
+          "2": 'Verá unha conta de novas respostas, porque ten axustado <a href="%{basePath}/u/%{username}/preferences/notifications">ler este tema</a>.'
+          "1_2": "Notificarémosllo se alguén menciona o seu @nome ou lle responde."
+          "1": "Notificarémosllo se alguén menciona o seu @nome ou lle responde."
+          "0_7": "Está a ignorar todas as notificacións desta categoría."
+          "0_2": "Está a ignorar todas as notificacións deste tema."
+          "0": "Está a ignorar todas as notificacións deste tema."
         watching_pm:
-          title: "Ver"
-          description: "Recibirás notificacións de cada resposta a esta mensaxe e aparecerá o número de novas respostas."
+          title: "En observación"
+          description: "Recibirá notificacións de cada resposta a esta mensaxe e aparecerá o número de novas respostas."
         watching:
-          title: "Ver"
-          description: "Notificaránseche as respostas recibidas neste tema e amosarase o número de novas respostas."
+          title: "En observación"
+          description: "Notificaránselle as respostas recibidas neste tema e amosaráselle o número de novas respostas."
         tracking_pm:
           title: "Seguimento"
-          description: "Amosarase o número de novas respostas desta mensaxe. Notificaránseche as mencións ao teu @name ou cando alguén che responda."
+          description: "Amosaráselle o número de novas respostas desta mensaxe. Notificaráselle as mencións ao seu @name ou cando alguén lle responda."
         tracking:
           title: "Seguimento"
-          description: "Amosarase o número de novas respostas para este tema. Notificaránseche as mencións ao teu @name ou cando alguén che responda."
+          description: "Amosaráselle o número de novas respostas para este tema. Notificaráselle as mencións ao seu @name ou cando alguén lle responda."
         regular:
           title: "Normal"
-          description: "Notificarémosche se alguén menciona o teu @nome ou che responde."
+          description: "Notificarémosllo se alguén menciona o seu @nome ou lle responde."
         regular_pm:
           title: "Normal"
-          description: "Notificarémosche se alguén menciona o teu @nome ou che responde."
+          description: "Notificarémosllo se alguén menciona o seu @nome ou lle responde."
         muted_pm:
           title: "Silenciado"
-          description: "Non recibirás ningunha notificación sobre esta mensaxe."
+          description: "Non recibirá ningunha notificación sobre esta mensaxe."
         muted:
           title: "Silenciado"
-          description: "Non se che notificará nada sobre este tema e non aparecerá no listado de últimos."
+          description: "Non se lle notificará nada sobre este tema e non aparecerá no listado de últimos."
       actions:
         title: "Accións"
         recover: "Recuperar tema"
         delete: "Eliminar tema"
         open: "Abrir tema"
         close: "Pechar tema"
-        multi_select: "Seleccionar publicacións..."
+        multi_select: "Seleccionar publicacións…"
+        slow_mode: "Estabelecer modo lento"
         timed_update: "Estabelecer temporizador do tema..."
-        pin: "Pegar tema..."
-        unpin: "Despegar tema..."
+        pin: "Fixar tema…"
+        unpin: "Desprender tema…"
         unarchive: "Desarquivar tema"
         archive: "Arquivar tema"
-        invisible: "Retirar da lista"
-        visible: "Engadir á lista"
+        invisible: "Retirar da listaxe"
+        visible: "Engadir á listaxe"
         reset_read: "Restabelecer datos de lecturas"
-        make_private: "Facer que sexa mensaxe privada"
+        make_public: "Facer público o tema"
+        make_private: "Facer privada a mensaxe"
         reset_bump_date: "Restabelecer data de promoción"
       feature:
-        pin: "Pegar tema"
-        unpin: "Despegar tema"
-        pin_globally: "Pegar tema globalmente"
+        pin: "Fixar o tema"
+        unpin: "Desprender o tema"
+        pin_globally: "Fixar o tema globalmente"
         make_banner: "Tema do báner"
-        remove_banner: "Eliminar o tema do báner"
+        remove_banner: "Retirar o tema do báner"
       reply:
         title: "Responder"
         help: "escribir unha resposta a este tema"
       clear_pin:
-        title: "Borrar o estado Pegar"
-        help: "Borra o estado Pegado deste tema para que non apareza na banda superior da lista de temas."
+        title: "Despexar o fixado"
+        help: "Despexa o estado fixado deste tema para que xa non apareza por riba na listaxe de temas"
       share:
         title: "Compartir"
         extended_title: "Compartir unha ligazón"
         help: "compartir unha ligazón a este tema"
+        invite_users: "Convidar"
       print:
         title: "Imprimir"
-        help: "Abrir unha versión imprimible deste tema"
+        help: "Abrir unha versión imprimíbel deste tema"
       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."
+        title: "Sinalar"
+        help: "sinalar privadamente este tema para revisalo ou enviar unha notificación privada sobre el"
+        success_message: "Sinalou o tema correctamente."
       make_public:
         title: "Converter en tema público"
-        choose_category: "Selecciona unha categoría para o tema público:"
+        choose_category: "Seleccione 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é"
-        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}."
+        pin: "Facer que este tema apareza primeiro da categoría %{categoryLink} ata"
+        unpin: "Retirar este tema de primeiro da categoría %{categoryLink}."
+        unpin_until: "Retirar este tema de primeiro da %{categoryLink} ou agardar ata <strong>%{until}</strong>."
+        pin_note: "Os usuarios poden desprender o tema por si mesmos."
+        pin_validation: "Requírese unha data para fixar este tema."
+        not_pinned: "Non hai temas fixados 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>"
-        pin_globally: "Facer que este tema apareza no alto de todas as listas de temas até"
-        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."
+          one: "Temas fixados en %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Temas fixados actualmente en %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+        pin_globally: "Faga que este tema apareza no primeiro de todas as listaxes de temas ata"
+        confirm_pin_globally:
+          one: "Xa ten %{count} tema fixado globalmente. Demasiados temas fixados pode resultar abrumador para usuarios novos e anónimos. Confirma que quere fixar outro tema globalmente?"
+          other: "Xa ten %{count} temas fixados globalmente. Demasiados temas fixados pode resultar abrumador para usuarios novos e anónimos. Confirma que quere fixar outro tema globalmente?"
+        unpin_globally: "Eliminar este tema que está de primeiro de todas as listaxes de temas."
+        unpin_globally_until: "Eliminar este tema que está de primeiro de todas as listaxes de temas ou agardar ata <strong>%{until}</strong>."
+        global_pin_note: "Os usuarios poden desprender o tema por si mesmos."
+        not_pinned_globally: "Non hai temas fixados 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>"
+          one: "Temas fixados globalmente neste intre: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Temas fixados 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."
+        remove_banner: "Retirar 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. Só pode haber un tema que sexa báner ao mesmo tempo."
         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."
+        banner_exists: "Agora <strong class='badge badge-notification unread'>hai</strong> 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"
+        title: "Mensaxe para convidar"
         email_or_username: "Nome do usuario ou correo-e do convidado"
-        email_or_username_placeholder: "correo electrónico e nome do usuario"
+        email_or_username_placeholder: "correo electrónico e nome de 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."
+        success: "Convidamos a ese usuario a participar con esta mensaxe."
+        success_group: "Convidamos a este grupo a participar con esta mensaxe."
+        error: "Sentímolo pero houbo un erro convidando ese usuario."
+        not_allowed: "Desculpe pero ese usuario non pode ser convidado."
         group_name: "nome do grupo"
       controls: "Controis do tema"
       invite_reply:
         title: "Convidar"
-        username_placeholder: "nome do usuario"
+        username_placeholder: "nome de usuario"
         action: "Enviar convite"
         help: "convidar a outros a este tema por correo electrónico ou notificacións"
-        to_forum: "Enviaremos un correo electrónico permitindo ao teu amigo que se una inmediatamente ao premer nunha ligazón. Non require iniciar sesión."
-        sso_enabled: "Introduce o nome do usuario da persoa que desexas convidar a este tema."
-        to_topic_blank: "Introduce o nome do usuario ou o correo electrónico da persoa que desexas convidar a este tema."
-        to_topic_email: "Introduciches un enderezo de correo-e. Enviarémosche un convite que permitirá os teus amigos responder inmediatamente a este tema."
-        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."
+        to_forum: "Enviaremos un correo electrónico permitindo ao seu amigo que se una inmediatamente ao premer nunha ligazón. Non require iniciar sesión."
+        discourse_connect_enabled: "Escriba o nome de usuario da persoa á que quere convidar neste tema."
+        to_topic_blank: "Introduza o nome do usuario ou o correo electrónico da persoa que desexa convidar a este tema."
+        to_topic_email: "Introduciu un enderezo de correo. Enviarémoslle un convite que lles permitirá aos seus amigos responder inmediatamente a este tema."
+        to_topic_username: "Introduciu un nome de usuario. Enviarémoslle unha notificación cunha ligazón convidándoo a este tema."
+        to_username: "Introduza o nome do usuario da persoa que desexa 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émoslle cando utilice a invitación. Mire a lapela de convites na súa páxina de usuario para facer un seguimento das sú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)"
+        error: "Sentímolo, non foi posíbel convidar a 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"
+      login_reply: "Inicie sesión para responder"
       filters:
         n_posts:
           one: "Unha publicación"
@@ -2080,16 +2514,16 @@ gl:
         radio_label: "Novo tema"
         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."
+          one: "Vai crear un novo tema e enchelo coa publicación que seleccionou."
+          other: "Vai crear un novo tema e enchelo coas <b>%{count}</b> publicacións que seleccionou."
       merge_topic:
         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."
+          one: "Seleccione o tema ao que quere mover esta publicación."
+          other: "Seleccione o tema ao que quere mover estas <b>%{count}</b> publicacións."
       move_to_new_message:
         title: "Mover a Nova mensaxe"
         action: "mover a nova mensaxe"
@@ -2097,16 +2531,16 @@ gl:
         radio_label: "Nova mensaxe"
         participants: "Participantes"
         instructions:
-          one: "Vas crear unha nova mensaxe e enchela coa publicación que seleccionaches."
-          other: "Vas crear unha nova mensaxe e enchela coas <b>%{count}</b> publicacións que seleccionaches."
+          one: "Vai crear unha nova mensaxe e enchela coa publicación que seleccionou."
+          other: "Vai crear unha nova mensaxe e enchela coas <b>%{count}</b> publicacións que seleccionou."
       move_to_existing_message:
         title: "Mover a Mensaxe existente"
         action: "mover a mensaxe existente"
         radio_label: "Mensaxe existente"
         participants: "Participantes"
         instructions:
-          one: "Selecciona a mensaxe á que queres mover esta publicación."
-          other: "Selecciona a mensaxe á que queres mover estas <b>%{count}</b> publicacións."
+          one: "Seleccione a mensaxe á que quere mover esta publicación."
+          other: "Seleccione a mensaxe á que quere mover estas <b>%{count}</b> publicacións."
       merge_posts:
         title: "Combinar publicacións seleccionadas"
         action: "combinar publicacións seleccionadas"
@@ -2114,26 +2548,34 @@ gl:
       publish_page:
         title: "Publicación da páxina"
         publish: "Publicar"
+        description: "Cando un tema se publica como páxina, pódese compartir o seu URL e será presentado cun estilo personalizado."
+        slug: "Localizador abreviado"
         public: "Público"
         public_description: "Os demais poden ver esta páxina aínda que o tema asociado sexa privado."
-        publish_url: "A túa páxina publicouse en:"
-        topic_published: "O teu tema publicouse en:"
-        preview_url: "A túa páxina publicarase en:"
-        invalid_slug: "Sentímolo pero non podes publicar esta páxina."
+        publish_url: "A súa páxina publicouse en:"
+        topic_published: "O seu tema publicouse en:"
+        preview_url: "A súa páxina publicarase en:"
+        invalid_slug: "Sentímolo pero non pode publicar esta páxina."
+        unpublish: "Despublicar"
+        unpublished: "Despublicouse a páxina e xa non se pode acceder a ela."
         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:
+          one: "Escolla un novo propietario para a publicación de <b>@%{old_user}</b>"
+          other: "Escolla un novo propietario para as %{count} publicacións de <b>@%{old_user}</b>"
         instructions_without_old_user:
-          one: "Selecciona un novo propietario para a publicación"
-          other: "Selecciona un novo propietario para as %{count} publicacións"
+          one: "Seleccione un novo propietario para a publicación"
+          other: "Seleccione un novo propietario para as %{count} publicacións"
       change_timestamp:
+        title: "Cambiar o selo de tempo..."
         action: "cambiar a marca data/hora"
         invalid_timestamp: "A marca data/hora non pode ser no futuro."
         error: "Produciuse un erro cambiando a marca data/hora do tema."
-        instructions: "Selecciona a marca data/hora para o tema. As publicacións do tema actualizaranse para ter a mesma diferenza de tempo."
+        instructions: "Seleccione 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})"
@@ -2141,35 +2583,41 @@ gl:
           label: "seleccionar"
           title: "Engadir publicación á selección"
         selected_post:
-          title: "Preme para eliminar a publicación da selección"
+          label: "seleccionado"
+          title: "Prema para eliminar a publicación da selección"
         select_replies:
           label: "seleccionar +respostas"
           title: "Engadir a publicación e todas as respostas asociadas á selección"
+        select_below:
+          label: "seleccione +seguintes"
+          title: "Engadir publicación e todas as posteriores á selección"
         delete: eliminar seleccionados
-        cancel: cancelar selección
+        cancel: cancelar a selección
         select_all: seleccionar todo
         deselect_all: deseleccionar todo
         description:
-          one: Seleccionaches <b>unha</b> publicación.
-          other: "Seleccionaches <b>%{count}</b> publicacións."
+          one: Seleccionou <b>%{count}</b> publicación.
+          other: "Seleccionou <b>%{count}</b> publicacións."
       deleted_by_author:
-        one: "(tema retirado polo autor, eliminarase automaticamente en %{count} hora agás no caso de que sexa denunciado)"
-        other: "(tema retirado polo autor, eliminarase automaticamente en %{count} horas agás no caso de que sexa denunciado)"
+        one: "(tema retirado polo autor, eliminarase automaticamente en %{count} hora, agás no caso de que sexa sinalado)"
+        other: "(tema retirado polo autor, eliminarase automaticamente en %{count} horas, agás no caso de que sexa sinalado)"
     post:
-      quote_reply: "Citar"
-      edit_reason: "Razón:"
+      quote_reply: "Cita"
+      quote_share: "Compartir"
+      edit_reason: "Razón: "
       post_number: "publicación %{number}"
       ignored: "Contido ignorado"
+      wiki_last_edited_on: "a última edición do wiki foi o"
       last_edited_on: "última edición da publicación"
       reply_as_new_topic: "Responder como tema ligado"
-      reply_as_new_private_message: "Responder como nova mensaxe aos mesmos destinatarios"
+      reply_as_new_private_message: "Responderlles como nova mensaxe aos mesmos destinatarios"
       continue_discussion: "Continuar a discusión de %{postLink}:"
       follow_quote: "ir á publicación citada"
       show_full: "Amosar a publicación completa"
       show_hidden: "Ver o contido ignorado."
       deleted_by_author:
-        one: "(as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} hora, excepto que fosen denunciadas)"
-        other: "(as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} horas, excepto que fosen denunciadas)"
+        one: "(as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} hora, agás que fosen sinaladas)"
+        other: "(as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} horas, agás que fosen sinaladas)"
       collapse: "reducir"
       expand_collapse: "ampliar/reducir"
       locked: "un membro do equipo bloqueou a edición nesta publicación"
@@ -2178,61 +2626,70 @@ gl:
         other: "ver %{count} respostas ocultas"
       notice:
         new_user: "É a primeira publicación de %{user}. Deámoslle a benvida á nosa comunidade!"
-        returning_user: "Non viamos a %{user} por aquí desde hai un tempo. A súa última publicación foi  %{time}."
-      unread: "Publicación sen ler"
+        returning_user: "Non viamos a %{user} por aquí desde hai un tempo. A súa última publicación foi %{time}."
+      unread: "Publicación pendente de lectura"
       has_replies:
-        one: "%{count} resposta"
-        other: "%{count} respostas"
+        one: "%{count} Resposta"
+        other: "%{count} Respostas"
+      has_replies_count: "%{count}"
       unknown_user: "(usuario descoñecido/eliminado)"
       has_likes_title:
-        one: "A unha persoa gustoulle esta publicación"
+        one: "A %{count} persoa gustoulle 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"
+        one: "vostede e %{count} máis apreciaron esta publicación"
+        other: "vostede %{count} máis apreciaron esta publicación"
+      filtered_replies_hint:
+        one: "Ver esta publicación e a súa resposta"
+        other: "Ver esta publicación e as súas %{count} respostas"
+      filtered_replies_viewing:
+        one: "Vendo %{count} resposta a"
+        other: "Vendo %{count} respostas a"
+      in_reply_to: "Cargar a publicación pai"
+      view_all_posts: "Ver todas as publicacións"
       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."
-        upload: "Sentímolo pero produciuse un erro enviando a publicación. Téntao de novo."
-        file_too_large: "Sentímolo, pero o ficheiro é demasiado grande (o tamaño máximo é de %{max_size_kb}kb). Por que non probas a subilo á nube e pegas aquí a ligazón?"
-        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."
-      abandon_edit:
-        confirm: "Confirmas que queres desbotar os cambios?"
-        no_value: "Non, seguir"
-        no_save_draft: "Non, gardar borrador"
-        yes_value: "Si, desbotar edición"
-      abandon:
-        confirm: "Confirmas o abandono da túa publicación?"
-        no_value: "Non, seguir"
-        no_save_draft: "Non, gardar borrador"
-        yes_value: "Si, abandonar"
-      via_email: "esta publicación chegou por correo-e"
+        create: "Sentímolo pero produciuse un erro creando a publicación. Ténteo de novo."
+        edit: "Sentímolo pero produciuse un erro editando a publicación. Ténteo de novo."
+        upload: "Sentímolo pero produciuse un erro ao cargar ese ficheiro. Ténteo de novo."
+        file_too_large: "Sentímolo, pero o ficheiro é demasiado grande (o tamaño máximo é de %{max_size_kb}kb). Por que non proba a cargalo nun servizo da nube e pega aquí a ligazón?"
+        too_many_uploads: "Sentímolo pero só pode cargar un ficheiro de cada vez."
+        too_many_dragged_and_dropped_files:
+          one: "Soamente pode cargar %{count} ficheiro de cada vez."
+          other: "Soamente pode cargar %{count} ficheiros de cada vez."
+        upload_not_authorized: "Sentímolo, o ficheiro que tenta cargar non está autorizado (extensións permitidas: %{authorized_extensions})."
+        image_upload_not_allowed_for_new_user: "Sentímolo pero os novos usuarios non poden cargar imaxes."
+        attachment_upload_not_allowed_for_new_user: "Sentímolo pero os novos usuarios non poden cargar anexos."
+        attachment_download_requires_login: "Sentímolo pero debe iniciar sesión para descargar anexos."
+      cancel_composer:
+        confirm: "Que quere facer coa súa publicación?"
+        discard: "Desbotar"
+        save_draft: "Gardar borrador para máis tarde"
+        keep_editing: "Seguir editando"
+      via_email: "esta publicación chegou por correo"
       via_auto_generated_email: "esta publicación chegou dun correo electrónico xerado automaticamente"
-      whisper: "este é un bisbar privado para moderadores"
+      whisper: "este é un rumor privado para moderadores"
       wiki:
-        about: "esta publicación é unha wiki"
+        about: "esta publicación é un wiki"
       archetypes:
         save: "Gardar opcións"
+      few_likes_left: "Grazas por repartir cariño! Só lle quedan algúns gústame por hoxe."
       controls:
         reply: "escribir unha resposta a esta publicación"
         like: "gústame esta publicación"
-        has_liked: "gustouche esta publicación"
+        has_liked: "gustoulle esta publicación"
+        read_indicator: "membros que leron esta publicación"
         undo_like: "desfacer o gústame"
-        edit: "editar publicación"
+        edit: "editar a publicación"
         edit_action: "Editar"
-        edit_anonymous: "Sentímolo pero debes iniciar sesión para editar esta publicación."
-        flag: "denunciar privadamente esta publicación ou enviar unha notificación privada sobre ela"
-        delete: "eliminar publicación"
-        undelete: "recuperar publicación"
-        share: "compartir ligazón á publicación"
+        edit_anonymous: "Sentímolo pero debe iniciar sesión para editar esta publicación."
+        flag: "sinalar privadamente esta publicación ou enviar unha notificación privada sobre ela"
+        delete: "eliminar esta publicación"
+        undelete: "recuperar esta publicación"
+        share: "compartir ligazón a esta publicación"
         more: "Máis"
         delete_replies:
-          confirm: "Confirmas a eliminación das respostas desta publicación?"
+          confirm: "Confirma a eliminación das respostas desta publicación?"
           direct_replies:
             one: "Si, e %{count} resposta directa"
             other: "Si, e %{count} respostas directas"
@@ -2243,54 +2700,68 @@ gl:
         admin: "accións admin. nas publicacións"
         wiki: "Crear wiki"
         unwiki: "Eliminar wiki"
-        convert_to_moderator: "Engadir cor do Equipo"
-        revert_to_regular: "Eliminar cor do Equipo"
+        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"
+        unhide: "Non agochar"
         change_owner: "Cambiar propietario"
         grant_badge: "Conceder insignia"
         lock_post: "Bloquear publicación"
         lock_post_description: "evitar que o autor edite esta publicación"
-        unlock_post: "Desbloquear publicación"
+        unlock_post: "Desbloquear a publicación"
         unlock_post_description: "permitir que o autor edite esta publicación"
-        delete_topic_disallowed_modal: "Non tes permiso para eliminar este tema. Se desexas eliminalo, denúnciao para que o revise o moderador e xustifica a causa da denuncia."
-        delete_topic_disallowed: "non tes permiso para eliminar este tema"
+        delete_topic_disallowed_modal: "Non ten permiso para eliminar este tema. Se desexa eliminalo, emita unha alerta para que o revise o moderador e xustifique a causa da alerta."
+        delete_topic_disallowed: "non ten permiso para eliminar este tema"
+        delete_topic_confirm_modal:
+          one: "Este tema ten agora máis de %{count} visualización e pode ser un destino de busca popular. Confirma que quere eliminar este tema por completo, en vez de editalo para melloralo?"
+          other: "Este tema ten agora máis de %{count} visualizacións e pode ser un destino de busca popular. Confirma que quere eliminar este tema por completo, en vez de editalo para melloralo?"
+        delete_topic_confirm_modal_yes: "Si, eliminar este tema"
+        delete_topic_confirm_modal_no: "Non, manter este tema"
+        delete_topic_error: "Produciuse un erro ao eliminar este tema"
         delete_topic: "eliminar tema"
-        remove_timer: "eliminar temporizador"
+        add_post_notice: "Engadir aviso do equipo"
+        change_post_notice: "Cambiar o aviso do equipo"
+        delete_post_notice: "Eliminar o aviso do equipo"
+        remove_timer: "retirar o temporizador"
+        edit_timer: "editar temporizador"
       actions:
         people:
+          like:
+            one: "gustoume isto"
+            other: "gustáronme estes"
           read:
             one: "leu isto"
             other: "leron isto"
           like_capped:
-            one: "e a %{count} máis gustouvos isto"
-            other: "e a %{count} máis gustouvos isto"
+            one: "e a %{count} máis gustoulle isto"
+            other: "e a %{count} máis gustoulles isto"
           read_capped:
-            one: "e %{count} máis lestes isto"
-            other: "e %{count} máis lestes isto"
+            one: "e %{count} máis leu isto"
+            other: "e %{count} máis leron isto"
         by_you:
-          off_topic: "Informaches disto como non relacionado"
-          spam: "Denunciaches isto como spam"
-          inappropriate: "Denunciaches isto como inapropiado"
-          notify_moderators: "Denunciaches isto para moderación"
-          notify_user: "Enviaches unha mensaxe a este usuario"
+          off_topic: "Informou disto como non relacionado"
+          spam: "Sinalou isto como lixo"
+          inappropriate: "Sinalou isto como inapropiado"
+          notify_moderators: "Sinalou isto para moderación"
+          notify_user: "Enviou unha mensaxe a este usuario"
       delete:
         confirm:
-          one: "Confirmas a eliminación desta publicación?"
-          other: "Confirmas a eliminación destas %{count} publicacións?"
+          one: "Confirma a eliminación desta publicación?"
+          other: "Confirma a eliminación destas %{count} publicacións?"
       merge:
         confirm:
-          one: "Confirmas a combinación desas publicacións?"
-          other: "Confirmas a combinación destas %{count} publicacións?"
+          one: "Confirma a combinación desas publicacións?"
+          other: "Confirma a combinación destas %{count} publicacións?"
       revisions:
         controls:
           first: "Primeira revisión"
           previous: "Revisión anterior"
           next: "Revisión seguinte"
           last: "Última revisión"
-          hide: "Ocultar revisión"
+          hide: "Agochar a revisión"
           show: "Amosar revisión"
+          revert: "Volver á revisión %{revision}"
           edit_wiki: "Editar wiki"
           edit_post: "Editar publicación"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
@@ -2303,8 +2774,12 @@ gl:
             button: "HTML"
           side_by_side_markdown:
             title: "Amosar a fonte crúa coas diferenzas comparadas"
+            button: "En bruto"
       raw_email:
         displays:
+          raw:
+            title: "Amosar o correo electrónico en bruto"
+            button: "En bruto"
           text_part:
             title: "Amosar a parte de texto do correo electrónico"
             button: "Texto"
@@ -2318,23 +2793,37 @@ gl:
         updated: "Actualizado"
         name: "Nome"
         name_placeholder: "Para que serve este marcador?"
+        set_reminder: "Lémbreme"
         actions:
           delete_bookmark:
             name: "Eliminar marcador"
-            description: "Elimina o marcador do teu perfil e detén todos os recordatorios asociados"
+            description: "Elimina o marcador do seu perfil e deteña todos os recordatorios asociados"
           edit_bookmark:
             name: "Editar marcador"
             description: "Editar o nome do marcador ou cambiar a data e hora do recordatorio"
+          pin_bookmark:
+            name: "Fixar o marcador"
+            description: "Fixar o marcador. Isto fará que apareza na parte superior da lista de marcadores."
+          unpin_bookmark:
+            name: "Desprender o marcador"
+            description: "Desprender o marcador. Isto fará que xa non apareza na parte superior da súa lista de marcadores."
+      filtered_replies:
+        viewing_posts_by: "Vendo %{post_count} publicacións de"
+        viewing_subset: "Algunhas respostas están repregadas"
+        viewing_summary: "Vendo un resumo deste tema"
+        post_number: "%{username}, publicación #%{post_number}"
+        show_all: "Amosar todas"
     category:
-      can: "podes&hellip; "
+      can: "pode&hellip; "
       none: "(sen categoría)"
       all: "Todas as categorías"
       choose: "categoría&hellip;"
       edit: "Editar"
       edit_dialog_title: "Editar: %{categoryName}"
-      view: "Ver os Temas na Categoría"
+      view: "Ver os temas na categoría"
+      back: "Volver á categoría"
       general: "Xeral"
-      settings: "Axustes"
+      settings: "Configuración"
       topic_template: "Modelo para o tema"
       tags: "Etiquetas"
       tags_allowed_tags: "Restrinxir estas etiquetas a esta categoría:"
@@ -2342,18 +2831,19 @@ gl:
       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: "Xestionar 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:"
-      topic_featured_link_allowed: "Permitir ligazóns destacadas nesta categoría"
+      topic_featured_link_allowed: "Permitir ligazóns de actualidade nesta categoría"
       delete: "Eliminar categoría"
       create: "Nova categoría"
       create_long: "Crear unha nova categoría"
       save: "Gardar categoría"
-      slug: "«Slug» da Categoría"
-      slug_placeholder: "Inserir guións entre palabras para url (opcional) "
+      slug: "URL compacto da categoría"
+      slug_placeholder: "Inserir guións entre palabras para o url (opcional)"
       creation_error: Produciuse un erro durante a creación desta categoría.
       save_error: Produciuse un erro gardando a categoría.
       name: "Nome da categoría"
@@ -2366,60 +2856,75 @@ gl:
       foreground_color: "Cor do primeiro plano"
       name_placeholder: "Dúas palabras como máximo"
       color_placeholder: "Calquera cor web"
-      delete_confirm: "Confirmas a eliminación desta categoría?"
+      delete_confirm: "Confirma a eliminación desta categoría?"
       delete_error: "Produciuse un erro elimando esta categoría."
       list: "Listar categorías"
-      no_description: "Engade unha descrición a esta categoría."
+      no_description: "Engada unha descrición a esta categoría."
       change_in_category_topic: "Editar a descrición"
       already_used: "Esta cor usouna outra categoría"
       security: "Seguranza"
-      special_warning: "Aviso: esta categoría ten axustes predeterminados e as opcións de seguranza non se poden modificar. Se non queres usala, elimínaa no canto de reciclala."
+      security_add_group: "Engadir grupo"
+      permissions:
+        group: "Grupo"
+        see: "Ver"
+        reply: "Responder"
+        create: "Crear"
+        no_groups_selected: "Non se lle concedeu acceso a ningún grupo; esta categoría só será visíbel para o equipo."
+        everyone_has_access: 'Esta categoría é pública, todos poden ver, responder e crear publicacións. Para restrinxir os permisos, retire un ou máis dos permisos concedidos ao grupo «todos».'
+        toggle_reply: "Trocar permiso de resposta"
+        toggle_full: "Trocar permiso para crear"
+        inherited: 'Este permiso hérdase do de «todos»'
+      special_warning: "Aviso: esta categoría ten axustes predeterminados e as opcións de seguranza non se poden modificar. Se non quere usala, elimínea no canto de reciclala."
       uncategorized_security_warning: "Esta categoría é especial. Enténdese como unha área de espera para aqueles temas que non teñen categoría. Non pode ter axustes de seguranza."
-      uncategorized_general_warning: 'Esta categoría é especial. Úsase como categoría predeterminada para os novos temas que non teñen unha categoría seleccionada. Se non queres isto e prefires forzar a selección de categorías, <a href="%{settingLink}">desactiva aquí o axuste</a>. Se queres cambiar o nome ou a descrición, vai a <a href="%{customizeLink}">Personalizar / Contido de texto</a>.'
-      pending_permission_change_alert: "Non engadiches %{group} nesta categoría; preme neste botón para engadilos."
+      uncategorized_general_warning: 'Esta categoría é especial. Úsase como categoría predeterminada para os novos temas que non teñen unha categoría seleccionada. Se non quere isto e prefire forzar a selección de categorías, <a href="%{settingLink}">desactive aquí o axuste</a>. Se quere cambiar o nome ou a descrición, vai a <a href="%{customizeLink}">Personalizar / Contido de texto</a>.'
+      pending_permission_change_alert: "Non engadiu %{group} nesta categoría; prema neste botón para engadilos."
       images: "Imaxes"
-      email_in: "Personalizar enderezos de correos-e entrantes:"
-      email_in_allow_strangers: "Aceptar correos-e de usuarios anónimos sen contas"
-      email_in_disabled: "A publicación de novos temas vía correo-e está desactivada nos axustes do sitio. Para activala,"
-      email_in_disabled_click: 'activar o axuste «email in».'
+      email_in: "Personalizar enderezos de mensaxes de correo entrantes:"
+      email_in_allow_strangers: "Aceptar correo de usuarios anónimos sen contas"
+      email_in_disabled: "A publicación de novos temas vía correo está desactivada na configuración do sitio. Para activala, "
+      email_in_disabled_click: 'activar o axuste «correo de entrada».'
+      mailinglist_mirror: "A categoría replica unha lista de correo"
       show_subcategory_list: "Amosar a lista de subcategorías por riba dos temas desta categoría."
       read_only_banner: "Texto do báner cando o usuario non poida crear un tema nesta categoría:"
-      num_featured_topics: "Número de temas mostrados na páxina de categorías:"
-      subcategory_num_featured_topics: "Número de temas destacados na páxina da categoría primaria:"
-      subcategory_list_style: "Estilo da lista de subcategorías:"
-      sort_order: "Ordenar lista de temas por:"
-      default_view: "Lista de temas predeterminada"
-      default_list_filter: "Filtro de lista predeterminado:"
+      num_featured_topics: "Número de temas amosados na páxina de categorías:"
+      subcategory_num_featured_topics: "Número de temas de actualidade na páxina da categoría primaria:"
+      all_topics_wiki: "Fai novas publicacións de wiki de modo predeterminado"
+      subcategory_list_style: "Estilo da listaxe de subcategorías:"
+      sort_order: "Ordenar listaxe de temas por:"
+      default_view: "Listaxe de temas predeterminada:"
+      default_top_period: "Período predeterminado como importante:"
+      default_list_filter: "Filtro de listaxe predeterminado:"
       allow_badges_label: "Permitir adxudicar insignias nesta categoría"
       edit_permissions: "Editar permisos"
+      reviewable_by_group: "Ademais do equipo, o contido desta categoría tamén pode ser revisado por:"
       review_group_name: "nome do grupo"
       require_topic_approval: "Require a aprobación de todos os temas novos polo moderador"
       require_reply_approval: "Require a aprobación de todas as respostas novas polo moderador"
       this_year: "este ano"
-      position: "Posición na páxina de categorías"
+      position: "Posición na páxina de categorías:"
       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».'
+      position_disabled: "As categorías presentaranse en orde de actividade. Para controlar a orde das categorías nas listaxes, "
+      position_disabled_click: 'activar o axuste «posición das categorías fixadas».'
       minimum_required_tags: "Número mínimo de etiquetas requiridas nun tema:"
       parent: "Categoría primaria"
-      num_auto_bump_daily: "Número de temas abertos que se promoven automaticamente cada día"
+      num_auto_bump_daily: "Número de temas abertos que se promoven automaticamente cada día:"
       navigate_to_first_post_after_read: "Ir á primeira publicación despois de ler os temas"
       notifications:
         watching:
           title: "Ver"
-          description: "Verás automaticamente todos os temas destas categorías. Recibirás notificacións de cada nova publicación en cada tema e aparecerá o número de novas respostas."
+          description: "Verá automaticamente todos os temas destas categorías. Recibirá notificacións de cada nova publicación en cada tema e aparecerá o número de novas respostas."
         watching_first_post:
-          title: "Vendo publicación inicial"
-          description: "Recibirás notificacións dos novos temas nesta categoría pero non das respostas."
+          title: "Observando a publicación inicial"
+          description: "Recibirá notificacións dos novos temas nesta categoría pero non das respostas."
         tracking:
           title: "Seguimento"
-          description: "Seguirás automaticamente todos os temas destas categorías. Recibirás notificacións das mencións do teu @nome e das respostas que recibas e aparecerá o número de novas respostas."
+          description: "Seguirá automaticamente todos os temas destas categorías. Recibirá notificacións das mencións do seu @nome e das respostas que reciba e aparecerá o número de novas respostas."
         regular:
           title: "Normal"
-          description: "Notificarémosche se alguén menciona o teu @nome ou che responde."
+          description: "Notificarémosllo se alguén menciona o seu @nome ou lle responde."
         muted:
           title: "Silenciado"
-          description: "Non se che notificarán novos temas nestas categorías e non aparecerán nos Últimos."
+          description: "Non se lle notificarán novos temas nestas categorías e non aparecerán nos Últimos."
       search_priority:
         label: "Prioridade da busca"
         options:
@@ -2432,6 +2937,7 @@ gl:
       sort_options:
         default: "predeterminado"
         likes: "Gústames"
+        op_likes: "Gústames da publicación orixinal"
         views: "Vistas"
         posts: "Publicacións"
         activity: "Actividade"
@@ -2441,40 +2947,64 @@ gl:
       sort_ascending: "Ascendente"
       sort_descending: "Descendente"
       subcategory_list_styles:
+        rows: "Filas"
+        rows_with_featured_topics: "Liñas con temas de actualidade"
         boxes: "Caixas"
-        boxes_with_featured_topics: "Caixas con temas destacados"
+        boxes_with_featured_topics: "Caixas con temas de actualidade"
       settings_sections:
         general: "Xeral"
         moderation: "Moderación"
+        appearance: "Aparencia"
         email: "Correo electrónico"
       list_filters:
         all: "todos os temas"
         none: "sen subcategorías"
+      colors_disabled: "Non pode seleccionar cores porque ten un estilo de categoría con ningún."
     flagging:
-      title: "Grazas por axudar a manter a nosa comunidade."
-      action: "Denunciar publicación"
+      title: "Grazas por axudar a manter cívica a nosa comunidade!"
+      action: "Sinalar a publicación"
+      take_action: "Intervir..."
+      take_action_options:
+        default:
+          title: "Intervir"
+          details: "Acadar o límite da alerta inmediatamente e non agardar por máis alertas da comunidade"
+        suspend:
+          title: "Suspender o usuario"
+          details: "Acadar o límite da alerta e suspender o usuario"
+        silence:
+          title: "Silenciar o usuario"
+          details: "Acadar o límite da alerta e silenciar o usuario"
       notify_action: "Mensaxe"
-      delete_spammer: "Eliminar spammer"
-      yes_delete_spammer: "Si, eliminar o spammer"
+      official_warning: "Aviso oficial"
+      delete_spammer: "Eliminar remitente de lixo"
+      flag_for_review: "Cola para revisión"
+      delete_confirm_MF: "Vai eliminar {POSTS, plural, one {<b>#</b> publicación} other {<b>#</b> publicacións}} e {TOPICS, plural, one {<b>#</b> tema} other {<b>#</b> temas}} deste usuario, retirar a súa conta, bloquear accesos desde o seu enderezo IP <b>{ip_address}</b>, e engadir o seu enderezo de correo <b>{email}</b> a unha listaxe de bloqueo permanente. Confirma que este usuario se dedica a enviar lixo?"
+      yes_delete_spammer: "Si, eliminar o remitente de lixo"
       ip_address_missing: "(N/D)"
-      hidden_email_address: "(oculto)"
-      submit_tooltip: "Enviar a denuncia privada"
-      take_action_tooltip: "Alcanzar o limiar de denuncias inmediatamente no canto de agardar por máis denuncias da comunidade"
-      cant: "Sentímolo pero non podes denunciar esta publicación neste intre."
-      notify_staff: "Notificar ao equipo privadamente"
+      hidden_email_address: "(agochado)"
+      submit_tooltip: "Enviar a alerta privada"
+      take_action_tooltip: "Acadar o limiar de alertas inmediatamente no canto de agardar por máis alertas da comunidade"
+      cant: "Sentímolo pero non pode sinalar esta publicación neste intre."
+      notify_staff: "Notificarllo ao equipo privadamente"
       formatted_name:
         off_topic: "Non está relacionado"
         inappropriate: "É inapropiado"
-        spam: "É spam"
-      custom_placeholder_notify_user: "Se específico, construtivo e sempre amábel."
-      custom_placeholder_notify_moderators: "Especifícanos sobre o que estás preocupado e proporciónanos ligazóns relevantes e exemplos cando sexa posíbel."
+        spam: "É lixo"
+      custom_placeholder_notify_user: "Sexa específico, construtivo e sempre amábel."
+      custom_placeholder_notify_moderators: "Especifíquenos o que lle preocupa e proporciónenos ligazóns relevantes e exemplos cando sexa posíbel."
       custom_message:
         at_least:
-          one: "escribe como mínimo %{count} carácter"
-          other: "escribe como mínimo %{count} caracteres"
+          one: "escriba como mínimo %{count} carácter"
+          other: "escriba como mínimo %{count} caracteres"
+        more:
+          one: "Falta %{count} para..."
+          other: "Falta %{count} para..."
+        left:
+          one: "Queda %{count}"
+          other: "Quedan %{count}"
     flagging_topic:
-      title: "Grazas por axudar a manter a nosa comunidade."
-      action: "Denunciar tema"
+      title: "Grazas por axudar a manter cívica a nosa comunidade!"
+      action: "Sinalar o tema"
       notify_action: "Mensaxe"
     topic_map:
       title: "Resumo do tema"
@@ -2482,9 +3012,10 @@ gl:
       links_title: "Ligazóns populares"
       links_shown: "amosar máis ligazóns..."
       clicks:
-        one: "Un clic"
+        one: "%{count} clic"
         other: "%{count} clics"
     post_links:
+      about: "despregar máis ligazóns para esta publicación"
       title:
         one: "%{count} máis"
         other: "%{count} máis"
@@ -2492,7 +3023,7 @@ gl:
       warning:
         help: "Este é un aviso oficial."
       bookmarked:
-        help: "Marcaches este tema"
+        help: "Marcou este tema"
       locked:
         help: "Este tema está pechado, xa non acepta respostas"
       archived:
@@ -2500,14 +3031,14 @@ gl:
       locked_and_archived:
         help: "Este tema está pechado e arquivado; xa non acepta novas respostas e non se pode cambiar"
       unpinned:
-        title: "Despegado"
-        help: "Este tema está despegado para vostede; presentarase na orde normal"
+        title: "Desprendido"
+        help: "Este tema está desprendido para vostede; presentarase na orde normal"
       pinned_globally:
-        title: "Pegado globalmente"
-        help: "Este tema pegouse globalmente; presentarase na banda superior dos máis recentes e na súa categoría"
+        title: "Fixado globalmente"
+        help: "Este tema está fixado globalmente; presentarase na banda superior dos máis recentes e na súa categoría"
       pinned:
-        title: "Pegado"
-        help: "Este tema pegouse globalmente; presentarase na banda superior da súa categoría"
+        title: "Fixado"
+        help: "Este tema está fixado globalmente; presentarase na banda superior da súa categoría"
       unlisted:
         help: "Este tema non está listado. Non se presentará nas listas de temas e só estará accesíbel vía ligazón directa"
       personal_message:
@@ -2515,11 +3046,11 @@ gl:
         help: "Este tema é unha mensaxe privada"
     posts: "Publicacións"
     posts_likes_MF: |
-      Este tema ten {count, plural, one {1 resposta} other {# respostas}} {ratio, select,
-      low {cun alto índice de gústames}
-      med {cun moi alto índice de gústames}
-      high {cun extremadamente alto índice de gústames}
-      other {}}
+      Este tema ten {count, plural, one {# resposta} other {# respostas}} {ratio, select,
+        low {cun alto nivel de valoración da publicación}
+        med {cun moi alto nivel de valoración da publicación}
+        high {cun extremo nivel de valoración da publicación}
+        other {}}
     original_post: "Publicación orixinal"
     views: "Vistas"
     views_lowercase:
@@ -2539,11 +3070,10 @@ gl:
       one: "usuario"
       other: "usuarios"
     category_title: "Categoría"
-    history: "Historial"
-    changed_by: "por %{author}"
+    changed_by: "de %{author}"
     raw_email:
-      title: "Correo electrónico entrante"
-      not_available: "Non dispoñíbel."
+      title: "Correo entrante"
+      not_available: "Non dispoñíbel!"
     categories_list: "Lista de categorías"
     filters:
       with_topics: "%{filter} temas"
@@ -2556,36 +3086,36 @@ gl:
         help: "temas con publicacións recentes"
       read:
         title: "Lidos"
-        help: "temas que liches, partindo da última lectura"
+        help: "temas que leu, partindo da última lectura"
       categories:
         title: "Categorías"
         title_in: "Categoría - %{categoryName}"
         help: "todos os temas agrupados por categoría"
       unread:
-        title: "Sen ler"
+        title: "Pendentes de lectura"
         title_with_count:
-          one: "Un sen ler"
-          other: "(%{count}) sen ler"
-        help: "temas con publicacións sen ler que estás vendo ou seguindo"
+          one: "(%{count}) pendente de ler"
+          other: "(%{count}) pendentes de ler"
+        help: "temas con publicacións pendente de lectura que está observando ou seguindo"
         lower_title_with_count:
-          one: "%{count} sen ler"
-          other: "%{count} sen ler"
+          one: "%{count} pendente de lectura"
+          other: "%{count} pendentes de lectura"
       new:
         lower_title_with_count:
-          one: "Un novo"
+          one: "%{count} novo"
           other: "%{count} novos"
         lower_title: "novo"
         title: "Novo"
         title_with_count:
-          one: "Un novo"
+          one: "(%{count}) novo"
           other: "(%{count}) novos"
         help: "temas creados nos últimos días"
       posted:
         title: "As miñas publicacións"
-        help: "temas nos que publicaches"
+        help: "temas nos que publicou"
       bookmarks:
         title: "Marcadores"
-        help: "temas que marcaches"
+        help: "temas que marcou"
       category:
         title: "%{categoryName}"
         title_with_count:
@@ -2596,7 +3126,7 @@ gl:
         title: "Destacados"
         help: "os temas máis activos no último ano, mes, semana ou día"
         all:
-          title: "Todos"
+          title: "Desde o principio"
         yearly:
           title: "Anual"
         quarterly:
@@ -2607,12 +3137,14 @@ gl:
           title: "Semanal"
         daily:
           title: "Diario"
-        all_time: "Todos"
+        all_time: "Desde o principio"
         this_year: "Ano"
         this_quarter: "Trimestre"
         this_month: "Mes"
         this_week: "Semana"
         today: "Hoxe"
+        other_periods: "ver arriba:"
+    browser_update: 'Desafortunadamente, <a href="https://www.discourse.org/faq/#browser"> o seu navegador é demasiado vello para traballar neste sitio</a>. Por favor, <a href="https://browsehappy.com">actualice o seu navegador</a> para ver contido enriquecido, iniciar sesión e responder.'
     permission_types:
       full: "Crear / Responder / Ver"
       create_post: "Responder / Ver"
@@ -2621,6 +3153,7 @@ gl:
       download: "descargar"
       previous: "Anterior (tecla de frecha cara á esquerda)"
       next: "Seguinte (tecla de frecha cara á dereita)"
+      counter: "%curr% de %total%"
       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.'
@@ -2636,20 +3169,23 @@ gl:
         home: "%{shortcut} Inicio"
         latest: "%{shortcut} Último"
         new: "%{shortcut} Novo"
-        unread: "%{shortcut} Sen ler"
+        unread: "%{shortcut} Pendentes de lectura"
         categories: "%{shortcut} Categorías"
         top: "%{shortcut} Arriba"
         bookmarks: "%{shortcut} Marcadores"
         profile: "%{shortcut} Perfil"
         messages: "%{shortcut} Mensaxes"
         drafts: "%{shortcut} Borradores"
+        next: "%{shortcut} Seguinte tema"
+        previous: "%{shortcut} Tema anterior"
       navigation:
         title: "Navegación"
         jump: "%{shortcut} Ir á publicación #"
         back: "%{shortcut} Volver"
         up_down: "%{shortcut} Mover selección &uarr; &darr;"
         open: "%{shortcut} Abrir tema seleccionado"
-        next_prev: "%{shortcut} Sección Seguinte/Anterior"
+        next_prev: "%{shortcut} Sección seguinte/anterior"
+        go_to_unread_post: "%{shortcut} Ir á primeira publicación pendente de lectura"
       application:
         title: "Aplicativo"
         create: "%{shortcut} Crear un novo tema"
@@ -2659,7 +3195,7 @@ gl:
         show_incoming_updated_topics: "%{shortcut} Amosar temas actualizados"
         search: "%{shortcut} Buscar"
         help: "%{shortcut} Abrir a axuda do teclado"
-        dismiss_new_posts: "%{shortcut} Desbotar Novas/Publicacións"
+        dismiss_new_posts: "%{shortcut} Desbotar novos/publicacións"
         dismiss_topics: "%{shortcut} Desbotar temas"
         log_out: "%{shortcut} Saír da sesión"
       composing:
@@ -2667,54 +3203,65 @@ gl:
         return: "%{shortcut} Volver ao panel de composición"
         fullscreen: "%{shortcut} Panel de composición en pantalla completa"
       bookmarks:
+        title: "Marcadores"
         enter: "%{shortcut} Gardar e pechar"
+        later_today: "%{shortcut} Hoxe pero despois"
+        later_this_week: "%{shortcut} Esta semana pero despois"
         tomorrow: "%{shortcut} Mañá"
         next_week: "%{shortcut} A vindeira semana"
         next_month: "%{shortcut} O vindeiro mes"
-        next_business_day: "%{shortcut} O vindeiro día laborable"
+        next_business_week: "%{shortcut} A principios da próxima semana"
+        next_business_day: "%{shortcut} O vindeiro día laborábel"
         custom: "%{shortcut} Personalizar data e hora"
         none: "%{shortcut} Sen recordatorio"
         delete: "%{shortcut} Eliminar marcador"
       actions:
         title: "Accións"
-        bookmark_topic: "%{shortcut} Cambiar marcar tema"
-        pin_unpin_topic: "%{shortcut} Pegar/Despegar tema"
+        bookmark_topic: "%{shortcut} Trocar marcar tema"
+        pin_unpin_topic: "%{shortcut} Fixar/Desprender tema"
         share_topic: "%{shortcut} Compartir tema"
         share_post: "%{shortcut} Compartir publicación"
         reply_as_new_topic: "%{shortcut} Responder como tema ligado"
-        reply_topic: "%{shortcut} Responder o tema"
-        reply_post: "%{shortcut} Responder a publicación"
-        quote_post: "%{shortcut} Citar publicación"
+        reply_topic: "%{shortcut} Responder no tema"
+        reply_post: "%{shortcut} Responder na publicación"
+        quote_post: "%{shortcut} Citar a publicación"
         like: "%{shortcut} Gústame a publicación"
-        flag: "%{shortcut} Denunciar publicación"
-        bookmark: "%{shortcut} Marcar publicación"
-        edit: "%{shortcut} Editar publicación"
-        delete: "%{shortcut} Eliminar publicación"
-        mark_muted: "%{shortcut} Silenciar tema"
+        flag: "%{shortcut} Sinalar a publicación"
+        bookmark: "%{shortcut} Marcar a publicación"
+        edit: "%{shortcut} Editar a publicación"
+        delete: "%{shortcut} Eliminar a publicación"
+        mark_muted: "%{shortcut} Silenciar o tema"
         mark_regular: "%{shortcut} Tema normal (predeterminado)"
-        mark_tracking: "%{shortcut} Seguir tema"
-        mark_watching: "%{shortcut} Ver tema"
-        print: "%{shortcut} Imprimir tema"
+        mark_tracking: "%{shortcut} Seguir o tema"
+        mark_watching: "%{shortcut} Ver o tema"
+        print: "%{shortcut} Imprimir o tema"
+        defer: "%{shortcut} Adiar o tema"
+        topic_admin_actions: "%{shortcut} Abrir intervencións do admin no tema"
       search_menu:
         title: "Menú de busca"
+        prev_next: "%{shortcut} Mover a selección arriba e abaixo"
         insert_url: "%{shortcut} Introducir selección no panel de composición"
     badges:
       earned_n_times:
-        one: "Conseguiu esta insignia %{count} vez"
-        other: "Conseguiu esta insignia %{count} veces"
+        one: "Gañou esta insignia %{count} vez"
+        other: "Gañou esta insignia %{count} veces"
       granted_on: "Concedida %{date}"
-      others_count: "Máis con esta insignia (%{count})"
+      others_count: "Outros con esta insignia (%{count})"
       title: Insignias
-      allow_title: "Podes usar esta insignia como título"
-      multiple_grant: "Podes conseguila múltiples veces"
+      allow_title: "Pode usar esta insignia como título"
+      multiple_grant: "Pode gañala múltiples veces"
       badge_count:
         one: "%{count} insignia"
         other: "%{count} insignias"
+      more_badges:
+        one: "+%{count} Máis"
+        other: "+%{count} Máis"
       granted:
         one: "%{count} concedida"
         other: "%{count} concedidas"
-      select_badge_for_title: Selecciona insignia para usar como o teu título
-      none: "(ningún)"
+      select_badge_for_title: Seleccione unha insignia que usará como título
+      none: "(ningunha)"
+      successfully_granted: "Concedeuse %{badge} a %{username} correctamente"
       badge_grouping:
         getting_started:
           name: Comezar
@@ -2736,61 +3283,78 @@ gl:
       choose_for_topic: "etiquetas opcionais"
       info: "Información"
       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."
+      category_restricted: "Esta etiqueta restrínxese ás categorías ás que non ten permiso para acceder."
       synonyms: "Sinónimos"
       synonyms_description: "Cando se usen as seguintes etiquetas, substituílas por <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'Esta etiqueta pertence ao grupo "%{tag_groups}".'
-        other: "Esta etiqueta pertence a estes grupos: %{tag_groups}."
+        one: 'Esta etiqueta pertence ao grupo «%{tag_groups}».'
+        other: "Esta etiqueta pertence a estes grupos: «%{tag_groups}»."
       category_restrictions:
-        one: "Só pode usarse nesta categoría"
-        other: "Só pode usarse nestas categorías: "
+        one: "Só pode usarse nesta categoría:"
+        other: "Só pode usarse nestas categorías:"
       edit_synonyms: "Xestionar sinónimos"
       add_synonyms_label: "Engadir sinónimos:"
       add_synonyms: "Engadir"
-      add_synonyms_failed: "Non se puido engadir as seguintes etiquetas como sinónimos: <b>%{tag_names}</b>. Comproba que non teñan sinónimos asociados e non figuren como sinónimos doutra etiqueta."
-      remove_synonym: "Eliminar sinónimo"
-      delete_synonym_confirm: 'Confirmas a eliminación do sinónimo "%{tag_name}"?'
+      add_synonyms_explanation:
+        one: "Calquera lugar que use esta etiqueta cambiarase para que use <b>%{tag_name}</b> . Seguro que quere facer este cambio?"
+        other: "Calquera lugar que use actualmente estas etiquetas cambiarase para que use <b>%{tag_name}</b> . Seguro que quere facer este cambio?"
+      add_synonyms_failed: "Non se puido engadir as seguintes etiquetas como sinónimos: <b>%{tag_names}</b>. Comprobe que non teñan sinónimos asociados e non figuren como sinónimos doutra etiqueta."
+      remove_synonym: "Retirar o sinónimo"
+      delete_synonym_confirm: 'Confirma a eliminación do sinónimo «%{tag_name}»?'
       delete_tag: "Eliminar etiqueta"
-      delete_confirm_no_topics: "Confirmas a eliminación desta etiqueta?"
+      delete_confirm:
+        one: "Está seguro de que quere eliminar esta etiqueta e retirala de %{count} tema ao que está asignada?"
+        other: "Está seguro de que quere eliminar esta etiqueta e retirala de %{count} temas aos que está asignada?"
+      delete_confirm_no_topics: "Confirma a eliminación desta etiqueta?"
       delete_confirm_synonyms:
         one: "Tamén se eliminará o seu sinónimo."
         other: "Tamén se eliminarán os seus %{count} sinónimos."
       rename_tag: "Renomear etiqueta"
-      rename_instructions: "Selecciona un novo nome para a etiqueta:"
+      rename_instructions: "Seleccione un novo nome para a etiqueta:"
       sort_by: "Ordenar por:"
       sort_by_count: "número"
       sort_by_name: "nome"
       manage_groups: "Xestionar grupos de etiquetas"
       manage_groups_description: "Estabelecer grupos para organizar etiquetas"
+      upload: "Cargar etiquetas"
+      upload_description: "Cargar un ficheiro csv para crear etiquetas en lote"
+      upload_instructions: "Unha por liña, opcionalmente cun grupo de etiquetas co formato «etiqueta_nome, etiqueta_grupo»."
+      upload_successful: "Etiquetas cargadas correctamente"
       delete_unused_confirmation:
-        one: " Eliminarase %{count}etiqueta: %{tags}"
+        one: "Será(n) eliminada(s) %{count}etiqueta(s): %{tags}"
         other: "Eliminaranse %{count}etiquetas: %{tags}"
       delete_unused_confirmation_more_tags:
         one: "%{tags} e %{count} máis"
         other: "%{tags} e %{count} máis"
+      delete_no_unused_tags: "Non hai etiquetas sen usar."
+      tag_list_joiner: ", "
       delete_unused: "Eliminar etiquetas sen usar"
       delete_unused_description: "Eliminar todas as etiquetas que non estean asociadas a ningún tema ou mensaxe privada"
       cancel_delete_unused: "Cancelar"
+      filters:
+        without_category: "%{filter} %{tag} temas"
+        with_category: "%{filter}%{tag} temas en %{category}"
+        untagged_without_category: "%{filter} temas sen etiquetar"
+        untagged_with_category: "%{filter} temas sen etiquetar en %{category}"
       notifications:
         watching:
-          title: "Ver"
-          description: "Verás automaticamente todos os temas con esta etiquetas. Recibirás notificacións de todas as novas publicacións e temas e o número de publicacións novas e pendentes de ler aparecerá preto do tema."
+          title: "Observando"
+          description: "Pasará a observar automaticamente todos os temas con esta etiquetas. Recibirá notificacións de todas as novas publicacións e temas e o número de publicacións novas e pendentes de ler aparecerá preto do tema."
         watching_first_post:
-          title: "Vendo publicación inicial"
-          description: "Recibirás notificacións dos novos temas nesta etiqueta pero non das respostas."
+          title: "Observando a publicación inicial"
+          description: "Recibirá notificacións dos novos temas nesta etiqueta pero non das respostas."
         tracking:
           title: "Seguimento"
-          description: "Seguirás automaticamente todos os temas con esta etiqueta. O número de publicacións novas e pendentes de ler aparecerá preto do tema."
+          description: "Pasará a seguir automaticamente todos os temas con esta etiqueta. O número de publicacións novas e pendentes de ler aparecerá preto do tema."
         regular:
           title: "Normal"
-          description: "Recibirás notificacións se alguén menciona o teu @nome ou responde á túa publicación."
+          description: "Pasará a recibir notificacións se alguén menciona o seu @nome ou responde á súa publicación."
         muted:
           title: "Silenciado"
-          description: "Non recibirás notificacións de nada relacionado cos novos temas con esta etiqueta e non aparecerán no separador de elementos pendentes de ler."
+          description: "Non recibirá notificacións de nada relacionado cos novos temas con esta etiqueta e non aparecerán no separador de elementos pendentes de ler."
       groups:
         title: "Etiquetar grupos"
-        about: "Engade etiquetas aos grupos para xestionalos con maior facilidade."
+        about: "Engádalles etiquetas aos grupos para xestionalos con maior facilidade."
         new: "Novo grupo"
         tags_label: "Etiquetas neste grupo:"
         parent_tag_label: "Etiqueta primaria:"
@@ -2800,87 +3364,118 @@ gl:
         name_placeholder: "Nome do grupo de etiquetas"
         save: "Gardar"
         delete: "Eliminar"
-        confirm_delete: "Confirmas a eliminación deste grupo de etiquetas?"
+        confirm_delete: "Confirma a eliminación deste grupo de etiquetas?"
         everyone_can_use: "Todos poden usar as etiquetas"
+        usable_only_by_groups: "As etiquetas son visíbeis para todos, pero só os seguintes grupos poden usalas"
+        visible_only_to_groups: "As etiquetas só son visíbeis para os seguintes grupos"
       topics:
         none:
-          unread: "Non tes temas sen ler."
-          new: "Non tes novos temas."
-          read: "Aínda non liches ningún tema."
-          posted: "Aínda non publicaches en ningún tema."
-          bookmarks: "Aínda non marcaches este tema."
+          unread: "Non ten temas sen ler."
+          new: "Non ten novos temas."
+          read: "Aínda non leu ningún tema."
+          posted: "Aínda non publicou en ningún tema."
+          latest: "Non hai últimos temas."
+          bookmarks: "Aínda non marcou este tema."
           top: "Non hai temas destacados."
     invite:
-      custom_message: "Podes facer o convite un pouco máis persoal escribindo unha  <a href>mensaxe personalizada</a>."
-      custom_message_placeholder: "Escribe a túa mensaxe personalizada"
-      custom_message_template_forum: "Oes, únete a este foro!"
-      custom_message_template_topic: "Oes, vaiche gustar este tema!"
+      custom_message: "Pode facer o convite un pouco máis persoal escribindo unha <a href>mensaxe personalizada</a>."
+      custom_message_placeholder: "Escriba a súa mensaxe personalizada"
+      approval_not_required: "O usuario será aprobado axiña que acepte esta invitación."
+      custom_message_template_forum: "Mire, podería participar neste foro!"
+      custom_message_template_topic: "Mire, vaille gustar este tema!"
+    forced_anonymous: "Debido á carga extrema, amosaráselle isto temporalmente a calquera, de modo que ata un usuario sen sesión podería velo."
+    forced_anonymous_login_required: "O sitio está baixo carga extrema e non se pode cargar neste intre. Ténteo de novo nuns minutos."
     footer_nav:
       back: "Atrás"
       forward: "Reenviar"
       share: "Compartir"
       dismiss: "Desbotar"
     safe_mode:
-      enabled: "O modo seguro está activado. Para saír do modo seguro pecha esta ventá do navegador."
+      enabled: "O modo seguro está activado; para saír do modo seguro peche esta xanela do navegador"
+    image_removed: "(imaxe retirada)"
+    do_not_disturb:
+      title: "Non molestar durante..."
+      label: "Non molestar"
+      remaining: "queda %{remaining}"
+      options:
+        half_hour: "30 minutos"
+        one_hour: "1 hora"
+        two_hours: "2 horas"
+        tomorrow: "Ata mañá"
+        custom: "Personalizado"
+      set_schedule: "Estabelecer un calendario de notificacións"
   admin_js:
-    type_to_filter: "escribe para filtrar..."
+    type_to_filter: "escriba para filtrar..."
     admin:
       title: "Administrador de Discourse"
       moderator: "Moderador"
       tags:
         remove_muted_tags_from_latest:
           always: "sempre"
+          only_muted: "cando se usa só ou con outras etiquetas silenciadas"
           never: "nunca"
       reports:
-        title: "Lista dos informes dispoñíbeis"
+        title: "Listaxe dos informes dispoñíbeis"
       dashboard:
         title: "Panel"
         last_updated: "Actualización do panel:"
         discourse_last_updated: "Actualización de Discourse:"
         version: "Versión"
-        up_to_date: "Estás actualizado."
+        up_to_date: "Está actualizado/a!"
         critical_available: "Está dispoñíbel unha actualización crítica."
         updates_available: "Hai actualizacións dispoñíbeis."
-        please_upgrade: "Por favor actualiza."
-        no_check_performed: "Non se efectuou unha busca de actualizacións. Asegúrate de que sidekiq está executándose."
-        stale_data: "Non se efectuou unha busca de actualizacións ultimamente. Asegúrate de que sidekiq está executándose."
-        version_check_pending: "Parece que actualizaches recentemente. Caralludo!"
+        please_upgrade: "Por favor, actualice!"
+        no_check_performed: "Non se efectuou unha busca de actualizacións. Asegúrese de que sidekiq está executándose."
+        stale_data: "Non se efectuou unha busca de actualizacións ultimamente. Asegúrese de que sidekiq está executándose."
+        version_check_pending: "Parece que actualizou recentemente. Caralludo!"
         installed_version: "Instalado"
         latest_version: "Últimos"
+        problems_found: "Algúns consellos baseados na súa configuración actual do sitio"
+        new_features:
+          title: "Novas funcionalidades"
+          dismiss: "Desbotar"
+          learn_more: "Saber máis"
         last_checked: "Última comprobación"
         refresh_problems: "Actualizar"
         no_problems: "Non se atoparon problemas."
         moderators: "Moderadores:"
         admins: "Administradores:"
+        silenced: "Silenciado:"
         suspended: "Suspendidos:"
         private_messages_short: "Mensaxes"
         private_messages_title: "Mensaxes"
         mobile_title: "Móbil"
         space_used: "%{usedSize} usados"
         space_used_and_free: "%{usedSize} (%{freeSize} libres)"
+        uploads: "Cargas"
         backups: "Copias de seguranza"
         backup_count:
-          one: "%{count} copia de seguranza en %{location}"
-          other: "%{count} copias de seguranza en %{location}"
+          one: "%{count} copia en %{location}"
+          other: "%{count} copias en %{location}"
+        lastest_backup: "Últimas: %{date}"
         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"
+        community_health: Saúde da comunidade
         moderators_activity: Actividade dos moderadores
-        whats_new_in_discourse: Novidades en Discourse
+        whats_new_in_discourse: Novidades do Discourse?
+        activity_metrics: Métricas de actividade
         all_reports: "Todos os informes"
         general_tab: "Xeral"
         moderation_tab: "Moderación"
         security_tab: "Seguranza"
         reports_tab: "Informes"
+        report_filter_any: "calquera"
         disabled: Desactivado
-        timeout_error: Sentímolo, pero a consulta está demorando moito. Escolle un intervalo máis curto
+        timeout_error: Sentímolo, pero a consulta está demorando moito. Escolla un intervalo máis curto
         exception_error: Sentímolo pero produciuse un erro ao executar a consulta
-        too_many_requests: Executaches esta acción demasiadas veces. Agarda antes de volvelo tentar.
+        too_many_requests: Executou esta acción demasiadas veces. Agarde antes de volvelo tentar.
         not_found_error: Sentímolo pero o informe non existe
         filter_reports: Filtrar informes
         reports:
+          trend_title: "Cambio do %{percent}. Actualmente %{current}, era %{prev} no período anterior."
           today: "Hoxe"
           yesterday: "Onte"
           last_7_days: "Últimos 7"
@@ -2890,10 +3485,17 @@ gl:
           30_days_ago: "Hai 30 días"
           all: "Todo"
           view_table: "táboa"
+          view_graph: "gráfica"
           refresh_report: "Actualizar informe"
+          daily: Diario
+          monthly: Mensual
+          weekly: Semanal
           dates: "Datas (UTC)"
           groups: "Todos os grupos"
-          disabled: "Este informe está deshabilitado"
+          disabled: "Este informe está desactivado"
+          totals_for_sample: "Totais por mostra"
+          average_for_sample: "Media por mostra"
+          total: "Total global"
           no_data: "Non hai datos que amosar."
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">Buscar rexistros</a>'
@@ -2908,7 +3510,7 @@ gl:
             include_subcategories:
               label: "Incluír subcategorías"
       commits:
-        latest_changes: "Últimos cambios: por favor, actualiza a miúdo."
+        latest_changes: "Últimos cambios: por favor, actualice con frecuencia!"
         by: "por"
       groups:
         new:
@@ -2921,34 +3523,35 @@ gl:
             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"
-          complete_users_not_added: "Non se engadiron estes usuarios (comproba que teñan unha conta):"
-          paste: "Pegar unha lista de nomes de usuario ou correos-e, un por liña:"
         add_members:
           as_owner: "Estabelecer usuario(s) como propietario(s) deste grupo"
         manage:
           interaction:
             email: Correo electrónico
             incoming_email: "Personalizar enderezos de correo-e entrantes"
-            incoming_email_placeholder: "introducir enderezos de correo-e"
+            incoming_email_placeholder: "introducir enderezos de correo"
             visibility: Visibilidade
             visibility_levels:
               title: "Quen pode ver este grupo?"
               public: "Todos"
               logged_on_users: "Usuarios conectados"
+              members: "Grupo de propietarios, membros e moderadores"
+              staff: "Grupo de propietarios e moderadores"
               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."
+            publish_read_state: "Publicar nas mensaxes de grupo o estado de lectura de grupo"
           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:"
-            automatic_membership_user_count: "%{count} usuarios teñen novos dominios de correo electrónico e serán engadidos ao grupo."
+            automatic_membership_user_count:
+              one: "%{count} usuario ten novos dominios de correo electrónico e engadiranse ao grupo."
+              other: "%{count} usuarios teñen novos dominios de correo electrónico e engadiranse grupo."
             primary_group: "Estabelecer automaticamente como grupo primario"
         name_placeholder: "Nome do grupo sen espazos, como na regra do nome do usuario"
         primary: "Grupo primario"
@@ -2956,11 +3559,15 @@ gl:
         title: "Grupos"
         edit: "Editar grupos"
         refresh: "Actualizar"
-        about: "Edita aquí a túa pertenza a un grupo e nomes"
+        about: "Edite aquí a súa pertenza a un grupo e nomes"
         group_members: "Membros do grupo"
         delete: "Eliminar"
         delete_confirm: "Eliminar este grupo?"
+        delete_with_messages_confirm:
+          one: "Se elimina este grupo, quedará orfa %{count} mensaxe, os membros do grupo xa non terán acceso a ela.<br><br>Está seguro?"
+          other: "Se elimina este grupo, quedarán orfas %{count} mensaxes, os membros do grupo xa non terán acceso a elas.<br><br>Está seguro?"
         delete_failed: "Non é posíbel eliminar o grupo. Se este é un grupo automático, non se pode destruír."
+        delete_automatic_group: Este é un grupo automático e non se pode eliminar.
         delete_owner_confirm: "Eliminar os privilexios de usuario de «%{username}»?"
         add: "Engadir"
         custom: "Personalizar"
@@ -2979,35 +3586,91 @@ gl:
         key: "Chave"
         created: Creado
         updated: Actualizado
+        last_used: Último utilizado
         never_used: (nunca)
         generate: "Xerar"
+        undo_revoke: "Desfacer revogar"
         revoke: "Revogar"
         all_users: "Todos os usuarios"
+        active_keys: "Claves activas da API"
         manage_keys: Xestionar chaves
         show_details: Detalles
         description: Descrición
         no_description: (sen descrición)
+        all_api_keys: Todas as claves da API
         user_mode: Nivel de usuario
         impersonate_all_users: Suplantar calquera usuario
+        single_user: "Usuario único"
         user_placeholder: Escribe un nome de usuario
         description_placeholder: Para que se usa esta chave?
         save: Gardar
+        new_key: Nova clave API
         revoked: Revogada
+        delete: Eliminar definitivamente
+        not_shown_again: Esta clave non se amosará de novo. Asegúrese de ter unha copia antes de continuar.
         continue: Continuar
+        use_global_key: Clave global (permite todas as accións)
+        scopes:
+          description: |
+            Ao utilizar ámbitos, pode restrinxir unha clave API a un conxunto específico de resultados.
+            Tamén pode definir que parámetros se permitirán. Utilice comas para separar varios valores.
+          title: Ámbitos
+          resource: Recurso
+          action: Acción
+          allowed_parameters: Parámetros permitidos
+          optional_allowed_parameters: Parámetros permitidos (opcional)
+          any_parameter: (calquera parámetro)
+          allowed_urls: URL permitidos
+          descriptions:
+            topics:
+              read: Ler un tema ou unha publicación específica nel. O RSS tamén é compatíbel.
+              write: Crear un tema novo ou publicalo nun xa existente.
+              read_lists: Ler listaxes de temas como importantes, novos, últimos, etc. Tamén se admite RSS.
+              wordpress: Necesario para que funcione o complemento wp-discourse de WordPress.
+            users:
+              bookmarks: Listar os marcadores do usuario. Devolve recordatorios de marcadores ao usaren o formato ICS.
+              sync_sso: Sincronizar un usuario usando SSO.
+              show: Obter información sobre un usuario.
+              check_emails: Listar os enderezos de correo dos usuarios.
+              update: Actualizar a información do perfil de usuario.
+              log_out: Cerrar todas a sesións dun usuario.
+              anonymize: Anonimizar as contas de usuario.
+              delete: Eliminar contas de usuario.
+            email:
+              receive_emails: Combinar este ámbito co receptor de correo para procesar as mensaxes de correos entrantes.
       web_hooks:
+        title: "Enganches de web (webhooks)"
+        none: "Non hai enganches de web neste momento."
+        instruction: "Os enganches de web permiten que Discourse notifique a servizos externos se sucede certo evento no seu sitio. Cando se dispara o enganche de web, enviarase unha petición POST ao URL fornecido."
+        detailed_instruction: "Enviarase unha petición POST ao URL proporcionado se sucede o evento escollido."
+        new: "Novo enganche de web"
         create: "Crear"
         save: "Gardar"
         destroy: "Eliminar"
         description: "Descrición"
         controls: "Controis"
         go_back: "Volver á lista"
-        secret_invalid: "O segredo non pode conter caracteres en branco."
-        secret_too_short: "O segredo debe conter como mínimo 12 caracteres."
-        event_type_missing: "Debes estabelecer ao menos un tipo de evento."
+        payload_url: "URL que carga"
+        payload_url_placeholder: "https://example.com/postreceive"
+        secret_invalid: "A clave secreta non pode conter caracteres en branco."
+        secret_too_short: "A clave secreta debe conter como mínimo 12 caracteres."
+        secret_placeholder: "Unha cadea opcional, utilizada para xerar sinatura"
+        event_type_missing: "Debe estabelecer polo menos un tipo de evento."
         content_type: "Tipo de contido"
-        secret: "Segredo"
-        individual_event: "Selecciona eventos individuais."
+        secret: "Clave secreta"
+        event_chooser: "Que eventos deben disparar este enganche de web?"
+        wildcard_event: "Envíemo todo."
+        individual_event: "Seleccione eventos individuais."
+        verify_certificate: "Comprobe o certificado TLS do enderezo que carga"
         active: "Activo"
+        active_notice: "Entregaremos os detalles do evento cando suceda."
+        categories_filter_instructions: "Os enganches de web relevantes só se dispararán se o evento está relacionado con categorías específicas. Déixeo en branco para disparar enganches de web en todas as categorías."
+        categories_filter: "Categorías disparadas"
+        tags_filter_instructions: "Os enganches de web relevantes soamente se dispararán se o evento está relacionado con etiquetas específicas. Déixeo en branco para que os enganches de web se disparen con calquera etiqueta."
+        tags_filter: "Etiquetas disparadas"
+        groups_filter_instructions: "Os enganches de web relevantes soamente se dispararán se o evento está relacionado con grupos específicos. Déixeo en branco para que os enganches de web se disparen con calquera grupo."
+        groups_filter: "Grupos disparados"
+        delete_confirm: "Eliminar este enganche de web?"
         topic_event:
           name: "Evento de tema"
           details: "Cando se publica, revisa, cambia ou elimina un novo tema."
@@ -3016,7 +3679,6 @@ gl:
           details: "Cando se publica, cambia, elimina ou recupera unha nova resposta."
         user_event:
           name: "Evento de usuario"
-          details: "Cando se inicia ou pecha a sesión, así como cando se crea, aproba ou actualiza un usuario."
         group_event:
           name: "Evento de grupo"
           details: "Cando se crea, actualiza ou destrúe un grupo."
@@ -3039,103 +3701,113 @@ gl:
           title: "Estado de entrega"
           inactive: "Inactivo"
           failed: "Fallou"
+          successful: "Feito"
           disabled: "Desactivado"
         events:
           none: "Non hai eventos relacionados."
+          redeliver: "Volver entregar"
           incoming:
             one: "Hai un evento novo."
             other: "Hai %{count} eventos novos."
           completed_in:
-            one: "Completado nun %{count} segundo."
+            one: "Completado en %{count} segundo."
             other: "Completado en %{count} segundos."
           request: "Petición"
+          response: "Resposta"
+          redeliver_confirm: "Confirma que quere volver entregar a mesma carga?"
           headers: "Cabeceiras"
+          payload: "Datos de carga"
           body: "Corpo"
-          go_list: "Ir á lista"
+          go_list: "Ir á listaxe"
+          go_details: "Editar enganche de web "
           go_events: "Ir a eventos"
+          ping: "Ping"
           status: "Código de estado"
           event_id: "ID"
           timestamp: "Creado"
+          completion: "Tempo para completar"
           actions: "Accións"
       plugins:
-        title: "Plugins"
-        installed: "Plugins instalados"
+        title: "Complementos"
+        installed: "Complementos instalados"
         name: "Nome"
-        none_installed: "Non tes ningún plugin instalado."
+        none_installed: "Non ten ningún complemento instalado."
         version: "Versión"
         enabled: "Activado?"
         is_enabled: "S"
         not_enabled: "N"
-        change_settings: "Cambiar axustes"
-        change_settings_short: "Axustes"
-        howto: "Como podo instalar un plugin?"
+        change_settings: "Cambiar a configuración"
+        change_settings_short: "Configuración"
+        howto: "Como podo instalar un complemento?"
+        official: "Complemento oficial"
       backups:
         title: "Copias de seguranza"
         menu:
           backups: "Copias de seguranza"
           logs: "Rexistros"
-        none: "Non hai copia de seguranza dispoñíbel"
+        none: "Non hai copia de seguranza dispoñíbel."
         read_only:
           enable:
-            title: "Activar modo de só-lectura"
-            label: "Activar só-lectura"
-            confirm: "Confirmas a activación do modo de só-lectura?"
+            title: "Activar modo que só permite lectura"
+            label: "Activar o permitir só lectura"
+            confirm: "Confirma a activación do modo que só permite lectura?"
           disable:
-            title: "Desactivar modo de só-lectura"
-            label: "Desactivar só-lectura"
+            title: "Desactivar modo que só permite lectura"
+            label: "Desactivar o permitir só lectura"
         logs:
           none: "Aínda non hai rexistros..."
         columns:
           filename: "Nome do ficheiro"
           size: "Tamaño"
         upload:
-          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}"
+          label: "Cargar"
+          title: "Cargar unha copia de seguranza a esta instancia"
+          uploading: "Cargando..."
+          uploading_progress: "Cargando... %{progress}%"
+          success: "Cargouse correctamente «%{filename}». O ficheiro está agora sendo procesado e tardará ata un minuto en aparecer na lista."
+          error: "Produciuse un erro durante a carga de «%{filename}»: %{message}"
         operations:
           is_running: "Estase executando unha operación..."
           failed: "Produciuse un fallo %{operation} . Revisa os rexistros."
           cancel:
             label: "Cancelar"
             title: "Cancelar a operación actual"
-            confirm: "Confirmas a cancelación da operación actual?"
+            confirm: "Confirma a cancelación da operación actual?"
           backup:
             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)"
+            confirm: "Confirma a execución dunha nova copia de seguranza?"
+            without_uploads: "Si (non incluír as cargas)"
           download:
             label: "Descargar"
             title: "Enviar correo electrónico coa ligazón de descarga"
-            alert: "Recibiches un correo electrónico coa ligazón para descargar esta copia de seguranza."
+            alert: "Recibiu un correo electrónico coa ligazón para descargar esta copia de seguranza."
           destroy:
             title: "Eliminar a copia de seguranza"
-            confirm: "Confirmas a destrución desta copia de seguranza?"
+            confirm: "Confirma a destrución desta copia de seguranza?"
           restore:
-            is_disabled: "«Restabelecer» está desactivado nos axustes do sitio."
+            is_disabled: "«Restabelecer» está desactivado na configuración do sitio."
             label: "Restabelecer"
             title: "Restabelecer a copia de seguranza"
-            confirm: "Confirmas a restauración desta copia de seguranza?"
+            confirm: "Confirma a restauración desta copia de seguranza?"
           rollback:
             label: "Reverter"
             title: "Reverter a base de datos ao estado de funcionamento anterior"
-            confirm: "Confirmas a reversión da base de datos ao estado de funcionamento anterior?"
+            confirm: "Confirma a reversión da base de datos ao estado de funcionamento anterior?"
         location:
-          local: "Almacenamento local"
+          local: "Almacén local"
           s3: "S3"
         backup_storage_error: "Erro ao acceder ao almacenamento da copia de seguranza: %{error_message}"
       export_csv:
-        success: "Iniciouse a exportación, notificarémosche cunha mensaxe o remate do proceso."
-        failed: "Produciuse un fallo na exportación. Comproba os rexistros."
+        success: "Iniciouse a exportación, notificarémoslle cunha mensaxe o remate do proceso."
+        failed: "Produciuse un fallo na exportación. Comprobe os rexistros."
         button_text: "Exportar"
         button_title:
-          user: "Exportar a lista completa de usuarios en formato CSV."
+          user: "Exportar a listaxe completa de usuarios en formato CSV."
           staff_action: "Exportar o rexistro con todas as accións do equipo en formato CSV."
-          screened_email: "Exportar a lista de correos-e controlados en formato CSV."
-          screened_ip: "Exportar a lista de IP controladas en formato CSV."
-          screened_url: "Exportar a lista de URL controladas en formato CSV."
+          screened_email: "Exportar a lista de correos controlados en formato CSV."
+          screened_ip: "Exportar a lista de IP controlados en formato CSV."
+          screened_url: "Exportar a lista de URL controlados en formato CSV."
       export_json:
         button_text: "Exportar"
       invite:
@@ -3144,14 +3816,14 @@ gl:
       customize:
         title: "Personalizar"
         long_title: "Personalización do sitio"
-        preview: "previsualizar"
+        preview: "visualizar"
         explain_preview: "Ver o sitio con este tema activado"
         save: "Gardar"
         new: "Novo"
         new_style: "Novo estilo"
         install: "Instalar"
         delete: "Eliminar"
-        delete_confirm: 'Confirmas a eliminación de "%{theme_name}"?'
+        delete_confirm: 'Confirma a eliminación de «%{theme_name}»?'
         color: "Cor"
         opacity: "Opacidade"
         copy: "Copiar"
@@ -3162,110 +3834,167 @@ gl:
         email_templates:
           title: "Correo electrónico"
           subject: "Asunto"
-          multiple_subjects: "Este modelo de correo-e ten varios asuntos."
+          multiple_subjects: "Este modelo de correo ten varios asuntos."
           body: "Corpo"
           revert: "Reverter os cambios"
-          revert_confirm: "Confirmas a reversión dos cambios?"
+          revert_confirm: "Confirma a reversión dos cambios?"
         theme:
           theme: "Tema"
           component: "Compoñente"
           components: "Compoñentes"
           theme_name: "Nome do tema"
           component_name: "Nome do compoñente"
-          themes_intro: "Selecciona un tema existente ou instala un novo para comezar"
-          beginners_guide_title: "Guía de uso dos temas de Discourse para principiantes"
-          developers_guide_title: "Guía de uso dos temas de Discourse para desenvolvedores"
+          themes_intro: "Seleccione un tema existente ou instale un novo para comezar"
+          themes_intro_emoji: "muller artista emoji"
+          beginners_guide_title: "Guía de uso dos temas do Discourse para principiantes"
+          developers_guide_title: "Guía de uso dos temas do Discourse para desenvolvedores"
           browse_themes: "Explorar temas da comunidade"
           customize_desc: "Personalizar:"
           title: "Temas"
           create: "Crear"
           create_type: "Tipo"
           create_name: "Nome"
+          long_title: "Mudar as cores, o contido CSS e HTML do seu sitio"
           edit: "Editar"
-          edit_confirm: "Este é un tema remoto. Se editas o CSS/HTML, os cambios borraranse a próxima vez que actualices o tema."
-          update_confirm: "Estes cambios locais borraranse coa actualización. Confirmas que queres continuar?"
+          edit_confirm: "Este é un tema remoto. Se editas o CSS/HTML, os cambios borraranse a próxima vez que actualice o tema."
+          update_confirm: "Estes cambios locais borraranse coa actualización. Confirma que queres continuar?"
           update_confirm_yes: "Si, continuar coa actualización"
+          common: "Común"
+          desktop: "Escritorio"
           mobile: "Móbil"
-          settings: "Axustes"
+          settings: "Configuración"
           translations: "Traducións"
+          extra_scss: "SCSS extra"
+          extra_files: "Ficheiros extra"
           extra_files_upload: "Exportar tema para ver estes ficheiros."
+          extra_files_remote: "Exportar o tema ou comprobar o repositorio git para ver estes ficheiros."
           preview: "Previsualizar"
-          show_advanced: "Mostrar campos avanzados"
+          show_advanced: "Amosar campos avanzados"
           hide_advanced: "Ocultar campos avanzados"
-          hide_unused_fields: "Ocultar campos non usados"
-          is_default: "O tema está activado por defecto"
+          hide_unused_fields: "Agochar campos non usados"
+          is_default: "O tema está activado de modo predeterminado"
           user_selectable: "O tema pode ser seleccionado polos usuarios"
+          color_scheme_user_selectable: "O esquema de cor pode ser seleccionado polos usuarios"
+          auto_update: "Actualización automática cando Discourse estea actualizado"
           color_scheme: "Paleta de cores"
-          color_scheme_select: "Selecciona as cores que queres usar no tema"
+          default_light_scheme: "Claro (predeterminado)"
+          color_scheme_select: "Seleccione as cores que quere utilizar no tema"
           custom_sections: "Seccións personalizadas:"
           theme_components: "Compoñentes do tema"
           add_all_themes: "Engadir todos os temas"
           convert: "Converter"
+          convert_component_alert: "Confirma a conversión deste compoñente como tema? Deixará de ser un compoñente de %{relatives}."
           convert_component_tooltip: "Converter este compoñente nun tema"
-          convert_theme_alert: "Confirmas a conversión deste tema nun compoñente? Deixará de ser unha categoría primaria para %{relatives}."
+          convert_component_alert_generic: "Confirma que quere converter este compoñente en tema?"
+          convert_theme_alert: "Confirma a conversión deste tema nun compoñente? Deixará de ser unha categoría primaria para %{relatives}."
+          convert_theme_alert_generic: "Confirma que quere converter este tema en compoñente?"
           convert_theme_tooltip: "Converter este tema nun compoñente"
           inactive_themes: "Temas inactivos:"
-          inactive_components: "Compoñentes non usados:"
+          inactive_components: "Compoñentes non utilizados:"
           broken_theme_tooltip: "Este tema ten erros no CSS, HTML ou YAML"
-          disabled_component_tooltip: "Este compoñente foi deshabilitado"
+          disabled_component_tooltip: "Este compoñente foi desactivado"
           default_theme_tooltip: "Este tema é o predeterminado do sitio"
-          updates_available_tooltip: "Hai actualizacións dispoñibles para este tema"
+          updates_available_tooltip: "Hai actualizacións dispoñíbeis para este tema"
           and_x_more: "e %{count} máis."
           collapse: Reducir
-          variable_name_invalid: "O nome da variable non é válido. Só se permiten caracteres alfanuméricos. Debe comezar cunha letra. Debe ser exclusivo."
+          uploads: "Cargas"
+          no_uploads: "Pode cargar recursos asociados co seu tema como tipos de letra e imaxes"
+          add_upload: "Engadir carga"
+          upload_file_tip: "Escolla un recurso para cargar (png, woff2, etc ...)"
+          variable_name: "Nome da var SCSS:"
+          variable_name_invalid: "O nome da variábel non é correcto. Só se permiten caracteres alfanuméricos. Debe comezar cunha letra. Debe ser exclusivo."
           variable_name_error:
-            invalid_syntax: "O nome da variable non é válido. Só se permiten caracteres alfanuméricos. Debe comezar cunha letra."
-            no_overwrite: "O nome da variable non é válido. Non debe coincidir cunha variable existente."
-            must_be_unique: "O nome da variable non é válido. Debe ser exclusivo."
-          upload: "Enviar"
-          select_component: "Selecciona un compoñente..."
-          unsaved_changes_alert: "Aínda non gardaches os cambios. Queres desbotalos e continuar?"
-          unsaved_parent_themes: "Aínda non asignaches o compoñente aos temas. Queres continuar?"
+            invalid_syntax: "O nome da variábel non é correcto. Só se permiten caracteres alfanuméricos. Debe comezar cunha letra."
+            no_overwrite: "O nome da variábel non é correcto. Non debe coincidir cunha variábel existente."
+            must_be_unique: "O nome da variábel non é correcto. Debe ser exclusivo."
+          upload: "Cargar"
+          select_component: "Seleccione un compoñente..."
+          unsaved_changes_alert: "Aínda non gardou os cambios. Quere desbotalos e continuar?"
+          unsaved_parent_themes: "Aínda non asignou o compoñente aos temas. Quere continuar?"
           discard: "Desbotar"
+          stay: "Deixar"
           css_html: "Personalizar CSS/HTML"
           edit_css_html: "Editar CSS/HTML"
-          edit_css_html_help: "Non editaches ningún CSS ou HTML"
+          edit_css_html_help: "Non editou ningún CSS ou HTML"
+          delete_upload_confirm: "Eliminar esta carga? (Pode ser que o tema CSS deixe de funcionar!)"
           component_on_themes: "Incluír compoñentes nestes temas"
           included_components: "Compoñentes incluídos"
           add_all: "Engadir todos"
           import_web_tip: "Repositorio que contén o tema"
+          direct_install_tip: "Confirma que quere instalar <strong>%{name}</strong> desde o repositorio que se lista a seguir?"
           import_web_advanced: "Avanzados..."
+          import_file_tip: "Ficheiro .tar.gz, .zip ou .dcstyle.json que contén o tema"
+          is_private: "O tema está nun repositorio privado de git"
+          remote_branch: "Nome da ramificación (opcional)"
+          public_key: "Conceder á seguinte clave pública acceso ao repositorio:"
           install: "Instalar"
           installed: "Instalado"
           install_popular: "Destacados"
-          install_upload: "Desde o teu dispositivo"
+          install_upload: "Desde o seu dispositivo"
+          install_git_repo: "Desde un repositorio git"
           install_create: "Crear novo"
-          about_theme: "Sobre"
+          duplicate_remote_theme: "O compoñente do tema «%{name}» xa está instalado, confirma que quere instalar outra copia?"
+          about_theme: "Verbo de"
           license: "Licenza"
           version: "Versión:"
+          authors: "Autoría:"
           creator: "Creado por:"
+          source_url: "Fonte"
           enable: "Activar"
           disable: "Desactivar"
-          disabled: "Este compoñente foi deshabilitado."
-          disabled_by: "Este compoñente foi deshabilitado por"
+          disabled: "Este compoñente foi desactivado."
+          disabled_by: "Este compoñente foi desactivado por"
           required_version:
-            error: "Este tema foi deshabilitado automaticamente porque non é compatíbel coa versión actual de Discourse."
+            error: "Este tema foi desactivado automaticamente porque non é compatíbel coa versión actual de Discourse."
             minimum: "Require a versión %{version} de Discourse ou unha superior."
             maximum: "Require a versión %{version} de Discourse ou unha inferior."
           component_of: "Compoñente de:"
+          update_to_latest: "Actualizar o tema"
           check_for_updates: "Buscar actualizacións"
           updating: "Actualizando..."
+          up_to_date: "O tema está actualizado, última comprobación:"
+          has_overwritten_history: "A versión actual do tema xa non existe porque o historial de Git foi sobrescrito por un push forzado."
           add: "Engadir"
-          theme_settings: "Axustes do tema"
+          theme_settings: "Configuración do tema"
           no_settings: "Este tema non ten axustes."
           theme_translations: "Traducións do tema"
           empty: "Sen elementos"
+          commits_behind:
+            one: "O tema está %{count} commit por atrás!"
+            other: "O tema está %{count} commits por atrás!"
+          compare_commits: "(Ver os novos commits)"
+          remote_theme_edits: "Se quere editar este tema, debe <a href='%{repoURL}' target='_blank'> enviar un cambio a este repositorio</a>"
+          repo_unreachable: "Non se puido conectar co repositorio Git deste tema. Mensaxe de erro:"
           imported_from_archive: "Este tema foi importado dun ficheiro .zip"
           scss:
             text: "CSS"
+            title: "Escriba CSS personalizado, aceptamos todo CSS válido e estilos SCSS"
           header:
             text: "Cabeceira"
+            title: "Escriba o HTML que se presentará enriba da cabeceira do sitio"
           after_header:
             text: "Despois da cabeceira"
+            title: "Escriba HTML que se presentará en todas as páxinas despois da cabeceira do sitio"
           footer:
-            text: "Pé de páxina"
+            text: "Rodapé"
+            title: "Escriba HTML que se presentará no rodapé"
           embedded_scss:
             text: "CSS encaixado"
+            title: "Escriba CSS personalizado para entregar coa versión incorporada dos comentarios"
+          color_definitions:
+            text: "Definicións de cor"
+            title: "Escriba definicións de cor personalizadas (só para usuarios avanzados)"
+            placeholder: |2-
+
+              Utilice esta folla de estilo para engadir cores personalizadas á listaxe de propiedades CSS.
+
+              Exemplo:
+
+              :root {
+              --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};
+              }
+
+              Prefixar os nomes da propiedade resulta altamente recomendábel para evitarmos conflitos con complementos e/ou o núcleo.
           head_tag:
             text: "</head>"
             title: "HTML que se inserirá antes da etiqueta </head>"
@@ -3293,15 +4022,19 @@ gl:
           primary:
             name: "primario"
             description: "Principalmente texto, iconas e bordos."
+          primary-medium:
+            name: "primario-medio"
+          primary-low-mid:
+            name: "primario-baixo-medio"
           secondary:
             name: "secundario"
             description: "Cor principal do fondo e cor do texto dalgúns botóns."
           tertiary:
             name: "terciario"
-            description: "Ligazóns, algúns botóns, notificacións e cor de resalte."
+            description: "Ligazóns, algúns botóns, notificacións e cor de realce."
           quaternary:
             name: "cuaternario"
-            description: "Ligazóns de navegación"
+            description: "Ligazóns de navegación."
           header_background:
             name: "fondo da cabeceira"
             description: "Cor do fondo na cabeceira do sitio."
@@ -3309,53 +4042,66 @@ gl:
             name: "cabeceira primaria"
             description: "Texto e iconas na cabeceira do sitio."
           highlight:
-            name: "resaltes"
-            description: "Cor do fondo dos elementos resaltados da páxina, como publicacións e temas."
+            name: "realce"
+            description: "Cor do fondo dos elementos realzados da páxina, como publicacións e temas."
+          highlight-high:
+            name: "realzado-alto"
+          highlight-medium:
+            name: "realzado-medio"
+          highlight-low:
+            name: "realzado-baixo"
           danger:
             name: "perigo"
-            description: "Cor de resalte para accións como eliminar publicacións e temas."
+            description: "Cor de realce para accións como eliminar publicacións e temas."
           success:
             name: "correcto"
             description: "Usado para indicar que unha acción se realizou correctamente."
           love:
-            name: "gústame"
-            description: "Cor do botón Gústame."
+            name: "amor"
+            description: "Cor do botón gústame."
+        robots:
+          title: "Sobrescribir o ficheiro robots.txt do sitio:"
+          warning: "Isto sobrescribirá definitivamente calquera configuración relativa ao sitio."
+          overridden: O ficheiro predeterminado robots.txt do sitio foi sobrescrito.
         email_style:
           title: "Estilo de correo electrónico"
           heading: "Personalizar estilo de correo electrónico"
           html: "Modelo HTML"
           css: "CSS"
-          reset: "Restabelecer aos valores predeterminados"
-          reset_confirm: "Confirmas o restabelecemento de %{fieldName} aos valores predeterminados? Perderás todos os cambios."
-          save_error_with_reason: "Non se gardaron os teus cambios. %{error}"
+          reset: "Restabelecer cos valores predeterminados"
+          reset_confirm: "Confirma o restabelecemento de %{fieldName} cos valores predeterminados? Perderá todos os cambios."
+          save_error_with_reason: "Non se gardaron os seus cambios. %{error}"
+          instructions: "Personalizar o modelo co que se renderizan todos os correos html e o estilo, utilizando CSS."
       email:
-        title: "Correos electrónicos"
-        settings: "Axustes"
+        title: "Mensaxes de correo"
+        settings: "Configuración"
         templates: "Modelos"
-        preview_digest: "Previsualización do compendio"
+        preview_digest: "Visualización do compendio"
         advanced_test:
-          desc: "Coñece como Discourse procesa os correos electrónicos recibidos. Para poder procesar correctamente o correo electrónico, pega a continuación a mensaxe orixinal."
+          title: "Test avanzado"
+          desc: "Coñece como Discourse procesa as mensaxes de correo recibidas. Para poder procesar correctamente o correo electrónico, pega a continuación a mensaxe orixinal."
           email: "Mensaxe orixinal"
           run: "Executar proba"
           text: "Corpo de texto seleccionado"
-        sending_test: "Enviando correo-e de proba..."
+          elided: "Texto elidido"
+        sending_test: "Enviando mensaxe 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."
-        sent: "Enviado"
-        skipped: "Saltado"
-        bounced: "Rebotado"
-        received: "Recibidos"
-        rejected: "Rexeitado"
-        sent_at: "Enviado ás"
+        test_error: "Produciuse un problema enviando a mensaxe de proba. Revise os seus axustes de correo, comprobe que o seu servidor non está bloqueando as conexións de correo e ténteo de novo."
+        sent: "Enviada"
+        skipped: "Saltada"
+        bounced: "Rebotada"
+        received: "Recibidas"
+        rejected: "Rexeitada"
+        sent_at: "Enviada ás"
         time: "Hora"
         user: "Usuario"
-        email_type: "Tipo de correo-e"
+        email_type: "Tipo de correo"
         to_address: "Ao enderezo"
-        test_email_address: "enderezo de correo-e de proba"
-        send_test: "Enviar correo-e de proba"
-        sent_test: "enviado!"
+        test_email_address: "enderezo de mensaxe de correo de proba"
+        send_test: "Enviar mensaxe de correo de proba"
+        sent_test: "enviada!"
         delivery_method: "Método de entrega"
-        preview_digest_desc: "Previsualiza o contido dos correos-e compendio enviados a usuarios inactivos."
+        preview_digest_desc: "Visualiza o contido das mensaxes de correo e o compendio enviado a usuarios inactivos."
         refresh: "Actualizar"
         send_digest_label: "Enviar este resultado a:"
         send_digest: "Enviar"
@@ -3363,7 +4109,7 @@ gl:
         format: "Formato"
         html: "html"
         text: "texto"
-        html_preview: "Previsualización do contido do correo electrónico"
+        html_preview: "Visualizació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"
@@ -3374,14 +4120,14 @@ gl:
           cc_addresses: "Cc"
           subject: "Asunto"
           error: "Erro"
-          none: "Non se atoparon correos entrantes."
+          none: "Non se atoparon mensaxes entrantes."
           modal:
-            title: "Detalles dos correos-e entrantes"
+            title: "Detalles das mensaxes entrantes"
             error: "Erro"
             headers: "Cabeceiras"
             subject: "Asunto"
             body: "Corpo"
-            rejection_message: "Correo-e de rexeitamento"
+            rejection_message: "Mensaxe de correo de rexeitamento"
           filters:
             from_placeholder: "de@exemplo.com"
             to_placeholder: "a@exemplo.com"
@@ -3397,8 +4143,8 @@ gl:
             type_placeholder: "compendio, rexistro..."
             reply_key_placeholder: "tecla para responder"
       moderation_history:
-        performed_by: "Executado por"
-        no_results: "Non hai ningún historial de moderación dispoñible."
+        performed_by: "Realizado po"
+        no_results: "Non hai ningún historial de moderación dispoñíbel."
         actions:
           delete_user: "Usuario eliminado"
           suspend_user: "Usuario suspendido"
@@ -3448,46 +4194,49 @@ gl:
             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)"
+            suspend_user: "suspender un usuario"
+            unsuspend_user: "non suspender o usuario"
+            removed_suspend_user: "suspender un usuario (retirado)"
+            removed_unsuspend_user: "non suspender o usuario (retirado)"
             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"
+            check_email: "comprobar correo"
+            delete_topic: "eliminar o tema"
+            recover_topic: "recuperar o tema"
+            delete_post: "eliminar a publicación"
             impersonate: "suplantar"
-            anonymize_user: "facer o usuario anónimo"
-            roll_up: "encartar os bloques de IP"
+            anonymize_user: "anonimizar o usuario"
+            roll_up: "pregar bloques de IP"
             change_category_settings: "cambiar axustes da categoría"
-            delete_category: "eliminar categoría"
+            delete_category: "eliminar a 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"
+            silence_user: "silenciar un usuario"
+            unsilence_user: "non silenciar o usuario"
+            removed_silence_user: "silenciar un usuario (retirado)"
+            removed_unsilence_user: "non silenciar o usuario (retirado)"
+            grant_admin: "conceder a administración"
+            revoke_admin: "revogar a administración"
+            grant_moderation: "conceder a moderación"
+            revoke_moderation: "revogar a moderación"
             backup_create: "crear copia de seguranza"
             deleted_tag: "etiqueta eliminada"
             deleted_unused_tags: "etiquetas sen usar eliminadas"
+            renamed_tag: "etiqueta renomeada"
             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"
+            activate_user: "activar un usuario"
+            deactivate_user: "desactivar o usuario"
+            change_readonly_mode: "cambiar a modo que só permite lectura"
             backup_download: "descargar copia de seguranza"
             backup_destroy: "destruír copia de seguranza"
             reviewed_post: "publicación revisada"
+            custom_staff: "acción personalizada do complemento"
             post_locked: "publicación bloqueada"
             post_edit: "edición da publicación"
             post_unlocked: "publicación desbloqueada"
-            check_personal_message: "comprobar mensaxe privada"
+            check_personal_message: "comprobar de mensaxe privada"
+            disabled_second_factor: "desactivar a autenticación de dobre paso"
             topic_published: "tema publicado"
             post_approved: "publicación aprobada"
             post_rejected: "publicación rexeitada"
@@ -3497,32 +4246,52 @@ gl:
             merge_user: "combinar usuario"
             entity_export: "exportar entidade"
             change_name: "cambiar nome"
+            topic_timestamps_changed: "cambiado o selo de tempo do tema"
             approve_user: "usuario aprobado"
+            web_hook_create: "crear enganche web"
+            web_hook_update: "actualizar o enganche de web"
+            web_hook_destroy: "destruír o enganche de web"
+            web_hook_deactivate: "desactivar o enganche de web"
+            embeddable_host_create: "crear servidor incorporábel"
+            embeddable_host_update: "actualizar servidor incorporábel"
+            embeddable_host_destroy: "destruír servidor incorporábel"
             change_theme_setting: "cambiar axuste do tema"
-            disable_theme_component: "deshabilitar compoñente do tema"
+            disable_theme_component: "desactivar compoñente do tema"
             enable_theme_component: "activar compoñente do tema"
             revoke_title: "revogar título"
             change_title: "cambiar título"
+            api_key_create: "crear clave api"
+            api_key_update: "actualizar clave api"
+            api_key_destroy: "destruír clave api"
+            override_upload_secure_status: "sobrescribir o status de carga segura"
             page_published: "páxina publicada"
             page_unpublished: "páxina sen publicar"
-            add_email: "engadir correo electrónico"
-            update_email: "actualizar correo electrónico"
-            destroy_email: "destruír correo electrónico"
+            add_email: "engadir enderezo de correo"
+            update_email: "actualizar enderezo de correo"
+            destroy_email: "destruír enderezo de correo"
+            topic_closed: "tema pechado"
+            topic_opened: "tema aberto"
+            topic_archived: "tema arquivado"
+            topic_unarchived: "tema desarquivado"
+            post_staff_note_create: "engadir nota do equipo"
+            post_staff_note_destroy: "destruír nota do equipo"
+            delete_group: "eliminar grupo"
         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."
-          email: "Enderezo de correo-e"
+          title: "Correos controlados"
+          description: "Cando alguén tente crear unha nova conta, comprobaranse os seguintes enderezos de correo e bloquearase o rexistro ou se tomará outra medida."
+          email: "Enderezo de correo"
           actions:
             allow: "Permitir"
         screened_urls:
-          title: "URL controladas"
-          description: "As URL listadas aquí usáronse en publicacións de usuarios que foron identificados como spammers."
+          title: "URL controlados"
+          description: "Os URL listados aquí utilizáronse en publicacións de usuarios que foron identificados como emisores de lixo."
           url: "URL"
           domain: "Dominio"
         screened_ips:
-          title: "IP controladas"
-          delete_confirm: "Confirmas a eliminación da regra para %{ip_address}?"
-          roll_up_confirm: "Confirmas que queres agrupar en subredes os enderezos IP controlados comunmente?"
+          title: "IP controlados"
+          description: 'Enderezos IP observados. Use «Permitir» para crear listas de enderezos IP.'
+          delete_confirm: "Confirma a eliminación da regra para %{ip_address}?"
+          roll_up_confirm: "Confirma que quere agrupar en subredes os enderezos IP controlados comunmente?"
           rolled_up_some_subnets: "Agrupáronse correctamente en subredes as entradas de IP para bloquear: %{subnets}."
           rolled_up_no_subnet: "Non hai nada que agrupar."
           actions:
@@ -3543,51 +4312,67 @@ gl:
           searches: "Buscas"
           click_through_rate: "CTR"
           types:
-            all_search_types: "todos os tipos de busca"
+            all_search_types: "Todos os tipos de busca"
             header: "Cabeceira"
             full_page: "Páxina completa"
+            click_through_only: "Todas (só prema)"
+          header_search_results: "Resultados da busca de cabeceiras"
         logster:
           title: "Rexistros de erros"
       watched_words:
+        title: "Palabras observadas"
         search: "buscar"
         clear_filter: "Borrar"
-        show_words: "amosar palabras"
-        one_word_per_line: "Unha palabra por liña"
+        show_words:
+          one: "Amosar %{count} palabra"
+          other: "amosar %{count} palabras"
         download: Descargar
         clear_all: Borrar todo
-        word_count:
-          one: "%{count} palabra"
-          other: "%{count} palabras"
+        clear_all_confirm: "Confirma que quere limpar todas as palabras observadas na acción %{action}?"
         actions:
           block: "Bloquear"
+          censor: "Censurar"
           require_approval: "Requirir aprobación"
-          flag: "Denunciar"
+          flag: "Sinalar"
+          replace: "Substituír"
+          tag: "Etiqueta"
         action_descriptions:
           block: "Evitar as publicacións que conteñen estas palabras. O usuario verá unha mensaxe de erro cando tente enviar a publicación."
+          censor: "Permitir publicacións que conteñan estas palabras pero substitúeas por caracteres que oculten as palabras censuradas."
           require_approval: "As publicacións que conteñan estas palabras requiren a aprobación do equipo antes de ser visíbeis."
           flag: "Permitir as publicacións que conteñen estas palabras, pero marcalas como inadecuadas para que os moderadores poidan revisalas."
+          replace: "Substitúa as palabras das publicacións por outras palabras ou ligazóns"
         form:
-          label: "Palabra nova:"
           placeholder_regexp: "expresión regular"
+          replacement_label: "Substitución"
+          replacement_placeholder: "exemplo ou https://examplo.com"
+          tag_label: "Etiqueta"
+          tag_placeholder: "etiqueta1, etiqueta2, etiqueta3"
           add: "Engadir"
+          success: "Feito"
           exists: "Xa existe"
           upload: "Engadir desde ficheiro"
+          upload_successful: "Carga realizada correctamente. Engadíronse palabras."
         test:
+          button_label: "Proba"
+          modal_title: "Probar as palabras observadas na acción «%{action}»"
+          description: "Escriba texto a continuación para comprobar coincidencias con palabras observadas"
           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."
+        help: "Usar esta ferramenta para suplantar unha conta de usuario co obxecto de detectar e corrixir erros. Deberá saír da sesión ao rematar."
         not_found: "Non é posíbel atopar o usuario."
-        invalid: "Sentímolo pero non podes suplantar este usuario."
+        invalid: "Sentímolo pero non pode suplantar este usuario."
       users:
         title: "Usuarios"
         create: "Engadir usuario administrador"
-        last_emailed: "Últimos envíos por correo-e"
+        last_emailed: "Últimos envíos por correo"
         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"
+        active: "Activado"
+        show_emails: "Amosar correos"
+        hide_emails: "Agochar correos"
         nav:
           new: "Novo"
           active: "Activo"
@@ -3611,40 +4396,56 @@ gl:
           silenced: "Usuarios silenciados"
           suspended: "Usuarios suspendidos"
           staged: "Usuarios transitorios"
-        not_verified: "Sen verificar"
+        not_verified: "Sen comprobar"
         check_email:
-          title: "Amosar o enderezo de correo-e deste usuario"
+          title: "Amosar o enderezo de correo deste usuario"
+          text: "Amosar"
+        check_sso:
+          title: "Desvelar a carga do SSO"
           text: "Amosar"
       user:
-        suspend_failed: "Algo fallou rexeitando este usuario %{error}"
+        suspend_failed: "Algo fallou ao suspender 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_hidden_label: "Cal é o motivo da suspensión? Este texto amosaráselle ao usuario cando tente iniciar sesión. Procura ser breve."
+        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. Procure ser breve."
+        suspend_reason_hidden_label: "Cal é o motivo da suspensión? Este texto amosaráselle ao usuario cando tente iniciar sesión. Procure ser breve."
         suspend_reason: "Razó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."
+        suspend_reason_title: "Razón da suspensión"
+        suspend_reasons:
+          not_listening_to_staff: "Preferiría non escoitar comentarios do equipo"
+          consuming_staff_time: "Consumiu cantidades desproporcionadas de tempo do equipo"
+          combatative: "Demasiado combativo"
+          in_wrong_place: "No lugar equivocado"
+          no_constructive_purpose: "Non ten ningún propósito construtivo nas súas accións que non sexa crear disensión dentro da comunidade"
+          custom: "Personalizar..."
+        suspend_message: "Mensaxe de correo"
+        suspend_message_placeholder: "Pode 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_reason_label: "Por que silencias este usuario?"
-        silence_message: "Mensaxe de correo electrónico"
+        silence_modal_title: "Silenciar o usuario"
+        silence_duration: "Canto tempo estará silenciado o usuario?"
+        silence_reason_label: "Por que silencia este usuario?"
+        silence_reason_placeholder: "Razón do silencio"
+        silence_message: "Mensaxe de correo"
         silence_message_placeholder: "(deixar baleiro para enviar mensaxe predeterminada)"
-        suspended_until: "(até %{until})"
+        suspended_until: "(ata %{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_actions: "Que quere 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"
+        penalty_post_none: "Non facer nada"
         penalty_count: "Número de penalizacións"
         clear_penalty_history:
-          title: "Borrar historial de penalizacións"
-        delete_all_posts_confirm_MF: "Vas eliminar {POSTS, plural, one {1 post} other {# posts}} e {TOPICS, plural, one {1 topic} other {# topics}}. Confirmas a eliminación?"
+          title: "Borrar o historial de penalizacións"
+          description: "os usuarios con sancións non poden acadar TL3"
+        delete_all_posts_confirm_MF: "Vai eliminar {POSTS, plural, one {# publicación} other {# publicacións}} e {TOPICS, plural, one {# tema} other {# temas}}. Está seguro?"
         silence: "Silenciar"
+        unsilence: "Levantar silencio"
         silenced: "Silenciado?"
         moderator: "Moderador?"
         admin: "Administrador?"
@@ -3664,32 +4465,36 @@ gl:
         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."
+        show_flags_received: "Amosar alertas recibidas"
+        flags_received_by: "Alertas que recibiu %{username}"
+        flags_received_none: "Este usuario non recibiu ningunha alerta."
         reputation: Reputación
         permissions: Permisos
         activity: Actividade
-        like_count: Gústames dados / recibidos
+        like_count: Valoracións dadas / recibidas
         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: Activada a autenticación de dobre factor
         topics_entered: Temas vistos
-        flags_given_count: Denuncias dadas
-        flags_received_count: Denuncias recibidas
+        flags_given_count: Alertas dadas
+        flags_received_count: Alertas recibidas
         warnings_received_count: Avisos recibidos
-        flags_given_received_count: "Denuncias dadas / recibidas"
+        flags_given_received_count: "Alertas dadas / recibidas"
         approve: "Aprobar"
         approved_by: "aprobado por"
-        approve_success: "Usuario aprobado, enviouse un correo-e coas instrucións de activación."
+        approve_success: "Usuario aprobado, enviouse unha mensaxe de correo coas instrucións de activación."
         approve_bulk_success: "Todos os usuarios seleccionados foron aprobados e notificados."
         time_read: "Tempo de lectura"
         anonymize: "Facer o usuario anónimo"
-        anonymize_confirm: "Confirmas que desexas converter esta conta en anónima? Cambiaranse o nome do usuario e o correo electrónico e restabelecerase toda a información do perfil."
+        anonymize_confirm: "Confirma que desexa converter esta conta en anónima? Cambiaranse o nome do usuario e o correo electrónico e reiniciarase toda a información do perfil."
         anonymize_yes: "Si, converter a conta en anónima"
         anonymize_failed: "Produciuse un problema convertendo a conta en anónima."
         delete: "Eliminar usuario"
+        delete_posts:
+          progress:
+            title: "Progreso na eliminación de publicacións"
         merge:
           button: "Combinar"
           prompt:
@@ -3701,14 +4506,16 @@ gl:
             target_username_placeholder: "Nome de usuario do novo propietario"
             transfer_and_delete: "Transferir e eliminar @%{username}"
             cancel: "Cancelar"
+          progress:
+            title: "Combinar o progreso"
           confirmation:
             title: "Transferir e eliminar @%{username}"
             description: |
               <p>Todo o contido de <b>@%{username}</b> vai ser transferido e asignado a <b>@%{targetUsername}</b>. Unha vez transferido o contido, a conta de<b>@%{username}</b> será eliminada.</p>
 
-              <p><b>Esta acción non poderá desfacerse.</b></p>
+              <p><b>Esta acción non se poderá desfacer.</b></p>
 
-              <p>Para continuar, escribe: <code>%{text}</code></p>
+              <p>Para continuar, escriba: <code>%{text}</code></p>
             text: "transferir @%{username} a @%{targetUsername}"
             transfer_and_delete: "Transferir e eliminar @%{username}"
             cancel: "Cancelar"
@@ -3717,34 +4524,37 @@ gl:
         delete_forbidden_because_staff: "Non é posíbel eliminar os administradores e moderadores."
         delete_posts_forbidden_because_staff: "Non é posíbel eliminar todas as publicacións dos administradores ou moderadores."
         delete_forbidden:
-          one: "Non é posíbel eliminar usuarios se teñen publicacións. Elimina as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de %{count} día)"
-          other: "Non é posíbel eliminar usuarios se teñen publicacións. Elimina as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de %{count} días)"
+          one: "Non é posíbel eliminar usuarios se teñen publicacións. Elimine as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de %{count} día)"
+          other: "Non é posíbel eliminar usuarios se teñen publicacións. Elimine as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de %{count} días)"
         cant_delete_all_posts:
-          one: "Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} día. (o axuste delete_user_max_post_age.)"
-          other: "Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} días. (o axuste delete_user_max_post_age.)"
+          one: "Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} día. (O axuste delete_user_max_post_age.)"
+          other: "Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} días. (O axuste delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
           one: "Non é posíbel eliminar todas as publicacións porque o usuario ten máis dunha publicación. (delete_all_posts_max)"
           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_confirm: "Xeralmente é preferíbel anonimizar os usuarios mellor ca eliminalos, para evitar retirar contido das discusións existentes.<br><br>Está SEGURO de que quere eliminar este usuario? Isto é permanente!"
+        delete_and_block: "Eliminar e <b>bloquear</b> este enderezo de correo e de 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"
-        activation_email_sent: "Enviouse un correo electrónico de activación."
-        send_activation_email_failed: "Produciuse un problema enviando outro correo-e de activación. %{error}"
+        delete_failed: "Produciuse un erro eliminando este usuario. Asegúrese de que se eliminan todas as publicacións antes de tentar eliminar o usuario."
+        send_activation_email: "Enviar mensaxe de correo de activación"
+        activation_email_sent: "Enviouse unha mensaxe de correo de activación."
+        send_activation_email_failed: "Produciuse un problema enviando outra mensaxe de correo de activación. %{error}"
         activate: "Activar conta"
         activate_failed: "Produciuse un problema activando o usuario."
         deactivate_account: "Desactivar a conta"
         deactivate_failed: "Produciuse un problema desactivando o usuario."
+        unsilence_failed: "Produciuse un problema ao levantar o silencio do usuario."
         silence_failed: "Produciuse un erro ao silenciar o usuario."
-        silence_confirm: "Confirmas que queres silenciar este usuario? Non poderá crear máis temas nin publicación."
+        silence_confirm: "Confirma que quere silenciar este usuario? Non poderá crear máis temas nin publicación."
         silence_accept: "Si, silencialo"
         bounce_score: "Puntuación de rebotes"
         reset_bounce_score:
+          label: "Restabelecer"
           title: "Restabelecer a puntuación de rebotes a 0"
         visit_profile: "Visita a <a href='%{url}'>páxina de preferencias do usuario</a> para editar o seu perfil"
-        deactivate_explanation: "Un usuario desactivado debe revalidar o seu correo-e."
+        deactivate_explanation: "Un usuario desactivado debe revalidar o enderezo de correo."
         suspended_explanation: "Un usuario suspendido non pode iniciar sesión."
         silence_explanation: "Un usuario silenciado non pode publicar nin iniciar temas."
         staged_explanation: "Un usuario transitorio só pode publicar por correo electrónico en temas específicos."
@@ -3753,16 +4563,16 @@ gl:
           some: "Recibíronse recentemente algúns rebotes dese correo electrónico."
           threshold_reached: "Recibíronse demasiados rebotes dese correo electrónico."
         trust_level_change_failed: "Produciuse un problema cambiando o nivel de confianza do usuario."
-        suspend_modal_title: "Suspender usuario"
-        confirm_cancel_penalty: "Confirmas que queres eliminar a penalización?"
+        suspend_modal_title: "Suspender un usuario"
+        confirm_cancel_penalty: "Confirma que quere eliminar a penalización?"
         trust_level_2_users: "Usuarios con nivel 2 de confianza"
         trust_level_3_requirements: "Requirimentos para o nivel de confianza 3"
         trust_level_locked_tip: "o nivel de confianza está bloqueado, o sistema non promocionará nin rebaixará o usuario"
-        trust_level_unlocked_tip: "o nivel de confianza está desbloqueado, o sistema pode promocionar ou rebaixar o usuario"
+        trust_level_unlocked_tip: "o nivel de confianza está desbloqueado, o sistema pode promocionar ou rebaixar un usuario"
         lock_trust_level: "Bloquear o nivel de confianza"
         unlock_trust_level: "Desbloquear o nivel de confianza"
         tl3_requirements:
-          title: "Requerimentos para o nivel 3 de confianza"
+          title: "Requirimentos para o nivel 3 de confianza"
           table_title:
             one: "No último día:"
             other: "Nos últimos %{count} días:"
@@ -3770,13 +4580,13 @@ gl:
           requirement_heading: "Requirimento"
           visits: "Visitas"
           days: "días"
-          topics_replied_to: "Temas os que respondeu"
+          topics_replied_to: "Temas aos que respondeu"
           topics_viewed: "Temas vistos"
           topics_viewed_all_time: "Temas vistos (todo o tempo)"
           posts_read: "Publicacións lidas"
           posts_read_all_time: "Publicacións lidas (todo o tempo)"
-          flagged_posts: "Publicacións denunciadas"
-          flagged_by_users: "Usuarios que denunciaron"
+          flagged_posts: "Publicacións sinaladas"
+          flagged_by_users: "Usuarios que alertaron"
           likes_given: "Gústames dados"
           likes_received: "Gústames recibidos"
           likes_received_days: "Gústames recibidos: por días"
@@ -3787,16 +4597,19 @@ gl:
           does_not_qualify: "Non cumpre os requisitos para o nivel de confianza 3."
           will_be_promoted: "Será promocionado pronto."
           will_be_demoted: "Será rebaixado pronto."
-          on_grace_period: "Actualmente ne periodo de graza da promoción, non será rebaixado"
+          on_grace_period: "Actualmente en período de graza da promoción, non será rebaixado."
           locked_will_not_be_promoted: "Nivel de confianza bloqueado. Non se promocionará nunca."
           locked_will_not_be_demoted: "Nivel de confianza bloqueado. Non será rebaixado nunca."
-        sso:
-          title: "Inicio de sesión simple"
+        discourse_connect:
+          title: "Inicio de sesión válido por unha soa vez «SSO» con DiscourseConnect"
           external_id: "ID externo"
-          external_username: "Nome do usuario"
+          external_username: "Nome de usuario"
           external_name: "Nome"
-          external_email: "Correo electrónico"
+          external_email: "Enderezo de correo"
           external_avatar_url: "URL da imaxe do perfil"
+          last_payload: "Última carga"
+          delete_sso_record: "Eliminar o rexistro de SSO"
+          confirm_delete: "Confirma que quere eliminar este rexistro do DiscourseConnect?"
       user_fields:
         title: "Campos do usuario"
         help: "Engade campos que os usuarios poidan encher."
@@ -3809,7 +4622,7 @@ gl:
         edit: "Editar"
         delete: "Eliminar"
         cancel: "Cancelar"
-        delete_confirm: "Confirmas a eliminación deste campo do usuario?"
+        delete_confirm: "Confirma a eliminación deste campo do usuario?"
         options: "Opcións"
         required:
           title: "Requirido para rexistrarse?"
@@ -3824,66 +4637,71 @@ gl:
           enabled: "amosado no perfil"
           disabled: "non amosado no perfil"
         show_on_user_card:
-          title: "Mostrar na tarxeta de usuario?"
-          enabled: "mostrado na tarxeta de usuario"
-          disabled: "non mostrado na tarxeta de usuario"
+          title: "Amosar na tarxeta de usuario?"
+          enabled: "amosado na tarxeta de usuario"
+          disabled: "non amosado na tarxeta de usuario"
         field_types:
           text: "Campo de texto"
           confirm: "Confirmación"
           dropdown: "Despregábel"
       site_text:
-        description: "Podes personalizar calquera texto do teu foro. Comeza por buscar debaixo:"
-        search: "Busca o texto que queres editar"
+        description: "Pode personalizar calquera texto do seu foro. Comece por buscar a seguir:"
+        search: "Busque o texto que quere editar"
         title: "Texto"
         edit: "editar"
         revert: "Reverter os cambios"
-        revert_confirm: "Confirmas a reversión dos cambios?"
+        revert_confirm: "Confirma a reversión dos cambios?"
         go_back: "Volver á busca"
-        recommended: "Recomendamos personalizar o seguinte texto para axeitalo ás túas necesidades:"
+        recommended: "Recomendamos personalizar o seguinte texto para axeitalo ás súas necesidades:"
         show_overriden: "Amosar só os cambios"
-        more_than_50_results: "Hai máis de 50 resultados. Restrinxe a busca."
+        locale: "Idioma:"
+        fallback_locale_warning: "Está a editar un idioma baseado en %{fallback}. Os usuarios que escollan %{fallback} como idioma de interface non verán os cambios."
+        more_than_50_results: "Hai máis de 50 resultados. Restrinxa a busca."
       settings:
         show_overriden: "Amosar só os cambios"
+        history: "Ver o historial de cambios"
         reset: "restabelecer"
         none: "ningunha"
       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."
+        more_than_30_results: "Hai máis de 30 resultados. Restrinxa a busca ou seleccione unha categoría."
         clear_filter: "Borrar"
         add_url: "engadir URL"
-        add_host: "engadir host"
+        add_host: "engadir servidor"
         add_group: "engadir grupo"
         uploaded_image_list:
-          label: "Editar lista"
-          empty: "Aínda non hai imaxes. Sube unha."
+          label: "Editar listaxe"
+          empty: "Aínda non hai imaxes. Cargue unha."
           upload:
-            label: "Enviar"
-            title: "Subir imaxe(s)"
+            label: "Cargar"
+            title: "Cargar imaxe(s)"
         selectable_avatars:
           title: "Listaxe de avatares que os usuarios poden elixir"
         categories:
           all_results: "Todo"
           required: "Obrigatorio"
+          branding: "Logo"
           basic: "Configuración básica"
           users: "Usuarios"
           posting: "Publicación"
-          email: "Correo electrónico"
+          email: "Enderezo de correo"
           files: "Ficheiros"
           trust: "Niveis de confianza"
           security: "Seguranza"
           onebox: "Onebox"
           seo: "SEO"
-          spam: "Spam"
+          spam: "Lixo"
           rate_limits: "Límites de frecuencia"
           developer: "Desenvolvedor"
-          embedding: "Encaixado"
+          embedding: "Incorporado"
           legal: "Legal"
           api: "API"
+          user_api: "API de usuario"
           uncategorized: "Outro"
           backups: "Copias de seguranza"
           login: "Iniciar sesión"
-          plugins: "Plugins"
+          plugins: "Complementos"
           user_preferences: "Preferencias do usuario"
           tags: "Etiquetas"
           search: "Buscar"
@@ -3892,11 +4710,14 @@ gl:
         secret_list:
           invalid_input: "Os campos de entrada de datos non poden quedar baleiros nin conter a barra vertical."
         default_categories:
-          modal_description: "Queres aplicar este cambio con efectos retroactivos? Isto afectará as preferencias de %{count} usuarios existentes."
+          modal_description: "Quere aplicar este cambio con efectos retroactivos? Isto afectará as preferencias de %{count} usuarios existentes."
           modal_yes: "Si"
           modal_no: "Non, aplicar só o cambio a partir de agora"
         simple_list:
           add_item: "Engadir elemento..."
+        json_schema:
+          edit: Abrir o editor
+          modal_title: "Editar: %{name}"
       badges:
         title: Insignias
         new_badge: Nova insignia
@@ -3915,29 +4736,35 @@ gl:
         reason_help: (Ligazón a unha publicación ou tema)
         save: Gardar
         delete: Eliminar
-        delete_confirm: Confirmas a eliminación desta insignia?
+        delete_confirm: Confirma a eliminación desta insignia?
         revoke: Revogar
         reason: Razón
         expand: Expandir &hellip;
-        revoke_confirm: Confirmas a revogación desta insignia?
+        revoke_confirm: Confirma a revogación desta insignia?
         edit_badges: Editar insignias
         grant_badge: Conceder insignia
         granted_badges: Insignias concedidas
         grant: Conceder
         no_user_badges: "A %{name} non se lle concedeu ningunha insignia."
         no_badges: Non hai insignias para conceder.
-        none_selected: "Selecciona unha insignia para comezar"
+        none_selected: "Seleccione unha insignia para comezar"
         allow_title: Permitir que se use a insignia como un título
         multiple_grant: Pode concederse múltiples veces
         listable: Amosar a insignia na páxina de insignias públicas
-        enabled: Activar insignia
+        enabled: Activar a insignia
         icon: Icona
         image: Imaxe
-        query: Consulta sobre insignia (SQL)
-        target_posts: Consulta dirixida a mensaxes
+        graphic: Gráfico
+        icon_help: "Escriba un nome de icona Font Awesome (use o prefixo «far-» para as iconas normais e «fab-» para as iconas de marca)"
+        image_help: "Ao cargar unha imaxe sobrescríbese o campo da icona se ambos estivesen determinados."
+        select_an_icon: "Seleccionar unha icona"
+        upload_an_image: "Cargar unha imaxe"
+        read_only_setting_help: "Personalice o texto"
+        query: Consultar insignia (SQL)
+        target_posts: Consulta con destino a publicacións
         auto_revoke: Executar a consulta de revogación diariamente
-        show_posts: Amosar a publicación concedendo a insignia na páxina das insignias
-        trigger: Activador
+        show_posts: Amosar a publicación pola que se concede a insignia na páxina das insignias
+        trigger: Disparador
         trigger_type:
           none: "Actualizar diariamente"
           post_action: "Cando un usuario actúa sobre unha publicación"
@@ -3946,14 +4773,14 @@ gl:
           user_change: "Cando se crea ou edita un usuario"
           post_processed: "Despois de procesar unha publicación"
         preview:
-          link_text: "Previsualizar as insignias concedidas"
-          plan_text: "Vista previa do plan da consulta"
-          modal_title: "Previsualizar a consulta de insignias"
+          link_text: "Visualizar as insignias concedidas"
+          plan_text: "Visualizar con plan de consulta"
+          modal_title: "Visualizar a consulta de insignias"
           sql_error_header: "Produciuse un erro coa consulta."
           error_help: "Busca axuda nas seguintes ligazóns sobre consultas de insignias."
           bad_count_warning:
-            header: "AVISO"
-            text: "Faltan algunhas mostras para a concesión da insignia. Isto acontece cando a consulta sobre insignias devolve unha ID do usuario, ou de publicacións que non existen. Pode causar resultados inesperados posteriormente. Revisa outra vez a solicitude."
+            header: "AVISO!"
+            text: "Faltan algunhas mostras para a concesión da insignia. Isto acontece cando a consulta sobre insignias devolve ID do usuario, ou ID de publicacións que non existen. Pode producir resultados inesperados posteriormente. Revise outra vez a consulta."
           no_grant_count: "Non hai insignias para asignar."
           grant_count:
             one: "<b>%{count}</b> insignia para asignar."
@@ -3961,51 +4788,59 @@ gl:
           sample: "Mostra:"
           grant:
             with: <span class="username">%{username}</span>
-            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_post: <span class="username">%{username}</span> por publicación en %{link}
+            with_post_time: <span class="username">%{username}</span> por 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"
+          title: "Seleccione unha insignia existente ou cree unha nova para comezar"
           emoji: "emoji de muller estudante"
           what_are_badges_title: "Que son as insignias?"
           badge_query_examples_title: "Exemplos de consulta de insignias"
         mass_award:
+          title: Recoñemento en lote
           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
-          aborted: Sube un CSV que conteña os correos electrónicos ou os nomes de usuario
-          success: Recibimos o teu CSV. Os usuarios recibirán axiña a súa insignia.
+          upload_csv: Cargar un CSV con enderezos de correo ou nomes de usuario
+          aborted: Cargue un CSV que conteña os enderezos de correo ou os nomes de usuario
+          success: Recibimos o seu CSV. Os usuarios recibirán axiña a súa insignia.
           replace_owners: Retirar a insignia dos propietarios anteriores
       emoji:
         title: "Emoji"
-        help: "Engade novo emoji que estará dispoñíbel para todos. (Suxestión: arrastra e solta múltiples ficheiros dunha vez)"
+        help: "Engada un novo emoji que estará dispoñíbel para todos. (Suxestión: arrastre e solte múltiples ficheiros dunha vez)"
         add: "Engadir novo emoji"
-        uploading: "Actualizando..."
+        uploading: "Cargando..."
         name: "Nome"
         group: "Grupo"
         image: "Imaxe"
-        alt: "previsualización do emoji personalizado"
-        delete_confirm: "Confirmas a eliminación do emoji :%{name}:?"
+        alt: "visualización do emoji personalizado"
+        delete_confirm: "Confirma a eliminación do emoji :%{name}:?"
       embedding:
-        get_started: "Se queres encaixar o Discourse noutro sitio web, comeza engadindo o seu host."
-        confirm_delete: "Confirmas a eliminación deste host?"
-        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"
+        get_started: "Se quere incorporar o Discourse noutro sitio web, comece engadindo o seu servidor."
+        confirm_delete: "Confirma a eliminación deste servidor?"
+        sample: "Utilice o seguinte código HTML no seu sitio para crear e incorporar temas do Discourse. Substitúa <b>REPLACE_ME</b> polo URL canónico da páxina na que o está a incorporar."
+        title: "Incorporando"
+        host: "Servidores permitidos"
         class_name: "Nome da clase"
+        allowed_paths: "Lista de camiños admitidos"
         edit: "editar"
-        category: "Publicación a categoría"
-        add_host: "Engadir host"
-        settings: "Axustes para o encaixado"
-        crawling_settings: "Axustes do extractor"
-        crawling_description: "Cando o Discourse crea temas para as túas publicacións, se non existe unha fonte RSS/ATOM, tentará analizar o contido do teu HTML. Ás veces pode ser difícil extraer o contido, por iso damos a posibilidade de especificar as regras do CSS para facilitar a extracción."
+        category: "Publicación na categoría"
+        add_host: "Engadir servidor"
+        settings: "Configuración da incorporación"
+        crawling_settings: "Configuración do extractor"
+        crawling_description: "Cando o Discourse crea temas para as súas publicacións, se non existe unha fonte RSS/ATOM, tentará procesar o contido do seu HTML. Ás veces pode ser difícil extraer o contido, por iso dámoslle a posibilidade de especificar as regras do CSS para facilitar a extracción."
         embed_by_username: "Nome do usuario para crear o tema"
-        embed_post_limit: "Número máximo de publicacións a encaixar"
-        embed_truncate: "Truncar as publicacións encaixadas"
-        save: "Gardar axustes de encaixado"
+        embed_post_limit: "Número máximo de publicacións que incorporar"
+        embed_title_scrubber: "Expresión regular empregada para limpar o título das publicacións"
+        embed_truncate: "Truncar as publicacións incorporadas"
+        embed_unlisted: "Os temas importados non serán listados ata que haxa unha resposta."
+        allowed_embed_selectors: "Selector CSS para elementos permitidos nas incorporacións"
+        blocked_embed_selectors: "Selector CSS para elementos retirados das incorporacións"
+        allowed_embed_classnames: "Nomes permitidos de clases CSS"
+        save: "Gardar a configuración da incorporación"
       permalink:
         title: "Ligazóns permanentes"
+        description: "Redireccións que se lle aplicarán a URL non coñecidos polo foro."
         url: "URL"
         topic_id: "ID do tema"
         topic_title: "Tema"
@@ -4014,16 +4849,17 @@ gl:
         category_id: "ID da categoría"
         category_title: "Categoría"
         tag_name: "Nome da etiqueta"
+        external_url: "URL externo ou relativo"
         destination: "Destino"
-        copy_to_clipboard: "Copiar ligazón permanente ao portapapeis"
-        delete_confirm: Confirmas a eliminación desta ligazón permanente?
+        copy_to_clipboard: "Copiar a ligazón permanente ao portapapeis"
+        delete_confirm: Confirma a eliminación desta ligazón permanente?
         form:
           label: "Novo:"
           add: "Engadir"
-          filter: "Buscar (URLou URL externa)"
+          filter: "Buscar (URL ou URL externa)"
       reseed:
         action:
-          label: "Substituír texto..."
+          label: "Substituír texto…"
           title: "Substituír o texto das categorías e temas coas traducións"
         modal:
           title: "Substituír texto"
@@ -4035,24 +4871,25 @@ gl:
     wizard:
       done: "Feito"
       finish: "Finalizar"
-      back: "Atrás"
+      back: "Volver"
       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."
+      upload: "Cargar"
+      uploading: "Cargando..."
+      upload_error: "Sentímolo pero produciuse un erro ao cargar ese ficheiro. Ténteo de novo."
       quit: "Pode que logo"
       staff_count:
-        one: "A túa comunidade ten %{count} membro (ti)."
-        other: "A túa comunidade ten %{count} membros, incluíndote a ti."
+        one: "A súa comunidade ten %{count} en equipo (vostede)."
+        other: "A súa comunidade ten %{count} en equipo, incluído vostede."
       invites:
         add_user: "engadir"
-        none_added: "Non convidaches a ninguén do equipo. Confirmas que queres continuar?"
+        none_added: "Non convidou a ninguén do equipo. Confirma que quere continuar?"
         roles:
           admin: "Administración"
           moderator: "Moderador"
           regular: "Usuario normal"
       previews:
         topic_title: "Tema de discusión"
+        font_title: "Tipo de letra %{font}"
         share_button: "Compartir"
         reply_button: "Responder"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 8868553991..6f0a8531ab 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -202,6 +202,9 @@ he:
     topic_admin_menu: "פעולות על נושא"
     wizard_required: "ברוך בואך ל־Discourse החדש שלך! נתחיל עם <a href='%{url}' data-auto-route='true'>אשף ההתקנה</a> ✨"
     emails_are_disabled: "כל הדוא״ל היוצא נוטרל באופן גורף על ידי מנהל אתר. שום הודעת דוא״ל, מכל סוג שהוא, לא תשלח."
+    software_update_prompt:
+      message: "עדכנו את האתר הזה, <span>נא לרענן</span> או שיתכן שתופענה כל מיני תופעות בלתי מוסברות."
+      dismiss: "התעלמות"
     bootstrap_mode_enabled:
       one: "כדי להקל על הקמת האתר החדש שלך, כרגע המערכת במצב אתחול ראשוני. לכל המשתמשים החדשים תוענק דרגת האמון 1 ויישלח אליהם תמצות יומי בדוא״ל. אפשרות זו תכבה אוטומטית לאחר שהצטרף משתמש %{count}."
       two: "כדי להקל על הקמת האתר החדש שלך, כרגע המערכת במצב אתחול ראשוני. לכל המשתמשים החדשים תוענק דרגת האמון 1 ויישלח אליהם תמצות יומי בדוא״ל. אפשרות זו תכבה אוטומטית לאחר שהצטרפו %{count} משתמשים."
@@ -215,6 +218,7 @@ he:
       regions:
         ap_northeast_1: "אסיה ומדינות האוקיינוס השקט (טוקיו)"
         ap_northeast_2: "אסיה ומדינות האוקיינוס השקט (סיאול)"
+        ap_east_1: "אסיה ומדינות האוקיינוס השקט (הונג קונג)"
         ap_south_1: "אסיה ומדינות האוקיינוס השקט (מומבאי)"
         ap_southeast_1: "אסיה ומדינות האוקיינוס השקט (סינגפור)"
         ap_southeast_2: "אסיה ומדינות האוקיינוס השקט (סידני)"
@@ -233,6 +237,7 @@ he:
         us_gov_west_1: "הענן הממשלתי של AWS (מערב ארה״ב)"
         us_west_1: "מערב ארה״ב (צפון קליפורניה)"
         us_west_2: "מערב ארה״ב (אורגון)"
+    clear_input: "פינוי הקלט"
     edit: "עריכת הכותרת והקטגוריה של נושא זה"
     expand: "הרחב"
     not_implemented: "תכונה זו עדיין לא מומשה, עמך הסליחה!"
@@ -269,6 +274,11 @@ he:
     now: "ממש עכשיו"
     read_more: "המשך קריאה"
     more: "להרחבה"
+    x_more:
+      one: "עוד %{count}"
+      two: "עוד %{count}"
+      many: "עוד %{count}"
+      other: "עוד %{count}"
     less: "צמצום"
     never: "אף פעם"
     every_30_minutes: "כל 30 דקות"
@@ -299,6 +309,7 @@ he:
       moderators: "מפקחים"
       stat:
         all_time: "כל הזמנים"
+        last_day: "24 השעות האחרונות"
         last_7_days: "7 הימים האחרונים"
         last_30_days: "30 הימים האחרונים"
       like_count: "לייקים"
@@ -336,18 +347,6 @@ he:
       search_placeholder: "חיפוש סימניות לפי שם, כותרת הנושא או תוכן הפוסט"
       search: "חיפוש"
       reminders:
-        later_today: "בהמשך היום"
-        next_business_day: "יום העסקים הבא"
-        tomorrow: "מחר"
-        next_week: "בשבוע הבא"
-        post_local_date: "תאריך בפוסט"
-        later_this_week: "בהמשך השבוע"
-        start_of_next_business_week: "יום שני"
-        start_of_next_business_week_alt: "יום שני הבא"
-        next_month: "חודש הבא"
-        custom: "תאריך ושעה מותאמים אישית"
-        last_custom: "האחרון"
-        none: "לא נדרשת תזכורת"
         today_with_time: "היום ב־%{time}"
         tomorrow_with_time: "מחר ב־%{time}"
         at_time: "ב־%{date_time}"
@@ -362,9 +361,9 @@ he:
       new_private_message: "טיוטת הודעה פרטית חדשה"
       topic_reply: "טיוטת תשובה"
       abandon:
-        confirm: "כבר קיימת טיוטה בנושא זה. לנטוש אותה?"
-        yes_value: "כן, לנטוש"
-        no_value: "לא, שמור"
+        confirm: "יש טיוטה שהתחלת לערוך לנושא הזה. מה לעשות אתה?"
+        yes_value: "להשליך"
+        no_value: "לחזור לעריכה"
     topic_count_latest:
       one: "הצגת נושא %{count} חדש או עדכני"
       two: "הצגת %{count} נושאים חדשים או עדכניים"
@@ -389,6 +388,7 @@ he:
     upload: "העלאה"
     uploading: "בהליכי העלאה..."
     uploading_filename: "מעלה: %{filename}..."
+    processing_filename: "מתבצע עיבוד: %{filename}…"
     clipboard: "לוח"
     uploaded: "הועלה!"
     pasting: "מדביק..."
@@ -469,6 +469,7 @@ he:
       topic: "נושא:"
       filtered_topic: "סיננת לתוכן שממתין לסקירה בנושא מסוים."
       filtered_user: "משתמש"
+      filtered_reviewed_by: "נסקר על ידי"
       show_all_topics: "להציג את כל הנושאים"
       deleted_post: "(פוסט נמחק)"
       deleted_user: "(משתמש נמחק)"
@@ -479,12 +480,13 @@ he:
         email: "דוא״ל"
         name: "שם"
         fields: "שדות"
+        reject_reason: "סיבה"
       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}% מסכימים"
@@ -537,7 +539,8 @@ he:
           created_at_asc: "מועד יצירה (הפוך)"
         priority:
           title: "עדיפות מזערית"
-          low: "(כלשהו)"
+          any: "(כלשהו)"
+          low: "נמוכה"
           medium: "בינונית"
           high: "גבוהה"
       conversation:
@@ -575,6 +578,8 @@ he:
           title: "הוספת פוסט לתור"
         reviewable_user:
           title: "משתמש"
+        reviewable_post:
+          title: "פוסט"
       approval:
         title: "הפוסט זקוק לאישור"
         description: "הפוסט התקבל אך הוא נתון לאישור מפקח בטרם הצגתו. נא להתאזר בסבלנות."
@@ -585,6 +590,49 @@ he:
           other: "יש לך <strong>%{count}</strong> פוסטים ממתינים."
         ok: "אישור"
       example_username: "שם משתמש"
+      reject_reason:
+        title: "למה בחרת לדחות את המשתמש הזה?"
+        send_email: "שליחת הודעה דחייה בדוא״ל"
+    relative_time_picker:
+      minutes:
+        one: "דקה"
+        two: "דקות"
+        many: "דקות"
+        other: "דקות"
+      hours:
+        one: "שעה"
+        two: "שעתיים"
+        many: "שעות"
+        other: "שעות"
+      days:
+        one: "יום"
+        two: "יומיים"
+        many: "ימים"
+        other: "ימים"
+      months:
+        one: "חודש"
+        two: "חודשיים"
+        many: "חודשים"
+        other: "חודשים"
+      years:
+        one: "שנה"
+        two: "שנתיים"
+        many: "שנים"
+        other: "שנים"
+      relative: "יחסי"
+    time_shortcut:
+      later_today: "בהמשך היום"
+      next_business_day: "יום העסקים הבא"
+      tomorrow: "מחר"
+      next_week: "בשבוע הבא"
+      post_local_date: "תאריך בפוסט"
+      later_this_week: "בהמשך השבוע"
+      start_of_next_business_week: "יום שני"
+      start_of_next_business_week_alt: "יום שני הבא"
+      next_month: "חודש הבא"
+      custom: "תאריך ושעה מותאמים אישית"
+      relative: "זמן יחסי"
+      none: "אין צורך"
     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>"
@@ -673,6 +721,10 @@ he:
             imap_ssl: "להשתמש ב־SSL ל־IMAP"
             username: "שם משתמש"
             password: "סיסמה"
+          settings:
+            title: "הגדרות"
+            allow_unknown_sender_topic_replies: "לאפשר תגובות לנושאים משולחים בלתי־ידועים."
+            allow_unknown_sender_topic_replies_hint: "מאפשר לשולחים בלתי־ידועים להגיב לנושאים קבוצתיים. אם האפשרות מבוטלת, תגובות מכתובות דוא״ל שאינן מופיעות בשרשור דוא״ל IMAP או שהוזמנו לנושא תיצורנה נושא חדש."
           mailboxes:
             synchronized: "תיבת דוא״ל מסונכרנת"
             none_found: "לא נמצאו תיבות דוא״ל בחשבון הדוא״ל הזה."
@@ -776,7 +828,22 @@ he:
         make_owner_description: "הסבה של <b>%{username}</b> לבעלים של קבוצה זו"
         remove_owner: "הסרת בעלות"
         remove_owner_description: "הסרת הבעלות של <b>%{username}</b> על קבוצה זו"
+        make_primary: "להפוך לראשית"
+        make_primary_description: "להפוך אותה לקבוצה הראשית של <b>%{username}</b>"
+        remove_primary: "הסרה כראשית"
+        remove_primary_description: "להסיר אותה כקבוצה הראשית של <b>%{username}</b>"
+        remove_members: "הסרת חברים"
+        remove_members_description: "הסרת המשתמשים הנבחרים מהקבוצה הזאת"
+        make_owners: "הסבה לבעלים"
+        make_owners_description: "להפוך את המשתמשים הנבחרים לבעלי הקבוצה הזאת"
+        remove_owners: "הסרת בעלים"
+        remove_owners_description: "להסיר את המשתמשים הנבחרים מהנהלת הקבוצה הזאת"
+        make_all_primary: "להפוך לראשית אצל כולם"
+        make_all_primary_description: "להפוך את הקבוצה הזאת לראשית עבור כל המשתמשים הנבחרים"
+        remove_all_primary: "הסרה כראשית"
+        remove_all_primary_description: "הסרת הקבוצה הזאת כראשית"
         owner: "בעלות"
+        primary: "ראשית"
         forbidden: "אין לך הרשאות לצפות ברשימת החברים."
       topics: "נושאים"
       posts: "פוסטים"
@@ -848,7 +915,6 @@ he:
       posts: "פוסטים"
       topics: "נושאים"
       latest: "לאחרונה"
-      latest_by: "לאחרונה על ידי"
       toggle_ordering: "שינוי בקר סדר"
       subcategories: "תתי קטגוריות"
       muted: "קטגוריות מושתקות"
@@ -857,6 +923,19 @@ he:
         two: "%{count} נושאים"
         many: "%{count} נושאים"
         other: "%{count} נושאים"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        two: "%{number} / %{unit}"
+        many: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "שבוע"
+        month: "חודש"
+      topic_stat_all_time:
+        one: "%{number} סה״כ"
+        two: "%{number} סה״כ"
+        many: "%{number} סה״כ"
+        other: "%{number} סה״כ"
       topic_stat_sentence_week:
         one: "נושא חדש %{count} בשבוע האחרון"
         two: "%{count} נושאים חדשים בשבוע האחרון"
@@ -921,7 +1000,23 @@ he:
         mute_option_title: "לא תגענה אליך התראות בנוגע למשתמש זה."
         normal_option: "רגיל"
         normal_option_title: "תגיע אליך התראה אם המשתמש הזה יגיב לך, יצטט אותך או יאזכר אותך."
+      notification_schedule:
+        title: "תזמון התראות"
+        label: "הפעלת תזמון התראות מותאם אישית"
+        tip: "מחוץ לשעות אלו המצב שלך יוגדר לכדי ‚לא להפריע’ אוטומטית."
+        midnight: "חצות"
+        none: "ללא"
+        monday: "יום שני"
+        tuesday: "יום שלישי"
+        wednesday: "יום רביעי"
+        thursday: "יום חמישי"
+        friday: "יום שישי"
+        saturday: "שבת"
+        sunday: "יום ראשון"
+        to: "עד"
       activity_stream: "פעילות"
+      read: "נקרא"
+      read_help: "נושאים שנקראו לאחרונה"
       preferences: "העדפות"
       feature_topic_on_profile:
         open_search: "נא לבחור נושא חדש"
@@ -950,11 +1045,16 @@ he:
         perm_denied_expl: "דחית הרשאה לקבלת התראות. יש לאפשר התראות בהגדרות הדפדפן שלך."
         disable: "כבוי התראות"
         enable: "אפשר התראות"
-        each_browser_note: "הערה: עליך לשנות הגדרה זו עבור כל דפדפן בנפרד."
+        each_browser_note: 'הערה: עליך לשנות הגדרה זו בכל דפדפן שבו אתה משתמש. כל ההודעות יושבתו במצב "אל תפריע", ללא קשר להגדרה זו.'
         consent_prompt: "האם ברצונך לקבל התראות כשאנשים מגיבים לפוסטים שלך?"
       dismiss: "דחה"
       dismiss_notifications: "בטלו הכל"
       dismiss_notifications_tooltip: "סימון כל ההתראות שלא נקראו כהתראות שנקראו"
+      no_messages_title: "אין לך הודעות כלל"
+      no_bookmarks_title: "עדיין לא הוספת שום דבר לסימניות"
+      no_bookmarks_body: >
+        ניתן להתחיל להוסיף פוסטים לסימניות עם הכפתור %{icon} והן תופענה כאן לפנייה בקלות. ניתן גם לתזמן תזכורת!
+      no_notifications_title: "אין לך התראות עדיין"
       first_notification: "התראה ראשונה! בחרו אותה כדי להתחיל."
       dynamic_favicon: "הצגת ספירה בסמל הדפדפן"
       skip_new_user_tips:
@@ -965,7 +1065,7 @@ he:
       color_scheme_default_on_all_devices: "הגדרת ערכות צבעים כבררת מחדל לכל המכשירים שלי"
       color_scheme: "ערכת צבעים"
       color_schemes:
-        default_description: "בררת מחדל"
+        default_description: "בררת המחדל לערכת העיצוב"
         disable_dark_scheme: "כמו הרגילה"
         dark_instructions: "ניתן להדגים את ערכת צבעי הערכה הכהה על ידי החלפת מצב התצוגה הכהה במכשיר שלך."
         undo: "איפוס"
@@ -1069,6 +1169,7 @@ he:
         tags: "תגיות"
       preferences_nav:
         account: "חשבון"
+        security: "אבטחה"
         profile: "פרופיל"
         emails: "כתובות דוא״ל"
         notifications: "התראות"
@@ -1184,6 +1285,7 @@ he:
         uploaded_avatar_empty: "הוסיפו תמונה אישית"
         upload_title: "העלאת התמונה שלך"
         image_is_not_a_square: "אזהרה: קיצצנו את התמונה שלך; האורך והרוחב לא היו שווים."
+        logo_small: "הלוגו הקטן של האתר. משמש כבררת מחדל."
       change_profile_background:
         title: "כותרת פרופיל"
         instructions: "כותרות הפרופילים ימורכזו ורוחבן ייקבע ל־1110 פיקסלים כבררת מחדל."
@@ -1206,7 +1308,7 @@ he:
         set_primary: "הגדרת כתובת דוא״ל ראשית"
         destroy: "הסרת דוא״ל"
         add_email: "הוספת כתובת דוא״ל חלופית"
-        sso_override_instructions: "ניתן לעדכן את כתובת הדוא״ל דרך ספק ה־SSO."
+        auth_override_instructions: "ניתן לעדכן את כתובת הדוא״ל דרך ספק האימות."
         no_secondary: "אין כתובות דוא״ל משניות"
         instructions: "לעולם לא מוצג לציבור."
         admin_note: "הערה: משתמש ניהולי שמשנה כתובת דוא״ל למשתמש שאינו ניהולי מציינת שהגישה של המשתמש לכתובת הדוא״ל המקורית אבדה, לכן תישלח הודעת איפוס ססמה לכתובת החדשה בדוא״ל. כתובת הדוא״ל של המשתמש לא תוחלף עד לביצוע תהליך איפוס הססמה."
@@ -1214,6 +1316,7 @@ he:
         required: "נא למלא כתובת דוא״ל"
         invalid: "בבקשה הכניסו כתובת דואר אלקטרוני תקינה"
         authenticated: "כתובת הדואר האלקטרוני שלך אושרה על ידי %{provider}"
+        invite_auth_email_invalid: "הודעת ההזמנה שלך בדוא״ל אינה תואמת להודעה שאומתה על ידי %{provider}"
         frequency_immediately: "נשלח לך הודעה בדוא״ל מיידית אם טרם קראת את מה ששלחנו לך קודם."
         frequency:
           one: "נשלח לך הודעה בדוא״ל רק אם לא הופעת בדקה האחרונה."
@@ -1249,9 +1352,10 @@ he:
         checking: "בודק זמינות שם משתמש..."
         prefilled: "הדואר האלקטרוני תואם לשם משתמש זה"
         required: "נא למלא שם משתמש"
+        edit: "עריכת שם משתמש"
       locale:
-        title: "שפת ממשק"
-        instructions: "שפת ממשק המשתמש. היא תתחלף כשתרעננו את העמוד."
+        title: "שפת מנשק"
+        instructions: "שפת מנשק המשתמש. היא תתחלף עם רענון העמוד."
         default: "(ברירת מחדל)"
         any: "כלשהו"
       password_confirmation:
@@ -1345,10 +1449,27 @@ he:
         after_10_minutes: "אחרי 10 דקות"
       notification_level_when_replying: "כאשר אני מפרסם נושא, קבע נושא זה ל"
       invited:
-        search: "הקלידו כדי לחפש הזמנות..."
         title: "הזמנות"
+        pending_tab: "ממתין"
+        pending_tab_with_count: "ממתינות (%{count})"
+        expired_tab: "לא בתוקף"
+        expired_tab_with_count: "לא בתוקף (%{count})"
+        redeemed_tab: "נוצלו"
+        redeemed_tab_with_count: "נוצלו (%{count})"
+        invited_via: "הזמנה"
+        invited_via_link: "קישור %{key}‏ (%{count} / %{max} נוצלו)"
+        groups: "קבוצות"
+        topic: "נושא"
+        sent: "נוצרו/נשלחו לאחרונה"
+        expires_at: "תפוג"
+        edit: "עריכה"
+        remove: "הסרה"
+        copy_link: "קבלת קישור"
+        reinvite: "לשלוח דוא״ל מחדש"
+        reinvited: "ההזמנה נשלחה שוב"
+        removed: "הוסרה"
+        search: "הקלידו כדי לחפש הזמנות..."
         user: "משתמשים שהוזמנו"
-        sent: "שליחה אחרונה"
         none: "אין הזמנות להצגה"
         truncated:
           one: "מראה את ההזמנה הראשונה."
@@ -1356,38 +1477,21 @@ he:
           many: "מראה את %{count} ההזמנות הראשונות."
           other: "מראה את %{count} ההזמנות הראשונות."
         redeemed: "הזמנות נוצלו"
-        redeemed_tab: "נענו"
-        redeemed_tab_with_count: "נוצלו (%{count})"
-        redeemed_at: "נפדו ב"
+        redeemed_at: "נוצלו"
         pending: "הזמנות ממתינות"
-        pending_tab: "ממתין"
-        pending_tab_with_count: "ממתינות (%{count})"
         topics_entered: "נושאים שנצפו"
         posts_read_count: "פוסטים נקראו"
         expired: "פג תוקף ההזמנה."
-        rescind: "הסרה"
-        rescinded: "הזמנה הוסרה"
-        rescind_all: "הסרת הזמנות שתוקפן פג"
-        rescinded_all: "כל ההזמנות שתוקפן פג הוסרו!"
-        rescind_all_confirm: "להסיר את כל ההזמנות שתוקפן פג?"
-        reinvite: "משלוח חוזר של הזמנה"
-        reinvite_all: "שלח מחדש את כל ההזמנות"
+        remove_all: "הסרת הזמנות שתוקפן פג"
+        removed_all: "כל ההזמנות שתוקפן פג הוסרו!"
+        remove_all_confirm: "להסיר את כל ההזמנות שתוקפן פג?"
+        reinvite_all: "לשלוח את כל ההזמנות מחדש"
         reinvite_all_confirm: "לשלוח מחדש את כל ההזמנות?"
-        reinvited: "ההזמנה נשלחה שוב"
-        reinvited_all: "כל ההזמנות נשלחו מחדש!"
+        reinvited_all: "כל ההזמנות נשלחו!"
         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}"
@@ -1399,12 +1503,32 @@ he:
           error: "אירעה שגיאה ביצירת קישור הזמנה."
           max_redemptions_allowed_label: "לכמה אנשים מותר להירשם באמצעות הקישור הזה?"
           expires_at: "מתי תוקף קישור ההזמנה יפוג?"
+        invite:
+          new_title: "יצירת הזמנה"
+          edit_title: "עריכת הזמנה"
+          instructions: "ניתן לשתף את הקישור הזה באופן מיידי כדי להעניק גישה לאתר:"
+          copy_link: "העתקת קישור"
+          expires_in_time: "תפוג בעוד %{time}."
+          expired_at_time: "פגה ב־%{time}."
+          show_advanced: "הצגת אפשרויות מתקדמות"
+          hide_advanced: "הסתרת אפשרויות מתקדמות"
+          restrict_email: "להגביל את ההזמנה לכתובת דוא״ל אחת"
+          max_redemptions_allowed: "מספר השימושים המרבי:"
+          add_to_groups: "הוספה לקבוצות:"
+          invite_to_topic: "שליחה לנושא עם הכניסה הראשונה:"
+          expires_at: "תפוגה לאחר:"
+          custom_message: "הודעה אישית כרשות:"
+          send_invite_email: "לשמור ולשלח דוא״ל"
+          save_invite: "שמירת הזמנה"
+          invite_saved: "ההזמנה נשמרה."
+          invite_copied: "קישור ההזמנה הועתק."
+          blank_email: "קישור ההזמנה לא הועתק. יש למלא כתובת דוא״ל."
         bulk_invite:
           none: "אין הזמנות להצגה בעמוד הזה."
           text: "הזמנה כמותית"
-          success: "העלאת הקובץ החלה בהצלחה, תקבלו התראה באמצעות מסר כאשר התהליך יושלם."
+          progress: "מתבצעת העלאה %{progress}%…"
+          success: "הקובץ נשלח בהצלחה. תישלח אליך הודעה כשהתהליך יושלם."
           error: "הקובץ אמור להיות בתצורת CSV, עמך הסליחה."
-          confirmation_message: "פעולה זו תשלח הזמנות בדוא״ל לכל מי שבקובץ שהועלה."
       password:
         title: "סיסמה"
         too_short: "הסיסמה שלך קצרה מידי."
@@ -1484,6 +1608,8 @@ he:
       avatar:
         title: "תמונת פרופיל"
         header_title: "פרופיל, הודעות, סימניות והעדפות"
+        name_and_description: "%{name} - %{description}"
+        edit: "עריכת תמונת פרופיל"
       title:
         title: "כותרת"
         none: "(ללא)"
@@ -1521,7 +1647,7 @@ he:
       close: "סגירה"
       dismiss_error: "התעלמות מהשגיאה"
     close: "סגור"
-    assets_changed_confirm: "האתר עבר עדכון. תרצו לרענן לגרסה המתקדמת ביותר?"
+    assets_changed_confirm: "האתר זכה לשדרוג תכנה. למשוך את הגרסה העדכנית?"
     logout: "יצאת מהמערכת."
     refresh: "רענן"
     home: "בית"
@@ -1541,15 +1667,6 @@ he:
       exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {שגיאה אחת בשעה חרגה} other {# שגיאות בשעה חרגו}}</a> ממגבלת האתר שהיא {limit, plural, one {שגיאה אחת בשעה} other {# שגיאות בשעה}}."
       exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {שגיאה אחת בדקה חרגה} other {# שגיאות בדקה חרגו}}</a> ממגבלת האתר שהיא {limit, plural, one {שגיאה אחת בדקה} other {# שגיאות בדקה}}."
     learn_more: "למד עוד..."
-    all_time: "סך הכל"
-    all_time_desc: "כל הנושאים שנוצרו"
-    year: "שנה"
-    year_desc: "נושאים שפורסמו ב־365 הימים האחרונים"
-    month: "חודש"
-    month_desc: "נושאים שפורסמו ב־30 הימים האחרונים"
-    week: "שבוע"
-    week_desc: "נושאים שפורסמו ב־7 הימים האחרונים"
-    day: "יום"
     first_post: פוסט ראשון
     mute: השתק
     unmute: ביטול השתקה
@@ -1574,8 +1691,12 @@ he:
       value_prop: "בעת יצירת החשבון, אנו זוכרים במדויק מה קראת, לכן תמיד יתאפשר לך לחזור להיכן שהפסקת. נוסף על כך, יישלחו אליך התראות, כאן ודרך דוא״ל כשמתקבלת תגובה על משהו שכתבת. יש לך גם אפשרות לסמן לייק פוסטים שאהבת כדי להוסיף ולהפיץ אהבה. :heartpulse:"
     summary:
       enabled_description: "אתם צופים בסיכום נושא זה: הפוסטים המעניינים ביותר כפי שסומנו על ידי הקהילה."
-      description: "ישנן <b>%{replyCount}</b> תגובות."
-      description_time: "יש <b>%{replyCount}</b> תגובות עם זמן קריאה מוערך של <b>%{readingTime} דקות</b>."
+      description:
+        one: "יש תגובה <b>%{count}</b>."
+        two: "יש <b>%{count}</b> תגובות."
+        many: "יש <b>%{count}</b> תגובות."
+        other: "יש <b>%{count}</b> תגובות."
+      description_time_MF: "יש {replyCount, plural, one {תגובה <b>אחת</b>} other {<b>#</b> תגובות}} עם זמן קריאה משוערך של <b>{readingTime, plural, one {דקה} other {# דקות}}</b>."
       enable: "סכם נושא זה"
       disable: "הצג את כל הפוסטים"
     deleted_filter:
@@ -1600,8 +1721,10 @@ he:
     trust_level: "דרגת אמון"
     search_hint: "שם משתמש, דוא״ל או כתובת IP"
     create_account:
+      header_title: "ברוך בואך!"
+      subheader_title: "הבה ניצור לך חשבון"
       disclaimer: "עצם הרשמתך מביעה את הסכמתך ל<a href='%{privacy_link}' target='blank'>מדיניות הפרטיות</a> ול<a href='%{tos_link}' target='blank'>תנאי השירות</a>."
-      title: "יצירת חשבון חדש"
+      title: "יצירת חשבון משלך"
       failed: "משהו לא בסדר, אולי כבר קיימת כתובת דואר אלקטרוני כזו. נסו את קישור שכחתי סיסמה."
     forgot_password:
       title: "אתחול סיסמה"
@@ -1620,6 +1743,7 @@ he:
     email_login:
       link_label: "נא לשלוח לי קישור לכניסה בדוא״ל"
       button_label: "עם דוא״ל"
+      login_link: "לדלג על הססמה, פשוט לשלוח לי קישור כניסה בדוא״ל"
       emoji: "אמוג׳י של מנעול"
       complete_username: "אם קיים חשבון שמתאים לשם המשתמש <b>%{username}</b>, בקרוב אמורה להגיע אליך הודעה בדוא״ל עם קישור כניסה למערכת."
       complete_email: "אם קיים חשבון שמתאים ל־<b>%{email}</b>, בקרוב אמורה להגיע אליך הודעה בדוא״ל עם קישור כניסה למערכת."
@@ -1631,6 +1755,8 @@ he:
       logging_in_as: מתבצעת כניסה בתור %{email}
       confirm_button: סיום הכניסה
     login:
+      header_title: "ברוך שובך"
+      subheader_title: "כניסה לחשבון שלך"
       title: "כניסה"
       username: "משתמש"
       password: "סיסמה"
@@ -1646,7 +1772,7 @@ he:
       security_key_not_allowed_error: "זמן תהליך אימות מפתח האבטחה פג או שבוטל."
       security_key_no_matching_credential_error: "לא ניתן למצוא פרטי גישה במפתח האבטחה שסופק."
       security_key_support_missing_error: "המכשיר או הדפדפן הנוכחי שלך לא תומך בשימוש במפתחות אבטחה, נא להשתמש בשיטה אחרת."
-      email_placeholder: "דואר אלקטרוני או שם משתמש/ת"
+      email_placeholder: "דוא״ל / שם משתמש"
       caps_lock_warning: "מקש Caps Lock לחוץ"
       error: "שגיאה לא ידועה"
       cookies_error: "כנראה שהעוגיות בדפדפן שלך מושבתות. אין אפשרות להיכנס מבלי להפעיל אותן."
@@ -1713,7 +1839,6 @@ he:
       apple_international: "אפל/בינלאומי"
       google: "גוגל"
       twitter: "טוויטר"
-      emoji_one: "JoyPixels (לשעבר EmojiOne)"
       win10: "חלונות 10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1748,6 +1873,8 @@ he:
         many: "+ %{count} תת־קטגוריות"
         other: "+ %{count} תת־קטגוריות"
     select_kit:
+      filter_by: "סינון לפי: %{name}"
+      select_to_filter: "נא לבחור ערך לסינון"
       default_header_text: בחירה…
       no_content: לא נמצאו התאמות
       filter_placeholder: חיפוש...
@@ -1769,13 +1896,13 @@ he:
         many: "אורך הבחירה חייב להיות %{count} תווים לפחות."
         other: "אורך הבחירה חייב להיות %{count} תווים לפחות."
       components:
+        tag_drop:
+          filter_for_more: לסנן לעוד…
         categories_admin_dropdown:
           title: "ניהול קטגוריות"
     date_time_picker:
       from: מאת
       to: אל
-      errors:
-        to_before_from: "תאריך היעד חייב להיות לאחר תאריך ההתחלה."
     emoji_picker:
       filter_placeholder: חיפוש אחר אמוג׳י
       smileys_&_emotion: חייכנים ורגש
@@ -1797,7 +1924,7 @@ he:
       default: אמוג׳ים מותאמים
     shared_drafts:
       title: "טיוטות משותפות"
-      notice: "הנושא הזה ניתן לצפייה עבור מי שיכולים לצפות בקטגורית <b>%{category}</b>."
+      notice: "הנושא הזה זמין לצפייה לאלו שיכולים לפרסם טיוטות שיתופיות."
       destination_category: "קטגוריית יעד"
       publish: "פרסום טיוטה משותפת"
       confirm_publish: "לפרסם את הטיוטה הזו?"
@@ -1808,7 +1935,6 @@ he:
       options: "אפשרויות"
       whisper: "לחישה"
       unlist: "לא-רשום"
-      blockquote_text: "בלוק ציטוט"
       add_warning: "זוהי אזהרה רשמית."
       toggle_whisper: "הפעלת לחישה"
       toggle_unlisted: "סימון/אי-סימון כלא-ברשימות"
@@ -1834,10 +1960,22 @@ he:
       reference_topic_title: "תגובה: %{title}"
       error:
         title_missing: "יש להזין כותרת."
-        title_too_short: "על הכותרת להיות באורך %{min} תווים לפחות."
-        title_too_long: "על הכותרת להיות באורך %{max} לכל היותר."
+        title_too_short:
+          one: "על הכותרת להיות באורך תו %{count} לפחות."
+          two: "על הכותרת להיות באורך %{count} תווים לפחות."
+          many: "על הכותרת להיות באורך %{count} תווים לפחות."
+          other: "על הכותרת להיות באורך %{count} תווים לפחות."
+        title_too_long:
+          one: "על הכותרת להיות עד תו %{count}."
+          two: "על הכותרת להיות עד %{count} תווים."
+          many: "על הכותרת להיות עד %{count} תווים."
+          other: "על הכותרת להיות עד %{count} תווים."
         post_missing: "הפוסט לא יכול להיות ריק"
-        post_length: "על הפוסט להיות באורך %{min} תווים לפחות"
+        post_length:
+          one: "על הפוסט להיות באורך תו %{count} לפחות"
+          two: "על הפוסט להיות באורך %{count} תווים לפחות"
+          many: "על הפוסט להיות באורך %{count} תווים לפחות"
+          other: "על הפוסט להיות באורך %{count} תווים לפחות"
         try_like: "האם ניסית את כפתור ה-%{heart}?"
         category_missing: "עליך לבחור קטגוריה."
         tags_missing:
@@ -1872,8 +2010,8 @@ he:
       saved: "נשמר!"
       saved_draft: "טיוטה לפוסט בעריכה. נא לגעת כדי להמשיך."
       uploading: "מעלה..."
-      show_preview: "הראה תצוגה מקדימה &raquo;"
-      hide_preview: "&laquo; הסתר תצוגה מקדימה"
+      show_preview: "להציג תצוגה מקדימה"
+      hide_preview: "להסתיר תצוגה מקדימה"
       quote_post_title: "ציטוט פוסט בשלמותו"
       bold_label: "B"
       bold_title: "מודגש"
@@ -1886,8 +2024,8 @@ he:
       link_dialog_title: "הזן קישור"
       link_optional_text: "כותרת כרשות"
       link_url_placeholder: "יש להדביק כתובת כדי לחפש נושאים"
-      quote_title: "ציטוט"
-      quote_text: "ציטוט"
+      blockquote_title: "מקטע ציטוט"
+      blockquote_text: "בלוק ציטוט"
       code_title: "טקסט מעוצב"
       code_text: "הזחה של הטקסט ב-4 רווחים"
       paste_code_text: "הקלידו או הדביקו קוד כאן"
@@ -1912,7 +2050,7 @@ he:
         title: "שחכתם להוסיף נמענים?"
         body: "כרגע ההודעה הזו נשלחת רק אליכם!"
       slow_mode:
-        error: "נושא זה נכנס למצב אטי. כדי לקדם דיון מתחשב ואחראי ניתן לפרסם פעם בכל %{duration}."
+        error: "נושא זה נמצא במצב אטי. כבר פרסמת לאחרונה; אפשר לפרסם שוב בעוד %{timeLeft}."
       admin_options_title: "אפשרויות סגל כרשות לנושא זה"
       composer_actions:
         reply: השב
@@ -1941,7 +2079,7 @@ he:
           label: "נושא חדש"
         shared_draft:
           label: "טיוטה משותפת"
-          desc: "יצירת טיוטה לנושא שרק חברי הסגל יוכלו לראות"
+          desc: "יצירת טיוטה לנושא שרק משתמשים מורשים יוכלו לראות"
         toggle_topic_bump:
           label: "החלפת מצב הקפצת נושא"
           desc: "הגב מבלי לשנות את תאריך התגובה האחרונה"
@@ -2055,14 +2193,15 @@ he:
       from_my_computer: "מהמחשב שלי"
       from_the_web: "מהאינטרנט"
       remote_tip: "קישור לתמונה"
-      remote_tip_with_attachments: "קישור לתמונה או לקובץ %{authorized_extensions}"
+      remote_tip_with_attachments: "קישור לתמונה או לקובץ"
       local_tip: "בחרו תמונות ממכשירכם"
-      local_tip_with_attachments: "בחירת תמונות או קבצים מהמכשיר שלך %{authorized_extensions}"
+      local_tip_with_attachments: "בחירת תמונות או קבצים מהמכשיר שלך"
       hint: "(ניתן גם לגרור לעורך להעלאה)"
       hint_for_supported_browsers: "תוכלו גם לגרור או להדביק תמונות לעורך"
       uploading: "מעלה"
       select_file: "בחירת קובץ"
       default_image_alt_text: תמונה
+      supported_formats: "תצורות קבצים נתמכות"
     search:
       sort_by: "מיון על פי"
       relevance: "רלוונטיות"
@@ -2090,6 +2229,7 @@ he:
       or_search_google: "או שתנסו חיפוש בעזרת גוגל במקום."
       search_google: "נסה לחפש באמצעות גוגל במקום:"
       search_google_button: "גוגל"
+      search_button: "חיפוש"
       context:
         user: "חיפוש פוסטים לפי @%{username}"
         category: "חפשו את הקטגוריה #%{category}"
@@ -2155,7 +2295,7 @@ he:
     go_back: "חזור אחורה"
     not_logged_in_user: "עמוד משתמש עם סיכום פעילות נוכחית והעדפות"
     current_user: "לך לעמוד המשתמש שלך"
-    view_all: "להציג הכול"
+    view_all: "להציג את כל %{tab}"
     topics:
       new_messages_marker: "ביקור אחרון"
       bulk:
@@ -2166,7 +2306,7 @@ he:
         reset_read: "איפוס נקראו"
         delete: "מחיקת נושאים"
         dismiss: "ביטול"
-        dismiss_read: "בטלו את כל אלו שלא-נקראו"
+        dismiss_read: "התעלמות מאלו שלא נקראו"
         dismiss_button: "ביטול..."
         dismiss_tooltip: "ביטול הצגת פוסטים חדשים או מעקב אחר נושאים"
         also_dismiss_topics: "הפסיקו לעקוב אחרי נושאים אלו כדי שהם לא יופיעו שוב בתור לא-נקראו"
@@ -2176,7 +2316,9 @@ he:
         change_category: "קביעת קטגוריה"
         close_topics: "סגירת נושאים"
         archive_topics: "ארכוב נושאים"
+        move_messages_to_inbox: "העברה לדואר נכנס"
         notification_level: "התראות"
+        change_notification_level: "שינוי רמת ההתראות"
         choose_new_category: "נא לבחור קטגוריה לנושאים:"
         selected:
           one: "בחרת בנושא <b>אחד</b>."
@@ -2188,7 +2330,12 @@ he:
         choose_new_tags: "בחירה בתגיות חדשות לנושאים אלו:"
         choose_append_tags: "בחירה בתגיות חדשות שיתווספו לנושאים אלו:"
         changed_tags: "התגיות של נושאים אלו השתנו."
-        remove_tags: "הסרת תגיות"
+        remove_tags: "הסרת כל התגיות"
+        confirm_remove_tags:
+          one: "כל התגיות יוסרו מהנושא הזה. להמשיך?"
+          two: "כל התגיות יוסרו מ־<b>%{count}</b> הנושאים האלה. להמשיך?"
+          many: "כל התגיות יוסרו מ־<b>%{count}</b> הנושאים האלה. להמשיך?"
+          other: "כל התגיות יוסרו מ־<b>%{count}</b> הנושאים האלה. להמשיך?"
         progress:
           one: "התקדמות: נושא <strong>%{count}</strong>"
           two: "התקדמות: <strong>%{count}</strong> נושאים"
@@ -2206,7 +2353,7 @@ he:
         top: "אין נושאים מובילים."
         educate:
           new: '<p>הנושאים החדשים שלך יופיעו כאן. כבררת מחדל, נושאים נחשבים חדשים ויופיעו עם המחוון <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> אם הם נוצרו ביומיים האחרונים. </p><p>ניתן לבקר בעמוד ה<a href="%{userPrefsUrl}">העדפות</a> שלך כדי לשנות זאת.</p>'
-          unread: '<p>הנושאים שלא קראת יופיעו כאן.</p><p>כבררת מחדל, נושאים ייחשבו שטרם קראת אותם ויציגו את המונה <span class="badge new-posts badge-notification">1</span> בספירה של הפריטים שלא נקראו אם: </p> <ul><li>יצרת את הנושא</li><li>הגבת לנושא</li><li>קראת את הנושא במשך יותר מ־4 דקות</li></ul><p>או אם בחרת לעקוב או לצפות בנושא דרך מנגנון ההתראות המופיע בתחתית כל נושא.</p><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>או אם בחרת לעקוב או לצפות בנושא דרך \U0001F514 המופיע בכל נושא.</p><p>ניתן לבקר ב בעמוד ה<a href=\"%{userPrefsUrl}\">העדפות</a> שלך כדי לשנות זאת.</p>"
       bottom:
         latest: "אין עוד נושאים אחרונים."
         posted: "אין עוד נושאים שפורסמו."
@@ -2297,7 +2444,6 @@ he:
       read_more_in_category: "רוצים לקרוא עוד? עיינו בנושאים אחרים ב %{catLink} או %{latestLink}."
       read_more: "רוצה לקרוא עוד? %{catLink} or %{latestLink}."
       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: עיינו בכל הקטגוריות
       browse_all_tags: עיון בכל התגיות
@@ -2311,19 +2457,25 @@ he:
         select: "משתמשים יכולים לפרסם לנושא הזה רק פעם אחת בכל:"
         description: "כדי לקדם דיון מתחשב במהלך דיונים מהירים או וכחניים, משתמשים חייבים להמתין בטרם פרסום פעם נוספת לנושא הזה."
         save: "הפעלה"
+        enabled_until: "מופעל עד:"
         remove: "השבתה"
         hours: "שעות:"
         minutes: "דקות:"
         seconds: "שניות:"
         durations:
+          10_minutes: "10 דקות"
           15_minutes: "רבע שעה"
+          30_minutes: "חצי שעה"
+          45_minutes: "45 דקות"
           1_hour: "שעה"
+          2_hours: "שעתיים"
           4_hours: "4 שעות"
-          1_day: "יום"
-          1_week: "שבוע"
+          8_hours: "8 שעות"
+          12_hours: "12 שעות"
+          24_hours: "24 שעות"
           custom: "משך מותאם אישית"
       slow_mode_notice:
-        duration: "עליך להמתין %{duration} בין פוסטים בנושא הזה"
+        duration: "נא להמתין %{duration} בין פוסטים בנושא הזה"
       topic_status_update:
         title: "שעון עצר לנושא"
         save: "קביעת שעון עצר"
@@ -2332,7 +2484,9 @@ he:
         remove: "הסרת שעון עצר"
         publish_to: "פרסום ל:"
         when: "מתי:"
-        time_frame_required: נא לבחור מסגרת זמנים
+        time_frame_required: "נא לבחור מסגרת זמנים"
+        min_duration: "משך הזמן חייב להיות גדול מ־0"
+        max_duration: "משך הזמן חייב להיות פחות מ־20 שנה"
       auto_update_input:
         none: "נא לבחור טווח זמן"
         now: "כעת"
@@ -2361,9 +2515,11 @@ he:
         title: "סגירה זמנית"
       auto_close:
         title: "סגירה אוטומטית של נושא"
-        label: "שעות סגירת נושאים אוטומטית:"
+        label: "לסגור נושאים אוטומטית לאחר:"
         error: "אנא הכניסו ערך תקין."
         based_on_last_post: "אל תסגרו עד שהפוסט האחרון בנושא הוא לפחות בגיל זה."
+      auto_close_after_last_post:
+        title: "לסגור את הנושא אוטומטית לאחר הפוסט האחרון"
       auto_delete:
         title: "מחיקה-אוטומטית של נושא"
       auto_bump:
@@ -2376,7 +2532,7 @@ he:
         auto_open: "נושא זה ייפתח אוטומטית %{timeLeft}."
         auto_close: "נושא זו ייסגר אוטומטית %{timeLeft}."
         auto_publish_to_category: "נושא זה יפורסם ל-<a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "נושא זה ייסגר %{duration} אחרי התגובה האחרונה."
+        auto_close_after_last_post: "נושא זה ייסגר %{duration} אחרי התגובה האחרונה."
         auto_delete: "נושא זה יימחק אוטומטית %{timeLeft}."
         auto_bump: "נושא זה יוקפץ אוטומטית %{timeLeft}."
         auto_reminder: "תישלח אליך תזכורת בנוגע לנושא זה %{timeLeft}."
@@ -2387,6 +2543,11 @@ he:
         two: "הפוסט האחרון בנושא הוא כבר בן שעתיים (%{count}), אז הנושא ייסגר אוטומטית."
         many: "הפוסט האחרון בנושא הוא כבר בן %{count} שעות, אז הנושא ייסגר אוטומטית."
         other: "הפוסט האחרון בנושא הוא כבר בן %{count} שעות, אז הנושא ייסגר אוטומטית."
+      auto_close_momentarily:
+        one: "הפוסט האחרון בנושא הוא כבר בן שעה (%{count}), לכן הנושא ייסגר מיידית."
+        two: "הפוסט האחרון בנושא הוא כבר בן שעתיים (%{count}), לכן הנושא ייסגר מיידית."
+        many: "הפוסט האחרון בנושא הוא כבר בן %{count} שעות, לכן הנושא ייסגר מיידית."
+        other: "הפוסט האחרון בנושא הוא כבר בן %{count} שעות, לכן הנושא ייסגר מיידית."
       timeline:
         back: "חזרה"
         back_description: "חיזרו לפוסט האחרון שלא-נקרא על-ידיכם"
@@ -2398,7 +2559,11 @@ he:
         go: "קדימה"
         jump_bottom: "מעבר לפוסט האחרון"
         jump_prompt: "קפצו אל..."
-        jump_prompt_of: "מתוך %{count} פוסטים"
+        jump_prompt_of:
+          one: "מתוך פוסט %{count}"
+          two: "מתוך %{count} פוסטים"
+          many: "מתוך %{count} פוסטים"
+          other: "מתוך %{count} פוסטים"
         jump_prompt_long: "מעבר אל…"
         jump_bottom_with_number: "קפיצה לפוסט %{post_number}"
         jump_prompt_to_date: "עד לתאריך"
@@ -2410,12 +2575,15 @@ he:
         reasons:
           mailing_list_mode: "מצב רשימת תפוצה פעיל, לכן תישלח אליך התראה בדוא״ל על תגובות לנושא זה."
           "3_10": "תקבלו התראות כיוון שאתם צופים בתג שקשור לנושא זה."
+          "3_10_stale": "תישלחנה אליך הודעות כיוון שבחרת לעקוב אחר תגית בנושא הזה בעבר."
           "3_6": "תקבלו התראות כיוון שאתם עוקבים אחרי קטגוריה זו."
+          "3_6_stale": "תישלחנה אליך הודעות כיוון שבחרת לעקוב אחר הקטגוריה הזאת בעבר."
           "3_5": "תקבלו התראות כיוון שהתחלתם לעקוב אחרי הנושא הזה אוטומטית."
           "3_2": "תקבלו התראות כיוון שאתם עוקבים אחרי הנושא הזה."
           "3_1": "תקבלו התראות כיוון שאתם יצרתם את הנושא הזה."
           "3": "תקבלו התראות כיוון שאתם עוקבים אחרי הנושא זה."
           "2_8": "תראו ספירה של תגובות חדשות כיוון שאתם עוקבים אחר קטגוריה זו."
+          "2_8_stale": "יופיע מניין תגובות חדשות כיוון שבחרת לעקוב אחר קטגוריה זו בעבר."
           "2_4": "תראו ספירה של תגובות חדשות כיוון שפרסמתם תגובה לנושא זה."
           "2_2": "תראו ספירה של תגובות חדשות כיוון שאתם עוקבים אחר נושא זה:"
           "2": 'יופיע עיטור עם מספר התגובות החדשות מכיוון ש<a href="%{basePath}/u/%{username}/preferences/notifications">קראת את הנושא הזה</a>.'
@@ -2483,6 +2651,17 @@ he:
         title: "שיתוף"
         extended_title: "שתף קישור"
         help: "שתפו קישור לנושא זה"
+        instructions: "שיתוף קישור לנושא זה:"
+        copied: "קישור הנושא הועתק."
+        notify_users:
+          title: "להודיע"
+          instructions: "להודיע למשתמשים הבאים על הנושא הזה:"
+          success:
+            one: "נשלחה הודעה אל %{username} על הנושא הזה."
+            two: "נשלחה הודעה לכולם על הנושא הזה."
+            many: "נשלחה הודעה לכולם על הנושא הזה."
+            other: "נשלחה הודעה לכולם על הנושא הזה."
+        invite_users: "להזמין"
       print:
         title: "הדפסה"
         help: "פתיחת גרסה ידידותית להדפסה של נושא זה"
@@ -2542,16 +2721,16 @@ he:
       invite_reply:
         title: "הזמנה"
         username_placeholder: "שם משתמש"
-        action: "שלח הזמנה"
+        action: "שליחת הזמנה"
         help: "הזמינו אנשים אחרים לנושא זה דרך דואר אלקטרוני או התראות"
-        to_forum: "אנו נשלח הודעה קצרה בדוא״ל שתאפשר לחברים שלך להצטרף באופן מיידי על ידי לחיצה על קישור וללא צורך בכניסה למערכת."
-        sso_enabled: "הכניסו את שם המשתמש של האדם שברצונכם להזמין לנושא זה."
+        to_forum: "אנו נשלח הודעה קצרה בדוא״ל שתאפשר לחברים שלך להצטרף באופן מיידי בלחיצה על קישור."
+        discourse_connect_enabled: "נא למלא את שם המשתמש של מי שברצונך להזמין לנושא זה."
         to_topic_blank: "הכניסו את שם המשתמש או כתובת הדואר האלקטרוני של האדם שברצונכם להזמין לנושא זה."
         to_topic_email: "מילאת כתובת דוא״ל. אנחנו נשלח לך הזמנה בדוא״ל שתאפשר לחבריך להשיב לנושא הזה מיידית."
         to_topic_username: "הזנת שם משתמש/ת. נשלח התראה עם לינק הזמנה לנושא הזה. "
         to_username: "הכנסתם את שם המשתמש של האדם שברצונכם להזמין. אנו נשלח התראה למשתמש זה עם קישור המזמין אותו לנושא זה."
         email_placeholder: "name@example.com"
-        success_email: "שלחנו הזמנה אל <b>%{emailOrUsername}</b>. נודיע לך כשהזמנה תיענה. כדאי לבדוק את לשונית ההזמנות בעמוד המשתמש שלך כדי לעקוב אחר ההזמנות ששלחת."
+        success_email: "שלחנו הזמנה אל <b>%{invitee}</b>. נודיע לך כשההזמנה תנוצל. כדאי לבדוק את לשונית ההזמנות בעמוד המשתמש שלך כדי לעקוב אחר ההזמנות ששלחת."
         success_username: "הזמנו את המשתמש להשתתף בנושא."
         error: "מצטערים, לא יכלנו להזמין משתמש/ת אלו. אולי הם כבר הוזמנו בעבר? (תדירות שליחת ההזמנות מוגבלת)"
         success_existing_email: " כבר קיים משתמש עם כתובת הדוא״ל <b>%{emailOrUsername}</b>. נשלחה הזמנה למשתמש להשתתף בנושא."
@@ -2683,8 +2862,8 @@ he:
       edit_reason: "סיבה: "
       post_number: "פוסט %{number}"
       ignored: "תוכן בהתעלמות"
-      wiki_last_edited_on: "וויקי נערך לאחרונה ב"
-      last_edited_on: "הפוסט נערך לאחרונה ב"
+      wiki_last_edited_on: "הוויקי נערך לאחרונה ב־%{dateTime}"
+      last_edited_on: "הפוסט נערך לאחרונה ב־%{dateTime}"
       reply_as_new_topic: "תגובה כנושא מקושר"
       reply_as_new_private_message: "תגובה כהודעה חדשה לאותם נמענים"
       continue_discussion: "ממשיך את הדיון מ %{postLink}:"
@@ -2713,6 +2892,7 @@ he:
         two: "%{count} תגובות"
         many: "%{count} תגובות"
         other: "%{count} תגובות"
+      has_replies_count: "%{count}"
       unknown_user: "(משתמש לא ידוע/נמחק)"
       has_likes_title:
         one: "מישהו אחד אהב את התגובה הזו"
@@ -2725,6 +2905,18 @@ he:
         two: "אתם ו %{count} אנשים אחרים אהבתם את הפוסט הזה"
         many: "אתם ו %{count} אנשים אחרים אהבתם את הפוסט הזה"
         other: "אתם ו %{count} אנשים אחרים אהבתם את הפוסט הזה"
+      filtered_replies_hint:
+        one: "הצגת הפוסט הזה ואת התגובה עליו"
+        two: "הצגת הפוסט הזה ואת %{count} התגובות עליו"
+        many: "הצגת הפוסט הזה ואת %{count} התגובות עליו"
+        other: "הצגת הפוסט הזה ואת %{count} התגובות עליו"
+      filtered_replies_viewing:
+        one: "מוצגת תגובה %{count} אל"
+        two: "מוצגות %{count} תגובות אל"
+        many: "מוצגות %{count} תגובות אל"
+        other: "מוצגות %{count} תגובות אל"
+      in_reply_to: "טעינת הפוסט ההורה"
+      view_all_posts: "הצגת כל הפוסטים"
       errors:
         create: "אירעה שגיאה ביצירת הפוסט שלך. נא לנסות שוב, עמך הסליחה."
         edit: "אירעה שגיאה בעריכת הפוסט שלך. נא לנסות שוב, עמך הסליחה."
@@ -2740,17 +2932,11 @@ he:
         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:
-        title: "נטישת הטיוטה"
-        confirm: "לנטוש את הפוסט שלך?"
-        no_value: "לא, שמור אותו"
-        no_save_draft: "לא, לשמור טיוטה"
-        yes_value: "כן, נטוש"
+      cancel_composer:
+        confirm: "מה לעשות עם הפוסט שלך?"
+        discard: "להשליך"
+        save_draft: "לשמור טיוטה להמשך"
+        keep_editing: "להמשיך לערוך"
       via_email: "פוסט זה הגיע בדוא״ל"
       via_auto_generated_email: "פוסט זה הגיע דרך הודעת דוא״ל שנוצרה אוטומטית"
       whisper: "פוסט זה הוא לחישה פרטית למפקחים"
@@ -2802,7 +2988,11 @@ he:
         unlock_post_description: "לאפשר למפרסם לערוך את הפוסט הזה"
         delete_topic_disallowed_modal: "אין לך הרשאות למחוק את הנושא הזה. כדי למחוק אותו לצמיתות, יש לסמן אותו בדגל כדי שיקבל את תשומת לב הפיקוח לרבות סיבת הסימון."
         delete_topic_disallowed: "אין לך הרשאה למחוק את הנושא הזה"
-        delete_topic_confirm_modal: "לנושא זה יש למעלה מ־%{minViews} צפיות והוא עשוי להיות יעד חיפוש נפוץ. למחוק את הנושא הזה לחלוטין במקום לערוך ולשפר אותו?"
+        delete_topic_confirm_modal:
+          one: "לנושא זה יש למעלה מצפייה %{count} ועשוי להיות יעד חיפוש נפוץ. למחוק את הנושא הזה לחלוטין במקום לערוך ולשפר אותו?"
+          two: "לנושא זה יש למעלה מ־%{count} צפיות ועשוי להיות יעד חיפוש נפוץ. למחוק את הנושא הזה לחלוטין במקום לערוך ולשפר אותו?"
+          many: "לנושא זה יש למעלה מ־%{count} צפיות ועשוי להיות יעד חיפוש נפוץ. למחוק את הנושא הזה לחלוטין במקום לערוך ולשפר אותו?"
+          other: "לנושא זה יש למעלה מ־%{count} צפיות ועשוי להיות יעד חיפוש נפוץ. למחוק את הנושא הזה לחלוטין במקום לערוך ולשפר אותו?"
         delete_topic_confirm_modal_yes: "כן, למחוק את הנושא הזה"
         delete_topic_confirm_modal_no: "לא, להשאיר את הנושא הזה"
         delete_topic_error: "אירעה שגיאה בעת מחיקת הנושא"
@@ -2811,6 +3001,7 @@ he:
         change_post_notice: "החלפת התראת סגל"
         delete_post_notice: "מחיקת התראת סגל"
         remove_timer: "הסרת שעון עצר"
+        edit_timer: "עריכת מתזמן"
       actions:
         people:
           like:
@@ -2899,6 +3090,18 @@ he:
           edit_bookmark:
             name: "עריכת סימנייה"
             description: "עריכת שם הסימנייה או החלפת מועד התזכורת"
+          pin_bookmark:
+            name: "הצמדת הסימנייה"
+            description: "הצמדת הסימנייה. פעולה זו תגרום לה להופיע בראש רשימת הסימניות שלך."
+          unpin_bookmark:
+            name: "ביטול הצמדת הסימנייה"
+            description: "ביטול הצמדת הסימנייה. היא לא תופיע עוד בראש רשימת המועדפים שלך."
+      filtered_replies:
+        viewing_posts_by: "מוצגים %{post_count} פוסטים מאת"
+        viewing_subset: "חלק מהתגובות מצומצמות"
+        viewing_summary: "מוצג סיכום של הפוסט הזה"
+        post_number: "%{username}, פוסט מס׳ %{post_number}"
+        show_all: "להציג הכול"
     category:
       can: "יכול&hellip; "
       none: "(ללא קטגוריה)"
@@ -2956,10 +3159,10 @@ he:
         reply: "להגיב"
         create: "ליצור"
         no_groups_selected: "אף קבוצה לא קיבלה גישה; קטגוריה זו תהיה גלויה רק לסגל."
-        everyone_has_access: "קטגוריה זו היא ציבורית, כולם יכולים לצפות, להגיב וליצור פוסטים. די להגביל את ההרשאות, יש להסיר הרשאה אחת או יותר מאלו שהוענקו לקבוצה „כולם”."
+        everyone_has_access: 'קטגוריה זו היא ציבורית, כולם יכולים לצפות, להגיב וליצור פוסטים. די להגביל את ההרשאות, יש להסיר הרשאה אחת או יותר מאלו שהוענקו לקבוצה „כולם”.'
         toggle_reply: "החלפת הרשאות תגובה"
         toggle_full: "החלפת הרשאות יצירה"
-        inherited: "הרשאה זו התקבלה בירושה מתוך „כולם”"
+        inherited: 'הרשאה זו התקבלה בירושה מתוך „כולם”'
       special_warning: "אזהרה: קטגוריה זו הגיעה מראש והגדרות האבטחה שלה אינן ניתנות לשינוי. אם אתם מעוניינים להשתמש בקטגוריה זו, מחקו אותה במקום להשתמש בה מחדש."
       uncategorized_security_warning: "קטגוריה זו היא מיוחדת. היא מיועדת להחזקת מגוון של נושאים שאין להם קטגוריה, לא יכולות להיות לקבוצה זו הגדרות אבטחה."
       uncategorized_general_warning: 'קטגוריה זו היא מיוחדת. היא משמשת כקטגוריית בררת המחדל לנושאים חדשים שלא נבחרה עבורם קטגוריה. אם ברצונך למנוע את ההתנהגות הזאת ולאלץ בחירת קטגוריה, <a href="%{settingLink}">נא לנטרל את ההגדרה הזאת כאן</a>. אם מעניין אותך לשנות את השם או את התיאור, עליך לגשת אל <a href="%{customizeLink}">התאמה אישית / תוכן טקסט</a>.'
@@ -2975,6 +3178,7 @@ he:
       num_featured_topics: "מספר הנושאים המוצגים בדף הקטגוריות:"
       subcategory_num_featured_topics: "מספר הנושאים המומלצים בדף קטגוריית ההורה:"
       all_topics_wiki: "להפוך נושאים חדשים לעמודי ויקי כבררת מחדל"
+      allow_unlimited_owner_edits_on_first_post: "לבטל את מגבלת העריכות על ידי הבעלים לפוסט הראשון"
       subcategory_list_style: "סגנון רשימות קטגוריות משנה:"
       sort_order: "סידור ברירת מחדל לנושאים:"
       default_view: "תצוגת ברירת מחדל לנושאים:"
@@ -2998,19 +3202,19 @@ he:
       notifications:
         watching:
           title: "עוקב"
-          description: "תצפו באופן אוטומטי בכל הנושאים שבקטגוריות אלו. תקבלו התראה על כל פוסט חדש בכל אחד מהנושאים בקטגוריה ואת מספר התגובות לכל אחד מהם."
+          description: "כל הנושאים שבקטגוריה הזאת יצטרפו למעקב הצמוד שלך. תישלח אליך התראה על כל פוסט חדש בכל נושא ויופיע מספור של התגובות החדשות."
         watching_first_post:
           title: "צפייה בפוסט הראשון"
           description: "תופענה אצלך התראות על נושאים חדשים בקטגוריה הזו אך לא על תגובות על הנושאים."
         tracking:
           title: "עוקב"
-          description: "אתם תעקבו אוטומטית אחרי כל הנושאים בקטגוריות אלו. אתם תיודעו אם מישהו מזכיר את @שמכם או עונה לכם, וספירה של תגובות חדשות תופיע לכם."
+          description: "כל הנושאים שבקטגוריה הזאת יצטרפו למעקב שלך. תישלח אליך התראה עם כל אזכור של @שמך או תגובות על דברים שכתבת וגם יופיע מספור של התגובות החדשות."
         regular:
           title: "נורמלי"
           description: "תישלח אליך התראה אם מישהו יזכיר את @שם_המשתמש שלך או ישיב לך."
         muted:
           title: "מושתק"
-          description: "לא תקבלו התראות על נושאים חדשים בקטגוריות אלו, והם לא יופיעו בעמוד הלא-נקראו שלך."
+          description: "לא תישלחנה אליך התראות על נושאים חדשים בקטגוריה הזאת והם לא יופיעו בעמוד האחרונים שלך."
       search_priority:
         label: "עדיפות חיפוש"
         options:
@@ -3045,6 +3249,7 @@ he:
       list_filters:
         all: "כל הנושאים"
         none: "אין תת־קטגוריות"
+      colors_disabled: "אי אפשר לבחור צבעים כיוון שסגנון הקטגוריה הוא כלום."
     flagging:
       title: "תודה על עזרתך לשמירה על תרבות הקהילה שלנו!"
       action: "דגלו פוסט"
@@ -3062,7 +3267,8 @@ he:
       notify_action: "הודעה"
       official_warning: "אזהרה רשמית"
       delete_spammer: "מחק ספאמר"
-      delete_confirm_MF: "פעולה זו תסיר {POSTS, plural, one {פוסט <b>אחד</b>} other {<b>#</b> פוסטים}} ו{TOPICS, plural, one {נושא <b>אחד</b>} other {־<b>#</b> נושאים}} שנכתבו על ידי משתמש זה, תסיר את החשבון שלו, תחסום הרשמה מכתובת ה־IP <b> ‏{ip_address}</b> ותוסיף את כתובת הדוא״ל שלו <b>{email}</b> לרשימת חסימה קבועה. האם משתמש זה הוא בוודאות מפיץ זבל (ספאמר)?"
+      flag_for_review: "תור לסקירה"
+      delete_confirm_MF: "פעולה זו תסיר {POSTS, plural, one {פוסט <b>אחד</b>} other {<b>#</b> פוסטים}} ו{TOPICS, plural, one {נושא <b>אחד</b>} other {־<b>#</b> נושאים}} שנכתבו על ידי משתמש זה, תסיר את החשבון שלו, תחסום הרשמה מכתובת ה־IP‏ <b> ‏{ip_address}</b> ותוסיף את כתובת הדוא״ל שלו <b>{email}</b> לרשימת חסימה קבועה. האם משתמש זה הוא בוודאות מפיץ זבל (ספאמר)?"
       yes_delete_spammer: "כן, מחק ספאמר"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(מוסתר)"
@@ -3140,11 +3346,11 @@ he:
         help: "הנושא הזה הוא הודעה אישית"
     posts: "פוסטים"
     posts_likes_MF: |
-      לנושא זה יש {count, plural, one {תגובה 1} other {# תגובות}} {ration, select,
-      low {עם יחס גבוה של לייקים לפוסט}
-      med {עם יחס גבוה מאוד של לייקים לפוסט}
-      high {עם יחס גבוה בצורה יוצאת דופן של לייקים לפוסט}
-      other {}}
+      לנושא זה יש {count, plural, one {תגובה אחת} two {שתי תגובות} many {# תגובות} other {# תגובות}} {ratio, select,
+        low {עם יחס גבוה של לייקים לפוסט}
+        med {עם יחס גבוה מאוד של לייקים לפוסט}
+        high {עם יחס גבוה במיוחד של לייקים לפוסט}
+        other {}}
     original_post: "פוסט מקורי"
     views: "צפיות"
     views_lowercase:
@@ -3172,7 +3378,7 @@ he:
       many: "משתמשים"
       other: "משתמשים"
     category_title: "קטגוריה"
-    history: "היסטוריה"
+    history: "היסטוריה, 100 התיקונים האחרונים"
     changed_by: "מאת %{author}"
     raw_email:
       title: "דוא״ל נכנס"
@@ -3272,6 +3478,7 @@ he:
       close: "סגירה (Esc)"
       content_load_error: 'אין אפשרות לטעון את ה<a href="%url%">תוכן הזה</a>.'
       image_load_error: 'אין אפשרות לטעון את ה<a href="%url%">תמונה הזו</a>.'
+    cannot_render_video: לא ניתן לעבד את הסרטון הזה מכיוון שהדפדפן שלך אינו תומך במקודד.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -3464,6 +3671,7 @@ he:
         many: "%{tags} ו־%{count} נוספות"
         other: "%{tags} ו־%{count} נוספות"
       delete_no_unused_tags: "אין תגיות שאינן בשימוש."
+      tag_list_joiner: ", "
       delete_unused: "מחיקת תגיות שאינן בשימוש"
       delete_unused_description: "למחוק את כל התגיות שאינן מקושרות לנושאים או להודעות פרטיות כלל"
       cancel_delete_unused: "ביטול"
@@ -3504,6 +3712,7 @@ he:
         everyone_can_use: "ניתן להשתמש בתגיות בכל מקום"
         usable_only_by_groups: "התגיות גלויות לכולם אך רק הקבוצות הבאות יכולות להשתמש בהן"
         visible_only_to_groups: "התגיות גלויות לקבוצות הבאות בלבד"
+        cannot_save: "לא ניתן לשמור את קבוצת התגיות. נא לוודא שיש לפחות תגית אחד, ששם קבוצת התגיות אינו ריק ושנבחרה קבוצה לצורך הרשאת תגיות."
       topics:
         none:
           unread: "אין לך נושאים שלא נקראו."
@@ -3520,6 +3729,7 @@ he:
       custom_message_template_forum: "היי, זה פורום מומלץ, כדאי להצטרף אליו!"
       custom_message_template_topic: "היי, חשבתי שהנושא הזה יעניין אותך!"
     forced_anonymous: "עקב עומס חריג, הודעה זו מוצגת באופן זמני לכולם כפי שתופיע בפני משתמשים שלא נכנסו למערכת."
+    forced_anonymous_login_required: "האתר חווה עומס קיצוני ולא ניתן לפנות אליו, נא לנסות שוב בעוד מספר דקות."
     footer_nav:
       back: "חזרה"
       forward: "העברה"
@@ -3528,6 +3738,17 @@ he:
     safe_mode:
       enabled: "מצב בטוח מאופשר, כדי לצאת ממנו סיגרו את חלון הדפדפן הזה"
     image_removed: "(התמונה הוסרה)"
+    do_not_disturb:
+      title: "לא להפריע למשך…"
+      label: "לא להפריע"
+      remaining: "%{remaining} נותרו"
+      options:
+        half_hour: "חצי שעה"
+        one_hour: "שעה"
+        two_hours: "שעתיים"
+        tomorrow: "עד מחר"
+        custom: "מותאם"
+      set_schedule: "הגדרת תזמון התראות"
   admin_js:
     type_to_filter: "הקלידו לסינון..."
     admin:
@@ -3555,6 +3776,10 @@ he:
         installed_version: "הותקן"
         latest_version: "אחרונה"
         problems_found: "עצה שמבוססת על הגדרות האתר הנוכחיות שלך"
+        new_features:
+          title: "\U0001F381 תכונות חדשות"
+          dismiss: "התעלמות"
+          learn_more: "מידע נוסף"
         last_checked: "נבדק לאחרונה"
         refresh_problems: "רענן"
         no_problems: "לא נמצאו בעיות."
@@ -3645,10 +3870,6 @@ he:
             available: "שם הקבוצה זמין"
             not_available: "שם הקבוצה אינו זמין"
             blank: "שם הקבוצה לא יכול להיות ריק"
-        bulk_add:
-          title: "הוספה מרוכזת לקבוצה"
-          complete_users_not_added: "משתמשים אלו לא נוספו (וודאו שיש להם חשבון):"
-          paste: "נא להדביק רשימה של שמות משתמשים או כתובות דוא״ל, אחת בכל שורה:"
         add_members:
           as_owner: "הגדרת משתמשים כבעלים של הקבוצה הזו"
         manage:
@@ -3675,7 +3896,11 @@ he:
             effects: אפקטים
             trust_levels_none: "ללא"
             automatic_membership_email_domains: "משתמשים שנרשמים עם שם תחום (דומיין) דוא״ל שתואם בדיוק לאחד מהרשימה, יתווספו באופן אוטומטי לקבוצה זו:"
-            automatic_membership_user_count: "ל־%{count} משתמשים יש את כתובות הדוא״ל בשם התחום החדש ויתווספו לקבוצה."
+            automatic_membership_user_count:
+              one: "למשתמש %{count} יש את כתובות הדוא״ל בשם התחום החדש והוא יתווסף לקבוצה."
+              two: "ל־%{count} משתמשים יש את כתובות הדוא״ל בשם התחום החדש ויתווספו לקבוצה."
+              many: "ל־%{count} משתמשים יש את כתובות הדוא״ל בשם התחום החדש ויתווספו לקבוצה."
+              other: "ל־%{count} משתמשים יש את כתובות הדוא״ל בשם התחום החדש ויתווספו לקבוצה."
             primary_group: "קבע כקבוצה ראשית באופן אוטומטי"
         name_placeholder: "שם קבוצה, ללא רווחים, לפי הכללים של שמות משתמשים"
         primary: "קבוצה ראשית"
@@ -3687,7 +3912,13 @@ he:
         group_members: "חברי הקבוצה"
         delete: "מחיקה"
         delete_confirm: "להסיר קבוצה זו?"
+        delete_with_messages_confirm:
+          one: "מחיקת הקבוצה הזאת תוביל להתייתמותה של הודעה %{count}, חברי הקבוצה לא יוכלו לגשת אליה עוד.<br><br>להמשיך?"
+          two: "מחיקת הקבוצה הזאת תוביל להתייתמותן של %{count} הודעות, חברי הקבוצה לא יוכלו לגשת אליהן עוד.<br><br>להמשיך?"
+          many: "מחיקת הקבוצה הזאת תוביל להתייתמותן של %{count} הודעות, חברי הקבוצה לא יוכלו לגשת אליהן עוד.<br><br>להמשיך?"
+          other: "מחיקת הקבוצה הזאת תוביל להתייתמותן של %{count} הודעות, חברי הקבוצה לא יוכלו לגשת אליהן עוד.<br><br>להמשיך?"
         delete_failed: "לא ניתן להסיר קבוצה זו. אם זו קבוצה אוטומטית, היא בלתי ניתנת למחיקה."
+        delete_automatic_group: זו קבוצה אוטומטית ולא ניתן למחוק אותה.
         delete_owner_confirm: "להסיר את הרשאות הניהול של ‚%{username}’?"
         add: "הוספה"
         custom: "מותאם"
@@ -3749,9 +3980,13 @@ he:
               wordpress: נחוץ כדי שהתוסף wp-discourse ל־WordPress יעבוד.
             users:
               bookmarks: הצגת סימניות המשתמשים. מחזירה תזכורות לסימניות בעת שימוש בתצורת ICS.
-              sync_sso: סנכרון משתמש באמצעות SSO.
+              sync_sso: סנכרון משתמש באמצעות DiscourseConnect.
               show: קבלת מידע על משתמש.
               check_emails: הצגת כתובות הדוא״ל של המשתמשים.
+              update: עדכון פרטי פרופיל המשתמש.
+              log_out: להוציא משתמש מכל ההפעלות שלו.
+              anonymize: הפיכת חשבונות משתמשים לאלמוניים.
+              delete: מחיקת חשבונות משתמשים.
             email:
               receive_emails: לשלב את התחום הזה עם מקבל הודעות הדוא״ל כדי לעבד הודעות דוא״ל נכנסות.
       web_hooks:
@@ -3796,7 +4031,7 @@ he:
           details: "כאשר יש תגובה חדשה, עריכה, מחיקה או שחזור."
         user_event:
           name: "אירוע משתמש"
-          details: "כאשר משתמש נכנס, יוצא, נוצר, מאושר או מעודכן."
+          details: "כאשר משתמש נכנס, יוצא, מאשר את כתובת הדוא״ל שלו, נוצר, מאושר או מעודכן."
         group_event:
           name: "אירוע קבוצה"
           details: "כאשר קבוצה נוצרת, מתעדכנת או מושמדת."
@@ -3815,6 +4050,12 @@ he:
         user_badge_event:
           name: "אירוע הענקת עיטור"
           details: "כמשתמש מקבל עיטור."
+        group_user_event:
+          name: "אירוע משתמש בקבוצה"
+          details: "כאשר משתמש מתווסף או נגרע מקבוצה."
+        like_event:
+          name: "אירוע לייק"
+          details: "כשמשתמש מצביע לייק בפוסט."
         delivery_status:
           title: "מצב שליחה"
           inactive: "לא פעיל"
@@ -4007,7 +4248,9 @@ he:
           convert: "המרה"
           convert_component_alert: "להמיר את הרכיב הזה לערכת עיצוב? הוא יוסר כרכיב מתוך %{relatives}."
           convert_component_tooltip: "המרת הרכיב הזה לערכת עיצוב"
+          convert_component_alert_generic: "להמיר את הרכיב הזה לערכת עיצוב?"
           convert_theme_alert: "להמיר את ערכת העיצוב הזו לרכיב? היא תוסר כהורה מתוך %{relatives}."
+          convert_theme_alert_generic: "להמיר את ערכת העיצוב הזאת לרכיב?"
           convert_theme_tooltip: "המרת ערכת עיצוב זו לרכיב"
           inactive_themes: "ערכות עיצוב בלתי פעילות:"
           inactive_components: "רכיבים שאינם בשימוש:"
@@ -4041,17 +4284,20 @@ he:
           included_components: "רכיבים כלולים"
           add_all: "להוסיף הכול"
           import_web_tip: "מאגר שמכיל ערכת עיצוב"
+          direct_install_tip: "להתקין את <strong>%{name}</strong> מהמאגר שמופיע להלן?"
           import_web_advanced: "מתקדם…"
           import_file_tip: "קובץ ‎.tar.gz,‏ ‎.zip,‏ או ‎.dcstyle.json שמכיל ערכת עיצוב"
           is_private: "ערכת העיצוב נמצאת במאגר git פרטי"
           remote_branch: "שם ענף (רשות)"
           public_key: "להעניק למפתח הציבורי הבא גישה למאגר:"
+          public_key_note: "לאחר מילוי כתובת אתר מאגר פרטית תקפה לעיל, מפתח SSH ייווצר ויוצג כאן."
           install: "התקנה"
           installed: "הותקן"
           install_popular: "פופלארי"
           install_upload: "מהמכשיר שלך"
           install_git_repo: "ממאגר git"
           install_create: "יצירת חדשה"
+          duplicate_remote_theme: "רכיב ערכת העיצוב „%{name}” כבר מותקן, להתקין עותק נוסף?"
           about_theme: "אודות"
           license: "רישיון"
           version: "גרסה:"
@@ -4083,6 +4329,7 @@ he:
             many: "ערכת העיצוב מעוכבת ב־%{count} הגשות!"
             other: "ערכת העיצוב מעוכבת ב־%{count} הגשות!"
           compare_commits: "(צפייה בהגשות חדשות)"
+          remote_theme_edits: "אם מעניין אותך לערוך את ערכת העיצוב הזאת, עליך <a href='%{repoURL}' target='_blank'>להגיש שינוי במאגר שלה</a>"
           repo_unreachable: "לא ניתן ליצור קשר עם מאגר ה־git של ערכת העיצוב הזו. הודעת השגיאה:"
           imported_from_archive: "ערכת עיצוב זו ייובאה מקובץ ‎.zip"
           scss:
@@ -4109,20 +4356,20 @@ he:
 
               דוגמה:
 
-              :root {
-              --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};
-              }
+              %{example}
 
               מומלץ מאוד להוסיף קידומת לשמות המאפיינים כדי להימנע מסתירות מול תוספים ו/או הליבה.
           head_tag:
-            text: "</head>"
-            title: "HTML שיוכנס לפני התג </head>"
+            text: "</‎head>"
+            title: "HTML שיוכנס לפני התג </‎head>"
           body_tag:
-            text: "</body>"
-            title: "HTML שיוכנס לפני התג </body> "
+            text: "</‎body>"
+            title: "HTML שיוכנס לפני התג </‎body>"
           yaml:
             text: "YAML"
             title: "עריכת הגדרות ערכת העיצוב בתצורת YAML"
+          scss_color_variables_warning: "השימוש במשתני צבע ליבת SCSS בערכות עיצוב הושמט. נא להשתמש במאפייני CSS מותאמים אישית במקום. <a href=\"https://meta.discourse.org/t/-/77551#color-variables-2\" target=\"_blank\">במדריך הזה</a> יש פרטים נוספים."
+          scss_warning_inline: "השימוש במשתני צבע ליבת SCSS בערכות עיצוב הושמט."
         colors:
           select_base:
             title: "בחירת מבחר צבעים בסיסי"
@@ -4394,6 +4641,7 @@ he:
             topic_unarchived: "הנושא יצא מהארכיון"
             post_staff_note_create: "הוספת הערת סגל"
             post_staff_note_destroy: "השמדת הערת סגל"
+            delete_group: "הסרת קבוצה"
         screened_emails:
           title: "הודעות דואר מסוננות"
           description: "כשמישהו מנסה ליצור חשבון חדש, כתובות הדואר האלקטרוני הבאות ייבדקו וההרשמה תחסם או שיבוצו פעולות אחרות."
@@ -4441,33 +4689,36 @@ he:
         title: "מילים במעקב"
         search: "חיפוש"
         clear_filter: "ניקוי"
-        show_words: "הצגת מילים"
-        one_word_per_line: "מילה בשורה"
+        show_words:
+          one: "להציג מילה %{count}"
+          two: "להציג %{count} מילים"
+          many: "להציג %{count} מילים"
+          other: "להציג %{count} מילים"
         download: הורדה
         clear_all: נקו הכל
-        clear_all_confirm_block: "לפנות את כל המילים שבמעקב לפעולת החסימה?"
-        clear_all_confirm_censor: "לפנות את כל המילים שבמעקב לפעולת הצנזורה?"
-        clear_all_confirm_flag: "לפנות את כל המילים שבמעקב לפעולת הסימון בדגל?"
-        clear_all_confirm_require_approval: "לפנות את כל המילים שבמעקב לפעולת בקשת האישור?"
-        word_count:
-          one: "מילה %{count}"
-          two: "%{count} מילים"
-          many: "%{count} מילים"
-          other: "%{count} מילים"
+        clear_all_confirm: "לפנות את כל המילים שבמעקב לפעולה %{action}?"
         actions:
           block: "חסימה"
           censor: "צינזור"
           require_approval: "דרישת אישור"
           flag: "דגל"
+          replace: "החלפה"
+          tag: "תגית"
         action_descriptions:
           block: "למנוע פרסום של פוסטים שמכילים את המילים הללו. בפני המשתמש תופיע הודעת שגיאה בעת ניסיון פרסום הפוסט."
           censor: "להרשות פוסטים שמכילים מילים אלו, אבל להחליף אותן בתווים שמסתירים את המילים המצונזרות."
           require_approval: "פוסטים שמכילים מילים אלו יצטרכו לקבל אישור מהסגל לפני שניתן יהיה לצפות בהם."
           flag: "להרשות פוסטים שמכילים מילים אלו, אבל לסמן אותם כבלתי הולמים כדי שמפקחים יוכלו לסקור אותם."
+          replace: "להחליף מילים בפוסטים במילים או קישורים אחרים"
+          tag: "לתייג אוטומטית נושאים לפי הפוסט הראשון בהם"
         form:
-          label: "מילה חדשה:"
-          placeholder: "מילה מלאה או * כתו כל"
+          label: "יש מילה או ביטוי"
+          placeholder: "נא למלא מילה או ביטוי (* הוא תו כללי)"
           placeholder_regexp: "ביטוי רגולרי"
+          replacement_label: "חלופה"
+          replacement_placeholder: "דוגמה או https://example.com"
+          tag_label: "תגית"
+          tag_placeholder: "תגית1,תגית2,תגית3"
           add: "הוספה"
           success: "הצלחה"
           exists: "כבר קיימת"
@@ -4520,6 +4771,9 @@ he:
         check_email:
           title: "חשיפת כתובת הדוא״ל של המשתמש"
           text: "הצגה"
+        check_sso:
+          title: "חשיפת מטען SSO"
+          text: "הצגה"
       user:
         suspend_failed: "משהו נכשל בהשעיית המשתמש הזה %{error}"
         unsuspend_failed: "משהו נכשל בביטול השעיית המשתמש הזה %{error}"
@@ -4560,7 +4814,7 @@ he:
         clear_penalty_history:
           title: "מחיקת היסטוריית עונשין"
           description: "משתמשים עם עונשין לא יכולים להגיע לדרגת אמון 3"
-        delete_all_posts_confirm_MF: "פעולה זו תסיר {POSTS, plural, one {פוסט אחד} other {# פוסטים}} ו{TOPICS, plural, one {נושא אחד} other {־# נושאים}}. להמשיך?"
+        delete_all_posts_confirm_MF: "פעולה זו תמחק {POSTS, plural, one {פוסט אחד} two {שני פוסטים} many {# פוסטים} other {# פוסטים}} ו{TOPICS, plural, one {נושא אחד} two {שני נושאים} many {־# נושאים} other {־# נושאים}}. להמשיך?"
         silence: "השתקה"
         unsilence: "ביטול השתקה"
         silenced: "בהשתקה?"
@@ -4609,6 +4863,9 @@ he:
         anonymize_yes: "כן, נא להפוך חשבון זה לאלמוני"
         anonymize_failed: "אירעה תקלה בהפיכת חשבון זה לאלמוני."
         delete: "מחיקת משתמש"
+        delete_posts:
+          progress:
+            title: "התקדמות מחיקת הפוסטים"
         merge:
           button: "מיזוג"
           prompt:
@@ -4620,6 +4877,8 @@ he:
             target_username_placeholder: "שם המשתמש של הבעלים החדשים"
             transfer_and_delete: "העברה ומחיקה של ‎@%{username}‎"
             cancel: "ביטול"
+          progress:
+            title: "התקדמות המיזוג"
           confirmation:
             title: "העברה ומחיקה של ‎@%{username}‎"
             description: |
@@ -4720,16 +4979,16 @@ he:
           on_grace_period: "כרגע בתקופת חחסד של העלאה בדרכה, לא תתבצע הורדה בטבלה."
           locked_will_not_be_promoted: "דרגת האמון נעולה. לא תתבצע העלאה בדרגה."
           locked_will_not_be_demoted: "דרגת האמון נעולה. לא תתבצע הורדה בדרגה."
-        sso:
-          title: "התחברות חד פעמית"
-          external_id: "ID חיצוני"
+        discourse_connect:
+          title: "כניסה אחודה עם DiscourseConnect"
+          external_id: "מזהה חיצוני"
           external_username: "שם משתמש"
           external_name: "שם"
-          external_email: "כתובת דוא״ל"
-          external_avatar_url: "כתובת URL לתמונת הפרופיל"
+          external_email: "דוא״ל"
+          external_avatar_url: "כתובת לתמונת פרופיל"
           last_payload: "מטען אחרון"
-          delete_sso_record: "מחיקת רשומת SSO"
-          confirm_delete: "למחוק את רשומת הכניסה האחודה (SSO)?"
+          delete_sso_record: "מחיקת רשומת כניסה אחודה"
+          confirm_delete: "למחוק את רשומת DiscourseConnect זו?"
       user_fields:
         title: "שדות משתמש"
         help: "הוספת שדות שהמשתמשים שלך יוכלו למלא."
@@ -4760,6 +5019,10 @@ he:
           title: "הצגה על כרטיס משתמש?"
           enabled: "מוצג על כרטיס משתמש"
           disabled: "לא מוצג על כרטיס משתמש"
+        searchable:
+          title: "זמין לחיפוש?"
+          enabled: "זמין לחיפוש"
+          disabled: "לא זמין לחיפוש"
         field_types:
           text: "שדה טקסט"
           confirm: "אישור"
@@ -4774,6 +5037,8 @@ he:
         go_back: "חזרה לחיפוש"
         recommended: "אנו ממליצים לערוך את הטקסט הבא כדי שיתאים לצרכים שלך:"
         show_overriden: "להציג רק את אלו שנדרסו"
+        locale: "שפה:"
+        fallback_locale_warning: "בחרת לערוך שפה שמבוססת על %{fallback}. משתמשים שבוחרים ב%{fallback} כשפת מנשק המשתמש שלהם לא יראו את השינויים שלך."
         more_than_50_results: "יש למעלה מ־50 תוצאות. נא למקד את החיפוש שלך."
       settings:
         show_overriden: "להציג רק את אלו שנדרסו"
@@ -4781,6 +5046,10 @@ he:
         reset: "אתחול"
         none: "ללא"
       site_settings:
+        emoji_list:
+          invalid_input: "רשימות האמוג׳י אמורה להכיל רק שמות סימני אמוג׳י תקניים, למשל: hugs (חיבוקים)"
+          add_emoji_button:
+            label: "הוספת אמוג׳י"
         title: "הגדרות"
         no_results: "לא נמצאו תוצאות."
         more_than_30_results: "יש למעלה מ־50 תוצאות. נא למקד את החיפוש שלך."
@@ -4833,6 +5102,9 @@ he:
           modal_no: "לא, להחיל את השינוי מעתה ואילך"
         simple_list:
           add_item: "הוספת פריט…"
+        json_schema:
+          edit: הפעלת העורך
+          modal_title: "עריכת %{name}"
       badges:
         title: עיטורים
         new_badge: עיטור חדש
@@ -4869,8 +5141,12 @@ he:
         enabled: הפעלת עיטור
         icon: סמליל
         image: תמונה
+        graphic: גרפיקה
         icon_help: "נא למלא שם של סמל מתוך Font Awesome (קידומת ‚far-‎’ לסמלים רגילים ו־‚fab-‎’ לסמלים ממותגים)"
-        image_help: "נא להקליד את כתובת התמונה (דורסת את שדה הסמל אם שניהם מוגדרים)"
+        image_help: "העלאת תמונה דורסת את שדה הסמל אם שני אלו הוגדרו."
+        select_an_icon: "נא לבחור סמל"
+        upload_an_image: "העלאת תמונה"
+        read_only_setting_help: "התאמת טקסט אישית"
         query: שאילתת עיטור (SQL)
         target_posts: השאילתה מוכוונת פוסטים
         auto_revoke: הרצת שאילתת שלילה יומית
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 63dd1cf5c3..2b9cd930a2 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -158,6 +158,11 @@ hu:
     topic_admin_menu: "témaműveletek"
     wizard_required: "Üdvözöljük az új Discourse-on. Kezdjük a <a href='%{url}' data-auto-route='true'>beállításvarázslóval</a>. ✨"
     emails_are_disabled: "Egy adminisztrátor letiltotta a kimenő e-maileket. Semmilyen értesítő e-mail nem lesz elküldve."
+    software_update_prompt:
+      dismiss: "Elvetés"
+    bootstrap_mode_enabled:
+      one: "Hogy könnyebbé tegyük az új oldala elindítását, most előkészítési módban van. Minden új felhasználó 1-es szintet kap és be lesz állítva, hogy napi kivonat e-mailt kapjanak. Ez a beállítás automatikusan kikapcsol, ha legalább %{count} felhasználó regisztrált."
+      other: "Hogy könnyebbé tegyük az új oldala elindítását, most előkészítési módban van. Minden új felhasználó 1-es szintet kap és be lesz állítva, hogy napi kivonat e-mailt kapjanak. Ez a beállítás automatikusan kikapcsol, ha legalább %{count} felhasználó regisztrált."
     bootstrap_mode_disabled: "Az előkészítési mód 24 órán belül kikapcsol."
     themes:
       default_description: "Alapértelmezett"
@@ -184,6 +189,7 @@ hu:
         us_gov_west_1: "AWS GovCloud (USA nyugati része)"
         us_west_1: "USA nyugati része (Észak-Kalifornia)"
         us_west_2: "USA nyugati része (Oregon)"
+    clear_input: "A bevitel törlése"
     edit: "a téma címének és kategóriájának szerkesztése"
     expand: "Kibontás"
     not_implemented: "Ez a funkció még nincs megvalósítva."
@@ -218,6 +224,9 @@ hu:
     now: "épp most"
     read_more: "olvasás tovább"
     more: "Több"
+    x_more:
+      one: "Még %{count}"
+      other: "Még %{count}"
     less: "Kevesebb"
     never: "soha"
     every_30_minutes: "30 percenként"
@@ -246,8 +255,6 @@ hu:
       moderators: "Moderátorok"
       stat:
         all_time: "Összes"
-        last_7_days: "Utolsó 7"
-        last_30_days: "Utolsó 30"
       like_count: "Kedvelés"
       topic_count: "Téma"
       post_count: "Bejegyzés"
@@ -261,28 +268,40 @@ hu:
       help:
         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"
+        unbookmark_with_reminder: "Kattints ide minden könyvjelző és emlékeztető törléséhez ebben a témában. Ezt az emlékeztetőt állítottad be a témához: %{reminder_at} ."
     bookmarks:
+      created: "Könyvjelzőt adtál ehhez a válaszhoz. %{name}"
       not_bookmarked: "bejegyzés könyvjelzőzése"
+      created_with_reminder: "Ezt a bejegyzést könyvjelzővel láttad el, és egy emlékeztetővel ekkorra: %{date}. %{name}"
       remove: "Könyvjelző eltávolítása"
+      delete: "Könyvjelző törlése"
+      confirm_delete: "Biztos vagy benne, hogy törölni szeretnéd ezt a könyvjelzőt? Az emlékeztető is törlődni fog."
       confirm_clear: "Biztos, hogy törli az összes könyvjelzőjét ebből a témából?"
       save: "Mentés"
+      no_timezone: 'Még nem állítottál be időzónát, így nem állíthatsz be emlékeztetőket. Állítsd be az időzonádat a <a href="%{basePath}/my/preferences/profile">a profilodon</a>!'
+      list_permission_denied: "Nincsen engedélyed a felhasználó könyvjelzőinek megtekintéséhez."
+      no_user_bookmarks: "Nincsenek könyvjelzővel ellátott bejegyzéseid; a könyvjelzők segítségével gyorsan hivatkozhatsz bizonyos bejegyzésekre."
+      auto_delete_preference:
+        label: "Automatikus törlés"
+        never: "Soha"
+        when_reminder_sent: "Az emlékeztető elküldése után"
+        on_owner_reply: "Miután válaszoltam erre a témára"
+      search_placeholder: "Könyvjelzők keresése név, téma címe vagy tartalom alapján"
       search: "Keresé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"
+        today_with_time: "ma %{time}kor"
+        tomorrow_with_time: "holnap %{time}kor"
+        at_time: "%{date_time}kor"
+        existing_reminder: "Beállítottál egy emlékeztetőt erre a könyvjelzőre, amelyet %{at_date_time}kor fogunk kiküldeni"
+    copy_codeblock:
+      copied: "másolva!"
     drafts:
       resume: "Folytatás"
       remove: "Eltávolítás"
+      remove_confirmation: "Biztosan törölni akarod ezt a vázlatot?"
       new_topic: "Új témavázlat"
       new_private_message: "Új személyes üzenet vázlat"
       topic_reply: "Választervezet"
-      abandon:
-        confirm: "Már nyitott egy másik piszkozatot ebben a témában. Biztos, hogy elveti?"
-        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"
@@ -294,6 +313,7 @@ hu:
       other: "Nézzen meg %{count} új témát"
     preview: "előnézet"
     cancel: "mégse"
+    deleting: "Törlés…"
     save: "Módosítások mentése"
     saving: "Mentés…"
     saved: "Mentve!"
@@ -328,7 +348,11 @@ hu:
       order_by: "Rendezés:"
       in_reply_to: "válasz erre:"
       explain:
+        formula: "Képlet"
+        subtotal: "Részösszeg"
         total: "Összesen"
+        take_action_bonus:
+          name: "intézkedett"
         user_accuracy_bonus:
           name: "felhasználói pontosság"
         trust_level_bonus:
@@ -364,19 +388,19 @@ hu:
       topic: "Téma:"
       filtered_topic: "A jóváhagyandó tartalmakra szűrt egyetlen témában."
       filtered_user: "Felhasználó"
+      filtered_reviewed_by: "Jóváhagyta"
       show_all_topics: "összes téma megjelenítése"
       deleted_post: "(bejegyzés törölve)"
       deleted_user: "(felhasználó törölve)"
       user:
+        bio: "Életrajz"
         website: "Weboldal"
         username: "Felhasználónév"
         email: "E-mail"
         name: "Név"
         fields: "Mezők"
+        reject_reason: "Ok"
       user_percentage:
-        summary:
-          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"
@@ -419,7 +443,8 @@ hu:
           created_at_asc: "Létrehozva (fordított)"
         priority:
           title: "Legalacsonyabb prioritás"
-          low: "(bármely)"
+          any: "(bármely)"
+          low: "Alacsony"
           medium: "Közepes"
           high: "Magas"
       conversation:
@@ -457,6 +482,8 @@ hu:
           title: "Sorban álló bejegyzés"
         reviewable_user:
           title: "Felhasználó"
+        reviewable_post:
+          title: "Hozzászólás"
       approval:
         title: "A bejegyzés jóváhagyásra vár."
         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."
@@ -464,6 +491,39 @@ hu:
           one: "<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"
+      example_username: "felhasználónév"
+      reject_reason:
+        title: "Miért utasítod el ezt a felhasználót?"
+        send_email: "Elutasító e-mail küldése"
+    relative_time_picker:
+      minutes:
+        one: "perc"
+        other: "perc"
+      hours:
+        one: "óra"
+        other: "óra"
+      days:
+        one: "nap"
+        other: "nap"
+      months:
+        one: "hónap"
+        other: "hónap"
+      years:
+        one: "év"
+        other: "év"
+    time_shortcut:
+      later_today: "Ma később"
+      next_business_day: "Következő munkanap"
+      tomorrow: "Holnap"
+      next_week: "Jövő héten"
+      post_local_date: "A bejegyzésben szereplő dátum"
+      later_this_week: "Később ezen a héten"
+      start_of_next_business_week: "Hétfő"
+      start_of_next_business_week_alt: "Kovetkező hétfőn"
+      next_month: "Jövő hónapban"
+      custom: "Egyéni dátum és idő"
+      relative: "Relatív idő"
+      none: "Idő megadása nem szükséges"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a> közzétett <a href='%{topicUrl}'>egy témát</a>"
       you_posted_topic: "<a href='%{userUrl}'>Ön</a> közzétett <a href='%{topicUrl}'>egy témát</a>"
@@ -479,6 +539,7 @@ hu:
       sent_by_user: "<a href='%{userUrl}'>%{user}</a> küldte"
       sent_by_you: "<a href='%{userUrl}'>Ön</a> küldte"
     directory:
+      username: "Felhasználónév"
       filter_name: "szűrés felhasználónév alapján"
       title: "Felhasználók"
       likes_given: "Adott"
@@ -509,6 +570,11 @@ hu:
     groups:
       member_added: "Hozzáadva"
       member_requested: "Kérve"
+      add_members:
+        title: "Tagok hozzáadása a %{group_name} csoporthoz"
+        usernames: "Add meg a felhasználóneveket vagy email-címeket"
+        input_placeholder: "Felhasználónév vagy e-mail-cím"
+        notify_users: "Felhasználók értesítése"
       requests:
         title: "Kérelmek"
         reason: "Indok"
@@ -532,12 +598,29 @@ hu:
           notification: Értesítés
         email:
           title: "E-mail-cím"
+          status: "A %{total_emails}ből %{old_emails} e-mailt szinkronizáltunk az IMAP-on keresztül."
           credentials:
+            title: "Hitelesítő adatok"
+            smtp_server: "SMTP szerver"
+            smtp_port: "SMTP-port"
+            smtp_ssl: "Használjon SSL-t az SMTP-hez"
+            imap_server: "IMAP-kiszolgáló"
+            imap_port: "IMAP-port"
             username: "Felhasználónév"
             password: "Jelszó"
+          settings:
+            title: "Beállítások"
+            allow_unknown_sender_topic_replies: "Engedélyezze az ismeretlen feladóktól érkező témaválaszokat."
+            allow_unknown_sender_topic_replies_hint: "Lehetővé teszi az ismeretlen feladók számára, hogy válaszoljanak a csoport témáira. Ha ez nincs engedélyezve, akkor az e-mail címekről érkező válaszok, amelyek még nem szerepelnek az IMAP e-mail szálában, vagy meghívást kaptak a témára, új témát hoznak létre."
+          mailboxes:
+            disabled: "kikapcsolva"
         membership:
           title: Tagság
           access: Hozzáférés
+        categories:
+          title: Kategóriák
+        tags:
+          title: Címkék
         logs:
           title: "Naplók"
           when: "Mikor"
@@ -548,6 +631,8 @@ hu:
           details: "Részletek"
           from: "Feladó"
           to: "Címzett"
+      permissions:
+        title: "Jogok"
       public_admission: "A felhasználók szabadon csatlakozhatnak a csoporthoz (Nyilvánosan látható csoport szükséges)"
       public_exit: "A felhasználók szabadon elhagyhatják a csoportot"
       empty:
@@ -682,18 +767,21 @@ hu:
       posts: "Bejegyzések"
       topics: "Témák"
       latest: "Legutóbbi"
-      latest_by: "utolsó hozzászóló"
       toggle_ordering: "rendezés megfordítása"
       subcategories: "Alkategóriák"
       topic_sentence:
         one: "%{count} téma"
         other: "%{count} téma"
+      topic_stat_unit:
+        week: "hét"
+        month: "hónap"
       topic_stat_sentence_week:
         one: "%{count} új téma az elmúlt héten."
         other: "%{count} új téma az elmúlt héten."
       topic_stat_sentence_month:
         one: "%{count} új téma az elmúlt hónapban."
         other: "%{count} új téma az elmúlt hónapban."
+      n_more: "Kategóriák (%{count} további)..."
     ip_lookup:
       title: IP-cím keresése
       hostname: Gépnév
@@ -747,7 +835,12 @@ hu:
         mute_option_title: "Nem fog értesítést kapni a felhasználóval kapcsolatban."
         normal_option: "Normál"
         normal_option_title: "Értesítést fog kapni, ha a felhasználó válaszol, idézi vagy megemlíti."
+      notification_schedule:
+        none: "Egyik sem"
+        monday: "Hétfő"
+        to: "címzett"
       activity_stream: "Tevékenység"
+      read: "Olvasott"
       preferences: "Beállítások"
       feature_topic_on_profile:
         open_search: "Válasszon egy új témát"
@@ -756,6 +849,7 @@ hu:
         save: "Mentés"
         clear:
           title: "Törlés"
+          warning: "Biztos vagy benne, hogy törölni szeretnéd a kiemelt témát?"
       use_current_timezone: "Jelenlegi időzóna használata"
       profile_hidden: "A felhasználó nyilvános profilja rejtett."
       expand_profile: "Kibontás"
@@ -775,71 +869,83 @@ hu:
         perm_denied_expl: "Letiltotta a figyelmeztetéseket. Engedélyezze őket a böngésző beállításaiban."
         disable: "Értesítések kikapcsolása"
         enable: "Értesítések bekapcsolása"
-        each_browser_note: "Megjegyzés: Minden használt böngészőben be kell állítania ezt a beállítást."
+        each_browser_note: 'Megjegyzés: Ezt a beállítást minden használt böngészőben meg kell változtatnod. Az összes értesítést letiltjuk ettől a beállítástól függetlenül, ha a profilod „Ne zavarjanak” állapotba teszed.'
         consent_prompt: "Szeretne élő értesítéseket kapni, ha valaki válaszol a hozzászólásaira?"
       dismiss: "Elvetés"
       dismiss_notifications: "Összes elvetése"
       dismiss_notifications_tooltip: "Minden olvasatlan értesítés olvasottnak jelölése"
       first_notification: "Az első értesítése! Válassza ki a kezdéshez."
       dynamic_favicon: "Számok megjelenítése a böngésző ikonján"
+      skip_new_user_tips:
+        description: "Új felhasználói belépési tippek és jelvények kihagyása"
+        not_first_time: "Nem az első alkalommal jársz itt?"
+        skip_link: "A tippek kihagyása"
       theme_default_on_all_devices: "Legyen ez az alapértelmezett téma az összes eszközén"
+      color_schemes:
+        undo: "Visszaállítás"
+        regular: "Átlagos"
       text_size_default_on_all_devices: "Legyen ez az alapértelmezett szövegméret az összes eszközén"
       allow_private_messages: "Engedélyezés a többi felhasználónak, hogy privát üzenetet küldjenek Önnek"
       external_links_in_new_tab: "Az összes külső hivatkozás megnyitása új lapon"
-      enable_quoting: "A kijelölt szöveg engedélyezése idézetként"
-      enable_defer: "Engedélyezze a témák olvasatlanként jelölését"
-      change: "megváltoztatás"
+      enable_quoting: "A kijelölt szöveg idézése a válaszban"
+      enable_defer: "A témák olvasatlannak jelölésének engedélyezése"
+      change: "módosítás"
       featured_topic: "Kiemelt téma"
-      moderator: "{user}} egy moderátor"
-      admin: "{user}} egy adminisztrátor"
+      moderator: "%{user} egy moderátor"
+      admin: "%{user} egy adminisztrátor"
       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_permanently: "Ez a felhasználó fel van függesztve."
-      suspended_reason: "Ok:"
-      email_activity_summary: "Aktivitás Összefoglaló"
+      suspended_notice: "Ez a felhasználó eddig felfüggesztett: %{date}."
+      suspended_permanently: "Ez a felhasználó felfüggesztett."
+      suspended_reason: "Ok: "
+      github_profile: "GitHub"
+      email_activity_summary: "Tevékenység-összefoglaló"
       mailing_list_mode:
         label: "Levelezőlista mód"
         enabled: "Levelezőlista mód bekapcsolása"
-        instructions: |2
+        instructions: |
+          Ez a beállítás felülbírálja a tevékenység-összefoglalót.<br />
 
-          Ez a beállítás felülírja az aktivitás összefoglalót. <br />
-
-          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)"
-        few_per_day: "Küldjön e-mailt minden új hozzászólás után (naponta kb. 2 db)"
+          A némított témák és kategóriák nem lesznek benne ezekben az e-mailekben.
+        individual: "E-mail küldése az összes új hozzászólásról"
+        individual_no_echo: "E-mail küldése az összes új hozzászólásról, kivéve a sajátokat"
+        many_per_day: "E-mail küldése az összes új hozzászólásról (naponta kb. %{dailyEmailEstimate} db)"
+        few_per_day: "E-mail küldése az összes új hozzászólásról (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"
-      watched_tags: "Figyelve"
-      watched_tags_instructions: "Automatikusan figyeltetni fogod az összes ezen a címkékkel ellátott témát. Értesítést fogsz kapni az összes új hozzászólásról és témáról, és az új hozzászólások száma megfog jelenni a téma mellett."
-      tracked_tags: "Követve"
-      tracked_tags_instructions: "Automatikusan követni fogsz minden ilyen címkéjű témakört. Az új hozzászólások száma megfog jelenni a téma mellett."
-      muted_tags: "Némítva"
-      muted_tags_instructions: "Egyáltalán nem fogsz kapni semmilyen értesítést ennek a kategóriának a témaköreiről és legújabbak között sem fog megjelenni."
-      watched_categories: "Figyelve"
-      watched_categories_instructions: "Automatikusan figyelni fogod ezeket a kategóriákat. Értesítést fogsz kapni minden új témáról és bejegyzésről, a témakörök neve mellett meg fog jelenni az új bejegyzések számlálója is."
-      tracked_categories: "Követve"
-      tracked_categories_instructions: "Automatikusan nyomon fog követni minden új témát ezekben a kategóriákban "
-      watched_first_post_categories: "Első bejegyzés megtekintése"
-      watched_first_post_categories_instructions: "Csak minden új témakör legelső hozzászólásáról fogsz értesítést kapni ezekben a kategóriákban."
-      watched_first_post_tags: "Első bejegyzés megtekintése"
-      watched_first_post_tags_instructions: "Az új témakör legelső hozzászólásáról fogsz értesítést kapni ezekben a kategóriákban."
-      muted_categories: "Lenémítva"
-      muted_categories_instructions: "Egyáltalán nem fogsz kapni semmilyen értesítést ennek a kategóriának a témaköreiről, és nem fog megjelenni az olvasatlan oldalon."
-      no_category_access: "Moderátorként kategóriákra van limitálva a hozzáférésed, mentés le van tiltva."
-      delete_account: "Fiókom törlése"
-      delete_account_confirm: "Biztosan végleg törölni akarod a fiókodat? Ez a művelet nem vonható vissza!"
-      deleted_yourself: "A fiókod törlése sikerült."
-      delete_yourself_not_allowed: "Kérlek kozlultálj egy staff taggal, ha azt szeretnéd, hogy a fiók törlésre kerüljön."
+      watched_tags: "Figyelt"
+      watched_tags_instructions: "Automatikusan figyelni fogja az összes ilyen címkével ellátott témát. Értesítést fog kapni az összes új hozzászólásról és témáról, valamint az új hozzászólások száma megjelenik a téma mellett."
+      tracked_tags: "Követett"
+      tracked_tags_instructions: "Automatikusan követni fogja az összes ilyen címkéjű témakört. Az új hozzászólások száma megjelenik a téma mellett."
+      muted_tags: "Némított"
+      muted_tags_instructions: "Semmilyen értesítést nem fog kapni a kategória témaköreiről, és a legújabbak között sem fog megjelenni."
+      watched_categories: "Figyelt"
+      watched_categories_instructions: "Automatikusan figyelni fogja az összes ebben a kategóriában lévő témát. Értesítést fog kapni az összes új hozzászólásról és témáról, valamint az új hozzászólások száma megjelenik a téma mellett."
+      tracked_categories: "Követett"
+      tracked_categories_instructions: "Automatikusan követni fogja az összes ebben a kategóriában lévő témát. Az új hozzászólások száma megjelenik a téma mellett."
+      watched_first_post_categories: "Első bejegyzés figyelése"
+      watched_first_post_categories_instructions: "Csak az új témakörök legelső hozzászólásáról fog értesítést kapni ezekben a kategóriákban."
+      watched_first_post_tags: "Első bejegyzés figyelése"
+      watched_first_post_tags_instructions: "Csak az új témakörök legelső hozzászólásáról fog értesítést kapni ezekben a címkékben."
+      muted_categories: "Némított"
+      muted_categories_instructions: "Semmilyen értesítést nem fog kapni a kategória témaköreiről, és a kategóriák vagy a legújabbak között sem fog megjelenni."
+      regular_categories: "Átlagos"
+      no_category_access: "Moderátorként korlátozott kategória-hozzáférése van, a mentés tiltott."
+      delete_account: "Saját fiók törlése"
+      delete_account_confirm: "Biztos, hogy végleg törli a fiókját? Ez a művelet nem vonható vissza."
+      deleted_yourself: "A fiókja törlése sikeres."
+      delete_yourself_not_allowed: "Ha törölni akarja a fiókját, akkor vegye fel a kapcsolatot egy stábtaggal."
       unread_message_count: "Üzenetek"
       admin_delete: "Törlés"
       users: "Felhasználók"
-      muted_users: "Lenémítva"
-      ignored_users: "Figyelmen kívül hagyva"
-      tracked_topics_link: "Mutat"
+      muted_users: "Némított"
+      muted_users_instructions: "Letiltja az összes értesítést és magánüzentet ezektől a felhasználóktól."
+      allowed_pm_users_instructions: "Csak ezeknek a felhasználóknak engedélyezem a magánüzenetek küldését."
+      allow_private_messages_from_specific_users: "Személyes üzenetek küldésének engedélyezése kizárólag meghatározott felhasználók számára."
+      ignored_users: "Figyelmen kívül hagyott"
+      ignored_users_instructions: "Letiltja az összes választ, értesítést és magánüzentet ezektől a felhasználóktól."
+      tracked_topics_link: "Megjelenítés"
       automatically_unpin_topics: "Automatikusan letűzi a témát amikor elérem az alját."
       apps: "Alkalmazások"
       revoke_access: "Hozzáférés visszavonása"
@@ -870,6 +976,7 @@ hu:
         tags: "Címkék"
       preferences_nav:
         account: "Fiók"
+        security: "Biztonság"
         profile: "Profil"
         emails: "Emailek"
         notifications: "Értesítések"
@@ -897,16 +1004,24 @@ hu:
         copied_to_clipboard: "Vágólapra másolva"
         download_backup_codes: "Biztonsági kódok letöltése"
         use: "Biztonsági kód használata"
+        enable_prerequisites: "A biztonsági kódok létrehozása előtt engedélyezned kell egy elsődleges kétfaktoros módszert."
         codes:
           title: "Biztonsági kódok előállítva"
       second_factor:
+        title: "Kéttényezős hitelesítés"
+        enable: "A kéttényezős hitelesítés kezelése"
         forgot_password: "Elfelejtetted a jelszavad?"
         confirm_password_description: "Kérlek erősítsd meg a jelszavad a továbbhaladáshoz"
         name: "Név"
         label: "Kód"
         disable_description: "Írd be az azonosító kódodat az alkalmazásból"
         show_key_description: "Manuális beírás"
+        extended_description: |
+          A kétfaktoros hitelesítés további biztonságot nyújt a fiókodban azzal, hogy a jelszavadon kívül még egy egyszeri kód beírását igényli (mint a banki alkalmazások esetén). Ilyen kódok több féle alkalmazással is előaállíthatók <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a> és <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a> eszközökön egyaránt.
+        oauth_enabled_warning: "Felhívjuk figyelmedet, hogy a közösségi bejelentkezések letiltásra kerülnek, ha fiókjodban engedélyezted a kéttényezős hitelesítést."
+        enforced_notice: "A webhely elérése előtt engedélyezned kell a kéttényezős hitelesítést."
         disable: "Kikapcsol"
+        disable_confirm: "Biztos benne, hogy le szeretné tiltani az összes kéttényezős hitelesítés?"
         save: "Mentés"
         edit: "Szerkesztés"
         security_key:
@@ -933,35 +1048,48 @@ hu:
         taken: "Sajnos az e-mail cím nem érhető el."
         error: "Hiba történt az e-mail-címe módosításakor. Talán már használatban van?"
         success: "E-mailt küldtünk a megadott címre. Kövesse a megerősítési utasításokat."
+        success_via_admin: "E-mailt küldtünk a megadott címre. Kövesd a benne szereplő megerősítési utasításokat!"
         success_staff: "Küldtünk egy levelet az e-mail-címére. Kövesse a megerősítési utasításokat."
       change_avatar:
         title: "Profilkép megváltoztatása"
+        refresh_gravatar_title: "Frissítsd a %{gravatarName}t"
         letter_based: "A rendszer által adott profilkép"
         uploaded_avatar: "Egyéni kép"
         uploaded_avatar_empty: "Egyéni kép hozzáadása"
         upload_title: "Saját kép feltöltése"
         image_is_not_a_square: "Figyelmeztetés: átméreteztük a képét; szélesség és hosszúság nem volt egyforma"
+      change_profile_background:
+        title: "A profil borítóképe"
+        instructions: "A profil borítóképe középre lesz rendezve, alapértelmezett 1110px-es szélességgel."
       change_card_background:
         title: "Felhasználói kártya háttérképe"
         instructions: "A háttérképek középre lesznek helyezve, egy alapértelmezett 590px-es szélességgel."
+      change_featured_topic:
+        title: "Kiemelt téma"
+        instructions: "Adj hozzá egy linket a témához a felhasználói kártyádon és a profilodon."
       email:
         title: "E-mail"
         primary: "Elsődleges e-mail-cím"
         secondary: "Másodlagos e-mail-címek"
         primary_label: "Elsődleges"
+        unconfirmed_label: "nem megerősített"
         resend_label: "megerősítő e-mail újraküldése"
+        resending_label: "küldés..."
         resent_label: "e-mail elküldve"
         update_email: "E-mail-cím módosítása"
         set_primary: "Elsődleges e-mail-cím beállítása"
         destroy: "E-mail-cím eltávolítása"
         add_email: "Alternatív e-mail-cím hozzáadása"
-        sso_override_instructions: "Az e-mail-címet az SSO-szolgáltató tudja frissíteni."
         no_secondary: "Nincsenek másodlagos e-mail-címek"
+        instructions: "Nem nyilvános, nem adjuk ki senkinek."
         ok: "E-mail küldünk a megerősítéshez"
         required: "Adjon meg egy e-mail-címet"
         invalid: "Adjon meg egy érvényes e-mail-címet"
         authenticated: "Az e-mail-címét a(z) %{provider} hitelesítette"
         frequency_immediately: "Azonnal e-mailt fogunk küldeni, ha még nem olvasta el, amiről e-mailt küldtünk."
+        frequency:
+          one: "Csak akkor küldünk e-mailt neked, ha nem láttunk a legutóbbi percben.."
+          other: "Csak akkor küldünk e-mailt neked, ha nem láttunk a legutóbbi %{count} percben."
       associated_accounts:
         title: "Társított fiókok"
         connect: "Csatlakozás"
@@ -1009,6 +1137,7 @@ hu:
       location: "Hely"
       website: "Weblap"
       email_settings: "E-mail-cím"
+      hide_profile_and_presence: "A nyilvános profilom és a jelenlétem elrejtése"
       text_size:
         title: "Szövegméret"
         smaller: "Kisebb"
@@ -1016,6 +1145,7 @@ hu:
         larger: "Nagyobb"
         largest: "Legnagyobb"
       title_count_mode:
+        title: "Az oldal háttér ennyit jelenít meg ebből:"
         notifications: "Új értesítések"
         contextual: "Új oldal tartalmai"
       like_notification_frequency:
@@ -1067,38 +1197,50 @@ hu:
         after_10_minutes: "10 perc elteltével"
       notification_level_when_replying: "Ha írok egy témába, állítsa be erre: "
       invited:
-        search: "írd be a keresett meghívottak nevét…"
         title: "Meghívók"
+        pending_tab: "Várakozik"
+        pending_tab_with_count: "Várakozik (%{count})"
+        expired_tab: "Lejárt"
+        expired_tab_with_count: "Lejárt (%{count})"
+        redeemed_tab: "Felhasználva"
+        redeemed_tab_with_count: "Felhasználva (%{count})"
+        invited_via: "Meghívás"
+        groups: "Csoportok"
+        topic: "Téma"
+        sent: "Létrehozva / utoljára elküldve"
+        expires_at: "Lejár"
+        edit: "Szerkesztés"
+        remove: "Eltávolítás"
+        reinvited: "Meghívó újraküldve"
+        search: "írd be a keresett meghívottak nevét…"
         user: "Meghívott felhasználó"
         none: "Nincsenek meghívók."
         redeemed: "Felhasznált meghívók"
-        redeemed_tab: "Felhasználva"
-        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})"
         topics_entered: "Megtekintett témák"
         posts_read_count: "Elolvasott bejegyzések"
         expired: "Ez a meghívó lejárt!"
-        rescind: "Törlés"
-        rescinded: "Meghívó törölve"
-        reinvite: "Meghívó újraküldése"
-        reinvite_all: "Összes meghívó újraküldése"
+        remove_all_confirm: "Biztosan eltávolítod az összes lejárt meghívót?"
         reinvite_all_confirm: "Biztosan szeretnél újraküldeni minden meghívót?"
-        reinvited: "Meghívó újraküldve"
-        reinvited_all: "Összes meghívó újraküldve!"
         time_read: "Olvasási idő"
         days_visited: "Látogatott napok"
         account_age_days: "Fiók kora napokban"
-        links_tab: "Hivatkozások"
-        link_created_at: "Létrehozott"
-        link_groups: Csoportok
+        create: "Meghívás"
+        generate_link: "Meghívó link létrehozása"
+        link_generated: "Itt van a meghívó linkje!"
         valid_for: "A meghívási hivatkozás csak ehhez az e-mail-címhez érvényes: %{email}"
+        single_user: "Meghívás e-mailben"
         invite_link:
+          title: "Meghívó link"
           success: "Meghívó link elkészült!"
+          error: "Hiba történt a Meghívó link létrehozása során"
+          max_redemptions_allowed_label: "Hány ember regisztrálhat ezen a linken keresztül?"
+          expires_at: "Mikor jár le a meghívó link?"
+        invite:
+          new_title: "Meghívó link létrehozása"
         bulk_invite:
-          success: "A file sikeresen feltöltve, értesítést kapsz, ha a folyamat készen van."
+          none: "Nincs megjeleníthető meghívások ezen az oldalon."
           error: "A feltöltött filenak CSV formátumúnak kell lennie."
       password:
         title: "Jelszó"
@@ -1149,7 +1291,7 @@ hu:
         top_links: "Népszerű Hivatkozások"
         no_links: "Nincsenek hivatkozások még."
         most_liked_by: "Legtöbbet kedvelt"
-        most_liked_users: "Legtöbbet Lájkolt"
+        most_liked_users: "Legtöbbet kedvelt"
         most_replied_to_users: "Legtöbbet válaszolt"
         no_likes: "Nincsenek kedvelések még."
         top_categories: "Top kategóriák"
@@ -1198,7 +1340,6 @@ hu:
     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."
     refresh: "Frissítés"
     home: "Kezdőlap"
@@ -1207,15 +1348,6 @@ hu:
       login_disabled: "A belépés le van tiltva, amíg az oldal \"csak olvasható\" módban van."
       logout_disabled: "A kilépés le van tiltva, amíg az oldal \"csak olvasható\" módban van."
     learn_more: "tovább..."
-    all_time: "Összes"
-    all_time_desc: "összes létrehozott téma"
-    year: "év"
-    year_desc: "az utóbbi 365 napban létrehozott témakörök"
-    month: "hónap"
-    month_desc: "az utóbbi 30 napban létrehozott témakörök"
-    week: "hét"
-    week_desc: "az utóbbi 7 napban létrehozott témakörök"
-    day: "nap"
     first_post: Első bejegyzés
     mute: Elnémít
     unmute: Némítás feloldása
@@ -1231,10 +1363,13 @@ hu:
       sign_up: "Regisztráció"
       hide_session: "Holnap emlékeztess"
       hide_forever: "nem, köszönöm"
-      hidden_for_session: "Rendben, holnap emlékeztetni foglak. Bármikor használhatod a 'Belépés' gombot, hogy csinálj magadnak egy fiókot."
+      intro: "Szia! Úgy tűnik, tetszik neked a fórumunk, de még nem regisztráltál fiókot."
+      value_prop: "Onnantól, hogy létrehozol egy fiókot, a rendszer emlékezni fog arra, hogy mit olvastál, így mindig oda térhetsz vissza, ahol korábban abbahagytad. Értesítéseket is kapsz, itt is és e-mailben is, valahányszor valaki válaszol neked. A bejegyzéseket pedig kedvelheted is. :heartpulse:"
     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:
+        one: "<b>%{count}</b> válasz van."
+        other: "<b>%{count}</b> válasz van."
       enable: "Téma összefoglalása"
       disable: "Összes bejegyzés mutatása"
     deleted_filter:
@@ -1244,6 +1379,10 @@ hu:
       disable: "Törölt bejegyzések mutatása"
     private_message_info:
       title: "Üzenet"
+      invite: "Mások meghívása..."
+      edit: "Hozzáadás és eltávolítás"
+      remove: "Eltávolítás..."
+      add: "Hozzáadás…"
       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?"
@@ -1255,7 +1394,10 @@ hu:
     trust_level: "Bizalmi szint"
     search_hint: "felhasználónév, e-mail vagy IP-cím"
     create_account:
-      title: "Új fiók létrehozása"
+      header_title: "Üdvözlünk!"
+      subheader_title: "Hozzuk létre a fiókodat!"
+      disclaimer: "Csak akkor regisztrálj, ha elfogadod az <a href='%{privacy_link}' target='blank'>Adatvédelmi szabályzatunkat</a> és az <a href='%{tos_link}' target='blank'>Általános Szerződési Feltételeket</a>."
+      title: "Regisztráció"
       failed: "Valami hiba történt, talán ez az e-mail cím már regisztrálva van. Próbálta már a jelszó-emlékeztetőt?"
     forgot_password:
       title: "Jelszó-visszaállítás"
@@ -1264,25 +1406,39 @@ hu:
       reset: "Jelszó visszaállítása"
       complete_username: "Amennyiben létezik fiók <b>%{username}</b> felhasználónévvel, hamarosan kapni fog egy levelet, amiben megtalálhatja a jelszó visszaállításához szükséges további lépéseket."
       complete_email: "Amennyiben létezik fiók <b>%{email}</b> e-mail-címmel, hamarosan kapni fog egy levelet, amiben megtalálhatja a jelszava visszaállításához szükséges további lépéseket."
+      complete_username_found: "Találtunk egy fiókot, amelynek a felhasználóneve megegyezik ezzel: <b>%{username}</b>. Perceken belül egy e-mailt kell kapnod arról, hogy hogyan állíthatod vissza a jelszavadat."
+      complete_email_found: "Találtunk egy fiókot, amelynek a beállított e-mail címe megegyezik ezzel: <b>%{email}</b>. Perceken belül egy e-mailt kell kapnod arról, hogy hogyan állíthatod vissza a jelszavadat."
       complete_username_not_found: "Nincs fiók regisztrálva a következő felhasználónévvel: <b>%{username}</b>"
       complete_email_not_found: "Nincs fiók regisztrálva a következő e-mail-címmel: <b>%{email}</b>"
+      help: "Nem érkezik meg az e-mail? Ellenőrizd a spam mappában (és Gmail esetén a Promóciók tabon) is!<p>Nem vagy biztos benne, hogy melyik e-mail címedet használtad? Adj meg egy e-mail címet, és megmondjuk, van-e vele regisztráció itt.</p><p>Ha már nem férsz hozzá a fiókodban szereplő e-mail címhez, kérjük, lépj kapcsolatba <a href='%{basePath}/about'>segítőkész csapatunkkal!</a></p>"
       button_ok: "Rendben"
       button_help: "Segítség"
     email_login:
       link_label: "Küldjön e-mailben egy bejelentkezési hivatkozást"
       button_label: "e-maillel"
+      login_link: "Nem írom be a jelszót; inkább küldj egy linket a bejelentkezéshez"
+      emoji: "zár emodzsi"
+      complete_username: "Amennyiben létezik fiók <b>%{username}</b> felhasználónévvel, hamarosan kapni fogsz egy levelet, amiben megtalálhatod a jelszó visszaállításához szükséges további lépéseket."
+      complete_email: "Amennyiben létezik fiók a(z) <b>%{email}</b> e-mail címmel, hamarosan kapni fogsz egy levelet, amiben megtalálhatod a belépéshez szükséges linket."
+      complete_username_found: "Találtunk egy fiókot ezzel a felhasználónévvel: <b>%{username}</b>. Hamarosan kapni fogsz egy levelet, amiben megtalálhatod a belépéshez szükséges linket."
+      complete_email_found: "Találtunk egy fiókot, amelynek a beállított e-mail címe megegyezik ezzel: <b>%{email}</b>. Perceken belül egy e-mailt kell kapnod a bejelentkezési linkkel."
       complete_username_not_found: "Nem található egyezés a felhasználónévvel<b>%{username}</b>"
       complete_email_not_found: "Nincs fiók regisztrálva a következő e-mail-címmel: <b>%{email}</b>"
       confirm_title: Tovább a%{site_name}
+      logging_in_as: Bejelentkezés %{email}ként
+      confirm_button: Bejelentkezés befejezése
     login:
-      title: "Bejelentkezés"
+      subheader_title: "Jelentkezz be a fiókodba"
       username: "Felhasználó"
       password: "Jelszó"
+      second_factor_title: "Kéttényezős hitelesítés"
       second_factor_description: "Kérlek írd be az azonosítási kódodat az alkalmazásodból"
       second_factor_backup_description: "Kérlek írd be valamelyik biztonsági kódodat"
-      email_placeholder: "e-mail vagy felhasználónév"
+      security_key_no_matching_credential_error: "A megadott biztonsági kulcsban nem található megfelelő hitelesítő adat."
+      email_placeholder: "E-mail vagy Felhasználónév"
       caps_lock_warning: "A Caps Lock be van kapcsolva"
       error: "Ismeretlen hiba"
+      cookies_error: "Úgy tűnik, hogy az böngésződben a sütik le vannak tiltva. Előfordulhat, hogy nem tudsz bejelentkezni anélkül, hogy előbb engedélyeznéd őket."
       rate_limit: "Kérlek várj a bejelentkezés megpróbálása előtt."
       blank_username: "Adja meg az e-mail-címét vagy felhasználónevét"
       blank_username_or_password: "Adja meg az e-mail-címét vagy felhasználónevét és a jelszavát."
@@ -1294,13 +1450,16 @@ hu:
       awaiting_approval: "A felhasználói fiókja még nincs jóváhagyva. A jóváhagyásról elektronikus levélben kap é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 tud bejelentkezni, mert a felhasználói fiókja még nincs aktiválva. Előzőleg küldtünk egy aktiváló e-mailt a(z) <b>%{sentTo}</b> címre. A fiók aktiválásához kövesse az abban az e-mailben található utasításokat."
+      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: "Kattintson ide az aktiváló e-mail újraküldéséhez."
+      omniauth_disallow_totp: "A fiókodban engedélyezve van a kéttényezős hitelesítés. Kérjük, jelentkezz be a jelszavaddal!"
       resend_title: "Aktiváló e-mail újraküldése"
       change_email: "E-mail-cím módosítása"
       provide_new_email: "Adjon meg egy új címet, és újraküldjük az aktiváló e-mailt."
       submit_new_email: "E-mail-cím frissítése"
       sent_activation_email_again: "Küldtünk egy másik aktivációs e-mailt a(z) <b>%{currentEmail}</b> címre. Néhány percen belül meg kell érkeznie; győződjön meg róla, hogy nem került a levélszemét mappába."
+      sent_activation_email_again_generic: "Küldtünk egy újabb aktivációs e-mailt a címedre. Néhány percen belül meg kell érkeznie; győződj meg róla, hogy nem került a levélszemét (vagy Gmail esetén a Promóciók) mappába!"
       to_continue: "Kérlek jelentkezz be"
       preferences: "Bejelentkezve kell lenned ahoz hogy megváltoztasd a felhasználói beállításokat"
       not_approved: "A fiók még nem lett elfogadva. E-mailben értesítjük, ha bejelentkezhet."
@@ -1325,10 +1484,12 @@ hu:
       accept_title: "Meghívás"
       welcome_to: "Üdvözöllek a%{site_name}"
       invited_by: "Meglettél hívva:"
+      social_login_available: "Bármely közösségi bejelentkezéssel is be tudsz jelentkezni ennek az e-mailen címnek a használatával."
       your_email: "A fiókja e-mail-címe <b>%{email}</b>."
       accept_invite: "Meghívás elfogadása"
       success: "A fiók elkészült és mostmár be vagy jelentkezve"
       name_label: "Név"
+      password_label: "Jelszó"
       optional_description: "(opcionális)"
     password_reset:
       continue: "Tovább a%{site_name}"
@@ -1351,11 +1512,27 @@ hu:
       alt: "Alt"
     conditional_loading_section:
       loading: Töltés...
+    category_row:
+      topic_count:
+        one: "%{count} téma van ebben a kategóriában."
+        other: "%{count} téma van ebben a kategóriában"
     select_kit:
+      filter_by: "Szűrő: %{name}"
+      select_to_filter: "Válaszd ki a szűrni kívánt értéket"
       default_header_text: Kiválasztás...
       no_content: Nem található egyezés
       filter_placeholder: Keresés...
+      filter_placeholder_with_any: Keresés vagy létrehozás ...
       create: "Létrehozás: '%{content}'"
+      max_content_reached:
+        one: "Csak %{count} elemet választhat."
+        other: "Csak %{count} elemet választhatsz."
+      min_content_not_reached:
+        one: "Válassz legalább %{count} elemet."
+        other: "Válassz ki legalább %{count} elemet."
+      invalid_selection_length:
+        one: "A címnek legalább %{count} karakter hosszúnak kell lennie"
+        other: "A kijelölésnek legalább %{count} karakter hosszúnak kell lennie"
     date_time_picker:
       from: From
       to: To
@@ -1373,7 +1550,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 csak azok számára látható, akik megosztott vázlatokat tehetnek közzé."
       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?"
@@ -1384,7 +1561,6 @@ hu:
       options: "Beállítások"
       whisper: "suttogás"
       unlist: "nem listázott"
-      blockquote_text: "idézetblokk"
       add_warning: "Ez egy hivatalos figyelmeztetés."
       posting_not_on_topic: "Melyik témakörre szeretnél válaszolni?"
       saved_local_draft_tip: "helyi mentés készült"
@@ -1396,11 +1572,9 @@ hu:
       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"
+      duplicate_link: "Úgy tűnik, hogy a <b>%{domain}</b> re mutató linkjét <b>@%{username}</b> már <a href='%{post_url}'>ban közzétette a témában, válasz: %{ago}</a> - Biztosan újra el akarja küldeni?"
       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"
         category_missing: "Ki kéne választanod egy kategóriát"
       save_edit: "Módosítások mentése"
       overwrite_edit: "Módosítások mentése"
@@ -1418,15 +1592,15 @@ hu:
       title_placeholder: "Mi lesz a témája ennek a beszélgetésnek, röviden?"
       title_or_link_placeholder: "Adj címet vagy másolj ide egy linket"
       edit_reason_placeholder: "miért szerkesztesz?"
+      topic_featured_link_placeholder: "Írja be a link címét!"
       remove_featured_link: "Hivatkozás eltávolítása a témából."
       reply_placeholder: "Ide írhatsz. A feltöltéshez húzz- vagy illessz be képet! A formázáshoz használhatsz Markdown-, BBCode- vagy HTML kódokat is."
       reply_placeholder_no_images: "Ide írj. Használhatsz Markdown-t, BBCode-ot, vagy HTML-t a formázáshoz."
+      reply_placeholder_choose_category: "Válassz egy kategóriát, mielőtt elkezdesz írni!"
       view_new_post: "Nézd meg az új bejegyzésedet."
       saving: "Mentés"
       saved: "Elmentve!"
       uploading: "Feltöltés..."
-      show_preview: "előnézet megjelenítése &raquo;"
-      hide_preview: "&laquo; előnézet elrejtése"
       quote_post_title: "Teljes bejegyzés idézése"
       bold_label: "Félkövér"
       bold_title: "Félkövér"
@@ -1438,8 +1612,8 @@ hu:
       link_description: "itt add meg a link leírását"
       link_dialog_title: "Hiperhivatkozás beszúrása"
       link_optional_text: "alternatív cím"
-      quote_title: "Idézet"
-      quote_text: "Idézet"
+      blockquote_title: "idézetblokk"
+      blockquote_text: "idézetblokk"
       code_title: "Előformázott szöveg"
       code_text: "az előformázott szöveget 4 szóközzel beljebb kezdi"
       paste_code_text: "Írd vagy másold be a kódot ide"
@@ -1465,6 +1639,9 @@ hu:
         reply_as_new_topic:
           label: Válasz egy csatolt témaként
           desc: Egy új téma létrehozása ezzel a témával kapcsolatban
+          confirm: Elmentettük az új témavázlatodat, amelyet a program automatikusan felülír, ha csatolt témakört hozol létre.
+        reply_as_new_group_message:
+          desc: Új privát üzenet létrehozása ugyanazokkal a címzettekkel
         reply_as_private_message:
           label: Új üzenet
           desc: Személyes üzenet létrehozása
@@ -1474,7 +1651,7 @@ hu:
           label: "Új téma"
         shared_draft:
           label: "Megsztott vázlat"
-          desc: "Csak olyan témákat soroljon be amik csak a személyzet által láthatóak"
+      ignore: "Letiltás"
     notifications:
       tooltip:
         regular:
@@ -1486,6 +1663,7 @@ hu:
       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."
+      post_approved: "A bejegyzésedet jóváhagytuk"
       reviewable_items: "felülvizsgálatot igénylő elemek"
       mentioned: "<span>%{username}</span>%{description}"
       group_mentioned: "<span>%{username} </span>%{description}"
@@ -1495,15 +1673,24 @@ hu:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} %{count} más</span> %{description}"
+        other: "<span class='multi-user'>%{username}, %{username2} és %{count} mások</span> %{description}"
+      liked_consolidated_description:
+        one: "%{count} bejegyzésed kedvelte"
+        other: "%{count} bejegyzésed kedvelte"
       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}'"
+      granted_badge: "Új jelvény: '%{description}'"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Új téma</span>%{description} "
+      reaction: "<span>%{username}</span>%{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       group_message_summary:
         one: "%{count} Üzenet a %{group_name} postaládában"
         other: "%{count} Üzenetek a %{group_name} postaládában"
@@ -1514,10 +1701,19 @@ hu:
         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}'
+        linked: '%{username} válaszolt neked itt: "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} új témát hozott létre: "%{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:
+        private_message: "új személyes üzenet"
+        invited_to_private_message: "meghívott privát üzenetre"
+        linked: "linkelve"
+        bookmark_reminder: "könyvjelző emlékeztető"
+        bookmark_reminder_with_name: "könyvjelző emlékeztető - %{name}"
+        granted_badge: "kiadott jelvény"
+        group_message_summary: "új csoportüzenetek"
         watching_first_post: "új téma"
         post_approved: "bejegyzés jóváhagyva"
     upload_selector:
@@ -1527,7 +1723,6 @@ 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}"
       uploading: "Feltöltés"
       select_file: "File kiválasztása."
       default_image_alt_text: Kép
@@ -1537,7 +1732,7 @@ hu:
       latest_post: "Utolsó bejegyzés"
       latest_topic: "Legutóbbi téma"
       most_viewed: "Legtöbbet megtekintett"
-      most_liked: "Legtöbbet Lájkolt"
+      most_liked: "Legtöbbet kedvelt"
       select_all: "Összes kijelölése"
       clear_all: "Összes tisztítása"
       too_short: "Keresési kifejezésed túl rövid."
@@ -1551,8 +1746,10 @@ hu:
       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_button: "Keresés"
       context:
         user: "Keresés @%{username} bejegyzései között"
+        category: "Keresés a #%{category}ban"
         topic: "Keresés ebben a témakörben"
         private_messages: "Üzenetek keresése"
       advanced:
@@ -1566,27 +1763,36 @@ hu:
         with_tags:
           label: Címke
         filters:
+          label: 'Csak akkor mutass egy témát/választ, ha:'
+          title: Csak ha a keresett kifejezés megtalálható a címben
           likes: Kedveltem
+          created: Létrehoztam
           watching: Figyelem
           tracking: Követem
+          private: Az üzeneteim között található
           bookmarks: Könyvjelzőztem
+          first: a legelső bejegyzés
           seen: Olvastam
+          all_tags: Az összes fenti címke használata
         statuses:
           open: Megnyitva
           closed: Bezárva
           archived: Archivált
           noreplies: Nincsenek válaszok
         post:
+          count:
+            label: Válaszok
           time:
             label: Közzétett
             before: előtte
             after: utána
+        views:
+          label: Megtekintések
     hamburger_menu: "Menj egy másik témára vagy kategóriára"
     new_item: "új"
     go_back: "visszalépés"
     not_logged_in_user: "felhasználói oldal összesítéssel a jelenleg aktivitásokról és beállításokról"
     current_user: "a felhasználói oldalad meglátogatása"
-    view_all: "mindent megtekint"
     topics:
       new_messages_marker: "utoljára megtekintett"
       bulk:
@@ -1602,17 +1808,27 @@ hu:
         change_category: "Kategória beállítása"
         close_topics: "Témakörök lezárása"
         archive_topics: "Témakörök archíválása"
+        move_messages_to_inbox: "Áthelyezés a bejövő üzenetek közé"
         notification_level: "Értesítések"
+        change_notification_level: "Értesítési szint módosítása"
+        choose_new_category: "Válaszd ki az új kategóriát a témákhoz:"
+        selected:
+          one: "Kiválasztottad a <b>%{count}</b> témát."
+          other: "Kiválasztottál <b>%{count}</b> témát."
+        confirm_remove_tags:
+          one: "Az összes címkét eltávolítjuk erről a témáról. biztos vagy ebben?"
+          other: "Az összes címkét eltávolítjuk <b>%{count}</b> témakörből. biztos vagy ebben?"
       none:
         unread: "Nincsenek olvasatlan témakörök."
         new: "Nincsenek új témakörök."
         read: "Még egy témakört sem olvastál el."
         posted: "Még egy témakörhöz sem szóltál hozzá."
+        ready_to_create: "Hozd létre "
         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."
         top: "Nincsenek top témák"
         educate:
-          unread: '<p> Az olvasatlan témáid itt jelennek meg. </p><p> Alapértelmezés szerint a témák olvasatlanok és a <span class="badge new-posts badge-notification">1</span> számlálót mutatják, ha te: </p><ul><li> Hoztad létre a témát </li><li> Válaszoltál a témára </li><li> Több mint 4 percig olvastad a témát </li></ul><p> Vagy ha az egyes témák alján található értesítésvezérlés segítségével kifejezetten követettre vagy figyeltre állítottad a témát. </p><p> Látogasd meg a <a href="%{userPrefsUrl}">beállításokat,</a> ha változtatnál ezen. </p>'
+          new: '<p>Az új témák fognak itt megjelenni. Alapértelmezésként itt jelennek meg a friss témák, és egy ilyen jelet <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> találsz majd azok mellett, amelyeket ráadásul az elmúlt két napban tettek közzé.</p><p>A beállításaidat <a href="%{userPrefsUrl}">ezen az oldalon</a> tudod módosítani.</p>'
       bottom:
         latest: "Nincs több friss téma."
         posted: "Nincsen több közzétett téma"
@@ -1620,6 +1836,7 @@ hu:
         new: "Nincs több új témakör."
         unread: "Nincs több olvasatlan témakör."
         category: "Nincs több %{category} téma."
+        tag: "Nincs több %{tag} 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:
@@ -1634,6 +1851,13 @@ hu:
         title: "Áthelyezés a bejövő üzenetek közé"
       edit_message:
         title: "Szerkesztés"
+      feature_on_profile:
+        help: "Adj hozzá egy linket a témához a felhasználói kártyádon és a profilodon"
+        title: "Megjelenítés kiemeltként a profilodon"
+      remove_from_profile:
+        warning: "A profilodnak már van egy kiemelt témája. Ha folytatos, ez a téma lecseréli a meglévő témát."
+        help: "A témára mutató hivatkozás eltávolítása a felhasználói profilodban"
+        title: "Eltávolítás a profilból"
       list: "Témák"
       new: "új téma"
       unread: "olvasatlan"
@@ -1669,12 +1893,27 @@ hu:
       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_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
+      suggest_create_topic: az első témát te!
       jump_reply_up: ugrás régebbi válaszhoz
       jump_reply_down: ugrás újabb válaszhoz
       deleted: "Ez a témakör ki lett törölve"
+      slow_mode_update:
+        save: "Engedélyezés"
+        remove: "Letiltás"
+        hours: "Óráig:"
+        durations:
+          10_minutes: "10 Percig"
+          15_minutes: "15 Percig"
+          30_minutes: "30 Percig"
+          45_minutes: "45 Percig"
+          1_hour: "1 Óráig"
+          2_hours: "2 Óráig"
+          4_hours: "4 Óráig"
+          8_hours: "8 Óráig"
+          12_hours: "12 Óráig"
+          24_hours: "24 Óráig"
       topic_status_update:
         title: "Téma időzítése"
         save: "Időzítő beállítása"
@@ -1682,18 +1921,16 @@ hu:
         remove: "Időzítő eltávolítása"
         publish_to: "Közzététel itt:"
         when: "Mikor:"
-        time_frame_required: Kérjük, válassz ki egy időkeretet
+        time_frame_required: "Kérjük, válassz ki egy időkeretet"
       auto_update_input:
+        none: "Válassz időkeretet"
+        now: "Most"
         later_today: "A mai nap folyamán"
         tomorrow: "Holnap"
         later_this_week: "A hét folyamán"
         this_weekend: "Hétvégén"
         next_week: "Jövő héten"
-        two_weeks: "Két hét"
         next_month: "Jövő hónapban"
-        three_months: "Három hónap"
-        six_months: "Hat hónap"
-        one_year: "Egy év"
         forever: "Örökre"
         pick_date_and_time: "Dátum és idő kiválasztása"
       auto_reopen:
@@ -1702,12 +1939,15 @@ hu:
         title: "Téma automatikus lezárása"
         error: "Érvényes dátumot kérek!"
         based_on_last_post: "Nem zárul le a poszt addig, amíg a legújabb üzenet nem ennyi ideje lett elküldve."
+      auto_close_after_last_post:
+        title: "Téma automatikus bezárása az utolsó hozzászólás után"
       auto_delete:
         title: "Téma automatikus törlése"
       reminder:
         title: "Emlékeztető"
       status_update_notice:
         auto_close: "Ez a téma %{timeLeft} automatikusan lezárul."
+        auto_close_after_last_post: "Ez a téma az utolsó válasz után %{duration} idővel zár le."
       auto_close_title: "Automatikus lezárási beállítások"
       timeline:
         back: "Vissza"
@@ -1720,7 +1960,7 @@ hu:
         go: "ugrás"
         jump_bottom: "Ugrás az utolsó bejegyzéshez"
         jump_prompt: "ugrás..."
-        jump_prompt_of: "a %{count} bejegyzésből"
+        jump_prompt_long: "Ugrás..."
         jump_bottom_with_number: "ugrás a következő bejegyzéshez: %{post_number}"
         jump_prompt_to_date: "Mostanáig"
         jump_prompt_or: "vagy"
@@ -1791,12 +2031,15 @@ hu:
         remove_banner: "Kiemelt Téma eltávolítása"
       reply:
         title: "Válasz"
+        help: "kezdj választ írni erre a témára"
       clear_pin:
         title: "Kiemelés törlése"
         help: "A téma kiemelésének törlése, ezután nem jelenik meg a témaköreid legelején"
       share:
         title: "Megosztás"
+        extended_title: "Link megosztása"
         help: "a témakör hivatkozásának megosztása"
+        invite_users: "Meghívás"
       print:
         title: "Nyomtatás"
       flag_topic:
@@ -1805,6 +2048,9 @@ hu:
       feature_topic:
         unpin: "Téma eltávolítása a %{categoryLink} kategória elejéről."
         not_pinned: "Nincsenek kiemelt %{categoryLink} témák. "
+        confirm_pin_globally:
+          one: "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?"
+          other: "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?"
         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>"
@@ -1815,7 +2061,10 @@ hu:
         email_or_username: "A meghívott e-mail-címe vagy felhasználóneve"
         email_or_username_placeholder: "e-mail-cím vagy felhasználónév"
         action: "Meghívás"
+        success: "Meghívtuk a felhasználót, hogy vegyen részt ebben az üzenetben."
+        success_group: "Meghívtuk a csoportot, hogy vegyen részt ebben az üzenetben."
         error: "Sajnos hiba történt a felhasználó meghívásakor."
+        not_allowed: "Sajnáljuk, a felhasználót nem lehet meghívni."
         group_name: "csoport neve"
       controls: "Témák kezelése"
       invite_reply:
@@ -1823,10 +2072,15 @@ hu:
         username_placeholder: "felhasználónév"
         action: "Meghívó küldése"
         help: "mások meghívása ebbe a témába e-mailben vagy értesítéssel"
-        sso_enabled: "Írd be annak a felhasználónevét, akit meg szeretnél hívni ebbe a témába."
+        to_forum: "Küldünk egy rövid e-mailt, amely lehetővé teszi, hogy a barátod azonnal és egyszerűen csatlakozni tudjon egyetlen linkre kattintva."
+        discourse_connect_enabled: "Írd be annak a felhasználónevét, akit meg szeretnél hívni ebbe a témába."
         to_topic_blank: "Adja meg a témába meghívandó személy felhasználónevét vagy e-mail-címét."
+        to_topic_email: "Megadtál egy e-mail címet. Erre küldünk egy rövid e-mailt, amely lehetővé teszi, hogy a barátod azonnal és egyszerűen csatlakozni tudjon egyetlen linkre kattintva."
+        to_topic_username: "Megadtál egy felhasználónevet. Küldünk egy rövid e-mailt, amely lehetővé teszi, hogy a barátod azonnal és egyszerűen csatlakozni tudjon egyetlen linkre kattintva."
         to_username: "Írd be annak a felhasználónevét, akit meg szeretnél hívni. Értesítést fogunk neki küldeni, ennek a témának a linkjével."
         email_placeholder: "nev@pelda.hu"
+        success_email: "Meghívót küldtünk ki a <b>%{invitee}</b>címre. Értesíteni fogunk, ha a meghívót elfogadják. Ellenőrizd a meghívók fület a felhasználói oldaladon, hogy nyomon kövesd a meghívásaidat."
+        success_existing_email: "Létezik felhasználó ezzel az e-mail címmel: <b>%{emailOrUsername}</b> . Meghívtuk a felhasználót, hogy vegyen részt ebben a témában zajló beszélgetésben."
       login_reply: "Jelentkezz be, hogy válaszolhass"
       filters:
         n_posts:
@@ -1862,12 +2116,16 @@ hu:
         selected: "kiválasztva (%{count})"
         select_post:
           label: "Kiválasztás"
+          title: "Hozzászólás hozzáadása a kiválasztáshoz"
         selected_post:
           label: "Kiválasztott"
+          title: "Ide kattintva eltávolíthatja a bejegyzést a kijelölésből"
         select_replies:
           label: "kiválaszt +válaszok"
+          title: "A hozzászólás és összes válaszának hozzáadása a kiválasztáshoz"
         select_below:
           label: "Kiválaszt +alatta"
+          title: "Add hozzá a választ és minden utána következőt a kiválasztáshoz"
         delete: kiválasztottak törlése
         cancel: kiválasztások visszavonása
         select_all: mind kiválasztása
@@ -1880,13 +2138,15 @@ hu:
         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"
+      quote_share: "Megosztás"
       edit_reason: "Ok:"
       post_number: "bejegyzés %{number}"
-      wiki_last_edited_on: "Wiki utoljára szerkesztve"
-      last_edited_on: "utoljára szerkesztve"
+      ignored: "Letiltott tartalom"
       reply_as_new_topic: "Válasz csatolt üzenetként"
+      reply_as_new_private_message: "Válasz új üzenetként ugyanazoknak a címzetteknek"
       follow_quote: "ugrás az idézett bejegyzéshez"
       show_full: "Teljes bejegyzés megtekintése"
+      show_hidden: "Letiltott tartalom megtekintése"
       deleted_by_author:
         one: "(a szerző által visszavont hozzászólás 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)"
@@ -1895,6 +2155,8 @@ hu:
       gap:
         one: "%{count} rejtett válasz megtekintése"
         other: "%{count} rejtett válasz megtekintése"
+      notice:
+        new_user: "Ez az első alkalom, hogy %{user} posztolt - üdvözöljük a közösségünkben!"
       unread: "Olvasatlan bejegyzés"
       has_replies:
         one: "%{count} Válasz"
@@ -1906,6 +2168,8 @@ hu:
       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"
+      in_reply_to: "Szülő bejegyzés betöltése"
+      view_all_posts: "Az összes válasz megtekintése"
       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!"
@@ -1914,27 +2178,28 @@ hu:
         image_upload_not_allowed_for_new_user: "Sajnáljuk, de az új felhasználók nem tölthetnek fel képeket!"
         attachment_upload_not_allowed_for_new_user: "Sajnáljuk, de az új felhasználók nem tölthetnek fel csatolmányokat!"
         attachment_download_requires_login: "Sajnáljuk, de be kell jelentkezned, hogy letölthess csatolmányokat!"
-      abandon_edit:
-        no_value: "Nem, megtartás"
-      abandon:
-        confirm: "Biztosan visszavonod a bejegyzésedet? "
-        no_value: "Nem, tartsd meg"
-        yes_value: "Igen, visszavonom"
+      via_email: "ez a válasz e-mailben érkezett"
+      via_auto_generated_email: "ez a bejegyzés egy automatikusan generált e-mailen keresztül érkezett"
       archetypes:
         save: "Mentési beállítások"
+      few_likes_left: "Köszönjük, hogy aktívan osztod a kedveléseket! A jóból is megárt a sok: már csak néhány kiosztható kedvelésed maradt mára."
       controls:
+        reply: "kezdje meg a választ erre a bejegyzésre"
         like: "bejegyzés kedvelése"
         has_liked: "kedvelted ezt a bejegyzést"
+        read_indicator: "tagok, akik elolvasták ezt a bejegyzést"
         undo_like: "kedvelés visszavonása"
         edit: "bejegyzés szerkesztése"
         edit_action: "Szerkesztés"
         edit_anonymous: "Sajnáljuk, de be kell jelentkezned, hogy szerkeszthesd ezt a bejegyzést!"
+        flag: "Titkosan jelöld meg ezt a bejegyzést, hogy felhívd rá a moderátorok figyelmét, vagy küldj privát értesítést róla"
         delete: "bejegyzés törlése"
         undelete: "bejegyzés visszaállítása"
         share: "bejegyzés megosztása link-kel"
         more: "Több"
         delete_replies:
           just_the_post: "Nem, csak ezt a bejegyzést"
+        admin: "admin műveletek"
         wiki: "Wiki létrehozása"
         unwiki: "Wiki eltávolítása"
         convert_to_moderator: "Stáb szín hozzáadása"
@@ -1945,9 +2210,17 @@ hu:
         grant_badge: "Jelvény adományozása"
         lock_post: "Bejegyzés zárolása"
         unlock_post: "Bejegyzés zárolásának feloldása"
+        delete_topic_confirm_modal_yes: "Igen, töröld ezt a témát"
+        delete_topic_confirm_modal_no: "Nem, tartsa meg ezt a témát"
         delete_topic: "témakör törlése"
       actions:
         people:
+          like:
+            one: "kedvelve"
+            other: "kedvelve"
+          read:
+            one: "olvasd ezt el"
+            other: "olvasd ezt el"
           like_capped:
             one: "és %{count} ezt likeolták"
             other: "és %{count} embernek tetszett"
@@ -1957,8 +2230,17 @@ hu:
           inappropriate: "Ide nem illőnek jelölted"
           notify_moderators: "Moderálásra jelölted"
           notify_user: "Üzenetet küldtél ennek a felhasználónak"
+      delete:
+        confirm:
+          one: "Biztosan törlöd ezt a bejegyzést?"
+          other: "Biztosan törlöd ezt a %{count} bejegyzést?"
+      merge:
+        confirm:
+          one: "Biztos, hogy egyesíteni szeretnéd ezeket a bejegyzéseket?"
+          other: "Biztos, hogy egyesíteni kívánod ezt a %{count} bejegyzést?"
       revisions:
         controls:
+          hide: "Átdolgozás elrejtése"
           edit_wiki: "Wiki szerkesztése"
           edit_post: "Bejegyzés szerkesztése"
         displays:
@@ -1971,28 +2253,49 @@ hu:
       raw_email:
         displays:
           raw:
+            title: "A nyers e-mail megjelenítése"
             button: "Raw"
           text_part:
+            title: "Az e-mail szöveges részének megjelenítése"
             button: "Üzenet"
           html_part:
             title: "Az e-mail HTML részének megjelenítése"
             button: "HTML"
       bookmarks:
+        create: "Könyvjelző létrehozása"
+        edit: "Könyvjelző szerkesztése"
         created: "Létrehozott"
+        updated: "Frissítve"
         name: "Név"
+        name_placeholder: "Mire való ez a könyvjelző?"
+        set_reminder: "Emlékeztess"
+        actions:
+          delete_bookmark:
+            name: "Könyvjelző törlése"
+            description: "Eltávolítja a könyvjelzőt a profilodból, és leállítja a könyvjelző összes emlékeztetőjét"
+          edit_bookmark:
+            name: "Könyvjelző szerkesztése"
+            description: "Szerkessze a könyvjelző nevét, vagy módosítsa az emlékeztető dátumát és idejét"
+      filtered_replies:
+        viewing_summary: "A téma összefoglalójának megtekintése"
     category:
       none: "(nincs kategória)"
       all: "Minden kategória"
+      choose: "kategória&hellip;"
       edit: "Szerkesztés"
+      edit_dialog_title: "Szerkesztés: %{categoryName}"
       view: "Témák megjelenítése a kategóriában"
       back: "Vissza a kategóriához"
       general: "Általános"
       settings: "Beállítások"
       topic_template: "Téma sablonja"
       tags: "Címkék"
+      topic_featured_link_allowed: "Kiemelt hivatkozások engedélyezése ebben a kategóriában"
       delete: "Kategória törlése"
       create: "Új kategória"
+      create_long: "Új kategória létrehozása"
       save: "Kategória mentése"
+      slug: "Kategória URL-végződés"
       creation_error: Hiba lépett fel a kategória létrehozása során!
       save_error: Hiba lépett fel a kategória mentése során!
       name: "Kategória neve"
@@ -2012,6 +2315,12 @@ hu:
       change_in_category_topic: "Leírás szerkesztése"
       already_used: "Ezt a színt már egy másik kategória is használja."
       security: "Biztonság"
+      security_add_group: "Csoport hozzáadása"
+      permissions:
+        group: "Csoport"
+        see: "Megtekintés"
+        reply: "Válasz"
+        create: "Létrehozás"
       images: "Képek"
       email_in: "Egyéni e-mail-cím a bejövő üzeneteknek:"
       email_in_allow_strangers: "E-mailek fogadása fiók nélküli névtelen felhasználóktól"
@@ -2028,25 +2337,23 @@ hu:
       default_position: "Alapértelmezett pozíció"
       position_disabled: "A kategóriák aktivitási sorrendben jelennek meg. A kategóriák sorrendjének listákban való szabályzásához,"
       parent: "Szülő kategória"
+      navigate_to_first_post_after_read: "A témák elolvasása után navigáljon az első hozzászóláshoz"
       notifications:
         watching:
           title: "Figyelés"
-          description: "Automatikusan figyelni fogsz minden témakört ezekben a kategóriákban. Értesítést kapsz az összes témakör minden új hozzászólásáról és látni fogod az új hozzászólások számát."
         watching_first_post:
           title: "Első hozzászólás figyelése"
         tracking:
           title: "Követés"
-          description: "Automatikusan követni fogsz minden témakört ezekben a kategóriákban. Látni fogod az új hozzászólások számát és értesítve leszel ha valaki a megemlíti a @nevedet vagy válaszol neked."
         regular:
           title: "Normál"
           description: "Csak akkor leszel értesítve, ha valaki megemlíti a @nevedet vagy válaszol neked."
         muted:
           title: "Némítás"
-          description: "Egyáltalán nem fogsz kapni semmilyen értesítést ennek a kategóriának a témaköreiről és legújabbak között sem fog szerepelni."
       search_priority:
         options:
           normal: "Normális"
-          ignore: "Ignorál"
+          ignore: "Letiltás"
           low: "Alacsony"
           high: "Magas"
       sort_options:
@@ -2065,25 +2372,39 @@ hu:
         general: "Általános"
         moderation: "Moderálás"
         email: "Email"
+      list_filters:
+        none: "nincsenek alkategóriák"
     flagging:
+      title: "Köszönjük, hogy segítesz a közösségünket civilizáltan tartani!"
       action: "Bejegyzés megjelölése"
+      take_action_options:
+        default:
+          title: "Művelet megkezdése"
+        suspend:
+          title: "Felhasználó felfüggesztése"
+        silence:
+          title: "Felhasználó elnémítása"
       notify_action: "Üzenet"
       official_warning: "Hivatalos figyelmeztetés"
       delete_spammer: "Spammer törlése"
       yes_delete_spammer: "Igen, Spammer törlése"
       ip_address_missing: "(ismeretlen)"
       hidden_email_address: "(elrejtett)"
+      submit_tooltip: "A titkos jelzés elküldése"
       cant: "Sajnáljuk, most nem jelölheted meg ezt a bejegyzést."
+      notify_staff: "A személyzet titkos értesítése"
       formatted_name:
         off_topic: "Ez nem tartozik a témakörbe"
         inappropriate: "Ez nem megfelelő"
         spam: "Ez szemét"
       custom_placeholder_notify_user: "Légy célra törő, építő jellegű és mindig legyél kedves másokhoz!"
+      custom_placeholder_notify_moderators: "Tudasd velünk konkrétan, hogy mi a gond, és lehetőség szerint adj megfelelő linkeket és példákat."
       custom_message:
         left:
           one: "%{count} van hátra"
           other: "%{count} hátralévő"
     flagging_topic:
+      title: "Köszönjük, hogy segítesz a közösségünket civilizáltan tartani!"
       action: "Téma jelölése"
       notify_action: "Üzenet"
     topic_map:
@@ -2095,6 +2416,7 @@ hu:
         one: "%{count} kattintás"
         other: "%{count} kattintás"
     post_links:
+      about: "bővíts további linkeket ehhez a bejegyzéshez"
       title:
         one: "még %{count}"
         other: "további %{count}"
@@ -2127,6 +2449,9 @@ hu:
       one: "megtekintés"
       other: "megtekintés"
     replies: "Válaszok"
+    views_long:
+      one: "ezt a témát %{count} alkalommal nézték meg"
+      other: "ezt a témát %{number} alkalommal nézték meg"
     activity: "Aktivitás"
     likes: "Kedvelések"
     likes_lowercase:
@@ -2137,7 +2462,6 @@ hu:
       one: "felhasználó"
       other: "felhasználók"
     category_title: "Kategória"
-    history: "Előzmények"
     changed_by: "szerző %{author}"
     raw_email:
       title: "Bejövő email"
@@ -2145,6 +2469,7 @@ hu:
     categories_list: "Kategóriák listája"
     filters:
       with_topics: "%{filter} témák"
+      with_category: "%{filter} %{category} Témák"
       latest:
         title: "Legújabb"
         title_with_count:
@@ -2210,12 +2535,14 @@ hu:
         this_month: "Utolsó 30 nap"
         this_week: "Utolsó 7 nap"
         today: "Utolsó 24 óra"
+        other_periods: "a legkedveltebbek között:"
     permission_types:
       full: "Létrehozás / Válaszolás / Megtekintés"
       create_post: "Válaszolás / Megtekintés"
       readonly: "Megtekintés"
     lightbox:
       download: "letöltés"
+      counter: "%curr% / %total%"
     keyboard_shortcuts_help:
       title: "Billentyűkombinációk"
       jump_to:
@@ -2234,6 +2561,7 @@ hu:
         title: "Navigáció"
         jump: "%{shortcut} Ugrás a bejegyzésre #"
         back: "%{shortcut} Vissza"
+        go_to_unread_post: "%{shortcut} Ugrás az első olvasatlan bejegyzésre"
       application:
         title: "Alkalmazás"
         create: "%{shortcut} Új téma létrehozása"
@@ -2248,6 +2576,19 @@ hu:
         log_out: "%{shortcut} Kijelentkezés"
       composing:
         title: "Megfogalmaz"
+      bookmarks:
+        title: "Könyvjelzők"
+        enter: "%{shortcut} Mentés és bezárás"
+        later_today: "%{shortcut} Ma később"
+        later_this_week: "%{shortcut} Később ezen a héten"
+        tomorrow: "%{shortcut} Holnap"
+        next_week: "%{shortcut} Jövő héten"
+        next_month: "%{shortcut} Következő hónapban"
+        next_business_week: "%{shortcut} A jövő hét kezdetén"
+        next_business_day: "%{shortcut} Következő munkanapon"
+        custom: "%{shortcut} Egyéni dátum és idő"
+        none: "%{shortcut} Nincs emlékeztető"
+        delete: "%{shortcut} Könyvjelző törlése"
       actions:
         title: "Műveletek"
         share_topic: "%{shortcut} Téma megosztása"
@@ -2267,12 +2608,20 @@ hu:
       earned_n_times:
         one: "Nyerte ezt a jelvényt %{count} idővel"
         other: "%{count} alkalommal szerezte meg ezt a jelvényt"
+      granted_on: "Kiadva %{date}"
       others_count: "A jelvényt birtoklók száma (%{count})"
       title: Jelvények
       allow_title: "Ezt a jelvényt címként használhatod"
+      multiple_grant: "Ezt többször is megkeresheted"
       badge_count:
         one: "%{count} Jelvény"
         other: "%{count} jelvény"
+      more_badges:
+        one: "+Még %{count}"
+        other: "+Még %{count}"
+      granted:
+        one: "%{count} kiadva"
+        other: "%{count} kiadva"
       select_badge_for_title: Válassz egy jelvényt, hogy címként használd
       none: "(semmi)"
       successfully_granted: "Sikeresen adományoztott %{badge} %{username} számára"
@@ -2348,6 +2697,16 @@ hu:
       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"
+    do_not_disturb:
+      title: "Ne zavarjanak..."
+      label: "Ne zavarjanak"
+      remaining: "%{remaining} van hátra"
+      options:
+        half_hour: "30 percig"
+        one_hour: "1 óráig"
+        two_hours: "2 óráig"
+        tomorrow: "Holnapig"
+        custom: "Egyéni"
   admin_js:
     type_to_filter: "Írj ide a szűréshez.."
     admin:
@@ -2371,6 +2730,8 @@ hu:
         version_check_pending: "Úgy nézik nem rég frissítettél. Fantasztikus!"
         installed_version: "Telepítve"
         latest_version: "Legfrissebb"
+        new_features:
+          dismiss: "Elvetés"
         last_checked: "Utoljára ellenőrizve: "
         refresh_problems: "Újratöltés"
         no_problems: "Nem találtunk semmilyen problémát."
@@ -2411,6 +2772,9 @@ hu:
           view_table: "asztal"
           view_graph: "Grafikon"
           refresh_report: "Jelentés frissítése"
+          daily: Napi
+          monthly: Havi
+          weekly: Heti
           groups: "Összes csoport"
           disabled: "Ez a bejelentés ki van kapcsolva"
           total: "Mindenkori összes"
@@ -2474,13 +2838,21 @@ hu:
         user: "Felhasználó"
         title: "API"
         created: Létrehozott
+        updated: Frissítve
         generate: "Generálás"
         revoke: "Visszavonás"
         all_users: "Minden felhasználó"
         show_details: Részletek
         description: Leírás
         save: Mentés
+        not_shown_again: Ez a gomb nem jelenik meg újra. A folytatás előtt győződj meg róla, hogy készítettél egy másolatot róla.
         continue: Folytatás
+        scopes:
+          resource: Forrás
+          action: Művelet
+          descriptions:
+            users:
+              update: Felhasználói profil adatainak frissítése.
       web_hooks:
         title: "Webhooks"
         create: "Létrehoz"
@@ -2503,7 +2875,6 @@ hu:
           name: "Bejegyzés témája"
         user_event:
           name: "Felhasználói esemény"
-          details: "Amikor egy felhasználó bejelentkezik, kijelentkezik, jóváhagyásra kerül vagy módosul."
         group_event:
           name: "Csoport esemény"
           details: "Amikor egy csoport létrejön, módosul vagy megsemmisül."
@@ -2656,14 +3027,18 @@ hu:
           add_upload: "Feltöltés hozzáadása"
           variable_name: "SCSS var name:"
           upload: "Feltöltés"
+          select_component: "Válassz ki egy komponenst..."
           css_html: "Egyedi CSS/HTML"
           edit_css_html: "CSS/HTML szerkesztése"
           edit_css_html_help: "Nem szerkesztettél semmilyen CSS vagy HTML formátumot"
           delete_upload_confirm: "Töröljük ezt a feltöltést? (A témához tartozó CSS működésképtelenné válhat!)"
           installed: "Telepítve"
           install_popular: "Népszerű"
+          install_create: "Új létrehozása"
           about_theme: "About"
           license: "Licenc"
+          version: "Verzió:"
+          creator: "Létrehozva:"
           enable: "Engedélyez"
           disable: "Kikapcsol"
           update_to_latest: "Legutóbbi verzióra frissített"
@@ -2698,6 +3073,7 @@ hu:
             description: "valamenyi szövegek,ikonok és szegélyek"
           secondary:
             name: "Másodlagos"
+            description: "A fő háttérszín és néhány gomb szövegszíne."
           tertiary:
             name: "harmadlagos"
           quaternary:
@@ -2709,6 +3085,7 @@ hu:
             description: "Az oldal fejlécében lévő szöveg és ikonok."
           highlight:
             name: "kiemelés"
+            description: "Az oldalon kiemelt elemek, például bejegyzések és témák háttérszíne."
           danger:
             name: "veszély"
           success:
@@ -2718,6 +3095,7 @@ hu:
             description: "A kedvelés gomb színe."
         email_style:
           css: "CSS"
+          reset: "Alapértelmezés visszaállítása"
       email:
         title: "Emailek"
         settings: "Beállítások"
@@ -2747,6 +3125,7 @@ hu:
         html: "html"
         text: "szöveges"
         last_seen_user: "Legutóbb látott felhasználó:"
+        no_result: "Nincsenek összefoglható találatok."
         reply_key: "Válasz kulcs"
         skipped_reason: "Ok kihagyása"
         incoming_emails:
@@ -2756,6 +3135,7 @@ hu:
           subject: "Tárgy"
           error: "Hiba"
           modal:
+            title: "Az e-mail részleteinek hozzáfűzése"
             error: "Hiba"
             headers: "Fejlécek"
             subject: "Téma"
@@ -2780,6 +3160,7 @@ hu:
           silence_user: "Felhasználó elnémítva"
           delete_post: "Bejegyzés törölve"
           delete_topic: "Téma törölve"
+          post_approved: "Bejegyzés jóváhagyva"
       logs:
         title: "Naplók"
         action: "Művelet"
@@ -2860,7 +3241,9 @@ hu:
             custom_staff: "Kiegészítő egyedi eljárása"
             post_locked: "Bejegyzés lezárva"
             post_edit: "Bejegyzés szerkesztése"
+            post_unlocked: "Bejegyzés feloldva"
             check_personal_message: "Személyes üzenetek megnézése"
+            disabled_second_factor: "Kéttényezős hitelesítés kikapcsolása"
             topic_published: "Téma közzétéve"
             post_approved: "bejegyzés jóváhagyva"
             post_rejected: "Bejegyzés elutasítva"
@@ -2869,7 +3252,14 @@ hu:
             delete_badge: "jelvény törlése"
             merge_user: "Felhasználók eggyesíétse"
             topic_timestamps_changed: "téma időbélyege módosítva"
+            web_hook_create: "webhook létrehozása"
+            api_key_create: "api kulcs létrehozása"
+            add_email: "e-mail-cím hozzáadása"
+            update_email: "e-mail frissítése"
+            destroy_email: "e-mail megsemmisítése"
+            post_staff_note_create: "személyzeti megjegyzés hozzáadása"
         screened_emails:
+          title: "Szűrt e-mailek"
           email: "E-mail cím"
           actions:
             allow: "Engedélyez"
@@ -2897,12 +3287,8 @@ hu:
       watched_words:
         search: "keresés"
         clear_filter: "Törlés"
-        show_words: "Szöveg megjelenítése"
         download: Letöltés
         clear_all: Mindent törölni
-        word_count:
-          one: "%{count} szó"
-          other: "%{count} szavak"
         actions:
           block: "Blokkol"
           censor: "Cenzúra"
@@ -2911,11 +3297,11 @@ hu:
         action_descriptions:
           flag: "Engedélyezze az ezeket a szavakat tartalmazó bejegyzéseket, de nem megfelelőnek jelölje őket, így a moderátorok átnézhetik azokat."
         form:
-          label: "Új szó:"
           placeholder_regexp: "reguláris kifejezés"
           add: "Hozzáadás"
           success: "Siker"
           exists: "Már létezik"
+          upload_successful: "A feltöltés sikeres, egy Word-öt hozzáadtunk."
         test:
           button_label: "Teszt"
           no_matches: "Nem található egyezés"
@@ -2928,7 +3314,9 @@ hu:
         last_emailed: "Utolsó levélküldés"
         not_found: "Sajnos ez a felhasználónév nem létezik."
         id_not_found: "Sajnos ez a felhasználó id nem található a rendszerben."
+        active: "Aktíválva"
         show_emails: "E-mailek mutatása"
+        hide_emails: "E-mailek elrejtése"
         nav:
           new: "Új"
           active: "Aktív"
@@ -2955,9 +3343,13 @@ hu:
         check_email:
           title: "A felhasználó email címének megjelenítése"
           text: "Mutat"
+        check_sso:
+          text: "Megjelenítés"
       user:
+        suspend_reason_label: "Miért függeszted fel? Ez a <b>szöveg mindenki számára látható lesz</b> ennek a felhasználónak a profiloldalán, és akkor jelenik meg a felhasználó számára, amikor megpróbál bejelentkezni. Fogalmazz röviden."
         suspend_reason: "oka"
         suspend_message: "Email üzenet"
+        suspend_message_placeholder: "Opcionálisan adjon meg további információkat a felfüggesztésről, amit e-mailben elküldünk a felhasználónak."
         suspended_by: "Felfüggesztette"
         silence_reason: "Indok"
         silenced_by: "Némítva általa"
@@ -2970,6 +3362,7 @@ hu:
         suspended_until: "(eddig %{until})"
         cant_suspend: "Ez a felhasználó nem lett felfüggesztve"
         delete_all_posts: "Összes hozzászólás törlése"
+        delete_posts_progress: "Bejegyzések törlése ..."
         penalty_post_actions: "Mit szeretnél csinálni ezzel az összekapcsolt bejegyzéssel?"
         penalty_post_delete: "Bejegyzés eltávolítása"
         penalty_post_edit: "Bejegyzés szerkesztése"
@@ -2978,10 +3371,12 @@ hu:
           title: "Büntetési előzmények törlése"
           description: "Felhasználók akiknek van eltiltása nem érheti el a bizalmi szint 3-at"
         silence: "Elnémítás"
+        unsilence: "Némítás feloldása"
         silenced: "Elnémítás?"
         moderator: "Moderátor?"
         admin: "Adminisztrátor?"
         suspended: "Felfüggesztett?"
+        staged: "Lépcsőzetes?"
         show_admin_profile: "Adminisztrátor"
         show_public_profile: "Publikus profil megjelenítése"
         impersonate: "Megszemélyesít"
@@ -2989,6 +3384,7 @@ hu:
         log_out: "Kijelentkezés"
         revoke_admin: "Admin jog visszavonása"
         grant_admin: "Admin jog adása"
+        grant_admin_confirm: "E-mailt küldtünk az új adminisztrátor igazolására. Kérjük, nyisd meg és kövesd az utasításokat!"
         revoke_moderation: "Moderáció visszavonása"
         unsuspend: "Felfüggesztés feloldása"
         suspend: "Felfüggesztett"
@@ -2999,26 +3395,37 @@ hu:
         private_topics_count: Privát témák
         posts_read_count: Elolvasott bejegyzések
         post_count: Létrehozott bejegyzések
+        second_factor_enabled: Kéttényezős hitelesítés aktiválva
         topics_entered: Megtekintett témák
         approve: "Jóváhagy"
         approved_by: "jóváhagyta:"
         approve_success: "A felhasználó jóváhagyásra került és e-mailt küldtünk az aktiválási útmutatóval."
         time_read: "Olvasási idő"
         anonymize: "Felhasználó névtelenítése"
+        anonymize_confirm: "BIZTOSan anonimizálni szeretnéd ezt a fiókot? Ez megváltoztatja a felhasználónevet és az e-mail címet, és visszaállítja az összes profiladatot."
         delete: "Felhasználó törlése"
         merge:
           prompt:
             cancel: "Mégse"
           confirmation:
             cancel: "Mégse"
+        delete_posts_forbidden_because_staff: "Nem törölhető az összes adminisztrátor és moderátor bejegyzése."
+        delete_and_block: "Az e-mail és az IP-cím törlése és <b>blokkolása</b>"
         delete_dont_block: "Csak törlés"
         deleting_user: "Felhasználó törlése..."
         deleted: "A felhasználó el lett távolítva"
         send_activation_email: "Aktivációs email küldése"
         activation_email_sent: "Egy aktivációs email elküldve"
         activate: "Fiók aktiválása"
+        deactivate_account: "Fiók deaktiválása"
+        unsilence_failed: "Probléma merült fel a felhasználó némításának feloldásakor."
         reset_bounce_score:
           label: "Alaphelyzet"
+        visit_profile: "A profil szerkesztéséhez látogass el a <a href='%{url}'>felhasználó preferenciáinak</a> oldalára"
+        deactivate_explanation: "A deaktivált felhasználónak újra érvényesítenie kell az e-mailj címét."
+        bounce_score_explanation:
+          none: "Erről az e-mailről nem érkezett visszapattanás a közelmúltban."
+          some: "Néhány visszapattanás érkezett a közelmúltban erről az e-mailről."
         suspend_modal_title: "Felhasználó felfüggesztése"
         tl3_requirements:
           value_heading: "Érték"
@@ -3026,16 +3433,16 @@ hu:
           days: "nap"
           topics_viewed: "Megtekintett témák"
           posts_read: "Elolvasott bejegyzések"
+          posts_read_all_time: "Elolvasott bejegyzések (összesen)"
           flagged_posts: "Megjelölt bejegyzés"
           flagged_by_users: "Felhasználók, akik megjelölték"
           likes_given: "Adott tetszésnyilvánítások"
           likes_received: "Kapott kedvelések"
-        sso:
-          title: "Single Sign On"
+        discourse_connect:
           external_id: "Külső ID"
           external_username: "Felhasználónév"
           external_name: "Név"
-          external_email: "Email"
+          external_email: "E-mail"
           external_avatar_url: "Profilkép URL-je"
       user_fields:
         title: "Felhasználói mezők"
@@ -3055,6 +3462,10 @@ hu:
         editable:
           enabled: "szerkeszthető"
           disabled: "nem szerkeszthető"
+        show_on_profile:
+          title: "Megjelenjen a nyilvános profilon?"
+          enabled: "látható a profilon"
+          disabled: "nem látható a profilon"
         field_types:
           text: "Szöveges mező"
           confirm: "Megerősítés"
@@ -3074,6 +3485,7 @@ hu:
       site_settings:
         title: "Beállítások"
         no_results: "Nincs találat."
+        more_than_30_results: "A keresés több, mint 30 találatot adott. Kérlek, pontosítsd a keresést vagy válassz egy kategóriát!"
         clear_filter: "Törlés"
         add_url: "URL hozzáadása"
         uploaded_image_list:
@@ -3183,6 +3595,7 @@ hu:
         embed_by_username: "Felhasználónév téma létrehozáshoz"
         embed_post_limit: "A bejegyzések maximális száma a beágyazásban"
         embed_truncate: "Beágyazott bejegyzések rövidítése"
+        allowed_embed_classnames: "Engedélyezett CSS-osztálynevek"
         save: "Beágyazás beállításainak mentése"
       permalink:
         title: "Közvetlen link"
@@ -3193,6 +3606,7 @@ hu:
         post_title: "Hozzászólás"
         category_id: "Kategória azonosító"
         category_title: "Kategória"
+        copy_to_clipboard: "Másold az állandó linket a vágólapra"
         delete_confirm: Biztosan törölni szeretnéd ezt a közvetlen linket?
         form:
           label: "Új :"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 70f6d83e09..1cb2ad4a7b 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -154,6 +154,8 @@ hy:
     topic_admin_menu: "թեմայի ադմինի գործողություններ"
     wizard_required: "Բարի գալուստ Ձեր նոր Discourse! Սկսենք <a href='%{url}' data-auto-route='true'>տեղակայման մասնագետ</a>-ի հետ ✨"
     emails_are_disabled: "Բոլոր ելքային էլ. նամակները անջատվել են ադմինիստրատորի կողմից: Էլ. փոստով ոչ մի տեսակի ծանուցում չի ուղարկվի:"
+    software_update_prompt:
+      dismiss: "Չեղարկել"
     bootstrap_mode_disabled: "Սկզբնաբեռնման(Bootstrap) ռեժիմը կանջատվի 24 ժամվա ընթացքում:"
     themes:
       default_description: "Լռելյայն"
@@ -214,6 +216,9 @@ hy:
     now: "հենց նոր"
     read_more: "կարդալ ավելին"
     more: "Ավելին"
+    x_more:
+      one: "ևս %{count}"
+      other: "ևս %{count}"
     less: "Կրճատ"
     never: "երբեք"
     every_30_minutes: "30 րոպեն մեկ"
@@ -242,8 +247,6 @@ hy:
       moderators: "Մոդերատորներ"
       stat:
         all_time: "Ամբողջ Ժամանակ"
-        last_7_days: "Վերջին 7 օրում"
-        last_30_days: "Վերջին 30 օրում"
       like_count: "Հավանումներ"
       topic_count: "Թեմաներ"
       post_count: "Գրառում"
@@ -268,18 +271,11 @@ hy:
       no_timezone: 'Դուք դեռ չեք նշել ձեր ժամային գոտին: Դուք չեք կարողանա հիշեցումներ անել: Տեղադրեք <a href="%{basePath}/my/preferences/profile"> ձեր պրոֆիլում:'
       invalid_custom_datetime: "Ամսաթիվը և ժամանակը ճիշտ չէ նշված, կրկին փորձեք:"
       list_permission_denied: "Դուք իրավունք չունեք դիտելու այս օգտատիրոջ էջանշանները: "
+      no_user_bookmarks: "Դուք էջանշած գրառումներ չունեք; էջանշումները թույլ են տալիս Ձեզ արագորեն տեղափոխվել դեպի որոշակի գրառում:"
+      auto_delete_preference:
+        never: "Երբեք"
       search: "Որոնում"
       reminders:
-        later_today: "Այսօր, մի փոքր ուշ"
-        next_business_day: "Հաջորդ աշխատանքային օրը: "
-        tomorrow: "Վաղը"
-        next_week: "Հաջորդ շաբաթ"
-        later_this_week: "Այս շաբաթ, մի փոքր ավելի ուշ"
-        start_of_next_business_week_alt: "Հաջորդ Երկուշաբթի: "
-        next_month: "Հաջորդ ամիս"
-        custom: "Սահմանել հիշեցումների ամսաթիվն ու ժամանակը:"
-        last_custom: "Օգտագործել ամսաթվի և ժամանակի վերջին գրառումը  "
-        none: "Հիշեցում չսահմանել "
         today_with_time: "այսօր %{time}"
         tomorrow_with_time: "Վաղը %{time}"
         at_time: " %{date_time} -ում"
@@ -290,9 +286,7 @@ hy:
       new_private_message: "Նոր անձնական հաղորդագրության սևագիր"
       topic_reply: "Պատասխանի սևագիր"
       abandon:
-        confirm: "Դուք արդեն բացել եք մեկ այլ սևագիր այս թեմայում: Դուք համոզվա՞ծ եք, որ ցանկանում եք հրաժարվել դրանից:"
-        yes_value: "Այո, հրաժարվել"
-        no_value: "Ոչ, պահել"
+        yes_value: "Չեղարկել"
     topic_count_latest:
       one: "Տեսնել %{count} նոր կամ թարմացված թեման"
       other: "Դիտել %{count} նոր կամ թարմացված թեմաները"
@@ -385,6 +379,7 @@ hy:
       topic: "Թեմա՝"
       filtered_topic: "Դուք ֆիլտրել եք դիտման համար՝ միայն մեկ թեմայի բովանդակությունը "
       filtered_user: "Օգտատեր"
+      filtered_reviewed_by: "Վերանայվել է"
       show_all_topics: "ցուցադրել բոլոր թեմաները"
       deleted_post: "(գրառումը ջնջված է)"
       deleted_user: "(օգտատերը ջնջված է)"
@@ -395,6 +390,7 @@ hy:
         email: "Էլ. հասցե"
         name: "Անուն"
         fields: "Դաշտեր"
+        reject_reason: "Պատճառ"
       topics:
         topic: "Թեմա"
         reviewable_count: "Քանակ"
@@ -402,6 +398,12 @@ hy:
         deleted: "[Թեման Ջնջված է]"
         original: "(օրիգինալ թեմա)"
         details: "մանրամասները"
+        unique_users:
+          one: "%{count} օգտատեր"
+          other: "%{count} օգտատեր"
+      replies:
+        one: "%{count} պատասխան"
+        other: "%{count} պատասխան"
       edit: "Խմբագրել"
       save: "Պահպանել"
       cancel: "Չեղարկել"
@@ -421,7 +423,8 @@ hy:
           created_at_asc: "Ստեղծվել է At (հետադարձ տեսակավորում)"
         priority:
           title: "Մինիմալ Գերակայություն"
-          low: "(ցանկացած)"
+          any: "(ցանկացած)"
+          low: "Բարձր"
           medium: "Միջին"
           high: "Կարևոր"
       conversation:
@@ -459,10 +462,26 @@ hy:
           title: "Հաղորդագրությունը Հերթագրված է "
         reviewable_user:
           title: "Օգտատեր"
+        reviewable_post:
+          title: "Գրառում"
       approval:
         title: "Գրառումը Հաստատման Կարիք Ունի"
         description: "Մենք ստացել ենք Ձեր նոր գրառումը, սակայն այն պետք է հաստատվի մոդերատորի կողմից մինչև ցուցադրվելը: Խնդրում ենք սպասել:"
         ok: "ՕԿ"
+      example_username: "օգտանուն"
+    relative_time_picker:
+      days:
+        one: "օր"
+        other: "օր"
+    time_shortcut:
+      later_today: "Այսօր, մի փոքր ուշ"
+      next_business_day: "Հաջորդ աշխատանքային օրը: "
+      tomorrow: "Վաղը"
+      next_week: "Հաջորդ շաբաթ"
+      later_this_week: "Այս շաբաթ, մի փոքր ավելի ուշ"
+      start_of_next_business_week_alt: "Հաջորդ Երկուշաբթի: "
+      next_month: "Հաջորդ ամիս"
+      custom: "Սահմանել հիշեցումների ամսաթիվն ու ժամանակը:"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a>-ը հրապարակել է <a href='%{topicUrl}'>այս թեման</a>"
       you_posted_topic: "<a href='%{userUrl}'>Դուք</a> հրապարակել եք <a href='%{topicUrl}'>այս թեման</a>"
@@ -478,6 +497,7 @@ hy:
       sent_by_user: "Ուղարկվել է<a href='%{userUrl}'>%{user}</a>-ի կողմից"
       sent_by_you: "Ուղարկվել է <a href='%{userUrl}'>Ձեր</a>կողմից"
     directory:
+      username: "Օգտանուն"
       filter_name: "ֆիլտրել ըստ օգտանվան"
       title: "Օգտատերեր"
       likes_given: "Տրված"
@@ -534,9 +554,17 @@ hy:
           credentials:
             username: "Օգտանուն"
             password: "Գաղտնաբառ"
+          settings:
+            title: "Կարգավորումներ"
+          mailboxes:
+            disabled: "անջատված"
         membership:
           title: Անդամակցություն
           access: Թույլտվություն
+        categories:
+          title: Կատեգորիաներ
+        tags:
+          title: Թեգեր
         logs:
           title: "Գրառումներ"
           when: "Երբ"
@@ -547,6 +575,8 @@ hy:
           details: "Մանրամասներ"
           from: "Ումից"
           to: "Ում"
+      permissions:
+        title: "Թույլտվություններ"
       public_admission: "Թույլ տալ օգտատերերին ազատ կերպով միանալ խմբին (Խումբը պետք է լինի հրապարակային)"
       public_exit: "Թույլ տալ օգտատերերին ազատ կերպով լքել խումբը"
       empty:
@@ -677,18 +707,21 @@ hy:
       posts: "Գրառումներ"
       topics: "Թեմաներ"
       latest: "Վերջինները"
-      latest_by: "վերջինները ըստ"
       toggle_ordering: "փոխանջատել դասավորման կառավորումը"
       subcategories: "Ենթակատեգորիաներ"
       topic_sentence:
         one: "%{count} թեմա"
         other: "%{count} թեմա"
+      topic_stat_unit:
+        week: "շաբաթ"
+        month: "ամիս"
       topic_stat_sentence_week:
         one: "%{count} նոր թեմա անցյալ շաբաթվա ընթացքում"
         other: "%{count} նոր թեմա անցյալ շաբաթվա ընթացքում:"
       topic_stat_sentence_month:
         one: "%{count} նոր թեմա անցյալ ամսվա ընթացքում"
         other: "%{count} նոր թեմա անցյալ ամսվա ընթացքում:"
+      n_more: "Կատեգորիաներ (ևս %{count})..."
     ip_lookup:
       title: IP Հասցեի Որոնում
       hostname: Հոսթի անունը
@@ -739,7 +772,11 @@ hy:
         mute_option_title: "Դուք այս օգտատիրոջից որևէ ծանուցում չեք ստանա:"
         normal_option: "Նորմալ"
         normal_option_title: "Դուք ծանուցում կստանաք, եթե այդ օգտատերը պատասխանի ձեր հրապարակմանը, մեջբերում անի կամ հիշատակի ձեր անունը:"
+      notification_schedule:
+        none: "Ոչ մի"
+        to: "ում"
       activity_stream: "Ակտիվություն"
+      read: "Կարդացած"
       preferences: "Նախընտրություններ"
       feature_topic_on_profile:
         open_search: "Ընտրեք Նոր Թեմա"
@@ -768,7 +805,6 @@ hy:
         perm_denied_expl: "Դուք մերժել եք ծանուցումների թույլտվությունը: Թույլատրեք ծանուցումները Ձեր բրաուզերի կարգավորումներից:"
         disable: "Անջատել Ծանուցումները"
         enable: "Միացնել Ծանուցումները"
-        each_browser_note: "Ծանոթություն: Դուք պետք է փոխեք այս կարգավորումը Ձեր օգտագործած յուրաքանչյուր բրաուզերի համար:"
         consent_prompt: "Դուք ցանկանո՞ւմ եք ստանալ այժմեական ծանուցումներ, երբ մարդիկ պատասխանեն Ձեր գրառումներին:"
       dismiss: "Չեղարկել"
       dismiss_notifications: "Չեղարկել Բոլորը"
@@ -776,6 +812,9 @@ hy:
       first_notification: "Ձեր առաջին ծանուցումն է! Ընտրեք այն՝ սկսելու համար:"
       dynamic_favicon: "Ցուցադրել քանակը բրաուզերի պատկերակի վրա"
       theme_default_on_all_devices: "Դարձնել սա լռելյայն թեմա իմ բոլոր սարքավորումների համար"
+      color_schemes:
+        undo: "Զրոյացնել"
+        regular: "Սովորական"
       text_size_default_on_all_devices: "Դարձնել սա լռելյայն տեքստի չափ իմ բոլոր սարքավորում համար"
       allow_private_messages: "Թույլ տալ այլ օգտատերերին ուղարկել ինձ անձնական հաղորդագրություններ"
       external_links_in_new_tab: "Բացել բոլոր արտաքին հղումները նոր ներդիրում(tab)"
@@ -791,6 +830,7 @@ hy:
       suspended_notice: "Այս օգտատերը սառեցված է մինչև %{date}:"
       suspended_permanently: "Այս օգտատերը սառեցված է"
       suspended_reason: "Պատճառը՝ "
+      github_profile: "GitHub"
       email_activity_summary: "Ակտիվության Ամփոփում"
       mailing_list_mode:
         label: "Փոստային ցուցակի ռեժիմ"
@@ -821,6 +861,7 @@ hy:
       muted_categories: "Խլացված"
       muted_categories_instructions: "Դուք չեք ստանա որևէ ծանուցում այս կատեգորիաների նոր թեմաների մասին, և դրանք չեն հայտնվի կատեգորիաներում կամ վերջին էջերում:"
       muted_categories_instructions_dont_hide: "Դուք որևէ ծանուցում չեք ստանա այս կատեգորիայի նոր թեմաների վերաբերյալ:"
+      regular_categories: "Սովորական"
       no_category_access: "Որպես մոդերատոր՝ Դուք ունեք կատեգորիաների սահմանափակ թույլտվություն, պահպանելն անջատված է:"
       delete_account: "Ջնջել Իմ Հաշիվը"
       delete_account_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք մշտապես ջնջել Ձեր հաշիվը: Այս գործողությունը չի կարող ետարկվել!"
@@ -862,6 +903,7 @@ hy:
         tags: "Թեգեր"
       preferences_nav:
         account: "Հաշիվ"
+        security: "Անվտանգություն"
         profile: "Պրոֆիլ"
         emails: "Էլ. հասցեներ"
         notifications: "Ծանուցումներ"
@@ -966,7 +1008,6 @@ hy:
         secondary: "Երկրորդական Էլ. հասցեներ"
         primary_label: "հիմնական"
         update_email: "Փոփոխել Էլ. Հասցեն"
-        sso_override_instructions: "Էլ. հասցեն կարող է թարմացվել SSO մատակարարից:"
         no_secondary: "Երկրորդական էլ. հասցեներ չկան"
         instructions: "Երբեք չի ցուցադրվում հանրությանը"
         ok: "Հաստատման համար մենք Ձեզ կուղարկենք էլ. նամակ"
@@ -1095,46 +1136,41 @@ hy:
         after_10_minutes: "10 րոպե հետո"
       notification_level_when_replying: "Երբ ես գրառում եմ կատարում թեմայում, նշանակել այդ թեման որպես"
       invited:
-        search: "փնտրել հրավերներ..."
         title: "Հրավերներ"
+        pending_tab: "Սպասող"
+        pending_tab_with_count: "Սպասող (%{count})"
+        redeemed_tab: "Ընդունված"
+        redeemed_tab_with_count: "Ընդունված (%{count})"
+        invited_via: "Հրավեր"
+        groups: "Խմբեր"
+        topic: "Թեմա"
+        edit: "Խմբագրել"
+        remove: "Ջնջել"
+        reinvited: "Հրավերը կրկին է ուղարկված"
+        search: "փնտրել հրավերներ..."
         user: "Հրավիրված Օգտատեր"
-        sent: "Վերջին Ուղարկվածը"
         none: "Հրավերներ չկան:"
         truncated:
           one: "Առաջին հրավերի ցուցադրում"
           other: "Ցույց են տրված առաջին %{count} հրավերները:"
         redeemed: "Ընդունված Հրավերները"
-        redeemed_tab: "Ընդունված"
-        redeemed_tab_with_count: "Ընդունված (%{count})"
         redeemed_at: "Ընդունվել է"
         pending: "Սպասող Հրավերներ"
-        pending_tab: "Սպասող"
-        pending_tab_with_count: "Սպասող (%{count})"
         topics_entered: "Դիտված Թեմաները"
         posts_read_count: "Կարդացած Գրառում"
         expired: "Այս հրավերի ժամկետն անցել է:"
-        rescind: "Հեռացնել"
-        rescinded: "Հրավերը հեռացված է"
-        rescinded_all: "Բոլոր Ժամկետանց Հրավերները հեռացված են!"
-        rescind_all_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք հեռացնել բոլոր ժամկետանց հրավերները:"
-        reinvite: "Հրավերը կրկին ուղարկել"
-        reinvite_all: "Կրկին ուղարկել բոլոր հրավերները "
+        removed_all: "Բոլոր Ժամկետանց Հրավերները հեռացված են!"
+        remove_all_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք հեռացնել բոլոր ժամկետանց հրավերները:"
         reinvite_all_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք կրկին ուղարկել բոլոր հրավերները:"
-        reinvited: "Հրավերը կրկին է ուղարկված"
-        reinvited_all: "Բոլոր հրավերները կրկին ուղարկված են!"
         time_read: "Կարդացած Ժամանակը"
         days_visited: "Այցելության Օր"
         account_age_days: "Հաշվի տարիքը օրերով"
-        links_tab: "Հղումներ"
-        link_created_at: "Ստեղծված"
-        link_groups: Խմբեր
+        create: "Հրավիրել"
         valid_for: "Հրավերի հղումը վավեր է միայն հետևյալ էլ. հասցեի համար՝ %{email}"
         invite_link:
           success: "Հրավերի հղումը հաջողությամբ գեներացված է!"
         bulk_invite:
-          success: "Ֆայլը հաջողությամբ վերբեռնվել է, Դուք կստանաք ծանուցում հաղորդագրության միջոցով, երբ գործընթացն ավարտվի:"
           error: "Ներողություն, ֆայլը պետք է լինի CSV ձևաչափով:"
-          confirmation_message: "Դուք պատրաստվում եք էլ. նամակով հրավերներ ուղարկել վերբեռնված ֆայլում բոլոր նշվածներին:"
       password:
         title: "Գաղտնաբառ"
         too_short: "Ձեր գաղտնաբառը շատ կարճ է:"
@@ -1234,7 +1270,6 @@ hy:
       close: "փակել"
       dismiss_error: "Չեղարկել սխալը"
     close: "Փակել"
-    assets_changed_confirm: "Այս կայքը հենց նոր թարմացվել է: Թարմացնե՞լ էջը հիմա՝ ամենավերջին տարբերակն ստանալու համար:"
     logout: "Դուք դուրս եք գրվել:"
     refresh: "Թարմացնել"
     home: "Գլխավոր էջ"
@@ -1243,15 +1278,6 @@ hy:
       login_disabled: "Մուտք գործելն անջատված է, քանի դեռ կայքը գտնվում է «միայն կարդալու համար» ռեժիմում:"
       logout_disabled: "Դուրս գրվելը անջատված է, երբ կայքը գտնվում է միայն կարդալու համար ռեժիմում:"
     learn_more: "իմանալ ավելին..."
-    all_time: "ընդհանուրը"
-    all_time_desc: "ստեղծված բոլոր թեմաները"
-    year: "տարի"
-    year_desc: "վերջին 365 օրվա ընթացքում ստեղծված թեմաները"
-    month: "ամիս"
-    month_desc: "վերջին 30 օրվա ընթացքում ստեղծված թեմաները"
-    week: "շաբաթ"
-    week_desc: "վերջին 7 օրվա ընթացքում ստեղծված թեմաները"
-    day: "օր"
     first_post: Առաջին գրառումը
     mute: Խլացնել
     unmute: Միացնել
@@ -1269,13 +1295,10 @@ hy:
       sign_up: "Գրանցվել"
       hide_session: "Հիշեցնել ինձ վաղը"
       hide_forever: "ոչ, շնորհակալություն"
-      hidden_for_session: "Լավ, ես կհարցնեմ վաղը: Դուք միշտ կարող եք օգտագործել նաև 'Մուտք'-ը հաշիվ ստեղծելու համար:"
       intro: "Ողջույն! Կարծես թե Դուք վայելում եք քննարկումը, սակայն դեռևս հաշիվ չեք գրանցել:"
       value_prop: "Երբ Դուք ստեղծում եք հաշիվ, մենք հստակ հիշում ենք, թե Դուք ինչ եք կադացել, այսպիսով՝ Դուք միշտ վերադառնում եք ճիշտ այնտեղ, որտեղ կանգնել էիք: Դուք նաև ստանում եք ծանուցումներ այստեղ և էլ. փոստով, երբ որևէ մեկը պատասխանում է Ձեզ: Եվ Դուք կարող եք հավանել գրառումներ՝ կիսվելով սիրով: :heartpulse:"
     summary:
       enabled_description: "Դուք դիտում եք այս թեմայի ամփոփումը՝ համայնքի կողմից որոշված ամենահետաքրքիր գրառումները:"
-      description: "Կա <b>%{replyCount}</b> պատասխան:"
-      description_time: "Կա <b>%{replyCount}</b> պատասխան՝ մոտավորապես <b>%{readingTime} րոպե</b> կարդալու ժամանակով:"
       enable: "Ամփոփել Այս Թեման"
       disable: "Ցուցադրել Բոլոր Գրառումները"
     deleted_filter:
@@ -1285,6 +1308,9 @@ hy:
       disable: "Ցուցադրել Հեռացված Գրառումները"
     private_message_info:
       title: "Հաղորդագրություն"
+      invite: "Հրավիրել այլ Մարդկանց..."
+      edit: "Ավելացնել կամ Հեռացնել..."
+      add: "Ավելացնել"
       leave_message: "Դուք իսկապե՞ս ցանկանում եք թողնել այս հաղորդագրությունը:"
       remove_allowed_user: "Դուք իսկապե՞ս ցանկանում եք հեռացնել %{name}-ը այս հաղորդագրությունից:"
       remove_allowed_group: "Դուք իսկապե՞ս ցանկանում եք հեռացնել %{name}-ը այս հաղորդագրությունից:"
@@ -1296,8 +1322,8 @@ hy:
     trust_level: "Վստահության Մակարդակ"
     search_hint: "օգտանուն, էլ. հասցե կամ IP հասցե"
     create_account:
+      header_title: "Բարի գալուստ!"
       disclaimer: "Գրանցվելով դուք ընդունում եք <a href='%{privacy_link}' target='blank'> գաղտնիության քաղաքականությունը </a> և <a href='%{tos_link}' target='blank'> պայմանները </a>:"
-      title: "Ստեղծել Նոր Հաշիվ"
       failed: "Ինչ-որ սխալ է տեղի ունեցել, հնարավոր է՝ այս էլ. հասցեն արդեն գրանցված է, փորձեք կատարել գաղտնաբառի վերականգնում:"
     forgot_password:
       title: "Գաղտնաբառի Վերականգնում"
@@ -1327,7 +1353,6 @@ hy:
       logging_in_as: Մուտք գործել որպես %{email}
       confirm_button: Ավարտել Մուտքը
     login:
-      title: "Մուտք"
       username: "Օգտատեր"
       password: "Գաղտնաբառ"
       second_factor_description: "Խնդրում ենք Ձեր հավելվածից մուտքագրել վավերացման կոդը՝"
@@ -1339,7 +1364,6 @@ hy:
       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: "Կարծես թե Ձեր բրաուզերի քուքիները անջատված են: Դուք չեք կարող մուտք գործել առանց դրանք միացնելու:"
@@ -1396,6 +1420,7 @@ hy:
       accept_invite: "Ընդունել Հրավերը"
       success: "Ձեր հաշիվը ստեղծված է, և այժմ Դուք մուտք եք գործել:"
       name_label: "Անուն"
+      password_label: "Գաղտնաբառ"
       optional_description: "(ընտրովի)"
     password_reset:
       continue: "Շարունակել դեպի %{site_name}"
@@ -1403,7 +1428,6 @@ hy:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (նախկինում EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1436,8 +1460,6 @@ hy:
     date_time_picker:
       from: Ում կողմից
       to: Ում
-      errors:
-        to_before_from: "Հաջորդ ամսաթիվը պետք է լինի ավելի մեծ, քան նախորդը:"
     emoji_picker:
       filter_placeholder: Փնտրել էմոջի
       smileys_&_emotion: Սմայլիկներ և Էմոցինաեր
@@ -1459,7 +1481,6 @@ hy:
       default: Մասնավոր էմոջիներ
     shared_drafts:
       title: "Կիսված Սևագրեր"
-      notice: "Այս թեման տեսանելի է միայն նրանց, ովքեր կարող են տեսնել <b>%{category}</b> կատեգորիան:"
       destination_category: "Նպատակային Կատեգորիա"
       publish: "Հրատարակել կիսված սևագիրը"
       confirm_publish: "Դուք համոզվա՞ծ եք, որ ցանկանում եք հրատարակել այս սևագիրը:"
@@ -1470,7 +1491,6 @@ hy:
       options: "Տարբերակներ"
       whisper: "շշուկ"
       unlist: "չցուցակագրված"
-      blockquote_text: "Մեջբերել բաժինը"
       add_warning: "Սա պաշտոնական զգուշացում է:"
       toggle_whisper: "Փոխանջատել Շշնջումը"
       toggle_unlisted: "Փոխանջատել Չցուցակագրվածները"
@@ -1489,10 +1509,7 @@ hy:
       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: "Դուք պետք է ընտրեք կատեգորիա:"
         topic_template_not_modified: "Դետալները գրանցել թեմայի մեջ և խմբագրել ձևանմուշը: "
@@ -1522,8 +1539,6 @@ hy:
       saved: "Պահված է!"
       saved_draft: "Գրառման սևագիրն ընթացքի մեջ է: Սեղմեք՝ վերսկսելու համար:"
       uploading: "Վերբեռնվում է..."
-      show_preview: "ցուցադրել նախադիտումը &raquo;"
-      hide_preview: "&laquo; թաքցնել նախադիտումը"
       quote_post_title: "Մեջբերել ամբողջ գրառումը"
       bold_label: "B"
       bold_title: "Թավ"
@@ -1536,8 +1551,8 @@ hy:
       link_dialog_title: "Տեղադրել Հիպերհղումը"
       link_optional_text: "ընտրովի վերնագիր"
       link_url_placeholder: "Տեղադրեք URL կամ տեքստը մուտքագրեք՝ թեմաները որոնելու համար"
-      quote_title: "Մեջբերել"
-      quote_text: "Մեջբերել բաժինը"
+      blockquote_title: "Մեջբերել բաժինը"
+      blockquote_text: "Մեջբերել բաժինը"
       code_title: "Ձևաչափված տեքստ"
       code_text: "Անջատել ձևաչափված տեքստը 4 բացատով"
       paste_code_text: "գրեք կամ տեղադրեք կոդն այստեղ"
@@ -1583,10 +1598,10 @@ hy:
           label: "Նոր Թեմա"
         shared_draft:
           label: "Ստեղծել Կիսված Սևագիր"
-          desc: "Սևագրեք թեմա, որը տեսանելի կլինի միայն անձնակազմին"
         toggle_topic_bump:
           label: "Փոխանջատել թեմայի բարձրացումը "
           desc: "Պատասխանել՝ առանց պատասխանի վերջին ամսաթիվը փոխելու"
+      ignore: "Անտեսել"
     notifications:
       tooltip:
         regular:
@@ -1608,6 +1623,10 @@ hy:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} and %{count} other</span> %{description}"
+        other: "<span class='multi-user'>%{username}, %{username2} և ևս %{count}-ը</span> %{description}"
       liked_consolidated_description:
         one: "հավանել է Ձեր %{count} գրառում"
         other: "հավանել է Ձեր %{count} գրառումը"
@@ -1622,6 +1641,8 @@ hy:
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Նոր Թեմա</span> %{description}"
       membership_request_accepted: "Անդամակցության հարցումը ընդունվել է՝ '%{group_name}'"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       group_message_summary:
         one: "%{count} հաղորդագրություն Ձեր %{group_name} մուտքային արկղում"
         other: "%{count} հաղորդագրություն Ձեր %{group_name}-ի մուտքային արկղում"
@@ -1666,10 +1687,7 @@ hy:
       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: "Դուք կարող եք նաև քաշել և գցել կամ տեղադրել նկարները խմբագրիչի մեջ"
       uploading: "Վերբեռնվում է"
       select_file: "Ընտրել Ֆայլ"
@@ -1699,6 +1717,7 @@ hy:
       or_search_google: "Կամ փորձեք որոնել Google-ում:"
       search_google: "Փորձեք որոնել Google-ում:"
       search_google_button: "Google"
+      search_button: "Որոնում"
       context:
         user: "Որոնել @%{username}-ի գրառումները"
         category: "Որոնել #%{category} կատեգորիայում"
@@ -1743,16 +1762,19 @@ hy:
           noreplies: պատասխաններ չունեն
           single_user: պարունակում են մեկ օգտատեր
         post:
+          count:
+            label: Գրառում
           time:
             label: Հրապարակվել է
             before: մինչև
             after: հետո
+        views:
+          label: Դիտումների
     hamburger_menu: "գնալ այլ թեմաների ցանկ կամ կատեգորիա"
     new_item: "նոր"
     go_back: "ետ գնալ"
     not_logged_in_user: "օգտատիրոջ էջը՝ ընթացիկ ակտիվության և նախընտրությունների ամփոփումով"
     current_user: "գնալ իմ էջը"
-    view_all: "դիտել բոլոը"
     topics:
       new_messages_marker: "վերջին այցելությունը"
       bulk:
@@ -1773,6 +1795,7 @@ hy:
         change_category: "Ավելացնել Կատեգորիա"
         close_topics: "Փակել Թեմաները"
         archive_topics: "Արխիվացնել Թեմաները"
+        move_messages_to_inbox: "Տեղափոխել Մուտքերի արկղ"
         notification_level: "Ծանուցումներ"
         choose_new_category: "Ընտրել նոր կատեգորիա թեմաների համար՝"
         selected:
@@ -1791,8 +1814,6 @@ hy:
         bookmarks: "Դուք դեռևս չունեք էջանշված թեմաներ:"
         category: " %{category}-ում թեմաներ չկան:"
         top: "Թոփ թեմաներ չկան:"
-        educate:
-          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: "Վերջին թեմաներ այլևս չկան:"
         posted: "Հրապարակված թեմաներ այլևս չկան:"
@@ -1800,6 +1821,7 @@ hy:
         new: "Նոր թեմաներ այլևս չկան:"
         unread: "Չկարդացած թեմաներ այլևս չկան:"
         category: "%{category}-ում թեմաներ այլևս չկան:"
+        tag: "%{tag}-ում թեմաներ այլևս չկան:"
         top: "Թոփ թեմաներ այլևս չկան:"
         bookmarks: "Էջանշված թեմաներ այլևս չկան:"
     topic:
@@ -1868,13 +1890,15 @@ hy:
       read_more_in_category: "Ցանկանո՞ւմ եք կարդալ ավելին: Դիտեք այլ թեմաներ՝ %{catLink}-ում կամ %{latestLink}."
       read_more: "Ցանկանո՞ւմ եք կարդալ ավելին: %{catLink} կամ %{latestLink}."
       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: դիտեք վերջին թեմաները
       jump_reply_up: ցատկել դեպի ավելի վաղ պատասխան
       jump_reply_down: ցատկել դեպի ավելի հին պատասխան
       deleted: "Թեման ջնջվել է"
+      slow_mode_update:
+        save: "Միացնել"
+        remove: "Անջատել"
       topic_status_update:
         title: "Թեմայի Ժամաչափիչ"
         save: "Ժամաչափիչ Դնել"
@@ -1883,7 +1907,7 @@ hy:
         remove: "Հեռացնել Ժամաչափիչը"
         publish_to: "Հրատարակել."
         when: "Երբ."
-        time_frame_required: Խնդրում ենք ընտրել ժամանակահատված
+        time_frame_required: "Խնդրում ենք ընտրել ժամանակահատված"
       auto_update_input:
         none: "Ընտրել ժամանակահատված"
         later_today: "Այսօր, մի փոքր ուշ"
@@ -1891,13 +1915,7 @@ hy:
         later_this_week: "Այս շաբաթ, մի փոքր ավելի ուշ"
         this_weekend: "Այս շաբաթ-կիրակի"
         next_week: "Հաջորդ շաբաթ"
-        two_weeks: "Երկու Շաբաթ"
         next_month: "Հաջորդ ամիս"
-        two_months: "Երկու Ամիս"
-        three_months: "Երեք Ամիս"
-        four_months: "Չորս Ամիս"
-        six_months: "Վեց Ամիս"
-        one_year: "Մեկ Տարի"
         forever: "Ընդմիշտ"
         pick_date_and_time: "Ընտրել ամսաթիվ և ժամ"
         set_based_on_last_post: "Փակել՝ կախված վերջին գրառումից"
@@ -1911,7 +1929,6 @@ hy:
         title: "Ժամանակավորապես Փակել"
       auto_close:
         title: "Ավտոմատ փակել Թեման"
-        label: "Ավտոմատ փակել թեմայի ժամերը՝ "
         error: "Խնդրում ենք մուտքագրել վավեր արժեք:"
         based_on_last_post: "Չփակել, մինչև թեմայի վերջին գրառումը չունենա այսքան վաղեմություն:"
       auto_delete:
@@ -1926,7 +1943,7 @@ hy:
         auto_open: "Այս թեման ավտոմատ կբացվի %{timeLeft}:"
         auto_close: "Այս թեման ավտոմատ կփակվի %{timeLeft}:"
         auto_publish_to_category: "Այս թեման կհրատարակվի <a href=%{categoryUrl}>#%{categoryName}</a>-ում %{timeLeft}:"
-        auto_close_based_on_last_post: "Այս թեման կփակվի վերջին պատասխանից %{duration} հետո:"
+        auto_close_after_last_post: "Այս թեման կփակվի վերջին պատասխանից %{duration} հետո:"
         auto_delete: "Այս թեման ավտոմատ կերպով կջնջվի %{timeLeft}:"
         auto_bump: "Այս թեման ավտոմատ կբարձրացվի %{timeLeft}:"
         auto_reminder: "Ձեզ կհիշեցվի այս թեմայի մասին %{timeLeft}:"
@@ -1946,7 +1963,6 @@ hy:
         go: "գնալ"
         jump_bottom: "ցատկել դեպի վերջին գրառում"
         jump_prompt: "ցատկել դեպի..."
-        jump_prompt_of: "%{count} գրառումից"
         jump_prompt_long: "Ցատկել դեպի.."
         jump_bottom_with_number: "ցատկել դեպի %{post_number}գրառումը"
         jump_prompt_to_date: "դեպի ամսաթիվ"
@@ -2030,6 +2046,7 @@ hy:
         title: "Կիսվել"
         extended_title: "Կիսվել հղումով"
         help: "կիսվել այս թեմայի հղումով"
+        invite_users: "Հրավիրել"
       print:
         title: "Տպել"
         help: "Բացել այս թեմայի տպման հարմար նախատեսված տարբերակը"
@@ -2081,14 +2098,13 @@ hy:
         username_placeholder: "օգտանուն"
         action: "Ուղարկել Հրավեր"
         help: "Հրավիրել մյուսներին այս թեմային էլ. հասցեի կամ ծանուցումների միջոցով"
-        to_forum: "Մենք կուղարկենք համառոտ էլ. նամակ, որը թույլ կտա Ձեր ընկերոջը անմիջապես միանալ՝ սեղմելով հղմանը, առանց մուտք գործելու անհրաժեշտության:"
-        sso_enabled: "Մուտքագրեք այն անձի օգտանունը, ում ցանկանում եք հրավիրել այս թեմային:"
+        discourse_connect_enabled: "Մուտքագրեք այն անձի օգտանունը, ում ցանկանում եք հրավիրել այս թեմային:"
         to_topic_blank: "Մուտքագրեք այն անձի օգտանունը կամ էլ. հասցեն, ում ցանկանում եք հրավիրել այս թեմային:"
         to_topic_email: "Դուք մուտքագրել եք էլ. հասցե: Մենք կուղարկենք հրավեր, որը թույլ կտա Ձեր ընկերոջը անմիջապես պատասխանել այս թեմային:"
         to_topic_username: "Դուք մուտքագրել եք օգտանուն: Մենք կուղարկենք ծանուցում՝ այս թեմային հրավերի հղումով:"
         to_username: "Մուտքագրեք այն անձի օգտանունը, ում ցանկանում եք հրավիրել: Մենք կուղարկենք ծանուցում՝ այս թեմային հրավերի հղումով:"
         email_placeholder: "name@example.com"
-        success_email: "Մենք ուղարկել ենք հրավերի էլ. նամակ <b>%{emailOrUsername}</b>-ին: Մենք ծանուցում կուղարկենք Ձեզ, երբ հրավերն ընդունվի: Ստուգեք Ձեր էջի հրավերների ներդիրը՝ Ձեր հրավերներին հետևելու համար:"
+        success_email: "Մենք ուղարկել ենք հրավերի էլ. նամակ <b>%{invitee}</b>-ին: Մենք ծանուցում կուղարկենք Ձեզ, երբ հրավերն ընդունվի: Ստուգեք Ձեր էջի հրավերների ներդիրը՝ Ձեր հրավերներին հետևելու համար:"
         success_username: "Մենք հրավիրել ենք այդ օգտատիրոջը մասնակցելու այս թեմային:"
         error: "Ներողություն, մենք չկարողացանք հրավիրել այդ մարդուն: Միգուցե նա արդեն հրավիրվա՞ծ է: (Հրավերները սահմանափակ են)"
         success_existing_email: " <b>%{emailOrUsername}</b> էլ. հասցեով օգատեր արդեն գոյություն ունի: Մենք հրավիրել ենք նրան մասնակցելու այս թեմային:"
@@ -2190,11 +2206,10 @@ hy:
           other: "Դուք ընտրել եք <b>%{count}</b> գրառում:"
     post:
       quote_reply: "Մեջբերել"
+      quote_share: "Կիսվել"
       edit_reason: "Պատճառը՝ "
       post_number: "գրառում %{number}"
       ignored: "Անտեսված բովանդակություն"
-      wiki_last_edited_on: "wiki-ն վերջին անգամ խմբագրվել է"
-      last_edited_on: "գրառումը վերջին անգամ խմբագրվել է"
       reply_as_new_topic: "Պատասխանել որպես հղված թեմա"
       reply_as_new_private_message: "Պատասխանել որպես հաղորդագրություն նույն ստացողներին"
       continue_discussion: "Շարունակելով %{postLink} քննարկումը՝ "
@@ -2234,16 +2249,8 @@ hy:
         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: "Այո, լքել"
+      cancel_composer:
+        discard: "Չեղարկել"
       via_email: "այս գրառումը եկել է էլ. նամակով"
       via_auto_generated_email: "այս գրառումը եկել է ավտոմատ գեներացված էլ. նամակով"
       whisper: "այս գրառումը գաղտնի շշուկ է մոդերատորների համար"
@@ -2296,6 +2303,9 @@ hy:
         remove_timer: "հեռացնել ժամաչափիչը"
       actions:
         people:
+          like:
+            one: "հավանել է սա"
+            other: "հավանել է սա"
           like_capped:
             one: "և %{count} այլ անձ հավանել է սա"
             other: "և %{count} հոգի հավանել են սա"
@@ -2408,6 +2418,11 @@ hy:
       change_in_category_topic: "Խմբագրել Նկարագրությունը"
       already_used: "Այս գույնը օգտագործվել է մեկ այլ կատեգորիայի կողմից"
       security: "Անվտանգություն"
+      permissions:
+        group: "Խումբ"
+        see: "Դիտել"
+        reply: "Պատասխանել"
+        create: "Ստեղծել"
       special_warning: "Ուշադրություն. Այս կատեգորիան նախապես ստեղծված կատեգորիա է, և անվտանգության կարգավորումները չեն կարող փոփոխվել: Եթե Դուք չեք ցանկանում օգտագործել այս կատեգորիան, ջնջեք այն՝ փոփոխելու փոխարեն:"
       uncategorized_security_warning: "Այս կատեգորիան հատուկ է: Այն նախատեսված է որպես կատեգորիա չունեցող թեմաների պահման տարածք; այն չի կարող ունենալ անվտանգության կարգավորումներ:"
       uncategorized_general_warning: 'Այս կատեգորիան հատուկ է: Այն օգտագործվում է որպես լռելյայն կատեգորիա նոր թեմաների համար, որոնք չունեն ընտրված կատեգորիա: Եթե Դուք ցանկանում եք կանխել սա և պարտադրել կատեգորիայի ընտրությունը, <a href="%{settingLink}">խնդրում ենք անջատել կարգավորումը այստեղ</a>: Եթե ցանկանում եք փոփոխել անունը կամ նկարագրությունը, այցելեք <a href="%{customizeLink}">Customize / Text Content</a>:'
@@ -2444,19 +2459,16 @@ hy:
       notifications:
         watching:
           title: "Դիտում Եմ"
-          description: "Դուք ավտոմատ կերպով կդիտեք այս կատեգորիաների բոլոր թեմաները: Դուք ծանուցում կստանաք յուրաքանչյուր թեմայում յուրաքանչյուր նոր գրառման համար, և կցուցադրվի նոր պատասխանների քանակը:"
         watching_first_post:
           title: "Դիտում Եմ Առաջին Գրառումը"
           description: "Դուք ծանուցում կստանաք այս կատեգորիայում նոր թեմաների, բայց ոչ այս թեմայի պատասխանների մասին:"
         tracking:
           title: "Հետևում Եմ"
-          description: "Դուք ավտոմատ կերպով կհետևեք այս կատեգորիաների բոլոր թեմաներին: Դուք ծանուցում կստանաք, եթե որևէ մեկը հիշատակի Ձեր @անունը կամ պատասխանի Ձեզ, և կցուցադրվի նոր պատասխանների քանակը:"
         regular:
           title: "Նորմալ"
           description: "Դուք ծանուցում կստանաք, եթե որևէ մեկը հիշատակի Ձեր @անունը կամ պատասխանի Ձեզ:"
         muted:
           title: "Խլացված"
-          description: "Դուք երբեք ծանուցում չեք ստանա այս կատեգորիաների նոր թեմաների մասին, և դրանք չեն հայտնվի վերջիններում:"
       search_priority:
         label: "Որոնման Առաջնահերթություն"
         options:
@@ -2491,10 +2503,17 @@ hy:
     flagging:
       title: "Շնորհակալ ենք, որ օգնում եք պահել մեր համայնքը քաղաքակիրթ:"
       action: "Դրոշակավորել Գրառումը"
+      take_action_options:
+        default:
+          title: "Ձեռնարկել Գործողություն"
+          details: "Անմիջապես հասնել դրոշակների քանակի սահմանին՝ առանց սպասելու համայնքային ավելի շատ դրոշակների"
+        suspend:
+          title: "Սառեցնել Օգտատիրոջը"
+        silence:
+          title: "Լռեցնել Օգտատիրոջը"
       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> թեմաները}} , ջնջել նրա հաշիվը, արգելափակել մուտքը նրա <b>{ip_address}</b> IP-ից և ավելացնել նրա <b>{email}</b> էլ հասցեն մշտական արգելափակվածների ցանկին: Դուք համոզվա՞ծ եք, որ այս օգտատերն իրոք սպամ տարածող է:"
       yes_delete_spammer: "Այո, Ջնջել Սպամ տարածողին"
       ip_address_missing: "(անհասանելի)"
       hidden_email_address: "(թաքցված)"
@@ -2561,12 +2580,6 @@ hy:
         title: "Այս թեման անձնական հաղորդագրություն է"
         help: "Այս թեման անձնական հաղորդագրություն է"
     posts: "Գրառումներ"
-    posts_likes_MF: |
-      Այս թեման ունի {count, plural, one {1 պատասխան} other {# պատասխան}} {ratio, select,
-        low {գրառման հավանումների բարձր հարաբերակցությամբ}
-        med {գրառման հավանումների շատ բարձր հարաբերակցությամբ}
-        high {գրառման հավանումների չափազանց բարձր հարաբերակցությամբ}
-        other {}}
     original_post: "Սկզբնական Գրառումը"
     views: "Դիտում"
     views_lowercase:
@@ -2586,7 +2599,6 @@ hy:
       one: "օգտատեր"
       other: "օգտատերեր"
     category_title: "Կատեգորիա"
-    history: "Պատմություն"
     changed_by: "%{author}-ի կողմից"
     raw_email:
       title: "Մուտքային Էլ. նամակ"
@@ -2891,6 +2903,10 @@ hy:
       dismiss: "Չեղարկել"
     safe_mode:
       enabled: "Անվտանգ ռեժիմը միացված է, փակեք բրաուզերի այս պատուհանը՝ անվտանգ ռեժիմից դուրս գալու համար:"
+    do_not_disturb:
+      remaining: "%{remaining}-ը մնում է"
+      options:
+        custom: "Մասնավոր"
   admin_js:
     type_to_filter: "գրեք ֆիլտրելու համար..."
     admin:
@@ -2918,6 +2934,8 @@ hy:
         installed_version: "Տեղադրված է "
         latest_version: "Վերջինը"
         problems_found: "Որոշ խորհուրդներ՝ հիմնված Ձեր կայքի ընթացիկ կարգավորումների վրա"
+        new_features:
+          dismiss: "Չեղարկել"
         last_checked: "Վերջին ստուգումը՝ "
         refresh_problems: "Թարմացնել"
         no_problems: "Խնդիրներ չեն գտնվել:"
@@ -2970,6 +2988,9 @@ hy:
           view_table: "աղյուսակ"
           view_graph: "գրաֆիկ"
           refresh_report: "Թարմացնել Հաշվետվությունը"
+          daily: Օրվա Ընթացքում
+          monthly: Ամսվա Ընթացքում
+          weekly: Շաբաթվա Ընթացքում
           dates: "Ամսաթվեր (UTC)"
           groups: "Բոլոր խմբերը"
           disabled: "Այս հաշվետվությունն անջատված է"
@@ -3003,10 +3024,6 @@ hy:
             available: "Խմբի անունը հասանելի է"
             not_available: "Խմբի անունը հասանելի չէ"
             blank: "Խմբի անունը չի կարող դատարկ լինել"
-        bulk_add:
-          title: "Զանգվածային Ավելացում Խմբին"
-          complete_users_not_added: "Այս օգտատերերը չեն ավելացվել (համոզվեք, որ նրանք ունեն հաշիվ) `"
-          paste: "Տեղադրեք օգտանունների կամ էլ. հասցեների ցանկ, յուրաքանչյուր տողում մեկ հատ՝ "
         add_members:
           as_owner: "Սահմանել օգտատիրոջ(երի) որպես այս խմբի սեփականատեր(եր)"
         manage:
@@ -3031,7 +3048,6 @@ hy:
             effects: Էֆեկտներ
             trust_levels_none: "Ոչ մի"
             automatic_membership_email_domains: "Այն օգտատերերը, որոնք գրանցվում են էլ. հասցեի դոմենով, որը ճշգրտորեն համընկնում է այս ցանկում գտնվողին, ավտոմատ կերպով կավելացվեն այս խմբում՝ "
-            automatic_membership_user_count: "%{count} օգտատերեը կավելացվեն խմբին՝ նոր էլ. հասցեով:"
             primary_group: "Ավտոմատ կիրառել որպես հիմնական խումբ"
         name_placeholder: "Խմբի անունը, առանց բացատների, նույնը, ինչ օգտանվան կանոնը"
         primary: "Հիմնական Խումբ"
@@ -3084,6 +3100,8 @@ hy:
         revoked: Հետկանչված
         not_shown_again: 'Այս բանալին՝ էլ երբեք չի ցուցադրվի: Համոզվեք, որ պատճենահանել եք՝ նախքան շարունակելը:'
         continue: Շարունակել
+        scopes:
+          action: Գործողություն
       web_hooks:
         title: "Webhook-ներ"
         none: "Այս պահին webhook-ներ չկան:"
@@ -3098,7 +3116,6 @@ hy:
         go_back: "Վերադառնալ ցանկին"
         payload_url: "Տվյալների ուղարկման URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Կարծես թե Դուք փորձում եք կարգավորել webhook տեղական url-ով: Տեղական հասցեին ուղարկված իրադարձությունը կարող է ունենալ կողմնակի ազդեցություն կամ անսպասելի վարքագիծ: Շարունակե՞լ:"
         secret_invalid: "Ծածկագիրը չպետք է ունենա բացատներ:"
         secret_too_short: "Ծածկագիրը պետք է պարունակի առնվազն 12 սիմվոլ:"
         secret_placeholder: "Ընտրովի տող, որը օգտագործվում է ստորագրություն գեներացնելու համար"
@@ -3126,7 +3143,6 @@ hy:
           details: "Երբ կա նոր պատասխան, խմբագրում, այն ջնջվում է կամ վերականգնվում:"
         user_event:
           name: "Օգտատիրոջ Իրադարձություն"
-          details: "Երբ օգտատերը մուտք է գործում, դուրս է գրվում, օգտատեր է ստեղծվում, հաստատվում կամ թարմացվում:"
         group_event:
           name: "Խմբի Իրադարձություն"
           details: "Երբ խումբ է ստեղծվում, թարմացվում կամ ջնջվում:"
@@ -3726,30 +3742,20 @@ hy:
         title: "Դիտված Բառեր"
         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} բառ"
         actions:
           block: "Արգելափակել"
           censor: "Գրաքննել"
           require_approval: "Պահանջել Հաստատում"
           flag: "Դրոշակավորել"
+          replace: "Փոխարինել"
         action_descriptions:
           block: "Արգելել այս բառերը պարունակող գրառումների հրապարակումը: Օգտատերը կտեսնի սխալի հաղորդագրություն, երբ փորձի կատարել գրառում:"
           censor: "Թույլատրել այս բառերը պարունակող գրառումները, սակայն փոխարինել դրանք սիմվոլներով, որոնք կթաքցնեն գրաքննության ենթարկված բառերը:"
           require_approval: "Այս բառերը պարունակող հրապարակումների համար կպահանջվի հաստատում անձնակազմի կողմից՝ մինչև դրանց տեսանելի դառնալը:"
           flag: "Թույլատրել այս բառերը պարունակող գրառումները, սակայն դրոշակավորել դրանք որպես անհամապատասխան, որպեսզի մոդերատորները կարողանան վերանայել դրանք:"
         form:
-          label: "Նոր Բառ՝ "
-          placeholder: "ամբողջական բառը կամ * որպես դերանշան(wildcard)"
           placeholder_regexp: "regular expression"
           add: "Ավելացնել"
           success: "Հաջողություն"
@@ -3803,6 +3809,8 @@ hy:
         check_email:
           title: "Ցուցադրել այս օգտատիրոջ էլ. հասցեն"
           text: "Ցուցադրել"
+        check_sso:
+          text: "Ցուցադրել"
       user:
         suspend_failed: "Այս օգտատիրոջը սառեցնելիս ինչ-որ սխալ է տեղի ունեցել՝ %{error}"
         unsuspend_failed: "Այս օգտատիրոջը վերականգնելիս ինչ-որ սխալ է տեղի ունեցել՝ %{error}"
@@ -3810,6 +3818,7 @@ hy:
         suspend_reason_label: "Ինչո՞ւ եք սառեցնում այս օգտատիրոջը: Այս տեքստը <b>տեսանելի կլինի բոլորին</b> այս օգտատիրոջ պրոֆիլի էջում և կցուցադրվի օգտատիրոջը, երբ նա փորձի մուտք գործել: Մուտքագրեք կարճ տեքստ:"
         suspend_reason_hidden_label: "Ինչո՞ւ եք սառեցնում այս օգտատիրոջը: Այս տեքստը կցուցադրվի օգտատիրոջը, երբ նա փորձի մուտք գործել: Մուտքագրեք կարճ տեքստ:"
         suspend_reason: "Պատճառ"
+        suspend_reason_title: "Սառեցման Պատճառը"
         suspend_message: "Էլ. նամակ"
         suspend_message_placeholder: "Ըստ ցանկության, տրամադրեք ավելի շատ տեղեկություններ սառեցման մասին, և այն կուղարկվի օգտատիրոջը էլ. նամակով:"
         suspended_by: "Սառեցնող՝ "
@@ -3835,7 +3844,6 @@ hy:
         clear_penalty_history:
           title: "Ջնջել Տուգանքների Պատմությունը"
           description: "տուգանքներ ունեցող օգտատերերը չեն կարող հասնել 3-րդ Վստահության Մակարդակի"
-        delete_all_posts_confirm_MF: "Դուք պատրաստվում եք ջնջել {POSTS, plural, one {1 գրառում} other {# գրառում}} և {TOPICS, plural, one {1 թեմա} other {# թեմա}}: Դուք համոզվա՞ծ եք:"
         silence: "Լռեցնել"
         unsilence: "Միացնել"
         silenced: "Լռեցվա՞ծ"
@@ -3986,8 +3994,7 @@ hy:
           on_grace_period: "Ներկայումս գտնվում է մակարդակի բարձրացման փուլում, մակարդակը չի իջեցվի"
           locked_will_not_be_promoted: "Վստահության մակարդակը արգելափակված է: Մակարդակը երբեք չի բարձրացվի:"
           locked_will_not_be_demoted: "Վստահության մակարդակը արգելափակված է: Մակարդակը երբեք չի իջեցվի:"
-        sso:
-          title: "Միակ Մուտքի Տեխնոլոգիա (SSO)"
+        discourse_connect:
           external_id: "Արտաքին ID"
           external_username: "Օգտանուն"
           external_name: "Անուն"
@@ -4130,7 +4137,6 @@ hy:
         icon: Պատկերակ
         image: Նկար
         icon_help: "Մուտքագրեք Font Awesome պատկերակի անունը (օգտագործեք 'far-' նախածանցը՝ սովորական և 'fab-' ՝ բրենդային պատկերակների համար): \n "
-        image_help: "Մուտքագրեք նկարի URL-ը (վերասահմանում է պատկերակի դաշտը, եթե երկուսն ել հաստատված են)"
         query: Կրծքանշանի Հարցում (SQL)
         target_posts: Հարցման նպատակային գրառումներ
         auto_revoke: Գործարկել հետկանչման հարցումն ամեն օր
@@ -4204,6 +4210,9 @@ hy:
         embed_title_scrubber: "Գրառումների վերնագրի զտման համար օգտագործվող regular expression"
         embed_truncate: "Կրճատել զետեղված գրառումները"
         embed_unlisted: "Ներմուծվող թեմաները կցուցադրվեն թեմաների ցանկում միայն՝ պատասխանն ավելացնելուց հետո: "
+        allowed_embed_selectors: "CSS սելեկտոր այն տարրերի համար, որոնք թույլատրված են զետեղումների մեջ"
+        blocked_embed_selectors: "CSS սելեկտոր այն տարրերի համար, որոնք հեռացվում են զետեղումներից"
+        allowed_embed_classnames: "Թույլատրված CSS կլասների անվանումներ"
         save: "Պահպանել Զետեղման Կարգավորումները"
       permalink:
         title: "Մշտահղումներ"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index cad276b543..0b0bd8432c 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -135,6 +135,10 @@ id:
     topic_admin_menu: "tindakan topik"
     wizard_required: "Selamat datang di Discourse baru Anda! Mari kita mulai dengan <a href='%{url}' data-auto-route='true'>wizard pengaturan</a> ✨"
     emails_are_disabled: "Semua surel yang keluar telah dinonaktifkan oleh administrator. Tidak ada pemberitahuan email yang akan dikirimkan."
+    software_update_prompt:
+      dismiss: "Bubar"
+    bootstrap_mode_enabled:
+      other: "Untuk lebih memudahkan peluncuran situs baru Anda, Anda berada di mode bootstrap. Semua pengguna baru akan mendapat level 1 dan mendapat ringkasan email harian diaktifkan. Hal ini akan otomatis dimatikan ketika pengguna %{count} sudah ikut."
     bootstrap_mode_disabled: "Mode bootstrap akan dinonaktifkan dalam 24 jam."
     themes:
       default_description: "Asal"
@@ -221,8 +225,6 @@ id:
       moderators: "Moderator"
       stat:
         all_time: "Sepanjang Waktu"
-        last_7_days: "7 terakhir"
-        last_30_days: "30 terakhir"
       like_count: "Suka"
       topic_count: "Topik"
       post_count: "Pos"
@@ -242,18 +244,23 @@ id:
       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> .'
+      auto_delete_preference:
+        label: "Hapus secara otomatis"
+        never: "Tidak pernah"
+        on_owner_reply: "Setelah saya membalas topik ini"
+      search: "Cari"
       reminders:
-        custom: "Tanggal dan waktu tersuai"
+        today_with_time: "hari ini pada %{time}"
+        tomorrow_with_time: "besok pada %{time}"
+        at_time: "pada %{date_time}"
+    copy_codeblock:
+      copied: "disalin!"
     drafts:
       resume: "Lanjut"
       remove: "Hapus"
       new_topic: "Konsep topik baru"
       new_private_message: "Konsep pesan pribadi baru"
       topic_reply: "Balasan konsep"
-      abandon:
-        confirm: "Anda sudah membuka konsep lain dalam topik ini. Anda yakin ingin mengabaikannya?"
-        yes_value: "Ya, abaikan"
-        no_value: "Tidak, simpan"
     topic_count_latest:
       other: "Lihat %{count} topik baru atau diperbarui"
     topic_count_unread:
@@ -262,6 +269,7 @@ id:
       other: "Lihat %{count} topik baru"
     preview: "pratinjau"
     cancel: "batal"
+    deleting: "Menghapus..."
     save: "Simpan Perubahan"
     saving: "Menyimpan..."
     saved: "Tersimpan!"
@@ -332,6 +340,7 @@ id:
       topic: "Topik:"
       filtered_topic: "Anda telah menyaring ke konten yang dapat ditinjau dalam satu topik."
       filtered_user: "Pengguna"
+      filtered_reviewed_by: "Diperiksa Oleh"
       show_all_topics: "tampilkan semua topik"
       deleted_post: "(pos dihapus)"
       deleted_user: "(pengguna dihapus)"
@@ -341,6 +350,7 @@ id:
         username: "Nama Pengguna"
         email: "Email"
         name: "Nama"
+        reject_reason: "Alasan"
       user_percentage:
         agreed:
           other: "%{count}% setuju"
@@ -378,7 +388,7 @@ id:
           created_at_asc: "Dibuat Pada (terbalik)"
         priority:
           title: "Prioritas Minimum"
-          low: "(apa saja)"
+          any: "(apa saja)"
           medium: "Sedang"
           high: "Tinggi"
       conversation:
@@ -421,6 +431,16 @@ id:
         pending_posts:
           other: "Anda memiliki <strong>%{count}</strong> pos sedang menunggu."
         ok: "OK"
+      example_username: "username"
+    time_shortcut:
+      later_today: "Nanti hari ini"
+      next_business_day: "Hari kerja berikutnya"
+      tomorrow: "Besok"
+      next_week: "Minggu depan"
+      start_of_next_business_week: "Senin"
+      start_of_next_business_week_alt: "Senin Depan"
+      next_month: "Bulan depan"
+      custom: "Tanggal dan waktu tersuai"
     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>"
@@ -436,6 +456,7 @@ id:
       sent_by_user: "Dikirim oleh <a href='%{userUrl}'>%{user}</a>"
       sent_by_you: "Dikirim oleh <a href='%{userUrl}'>kamu</a>"
     directory:
+      username: "Nama Pengguna"
       filter_name: "Menyaring dari nama pengguna"
       title: "Pengguna"
       likes_given: "Mendapatkan"
@@ -452,6 +473,7 @@ id:
       days_visited_long: "Hari yang dikunjungi"
       posts_read: "baca"
       posts_read_long: "Tulisan dilihat"
+      last_updated: "Terakhir Diperbarui:"
       total_rows:
         other: "%{count} pengguna"
     group_histories:
@@ -464,6 +486,9 @@ id:
     groups:
       member_added: "Ditambahkan"
       member_requested: "Diminta pada"
+      add_members:
+        title: "Tambahkan anggota ke %{group_name}"
+        notify_users: "Beritahu pengguna"
       requests:
         title: "Permintaan"
         reason: "Alasan"
@@ -480,16 +505,29 @@ id:
         profile:
           title: Profil
         interaction:
+          title: Interaksi
           posting: Posting
           notification: Pemberitahuan
         email:
           title: "Email"
           credentials:
+            smtp_server: "Server SMTP"
+            smtp_port: "Port SMTP"
+            imap_server: "Server IMAP"
+            imap_port: "Port IMAP"
             username: "Nama Pengguna"
             password: "Kata Sandi"
+          settings:
+            title: "Pengaturan"
+          mailboxes:
+            disabled: "dinonaktifkan"
         membership:
           title: Keanggotaan
           access: Mengakses
+        categories:
+          title: Kategori
+        tags:
+          title: Label
         logs:
           title: "Log"
           when: "Ketika"
@@ -624,15 +662,18 @@ id:
       posts: "Post"
       topics: "Topik"
       latest: "Terbaru"
-      latest_by: "Terbaru oleh"
       toggle_ordering: "beralih memesan kontrol"
       subcategories: "Subkategori"
       topic_sentence:
         other: "%{count} topik"
+      topic_stat_unit:
+        week: "minggu"
+        month: "bulan"
       topic_stat_sentence_week:
         other: "%{count} topik baru dalam seminggu terakhir."
       topic_stat_sentence_month:
         other: "%{count} topik baru dalam sebulan terakhir."
+      n_more: "Kategori (%{count} lagi)..."
     ip_lookup:
       title: Pencarian Alamat IP
       hostname: nama host
@@ -676,7 +717,12 @@ id:
         add_ignored_user: "Tambahkan..."
         mute_option: "Bisukan"
         normal_option: "normal"
+      notification_schedule:
+        none: "Tidak ada"
+        monday: "Senin"
+        to: "kepada"
       activity_stream: "Activity"
+      read: "baca"
       preferences: "Preferensi"
       feature_topic_on_profile:
         open_search: "Pilih Topik Baru"
@@ -704,7 +750,6 @@ id:
         perm_denied_expl: "Anda menolak izin untuk pemberitahuan. Izinkan pemberitahuan melalui pengaturan browser anda."
         disable: "Tidak membolehkan Notifikasi"
         enable: "Membolehkan Notifikasi"
-        each_browser_note: "Catatan : Anda harus mengubah pengaturan ini pada setiap browser yang Anda gunakan."
       dismiss: "Bubar"
       dismiss_notifications: "Bubarkan Semua"
       dismiss_notifications_tooltip: "Tandai semua notifikasi belum dibaca telah dibaca"
@@ -724,6 +769,7 @@ id:
       suspended_notice: "Pengguna ini ditangguhkan sampai %{date}"
       suspended_permanently: "Pengguna ini dicekal"
       suspended_reason: "Alasan:"
+      github_profile: "GitHub"
       email_activity_summary: "Jumlah aktifitas"
       mailing_list_mode:
         label: "mode milis"
@@ -821,6 +867,8 @@ id:
         title: "Ganti Username"
         taken: "Maaf, username tersebut sudah ada yang menggunakan"
         invalid: "Username tersebut tidak valid. Username harus berupa angka dan huruf"
+      add_email:
+        add: "menambahkan"
       change_email:
         title: "Ganti Alamat Surel"
         taken: "Maaf, alamat surel tersebut tidak tersedia."
@@ -938,34 +986,29 @@ id:
         after_5_minutes: "setelah 5 menit"
         after_10_minutes: "setelah 10 menit"
       invited:
-        search: "ketik untuk mecari undangan..."
         title: "Undangan"
-        user: "Pengguna yang telah diundang"
-        sent: "Terakhir Terkirim"
-        none: "Tidak ada undangan"
-        pending: "Undangan yang tertunda"
         pending_tab: "Tertunda"
         pending_tab_with_count: "Tertunda (%{count})"
+        invited_via: "Undangan"
+        groups: "Grup"
+        topic: "Topik"
+        edit: "Ubah"
+        remove: "Hapus"
+        reinvited: "Undangan sudah dikirim ulang"
+        search: "ketik untuk mecari undangan..."
+        user: "Pengguna yang telah diundang"
+        none: "Tidak ada undangan"
+        pending: "Undangan yang tertunda"
         topics_entered: "Topik Dilihat"
         posts_read_count: "Tulisan dilihat"
         expired: "Undangan ini sudah kadaluarsa"
-        rescind: "Hapus"
-        rescinded: "Undangan dihapus"
-        reinvite: "Kirim Ulang Undangan"
-        reinvite_all: "Kirim ulang semua Undangan"
-        reinvited: "Undangan sudah dikirim ulang"
-        reinvited_all: "Semua Undangan sudah dikirim ulang"
         time_read: "Waktu Baca"
         days_visited: "Hari Berkunjung"
         account_age_days: "Umur akun dalam hari"
-        links_tab: "Tautan"
-        link_created_at: "Dibuat"
-        link_groups: Grup
         valid_for: "Tautan undangan hanya berlaku untuk alamat surel: %{email}"
         invite_link:
           success: "Tautan undangan telah sukses dibuat!"
         bulk_invite:
-          success: "File telah sukses diunggah, anda akan mendapat pesan pemberitahuan saat proses telah selesai."
           error: "Maaf, file harus dalam format CSV"
       password:
         title: "Kata sandi"
@@ -991,6 +1034,8 @@ id:
           other: "hari berkunjung"
         topics_entered:
           other: "topik dilihat"
+        bookmark_count:
+          other: "markah"
         top_replies: "Balasan Teratas"
         no_replies: "Belum ada balasan"
         more_replies: "Balasan lebih banyak"
@@ -1050,15 +1095,6 @@ id:
     home: "Beranda"
     read_only_mode:
       logout_disabled: "Logout di-nonaktifkan saat situs dalam mode hanya-baca."
-    all_time: "total"
-    all_time_desc: "total topik yang dibuat"
-    year: "tahun"
-    year_desc: "topik yang dibuat dalam 365 hari terakhir"
-    month: "bulan"
-    month_desc: "topik yang dibuat dalam 30 hari terakhir"
-    week: "minggu"
-    week_desc: "topik yang dibuat dalam 7 hari terakhir"
-    day: "hari"
     first_post: Tulisan pertama
     mute: Bisu
     unmute: Buka Bisu
@@ -1074,7 +1110,8 @@ id:
       hide_session: "Ingat saya besok"
       hide_forever: "tidak, terima kasih"
     summary:
-      description: "Terdapat <b>%{replyCount}</b> balasan."
+      description:
+        other: "Terdapat <b>%{count}</b> balasan."
       enable: "Rangkum Topik Ini"
       disable: "Tampilkan Semua Postingan"
     deleted_filter:
@@ -1082,6 +1119,8 @@ id:
       disable: "Tunjukkan Tulisan yang Dihapus"
     private_message_info:
       title: "Pesan"
+      edit: "Tambah atau Hapus..."
+      add: "Tambahkan..."
       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?"
@@ -1092,8 +1131,6 @@ id:
     created_lowercase: "dibuat"
     trust_level: "Tingkat Kepercayaan"
     search_hint: "username, email, atau alamat IP"
-    create_account:
-      title: "Buat Akun Baru"
     forgot_password:
       title: "Atur Ulang Kata Sandi"
       action: "Saya lupa password"
@@ -1107,10 +1144,8 @@ id:
       confirm_title: Lanjut ke %{site_name}
       logging_in_as: Masuk sebagai %{email}
     login:
-      title: "Log In"
       username: "Pengguna"
       password: "Kata Sandi"
-      email_placeholder: "email atau username"
       caps_lock_warning: "Tombol \"Caps Lock\" menyala"
       error: "Galat yang tidak diketahui"
       blank_username: "Silakan masukkan email atau nama pengguna Anda."
@@ -1144,6 +1179,7 @@ id:
       invited_by: "Anda telah diundang oleh:"
       accept_invite: "Terima Undangan"
       name_label: "Nama"
+      password_label: "Kata Sandi"
       optional_description: "(opsional)"
     password_reset:
       continue: "Lanjut ke %{site_name}"
@@ -1151,7 +1187,6 @@ id:
       apple_international: "Apple/Internasional"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (dahulu EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1169,6 +1204,9 @@ id:
       enter: "Enter"
     conditional_loading_section:
       loading: Diproses...
+    category_row:
+      topic_count:
+        other: "%{count} topik dalam kategori ini"
     select_kit:
       default_header_text: Pilih...
       no_content: Tidak ditemukan yang cocok
@@ -1187,18 +1225,22 @@ id:
     composer:
       emoji: "Emoji :)"
       options: "Pilihan"
-      blockquote_text: "Blok Kutipan"
       add_warning: "Ini adalah peringatan resmi."
       similar_topics: "Topik anda mirip dengan..."
       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:
+          other: "Judul setidaknya %{count} karakter"
+        title_too_long:
+          other: "Judul tidak boleh lebih dari %{count} karakter"
         post_missing: "Tulisan tidak boleh kosong"
-        post_length: "Tulisan setidaknya harus %{min} karakter"
+        post_length:
+          other: "Tulisan setidaknya harus %{count} karakter"
         try_like: "Sudahkah Anda mencoba tombol %{heart}?"
         category_missing: "Anda harus memilih kategori"
+        tags_missing:
+          other: "Anda harus memilih setidaknya %{count} label"
       save_edit: "Simpah Ubahan"
       reply_original: "Balas pada Topik Asal"
       reply_here: "Balas Disini"
@@ -1221,8 +1263,6 @@ id:
       saving: "Menyimpan"
       saved: "Tersimpan!"
       uploading: "Mengunggah..."
-      show_preview: "tunjukkan pratinjau &raquo;"
-      hide_preview: "&laquo; sembunyikan pratinjau"
       quote_post_title: "Kutip seluruh tulisan"
       bold_label: "B"
       bold_title: "Strong"
@@ -1232,8 +1272,8 @@ id:
       link_dialog_title: "Sisipkan Tautan"
       link_optional_text: "judul opsional"
       link_url_placeholder: "Tempel URL atau ketik untuk mencari topik"
-      quote_title: "Blok Kutipan"
-      quote_text: "Blok Kutipan"
+      blockquote_title: "Blok Kutipan"
+      blockquote_text: "Blok Kutipan"
       code_title: "Teks terformat"
       paste_code_text: "ketik atau tempel kode di sini"
       upload_title: "Unggah"
@@ -1260,6 +1300,7 @@ id:
           label: "Topik Baru"
         shared_draft:
           label: "Konsep Bersama"
+      ignore: "Abaikan"
     notifications:
       tooltip:
         message:
@@ -1297,14 +1338,19 @@ id:
       title: "mencari topik, artikel, pengguna, atau kategori"
       full_page_title: "cari topik atau artikel"
       search_google_button: "Google"
+      search_button: "Cari"
       advanced:
         posted_by:
           label: Dibuat oleh
+        post:
+          count:
+            label: Pos
     new_item: "baru"
     topics:
       bulk:
         select_all: "Pilih Semua"
         dismiss: "Bubar"
+        move_messages_to_inbox: "Pindah ke Kotak Masuk"
         notification_level: "Pemberitahuan"
         choose_new_tags: "Silahkan pilih tag baru untuk topik-topik ini:"
       none:
@@ -1322,6 +1368,7 @@ id:
         title: "Ubah"
       list: "Topik"
       new: "topik baru"
+      unread: "belum dibaca"
       new_topics:
         other: "%{count} topik baru"
       title: "Topik"
@@ -1339,6 +1386,16 @@ id:
       browse_all_categories: Lihat semua kategori
       view_latest_topics: lihat topik terbaru
       jump_reply_up: lompat ke balasan sebelumnya
+      slow_mode_update:
+        save: "Aktifkan"
+        remove: "Nonaktifkan"
+      topic_status_update:
+        when: "Ketika:"
+      auto_update_input:
+        later_today: "Nanti hari ini"
+        tomorrow: "Besok"
+        next_week: "Minggu depan"
+        next_month: "Bulan depan"
       progress:
         jump_prompt_or: "atau"
       notifications:
@@ -1372,9 +1429,13 @@ id:
         title: "Balas"
       share:
         help: "share link ke topik ini"
+      invite_private:
+        group_name: "nama grup"
       invite_reply:
         username_placeholder: "nama pengguna"
       filters:
+        n_posts:
+          other: "%{count} post"
         cancel: "Hapus filter"
       split_topic:
         title: "Pindahkan sebagai Topik Baru"
@@ -1389,15 +1450,13 @@ id:
         placeholder: "username pemilik yang baru"
     post:
       edit_reason: "Alasan:"
+      collapse: "persempit"
       expand_collapse: "perluas/tutup"
+      has_replies:
+        other: "%{count} Balasan"
       errors:
         image_upload_not_allowed_for_new_user: "Maaf, pengguna baru belum diperbolehkan mengunggah gambar."
         attachment_upload_not_allowed_for_new_user: "Maaf, pengguna baru belum diperbolehkan mengunggah lampiran."
-      abandon_edit:
-        no_value: "Tidak, simpan"
-      abandon:
-        no_value: "Tidak, simpan"
-        yes_value: "Ya, abaikan"
       controls:
         edit_action: "Ubah"
         more: "Selengkapnya"
@@ -1412,6 +1471,9 @@ id:
       settings: "Pengaturan"
       tags: "Label"
       name: "Nama Kategori"
+      permissions:
+        reply: "Balas"
+      review_group_name: "nama grup"
       notifications:
         watching:
           title: "Melihat"
@@ -1430,6 +1492,7 @@ id:
           ignore: "Abaikan"
           high: "Tinggi"
       sort_options:
+        default: "asal"
         likes: "Suka"
         posts: "Pos"
         activity: "Aktifitas"
@@ -1454,8 +1517,14 @@ id:
     replies: "Balasan"
     activity: "Aktifitas"
     likes: "Suka"
+    likes_lowercase:
+      other: "suka"
     users: "Pengguna"
+    users_lowercase:
+      other: "pengguna"
     category_title: "Kategori"
+    raw_email:
+      not_available: "Tidak tersedia!"
     filters:
       with_topics: "%{filter} topik"
       with_category: "%{filter} %{category} topik"
@@ -1486,6 +1555,8 @@ id:
     lightbox:
       download: "unduh"
     keyboard_shortcuts_help:
+      jump_to:
+        new: "%{shortcut} Baru"
       navigation:
         title: "Navigasi"
       application:
@@ -1506,6 +1577,7 @@ id:
     tagging:
       tags: "Label"
       add_synonyms: "Menambahkan"
+      sort_by_count: "menghitung"
       sort_by_name: "nama"
       cancel_delete_unused: "Batal"
       filters:
@@ -1541,8 +1613,11 @@ id:
           never: "tidak pernah"
       dashboard:
         latest_version: "Terbaru"
+        new_features:
+          dismiss: "Bubar"
         last_checked: "Terakhir dicek"
         refresh_problems: "Segarkan"
+        moderators: "Moderator:"
         private_messages_title: "Pesan"
         report_filter_any: "apa saja"
         filter_reports: Filter laporan
@@ -1583,6 +1658,8 @@ id:
         show_details: Detil
         save: Simpan
         continue: Lanjutkan
+        scopes:
+          action: Aksi
       web_hooks:
         save: "Simpan"
         destroy: "Hapus"
@@ -1606,6 +1683,10 @@ id:
         operations:
           cancel:
             label: "Batal"
+      export_csv:
+        button_text: "Ekspor"
+      export_json:
+        button_text: "Ekspor"
       customize:
         preview: "pratinjau"
         save: "Simpan"
@@ -1624,22 +1705,28 @@ id:
           settings: "Pengaturan"
           collapse: Persempit
           upload: "Unggah"
+          direct_install_tip: "Apakah Anda yakin ingin memasang <strong>%{name}</strong> dari repositori yang tercantum di bawah ini?"
           about_theme: "Tentang"
           enable: "Aktifkan"
           disable: "Nonaktifkan"
           add: "Menambahkan"
+        colors:
+          undo: "batalkan perintah"
+          revert: "dibalik"
       email:
         title: "Surel"
         settings: "Pengaturan"
         sent: "Mengirim"
         received: "Menerima"
         rejected: "Ditolak"
+        time: "Waktu"
         user: "Pengguna"
         to_address: "Kepada Alamat"
         test_email_address: "alamat email uji coba"
         sent_test: "terkirim!"
         delivery_method: "Metode Pengiriman"
         refresh: "Segarkan"
+        sending_email: "Mengirimkan surel..."
         html: "html"
         incoming_emails:
           from_address: "Dari"
@@ -1686,7 +1773,9 @@ id:
             label: "Baru:"
             ip_address: "Alamat IP"
             add: "Menambahkan"
+            filter: "Cari"
       watched_words:
+        search: "cari"
         clear_filter: "Bersihkan"
         form:
           add: "Menambahkan"
@@ -1700,6 +1789,7 @@ id:
           new: "Baru"
           active: "Aktif"
           staff: "Staf"
+        approved: "Disetujui?"
         titles:
           active: "Pengguna Aktif"
           new: "Pengguna Baru"
@@ -1708,9 +1798,13 @@ id:
         check_email:
           title: "Tampilkan alamat email pengguna ini"
           text: "Tunjukkan"
+        check_sso:
+          text: "Tunjukkan"
       user:
         suspend_reason: "Alasan"
         silence_reason: "Alasan"
+        moderator: "Moderator?"
+        admin: "Admin?"
         show_admin_profile: "Admin"
         log_out: "Keluar"
         activity: Aktifitas
@@ -1731,7 +1825,7 @@ id:
           posts_read: "Tulisan dilihat"
           likes_given: "Likes Diberikan"
           likes_received: "Likes Diterima"
-        sso:
+        discourse_connect:
           external_username: "Nama Pengguna"
           external_name: "Nama"
           external_email: "Email"
@@ -1741,6 +1835,8 @@ id:
         delete: "Hapus"
         cancel: "Batal"
         options: "Pilihan"
+      site_text:
+        edit: "ubah"
       settings:
         none: "Tak ada"
       site_settings:
@@ -1756,6 +1852,7 @@ id:
           email: "Email"
           uncategorized: "Lainnya"
           tags: "Label"
+          search: "Cari"
           groups: "Grup"
         default_categories:
           modal_yes: "Ya"
@@ -1771,6 +1868,8 @@ id:
       emoji:
         uploading: "Mengunggah..."
         name: "Nama"
+      embedding:
+        edit: "ubah"
       permalink:
         topic_title: "Topik"
         category_title: "Kategori"
@@ -1786,6 +1885,7 @@ id:
       upload: "Unggah"
       uploading: "Mengunggah..."
       invites:
+        add_user: "menambahkan"
         roles:
           admin: "Admin"
           moderator: "Moderator"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 6254698808..a83d66bf02 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -113,7 +113,7 @@ it:
           one: "%{count} anno dopo"
           other: "%{count} anni dopo"
       previous_month: "Mese Precedente"
-      next_month: "Mese Successivo"
+      next_month: "Mese Prossimo"
       placeholder: data
     share:
       topic_html: 'Argomento: <span class="topic-title">%{topicTitle}</span>'
@@ -129,9 +129,9 @@ it:
       split_topic: "ha separato questo argomento %{when}"
       invited_user: "ha invitato %{who} %{when}"
       invited_group: "ha invitato %{who} %{when}"
-      user_left: "%{who}ha rimosso se stesso da questo messaggio %{when} "
+      user_left: "%{who} ha rimosso se stesso da questo messaggio %{when}"
       removed_user: "rimosso %{who} %{when}"
-      removed_group: "cancellato %{who} %{when}"
+      removed_group: "rimosso %{who} %{when}"
       autobumped: "riproposto automaticamente %{when}"
       autoclosed:
         enabled: "chiuso %{when}"
@@ -156,8 +156,11 @@ it:
         disabled: "ha rimosso questo annuncio il %{when}. Non apparirà più in cima ad ogni pagina."
       forwarded: "ha inoltrato l'email 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> ✨"
+    wizard_required: "Benvenuto al tuo nuovo sito 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."
+    software_update_prompt:
+      message: "Abbiamo aggiornato il sito, <span>si prega di aggiornare</span> o potrebbe verificarsi un comportamento imprevisto."
+      dismiss: "Ignora"
     bootstrap_mode_enabled:
       one: "Per rendere più facile il lancio del nuovo sito, sei in modalità bootstrap. A tutti i nuovi utenti verrà concesso il livello di esperienza 1 e verranno attivate le email di riepilogo giornaliere. Questa modalità verrà disattivata automaticamente quando %{count} utente si sarà unito."
       other: "Per rendere più facile il lancio del nuovo sito, sei in modalità bootstrap. A tutti i nuovi utenti verrà concesso il livello di esperienza 1 e verranno attivate le email di riepilogo giornaliere. Questa modalità verrà disattivata automaticamente quando %{count} utenti si saranno uniti."
@@ -169,6 +172,7 @@ it:
       regions:
         ap_northeast_1: "Asia Pacifico (Tokyo)"
         ap_northeast_2: "Asia Pacifico (Seoul)"
+        ap_east_1: "Asia Pacifico (Hong Kong)"
         ap_south_1: "Asia Pacifico (Mumbai)"
         ap_southeast_1: "Asia Pacifico (Singapore)"
         ap_southeast_2: "Asia Pacifico (Sidney)"
@@ -187,6 +191,7 @@ it:
         us_gov_west_1: "AWS GovCloud (US-West)"
         us_west_1: "Stati Uniti Ovest (California del Nord)"
         us_west_2: "Stati Uniti Ovest (Oregon)"
+    clear_input: "Cancella input"
     edit: "modifica titolo e categoria dell'argomento"
     expand: "Espandi"
     not_implemented: "Spiacenti! Questa funzione non è stata ancora implementata."
@@ -221,6 +226,9 @@ it:
     now: "proprio ora"
     read_more: "continua"
     more: "Più"
+    x_more:
+      one: "%{count} altro"
+      other: "%{count} altri"
     less: "Meno"
     never: "mai"
     every_30_minutes: "ogni 30 minuti"
@@ -249,8 +257,9 @@ it:
       moderators: "Moderatori"
       stat:
         all_time: "Sempre"
-        last_7_days: "Ultimi 7"
-        last_30_days: "Ultimi 30"
+        last_day: "Ultime 24 ore"
+        last_7_days: "Ultimi 7 giorni"
+        last_30_days: "Ultimi 30 giorni"
       like_count: "Mi piace"
       topic_count: "Argomenti"
       post_count: "Messaggi"
@@ -286,18 +295,6 @@ it:
       search_placeholder: "Cerca nei segnalibri per nome, titolo dell'argomento o contenuto del messaggio"
       search: "Cerca"
       reminders:
-        later_today: "Più tardi oggi"
-        next_business_day: "Il prossimo giorno lavorativo"
-        tomorrow: "Domani"
-        next_week: "La prossima settimana"
-        post_local_date: "Data nel post"
-        later_this_week: "Più tardi questa settimana"
-        start_of_next_business_week: "Lunedi"
-        start_of_next_business_week_alt: "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}"
@@ -312,9 +309,9 @@ it:
       new_private_message: "Nuovo messaggio privato in bozza"
       topic_reply: "Risposta in bozza"
       abandon:
-        confirm: "Hai già aperto una bozza in questo argomento. Sei sicuro di volerla abbandonare?"
-        yes_value: "Sì, abbandona"
-        no_value: "No, mantieni"
+        confirm: "Hai una bozza in corso per questo argomento. Cosa vorresti fare?"
+        yes_value: "Elimina"
+        no_value: "Riprendi la modifica"
     topic_count_latest:
       one: "Visualizza %{count} argomento nuovi o aggiornato"
       other: "Visualizza %{count} argomenti nuovi o aggiornati."
@@ -333,6 +330,7 @@ it:
     upload: "Carica"
     uploading: "In caricamento..."
     uploading_filename: "In caricamento: %{filename}..."
+    processing_filename: "In elaborazione: %{filename}..."
     clipboard: "clipboard"
     uploaded: "Caricato!"
     pasting: "Incollando..."
@@ -353,12 +351,12 @@ it:
       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"
+        placeholder: "digita qui il titolo dell'argomento, l'URL o l'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"
+        placeholder: "digita qui il titolo del messaggio, l'URL o l'id"
     review:
       order_by: "Ordina per"
       in_reply_to: "in risposta a"
@@ -411,6 +409,7 @@ it:
       topic: "Argomento:"
       filtered_topic: "Hai filtrato il contenuto revisionabile in un singolo Argomento"
       filtered_user: "Utente"
+      filtered_reviewed_by: "Revisionato da"
       show_all_topics: "mostra tutti gli argomenti"
       deleted_post: "(messaggio eliminato)"
       deleted_user: "(utente eliminato)"
@@ -421,10 +420,11 @@ it:
         email: "Email"
         name: "Nome"
         fields: "Campi"
+        reject_reason: "Motivo"
       user_percentage:
         summary:
-          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} segnalazione in totale)"
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} segnalazioni in totale)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (dell'ultima segnalazione)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (delle ultime %{count} segnalazioni)"
         agreed:
           one: "%{count}% a favore"
           other: "%{count}% a favore"
@@ -467,7 +467,8 @@ it:
           created_at_asc: "Creato il (inverso)"
         priority:
           title: "Priorità Minima"
-          low: "(qualsiasi)"
+          any: "(qualsiasi)"
+          low: "Bassa"
           medium: "Media"
           high: "Alta"
       conversation:
@@ -505,6 +506,8 @@ it:
           title: "Messaggio accodato"
         reviewable_user:
           title: "Utente"
+        reviewable_post:
+          title: "Messaggio"
       approval:
         title: "Messaggio Da Approvare"
         description: "Abbiamo ricevuto il tuo messaggio ma prima che appaia è necessario che venga approvato da un moderatore. Per favore sii paziente."
@@ -513,6 +516,39 @@ it:
           other: "Hai<strong>%{count}</strong> messaggi in attesa."
         ok: "OK"
       example_username: "nome utente"
+      reject_reason:
+        title: "Perché stai rifiutando questo utente?"
+        send_email: "Invia email di rifiuto"
+    relative_time_picker:
+      minutes:
+        one: "minuto"
+        other: "minuti"
+      hours:
+        one: "ora"
+        other: "ore"
+      days:
+        one: "giorno"
+        other: "giorni"
+      months:
+        one: "mese"
+        other: "mesi"
+      years:
+        one: "anno"
+        other: "anni"
+      relative: "Relativo"
+    time_shortcut:
+      later_today: "Più tardi oggi"
+      next_business_day: "Il prossimo giorno lavorativo"
+      tomorrow: "Domani"
+      next_week: "La prossima settimana"
+      post_local_date: "Data nel messaggio"
+      later_this_week: "Più tardi questa settimana"
+      start_of_next_business_week: "Lunedì"
+      start_of_next_business_week_alt: "Lunedì prossimo"
+      next_month: "Il prossimo mese"
+      custom: "Data e ora personalizzate"
+      relative: "Tempo relativo"
+      none: "Nessuno necessario"
     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>"
@@ -542,7 +578,7 @@ it:
       post_count_long: "Risposte Inviate"
       no_results: "Nessun risultato trovato."
       days_visited: "Visite"
-      days_visited_long: "Giorni Frequenza"
+      days_visited_long: "Giorni di Frequenza"
       posts_read: "Letti"
       posts_read_long: "Messaggi Letti"
       last_updated: "Ultimo aggiornamento:"
@@ -599,6 +635,10 @@ it:
             imap_ssl: "Usa SSL per IMAP"
             username: "Nome utente"
             password: "Password"
+          settings:
+            title: "Impostazioni"
+            allow_unknown_sender_topic_replies: "Consenti a mittenti sconosciuti di rispondere all'argomento."
+            allow_unknown_sender_topic_replies_hint: "Consente ai mittenti sconosciuti di rispondere agli argomenti di gruppo. Se non abilitato, le risposte da indirizzi email non già inclusi nella discussione IMAP o invitati all'argomento creeranno un nuovo argomento."
           mailboxes:
             synchronized: "Maibox sincronizzata"
             none_found: "Nessuna mailbox trovata in questo account e-mail."
@@ -700,7 +740,22 @@ it:
         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 "
+        make_primary: "Rendi Primario"
+        make_primary_description: "Rendi questo gruppo primario per <b>%{username}</b>"
+        remove_primary: "Rimuovi come primario"
+        remove_primary_description: "Rimuovi questo gruppo primario per <b>%{username}</b>"
+        remove_members: "Rimuovi Membri"
+        remove_members_description: "Rimuovi gli utenti selezionati da questo gruppo"
+        make_owners: "Rendi Proprietario"
+        make_owners_description: "Rendi gli utenti selezionati proprietari di questo gruppo"
+        remove_owners: "Rimuovi Proprietari"
+        remove_owners_description: "Rimuovi gli utenti selezionati dai proprietari di questo gruppo"
+        make_all_primary: "Rendi tutto primario"
+        make_all_primary_description: "Rendi questo gruppo il gruppo principale per tutti gli utenti selezionati"
+        remove_all_primary: "Rimuovi come primario"
+        remove_all_primary_description: "Rimuovi questo gruppo come primario"
         owner: "Proprietario"
+        primary: "Principale"
         forbidden: "Non puoi visualizzare i membri."
       topics: "Argomenti"
       posts: "Messaggi"
@@ -721,11 +776,11 @@ it:
           title: "Osservate"
           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"
+          title: "Osserva Primo Messaggio"
           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."
+          title: "Seguite"
+          description: "Verrai avvertito se qualcuno menziona il tuo @nome o ti risponde e verrà mostrato un conteggio delle nuove risposte."
         regular:
           title: "Normale"
           description: "Verrai avvertito se qualcuno menziona il tuo @nome o ti risponde."
@@ -772,13 +827,21 @@ it:
       posts: "Messaggi"
       topics: "Argomenti"
       latest: "Più recenti"
-      latest_by: "i più recenti di"
       toggle_ordering: "inverti l'ordinamento"
       subcategories: "Sottocategorie"
       muted: "Categorie silenziate"
       topic_sentence:
         one: "%{count} argomento"
         other: "%{count} argomenti"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "settimana"
+        month: "mese"
+      topic_stat_all_time:
+        one: "%{number} in totale"
+        other: "%{number} in totale"
       topic_stat_sentence_week:
         one: "%{count} nuovo argomento nell'ultima settimana."
         other: "%{count} nuovi argomenti nell'ultima settimana."
@@ -839,8 +902,24 @@ it:
         mute_option_title: "Non riceverai più notifiche relative a questo utente."
         normal_option: "Normale"
         normal_option_title: "Riceverai una notifica quando questo utente ti risponde, ti cita o ti menziona."
+      notification_schedule:
+        title: "Programmazione delle notifiche"
+        label: "Attiva pianificazione delle notifiche personalizzata"
+        tip: "Al di fuori di queste ore sarai impostato a 'non disturbare' automaticamente."
+        midnight: "Mezzanotte"
+        none: "Nessuno"
+        monday: "lunedi"
+        tuesday: "martedì"
+        wednesday: "mercoledì"
+        thursday: "giovedi"
+        friday: "venerdì"
+        saturday: "sabato"
+        sunday: "domenica"
+        to: "a"
       activity_stream: "Attività"
-      preferences: "Opzioni"
+      read: "Leggi"
+      read_help: "Argomenti letti di recente"
+      preferences: "Preferenze"
       feature_topic_on_profile:
         open_search: "Seleziona un nuovo argomento"
         title: "Seleziona un argomento"
@@ -848,7 +927,7 @@ it:
         save: "Salva"
         clear:
           title: "Pulisci"
-          warning: "Sei sicuro di voler cancellare l&#39;argomento in primo piano?"
+          warning: "Sei sicuro di voler cancellare l'argomento in primo piano?"
       use_current_timezone: "Usa Fuso Orario Corrente"
       profile_hidden: "Il profilo pubblico di questo utente è nascosto."
       expand_profile: "Espandi"
@@ -868,11 +947,18 @@ it:
         perm_denied_expl: "Hai negato il permesso per le notifiche. Autorizza le notifiche tramite le impostazioni del tuo browser."
         disable: "Disabilita Notifiche"
         enable: "Abilita Notifiche"
-        each_browser_note: "Nota: devi modificare questa impostazione per ogni browser che utilizzi."
+        each_browser_note: 'Nota: devi modificare questa impostazione su ogni browser che utilizzi. Tutte le notifiche verranno disabilitate quando in "non disturbare", indipendentemente da questa impostazione.'
         consent_prompt: "Desideri ricevere notifiche in tempo reale quando qualcuno risponde a un tuo messaggio?"
       dismiss: "Ignora"
       dismiss_notifications: "Ignora tutti"
       dismiss_notifications_tooltip: "Imposta tutte le notifiche non lette come lette "
+      no_messages_title: "Non hai messaggi"
+      no_messages_body: >
+        Hai la necessità di avere una conversazione privata con qualcuno? Invia un messaggio selezionando l'avatar e utilizzando il pulsante del messaggio %{icon}<br><br> Se hai bisogno di aiuto, puoi <a href='%{aboutUrl}'>inviare un messaggio a un membro dello staff</a>.
+      no_bookmarks_title: "Non hai ancora aggiunto alcun segnalibro"
+      no_bookmarks_body: >
+        Inizia ad aggiungere segnalibri ai messaggi con il bottone %{icon} e verranno elencati qui per una facile consultazione. Puoi anche impostare un promemoria!
+      no_notifications_title: "Non hai ancora notifiche"
       first_notification: "La tua prima notifica! Selezionala per iniziare."
       dynamic_favicon: "Mostra il contatore sull'icona del browser"
       skip_new_user_tips:
@@ -883,7 +969,7 @@ it:
       color_scheme_default_on_all_devices: "Imposta questa combinazione (o combinazioni) di colori come predefinita/e su tutti i miei dispositivi"
       color_scheme: "Combinazione di colori"
       color_schemes:
-        default_description: "Predefinito"
+        default_description: "Tema predefinito"
         disable_dark_scheme: "Come di norma"
         dark_instructions: "Puoi provare i colori del tema scuro attivando il tema scuro sul tuo dispositivo."
         undo: "Reimposta"
@@ -931,9 +1017,9 @@ it:
       watched_categories_instructions: "Osserverai automaticamente tutti gli argomenti in queste categorie. Riceverai notifiche su tutti i nuovi messaggi e argomenti e, accanto all'argomento, apparirà il conteggio dei nuovi messaggi."
       tracked_categories: "Seguite"
       tracked_categories_instructions: "Seguirai automaticamente tutti gli argomenti appartenenti a queste categorie. Accanto all'argomento comparirà il conteggio dei nuovi messaggi."
-      watched_first_post_categories: "Osservando Primo Messaggio"
+      watched_first_post_categories: "Osserva Primo Messaggio"
       watched_first_post_categories_instructions: "Riceverai la notifica per il primo messaggio di ogni nuovo argomento in queste categorie."
-      watched_first_post_tags: "Osservando Primo Messaggio"
+      watched_first_post_tags: "Osserva 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 riguardanti i contenuti di queste categorie, e non appariranno nelle pagine delle Categorie o dei Recenti."
@@ -987,6 +1073,7 @@ it:
         tags: "Etichette"
       preferences_nav:
         account: "Account"
+        security: "Sicurezza"
         profile: "Profilo"
         emails: "Email"
         notifications: "Notifiche"
@@ -1098,12 +1185,13 @@ it:
         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."
+        logo_small: "Logo piccolo del sito. Usato come impostazione predefinita."
       change_profile_background:
         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."
+        instructions: "Le immagini di sfondo saranno centrate e avranno una larghezza predefinita di 590px."
       change_featured_topic:
         title: "Argomento in primo piano"
         instructions: "Un collegamento a questo argomento sarà sulla tua scheda utente e profilo."
@@ -1111,7 +1199,7 @@ it:
         title: "Email"
         primary: "Email principale"
         secondary: "Email secondaria"
-        primary_label: "primario"
+        primary_label: "primaria"
         unconfirmed_label: "non confermata"
         resend_label: "Reinvia email di conferma"
         resending_label: "invio in corso..."
@@ -1120,14 +1208,15 @@ it:
         set_primary: "Imposta email principale"
         destroy: "Rimuovi email"
         add_email: "Aggiungi email alternativa"
-        sso_override_instructions: "L'email può essere aggiornata dal provider SSO."
+        auth_override_instructions: "L'email può essere aggiornata dal provider di autenticazione."
         no_secondary: "Nessuna email secondaria"
-        instructions: "Mai mostrato pubblicamente"
+        instructions: "Mai mostrata pubblicamente"
         admin_note: "Nota: un utente amministratore che modifica l'email di un utente non amministratore implica che l'utente abbia perso l'accesso al proprio account email originale, e quindi l'email di reimpostazione della password verrà inviata al nuovo indirizzo. L'email dell'utente non cambierà finché non completerà il processo di reimpostazione della password."
         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"
+        invite_auth_email_invalid: "La tua email di invito non corrisponde all'email autenticata da %{provider}"
         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."
@@ -1161,6 +1250,7 @@ it:
         checking: "Controllo la disponibilità del nome utente..."
         prefilled: "L'email corrisponde al nome utente registrato"
         required: "Inserisci un nome utente"
+        edit: "Modifica nome utente"
       locale:
         title: "Lingua dell'interfaccia"
         instructions: "Lingua dell'interfaccia utente. Cambierà quando aggiornerai la pagina."
@@ -1198,11 +1288,11 @@ it:
       enable_physical_keyboard: "Attiva supporto alla tastiera fisica su iPad"
       text_size:
         title: "Dimensioni del testo"
-        smallest: "Più piccolo"
+        smallest: "Piccolissimo"
         smaller: "Più piccolo"
         normal: "Normale"
         larger: "Più grande"
-        largest: "Massima"
+        largest: "Grandissimo"
       title_count_mode:
         title: "Il titolo della pagina di background mostra il conteggio di:"
         notifications: "Nuove notifiche"
@@ -1257,47 +1347,47 @@ it:
         after_10_minutes: "dopo 10 minuti"
       notification_level_when_replying: "Quando scrivo in un argomento, modifica il titolo dell'argomento a"
       invited:
-        search: "digita per cercare inviti..."
         title: "Inviti"
+        pending_tab: "In sospeso"
+        pending_tab_with_count: "In sospeso (%{count})"
+        expired_tab: "Scaduto"
+        expired_tab_with_count: "Scaduti (%{count})"
+        redeemed_tab: "Riscattato"
+        redeemed_tab_with_count: "Riscattato (%{count})"
+        invited_via: "Invito"
+        invited_via_link: "Link %{key} (%{count} / %{max} rimborsate)"
+        groups: "Gruppi"
+        topic: "Argomento"
+        sent: "Creato/Ultimo Invio"
+        expires_at: "Scadenza"
+        edit: "Modifica"
+        remove: "Rimuovi"
+        copy_link: "Ottieni link"
+        reinvite: "Reinvia Email"
+        reinvited: "Invito rinviato"
+        removed: "Rimosso"
+        search: "digita per cercare inviti..."
         user: "Utente Invitato"
-        sent: "Ultimo inviato"
         none: "Nessun invito da visualizzare."
         truncated:
           one: "Mostro il primo invito."
           other: "Mostro i primi %{count} inviti."
         redeemed: "Inviti Accettati"
-        redeemed_tab: "Riscattato"
-        redeemed_tab_with_count: "Riscattato (%{count})"
         redeemed_at: "Accettato"
         pending: "Inviti in sospeso"
-        pending_tab: "In sospeso"
-        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 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"
+        remove_all: "Rimuovi inviti scaduti"
+        removed_all: "Tutti gli inviti scaduti sono stati rimossi!"
+        remove_all_confirm: "Sei sicuro di voler rimuovere tutti gli inviti scaduti?"
         reinvite_all: "Rispedisci tutti gli Inviti"
         reinvite_all_confirm: "Sei sicuro di voler inviare nuovamente tutti gli inviti?"
-        reinvited: "Invito rinviato"
-        reinvited_all: "Tutti gli inviti sono stati rispediti!"
+        reinvited_all: "Tutti gli inviti sono stati spediti!"
         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
+        days_visited: "Giorni di Frequenza"
+        account_age_days: "Età dell'account in giorni"
         create: "Invita"
-        copy_link: "Mostra collegamento"
         generate_link: "Crea link di invito"
         link_generated: "Ecco il tuo link di invito!"
         valid_for: "Questo collegamento di invito è valido solamente per il seguente indirizzo email: %{email}"
@@ -1309,12 +1399,36 @@ it:
           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?"
+        invite:
+          new_title: "Crea invito"
+          edit_title: "Modifica invito"
+          instructions: "Condividi questo link per concedere istantaneamente l'accesso a questo sito:"
+          copy_link: "copia link"
+          expires_in_time: "Scade fra %{time}."
+          expired_at_time: "Scaduto alle %{time}."
+          show_advanced: "Mostra Opzioni Avanzate"
+          hide_advanced: "Nascondi opzioni avanzate"
+          restrict_email: "Limita l'invito a un solo indirizzo email"
+          max_redemptions_allowed: "Numero massimo di utilizzi:"
+          add_to_groups: "Aggiungi ai gruppi:"
+          invite_to_topic: "Invia all'argomento al primo accesso:"
+          expires_at: "Scadenza dopo:"
+          custom_message: "Messaggio personale facoltativo:"
+          send_invite_email: "Salva e invia Email"
+          save_invite: "Salva invito"
+          invite_saved: "Invito salvato."
+          invite_copied: "Link di invito copiato."
+          blank_email: "Collegamento di invito non copiato. L'indirizzo e-mail è obbligatorio."
         bulk_invite:
           none: "Nessun invito da visualizzare in questa pagina."
           text: "Inviti di gruppo"
+          instructions: |
+            <p>Invita un elenco di utenti per avviare rapidamente la tua comunità. Prepara un file CSV <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank"></a> contenente almeno una riga per indirizzo email degli utenti che desideri invitare. Le seguenti informazioni, separate da virgola, possono essere fornite se desideri aggiungere persone a gruppi o inviarle a un argomento specifico la prima volta che</p>
+            <pre>john @ smith.com, first_group_name; second_group_name, topic_id</pre>
+            <p>Per ogni indirizzo email inserito nel tuo file CSV verrà inviato un invito e potrai gestirlo in seguito.</p>
+          progress: "Caricamento %{progress}%..."
           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."
       password:
         title: "Password"
         too_short: "La password è troppo breve."
@@ -1378,6 +1492,8 @@ it:
       avatar:
         title: "Immagine Profilo"
         header_title: "profilo, messaggi, segnalibri e preferenze"
+        name_and_description: "%{name} - %{description}"
+        edit: "Modifica immagine profilo"
       title:
         title: "Titolo"
         none: "(nessuno)"
@@ -1405,7 +1521,7 @@ it:
         network_fixed: "Sembra essere tornato."
         server: "Codice di errore: %{status}"
         forbidden: "Non hai i permessi per visualizzarlo."
-        not_found: "Oops, l'applicazione ha cercato di caricare una URL inesistente."
+        not_found: "Ops, l'applicazione ha cercato di caricare una URL inesistente."
         unknown: "Qualcosa è andato storto."
       buttons:
         back: "Torna Indietro"
@@ -1415,7 +1531,7 @@ it:
       close: "chiudi"
       dismiss_error: "Ignora errore"
     close: "Chiudi"
-    assets_changed_confirm: "Questo sito è stato aggiornato. Aggiornare ora alla nuova versione?"
+    assets_changed_confirm: "Questo sito ha appena ricevuto un aggiornamento software. Vuoi scaricare l'ultima versione ora?"
     logout: "Sei stato disconnesso."
     refresh: "Ricarica"
     home: "Home"
@@ -1435,15 +1551,6 @@ it:
       exceeded_hour_MF: "<b>{relativeAge}</b> — <a href='{url}' target='_blank'>{rate, plural, one {# errore/ora} other {# errori/ora}}</a> ha superato il limite di impostazione del sito di {limit, plural, one {# errore/ora} other {# errori/ora}}."
       exceeded_minute_MF: "<b>{relativeAge}</b> — <a href='{url}' target='_blank'>{rate, plural, one {# errore/minuto} other {# errori/minuto}}</a> ha superato il limite di impostazione del sito di {limit, plural, one {# errore/minuto} other {# errori/minuto}}."
     learn_more: "per saperne di più..."
-    all_time: "totale"
-    all_time_desc: "totale argomenti creati"
-    year: "all'anno"
-    year_desc: "argomenti creati negli ultimi 365 giorni"
-    month: "al mese"
-    month_desc: "argomenti creati negli ultimi 30 giorni"
-    week: "a settimana"
-    week_desc: "argomenti creati negli ultimi 7 giorni"
-    day: "al giorno"
     first_post: Primo messaggio
     mute: Ignora
     unmute: Attiva
@@ -1461,13 +1568,15 @@ it:
       sign_up: "Iscriviti"
       hide_session: "Ricordamelo domani"
       hide_forever: "no grazie"
-      hidden_for_session: "Ok, te lo chiederò domani. Puoi anche usare 'Connetti' per creare un account."
+      hidden_for_session: "OK, te lo chiederemo domani. Puoi sempre utilizzare \"Accedi\" anche per creare un account."
       intro: "Ciao! Sembra che la discussione ti interessi, ma non hai ancora registrato un account."
       value_prop: "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:
+        one: "C'è <b>%{count}</b> risposta."
+        other: "Ci sono <b>%{count}</b> risposte."
+      description_time_MF: "{replyCount, plural, one {C'è <b>#</b> risposta} other {Ci sono <b>#</b> risposte}} con un tempo di lettura stimato di <b>{readingTime, plural, one {# minuto} other {# minuti}}</b>."
       enable: "Riassumi Questo Argomento"
       disable: "Mostra Tutti i Messaggi"
     deleted_filter:
@@ -1492,8 +1601,10 @@ it:
     trust_level: "Livello Esperienza"
     search_hint: "nome utente, email o indirizzo IP"
     create_account:
+      header_title: "Benvenuti!"
+      subheader_title: "Creiamo il tuo 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>."
-      title: "Crea Nuovo Account"
+      title: "Crea il tuo account"
       failed: "Qualcosa non ha funzionato. Forse questa email è già registrata, prova a usare il link di recupero password"
     forgot_password:
       title: "Reimposta Password"
@@ -1512,6 +1623,7 @@ it:
     email_login:
       link_label: "Inviami un link di accesso"
       button_label: "con email"
+      login_link: "Salta la password; inviami 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."
@@ -1523,7 +1635,9 @@ it:
       logging_in_as: Accesso come %{email}
       confirm_button: Completa l'accesso
     login:
-      title: "Connetti"
+      header_title: "Bentornato"
+      subheader_title: "Accedi al tuo account"
+      title: "Accedi"
       username: "Utente"
       password: "Password"
       second_factor_title: "Autenticazione a Due Fattori"
@@ -1537,8 +1651,8 @@ it:
       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"
+      security_key_support_missing_error: "Il tuo dispositivo o browser attuale non supporta l'uso di chiavi di sicurezza. Si prega di utilizzare un altro metodo."
+      email_placeholder: "Email / Nome Utente"
       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."
@@ -1605,7 +1719,6 @@ it:
       apple_international: "Apple/Internazionale"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (precedentemente EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1627,7 +1740,15 @@ it:
       topic_count:
         one: "%{count} argomento in questa categoria"
         other: "%{count} argomenti in questa categoria"
+      plus_subcategories_title:
+        one: "%{name} e una sottocategoria"
+        other: "%{name} e %{count} sottocategorie"
+      plus_subcategories:
+        one: "+ %{count} sottocategoria"
+        other: "+ %{count} sottocategorie"
     select_kit:
+      filter_by: "Filtra per: %{name}"
+      select_to_filter: "Seleziona un valore da filtrare"
       default_header_text: Selezione...
       no_content: Nessun risultato trovato
       filter_placeholder: Ricerca...
@@ -1643,13 +1764,13 @@ it:
         one: "La selezione deve contenere almeno %{count} carattere."
         other: "La selezione deve contenere almeno %{count} caratteri."
       components:
+        tag_drop:
+          filter_for_more: Filtra di più...
         categories_admin_dropdown:
           title: "Gestisci le categorie"
     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
@@ -1671,7 +1792,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: "Questo argomento è visibile solo a coloro che possono pubblicare bozze condivise."
       destination_category: "Categoria di destinazione"
       publish: "Pubblica Bozza Condivisa"
       confirm_publish: "Confermi la pubblicazione di questa bozza?"
@@ -1682,7 +1803,6 @@ it:
       options: "Opzioni"
       whisper: "sussurra"
       unlist: "invisibile"
-      blockquote_text: "Citazione"
       add_warning: "Questo è un avvertimento ufficiale."
       toggle_whisper: "Attiva/Disattiva Sussurri"
       toggle_unlisted: "Rendi Invisibile"
@@ -1704,10 +1824,16 @@ it:
       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:
+          one: "Il titolo deve contenere almeno %{count} carattere"
+          other: "Il titolo deve contenere almeno %{count} caratteri"
+        title_too_long:
+          one: "Il titolo deve contenere almeno %{count} carattere"
+          other: "Il titolo deve contenere almeno %{count} caratteri"
         post_missing: "Il messaggio non può essere vuoto"
-        post_length: "Il messaggio deve essere lungo almeno %{min} caratteri"
+        post_length:
+          one: "Il messaggio deve contenere almeno %{count} carattere"
+          other: "Il messaggio deve contenere almeno %{count} caratteri"
         try_like: "Hai provato ad usare il pulsante %{heart} ?"
         category_missing: "Devi scegliere una categoria"
         tags_missing:
@@ -1728,7 +1854,7 @@ it:
       title: "O premi Ctrl+Enter"
       users_placeholder: "Aggiunti un utente"
       title_placeholder: "In breve, di cosa tratta questo argomento?"
-      title_or_link_placeholder: "Digita il titolo, o incolla qui il collegamento "
+      title_or_link_placeholder: "Digita il titolo o incolla qui il collegamento"
       edit_reason_placeholder: "perché stai scrivendo?"
       topic_featured_link_placeholder: "Inserisci il collegamento mostrato con il titolo."
       remove_featured_link: "Rimuovi il collegamento dall'argomento."
@@ -1740,8 +1866,8 @@ it:
       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"
+      show_preview: "mostra anteprima"
+      hide_preview: "nascondi anteprima"
       quote_post_title: "Cita l'intero messaggio"
       bold_label: "G"
       bold_title: "Grassetto"
@@ -1754,8 +1880,8 @@ it:
       link_dialog_title: "Inserisci il collegamento"
       link_optional_text: "titolo opzionale"
       link_url_placeholder: "Incolla un URL o digita per cercare argomenti"
-      quote_title: "Citazione"
-      quote_text: "Citazione"
+      blockquote_title: "Citazione"
+      blockquote_text: "Citazione"
       code_title: "Testo preformattato"
       code_text: "rientra il testo preformattato di 4 spazi"
       paste_code_text: "digita o incolla il codice qui"
@@ -1780,7 +1906,7 @@ it:
         title: "Hai dimenticato di aggiungere i destinatari?"
         body: "Per ora il messaggio sarà inviato solo a te stesso!"
       slow_mode:
-        error: "Questo argomento è in modalità lenta. Al fine di promuovere una discussione riflessiva e ponderata puoi pubblicare solo una volta ogni %{duration}."
+        error: "Questo argomento è in modalità lenta. Hai già postato di recente, puoi postare di nuovo tra %{timeLeft}."
       admin_options_title: "Impostazioni dello staff opzionali per l'argomento"
       composer_actions:
         reply: Rispondi
@@ -1809,7 +1935,7 @@ it:
           label: "Nuovo Argomento"
         shared_draft:
           label: "Bozza Condivisa"
-          desc: "Prepara la bozza di un argomento che sarà visibile solo allo Staff"
+          desc: "Crea una bozza di argomento che sarà visibile solo agli utenti autorizzati"
         toggle_topic_bump:
           label: "Commuta riproposizione argomenti"
           desc: "Rispondi senza cambiare la data dell'ultima risposta"
@@ -1864,7 +1990,7 @@ it:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - completato"
       group_message_summary:
-        one: "%{count} messaggi in arrivo nella casella %{group_name}"
+        one: "%{count} messaggio 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}'
@@ -1909,14 +2035,13 @@ 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}"
       local_tip: "seleziona immagini dal tuo dispositivo"
-      local_tip_with_attachments: "seleziona immagini o file dal tuo dispositivo %{authorized_extensions}"
-      hint: "(puoi anche trascinarle nell'editor per caricarle)"
+      hint: "(puoi anche trascinare e rilasciare nell'editor per caricare)"
       hint_for_supported_browsers: "puoi fare il \"trascina e rilascia\" o incollare immagini nell'editor"
       uploading: "In caricamento"
       select_file: "Seleziona File"
       default_image_alt_text: immagine
+      supported_formats: "formati supportati"
     search:
       sort_by: "Ordina per"
       relevance: "Rilevanza"
@@ -1934,14 +2059,15 @@ it:
       full_page_title: "Cerca negli Argomenti o nei Messaggi"
       no_results: "Nessun risultato trovato."
       no_more_results: "Nessun altro risultato trovato."
-      post_format: "#%{post_number} da %{username}"
+      post_format: "n°%{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?"
+      start_new_topic: "Forse vuoi iniziare un nuovo argomento?"
       or_search_google: "O prova a cercare con Google invece:"
       search_google: "Prova a cercare con Google invece:"
       search_google_button: "Google"
+      search_button: "Cerca"
       context:
         user: "Cerca messaggi di @%{username}"
         category: "Cerca nella categoria #%{category}"
@@ -2007,7 +2133,7 @@ it:
     go_back: "indietro"
     not_logged_in_user: "pagina utente con riassunto delle attività correnti e delle impostazioni"
     current_user: "vai alla pagina utente"
-    view_all: "vedi tutto"
+    view_all: "visualizza tutti i %{tab}"
     topics:
       new_messages_marker: "ultima visita"
       bulk:
@@ -2019,16 +2145,18 @@ it:
         delete: "Elimina argomenti"
         dismiss: "Letti"
         dismiss_read: "Nascondi tutti i non letti"
-        dismiss_button: "Nascondi..."
-        dismiss_tooltip: "Nascondi solo i nuovi messaggi o smetti di seguire gli argomenti"
-        also_dismiss_topics: "Smetti di seguire questi argomenti così che non compariranno più come non letti per me"
+        dismiss_button: "Ignora…"
+        dismiss_tooltip: "Ignora solo i nuovi messaggi o smetti di seguire gli argomenti"
+        also_dismiss_topics: "Smetti di seguire questi argomenti in modo che non vengano più visualizzati come non letti per me"
         dismiss_new: "Ignora i nuovi messaggi"
         toggle: "commuta la selezione multipla degli argomenti"
         actions: "Azioni Multiple"
         change_category: "Imposta categoria"
         close_topics: "Chiudi argomenti"
         archive_topics: "Archivia argomenti"
+        move_messages_to_inbox: "Sposta nella posta in arrivo"
         notification_level: "Notifiche"
+        change_notification_level: "Modifica livello di notifica"
         choose_new_category: "Scegli la nuova categoria per gli argomenti:"
         selected:
           one: "Hai selezionato <b>%{count}</b> argomento."
@@ -2038,7 +2166,10 @@ it:
         choose_new_tags: "Scegli nuove etichette per i seguenti argomenti:"
         choose_append_tags: "Scegli nuove etichette da aggiungere a questi argomenti:"
         changed_tags: "Le etichette per quegli argomenti sono state cambiate."
-        remove_tags: "Rimuovi etichette"
+        remove_tags: "Rimuovi tutti i tag"
+        confirm_remove_tags:
+          one: "Tutti i tag verranno rimossi da questo argomento. Sei sicuro?"
+          other: "Tutti i tag verranno rimossi da <b>%{count}</b> argomenti. Sei sicuro?"
         progress:
           one: "Avanzamento: <strong>%{count}</strong> argomento"
           other: "Avanzamento: <strong>%{count}</strong> argomenti"
@@ -2054,7 +2185,7 @@ it:
         top: "Non ci sono argomenti di punta."
         educate:
           new: '<p>I tuoi nuovi argomenti appariranno qui. Di default, gli argomenti sono considerati nuovi e mostreranno un indicatore <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> se sono stati creati negli ultimi 2 giorni.</p><p>Visita le tue <a href="%{userPrefsUrl}">preferenze</a> per cambiarle.</p>'
-          unread: '<p>Qui compaiono gli argomenti che non hai letto.</p><p>Per difetto, gli argomenti sono considerati non letti e ne viene mostrato un conteggio <span class="badge new-posts badge-notification">1</span> se hai:</p><ul><li>Creato l''argomento</li><li>Risposto all''argomento</li><li>Letto l''argomento per più di 4 minuti</li></ul><p>Oppure se hai esplicitamente impostato l''argomento come Seguito o Osservato usando il pannello delle notifiche in fondo ad ogni argomento.</p><p>Puoi cambiare questa configurazione nelle tue <a href="%{userPrefsUrl}">preferenze</a>.</p>'
+          unread: "<p>I tuoi argomenti non letti appaiono qui.</p><p>Di default, gli argomenti sono considerati non letti e mostreranno conteggi non letti <span class=\"badge new-posts badge-notification\">1</span> se tu:</p><ul><li>Hai creato l'argomento</li><li>Hai risposto all'argomento</li><li>Leggi l'argomento per più di 4 minuti</li></ul><p>O hai esplicitamente impostato l'argomento su Seguito o Osservato tramite \U0001F514 in ogni argomento.</p><p>Visita le tue <a href=\"%{userPrefsUrl}\">preferenze</a> per cambiare queste impostazioni.</p>"
       bottom:
         latest: "Non ci sono altri argomenti più recenti."
         posted: "Non ci sono altri argomenti pubblicati."
@@ -2113,8 +2244,8 @@ it:
         title: "Argomento non trovato"
         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"
+        one: "hai %{count} messaggio non letto in questa discussione"
+        other: "hai %{count} messaggi 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"
@@ -2130,8 +2261,8 @@ it:
       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}."
-      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 {}}"
+      unread_indicator: "Nessun utente ha ancora letto l'ultimo post di questo Argomento."
+      read_more_MF: "{ UNREAD, plural, =0 {} one { C'è <a href='{basePath}/unread'># non letto</a> } other { Ci sono <a href='{basePath}/unread'># non letti</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {c'è } other{}} <a href='{basePath}/new'># nuovo</a> argomento} other { {BOTH, select, true{e } false {ci sono } other{}} <a href='{basePath}/new'># nuovi</a> argomenti} } restanti, o {CATEGORY, select, true {sfoglia 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
       browse_all_tags: Sfoglia tutte le etichette
@@ -2145,19 +2276,23 @@ it:
         select: "Gli utenti possono pubblicare in questo argomento solo una volta ogni:"
         description: "Per promuovere discussioni ponderate in argomenti in rapida evoluzione o controversi, gli utenti devono attendere prima di pubblicare nuovamente in questo argomento."
         save: "Abilita"
+        enabled_until: "Abilitato fino a:"
         remove: "Disattiva"
         hours: "Ore:"
         minutes: "Minuti:"
         seconds: "Secondi:"
         durations:
+          10_minutes: "10 minuti"
           15_minutes: "15 minuti"
+          30_minutes: "30 Minuti"
+          45_minutes: "45 Minuti"
           1_hour: "1 ora"
+          2_hours: "2 Ore"
           4_hours: "4 ore"
-          1_day: "1 giorno"
-          1_week: "1 settimana"
+          8_hours: "8 Ore"
+          12_hours: "12 Ore"
+          24_hours: "24 Ore"
           custom: "Durata personalizzata"
-      slow_mode_notice:
-        duration: "Devi aspettare %{duration} tra ciascun messaggio in questo argomento"
       topic_status_update:
         title: "Timer Argomento"
         save: "Imposta Timer"
@@ -2166,7 +2301,9 @@ it:
         remove: "Rimuovi Timer"
         publish_to: "Pubblica Su:"
         when: "Quando:"
-        time_frame_required: Per favore, seleziona un lasso di tempo
+        time_frame_required: "Per favore, seleziona un lasso di tempo"
+        min_duration: "La durata deve essere maggiore di 0"
+        max_duration: "La durata deve essere inferiore a 20 anni"
       auto_update_input:
         none: "Seleziona un lasso di tempo"
         now: "Adesso"
@@ -2175,13 +2312,13 @@ it:
         later_this_week: "Più tardi questa settimana"
         this_weekend: "Questo fine settimana"
         next_week: "La prossima settimana"
-        two_weeks: "Due Settimane"
+        two_weeks: "Due settimane"
         next_month: "Il prossimo mese"
         two_months: "Due mesi"
-        three_months: "Tre Mesi"
+        three_months: "Tre mesi"
         four_months: "Quattro mesi"
-        six_months: "Sei Mesi"
-        one_year: "Un Anno"
+        six_months: "Sei mesi"
+        one_year: "Un anno"
         forever: "Per sempre"
         pick_date_and_time: "Scegli la data e l'ora"
         set_based_on_last_post: "Chiudi in base all'ultimo messaggio"
@@ -2195,9 +2332,11 @@ it:
         title: "Chiudi Temporaneamente"
       auto_close:
         title: "Chiudi Automaticamente"
-        label: "Ore per la chiusura automatica:"
+        label: "Chiude automaticamente l'argomento dopo:"
         error: "Per favore inserisci un valore valido."
         based_on_last_post: "Non chiudere finché l'ultimo messaggio nell'argomento non ha questa anzianità."
+      auto_close_after_last_post:
+        title: "Chiudi automaticamente l'argomento dopo l'ultimo messaggio"
       auto_delete:
         title: "Elimina Automaticamente Argomento"
       auto_bump:
@@ -2210,7 +2349,7 @@ it:
         auto_open: "Questo argomento verrà automaticamente aperto %{timeLeft}"
         auto_close: "Questo argomento si chiuderà automaticamente in %{timeLeft}."
         auto_publish_to_category: "Questo argomento verrà pubblicato su <a href=%{categoryUrl}>#%{categoryName}</a>%{timeLeft}"
-        auto_close_based_on_last_post: "Questo argomento si chiuderà %{duration}dopo l'ultima risposta."
+        auto_close_after_last_post: "Questo Argomento si chiuderà %{duration} dopo l'ultima risposta."
         auto_delete: "Questo argomento verrà automaticamente cancellato %{timeLeft}."
         auto_bump: "Questo argomento sarà riproposto automaticamente %{timeLeft}."
         auto_reminder: "Questo argomento ti verrà ricordato %{timeLeft}."
@@ -2219,6 +2358,9 @@ it:
       auto_close_immediate:
         one: "L'ultimo messaggio nell'argomento ha già %{count} ora, per cui l'argomento verrà chiuso immediatamente."
         other: "L'ultimo messaggio nell'argomento ha già %{count} ore, per cui l'argomento verrà chiuso immediatamente."
+      auto_close_momentarily:
+        one: "L'ultimo messaggio dell'Argomento risale a %{count} ora fa, quindi l'Argomento verrà chiuso momentaneamente."
+        other: "L'ultimo messaggio dell'Argomento risale a %{count} ore fa, quindi l'Argomento verrà chiuso momentaneamente."
       timeline:
         back: "Indietro"
         back_description: "Torna indietro al tuo ultimo messaggio non letto"
@@ -2230,7 +2372,9 @@ it:
         go: "vai"
         jump_bottom: "salta all'ultimo messaggio"
         jump_prompt: "vai a..."
-        jump_prompt_of: "di %{count} messaggi"
+        jump_prompt_of:
+          one: "di %{count} messaggio"
+          other: "di %{count} messaggi"
         jump_prompt_long: "Salta a..."
         jump_bottom_with_number: "Passa al messaggio %{post_number}"
         jump_prompt_to_date: "ad oggi"
@@ -2242,6 +2386,7 @@ it:
         reasons:
           mailing_list_mode: "Hai la modalità mailing list abilitata, verrai notificato delle risposte a questo argomento via email."
           "3_10": "Riceverai notifiche perché stai osservando un'etichetta in questo argomento."
+          "3_10_stale": "Riceverai notifiche perché in passato stavi seguendo un’etichetta su questo argomento."
           "3_6": "Riceverai notifiche perché stai osservando questa categoria."
           "3_5": "Riceverai notifiche poiché hai iniziato ad osservare questo argomento automaticamente."
           "3_2": "Riceverai notifiche perché stai osservando questo argomento."
@@ -2257,14 +2402,14 @@ it:
           "0_2": "Stai ignorando tutte le notifiche di questo argomento."
           "0": "Stai ignorando tutte le notifiche di questo argomento."
         watching_pm:
-          title: "In osservazione"
+          title: "Osservato"
           description: "Riceverai una notifica per ogni nuova risposta a questo messaggio, e comparirà un conteggio delle nuove risposte."
         watching:
-          title: "In osservazione"
+          title: "Osservato"
           description: "Riceverai una notifica per ogni nuova risposta in questo argomento, e comparirà un conteggio delle nuove risposte."
         tracking_pm:
           title: "Seguito"
-          description: "Per questo messaggio apparirà un conteggio delle nuove risposte. Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde."
+          description: "Per questo messaggio personale apparirà un conteggio delle nuove risposte. Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde."
         tracking:
           title: "Seguito"
           description: "Per questo argomento apparirà un conteggio delle nuove risposte. Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde."
@@ -2315,6 +2460,15 @@ it:
         title: "Condividi"
         extended_title: "Condividi un collegamento"
         help: "condividi un collegamento a questo argomento"
+        instructions: "Condividi un link a questo argomento:"
+        copied: "Link all'argomento copiato."
+        notify_users:
+          title: "Notifica"
+          instructions: "Notifica i seguenti utenti su questo argomento:"
+          success:
+            one: "%{username} notificato su questo argomento."
+            other: "Notifica all'argomento inviata correttamente a tutti gli utenti."
+        invite_users: "Invita"
       print:
         title: "Stampa"
         help: "Apri una versione da stampabile di questo argomento"
@@ -2370,14 +2524,14 @@ it:
         username_placeholder: "nome utente"
         action: "Invia Invito"
         help: "invita altri su questo argomento via email o tramite notifiche"
-        to_forum: "Invieremo una breve email che permetterà al tuo amico di partecipare subito cliccando un collegamento, senza bisogno di connettersi."
-        sso_enabled: "Inserisci il nome utente della persona che vorresti invitare su questo argomento."
+        to_forum: "Invieremo una breve e-mail consentendo al tuo amico di iscriversi immediatamente facendo clic su un link."
+        discourse_connect_enabled: "Inserisci il nome utente della persona che vorresti invitare su questo argomento."
         to_topic_blank: "Inserisci il nome utente o l'indirizzo email della persona che vorresti invitare su questo argomento."
         to_topic_email: "Hai inserito un indirizzo email. Invieremo una email di invito che permetterà al tuo amico di rispondere subito a questo argomento."
         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>%{invitee}</b>. Ti avvertiremo quando l'invito verrà utilizzato. 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."
@@ -2435,7 +2589,7 @@ it:
         description: "Quando un argomento viene pubblicato come pagina, l'URL può essere condiviso e verrà visualizzato con uno stile personalizzato."
         slug: "Abbreviazione"
         public: "Pubblico"
-        public_description: "Le persone possono vedere la pagina anche se l&#39;argomento associato è privato."
+        public_description: "Le persone possono vedere la pagina anche se l'argomento associato è privato."
         publish_url: "La tua pagina è stata pubblicata su:"
         topic_published: "Il tuo argomento è stato pubblicato su:"
         preview_url: "La tua pagina sarà pubblicata su:"
@@ -2491,8 +2645,8 @@ it:
       edit_reason: "Motivo:"
       post_number: "messaggio %{number}"
       ignored: "Contenuto ignorato"
-      wiki_last_edited_on: "ultima modifica alla wiki"
-      last_edited_on: "ultima modifica al messaggio:"
+      wiki_last_edited_on: "wiki modificata l'ultima volta il %{dateTime}"
+      last_edited_on: "messaggio modificato l'ultima volta il %{dateTime}"
       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}:"
@@ -2515,14 +2669,23 @@ it:
       has_replies:
         one: "%{count} Risposta"
         other: "%{count} Risposte"
+      has_replies_count: "%{count}"
       unknown_user: "(utente sconosciuto / eliminato)"
       has_likes_title:
-        one: "Una persona ha messo \"Mi piace\" a questo messaggio"
+        one: "%{count} persona ha 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"
+      filtered_replies_hint:
+        one: "Visualizza questo messaggio e la sua risposta"
+        other: "Visualizza questo messaggio e le sue %{count} risposte"
+      filtered_replies_viewing:
+        one: "Visualizzazione di %{count} risposta a"
+        other: "Visualizzazione di %{count} risposte a"
+      in_reply_to: "Carica messaggio padre"
+      view_all_posts: "Visualizza tutti i messaggi"
       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."
@@ -2536,17 +2699,11 @@ it:
         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."
-      abandon_edit:
-        confirm: "Sei sicuro di voler annullare le modifiche?"
-        no_value: "No, mantieni"
-        no_save_draft: "No, salva in bozza"
-        yes_value: "Sì, scarta le modifiche"
-      abandon:
-        title: "Abbandona la bozza"
-        confirm: "Sicuro di voler abbandonare il tuo messaggio?"
-        no_value: "No, mantienilo"
-        no_save_draft: "No, salva in bozza"
-        yes_value: "Si, abbandona"
+      cancel_composer:
+        confirm: "Cosa vorresti fare con il tuo messaggio?"
+        discard: "Elimina"
+        save_draft: "Salva la bozza"
+        keep_editing: "Continua a modificare"
       via_email: "questo messaggio è arrivato via email"
       via_auto_generated_email: "questo messaggio è arrivato tramite una email auto generata"
       whisper: "questo messaggio è un sussurro privato per i moderatori"
@@ -2594,7 +2751,9 @@ it:
         unlock_post_description: "consenti all'autore di modificare questo messaggio"
         delete_topic_disallowed_modal: "Non hai il permesso di eliminare questo Argomento. Se davvero lo vuoi eliminare, segnalalo all'attenzione dei moderatori spiegando le tue motivazioni."
         delete_topic_disallowed: "non hai il permesso di eliminare questo argomento"
-        delete_topic_confirm_modal: "Questo argomento ha attualmente più di %{minViews} visualizzazioni e potrebbe essere una destinazione di ricerca popolare. Sei sicuro di voler eliminare completamente questo argomento, invece di modificarlo per migliorarlo?"
+        delete_topic_confirm_modal:
+          one: "Questo argomento ha attualmente più di %{count} visualizzazione e potrebbe essere una destinazione di ricerca popolare. Sei sicuro di voler eliminare completamente questo argomento, invece di modificarlo per migliorarlo?"
+          other: "Questo argomento ha attualmente più di %{count} visualizzazioni e potrebbe essere una destinazione di ricerca popolare. Sei sicuro di voler eliminare completamente questo argomento, invece di modificarlo per migliorarlo?"
         delete_topic_confirm_modal_yes: "Sì, elimina questo argomento"
         delete_topic_confirm_modal_no: "No, mantieni questo argomento"
         delete_topic_error: "Si è verificato un errore durante l'eliminazione di questo argomento"
@@ -2603,11 +2762,12 @@ it:
         change_post_notice: "Modifica note dello staff"
         delete_post_notice: "Elimina avviso dello staff"
         remove_timer: "rimuovi il timer"
+        edit_timer: "modifica timer"
       actions:
         people:
           like:
             one: "ha messo \"Mi piace\""
-            other: "ha messo \"Mi piace\""
+            other: "hanno messo \"Mi piace\""
           read:
             one: "ha letto"
             other: "ha letto"
@@ -2679,6 +2839,18 @@ it:
           edit_bookmark:
             name: "Modifica Segnalibro"
             description: "Modifica il nome del segnalibro o modifica la data e l'ora del promemoria"
+          pin_bookmark:
+            name: "Blocca il segnalibro"
+            description: "Blocca il segnalibro. Questo lo farà apparire in cima all'elenco dei segnalibri."
+          unpin_bookmark:
+            name: "Sblocca il segnalibro"
+            description: "Sblocca il segnalibro. Non apparirà più in cima all'elenco dei segnalibri."
+      filtered_replies:
+        viewing_posts_by: "Visualizzazione di %{post_count} messaggi di"
+        viewing_subset: "Alcune risposte sono compresse"
+        viewing_summary: "Visualizza un riepilogo di questo argomento"
+        post_number: "%{username}, messaggio n. %{post_number}"
+        show_all: "Mostra tutto"
     category:
       can: "può&hellip;"
       none: "(nessuna categoria)"
@@ -2729,6 +2901,17 @@ it:
       change_in_category_topic: "Modifica Descrizione"
       already_used: "Questo colore è già stato usato in un'altra categoria."
       security: "Sicurezza"
+      security_add_group: "Aggiungi un gruppo"
+      permissions:
+        group: "Gruppo"
+        see: "Vedi"
+        reply: "Rispondi"
+        create: "Crea"
+        no_groups_selected: "Nessun gruppo ha ottenuto l'accesso; questa categoria sarà visibile solo allo staff."
+        everyone_has_access: 'Questa categoria è pubblica, tutti possono vedere, rispondere e creare messaggi. Per limitare i permessi, rimuovere uno o più permessi concessi al gruppo "tutti".'
+        toggle_reply: "Attiva/Disattiva permesso di risposta"
+        toggle_full: "Attiva/Disattiva permesso di creazione"
+        inherited: 'Questo permesso è ereditato da "tutti"'
       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>.'
@@ -2744,6 +2927,7 @@ it:
       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"
+      allow_unlimited_owner_edits_on_first_post: "Consenti al proprietario modifiche illimitate al suo primo messaggio"
       subcategory_list_style: "Stile Lista Sottocategorie:"
       sort_order: "Lista Argomenti Ordinata Per:"
       default_view: "Lista Argomenti Predefinita:"
@@ -2766,20 +2950,20 @@ it:
       navigate_to_first_post_after_read: "Vai al primo messaggio dopo che gli argomenti vengono letti"
       notifications:
         watching:
-          title: "In osservazione"
+          title: "Osservata"
           description: "Osserverai automaticamente tutti gli argomenti in queste categorie. Riceverai notifiche per ogni nuovo messaggio in ogni argomento, e apparirà il conteggio delle nuove risposte."
         watching_first_post:
-          title: "Osservando il Primo Messaggio"
+          title: "Osserva Primo Messaggio"
           description: "Riceverai una notifica di nuovi argomenti in questa categoria, ma non per le risposte agli argomenti."
         tracking:
-          title: "Seguendo"
-          description: "Seguirai automaticamente tutti gli argomenti in tali categorie. Ti verrà inviata una notifica se qualcuno menziona il tuo @nome o ti risponde, e apparirà un conteggio delle nuove risposte."
+          title: "Seguita"
+          description: "Seguirai automaticamente tutti gli argomenti in questa categoria. Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde, e apparirà un conteggio delle nuove risposte."
         regular:
           title: "Normale"
           description: "Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde."
         muted:
           title: "Silenziato"
-          description: "Non ti verrà mai notificato nulla sui nuovi argomenti di queste categorie, e non compariranno nell'elenco dei Non letti."
+          description: "Non ti verrà mai notificato nulla sui nuovi argomenti di questa categoria, e non compariranno nell'elenco dei Non letti."
       search_priority:
         label: "Priorità della ricerca"
         options:
@@ -2814,6 +2998,7 @@ it:
       list_filters:
         all: "tutti gli argomenti"
         none: "nessuna sottocategoria"
+      colors_disabled: "Non puoi selezionare i colori perché lo stile della categoria è impostato su 'none'."
     flagging:
       title: "Grazie per aiutarci a mantenere la nostra comunità civile!"
       action: "Segnala Messaggio"
@@ -2831,7 +3016,8 @@ it:
       notify_action: "Messaggio"
       official_warning: "Avvertimento Ufficiale"
       delete_spammer: "Cancella Spammer"
-      delete_confirm_MF: "Stai per cancellare {POSTS, plural, one {<b>1</b> messaggio} other {<b>#</b> messaggi}} e {TOPICS, plural, one {<b>1</b> argomento} other {<b>#</b> argomenti}} di questo utente, rimuovere il suo account, bloccare l'iscrizione dall'indirizzo IP<b>{ip_address}</b>, e aggiungere il suo indirizzo email <b>{email}</b> ad un elenco nero permanente. Sei veramente sicuro che questo utente sia uno spammer?"
+      flag_for_review: "Coda per la revisione"
+      delete_confirm_MF: "Stai per cancellare {POSTS, plural, one {<b>#</b> messaggio} other {<b>#</b> messaggi}} e {TOPICS, plural, one {<b>#</b> argomento} other {<b>#</b> argomenti}} di questo utente, rimuovere il suo account, bloccare l'iscrizione dal suo indirizzo IP <b>{ip_address}</b> e aggiungere il suo indirizzo email <b>{email}</b> ad un elenco di indirizzi bloccati permanente. Sei sicuro che questo utente sia veramente uno spammer?"
       yes_delete_spammer: "Sì, cancella lo spammer"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(nascosto)"
@@ -2899,7 +3085,11 @@ it:
         help: "Questo argomento è un messaggio personale"
     posts: "Messaggi"
     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 {}}
+      Questo argomento ha {count, plural, one {# risposta} other {# risposte}} {ratio, select,
+        low {con un rapporto di 'mi piace' e risposte alto}
+        med {con un rapporto di 'mi piace' e risposte molto alto}
+        high {con un rapporto di 'mi piace' e risposte estremamente alto}
+        other {}}
     original_post: "Messaggio Originale"
     views: "Visite"
     views_lowercase:
@@ -2919,7 +3109,6 @@ it:
       one: "utente"
       other: "utenti"
     category_title: "Categoria"
-    history: "Storia"
     changed_by: "da %{author}"
     raw_email:
       title: "Email In Arrivo"
@@ -3007,6 +3196,7 @@ it:
       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.'
+    cannot_render_video: Questo video non può essere visualizzato perché il tuo browser non supporta il codec.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -3171,12 +3361,13 @@ it:
       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}"
+        one: "%{count} etichetta sarà eliminata: %{tags}"
         other: "%{count} etichette saranno eliminate: %{tags}"
       delete_unused_confirmation_more_tags:
         one: "%{tags} e %{count} altra"
         other: "%{tags} e %{count} altre"
       delete_no_unused_tags: "Non ci sono etichette inutilizzate."
+      tag_list_joiner: ", "
       delete_unused: "Elimina Etichette Inutilizzate"
       delete_unused_description: "Elimina tutte le etichette che non sono usate in alcun argomento o messaggio personale"
       cancel_delete_unused: "Annulla"
@@ -3190,11 +3381,11 @@ it:
           title: "In osservazione"
           description: "Visualizzerai automaticamente tutti gli Argomenti con questa Etichetta. Riceverai una notifica per tutti i nuovi messaggi e Argomenti. Inoltre, accanto all'Argomento apparirà il conteggio dei messaggi non letti e di quelli nuovi."
         watching_first_post:
-          title: "Osservando Primo Messaggio"
+          title: "Osserva Primo Messaggio"
           description: "Riceverai una notifica se saranno aperti nuovi Argomenti in questa Etichetta, ma non per le risposte agli Argomenti."
         tracking:
           title: "Seguiti"
-          description: "Seguirai automaticamente tutti gli argomenti con questa Etichetta. Accanto all'argomento apparirà un conteggio dei messaggi non letti e di quelli nuovi."
+          description: "Seguirai automaticamente tutti gli argomenti con questa etichetta. Accanto all'argomento apparirà un conteggio dei messaggi non letti e nuovi."
         regular:
           title: "Normale"
           description: "Riceverai una notifica se qualcuno menziona il tuo @nome o risponde al tuo messaggio."
@@ -3217,6 +3408,7 @@ it:
         everyone_can_use: "Le etichette possono essere usate da tutti"
         usable_only_by_groups: "Le etichette sono visibili a tutti, ma solo i gruppi seguenti possono usarle"
         visible_only_to_groups: "Le etichette sono visibili soltanto ai seguenti gruppi"
+        cannot_save: "Impossibile salvare il gruppo di etichette. Assicurati che ci sia almeno un'etichetta, che il nome del gruppo di etichette non sia vuoto e che sia selezionato un gruppo etichette per i permessi."
       topics:
         none:
           unread: "Non hai argomenti non letti."
@@ -3229,10 +3421,11 @@ it:
     invite:
       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"
-      approval_not_required: "L'utente sarà approvato automaticamente non appena accetterà questo invito."
+      approval_not_required: "L'utente verrà approvato automaticamente non appena accetterà questo invito."
       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."
+    forced_anonymous_login_required: "Il sito è sovraccarico e non può essere caricato in questo momento; riprova tra qualche minuto."
     footer_nav:
       back: "Indietro"
       forward: "Inoltra"
@@ -3241,6 +3434,17 @@ it:
     safe_mode:
       enabled: "La modalità sicura è attiva, per disattivarla chiudi il browser"
     image_removed: "(immagine rimossa)"
+    do_not_disturb:
+      title: "Non disturbare per..."
+      label: "Non disturbare"
+      remaining: "%{remaining} rimanenti"
+      options:
+        half_hour: "30 minuti"
+        one_hour: "un'ora"
+        two_hours: "due ore"
+        tomorrow: "Fino a domani"
+        custom: "Personalizzato"
+      set_schedule: "Imposta una pianificazione delle notifiche"
   admin_js:
     type_to_filter: "digita per filtrare..."
     admin:
@@ -3268,6 +3472,10 @@ it:
         installed_version: "Installata"
         latest_version: "Ultima"
         problems_found: "Alcuni consigli basati sulle attuali impostazioni del sito"
+        new_features:
+          title: "\U0001F381 Nuove funzionalità"
+          dismiss: "Ignora"
+          learn_more: "Scopri di più"
         last_checked: "Ultimo controllo"
         refresh_problems: "Aggiorna"
         no_problems: "Nessun problema rilevato."
@@ -3314,8 +3522,8 @@ it:
           last_7_days: "Ultimi 7"
           last_30_days: "Ultimi 30"
           all_time: "Di Sempre"
-          7_days_ago: "7 Giorni Fa"
-          30_days_ago: "30 Giorni Fa"
+          7_days_ago: "7 giorni fa"
+          30_days_ago: "30 giorni fa"
           all: "Tutti"
           view_table: "tabella"
           view_graph: "grafico"
@@ -3356,10 +3564,6 @@ it:
             available: "Il nome del gruppo è disponibile"
             not_available: "Il nome del gruppo non è disponibile"
             blank: "Il nome del Gruppo non può essere vuoto"
-        bulk_add:
-          title: "Aggiungi in blocco al Gruppo"
-          complete_users_not_added: "I seguenti utenti non sono stati aggiunti (assicurati che abbiano un account):"
-          paste: "Incolla un elenco di username ed email, uno per riga:"
         add_members:
           as_owner: "Imposta l'utente(i) come proprietario di questo gruppo"
         manage:
@@ -3386,7 +3590,9 @@ 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."
+            automatic_membership_user_count:
+              one: "%{count} utente ha i nuovi domini di email e verrà aggiunto al gruppo."
+              other: "%{count} utenti hanno i nuovi domini di 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"
@@ -3398,7 +3604,11 @@ it:
         group_members: "Membri del gruppo"
         delete: "Cancella"
         delete_confirm: "Cancellare questo gruppo?"
+        delete_with_messages_confirm:
+          one: "L'eliminazione di questo gruppo farà sì che %{count} messaggio sia orfano, e i membri del gruppo non ne avranno più accesso.<br><br>Sei sicuro?"
+          other: "L'eliminazione di questo gruppo farà sì che %{count} messaggi siano orfani, e i membri del gruppo non ne avranno più accesso.<br><br>Sei sicuro?"
         delete_failed: "Impossibile cancellare il gruppo. Se questo è un gruppo automatico, non può essere eliminato."
+        delete_automatic_group: Questo è un gruppo automatico e non può essere eliminato.
         delete_owner_confirm: "Rimuovere i privilegi per '%{username}'?"
         add: "Aggiungi"
         custom: "Personalizzato"
@@ -3460,9 +3670,13 @@ it:
               wordpress: Necessario al funzionamento del plugin wp-discourse di WordPress.
             users:
               bookmarks: Elenca i segnalibri utente. Restituisce i segnalibri quando si utilizza il formato ICS.
-              sync_sso: Sincronizza un utente usando SSO.
+              sync_sso: Sincronizza un utente utilizzando DiscourseConnect.
               show: Ottieni informazioni su un utente.
               check_emails: Elenca le email degli utenti.
+              update: Aggiorna le informazioni del profilo utente.
+              log_out: Disconnetti tutte le sessioni per un utente.
+              anonymize: Anonimizza gli account utente.
+              delete: Elimina account utente.
             email:
               receive_emails: Combina questo ambito con il destinatario della posta per elaborare le email in arrivo.
       web_hooks:
@@ -3526,6 +3740,12 @@ it:
         user_badge_event:
           name: "Evento Assegnazione Distintivo"
           details: "Quando un utente riceve un distintivo."
+        group_user_event:
+          name: "Raggruppa Evento Utente"
+          details: "Quando un utente viene aggiunto o rimosso da un gruppo."
+        like_event:
+          name: "Evento Mi Piace"
+          details: "Quando un utente mette Mi piace su un messaggio."
         delivery_status:
           title: "Stato di Consegna"
           inactive: "Non attivo"
@@ -3714,7 +3934,9 @@ it:
           convert: "Converti"
           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_component_alert_generic: "Sei sicuro di voler convertire 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_alert_generic: "Sei sicuro di voler convertire questo tema in componente?"
           convert_theme_tooltip: "Converti questo Tema in Componente"
           inactive_themes: "Temi non attivi:"
           inactive_components: "Componenti inutilizzati:"
@@ -3748,17 +3970,20 @@ it:
           included_components: "Includi Componenti"
           add_all: "Aggiungi tutti"
           import_web_tip: "Repository contenente il tema"
+          direct_install_tip: "Sei sicuro di voler installare <strong>%{name}</strong> dal deposito elencato di seguito?"
           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:"
+          public_key_note: "Dopo l’inserimento di una valida repository URL riservata, verrà generata e qui visualizzata una corrispondente chiave SSH."
           install: "Installa"
           installed: "Installata"
           install_popular: "Di successo"
           install_upload: "Dal tuo dispositivo"
           install_git_repo: "Da un repository git"
           install_create: "Crea nuovo"
+          duplicate_remote_theme: "Il componente «%{name}» è già installato, sei sicuro di volerne installare un'altra copia?"
           about_theme: "Informazioni su"
           license: "Licenza"
           version: "Versione:"
@@ -3788,6 +4013,7 @@ it:
             one: "Il tema è indietro di %{count} aggiornamento!"
             other: "Il tema è indietro di %{count} commit!"
           compare_commits: "(Vedi i nuovi commit)"
+          remote_theme_edits: "Se si desidera modificare questo tema, è necessario <a href='%{repoURL}' target='_blank'>inviare una modifica sul suo repository</a>"
           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:
@@ -3812,13 +4038,11 @@ it:
 
               Usa questo foglio di stile per aggiungere colori personalizzati all'elenco delle proprietà personalizzate CSS.
 
-              Esempio:
+              Ad esempio:
 
-              :root {
-              --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};
-              }
+              %{example}
 
-              E' fortemente raccomandato premettere i nomi delle proprietà per evitare conflitti con i plugin e/o il nucleo.
+              E' fortemente raccomandato assegnare un prefisso ai nomi delle proprietà per evitare conflitti con i plugin e/o il kernel.
           head_tag:
             text: "</head>"
             title: "HTML che sarà inserito prima del tag </head> "
@@ -3828,6 +4052,8 @@ it:
           yaml:
             text: "YAML"
             title: "Definisci le impostazioni del tema in formato YAML"
+          scss_color_variables_warning: "L'utilizzo delle variabili di colore SCSS di base nei temi è deprecato. Utilizzare invece le proprietà personalizzate CSS. Vedi <a href=\"https://meta.discourse.org/t/-/77551#color-variables-2\" target=\"_blank\">questa guida</a> per maggiori dettagli."
+          scss_warning_inline: "L'utilizzo delle variabili di colore SCSS di base nei temi è deprecato."
         colors:
           select_base:
             title: "Seleziona la paletta dei colori di base"
@@ -3911,8 +4137,8 @@ it:
         sending_test: "Invio email di prova in corso..."
         error: "<b>ERRORE</b> - %{server_error}"
         test_error: "C'è stato un problema nell'invio dell'email di test. Controlla nuovamente le impostazioni email, verifica che il tuo host non blocchi le connessioni email e riprova."
-        sent: "Inviato"
-        skipped: "Omesso"
+        sent: "Inviate"
+        skipped: "Omesse"
         bounced: "Ritornate"
         received: "Ricevute"
         rejected: "Rifiutate"
@@ -4099,6 +4325,7 @@ it:
             topic_unarchived: "argomento de-archiviato"
             post_staff_note_create: "aggiungi note dello staff"
             post_staff_note_destroy: "distruggi la nota dello staff"
+            delete_group: "elimina gruppo"
         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."
@@ -4146,31 +4373,31 @@ it:
         title: "Parole Osservate"
         search: "ricerca"
         clear_filter: "Pulisci"
-        show_words: "mostra le parole"
-        one_word_per_line: "Una parola per riga"
+        show_words:
+          one: "mostra %{count} parola"
+          other: "mostra %{count} parole"
         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"
+        clear_all_confirm: "Vuoi davvero cancellare tutte le parole che osservi per l'azione %{action}?"
         actions:
           block: "Blocca"
           censor: "Censura"
           require_approval: "Richiede Approvazione"
           flag: "Segnala"
+          replace: "Sostituisci"
+          tag: "Etichetta"
         action_descriptions:
           block: "Impedisci che i messaggi contenenti queste parole siano pubblicati. L'utente visualizzerà un messaggio di errore quando cercherà di pubblicare il messaggio."
           censor: "Consenti i messaggi contenenti queste parole, ma sostituiscile con caratteri che nascondono le parole censurate."
           require_approval: "I messaggi contenenti queste parole richiederanno l'approvazione dello staff prima di poter essere visualizzati."
           flag: "Consenti i messaggi contenenti queste parole, ma segnalale come inappropriate in modo che i moderatori possano revisionarle."
+          replace: "Sostituisci le parole nei messaggi con altre parole o link"
         form:
-          label: "Nuova Parola:"
-          placeholder: "parola completa o * come carattere jolly"
           placeholder_regexp: "espressione regolare"
+          replacement_label: "Sostituzione"
+          replacement_placeholder: "esempio o https://esempio.com"
+          tag_label: "Etichetta"
+          tag_placeholder: "tag1,tag2,tag3"
           add: "Aggiungi"
           success: "Successo"
           exists: "Già esistente"
@@ -4223,6 +4450,9 @@ it:
         check_email:
           title: "Mostra l'indirizzo email di questo utente"
           text: "Mostra"
+        check_sso:
+          title: "Rivela il payload SSO"
+          text: "Mostra"
       user:
         suspend_failed: "Si è verificato un errore sospendendo questo utente %{error}"
         unsuspend_failed: "Si è verificato un errore riabilitando questo utente %{error}"
@@ -4263,7 +4493,7 @@ it:
         clear_penalty_history:
           title: "Cancella la storia delle penalizzazioni"
           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?"
+        delete_all_posts_confirm_MF: "Stai per eliminare {POSTS, plural, one {# messaggio} other {# messaggi}} e {TOPICS, plural, one {# argomento} other {# argomenti}}. Sei sicuro?"
         silence: "Silenzio"
         unsilence: "Non in silenzio"
         silenced: "Silenziato?"
@@ -4312,6 +4542,9 @@ it:
         anonymize_yes: "Sì, rendi anonimo questo account"
         anonymize_failed: "Si è verificato un problema nel rendere anonimo l'account."
         delete: "Cancella utente"
+        delete_posts:
+          progress:
+            title: "Avanzamento dell'eliminazione dei messaggi"
         merge:
           button: "Unisci"
           prompt:
@@ -4323,6 +4556,8 @@ it:
             target_username_placeholder: "Nome utente del nuovo proprietario"
             transfer_and_delete: "Trasferisci ed Elimina @%{username}"
             cancel: "Annulla"
+          progress:
+            title: "Avanzamento unione"
           confirmation:
             title: "Trasferisci ed Elimina @%{username}"
             description: |
@@ -4415,16 +4650,16 @@ it:
           on_grace_period: "Al momento la promozione si trova nel periodo di grazia, non verrà degradato."
           locked_will_not_be_promoted: "Livello esperienza bloccato. Non verrà mai promosso."
           locked_will_not_be_demoted: "Livello esperienza bloccato. Non verrà mai degradato."
-        sso:
-          title: "Single Sign On"
-          external_id: "ID Esterno"
+        discourse_connect:
+          title: "DiscourseConnect Single Sign On"
+          external_id: "ID esterno"
           external_username: "Nome utente"
           external_name: "Nome"
           external_email: "Email"
-          external_avatar_url: "URL dell'Immagine Profilo"
-          last_payload: "Ultimo payload"
-          delete_sso_record: "Elimina record SSO"
-          confirm_delete: "Vuoi davvero eliminare questo registro di autenticazione unica (SSO)?"
+          external_avatar_url: "URL immagine profilo"
+          last_payload: "Ultimo Payload"
+          delete_sso_record: "Elimina Record SSO"
+          confirm_delete: "Sei sicuro di voler eliminare questo record DiscourseConnect?"
       user_fields:
         title: "Campi Utente"
         help: "Tutti i campi che i tuoi utenti possono riempire."
@@ -4455,6 +4690,10 @@ it:
           title: "Mostrare sulla scheda utente?"
           enabled: "mostrato sulla scheda utente"
           disabled: "non mostrato sulla scheda utente"
+        searchable:
+          title: "Ricercabile?"
+          enabled: "ricercabile"
+          disabled: "non ricercabile"
         field_types:
           text: "Campo Testo"
           confirm: "Conferma"
@@ -4469,6 +4708,8 @@ it:
         go_back: "Torna alla Ricerca"
         recommended: "Consigliamo di personalizzare il seguente testo per tue adattarlo alle necessità:"
         show_overriden: "Mostra solo le opzioni sovrascritte"
+        locale: "Lingua:"
+        fallback_locale_warning: "Stai modificando una varietà di %{fallback}. Gli utenti che scelgono %{fallback} come lingua dell'interfaccia non visualizzeranno le modifiche apportate."
         more_than_50_results: "Ci sono più di 50 risultati. Per favore, raffina la tua ricerca."
       settings:
         show_overriden: "Mostra solo i sovrascritti"
@@ -4476,6 +4717,10 @@ it:
         reset: "reimposta"
         none: "nessuno"
       site_settings:
+        emoji_list:
+          invalid_input: "L'elenco di emoji dovrebbe contenere solo nomi emoji validi, ad esempio: abbracci"
+          add_emoji_button:
+            label: "Aggiungi Emoji"
         title: "Impostazioni"
         no_results: "Nessun risultato trovato."
         more_than_30_results: "Ci sono più di 30 risultati. Per favore, raffina la tua ricerca o seleziona una Categoria."
@@ -4521,13 +4766,16 @@ it:
           groups: "Gruppi"
           dashboard: "Cruscotto"
         secret_list:
-          invalid_input: "I campi di input non possono essere vuoti o contenere il carattere barra verticale."
+          invalid_input: "I campi di inserimento 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"
         simple_list:
           add_item: "Aggiungi elemento..."
+        json_schema:
+          edit: Avvia Editor
+          modal_title: "Modifica %{name}"
       badges:
         title: Distintivi
         new_badge: Nuovo Distintivo
@@ -4564,8 +4812,12 @@ it:
         enabled: Attiva distintivo
         icon: Icona
         image: Immagine
+        graphic: Grafico
         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)"
+        image_help: "Il caricamento di un'immagine sovrascrive il campo icona se entrambi sono impostati."
+        select_an_icon: "Seleziona un'icona"
+        upload_an_image: "Carica un'immagine"
+        read_only_setting_help: "Personalizza testo"
         query: Query Distintivo (SQL)
         target_posts: Interroga i messaggi destinazione
         auto_revoke: Avvia l'istruzione di revoca giornalmente
@@ -4689,7 +4941,7 @@ it:
         other: "La tua comunità ha %{count} membri dello staff, te incluso."
       invites:
         add_user: "aggiungi"
-        none_added: "Non hai invitato nessuno dello staff. Sicuro di voler proseguire?"
+        none_added: "Non hai invitato nessuno a far parte dello staff. Vuoi proseguire lo stesso?"
         roles:
           admin: "Amministratore"
           moderator: "Moderatore"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 31fb8281ce..ad632e398c 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -25,7 +25,10 @@ ja:
         millions: "%{number}M"
     dates:
       time: "H:mm"
+      time_with_zone: "HH:mm (z)"
+      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日 H:mm"
@@ -94,6 +97,10 @@ ja:
       topic_html: 'トピック: <span class="topic-title">%{topicTitle}</span>'
       post: "投稿 #%{postNumber}"
       close: "閉じる"
+      twitter: "Twitterで共有"
+      facebook: "Facebookで共有"
+      email: "メールで送信"
+      url: "URLをコピーして共有"
     action_codes:
       public_topic: "トピックを公開しました: %{when} "
       private_topic: "このトピックを %{when} にダイレクトメッセージとして送る"
@@ -125,8 +132,14 @@ ja:
       banner:
         enabled: "この広告%{when}を作成して下さい。ユーザーが拒否するまで各ページの上部に表示されます。"
         disabled: "このバナー%{when}を削除すると、各ページの最上部に表示しません。"
+      forwarded: "上記のメールを転送しました"
+    topic_admin_menu: "トピックアクション"
     wizard_required: "Discourseへようこそ！ さあ<a href='%{url}' data-auto-route='true'>セットアップウィザード</a>から始めましょう"
     emails_are_disabled: "メールアドレスの送信は管理者によって無効化されています。全てのメール通知は行われません"
+    software_update_prompt:
+      dismiss: "閉じる"
+    bootstrap_mode_enabled:
+      other: "簡単にサイトを立ち上げられるように、ブートストラップモードにしました。\nすべての新規ユーザーはトラストレベル1となり、毎日のサマリーメールが有効な状態です。この設定は%{count}名のユーザーが参加した時に自動的に無効になります。"
     bootstrap_mode_disabled: "ブートストラップモードは24時間以内に無効になります。"
     themes:
       default_description: "デフォルト"
@@ -153,6 +166,7 @@ ja:
         us_gov_west_1: "AWS GovCloud (US-West)"
         us_west_1: "米西部(カリフォルニア北部)"
         us_west_2: "米西部(オレゴン)"
+    clear_input: "入力をクリア"
     edit: "このトピックのタイトル/カテゴリを編集"
     expand: "拡張"
     not_implemented: "この機能はまだ実装されていません！"
@@ -186,6 +200,8 @@ ja:
     now: "たった今"
     read_more: "もっと読む"
     more: "もっと読む"
+    x_more:
+      other: "%{count} リンク"
     less: "減らす"
     never: "決して"
     every_30_minutes: "30分毎"
@@ -213,8 +229,6 @@ ja:
       moderators: "モデレータ"
       stat:
         all_time: "すべて"
-        last_7_days: "過去7日間"
-        last_30_days: "過去30日間"
       like_count: "いいね！"
       topic_count: "トピック"
       post_count: "投稿"
@@ -228,30 +242,41 @@ ja:
       help:
         bookmark: "クリックするとトピックの最初の投稿をブックマークします"
         unbookmark: "クリックするとトピック内の全てのブックマークを削除します"
+        unbookmark_with_reminder: "クリックして、このトピックのすべてのブックマークとリマインダーを削除します。このトピックのリマインダーは %{reminder_at} です。"
     bookmarks:
+      created: "%{name} の投稿をブックマークしました。"
       not_bookmarked: "この投稿をブックマークする"
+      created_with_reminder: "%{name} の投稿を %{date} のリマインダー付きでブックマークしました。"
       remove: "ブックマークを削除"
+      delete: "ブックマークを削除"
+      confirm_delete: "このブックマークを削除してもよろしいですか？リマインダーも削除されます。"
       confirm_clear: "このトピックのすべてのブックマークをクリアしますか?"
       save: "保存"
+      no_timezone: 'まだタイムゾーンを設定していないためリマインダーを設定することはできません。<a href="%{basePath}/my/preferences/profile">プロフィール</a>にて設定してください。'
+      invalid_custom_datetime: "入力された日時が無効です。もう一度やり直してください。"
+      list_permission_denied: "このユーザーのブックマークを表示する権限がありません。"
+      no_user_bookmarks: "ブックマークした投稿はありません。ブックマークを使用すると、特定の投稿を素早く参照できます。"
+      auto_delete_preference:
+        label: "自動的に削除"
+        never: "一切なし"
+        when_reminder_sent: "リマインダーが送信されたとき"
+        on_owner_reply: "このトピックに返信した後"
+      search_placeholder: "名前、トピックタイトル、または投稿コンテンツでブックマークを検索する"
       search: "検索"
       reminders:
-        later_today: "今日中"
-        tomorrow: "明日"
-        next_week: "来週"
-        later_this_week: "今週中"
-        start_of_next_business_week: "月曜日"
-        start_of_next_business_week_alt: "来週の月曜日"
-        next_month: "来月"
+        today_with_time: "今日は %{time}"
+        tomorrow_with_time: "明日は %{time}"
+        at_time: "%{date_time} に"
+        existing_reminder: "このブックマークに %{at_date_time} に送信されるリマインダーが設定されています"
+    copy_codeblock:
+      copied: "コピーしました！"
     drafts:
       resume: "続ける"
       remove: "削除"
+      remove_confirmation: "この下書きを削除してもよろしいですか？"
       new_topic: "新しいトピックの下書き"
       new_private_message: "プライベートメッセージの下書き"
       topic_reply: "返信の下書き"
-      abandon:
-        confirm: "このトピックで別の下書きを開いています。これを破棄しますか?"
-        yes_value: "はい、破棄します"
-        no_value: "いいえ、保持します"
     topic_count_latest:
       other: "%{count}件の新規/更新トピックがあります。"
     topic_count_unread:
@@ -260,6 +285,7 @@ ja:
       other: "%{count} 件の新規トピックがあります。"
     preview: "プレビュー"
     cancel: "キャンセル"
+    deleting: "削除中..."
     save: "変更を保存"
     saving: "保存中..."
     saved: "保存しました"
@@ -284,8 +310,14 @@ ja:
       install_banner: "<a href>このデバイスに%{title}をインストール</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: "こちらへの回答"
@@ -297,8 +329,22 @@ ja:
         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: "他の人のレビューを防ぐために、この項目を強調することができます。"
+        claimed_by_you: "このアイテムは申し立て済みで、レビューできます。"
+        claimed_by_other: "この項目は <b>%{username}</b> のみがレビューできます。"
       claim:
         title: "トピックを要請する"
       unclaim:
@@ -309,6 +355,8 @@ ja:
         saved: "保存しました"
         save_changes: "変更を保存"
         title: "設定"
+        priorities:
+          title: "レビュー可能な優先順位"
       moderation_history: "ヒストリーを操作する"
       view_all: "すべて見る"
       grouped_by_topic: "トピックによってグループ分けされた"
@@ -318,15 +366,20 @@ ja:
         other: "このトピックは<b>%{count}</b>件の承認待ちのポストがあります"
       title: "レビュー"
       topic: "トピック:"
+      filtered_topic: "1 つのトピックでレビュー可能なコンテンツにフィルターを適用しました。"
       filtered_user: "ユーザー"
+      filtered_reviewed_by: "レビューアー："
       show_all_topics: "すべてのトピックを表示"
       deleted_post: "(削除されたポスト)"
       deleted_user: "(削除されたユーザー)"
       user:
+        bio: "略歴"
+        website: "ウェブサイト"
         username: "ユーザー名"
         email: "Eメール"
         name: "名前"
         fields: "広場"
+        reject_reason: "理由"
       user_percentage:
         agreed:
           other: "%{count}%同意"
@@ -336,6 +389,7 @@ ja:
           other: "%{count}%無投票"
       topics:
         topic: "トピック"
+        reviewable_count: "カウント"
         reported_by: "報告者："
         deleted: "[デリートされたトピック]"
         original: "(もとのトピック)"
@@ -359,14 +413,18 @@ ja:
         category: "カテゴリ"
         orders:
           score: "スコア"
+          score_asc: "スコア (昇順)"
           created_at: "作られた"
+          created_at_asc: "作成日時 (昇順)"
         priority:
           title: "最小の優先度"
+          any: "(任意)"
           medium: "普通"
           high: "高い"
       conversation:
         view_full: "すべての会話を見る"
       scores:
+        about: "このスコアは、レポーターの信頼レベル、以前のフラグの精度、およびレポートされるアイテムの優先度に基づいて計算されます。"
         score: "スコア"
         date: "日付"
         type: "タイプ"
@@ -376,21 +434,62 @@ ja:
       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: "ユーザー"
+        reviewable_post:
+          title: "投稿"
       approval:
         title: "この投稿は承認が必要です"
         description: "新しい投稿はモデレータによる承認が必要です。しばらくお待ち下さい。"
+        pending_posts:
+          other: "<strong>%{count}</strong> 個の投稿が保留中です。"
         ok: "OK"
+      example_username: "ユーザ名"
+      reject_reason:
+        title: "このユーザーを拒否する理由は何ですか？"
+        send_email: "拒否メールを送信"
+    relative_time_picker:
+      minutes:
+        other: "分"
+      hours:
+        other: "時間"
+      days:
+        other: "日"
+      months:
+        other: "月"
+    time_shortcut:
+      later_today: "今日中"
+      next_business_day: "翌営業日"
+      tomorrow: "明日"
+      next_week: "来週"
+      post_local_date: "投稿日時"
+      later_this_week: "今週中"
+      start_of_next_business_week: "月曜日"
+      start_of_next_business_week_alt: "来週の月曜日"
+      next_month: "来月"
+      custom: "日時を選択"
+      relative: "相対時間"
+      none: "必要ありません"
     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> を作成"
@@ -406,6 +505,7 @@ ja:
       sent_by_user: "<a href='%{userUrl}'>%{user}</a> が送信"
       sent_by_you: "<a href='%{userUrl}'>あなた</a> が送信"
     directory:
+      username: "ユーザ名"
       filter_name: "ユーザー名でフィルタ"
       title: "ユーザー"
       likes_given: "与えた"
@@ -422,6 +522,7 @@ ja:
       days_visited_long: "閲覧された日数"
       posts_read: "既読"
       posts_read_long: "投稿の閲覧数"
+      last_updated: "最終更新："
       total_rows:
         other: "%{count}人のユーザー"
     group_histories:
@@ -433,12 +534,22 @@ ja:
         remove_user_as_group_owner: "オーナーから削除する"
     groups:
       member_added: "追加済み"
+      member_requested: "リクエスト日時："
+      add_members:
+        title: "メンバーを %{group_name}に追加"
+        description: "カンマ区切りのリストに貼り付けることもできます。"
+        usernames: "ユーザー名またはメールアドレスを入力してください"
+        input_placeholder: "ユーザー名またはメール"
+        notify_users: "ユーザーに通知"
       requests:
         title: "リクエスト"
         reason: "理由"
         accept: "受け入れ"
         accepted: "受け入れられました"
         deny: "拒否"
+        denied: "拒否されました"
+        undone: "リクエストの取り消し"
+        handle: "メンバーシップリクエストを処理する"
       manage:
         title: "管理"
         name: "名前"
@@ -453,12 +564,46 @@ ja:
           notification: 通知
         email:
           title: "Eメール"
+          status: "IMAP経由で %{old_emails} / %{total_emails} のメールを同期しました。"
           credentials:
+            title: "資格情報"
+            smtp_server: "SMTPサーバー"
+            smtp_port: "SMTPポート"
+            smtp_ssl: "SMTP に SSL を使用する"
+            imap_server: "IMAP サーバ"
+            imap_port: "IMAP ポート"
+            imap_ssl: "IMAPにSSLを使用する"
             username: "ユーザー名"
             password: "パスワード"
+          settings:
+            title: "設定"
+            allow_unknown_sender_topic_replies: "送信者不明のトピックの返信を許可。"
+            allow_unknown_sender_topic_replies_hint: "不明な送信者がグループトピックに返信できるようにします。これが有効になっていない場合、IMAP電子メールスレッドにまだ含まれていない、またはトピックに招待されていない電子メールアドレスからの返信があった場合は、新しいトピックを作成します。"
+          mailboxes:
+            synchronized: "同期されたメールボックス"
+            none_found: "このメールアカウントにはメールボックスが見つかりませんでした。"
+            disabled: "無効"
         membership:
           title: メンバーシップ
           access: アクセス
+        categories:
+          title: カテゴリ
+          long_title: "カテゴリのデフォルト通知"
+          description: "ユーザーがこのグループに追加されると、ユーザーのカテゴリ通知設定はこれらのデフォルトに設定されます。その後、彼らはそれらを変更することができます。"
+          watched_categories_instructions: "自動的にカテゴリー内の全てのトピックをウォッチします。グループのメンバーに全ての新規投稿と新規トピックが通知されまた、新規投稿数がトピックの隣に表示されます。"
+          tracked_categories_instructions: "自動的にカテゴリー内の全てのトピックを追跡します。新規投稿数がトピックの隣に表示されます。"
+          watching_first_post_categories_instructions: "ユーザーにカテゴリー内の新規トピックに対する最初の投稿が通知されます。"
+          regular_categories_instructions: "これらのカテゴリがミュートされている場合、グループメンバーのミュートは解除されます。ユーザーがメンションされたり、誰かが返信したりすると、ユーザーに通知されます。"
+          muted_categories_instructions: "これらのカテゴリの新しいトピックについては通知されず、カテゴリや最新のページにも表示されません。"
+        tags:
+          title: タグ
+          long_title: "タグのデフォルト通知"
+          description: "ユーザーがこのグループに追加されると、そのユーザーのカテゴリ通知設定はこのグループのデフォルトに設定されます。この設定は、各自で変更することができます。"
+          watched_tags_instructions: "自動的にカテゴリー内の全てのトピックをウォッチします。グループのメンバーに全ての新規投稿と新規トピックが通知され、新規投稿数がトピックの隣に表示されます。"
+          tracked_tags_instructions: "これらのタグのすべてのトピックを自動的に追跡します。 新しい投稿の数がトピックの横に表示されます。"
+          watching_first_post_tags_instructions: "これらのタグが付加された新規トピック内の初めての投稿は通知されます。"
+          regular_tags_instructions: "これらのタグがミュートされている場合、グループメンバーにはミュートが解除されます。ユーザーが言及されたり、誰かがそれに返信したりすると、ユーザーに通知されます。"
+          muted_tags_instructions: "このタグが付いている新しいトピックについては、ユーザーには何も通知されず、最新のものには表示されません。"
         logs:
           title: "ログ"
           when: "いつ"
@@ -469,6 +614,10 @@ ja:
           details: "詳細"
           from: "発信元"
           to: "宛先"
+      permissions:
+        title: "権限"
+        none: "このグループに関連付けられているカテゴリはありません。"
+        description: "このグループのメンバはこれらのカテゴリにアクセスできます"
       public_admission: "ユーザーがグループへ自由に参加できるようにする (一般公開グループである必要があります)"
       public_exit: "ユーザーがグループから自由に離脱できるようにする"
       empty:
@@ -484,6 +633,8 @@ ja:
       leave: "脱退"
       request: "リクエスト"
       message: "メッセージ"
+      confirm_leave: "このグループから脱退してもよろしいですか？"
+      allow_membership_requests: "ユーザーがグループの所有者にメンバーシップリクエストを送信できるようにする (公開されているグループが必要)"
       membership_request_template: "メンバーシップリクエスト送信時に表示するカスタムテンプレート"
       membership_request:
         submit: "リクエストを送信"
@@ -505,6 +656,7 @@ ja:
         close_groups: "クローズされたグループ"
         automatic_groups: "自動で作成されたグループ"
         automatic: "自動"
+        closed: "閉鎖"
         public: "公開"
         private: "非公開"
         public_groups: "公開グループ"
@@ -527,6 +679,20 @@ ja:
         make_owner_description: "<b>%{username}</b> をこのグループのオーナーにする"
         remove_owner: "オーナーから削除"
         remove_owner_description: "<b>%{username}</b> をこのグループから削除します"
+        make_primary: "優先にする"
+        make_primary_description: "これを <b>%{username}</b>のプライマリグループにします"
+        remove_primary: "プライマリとして削除"
+        remove_primary_description: "<b>%{username}</b>のプライマリグループとしてこれを削除"
+        remove_members: "メンバーを削除する"
+        remove_members_description: "このグループから選択したユーザーを削除する"
+        make_owners: "オーナーにする"
+        make_owners_description: "選択したユーザーをこのグループのオーナーにする"
+        remove_owners: "オーナーから削除"
+        remove_owners_description: "このグループのオーナーとして、選択したユーザーを削除"
+        make_all_primary: "すべてをプライマリにする"
+        make_all_primary_description: "これを選択したすべてのユーザーのプライマリグループにします"
+        remove_all_primary: "プライマリとして削除"
+        remove_all_primary_description: "このグループをプライマリとして削除します"
         owner: "オーナー"
         forbidden: "メンバーの閲覧は許可されていません"
       topics: "トピック"
@@ -560,6 +726,7 @@ ja:
           title: "ミュート"
           description: "このグループのすべてのメッセージを通知しません。"
       flair_url: "アバター画像"
+      flair_upload_description: "20px x 20px以上の正方形の画像を使用してください。"
       flair_bg_color: "アバターの背景色"
       flair_bg_color_placeholder: "(オプション) HEXカラー値"
       flair_color: "アバター色"
@@ -567,6 +734,7 @@ ja:
       flair_preview_icon: "アイコンプレビュー"
       flair_preview_image: "画像プレビュー"
       flair_type:
+        icon: "アイコンを選択してください"
         image: "画像のアップロード"
     user_action_groups:
       "1": "「いいね！」 "
@@ -597,15 +765,19 @@ ja:
       posts: "投稿"
       topics: "トピック"
       latest: "最近の投稿"
-      latest_by: "最新投稿: "
       toggle_ordering: "カテゴリの並び替えモードを切り替え"
       subcategories: "サブカテゴリ:"
+      muted: "ミュートされたカテゴリ"
       topic_sentence:
         other: "%{count}トピック群"
+      topic_stat_unit:
+        week: "週"
+        month: "月"
       topic_stat_sentence_week:
         other: "先週 %{count} の新しいトピックが投稿されました。"
       topic_stat_sentence_month:
         other: "先月 %{count} 個の新しいトピックが投稿されました。"
+      n_more: "カテゴリ (%{count} 個以上)..."
     ip_lookup:
       title: IPアドレスを検索
       hostname: ホスト名
@@ -621,9 +793,11 @@ ja:
       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: "プロフィール"
@@ -639,22 +813,51 @@ ja:
       private_messages: "メッセージ"
       user_notifications:
         filters:
+          filter_by: "フィルタで絞り込む"
           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: "このユーザーがあなたに返信したり、引用したり、メンションすると通知されます。"
+      notification_schedule:
+        title: "通知スケジュール"
+        label: "カスタム通知スケジュールを有効にする"
+        tip: "これらの時間外は、自動的に「おやすみモード」に設定されます。"
+        midnight: "深夜"
+        none: "なし"
+        monday: "月曜日"
+        tuesday: "火曜日"
+        wednesday: "水曜日"
+        thursday: "木曜日"
+        friday: "金曜日"
+        saturday: "土曜日"
+        sunday: "日曜日"
+        to: "宛先"
       activity_stream: "アクティビティ"
+      read: "既読"
+      read_help: "最近読んだトピック"
       preferences: "設定"
       feature_topic_on_profile:
+        open_search: "新規トピックを選択"
+        title: "トピックを選択"
+        search_label: "タイトルでトピックを検索"
         save: "保存"
         clear:
           title: "クリア"
+          warning: "おすすめのトピックをクリアしてもよろしいですか？"
+      use_current_timezone: "現在のタイムゾーンを使用"
       profile_hidden: "このユーザーの公開プロフィールは非公開です"
       expand_profile: "開く"
       collapse_profile: "折りたたむ"
@@ -673,19 +876,37 @@ ja:
         perm_denied_expl: "通知へのアクセスが拒否されました。ブラウザの設定から通知を許可してください。"
         disable: "通知を無効にする"
         enable: "通知を有効にする"
-        each_browser_note: "注意: 利用するすべてのブラウザでこの設定を変更する必要があります"
+        each_browser_note: '注:この設定は、使用するすべてのブラウザーで変更する必要があります。この設定に関係なく、「おやすみモード」では、すべての通知が無効になります。'
         consent_prompt: "あなたの投稿に返信があったときライブ通知しますか？"
       dismiss: "閉じる"
       dismiss_notifications: "すべて既読にする"
       dismiss_notifications_tooltip: "全ての未読の通知を既読にします"
       first_notification: "最初の通知です! 始めるために選択してください。"
       dynamic_favicon: "ブラウザのアイコンに件数を表示する"
+      skip_new_user_tips:
+        description: "新規ユーザーのヒントとバッジをスキップする"
+        not_first_time: "初めてではありませんか？"
+        skip_link: "これらのヒントをスキップ"
       theme_default_on_all_devices: "これをすべてのデバイスのデフォルトテーマにする"
+      color_scheme_default_on_all_devices: "すべてのデバイスでデフォルトの配色を設定する"
+      color_scheme: "配色"
+      color_schemes:
+        default_description: "既定のテーマ"
+        disable_dark_scheme: "通常と同じ"
+        dark_instructions: "デバイスをダークモードに切り替えることで、ダークモードの配色をプレビューできます。"
+        undo: "リセット"
+        regular: "通常"
+        dark: "ダークモード"
+        default_dark_scheme: "(サイトのデフォルト)"
+      dark_mode: "ダークモード"
+      dark_mode_enable: "自動ダークモード配色を有効にする"
       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: "このユーザーはモデレータです"
@@ -694,6 +915,7 @@ ja:
       suspended_notice: "このユーザーは %{date} まで凍結状態です。"
       suspended_permanently: "このユーザーは凍結されています"
       suspended_reason: "理由: "
+      github_profile: "GitHub"
       email_activity_summary: "アクティビティの情報"
       mailing_list_mode:
         label: "メーリングリストモード"
@@ -724,6 +946,8 @@ ja:
       muted_categories: "通知しない"
       muted_categories_instructions: "これらのカテゴリの新しいトピックについては通知されず、カテゴリや最新のページにも表示されません。"
       muted_categories_instructions_dont_hide: "グループ内の新規トピックについては何も通知されません。"
+      regular_categories: "通常"
+      regular_categories_instructions: "これらのカテゴリは「最新」と「トップ」のトピックリストに表示されます。"
       no_category_access: "モデレータとしてカテゴリーへのアクセスが制限されたので、保存できませんでした。"
       delete_account: "アカウントを削除する"
       delete_account_confirm: "アカウントを削除してもよろしいですか？削除されたアカウントは復元できません。"
@@ -733,7 +957,12 @@ ja:
       admin_delete: "削除"
       users: "ユーザー"
       muted_users: "ミュート"
+      muted_users_instructions: "これらのユーザーからのすべての通知とPMを抑えます。"
+      allowed_pm_users: "許可"
+      allowed_pm_users_instructions: "これらのユーザーからのPMのみを許可します。"
+      allow_private_messages_from_specific_users: "特定のユーザーにのみ私へのパーソナルメッセージの送信を許可する"
       ignored_users: "無視する"
+      ignored_users_instructions: "これらのユーザーからのすべての投稿、通知、およびPMを抑えます。"
       tracked_topics_link: "詳しく見る"
       automatically_unpin_topics: "最後まで読んだら自動的に固定表示を解除する。"
       apps: "アプリ連携"
@@ -742,6 +971,7 @@ ja:
       api_approved: "承認されました:"
       api_last_used_at: "最終利用:"
       theme: "テーマ"
+      save_to_change_theme: '"%{save_text}" をクリックするとテーマが更新されます'
       home: "デフォルトホームページ"
       staged: "段階"
       staff_counters:
@@ -750,6 +980,7 @@ ja:
         deleted_posts: "削除された投稿"
         suspensions: "凍結"
         warnings_received: "警告"
+        rejected_posts: "拒否された投稿"
       messages:
         all: "すべて"
         inbox: "受信ボックス"
@@ -764,6 +995,7 @@ ja:
         tags: "タグ"
       preferences_nav:
         account: "アカウント"
+        security: "セキュリティ"
         profile: "プロフィール"
         emails: "メール"
         notifications: "お知らせ"
@@ -776,30 +1008,74 @@ ja:
         success: "(メールを送信しました)"
         in_progress: "(メールを送信中)"
         error: "(エラー)"
+        emoji: "絵文字をロックする"
         action: "パスワードリセット用メールを送信する"
         set_password: "パスワードを設定する"
         choose_new: "新規パスワードを決定"
         choose: "パスワードを決定"
       second_factor_backup:
+        title: "2要素バックアップコード"
         regenerate: "API キーを再生成"
         disable: "利用できません"
         enable: "利用できます"
         enable_long: "バックアップコードを有効にします"
+        manage:
+          other: "バックアップコードを管理してください。 <strong>%{count}</strong> 個のバックアップコードが残っています。"
+        copy_to_clipboard: "クリップボードにコピー"
         copy_to_clipboard_error: "クリップボードにコピーする際にエラーが発生しました"
         copied_to_clipboard: "クリップボードにコピーしました"
+        download_backup_codes: "バックアップコードのダウンロード"
+        remaining_codes:
+          other: "<strong>%{count}</strong> 個のバックアップコードが残っています。"
         use: "バックアップコードを使用"
+        enable_prerequisites: "バックアップコードを生成する前に、最初の2 要素方式を有効にする必要があります。"
         codes:
           title: "バックアップコードが作られました"
+          description: "これらのバックアップコードはそれぞれ1回しか使用できません。それらを安全でアクセス可能な場所に保管してください。"
       second_factor:
+        title: "2段階認証"
+        enable: "2要素認証の管理"
+        disable_all: "すべて無効"
+        forgot_password: "パスワードを忘れましたか？"
         confirm_password_description: "続行するにはパスワードを入力してください"
         name: "名前"
         label: "コード"
+        rate_limit: "別の認証コードを試す前に、しばらくお待ちください。"
+        enable_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" target="_blank">iOS</a>) でこのQRコードをスキャンし、認証コードを入力します。
+        disable_description: "アプリから認証コードを入力してください"
         show_key_description: "手動入力"
+        short_description: |
+          1回限りのセキュリティコードでアカウントを保護します。
+        extended_description: |
+          2要素認証は、パスワードに加えてワンタイムトークンを必要とすることで、アカウントに追加のセキュリティを追加します。 トークンは <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: "アカウントで2段階認証が有効になると、ソーシャルログインは無効になります。"
+        use: "認証アプリを使用"
+        enforced_notice: "このサイトにアクセスするには2段階認証を有効にする必要があります。"
         disable: "利用できません"
+        disable_confirm: "すべての2要素認証を無効にしてもよろしいですか？"
         save: "保存"
         edit: "編集"
+        edit_title: "認証器の編集"
+        edit_description: "認証器名"
+        enable_security_key_description: |
+          <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">ハードウェアセキュリティキー</a> 準備したら、下の[登録]ボタンを押します。
+        totp:
+          title: "トークンベースの認証"
+          add: "認証器の追加"
+          default_name: "自分の認証器"
+          name_and_code_required_error: "認証アプリから名前とコードを入力する必要があります。"
         security_key:
+          register: "登録"
+          title: "セキュリティキー"
+          add: "セキュリティキーの追加"
+          default_name: "メインセキュリティキー"
+          not_allowed_error: "セキュリティキーの登録プロセスがタイムアウトしたか、キャンセルされました。"
+          already_added_error: "このセキュリティキーはすでに登録されています。再度登録する必要はありません。"
+          edit: "セキュリティキーの編集"
           save: "保存"
+          edit_description: "セキュリティキー名"
+          name_required_error: "セキュリティキーの名前を指定する必要があります。"
       change_about:
         title: "プロフィールを変更"
         error: "変更中にエラーが発生しました。"
@@ -809,32 +1085,54 @@ ja:
         taken: "このユーザー名は既に使われています。"
         invalid: "このユーザー名は無効です。英数字のみ利用可能です。"
       add_email:
+        title: "メールアドレスを追加"
         add: "追加"
       change_email:
         title: "メールアドレスを変更"
         taken: "このメールアドレスは既に使われています。"
         error: "メールアドレス変更中にエラーが発生しました。既にこのアドレスが使われているのかもしれません。"
         success: "このアドレスにメールを送信しました。メールの指示に従って確認処理を行ってください。"
+        success_via_admin: "そのアドレスにメールを送信しました。ユーザーはメールの確認手順に従う必要があります。"
         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: "その他のメールアドレス"
         primary_label: "プライマリー"
+        unconfirmed_label: "未確認"
+        resend_label: "確認メールを再送信"
+        resending_label: "送信中..."
+        resent_label: "メールを送信しました"
         update_email: "メールアドレスを変更"
+        set_primary: "プライマリメールアドレスの設定"
+        destroy: "メールアドレスを削除"
+        add_email: "代替メールアドレスを追加"
+        auth_override_instructions: "メールは、外部認証サービスから更新できます。"
         no_secondary: "その他のメールアドレスはありません"
         instructions: "他人に公開はされません"
+        admin_note: "注：管理者ユーザーが別の非管理者ユーザーの電子メールを変更すると、そのユーザーは元の電子メールアカウントでアクセスできなくなるため、パスワードのリセットメールが新しいアドレスに送信されます。ユーザーのメールアドレスは、パスワードのリセットプロセスが完了するまで変更されません。"
         ok: "確認用メールを送信します"
+        required: "メールアドレスを入力してください"
         invalid: "正しいメールアドレスを入力してください"
         authenticated: "あなたのメールアドレスは %{provider} によって認証されています"
         frequency_immediately: "あなたがまだ読んでいない未送信分の内容について今すぐメールを送ります。"
@@ -846,10 +1144,15 @@ ja:
         revoke: "解除"
         cancel: "キャンセル"
         not_connected: "(接続されていない)"
+        confirm_modal_title: "%{provider} アカウントに接続"
+        confirm_description:
+          account_specific: "あなたの %{provider} アカウント '%{account_description}' は認証に使用されます。"
+          generic: "あなたの %{provider} アカウントは認証に使用されます。"
       name:
         title: "名前"
         instructions: "氏名(任意)"
         instructions_required: "氏名"
+        required: "名前を入力してください"
         too_short: "名前が短いです"
         ok: "問題ありません"
       username:
@@ -863,6 +1166,8 @@ ja:
         too_long: "ユーザー名が長すぎます"
         checking: "ユーザー名が利用可能か確認しています..."
         prefilled: "この登録ユーザー名にマッチするメールアドレスが見つかりました"
+        required: "ユーザー名を入力してください"
+        edit: "ユーザー名を編集"
       locale:
         title: "表示する言語"
         instructions: "ユーザインターフェイスの言語です。ページを再読み込みした際に変更されます。"
@@ -870,6 +1175,9 @@ ja:
         any: "任意"
       password_confirmation:
         title: "もう一度パスワードを入力してください。"
+      invite_code:
+        title: "招待コード"
+        instructions: "アカウント登録には招待コードが必要です"
       auth_tokens:
         title: "最近使用した端末"
         details: "詳細"
@@ -878,6 +1186,13 @@ ja:
         show_all: "すべてを見る(%{count})"
         show_few: "表示件数を少なくする"
         was_this_you: "これはあなたですか？"
+        was_this_you_description: "あなたではない場合は、パスワードを変更しログアウトすることをお勧めします。"
+        browser_and_device: "%{browser} on %{device}"
+        secure_account: "アカウントの保護"
+        latest_post: "最後の投稿…"
+        device_location: '<span class="auth-token-device">%{device}</span> &ndash; <span title="IP: %{ip}">%{location}</span>'
+        browser_active: '%{browser} | <span class="active">現在アクティブ</span>'
+        browser_last_seen: "%{browser} | %{date}"
       last_posted: "最後の投稿"
       last_emailed: "最終メール"
       last_seen: "最後のアクティビティ"
@@ -887,12 +1202,17 @@ ja:
       website: "ウェブサイト"
       email_settings: "メール"
       hide_profile_and_presence: "公開プロフィールとプレゼンス機能を非表示にする"
+      enable_physical_keyboard: "iPadで物理キーボードのサポートを有効にする"
       text_size:
         title: "テキストサイズ"
+        smallest: "最小"
         smaller: "小"
         normal: "デフォルト"
         larger: "大"
         largest: "最大"
+      title_count_mode:
+        notifications: "新しい通知"
+        contextual: "新しいページのコンテンツ"
       like_notification_frequency:
         title: "いいねされた時に通知"
         always: "常時"
@@ -943,40 +1263,51 @@ ja:
         after_10_minutes: "10分後"
       notification_level_when_replying: "トピックに投稿するときは、トピックを"
       invited:
-        search: "招待履歴を検索"
         title: "招待"
+        pending_tab: "保留中"
+        pending_tab_with_count: "保留中 (%{count})"
+        redeemed_tab: "確認済み"
+        redeemed_tab_with_count: "確認済み (%{count})"
+        invited_via: "招待"
+        groups: "グループ"
+        topic: "トピック"
+        expires_at: "有効期限"
+        edit: "編集"
+        remove: "削除"
+        reinvited: "再度招待しました"
+        search: "招待履歴を検索"
         user: "招待したユーザ"
         none: "表示する招待はありません。"
         truncated:
           other: "%{count} 件の招待を表示しています。"
         redeemed: "招待を確認する"
-        redeemed_tab: "確認済み"
-        redeemed_tab_with_count: "確認済み (%{count})"
         redeemed_at: "確認済み"
         pending: "保留中の招待"
-        pending_tab: "保留中"
-        pending_tab_with_count: "保留中 (%{count})"
         topics_entered: "閲覧したトピックの数"
         posts_read_count: "読んだ投稿"
         expired: "この招待の有効期限が切れました。"
-        rescind: "削除"
-        rescinded: "取り消された招待"
-        reinvite: "もう一度招待する"
-        reinvite_all: "全ての招待をもう一度"
+        remove_all: "期限切れの招待を削除"
+        removed_all: "期限切れの招待はすべて削除されました！"
+        remove_all_confirm: "期限切れの招待をすべて削除してもよろしいですか？"
         reinvite_all_confirm: "本当に全ての招待を再送したいですか?"
-        reinvited: "再度招待しました"
-        reinvited_all: "全ての招待をもう一度行いました"
         time_read: "読んだ時間"
         days_visited: "閲覧された日数"
         account_age_days: "アカウント有効日数"
-        links_tab: "リンク"
-        link_created_at: "作成者"
-        link_groups: グループ
+        create: "招待"
+        generate_link: "招待リンクの作成"
+        link_generated: "これがあなたの招待リンクです！"
         valid_for: "招待リンクはこのメールアドレスにだけ有効です。%{email}"
+        single_user: "メールで招待"
+        multiple_user: "リンクで招待"
         invite_link:
+          title: "招待リンク"
           success: "招待リンクが生成されました！"
+          error: "招待リンクの生成中にエラーが発生しました"
+          max_redemptions_allowed_label: "このリンクを使用して登録できる人数は何人ですか？"
+          expires_at: "この招待リンクの有効期限はいつまでですか？"
         bulk_invite:
-          success: "ファイルは無事にアップロードされました。処理が完了したらメッセージでお知らせします。"
+          none: "このページに表示する招待はありません。"
+          text: "一括招待"
           error: "申し訳ありません、ファイルはCSV形式である必要があります。"
       password:
         title: "パスワード"
@@ -986,6 +1317,7 @@ ja:
         same_as_email: "パスワードとメールアドレスが一致しています"
         ok: "最適なパスワードです。"
         instructions: "最低 %{count} 文字以上"
+        required: "パスワードを入力してください"
       summary:
         title: "サマリー"
         stats: "統計"
@@ -1032,6 +1364,7 @@ ja:
       avatar:
         title: "プロフィール画像"
         header_title: "プロフィール、メッセージ、ブックマーク、設定"
+        edit: "プロフィール画像の編集"
       title:
         title: "肩書き"
         none: "（なし）"
@@ -1067,8 +1400,8 @@ ja:
         fixed: "ページロード"
     modal:
       close: "閉じる"
+      dismiss_error: "エラーを閉じる"
     close: "閉じる"
-    assets_changed_confirm: "Discourseがアップデートされました。ページを更新して最新のバージョンにしますか？"
     logout: "ログアウトしました"
     refresh: "更新"
     home: "ホーム"
@@ -1076,21 +1409,27 @@ ja:
       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, other { <strong>#</strong> トピック}} と {currentPosts, plural, other {<strong>#</strong> 投稿}} があります。訪問者はよく読んで返信する必要があります。最低でも {requiredTopics, plural, other {<strong>#</strong> トピック}} と {requiredPosts, plural, other {<strong>#</strong> 投稿}} をおすすめします。このメッセージを見ることができるのはスタッフだけです。
+    too_few_topics_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">議論を開始しましょう！</a> そこには {currentTopics, plural, other { <strong>#</strong> トピック}} があります。訪問者はよく読んで返信する必要があります。少なくとも {requiredTopics, plural, other {<strong>#</strong> トピック}}をおすすめします。このメッセージを見ることができるのはスタッフだけです。
+    too_few_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">議論を始めましょう！</a> そこには {currentPosts, plural, other { <strong>#</strong> 投稿}}があります。訪問者はよく読んで返信する必要があります。少なくとも {requiredPosts, plural, other {<strong>#</strong> 投稿}}をおすすめします。このメッセージを見ることができるのはスタッフだけです。
+    logs_error_rate_notice:
+      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, other {# エラー/時間}}</a> がサイト設定制限の {limit, plural, other {# エラー/時間}} に達しました。"
+      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, other {# エラー/分}}</a> がサイト設定制限の {limit, plural, other {#エラー/分}} に達しました 。"
+      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, other {# エラー/時間}}</a>サイト設定制限の {limit, plural, other {# エラー/時間}} を超えました 。"
+      exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, other {＃エラー/分}}</a> サイト設定制限の {limit, plural, other {＃エラー/分}} 超えました。"
     learn_more: "より詳しく..."
-    all_time: "合計"
-    all_time_desc: "作成されたトピックの総数"
-    year: "年"
-    year_desc: "過去一年間に投稿されたトピック"
-    month: "月"
-    month_desc: "過去30日間に投稿されたトピック"
-    week: "週"
-    week_desc: "過去7日間に投稿されたトピック"
-    day: "日"
     first_post: 最初の投稿
     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: 返信
@@ -1098,13 +1437,12 @@ ja:
       sign_up: "新しいアカウントを作成"
       hide_session: "明日私に思い出させてください。"
       hide_forever: "いいえ、結構です"
-      hidden_for_session: "わかりました、明日お尋ねします。あなたは「ログイン」からいつでもアカウントを作成できます。"
       intro: "こんにちは！ :heart_eyes: エンジョイしていますね。 ですが、サインアップしていないようです。"
       value_prop: "アカウントを作成した後、いま読んでいるページへ戻ります。また、新しい投稿があった場合はこことメールにてお知らせします。 いいね！を使って好きな投稿をみんなに教えましょう。 :heartbeat:"
     summary:
       enabled_description: "トピックのまとめを表示されています。"
-      description: "<b>%{replyCount}</b>件の返信があります。"
-      description_time: "<b>%{replyCount}</b> 件の返信があります。 概ね <b>%{readingTime} 分</b>で読める文量です。"
+      description:
+        other: "<b>%{count}</b>件の返信があります。"
       enable: "このトピックを要約する"
       disable: "すべての投稿を表示する"
     deleted_filter:
@@ -1114,6 +1452,10 @@ ja:
       disable: "削除された投稿を表示する"
     private_message_info:
       title: "メッセージ"
+      invite: "他の人を招待する..."
+      edit: "追加、削除"
+      remove: "削除..."
+      add: "追加..."
       leave_message: "本当にメッセージから離れますか？"
       remove_allowed_user: "このメッセージから %{name} を削除してもよろしいですか？"
       remove_allowed_group: "このメッセージから %{name} を削除してもよろしいですか？"
@@ -1125,6 +1467,8 @@ ja:
     trust_level: "トラストレベル"
     search_hint: "ユーザ名、メールアドレスまたはIPアドレス"
     create_account:
+      header_title: "ようこそ！"
+      subheader_title: "アカウントを作成しましょう"
       disclaimer: "登録すると<a href='%{privacy_link}' target='blank'>プライバシーポリシー</a>と<a href='%{tos_link}' target='blank'>利用規約</a>に同意することになります。"
       title: "アカウントの作成"
       failed: "エラーが発生しました。既にこのメールアドレスは使用中かもしれません。「パスワードを忘れました」リンクを試してみてください"
@@ -1135,23 +1479,46 @@ ja:
       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>"
       button_ok: "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: "ログイン"
+      subheader_title: "アカウントにログインする"
       username: "ユーザ名"
       password: "パスワード"
+      second_factor_title: "2要素認証"
+      second_factor_description: "アプリから認証コードを入力してください:"
+      second_factor_backup: "バックアップ コードを使用してログイン"
+      second_factor_backup_title: "2段階バックアップ"
       second_factor_backup_description: "バックアップコードを入力: "
-      email_placeholder: "メールアドレスかユーザ名"
+      second_factor: "認証アプリを使用してログイン"
+      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: "お使いのブラウザでCookieが無効になっているようです。最初に有効にしないとログインできない場合があります。"
       rate_limit: "しばらく待ってから再度ログインをお試しください。"
       blank_username: "あなたのメールアドレスかユーザー名を入力してください。"
       blank_username_or_password: "あなたのメールアドレスかユーザ名、そしてパスワードを入力して下さい。"
@@ -1163,8 +1530,10 @@ ja:
       awaiting_approval: "アカウントはまだスタッフに承認されていません。承認され次第メールにてお知らせいたします。"
       requires_invite: "申し訳ありませんが、このフォーラムは招待制です。"
       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: "アクティベーションメールの再送"
       change_email: "メールアドレスの変更"
       provide_new_email: "新しいメールアドレスを設定します。このあと、確認のメールを送信します。"
@@ -1189,8 +1558,15 @@ ja:
       github:
         name: "GitHub"
         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: "このメールアドレスを使ってソーシャルログインすることも可能です。"
@@ -1198,6 +1574,7 @@ ja:
       accept_invite: "招待に応じる"
       success: "あなたのアカウントは作成されて、ログインされました。"
       name_label: "氏名"
+      password_label: "パスワード"
       optional_description: "(任意)"
     password_reset:
       continue: "%{site_name} に進む"
@@ -1213,13 +1590,25 @@ ja:
       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: "Enter"
     conditional_loading_section:
       loading: 読み込み中...
+    category_row:
+      topic_count:
+        other: "このカテゴリ内の %{count} 件のトピック"
+      plus_subcategories_title:
+        other: "%{name} および %{count} 個のサブカテゴリ"
+      plus_subcategories:
+        other: "+ %{count} 個のサブカテゴリ"
     select_kit:
+      filter_by: "%{name} でフィルター"
+      select_to_filter: "フィルタする値を選択"
       default_header_text: 選択...
       no_content: 一致する項目が見つかりませんでした
       filter_placeholder: 検索...
@@ -1229,11 +1618,21 @@ ja:
         other: "%{count}アイテムまで選択できます。"
       min_content_not_reached:
         other: "少なくとも%{count}アイテムを選択してください。"
+      invalid_selection_length:
+        other: "選択は%{count}文字以上必要です。"
+      components:
+        categories_admin_dropdown:
+          title: "カテゴリの管理"
     date_time_picker:
       from: 発信元
       to: 宛先
     emoji_picker:
       filter_placeholder: 絵文字を探す
+      smileys_&_emotion: スマイリーと感情
+      people_&_body: 人と体
+      animals_&_nature: 動物と自然
+      food_&_drink: 食べ物と飲み物
+      travel_&_places: 旅行と場所
       activities: 活動
       objects: オブジェクト
       symbols: シンボル
@@ -1247,6 +1646,10 @@ ja:
       dark_tone: ダークスキントーン
       default: カスタム絵文字
     shared_drafts:
+      title: "共有ドラフト"
+      notice: "このトピックは、共有の下書きを公開できるユーザーのみに表示されます。"
+      destination_category: "宛先カテゴリ"
+      publish: "共有ドラフトの公開"
       confirm_publish: "この下書きを公開してもよろしいですか？"
       publishing: "トピック公開中..."
     composer:
@@ -1255,7 +1658,6 @@ ja:
       options: "オプション"
       whisper: "ささやき"
       unlist: "リストから非表示"
-      blockquote_text: "引用"
       add_warning: "これは運営スタッフからの警告です。"
       toggle_whisper: "ささやき機能の切り替え"
       toggle_unlisted: "表示非表示を切り替える"
@@ -1263,26 +1665,41 @@ ja:
       saved_local_draft_tip: "ローカルに保存しました"
       similar_topics: "このトピックに似ているものは..."
       drafts_offline: "オフラインの下書き"
+      edit_conflict: "競合の編集"
+      group_mentioned_limit:
+        other: "<b>警告！</b> <a href='%{group_link}'>%{group}</a>にメンションしましたが、このグループには、管理者が設定したメンション制限の %{count} 人のユーザーよりも多くのメンバーがいます。そのため誰にも通知されません。"
       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_length: "投稿は%{min}文字以上必要です。"
+        title_too_short:
+          other: "タイトルは%{count}文字以上必要です。"
+        title_too_long:
+          other: "タイトルは %{count} 文字以上にすることはできません"
+        post_missing: "空白の投稿はできません"
+        post_length:
+          other: "投稿は%{count}文字以上必要です。"
         try_like: " %{heart} ボタンは試しましたか？"
         category_missing: "カテゴリを選択してください。"
+        tags_missing:
+          other: "少なくとも %{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: "トピックのタイトルを入力してください。"
@@ -1296,9 +1713,8 @@ ja:
       view_new_post: "新しい投稿を見る。"
       saving: "保存中"
       saved: "保存しました!"
+      saved_draft: "下書きを投稿中です。タップして再開します。"
       uploading: "アップロード中..."
-      show_preview: "プレビューを表示する &raquo;"
-      hide_preview: "&laquo; プレビューを隠す"
       quote_post_title: "投稿全体を引用"
       bold_label: "B"
       bold_title: "太字"
@@ -1310,8 +1726,9 @@ ja:
       link_description: "リンクの説明をここに入力"
       link_dialog_title: "ハイパーリンクの挿入"
       link_optional_text: "タイトル(オプション)"
-      quote_title: "引用"
-      quote_text: "引用"
+      link_url_placeholder: "トピックを検索するためにURLを貼り付けるか入力してください"
+      blockquote_title: "引用"
+      blockquote_text: "引用"
       code_title: "整形済みテキスト"
       code_text: "4文字スペースでインデント"
       paste_code_text: "コードをここに入力"
@@ -1330,12 +1747,14 @@ ja:
       admin_options_title: "このトピックの詳細設定"
       composer_actions:
         reply: 返信
+        draft: 下書き
         edit: 編集
         reply_to_post:
           desc: 特定の投稿に返信する
         reply_as_new_topic:
           label: トピックのリンクを付けて返信
           desc: このトピックにリンクしている新しいトピックを作成する
+          confirm: 新しいトピックの下書きが保存されていますが、リンクされたトピックを作成すると上書きされます。
         reply_as_private_message:
           label: メッセージを作成
           desc: 新しいパーソナルメッセージを作成する
@@ -1344,10 +1763,23 @@ ja:
           desc: 特定の投稿ではなく、トピックに返信する
         create_topic:
           label: "新規トピック"
+        shared_draft:
+          label: "共有ドラフト"
+      reload: "再読み込み"
+      ignore: "無視する"
     notifications:
+      tooltip:
+        regular:
+          other: "%{count}件の未読通知"
+        message:
+          other: "%{count}件の未読メッセージ"
+        high_priority:
+          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}"
@@ -1356,6 +1788,9 @@ ja:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        other: "<span class='multi-user'>%{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}"
@@ -1366,6 +1801,9 @@ ja:
       granted_badge: "'%{description}'バッジをゲット！"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>新しいトピック</span> %{description}"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
+      votes_released: "%{description} - 完了"
       group_message_summary:
         other: "%{group_name} 宛のメッセージが %{count} 通あります"
       popup:
@@ -1374,20 +1812,34 @@ ja:
         quoted: '"%{topic}"で%{username}が引用しました - %{site_title}'
         replied: '%{username}が"%{topic}"へ返信しました - %{site_title}'
         posted: '%{username} が投稿しました "%{topic}" - %{site_title}'
+        private_message: '%{username} が "%{topic}" - %{site_title} であなたに個人的なメッセージを送信しました'
         linked: '"%{topic}"にあるあなたの投稿に%{username}がリンクしました - %{site_title}'
+        watching_first_post: '%{username} が "%{topic}" - %{site_title}を投稿しました'
+        confirm_title: "通知を有効にしました - %{site_title}"
         confirm_body: "成功！通知を可能にしました！"
       titles:
+        mentioned: "メンション済み"
+        replied: "新しい返信"
+        quoted: "引用された"
+        edited: "編集済み"
+        private_message: "新しいプライベートメッセージ"
+        invited_to_private_message: "プライベートメッセージに招待"
+        invitee_accepted: "招待が承認されました"
+        posted: "新しい投稿"
+        moved_post: "投稿が移動されました"
+        granted_badge: "バッジが付与されました"
+        invited_to_topic: "トピックに招待済み"
+        group_mentioned: "グループがメンションされました"
+        group_message_summary: "新しいグループメッセージ"
         watching_first_post: "新着トピック"
+        topic_reminder: "トピックのリマインダー"
     upload_selector:
       title: "画像のアップロード"
       title_with_attachments: "画像/ファイルをアップロード"
       from_my_computer: "このデバイスから"
       from_the_web: "Web から"
       remote_tip: "画像へのリンク"
-      remote_tip_with_attachments: "画像かファイルへのリンク %{authorized_extensions}"
       local_tip: "ローカルからアップロードする画像を選択"
-      local_tip_with_attachments: "デバイスから画像/ファイルを選択する %{authorized_extensions}"
-      hint: "(アップロードする画像をエディタにドラッグ&ドロップすることもできます)"
       hint_for_supported_browsers: "ドラッグ＆ドロップあるいはエディター内に画像を貼り付けてください。"
       uploading: "アップロード中"
       select_file: "ファイル選択"
@@ -1412,6 +1864,7 @@ ja:
       or_search_google: "あるいは、Google検索で試してみてください:"
       search_google: "Google検索で試してみてください:"
       search_google_button: "Google"
+      search_button: "検索"
       context:
         user: "@%{username}の投稿を検索"
         category: "#%{category} から検索する"
@@ -1452,10 +1905,14 @@ ja:
           noreplies: 返信がまったくない
           single_user: 一人しか参加者がいない
         post:
+          count:
+            label: 投稿
           time:
             label: 投稿されたタイミング
             before: より前
             after: より後
+        views:
+          label: 表示
     hamburger_menu: "他のトピック一覧やカテゴリを見る"
     new_item: "新しい"
     go_back: "戻る"
@@ -1481,6 +1938,7 @@ ja:
         change_category: "カテゴリを設定する"
         close_topics: "トピックをクローズする"
         archive_topics: "アーカイブトピック"
+        move_messages_to_inbox: "受信ボックスへ移動"
         notification_level: "通知"
         choose_new_category: "このトピックの新しいカテゴリを選択してください"
         selected:
@@ -1495,11 +1953,12 @@ ja:
         new: "新しいトピックはありません。"
         read: "まだトピックを一つも読んでいません。"
         posted: "トピックは一つもありません。"
+        latest: "コンテンツは以上です!"
         bookmarks: "ブックマークしたトピックはありません。"
         category: "%{category} トピックはありません。"
         top: "トップトピックはありません。"
         educate:
-          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>'
+          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>'
       bottom:
         latest: "最新のトピックは以上です。"
         posted: "投稿のあるトピックは以上です。"
@@ -1507,6 +1966,7 @@ ja:
         new: "新着トピックは以上です。"
         unread: "未読のトピックは以上です。"
         category: "%{category}トピックは以上です。"
+        tag: "%{tag}が付加されたトピックは以上です。"
         top: "トップトピックはこれ以上ありません。"
         bookmarks: "ブックマーク済みのトピックはこれ以上ありません。"
     topic:
@@ -1526,7 +1986,15 @@ ja:
         help: "メッセージの最初の投稿を編集"
         title: "編集"
       defer:
+        help: "未読にする"
         title: "取り下げる"
+      feature_on_profile:
+        help: "このトピックへのリンクをユーザーカードとプロフィールに追加する"
+        title: "プロフィールの機能"
+      remove_from_profile:
+        warning: "あなたのプロフィールにはすでに注目のトピックがあります。続行すると、このトピックが既存のトピックに置き換わります。"
+        help: "ユーザープロファイルでこのトピックへのリンクを削除します"
+        title: "プロファイルから削除"
       list: "トピック"
       new: "新着トピック"
       unread: "未読"
@@ -1559,18 +2027,32 @@ ja:
       toggle_information: "トピックの詳細を切り替え"
       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 {}}"
+      unread_indicator: "このトピックの最後の投稿を読んだメンバーはまだいません。"
       browse_all_categories: 全てのカテゴリを閲覧する
+      browse_all_tags: すべてのタグを参照
       view_latest_topics: 最新のトピックを見る
+      suggest_create_topic: 新しい会話を始めますか？
       jump_reply_up: 以前の返信へジャンプ
       jump_reply_down: 以後の返信へジャンプ
       deleted: "トピックは削除されました"
+      slow_mode_update:
+        select: "ユーザーは、このトピックに一度だけ投稿できます。"
+        save: "有効"
+        remove: "無効にする"
+        durations:
+          10_minutes: "10分"
+          15_minutes: "15分"
+          30_minutes: "30分"
+          45_minutes: "45分"
+          1_hour: "１時間"
+          2_hours: "２時間"
       topic_status_update:
         save: "タイマーをセットする"
         num_of_hours: "時間数"
         remove: "タイマーをはずす"
         publish_to: "公開先:"
         when: "公開時間:"
+        time_frame_required: "時間枠を選択してください"
       auto_update_input:
         later_today: "今日中"
         tomorrow: "明日"
@@ -1590,7 +2072,6 @@ ja:
         title: "一時的にクローズ"
       auto_close:
         title: "自動的にクローズ"
-        label: "自動的にトピッククローズするまでの時間:"
         error: "正しい値を入力してください。"
         based_on_last_post: "最終投稿時間より前でクローズしない"
       auto_delete:
@@ -1601,7 +2082,7 @@ ja:
         auto_open: "このトピックはあと%{timeLeft}で自動的にオープンします。"
         auto_close: "このトピックはあと%{timeLeft}で自動的にクローズします。"
         auto_publish_to_category: "このトピックはあと %{timeLeft} で、<a href=%{categoryUrl}>#%{categoryName}</a> にて公開されます。"
-        auto_close_based_on_last_post: "このトピックは最後の返信から%{duration} 後にクローズされます"
+        auto_close_after_last_post: "このトピックは最後の返信から%{duration} 後にクローズされます"
         auto_delete: "このトピックはあと%{timeLeft}で自動的に削除されます。"
         auto_reminder: "このトピックについて、%{timeLeft} 後にリマインドします。"
       auto_close_title: "オートクローズの設定"
@@ -1618,7 +2099,9 @@ ja:
         go: "へ"
         jump_bottom: "最後の投稿へ"
         jump_prompt: "ジャンプする..."
-        jump_prompt_of: "%{count} 投稿"
+        jump_prompt_of:
+          other: "%{count} 投稿"
+        jump_prompt_long: "ジャンプする..."
         jump_bottom_with_number: "%{post_number}番へジャンプ"
         jump_prompt_or: "または"
         total: 投稿の合計
@@ -1698,6 +2181,7 @@ ja:
       share:
         title: "シェア"
         help: "このトピックのリンクをシェアする"
+        invite_users: "招待"
       print:
         title: "印刷"
         help: "印刷用の表示にする"
@@ -1716,6 +2200,8 @@ ja:
         already_pinned:
           other: "%{categoryLink}で固定表示されているトピック: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "このトピックをすべてのトピックリストのトップに表示する"
+        confirm_pin_globally:
+          other: "全体で既に %{count} トピックを固定表示しています。固定表示が多すぎると、新規あるいは匿名ユーザの負担になる場合があります。このカテゴリにおいてさらに固定表示設定してもよいですか？"
         unpin_globally: "トピック一覧のトップからこのトピックを削除します"
         unpin_globally_until: "このトピックをすべてのトピックリストのトップから削除するか、<strong>%{until}</strong> まで待つ。"
         global_pin_note: "ユーザはトピックを個別に固定表示解除することができます。"
@@ -1744,14 +2230,13 @@ ja:
         username_placeholder: "ユーザ名"
         action: "招待を送る"
         help: "このトピックに他のユーザをメールまたは通知で招待する。"
-        to_forum: "ログインしなくてもこの投稿に返信ができることを、あなたの友人に知らせます。"
-        sso_enabled: "このトピックに招待したい人のユーザ名を入れてください"
+        discourse_connect_enabled: "このトピックに招待したい人のユーザ名を入れてください"
         to_topic_blank: "このトピックに招待したい人のユーザ名かメールアドレスを入れてください"
         to_topic_email: "あなたはメールアドレスを入力しました。フレンドがすぐにこのトピックへ返信できるようにメールで招待します。"
         to_topic_username: "ユーザ名を入力しました。このトピックへの招待リンクの通知を送信します。"
         to_username: "招待したい人のユーザ名を入れてください。このトピックへの招待リンクの通知を送信します。"
         email_placeholder: "name@example.com"
-        success_email: "<b>%{emailOrUsername}</b>に招待を送信しました。招待が受理されたらお知らせします。招待した人はユーザページの招待タブにて確認できます。"
+        success_email: "<b>%{invitee}</b>に招待を送信しました。招待が受理されたらお知らせします。招待の状態は、ユーザページの招待タブにて確認できます。"
         success_username: "ユーザをこのトピックへ招待しました。"
         error: "申し訳ありません。その人を招待できませんでした。すでに招待を送信していませんか？ (招待できる数には限りがあります)"
         success_existing_email: "<b>%{emailOrUsername}</b>はすでにこのトピックへ招待済みです。"
@@ -1815,11 +2300,10 @@ ja:
           other: "<b>%{count}</b>個の投稿を選択中。"
     post:
       quote_reply: "引用"
+      quote_share: "シェア"
       edit_reason: "理由: "
       post_number: "投稿%{number}"
       ignored: "無視したコンテンツ"
-      wiki_last_edited_on: "wikiの最終編集日"
-      last_edited_on: "投稿の最終編集日"
       reply_as_new_topic: "トピックのリンクを付けて返信"
       reply_as_new_private_message: "同じ受信者へ新しいメッセージとして返信"
       continue_discussion: "%{postLink} から:"
@@ -1828,9 +2312,12 @@ ja:
       show_hidden: "無視したコンテンツを見る"
       deleted_by_author:
         other: "(投稿は投稿者により削除されました。何らかの通報がされていない限り、%{count}時間後に自動的に削除されます)"
+      collapse: "折りたたむ"
       expand_collapse: "開く/折りたたむ"
       gap:
         other: "%{count}個の返信をすべて表示する"
+      notice:
+        new_user: "%{user} が投稿するのはこれが初めてです—私たちのコミュニティに彼らを歓迎しましょう！"
       unread: "未読の投稿"
       has_replies:
         other: "%{count} 件の返信"
@@ -1848,12 +2335,6 @@ ja:
         image_upload_not_allowed_for_new_user: "申し訳ありませんが、新規ユーザは画像のアップロードができません。"
         attachment_upload_not_allowed_for_new_user: "申し訳ありませんが、新規ユーザはファイルの添付ができません。"
         attachment_download_requires_login: "ファイルをダウンロードするには、ログインする必要があります"
-      abandon_edit:
-        no_value: "いいえ、保持します"
-      abandon:
-        confirm: "編集中の投稿は失われてしまいます。本当によろしいですか？"
-        no_value: "いいえ"
-        yes_value: "はい"
       via_email: "メールで投稿されました。"
       whisper: "この投稿はモデレーターへのプライベートメッセージです"
       wiki:
@@ -1886,6 +2367,9 @@ ja:
         grant_badge: "バッジを付与"
         delete_topic: "トピック削除"
       actions:
+        people:
+          like:
+            other: "「いいね！」する"
         by_you:
           off_topic: "関係のない話題として通報しました"
           spam: "スパム報告として通報しました"
@@ -1968,6 +2452,10 @@ ja:
       change_in_category_topic: "カテゴリ内容を編集"
       already_used: "この色は他のカテゴリで利用しています"
       security: "セキュリティ"
+      permissions:
+        group: "グループ"
+        see: "閲覧できる"
+        reply: "返信"
       images: "画像"
       email_in: "カスタムメールアドレス:"
       email_in_allow_strangers: "登録されていないユーザからメールを受け取ります"
@@ -1979,12 +2467,11 @@ ja:
       this_year: "今年"
       default_position: "デフォルトポジション"
       position_disabled: "カテゴリはアクティビティで並び替えられます。カテゴリ一覧の順番を制御するには"
-      position_disabled_click: '「固定されたケテゴリーの位置付け」の設定を有効にしてください。'
+      position_disabled_click: '「固定されたカテゴリーの位置付け」の設定を有効にしてください。'
       parent: "親カテゴリ"
       notifications:
         watching:
           title: "ウォッチ中"
-          description: "このカテゴリの、すべてのトピックの新しい投稿が通知されます。また、新しい返信の数が表示されます。"
         watching_first_post:
           title: "最初の投稿をウォッチする"
         tracking:
@@ -2000,6 +2487,7 @@ ja:
           ignore: "無視する"
           high: "高い"
       sort_options:
+        default: "デフォルト"
         likes: "いいね！"
         views: "表示"
         posts: "投稿"
@@ -2013,6 +2501,12 @@ ja:
     flagging:
       title: "報告していただきありがとうございます。"
       action: "投稿を通報"
+      take_action_options:
+        default:
+          title: "アクションをする"
+          details: "誰かが通報するのを待つのではなく、通報しましょう。"
+        suspend:
+          title: "凍結中のユーザ"
       notify_action: "メッセージ"
       official_warning: "運営スタッフからの警告"
       delete_spammer: "スパムの削除"
@@ -2074,12 +2568,6 @@ ja:
       unlisted:
         help: "このトピックはリストされていません。トピックリストには表示されません。直接リンクでのみアクセス可能です"
     posts: "投稿"
-    posts_likes_MF: |
-      This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
-      low {with a high like to post ratio}
-      med {with a very high like to post ratio}
-      high {with an extremely high like to post ratio}
-      other {}}
     original_post: "オリジナルの投稿"
     views: "閲覧"
     views_lowercase:
@@ -2095,7 +2583,6 @@ ja:
     users_lowercase:
       other: "ユーザ"
     category_title: "カテゴリ"
-    history: "履歴"
     changed_by: "by %{author}"
     raw_email:
       title: "受信メール"
@@ -2169,6 +2656,7 @@ ja:
       readonly: "閲覧できる"
     lightbox:
       download: "ダウンロード"
+      counter: "%curr% / %total%"
     keyboard_shortcuts_help:
       title: "ショートカットキー"
       jump_to:
@@ -2227,6 +2715,8 @@ ja:
       title: バッジ
       badge_count:
         other: "%{count}個のバッジ"
+      more_badges:
+        other: "+%{count} リンク"
       select_badge_for_title: プロフィールの肩書きに付けるバッジを選んでください
       none: "（なし）"
       badge_grouping:
@@ -2253,11 +2743,14 @@ ja:
       rename_tag: "タグの名前を変更"
       rename_instructions: "このタグの新しい名前を選択:"
       sort_by: "並べ替え:"
+      sort_by_count: "カウント"
       sort_by_name: "名前"
       manage_groups: "タグのグループを管理"
       upload_successful: "タグのアップロードに成功しました"
       delete_unused: "使われていないタグを削除"
       cancel_delete_unused: "キャンセル"
+      filters:
+        without_category: "%{filter} %{tag} トピック"
       notifications:
         watching:
           title: "ウォッチ中"
@@ -2296,6 +2789,17 @@ ja:
       back: "戻る"
       share: "共有"
       dismiss: "閉じる"
+    do_not_disturb:
+      title: "おやすみモード..."
+      label: "おやすみモード"
+      remaining: "残り%{remaining}"
+      options:
+        half_hour: "30分"
+        one_hour: "１時間"
+        two_hours: "２時間"
+        tomorrow: "明日まで"
+        custom: "カスタム"
+      set_schedule: "通知スケジュールを設定する"
   admin_js:
     type_to_filter: "設定項目を検索..."
     admin:
@@ -2318,6 +2822,8 @@ ja:
         installed_version: "インストール済み"
         latest_version: "最新"
         problems_found: "現在のサイト設定に基づいたアドバイス"
+        new_features:
+          dismiss: "閉じる"
         last_checked: "最終チェック"
         refresh_problems: "更新"
         no_problems: "問題は見つかりませんでした。"
@@ -2349,6 +2855,9 @@ ja:
           all: "全て"
           view_table: "table"
           refresh_report: "Refresh Report"
+          daily: 日ごと
+          monthly: 月ごと
+          weekly: 毎週
           groups: "すべてのグループ"
           disabled: "このレポートは利用不可"
           filters:
@@ -2365,12 +2874,10 @@ ja:
           name:
             too_short: "グループ名が短すぎます"
             blank: "グループ名は空白にできません"
-        bulk_add:
-          title: "グループに一括追加"
-          paste: "1行ごとにユーザ名またはメールアドレスを貼り付けてください:"
         manage:
           interaction:
             email: Eメール
+            incoming_email: "カスタムメールアドレス"
             incoming_email_placeholder: "メールアドレスを入力"
             visibility: 可視性
             visibility_levels:
@@ -2414,6 +2921,8 @@ ja:
         description: 説明
         save: 保存
         continue: 続く
+        scopes:
+          action: アクション
       web_hooks:
         title: "Webhooks"
         none: "現在、Webhooksはありません。"
@@ -2522,6 +3031,7 @@ ja:
         color: "カラー"
         opacity: "透明度"
         copy: "コピー"
+        copy_to_clipboard: "クリップボードにコピー"
         copied_to_clipboard: "クリップボードにコピーしました"
         copy_to_clipboard_error: "クリップボードにコピーする際にエラーが発生しました"
         email_templates:
@@ -2533,6 +3043,7 @@ ja:
           revert_confirm: "本当に変更を元に戻しますか?"
         theme:
           theme: "テーマ"
+          customize_desc: "カスタマイズ:"
           create_type: "タイプ"
           create_name: "名前"
           edit: "編集"
@@ -2547,6 +3058,7 @@ ja:
           install_popular: "人気"
           about_theme: "このサイトについて"
           license: "ライセンス"
+          version: "Version:"
           enable: "利用できます"
           disable: "利用できません"
           check_for_updates: "アップデートを確認"
@@ -2771,7 +3283,6 @@ ja:
         action_descriptions:
           flag: "これらの言葉を含む投稿を許可しますが、仲裁者がこれをレビューできるよう、不適切であると通報されます。"
         form:
-          label: "新しい単語:"
           placeholder_regexp: "正規表現"
           add: "追加"
           success: "成功"
@@ -2815,12 +3326,15 @@ ja:
         check_email:
           title: "メールアドレスを表示する"
           text: "表示する"
+        check_sso:
+          text: "詳しく見る"
       user:
         suspend_failed: "ユーザの凍結に失敗しました: %{error}"
         unsuspend_failed: "ユーザの凍結解除に失敗しました: %{error}"
         suspend_duration: "ユーザを何日間凍結しますか?"
         suspend_reason_label: "アカウントを凍結する理由を説明してください。ここに書いた理由は、このユーザのプロファイルページにおいて<b>全員が閲覧可能な状態</b>で公開されます。またこのユーザがログインを試みた際にも表示されます。"
         suspend_reason: "理由"
+        suspend_reason_title: "凍結理由"
         suspend_message: "メールメッセージ"
         suspended_by: "凍結したユーザ"
         silence_reason: "理由"
@@ -2941,12 +3455,11 @@ ja:
           on_grace_period: "現在の昇格期間中は、降格されません"
           locked_will_not_be_promoted: "トラストレベルはロックされています。昇格することはありません"
           locked_will_not_be_demoted: "トラストレベルはロックされています。降格することはありません"
-        sso:
-          title: "シングルサインオン"
+        discourse_connect:
           external_id: "External ID"
-          external_username: "ユーザ名"
+          external_username: "ユーザー名"
           external_name: "名前"
-          external_email: "メール"
+          external_email: "Eメール"
           external_avatar_url: "プロフィール画像URL"
       user_fields:
         title: "ユーザフィールド"
@@ -3120,6 +3633,9 @@ ja:
         add_host: "ホストの追加"
         settings: "埋め込みの設定"
         embed_truncate: "埋め込まれた投稿を削除する"
+        allowed_embed_selectors: "埋め込みで許可される要素のCSSセレクタ"
+        blocked_embed_selectors: "埋め込みから削除された要素のCSSセレクタ"
+        allowed_embed_classnames: "許可されたCSSクラス名"
         save: "埋め込みの設定を保存"
       permalink:
         title: "パーマリンク"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index da3e1d0518..01a7e07a3d 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -136,6 +136,9 @@ ko:
     topic_admin_menu: "글 관리"
     wizard_required: "새로운 Discourse에 오신것을 환영합니다! <a href='%{url}' data-auto-route='true'>설치 마법사</a>로 시작합니다 ✨"
     emails_are_disabled: "관리자에 의해 모든 이메일의 발신이 비활성화 되었습니다. 어떤 종류의 이메일 알림도 전송되지 않습니다."
+    software_update_prompt:
+      message: "사이트를 업데이트했습니다. <span>새로 고침</span>하세요. 그렇지 않으면 예기치 않은 동작이 발생할 수 있습니다."
+      dismiss: "읽음"
     bootstrap_mode_enabled:
       other: "쉬운 시작을 위해 부트스트랩 모드로 구동 되었습니다. 모든 새로운 사용자에게 회원 레벨 1이 부여되고 이메일로 매일 요약 전송이 활성화됩니다. %{count}명의 사용자가 가입하면 자동으로 해제됩니다."
     bootstrap_mode_disabled: "Bootstrap 모드가 24시간 이내에 해제됩니다."
@@ -146,6 +149,7 @@ ko:
       regions:
         ap_northeast_1: "아시아 태평양 (도쿄)"
         ap_northeast_2: "아시아 태평양 (서울)"
+        ap_east_1: "아시아 태평양 (홍콩)"
         ap_south_1: "아시아 태평양 (뭄바이)"
         ap_southeast_1: "아시아 태평양 (싱가폴)"
         ap_southeast_2: "아시아 태평양 (시드니)"
@@ -164,6 +168,7 @@ ko:
         us_gov_west_1: "AWS GovCloud (미국 서부)"
         us_west_1: "미국 서부 (N. 캘리포니아)"
         us_west_2: "미국 서부 (오리건)"
+    clear_input: "입력 지우기"
     edit: "이 글의 제목과 카테고리 편집"
     expand: "확장"
     not_implemented: "죄송합니다. 아직 사용할 수 없는 기능입니다."
@@ -185,18 +190,20 @@ ko:
       other: "링크"
     faq: "자주하는 질문"
     guidelines: "가이드라인"
-    privacy_policy: "개인보호 정책"
-    privacy: "개인정보처리방침"
-    tos: "서비스 이용약관"
+    privacy_policy: "개인 정보 보호 정책"
+    privacy: "개인 정보 처리 방침"
+    tos: "서비스 약관"
     rules: "규칙"
-    conduct: "윤리 강령"
-    mobile_view: "모바일로 보기"
-    desktop_view: "PC로 보기"
+    conduct: "행동 강령"
+    mobile_view: "모바일 보기"
+    desktop_view: "데스크톱 보기"
     you: "사용자님"
     or: "또는"
     now: "방금"
-    read_more: "더보기"
+    read_more: "더 보기"
     more: "더 보기"
+    x_more:
+      other: "%{count}개 더보기"
     less: "덜"
     never: "전혀"
     every_30_minutes: "30분마다"
@@ -224,6 +231,7 @@ ko:
       moderators: "관리자"
       stat:
         all_time: "전체"
+        last_day: "지난 24시간"
         last_7_days: "지난 7일"
         last_30_days: "지난 30일"
       like_count: "좋아요"
@@ -258,21 +266,9 @@ ko:
         never: "절대"
         when_reminder_sent: "알림이 전송되면"
         on_owner_reply: "이 글에 댓글을 작성한 후"
-      search_placeholder: "이름, 글 제목 또는 글 내용으로 북마크 검색"
+      search_placeholder: "이름, 글 제목 또는 내용으로 북마크 검색"
       search: "검색"
       reminders:
-        later_today: "오늘 나중에"
-        next_business_day: "다음 영업일"
-        tomorrow: "내일"
-        next_week: "다음 주"
-        post_local_date: "게시물의 날짜"
-        later_this_week: "이번 주말"
-        start_of_next_business_week: "월요일"
-        start_of_next_business_week_alt: "다음주 월요일"
-        next_month: "다음 달"
-        custom: "사용자 지정 날짜 및 시간"
-        last_custom: "마지막"
-        none: "알림이 필요하지 않습니다"
         today_with_time: "오늘 %{time}"
         tomorrow_with_time: "내일 %{time}"
         at_time: "%{date_time}"
@@ -287,9 +283,9 @@ ko:
       new_private_message: "새 비공개 메시지 초안"
       topic_reply: "임시 댓글"
       abandon:
-        confirm: "이 글의 다른 초안을 이미 열었습니다. 해당 초안을 포기하시겠습니까?"
-        yes_value: "예, 포기합니다"
-        no_value: "아니요, 유지합니다"
+        confirm: "이 항목에 대한 초안이 진행중입니다. 무엇을 하고 싶습니까?"
+        yes_value: "버리기"
+        no_value: "편집 재개"
     topic_count_latest:
       other: "%{count}개의 새글 또는 업데이트 된 글 보기"
     topic_count_unread:
@@ -305,6 +301,7 @@ ko:
     upload: "업로드"
     uploading: "업로드 중..."
     uploading_filename: "업르도 중: %{filename}..."
+    processing_filename: "처리 중: %{filename}..."
     clipboard: "클립보드"
     uploaded: "업로드 되었습니다!"
     pasting: "붙여넣기 중..."
@@ -382,6 +379,7 @@ ko:
       topic: "글:"
       filtered_topic: "한 글에서 검토 가능한 콘텐츠로 필터링했습니다."
       filtered_user: "사용자"
+      filtered_reviewed_by: "검토자"
       show_all_topics: "모든 글 보기"
       deleted_post: "(게시물 삭제됨)"
       deleted_user: "(사용자 삭제됨)"
@@ -392,9 +390,10 @@ ko:
         email: "이메일"
         name: "이름"
         fields: "필드"
+        reject_reason: "이유"
       user_percentage:
         summary:
-          other: "%{agreed}, %{disagreed}, %{ignored} (전체 %{count}개의 신고)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (최근 %{count}개의  신고중)"
         agreed:
           other: "%{count}% 동의"
         disagreed:
@@ -432,7 +431,8 @@ ko:
           created_at_asc: "작성 날짜 (역순)"
         priority:
           title: "최소 우선 순위"
-          low: "(모든)"
+          any: "(모든)"
+          low: "낮음"
           medium: "중간"
           high: "높음"
       conversation:
@@ -470,6 +470,8 @@ ko:
           title: "대기중인 글"
         reviewable_user:
           title: "사용자"
+        reviewable_post:
+          title: "글"
       approval:
         title: "승인이 필요한 게시물"
         description: "새로운 게시글이 있습니다. 그러나 이 게시글이 보여지려면 운영자의 승인이 필요합니다."
@@ -477,6 +479,35 @@ ko:
           other: "승인 대기중인 게시물이 <strong>%{count}</strong>개 있습니다."
         ok: "확인"
       example_username: "사용자명"
+      reject_reason:
+        title: "이 사용자를 금지하는 이유는 무엇입니까?"
+        send_email: "거부 이메일 보내기"
+    relative_time_picker:
+      minutes:
+        other: "분"
+      hours:
+        other: "시간"
+      days:
+        other: "일"
+      months:
+        other: "월"
+      years:
+        other: "년"
+      relative: "상대적"
+    time_shortcut:
+      later_today: "오늘 늦게"
+      next_business_day: "다음 영업일"
+      tomorrow: "내일"
+      next_week: "다음 주"
+      post_local_date: "게시 날짜"
+      later_this_week: "이번 주말"
+      start_of_next_business_week: "월요일"
+      start_of_next_business_week_alt: "다음 월요일"
+      next_month: "다음 달"
+      custom: "사용자 지정 날짜 및 시간"
+      relative: "상대 시간"
+      none: "필요 없음"
+      last_custom: "마지막 맞춤 시간"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a> 사용자가 <a href='%{topicUrl}'>글 작성</a>"
       you_posted_topic: "<a href='%{userUrl}'>사용자님</a>이 <a href='%{topicUrl}'>글 작성</a>"
@@ -562,6 +593,10 @@ ko:
             imap_ssl: "IMAP에 SSL 사용"
             username: "사용자명"
             password: "비밀번호"
+          settings:
+            title: "설정"
+            allow_unknown_sender_topic_replies: "알 수 없는 발신자 주제 응답을 허용합니다."
+            allow_unknown_sender_topic_replies_hint: "알 수없는 발신자가 그룹 글에 댓글을 작성 할 수 있습니다. 이 기능이 활성화되어 있지 않으면 IMAP 이메일 스레드에 아직 포함되지 않았거나 글에 초대되지 않은 이메일 주소에서 답장하면 새 글이 생성됩니다."
           mailboxes:
             synchronized: "동기화된 사서함"
             none_found: "현재 이메일 계정에 사서함이 없습니다."
@@ -662,7 +697,20 @@ ko:
         make_owner_description: "<b>%{username}</b> 사용자를 이 그룹의 소유자로 만들기"
         remove_owner: "소유자로 제거"
         remove_owner_description: "<b>%{username}</b>님을 이 그룹의 소유자에서 제거"
+        make_primary: "기본으로 설정"
+        remove_primary: "기본에서 제거"
+        remove_members: "회원 삭제"
+        remove_members_description: "이 그룹에서 선택한 사용자 제거"
+        make_owners: "소유자로 만들기"
+        make_owners_description: "선택한 사용자를 이 그룹의 소유자로 지정"
+        remove_owners: "소유자 제거"
+        remove_owners_description: "선택한 사용자를 이 그룹의 소유자에서 제거"
+        make_all_primary: "모두 기본으로 설정"
+        make_all_primary_description: "선택한 모든 사용자의 기본 그룹으로 설정"
+        remove_all_primary: "기본에서 제거"
+        remove_all_primary_description: "이 그룹을 기본 그룹에서 제거"
         owner: "소유자"
+        primary: "기본"
         forbidden: "회원을 볼 수 없습니다."
       topics: "글"
       posts: "게시글"
@@ -734,12 +782,18 @@ ko:
       posts: "게시글"
       topics: "글"
       latest: "최신"
-      latest_by: "가장 최근"
       toggle_ordering: "정렬 컨트롤 토글"
       subcategories: "하위 카테고리"
       muted: "뮤트된 카테고리"
       topic_sentence:
         other: "%{count}개의 글"
+      topic_stat:
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "주"
+        month: "월"
+      topic_stat_all_time:
+        other: "총 %{number}개"
       topic_stat_sentence_week:
         other: "지난주 %{count}개의 새 글이 있습니다."
       topic_stat_sentence_month:
@@ -798,7 +852,23 @@ ko:
         mute_option_title: "이 사용자와 관련된 알림을 받지 않습니다."
         normal_option: "보통"
         normal_option_title: "이 사용자가 사용자님에게 댓글을 작성 하거나, 인용하거나, 멘션하면 알림이 전송됩니다."
+      notification_schedule:
+        title: "알림 일정"
+        label: "사용자 지정 알림 일정 사용"
+        tip: "이 시간 이외에는 자동으로 '방해 금지' 상태가 됩니다."
+        midnight: "한밤중"
+        none: "없음"
+        monday: "월요일"
+        tuesday: "화요일"
+        wednesday: "수요일"
+        thursday: "목요일"
+        friday: "금요일"
+        saturday: "토요일"
+        sunday: "일요일"
+        to: "받는사람"
       activity_stream: "활동"
+      read: "읽음"
+      read_help: "최근 읽은 주제"
       preferences: "환경 설정"
       feature_topic_on_profile:
         open_search: "새 글 선택"
@@ -827,11 +897,18 @@ ko:
         perm_denied_expl: "알림을 허가하지 않으셨군요. 브라우저 설정을 통해서 알림을 허용해주세요."
         disable: "알림 비활성화"
         enable: "알림 활성화"
-        each_browser_note: "참고: 사용하는 모든 브라우저에서 이 설정을 변경해야 합니다."
+        each_browser_note: '참고: 사용하는 모든 브라우저에서 이 설정을 변경해야합니다. 이 설정에 관계없이 "방해 금지"에있는 경우 모든 알림이 비활성화됩니다.'
         consent_prompt: "내 글에 댓글이 달리면 실시간으로 알림을 받으시겠습니까?"
       dismiss: "읽음"
       dismiss_notifications: "모두 읽음"
       dismiss_notifications_tooltip: "읽지 않은 알림을 모두 읽음으로 표시"
+      no_messages_title: "메시지가 없습니다."
+      no_messages_body: >
+        다른 사람과 직접 개인적인 대화를 해야합니까? 아바타를 선택하고 %{icon} 메시지 버튼을 클릭하여 메시지를 보냅니다.<br><br>도움이 필요하면 <a href='%{aboutUrl}'>관리자에게 메시지</a>로 문의하세요.
+      no_bookmarks_title: "아직 북마크가 없습니다."
+      no_bookmarks_body: >
+        %{icon} 버튼으로 게시물 북마크를 시작하면 쉽게 참조 할 수 있도록 여기에 나열됩니다. 알림을 예약 할 수도 있습니다!
+      no_notifications_title: "아직 알림이 없습니다."
       first_notification: "첫 번째 알림! 시작하려면 선택하세요."
       dynamic_favicon: "브라우저 아이콘에 수 표시"
       skip_new_user_tips:
@@ -842,7 +919,7 @@ ko:
       color_scheme_default_on_all_devices: "모든 장치에서 기본 색 구성표 설정"
       color_scheme: "색상 구성표"
       color_schemes:
-        default_description: "기본"
+        default_description: "테마 기본값"
         disable_dark_scheme: "일반과 동일"
         dark_instructions: "기기의 어두운 모드를 전환하여 어두운 모드 색 구성표를 미리 볼 수 있습니다."
         undo: "초기화"
@@ -946,6 +1023,7 @@ ko:
         tags: "태그"
       preferences_nav:
         account: "계정"
+        security: "보안"
         profile: "프로필"
         emails: "이메일"
         notifications: "알림"
@@ -1055,6 +1133,7 @@ ko:
         uploaded_avatar_empty: "사용자 지정 사진 추가"
         upload_title: "사진 업로드"
         image_is_not_a_square: "경고: 정사각형 이미지가 아니기 때문에 사진을 수정하였습니다."
+        logo_small: "사이트의 작은 로고. 기본적으로 사용됩니다."
       change_profile_background:
         title: "프로필 헤더"
         instructions: "프로필 헤더는 중앙에 위치하며 기본 너비는 1110px입니다."
@@ -1077,7 +1156,7 @@ ko:
         set_primary: "기본 이메일 설정"
         destroy: "이메일 제거"
         add_email: "보조 이메일 추가"
-        sso_override_instructions: "SSO 제공 업체에서 이메일을 업데이트 할 수 있습니다."
+        auth_override_instructions: "인증 제공 업체에서 이메일을 업데이트 할 수 있습니다."
         no_secondary: "보조 이메일이 없습니다"
         instructions: "다른 사용자에게 공개되지 않습니다."
         admin_note: "참고 : 관리자가 아닌 다른 사용자의 이메일을 변경하는 관리자는 사용자가 원래 이메일 계정에 액세스할 수 없음을 나타내므로 비밀번호 재설정 이메일이 새 주소로 전송됩니다. 사용자의 이메일은 비밀번호 재설정 프로세스를 완료할 때까지 변경되지 않습니다."
@@ -1085,6 +1164,7 @@ ko:
         required: "이메일 주소를 입력하십시오"
         invalid: "유효한 이메일 주소를 입력하십시오."
         authenticated: "사용자님의 이메일은 %{provider}에 의해 인증되었습니다."
+        invite_auth_email_invalid: "초대 이메일이 %{provider}에 인증된 이메일과 일치하지 않습니다."
         frequency_immediately: "만약 전송된 메일을 읽지 않았을 경우, 즉시 메일을 다시 보내드립니다."
         frequency:
           other: "최근 %{count}분 동안 접속하지 않을 경우에만 메일이 전송됩니다."
@@ -1117,6 +1197,7 @@ ko:
         checking: "사용자명 사용 가능 여부 확인 중..."
         prefilled: "이메일이 등록된 사용자명과 일치합니다."
         required: "사용자명을 입력 해주세요"
+        edit: "아이디 수정"
       locale:
         title: "인터페이스 언어"
         instructions: "사용자 인터페이스 언어를 변경 후 페이지 새로 고침하면 반영됩니다."
@@ -1213,46 +1294,45 @@ ko:
         after_10_minutes: "10분 후"
       notification_level_when_replying: "글에 댓글을 쓰면 그 글을 다음으로 설정"
       invited:
-        search: "초대를 검색하려면 입력..."
         title: "초대"
+        pending_tab: "보류중"
+        pending_tab_with_count: "보류중 (%{count})"
+        expired_tab: "만료됨"
+        expired_tab_with_count: "만료됨 (%{count})"
+        redeemed_tab: "사용됨"
+        redeemed_tab_with_count: "사용됨 (%{count})"
+        invited_via: "초대"
+        groups: "그룹"
+        topic: "글"
+        sent: "생성됨/마지막 보낸 날짜"
+        expires_at: "만료"
+        edit: "수정"
+        remove: "제거"
+        copy_link: "링크 가져오기"
+        reinvite: "이메일 재전송"
+        reinvited: "초대 메일 재전송 됨"
+        removed: "제거됨"
+        search: "초대를 검색하려면 입력..."
         user: "초대된 사용자"
-        sent: "마지막으로 보냄"
         none: "표시 할 초대가 없습니다."
         truncated:
           other: "처음 %{count}개의 초대를 표시합니다."
         redeemed: "사용된 초대"
-        redeemed_tab: "사용됨"
-        redeemed_tab_with_count: "사용됨 (%{count})"
         redeemed_at: "사용됨"
         pending: "보류 중인 초대"
-        pending_tab: "보류중"
-        pending_tab_with_count: "보류중 (%{count})"
         topics_entered: "읽은 글"
         posts_read_count: "읽은 댓글"
         expired: "이 초대장의 기한이 만료되었습니다."
-        rescind: "삭제"
-        rescinded: "초대가 제거되었습니다."
-        rescind_all: "만료된 초대 제거"
-        rescinded_all: "모든 만료 된 초대가 제거되었습니다!"
-        rescind_all_confirm: "만료 된 초대를 모두 제거 하시겠습니까?"
-        reinvite: "초대 다시 보내기"
+        remove_all: "만료된 초대 제거"
+        removed_all: "만료된 모든 초대가 제거되었습니다!"
+        remove_all_confirm: "만료된 초대를 모두 제거 하시겠습니까?"
         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_redemption_stats: "회수"
-        link_groups: 그룹
-        link_expires_at: 만료
         create: "초대"
-        copy_link: "링크 표시"
         generate_link: "초대 링크 만들기"
         link_generated: "초대 링크는 다음과 같습니다!"
         valid_for: "초대 링크는 다음 이메일 주소에만 유효합니다: %{email}"
@@ -1264,12 +1344,32 @@ ko:
           error: "초대 링크를 생성하는 중에 오류가 발생했습니다."
           max_redemptions_allowed_label: "이 링크를 사용하여 등록 할 수있는 사람은 몇 명입니까?"
           expires_at: "이 초대 링크는 언제 만료됩니까?"
+        invite:
+          new_title: "초대 링크 만들기"
+          edit_title: "초대 수정"
+          instructions: "이 링크를 공유하면 이 사이트에 대한 액세스 권한을 즉시 부여할 수 있습니다."
+          copy_link: "링크 복사"
+          expires_in_time: "%{time}에 만료됩니다."
+          expired_at_time: "%{time}에 만료됨."
+          show_advanced: "고급 옵션 표시"
+          hide_advanced: "고급 옵션 숨기기"
+          restrict_email: "초대를 하나의 이메일 주소로 제한"
+          max_redemptions_allowed: "최대 사용 횟수:"
+          add_to_groups: "그룹에 추가:"
+          invite_to_topic: "첫 번째 로그인시 글로 보내기:"
+          expires_at: "만료:"
+          custom_message: "선택적 개인 메시지:"
+          send_invite_email: "이메일 저장 및 보내기"
+          save_invite: "초대 저장"
+          invite_saved: "초대가 저장되었습니다."
+          invite_copied: "초대 링크가 복사되었습니다."
+          blank_email: "초대 링크가 복사되지 않았습니다. 이메일 주소가 필요합니다."
         bulk_invite:
           none: "이 페이지에 표시할 초대장이 없습니다."
           text: "일괄 초대"
-          success: "파일이 성공적으로 업로드되었습니다. 처리가 완료되면 메시지를 통해 알림을 받게됩니다."
+          progress: "%{progress}% 업로드..."
+          success: "파일이 성공적으로 업로드되었습니다. 프로세스가 완료되면 메시지를 통해 알려드립니다."
           error: "죄송합니다. 파일은 CSV 형식이어야 합니다."
-          confirmation_message: "업로드된 파일의 모든 사람에게 초대를 메일로 보내려 합니다."
       password:
         title: "비밀번호"
         too_short: "비밀번호가 너무 짧습니다."
@@ -1325,6 +1425,8 @@ ko:
       avatar:
         title: "프로필 사진"
         header_title: "프로필, 메시지, 북마크 및 환경설정"
+        name_and_description: "%{name} - %{description}"
+        edit: "프로필 사진 변경"
       title:
         title: "제목"
         none: "(없음)"
@@ -1340,7 +1442,7 @@ ko:
         the_topic: "글"
     loading: "로드 중..."
     errors:
-      prev_page: "로드하는 동안"
+      prev_page: "로드하는 중"
       reasons:
         network: "네트워크 오류"
         server: "서버 오류"
@@ -1362,7 +1464,7 @@ ko:
       close: "닫기"
       dismiss_error: "오류 무시"
     close: "닫기"
-    assets_changed_confirm: "이 사이트는 방금 업데이트되었습니다. 지금 최신 버전으로 새로 고침 하시겠습니까?"
+    assets_changed_confirm: "이 사이트는 방금 소프트웨어 업그레이드를 받았습니다. 지금 최신 버전을 받으시겠습니까?"
     logout: "로그아웃 되었습니다."
     refresh: "새로 고침"
     home: "홈"
@@ -1382,15 +1484,6 @@ ko:
       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: "생성 된 총 글"
-    year: "년"
-    year_desc: "지난 365일 동안 작성된 글"
-    month: "월"
-    month_desc: "지난 30일 동안 작성된 글"
-    week: "주"
-    week_desc: "지난 7일 동안 작성된 글"
-    day: "일"
     first_post: 첫 번째 글
     mute: 알림끔
     unmute: 알림끔 해제
@@ -1412,8 +1505,8 @@ ko:
       value_prop: "계정을 만들면 사이트내 읽은 글과 읽지 않은 글을 기억해 보다 편한 이용을 도와 줍니다. 또한 누군가가 댓글을 달거나 질문을 할 경우 이메일을 통해 알림을 받을 수 있습니다. :heartpulse:"
     summary:
       enabled_description: "이 글에 대한 요약: 현재 커뮤니티의 주요 글 요약본을 보고 있습니다"
-      description: "<b>%{replyCount}</b>개의 댓글이 있습니다."
-      description_time: "댓글이 <b>%{replyCount}</b>개 있으며 예상 읽기 시간은 <b>%{readingTime}분</b> 입니다."
+      description:
+        other: "<b>%{count}</b>개의 댓글이 있습니다."
       enable: "이 글 요약"
       disable: "모든 글 표시"
     deleted_filter:
@@ -1438,8 +1531,10 @@ ko:
     trust_level: "회원 레벨"
     search_hint: "사용자명, 이메일 또는 IP 주소"
     create_account:
+      header_title: "어서 오세요!"
+      subheader_title: "계정을 만드세요"
       disclaimer: "등록하면 <a href='%{privacy_link}' target='blank'>개인 정보 보호 정책</a> 및 <a href='%{tos_link}' target='blank'>서비스 약관에</a> 동의하게됩니다."
-      title: "새 계정 만들기"
+      title: "계정 만들기"
       failed: "문제가 발생했습니다. 이 이메일이 이미 등록되어있을 수 있습니다. 비밀번호 찾기 링크를 시도해보세요."
     forgot_password:
       title: "비밀번호 재설정"
@@ -1458,6 +1553,7 @@ ko:
     email_login:
       link_label: "로그인 링크를 이메일로 보내기"
       button_label: "이메일 사용"
+      login_link: "비밀번호 건너뛰기; 로그인 링크를 이메일로 보내주십시오."
       emoji: "이모티콘 잠금"
       complete_username: "계정이 사용자 이름 <b>%{username}</b> 과 일치하면 곧 로그인 링크가 포함 된 이메일을 받게됩니다."
       complete_email: "계정이 <b>%{email}</b> 과 일치하면 곧 로그인 링크가 포함 된 이메일을 받게됩니다."
@@ -1469,6 +1565,8 @@ ko:
       logging_in_as: '%{email}으로 로그인'
       confirm_button: 로그인 완료
     login:
+      header_title: "환영합니다"
+      subheader_title: "계정에 로그인하십시오."
       title: "로그인"
       username: "사용자"
       password: "비밀번호"
@@ -1484,7 +1582,7 @@ ko:
       security_key_not_allowed_error: "보안 키 인증 프로세스가 시간 초과되었거나 취소되었습니다."
       security_key_no_matching_credential_error: "제공된 보안 키에서 일치하는 자격 증명을 찾을 수 없습니다."
       security_key_support_missing_error: "현재 장치 또는 브라우저가 보안 키 사용을 지원하지 않습니다. 다른 방법을 사용하십시오."
-      email_placeholder: "이메일 또는 사용자명"
+      email_placeholder: "이메일 / 아이디"
       caps_lock_warning: "Caps Lock 켜짐"
       error: "알 수없는 오류"
       cookies_error: "브라우저의 쿠키가 비활성화 된 것 같습니다. 먼저 활성화하지 않으면 로그인하지 못할 수 있습니다."
@@ -1551,7 +1649,6 @@ ko:
       apple_international: "애플/인터내셔널"
       google: "구글"
       twitter: "트위터"
-      emoji_one: "JoyPixels (이전의 EmojiOne)"
       win10: "윈10"
       google_classic: "구글 클래식"
       facebook_messenger: "페이스북 메신저"
@@ -1572,7 +1669,13 @@ ko:
     category_row:
       topic_count:
         other: "이 카테고리에는 %{count}개의 글이 있습니다"
+      plus_subcategories_title:
+        other: "%{name} 및 %{count}개의 하위 카테고리"
+      plus_subcategories:
+        other: "+ %{count}개의 하위 카테고리"
     select_kit:
+      filter_by: "필터링 기준: %{name}"
+      select_to_filter: "필터링 기준 선택"
       default_header_text: 선택...
       no_content: 일치하는 항목을 찾을 수 없음
       filter_placeholder: 검색...
@@ -1585,13 +1688,13 @@ ko:
       invalid_selection_length:
         other: "선택은 %{count}글자 이상이어야 합니다."
       components:
+        tag_drop:
+          filter_for_more: 추가 필터링...
         categories_admin_dropdown:
           title: "카테고리 관리"
     date_time_picker:
       from: 보내는사람
       to: 받는사람
-      errors:
-        to_before_from: "종료 날짜는 시작 날짜보다 이후여야 합니다."
     emoji_picker:
       filter_placeholder: 이모티콘 검색
       smileys_&_emotion: 웃는 얼굴과 감정
@@ -1613,7 +1716,7 @@ ko:
       default: 사용자 정의 이모티콘
     shared_drafts:
       title: "공유 초안"
-      notice: "이 항목은 <b>%{category}</b> 카테고리를 볼 수 있는 사용자만 볼 수 있습니다."
+      notice: "이 항목은 공유 초안을 게시할 수 있는 사용자만 볼 수 있습니다."
       destination_category: "대상 카테고리"
       publish: "공유 초안 게시"
       confirm_publish: "이 초안을 게시 하시겠습니까?"
@@ -1624,7 +1727,6 @@ ko:
       options: "옵션"
       whisper: "귓속말"
       unlist: "목록에서 제외됨"
-      blockquote_text: "인용구"
       add_warning: "경고 메시지"
       toggle_whisper: "귀속말 켜고 끄기"
       toggle_unlisted: "목록제외 켜고 끄기"
@@ -1644,10 +1746,13 @@ ko:
       reference_topic_title: "RE : %{title}"
       error:
         title_missing: "제목은 필수 항목입니다"
-        title_too_short: "제목은 %{min}자 이상 이어야 합니다."
-        title_too_long: "제목은 %{max}자를 초과 할 수 없습니다."
+        title_too_short:
+          other: "제목은 %{count}자 이상이어야 합니다."
+        title_too_long:
+          other: "제목은 %{count}자를 초과 할 수 없습니다."
         post_missing: "게시물은 비워 둘 수 없습니다"
-        post_length: "글은 최소 %{min}글자 이상이어야 합니다."
+        post_length:
+          other: "내용은 %{count}자 이상이어야 합니다."
         try_like: "%{heart} 버튼을 사용해 보셨습니까?"
         category_missing: "카테고리를 선택해주세요."
         tags_missing:
@@ -1679,8 +1784,8 @@ ko:
       saved: "저장되었습니다!"
       saved_draft: "초안 게시가 진행 중입니다. 다시 시작하려면 탭하세요."
       uploading: "업로드 중..."
-      show_preview: "미리보기 열기 &raquo;"
-      hide_preview: "&laquo; 미리보기 숨김"
+      show_preview: "미리보기 표시"
+      hide_preview: "미리보기 숨기기"
       quote_post_title: "전체 글을 인용"
       bold_label: "B"
       bold_title: "굵게"
@@ -1693,8 +1798,8 @@ ko:
       link_dialog_title: "하이퍼링크 삽입"
       link_optional_text: "선택적 제목"
       link_url_placeholder: "글을 검색하려면 URL을 붙여 넣거나 입력하세요."
-      quote_title: "인용구"
-      quote_text: "인용구"
+      blockquote_title: "인용구"
+      blockquote_text: "인용구"
       code_title: "코드"
       code_text: "미리 서식이 지정된 텍스트를 4칸 들여쓰기"
       paste_code_text: "여기에 코드를 입력하거나 붙여 넣습니다."
@@ -1718,8 +1823,6 @@ ko:
       yourself_confirm:
         title: "받는 사람 추가를 잊으셨나요?"
         body: "지금 이 메시지는 자신에게만 전송됩니다!"
-      slow_mode:
-        error: "이 항목은 느린 모드입니다. %{duration}마다 한 번만 게시 할 수 있습니다."
       admin_options_title: "이 글에 대한 옵션 설정"
       composer_actions:
         reply: 댓글
@@ -1748,7 +1851,7 @@ ko:
           label: "새 글"
         shared_draft:
           label: "공유 초안"
-          desc: "관리자만 볼 수있는 글 초안 작성"
+          desc: "허용된 사용자만 볼 수 있는 글 초안 작성"
         toggle_topic_bump:
           label: "글 범프 전환"
           desc: "최신 회신 날짜를 변경하지 않고 회신"
@@ -1841,14 +1944,15 @@ ko:
       from_my_computer: "내 기기에서"
       from_the_web: "웹에서"
       remote_tip: "이미지 링크"
-      remote_tip_with_attachments: "이미지 또는 파일의 링크 %{authorized_extensions}"
+      remote_tip_with_attachments: "이미지 또는 파일 링크"
       local_tip: "기기에서 이미지 선택"
-      local_tip_with_attachments: "기기에서 이미지 또는 파일 선택 %{authorized_extensions}"
+      local_tip_with_attachments: "장치에서 이미지 또는 파일 선택"
       hint: "(편집기로 드래그 앤 드롭하여 업로드 할 수도 있습니다)"
       hint_for_supported_browsers: "편집기로 이미지를 끌어다 놓거나 붙여 넣을 수도 있습니다."
       uploading: "업로드 중"
       select_file: "파일 선택"
       default_image_alt_text: 이미지
+      supported_formats: "지원되는 형식"
     search:
       sort_by: "정렬 기준"
       relevance: "관련성"
@@ -1873,6 +1977,7 @@ ko:
       or_search_google: "혹은 구글에서 검색해볼 수도 있습니다."
       search_google: "대신 구글에서 검색해보세요."
       search_google_button: "구글"
+      search_button: "검색"
       context:
         user: "@%{username}님의 글 검색"
         category: "#%{category} 카테고리에서 검색"
@@ -1938,7 +2043,7 @@ ko:
     go_back: "돌아가기"
     not_logged_in_user: "현재 활동 및 기본 설정에 대한 요약이 포함된 사용자 페이지"
     current_user: "사용자 페이지로 이동"
-    view_all: "모두 보기"
+    view_all: "모두보기 %{tab}"
     topics:
       new_messages_marker: "마지막 방문"
       bulk:
@@ -1959,7 +2064,9 @@ ko:
         change_category: "카테고리 설정"
         close_topics: "글 닫기"
         archive_topics: "글 보관"
+        move_messages_to_inbox: "받은 편지함으로 이동"
         notification_level: "알림"
+        change_notification_level: "알림 수준 변경"
         choose_new_category: "글에 대한 새 카테고리 선택:"
         selected:
           other: "사용자님은 <b>%{count}</b>개의 글을 선택했습니다."
@@ -1968,7 +2075,9 @@ ko:
         choose_new_tags: "다음 글에 대한 새 태그를 선택하십시오:"
         choose_append_tags: "다음 글에 추가 할 새 태그를 선택하십시오:"
         changed_tags: "해당 글의 태그가 변경되었습니다."
-        remove_tags: "태그 제거"
+        remove_tags: "모든 태그 제거"
+        confirm_remove_tags:
+          other: "<b>%{count}</b>개의 글에서 모든 태그가 제거됩니다. 확실한가요?"
         progress:
           other: "진행률: <strong>%{count}</strong>개의 글"
       none:
@@ -1983,7 +2092,7 @@ ko:
         top: "주요 글이 없습니다."
         educate:
           new: '<p>새로운 글이 여기에 표시됩니다. 기본적으로 지난 2일 이내에 작성된 글은 새로운 글로 간주되며 <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> 가 표시됩니다.</p><p>이 기준을 변경하려면 <a href="%{userPrefsUrl}">환경설정</a>에서 변경 하십시오.</p>'
-          unread: '<p>읽지 않은 글은 여기에 표시됩니다.</p><p>기본적으로 글은 읽지 않은 것으로 간주하고 다음과 같은 조건 중 하나를 만족하면 읽지 않은 글갯수 <span class="badge new-posts badge-notification">1</span> 을 표시합니다:</p><ul><li>글 만들기</li><li>글에 댓글달기</li><li>글을 4분 이상 읽기</li></ul><p>또는 글을 팔로우 하거나 지켜보기 위해 각 글의 밑부분에 달린 알림 제어판에서 설정하는 경우도 포합됩니다.</p><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: "더 이상 최근 글이 없습니다."
         posted: "더 이상 작성한 글이 없습니다."
@@ -2053,7 +2162,6 @@ ko:
       read_more_in_category: "더 읽을거리가 필요하신가요? %{catLink} 또는 %{latestLink}를 살펴보세요."
       read_more: "%{catLink} 또는 %{latestLink}에서 더 많은 글을 찾으실 수 있습니다."
       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: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: 모든 카테고리 보기
       browse_all_tags: 모든 태그 보기
@@ -2067,16 +2175,22 @@ ko:
         select: "사용자는 이 글에 한 번 씩만 댓글을 작성 할 수 있습니다."
         description: "빠르게 진행되거나 논쟁이되는 대화에서 신중한 대화를 유도하기위해 사용자는이 글에 추가로 글을 작성하기 위해서는 기다려야합니다."
         save: "활성화"
+        enabled_until: "다음까지 사용 가능:"
         remove: "비활성화"
         hours: "시간:"
         minutes: "분:"
         seconds: "초:"
         durations:
+          10_minutes: "10분"
           15_minutes: "15분"
+          30_minutes: "30분"
+          45_minutes: "45분"
           1_hour: "1시간"
+          2_hours: "2시간"
           4_hours: "4시간"
-          1_day: "1일"
-          1_week: "1주"
+          8_hours: "8시간"
+          12_hours: "12시간"
+          24_hours: "24시간"
           custom: "사용자 지정 기간"
       slow_mode_notice:
         duration: "이 글에 댓글을 작성하려면 %{duration}을 기다려야합니다."
@@ -2088,7 +2202,9 @@ ko:
         remove: "타이머 제거하기"
         publish_to: "게시되는 곳:"
         when: "게시일:"
-        time_frame_required: 기간을 선택하세요.
+        time_frame_required: "기간을 선택하세요."
+        min_duration: "기간은 0보다 커야 합니다."
+        max_duration: "기간은 20년 미만이어야 합니다."
       auto_update_input:
         none: "시간대 선택"
         now: "지금"
@@ -2120,6 +2236,8 @@ ko:
         label: "자동으로 글 닫기 시간:"
         error: "유효한 값을 입력하십시오."
         based_on_last_post: "글의 마지막 게시물이 이보다 오래 될 때까지 닫지 마십시오."
+      auto_close_after_last_post:
+        title: "마지막 댓글후 글 자동 닫기"
       auto_delete:
         title: "글 자동 삭제"
       auto_bump:
@@ -2132,7 +2250,7 @@ ko:
         auto_open: "이 글은 %{timeLeft}에 자동으로 열립니다."
         auto_close: "이 글은 %{timeLeft}에 자동으로 닫힙니다."
         auto_publish_to_category: "이 글은 <a href=%{categoryUrl}>#%{categoryName}</a>에 %{timeLeft} 후 게시됩니다."
-        auto_close_based_on_last_post: "이 글은 마지막 댓글이 달린 %{duration} 후 닫힙니다."
+        auto_close_after_last_post: "이 글은 마지막 댓글이 달리고 %{duration} 후 닫힙니다."
         auto_delete: "이 글은 %{timeLeft}에 자동으로 삭제됩니다."
         auto_bump: "이 글은 %{timeLeft}에 자동으로 끌어올려 집니다."
         auto_reminder: "%{timeLeft}에 현재 글 알림"
@@ -2140,6 +2258,8 @@ ko:
       auto_close_title: "자동 닫기 설정"
       auto_close_immediate:
         other: "글의 마지막 게시물은 이미 %{count}시간이 지났으므로 해당 글은 즉시 닫힙니다."
+      auto_close_momentarily:
+        other: "글의 마지막 게시물은 이미 %{count}시간이 지났으므로 일시적으로 닫힙니다."
       timeline:
         back: "뒤로"
         back_description: "읽지 않은 마지막 게시물로 돌아가기"
@@ -2151,7 +2271,8 @@ ko:
         go: "이동"
         jump_bottom: "마지막 게시물로 이동"
         jump_prompt: "이동..."
-        jump_prompt_of: "번째, %{count}개 중"
+        jump_prompt_of:
+          other: "번째, %{count}개 중"
         jump_prompt_long: "이동..."
         jump_bottom_with_number: "%{post_number}로 이동"
         jump_prompt_to_date: "현재까지"
@@ -2169,6 +2290,7 @@ ko:
           "3_1": "이 글을 작성 했으므로 알림을 받게됩니다."
           "3": "이 글을 보고 있으므로 알림을 받게됩니다."
           "2_8": "이 카테고리를 팔로우 하고 있으므로 새 댓글 수가 표시됩니다."
+          "2_8_stale": "과거에 이 카테고리를 팔로우했기 때문에 새 댓글 수가 표시됩니다."
           "2_4": "이 글에 댓글을 작성했기 때문에 새 글 수가 표시됩니다."
           "2_2": "이 글을 팔로우 하고 있기 때문에 새 글 수가 표시됩니다."
           "2": '<a href="%{basePath}/u/%{username}/preferences/notifications">이 글을 읽었으므로 새 댓글 수가 표시됩니다</a>.'
@@ -2236,6 +2358,14 @@ ko:
         title: "공유하기"
         extended_title: "링크 공유"
         help: "이 글의 링크 공유"
+        instructions: "이 글의 링크 공유:"
+        copied: "글 링크가 복사되었습니다."
+        notify_users:
+          title: "알림"
+          instructions: "다음 사용자에게 이 항목에 대해 알립니다."
+          success:
+            other: "이 글에 대해 모든 사용자에게 알렸습니다."
+        invite_users: "초대"
       print:
         title: "프린트하기"
         help: "이 토픽을 인쇄하기 좋은 버전으로 보기"
@@ -2288,14 +2418,14 @@ ko:
         username_placeholder: "아이디"
         action: "초대장 보내기"
         help: "이메일을 통해 다른 사람을 이 주제에 초대합니다."
-        to_forum: "친구에게 요약 이메일을 보내고 이 포럼에 가입할 수 있도록 링크를 전송합니다."
-        sso_enabled: "이 주제에 초대하고 싶은 사람의 아이디를 입력하세요."
+        to_forum: "링크를 클릭하여 친구가 즉시 참여할 수 있도록 간단한 이메일을 보내드립니다."
+        discourse_connect_enabled: "이 글에 초대하려는 사람의 아이디를 입력합니다."
         to_topic_blank: "이 글에 초대 할 사람의 사용자명 또는 이메일 주소를 입력하십시오."
         to_topic_email: "이메일 주소를 입력했습니다. 친구가 이 글에 즉시 댓글을 작성 할 수있는 초대장을 이메일로 보내드립니다."
         to_topic_username: "아이디를 입력하셨습니다. 이 주제에 초대하는 링크와 함께 알림을 보내겠습니다."
         to_username: "초대하려는 사용자의 아이디를 입력하세요. 이 주제에 초대하는 링크와 함께 알림을 보내겠습니다."
         email_placeholder: "이메일 주소"
-        success_email: "<b>%{emailOrUsername}</b>로 초대장을 발송했습니다. 초대를 수락하면 알려 드리겠습니다. 초대상태를 확인하려면 사용자 페이지에서 '초대장' 탭을 선택하세요."
+        success_email: "<b>%{invitee}</b>로 초대장을 발송했습니다. 초대를 수락하면 알려 드리겠습니다. 초대상태를 확인하려면 사용자 페이지에서 '초대장' 탭을 선택하세요."
         success_username: "사용자가 이 주제에 참여할 수 있도록 초대했습니다."
         error: "그 사람을 초대할 수 없습니다. 혹시 이미 초대하진 않았나요? (Invites are rate limited)"
         success_existing_email: "해당 email을 사용하고 있는 사용자 <b>%{emailOrUsername}</b> 가 이미 존재합니다. 그 사용자를 이 토픽에 참여하도록 초청했습니다."
@@ -2400,8 +2530,8 @@ ko:
       edit_reason: "사유: "
       post_number: "%{number}번째 글"
       ignored: "무시 된 콘텐츠"
-      wiki_last_edited_on: "마지막으로 위키가 수정된 일시"
-      last_edited_on: "마지막으로 편집:"
+      wiki_last_edited_on: "%{dateTime}에 마지막으로 편집 된 위키"
+      last_edited_on: "%{dateTime}에 마지막으로 수정 된 글"
       reply_as_new_topic: "연결된 주제로 답글 작성하기"
       reply_as_new_private_message: "같은 수신자에게 새로운 메시지로 답글쓰기"
       continue_discussion: "%{postLink}에서 토론을 계속:"
@@ -2421,12 +2551,19 @@ ko:
       unread: "읽지 않은 포스트"
       has_replies:
         other: "%{count}개의 댓글"
+      has_replies_count: "%{count}"
       unknown_user: "(알 수 없음/삭제된 사용자)"
       has_likes_title:
         other: "%{count}명이 이 글을 좋아합니다"
       has_likes_title_only_you: "당신이 이 글을 좋아합니다."
       has_likes_title_you:
         other: "당신 외 %{count}명이 이 글을 좋아합니다"
+      filtered_replies_hint:
+        other: "이 글과 %{count}개의 댓글 보기"
+      filtered_replies_viewing:
+        other: "댓글 %{count}개 보기"
+      in_reply_to: "상위 게시물 로드"
+      view_all_posts: "모든 글 보기"
       errors:
         create: "죄송합니다. 글을 만드는 동안 오류가 발생했습니다. 다시 시도하십시오."
         edit: "죄송합니다. 글을 수정하는 중에 오류가 발생했습니다. 다시 시도하십시오."
@@ -2439,17 +2576,11 @@ ko:
         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:
-        title: "초안 삭제"
-        confirm: "글 작성을 취소 하시겠습니까?"
-        no_value: "아니오"
-        no_save_draft: "아니오, 초안 저장"
-        yes_value: "예"
+      cancel_composer:
+        confirm: "사용자님의 게시물에 대해 무엇을하고 싶습니까?"
+        discard: "포기"
+        save_draft: "나중을 위해 초안 저장"
+        keep_editing: "편집 유지"
       via_email: "이 주제는 이메일을 통해 등록되었습니다."
       via_auto_generated_email: "이 게시글은 자동 생성된 이메일로 작성되었습니다"
       whisper: "이 포스트는 운영자를 위한 비공개 귓말입니다."
@@ -2495,7 +2626,8 @@ ko:
         unlock_post_description: "작성자가 글을 수정하도록 허용"
         delete_topic_disallowed_modal: "이 주제를 삭제할 권한이 없습니다. 실제로 삭제하려면 추론과 함께 중재자주의 플래그를 제출하십시오."
         delete_topic_disallowed: "이 글을 삭제할 수있는 권한이 없습니다"
-        delete_topic_confirm_modal: "이 글은 현재 조회수가 %{minViews}회 이상이며 인기 검색 대상 일 수 있습니다. 이 주제를 개선하기 위해 편집하는 대신 완전히 삭제 하시겠습니까?"
+        delete_topic_confirm_modal:
+          other: "이 글은 현재 조회수가 %{count}회 이상이며 인기 글 검색 대상 일 수 있습니다. 이 글을 개선하기 위해 편집하는 대신 완전히 삭제 하시겠습니까?"
         delete_topic_confirm_modal_yes: "예, 이 글을 삭제합니다."
         delete_topic_confirm_modal_no: "아니요, 이 글을 유지합니다."
         delete_topic_error: "이 항목을 삭제하는 동안 오류가 발생했습니다."
@@ -2504,6 +2636,7 @@ ko:
         change_post_notice: "관리자 공지 변경"
         delete_post_notice: "관리자 공지 삭제"
         remove_timer: "타이머를 제거"
+        edit_timer: "편집 타이머"
       actions:
         people:
           like:
@@ -2574,6 +2707,18 @@ ko:
           edit_bookmark:
             name: "북마크 수정"
             description: "북마크 이름을 수정하거나 알림 날짜 및 시간을 변경하십시오."
+          pin_bookmark:
+            name: "북마크 고정"
+            description: "북마크를 고정합니다. 북마크 목록 상단에 표시됩니다."
+          unpin_bookmark:
+            name: "북마크 고정 해제"
+            description: "북마크를 고정 해제합니다. 더 이상 북마크 목록 상단에 표시되지 않습니다."
+      filtered_replies:
+        viewing_posts_by: "%{post_count} 개의 게시물 보기"
+        viewing_subset: "몇 개의 댓글이 접혀 있습니다."
+        viewing_summary: "이 글의 요약 보기"
+        post_number: "%{username}, 글 #%{post_number}"
+        show_all: "모두 보기"
     category:
       can: "허용"
       none: "(카테고리 없음)"
@@ -2624,6 +2769,17 @@ ko:
       change_in_category_topic: "설명 편집"
       already_used: "이 색은 다른 카테고리에서 사용되고 있습니다."
       security: "보안"
+      security_add_group: "그룹 추가"
+      permissions:
+        group: "그룹"
+        see: "보기"
+        reply: "댓글"
+        create: "만들기"
+        no_groups_selected: "접근 권한이 부여된 그룹이 없습니다. 이 카테고리는 관리자만 볼 수 있습니다."
+        everyone_has_access: '이 카테고리는 공개이며, 누구나 볼 수 있고, 댓글을 작성 하고, 글을 쓸 수 있습니다. 사용 권한을 제한하려면 "everyone" 그룹에 부여된 사용 권한 중 하나 이상을 제거해야 합니다.'
+        toggle_reply: "토글 댓글 권한"
+        toggle_full: "토글 생성 권한"
+        inherited: '이 권한은 "everyone" 으로부터 상속됩니다.'
       special_warning: "경고: 이 카테고리는 사전 생성된 카테고리이기 때문에 보안 설정 변경이 불가합니다. 이 카테고리를 사용하고 싶지 않다면, 수정하지말고 삭제하세요."
       uncategorized_security_warning: "이 카테고리는 특별합니다. 카테고리가없는 주제의 보관 영역으로 사용됩니다. 보안 설정을 가질 수 없습니다."
       uncategorized_general_warning: '이 카테고리는 특별합니다. 카테고리를 선택하지 않은 새 주제의 기본 카테고리로 사용됩니다. 이 동작을 방지하고 범주를 강제로 선택 <a href="%{settingLink}">하려면 여기에서 설정을 비활성화하십시오</a> . 이름이나 설명을 변경하려면 <a href="%{customizeLink}">사용자 정의 / 텍스트 내용으로 이동하십시오</a> .'
@@ -2639,6 +2795,7 @@ ko:
       num_featured_topics: "카테고리 페이지에 표시되는 글 수:"
       subcategory_num_featured_topics: "상위 카테고리 페이지에 표시되는 주요 글 수:"
       all_topics_wiki: "기본으로 새로운 글 위키 만들기"
+      allow_unlimited_owner_edits_on_first_post: "첫 번째 게시물에 대해 글 작성자의 무제한 수정 허용"
       subcategory_list_style: "하위 카테고리 목록 스타일:"
       sort_order: "글 목록 정렬 기준:"
       default_view: "글 기본 목록:"
@@ -2662,19 +2819,19 @@ ko:
       notifications:
         watching:
           title: "주시 중"
-          description: "이 카테고리의 모든 토픽을 주시하도록 자동 설정됩니다. 모든 토픽과 게시글에 대하여 알림을 받게 되며, 새로운 게시글의 수가 표시됩니다."
+          description: "이 카테고리의 모든 글이 자동으로 관심글로 설정됩니다. 모든 글의 모든 새 댓글에 대한 알림을 받게되며 새 댓글 개수가 표시됩니다."
         watching_first_post:
           title: "새글 알림"
           description: "이 카테고리의 새 주제에 대한 알림을 받지만 주제에 대한 답장은 없습니다."
         tracking:
           title: "추적 중"
-          description: "이 카테고리의 모든 토픽을 추적하도록 자동 설정됩니다. 다른 사용자가 당신의 @이름 을 언급하거나 당신의 게시글에 답글을 달 때 알림을 받게 되며 새로운 게시글의 수가 표시됩니다."
+          description: "이 카테고리의 모든 글을 자동으로 팔로우합니다. 누군가 @name 형식으로 사용자님을 언급하거나 사용자님에게 댓글을 보내면 알림을 받게되며 새 댓글 개수가 표시됩니다."
         regular:
           title: "알림 : 일반"
           description: "누군가 내 @아아디 으로 멘션했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다."
         muted:
           title: "알림 꺼짐"
-          description: "이 카테고리 내의 새 토픽에 대해 어떠한 알림도 받지 않으며, 최신 토픽 항목에도 나타나지 않습니다."
+          description: "이 카테고리의 새 글에 대한 알림을받지 않으며 최신 글 목록에 표시되지 않습니다."
       search_priority:
         label: "검색 우선 순위"
         options:
@@ -2709,10 +2866,11 @@ ko:
       list_filters:
         all: "모든 글"
         none: "하위 카테고리 없음"
+      colors_disabled: "카테고리 스타일이 없음이므로 색상을 선택할 수 없습니다."
     flagging:
       title: "우리 커뮤니티 질서를 지키는데 도와주셔서 감사합니다!"
       action: "글 신고했습니다"
-      take_action: "조치 수행..."
+      take_action: "조치하기..."
       take_action_options:
         default:
           title: "조치하기"
@@ -2726,7 +2884,7 @@ ko:
       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> 를 영구 정지 목록에 추가하려고 합니다. 이 사용자가 스패머인 것이 확실합니까?"
+      flag_for_review: "검토 대기열"
       yes_delete_spammer: "예, 스팸 회원을 삭제합니다"
       ip_address_missing: "(알 수 없음)"
       hidden_email_address: "(숨김)"
@@ -2788,17 +2946,6 @@ ko:
         title: "이 주제는 개인 메시지입니다"
         help: "이 주제는 개인 메시지입니다"
     posts: "글"
-    posts_likes_MF: |2
-
-      이 토픽에는 {ratio, select,
-
-      low {포스트 대비 높은 좋아요를 받은}
-
-      med {포스트 대비 매우 높은 좋아요를 받은}
-
-      high {포스트 대비 엄청나게 높은 좋아요를 받은}
-
-      other {}} {count, plural, one {1 개} other {# 개의 답글이 있습니다.}}
     original_post: "원본 글"
     views: "조회수"
     views_lowercase:
@@ -2814,7 +2961,7 @@ ko:
     users_lowercase:
       other: "사용자"
     category_title: "카테고리"
-    history: "기록"
+    history: "히스토리, 최근 100개의 리비전"
     changed_by: "%{author}에 의해"
     raw_email:
       title: "수신 이메일"
@@ -2896,6 +3043,7 @@ ko:
       close: "닫기 (Esc)"
       content_load_error: '<a href="%url%">내용을</a> 로드 할 수 없습니다.'
       image_load_error: '<a href="%url%">이미지를</a> 로드 할 수 없습니다.'
+    cannot_render_video: 브라우저가 코덱을 지원하지 않기 때문에이 동영상을 렌더링 할 수 없습니다.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ","
       shortcut_key_delimiter_plus: "+"
@@ -3015,7 +3163,7 @@ ko:
       selector_no_tags: "태그 없음"
       changed: "바뀐 태그:"
       tags: "태그"
-      choose_for_topic: "선택적 태그"
+      choose_for_topic: "태그 선택"
       info: "정보"
       default_info: "이 태그는 카테고리로 제한되지 않으며 동의어가 없습니다."
       category_restricted: "이 태그는 액세스 권한이없는 카테고리로 제한됩니다."
@@ -3055,6 +3203,7 @@ ko:
       delete_unused_confirmation_more_tags:
         other: "%{tags} 외 %{count}개"
       delete_no_unused_tags: "사용되지 않은 태그가 없습니다."
+      tag_list_joiner: ", "
       delete_unused: "사용하지 않은 태그 삭제"
       delete_unused_description: "글 또는 개인 메시지에 첨부되지 않은 모든 태그 삭제"
       cancel_delete_unused: "취소"
@@ -3095,6 +3244,7 @@ ko:
         everyone_can_use: "모든 사람이 태그를 사용할 수 있습니다"
         usable_only_by_groups: "태그는 모든 사람에게 보이지만 다음 그룹만 태그를 사용할 수 있습니다."
         visible_only_to_groups: "태그는 다음 그룹에만 표시됩니다."
+        cannot_save: "태그 그룹을 저장할 수 없습니다. 태그가 하나 이상 있고 태그 그룹 이름이 비어 있지 않으며 태그 권한에 그룹이 선택되어 있는지 확인하십시오."
       topics:
         none:
           unread: "읽지 않은 토픽이 없습니다."
@@ -3107,10 +3257,11 @@ ko:
     invite:
       custom_message: "<a href>맞춤 메시지</a> 를 작성하여 초대를 좀 더 개인적으로 만드십시오."
       custom_message_placeholder: "사용자 설정 메시지를 입력하세요"
-      approval_not_required: "사용자는 이 초대를 수락하는 즉시 자동 승인됩니다."
+      approval_not_required: "사용자는이 초대를 수락하는 즉시 자동 승인됩니다."
       custom_message_template_forum: "저기요, 이 포럼에 가입하셔야 해요!"
       custom_message_template_topic: "이 토픽에 흥미 있을 거 같은데요!"
     forced_anonymous: "극단적 인로드로 인해 로그 아웃 한 사용자가 볼 수있는 것처럼 모든 사람에게 일시적으로 표시됩니다."
+    forced_anonymous_login_required: "사이트 과부하로 지금은 불러올 수 없습니다. 몇 분 후에 다시 시도하십시오."
     footer_nav:
       back: "이전"
       forward: "앞으로"
@@ -3119,6 +3270,17 @@ ko:
     safe_mode:
       enabled: "안전모드가 활성화 되었습니다. 안전모드를 종료하려면 이 웹브라우저창을 닫아야 합니다."
     image_removed: "(이미지 제거됨)"
+    do_not_disturb:
+      title: "방해 금지..."
+      label: "방해 금지"
+      remaining: "%{remaining} 남음"
+      options:
+        half_hour: "30분"
+        one_hour: "1시간"
+        two_hours: "2시간"
+        tomorrow: "내일까지"
+        custom: "사용자 정의"
+      set_schedule: "알림 일정 설정"
   admin_js:
     type_to_filter: "필터를 입력하세요"
     admin:
@@ -3146,6 +3308,10 @@ ko:
         installed_version: "설치됨"
         latest_version: "최신"
         problems_found: "현재 사이트 설정에 따른 몇 가지 조언"
+        new_features:
+          title: "\U0001F381 새로운 기능"
+          dismiss: "읽음"
+          learn_more: "더 보기"
         last_checked: "마지막으로 확인"
         refresh_problems: "새로고침"
         no_problems: "아무런 문제가 발견되지 않았습니다."
@@ -3233,10 +3399,6 @@ ko:
             available: "사용가능한 그룹 이름"
             not_available: "사용 불가능한 그룹 이름"
             blank: "그룹 이름은 공백이 될 수 없습니다"
-        bulk_add:
-          title: "그룹에 한꺼번에 추가하기"
-          complete_users_not_added: "이 사용자는 추가되지 않았습니다(계정이 있는지 확인해보세요):"
-          paste: "한 줄당 하나씩 아이디 또는 이메일 리스트를 붙여넣기 하세요."
         add_members:
           as_owner: "사용자를 이 그룹의 소유자로 설정"
         manage:
@@ -3263,7 +3425,8 @@ ko:
             effects: 효과
             trust_levels_none: "없음"
             automatic_membership_email_domains: "이 목록의 있는 항목과 사용자들이 등록한 이메일 도메인이 일치할때 이 그룹에 포함"
-            automatic_membership_user_count: "%{count} 사용자는 새 이메일 도메인을 가지며 그룹에 추가됩니다."
+            automatic_membership_user_count:
+              other: "%{count}명의 사용자는 새 이메일 도메인을 가지며 그룹에 추가됩니다."
             primary_group: "기본 그룹으로 자동 설정"
         name_placeholder: "그룹 이름, 공백 없이 username 규칙과 동일하게 입력하세요."
         primary: "주 그룹"
@@ -3275,7 +3438,10 @@ ko:
         group_members: "그룹 멤버"
         delete: "삭제"
         delete_confirm: "이 그룹을 삭제 하시겠습니까?"
+        delete_with_messages_confirm:
+          other: "이 그룹을 삭제하면 %{count}개의 메시지가 분리되고 그룹 회원은 더 이상 메시지에 접근 할 수 없습니다.<br><br>삭제 하시겠습니까?"
         delete_failed: "이것은 자동으로 생성된 그룹입니다. 삭제할 수 없습니다."
+        delete_automatic_group: 이 그룹은 자동 그룹이므로 삭제할 수 없습니다.
         delete_owner_confirm: "'%{username}' 님에게서 소유자권한을 제거할까요?"
         add: "추가"
         custom: "Custom"
@@ -3337,9 +3503,15 @@ ko:
               wordpress: 워드프레스 wp-discourse 플러그인이 작동하는데 필요합니다.
             users:
               bookmarks: 사용자 북마크를 나열합니다. ICS 형식을 사용하면 북마크 알림을 반환합니다.
-              sync_sso: SSO를 사용하여 사용자를 동기화합니다.
+              sync_sso: DiscourseConnect를 사용하여 사용자를 동기화합니다.
               show: 사용자에 대한 정보를 얻습니다.
               check_emails: 사용자 이메일을 나열합니다.
+              update: 사용자 프로필 정보를 업데이트합니다.
+              log_out: 사용자의 모든 세션을 로그 아웃합니다.
+              anonymize: 사용자 계정을 익명화합니다.
+              delete: 사용자 계정을 삭제합니다.
+            email:
+              receive_emails: 이 범위를 메일 수신자와 결합하여 수신 이메일을 처리하십시오.
       web_hooks:
         title: "Webhook"
         none: "현재 webhook이 없습니다."
@@ -3354,7 +3526,7 @@ ko:
         go_back: "목록으로 돌아가기"
         payload_url: "Payload URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "webhook을 로컬로 설정하려고 시도중입니다. 로컬 주소로 이벤트를 전송하는 것은 부작용 또는 비정상 작동을 유발할 수 있습니다. 계속할까요?"
+        warn_local_payload_url: "웹훅을 로컬 URL에 설정하려는 것 같습니다. 로컬 주소로 이벤트가 전달되면 부작용이나 예기치 않은 동작이 발생할 수 있습니다. 계속하시겠습니까?"
         secret_invalid: "Secret에는 공백이 들어갈 수 없습니다."
         secret_too_short: "Secret은 최소 12자 이상이어야 합니다."
         secret_placeholder: "시그니처를 생성하기 위한 문자열(선택사항)"
@@ -3382,7 +3554,7 @@ ko:
           details: "게시글이 생성, 편집, 삭제, 재생될 때."
         user_event:
           name: "사용자 이벤트"
-          details: "사용자가 로그인하면 로그 아웃, 생성, 승인 또는 업데이트됩니다."
+          details: "사용자가 로그인, 로그아웃, 이메일 확인, 생성, 승인 또는 업데이트 될 때."
         group_event:
           name: "그룹 이벤트"
           details: "그룹이 생성, 업데이트 또는 파괴 될 때."
@@ -3401,6 +3573,12 @@ ko:
         user_badge_event:
           name: "배지 보조금 행사"
           details: "사용자가 배지를받을 때"
+        group_user_event:
+          name: "그룹 사용자 이벤트"
+          details: "사용자가 그룹에 추가되거나 제거되는 경우"
+        like_event:
+          name: "좋아요 이벤트"
+          details: "사용자가 게시물을 좋아할 때."
         delivery_status:
           title: "발송 상태"
           inactive: "비활성화"
@@ -3587,7 +3765,9 @@ ko:
           convert: "변환"
           convert_component_alert: "이 구성 요소를 테마로 변환 하시겠습니까? %{relatives}에서 구성 요소로 제거됩니다."
           convert_component_tooltip: "이 컴포넌트를 테마로 변환"
+          convert_component_alert_generic: "이 구성 요소를 테마로 변환 하시겠습니까?"
           convert_theme_alert: "이 테마를 구성 요소로 변환 하시겠습니까? %{relatives}에서 부모로 제거됩니다."
+          convert_theme_alert_generic: "이 테마를 구성 요소로 변환 하시겠습니까?"
           convert_theme_tooltip: "이 테마를 컴포넌트로 변환"
           inactive_themes: "비활성 테마:"
           inactive_components: "사용하지 않은 구성 요소 :"
@@ -3621,17 +3801,20 @@ ko:
           included_components: "포함 된 구성 요소"
           add_all: "모두 추가"
           import_web_tip: "테마가 있는 Repository"
-          import_web_advanced: "많은..."
+          direct_install_tip: "정말로 아래의 저장소에서 <strong>%{name}</strong>을 설치하시겠습니까?"
+          import_web_advanced: "고급..."
           import_file_tip: "테마가 포함 된 .tar.gz, .zip 또는 .dcstyle.json 파일"
-          is_private: "테마가 비공개 git 저장소에 있습니다."
-          remote_branch: "지점 이름 (선택 사항)"
+          is_private: "테마는 개인 git 저장소에 있습니다."
+          remote_branch: "브랜치 이름 (선택 사항)"
           public_key: "다음 공개 키 액세스 권한을 리포지토리에 부여하십시오."
+          public_key_note: "위에 유효한 개인 저장소 URL을 입력하면 SSH 키가 생성되어 여기에 표시됩니다."
           install: "설치"
           installed: "설치됨"
           install_popular: "인기"
           install_upload: "기기에서"
           install_git_repo: "git 저장소에서"
           install_create: "새로 만들기"
+          duplicate_remote_theme: "테마 구성 요소“%{name}”은 이미 설치되어 있습니다. 다른 복사본을 설치 하시겠습니까?"
           about_theme: "소개"
           license: "라이센스 정보"
           version: "버전:"
@@ -3650,7 +3833,8 @@ ko:
           update_to_latest: "최신버전으로 업데이트하기"
           check_for_updates: "업데이트 체크하기"
           updating: "업데이트 중..."
-          up_to_date: "테마가 최신입니다, 마지막으로 체크한 일시:"
+          up_to_date: "테마가 최신 상태입니다. 마지막 확인:"
+          has_overwritten_history: "강제 푸시로 Git 기록을 덮어 썼으므로 현재 테마 버전이 더 이상 존재하지 않습니다."
           add: "추가"
           theme_settings: "테마 설정"
           no_settings: "이 테마에는 설정이 없습니다."
@@ -3659,6 +3843,7 @@ ko:
           commits_behind:
             other: "테마가 %{count} 개 커밋 뒤쳐졌습니다!"
           compare_commits: "(새로운 커밋 참조)"
+          remote_theme_edits: "이 테마를 편집하려면 <a href='%{repoURL}' target='_blank'>저장소에 변경 사항을 제출해야합니다.</a>"
           repo_unreachable: "이 테마의 Git 저장소에 접속할 수 없습니다. 에러 메시지:"
           imported_from_archive: "이 테마는 .zip 파일에서 가져 왔습니다."
           scss:
@@ -3681,13 +3866,11 @@ ko:
             title: "사용자 색상 정의 입력 (고급 사용자용)"
             placeholder: |2-
 
-              이 스타일시트를 사용하여 사용자 정의 CSS 속성 목록에 사용자 정의 색상을 추가합니다.
+              이 스타일시트를 사용하여 CSS 사용자 정의 속성 목록에 사용자 정의 색상을 추가합니다.
 
               예:
 
-              :root {
-              --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};
-              }
+              %{example}
 
               플러그인 및/또는 코어와의 충돌을 피하기 위해 속성 이름 앞에 붙이는 것이 좋습니다.
           head_tag:
@@ -3699,6 +3882,7 @@ ko:
           yaml:
             text: "YAML"
             title: "YAML 형식으로 테마 설정 정의"
+          scss_warning_inline: "테마에서 핵심 SCSS 색상 변수를 사용하는 것은 더 이상 사용되지 않습니다."
         colors:
           select_base:
             title: "기본 색상 팔레트 선택"
@@ -3750,7 +3934,7 @@ ko:
             description: "글 삭제 등에 사용되는 강조색"
           success:
             name: "성공"
-            description: "동작이 성공적으로 수행되었음을 알립니다."
+            description: "작업이 성공했음을 나타내는데 사용됩니다."
           love:
             name: "사랑"
             description: "좋아요 버튼 색"
@@ -3970,6 +4154,7 @@ ko:
             topic_unarchived: "아카이브 취소된 글"
             post_staff_note_create: "관리자 메모 추가"
             post_staff_note_destroy: "관리자 메모 삭제"
+            delete_group: "그룹 삭제"
         screened_emails:
           title: "블락된 이메일들"
           description: "누군가가 새로운 계정을 만들면 아래 이메일 주소는 체크되고 등록은 블락됩니다, 또는 다른 조치가 취해집니다."
@@ -4017,30 +4202,33 @@ ko:
         title: "\\b감시 단어"
         search: "검색"
         clear_filter: "지우기"
-        show_words: "단어 보이기"
-        one_word_per_line: "한 줄에 한 단어"
+        show_words:
+          other: "%{count}개 단어 보기"
         download: 다운로드
         clear_all: 모두 지우기
-        clear_all_confirm_block: "차단 작업에 대해 본 모든 단어를 지우시겠습니까?"
-        clear_all_confirm_censor: "검열 동작에 대해 본 모든 단어를 지우시겠습니까?"
-        clear_all_confirm_flag: "신고 작업에 대해 본 모든 단어를 지우시겠습니까?"
-        clear_all_confirm_require_approval: "승인 필요 조치에 대해 본 모든 단어를 지우시겠습니까?"
-        word_count:
-          other: "%{count}개 단어"
+        clear_all_confirm: "%{action} 작업에 대한 모든 관심 단어를 지우시겠습니까?"
         actions:
           block: "차단"
           censor: "가리기"
           require_approval: "승인 필요"
           flag: "신고"
+          replace: "바꾸기"
+          tag: "태그"
         action_descriptions:
           block: "이 단어를 포함한 포스트는 게시되지 못하게 합니다. 사용자가 포스트를 올리려할 때 에러 메시지를 표시합니다."
           censor: "이 단어를 포함해도 포스트는 올라가지만, 가리기 설정된 단어는 다른 글자로 교체됩니다."
           require_approval: "이 단어를 포함한 포스트가 올라가려면 스탭의 허가가 필요합니다."
           flag: "이러한 단어가 포함 된 게시물을 허용하지만 관리자가 검토 할 수 있도록 검토 대상 항목으로 표시합니다."
+          replace: "게시물의 단어를 다른 단어 또는 링크로 교체"
+          tag: "첫 번째 게시물을 기반으로 글에 자동 태그 지정"
         form:
-          label: "새 단어:"
-          placeholder: "전체 단어 또는 * 을 와일드카드로 사용"
+          label: "단어 또는 문구가 있음"
+          placeholder: "단어 또는 구 입력 (*는 와일드카드)"
           placeholder_regexp: "정규표현식"
+          replacement_label: "교체"
+          replacement_placeholder: "예 또는 https://example.com"
+          tag_label: "태그"
+          tag_placeholder: "태그1,태그2,태그3"
           add: "추가"
           success: "성공"
           exists: "이미 존재 함"
@@ -4093,6 +4281,9 @@ ko:
         check_email:
           title: "사용자의 이메일 주소 표시"
           text: "보이기"
+        check_sso:
+          title: "SSO 페이로드 표시"
+          text: "보기"
       user:
         suspend_failed: "이 사용자를 접근 금지하는데 오류 발생 %{error}"
         unsuspend_failed: "이 사용자를 접근 허용 하는데 오류 발생 %{error}"
@@ -4103,7 +4294,9 @@ ko:
         suspend_reason_title: "정지 이유"
         suspend_reasons:
           not_listening_to_staff: "관리자의 조치를 따르지 않음"
+          consuming_staff_time: "스태프의 불균형 한 시간 사용"
           combatative: "분란 조장"
+          in_wrong_place: "잘못된 곳에서"
           no_constructive_purpose: "반대나 분란 조장의 목적 이외에는 다른 긍정적인 목적이 없습니다."
           custom: "사용자 지정..."
         suspend_message: "이메일 메시지"
@@ -4131,7 +4324,7 @@ ko:
         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 {# 댓글} other {# 댓글}} 그리고 {TOPICS, plural, one {# 글} other {# 글}} 을 삭제하려고 합니다. 확실합니까?"
         silence: "쓰기 금지"
         unsilence: "쓰기 금지 해제"
         silenced: "쓰기 금지?"
@@ -4180,6 +4373,9 @@ ko:
         anonymize_yes: "Yes, anonymize this account"
         anonymize_failed: "There was a problem anonymizing the account."
         delete: "사용자 삭제"
+        delete_posts:
+          progress:
+            title: "게시물 삭제 진행률"
         merge:
           button: "병합"
           prompt:
@@ -4191,6 +4387,8 @@ ko:
             target_username_placeholder: "새로운 소유자의 사용자 이름"
             transfer_and_delete: "전송 및 삭제 @ %{username}"
             cancel: "취소"
+          progress:
+            title: "병합 진행률"
           confirmation:
             title: "전송 및 삭제 @ %{username}"
             description: |
@@ -4279,16 +4477,15 @@ ko:
           on_grace_period: "현재 승급 유예 기간이므로 강등되지 않습니다."
           locked_will_not_be_promoted: "회원등급이 고정되었습니다. 승급되지 않을 것입니다."
           locked_will_not_be_demoted: "회원등급이 고정되었습니다. 강등되지 않을 것입니다."
-        sso:
-          title: "Single Sign On"
-          external_id: "External ID"
+        discourse_connect:
+          external_id: "외부 ID"
           external_username: "아이디"
-          external_name: "Name"
-          external_email: "Email"
+          external_name: "이름"
+          external_email: "이메일"
           external_avatar_url: "프로필 사진 URL"
           last_payload: "마지막 페이로드"
           delete_sso_record: "SSO 레코드 삭제"
-          confirm_delete: "이 단일 사인온 (SSO) 레코드를 삭제하시겠습니까?"
+          confirm_delete: "이 DiscourseConnect 레코드를 삭제 하시겠습니까?"
       user_fields:
         title: "사용자 필드"
         help: "사용자가 입력할 수 있는 필드를 추가"
@@ -4319,6 +4516,10 @@ ko:
           title: "사용자 카드에 표시할까요?"
           enabled: "사용자 카드에 표시하기"
           disabled: "사용자 카드에 표시하지 않기"
+        searchable:
+          title: "검색 가능한가요?"
+          enabled: "검색 가능"
+          disabled: "검색 할 수 없음"
         field_types:
           text: "텍스트 필드"
           confirm: "확인"
@@ -4333,6 +4534,8 @@ ko:
         go_back: "검색으로 돌아가기"
         recommended: "다음의 텍스트를 요구에 맞게 편집하는 것을 권장:"
         show_overriden: "Override 된 설정만 보여주기"
+        locale: "언어:"
+        fallback_locale_warning: "%{fallback}기반 언어를 편집하고 있습니다. 인터페이스 언어로 %{fallback}을 선택한 사용자는 변경 사항을 볼 수 없습니다."
         more_than_50_results: "50개 이상의 결과가 있습니다. 검색 범위를 좁히십시오."
       settings:
         show_overriden: "변경된 것들만 보기"
@@ -4340,6 +4543,10 @@ ko:
         reset: "초기화"
         none: "없음"
       site_settings:
+        emoji_list:
+          invalid_input: "이모티콘 목록에는 유효한 이모티콘명만 포함되어야 합니다. 예: hugs"
+          add_emoji_button:
+            label: "이모티콘 추가"
         title: "사이트 설정"
         no_results: "검색된 결과가 없습니다."
         more_than_30_results: "30개 이상의 결과가 있습니다. 검색 범위를 좁히거나 카테고리를 선택하세요."
@@ -4392,6 +4599,9 @@ ko:
           modal_no: "아니요, 앞으로 만 변경 사항을 적용하십시오."
         simple_list:
           add_item: "항목 추가..."
+        json_schema:
+          edit: 편집기 실행
+          modal_title: "%{name} 수정"
       badges:
         title: 배지
         new_badge: 새 배지
@@ -4428,8 +4638,12 @@ ko:
         enabled: 배지 기능 사용
         icon: 아이콘
         image: 이미지
+        graphic: 그래픽
         icon_help: "Font Awesome 아이콘 이름을 입력하십시오 (일반 아이콘에는 접두사 &#39;far-&#39;, 브랜드 아이콘에는 &#39;fab-&#39;사용)"
-        image_help: "이미지의 URL을 입력하세요 (둘 다 설정된 경우 아이콘 필드보다 우선함)"
+        image_help: "둘 다 설정된 경우 이미지 업로드가 아이콘 필드를 덮어씁니다."
+        select_an_icon: "아이콘 선택"
+        upload_an_image: "이미지 업로드"
+        read_only_setting_help: "사용자 정의 텍스트"
         query: 배지 쿼리(SQL)
         target_posts: 글들을 대상으로 하는 쿼리
         auto_revoke: 회수 쿼리를 매일 실행
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 32b2f4eaec..ef8924a82e 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -130,6 +130,11 @@ lt:
           few: "prieš %{count} dienas"
           many: "prieš %{count} dienų"
           other: "prieš %{count} dienų"
+        x_months:
+          one: "prieš %{count} mėnesį"
+          few: "prieš %{count} mėnesius"
+          many: "prieš %{count} mėnesių"
+          other: "prieš %{count} mėnesių"
       later:
         x_days:
           one: "po %{count} dienos"
@@ -192,6 +197,8 @@ lt:
     topic_admin_menu: "temos veiksmai"
     wizard_required: "Sveiki, tai jūsų naujasis Discourse! Pradėkime nuo<a href='%{url}' data-auto-route='true'>Instliacijos</a>✨"
     emails_are_disabled: "Visos išeinančios elektroninės žinutės buvo uždraustos administratoriaus. Jokių papildų įspėjamųjų žinučių nebus išsiųsta"
+    software_update_prompt:
+      dismiss: "Praleisti"
     bootstrap_mode_disabled: "Paleidimo režimas bus išjungtas per 24 valandas."
     themes:
       default_description: "Numatytasis"
@@ -254,6 +261,11 @@ lt:
     now: "Ką tik"
     read_more: "skaityti daugiau"
     more: "Daugiau"
+    x_more:
+      one: "%{count} Daugiau"
+      few: "%{count} Daugiau"
+      many: "%{count} Daugiau"
+      other: "%{count} Daugiau"
     less: "Mažiau"
     never: "niekada"
     every_30_minutes: "kas 30 minučių"
@@ -284,8 +296,6 @@ lt:
       moderators: "Moderatoriai"
       stat:
         all_time: "Per visą laiką"
-        last_7_days: "Paskutinės 7"
-        last_30_days: "Paskutinės 30"
       like_count: "Patinka"
       topic_count: "Temos"
       post_count: "Įrašai"
@@ -308,12 +318,6 @@ lt:
         never: "Niekada"
       search: "Paieška"
       reminders:
-        later_today: "Šiandien vėliau"
-        tomorrow: "Rytoj"
-        next_week: "Kitą savaitę"
-        later_this_week: "Šia savaitę vėliau"
-        start_of_next_business_week: "Pirmadienis"
-        next_month: "Kitą mėnesį"
         at_time: "ties %{date_time}"
     copy_codeblock:
       copied: "nukopijuota!"
@@ -323,9 +327,6 @@ lt:
       new_topic: "Naujos temos juodraštis"
       new_private_message: "Naujas privatus pranešimo juodraštis"
       topic_reply: "Atsakymo juodraštis"
-      abandon:
-        yes_value: "Taip, atšaukti"
-        no_value: "Ne, palikti"
     topic_count_new:
       one: "Pamatyk %{count} naują temą"
       few: "Pamatyk %{count} naujas temas"
@@ -378,10 +379,21 @@ lt:
         username: "Slapyvardis"
         email: "Epaštas"
         name: "Vardas"
+        reject_reason: "Priežastis"
       topics:
         topic: "Tema"
         reviewable_count: "Skaičiuoti"
         details: "detalės"
+        unique_users:
+          one: "%{count} vartotojas"
+          few: "%{count} vartotojų"
+          many: "%{count} vartotojų"
+          other: "%{count} vartotojų"
+      replies:
+        one: "%{count} atsakymas"
+        few: "%{count} atsakymai"
+        many: "%{count} atsakymai"
+        other: "%{count} atsakymai"
       edit: "Redaguoti"
       save: "Saugoti"
       cancel: "Atšaukti"
@@ -421,10 +433,26 @@ lt:
           title: "Pažymėtas pranešimas"
         reviewable_user:
           title: "Narys"
+        reviewable_post:
+          title: "Įrašai"
       approval:
         title: "Įrašui reikalingas patvirtinimas"
         description: "Mes gavome tavo naują įrašą, tačiau jis turi būti patvirtintas moderatoriaus. Ačiū už kantrybę!"
         ok: "GERAI"
+      example_username: "Vartotojo vardas"
+    relative_time_picker:
+      days:
+        one: "diena"
+        few: "dienos"
+        many: "dienos"
+        other: "dienos"
+    time_shortcut:
+      later_today: "Šiandien vėliau"
+      tomorrow: "Rytoj"
+      next_week: "Kitą savaitę"
+      later_this_week: "Šia savaitę vėliau"
+      start_of_next_business_week: "Pirmadienis"
+      next_month: "Kitą mėnesį"
     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>"
@@ -440,6 +468,7 @@ lt:
       sent_by_user: "Išsiuntė <a href='%{userUrl}'>%{user}</a>"
       sent_by_you: "Išsiųsta nuo <a href='%{userUrl}'>jūsų</a>"
     directory:
+      username: "Slapyvardis"
       filter_name: "rušiuoti pagal vartotojus"
       title: "Vartotojai"
       likes_given: "Duota"
@@ -490,9 +519,17 @@ lt:
           credentials:
             username: "Slapyvardis"
             password: "Slaptažodis"
+          settings:
+            title: "Nustatymai"
+          mailboxes:
+            disabled: "uždrausta"
         membership:
           title: Narystė
           access: Prieiga
+        categories:
+          title: Kategorijos
+        tags:
+          title: Etiketės
         logs:
           title: "Atąskaita"
           when: "Kada"
@@ -503,6 +540,8 @@ lt:
           details: "Detalės"
           from: "Nuo"
           to: "Kam"
+      permissions:
+        title: "Leidimai"
       public_admission: "Leisti vartotojams laisvai prisijungti prie grupės (reikalauja viešai matomos grupės)"
       public_exit: "Leisti vartotojams laisvai išeiti iš grupės"
       empty:
@@ -618,7 +657,6 @@ lt:
       posts: "Įraša"
       topics: "Temos"
       latest: "Paskutinės"
-      latest_by: "paskutinės pagal"
       toggle_ordering: "perjungti išdėstimo tvarką"
       subcategories: "Subkategorijos"
       topic_sentence:
@@ -626,6 +664,9 @@ lt:
         few: "%{count} temos"
         many: "%{count}temų"
         other: "%{count}temos"
+      topic_stat_unit:
+        week: "savaitė"
+        month: "mėnesis"
     ip_lookup:
       title: IP adreso peržiųra
       hostname: Adresas
@@ -664,9 +705,15 @@ lt:
           unread: "Neperskaitytos"
         ignore_duration_username: "Slapyvardis"
         ignore_duration_save: "Ignoruoti"
+        ignore_option: "Nepaisoma"
         mute_option: "Nutildyta"
         normal_option: "Įprastas"
+      notification_schedule:
+        none: "Nieko"
+        monday: "Pirmadienis"
+        to: "kam"
       activity_stream: "Aktyvumas"
+      read: "Perskaityti"
       preferences: "Nustatymai"
       feature_topic_on_profile:
         save: "Saugoti"
@@ -688,12 +735,13 @@ lt:
         perm_denied_expl: "Užklausa atmesta nes jūs to neleidote. Jaigu norite gauti perspėjimus, tai galite jūsų naršyklės nustatymuose."
         disable: "Išjungti Pranešimus"
         enable: "Galimi Pranešimai"
-        each_browser_note: "Pranešimas: Jūs turite pasikeisti nustatymus ant kiekvienos naršyklės, kurią naudojate."
         consent_prompt: "Ar norite gauti tiesioginius pranešimus, kai žmonės atsakys į jūsų įrašus?"
       dismiss: "Praleisti"
       dismiss_notifications: "Atmesti visus"
       dismiss_notifications_tooltip: "Pažymėkite visus pranešimus kaip Perskaitytus."
       first_notification: "Asmeniniai perspėjimai. Jūs galite atlikti jums reikiamą užklausą pasirinkdami atitinkamus nustatymus."
+      color_schemes:
+        regular: "Nuolatinės"
       allow_private_messages: "Leisti kitiems vartotojams siųsti man asmeninius pranešimus"
       external_links_in_new_tab: "Atidaryti visas pridėtas nuorodas naujame lange"
       enable_quoting: "Įjungti citatų atsakymus pabrėžtam tekstui"
@@ -706,6 +754,7 @@ lt:
       suspended_notice: "Šis vartotojas nušalintas iki %{date}."
       suspended_permanently: "Šis narys suspenduotas"
       suspended_reason: "Priežastis:"
+      github_profile: "GitHub"
       email_activity_summary: "Aktyvumo veikla"
       mailing_list_mode:
         label: "Elektroninio pašto grupė"
@@ -733,6 +782,7 @@ lt:
       watched_first_post_tags: "Stebime Pirmą Įrašą"
       watched_first_post_tags_instructions: "Jūs būsite perspėjami apie įrašus kėkvienoje naujoje temoje su pasirinktomis etiketėmis."
       muted_categories: "Nutildytos"
+      regular_categories: "Nuolatinės"
       delete_account: "Ištrinti mano vartotoją"
       delete_account_confirm: "Ar tikrai norite visam laikui ištrinti savo paskyrą? Šis veiksmas yra galutinis."
       deleted_yourself: "Jūsų paskyra sėkmingai ištrinta."
@@ -740,6 +790,7 @@ lt:
       admin_delete: "Ištrinti"
       users: "Vartotojai"
       muted_users: "Nutildytos"
+      ignored_users: "Nepaisoma"
       tracked_topics_link: "Rodyti"
       automatically_unpin_topics: "Automatiškai atsegti temas pasiekus apačią."
       apps: "Programėlės"
@@ -748,6 +799,7 @@ lt:
       api_approved: "Patvirtinta:"
       theme: "Tema"
       home: "Numatytasis pagrindinis puslapis"
+      staged: "Inscenizuotas"
       staff_counters:
         flags_given: "naudingos vėliavos"
         flagged_posts: "įrašai su vėliavomis"
@@ -768,6 +820,7 @@ lt:
         tags: "Gairės"
       preferences_nav:
         account: "Paskyra"
+        security: "Saugumo"
         profile: "Profilis"
         emails: "Epaštai"
         notifications: "Pranešimai"
@@ -901,6 +954,8 @@ lt:
         every_hour: "kas valandą"
         daily: "kas dieną"
         weekly: "kas savaitę"
+        every_month: "kiekvieną mėnesį"
+        every_six_months: "kas šešis mėnesius"
       email_level:
         title: "Atsiųskite man el. laišką, jei kažkas mane cituoja, atsako į mano įrašą, pakviečia į temą ar pamini mane."
         always: "visada"
@@ -931,8 +986,17 @@ lt:
         after_10_minutes: "po 10 minučių"
       notification_level_when_replying: "Kuomet paskelbiu temą, pažymeti tą temą kaip"
       invited:
-        search: "įveskite, kad ieškotumete pakvietim"
         title: "Pakvietimai"
+        pending_tab: "Laukiama"
+        pending_tab_with_count: "Neperskaityti (%{count})"
+        redeemed_tab: "Atstatyta"
+        redeemed_tab_with_count: "Atstatyta (%{count})"
+        groups: "Grupės"
+        topic: "Tema"
+        edit: "Redaguoti"
+        remove: "Pašalinti"
+        reinvited: "Pakvietimas persiųstas"
+        search: "įveskite, kad ieškotumete pakvietim"
         user: "Pakviestas vartotojas"
         truncated:
           one: "Rodomas pirmas pakvietimas"
@@ -940,33 +1004,20 @@ lt:
           many: "Rodomi pirmi %{count} pakvietimai."
           other: "Rodomi pirmi %{count} pakvietimai."
         redeemed: "Atstatyti pakvietimai"
-        redeemed_tab: "Atstatyta"
-        redeemed_tab_with_count: "Atstatyta (%{count})"
         redeemed_at: "Atstatyta"
         pending: "Laukiami pakvietimai"
-        pending_tab: "Laukiama"
-        pending_tab_with_count: "Neperskaityti (%{count})"
         topics_entered: "Peržiūrėtos temos"
         posts_read_count: "Perskaityta įrašų"
         expired: "Šis pakvietimas nebegalioja"
-        rescind: "Pašalinti"
-        rescinded: "Pakvietimas pašalintas"
-        reinvite: "Persiųsti pakvietimą"
-        reinvite_all: "Persiųsti visus pakvietimus dar kartą"
         reinvite_all_confirm: "Ar esate tikri, norėdami persiųsti visus pakvietimus?"
-        reinvited: "Pakvietimas persiųstas"
-        reinvited_all: "Visi pakvietimai buvo persiųsti!"
         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: "Kviesti"
         valid_for: "Pakvietimo nuoroda galioja tik šiam elektroninio pašto adresui: %{email}"
         invite_link:
           success: "Pavyko sugeneruoti pakvietimo nuorodą"
         bulk_invite:
-          success: "Failas įkeltas sėkmingai, jums bus pranešta kada procesas bus baigtas."
           error: "Atsiprašome, failas privalo buti CSV formato."
       password:
         title: "Slaptažodis"
@@ -980,6 +1031,21 @@ lt:
         title: "Aprašymas"
         stats: "Statistika"
         time_read: "skaitymo laikas"
+        likes_given:
+          one: "duota"
+          few: "duota"
+          many: "duota"
+          other: "duota"
+        likes_received:
+          one: "gauta"
+          few: "gauta"
+          many: "gauta"
+          other: "gauta"
+        bookmark_count:
+          one: "žymės"
+          few: "žymės"
+          many: "žymės"
+          other: "žymės"
         top_replies: "Populiariausi Atsakymai"
         no_replies: "Jokių atsakymų nerasta."
         more_replies: "Daugiau Atsakymų"
@@ -1040,7 +1106,6 @@ lt:
     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."
     refresh: "Atnaujinti"
     home: "Pradinis"
@@ -1049,15 +1114,6 @@ lt:
       login_disabled: "Prisijungimas yra išjungtas, kai svetainė yra skaitymo režime."
       logout_disabled: "Atsijungimas yra laikinai išjunktas kuomet puslapis yra žiūrimas skaitymo režimu"
     learn_more: "sužinoti daugiau..."
-    all_time: "iš viso"
-    all_time_desc: "temų sukurta"
-    year: "metai"
-    year_desc: "sukurtos temos per paskutines 365 dienas"
-    month: "mėnesis"
-    month_desc: "sukurta temų per paskutines 30 dienų"
-    week: "savaitė"
-    week_desc: "sukurta temų per paskutines 7 dienas"
-    day: "diena"
     first_post: Pirmas įrašas
     mute: Nutildyti
     unmute: Pašalinti nutildymą
@@ -1075,11 +1131,8 @@ lt:
       sign_up: "Registruotis"
       hide_session: "Priminti rytoj"
       hide_forever: "Ačiū ne!"
-      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>."
       enable: "Apibendrinkite šią Temą"
       disable: "Peržiūrėti visus Įrašus"
     deleted_filter:
@@ -1099,7 +1152,7 @@ lt:
     trust_level: "Patikimumo lygis"
     search_hint: "vartotojo vardas, el. paštas arba IP adresas"
     create_account:
-      title: "Sukurti naują paskyrą"
+      header_title: "Sveiki!"
       failed: "Įvyko kažkas blogai, gali būti, kad šis el. paštas jau yra užregistruotas, pameginkite pasinaudoti slaptažodžio priminimo nuoroda"
     forgot_password:
       title: "Slaptažodžio atkūrimas"
@@ -1117,10 +1170,8 @@ lt:
       complete_email_not_found: "Jokia paskyra nesutampa su <b>%{email}</b>"
       confirm_title: Tęsti į %{site_name}
     login:
-      title: "Prisijungti"
       username: "Vartotojas"
       password: "Slaptažodis"
-      email_placeholder: "el. paštas arba slaptažodis"
       caps_lock_warning: "Įjungtas didžiųjų raidžių rašymas"
       error: "Nežinoma klaida"
       rate_limit: "Prašome palaukti prieš prisijungiant dar kartą."
@@ -1159,6 +1210,7 @@ lt:
       invited_by: "Jus pakvietė:"
       accept_invite: "Priimti kvietimą"
       name_label: "Vardas"
+      password_label: "Slaptažodis"
       optional_description: "(pasoronktinai)"
     password_reset:
       continue: "Tėsti į %{site_name}"
@@ -1213,7 +1265,6 @@ lt:
       options: "Nustatymai"
       whisper: "šnabždesys"
       unlist: "neįtraukta į sąrašą"
-      blockquote_text: "Blokuoti citatą"
       add_warning: "Tai Oficialus Ispėjimas"
       toggle_whisper: "Įjungti Šnabždesį"
       toggle_unlisted: "Pažymeti iš sarašo"
@@ -1223,9 +1274,6 @@ 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"
         category_missing: "Jūs privalote pasirinkti kategoriją"
       save_edit: "Išsaugoti pakeitimus"
       reply_original: "Atsakyti į Originalią Temą"
@@ -1245,8 +1293,6 @@ lt:
       saving: "Saugoma..."
       saved: "Išsaugota!"
       uploading: "Įkeliama..."
-      show_preview: "rodyti peržiūrą &raquo;"
-      hide_preview: "&laquo; slėpti peržiūrą"
       quote_post_title: "Cituoti visą įrašą"
       bold_title: "Paryškinimas"
       bold_text: "paryškintas tekstas"
@@ -1256,8 +1302,8 @@ lt:
       link_description: "įveskite čia nuorodos aprašymą"
       link_dialog_title: "Įkelti nuorodą"
       link_optional_text: "papildoma antraštė"
-      quote_title: "Blokuoti citatą"
-      quote_text: "Blokuoti citatą"
+      blockquote_title: "Blokuoti citatą"
+      blockquote_text: "Blokuoti citatą"
       code_title: "Tekstas kodui"
       code_text: "Tekstą kodui atitraukite per 4 tarpelius "
       paste_code_text: "įveskite arba ėkopijuokite kodą čia"
@@ -1287,6 +1333,7 @@ lt:
           label: "Nauja tema"
         shared_draft:
           label: "Bendrinami juodraščiai"
+      ignore: "Ignoruoti"
     notifications:
       tooltip:
         regular:
@@ -1310,6 +1357,12 @@ lt:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} ir dar %{count}</span> %{description}"
+        few: "<span class='multi-user'>%{username}, %{username2}ir %{count} kiti</span> %{description}"
+        many: "<span class='multi-user'>%{username}, %{username2} ir %{count}kitų</span> %{description}"
+        other: "<span class='multi-user'>%{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}"
@@ -1320,6 +1373,8 @@ lt:
       granted_badge: "Gavote '%{description}'"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Nauja tema</span> %{description}"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</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"
@@ -1343,10 +1398,7 @@ 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}"
       local_tip: "Pasirinkti nuotraukas iš įrenginio"
-      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"
       select_file: "Pasirinkti failus"
@@ -1374,6 +1426,7 @@ lt:
       results_page: "Paieškos rezultatai ir '%{term}'"
       start_new_topic: "Galbūt pradėkite naują temą?"
       search_google_button: "Google"
+      search_button: "Paieška"
       context:
         user: "Ieškoti įrašų nuo @%{username}"
         category: "Ieškoti #%{category}kategorijoje"
@@ -1409,10 +1462,14 @@ lt:
           archived: archyvuota
           noreplies: neturi atsakymų
         post:
+          count:
+            label: Įrašai
           time:
             label: Paskelbta
             before: anksčiau
             after: po to
+        views:
+          label: Peržiūros
     hamburger_menu: "Eiti į kitą temų sąrašą ar kategoriją"
     new_item: "Nauja"
     go_back: "grįžti atgal"
@@ -1437,6 +1494,7 @@ lt:
         change_category: "Nustatyti kategoriją"
         close_topics: "Uždaryti temas"
         archive_topics: "Archyvuoti temas"
+        move_messages_to_inbox: "Perkelti į Pranešimų dėžutę"
         notification_level: "Pranešimai"
         choose_new_category: "Pasirinkti naują kategoriją temoms:"
         selected:
@@ -1459,6 +1517,7 @@ lt:
         new: "Daugiau nėra jokių naujų temų."
         unread: "Daugiau nėra jokių neperskaitytų temų."
         category: "Daugiau nėra jokių temų kategorijoje %{category}."
+        tag: "Daugiau nėra jokių temų kategorijoje %{tag}."
         top: "Daugiau nėra jokių populiarių temų."
         bookmarks: "Daugiau pažymėtų temų nėra"
     topic:
@@ -1531,12 +1590,14 @@ lt:
       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_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
       jump_reply_up: Pereiti į ankstesnį atsakymą
       jump_reply_down: Pereitį į sekantį atsakymą
       deleted: "Tema buvo ištrinta"
+      slow_mode_update:
+        save: "Įjungti"
+        remove: "Išjungti"
       topic_status_update:
         title: "Temos laikmatis"
         save: "Nustatyti laikmatį"
@@ -1550,11 +1611,7 @@ lt:
         later_this_week: "Šia savaitę vėliau"
         this_weekend: "Šį savaitgalį"
         next_week: "Kitą savaitę"
-        two_weeks: "Dvi savaitės"
         next_month: "Kitą mėnesį"
-        three_months: "Trys mėnesiai"
-        six_months: "Pusė metų"
-        one_year: "Metai"
         forever: "Am-inai"
         pick_date_and_time: "Pasirinkite datą ir laiką"
       temp_open:
@@ -1569,7 +1626,7 @@ lt:
       status_update_notice:
         auto_open: "Ši tema automatiškai atsidarys po %{timeLeft} ."
         auto_close: "Ši tema automatiškai užsidarys po %{timeLeft}."
-        auto_close_based_on_last_post: "Ši tema užsidarys po %{duration} po paskutinio atsakymo."
+        auto_close_after_last_post: "Ši tema užsidarys po %{duration} po paskutinio atsakymo."
       auto_close_title: "Automatinio uždarymo nustatymai"
       timeline:
         back: "Atgal"
@@ -1581,7 +1638,7 @@ lt:
         go: "eiti"
         jump_bottom: "Pereiti į sekantį įrašą"
         jump_prompt: "peršokti į..."
-        jump_prompt_of: "iš %{count} įrašų"
+        jump_prompt_long: "Peršokti į..."
         jump_bottom_with_number: "pereiti į įrašą %{post_number}"
         jump_prompt_or: "arba"
         total: visi įrašai
@@ -1652,6 +1709,7 @@ lt:
       share:
         title: "Pasidalinti"
         help: "Pasidalink šios temos nuoroda"
+        invite_users: "Kviesti"
       print:
         title: "Spausdinti"
         help: "Atverti spausdinimui draugišką šios temos versiją"
@@ -1702,14 +1760,13 @@ lt:
         username_placeholder: "Slapyvardis"
         action: "Siųsti pakvietimą"
         help: "pakviesk kitus į šią temą el. laišku ar pranešimu"
-        to_forum: "Mes išsiųsime trumpą el. laišką leidžiantį tavo draugui iš karto prisijungti tiesiog paspaudžiant nuorodą. Jokia registracija nebūtina."
-        sso_enabled: "Įveskite vartotojo vardą žmogaus, kurį norite pakviesti į šią temą."
+        discourse_connect_enabled: "Įveskite vartotojo vardą žmogaus, kurį norite pakviesti į šią temą."
         to_topic_blank: "Įrašykite vartotojo vardą ar el. paštą žmogaus, kurį norite pakviesti į šią temą."
         to_topic_email: "El. paštas įvestas. Mes išsiųsime trumpą el. laišką, kuris suteiks galimybę iš karto atsakyti į temą."
         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>%{invitee}</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"
@@ -1779,10 +1836,9 @@ lt:
           other: "Jūs pasirinkote <b>%{count}</b> įrašus."
     post:
       quote_reply: "Citata"
+      quote_share: "Pasidalinti"
       edit_reason: "Priežastis:"
       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:"
       follow_quote: "eiti į cituotą įrašą"
@@ -1792,6 +1848,7 @@ lt:
         few: "(autoriaus išimtas įrašas automatiškai bus ištrintas per %{count} valandas, nebent turėjo vėliavą)"
         many: "(autoriaus išimtas įrašas automatiškai bus ištrintas per %{count} valandas, nebent turėjo vėliavą)"
         other: "(autoriaus išimtas įrašas automatiškai bus ištrintas per %{count} valandas, nebent turėjo vėliavą)"
+      collapse: "suskleisti"
       expand_collapse: "išskleisti/suskleisti"
       gap:
         one: "Peržiūrėti %{count} paslėptą atsakymą"
@@ -1823,12 +1880,6 @@ lt:
         image_upload_not_allowed_for_new_user: "Atsiprašome, bet nauji vartotojai negali įkelti nuotraukų."
         attachment_upload_not_allowed_for_new_user: "Atsiprašome, bet nauji vartotojai negali įkelti priedų."
         attachment_download_requires_login: "Atsiprašome, bet jūs turite būti prisijungęs, kad galėtumėt atsisiųsti priedus."
-      abandon_edit:
-        no_value: "Ne, palikti"
-      abandon:
-        confirm: "Ar tikrai norite atšaukti savo įrašą?"
-        no_value: "Ne, palikti"
-        yes_value: "Taip, atšaukti"
       via_email: "Šis įrašas buvo gautas per el. paštą"
       whisper: "Šis įrašas yra privatus šnabždesys moderatoriams"
       wiki:
@@ -1874,6 +1925,11 @@ lt:
         delete_topic: "ištrinti temą"
       actions:
         people:
+          like:
+            one: "mėgstate"
+            few: "mėgstate"
+            many: "mėgstate"
+            other: "mėgstate"
           like_capped:
             one: "ir %{count}kitas mėgsta tai"
             few: "ir %{count}kitų mėgsta tai"
@@ -1949,6 +2005,11 @@ lt:
       change_in_category_topic: "Redaguoti aprašyma"
       already_used: "Ši spalva jau priskirta prie kitos kategorijos"
       security: "Saugumo"
+      permissions:
+        group: "Grupė"
+        see: "Peržiūrėti"
+        reply: "Atsakyti"
+        create: "Sukurti"
       special_warning: "Įspėjimas: Ši kategorija yra iš anksto numatyta kategorija ir saugumo nustatymai negali būti keičiami. Jeigu nenorite naudoti šios kategorijos, ištrinkie ją vietoj pakartotino naudojimo."
       images: "Paveiksliukai"
       email_in: " papildomas naujas el. pašto adresas:"
@@ -1976,11 +2037,11 @@ lt:
           description: "Būsi perspėtas kai kažkas paminės tavo @vardą ar tau atsakys."
         muted:
           title: "Nutildytos"
-          description: "Tau nebus siunčiami pranešimai susiję su šia kategorijos tema."
       search_priority:
         options:
           normal: "Įprastas"
           ignore: "Ignoruoti"
+          high: "Aukštas"
       sort_options:
         default: "numatytasis"
         likes: "Mėgsta"
@@ -2000,6 +2061,14 @@ lt:
     flagging:
       title: "Ačiū, kad padedi padedi išlaikyti forumą civilizuotu!"
       action: "Uždėti Įrašui Vėliavą"
+      take_action_options:
+        default:
+          title: "Imtis Veiksmų"
+          details: "Prieiti prie vėliavų ribos tuoj pat, o ne laukti daugiau vartotojų vėliavų"
+        suspend:
+          title: "Sustabdyti vartotoją"
+        silence:
+          title: "Nutildyti narį"
       notify_action: "Žinutės"
       official_warning: "Oficialus įspėjimas"
       delete_spammer: "Ištrinti Vartotoją"
@@ -2070,12 +2139,6 @@ 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_likes_MF: |
-      Ši tema turi {count, plural, one {1 reply} other {# replies}} {ratio, select,
-      low {with a high like to post ratio}
-      med {with a very high like to post ratio}
-      high {with an extremely high like to post ratio}
-      other {}}
     original_post: "Originalus įrašas"
     views: "Peržiūros"
     views_lowercase:
@@ -2103,7 +2166,6 @@ lt:
       many: "vartotojai"
       other: "vartotojai"
     category_title: "Kategorija"
-    history: "Istorija"
     changed_by: "pagal %{author}"
     raw_email:
       title: "Įeinantis paštas"
@@ -2195,6 +2257,7 @@ lt:
       readonly: "Peržiūrėti"
     lightbox:
       download: "atsisiųsti"
+      counter: "%curr% iš %total%"
     keyboard_shortcuts_help:
       title: "Klaviatūros trumpiniai"
       jump_to:
@@ -2321,6 +2384,9 @@ lt:
       back: "Atgal"
       share: "Dalintis"
       dismiss: "Praleisti"
+    do_not_disturb:
+      options:
+        custom: "Išskirtinės"
   admin_js:
     type_to_filter: "įrašyk kažką dėl filtro..."
     admin:
@@ -2342,11 +2408,14 @@ lt:
         version_check_pending: "Matomai jūs nesenai atsinaujinote. Nuostabu!"
         installed_version: "Įrašyta"
         latest_version: "Naujausia"
+        new_features:
+          dismiss: "Praleisti"
         last_checked: "Paskutinį kartą tikrinta"
         refresh_problems: "Atnaujinti"
         no_problems: "Nerasta jokių problemų"
         moderators: "Moderatoriai:"
         admins: "Administratoriai:"
+        silenced: "Nutildytas:"
         suspended: "Sustabdyti:"
         private_messages_short: "Msgs"
         private_messages_title: "Žinutės"
@@ -2380,6 +2449,9 @@ lt:
           all: "Visi"
           view_table: "table"
           refresh_report: "Refresh Report"
+          daily: Kasdien
+          monthly: Kas mėnesį
+          weekly: Kas savaitę
           groups: "Visos grupės"
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">Paieškos įrašai</a>'
@@ -2402,9 +2474,6 @@ lt:
             available: "Grupės pavadinimas galimas"
             not_available: "Grupės pavadinimas negalimas"
             blank: "Grupės pavadinimas negali buti tuščias"
-        bulk_add:
-          title: "Didžioji dauguma pridėta prie Grupės"
-          paste: "Pridėti vartotojų ir jų el. pašto sąrašą. Po vieną vartotoją vienoje linijoje:"
         manage:
           interaction:
             email: Epaštas
@@ -2451,6 +2520,8 @@ lt:
         description: Aprašymas
         save: Saugoti
         continue: Tęsti
+        scopes:
+          action: Veiksmas
       web_hooks:
         create: "Sukurti"
         save: "Saugoti"
@@ -2564,6 +2635,7 @@ lt:
           revert_confirm: "Ar tikrai nori atstatyti pakeitimus?"
         theme:
           theme: "Tema"
+          customize_desc: "Pakeisti:"
           title: "Temos"
           create: "Sukurti"
           create_type: "Tipas"
@@ -2583,6 +2655,7 @@ lt:
           install_popular: "Populiaros"
           about_theme: "Apie"
           license: "Licensija"
+          version: "Versija:"
           enable: "Įgalinti"
           disable: "Išjungti"
           component_of: "Komponentas:"
@@ -2811,21 +2884,15 @@ lt:
           title: "Klaidų įrašai"
       watched_words:
         title: "Peržiūrėti Žodžiai"
+        search: "paieška"
         clear_filter: "Išvalyti"
-        show_words: "rodyti žodžius"
         download: Atsisiųsti
         clear_all: Išvalyti viską
-        word_count:
-          one: "%{count} žodis"
-          few: "%{count} žodžiai"
-          many: "%{count} žodžiai"
-          other: "%{count} žodžiai"
         actions:
           block: "Blokuoti"
           require_approval: "Reikalauja patvirtinimo"
           flag: "Pranešti"
         form:
-          label: "Naujas Žodis:"
           add: "Pridėti"
           success: "Sėkmingai"
           exists: "Jau egzistuoja"
@@ -2848,6 +2915,8 @@ lt:
           active: "Aktyvūs"
           staff: "Komanda"
           suspended: "Sustabdyti"
+          silenced: "Nutildytas"
+          staged: "Inscenizuotas"
         approved: "Patvirtinta?"
         titles:
           active: "Aktyvūs vartotojai"
@@ -2867,12 +2936,15 @@ lt:
         check_email:
           title: "Atskleisk šio vartotojo el. pašto adresą"
           text: "Rodyti"
+        check_sso:
+          text: "Rodyti"
       user:
         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"
+        suspend_reason_title: "Suspendavimo priežastis"
         suspend_message: "E-pašto žinutė"
         suspended_by: "Sustabdė"
         silence_reason: "Priežastis"
@@ -2996,12 +3068,11 @@ lt:
           on_grace_period: "Šiuo metu yra paaukštinimo laikotarpyje, nebus pažemintas."
           locked_will_not_be_promoted: "Užrakintas pasitikėjimo lygis. Niekada nebus paaukštintas."
           locked_will_not_be_demoted: "Užrakintas pasitikėjimo lygis. Niekada nebus pažemintas."
-        sso:
-          title: "Single Sign On"
+        discourse_connect:
           external_id: "Išorinis ID"
           external_username: "Slapyvardis"
-          external_name: "Vardas ir Pavardė"
-          external_email: "El. paštas"
+          external_name: "Vardas"
+          external_email: "Epaštas"
           external_avatar_url: "Profilio Nuotraukos URL"
       user_fields:
         title: "Vartotojo laukeliai"
@@ -3181,6 +3252,9 @@ lt:
         embed_by_username: "Vartotojo vardas skirtas temų sukūrimui"
         embed_post_limit: "Maskimalus įterpiamų įrašų skaičius"
         embed_truncate: "Truncate the embedded posts"
+        allowed_embed_selectors: "CSS selector for elements that are allowed in embeds"
+        blocked_embed_selectors: "CSS selector for elements that are removed from embeds"
+        allowed_embed_classnames: "Leidžiamos CSS klasės"
         save: "Išsaugoti Įterpimo Nustatymus"
       permalink:
         title: "Laikinos Nuorodos"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 7684cb06e3..47f4d2c238 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -49,6 +49,10 @@ lv:
           zero: "0 s"
           one: "%{count} s"
           other: "%{count} s"
+        less_than_x_minutes:
+          zero: "< %{count} m"
+          one: "< %{count} m"
+          other: "< %{count} m"
         x_minutes:
           zero: "0 m"
           one: "%{count} m"
@@ -152,6 +156,8 @@ lv:
         disabled: "noņēma šo baneri %{when}. Tas vairs neparādīsies katras lapas augšā."
     wizard_required: "Laipni lūgti jūsu jaunajā Discourse! Sāksim ar <a href='%{url}' data-auto-route='true'>uzstādīšanas palīgu</a> ✨"
     emails_are_disabled: "Administrators ir globāli izslēdzis visus izejošos e-pastus. Netiks nosūtīti nekāda veida paziņojumi."
+    software_update_prompt:
+      dismiss: "Nerādīt"
     themes:
       default_description: "Noklusējums"
     s3:
@@ -202,6 +208,10 @@ lv:
     now: "tikko"
     read_more: "lasīt vairāk"
     more: "Vairāk"
+    x_more:
+      zero: "Vēl %{count}"
+      one: "Vēl %{count}"
+      other: "Vēl %{count}"
     less: "Mazāk"
     never: "nekad"
     every_30_minutes: "katras 30 minūtes"
@@ -246,19 +256,12 @@ lv:
     bookmarks:
       remove: "Noņemt grāmatzīmi"
       save: "Saglabāt"
+      auto_delete_preference:
+        never: "Nekad"
       search: "Meklē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"
-      abandon:
-        yes_value: "Jā, pamest"
-        no_value: "Nē, paturēt"
     preview: "priekšskatījums"
     cancel: "atcelt"
     save: "Saglabāt izmaiņas"
@@ -300,11 +303,21 @@ lv:
         email: "E-pasts"
         name: "Vārds"
         fields: "Lauki"
+        reject_reason: "Iemesls"
       topics:
         topic: "Tēmas"
         reviewable_count: "Skaits"
         deleted: "[Temats dzēsts]"
         original: "(sākotnējais temats)"
+        details: "detaļas"
+        unique_users:
+          zero: "%{count} lietotāji"
+          one: "%{count} lietotājs"
+          other: "%{count} lietotāji"
+      replies:
+        zero: "%{count} atbildes"
+        one: "%{count} atbilde"
+        other: "%{count} atbildes"
       edit: "Labot"
       save: "Saglabāt"
       cancel: "Atcelt"
@@ -318,15 +331,31 @@ lv:
       statuses:
         pending:
           title: "Gaidošie"
+        approved:
+          title: "Apstiprināts"
         rejected:
           title: "Noraidīts"
       types:
         reviewable_user:
           title: "Lietotājs"
+        reviewable_post:
+          title: "Ieraksts"
       approval:
         title: "Ieraksts gaida apstiprinājumu"
         description: "Mēs saņēmām jūsu ierakstu, taču vispirms to jāapstiprina moderatoram. Lūdzu, esiet pacietīgi."
         ok: "OK"
+      example_username: "lietotājvārds"
+    relative_time_picker:
+      days:
+        zero: "dienas"
+        one: "diena"
+        other: "dienas"
+    time_shortcut:
+      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ī"
     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>"
@@ -342,6 +371,7 @@ lv:
       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:
+      username: "Lietotājvārds"
       filter_name: "atlasīt pēc lietotājvārda"
       title: "Lietotāji"
       likes_given: "Dots"
@@ -386,8 +416,14 @@ lv:
           credentials:
             username: "Lietotājvārds"
             password: "Parole"
+          settings:
+            title: "Iestatījumi"
         membership:
           title: Piederība
+        categories:
+          title: Sadaļas
+        tags:
+          title: Tagi
         logs:
           title: "Žurnāls"
           when: "Kad"
@@ -398,6 +434,8 @@ lv:
           details: "Detaļas"
           from: "No"
           to: "Kam"
+      permissions:
+        title: "Atļaujas / Pieejas"
       public_admission: "Atļaut lietotājiem brīvi pievienoties grupai (šai grupai jābūt publiski redzamai)"
       public_exit: "Ļaut lietotājiem brīvi pamest grupu"
       empty:
@@ -496,13 +534,15 @@ lv:
       posts: "Raksti"
       topics: "Tēmas"
       latest: "Jaunākie"
-      latest_by: "jaunāks par"
       toggle_ordering: "mainīt secības kontroli"
       subcategories: "Apakšsadaļas"
       topic_sentence:
         zero: "Nav tēmu"
         one: "%{count} tēma"
         other: "%{count} tēmas"
+      topic_stat_unit:
+        week: "nedēļa"
+        month: "mēnesis"
     ip_lookup:
       title: IP adreses meklēšana
       hostname: Resursdatora nosaukums
@@ -544,7 +584,11 @@ lv:
         add_ignored_user: "Pievienot..."
         mute_option: "Noklusināts"
         normal_option: "Normāls"
+      notification_schedule:
+        none: "Nav"
+        to: "kam"
       activity_stream: "Aktivitāte"
+      read: "Lasīts"
       preferences: "Iestatījumi"
       feature_topic_on_profile:
         save: "Saglabāt"
@@ -565,11 +609,13 @@ lv:
         perm_denied_expl: "Jūs neatļāvāt paziņojumus. Atļaujiet paziņojumus jūsu pārlūkprogrammas iestatījumos."
         disable: "Atslēgt paziņojumus"
         enable: "Ieslēgt paziņojumus"
-        each_browser_note: "Piezīme: šis iestatījums jānomaina katrā pārlūkprogrammā. kuru izmantojat."
       dismiss: "Nerādīt"
       dismiss_notifications: "Vairs nerādīt visus"
       dismiss_notifications_tooltip: "Atzīmēt visus nelasītos paziņojumus kā izlasītus"
       first_notification: "Jūsu pirmais paziņojums! Izvēlieties to, lai sāktu."
+      color_schemes:
+        undo: "Atlikt"
+        regular: "Regulārs"
       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"
@@ -579,6 +625,7 @@ lv:
       admin_tooltip: "Šis lietotājs ir administrators"
       suspended_notice: "Lietotājs ir īslaicīgi bloķēts līdz %{date}."
       suspended_reason: "Iemesls:"
+      github_profile: "GitHub"
       email_activity_summary: "Aktivitātes atskaite"
       mailing_list_mode:
         label: "Vēstkopas režīms"
@@ -606,6 +653,7 @@ lv:
       watched_first_post_tags: "Seko pirmajam ierakstam"
       watched_first_post_tags_instructions: "Jums paziņos par pirmo ierakstu katrā jaunajā tēmā ar šiem tagiem."
       muted_categories: "Klusināts"
+      regular_categories: "Regulārs"
       no_category_access: "Kā moderatoram jums ir ierobežota kategoriju piekļuve, saglabāšana ir atspējota."
       delete_account: "Izdzēst manu profilu"
       delete_account_confirm: "Vai esat drošs, ka vēlaties neatgriezeniski dzēst savu profilu? Šo darbību nevar atcelt!"
@@ -621,6 +669,7 @@ lv:
       undo_revoke_access: "Atcelt piekļuves liegšanu"
       api_approved: "Apstiprināts:"
       theme: "Tēma"
+      staged: "Izveidots"
       staff_counters:
         flags_given: "noderīgas sūdzības"
         flagged_posts: "ieraksti ar sūdzībām"
@@ -641,6 +690,7 @@ lv:
         tags: "Birkas"
       preferences_nav:
         account: "Konts"
+        security: "Drošība"
         profile: "Profils"
         emails: "E-pasti"
         notifications: "Paziņojumi"
@@ -798,41 +848,38 @@ lv:
         after_10_minutes: "pēc 10 minūtēm"
       notification_level_when_replying: "Kad es ierakstu tēmā, iestatīt tēmai"
       invited:
-        search: "raksti, lai meklētu ielūgumos..."
         title: "Ielūgumi"
+        pending_tab: "Gaidošie"
+        pending_tab_with_count: "Gaidošie (%{count})"
+        redeemed_tab: "Pieņemti"
+        redeemed_tab_with_count: "Pieņemti (%{count})"
+        invited_via: "Ielūgums"
+        groups: "Grupas"
+        topic: "Tēmas"
+        edit: "Labot"
+        remove: "Atcelt"
+        reinvited: "Ielūgums atkārtots"
+        search: "raksti, lai meklētu ielūgumos..."
         user: "Ielūgtie lietotāji"
         truncated:
           zero: "Nav ielūgumu."
           one: "Pirmais ielūgums."
           other: "Pirmie %{count} ielūgumi."
         redeemed: "Pieņemtie ielūgumi"
-        redeemed_tab: "Pieņemti"
-        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})"
         topics_entered: "Apskatītās tēmas"
         posts_read_count: "Izlasītie ieraksti"
         expired: "Šis ielūgums ir izbeidzies."
-        rescind: "Atcelt"
-        rescinded: "Ielūgums atcelts"
-        reinvite: "Atkārtot ielūgumu"
-        reinvite_all: "Atkārtot visus ielūgumus"
         reinvite_all_confirm: "Vai tiešām vēlaties atkārtot visus ielūgumus?"
-        reinvited: "Ielūgums atkārtots"
-        reinvited_all: "Visi ielūgumi atkārtoti!"
         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: "Ielūgt"
         valid_for: "Ielūguma saite ir derīga tikai šai e-pasta adresei: %{email}"
         invite_link:
           success: "Ielūguma saite gatava!"
         bulk_invite:
-          success: "Fails veiksmīgi lejuplādēts, jums paziņos, kad process beidzies."
           error: "Atvainojiet, failam jābūt CSV formātā."
       password:
         title: "Parole"
@@ -854,6 +901,14 @@ lv:
           zero: "ierakstu izveidoti"
           one: "ieraksts izveidots"
           other: "izveidotie ieraksti"
+        likes_given:
+          zero: "dots"
+          one: "dots"
+          other: "dots"
+        likes_received:
+          zero: "saņemts"
+          one: "saņemts"
+          other: "saņemts"
         days_visited:
           zero: "apmeklētas dienas"
           one: " apmeklēta diena"
@@ -926,7 +981,6 @@ lv:
     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."
     refresh: "Pārlādēt"
     read_only_mode:
@@ -934,15 +988,6 @@ lv:
       login_disabled: "Pieslēgšanās ir atslēgta, kamēr vietne ir \"tikai lasīšanas\" režīmā."
       logout_disabled: "Iziešana ir atslēgta, kamēr vietne ir \"tikai lasīšanas\" režīmā."
     learn_more: "uzzināt vairāk..."
-    all_time: "kopā"
-    all_time_desc: "pavisam izveidotas tēmas"
-    year: "gads"
-    year_desc: "pēdējās 365 dienās izveidotie ieraksti"
-    month: "mēnesis"
-    month_desc: "pēdējās 30 dienās izveidotās tēmas"
-    week: "nedēļa"
-    week_desc: "pēdējās 7 dienās izveidotās tēmas"
-    day: "diena"
     first_post: Pirmais ieraksts
     mute: Noklusināt
     unmute: Pārtraukt klusināšanu
@@ -957,11 +1002,8 @@ lv:
       sign_up: "Pierakstīties"
       hide_session: "Atgādināt man rīt"
       hide_forever: "nē, paldies"
-      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>."
       enable: "Tēmas kopsavilkums"
       disable: "Parādīt visus ierakstus"
     deleted_filter:
@@ -971,6 +1013,7 @@ lv:
       disable: "Rādīt dzēstos ierakstus"
     private_message_info:
       title: "Ziņa"
+      add: "Pievienot..."
       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"
@@ -981,7 +1024,6 @@ lv:
     trust_level: "Uzticības līmenis"
     search_hint: "lietotājvārds, e-pasts vai IP adrese"
     create_account:
-      title: "Izveidot jaunu profilu"
       failed: "Notika neparedzēta kļūda; varbūt šis e-pasts ir jau reģistrēts, pamēģiniet izmantot \"aizmirsu paroli\""
     forgot_password:
       title: "Paroles atjaunošana"
@@ -1000,10 +1042,8 @@ lv:
       complete_email_not_found: "Neviens konts neatbilst <b>%{email}</b>"
       confirm_title: Turpināt %{site_name}
     login:
-      title: "Ieiet sistēmā"
       username: "Lietotājs"
       password: "Parole"
-      email_placeholder: "e-pasts vai lietotājvārds"
       caps_lock_warning: "Ir ieslēgts Caps Lock"
       error: "Nezināma kļūda"
       rate_limit: "Lūdzu uzgaidiet pirms nākamā mēģinājuma ieiet sistēmā"
@@ -1053,6 +1093,7 @@ lv:
       accept_invite: "Pieņemt ielūgumu"
       success: "Jūsu konts ir izveidots un jūs esat ielogojies "
       name_label: "Vārds"
+      password_label: "Parole"
       optional_description: "(pēc izvēles)"
     password_reset:
       continue: "Turpināt %{site_name}"
@@ -1074,6 +1115,7 @@ lv:
     conditional_loading_section:
       loading: Ielādē...
     date_time_picker:
+      from: "No"
       to: Kam
     emoji_picker:
       filter_placeholder: Meklēt emoji
@@ -1094,7 +1136,6 @@ lv:
       options: "Iespējas"
       whisper: "čuksts"
       unlist: "paslēpts"
-      blockquote_text: "Bloka citāts"
       add_warning: "Šis ir oficiāls brīdinājums."
       toggle_whisper: "Čukstēšana"
       toggle_unlisted: "Paslēpšana no tēmu saraksta"
@@ -1112,9 +1153,6 @@ lv:
       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"
         category_missing: "Jums ir jāizvēlas sadaļa"
       save_edit: "Saglabāt izmaiņas"
       reply_original: "Atbildēt sākotnējā tēmā"
@@ -1134,8 +1172,6 @@ lv:
       saving: "Saglabā"
       saved: "Saglabāts!"
       uploading: "Augšuplādē..."
-      show_preview: "rādīt priekšskatījumu &raquo;"
-      hide_preview: "&laquo; slēpt priekšskatījumu"
       quote_post_title: "Citēt visu ierakstu"
       bold_label: "B"
       bold_title: "Treknraksts"
@@ -1147,8 +1183,8 @@ lv:
       link_description: "ievadiet saites aprakstu šeit"
       link_dialog_title: "Ievietojiet saiti"
       link_optional_text: "neobligāts nosaukums"
-      quote_title: "Bloka citāts"
-      quote_text: "Ierakstiet bloka citāta saturu"
+      blockquote_title: "Bloka citāts"
+      blockquote_text: "Bloka citāts"
       code_title: "Formatēts teksts"
       code_text: "piešķirt formatētajam tekstam 4 atstarpju atkāpi"
       paste_code_text: "ierakstiet vai ielīmējiet formatēto tekstu šeit"
@@ -1170,6 +1206,7 @@ lv:
         edit: Labot
         create_topic:
           label: "Jauna tēma"
+      ignore: "Ignorēt"
     notifications:
       title: "paziņojumi par @vārda pieminēšanu, atbildēm uz jūsu ierakstiem un tēmām, ziņām, utt."
       none: "Pašlaik neizdodas ielādēt paziņojumus."
@@ -1189,13 +1226,11 @@ 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}"
       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}"
-      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ē"
       select_file: "Izvēlēties failu"
+      default_image_alt_text: bilde
     search:
       sort_by: "Kārtot pēc"
       relevance: "Nozīmīgums"
@@ -1212,6 +1247,7 @@ lv:
       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_button: "Meklēt"
       context:
         user: "Meklēt ierakstus ar @%{username}"
         category: "Meklēt #%{category} sadaļā"
@@ -1242,10 +1278,14 @@ lv:
           noreplies: ir bez atbildēm
           single_user: ir rakstījis tikai viens lietotājs
         post:
+          count:
+            label: Ieraksti
           time:
             label: Ierakstīts
             before: līdz
             after: pēc
+        views:
+          label: Skatījumi
     hamburger_menu: "iet uz citu tēmu sarakstu vai sadaļu"
     new_item: "jauns"
     go_back: "atgriezties"
@@ -1271,6 +1311,7 @@ lv:
         change_category: "Norādīt sadaļu"
         close_topics: "Slēgt tēmas"
         archive_topics: "Arhivēt tēmas"
+        move_messages_to_inbox: "Pārvietot uz iesūtni"
         notification_level: "Paziņojumi"
         choose_new_category: "Izvēlēties jaunu sadaļu šīm tēmām:"
         selected:
@@ -1290,8 +1331,6 @@ lv:
         bookmarks: "Jūs vēl neesat pievienojuši grāmatzīmēm nevienu tēmu."
         category: "Sadaļā %{category} nav tēmu."
         top: "Nav svarīgu tēmu."
-        educate:
-          unread: '<p>Jūsu nelasītās tēmas parādās šeit.</p><p>Pēc noklusējuma tēmas tiek uzskatītas par nelasītām un tiks uzskaitītas <span class="badge new-posts badge-notification">1</span> ja jūs:</p><ul><li>Izveidojāt tēmu</li><li>Atbildējāt tēmā</li><li>Lasījāt tēmu vairāk nekā 4 minūtes</li></ul><p>Vai jūs atzīmējāt Sekot vai Skatī tēmas apakšā.</p><p>To var izmainīt jūsu <a href="%{userPrefsUrl}">iestatījumos</a>.</p>'
       bottom:
         latest: "Vairāk jaunāko tēmu nav. "
         posted: "Vairāk publicēto tēmu nav. "
@@ -1299,6 +1338,7 @@ lv:
         new: "Vairāk jauno tēmu nav. "
         unread: "Vairāk nelasīto tēmu nav. "
         category: "Vairāk sadaļās %{category} tēmu nav. "
+        tag: "Vairāk sadaļās %{tag} tēmu nav. "
         top: "Vairāk svarīgu tēmu nav. "
         bookmarks: "Vairāk grāmatzīmēs ievietoto tēmu nav. "
     topic:
@@ -1363,12 +1403,14 @@ lv:
       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_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
       jump_reply_up: pāriet uz agrāku atbildi
       jump_reply_down: pāriet uz vēlāku atbildi
       deleted: "Tēma ir dzēsta "
+      slow_mode_update:
+        save: "Ieslēgt"
+        remove: "Atslēgt"
       topic_status_update:
         save: "Uzstādīt taimeri "
         num_of_hours: "Stundu skaits:"
@@ -1394,7 +1436,6 @@ lv:
         title: "Aizvērt uz laiku "
       auto_close:
         title: "Automātiski aizvērt tēmu "
-        label: "Automātiski aizvērt tēmas stundas"
         error: "Lūdzu ievadiet derīgu vērtību "
         based_on_last_post: "Neaizvērt, līdz pēdējais ziņojums šajā tēmā ir vismaz tik vecs. "
       auto_delete:
@@ -1405,7 +1446,7 @@ lv:
         auto_open: "Šo tēmu automātiski atvērs %{timeLeft}."
         auto_close: "Šo tēmu automātiski slēgs %{timeLeft}."
         auto_publish_to_category: "Šo tēmu publicēs <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Šo tēmu slēgs %{duration} pēc pēdējās atbildes."
+        auto_close_after_last_post: "Šo tēmu slēgs %{duration} pēc pēdējās atbildes."
         auto_delete: "Šo tēmu automātiski dzēsīs pēc %{timeLeft}."
         auto_reminder: "Jums atgādinās par šo tēmu pēc %{timeLeft}."
       auto_close_title: "Automātiskās slēgšanas iestatījumi"
@@ -1424,7 +1465,7 @@ lv:
         go: "doties"
         jump_bottom: "pāriet pie pēdējā ieraksta"
         jump_prompt: "pāriet pie..."
-        jump_prompt_of: "no %{count} ierakstiem"
+        jump_prompt_long: "Pāriet pie..."
         jump_bottom_with_number: "pāriet pie ieraksta %{post_number}"
         jump_prompt_or: "vai"
         total: kopējais ierakstu skaits
@@ -1503,6 +1544,7 @@ lv:
       share:
         title: "Dalīties"
         help: "dalīties ar saiti uz so tēmu"
+        invite_users: "Ielūgt"
       print:
         title: "Drukāt"
         help: "Atvērt šīs tēmas drukas versiju"
@@ -1553,14 +1595,13 @@ lv:
         username_placeholder: "lietotājvārds"
         action: "Nosūtīt ielūgumu"
         help: "Ielūgt citus uz šo tēmu, izmantojot e-pastu vai paziņojumus"
-        to_forum: "Mēs nosūtīsim īsu e-pastu, kas ļaus jūsu draugam nekavējoties pievienoties, uzklikšķinot uz saites un bez ienākšanas forumā."
-        sso_enabled: "Ievadiet personas, ko vēlētos ielūgt šai tēmā, lietotājvārdu."
+        discourse_connect_enabled: "Ievadiet personas, ko vēlētos ielūgt šai tēmā, lietotājvārdu."
         to_topic_blank: "Ievadiet personas, ko vēlētos ielūgt šai tēmā, lietotājvārdu vai e-pastu."
         to_topic_email: "Jūs esat ievadījis e-pasta adresi. Mēs nosūtīsim e-pastā ielūgumu, kas ļaus jūsu draugam nekavējoties atbildēt šai tēmā."
         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>%{invitee}</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ā."
@@ -1623,10 +1664,9 @@ lv:
           other: "Jūs esat izvēlējies <b>%{count}</b> ierakstus."
     post:
       quote_reply: "Citāts"
+      quote_share: "Dalīties"
       edit_reason: "Iemesls:"
       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}:"
@@ -1636,6 +1676,7 @@ lv:
         zero: "(autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundām, ja neviens nav ziņojis par to)"
         one: "(autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundas, ja neviens nav ziņojis par to)"
         other: "(autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundām, ja neviens nav ziņojis par to)"
+      collapse: "sakļaut"
       expand_collapse: "paplašināt/minimizēt"
       gap:
         zero: "apslēpt %{count} slēptās atbildes"
@@ -1666,12 +1707,6 @@ lv:
         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."
-      abandon_edit:
-        no_value: "Nē, paturēt"
-      abandon:
-        confirm: "Vai esat drošs, ka vēlaties atteikties no sava ieraksta?"
-        no_value: "Nē, paturēt"
-        yes_value: "Jā, pamest"
       via_email: "šis ieraksts atnāca e-pastā"
       via_auto_generated_email: "šis ieraksts atnāca automātiski ģenerētā e-pastā"
       whisper: "šis ieraksts ir privāts čuksts moderatoriem"
@@ -1706,6 +1741,11 @@ lv:
         grant_badge: "Piešķirt Žetonu"
         delete_topic: "Dzēst tēmu"
       actions:
+        people:
+          like:
+            zero: "patika ieraksts"
+            one: "patika ieraksts"
+            other: "patika ieraksts"
         by_you:
           off_topic: "Jūs ziņojāt par šo kā novirzīšanos no tēmas"
           spam: "Jūs ziņojāt par šo kā spamu"
@@ -1780,8 +1820,14 @@ lv:
       change_in_category_topic: "Rediģēt aprakstu"
       already_used: "Šī krāsa ir izmantota citai sadaļai"
       security: "Drošība"
+      permissions:
+        group: "Grupa"
+        see: "Skatīt"
+        reply: "Atbildēt"
+        create: "Izveidot"
       special_warning: "Brīdinājums: šī sadaļa ir automātiski izveidota un tās drošības uzstādījumi nav maināmi. Ja jūs nevēlaties šo sadaļu izmantot, izdzēsiet to, nevis pielietojiet citiem mērķiem."
       images: "Attēli"
+      email_in: "Īpašas ienākošā e-pasta adreses:"
       email_in_allow_strangers: "Pieņemt e-pastus no anonīmiem lietotājiem bez profiliem"
       email_in_disabled: "Jaunu tēmu ievietošana, izmantojot e-pastu, ir atcelta foruma iestatījumos. Lai atļautu ievietot jaunas tēmas, izmantojot e-pastu,"
       show_subcategory_list: "Rādīt apakšsadaļu sarakstu virs tēmām šai sadaļā."
@@ -1801,18 +1847,15 @@ lv:
       notifications:
         watching:
           title: "Novērošana"
-          description: "Jūs automātiski novērosiet visas tēmas šajās sadaļās. Jums paziņos par katru jaunu ierakstu katrā tēmā, kā arī parādīs jauno atbilžu skaitu."
         watching_first_post:
           title: "Novērot pirmo ierakstu"
         tracking:
           title: "Sekošana"
-          description: "Jūs automātiski sekosiet visām tēmām šajās sadaļās. Jums paziņos, ja kāds pieminēs jūsu @lietotājvārdu vai atbildēs jums, kā arī parādīs jauno atbilžu skaitu."
         regular:
           title: "Normāls"
           description: "Jums paziņos, ja kāds pieminēs jūsu @lietotājvārdu vai atbildēs jums."
         muted:
           title: "Noklusināts"
-          description: "Jums neko neziņos par jaunajām tēmām šajās sadaļās, kā arī tās neparādīsies starp pēdējām izmaiņām."
       search_priority:
         options:
           normal: "Normāls"
@@ -1840,10 +1883,14 @@ lv:
     flagging:
       title: "Paldies, ka palīdzat uzturēt mūsu forumu civilizētu!"
       action: "Ziņot par ierakstu"
+      take_action_options:
+        default:
+          details: "Sasniegt ziņojumu robežu uzreiz, nevis gaidīt vēl ziņojumus no lietotājiem"
+        suspend:
+          title: "Apturētie lietotāji"
       notify_action: "Ziņa"
       official_warning: "Oficiāls brīdinājums"
       delete_spammer: "Dzēst spamotāju"
-      delete_confirm_MF: "Jūs grasāties izdzēst šī lietotāja {IERAKSTUS, plural, one {<b>1</b> ierakstu} other {<b>#</b> ierakstus}} un {TĒMAS, plural, one {<b>1</b> tēmu} other {<b>#</b> tēmas}}, izdzēst viņa profilu, bloķēt reģistrēšanos no viņa IP adreses <b>{ip_address}</b> un pievienot viņa e-pasta adresi <b>{email}</b> pastāvīgajam bloķēto sarakstam. Vai jūs esat pārliecināts, ka šis lietotājs patiešām ir spameris?"
       yes_delete_spammer: "Jā, izdzēst spameri"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(paslēpts)"
@@ -1911,12 +1958,6 @@ 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_likes_MF: |
-      Šai tēmā ir {count, plural, one {1 atbilde} other {# atbildes}} {ratio, select,
-      low {ar nedaudzām atzinībām}
-      med {ar vidēji daudzām atzinībām}
-      high {ar ļoti daudzām atzinībām}
-      other {}}
     original_post: "Oriģinālais ieraksts"
     views: "Skatījumi"
     views_lowercase:
@@ -1940,7 +1981,6 @@ lv:
       one: "lietotājs"
       other: "lietotāji"
     category_title: "Sadaļa"
-    history: "Vēsture"
     changed_by: "%{author}"
     raw_email:
       title: "Ienākošie e-pasti"
@@ -2026,6 +2066,7 @@ lv:
       readonly: "Skatīt"
     lightbox:
       download: "lejuplādēt"
+      counter: "%curr% no %total%"
     keyboard_shortcuts_help:
       title: "Klaviatūras saīsnes"
       jump_to:
@@ -2090,6 +2131,10 @@ lv:
         zero: "%{count} žetoni"
         one: "%{count} žetons"
         other: "%{count} žetoni"
+      more_badges:
+        zero: "+Vēl %{count}"
+        one: "+Vēl %{count}"
+        other: "+Vēl %{count}"
       granted:
         zero: "%{count} piešķirti"
         one: "%{count} piešķirts"
@@ -2171,6 +2216,8 @@ lv:
       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"
+    do_not_disturb:
+      remaining: "palicis %{remaining}"
   admin_js:
     type_to_filter: "ievadiet, lai atlasītu..."
     admin:
@@ -2192,6 +2239,8 @@ lv:
         version_check_pending: "Izskatās, ka nesen esat veicies atjauninājumus. Lieliski!"
         installed_version: "Uzinstalēts"
         latest_version: "Pēdējais"
+        new_features:
+          dismiss: "Nerādīt"
         last_checked: "Pēdējā pārbaude"
         refresh_problems: "Pārlādēt"
         no_problems: "Problēmas nav atrastas."
@@ -2220,6 +2269,9 @@ lv:
           view_table: "tabula"
           view_graph: "grafiks"
           refresh_report: "Pārlādēt ziņojumu"
+          daily: Dienas
+          monthly: Mēneša
+          weekly: Nedēļas
           groups: "Visas grupas"
           filters:
             group:
@@ -2233,10 +2285,6 @@ lv:
         new:
           title: "Jauna grupa"
           create: "Izveidot"
-        bulk_add:
-          title: "Pievienot grupai vairākus"
-          complete_users_not_added: "Šie lietotāji nav pievienoti (pārliecinieties, ka viņiem ir profili):"
-          paste: "Kopēt lietotājvārdu vai e-pastu sarakstu, vienu katrā rindiņā:"
         manage:
           interaction:
             email: E-pasts
@@ -2282,6 +2330,8 @@ lv:
         description: Apraksts
         save: Saglabāt
         continue: Turpināt
+        scopes:
+          action: Darbība
       web_hooks:
         detailed_instruction: "Ja būs signāls par izvēlēto notikumu, uz norādīto URL tiks nosūtīts POST pieprasījums."
         create: "Izveidot"
@@ -2461,6 +2511,7 @@ lv:
           install_popular: "Populāri"
           about_theme: "Par"
           license: "Licence"
+          version: "Versija:"
           enable: "Ieslēgt"
           disable: "Atslēgt"
           update_to_latest: "Atjaunināt uz pēdējo"
@@ -2471,6 +2522,10 @@ lv:
           scss:
             text: "CSS"
         colors:
+          undo: "atsaukt"
+          revert: "atgriezt"
+          success:
+            name: "veiksmīgi"
           love:
             description: "Atzinības pogas krāsa."
         email_style:
@@ -2643,13 +2698,8 @@ lv:
         title: "Vārdi, kas tiek novēroti"
         search: "meklēt"
         clear_filter: "Notīrīt"
-        show_words: "parādīt vārdus"
         download: Lejuplādēt
         clear_all: Noņemt visus
-        word_count:
-          zero: "%{count} vārdi"
-          one: "%{count} vārds"
-          other: "%{count} vārdi"
         actions:
           block: "Bloķēt"
           censor: "Cenzēt"
@@ -2661,7 +2711,6 @@ lv:
           require_approval: "Ierakstiem, kas satur šos vārdus, būs nepieciešams darbinieku apstiprinājums, pirms tos varēs redzēt citi."
           flag: "Atļaut ierakstus, kas satur šos vārdus, taču atzīmēt tos kā nepiedienīgus, lai moderatori var tos pārbaudīt."
         form:
-          label: "Jauns vārds:"
           add: "Pievienot"
           success: "Veiksmīgi"
           upload_successful: "Augšupielāde ir veiksmīga. Vārdi ir pievienoti."
@@ -2682,6 +2731,7 @@ lv:
           active: "Aktīvi"
           staff: "Personāls"
           suspended: "Apturēts"
+          staged: "Izveidots"
         approved: "Apstiprināt?"
         titles:
           active: "Aktīvi lietotāji"
@@ -2700,6 +2750,8 @@ lv:
         check_email:
           title: "Atklāt šī lietotāja e-pasta adresi"
           text: "Parādīt"
+        check_sso:
+          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}"
@@ -2709,7 +2761,6 @@ lv:
         suspended_by: "Apturēja"
         silence_reason: "Iemesls"
         delete_all_posts: "Dzēst visus ierakstus"
-        delete_all_posts_confirm_MF: "Jūs grasaties dzēst šos ierakstus. Vai est drošs?"
         moderator: "Moderātors?"
         admin: "Administrators?"
         suspended: "Neapturēts?"
@@ -2829,8 +2880,7 @@ lv:
           on_grace_period: "Currently in promotion grace period, will not be demoted."
           locked_will_not_be_promoted: "Uzticības līmenis noslēgts. Nevar tikt paaugstināts."
           locked_will_not_be_demoted: "Uzticības līmenis noslēgts. Nevar tikt pazemināts."
-        sso:
-          title: "Vienreizēja pierakstīšanās (Single Sign On)"
+        discourse_connect:
           external_id: "Ārējs ID"
           external_username: "Lietotājvārds"
           external_name: "Vārds"
@@ -3017,6 +3067,9 @@ lv:
         embed_post_limit: "Maksimālais iegulto ierakstu skaits"
         embed_title_scrubber: "(Regular expression used to scrub the title of posts)"
         embed_truncate: "Saīsināt iegultos ierakstus"
+        allowed_embed_selectors: "(CSS selector for elements that are allowed in embeds)"
+        blocked_embed_selectors: "(CSS selector for elements that are removed from embeds)"
+        allowed_embed_classnames: "Atļautie CSS nosaukumi (Allowed CSS class names)"
         save: "Saglabāt iegulšanas iestatījumus"
       permalink:
         title: "Patstāvīgā saite"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 6be0975e2f..8e8966f752 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -151,6 +151,8 @@ nb_NO:
     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."
+    software_update_prompt:
+      dismiss: "Avslå"
     bootstrap_mode_disabled: "Oppstartsmodus vil bli deaktivert i løpet av 24 timer."
     themes:
       default_description: "Forvalg"
@@ -233,8 +235,6 @@ nb_NO:
       moderators: "Moderatorer"
       stat:
         all_time: "Gjennom tidene"
-        last_7_days: "Siste 7"
-        last_30_days: "Siste 30"
       like_count: "Likes"
       topic_count: "Emner"
       post_count: "Innlegg"
@@ -254,24 +254,16 @@ nb_NO:
       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>.'
+      no_user_bookmarks: "Du har ingen bokmerkede innlegg; bokmerker lar deg raskt slå opp spesifike innlegg."
+      auto_delete_preference:
+        never: "Aldri"
       search: "Søk"
-      reminders:
-        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"
       new_topic: "Nytt emneutkast"
       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:
       one: "Se %{count} nytt eller oppdatert emne"
       other: "Se %{count} nye eller oppdaterte emner"
@@ -357,6 +349,7 @@ nb_NO:
         email: "E-post"
         name: "Navn"
         fields: "Felter"
+        reject_reason: "Begrunnelse"
       topics:
         topic: "Emne"
         reviewable_count: "Antall"
@@ -388,15 +381,31 @@ nb_NO:
       statuses:
         pending:
           title: "På vent"
+        approved:
+          title: "Godkjent"
         rejected:
           title: "Avvist"
       types:
         reviewable_user:
           title: "Bruker"
+        reviewable_post:
+          title: "Innlegg"
       approval:
         title: "Innlegg trenger godkjenning"
         description: "Vi har mottatt ditt nye innlegg men det krever godkjenning av en moderator før det vises. Ha tålmod."
         ok: "OK"
+      example_username: "brukernavn"
+    relative_time_picker:
+      days:
+        one: "dag"
+        other: "dager"
+    time_shortcut:
+      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"
     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>"
@@ -412,6 +421,7 @@ nb_NO:
       sent_by_user: "Sendt av <a href='%{userUrl}'>%{user}</a>"
       sent_by_you: "Sendt av <a href='%{userUrl}'>deg</a>"
     directory:
+      username: "Brukernavn"
       filter_name: "filtrer etter brukernavn"
       title: "Brukere"
       likes_given: "Gitt"
@@ -461,9 +471,17 @@ nb_NO:
           credentials:
             username: "Brukernavn"
             password: "Passord"
+          settings:
+            title: "Innstillinger"
+          mailboxes:
+            disabled: "deaktivert"
         membership:
           title: Medlemskap
           access: Tilgang
+        categories:
+          title: Kategorier
+        tags:
+          title: Stikkord
         logs:
           title: "Logger"
           when: "Når"
@@ -474,6 +492,8 @@ nb_NO:
           details: "Detaljer"
           from: "Fra"
           to: "Til"
+      permissions:
+        title: "Tillatelser"
       public_admission: "Tillat brukere å ta del i gruppen fritt (krever offentlig synlig gruppe)"
       public_exit: "Tillat brukere å fritt forlate gruppen"
       empty:
@@ -599,12 +619,15 @@ nb_NO:
       posts: "Innlegg"
       topics: "Emner"
       latest: "Siste"
-      latest_by: "siste av"
       toggle_ordering: "slå på/av styring av sortering"
       subcategories: "Underkategorier"
       topic_sentence:
         one: "%{count} emne"
         other: "%{count} emner"
+      topic_stat_unit:
+        week: "uke"
+        month: "måned"
+      n_more: "Kategorier (ytterligere%{count})..."
     ip_lookup:
       title: Slå opp IP-adresse
       hostname: Vertsnavn
@@ -645,7 +668,11 @@ nb_NO:
         add_ignored_user: "Legg til …"
         mute_option: "Ignorert"
         normal_option: "Normal"
+      notification_schedule:
+        none: "Ingen"
+        to: "til"
       activity_stream: "Aktivitet"
+      read: "Lest"
       preferences: "Innstillinger"
       feature_topic_on_profile:
         save: "Lagre"
@@ -667,12 +694,14 @@ nb_NO:
         perm_denied_expl: "Du tillot ikke varsler. Tillat varsler via innstillingene i din nettleser."
         disable: "Slå av varslinger"
         enable: "Slå på varslinger"
-        each_browser_note: "Merk: Du må endre denne innstillinger for hver nettleser du bruker."
         consent_prompt: "Ønsker du å motta skrivebordsvarsler når andre svarer på dine innlegg?"
       dismiss: "Avslå"
       dismiss_notifications: "Forkast alle"
       dismiss_notifications_tooltip: "Merk alle uleste varslinger som lest"
       first_notification: "Ditt første varsel! Velg det for å komme i gang."
+      color_schemes:
+        undo: "Tilbakestill"
+        regular: "Aktivt medlem"
       allow_private_messages: "Tillat andre brukere å sende meg personlige meldinger"
       external_links_in_new_tab: "Åpne alle eksterne lenker i ny fane"
       enable_quoting: "Aktiver svar med sitat for uthevet tekst"
@@ -685,6 +714,7 @@ nb_NO:
       suspended_notice: "Denne brukeren er utestengt til %{date}."
       suspended_permanently: "Denne brukeren er utestengt."
       suspended_reason: "Begrunnelse:"
+      github_profile: "GitHub"
       email_activity_summary: "Oppsummering av aktivitet"
       mailing_list_mode:
         label: "E-postlistemodus"
@@ -713,6 +743,7 @@ nb_NO:
       watched_first_post_tags: "Følger første innlegg"
       watched_first_post_tags_instructions: "Du vil bli varslet om det første innlegget i hvert nye emne med disse stikkordene."
       muted_categories: "Ignorert"
+      regular_categories: "Aktivt medlem"
       no_category_access: "Som moderator har du begrenset kategoritilgang, lagring er avskrudd."
       delete_account: "Slett kontoen min"
       delete_account_confirm: "Er du sikker på at du vil slette kontoen din permanent? Denne handlingen kan ikke angres!"
@@ -751,6 +782,7 @@ nb_NO:
         tags: "Stikkord"
       preferences_nav:
         account: "Konto"
+        security: "Sikkerhet"
         profile: "Profil"
         emails: "E-poster"
         notifications: "Varsler"
@@ -921,41 +953,38 @@ nb_NO:
         after_10_minutes: "etter 10 minutt"
       notification_level_when_replying: "Når jeg skriver noe i et emne, sett emnet som"
       invited:
-        search: "skriv for å søke etter invitasjoner…"
         title: "invitasjoner"
+        pending_tab: "På vent"
+        pending_tab_with_count: "Ventende (%{count})"
+        redeemed_tab: "Brukt"
+        redeemed_tab_with_count: "Innløste (%{count})"
+        invited_via: "Invitasjon"
+        groups: "Grupper"
+        topic: "Emne"
+        edit: "Rediger"
+        remove: "Fjern"
+        reinvited: "Invitasjon sendt igjen"
+        search: "skriv for å søke etter invitasjoner…"
         user: "Invitert bruker"
         none: "Ingen invitasjoner å vise."
         truncated:
           one: "Viser den første invitasjonen."
           other: "Viser de %{count} første invitisajonene."
         redeemed: "Løs inn invitasjoner"
-        redeemed_tab: "Brukt"
-        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})"
         topics_entered: "Emner vist"
         posts_read_count: "Innlegg lest"
         expired: "Denne invitasjonen har utløpt"
-        rescind: "Fjern"
-        rescinded: "Invitasjon fjernet"
-        reinvite: "Send invitasjon igjen"
-        reinvite_all: "Send alle invitasjoner på nytt"
         reinvite_all_confirm: "Er du sikker på at du vil sende ut alle invitasjoner igjen?"
-        reinvited: "Invitasjon sendt igjen"
-        reinvited_all: "Alle invitasjoner sendt på nytt!"
         time_read: "Lesetid"
         days_visited: "Dager besøkt"
         account_age_days: "Kontoalder i dager"
-        links_tab: "Lenker"
-        link_created_at: "Opprettet"
-        link_groups: Grupper
+        create: "Inviter"
         valid_for: "Invitasjonslenke er kun gyldig for denne e-postadressen: %{email}"
         invite_link:
           success: "Invitasjonslenke har blitt generert!"
         bulk_invite:
-          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:
         title: "Passord"
@@ -1055,7 +1084,6 @@ nb_NO:
     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"
     refresh: "Refresh"
     home: "Hjem"
@@ -1064,15 +1092,6 @@ nb_NO:
       login_disabled: "Innlogging er deaktivert mens nettsiden er i skrivebeskyttet modus."
       logout_disabled: "Du kan ikke logge ut når nettstedet er i lese-modus."
     learn_more: "lær mer…"
-    all_time: "totalt"
-    all_time_desc: "totalt antall emner opprettet"
-    year: "år"
-    year_desc: "emner opprettet de siste 365 dagene"
-    month: "måned"
-    month_desc: "emner opprettet de siste 30 dagene"
-    week: "uke"
-    week_desc: "emner opprettet de siste 7 dagene"
-    day: "dag"
     first_post: Første innlegg
     mute: Ignorer
     unmute: Fjern ignorering
@@ -1089,11 +1108,8 @@ nb_NO:
       sign_up: "Registrer deg"
       hide_session: "Spør meg igjen i morgen"
       hide_forever: "nei takk"
-      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>."
       enable: "Oppsummer dette emnet"
       disable: "Vis alle innlegg"
     deleted_filter:
@@ -1103,6 +1119,7 @@ nb_NO:
       disable: "Vis slettede innlegg"
     private_message_info:
       title: "Send"
+      add: "Legg til …"
       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?"
@@ -1114,7 +1131,7 @@ nb_NO:
     trust_level: "Tillitsnivå"
     search_hint: "brukernavn, e-post eller IP-adresse"
     create_account:
-      title: "Opprett ny konto"
+      header_title: "Velkommen!"
       failed: "Noe gikk galt, kanskje denne e-postadressen allerede er registrert. Prøv lenke for glemt passord"
     forgot_password:
       title: "Nullstill Passord"
@@ -1139,12 +1156,10 @@ nb_NO:
       complete_email_not_found: "Ingen konto med e-postadressen <b>%{email}</b> er registrert"
       confirm_title: Fortsett til %{site_name}
     login:
-      title: "Logg Inn"
       username: "Bruker"
       password: "Passord"
       second_factor_description: "Skriv inn verifiseringskoden fra din app:"
       second_factor_backup_description: "Vennligst skriv en av reservekodene dine:"
-      email_placeholder: "e-postadresse eller brukernavn"
       caps_lock_warning: "Caps Lock er på"
       error: "Ukjent feil"
       rate_limit: "Vent litt før du logger inn igjen."
@@ -1192,6 +1207,7 @@ nb_NO:
       accept_invite: "Godta invitasjon"
       success: "Kontoen din har blitt opprettet og du er nå logget inn."
       name_label: "Navn"
+      password_label: "Passord"
       optional_description: "(valgfritt)"
     password_reset:
       continue: "Fortsett til %{site_name}"
@@ -1241,7 +1257,6 @@ 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."
       destination_category: "Målkategori"
       publish: "Publiser delt kladd"
       confirm_publish: "Er du sikker på at du vil publisere denne kladden?"
@@ -1252,7 +1267,6 @@ nb_NO:
       options: "Alternativer"
       whisper: "hvisk"
       unlist: "skjult"
-      blockquote_text: "Sitatramme"
       add_warning: "Dette er en offisiell advarsel."
       toggle_whisper: "Slå på/av hvisking"
       toggle_unlisted: "Skjul eller gjør synlig"
@@ -1269,9 +1283,6 @@ nb_NO:
       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?"
         category_missing: "Du må velge en kategori"
       save_edit: "Lagre endring"
@@ -1297,8 +1308,6 @@ nb_NO:
       saving: "Lagrer"
       saved: "Lagret!"
       uploading: "Laster opp…"
-      show_preview: "forhåndsvis &raquo;"
-      hide_preview: "&laquo; skjul forhåndsvisning"
       quote_post_title: "Siter hele innlegget"
       bold_label: "F"
       bold_title: "Sterk"
@@ -1310,8 +1319,8 @@ nb_NO:
       link_description: "beskriv lenken her"
       link_dialog_title: "Sett inn hyperlenke"
       link_optional_text: "valgfri tittel"
-      quote_title: "Sitatramme"
-      quote_text: "Sitatramme"
+      blockquote_title: "Sitatramme"
+      blockquote_text: "Sitatramme"
       code_title: "Kodeutsnitt"
       code_text: "Skriv inn preformattert tekst med 4 mellomroms innrykk."
       paste_code_text: "skriv inn eller kopier kode her"
@@ -1353,9 +1362,9 @@ nb_NO:
           label: "Nytt emne"
         shared_draft:
           label: "Delt kladd"
-          desc: "Lag et emneutkast som kun er synlig for staben"
         toggle_topic_bump:
           label: "Slå på/av at emnet flyttes øverst"
+      ignore: "Ignorer"
     notifications:
       tooltip:
         regular:
@@ -1375,6 +1384,10 @@ nb_NO:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} og én annen</span> %{description}"
+        other: "<span class='multi-user'>%{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}"
@@ -1385,6 +1398,8 @@ nb_NO:
       granted_badge: "Gjorde seg fortjent til '%{description}'"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Nytt emne</span> %{description}"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       group_message_summary:
         one: "%{count} melding i din %{group_name} innboks"
         other: "%{count} meldinger i din innboks for %{group_name}"
@@ -1407,10 +1422,7 @@ 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}"
       local_tip: "velg bilder fra din enhet"
-      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"
       select_file: "Velg fil"
@@ -1440,6 +1452,7 @@ nb_NO:
       or_search_google: "Eller prøv å søke på Google istedenfor:"
       search_google: "Prøv å søke på Google istedenfor:"
       search_google_button: "Google"
+      search_button: "Søk"
       context:
         user: "Søk i innleggene av @%{username}"
         category: "Søk i kategorien #%{category}"
@@ -1481,10 +1494,14 @@ nb_NO:
           noreplies: har ingen svar
           single_user: inneholder bare én bruker
         post:
+          count:
+            label: Innlegg
           time:
             label: Skrevet
             before: før
             after: etter
+        views:
+          label: Visninger
     hamburger_menu: "gå til en annen liste over emner eller en annen kategori"
     new_item: "ny"
     go_back: "gå tilbake"
@@ -1510,6 +1527,7 @@ nb_NO:
         change_category: "Velg kategori"
         close_topics: "Lukk emner"
         archive_topics: "Arkiver emner"
+        move_messages_to_inbox: "Flytt til innboks"
         notification_level: "Varsler"
         choose_new_category: "Velg den nye kategorien for emnene:"
         selected:
@@ -1528,8 +1546,6 @@ nb_NO:
         bookmarks: "Du har ingen bokmerkede emner enda."
         category: "Det finnes ingen %{category}-emner."
         top: "Det finnes ingen populære emner."
-        educate:
-          unread: '<p>Dine uleste emner vil vises her.</p><p>Som forvalg anses emner som ulest og vil vise ulest-tall <span class="badge new-posts badge-notification">1</span> dersom du:</p><ul><li>Opprettet emnet</li><li>Svarte på emnet</li><li>Leste emnet i mer enn 4 minutter</li></ul><p>Eller dersom du uttrykkelig har satt emnet som overvåkes eller følges via varselkontrollen nederst i hvert emne.</p><p>Gå til<a href="%{userPrefsUrl}">innstillingene</a> dine for å endre dette.</p>'
       bottom:
         latest: "Det finnes ingen flere siste emner."
         posted: "Det finnes ingen flere emner med innlegg."
@@ -1537,6 +1553,7 @@ nb_NO:
         new: "Det finnes ingen flere nye emner."
         unread: "Det finnes ingen flere uleste emner."
         category: "Det finnes ingen %{category}-emner igjen."
+        tag: "Det finnes ingen %{tag}-emner igjen."
         top: "Det finnes ingen flere populære emner."
         bookmarks: "Det finnes ingen flere bokmerkede emner."
     topic:
@@ -1596,12 +1613,14 @@ nb_NO:
       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_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
       jump_reply_up: hopp til tidligere svar
       jump_reply_down: hopp til senere svar
       deleted: "Emnet ble slettet"
+      slow_mode_update:
+        save: "Aktiver"
+        remove: "Deaktiver"
       topic_status_update:
         title: "Tidsbestemt handling for emne"
         save: "Sett opp tidsbestemt handling"
@@ -1616,11 +1635,7 @@ nb_NO:
         later_this_week: "Senere denne uken"
         this_weekend: "Denne uken"
         next_week: "Neste uke"
-        two_weeks: "To uker"
         next_month: "Neste måned"
-        three_months: "Tre måneder"
-        six_months: "Seks måneder"
-        one_year: "Ett år"
         forever: "For alltid"
         pick_date_and_time: "Velg dato og tid"
         set_based_on_last_post: "Lukk basert på siste post"
@@ -1634,7 +1649,6 @@ nb_NO:
         title: "Lukk midlertidig"
       auto_close:
         title: "Automatisk lukking av emne"
-        label: "Tidsrom for automatisk lukking av emne:"
         error: "Skriv inn en gyldig verdi."
         based_on_last_post: "Ikke lukk før det siste innlegget i emnet er minst så gammelt."
       auto_delete:
@@ -1647,7 +1661,7 @@ nb_NO:
         auto_open: "Dette emnet vil åpnes automatisk %{timeLeft}."
         auto_close: "Dette emnet vil lukkes automatisk %{timeLeft}."
         auto_publish_to_category: "Dette emnet vil bli opprettet i <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Dette emnet vil bli lukket %{duration} etter det siste innlegget."
+        auto_close_after_last_post: "Dette emnet vil bli lukket %{duration} etter det siste innlegget."
         auto_delete: "Dette emnet vil bli automatisk slettet %{timeLeft}."
         auto_bump: "Dette emnet vil automatisk bli flyttet øverst om %{timeLeft}."
         auto_reminder: "Du vil bli påminnet om dette emnet %{timeLeft}."
@@ -1666,7 +1680,7 @@ nb_NO:
         go: "gå"
         jump_bottom: "Hopp til nyeste innlegg"
         jump_prompt: "hopp til…"
-        jump_prompt_of: "av %{count} innlegg"
+        jump_prompt_long: "Hopp til…"
         jump_bottom_with_number: "hopp til innlegg %{post_number}"
         jump_prompt_to_date: "til dato"
         jump_prompt_or: "eller"
@@ -1748,6 +1762,7 @@ nb_NO:
       share:
         title: "Del"
         help: "del en lenke til dette emnet"
+        invite_users: "Inviter"
       print:
         title: "Skriv ut"
         help: "Åpne en utskriftsvennlig utgave av dette emnet"
@@ -1796,14 +1811,13 @@ nb_NO:
         username_placeholder: "brukernavn"
         action: "Send Invitasjon"
         help: "Inviter andre til dette emnet via e-post eller varsler"
-        to_forum: "Vi sender en kortfattet e-post som gjør det mulig for en venn å umiddelbart registreres ved å klikke på en lenke. Ingen innlogging er nødvendig."
-        sso_enabled: "Oppgi brukernavnet til personen du ønsker å invitere til dette emnet."
+        discourse_connect_enabled: "Oppgi brukernavnet til personen du ønsker å invitere til dette emnet."
         to_topic_blank: "Oppgi brukernavnet eller e-postadressen til personen du ønsker å invitere til dette emnet."
         to_topic_email: "Du har oppgitt en e-postadresse. Vi vil sende en invitasjon som lar vennen din svare på dette emnet umiddelbart."
         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>%{invitee}</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."
@@ -1870,10 +1884,9 @@ nb_NO:
           other: "Du har valgt <b>%{count}</b> innlegg."
     post:
       quote_reply: "Sitat"
+      quote_share: "Del"
       edit_reason: "Begrunnelse:"
       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}:"
@@ -1908,12 +1921,6 @@ nb_NO:
         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."
-      abandon_edit:
-        no_value: "Nei"
-      abandon:
-        confirm: "Er du sikker på at du vil forlate innlegget ditt?"
-        no_value: "Nei"
-        yes_value: "Ja"
       via_email: "Dette innlegget ankom via e-post"
       via_auto_generated_email: "dette innlegget kommer fra en automatisk generert e-post"
       whisper: "dette innlegget er et privat hvisken for moderatorer"
@@ -1962,6 +1969,9 @@ nb_NO:
         delete_topic: "slett emne"
       actions:
         people:
+          like:
+            one: "likte dette"
+            other: "likte dette"
           like_capped:
             one: "og %{count} annen likte dette"
             other: "og %{count} andre likte dette"
@@ -2052,6 +2062,11 @@ nb_NO:
       change_in_category_topic: "Rediger beskrivelse"
       already_used: "Denne fargen er i bruk av en annen kategori"
       security: "Sikkerhet"
+      permissions:
+        group: "Gruppe"
+        see: "Se"
+        reply: "Svar"
+        create: "Opprett"
       special_warning: "Advarsel: Denne kategorien er en forhåndsbestemt kategori og dens sikkerhetsinnstillinger kan ikke endres. Hvis du ikke vil bruke denne kategorien, slett den i stedet for å bruke den til noe annet."
       images: "Bilder"
       email_in: "Egendefinert innkommende e-postadresse:"
@@ -2083,18 +2098,15 @@ nb_NO:
       notifications:
         watching:
           title: "Følger"
-          description: "Du vil automatisk følge alle emnene i disse kategoriene. Du vil bli varslet om alle nye innlegg i hvert emne, og antall nye svar vil bli vist."
         watching_first_post:
           title: "Følger første innlegg"
         tracking:
           title: "Overvåkning"
-          description: "Du vil automatisk overvåke alle emner i disse kategoriene. Du vil bli varslet dersom noen nevner @navnet ditt eller svarer deg, og antallet nye svar vil bli vist."
         regular:
           title: "Normal"
           description: "Du vil bli varslet om noen nevner @navnet ditt eller svarer deg."
         muted:
           title: "Ignorert"
-          description: "Du vil aldri bli varslet om noe vedrørende nye emner i disse kategoriene, og de vil ikke vises i listen over siste."
       search_priority:
         options:
           normal: "Normal"
@@ -2123,10 +2135,17 @@ nb_NO:
     flagging:
       title: "Takk for at du hjelper å holde forumet ryddig!"
       action: "Rapporter innlegg"
+      take_action_options:
+        default:
+          title: "Ta handling"
+          details: "Oppnå rapporteringsterskel umiddelbart, i stedet for å vente på flere rapporteringer."
+        suspend:
+          title: "Steng ute bruker"
+        silence:
+          title: "Demp bruker"
       notify_action: "Melding"
       official_warning: "Offisiell advarsel"
       delete_spammer: "Slett spammer"
-      delete_confirm_MF: "Du er i ferd med å slette {POSTS, plural, one {<b>1</b> innlegg} other {<b>#</b> innlegg}} og {TOPICS, plural, one {<b>1</b> emne} other {<b>#</b> emner}} opprettet av denne brukeren, fjerne kontoen, blokkere påmeldinger fra IP-adressen <b>{ip_address}</b>, og legge til e-postadressen <b>{email}</b> til en permanent blokkeringsliste. Er du sikker på at denne brukeren virkelig sender søppelpost?"
       yes_delete_spammer: "Ja, slett spammer"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(skjult)"
@@ -2190,12 +2209,6 @@ 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_likes_MF: |
-      Dette emnet har {count, plural, one {1 svar} other {# svar}} {ratio, select,
-      low {med mange likes i forhold til innlegg}
-      med {med veldig mange likes i forhold til innlegg}
-      high {med ekstremt mange likes i forhold til innlegg}
-      other {}}
     original_post: "Originalt innlegg"
     views: "Visninger"
     views_lowercase:
@@ -2215,7 +2228,6 @@ nb_NO:
       one: "bruker"
       other: "brukere"
     category_title: "Kategori"
-    history: "Historie"
     changed_by: "av %{author}"
     raw_email:
       title: "Innkommende e-post"
@@ -2295,6 +2307,7 @@ nb_NO:
       readonly: "Se"
     lightbox:
       download: "last ned"
+      counter: "%curr% av %total%"
     keyboard_shortcuts_help:
       title: "Tastatursnarveier"
       jump_to:
@@ -2462,6 +2475,10 @@ nb_NO:
       dismiss: "Avslå"
     safe_mode:
       enabled: "Sikkert modus er påskrudd, for å skru av sikkert modus, lukk dette nettleservinduet"
+    do_not_disturb:
+      remaining: "%{remaining} gjenstående"
+      options:
+        custom: "Egendefinert"
   admin_js:
     type_to_filter: "skriv for å filtrere…"
     admin:
@@ -2485,6 +2502,8 @@ nb_NO:
         version_check_pending: "Ser ut som om du oppgraderte nylig. Fantastisk!"
         installed_version: "Installert"
         latest_version: "Siste"
+        new_features:
+          dismiss: "Avslå"
         last_checked: "Sist sjekket"
         refresh_problems: "Last inn siden på nytt"
         no_problems: "Ingen problemer ble funnet."
@@ -2528,6 +2547,9 @@ nb_NO:
           view_table: "tabell"
           view_graph: "graf"
           refresh_report: "Refresh Rapport"
+          daily: Daglig
+          monthly: Månedlig
+          weekly: Ukentlig
           groups: "Alle grupper"
           disabled: "Denne rapporten er deaktivert"
           totals_for_sample: "Totalt for tidsrom"
@@ -2555,10 +2577,6 @@ nb_NO:
             available: "Gruppenavn tilgjengelig"
             not_available: "Gruppenavn ikke tilgjengelig"
             blank: "Gruppenavnet kan ikke være tomt"
-        bulk_add:
-          title: "Legg til flere til gruppe"
-          complete_users_not_added: "Disse brukerne ble ikke lagt til (sjekk om kontoen finnes):"
-          paste: "Lim inn en liste over brukernavn eller e-poster, en per linje:"
         add_members:
           as_owner: "Sett bruker(e) som eier(e) av denne gruppen"
         manage:
@@ -2610,6 +2628,8 @@ nb_NO:
         description: Beskrivelse
         save: Lagre
         continue: Fortsett
+        scopes:
+          action: Handling
       web_hooks:
         title: "Webhooker"
         none: "Det finnes ingen webhooker for tiden."
@@ -2624,7 +2644,6 @@ nb_NO:
         go_back: "Tilbake til liste"
         payload_url: "Payload URL"
         payload_url_placeholder: "https://eksempel.no/postmottak"
-        warn_local_payload_url: "Det ser ut som du prøver å sende webhooken til en lokal URL. Hendelser som sendes til lokale adresser kan gi sideeffekter eller føre til uventet oppførsel. Fortsette?"
         secret_invalid: "Delt hemmelighet kan ikke inneholde blanke tegn."
         secret_too_short: "Delt hemmelighet må være minst 12 tegn."
         secret_placeholder: "En valgfri streng som brukes for å lage signatur"
@@ -2650,7 +2669,6 @@ nb_NO:
           details: "Når det er et nytt, redigert, slettet eller gjenopprettet innlegg."
         user_event:
           name: "Brukerhendelse"
-          details: "Når en bruker logger inn, logger ut, blir opprettet, godkjent eller oppdatert."
         group_event:
           name: "Gruppehandling"
           details: "Når en gruppe lages, oppdateres eller slettes."
@@ -2837,6 +2855,7 @@ nb_NO:
           install_popular: "Populært"
           about_theme: "Om"
           license: "Lisens"
+          version: "Versjon:"
           enable: "Aktiver"
           disable: "Deaktiver"
           update_to_latest: "Oppdater til seneste"
@@ -3119,12 +3138,8 @@ nb_NO:
         title: "Ord som holdes oppsyn med"
         search: "søk"
         clear_filter: "Tøm"
-        show_words: "vis ord"
         download: Last ned
         clear_all: Fjern alle
-        word_count:
-          one: "ett ord"
-          other: "%{count} ord"
         actions:
           block: "Blokker"
           censor: "Sensurer"
@@ -3136,8 +3151,6 @@ nb_NO:
           require_approval: "Innlegg som inneholder disse ordene, vil måtte godkjennes av staben før de kan bli sett."
           flag: "Tillat innlegg som inneholder disse ordene, men flagg dem som upassende slik at moderatorer kan se over dem."
         form:
-          label: "Nytt ord:"
-          placeholder: "helt ord eller * som jokertegn"
           placeholder_regexp: "regulært uttrykk"
           add: "Legg til"
           success: "Suksess"
@@ -3185,6 +3198,8 @@ nb_NO:
         check_email:
           title: "Vis denne brukerens e-postadresse"
           text: "Vis"
+        check_sso:
+          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}"
@@ -3192,6 +3207,7 @@ nb_NO:
         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."
         suspend_reason: "Begrunnelse"
+        suspend_reason_title: "Bannlysningsgrunn"
         suspend_message: "E-postmelding"
         suspend_message_placeholder: "Alternativt, kan du detaljere bannlysningen og det vil bli sendt per e-post til brukeren."
         suspended_by: "Utestengt av"
@@ -3214,7 +3230,6 @@ nb_NO:
         clear_penalty_history:
           title: "Fjern straffehistorikk"
           description: "brukere med straffer kan ikke nå TL3"
-        delete_all_posts_confirm_MF: "Du er i ferd med å slette {POSTS, plural, one {1 innlegg} other {# innlegg}} og {TOPICS, plural, one {1 emne} other {# emner}}. Er du sikker?"
         silence: "Demp"
         unsilence: "Opphev demping"
         silenced: "Dempet?"
@@ -3342,8 +3357,7 @@ nb_NO:
           on_grace_period: "For tiden i prøvetid for forfremmelse, vil ikke degraderes"
           locked_will_not_be_promoted: "Tillitsnivå låst. Vil aldri bli forfremmet."
           locked_will_not_be_demoted: "Tillitsnivå låst. Vil aldri bli degradert."
-        sso:
-          title: "Single Sign On"
+        discourse_connect:
           external_id: "Ekstern-ID"
           external_username: "Brukernavn"
           external_name: "Navn"
@@ -3478,7 +3492,6 @@ nb_NO:
         enabled: Aktiver merke
         icon: Ikon
         image: Bilde
-        image_help: "Oppgi URL for bildet (overstyrer ikonfeltet hvis begge er satt)"
         query: Spørring for merke (SQL)
         target_posts: Spørring har innlegg som mål
         auto_revoke: Kjør tilbakedragningsspørring daglig
@@ -3536,6 +3549,9 @@ nb_NO:
         embed_post_limit: "Maksimalt antall innlegg å bygge inn"
         embed_title_scrubber: "Regulære uttrykk brukt til å finne og korrigere feil i titler"
         embed_truncate: "Forkort de innebygde innleggene"
+        allowed_embed_selectors: "CSS-velger for elementer som tillates i innbygginger"
+        blocked_embed_selectors: "CSS-velger for element som fjernes fra innbygginger"
+        allowed_embed_classnames: "Tillatte navn for CSS-klasser"
         save: "Lagre innbyggingsinnstillinger"
       permalink:
         title: "Permalenker"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index a63bee3892..c94a991ea6 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -158,6 +158,9 @@ nl:
     topic_admin_menu: "topicacties"
     wizard_required: "Welkom bij uw nieuwe Discourse! Laten we beginnen met <a href='%{url}' data-auto-route='true'>de configuratiewizard</a> ✨"
     emails_are_disabled: "Alle uitgaande e-mail is uitgeschakeld door een beheerder. Er wordt geen enkele e-mailmelding verstuurd."
+    software_update_prompt:
+      message: "We hebben deze site bijgewerkt, <span>gelieve te vernieuwen</span>, anders kan er onverwacht gedrag optreden."
+      dismiss: "Negeren"
     bootstrap_mode_enabled:
       one: "Om het opzetten van uw nieuwe website makkelijker te maken, bevindt u zich in bootstrapmodus. Aan alle nieuwe gebruikers wordt vertrouwensniveau 1 toegekend, en dagelijkse e-mailsamenvattingen zijn voor hen ingeschakeld. Dit wordt automatisch uitgeschakeld zodra %{count} gebruiker lid is geworden."
       other: "Om het opzetten van uw nieuwe website makkelijker te maken, bevindt u zich in bootstrapmodus. Aan alle nieuwe gebruikers wordt vertrouwensniveau 1 toegekend, en dagelijkse e-mailsamenvattingen zijn voor hen ingeschakeld. Dit wordt automatisch uitgeschakeld zodra %{count} gebruikers lid zijn geworden."
@@ -169,6 +172,7 @@ nl:
       regions:
         ap_northeast_1: "Azië Pacifisch (Tokio)"
         ap_northeast_2: "Azië Pacifisch (Seoel)"
+        ap_east_1: "Azië Pacifisch (Hong Kong)"
         ap_south_1: "Azië Pacifisch (Bombay)"
         ap_southeast_1: "Azië Pacifisch (Singapore)"
         ap_southeast_2: "Azië Pacifisch (Sydney)"
@@ -187,6 +191,7 @@ nl:
         us_gov_west_1: "AWS GovCloud (VS West)"
         us_west_1: "VS West (N. Californië)"
         us_west_2: "VS West (Oregon)"
+    clear_input: "Invoer wissen"
     edit: "de titel en categorie van dit topic bewerken"
     expand: "Uitvouwen"
     not_implemented: "Deze functie is helaas nog niet beschikbaar, sorry!"
@@ -219,8 +224,11 @@ nl:
     you: "U"
     or: "of"
     now: "zojuist"
-    read_more: "meer info"
+    read_more: "meer lezen"
     more: "Meer"
+    x_more:
+      one: "%{count} Meer"
+      other: "%{count} Meer"
     less: "Minder"
     never: "nooit"
     every_30_minutes: "elke 30 minuten"
@@ -229,7 +237,7 @@ nl:
     weekly: "wekelijks"
     every_month: "elke maand"
     every_six_months: "elke zes maanden"
-    max_of_count: "maximaal %{count}"
+    max_of_count: "max. %{count}"
     alternation: "of"
     character_count:
       one: "%{count} teken"
@@ -249,8 +257,9 @@ nl:
       moderators: "Moderators"
       stat:
         all_time: "Sinds het begin"
-        last_7_days: "Laatste 7"
-        last_30_days: "Laatste 30"
+        last_day: "Afgelopen 24 uur"
+        last_7_days: "Afgelopen 7 dagen"
+        last_30_days: "Afgelopen 30 dagen"
       like_count: "Likes"
       topic_count: "Topics"
       post_count: "Berichten"
@@ -286,18 +295,6 @@ nl:
       search_placeholder: "Bladwijzers doorzoeken op naam, topictitel of berichtinhoud"
       search: "Zoeken"
       reminders:
-        later_today: "Later vandaag"
-        next_business_day: "Volgende werkdag"
-        tomorrow: "Morgen"
-        next_week: "Volgende week"
-        post_local_date: "Datum in bericht"
-        later_this_week: "Later deze week"
-        start_of_next_business_week: "Maandag"
-        start_of_next_business_week_alt: "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}"
@@ -312,9 +309,9 @@ nl:
       new_private_message: "Nieuw-privéberichtconcept"
       topic_reply: "Conceptantwoord"
       abandon:
-        confirm: "U hebt al een ander concept geopend in dit topic. Weet u zeker dat u het wilt afbreken?"
-        yes_value: "Ja, afbreken"
-        no_value: "Nee, behouden"
+        confirm: "U hebt een concept in uitvoering voor dit topic. Wat wilt u er mee doen?"
+        yes_value: "Negeren"
+        no_value: "Bewerken hervatten"
     topic_count_latest:
       one: "%{count} nieuw of bijgewerkt topic bekijken"
       other: "%{count} nieuwe of bijgewerkte topics bekijken"
@@ -333,6 +330,7 @@ nl:
     upload: "Uploaden"
     uploading: "Uploaden..."
     uploading_filename: "Uploaden: %{filename}..."
+    processing_filename: "Verwerken: %{filename}..."
     clipboard: "klembord"
     uploaded: "Geüpload!"
     pasting: "Plakken..."
@@ -411,6 +409,7 @@ nl:
       topic: "Topic:"
       filtered_topic: "U hebt op beoordeelbare inhoud in één topic gefilterd."
       filtered_user: "Gebruiker"
+      filtered_reviewed_by: "Beoordeeld door"
       show_all_topics: "alle topics tonen"
       deleted_post: "(bericht verwijderd)"
       deleted_user: "(gebruiker verwijderd)"
@@ -421,10 +420,11 @@ nl:
         email: "E-mailadres"
         name: "Naam"
         fields: "Velden"
+        reject_reason: "Reden"
       user_percentage:
         summary:
-          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} totale markering)"
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} totale markeringen)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (van laatste markering)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (van laatste %{count} markeringen)"
         agreed:
           one: "%{count}% akkoord"
           other: "%{count}% akkoord"
@@ -467,7 +467,8 @@ nl:
           created_at_asc: "Gemaakt op (omgekeerd)"
         priority:
           title: "Minimale prioriteit"
-          low: "(alle)"
+          any: "(alle)"
+          low: "Laag"
           medium: "Gemiddeld"
           high: "Hoog"
       conversation:
@@ -505,6 +506,8 @@ nl:
           title: "Bericht in wachtrij"
         reviewable_user:
           title: "Gebruiker"
+        reviewable_post:
+          title: "Bericht"
       approval:
         title: "Bericht heeft goedkeuring nodig"
         description: "We hebben uw nieuwe bericht ontvangen, maar dit moet eerst door een moderator worden goedgekeurd voordat het zichtbaar wordt. Heb geduld."
@@ -513,6 +516,40 @@ nl:
           other: "U hebt <strong>%{count}</strong> wachtende berichten."
         ok: "OK"
       example_username: "gebruikersnaam"
+      reject_reason:
+        title: "Waarom keurt u deze gebruiker af?"
+        send_email: "Afwijzingsmail verzenden"
+    relative_time_picker:
+      minutes:
+        one: "minuut"
+        other: "minuten"
+      hours:
+        one: "uur"
+        other: "uur"
+      days:
+        one: "dag"
+        other: "dagen"
+      months:
+        one: "maand"
+        other: "maanden"
+      years:
+        one: "jaar"
+        other: "jaar"
+      relative: "Relatief"
+    time_shortcut:
+      later_today: "Later vandaag"
+      next_business_day: "Volgende werkdag"
+      tomorrow: "Morgen"
+      next_week: "Volgende week"
+      post_local_date: "Datum in bericht"
+      later_this_week: "Later deze week"
+      start_of_next_business_week: "Maandag"
+      start_of_next_business_week_alt: "Volgende maandag"
+      next_month: "Volgende maand"
+      custom: "Aangepaste datum en tijd"
+      relative: "Relatieve tijd"
+      none: "Niet nodig"
+      last_custom: "Laatste aangepaste datumtijd"
     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"
@@ -564,7 +601,7 @@ nl:
         description: "U kunt ook in een door komma's gescheiden lijst plakken."
         usernames: "Voer gebruikersnamen of e-mailadressen in"
         input_placeholder: "Gebruikersnamen of e-mailadressen"
-        notify_users: "Gebruikers inlichten"
+        notify_users: "Gebruikers een melding sturen"
       requests:
         title: "Aanvragen"
         reason: "Reden"
@@ -599,6 +636,10 @@ nl:
             imap_ssl: "SSL gebruiken voor IMAP"
             username: "Gebruikersnaam"
             password: "Wachtwoord"
+          settings:
+            title: "Instellingen"
+            allow_unknown_sender_topic_replies: "Sta topic antwoorden van onbekende afzenders toe."
+            allow_unknown_sender_topic_replies_hint: "Staat onbekende afzenders toe om te antwoorden op groepstopics. Als dit niet is ingeschakeld zullen antwoorden van e-mailadressen die niet al in de IMAP e-mailthread staan, of die voor het topic zijn uitgenodigd, een nieuw topic aanmaken."
           mailboxes:
             synchronized: "Gesynchroniseerd postvak"
             none_found: "Geen postvakken gevonden in deze e-mailaccount."
@@ -700,7 +741,22 @@ nl:
         make_owner_description: "<b>%{username}</b> een eigenaar van deze groep maken"
         remove_owner: "Verwijderen als eigenaar"
         remove_owner_description: "<b>%{username}</b> als een eigenaar van deze groep verwijderen"
+        make_primary: "Primair maken"
+        make_primary_description: "Dit de primaire groep maken voor <b>%{username}</b>"
+        remove_primary: "Als primaire verwijderen"
+        remove_primary_description: "Deze als de primaire groep voor <b>%{username}</b> verwijderen"
+        remove_members: "Leden verwijderen"
+        remove_members_description: "Geselecteerde gebruikers verwijderen uit deze groep"
+        make_owners: "Eigenaren maken"
+        make_owners_description: "Geselecteerde gebruikers eigenaren van deze groep maken"
+        remove_owners: "Eigenaren verwijderen"
+        remove_owners_description: "Geselecteerde gebruikers verwijderen als eigenaren van deze groep"
+        make_all_primary: "Alles primair maken"
+        make_all_primary_description: "Dit de primaire groep maken voor alle geselecteerde gebruikers."
+        remove_all_primary: "Alles als primair verwijderen"
+        remove_all_primary_description: "Deze groep verwijderen als primair"
         owner: "Eigenaar"
+        primary: "Primair"
         forbidden: "U mag de leden niet bekijken."
       topics: "Topics"
       posts: "Berichten"
@@ -725,10 +781,10 @@ nl:
           description: "U ontvangt meldingen van nieuwe berichten in deze groep, maar niet van antwoorden op de berichten."
         tracking:
           title: "Volgen"
-          description: "U ontvangt een melding wanneer iemand uw @naam noemt of een bericht van u beantwoordt, en het aantal nieuwe antwoorden wordt weergeven."
+          description: "U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt, en het aantal nieuwe antwoorden wordt weergeven."
         regular:
           title: "Normaal"
-          description: "U ontvangt een melding wanneer iemand uw @naam noemt of een bericht van uw beantwoordt."
+          description: "U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt."
         muted:
           title: "Genegeerd"
           description: "U ontvangt geen enkele melding over berichten in deze groep."
@@ -772,13 +828,21 @@ nl:
       posts: "Berichten"
       topics: "Topics"
       latest: "Nieuwste"
-      latest_by: "nieuwste door"
       toggle_ordering: "sorteermethode omschakelen"
       subcategories: "Subcategorieën"
       muted: "Genegeerde categorieën"
       topic_sentence:
         one: "%{count} topic"
         other: "%{count} topics"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "week"
+        month: "maand"
+      topic_stat_all_time:
+        one: "%{number} totaal"
+        other: "%{number} totaal"
       topic_stat_sentence_week:
         one: "%{count} nieuw topic in de afgelopen week."
         other: "%{count} nieuwe topics in de afgelopen week."
@@ -839,7 +903,23 @@ nl:
         mute_option_title: "U ontvangt geen meldingen met betrekking tot deze gebruiker."
         normal_option: "Normaal"
         normal_option_title: "U ontvangt een melding als deze gebruiker een bericht van u beantwoordt, u citeert, of uw naam noemt."
+      notification_schedule:
+        title: "Meldingsschema"
+        label: "Aangepast meldingsschema inschakelen"
+        tip: "Buiten deze uren wordt u automatisch op 'niet storen' gezet."
+        midnight: "Middernacht"
+        none: "Geen"
+        monday: "Maandag"
+        tuesday: "Dinsdag"
+        wednesday: "woensdag"
+        thursday: "donderdag"
+        friday: "vrijdag"
+        saturday: "zaterdag"
+        sunday: "zondag"
+        to: "aan"
       activity_stream: "Activiteit"
+      read: "Gelezen"
+      read_help: "Onlangs gelezen topics"
       preferences: "Voorkeuren"
       feature_topic_on_profile:
         open_search: "Selecteer een nieuw topic"
@@ -868,11 +948,18 @@ nl:
         perm_denied_expl: "U hebt toestemming voor meldingen geweigerd. Sta meldingen toe via uw browserinstellingen."
         disable: "Meldingen uitschakelen"
         enable: "Meldingen inschakelen"
-        each_browser_note: "Opmerking: u moet deze instelling in elke browser die u gebruikt wijzigen."
+        each_browser_note: 'Opmerking: U moet deze instelling wijzigen in elke browser die u gebruikt. Alle meldingen worden uitgeschakeld wanneer u zich in "niet storen" bevindt, ongeacht deze instelling.'
         consent_prompt: "Wilt u livemeldingen ontvangen als mensen op uw berichten antwoorden?"
       dismiss: "Negeren"
       dismiss_notifications: "Alle verwijderen"
       dismiss_notifications_tooltip: "Alle ongelezen meldingen markeren als gelezen"
+      no_messages_title: "U hebt geen berichten"
+      no_messages_body: >
+        Wilt u een direct persoonlijk gesprek met iemand hebben, buiten de normale gespreksstroom? Stuur ze een bericht door hun avatar te selecteren en de %{icon} berichtknop te gebruiken.<br><br> Als u hulp nodig hebt, kunt u <a href='%{aboutUrl}'>een medewerker een bericht sturen</a>.
+      no_bookmarks_title: "U hebt nog geen bladwijzers gemaakt"
+      no_bookmarks_body: >
+        Begin een bladwijzer te maken voor berichten met de %{icon} knop en ze worden hier weergegeven voor gemakkelijke referentie. U kunt ook een herinnering plannen!
+      no_notifications_title: "U hebt nog geen meldingen"
       first_notification: "Uw eerste melding! Selecteer deze om te beginnen."
       dynamic_favicon: "Aantal op browserpictogram tonen"
       skip_new_user_tips:
@@ -883,7 +970,7 @@ nl:
       color_scheme_default_on_all_devices: "Standaard kleurenschema(’s) op al mijn apparaten instellen"
       color_scheme: "Kleurenschema"
       color_schemes:
-        default_description: "Standaard"
+        default_description: "Standaard voor thema"
         disable_dark_scheme: "Hetzelfde als normaal"
         dark_instructions: "U kunt een voorbeeld van het kleurenschema van de donkere modus bekijken door de donkere modus van uw apparaat om te schakelen."
         undo: "Terugzetten"
@@ -943,7 +1030,7 @@ nl:
       no_category_access: "Als moderator hebt u beperkte toegang tot categorieën, opslaan is uitgeschakeld."
       delete_account: "Mijn account verwijderen"
       delete_account_confirm: "Weet u zeker dat u uw account definitief wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt!"
-      deleted_yourself: "Uw account is verwijderd."
+      deleted_yourself: "Uw account is succesvol verwijderd."
       delete_yourself_not_allowed: "Neem contact op met een staflid als u wilt dat uw account wordt verwijderd."
       unread_message_count: "Berichten"
       admin_delete: "Verwijderen"
@@ -987,6 +1074,7 @@ nl:
         tags: "Tags"
       preferences_nav:
         account: "Account"
+        security: "Beveiliging"
         profile: "Profiel"
         emails: "E-mails"
         notifications: "Meldingen"
@@ -1098,6 +1186,7 @@ nl:
         uploaded_avatar_empty: "Een eigen afbeelding toevoegen"
         upload_title: "Uw afbeelding uploaden"
         image_is_not_a_square: "Waarschuwing: we hebben uw afbeelding bijgesneden; breedte en hoogte waren niet gelijk."
+        logo_small: "Het kleine logo van de website. Standaard gebruikt."
       change_profile_background:
         title: "Profielkoptekst"
         instructions: "Profielkopteksten worden gecentreerd en hebben een standaardbreedte van 1110px."
@@ -1120,7 +1209,7 @@ nl:
         set_primary: "Primair e-mailadres instellen"
         destroy: "E-mailadres verwijderen"
         add_email: "Alternatief e-mailadres toevoegen"
-        sso_override_instructions: "E-mailadres kan vanaf SSO-provider worden bijgewerkt."
+        auth_override_instructions: "E-mailadres kan worden bijgewerkt vanaf de authenticatieprovider."
         no_secondary: "Geen extra e-mailadressen"
         instructions: "Nooit openbaar zichtbaar."
         admin_note: "Opmerking: een beheerder die het e-mailadres van een andere niet-beheerder wijzigt, geeft aan dat de gebruiker geen toegang meer heeft tot zijn of haar e-mailaccount, dus er wordt een e-mail voor opnieuw instellen van het wachtwoord naar zijn of haar nieuwe adres gestuurd. Het e-mailadres van de gebruiker wordt pas gewijzigd nadat hij of zij het proces voor opnieuw instellen van het wachtwoord heeft voltooid."
@@ -1128,6 +1217,7 @@ nl:
         required: "Voer een e-mailadres in"
         invalid: "Voer een geldig e-mailadres in"
         authenticated: "Uw e-mailadres is geauthenticeerd door %{provider}"
+        invite_auth_email_invalid: "Uw uitnodigingsmail komt niet overeen met het e-mailadres dat door %{provider} is geverifieerd"
         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."
@@ -1161,6 +1251,7 @@ nl:
         checking: "Beschikbaarheid van gebruikersnaam controleren..."
         prefilled: "E-mailadres komt overeen met deze geregistreerde gebruikersnaam"
         required: "Voer een gebruikersnaam in"
+        edit: "Gebruikersnaam bewerken"
       locale:
         title: "Taal van interface"
         instructions: "Taal van de gebruikersinterface. Deze verandert zodra u de pagina opnieuw laadt."
@@ -1182,7 +1273,7 @@ nl:
         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}"
         secure_account: "Mijn account beveiligen"
-        latest_post: "Uw laatste bericht..."
+        latest_post: "U hebt voor het laatst een bericht geplaatst…"
         device_location: '<span class="auth-token-device">%{device}</span> &ndash; <span title="IP: %{ip}">%{location}</span>'
         browser_active: '%{browser} | <span class="active">nu actief</span>'
         browser_last_seen: "%{browser} | %{date}"
@@ -1208,7 +1299,7 @@ nl:
         notifications: "Nieuwe meldingen"
         contextual: "Nieuwe pagina-inhoud"
       like_notification_frequency:
-        title: "Melden wanneer geliket"
+        title: "Een melding sturen wanneer geliket"
         always: "Altijd"
         first_time_and_daily: "De eerste keer dat een bericht is geliket en dagelijks"
         first_time: "De eerste keer dat een bericht is geliket"
@@ -1257,46 +1348,47 @@ nl:
         after_10_minutes: "na 10 minuten"
       notification_level_when_replying: "Als ik een bericht in een topic plaats, dat topic instellen op"
       invited:
-        search: "typ om uitnodigingen te zoeken..."
         title: "Uitnodigingen"
+        pending_tab: "Uitstaand"
+        pending_tab_with_count: "Uitstaand (%{count})"
+        expired_tab: "Verlopen"
+        expired_tab_with_count: "Verlopen (%{count})"
+        redeemed_tab: "Verzilverd"
+        redeemed_tab_with_count: "Verzilverd (%{count})"
+        invited_via: "Uitnodiging"
+        invited_via_link: "koppeling %{key} (%{count} / %{max} verzilverd)"
+        groups: "Groepen"
+        topic: "Topic"
+        sent: "Aangemaakt/Laatst Verstuurd"
+        expires_at: "Verloopt"
+        edit: "Bewerken"
+        remove: "Verwijderen"
+        copy_link: "Koppeling ophalen"
+        reinvite: "E-mail opnieuw versturen"
+        reinvited: "Uitnodiging opnieuw verstuurd"
+        removed: "Verwijderd"
+        search: "typ om uitnodigingen te zoeken..."
         user: "Uitgenodigde gebruiker"
-        sent: "Laatst verzonden"
         none: "Geen uitnodigingen om weer te geven."
         truncated:
           one: "De eerste uitnodiging wordt getoond."
           other: "De eerste %{count} uitnodigingen worden getoond."
         redeemed: "Verzilverde uitnodigingen"
-        redeemed_tab: "Verzilverd"
-        redeemed_tab_with_count: "Verzilverd (%{count})"
         redeemed_at: "Verzilverd"
         pending: "Uitstaande uitnodigingen"
-        pending_tab: "Uitstaand"
-        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: "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"
+        remove_all: "Verwijder Verlopen uitnodigingen"
+        removed_all: "Alle Verlopen uitnodigingen verwijderd!"
+        remove_all_confirm: "Weet u zeker dat u alle verlopen uitnodigingen wilt verwijderen?"
         reinvite_all: "Alle uitnodigingen opnieuw versturen"
         reinvite_all_confirm: "Weet u zeker dat u alle uitnodigingen opnieuw wilt versturen?"
-        reinvited: "Uitnodiging opnieuw verstuurd"
-        reinvited_all: "Alle uitnodigingen zijn opnieuw verstuurd!"
+        reinvited_all: "Alle uitnodigingen zijn verstuurd!"
         time_read: "Leestijd"
         days_visited: "Dagen bezocht"
         account_age_days: "Leeftijd van account in dagen"
-        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
-        copy_link: "Koppeling tonen"
+        create: "Uitnodigen"
         generate_link: "Uitnodigingskoppeling maken"
         link_generated: "Hier is uw uitnodigingskoppeling!"
         valid_for: "De uitnodigingskoppeling is alleen geldig voor dit e-mailadres: %{email}"
@@ -1304,16 +1396,40 @@ nl:
         multiple_user: "Uitnodigen via koppeling"
         invite_link:
           title: "Uitnodigingskoppeling"
-          success: "Uitnodigingskoppeling is aangemaakt!"
+          success: "Uitnodigingskoppeling succesvol gegenereerd!"
           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?"
+        invite:
+          new_title: "Uitnodiging maken"
+          edit_title: "Uitnodiging bewerken"
+          instructions: "Deze koppeling delen om meteen toegang tot deze website te verlenen:"
+          copy_link: "koppeling kopiëren"
+          expires_in_time: "Verloopt in %{time}."
+          expired_at_time: "Verlopen om %{time}."
+          show_advanced: "Geavanceerde opties tonen"
+          hide_advanced: "Geavanceerde opties verbergen"
+          restrict_email: "De uitnodiging tot één e-mail beperken"
+          max_redemptions_allowed: "Max. aantal toepassingen:"
+          add_to_groups: "Toevoegen aan groepen:"
+          invite_to_topic: "Naar topic versturen bij eerste login:"
+          expires_at: "Verloopt na:"
+          custom_message: "Optioneel persoonlijk bericht:"
+          send_invite_email: "E-mail opslaan en versturen"
+          save_invite: "Uitnodiging opslaan"
+          invite_saved: "Uitnodiging opgeslagen."
+          invite_copied: "Uitnodigingskoppeling gekopieerd."
+          blank_email: "Uitnodigingskoppeling niet gekopieerd. E-mailadres is vereist."
         bulk_invite:
           none: "Geen uitnodigingen om weer te geven op deze pagina."
           text: "Bulkuitnodiging"
-          success: "Het bestand is geüpload. U ontvangt een melding via een bericht zodra het proces is voltooid."
+          instructions: |
+            <p>Nodig een lijst met gebruikers uit om uw community snel op gang te helpen. Bereid een <a href="https://nl.wikipedia.org/wiki/Kommagescheiden_bestand" target="_blank">CSV-bestand</a> voor met ten minste één rij per e-mailadres van gebruikers die u wilt uitnodigen. De volgende door komma's gescheiden informatie kan worden verstrekt als u mensen aan groepen wilt toevoegen of ze naar een specifiek topic wilt sturen de eerste keer dat ze zich aanmelden.</p>
+            <pre>john@smith.com,eerste_groepsnaam;tweede_groepsnaam,topic_id</pre>
+            <p>Elk e-mailadres in uw geüploade CSV-bestand zal een uitnodiging opgestuurd krijgen en u zult deze later kunnen beheren.</p>
+          progress: "%{progress}% geüpload..."
+          success: "Bestand succesvol geüpload. U ontvangt een melding 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"
       password:
         title: "Wachtwoord"
         too_short: "Uw wachtwoord is te kort."
@@ -1377,6 +1493,8 @@ nl:
       avatar:
         title: "Profielafbeelding"
         header_title: "profiel, berichten, bladwijzers en voorkeuren"
+        name_and_description: "%{name} - %{description}"
+        edit: "Profielafbeelding bewerken"
       title:
         title: "Titel"
         none: "(geen)"
@@ -1414,7 +1532,7 @@ nl:
       close: "sluiten"
       dismiss_error: "Fout negeren"
     close: "Sluiten"
-    assets_changed_confirm: "Deze website is zojuist bijgewerkt. Nu vernieuwen om de nieuwste versie te laden?"
+    assets_changed_confirm: "Deze website heeft zojuist een software-upgrade ontvangen. Nu de laatste versie downloaden?"
     logout: "U bent afgemeld."
     refresh: "Vernieuwen"
     home: "Hoofdpagina"
@@ -1434,15 +1552,6 @@ nl:
       exceeded_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."
       exceeded_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."
     learn_more: "meer info..."
-    all_time: "totaal"
-    all_time_desc: "aantal aangemaakte topics"
-    year: "jaar"
-    year_desc: "in de afgelopen 365 dagen aangemaakte topics"
-    month: "maand"
-    month_desc: "in de afgelopen 30 dagen aangemaakte topics"
-    week: "week"
-    week_desc: "in de afgelopen 7 dagen aangemaakte topics"
-    day: "dag"
     first_post: Eerste bericht
     mute: Negeren
     unmute: Tonen
@@ -1460,13 +1569,15 @@ nl:
       sign_up: "Registreren"
       hide_session: "Mij morgen herinneren"
       hide_forever: "nee, bedankt"
-      hidden_for_session: "OK, ik vraag het u morgen. U kunt ook altijd 'Aanmelden' gebruiken om een account aan te maken."
+      hidden_for_session: "OK, we vragen het u morgen. U kunt ook altijd 'Inloggen' gebruiken om een account aan te maken."
       intro: "Hallo! Zo te zien beleeft u plezier aan de discussie, maar hebt u zich nog niet voor een account geregistreerd."
       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:
+        one: "Er is <b>%{count}</b> antwoord."
+        other: "Er zijn <b>%{count}</b> antwoorden."
+      description_time_MF: "Er {replyCount, plural, one {is <b>#</b> antwoord} other {zijn <b>#</b> antwoorden}} met een geschatte leestijd van <b>{readingTime, plural, one {# minuut} other {# minuten}}</b>."
       enable: "Dit topic samenvatten"
       disable: "Alle berichten tonen"
     deleted_filter:
@@ -1491,6 +1602,8 @@ nl:
     trust_level: "Vertrouwensniveau"
     search_hint: "gebruikersnaam, e-mailadres of IP-adres"
     create_account:
+      header_title: "Welkom!"
+      subheader_title: "Laten we uw account maken"
       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: "Nieuw account maken"
       failed: "Er is iets misgegaan; mogelijk is het e-mailadres al geregistreerd. Probeer de koppeling 'Wachtwoord vergeten'."
@@ -1510,7 +1623,8 @@ nl:
       button_help: "Help"
     email_login:
       link_label: "Een koppeling voor aanmelding e-mailen"
-      button_label: "via e-mail"
+      button_label: "met e-mail"
+      login_link: "Sla het wachtwoord over; mail me een inloglink"
       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."
@@ -1522,6 +1636,8 @@ nl:
       logging_in_as: Aanmelden als %{email}
       confirm_button: Aanmelding voltooien
     login:
+      header_title: "Welkom terug"
+      subheader_title: "Aanmelden op uw account"
       title: "Aanmelden"
       username: "Gebruiker"
       password: "Wachtwoord"
@@ -1529,7 +1645,7 @@ nl:
       second_factor_description: "Voer de authenticatiecode van uw app in:"
       second_factor_backup: "Aanmelden met een back-upcode"
       second_factor_backup_title: "Tweefactor-back-up"
-      second_factor_backup_description: "Voer een van uw back-upcodes in:"
+      second_factor_backup_description: "Voer één van uw back-upcodes in:"
       second_factor: "Aanmelden met authenticator-app"
       security_key_description: "Houd uw fysieke beveiligingssleutel gereed en klik op de onderstaande knop Authenticeren met beveiligingssleutel."
       security_key_alternative: "Andere manier proberen"
@@ -1537,7 +1653,7 @@ nl:
       security_key_not_allowed_error: "Het authenticatieproces van de beveiligingssleutel had een time-out of is geannuleerd."
       security_key_no_matching_credential_error: "Geen referenties gevonden in de opgegeven beveiligingssleutel."
       security_key_support_missing_error: "Uw huidige apparaat of browser ondersteunt geen gebruik van beveiligingssleutels. Gebruik een andere methode."
-      email_placeholder: "e-mailadres of gebruikersnaam"
+      email_placeholder: "E-mailadres / Gebruikersnaam"
       caps_lock_warning: "Caps Lock staat aan"
       error: "Onbekende fout"
       cookies_error: "Het lijkt erop dat uw browser geen cookies toestaat. Als u ze niet eerst toestaat, kunt u zich misschien niet aanmelden."
@@ -1604,7 +1720,6 @@ nl:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (voorheen EmojiOne)"
       win10: "Win10"
       google_classic: "Google Klassiek"
       facebook_messenger: "Facebook Messenger"
@@ -1626,7 +1741,15 @@ nl:
       topic_count:
         one: "%{count} topic in deze categorie"
         other: "%{count} topics in deze categorie"
+      plus_subcategories_title:
+        one: "%{name} en één subcategorie"
+        other: "%{name} en %{count} subcategorieën"
+      plus_subcategories:
+        one: "+ %{count} subcategorie"
+        other: "+ %{count} subcategorieën"
     select_kit:
+      filter_by: "Filteren op: %{name}"
+      select_to_filter: "Een waarde selecteren om te filteren"
       default_header_text: Selecteren...
       no_content: Geen overeenkomsten gevonden
       filter_placeholder: Zoeken...
@@ -1642,13 +1765,13 @@ nl:
         one: "Selectie moet minstens %{count} teken bevatten."
         other: "Selectie moet minstens %{count} tekens bevatten."
       components:
+        tag_drop:
+          filter_for_more: Filteren voor meer...
         categories_admin_dropdown:
           title: "Categorieën beheren"
     date_time_picker:
       from: Van
       to: Aan
-      errors:
-        to_before_from: "Tot-datum moet later zijn dan van-datum."
     emoji_picker:
       filter_placeholder: Zoeken naar emoji
       smileys_&_emotion: Smileys en Emotie
@@ -1670,7 +1793,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 gedeelde concepten kunnen publiceren."
       destination_category: "Bestemmingscategorie"
       publish: "Gedeeld concept publiceren"
       confirm_publish: "Weet u zeker dat u dit concept wilt publiceren?"
@@ -1681,7 +1804,6 @@ nl:
       options: "Opties"
       whisper: "fluisteren"
       unlist: "onzichtbaar"
-      blockquote_text: "Citaat"
       add_warning: "Dit is een officiële waarschuwing."
       toggle_whisper: "Fluistermodus in-/uitschakelen"
       toggle_unlisted: "Onzichtbaar in-/uitschakelen"
@@ -1703,10 +1825,16 @@ nl:
       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:
+          one: "Titel moet minstens %{count} teken bevatten."
+          other: "Titel moet minstens %{count} tekens bevatten."
+        title_too_long:
+          one: "Titel kan niet langer zijn dan %{count} teken"
+          other: "Titel kan niet langer zijn dan %{count} tekens"
         post_missing: "Bericht kan niet leeg zijn"
-        post_length: "Bericht moet minstens %{min} tekens bevatten"
+        post_length:
+          one: "Bericht moet minstens %{count} teken bevatten."
+          other: "Bericht moet minstens %{count} tekens bevatten."
         try_like: "Hebt u de knop %{heart} geprobeerd?"
         category_missing: "U moet een categorie kiezen"
         tags_missing:
@@ -1739,8 +1867,8 @@ nl:
       saved: "Opgeslagen!"
       saved_draft: "Berichtconcept wordt uitgevoerd. Tik om te hervatten."
       uploading: "Uploaden..."
-      show_preview: "voorbeeld tonen &raquo;"
-      hide_preview: "&laquo; voorbeeld verbergen"
+      show_preview: "toon voorbeeld"
+      hide_preview: "verberg voorbeeld"
       quote_post_title: "Hele bericht citeren"
       bold_label: "B"
       bold_title: "Vet"
@@ -1753,8 +1881,8 @@ nl:
       link_dialog_title: "Hyperlink invoegen"
       link_optional_text: "optionele titel"
       link_url_placeholder: "Plak een URL of typ om topics te zoeken"
-      quote_title: "Citaat"
-      quote_text: "Citaat"
+      blockquote_title: "Citaat"
+      blockquote_text: "Citaat"
       code_title: "Vooraf opgemaakte tekst"
       code_text: "vooraf opgemaakte tekst met 4 spaties laten inspringen"
       paste_code_text: "typ of plak hier code"
@@ -1779,7 +1907,7 @@ nl:
         title: "Bent u ontvangers vergeten toe te voegen?"
         body: "Het bericht wordt nu alleen naar uzelf verstuurd!"
       slow_mode:
-        error: "Dit topic bevindt zich in de langzame modus. Om een doordachte, weloverwogen discussie te stimuleren, mag u slechts één keer per %{duration} een bericht plaatsen."
+        error: "Dit topic bevindt zich in de langzame modus. U hebt onlangs al gepost; U kunt opnieuw posten in %{timeLeft}."
       admin_options_title: "Optionele stafinstellingen voor dit topic"
       composer_actions:
         reply: Antwoorden
@@ -1808,7 +1936,7 @@ nl:
           label: "Nieuw topic"
         shared_draft:
           label: "Gedeeld concept"
-          desc: "Een concepttopic maken dat alleen zichtbaar is voor stafleden"
+          desc: "Een concepttopic maken dat alleen zichtbaar is voor toegestane gebruikers"
         toggle_topic_bump:
           label: "Topicbump in-/uitschakelen"
           desc: "Antwoorden zonder datum van laatste antwoord te wijzigen"
@@ -1908,14 +2036,15 @@ 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"
       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"
       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"
       select_file: "Bestand selecteren"
       default_image_alt_text: afbeelding
+      supported_formats: "ondersteunde formaten"
     search:
       sort_by: "Sorteren op"
       relevance: "Relevantie"
@@ -1941,6 +2070,7 @@ nl:
       or_search_google: "Of probeer in plaats hiervan te zoeken met Google:"
       search_google: "Probeer in plaats hiervan te zoeken met Google:"
       search_google_button: "Google"
+      search_button: "Zoeken"
       context:
         user: "Berichten van @%{username} doorzoeken"
         category: "De categorie #%{category} doorzoeken"
@@ -1968,7 +2098,7 @@ nl:
           watching: die ik in de gaten houd
           tracking: die ik volg
           private: In mijn berichten
-          bookmarks: Ik heb een bladwijzer aangemaakt
+          bookmarks: Ik heb een bladwijzer gemaakt
           first: die het eerste bericht zijn
           pinned: die zijn vastgemaakt
           seen: Ik heb gelezen
@@ -2006,7 +2136,7 @@ nl:
     go_back: "terug"
     not_logged_in_user: "gebruikerspagina met samenvatting van huidige activiteit en voorkeuren"
     current_user: "naar uw gebruikerspagina"
-    view_all: "alle bekijken"
+    view_all: "Alle %{tab} bekijken"
     topics:
       new_messages_marker: "laatste bezoek"
       bulk:
@@ -2027,7 +2157,9 @@ nl:
         change_category: "Categorie wijzigen"
         close_topics: "Topics sluiten"
         archive_topics: "Topics archiveren"
+        move_messages_to_inbox: "Naar Postvak IN verplaatsen"
         notification_level: "Meldingen"
+        change_notification_level: "Wijzig meldingsniveau"
         choose_new_category: "Kies de nieuwe categorie voor de topics:"
         selected:
           one: "U hebt <b>%{count}</b> topic geselecteerd."
@@ -2037,7 +2169,10 @@ nl:
         choose_new_tags: "Kies nieuwe tags voor deze topics:"
         choose_append_tags: "Kies nieuwe tags om voor deze topics toe te voegen:"
         changed_tags: "De tags van deze topics zijn gewijzigd."
-        remove_tags: "Tags verwijderen"
+        remove_tags: "Verwijder alle tags"
+        confirm_remove_tags:
+          one: "Alle tags zullen verwijderd worden uit dit topic. Weet u het zeker?"
+          other: "Alle tags zullen verwijderd worden uit <b>%{count}</b> topics. Weet u het zeker?"
         progress:
           one: "Voortgang: <strong>%{count}</strong> topic"
           other: "Voortgang: <strong>%{count}</strong> topics"
@@ -2053,7 +2188,7 @@ nl:
         top: "Er zijn geen toptopics."
         educate:
           new: '<p>Hier verschijnen uw nieuwe topics. Standaard worden topics als nieuw beschouwd en verschijnt de indicator <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> als deze in de afgelopen 2 dagen zijn aangemaakt.</p><p>Bezoek uw <a href="%{userPrefsUrl}">voorkeuren</a> om dit te wijzigen.</p>'
-          unread: '<p>Hier verschijnen uw ongelezen topics.</p><p>Standaard worden topics als ongelezen beschouwd en verschijnt het aantal ongelezen <span class="badge new-posts badge-notification">1</span> als u:</p><ul><li>Het topic hebt aangemaakt</li><li>Op het topic hebt geantwoord</li><li>Het topic langer dan 4 minuten hebt gelezen</li></ul><p>Of als u het topic expliciet op Gevolgd of In de gaten gehouden hebt gezet via de meldingsinstellingen onder elk topic.</p><p>Bezoek uw <a href="%{userPrefsUrl}">voorkeuren</a> om dit te wijzigen.</p>'
+          unread: "<p>Uw ongelezen topics verschijnen hier.</p><p>Standaard worden topics als ongelezen beschouwd en zullen ze het aantal ongelezen berichten laten zien <span class=\"badge new-posts badge-notification\">1</span> als u:</p><ul><li>Het topic heeft aangemaakt</li><li>Op het topic heeft geantwoord</li><li>Het topic langer dan 4 minuten heeft gelezen</li></ul><p>Of als u het topic expliciet heeft ingesteld op \"Gevolgd\" of \"In de gaten gehouden\" via de \U0001F514 in elk topic.</p><p>Bezoek uw <a href=\"%{userPrefsUrl}\">voorkeuren</a> om dit te wijzigen.</p>"
       bottom:
         latest: "Er zijn geen nieuwste topics meer."
         posted: "Er zijn geen topics meer geplaatst."
@@ -2130,7 +2265,7 @@ nl:
       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}."
       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 {}}"
+      read_more_MF: "Er { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'># ongelezen</a> } other { zijn <a href='{basePath}/unread'># ongelezen</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{en } false {is } other{}} <a href='{basePath}/new'># nieuw</a> topic} other { {BOTH, select, true{en } false {zijn } other{}} <a href='{basePath}/new'># nieuwe</a> topics} } over, of {CATEGORY, select, true {bekijk 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
       browse_all_tags: Alle tags bekijken
@@ -2144,19 +2279,25 @@ nl:
         select: "Gebruikers mogen slechts een bericht in dit topic plaatsen om de:"
         description: "Om een doordachte discussie in snel bewegende of controversiële discussies te stimuleren, moeten gebruikers wachten voordat ze opnieuw een bericht in dit topic kunnen plaatsen."
         save: "Inschakelen"
+        enabled_until: "Ingeschakeld tot:"
         remove: "Uitschakelen"
         hours: "Uren:"
         minutes: "Minuten:"
         seconds: "Seconden:"
         durations:
+          10_minutes: "10 minuten"
           15_minutes: "15 minuten"
+          30_minutes: "30 minuten"
+          45_minutes: "45 minuten"
           1_hour: "1 uur"
+          2_hours: "2 uur"
           4_hours: "4 uur"
-          1_day: "1 dag"
-          1_week: "1 week"
+          8_hours: "8 uur"
+          12_hours: "12 uur"
+          24_hours: "24 uur"
           custom: "Aangepaste tijdsduur"
       slow_mode_notice:
-        duration: "U dient %{duration} te wachten tussen berichten in dit topic"
+        duration: "Wacht %{duration} tussen berichten in dit topic"
       topic_status_update:
         title: "Topictimer"
         save: "Timer instellen"
@@ -2165,7 +2306,9 @@ nl:
         remove: "Timer verwijderen"
         publish_to: "Publiceren naar:"
         when: "Wanneer:"
-        time_frame_required: Selecteer een tijdsbestek
+        time_frame_required: "Selecteer een tijdsbestek"
+        min_duration: "Tijdsduur moet langer zijn dan 0"
+        max_duration: "Tijdsduur moet minder dan 20 jaar zijn"
       auto_update_input:
         none: "Selecteer een tijdsbestek"
         now: "Nu"
@@ -2194,9 +2337,11 @@ nl:
         title: "Tijdelijk sluiten"
       auto_close:
         title: "Topic automatisch sluiten"
-        label: "Tijden voor automatisch sluiten van topic:"
+        label: "Sluit topic automatisch na:"
         error: "Voer een geldige waarde in."
         based_on_last_post: "Pas sluiten als het laatste bericht in het topic minstens zo oud is"
+      auto_close_after_last_post:
+        title: "Topic automatisch sluiten na laatste bericht"
       auto_delete:
         title: "Topic automatisch verwijderen"
       auto_bump:
@@ -2209,7 +2354,7 @@ nl:
         auto_open: "Dit topic wordt %{timeLeft} automatisch geopend."
         auto_close: "Dit topic wordt %{timeLeft} automatisch gesloten."
         auto_publish_to_category: "Dit topic wordt %{timeLeft} naar <a href=%{categoryUrl}>#%{categoryName}</a> gepubliceerd."
-        auto_close_based_on_last_post: "Dit topic wordt %{duration} na het laatste antwoord gesloten."
+        auto_close_after_last_post: "Dit topic wordt %{duration} na het laatste antwoord gesloten."
         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."
@@ -2218,6 +2363,9 @@ nl:
       auto_close_immediate:
         one: "Het laatste bericht in dit topic is al %{count} uur oud, dus het topic wordt meteen gesloten."
         other: "Het laatste bericht in dit topic is al %{count} uur oud, dus het topic wordt meteen gesloten."
+      auto_close_momentarily:
+        one: "Het laatste bericht in dit topic is al %{count} uur oud, dus het topic wordt gesloten."
+        other: "Het laatste bericht in dit topic is al %{count} uur oud, dus het topic wordt gesloten."
       timeline:
         back: "Terug"
         back_description: "Terug naar uw laatste ongelezen bericht"
@@ -2229,7 +2377,9 @@ nl:
         go: "gaan"
         jump_bottom: "naar laatste bericht"
         jump_prompt: "springen naar..."
-        jump_prompt_of: "van %{count} berichten"
+        jump_prompt_of:
+          one: "van %{count} bericht"
+          other: "van %{count} berichten"
         jump_prompt_long: "Springen naar..."
         jump_bottom_with_number: "naar bericht %{post_number}"
         jump_prompt_to_date: "tot datum"
@@ -2314,13 +2464,22 @@ nl:
         title: "Delen"
         extended_title: "Een koppeling delen"
         help: "een koppeling naar dit topic delen"
+        instructions: "Een koppeling naar dit topic delen:"
+        copied: "Topiclink gekopieerd."
+        notify_users:
+          title: "Een melding sturen"
+          instructions: "De volgende gebruikers een melding sturen over dit topic."
+          success:
+            one: "%{username} is succesvol een melding gestuurd over dit topic."
+            other: "Alle gebruikers succesvol een melding gestuurd over dit topic."
+        invite_users: "Uitnodigen"
       print:
         title: "Afdrukken"
         help: "Een printervriendelijke versie van dit topic openen"
       flag_topic:
         title: "Markeren"
         help: "een privémarkering aan dit topic geven of er een privébericht over sturen"
-        success_message: "U hebt dit topic gemarkeerd."
+        success_message: "U hebt dit topic succesvol gemarkeerd."
       make_public:
         title: "Converteren naar openbaar topic"
         choose_category: "Kies een categorie voor het openbare topic:"
@@ -2369,14 +2528,14 @@ nl:
         username_placeholder: "gebruikersnaam"
         action: "Uitnodiging sturen"
         help: "anderen uitnodigen voor dit topic via e-mail of meldingen"
-        to_forum: "We sturen een kort mailtje waarmee uw vriend(in) direct kan deelnemen door op een koppeling te klikken; er is geen aanmelding vereist."
-        sso_enabled: "Voer de gebruikersnaam in van de persoon die u voor dit topic wilt uitnodigen."
+        to_forum: "We sturen een kort mailtje waarmee uw vriend(in) direct kan deelnemen door op een koppeling te klikken."
+        discourse_connect_enabled: "Voer de gebruikersnaam in van de persoon die u voor dit topic wilt uitnodigen."
         to_topic_blank: "Voer de gebruikersnaam of het e-mailadres in van de persoon die u voor dit topic wilt uitnodigen."
         to_topic_email: "U hebt een e-mailadres ingevoerd. We sturen een uitnodiging per e-mail waarmee uw vriend(in) direct op dit topic kan antwoorden."
         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: "We hebben een uitnodiging verstuurd naar <b>%{invitee}</b>. We brengen u op de hoogte wanneer de uitnodiging is afgegeven. Controleer het tabblad Uitnodigingen 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: "Er bestaat al een gebruiker met het e-mailadres <b>%{emailOrUsername}</b>. We hebben deze gebruiker uitgenodigd om aan dit topic deel te nemen."
@@ -2397,8 +2556,8 @@ nl:
         radio_label: "Nieuw topic"
         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."
+          one: "U staat op het punt een nieuw topic te maken en het in te vullen met het bericht dat u hebt geselecteerd."
+          other: "U staat op het punt een nieuw topic te maken en het in te vullen met de <b>%{count}</b> berichten die u hebt geselecteerd."
       merge_topic:
         title: "Verplaatsen naar bestaand topic"
         action: "verplaatsen naar bestaand topic"
@@ -2414,8 +2573,8 @@ nl:
         radio_label: "Nieuw bericht"
         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."
+          one: "U staat op het punt een nieuw bericht te maken en het in te vullen met het bericht dat u hebt geselecteerd."
+          other: "U staat op het punt een nieuw bericht te maken en het in te vullen met de <b>%{count}</b> berichten die u hebt geselecteerd."
       move_to_existing_message:
         title: "Verplaatsen naar bestaand bericht"
         action: "verplaatsen naar bestaand bericht"
@@ -2490,8 +2649,8 @@ nl:
       edit_reason: "Reden: "
       post_number: "bericht %{number}"
       ignored: "Genegeerde inhoud"
-      wiki_last_edited_on: "wiki laatst bewerkt op"
-      last_edited_on: "bericht laatst bewerkt op"
+      wiki_last_edited_on: "wiki laatst bewerkt op %{dateTime}"
+      last_edited_on: "bericht laatst bewerkt op %{dateTime}"
       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}:"
@@ -2509,11 +2668,12 @@ nl:
         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}."
+        returning_user: "Het is al even geleden dat we %{user} hebben gezien – hun laatste bericht dateert van %{time}."
       unread: "Bericht is ongelezen"
       has_replies:
         one: "%{count} antwoord"
         other: "%{count} antwoorden"
+      has_replies_count: "%{count}"
       unknown_user: "(onbekende/verwijderde gebruiker)"
       has_likes_title:
         one: "%{count} persoon heeft dit bericht geliket"
@@ -2522,6 +2682,14 @@ nl:
       has_likes_title_you:
         one: "u en %{count} andere persoon hebben dit bericht geliket"
         other: "u en %{count} andere personen hebben dit bericht geliket"
+      filtered_replies_hint:
+        one: "Dit bericht en zijn antwoord bekijken"
+        other: "Dit bericht en zijn %{count} antwoorden bekijken"
+      filtered_replies_viewing:
+        one: "%{count} antwoord aan het bekijken op"
+        other: "%{count} antwoorden aan het bekijken op"
+      in_reply_to: "Bovenliggend bericht laden"
+      view_all_posts: "Alle berichten bekijken"
       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."
@@ -2535,16 +2703,11 @@ nl:
         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."
-      abandon_edit:
-        confirm: "Weet u zeker dat u uw wijzigingen wilt negeren?"
-        no_value: "Nee, behouden"
-        no_save_draft: "Nee, concept opslaan"
-        yes_value: "Ja, bewerking negeren"
-      abandon:
-        confirm: "Weet u zeker dat u uw bericht wilt afbreken?"
-        no_value: "Nee, behouden"
-        no_save_draft: "Nee, concept opslaan"
-        yes_value: "Ja, afbreken"
+      cancel_composer:
+        confirm: "Wat wilt u met uw bericht doen?"
+        discard: "Negeren"
+        save_draft: "Concept opslaan voor later"
+        keep_editing: "Blijf bewerken"
       via_email: "dit bericht kwam binnen via e-mail"
       via_auto_generated_email: "dit bericht kwam binnen via een automatisch gegenereerde e-mail"
       whisper: "dit bericht is alleen toegankelijk voor moderators"
@@ -2592,7 +2755,9 @@ nl:
         unlock_post_description: "toestaan dat de schrijver dit bericht bewerkt"
         delete_topic_disallowed_modal: "U hebt geen toestemming om dit topic te verwijderen. Als u echt wilt dat het wordt verwijderd, plaats dan een markering voor aandacht van een moderator, en voeg de reden bij."
         delete_topic_disallowed: "u hebt geen toestemming om dit topic te verwijderen"
-        delete_topic_confirm_modal: "Dit topic heeft momenteel meer dan %{minViews} weergaven en kan een populaire zoekbestemming zijn. Weet u zeker dat u dit topic volledig wilt verwijderen, in plaats van het te bewerken voor verbetering?"
+        delete_topic_confirm_modal:
+          one: "Dit topic heeft momenteel meer dan %{count} weergave en kan een populaire zoekbestemming zijn. Weet u zeker dat u dit topic volledig wilt verwijderen, in plaats van het te bewerken voor verbetering?"
+          other: "Dit topic heeft momenteel meer dan %{count} weergaven en kan een populaire zoekbestemming zijn. Weet u zeker dat u dit topic volledig wilt verwijderen, in plaats van het te bewerken voor verbetering?"
         delete_topic_confirm_modal_yes: "Ja, dit topic verwijderen"
         delete_topic_confirm_modal_no: "Nee, dit topic behouden"
         delete_topic_error: "Er is een fout opgetreden bij het verwijderen van dit topic"
@@ -2601,6 +2766,7 @@ nl:
         change_post_notice: "Stafmelding wijzigen"
         delete_post_notice: "Stafmelding verwijderen"
         remove_timer: "timer verwijderen"
+        edit_timer: "timer bewerken"
       actions:
         people:
           like:
@@ -2677,6 +2843,18 @@ nl:
           edit_bookmark:
             name: "Bladwijzer bewerken"
             description: "De bladwijzernaam bewerken of de herinneringsdatum en -tijd wijzigen"
+          pin_bookmark:
+            name: "Bladwijzer vastmaken"
+            description: "Maak de bladwijzer vast. Hierdoor wordt het boven aan uw bladwijzerlijst weergegeven."
+          unpin_bookmark:
+            name: "Bladwijzer losmaken"
+            description: "Maak de bladwijzer los. Het wordt niet langer boven aan uw bladwijzerlijst weergegeven."
+      filtered_replies:
+        viewing_posts_by: "%{post_count} berichten aan het bekijken door"
+        viewing_subset: "Sommige antwoorden zijn samengevouwen"
+        viewing_summary: "Samenvatting van dit topic aan het bekijken"
+        post_number: "%{username}, bericht #%{post_number}"
+        show_all: "Alles tonen"
     category:
       can: "kan&hellip; "
       none: "(geen categorie)"
@@ -2724,9 +2902,20 @@ nl:
       delete_error: "Er is een fout opgetreden bij het verwijderen van de categorie."
       list: "Lijst van categorieën"
       no_description: "Voeg een omschrijving toe voor deze categorie."
-      change_in_category_topic: "Omschrijving wijzigen"
+      change_in_category_topic: "Omschrijving bewerken"
       already_used: "Deze kleur is al in gebruik door een andere categorie"
       security: "Beveiliging"
+      security_add_group: "Een groep toevoegen"
+      permissions:
+        group: "Groep"
+        see: "Bekijken"
+        reply: "Antwoorden"
+        create: "Aanmaken"
+        no_groups_selected: "Er is geen toegang tot groepen verleend; deze categorie is alleen zichtbaar voor stafleden."
+        everyone_has_access: 'Deze categorie is openbaar; iedereen kan berichten zien, beantwoorden en aanmaken. Verwijder een of meer van de verleende toestemmingen voor de groep ''iedereen'' om toestemmingen te beperken.'
+        toggle_reply: "Toestemming Antwoorden in-/uitschakelen"
+        toggle_full: "Toestemming Aanmaken in-/uitschakelen"
+        inherited: 'Deze toestemming is overgenomen van ''iedereen'''
       special_warning: "Waarschuwing: deze categorie is een vooraf geseede categorie, en de beveiligingsinstellingen kunnen niet worden bewerkt. Als u deze categorie niet wenst te gebruiken, verwijder deze dan in plaats van het doel ervan te wijzigen."
       uncategorized_security_warning: "Deze categorie is bijzonder. Hij is bedoeld als wachtruimte voor topics die geen categorie hebben, en kan geen beveiligingsinstellingen bevatten."
       uncategorized_general_warning: 'Deze categorie is bijzonder. Hij is bedoeld als de standaardcategorie voor nieuwe topics die geen selecteerde categorie hebben. Als u dit gedrag wilt voorkomen en categorieselectie wilt afdwingen, <a href="%{settingLink}">schakel de instelling dan hier uit</a>. Als u de naam of omschrijving wilt wijzigen, ga dan naar <a href="%{customizeLink}">Aanpassen / Tekstinhoud</a>.'
@@ -2742,13 +2931,14 @@ nl:
       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"
+      allow_unlimited_owner_edits_on_first_post: "Sta onbeperkte wijzigingen van de eigenaar toe voor het eerste bericht"
       subcategory_list_style: "Stijl van subcategorielijst:"
       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"
+      edit_permissions: "Toestemmingen bewerken"
       reviewable_by_group: "Naast stafleden kan inhoud in deze categorie ook worden beoordeeld door:"
       review_group_name: "groepsnaam"
       require_topic_approval: "Goedkeuring van moderator voor alle nieuwe topics vereisen"
@@ -2765,19 +2955,19 @@ nl:
       notifications:
         watching:
           title: "In de gaten houden"
-          description: "U houdt automatisch alle topics in deze categorieën in de gaten. U ontvangt meldingen voor elk nieuw bericht in elk topic, en het aantal nieuwe antwoorden verschijnt naast het topic."
+          description: "U houdt automatisch alle nieuwe topics in deze categorieën in de gaten. U ontvangt meldingen bij elk nieuw bericht in elk topic, en het aantal nieuwe antwoorden verschijnt naast het topic."
         watching_first_post:
           title: "Eerste bericht in de gaten houden"
           description: "U ontvangt meldingen over nieuwe topics in deze categorie, maar niet over antwoorden op de topics."
         tracking:
           title: "Volgen"
-          description: "U volgt automatisch alle topics in deze categorieën. U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt, en het aantal nieuwe antwoorden wordt weergegeven."
+          description: "U volgt automatisch alle nieuwe topics in deze categorie. U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt, en het aantal nieuwe antwoorden wordt weergeven."
         regular:
           title: "Normaal"
           description: "U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt."
         muted:
           title: "Genegeerd"
-          description: "U ontvangt geen enkele melding over nieuwe topics in deze categorieën, en ze verschijnen niet in Nieuwste."
+          description: "U ontvangt geen enkele melding over nieuwe topics in deze categorie, en ze verschijnen niet in Nieuwste."
       search_priority:
         label: "Zoekprioriteit"
         options:
@@ -2812,6 +3002,7 @@ nl:
       list_filters:
         all: "alle topics"
         none: "geen subcategorieën"
+      colors_disabled: "U kunt geen kleuren selecteren omdat u een categoriestijl van geen hebt."
     flagging:
       title: "Bedankt voor het beleefd houden van onze gemeenschap!"
       action: "Bericht markeren"
@@ -2829,7 +3020,8 @@ nl:
       notify_action: "Bericht"
       official_warning: "Officiële waarschuwing"
       delete_spammer: "Spammer verwijderen"
-      delete_confirm_MF: "U gaat {POSTS, plural, one {<b>1</b> bericht} other {<b>#</b> berichten}} en {TOPICS, plural, one {<b>1</b> topic} other {<b>#</b> topics}} van deze gebruiker verwijderen, zijn/haar account verwijderen, nieuwe registraties vanaf het IP-adres <b>{ip_address}</b> blokkeren en het e-mailadres <b>{email}</b> op een permanente blokkeerlijst zetten. Weet u zeker dat deze gebruiker een spammer is?"
+      flag_for_review: "Voor beoordeling in wachtrij zetten"
+      delete_confirm_MF: "U staat op het punt {POSTS, plural, one {<b>#</b> bericht} other {<b>#</b> berichten}} en {TOPICS, plural, one {<b>#</b> topic} other {<b>#</b> topics}} van deze gebruiker te verwijderen, hun account te verwijderen, registraties vanaf hun IP-adres <b>{ip_address}</b> te blokkeren, en hun e-mailadres <b>{email}</b> toe te voegen aan een permanente blokkeerlijst. Weet u het zeker?"
       yes_delete_spammer: "Ja, spammer verwijderen"
       ip_address_missing: "(N.v.t.)"
       hidden_email_address: "(verborgen)"
@@ -2897,7 +3089,7 @@ nl:
         help: "Dit topic is een persoonlijk bericht"
     posts: "Berichten"
     posts_likes_MF: |
-      Dit topic heeft {count, plural, one {1 antwoord} other {# antwoorden}} {ratio, select,
+      Dit topic heeft {count, plural, one {# antwoord} other {# antwoorden}} {ratio, select,
       low {met een hoge verhouding likes per bericht}
       med {met een erg hoge verhouding likes per bericht}
       high {met een zeer hoge verhouding likes per bericht}
@@ -2921,7 +3113,7 @@ nl:
       one: "gebruiker"
       other: "gebruikers"
     category_title: "Categorie"
-    history: "Geschiedenis"
+    history: "Geschiedenis, laatste 100 herzieningen"
     changed_by: "door %{author}"
     raw_email:
       title: "Inkomende e-mail"
@@ -3009,6 +3201,7 @@ nl:
       close: "Sluiten (Esc)"
       content_load_error: '<a href="%url%">De inhoud</a> kon niet worden geladen.'
       image_load_error: '<a href="%url%">De afbeelding</a> kon niet worden geladen.'
+    cannot_render_video: Deze video kan niet worden weergegeven omdat uw browser de codec niet ondersteunt.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -3113,7 +3306,7 @@ nl:
         other: "%{count} toegekend"
       select_badge_for_title: Kies een badge om als uw titel te gebruiken
       none: "(geen)"
-      successfully_granted: "%{badge} toegekend aan %{username}"
+      successfully_granted: "%{badge} is succesvol toegekend aan %{username}"
       badge_grouping:
         getting_started:
           name: Aan de slag
@@ -3171,7 +3364,7 @@ nl:
       upload: "Tags uploaden"
       upload_description: "Een CSV-bestand uploaden om bulksgewijs tags te maken"
       upload_instructions: "Eén per regel, optioneel met een tag-groep in de notatie 'tag_name,tag_group'."
-      upload_successful: "Tags zijn geüpload"
+      upload_successful: "Tags succesvol geüpload"
       delete_unused_confirmation:
         one: "%{count} tag wordt verwijderd: %{tags}"
         other: "%{count} tags worden verwijderd: %{tags}"
@@ -3179,6 +3372,7 @@ nl:
         one: "%{tags} en nog %{count}"
         other: "%{tags} en nog %{count}"
       delete_no_unused_tags: "Er zijn geen ongebruikte tags."
+      tag_list_joiner: ", "
       delete_unused: "Ongebruikte tags verwijderen"
       delete_unused_description: "Alle tags verwijderen die niet aan topics of persoonlijke berichten zijn gekoppeld"
       cancel_delete_unused: "Annuleren"
@@ -3199,7 +3393,7 @@ nl:
           description: "U volgt automatisch alle topics met deze tag. Het aantal ongelezen en nieuwe berichten verschijnt naast het topic."
         regular:
           title: "Normaal"
-          description: "U ontvangt een melding wanneer iemand uw @naam noemt of een bericht van u beantwoordt."
+          description: "U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt."
         muted:
           title: "Genegeerd"
           description: "U ontvangt geen enkele melding over nieuwe topics met deze tag, en ze verschijnen niet op uw tabblad Ongelezen."
@@ -3209,7 +3403,7 @@ nl:
         new: "Nieuwe groep"
         tags_label: "Tags in deze groep:"
         parent_tag_label: "Bovenliggende tag:"
-        parent_tag_description: "Tags uit deze groep kunnen niet worden gebruikt, tenzij de bovenliggende tag actief is."
+        parent_tag_description: "Tags uit deze groep kunnen niet worden gebruikt, tenzij de bovenliggende tag aanwezig is."
         one_per_topic_label: "Beperken tot 1 tag per topic uit deze groep"
         new_name: "Nieuwe tag-groep"
         name_placeholder: "Naam van tag-groep"
@@ -3219,6 +3413,7 @@ nl:
         everyone_can_use: "Tags kunnen door iedereen worden gebruikt"
         usable_only_by_groups: "Tags zijn voor iedereen zichtbaar, maar alleen de volgende groepen kunnen ze gebruiken"
         visible_only_to_groups: "Tags zijn alleen zichtbaar voor de volgende groepen"
+        cannot_save: "Kan tag-groep niet opslaan. Zorg ervoor dat er ten minste één tag aanwezig is, de tag-group naam niet leeg is en een groep geselecteerd is voor tags toestemming."
       topics:
         none:
           unread: "U hebt geen ongelezen topics."
@@ -3231,10 +3426,11 @@ nl:
     invite:
       custom_message: "Maak uw uitnodiging iets persoonlijker door een <a href>eigen bericht</a> te schrijven."
       custom_message_placeholder: "Voer uw eigen bericht in"
-      approval_not_required: "Gebruiker wordt automatisch goedgekeurd zodra hij of zij deze uitnodiging accepteert."
+      approval_not_required: "De gebruiker wordt automatisch goedgekeurd zodra hij of zij deze uitnodiging accepteert."
       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."
+    forced_anonymous_login_required: "De website staat onder extreme belasting en kan op dit moment niet worden geladen, probeer het over een paar minuten opnieuw."
     footer_nav:
       back: "Vorige"
       forward: "Volgende"
@@ -3243,6 +3439,17 @@ nl:
     safe_mode:
       enabled: "Veilige modus is ingeschakeld; sluit dit browservenster om de veilige modus te verlaten"
     image_removed: "(afbeelding verwijderd)"
+    do_not_disturb:
+      title: "Niet storen voor..."
+      label: "Niet storen"
+      remaining: "%{remaining} resterend"
+      options:
+        half_hour: "30 minuten"
+        one_hour: "1 uur"
+        two_hours: "2 uur"
+        tomorrow: "Tot morgen"
+        custom: "Aangepast"
+      set_schedule: "Stel een meldingsschema in"
   admin_js:
     type_to_filter: "typ om te filteren..."
     admin:
@@ -3270,6 +3477,10 @@ nl:
         installed_version: "Geïnstalleerd"
         latest_version: "Nieuwste"
         problems_found: "Advies op basis van uw huidige website-instellingen"
+        new_features:
+          title: "\U0001F381 Nieuwe functies"
+          dismiss: "Negeren"
+          learn_more: "Meer info"
         last_checked: "Laatst gecontroleerd"
         refresh_problems: "Opnieuw laden"
         no_problems: "Er zijn geen problemen gevonden."
@@ -3358,10 +3569,6 @@ nl:
             available: "Groepsnaam is beschikbaar"
             not_available: "Groepsnaam is niet beschikbaar"
             blank: "Groepsnaam mag niet leeg zijn"
-        bulk_add:
-          title: "Bulk toevoegen aan groep"
-          complete_users_not_added: "Deze gebruikers zijn niet toegevoegd (controleer of ze een account hebben):"
-          paste: "Plak een lijst van gebruikersnamen of e-mailadressen, één per regel:"
         add_members:
           as_owner: "Gebruiker(s) als eigenaar(s) van deze groep instellen"
         manage:
@@ -3388,7 +3595,9 @@ 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_user_count: "%{count} gebruikers hebben de nieuwe e-maildomeinen en worden aan de groep toegevoegd."
+            automatic_membership_user_count:
+              one: "%{count} gebruiker heeft de nieuwe e-maildomeinen en zal aan de groep worden toegevoegd."
+              other: "%{count} gebruikers hebben de nieuwe e-maildomeinen en zullen aan de groep worden toegevoegd."
             primary_group: "Automatisch instellen als primaire groep"
         name_placeholder: "Groepsnaam, geen spaties, hetzelfde als gebruikersnaamregel"
         primary: "Primaire groep"
@@ -3400,7 +3609,11 @@ nl:
         group_members: "Groepsleden"
         delete: "Verwijderen"
         delete_confirm: "Deze groepen verwijderen?"
+        delete_with_messages_confirm:
+          one: "Als u deze groep verwijdert, wordt %{count} bericht verweesd, groepsleden hebben er geen toegang meer toe.<br><br>Weet u het zeker?"
+          other: "Als u deze groep verwijdert, worden %{count} berichten verweesd, groepsleden hebben er geen toegang meer toe.<br><br>Weet u het zeker?"
         delete_failed: "Kan groep niet verwijderen. Als dit een automatische groep is, kan deze niet worden verwijderd."
+        delete_automatic_group: Dit is een automatische groep en kan niet worden verwijderd.
         delete_owner_confirm: "Eigenaarsprivileges van '%{username}' verwijderen?"
         add: "Toevoegen"
         custom: "Aangepast"
@@ -3462,9 +3675,15 @@ nl:
               wordpress: Noodzakelijk om de WordPress wp-discourse-plug-in te laten werken.
             users:
               bookmarks: Bladwijzers van gebruiker weergeven. Geeft bladwijzerherinneringen terug bij gebruik van de ICS-indeling.
-              sync_sso: Een gebruiker synchroniseren via SSO.
+              sync_sso: Een gebruiker synchroniseren met DiscourseConnect.
               show: Informatie over een gebruiker verkrijgen.
               check_emails: E-mailadressen van gebruiker weergeven.
+              update: Gebruikersprofielgegevens bijwerken.
+              log_out: Alle sessies voor een gebruiker afmelden.
+              anonymize: Gebruikersaccounts anonimiseren.
+              delete: Gebruikersaccounts verwijderen.
+            email:
+              receive_emails: Deze scope met de e-mailontvanger combineren om inkomende e-mails te verwerken.
       web_hooks:
         title: "Webhooks"
         none: "Er zijn op dit moment geen webhooks."
@@ -3479,7 +3698,7 @@ nl:
         go_back: "Terug naar lijst"
         payload_url: "Payload-URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Zo te zien probeert u een webhook naar een lokale URL te laten wijzen. Een gebeurtenis die naar een lokaal adres wordt gestuurd, kan neveneffecten of onverwacht gedrag veroorzaken. Doorgaan?"
+        warn_local_payload_url: "Het lijkt erop dat u probeert de webhook in te stellen op een lokale URL. Gebeurtenissen die op een lokaal adres worden afgeleverd, kunnen bijwerkingen of onverwacht gedrag veroorzaken. Doorgaan?"
         secret_invalid: "Geheim mag geen lege tekens bevatten."
         secret_too_short: "Geheim dient uit minimaal 12 tekens te bestaan."
         secret_placeholder: "Een optionele tekenreeks, gebruikt voor het aanmaken van een ondertekening"
@@ -3507,7 +3726,7 @@ nl:
           details: "Wanneer een (nieuw) bericht wordt geplaatst, bewerkt, verwijderd of hersteld."
         user_event:
           name: "Gebruikersgebeurtenis"
-          details: "Wanneer een gebruiker zich aanmeldt, afmeldt, wordt aangemaakt, goedgekeurd of bijgewerkt."
+          details: "Wanneer een gebruiker zich aanmeldt, zich afmeldt, zijn e-mail bevestigt, wordt aangemaakt, goedgekeurd of bijgewerkt."
         group_event:
           name: "Groepsgebeurtenis"
           details: "Wanneer een groep wordt gemaakt, bijgewerkt of verwijderd."
@@ -3526,6 +3745,12 @@ nl:
         user_badge_event:
           name: "Badgetoekenningsgebeurtenis"
           details: "Wanneer een gebruiker een badge ontvangt."
+        group_user_event:
+          name: "Groep-gebruikersgebeurtenis"
+          details: "Wanneer een gebruiker wordt toegevoegd of verwijderd in een groep."
+        like_event:
+          name: "Likegebeurtenis"
+          details: "Wanneer een gebruiker een bericht leuk vindt."
         delivery_status:
           title: "Afleveringsstatus"
           inactive: "Inactief"
@@ -3593,7 +3818,7 @@ nl:
           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."
+          success: "'%{filename}' is succesvol 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..."
@@ -3677,7 +3902,7 @@ nl:
           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"
+          browse_themes: "Gemeenschapsthema's bekijken"
           customize_desc: "Aanpassen:"
           title: "Thema's"
           create: "Maken"
@@ -3704,6 +3929,7 @@ nl:
           is_default: "Thema is standaard ingeschakeld"
           user_selectable: "Thema kan door gebruikers worden geselecteerd"
           color_scheme_user_selectable: "Kleurenschema kan door gebruikers worden geselecteerd"
+          auto_update: "Automatisch bijwerken wanneer Discourse wordt bijgewerkt"
           color_scheme: "Kleurenpalet"
           default_light_scheme: "Licht (standaard)"
           color_scheme_select: "Kleuren die door thema worden gebruikt selecteren"
@@ -3713,7 +3939,9 @@ nl:
           convert: "Converteren"
           convert_component_alert: "Weet u zeker dat u dit onderdeel naar een thema wilt converteren? Het wordt als onderdeel van %{relatives} verwijderd."
           convert_component_tooltip: "Dit onderdeel naar een thema converteren"
+          convert_component_alert_generic: "Weet u zeker dat u dit onderdeel naar een thema wilt converteren?"
           convert_theme_alert: "Weet u zeker dat u dit thema naar een onderdeel wilt converteren? Het wordt als bovenliggend thema van %{relatives} verwijderd."
+          convert_theme_alert_generic: "Weet u zeker dat u dit thema naar een onderdeel wilt converteren?"
           convert_theme_tooltip: "Dit thema naar een onderdeel converteren"
           inactive_themes: "Inactieve thema's:"
           inactive_components: "Ongebruikte onderdelen:"
@@ -3747,17 +3975,20 @@ nl:
           included_components: "Opgenomen onderdelen"
           add_all: "Alle toevoegen"
           import_web_tip: "Repository die thema bevat"
+          direct_install_tip: "Weet u zeker dat u <strong>%{name}</strong> uit de onderstaande repository wilt installeren?"
           import_web_advanced: "Geavanceerd..."
           import_file_tip: ".tar.gz-, .zip- of .dcstyle.json-bestand dat thema bevat"
           is_private: "Thema bevindt zich in een privé-git-repository"
           remote_branch: "Branchnaam (optioneel)"
           public_key: "De volgende openbare sleutel toegang tot de repo verlenen:"
+          public_key_note: "Na het hierboven invoeren van een geldig privé repository-URL wordt een SSH-sleutel gegenereerd en hier weergegeven."
           install: "Installeren"
           installed: "Geïnstalleerd"
           install_popular: "Populair"
           install_upload: "Vanaf uw apparaat"
           install_git_repo: "Vanaf een git-repository"
           install_create: "Nieuwe maken"
+          duplicate_remote_theme: "Het themaonderdeel “%{name}” is al geïnstalleerd, weet u zeker dat u nog een kopie wilt installeren?"
           about_theme: "Over"
           license: "Licentie"
           version: "Versie:"
@@ -3777,6 +4008,7 @@ nl:
           check_for_updates: "Controleren op updates"
           updating: "Bijwerken..."
           up_to_date: "Thema is up-to-date, laatst gecontroleerd:"
+          has_overwritten_history: "De huidige themaversie bestaat niet meer, omdat de Git-geschiedenis door een afgedwongen push is overschreven."
           add: "Toevoegen"
           theme_settings: "Thema-instellingen"
           no_settings: "Dit thema heeft geen instellingen."
@@ -3786,6 +4018,7 @@ nl:
             one: "Thema loopt %{count} commit achter!"
             other: "Thema loopt %{count} commits achter!"
           compare_commits: "(Nieuwe commits bekijken)"
+          remote_theme_edits: "Als u dit thema wilt bewerken, moet u <a href='%{repoURL}' target='_blank'>een wijziging indienen in de repository</a>"
           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"
           scss:
@@ -3808,15 +4041,13 @@ nl:
             title: "Aangepaste kleurdefinities invoeren (alleen gevorderde gebruikers)"
             placeholder: |2-
 
-              Gebruik dit stylesheet om aangepaste kleuren aan de lijst van aangepaste CSS-eigenschappen toe te voegen.
+              Gebruik deze stylesheet om aangepaste kleuren aan de lijst van aangepaste CSS-eigenschappen toe te voegen.
 
               Voorbeeld:
 
-              :root {
-              --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};
-              }
+              %{example}
 
-              Voorvoegsels bij eigenschapnamen worden ten sterkste aanbevolen om conflicten met plug-ins en/of kern te vermijden.
+              Het toevoegen van voorvoegsels aan de eigenschapsnamen wordt sterk aanbevolen om conflicten met plug-ins en/of core te voorkomen.
           head_tag:
             text: "</head>"
             title: "HTML die voor de </head>-tag wordt ingevoegd"
@@ -3962,7 +4193,7 @@ nl:
             title: "Filter"
             user_placeholder: "gebruikersnaam"
             address_placeholder: "naam@example.com"
-            type_placeholder: "samenvatting, registratie"
+            type_placeholder: "samenvatting, registratie..."
             reply_key_placeholder: "antwoordsleutel"
       moderation_history:
         performed_by: "Uitgevoerd door"
@@ -4097,6 +4328,7 @@ nl:
             topic_unarchived: "topic gedearchiveerd"
             post_staff_note_create: "stafopmerking toevoegen"
             post_staff_note_destroy: "stafopmerking verwijderen"
+            delete_group: "groep 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."
@@ -4113,7 +4345,7 @@ nl:
           description: 'IP-adressen die in de gaten worden gehouden. Gebruik ''Toestaan'' om IP-adressen op de acceptatielijst te zetten.'
           delete_confirm: "Weet u zeker dat u de regel voor %{ip_address} wilt verwijderen?"
           roll_up_confirm: "Weet u zeker dat u regelmatig gecontroleerde IP-adressen in subnetten wilt samenvoegen?"
-          rolled_up_some_subnets: "Verbannen IP-adressen zijn zojuist tot deze subnetten samengevoegd: %{subnets}."
+          rolled_up_some_subnets: "Verbannen IP-adressen zijn zojuist succesvol tot deze subnetten samengevoegd: %{subnets}."
           rolled_up_no_subnet: "Er was niets om samen te voegen."
           actions:
             block: "Blokkeren"
@@ -4144,31 +4376,32 @@ nl:
         title: "In de gaten gehouden woorden"
         search: "zoeken"
         clear_filter: "Wissen"
-        show_words: "woorden tonen"
-        one_word_per_line: "Eén woord per regel"
+        show_words:
+          one: "%{count} woord tonen"
+          other: "%{count} woorden tonen"
         download: Downloaden
         clear_all: Alles wissen
-        clear_all_confirm_block: "Weet u zeker dat u alle in de gaten gehouden woorden voor de actie Blokkeren wilt wissen?"
-        clear_all_confirm_censor: "Weet u zeker dat u alle in de gaten gehouden woorden voor de actie Censureren wilt wissen?"
-        clear_all_confirm_flag: "Weet u zeker dat u alle in de gaten gehouden woorden voor de actie Markeren wilt wissen?"
-        clear_all_confirm_require_approval: "Weet u zeker dat u alle in de gaten gehouden woorden voor de actie Heeft goedkeuring nodig wilt wissen?"
-        word_count:
-          one: "%{count} woord"
-          other: "%{count} woorden"
+        clear_all_confirm: "Weet u zeker dat u alle in de gaten gehouden woorden wilt verwijderen voor de %{action} actie?"
         actions:
           block: "Blokkeren"
           censor: "Censureren"
           require_approval: "Heeft goedkeuring nodig"
           flag: "Markeren"
+          replace: "Vervangen"
+          tag: "Taggen"
         action_descriptions:
           block: "Het plaatsen van berichten die deze woorden bevatten tegengaan. Gebruikers zien een foutbericht wanneer ze hun bericht proberen te verzenden."
           censor: "Berichten met deze woorden toestaan, maar deze vervangen door tekens die de gecensureerde woorden verbergen."
           require_approval: "Berichten die deze woorden bevatten, vereisen goedkeuring door stafleden voordat ze kunnen worden bekeken."
           flag: "Berichten met deze woorden toestaan, maar deze markeren als ongepast zodat moderators ze kunnen beoordelen."
+          replace: "Woorden in berichten vervangen door andere woorden of links"
+          tag: "Automatisch topics taggen op basis van het eerste bericht"
         form:
-          label: "Nieuw woord:"
-          placeholder: "volledig woord of * als jokerteken"
           placeholder_regexp: "reguliere expressie"
+          replacement_label: "Vervanging"
+          replacement_placeholder: "voorbeeld of https://example.com"
+          tag_label: "Tag"
+          tag_placeholder: "tag1,tag2,tag3"
           add: "Toevoegen"
           success: "Succes"
           exists: "Bestaat al"
@@ -4221,6 +4454,9 @@ nl:
         check_email:
           title: "E-mailadres van deze gebruiker tonen"
           text: "Tonen"
+        check_sso:
+          title: "SSO-payload 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}"
@@ -4234,7 +4470,7 @@ nl:
           consuming_staff_time: "Heeft onevenredig veel tijd van stafleden verbruikt"
           combatative: "Te strijdlustig"
           in_wrong_place: "Op de verkeerde plek"
-          no_constructive_purpose: "Geen constructief doel voor zijn/haar acties, anders dan het creëren van onenigheid binnen de gemeenschap"
+          no_constructive_purpose: "Geen constructief doel voor hun acties, anders dan het creëren van onenigheid binnen de gemeenschap"
           custom: "Aangepast..."
         suspend_message: "E-mailbericht"
         suspend_message_placeholder: "Optioneel kunt u meer informatie over de schorsing geven, die naar de gebruiker wordt gemaild."
@@ -4261,7 +4497,7 @@ nl:
         clear_penalty_history:
           title: "Minpuntengeschiedenis wissen"
           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?"
+        delete_all_posts_confirm_MF: "U staat op het punt {POSTS, plural, one {# bericht} other {# berichten}} en {TOPICS, plural, one {# topic} other {# topics}} te verwijderen. Weet u het zeker?"
         silence: "Dempen"
         unsilence: "Dempen opheffen"
         silenced: "Gedempt?"
@@ -4310,6 +4546,9 @@ nl:
         anonymize_yes: "Ja, deze account anonimiseren"
         anonymize_failed: "Er is een probleem opgetreden bij het anonimiseren van de account."
         delete: "Gebruiker verwijderen"
+        delete_posts:
+          progress:
+            title: "Voortgang van het verwijderen van berichten"
         merge:
           button: "Samenvoegen"
           prompt:
@@ -4321,6 +4560,8 @@ nl:
             target_username_placeholder: "Gebruikersnaam van nieuwe eigenaar"
             transfer_and_delete: "Overdragen & @%{username} verwijderen"
             cancel: "Annuleren"
+          progress:
+            title: "Voortgang met samenvoegen"
           confirmation:
             title: "Overdragen & @%{username} verwijderen"
             description: |
@@ -4413,8 +4654,8 @@ nl:
           on_grace_period: "Op dit moment in promotiewachtperiode, zal niet worden gedegradeerd."
           locked_will_not_be_promoted: "Vertrouwensniveau vergrendeld. Zal nooit worden gepromoveerd."
           locked_will_not_be_demoted: "Vertrouwensniveau vergrendeld. Zal nooit worden gedegradeerd."
-        sso:
-          title: "Single Sign On"
+        discourse_connect:
+          title: "DiscourseConnect Single Sign On"
           external_id: "Externe ID"
           external_username: "Gebruikersnaam"
           external_name: "Naam"
@@ -4422,7 +4663,7 @@ nl:
           external_avatar_url: "URL van profielafbeelding"
           last_payload: "Laatste payload"
           delete_sso_record: "SSO-record verwijderen"
-          confirm_delete: "Weet u zeker dat u deze record voor eenmalige aanmelding (SSO) wilt verwijderen?"
+          confirm_delete: "Weet u zeker dat u dit DiscourseConnect-record wilt verwijderen?"
       user_fields:
         title: "Gebruikersvelden"
         help: "Voeg velden toe die uw gebruikers kunnen invullen."
@@ -4453,6 +4694,10 @@ nl:
           title: "Tonen op gebruikerskaart?"
           enabled: "getoond op gebruikerskaart"
           disabled: "niet getoond op gebruikerskaart"
+        searchable:
+          title: "Doorzoekbaar?"
+          enabled: "doorzoekbaar"
+          disabled: "niet doorzoekbaar"
         field_types:
           text: "Tekstveld"
           confirm: "Bevestiging"
@@ -4467,12 +4712,19 @@ nl:
         go_back: "Terug naar Zoeken"
         recommended: "We raden aan de volgende tekst naar wens aan te passen:"
         show_overriden: "Alleen aangepaste tonen"
+        locale: "Taal:"
+        fallback_locale_warning: "U bent een taal gebaseerd op %{fallback} aan het bewerken. Gebruikers die %{fallback} als taal van hun interface kiezen zien uw wijzigingen niet."
         more_than_50_results: "Er zijn meer dan 50 resultaten. Verfijn uw zoekopdracht."
       settings:
         show_overriden: "Alleen aangepaste tonen"
+        history: "Wijzigingsoverzicht bekijken"
         reset: "terugzetten"
         none: "geen"
       site_settings:
+        emoji_list:
+          invalid_input: "Emoji-lijst mag alleen geldige emoji-namen bevatten, bijv.: knuffels"
+          add_emoji_button:
+            label: "Emoji toevoegen"
         title: "Instellingen"
         no_results: "Geen resultaten gevonden."
         more_than_30_results: "Er zijn meer dan 30 resultaten. Verfijn uw zoekopdracht of selecteer een categorie."
@@ -4510,7 +4762,7 @@ nl:
           user_api: "Gebruikers-API"
           uncategorized: "Overige"
           backups: "Back-ups"
-          login: "Inloggen"
+          login: "Aanmelden"
           plugins: "Plug-ins"
           user_preferences: "Gebruikersvoorkeuren"
           tags: "Tags"
@@ -4525,6 +4777,9 @@ nl:
           modal_no: "Nee, wijziging alleen vanaf nu toepassen"
         simple_list:
           add_item: "Item toevoegen..."
+        json_schema:
+          edit: Editor opzetten.
+          modal_title: "%{name} bewerken"
       badges:
         title: Badges
         new_badge: Nieuwe badge
@@ -4561,8 +4816,12 @@ nl:
         enabled: Badge inschakelen
         icon: Pictogram
         image: Afbeelding
+        graphic: Grafisch
         icon_help: "Voer een Font Awesome-pictogramnaam in (gebruik het voorvoegsel 'far-' voor normale pictogrammen en 'fab-' voor merkpictogrammen)"
-        image_help: "Voer de URL van de afbeelding in (negeert pictogramveld als beide zijn ingesteld)"
+        image_help: "Het uploaden van een afbeelding overschrijft het pictogramveld als beide zijn ingesteld."
+        select_an_icon: "Een pictogram selecteren"
+        upload_an_image: "Een afbeelding uploaden"
+        read_only_setting_help: "Tekst aanpassen"
         query: Badgequery (SQL)
         target_posts: Geassocieerde berichten opvragen
         auto_revoke: Intrekkingsquery dagelijks uitvoeren
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 0979416c04..8cb24d4417 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -27,18 +27,18 @@ pl_PL:
         thousands: "%{number}k"
         millions: "%{number}M"
     dates:
-      time: "H:mm"
+      time: "HH:mm"
       time_with_zone: "HH:mm (z)"
-      time_short_day: "ddd, GG: mm"
+      time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, GG: 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 H:mm"
+      full_no_year_no_time: "D MMMM"
+      long_with_year: "D MMM YYYY HH:mm"
       long_with_year_no_time: "D MMM YYYY"
-      full_with_year_no_time: "MMMM Do, YYYY"
+      full_with_year_no_time: "D MMMM YYYY"
       long_date_with_year: "D MMM 'YY LT"
-      long_date_without_year: "D MMM, LT"
+      long_date_without_year: "D MMM LT"
       long_date_with_year_without_time: "D MMM 'YY"
       long_date_without_year_with_linebreak: "D MMM <br/>LT"
       long_date_with_year_with_linebreak: "D MMM 'YY <br/>LT"
@@ -132,12 +132,12 @@ pl_PL:
           other: "%{count} dni temu"
         x_months:
           one: "%{count} miesiąc temu"
-          few: "%{count} miesięcy temu"
+          few: "%{count} miesiące temu"
           many: "%{count} miesięcy temu"
           other: "%{count} miesięcy temu"
         x_years:
           one: "%{count} rok temu"
-          few: "%{count} lat temu"
+          few: "%{count} lata temu"
           many: "%{count} lat temu"
           other: "%{count} lat temu"
       later:
@@ -161,7 +161,7 @@ pl_PL:
       placeholder: data
     share:
       topic_html: 'Temat: <span class="topic-title">%{topicTitle}</span>'
-      post: "wpis #%{postNumber}"
+      post: "post #%{postNumber}"
       close: "zamknij"
       twitter: "Udostępnij na Twitterze"
       facebook: "Udostępnij na Facebooku"
@@ -169,7 +169,7 @@ pl_PL:
       url: "Skopiuj i udostępnij adres URL"
     action_codes:
       public_topic: "Upublicznij ten temat %{when}"
-      private_topic: "przekształcił ten temat w wiadomość prywatną %{when}"
+      private_topic: "przekształcił(a) ten temat w wiadomość prywatną %{when}"
       split_topic: "podziel ten temat %{when}"
       invited_user: "%{who} został zaproszony %{when}"
       invited_group: "%{who} został zaproszony %{when}"
@@ -201,7 +201,10 @@ pl_PL:
       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."
+    emails_are_disabled: "Wszystkie wychodzące wiadomości e-mail zostały globalnie wyłączone przez administratora. Żadne powiadomienia e-mail nie będą wysyłane."
+    software_update_prompt:
+      message: "Zaktualizowaliśmy tę witrynę, <span>prosimy ją odświeżyć</span>, aby uniknąć nieoczekiwanego zachowania."
+      dismiss: "Odrzuć"
     bootstrap_mode_enabled:
       one: "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 %{count} osoba dołączy."
       few: "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 %{count} osoby dołączy."
@@ -213,26 +216,28 @@ pl_PL:
       broken_theme_alert: "Twoja strona może nie działać, bo motyw / komponent %{theme} zawiera błędy. Wyłącz go w %{path}."
     s3:
       regions:
-        ap_northeast_1: "Asia Pacific (Tokyo)"
-        ap_northeast_2: "Asia Pacific (Seoul)"
+        ap_northeast_1: "Azja i Pacyfik (Tokio)"
+        ap_northeast_2: "Azja i Pacyfik (Seul)"
+        ap_east_1: "Asia Pacific (Hong Kong)"
         ap_south_1: "Azja-Pacyfik (Mumbai)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ca_central_1: "Kanada (centralna)"
-        cn_north_1: "Chiny (Beijing)"
+        ap_southeast_1: "Azja i Pacyfik (Singapur)"
+        ap_southeast_2: "Azja i Pacyfik (Sydney)"
+        ca_central_1: "Kanada (środkowa)"
+        cn_north_1: "Chiny (Pekin)"
         cn_northwest_1: "Chiny (Ningxia)"
-        eu_central_1: "EU (Frankfurt)"
-        eu_north_1: "Europa (Sztokholm)"
-        eu_west_1: "EU (Irlandia)"
-        eu_west_2: "Europa (Londyn)"
-        eu_west_3: "EU (Paris)"
+        eu_central_1: "UE (Frankfurt)"
+        eu_north_1: "UE (Sztokholm)"
+        eu_west_1: "UE (Irlandia)"
+        eu_west_2: "UE (Londyn)"
+        eu_west_3: "EU (Paryż)"
         sa_east_1: "Ameryka Południowa (São Paulo)"
-        us_east_1: "US East (N. Virginia)"
+        us_east_1: "Wschodnie USA (Północna Wirginia)"
         us_east_2: "Wschodnie USA (Ohio)"
         us_gov_east_1: "AWS GovCloud (US-East)"
         us_gov_west_1: "AWS GovCloud (US-West)"
-        us_west_1: "US West (N. California)"
+        us_west_1: "Zachodnie USA (Północna Kalifornia)"
         us_west_2: "US West (Oregon)"
+    clear_input: "Wyczyść wprowadzone dane"
     edit: "edytuj tytuł i kategorię tego tematu"
     expand: "Rozszerz"
     not_implemented: "Bardzo nam przykro, ale ta funkcja nie została jeszcze zaimplementowana."
@@ -256,26 +261,31 @@ pl_PL:
       many: "linków"
       other: "odnośników"
     faq: "FAQ"
-    guidelines: "Przewodnik"
+    guidelines: "Wytyczne"
     privacy_policy: "Polityka prywatności"
     privacy: "Prywatność"
     tos: "Warunki użytkowania serwisu"
     rules: "Zasady"
     conduct: "Regulamin"
-    mobile_view: "Wersja mobilna"
+    mobile_view: "Widok mobilny"
     desktop_view: "Wersja komputerowa"
     you: "Ty"
     or: "lub"
     now: "teraz"
     read_more: "więcej"
     more: "Więcej"
+    x_more:
+      one: "%{count} Więcej"
+      few: "%{count} Więcej"
+      many: "%{count} Więcej"
+      other: "%{count} Więcej"
     less: "Mniej"
     never: "nigdy"
     every_30_minutes: "co 30 minut"
     every_hour: "co godzinę"
     daily: "dziennie"
     weekly: "tygodniowo"
-    every_month: "każdego miesiąca"
+    every_month: "co miesiąc"
     every_six_months: "co 6 miesięcy"
     max_of_count: "max z %{count}"
     alternation: "lub"
@@ -295,15 +305,16 @@ pl_PL:
       title: "O %{title}"
       stats: "Statystyki strony"
       our_admins: "Administratorzy"
-      our_moderators: "Moderatoratorzy"
-      moderators: "Moderatoratorzy"
+      our_moderators: "Moderatorzy"
+      moderators: "Moderatorzy"
       stat:
         all_time: "Ogółem"
-        last_7_days: "Ostatnie 7"
-        last_30_days: "Ostatnie 30"
+        last_day: "Ostatnie 24 godziny"
+        last_7_days: "Ostatnie 7 dni"
+        last_30_days: "Ostatnie 30 dni"
       like_count: "Polubienia"
       topic_count: "Tematy"
-      post_count: "Wpisy"
+      post_count: "Posty"
       user_count: "Użytkownicy"
       active_user_count: "Aktywni użytkownicy"
       contact: "Kontakt"
@@ -312,42 +323,30 @@ pl_PL:
       title: "Zakładka"
       clear_bookmarks: "Wyczyść zakładki"
       help:
-        bookmark: "Kliknij, aby dodać pierwszy wpis tematu do zakładek"
+        bookmark: "Kliknij, aby dodać pierwszy post tematu do zakładek"
         unbookmark: "Kliknij, aby usunąć wszystkie zakładki z tego tematu"
         unbookmark_with_reminder: "Kliknij, aby usunąć wszystkie zakładki i przypomnienia w tym temacie. Masz przypomnienie ustawione na %{reminder_at} dla tego tematu."
     bookmarks:
-      created: "Wpis już dodano do zakładek%{name}"
+      created: "Dodano post do zakładek. %{name}"
       not_bookmarked: "dodaj do zakładek"
-      created_with_reminder: "Dodałeś ten wpis do zakładek z przypomnieniem %{date}%{name}"
+      created_with_reminder: "Dodano post do zakładek z przypomnieniem %{date}. %{name}"
       remove: "Usuń zakładkę"
       delete: "Usuń zakładkę"
       confirm_delete: "Czy na pewno chcesz usunąć tę zakładkę? Przypomnienie również zostanie usunięte."
       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> .'
+      no_timezone: 'Nie ustawiłeś/łaś jeszcze strefy czasowej. Nie będziesz mógł/mogła 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."
-      no_user_bookmarks: "Nie masz żadnych wpisów dodanych do zakładek. Zakładki pozwalają na szybkie odwoływanie się do konkretnych wpisów."
+      no_user_bookmarks: "Nie masz żadnych postów dodanych do zakładek. Zakładki pozwalają na szybkie odwoływanie się do konkretnych postów."
       auto_delete_preference:
         label: "Usuń automatycznie"
         never: "Nigdy"
         when_reminder_sent: "Po wysłaniu przypomnienia"
-        on_owner_reply: "Po odpowiedzi na ten temat"
+        on_owner_reply: "Gdy odpowiem w tym temacie"
       search_placeholder: "Wyszukiwanie zakładek według nazwy, tytułu tematu lub treści postu"
       search: "Wyszukaj"
       reminders:
-        later_today: "Później dzisiaj"
-        next_business_day: "Następny dzień roboczy"
-        tomorrow: "Jutro"
-        next_week: "Następny tydzień"
-        post_local_date: "Data w wiadomości"
-        later_this_week: "Później w tym tygodniu"
-        start_of_next_business_week: "Poniedziałek"
-        start_of_next_business_week_alt: "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"
         today_with_time: "dzisiaj o %{time}"
         tomorrow_with_time: "jutro o %{time}"
         at_time: "o %{date_time}"
@@ -358,13 +357,13 @@ pl_PL:
       resume: "Kontynuuj"
       remove: "Usuń"
       remove_confirmation: "Czy na pewno chcesz usunąć ten szkic?"
-      new_topic: "Nowy szkic tematu "
+      new_topic: "Nowy szkic tematu"
       new_private_message: "Nowy szkic wiadomości prywatnej"
       topic_reply: "Szkic odpowiedzi"
       abandon:
-        confirm: "Otworzyłeś już szkic w tym temacie. Czy jesteś pewny, że chcesz go porzucić?"
-        yes_value: "Tak, porzuć"
-        no_value: "Nie, zatrzymaj"
+        confirm: "Masz projekt w toku dla tego tematu. Co chcesz z nim zrobić?"
+        yes_value: "Odrzuć"
+        no_value: "Wznów edycję"
     topic_count_latest:
       one: "Zobacz %{count} nowy albo zaktualizowany temat"
       few: "Zobacz %{count} nowe albo zaktualizowane tematy"
@@ -386,11 +385,12 @@ pl_PL:
     save: "Zapisz zmiany"
     saving: "Zapisuję…"
     saved: "Zapisano!"
-    upload: "Dodaj"
-    uploading: "Wysyłam…"
-    uploading_filename: "Wysyłanie: %{filename}"
+    upload: "Prześlij"
+    uploading: "Przesyłanie..."
+    uploading_filename: "Przesyłanie: %{filename}..."
+    processing_filename: "Przetwarzanie: %{filename}..."
     clipboard: "schowek"
-    uploaded: "Wgrano!"
+    uploaded: "Przesłano!"
     pasting: "Wklejanie..."
     enable: "Włącz"
     disable: "Wyłącz"
@@ -409,12 +409,12 @@ pl_PL:
       none_found: "Nie znaleziono tematów."
       title:
         search: "Wyszukaj temat"
-        placeholder: "wpisz tytuł tematu, adres URL lub identyfikator tutaj"
+        placeholder: "wpisz tutaj tytuł tematu, adres URL lub id"
     choose_message:
       none_found: "Nie znaleziono wiadomości."
       title:
         search: "Wyszukaj wiadomość"
-        placeholder: "wpisz tutaj tytuł wiadomości, adres URL lub identyfikator"
+        placeholder: "wpisz tutaj tytuł wiadomości, adres URL lub id"
     review:
       order_by: "Segreguj według:"
       in_reply_to: "w odpowiedzi na"
@@ -425,7 +425,7 @@ pl_PL:
         subtotal: "Suma częściowa"
         total: "Łącznie"
         min_score_visibility: "Minimalny wynik dla widoczności"
-        score_to_hide: "Wynik do ukrycia wpisu"
+        score_to_hide: "Wynik by ukryć post"
         take_action_bonus:
           name: "Podjęto działanie"
           title: "Gdy członek personelu zdecyduje się na działanie, flaga otrzymuje premię."
@@ -440,8 +440,8 @@ pl_PL:
           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ć."
+        required: "Musisz przejąć tę pozycję, zanim będziesz mógł/mogła je przejrzeć."
+        claimed_by_you: "Przejąłeś/łaś tę pozycję i możesz ją teraz przejrzeć."
         claimed_by_other: "Ten przedmiot może być sprawdzony tylko przez <b>%{username}</b> ."
       claim:
         title: "zgłoś ten temat"
@@ -467,8 +467,9 @@ pl_PL:
         other: "W tym temacie jest <b>%{count}</b> wpisów oczekujących na zatwierdzenie"
       title: "Sprawdź"
       topic: "Temat:"
-      filtered_topic: "Przefiltrowałeś do przeglądalnej zawartości w jednym temacie."
+      filtered_topic: "Przefiltrowałeś/łaś do przeglądalnej zawartości w jednym temacie."
       filtered_user: "Użytkownik"
+      filtered_reviewed_by: "Sprawdzony przez"
       show_all_topics: "pokaż wszystkie tematy"
       deleted_post: "(wpis usunięty)"
       deleted_user: "(użytkownik usunięty)"
@@ -479,12 +480,13 @@ pl_PL:
         email: "Email"
         name: "Imię"
         fields: "Pola"
+        reject_reason: "Powód"
       user_percentage:
         summary:
-          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} flaga ogółem)"
-          few: "%{agreed}, %{disagreed}, %{ignored} (%{count} flagi ogółem)"
-          many: "%{agreed}, %{disagreed}, %{ignored} (%{count} flag ogółem)"
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} flag ogółem)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (z ostatniej flagi)"
+          few: "%{agreed}, %{disagreed}, %{ignored} (z ostatnich %{count} flag)"
+          many: "%{agreed}, %{disagreed}, %{ignored} (z ostatnich %{count} flag)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (z ostatnich %{count} flag)"
         agreed:
           one: "%{count}% zgadza się"
           few: "%{count}% zgadza się"
@@ -537,13 +539,14 @@ pl_PL:
           created_at_asc: "Utworzono (odwrotnie)"
         priority:
           title: "Minimalny priorytet"
-          low: "(dowolny)"
+          any: "(dowolny)"
+          low: "Niski"
           medium: "Średni"
           high: "Wysoki"
       conversation:
         view_full: "zobacz całą rozmowę"
       scores:
-        about: "Wynik jest obliczany na podstawie poziomu zaufania raportującego, akceptacji poprzednich flag i priorytetu raportowanego wpisu."
+        about: "Wynik jest obliczany na podstawie poziomu zaufania raportującego, akceptacji poprzednich flag i priorytetu raportowanego postu."
         score: "Wynik"
         date: "Data"
         type: "Typ"
@@ -575,16 +578,62 @@ pl_PL:
           title: "Wpis w kolejce"
         reviewable_user:
           title: "Użytkownik"
+        reviewable_post:
+          title: "Post"
       approval:
-        title: "Wpis wymaga zatwierdzenia"
+        title: "Post wymaga zatwierdzenia"
         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> oczekujący wpis."
-          few: "Masz <strong>%{count}</strong> oczekujące wpisy."
-          many: "Masz <strong>%{count}</strong> oczekujących wpisów."
-          other: "Masz <strong>%{count}</strong> oczekujących wpisów."
+          one: "Masz <strong>%{count}</strong> oczekujący post."
+          few: "Masz <strong>%{count}</strong> oczekujące posty."
+          many: "Masz <strong>%{count}</strong> oczekujących postów."
+          other: "Masz <strong>%{count}</strong> oczekujących postów."
         ok: "OK"
       example_username: "użytkownik"
+      reject_reason:
+        title: "Dlaczego odrzucasz tego użytkownika?"
+        send_email: "Wyślij wiadomość e-mail z powodem odrzucenia"
+    relative_time_picker:
+      minutes:
+        one: "minuta"
+        few: "minuty"
+        many: "minut"
+        other: "minut"
+      hours:
+        one: "godzina"
+        few: "godziny"
+        many: "godzin"
+        other: "godzin"
+      days:
+        one: "dzień"
+        few: "dni"
+        many: "dni"
+        other: "dni"
+      months:
+        one: "miesiąc"
+        few: "miesiące"
+        many: "miesięcy"
+        other: "miesięcy"
+      years:
+        one: "rok"
+        few: "lata"
+        many: "lat"
+        other: "lat"
+      relative: "Względny"
+    time_shortcut:
+      later_today: "Później dzisiaj"
+      next_business_day: "Następny dzień roboczy"
+      tomorrow: "Jutro"
+      next_week: "Następny tydzień"
+      post_local_date: "Data w poście"
+      later_this_week: "Później w tym tygodniu"
+      start_of_next_business_week: "Poniedziałek"
+      start_of_next_business_week_alt: "Następny poniedziałek"
+      next_month: "Następny miesiąc"
+      custom: "Niestandardowa data i godzina"
+      relative: "Względny czas"
+      none: "Żadne nie są potrzebne"
+      last_custom: "Ostatnia niestandardowa data i godzina"
     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>"
@@ -593,7 +642,7 @@ pl_PL:
       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>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> wspomniał(a) 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>"
@@ -647,7 +696,7 @@ pl_PL:
         deny: "Odrzuć"
         denied: "odrzucony"
         undone: "prośba cofnięta"
-        handle: "obsłuż prośby o członkostwo "
+        handle: "obsłuż prośby o członkostwo"
       manage:
         title: "Zarządzaj"
         name: "Nazwa"
@@ -673,6 +722,10 @@ pl_PL:
             imap_ssl: "Użyj SSL dla IMAP"
             username: "Nazwa użytkownika"
             password: "Hasło"
+          settings:
+            title: "Ustawienia"
+            allow_unknown_sender_topic_replies: "Zezwalaj na odpowiedzi od nieznanego nadawcy w temacie."
+            allow_unknown_sender_topic_replies_hint: "Zezwalaj nieznanym nadawcom na odpowiadanie w wątku grupowym. Jeśli to ustawienie nie jest włączone, odpowiedzi z adresów e-mail użytkowników spoza grupy lub zaproszonych do tematu utworzą nowy temat."
           mailboxes:
             synchronized: "Zsynchronizowana skrzynka pocztowa"
             none_found: "Na tym koncie e-mail nie znaleziono żadnych skrzynek pocztowych."
@@ -684,8 +737,8 @@ pl_PL:
           title: Kategorie
           long_title: "Domyślne powiadomienia kategorii"
           description: "Po dodaniu użytkowników do tej grupy ustawienia powiadomień kategorii zostaną ustawione na wartości domyślne. Potem mogą je zmienić."
-          watched_categories_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach. Będziesz otrzymywać powiadomienie o każdym nowym wpisie i temacie, a liczba nowych wpisów będzie wyświetlana obok tytułów na liście tematów."
-          tracked_categories_instructions: "Będziesz automatycznie śledzić wszystkie tematy w tych kategoriach. Licznik nowych wpisów pojawi się obok tytułu na liście tematów."
+          watched_categories_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach. Będziesz otrzymywać powiadomienie o każdym nowym poście i temacie, a liczba nowych postów będzie wyświetlana obok tytułów na liście tematów."
+          tracked_categories_instructions: "Będziesz automatycznie śledzić wszystkie tematy w tych kategoriach. Licznik nowych postów pojawi się obok tytułu na liście tematów."
           watching_first_post_categories_instructions: "Użytkownicy zostaną powiadomieni o pierwszym postie w każdym nowym temacie w tych kategoriach."
           regular_categories_instructions: "Jeśli te kategorie są wyciszone, nie zostaną wyciszone dla członków grupy. Użytkownicy zostaną powiadomieni, jeśli zostaną wspomniani lub ktoś na nie odpowie."
           muted_categories_instructions: "Użytkownicy nie będą powiadamiani o nowych tematach w tych kategoriach i nie będą pojawiać się na stronach kategorii ani najnowszych tematów."
@@ -695,7 +748,7 @@ pl_PL:
           description: "Po dodaniu użytkowników do tej grupy ustawienia powiadomień tagów zostaną ustawione na wartości domyślne. Potem mogą je zmienić."
           watched_tags_instructions: "Automatycznie obserwuj wszystkie tematy z tymi tagami. Członkowie grupy zostaną powiadomieni o wszystkich nowych postach i tematach, a liczba nowych postów będzie również wyświetlana obok tematu."
           tracked_tags_instructions: "Automatycznie śledź wszystkie tematy z tymi tagami. Obok tematu pojawi się liczba nowych postów."
-          watching_first_post_tags_instructions: "Zostaniesz powiadomiony o pierwszym wpisie w każdym nowym temacie oznaczonym tymi tagami."
+          watching_first_post_tags_instructions: "Zostaniesz powiadomiony o pierwszym poście w każdym nowym temacie oznaczonym tymi tagami."
           regular_tags_instructions: "Jeśli te tagi są wyciszone, nie zostaną wyciszone dla członków grupy. Użytkownicy zostaną powiadomieni, jeśli zostaną wspomniani lub ktoś na nie odpowie."
           muted_tags_instructions: "Użytkownicy nie będą powiadamiani o nowych tematach z tymi tagami i nie pojawią się one w najnowszych."
         logs:
@@ -715,7 +768,7 @@ pl_PL:
       public_admission: "Zezwól wszystkim użytkownikom na dołączanie do tej grupy (widoczność grupy musi być ustawiona na publiczną)"
       public_exit: "Zezwól wszystkim użytkownikom na opuszczanie tej grupy"
       empty:
-        posts: "Członkowie tej grupy nie opublikowali żadnych wpisów."
+        posts: "Członkowie tej grupy nie napisali żadnych postów."
         members: "Nie ma użytkowników w tej grupie"
         requests: "Są prośby o dołączenie do tej grupy."
         mentions: "Nie ma wspomnień tej grupy"
@@ -776,10 +829,25 @@ pl_PL:
         make_owner_description: "Uczyń <b>%{username}</b> właścicielem tej grupy"
         remove_owner: "Usuń z funkcji właściciela"
         remove_owner_description: "Usuń <b>%{username}</b> z funkcji właściciela tej grupy"
+        make_primary: "Ustaw jako podstawowe"
+        make_primary_description: "Ustaw tę grupę jako podstawową dla <b>%{username}</b>"
+        remove_primary: "Usuń jako podstawowy"
+        remove_primary_description: "Usuń tę grupę jako grupę podstawową dla <b>%{username}</b>"
+        remove_members: "Usuń członków"
+        remove_members_description: "Usuń wybranych użytkowników z tej grupy"
+        make_owners: "Uczyń właścicielami"
+        make_owners_description: "Uczyń wybranych użytkowników właścicielami tej grupy"
+        remove_owners: "Usuń właścicieli"
+        remove_owners_description: "Usuń wybranych użytkowników jako właścicieli tej grupy"
+        make_all_primary: "Uczyń wszystkie jako podstawowe"
+        make_all_primary_description: "Ustaw tę grupę jako podstawową dla wszystkich wybranych użytkowników"
+        remove_all_primary: "Usuń jako podstawowy"
+        remove_all_primary_description: "Usuń tę grupę jako podstawową"
         owner: "Właściciel"
+        primary: "Podstawowy"
         forbidden: "Nie możesz oglądać profili użytkowników."
       topics: "Tematy"
-      posts: "Wpisów"
+      posts: "Postów"
       mentions: "Wzmianki"
       messages: "Wiadomości"
       notification_level: "Domyślny poziom powiadomień dla wiadomości grupy."
@@ -795,9 +863,9 @@ pl_PL:
       notifications:
         watching:
           title: "Obserwowanie"
-          description: "Dostaniesz powiadomienie o każdym nowym wpisie w każdej dyskusji, zobaczysz również ilość odpowiedzi."
+          description: "Dostaniesz powiadomienie o każdym nowym poście w każdej dyskusji, zobaczysz również ilość odpowiedzi."
         watching_first_post:
-          title: "Oglądasz pierwszy wpis"
+          title: "Obserwowanie pierwszego postu"
           description: "Zostaniesz poinformowany o nowych wiadomościach w tej grupie, ale nie odpowiedziach do wiadomości."
         tracking:
           title: "Śledzenie"
@@ -820,7 +888,7 @@ pl_PL:
         icon: "Wybierz ikonę"
         image: "Prześlij obraz"
     user_action_groups:
-      "1": "Polobienia"
+      "1": "Polubienia"
       "2": "Otrzymane polubienia"
       "3": "Zakładki"
       "4": "Tematy"
@@ -845,10 +913,9 @@ pl_PL:
         save: "Zapisz kolejność"
         apply_all: "Zastosuj"
         position: "Pozycja"
-      posts: "Wpisy"
+      posts: "Posty"
       topics: "Tematy"
       latest: "Aktualne"
-      latest_by: "najnowszy wpis: "
       toggle_ordering: "przełącz kolejność kontroli"
       subcategories: "Podkategorie"
       muted: "Wyciszone kategorie"
@@ -857,11 +924,24 @@ pl_PL:
         few: "%{count} tematy"
         many: "%{count} tematów"
         other: "%{count} tematów"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        few: "%{number} / %{unit}"
+        many: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "tydzień"
+        month: "miesiąc"
+      topic_stat_all_time:
+        one: "%{number} łącznie"
+        few: "%{number} łącznie"
+        many: "%{number} łącznie"
+        other: "%{number} łącznie"
       topic_stat_sentence_week:
-        one: "%{count}nowy temat w zeszłym miesiącu."
-        few: "%{count}nowe tematy w zeszłym tygodniu."
-        many: "%{count}nowych tematów w zeszłym tygodniu."
-        other: "%{count}nowych tematów w zeszłym tygodniu."
+        one: "%{count} nowy temat w zeszłym tygodniu."
+        few: "%{count} nowe tematy w zeszłym tygodniu."
+        many: "%{count} nowych tematów w zeszłym tygodniu."
+        other: "%{count} nowych tematów w zeszłym tygodniu."
       topic_stat_sentence_month:
         one: "%{count} nowy temat w ostatnim miesiącu."
         few: "%{count} nowe tematy w ostatnim miesiącu."
@@ -881,7 +961,7 @@ pl_PL:
       trust_level: "TL"
       read_time: "czas czytania:"
       topics_entered: "wprowadzone tematy:"
-      post_count: "# wpisów"
+      post_count: "# postów"
       confirm_delete_other_accounts: "Czy na pewno chcesz usunąć wybrane konta?"
       powered_by: "używa <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "skopiowano"
@@ -895,9 +975,9 @@ pl_PL:
       edit: "Edytuj ustawienia"
       download_archive:
         button_text: "Pobierz Wszystko"
-        confirm: "Czy na pewno chcesz pobrać swoje wszystkie wpisy?"
+        confirm: "Czy na pewno chcesz pobrać swoje posty?"
         success: "Rozpoczęto eksport: otrzymasz wiadomość, gdy proces zostanie zakończony."
-        rate_limit_error: "Wpisy mogą być pobierane raz dziennie, spróbuj ponownie jutro."
+        rate_limit_error: "Posty mogą być pobierane raz dziennie, spróbuj ponownie jutro."
       new_private_message: "Nowa wiadomość"
       private_message: "Wiadomość"
       private_messages: "Wiadomości"
@@ -921,7 +1001,23 @@ pl_PL:
         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."
+      notification_schedule:
+        title: "Harmonogram powiadomień"
+        label: "Włącz niestandardowy harmonogram powiadomień"
+        tip: "Poza tymi godzinami automatycznie pojawi się opcja „nie przeszkadzać”."
+        midnight: "Północ"
+        none: "Brak"
+        monday: "Poniedziałek"
+        tuesday: "Wtorek"
+        wednesday: "Środa"
+        thursday: "Czwartek"
+        friday: "Piątek"
+        saturday: "Sobota"
+        sunday: "Niedziela"
+        to: "do"
       activity_stream: "Aktywność"
+      read: "Przeczytane"
+      read_help: "Ostatnio przeczytane tematy"
       preferences: "Ustawienia"
       feature_topic_on_profile:
         open_search: "Wybierz nowy temat"
@@ -947,14 +1043,17 @@ pl_PL:
         not_supported: "Powiadomienia nie są wspierane przez tę przeglądarkę. Przepraszamy."
         perm_default: "Włącz powiadomienia"
         perm_denied_btn: "Brak uprawnień"
-        perm_denied_expl: "Odmówiłeś dostępu dla powiadomień. Pozwól na powiadomienia w ustawieniach przeglądarki."
+        perm_denied_expl: "Odmówiłeś/łaś dostępu dla powiadomień. Pozwól na powiadomienia w ustawieniach przeglądarki."
         disable: "Wyłącz powiadomienia"
         enable: "Włącz powiadomienia"
-        each_browser_note: "Uwaga: to ustawienie musisz zmienić w każdej przeglądarce której używasz."
-        consent_prompt: "Czy chcesz otrzymywać natychmiastowe powiadomienia, gdy ktoś odpowie na twój wpis?"
+        each_browser_note: 'Uwaga: musisz zmienić to ustawienie w każdej przeglądarce, której używasz. Wszystkie powiadomienia zostaną wyłączone w trybie „nie przeszkadzać”, niezależnie od tego ustawienia.'
+        consent_prompt: "Czy chcesz otrzymywać natychmiastowe powiadomienia, gdy ktoś odpowiada na twoje posty?"
       dismiss: "Odrzuć"
       dismiss_notifications: "Odrzuć wszystkie"
       dismiss_notifications_tooltip: "Oznacz wszystkie powiadomienia jako przeczytane"
+      no_messages_title: "Nie masz żadnych wiadomości"
+      no_bookmarks_title: "Nie masz jeszcze żadnych zakładek"
+      no_notifications_title: "Nie masz jeszcze żadnych powiadomień"
       first_notification: "Twoje pierwsze powiadomienie! Kliknij aby zacząć."
       dynamic_favicon: "Pokazuj liczbę nowych/zaktualizowanych tematów w ikonie przeglądarki."
       skip_new_user_tips:
@@ -965,7 +1064,7 @@ pl_PL:
       color_scheme_default_on_all_devices: "Ustaw domyślne schematy kolorów na wszystkich moich urządzeniach"
       color_scheme: "Schemat kolorów"
       color_schemes:
-        default_description: "Domyślny"
+        default_description: "Motyw domyślny"
         disable_dark_scheme: "Taki sam jak zwykły"
         dark_instructions: "Możesz wyświetlić podgląd schematu kolorów trybu ciemnego, przełączając tryb ciemny urządzenia."
         undo: "Przywróć"
@@ -996,22 +1095,22 @@ pl_PL:
         enabled: "Włącz tryb listy mailingowej"
         instructions: |
           To ustawienie nadpisuje podsumowanie aktywności. <br />
-        individual: "Wyślij e-mail dla każdego nowego wpisu"
-        individual_no_echo: "Wysyłaj emaile dla każdego nowego wpisu oprócz mojego"
-        many_per_day: "Wyślij mi e-mail dla każdego nowego wpisu (około %{dailyEmailEstimate} na dzień)"
-        few_per_day: "Wyślij mi e-mail dla każdego nowego wpisu (około 2 dziennie)"
+        individual: "Wyślij e-mail dla każdego nowego postu"
+        individual_no_echo: "Wysyłaj e-maile dla każdego nowego postu oprócz mojego"
+        many_per_day: "Wyślij mi e-mail dla każdego nowego postu (około %{dailyEmailEstimate} na dzień)"
+        few_per_day: "Wyślij mi e-mail dla każdego nowego postu (około 2 dziennie)"
         warning: "Tryb listy mailingowej włączony. Ustawienia powiadomień e-mail są zastępowane."
       tag_settings: "Tagi"
       watched_tags: "Obserwowane"
-      watched_tags_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy z tymi tagami, będziesz otrzymywać powiadomienie o każdym nowym wpisie i temacie, a liczba nieprzeczytanych i nowych wpisów będzie wyświetlana obok tytułów na liście tematów. "
+      watched_tags_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy z tymi tagami, będziesz otrzymywać powiadomienie o każdym nowym poście i temacie, a liczba nieprzeczytanych i nowych postów będzie wyświetlana obok tytułów na liście tematów."
       tracked_tags: "Śledzone"
-      tracked_tags_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy z tymi tagami. Licznik nowych wpisów pojawi się obok tytułu na liście tematów."
+      tracked_tags_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy z tymi tagami. Licznik nowych postów pojawi się obok tytułu na liście tematów."
       muted_tags: "Wyciszone"
       muted_tags_instructions: "Nie będziesz powiadamiany o niczym dotyczącym nowych tematów z tymi tagami i nie pojawią się na liście aktualnych."
       watched_categories: "Obserwowane"
-      watched_categories_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach. Będziesz otrzymywać powiadomienie o każdym nowym wpisie i temacie, a liczba nowych wpisów będzie wyświetlana obok tytułów na liście tematów. "
+      watched_categories_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach. Będziesz otrzymywać powiadomienie o każdym nowym poście i temacie, a liczba nowych postów będzie wyświetlana obok tytułów na liście tematów."
       tracked_categories: "Śledzone"
-      tracked_categories_instructions: "Będziesz automatycznie śledzić wszystkie tematy w tych kategoriach. Licznik nowych wpisów pojawi się obok tytułu na liście tematów."
+      tracked_categories_instructions: "Będziesz automatycznie śledzić wszystkie tematy w tych kategoriach. Licznik nowych postów pojawi się obok tytułu na liście tematów."
       watched_first_post_categories: "Oglądasz pierwszy wpis"
       watched_first_post_categories_instructions: "Zostaniesz powiadomiony o pierwszym wpisie w każdym nowym temacie w tych kategoriach."
       watched_first_post_tags: "Oglądasz pierwszy wpis"
@@ -1068,6 +1167,7 @@ pl_PL:
         tags: "Tagi"
       preferences_nav:
         account: "Konto"
+        security: "Bezpieczeństwo"
         profile: "Profil"
         emails: "Wiadomości"
         notifications: "Powiadomienia"
@@ -1114,7 +1214,7 @@ pl_PL:
         title: "Uwierzytelnianie dwuskładnikowe"
         enable: "Zarządzaj uwierzytelnianiem dwuskładnikowym"
         disable_all: "Wyłącz wszystkie"
-        forgot_password: "Zapomniałeś hasła?"
+        forgot_password: "Zapomniałeś/łaś hasła?"
         confirm_password_description: "Potwierdź swoje hasło, aby kontynuować"
         name: "Imię"
         label: "Kod"
@@ -1127,7 +1227,7 @@ pl_PL:
           Chroń swoje konto za pomocą jednorazowych kodów bezpieczeństwa.
         extended_description: |
           Uwierzytelnianie dwuskładnikowe zapewnia dodatkowe bezpieczeństwo konta, wymagając jednorazowego tokena oprócz hasła. Tokeny można generować na <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>urządzeniach z systemem Android</a> i <a href="https://www.google.com/search?q=authenticator+apps+for+ios">systemem iOS</a>.
-        oauth_enabled_warning: "Pamiętaj, że loginy społecznościowe zostaną wyłączone po włączeniu uwierzytelniania dwuskładnikowego na Twoim koncie."
+        oauth_enabled_warning: "Pamiętaj, że logowanie kontem społecznościowym zostanie wyłączone po włączeniu uwierzytelniania dwuskładnikowego na Twoim koncie."
         use: "Użyj aplikacji Authenticator"
         enforced_notice: "Aby uzyskać dostęp do tej witryny, musisz włączyć uwierzytelnianie dwuskładnikowe."
         disable: "Wyłącz"
@@ -1183,6 +1283,7 @@ pl_PL:
         uploaded_avatar_empty: "Dodaj zwyczajny obrazek"
         upload_title: "Wyślij swoją grafikę"
         image_is_not_a_square: "Uwaga: grafika została przycięta ponieważ jej wysokość i szerokość nie były równe. "
+        logo_small: "Małe logo witryny. Używane domyślnie."
       change_profile_background:
         title: "Nagłówek profilu"
         instructions: "Nagłówki profilu zostaną wyśrodkowane i będą miały domyślną szerokość 1110 pikseli."
@@ -1205,7 +1306,7 @@ pl_PL:
         set_primary: "Ustaw podstawowy adres e-mail"
         destroy: "Usuń e-mail"
         add_email: "Dodaj alternatywny adres email"
-        sso_override_instructions: "E-mail można zaktualizować od dostawcy SSO."
+        auth_override_instructions: "Adres e-mail można zaktualizować od dostawcy uwierzytelniania."
         no_secondary: "Brak drugorzędnych adresów email"
         instructions: "Nie będzie publicznie widoczny."
         admin_note: "Uwaga: Użytkownik administratora zmieniający adres e-mail innego użytkownika niebędącego administratorem wskazuje, że użytkownik stracił dostęp do oryginalnego konta e-mail, więc na nowy adres zostanie wysłany e-mail z resetem hasła. Adres e-mail użytkownika nie ulegnie zmianie, dopóki nie zakończy się proces resetowania hasła."
@@ -1213,6 +1314,7 @@ pl_PL:
         required: "Podaj adres email"
         invalid: "Podaj poprawny adres email"
         authenticated: "Twój email został potwierdzony przez %{provider}"
+        invite_auth_email_invalid: "Twój e-mail z zaproszeniem nie jest zgodny z e-mailem uwierzytelnionym 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."
@@ -1248,6 +1350,7 @@ pl_PL:
         checking: "Sprawdzanie, czy nazwa jest dostępna…"
         prefilled: "Email zgadza się z zarejestrowaną nazwą użytkownika"
         required: "Wpisz nazwę użytkownika"
+        edit: "Edytuj nazwę użytkownika"
       locale:
         title: "Język interfejsu"
         instructions: "Język interfejsu użytkownika. Zmieni się, gdy odświeżysz stronę."
@@ -1265,7 +1368,7 @@ pl_PL:
         not_you: "To nie ty?"
         show_all: "Pokaż wszystko (%{count})"
         show_few: "Pokaż mniej"
-        was_this_you: "To byłes Ty?"
+        was_this_you: "Czy to byłeś 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}"
         secure_account: "Zabezpiecz moje konto"
@@ -1274,7 +1377,7 @@ pl_PL:
         browser_active: '%{browser} | <span class="active">aktywny teraz</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Ostatni wpis"
-      last_emailed: "Ostatnio otrzymał email"
+      last_emailed: "Ostatnio otrzymał(a) email"
       last_seen: "Ostatnio widziano"
       created: "Dołączył"
       log_out: "Wyloguj"
@@ -1320,7 +1423,7 @@ pl_PL:
         never: "nigdy"
       email_messages_level: "Wyślij e-mail, gdy ktoś napisze mi prywatną wiadomość"
       include_tl0_in_digests: "Dołącz treści od nowych użytkowników w e-mailach podsumowujących."
-      email_in_reply_to: "Dołącz fragment odpowiedzi w poście do maili "
+      email_in_reply_to: "Zawieraj w e-mailach fragment oryginalnych postów z odpowiedzi"
       other_settings: "Inne"
       categories_settings: "Kategorie"
       new_topic_duration:
@@ -1344,10 +1447,27 @@ pl_PL:
         after_10_minutes: "po 10 minutach"
       notification_level_when_replying: "Kiedy piszę w temacie, dołącz ten temat do"
       invited:
-        search: "wpisz aby szukać zaproszeń…"
         title: "Zaproszenia"
+        pending_tab: "Oczekujący"
+        pending_tab_with_count: "Oczekujące (%{count})"
+        expired_tab: "Wygasły"
+        expired_tab_with_count: "Wygasło (%{count})"
+        redeemed_tab: "Przyjęte"
+        redeemed_tab_with_count: "Zrealizowane (%{count})"
+        invited_via: "Zaproszenie"
+        invited_via_link: "link %{key} (użyto %{count} z %{max})"
+        groups: "Grupy"
+        topic: "Temat"
+        sent: "Utworzone/Ostatnio wysłane"
+        expires_at: "Wygasa"
+        edit: "Edytuj"
+        remove: "Usuń"
+        copy_link: "Uzyskaj link"
+        reinvite: "Wyślij ponownie e-mail"
+        reinvited: "Ponowne wysłanie zaproszenia"
+        removed: "Usunięto"
+        search: "wpisz aby szukać zaproszeń…"
         user: "Zaproszony(-a) użytkownik(-czka)"
-        sent: "Ostatni wysłany"
         none: "Brak zaproszeń do wyświetlenia."
         truncated:
           one: "Wyświetlanie pierwszego zaproszenia."
@@ -1355,38 +1475,21 @@ pl_PL:
           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_at: "Przyjęte"
         pending: "Oczekujące zaproszenia"
-        pending_tab: "Oczekujący"
-        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ń 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"
+        remove_all: "Usuń wygasłe zaproszenia"
+        removed_all: "Wszystkie wygasłe zaproszenia zostały usunięte!"
+        remove_all_confirm: "Czy na pewno chcesz usunąć wszystkie wygasłe zaproszenia?"
         reinvite_all: "Wyślij ponownie wszystkie zaproszenia"
         reinvite_all_confirm: "Jesteś pewny, że chcesz ponownie wysłać wszystkie zaproszenia?"
-        reinvited: "Ponowne wysłanie zaproszenia"
-        reinvited_all: "Wszystkie zaproszenia zostały ponownie wysłane!"
+        reinvited_all: "Wszystkie zaproszenia zostały wysłane!"
         time_read: "Czas odczytu"
         days_visited: "Dni odwiedzin"
         account_age_days: "Wiek konta w dniach"
-        source: "Zaproszone przez"
-        links_tab: "Odnośniki"
-        links_tab_with_count: "Odnośników (%{count})"
-        link_url: "Odnośnik"
-        link_created_at: "Utworzono"
-        link_redemption_stats: "Zaakceptowane zaproszenia"
-        link_groups: Grupy
-        link_expires_at: Wygasa
         create: "Zaproś"
-        copy_link: "Pokaż link"
         generate_link: "Stwórz odnośnik z zaproszeniem"
         link_generated: "Oto Twój link z zaproszeniem!"
         valid_for: "Link do zaproszenia jest ważny tylko dla tego adresu: %{email}"
@@ -1398,12 +1501,36 @@ pl_PL:
           error: "Wystąpił błąd podczas generowania linku do zaproszenia"
           max_redemptions_allowed_label: "Ile osób może zarejestrować się za pomocą tego linku?"
           expires_at: "Kiedy ten link z zaproszeniem wygaśnie?"
+        invite:
+          new_title: "Utwórz zaproszenie"
+          edit_title: "Edytuj zaproszenie"
+          instructions: "Udostępnij ten link, aby natychmiast przyznać dostęp do tej witryny:"
+          copy_link: "skopiuj link"
+          expires_in_time: "Wygasa za %{time}."
+          expired_at_time: "Wygasło o %{time}."
+          show_advanced: "Pokaż ustawienia zaawansowane"
+          hide_advanced: "Ukryj ustawienia zaawansowane"
+          restrict_email: "Ogranicz zaproszenie do jednego adresu e-mail"
+          max_redemptions_allowed: "Maksymalna liczba użytkowników:"
+          add_to_groups: "Dodaj do grup:"
+          invite_to_topic: "Wyślij do tematu przy pierwszym logowaniu:"
+          expires_at: "Wygasa po:"
+          custom_message: "Opcjonalna wiadomość osobista:"
+          send_invite_email: "Zapisz i wyślij e-mail"
+          save_invite: "Zapisz zaproszenie"
+          invite_saved: "Zaproszenie zapisane."
+          invite_copied: "Link z zaproszeniem został skopiowany."
+          blank_email: "Link z zaproszeniem nie został skopiowany. Adres e-mail jest wymagany."
         bulk_invite:
           none: "Brak zaproszeń do wyświetlenia na tej stronie."
           text: "Zaproszenie zbiorcze"
-          success: "Plik został przesłany pomyślnie: otrzymasz prywatną wiadomość, gdy proces zostanie zakończony."
+          instructions: |
+            <p>Zaproś grupę użytkowników, aby Twoja społeczność rosła szybko. Przygotuj <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">plik CSV</a> zawierający co najmniej jeden wiersz na adres e-mail użytkowników, których chcesz zaprosić. Poniższe informacje oddzielone przecinkami można podać, jeśli chcesz dodać osoby do grup lub wysłać je do określonego tematu przy pierwszym logowaniu.</p>
+            <pre>john @ smith.com, first_group_name; second_group_name, topic_id</pre>
+            <p>Na każdy adres e-mail w przesłanym pliku CSV zostanie wysłane zaproszenie, którym będziesz mógł zarządzać później.</p>
+          progress: "Przesłano %{progress}%..."
+          success: "Plik został przesłany pomyślnie. Po zakończeniu procesu otrzymasz powiadomienie za pośrednictwem wiadomości."
           error: "Przykro nam, ale wymagany format pliku to CSV."
-          confirmation_message: "Za chwilę wyślesz zaproszenia do wszystkich w przesłanym pliku."
       password:
         title: "Hasło"
         too_short: "Hasło jest za krótkie."
@@ -1450,8 +1577,8 @@ pl_PL:
           other: "przeczytane tematy"
         posts_read:
           one: "przeczytany post"
-          few: "przeczytanych postów"
-          many: "przeczytane posty"
+          few: "przeczytane posty"
+          many: "przeczytanych postów"
           other: "przeczytanych wpisów"
         bookmark_count:
           one: "zakładka"
@@ -1483,6 +1610,8 @@ pl_PL:
       avatar:
         title: "Awatar"
         header_title: "profil, wiadomości, zakładki i ustawienia"
+        name_and_description: "%{name} - %{description}"
+        edit: "Edytuj zdjęcie profilowe"
       title:
         title: "Tytuł"
         none: "(brak)"
@@ -1520,12 +1649,12 @@ pl_PL:
       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?"
+    assets_changed_confirm: "Ta strona właśnie otrzymała aktualizację oprogramowania. Pobrać najnowszą wersję teraz?"
     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 publikowanie wpisów, polubianie i inne są wyłączone."
+      enabled: "Strona jest w trybie tylko-do-odczytu. Możesz ją nadal przeglądać, ale operacje takie jak publikowanie postów, polubianie 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: >-
@@ -1540,15 +1669,6 @@ pl_PL:
       exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} few {# errors/hour} many {# errors/hour} other {# errors/hour}}</a> osiągnięto limit ustawień witryny wynoszący {limit, plural, one {# error/hour} few {# errors/hour} many {# errors/hour} other {# errors/hour}}."
       exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} few {# errors/minute} many {# errors/minute} other {# errors/minute}}</a> osiągnięto limit ustawień witryny wynoszący {limit, plural, one {# error/minute} few {# errors/minute} many {# errors/minute} other {# errors/minute}}."
     learn_more: "dowiedz się więcej…"
-    all_time: "łącznie"
-    all_time_desc: "łącznie utworzonych tematów"
-    year: "rok"
-    year_desc: "tematów utworzonych w ciągu ostatnich 365 dni"
-    month: "miesiąc"
-    month_desc: "tematów utworzonych w ciągu ostatnich 30 dni"
-    week: "tydzień"
-    week_desc: "tematów utworzonych w ciągu ostatnich 7 dni"
-    day: "dzień"
     first_post: Pierwszy wpis
     mute: Wycisz
     unmute: Wyłącz wyciszenie
@@ -1568,20 +1688,24 @@ pl_PL:
       sign_up: "Rejestracja"
       hide_session: "Przypomnij mi jutro"
       hide_forever: "nie, dziękuję"
-      hidden_for_session: "Ok, zapytamy jutro. Pamiętaj, że konto możesz w każdej chwili założyć klikając na 'Logowanie'."
+      hidden_for_session: "OK, zapytamy Cię jutro. Zawsze możesz też użyć opcji „Zaloguj się”, aby utworzyć konto."
       intro: "Hej! Wygląda na to, że zainteresowała Cię ta dyskusja, ale nie posiadasz jeszcze konta."
-      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ć wpisy, aby dzielić się miłością. :heartpulse:"
+      value_prop: "Jeśli założysz konto, będziemy pamiętać dokładnie to, co przeczytałeś/łaś, więc zawsze wrócisz tam, gdzie ostatnio opuściłeś/łaś temat. Otrzymasz również powiadomienia, tutaj i za pośrednictwem poczty email, gdy ktoś Ci odpowie. Możesz również polubić wpisy, 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:
+        one: "Jest <b>%{count}</b> odpowiedź."
+        few: "Jest <b>%{count}</b> odpowiedzi."
+        many: "Jest <b>%{count}</b> odpowiedzi."
+        other: "Jest <b>%{count}</b> odpowiedzi."
+      description_time_MF: "Istnieje {replyCount, plural, one {<b>#</b> odpowiedź} few {<b>#</b> odpowiedzi} many {<b>#</b> odpowiedzi} other {<b>#</b> odpowiedzi}} z szacowanym czasem czytania <b>{readingTime, plural, one {# minuty} few {# minut} many {# minut} other {# minut}}</b>."
       enable: "Podsumuj ten temat"
-      disable: "Pokaż wszystkie wpisy"
+      disable: "Pokaż wszystkie posty"
     deleted_filter:
       enabled_description: "Ten temat posiada usunięte wpisy, które zostały ukryte."
       disabled_description: "Usunięte wpisy w tym temacie są widoczne."
-      enable: "Ukryj usunięte wpisy"
-      disable: "Pokaż usunięte wpisy."
+      enable: "Ukryj usunięte posty"
+      disable: "Pokaż usunięte posty"
     private_message_info:
       title: "Wiadomość"
       invite: "Zaproś innych..."
@@ -1599,8 +1723,10 @@ pl_PL:
     trust_level: "Poziom zaufania"
     search_hint: "nazwa użytkownika, email lub IP"
     create_account:
+      header_title: "Witamy!"
+      subheader_title: "Utwórzmy Twoje konto"
       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"
+      title: "Utwórz swoje 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:
       title: "Reset hasła"
@@ -1609,28 +1735,31 @@ 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_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>"
+      help: "Email nie dotarł? Upewnij się najpierw czy sprawdziłeś/łaś 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>"
       button_ok: "OK"
       button_help: "Pomoc"
     email_login:
       link_label: "Wyślij mi link do logowania"
       button_label: "z e-mailem"
+      login_link: "Pomiń hasło; wyślij mi e-mailem link do logowania"
       emoji: "zablokuj emoji"
-      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: "Jeśli konto pasuje do nazwy użytkownika <b>%{username}</b>, wkrótce otrzymasz wiadomość e-mail z linkiem do logowania."
+      complete_email: "Jeśli konto pasuje do <b>%{email}</b> , wkrótce otrzymasz wiadomość e-mail z linkiem do logowania."
+      complete_username_found: "Znaleźliśmy konto pasujące do nazwy użytkownika <b>%{username}</b>, wkrótce otrzymasz wiadomość e-mail z linkiem do logowania."
+      complete_email_found: "Znaleźliśmy konto pasujące do <b>%{email}</b> , wkrótce 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}
       logging_in_as: Logowanie jako %{email}
       confirm_button: Dokończ logowanie
     login:
-      title: "Logowanie"
+      header_title: "Witamy ponownie"
+      subheader_title: "Zaloguj się na swoje konto"
+      title: "Zaloguj się"
       username: "Użytkownik"
       password: "Hasło"
       second_factor_title: "Uwierzytelnianie dwuskładnikowe"
@@ -1645,7 +1774,7 @@ pl_PL:
       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"
+      email_placeholder: "E-mail / 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."
@@ -1666,13 +1795,13 @@ pl_PL:
       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."
+      provide_new_email: "Wprowadź nowy adres e-mail. Wyślemy na niego e-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."
-      not_approved: "Twoje konto nie zostało jeszcze aktywowane. Zostaniesz powiadomiony emailem gdy będziesz mógł się zalogować."
+      not_approved: "Twoje konto nie zostało jeszcze aktywowane. Zostaniesz powiadomiony emailem gdy będziesz mógł/mogła się zalogować."
       google_oauth2:
         name: "Google"
         title: "przez Google"
@@ -1681,7 +1810,7 @@ pl_PL:
         title: "przez Twitter"
       instagram:
         name: "Instagram"
-        title: "z Instagram"
+        title: "z Instagramem"
       facebook:
         name: "Facebook"
         title: "przez Facebook"
@@ -1698,11 +1827,11 @@ pl_PL:
       accept_title: "Zaproszenie"
       emoji: "envelope emoji"
       welcome_to: "Witaj na %{site_name}!"
-      invited_by: "Zostałeś zaproszony przez:"
+      invited_by: "Zostałeś/łaś zaproszony przez:"
       social_login_available: "Będziesz mógł zalogować się za pomocą dowolnej platformy społecznościowej używając tego adresu e-mail."
       your_email: "Adres e-mail przypisany do twojego konta to <b>%{email}</b>."
       accept_invite: "Akceptuj zaproszenie"
-      success: "Twje konto zostało utworzone i zostałeś zalogowany."
+      success: "Twoje konto zostało utworzone i jesteś teraz zalogowany."
       name_label: "Nazwa"
       password_label: "Hasło"
       optional_description: "(opcjonalne)"
@@ -1712,7 +1841,6 @@ 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"
@@ -1747,18 +1875,20 @@ pl_PL:
         many: "+ %{count} podkategorii"
         other: "+ %{count} podkategorii"
     select_kit:
+      filter_by: "Filtruj według: %{name}"
+      select_to_filter: "Wybierz wartość do filtrowania"
       default_header_text: Wybierz...
       no_content: Nie znaleziono dopasowań
       filter_placeholder: Wyszukiwanie...
       filter_placeholder_with_any: Wyszukaj lub utwórz...
       create: "Stwórz: '%{content}'"
       max_content_reached:
-        one: "Możesz wybrać tylko jeden element."
-        few: "Może wybrać tylko %{count} elementy."
+        one: "Możesz wybrać tylko %{count} element."
+        few: "Możesz 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."
+        one: "Wybierz co najmniej %{count} element."
         few: "Wybierz co najmniej %{count} elementy."
         many: "Wybierz co najmniej %{count} elementów."
         other: "Wybierz co najmniej %{count} elementów."
@@ -1768,16 +1898,16 @@ pl_PL:
         many: "Zaznaczenie musi zawierać co najmniej %{count} znaków."
         other: "Zaznaczenie musi zawierać co najmniej %{count} znaków."
       components:
+        tag_drop:
+          filter_for_more: Filtruj po więcej...
         categories_admin_dropdown:
           title: "Zarządzaj kategoriami"
     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
+      smileys_&_emotion: Buźki i emocje
       people_&_body: Ludzie i ciało
       animals_&_nature: Zwierzęta i przyroda
       food_&_drink: Jedzenie i picie
@@ -1796,7 +1926,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 dla osób, które mogą publikować współdzielone szkice postów."
       destination_category: "Kategoria docelowa"
       publish: "Opublikuj udostępniony projekt"
       confirm_publish: "Czy na pewno chcesz opublikować ten projekt?"
@@ -1807,7 +1937,6 @@ pl_PL:
       options: "Opcje"
       whisper: "szept"
       unlist: "nie widoczny"
-      blockquote_text: "Cytat"
       add_warning: "To jest oficjalne ostrzeżenie."
       toggle_whisper: "Przełącz szept"
       toggle_unlisted: "Przycisk ukrywania"
@@ -1817,27 +1946,39 @@ pl_PL:
       drafts_offline: "szkice offline"
       edit_conflict: "edytuj konflikt"
       group_mentioned_limit:
-        one: "<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 %{count}. Nikt nie zostanie powiadomiony."
-        few: "<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 %{count}. Nikt nie zostanie powiadomiony."
-        many: "<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 %{count}. Nikt nie zostanie powiadomiony."
-        other: "<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 %{count}. Nikt nie zostanie powiadomiony."
+        one: "<b>Ostrzeżenie!</b> Wspomniałeś/łaś o <a href='%{group_link}'>%{group}</a> , jednak ta grupa ma więcej członków niż skonfigurowany przez administratora limit wzmianek dla użytkowników %{count}. Nikt nie zostanie powiadomiony."
+        few: "<b>Ostrzeżenie!</b> Wspomniałeś/łaś o <a href='%{group_link}'>%{group}</a> , jednak ta grupa ma więcej członków niż skonfigurowany przez administratora limit wzmianek dla użytkowników %{count}. Nikt nie zostanie powiadomiony."
+        many: "<b>Ostrzeżenie!</b> Wspomniałeś/łaś o <a href='%{group_link}'>%{group}</a> , jednak ta grupa ma więcej członków niż skonfigurowany przez administratora limit wzmianek dla użytkowników %{count}. Nikt nie zostanie powiadomiony."
+        other: "<b>Ostrzeżenie!</b> Wspomniałeś/łaś o <a href='%{group_link}'>%{group}</a> , jednak ta grupa ma więcej członków niż skonfigurowany przez administratora limit wzmianek dla użytkowników %{count}. Nikt nie zostanie powiadomiony."
       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?"
       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 "
+        category: "Wspomniałeś/łaś 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ś/łaś 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_missing: "Tytuł jest wymagany"
+        title_too_short:
+          one: "Tytuł musi mieć co najmniej %{count} znak"
+          few: "Tytuł musi mieć co najmniej %{count} znaki"
+          many: "Tytuł musi mieć co najmniej %{count} znaków"
+          other: "Tytuł musi mieć co najmniej %{count} znaków"
+        title_too_long:
+          one: "Tytuł nie może mieć więcej niż %{count} znak"
+          few: "Tytuł nie może mieć więcej niż %{count} znaki"
+          many: "Tytuł nie może mieć więcej niż %{count} znaków"
+          other: "Tytuł nie może mieć więcej niż %{count} znaków"
         post_missing: "Wpis nie może być pusty"
-        post_length: "Wpis musi zawierać przynajmniej %{min} znaków"
-        try_like: "Czy wypróbowałeś przycisk %{heart}?"
+        post_length:
+          one: "Post musi mieć co najmniej %{count} znak"
+          few: "Post musi mieć co najmniej %{count} znaki"
+          many: "Post musi mieć co najmniej %{count} znaków"
+          other: "Post musi mieć co najmniej %{count} znaków"
+        try_like: "Czy wypróbowałeś/łaś przycisk %{heart}?"
         category_missing: "Musisz wybrać kategorię"
         tags_missing:
           one: "Musisz wybrać co najmniej %{count} tag."
@@ -1871,13 +2012,13 @@ pl_PL:
       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"
+      show_preview: "pokaż podgląd"
+      hide_preview: "ukryj podgląd"
       quote_post_title: "Cytuj cały wpis"
-      bold_label: "Pogrubienie"
+      bold_label: "B"
       bold_title: "Pogrubienie"
       bold_text: "pogrubiony tekst"
-      italic_label: "Kursywa"
+      italic_label: "I"
       italic_title: "Wyróżnienie"
       italic_text: "wyróżniony tekst"
       link_title: "Odnośnik"
@@ -1885,8 +2026,8 @@ pl_PL:
       link_dialog_title: "Wstaw odnośnik"
       link_optional_text: "opcjonalny tytuł"
       link_url_placeholder: "Wklej adres URL lub wpisz, aby wyszukać tematy"
-      quote_title: "Cytat"
-      quote_text: "Cytat"
+      blockquote_title: "Cytat blokowy"
+      blockquote_text: "Cytat"
       code_title: "Tekst sformatowany"
       code_text: "Sformatowany blok tekstu poprzedź 4 spacjami"
       paste_code_text: "wpisz lub wklej tutaj kod"
@@ -1908,10 +2049,10 @@ pl_PL:
       modal_cancel: "Anuluj"
       cant_send_pm: "Przepraszamy, niestety nie możesz wysłać prywatnej wiadomości do %{username}."
       yourself_confirm:
-        title: "Nie zapomniałeś dodać odbiorców?"
+        title: "Nie zapomniałeś/łaś dodać odbiorców?"
         body: "Aktualnie ta wiadomość będzie wysłana tylko do ciebie!"
       slow_mode:
-        error: "Ten temat jest w trybie zwolnionym. W celu promowania przemyślanej, rozważanej dyskusji można publikować wpisy tylko raz na %{duration}."
+        error: "Ten temat jest w trybie powolnym. Opublikowałeś już niedawno post; możesz napisać kolejny za %{timeLeft}."
       admin_options_title: "Opcjonalne ustawienia zespołu dla tego tematu"
       composer_actions:
         reply: Odpowiedź
@@ -1940,7 +2081,7 @@ pl_PL:
           label: "Nowy temat"
         shared_draft:
           label: "Udostępniony projekt"
-          desc: "Opracuj temat, który będzie widoczny tylko dla zespołu zarządzającego"
+          desc: "Szkicuj temat, który będzie widoczny tylko dla uprawnionych użytkowników"
         toggle_topic_bump:
           label: "Przełącz wypukłość tematu"
           desc: "Odpowiedz bez zmiany ostatniej daty odpowiedzi"
@@ -1954,10 +2095,10 @@ pl_PL:
           many: "Nieprzeczytanych powiadomień: %{count}"
           other: "Nieprzeczytanych powiadomień: %{count}"
         message:
-          one: "Nieodczytane wiadomości: %{count}"
-          few: "Nieodczytane wiadomości: %{count}"
+          one: "%{count} nieodczytana wiadomość"
+          few: "%{count} nieodczytane wiadomości"
           many: "Nieodczytane wiadomości: %{count}"
-          other: "Nieodczytane wiadomości: 1"
+          other: "%{count} nieodczytanych wiadomości"
         high_priority:
           one: "%{count} nieprzeczytane powiadomienie o wysokim priorytecie"
           few: "%{count} nieprzeczytane powiadomienia o wysokim priorytecie"
@@ -2007,19 +2148,19 @@ pl_PL:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - zakończone"
       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: "%{count} wiadomość w skrzynce odbiorczej %{group_name}"
+        few: "%{count} wiadomości w skrzynce odbiorczej %{group_name}"
+        many: "%{count} wiadomości w skrzynce odbiorczej %{group_name}"
+        other: "%{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}'
+        group_mentioned: '%{username} wspomniał(a) 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}'
+        watching_first_post: '%{username} utworzył(a) 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}"
@@ -2054,14 +2195,15 @@ 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"
       local_tip: "wybierz obrazy ze swojego urządzenia"
-      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)"
+      local_tip_with_attachments: "wybierz obrazy lub pliki ze swojego urządzenia"
+      hint: "(możesz również przeciągać i upuszczać do edytora, aby przesłać)"
       hint_for_supported_browsers: "możesz też przeciągać lub wklejać grafiki do edytora"
       uploading: "Wgrywanie"
       select_file: "Wybierz plik"
       default_image_alt_text: Obraz
+      supported_formats: "obsługiwane formaty"
     search:
       sort_by: "Sortuj po"
       relevance: "Trafność"
@@ -2073,12 +2215,12 @@ 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>"
-      title: "szukaj tematów, wpisów, użytkowników lub kategorii"
-      full_page_title: "szukaj tematów lub wpisów"
+        one: "<span>%{count} wynik dla</span><span class='term'>%{term}</span>"
+        few: "<span>%{count}%{plus} wyniki dla</span><span class='term'>%{term}</span>"
+        many: "<span>%{count}%{plus} wyników dla</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} wyników dla</span><span class='term'>%{term}</span>"
+      title: "szukaj tematów, postó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."
       post_format: "#%{post_number} za %{username}"
@@ -2089,8 +2231,9 @@ pl_PL:
       or_search_google: "Albo spróbuj wyszukać w Google:"
       search_google: "Spróbuj wyszukać w Google:"
       search_google_button: "Google"
+      search_button: "Szukaj"
       context:
-        user: "Szukaj wpisów @%{username}"
+        user: "Szukaj postów @%{username}"
         category: "Szukaj w kategorii #%{category}"
         tag: "Wyszukaj znacznik # %{tag}"
         topic: "Szukaj w tym temacie"
@@ -2154,7 +2297,7 @@ pl_PL:
     go_back: "wróć"
     not_logged_in_user: "strona użytkownika z podsumowaniem bieżących działań i ustawień"
     current_user: "idź do swojej strony użytkowanika"
-    view_all: "pokaż wszystkie"
+    view_all: "zobacz wszystkie %{tab}"
     topics:
       new_messages_marker: "ostatnia wizyta"
       bulk:
@@ -2175,7 +2318,9 @@ pl_PL:
         change_category: "Ustaw kategorię"
         close_topics: "Zamknij tematy"
         archive_topics: "Zarchiwizuj tematy"
+        move_messages_to_inbox: "Przenieś do skrzynki odbiorczej"
         notification_level: "Powiadomienia"
+        change_notification_level: "Zmień poziom powiadomień"
         choose_new_category: "Wybierz nową kategorię dla tematów:"
         selected:
           one: "Zaznaczono <b>%{count}</b> temat."
@@ -2187,7 +2332,12 @@ pl_PL:
         choose_new_tags: "Wybierz nowe tagi dla tych tematów:"
         choose_append_tags: "Wybierz nowe tagi dla tych tematów:"
         changed_tags: "Tagi tych tematów były zmieniane."
-        remove_tags: "Usuń tagi"
+        remove_tags: "Usuń wszystkie tagi"
+        confirm_remove_tags:
+          one: "Wszystkie tagi zostaną usunięte z tego tematu. Jesteś pewny?"
+          few: "Wszystkie tagi zostaną usunięte z <b>%{count}</b> tematów. Jesteś pewny?"
+          many: "Wszystkie tagi zostaną usunięte z <b>%{count}</b> tematów. Jesteś pewny?"
+          other: "Wszystkie tagi zostaną usunięte z <b>%{count}</b> tematów. Jesteś pewny?"
         progress:
           one: "Postęp: <strong>%{count}</strong> temat"
           few: "Postęp: <strong>%{count}</strong> tematy"
@@ -2197,7 +2347,7 @@ pl_PL:
         unread: "Nie masz nieprzeczytanych tematów."
         new: "Nie masz nowych tematów."
         read: "You haven't read any topics yet."
-        posted: "Jeszcze nie zamieściłeś wpisu w żadnym z tematów."
+        posted: "Jeszcze nie zamieściłeś/łaś wpisu w żadnym z tematów."
         ready_to_create: "Gotowy do "
         latest: "Jesteś na biężąco!"
         bookmarks: "Nie posiadasz tematów dodanych do zakładek."
@@ -2205,7 +2355,7 @@ pl_PL:
         top: "Brak najlepszych tematów."
         educate:
           new: '<p>Twoje nowe tematy pojawią się tutaj. Domyślnie tematy są uważane za nowe i będą pokazywać wskaźnik <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span>, jeśli zostały utworzone w ciągu ostatnich 2 dni.</p><p>Odwiedź swoje <a href="%{userPrefsUrl}">ustawienia</a>, aby to zmienić.</p>'
-          unread: '<p>Twoje nie przeczytane tematy będą pojawiać się tutaj.</p><p>Domyślnie tematy są określane jako nieprzeczytane a ich liczba zostanie wyświetlona<span class="badge new-posts badge-notification">1</span> Jeśli:</p><ul><li>Utworzyłeś temat</li><li>Odpowiedziałeś w temacie</li><li>Czytałeś temat dłużej niż 4 minuty</li></ul><p>Albo ustawiłeś śledzenie lub obserwowanie tematu przez kontrolę powiadomień na dole każdego tematu .</p><p>Odwiedź swoje <a href="%{userPrefsUrl}">ustawienia</a> by to zmienić.</p>'
+          unread: "<p>Twoje nie przeczytane tematy będą pojawiać się tutaj.</p><p>Domyślnie tematy są określane jako nieprzeczytane a ich liczba zostanie wyświetlona<span class=\"badge new-posts badge-notification\">1</span> Jeśli:</p><ul><li>Utworzyłeś/łaś temat</li><li>Odpowiedziałeś/łaś w temacie</li><li>Czytałeś/łaś temat dłużej niż 4 minuty</li></ul><p>Albo ustawiłeś/łaś śledzenie lub obserwowanie tematu przez \U0001F514 na dole każdej dyskusji.</p><p>Odwiedź swoje <a href=\"%{userPrefsUrl}\">ustawienia</a> by to zmienić.</p>"
       bottom:
         latest: "Nie ma więcej najnowszych tematów."
         posted: "Nie ma więcej tematów w których pisałeś."
@@ -2218,10 +2368,10 @@ pl_PL:
         bookmarks: "Nie ma więcej zakładek."
     topic:
       filter_to:
-        one: "%{count} wpis w temacie"
+        one: "%{count} post w temacie"
         few: "%{count} posty w temacie"
         many: "%{count} postów w temacie"
-        other: "%{count} wpisów w temacie"
+        other: "%{count} postów w temacie"
       create: "Nowy temat"
       create_long: "Utwórz nowy temat"
       open_draft: "Otwórz szkic"
@@ -2296,33 +2446,39 @@ pl_PL:
       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}."
       unread_indicator: "Nikt jeszcze nie czytał ostatniego postu w tym temacie."
-      read_more_MF: "Masz do zobaczenia { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 nieprzeczytany</a> temat } other { <a href='{basePath}/unread'># nieprzeczytanych</a> tematów } }{ NEW, plural, =0 {} one { {BOTH, select, true{ oraz} false {} other{}} <a href='{basePath}/new'>1 nowy</a> temat} other { {BOTH, select, true{oraz } false {} other{}}<a href='{basePath}/new'># nowych</a> tematów} }, lub {CATEGORY, select, true {przejrzyj inne tematy w {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "Masz do zobaczenia { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'># nieprzeczytany</a> temat } other { <a href='{basePath}/unread'># nieprzeczytanych</a> tematów } }{ NEW, plural, =0 {} one { {BOTH, select, true{ oraz} false {} other{}} <a href='{basePath}/new'># nowy</a> temat} other { {BOTH, select, true{oraz } false {} other{}}<a href='{basePath}/new'># nowych</a> tematów} }, lub {CATEGORY, select, true {przejrzyj 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
       browse_all_tags: Przeglądaj wszystkie tagi
       view_latest_topics: pokaż aktualne tematy
       suggest_create_topic: rozpocząć nową rozmowę?
-      jump_reply_up: przeskocz do wcześniejszej odpowiedzi
-      jump_reply_down: przeskocz do późniejszej odpowiedzi
+      jump_reply_up: skocz do wcześniejszej odpowiedzi
+      jump_reply_down: skocz do późniejszej odpowiedzi
       deleted: "Temat został usunięty"
       slow_mode_update:
         title: "Tryb powolny"
         select: "Użytkownicy mogą publikować w tym temacie tylko raz na:"
         description: "Aby promować przemyślaną dyskusję w popularnych lub spornych dyskusjach, użytkownicy muszą poczekać przed ponownym opublikowaniem odpowiedzi w tym temacie."
         save: "Włącz"
+        enabled_until: "Włączone do:"
         remove: "Wyłącz"
         hours: "Godziny:"
         minutes: "Minuty:"
         seconds: "Sekundy:"
         durations:
+          10_minutes: "10 minut"
           15_minutes: "15 minut"
+          30_minutes: "30 minut"
+          45_minutes: "45 minut"
           1_hour: "1 godzina"
+          2_hours: "2 godziny"
           4_hours: "4 godziny"
-          1_day: "1 dzień"
-          1_week: "1 tydzień"
+          8_hours: "8 godzin"
+          12_hours: "12 godzin"
+          24_hours: "24 godziny"
           custom: "Niestandardowy czas trwania"
       slow_mode_notice:
-        duration: "Musisz poczekać %{duration} między następnym wpisem w tym temacie"
+        duration: "Poczekaj %{duration} między postami w tym wątku"
       topic_status_update:
         title: "Timer tematów"
         save: "Ustaw czas"
@@ -2331,7 +2487,9 @@ pl_PL:
         remove: "Usuń czas"
         publish_to: "Opublikuj do:"
         when: "Kiedy:"
-        time_frame_required: Wybierz przedział czasowy
+        time_frame_required: "Wybierz przedział czasowy"
+        min_duration: "Czas trwania musi być większy niż 0"
+        max_duration: "Czas trwania musi być krótszy niż 20 lat"
       auto_update_input:
         none: "Wybierz przedział czasowy"
         now: "Teraz"
@@ -2346,7 +2504,7 @@ pl_PL:
         three_months: "Trzy miesiące"
         four_months: "Cztery miesiące"
         six_months: "Sześć miesięcy"
-        one_year: "Jeden rok"
+        one_year: "Rok"
         forever: "Zawsze"
         pick_date_and_time: "Wybierz datę i czas"
         set_based_on_last_post: "Zamknij na podstawie ostatniego wpisu"
@@ -2355,16 +2513,18 @@ pl_PL:
       temp_open:
         title: "Otwórz tymczasowo"
       auto_reopen:
-        title: "Automatycznie otwórz wątek"
+        title: "Automatycznie otwórz temat"
       temp_close:
         title: "Zamknij tymczasowo"
       auto_close:
-        title: "Automatycznie zamknij wątek"
-        label: "Godziny automatycznego zamknięcia:"
+        title: "Automatycznie zamknij temat"
+        label: "Automatycznie zamknij temat po:"
         error: "Wprowadź poprawną wartość."
         based_on_last_post: "Nie zamykaj tematu dopóki od ostatniego wpisu nie upłynie przynajmniej tyle czasu."
+      auto_close_after_last_post:
+        title: "Automatycznie zamknij temat po ostatnim poście"
       auto_delete:
-        title: "Automatycznie usuń wątek"
+        title: "Automatycznie usuń temat"
       auto_bump:
         title: "Automatycznie podbij temat"
       reminder:
@@ -2375,7 +2535,7 @@ pl_PL:
         auto_open: "Ten wątek zostanie automatycznie otwarty po %{timeLeft}."
         auto_close: "Ten wątek zostanie automatycznie zamknięty po %{timeLeft}."
         auto_publish_to_category: "Wątek zostanie opublikowany w <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Ten watek zostanie automatycznie zamknięty po %{duration} od ostatniego wpisu."
+        auto_close_after_last_post: "Ten watek zostanie automatycznie zamknięty po %{duration} od ostatniej odpowiedzi."
         auto_delete: "Ten wątek zostanie automatycznie zamknięty po %{timeLeft}."
         auto_bump: "Ten temat zostanie automatycznie podbity %{timeLeft}."
         auto_reminder: "Otrzymasz przypomnienie o tym temacie %{timeLeft}."
@@ -2383,9 +2543,14 @@ pl_PL:
       auto_close_title: "Ustawienia automatycznego zamykania"
       auto_close_immediate:
         one: "Ostatni wpis w tym temacie został zamieszczony %{count} godzinę temu, więc zostanie on natychmiastowo zamknięty."
-        few: "Ostatni wpis w tym temacie został zamieszczony %{hours} godziny temu, więc zostanie on natychmiastowo zamknięty."
+        few: "Ostatni wpis w tym temacie został zamieszczony %{count} godziny temu, więc zostanie on natychmiastowo zamknięty."
         many: "Ostatni wpis w tym temacie został zamieszczony %{count} godzin temu, więc zostanie on natychmiastowo zamknięty."
-        other: "Ostatni wpis w tym temacie został zamieszczony %{hours} godzin temu, więc zostanie on natychmiastowo zamknięty."
+        other: "Ostatni wpis w tym temacie został zamieszczony %{count} godzin temu, więc zostanie on natychmiastowo zamknięty."
+      auto_close_momentarily:
+        one: "Ostatni post w temacie ma już %{count} godzinę, więc temat zostanie chwilowo zamknięty."
+        few: "Ostatni post w temacie ma już %{count} godziny, więc temat zostanie chwilowo zamknięty."
+        many: "Ostatni post w temacie ma już %{count} godzin, więc temat zostanie chwilowo zamknięty."
+        other: "Ostatni post w temacie ma już %{count} godzin, więc temat zostanie chwilowo zamknięty."
       timeline:
         back: "Wstecz"
         back_description: "Wróć do ostatniego nieprzeczytanego wpisu"
@@ -2397,9 +2562,13 @@ pl_PL:
         go: "idź"
         jump_bottom: "Przejdź na koniec"
         jump_prompt: "skocz do..."
-        jump_prompt_of: "%{count} wpisów"
+        jump_prompt_of:
+          one: "z %{count} postu"
+          few: "z %{count} postów"
+          many: "z %{count} postów"
+          other: "z %{count} postów"
         jump_prompt_long: "Skocz do..."
-        jump_bottom_with_number: "przeskocz do wpisu %{post_number}"
+        jump_bottom_with_number: "skocz do postu %{post_number}"
         jump_prompt_to_date: "do daty"
         jump_prompt_or: "lub"
         total: w sumie wpisów
@@ -2407,7 +2576,7 @@ pl_PL:
       notifications:
         title: Ustaw jak często chcesz być powiadamiany o tym temacie
         reasons:
-          mailing_list_mode: "Masz włączony tryb powiadomień mailowych, więc będziesz otrzymywał powiadomienia o nowych odpowiedziach w tym temacie za pośrednictwem poczty e-mail"
+          mailing_list_mode: "Masz włączony tryb powiadomień mailowych, więc będziesz otrzymywał powiadomienia o nowych odpowiedziach w tym temacie za przez e-mail."
           "3_10": "Będziesz otrzymywał powiadomienia, ponieważ temat zawiera obserwowany przez Ciebie tag"
           "3_6": "Będziesz otrzymywać powiadomienia o każdym nowym wpisie i temacie, ponieważ obserwujesz tę kategorię."
           "3_5": "Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ włączono automatyczne obserwowanie tego tematu."
@@ -2415,9 +2584,9 @@ pl_PL:
           "3_1": "Będziesz otrzymywać powiadomienia, ponieważ jesteś autorem tego tematu."
           "3": "Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ obserwujesz ten temat."
           "2_8": "Widzisz ilość nowych odpowiedzi, ponieważ śledzisz kategorię wątku."
-          "2_4": "Widzisz ilość nowych odpowiedzi, ponieważ wypowiedziałeś się w tym wątku."
+          "2_4": "Widzisz ilość nowych odpowiedzi, ponieważ wypowiedziałeś/łaś się w tym wątku."
           "2_2": "Widzisz ilość nowych odpowiedzi, ponieważ śledzisz ten wątek."
-          "2": 'Zobaczysz liczbę nowych odpowiedzi, ponieważ <a href="%{basePath}/u/%{username}/preferences/notifications">przeczytałeś ten temat</a>.'
+          "2": 'Zobaczysz liczbę nowych odpowiedzi, ponieważ <a href="%{basePath}/u/%{username}/preferences/notifications">przeczytałeś/łaś ten temat</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."
@@ -2482,6 +2651,17 @@ pl_PL:
         title: "Udostępnij"
         extended_title: "Udostępnij link"
         help: "udostępnij odnośnik do tego tematu"
+        instructions: "Udostępnij link do tego tematu:"
+        copied: "Link do tematu skopiowany."
+        notify_users:
+          title: "Powiadom"
+          instructions: "Powiadom następujących użytkowników o tym temacie:"
+          success:
+            one: "Pomyślnie powiadomiono %{username} o tym temacie."
+            few: "Pomyślnie powiadomiono wszystkich użytkowników o tym temacie."
+            many: "Pomyślnie powiadomiono wszystkich użytkowników o tym temacie."
+            other: "Pomyślnie powiadomiono wszystkich użytkowników o tym temacie."
+        invite_users: "Zaproś"
       print:
         title: "Drukuj"
         help: "Otwórz widok wydruku dla tego tematu"
@@ -2543,14 +2723,14 @@ pl_PL:
         username_placeholder: "nazwa użytkownika"
         action: "Wyślij zaproszenie"
         help: "zaproś innych do tego tematu e-mailem lub powiadomieniem"
-        to_forum: "Wyślemy krótki email pozwalający twojemu znajomemu błyskawicznie dołączyć przez kliknięcie w link (bez logowania)."
-        sso_enabled: "Podaj nazwę użytkownika lub e-mail osoby którą chcesz zaprosić do tego tematu."
+        to_forum: "Wyślemy krótką wiadomość e-mail umożliwiającą znajomemu natychmiastowe dołączenie poprzez kliknięcie linku."
+        discourse_connect_enabled: "Wpisz nazwę użytkownika osoby, którą chcesz zaprosić do tego tematu."
         to_topic_blank: "Podaj nazwę użytkownika lub e-mail osoby którą chcesz zaprosić do tego tematu."
         to_topic_email: "Wprowadzony został adres e-mail. Wyślemy tam zaproszenie umożliwiające wskazanej osobie odpowiedź w tym temacie."
         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>%{invitee}</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."
@@ -2594,10 +2774,10 @@ pl_PL:
         radio_label: "Nowa wiadomość"
         participants: "Uczestnicy"
         instructions:
-          one: "Za chwilę utworzysz nowy wpis i zapełnisz go wybranym wpisem."
-          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 zapełnisz ją wybranymi <b>%{count}</b> wpisami."
+          one: "Za chwilę utworzysz nową wiadomość i wypełnisz ją wybranym postem."
+          few: "Za chwilę utworzysz nową wiadomość i wypełnisz ją wybranymi <b>%{count}</b> postami."
+          many: "Za chwilę utworzysz nową wiadomość i wypełnisz ją wybranymi <b>%{count}</b> postami."
+          other: "Za chwilę utworzysz nową wiadomość i wypełnisz ją wybranymi <b>%{count}</b> postami."
       move_to_existing_message:
         title: "Przejdź do istniejącej wiadomości"
         action: "przejdź do istniejącej wiadomości"
@@ -2605,9 +2785,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 <b>%{count}</b> wpisów."
+          few: "Wybierz wiadomość, do której chcesz przenieść te <b>%{count}</b> posty."
+          many: "Wybierz wiadomość, do której chcesz przenieść te <b>%{count}</b> postów."
+          other: "Wybierz wiadomość, do której chcesz przenieść te <b>%{count}</b> postów."
       merge_posts:
         title: "Scal wybrane wpisy"
         action: "scal wybrane wpisy"
@@ -2682,8 +2862,8 @@ pl_PL:
       edit_reason: "Powód"
       post_number: "wpis %{number}"
       ignored: "Zignorowana treść"
-      wiki_last_edited_on: "wiki ostatnio edytowane w"
-      last_edited_on: "ostatnia edycja wpisu"
+      wiki_last_edited_on: "wiki ostatnio edytowane %{dateTime}"
+      last_edited_on: "post ostatnio edytowany %{dateTime}"
       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}:"
@@ -2712,6 +2892,7 @@ pl_PL:
         few: "%{count} odpowiedzi"
         many: "%{count} odpowiedzi"
         other: "%{count} odpowiedzi"
+      has_replies_count: "%{count}"
       unknown_user: "(nieznany/usunięty użytkownik)"
       has_likes_title:
         one: "%{count} osoba lajkuje ten wpis"
@@ -2724,6 +2905,18 @@ pl_PL:
         few: "ty i %{count} inne osoby polubiły ten wpis"
         many: "ty i %{count} innych osób polubiło ten wpis"
         other: "ty i %{count} innych osób polubiło ten wpis"
+      filtered_replies_hint:
+        one: "Zobacz ten post i jego odpowiedź"
+        few: "Zobacz ten post i jego %{count} odpowiedzi"
+        many: "Zobacz ten post i jego %{count} odpowiedzi"
+        other: "Zobacz ten post i jego %{count} odpowiedzi"
+      filtered_replies_viewing:
+        one: "Przeglądanie %{count} odpowiedzi do"
+        few: "Przeglądanie %{count} odpowiedzi do"
+        many: "Przeglądanie %{count} odpowiedzi do"
+        other: "Przeglądanie %{count} odpowiedzi do"
+      in_reply_to: "Załaduj post nadrzędny"
+      view_all_posts: "Wyświetl wszystkie posty"
       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."
@@ -2739,17 +2932,11 @@ pl_PL:
         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."
-      abandon_edit:
-        confirm: "Na pewno chcesz odrzucić zmiany?"
-        no_value: "Nie, zatrzymaj"
-        no_save_draft: "Nie, zapisz szkic"
-        yes_value: "Tak, odrzuć zmiany"
-      abandon:
-        title: "Porzuć szkic"
-        confirm: "Czy na pewno chcesz porzucić ten wpis?"
-        no_value: "Nie, pozostaw"
-        no_save_draft: "Nie, zapisz szkic"
-        yes_value: "Tak, porzuć"
+      cancel_composer:
+        confirm: "Co chcesz zrobić ze swoim wpisem?"
+        discard: "Odrzuć"
+        save_draft: "Zapisz szkic na później"
+        keep_editing: "Kontynuuj edycję"
       via_email: "ten wpis został dodany emailem"
       via_auto_generated_email: "ten wpis został dodany poprzez automatycznie wygenerowaną wiadomość e-mail"
       whisper: "ten wpis jest prywatnym szeptem do moderatorów"
@@ -2780,10 +2967,10 @@ pl_PL:
             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 "
+            one: "Tak i %{count} odpowiedź"
+            few: "Tak i wszystkie %{count} odpowiedzi"
+            many: "Tak i wszystkie %{count} odpowiedzi"
+            other: "Tak i wszystkie %{count} odpowiedzi"
           just_the_post: "Nie, tylko ten wpis"
         admin: "administracja wpisem (tryb wiki itp)"
         wiki: "Włącz tryb Wiki"
@@ -2801,7 +2988,11 @@ pl_PL:
         unlock_post_description: "zezwól postującemu na edycję tego wpisu"
         delete_topic_disallowed_modal: "Nie masz uprawnień do usunięcia tego tematu. Jeśli naprawdę chcesz go usunąć, prześlij flagę do moderatora wraz z uzasadnieniem."
         delete_topic_disallowed: "nie masz uprawnień do usunięcia tego tematu"
-        delete_topic_confirm_modal: "Ten temat ma obecnie ponad %{minViews} wyświetleń i może być popularnym miejscem wyszukiwania. Czy na pewno chcesz całkowicie usunąć ten temat, zamiast edytować go w celu ulepszenia?"
+        delete_topic_confirm_modal:
+          one: "Ten temat ma obecnie ponad %{count} wyświetlenie i może być popularnym miejscem wyszukiwania. Czy na pewno chcesz całkowicie usunąć ten temat, zamiast edytować go w celu ulepszenia?"
+          few: "Ten temat ma obecnie ponad %{count} wyświetlenia i może być popularnym miejscem wyszukiwania. Czy na pewno chcesz całkowicie usunąć ten temat, zamiast edytować go w celu ulepszenia?"
+          many: "Ten temat ma obecnie ponad %{count} wyświetleń i może być popularnym miejscem wyszukiwania. Czy na pewno chcesz całkowicie usunąć ten temat, zamiast edytować go w celu ulepszenia?"
+          other: "Ten temat ma obecnie ponad %{count} wyświetleń i może być popularnym miejscem wyszukiwania. Czy na pewno chcesz całkowicie usunąć ten temat, zamiast edytować go w celu ulepszenia?"
         delete_topic_confirm_modal_yes: "Tak, usuń ten temat"
         delete_topic_confirm_modal_no: "Nie, zachowaj ten temat"
         delete_topic_error: "Wystąpił błąd podczas usuwania tego wątku"
@@ -2810,6 +3001,7 @@ pl_PL:
         change_post_notice: "Zmień wiadomość personelu"
         delete_post_notice: "Usuń wiadomość personelu"
         remove_timer: "usuń minutnik"
+        edit_timer: "edytuj licznik czasu"
       actions:
         people:
           like:
@@ -2842,14 +3034,14 @@ pl_PL:
         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} wpisów?"
+          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?"
+          few: "Czy na pewno chcesz połączyć te %{count} posty?"
           many: "Czy na pewno chcesz połączyć te %{count} postów?"
-          other: "Czy na pewno chcesz połączyć te %{count} wpisów?"
+          other: "Czy na pewno chcesz połączyć te %{count} postów?"
       revisions:
         controls:
           first: "Pierwsza wersja"
@@ -2898,6 +3090,18 @@ pl_PL:
           edit_bookmark:
             name: "Edytuj zakładkę"
             description: "Edytuj nazwę zakładki lub zmień datę i godzinę przypomnienia"
+          pin_bookmark:
+            name: "Przypnij zakładkę"
+            description: "Przypnij zakładkę. To sprawi, że pojawi się na górze listy zakładek."
+          unpin_bookmark:
+            name: "Odepnij zakładkę"
+            description: "Odepnij zakładkę. Nie pojawi się już na górze listy zakładek."
+      filtered_replies:
+        viewing_posts_by: "Przeglądanie %{post_count} postów autorstwa"
+        viewing_subset: "Niektóre odpowiedzi są zwinięte"
+        viewing_summary: "Przeglądanie podsumowania tego tematu"
+        post_number: "%{username}, post #%{post_number}"
+        show_all: "Pokaż wszystkie"
     category:
       can: "może&hellip; "
       none: "(brak kategorii)"
@@ -2938,7 +3142,7 @@ pl_PL:
       background_image: "Grafika z tłem kategorii"
       badge_colors: "Kolor Etykiety"
       background_color: "Kolor tła"
-      foreground_color: "Kolor Pierwszego Planu"
+      foreground_color: "Kolor pierwszego planu"
       name_placeholder: "Maksymalnie jedno lub dwa słowa"
       color_placeholder: "Dowolny kolor sieciowy"
       delete_confirm: "Czy na pewno chcesz usunąć tę kategorię?"
@@ -2955,14 +3159,14 @@ pl_PL:
         reply: "Odpowiedz"
         create: "Utwórz"
         no_groups_selected: "Żadnej grupie nie przyznano dostępu; ta kategoria będzie widoczna tylko dla personelu."
-        everyone_has_access: "Ta kategoria jest publiczna, każdy może wyświetlać, odpowiadać i tworzyć posty. Aby ograniczyć uprawnienia, usuń jedno lub więcej uprawnień przyznanych grupie \"wszyscy\"."
+        everyone_has_access: 'Ta kategoria jest publiczna, każdy może wyświetlać, odpowiadać i tworzyć posty. Aby ograniczyć uprawnienia, usuń jedno lub więcej uprawnień przyznanych grupie "wszyscy".'
         toggle_reply: "Przełącz uprawnienie do odpowiedzi"
         toggle_full: "Przełącz uprawnienie do tworzenia"
-        inherited: "To uprawnienie jest dziedziczone po \"wszystkich\""
+        inherited: 'To uprawnienie jest dziedziczone po "wszystkich"'
       special_warning: "Uwaga: Ta kategoria jest generowana automatycznie i jej ustawienia bezpieczeństwa nie mogą być edytowane. Jeśli nie zamierzasz jej używać, skasuj ją, zamiast zmieniać jej przeznaczenie."
       uncategorized_security_warning: "Ta kategoria ma specjalny charakter. Jest przeznaczona jako miejsce do przechowywania tematów nie przypisanych do żadnej kategorii i jako taka nie może mieć ustawień bezpieczeństwa."
       uncategorized_general_warning: 'Ta kategoria jest wyjątkowa. Jest używana jako domyślna kategoria dla nowych tematów, które nie mają wybranej kategorii. Jeśli chcesz zapobiec temu zachowaniu i wymusić wybór kategorii, <a href="%{settingLink}">wyłącz to ustawienie tutaj</a>. Jeśli chcesz zmienić nazwę lub opis, przejdź do <a href="%{customizeLink}">Dostosuj / Treść tekstowa</a>.'
-      pending_permission_change_alert: "Nie dodałeś %{group} do tej kategorii; kliknij ten przycisk, aby je dodać."
+      pending_permission_change_alert: "Nie dodałeś/łaś %{group} do tej kategorii; kliknij ten przycisk, aby je dodać."
       images: "Obrazy"
       email_in: "Dedykowany adres email kategorii:"
       email_in_allow_strangers: "Akceptuj wiadomości email od anonimowych, nieposiadających kont użytkowników "
@@ -2974,10 +3178,11 @@ pl_PL:
       num_featured_topics: "Liczba wątków do wyświetlenia na stronie kategorii:"
       subcategory_num_featured_topics: "Liczba wątków do wyświetlenia na stronie kategorii:"
       all_topics_wiki: "Twórz nowe tematy domyślnie jako wiki"
+      allow_unlimited_owner_edits_on_first_post: "Zezwalaj na nieograniczone edycje właściciela pierwszego postu"
       subcategory_list_style: "Styl listy podkategorii:"
       sort_order: "Sortuj listę wątków po:"
       default_view: "Domyślna lista wątków:"
-      default_top_period: "Domyślny okres wyświetlania najlepszych wpisów:"
+      default_top_period: "Domyślny okres wyświetlania najlepszych postów:"
       default_list_filter: "Domyślny filtr listy:"
       allow_badges_label: "Włącz przyznawanie odznak na podstawie aktywności w tej kategorii"
       edit_permissions: "Edytuj uprawnienia"
@@ -2997,19 +3202,19 @@ pl_PL:
       notifications:
         watching:
           title: "Obserwuj wszystko"
-          description: "Będziesz automatycznie śledzić wszystkie tematy w tych kategoriach. Będziesz otrzymywać powiadomienie o każdym nowym wpisie w każdym temacie, a liczba nowych wpisów będzie wyświetlana."
+          description: "Będziesz automatycznie obserwować wszystkie tematy w tej kategorii. Zostaniesz powiadomiony o każdym nowym poście w każdym wątku, a liczba nowych odpowiedzi zostanie wyświetlona."
         watching_first_post:
           title: "Oglądasz pierwszy wpis"
           description: "Zostaniesz poinformowany o nowych wiadomościach w tej kategorii, ale nie odpowiedziach do tematów."
         tracking:
           title: "Śledzona"
-          description: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach. Dostaniesz powiadomienie, gdy ktoś ci odpowie lub wspomni twoją @nazwę. Zobaczysz również liczbę odpowiedzi."
+          description: "Będziesz automatycznie śledzić wszystkie tematy w tej kategorii. Zostaniesz powiadomiony, jeśli ktoś wspomni o Twoim @pseudonimie lub odpowie w temacie, a liczba nowych odpowiedzi zostanie wyświetlona."
         regular:
           title: "Normalny"
           description: "Otrzymasz powiadomienie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis."
         muted:
           title: "Wyciszone"
-          description: "Nie otrzymasz powiadomień o nowych tematach w tych kategoriach. Nie pojawią się na liście nieprzeczytanych."
+          description: "Nigdy nie będziesz otrzymywać powiadomień o nowych tematach w tej kategorii i nie pojawią się one w zakładce najnowszych tematów."
       search_priority:
         label: "Priorytet wyszukiwania"
         options:
@@ -3044,6 +3249,7 @@ pl_PL:
       list_filters:
         all: "wszystkie tematy"
         none: "brak podkategorii"
+      colors_disabled: "Nie możesz wybrać kolorów, ponieważ nie masz stylu kategorii."
     flagging:
       title: "Dziękujemy za pomoc w utrzymaniu porządku w naszej społeczności!"
       action: "Oflaguj wpis"
@@ -3061,7 +3267,8 @@ pl_PL:
       notify_action: "Wiadomość"
       official_warning: "Oficjalne ostrzeżenie"
       delete_spammer: "Usuń spamera"
-      delete_confirm_MF: "Zamierzasz usunąć {POSTS, plural, one {<b>1</b> wpis} few {<b>#</b> wpisy} other {<b>#</b> wpisów}} i {TOPICS, plural, one {<b>1</b> temat} few {<b>#</b> tematy} other {<b>#</b> tematów}} użytkownika, usunąć jego konto, zablokować możliwość zakładania kont z jego adresu IP <b>{ip_address}</b> i dodać jego email <b>{email}</b> do listy trwale zablokowanych. Czy na pewno ten użytkownik jest spamerem?"
+      flag_for_review: "Kolejka do sprawdzenia"
+      delete_confirm_MF: "Zamierzasz usunąć {POSTS, plural, one {<b>#</b> wpis} few {<b>#</b> wpisy} other {<b>#</b> wpisów}} i {TOPICS, plural, one {<b>#</b> temat} few {<b>#</b> tematy} other {<b>#</b> tematów}} użytkownika, usunąć jego konto, zablokować możliwość zakładania kont z jego adresu IP <b>{ip_address}</b> i dodać jego email <b>{email}</b> do listy trwale zablokowanych. Czy na pewno ten użytkownik jest spamerem?"
       yes_delete_spammer: "Tak, usuń spamera"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(ukryto)"
@@ -3139,10 +3346,10 @@ pl_PL:
         help: "Ten temat jest wiadomością prywatną"
     posts: "Wpisy"
     posts_likes_MF: |
-      Ten temat ma {count, plural, one {1 odpowiedź} few {# odpowiedzi} many {# odpowiedzi} other {# odpowiedzi}} {ratio, select,
-        low {z wysokim współczynnikiem polubień postów}
-        med {z bardzo wysokim współczynnikiem polubień postów}
-        high {z ekstremalnie wysokim współczynnikiem polubień postów}
+      Ten temat ma {count, plural, one {# odpowiedź} few {# odpowiedzi} many {# odpowiedzi} other {# odpowiedzi}} {ratio, select,
+        low {z wysokim stosunkiem polubień na post}
+        med {z bardzo wysokim stosunkiem polubień na post}
+        high {z ekstremalnie wysokim stosunkiem polubień na post}
         other {}}
     original_post: "Oryginalny wpis"
     views: "Odsłony"
@@ -3171,7 +3378,6 @@ pl_PL:
       many: "użytkowników"
       other: "użytkowników"
     category_title: "Kategoria"
-    history: "Historia"
     changed_by: "przez %{author}"
     raw_email:
       title: "Email przychodzący"
@@ -3210,7 +3416,7 @@ pl_PL:
           other: "%{count} nieprzeczytanych"
       new:
         lower_title_with_count:
-          one: "%{count} nowa"
+          one: "%{count} nowy"
           few: "%{count} nowe"
           many: "%{count} nowych"
           other: "%{count} nowych"
@@ -3271,8 +3477,9 @@ pl_PL:
       close: "Zamknij (Esc)"
       content_load_error: '<a href="%url%">Zawartość</a> nie może zostać wczytana.'
       image_load_error: '<a href="%url%">Obraz</a> nie może zostać wczytany.'
+    cannot_render_video: Nie można wyrenderować tego wideo, ponieważ Twoja przeglądarka nie obsługuje tego kodeka.
     keyboard_shortcuts_help:
-      shortcut_key_delimiter_comma: ","
+      shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
       shortcut_delimiter_or: "%{shortcut1} lub %{shortcut2}"
       shortcut_delimiter_slash: "%{shortcut1}/%{shortcut2}"
@@ -3347,7 +3554,7 @@ pl_PL:
         mark_muted: "%{shortcut} Wycisz temat"
         mark_regular: "%{shortcut} Zwykły (domyślny) temat"
         mark_tracking: "%{shortcut} śledź temat"
-        mark_watching: "%{shortcut} Obserwuj wątek"
+        mark_watching: "%{shortcut} Obserwuj temat"
         print: "%{shortcut} Drukuj temat"
         defer: "%{shortcut} Odrocz wątek"
         topic_admin_actions: "%{shortcut} Otwórz działania administratora tematu"
@@ -3364,7 +3571,7 @@ pl_PL:
       granted_on: "Przyznano %{date}"
       others_count: "Inni użytkownicy z tą odznaką (%{count})"
       title: Odznaki
-      allow_title: "Możesz użyc tej odznaki jako tytułu"
+      allow_title: "Możesz użyć tej odznaki jako tytułu"
       multiple_grant: "Możesz zdobyć tą odznakę wiele razy"
       badge_count:
         one: "%{count} odznaka"
@@ -3463,6 +3670,7 @@ pl_PL:
         many: "%{tags} i %{count} więcej"
         other: "%{tags} i %{count} więcej"
       delete_no_unused_tags: "Nie ma nieużywanych tagów."
+      tag_list_joiner: ", "
       delete_unused: "Usuń nieużywane tagi"
       delete_unused_description: "Usuń wszystkie tagi, które nie są dołączone do żadnych wątków ani wiadomości."
       cancel_delete_unused: "Anuluj"
@@ -3507,8 +3715,8 @@ pl_PL:
         none:
           unread: "Nie masz nieprzeczytanych tematów."
           new: "Nie masz nowych tematów."
-          read: "Nie przeczytałeś jeszcze żadnych tematów."
-          posted: "Jeszcze nie zamieściłeś postów w żadnym z tematów."
+          read: "Nie przeczytałeś/łaś jeszcze żadnych tematów."
+          posted: "Jeszcze nie zamieściłeś/łaś postów w żadnym z tematów."
           latest: "Brak najnowszych tematów."
           bookmarks: "Nie posiadasz tematów dodanych do zakładek."
           top: "Brak najlepszych tematów."
@@ -3519,6 +3727,7 @@ pl_PL:
       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 !"
     forced_anonymous: "Ze względu na ekstremalne obciążenie jest to tymczasowo pokazywane wszystkim, tak jak zobaczy to gość."
+    forced_anonymous_login_required: "Witryna jest pod dużym obciążeniem i nie można jej załadować w tej chwili, spróbuj ponownie za kilka minut."
     footer_nav:
       back: "Poprzednia"
       forward: "Do przodu"
@@ -3527,6 +3736,17 @@ pl_PL:
     safe_mode:
       enabled: "Tryb bezpieczny jest włączony, aby z niego wyjść zamknij to okno przeglądrki"
     image_removed: "(obraz usunięty)"
+    do_not_disturb:
+      title: "Nie przeszkadzać przez..."
+      label: "Nie przeszkadzać"
+      remaining: "%{remaining} pozostało"
+      options:
+        half_hour: "30 minut"
+        one_hour: "1 godzina"
+        two_hours: "2 godziny"
+        tomorrow: "Do jutra"
+        custom: "Niestandardowe"
+      set_schedule: "Ustaw harmonogram powiadomień"
   admin_js:
     type_to_filter: "pisz, aby filtrować…"
     admin:
@@ -3540,25 +3760,29 @@ pl_PL:
       reports:
         title: "Lista dostępnych zgłoszeń"
       dashboard:
-        title: "Raporty"
-        last_updated: "Zaktualizowano panel kontrolny:"
-        discourse_last_updated: "Zaktualizowano Discourse:"
+        title: "Panel"
+        last_updated: "Panel zaktualizowany:"
+        discourse_last_updated: "Discourse zaktualizowane:"
         version: "Wersja"
-        up_to_date: "Wersja Aktualna!"
+        up_to_date: "Wersja aktualna!"
         critical_available: "Ważna aktualizacja jest dostępna."
         updates_available: "Aktualizacje są dostępne."
         please_upgrade: "Koniecznie zaktualizuj!"
-        no_check_performed: "Sprawdzanie dostępności aktualizacji nie jest wykonywane. Sprawdź działa czy sidekiq."
-        stale_data: "Sprawdzanie dostępności aktualizacji nie było ostatnio wykonywane. Sprawdź działa czy sidekiq."
-        version_check_pending: "Wygląda na to że ostatnio była wykonana aktualizacja. Fantastycznie!"
+        no_check_performed: "Sprawdzanie aktualizacji nie zostało przeprowadzone. Upewnij się, że sidekiq jest uruchomiony."
+        stale_data: "Sprawdzanie dostępności aktualizacji nie było ostatnio wykonywane. Sprawdź czy działa sidekiq."
+        version_check_pending: "Wygląda na to, że ostatnio była wykonana aktualizacja. Fantastycznie!"
         installed_version: "Zainstalowana"
         latest_version: "Najnowsza"
         problems_found: "Porada bazująca na twoich aktualnych ustawieniach"
+        new_features:
+          title: "\U0001F381 Nowe funkcje"
+          dismiss: "Odrzuć"
+          learn_more: "Dowiedz się więcej"
         last_checked: "Ostatnio sprawdzana"
         refresh_problems: "Odśwież"
         no_problems: "Nie znaleziono problemów."
         moderators: "Moderatorzy:"
-        admins: "Adminstratorzy:"
+        admins: "Administratorzy:"
         silenced: "Wyciszeni:"
         suspended: "Zawieszeni:"
         private_messages_short: "Wiad."
@@ -3592,7 +3816,7 @@ pl_PL:
         disabled: Wyłączony
         timeout_error: Przepraszamy, to wykonanie tego zapytania trwa za długo, wybierz proszę krótszy interwał
         exception_error: Przepraszamy, podczas wykonywania zapytania pojawił się błąd
-        too_many_requests: Wykonałeś tę akcję zbyt wiele razy. Poczekaj, zanim spróbujesz ponownie.
+        too_many_requests: Wykonałeś/łaś tę akcję zbyt wiele razy. Poczekaj, zanim spróbujesz ponownie.
         not_found_error: Przepraszamy, ten raport nie istnieje.
         filter_reports: Filtruj zgłoszenia
         reports:
@@ -3644,10 +3868,6 @@ pl_PL:
             available: "Nazwa grupy jest dostępna"
             not_available: "Nazwa grupy jest niedostępna"
             blank: "Nazwa grupy nie może być pusta"
-        bulk_add:
-          title: "Dodaj więcej do grupy"
-          complete_users_not_added: "Podani użytkownicy nie mogą zostać dodani (Sprawdź, czy stworzyli konto):"
-          paste: "Podaj listę nazw użytkowników lub adresów e-mail, każdy w oddzielnej linii:"
         add_members:
           as_owner: "Ustaw użytkownika/ów jako właściciel/i tej grupy"
         manage:
@@ -3674,7 +3894,11 @@ 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_user_count: "%{count} użytkowników ma nowe domeny e-mail i zostaną dodani do grupy."
+            automatic_membership_user_count:
+              one: "%{count} użytkownik ma nowe domeny e-mail i zostanie dodany do grupy."
+              few: "%{count} użytkowników ma nowe domeny e-mail i zostaną dodani do grupy."
+              many: "%{count} użytkowników ma nowe domeny e-mail i zostaną dodani do grupy."
+              other: "%{count} użytkowników ma nowe domeny e-mail i zostaną dodani do grupy."
             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"
@@ -3686,7 +3910,13 @@ pl_PL:
         group_members: "Członkowie grupy"
         delete: "Usuń"
         delete_confirm: "Usunąć tę grupę?"
+        delete_with_messages_confirm:
+          one: "Usunięcie tej grupy spowoduje, że %{count} wiadomość zostanie osierocona, a członkowie grupy nie będą już mieli do niej dostępu.<br><br>Jesteś pewien?"
+          few: "Usunięcie tej grupy spowoduje, że %{count} wiadomości zostanie osieroconych, a członkowie grupy nie będą już mieli do nich dostępu.<br><br>Jesteś pewien?"
+          many: "Usunięcie tej grupy spowoduje, że %{count} wiadomości zostanie osieroconych, a członkowie grupy nie będą już mieli do nich dostępu.<br><br>Jesteś pewien?"
+          other: "Usunięcie tej grupy spowoduje, że %{count} wiadomości zostanie osieroconych, a członkowie grupy nie będą już mieli do nich dostępu.<br><br>Jesteś pewien?"
         delete_failed: "Nie można usunąć grupy. Jeżeli jest to grupa automatyczna, nie może zostać zniszczona."
+        delete_automatic_group: To jest grupa automatyczna i nie można jej usunąć.
         delete_owner_confirm: "Usunąć status właściciela dla '%{username}'?"
         add: "Dodaj"
         custom: "Niestandardowe"
@@ -3696,9 +3926,9 @@ pl_PL:
         group_owners: Właściciele
         add_owners: Dodaj właścicieli
         none_selected: "Wybierz grupę, aby rozpocząć"
-        no_custom_groups: "Utwórz nową grupę"
+        no_custom_groups: "Utwórz nową niestandardową grupę"
       api:
-        generate_master: "Generuj Master API Key"
+        generate_master: "Generuj główny klucz API"
         none: "Nie ma teraz aktywnych kluczy API."
         user: "Użytkownik"
         title: "API"
@@ -3711,14 +3941,14 @@ pl_PL:
         undo_revoke: "Cofnij unieważnienie"
         revoke: "Unieważnij"
         all_users: "Wszyscy użytkownicy"
-        active_keys: "Aktywuj klucze API"
+        active_keys: "Aktywne klucze API"
         manage_keys: Zarządzaj kluczami
-        show_details: Detale
+        show_details: Szczegóły
         description: Opis
         no_description: (brak opisu)
         all_api_keys: Wszystkie klucze API
         user_mode: Poziom użytkownika
-        impersonate_all_users: Podszyj się pod dowolnego użytkownika
+        impersonate_all_users: Podszywanie się pod dowolnego użytkownika
         single_user: "Pojedynczy użytkownik"
         user_placeholder: Wprowadź nazwę użytkownika
         description_placeholder: Do czego będzie używany ten klucz?
@@ -3726,7 +3956,7 @@ pl_PL:
         new_key: Nowy klucz API
         revoked: Unieważniono
         delete: Usuń bezpowrotnie
-        not_shown_again: Ten klucz nie będzie ponownie wyświetlany. Upewnij się, że wykonałeś kopię, zanim przejdziesz dalej.
+        not_shown_again: Ten klucz nie będzie ponownie wyświetlany. Upewnij się, że wykonałeś/łaś kopię, zanim przejdziesz dalej.
         continue: Kontynuuj
         use_global_key: Klucz globalny (zezwala na wszystkie działania)
         scopes:
@@ -3748,14 +3978,18 @@ pl_PL:
               wordpress: Niezbędne do działania wtyczki wp-discourse na WordPress.
             users:
               bookmarks: Lista zakładek użytkownika. Zwraca przypomnienia o zakładkach podczas korzystania z formatu ICS.
-              sync_sso: Synchronizuj użytkownika za pomocą logowania SSO.
+              sync_sso: Zsynchronizuj użytkownika za pomocą DiscourseConnect.
               show: Uzyskaj informacje o użytkowniku.
               check_emails: Lista adresów e-mail użytkowników.
+              update: Zaktualizuj informacje o profilu użytkownika.
+              log_out: Wyloguj wszystkie sesje użytkownika.
+              anonymize: Anonimizuj konta użytkowników.
+              delete: Usuń konta użytkowników.
             email:
               receive_emails: Połącz ten zakres z odbiorcą poczty w celu przetwarzania przychodzących wiadomości e-mail.
       web_hooks:
-        title: "Webhooks"
-        none: "Brak webhooks"
+        title: "Webhooki"
+        none: "Brak webhooków"
         instruction: "Webhooks pozwala Discourse powiadomić zewnętrzne usługi, kiedy pewne zdarzenie pojawi się na twojej stronie. Gdy webhook jest uruchamiany, żądanie POST wyśle ​​do URL świadczonych."
         detailed_instruction: "Zapytanie POST zostanie wysłane na podany adres URL gdy zostanie spełnione wybrane wydarzenie"
         new: "Nowy webhook"
@@ -3767,12 +4001,12 @@ pl_PL:
         go_back: "Powrót do listy"
         payload_url: "Zawartość URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Wydaje próbujesz skonfigurować webhook do lokalnego URL. Wydarzenie dostarczone do lokalnego adresu może spowodować efekt uboczny lub nieoczekiwane zachowanie. Kontynuować?"
+        warn_local_payload_url: "Wygląda na to, że próbujesz skonfigurować webhook na lokalny adres URL. Event dostarczony na adres lokalny może spowodować efekt uboczny lub nieoczekiwane zachowanie. Kontynuować?"
         secret_invalid: "Sekret nie może zawierać pustych znaków."
         secret_too_short: "Sekret musi zawierać przynajmniej 12 znaków."
         secret_placeholder: "Opcjonalna fraza użyta do generowania podpisu"
         event_type_missing: "Musisz ustawić co najmniej jeden typ wydarzenia."
-        content_type: "Typ zawartości "
+        content_type: "Typ zawartości"
         secret: "Tajemnica"
         event_chooser: "Jakie zdarzenia powinny wywołać uruchomienie tego webhooka?"
         wildcard_event: "Wysyłaj mi wszystko."
@@ -3795,7 +4029,7 @@ pl_PL:
           details: "Kiedy pojawia się nowa odpowiedź, edytuj, usuń lub odzyskaj."
         user_event:
           name: "Wydarzenie użytkownika"
-          details: "Kiedy użytkownik się loguje, wylogowuje, jest tworzony, zatwierdzany lub aktualizowany."
+          details: "Gdy użytkownik się loguje, wylogowuje, potwierdza swój adres e-mail, jest utworzony, zatwierdzony lub zaktualizowany."
         group_event:
           name: "Zdarzenie grupowe"
           details: "Kiedy grupa jest tworzona, aktualizowana lub niszczona. "
@@ -3814,6 +4048,11 @@ pl_PL:
         user_badge_event:
           name: "Wydarzenie przyznania odznak"
           details: "Gdy użytkownik otrzymuje odznakę."
+        group_user_event:
+          name: "Grupowy event użytkownika"
+        like_event:
+          name: "Event polubienia postu"
+          details: "Gdy użytkownik polubi post."
         delivery_status:
           title: "Status dostarczenia"
           inactive: "Nieaktywny"
@@ -3914,7 +4153,7 @@ pl_PL:
           rollback:
             label: "Wycofaj"
             title: "Wycofaj bazę danych do poprzedniego poprawnego stanu"
-            confirm: "Czy jesteś pewien, że chcesz przywrócić bazę danych do ostatniej działającej wersji ?"
+            confirm: "Czy jesteś pewien, że chcesz przywrócić bazę danych do ostatniej działającej wersji?"
         location:
           local: "Lokalne miejsce"
           s3: "S3"
@@ -4006,7 +4245,9 @@ pl_PL:
           convert: "Konwertuj"
           convert_component_alert: "Czy na pewno chcesz konwertować ten składnik na motyw? Zostanie usunięty jako składnik z %{relatives}."
           convert_component_tooltip: "Konwertuj ten składnik na motyw"
+          convert_component_alert_generic: "Czy na pewno chcesz przekonwertować ten komponent na motyw?"
           convert_theme_alert: "Czy na pewno chcesz konwertować ten motyw na składnik. Zostanie usunięty jako rodzic z %{relatives}."
+          convert_theme_alert_generic: "Czy na pewno chcesz przekonwertować ten motyw na komponent?"
           convert_theme_tooltip: "Konwertuj ten motyw na składnik"
           inactive_themes: "Nieaktywne motywy:"
           inactive_components: "Nieużywane komponenty:"
@@ -4028,29 +4269,32 @@ pl_PL:
             must_be_unique: "Niepoprawna nazwa zmiennej. Musi być unikalna."
           upload: "Plik"
           select_component: "Wybierz składnik..."
-          unsaved_changes_alert: "Nie zapisałeś jeszcze zmian, czy chcesz je odrzucić i przejść dalej?"
-          unsaved_parent_themes: "Nie przypisałeś komponentu do motywów, czy chcesz przejść dalej?"
+          unsaved_changes_alert: "Nie zapisałeś/łaś jeszcze zmian, czy chcesz je odrzucić i przejść dalej?"
+          unsaved_parent_themes: "Nie przypisałeś/łaś komponentu do motywów, czy chcesz przejść dalej?"
           discard: "Odrzuć"
           stay: "Zostań"
           css_html: "Własny CSS/HTML"
           edit_css_html: "Edytuj CSS/HTML"
-          edit_css_html_help: "Nie modyfikowałeś CSS ani HTML"
+          edit_css_html_help: "Nie modyfikowałeś/łaś CSS ani HTML"
           delete_upload_confirm: "Czy usunąć ten plik? (CSS motywu może przestać działać!)"
           component_on_themes: "Dołącz komponent do tych motywów"
           included_components: "Dołączone komponenty"
           add_all: "Dodaj wszystkie"
           import_web_tip: "Repozytorium zawierające motyw"
+          direct_install_tip: "Czy na pewno chcesz zainstalować <strong>%{name}</strong> z repozytorium wymienionego poniżej?"
           import_web_advanced: "Zaawansowane..."
           import_file_tip: "plik .tar.gz, .zip, lub .dcstyle.json zawierający motyw"
           is_private: "Motyw jest w prywatnym repozytorium git"
           remote_branch: "Nazwa oddziału (opcjonalnie)"
           public_key: "Podaj następujący klucz publiczny pozwalający na dostęp do repozytorium:"
+          public_key_note: "Po wprowadzeniu powyżej poprawnego adresu URL prywatnego repozytorium klucz SSH zostanie wygenerowany i wyświetlony tutaj."
           install: "Zainstaluj"
           installed: "Zainstalowana"
           install_popular: "Popularne"
           install_upload: "Z twojego urządzenia"
           install_git_repo: "Z repozytorium git"
           install_create: "Stwórz nowy"
+          duplicate_remote_theme: "Komponent motywu ”%{name}” jest już zainstalowany. Czy na pewno chcesz zainstalować inną kopię?"
           about_theme: "O stronie"
           license: "Licencja"
           version: "Wersja:"
@@ -4066,13 +4310,13 @@ pl_PL:
             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"
+          update_to_latest: "Zaktualizuj do najnowszej wersji"
           check_for_updates: "Sprawdź dostępność aktualizacji"
           updating: "Trwa proces aktualizacji..."
           up_to_date: "Motyw jest aktualny. Ostatnio sprawdzano:"
           has_overwritten_history: "Bieżąca wersja motywu już nie istnieje, ponieważ historia Git została nadpisana przez wymuszony push."
           add: "Dodaj"
-          theme_settings: "Ustawienia tematu"
+          theme_settings: "Ustawienia motywu"
           no_settings: "Ten temat nie ma żanych ustawień"
           theme_translations: "Tłumaczenia tematu"
           empty: "Brak elementu"
@@ -4082,6 +4326,7 @@ pl_PL:
             many: "Motyw jest %{count} aktualizacji w tyle!"
             other: "Motyw jest %{count} aktualizacji w tyle!"
           compare_commits: "(Sprawdź nowe commity)"
+          remote_theme_edits: "Jeśli chcesz edytować ten motyw, musisz <a href='%{repoURL}' target='_blank'>przesłać zmianę w jego repozytorium</a>"
           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"
           scss:
@@ -4104,15 +4349,13 @@ pl_PL:
             title: "Określ własne kolory (tylko dla zaawansowanych użytkowników)"
             placeholder: |2-
 
-              Użyj tego arkusza stylów, aby dodać kolory do listy niestandardowych właściwości CSS.
+              Użyj tego arkusza stylów, aby dodać własne kolory do listy niestandardowych właściwości CSS.
 
-              Na przykład:
+              Przykład:
 
-              :root {
-              --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};
-              }
+              %{example}
 
-              Zdecydowanie zaleca się dodawanie przedrostków do nazw właściwości, aby uniknąć konfliktów z zainstalowanymi wtyczkami lub silnikiem forum.
+              Zdecydowanie zalecamy dodawanie przedrostków do nazw zmiennych, aby uniknąć konfliktów z wtyczkami i/lub silnikiem forum.
           head_tag:
             text: "</head>"
             title: "HTML, który zostanie umieszczony przed tagiem </head>"
@@ -4182,8 +4425,8 @@ pl_PL:
           warning: "To ustawienie permanentnie nadpisze wszystkie powiązane ustawienia witryny."
           overridden: Domyślny plik robots.txt twojej witryny został nadpisany
         email_style:
-          title: "Styl e-maili"
-          heading: "Zmień styl e-maili"
+          title: "Styl wiadomości e-mail"
+          heading: "Dostosuj styl wiadomości e-mail"
           html: "Szablon HTML"
           css: "CSS"
           reset: "Przywróć ustawienia domyślne"
@@ -4204,7 +4447,7 @@ pl_PL:
           elided: "Pominięty tekst"
         sending_test: "Wysyłanie testowego emaila…"
         error: "<b>BŁAD</b> - %{server_error}"
-        test_error: "Wystąpił problem podczas wysyłania testowego maila. Sprawdź ustawienia poczty, sprawdź czy Twój serwer nie blokuje połączeń pocztowych i spróbuj ponownie."
+        test_error: "Wystąpił problem podczas wysyłania testowego e-maila. Sprawdź ustawienia poczty, upewnij się czy Twój serwer nie blokuje połączeń pocztowych i spróbuj ponownie."
         sent: "Wysłane"
         skipped: "Pominięte"
         bounced: "Odbite"
@@ -4235,12 +4478,12 @@ pl_PL:
         incoming_emails:
           from_address: "Od"
           to_addresses: "Do"
-          cc_addresses: "Cc"
+          cc_addresses: "DW"
           subject: "Temat"
           error: "Błąd"
-          none: "Brak przychodzących emaili."
+          none: "Nie znaleziono przychodzących wiadomości e-mail."
           modal:
-            title: "Szczegóły przychodzącego emaila"
+            title: "Szczegóły przychodzącej wiadomości e-mail"
             error: "Błąd"
             headers: "Nagłówki"
             subject: "Temat"
@@ -4284,11 +4527,11 @@ pl_PL:
         edit: "Edytuj"
         save: "Zapisz"
         screened_actions:
-          block: "blok"
+          block: "zablokuj"
           do_nothing: "nic nie rób"
         staff_actions:
           all: "wszystkie"
-          filter: "Filtruj:"
+          filter: "Filtr:"
           title: "Działania zespołu zarządzającego"
           clear_filters: "Pokaż wszystko"
           staff_user: "Użytkownik"
@@ -4346,8 +4589,8 @@ pl_PL:
             activate_user: "aktywuj użytkownika "
             deactivate_user: "deaktywuj użytkownika"
             change_readonly_mode: "Zmień tryb tylko do otczytu"
-            backup_download: "Pobierz kopię zapasową"
-            backup_destroy: "Zniszcz kopię zapasową "
+            backup_download: "pobierz kopię zapasową"
+            backup_destroy: "zniszcz kopię zapasową"
             reviewed_post: "przejrzane posty"
             custom_staff: "spersonalizowana akcja wtyczki"
             post_locked: "wpis zablokowany"
@@ -4393,12 +4636,13 @@ pl_PL:
             topic_unarchived: "temat niezarchiwizowany"
             post_staff_note_create: "dodaj notatkę personelu"
             post_staff_note_destroy: "zniszcz notatkę personelu"
+            delete_group: "usuń grupę"
         screened_emails:
           title: "Ekranowane emaile"
           description: "Kiedy ktoś próbuje założyć nowe konto, jego adres email zostaje sprawdzony i rejestracja zostaje zablokowana, lub inna akcja jest podejmowana."
           email: "Adres email"
           actions:
-            allow: "Zezwalaj"
+            allow: "Zezwól"
         screened_urls:
           title: "Ekranowane URLe"
           description: "URLe wypisane tutaj były używane we wpisach przez użytkowników wykrytych jako spamerzy."
@@ -4440,33 +4684,35 @@ pl_PL:
         title: "Obserwowane słowa"
         search: "szukaj"
         clear_filter: "Wyczyść"
-        show_words: "pokaż słowa"
-        one_word_per_line: "Jedno słowo w wierszu"
+        show_words:
+          one: "pokaż %{count} słowo"
+          few: "pokaż %{count} słowa"
+          many: "pokaż %{count} słów"
+          other: "pokaż %{count} słów"
         download: Pobierz
         clear_all: Wyczyść wszystko
-        clear_all_confirm_block: "Czy na pewno chcesz wyczyścić wszystkie obserwowane słowa dla akcji Blokuj?"
-        clear_all_confirm_censor: "Czy na pewno chcesz wyczyścić wszystkie obserwowane słowa dla akcji Cenzuruj?"
-        clear_all_confirm_flag: "Czy na pewno chcesz usunąć wszystkie słowa używane do oceniania wiadomości oznaczonych jako nieodpowiednie?"
-        clear_all_confirm_require_approval: "Czy na pewno chcesz usunąć wszystkie słowa używane podczas oceny postów wymagających zatwierdzenia?"
-        word_count:
-          one: "%{count} słowo"
-          few: "%{count} słówa"
-          many: "%{count} słów"
-          other: "%{count} słów"
+        clear_all_confirm: "Czy na pewno chcesz wyczyścić wszystkie obejrzane słowa dla akcji %{action}?"
         actions:
           block: "Zablokuj"
           censor: "Cenzuruj"
           require_approval: "Wymaga zatwierdzenia"
           flag: "Oflaguj"
+          replace: "Zamień"
+          tag: "Tag"
         action_descriptions:
           block: "Zapobiegaj publikacji postów zawierających te słowa. Użytkownicy zobaczą błąd próbując wysłać taki wpis."
           censor: "Zezwalaj na wysyłanie wpisów zawierających te słowa, ale zamień na znaki ukrywające ocenzurowane słowa."
           require_approval: "Wpisy zawierające te słowa będą wymagały zatwierdzenia przez członka zespołu zarządzającego zanim zostaną opublikowane."
           flag: "Zezwalaj na publikację takich wpisów, ale oflaguj je jako nieodpowiednie, aby moderatorzy mogli przejrzeć ich zawartość."
+          replace: "Zastąp słowa w postach innymi słowami lub linkami"
         form:
-          label: "Nowe słowo:"
-          placeholder: "pełne słowo lub jako dzika karta"
+          label: "Zawiera słowo lub frazę"
+          placeholder: "Wpisz słowo lub frazę (* to symbol wieloznaczny)"
           placeholder_regexp: "wyrażenie regularne"
+          replacement_label: "Zastąpienie"
+          replacement_placeholder: "example lub https://example.com"
+          tag_label: "Tag"
+          tag_placeholder: "tag1,tag2,tag3"
           add: "Dodaj"
           success: "Sukces"
           exists: "Już istnieje"
@@ -4479,18 +4725,18 @@ pl_PL:
           found_matches: "Znalezione wyniki:"
           no_matches: "Nie znaleziono dopasowań"
       impersonate:
-        title: "Zaloguj się na to konto"
-        help: "Użyj tego narzędzia, aby logować się jako dowolny użytkownik w celach diagnozy problemów."
+        title: "Podszywaj się"
+        help: "Użyj tego narzędzia, aby podszywać się pod konto użytkownika do celów debugowania. Będziesz musiał się wylogować po zakończeniu."
         not_found: "Wskazany użytkownik nie został znaleziony."
         invalid: "Przepraszamy, nie możesz zalogować się jako ten użytkownik."
       users:
         title: "Użytkownicy"
         create: "Dodaj Administratora"
-        last_emailed: "Ostatnio wysłano email"
-        not_found: "Przepraszamu, taka nazwa użytkowanika nie istnieje w naszym systemie."
+        last_emailed: "Ostatni e-mail"
+        not_found: "Przepraszamy, taka nazwa użytkownika nie istnieje w naszym systemie."
         id_not_found: "Przepraszamy, ten identyfikator użytkownika nie istnieje w naszym systemie."
         active: "Aktywowane"
-        show_emails: "Pokaż emaile"
+        show_emails: "Pokaż e-maile"
         hide_emails: "Ukryj e-maile"
         nav:
           new: "Nowi"
@@ -4498,8 +4744,8 @@ pl_PL:
           staff: "Zespół"
           suspended: "Zawieszeni"
           silenced: "Wyciszony"
-          staged: "Wystawiany na scenie"
-        approved: "Zatwierdzam?"
+          staged: "Etapowi"
+        approved: "Zatwierdzony?"
         titles:
           active: "Aktywni użytkownicy"
           new: "Nowi użytkownicy"
@@ -4511,14 +4757,17 @@ pl_PL:
           leader: "Użytkownicy na 4 poziomie zaufania (Weterani)"
           staff: "Zespół"
           admins: "Administratorzy"
-          moderators: "Moderatoratorzy"
+          moderators: "Moderatorzy"
           silenced: "Wyciszeni użytkownicy"
-          suspended: "Zawieszone konta"
-          staged: "Wystawieni użytkownicy"
+          suspended: "Zawieszeni użytkownicy"
+          staged: "Użytkownicy etapowi"
         not_verified: "Niezweryfikowany"
         check_email:
           title: "Wyświetl adres email tego użytkownika"
           text: "Pokaż"
+        check_sso:
+          title: "Reveal SSO payload"
+          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}"
@@ -4559,23 +4808,23 @@ pl_PL:
         clear_penalty_history:
           title: "Wyczyść Historię Przewinień"
           description: "użytkownicy z karami nie mogą otrzymać TL3"
-        delete_all_posts_confirm_MF: "Zamierzasz usunąć {POSTS, plural, one {1 post} few {# wpisy} many {# postów} other {# wpisów}} i {TOPICS, plural, one {1 temat} few {# tematy} many {# tematów} other {# tematów}}. Czy jesteś pewien?"
+        delete_all_posts_confirm_MF: "Zamierzasz usunąć {POSTS, plural, one {# post} few {# posty} many {# postów} other {# postów}} i {TOPICS, plural, one {# temat} few {# tematy} many {# tematów} other {# tematów}}. Jesteś pewien?"
         silence: "Wycisz"
         unsilence: "Cofnij wyciszenie"
         silenced: "Wyciszony?"
         moderator: "Moderator?"
-        admin: "Admin?"
+        admin: "Administrator?"
         suspended: "Zawieszony?"
-        staged: "Wystawiony?"
-        show_admin_profile: "Admin"
+        staged: "Etapowy?"
+        show_admin_profile: "Administrator"
         show_public_profile: "Pokaż profil publiczny"
-        impersonate: "Zaloguj się na to konto"
+        impersonate: "Podszywaj się"
         action_logs: "Logi akcji"
         ip_lookup: "Wyszukiwanie IP"
         log_out: "Wyloguj"
         logged_out: "Użytkownik został wylogowany na wszystkich urządzeniach."
-        revoke_admin: "Odbierz status admina"
-        grant_admin: "Przyznaj status admina"
+        revoke_admin: "Odbierz status administratora"
+        grant_admin: "Przyznaj status administratora"
         grant_admin_confirm: "Wysłaliśmy adres email, aby zweryfikować nowego administratora. Zapoznaj się z instrukcjami w nim zawartymi."
         revoke_moderation: "Odbierz status moderatora"
         grant_moderation: "Przyznaj status moderatora"
@@ -4603,11 +4852,14 @@ pl_PL:
         approve_success: "Użytkownik zatwierdzony i został wysłany email z instrukcjami aktywacji."
         approve_bulk_success: "Sukces! Wszyscy wybrani użytkownicy zostali zatwierdzeni i powiadomieni."
         time_read: "Czas czytania"
-        anonymize: "Anonimizacja użytkownika"
-        anonymize_confirm: "Czy na pewno chcesz anonimizować to konto? Zmianie ulegnie nazwa użytkownika, e-mail oraz zawartość profilu."
-        anonymize_yes: "Tak, anonimizuj to konto."
-        anonymize_failed: "Wystąpił problem podczas anonimizacji konta."
+        anonymize: "Anonimizuj użytkownika"
+        anonymize_confirm: "Jesteś pewien, że chcesz anonimizować to konto? Spowoduje to zmianę nazwy użytkownika i adresu e-mail oraz zresetowanie wszystkich informacji o profilu."
+        anonymize_yes: "Tak, anonimizuj to konto"
+        anonymize_failed: "Wystąpił problem z anonimizacją konta."
         delete: "Usuń użytkownika"
+        delete_posts:
+          progress:
+            title: "Postęp usuwania postów"
         merge:
           button: "Połącz"
           prompt:
@@ -4615,10 +4867,12 @@ pl_PL:
             description: |
               <p>Wybierz nowego właściciela treści <b>@%{username}</b> .</p>
 
-              <p>Wszystkie tematy, posty, wiadomości i inne treści utworzone przez <b>@%{username}</b> zostaną przeniesione.</p>
+              <p>Wszystkie tematy, wpisy, wiadomości i inne treści utworzone przez <b>@%{username}</b> zostaną przeniesione.</p>
             target_username_placeholder: "Nazwa nowego właściciela"
             transfer_and_delete: "Przenieś i usuń @%{username}"
             cancel: "Anuluj"
+          progress:
+            title: "Scal postęp"
           confirmation:
             title: "Przenieś i usuń @%{username}"
             description: |
@@ -4664,7 +4918,7 @@ pl_PL:
         deactivate_failed: "Wystąpił problem przy deaktywacji konta użytkownika."
         unsilence_failed: "Wystąpił problem podczas odblokowywania wyciszenia użytkownika."
         silence_failed: "Wystąpił problem podczas wyciszania użytkownika."
-        silence_confirm: "Czy na pewno chcesz wyciszyć tego użytkownika? Nie będzie mógł tworzyć nowych tematów ani postów."
+        silence_confirm: "Czy na pewno chcesz wyciszyć tego użytkownika? Nie będzie mógł/mogła tworzyć nowych tematów ani postów."
         silence_accept: "Tak, ucisz tego użytkownika"
         bounce_score: "Wskaźnik odbić"
         reset_bounce_score:
@@ -4679,7 +4933,7 @@ pl_PL:
           none: "Z tego adresu email nie otrzymano ostatnio żadnych wiadomości zwrotnych."
           some: "Z tego adresu email zostały ostatnio otrzymane wiadomości zwrotne."
           threshold_reached: "Otrzymano zbyt wiele wiadomości zwrotnych z tego adresu email."
-        trust_level_change_failed: "Wystąpił problem przy zmianie poziomu zaufania użytkowanika."
+        trust_level_change_failed: "Wystąpił problem podczas zmiany poziomu zaufania użytkownika."
         suspend_modal_title: "Zawieś użytkownika"
         confirm_cancel_penalty: "Na pewno chcesz odrzucić listę przewinień?"
         trust_level_2_users: "Użytkownicy o 2. poziomie zaufania"
@@ -4719,16 +4973,16 @@ pl_PL:
           on_grace_period: "Podlega pod okres ochronny, nie zostanie zdegradowany."
           locked_will_not_be_promoted: "Zablokowany poziom zaufania. Nie będzie awansować."
           locked_will_not_be_demoted: "Zablokowany poziom zaufania. Nie będzie degradowany."
-        sso:
-          title: "Single Sign On"
+        discourse_connect:
+          title: "Logowanie jednokrotne DiscourseConnect"
           external_id: "Zewnętrzny ID"
           external_username: "Nazwa użytkownika"
           external_name: "Nazwa"
           external_email: "Email"
-          external_avatar_url: "URL awatara"
+          external_avatar_url: "Adres URL zdjęcia profilowego"
           last_payload: "Ostatni ładunek"
           delete_sso_record: "Usuń rekord SSO"
-          confirm_delete: "Czy na pewno chcesz usunąć ten rekord jednokrotnego logowania (SSO)?"
+          confirm_delete: "Czy na pewno chcesz usunąć ten rekord DiscourseConnect?"
       user_fields:
         title: "Pola użytkownika"
         help: "Dodaj pola które użytkownicy mogą wypełnić."
@@ -4741,7 +4995,7 @@ pl_PL:
         edit: "Edycja"
         delete: "Usuń"
         cancel: "Anuluj"
-        delete_confirm: "Czy na pewno chcesz usunąć to pole?"
+        delete_confirm: "Czy na pewno chcesz usunąć to pole użytkownika?"
         options: "Opcje"
         required:
           title: "Wymagane przy rejestracji?"
@@ -4759,6 +5013,10 @@ pl_PL:
           title: "Pokaż na karcie użytkownika?"
           enabled: "wyświetlane na karcie użytkownika"
           disabled: "nie pokazany na karcie użytkownika"
+        searchable:
+          title: "Możliwe do wyszukania?"
+          enabled: "możliwe do wyszukania"
+          disabled: "nie można wyszukiwać"
         field_types:
           text: "Pole tekstowe"
           confirm: "Potwierdzenie"
@@ -4773,6 +5031,8 @@ pl_PL:
         go_back: "Wróć do wyszukiwania"
         recommended: "Zalecamy zmianę poniższego tekstu, aby lepiej odpowiadał Twoim potrzebom:"
         show_overriden: "Pokaż tylko nadpisane"
+        locale: "Język:"
+        fallback_locale_warning: "Edytujesz język oparty na %{fallback}. Użytkownicy, którzy wybiorą %{fallback} jako język interfejsu, nie zobaczą Twoich zmian."
         more_than_50_results: "Istnieje ponad 50 wyników. Zawęź wyszukiwanie."
       settings:
         show_overriden: "Pokaż tylko nadpisane"
@@ -4780,6 +5040,10 @@ pl_PL:
         reset: "przywróć domyślne"
         none: "żadne"
       site_settings:
+        emoji_list:
+          invalid_input: "Lista emoji powinna zawierać tylko poprawne nazwy emoji, np. hugs"
+          add_emoji_button:
+            label: "Dodaj emoji"
         title: "Ustawienia"
         no_results: "Brak wyników wyszukiwania"
         more_than_30_results: "Istnieje ponad 30 wyników. Zawęź wyszukiwanie lub wybierz kategorię."
@@ -4789,10 +5053,10 @@ pl_PL:
         add_group: "dodaj grupę"
         uploaded_image_list:
           label: "Edytuj listę"
-          empty: "Brak zdjęć. Prześlij jedno."
+          empty: "Nie ma jeszcze zdjęć. Proszę jakieś przesłać."
           upload:
             label: "Prześlij"
-            title: "Prześlij obrazek"
+            title: "Prześlij obraz(y)"
         selectable_avatars:
           title: "Lista awatarów, z których użytkownicy mogą wybierać"
         categories:
@@ -4823,7 +5087,7 @@ pl_PL:
           tags: "Tagi"
           search: "Wyszukaj"
           groups: "Grupy"
-          dashboard: "Raporty"
+          dashboard: "Panel"
         secret_list:
           invalid_input: "Pola tekstowe nie mogą być puste ani zawierać znaku pionowej kreski."
         default_categories:
@@ -4832,6 +5096,9 @@ pl_PL:
           modal_no: "Nie, wprowadź zmianę odtąd, na przyszłość"
         simple_list:
           add_item: "Dodaj element..."
+        json_schema:
+          edit: Uruchom edytor
+          modal_title: "Edytuj %{name}"
       badges:
         title: Odznaki
         new_badge: Nowa odznaka
@@ -4868,8 +5135,12 @@ pl_PL:
         enabled: Włącz odznakę
         icon: Ikona
         image: Grafika
+        graphic: Grafika
         icon_help: "Wprowadź nazwę ikony Font Awesome (użyj prefiksu \"far-\" dla zwykłych ikon i \"fab-\" dla ikon marek)"
-        image_help: "Wprowadź adres URL obrazu (zastępuje pole ikony, jeśli oba są ustawione)"
+        image_help: "Przesyłanie obrazu zastępuje pole ikony, jeśli oba są ustawione."
+        select_an_icon: "Wybierz ikonę"
+        upload_an_image: "Prześlij obrazek"
+        read_only_setting_help: "Dostosuj tekst"
         query: Zapytanie odznaki (SQL)
         target_posts: Wpisy powiązane z odznaką
         auto_revoke: Codziennie uruchamiaj zapytanie odbierające odznakę
@@ -4919,14 +5190,14 @@ pl_PL:
           replace_owners: Usuń odznakę od poprzednich właścicieli
       emoji:
         title: "Emoji"
-        help: "Dodawanie nowych emoji. (PROTIP: przeciągnij i upuść wiele plików)"
+        help: "Dodaj nowe emoji. (PROTIP: przeciągnij i upuść kilka plików na raz)"
         add: "Dodaj nowe Emoji"
         uploading: "Przesyłanie…"
         name: "Nazwa"
         group: "Grupa"
         image: "Grafika"
         alt: "podgląd niestandardowego emoji"
-        delete_confirm: "Jesteś pewny(-a), że chcesz usunąć emoji :%{name}: ?"
+        delete_confirm: "Jesteś pewny(-a), że chcesz usunąć emoji :%{name}:?"
       embedding:
         get_started: "Jeśli chcesz osadzić Discourse na innej stronie, rozpocznij podając jej host."
         confirm_delete: "Czy na pewno chcesz usunąć ten host?"
@@ -4997,7 +5268,7 @@ pl_PL:
         other: "W twojej społeczności jest %{count}członków zespołu, w tym Ty."
       invites:
         add_user: "dodaj"
-        none_added: "Nie zaprosiłeś nikogo. Czy na pewno chcesz kontynuować?"
+        none_added: "Nie zaprosiłeś/łaś nikogo. Czy na pewno chcesz kontynuować?"
         roles:
           admin: "Administratorzy"
           moderator: "Moderatorzy"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 9f6f213ade..5ed55a7d1d 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -96,6 +96,12 @@ pt:
         x_days:
           one: "%{count} dia atrás"
           other: "%{count} dias atrás"
+        x_months:
+          one: "%{count} mês atrás"
+          other: "%{count} meses atrás"
+        x_years:
+          one: "%{count} ano atrás"
+          other: "%{count} anos atrás"
       later:
         x_days:
           one: "%{count} dia mais tarde"
@@ -107,7 +113,7 @@ pt:
           one: "%{count} ano mais tarde"
           other: "%{count} anos mais tarde"
       previous_month: "Mês Anterior"
-      next_month: "Mês Seguinte"
+      next_month: "Próximo Mês"
       placeholder: data
     share:
       topic_html: 'Tópico: <span class="topic-title">%{topicTitle}</span>'
@@ -152,6 +158,11 @@ pt:
     topic_admin_menu: "ações do tópico"
     wizard_required: "Bem-vindo ao seu novo Discourse! Vamos começar com <a href='%{url}' data-auto-route='true'>o assistente de configuração</a> ✨"
     emails_are_disabled: "Todos os envios de e-mail foram globalmente desativados por um administrador. Nenhum e-mail de notificação será enviado."
+    software_update_prompt:
+      dismiss: "Marcar como visto"
+    bootstrap_mode_enabled:
+      one: "Para que o início do teu Site seja o mais simples possível, estás agora em modo de inicialização simples. A todos os novos utilizadores será concedido o Nível de Confiança 1 e o resumo por e-mail enviado diariamente estará ativado. Isto será automaticamente desligado quando %{count} utilizador se tiver juntado ao fórum."
+      other: "Para que o início do teu Site seja o mais simples possível, estás agora em modo de inicialização simples. A todos os novos utilizadores será concedido o Nível de Confiança 1 e o resumo por e-mail enviado diariamente estará ativado. Isto será automaticamente desligado quando %{count} utilizadores se tiverem juntado ao fórum."
     bootstrap_mode_disabled: "O modo de inicialização simples será desactivado em 24 horas."
     themes:
       default_description: "Predefinição"
@@ -178,6 +189,7 @@ pt:
         us_gov_west_1: "AWS GovCloud (Oeste dos EUA)"
         us_west_1: "Oeste dos E.U.A. (California do Norte)"
         us_west_2: "Oeste dos E.U.A. (Óregon)"
+    clear_input: "Limpar entrada"
     edit: "editar o título e a categoria deste tópico"
     expand: "Expandir"
     not_implemented: "Essa funcionalidade ainda não foi implementada, pedimos desculpa!"
@@ -212,6 +224,9 @@ pt:
     now: "ainda agora"
     read_more: "ler mais"
     more: "Mais"
+    x_more:
+      one: "%{count} Mais"
+      other: "%{count} Mais"
     less: "Menos"
     never: "nunca"
     every_30_minutes: "a cada 30 minutos"
@@ -240,8 +255,6 @@ pt:
       moderators: "Moderadores"
       stat:
         all_time: "Sempre"
-        last_7_days: "Últimos 7 Dias"
-        last_30_days: "Últimos 30 Dias"
       like_count: "Gostos"
       topic_count: "Tópicos"
       post_count: "Publicações"
@@ -277,18 +290,6 @@ pt:
       search_placeholder: "Pesquise favoritos por nome, título do tópico ou conteúdo do post"
       search: "Pesquisar"
       reminders:
-        later_today: "Hoje, mais tarde"
-        next_business_day: "Próximo dia útil"
-        tomorrow: "Amanhã"
-        next_week: "Próxima semana"
-        post_local_date: "Data no post"
-        later_this_week: "No final desta semana"
-        start_of_next_business_week: "Segunda-feira"
-        start_of_next_business_week_alt: "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: "às %{date_time}"
@@ -303,9 +304,9 @@ pt:
       new_private_message: "Novo rascunho de mensagem privada"
       topic_reply: "Rascunho da resposta"
       abandon:
-        confirm: "Já abriu outro rascunho neste tópico. Tem a certeza que o pretende eliminar?"
-        yes_value: "Sim, abandonar"
-        no_value: "Não, manter"
+        confirm: "Tem um rascunho em andamento neste tópico. O que gostaria de fazer com ele?"
+        yes_value: "Descartar"
+        no_value: "Retomar a edição"
     topic_count_latest:
       one: "Ver %{count} tópico novo ou atualizado"
       other: "Ver %{count} tópicos novos ou atualizados"
@@ -400,27 +401,67 @@ pt:
         other: "Este tópico tem <b>%{count}</b> posts com aprovação pendente"
       title: "Revisão"
       topic: "Tópico:"
+      filtered_topic: "Filtrou para conteúdo revisável num único tópico."
       filtered_user: "Utilizador"
+      filtered_reviewed_by: "Revisto por"
+      show_all_topics: "mostrar todos os tópicos"
+      deleted_post: "(publicação eliminada)"
+      deleted_user: "(usuário eliminado)"
       user:
+        bio: "Biografia"
+        website: "site"
         username: "Nome de utilizador"
         email: "E-mail"
         name: "Nome"
+        fields: "campos"
+        reject_reason: "Motivo"
+      user_percentage:
+        summary:
+          one: "%{agreed}, %{disagreed}, %{ignored} (da última sinalização)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (das últimas %{count} sinalizações)"
+        agreed:
+          one: "%{count}% concorda"
+          other: "%{count}% concordam"
+        disagreed:
+          one: "%{count}% discorda"
+          other: "%{count}% discordam"
+        ignored:
+          one: "%{count}% ignora"
+          other: "%{count}% ignoram"
       topics:
         topic: "Tópico"
+        reviewable_count: "Contagem"
+        reported_by: "Reportado por"
+        deleted: "[Tópico eliminado]"
+        original: "(publicação Original)"
+        details: "detalhes"
+        unique_users:
+          one: "%{count} usuário"
+          other: "%{count} usuários"
+      replies:
+        one: "%{count} resposta"
+        other: "%{count} respostas"
       edit: "Editar"
       save: "Guardar"
       cancel: "Cancelar"
+      new_topic: "A aprovação deste item criará um novo tópico"
       filters:
         all_categories: "(todas as categorias)"
         type:
           title: "Tipo"
+          all: "(todos os tipos)"
+        minimum_score: "Pontuação Mínima:"
         refresh: "Atualizar"
         status: "Estado"
         category: "Categoria"
         orders:
+          score: "Pontuação"
+          score_asc: "Pontuação (reverso)"
           created_at: "Criado a"
+          created_at_asc: "Criado em (reverso)"
         priority:
-          low: "(qualquer)"
+          title: "Prioridade Mínima"
+          any: "(qualquer)"
           medium: "Médio"
           high: "Elevado"
       conversation:
@@ -458,11 +499,49 @@ pt:
           title: "Post na fila"
         reviewable_user:
           title: "Utilizador"
+        reviewable_post:
+          title: "Mensagem"
       approval:
         title: "A Publicação Necessita de Aprovação"
         description: "Recebemos a sua nova publicação mas necessita de ser aprovada pelo moderador antes de aparecer. Por favor seja paciente."
+        pending_posts:
+          one: "Resta <strong>%{count}</strong> post pendente."
+          other: "Restam <strong>%{count}</strong> posts pendentes."
         ok: "CONFIRMAR"
       example_username: "nome de utilizador"
+      reject_reason:
+        title: "Por que está a rejeitar este usuário?"
+        send_email: "Enviar e-mail de rejeição"
+    relative_time_picker:
+      minutes:
+        one: "minuto"
+        other: "minutos"
+      hours:
+        one: "hora"
+        other: "horas"
+      days:
+        one: "dia"
+        other: "dias"
+      months:
+        one: "mês"
+        other: "meses"
+      years:
+        one: "ano"
+        other: "anos"
+      relative: "Relativo"
+    time_shortcut:
+      later_today: "Hoje, mais tarde"
+      next_business_day: "Próximo dia útil"
+      tomorrow: "Amanhã"
+      next_week: "Próxima semana"
+      post_local_date: "Data no post"
+      later_this_week: "No final desta semana"
+      start_of_next_business_week: "Segunda-feira"
+      start_of_next_business_week_alt: "Próxima Segunda-feira"
+      next_month: "Próximo mês"
+      custom: "Data e hora personalizadas"
+      relative: "Tempo relativo"
+      none: "Não é necessário"
     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>"
@@ -549,6 +628,10 @@ pt:
             imap_ssl: "Utilizar SSL para IMAP"
             username: "Nome de utilizador"
             password: "Palavra-passe"
+          settings:
+            title: "Configurações"
+            allow_unknown_sender_topic_replies: "Permitir respostas a tópicos por remetentes desconhecidos."
+            allow_unknown_sender_topic_replies_hint: "Permite que remetentes desconhecidos respondam aos tópicos do grupo. Se não estiver ativado, as respostas de endereços de e-mail ainda não incluídos no tópico de e-mail IMAP ou convidados para o tópico criarão um novo tópico."
           mailboxes:
             synchronized: "Caixa de Correio Sincronizada"
             none_found: "Não foram encontradas caixas de correio nesta conta de e-mail."
@@ -564,6 +647,16 @@ pt:
           tracked_categories_instructions: "Seguir automaticamente todos os tópicos nestas categorias. Uma contagem de novas respostas irá aparecer junto ao tópico."
           watching_first_post_categories_instructions: "Os utilizadores serão notificados acerca da primeira resposta em cada novo tópico nestas categorias."
           regular_categories_instructions: "Se estas categorias estiverem silenciadas, elas serão ativadas para membros do grupo. Os utilizadores serão notificados se forem mencionados ou alguém lhes responder."
+          muted_categories_instructions: "Não vai ser notificado(a) sobre novos tópicos nestas categorias, e eles não vão aparecer na página dos tópicos recentes nem na página de categorias."
+        tags:
+          title: Etiquetas
+          long_title: "Notificações padrão da categoria"
+          description: "Ao serem adicionados utilizadores a este grupo, as suas configurações de notificação da categoria são definidas para estes padrões. Depois, eles podem mudá-las."
+          watched_tags_instructions: "Vigiar automaticamente todos os tópicos com estas etiquetas. Os membros do grupo serão notificados de todas as novas respostas e tópicos, e uma contagem de novas respostas irá aparecer junto ao tópico."
+          tracked_tags_instructions: "Seguir automaticamente todos os tópicos com estas etiquetas. Uma contagem de novas respostas irá aparecer junto ao tópico."
+          watching_first_post_tags_instructions: "Será notificado acerca da primeira resposta em cada novo tópico nestas categorias."
+          regular_tags_instructions: "Se estas etiquetas estiverem silenciadas, elas serão ativadas para membros do grupo. Os utilizadores serão notificados se forem mencionados ou alguém lhes responder."
+          muted_tags_instructions: "Os usuários não serão notificados de nada acerca de novos tópicos com estas etiquetas, nem estes irão aparecer nos recentes."
         logs:
           title: "Registos"
           when: "Quando"
@@ -574,11 +667,16 @@ pt:
           details: "Detalhes"
           from: "De"
           to: "Para"
+      permissions:
+        title: "Permissões"
+        none: "Não existem categorias associadas a este grupo."
+        description: "Os membros deste grupo podem ter acesso a estas categorias"
       public_admission: "Permitir entrada livre no grupo (Requer grupo publicamente visível)"
       public_exit: "Permitir que os utilizadores deixem o grupo livremente"
       empty:
         posts: "Não existem publicações por membros deste grupo."
         members: "Não existem membros neste grupo."
+        requests: "Não existem pedidos de adesão para este grupo."
         mentions: "Não existem menções deste grupo."
         messages: "Não existem mensagens para este grupo."
         topics: "Não existem tópicos por membros deste grupo."
@@ -588,6 +686,8 @@ pt:
       leave: "Sair"
       request: "Pedir"
       message: "Mensagem"
+      confirm_leave: "Tem a certeza que pretende sair deste grupo?"
+      allow_membership_requests: "Permitir que os usuários enviem solicitações de adesão aos proprietários do grupo (requer grupo publicamente visível)"
       membership_request_template: "Template personalizado para mostrar aos utilizadores quando for enviado um pedido de adesão"
       membership_request:
         submit: "Submeter Pedido"
@@ -633,7 +733,23 @@ pt:
         make_owner_description: "Fazer com que <b>%{username}</b> seja dono(a) deste grupo"
         remove_owner: "Remover Privilégios de Dono"
         remove_owner_description: "Remover <b>%{username}</b> como dono(a) deste grupo"
+        make_primary: "Tornar Principal"
+        make_primary_description: "Tornar este o grupo principal para <b>%{username}</b>"
+        remove_primary: "Remover como Principal"
+        remove_primary_description: "Remover este como o grupo principal para <b>%{username}</b>"
+        remove_members: "Remover Membros"
+        remove_members_description: "Remover usuários selecionados deste grupo"
+        make_owners: "Criar Proprietários"
+        make_owners_description: "Tornar os usuários selecionados proprietários deste grupo"
+        remove_owners: "Remover Proprietários"
+        remove_owners_description: "Remover os usuários selecionados de proprietários deste grupo"
+        make_all_primary: "Tornar tudo Principal"
+        make_all_primary_description: "Tornar este o grupo principal para todos os usuários selecionados"
+        remove_all_primary: "Remover como Principal"
+        remove_all_primary_description: "Remover este grupo como principal"
         owner: "Dono(a)"
+        primary: "Principal"
+        forbidden: "Não tem permissão para visualizar os membros."
       topics: "Tópicos"
       posts: "Publicações"
       mentions: "Menções"
@@ -646,6 +762,7 @@ pt:
         only_admins: "Apenas administradores"
         mods_and_admins: "Apenas moderadores e Administradores"
         members_mods_and_admins: "Apenas membros do grupo, moderadores e administradores"
+        owners_mods_and_admins: "Apenas proprietários do grupo, moderadores e administradores"
         everyone: "Todos"
       notifications:
         watching:
@@ -664,12 +781,16 @@ pt:
           title: "Silenciado"
           description: "Não vai ser notificado(a) de nenhuma mensagem neste grupo."
       flair_url: "Imagem da Marca de Avatar"
+      flair_upload_description: "Use imagens quadradas de, no mínimo, 20 x 20 px."
       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"
       flair_color_placeholder: "(Opcional) Valor hexadecimal da cor"
       flair_preview_icon: "Pré-visualizar Ícone"
       flair_preview_image: "Pré-visualizar Imagem"
+      flair_type:
+        icon: "Selecione um ícone"
+        image: "Enviar uma imagem"
     user_action_groups:
       "1": "Gostos Dados"
       "2": "Gostos Recebidos"
@@ -699,18 +820,28 @@ pt:
       posts: "Publicações"
       topics: "Tópicos"
       latest: "Recentes"
-      latest_by: "recentes por"
       toggle_ordering: "alternar o controlo de ordenação"
       subcategories: "Subcategorias"
+      muted: "Categorias silenciadas"
       topic_sentence:
         one: "%{count} tópico"
         other: "%{count} tópicos"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "semana"
+        month: "mês"
+      topic_stat_all_time:
+        one: "%{number} total"
+        other: "%{number} total"
       topic_stat_sentence_week:
         one: "%{count} tópico novo na semana passada."
         other: "%{count} tópicos novos na semana passada."
       topic_stat_sentence_month:
         one: "%{count} tópico novo no mês passado."
         other: "%{count} tópicos novos no mês passado."
+      n_more: "Categorias (mais %{count})..."
     ip_lookup:
       title: Pesquisa de Endereço IP
       hostname: Nome do Servidor
@@ -730,6 +861,7 @@ pt:
       copied: "copiado"
     user_fields:
       none: "(selecione uma opção)"
+      required: 'Por favor, insira um valor para "%{name}”'
     user:
       said: "%{username}:"
       profile: "Perfil"
@@ -745,21 +877,51 @@ pt:
       private_messages: "Mensagens"
       user_notifications:
         filters:
+          filter_by: "Filtrar por"
           all: "Todos"
           read: "Lido"
           unread: "Não Lido"
+        ignore_duration_title: "Ignorar Utilizador"
         ignore_duration_username: "Nome de utilizador"
+        ignore_duration_when: "Duração:"
         ignore_duration_save: "Ignorar"
+        ignore_duration_note: "Por favor, tome note que todos os itens ignorados são removidos automaticamente após o fim da duração para ignorar."
         ignore_duration_time_frame_required: "Por favor selecione um intervalo de tempo"
+        ignore_no_users: "Não tem utilizadores ignorados."
         ignore_option: "Ignorados"
+        ignore_option_title: "Não irá receber notificações relacionadas com este utilizador e todas as publicações deste serão escondidas."
+        add_ignored_user: "Adicionar..."
         mute_option: "Silenciado"
+        mute_option_title: "Não irá receber quaisquer notificações relacionadas com este utilizador."
         normal_option: "Normal"
+        normal_option_title: "Será notificado se este usuário lhe responder, citar ou mencionar."
+      notification_schedule:
+        title: "Agendamento de Notificações"
+        label: "Activar agendamento de notificações personalizado"
+        tip: "Fora destas horas será automaticamente colocado no modo 'não incomodar'."
+        midnight: "Meia-noite"
+        none: "Nenhuma"
+        monday: "Segunda-feira"
+        tuesday: "Terça-feira"
+        wednesday: "Quarta-feira"
+        thursday: "Quinta-feira"
+        friday: "Sexta-feira"
+        saturday: "Sábado"
+        sunday: "Domingo"
+        to: "para"
       activity_stream: "Atividade"
+      read: "Lidos"
+      read_help: "Tópicos lidos recentemente"
       preferences: "Preferências"
       feature_topic_on_profile:
+        open_search: "Selecione um Novo Tópico"
+        title: "Selecione um Tópico"
+        search_label: "Pesquisar Tópico por título"
         save: "Guardar"
         clear:
           title: "Remover"
+          warning: "Tem a certeza que pretende limpar o tópico em destaque?"
+      use_current_timezone: "Usar fuso horário atual"
       profile_hidden: "O perfil público deste utilizador está oculto."
       expand_profile: "Expandir"
       collapse_profile: "Colapsar"
@@ -778,13 +940,28 @@ pt:
         perm_denied_expl: "Negou a permissão para as notificações. Autorize as notificações através das configurações do seu navegador."
         disable: "Desativar Notificações"
         enable: "Ativar Notificações"
-        each_browser_note: "Nota: Tem que alterar esta configuração em todos os navegadores de internet que utiliza."
+        each_browser_note: 'Nota: Terá de alterar esta configuração em cada navegador que usar. Todas as notificações serão desativadas quando estiver em "Não perturbar", independentemente desta configuração.'
         consent_prompt: "Quer receber notificações instantâneas quando outras pessoas responderem às suas publicações?"
       dismiss: "Marcar como visto"
       dismiss_notifications: "Marcar Visto Tudo"
       dismiss_notifications_tooltip: "Marcar como lidas todas as notificações por ler"
       first_notification: "A sua primeira notificação! Seleccione-a para começar."
+      dynamic_favicon: "Mostrar contagens no ícone do navegador"
+      skip_new_user_tips:
+        description: "Ignorar dicas e emblemas de integração de novos usuários"
+        not_first_time: "Não é a sua primeira vez?"
+        skip_link: "Ignorar estas dicas"
       theme_default_on_all_devices: "Usar este tema por defeito em todos os meus dispositivos"
+      color_scheme_default_on_all_devices: "Definir esquema(s) de cor padrão em todos os meus dispositivos"
+      color_scheme: "Esquema de Cores"
+      color_schemes:
+        default_description: "Tema padrão"
+        disable_dark_scheme: "Igual ao normal"
+        dark_instructions: "Pode pré-visualizar o esquema de cores do modo escuro ativando o modo escuro do seu dispositivo."
+        undo: "Repor"
+        regular: "Habitual"
+        dark: "Modo escuro"
+        default_dark_scheme: "(padrão do site)"
       dark_mode: "Modo Escuro"
       dark_mode_enable: "Ativar automaticamente o esquema de cores do modo escuro"
       text_size_default_on_all_devices: "Usar este tamanho de texto por defeito em todos os meus dispositivos"
@@ -884,6 +1061,7 @@ pt:
         tags: "Etiquetas"
       preferences_nav:
         account: "Conta"
+        security: "Segurança"
         profile: "Perfil"
         emails: "E-mails"
         notifications: "Notificações"
@@ -896,34 +1074,76 @@ pt:
         success: "(email enviado)"
         in_progress: "(a enviar email)"
         error: "(erro)"
+        emoji: "emoji de bloqueio"
         action: "Enviar email de recuperação de palavra-passe"
         set_password: "Definir Palavra-passe"
         choose_new: "Escolha uma nova palavra-passe"
         choose: "Escolha uma palavra-passe"
       second_factor_backup:
+        title: "Códigos de Reserva para Autenticação em Dois Passos"
         regenerate: "Regenerar"
         disable: "Desativar"
         enable: "Ativar"
         enable_long: "Ativar códigos de reserva"
+        manage:
+          one: "Gerir códigos de reserva. Resta <strong>%{count}</strong> código de reserva."
+          other: "Gerir códigos de reserva. Restam <strong>%{count}</strong> códigos de reserva."
+        copy_to_clipboard: "Copiar 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"
         download_backup_codes: "Transferir códigos de cópia de segurança"
+        remaining_codes:
+          one: "Resta <strong>%{count}</strong> código de reserva."
+          other: "Restam <strong>%{count}</strong> códigos de reserva."
+        use: "Utilize um código de reserva"
+        enable_prerequisites: "Tem de activar um método primário de dois passos antes de gerar 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."
       second_factor:
+        title: "Autenticação em Dois Passos"
+        enable: "Gerir Autenticação em Dois Passos"
+        disable_all: "Desativar Tudo"
+        forgot_password: "Esqueceu a palavra-passe?"
         confirm_password_description: "Por favor confirme a sua palavra-passe para continuar"
         name: "Nome"
         label: "Código"
         rate_limit: "Por favor espere antes de voltar a tentar um código de autenticação."
+        enable_description: |
+          Leia este código QR numa aplicação compatível (<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 insira o seu código de autenticação.
         disable_description: "Por favor introduza o código de autenticação a partir da sua aplicação"
         show_key_description: "Inserir manualmente"
+        short_description: |
+          Proteja a sua conta com códigos de segurança de utilização única.
+        extended_description: |
+          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: "Tenha em consideração que os logins sociais serão desativados assim que a autenticação em dois passos for ativada na sua conta."
+        use: "Utilizar a aplicação Authenticator"
+        enforced_notice: "É necessário ativar a autenticação em dois passos para aceder a este site."
         disable: "Desativar"
+        disable_confirm: "Tem a certeza que deseja desativar todos os métodos de dois passos?"
         save: "Guardar"
         edit: "Editar"
+        edit_title: "Editar Autenticador"
+        edit_description: "Nome do Autenticador"
+        enable_security_key_description: |
+          Quando tiver a sua <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">chave de segurança de hardware</a> preparada, pressione o botão abaixo de Registar.
+        totp:
+          title: "Autenticadores Baseados em Tokens"
+          add: "Adicionar Autenticador"
+          default_name: "O Meu Autenticador"
+          name_and_code_required_error: "Tem de fornecer um nome e o código da sua aplicação de autenticação."
         security_key:
           register: "Registar"
+          title: "Chaves de Segurança"
+          add: "Adicionar Chave de Segurança"
+          default_name: "Chave de Segurança Principal"
+          not_allowed_error: "O processo de registo da chave de segurança atingiu o tempo limite ou foi cancelado."
+          already_added_error: "Já registou esta chave de segurança. Não precisa de a registar novamente."
+          edit: "Editar Chave de Segurança"
           save: "Guardar"
+          edit_description: "Nome da Chave de Segurança"
+          name_required_error: "Tem de fornecer um nome para a sua chave de segurança."
       change_about:
         title: "Modificar Sobre Mim"
         error: "Ocorreu um erro ao modificar este valor."
@@ -933,33 +1153,56 @@ pt:
         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:
+        title: "Adicionar E-mail"
         add: "adicionar"
       change_email:
         title: "Alterar Email"
         taken: "Pedimos desculpa, esse email não está disponível."
         error: "Ocorreu um erro ao alterar o email. Talvez esse endereço já esteja a ser utilizado neste fórum?"
         success: "Enviámos um email para esse endereço. Por favor siga as instruções de confirmação."
+        success_via_admin: "Enviámos um e-mail para esse endereço. O utilizador terá de seguir as instruções de confirmação no e-mail.."
         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='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, com base em"
+        gravatar_title: "Alterar o seu avatar no site %{gravatarName}"
+        gravatar_failed: "Não foi possível encontrar um %{gravatarName} com esse endereço de e-mail."
+        refresh_gravatar_title: "Atualize o seu %{gravatarName}"
         letter_based: "Imagem de perfil atribuída pelo sistema"
         uploaded_avatar: "Foto personalizada"
         uploaded_avatar_empty: "Adicionar foto personalizada"
         upload_title: "Carregar a sua foto"
         image_is_not_a_square: "Alerta: cortámos a sua imagem; o comprimento e a altura não eram iguais."
+      change_profile_background:
+        title: "Cabeçalho do Perfil"
+        instructions: "Os cabeçalhos do perfil serão centrados e com uma largura padrão de 1110px."
       change_card_background:
         title: "Fundo do cartão de utilizador"
         instructions: "As imagens de fundo serão centradas e terão por defeito uma largura de 590px."
+      change_featured_topic:
+        title: "Tópico em Destaque"
+        instructions: "Um link para este tópico estará visível no seu cartão de usuário e perfil."
       email:
         title: "Email"
         primary: "Email Principal"
         secondary: "Emails Secundários"
         primary_label: "primária"
+        unconfirmed_label: "não confirmado"
+        resend_label: "reenviar e-mail de confirmação"
+        resending_label: "a enviar..."
+        resent_label: "e-mail enviado"
         update_email: "Alterar Email"
+        set_primary: "Definir E-mail Principal"
+        destroy: "Remover E-mail"
+        add_email: "Adicionar E-mail Alternativo"
+        auth_override_instructions: "O e-mail pode ser atualizado a partir do provedor de autenticação."
         no_secondary: "Não existem emails secundários"
+        instructions: "Nunca mostrado ao público."
         ok: "Enviar-lhe-emos um email para confirmar"
+        required: "Por favor introduza um endereço de e-mail"
         invalid: "Por favor introduza um endereço de email válido"
         authenticated: "O seu email foi autenticado por %{provider}"
+        invite_auth_email_invalid: "O seu email de convite não coincide com o email 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."
@@ -974,6 +1217,7 @@ pt:
         title: "Nome"
         instructions: "o seu nome completo (opcional)"
         instructions_required: "O seu nome completo"
+        required: "Por favor introduza um nome"
         too_short: "O seu nome é demasiado curto"
         ok: "O seu nome parece adequado"
       username:
@@ -987,6 +1231,8 @@ pt:
         too_long: "O seu nome de utilizador é muito longo"
         checking: "A verificar a disponibilidade do nome de utilizador..."
         prefilled: "O e-mail corresponde com este nome de utilizador registado"
+        required: "Por favor introduza um nome de utilizador"
+        edit: "Editar nome de usuário"
       locale:
         title: "Idioma da Interface"
         instructions: "O idioma da interface do utilizador. Este será alterado quando recarregar a página."
@@ -994,6 +1240,9 @@ pt:
         any: "qualquer"
       password_confirmation:
         title: "Palavra-passe Novamente"
+      invite_code:
+        title: "Código de Convite"
+        instructions: "O registo da conta requer um código de convite"
       auth_tokens:
         title: "Dispositivos Recentemente Utilizados"
         details: "Detalhes"
@@ -1006,6 +1255,9 @@ pt:
         browser_and_device: "%{browser} no %{device}"
         secure_account: "Proteger a minha Conta"
         latest_post: "A sua última publicação..."
+        device_location: '<span class="auth-token-device">%{device}</span> &ndash; <span title="IP: %{ip}">%{location}</span>'
+        browser_active: '%{browser} | <span class="active">ativo agora</span>'
+        browser_last_seen: "%{browser} | %{date}"
       last_posted: "Última Publicação"
       last_emailed: "Último Enviado por Mensagem"
       last_seen: "Visto"
@@ -1018,10 +1270,13 @@ pt:
       enable_physical_keyboard: "Ativar suporte para teclado físico no iPad"
       text_size:
         title: "Tamanho do Texto"
+        smallest: "O menor"
         smaller: "Mais Pequeno"
         normal: "Normal"
         larger: "Maior"
         largest: "O Maior Possível"
+      title_count_mode:
+        notifications: "Novas notificações"
       like_notification_frequency:
         title: "Notificar quando alguém gostar"
         always: "Sempre"
@@ -1072,45 +1327,78 @@ pt:
         after_10_minutes: "depois de 10 minutos"
       notification_level_when_replying: "Quando eu publico num tópico, coloque esse tópico como"
       invited:
-        search: "digite para pesquisar por convites..."
         title: "Convites"
+        pending_tab: "Pendente"
+        pending_tab_with_count: "Pendentes (%{count})"
+        expired_tab: "Expirado"
+        expired_tab_with_count: "Expirado (%{count})"
+        redeemed_tab: "Resgatado"
+        redeemed_tab_with_count: "Resgatados (%{count})"
+        invited_via: "Convite"
+        groups: "Grupos"
+        topic: "Tópico"
+        sent: "Criado/Último Enviado"
+        expires_at: "Expira"
+        edit: "Editar"
+        remove: "Remover"
+        copy_link: "Obter Link"
+        reinvite: "Reenviar Email"
+        reinvited: "Convite reenviado"
+        removed: "Removido"
+        search: "digite para pesquisar por convites..."
         user: "Utilizador Convidado"
         none: "Sem convites para exibir."
         truncated:
           one: "A exibir o primeiro convite."
           other: "A exibir os primeiros %{count} convites."
         redeemed: "Convites Resgatados"
-        redeemed_tab: "Resgatado"
-        redeemed_tab_with_count: "Resgatados (%{count})"
         redeemed_at: "Resgatado"
         pending: "Convites Pendentes"
-        pending_tab: "Pendente"
-        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"
-        rescinded_all: "Todos os Convites Expirados foram removidos!"
-        rescind_all_confirm: "Tem a certeza que pretende remover todos os convites expirados?"
-        reinvite: "Reenviar Convite"
+        remove_all: "Remover Convites Expirados"
+        removed_all: "Todos os Convites Expirados foram removidos!"
+        remove_all_confirm: "Tem certeza que pretende remover todos os convites expirados?"
         reinvite_all: "Reenviar todos os Convites"
         reinvite_all_confirm: "Tem a certeza que deseja reenviar todos os convites?"
-        reinvited: "Convite reenviado"
-        reinvited_all: "Todos os Convites reenviados!"
+        reinvited_all: "Todos os Convites enviados!"
         time_read: "Tempo de Leitura"
         days_visited: "Dias Visitados"
         account_age_days: "Idade da conta, em dias"
-        links_tab: "Hiperligações"
-        link_created_at: "Criado"
-        link_groups: Grupos
+        create: "Convidar"
+        generate_link: "Criar Link de Convite"
+        link_generated: "Aqui está o seu link de convite!"
         valid_for: "A hiperligação do convite é válida apenas para este endereço de e-mail: %{email}"
+        single_user: "Convidar por email"
+        multiple_user: "Convidar por link"
         invite_link:
+          title: "Link de Convite"
           success: "Hiperligação do convite gerada com sucesso!"
+          error: "Ocorreu um erro ao gerar o Link de Convite"
+          max_redemptions_allowed_label: "Quantas pessoas têm permissão para se registar usando este link?"
+          expires_at: "Quando irá este link de convite expirar?"
+        invite:
+          new_title: "Criar Convite"
+          edit_title: "Editar Convite"
+          instructions: "Compartilhe este link para conceder acesso instantâneo a este site:"
+          copy_link: "copiar link"
+          expires_in_time: "Expira em %{time}."
+          expired_at_time: "Expirou em %{time}."
+          show_advanced: "Mostrar Opções Avançadas"
+          hide_advanced: "Ocultar Opções Avançadas"
+          max_redemptions_allowed: "Número máximo de utilizações:"
+          add_to_groups: "Adicionar aos grupos:"
+          invite_to_topic: "Enviar para o tópico no primeira vez que efectuar login:"
+          expires_at: "Expira após:"
+          custom_message: "Mensagem pessoal opcional:"
+          send_invite_email: "Guardar e Enviar E-mail"
+          save_invite: "Salvar Convite"
         bulk_invite:
-          success: "Ficheiro enviado corretamente, será notificado via mensagem quando o processo estiver concluído."
+          none: "Sem convites para exibir nesta página."
+          text: "Convite em massa"
+          progress: "Enviado %{progress}%..."
           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."
       password:
         title: "Palavra-passe"
         too_short: "A sua palavra-passe é muito curta."
@@ -1173,6 +1461,7 @@ pt:
       avatar:
         title: "Imagem de Perfil"
         header_title: "perfil, mensagens, marcadores e preferências"
+        edit: "Editar Imagem de Perfil"
       title:
         title: "Título"
         none: "(nenhum)"
@@ -1209,7 +1498,7 @@ pt:
     modal:
       close: "fechar"
     close: "Fechar"
-    assets_changed_confirm: "Este site acabou se ser atualizado. Recarregar agora para a versão mais recente?"
+    assets_changed_confirm: "Este site acabou de receber uma atualização de software. Obter a versão mais recente agora?"
     logout: "A sua sessão foi encerrada."
     refresh: "Atualizar"
     home: "Início"
@@ -1218,15 +1507,6 @@ pt:
       login_disabled: "Enquanto o site se encontrar no modo só de leitura, a opção de iniciar a sessão está desativada."
       logout_disabled: "Enquanto o site se encontrar no modo só de leitura, a opção de terminar a sessão está desativada."
     learn_more: "saber mais..."
-    all_time: "total"
-    all_time_desc: "total de tópicos criados"
-    year: "ano"
-    year_desc: "tópicos criados nos últimos 365 dias"
-    month: "mês"
-    month_desc: "tópicos criados nos últimos 30 dias"
-    week: "semana"
-    week_desc: "tópicos criados nos últimos 7 dias"
-    day: "dia"
     first_post: Primeira publicação
     mute: Silenciar
     unmute: Desativar silêncio
@@ -1243,13 +1523,10 @@ pt:
       sign_up: "Inscrever-se"
       hide_session: "Lembrar-me amanhã"
       hide_forever: "não, obrigado"
-      hidden_for_session: "Está bem, eu irei perguntar-lhe amanhã. Pode utilizar sempre 'Iniciar a Sessão' para também criar uma conta."
       intro: "Olá! Parece que está a gostar da conversa, mas ainda não tem uma conta."
       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>."
       enable: "Resumir Este Tópico"
       disable: "Mostrar Todas As Publicações"
     deleted_filter:
@@ -1259,6 +1536,9 @@ pt:
       disable: "Mostrar Publicações Eliminadas"
     private_message_info:
       title: "Mensagem"
+      invite: "Convidar Outros..."
+      edit: "Adicionar ou Remover..."
+      add: "Adicionar..."
       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?"
@@ -1270,8 +1550,9 @@ pt:
     trust_level: "Nível de Confiança"
     search_hint: "nome de utilizador, e-mail ou endereço de IP"
     create_account:
+      header_title: "Bem-vindo!"
+      subheader_title: "Vamos criar a sua conta"
       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:
       title: "Repor Palavra-Passe"
@@ -1288,6 +1569,8 @@ pt:
     email_login:
       link_label: "Enviem-me uma ligação para entrar"
       button_label: "com e-mail"
+      login_link: "Ignorar a senha; enviar-me um link de login"
+      emoji: "emoji de bloqueio"
       complete_username: "Se houver uma conta com o nome de utilizador <b>%{username}</b>, deverá receber um email com uma ligação para ligar dentro de poucos instantes."
       complete_email: "Se houver uma conta com o endereço <b>%{email}</b>, irá receber um email com uma ligação para entrar dentro de poucos instantes."
       complete_username_found: "Encontrámos uma conta que usa o nome de utilizador <b>%{username}</b>, deverá receber um email com uma ligação para entrar dentro de poucos instantes."
@@ -1296,12 +1579,12 @@ pt:
       complete_email_not_found: "Nenhuma conta correspondente com <b>%{email}</b>"
       confirm_title: Continuar para %{site_name}
     login:
-      title: "Iniciar a Sessão"
+      subheader_title: "Faça login na sua conta"
       username: "Utilizador"
       password: "Palavra-passe"
+      second_factor_title: "Autenticação em Dois Passos"
       second_factor_description: "Por favor introduza um código de autenticação a partir da sua aplicação:"
       second_factor_backup_description: "Por favor introduza um dos seus códigos de reserva:"
-      email_placeholder: "e-mail ou nome de utilizador"
       caps_lock_warning: "Caps Lock está ligada"
       error: "Erro desconhecido"
       rate_limit: "Por favor, aguarde antes de tentar iniciar a sessão novamente."
@@ -1352,6 +1635,7 @@ pt:
       accept_invite: "Aceitar Convite"
       success: "A sua conta foi criada e está agora com a sessão iniciada."
       name_label: "Nome"
+      password_label: "Palavra-passe"
       optional_description: "(opcional)"
     password_reset:
       continue: "Continuar para %{site_name}"
@@ -1387,6 +1671,9 @@ pt:
       min_content_not_reached:
         one: "Selecione pelo menos %{count} item."
         other: "Selecione pelo menos %{count} itens."
+      components:
+        categories_admin_dropdown:
+          title: "Gerir categorias"
     date_time_picker:
       from: De
       to: Para
@@ -1411,7 +1698,6 @@ 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>."
       destination_category: "Categoria Destino"
       publish: "Publicar Rascunho Partilhado"
       confirm_publish: "Tem a certeza que quer publicar este rascunho?"
@@ -1422,7 +1708,6 @@ pt:
       options: "Opções"
       whisper: "susurro"
       unlist: "não listado"
-      blockquote_text: "Bloco de Citação"
       add_warning: "Este é um aviso oficial."
       toggle_whisper: "Alternar Sussuro"
       toggle_unlisted: "Alternar Não Listado"
@@ -1440,10 +1725,7 @@ pt:
       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_missing: "A mensagem não pode estar vazia"
-        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"
       save_edit: "Guardar Edição"
@@ -1470,8 +1752,6 @@ pt:
       saving: "A Guardar"
       saved: "Guardado!"
       uploading: "A enviar…"
-      show_preview: "mostrar pré-visualização &raquo;"
-      hide_preview: "&laquo; ocultar pré-visualização"
       quote_post_title: "Citar toda a publicação"
       bold_label: "B"
       bold_title: "Negrito"
@@ -1483,8 +1763,8 @@ pt:
       link_description: "insira aqui a descrição da hiperligação"
       link_dialog_title: "Inserir Hiperligação"
       link_optional_text: "título opcional"
-      quote_title: "Bloco de Citação"
-      quote_text: "Bloco de Citação"
+      blockquote_title: "Bloco de Citação"
+      blockquote_text: "Bloco de Citação"
       code_title: "Texto pré-formatado"
       code_text: "Indentar texto pré-formatado até 4 espaços"
       paste_code_text: "digite ou cole aqui o código"
@@ -1529,10 +1809,10 @@ pt:
           label: "Novo Tópico"
         shared_draft:
           label: "Rascunho Partilhado"
-          desc: "Escrever um rascunho de tópico que só pode ser visível pela equipa do site"
         toggle_topic_bump:
           label: "Alterar possibilidade de bump de tópico"
           desc: "Responder sem alterar a data de última resposta"
+      ignore: "Ignorar"
     notifications:
       tooltip:
         regular:
@@ -1552,6 +1832,10 @@ pt:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} e %{count} outro</span> %{description}"
+        other: "<span class='multi-user'>%{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"
@@ -1565,6 +1849,8 @@ pt:
       granted_badge: "Ganhou '%{description}'"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Novo Tópico</span> %{description}"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       group_message_summary:
         one: "%{count} mensagem no seu grupo %{group_name}"
         other: "%{count} mensagens no seu grupo %{group_name}"
@@ -1588,10 +1874,7 @@ 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}"
       local_tip: "selecionar imagens a partir do seu dispositivo"
-      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"
       select_file: "Selecionar Ficheiro"
@@ -1621,6 +1904,7 @@ pt:
       or_search_google: "Ou experimente pesquisar com o Google:"
       search_google: "Experimente pesquisar com o Google:"
       search_google_button: "Google"
+      search_button: "Pesquisar"
       context:
         user: "Procurar publicações por @%{username}"
         category: "Pesquise na categoria #%{category}"
@@ -1662,10 +1946,14 @@ pt:
           noreplies: têm zero respostas
           single_user: contêm um único utilizador
         post:
+          count:
+            label: Publicações
           time:
             label: Publicada
             before: antes
             after: depois
+        views:
+          label: Vistas
     hamburger_menu: "ir para outra lista de tópicos ou categorias"
     new_item: "novo"
     go_back: "voltar atrás"
@@ -1691,6 +1979,7 @@ pt:
         change_category: "Definir Categoria"
         close_topics: "Fechar Tópicos"
         archive_topics: "Arquivar tópicos"
+        move_messages_to_inbox: "Mover para a Caixa de Entrada"
         notification_level: "Notificações"
         choose_new_category: "Escolha a nova categoria para os tópicos:"
         selected:
@@ -1709,8 +1998,6 @@ pt:
         bookmarks: "Ainda não marcou nenhum tópico."
         category: "Não há tópicos na categoria %{category}."
         top: "Não existem tópicos recentes."
-        educate:
-          unread: '<p>As suas publicações não lidas aparecem aqui.</p><p>Por defeito, tópicos são considerados não lidos e mostrarão contadores de não lidos <span class="badge new-posts badge-notification">1</span> se você:</p><ul><li>Criou o tópico</li><li>Respondeu ao tópico</li><li>Leu o tópico durante mais de 4 minutos</li></ul><p>Ou marcou explicitamente o tópico como Seguido ou Vigiado via o controle de notificações no fundo de cada tópico.</p><p>Visite as suas <a href="%{userPrefsUrl}">preferências</a> para mudar isto.</p>'
       bottom:
         latest: "Não existem mais tópicos recentes."
         posted: "Não existem mais tópicos publicados."
@@ -1718,6 +2005,7 @@ pt:
         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}."
+        tag: "Não existem mais tópicos em %{tag}."
         top: "Não existem mais tópicos recentes."
         bookmarks: "Não há mais tópicos marcados."
     topic:
@@ -1775,14 +2063,17 @@ pt:
       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_in_category: "Pretende ler mais? Navegue por 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 {}}"
+      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 {navegue por 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
       jump_reply_up: avançar para resposta mais recente
       jump_reply_down: avançar para resposta mais antiga
       deleted: "Este tópico foi eliminado"
+      slow_mode_update:
+        save: "Ativar "
+        remove: "Desativar"
       topic_status_update:
         title: "Temporizador do Tópico"
         save: "Definir Temporizador"
@@ -1790,7 +2081,7 @@ pt:
         remove: "Remover Temporizador"
         publish_to: "Publicar para:"
         when: "Quando:"
-        time_frame_required: Por favor selecione um intervalo de tempo
+        time_frame_required: "Por favor selecione um intervalo de tempo"
       auto_update_input:
         none: "Selecione um intervalo de tempo"
         later_today: "Hoje, mais tarde"
@@ -1798,11 +2089,7 @@ pt:
         later_this_week: "No final desta semana"
         this_weekend: "Este fim de semana"
         next_week: "Próxima semana"
-        two_weeks: "Duas Semanas"
         next_month: "Próximo mês"
-        three_months: "Três Meses"
-        six_months: "Seis Meses"
-        one_year: "Um Ano"
         forever: "Para Sempre"
         pick_date_and_time: "Escolha uma data e hora"
         set_based_on_last_post: "Fechar baseado na última publicação"
@@ -1816,7 +2103,6 @@ pt:
         title: "Fechar Temporariamente"
       auto_close:
         title: "Fechar Tópico Automaticamente"
-        label: "Horas de fecho automático do tópico:"
         error: "Por favor introduza um valor válido."
         based_on_last_post: "Não fechar até que a última mensagem no tópico tenha este tempo."
       auto_delete:
@@ -1829,7 +2115,7 @@ pt:
         auto_open: "Este tópico vai abrir automaticamente %{timeLeft}."
         auto_close: "Este tópico vai fechar automaticamente %{timeLeft}."
         auto_publish_to_category: "Este tópico vai ser publicado em <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Este tópico vai fechar %{duration} depois da última resposta."
+        auto_close_after_last_post: "Este tópico vai fechar %{duration} depois da última resposta."
         auto_delete: "Este tópico vai ser automaticamente eliminado %{timeLeft}."
         auto_bump: "Este tópico vai ser automaticamente bumped %{timeLeft}."
         auto_reminder: "Irá ser relembrado acerca deste tópico %{timeLeft}."
@@ -1848,7 +2134,7 @@ pt:
         go: "ir"
         jump_bottom: "ir para a última publicação"
         jump_prompt: "ir para..."
-        jump_prompt_of: "de %{count} mensagens"
+        jump_prompt_long: "Ir para..."
         jump_bottom_with_number: "ir para a mensagem %{post_number}"
         jump_prompt_to_date: "ir para data"
         jump_prompt_or: "ou"
@@ -1931,6 +2217,7 @@ pt:
         title: "Partilhar"
         extended_title: "Partilhar uma ligação"
         help: "Partilhar uma ligação para este tópico"
+        invite_users: "Convidar"
       print:
         title: "Imprimir"
         help: "Abrir uma versão para impressão deste tópico"
@@ -1979,14 +2266,13 @@ pt:
         username_placeholder: "nome de utilizador"
         action: "Enviar Convite"
         help: "convidar outros para este tópico via email ou notificações"
-        to_forum: "Enviaremos um breve email que permitirá ao seu amigo juntar-se imediatamente clicando numa ligação, não sendo necessário ter sessão iniciada."
-        sso_enabled: "Introduza o nome de utilizador da pessoa que gostaria de convidar para este tópico."
+        discourse_connect_enabled: "Informe o nome de usuário da pessoa que gostaria de convidar para este tópico."
         to_topic_blank: "Introduza o nome de utilizador ou endereço de email da pessoa que gostaria de convidar para este tópico."
         to_topic_email: "Introduziu um endereço de email. Iremos enviar um email com um convite que permite aos seus amigos responderem a este tópico imediatamente."
-        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_topic_username: "Você informou um nome de usuário. Enviaremos uma notificação com um link 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>%{invitee}</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."
@@ -2062,9 +2348,9 @@ pt:
           other: "Selecionou <b>%{count}</b> publicações."
     post:
       quote_reply: "Citar"
+      quote_share: "Partilhar"
       edit_reason: "Motivo:"
       post_number: "publicação %{number}"
-      last_edited_on: "última edição da mensagem 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"
@@ -2072,6 +2358,7 @@ pt:
       deleted_by_author:
         one: "(publicação retraída pelo autor, será removida automaticamente em %{count} hora a não ser que esteja denunciada)"
         other: "(publicação retraída pelo autor, será eliminada automaticamente em %{count} horas a não ser que esteja denunciada)"
+      collapse: "colapsar"
       expand_collapse: "expandir/colapsar"
       gap:
         one: "ver %{count} resposta oculta"
@@ -2096,13 +2383,11 @@ pt:
         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, deve estar autenticado para transferir os anexos."
-      abandon_edit:
-        no_value: "Não, manter"
-      abandon:
-        title: "Abandonar o rascunho"
-        confirm: "Tem a certeza que deseja abandonar a sua mensagem?"
-        no_value: "Não, manter"
-        yes_value: "Sim, abandonar"
+      cancel_composer:
+        confirm: "O que gostaria de fazer com a sua publicação?"
+        discard: "Descartar"
+        save_draft: "Salvar rascunho para mais tarde"
+        keep_editing: "Prosseguir a edição"
       via_email: "esta mensagem 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"
@@ -2138,7 +2423,12 @@ pt:
         delete_topic: "eliminar tópico"
         change_post_notice: "Alterar Aviso da Equipa"
         delete_post_notice: "Apagar Aviso da Equipa"
+        edit_timer: "editar temporizador"
       actions:
+        people:
+          like:
+            one: "gostou disto"
+            other: "gostou disto"
         by_you:
           off_topic: "Denunciou isto como fora de contexto"
           spam: "Denunciou isto como spam"
@@ -2211,6 +2501,11 @@ pt:
       change_in_category_topic: "Editar Descrição"
       already_used: "Esta cor já foi usada para outra categoria"
       security: "Segurança"
+      permissions:
+        group: "Grupo"
+        see: "Ver"
+        reply: "Responder"
+        create: "Criar"
       special_warning: "Aviso: Esta categoria é uma categoria pré-preenchida e as configurações de segurança não podem ser editadas. Se não deseja utilizar esta categoria, elimine-a em vez de lhe dar um novo propósito."
       images: "Imagens"
       email_in: "Endereço de email personalizado para emails recebidos:"
@@ -2228,22 +2523,20 @@ pt:
       notifications:
         watching:
           title: "A vigiar"
-          description: "Irá vigiar automaticamente todos os novos tópicos nestas categorias. Será notificado de todas as novas respostas em cada tópico, e uma contagem de novas respostas será mostrada."
         watching_first_post:
           title: "A Vigiar a Primeira Mensagem"
         tracking:
           title: "A Seguir"
-          description: "Irá seguir automaticamente todos os novos tópicos nestas categorias. Será notificado sempre que alguém menciona o seu @nome ou responde a si, e uma contagem de novas respostas será mostrada."
         regular:
           title: "Normal"
           description: "Será notificado se alguém mencionar o seu @nome ou responder-lhe."
         muted:
           title: "Silenciado"
-          description: "Nunca será notificado de nada acerca de novos tópicos nestas categorias, e estes não irão aparecer nos recentes."
       search_priority:
         options:
           normal: "Normal"
           ignore: "Ignorar"
+          high: "Elevado"
       sort_options:
         default: "predefinida"
         likes: "Gostos"
@@ -2262,10 +2555,15 @@ pt:
     flagging:
       title: "Obrigado por ajudar a manter a nossa comunidade cívica!"
       action: "Denunciar Publicação"
+      take_action_options:
+        default:
+          title: "Acionar"
+          details: "Atingir imediatamente o limite de denúncias, em vez de esperar por mais denúncias da comunidade"
+        suspend:
+          title: "Utilizador Suspenso"
       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} 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)"
@@ -2329,17 +2627,6 @@ 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_likes_MF: |2
-
-      Este tópico tem {count, plural, one {1 resposta} other {# respostas}} {ratio, select,
-
-      low {com uma proporção de gostos para publicações alta}
-
-      med {com uma proporção de gostos para publicações muito alta}
-
-      high {com uma proporção de gostos para publicações extremamente alta}
-
-      other {}}
     original_post: "Publicação Original"
     views: "Vistas"
     views_lowercase:
@@ -2356,7 +2643,6 @@ pt:
       one: "utilizador"
       other: "utilizadores"
     category_title: "Categoria"
-    history: "Histórico"
     changed_by: "por %{author}"
     raw_email:
       not_available: "Indisponível!"
@@ -2435,6 +2721,7 @@ pt:
       readonly: "Ver"
     lightbox:
       download: "transferir"
+      counter: "%curr% de %total%"
     keyboard_shortcuts_help:
       title: "Atalhos de Teclado"
       jump_to:
@@ -2466,6 +2753,8 @@ pt:
         dismiss_new_posts: "%{shortcut} Marcar Visto Novos/Publicações"
         dismiss_topics: "%{shortcut} Marcar Visto Tópicos"
         log_out: "%{shortcut} Sair"
+      bookmarks:
+        next_month: "%{shortcut} Próximo mês"
       actions:
         title: "Ações"
         bookmark_topic: "%{shortcut} Alternar marcador de tópico"
@@ -2576,12 +2865,17 @@ 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!"
+    forced_anonymous_login_required: "O site está sobrecarregado pelo que não pode ser visualizado neste momento, tente novamente daqui a alguns minutos."
     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"
+    do_not_disturb:
+      remaining: "%{remaining} restante"
+      options:
+        custom: "Personalizar"
   admin_js:
     type_to_filter: "digite para filtrar..."
     admin:
@@ -2603,6 +2897,8 @@ pt:
         version_check_pending: "Parece que atualizou recentemente. Fantástico!"
         installed_version: "Instalado"
         latest_version: "Recentes"
+        new_features:
+          dismiss: "Marcar como visto"
         last_checked: "Última verificação"
         refresh_problems: "Atualizar"
         no_problems: "Nenhum problema encontrado."
@@ -2631,6 +2927,9 @@ pt:
           view_table: "tabela"
           view_graph: "grafo"
           refresh_report: "Atualizar relatório"
+          daily: Diário
+          monthly: Mensal
+          weekly: Semanal
           groups: "Todos os grupos"
           filters:
             group:
@@ -2644,9 +2943,6 @@ pt:
         new:
           title: "Novo Grupo"
           create: "Criar"
-        bulk_add:
-          title: "Adicionar ao Grupo em Massa"
-          paste: "Colar uma lista de nomes de utilizador ou emails, um por linha:"
         manage:
           interaction:
             email: E-mail
@@ -2691,6 +2987,8 @@ pt:
         description: Descrição
         save: Guardar
         continue: Continuar
+        scopes:
+          action: Ação
       web_hooks:
         title: "Webhooks"
         none: "Não existem webhooks neste momento."
@@ -2705,7 +3003,6 @@ pt:
         go_back: "Voltar à lista"
         payload_url: "URL de carga"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Parece que está a tentar configurar um webhook para um url local. Eventos entregues num endereço local poderão causar efeitos secundários ou comportamentos inesperados. Continuar?"
         secret_invalid: "O segredo não pode ter espaços."
         secret_too_short: "O segredo tem de ter pelo menos 12 caracteres."
         event_type_missing: "Tem de configurar pelo menos um tipo de evento."
@@ -2847,6 +3144,7 @@ pt:
         color: "Cor"
         opacity: "Opacidade"
         copy: "Copiar"
+        copy_to_clipboard: "Copiar para a Área de Transferência"
         copied_to_clipboard: "Copiado para a Área de Transferência"
         copy_to_clipboard_error: "Erro a copiar dados para a Área de Transferência"
         email_templates:
@@ -2858,6 +3156,7 @@ pt:
           revert_confirm: "Tem a certeza que quer reverter as suas alterações?"
         theme:
           theme: "Tema"
+          customize_desc: "Personalizar:"
           create: "Criar"
           create_type: "Tipo"
           create_name: "Nome"
@@ -2867,12 +3166,16 @@ pt:
           preview: "Pré-visualização"
           collapse: Colapsar
           upload: "Carregar"
+          discard: "Descartar"
+          direct_install_tip: "Tem a certeza que pretende instalar <strong>%{name}</strong> do repositório listado abaixo?"
           installed: "Instalado"
           install_popular: "Popular"
           about_theme: "Sobre"
+          version: "Versão:"
           enable: "Ativar"
           disable: "Desativar"
           add: "Adicionar"
+          remote_theme_edits: "Se quiser editar este tema, tem de <a href='%{repoURL}' target='_blank'>enviar uma alteração para o seu repositório</a>"
           scss:
             text: "CSS"
           header:
@@ -3005,6 +3308,7 @@ pt:
           do_nothing: "não fazer nada"
         staff_actions:
           all: "todos"
+          filter: "Filtrar:"
           title: "Ações do Pessoal"
           clear_filters: "Mostrar Tudo"
           staff_user: "Utilizador"
@@ -3089,16 +3393,27 @@ pt:
         logster:
           title: "Registo de Erros em Logs"
       watched_words:
+        title: "Palavras Vigiadas"
+        search: "pesquisar"
         clear_filter: "Remover"
         download: Transferir
         clear_all: Remover Tudo
+        clear_all_confirm: "Tem a certeza de que pretende limpar todas as palavras vigiadas para a ação %{action}"
         actions:
           block: "Bloquear"
           flag: "Denunciar"
+        action_descriptions:
+          block: "Impede que posts que contenham estas palavras sejam publicados. O usuário irá receber uma mensagem de erro ao tentar enviar o seu post."
+          censor: "Permite posts que contenham estas palavras, mas substitui-as por caracteres que ocultam as palavras censuradas."
+          require_approval: "As publicações que contenham estas palavras terão de ser aprovadas pelo pessoal antes de poderem ser vistas."
+          flag: "Permite posts que contenham estas palavras, mas sinaliza-as como inapropriadas para que os moderadores as possam rever."
+          replace: "Substituir palavras em posts com outras palavras ou links"
         form:
           add: "Adicionar"
         test:
           button_label: "Testar"
+          modal_title: "Testar '%{action}' Palavras Vigiadas"
+          description: "Insira o texto abaixo para verificar as correspondências com palavras vigiadas"
           no_matches: "Não foram encontradas correspondências"
       impersonate:
         title: "Personificar"
@@ -3136,6 +3451,9 @@ pt:
         check_email:
           title: "Revelar o endereço de email deste utilizador"
           text: "Mostrar"
+        check_sso:
+          title: "Mostrar carga SSO"
+          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}"
@@ -3154,7 +3472,6 @@ pt:
         silence_reason: "Motivo"
         delete_all_posts: "Eliminar todas as publicações"
         penalty_post_edit: "Editar a mensagem"
-        delete_all_posts_confirm_MF: "Está prestes a apagar {POSTS, plural, one {1 publicação} other {# publicações}} e {TOPICS, plural, one {1 tópico} other {# tópicos}}. Tem a certeza de que quer continuar?"
         moderator: "Moderador?"
         admin: "Administração?"
         suspended: "Suspendido?"
@@ -3268,12 +3585,11 @@ pt:
           on_grace_period: "Atualmente no período de carência da promoção, não será despromovido."
           locked_will_not_be_promoted: "Nível de Confiança bloqueado. Nunca será promovido."
           locked_will_not_be_demoted: "Nível de Confiança bloqueado. Nunca será despromovido."
-        sso:
-          title: "Inscrição Única"
+        discourse_connect:
           external_id: "ID Externo"
-          external_username: "Nome de Utilizador"
+          external_username: "Nome de utilizador"
           external_name: "Nome"
-          external_email: "Email"
+          external_email: "E-mail"
           external_avatar_url: "URL da Fotografia de Perfil"
       user_fields:
         title: "Campos de utilizador"
@@ -3308,7 +3624,7 @@ pt:
         field_types:
           text: "Campo de Texto"
           confirm: "Confirmação"
-          dropdown: "Suspenso"
+          dropdown: "Lista pendente"
       site_text:
         description: "Pode personalizar qualquer texto no seu fórum. Por favor comece por pesquisar abaixo:"
         search: "Pesquisar o texto que gostaria de editar"
@@ -3398,6 +3714,9 @@ pt:
         enabled: Ativar crachá
         icon: Ícone
         image: Imagem
+        graphic: Gráfico
+        select_an_icon: "Selecione um Ícone"
+        upload_an_image: "Enviar uma Imagem"
         query: Query do Crachá (SQL)
         target_posts: '"Query" direcionada a publicações'
         auto_revoke: Executar diariamente a "query" de revogação
@@ -3458,6 +3777,9 @@ pt:
         embed_post_limit: "Número máximo de publicações a incorporar"
         embed_title_scrubber: "Expressão regular usada para filtrar o título de publicações"
         embed_truncate: "Omitir as mensagens incorporadas"
+        allowed_embed_selectors: "Seletor CSS para elementos que são permitidos nas incorporações"
+        blocked_embed_selectors: "Seletor CSS para elementos que são removidos das incorporações"
+        allowed_embed_classnames: "Nomes de classes CSS permitidas"
         save: "Guardar Configurações de Incorporação"
       permalink:
         title: "Hiperligações Permanentes"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 23283f8064..361f78f37f 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -113,7 +113,7 @@ pt_BR:
           one: "%{count} ano depois"
           other: "%{count} anos depois"
       previous_month: "Mês Anterior"
-      next_month: "Mês Seguinte"
+      next_month: "Próximo Mês"
       placeholder: data
     share:
       topic_html: 'Tópico: <span class="topic-title">%{topicTitle}</span>'
@@ -158,6 +158,12 @@ pt_BR:
     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."
+    software_update_prompt:
+      message: "Nós atualizamos este site, <span>por favor recarregue a página</span>, ou você poderá enfrentar um comportamento inesperado."
+      dismiss: "Dispensar"
+    bootstrap_mode_enabled:
+      one: "Para facilitar o lançamento do seu novo site, você está no modo de bootstrap. Todos os novos usuários receberão o nível de confiança 1 e terão os e-mails diários de resumo ativados. Isso será desativado automaticamente quando %{count} usuários se registrarem."
+      other: "Para facilitar o lançamento do seu novo site, você está no modo de bootstrap. Todos os novos usuários receberão o nível de confiança 1 e terão os e-mails diários de resumo ativados. Isso será desativado automaticamente quando %{count} usuários se registrarem."
     bootstrap_mode_disabled: "O modo bootstrap será desativado em 24 horas."
     themes:
       default_description: "Padrão"
@@ -166,6 +172,7 @@ pt_BR:
       regions:
         ap_northeast_1: "Ásia Pacífico (Tóquio)"
         ap_northeast_2: "Ásia Pacífico (Seul)"
+        ap_east_1: "Ásia Pacífico (Hong Kong)"
         ap_south_1: "Ásia-Pacífico (Mumbai)"
         ap_southeast_1: "Ásia Pacífico (Singapura)"
         ap_southeast_2: "Ásia Pacífico (Sidney)"
@@ -184,6 +191,7 @@ pt_BR:
         us_gov_west_1: "AWS GovCloud (EUA-Oeste)"
         us_west_1: "Oeste do EUA (N. da Califórnia)"
         us_west_2: "Oeste do EUA (Oregon)"
+    clear_input: "Limpar entrada"
     edit: "edite o título e a categoria deste tópico"
     expand: "Expandir"
     not_implemented: "Este recurso ainda não foi implementado, desculpe!"
@@ -218,6 +226,9 @@ pt_BR:
     now: "agora"
     read_more: "leia mais"
     more: "Mais"
+    x_more:
+      one: "Mais %{count}"
+      other: "Mais %{count}"
     less: "Menos"
     never: "nunca"
     every_30_minutes: "a cada 30 minutos"
@@ -246,8 +257,9 @@ pt_BR:
       moderators: "Moderadores"
       stat:
         all_time: "Desde o Começo"
-        last_7_days: "Últimos 7"
-        last_30_days: "Últimos 30"
+        last_day: "Últimas 24 horas"
+        last_7_days: "Últimos 7 dias"
+        last_30_days: "Últimos 30 dias"
       like_count: "Curtidas"
       topic_count: "Tópicos"
       post_count: "Mensagens"
@@ -283,17 +295,6 @@ pt_BR:
       search_placeholder: "Pesquisar os favoritos por nome, título do tópico ou conteúdo da mensagem"
       search: "Pesquisar"
       reminders:
-        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: "Segunda-feira"
-        start_of_next_business_week_alt: "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}"
@@ -303,13 +304,13 @@ pt_BR:
     drafts:
       resume: "Resumir"
       remove: "Remova"
+      remove_confirmation: "Tem certeza de que deseja excluir este rascunho?"
       new_topic: "Novo rascunho de tópico"
       new_private_message: "Novo rascunho de mensagem privada"
       topic_reply: "Resposta rascunho"
       abandon:
-        confirm: "Você já abriu outro rascunho neste tópico. Você tem certeza de que deseja descartá-lo?"
-        yes_value: "Sim, descartar."
-        no_value: "Não, manter."
+        confirm: "Você tem um rascunho em andamento para este tópico. O que você gostaria de fazer com ele?"
+        yes_value: "Descartar"
     topic_count_latest:
       one: "Veja %{count} tópico novo ou atualizado"
       other: "Veja %{count} tópicos novos ou atualizados"
@@ -321,6 +322,7 @@ pt_BR:
       other: "Veja %{count} novos tópicos"
     preview: "pré-visualização"
     cancel: "cancelar"
+    deleting: "Excluindo..."
     save: "Salvar Mudanças"
     saving: "Salvando..."
     saved: "Salvo!"
@@ -405,6 +407,7 @@ pt_BR:
       topic: "Tópico:"
       filtered_topic: "Você filtrou para conteúdo de revisão em um único tópico."
       filtered_user: "Usuário"
+      filtered_reviewed_by: "Revisado Por"
       show_all_topics: "mostrar todos os tópicos"
       deleted_post: "(postagem excluída)"
       deleted_user: "(usuário excluído)"
@@ -415,10 +418,11 @@ pt_BR:
         email: "E-mail"
         name: "Nome"
         fields: "Campos"
+        reject_reason: "Motivo"
       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} (da última flag)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (das últimas %{count} flags)"
         agreed:
           one: "%{count}% concorda"
           other: "%{count}% concordam"
@@ -461,7 +465,8 @@ pt_BR:
           created_at_asc: "Criado Em (reverso)"
         priority:
           title: "Prioridade Mínima"
-          low: "(qualquer)"
+          any: "(qualquer um)"
+          low: "Baixa"
           medium: "Média"
           high: "Alta"
       conversation:
@@ -499,6 +504,8 @@ pt_BR:
           title: "Postagem Enfileirada"
         reviewable_user:
           title: "Usuário"
+        reviewable_post:
+          title: "Postagem"
       approval:
         title: "Postagem Precisa de Aprovação"
         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."
@@ -506,6 +513,40 @@ pt_BR:
           one: "Você tem <strong>%{count}</strong> postagem pendente."
           other: "Você tem postagens <strong>%{count}</strong> pendentes."
         ok: "OK"
+      example_username: "nome de usuário"
+      reject_reason:
+        title: "Por que você está rejeitando esse usuário?"
+        send_email: "Enviar e-mail de rejeição"
+    relative_time_picker:
+      minutes:
+        one: "minuto"
+        other: "minutos"
+      hours:
+        one: "hora"
+        other: "horas"
+      days:
+        one: "dia"
+        other: "dias"
+      months:
+        one: "mês"
+        other: "meses"
+      years:
+        one: "ano"
+        other: "anos"
+      relative: "Relativo"
+    time_shortcut:
+      later_today: "Hoje mais tarde"
+      next_business_day: "Próximo dia útil"
+      tomorrow: "Amanhã"
+      next_week: "Próxima semana"
+      post_local_date: "Data na postagem"
+      later_this_week: "Mais tarde esta semana"
+      start_of_next_business_week: "Segunda-feira"
+      start_of_next_business_week_alt: "Próxima Segunda-feira"
+      next_month: "Próximo mês"
+      custom: "Data e hora personalizadas"
+      relative: "Tempo relativo"
+      none: "Nenhum necessário"
     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>"
@@ -592,6 +633,10 @@ pt_BR:
             imap_ssl: "Usar SSL para IMAP"
             username: "Nome de Usuário"
             password: "Senha"
+          settings:
+            title: "Configurações"
+            allow_unknown_sender_topic_replies: "Permitir que remetentes desconhecidos respondam a tópicos."
+            allow_unknown_sender_topic_replies_hint: "Permite que remetentes desconhecidos respondam a tópicos de grupo. Se não estiver habilitado, respostas de endereços de e-mail não incluídos no tópico de e-mail IMAP ou convidados para o tópico irão criar um novo tópico."
           mailboxes:
             synchronized: "Caixa de Correio Sincronizada"
             none_found: "Nenhuma caixa de correio foi encontrada nesta conta de e-mail."
@@ -607,6 +652,10 @@ pt_BR:
           tracked_categories_instructions: "Você será inscrito automaticamente em todos os tópicos nestas categorias. Uma contagem de postagens novas aparecerá ao lado do tópico."
           watching_first_post_categories_instructions: "Usuários serão notificados sobre a primeira mensagem postada em cada tópico novo destas categorias."
           regular_categories_instructions: "Se estas categorias forem silenciadas, elas apenas não serão silenciadas para membros do grupo. Os usuários serão notificados se forem mencionados ou se alguém responder a eles."
+          muted_categories_instructions: "Os usuários não serão notificados sobre novos tópicos nessas categorias e eles não aparecerão nas categorias ou nas páginas de tópicos mais recentes."
+        tags:
+          title: Tags
+          long_title: "Notificações padrão das tags"
         logs:
           title: "Registros"
           when: "Quando"
@@ -617,6 +666,10 @@ pt_BR:
           details: "Detalhes"
           from: "De"
           to: "Para"
+      permissions:
+        title: "Permissões"
+        none: "Não há categorias associadas a este grupo."
+        description: "Membros deste grupo podem acessar estas categorias"
       public_admission: "Permitir que os usuários entrem no grupo livremente (Requer grupo publicamente visível)"
       public_exit: "Permitir que os usuários saiam do grupo livremente"
       empty:
@@ -666,7 +719,7 @@ pt_BR:
         is_group_user: "Membro"
         is_group_owner: "Proprietário"
       title:
-        one: "Grupos "
+        one: "Grupo"
         other: "Grupos"
       activity: "Atividade"
       members:
@@ -679,7 +732,22 @@ pt_BR:
         make_owner_description: "Tornar <b>%{username}</b> um proprietário deste grupo"
         remove_owner: "Remover como Proprietário"
         remove_owner_description: "Remover <b>%{username}</b> como um proprietário deste grupo"
+        make_primary: "Tornar Primário"
+        make_primary_description: "Tornar este grupo como primário para <b>%{username}</b>"
+        remove_primary: "Remover como Primário"
+        remove_primary_description: "Remover este grupo como primário para <b>%{username}</b>"
+        remove_members: "Remover Membros"
+        remove_members_description: "Remover usuários selecionados deste grupo"
+        make_owners: "Tornar Proprietários"
+        make_owners_description: "Tornar usuários selecionados como proprietários deste grupo"
+        remove_owners: "Remover Proprietários"
+        remove_owners_description: "Remover usuários selecionados como proprietários deste grupo"
+        make_all_primary: "Tornar Primário para Todos"
+        make_all_primary_description: "Tornar este o grupo primário de todos os usuários selecionados"
+        remove_all_primary: "Remover como Primário"
+        remove_all_primary_description: "Remover este grupo comp primário"
         owner: "Proprietário"
+        primary: "Primário"
         forbidden: "Você não tem permissão para visualizar os membros."
       topics: "Tópicos"
       posts: "Postagens"
@@ -751,18 +819,22 @@ pt_BR:
       posts: "Postagens"
       topics: "Tópicos"
       latest: "Últimos"
-      latest_by: "últimos por"
       toggle_ordering: "alternar controle de ordenação"
       subcategories: "Subcategorias"
+      muted: "Categorias silenciadas"
       topic_sentence:
         one: "%{count} tópico"
         other: "%{count} tópicos"
+      topic_stat_unit:
+        week: "semana"
+        month: "mês"
       topic_stat_sentence_week:
         one: "%{count} novo tópico na última semana."
         other: "%{count} novos tópicos na última semana."
       topic_stat_sentence_month:
         one: "%{count} novo tópico no último mês."
         other: "%{count} novos tópicos no último mês."
+      n_more: "Categorias (mais %{count})..."
     ip_lookup:
       title: Pesquisa do Endereço de IP
       hostname: Nome do host
@@ -816,7 +888,20 @@ pt_BR:
         mute_option_title: "Você não receberá notificações relacionadas a este usuário."
         normal_option: "Normal"
         normal_option_title: "Você será notificado se este usuário responder a você, citá-lo ou mencioná-lo."
+      notification_schedule:
+        midnight: "Meia-noite"
+        none: "Nenhum"
+        monday: "Segunda-feira"
+        tuesday: "Terça-feira"
+        wednesday: "Quarta-feira"
+        thursday: "Quinta-feira"
+        friday: "Sexta-feira"
+        saturday: "Sábado"
+        sunday: "Domingo"
+        to: "para"
       activity_stream: "Atividade"
+      read: "Lidos"
+      read_help: "Tópicos lidos recentemente"
       preferences: "Preferências"
       feature_topic_on_profile:
         open_search: "Selecione um Novo Tópico"
@@ -845,19 +930,23 @@ pt_BR:
         perm_denied_expl: "Você negou permissão para notificações. Permita notificações nas configurações do seu navegador."
         disable: "Desativar Notificações"
         enable: "Ativar Notificações"
-        each_browser_note: "Obs.: Você deve modificar esta configuração em todos os navegadores que você usa."
+        each_browser_note: 'Nota: Você deve alterar esta configuração em cada navegador que você usa. Todas as notificações serão desabilitadas quando em "não perturbe", independente desta configuração.'
         consent_prompt: "Você quer notificações ao vivo quando as pessoas respondem às suas postagens?"
       dismiss: "Descartar"
       dismiss_notifications: "Descartar Tudo"
       dismiss_notifications_tooltip: "Marcar todas as notificações não lidas como lidas"
+      no_notifications_title: "Você ainda não tem nenhuma notificação"
       first_notification: "Sua primeira notificação! Selecione-a para começar."
       dynamic_favicon: "Mostrar contagens no ícone do navegador"
       theme_default_on_all_devices: "Definir este tema como padrão em todos os meus dispositivos"
+      color_schemes:
+        undo: "Redefinir"
+        regular: "Normal"
       text_size_default_on_all_devices: "Definir este tamanho de texto como padrão em todos os meus dispositivos"
       allow_private_messages: "Permitir que outros usuários me enviem mensagens pessoais"
       external_links_in_new_tab: "Abrir todos os links externos em uma nova aba"
       enable_quoting: "Habilitar resposta citando o texto destacado"
-      enable_defer: "Habilitar adiar para marcar tópicos não lidos"
+      enable_defer: "Habilitar adiar para marcar tópicos como não lidos"
       change: "alterar"
       featured_topic: "Tópico em Destaque"
       moderator: "%{user} é um moderador"
@@ -867,7 +956,8 @@ pt_BR:
       silenced_tooltip: "Este usuário está silenciado"
       suspended_notice: "Este usuário está suspenso até %{date}."
       suspended_permanently: "Este usuário está suspenso."
-      suspended_reason: "Motivo:"
+      suspended_reason: "Motivo: "
+      github_profile: "GitHub"
       email_activity_summary: "Resumo de Atividades"
       mailing_list_mode:
         label: "Modo lista de correio"
@@ -898,6 +988,8 @@ pt_BR:
       muted_categories: "Silenciadas"
       muted_categories_instructions: "Você não será notificado de nada sobre novos tópicos nestas categorias, e eles não aparecerão nas categorias ou nas últimas páginas."
       muted_categories_instructions_dont_hide: "Você não será notificado de nada sobre novos tópicos nestas categorias."
+      regular_categories: "Normal"
+      regular_categories_instructions: "Você verá essas categorias nas listas de tópicos “Recentes” e “Melhores”."
       no_category_access: "Como um moderador, você tem acesso limitado à categorias, salvar está desabilitado."
       delete_account: "Excluir Minha Conta"
       delete_account_confirm: "Você tem certeza de que deseja permanentemente excluir a sua conta? Esta ação não pode ser desfeita!"
@@ -942,6 +1034,7 @@ pt_BR:
         tags: "Etiquetas"
       preferences_nav:
         account: "Conta"
+        security: "Segurança"
         profile: "Perfil"
         emails: "E-mails"
         notifications: "Notificações"
@@ -1034,6 +1127,7 @@ pt_BR:
         uploaded_avatar_empty: "Adicionar uma imagem personalizada"
         upload_title: "Enviar sua imagem"
         image_is_not_a_square: "Aviso: nós cortamos a sua imagem; largura e altura não eram iguais."
+        logo_small: "Logotipo pequeno do site. Usado por padrão."
       change_profile_background:
         title: "Cabeçalho do Perfil"
         instructions: "Os cabeçalhos do perfil serão centralizados e terão uma largura padrão de 1110px."
@@ -1056,7 +1150,6 @@ pt_BR:
         set_primary: "Defina o E-mail Primário"
         destroy: "Retire o e-mail"
         add_email: "Adicione E-mail Alternativo"
-        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"
@@ -1096,6 +1189,7 @@ pt_BR:
         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"
+        edit: "Editar nome de usuário"
       locale:
         title: "Idioma da interface"
         instructions: "Idioma da interface do usuário. Será alterado quando você atualizar a página."
@@ -1188,50 +1282,43 @@ pt_BR:
         after_10_minutes: "depois de 10 minutos"
       notification_level_when_replying: "Quando eu postar em um tópico, definir aquele tópico como"
       invited:
-        search: "digite para pesquisar convites..."
         title: "Convites"
+        pending_tab: "Pendentes"
+        pending_tab_with_count: "Pendentes (%{count})"
+        redeemed_tab: "Usados"
+        redeemed_tab_with_count: "Usados (%{count})"
+        invited_via: "Convite"
+        groups: "Grupos"
+        topic: "Tópico"
+        edit: "Editar"
+        remove: "Remova"
+        reinvite: "Reenviar e-mail"
+        reinvited: "Convite reenviado"
+        search: "digite para pesquisar convites..."
         user: "Usuário Convidado"
-        sent: "Último envio"
         none: "Não há convites para exibir."
         truncated:
           one: "Mostrando o primeiro convite."
           other: "Mostrando os primeiros %{count} convites."
         redeemed: "Convites Usados"
-        redeemed_tab: "Usados"
-        redeemed_tab_with_count: "Usados (%{count})"
         redeemed_at: "Usado"
         pending: "Convites Pendentes"
-        pending_tab: "Pendentes"
-        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: "Remova Convites Vencidos"
-        rescinded_all: "Todos os Convites Expirados removidos!"
-        rescind_all_confirm: "Você tem certeza de que deseja remover todos os convites expirados?"
-        reinvite: "Reenviar Convite"
-        reinvite_all: "Reenviar todos os Convites"
+        remove_all: "Remova Convites Vencidos"
+        removed_all: "Todos os Convites Expirados removidos!"
+        remove_all_confirm: "Você tem certeza de que deseja remover todos os convites expirados?"
         reinvite_all_confirm: "Você tem certeza de que deseja reenviar todos os convites?"
-        reinvited: "Convite reenviado"
-        reinvited_all: "Todos os Convites foram reenviados!"
         time_read: "Tempo de Leitura"
         days_visited: "Dias Visitados"
         account_age_days: "Idade da conta em dias"
-        source: "Convidado Via"
-        links_tab: "Links"
-        links_tab_with_count: "Links (%{count})"
-        link_url: "Link"
-        link_created_at: "Criado"
-        link_groups: Grupos
+        create: "Convite"
         valid_for: "Link do convite é válido apenas para este endereço de e-mail: %{email}"
         invite_link:
           success: "Link do convite gerado com sucesso!"
         bulk_invite:
-          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."
       password:
         title: "Senha"
         too_short: "A sua senha é muito curta."
@@ -1295,6 +1382,7 @@ pt_BR:
       avatar:
         title: "Imagem de Perfil"
         header_title: "perfil, mensagens, favoritos e preferências"
+        edit: "Editar Imagem de Perfil"
       title:
         title: "Título"
         none: "(nenhum)"
@@ -1332,7 +1420,6 @@ pt_BR:
       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."
     refresh: "Atualizar"
     home: "Início"
@@ -1352,15 +1439,6 @@ pt_BR:
       exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erro/hora} other {# erros/hora}}</a> ultrapassou o limite de configuração do site de {limit, plural, one {# erro/hora} other {# erros/hora}}."
       exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erro/minuto} other {# erros/minuto}}</a> ultrapassou o limite de configuração do site de {limit, plural, one {# erro/minuto} other {# erros/minuto}}."
     learn_more: "saber mais..."
-    all_time: "total"
-    all_time_desc: "total de tópicos criados"
-    year: "ano"
-    year_desc: "tópicos criados nos últimos 365 dias"
-    month: "mês"
-    month_desc: "tópicos criados nos últimos 30 dias"
-    week: "semana"
-    week_desc: "tópicos criados nos últimos 7 dias"
-    day: "dia"
     first_post: Primeira postagem
     mute: Silenciar
     unmute: Remover Silêncio
@@ -1378,13 +1456,10 @@ pt_BR:
       sign_up: "Cadastrar-se"
       hide_session: "Me lembrar amanhã"
       hide_forever: "não obrigado"
-      hidden_for_session: "OK, eu vou te perguntar amanhã. Você sempre pode usar o 'Entrar' também para criar uma conta."
       intro: "Tudo bom? Parece que você está gostando da discussão, mas ainda não se cadastrou para uma conta."
       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>."
       enable: "Resumir Este Tópico"
       disable: "Exibir Todas as Postagens"
     deleted_filter:
@@ -1394,6 +1469,9 @@ pt_BR:
       disable: "Mostrar Postagens Excluídas"
     private_message_info:
       title: "Mensagem"
+      invite: "Convidar Outros..."
+      edit: "Adicionar ou Remover..."
+      add: "Adicionar..."
       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?"
@@ -1405,8 +1483,8 @@ pt_BR:
     trust_level: "Nível de Confiança"
     search_hint: "nome de usuário, e-mail ou endereço IP"
     create_account:
+      header_title: "Bem-Vindo!"
       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:
       title: "Redefinição de Senha"
@@ -1436,7 +1514,6 @@ pt_BR:
       logging_in_as: Fazendo login como %{email}
       confirm_button: Terminar Login
     login:
-      title: "Entrar"
       username: "Usuário"
       password: "Senha"
       second_factor_description: "Por favor, digite o código de autenticação do seu aplicativo:"
@@ -1449,7 +1526,6 @@ pt_BR:
       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."
-      email_placeholder: "e-mail ou nome de usuário"
       caps_lock_warning: "Caps Lock está ativado"
       error: "Erro desconhecido"
       cookies_error: "Seu navegador parece ter cookies desativados. Você pode não conseguir efetuar login sem ativá-los primeiro."
@@ -1492,7 +1568,7 @@ pt_BR:
         title: "com GitHub"
       discord:
         name: "Discord"
-        title: "com Discórdia"
+        title: "com Discord"
       second_factor_toggle:
         totp: "Use um aplicativo autenticador"
         backup_code: "Use um código de backup"
@@ -1506,6 +1582,7 @@ pt_BR:
       accept_invite: "Aceitar Convite"
       success: "Sua conta foi criada e você já está logado."
       name_label: "Nome"
+      password_label: "Senha"
       optional_description: "(opcional)"
     password_reset:
       continue: "Continuar para %{site_name}"
@@ -1513,7 +1590,6 @@ pt_BR:
       apple_international: "Apple/Internacional"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (anteriormente EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1532,6 +1608,8 @@ pt_BR:
     conditional_loading_section:
       loading: Carregando...
     select_kit:
+      filter_by: "Filtrar por: %{name}"
+      select_to_filter: "Selecione um valor para filtrar"
       default_header_text: Selecionar...
       no_content: Nenhuma correspondência encontrada
       filter_placeholder: Pesquisar...
@@ -1543,11 +1621,12 @@ pt_BR:
       min_content_not_reached:
         one: "Selecione pelo menos %{count} item."
         other: "Selecione pelo menos %{count} itens."
+      components:
+        tag_drop:
+          filter_for_more: Filtre para ver mais...
     date_time_picker:
       from: De
       to: Para
-      errors:
-        to_before_from: "Até a data deve ser posterior a partir da data."
     emoji_picker:
       filter_placeholder: Pesquisar por emoji
       smileys_&_emotion: Smileys e Emotion
@@ -1569,7 +1648,6 @@ 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>."
       destination_category: "Categoria de Destino"
       publish: "Publicar Rascunho Compartilhado"
       confirm_publish: "Você tem certeza de que deseja publicar este rascunho?"
@@ -1580,7 +1658,6 @@ pt_BR:
       options: "Opções"
       whisper: "sussuro"
       unlist: "não listado"
-      blockquote_text: "Bloco de Citação"
       add_warning: "Esta é uma advertência oficial."
       toggle_whisper: "Alternar Sussuro"
       toggle_unlisted: "Alternar Não Listado"
@@ -1599,10 +1676,7 @@ pt_BR:
       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"
         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}?"
         category_missing: "Você precisa escolher uma categoria"
         topic_template_not_modified: "Por favor, adicione detalhes e especificações ao seu tópico editando o modelo do tópico."
@@ -1632,8 +1706,6 @@ pt_BR:
       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"
       quote_post_title: "Citar postagem inteira"
       bold_label: "N"
       bold_title: "Negrito"
@@ -1646,10 +1718,10 @@ pt_BR:
       link_dialog_title: "Inserir Hyperlink"
       link_optional_text: "título opcional"
       link_url_placeholder: "Cole uma URL ou digite para pesquisar tópicos"
-      quote_title: "Bloco de Citação"
-      quote_text: "Bloco de Citação"
+      blockquote_title: "Bloco de Citação"
+      blockquote_text: "Bloco de Citação"
       code_title: "Texto pré-formatado"
-      code_text: "identar texto pré-formatado por 4 espaços"
+      code_text: "recuar o texto pré-formatado em 4 espaços"
       paste_code_text: "digite ou cole o código aqui"
       upload_title: "Enviar"
       upload_description: "digite aqui a descrição do arquivo enviado"
@@ -1693,10 +1765,11 @@ pt_BR:
           label: "Novo Tópico"
         shared_draft:
           label: "Rascunho Compartilhado"
-          desc: "Elabore um tópico que será visível somente para a staff"
         toggle_topic_bump:
           label: "Alternar promoção de tópico"
           desc: "Responder sem alterar a data da última resposta"
+      reload: "Recarregar"
+      ignore: "Ignorar"
     notifications:
       tooltip:
         regular:
@@ -1721,6 +1794,10 @@ pt_BR:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} e %{count} outro</span> %{description}"
+        other: "<span class='multi-user'>%{username}, %{username2} e %{count} outros</span> %{description}"
       liked_consolidated_description:
         one: "curtiu %{count} de suas postagens"
         other: "curtiu %{count} de suas postagens"
@@ -1735,6 +1812,8 @@ pt_BR:
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Novo Tópico</span> %{description}"
       membership_request_accepted: "Afiliação aceita em '%{group_name}'"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       group_message_summary:
         one: "%{count} mensagem na caixa de entrada de %{group_name}"
         other: "%{count} mensagens na caixa de entrada de %{group_name}"
@@ -1773,16 +1852,15 @@ pt_BR:
         liked_consolidated: "novas curtidas"
         post_approved: "publicação aprovada"
         membership_request_consolidated: "novas solicitações de associação"
+        reaction: "nova reação"
     upload_selector:
       title: "Adicionar uma imagem"
       title_with_attachments: "Adicionar uma imagem ou um arquivo"
       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}"
       local_tip: "selecione imagens a partir do seu dispositivo"
-      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: "(você também pode arrastar e soltar no editor para fazer upload)"
       hint_for_supported_browsers: "você também pode arrastar e soltar no editor para enviá-las"
       uploading: "Enviando"
       select_file: "Selecionar Arquivo"
@@ -1812,10 +1890,11 @@ pt_BR:
       or_search_google: "Ou tente pesquisar com o Google:"
       search_google: "Tente pesquisar com o Google em vez disso:"
       search_google_button: "Google"
+      search_button: "Pesquisar"
       context:
         user: "Pesquisar postagens por @%{username}"
         category: "Pesquisar a categoria #%{category}"
-        tag: "Pesquisar a #%{tag} etiqueta"
+        tag: "Pesquisar a tag #%{tag}"
         topic: "Pesquisar este tópico"
         private_messages: "Pesquisar mensagens"
       advanced:
@@ -1856,16 +1935,27 @@ pt_BR:
           noreplies: não possuem respostas
           single_user: contém um único usuário
         post:
+          count:
+            label: Mensagens
+          min:
+            placeholder: mínimo
+          max:
+            placeholder: máximo
           time:
             label: Postado
             before: antes
             after: depois
+        views:
+          label: Visualizações
+        min_views:
+          placeholder: mínimo
+        max_views:
+          placeholder: máximo
     hamburger_menu: "ir para outra listagem de tópicos ou categoria"
     new_item: "novo"
     go_back: "voltar"
     not_logged_in_user: "página do usuário com resumo de atividades e preferências atuais"
     current_user: "ir para a sua página de usuário"
-    view_all: "ver tudo"
     topics:
       new_messages_marker: "última visita"
       bulk:
@@ -1886,6 +1976,7 @@ pt_BR:
         change_category: "Definir Categoria"
         close_topics: "Fechar Tópicos"
         archive_topics: "Arquivar Tópicos"
+        move_messages_to_inbox: "Mover para Caixa de entrada"
         notification_level: "Notificações"
         choose_new_category: "Escolha a nova categoria para os tópicos:"
         selected:
@@ -1904,8 +1995,6 @@ pt_BR:
         bookmarks: "Você ainda não tem nenhum tópico favorito."
         category: "Não há tópicos na categoria %{category}."
         top: "Não há melhores tópicos."
-        educate:
-          unread: '<p>Seus tópicos não lidos aparecem aqui.</p><p>Por padrão, tópicos são considerados como não lidos e irão mostrar contadores <span class="badge new-posts badge-notification">1</span> se você:</p><ul><li>Criou o tópico</li><li>Respondeu ao tópico</li><li>Leu o tópico por mais de 4 minutos</li></ul><p>Ou se você explicitamente colocou o tópico como Monitorado ou Observado através do controle de notificações na parte inferior de cada tópico.</p><p>Visite suas <a href="%{userPrefsUrl}">preferências</a> para alterar isto.</p>'
       bottom:
         latest: "Não há mais últimos tópicos."
         posted: "Não há mais tópicos postados."
@@ -1913,6 +2002,7 @@ pt_BR:
         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}."
+        tag: "Não há mais tópicos na categoria %{tag}."
         top: "Não há mais melhores tópicos."
         bookmarks: "Não há mais tópicos favoritos."
     topic:
@@ -1934,7 +2024,7 @@ pt_BR:
         title: "Editar"
       defer:
         help: "Marcar como não lido"
-        title: "Delegar"
+        title: "Adiar"
       feature_on_profile:
         help: "Adicionar um link para este tópico em seu cartão de usuário e perfil"
         title: "Recurso no Perfil"
@@ -1981,13 +2071,29 @@ pt_BR:
       read_more_in_category: "Quer ler mais? Veja outros tópicos em %{catLink} ou %{latestLink}."
       read_more: "Quer ler mais? %{catLink} ou %{latestLink}."
       unread_indicator: "Nenhum membro leu a última postagem deste tópico ainda."
-      read_more_MF: "Há { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>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
       jump_reply_up: pular para a primeira resposta
       jump_reply_down: pular para a última resposta
       deleted: "Este tópico foi excluído"
+      slow_mode_update:
+        save: "Habilitar"
+        remove: "Desabilitar"
+        hours: "Horas:"
+        minutes: "Minutos:"
+        seconds: "Segundos:"
+        durations:
+          10_minutes: "10 Minutos"
+          15_minutes: "15 Minutos"
+          30_minutes: "30 Minutos"
+          45_minutes: "45 Minutos"
+          1_hour: "1 Hora"
+          2_hours: "2 Horas"
+          4_hours: "4 Horas"
+          8_hours: "8 Horas"
+          12_hours: "12 Horas"
+          24_hours: "24 Horas"
       topic_status_update:
         title: "Temporizador de Tópico"
         save: "Definir Temporizador"
@@ -1996,21 +2102,22 @@ pt_BR:
         remove: "Remover Temporizador"
         publish_to: "Publicar Em:"
         when: "Quando:"
-        time_frame_required: Por favor selecione um período de tempo
+        time_frame_required: "Por favor selecione um período de tempo"
       auto_update_input:
         none: "Selecione um período de tempo"
+        now: "Agora"
         later_today: "Mais tarde hoje"
         tomorrow: "Amanhã"
         later_this_week: "Mais tarde nesta semana"
         this_weekend: "Este fim de semana"
         next_week: "Próxima semana"
-        two_weeks: "Duas Semanas"
+        two_weeks: "Duas semanas"
         next_month: "Próximo mês"
-        two_months: "Dois Meses"
-        three_months: "Três Meses"
-        four_months: "Quatro Meses"
-        six_months: "Seis Meses"
-        one_year: "Um Ano"
+        two_months: "Dois meses"
+        three_months: "Três meses"
+        four_months: "Quatro meses"
+        six_months: "Seis meses"
+        one_year: "Um ano"
         forever: "Para Sempre"
         pick_date_and_time: "Escolha data e hora"
         set_based_on_last_post: "Fechar baseado na última postagem"
@@ -2024,7 +2131,7 @@ pt_BR:
         title: "Fechar Temporariamente"
       auto_close:
         title: "Fechar Tópico Automaticamente"
-        label: "Horas para fechar tópico automaticamente:"
+        label: "Fechar tópico automaticamente após:"
         error: "Por favor insira um valor válido."
         based_on_last_post: "Não fechar até que a última postagem do tópico tenha pelo menos esta idade."
       auto_delete:
@@ -2037,9 +2144,9 @@ pt_BR:
         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}."
+        auto_close: "Este tópico fechará automaticamente %{timeLeft}."
         auto_publish_to_category: "Este tópico será publicado em <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Este tópico fechará %{duration} após a última resposta."
+        auto_close_after_last_post: "Este tópico fechará %{duration} após a última resposta."
         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}."
@@ -2059,7 +2166,6 @@ pt_BR:
         go: "ir"
         jump_bottom: "pular para a última postagem"
         jump_prompt: "pular para..."
-        jump_prompt_of: "de %{count} postagens"
         jump_prompt_long: "Pular para..."
         jump_bottom_with_number: "pular para postagem %{post_number}"
         jump_prompt_to_date: "até agora"
@@ -2071,12 +2177,15 @@ pt_BR:
         reasons:
           mailing_list_mode: "Você está com o modo de lista de discussão ativado, portanto será notificado sobre as respostas deste tópico por e-mail."
           "3_10": "Você receberá notificações porque está acompanhando uma etiqueta neste tópico."
+          "3_10_stale": "Você receberá notificações porque estava acompanhando uma tag nesse tópico no passado."
           "3_6": "Você receberá notificações porque você está observando esta categoria."
+          "3_6_stale": "Você receberá notificações porque estava acompanhando essa categoria no passado."
           "3_5": "Você receberá notificações porque começou a observar este tópico automaticamente."
           "3_2": "Você receberá notificações porque está observando este tópico."
           "3_1": "Você receberá notificações porque criou este tópico."
           "3": "Você receberá notificações porque você está observando este tópico."
           "2_8": "Você verá uma contagem de novas respostas porque está acompanhando esta categoria."
+          "2_8_stale": "Você verá uma contagem de novas respostas porque você estava acompanhando essa categoria no passado."
           "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/notifications">leu esse tópico</a>.'
@@ -2143,6 +2252,7 @@ pt_BR:
         title: "Compartilhar"
         extended_title: "Compartilhar um link"
         help: "compartilhar um link deste tópico"
+        invite_users: "Convite"
       print:
         title: "Imprimir"
         help: "Abrir uma versão imprimível deste tópico"
@@ -2194,14 +2304,13 @@ pt_BR:
         username_placeholder: "nome de usuário"
         action: "Enviar Convite"
         help: "Convidar outros para este tópico por e-mail ou notificação"
-        to_forum: "Nós vamos mandar um e-mail curto permitindo seu amigo a entrar e responder a este tópico clicando em um link, sem necessidade de entrar."
-        sso_enabled: "Entrar o nome de usuário da pessoa que você gostaria de convidar para este tópico."
+        discourse_connect_enabled: "Entrar o nome de usuário da pessoa que você gostaria de convidar para este tópico."
         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 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>%{invitee}</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."
@@ -2310,11 +2419,10 @@ pt_BR:
         other: "(tópico retirado pelo autor, será automaticamente excluído em %{count} horas a menos que seja sinalizado)"
     post:
       quote_reply: "Citação"
+      quote_share: "Compartilhar"
       edit_reason: "Motivo:"
       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}:"
@@ -2322,8 +2430,8 @@ pt_BR:
       show_full: "Exibir mensagem completa"
       show_hidden: "Ver o conteúdo ignorado."
       deleted_by_author:
-        one: "(respostas abandonadas pelo autor, serão removidas automaticamente em %{count} hora a exceto se forem sinalizadas)"
-        other: "(respostas abandonadas pelo autor, serão removidas automaticamente em %{count} horas a exceto se forem sinalizadas)"
+        one: "(postagem retirada pelo autor, será automaticamente excluída em %{count} hora a menos que seja sinalizada)"
+        other: "(postagem retirada pelo autor, será automaticamente excluída em %{count} horas a menos que seja sinalizada)"
       collapse: "colapso"
       expand_collapse: "expandir/encolher"
       locked: "um membro da equipe bloqueou este post de ser editado"
@@ -2337,6 +2445,7 @@ pt_BR:
       has_replies:
         one: "%{count} Resposta"
         other: "%{count} Respostas"
+      unknown_user: "(usuário desconhecido/excluído)"
       has_likes_title:
         one: "%{count} pessoa curtiu esta postagem"
         other: "%{count} pessoas curtiram esta postagem"
@@ -2344,6 +2453,9 @@ pt_BR:
       has_likes_title_you:
         one: "você e mais %{count} pessoa curtiram esta postagem"
         other: "você e mais %{count} outras pessoas curtiram esta postagem"
+      filtered_replies_viewing:
+        one: "Exibindo %{count} resposta a"
+        other: "Vendo %{count} respostas a"
       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."
@@ -2354,16 +2466,11 @@ pt_BR:
         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."
-      abandon_edit:
-        confirm: "Você tem certeza que deseja descartar suas alterações?"
-        no_value: "Não, manter."
-        no_save_draft: "Não, salvar rascunho"
-        yes_value: "Sim, descartar edição"
-      abandon:
-        confirm: "Tem certeza que quer abandonar a sua mensagem?"
-        no_value: "Não, manter"
-        no_save_draft: "Não, salvar rascunho"
-        yes_value: "Sim, abandone"
+      cancel_composer:
+        confirm: "O que gostaria de fazer com sua postagem?"
+        discard: "Descartar"
+        save_draft: "Salvar rascunho para depois"
+        keep_editing: "Continuar editando"
       via_email: "post recebido via e-mail"
       via_auto_generated_email: "esta mensagem chegou através de um e-mail gerado automaticamente"
       whisper: "esta mensagem é um sussuro privado para moderadores"
@@ -2489,6 +2596,11 @@ pt_BR:
           edit_bookmark:
             name: "Editar favorito"
             description: "Editar o nome do favorito ou alterar a data e hora do lembrete"
+      filtered_replies:
+        viewing_posts_by: "Vendo %{post_count} postagens de"
+        viewing_subset: "Algumas respostas estão ocultas"
+        viewing_summary: "Vendo um resumo deste tópico"
+        show_all: "Mostrar tudo"
     category:
       can: "pode&hellip; "
       none: "(sem categoria)"
@@ -2537,6 +2649,11 @@ pt_BR:
       change_in_category_topic: "Editar Descrição"
       already_used: "Esta cor já foi usada para outra categoria"
       security: "Segurança"
+      permissions:
+        group: "Grupo"
+        see: "Ver"
+        reply: "Responder"
+        create: "Criar"
       special_warning: "Atenção: Esta categoria é uma categoria padrão e as configurações de segurança e não podem ser editadas. Se você não quer usar esta categoria, apague-a ao invés de reaproveitá-la."
       uncategorized_security_warning: "Esta categoria é especial. Ela é destinada para tópicos que não têm categoria; ela não pode ter configurações de segurança."
       uncategorized_general_warning: 'Esta categoria é especial. Ela é usada como a categoria padrão para novos tópicos que não possuem uma categoria selecionada. Se você quiser evitar este comportamento e forçar a seleção de categoria, <a href="%{settingLink}">desative a configuração aqui</a>. Se você quiser alterar o nome ou a descrição, vá para <a href="%{customizeLink}">Personalização / Conteúdo de Texto</a>.'
@@ -2573,19 +2690,19 @@ pt_BR:
       notifications:
         watching:
           title: "Observar"
-          description: "Você vai observar automaticamente todos os tópicos destas categorias. Você será notificado de todas as novas mensagens em todos os tópicos. Além disso, a contagem de novas respostas também será exibida."
+          description: "Você vai observar automaticamente todos os tópicos nesta categoria. Você será notificado de todas as novas mensagens em todos os tópicos. Além disso, uma contagem de novas respostas será exibida."
         watching_first_post:
           title: "Observando o primeiro post"
           description: "Você será notificado sobre novos tópicos nesta categoria, mas não sobre respostas aos tópicos."
         tracking:
           title: "Monitorar"
-          description: "Você vai acompanhar automaticamente todos os tópicos destas categorias. Você será notificado se alguém mencionar o seu @nome ou responder para você. Além disso, a contagem de novas respostas também será exibida."
+          description: "Você vai acompanhar automaticamente todos os tópicos nesta categoria. Você será notificado se alguém mencionar o seu @nome ou responder para você. Além disso, uma contagem de novas respostas será exibida."
         regular:
           title: "Normal"
           description: "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem."
         muted:
           title: "Silenciar"
-          description: "Você nunca será notificado sobre novos tópicos nestas categorias, e não aparecerão no Recentes."
+          description: "Você nunca será notificado sobre novos tópicos nesta categoria e eles não aparecerão em Recentes."
       search_priority:
         label: "Prioridade de Pesquisa"
         options:
@@ -2626,10 +2743,11 @@ pt_BR:
           details: "Atingir o limiar de denuncias imediatamente, ao invés de esperar para mais denuncias da comunidade"
         suspend:
           title: "Suspender usuário"
+        silence:
+          title: "Silenciar Usuário"
       notify_action: "Mensagem"
       official_warning: "Aviso Oficial"
       delete_spammer: "Apagar Spammer"
-      delete_confirm_MF: "Você está prestes a remover {POSTS, plural, one {<b>1</b> postagem} other {<b>#</b> postagens}} e {TOPICS, plural, one {<b>1</b> tópico} other {<b>#</b> tópicos}} deste usuário, removendo a conta, bloqueando cadastro a partir do endereço IP <b>{ip_address}</b>, e adicionando o e-mail dele <b>{e-mail}</b> em uma lista de bloqueio permanente. Você tem certeza que este usuário é realmente um spammer?"
       yes_delete_spammer: "Sim, Apagar Spammer"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(escondido)"
@@ -2696,12 +2814,6 @@ pt_BR:
         title: "Este tópico é uma mensagem pessoal"
         help: "Este tópico é uma mensagem pessoal"
     posts: "Postagens"
-    posts_likes_MF: |
-      Este tópico tem {count, plural, one {1 resposta} other {# respostas}} {ratio, select,
-      low {com uma proporção alta de curtidas}
-      med {com uma proporção muito alta de curtidas}
-      high {com uma proporção extremamente alta de curtidas}
-      other {}}
     original_post: "Resposta original"
     views: "Visualizações"
     views_lowercase:
@@ -2709,7 +2821,7 @@ pt_BR:
       other: "visualizações"
     replies: "Respostas"
     views_long:
-      one: "este tópico foi visto uma vez"
+      one: "este tópico foi visto %{count} vez"
       other: "este tópico foi visto %{number} vezes"
     activity: "Atividade"
     likes: "Curtidas"
@@ -2721,7 +2833,6 @@ pt_BR:
       one: "usuário"
       other: "usuários"
     category_title: "Categoria"
-    history: "Histórico"
     changed_by: "por %{author}"
     raw_email:
       title: "Detalhes dos Emails Recebidos"
@@ -2934,10 +3045,10 @@ pt_BR:
       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>."
+      synonyms_description: "Quando as seguintes tags 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 tag pertence ao grupo: %{tag_groups}.'
+        other: "Esta tag pertence aos grupos: %{tag_groups}."
       category_restrictions:
         one: "Pode ser usada nesta categoria:"
         other: "Pode ser usada nestas categorias:"
@@ -2952,8 +3063,8 @@ pt_BR:
       delete_synonym_confirm: 'Você tem certeza que deseja excluir o sinônimo "%{tag_name}"?'
       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?"
+        one: "Tem certeza de que deseja excluir esta etiqueta e removê-la de %{count} tópico para o qual ela está atribuída?"
+        other: "Tem certeza de que deseja excluir esta etiqueta 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."
@@ -2970,16 +3081,16 @@ pt_BR:
       upload_instructions: "Uma por linha, opcionalmente com um grupo de etiquetas no formato 'nome_etiqueta,grupo_etiqueta'."
       upload_successful: "Etiquetas enviadas com sucesso"
       delete_unused_confirmation:
-        one: "%{count} etiqueta será excluída: %{etiquetas}"
-        other: "%{count} etiquetas serão excluídas: %{etiquetas}"
+        one: "%{count} etiqueta será excluída: %{tags}"
+        other: "%{count} etiquetas serão excluídas: %{tags}"
       delete_unused_confirmation_more_tags:
-        one: "%{etiquetas} e %{count} mais"
-        other: "%{etiquetas} e %{count} mais"
+        one: "%{tags} e %{count} mais"
+        other: "%{tags} e %{count} mais"
       delete_unused: "Excluir Etiquetas Não Usadas"
       delete_unused_description: "Excluir todas as etiquetas que não estão anexadas a nenhum tópico ou mensagem pessoal"
       cancel_delete_unused: "Cancelar"
       filters:
-        without_category: "%{filter} %{category} Tópicos"
+        without_category: "%{filter} %{tag} Tópicos"
         with_category: "%{filter} %{tag} tópicos em %{category}"
         untagged_without_category: "%{filter} tópicos não etiquetados"
         untagged_with_category: "%{filter} tópicos não etiquetados em %{category}"
@@ -3037,6 +3148,16 @@ pt_BR:
       dismiss: "Descartar"
     safe_mode:
       enabled: "O modo seguro está habilitado. Para sair do modo seguro feche esta janela do navegador"
+    do_not_disturb:
+      title: "Não perturbe por..."
+      label: "Não perturbe"
+      remaining: "%{remaining} restantes"
+      options:
+        half_hour: "30 minutos"
+        one_hour: "1 hora"
+        two_hours: "2 horas"
+        tomorrow: "Até amanhã"
+        custom: "Definidos"
   admin_js:
     type_to_filter: "escreva para filtrar..."
     admin:
@@ -3064,6 +3185,9 @@ pt_BR:
         installed_version: "Instalado"
         latest_version: "Última versão"
         problems_found: "Alguns conselhos baseados nas configurações atuais do seu site"
+        new_features:
+          title: "\U0001F381 Novos Recursos"
+          dismiss: "Dispensar"
         last_checked: "Última verificação"
         refresh_problems: "Atualizar"
         no_problems: "Nenhum problema encontrado."
@@ -3116,6 +3240,9 @@ pt_BR:
           view_table: "tabela"
           view_graph: "gráfico"
           refresh_report: "Atualizar Relatório"
+          daily: Diariamente
+          monthly: Mensalmente
+          weekly: Semanalmente
           dates: "Datas (UTC)"
           groups: "Todos os grupos"
           disabled: "Este relatório está desativado"
@@ -3149,10 +3276,6 @@ pt_BR:
             available: "O nome do grupo está disponível"
             not_available: "O nome do grupo não está disponível"
             blank: "O nome do grupo não pode ficar em branco"
-        bulk_add:
-          title: "Adicionar em massa ao grupo"
-          complete_users_not_added: "Esses usuários não foram adicionados (verifique se eles têm uma conta):"
-          paste: "Cole uma lista de nomes de usuários ou e-mails, um por linha:"
         add_members:
           as_owner: "Definir usuário (s) como proprietário (s) deste grupo"
         manage:
@@ -3177,7 +3300,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_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"
@@ -3230,6 +3352,8 @@ pt_BR:
         revoked: Revogada
         not_shown_again: Esta chave não será exibida novamente. Certifique-se de tirar uma cópia antes de continuar.
         continue: Continuar
+        scopes:
+          action: Ação
       web_hooks:
         title: "Webhooks"
         none: "Não existem webhooks no momento."
@@ -3244,7 +3368,6 @@ pt_BR:
         go_back: "Volta à lista"
         payload_url: "URL do Payload"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Parece que você está tentando configurar um webhook para uma URL local. Eventos entregues a endereços locais podem causar efeitos colaterais ou comportamentos inesperados. Continuar?"
         secret_invalid: "O segredo não deve conter caracteres em branco."
         secret_too_short: "O segredo deve ter pelo menos 12 caracteres."
         secret_placeholder: "Um texto opcional, usado para gerar assinatura"
@@ -3272,7 +3395,6 @@ pt_BR:
           details: "Quando existir uma nova resposta, edição, deleção ou recuperação."
         user_event:
           name: "Evento de Usuário"
-          details: "Quando um usuário efetua login, efetua logout, é criado, aprovado ou atualizado."
         group_event:
           name: "Evento de Grupo"
           details: "Quando um grupo é criado, atualizado ou destruído."
@@ -3291,6 +3413,9 @@ pt_BR:
         user_badge_event:
           name: "Evento de Concessão de Emblema"
           details: "Quando um usuário recebe um emblema."
+        like_event:
+          name: "Evento de Curtida"
+          details: "Quando um usuário curte uma postagem."
         delivery_status:
           title: "Status de Entrega"
           inactive: "Inativo"
@@ -3362,7 +3487,7 @@ pt_BR:
           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 %{operation} falhou. Por favor, cheque os registros."
           cancel:
             label: "Cancelar"
             title: "Cancelar a operação atual"
@@ -3826,6 +3951,7 @@ pt_BR:
             override_upload_secure_status: "Sobrescrever o status seguro do upload"
             page_published: "página publicada"
             page_unpublished: "página despublicada"
+            delete_group: "apagar grupo"
         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."
@@ -3872,30 +3998,20 @@ pt_BR:
         title: "Palavras assistidas"
         search: "pesquisa"
         clear_filter: "Limpo"
-        show_words: "mostrar palavras"
-        one_word_per_line: "Uma palavra por linha"
         download: Download
         clear_all: Limpar Todos
-        clear_all_confirm_block: "Tem certeza de que deseja limpar todas as palavras observadas para a ação Bloquear?"
-        clear_all_confirm_censor: "Tem certeza de que deseja limpar todas as palavras observadas para a ação Censor?"
-        clear_all_confirm_flag: "Tem certeza de que deseja limpar todas as palavras observadas para a ação Sinalizar?"
-        clear_all_confirm_require_approval: "Tem certeza de que deseja limpar todas as palavras observadas para a ação Exigir aprovação?"
-        word_count:
-          one: "%{count} palavra"
-          other: "%{count} palavras"
         actions:
           block: "Bloqueado"
           censor: "Censor"
           require_approval: "Requerer aprovação"
           flag: "Bandeira,Sinalização"
+          replace: "Substituir"
         action_descriptions:
           block: "Impedir que postagens contendo estas palavras sejam postadas. O usuário verá uma mensagem de erro quando tentar enviar a postagem."
           censor: "Permitir postagens contendo estas palavras, mas substituí-las por caracteres que ocultem as palavras censuradas."
           require_approval: "As postagens contendo estas palavras exigirão aprovação da equipe antes que elas possam ser vistas."
           flag: "Permita postagens contendo estas palavras, mas sinalize-as como impróprias para que os moderadores possam analisá-las."
         form:
-          label: "Nova Palavra:"
-          placeholder: "palavra completa ou * como curinga"
           placeholder_regexp: "expressão regular"
           add: "Adicionar"
           success: "Sucesso"
@@ -3949,6 +4065,8 @@ pt_BR:
         check_email:
           title: "Mostrar endereço de e-mail deste usuário"
           text: "Mostrar"
+        check_sso:
+          text: "Exibir"
       user:
         suspend_failed: "Algo deu errado suspendendo este usuário %{error}"
         unsuspend_failed: "Algo deu errado reativando este usuário %{error}"
@@ -3956,6 +4074,7 @@ pt_BR:
         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."
         suspend_reason: "Motivo"
+        suspend_reason_title: "Razão de Suspensão"
         suspend_message: "Mensagem de e-mail"
         suspend_message_placeholder: "Opcionalmente, forneça mais informações sobre a suspensão e ela será enviada para o usuário por e-mail."
         suspended_by: "Suspenso por"
@@ -3981,7 +4100,6 @@ pt_BR:
         clear_penalty_history:
           title: "Limpar Histórico de Penalidades"
           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: "Remover silenciamento"
         silenced: "Silenciado?"
@@ -4029,6 +4147,9 @@ 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"
+        delete_posts:
+          progress:
+            title: "Progresso da exclusão de postagens"
         merge:
           button: "Mesclar"
           prompt:
@@ -4062,7 +4183,7 @@ pt_BR:
           one: "Não é possível excluir todas as mensagens. Algumas mensagens são mais antigas do que %{count} dia. (Configuração delete_user_max_post_age.)"
           other: "Não é possível remover todas as mensagens. Algumas mensagens são mais antigas do que %{count} dias. (Configuração delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
-          one: "Não pode remover porque o usuário tem mais de uma mensagem (delete_all_posts_max)"
+          one: "Não pode remover porque o usuário tem mais de %{count} mensagem (delete_all_posts_max)"
           other: "Não pode remover porque o usuário tem mais de %{count} mensagens. (delete_all_posts_max)"
         delete_confirm: "Geralmente é preferível anonimizar usuários ao invés de excluí-los, para evitar remover conteúdo de discussões existentes.<br><br>Você tem CERTEZA de que deseja excluir este usuário? Esta ação é permanente!"
         delete_and_block: "Deletar e <b>bloquear</b> este e-mail e endereço IP"
@@ -4132,12 +4253,11 @@ pt_BR:
           on_grace_period: "Atualmente em período de aprovação da promoção, não será demovido."
           locked_will_not_be_promoted: "Nível de confiança travado. Nunca será promovido."
           locked_will_not_be_demoted: "Nível de confiança travado. Nunca será demovido."
-        sso:
-          title: "Único Login"
+        discourse_connect:
           external_id: "ID Externo"
-          external_username: "Usuário"
+          external_username: "Nome de Usuário"
           external_name: "Nome"
-          external_email: "Email"
+          external_email: "E-mail"
           external_avatar_url: "URL da Imagem de Perfil"
       user_fields:
         title: "Campos de Usuários"
@@ -4169,6 +4289,10 @@ pt_BR:
           title: "Exibir no cartão de usuário?"
           enabled: "exibir no cartão de usuário"
           disabled: "não exibido no cartão de usuário"
+        searchable:
+          title: "Pesquisável?"
+          enabled: "pesquisável"
+          disabled: "não pesquisável"
         field_types:
           text: "Campo Texto"
           confirm: "Confirmação"
@@ -4276,7 +4400,6 @@ pt_BR:
         icon: Ícone
         image: Imagem
         icon_help: "Digite um nome de ícone do tipo Font Awesome (use o prefixo 'far-' para ícones regulares e 'fab-' para ícones de marca)"
-        image_help: "Digite o URL da imagem (substitui o campo de ícone se ambos estiverem configurados)"
         query: Badge Query (SQL)
         target_posts: Consultar respostas selecionadas
         auto_revoke: Rodar revocation query todo dia
@@ -4350,6 +4473,9 @@ pt_BR:
         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."
+        allowed_embed_selectors: "Seletor de CSS para elementos que são permitidos na incorporação"
+        blocked_embed_selectors: "Seletor de CSS para elementos que são removidos da incorporação"
+        allowed_embed_classnames: "Nomes de classes CSS permitidas"
         save: "Salvar Configurações de Incorporação"
       permalink:
         title: "Links permanentes"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 1c2d401450..963c8f49a2 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -113,6 +113,10 @@ ro:
           one: "acum o zi"
           few: "acum %{count} zile"
           other: "acum %{count} de zile"
+        x_months:
+          one: "acum %{count} luni"
+          few: "acum %{count} luni"
+          other: "acum %{count} de luni"
       later:
         x_days:
           one: "După o zi"
@@ -172,6 +176,13 @@ ro:
     topic_admin_menu: "acțiuni subiect"
     wizard_required: "Bine ai venit la noul tău Discourse! Să începem cu <a href='%{url}' data-auto-route='true'>expertul de configurare</a> ✨"
     emails_are_disabled: "Trimiterea de emailuri a fost dezactivată global de către un administrator. Nu vor fi trimise notificări email de nici un fel."
+    software_update_prompt:
+      message: "Site-ul a fost actualizat! <span>Reîmprospătează pagina</span>."
+      dismiss: "Renunță"
+    bootstrap_mode_enabled:
+      one: "Pentru a simplifica lansarea noului site, sunteți în modul bootstrap. Toți utilizatorii noi vor primi nivelul 1 de încredere și vor avea activată primirea zilnică de e-mail-uri rezumat. Această funcționalitate va fi oprită automat după ce se înregistrează primii %{count} membri."
+      few: "Pentru a simplifica lansarea noului dv. site, sunteți în modul bootstrap. Toți utilizatorii noi vor primi nivelul 1 de încredere și vor avea activată primirea zilnică de e-mail-uri rezumat. Această funcționalitate va fi oprită automat după ce se înregistrează primii %{count} membri."
+      other: "Pentru a simplifica lansarea noului dv. site, sunteți în modul bootstrap. Toți utilizatorii noi vor primi nivelul 1 de încredere și vor avea activată primirea zilnică de e-mail-uri rezumat. Această funcționalitate va fi oprită automat după ce se înregistrează primii %{count} membri."
     bootstrap_mode_disabled: "Modul bootstrap va fi dezactivat în următoarele 24 de ore"
     themes:
       default_description: "Implicit"
@@ -198,6 +209,7 @@ ro:
         us_gov_west_1: "AWS GovCloud (SUA-Vest)"
         us_west_1: "US West (N. California)"
         us_west_2: "US West (Oregon)"
+    clear_input: "Șterge"
     edit: "Editează titlul și categoria acestui subiect"
     expand: "Extinde"
     not_implemented: "Această funcționalitate nu a fost implementată încă."
@@ -233,6 +245,10 @@ ro:
     now: "Acum"
     read_more: "Citește mai mult"
     more: "Mai mult"
+    x_more:
+      one: "Mai e %{count}"
+      few: "Mai e %{count}"
+      other: "Mai e %{count}"
     less: "Mai puțin"
     never: "Niciodată"
     every_30_minutes: "La fiecare 30 de minute"
@@ -262,8 +278,9 @@ ro:
       moderators: "Moderatori"
       stat:
         all_time: "Tot timpul"
-        last_7_days: "Ultimele 7"
-        last_30_days: "Ultimele 30"
+        last_day: "Ultimele 24 de ore"
+        last_7_days: "Ultimele 7 zile"
+        last_30_days: "Ultimele 30 de zile"
       like_count: "Aprecieri"
       topic_count: "Subiecte"
       post_count: "Postări"
@@ -299,17 +316,6 @@ ro:
       search_placeholder: "Căutați marcaje după nume, titlul subiectului sau conținutul postării"
       search: "Caută"
       reminders:
-        later_today: "Mai târziu azi"
-        next_business_day: "Următoarea zi lucrătoare"
-        tomorrow: "Mâine"
-        next_week: "Săptămâna viitoare"
-        later_this_week: "Mai târziu săptămâna asta"
-        start_of_next_business_week: "Luni"
-        start_of_next_business_week_alt: "Lunea viitoare"
-        next_month: "Luna viitoare"
-        custom: "Data și ora personalizată"
-        last_custom: "Ultima"
-        none: "Nu este necesar un memento"
         today_with_time: "astăzi la %{time}"
         tomorrow_with_time: "mâine la %{time}"
         at_time: "la %{date_time}"
@@ -319,13 +325,14 @@ ro:
     drafts:
       resume: "Reluați"
       remove: "Eliminați"
+      remove_confirmation: "Ești sigur că vrei să ștergi această ciornă?"
       new_topic: "Ciornă subiect nou"
       new_private_message: "Ciornă mesaj privat nou"
       topic_reply: "Răspuns ciornă"
       abandon:
-        confirm: "Ai o altă ciornă pentru acest subiect. Sigur o abandonezi?"
-        yes_value: "Da, abandonează."
-        no_value: "Nu, păstrează."
+        confirm: "Ai o schiță în curs pentru acest subiect. Ce ai vrea să faci mai departe?"
+        yes_value: "Renunță"
+        no_value: "Reia editarea"
     topic_count_latest:
       one: "Un subiect nou sau actualizat."
       few: "%{count} subiecte noi sau actualizate."
@@ -340,6 +347,7 @@ ro:
       other: "Afișați %{count} subiecte noi"
     preview: "Previzualizează"
     cancel: "Anulează"
+    deleting: "Ștergere..."
     save: "Salvează schimbările"
     saving: "Se salvează..."
     saved: "Salvat!"
@@ -421,6 +429,7 @@ ro:
       topic: "Subiect:"
       filtered_topic: "Ai ales conținutul care poate fi revizuit dintr-un singur subiect."
       filtered_user: "Utilizatori"
+      filtered_reviewed_by: "Revizuit de"
       show_all_topics: "arată toate subiectele"
       deleted_post: "(postare ștearsă)"
       deleted_user: "(utilizator șters)"
@@ -431,6 +440,7 @@ ro:
         email: "Email"
         name: "Nume"
         fields: "Câmpuri"
+        reject_reason: "Motiv"
       user_percentage:
         agreed:
           one: "%{count}% este de acord"
@@ -446,14 +456,28 @@ ro:
           other: "%{count}% ignoră"
       topics:
         topic: "Discuție"
+        reviewable_count: "Număr"
+        reported_by: "Raportat de"
+        deleted: "[Subiect șters]"
+        original: "(topic inițial)"
         details: "detalii"
+        unique_users:
+          one: "%{count} utilizator"
+          few: "%{count} utilizatori"
+          other: "%{count} utilizatori"
+      replies:
+        one: "%{count} răspuns"
+        few: "%{count} răspunsuri"
+        other: "%{count} răspunsuri"
       edit: "Editează"
       save: "Salvează"
       cancel: "Anulează"
+      new_topic: "Aprobarea acestui element va crea un subiect nou"
       filters:
         all_categories: "(toate categoriile)"
         type:
           title: "Tip"
+          all: "(toate tipurile)"
         minimum_score: "Scor minim:"
         refresh: "Reîmprospătează"
         status: "Status"
@@ -465,7 +489,7 @@ ro:
           created_at_asc: "Creat la (invers)"
         priority:
           title: "Prioritate minimă"
-          low: "(oricare)"
+          any: "(oricare)"
           medium: "Medie"
           high: "Ridicată"
       conversation:
@@ -503,6 +527,8 @@ ro:
           title: "Postare în așteptare"
         reviewable_user:
           title: "Utilizatori"
+        reviewable_post:
+          title: "Postare"
       approval:
         title: "Necesită aprobare"
         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."
@@ -511,6 +537,24 @@ ro:
           few: "Ai <strong>%{count}</strong> postări în așteptare."
           other: "Ai <strong>%{count}</strong> postări în așteptare."
         ok: "Ok"
+      example_username: "nume de utilizator"
+      reject_reason:
+        send_email: "Trimite un e-mail de respingere"
+    relative_time_picker:
+      days:
+        one: "zi"
+        few: "Zile"
+        other: "zile"
+    time_shortcut:
+      later_today: "Mai târziu azi"
+      next_business_day: "Următoarea zi lucrătoare"
+      tomorrow: "Mâine"
+      next_week: "Săptămâna viitoare"
+      later_this_week: "Mai târziu săptămâna asta"
+      start_of_next_business_week: "Luni"
+      start_of_next_business_week_alt: "Lunea viitoare"
+      next_month: "Luna viitoare"
+      custom: "Data și ora personalizată"
     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>"
@@ -598,6 +642,8 @@ ro:
             imap_ssl: "Folosește SSL pentru IMAP"
             username: "Nume utilizator"
             password: "Parolă"
+          settings:
+            title: "Setări"
           mailboxes:
             synchronized: "Cutie poștală sincronizată"
             none_found: "Nu au fost găsite cutii poștale în acest cont de e-mail."
@@ -615,6 +661,7 @@ ro:
           regular_categories_instructions: "Dacă aceste categorii sunt dezactivate, vor fi deblocate pentru membrii grupului. Utilizatorii vor fi notificați dacă sunt menționați sau cineva le răspunde."
         tags:
           title: Etichete
+          description: "Când utilizatorii sunt adăugați la acest grup, setările lor de notificare a etichetei vor fi setate la aceste valori implicite. Ulterior, le pot schimba."
         logs:
           title: "Jurnale"
           when: "Când"
@@ -764,7 +811,6 @@ ro:
       posts: "Postări"
       topics: "Subiecte"
       latest: "Cele mai recente"
-      latest_by: "Cele mai recente după"
       toggle_ordering: "Comută criteriu de aranjare"
       subcategories: "Subcategorii"
       muted: "Categorii dezactivate"
@@ -772,6 +818,9 @@ ro:
         one: "Un subiect"
         few: "%{count} subiecte"
         other: "%{count} de subiecte"
+      topic_stat_unit:
+        week: "săptămană"
+        month: "lună"
     ip_lookup:
       title: Căutare adresă IP
       hostname: Nume gazdă
@@ -787,8 +836,10 @@ ro:
       topics_entered: "Subiecte la care particip"
       post_count: "# postări"
       confirm_delete_other_accounts: "Ești sigur că vrei să ștergi aceste conturi?"
+      copied: "copiat"
     user_fields:
       none: "(alege o opțiune)"
+      required: 'Te rog introdu o valoare pentru "%{name}"'
     user:
       said: "%{username}:"
       profile: "Profil"
@@ -804,24 +855,51 @@ ro:
       private_messages: "Mesaje"
       user_notifications:
         filters:
+          filter_by: "Filtrare după"
           all: "Toate"
           read: "Citite"
           unread: "Necitite"
+        ignore_duration_title: "Ignoră Utilizatorul"
         ignore_duration_username: "Nume utilizator"
+        ignore_duration_when: "Durată:"
         ignore_duration_save: "Ignoră"
+        ignore_duration_note: "Rețineți că toate ignorările sunt șterse automat după expirarea duratei de ignorare."
+        ignore_duration_time_frame_required: "Te rog selectează un interval de timp"
+        ignore_no_users: "Nu aveți utilizatori ignorați."
+        ignore_option: "Ignorat"
+        ignore_option_title: "Nu vei primi notificări legate de acest utilizator și toate subiectele și răspunsurile acestuia vor fi ascunse."
+        add_ignored_user: "Adaugă..."
         mute_option: "Setate pe silențios"
+        mute_option_title: "Nu vei primi notificări legate de acest utilizator."
         normal_option: "Normal"
+        normal_option_title: "Vei fi notificat dacă acest utilizator îți răspunde, te citează sau te menționează."
+      notification_schedule:
+        none: "Nimeni"
+        monday: "Luni"
+        tuesday: "Marţi"
+        wednesday: "Miercuri"
+        thursday: "Joi"
+        friday: "Vineri"
+        saturday: "Sâmbătă"
+        sunday: "Duminică"
+        to: "către"
       activity_stream: "Activitate"
+      read: "Citite"
       preferences: "Preferințe"
       feature_topic_on_profile:
+        open_search: "Selectează un subiect nou"
+        title: "Selectați un subiect"
+        search_label: "Căutați un subiect după titlu"
         save: "Salvează"
         clear:
           title: "Șterge"
+      use_current_timezone: "Utilizați fusul orar curent"
       profile_hidden: "Acest profil public al utilizatorului este ascuns."
       expand_profile: "Extinde"
       collapse_profile: "Colaps"
       bookmarks: "Semne de carte"
       bio: "Despre mine"
+      timezone: "Fus orar"
       invited_by: "Invitat de"
       trust_level: "Nivel de încredere"
       notifications: "Notificări"
@@ -834,19 +912,28 @@ ro:
         perm_denied_expl: "Ai blocat notificările. Activează notificările din setările browser-ului."
         disable: "Dezactivează notificări"
         enable: "Activează notificările"
-        each_browser_note: "Observație: Setările trebuie modificate pe fiecare browser utilizat."
         consent_prompt: "Vrei să primești notificări atunci când cineva îți răspunde?"
       dismiss: "Înlătură"
       dismiss_notifications: "Elimină tot"
       dismiss_notifications_tooltip: "Marchează toate notificările ca citite"
       first_notification: "Prima notificare pe care ai primit-o! Selectează-o ca să continui. "
+      skip_new_user_tips:
+        skip_link: "Sări peste aceste sfaturi"
+      theme_default_on_all_devices: "Faceți ca aceasta să fie tema implicită pe toate dispozitivele mele"
+      color_scheme_default_on_all_devices: "Setează schema (schemele) de culori implicite pe toate dispozitivele mele"
+      color_scheme: "Schema de culori"
       color_schemes:
-        default_description: "Implicit"
+        default_description: "Tema implicită"
         disable_dark_scheme: "La fel ca de obicei"
+        undo: "Resetare"
+        regular: "Utilizator frecvent"
+        dark: "Mod întunecat"
+      dark_mode: "Mod întunecat"
       allow_private_messages: "Permite altor utilizatori să îmi trimită mesaje private"
       external_links_in_new_tab: "Deschide toate adresele externe într-un tab nou"
       enable_quoting: "Activează citarea răspunsurilor pentru textul selectat"
       change: "Schimbă"
+      featured_topic: "Subiect recomandat"
       moderator: "%{user} este moderator"
       admin: "%{user} este admin"
       moderator_tooltip: "Acest utilizator este moderator"
@@ -855,6 +942,7 @@ ro:
       suspended_notice: "Acest utilizator este suspendat până la %{date}."
       suspended_permanently: "Acest utilizator este suspendat."
       suspended_reason: "Motiv: "
+      github_profile: "GitHub"
       email_activity_summary: "Sumarul activității"
       mailing_list_mode:
         label: " Mod mailing list"
@@ -882,6 +970,7 @@ ro:
       watched_first_post_tags: "Urmărire activă prima postare"
       watched_first_post_tags_instructions: "Vei fi notificat cu privire la prima postare din fiecare nou subiect cu aceste etichete."
       muted_categories: "Setat pe silențios"
+      regular_categories: "Utilizator frecvent"
       no_category_access: "În calitate de moderator ai acces limitat la categorii, salvarea este dezactivată."
       delete_account: "Șterge-mi contul"
       delete_account_confirm: "Ești sigur că vrei să ștergi contul? Această acțiune este ireversibilă!"
@@ -890,6 +979,7 @@ ro:
       admin_delete: "Șterge"
       users: "Utilizatori"
       muted_users: "Silențios"
+      ignored_users: "Ignorat"
       ignored_users_instructions: "Suprimă toate mesajele, notificările și mesajele directe 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."
@@ -923,6 +1013,7 @@ ro:
         tags: "Etichete"
       preferences_nav:
         account: "Cont"
+        security: "Securitate"
         profile: "Profil"
         emails: "Adrese de email"
         notifications: "Notificări"
@@ -955,7 +1046,12 @@ ro:
         edit: "Editează"
         security_key:
           register: "Înregistrare"
+          title: "Chei de securitate"
+          add: "Adaugă cheie de securitate"
+          default_name: "Cheie de securitate principală"
           save: "Salvează"
+          edit_description: "Nume cheie de securitate"
+          name_required_error: "Trebuie să oferi un nume pentru cheia de securitate."
       change_about:
         title: "Schimbare date personale"
         error: "A apărut o eroare la schimbarea acestei valori."
@@ -965,30 +1061,53 @@ ro:
         taken: "Acest nume de utilizator este deja folosit."
         invalid: "Acest nume de utilizator este invalid. Trebuie să includă doar cifre și litere."
       add_email:
+        title: "Adaugă e-mail"
         add: "adaugă"
       change_email:
         title: "Schimbă email"
         taken: "Această adresă există deja în baza de date."
         error: "A apărut o eroare la schimbarea de email. Poate această adresă este deja utilizată?"
         success: "Am trimis un email către adresa respectivă. Urmează instrucțiunile de confirmare."
+        success_via_admin: "Am trimis un e-mail la acea adresă. Utilizatorul va trebui să urmeze instrucțiunile de confirmare din e-mail."
         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='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, bazat pe"
+        gravatar_title: "Schimbă-ți avatarul pe site-ul %{gravatarName}"
+        gravatar_failed: "Nu am putut găsi un %{gravatarName} cu acea adresă de e-mail."
+        refresh_gravatar_title: "Reîmprospătează %{gravatarName}"
         letter_based: "Poză de profil atribuită de sistem."
         uploaded_avatar: "Poză preferată"
         uploaded_avatar_empty: "Adaugă poza preferată"
         upload_title: "Încarcă poza preferată"
         image_is_not_a_square: "Atenţie: poza este decupată, înălțimea și lățimea nu erau egale."
+      change_profile_background:
+        title: "Antet profil"
+        instructions: "Antetele profilului vor fi centrate și au lățimea implicită de 1110px."
       change_card_background:
         title: "Fundal pentru pagina cu date personale"
         instructions: "Fundalul va fi centrat şi va avea o dimensiune standard de 590px."
+      change_featured_topic:
+        title: "Subiect recomandat"
+        instructions: "Un link către acest topic va fi pe cardul tău de utilizator și profil."
       email:
         title: "Email"
+        primary: "E-mail primar"
+        secondary: "E-mailuri secundare"
         primary_label: "primar"
+        unconfirmed_label: "neconfirmat"
+        resend_label: "retrimite e-mail-ul de confirmare"
+        resending_label: "trimitere..."
+        resent_label: "email trimis"
         update_email: "Schimbă email"
+        set_primary: "Setează e-mail principal"
+        destroy: "Elimină e-mail"
+        add_email: "Adaugă e-mail alternativ"
+        no_secondary: "Nici un e-mail secundar"
         instructions: "Niciodată arătat publicului."
         admin_note: "Notă: Un utilizator de administrator care modifică adresa email a altui utilizator non-administrator indică faptul că utilizatorul a pierdut accesul la contul de email original, astfel încât un email de resetare a parolei va fi trimis la noua adresă. Adresa email a utilizatorului nu se va schimba până când acesta nu finalizează procesul de resetare a parolei."
         ok: "Îți vom trimite un email pentru confirmare."
+        required: "Te rugăm să introduci o adresă de e-mail"
         invalid: "Introduceți o adresă de email validă."
         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. "
@@ -1003,10 +1122,14 @@ ro:
         cancel: "Anulează"
         not_connected: "(nu este conectat)"
         confirm_modal_title: "Conectare cont %{provider}"
+        confirm_description:
+          account_specific: "Contul tău %{provider} '%{account_description}' va fi folosit pentru autentificare."
+          generic: "Contul tău %{provider} va fi folosit pentru autentificare."
       name:
         title: "Nume"
         instructions: "Numele tău complet (opțional)"
         instructions_required: "Numele tău complet"
+        required: "Te rugăm să introduci un nume"
         too_short: "Numele este prea scurt."
         ok: "Numele tău este OK."
       username:
@@ -1020,6 +1143,8 @@ ro:
         too_long: "Numele de utilizator este prea lung."
         checking: "Verifică disponibilitatea numelui de utilizator..."
         prefilled: "Emailul se potrivește cu numele de utilizator înregistrat."
+        required: "Te rugăm să introduci un nume de utilizator"
+        edit: "Editează numele de utilizator"
       locale:
         title: "Limba interfeței"
         instructions: "Limba pentru interfața forumului. Schimbarea se va produce odată ce reîmprospătați pagina."
@@ -1027,6 +1152,8 @@ ro:
         any: "oricare"
       password_confirmation:
         title: "Confirmă parola"
+      invite_code:
+        title: "Cod de invitație"
       auth_tokens:
         title: "Dispozitive folosite recent"
         details: "Detalii"
@@ -1039,7 +1166,14 @@ ro:
       website: "Website"
       email_settings: "Email"
       text_size:
+        title: "Dimensiune text"
+        smallest: "Cel mai mic"
+        smaller: "Mai mic"
         normal: "Normal"
+        larger: "Mai mare"
+        largest: "Cel mai mare"
+      title_count_mode:
+        title: "Titlul paginii în fundal afișează numărul de:"
       like_notification_frequency:
         title: "Notificare atunci când se primește apreciere"
         always: "Întotdeauna"
@@ -1056,6 +1190,8 @@ ro:
         every_hour: "În fiecare oră"
         daily: "Zilnic"
         weekly: "Săptămânal"
+        every_month: "în fiecare lună"
+        every_six_months: "la fiecare șase luni"
       email_level:
         title: "Trimite un email când cineva mă citează, îmi răspunde la o postare, menționează numele meu de utilizator, sau mă invită la un subiect."
         always: "întotdeauna"
@@ -1086,8 +1222,18 @@ ro:
         after_10_minutes: "după 10 minute"
       notification_level_when_replying: "Când postez într-un subiect, setează subiectul ca"
       invited:
-        search: "Scrie pentru a căuta invitații..."
         title: "Invitații"
+        pending_tab: "În așteptare"
+        pending_tab_with_count: "În așteptare: (%{count})"
+        redeemed_tab: "Acceptate"
+        redeemed_tab_with_count: "(%{count}) Acceptate"
+        invited_via: "Initație"
+        groups: "Grupuri"
+        topic: "Discuție"
+        edit: "Editează"
+        remove: "Eliminați"
+        reinvited: "Invitaţia a fost retrimisă"
+        search: "Scrie pentru a căuta invitații..."
         user: "Utilizator invitat"
         none: "Nu există invitații."
         truncated:
@@ -1095,33 +1241,20 @@ ro:
           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_at: "Acceptate"
         pending: "Invitații în așteptare"
-        pending_tab: "În așteptare"
-        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."
-        rescind: "Elimină"
-        rescinded: "Invitație eliminată"
-        reinvite: "Retrimite invitaţia"
-        reinvite_all: "Retrimite toate invitațiile"
         reinvite_all_confirm: "Sigur retrimiți toate invitațiile?"
-        reinvited: "Invitaţia a fost retrimisă"
-        reinvited_all: "Toate invitațiile retrimise!"
         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: "Invită"
         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:
-          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:
         title: "Parolă"
@@ -1228,7 +1361,6 @@ ro:
     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."
     refresh: "Reîmprospătează"
     home: "Acasă"
@@ -1237,15 +1369,6 @@ ro:
       login_disabled: "Autentificarea este dezactivată când siteul este în modul exclusiv-citire."
       logout_disabled: "Deautentificarea este dezactivată cât timp site-ul este în modul exclusiv-citire."
     learn_more: "află mai multe..."
-    all_time: "total"
-    all_time_desc: "total subiecte create"
-    year: "an"
-    year_desc: "subiecte create în ultimele 365 de zile"
-    month: "lună"
-    month_desc: "subiecte create în ultimele 30 de zile"
-    week: "săptămană"
-    week_desc: "subiecte create în ultimele 7 zile"
-    day: "zi"
     first_post: Prima postare
     mute: Blochează
     unmute: Deblochează
@@ -1263,13 +1386,10 @@ ro:
       sign_up: "Înregistrare"
       hide_session: "Amintește-mi mai târziu."
       hide_forever: "Nu, mulțumesc"
-      hidden_for_session: "OK, vom reveni. Poți oricând folosi secțiunea de 'Autentificare' pentru a crea un cont."
       intro: "Salut! Se pare că îți place discuția, dar încă nu te-ai înscris pentru un cont."
       value_prop: "Când creezi un cont, ne amintim exact ce ai citit, astfel încât să te întorci întotdeauna de unde ai rămas. Primești de asemenea notificări, aici și prin e-mail, ori de câte ori cineva îți răspunde. Și poți aprecia și comentariile bune. :heartpulse:"
     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>."
       enable: "Fă rezumatul acestui subiect"
       disable: "Arată toate postările"
     deleted_filter:
@@ -1279,6 +1399,7 @@ ro:
       disable: "Arată postările șterse"
     private_message_info:
       title: "Mesaj"
+      add: "Adaugă..."
       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?"
@@ -1290,7 +1411,10 @@ ro:
     trust_level: "Nivel de încredere"
     search_hint: "Numele de utilizator, email sau adresă IP"
     create_account:
-      title: "Creează cont"
+      header_title: "Bun venit!"
+      subheader_title: "Să-ți creăm contul"
+      disclaimer: "Prin înregistrare, ești de acord cu politica de confidențialitate <a href='%{privacy_link}' target='blank'></a> și <a href='%{tos_link}' target='blank'>termenii de utilizare</a>."
+      title: "Creează-ți contul"
       failed: "Ceva s-a întâmplat, poate că acest email este deja înregistrat, încearcă să-ți resetezi parola la link-ul respectiv."
     forgot_password:
       title: "Resetare parolă"
@@ -1299,22 +1423,36 @@ ro:
       reset: "Resetare parolă"
       complete_username: "Dacă contul corespunde cu numele de utilizator <b>%{username}</b>, ar trebui să primești în scurt timp un email cu instrucțiunile de resetare a parolei."
       complete_email: "Dacă un cont corespunde cu <b>%{email}</b>, ar trebui să primești un email în cel mai scurt timp cu instrucțiunile de resetare a parolei."
+      complete_username_found: "Am găsit un cont care se potrivește cu numele de utilizator <b>%{username}</b>. Ar trebui să primiți un e-mail cu instrucțiuni despre cum să resetați parola în scurt timp."
       complete_username_not_found: "Nici un cont nu se potriveşte cu utilizatorul <b>%{username}</b>"
       complete_email_not_found: "Nici un cont nu se potrivește cu adresa <b>%{email}</b>"
       help: "Email-ul nu a sosit? Asigură-te că verifici mai întâi în folderul Spam. <p>Nu ești sigur ce adresă de email folosești? Scrie adresa de email și îți vom spune dacă aceasta există.</p><p>Dacă nu mai ai acces în contul tău la adresa de email, te rog contactează <a href='%{basePath}/about'>echipa de ajutor.</a></p>"
       button_ok: "Ok"
       button_help: "Ajutor"
     email_login:
+      link_label: "Trimite-mi un link de autentificare"
+      login_link: "Sari peste parolă; trimite-mi un link de autentificare"
+      complete_username: "Dacă un cont se potrivește cu numele de utilizator <b>%{username}</b>, ar trebui să primești în scurt timp un e-mail cu un link de autentificare."
+      complete_email: "Dacă un cont se potrivește cu <b>%{email}</b>, ar trebui să primești un e-mail cu un link de conectare în scurt timp."
+      complete_username_found: "Am găsit un cont care se potrivește cu numele de utilizator <b>%{username}</b>, ar trebui să primești în scurt timp un e-mail cu un link de autentificare."
+      complete_email_found: "Am găsit un cont care se potrivește cu <b>%{email}</b>, ar trebui să primești un e-mail cu un link de conectare în scurt timp."
       complete_username_not_found: "Nici un cont nu se potriveşte cu utilizatorul <b>%{username}</b>"
       complete_email_not_found: "Nici un cont nu se potrivește cu adresa <b>%{email}</b>"
       confirm_title: Continuă la %{site_name}
+      logging_in_as: Autentificare ca %{email}
+      confirm_button: Finalizează autentificarea
     login:
+      header_title: "Bine ai revenit"
+      subheader_title: "Conectează-te la contul tau"
       title: "Autentificare"
       username: "Utilizator"
       password: "Parolă"
-      email_placeholder: "email sau nume de utilizator"
+      second_factor_backup: "Autentifică-te folosind un cod de rezervă"
+      second_factor: "Autentifică-te folosind aplicația Autentificator"
+      email_placeholder: "E-mail / Utilizator"
       caps_lock_warning: "Tasta Caps Lock este activă"
       error: "Eroare necunoscută"
+      cookies_error: "Se pare că browser-ul tău are cookie-uri dezactivate. S-ar putea să nu te poți conecta fără să le activezi mai întâi."
       rate_limit: "Te rog așteaptă înainte de a te reconecta."
       blank_username: "Vă rugăm să introduceți adresa dvs. de email sau numele de utilizator."
       blank_username_or_password: "Introdu emailul sau numele de utilizator și parola."
@@ -1326,8 +1464,10 @@ ro:
       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_allowed_from_ip_address: "Nu te poți conecta cu această adresă IP."
       admin_not_allowed_from_ip_address: "Nu te poți conecta ca administrator cu această adresă IP."
       resend_activation_email: "Click aici pentru a retrimite emailul de activare."
+      omniauth_disallow_totp: "Contul tău are autentificarea cu doi factori activată. Te rog să te autentifici cu parola."
       resend_title: "Retrimite emailul de activare"
       change_email: "Schimbă adresa de email"
       provide_new_email: "Furnizează o nouă adresă de email și îți vom retrimite linkul de confirmare."
@@ -1343,11 +1483,17 @@ ro:
         name: "Twitter"
         title: "Twitter"
       instagram:
+        name: "Instagram"
         title: "Instagram"
       facebook:
+        name: "Facebook"
         title: "Facebook"
       github:
+        name: "GitHub"
         title: "GitHub"
+      discord:
+        name: "Discord"
+        title: "cu Discord"
     invites:
       accept_title: "Initație"
       welcome_to: "Bine ai venit la %{site_name}!"
@@ -1357,6 +1503,7 @@ ro:
       accept_invite: "Acceptă invitație"
       success: "Contul tău a fost creat și acum ești logat."
       name_label: "Nume"
+      password_label: "Parolă"
       optional_description: "(opțional)"
     password_reset:
       continue: "Continuă la %{site_name}"
@@ -1372,6 +1519,8 @@ ro:
       categories_with_featured_topics: "Categorii cu subiecte promovate"
       categories_and_latest_topics: "Categorii și subiecte recente"
       categories_and_top_topics: "Categorii și discuții în top"
+      categories_boxes: "Cutii cu subcategorii"
+      categories_boxes_with_topics: "Cutii cu subiecte recomandate"
     shortcut_modifier_key:
       shift: "Shift"
       ctrl: "Ctrl"
@@ -1382,6 +1531,7 @@ ro:
       default_header_text: Selectează...
       no_content: Nu s-au găsit potriviri
       filter_placeholder: Caută...
+      create: "Creează: '%{content}'"
     date_time_picker:
       from: De la
       to: Către
@@ -1392,7 +1542,6 @@ 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>."
       publishing: "Se postează discuția ..."
     composer:
       emoji: "Emoji :)"
@@ -1400,7 +1549,6 @@ ro:
       options: "Opțiuni"
       whisper: "discret"
       unlist: "nelistat"
-      blockquote_text: "Bloc citat"
       add_warning: "Aceasta este o avertizare oficială."
       toggle_whisper: "Comută modul discret"
       toggle_unlisted: "Comută modul nelistat"
@@ -1418,9 +1566,6 @@ ro:
       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"
         category_missing: "Trebuie să alegi o categorie"
       save_edit: "Salvează editarea"
       reply_original: "Răspunde la subiectul inițial"
@@ -1430,6 +1575,7 @@ ro:
       create_topic: "Creează un subiect"
       create_pm: "Mesaj"
       create_whisper: "Șoaptă"
+      create_shared_draft: "Creează ciornă partajată"
       title: "Sau apasă Ctrl+Enter"
       users_placeholder: "Adaugă un utilizator"
       title_placeholder: "Despre ce e vorba în acest subiect - pe scurt?"
@@ -1441,9 +1587,8 @@ ro:
       view_new_post: "Vezi noua ta postare."
       saving: "Se salvează"
       saved: "Salvat!"
+      saved_draft: "Postează schița în curs. Atinge pentru a relua."
       uploading: "Se încarcă..."
-      show_preview: "arată previzualizare &raquo;"
-      hide_preview: "&laquo; ascunde previzualizare"
       quote_post_title: "Citează întreaga postare"
       bold_label: "B"
       bold_title: "Aldin"
@@ -1455,8 +1600,8 @@ ro:
       link_description: "adaugă aici descrierea link-ului"
       link_dialog_title: "Introdu link"
       link_optional_text: "titlu opțional"
-      quote_title: "Bloc citat"
-      quote_text: "Bloc citat"
+      blockquote_title: "Bloc citat"
+      blockquote_text: "Bloc citat"
       code_title: "Text preformatat"
       code_text: "indentează textul preformatat cu 4 spații"
       paste_code_text: "tastează sau lipește cod aici"
@@ -1487,8 +1632,6 @@ ro:
           desc: Răspundeți subiectului, nu unei anumite postări
         create_topic:
           label: "Discuție nouă"
-        shared_draft:
-          desc: "Pregătește o ciornă a unei discuții care va fi vizibilă doar pentru personal"
         toggle_topic_bump:
           label: "Comută bump pentru subiect"
       reload: "Reîncarcă"
@@ -1510,6 +1653,11 @@ ro:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} și încă o persoană</span> %{description}"
+        few: "<span class='multi-user'>%{username}, %{username2} și încă o persoană</span> %{description}"
+        other: "<span class='multi-user'>%{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}"
@@ -1520,6 +1668,8 @@ ro:
       granted_badge: "Ai câștigat '%{description}'"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Subiect nou</span> %{description}"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       popup:
         mentioned: '%{username} te-a menţionat în "%{topic}" - %{site_title}'
         group_mentioned: '%{username} te-a menţionat în "%{topic}" - %{site_title}'
@@ -1528,6 +1678,8 @@ ro:
         posted: '%{username} a postat în "%{topic}" - %{site_title}'
         linked: '%{username} a pus un link către postarea ta din "%{topic}" - %{site_title}'
       titles:
+        bookmark_reminder: "memento semn de carte"
+        bookmark_reminder_with_name: "memento semn de carte - %{name}"
         watching_first_post: "subiect nou"
     upload_selector:
       title: "Adaugă o imagine"
@@ -1535,10 +1687,7 @@ 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}"
       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}"
-      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ă"
       select_file: "Alege fișier"
@@ -1561,6 +1710,7 @@ ro:
       start_new_topic: "Creează un nou subiect?"
       or_search_google: "Sau încearcă să cauți cu Google:"
       search_google_button: "Google"
+      search_button: "Caută"
       context:
         user: "Caută postări după @%{username}"
         category: "Caută în categoria #%{category} "
@@ -1581,9 +1731,11 @@ ro:
         filters:
           likes: pe care le-am apreciat
           posted: în care am postat
+          created: Am creat
           watching: pe care le urmăresc activ
           tracking: le urmăresc
           private: În mesajele mele
+          bookmarks: Am adăugat un semn de carte
           first: sunt chiar pe primul loc în listă
           pinned: sunt fixate
           seen: Citesc
@@ -1598,6 +1750,8 @@ ro:
           noreplies: nu au nici un răspuns
           single_user: au un singur utilizator
         post:
+          count:
+            label: Postări
           min:
             placeholder: minim
           max:
@@ -1636,6 +1790,7 @@ ro:
         change_category: "Alege categoria"
         close_topics: "Închide subiectele"
         archive_topics: "Arhivează subiectele"
+        move_messages_to_inbox: "Mută în „Primite”"
         notification_level: "Notificări"
         choose_new_category: "Alege o nouă categorie pentru acest subiect"
         selected:
@@ -1665,6 +1820,7 @@ ro:
         new: "Nu mai există subiecte noi."
         unread: "Nu mai există subiecte necitite."
         category: "Nu mai există subiecte din categoria %{category}."
+        tag: "Nu mai există subiecte din categoria %{tag}."
         top: "Nu mai există subiecte de top."
         bookmarks: "Nu mai sunt semne de carte."
     topic:
@@ -1729,12 +1885,15 @@ ro:
       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_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 {}}"
+      read_more_MF: "Există { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'># subiect</a> necitit} other { <a href='{basePath}/unread'># subiecte</a> necitite} }{ NEW, plural, =0 {} one {{ BOTH, select, true{&nbsp;și } false {} other{} } <a href='{basePath}/new'># discuție nouă</a>} other {{ BOTH, select, true{&nbsp;și } false {} other{} } <a href='{basePath}/new'># discuții noi</a>} }. {CATEGORY, select, true {Răsfoiește altele subiecte în {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Răsfoiți prin toate categoriile
       view_latest_topics: arată ultimele subiecte
       jump_reply_up: sări la un răspuns mai vechi
       jump_reply_down: sări la un răspuns mai nou
       deleted: "Subiectul a fost șters"
+      slow_mode_update:
+        save: "Activează"
+        remove: "Dezactivează"
       topic_status_update:
         title: "Temporizator subiect"
         save: "Setează temporizator"
@@ -1742,6 +1901,7 @@ ro:
         remove: "Elimină temporizator"
         publish_to: "Publică la:"
         when: "Când:"
+        time_frame_required: "Te rog selectează un interval de timp"
       auto_update_input:
         none: "Alege un interval de timp"
         later_today: "Mai târziu azi"
@@ -1749,11 +1909,7 @@ ro:
         later_this_week: "Mai târziu săptămâna asta"
         this_weekend: "Acest weekend"
         next_week: "Săptămâna viitoare"
-        two_weeks: "Două săptămâni"
         next_month: "Luna viitoare"
-        three_months: "Trei luni"
-        six_months: "6 luni"
-        one_year: "Un an"
         forever: "Pentru totdeanua"
         pick_date_and_time: "Alege data și ora"
         set_based_on_last_post: "Închide pe baza ultimei postări"
@@ -1767,7 +1923,6 @@ ro:
         title: "Închide temporar"
       auto_close:
         title: "Închide automat subiectul"
-        label: "Ore pentru închidere automată a subiectului:"
         error: "Introduceţi o valoare validă."
         based_on_last_post: "Nu închide până când ultima postare din subiect este măcar atât de veche."
       auto_delete:
@@ -1777,7 +1932,7 @@ ro:
       status_update_notice:
         auto_open: "Acest subiect va fi deschis automat la %{timeLeft}."
         auto_close: "Acest subiect va fi automat închis în %{timeLeft}."
-        auto_close_based_on_last_post: "Acest subiect va fi automat închis după %{duration} de la ultimul răspuns."
+        auto_close_after_last_post: "Acest subiect se va închide la %{duration} după ultimul răspuns."
       auto_close_title: "Setări de închidere automată"
       auto_close_immediate:
         one: "Ultima postare din subiect este deja veche de o oră, așa că subiectul va fi închis imediat."
@@ -1794,7 +1949,7 @@ ro:
         go: "mergi"
         jump_bottom: "sari la ultimul mesaj"
         jump_prompt: "sari la..."
-        jump_prompt_of: "din %{count} postări"
+        jump_prompt_long: "Sari la..."
         jump_bottom_with_number: "sari la mesajul %{post_number}"
         jump_prompt_or: "sau"
         total: toate postările
@@ -1809,6 +1964,7 @@ ro:
           "3_2": "Vei primi notificări deoarece urmărești activ acest subiect."
           "3_1": "Vei primi notificări deoarece ai creat acest subiect."
           "3": "Vei primi notificări deoarece urmărești activ acest subiect."
+          "2_4": "Vei vedea numărul răspunsurilor noi deoarece ai adăugat un comentariu în acest subiect."
           "2_2": "Vei vedea numărul răspunsurilor noi deoarece urmărești acest subiect."
           "2": 'You will see a count of new replies because you <a href="%{basePath}/u/%{username}/preferences/notifications">read this topic</a>.'
           "1_2": "Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns."
@@ -1871,6 +2027,7 @@ ro:
       share:
         title: "Distribuie"
         help: "distribuie un link cu acest subiect"
+        invite_users: "Invită"
       print:
         title: "Tipărire"
         help: "Deschide o versiune pentru imprimare a acestui subiect"
@@ -1921,14 +2078,13 @@ ro:
         username_placeholder: "nume utilizator"
         action: "Trimite o invitație"
         help: "invită alţi utilizatori la această discuţie via email sau notificare"
-        to_forum: "Vom trimite un email scurt prietenilor tăi ca să participe făcând click pe o adresă, fără a fi nevoie de autentificare."
-        sso_enabled: "Introdu numele de utilizator al persoanei pe care dorești să o inviți la acest subiect."
+        discourse_connect_enabled: "Introdu numele de utilizator al persoanei pe care dorești să o inviți la acest subiect."
         to_topic_blank: "Introdu numele de utilizator sau adresa de email a persoanei pe care dorești să o inviți la acest subiect."
         to_topic_email: "Ai introdus o adresă de email. Vom trimite către ea un email cu o invitație ce îi va permite prietenului tău să răspundă imediat la acest subiect."
         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>%{invitee}</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."
@@ -1996,9 +2152,9 @@ ro:
           other: "Ai selectat <b>%{count}</b> de mesaje."
     post:
       quote_reply: "Citează"
+      quote_share: "Distribuie"
       edit_reason: "Motivul edit[rii: "
       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}:"
@@ -2039,12 +2195,11 @@ ro:
         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."
-      abandon_edit:
-        no_value: "Nu, păstrează."
-      abandon:
-        confirm: "Ești sigur că dorești să abandonezi postarea?"
-        no_value: "Nu, păstrează"
-        yes_value: "Da, abandonează"
+      cancel_composer:
+        confirm: "Ce ai vrea să faci cu postarea ta?"
+        discard: "Renunță"
+        save_draft: "Salvează schița pentru mai târziu"
+        keep_editing: "Continuă editarea"
       via_email: "această postare a sosit via email"
       via_auto_generated_email: "Această postare a sosit prin intermediul unui email auto-generat"
       whisper: "această postare este doar pentru moderatori (modul discret)"
@@ -2093,6 +2248,10 @@ ro:
         delete_topic: "șterge subiectul"
       actions:
         people:
+          like:
+            one: "a apreciat asta"
+            few: "a apreciat asta"
+            other: "a apreciat asta"
           like_capped:
             one: "și %{count} altul au apreciat asta"
             few: "și %{count} alții au apreciat asta"
@@ -2140,8 +2299,26 @@ ro:
             title: "Arată partea HTML a emailului"
             button: "HTML"
       bookmarks:
+        create: "Creare semn de carte"
+        edit: "Editare semn de carte"
         created: "Creat"
+        updated: "Actualizat"
         name: "Nume"
+        name_placeholder: "Pentru ce este acest semn de carte?"
+        set_reminder: "Aminteşte-mi"
+        actions:
+          delete_bookmark:
+            name: "Ștergere semn de carte"
+            description: "Elimină semnul de carte de pe profilul tău și oprește toate memento-urile pentru semnul de carte"
+          edit_bookmark:
+            name: "Editare semn de carte"
+            description: "Editează numele semnului de carte sau schimbaţi data şi ora memento-ului"
+          pin_bookmark:
+            name: "Fixează semnul de carte"
+            description: "Fixează semnul de carte. Acest lucru îl va face să apară în partea de sus a listei de marcaje."
+          unpin_bookmark:
+            name: "Anulează fixarea semnului de carte"
+            description: "Anulează fixarea semnului de carte. Acesta nu va mai apărea în partea de sus a listei de semne de carte."
     category:
       can: "can&hellip; "
       none: "(nicio categorie)"
@@ -2180,6 +2357,11 @@ ro:
       change_in_category_topic: "Editează descrierea"
       already_used: "Această culoare este folosită la o altă categorie"
       security: "Securitate"
+      permissions:
+        group: "Grup"
+        see: "Doar citire"
+        reply: "Răspunde"
+        create: "Creează"
       special_warning: "Atenție: Această categorie este pre-instalată și setările de securitate nu pot fi editate. Dacă nu dorești să folosești această categorie, va trebui să o ștergi în loc să-i schimbi destinația."
       images: "Imagini"
       email_in: "Adresa email de primire preferențială:"
@@ -2202,22 +2384,20 @@ ro:
       notifications:
         watching:
           title: "Urmărind activ"
-          description: "Vei urmări automat toate subiectele din aceste categorii. Vei fi notificat cu privire la fiecare nouă postare din fiecare subiect, și va fi afișat un contor al noilor răspunsuri."
         watching_first_post:
           title: "Urmărind activ prima postare"
         tracking:
           title: "Urmărire"
-          description: "Vei urmări automat toate subiectele din aceste categorii. Vei fi notificat dacă cineva îți menționează @numele sau îți răspunde, și va fi afișat un contor al noilor răspunsuri."
         regular:
           title: "Normal"
           description: "Vei fi notificat dacă cineva îți menționează @numele sau îți răspunde."
         muted:
           title: "Setat pe silențios"
-          description: "Nu vei fi niciodată notificat cu privire la nimic legat de noile subiecte din aceste categorii și ele nu vor apărea în listă."
       search_priority:
         options:
           normal: "Normal"
           ignore: "Ignoră"
+          high: "Ridicată"
       sort_options:
         default: "implicit"
         likes: "Aprecieri"
@@ -2252,7 +2432,6 @@ ro:
       notify_action: "Mesaj"
       official_warning: "Avertizare oficială"
       delete_spammer: "Șterge spammer"
-      delete_confirm_MF: "Ești pe cale să ștergi {POSTS, plural, one {<b>1</b> postare} other {<b>#</b> postări}} și {TOPICS, plural, one {<b>1</b> subiect} other {<b>#</b> subiecte}} de la acest utilizator, și să îi ștergi contul, blochezi înscrierile de pe IP-ul lui <b>{ip_address}</b>, și să îi adăugi adresa de email <b>{email}</b> pe lista celor blocate permanent. Ești sigur că acest utilizator este spammer?"
       yes_delete_spammer: "Da, șterge spammer"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(ascuns)"
@@ -2321,12 +2500,6 @@ 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_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}
-      med {cu o foarte înaltă de aprecieri pe postare}
-      high {cu o rată extrem de înaltă de aprecieri pe postare}
-      other {}}
     original_post: "Postare inițială"
     views: "Vizualizări"
     views_lowercase:
@@ -2350,7 +2523,6 @@ ro:
       few: "utilizatori"
       other: "de utilizatori"
     category_title: "Categorie"
-    history: "Istoric"
     changed_by: "de %{author}"
     raw_email:
       not_available: "Indisponibil!"
@@ -2435,6 +2607,7 @@ ro:
       readonly: "Doar citire"
     lightbox:
       download: "descărcare"
+      counter: "%curr% din %total%"
     keyboard_shortcuts_help:
       title: "Scurtături de tastatură"
       jump_to:
@@ -2466,6 +2639,15 @@ ro:
         dismiss_new_posts: "%{shortcut} Abandonează postări noi"
         dismiss_topics: "%{shortcut} Abandonează subiecte"
         log_out: "%{shortcut} Ieșire"
+      bookmarks:
+        title: "Semne de carte"
+        enter: "%{shortcut} Salvează și închide"
+        later_today: "%{shortcut} Mai târziu astăzi"
+        later_this_week: "%{shortcut} Mai târziu în această săptămână"
+        tomorrow: "%{shortcut} Mâine"
+        next_week: "%{shortcut} Săptămâna viitoare"
+        next_month: "%{shortcut} Luna viitoare"
+        delete: "%{shortcut} Șterge marcajul de carte"
       actions:
         title: "Acțiuni"
         bookmark_topic: "%{shortcut} Comută semnul de carte pentru subiect"
@@ -2594,6 +2776,10 @@ ro:
       dismiss: "Înlătură"
     safe_mode:
       enabled: "Modul sigur este activat, pentru a ieși din modul sigur închide această fereastră de browser"
+    do_not_disturb:
+      remaining: "a mai rămas %{remaining} ..."
+      options:
+        custom: "Personalizat"
   admin_js:
     type_to_filter: "tastează pentru a filtra..."
     admin:
@@ -2615,6 +2801,8 @@ ro:
         version_check_pending: "Se pare că ai actualizat recent. Fantastic!"
         installed_version: "Instalată"
         latest_version: "Ultima"
+        new_features:
+          dismiss: "Înlătură"
         last_checked: "Ultima verificare"
         refresh_problems: "Reîmprospătează"
         no_problems: "Nu a apărut nicio problemă."
@@ -2646,6 +2834,9 @@ ro:
           view_table: "tabel"
           view_graph: "grafic"
           refresh_report: "Reactualizează raportul"
+          daily: Zilnic
+          monthly: Lunar
+          weekly: Săptămânal
           groups: "Toate grupurile"
           filters:
             group:
@@ -2659,10 +2850,6 @@ ro:
         new:
           title: "Grup nou"
           create: "Creează"
-        bulk_add:
-          title: "Adaugă în grup mai mulți utilizatori odată"
-          complete_users_not_added: "Acești utilizatori nu au fost adăugați (asigură-te că au cont):"
-          paste: "Lipește o listă de utilizatori sau email-uri, câte unul pe linie:"
         manage:
           interaction:
             email: Email
@@ -2702,6 +2889,7 @@ ro:
         user: "Utilizator"
         title: "API"
         created: Creat
+        updated: Actualizat
         generate: "Generare"
         revoke: "Revocă"
         all_users: "Toți utilizatorii"
@@ -2709,6 +2897,8 @@ ro:
         description: Descriere
         save: Salvează
         continue: Continuă
+        scopes:
+          action: țiune
       web_hooks:
         title: "Webhooks"
         none: "Momentan nu există nici un webhook"
@@ -2723,7 +2913,6 @@ ro:
         go_back: "Înapoi la listă"
         payload_url: "URL-ul încărcăturii "
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Se pare că dorești să setezi un webhook pentru un url local. Un eveniment livrat către o adresă locală ar putea avea efecte secundare și genera comportamente neașteptate. Continuă?"
         secret_invalid: "Secretul nu trebuie să aibă nici un caracter spațiu-gol."
         secret_too_short: "Secretul trebuie sa conțină cel puțin 12 caractere."
         secret_placeholder: "Un șir de caractere opțional, folosit la generarea semnăturii"
@@ -2903,6 +3092,7 @@ ro:
           uploads: "Urcări"
           variable_name: "Numele variabilei SCSS:"
           upload: "Urcă"
+          discard: "Renunță"
           css_html: "CSS/HTML personalizat"
           edit_css_html: "Modifică CSS/HTML"
           edit_css_html_help: "Nu ai modificat CSS sau HTML"
@@ -2910,6 +3100,7 @@ ro:
           install_popular: "Populare"
           about_theme: "Despre"
           license: "Licență"
+          version: "Versiune:"
           enable: "Activează"
           disable: "Dezactivează"
           update_to_latest: "Actualizat la ultima"
@@ -3166,7 +3357,6 @@ ro:
       watched_words:
         search: "caută"
         clear_filter: "Șterge"
-        show_words: "arată cuvinte"
         download: Descărcare
         clear_all: Deselectează tot
         actions:
@@ -3175,7 +3365,6 @@ ro:
           require_approval: "Necesită aprobare"
           flag: "Marchează cu marcaj de avertizare"
         form:
-          label: "Cuvânt nou:"
           add: "Adaugă"
           success: "Succes"
         test:
@@ -3217,6 +3406,8 @@ ro:
         check_email:
           title: "Arată adresa de email a acestui utilizator"
           text: "Arată"
+        check_sso:
+          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}"
@@ -3226,6 +3417,7 @@ ro:
         suspend_message: "Mesaj email"
         suspended_by: "Suspendat de"
         silence_reason: "Motiv"
+        silence_modal_title: "Suspendă utilizatorul"
         silence_message: "Mesaj email"
         silence_message_placeholder: "(lăsați necompletat pentru a trimite mesajul implicit)"
         suspended_until: "(până la %{until})"
@@ -3235,7 +3427,6 @@ ro:
         penalty_post_delete: "Șterge postarea"
         penalty_post_edit: "Modifică postarea"
         penalty_post_none: "Nu face nimic"
-        delete_all_posts_confirm_MF: "Ești pe cale să ștergi {POSTS, plural, one {1 postare} other {# postări}} și {TOPICS, plural, one {1 subiect} other {# subiecte}}. Ești sigur?"
         moderator: "Moderator?"
         admin: "Admin?"
         suspended: "Suspendat?"
@@ -3278,6 +3469,7 @@ ro:
         delete: "Ștergere utilizator"
         merge:
           prompt:
+            target_username_placeholder: "Numele de utilizator al noului proprietar"
             cancel: "Anulează"
           confirmation:
             cancel: "Anulează"
@@ -3355,8 +3547,7 @@ ro:
           on_grace_period: "În prezent, în perioada de grație a promovării, nu va fi retrogradat."
           locked_will_not_be_promoted: "Nivelul de încredere blocat. Nu va fi niciodată promovat."
           locked_will_not_be_demoted: "Nivelul de încredere blocat. Nu va fi niciodată retrogradat."
-        sso:
-          title: "Autentificare unică"
+        discourse_connect:
           external_id: "ID Extern"
           external_username: "Nume utilizator"
           external_name: "Nume"
@@ -3543,6 +3734,9 @@ ro:
         embed_post_limit: "Numărul maxim de postări de încorporat."
         embed_title_scrubber: "Expresie obișnuită pentru a curăța titlurile postărilor"
         embed_truncate: "Scurtează postările embedded."
+        allowed_embed_selectors: "Selector CSS pentru elemente care nu sunt permise în embeds."
+        blocked_embed_selectors: "Selector CSS pentru elemente care sunt șterse din emebds."
+        allowed_embed_classnames: "Nume de clase CSS permise"
         save: "Salvați setările pentru embeding"
       permalink:
         title: "Adrese permanente"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 31f9ce813a..dfa266bc7f 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -193,15 +193,18 @@ ru:
         enabled: "Закрепил тему глобально %{when}"
         disabled: "Открепил тему глобально %{when}"
       visible:
-        enabled: "Включил в списки %{when}"
-        disabled: "Исключил из списков %{when}"
+        enabled: "Включил отображение темы %{when}"
+        disabled: "Выключил отображение темы %{when}"
       banner:
         enabled: "Создал объявление %{when}. Оно будет отображаться вверху каждой страницы пока пользователь не закроет его."
         disabled: "Удалил объявление %{when}. Оно больше не будет отображаться в верхней части каждой страницы."
-      forwarded: "переадресовал вышеуказанное письмо"
+      forwarded: "Переадресовал вышеуказанное письмо"
     topic_admin_menu: "Действия администратора над темой"
     wizard_required: "Добро пожаловать в ваш новый Discourse! Начните с <a href='%{url}' data-auto-route='true'>мастера настройки</a> ✨"
     emails_are_disabled: "Все исходящие письма были глобально отключены администратором. Уведомления любого вида не будут отправляться на почту."
+    software_update_prompt:
+      message: "Сайт был обновлён, пожалуйста, <span>обновите страницу</span>."
+      dismiss: "Отложить"
     bootstrap_mode_enabled:
       one: "Для скорейшего развития вашего нового сайта был включен специальный режим его работы. В этом режиме всем новым пользователям при регистрации автоматически присваивается 1-й уровень доверия и включается ежедневная почтовая рассылка сводки новостей. Этот режим будет автоматически выключен, как только количество зарегистрированных пользователей достигнет %{count}."
       few: "Для скорейшего развития вашего нового сайта был включен специальный режим его работы. В этом режиме всем новым пользователям при регистрации автоматически присваивается 1-й уровень доверия и включается ежедневная почтовая рассылка сводки новостей. Этот режим будет автоматически выключен, как только количество зарегистрированных пользователей достигнет %{count}."
@@ -213,26 +216,28 @@ ru:
       broken_theme_alert: "Ваш сайт может не работать, потому что в теме / компоненте %{theme} есть ошибки. Отключить это в %{path}."
     s3:
       regions:
-        ap_northeast_1: "Asia Pacific (Tokyo)"
-        ap_northeast_2: "Asia Pacific (Seoul)"
-        ap_south_1: "Asia Pacific (Mumbai)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
+        ap_northeast_1: "Азиатско-Тихоокеанский регион (Токио)"
+        ap_northeast_2: "Азиатско-Тихоокеанский регион (Сеул)"
+        ap_east_1: "Азиатско-Тихоокеанский регион (Гонконг)"
+        ap_south_1: "Азиатско-Тихий океан (Мумбаи)"
+        ap_southeast_1: "Азиатско-Тихоокеанский регион (Сингапур)"
+        ap_southeast_2: "Азиатско-Тихоокеанский регион (Сидней)"
         ca_central_1: "Канада (Центральная)"
-        cn_north_1: "China (Beijing)"
-        cn_northwest_1: "China (Ningxia)"
-        eu_central_1: "EU (Frankfurt)"
+        cn_north_1: "Китай (Пекин)"
+        cn_northwest_1: "Китай (Нинся)"
+        eu_central_1: "ЕС (Франкфурт)"
         eu_north_1: "ЕС (Стокгольм)"
-        eu_west_1: "EU (Ирландия)"
-        eu_west_2: "EU (Лондон)"
-        eu_west_3: "EU (Париж)"
+        eu_west_1: "ЕС (Ирландия)"
+        eu_west_2: "ЕС (Лондон)"
+        eu_west_3: "ЕС (Париж)"
         sa_east_1: "Южная Америка (Сан-Паулу)"
-        us_east_1: "US East (Сев. Вирджиния)"
-        us_east_2: "US East (Огайо)"
+        us_east_1: "Восток США (Северная Вирджиния)"
+        us_east_2: "Восток США (Огайо)"
         us_gov_east_1: "AWS GovCloud (США-Восток)"
         us_gov_west_1: "AWS GovCloud (США-Запад)"
-        us_west_1: "US West (Сев. Калифорния)"
-        us_west_2: "US West (Орегон)"
+        us_west_1: "Запад США (Северная Калифорния)"
+        us_west_2: "Запад США (Орегон)"
+    clear_input: "Очистить"
     edit: "Отредактировать название и раздел темы"
     expand: "Развернуть"
     not_implemented: "Извините, эта функция ещё не реализована!"
@@ -269,6 +274,11 @@ ru:
     now: "только что"
     read_more: "читать дальше"
     more: "Больше"
+    x_more:
+      one: "Ещё %{count}"
+      few: "Ещё %{count}"
+      many: "Ещё %{count}"
+      other: "Ещё %{count}"
     less: "Меньше"
     never: "никогда"
     every_30_minutes: "каждые 30 минут"
@@ -299,8 +309,9 @@ ru:
       moderators: "Модераторы"
       stat:
         all_time: "За всё время"
-        last_7_days: "7 дней"
-        last_30_days: "30 дней"
+        last_day: "За последние 24 часа"
+        last_7_days: "За последние 7 дней"
+        last_30_days: "За последние 30 дней"
       like_count: "Симпатии"
       topic_count: "Темы"
       post_count: "Сообщения"
@@ -336,18 +347,6 @@ ru:
       search_placeholder: "Поиск закладок по имени, названию темы или по содержанию сообщения"
       search: "Поиск"
       reminders:
-        later_today: "Сегодня, но позже"
-        next_business_day: "На следующий рабочий день"
-        tomorrow: "Завтра"
-        next_week: "Через неделю"
-        post_local_date: "Дата сообщения"
-        later_this_week: "Позже на этой неделе"
-        start_of_next_business_week: "В понедельник"
-        start_of_next_business_week_alt: "В следующий понедельник"
-        next_month: "Через месяц"
-        custom: "Установить дату и время напоминания"
-        last_custom: "Использовать ранее установленные дату и время"
-        none: "Не настраивать напоминание"
         today_with_time: "сегодня в %{time}"
         tomorrow_with_time: "завтра в %{time}"
         at_time: "%{date_time}"
@@ -362,9 +361,9 @@ ru:
       new_private_message: "Черновик нового личного сообщения"
       topic_reply: "Черновик ответа"
       abandon:
-        confirm: "В этой теме найден ваш незавершённый черновик сообщения. Хотите от него отказаться?"
-        yes_value: "Да, удалить"
-        no_value: "Нет, сохранить"
+        confirm: "По этой теме есть сохранённый черновик. Что бы вы хотели с ним сделать?"
+        yes_value: "Удалить"
+        no_value: "Возобновить редактирование"
     topic_count_latest:
       one: "Есть %{count} новая или обновлённая тема"
       few: "Есть %{count} новых или обновлённых темы"
@@ -389,6 +388,7 @@ ru:
     upload: "Загрузить"
     uploading: "Загрузка..."
     uploading_filename: "Загрузка %{filename}"
+    processing_filename: "Обработка: %{filename}..."
     clipboard: "буфер обмена"
     uploaded: "Загружено!"
     pasting: "Вставка..."
@@ -420,21 +420,21 @@ ru:
       in_reply_to: "Посмотреть обсуждение"
       explain:
         why: "Объяснить, почему этот элемент оказался в очереди"
-        title: "Обзорная оценка"
+        title: "Оценка содержимого"
         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: "Проверяемые элементы, созданные пользователями с более высоким уровнем доверия, имеют более высокий балл."
+          title: "Элементы, проверяемые пользователями с более высоким уровнем доверия, имеют более высокий балл."
         type_bonus:
           name: "тип бонуса"
           title: "Некоторые проверяемые типы могут быть назначены бонус сотрудниками, чтобы сделать их более приоритетными."
@@ -454,12 +454,12 @@ ru:
         save_changes: "Сохранить изменения"
         title: "Настройки"
         priorities:
-          title: "Обзорные приоритеты"
+          title: "Приоритеты проверяемых элементов"
       moderation_history: "История модерации"
-      view_all: "Посмотреть всё"
+      view_all: "Просмотреть всё"
       grouped_by_topic: "Группировать по темам"
       none: "Нет элементов для премодерации."
-      view_pending: "Просмотр сообщений, ожидающих подтверждения"
+      view_pending: "Просмотр сообщений, ожидающих проверки"
       topic_has_pending:
         one: "В этой теме <b>%{count}</b> сообщение ожидает проверки"
         few: "В этой теме <b>%{count}</b> сообщения ожидают проверки"
@@ -467,8 +467,9 @@ ru:
         other: "В этой теме <b>%{count}</b> сообщений ожидают проверки"
       title: "Премодерация"
       topic: "Тема:"
-      filtered_topic: "Вы отфильтровали для просмотра содержимое в одной теме."
+      filtered_topic: "Вы отфильтровали проверяемый контент в рамках одной темы."
       filtered_user: "Пользователь"
+      filtered_reviewed_by: "Проверено"
       show_all_topics: "показать все темы"
       deleted_post: "(сообщение удалено)"
       deleted_user: "(пользователь удалён)"
@@ -479,12 +480,13 @@ ru:
         email: "Email"
         name: "Имя"
         fields: "Поля"
+        reject_reason: "Причина"
       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}"
+          few: "%{agreed}, %{disagreed}, %{ignored} (из %{count} жалоб)"
+          many: "%{agreed}, %{disagreed}, %{ignored} (из %{count} жалоб)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (из %{count} жалоб)"
         agreed:
           one: "%{count}% согласие"
           few: "%{count}% согласия"
@@ -503,7 +505,7 @@ ru:
       topics:
         topic: "Тема"
         reviewable_count: "Количество"
-        reported_by: "Сообщает"
+        reported_by: "Жалоба от"
         deleted: "[Тема удалена]"
         original: "(оригинальная тема)"
         details: "подробности"
@@ -537,7 +539,8 @@ ru:
           created_at_asc: "Дата создания (обратная сортировка)"
         priority:
           title: "Минимальный приоритет:"
-          low: "(любой)"
+          any: "(любой)"
+          low: "Низкий"
           medium: "Средний"
           high: "Высокий"
       conversation:
@@ -568,15 +571,17 @@ ru:
       types:
         reviewable_flagged_post:
           title: "На это сообщение поступила жалоба"
-          flagged_by: "Кем отмечено"
+          flagged_by: "Кто пожаловался"
         reviewable_queued_topic:
           title: "Тема в очереди"
         reviewable_queued_post:
           title: "Сообщение в очереди"
         reviewable_user:
           title: "Пользователь"
+        reviewable_post:
+          title: "Сообщение"
       approval:
-        title: "Сообщения для проверки"
+        title: "Модерируемые сообщения"
         description: "Ваше сообщение получено, но требует проверки и утверждения модератором перед публикацией. Пожалуйста, будьте терпеливы."
         pending_posts:
           one: "У вас <strong>%{count}</strong> сообщение в ожидании модерации."
@@ -585,6 +590,50 @@ ru:
           other: "У вас <strong>%{count}</strong> сообщений в ожидании модерации."
         ok: "OK"
       example_username: "имя пользователя"
+      reject_reason:
+        title: "Почему вы отклоняете регистрацию этого пользователя?"
+        send_email: "Отправить сообщение об отказе в регистрации"
+    relative_time_picker:
+      minutes:
+        one: "минуту"
+        few: "минуты"
+        many: "минут"
+        other: "минут"
+      hours:
+        one: "час"
+        few: "часа"
+        many: "часов"
+        other: "часов"
+      days:
+        one: "день"
+        few: "дня"
+        many: "дней"
+        other: "дней"
+      months:
+        one: "месяц"
+        few: "месяца"
+        many: "месяцев"
+        other: "месяцев"
+      years:
+        one: "год"
+        few: "года"
+        many: "лет"
+        other: "лет"
+      relative: "Напомнить через:"
+    time_shortcut:
+      later_today: "Сегодня, но позже"
+      next_business_day: "На следующий рабочий день"
+      tomorrow: "Завтра"
+      next_week: "Через неделю"
+      post_local_date: "Дата сообщения"
+      later_this_week: "Позже на этой неделе"
+      start_of_next_business_week: "В понедельник"
+      start_of_next_business_week_alt: "В следующий понедельник"
+      next_month: "Через месяц"
+      custom: "Установить дату и время"
+      relative: "Через указанное время"
+      none: "Не настраивать напоминание"
+      last_custom: "Использовать ранее установленные дату и время"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a> создал <a href='%{topicUrl}'>тему</a>"
       you_posted_topic: "<a href='%{userUrl}'>Вы</a> создали <a href='%{topicUrl}'>тему</a>"
@@ -642,9 +691,9 @@ ru:
       requests:
         title: "Запросы"
         reason: "Причина"
-        accept: "Принимать"
+        accept: "Принять"
         accepted: "принято"
-        deny: "Отрицать"
+        deny: "Отказать"
         denied: "отказано"
         undone: "запрос отменён"
         handle: "обрабатывать запрос на вступление"
@@ -673,6 +722,10 @@ ru:
             imap_ssl: "Использовать SSL для IMAP"
             username: "Имя пользователя"
             password: "Пароль"
+          settings:
+            title: "Настройки"
+            allow_unknown_sender_topic_replies: "Разрешать в теме ответы от неизвестного отправителя."
+            allow_unknown_sender_topic_replies_hint: "Разрешать неизвестным отправителям отвечать в групповой теме. Если этот параметр не включен, ответы с адресов электронной почты пользователей, не включенных в группу или не приглашенных в тему, создадут новую тему."
           mailboxes:
             synchronized: "Синхронизированный почтовый ящик"
             none_found: "В этой учётной записи электронной почты не найдено ни одного почтового ящика."
@@ -776,7 +829,22 @@ ru:
         make_owner_description: "Сделать <b>%{username}</b> владельцем этой группы"
         remove_owner: "Удалить владельца"
         remove_owner_description: "Удалить <b>%{username}</b> как владельца этой группы"
+        make_primary: "Сделать основной"
+        make_primary_description: "Сделать основной группой для пользователя <b>%{username}</b>"
+        remove_primary: "Удалить как основную"
+        remove_primary_description: "Удалить как основную группу для пользователя <b>%{username}</b>"
+        remove_members: "Удалить участников"
+        remove_members_description: "Удалить выбранных пользователей из этой группы"
+        make_owners: "Сделать владельцами"
+        make_owners_description: "Сделать выбранных пользователей владельцами этой группы"
+        remove_owners: "Удалить владельцев"
+        remove_owners_description: "Удалить выбранных пользователей как владельцев этой группы"
+        make_all_primary: "Сделать основной для всех"
+        make_all_primary_description: "Сделать основной группой для всех выбранных пользователей"
+        remove_all_primary: "Удалить как основную"
+        remove_all_primary_description: "Удалить как основную группу"
         owner: "Владелец"
+        primary: "Основная"
         forbidden: "Вы не можете просматривать участников."
       topics: "Темы"
       posts: "Сообщения"
@@ -848,7 +916,6 @@ ru:
       posts: "Сообщения"
       topics: "Темы"
       latest: "Последние"
-      latest_by: "последние от"
       toggle_ordering: "изменить сортировку"
       subcategories: "Подразделы"
       muted: "Разделы с отключёнными уведомлениями"
@@ -857,6 +924,19 @@ ru:
         few: "%{count} темы"
         many: "%{count} тем"
         other: "%{count} тем"
+      topic_stat:
+        one: "%{number} за %{unit}"
+        few: "%{number} за %{unit}"
+        many: "%{number} за %{unit}"
+        other: "%{number} за %{unit}"
+      topic_stat_unit:
+        week: "неделю"
+        month: "месяц"
+      topic_stat_all_time:
+        one: "Всего: %{number}"
+        few: "Всего: %{number}"
+        many: "Всего: %{number}"
+        other: "Всего: %{number}"
       topic_stat_sentence_week:
         one: "%{count} новая тема на прошлой неделе."
         few: "%{count} новых темы на прошлой неделе."
@@ -921,7 +1001,23 @@ ru:
         mute_option_title: "Вы не будете получать никаких уведомлений, связанных с этим пользователем."
         normal_option: "Нормальный"
         normal_option_title: "Вы будете уведомлены, если этот пользователь ответит вам, процитирует или упомянет вас."
+      notification_schedule:
+        title: "Расписание уведомлений"
+        label: "Включить расписание уведомлений"
+        tip: "Вне указанных здесь часов автоматически включается режим 'Не беспокоить'."
+        midnight: "Полночь"
+        none: "Уведомления отключены"
+        monday: "Понедельник"
+        tuesday: "Вторник"
+        wednesday: "Среда"
+        thursday: "Четверг"
+        friday: "Пятница"
+        saturday: "Суббота"
+        sunday: "Воскресенье"
+        to: "-"
       activity_stream: "Активность"
+      read: "Прочитанные"
+      read_help: "Недавно прочитанные темы"
       preferences: "Настройки"
       feature_topic_on_profile:
         open_search: "Выберите тему"
@@ -950,11 +1046,20 @@ ru:
         perm_denied_expl: "Вы запретили уведомления в вашем браузере. Вначале разрешите уведомления в настройках браузера, а затем попробуйте ещё раз."
         disable: "Отключить уведомления"
         enable: "Включить уведомления"
-        each_browser_note: "Примечание: вы должны изменить этот параметр в каждом браузере, который вы используете."
+        each_browser_note: 'Примечание: Вам необходимо изменить этот параметр в каждом используемом браузере. Во время действия режима ''Не беспокоить'' все уведомления, касающиеся форума, будут отключены, вне зависимости от значения этого параметра.'
         consent_prompt: "Вы хотите получать уведомления в реальном времени, когда люди отвечают на ваши сообщения?"
-      dismiss: "Отклонить"
+      dismiss: "Пометить прочитанными"
       dismiss_notifications: "Отклонить всё"
       dismiss_notifications_tooltip: "Пометить все непрочитанные уведомления прочитанными"
+      no_messages_title: "У вас нет личных сообщений"
+      no_messages_body: >
+        Необходимо непубличное общение с кем-то из участников форума? Напишите личное сообщение, кликнув на аватар участника и нажав на кнопку %{icon}.<br><br>. Если вам необходима помощь, вы можете написать нам на адрес, указанный на <a href='%{aboutUrl}'>этой</a> странице.
+      no_bookmarks_title: "Вы ещё ничего не добавили в закладки"
+      no_bookmarks_body: >
+        Начните добавлять сообщения в закладки с помощью кнопки %{icon} , и они будут перечислены здесь для быстрого доступа. Вы также можете настроить напоминание о закладке!
+      no_notifications_title: "У вас пока нет уведомлений"
+      no_notifications_body: >
+        На этой странице будут отображаться уведомления о любой активности на форуме, имеющей прямое отношение к вам, включая: ответы на ваши темы и сообщения, <b>@ упоминание</b> или цитирование вас в сообщениях, ответы на темы, которые вы отслеживаете. Уведомления будут отправляться на вашу электронную почту, если вы какое-то время не входили в систему. <br><br> Используйте иконку %{icon}, чтобы решить, о каких темах, категориях и тегах вы хотите получать уведомления. Дополнительные параметры доступны в <a href='%{preferencesUrl}'>настройках пользователя</a>.
       first_notification: "Ваше первое уведомление! Выберите его, чтобы начать."
       dynamic_favicon: "Показывать количество на значке браузера"
       skip_new_user_tips:
@@ -965,7 +1070,7 @@ ru:
       color_scheme_default_on_all_devices: "Установить цветовую схему по умолчанию на всех моих устройствах"
       color_scheme: "Цветовая схема"
       color_schemes:
-        default_description: "Цветовая схема по умолчанию"
+        default_description: "Тема по умолчанию"
         disable_dark_scheme: "То же самое, что и обычный"
         dark_instructions: "Вы можете просмотреть цветовую схему тёмного режима, переключив тёмный режим вашего устройства."
         undo: "Сбросить"
@@ -1004,11 +1109,11 @@ ru:
         warning: "Включён режим почтовой рассылки. Настройки email-уведомлений переопределены."
       tag_settings: "Теги"
       watched_tags: "Наблюдающие"
-      watched_tags_instructions: "Вы будете автоматически наблюдать все темы, помеченные этими тегами. Вам будут приходить уведомления о новых сообщениях и темах, рядом с темой будет отображено количество новых сообщений."
+      watched_tags_instructions: "Вы будете автоматически наблюдать все темы, если тема помечена такими тегами. Вам будут приходить уведомления о новых сообщениях и темах, рядом с темой будет отображено количество новых сообщений."
       tracked_tags: "Следящие"
-      tracked_tags_instructions: "Вы будете автоматически отслеживать все темы, помеченные этими тегами. Рядом с темой будет отображено количество новых сообщений."
+      tracked_tags_instructions: "Вы будете автоматически отслеживать все темы, если тема помечена такими тегами. Рядом с темой будет отображено количество новых сообщений."
       muted_tags: "Выключающие"
-      muted_tags_instructions: "Вы не будете получать уведомления о новых темах, помеченные этими тегами. Также эти темы не будут показываться во вкладке 'Непрочитанные'."
+      muted_tags_instructions: "Вы не будете получать уведомления о новых темах, если тема помечена этими тегами. Также эти темы не будут показываться во вкладке 'Непрочитанные'."
       watched_categories: "Наблюдаемые"
       watched_categories_instructions: "Вы будете автоматически наблюдать все темы в этих разделах. Вам будут приходить уведомления о новых сообщениях и темах, рядом со списком тем будет отображено количество новых сообщений."
       tracked_categories: "Отслеживаемые"
@@ -1069,6 +1174,7 @@ ru:
         tags: "Теги"
       preferences_nav:
         account: "Учётная запись"
+        security: "Безопасность"
         profile: "Профиль"
         emails: "Почта"
         notifications: "Уведомления"
@@ -1184,6 +1290,7 @@ ru:
         uploaded_avatar_empty: "Добавить собственный аватар"
         upload_title: "Загрузка собственного аватара"
         image_is_not_a_square: "Внимание: мы обрезали ваше изображение; ширина и высота не равны друг другу."
+        logo_small: "Маленький логотип сайта. Используется по умолчанию."
       change_profile_background:
         title: "Шапка профиля"
         instructions: "Шапка профиля будет отцентрирована и по умолчанию имеет ширину 1110 пикселей."
@@ -1206,14 +1313,15 @@ ru:
         set_primary: "Указать как основной E-mail"
         destroy: "Удалить E-mail"
         add_email: "Добавить дополнительный E-mail"
-        sso_override_instructions: "E-mail может быть переопределён от поставщика SSO."
-        no_secondary: "Нет дополнительного адреса электронной почты"
+        auth_override_instructions: "Электронная почта может быть обновлена поставщиком аутентификации."
+        no_secondary: "Нет дополнительных адресов электронной почты"
         instructions: "Не будет отображаться."
         admin_note: "Примечание: Администратор меняет адрес электронной почты другого пользователя, не являющегося администратором, что указывает на то, что пользователь потерял доступ к своему первоначальному электронному адресу. На новый адрес пользователя будет отправлено электронное письмо для сброса пароля. Адрес электронной почты не изменится, пока пользователь не завершит процесс сброса пароля."
         ok: "Мы вышлем вам письмо для подтверждения"
         required: "Пожалуйста, введите E-mail"
         invalid: "Введите действующий адрес электронной почты"
         authenticated: "Ваш адрес электронной почты подтверждён через %{provider}"
+        invite_auth_email_invalid: "Ваш пригласительный адрес не совпадает с адресом электронной почты, подтверждённым через %{provider}"
         frequency_immediately: "Получать уведомления о новых непрочитанных сообщениях незамедлительно."
         frequency:
           one: "Мы отправим вам письмо только в том случае, если вы более %{count} минуты находитесь офлайн."
@@ -1249,6 +1357,7 @@ ru:
         checking: "Проверяем доступность псевдонима..."
         prefilled: "Адрес электронной почты совпадает с зарегистрированным псевдонимом"
         required: "Пожалуйста, введите псевдоним"
+        edit: "Изменить псевдоним"
       locale:
         title: "Язык интерфейса"
         instructions: "Язык интерфейса сайта. Необходимо перезагрузить страницу, чтобы изменения вступили в силу."
@@ -1315,7 +1424,7 @@ ru:
         every_month: "Каждый месяц"
         every_six_months: "Каждые шесть месяцев"
       email_level:
-        title: "Присылать письмо когда кто-то меня цитирует, отвечает на моё сообщение, упоминает мой @псевдоним или приглашает меня в тему"
+        title: "Присылать письмо, когда кто-то меня цитирует, отвечает на моё сообщение, упоминает мой @псевдоним или приглашает меня в тему"
         always: "Всегда"
         only_when_away: "Если вы находитесь офлайн"
         never: "Никогда"
@@ -1345,10 +1454,27 @@ ru:
         after_10_minutes: "Более 10 минут"
       notification_level_when_replying: "Когда я пишу в теме, установить для неё следующий уровень уведомлений"
       invited:
-        search: "Введите текст для поиска по приглашениям..."
         title: "Приглашения"
+        pending_tab: "Ожидающие"
+        pending_tab_with_count: "Ожидающие (%{count})"
+        expired_tab: "Истекшие"
+        expired_tab_with_count: "Истекшие (%{count})"
+        redeemed_tab: "Принятые"
+        redeemed_tab_with_count: "Принятые (%{count})"
+        invited_via: "Приглашение"
+        invited_via_link: "Ссылка %{key} (принято %{count} из %{max})"
+        groups: "Группы"
+        topic: "Перенаправление в тему"
+        sent: "Создано / Последняя отправка"
+        expires_at: "Истекает"
+        edit: "Изменить"
+        remove: "Отозвать"
+        copy_link: "Получить ссылку"
+        reinvite: "Отправить письмо повторно"
+        reinvited: "Приглашение выслано повторно"
+        removed: "Отозваны"
+        search: "Поиск приглашений..."
         user: "Кто приглашён"
-        sent: "Последнее отправленное приглашение"
         none: "Нет приглашений для отображения."
         truncated:
           one: "Показ %{count} приглашения"
@@ -1356,41 +1482,24 @@ ru:
           many: "Показ первых %{count} приглашений"
           other: "Показ первых %{count} приглашений"
         redeemed: "Принятые приглашения"
-        redeemed_tab: "Принятые"
-        redeemed_tab_with_count: "Принятые (%{count})"
         redeemed_at: "Принято"
         pending: "Ещё не принятые приглашения"
-        pending_tab: "Ожидающие"
-        pending_tab_with_count: "Ожидающие (%{count})"
         topics_entered: "Просмотрел тем"
         posts_read_count: "Прочитал сообщений"
         expired: "Это приглашение истекло."
-        rescind: "Отозвать"
-        rescinded: "Приглашение отозвано"
-        rescind_all: "Удалить просроченные приглашения"
-        rescinded_all: "Все просроченные приглашения удалены!"
-        rescind_all_confirm: "Вы действительно хотите удалить все просроченные приглашения?"
-        reinvite: "Повторить приглашение"
-        reinvite_all: "Повторить все приглашения"
+        remove_all: "Удалить просроченные приглашения"
+        removed_all: "Все просроченные приглашения удалены!"
+        remove_all_confirm: "Вы действительно хотите удалить все просроченные приглашения?"
+        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_redemption_stats: "Принятые приглашения"
-        link_groups: Группы
-        link_expires_at: Истекает
         create: "Пригласить"
-        copy_link: "Показать ссылку"
         generate_link: "Создать ссылку для приглашения"
-        link_generated: "Вот ссылка на приглашение:"
-        valid_for: "Ссылка на приглашение действительна только для этого email: %{email}"
+        link_generated: "Cсылка на приглашение:"
+        valid_for: "Ссылка на приглашение действительна только для этого адреса: %{email}"
         single_user: "Пригласить по электронной почте"
         multiple_user: "Пригласить по ссылке"
         invite_link:
@@ -1399,11 +1508,36 @@ ru:
           error: "Произошла ошибка при создании ссылки на приглашение"
           max_redemptions_allowed_label: "Сколько человек могут зарегистрироваться по этой ссылке?"
           expires_at: "Когда истечёт срок действия этой ссылки?"
+        invite:
+          new_title: "Создать приглашение"
+          edit_title: "Изменить приглашение"
+          instructions: "Поделитесь указанной здесь ссылкой, чтобы предоставить доступ к этому сайту:"
+          copy_link: "Скопировать ссылку"
+          expires_in_time: "Срок действия ссылки истечёт через %{time}."
+          expired_at_time: "Срок действия ссылки истёк %{time}."
+          show_advanced: "Показать дополнительные параметры"
+          hide_advanced: "Скрыть дополнительные параметры"
+          restrict_email: "Ограничить приглашение одним адресом электронной почты"
+          max_redemptions_allowed: "Максимальное количество использований ссылки:"
+          add_to_groups: "Добавить в группы:"
+          invite_to_topic: "Перенаправить в эту тему при первом входе в систему:"
+          expires_at: "Срок действия приглашения истечёт:"
+          custom_message: "Необязательное личное сообщение:"
+          send_invite_email: "Сохранить и отправить приглашение"
+          save_invite: "Сохранить приглашение"
+          invite_saved: "Приглашение сохранено."
+          invite_copied: "Ссылка на приглашение скопирована."
+          blank_email: "Ссылка на приглашение не скопирована. Требуется адрес электронной почты."
         bulk_invite:
+          none: "Нет приглашений для отображения на этой странице."
           text: "Массовое приглашение"
+          instructions: |
+            <p>Пригласите максимально возможное количество пользователей, чтобы ваше сообщество развивалось как можно быстрее. Подготовьте <a href="https://ru.wikipedia.org/wiki/CSV" target="_blank">CSV-файл</a>, содержащий адреса электронной почты пользователей (<a href="https://meta.discourse.org/t/sending-bulk-user-invites" target="_blank">по одному адресу в строке</a>), которых вы хотите пригласить. Например, представленные ниже и разделенные запятыми данные могут быть использованы для автоматического добавления пользователей в определённые группы или перенаправления пользователей в ту или иную тему при первом входе в систему.</p>
+            <pre>valentin@petrov.com,название_первой_группы;название_второй_группы,42</pre>
+            <p>На загруженные адреса электронной почты будут отправлены приглашения, которые при необходимости вы сможете настроить позже более детально.</p>
+          progress: "Загружено %{progress}%..."
           success: "Файл успешно загружен, вы получите сообщение, когда процесс будет завершён."
           error: "Извините, но файл должен быть в формате CSV."
-          confirmation_message: "Вы собираетесь отправить приглашения по электронной почте всем адресатам, указанным в загруженном файле."
       password:
         title: "Пароль"
         too_short: "Пароль слишком короткий."
@@ -1417,42 +1551,42 @@ ru:
         title: "Сводка"
         stats: "Статистика"
         time_read: "время чтения"
-        recent_time_read: "недавнее время чтения"
+        recent_time_read: "время недавнего чтения"
         topic_count:
-          one: "тему создал"
-          few: "темы создал"
-          many: "тем создал"
-          other: "тем создал"
+          one: "тема создана"
+          few: "темы созданы"
+          many: "тем созданы"
+          other: "тем созданы"
         post_count:
-          one: "сообщение написал"
-          few: "сообщения написал"
-          many: "сообщений написал"
-          other: "сообщений написал"
+          one: "сообщение написано"
+          few: "сообщения написано"
+          many: "сообщений написано"
+          other: "сообщений написано"
         likes_given:
-          one: "выразил"
-          few: "выразил"
-          many: "выразил"
-          other: "выразил"
+          one: "выражена"
+          few: "выражены"
+          many: "выражены"
+          other: "выражены"
         likes_received:
-          one: "получил"
-          few: "получил"
-          many: "получил"
-          other: "получил"
+          one: "получена"
+          few: "получены"
+          many: "получены"
+          other: "получены"
         days_visited:
           one: "день посещения"
           few: "дня посещения"
           many: "дней посещения"
           other: "дней посещения"
         topics_entered:
-          one: "тему посмотрел"
-          few: "темы посмотрел"
+          one: "тема просмотрена"
+          few: "темы просмотрено"
           many: "тем просмотрено"
           other: "тем просмотрено"
         posts_read:
-          one: "сообщение прочёл"
-          few: "сообщения прочёл"
-          many: "сообщений прочёл"
-          other: "сообщений прочёл"
+          one: "сообщение прочитано"
+          few: "сообщения прочитаны"
+          many: "сообщений прочитаны"
+          other: "сообщений прочитаны"
         bookmark_count:
           one: "закладка"
           few: "закладки"
@@ -1483,6 +1617,8 @@ ru:
       avatar:
         title: "Аватар"
         header_title: "профиль, сообщения, закладки и настройки"
+        name_and_description: "%{name} - %{description}"
+        edit: "Изменить изображение в профиле"
       title:
         title: "Заголовок"
         none: "(нет)"
@@ -1494,7 +1630,7 @@ ru:
       stream:
         posted_by: "Опубликовано"
         sent_by: "Отправлено"
-        private_message: "сообщение"
+        private_message: "личное сообщение"
         the_topic: "тема"
     loading: "Загрузка..."
     errors:
@@ -1520,7 +1656,7 @@ ru:
       close: "закрыть"
       dismiss_error: "Отклонить ошибку"
     close: "Закрыть"
-    assets_changed_confirm: "Сайт только что был обновлён. Перезагрузить страницу для перехода к новой версии?"
+    assets_changed_confirm: "Для этого сайта есть обновление программного обеспечения. Получить последнюю версию?"
     logout: "Необходимо заново войти в систему."
     refresh: "Обновить"
     home: "Вернуться"
@@ -1540,15 +1676,6 @@ ru:
       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: "всего создано тем"
-    year: "год"
-    year_desc: "темы, созданные за последние 365 дней"
-    month: "месяц"
-    month_desc: "темы, созданные за последние 30 дней"
-    week: "неделя"
-    week_desc: "темы, созданные за последние 7 дней"
-    day: "день"
     first_post: Первое сообщение
     mute: Отключить
     unmute: Включить
@@ -1557,7 +1684,7 @@ ru:
     time_read: Прочитанные
     time_read_recently: "%{time_read} недавно"
     time_read_tooltip: "%{time_read} общее время чтения"
-    time_read_recently_tooltip: "%{time_read} общее время чтения (%{recent_time_read}за последние 60 дней)"
+    time_read_recently_tooltip: "Общее время чтения: %{time_read} (%{recent_time_read} за последние 60 дней)"
     last_reply_lowercase: последний ответ
     replies_lowercase:
       one: ответ
@@ -1568,13 +1695,17 @@ ru:
       sign_up: "Зарегистрироваться"
       hide_session: "Напомнить мне завтра"
       hide_forever: "Нет, спасибо"
-      hidden_for_session: "Хорошо, напомню завтра. Кстати, зарегистрироваться можно также и с помощью кнопки \"Войти\"."
+      hidden_for_session: "Хорошо, напомним завтра. Кстати, зарегистрироваться можно также и с помощью кнопки \"Войти\"."
       intro: "Здравствуйте! Похоже, вам нравится обсуждение, но вы ещё не зарегистрировали аккаунт."
       value_prop: "Когда вы создаёте учётную запись, мы точно помним, что вы прочитали, поэтому вы всегда возвращаетесь туда, где остановились. Вы также получаете уведомления, здесь и по электронной почте, когда кто-то отвечает вам. И вы можете в сообщениях поставить отметку 'Мне нравится'. :heartpulse:"
     summary:
       enabled_description: "Вы просматриваете выдержку из темы - только самые интересные сообщения по мнению сообщества."
-      description: "Всего <b>%{replyCount}ответов</b>."
-      description_time: "<b>%{replyCount}</b> ответов с предполагаемым временем прочтения около <b>%{readingTime} минут</b>."
+      description:
+        one: "Есть <b>%{count}</b> ответ."
+        few: "Есть <b>%{count}</b> ответа."
+        many: "Есть <b>%{count}</b> ответов."
+        other: "Есть <b>%{count}</b> ответов."
+      description_time_MF: "Есть {replyCount, plural, one { <b>#</b> ответ} few { <b>#</b> ответа} many { <b>#</b> ответов} other { <b>#</b> ответов}} с расчётным временем чтения <b>{readingTime, plural, one {# минута} few {# минуты} many {# минут} other {# минут}}</b>."
       enable: "Сводка по теме"
       disable: "Показать все сообщения"
     deleted_filter:
@@ -1599,8 +1730,10 @@ ru:
     trust_level: "Уровень доверия"
     search_hint: "Псевдоним, e-mail или IP-адрес"
     create_account:
+      header_title: "Добро пожаловать!"
+      subheader_title: "Давайте создадим вашу учётную запись"
       disclaimer: "Регистрируясь, вы соглашаетесь с <a href='%{privacy_link}' target='blank'>политикой конфиденциальности</a> и <a href='%{tos_link}' target='blank'> условиями предоставления услуг</a>."
-      title: "Зарегистрироваться"
+      title: "Создать учётную запись"
       failed: "Произошла ошибка. Возможно, этот Email уже используется. Попробуйте восстановить пароль"
     forgot_password:
       title: "Сброс пароля"
@@ -1619,6 +1752,7 @@ ru:
     email_login:
       link_label: "Пришлите мне ссылку для входа"
       button_label: "E-mail"
+      login_link: "Пропустить пароль; выслать мне ссылку для входа"
       emoji: "lock emoji"
       complete_username: "Если учётная запись совпадает с именем пользователя <b>%{username}</b>, вы должны в ближайшее время получить электронное письмо со ссылкой для входа в систему."
       complete_email: "Если данные аккаунта совпадают с <b>%{email}</b>, вы должны в ближайшее время получить электронное письмо со ссылкой для входа в систему."
@@ -1630,6 +1764,8 @@ ru:
       logging_in_as: Войти как %{email}
       confirm_button: Завершить вход
     login:
+      header_title: "С возвращением!"
+      subheader_title: "Войдите в свою учётную запись"
       title: "Войти"
       username: "Пользователь"
       password: "Пароль"
@@ -1645,7 +1781,7 @@ ru:
       security_key_not_allowed_error: "Время проверки подлинности ключа безопасности истекло или проверка была отменена."
       security_key_no_matching_credential_error: "В указанном ключе безопасности не найдено подходящих учётных данных."
       security_key_support_missing_error: "Ваше текущее устройство или браузер не поддерживает использование ключей безопасности. Пожалуйста, используйте другой метод."
-      email_placeholder: "Email или псевдоним"
+      email_placeholder: "Email / Псевдоним"
       caps_lock_warning: "Caps Lock включён"
       error: "Неизвестная ошибка"
       cookies_error: "Похоже, что в вашем браузере выключены куки. Скорее всего вы не сможете войти на сайт, пока не включите куки."
@@ -1705,14 +1841,13 @@ ru:
       success: "Ваш аккаунт создан и теперь вы можете войти."
       name_label: "Имя"
       password_label: "Пароль"
-      optional_description: "(опционально)"
+      optional_description: "(необязательно)"
     password_reset:
       continue: "Далее на %{site_name}"
     emoji_set:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (ранее EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1747,6 +1882,8 @@ ru:
         many: "+ %{count} подразделов"
         other: "+ %{count} подразделов"
     select_kit:
+      filter_by: "Фильтровать по: %{name}"
+      select_to_filter: "Выберите значение для фильтра"
       default_header_text: Выбрать...
       no_content: Совпадений не найдено
       filter_placeholder: Поиск...
@@ -1768,15 +1905,15 @@ ru:
         many: "Необходимо выбрать не менее %{count} символов."
         other: "Необходимо выбрать не менее %{count} символов."
       components:
+        tag_drop:
+          filter_for_more: Больше тегов...
         categories_admin_dropdown:
           title: "Управление разделами"
     date_time_picker:
       from: От
       to: Кому
-      errors:
-        to_before_from: "Конечная дата должна быть больше начальной."
     emoji_picker:
-      filter_placeholder: Поиск смайла
+      filter_placeholder: Поиск эмодзи
       smileys_&_emotion: Смайлики и эмоции
       people_&_body: Люди и части тел
       animals_&_nature: Животные и природа
@@ -1793,10 +1930,10 @@ ru:
       medium_tone: Средний тон скина
       medium_dark_tone: Средне-тёмный тон скина
       dark_tone: Тёмный оттенок скина
-      default: Пользовательские смайлы
+      default: Пользовательские эмодзи
     shared_drafts:
       title: "Общие черновики"
-      notice: "Эти темы видны только тем, кому доступен раздел <b>%{category}</b>."
+      notice: "Эта тема видна только тем, кто может публиковать общие черновики."
       destination_category: "Раздел назначения"
       publish: "Публикация общего черновика"
       confirm_publish: "Вы действительно хотите опубликовать этот черновик?"
@@ -1807,10 +1944,9 @@ ru:
       options: "Настройки"
       whisper: "скрытое сообщение"
       unlist: "исключена из списков тем"
-      blockquote_text: "Цитата"
       add_warning: "Это официальное предупреждение."
       toggle_whisper: "Скрытое сообщение"
-      toggle_unlisted: "Исключить из списка"
+      toggle_unlisted: "Скрыть"
       posting_not_on_topic: "В какой теме вы хотите ответить?"
       saved_local_draft_tip: "Сохранено локально"
       similar_topics: "Ваша тема похожа на..."
@@ -1833,10 +1969,22 @@ ru:
       reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Требуется название темы"
-        title_too_short: "Название темы должно быть не короче %{min} символов"
-        title_too_long: "Название темы не может быть длиннее %{max} символов"
+        title_too_short:
+          one: "Название темы должно быть не короче %{count} символа"
+          few: "Название темы должно быть не короче %{count} символов"
+          many: "Название темы должно быть не короче %{count} символов"
+          other: "Название темы должно быть не короче %{count} символов"
+        title_too_long:
+          one: "Название темы не может быть длиннее %{count} символа"
+          few: "Название темы не может быть длиннее %{count} символов"
+          many: "Название темы не может быть длиннее %{count} символов"
+          other: "Название темы не может быть длиннее %{count} символов"
         post_missing: "Сообщение не может быть пустым"
-        post_length: "Сообщение должно быть не короче %{min} символов"
+        post_length:
+          one: "Сообщение должно быть не короче %{count} символа"
+          few: "Сообщение должно быть не короче %{count} символов"
+          many: "Сообщение должно быть не короче %{count} символов"
+          other: "Сообщение должно быть не короче %{count} символов"
         try_like: "Вы пробовали нажать на кнопку %{heart}?"
         category_missing: "Выберите раздел"
         tags_missing:
@@ -1871,8 +2019,8 @@ ru:
       saved: "Сохранено!"
       saved_draft: "Черновик сохранён; нажмите сюда, чтобы его открыть."
       uploading: "Загрузка..."
-      show_preview: "показать предварительный просмотр &raquo;"
-      hide_preview: "&laquo; скрыть предварительный просмотр"
+      show_preview: "Показать предварительный просмотр"
+      hide_preview: "Скрыть предварительный просмотр"
       quote_post_title: "Процитировать сообщение целиком"
       bold_label: "Ж"
       bold_title: "Жирный"
@@ -1885,8 +2033,8 @@ ru:
       link_dialog_title: "Вставить ссылку"
       link_optional_text: "Необязательный текст ссылки"
       link_url_placeholder: "Вставьте URL или введите текст для поиска темы"
-      quote_title: "Цитата"
-      quote_text: "Впишите сюда текст цитаты"
+      blockquote_title: "Цитата"
+      blockquote_text: "Впишите сюда текст цитаты"
       code_title: "Текст \"как есть\" (без применения форматирования)"
       code_text: "Впишите сюда текст; также отключить форматирование текста можно, начав строку с 4х пробелов"
       paste_code_text: "Напечатайте или вставьте сюда код"
@@ -1911,7 +2059,7 @@ ru:
         title: "Забыли указать получателей?"
         body: "В списке получателей сейчас только вы сами!"
       slow_mode:
-        error: "Эта тема находится в замедленном режиме. Чтобы способствовать вдумчивому и взвешенному обсуждению, вы можете публиковать сообщения только раз в %{duration}."
+        error: "Эта тема находится в замедленном режиме и вы недавно уже писали в ней; следующее сообщение вы сможете опубликовать через %{timeLeft}."
       admin_options_title: "Дополнительные настройки темы для персонала"
       composer_actions:
         reply: Ответить
@@ -1940,7 +2088,7 @@ ru:
           label: "Новая тема"
         shared_draft:
           label: "Общий черновик"
-          desc: "Черновик темы, который будет виден только сотрудникам"
+          desc: "Черновик темы, который будет виден только пользователям с необходимыми правами доступа"
         toggle_topic_bump:
           label: "Не поднимать тему"
           desc: "Ответить без изменения даты последнего ответа"
@@ -2054,14 +2202,15 @@ ru:
       from_my_computer: "С моего устройства"
       from_the_web: "Из интернета"
       remote_tip: "Ссылка на изображение"
-      remote_tip_with_attachments: "Ссылка на изображение или файл %{authorized_extensions}"
+      remote_tip_with_attachments: "Ссылка на изображение или файл"
       local_tip: "Выбор изображения с вашего устройства"
-      local_tip_with_attachments: "Выбор изображения или файла с вашего устройства %{authorized_extensions}"
+      local_tip_with_attachments: "Выбор изображения или файла с вашего устройства"
       hint: "(вы также можете перетащить объект в окно редактора для его загрузки)"
       hint_for_supported_browsers: "вы также можете перетащить или скопировать изображения в редактор"
       uploading: "Загрузка"
       select_file: "Выбрать файл"
       default_image_alt_text: изображение
+      supported_formats: "Поддерживаемые форматы"
     search:
       sort_by: "Сортировка"
       relevance: "По соответствию"
@@ -2089,6 +2238,7 @@ ru:
       or_search_google: "или попробуйте поискать в Google:"
       search_google: "Попробуйте поискать в Google:"
       search_google_button: "Google"
+      search_button: "Найти"
       context:
         user: "Искать сообщения от @%{username}"
         category: "Искать в разделе #%{category}"
@@ -2154,7 +2304,7 @@ ru:
     go_back: "вернуться"
     not_logged_in_user: "страница пользователя с историей его последней активности и настроек"
     current_user: "перейти на вашу страницу пользователя"
-    view_all: "посмотреть всё"
+    view_all: "Просмотреть все %{tab}"
     topics:
       new_messages_marker: "последний визит"
       bulk:
@@ -2175,7 +2325,9 @@ ru:
         change_category: "Задать раздел"
         close_topics: "Закрыть темы"
         archive_topics: "Архивировать темы"
+        move_messages_to_inbox: "Переместить во Входящие"
         notification_level: "Уведомления"
+        change_notification_level: "Изменить уровень уведомлений"
         choose_new_category: "Выберите новый раздел для этих тем:"
         selected:
           one: "Вы выбрали <b>%{count}</b> тему."
@@ -2187,7 +2339,12 @@ ru:
         choose_new_tags: "Выберите новые теги для этих тем:"
         choose_append_tags: "Выберите теги для добавления к этим темам:"
         changed_tags: "Теги этих тем изменены."
-        remove_tags: "Удалить теги"
+        remove_tags: "Удалить все теги"
+        confirm_remove_tags:
+          one: "Все теги будут удалены из этой темы. Вы уверены?"
+          few: "Все теги будут удалены из этих <b>%{count}</b> тем. Вы уверены?"
+          many: "Все теги будут удалены из этих <b>%{count}</b> тем. Вы уверены?"
+          other: "Все теги будут удалены из этих <b>%{count}</b> тем. Вы уверены?"
         progress:
           one: "Выполнено: <strong>%{count}</strong> тема"
           few: "Выполнено: <strong>%{count}</strong> темы"
@@ -2205,7 +2362,7 @@ ru:
         top: "Нет обсуждаемых тем."
         educate:
           new: '<p>Здесь появятся ваши новые темы. По умолчанию темы считаются новыми, и они обозначаются индикатором <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span>, если темы были созданы за последние 2 дня.</p><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>'
+          unread: "<p>Ваши непрочитанные темы скоро появятся тут.</p><p>По умолчанию темы получают счётчик <span class=\"badge new-posts badge-notification\">1</span>, если:</p><ul><li>Создана тема</li><li>Получен ответ на сообщение в теме</li><li>Время чтения темы пользователем превышает 4 минуты</li></ul><p>Вы можете изменить настройки уведомлений, нажав на значок \U0001F514 в интересующей вас теме.</p><p>При необходимости вы можете изменить стандартные параметры уведомлений в <a href=\"%{userPrefsUrl}\">настройках</a> профиля пользователя.</p>"
       bottom:
         latest: "Обновлённых тем больше нет."
         posted: "Новых тем больше нет."
@@ -2293,10 +2450,10 @@ ru:
       options: "Параметры темы"
       show_links: "Показать ссылки в теме"
       toggle_information: "Показать/скрыть подробную информацию о теме"
-      read_more_in_category: "Хотите почитать что-нибудь ещё? Можно посмотреть темы в %{catLink} или %{latestLink}."
+      read_more_in_category: "Хотите почитать что-нибудь ещё? Можно просмотреть темы в разделе %{catLink} или %{latestLink}."
       read_more: "Хотите почитать что-нибудь ещё? %{catLink} или %{latestLink}."
       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 {}}"
+      read_more_MF: "У вас { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'># непрочитанная</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'># новая</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: Просмотреть все разделы
       browse_all_tags: Просмотреть все теги
@@ -2308,21 +2465,27 @@ ru:
       slow_mode_update:
         title: "Замедленный режим"
         select: "Пользователи могут публиковать сообщения в этой теме не чаще чем раз в:"
-        description: "Чтобы способствовать вдумчивому обсуждению в активных или спорных дискуссиях, пользователи должны подождать определённое время, прежде чем снова публиковать сообщения в этой теме."
+        description: "Чтобы способствовать вдумчивому обсуждению в активных или спорных дискуссиях, пользователи должны подождать определённое время, прежде чем публиковать очередное сообщение в этой теме."
         save: "Включить"
+        enabled_until: "Включён до:"
         remove: "Отключить"
         hours: "Часы:"
         minutes: "Минуты:"
         seconds: "Секунды:"
         durations:
+          10_minutes: "10 минут"
           15_minutes: "15 минут"
+          30_minutes: "30 минут"
+          45_minutes: "45 минут"
           1_hour: "1 час"
+          2_hours: "2 часа"
           4_hours: "4 часа"
-          1_day: "1 день"
-          1_week: "1 неделя"
+          8_hours: "8 часов"
+          12_hours: "12 часов"
+          24_hours: "24 часа"
           custom: "Настраиваемый интервал"
       slow_mode_notice:
-        duration: "Между публикациями сообщений в этой теме нужно подождать %{duration}"
+        duration: "Пожалуйста, подождите %{duration} между публикациями в этой теме"
       topic_status_update:
         title: "Таймер темы"
         save: "Установить таймер"
@@ -2331,7 +2494,9 @@ ru:
         remove: "Удалить таймер"
         publish_to: "Опубликовать в:"
         when: "Когда:"
-        time_frame_required: Пожалуйста, выберите периоды времени
+        time_frame_required: "Пожалуйста, выберите период времени"
+        min_duration: "Период времени должен быть больше 0"
+        max_duration: "Период времени не должен быть более 20 лет."
       auto_update_input:
         none: "Выбор даты"
         now: "Сейчас"
@@ -2360,9 +2525,11 @@ ru:
         title: "Закрыть на время"
       auto_close:
         title: "Автоматическое закрытие темы"
-        label: "Закрыть тему через указанное количество часов:"
+        label: "Автоматически закрыть тему через:"
         error: "Пожалуйста, введите корректное значение."
         based_on_last_post: "Не закрывать, пока не пройдёт указанное количество часов с момента последнего сообщения в теме."
+      auto_close_after_last_post:
+        title: "Автоматическое закрытие темы после последнего сообщения"
       auto_delete:
         title: "Автоматическое удаление темы"
       auto_bump:
@@ -2375,17 +2542,22 @@ ru:
         auto_open: "Эта тема автоматически откроется %{timeLeft}."
         auto_close: "Эта тема автоматически закроется %{timeLeft}."
         auto_publish_to_category: "Эта тема будет опубликована в разделе <a href=%{categoryUrl}>#%{categoryName}</a> через %{timeLeft}."
-        auto_close_based_on_last_post: "Эта тема будет закрыта через %{duration} после последнего ответа."
+        auto_close_after_last_post: "Эта тема будет закрыта через %{duration} после последнего ответа."
         auto_delete: "Эта тема будет автоматически удалена %{timeLeft}."
         auto_bump: "Эта тема будет автоматически поднята %{timeLeft}."
         auto_reminder: "Вам придёт напоминание об этой теме через %{timeLeft}."
-        auto_delete_replies: "Ответы в этой теме автоматически удалятся через %{duration}."
+        auto_delete_replies: "Ответы в этой теме автоматически удаляются через %{duration}."
       auto_close_title: "Настройки закрытия темы"
       auto_close_immediate:
         one: "Последнее сообщение в этой теме отправлено %{count} час назад, поэтому данная тема будет закрыта незамедлительно."
         few: "Последнее сообщение в этой теме отправлено %{count} часа назад, поэтому данная тема будет закрыта незамедлительно."
         many: "Последнее сообщение в этой теме отправлено %{count} часов назад, поэтому данная тема будет закрыта незамедлительно."
         other: "Последнее сообщение в этой теме отправлено %{count} часов назад, поэтому данная тема будет закрыта незамедлительно."
+      auto_close_momentarily:
+        one: "Последнее сообщение в этой теме отправлено %{count} час назад, поэтому данная тема будет немедленно закрыта."
+        few: "Последнее сообщение в этой теме отправлено %{count} часа назад, поэтому данная тема будет немедленно закрыта."
+        many: "Последнее сообщение в этой теме отправлено %{count} часов назад, поэтому данная тема будет немедленно закрыта."
+        other: "Последнее сообщение в этой теме отправлено %{count} часов назад, поэтому данная тема будет немедленно закрыта."
       timeline:
         back: "Вернуться"
         back_description: "Перейти к последнему непрочитанному сообщению"
@@ -2397,7 +2569,11 @@ ru:
         go: "=>"
         jump_bottom: "Перейти к последнему сообщению"
         jump_prompt: "Перейти к..."
-        jump_prompt_of: "из %{count} сообщений"
+        jump_prompt_of:
+          one: "из %{count} сообщения"
+          few: "из %{count} сообщений"
+          many: "из %{count} сообщений"
+          other: "из %{count} сообщений"
         jump_prompt_long: "Перейти к..."
         jump_bottom_with_number: "Перейти к сообщению %{post_number}"
         jump_prompt_to_date: "дате"
@@ -2409,12 +2585,15 @@ ru:
         reasons:
           mailing_list_mode: "Вы включили режим почтовой рассылки, поэтому Вы будете получать уведомления об ответах в этой теме через e-mail."
           "3_10": "Вы будете получать уведомления, поскольку наблюдаете за тегом этой темы."
+          "3_10_stale": "Вы будете получать уведомления, поскольку ранее пометили эту тему наблюдающим тегом."
           "3_6": "Вы будете получать уведомления, поскольку наблюдаете за этим разделом."
+          "3_6_stale": "Вы будете получать уведомления, поскольку ранее пометили этот раздел как 'Наблюдаемый'."
           "3_5": "Вы будете получать уведомления, поскольку наблюдение за темой началось автоматически."
           "3_2": "Вы будете получать уведомления, поскольку наблюдаете за этой темой."
           "3_1": "Вы будете получать уведомления, поскольку создали эту тему."
           "3": "Вы будете получать уведомления, поскольку наблюдаете за этой темой."
           "2_8": "Вы увидите количество новых ответов, поскольку следите за этим разделом."
+          "2_8_stale": "Вы увидите количество новых ответов, поскольку ранее пометили этот раздел как 'Отслеживаемый'."
           "2_4": "Вы увидите количество новых ответов, поскольку вы размещали ответ в этой теме."
           "2_2": "Вы увидите количество новых ответов, поскольку следите за этой темой."
           "2": 'Вы увидите количество новых ответов, потому что <a href="%{basePath}/u/%{username}/preferences/notifications">прочитали эту тему</a>.'
@@ -2460,8 +2639,8 @@ ru:
         unpin: "Открепить тему..."
         unarchive: "Разархивировать тему"
         archive: "Архивировать тему"
-        invisible: "Исключить из списков"
-        visible: "Включить в списки"
+        invisible: "Скрыть тему"
+        visible: "Показать тему"
         reset_read: "Сбросить счётчики"
         make_public: "Превратить в публичную тему"
         make_private: "Превратить в личное сообщение"
@@ -2482,6 +2661,17 @@ ru:
         title: "Поделиться"
         extended_title: "Поделиться ссылкой"
         help: "Поделиться ссылкой на тему"
+        instructions: "Поделиться ссылкой на тему:"
+        copied: "Ссылка на тему скопирована."
+        notify_users:
+          title: "Уведомить"
+          instructions: "Уведомить следующих пользователей об этой теме:"
+          success:
+            one: "Пользователь %{username} успешно уведомлён об этой теме."
+            few: "Пользователи успешно уведомлены об этой теме."
+            many: "Пользователи успешно уведомлены об этой теме."
+            other: "Пользователи успешно уведомлены об этой теме."
+        invite_users: "Пригласить"
       print:
         title: "Печать"
         help: "Открыть версию для печати"
@@ -2543,14 +2733,14 @@ ru:
         username_placeholder: "Псевдоним"
         action: "Отправить приглашение"
         help: "Пригласить других в эту тему с помощью Еmail или уведомлений"
-        to_forum: "Будет отправлено короткое письмо, которое позволит вашему другу быстро присоединиться к обсуждению, просто кликнув по ссылке, без необходимости ввода учётных данных."
-        sso_enabled: "Введите псевдоним пользователя, которого вы хотите пригласить в эту тему."
+        to_forum: "Мы отправим короткое электронное сообщение, позволяющее вашему другу быстро присоединиться к обсуждению, просто перейдя по ссылке."
+        discourse_connect_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>%{invitee}</b>. Мы уведомим Вас, когда этим приглашением воспользуются. Проверьте вкладку <b>Приглашения</b> на вашей странице пользователя, чтобы узнать состояние всех ваших приглашений."
         success_username: "Мы пригласили этого пользователя принять участие в теме."
         error: "К сожалению, мы не смогли пригласить этого человека. Возможно, он уже был приглашён? (Количество приглашений ограничено)"
         success_existing_email: "Пользователь с электронной почтой <b>%{emailOrUsername}</b> уже существует. Мы пригласили этого пользователя принять участие в этой теме."
@@ -2581,7 +2771,7 @@ ru:
         title: "Переместить в существующую тему"
         action: "Переместить в существующую тему"
         error: "При перемещении сообщений в эту тему произошла ошибка."
-        radio_label: "При перемещении сообщений в эту тему произошла ошибка."
+        radio_label: "Существующая тема"
         instructions:
           one: "Пожалуйста, выберите тему, в которую вы бы хотели переместить это сообщение."
           few: "Пожалуйста, выберите тему, в которую вы бы хотели переместить эти <b>%{count}</b> сообщения."
@@ -2681,9 +2871,9 @@ ru:
       quote_share: "Поделиться"
       edit_reason: "Причина: "
       post_number: "сообщение %{number}"
-      ignored: "Проигнорированное содержание"
-      wiki_last_edited_on: "Вики редактировалась"
-      last_edited_on: "Последний раз сообщение редактировалось"
+      ignored: "Игнорируемое содержимое"
+      wiki_last_edited_on: "Вики-сообщение последний раз редактировалось %{dateTime}"
+      last_edited_on: "Сообщение последний раз редактировалось %{dateTime}"
       reply_as_new_topic: "Ответить в новой связанной теме"
       reply_as_new_private_message: "Ответить в новом сообщении тем же адресатам"
       continue_discussion: "Продолжая обсуждение из темы %{postLink}:"
@@ -2712,6 +2902,7 @@ ru:
         few: "%{count} ответа"
         many: "%{count} ответов"
         other: "%{count} ответов"
+      has_replies_count: "%{count}"
       unknown_user: "(неизвестный/удалённый пользователь)"
       has_likes_title:
         one: "Это сообщение понравилось %{count} человеку"
@@ -2724,6 +2915,18 @@ ru:
         few: "Вам и ещё %{count} людям понравилось это сообщение"
         many: "Вам и ещё %{count} людям понравилось это сообщение"
         other: "Вам и ещё %{count} людям понравилось это сообщение"
+      filtered_replies_hint:
+        one: "Посмотреть это сообщение и ответ на него"
+        few: "Посмотреть это сообщение и %{count} ответа"
+        many: "Посмотреть это сообщение и %{count} ответов"
+        other: "Посмотреть это сообщение и %{count} ответов"
+      filtered_replies_viewing:
+        one: "Просмотр %{count} ответа на"
+        few: "Просмотр %{count} ответов на"
+        many: "Просмотр %{count} ответов на"
+        other: "Просмотр %{count} ответов на"
+      in_reply_to: "Загрузить родительское сообщение"
+      view_all_posts: "Отобразить все сообщения"
       errors:
         create: "К сожалению, не удалось создать сообщение из-за ошибки. Попробуйте ещё раз."
         edit: "К сожалению, не удалось изменить сообщение. Попробуйте ещё раз."
@@ -2739,17 +2942,11 @@ ru:
         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:
-        title: "Отказаться от черновика"
-        confirm: "Вы действительно хотите отказаться от создания сообщения?"
-        no_value: "Нет, оставить"
-        no_save_draft: "Нет, сохранить черновик"
-        yes_value: "Да, отказаться"
+      cancel_composer:
+        confirm: "Что сделать с сообщением?"
+        discard: "Отказаться"
+        save_draft: "Сохранить черновик на будущее"
+        keep_editing: "Продолжить редактирование"
       via_email: "Это сообщение получено по электронной почте"
       via_auto_generated_email: "Это автоматическое сообщение получено по электронной почте"
       whisper: "Это скрытое сообщение и оно доступно только модераторам"
@@ -2801,7 +2998,11 @@ ru:
         unlock_post_description: "Разрешить автору редактировать это сообщение"
         delete_topic_disallowed_modal: "У вас нет разрешения на удаление этой темы. Если вы действительно хотите, чтобы она была удалена, воспользуйтесь кнопкой <b>Пожаловаться</b>, указав причину, по которой тема должна быть удалена."
         delete_topic_disallowed: "У вас нет разрешения на удаление этой темы"
-        delete_topic_confirm_modal: "Эта тема в настоящее время имеет более %{minViews} просмотров и может быть популярна в выдаче результатов поиска. Вы действительно хотите удалить эту тему, а не отредактировать её для улучшения качества содержащейся в ней информации?"
+        delete_topic_confirm_modal:
+          one: "Эта тема в настоящее время имеет более %{count} просмотра и может быть популярна в выдаче результатов поиска. Вы действительно хотите удалить эту тему, а не отредактировать её для улучшения качества содержащейся в ней информации?"
+          few: "Эта тема в настоящее время имеет более %{count} просмотров и может быть популярна в выдаче результатов поиска. Вы действительно хотите удалить эту тему, а не отредактировать её для улучшения качества содержащейся в ней информации?"
+          many: "Эта тема в настоящее время имеет более %{count} просмотров и может быть популярна в выдаче результатов поиска. Вы действительно хотите удалить эту тему, а не отредактировать её для улучшения качества содержащейся в ней информации?"
+          other: "Эта тема в настоящее время имеет более %{count} просмотров и может быть популярна в выдаче результатов поиска. Вы действительно хотите удалить эту тему, а не отредактировать её для улучшения качества содержащейся в ней информации?"
         delete_topic_confirm_modal_yes: "Да, удалить эту тему"
         delete_topic_confirm_modal_no: "Нет, оставить эту тему"
         delete_topic_error: "Произошла ошибка при удалении темы"
@@ -2810,6 +3011,7 @@ ru:
         change_post_notice: "Изменить сообщение модератора"
         delete_post_notice: "Удалить сообщение модератора"
         remove_timer: "Отменить таймер"
+        edit_timer: "Изменить таймер"
       actions:
         people:
           like:
@@ -2898,6 +3100,18 @@ ru:
           edit_bookmark:
             name: "Изменить закладку"
             description: "Изменение названия закладки или даты/времени напоминания."
+          pin_bookmark:
+            name: "Закрепить закладку"
+            description: "Закрепление закладки. Закладка появится в верхней части списка закладок."
+          unpin_bookmark:
+            name: "Открепить закладку"
+            description: "Открепление закладки. Закладка больше не будет отображаться в верхней части списка закладок."
+      filtered_replies:
+        viewing_posts_by: "Просмотр %{post_count} сообщений от"
+        viewing_subset: "Некоторые ответы свернуты"
+        viewing_summary: "Просмотр сводки по этой теме"
+        post_number: "%{username}, сообщение #%{post_number}"
+        show_all: "Показать все"
     category:
       can: "может&hellip; "
       none: "(РАЗНОЕ)"
@@ -2955,10 +3169,10 @@ ru:
         reply: "Ответ"
         create: "Создание"
         no_groups_selected: "Доступ не предоставлен ни одной группе; этот раздел будет виден только персоналу."
-        everyone_has_access: "Эта общедоступный раздел; все пользователи могут просматривать, создавать сообщения, а также отвечать на них. Чтобы ограничить разрешения, удалите одно или несколько разрешений, предоставленных группе 'все'."
+        everyone_has_access: 'Эта общедоступный раздел; все пользователи могут просматривать, создавать сообщения, а также отвечать на них. Чтобы ограничить разрешения, удалите одно или несколько разрешений, предоставленных группе ''все''.'
         toggle_reply: "Переключить разрешение 'Ответ'"
         toggle_full: "Переключить разрешение 'Создание'"
-        inherited: "Это разрешение унаследовано от группы 'все'"
+        inherited: 'Это разрешение унаследовано от группы ''все'''
       special_warning: "Внимание: данный раздел был предустановлен по умолчанию и его настройки безопасности не могут быть изменены. Если не хотите использовать этот раздел, удалите его вместо изменения."
       uncategorized_security_warning: "Это специальный раздел, предназначенный для хранения тем, которые не относятся к какому-либо разделу; у него не может быть настроек безопасности."
       uncategorized_general_warning: 'Это специальный раздел, используемый в качестве раздела по умолчанию для новых тем, для которых не был выбран конкретный раздел. Если вы хотите предотвратить такое поведение и принудительно выбирать раздел, отключите соответствующую настройку <a href="%{settingLink}">здесь</a>. Если вы хотите изменить название или описание раздела, сделайте это в настройке <a href="%{customizeLink}">Оформление / Текст</a>.'
@@ -2974,6 +3188,7 @@ ru:
       num_featured_topics: "Количество тем, отображаемых на странице раздела:"
       subcategory_num_featured_topics: "Количество избранных тем на странице родительского раздела:"
       all_topics_wiki: "Создавать новые темы в виде вики-сообщений"
+      allow_unlimited_owner_edits_on_first_post: "Разрешить автору первого сообщения неограниченное количество правок этого сообщения"
       subcategory_list_style: "Стиль списка подразделов:"
       sort_order: "Порядок сортировки тем:"
       default_view: "Вид списка тем по умолчанию:"
@@ -3044,6 +3259,7 @@ ru:
       list_filters:
         all: "Все темы"
         none: "Без подразделов"
+      colors_disabled: "Вы не можете выбирать цвета, поскольку не указан стиль раздела."
     flagging:
       title: "Спасибо за вашу помощь в поддержании порядка!"
       action: "Пожаловаться на сообщение"
@@ -3061,7 +3277,8 @@ ru:
       notify_action: "Сообщение"
       official_warning: "Официальное предупреждение"
       delete_spammer: "Удалить спамера"
-      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> в чёрный список. Вы действительно уверены, что этот пользователь - спамер?"
+      flag_for_review: "Отправить на премодерацию"
+      delete_confirm_MF: "Вы собираетесь удалить {POSTS, plural, one {<b>#</b> сообщение} few {<b>#</b> сообщения} other {<b>#</b> сообщений}} и {TOPICS, plural, one {<b>#</b> тему} few {<b>#</b> темы} other {<b>#</b> тем}} этого пользователя, а так же удалить его учётную запись, добавить его IP-адрес <b>{ip_address}</b> и его почтовый адрес <b>{email}</b> в чёрный список. Вы действительно уверены, что этот пользователь - спамер?"
       yes_delete_spammer: "Да, удалить спамера"
       ip_address_missing: "(не доступен)"
       hidden_email_address: "(скрыто)"
@@ -3099,14 +3316,14 @@ ru:
       title: "Сводка по теме"
       participants_title: "Частые авторы"
       links_title: "Популярные ссылки"
-      links_shown: "показать больше ссылок..."
+      links_shown: "Показать все ссылки..."
       clicks:
         one: "%{count} клик"
         few: "%{count} клика"
         many: "%{count} кликов"
         other: "%{count} кликов"
     post_links:
-      about: "развернуть больше ссылок для этого сообщения"
+      about: "Отобразить все ссылки"
       title:
         one: "ещё %{count}"
         few: "ещё %{count}"
@@ -3135,11 +3352,11 @@ ru:
       unlisted:
         help: "Тема исключена из всех списков тем и доступна только по прямой ссылке"
       personal_message:
-        title: "Эта тема является личным сообщением"
-        help: "Эта тема является личным сообщением"
+        title: "Эта тема преобразована в личные сообщения"
+        help: "Эта тема преобразована в личные сообщения"
     posts: "Сообщ."
     posts_likes_MF: |
-      В этой теме {count, plural, one {1 сообщение} few {# сообщения} other {# сообщений}} {ratio, select,
+      В этой теме {count, plural, one {# сообщение} few {# сообщения} other {# сообщений}} {ratio, select,
       low {с высоким рейтингом симпатий}
       med {с очень высоким рейтингом симпатий}
       high {с чрезвычайно высоким рейтингом симпатий}
@@ -3171,7 +3388,7 @@ ru:
       many: "пользователей"
       other: "пользователей"
     category_title: "Раздел"
-    history: "История"
+    history: "История, последние 100 изменений"
     changed_by: "автором %{author}"
     raw_email:
       title: "Входящее сообщение"
@@ -3271,6 +3488,7 @@ ru:
       close: "Закрыть (Esc)"
       content_load_error: '<a href="%url%">Содержимое</a> не удалось загрузить.'
       image_load_error: '<a href="%url%">Изображение</a> не удалось загрузить.'
+    cannot_render_video: 'Это видео невозможно отобразить: видеокодек не поддерживается браузером.'
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -3365,7 +3583,7 @@ ru:
       others_count: "Другие с этой наградой (%{count})"
       title: Награды
       allow_title: "Вы можете использовать эту награду в качестве титула."
-      multiple_grant: "Вы можете получить её несколько раз"
+      multiple_grant: "Вы можете получить эту награду несколько раз"
       badge_count:
         one: "%{count} награда"
         few: "%{count} награды"
@@ -3463,6 +3681,7 @@ ru:
         many: "%{tags} и более %{count}"
         other: "%{tags} и более %{count}"
       delete_no_unused_tags: "Неиспользуемые теги не обнаружены."
+      tag_list_joiner: ", "
       delete_unused: "Удалить неиспользуемые теги"
       delete_unused_description: "Удалите все теги, которые не прикреплены к темам или личным сообщениям"
       cancel_delete_unused: "Отменить"
@@ -3490,19 +3709,20 @@ ru:
       groups:
         title: "Группы тегов"
         about: "Для простоты управления тегами распределите их по группам"
-        new: "Новая группа"
+        new: "Новая группа тегов"
         tags_label: "Теги в этой группе:"
         parent_tag_label: "Родительский тег:"
-        parent_tag_description: "Теги из этой группы будут доступны только после добавления к теме родительского тега."
+        parent_tag_description: "Теги из этой группы не могут быть использованы, если отсутствует родительский тег."
         one_per_topic_label: "Разрешить не более одного тега из этой группы в одной теме"
-        new_name: "Название новой группы"
+        new_name: "Название новой группы тегов"
         name_placeholder: "Имя группы тегов"
         save: "Сохранить"
         delete: "Удалить"
         confirm_delete: "Вы действительно хотите удалить эту группу тегов?"
         everyone_can_use: "Все могут использовать теги"
-        usable_only_by_groups: "Теги видны всем, но использовать их могут только следующие группы"
-        visible_only_to_groups: "Теги видны только следующим группам"
+        usable_only_by_groups: "Теги видны всем, но использовать их могут только указанные группы"
+        visible_only_to_groups: "Теги видны только указанным группам"
+        cannot_save: "Невозможно сохранить группу тегов. Убедитесь, что выбран хотя бы один тег, указано название группы тегов, и указаны соответствующие группы, если выбрано ограничение по использованию тегов."
       topics:
         none:
           unread: "Нет непрочитанных тем."
@@ -3519,6 +3739,7 @@ ru:
       custom_message_template_forum: "Привет. Подумал, что тебе будет интересно зарегистрироваться на этом форуме!"
       custom_message_template_topic: "Привет! Подумал, что тебя может заинтересовать эта тема!"
     forced_anonymous: "Из-за чрезмерной нагрузки форум временно отображается в таком виде, как если бы пользователь вышел из системы."
+    forced_anonymous_login_required: "Сайт сильно загружен, поэтому в данный момент страница не может быть отображена. Повторите попытку через несколько минут."
     footer_nav:
       back: "Назад"
       forward: "Вперёд"
@@ -3527,6 +3748,17 @@ ru:
     safe_mode:
       enabled: "Включён безопасный режим, чтобы выйти из безопасного режима, закройте текущее окно браузера"
     image_removed: "(изображение удалено)"
+    do_not_disturb:
+      title: "Не беспокоить..."
+      label: "Не беспокоить"
+      remaining: "Осталось %{remaining}"
+      options:
+        half_hour: "В течение 30 минут"
+        one_hour: "В течение 1 часа"
+        two_hours: "В течение 2 часов"
+        tomorrow: "До завтра"
+        custom: "Указать продолжительность"
+      set_schedule: "Настроить расписание уведомлений"
   admin_js:
     type_to_filter: "Фильтрация настроек..."
     admin:
@@ -3554,6 +3786,10 @@ ru:
         installed_version: "Установленная версия"
         latest_version: "Последняя версия"
         problems_found: "Несколько советов по вашим текущим настройкам сайта"
+        new_features:
+          title: "\U0001F381 Новые возможности"
+          dismiss: "Отклонить"
+          learn_more: "Подробнее"
         last_checked: "Последняя проверка"
         refresh_problems: "Обновить"
         no_problems: "Проблем не обнаружено."
@@ -3644,10 +3880,6 @@ ru:
             available: "Название группы доступно"
             not_available: "Название группы недоступно"
             blank: "Название группы не может быть пустым"
-        bulk_add:
-          title: "Массовое добавление в группу"
-          complete_users_not_added: "Эти пользователи не были добавлены (убедитесь, что у них есть учётная запись):"
-          paste: "Вставить список псевдонимов пользователей или их Email, по одному в строке:"
         add_members:
           as_owner: "Установить пользователя (ей) в качестве владельца (ов) этой группы"
         manage:
@@ -3674,9 +3906,13 @@ ru:
             effects: Эффекты
             trust_levels_none: "Отсутствует"
             automatic_membership_email_domains: "Пользователи, зарегистрированные c адресом электронной почты, который точно совпадает с доменом в этом списке, будут автоматически добавлены в эту группу: "
-            automatic_membership_user_count: "Следующее количество пользователей с новыми почтовыми доменами будут добавлены в группу: %{count}."
+            automatic_membership_user_count:
+              one: "Следующее количество пользователей с новыми почтовыми доменами будут добавлены в группу: %{count}."
+              few: "Следующее количество пользователей с новыми почтовыми доменами будут добавлены в группу: %{count}."
+              many: "Следующее количество пользователей с новыми почтовыми доменами будут добавлены в группу: %{count}."
+              other: "Следующее количество пользователей с новыми почтовыми доменами будут добавлены в группу: %{count}."
             primary_group: "Автоматически устанавливается в качестве основной группы"
-        name_placeholder: "Название группы, без пробелов, по тем же правилам, что и для псевдонимов."
+        name_placeholder: "Без пробелов, по тем же правилам, что и для псевдонимов."
         primary: "Основная группа"
         no_primary: "(нет основной группы)"
         title: "Группы"
@@ -3686,7 +3922,13 @@ ru:
         group_members: "Участники группы"
         delete: "Удалить"
         delete_confirm: "Удалить эту группу?"
+        delete_with_messages_confirm:
+          one: "Удаление этой группы приведет к тому, что члены группы больше не будут иметь доступа к %{count} сообщению.<br><br>Продолжить?"
+          few: "Удаление этой группы приведет к тому, что члены группы больше не будут иметь доступа к %{count} сообщениям.<br><br>Продолжить?"
+          many: "Удаление этой группы приведет к тому, что члены группы больше не будут иметь доступа к %{count} сообщениям.<br><br>Продолжить?"
+          other: "Удаление этой группы приведет к тому, что члены группы больше не будут иметь доступа к %{count} сообщениям.<br><br>Продолжить?"
         delete_failed: "Невозможно удалить группу. Если группа была создана автоматически, то она не может быть удалена."
+        delete_automatic_group: Это автоматическая группа и она не может быть удалена.
         delete_owner_confirm: "Отозвать права владельца у пользователя '%{username}'?"
         add: "Добавить"
         custom: "Настраиваемые"
@@ -3748,9 +3990,13 @@ ru:
               wordpress: Работа плагина WordPress wp-discourse.
             users:
               bookmarks: Список закладок пользователя. Возвращает напоминания о закладках при использовании формата ICS.
-              sync_sso: Синхронизация пользователя с использованием SSO.
+              sync_sso: Синхронизация пользователя с помощью DiscourseConnect.
               show: Получение информации о пользователе.
               check_emails: Список электронных писем пользователя.
+              update: Обновление информации в профиле пользователя.
+              log_out: Завершение всех сессий пользователя.
+              anonymize: Анонимизация учетных записей пользователей.
+              delete: Удаление учетных записей пользователей.
             email:
               receive_emails: Объединение этой области действия с получателем почты для обработки входящих писем.
       web_hooks:
@@ -3795,7 +4041,7 @@ ru:
           details: "При создании, изменении, удалении или восстановлении сообщения."
         user_event:
           name: "Событие пользователя"
-          details: "При входе, выходе, создании, подтверждении или изменении пользователя."
+          details: "При входе, выходе, создании, утверждении или изменении пользователя, а также при подтверждении электронной почты."
         group_event:
           name: "Событие группы"
           details: "При создании, обновлении или удалении группы."
@@ -3814,6 +4060,12 @@ ru:
         user_badge_event:
           name: "Событие награждения"
           details: "При получении пользователем награды."
+        group_user_event:
+          name: "Событие группового пользователя"
+          details: "При добавлении или удалении пользователя из группы."
+        like_event:
+          name: "Событие 'Мне нравится'"
+          details: "При пометке сообщения статусом 'Мне нравится'."
         delivery_status:
           title: "Статус передачи"
           inactive: "Неактивна"
@@ -3940,7 +4192,7 @@ ru:
         preview: "Предварительный просмотр"
         explain_preview: "Предпросмотр сайта с новым оформлением"
         save: "Сохранить"
-        new: "Новое"
+        new: "Новая"
         new_style: "Новый стиль"
         install: "Установить"
         delete: "Удалить"
@@ -4006,7 +4258,9 @@ ru:
           convert: "Преобразовать"
           convert_component_alert: "Вы действительно хотите преобразовать этот компонент в тему? Он будет удалён как компонент из %{relatives}."
           convert_component_tooltip: "Преобразовать этот компонент в тему"
+          convert_component_alert_generic: "Вы действительно хотите преобразовать этот компонент в тему?"
           convert_theme_alert: "Вы действительно хотите преобразовать эту тему в компонент? Он будет удалён как родитель из %{relatives}."
+          convert_theme_alert_generic: "Вы действительно хотите преобразовать эту тему в компонент?"
           convert_theme_tooltip: "Преобразовать эту тему в компонент"
           inactive_themes: "Неактивные темы:"
           inactive_components: "Неиспользуемые компоненты:"
@@ -4015,7 +4269,7 @@ ru:
           default_theme_tooltip: "Эта тема является темой по умолчанию"
           updates_available_tooltip: "Доступны обновления для этой темы"
           and_x_more: "и более %{count}."
-          collapse: Крах
+          collapse: Свернуть
           uploads: "Загрузки"
           no_uploads: "Вы можете загрузить различные ресурсы для темы, такие как шрифты и изображения"
           add_upload: "Добавить ресурс"
@@ -4040,17 +4294,20 @@ ru:
           included_components: "Включённые компоненты"
           add_all: "Добавить все"
           import_web_tip: "Репозиторий темы"
+          direct_install_tip: "Вы действительно хотите установить <strong>%{name}</strong> из указанного ниже репозитория?"
           import_web_advanced: "Дополнительно..."
           import_file_tip: "Файл с расширением .tar.gz, .zip, или .dcstyle.json, содержащий тему"
           is_private: "Тема находится в приватном git-репозитории"
           remote_branch: "Имя ветки (необязательно)"
           public_key: "Предоставьте доступ к репозиторию со следующим открытым ключом:"
+          public_key_note: "После ввода корректного URL-адреса приватного репозитория, будет сгенерирован ключ SSH, который будет отображаться здесь."
           install: "Установить"
           installed: "Установленные"
           install_popular: "Популярные"
           install_upload: "С вашего устройства"
           install_git_repo: "Из git-репозитория"
           install_create: "Создать новую"
+          duplicate_remote_theme: "Компонент темы «%{name}» уже установлен. Вы действительно хотите установить ещё одну копию?"
           about_theme: "О теме"
           license: "Лицензия"
           version: "Версия:"
@@ -4082,7 +4339,8 @@ ru:
             many: "Тема находится на %{count} коммитов сзади!"
             other: "Тема находится на %{count} коммитов сзади!"
           compare_commits: "(Смотрите новые коммиты)"
-          repo_unreachable: "Не удалось связаться с Git-репозиторием этой темы. Сообщение об ошибке:"
+          remote_theme_edits: "Если вы хотите отредактировать эту тему, вам необходимо <a href='%{repoURL}' target='_blank'>отправить внесённое изменение в её репозиторий</a>"
+          repo_unreachable: "Не удалось связаться с git-репозиторием этой темы. Сообщение об ошибке:"
           imported_from_archive: "Эта тема была импортирована из zip-файла"
           scss:
             text: "CSS"
@@ -4102,7 +4360,7 @@ ru:
           color_definitions:
             text: "Определение цветовой схемы"
             title: "Укажите собственные цвета (только для опытных пользователей)"
-            placeholder: "\nИспользуйте эту таблицу стилей для добавления цветов в список пользовательских свойств CSS.\n\nПример: \n\n:root { --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};\n}\n\nНастоятельно рекомендуется добавлять префиксы к именам свойств, чтобы избежать конфликтов с плагинами и / или движком форума."
+            placeholder: "\nИспользуйте эту таблицу стилей для добавления цветов в список пользовательских свойств CSS.\n\nПример: \n\n%{example}\n\nНастоятельно рекомендуется добавлять префиксы к именам свойств, чтобы избежать конфликтов с плагинами и / или движком форума."
           head_tag:
             text: "</head>"
             title: "HTML для размещения перед тегом </head>"
@@ -4112,6 +4370,8 @@ ru:
           yaml:
             text: "YAML"
             title: "Определить настройки темы в формате YAML"
+          scss_color_variables_warning: "Использование в темах цветовых переменных SCSS является устаревшим. Вместо этого используйте пользовательские свойства CSS. См. <a href=\"https://meta.discourse.org/t/-/77551#color-variables-2\" target=\"_blank\">это руководство</a> для получения более подробной информации."
+          scss_warning_inline: "Использование в темах цветовых переменных SCSS является устаревшим."
         colors:
           select_base:
             title: "Выберите базовую цветовую палитру"
@@ -4168,9 +4428,9 @@ ru:
             name: "Симпатии"
             description: "Цвет кнопки «Мне нравится»."
         robots:
-          title: "Переопределите файл robots.txt вашего сайта:"
-          warning: "Это навсегда переопределит любые связанные настройки сайта."
-          overridden: Файл robots.txt по умолчанию вашего сайта перезаписан.
+          title: "Изменить настройки в файле robots.txt:"
+          warning: "Это повлияет на соответствующие настройки сайта."
+          overridden: Изменены стандартные настройки в файле robots.txt.
         email_style:
           title: "Стиль Email"
           heading: "Настройка стиля Email"
@@ -4340,7 +4600,7 @@ ru:
             backup_destroy: "Удаление резервной копии"
             reviewed_post: "Рецензирование сообщения"
             custom_staff: "Действия с плагинами"
-            post_locked: "Заморозка сообщения"
+            post_locked: "Блокировка сообщения"
             post_edit: "Редактирование сообщения"
             post_unlocked: "Разморозка сообщения"
             check_personal_message: "Проверка личного сообщения"
@@ -4383,6 +4643,7 @@ ru:
             topic_unarchived: "Отмена архивации темы"
             post_staff_note_create: "Добавление комментария модератора"
             post_staff_note_destroy: "Удаление комментария модератора"
+            delete_group: "Удаление группы"
         screened_emails:
           title: "Почтовые адреса"
           description: "Когда кто-то создаёт новую учётную запись, указанный пользователем почтовый адрес проверяется на соответствие с указанным ниже списком, и в случае совпадения регистрация блокируется или производятся другие дополнительные действия."
@@ -4430,33 +4691,36 @@ ru:
         title: "Контролируемые слова"
         search: "поиск"
         clear_filter: "Очистить"
-        show_words: "Показать слова"
-        one_word_per_line: "(по одному слову в строке)"
+        show_words:
+          one: "Показать %{count} слово"
+          few: "Показать %{count} слова"
+          many: "Показать %{count} слов"
+          other: "Показать %{count} слов"
         download: Скачать слова
         clear_all: Удалить слова
-        clear_all_confirm_block: "Вы действительно хотите удалить все  слова, используемые при блокировке сообщений?"
-        clear_all_confirm_censor: "Вы действительно хотите удалить все  слова, используемые при цензурировании сообщений?"
-        clear_all_confirm_flag: "Вы действительно хотите удалить все  слова, которые используются при оценке сообщений, помеченных как неприемлемые?"
-        clear_all_confirm_require_approval: "Вы действительно хотите удалить все слова, которые используются при оценке сообщений, требующих одобрения?"
-        word_count:
-          one: "%{count} слово"
-          few: "%{count} слова"
-          many: "%{count} слов"
-          other: "%{count} слов"
+        clear_all_confirm: "Вы действительно хотите удалить все контролируемые слова, используемые на вкладке '%{action}'?"
         actions:
           block: "Блокировка"
           censor: "Цензура"
           require_approval: "Требующие одобрения"
           flag: "Жалобы"
+          replace: "Замена"
+          tag: "Теги"
         action_descriptions:
           block: "Запретить публикацию сообщений, содержащих эти слова. Пользователь увидит сообщение об ошибке при попытке отправить своё сообщение."
           censor: "Разрешить сообщения, содержащие эти слова, но заменять их символами, которые скрывают нецензурные выражения."
           require_approval: "Сообщения, содержащие эти слова, будут требовать одобрения персонала, прежде чем их можно будет увидеть."
           flag: "Разрешить сообщения, содержащие эти слова, но помечать их как неприемлемые, чтобы модераторы могли их оценить."
+          replace: "Заменить слова в сообщениях другими словами или ссылками."
+          tag: "Автоматически помечать тегами темы, содержащие эти слова в первом сообщении."
         form:
-          label: "Новое слово:"
-          placeholder: "слово может содержать (*)"
+          label: "Слово или фраза"
+          placeholder: "Введите слово или фразу (* - подстановочный знак)"
           placeholder_regexp: "Регулярное выражение"
+          replacement_label: "Заменить на"
+          replacement_placeholder: "слово или ссылка"
+          tag_label: "Тег"
+          tag_placeholder: "тег1, тег2, тег3"
           add: "Добавить"
           success: "Слово успешно добавлено"
           exists: "Уже существует"
@@ -4479,7 +4743,7 @@ ru:
         last_emailed: "Последнее письмо"
         not_found: "К сожалению, такой псевдоним не зарегистрирован."
         id_not_found: "К сожалению, этот пользователь не зарегистрирован."
-        active: "Активированные"
+        active: "Активирован"
         show_emails: "Показать адреса Email"
         hide_emails: "Скрыть адреса Email"
         nav:
@@ -4509,6 +4773,9 @@ ru:
         check_email:
           title: "Показать e-mail этого пользователя"
           text: "Показать"
+        check_sso:
+          title: "Показать полезную нагрузку SSO"
+          text: "Показать"
       user:
         suspend_failed: "Ошибка заморозки пользователя: %{error}"
         unsuspend_failed: "Ошибка разморозки пользователя: %{error}"
@@ -4549,7 +4816,7 @@ ru:
         clear_penalty_history:
           title: "Очистить историю нарушений"
           description: "Пользователи с нарушениями не могут достичь 3 уровня доверия"
-        delete_all_posts_confirm_MF: "Вы собираетесь удалить {POSTS, plural, one {1 сообщение} few {# сообщения} other {# сообщений}} и {TOPICS, plural, one {1 тему} few {# темы} other {# тем}}. Вы уверены?"
+        delete_all_posts_confirm_MF: "Вы собираетесь удалить {POSTS, plural, one {# сообщение} few {# сообщения} other {# сообщений}} и {TOPICS, plural, one {# тему} few {# темы} other {# тем}}. Вы уверены?"
         silence: "Заблокировать"
         unsilence: "Разблокировать"
         silenced: "Заблокирован?"
@@ -4579,7 +4846,7 @@ ru:
         activity: Активность
         like_count: Симпатий выразил / получил
         last_100_days: "за последние 100 дней"
-        private_topics_count: Частные темы
+        private_topics_count: Личные темы
         posts_read_count: Прочитано сообщений
         post_count: Создано сообщений
         second_factor_enabled: Двухфакторная аутентификация включена
@@ -4598,6 +4865,9 @@ ru:
         anonymize_yes: "Да, анонимизировать эту учётную запись"
         anonymize_failed: "Не удалось анонимизировать учётную запись."
         delete: "Удалить пользователя"
+        delete_posts:
+          progress:
+            title: "Удаление сообщений"
         merge:
           button: "Объединить пользователей"
           prompt:
@@ -4609,6 +4879,8 @@ ru:
             target_username_placeholder: "Псевдоним нового владельца"
             transfer_and_delete: "Объединить контент и удалить пользователя @%{username}"
             cancel: "Отмена"
+          progress:
+            title: "Объединение пользователей"
           confirmation:
             title: "Объединить контент и удалить пользователя @%{username}"
             description: |
@@ -4709,16 +4981,16 @@ ru:
           on_grace_period: "В данный момент находится в периоде доверия и не может быть понижен."
           locked_will_not_be_promoted: "Изменение уровня доверия заблокировано, поэтому пользователь никогда не будет повышен до этого уровня."
           locked_will_not_be_demoted: "Изменение уровня доверия заблокировано, поэтому пользователь никогда не будет понижен до этого уровня."
-        sso:
-          title: "Технология единого входа SSO"
-          external_id: "Внешний идентификатор"
+        discourse_connect:
+          title: "Система единого входа DiscourseConnect"
+          external_id: "Внешний ID"
           external_username: "Псевдоним"
-          external_name: "Имя"
+          external_name: "Название"
           external_email: "Email"
           external_avatar_url: "URL аватара"
           last_payload: "Последняя полезная нагрузка"
           delete_sso_record: "Удалить запись SSO"
-          confirm_delete: "Вы действительно хотите удалить эту запись системы единого входа (SSO)?"
+          confirm_delete: "Вы действительно хотите удалить эту запись DiscourseConnect?"
       user_fields:
         title: "Поля пользователя"
         help: "Добавить поля, которые могут заполнять пользователи форума."
@@ -4749,6 +5021,10 @@ ru:
           title: "Показывать в карточке пользователя?"
           enabled: "Показывать в карточке пользователя"
           disabled: "Не показывать в карточке пользователя"
+        searchable:
+          title: "Доступно для поиска?"
+          enabled: "Доступно для поиска"
+          disabled: "Не доступно для поиска"
         field_types:
           text: "Текстовое поле"
           confirm: "Подтверждение"
@@ -4759,10 +5035,12 @@ ru:
         title: "Текст"
         edit: "Изменить"
         revert: "Отменить изменения"
-        revert_confirm: "Вы уверены что хотите отменить внесённые изменения?"
+        revert_confirm: "Вы действительно хотите отменить внесённые изменения?"
         go_back: "Вернуться к поиску"
         recommended: "Мы рекомендуем изменить текст этих шаблонов под ваши требования:"
         show_overriden: "Показывать только изменённые значения"
+        locale: "Язык:"
+        fallback_locale_warning: "Вы редактируете язык на основе %{fallback}. Пользователи, выбравшие %{fallback} в качестве языка интерфейса, не увидят ваши изменения."
         more_than_50_results: "Найдено более 50 результатов. Пожалуйста, уточните параметры поиска."
       settings:
         show_overriden: "Показывать только изменённые значения"
@@ -4770,6 +5048,10 @@ ru:
         reset: "Сброс"
         none: "(нет)"
       site_settings:
+        emoji_list:
+          invalid_input: "Перечень эмодзи должен содержать только допустимые названия, например: hugs"
+          add_emoji_button:
+            label: "Добавить эмодзи"
         title: "Настройки"
         no_results: "Ничего не найдено."
         more_than_30_results: "Найдено более 30 результатов. Пожалуйста, уточните параметры поиска или выберите раздел."
@@ -4822,6 +5104,9 @@ ru:
           modal_no: "Нет, применять изменения только в будущем"
         simple_list:
           add_item: "Добавить элемент..."
+        json_schema:
+          edit: Открыть редактор
+          modal_title: "Редактировать %{name}"
       badges:
         title: Награды
         new_badge: Новая награда
@@ -4858,8 +5143,12 @@ ru:
         enabled: Активировать использование этой награды
         icon: Иконка
         image: Картинка
+        graphic: Иконка награды
         icon_help: "Введите имя иконки из коллекции Font Awesome (используйте префикс 'far-' для обычных значков и 'fab-' для значков брендов)"
-        image_help: "Введите URL-адрес изображения (отображается вместо иконки, если указаны оба параметра)"
+        image_help: "Вместо значка будет использоваться загруженное изображение, если используются обе настройки."
+        select_an_icon: "Выбрать иконку"
+        upload_an_image: "Загрузить изображение"
+        read_only_setting_help: "Настроить текст"
         query: Выборка награды (SQL)
         target_posts: Выборка целевых сообщений
         auto_revoke: Запускать ежедневно запрос на отзыв
@@ -4884,7 +5173,7 @@ ru:
           no_grant_count: "Нет наград для выдачи."
           grant_count:
             one: "Будет выдана <b>%{count}</b> награда."
-            few: "<b>%{count}</b> награды будут выданы."
+            few: "Будут выданы <b>%{count}</b> награды."
             many: "Будут выданы <b>%{count}</b> наград."
             other: "Будут выданы <b>%{count}</b> наград."
           sample: "Пример:"
@@ -4908,8 +5197,8 @@ ru:
           success: Файл успешно загружен, пользователи получат награды в ближайшее время.
           replace_owners: Удалять эту награду у предыдущих владельцев
       emoji:
-        title: "Смайлы"
-        help: "Добавить новые смайлики-emoji, которые будут доступны всем. (Подсказка: можно перетаскивать несколько файлов за раз)"
+        title: "Эмодзи"
+        help: "Добавить новые эмодзи, которые будут доступны всем. (Подсказка: можно перетаскивать несколько файлов за раз)"
         add: "Добавить новую иконку"
         uploading: "Загрузка..."
         name: "Название"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 77bd00b722..6e0a26bb80 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -127,6 +127,11 @@ sk:
           few: "pred %{count} dňami"
           many: "pred %{count} dňami"
           other: "pred %{count} dňami"
+        x_months:
+          one: "pred mesiacom"
+          few: "pred %{count} mesiacmi"
+          many: "pred %{count} mesiacmi"
+          other: "pred %{count} mesiacmi"
       later:
         x_days:
           one: "%{count} deň neskôr"
@@ -182,6 +187,8 @@ sk:
         disabled: "odstránil(a) tento oznam %{when}. Už sa viac nebude zobrazovať navrchu každej stránky."
     wizard_required: "Vitajte vo vašom novom Discourse! Začnime so <a href='%{url}' data-auto-route='true'>sprievodcom nastavením</a>✨ "
     emails_are_disabled: "Odosielanie emailov bolo globálne vypnuté administrátorom. Žiadne emailové notifikácie nebudú odoslané."
+    software_update_prompt:
+      dismiss: "Zahodiť"
     bootstrap_mode_disabled: "Zavádzací režim bude zrušený v priebehu nasledujúcich 24 hodín."
     themes:
       default_description: "Predvolené"
@@ -237,6 +244,11 @@ sk:
     now: "práve teraz"
     read_more: "čítaj ďalej"
     more: "Viac"
+    x_more:
+      one: "%{count} Ďalší"
+      few: "%{count} Ďalší"
+      many: "%{count} Ďalší"
+      other: "%{count} Ďalší"
     less: "Menej"
     never: "nikdy"
     every_30_minutes: "každých 30 mintút"
@@ -265,8 +277,6 @@ sk:
       moderators: "Moderátori"
       stat:
         all_time: "Za celú dobu"
-        last_7_days: "Posledných 7"
-        last_30_days: "Posledných 30"
       like_count: "Páči sa mi"
       topic_count: "Témy"
       post_count: "Príspevky"
@@ -285,18 +295,15 @@ 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ť"
+      auto_delete_preference:
+        never: "Nikdy"
       search: "Hľadať"
-      reminders:
-        tomorrow: "Zajtra"
-        next_week: "Budúci týždeň"
-        next_month: "Budúci mesiac"
     drafts:
       resume: "Pokračovať"
       remove: "Odstrániť"
       new_topic: "Nová téma"
       abandon:
-        yes_value: "Áno, opustiť"
-        no_value: "Nie, ponechať"
+        yes_value: "Zahodiť"
     topic_count_latest:
       one: "Pozri si %{count} novú alebo upravenú tému."
       few: "Pozri si %{count} nových alebo upravených tém."
@@ -343,6 +350,7 @@ sk:
         total: "Celkovo"
       delete: "Odstrániť"
       settings:
+        saved: "Uložené"
         save_changes: "Uložiť zmeny"
         title: "Nastavenia"
       topic: "Téma:"
@@ -351,9 +359,20 @@ sk:
         username: "Používateľské meno"
         email: "Email"
         name: "Meno"
+        reject_reason: "Dôvod"
       topics:
         topic: "Témy"
         details: "detaily"
+        unique_users:
+          one: "%{count} používateľ"
+          few: "%{count} používatelia"
+          many: "%{count} používateľov"
+          other: "%{count} používateľov"
+      replies:
+        one: "%{count} odpoveď"
+        few: "%{count} odpovede"
+        many: "%{count} odpovedí"
+        other: "%{count} odpovedí"
       edit: "Upraviť"
       save: "Uložiť"
       cancel: "Zrušiť"
@@ -369,15 +388,30 @@ sk:
       statuses:
         pending:
           title: "Čakajúce správy"
+        approved:
+          title: "Schválený"
         rejected:
           title: "Zamietnuté"
       types:
         reviewable_user:
           title: "Používateľ"
+        reviewable_post:
+          title: "Príspevok"
       approval:
         title: "Príspevok vyžaduje schválenie"
         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"
+      example_username: "používateľské meno"
+    relative_time_picker:
+      days:
+        one: "deň"
+        few: "dní"
+        many: "dní"
+        other: "dní"
+    time_shortcut:
+      tomorrow: "Zajtra"
+      next_week: "Budúci týždeň"
+      next_month: "Budúci mesiac"
     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>"
@@ -393,6 +427,7 @@ sk:
       sent_by_user: "Poslané od <a href='%{userUrl}'>%{user}</a>"
       sent_by_you: "Poslané <a href='%{userUrl}'>Vami</a>"
     directory:
+      username: "Používateľské meno"
       filter_name: "filtrovať podľa používateľského mena"
       title: "Používatelia"
       likes_given: "Rozdané"
@@ -442,9 +477,17 @@ sk:
           credentials:
             username: "Používateľské meno"
             password: "Heslo"
+          settings:
+            title: "Nastavenia"
+          mailboxes:
+            disabled: "vypnuté"
         membership:
           title: Členstvo
           access: Prístup
+        categories:
+          title: Kategórie
+        tags:
+          title: Štítky
         logs:
           title: "Záznamy"
           when: "Kedy"
@@ -455,6 +498,8 @@ sk:
           details: "Detaily"
           from: "Od"
           to: "Komu"
+      permissions:
+        title: "Práva"
       public_admission: "Povoliť používateľom slobodne sa stať člen skupiny (kupina musí byť verejne viditeľná)"
       public_exit: "Povoliť používateľom slobodne opustiť skupinu."
       empty:
@@ -580,7 +625,6 @@ sk:
       posts: "Príspevky"
       topics: "Témy"
       latest: "Najnovšie"
-      latest_by: "najnovšie podľa"
       toggle_ordering: "zmeniť radenie"
       subcategories: "Podkategórie"
       topic_sentence:
@@ -588,6 +632,10 @@ sk:
         few: "%{count} témy"
         many: "%{count} tém"
         other: "%{count} tém"
+      topic_stat_unit:
+        week: "týždeň"
+        month: "mesiac"
+      n_more: "Kategórie (%{count} viac)..."
     ip_lookup:
       title: Vyhľadávanie podľa IP adresy
       hostname: Hostname
@@ -628,7 +676,11 @@ sk:
         ignore_duration_username: "Používateľské meno"
         mute_option: "Ignorované"
         normal_option: "Normálne"
+      notification_schedule:
+        none: "Žiadny"
+        to: "komu"
       activity_stream: "Aktivita"
+      read: "Prečítané"
       preferences: "Nastavenia"
       feature_topic_on_profile:
         save: "Uložiť"
@@ -651,12 +703,13 @@ sk:
         perm_denied_expl: "Povolenie pre zobrazenie notifikácií ste zakázali. Notifikácie povolíte v nastaveniach vášho prehliadača."
         disable: "Zakázať upozornenia"
         enable: "Povoliť upozornenia"
-        each_browser_note: "Poznámka: Toto nastavenie musíte zmeniť v každom používanom prehliadači."
         consent_prompt: "Prajete si dostávať upozornenia na pracovnej ploche hneď keď niekto odpovie na váš príspevok?"
       dismiss: "Zahodiť"
       dismiss_notifications: "Zahodiť všetko"
       dismiss_notifications_tooltip: "Označiť všetky neprečítané upozornenia ako prečítané"
       first_notification: "Vaša prvé upozornenie! Vyberte ho ak chcete začať."
+      color_schemes:
+        regular: "Bežné"
       allow_private_messages: "Umožniť iným používateľom, aby mi posielali osobné správy"
       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"
@@ -699,6 +752,7 @@ sk:
       watched_first_post_tags: "Sledovaný prvý príspevok"
       watched_first_post_tags_instructions: "Budete upozornený na prvý príspevok v každej novej téme s týmito štítkami."
       muted_categories: "Ignorované"
+      regular_categories: "Bežné"
       no_category_access: "Ako moderátor máte obmedzený prístup ku kategóriám. Ukladanie nie je povolené."
       delete_account: "Vymazať môj účet"
       delete_account_confirm: "Ste si istý, že chcete permanentne vymazať váš účet? Táto akcia je nenávratná."
@@ -738,6 +792,7 @@ sk:
         tags: "Štítky"
       preferences_nav:
         account: "Účet"
+        security: "Bezpečnosť"
         profile: "Profil"
         emails: "Emaily"
         notifications: "Upozornenia"
@@ -911,8 +966,18 @@ sk:
         after_10_minutes: "po 10 minútach"
       notification_level_when_replying: "Keď prispejem do témy, nastav spôsob sledovania na"
       invited:
-        search: "začni písať pre hľadanie pozvánok"
         title: "Pozvánky"
+        pending_tab: "Čakajúce"
+        pending_tab_with_count: "Čakajúce (%{count})"
+        redeemed_tab: "Využité"
+        redeemed_tab_with_count: "Využité (%{count})"
+        invited_via: "Pozvánka"
+        groups: "Skupiny"
+        topic: "Témy"
+        edit: "Upraviť"
+        remove: "Odstrániť"
+        reinvited: "Poslať pozvánku znovu"
+        search: "začni písať pre hľadanie pozvánok"
         user: "Pozvaný používateľ"
         none: "Nemáte žiadne pozvánky na zobrazenie."
         truncated:
@@ -921,33 +986,20 @@ sk:
           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_at: "Využitá"
         pending: "Čakajúce pozvánky"
-        pending_tab: "Čakajúce"
-        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."
-        rescind: "Odstrániť"
-        rescinded: "Pozvánka odstránená"
-        reinvite: "Poslať pozvánku znovu"
-        reinvite_all: "Poslať všetky pozvánky znovu"
         reinvite_all_confirm: "Naozaj chcete poslať všetky pozvánky znovu?"
-        reinvited: "Poslať pozvánku znovu"
-        reinvited_all: "Všetky pozvánky boli znovu poslané!"
         time_read: "Doba čítania"
         days_visited: "Dní na stránke"
         account_age_days: "Vek účtu v dňoch"
-        links_tab: "Odkazy"
-        link_created_at: "Vytvorené"
-        link_groups: Skupiny
+        create: "Pozvi"
         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:
-          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:
         title: "Heslo"
@@ -971,6 +1023,16 @@ sk:
           few: "vytvorené príspevky"
           many: "vytvorených príspevkov"
           other: "vytvorených príspevkov"
+        likes_given:
+          one: "rozdané"
+          few: "rozdané"
+          many: "rozdané"
+          other: "rozdané"
+        likes_received:
+          one: "prijaté"
+          few: "prijaté"
+          many: "prijaté"
+          other: "prijaté"
         days_visited:
           one: "deň na stránke"
           few: "dni na stránke"
@@ -1047,7 +1109,6 @@ sk:
     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ý."
     refresh: "Obnoviť"
     home: "Domov"
@@ -1056,15 +1117,6 @@ sk:
       login_disabled: "Keď je zapnutý mód iba na čítanie, prihlásenie nie je možné."
       logout_disabled: "Odhlásenie nie je možné, kým je stránka v móde iba na čítanie."
     learn_more: "zistiť viac..."
-    all_time: "celkovo"
-    all_time_desc: "celkovo vytvorených tém"
-    year: "rok"
-    year_desc: "témy vytvorené za posledných 365 dní"
-    month: "mesiac"
-    month_desc: "témy vytvorené za posledných 30 dní"
-    week: "týždeň"
-    week_desc: "témy vytvorené za posledných 7 dní"
-    day: "deň"
     first_post: Prvý príspevok
     mute: Ignorovať
     unmute: Prestať ignorovať
@@ -1080,11 +1132,8 @@ sk:
       sign_up: "Registrovať sa"
       hide_session: "Pripomenúť zajtra"
       hide_forever: "nie, ďakujem"
-      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>."
       enable: "Zhrnutie tejto témy"
       disable: "Zobraziť všetky príspevky"
     deleted_filter:
@@ -1104,7 +1153,7 @@ sk:
     trust_level: "Stupeň dôvery"
     search_hint: "používateľské meno, email alebo IP adresa"
     create_account:
-      title: "Vytvoriť nový účet"
+      header_title: "Vitajte!"
       failed: "Niečo sa pokazilo, možno je tento e-mail už registrovaný, vyskúšajte odkaz pre zabudnuté heslo"
     forgot_password:
       title: "Obnovenie hesla"
@@ -1124,11 +1173,10 @@ sk:
       complete_email_not_found: "Žiadny účet nie je s e-mailom <b>%{email}</b>"
       confirm_title: Pokračujte na %{site_name}
     login:
-      title: "Prihlásenie"
       username: "Používateľ"
       password: "Heslo"
+      second_factor_description: "Prosím zadajte autentifikačný kód z vašej aplikácie:"
       second_factor_backup_description: "Zadajte jeden zo záložných kódov:"
-      email_placeholder: "e-mail alebo používateľské meno"
       caps_lock_warning: "Caps Lock je zapnutý"
       error: "Neznáma chyba"
       rate_limit: "Pred opätovným prihlásením chvíľku počkajte."
@@ -1171,6 +1219,7 @@ sk:
       accept_invite: "Prijať pozvánku"
       success: "Váš účet bol vytvorený a ste prihlásený."
       name_label: "Meno"
+      password_label: "Heslo"
       optional_description: "(nepovinné)"
     password_reset:
       continue: "Pokračujte na %{site_name}"
@@ -1202,7 +1251,6 @@ sk:
       more_emoji: "viac ..."
       options: "Možnosti"
       whisper: "šepot"
-      blockquote_text: "Úvodzovky"
       add_warning: "Toto je oficiálne varovanie."
       toggle_whisper: "Prepnúť šepot"
       posting_not_on_topic: "Na akú tému chcete odpovedať?"
@@ -1216,9 +1264,6 @@ sk:
         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"
         category_missing: "Musíte vybrať kategóriu"
       save_edit: "Uložiť úpravy"
       reply_original: "Odpovedať na pôvodnú tému"
@@ -1236,8 +1281,6 @@ sk:
       saving: "Ukladanie"
       saved: "Uložené!"
       uploading: "Upload prebieha..."
-      show_preview: "zobraziť náhľad &raquo;"
-      hide_preview: "&raquo; skryť náhľad"
       quote_post_title: "Citovať celý príspevok"
       bold_label: "B"
       bold_title: "Výrazne"
@@ -1249,8 +1292,8 @@ sk:
       link_description: "tu zadaj popis odkazu"
       link_dialog_title: "Vložte hyperlink"
       link_optional_text: "nepovinný názov"
-      quote_title: "Úvodzovky"
-      quote_text: "Úvodzovky"
+      blockquote_title: "Úvodzovky"
+      blockquote_text: "Úvodzovky"
       code_title: "Preformátovaný text"
       code_text: "Odsaďte preformátovaný text 4 medzerami"
       paste_code_text: "sem zadajte alebo vložte kód"
@@ -1292,10 +1335,7 @@ 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}"
       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}"
-      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"
       select_file: "Zvoľte súbor"
@@ -1316,6 +1356,7 @@ sk:
       post_format: "#%{post_number} podľa %{username}"
       cant_find: "Nemôžete nájsť to čo hľadáte?"
       search_google_button: "Google"
+      search_button: "Hľadať"
       context:
         user: "Vyhľadávanie podľa @%{username}"
         category: "Vyhľadať kategóriu #%{category}"
@@ -1343,10 +1384,14 @@ sk:
           noreplies: majú nula odpovedí
           single_user: obsahujú jediného používateľa
         post:
+          count:
+            label: Príspevky
           time:
             label: Odoslané
             before: pred
             after: po
+        views:
+          label: Zobrazenia
     hamburger_menu: "prejsť na iné témy, alebo kategórie"
     new_item: "nový"
     go_back: "späť"
@@ -1370,6 +1415,7 @@ sk:
         actions: "Hromadné akcie"
         close_topics: "Uzavrieť tému"
         archive_topics: "Archivuj témy"
+        move_messages_to_inbox: "Presuň do prijatej pošty"
         notification_level: "Upozornenia"
         choose_new_category: "Vyberte pre tému novú kategóriu:"
         selected:
@@ -1387,8 +1433,6 @@ sk:
         bookmarks: "Nemáte zatiaľ žiadne témy v záložkách."
         category: "V kategórii %{category} nie je žiadna téma"
         top: "Nie sú žiadne populárne témy."
-        educate:
-          unread: '<p>Tu sa zobrazia Vaše neprečítané témy.</p><p>V predvolenom nastavení sú témy považované za neprečítané a zobrazí sa počet neprečítaných <span class="badge new-posts badge-notification">1</span> ak ste:</p><ul><li>Vytvorili tému</li><li>Odpovedali na tému</li><li>Čítali tému viac ako 4 minúty</li></ul><p>Alebo ste explicitne nastavili pozorovanie alebo sledovanie témy prostredníctvom ovládania upozornení na konci každej témy.</p><p>Môžte to zmeniť vo Vašich <a href="%{userPrefsUrl}">nastaveniach</a>.</p>'
       bottom:
         latest: "Nie je už viac najnovšich tém."
         posted: "Žiadne ďalšie témy na čítanie."
@@ -1396,6 +1440,7 @@ sk:
         new: "Žiadne nové témy."
         unread: "Žiadne ďalšie neprečítané témy."
         category: "Žiadne ďalšie témy v %{category}."
+        tag: "Žiadne ďalšie témy v %{tag}."
         top: "Nie je už viac poulárnych tém"
         bookmarks: "Žiadne ďalšie témy v záložkách."
     topic:
@@ -1467,12 +1512,14 @@ sk:
       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_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
       jump_reply_up: prejsť na predchádzajúcu odpoveď
       jump_reply_down: prejsť na nasledujúcu odpoveď
       deleted: "Téma bola vymazaná"
+      slow_mode_update:
+        save: "Zapnúť"
+        remove: "Vypnúť"
       topic_status_update:
         num_of_hours: "Počet hodín:"
         when: "Kedy:"
@@ -1480,11 +1527,7 @@ sk:
         tomorrow: "Zajtra"
         this_weekend: "Tento víkend"
         next_week: "Budúci týždeň"
-        two_weeks: "Dva týždne"
         next_month: "Budúci mesiac"
-        three_months: "Tri mesiace"
-        six_months: "Šesť mesiacov"
-        one_year: "Jeden rok"
         forever: "Vždy"
         pick_date_and_time: "Vyberte dátum a čas"
       temp_close:
@@ -1496,7 +1539,7 @@ sk:
         title: "Upozorni ma"
       status_update_notice:
         auto_close: "Táto téma bude automaticky uzavretá o %{timeLeft}."
-        auto_close_based_on_last_post: "Táto téma bude uzavretá %{duration} po poslednej odpovedi."
+        auto_close_after_last_post: "Táto téma bude uzavretá %{duration} po poslednej odpovedi."
       auto_close_title: "Nastavenia automatického zatvárania"
       auto_close_immediate:
         one: "Posledný príspevok k téme je starý už %{count} hodinu, takže téma bude okamžite uzavretá. "
@@ -1512,6 +1555,7 @@ sk:
         go: "Choď"
         jump_bottom: "choď na posledný príspevok"
         jump_prompt: "choď na..."
+        jump_prompt_long: "Choď na..."
         jump_bottom_with_number: "choď na príspevok číslo %{post_number}"
         jump_prompt_or: "alebo"
         total: Všetkých príspevkov
@@ -1585,6 +1629,7 @@ sk:
       share:
         title: "Zdieľaj"
         help: "zdieľaj odkaz na túto tému"
+        invite_users: "Pozvi"
       print:
         title: "Tlačiť"
       flag_topic:
@@ -1635,14 +1680,13 @@ sk:
         username_placeholder: "používateľské meno"
         action: "Pošli pozvánku"
         help: "pozvite ostatných k tejto téme prostredníctvom emailu, alebo upozornení"
-        to_forum: "Pošleme krátký email dovoľujúci Vášmu priateľovi okamžité pripojenie kliknutím na odkaz bez potreby prihlasovania"
-        sso_enabled: "Zadajte používateľské meno osoby, ktorú by ste radi pozvali k tejto téme"
+        discourse_connect_enabled: "Zadajte používateľské meno osoby, ktorú by ste radi pozvali k tejto téme"
         to_topic_blank: "Zadajte používateľské meno alebo email osoby, ktorú by ste radi pozvali k tejto téme"
         to_topic_email: "Zadali ste emailovú adresu. Pošleme pozvánku ktorá umožní Vášmu priateľovi okamžitú odpoveď k tejto téme."
         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>%{invitee}</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ť"
@@ -1708,9 +1752,9 @@ sk:
           other: "Označili ste <b>%{count}</b> príspevkov"
     post:
       quote_reply: "Citácia"
+      quote_share: "Zdieľaj"
       edit_reason: "Dôvod:"
       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}:"
       follow_quote: "prejsť na citovaný príspevok"
@@ -1720,6 +1764,7 @@ sk:
         few: "(príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodiny pokiaľ nie sú označené)"
         many: "(príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodín pokiaľ nie sú označené)"
         other: "(príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodín pokiaľ nie sú označené)"
+      collapse: "zbaliť"
       expand_collapse: "rozbaliť/zbaliť"
       gap:
         one: "zobraziť skrytú odpoveď"
@@ -1752,12 +1797,8 @@ sk:
         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ý."
-      abandon_edit:
-        no_value: "Nie, ponechať"
-      abandon:
-        confirm: "Ste si istý, že chcete zahodiť tento príspevok?"
-        no_value: "Nie, ponechať."
-        yes_value: "Áno, zahodiť."
+      cancel_composer:
+        discard: "Zahodiť"
       via_email: "tento príspevok prišiel emailom"
       whisper: "tento príspevok je súkromným šepotom pre moderátorov"
       wiki:
@@ -1792,6 +1833,12 @@ sk:
         unlock_post: "Odblokovať príspevok"
         delete_topic: "odstrániť tému"
       actions:
+        people:
+          like:
+            one: "páčilo sa"
+            few: "páčilo sa"
+            many: "páčilo sa"
+            other: "páčilo sa"
         by_you:
           off_topic: "Označíli ste to ako mimo tému"
           spam: "Označíli ste to ako spam"
@@ -1857,6 +1904,11 @@ sk:
       change_in_category_topic: "Uprav popis"
       already_used: "Táto farba je už použitá inou kategóriou"
       security: "Bezpečnosť"
+      permissions:
+        group: "Skupina"
+        see: "Zobraz"
+        reply: "Odpovedať"
+        create: "Vytvoriť:"
       special_warning: "Upozornenie: Toto je preddefinovaná kategória a jej bezpečnostné nastavenia sa nedajú upraviť. Pokiaľ si neželáte použiť túto kategóriu, neupravujte ju, ale zmažte."
       images: "Obrázky"
       email_in: "Vlastná e-mailová adresa pre príchodziu poštu:"
@@ -1874,22 +1926,20 @@ sk:
       notifications:
         watching:
           title: "Sledovať"
-          description: "Budete automaticky sledovať všetky témy v týchto kategóriách. Budete upozornený na každý nový príspevok v každej téme. Zároveň bude zobrazený počet nových odpovedí."
         watching_first_post:
           title: "Sledovať prvý príspevok"
         tracking:
           title: "Pozorovať"
-          description: "Budete automaticky pozorovať všetky témy v týchto kategóriách. Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie. Zároveň bude zobrazený počet nových odpovedí."
         regular:
           title: "Bežné"
           description: "Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie."
         muted:
           title: "Stíšené"
-          description: "Nikdy nebudete informovaní o udalostiach v nových témach týchto kategórií. Tieto témy sa zároveň nebudú zobrazovať v zozname posledných udalostí."
       search_priority:
         options:
           normal: "Normálne"
       sort_options:
+        default: "predvolené"
         likes: "Páči sa mi"
         views: "Zobrazenia"
         posts: "Príspevky"
@@ -1902,6 +1952,14 @@ sk:
     flagging:
       title: "Ďakujeme, že pomáhate udržiavať slušnosť v našej komunite!"
       action: "Označ príspevok"
+      take_action_options:
+        default:
+          title: "Vykonať akciu"
+          details: "Dosiahnuť okamžite limit označení, namiesto čakania na ďalšie označenia od komunity"
+        suspend:
+          title: "Zruš práva používateľovi"
+        silence:
+          title: "Tichý užívateľ"
       notify_action: "Správa"
       official_warning: "Oficiálne varovanie"
       delete_spammer: "Zmazať spammera"
@@ -1972,17 +2030,6 @@ 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_likes_MF: |2
-
-      Táto téma obsahuje {count, plural, one {1 odpoveď} other {# odpovedí}} {ratio, select,
-
-      low {s vysokým pomerom "Páči sa" na príspevok}
-
-      med {s veľmi vysokým pomerom "Páči sa" na príspevok}
-
-      high {s extrémne vysokým pomerom "Páči sa" na príspevok}
-
-      other {}}
     original_post: "Pôvodný príspevok"
     views: "Zobrazenia"
     views_lowercase:
@@ -2005,7 +2052,6 @@ sk:
       many: "používateľov"
       other: "používateľov"
     category_title: "Kategória"
-    history: "História"
     changed_by: "od %{author}"
     raw_email:
       not_available: "Nedostupné!"
@@ -2096,6 +2142,7 @@ sk:
       readonly: "Zobraz"
     lightbox:
       download: "stiahnuť"
+      counter: "%curr% z %total%"
     keyboard_shortcuts_help:
       title: "Klávesové skratky"
       jump_to:
@@ -2155,6 +2202,11 @@ sk:
       granted_on: "Udelený dňa %{date}"
       others_count: "Ostatní s týmto odznakom (%{count})"
       title: Odznaky
+      more_badges:
+        one: "+%{count} Ďalší"
+        few: "+%{count} Ďalší"
+        many: "+%{count} Ďalší"
+        other: "+%{count} Ďalší"
       granted:
         one: "%{count} udelený"
         few: "%{count} udelené"
@@ -2230,6 +2282,10 @@ sk:
       back: "Späť"
       share: "Zdieľať"
       dismiss: "Zahodiť"
+    do_not_disturb:
+      remaining: "%{remaining} zostáva"
+      options:
+        custom: "Vlastné"
   admin_js:
     type_to_filter: "zadajte, čo chcete filtrovať ..."
     admin:
@@ -2251,6 +2307,8 @@ sk:
         version_check_pending: "Zdá sa že ste nedávno aktualizovali. Fantastické!"
         installed_version: "Nainštalované"
         latest_version: "Najnovšie"
+        new_features:
+          dismiss: "Zahodiť"
         last_checked: "Naposledy overené"
         refresh_problems: "Obnoviť"
         no_problems: "Nenašli sa žiadne problémy."
@@ -2283,6 +2341,9 @@ sk:
           view_table: "tabuľka"
           view_graph: "graf"
           refresh_report: "Obnoviť report"
+          daily: Denne
+          monthly: Mesačne
+          weekly: Týždenne
           groups: "Všetky skupiny"
           filters:
             group:
@@ -2303,9 +2364,6 @@ sk:
             available: "Názov skupiny je k dispozícii"
             not_available: "Názov skupiny nie je k dispozícii"
             blank: "Názov skupiny nesmie byť prázdny"
-        bulk_add:
-          title: "Hromadné pridanie do skupiny"
-          paste: "Vlož zoznam používateľov alebo emailov, jeden na riadok:"
         add_members:
           as_owner: "Nastaviť používateľa/ov ako vlastníka/ov skupiny"
         manage:
@@ -2352,6 +2410,8 @@ sk:
         description: Popis
         save: Uložiť
         continue: Pokračovať
+        scopes:
+          action: Akcia
       web_hooks:
         create: "Vytvoriť"
         save: "Uložiť"
@@ -2470,6 +2530,7 @@ sk:
           components: "Komponenty"
           theme_name: "Názov témy"
           component_name: "Názov komponentu"
+          customize_desc: "Upraviť:"
           create: "Vytvoriť:"
           create_type: "Typ"
           create_name: "Meno"
@@ -2489,6 +2550,7 @@ sk:
           installed: "Nainštalované"
           install_popular: "Populárne"
           about_theme: "O stránke"
+          version: "Verzia:"
           enable: "Povoliť"
           disable: "Zakázať"
           check_for_updates: "Skontrolovať aktualizácie"
@@ -2571,6 +2633,7 @@ sk:
         delivery_method: "Spôsob doručenia"
         preview_digest_desc: "Náhľad obsahu súhrnných emailov zaslaných neaktívnym používateľom."
         refresh: "Obnoviť"
+        sending_email: "Email sa odosiela..."
         format: "Formát"
         html: "html"
         text: "text"
@@ -2621,6 +2684,7 @@ sk:
           do_nothing: "nerob nič"
         staff_actions:
           all: "všetko"
+          filter: "Filter:"
           title: "Akcie personálu"
           clear_filters: "Ukázať všetko"
           staff_user: "Používateľ"
@@ -2703,6 +2767,7 @@ sk:
         logster:
           title: "Chybové Logy"
       watched_words:
+        search: "hľadať"
         clear_filter: "Vyčistiť"
         download: Stiahnuť
         clear_all: Odznač všetky
@@ -2751,6 +2816,8 @@ sk:
         check_email:
           title: "Odhaliť emailovú adresu tohto používateľa"
           text: "Zobraziť"
+        check_sso:
+          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}"
@@ -2868,8 +2935,7 @@ sk:
           on_grace_period: "V súčastnosti je v povyšovacej skúšobnej dobe, nebude degradovaný."
           locked_will_not_be_promoted: "Stupeň dôvery je zamknutý. Nikdy nebude povýšený."
           locked_will_not_be_demoted: "Stupeň dôvery je zamknutý. Nikdy nebude degradovaný."
-        sso:
-          title: "Jednotné prihlásenie"
+        discourse_connect:
           external_id: "Externé ID"
           external_username: "Používateľské meno"
           external_name: "Meno"
@@ -3048,6 +3114,9 @@ sk:
         embed_by_username: "Používateľské meno pre vytváranie tém"
         embed_post_limit: "Maximálny počet vložených príspevkov"
         embed_truncate: "Skrátiť vložené príspevky"
+        allowed_embed_selectors: "CSS selector pre elementy ktoré je možné vkladať"
+        blocked_embed_selectors: "CSS selector pre elementy ktoré nie je možné vkladať"
+        allowed_embed_classnames: "Dovolené názvy CSS tried"
         save: "Uložiť Nastavenia vkladania"
       permalink:
         title: "Trvalé odkazy"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 1eeec351f9..83178b3b7e 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -202,6 +202,8 @@ sl:
     topic_admin_menu: "dejanja teme"
     wizard_required: "Dobrodošli v vašem novem Discoursu! Začnimo s <a href='%{url}' data-auto-route='true'>čarovnikom za nastavitve</a> ✨"
     emails_are_disabled: "Vsa odhodna e-pošta je bila globalno onemogočena iz strani administratorja. E-poštna obvestila ne bodo poslana."
+    software_update_prompt:
+      dismiss: "Opusti"
     bootstrap_mode_disabled: "Zagonski način bo onemogočen v 24 urah."
     themes:
       default_description: "Privzeto"
@@ -228,6 +230,7 @@ sl:
         us_gov_west_1: "AWS GovCloud (ZDA-zahod)"
         us_west_1: "US West (N. California)"
         us_west_2: "US West (Oregon)"
+    clear_input: "Počisti vnos"
     edit: "uredi naslov in kategorijo te teme"
     expand: "Razširi"
     not_implemented: "Oprosti, ta funkcija še ni bila implementirana!"
@@ -264,6 +267,11 @@ sl:
     now: "ravnokar"
     read_more: "preberi več"
     more: "Več"
+    x_more:
+      one: "%{count} Več"
+      two: "%{count} Več"
+      few: "%{count} Več"
+      other: "%{count} Več"
     less: "Manj"
     never: "nikoli"
     every_30_minutes: "vsakih 30 minut"
@@ -294,8 +302,9 @@ sl:
       moderators: "Moderatorji"
       stat:
         all_time: "Ves čas"
-        last_7_days: "Zadnjih 7"
-        last_30_days: "Zadnjih 30"
+        last_day: "Zadnjih 24 ur"
+        last_7_days: "Zadnjih 7 dni"
+        last_30_days: "Zadnjih 30 dni"
       like_count: "Všečki"
       topic_count: "Teme"
       post_count: "Prispevki"
@@ -331,18 +340,6 @@ sl:
       search_placeholder: "Iščite zaznamke po imenu, naslovu teme ali vsebini objave"
       search: "Išči"
       reminders:
-        later_today: "Kasneje v dnevu"
-        next_business_day: "Naslednji delovni dan"
-        tomorrow: "Jutri"
-        next_week: "Naslednji teden"
-        post_local_date: "Datum v objavi"
-        later_this_week: "Kasneje v tednu"
-        start_of_next_business_week: "Ponedeljek"
-        start_of_next_business_week_alt: "Naslednji ponedeljek"
-        next_month: "Naslednji mesec"
-        custom: "Izberi datum in čas"
-        last_custom: "Zadnji"
-        none: "Opomnik ni potreben"
         today_with_time: "danes ob %{time}"
         tomorrow_with_time: "jutri ob %{time}"
         at_time: "ob %{date_time}"
@@ -357,9 +354,7 @@ sl:
       new_private_message: "Nov osnutek zasebnega sporočila"
       topic_reply: "Osnutek odgovora"
       abandon:
-        confirm: "V tej temi že imate drug osnutek. Ste prepričani, da ga želite opustiti?"
-        yes_value: "Da, opusti"
-        no_value: "Ne, obdrži"
+        yes_value: "Zavrzi"
     topic_count_latest:
       one: "Poglej %{count} novo ali posodobljeno temo"
       two: "Poglej %{count} novi ali posodobljeni temi"
@@ -437,7 +432,9 @@ sl:
         other: "Ta tema ima <b>%{count}</b> prispevkov za potrditev"
       title: "Pregled"
       topic: "Tema:"
+      filtered_topic: "V eni temi ste filtrirali vsebino, ki jo je mogoče pregledati."
       filtered_user: "Uporabnik"
+      filtered_reviewed_by: "Pregledal"
       show_all_topics: "prikaži vse teme"
       deleted_post: "(prispevek izbrisan)"
       deleted_user: "(uporabnik izbrisan)"
@@ -447,12 +444,7 @@ sl:
         email: "E-naslov"
         name: "Polno ime"
         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)"
+        reject_reason: "Razlog"
       topics:
         topic: "Tema"
         reviewable_count: "Število"
@@ -488,7 +480,9 @@ sl:
           created_at: "Ustvarjeno"
           created_at_asc: "Ustvarjeno (obratno)"
         priority:
-          low: "(katerikoli)"
+          title: "Minimalna prednost"
+          any: "(katerikoli)"
+          low: "Nizka"
           medium: "Srednja"
           high: "Visoka"
       conversation:
@@ -526,6 +520,8 @@ sl:
           title: "Prispevek za potrditev"
         reviewable_user:
           title: "Uporabnik"
+        reviewable_post:
+          title: "Prispevek"
       approval:
         title: "Prispevek za odobritev."
         description: "Prejeli smo vaš nov prispevek, vendar potrebuje odobritev s strani moderatorja preden bo objavljen. Prosimo za potrpežljivost."
@@ -536,6 +532,43 @@ sl:
           other: "Imate <strong>%{count}</strong> prispevkov za potrditev."
         ok: "OK"
       example_username: "uporabniško ime"
+      reject_reason:
+        title: "Zakaj zavračate tega uporabnika?"
+        send_email: "Pošlji e-poštno sporočilo o zavrnitvi"
+    relative_time_picker:
+      minutes:
+        one: "minuta"
+        two: "minuti"
+        few: "minute"
+        other: "minut"
+      hours:
+        one: "ura"
+        two: "uri"
+        few: "ure"
+        other: "ur"
+      days:
+        one: "dan"
+        two: "dneva"
+        few: "dnevi"
+        other: "dni"
+      months:
+        one: "mesec"
+        two: "meseca"
+        few: "meseci"
+        other: "mesecev"
+    time_shortcut:
+      later_today: "Kasneje danes"
+      next_business_day: "Naslednji delovni dan"
+      tomorrow: "Jutri"
+      next_week: "Naslednji teden"
+      post_local_date: "Datum v objavi"
+      later_this_week: "Kasneje v tednu"
+      start_of_next_business_week: "Ponedeljek"
+      start_of_next_business_week_alt: "Naslednji ponedeljek"
+      next_month: "Naslednji mesec"
+      custom: "Izberi datum in čas"
+      relative: "Relativni čas"
+      none: "Brez opomnika"
     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>"
@@ -624,6 +657,10 @@ sl:
             imap_ssl: "Uporabi SSL za IMAP"
             username: "Uporabniško ime"
             password: "Geslo"
+          settings:
+            title: "Nastavitve"
+            allow_unknown_sender_topic_replies: "Dovoli odgovore neznanih pošiljateljev."
+            allow_unknown_sender_topic_replies_hint: "Omogoča neznanim pošiljateljem, da odgovarjajo na teme skupine. Če to ni omogočeno, bodo odgovori iz e-poštnih naslovov, ki še niso vključeni v e-poštno nit IMAP ali niso povabljeni v to temo, ustvarili novo temo."
           mailboxes:
             synchronized: "Sinhronizirani nabiralnik"
             none_found: "V tem računu nismo našli poštnega nabiralnika."
@@ -727,7 +764,22 @@ sl:
         make_owner_description: "Izberi <b>%{username}</b> za skrbnika te skupine"
         remove_owner: "Odstrani kot skrbnika"
         remove_owner_description: "Odstrani <b>%{username} </b> kot skrbnika te skupine"
+        make_primary: "Nastavi kot primarno"
+        make_primary_description: "Naj bo to primarna skupina za <b>%{username}</b>"
+        remove_primary: "Odstrani kot primarno"
+        remove_primary_description: "Odstrani kot primarno skupino za <b>%{username}</b>"
+        remove_members: "Odstrani člane"
+        remove_members_description: "Odstrani izbrane uporabnike iz te skupine"
+        make_owners: "Določi za skrbnike"
+        make_owners_description: "Določi izbrane uporabnike za skrbnike te skupine"
+        remove_owners: "Odstrani skrbnike"
+        remove_owners_description: "Odstrani izbrane uporabnike kot skrbnike te skupine"
+        make_all_primary: "Nastavi vsem kot primarno"
+        make_all_primary_description: "Naj bo to primarna skupina za vse izbrane uporabnike"
+        remove_all_primary: "Odstrani kot primarno"
+        remove_all_primary_description: "Odstrani to skupino kot primarno"
         owner: "Skrbnik"
+        primary: "Primarna"
         forbidden: "Nimate dovoljenja da vidite člane."
       topics: "Teme"
       posts: "Prispevki"
@@ -799,7 +851,6 @@ sl:
       posts: "Prispevki"
       topics: "Teme"
       latest: "Najnovejše"
-      latest_by: "najnovejše po"
       toggle_ordering: "preklop nadzora razvrščanja"
       subcategories: "Pod Kategorija"
       muted: "Utišane kategorije"
@@ -808,6 +859,19 @@ sl:
         two: "%{count} temi"
         few: "%{count} teme"
         other: "%{count} tem"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        two: "%{number} / %{unit}"
+        few: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "teden"
+        month: "mesec"
+      topic_stat_all_time:
+        one: "%{number} skupaj"
+        two: "%{number} skupaj"
+        few: "%{number} skupaj"
+        other: "%{number} skupaj"
       topic_stat_sentence_week:
         one: "%{count} nova tema v preteklem tednu."
         two: "%{count} novi temi v preteklem tednu."
@@ -872,7 +936,23 @@ sl:
         mute_option_title: "Ne boste prejemali obvestil povezanih s tem uporabnikom."
         normal_option: "Običajno"
         normal_option_title: "Obveščeni boste, če vam ta uporabnik odgovori, vas citira ali vas omeni."
+      notification_schedule:
+        title: "Razpored obveščanja"
+        label: "Omogočite razpored obveščanja po meri"
+        tip: "Izven teh ur bo samodejno vključen način »ne moti«."
+        midnight: "Opolnoči"
+        none: "Brez"
+        monday: "Ponedeljek"
+        tuesday: "Torek"
+        wednesday: "Sreda"
+        thursday: "Četrtek"
+        friday: "Petek"
+        saturday: "Sobota"
+        sunday: "Nedelja"
+        to: "do"
       activity_stream: "Aktivnost"
+      read: "Prebrano"
+      read_help: "Nedavno prebrane teme"
       preferences: "Nastavitve"
       feature_topic_on_profile:
         open_search: "Izberite novo temo"
@@ -901,11 +981,14 @@ sl:
         perm_denied_expl: "Zavrnili ste dovoljenje za obvestila. Omogočite obvestila v nastavitvah vašega brskalnika."
         disable: "Onemogoči obvestila"
         enable: "Omogoči obvestila"
-        each_browser_note: "Opomba: to nastavitev morate spremeniti v vseh brskalnikih, ki jih uporabljate."
+        each_browser_note: 'Opomba: To nastavitev morate spremeniti v vsakem brskalniku, ki ga uporabljate. Vsa obvestila bodo onemogočena, če imate možnost »ne moti«, ne glede na to nastavitev.'
         consent_prompt: "Ali hočete obvestila v brskalniku, ko prejmete odgovore na vaše prispevke?"
       dismiss: "Opusti"
       dismiss_notifications: "Opusti vse"
       dismiss_notifications_tooltip: "Označi vsa neprebrana obvestila kot prebrana"
+      no_bookmarks_title: "Še ničesar niste dodali med zaznamke"
+      no_bookmarks_body: >
+        Dodajte objave z zaznamkom z gumbom %{icon} in tukaj bodo navedeni za lažjo uporabo. Lahko si nastavite tudi opomnik!
       first_notification: "Vaše prvo obvestilo! Izberite ga za začetek."
       dynamic_favicon: "Prikaži števec na ikoni brskalnika"
       skip_new_user_tips:
@@ -916,7 +999,6 @@ sl:
       color_scheme_default_on_all_devices: "Nastavi privzete barvne sheme v vseh mojih napravah"
       color_scheme: "Barvna shema"
       color_schemes:
-        default_description: "Privzeto"
         disable_dark_scheme: "Enako kot običajna"
         dark_instructions: "Barvno shemo temnega načina si lahko ogledate tako, da napravo preklopite v temni način."
         undo: "Ponastavi"
@@ -1020,6 +1102,7 @@ sl:
         tags: "Oznake"
       preferences_nav:
         account: "Račun"
+        security: "Varnost"
         profile: "Profil"
         emails: "E-sporočila"
         notifications: "Obvestila"
@@ -1032,6 +1115,7 @@ sl:
         success: "(e-sporočilo poslano)"
         in_progress: "(pošiljanje e-sporočila)"
         error: "(napaka)"
+        emoji: "emoji za ključavnico"
         action: "Pošlji e-sporočilo za zamenjavo gesla"
         set_password: "Nastavi geslo"
         choose_new: "Izberite novo geslo"
@@ -1141,7 +1225,7 @@ sl:
         set_primary: "Nastavite primarni e-poštni naslov"
         destroy: "Odstrani e-poštni naslov"
         add_email: "Dodajte nadomestni e-poštni naslov"
-        sso_override_instructions: "E-naslov se lahko spremeni pri SSO ponudniku."
+        auth_override_instructions: "E-naslov se lahko posodobi z naslovom pri ponudniku za overjanje."
         no_secondary: "Ni dodatnih e-naslovov"
         instructions: "se nikoli ne prikaže javno"
         admin_note: "Opomba: Kadar skrbnik spremeni e-naslov drugega uporabnika, ki ni skrbnik, je to indikator, da je uporabnik izgubil dostop do svojega izvornega e-poštnega računa, zato bo e-poštno sporočilo za ponastavitev gesla poslano na nov naslov. Uporabnikov e-naslov ne bo spremenjen, dokler ne zaključi postopka ponastavitve gesla."
@@ -1280,10 +1364,21 @@ sl:
         after_10_minutes: "po 10 minutah"
       notification_level_when_replying: "Ko objavim v določeni temi, nastavi temo na"
       invited:
-        search: "išči povabila..."
         title: "Povabila"
+        pending_tab: "V teku"
+        pending_tab_with_count: "V teku (%{count})"
+        expired_tab: "Poteklo"
+        redeemed_tab: "Sprejeto"
+        redeemed_tab_with_count: "Sprejeto (%{count})"
+        invited_via: "Povabilo"
+        groups: "Skupine"
+        topic: "Tema"
+        expires_at: "Poteče"
+        edit: "Uredi"
+        remove: "Odstrani"
+        reinvited: "Povabilo ponovno poslano"
+        search: "išči povabila..."
         user: "Povabljen uporabnik"
-        sent: "Nazadnje poslano"
         none: "Ni povabil za prikaz."
         truncated:
           one: "Prikazano prvo povabilo."
@@ -1291,37 +1386,19 @@ sl:
           few: "Prikazanih prva %{count} povabila."
           other: "Prikazanih prvih %{count} povabil."
         redeemed: "Sprejeta povabila"
-        redeemed_tab: "Sprejeto"
-        redeemed_tab_with_count: "Sprejeto (%{count})"
         redeemed_at: "Sprejeto"
         pending: "Povabila v teku"
-        pending_tab: "V teku"
-        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: "Odstranite potekla 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"
-        reinvite_all: "Ponovno pošlji vsa"
+        remove_all: "Odstranite potekla povabila"
+        removed_all: "Vsa pretečena povabila odstranjena!"
+        remove_all_confirm: "Ali ste prepričani, da hočete odstraniti vsa pretečena povabila?"
         reinvite_all_confirm: "Ste prepričani, da želite ponovno poslati vsa povabila?"
-        reinvited: "Povabilo ponovno poslano"
-        reinvited_all: "Vsa povabila ponovno poslana!"
         time_read: "Čas branja"
         days_visited: "Dni prisotnosti"
         account_age_days: "Starost računa v dnevih"
-        source: "Povabljen preko"
-        links_tab: "Povezave"
-        links_tab_with_count: "Povezave (%{count})"
-        link_url: "Povezava"
-        link_created_at: "Ustvarjeno"
-        link_redemption_stats: "Izkoriščene"
-        link_groups: Skupine
-        link_expires_at: Poteče
-        copy_link: "Pokaži povezavo"
+        create: "Povabi"
         generate_link: "Ustvari povezavo za povabilo"
         link_generated: "Tu je povezava do vašega povabila!"
         valid_for: "Povezava s povabilom je veljavna samo za e-naslov: %{email}"
@@ -1333,11 +1410,20 @@ sl:
           error: "Pri ustvarjanju povezave povabila je prišlo do napake"
           max_redemptions_allowed_label: "Koliko ljudi se lahko registrira s to povezavo?"
           expires_at: "Kdaj bo ta povezava povabila potekla?"
+        invite:
+          new_title: "Ustvari povabilo"
+          instructions: "Delite to povezavo in takoj omogočite dostop do te strani:"
+          expires_in_time: "Poteče čez %{time}."
+          show_advanced: "Pokaži dodatne možnosti"
+          restrict_email: "Omejitev povabila na en e-poštni naslov"
+          max_redemptions_allowed: "Največje število uporab:"
+          add_to_groups: "Dodaj v skupine:"
+          invite_to_topic: "Pošlji v temo ob prvi prijavi:"
+          expires_at: "Poteče po:"
         bulk_invite:
+          none: "Ni povabil za prikaz na tej strani."
           text: "Skupinsko povabilo"
-          success: "Datoteka je uspešno naložena. Obveščeni boste, ko bo postopek zaključen."
           error: "Datoteka mora biti v CSV obliki."
-          confirmation_message: "Poslali boste povabila preko e-pošte vsem iz naložene datoteke."
       password:
         title: "Geslo"
         too_short: "Vaše geslo je prekratko."
@@ -1417,6 +1503,7 @@ sl:
       avatar:
         title: "Slika profila"
         header_title: "profil, zasebna sporočila, zaznamki in nastavitve"
+        name_and_description: "%{name} - %{description}"
       title:
         title: "Naziv"
         none: "(brez)"
@@ -1454,7 +1541,6 @@ sl:
       close: "zapri"
       dismiss_error: "Opustite napako"
     close: "Zapri"
-    assets_changed_confirm: "Stran ji bala pravkar posodobljena. Osvežimo takoj za zadnjo verzijo?"
     logout: "Bili ste odjavljeni."
     refresh: "Osveži"
     home: "Domov"
@@ -1463,15 +1549,6 @@ sl:
       login_disabled: "Prijava je onemogočena dokler je stran v načinu za branje."
       logout_disabled: "Odjava je onemogočena dokler je stran v načinu za branje."
     learn_more: "izvedite več..."
-    all_time: "skupaj"
-    all_time_desc: "skupaj ustvarjenih tem"
-    year: "leto"
-    year_desc: "teme, ustvarjene v preteklih 365 dneh"
-    month: "mesec"
-    month_desc: "teme, ustvarjene v preteklih 30 dneh"
-    week: "teden"
-    week_desc: "teme, ustvarjene v preteklih 7 dneh"
-    day: "dan"
     first_post: Prvi prispevek
     mute: Utišano
     unmute: Povrni glasnost
@@ -1491,13 +1568,15 @@ sl:
       sign_up: "Registracija"
       hide_session: "Spomni me jutri"
       hide_forever: "ne, hvala"
-      hidden_for_session: "Hvala, ponovno vas vprašamo jutri. Vedno pa lahko uporabite gumb 'Prijava', da ustvarite nov račun."
       intro: "Pozdravljeni! Vidimo, da uživate v branju razprave, vendar se še niste registrirali kot uporabnik."
       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:
+        one: "Obstaja <b>%{count}</b> odgovor."
+        two: "Obstajata <b>%{count}</b> odgovora."
+        few: "Obstajajo <b>%{count}</b> odgovori."
+        other: "Obstaja <b>%{count}</b> odgovorov."
       enable: "Pripravi povzetek teme"
       disable: "Prikaži vse prispevke"
     deleted_filter:
@@ -1522,8 +1601,10 @@ sl:
     trust_level: "Nivo zaupanja"
     search_hint: "uporabniško ime, e-naslov ali IP naslov"
     create_account:
+      header_title: "Dobrodošli!"
+      subheader_title: "Ustvarimo vaš račun"
       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"
+      title: "Ustvari svoj račun"
       failed: "Nekaj je šlo narobe, morda je ta e-naslov že registriran, poskusite povezavo za pozabljeno geslo."
     forgot_password:
       title: "Zamenjava gesla"
@@ -1542,6 +1623,7 @@ sl:
     email_login:
       link_label: "Pošlji mi povezavo za prijavo na e-pošto"
       button_label: "z e-pošto"
+      login_link: "Preskoči geslo; pošljite mi povezavo za prijavo"
       emoji: "emoji za ključavnico"
       complete_username: "Če obstaja račun za uporabniško ime <b>%{username}</b> boste v kratkem prejeli e-sporočilo s povezavo za prijavo."
       complete_email: "Če obstaja račun z e-naslovom <b>%{email}</b> boste v kratkem prejeli e-sporočilo s povezavo za prijavo."
@@ -1553,7 +1635,7 @@ sl:
       logging_in_as: Prijava kot %{email}
       confirm_button: Zaključi prijavo
     login:
-      title: "Prijava"
+      subheader_title: "Prijavite se v svoj račun"
       username: "Uporabnik"
       password: "Geslo"
       second_factor_title: "Preverjanje v dveh korakih"
@@ -1568,7 +1650,6 @@ sl:
       security_key_not_allowed_error: "Postopek preverjanja z varnostnim ključem je potekel ali pa je bil preklican."
       security_key_no_matching_credential_error: "V podanem varnostnem ključu ni bilo mogoče najti ustreznih poverilnic."
       security_key_support_missing_error: "Vaša trenutna naprava ali brskalnik ne podpira uporabe varnostnih ključev. Uporabite drug način."
-      email_placeholder: "e-naslov ali uporabniško ime"
       caps_lock_warning: "Caps Lock je vključen"
       error: "Neznana napaka"
       cookies_error: "Brskalnik ima izklopljene piškotke. Mogoče se ne boste uspeli prijaviti, dokler jih ne omogočite."
@@ -1653,6 +1734,8 @@ sl:
     conditional_loading_section:
       loading: Nalagam...
     select_kit:
+      filter_by: "Filtriraj po: %{name}"
+      select_to_filter: "Izberite vrednost za filtriranje"
       default_header_text: Izberi...
       no_content: Ni zadetkov
       filter_placeholder: Išči...
@@ -1671,8 +1754,6 @@ sl:
     date_time_picker:
       from: Od
       to: Do
-      errors:
-        to_before_from: "Datum Od mora biti starejši kot Do datum"
     emoji_picker:
       filter_placeholder: Išči emoji
       smileys_&_emotion: Smeški in emotikoni
@@ -1694,7 +1775,6 @@ sl:
       default: Emojiji po meri
     shared_drafts:
       title: "Skupni osnutki"
-      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?"
@@ -1705,7 +1785,6 @@ sl:
       options: "Možnosti"
       whisper: "šepet"
       unlist: "izločeno"
-      blockquote_text: "Citirano"
       add_warning: "To je uradno opozorilo."
       toggle_whisper: "Preklopi šepet"
       toggle_unlisted: "Preklopi izločeno"
@@ -1726,10 +1805,22 @@ sl:
       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:
+          one: "Naslov mora vsebovati vsaj %{count} znakov"
+          two: "Naslov mora vsebovati vsaj %{count} znaka"
+          few: "Naslov mora vsebovati vsaj %{count} znake"
+          other: "Naslov mora vsebovati vsaj %{count} znakov"
+        title_too_long:
+          one: "Naslov ne sme vsebovati več kot %{count} znak"
+          two: "Naslov ne sme vsebovati več kot %{count} znaka"
+          few: "Naslov ne sme vsebovati več kot %{count} znake"
+          other: "Naslov ne sme vsebovati več kot %{count} znakov"
         post_missing: "Prispevek ne more biti prazen"
-        post_length: "Prispevek mora vsebovati vsaj %{min} znakov"
+        post_length:
+          one: "Prispevek mora vsebovati vsaj %{count} znak"
+          two: "Prispevek mora vsebovati vsaj %{count} znaka"
+          few: "Prispevek mora vsebovati vsaj %{count} znake"
+          other: "Prispevek mora vsebovati vsaj %{count} znakov"
         try_like: "Ste že uporabili %{heart} gumb za všečkanje?"
         category_missing: "Izbrati morate kategorijo"
         tags_missing:
@@ -1764,8 +1855,6 @@ sl:
       saved: "Shranjeno!"
       saved_draft: "Osnutek objave je v teku. Tapnite za nadaljevanje."
       uploading: "Nalagam..."
-      show_preview: "prikaži predogled &raquo;"
-      hide_preview: "&laquo; skrij predogled"
       quote_post_title: "Citiraj cel prispevek"
       bold_label: "B"
       bold_title: "Krepko"
@@ -1778,8 +1867,8 @@ sl:
       link_dialog_title: "Vstavi povezavo"
       link_optional_text: "neobvezen naslov"
       link_url_placeholder: "Za iskanje po temah prilepite ali vpišite URL"
-      quote_title: "Citiraj"
-      quote_text: "Citirano"
+      blockquote_title: "Citirano"
+      blockquote_text: "Citirano"
       code_title: "Predoblikovano besedilo"
       code_text: "zamakni predoblikovano besedilo s 4 presledki"
       paste_code_text: "vpiši ali prilepi kodo"
@@ -1828,10 +1917,10 @@ sl:
           label: "Nova tema"
         shared_draft:
           label: "Skupen osnutek"
-          desc: "Ustvari osnutek teme, ki bo viden samo osebju"
         toggle_topic_bump:
           label: "Preklopi izpostavljanje teme"
           desc: "Odgovori brez da spremeniš čas zadnjega odgovora"
+      ignore: "Prezri"
     notifications:
       tooltip:
         regular:
@@ -1857,6 +1946,12 @@ sl:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} in %{count} drug</span> %{description}"
+        two: "<span class='multi-user'>%{username}, %{username2} in %{count} druga</span> %{description}"
+        few: "<span class='multi-user'>%{username}, %{username2} in %{count} drugi</span> %{description}"
+        other: "<span class='multi-user'>%{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"
@@ -1873,6 +1968,8 @@ sl:
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Nova tema</span> %{description}"
       membership_request_accepted: "Sprejeti v članstvo v '%{group_name}'"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       group_message_summary:
         one: "%{count} sporočilo v%{group_name} predalu"
         two: "%{count} sporočili v %{group_name} predalu"
@@ -1916,9 +2013,7 @@ 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}"
       local_tip: "izberite slike iz vaše naprave"
-      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"
@@ -1951,6 +2046,7 @@ sl:
       or_search_google: "Ali poskusite iskati z Googlom:"
       search_google: "Poskusite iskati z Googlom:"
       search_google_button: "Google"
+      search_button: "Išči"
       context:
         user: "Išči prispevke od @%{username}"
         category: "Išči po #%{category} kategoriji"
@@ -2014,7 +2110,6 @@ sl:
     go_back: "pojdi nazaj"
     not_logged_in_user: "stran uporabnika s povzetkom trenutnih aktivnosti in nastavitev"
     current_user: "pojdi na svojo uporabniško stran"
-    view_all: "prikaži vse"
     topics:
       new_messages_marker: "zadnji obisk"
       bulk:
@@ -2035,7 +2130,9 @@ sl:
         change_category: "Določi kategorijo"
         close_topics: "Zapri teme"
         archive_topics: "Arhiviraj teme"
+        move_messages_to_inbox: "Prestavi v Prejeto"
         notification_level: "Obvestila"
+        change_notification_level: "Spremeni raven obveščanja"
         choose_new_category: "Izberi novo kategorijo za temo:"
         selected:
           one: "Izbrali ste <b>%{count}</b> temo."
@@ -2047,7 +2144,6 @@ sl:
         choose_new_tags: "Izberite nove oznake za te teme:"
         choose_append_tags: "Izberite nove oznake da se dodajo na te teme:"
         changed_tags: "Oznake na teh temah so bile spremenjene."
-        remove_tags: "Odstrani oznake"
         progress:
           one: "Napredek: <strong>%{count}</strong> tema"
           two: "Napredek: <strong>%{count}</strong> temi"
@@ -2063,8 +2159,6 @@ sl:
         bookmarks: "Nimate tem z zaznamki."
         category: "Ni tem v kategoriji %{category} ."
         top: "Ni najboljših tem."
-        educate:
-          unread: '<p>Tu se prikažejo vaše neprebrane teme.</p><p>Privzeto se teme prikažejo kot neprebrane s prikazom števila <span class="badge new-posts badge-notification">1</span> če ste:</p><ul><li>Ustvarili temo</li><li>Odgovorili na temo</li><li>Brali temo več kot 4 minute</li></ul><p>Izrecno nastavili temo kot "Opazujem" ali "Sledim" preko nastavitev obveščanja na dnu teme.</p><p>Pojdite na <a href="%{userPrefsUrl}">nastavitve</a> če želite spremembo.</p>'
       bottom:
         latest: "Ni več najnovejših tem."
         posted: "Ni več objavljenih tem."
@@ -2155,7 +2249,6 @@ sl:
       read_more_in_category: "Brskaj po ostalih temah v %{catLink} ali %{latestLink}."
       read_more: "Brskaj po ostalih temah %{catLink} ali %{latestLink}."
       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 {}}"
       bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Brskajte po vseh kategorijah
       browse_all_tags: Brskanje po vseh oznakah
@@ -2169,19 +2262,23 @@ sl:
         select: "Uporabniki lahko v tej temi objavijo samo enkrat na:"
         description: "Za spodbujanje premišljene razprave v hitrih in burnih razpravah morajo uporabniki počakati, preden lahko ponovno objavijo v tej temi."
         save: "Omogoči"
+        enabled_until: "Omogočeno do:"
         remove: "Onemogoči"
         hours: "Ure:"
         minutes: "Minute:"
         seconds: "Sekunde:"
         durations:
+          10_minutes: "10 minut"
           15_minutes: "15 minut"
+          30_minutes: "30 Minut"
+          45_minutes: "45 minut"
           1_hour: "1 ura"
+          2_hours: "2 Uri"
           4_hours: "4 ure"
-          1_day: "1 dan"
-          1_week: "1 teden"
+          8_hours: "8 ure"
+          12_hours: "12 ure"
+          24_hours: "24 ure"
           custom: "Trajanje po meri"
-      slow_mode_notice:
-        duration: "Med objavami v tej temi morate počakati %{duration}"
       topic_status_update:
         title: "Opomnik teme"
         save: "Nastavi opomnik"
@@ -2190,7 +2287,9 @@ sl:
         remove: "Odstrani opomnik"
         publish_to: "Objavi v:"
         when: "Kdaj:"
-        time_frame_required: Izberite časovni okvir
+        time_frame_required: "Izberite časovni okvir"
+        min_duration: "Trajanje mora biti večje od 0"
+        max_duration: "Trajanje mora biti krajše od 20 let"
       auto_update_input:
         none: "Izberi časovni okvir"
         now: "Zdaj"
@@ -2199,13 +2298,7 @@ sl:
         later_this_week: "Kasneje v tednu"
         this_weekend: "Ta vikend"
         next_week: "Naslednji teden"
-        two_weeks: "Dva tedna"
         next_month: "Naslednji mesec"
-        two_months: "Dveh mesecih"
-        three_months: "Tri mesece"
-        four_months: "Štirih mesecih"
-        six_months: "Šest mesecev"
-        one_year: "Eno leto"
         forever: "Za vedno"
         pick_date_and_time: "Izberi datum in čas"
         set_based_on_last_post: "Kloniraj na podlagi zadnjega prispevka"
@@ -2219,9 +2312,10 @@ sl:
         title: "Začasno zapri"
       auto_close:
         title: "Samodejno zapri temo"
-        label: "Samodejno zapri temo ob:"
         error: "Vnesite veljavno vsebino"
         based_on_last_post: "Ne zapri dokler zadnji prispevek v temi ni vsaj star."
+      auto_close_after_last_post:
+        title: "Samodejno zapri temo po zadnji objavi"
       auto_delete:
         title: "Samodejno izbriši temo"
       auto_bump:
@@ -2234,7 +2328,7 @@ sl:
         auto_open: "Ta tema se bo samodejno odprla %{timeLeft}."
         auto_close: "Ta tema se bo samodejno zaprla %{timeLeft}."
         auto_publish_to_category: "Ta tema bo objavljena v <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Ta tema se bo zaklenila %{duration} po zadnjem odgovoru."
+        auto_close_after_last_post: "Ta tema se bo zaprla %{duration} po zadnjem odgovoru."
         auto_delete: "Ta tema se bo sama izbrisala čez %{timeLeft}."
         auto_bump: "Ta tema se bo sama izpostavila %{timeLeft}."
         auto_reminder: "Opomnili vas bomo o tej temi %{timeLeft}."
@@ -2256,7 +2350,11 @@ sl:
         go: "pojdi"
         jump_bottom: "skoči na zadnji prispevek"
         jump_prompt: "skoči na..."
-        jump_prompt_of: "od %{count} prispevkov"
+        jump_prompt_of:
+          one: "od %{count} prispevka"
+          two: "od %{count} prispevkov"
+          few: "od %{count} prispevkov"
+          other: "od %{count} prispevkov"
         jump_prompt_long: "Skoči na..."
         jump_bottom_with_number: "skoči na prispevek %{post_number}"
         jump_prompt_to_date: "na datum"
@@ -2341,6 +2439,7 @@ sl:
         title: "Deli"
         extended_title: "Deli povezavo"
         help: "deli povezavo do te teme"
+        invite_users: "Povabi"
       print:
         title: "Natisni"
         help: "Odpri tiskalniku prilagojeno verzijo te teme"
@@ -2402,14 +2501,13 @@ sl:
         username_placeholder: "uporabniško ime"
         action: "Pošlji povabilo"
         help: "povabi ostale v to temo preko e-sporočila ali obvestil"
-        to_forum: "Poslali bomo kratko e-sporočilo s povezavo preko katere se bo vaš prijatelj lahko prijavil."
-        sso_enabled: "Vnesite uporabniško ime osebe, ki bi jo povabili v to temo."
+        discourse_connect_enabled: "Vnesite uporabniško ime osebe, ki bi jo radi povabili v to temo."
         to_topic_blank: "Vnesite uporabniško ime ali e-naslov osebe, ki bi ga radi povabili v to temo."
         to_topic_email: "Vnesli ste e-naslov. Poslali bomo vabilo preko e-sporočila, ki bo vašemu prijatelju omogočila, da bo neposredno odgovoril v temo."
         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>%{invitee}</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."
@@ -2524,11 +2622,10 @@ sl:
         other: "(tema umaknjena s strani avtorja bo samodejno izbrisana v %{count} urah - razen če je prijavljena moderatorju)"
     post:
       quote_reply: "Citiraj"
+      quote_share: "Deli"
       edit_reason: "Razlog: "
       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}:"
@@ -2557,6 +2654,7 @@ sl:
         two: "%{count} odgovora"
         few: "%{count} odgovore"
         other: "%{count} odgovorov"
+      has_replies_count: "%{count}"
       has_likes_title:
         one: "%{count} uporabniku je prispevek všeč"
         two: "%{count} uporabnikoma je prispevek všeč"
@@ -2568,6 +2666,12 @@ sl:
         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č"
+      filtered_replies_hint:
+        one: "Oglejte si to objavo in njen odgovor"
+        two: "Oglejte si to objavo in njena %{count} odgovora"
+        few: "Oglejte si to objavo in njene %{count} odgovore"
+        other: "Oglejte si to objavo in njenih %{count} odgovorov"
+      view_all_posts: "Ogled vseh objav"
       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."
@@ -2578,14 +2682,11 @@ sl:
         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."
-      abandon_edit:
-        no_value: "Ne, obdrži"
-        no_save_draft: "Ne, shranite osnutek"
-      abandon:
-        confirm: "Ali ste prepričani, da hočete zavreči vaš prispevek?"
-        no_value: "Ne, ohrani"
-        no_save_draft: "Ne, shranite osnutek"
-        yes_value: "Da, opusti"
+      cancel_composer:
+        confirm: "Kaj bi radi naredili z vašim prispevkom?"
+        discard: "Zavrzi"
+        save_draft: "Shrani osnutek"
+        keep_editing: "Nadaljuj z urejanjem"
       via_email: "ta prispevek je prispel preko e-sporočila"
       via_auto_generated_email: "ta prispevek je prispel preko samodejno ustvarjenega e-sporočila"
       whisper: "ta prispevek je zasebno šepetanje med moderatorji"
@@ -2627,6 +2728,7 @@ sl:
         convert_to_moderator: "Dodaj barvo osebja"
         revert_to_regular: "Odstrani barvo osebja"
         rebake: "Obnovi HTML"
+        publish_page: "Objavljanje strani"
         unhide: "Ponovni prikaži"
         change_owner: "Spremeni lastnika"
         grant_badge: "Podeli značko"
@@ -2636,13 +2738,24 @@ sl:
         unlock_post_description: "omogoči avtorju da ureja prispevek"
         delete_topic_disallowed_modal: "Nimate pravic da izbrišete to temo. Če jo bi res radi izbrisali, jo prijavite osebju skupaj z razlogi."
         delete_topic_disallowed: "nimate pravic za brisanje te teme"
+        delete_topic_confirm_modal:
+          one: "Ta tema ima trenutno več kot %{count} ogled in je morda priljubljena tarča iskanja. Ali ste prepričani, da želite to temo v celoti izbrisati, namesto da bi jo z urejanjem poskusili izboljšati?"
+          two: "Ta tema ima trenutno več kot %{count} ogleda in je morda priljubljena tarča iskanja. Ali ste prepričani, da želite to temo v celoti izbrisati, namesto da bi jo z urejanjem poskusili izboljšati?"
+          few: "Ta tema ima trenutno več kot %{count} oglede in je morda priljubljena tarča iskanja. Ali ste prepričani, da želite to temo v celoti izbrisati, namesto da bi jo z urejanjem poskusili izboljšati?"
+          other: "Ta tema ima trenutno več kot %{count} ogledov in je morda priljubljena tarča iskanja. Ali ste prepričani, da želite to temo v celoti izbrisati, namesto da bi jo z urejanjem poskusili izboljšati?"
         delete_topic: "izbriši temo"
         add_post_notice: "Dodaj obvestilo osebja"
         change_post_notice: "Spremeni obvestilo osebja"
         delete_post_notice: "Odstrani obvestilo osebja"
         remove_timer: "odstrani opomnik"
+        edit_timer: "uredi časovnik"
       actions:
         people:
+          like:
+            one: "je všeč"
+            two: "je všeč"
+            few: "je všeč"
+            other: "je všeč"
           like_capped:
             one: "in %{count} drugemu uporabniku je prispevek všeč"
             two: "in %{count} drugima uporabnikoma je prispevek všeč"
@@ -2701,6 +2814,12 @@ sl:
       bookmarks:
         created: "Ustvarjeno"
         name: "Polno ime"
+      filtered_replies:
+        viewing_posts_by: "Ogled %{post_count} objav avtorja"
+        viewing_subset: "Nekateri odgovori so strnjeni"
+        viewing_summary: "Ogled povzetka te teme"
+        post_number: "%{username}, objava #%{post_number}"
+        show_all: "Pokaži vse"
     category:
       can: "lahko&hellip; "
       none: "(brez kategorije)"
@@ -2744,6 +2863,17 @@ sl:
       change_in_category_topic: "Uredi opis"
       already_used: "Ta barva je že uporabljena na drugi kategoriji."
       security: "Varnost"
+      security_add_group: "Dodaj skupino"
+      permissions:
+        group: "Skupina"
+        see: "Glej"
+        reply: "Odgovori"
+        create: "Ustvari"
+        no_groups_selected: "Dostop ni bil odobren nobeni skupini; ta kategorija bo vidna samo osebju."
+        everyone_has_access: 'Ta kategorija je javna, vsi lahko vidijo, odgovarjajo in ustvarjajo objave. Če želite omejiti dovoljenja, odstranite eno ali več dovoljenj, dodeljenih skupini »vsi«.'
+        toggle_reply: "Preklopi dovoljenje za odgovor"
+        toggle_full: "Preklopi dovoljenje za ustvarjanje"
+        inherited: 'To dovoljenje je podedovano od "vsi"'
       special_warning: "Ta kategorija je prednastavljena, zato varnostnih nastavitev ni mogoče urejati. Če ne želite uporabljati te kategorije jo raje izbrišite kot uporabljajte v drug namen."
       uncategorized_security_warning: "Ta kategorija je posebna. Namenjena je za shranjevanje tem, ki nimajo kategorije. Zato ne more imeti varnostnih nastavitev."
       uncategorized_general_warning: 'Ta kategorija je posebna. Uporabi se kot privzeta kategorija za teme brez kategorije. Če hočete onemogočiti takšen način in hočete obvezno izbiro kategorije, <a href="%{settingLink}">potem onemogočite nastavitev tukaj</a>. Če hočete spremeniti ime ali opis, pojdite <a href="%{customizeLink}">Prilagodi / Vsebina besedila</a>.'
@@ -2779,19 +2909,16 @@ sl:
       notifications:
         watching:
           title: "Opazujem"
-          description: "Samodejno boste opazovali vse teme v tej kategoriji. Obveščeni boste za vsak nov prispevek v vsaki temi. Ob temi bo prikazano število novih odgovorov."
         watching_first_post:
           title: "Opazujem prvi prispevek"
           description: "Obveščeni boste o novih temah v tej kategoriji, ne pa tudi o odgovorih v temi."
         tracking:
           title: "Sledim"
-          description: "Samodejno boste sledili vsem temam v tej kategoriji. Obveščeni boste, če nekdo omeni vaše @ime ali vam odgovori. Ob temi bo prikazano število novih odgovorov."
         regular:
           title: "Običajno"
           description: "Obveščeni boste, če nekdo omeni vaše @ime ali vam odgovori."
         muted:
           title: "Utišano"
-          description: "O novih temah v tej kategoriji ne boste obveščeni in ne bodo se pojavile med najnovejšimi."
       search_priority:
         label: "Pomembnost v iskalniku"
         options:
@@ -2823,16 +2950,21 @@ sl:
         moderation: "Moderiranje"
         appearance: "Videz"
         email: "E-sporočila"
+      colors_disabled: "Barv ne morete izbrati, ker slog kategorije ni izbran."
     flagging:
       title: "Hvala, da pomagate ohraniti prijazno skupnost!"
       action: "Prijavi prispevek"
       take_action_options:
+        default:
+          title: "Ukrepaj"
+          details: "Doseži zahtevan nivo prijav takoj in ne čakaj na več prijav s strani uporabnikov"
+        suspend:
+          title: "Suspendiraj uporabnika"
         silence:
           title: "Utišaj uporabnika"
       notify_action: "Opozorilo"
       official_warning: "Uradno opozorilo"
       delete_spammer: "Izbriši spamerja"
-      delete_confirm_MF: "Izbrisali boste {POSTS, plural, one {<b>1</b> prispevek} two {<b>2</b> prispevka} other {<b>#</b> prispevkov}} in {TOPICS, plural, one {<b>1</b> temo} two {<b>2</b> temi} other {<b>#</b> tem}} od tega uporabnika, odstranili njegov račun, blokirali prijave iz njegovih IP naslovov <b>{ip_address}</b> in dodali njegov e-naslov <b>{email}</b> na trajen seznam blokiranih. Ali ste prepričani da je ta uporabnik res spamer?"
       yes_delete_spammer: "Da, izbriši spamerja"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(skrito)"
@@ -2909,12 +3041,6 @@ sl:
         title: "Ta tema je zasebno sporočilo"
         help: "Ta tema je zasebno sporočilo"
     posts: "Prispevki"
-    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}
-        med {z zelo visokim razmerjem med všečki in prispevki}
-        high {z skrajno visokim razmerjem med všečki in prispevki}
-        other {}}
     original_post: "Izvirni prispevek"
     views: "Ogledi"
     views_lowercase:
@@ -2942,7 +3068,6 @@ sl:
       few: "uporabniki"
       other: "uporabnikov"
     category_title: "Kategorija"
-    history: "Zgodovina"
     changed_by: "od %{author}"
     raw_email:
       title: "Dohodno e-sporočilo"
@@ -3232,6 +3357,7 @@ sl:
         few: "%{tags} in %{count} druge"
         other: "%{tags} in %{count} drugih"
       delete_no_unused_tags: "Ni neuporabljenih oznak."
+      tag_list_joiner: ", "
       delete_unused: "Izbriši neuporabljene oznake"
       delete_unused_description: "Izbriši vse oznake, ki se ne uporabljajo na nobeni temi ali zasebnem sporočilu"
       cancel_delete_unused: "Prekliči"
@@ -3284,10 +3410,10 @@ sl:
     invite:
       custom_message: "Naredite vaše povabilo bolj osebno tako da napišete <a href>osebno sporočilo</a>."
       custom_message_placeholder: "Vnesi sporočilo po meri"
-      approval_not_required: "Uporabnik bo samodejno odobren takoj, ko bo sprejel to povabilo."
       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."
+    forced_anonymous_login_required: "Spletno mesto je izjemno obremenjeno in ga trenutno ni mogoče naložiti, poskusite znova čez nekaj minut."
     footer_nav:
       back: "Nazaj"
       forward: "Naprej"
@@ -3296,6 +3422,17 @@ sl:
     safe_mode:
       enabled: "Varni način je vklopljen, za izklop varnega načina zaprite okno brskalnika."
     image_removed: "(slika odstranjena)"
+    do_not_disturb:
+      title: "Ne moti za ..."
+      label: "Ne moti"
+      remaining: "%{remaining} preostalo"
+      options:
+        half_hour: "30 minut"
+        one_hour: "1 ura"
+        two_hours: "2 uri"
+        tomorrow: "Do jutri"
+        custom: "Po meri"
+      set_schedule: "Nastavi razpored obveščanja"
   admin_js:
     type_to_filter: "vnesite za filter..."
     admin:
@@ -3323,6 +3460,10 @@ sl:
         installed_version: "Nameščeno"
         latest_version: "Najnovejše"
         problems_found: "Nekaj priporočil glede na vaše trenutne nastavitve strani"
+        new_features:
+          title: "\U0001F381 Nove funkcije"
+          dismiss: "Opusti"
+          learn_more: "Več o tem"
         last_checked: "Nazadnje preverjeno"
         refresh_problems: "Osveži"
         no_problems: "Nismo našli problemov."
@@ -3407,8 +3548,6 @@ sl:
             available: "Ime skupine je na voljo"
             not_available: "Ime skupine ni na voljo"
             blank: "Ime skupine ne more biti prazno"
-        bulk_add:
-          title: "Množično dodajanje v skupino"
         add_members:
           as_owner: "Dodaj uporabnika(-e) in skrbnika(-e) za to skupino"
         manage:
@@ -3425,6 +3564,11 @@ 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_user_count:
+              one: "%{count} uporabnik vsebuje eno od novih e-poštnih domen in bo dodan v skupino."
+              two: "%{count} uporabnika vsebujeta eno od novih e-poštnih domen in bosta dodana v skupino."
+              few: "%{count} uporabniki vsebujejo eno od novih e-poštnih domen in bodo dodani v skupino."
+              other: "%{count} uporabnikov vsebuje eno od novih e-poštnih domen in bodo dodani v skupino."
             primary_group: "Samodejno nastavi za primarno skupino"
         name_placeholder: "Ime skupine, brez presledkov, enaka pravila kot za uporabniško ime"
         primary: "Primarna skupina"
@@ -3436,6 +3580,11 @@ sl:
         group_members: "Člani skupine"
         delete: "Izbriši"
         delete_confirm: "Izbriši skupino?"
+        delete_with_messages_confirm:
+          one: "Če izbrišete to skupino, bo %{count} \nsporočilo osirotelo in člani skupine ne bodo več imeli dostopa do njega.<br><br>Ali ste prepričani?"
+          two: "Če izbrišete to skupino, bosta %{count} \nsporočili osiroteli in člani skupine ne bodo več imeli dostopa do njiju.<br><br>Ali ste prepričani?"
+          few: "Če izbrišete to skupino, bodo %{count} \nsporočila osirotela in člani skupine ne bodo več imeli dostopa do njih.<br><br>Ali ste prepričani?"
+          other: "Če izbrišete to skupino, bo %{count} \nsporočil osirotelo in člani skupine ne bodo več imeli dostopa do njih.<br><br>Ali ste prepričani?"
         delete_owner_confirm: "Odstrani vlogo skrbnika uporabniku '%{username}'?"
         add: "Dodaj"
         custom: "Po meri"
@@ -3462,13 +3611,13 @@ sl:
         continue: Nadaljuj
         use_global_key: Globalni ključ (omogoča vsa dejanja)
         scopes:
+          action: Dejanje
           descriptions:
             topics:
               write: Ustvarite novo temo ali objavite v obstoječi.
               read_lists: Preberite sezname tem, kot so najboljše, nove, najnovejše, itd. Podpira tudi RSS.
               wordpress: Potrebno za delovanje vtičnika wp-discourse za WordPress.
             users:
-              sync_sso: Sinhronizirajte uporabnika z uporabo SSO.
               show: Pridobi informacije o uporabniku.
       web_hooks:
         create: "Ustvari"
@@ -3577,22 +3726,30 @@ sl:
           mobile: "Mobilno"
           settings: "Nastavitve"
           preview: "Predogled"
+          show_advanced: "Pokaži napredna polja"
           auto_update: "Samodejno posodobi ob posodobitvi Discourse"
+          convert_component_alert_generic: "Ali ste prepričani, da želite pretvoriti to komponento v temo?"
+          convert_theme_alert_generic: "Ali ste prepričani, da želite pretvoriti to temo v komponento?"
           collapse: Skrči
           uploads: "Prenosi"
           upload: "Prenesi"
           unsaved_changes_alert: "Niste shranili sprememb - ali jih želite zavreči in nadaljevati?"
+          discard: "Zavrzi"
           css_html: "CSS/HTML po meri"
           edit_css_html: "Uredi CSS/HTML"
           edit_css_html_help: "Niste uredili še nobenega CSS ali HTML."
+          direct_install_tip: "Ali ste prepričani, da želite namestiti <strong>%{name}</strong> iz spodaj navedenega skladišča?"
           installed: "Nameščeno"
           install_popular: "Zanimivo"
+          duplicate_remote_theme: "Komponenta teme »%{name}« je že nameščena. Ali ste prepričani, da želite namestiti dodatno kopijo?"
           about_theme: "O nas"
           license: "Licenca"
+          version: "Verzija:"
           enable: "Omogoči"
           disable: "Onemogoči"
           updating: "Posodabljam..."
           add: "Dodaj"
+          remote_theme_edits: "Če želite urediti to temo, morate <a href='%{repoURL}' target='_blank'>predlagati spremembo v njenem repozitoriju</a>"
           scss:
             text: "CSS"
           header:
@@ -3607,6 +3764,9 @@ sl:
           title: "Barve"
           copy_name_prefix: "Kopija od"
           undo: "razveljavi"
+          revert: "povrni"
+          primary:
+            name: "primarni"
           highlight:
             name: "izpostavljeno"
           danger:
@@ -3627,7 +3787,10 @@ sl:
         sent_at: "Poslano"
         time: "Čas"
         user: "Uporabnik"
+        sent_test: "poslano!"
         refresh: "Osveži"
+        sending_email: "Pošiljanje e-sporočila..."
+        text: "besedilo"
         incoming_emails:
           from_address: "Od"
           to_addresses: "Za"
@@ -3729,6 +3892,7 @@ sl:
             change_badge: "spremeni značko"
             delete_badge: "izbriši značko"
             entity_export: "izvoz entitete"
+            delete_group: "izbriši skupino"
         screened_emails:
           title: "Nadzorovani e-naslovi"
           description: "Nadzorovani e-naslovi se bodo preverili ob vsaki novi registraciji uporabniškega računa - vsak poskus bo blokiran ali bo izvedena druga akcija."
@@ -3765,28 +3929,29 @@ sl:
         title: "Nadzorovane besede"
         search: "išči"
         clear_filter: "Počisti"
-        show_words: "pokaži besede"
+        show_words:
+          one: "pokaži %{count} besedo"
+          two: "pokaži %{count} besedi"
+          few: "pokaži %{count} besede"
+          other: "pokaži %{count} besed"
         download: Naloži
         clear_all: Počisti vse
-        word_count:
-          one: "%{count} beseda"
-          two: "%{count} besedi"
-          few: "%{count} besede"
-          other: "%{count} besed"
         actions:
           block: "Blokiraj"
           censor: "Cenzuriraj"
           require_approval: "Zahtevaj odobritev"
           flag: "Prijavi"
+          replace: "Zamenjaj"
         action_descriptions:
           block: "Onemogoči objavo prispevkov, ki vsebujejo te besede. Uporabnik bo dobil sporočilo o napaki, ko bo hotel objaviti prispevek."
           censor: "Dovoli prispevke s temi besedami, ampak jih zamenjaj z znaki, ki skrijejo cenzurirane besede."
           require_approval: "Prispevki, ki vsebujejo te besede bodo zahtevali potrditev s strani osebja preden jih lahko kdo vidi."
           flag: "Dovoli prispevke, ki vsebujejo te besede, vendar jih prijavi kot neprimerne, tako da jih lahko moderatorji preverijo."
+          replace: "Besede v objavah zamenjajte z drugimi besedami ali povezavami"
         form:
-          label: "Nova beseda:"
-          placeholder: "cela beseda ali * kot nadomestni znak"
           placeholder_regexp: "Regularni izraz"
+          replacement_label: "Zamenjava"
+          replacement_placeholder: "primer ali https://primer.si"
           add: "Dodaj"
           success: "Uspeh"
         test:
@@ -3825,6 +3990,9 @@ sl:
           staged: "Prirejeni uporabniki"
         check_email:
           text: "Prikaži"
+        check_sso:
+          title: "Razkrij izmenjano vsebino SSO"
+          text: "Prikaži"
       user:
         suspend_failed: "Nekaj je šlo narobe pri suspendiranju uporabnika %{error}"
         unsuspend_failed: "Nekaj je šlo narobe pri preklicu suspenza %{error}"
@@ -3858,7 +4026,6 @@ sl:
         penalty_post_none: "Ne naredi nič"
         clear_penalty_history:
           title: "Izbriši zgodovino kazni"
-        delete_all_posts_confirm_MF: "Izbrisali boste {POSTS, plural, one {1 prispevek} two {2 prispevka} other {# prispevkov}} in {TOPICS, plural, one {1 temo} two {2 temi} other {# tem}}. Ali ste prepričani?"
         silence: "Utišaj"
         unsilence: "Ukini utišanje uporabnika"
         silenced: "Utišan?"
@@ -3902,9 +4069,14 @@ 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"
+        delete_posts:
+          progress:
+            title: "Napredek pri brisanju objav"
         merge:
           prompt:
             cancel: "Prekliči"
+          progress:
+            title: "Napredek pri spajanju uporabnikov"
           confirmation:
             cancel: "Prekliči"
         delete_forbidden_because_staff: "Administratorjev in moderatorjev se ne da izbrisati."
@@ -3969,11 +4141,15 @@ sl:
           on_grace_period: "Trenutno v času mirovanja promocije, ne bo ponižan."
           locked_will_not_be_promoted: "Nivo zaupanja zaklenjen. Ne bo nikoli povišan."
           locked_will_not_be_demoted: "Nivo zaupanja zaklenjen. Ne bo nikoli znižan."
-        sso:
+        discourse_connect:
+          title: "DiscourseConnect Single Sign On"
+          external_id: "Zunanji ID"
           external_username: "Uporabniško ime"
           external_name: "Ime"
           external_email: "E-naslov"
-          external_avatar_url: "URL do profilne slike"
+          external_avatar_url: "URL slike profila"
+          delete_sso_record: "Izbriši zapis SSO"
+          confirm_delete: "Ali ste prepričani, da želite izbrisati ta zapis DiscourseConnect?"
       user_fields:
         title: "Podatki uporabnika"
         create: "Dodaj podatek uporabnika"
@@ -4015,10 +4191,13 @@ sl:
         revert_confirm: "Ste prepričani, da želite preklicati spremembe?"
         go_back: "Nazaj na iskalnik"
         show_overriden: "Prikaži samo preglašene/spremenjene"
+        locale: "Jezik:"
+        fallback_locale_warning: "Urejate jezik ki temelji na %{fallback}. Uporabniki, ki za jezik vmesnika izberejo %{fallback} ne bodo videli sprememb."
         more_than_50_results: "Našli smo več kot 50 zadetkov. Določite bolj natančno iskalne kriterije."
       settings:
         show_overriden: "Prikaži samo preglašene/spremenjene"
         history: "Ogled zgodovine sprememb"
+        reset: "ponastavi"
         none: "brez"
       site_settings:
         title: "Nastavitve"
@@ -4094,7 +4273,7 @@ sl:
         enabled: Omogoči značko
         icon: Ikona
         image: Slika
-        image_help: "Vnesi URL do slike (ima prednost pred ikono)"
+        read_only_setting_help: "Prilagodite besedilo"
         query: poizvedba (SQL) značke
         show_posts: Prikaži prispevek za značko na strani z značkami
         trigger: Sproži
@@ -4117,6 +4296,7 @@ sl:
             other: "<b>%{count}</b> značk za podelitev."
           sample: "Primer:"
           grant:
+            with: <span class="username">%{username}</span>
             with_post: <span class="username">%{username}</span> za prispevek v %{link}
             with_post_time: <span class="username">%{username}</span> za prispevek v %{link} ob <span class="time">%{time}</span>
             with_time: <span class="username">%{username}</span> ob <span class="time">%{time}</span>
@@ -4156,6 +4336,7 @@ sl:
         modal:
           categories: "Kategorije"
           topics: "Tem"
+          replace: "Zamenjaj"
   wizard_js:
     wizard:
       done: "Končano"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 70189dfab0..405f75b48a 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -46,6 +46,9 @@ sq:
         x_seconds:
           one: "%{count}s"
           other: "%{count}s"
+        less_than_x_minutes:
+          one: "< %{count}m"
+          other: "< %{count}m"
         x_minutes:
           one: "%{count}m"
           other: "%{count}m"
@@ -55,6 +58,9 @@ sq:
         x_days:
           one: "%{count}d"
           other: "%{count}d"
+        x_months:
+          one: "%{count}muaj"
+          other: "%{count}muaj"
         about_x_years:
           one: "%{count}v"
           other: "%{count}v"
@@ -87,6 +93,9 @@ sq:
         x_days:
           one: "%{count} ditë më parë"
           other: "%{count} ditë më parë"
+        x_months:
+          one: "%{count} muaj më parë"
+          other: "%{count} muaj më parë"
       later:
         x_days:
           one: "%{count} ditë më vonë"
@@ -130,6 +139,8 @@ sq:
         disabled: "çlistuar %{when}"
     wizard_required: "Mirseerdhët tek faqja juaj e re Discourse! Le t'ia nisim me <a href='%{url}' data-auto-route='true'>\"setup wizard\"</a> ✨"
     emails_are_disabled: "Emailat janë çaktivizuar globalisht nga administratori i faqes. Asnjë njoftim me email nuk do të dërgohet. "
+    software_update_prompt:
+      dismiss: "Hiqe"
     themes:
       default_description: "Paracaktuar"
     s3:
@@ -176,6 +187,9 @@ sq:
     now: "tani"
     read_more: "lexo më shumë"
     more: "Më shumë"
+    x_more:
+      one: "Edhe %{count}"
+      other: "Edhe %{count}"
     less: "Më pak"
     never: "asnjëherë"
     every_30_minutes: "çdo 30 minuta"
@@ -213,14 +227,14 @@ 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:
+      not_bookmarked: "shto postimin tek të preferuarat"
       remove: "Hiqeni nga të prefereruarat"
       save: "Ruaj"
+      auto_delete_preference:
+        never: "Asnjëherë"
       search: "Kërko"
     drafts:
       remove: "Hiq"
-      abandon:
-        yes_value: "Po, braktise"
-        no_value: "Jo, mbaji"
     preview: "shiko"
     cancel: "anulo"
     save: "Ruaj ndryshimet"
@@ -247,6 +261,7 @@ sq:
         total: "Total"
       delete: "Fshij"
       settings:
+        saved: "U ruajtën"
         save_changes: "Ruaj ndryshimet"
         title: "Rregullimet"
       topic: "Tema:"
@@ -255,8 +270,16 @@ sq:
         username: "Emri i përdoruesit"
         email: "Email"
         name: "Emri"
+        reject_reason: "Arsye"
       topics:
         topic: "Topic"
+        details: "detaje"
+        unique_users:
+          one: "%{count} anëtar"
+          other: "%{count} anëtarë"
+      replies:
+        one: "%{count} përgjigje"
+        other: "%{count} përgjigje"
       edit: "Redakto"
       save: "Ruaj"
       cancel: "Anulo"
@@ -270,15 +293,24 @@ sq:
       statuses:
         pending:
           title: "Në pritje"
+        approved:
+          title: "Aprovuar më"
         rejected:
           title: "Rejected"
       types:
         reviewable_user:
           title: "User"
+        reviewable_post:
+          title: "Postim"
       approval:
         title: "Postimi ka nevojë për aprovim"
         description: "Postimi juaj u morr, por duhet të aprovohet nga një moderator para se të shfaqet në faqe. Kini pak durim. "
         ok: "OK"
+      example_username: "username"
+    relative_time_picker:
+      days:
+        one: "ditë"
+        other: "ditë"
     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>"
@@ -294,6 +326,7 @@ sq:
       sent_by_user: "Dërguar nga <a href='%{userUrl}'>%{user}</a>"
       sent_by_you: "Dërguar nga <a href='%{userUrl}'>ju</a>"
     directory:
+      username: "Emri i përdoruesit"
       filter_name: "filtro sipas emrit të anëtarit"
       title: "Anëtarët"
       likes_given: "Dhënë"
@@ -337,6 +370,12 @@ sq:
           credentials:
             username: "Emri i përdoruesit"
             password: "Fjalëkalimi"
+          settings:
+            title: "Rregullimet"
+        categories:
+          title: Kategoritë
+        tags:
+          title: Etiketat
         logs:
           title: "Logs"
           when: "Kur"
@@ -347,6 +386,8 @@ sq:
           details: "Detaje"
           from: "Nga"
           to: "Për"
+      permissions:
+        title: "Të drejtat"
       public_admission: "Lejo që përdoruesit të bashkohen lirisht ne grupin (Kërkon grupin e dukshëm publik)"
       public_exit: "Lejo përdoruesit të largohen nga grupi lirshëm"
       empty:
@@ -365,6 +406,9 @@ sq:
         automatic_group: Grup automatik
         my_groups: "Grupet e mia"
         is_group_user: "Anëtar"
+      title:
+        one: "Grupi"
+        other: "Grupet"
       activity: "Aktiviteti"
       members:
         title: "Anëtarë"
@@ -425,12 +469,14 @@ sq:
       posts: "Postime"
       topics: "Tema"
       latest: "Të fundit"
-      latest_by: "e fundit nga"
       toggle_ordering: "toggle ordering control"
       subcategories: "Nënkategori"
       topic_sentence:
         one: "%{count} temë"
         other: "%{count} tema"
+      topic_stat_unit:
+        week: "javë"
+        month: "muaj"
     ip_lookup:
       title: Shiko adresën IP
       hostname: Hostname
@@ -468,7 +514,11 @@ sq:
         ignore_duration_username: "Emri i përdoruesit"
         mute_option: "Pa njoftime"
         normal_option: "Normal"
+      notification_schedule:
+        none: "Asnjë"
+        to: "për"
       activity_stream: "Aktiviteti"
+      read: "Lexuar"
       preferences: "Preferencat"
       feature_topic_on_profile:
         save: "Ruaj"
@@ -488,11 +538,13 @@ sq:
         perm_denied_expl: "Ju nuk na dhatë të drejtën t'ju dërgojmë njoftime. Njoftimet mund t'i lejoni në rregullimet e shfletuesit tuaj. "
         disable: "Çaktivizoni njoftimet"
         enable: "Aktivizoni njoftimet"
-        each_browser_note: "Shënim: Duhet të ndryshoni këtë rregullim (setting) në çdo shfletues që përdorni. "
       dismiss: "Hiqe"
       dismiss_notifications: "Hiqini të gjitha"
       dismiss_notifications_tooltip: "Shëno njoftimet e palexuara si të lexuara"
       first_notification: "Njoftimi juaj i parë! Zgjidheni për të filluar. "
+      color_schemes:
+        undo: "Rivendos"
+        regular: "Normal"
       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"
@@ -523,6 +575,7 @@ sq:
       watched_first_post_tags: "Postimi i parë nën vëzhgim"
       watched_first_post_tags_instructions: "Ju do të njoftoheni vetëm për postimin e parë të çdo teme nën këto etiketa."
       muted_categories: "Pa njoftime"
+      regular_categories: "Normal"
       delete_account: "Fshi llogarinë time"
       delete_account_confirm: "Jeni i sigurtë që dëshironi ta mbyllni përgjithmonë llogarinë tuaj? Ky veprim nuk mund të zhbëhet!"
       deleted_yourself: "Llogaria juaj u fshi me sukses."
@@ -537,6 +590,7 @@ sq:
       undo_revoke_access: "Anullo heqjen e aksesit"
       api_approved: "Aprovuar më:"
       theme: "Tema"
+      staged: "Staged"
       staff_counters:
         flags_given: "sinjalizime të dobishme"
         flagged_posts: "postimet e sinjalizuara"
@@ -557,6 +611,7 @@ sq:
         tags: "Etiketat"
       preferences_nav:
         account: "Llogaria"
+        security: "Siguria"
         profile: "Profili"
         emails: "Emailat"
         notifications: "Njoftimet"
@@ -704,36 +759,33 @@ sq:
         after_5_minutes: "pas 5 minutash"
         after_10_minutes: "pas 10 minutash"
       invited:
-        search: "shkruaj për të kërkuar ftesat..."
         title: "Ftesat"
+        pending_tab: "Në pritje"
+        pending_tab_with_count: "Në pritje (%{count})"
+        redeemed_tab: "Shlyer"
+        redeemed_tab_with_count: "Shlyer (%{count})"
+        invited_via: "Ftesë"
+        groups: "Grupet"
+        topic: "Topic"
+        edit: "Redakto"
+        remove: "Hiq"
+        reinvited: "Ftesa u ri-dërgua"
+        search: "shkruaj për të kërkuar ftesat..."
         user: "Anëtari i ftuar"
         truncated:
           one: "Po afishohet ftesa e parë."
           other: "Po afishohen %{count} ftesat e para."
         redeemed: "Ftesa të Shlyera"
-        redeemed_tab: "Shlyer"
-        redeemed_tab_with_count: "Shlyer (%{count})"
         redeemed_at: "Shlyer"
         pending: "Ftesat në pritje"
-        pending_tab: "Në pritje"
-        pending_tab_with_count: "Në pritje (%{count})"
         topics_entered: "Temat e shikuara"
         posts_read_count: "Postimet e lexuara"
         expired: "Kjo ftesë ka skaduar."
-        rescind: "Hiq"
-        rescinded: "Ftesa u hoq"
-        reinvite: "Ridërgo ftesën"
-        reinvite_all: "Ridërgo të gjitha ftesat"
-        reinvited: "Ftesa u ri-dërgua"
-        reinvited_all: "Tê gjitha ftesat u dërguan sërish!"
         time_read: "Koha e leximit"
         days_visited: "Ditë vizituar"
         account_age_days: "Jetëgjatësia e llogarisë (ditë)"
-        links_tab: "Lidhjet"
-        link_created_at: "Krijuar"
-        link_groups: Grupet
+        create: "Fto"
         bulk_invite:
-          success: "Skedari u ngarkua, do njoftoheni me mesazh kur procesi të mbarojë. "
           error: "Na vjen keq, skedari duhet të jete i formatit CSV."
       password:
         title: "Fjalëkalimi"
@@ -753,6 +805,12 @@ sq:
         post_count:
           one: "postim i krijuar"
           other: "postime të krijuara"
+        likes_given:
+          one: "dhënë"
+          other: "dhënë"
+        likes_received:
+          one: "marrë"
+          other: "marrë"
         days_visited:
           one: "ditë që viziton faqen"
           other: "ditë që viziton faqen"
@@ -822,7 +880,6 @@ sq:
     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!"
     refresh: "Rifresko"
     home: "Kryefaqja"
@@ -831,15 +888,6 @@ sq:
       login_disabled: "Nuk mund të hyni në faqe sepse faqja është përkohësisht në formatin vetëm-lexim."
       logout_disabled: "Nuk mund të shkëputeni nga faqja sepse faqja është përkohësisht në formatin vetëm-lexim."
     learn_more: "mëso më shumë..."
-    all_time: "total"
-    all_time_desc: "totali i temave të krijuara"
-    year: "vit"
-    year_desc: "temat e krijuara në 365 ditët e fundit"
-    month: "muaj"
-    month_desc: "temat e krijuara në 30 ditët e fundit"
-    week: "javë"
-    week_desc: "temat e krijuara në 7 ditët e fundit"
-    day: "ditë"
     first_post: Postimi i parë
     mute: Hesht
     unmute: Çaktivizo heshtjen
@@ -852,11 +900,8 @@ sq:
       sign_up: "Regjistrohu"
       hide_session: "Më rikujto nesër"
       hide_forever: "jo faleminderit"
-      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>."
       enable: "Përmblidhe këtë Temë"
       disable: "Shfaq të gjithë postimet"
     deleted_filter:
@@ -876,7 +921,7 @@ sq:
     trust_level: "Niveli i besimit"
     search_hint: "emri i anëtarit, email ose adresë IP"
     create_account:
-      title: "Regjistrohuni"
+      header_title: "Mirë se vini!"
       failed: "Diçka nuk funksionoi siç duhet, mbase kjo adresë emaili është e regjistruar në faqe. Provoni butonin e fjalëkalimit të humbur. "
     forgot_password:
       title: "Rivendos fjalëkalimin"
@@ -893,10 +938,8 @@ sq:
       complete_email_not_found: "Nuk ka llogari për <b>%{email}</b>"
       confirm_title: Vazhdo tek %{site_name}
     login:
-      title: "Identifikohu"
       username: "Anëtari"
       password: "Fjalëkalimi"
-      email_placeholder: "email ose emri i përdoruesit"
       caps_lock_warning: "Caps Lock është aktive"
       error: "Gabim i panjohur"
       rate_limit: "Ju lutemi të prisni para se të provoni të identifikoheni përsëri. "
@@ -940,6 +983,7 @@ sq:
       accept_invite: "Prano ftesën"
       success: "Llogaria juaj u krijua dhe ju tani mund të identifikoheni."
       name_label: "Emri"
+      password_label: "Fjalëkalimi"
     password_reset:
       continue: "Vazhdo tek %{site_name}"
     emoji_set:
@@ -968,7 +1012,6 @@ sq:
       options: "Opsione"
       whisper: "pëshpëritje"
       unlist: "çlistuar"
-      blockquote_text: "Citim"
       add_warning: "Ky është një paralajmërim zyrtar."
       toggle_whisper: "Pëshpëritje?"
       toggle_unlisted: "Toggle Unlisted"
@@ -983,9 +1026,6 @@ sq:
         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"
-        post_length: "Postimi duhet të ketë të paktën {{min} shkronja."
         category_missing: "Duhet të zgjidhni një kategori"
       save_edit: "Ruani modifikimet"
       reply_original: "Përgjigjuni temës origjinale"
@@ -1004,8 +1044,6 @@ sq:
       saving: "Duke e ruajtur"
       saved: "U ruajt!"
       uploading: "Duke ngarkuar..."
-      show_preview: "tregoni panelin e parashikimit &raquo;"
-      hide_preview: "&laquo; fshiheni panelin e parashikimit"
       quote_post_title: "Citoni të gjithë postimin"
       bold_label: "B"
       bold_title: "Trashë"
@@ -1017,8 +1055,8 @@ sq:
       link_description: "shkruaj përshkrimin e lidhjes këtu"
       link_dialog_title: "Vendosni një lidhje"
       link_optional_text: "titull fakultativ"
-      quote_title: "Citim"
-      quote_text: "Citim"
+      blockquote_title: "Citim"
+      blockquote_text: "Citim"
       code_title: "Tekst i paraformatuar"
       code_text: "shkruani 4 hapësira (space) për të filluar tekstin e paraformatuar"
       paste_code_text: "shkruani ose ngjisni kodin këtu"
@@ -1059,10 +1097,7 @@ 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}"
       local_tip: "zgjidh imazhet nga aparati"
-      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"
       select_file: "Zgjdhni një Skedar"
@@ -1082,6 +1117,7 @@ sq:
       no_more_results: "Nuk gjetëm rezultate të tjera. "
       post_format: "#%{post_number} nga %{username}"
       search_google_button: "Google"
+      search_button: "Kërko"
       context:
         user: "Kërko postime nga @%{username}"
         category: "Kërkoni kategorinë #%{category}"
@@ -1095,6 +1131,11 @@ sq:
           label: Në grupin
         with_badge:
           label: Me stemën
+        post:
+          count:
+            label: Postime
+        views:
+          label: Shikimet
     hamburger_menu: "shko tek një kategori ose një listë e re temash"
     new_item: "e re"
     go_back: "kthehu mbrapa"
@@ -1118,6 +1159,7 @@ sq:
         actions: "Veprime në masë"
         close_topics: "Mbyll temat"
         archive_topics: "Arkivo temat"
+        move_messages_to_inbox: "Transfero në inbox"
         notification_level: "Njoftimet"
         choose_new_category: "Zgjidhni kategorinë e re për temat: "
         selected:
@@ -1133,8 +1175,6 @@ sq:
         bookmarks: "Nuk keni ende tema të preferuara. "
         category: "Nuk ka tema në: %{category}."
         top: "Nuk ka tema popullore."
-        educate:
-          unread: '<p>Temat e palexuara shfaqen këtu.</p><p>Automatikisht, temat klasifikohen si të palexuara dhe kanë etiketa me numër <span class="badge new-posts badge-notification">1</span> nëse ju:</p><ul><li>krijuat temën</li><li>iu përgjigjët temës</li><li>lexuat temën për më shumë se 4 minuta</li></ul><p>Ose nëse keni zgjedhur të Gjurmoni ose Vëzhgoni temën duke klikuar në butonin përkatës në fund të çdo teme.</p><p>Vizitoni <a href="%{userPrefsUrl}">preferencat tuaja</a> për të bërë ndryshime.</p>'
       bottom:
         latest: "Nuk ka më tema të reja."
         posted: "Nuk ka më tema të publikuara."
@@ -1142,6 +1182,7 @@ sq:
         new: "Nuk ka më tema të reja."
         unread: "Nuk ka më tema të palexuara."
         category: "Nuk ka më tema nga %{category}."
+        tag: "Nuk ka më tema nga %{tag}."
         top: "Nuk ka më tema popullore."
         bookmarks: "Nuk ka më tema të preferuara."
     topic:
@@ -1199,18 +1240,22 @@ sq:
       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_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
       jump_reply_up: hidhe tek përgjigja paraardhëse
       jump_reply_down: hidhu tek përgjigja pasardhëse
       deleted: "Tema është fshirë"
+      slow_mode_update:
+        save: "Aktivizo"
+        remove: "Çaktivizo"
+      topic_status_update:
+        when: "Kur:"
       auto_close:
         error: "Ju lutem shkruani një vlerë të vlefshme."
         based_on_last_post: "Mos e mbyll derisa postimi i fundit brenda temës të jetë të paktën kaq i vjetër. "
       status_update_notice:
         auto_close: "Kjo temë do të mbyllet automatikisht %{timeLeft}."
-        auto_close_based_on_last_post: "Kjo temë do të mbyllet %{duration} pas përgjigjes së fundit. "
+        auto_close_after_last_post: "Kjo temë do të mbyllet %{duration} pas përgjigjes së fundit. "
       auto_close_title: "Rregullimet e Mbylljes Automatike"
       timeline:
         back: "Kthehu mbrapa"
@@ -1298,6 +1343,7 @@ sq:
       share:
         title: "Shpërndaje"
         help: "shpërndani një lidhje mbi temën"
+        invite_users: "Fto"
       flag_topic:
         title: "Sinjalizo"
         help: "sinjalizo privatisht këtë temë ose dërgo një njoftim privat"
@@ -1342,14 +1388,13 @@ sq:
         username_placeholder: "emri i përdoruesit"
         action: "Dërgoni ftesën"
         help: "fto të tjerë në këtë temë nëpërmjet emailit ose njoftimeve"
-        to_forum: "Do të dërgojmë një email të shkurtër që do ta lejojë mikun tuaj të regjistrohet menjëherë duke klikuar një lidhje, pa kërkuar hyrjen në sistem."
-        sso_enabled: "Vendosni emrin e përdoruesit që dëshironi të ftoni në këtë temë"
+        discourse_connect_enabled: "Vendosni emrin e përdoruesit që dëshironi të ftoni në këtë temë"
         to_topic_blank: "Vendosni emrin e përdoruesit ose adresën email të personit që dëshironi të ftoni në këtë temë"
         to_topic_email: "Ju keni shtuar një adresë email. Ne do t'i dërgojmë një ftesë në email që do ta lejojë mikun tuaj t'i përgjigjet menjëherë kësaj teme."
         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>%{invitee}</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"
@@ -1403,9 +1448,9 @@ sq:
           one: Keni përzgjedhur <b>%{count}</b> postim.
           other: "Keni përzgjedhur <b>%{count}</b> postime."
     post:
+      quote_share: "Shpërndaje"
       edit_reason: "Arsyeja:"
       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}:"
       follow_quote: "shko tek tema e cituar"
@@ -1437,12 +1482,6 @@ sq:
         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. "
-      abandon_edit:
-        no_value: "Jo, mbaji"
-      abandon:
-        confirm: "A jeni të sigurtë se do të braktisni postimin?"
-        no_value: "Jo, mbaji"
-        yes_value: "Po, braktise"
       via_email: "ky postim u dërgua me email"
       via_auto_generated_email: "ky postim u krijua nga një email automatik"
       whisper: "ky postim është një pëshpëritje private për moderatorët"
@@ -1477,6 +1516,10 @@ sq:
         grant_badge: "Dhuroni Stemë"
         delete_topic: "fshi temën"
       actions:
+        people:
+          like:
+            one: "pëlqeu këtë"
+            other: "pëlqeu këtë"
         by_you:
           off_topic: "Ti sinjalizove këtë postim si jashtë teme"
           spam: "Ti sinjalizove këtë postim si spam"
@@ -1546,6 +1589,10 @@ sq:
       change_in_category_topic: "Redakto përshkrimin"
       already_used: "Kjo ngjyrë është përdorur nga një kategori tjetër"
       security: "Siguria"
+      permissions:
+        group: "Grupi"
+        see: "Shiko"
+        reply: "Përgjigju"
       special_warning: "Warning: This category is a pre-seeded category and the security settings cannot be edited. If you do not wish to use this category, delete it instead of repurposing it."
       images: "Imazhet"
       email_in: "Custom incoming email address:"
@@ -1572,11 +1619,11 @@ sq:
           description: "Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. "
         muted:
           title: "Pa njoftime"
-          description: "Ju nuk do të njoftoheni për asgjë nga temat e reja të këtyre kategorive, dhe këto tema nuk do të afishohen në faqen \"Më të fundit\" për ju. "
       search_priority:
         options:
           normal: "Normal"
       sort_options:
+        default: "paracaktuar"
         likes: "Pëlqime"
         views: "Shikimet"
         posts: "Postime"
@@ -1589,6 +1636,12 @@ sq:
     flagging:
       title: "Faleminderit për ndihmën që i jepni këtij komuniteti!"
       action: "Sinjalizo postimin"
+      take_action_options:
+        default:
+          title: "Vepro"
+          details: "Kaloni direkt tek pragu i sinjalizimeve (dmth, mos prisni për sinjalizime të tjera nga komuniteti)"
+        suspend:
+          title: "Pezullo anëtarin"
       notify_action: "Mesazh"
       official_warning: "Paralajmërim zyrtar"
       delete_spammer: "Elimino Spammer"
@@ -1655,12 +1708,6 @@ 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_likes_MF: |
-      This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
-        low {with a high like to post ratio}
-        med {with a very high like to post ratio}
-        high {with an extremely high like to post ratio}
-        other {}}
     original_post: "Postimi Origjinal"
     views: "Shikimet"
     views_lowercase:
@@ -1677,7 +1724,6 @@ sq:
       one: "përdorues"
       other: "përdorues"
     category_title: "Kategoria"
-    history: "Historia"
     changed_by: "nga %{author}"
     raw_email:
       not_available: "Not available!"
@@ -1756,6 +1802,7 @@ sq:
       readonly: "Shiko"
     lightbox:
       download: "shkarko"
+      counter: "%curr% nga %total%"
     keyboard_shortcuts_help:
       title: "Shkurtimet e tastierës "
       jump_to:
@@ -1898,6 +1945,10 @@ sq:
       back: "Kthehu mbrapa"
       share: "Shpërndaje"
       dismiss: "Hiqe"
+    do_not_disturb:
+      remaining: "edhe %{remaining} gërmë"
+      options:
+        custom: "Grupet e krijuara"
   admin_js:
     type_to_filter: "shkruaj për kërkim"
     admin:
@@ -1919,6 +1970,8 @@ sq:
         version_check_pending: "Me sa shohim keni rinovuar faqen se fundmi. Fantastike!"
         installed_version: "Instaluar"
         latest_version: "Të fundit"
+        new_features:
+          dismiss: "Hiqe"
         last_checked: "Verifikimi i fundit"
         refresh_problems: "Rifresko"
         no_problems: "Nuk u gjet asnjë gabim."
@@ -1945,6 +1998,9 @@ sq:
           view_table: "tabelë"
           view_graph: "grafik"
           refresh_report: "Rifresko raportin"
+          daily: Ditore
+          monthly: Mujore
+          weekly: Javore
           groups: "Të gjitha grupet"
           filters:
             group:
@@ -1957,9 +2013,6 @@ sq:
       groups:
         new:
           title: "Grup i ri"
-        bulk_add:
-          title: "Shto në masë tek grupi"
-          paste: "Ngjit një listë përdoruesisht ose adresash email, 1 për çdo rresht:"
         manage:
           interaction:
             email: Email
@@ -2002,6 +2055,8 @@ sq:
         show_details: Detaje
         description: Përshkrimi
         save: Ruaj
+        scopes:
+          action: Veprimi
       web_hooks:
         title: "Webhooks"
         save: "Ruaj"
@@ -2111,6 +2166,7 @@ sq:
           revert_confirm: "A jeni i sigurtë që doni të riktheni ndryshimet?"
         theme:
           theme: "Tema"
+          customize_desc: "Personalizo:"
           create_type: "Lloji"
           create_name: "Emri"
           edit: "Redakto"
@@ -2121,6 +2177,7 @@ sq:
           installed: "Instaluar"
           install_popular: "Popullore"
           about_theme: "Rreth"
+          version: "Versioni:"
           enable: "Aktivizo"
           disable: "Çaktivizo"
           add: "Shto"
@@ -2198,6 +2255,7 @@ sq:
         sent_test: "u dërgua!"
         delivery_method: "Metoda e dorëzimit"
         refresh: "Rifresko"
+        sending_email: "Duke dërguar emailin..."
         format: "Formati"
         html: "html"
         text: "tekst"
@@ -2250,6 +2308,7 @@ sq:
           do_nothing: "mos bëj asgjë"
         staff_actions:
           all: "të gjitha"
+          filter: "Filtro:"
           title: "Veprime Stafi"
           clear_filters: "Trego gjithshka"
           staff_user: "User"
@@ -2331,6 +2390,7 @@ sq:
         logster:
           title: "Ditar Gabimesh"
       watched_words:
+        search: "kërko"
         clear_filter: "Pastro"
         download: Shkarko
         clear_all: Pastro kriteret
@@ -2356,6 +2416,7 @@ sq:
           active: "Aktiv"
           staff: "Stafi"
           suspended: "Të pezulluar"
+          staged: "Staged"
         approved: "Aprovuar?"
         titles:
           active: "Përdorues Aktivë"
@@ -2374,6 +2435,8 @@ sq:
         check_email:
           title: "Shfaq adresën email të këtij përdoruesi."
           text: "Shfaq"
+        check_sso:
+          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}"
@@ -2486,8 +2549,7 @@ sq:
           on_grace_period: "Currently in promotion grace period, will not be demoted."
           locked_will_not_be_promoted: "Niveli i besimit i kyçur. Nuk do të promovohet kurrë. "
           locked_will_not_be_demoted: "Niveli i besimit i kyçur. Nuk do të rikthehet kurrë. "
-        sso:
-          title: "Single Sign On"
+        discourse_connect:
           external_id: "ID i jashtëm"
           external_username: "Emri i përdoruesit"
           external_name: "Emri"
@@ -2658,6 +2720,8 @@ sq:
       embedding:
         title: "Embedding"
         edit: "redakto"
+        embed_post_limit: "Maximum number of posts to embed"
+        embed_truncate: "Truncate the embedded posts"
       permalink:
         title: "Permalinks"
         url: "URL"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index fc0a457494..2542abdc16 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -27,7 +27,10 @@ sr:
         millions: "%{number}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "Hh:mm (z)"
+      time_short_day: "dd, 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"
@@ -127,16 +130,23 @@ sr:
       next_month: "Sledeći mesec"
       placeholder: datum
     share:
+      topic_html: 'Tema: <span class="topic-title">%{topicTitle}</span>'
       post: "poruka #%{postNumber}"
       close: "zatvori"
+      twitter: "Podeli na Twitteru"
+      facebook: "Podeli na Facebooku"
+      email: "Pošalji putem e-pošte"
+      url: "Kopiraj i podeli link"
     action_codes:
       public_topic: "objavi ovu temu javno %{when}"
+      private_topic: "je napravio/la ovu temu kao privatnu poruku %{when}"
       split_topic: "podeli ovu temu %{when}"
       invited_user: "pozvan %{who} %{when}"
       invited_group: "pozvan%{who}%{when}"
       user_left: "%{who} je sam sebe obrisao iz ove poruke %{when}"
       removed_user: "uklonjen %{who} %{when}"
       removed_group: "uklonjen%{who}%{when}"
+      autobumped: "automatski bumpovano %{when}"
       autoclosed:
         enabled: "zatvoreno %{when}"
         disabled: "otvoreno %{when}"
@@ -158,32 +168,47 @@ sr:
       banner:
         enabled: "je ovo načinio banerom%{when}. Pojavljivaće se na vrhu svake stranice dok ga korisnik ne ukloni."
         disabled: "je uklonio ovaj baner%{when}. Više se neće pojavljivati na vrhu svake stranice."
+      forwarded: "je prosledio/la navedenu e-poštu"
+    topic_admin_menu: "opcije teme"
     wizard_required: "Dobrodošli na Vaš novi Discourse! Počnimo sa <a href='%{url}' data-auto-route='true'>instalacijom</a>"
     emails_are_disabled: "Sva odlazeća epošta je onemogućena globalno od strane administratora. Ni jedna notifikacija neće biti poslata."
+    bootstrap_mode_disabled: "Bootstrap mod će biti onemogućen u roku od 24 časa."
     themes:
       default_description: "zadato"
+      broken_theme_alert: "Vaš forum možda neće raditi jer tema / komponenta %{theme} ima greške. Onemogućite je putem linka %{path}."
     s3:
       regions:
         ap_northeast_1: "Azija Pacifik (Tokio)"
         ap_northeast_2: "Azija Pacifik (Seul)"
+        ap_east_1: "Azijsko-pacifički region (Hong Kong)"
         ap_south_1: "Azija Pacifik (Mumbai)"
         ap_southeast_1: "Azija Pacifik (Singapur)"
         ap_southeast_2: "Azija Pacifik (Sidnej)"
+        ca_central_1: "Kanada (centralna)"
         cn_north_1: "Kina (Peking)"
+        cn_northwest_1: "Kina (Ningxia)"
         eu_central_1: "EU (Frankfurt)"
+        eu_north_1: "EU (Stokholm)"
         eu_west_1: "EU (Irska)"
         eu_west_2: "EU (London)"
+        eu_west_3: "EU (Pariz)"
+        sa_east_1: "Južna Amerika (Sao Paulo)"
         us_east_1: "US East (N. Virginia)"
         us_east_2: "US East (Ohio)"
+        us_gov_east_1: "AWS GovCloud (SAD-Istok)"
+        us_gov_west_1: "AWS GovCloud (US-Zapad)"
         us_west_1: "US West (N. California)"
         us_west_2: "US West (Oregon)"
+    clear_input: "Poništi unos"
     edit: "Izmeni naziv i kategoriju ove teme"
     expand: "Proširi"
     not_implemented: "Ova stavka nije jos omogućena za sad, izvinjavamo se."
     no_value: "Ne"
     yes_value: "Da"
+    submit: "Potvrdi"
     generic_error: "Izvinite, pojavila se greška."
     generic_error_with_reason: "Došlo je do greške: %{error}"
+    go_ahead: "Nastavi"
     sign_up: "Registrujte se"
     log_in: "Prijavi se"
     age: "Godine"
@@ -201,6 +226,8 @@ sr:
     privacy_policy: "Politika Privatnosti"
     privacy: "Privatnost"
     tos: "Uslovi Korišćenja"
+    rules: "Pravila"
+    conduct: "Kodeks ponašanja"
     mobile_view: "Mobilni pogled"
     desktop_view: "Računarski pogled"
     you: "Ti"
@@ -208,18 +235,27 @@ sr:
     now: "upravo sad"
     read_more: "pročitaj više"
     more: "Više"
+    x_more:
+      one: "još %{count} član"
+      few: "još %{count} člana"
+      other: "još %{count} članova"
     less: "Manje"
     never: "nikad"
     every_30_minutes: "svakih 30 minuta"
     every_hour: "svakog sata"
     daily: "svakodnevno"
     weekly: "nedeljno"
+    every_month: "svaki mesec"
+    every_six_months: "svakih šest meseci"
     max_of_count: "maksimalno od %{count}"
     alternation: "ili"
     character_count:
       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}...'
     suggested_topics:
       title: "Predložene Teme"
       pm_title: "Predložene poruke"
@@ -245,25 +281,68 @@ sr:
       help:
         bookmark: "Klikni da markiraš prvi post u ovoj temi"
         unbookmark: "Klikni da bi obirsao sve markere sa ove teme"
+        unbookmark_with_reminder: "Kliknite da biste uklonili sve obeleživače i podsetnike u ovoj temi. Imate podsetnik %{reminder_at} za ovu temu."
     bookmarks:
+      created: "Obeležili ste ovu poruku. %{name}"
+      not_bookmarked: "obeleži ovu poruku"
+      created_with_reminder: "Obeležili ste ovu poruku sa podsetnikom %{date}. %{name}"
       remove: "Obriši marker"
+      delete: "Ukloni obeleživač"
+      confirm_delete: "Da li ste sigurni da želite da uklonite ovaj obeleživač? Podsetnik će takođe biti uklonjen."
+      confirm_clear: "Da li ste sigurni da želite da uklonite sve obeleživače sa ove teme?"
       save: "Sačuvaj"
+      no_timezone: 'Još niste podesili vremensku zonu. Nećete moći postaviti podsetnike. Podesite sada <a href="%{basePath}/my/preferences/profile">na vašem profilu</a>.'
+      invalid_custom_datetime: "Uneti datum i vreme nisu važeći. Pokušajte ponovo."
+      list_permission_denied: "Nemate dozvolu da vidite obeleživače ovog člana."
+      no_user_bookmarks: "Nemate obeleženih poruka; obeleživači vam omogućavaju da se brzo uputite ka određenoj poruci."
+      auto_delete_preference:
+        label: "Automatski ukloni"
+        never: "Nikad"
+        when_reminder_sent: "Kada je podestnik poslan"
+        on_owner_reply: "Nakon mog odgovora u ovoj temi"
+      search_placeholder: "Pretraži obeleživače po nazivu, naslovu teme ili sadržaju poruka"
+      search: "Pretraži"
+      reminders:
+        today_with_time: "danas u %{time}"
+        tomorrow_with_time: "sutra u %{time}"
+        at_time: "u %{date_time}"
+        existing_reminder: "Imate podsetnik postavljen za ovaj obeleživač koji će biti poslan %{at_date_time}"
+    copy_codeblock:
+      copied: "kopirano!"
     drafts:
+      resume: "Nastavi"
       remove: "Ukloni"
+      remove_confirmation: "Da li ste sigurni da želite da uklonite ovaj nacrt?"
+      new_topic: "Novi nacrt teme"
+      new_private_message: "Novi nacrt privatne poruke"
+      topic_reply: "Nacrt odgovora"
       abandon:
-        yes_value: "Da, odustani"
-        no_value: "Ne, zadrži"
+        confirm: "Imate nacrt za ovu temu. Sta želite da učinite sa njim?"
+        yes_value: "Odbaci"
+        no_value: "Nastavi sa uređivanjem"
+    topic_count_latest:
+      one: "Pregledajte %{count} novu ili ažuriranu temu"
+      few: "Pregledajte %{count} nove ili ažurirane teme"
+      other: "Pregledajte %{count} novih ili ažuriranih tema"
+    topic_count_unread:
+      one: "Pregledajte %{count} nepročitanu temu"
+      few: "Pregledajte %{count} nepročitane teme"
+      other: "Pregledajte %{count} nepročitanih tema"
     preview: "prikaži"
     cancel: "otkaži"
+    deleting: "Uklanjanje..."
     save: "Sačuvaj izmene"
     saving: "Čuvanje..."
     saved: "Sačuvano!"
     upload: "Učitaj"
     uploading: "Učitava se..."
+    uploading_filename: "Otpremanje: %{filename}..."
+    clipboard: "klipbord"
     uploaded: "Učitano!"
     pasting: "Nalepljivanje..."
     enable: "Omogući"
     disable: "Onemogući"
+    continue: "Nastavi"
     undo: "Vrati na prethodno"
     revert: "Vrati nazad"
     failed: "Neuspešno"
@@ -272,30 +351,80 @@ sr:
     banner:
       close: "Sakrij ovaj element."
       edit: "Promeni ovaj baner >>"
+    pwa:
+      install_banner: "Da li želite <a href>da instalirate %{title} na ovom uređaju?</a>"
     choose_topic:
       none_found: "Nema pronađenih tema."
+      title:
+        search: "Potražite temu"
+        placeholder: "ovde unesite naslov teme, link ili ID"
+    choose_message:
+      none_found: "Nijedna poruka nije pronađena."
+      title:
+        search: "Potražite poruku"
+        placeholder: "ovde unesite naslov poruke, link ili ID"
     review:
+      order_by: "Poređaj po"
+      in_reply_to: "odgovor na"
+      explain:
+        why: "objasnite žašto je ova stavka završila u redu čekanja"
+        title: "Pregledno bodovanje"
+        formula: "Formula"
+        subtotal: "Međuzbir"
+        total: "Ukupno"
+        min_score_visibility: "Minimalna ocena za vidljivost"
+        score_to_hide: "Ocena za skrivanje poruke"
+        take_action_bonus:
+          name: "preuzeo/la akciju"
+          title: "Kada se član osoblja odluči da preduzme akciju, zastavi će biti dodeljen bonus."
+        user_accuracy_bonus:
+          name: "tačnost člana"
+      awaiting_approval: "Čeka odobrenje"
       delete: "Obriši"
       settings:
+        saved: "Sačuvano"
         save_changes: "Sačuvaj izmene"
         title: "Podešavanje"
+      view_all: "Pogledaj sve"
+      none: "Nema stavki za pregled."
+      view_pending: "pregled na čekanju"
       topic: "Tema:"
       filtered_user: "Korisnik"
+      filtered_reviewed_by: "Pregledano od strane"
       user:
         username: "Korisničko ime"
         email: "E-mail"
         name: "Ime foruma"
+        reject_reason: "Razlog"
       topics:
         topic: "Tema"
+        reviewable_count: "Broj"
+        details: "detalji"
+        unique_users:
+          one: "{count} korisnik"
+          few: "%{count} korisnika"
+          other: "%{count} korisnika"
       edit: "Izmeni"
       save: "Sačuvaj"
       cancel: "Odustani"
       filters:
+        type:
+          title: "Tip"
         refresh: "Osveži"
         category: "Kategorija"
+        priority:
+          medium: "Srednje"
+          high: "Visoko"
+      conversation:
+        view_full: "pogledaj ceo razgovor"
+      scores:
+        type: "Tip"
+        reviewed_by: "Pregledano od strane"
       statuses:
         pending:
           title: "U toku"
+        approved:
+          title: "Potvrđenji"
       types:
         reviewable_user:
           title: "Korisnik"
@@ -303,6 +432,28 @@ sr:
         title: "Potrebno odobrenje"
         description: "Primili smo tvoj novi post ali on najpre mora biti odobren od strane moderatora. Budi strpljiv."
         ok: "U redu"
+      example_username: "Korisničko ime"
+    relative_time_picker:
+      days:
+        one: "dan"
+        few: "dana"
+        other: "dana"
+      years:
+        one: "godina"
+        few: "godine"
+        other: "godina"
+      relative: "Povezano"
+    time_shortcut:
+      later_today: "Kasnije ovog dana"
+      next_business_day: "Naredni radni dan"
+      tomorrow: "Sutra"
+      next_week: "Sledeće sedmice"
+      post_local_date: "Datum u poruci"
+      later_this_week: "Kasnije ove sedmice"
+      start_of_next_business_week: "Ponedeljak"
+      start_of_next_business_week_alt: "Naredni ponedeljak"
+      next_month: "Naredni mesec"
+      custom: "Prilagođen datum i vreme"
     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>"
@@ -318,6 +469,7 @@ sr:
       sent_by_user: "Poslao <a href='%{userUrl}'>%{user}</a>"
       sent_by_you: "Poslao <a href='%{userUrl}'>ti</a>"
     directory:
+      username: "Korisničko ime"
       filter_name: "filtriraj po korisničkom imenu"
       title: "Korisnici"
       likes_given: "Dato"
@@ -338,9 +490,18 @@ sr:
         one: "{count} korisnik"
         few: "%{count} korisnika"
         other: "%{count} korisnika"
+    group_histories:
+      actions:
+        add_user_to_group: "Dodaj člana"
+        remove_user_from_group: "Ukloni člana"
+        make_user_group_owner: "Stavi kao vlasnika"
+        remove_user_as_group_owner: "Opozovi vlasnika"
     groups:
       requests:
         reason: "Razlog"
+        accepted: "prihvaćen"
+        deny: "Odbij"
+        denied: "odbijen"
       manage:
         name: "Ime foruma"
         full_name: "Ime"
@@ -354,12 +515,18 @@ sr:
           credentials:
             username: "Korisničko ime"
             password: "Šifra"
+          settings:
+            title: "Podešavanje"
+        categories:
+          title: Kategorije
         logs:
           title: "Logovi"
           when: "Kada"
           action: "Akcije"
           subject: "Predmet"
           details: "Detalji"
+      permissions:
+        title: "Dozvole"
       add: "Dodaj"
       message: "Privatna poruka"
       name: "Ime foruma"
@@ -370,6 +537,10 @@ sr:
         title: "Grupe"
         automatic: "Automatska"
         is_group_user: "Član"
+      title:
+        one: "Grupa"
+        few: "Grupe"
+        other: "Grupe"
       activity: "Aktivnost"
       members:
         title: "Članovi"
@@ -423,9 +594,11 @@ sr:
       posts: "Poruka"
       topics: "Teme"
       latest: "Poslednje"
-      latest_by: "poslednje od"
       toggle_ordering: "odredi kontrolu smera"
       subcategories: "Podkategorije"
+      topic_stat_unit:
+        week: "nedelja"
+        month: "mesec"
     ip_lookup:
       title: Pretraga po IP adresi
       hostname: Ime računara
@@ -441,6 +614,7 @@ sr:
       topics_entered: "tema posećeno"
       post_count: "# poruka"
       confirm_delete_other_accounts: "Jeste li sigurni da želite obrisati ove naloge?"
+      copied: "kopirano"
     user_fields:
       none: "(izaberi jednu od opcija)"
     user:
@@ -461,7 +635,11 @@ sr:
         ignore_duration_username: "Korisničko ime"
         mute_option: "Utišano"
         normal_option: "Normalno"
+      notification_schedule:
+        none: "Ništa"
+        monday: "Ponedeljak"
       activity_stream: "Aktivnost"
+      read: "Pročitano"
       preferences: "Postavke"
       feature_topic_on_profile:
         save: "Sačuvaj"
@@ -475,6 +653,8 @@ sr:
       notifications: "Obaveštenja"
       statistics: "Statistike"
       dismiss_notifications_tooltip: "Označi sve nepročitana obavestenja kao pročitana"
+      color_schemes:
+        regular: "Stalni član"
       external_links_in_new_tab: "Otvori sve spoljne linkove u novom tabu"
       enable_quoting: "Omogući citirani odgovor označenog teksta"
       change: "promeni"
@@ -491,6 +671,7 @@ sr:
       watched_categories: "Pregledano"
       tracked_categories: "Praćeno"
       muted_categories: "Utišano"
+      regular_categories: "Stalni član"
       delete_account: "Obriši moj Nalog"
       delete_account_confirm: "Jeste li sigurni da želite trajno obrisati svoj nalog? Ova se akcija ne može poništiti!"
       deleted_yourself: "Vaš nalog je uspešno obrisan."
@@ -499,6 +680,7 @@ sr:
       users: "Korisnici"
       muted_users: "Utišano"
       tracked_topics_link: "Prikaži"
+      api_approved: "Potvrđenji:"
       staff_counters:
         flags_given: "pomoćne oznake"
         flagged_posts: "označene poruke"
@@ -513,6 +695,7 @@ sr:
         move_to_archive: "Arhiviraj"
         select_all: "Izaberi sve"
       preferences_nav:
+        security: "Sigurnost"
         profile: "Profil"
         notifications: "Obaveštenja"
         categories: "Kategorije"
@@ -579,6 +762,7 @@ sr:
         short_instructions: "Ljudi vas mogu spominjati kao @%{username}"
         available: "Vaše korisničko ime slobodno"
         not_available: "Nije dostupno. Pokušajte %{suggestion}?"
+        not_available_no_suggestion: "Nije dostupno"
         too_short: "Vaše korisničko ime prekratko"
         too_long: "Vaše korisničko ime je predugačko"
         checking: "Proveravamo dostupnost korisničkog imena..."
@@ -612,6 +796,8 @@ sr:
         every_30_minutes: "svakih 30 minuta"
         daily: "dnevno"
         weekly: "nedeljno"
+        every_month: "svaki mesec"
+        every_six_months: "svakih šest meseci"
       email_level:
         always: "uvek"
         never: "nikada"
@@ -633,30 +819,27 @@ sr:
         after_5_minutes: "posle 5 minuta"
         after_10_minutes: "posle 10 minuta"
       invited:
-        search: "pišite da pregledate pozivnice"
         title: "Pozivnice"
+        pending_tab: "U toku"
+        redeemed_tab: "Nadoknadi"
+        groups: "Grupe"
+        topic: "Tema"
+        edit: "Izmeni"
+        remove: "Ukloni"
+        reinvited: "Pozivnica ponovno poslata"
+        search: "pišite da pregledate pozivnice"
         user: "Pozvani Korisnici"
         redeemed: "Nadoknadi Pozivnice"
-        redeemed_tab: "Nadoknadi"
         redeemed_at: "Nadoknadi"
         pending: "Tekuće pozivnice"
-        pending_tab: "U toku"
         topics_entered: "Pogledane Teme"
         posts_read_count: "Pročitane poruke"
         expired: "Ova je pozivnica istekla."
-        rescind: "Ukloni"
-        rescinded: "Pozivnica uklonjena"
-        reinvite: "Ponovno pošalji pozivnicu"
-        reinvite_all: "Ponovo pošalji sve pozivnice"
         reinvite_all_confirm: "Da li ste sigurni da želite ponovo da pošaljete sve pozivnice?"
-        reinvited: "Pozivnica ponovno poslata"
-        reinvited_all: "Sve pozivnice su ponovo poslate!"
         time_read: "Vreme Čitanja"
         days_visited: "Dana posećeno"
         account_age_days: "Starost naloga u danima"
-        links_tab: "Linkovi"
-        link_created_at: "Napravljeno"
-        link_groups: Grupe
+        create: "Pozovi"
         invite_link:
           success: "Link pozivnice je uspešno kreiran!"
       password:
@@ -736,6 +919,7 @@ sr:
       stream:
         posted_by: "Postavio "
         sent_by: "Poslao"
+        private_message: "privatna poruka"
         the_topic: "tema"
     loading: "Učitavanje..."
     errors:
@@ -758,30 +942,24 @@ sr:
     modal:
       close: "zatvori"
     close: "Zatvori"
-    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..."
-    all_time: "ukupno"
-    year: "godina"
-    year_desc: "teme otvorene u zadnjih 365 dana"
-    month: "mesec"
-    month_desc: "teme otvorene u zadnjih 30 dana"
-    week: "nedelja"
-    week_desc: "teme otvorene u zadnjih 7 dana"
-    day: "dan"
     first_post: Prva poruka
     mute: Utišaj
     unmute: Poništi utišanje
     last_post: Pisao
     time_read: Pročitano
     last_reply_lowercase: poslednji odgovor
+    replies_lowercase:
+      one: odgovori
+      few: odgovori
+      other: odgovori
     signup_cta:
       sign_up: "Registrujte se"
-      hidden_for_session: "OK, pitacu te sutra. Uvek mozes da koristis 'Uloguj se' da kreiras nalog."
     summary:
       enabled_description: "Gledate pregled ove teme: najzanimljivije poruke su odabrane od strane zajednice."
       enable: "Sumirajte Ovu Temu"
@@ -801,7 +979,7 @@ sr:
     trust_level: "Nivo poverenja"
     search_hint: "korisničko ime, e-mail ili IP adresa"
     create_account:
-      title: "Napravi novi nalog"
+      header_title: "Dobrodošao!"
       failed: "Nešto nije u redu, možda je ovaj e-mail već registrovan, pokušajte s linkom za zaboravljenu šifru."
     forgot_password:
       action: "Zaboravio/la sam šifru"
@@ -816,10 +994,8 @@ sr:
       complete_username_not_found: "Nema naloga koji odgovara korisničkom imenu <b>%{username}</b>"
       complete_email_not_found: "Nema naloga koji odgovara <b>%{email}</b>"
     login:
-      title: "Prijava"
       username: "Korisnik"
       password: "Šifra"
-      email_placeholder: "e-mail ili korisničko ime"
       caps_lock_warning: "Caps Lock vam je uključen"
       error: "Nepoznata greška"
       rate_limit: "Molimo sačekajte pre nego pokušate opet da se prijavite."
@@ -849,6 +1025,7 @@ sr:
       welcome_to: "Dobrodošao na %{site_name}!"
       success: "Tvoj nalog je kreiran i sada si ulogovan."
       name_label: "Ime foruma"
+      password_label: "Šifra"
     emoji_set:
       apple_international: "Apple/International"
       google: "Google"
@@ -863,7 +1040,6 @@ sr:
       emoji: "Emotikoni :)"
       more_emoji: "više..."
       options: "Opcije"
-      blockquote_text: "izdvojeni citat"
       add_warning: "Ovo je službeno upozorenje."
       posting_not_on_topic: "U kojoj temi želite odgovoriti?"
       saved_local_draft_tip: "sačuvano lokalno"
@@ -871,9 +1047,6 @@ 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"
         category_missing: "Morate odabrati kategoriju"
       save_edit: "Sačuvaj izmenu"
       reply_original: "Odgovori na originalnu temu"
@@ -891,8 +1064,6 @@ sr:
       saving: "Čuvanje"
       saved: "Sačuvano!"
       uploading: "Učitavanje..."
-      show_preview: "prikaži prikaz &raquo;"
-      hide_preview: "&laquo; sakrij prikaz"
       quote_post_title: "Citiraj celu poruku"
       bold_label: "B"
       bold_title: "Bold"
@@ -904,8 +1075,8 @@ sr:
       link_description: "Unesite opis linka ovde"
       link_dialog_title: "Ubacite Hiperlink"
       link_optional_text: "neobavezan naslov"
-      quote_title: "izdvojeni citat"
-      quote_text: "izdvojeni citat"
+      blockquote_title: "izdvojeni citat"
+      blockquote_text: "izdvojeni citat"
       code_title: "Pred-formatirani tekst"
       code_text: "uvuci pred-formatirani tekst za 4 mesta"
       paste_code_text: "unesi ili nalepi kod ovde"
@@ -938,7 +1109,6 @@ sr:
       from_the_web: "S interneta"
       remote_tip: "link za sliku"
       local_tip: "Izaberite slike sa Vašeg uređaja"
-      hint: "(možete i povući i pustiti datoteke u ovaj prozor da ih učitate)"
       hint_for_supported_browsers: "možete takođe prevući ili nalepiti slike u editor"
       uploading: "Učitavanje"
       default_image_alt_text: slika
@@ -951,6 +1121,7 @@ sr:
       no_more_results: "Nije pronađeno više rezultata"
       post_format: "#%{post_number} od %{username}"
       search_google_button: "Google"
+      search_button: "Pretraži"
       context:
         user: "Pretražite poruke od @%{username}"
         topic: "Pretražite ovu temu"
@@ -959,9 +1130,13 @@ sr:
         posted_by:
           label: Postavio
         post:
+          count:
+            label: Poruka
           time:
             label: Pisao
             before: pre
+        views:
+          label: Pregledi
     hamburger_menu: "idi na drugi popis tema ili kategoriju"
     new_item: "novo"
     go_back: "idi nazad"
@@ -999,6 +1174,7 @@ sr:
         new: "Nema više novih tema."
         unread: "Nema više nepročitanih tema."
         category: "Nema više %{category} tema."
+        tag: "Nema više %{tag} tema."
         top: "Nema više glavnih tema."
         bookmarks: "Nema više markiranih tema."
     topic:
@@ -1054,18 +1230,28 @@ sr:
       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_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
       jump_reply_up: skoči na raniji odgovor
       jump_reply_down: skoči na kasniji odgovor
       deleted: "Tema je obrisana"
+      slow_mode_update:
+        save: "Omogući"
+        remove: "Onemogući"
+      topic_status_update:
+        when: "Kada:"
+      auto_update_input:
+        later_today: "Kasnije ovog dana"
+        tomorrow: "Sutra"
+        later_this_week: "Kasnije ove sedmice"
+        next_week: "Sledeće sedmice"
+        next_month: "Naredni mesec"
       auto_close:
         error: "Molimo unesite validnu vrednost"
         based_on_last_post: "Nemoj zatvoriti dok poslednja poruka nije odprilike ovoliko stara."
       status_update_notice:
         auto_close: "Ova tema će se autmatski zatvoriti %{timeLeft}."
-        auto_close_based_on_last_post: "Ova tema će se zatvoriti %{duration} nakon zadnjeg odgovora."
+        auto_close_after_last_post: "Ova tema će se zatvoriti %{duration} nakon zadnjeg odgovora."
       auto_close_title: "Postavke Automatskog Zatvaranja"
       timeline:
         back: "Nazad"
@@ -1137,6 +1323,7 @@ sr:
       share:
         title: "Podeli"
         help: "podeli link ka ovoj temi"
+        invite_users: "Pozovi"
       print:
         title: "Štampaj"
         help: "Otvori verziju pogodnu za štampanje"
@@ -1159,7 +1346,6 @@ sr:
       invite_reply:
         title: "Pozovite"
         username_placeholder: "korisničko ime"
-        to_forum: "Poslaćemo kratak e-mail dopuštajući tvom prijatelju da se odmah učlani jednim klikom na link, bez potrebe prijave."
         email_placeholder: "ime@primer.com"
       login_reply: "Prijavi se da bi odgovorio"
       filters:
@@ -1207,9 +1393,9 @@ sr:
           few: "Odabrali ste <b>%{count}</b> poruka."
           other: "Odabrali ste <b>%{count}</b> poruka."
     post:
+      quote_share: "Podeli"
       edit_reason: "Razlog:"
       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}:"
       follow_quote: "idi na citiranu poruku"
@@ -1228,12 +1414,8 @@ sr:
         image_upload_not_allowed_for_new_user: "Žao nam je, novi korisnici ne mogu učitavati slike."
         attachment_upload_not_allowed_for_new_user: "Žao nam je, novi korisnici ne mogu učitavati priloge."
         attachment_download_requires_login: "Žao nam je, morate biti prijavljeni da biste preuzimali priloge."
-      abandon_edit:
-        no_value: "Ne, zadrži"
-      abandon:
-        confirm: "Jeste li sigurni da želite odustati od vaše poruke?"
-        no_value: "Ne, zadrži"
-        yes_value: "Da, odustani"
+      cancel_composer:
+        discard: "Odbaci"
       via_email: "ova poruka stigla je preko e-maila"
       archetypes:
         save: "Sačuvaj postavke"
@@ -1316,6 +1498,10 @@ sr:
       change_in_category_topic: "Izmena Opisa"
       already_used: "Ova boja se koristi u drugoj kategoriji."
       security: "Sigurnost"
+      permissions:
+        group: "Grupa"
+        see: "Pogledaj"
+        reply: "Odgovori"
       images: "Slike"
       email_in: "Prilagođena adresa dolaznog e-maila."
       email_in_allow_strangers: "Prihvati emailove anonimnih korisnika bez naloga"
@@ -1342,7 +1528,9 @@ sr:
       search_priority:
         options:
           normal: "Normalno"
+          high: "Visoko"
       sort_options:
+        default: "zadato"
         likes: "Lajkovi"
         views: "Pregledi"
         posts: "Poruka"
@@ -1355,6 +1543,12 @@ sr:
     flagging:
       title: "Hvala što pomažete u održavanju naše zajednice pristojnom."
       action: "Označi Poruku Zastavom"
+      take_action_options:
+        default:
+          title: "Preduzmi Akciju"
+          details: "Dođite odmah do praga za zastave, umesto da čekate još zastava od zajednice."
+        suspend:
+          title: "Suspenduj Korisnika"
       notify_action: "Privatna poruka"
       delete_spammer: "Obriši korisnika zbog nepoželjnih poruka"
       yes_delete_spammer: "Da, Obriši Korisnika"
@@ -1379,6 +1573,11 @@ sr:
         one: "%{count} klik"
         few: "%{count} klikova"
         other: "%{count} klikova"
+    post_links:
+      title:
+        one: "još %{count} član"
+        few: "još %{count} član"
+        other: "još %{count} član"
     topic_statuses:
       warning:
         help: "Ovo je službeno upozorenje."
@@ -1405,8 +1604,11 @@ sr:
     activity: "Aktivnosti"
     likes: "Lajkova"
     users: "Korisnici"
+    users_lowercase:
+      one: "korisnik"
+      few: "korisnici"
+      other: "korisnici"
     category_title: "Kategorija"
-    history: "Istorija"
     changed_by: "od %{author}"
     raw_email:
       not_available: "Nije dostupno!"
@@ -1487,6 +1689,7 @@ sr:
       readonly: "Pogledaj"
     lightbox:
       download: "preuzmi"
+      counter: "%curr% od %total%"
     keyboard_shortcuts_help:
       title: "Prečice na tastaturi"
       jump_to:
@@ -1532,6 +1735,10 @@ sr:
         mark_watching: "%{shortcut} Posmatraj temu"
     badges:
       title: Značke
+      more_badges:
+        one: "+još %{count} član"
+        few: "+još %{count} član"
+        other: "+još %{count} član"
       select_badge_for_title: Odaberi značku koju češ koristit kao titulu
       badge_grouping:
         getting_started:
@@ -1546,7 +1753,11 @@ sr:
           name: Poruke
     tagging:
       add_synonyms: "Dodaj"
+      sort_by_count: "broj"
+      sort_by_name: "ime foruma"
       cancel_delete_unused: "Odustani"
+      filters:
+        without_category: "%{filter} %{tag} teme"
       notifications:
         watching:
           title: "Posmatrano"
@@ -1571,6 +1782,9 @@ sr:
     footer_nav:
       back: "Nazad"
       share: "Podeli"
+    do_not_disturb:
+      options:
+        custom: "Posebna"
   admin_js:
     type_to_filter: "upiši za filtriranje"
     admin:
@@ -1605,12 +1819,17 @@ sr:
         reports:
           today: "Danas"
           yesterday: "Juče"
+          last_7_days: "Zadnjih 7"
+          last_30_days: "Zadnjih 30"
           all_time: "Oduvek"
           7_days_ago: "Pre 7 Dana"
           30_days_ago: "Pre 30 Dana"
           all: "Sve"
           view_table: "tablica"
           refresh_report: "Osveži Prijave"
+          daily: Top dnevne
+          monthly: Top mesečne
+          weekly: Top nedeljne
           filters:
             group:
               label: Grupa
@@ -1655,6 +1874,9 @@ sr:
         show_details: Detalji
         description: Opis
         save: Sačuvaj
+        continue: Nastavi
+        scopes:
+          action: Akcije
       web_hooks:
         save: "Sačuvaj"
         destroy: "Obriši"
@@ -1740,12 +1962,16 @@ sr:
           title: "E-mail"
           subject: "Predmet"
         theme:
+          customize_desc: "Prilagođavanje:"
+          create_type: "Tip"
           create_name: "Ime foruma"
           edit: "Izmeni"
           settings: "Podešavanje"
           upload: "Učitaj"
+          discard: "Odbaci"
           installed: "Instalirano"
           about_theme: "O nama"
+          version: "Verzija:"
           enable: "Omogući"
           disable: "Onemogući"
           add: "Dodaj"
@@ -1818,6 +2044,7 @@ sr:
         sent_test: "poslato!"
         delivery_method: "Metoda dostave"
         refresh: "Osveži"
+        sending_email: "Email se šalje..."
         format: "Format"
         html: "html"
         text: "tekst"
@@ -1857,6 +2084,7 @@ sr:
           do_nothing: "Ne čini ništa"
         staff_actions:
           all: "sve"
+          filter: "Filter:"
           title: "Akcije Osoblja"
           clear_filters: "Prikaži sve"
           staff_user: "Korisnik"
@@ -1910,6 +2138,7 @@ sr:
             label: "Novo:"
             ip_address: "IP adrese"
             add: "Dodaj"
+            filter: "Pretraži"
           roll_up:
             text: "Zaokruži"
             title: "Otvori nove unose zabrana za podmreže ako ima barem 'min_ban_entries_for_roll_up' unosa."
@@ -1919,6 +2148,7 @@ sr:
         logster:
           title: "Logovi Grešaka"
       watched_words:
+        search: "pretraži"
         clear_filter: "Čisto"
         download: Preuzmi
         actions:
@@ -1959,6 +2189,8 @@ sr:
         check_email:
           title: "Otkrij korisnikovu email adresu"
           text: "Pokaži"
+        check_sso:
+          text: "Prikaž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}"
@@ -2065,12 +2297,11 @@ sr:
           on_grace_period: "Trenutno u periodu milosti zbog promocije, neće biti skinut."
           locked_will_not_be_promoted: "Nivo poverenja zaključan. Neće biti unapređivan."
           locked_will_not_be_demoted: "Nivo poverenja zaključan. Neće biti skinut."
-        sso:
-          title: "SSO"
+        discourse_connect:
           external_id: "Spoljašni ID"
           external_username: "Korisničko ime"
-          external_name: "Ime"
-          external_email: "Email"
+          external_name: "Ime foruma"
+          external_email: "E-mail"
           external_avatar_url: "URL Profilne Slike"
       user_fields:
         title: "Korisnička polja"
@@ -2137,6 +2368,7 @@ sr:
           backups: "Sigurnosne kopije"
           login: "Prijava"
           plugins: "Dodatci"
+          search: "Pretraži"
           groups: "Grupe"
           dashboard: "Komandna Tabla"
         default_categories:
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 65e8026417..f7e754f03e 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -158,6 +158,9 @@ sv:
     topic_admin_menu: "ämnesåtgärder"
     wizard_required: "Välkommen till din nya Discourse! Låt oss komma igång med hjälp av <a href='%{url}' data-auto-route='true'>konfigureringsguiden</a> ✨"
     emails_are_disabled: "All utgående e-post har blivit globalt inaktiverad av en administratör. Inga e-postaviseringar av något slag kommer att skickas ut."
+    software_update_prompt:
+      message: "Vi har uppdaterat den här webbplatsen, och <span>ber dig uppdatera sidan</span>, annars kan du uppleva oväntad funktion."
+      dismiss: "Avfärda"
     bootstrap_mode_enabled:
       one: "Du är i bootstrap-läge för att göra lanseringen av din nya webbplats enklare. Alla nya användare kommer att beviljas förtroendenivå 1 och få dagliga sammanfattningar skickade via e-post. Det här stängs automatiskt av när antalet användare når %{count}."
       other: "Du är i bootstrap-läge för att göra lanseringen av din nya webbplats enklare. Alla nya användare kommer att beviljas förtroendenivå 1 och få dagliga sammanfattningar skickade via e-post. Det här stängs automatiskt av när antalet användare når %{count}."
@@ -169,6 +172,7 @@ sv:
       regions:
         ap_northeast_1: "Asien Stillahavsområdet (Tokyo)"
         ap_northeast_2: "Asien Stillahavsområdet (Seoul)"
+        ap_east_1: "Asien-Stillahavsregionen (Hongkong)"
         ap_south_1: "Asien Stillahavsområdet (Mumbai)"
         ap_southeast_1: "Asien Stillahavsområdet (Singapore)"
         ap_southeast_2: "Asien Stillahavsområdet (Sydney)"
@@ -187,6 +191,7 @@ sv:
         us_gov_west_1: "AWS GovCloud (Västra USA)"
         us_west_1: "Västra USA (N. Kalifornien)"
         us_west_2: "Västra USA (Oregon)"
+    clear_input: "Rensa inmatning"
     edit: "redigera rubrik och kategori för det här ämnet"
     expand: "Utvidga"
     not_implemented: "Denna funktion har tyvärr inte implementerats än!"
@@ -221,6 +226,9 @@ sv:
     now: "nyss"
     read_more: "läs mer"
     more: "Mer"
+    x_more:
+      one: "Ytterligare %{count}"
+      other: "Ytterligare %{count}"
     less: "Mindre"
     never: "aldrig"
     every_30_minutes: "var 30:e minut"
@@ -249,8 +257,9 @@ sv:
       moderators: "Moderatorer"
       stat:
         all_time: "Alla dagar"
-        last_7_days: "Senaste 7"
-        last_30_days: "Senaste 30"
+        last_day: "Senaste 24 timmarna"
+        last_7_days: "Senaste 7 dagarna"
+        last_30_days: "Senaste 30 dagarna"
       like_count: "Gillningar"
       topic_count: "Ämnen"
       post_count: "Inlägg"
@@ -286,18 +295,6 @@ sv:
       search_placeholder: "Sök i bokmärken efter namn, ämnestitel eller postinnehåll"
       search: "Sök"
       reminders:
-        later_today: "Senare idag"
-        next_business_day: "Nästa vardag"
-        tomorrow: "Imorgon"
-        next_week: "Nästa vecka"
-        post_local_date: "Datum i inlägget"
-        later_this_week: "Senare denna vecka"
-        start_of_next_business_week: "Måndag"
-        start_of_next_business_week_alt: "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 kl. %{time}"
         tomorrow_with_time: "imorgon kl. %{time}"
         at_time: "den %{date_time}"
@@ -312,9 +309,9 @@ sv:
       new_private_message: "Nytt utkast för privat meddelande"
       topic_reply: "Svar på utkast"
       abandon:
-        confirm: "Du har redan öppnat ett annat utkast för detta ämne. Är du säker på att du vill överge detta?"
-        yes_value: "Ja, överge"
-        no_value: "Nej, behåll"
+        confirm: "Du har ett pågående utkast för detta ämne. Vad vill du göra med det?"
+        yes_value: "Förkasta"
+        no_value: "Återuppta redigering"
     topic_count_latest:
       one: "Visa %{count} nytt eller uppdaterat ämne"
       other: "Visa %{count} nya eller uppdaterade ämnen"
@@ -333,6 +330,7 @@ sv:
     upload: "Ladda upp"
     uploading: "Laddar upp..."
     uploading_filename: "Laddar upp: %{filename}..."
+    processing_filename: "Bearbetar: %{filename}..."
     clipboard: "urklipp"
     uploaded: "Uppladdad!"
     pasting: "Klistrar in..."
@@ -411,6 +409,7 @@ sv:
       topic: "Ämne:"
       filtered_topic: "Du har filtrerat för granskning av innehåll i ett enskilt ämne."
       filtered_user: "Användare"
+      filtered_reviewed_by: "Granskade av"
       show_all_topics: "visa alla ämnen"
       deleted_post: "(inlägg raderat)"
       deleted_user: "(användare raderad)"
@@ -421,10 +420,11 @@ sv:
         email: "E-post"
         name: "Namn"
         fields: "Fält"
+        reject_reason: "Anledning"
       user_percentage:
         summary:
-          one: "%{agreed},%{disagreed},%{ignored} (%{count} flagga totalt)"
-          other: "%{agreed},%{disagreed},%{ignored} (%{count} flaggor totalt)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (av den senaste flaggan)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (av de senaste %{count} flaggorna)"
         agreed:
           one: "%{count} % instämmer"
           other: "%{count} % instämmer"
@@ -467,7 +467,8 @@ sv:
           created_at_asc: "Skapad den (omvänt)"
         priority:
           title: "Lägsta prioritet"
-          low: "(valfri)"
+          any: "(valfritt)"
+          low: "Låg"
           medium: "Medium"
           high: "Hög"
       conversation:
@@ -505,6 +506,8 @@ sv:
           title: "Köat inlägg"
         reviewable_user:
           title: "Användare"
+        reviewable_post:
+          title: "Inlägg"
       approval:
         title: "Inlägget behöver godkännande"
         description: "Vi har mottagit ditt nya inlägg men det måste godkännas av en moderator innan det kan visas. Ha tålamod."
@@ -513,6 +516,40 @@ sv:
           other: "Du har <strong>%{count}</strong> inlägg som väntar."
         ok: "OK"
       example_username: "användarnamn"
+      reject_reason:
+        title: "Varför avvisar du den här användaren?"
+        send_email: "Skicka avvisningsmeddelande"
+    relative_time_picker:
+      minutes:
+        one: "minut"
+        other: "minuter"
+      hours:
+        one: "timme"
+        other: "timmar"
+      days:
+        one: "dag"
+        other: "dagar"
+      months:
+        one: "månad"
+        other: "månader"
+      years:
+        one: "år"
+        other: "år"
+      relative: "Relativ"
+    time_shortcut:
+      later_today: "Senare idag"
+      next_business_day: "Nästa vardag"
+      tomorrow: "Imorgon"
+      next_week: "Nästa vecka"
+      post_local_date: "Datum i inlägget"
+      later_this_week: "Senare denna vecka"
+      start_of_next_business_week: "Måndag"
+      start_of_next_business_week_alt: "Nästa måndag"
+      next_month: "Nästa månad"
+      custom: "Anpassa datum och tid"
+      relative: "Relativ tid"
+      none: "Ingen behövs"
+      last_custom: "Senaste anpassade datumtid"
     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>"
@@ -599,6 +636,10 @@ sv:
             imap_ssl: "Använd SSL för IMAP"
             username: "Användarnamn"
             password: "Lösenord"
+          settings:
+            title: "Inställningar"
+            allow_unknown_sender_topic_replies: "Tillåt okända avsändares ämnesvar."
+            allow_unknown_sender_topic_replies_hint: "Tillåter okända avsändare att svara på gruppämnen. Om detta inte är aktiverat kommer svar från e-postadresser som inte redan ingår i IMAP-e-posttråden eller inbjudna till ämnet att skapa ett nytt ämne."
           mailboxes:
             synchronized: "Synkroniserad brevlåda"
             none_found: "Inga brevlådor hittades för detta e-postkonto."
@@ -700,7 +741,22 @@ sv:
         make_owner_description: "Gör <b>%{username}</b> till ägare av denna grupp"
         remove_owner: "Ta bort som ägare"
         remove_owner_description: "Ta bort <b>%{username}</b> som ägare av denna grupp"
+        make_primary: "Gör till primär"
+        make_primary_description: "Gör denna till primär grupp för <b>%{username}</b>"
+        remove_primary: "Ta bort som primär"
+        remove_primary_description: "Ta bort denna som primär grupp för <b>%{username}</b>"
+        remove_members: "Ta bort medlemmar"
+        remove_members_description: "Ta bort markerade användare från denna grupp"
+        make_owners: "Gör till ägare"
+        make_owners_description: "Gör markerade användare till ägare av denna grupp"
+        remove_owners: "Ta bort ägare"
+        remove_owners_description: "Ta bort markerade användare som ägare till denna grupp"
+        make_all_primary: "Gör alla till primära"
+        make_all_primary_description: "Gör denna till primär grupp för alla markerade användare"
+        remove_all_primary: "Ta bort som primär"
+        remove_all_primary_description: "Ta bort denna grupp som primär"
         owner: "Ägare"
+        primary: "Primär"
         forbidden: "Du är inte tillåten att se medlemmarna."
       topics: "Ämnen"
       posts: "Inlägg"
@@ -772,13 +828,21 @@ sv:
       posts: "Inlägg"
       topics: "Ämnen"
       latest: "Senaste"
-      latest_by: "senast efter"
       toggle_ordering: "slå av/på sorteringskontroll"
       subcategories: "Underkategorier"
       muted: "Tystade kategorier"
       topic_sentence:
         one: "%{count} ämne"
         other: "%{count} ämnen"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "vecka"
+        month: "månad"
+      topic_stat_all_time:
+        one: "%{number} totalt"
+        other: "%{number} totalt"
       topic_stat_sentence_week:
         one: "%{count} nytt ämne under senaste veckan."
         other: "%{count} nya ämnen under senaste veckan."
@@ -839,7 +903,23 @@ sv:
         mute_option_title: "Du kommer inte att få några aviseringar från denna användare."
         normal_option: "Normal"
         normal_option_title: "Du kommer att aviseras om denna användare svarar dig, citerar dig eller nämner dig."
+      notification_schedule:
+        title: "Aviseringsschema"
+        label: "Aktivera anpassat aviseringsschema"
+        tip: "Utanför dessa timmar kommer du automatiskt att placeras i \"stör ej\"."
+        midnight: "Midnatt"
+        none: "Ingen"
+        monday: "Måndag"
+        tuesday: "Tisdag"
+        wednesday: "Onsdag"
+        thursday: "Torsdag"
+        friday: "Fredag"
+        saturday: "Lördag"
+        sunday: "Söndag"
+        to: "till"
       activity_stream: "Aktivitet"
+      read: "Läs"
+      read_help: "Nyligen lästa ämnen"
       preferences: "Inställningar"
       feature_topic_on_profile:
         open_search: "Välj ett nytt ämne"
@@ -868,11 +948,20 @@ sv:
         perm_denied_expl: "Du nekade tillåtelse för aviseringar. Tillåt aviseringar via din webbläsares inställningar."
         disable: "Inaktivera aviseringar"
         enable: "Aktivera aviseringar"
-        each_browser_note: "Notera: Du måste ändra denna inställning i varje webbläsare du använder."
+        each_browser_note: 'Obs! Du måste ändra den här inställningen i varje webbläsare du använder. Alla meddelanden kommer att inaktiveras när du är i ”stör ej”, oavsett denna inställning.'
         consent_prompt: "Vill du ha realtidsaviseringar när personer svarar på dina inlägg?"
       dismiss: "Avfärda"
       dismiss_notifications: "Avfärda alla"
       dismiss_notifications_tooltip: "Markera alla olästa aviseringar som lästa"
+      no_messages_title: "Du har inga meddelanden"
+      no_messages_body: >
+        Behöver du ha en direkt personlig konversation med någon, utanför det normala konversationsflödet? Meddela dem genom att klicka på deras avatar och använd %{icon} meddelandeknappen.<br><br> Om du behöver hjälp kan du <a href='%{aboutUrl}'>meddela någon ur personalen</a>.
+      no_bookmarks_title: "Du har inte bokmärkt något än"
+      no_bookmarks_body: >
+        Börja bokmärka inlägg med %{icon} -knappen, så visas de i listan här för enkel referens. Du kan också schemalägga en påminnelse!
+      no_notifications_title: "Du har inga aviseringar än"
+      no_notifications_body: >
+        Du kommer att aviseras i denna panel om aktivitet som är direkt relevant för dig, bland annat svar på dina ämnen och inlägg, när någon <b>@nämner</b> dig eller citerar dig och svarar på ämnen som du bevakar. Aviseringar kommer också att skickas till din e-postadress när du inte har loggat in på ett tag. <br><br> Leta efter %{icon} för att bestämma vilka specifika ämnen, kategorier och taggar som du vill aviseras om. Se mer i dina <a href='%{preferencesUrl}'>aviseringsinställningar</a>.
       first_notification: "Du har fått din första avisering! Markera den för att börja."
       dynamic_favicon: "Visa räknare i webbläsarens ikon"
       skip_new_user_tips:
@@ -883,7 +972,7 @@ sv:
       color_scheme_default_on_all_devices: "Ange standardfärgschema(n) för alla mina enheter"
       color_scheme: "Färgschema"
       color_schemes:
-        default_description: "Standard"
+        default_description: "Temat Standard"
         disable_dark_scheme: "Samma som vanlig"
         dark_instructions: "Du kan förhandsgranska färgschemat för mörkt läge genom att växla dina enheters mörka läge."
         undo: "Återställ"
@@ -986,6 +1075,7 @@ sv:
         tags: "Taggar"
       preferences_nav:
         account: "Konto"
+        security: "Säkerhet"
         profile: "Profil"
         emails: "E-post"
         notifications: "Aviseringar"
@@ -1098,6 +1188,7 @@ sv:
         uploaded_avatar_empty: "Lägg till en anpassad bild"
         upload_title: "Ladda upp din bild"
         image_is_not_a_square: "Varning: vi beskar din bild; bredden och höjden var inte lika stora."
+        logo_small: "Webbplatsens lilla logotyp. Används som standard."
       change_profile_background:
         title: "Profilrubrik"
         instructions: "Profilrubriken kommer att centreras, samt ha en standardbredd på 1110px."
@@ -1120,7 +1211,7 @@ sv:
         set_primary: "Ange primär e-postadress"
         destroy: "Ta bort e-postadress"
         add_email: "Lägg till alternativ e-postadress"
-        sso_override_instructions: "E-postadressen kan uppdateras från SSO-leverantören."
+        auth_override_instructions: "E-postadressen kan uppdateras från autentiseringsleverantören."
         no_secondary: "Inga sekundära e-postadresser"
         instructions: "Visas aldrig offentligt."
         admin_note: "Obs! En administratörsanvändare som ändrar annan icke-administratörsanvändares e-postadress anger att användaren har förlorat tillgången till sin ursprungliga adress, så ett återställnings-e-postmeddelande kommer att skickas till den nya adressen. Inget ändras förrän användaren har slutfört lösenordsåterställningsprocessen."
@@ -1128,6 +1219,7 @@ sv:
         required: "Vi ber dig ange en e-postadress"
         invalid: "Vi ber dig ange en giltig e-postadress"
         authenticated: "Din e-postadress har blivit verifierad av %{provider}"
+        invite_auth_email_invalid: "Ditt inbjudningsmeddelande matchar inte den e-postadress som autentiserats 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."
@@ -1161,6 +1253,7 @@ sv:
         checking: "Kollar användarnamnets tillgänglighet..."
         prefilled: "E-postadressen matchar det här registrerade användarnamnet"
         required: "Ange ett användarnamn"
+        edit: "Redigera 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."
@@ -1257,47 +1350,47 @@ sv:
         after_10_minutes: "efter 10 minuter"
       notification_level_when_replying: "När jag publicerar i ett ämne, ställ in ämnet till"
       invited:
-        search: "sök efter inbjudningar..."
         title: "Inbjudningar"
+        pending_tab: "Avvaktar"
+        pending_tab_with_count: "Pågående (%{count})"
+        expired_tab: "Utgången"
+        expired_tab_with_count: "Utgången (%{count})"
+        redeemed_tab: "Inlöst"
+        redeemed_tab_with_count: "Inlöst (%{count})"
+        invited_via: "Inbjudan"
+        invited_via_link: "länk %{key} (%{count} / %{max} inlösta)"
+        groups: "Grupper"
+        topic: "Ämne"
+        sent: "Skapad/senast skickad"
+        expires_at: "Utgår"
+        edit: "Redigera"
+        remove: "Ta bort"
+        copy_link: "Hämta länk"
+        reinvite: "Skicka e-post igen"
+        reinvited: "Inbjudan skickad"
+        removed: "Borttagen"
+        search: "sök efter inbjudningar..."
         user: "Inbjuden användare"
-        sent: "Senast skickade"
         none: "Inga inbjudningar att visa."
         truncated:
           one: "Visar den första inbjudningen."
           other: "Visar de första %{count} inbjudningarna."
         redeemed: "Inlösta inbjudningar"
-        redeemed_tab: "Inlöst"
-        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})"
         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 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"
+        remove_all: "Ta bort utgångna inbjudningar"
+        removed_all: "Alla utgångna inbjudningar har tagits bort!"
+        remove_all_confirm: "Är du säker på att du vill ta bort alla utgångna inbjudningar?"
         reinvite_all: "Skicka alla inbjudningar igen"
         reinvite_all_confirm: "Är du säker på att du vill skicka om alla inbjudningar?"
-        reinvited: "Inbjudan skickad"
-        reinvited_all: "Alla inbjudningar har skickats igen!"
+        reinvited_all: "Alla inbjudningar har skickats!"
         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: "Inbjudan"
-        copy_link: "Visa länk"
         generate_link: "Skapa inbjudningslänk"
         link_generated: "Här är din inbjudningslänk!"
         valid_for: "Länk för inbjudan är endast giltig för denna email adress: %{email}"
@@ -1309,12 +1402,36 @@ sv:
           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?"
+        invite:
+          new_title: "Skapa inbjudan"
+          edit_title: "Redigera inbjudan"
+          instructions: "Dela denna länk för att omedelbart bevilja åtkomst till denna webbplats:"
+          copy_link: "kopiera länk"
+          expires_in_time: "Utgår om %{time}."
+          expired_at_time: "Utgick kl. %{time}."
+          show_advanced: "Visa avancerade alternativ"
+          hide_advanced: "Dölj avancerade alternativ"
+          restrict_email: "Begränsa inbjudan till en e-postadress"
+          max_redemptions_allowed: "Max antal användningar:"
+          add_to_groups: "Lägg till i grupper:"
+          invite_to_topic: "Skicka till ämnet vid första inloggningen:"
+          expires_at: "Utgår efter:"
+          custom_message: "Valfritt personligt meddelande:"
+          send_invite_email: "Spara och skicka e-post"
+          save_invite: "Spara inbjudan"
+          invite_saved: "Inbjudan har sparats."
+          invite_copied: "Inbjudningslänken har kopierats."
+          blank_email: "Inbjudningslänken har inte kopierats. E-postadress krävs."
         bulk_invite:
           none: "Inga inbjudningar att visa på denna sida."
           text: "Massinbjudan"
-          success: "Filen laddades upp och du underrättas via meddelande när processen är klar"
+          instructions: |
+            <p>Bjud in en lista med användare för att få igång ditt forum snabbt. Förbered en <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">CSV-fil</a> som innehåller minst en rad per e-postadress för användare som du vill bjuda in. Följande kommaseparerad information kan anges om du vill lägga till personer till grupper eller skicka dem till ett visst ämne första gången de loggar in.</p>
+            <pre>john@smith.com,first_group_name;second_group_name,topic_id</pre>
+            <p>Det skickas en inbjudan till varje e-postadress i din uppladdade CSV-fil och du kommer att kunna hantera den senare.</p>
+          progress: "%{progress} % uppladdat..."
+          success: "Filen laddades upp. Du kommer att aviseras via meddelande när processen är klar."
           error: "Tyvärr bör filen vara i CSV-format."
-          confirmation_message: "Du är på väg att e-posta inbjudningar till alla personer i den uppladdade filen."
       password:
         title: "Lösenord"
         too_short: "Ditt lösenord är för kort."
@@ -1378,6 +1495,8 @@ sv:
       avatar:
         title: "Profilbild"
         header_title: "profil, meddelanden, bokmärken och inställningar"
+        name_and_description: "%{name} - %{description}"
+        edit: "Redigera profilbild"
       title:
         title: "Titel"
         none: "(ingen)"
@@ -1415,7 +1534,7 @@ sv:
       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?"
+    assets_changed_confirm: "Programvaran på denna webbplats uppgraderades precis. Vill du installera den senaste versionen nu?"
     logout: "Du loggades ut."
     refresh: "Uppdatera"
     home: "Hem"
@@ -1435,15 +1554,6 @@ sv:
       exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# fel/timma} other {# fel/timma}}</a> har överskridit webbplatsinställningarnas gräns som är {limit, plural, one {# fel/timma} other {# fel/timma}}."
       exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# fel/minut} other {# fel/minut}}</a> har överskridit webbplatsinställningarnas gräns som är {limit, plural, one {# fel/minut} other {# fel/minut}}."
     learn_more: "lär dig mer..."
-    all_time: "totalt"
-    all_time_desc: "totalt antal ämnen skapade"
-    year: "år"
-    year_desc: "ämnen skapade de senaste 365 dagarna"
-    month: "månad"
-    month_desc: "ämnen skapade de senaste 30 dagarna"
-    week: "vecka"
-    week_desc: "ämnen skapade de senaste 7 dagarna"
-    day: "dag"
     first_post: Första inlägget
     mute: Tysta
     unmute: Avtysta
@@ -1461,13 +1571,15 @@ sv:
       sign_up: "Registrera"
       hide_session: "Påminn mig imorgon"
       hide_forever: "nej tack"
-      hidden_for_session: "Ok, jag frågar dig imorgon. Du kan alltid använda 'Logga in' för att skapa ett konto, också."
+      hidden_for_session: "Ok, vi frågar dig imorgon. Du kan alltid använda 'Logga in' för att skapa ett konto, också."
       intro: "Hejsan! Det verkar som du gillar diskussionen, men du har ännu inte registrerat dig för ett konto."
       value_prop: "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:
+        one: "Det finns <b>%{count}</b> svar."
+        other: "Det finns <b>%{count}</b> svar."
+      description_time_MF: "Det {replyCount, plural, one {finns <b>#</b> svar} other {finns <b>#</b> svar}} med en uppskattad lästid på <b>{readingTime, plural, one {# minut} other {# minuter}}</b>."
       enable: "Sammanfatta detta ämne"
       disable: "Visa alla inlägg"
     deleted_filter:
@@ -1492,8 +1604,10 @@ sv:
     trust_level: "Förtroendenivå"
     search_hint: "användarnamn, e-post eller IP-adress"
     create_account:
+      header_title: "Välkommen!"
+      subheader_title: "Låt oss skapa ditt konto"
       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"
+      title: "Skapa ditt konto"
       failed: "Något gick fel, kanske är denna e-postadress redan registrerad, prova länken Glömt lösenord"
     forgot_password:
       title: "Beställ nytt lösenord"
@@ -1512,6 +1626,7 @@ sv:
     email_login:
       link_label: "E-posta mig en inloggningslänk"
       button_label: "per e-post"
+      login_link: "Hoppa över lösenordet; skicka en inloggningslänk till mig per e-post"
       emoji: "lås emoji"
       complete_username: "Om ett konto matchar användarnamnet <b>%{username}</b>, bör du snart få ett e-postmeddelande med en inloggningslänk."
       complete_email: "Om ett konto matchar <b>%{email}</b>, bör du snart få ett e-postmeddelande med en inloggningslänk."
@@ -1523,6 +1638,8 @@ sv:
       logging_in_as: Loggar in som %{email}
       confirm_button: Avsluta inloggning
     login:
+      header_title: "Välkommen tillbaka"
+      subheader_title: "Logga in till ditt konto"
       title: "Logga in"
       username: "Användare"
       password: "Lösenord"
@@ -1538,7 +1655,7 @@ sv:
       security_key_not_allowed_error: "Processen för autentiseringssäkerhetsnyckel dröjde antingen för länge eller avbröts."
       security_key_no_matching_credential_error: "Inga matchande referenser kunde hittas i den medföljande säkerhetsnyckeln."
       security_key_support_missing_error: "Din nuvarande enhet eller webbläsare stöder inte användning av säkerhetsnycklar. Använd en annan metod."
-      email_placeholder: "e-post eller användarnamn"
+      email_placeholder: "E-postadress/användarnamn"
       caps_lock_warning: "Skiftlås är aktiverat"
       error: "Okänt fel"
       cookies_error: "Din webbläsare verkar ha cookies inaktiverade. Du kanske inte kan logga in utan att aktivera dem först."
@@ -1605,7 +1722,6 @@ sv:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (tidigare EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1634,6 +1750,8 @@ sv:
         one: "+ %{count} underkategori"
         other: "+ %{count} underkategorier"
     select_kit:
+      filter_by: "Filtrera efter: %{name}"
+      select_to_filter: "Välj ett värde att filtrera"
       default_header_text: Välj...
       no_content: Inga matchningar hittades
       filter_placeholder: Sök...
@@ -1649,13 +1767,13 @@ sv:
         one: "Valet måste innehålla minst %{count} tecken."
         other: "Valet måste innehålla minst %{count} tecken."
       components:
+        tag_drop:
+          filter_for_more: Filtrera för fler...
         categories_admin_dropdown:
           title: "Hantera kategorier"
     date_time_picker:
       from: Från
       to: Till
-      errors:
-        to_before_from: "Till datum måste vara senare än Från datum."
     emoji_picker:
       filter_placeholder: Sök efter emoji
       smileys_&_emotion: Smileys och känslor
@@ -1677,7 +1795,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 endast synligt för de som kan publicera delade utkast."
       destination_category: "Målkategori"
       publish: "Publicera delat utkast"
       confirm_publish: "Är du säker på att du vill publicera detta utkast?"
@@ -1688,7 +1806,6 @@ sv:
       options: "Alternativ"
       whisper: "viska"
       unlist: "avlistad"
-      blockquote_text: "Citat"
       add_warning: "Det här är en officiell varning."
       toggle_whisper: "Växla viskning"
       toggle_unlisted: "Växla olistad"
@@ -1710,10 +1827,16 @@ sv:
       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:
+          one: "Rubriken måste innehålla minst %{count} tecken"
+          other: "Rubriken måste innehålla minst %{count} tecken"
+        title_too_long:
+          one: "Rubriken får inte vara längre än %{count} tecken"
+          other: "Rubriken får inte vara längre än %{count} tecken"
         post_missing: "Inlägg får inte vara tomt"
-        post_length: "Inlägg måste vara minst %{min} tecken långa."
+        post_length:
+          one: "Inlägget måste innehålla minst %{count} tecken"
+          other: "Inlägget måste innehålla minst %{count} tecken"
         try_like: "Har du provat %{heart}-knappen?"
         category_missing: "Du måste välja en kategori"
         tags_missing:
@@ -1746,8 +1869,8 @@ sv:
       saved: "Sparat!"
       saved_draft: "Utkast för inlägg pågår. Klicka för att fortsätta."
       uploading: "Laddar upp..."
-      show_preview: "visa förhandsgranskning &raquo;"
-      hide_preview: "&laquo; dölj förhandsgranskning"
+      show_preview: "visa förhandsgranskning"
+      hide_preview: "dölj förhandsgranskning"
       quote_post_title: "Citera hela inlägget"
       bold_label: "B"
       bold_title: "Fet"
@@ -1760,8 +1883,8 @@ sv:
       link_dialog_title: "Infoga hyperlänk"
       link_optional_text: "valfri rubrik"
       link_url_placeholder: "Klistra in en URL eller skriv för att söka ämnen"
-      quote_title: "Citat"
-      quote_text: "Citat"
+      blockquote_title: "Citat"
+      blockquote_text: "Citat"
       code_title: "Förformatterad text"
       code_text: "indentera förformatterad text med 4 mellanslag"
       paste_code_text: "skriv eller klistra in din kod här"
@@ -1786,7 +1909,7 @@ sv:
         title: "Glömde du lägga till mottagare?"
         body: "Just nu skickas det här meddelandet bara till dig själv!"
       slow_mode:
-        error: "Detta ämne är i långsamt läge. För att främja eftertänksam, genomtänkt diskussion får du bara publicera en gång var %{duration}."
+        error: "Detta ämne är i långsamt läge. Du publicerade nyligen, och kan publicera igen om %{timeLeft}."
       admin_options_title: "Valfria personalinställningar för detta ämne"
       composer_actions:
         reply: Svara
@@ -1815,7 +1938,7 @@ sv:
           label: "Nytt ämne"
         shared_draft:
           label: "Delat utkast"
-          desc: "Utarbeta ett ämne som endast är synligt för personalen"
+          desc: "Skapa ett utkast av ett ämne vilket enbart kommer vara synligt för tillåtna användare"
         toggle_topic_bump:
           label: "Växla ämnesknuff"
           desc: "Svara utan att ändra senaste svarsdatum"
@@ -1915,14 +2038,15 @@ 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"
       local_tip: "välj bilder från din enhet"
-      local_tip_with_attachments: "välj bilder eller filer från din enhet %{authorized_extensions}"
-      hint: "(du kan också dra och släppa i redigeraren för att ladda upp dem)"
+      local_tip_with_attachments: "välj bilder eller filer från din enhet"
+      hint: "(du kan också dra och släppa i redigeraren för att ladda upp)"
       hint_for_supported_browsers: "du kan också dra och släppa eller klistra in bilder i redigeraren"
       uploading: "Laddar upp"
       select_file: "Välj fil"
       default_image_alt_text: bild
+      supported_formats: "format som stöds"
     search:
       sort_by: "Sortera efter"
       relevance: "Relevans"
@@ -1948,6 +2072,7 @@ sv:
       or_search_google: "Eller försök söka med Google istället:"
       search_google: "Försök söka med Google istället:"
       search_google_button: "Google"
+      search_button: "Sök"
       context:
         user: "Sök inlägg av @%{username}"
         category: "Sök kategorin #%{category}"
@@ -2013,7 +2138,7 @@ sv:
     go_back: "gå tillbaka"
     not_logged_in_user: "användarsida med sammanställning av aktuell aktivitet och inställningar"
     current_user: "gå till din användarsida"
-    view_all: "visa alla"
+    view_all: "visa alla %{tab}"
     topics:
       new_messages_marker: "senaste besök"
       bulk:
@@ -2034,7 +2159,9 @@ sv:
         change_category: "Sätt kategori"
         close_topics: "Stäng ämnen"
         archive_topics: "Arkivera ämnen"
+        move_messages_to_inbox: "Flytta till inkorgen"
         notification_level: "Aviseringar"
+        change_notification_level: "Ändra aviseringsnivå"
         choose_new_category: "Välj den nya kategorin för ämnena:"
         selected:
           one: "Du har markerat <b>%{count}</b> ämne."
@@ -2044,7 +2171,10 @@ sv:
         choose_new_tags: "Välj nya taggar för de här ämnena:"
         choose_append_tags: "Välj nya taggar att lägga till för dessa ämnen:"
         changed_tags: "Taggarna för de här ämnena ändrades."
-        remove_tags: "Ta bort taggar"
+        remove_tags: "Ta bort alla taggar"
+        confirm_remove_tags:
+          one: "Alla taggar tas bort från det här ämnet. Är du säker?"
+          other: "Alla taggar tas bort från <b>%{count}</b> ämnen. Är du säker?"
         progress:
           one: "Förlopp: <strong>%{count}</strong> ämne"
           other: "Förlopp: <strong>%{count}</strong> ämnen"
@@ -2060,7 +2190,7 @@ sv:
         top: "Det finns inga toppämnen."
         educate:
           new: '<p>Dina nya ämnen hamnar här. 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;"></span>-indikator om de skapades de senaste 2 dagarna.</p><p>Gå till dina <a href="%{userPrefsUrl}">användarinställningar</a> för att ändra detta.</p>'
-          unread: '<p>Dina olästa ämnen hamnar här.</p><p>Standard är att inlägg anses olästa och kommer att visa antal olästa inlägg <span class="badge new-posts badge-notification">1</span> om du:</p><ul><li>Skapade ämnet</li><li>Svarade på ämnet</li><li>Läste ämnet i mer än 4 minuter</li></ul><p>Eller om du uttryckligen har markerat ämnet som Följt eller Bevakat via aviseringspanelen längst ned i varje ämne.</p><p>Gå till dina <a href="%{userPrefsUrl}">användarinställningar</a> för att ändra detta.</p>'
+          unread: "<p>Dina olästa ämnen visas här.</p><p>Som standard betraktas ämnen som olästa och visar olästa antal <span class=\"badge new-posts badge-notification\">1</span> om du:</p><ul><li>Skapade ämnet</li><li>Svarade på ämnet</li><li>Läste ämnet i mer än 4 minuter</li></ul><p>Eller om du uttryckligen har ställt in ämnet till Följer eller Bevakat via \U0001F514 i varje ämne.</p><p>Gå till dina <a href=\"%{userPrefsUrl}\">preferenser</a> för att ändra detta.</p>"
       bottom:
         latest: "Det finns inga fler senaste ämnen."
         posted: "Det finns inga fler postade ämnen."
@@ -2137,7 +2267,7 @@ sv:
       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}."
       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 {}}"
+      read_more_MF: "Det finns { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'># 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'># 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
       browse_all_tags: Bläddra bland alla taggar
@@ -2151,19 +2281,25 @@ sv:
         select: "Användare får bara publicera i detta ämne en gång varje:"
         description: "För att främja tankeväckande diskussioner i snabba eller omtvistade diskussioner måste användarna vänta innan de publicerar i det här ämnet igen."
         save: "Aktivera"
+        enabled_until: "Aktiverat till:"
         remove: "Inaktivera"
         hours: "Timmar:"
         minutes: "Minuter:"
         seconds: "Sekunder:"
         durations:
+          10_minutes: "10 minuter"
           15_minutes: "15 minuter"
+          30_minutes: "30 minuter"
+          45_minutes: "45 minuter"
           1_hour: "1 timme"
+          2_hours: "2 timmar"
           4_hours: "4 timmar"
-          1_day: "1 dag"
-          1_week: "1 vecka"
+          8_hours: "8 timmar"
+          12_hours: "12 timmar"
+          24_hours: "24 timmar"
           custom: "Anpassad varaktighet"
       slow_mode_notice:
-        duration: "Du måste vänta %{duration} mellan inläggen i det här ämnet"
+        duration: "Vi ber dig vänta %{duration} mellan inläggen i det här ämnet"
       topic_status_update:
         title: "Ämnestidtagning"
         save: "Ställ in timer"
@@ -2172,7 +2308,9 @@ sv:
         remove: "Ta bort timer:"
         publish_to: "Publicera till:"
         when: "När:"
-        time_frame_required: Välj en tidsram
+        time_frame_required: "Välj en tidsram"
+        min_duration: "Varaktigheten måste vara större än 0"
+        max_duration: "Varaktigheten måste vara kortare än 20 år"
       auto_update_input:
         none: "Välj en tidsram"
         now: "Nu"
@@ -2201,9 +2339,11 @@ sv:
         title: "Stäng tillfälligt"
       auto_close:
         title: "Stäng ämne automatiskt"
-        label: "Tid för att automatiskt stänga ämne:"
+        label: "Stäng automatiskt ämne efter:"
         error: "Ange ett giltigt värde."
         based_on_last_post: "Stäng inte förrän det sista inlägget i ämnet är åtminstone så här gammalt."
+      auto_close_after_last_post:
+        title: "Stäng ämnet automatiskt efter sista inlägget"
       auto_delete:
         title: "Radera ämne automatiskt:"
       auto_bump:
@@ -2216,7 +2356,7 @@ sv:
         auto_open: "Detta ämne kommer att öppnas automatiskt om %{timeLeft}."
         auto_close: "Det här ämnet kommer att stängas automatiskt om %{timeLeft}."
         auto_publish_to_category: "Detta ämne kommer att publiceras till <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Detta ämne stängs %{duration} efter sista svaret."
+        auto_close_after_last_post: "Detta ämne stängs %{duration} efter sista svaret."
         auto_delete: "Det här ämnet kommer att raderas automatiskt om %{timeLeft}."
         auto_bump: "Det här ämnet kommer att knuffas automatiskt %{timeLeft}."
         auto_reminder: "Du kommer att påminnas om detta ämne om %{timeLeft}."
@@ -2225,6 +2365,9 @@ sv:
       auto_close_immediate:
         one: "Senaste inlägget i det här ämnet är redan %{count} timme gammalt, så ämnet kommer att stängas omedelbart. "
         other: "Senaste inlägget i det här ämnet är redan %{count} timmar gammal, så ämnet kommer att stängas omedelbart. "
+      auto_close_momentarily:
+        one: "Senaste inlägget i det här ämnet är redan %{count} timme gammalt, så ämnet kommer att stängas för tillfället."
+        other: "Senaste inlägget i det här ämnet är redan %{count} timmar gammalt, så ämnet kommer att stängas för tillfället."
       timeline:
         back: "Tillbaka"
         back_description: "Gå tillbaka till ditt senaste olästa inlägg"
@@ -2236,7 +2379,9 @@ sv:
         go: "gå"
         jump_bottom: "hoppa till sista inlägget"
         jump_prompt: "hoppa till..."
-        jump_prompt_of: "av %{count} inlägg"
+        jump_prompt_of:
+          one: "av %{count} inlägg"
+          other: "av %{count} inlägg"
         jump_prompt_long: "Hoppa till..."
         jump_bottom_with_number: "hoppa till inlägg %{post_number}"
         jump_prompt_to_date: "till datum"
@@ -2248,12 +2393,15 @@ sv:
         reasons:
           mailing_list_mode: "Du har utskicksläge aktiverat, så du kommer aviseras om inlägg till det här ämnet via e-post."
           "3_10": "Du kommer att ta emot aviseringar eftersom du bevakar en tagg i det här ämnet."
+          "3_10_stale": "Du får aviseringar eftersom du har bevakat en tagg om det här ämnet tidigare."
           "3_6": "Du kommer att få aviseringar eftersom du bevakar denna kategori."
+          "3_6_stale": "Du kommer att få aviseringar eftersom du har bevakat denna kategori tidigare."
           "3_5": "Du kommer att få aviseringar eftersom du automatiskt började följa det här ämnet."
           "3_2": "Du kommer att få aviseringar eftersom du bevakar detta ämne."
           "3_1": "Du kommer att få aviseringar eftersom du skapade detta ämne."
           "3": "Du kommer att få aviseringar eftersom du bevakar detta ämne."
           "2_8": "Du kommer att se en räknare för nya svar eftersom du följer denna kategorin."
+          "2_8_stale": "Du kommer att se en räknare för nya svar eftersom du har följt denna kategori tidigare."
           "2_4": "Du kommer att se en räknare för nya svar eftersom du postat ett svar i detta ämne."
           "2_2": "Du kommer att se en räknare för nya svar eftersom du följer detta ämne."
           "2": 'Du kommer att se en räknare för nya svar eftersom du <a href="%{basePath}/u/%{username}/preferences/notifications">läser detta ämne</a>.'
@@ -2321,6 +2469,15 @@ sv:
         title: "Dela"
         extended_title: "Dela en länk"
         help: "dela en länk till detta ämne"
+        instructions: "Dela en länk till detta ämne:"
+        copied: "Ämneslänken har kopierats."
+        notify_users:
+          title: "Avisera"
+          instructions: "Avisera följande användare om det här ämnet:"
+          success:
+            one: "Aviserade %{username} om det här ämnet."
+            other: "Aviserade alla användare om det här ämnet."
+        invite_users: "Bjud in"
       print:
         title: "Skriv ut"
         help: "Öppna en utskriftsvänlig version av det här ämnet"
@@ -2376,14 +2533,14 @@ sv:
         username_placeholder: "användarnamn"
         action: "Skicka inbjudan"
         help: "bjud in andra till detta ämne via e-post eller aviseringar"
-        to_forum: "Vi skickar ett kort e-postmeddelande så att din vän omedelbart kan delta genom att klicka på en länk. Ingen inloggning krävs."
-        sso_enabled: "Ange användarnamnet för personen som du vill bjuda in till detta ämne."
+        to_forum: "Vi skickar ett kort e-postmeddelande så att din vän omedelbart kan delta genom att klicka på en länk."
+        discourse_connect_enabled: "Ange användarnamnet för personen som du vill bjuda in till detta ämne."
         to_topic_blank: "Ange användarnamnet eller e-postadressen för personen som du vill bjuda in till detta ämne."
         to_topic_email: "Du har angett en e-postadress. Vi skickar en inbjudan som ger din vän möjlighet att svara på detta ämne direkt."
         to_topic_username: "Du har angett ett användarnamn. Vi skickar en avisering 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 avisering 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 har lösts in. Kolla inbjudningsfliken på din användarsida för att hålla koll på dina inbjudningar."
+        success_email: "Vi skickade en inbjudan till <b>%{invitee}</b>. Vi meddelar dig när inbjudan har lösts in. Kolla inbjudningsfliken på din användarsida för att hålla reda på dina inbjudningar."
         success_username: "Vi har bjudit in användaren till att delta i detta ämne."
         error: "Tyvärr kunde vi inte bjuda in den personen. Kanske har personen redan blivit inbjuden? (inbjudningar är begränsade)"
         success_existing_email: "Det finns redan en användare med e-postadressen <b>%{emailOrUsername}</b>. Vi kommer att bjuda in denna person till att delta i detta ämne."
@@ -2497,8 +2654,8 @@ sv:
       edit_reason: "Anledning: "
       post_number: "inlägg %{number}"
       ignored: "Ignorerat innehåll"
-      wiki_last_edited_on: "wiki senast redigerad den"
-      last_edited_on: "inlägg senast ändrat den"
+      wiki_last_edited_on: "wiki redigerades senast den %{dateTime}"
+      last_edited_on: "inlägget redigerades senast den %{dateTime}"
       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}:"
@@ -2521,6 +2678,7 @@ sv:
       has_replies:
         one: "%{count} svar"
         other: "%{count} svar"
+      has_replies_count: "%{count}"
       unknown_user: "(okänd/raderad användare)"
       has_likes_title:
         one: "%{count} person gillade detta inlägg"
@@ -2529,6 +2687,14 @@ sv:
       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"
+      filtered_replies_hint:
+        one: "Visa detta inlägg och dess svar"
+        other: "Visa detta inlägg och dess %{count} svar"
+      filtered_replies_viewing:
+        one: "Visar %{count} svar på"
+        other: "Visar %{count} svar på"
+      in_reply_to: "Ladda överordnat inlägg"
+      view_all_posts: "Visa alla inlägg"
       errors:
         create: "Tyvärr uppstod det ett fel under skapandet av ditt inlägg. Vi ber dig försöka igen."
         edit: "Tyvärr uppstod det ett fel under ändringen av ditt inlägg. Vi ber dig försöka igen."
@@ -2542,17 +2708,11 @@ sv:
         image_upload_not_allowed_for_new_user: "Tyvärr kan nya användare inte ladda upp bilder."
         attachment_upload_not_allowed_for_new_user: "Tyvärr kan nya användare inte bifoga filer."
         attachment_download_requires_login: "Tyvärr måste du vara inloggad för att kunna ladda ned bifogade filer."
-      abandon_edit:
-        confirm: "Är du säker på att du vill ångra dina ändringar?"
-        no_value: "Nej, behåll"
-        no_save_draft: "Nej, spara utkast"
-        yes_value: "Ja, kasta ändringar"
-      abandon:
-        title: "Överge utkast"
-        confirm: "Är du säker på att du vill avbryta ditt inlägg?"
-        no_value: "Nej, behåll"
-        no_save_draft: "Nej, spara utkast"
-        yes_value: "Ja, överge"
+      cancel_composer:
+        confirm: "Vad vill du göra med ditt inlägg?"
+        discard: "Förkasta"
+        save_draft: "Spara utkast till senare"
+        keep_editing: "Fortsätt redigera"
       via_email: "det här inlägget har gjorts via e-post"
       via_auto_generated_email: "det här inlägget kom i ett autogenererat e-postmeddelande"
       whisper: "det här inlägget är en privat viskning för moderatorer"
@@ -2600,7 +2760,9 @@ sv:
         unlock_post_description: "tillåt att postaren redigerar inlägget"
         delete_topic_disallowed_modal: "Du har inte behörighet att radera detta ämne. Om du verkligen vill radera det, skapa en flagga för att uppmärksamma moderatorn tillsammans med orsak."
         delete_topic_disallowed: "du har inte behörighet att radera detta ämne"
-        delete_topic_confirm_modal: "Detta ämne har för närvarande över %{minViews} visningar och kan vara ett populärt sökmål. Är du säker på att du vill ta bort det här ämnet helt, istället för att redigera det för att förbättra det?"
+        delete_topic_confirm_modal:
+          one: "Detta ämne har för närvarande över %{count} visning och kan vara ett populärt sökmål. Är du säker på att du vill ta bort det här ämnet helt, istället för att redigera det för att förbättra det?"
+          other: "Detta ämne har för närvarande över %{count} visningar och kan vara ett populärt sökmål. Är du säker på att du vill ta bort det här ämnet helt, istället för att redigera det för att förbättra det?"
         delete_topic_confirm_modal_yes: "Ja, ta bort det här ämnet"
         delete_topic_confirm_modal_no: "Nej, behåll detta ämne"
         delete_topic_error: "Ett fel inträffade när det här ämnet togs bort"
@@ -2609,6 +2771,7 @@ sv:
         change_post_notice: "Ändra personalnotering"
         delete_post_notice: "Radera personalnotering"
         remove_timer: "Ta bort tidtagning"
+        edit_timer: "redigera timer"
       actions:
         people:
           like:
@@ -2685,6 +2848,18 @@ sv:
           edit_bookmark:
             name: "Redigera bokmärke"
             description: "Redigera bokmärkets namn eller ändra påminnelsens datum och tid."
+          pin_bookmark:
+            name: "Fäst bokmärke"
+            description: "Fäst bokmärket. Detta gör att det visas högst upp i din bokmärkeslista."
+          unpin_bookmark:
+            name: "Ta ned bokmärke"
+            description: "Ta ned bokmärket. Det kommer inte längre att visas högst upp i din bokmärkeslista."
+      filtered_replies:
+        viewing_posts_by: "Visar %{post_count} inlägg av"
+        viewing_subset: "Vissa svar har förminskats"
+        viewing_summary: "Visar en sammanfattning av detta ämne"
+        post_number: "%{username}, inlägg nr %{post_number}"
+        show_all: "Visa alla"
     category:
       can: "can&hellip; "
       none: "(ingen kategori)"
@@ -2742,10 +2917,10 @@ sv:
         reply: "Svara"
         create: "Skapa"
         no_groups_selected: "Inga grupper har beviljats åtkomst; denna kategori kommer endast att vara synlig för personalen."
-        everyone_has_access: "Denna kategori är offentlig och alla kan se, besvara och skapa inlägg. Om du vill begränsa behörigheterna tar du bort en eller flera av de behörigheter som tilldelats till gruppen ”alla”."
+        everyone_has_access: 'Denna kategori är offentlig och alla kan se, besvara och skapa inlägg. Om du vill begränsa behörigheterna tar du bort en eller flera av de behörigheter som tilldelats till gruppen ”alla”.'
         toggle_reply: "Slå på/av behörighet att svara"
         toggle_full: "Slå på/av behörighet att skapa"
-        inherited: "Denna behörighet ärvs från \"alla\""
+        inherited: 'Denna behörighet ärvs från "alla"'
       special_warning: "Varning: Den här kategorin är en förutbestämd kategori och säkerhetsinställningarna kan inte ändras. Om du inte vill använda kategorin tar du bort den istället för att återanvända den."
       uncategorized_security_warning: "Denna kategori är speciell. Den är avsedd för att innehålla ämnen som saknar kategori. Den kan inte ha säkerhetsinställningar."
       uncategorized_general_warning: 'Denna kategori är speciell. Den används som standardkategori för nya ämnen som inte har en vald kategori. Om du vill förhindra detta beteende och tvinga val av kategori <a href="%{settingLink}">inaktiverar du inställningen här</a>. Om du vill ändra namn eller beskrivning går du till <a href="%{customizeLink}">Anpassa / Textinnehåll</a>.'
@@ -2761,6 +2936,7 @@ sv:
       num_featured_topics: "Antal ämnen som visas på sidan kategorier:"
       subcategory_num_featured_topics: "Antalet föredragna ämnen på överordnad kategorisida:"
       all_topics_wiki: "Gör nya ämnen till wikis som standard"
+      allow_unlimited_owner_edits_on_first_post: "Tillåt obegränsat antal ägarredigeringar av första inlägget"
       subcategory_list_style: "Liststil på underkategori:"
       sort_order: "Sortera ämneslista enligt:"
       default_view: "Förvald ämneslista"
@@ -2784,19 +2960,19 @@ sv:
       notifications:
         watching:
           title: "Bevakar"
-          description: "Du kommer automatiskt att bevaka alla ämnen i de här kategorierna. Du aviseras om varje nytt inlägg i alla ämnen, och det visas en räknare över antalet nya inlägg."
+          description: "Du kommer automatiskt att bevaka alla ämnen i den här kategorin. Du aviseras om varje nytt inlägg i alla ämnen, och det visas en räknare över antalet nya svar."
         watching_first_post:
           title: "Bevakar första inlägget"
           description: "Du kommer att aviseras vid nya ämnen för denna kategori, men inte svar på ämnen."
         tracking:
           title: "Följer"
-          description: "Du kommer automatiskt att följa alla ämnen i de här kategorierna. Du aviseras om någon nämner ditt @namn eller svarar på ditt inlägg, och det visas en räknare över antalet nya inlägg."
+          description: "Du kommer automatiskt att följa alla ämnen i den här kategorin. Du aviseras om någon nämner ditt @namn eller svarar på ditt inlägg, och det visas en räknare över antalet nya svar."
         regular:
           title: "Normal"
           description: "Du aviseras om någon nämner ditt @namn eller svarar på ditt inlägg."
         muted:
           title: "Tystad"
-          description: "Du kommer aldrig att aviseras om något som rör nya ämnen i de här kategorierna och de kommer inte att dyka upp i senaste."
+          description: "Du kommer aldrig att aviseras om något som rör nya ämnen i den här kategorin och de kommer inte att dyka upp i senaste."
       search_priority:
         label: "Sökprioritering"
         options:
@@ -2831,6 +3007,7 @@ sv:
       list_filters:
         all: "alla ämnen"
         none: "inga underkategorier"
+      colors_disabled: "Du kan inte välja färger eftersom du inte har någon kategoristil."
     flagging:
       title: "Tack för att du hjälper till att hålla forumet civiliserat!"
       action: "Flagga inlägg"
@@ -2848,7 +3025,8 @@ sv:
       notify_action: "Meddelande"
       official_warning: "Officiell varning"
       delete_spammer: "Radera skräppostare"
-      delete_confirm_MF: "Du håller på att radera {POSTS, plural, one {<b>1</b> inlägg} other {<b>#</b> inlägg}} och {TOPICS, plural, one {<b>1</b> ämne} other {<b>#</b> ämnen}} från den här användaren, ta bort användarens konto, blockera registreringar från användarens IP-adress <b>{ip_address}</b>, och lägga till användarens e-postadress <b>{email}</b> till en permanent blockeringslista. Är du säker på att den här användaren verkligen är en skräppostare?"
+      flag_for_review: "Sätt i kö för granskning"
+      delete_confirm_MF: "Du håller på att radera {POSTS, plural, one {<b>#</b> inlägg} other {<b>#</b> inlägg}} och {TOPICS, plural, one {<b>#</b> ämne} other {<b>#</b> ämnen}} från den här användaren, ta bort användarens konto, blockera registreringar från användarens IP-adress <b>{ip_address}</b>, och lägga till användarens e-postadress <b>{email}</b> till en permanent blockeringslista. Är du säker på att den här användaren verkligen är en skräppostare?"
       yes_delete_spammer: "Ja, radera skräppostare"
       ip_address_missing: "(---)"
       hidden_email_address: "(dold)"
@@ -2916,11 +3094,11 @@ sv:
         help: "Detta ämne är ett personligt meddelande"
     posts: "Inlägg"
     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}
-      med {med ett väldigt högt förhållande mellan gillningar och inlägg}
-      high {med ett extremt högt förhållande mellan gillningar och inlägg}
-      other {}}
+      Detta ämne har {count, plural, one {# svar} other {# svar}} {ratio, select,
+        low {med ett högt förhållande mellan gillningar/inlägg}
+        med {med ett mycket högt förhållande mellan gillningar/inlägg}
+        high {med ett extremt högt förhållande mellan gillningar/inlägg}
+        other {}}
     original_post: "Originalinlägg"
     views: "Visningar"
     views_lowercase:
@@ -2940,7 +3118,7 @@ sv:
       one: "användare"
       other: "användare"
     category_title: "Kategori"
-    history: "Historik"
+    history: "Historik, senaste 100 versionerna"
     changed_by: "av %{author}"
     raw_email:
       title: "Inkommande e-post"
@@ -3028,6 +3206,7 @@ sv:
       close: "Stäng (Esc)"
       content_load_error: '<a href="%url%">Innehållet</a> kunde inte laddas.'
       image_load_error: '<a href="%url%">Bilden</a> kunde inte laddas.'
+    cannot_render_video: Den här videon kan inte renderas eftersom din webbläsare inte stöder denna kodek.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -3198,6 +3377,7 @@ sv:
         one: "%{tags} och %{count} till"
         other: "%{tags} och %{count} till"
       delete_no_unused_tags: "Det finns inga oanvända taggar."
+      tag_list_joiner: ", "
       delete_unused: "Radera oanvända taggar"
       delete_unused_description: "Radera alla taggar som inte är kopplade till något ämne eller personliga meddelanden"
       cancel_delete_unused: "Avbryt"
@@ -3238,6 +3418,7 @@ sv:
         everyone_can_use: "Taggar kan användas av alla"
         usable_only_by_groups: "Taggar är synliga för alla, men endast följande grupper kan använda dem"
         visible_only_to_groups: "Taggar är endast synliga för följande grupper"
+        cannot_save: "Kan inte spara taggrupp. Kontrollera att det finns minst en tagg tillgänglig, att taggruppsnamnet inte är tomt och att en grupp är markerad för taggbehörighet."
       topics:
         none:
           unread: "Du har inga olästa ämnen."
@@ -3250,10 +3431,11 @@ sv:
     invite:
       custom_message: "Gör din inbjudan lite personligare genom att skriva ett <a href>anpassat meddelande</a>."
       custom_message_placeholder: "Skriv ditt personliga meddelande"
-      approval_not_required: "Användaren godkänns automatiskt så snart han/hon godkänner denna inbjudan."
+      approval_not_required: "Användaren kommer automatiskt att godkännas så snart hon/han tackar ja till denna inbjudan."
       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."
+    forced_anonymous_login_required: "Webbplatsen är under extrem belastning och kan inte laddas just nu, försök igen om några minuter."
     footer_nav:
       back: "Tillbaka"
       forward: "Framåt"
@@ -3262,6 +3444,17 @@ sv:
     safe_mode:
       enabled: "Säkert läge är aktiverat och för att lämna säkert läge stänger du detta webbläsarfönster"
     image_removed: "(bild borttagen)"
+    do_not_disturb:
+      title: "Stör ej för..."
+      label: "Stör ej"
+      remaining: "%{remaining} kvar"
+      options:
+        half_hour: "30 minuter"
+        one_hour: "1 timme"
+        two_hours: "2 timmar"
+        tomorrow: "Tills imorgon"
+        custom: "Anpassad"
+      set_schedule: "Ange ett aviseringsschema"
   admin_js:
     type_to_filter: "skriv för att filtrera..."
     admin:
@@ -3289,6 +3482,10 @@ sv:
         installed_version: "Installerad"
         latest_version: "Senaste"
         problems_found: "Några förslag baserat på dina nuvarande webbplatsinställningar"
+        new_features:
+          title: "\U0001F381 Nya funktioner"
+          dismiss: "Avfärda"
+          learn_more: "Läs mer"
         last_checked: "Senast kollad"
         refresh_problems: "Uppdatera"
         no_problems: "Inga problem upptäcktes."
@@ -3377,10 +3574,6 @@ sv:
             available: "Gruppnamn är tillgängligt"
             not_available: "Gruppnamn är inte tillgängligt"
             blank: "Gruppnamn kan inte vara tomt"
-        bulk_add:
-          title: "Masstilläggning till grupp"
-          complete_users_not_added: "Dessa användare lades inte till (kontrollera att de har ett konto):"
-          paste: "Klistra in en lista med användarnamn eller e-postadresser, en per rad:"
         add_members:
           as_owner: "Ställ in användare som ägare av denna grupp"
         manage:
@@ -3407,7 +3600,9 @@ sv:
             effects: Effekter
             trust_levels_none: "Inga"
             automatic_membership_email_domains: "Användare som registrerar sig med en e-postadress vars domän exakt matchar en domän i den här listan kommer automatiskt att bli tillagda i den här gruppen:"
-            automatic_membership_user_count: "%{count} användarna har de nya e-postdomänerna och kommer att läggas till i gruppen."
+            automatic_membership_user_count:
+              one: "%{count} användare har de nya e-postdomänerna och kommer att läggas till i gruppen."
+              other: "%{count} användare 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"
@@ -3419,7 +3614,11 @@ sv:
         group_members: "Gruppmedlemmar"
         delete: "Radera"
         delete_confirm: "Ta bort den här gruppen?"
+        delete_with_messages_confirm:
+          one: "Om du raderar den här gruppen blir %{count} meddelande ägarlöst, och gruppmedlemmarna får inte längre tillgång till det.<br><br>Är du säker?"
+          other: "Om du raderar den här gruppen blir %{count} meddelanden ägarlösa, och gruppmedlemmarna får inte längre tillgång till dem.<br><br>Är du säker?"
         delete_failed: "Det går inte att ta bort grupp. Om det här är en automatisk grupp så kan den inte raderas."
+        delete_automatic_group: Detta är en automatisk grupp och kan inte raderas.
         delete_owner_confirm: "Vill du ta bort användarprivilegier för '%{username}'?"
         add: "Lägg till"
         custom: "Anpassad"
@@ -3481,9 +3680,13 @@ sv:
               wordpress: Nödvändigt för att WordPress-tillägget wp-discourse ska fungera.
             users:
               bookmarks: Lista användarbokmärken. Det returnerar bokmärkespåminnelser när ICS-formatet används.
-              sync_sso: Synkronisera en användare genom SSO.
+              sync_sso: Synkronisera en användare med DiscourseConnect.
               show: Erhåll information om en användare.
               check_emails: Lista användares e-post.
+              update: Uppdatera information om användarprofil.
+              log_out: Logga ut alla sessioner för en användare.
+              anonymize: Anonymisera användarkonton.
+              delete: Ta bort användarkonton.
             email:
               receive_emails: Kombinera detta omfång med e-postmottagaren för att bearbeta inkommande e-post.
       web_hooks:
@@ -3500,7 +3703,7 @@ sv:
         go_back: "Tillbaka till listan"
         payload_url: "Försändelse-URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Det verkar som du försöker sätta upp en webbkoppling till en lokal url. Händelser levererade till en lokal adress kan skapa sidoeffekter eller oväntade beteenden. Vill du fortsätta?"
+        warn_local_payload_url: "Det verkar som du försöker upprätta en webhook till en lokal URL. Händelser levererade till en lokal adress kan orsaka bieffekter eller oväntad funktion. Vill du fortsätta?"
         secret_invalid: "Hemligheten får inte ha några blanka tecken."
         secret_too_short: "Hemligheten bör vara minst 12 tecken."
         secret_placeholder: "En alternativ sträng som används för att generera signatur"
@@ -3528,7 +3731,7 @@ sv:
           details: "När det finns ett nytt, redigerat, borttaget eller återskapat svar."
         user_event:
           name: "Användarhändelse"
-          details: "När en användare loggar in, loggar ut, skapas, godkänns eller uppdateras."
+          details: "När en användare loggar in, loggar ut, bekräftar sin e-postadress, skapas, godkänns eller uppdateras."
         group_event:
           name: "Grupphändelse"
           details: "När en grupp skapas, uppdateras eller förstörs."
@@ -3547,6 +3750,12 @@ sv:
         user_badge_event:
           name: "Utmärkelsetilldelning"
           details: "När en användare får en utmärkelse."
+        group_user_event:
+          name: "Gruppanvändarhändelse"
+          details: "När en användare läggs till i, eller tas bort från, en grupp."
+        like_event:
+          name: "Gilla händelse"
+          details: "När en användare gillar ett inlägg."
         delivery_status:
           title: "Leveransstatus"
           inactive: "Inaktiv"
@@ -3735,7 +3944,9 @@ sv:
           convert: "Konvertera"
           convert_component_alert: "Är du säker på att du vill konvertera den här komponenten till temat? Den kommer att tas bort som en komponent från %{relatives}."
           convert_component_tooltip: "Konvertera den här komponenten till tema"
+          convert_component_alert_generic: "Är du säker på att du vill konvertera denna komponent till tema?"
           convert_theme_alert: "Är du säker på att du vill konvertera detta tema till komponent? Det kommer att tas bort som överordnat från %{relatives}."
+          convert_theme_alert_generic: "Är du säker på att du vill konvertera detta tema till komponent?"
           convert_theme_tooltip: "Konvertera detta tema till komponent"
           inactive_themes: "Inaktiva teman:"
           inactive_components: "Oanvända komponenter:"
@@ -3769,17 +3980,20 @@ sv:
           included_components: "Inkluderade komponenter"
           add_all: "Lägg till alla"
           import_web_tip: "Lagringsplats som innehåller tema"
+          direct_install_tip: "Är du säker på att du vill installera <strong>%{name}</strong> från lagringsplatsen nedan?"
           import_web_advanced: "Avancerat..."
           import_file_tip: ".tar.gz-, .zip- eller .dcstyle.json-fil innehåller tema"
           is_private: "Temat är i en privat git-lagringsplats"
           remote_branch: "Filialnamn (valfritt)"
           public_key: "Ge följande offentliga nyckel tillträde till lagringsplatsen:"
+          public_key_note: "När du har angett en giltig privat lagringsplats URL ovan genereras det en SSH-nyckel som visas här."
           install: "Installera"
           installed: "Installerad"
           install_popular: "Populära"
           install_upload: "Från din enhet"
           install_git_repo: "Från en git-lagringsplats"
           install_create: "Skapa ny"
+          duplicate_remote_theme: "Temakomponenten \"%{name}\" har redan installerats. Är du säker på att du vill installera ytterligare en kopia?"
           about_theme: "Om"
           license: "Licens"
           version: "Version:"
@@ -3809,6 +4023,7 @@ sv:
             one: "Temat ligger %{count} åtagande efter!"
             other: "Temat ligger %{count} åtaganden efter!"
           compare_commits: "(se nya åtaganden)"
+          remote_theme_edits: "Om du vill redigera detta tema måste du <a href='%{repoURL}' target='_blank'>skicka in en ändring av dess lagringsplats</a>"
           repo_unreachable: "Kunde inte kontakta Git-lagringsplatsen för detta tema. Felmeddelande:"
           imported_from_archive: "Detta tema importerades från en .zip-fil"
           scss:
@@ -3835,11 +4050,9 @@ sv:
 
               Exempel:
 
-              :root {
-              --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)
-              }
+              %{example}
 
-              Användning av prefix för egenskapsnamnen rekommenderas starkt för att undvika konflikter med tillägg och/eller grundläggande programvara.
+              Användning av prefix för egenskapsnamnen rekommenderas starkt för att undvika konflikter mellan tillägg och/eller grundläggande program.
           head_tag:
             text: "</head>"
             title: "HTML som kommer att sättas in före </head> taggen"
@@ -3849,6 +4062,8 @@ sv:
           yaml:
             text: "YAML"
             title: "Definiera temainställningar i YAML-format"
+          scss_color_variables_warning: "Användning av grundläggande programvaras SCSS-färgvariabler i teman har utfasats. Använd anpassade CSS-egenskaper i stället. Se <a href=\"https://meta.discourse.org/t/-/77551#color-variables-2\" target=\"_blank\">denna guide</a> för mer information."
+          scss_warning_inline: "Användning av grundläggande programvaras SCSS-färgvariabler i teman har utfasats."
         colors:
           select_base:
             title: "Välj grundfärgspalett"
@@ -4120,6 +4335,7 @@ sv:
             topic_unarchived: "ämnet inte arkiverat"
             post_staff_note_create: "lägg till personalnotering"
             post_staff_note_destroy: "ta bort personalnotering"
+            delete_group: "radera grupp"
         screened_emails:
           title: "Kontrollerade e-postadresser"
           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."
@@ -4167,31 +4383,34 @@ sv:
         title: "Bevakade ord"
         search: "sök"
         clear_filter: "Rensa"
-        show_words: "visa ord"
-        one_word_per_line: "Ett ord per rad"
+        show_words:
+          one: "visa %{count} ord"
+          other: "visa %{count} ord"
         download: Hämta
         clear_all: Rensa alla
-        clear_all_confirm_block: "Är du säker på att du vill rensa alla bevakade ord för blockeringshanteraren?"
-        clear_all_confirm_censor: "Är du säker på att du vill rensa alla bevakade ord för censurhanteraren?"
-        clear_all_confirm_flag: "Är du säker på att du vill rensa alla bevakade ord för åtgärden Flagga?"
-        clear_all_confirm_require_approval: "Är du säker på att du vill rensa alla bevakade ord för åtgärden Kräv godkännande?"
-        word_count:
-          one: "%{count} ord"
-          other: "%{count} ord"
+        clear_all_confirm: "Är du säker på att du vill rensa alla bevakade ord för åtgärden %{action}?"
         actions:
           block: "Blockera"
           censor: "Censur"
           require_approval: "Kräv godkännande"
           flag: "Flagga"
+          replace: "Ersätt"
+          tag: "Tagg"
         action_descriptions:
           block: "Förhindra att inlägg med dessa ord publiceras. Användaren kommer att se ett felmeddelande när de försöker skicka inlägget."
           censor: "Tillåt inlägg med dessa ord, men ersätt orden med tecken som döljer det censurerade orden."
           require_approval: "Inlägg som innehåller dessa ord kommer att behöva godkännande av personal innan de visas."
           flag: "Tillåt inlägg med dessa ord, men flagga orden som olämpliga så att moderatorer kan granska dem."
+          replace: "Ersätt ord i inlägg med andra ord eller länkar"
+          tag: "Tagga ämnen automatiskt baserat på första inlägget"
         form:
-          label: "Nytt ord:"
-          placeholder: "hela ordet eller * som jokertecken"
+          label: "Har ord eller fras"
+          placeholder: "Ange ord eller fras (* är ett jokertecken)"
           placeholder_regexp: "reguljärt uttryck"
+          replacement_label: "Ersättning"
+          replacement_placeholder: "exempel eller https://example.com"
+          tag_label: "Tagg"
+          tag_placeholder: "tag1,tag2,tag3"
           add: "Lägg till"
           success: "Lyckades"
           exists: "Finns redan"
@@ -4244,6 +4463,9 @@ sv:
         check_email:
           title: "Visa den här användarens e-postadress"
           text: "Visa"
+        check_sso:
+          title: "Visa SSO-nyttolast"
+          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}"
@@ -4284,7 +4506,7 @@ sv:
         clear_penalty_history:
           title: "Rensa straffhistorik"
           description: "användare med straff kan inte nå FN3"
-        delete_all_posts_confirm_MF: "Du håller på att radera {POSTS, plural, one {1 inlägg} other {# inlägg}} och {TOPICS, plural, one {1 ämne} other {# ämnen}}. Är du säker?"
+        delete_all_posts_confirm_MF: "Du håller på att radera {POSTS, plural, one {# inlägg} other {# inlägg}} och {TOPICS, plural, one {# ämne} other {# ämnen}}. Är du säker?"
         silence: "Tysta"
         unsilence: "Otysta"
         silenced: "Tystad?"
@@ -4333,6 +4555,9 @@ sv:
         anonymize_yes: "Ja, anonymisera detta konto"
         anonymize_failed: "Ett problem uppstod vid anonymiseringen av kontot"
         delete: "Radera användare"
+        delete_posts:
+          progress:
+            title: "Förlopp för radering av inlägg"
         merge:
           button: "Slå ihop"
           prompt:
@@ -4344,6 +4569,8 @@ sv:
             target_username_placeholder: "Användarnamn på den nya ägaren"
             transfer_and_delete: "Överför och radera @%{username}"
             cancel: "Avbryt"
+          progress:
+            title: "Sammanslagningsförlopp"
           confirmation:
             title: "Överför och radera @%{username}"
             description: |
@@ -4436,16 +4663,16 @@ sv:
           on_grace_period: "För närvarande i nådefrist för befordran, kommer inte degraderas."
           locked_will_not_be_promoted: "Förtroendenivå låst. Kommer aldrig bli befordrad."
           locked_will_not_be_demoted: "Förtroendenivå låst. Kommer aldrig att degraderas."
-        sso:
-          title: "Single sign on"
+        discourse_connect:
+          title: "DiscourseConnect Single Sign On"
           external_id: "Externt ID"
           external_username: "Användarnamn"
           external_name: "Namn"
-          external_email: "E-post"
-          external_avatar_url: "URL till profilbild"
+          external_email: "E-postadress"
+          external_avatar_url: "Profilbildens URL"
           last_payload: "Senaste nyttolast"
           delete_sso_record: "Ta bort SSO-post"
-          confirm_delete: "Är du säker på att du vill ta bort denna enstaka SSO-post (Single Sign-On)?"
+          confirm_delete: "Är du säker på att du vill radera denna DiscourseConnect-post?"
       user_fields:
         title: "Användarfält"
         help: "Lägg till fält som dina användare kan fylla i."
@@ -4476,6 +4703,10 @@ sv:
           title: "Ska visas på användarkort?"
           enabled: "visas på användarkort"
           disabled: "visas inte på användarkort"
+        searchable:
+          title: "Sökbart?"
+          enabled: "sökbart"
+          disabled: "inte sökbart"
         field_types:
           text: "Textfält"
           confirm: "Bekräftelse"
@@ -4490,6 +4721,8 @@ sv:
         go_back: "Tillbaka till sökningen"
         recommended: "Vi rekommenderar att du anpassar följande texter:"
         show_overriden: "Visa bara överskrivna"
+        locale: "Språk:"
+        fallback_locale_warning: "Du redigerar ett språk baserat på %{fallback}. Användare som väljer %{fallback} som sitt gränssnittsspråk kommer inte att se dina ändringar."
         more_than_50_results: "Det blev fler än 50 resultat. Förfina din sökning."
       settings:
         show_overriden: "Visa bara överskrivna"
@@ -4497,6 +4730,10 @@ sv:
         reset: "återställ"
         none: "ingen"
       site_settings:
+        emoji_list:
+          invalid_input: "Emoji-listan får endast innehålla giltiga emoji-namn, t.ex.: kramar"
+          add_emoji_button:
+            label: "Lägg till emoji"
         title: "Webbplatsinställningar"
         no_results: "Inga resultat hittades."
         more_than_30_results: "Det är fler än 30 resultat. Förfina din sökning eller välj en kategori."
@@ -4549,6 +4786,9 @@ sv:
           modal_no: "Nej, tillämpa enbart ändringar fr.o.m. nu"
         simple_list:
           add_item: "Lägg till objekt..."
+        json_schema:
+          edit: Öppna redigerare
+          modal_title: "Redigera %{name}"
       badges:
         title: Utmärkelser
         new_badge: Ny utmärkelse
@@ -4585,8 +4825,12 @@ sv:
         enabled: Aktivera utmärkelse
         icon: Ikon
         image: Bild
+        graphic: Grafik
         icon_help: "Ange ett FA-ikonnamn (använd prefix 'far-' för reguljära ikoner samt 'fab-' för varumärkesikoner)"
-        image_help: "Ange URL till bilden (ersätter ikonfältet om båda är angivna)"
+        image_help: "Uppladdning av en bild åsidosätter ikonfältet om båda är inställda."
+        select_an_icon: "Välj en ikon"
+        upload_an_image: "Ladda upp en bild"
+        read_only_setting_help: "Anpassa text"
         query: Utmärkelsesökning (SQL)
         target_posts: Sök målets inlägg
         auto_revoke: Kör återkallelsesökning dagligen
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 945d8ef2c4..719157f9be 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -141,6 +141,8 @@ sw:
         disabled: "aliondoa hili bango %{when}. Halitaonekana tena juu ya kila ukurasa."
     wizard_required: "Karibu Discourse! Tuanze na <a href='%{url}' data-auto-route='true'>the setup wizard</a> ✨"
     emails_are_disabled: "Utumaji wa barua pepe umezuiliwa na msimamizi. Hakuna taarifa za utumwaji wa barua pepe zitakazotumwa."
+    software_update_prompt:
+      dismiss: "Ondosha"
     bootstrap_mode_disabled: "Halitumizi ya Bootstrap itasitishwa baada ya masaa 24."
     themes:
       default_description: "Halisi"
@@ -214,8 +216,6 @@ sw:
       moderators: "Wasimamizi"
       stat:
         all_time: "Mda Wote"
-        last_7_days: "7 za Mwisho"
-        last_30_days: "30 za Mwisho"
       like_count: "Upendo"
       topic_count: "Mada"
       post_count: "Machapisho"
@@ -234,20 +234,13 @@ sw:
       remove: "Ondoa Alamisho"
       confirm_clear: "Una uhakika unataka kuondoa mialamisho ya mada hii?"
       save: "hifadhi"
+      auto_delete_preference:
+        never: "Kamwe"
       search: "Tafuta"
-      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"
       new_private_message: "Mswadajaribio wa ujumbe binafsi mpya"
-      abandon:
-        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}"
@@ -285,6 +278,7 @@ sw:
         total: "Jumla"
       delete: "Futa"
       settings:
+        saved: "Imehifadhiwa"
         save_changes: "Hifadhi Mabadiliko"
         title: "Mpangilio"
       moderation_history: "Historia ya Usimamizi"
@@ -294,9 +288,16 @@ sw:
         username: "Jina la mtumiaji"
         email: "Barua Pepe"
         name: "Jina"
+        reject_reason: "Sababu"
       topics:
         topic: "Mada"
         details: "maelezo"
+        unique_users:
+          one: "Mtumiaji mmoja"
+          other: "%{count} watumiaji"
+      replies:
+        one: "%{count} jibu"
+        other: "%{count} majibu"
       edit: "Hariri"
       save: "hifadhi"
       cancel: "Ghairi"
@@ -312,15 +313,30 @@ sw:
       statuses:
         pending:
           title: "subiria"
+        approved:
+          title: "Wamekubaliwa"
         rejected:
           title: "Imekataliwa"
       types:
         reviewable_user:
           title: "Mtumiaji"
+        reviewable_post:
+          title: "Ujumbe"
       approval:
         title: "Chapisho Linahitaji Kibali"
         description: "Tumepokea chapisho lako jipya, lakini linahitaji kupata kibali kutoka kwa kiongozi kabla ya kuonyeshwa. Tafadhali kuwa na subira."
         ok: "Sawa"
+      example_username: "jinalamtumiaji"
+    relative_time_picker:
+      days:
+        one: "siku"
+        other: "siku"
+    time_shortcut:
+      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"
     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>"
@@ -336,6 +352,7 @@ sw:
       sent_by_user: "Imetumwa na <a href='%{userUrl}'>%{mtumiaji}</a>"
       sent_by_you: "Imetumwa na <a href='%{userUrl}'>wewe</a>"
     directory:
+      username: "Jina la mtumiaji"
       filter_name: "chuja kwa jina la mtumiaji"
       title: "Watumiaji"
       likes_given: "Imetolewa"
@@ -383,9 +400,17 @@ sw:
           credentials:
             username: "Jina la mtumiaji"
             password: "Nywila"
+          settings:
+            title: "Mpangilio"
+          mailboxes:
+            disabled: "imezuiwa"
         membership:
           title: Uanachama
           access: Ufikivu
+        categories:
+          title: Vikundi
+        tags:
+          title: Lebo
         logs:
           title: "Batli"
           when: "Lini"
@@ -396,6 +421,8 @@ sw:
           details: "Maelezo"
           from: "Kutoka kwa"
           to: "Kwenda"
+      permissions:
+        title: "Vibali"
       public_admission: "ruhusu watumiaji wajiunge kwenye kikundi bure (kikundi kinabidi kionwe na umma)"
       public_exit: "ruhusu watumiaji waache kikundi bure"
       empty:
@@ -518,12 +545,14 @@ sw:
       posts: "Machapisho"
       topics: "Mada"
       latest: "Hivi Karibuni"
-      latest_by: "hivi karibuni na"
       toggle_ordering: "swichi udhibiti wa oda"
       subcategories: "Kategoria mtoto"
       topic_sentence:
         one: "%{count} topiki"
         other: "%{count} Topiki"
+      topic_stat_unit:
+        week: "wiki"
+        month: "mwezi"
     ip_lookup:
       title: Utafutaji wa Anwani ya Mtandao
       hostname: Hostname
@@ -564,7 +593,11 @@ sw:
         ignore_duration_save: "Puuzia"
         mute_option: "Imenyamazishwa"
         normal_option: "Kawaida"
+      notification_schedule:
+        none: "Hakuna"
+        to: "kwenda"
       activity_stream: "Shughuli"
+      read: "Soma"
       preferences: "Mapendekezo"
       feature_topic_on_profile:
         save: "hifadhi"
@@ -586,12 +619,14 @@ sw:
         perm_denied_expl: "Umekataza kibali cha taarifa. Ruhusu taarifa kupitia mipangilio ya kivinjari."
         disable: "Sitisha Taarifa"
         enable: "Ruhusu Taarifa"
-        each_browser_note: "Ilani: Unaweza kubadilisha mpangilio huu kwenye kila kivinjari utakachotumia."
         consent_prompt: "Je, unataka taarifa mubashara watu wakijibu kwenye posti zako?"
       dismiss: "Ondosha"
       dismiss_notifications: "Puuzia Zote"
       dismiss_notifications_tooltip: "Weka alama kuwa taarifa zote ambazo hazijasomwa kuwa zimesomwa"
       first_notification: "Umepata taarifa ya kwanza! Ichague kuanza."
+      color_schemes:
+        undo: "Anza Upya"
+        regular: "Kawaida"
       allow_private_messages: "Ruhusu watumiaji wengine wanitumie ujumbe binafsi"
       external_links_in_new_tab: "Fungua viungo vingine kwenye kichupo kingine"
       enable_quoting: "Ruhusu jibu nukulu kwenye neno lenye angaza"
@@ -604,6 +639,7 @@ sw:
       suspended_notice: "Akaunti imesitishwa mpaka %{tarehe}."
       suspended_permanently: "Mtumiaji amesitishwa."
       suspended_reason: "Sababu:"
+      github_profile: "GitHub"
       email_activity_summary: "Muhtasari wa Shughuli"
       mailing_list_mode:
         label: "Mfumo wa kutuma barua pepe"
@@ -632,6 +668,7 @@ sw:
       watched_first_post_tags: "Chapisho la Kwanza Linaangaliwa"
       watched_first_post_tags_instructions: "Utajulishwa kuhusu chapisho la kwanza kwenye kila mada mpya yenye lebo hizi."
       muted_categories: "Imenyamazishwa"
+      regular_categories: "Kawaida"
       no_category_access: "Kama msimamizi una ufikivu kidogo wa kategoria, hifadhi imesitishwa."
       delete_account: "Futa Akaunti Yangu"
       delete_account_confirm: "Una uhakika unataka kufuta akaunti yako? Kitendo hiki hakiwezi kufanyika tena!"
@@ -670,6 +707,7 @@ sw:
         tags: "Lebo"
       preferences_nav:
         account: "Akaunti"
+        security: "Ulinzi"
         profile: "Maelezo mafupi"
         emails: "Barua pepe"
         notifications: "Taarifa"
@@ -833,41 +871,38 @@ sw:
         after_10_minutes: "baada ya dakika 10"
       notification_level_when_replying: "Nikiandika ndani ya mada, mada itawekwa kwenye"
       invited:
-        search: "andika kutafuta mualiko..."
         title: "Waliokaribishwa"
+        pending_tab: "subiria"
+        pending_tab_with_count: "(%{count}) zinasubiria"
+        redeemed_tab: "Imepatikana"
+        redeemed_tab_with_count: "(%{count}) zimepatikana"
+        invited_via: "Mialiko"
+        groups: "Vikundi"
+        topic: "Mada"
+        edit: "Hariri"
+        remove: "Ondoa"
+        reinvited: "Mualiko umetumwa tena"
+        search: "andika kutafuta mualiko..."
         user: "Mtumiaji Aliyekaribishwa"
         none: "Hakuna mialiko ya kuonyeshwa."
         truncated:
           one: "Onyesha mwaliko wa kwanza."
           other: "Onyesha mialiko ya kwanza %{count}."
         redeemed: "Mialiko Iliyopatikana"
-        redeemed_tab: "Imepatikana"
-        redeemed_tab_with_count: "(%{count}) zimepatikana"
         redeemed_at: "Imepatikana"
         pending: "Mialiko Inayosubiria"
-        pending_tab: "subiria"
-        pending_tab_with_count: "(%{count}) zinasubiria"
         topics_entered: "mada zilizotazamwa"
         posts_read_count: "Machapisho yaliyosomwa"
         expired: "Mda wa mualiko huu umeisha."
-        rescind: "Ondoa"
-        rescinded: "Mualiko umeondolewa"
-        reinvite: "Tuma tena Mualiko"
-        reinvite_all: "Tuma tena Mialiko yote"
         reinvite_all_confirm: "Una uhakika unataka kutuma tena mialiko yote?"
-        reinvited: "Mualiko umetumwa tena"
-        reinvited_all: "Mialiko yote imetumwa tena!"
         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: "Mualiko"
         valid_for: "Kiungo cha Mwaliko kitatumiwa na barua pepe hii tu:%{email}"
         invite_link:
           success: "Kiungo cha Mualiko kimetengenezwa kwa mafanikio!"
         bulk_invite:
-          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:
         title: "Nywila"
@@ -967,7 +1002,6 @@ sw:
     modal:
       close: "funga"
     close: "Funga"
-    assets_changed_confirm: "Tovuti hii imesasishwa hivi karibuni. Rudisha tena kupata toleo la hivi karibuni?"
     logout: "Ulitolewa."
     refresh: "Rudisha Tena"
     home: "Nyumbani"
@@ -976,15 +1010,6 @@ sw:
       login_disabled: "Kuingia kumesitishwa kipindi tovuti ipo kwenye hali-tumizi ya kusoma tu."
       logout_disabled: "Kutoka kumesitishwa kipindi tovuti ipo kwenye hali-tumizi ya kusoma tu."
     learn_more: "jifunze zaidi..."
-    all_time: "jumla"
-    all_time_desc: "jumla ya mada zilizotengenezwa"
-    year: "mwaka"
-    year_desc: "mada zilizotengenezwa ndani ya siku 365 "
-    month: "mwezi"
-    month_desc: "mada zilizotengenezwa ndani ya siku 30 zilizopita"
-    week: "wiki"
-    week_desc: "mada zilizotengenezwa ndani ya siku 7"
-    day: "siku"
     first_post: Chapisho la kwanza
     mute: Nyamazisha
     unmute: Toa kwenye Ukimya
@@ -1001,11 +1026,8 @@ sw:
       sign_up: "Jiunge"
       hide_session: "Nikumbushe kesho"
       hide_forever: "hapana asante"
-      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>."
       enable: "Tengeneza Muhtasari wa Hii Mada."
       disable: "Onyesha Machapisho Yote"
     deleted_filter:
@@ -1026,7 +1048,7 @@ sw:
     trust_level: "Kipimo cha uaminifu"
     search_hint: "jina la mtumiaji, barua pepe au Anwani ya Mtandao"
     create_account:
-      title: "Unda akaunti mpya"
+      header_title: "Karibu!"
       failed: "Tatizo limetokea, labda barua pepe imesajiliwa tayari, jaribu kiungo cha kusahau nywila."
     forgot_password:
       title: "Weka upa nywila"
@@ -1051,12 +1073,10 @@ sw:
       complete_email_not_found: "Hakuna akaunti inayolingana na <b>%{email}</b>"
       confirm_title: Endelea kwenye %{site_name}
     login:
-      title: "Ingia"
       username: "Mtumiaji"
       password: "Nywila"
       second_factor_description: "Tafadhali andika kodi ya uthibitisho kutoka kwenye app yako:"
       second_factor_backup_description: "Samahani, Ingiza mojawapo ya kodi yako ya backup"
-      email_placeholder: "barua pepe au jina la mtumiaji"
       caps_lock_warning: "Caps Lock imewashwa"
       error: "Tatizo lilisojulikana"
       rate_limit: "Tafadhali jaribu tena kabla ya kujaribu kuingia tena."
@@ -1106,6 +1126,7 @@ sw:
       accept_invite: "Kubali mwaliko"
       success: "Akaunti yako imetengenezwa na sasa unaweza kuingia."
       name_label: "Jina"
+      password_label: "Nywila"
       optional_description: "(sio muhimu)"
     password_reset:
       continue: "endelea kwenye %{site_name}"
@@ -1155,7 +1176,6 @@ sw:
       default: Ishara binafsi
     shared_drafts:
       title: "Maswadajaribio Gawiza"
-      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?"
@@ -1166,7 +1186,6 @@ sw:
       options: "Chaguo"
       whisper: "nong'ona"
       unlist: "ondoa kwenye orodha"
-      blockquote_text: "Zuianukulu"
       add_warning: "Hii ni onyo rasmi."
       toggle_whisper: "Badilisha Nong'ono"
       toggle_unlisted: "Badilisha Ondoa kwenye Orodha"
@@ -1183,9 +1202,6 @@ sw:
       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}"
         category_missing: "Ni sharti uchague kategoria"
       save_edit: "Hifadhi Uhariri"
       reply_original: "Jibu kwenye Mada ya Kwanza"
@@ -1210,8 +1226,6 @@ sw:
       saving: "Inahifadhiwa"
       saved: "Imehifadhiwa!"
       uploading: "Inapakia..."
-      show_preview: "Onyesha hakikisho &raquo;"
-      hide_preview: "&laquo; ficha hakikisho"
       quote_post_title: "Nukulu chapisho lote"
       bold_label: "B"
       bold_title: "koleza"
@@ -1223,8 +1237,8 @@ sw:
       link_description: "andika maelezo ya kiungo hapa"
       link_dialog_title: "Ingiza kiungo-wavuti"
       link_optional_text: "kichwa cha habari kisichokuwa cha muhimu"
-      quote_title: "Zuianukulu"
-      quote_text: "Zuianukulu"
+      blockquote_title: "Zuianukulu"
+      blockquote_text: "Zuianukulu"
       code_title: "Maneno yaliyowekwa muundo"
       code_text: "Maneno yaliyowekwa muundo kwa kuacha nafasi 4 kuingia ndani"
       paste_code_text: "andika au bandika kodi hapa"
@@ -1265,7 +1279,7 @@ sw:
           label: "Mada Mpya"
         shared_draft:
           label: "Mswadajaribio Gawiza"
-          desc: "Mswadajaribio wa mada utakao onekana kwa wasaidizi tu"
+      ignore: "Puuzia"
     notifications:
       tooltip:
         regular:
@@ -1285,6 +1299,10 @@ sw:
       posted: "<span>%{jina la mtumiaji} </span> %{maelezo}"
       edited: "<span>%{jina la mtumiaji} </span> %{maelezo}"
       liked: "<span>%{jina la mtumiaji}</span> %{maelezo}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} na %{count} mwingine </span> %{description}"
+        other: "<span class='multi-user'>%{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}"
@@ -1295,6 +1313,7 @@ sw:
       granted_badge: "Umepata '%{maelezo}'"
       topic_reminder: "<span>%{jina la mtumiaji}</span> %{maelezo}"
       watching_first_post: "<span>Mada Mpya</span> %{maelezo}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       group_message_summary:
         one: "Kuna meseji %{count} kwenye %{group_name} inbox"
         other: "kuna meseji %{count} kwenye %{group_name} inbox"
@@ -1317,10 +1336,7 @@ 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}"
       local_tip: "chagua picha kwenye kifaa chako"
-      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"
       select_file: "Chagua Faili"
@@ -1350,6 +1366,7 @@ sw:
       or_search_google: "Au jaribu kutafuta kwa kutumia Google kama njia mbadala:"
       search_google: "Jaribu kutafuta kwa kutumia Google kama njia mbadala:"
       search_google_button: "Google"
+      search_button: "Tafuta"
       context:
         user: "Tafuta machapisho kwa kutumia @%{jina la mtumiaji}"
         category: "Tafuta kategoria #%{category} "
@@ -1391,10 +1408,14 @@ sw:
           noreplies: haina majibu
           single_user: ina mtumiaji mmoja
         post:
+          count:
+            label: Machapisho
           time:
             label: Chapishwa
             before: kabla
             after: baada
+        views:
+          label: Imeonwa
     hamburger_menu: "nenda kwenye orodha ya mada au kategoria nyingine"
     new_item: "mpya"
     go_back: "rudi nyuma"
@@ -1420,6 +1441,7 @@ sw:
         change_category: "Seti Kategoria"
         close_topics: "Funga Mada"
         archive_topics: "Hifadhi Mada kwenye nyaraka"
+        move_messages_to_inbox: "Hamishia kwenye kisanduku-pokezi"
         notification_level: "Taarifa"
         choose_new_category: "Chagua kategoria mpya kwa ajili ya mada:"
         selected:
@@ -1438,8 +1460,6 @@ sw:
         bookmarks: "Hauja alamisha mada yoyote."
         category: "Hakuna %{category} mada."
         top: "Hakuna mada za juu."
-        educate:
-          unread: '<p>Mada ambazo haujasoma zitatokea hapa.</p><p>Kwa chaguo-msingi, mada zote zinakuwa hazijasomwa na zitaonyesha jumla ya hizo namba<span class="badge new-posts badge-notification">1</span>Kama uli:</p><ul><li>Tengeneza mada</li><li>Alijibu mada</li><li>Amesoma mada zaidi ya dakika 4</li></ul><p>Au kama uliseti mada iwe inafuatiliwa au kuangaliwa kwa kupitia udhibiti wa taarifa chini ya kila mada. </p><p>Tembelea <a href="%{userPrefsUrl}">mapendekezo</a>yako kubadilisha hii.</p>'
       bottom:
         latest: "Hakuna mada mpya zingine."
         posted: "Hakuna mada mpya zilizochapishwa."
@@ -1447,6 +1467,7 @@ sw:
         new: "Hakuna mada mpya zingine."
         unread: "Hakuna mada zingine ambazo hazijasomwa."
         category: "Hakuna %{category} mada zingine."
+        tag: "Hakuna %{tag} mada zingine."
         top: "Hakuna mada za juu zingine."
         bookmarks: "Hakuna mada zingine zilizoalamishwa."
     topic:
@@ -1504,12 +1525,14 @@ sw:
       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}} false {{latestLink}} other {}}"
       browse_all_categories: Vinjari kategoria zote
       view_latest_topics: tembelea mada mpya
       jump_reply_up: fikia jibu la awali
       jump_reply_down: fikia jibu la baadaye
       deleted: "Mada imefutwa"
+      slow_mode_update:
+        save: "Ruhusu"
+        remove: "Zuia"
       topic_status_update:
         title: "Kipima Mda cha Mada"
         save: "Seti Kipima Mda"
@@ -1524,11 +1547,7 @@ sw:
         later_this_week: "Baada ya mda ndani ya wiki hii"
         this_weekend: "Wikiendi hii"
         next_week: "Wiki Ijayo"
-        two_weeks: "Wiki Mbili"
         next_month: "Mwezi ujao"
-        three_months: "Miezi Mitatu"
-        six_months: "Miezi Sita"
-        one_year: "Mwaka Mmoja"
         forever: "Milele"
         pick_date_and_time: "Chagua tarehe na mda"
         set_based_on_last_post: "Funga kulingana na chapisho la mwisho"
@@ -1542,7 +1561,6 @@ sw:
         title: "Funga kwa Sasa"
       auto_close:
         title: "Funga Mada otomatikali"
-        label: "Mda wa kufunga mada otomatikali:"
         error: "Tafadhali andika thamani sahihi."
         based_on_last_post: "Usifunge mpaka chapisho la mwisho kwenye mada liwe lina umri huu."
       auto_delete:
@@ -1553,7 +1571,7 @@ sw:
         auto_open: "Mada hii itafunguliwa otomatikali baada ya %{timeLeft}."
         auto_close: "Mada hii itafungwa otomatikali baada ya %{timeLeft}."
         auto_publish_to_category: "Mada hii itachapishwa kwenye <a href=%{categoryUrl}>#%{categoryName}</a>%{timeLeft}."
-        auto_close_based_on_last_post: "Mada hii itafungwa baada ya jibu la mwisho %{duration}."
+        auto_close_after_last_post: "Mada hii itafungwa baada ya jibu la mwisho %{duration}."
         auto_delete: "Mada hii itafutwa otomatikali %{timeLeft}."
         auto_reminder: "Utakumbushwa kuhusu mada hii %{timeLeft}."
       auto_close_title: "Funga Mada Otomatikali"
@@ -1568,7 +1586,7 @@ sw:
         go: "nenda"
         jump_bottom: "fikia chapisho la mwisho"
         jump_prompt: "ruka kwenda..."
-        jump_prompt_of: "machapisho %{count} ya"
+        jump_prompt_long: "Ruka kwenda..."
         jump_bottom_with_number: "fikia chapisho %{post_number}"
         jump_prompt_or: "au"
         total: jumla ya machapisho
@@ -1647,6 +1665,7 @@ sw:
       share:
         title: "Gawiza"
         help: "gawiza kiungo kwenye mada hii"
+        invite_users: "Mualiko"
       print:
         title: "Chapa"
       flag_topic:
@@ -1687,14 +1706,13 @@ sw:
         username_placeholder: "jina la mtumiaji"
         action: "Tuma Mualiko"
         help: "Wakaribishe watu wengine kwenye mada kupitia barua pepe au taarifa"
-        to_forum: "Tutatuma barua fupi kumruhusu rafiki yako aingie mara moja kupitia kiungo, haitaji kujiunga."
-        sso_enabled: "Andika jina la mtumiaji la mtu ambaye ungependa kumualika kwenye mada hii."
+        discourse_connect_enabled: "Andika jina la mtumiaji la mtu ambaye ungependa kumualika kwenye mada hii."
         to_topic_blank: "Andika jina la mtumiaji au barua pepe ya mtu ambaye ungependa kumualika kwenye mada hii."
         to_topic_email: "Umeandika barua pepe. Tutatuma mualiko utakao mruhusu rafiki yako kujibu mada hii."
         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>%{invitee}</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."
@@ -1755,10 +1773,9 @@ sw:
           other: "Umechagua machapisho<b>%{count}</b>."
     post:
       quote_reply: "Nukulu"
+      quote_share: "Gawiza"
       edit_reason: "Sababu:"
       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}:"
@@ -1790,12 +1807,6 @@ sw:
         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."
-      abandon_edit:
-        no_value: "Hapana, tunza"
-      abandon:
-        confirm: "Una uhakika unataka kuacha chapisho lako?"
-        no_value: "Hapana, tunza"
-        yes_value: "Ndio, acha"
       via_email: "chapisho hili limefika kupitia barua pepe"
       via_auto_generated_email: "chapisho hili limefika kupitia barua pepe iliyotengenezwa otomatikali"
       whisper: "Chapisho hili ni binafsi kwa wasimamizi tu."
@@ -1835,6 +1846,10 @@ sw:
         unlock_post_description: "mruhusu mchapishaji kuhariri chapisho hili"
         delete_topic: "futa mada"
       actions:
+        people:
+          like:
+            one: "ameipenda hii"
+            other: "ameipenda hii"
         by_you:
           off_topic: "Umeripoti hii kuwa haihusiki"
           spam: "Umeripoti hii kuwa ni taka"
@@ -1914,7 +1929,13 @@ sw:
       change_in_category_topic: "Hariri Maelezo"
       already_used: "Rangi hii imetumika kwenye kategoria nyingine"
       security: "Ulinzi"
+      permissions:
+        group: "Kikundi"
+        see: "Angalia"
+        reply: "Jibu"
+        create: "Tengeneza"
       images: "Picha"
+      email_in: "Barua Pepe inayoingia:"
       email_in_allow_strangers: "Pokea barua pepe kutoka kwa watumiaji wasiojulikana ambao hawana akaunti"
       email_in_disabled: "Uchapishaji wa mada mpya kupitia barua pepe umesitishwa kwenye Mipangilio ya Tovuti. Kuruhusu uchapishaji wa mada mpya kupitia barua pepe,"
       email_in_disabled_click: 'ruhusu mpangilio wa "barua pepe ndani"'
@@ -1933,18 +1954,15 @@ sw:
       notifications:
         watching:
           title: "Angalia"
-          description: "Utaangalia mada zote kwenye kategoria hizi. Utajulishwa kuhusiana na machapisho mapya ndani ya mada zote, na namba ya majibu itaonyeshwa."
         watching_first_post:
           title: "Chapisho la Kwanza Linaangaliwa"
         tracking:
           title: "Fuatilia"
-          description: "Ufuatilia mada zote kwenye kategoria hizi. Utajulishwa kama mtu akitaja @jina lako au akikujibu, na namba ya majibu itaonyeshwa."
         regular:
           title: "Kawaida"
           description: "Utajulishwa kama mtu akitaja @jina lako au akikujibu."
         muted:
           title: "Imenyamazishwa"
-          description: "Utajulishwa kuhusu kila kitu kuhusu mada mpya kwenye kategoria hizi, na hazitatokea kama taarifa za hivi karibuni."
       search_priority:
         options:
           normal: "Kawaida"
@@ -1970,10 +1988,16 @@ sw:
     flagging:
       title: "Asante kwa kuendeleza ustaarabu kwenye jumuiya yetu!"
       action: "Ripoti Chapisho"
+      take_action_options:
+        default:
+          title: "Fanya Kitendo"
+        suspend:
+          title: "Simamisha Mtumiaji"
+        silence:
+          title: "Nyamazisha Mtumiaji"
       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>{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)"
@@ -2016,12 +2040,6 @@ 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_likes_MF: |
-      Mada hii ina {count, plural, one {jibu 1} other {majibu #}} {ratio, select,
-      low {yenye uwiano wa upendo zaidi kuliko chapisho}
-      med {yenye uwiano wa upendo mwingi kuliko chapisho}
-      high {yenye uwiano wa upendo mwingi sana kuliko chapisho}
-      other {}}
     original_post: "Chapisho la Kwanza"
     views: "Imeonwa"
     views_lowercase:
@@ -2030,12 +2048,14 @@ sw:
     replies: "Majibu"
     activity: "Kitendo"
     likes: "Upendo"
+    likes_lowercase:
+      one: "penda"
+      other: "upendo"
     users: "Watumiaji"
     users_lowercase:
       one: "Mtumiaji"
       other: "Watumiaji"
     category_title: "Kategoria"
-    history: "Historia"
     changed_by: "na %{author}"
     raw_email:
       title: "Barua Pepe Iliyopokelewa"
@@ -2063,6 +2083,9 @@ sw:
           one: "Haijasomwa (%{count})"
           other: "Hazijasomwa (%{count})"
         help: "mada unazo fuatilia au angalia zenye machapisho ambayo hayajasomwa"
+        lower_title_with_count:
+          one: "%{count} haijasomwa"
+          other: "%{count} haijasomwa"
       new:
         lower_title_with_count:
           one: "Mada mpya %{count}"
@@ -2106,6 +2129,7 @@ sw:
       readonly: "Angalia"
     lightbox:
       download: "pakua"
+      counter: "%curr% chini ya %total%"
     keyboard_shortcuts_help:
       title: "Njia Mkato za Baobonye"
       jump_to:
@@ -2253,6 +2277,9 @@ sw:
       back: "Nyuma"
       share: "Shirikisha"
       dismiss: "Ondosha"
+    do_not_disturb:
+      options:
+        custom: "Binafsi"
   admin_js:
     type_to_filter: "andika kuchuja..."
     admin:
@@ -2276,6 +2303,8 @@ sw:
         version_check_pending: "Inaonekana umeweka toleo la sasa hivi karibuni. Vizuri!"
         installed_version: "Imesanikishwa"
         latest_version: "Hivi Karibuni"
+        new_features:
+          dismiss: "Ondosha"
         last_checked: "Mara ya Mwisho imeangaliwa"
         refresh_problems: "Rudisha Tena"
         no_problems: "Hakuna matatizo yaliyopatikana."
@@ -2312,6 +2341,9 @@ sw:
           view_table: "jedwali"
           view_graph: "grafu"
           refresh_report: "Rudisha tena Ripoti"
+          daily: Kila siku
+          monthly: Klla mwezi
+          weekly: Kila wiki
           groups: "Vikundi vyote"
           disabled: "Hii ripoti imezuiwa"
           total: "Jumla ya wakati wote"
@@ -2335,10 +2367,6 @@ sw:
             available: "Jina la kikundi lipo"
             not_available: "Jina la kikundi halipo"
             blank: "Jina la kikundi haliwezi kuwa wazi"
-        bulk_add:
-          title: "Ongeza Wengi kwenye Kikundi"
-          complete_users_not_added: "Watumiaji hawa hawajaongezwa (hakikisha wana akaunti):"
-          paste: "Bandika orodha ya majina ya watumiaji au barua pepe, moja kila mstari:"
         add_members:
           as_owner: "Fanya w(m)umiaji kuwa w(m)amiliki wa kikundi hiki"
         manage:
@@ -2389,6 +2417,8 @@ sw:
         description: Maelezo
         save: hifadhi
         continue: Endelea
+        scopes:
+          action: Kitendo
       web_hooks:
         create: "Tengeneza"
         save: "Hifadhi"
@@ -2415,7 +2445,6 @@ sw:
           details: "Wakati kuna jibu jipya, uhariri, kufutwa au kurejeshwa."
         user_event:
           name: "Mtumiaji Tukio"
-          details: "Wakati mtumiaji anavyoingia, anavyotoka, anavyotengenezwa, anavyothibitishwa au kusasishwa."
         group_event:
           name: "Kikundi Tukio"
           details: "Wakati kikundi kinapotengenezwa, sasishwa au kuvunjwa."
@@ -2587,6 +2616,7 @@ sw:
           install_popular: "Maarufu"
           about_theme: "Kuhusu"
           license: "Leseni"
+          version: "Toleo:"
           enable: "Wezesha"
           disable: "Sitisha"
           update_to_latest: "Sasisha iwe Toleo Jipya"
@@ -2847,7 +2877,6 @@ sw:
         title: "Maneno yanayoangaliwa"
         search: "tafuta"
         clear_filter: "Futa"
-        show_words: "onyesha maneno"
         download: Pakua
         clear_all: Futa Zote
         actions:
@@ -2861,8 +2890,6 @@ sw:
           require_approval: "Machapicho yenye maneno yafuatayo yatahitaji kibali kutoka kwa wafanyakazi kabla hayajaonwa."
           flag: "Ruhusu machapisho yawe na maneno haya, ila ripoti kuonyesha kuwa hazifai ili wasimamizi waweze kuzikagua."
         form:
-          label: "Neno Jipya:"
-          placeholder: "neno lote au * kama wildcard"
           placeholder_regexp: "muonekano wa kawaida"
           add: "Ongeza"
           success: "Mafanikio"
@@ -2909,6 +2936,8 @@ sw:
         check_email:
           title: "Onyesha barua pepe ya mtumiaji"
           text: "Onyesha"
+        check_sso:
+          text: "Onesha"
       user:
         suspend_failed: "Hitilafu imetokea wakati wa kumsitisha mtumiaji %{hitilafu}"
         unsuspend_failed: "Hitilafu imetokea wakati wa kuruhusu mtumiaji aweze kujadiliana kwenye jamii %{hitilafu}"
@@ -2916,6 +2945,7 @@ sw:
         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."
         suspend_reason: "Sababu"
+        suspend_reason_title: "Sababu ya kusitisha kwa mda mfupi"
         suspend_message: "Tuma Ujumbe kwa Barua Pepe"
         suspend_message_placeholder: "Sio lazima, ila unaweza kutoa sababu za ziada kuhusiana na sitisho na itatumwa kwa mtumiaji."
         suspended_by: "Amesitishwa kwa mda mfupi na"
@@ -2934,13 +2964,13 @@ 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} other {mada #}}. Una uhakika?"
         silence: "Imenyamazishwa"
         unsilence: "Imeruhusiwa"
         silenced: "Nyamazishwa?"
         moderator: "Msimamizi?"
         admin: "Kiongozi?"
         suspended: "Imesitishwa?"
+        staged: "Sehemu ya kujaribu?"
         show_admin_profile: "Msimamizi"
         show_public_profile: "Onyesha Taarifa za Umma"
         impersonate: "Chukua Utambulisho wa Mtu Mwingine"
@@ -3055,8 +3085,7 @@ sw:
           on_grace_period: "Kwa sasa upo kwenye kipindi cha kupanda daraja, hautashushwa daraja."
           locked_will_not_be_promoted: "Kiwango cha Uaminifu kimefungwa. Hautawai kupanda daraja."
           locked_will_not_be_demoted: "Kiwango cha Uaminifu kimefungwa. Hautashushwa Daraja."
-        sso:
-          title: "Ingia Mara Moja"
+        discourse_connect:
           external_id: "Utambulisho wa kutoka nje"
           external_username: "Jina la mtumiaji"
           external_name: "Jina"
@@ -3239,6 +3268,7 @@ sw:
         embed_post_limit: "Kiwango cha Juu cha Kupachika machapisho"
         embed_title_scrubber: "Neno linalotumika kufuta vichwa vya machapisho"
         embed_truncate: "Fupisha machapisho yaliyopachikwa"
+        allowed_embed_classnames: "Ruhusu majina ya madarasa ya CSS "
         save: "Hifadhi Mipangilio Iliyopachikwa"
       permalink:
         title: "Anwani za mtandao"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index 6e272934d9..5a3f6a2a59 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -40,6 +40,9 @@ te:
         x_seconds:
           one: "%{count}సె"
           other: "%{count}సె"
+        less_than_x_minutes:
+          one: "< %{count}ని"
+          other: "< %{count}ని"
         x_minutes:
           one: "%{count}ని"
           other: "%{count}ని"
@@ -49,6 +52,9 @@ te:
         x_days:
           one: "%{count}రో"
           other: "%{count}రో"
+        x_months:
+          one: "%{count}నెల"
+          other: "%{count}నెల"
         about_x_years:
           one: "%{count}సం"
           other: "%{count}సం"
@@ -81,6 +87,9 @@ te:
         x_days:
           one: "%{count} రోజు ముందు"
           other: "%{count} రోజుల ముందు"
+        x_months:
+          one: "ఒక మాసం ముందు"
+          other: "%{count} నెలల వెనుక"
       later:
         x_days:
           one: "%{count} రోజు తర్వాత"
@@ -144,8 +153,6 @@ te:
       moderators: "నిర్వాహకులు"
       stat:
         all_time: "ఆల్ టైమ్"
-        last_7_days: "చివరి 7"
-        last_30_days: "చివరి 30"
       like_count: "ఇష్టాలు"
       topic_count: "విషయాలు"
       post_count: "టపాలు"
@@ -160,18 +167,12 @@ te:
         bookmark: "ఈ అంశంపై మొదటి టపాకి పేజీకలను పెట్టండి"
         unbookmark: "ఈ అంశంపై అన్ని పేజీకలను తొలగించడానికి నొక్కండి"
     bookmarks:
+      not_bookmarked: "ఈ టపాకు పేజీక ఉంచు"
       remove: "పేజీక తొలగించండి"
       save: "భద్రపరచు"
       search: "వెతుకు"
-      reminders:
-        tomorrow: "రేపు"
-        next_week: "వచ్చే వారం"
-        next_month: "వచ్చే నెల"
     drafts:
       remove: "తొలగించు"
-      abandon:
-        yes_value: "అవును. వదిలేయండి"
-        no_value: "లేదు, ఉంచండి"
     preview: "మునుజూపు"
     cancel: "రద్దు"
     save: "మార్పులు భద్రపరచండి"
@@ -201,8 +202,10 @@ te:
         username: "వాడుకరి పేరు"
         email: "ఈమెయిల్"
         name: "పేరు"
+        reject_reason: "కారణం"
       topics:
         topic: "విషయం"
+        details: "వివరాలు"
       edit: "సవరించు"
       save: "భద్రపరచు"
       cancel: "రద్దుచేయి"
@@ -222,6 +225,15 @@ te:
           title: "సభ్యుడు"
       approval:
         ok: "సరే"
+      example_username: "సభ్యనామం"
+    relative_time_picker:
+      days:
+        one: "రోజు"
+        other: "రోజులు"
+    time_shortcut:
+      tomorrow: "రేపు"
+      next_week: "వచ్చే వారం"
+      next_month: "వచ్చే నెల"
     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> రాసారు"
@@ -237,6 +249,7 @@ te:
       sent_by_user: "<a href='%{userUrl}'>%{user}</a> పంపారు"
       sent_by_you: "<a href='%{userUrl}'>మీరు</a> పంపారు"
     directory:
+      username: "వాడుకరి పేరు"
       title: "వాడుకరులు"
       topics_entered_long: "సందర్శించిన విషయాలు "
       topic_count: "విషయాలు"
@@ -261,19 +274,28 @@ te:
           credentials:
             username: "వాడుకరి పేరు"
             password: "సంకేతపదం"
+          settings:
+            title: "అమరికలు"
         membership:
           title: సభ్యత్వం
+        categories:
+          title: వర్గాలు
+        tags:
+          title: ట్యాగులు
         logs:
           title: "లాగ్స్"
           when: "ఎప్పుడు"
           action: "చర్య"
           subject: "సబ్జెక్టు"
           details: "వివరాలు"
+      permissions:
+        title: "అనుమతులు"
       add: "కలుపు"
       membership: "సభ్యత్వం"
       name: "పేరు"
       user_count: "వాడుకరులు"
       selector_placeholder: "సభ్యనామం రాయండి"
+      owner: "యజమాని"
       index:
         title: "గుంపులు"
         automatic: "స్వీయంగా"
@@ -281,6 +303,9 @@ te:
         private: "అంతరంగికం"
         is_group_user: "సభ్యుడు"
         is_group_owner: "యజమాని"
+      title:
+        one: "సమూహం"
+        other: "గుంపులు"
       activity: "కార్యకలాపం"
       members:
         title: "సభ్యులు"
@@ -327,9 +352,11 @@ te:
       posts: "టపాలు"
       topics: "విషయాలు"
       latest: "తాజా"
-      latest_by: "నుండి తాజా"
       toggle_ordering: "వరుస నియంత్రణను అటుఇటుచేయి"
       subcategories: "ఉప వర్గాలు"
+      topic_stat_unit:
+        week: "వారం"
+        month: "నెల"
     ip_lookup:
       title: ఐపీ చిరునామా లుకప్
       hostname: అతిథిపేరు
@@ -362,6 +389,7 @@ te:
         ignore_duration_username: "వాడుకరి పేరు"
         mute_option: "నిశ్శబ్దం"
       activity_stream: "కలాపం"
+      read: "చదివిన"
       preferences: "అభిరుచులు"
       feature_topic_on_profile:
         save: "భద్రపరచు"
@@ -374,6 +402,8 @@ te:
       notifications: "ప్రకటనలు"
       statistics: "గణాంకాలు"
       dismiss_notifications_tooltip: "అన్ని చదవని ప్రకటనలూ చదివినట్టు గుర్తించు"
+      color_schemes:
+        regular: "రెగ్యులరు"
       external_links_in_new_tab: "అన్ని బాహ్య లంకెలనూ కొత్త ట్యాబులో తెరువు"
       enable_quoting: "హైలైట్ అయిన పాఠ్యానికి కోట్ జవాబు చేతనం చేయి"
       change: "మార్చు"
@@ -390,6 +420,7 @@ te:
       watched_categories: "ఒకకన్నేసారు"
       tracked_categories: "గమనించారు"
       muted_categories: "నిశ్శబ్దం"
+      regular_categories: "రెగ్యులరు"
       delete_account: "నా ఖాతా తొలగించు"
       delete_account_confirm: "నిజ్జంగా మీరు మీ ఖాతాను శాస్వతంగా తొలగించాలనుకుంటున్నారా? ఈ చర్య రద్దుచేయలేరు సుమా! "
       deleted_yourself: "మీ ఖాతా విజయవంతంగా తొలగించబడింది. "
@@ -412,6 +443,7 @@ te:
         tags: "ట్యాగులు"
       preferences_nav:
         account: "ఖాతా"
+        security: "సంరక్షణ"
         profile: "ప్రవర"
         notifications: "ప్రకటనలు"
         categories: "వర్గాలు"
@@ -440,6 +472,8 @@ te:
         title: "సభ్యనామం మార్చు"
         taken: "క్షమించాలి, ఆ సభ్యనామం వేరొకరు తీసుకున్నారు."
         invalid: "ఆ సభ్యనామం చెల్లనిది. కేవలం సంఖ్యలు, అక్షరాలు మాత్రమే కలిగి ఉండాలి. "
+      add_email:
+        add: "కలుపు"
       change_email:
         title: "ఈమెయిల్ మార్చు"
         taken: "క్షమించాలి. ఆ ఈమెయిల్ అందుబాటులో లేదు."
@@ -519,27 +553,27 @@ te:
         never: "ఎప్పటికీ వద్దు"
         immediately: "వెంటనే"
       invited:
-        search: "ఆహ్వానాలను వెతకడానికి రాయండి ... "
         title: "ఆహ్వానాలు"
+        pending_tab: "పెండింగు"
+        redeemed_tab: "మన్నించిన"
+        invited_via: "ఆహ్వానం"
+        groups: "గుంపులు"
+        topic: "విషయం"
+        edit: "సవరించు"
+        remove: "తొలగించు"
+        reinvited: "ఆహ్వానం మరలా పంపారు"
+        search: "ఆహ్వానాలను వెతకడానికి రాయండి ... "
         user: "ఆహ్వానించిన సభ్యుడు"
         redeemed: "మన్నించిన ఆహ్వానాలు"
-        redeemed_tab: "మన్నించిన"
         redeemed_at: "మన్నించిన"
         pending: "పెండింగులోని ఆహ్వానాలు"
-        pending_tab: "పెండింగు"
         topics_entered: "చూసిన విషయాలు"
         posts_read_count: "చదివిన టపాలు"
         expired: "ఈ ఆహ్వానం కాలాతీతమైంది."
-        rescind: "తొలగించు"
-        rescinded: "ఆహ్వానం తొలగించారు"
-        reinvite: "ఆహ్వానం మరలా పంపు"
-        reinvited: "ఆహ్వానం మరలా పంపారు"
         time_read: "చదువు సమయం"
         days_visited: "దర్శించిన రోజులు"
         account_age_days: "రోజుల్లో ఖాతా వయసు"
-        links_tab: "లంకెలు"
-        link_created_at: "సృష్టించిన"
-        link_groups: గుంపులు
+        create: "ఆహ్వానించు"
       password:
         title: "సంకేతపదం"
         too_short: "మీ సంకేతపదం మరీ చిన్నది."
@@ -551,6 +585,9 @@ te:
         title: "సారాంశం"
         stats: "గణాంకాలు"
         time_read: "చదువు సమయం"
+        bookmark_count:
+          one: "పేజీక"
+          other: "పేజీకలు"
         topics: "విషయాలు"
         replies: "జవాబులు"
       ip_address:
@@ -590,23 +627,18 @@ te:
     modal:
       close: "మూసివేయి"
     close: "మూసివేయి"
-    assets_changed_confirm: "ఈ సైటు ఇప్పుడే ఉన్నతీకరించబడింది. కొత్త రూపాంతరం చూడటానికి తాజాపరచండి?"
     logout: "మీరు లాగవుట్ అయ్యారు."
     refresh: "తాజాపరుచు"
     read_only_mode:
       login_disabled: "సేటు కేవలం చదివే రీతిలో ఉన్నప్పుడు లాగిన్ వీలవదు."
     learn_more: "మరింత తెలుసుకోండి..."
-    year: "సంవత్సరం"
-    year_desc: "గత 365 రోజులలో సృష్టించిన విషయాలు"
-    month: "నెల"
-    month_desc: "గత 30 రోజులలో సృష్టించిన విషయాలు"
-    week: "వారం"
-    week_desc: "గత 7 రోజులలో సృష్టించిన విషయాలు"
-    day: "రోజు"
     first_post: తొలి టపా
     mute: నిశ్శబ్దం
     unmute: వినిశ్శబ్దం
     time_read: చదివిన
+    replies_lowercase:
+      one: జవాబు
+      other: జవాబులు
     signup_cta:
       sign_up: "సైన్ అప్"
     summary:
@@ -626,7 +658,6 @@ te:
     trust_level: "నమ్మకపు స్థాయి"
     search_hint: "సభ్యనామం, ఈమెయిల్ మరియు ఐపీ చిరునామా"
     create_account:
-      title: "కొత్త ఖాతా సృష్టించు"
       failed: "ఏదో తేడా జరిగింది. బహుశా ఈమెయిల్ ఇప్పటికే ఈసైటులో రిజిస్టరు అయి ఉందేమో, సంకేతపదం మర్చిపోయా లంకె ప్రయత్నించు."
     forgot_password:
       action: "నేను నా సంకేతపదాన్ని మర్చిపోయాను"
@@ -643,10 +674,8 @@ te:
       complete_email_not_found: "<b>%{email}</b> తో ఏ ఖాతా సరిపోవడంలేదు"
       confirm_title: '%{site_name} కు కొనసాగండి'
     login:
-      title: "లాగిన్"
       username: "వాడుకరి"
       password: "సంకేతపదం"
-      email_placeholder: "ఈమెయిల్ లేదా సభ్యనామం"
       caps_lock_warning: "క్యాప్స్ లాక్ ఆన్ అయి ఉంది"
       error: "తెలీని దోషం"
       blank_username_or_password: "దయచేసి మీ ఈమెయిల్ లేదా సభ్యనామం మరియు సంకేతపదం రాయండి"
@@ -675,6 +704,7 @@ te:
       accept_title: "ఆహ్వానం"
       welcome_to: "%{site_name} కు సుస్వాగతం!"
       name_label: "పేరు"
+      password_label: "సంకేతపదం"
       optional_description: "(ఐచ్ఛికం)"
     password_reset:
       continue: "%{site_name} కు కొనసాగండి"
@@ -690,7 +720,6 @@ te:
       flags: కేతనాలు
     composer:
       options: "ఎంపికలు"
-      blockquote_text: "బ్లాక్ కోట్"
       add_warning: "ఇది ఒక అధికారిక హెచ్చరిక"
       posting_not_on_topic: "ఏ విషయానికి మీరు జవాబివ్వాలనుకుంటున్నారు? "
       saved_local_draft_tip: "స్థానికంగా భద్రం"
@@ -698,9 +727,6 @@ te:
       drafts_offline: "చిత్తుప్రతులు ఆఫ్లైను."
       error:
         title_missing: "శీర్షిక తప్పనిసరి"
-        title_too_short: "శీర్షిక కనీసం %{min} అక్షరాలు ఉండాలి"
-        title_too_long: "శీర్షిక %{max} అక్షరాలకు మించి ఉండకూడదు"
-        post_length: "టపా కనీసం %{min} అక్షరాలు కలిగి ఉండాలి"
         category_missing: "మీరు ఒక వర్గాన్ని ఎంచుకోవాలి"
       save_edit: "దాచి సవరించు"
       reply_original: "మూల విషయంకు జవాబివ్వు"
@@ -714,8 +740,6 @@ te:
       view_new_post: "మీ కొత్త టపా చూడండి"
       saved: "భద్రం!"
       uploading: "ఎగుమతవుతోంది..."
-      show_preview: "మునుజూపు చూపు &raquo;"
-      hide_preview: "&laquo; మునుజూపు దాచు"
       quote_post_title: "మొత్తం టపాను కోట్ చేయి"
       bold_title: "బొద్దు"
       bold_text: "బొద్దు పాఠ్యం"
@@ -725,8 +749,8 @@ te:
       link_description: "లంకె వివరణ ఇక్కడ రాయండి"
       link_dialog_title: "హైపర్ లంకె చొప్పించండి"
       link_optional_text: "ఐచ్చిక శీర్షిక"
-      quote_title: "బ్లాక్ కోట్"
-      quote_text: "బ్లాక్ కోట్"
+      blockquote_title: "బ్లాక్ కోట్"
+      blockquote_text: "బ్లాక్ కోట్"
       code_title: "ముందే అలంకరించిన పాఠ్యం"
       code_text: "ముందే అలంకరించిన పాఠ్యాన్ని 4 జాగాలు జరుపు"
       upload_title: "ఎగుమతించు"
@@ -753,7 +777,6 @@ te:
       from_my_computer: "నా పరికరం నుండి"
       from_the_web: "జాలం నుండి"
       remote_tip: "బొమ్మకు లంకె"
-      hint: "(మీరు వాటిని ఎడిటరులోకి లాగి వదిలెయ్యటు ద్వారా కూడా ఎగుమతించవచ్చు)"
       uploading: "ఎగుమతవుతోంది"
       default_image_alt_text: బొమ్మ
     search:
@@ -761,12 +784,18 @@ te:
       no_results: "ఎటువంటి ఫలితాలు దొరకలేదు."
       post_format: "%{username} నుండి #%{post_number}"
       search_google_button: "గూగుల్"
+      search_button: "వెతుకు"
       context:
         user: "@%{username} యొక్క విషయాలు వెతుకు"
         topic: "ఈ విషయంలో వెతుకు"
       advanced:
         posted_by:
           label: టపా రాసినవారు
+        post:
+          count:
+            label: టపాలు
+        views:
+          label: చూపులు
     hamburger_menu: "మరో విషయాల జాబితాకు లేదా వర్గానికి వెళ్లు"
     new_item: "కొత్త"
     go_back: "వెనక్కు మరలు"
@@ -801,6 +830,7 @@ te:
         new: "కొత్త విషయాలు లేవు."
         unread: "ఇంకా చదవని విషయాలు లేవు."
         category: "ఇంకా %{category} విషయాలు లేవు."
+        tag: "ఇంకా %{tag} విషయాలు లేవు."
         top: "ఇంకా అగ్ర విషయాలు లేవు."
         bookmarks: "ఇంకా పేజీక విషయాలు లేవు."
     topic:
@@ -853,20 +883,20 @@ te:
       jump_reply_up: పాత జవాబుకు వెళ్లు
       jump_reply_down: తరువాతి జవాబుకు వెళ్లు
       deleted: "ఈ విషయం తొలగించబడింది"
+      slow_mode_update:
+        save: "చేతనం"
+        remove: "అచేతనం"
       auto_update_input:
         tomorrow: "రేపు"
         this_weekend: "ఈ వారాంతం"
         next_week: "వచ్చే వారం"
-        two_weeks: "రెండు వారాలు"
         next_month: "వచ్చే నెల"
-        three_months: "మూడు నెలలు"
-        six_months: "ఆరు నెలలు"
       auto_close:
         error: "దయచేసి చెల్లే విలువ రాయండి"
         based_on_last_post: "ఈ విషయంలో చివరి టపా కనీసం ఇంత వయసు వచ్చేంతవరకూ విషయాన్ని మూయకు."
       status_update_notice:
         auto_close: "ఈ విషయం %{timeLeft} తర్వాత స్వీయంగా మూయబడుతుంది."
-        auto_close_based_on_last_post: "చివరి జవాబు తర్వాత %{duration}కు ఈ విషయం స్వీయ మూయబడుతుంది"
+        auto_close_after_last_post: "చివరి జవాబు తర్వాత %{duration}కు ఈ విషయం స్వీయ మూయబడుతుంది"
       auto_close_title: "స్వీయ ముగింపు అమరికలు"
       timeline:
         back: "వెనుకకు"
@@ -930,6 +960,7 @@ te:
       share:
         title: "పంచు"
         help: "ఈ విషయపులంకెను పంచు"
+        invite_users: "ఆహ్వానించు"
       flag_topic:
         title: "కేతనం"
         help: "ఈ విషయాన్ని ప్రైవేటుగా కేతనించు లేదా ప్రైవేటు ప్రకటన పంపు"
@@ -944,7 +975,6 @@ te:
       invite_reply:
         title: "ఆహ్వానించు"
         username_placeholder: "వాడుకరి పేరు"
-        to_forum: "మేము మీ స్నేహితునికి ఒక ఈమెయిల్ పంపుతాము. అందులోని లంకె ద్వారా వారు లాగిన్ అవసరం లేకుండానే నేరుగా ఈ చర్చలో పాల్గొనవచ్చు, జవాబివ్వవచ్చు."
         email_placeholder: "name@example.com"
       login_reply: "జవాబివ్వడానికి లాగిన్ అవ్వండి"
       filters:
@@ -988,9 +1018,9 @@ te:
           one: మీరు <b>%{count}</b> టపా ఎంచుకున్నారు
           other: "మీరు <b>%{count}</b> టపాలు ఎంచుకున్నారు"
     post:
+      quote_share: "పంచు"
       edit_reason: "కారణం:"
       post_number: "టపా %{number}"
-      last_edited_on: "టపా చివర సవరించిన కాలం"
       reply_as_new_topic: "లంకె విషయంగా జవాబివ్వు"
       continue_discussion: "%{postLink} నుండి చర్చ కొనసాగుతుంది;"
       follow_quote: "కోటెడ్ టపాకు వెళ్లు"
@@ -1008,12 +1038,6 @@ te:
         image_upload_not_allowed_for_new_user: "క్షమించాలి. కొత్త సభ్యులు బొమ్మలు ఎగుమతి చేయలేరు."
         attachment_upload_not_allowed_for_new_user: "క్షమించాలి. కొత్త సభ్యులు జోడింపులు ఎగుమతి చేయలేరు."
         attachment_download_requires_login: "క్షమించాలి. జోడింపులు దిగుమతి చేసుకోవడానికి మీరు లాగిన్ అయి ఉండాలి."
-      abandon_edit:
-        no_value: "లేదు, ఉంచండి"
-      abandon:
-        confirm: "మీరు నిజంగానే మీ టపాను వదిలేద్దామనుకుంటున్నారా?"
-        no_value: "లేదు, ఉంచండి"
-        yes_value: "అవును. వదిలేయండి"
       via_email: "ఈ టపా ఈమెయిల్ ద్వారా వచ్చింది"
       archetypes:
         save: "భద్రపరుచు ఐచ్చికాలు"
@@ -1042,6 +1066,10 @@ te:
         grant_badge: "బ్యాడ్జి ఇవ్వు"
         delete_topic: "విషయం తొలగించు"
       actions:
+        people:
+          like:
+            one: "ఈ టపాను ఇష్టపడ్డారు"
+            other: "ఈ టపాను ఇష్టపడ్డారు"
         by_you:
           off_topic: "మీరు దీన్ని విషయాంతరంగా కేతనించారు"
           spam: "మీరు దీన్ని స్పాముగా కేతనించారు"
@@ -1097,6 +1125,10 @@ te:
       change_in_category_topic: "వివరణ సవరించు"
       already_used: "ఈ రంగు వేరే వర్గం వాడింది"
       security: "సంరక్షణ"
+      permissions:
+        group: "సమూహం"
+        see: "చూడు"
+        reply: "జవాబు"
       images: "బొమ్మలు"
       email_in: "అనురూప లోపలికి వచ్చే ఈమెయిల్ చిరునామా:"
       email_in_allow_strangers: "ఎటువంటి ఖాతాలు లేని అనామక సభ్యుల నుండి వచ్చే ఈమెయిల్లు అంగీకరించు"
@@ -1118,6 +1150,7 @@ te:
         muted:
           title: "నిశ్శబ్దం"
       sort_options:
+        default: "అప్రమేయ"
         likes: "ఇష్టాలు"
         views: "చూపులు"
         posts: "టపాలు"
@@ -1130,6 +1163,12 @@ te:
     flagging:
       title: "మా కమ్యునిటీని నాగరికంగా ఉంచుటలో సహాయానికి ధన్యవాదములు"
       action: "టపాను కేతనించు"
+      take_action_options:
+        default:
+          title: "చర్య తీసుకో"
+          details: "మరిన్ని కమ్యునిటీ కేతనాల కోసం ఎదురు చూడకుండా ఇప్పుడే కేతన గట్టు చేరు"
+        suspend:
+          title: "సభ్యుడిని సస్పెండు చేయి"
       delete_spammer: "స్పామరును తొలగించు"
       yes_delete_spammer: "అవులు, స్పామరును తొలగించు"
       ip_address_missing: "వర్తించదు"
@@ -1176,12 +1215,14 @@ te:
     replies: "జవాబులు"
     activity: "కలాపం"
     likes: "ఇష్టాలు"
+    likes_lowercase:
+      one: "ఇష్టం"
+      other: "ఇష్టాలు"
     users: "సభ్యులు"
     users_lowercase:
       one: "వాడుకరి"
       other: "వాడుకరులు"
     category_title: "వర్గం"
-    history: "చరిత్ర"
     changed_by: " %{author} రాసిన"
     raw_email:
       not_available: "అందుబాటులో లేదు!"
@@ -1202,6 +1243,9 @@ te:
       unread:
         title: "చదవని"
         help: "మీరు ప్రస్తుతం కన్నేసిన లేదా గమనిస్తున్న చదవని టపాలతో ఉన్న విషయాలు "
+        lower_title_with_count:
+          one: "%{count} చదవనవి"
+          other: "%{count} చదవనవి"
       new:
         lower_title: "కొత్త"
         title: "కొత్త"
@@ -1289,6 +1333,8 @@ te:
       add_synonyms: "కలుపు"
       sort_by_name: "పేరు"
       cancel_delete_unused: "రద్దుచేయి"
+      filters:
+        without_category: "%{filter} %{tag} విషయాలు"
       notifications:
         watching:
           title: "కన్నేసారు"
@@ -1313,6 +1359,9 @@ te:
     footer_nav:
       back: "వెనుకకు"
       share: "పంచు"
+    do_not_disturb:
+      options:
+        custom: "అనురూప"
   admin_js:
     type_to_filter: "జల్లించుటకు రాయి..."
     admin:
@@ -1401,6 +1450,8 @@ te:
         show_details: వివరాలు
         description: వివరణ
         save: భద్రపరచు
+        scopes:
+          action: చర్య
       web_hooks:
         save: "భద్రపరచు"
         destroy: "తొలగించు"
@@ -1505,6 +1556,7 @@ te:
           installed: "ప్రతిష్టించబడింది"
           install_popular: "ప్రముఖ"
           about_theme: "గురించి"
+          version: "సంచిక:"
           enable: "చేతనం"
           disable: "అచేతనం"
           add: "కలుపు"
@@ -1616,6 +1668,7 @@ te:
           do_nothing: "ఏమీ చేయకు"
         staff_actions:
           all: "అన్నీ"
+          filter: "జల్లెడ:"
           title: "సిబ్బింది చర్యలు"
           clear_filters: "మొత్తం చూపు"
           staff_user: "సభ్యుడు"
@@ -1677,6 +1730,7 @@ te:
         logster:
           title: "దోష లాగులు"
       watched_words:
+        search: "వెతుకు"
         clear_filter: "శుభ్రపరుచు"
         download: దిగుమతి
         actions:
@@ -1717,6 +1771,8 @@ te:
         check_email:
           title: "ఈ సభ్యుని ఈమెయిల్ చూపు"
           text: "చూపు"
+        check_sso:
+          text: "చూపు"
       user:
         suspend_failed: "ఈ సభ్యుడిని సస్పెండ్ చేసేప్పుడు ఏదో తేడా జరిగింది. %{error}"
         unsuspend_failed: "ఈ వినియోగదారు వలన ఏదో తొలగింపబడని తప్పు జరిగింది %{error}"
@@ -1812,10 +1868,9 @@ te:
           on_grace_period: "ప్రస్తుతం స్థాయి పెరుగుదల అదనపుకాలంలో ఉంది, స్థాయి తగ్గింపు జరగదు."
           locked_will_not_be_promoted: "నమ్మకపు స్థాయి బంధించబడి ఉంది. స్థాయి పెరుగుదల ఉండదు."
           locked_will_not_be_demoted: "నమ్మకపు స్థాయి బంధించబడి ఉంది.ఎప్పటికీ స్థానాన్ని తగ్గించలేరు."
-        sso:
-          title: "ఒక సైన్ ఆన్"
+        discourse_connect:
           external_id: "బాహ్య ఐడీ"
-          external_username: "సభ్యనామం"
+          external_username: "వాడుకరి పేరు"
           external_name: "పేరు"
           external_email: "ఈమెయిల్"
           external_avatar_url: "ప్రవర బొమ్మ యూఆర్ యల్"
@@ -1977,6 +2032,7 @@ te:
       uploading: "ఎగుమతవుతోంది..."
       upload_error: "క్షమించాలి. దస్త్రం ఎగుమతించుటలో దోషం. దయచేసి మరలా ప్రయత్నించండి. "
       invites:
+        add_user: "కలుపు"
         roles:
           admin: "అధికారి"
           moderator: "నిర్వాహకుడు"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index dcab0dda1f..bb3762e11d 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -129,6 +129,8 @@ th:
         disabled: "ลบแบนเนอร์นี้%{when} จะไม่ปรากฏที่ด้านบนของหน้าใดๆ"
       forwarded: "ส่งต่ออีเมลข้างต้นแล้ว"
     emails_are_disabled: "อีเมลขาออกทั้งหมดถูกปิดโดยผู้ดูแลระบบ จะไม่มีอีเมลแจ้งเตือนใดๆถูกส่งออกไป"
+    software_update_prompt:
+      dismiss: "ซ่อน"
     themes:
       default_description: "ค่าเริ่มต้น"
     s3:
@@ -186,6 +188,8 @@ th:
     now: "ขณะนี้"
     read_more: "อ่านเพิ่มเติม"
     more: "เพิ่มเติม"
+    x_more:
+      other: "อีก %{count}"
     less: "น้อย"
     never: "ไม่เคย"
     every_30_minutes: "ทุก 30 นาที"
@@ -213,8 +217,6 @@ th:
       moderators: "ผู้ดูแล"
       stat:
         all_time: "ตลอดเวลา"
-        last_7_days: "7 วันที่ผ่านมา"
-        last_30_days: "30 วันที่ผ่านมา"
       like_count: "ถูกใจ"
       topic_count: "กระทู้"
       post_count: "โพสต์"
@@ -242,16 +244,6 @@ th:
         on_owner_reply: "หลังจากฉันตอบกลับกระทู้นี้"
       search: "ค้นหา"
       reminders:
-        later_today: "ภายหลังในวันนี้"
-        next_business_day: "ในวันทำการถัดไป"
-        tomorrow: "พรุ่งนี้"
-        next_week: "สัปดาห์หน้า"
-        later_this_week: "ภายหลังในสัปดาห์นี้"
-        start_of_next_business_week: "วันจันทร์"
-        start_of_next_business_week_alt: "วันจันทร์หน้า"
-        next_month: "เดือนหน้า"
-        custom: "วันและเวลาที่กำหนดเอง"
-        last_custom: "ล่าสุด"
         today_with_time: "วันนี้ตอน%{time}"
         tomorrow_with_time: "พรุ่งนี้ตอน%{time}"
         at_time: "เมื่อ%{date_time}"
@@ -263,10 +255,6 @@ th:
       new_topic: "แบบร่างกระทู้ใหม่"
       new_private_message: "แบบร่างข้อความส่วนตัวใหม่"
       topic_reply: "ตอบแบบร่าง"
-      abandon:
-        confirm: "คุณได้เปิดแบบร่างอื่นในกระทู้นี้แล้ว แน่ใจหรือว่าต้องการละทิ้งมัน"
-        yes_value: "ใช่ ละทิ้ง"
-        no_value: "ไม่ เก็บไว้"
     topic_count_latest:
       other: "ดู %{count} กระทู้ใหม่หรือที่อัปเดต"
     topic_count_unread:
@@ -327,6 +315,7 @@ th:
       title: "รีวิว"
       topic: "กระทู้:"
       filtered_user: "ผู้ใช้"
+      filtered_reviewed_by: "รีวิวโดย"
       show_all_topics: "แสดงกระทู้ทั้งหมด"
       deleted_post: "(โพสต์ถูกลบ)"
       deleted_user: "(ผู้ใช้ถูกลบ)"
@@ -335,9 +324,8 @@ th:
         username: "ชื่อผู้ใช้"
         email: "อีเมล"
         name: "ชื่อ"
+        reject_reason: "เหตุผล"
       user_percentage:
-        summary:
-          other: "%{agreed},%{disagreed},%{ignored} (%{count}ธงทั้งหมด)"
         agreed:
           other: "%{count}% เห็นด้วย"
         disagreed:
@@ -369,6 +357,7 @@ th:
           score: "คะแนน"
           created_at: "ถูกสร้างเมื่อ"
         priority:
+          low: "ต่ำ"
           medium: "ปานกลาง"
           high: "สูง"
       conversation:
@@ -401,12 +390,28 @@ th:
           flagged_by: "ถูกปักธงโดย"
         reviewable_user:
           title: "ผู้ใช้"
+        reviewable_post:
+          title: "โพสต์"
       approval:
         title: "โพสต์นี้ต้องได้รับการอนุมัติ"
         description: "เราได้รับโพสต์ใหม่ของคุณแล้ว แต่ต้องได้รับการอนุมัติจากผู้ดูแลก่อนถึงจะปรากฏขึ้น กรุณารอสักครู่"
         pending_posts:
           other: "คุณมี<strong>%{count}</strong>โพสต์ที่กำลังรอการยืนยัน"
         ok: "ตกลง"
+      example_username: "ผู้ใช้"
+    relative_time_picker:
+      days:
+        other: "วัน"
+    time_shortcut:
+      later_today: "ภายหลังในวันนี้"
+      next_business_day: "ในวันทำการถัดไป"
+      tomorrow: "พรุ่งนี้"
+      next_week: "สัปดาห์หน้า"
+      later_this_week: "ภายหลังในสัปดาห์นี้"
+      start_of_next_business_week: "วันจันทร์"
+      start_of_next_business_week_alt: "วันจันทร์หน้า"
+      next_month: "เดือนหน้า"
+      custom: "วันและเวลาที่กำหนดเอง"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a> โพสต์ <a href='%{topicUrl}'>กระทู้</a>"
       you_posted_topic: "<a href='%{userUrl}'>คุณ</a> โพสต์ <a href='%{topicUrl}'>กระทู้</a>"
@@ -422,6 +427,7 @@ th:
       sent_by_user: "ถูกส่งโดย <a href='%{userUrl}'>%{user}</a>"
       sent_by_you: "ถูกส่งโดย <a href='%{userUrl}'>คุณ</a>"
     directory:
+      username: "ชื่อผู้ใช้"
       filter_name: "กรองด้วยชื่อผู้ใช้"
       title: "ผู้ใช้"
       likes_given: "ให้"
@@ -473,9 +479,17 @@ th:
           credentials:
             username: "ชื่อผู้ใช้"
             password: "รหัสผ่าน"
+          settings:
+            title: "การตั้งค่า"
+          mailboxes:
+            disabled: "ปิดใช้งานแล้ว"
         membership:
           title: การเป็นสมาชิก
           access: การเข้าถึง
+        categories:
+          title: หมวดหมู่
+        tags:
+          title: แท็ก
         logs:
           when: "เมื่อ"
           acting_user: "ผู้ใช้ชั่วคราว"
@@ -606,15 +620,18 @@ th:
       posts: "โพสต์"
       topics: "กระทู้"
       latest: "ล่าสุด"
-      latest_by: "ล่าสุดโดย"
       toggle_ordering: "เปลี่ยนวิธีการจัดลำดับ"
       subcategories: "หมวดหมู่ย่อย"
       topic_sentence:
         other: "%{count}กระทู้"
+      topic_stat_unit:
+        week: "สัปดาห์"
+        month: "เดือน"
       topic_stat_sentence_week:
         other: "%{count}กระทู้ใหม่ในสัปดาห์ที่ผ่านมา"
       topic_stat_sentence_month:
         other: "%{count}กระทู้ใหม่ในเดือนที่ผ่านมา"
+      n_more: "หมวดหมู่ (อีก%{count})..."
     ip_lookup:
       title: มองหาที่อยู่ไอพี
       hostname: ชื่อโฮสต์
@@ -665,7 +682,12 @@ th:
         mute_option_title: "คุณจะไม่ได้รับการแจ้งเตือนใดๆที่เกี่ยวกับผู้ใช้นี้"
         normal_option: "ปกติ"
         normal_option_title: "คุณจะได้รับการแจ้งเตือนเมื่อผู้ใช้นี้ตอบคุณ อ้างอิงถึงคุณ หรือกล่าวถึงคุณ"
+      notification_schedule:
+        none: "ไม่มี"
+        monday: "วันจันทร์"
+        to: "ถึง"
       activity_stream: "กิจกรรม"
+      read: "อ่าน"
       preferences: "การตั้งค่า"
       feature_topic_on_profile:
         open_search: "เลือกกระทู้ใหม่"
@@ -694,7 +716,6 @@ th:
         perm_denied_expl: "คุณปฏิเสธการอนุญาตการแจ้งเตือน เปิดการแจ้งเตือนในการตั้งค่าบราวเซอร์ของคุณ"
         disable: "ปิดการแจ้งเตือน"
         enable: "เปิดการแจ้งเตือน"
-        each_browser_note: "โปรดทราบ: คุณต้องเปลี่ยนการตั้งค่านี้บนทุกบราวเซอร์ที่คุณใช้"
         consent_prompt: "เมื่อมีคนตอบกลับโพสต์ของคุณ คุณต้องการการแจ้งเตือนโดยทันทีหรือไม่"
       dismiss: "ซ่อน"
       dismiss_notifications: "ซ่อนทั้งหมด"
@@ -702,6 +723,8 @@ th:
       first_notification: "การแจ้งเตือนแรกของคุณ! กดเลือกเพื่อเริ่มต้น"
       dynamic_favicon: "แสดงจำนวนบนไอคอนเบราว์เซอร์"
       theme_default_on_all_devices: "ทำให้ธีมนี้เป็นธีมเริ่มต้นบนทุกอุปกรณ์ของฉัน"
+      color_schemes:
+        regular: "ทั่วไป"
       text_size_default_on_all_devices: "ทำให้ขนาดฟอนต์นี้เป็นค่าเริ่มต้นบนทุกอุปกรณ์ของฉัน"
       allow_private_messages: "อนุญาตให้ผู้ใช้อื่นส่งข้อความส่วนตัวหาฉัน"
       external_links_in_new_tab: "เปิดลิงก์ภายนอกทั้งหมดในแท็บใหม่"
@@ -715,6 +738,7 @@ th:
       suspended_notice: "ผู้ใช้นี้ถูกระงับจนถึง %{date}"
       suspended_permanently: "ผู้ใช้นี้ถูกระงับชั่วคราว"
       suspended_reason: "เหตุผล:"
+      github_profile: "กิตฮับ"
       email_activity_summary: "สรุปกิจกรรม"
       mailing_list_mode:
         label: "โหมดจดหมายข่าว"
@@ -735,6 +759,7 @@ th:
       watched_first_post_categories: "กำลังดูโพสต์แรก"
       watched_first_post_tags: "กำลังดูโพสต์แรก"
       muted_categories: "ปิดเสียง"
+      regular_categories: "ทั่วไป"
       delete_account: "ลบบัญชีของฉัน"
       delete_account_confirm: "คุณแน่ใจไหมที่จะลบบัญชีอย่างถาวร การดำเนินการนี้ไม่สามารถยกเลิกได้"
       deleted_yourself: "บัญชีของคุณถูกลบเรียบร้อยแล้ว"
@@ -773,6 +798,7 @@ th:
         tags: "แท็ก"
       preferences_nav:
         account: "บัญชี"
+        security: "ความปลอดภัย"
         profile: "โปรไฟล์"
         emails: "อีเมล"
         notifications: "การแจ้งเตือน"
@@ -966,43 +992,37 @@ th:
         after_5_minutes: "หลังจาก 5 นาที"
         after_10_minutes: "หลังจาก 10 นาที"
       invited:
-        search: "พิมพ์เพื่อค้นหาคำเชิญ..."
         title: "เชิญชวน"
+        pending_tab: "กำลังรอ"
+        pending_tab_with_count: "กำลังรอ (%{count})"
+        redeemed_tab: "ยืนยัน"
+        redeemed_tab_with_count: "ยืนยันแล้ว (%{count})"
+        invited_via: "คำเชิญ"
+        groups: "กลุ่ม"
+        topic: "หัวข้อ"
+        expires_at: "หมดอายุ"
+        edit: "แก้ไข"
+        remove: "ลบ"
+        reinvited: "การเชิญชวนถูกส่งอีกครั้งแล้ว"
+        search: "พิมพ์เพื่อค้นหาคำเชิญ..."
         user: "เชิญชวนผู้ใช้แล้ว"
-        sent: "ส่งล่าสุด"
         none: "ไม่มีคำเชิญที่จะแสดง"
         truncated:
           other: "กำลังแสดงคำเชิญ %{count} รายการแรก"
         redeemed: "ยืนยันการเชิญชวน"
-        redeemed_tab: "ยืนยัน"
-        redeemed_tab_with_count: "ยืนยันแล้ว (%{count})"
         redeemed_at: "ยืนยัน"
         pending: "คำเชิญที่กำลังรอการพิจารณา"
-        pending_tab: "กำลังรอ"
-        pending_tab_with_count: "กำลังรอ (%{count})"
         topics_entered: "กระทู้ที่ดูแล้ว"
         posts_read_count: "โพสต์ที่อ่านแล้ว"
         expired: "การเชิญชวนนี้หมดอายุแล้ว"
-        rescind: "ลบ"
-        rescinded: "การเชิญชวนถูกลบออก"
-        rescind_all: "ลบคำเชิญที่หมดอายุ"
-        rescinded_all: "คำเชิญที่หมดอายุทั้งหมดถูกลบแล้ว!"
-        rescind_all_confirm: "คุณแน่ใจหรือว่าต้องการลบคำเชิญที่หมดอายุทั้งหมด"
-        reinvite: "ส่งการเชิญชวนอีกครั้ง"
-        reinvite_all: "ส่งการเชิญชวนทั้งหมดอีกครั้ง"
+        remove_all: "ลบคำเชิญที่หมดอายุ"
+        removed_all: "คำเชิญที่หมดอายุทั้งหมดถูกลบแล้ว!"
+        remove_all_confirm: "คุณแน่ใจหรือว่าต้องการลบคำเชิญที่หมดอายุทั้งหมด"
         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: "เชิญ"
         valid_for: "ลิงก์คำเชิญใช้งานได้กับที่อยู่อีเมลนี้เท่านั้น: %{email}"
         invite_link:
           title: "ลิงก์คำเชิญ"
@@ -1010,8 +1030,6 @@ th:
           error: "มีข้อผิดพลาดในการสร้างลิงก์คำเชิญ"
           max_redemptions_allowed_label: "มีกี่คนที่ได้รับอนุญาตให้ลงทะเบียนใช้ลิงก์นี้"
           expires_at: "ลิงก์คำเชิญนี้จะหมดอายุเมื่อไร"
-        bulk_invite:
-          success: "ไฟล์ถูกอัปโหลดเรียบร้อยแล้ว คุณจะได้รับการแจ้งเตือนทางข้อความเมื่อขั้นตอนเสร็จสิ้น"
       password:
         title: "รหัสผ่าน"
         too_short: "รหัสผ่านสั้นเกินไป"
@@ -1104,7 +1122,6 @@ th:
       close: "ปิด"
       dismiss_error: "ละทิ้งข้อผิดพลาด"
     close: "ปิด"
-    assets_changed_confirm: "เว็บไซต์นี้พึ่งอัปเดต รีเฟรชตอนนี้เพื่อใช้เวอร์ชันล่าสุด"
     logout: "คุณได้ออกจากระบบ"
     refresh: "รีเฟรช"
     home: "หน้าแรก"
@@ -1113,15 +1130,6 @@ th:
       login_disabled: "การลงชื่อเข้าใช้จะไม่สามารถใช้งานได้เมื่อเว็บไซต์อยู่ในโหมดอ่านเท่านั้น"
       logout_disabled: "การออกจากระบบจะไม่สามารถใช้งานได้เมื่อเว็บไซต์อยู่ในโหมดอ่านเท่านั้น"
     learn_more: "เรียนรู้เพิ่มเติม..."
-    all_time: "ทั้งหมด"
-    all_time_desc: "กระทู้ทั้งหมดถูกสร้าง"
-    year: "ปี"
-    year_desc: "กระทู้ที่ถูกสร้างใน 365 วันที่ผ่านมา"
-    month: "เดือน"
-    month_desc: "กระทู้ที่ถูกสร้างใน 30 วันที่ผ่านมา"
-    week: "สัปดาห์"
-    week_desc: "กระทู้ที่ถูกสร้างใน 7 วันที่ผ่านมา"
-    day: "วัน"
     first_post: โพสต์แรก
     mute: ปิดเสียง
     unmute: เลิกปิดเสียง
@@ -1138,11 +1146,10 @@ th:
       sign_up: "สมัครสมาชิก"
       hide_session: "เตือนฉันพรุ่งนี้"
       hide_forever: "ไม่เป็นไร"
-      hidden_for_session: "ไม่เป็นไร ฉันจะถามคุณพรุ่งนี้อีกครั้ง คุณสามารถใช้เมนู เข้าสู่ระบบ เพื่อสร้างบัญชีได้เช่นกัน"
     summary:
       enabled_description: "คุณกำลังดูสรุปของกระทู้นี้ : นี่คือโพสที่น่าสนใจที่สุดที่หลายๆคนแนะนำ"
-      description: "มี <b>%{replyCount}</b> คำตอบ"
-      description_time: "มี <b>%{replyCount}</b> คำตอบ โดยมีเวลาการอ่านประมาณ <b>%{readingTime} นาที</b>."
+      description:
+        other: "มี <b>%{count}</b> คำตอบ"
       enable: "สรุปกระทู้นี้"
       disable: "แสดงโพสต์ทั้งหมด"
     deleted_filter:
@@ -1152,6 +1159,9 @@ th:
       disable: "แสดงโพสต์ที่ถูกลบ"
     private_message_info:
       title: "ข้อความ"
+      invite: "เชิญผู้อื่น..."
+      edit: "เพิ่มหรือลบ..."
+      add: "เพิ่ม..."
       leave_message: "คุณต้องการละทิ้งข้อความนี้จริงๆใช่หรือไม่"
       remove_allowed_user: "คุณต้องการลบ %{name} จากข้อความนี้ใช่หรือไม่"
       remove_allowed_group: "คุณต้องการลบ %{name} จากข้อความนี้ใช่หรือไม่"
@@ -1164,7 +1174,6 @@ th:
     search_hint: "ชื่อผู้ใช้ อีเมล หรือที่อยู่ไอพี"
     create_account:
       disclaimer: "เมื่อลงทะเบียน คุณได้ยอมรับ <a href='%{privacy_link}' target='blank'>นโยบายความเป็นส่วนตัว</a> และ <a href='%{tos_link}' target='blank'> เงื่อนไขการบริการ</a>"
-      title: "สร้างบัญชีใหม่"
       failed: "มีบางอย่างผิดพลาด อีเมลนี้อาจถูกลงทะเบียนไว้แล้ว กดลิงก์หากลืมรหัสผ่าน"
     forgot_password:
       title: "รีเซ็ตรหัสผ่าน"
@@ -1185,11 +1194,9 @@ th:
       logging_in_as: กำลังเข้าสู่ระบบด้วย %{email}
       confirm_button: เสร็จสิ้นการเข้าสู่ระบบ
     login:
-      title: "เข้าสู่ระบบ"
       username: "ชื่อผู้ใช้"
       password: "รหัสผ่าน"
       security_key_alternative: "ลองวิธีอื่น"
-      email_placeholder: "อีเมลหรือชื่อผู้ใช้"
       caps_lock_warning: "เปิดแคปล็อคอยู่"
       error: "ข้อผิดพลาดไม่ทราบสาเหตุ"
       cookies_error: "ดูเหมือนว่าเบราว์เซอร์ของคุณจะปิดการใช้งานคุกกี้ คุณอาจไม่สามารถเข้าสู่ระบบได้หากไม่เปิดใช้งานก่อน"
@@ -1240,6 +1247,7 @@ th:
       accept_invite: "ยอมรับคำเชิญ"
       success: "บัญชีของคุณถูกสร้าง คุณได้เข้าสู่ระบบแล้ว"
       name_label: "ชื่อ"
+      password_label: "รหัสผ่าน"
       optional_description: "(ทางเลือก)"
     password_reset:
       continue: "ดำเนินการต่อไปยัง %{site_name}"
@@ -1262,6 +1270,9 @@ th:
       enter: "เอ็นเทอร์"
     conditional_loading_section:
       loading: กำลังโหลด...
+    category_row:
+      topic_count:
+        other: "%{count}กระทู้ในหมวดหมู่นี้"
     select_kit:
       default_header_text: เลือก...
       no_content: ไม่พบผลลัพธ์ที่ตรงกัน
@@ -1272,6 +1283,8 @@ th:
         other: "คุณสามารถเลือกได้ %{count} รายการเท่านั้น"
       min_content_not_reached:
         other: "เลือกอย่างน้อย %{count} รายการ"
+      invalid_selection_length:
+        other: "การเลือกต้องมีอย่างน้อย %{count} ตัวอักษร"
     date_time_picker:
       from: จาก
       to: ถึง
@@ -1296,7 +1309,6 @@ th:
       default: อีโมจิที่กำหนดเอง
     shared_drafts:
       title: "แบบร่างที่ถูกแบ่งปัน"
-      notice: "กระทู้นี้แสดงให้ผู้ที่สามารถเห็นหมวดหมู่ <b>%{category}</b> เท่านั้น"
       publish: "เผยแพร่แบบร่างที่ถูกแบ่งปัน"
       confirm_publish: "คุณแน่ใจหรือว่าต้องการเผยแพร่แบบร่างนี้"
       publishing: "กำลังเผยแพร่กระทู้..."
@@ -1305,7 +1317,6 @@ th:
       more_emoji: "อื่นๆ..."
       options: "ตัวเลือก"
       whisper: "กระซิบ"
-      blockquote_text: "ส่วนอ้างถึง"
       add_warning: "นี่คือคำเตือนอย่างเป็นทางการ"
       toggle_whisper: "เปิดกระซิบ"
       posting_not_on_topic: "กระทู้ไหนที่คุณต้องการตอบ"
@@ -1316,12 +1327,17 @@ th:
       reference_topic_title: "ตอบกลับ: %{title}"
       error:
         title_missing: "ต้องมีชื่อเรื่อง"
-        title_too_short: "ชื่อเรื่องต้องมีอย่างน้อย %{min} ตัวอักษร"
-        title_too_long: "ชื่อเรื่องต้องไม่ยาวเกิน %{max} ตัวอักษร"
+        title_too_short:
+          other: "ชื่อเรื่องต้องมีอย่างน้อย %{count} ตัวอักษร"
+        title_too_long:
+          other: "ชื่อเรื่องต้องไม่ยาวเกิน %{count} ตัวอักษร"
         post_missing: "โพสต์ไม่สามารถว่างได้"
-        post_length: "โพสต์ต้องมีอย่างน้อย %{min} ตัวอักษร"
+        post_length:
+          other: "โพสต์ต้องมีอย่างน้อย %{count} ตัวอักษร"
         try_like: "คุณได้ลองปุ่ม %{heart} แล้วหรือยัง"
         category_missing: "คุณต้องเลือกหมวดหมู่"
+        tags_missing:
+          other: "คุณต้องเลือกอย่างน้อย %{count} แท็ก"
       save_edit: "บันทึกการแก้ไข"
       reply_original: "ตอบบนกระทู้ต้นฉบับ"
       reply_here: "ตอบที่นี่"
@@ -1344,8 +1360,6 @@ th:
       saved: "บันทึกแล้ว!"
       saved_draft: "โพสต์ร่างกำลังดำเนินการ กดเพื่อดำเนินการต่อ"
       uploading: "กำลังอัปโหลด..."
-      show_preview: "แสดงตัวอย่าง &raquo;"
-      hide_preview: "&raquo; ซ่อนตัวอย่าง"
       quote_post_title: "อ้างถึงโพสต์ทั้งหมด"
       bold_label: "หนา"
       bold_title: "หนา"
@@ -1358,8 +1372,8 @@ th:
       link_dialog_title: "เพิ่มลิงค์"
       link_optional_text: "ชื่อเรื่องเพิ่มเติม"
       link_url_placeholder: "วาง URL หรือพิมพ์เพื่อค้นหากระทู้"
-      quote_title: "ส่วนอ้างถึง"
-      quote_text: "ส่วนอ้างถึง"
+      blockquote_title: "ส่วนอ้างถึง"
+      blockquote_text: "ส่วนอ้างถึง"
       code_title: "ข้อความก่อนจัดรูปแบบ"
       code_text: "ข้อความก่อนจัดรูปแบบเยื้อง 4 เคาะ"
       paste_code_text: "พิมพ์หรือวางโค้ดที่นี่"
@@ -1396,9 +1410,9 @@ th:
           label: "กระทู้ใหม่"
         shared_draft:
           label: "แบบร่างที่ถูกแบ่งปัน"
-          desc: "ร่างกระทู้ที่สามารถเห็นแค่ทีมงาน"
         toggle_topic_bump:
           desc: "ตอบกลับโดยไม่เปลี่ยนวันที่ตอบกลับล่าสุด"
+      ignore: "ไม่สนใจ"
     notifications:
       tooltip:
         regular:
@@ -1419,6 +1433,9 @@ th:
       posted: "<span>%{username}</span>%{description}"
       edited: "<span>%{username}</span>%{description}"
       liked: "<span>%{username}</span>%{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span>%{description}"
+      liked_many:
+        other: "<span class='multi-user'>%{username}, %{username2} และอื่นๆอีก %{count}</span>%{description}"
       liked_consolidated_description:
         other: "ถูกใจ %{count} ครั้งต่อโพสต์ของคุณ"
       liked_consolidated: "<span>%{username}</span>%{description}"
@@ -1431,6 +1448,8 @@ th:
       topic_reminder: "<span>%{username}</span>%{description}"
       watching_first_post: "<span>กระทู้ใหม่</span>%{description}"
       membership_request_accepted: "ถูกรับเป็นสมาชิกในกลุ่ม '%{group_name}'"
+      reaction: "<span>%{username}</span>%{description}"
+      reaction_2: "<span>%{username}, %{username2}</span>%{description}"
       group_message_summary:
         other: "%{count}ข้อความในกล่องขาเข้าของกลุ่ม %{group_name}"
       popup:
@@ -1466,10 +1485,7 @@ th:
       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: "คุณสามารถลากหรือวางรูปภาพในช่องแก้ไขได้ด้วย"
       uploading: "กำลังอัปโหลด"
       select_file: "เลือกไฟล์"
@@ -1494,6 +1510,7 @@ th:
       or_search_google: "หรือลองค้นหาด้วยกูเกิล:"
       search_google: "ลองค้นหาด้วยกูเกิล:"
       search_google_button: "กูเกิล"
+      search_button: "ค้นหา"
       context:
         user: "ค้นหาโพสต์โดย @%{username}"
         category: "ค้นหาหมวด #%{category}"
@@ -1533,16 +1550,19 @@ th:
           noreplies: ไม่มีการตอบกลับ
           single_user: มีผู้ใช้คนเดียว
         post:
+          count:
+            label: โพสต์
           time:
             label: โพสต์แล้ว
             before: ก่อน
             after: หลังจาก
+        views:
+          label: ดู
     hamburger_menu: "ไปยังรายการกระทู้หรือหมวดหมู่อื่น"
     new_item: "ใหม่"
     go_back: "ย้อนกลับ"
     not_logged_in_user: "หน้าผู้ใช้พร้อมสรุปกิจกรรมล่าสุดและการตั้งค่า"
     current_user: "ไปยังหน้าผู้ใช้ของคุณ"
-    view_all: "ดูทั้งหมด"
     topics:
       new_messages_marker: "เยี่ยมชมครั้งล่าสุด"
       bulk:
@@ -1562,6 +1582,7 @@ th:
         change_category: "ตั้งค่าหมวดหมู่"
         close_topics: "ปิดกระทู้"
         archive_topics: "คลังกระทู้"
+        move_messages_to_inbox: "ย้ายไปกล่องขาเข้า"
         notification_level: "การแจ้งเตือน"
         choose_new_category: "เลือกหมวดหมู่ใหม่ให้กระทู้"
         selected:
@@ -1584,6 +1605,7 @@ th:
         new: "ไม่มีกระทู้ใหม่อีกแล้ว"
         unread: "ไม่มีกระทู้ที่ยังไม่อ่านอีกแล้ว"
         category: "ไม่มีกระทู้อื่นอีกใน %{category}"
+        tag: "ไม่มีกระทู้อื่นอีกใน %{tag}"
         top: "ไม่มีกระทู้ยอดนิยมอีกแล้ว"
         bookmarks: "ไม่มีกระทู้ที่บุ๊กมาร์กอีกแล้ว"
     topic:
@@ -1642,11 +1664,15 @@ th:
       jump_reply_up: ข้ามไปยังคำตอบก่อนหน้านี้
       jump_reply_down: ข้ามไปยังคำตอบหลังจากนี้
       deleted: "กระทู้ถูกลบ"
+      slow_mode_update:
+        save: "เปิดใช้งาน"
+        remove: "ปิดใช้งาน"
       topic_status_update:
         num_of_hours: "จำนวนชั่วโมง:"
         num_of_days: "จำนวนวัน:"
         publish_to: "เผยแพร่ไปยัง:"
         when: "เมื่อ:"
+        time_frame_required: "กรุณาเลือกระยะเวลา"
       auto_update_input:
         now: "ตอนนี้"
         later_today: "ภายหลังในวันนี้"
@@ -1654,13 +1680,7 @@ th:
         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:
@@ -1682,7 +1702,7 @@ th:
       status_update_notice:
         auto_open: "กระทู้นี้จะเปิดโดยอัตโนมัติ%{timeLeft}"
         auto_close: "กระทู้นี้จะถูกปิดอัตโนมัติใน %{timeLeft}"
-        auto_close_based_on_last_post: "กระทู้นี้จะถูกปิด %{duration} หลังจากการตอบล่าสุด"
+        auto_close_after_last_post: "กระทู้นี้จะถูกปิด %{duration} หลังจากการตอบล่าสุด"
         auto_delete: "กระทู้นี้จะลบโดยอัตโนมัติ%{timeLeft}"
         auto_reminder: "คุณจะถูกเตือนเกี่ยวกับกระทู้นี้%{timeLeft}"
         auto_delete_replies: "คำตอบในกระทู้นี้จะถูกลบโดยอัตโนมัติหลังจาก%{duration}"
@@ -1699,7 +1719,8 @@ th:
         go: "ไป"
         jump_bottom: "ข้ามไปยังโพสต์ล่าสุด"
         jump_prompt: "ข้ามไปยัง..."
-        jump_prompt_of: "ของ %{count} โพสต์"
+        jump_prompt_of:
+          other: "ของ %{count} โพสต์"
         jump_prompt_long: "ข้ามไปยัง..."
         jump_bottom_with_number: "ข้ามไปยังโพสต์ %{post_number}"
         jump_prompt_to_date: "ไปวันที่"
@@ -1777,6 +1798,7 @@ th:
         title: "แบ่งปัน"
         extended_title: "แบ่งปันลิงก์"
         help: "แบ่งปันลิงก์ไปยังกระทู้นี้"
+        invite_users: "เชิญ"
       print:
         title: "พิมพ์เอกสาร"
       flag_topic:
@@ -1795,6 +1817,8 @@ th:
         already_pinned:
           other: "ตอนนี้กระทู้ถูกปักหมุดใน %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "ทำให้กระทู้นี้ปรากฏด้านบนสุดของรายการกระทู้ทั้งหมดจนกระทั่ง"
+        confirm_pin_globally:
+          other: "คุณมีกระทู้ที่ปักหมุดทั้งหมด %{count}  กระทู้ การมีกระทู้ที่ปักหมุดมากๆอาจสร้างปัญหาให้แก่ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อได้ คุณแน่ใจหรือว่าจะปักหมุดกระทู้เพิ่มอีกในหมวดหมู่นี้"
         unpin_globally: "ลบกระทู้นี้ออกจากด้านบนสุดของรายการกระทู้ทั้งหมด"
         unpin_globally_until: "ลบกระทู้นี้ออกจากด้านบนสุดของรายการกระทู้ทั้งหมดหรือรอจนกระทั่ง <strong>%{until}</strong>"
         make_banner: "ทำให้กระทู้นี้เป็นแบนเนอร์ที่จะแสดงอยู่ด้านบนสุดของทุกหน้า"
@@ -1818,8 +1842,7 @@ th:
         username_placeholder: "ชื่อผู้ใช้"
         action: "ส่งคำเชิญ"
         help: "เชิญคนอื่นมาที่กระทู้นี้โดยอีเมลหรือการแจ้งเตือน"
-        to_forum: "เราจะส่งอีเมลสั้นๆเพื่ออนุญาตให้เพื่อนของคุณเข้าร่วมได้โดยทันทีเพียงคลิกลิงก์ ไม่จำเป็นต้องเข้าสู่ระบบ"
-        sso_enabled: "กรอกชื่อผู้ใช้ของคนที่คุณต้องการเชิญมายังกระทู้นี้"
+        discourse_connect_enabled: "กรอกชื่อผู้ใช้ของคนที่คุณต้องการเชิญมายังกระทู้นี้"
         to_topic_blank: "กรอกชื่อผู้ใช้หรือที่อยู่อีเมลของคนที่คุณต้องการเชิญมายังกระทู้นี้"
         to_topic_email: "คุณได้กรอกที่อยู่อีเมลแล้ว เราจะส่งอีเมลคำเชิญเพื่ออนุญาตเพื่อนของคุณให้ตอบกลับกระทู้นี้ได้โดยทันที"
         to_topic_username: "คุณได้กรอกชื่อผู้ใช้แล้ว เราจะส่งการแจ้งเตือนพร้อมลิงก์เพื่อเชิญพวกเขามายังกระทู้นี้"
@@ -1907,15 +1930,16 @@ th:
         other: "(กระทู้ถูกแจ้งลบโดยเจ้าของ และจะถูกลบโดยอัตโนมัติใน%{count}ชั่วโมง เว้นแต่จะถูกปักธง)"
     post:
       quote_reply: "อ้างอิง"
+      quote_share: "แบ่งปัน"
       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} ชั่วโมงเว้นแต่จะถูกปักธง)"
+      collapse: "ย่อ"
       expand_collapse: "ขยาย/ย่อ"
       locked: "ทีมงานได้ปิดโพสต์นี้จากการแก้ไข"
       gap:
@@ -1937,19 +1961,11 @@ th:
         edit: "ขออภัย เกิดความผิดพลาดขณะกำลังแก้ไขโพสต์ของคุณ กรุณาลองใหม่อีกครั้ง"
         upload: "ขออภัย เกิดความผิดพลาดขณะกำลังอัปโหลดไฟล์ของคุณ กรุณาลองใหม่อีกครั้ง"
         too_many_uploads: "ขออภัย คุณสามารถอัปโหลดได้ครั้งละหนึ่งไฟล์เท่านั้น"
+        too_many_dragged_and_dropped_files:
+          other: "ขออภัย คุณสามารถอัปโหลดได้ครั้งละ %{count}ไฟล์เท่านั้น"
         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: "โพสนี้คือการกระซิบจากผู้ดูแล"
       wiki:
@@ -2061,8 +2077,14 @@ th:
       change_in_category_topic: "แก้ไขรายละเอียด"
       already_used: "สีนี้ถูกใช้สำหรับหมวดหมู่อื่นแล้ว"
       security: "ความปลอดภัย"
+      permissions:
+        group: "กลุ่ม"
+        see: "ดู"
+        reply: "ตอบกลับ"
+        create: "สร้าง"
       pending_permission_change_alert: "คุณยังไม่ได้เพิ่ม %{group} ไปยังหมวดหมู่นี้ คลิกปุ่มนี้เพื่อเพิ่ม"
       images: "รูปภาพ"
+      email_in: "ตั้งที่อยู่สำหรับอีเมลขาเข้า:"
       email_in_allow_strangers: "ยอมรับอีเมลจากผู้ใช้ที่ไม่ระบุชื่อและไม่มีบัญชี"
       edit_permissions: "แก้ไขการอนุญาต"
       review_group_name: "ชื่อกลุ่ม"
@@ -2091,6 +2113,7 @@ th:
           high: "สูง"
           very_high: "สูงมาก"
       sort_options:
+        default: "ค่าเริ่มต้น"
         likes: "ถูกใจ"
         views: "ดู"
         posts: "โพสต์"
@@ -2172,7 +2195,6 @@ th:
     users_lowercase:
       other: "ผู้ใช้"
     category_title: "หมวดหมู่"
-    history: "ประวัติ"
     changed_by: "โดย %{author}"
     raw_email:
       not_available: "ไม่พร้อม!"
@@ -2405,6 +2427,8 @@ th:
       forward: "ส่งต่อ"
       share: "แบ่งปัน"
       dismiss: "ซ่อน"
+    do_not_disturb:
+      remaining: "เหลืออีก %{remaining}"
   admin_js:
     type_to_filter: "พิมพ์เพื่อกรอง..."
     admin:
@@ -2423,6 +2447,8 @@ th:
         please_upgrade: "กรุณาอัปเกรด!"
         installed_version: "ติดตั้งแล้ว"
         latest_version: "ล่าสุด"
+        new_features:
+          dismiss: "ซ่อน"
         last_checked: "ตรวจล่าสุด"
         refresh_problems: "รีเฟรช"
         no_problems: "ไม่พบปัญหา"
@@ -2454,6 +2480,9 @@ th:
           view_table: "ตาราง"
           view_graph: "กราฟ"
           refresh_report: "โหลดรายงานใหม่"
+          daily: รายวัน
+          monthly: รายเดือน
+          weekly: รายสัปดาห์
           dates: "วัน (UTC)"
           groups: "กลุ่มทั้งหมด"
           no_data: "ไม่มีข้อมูลที่จะแสดง"
@@ -2605,6 +2634,7 @@ th:
         theme:
           theme: "ธีม"
           theme_name: "ชื่อธีม"
+          customize_desc: "การปรับแต่ง:"
           title: "ธีม"
           create: "สร้าง"
           create_type: "ชนิด"
@@ -2616,6 +2646,7 @@ th:
           add_all_themes: "เพิ่มธีมทั้งหมด"
           inactive_themes: "ธีมที่ไม่ได้ใช้งาน:"
           and_x_more: "และอีก%{count}"
+          collapse: ย่อ
           uploads: "อัปโหลด"
           upload: "อัปโหลด"
           add_all: "เพิ่มทั้งหมด"
@@ -2649,8 +2680,11 @@ th:
         colors:
           title: "สี"
           undo: "เลิกทำ"
+          revert: "ย้อนกลับ"
           primary:
             name: "หลัก"
+          success:
+            name: "สำเร็จ"
         email_style:
           css: "CSS"
           save_error_with_reason: "การเปลี่ยนแปลงไม่ได้ถูกบันทึก %{error}"
@@ -2786,20 +2820,19 @@ th:
         clear_filter: "ล้าง"
         download: ดาวน์โหลด
         clear_all: ล้างทั้งหมด
-        word_count:
-          other: "%{count}คำ"
         actions:
           block: "บล็อก"
           censor: "เซนเซอร์"
           require_approval: "ต้องได้รับการอนุมัติ"
           flag: "ธง"
         form:
-          label: "คำใหม่:"
           add: "เพิ่ม"
           success: "สำเร็จ"
           exists: "มีอยู่แล้ว"
           upload: "เพิ่มจากไฟล์"
           upload_successful: "อัปโหลดสำเร็จแล้ว เพิ่มคำเรียบร้อย"
+        test:
+          no_matches: "ไม่พบผลลัพธ์ที่ตรงกัน"
       impersonate:
         not_found: "ไม่พบผู้ใช้นั้น"
       users:
@@ -2830,6 +2863,8 @@ th:
         check_email:
           title: "แสดงอีเมลของผู้ใช้งานนี้"
           text: "แสดง"
+        check_sso:
+          text: "แสดง"
       user:
         suspend_failed: "มีข้อผิดพลาดในการระงับผู้ใช้งานนี้ %{error}"
         unsuspend_failed: "มีข้อผิดพลาดในเปิดผู้ใช้งานนี้ %{error}"
@@ -2914,7 +2949,7 @@ th:
           does_not_qualify: "คุณสมบัติไม่เพียงพอสำหรับระดับความไว้ใจที่ 3"
           locked_will_not_be_promoted: "ระดับความไว้ใจถูกล็อก จะไม่ถูกปรับระดับความไว้ใจขึ้น"
           locked_will_not_be_demoted: "ระดับความไว้ใจถูกล็อก จะไม่ถูกปรับระดับความไว้ใจลง"
-        sso:
+        discourse_connect:
           external_id: "รหัสภายนอก"
           external_username: "ชื่อผู้ใช้"
           external_name: "ชื่อ"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index ce3e8ba5c2..ec439a7752 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -25,32 +25,32 @@ tr_TR:
         thousands: "%{number}b"
         millions: "%{number}M"
     dates:
-      time: "h:mm a"
+      time: "HH:mm"
       time_with_zone: "HH:mm (z)"
-      time_short_day: "ggg, SS:dd"
+      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: "MMMM Do"
-      long_with_year: "D MMM, YYYY h:mm a"
-      long_with_year_no_time: "D MMM, YYYY"
-      full_with_year_no_time: "MMMM Do, YYYY"
+      full_no_year_no_time: "Do MMMM"
+      long_with_year: "D MMM YYYY HH:mm"
+      long_with_year_no_time: "D MMM YYYY"
+      full_with_year_no_time: "D MMMM YYYY"
       long_date_with_year: "D MMM, 'YY LT"
-      long_date_without_year: "D MMM, LT"
+      long_date_without_year: "D MMM LT"
       long_date_with_year_without_time: "D MMM, 'YY"
       long_date_without_year_with_linebreak: "D MMM <br/>LT"
-      long_date_with_year_with_linebreak: "D MMM, 'YY <br/>LT"
+      long_date_with_year_with_linebreak: "D MMM 'YY <br/>LT"
       wrap_ago: "%{date} önce"
       tiny:
         half_a_minute: "< 1d"
         less_than_x_seconds:
-          one: "< %{count}s"
+          one: "< %{count}sn"
           other: "< %{count}s"
         x_seconds:
-          one: "%{count}s"
+          one: "%{count}sn"
           other: "%{count}s"
         less_than_x_minutes:
-          one: "< %{count}dk"
+          one: "< %{count}d"
           other: "< %{count}dk"
         x_minutes:
           one: "%{count}d"
@@ -62,7 +62,7 @@ tr_TR:
           one: "%{count}g"
           other: "%{count}g"
         x_months:
-          one: "%{count}ay"
+          one: "%{count}a"
           other: "%{count}ay"
         about_x_years:
           one: "%{count}y"
@@ -85,7 +85,7 @@ tr_TR:
         x_days:
           one: "%{count} gün"
           other: "%{count} gün"
-        date_year: "D MMM, 'YY"
+        date_year: "D MMM 'YY"
       medium_with_ago:
         x_minutes:
           one: "%{count} dakika önce"
@@ -117,12 +117,15 @@ tr_TR:
       placeholder: tarih
     share:
       topic_html: 'Konu: <span class="topic-title">%{topicTitle}</span>'
-      post: "#%{postNumber} numaralı gönderiyi paylaş"
+      post: "gönderi #%{postNumber}"
       close: "kapat"
       twitter: "Twitter'da paylaş"
+      facebook: "Facebook'ta paylaş"
+      email: "E-posta ile gönder"
+      url: "URL'yi kopyala ve paylaş"
     action_codes:
-      public_topic: "bu konuyu %{when} herkese açık yaptı"
-      private_topic: "bu konuyu %{when} kişisel mesaj yaptı"
+      public_topic: "bu konuyu %{when} tarihinde herkese açık yaptı"
+      private_topic: "bu konuyu %{when} tarihinde kişisel mesaj yaptı"
       split_topic: "bu konuyu %{when} ayırdı"
       invited_user: "%{when} %{who} davet edildi"
       invited_group: "%{who} %{when} davet edildi"
@@ -151,9 +154,13 @@ tr_TR:
       banner:
         enabled: "Bunu pankart yaptı %{when}. Kullanıcı tarafından yoksayılana kadar her sayfanın en üstünde belirecek."
         disabled: "Pankart kaldırıldı %{when}. Bundan sonra her sayfanın en üstünde gözükmeyecek. "
+      forwarded: "yukarıdaki e-postayı iletti"
     topic_admin_menu: "konu eylemleri"
     wizard_required: "Yeni Discourse'una hoşgeldin! Haydi kuruluma başlayalım! <a href='%{url}' data-auto-route='true'>Kurulum Sihirbazı</a> ✨"
     emails_are_disabled: "Giden tüm e-postalar yönetici tarafından devre dışı bırakıldı. Herhangi bir e-posta bildirimi gönderilmeyecek."
+    software_update_prompt:
+      message: "Siteyi güncelledik, <span>lütfen sayfayı yenileyin</span>, aksi takdirde beklenmedik durumlarla karşılaşabilirsiniz."
+      dismiss: "Yoksay"
     bootstrap_mode_disabled: "Önyükleme modu 24 saat içinde devre dışı bırakılacak. "
     themes:
       default_description: "Varsayılan "
@@ -180,6 +187,7 @@ tr_TR:
         us_gov_west_1: "AWS GovCloud (ABD-Batı)"
         us_west_1: "Batı ABD (Kuzey Kaliforniya)"
         us_west_2: "Batı ABD (Oregon)"
+    clear_input: "Girişi temizle"
     edit: "bu konunun başlığını ve kategorisini düzenle"
     expand: "Genişlet"
     not_implemented: "Bu özellik henüz geliştirilmedi, üzgünüz!"
@@ -209,11 +217,14 @@ tr_TR:
     conduct: "Davranış kodu"
     mobile_view: "Mobil Görünüm"
     desktop_view: "Masaüstü Görünümü"
-    you: "Sen"
+    you: "Siz"
     or: "ya da"
     now: "hemen şimdi"
     read_more: "devamını oku"
     more: "Daha fazla"
+    x_more:
+      one: "%{count} Daha"
+      other: "%{count} Daha"
     less: "Daha az"
     never: "asla"
     every_30_minutes: "her 30 dakikada bir"
@@ -242,8 +253,7 @@ tr_TR:
       moderators: "Moderatörler"
       stat:
         all_time: "Tüm Zamanlar"
-        last_7_days: "Son 7"
-        last_30_days: "Son 30"
+        last_day: "Son 24 saat"
       like_count: "Beğeniler"
       topic_count: "Konular"
       post_count: "Gönderiler"
@@ -257,35 +267,43 @@ tr_TR:
       help:
         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"
+        unbookmark_with_reminder: "Bu konudaki tüm yer imlerini ve hatırlatıcıları kaldırmak için tıklayın. Bu konu için %{reminder_at} bir hatırlatıcı ayarınız var."
     bookmarks:
+      created: " %{name} Başlıklı gönderiye yer işareti koydunuz."
       not_bookmarked: "bu yazıya yer işareti koy"
+      created_with_reminder: "%{name} Bu gönderiye %{date}  hatırlatıcısı ile yer işareti koydunuz. "
       remove: "İşareti Kaldır"
+      delete: "İşareti Sil"
+      confirm_delete: "Bu yer işaretini silmek istediğinizden emin misiniz? Hatırlatıcı da silinecektir."
       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.'
+      invalid_custom_datetime: "Sağladığınız tarih ve saat geçersiz, lütfen tekrar deneyin."
+      list_permission_denied: "Bu kullanıcının yer imlerini görüntüleme izniniz yok."
+      no_user_bookmarks: "Yer işaretli gönderiniz yok; yer imleri, belirli gönderilere hızlı bir şekilde başvurmanızı sağlar."
+      auto_delete_preference:
+        label: "Otomatik olarak sil"
+        never: "Asla"
+        when_reminder_sent: "Hatırlatıcı gönderildikten sonra"
+        on_owner_reply: "Bu konuya cevap verdikten sonra"
+      search_placeholder: "Yer imlerini isme, konu başlığına veya gönderi içeriğine göre arayın"
       search: "Arama"
       reminders:
-        later_today: "Bugün ilerleyen saatlerde"
-        tomorrow: "Yarın"
-        next_week: "Gelecek hafta"
-        later_this_week: "Bu hafta içinde"
-        start_of_next_business_week: "Pazartesi"
-        start_of_next_business_week_alt: "Sonraki Ay"
-        next_month: "Gelecek ay"
-        custom: "Özel tarih ve saat"
         today_with_time: "bugün %{time}"
         tomorrow_with_time: "yarın %{time}"
         at_time: "%{date_time}"
+        existing_reminder: "Bu yer işareti için %{at_date_time} gönderilecek bir hatırlatıcı ayarınız var"
+    copy_codeblock:
+      copied: "kopyalandı!"
     drafts:
       resume: "Sürdür"
       remove: "Kaldır"
+      remove_confirmation: "Bu taslağı silmek istediğinizden emin misiniz?"
       new_topic: "Yeni konu taslağı"
       new_private_message: "Yeni özel mesaj taslağı"
       topic_reply: "Cevap taslağı"
       abandon:
-        confirm: "Halihazırda bu konuda bir taslağınız var. Ondan vazgeçmek istediğinden emin misin?"
-        yes_value: "Evet, vazgeç"
-        no_value: "Hayır, kalsın"
+        yes_value: "At"
     topic_count_latest:
       one: "%{count} yeni ya da güncellenmiş konu."
       other: "%{count} yeni ya da güncellenmiş konu."
@@ -303,7 +321,7 @@ tr_TR:
     saved: "Kaydedildi!"
     upload: "Yükle"
     uploading: "Yükleniyor..."
-    uploading_filename: "Yükleme: %{filename}..."
+    uploading_filename: "Yükleniyor: %{filename}..."
     clipboard: "pano"
     uploaded: "Yüklendi!"
     pasting: "Yapıştırılıyor..."
@@ -382,6 +400,7 @@ tr_TR:
       topic: "Konu:"
       filtered_topic: "Tek konu içerisinde görüntülenebilir içerikleri filtrelediniz."
       filtered_user: "Kullanıcı"
+      filtered_reviewed_by: "Tarafından gözden geçirildi"
       show_all_topics: "bütün konuları göster"
       deleted_post: "(gönderi silindi)"
       deleted_user: "(kullanıcı silindi)"
@@ -392,10 +411,11 @@ tr_TR:
         email: "Eposta"
         name: "İsim"
         fields: "Alanlar"
+        reject_reason: "Sebep"
       user_percentage:
         summary:
-          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} toplam bildiri)"
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} toplam bildiri)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (son işaretten)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (son %{count} işaretinden)"
         agreed:
           one: "%%{count} uygunluk"
           other: "%%{count} uygunluk"
@@ -433,11 +453,13 @@ tr_TR:
         category: "Kategori"
         orders:
           score: "Skor"
+          score_asc: "Skor (ters)"
           created_at: "İçinde Oluşturuldu"
           created_at_asc: "İçinde Oluşturuldu (tersine)"
         priority:
           title: "En Düşük Öncelik"
-          low: "(hiç)"
+          any: "(hiç)"
+          low: "Düşük"
           medium: "Orta"
           high: "Yüksek"
       conversation:
@@ -475,6 +497,8 @@ tr_TR:
           title: "Kuyruğa Eklenmiş Gönderi"
         reviewable_user:
           title: "Kullanıcı"
+        reviewable_post:
+          title: "Gönderi"
       approval:
         title: "Gönderi Onay Gerektirir"
         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. "
@@ -483,6 +507,26 @@ tr_TR:
           other: "Bekleyen <strong>%{count}</strong> gönderiniz var."
         ok: "Tamam"
       example_username: "kullaniciadi"
+      reject_reason:
+        title: "Bu kullanıcıyı neden reddediyorsunuz?"
+        send_email: "Ret e-postası gönder"
+    relative_time_picker:
+      days:
+        one: "gün"
+        other: "günler"
+    time_shortcut:
+      later_today: "Bugün ilerleyen saatlerde"
+      next_business_day: "Bir sonraki iş günü"
+      tomorrow: "Yarın"
+      next_week: "Gelecek hafta"
+      post_local_date: "Gönderideki tarih"
+      later_this_week: "Bu hafta içinde"
+      start_of_next_business_week: "Pazartesi"
+      start_of_next_business_week_alt: "Gelecek pazartesi"
+      next_month: "Gelecek ay"
+      custom: "Özel tarih ve saat"
+      relative: "Göreli zaman"
+      none: "Hiçbiri"
     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"
@@ -530,7 +574,11 @@ tr_TR:
       member_added: "Eklendi"
       member_requested: "İstenen"
       add_members:
+        title: "%{group_name} grubuna üye ekleyin"
+        description: "Ayrıca virgülle ayrılmış bir liste de yapıştırabilirsiniz."
+        usernames: "Kullanıcı adlarını veya e-posta adreslerini girin"
         input_placeholder: "Kullanıcı adı ya da e-posta"
+        notify_users: "Kullanıcıları bilgilendir"
       requests:
         title: "İstekler"
         reason: "Sebep"
@@ -554,14 +602,46 @@ tr_TR:
           notification: Bildirim
         email:
           title: "Eposta"
+          status: "IMAP üzerinden senkronize edilmiş e-postalar %{old_emails} / %{total_emails} "
           credentials:
+            title: "Kimlik bilgileri"
+            smtp_server: "SMTP sunucusu"
+            smtp_port: "SMTP Bağlantı Noktası"
+            smtp_ssl: "SMTP için SSL kullan"
+            imap_server: "SMTP sunucusu"
+            imap_port: "IMAP Bağlantı Noktası"
+            imap_ssl: "IMAP için SSL kullan"
             username: "Kullanıcı Adı"
-            password: "Şifre"
+            password: "Parola"
+          settings:
+            title: "Ayarlar"
+            allow_unknown_sender_topic_replies: "Bilinmeyen gönderen konu yanıtlarına izin ver."
+            allow_unknown_sender_topic_replies_hint: "Bilinmeyen gönderenlerin grup konularına cevap vermesine izin verir. Bu etkinleştirilmezse, IMAP e-posta dizisine henüz dahil edilmemiş veya konuya davet edilmemiş e-posta adreslerinden gelen yanıtlar yeni bir konu oluşturacaktır."
+          mailboxes:
+            synchronized: "Senkronize Posta Kutusu"
+            none_found: "Bu e-posta hesabında hiçbir posta kutusu bulunamadı."
+            disabled: "devredışı"
         membership:
           title: Üyelik
           access: Erişim
         categories:
           title: Kategoriler
+          long_title: "Kategori varsayılan bildirimleri"
+          description: "Kullanıcılar bu gruba eklendiğinde, kategori bildirim ayarları bu varsayılanlara ayarlanır. Sonrasında, onları değiştirebilirler."
+          watched_categories_instructions: "Bu kategorilerdeki tüm konuları otomatik olarak izleyin. Grup üyelerine tüm yeni mesajlar ve konular hakkında bilgi verilecek ve konunun yanında yeni gönderilerin sayısı da görünecektir."
+          tracked_categories_instructions: "Bu kategorilerdeki tüm konuları otomatik olarak takip edin. Konunun yanında yeni gönderilerin sayısı görünecektir."
+          watching_first_post_categories_instructions: "Kullanıcılar bu kategorilerdeki her yeni konudaki ilk gönderiden haberdar edilecektir."
+          regular_categories_instructions: "Bu kategoriler sessize alınırsa, grup üyeleri için susturulmayacaktır. Kullanıcılara söz edilirse veya birisi onlara yanıt verirse bildirilecektir."
+          muted_categories_instructions: "Kullanıcılar bu kategorilerdeki yeni konular hakkında hiçbir şey bildirilmez ve kategorilerde veya en son konu sayfalarında görünmezler."
+        tags:
+          title: Etiketler
+          long_title: "Varsayılan etiket bildirimleri"
+          description: "Kullanıcılar bu gruba eklendiğinde, etiket bildirim ayarları bu varsayılanlara ayarlanacaktır. Daha sonra onları değiştirebilirler."
+          watched_tags_instructions: "Bu etikette tüm konuları otomatik olarak izleyin. Grup üyelerine tüm yeni gönderiler ve konular bildirilecek ve konunun yanında yeni gönder görünecektir."
+          tracked_tags_instructions: "Bu etiketlerle tüm konuları otomatik olarak izleyin. Konunun yanında bir dizi yeni gönderi görünecektir."
+          watching_first_post_tags_instructions: "Kullanıcılara her yeni konudaki ilk gönderi bu etiketlerle bildirilecektir."
+          regular_tags_instructions: "Bu etiketlerin sesi kapatılırsa, grup üyeleri için sesi açılacaktır. Kullanıcılar, kendilerinden bahsedilirse veya birileri onlara cevap verirse bilgilendirilecektir."
+          muted_tags_instructions: "Kullanıcılar bu kategorilerdeki yeni konular hakkında hiçbir şey bildirilmez ve kategorilerde veya en son konu sayfalarında görünmezler."
         logs:
           title: "Kayıtlar"
           when: "Ne zaman"
@@ -572,6 +652,10 @@ tr_TR:
           details: "Ayrıntılar"
           from: "Kimden"
           to: "Kime"
+      permissions:
+        title: "İzinler"
+        none: "Bu grupla ilişkilendirilmiş kategori yok."
+        description: "Bu grubun üyeleri bu kategorilere erişebilir"
       public_admission: "Kullanıcıların gruba ücretsiz olarak katılmalarına izin ver (Grubun herkese açık olması gerekiyor)"
       public_exit: "Kullanıcıların gruptan ücretsiz olarak ayrılmalarına izin ver"
       empty:
@@ -634,7 +718,22 @@ tr_TR:
         make_owner_description: " <b>%{username}</b> bu grubun sahibi yap"
         remove_owner: "Sahiplikten kaldır"
         remove_owner_description: "<b>%{username}</b> grubun sahibi olmaktan çıkar"
+        make_primary: "Birincil yap"
+        make_primary_description: "Bunu <b>%{username}</b>için birincil grup yap"
+        remove_primary: "Birincil kaldır"
+        remove_primary_description: "Bunu <b>%{username}</b>için birincil grup olarak kaldırın"
+        remove_members: "Üyeleri Kaldır"
+        remove_members_description: "Seçili kullanıcıları bu gruptan çıkar"
+        make_owners: "Sahibi Yap"
+        make_owners_description: "Seçili kullanıcıları bu grubun sahibi yapın"
+        remove_owners: "Sahipleri Kaldır"
+        remove_owners_description: "Seçili kullanıcıları bu grubun sahiplerinden kaldırın"
+        make_all_primary: "Tümünü Birincil Yap"
+        make_all_primary_description: "Bunu tüm seçili kullanıcılar için birincil grup yap"
+        remove_all_primary: "Birincil Olarak Kaldır"
+        remove_all_primary_description: "Bu grubu birincil olarak kaldır"
         owner: "Sahip"
+        primary: "Birincil"
         forbidden: "Üyeleri görmek için yetkiniz yok."
       topics: "Konular"
       posts: "Gönderiler"
@@ -667,12 +766,16 @@ tr_TR:
           title: "Sessiz"
           description: "Bu gruptaki bütün mesajlarla ilgili bilgilendirileceksiniz."
       flair_url: "Avatar Resmi"
+      flair_upload_description: "20 X 20 pikselden küçük olmayan kare resimler kullanın."
       flair_bg_color: "Avatar Arkaplan Rengi"
       flair_bg_color_placeholder: "(İsteğe bağlı) Hex renk değeri"
       flair_color: "Avatar Rengi"
       flair_color_placeholder: "(İsteğe bağlı) Hex renk değeri"
       flair_preview_icon: "İkonu önizle"
       flair_preview_image: "Resmi önizle"
+      flair_type:
+        icon: "Bir simge seçin"
+        image: "Bir görüntü yükle"
     user_action_groups:
       "1": "Beğenilenler"
       "2": "Alınan Beğeniler"
@@ -702,18 +805,25 @@ tr_TR:
       posts: "Gönderiler"
       topics: "Konular"
       latest: "En Son"
-      latest_by: "son gönderen"
       toggle_ordering: "talep kontrolünü değiştir"
       subcategories: "Alt kategoriler"
+      muted: "Yok sayılan kategoriler"
       topic_sentence:
         one: "%{count} konu"
         other: "%{count} konu"
+      topic_stat_unit:
+        week: "hafta"
+        month: "ay"
+      topic_stat_all_time:
+        one: "toplam %{number} "
+        other: " toplam %{number}"
       topic_stat_sentence_week:
         one: "geçen haftadan beri%{count} yeni konu."
         other: "geçen haftadan beri %{count} yeni konu."
       topic_stat_sentence_month:
         one: "geçen aydan beri %{count} yeni konu."
         other: "%{count} geçen ay yeni konular."
+      n_more: "Kategoriler (%{count} daha fazla) ..."
     ip_lookup:
       title: IP Adresi Ara
       hostname: Sunucu ismi
@@ -733,6 +843,7 @@ tr_TR:
       copied: "kopyalanan"
     user_fields:
       none: "(bir seçenek tercih et)"
+      required: 'Lütfen "%{name}" için bir değer girin'
     user:
       said: "%{username}:"
       profile: "Profil"
@@ -748,9 +859,11 @@ tr_TR:
       private_messages: "Mesajlar"
       user_notifications:
         filters:
+          filter_by: "Tarafından filtre"
           all: "Tümü"
           read: "Okunan"
           unread: "Okunmamış"
+        ignore_duration_title: "Kullanıcıyı yoksay"
         ignore_duration_username: "Kullanıcı Adı"
         ignore_duration_when: "Süre:"
         ignore_duration_save: "Yoksay"
@@ -764,7 +877,23 @@ tr_TR:
         mute_option_title: "Bir daha bu kullanıcıyla ilgili bildirim almayacaksın."
         normal_option: "Normal"
         normal_option_title: "Bu kullanıcı sizi yanıtlarsa, alıntılarsa ya da sizden bahsederse bildirim alacaksınız."
+      notification_schedule:
+        title: "Bildirim Zamanlaması"
+        label: "Özel bildirim zamanlamasını etkinleştir"
+        tip: "Bu saatler dışında otomatik olarak 'rahatsız etmeyin' durumuna alınacaksınız."
+        midnight: "Gece yarısı"
+        none: "Yok"
+        monday: "Pazartesi"
+        tuesday: "Salı"
+        wednesday: "Çarşamba"
+        thursday: "Perşembe"
+        friday: "Cuma"
+        saturday: "Cumartesi"
+        sunday: "Pazar"
+        to: "kime"
       activity_stream: "Aktivite"
+      read: "Okunmuş"
+      read_help: "Son okunan konular"
       preferences: "Tercihler"
       feature_topic_on_profile:
         open_search: "Yeni Bir Konu Seçin"
@@ -774,6 +903,7 @@ tr_TR:
         clear:
           title: "Temizle"
           warning: "Öne çıkmış olan konunuzu silmek istediğinizden emin misiniz?"
+      use_current_timezone: "Mevcut Saat Dilimini Kullan"
       profile_hidden: "Bu kullanıcının genel profili gizli."
       expand_profile: "Genişlet"
       collapse_profile: "Daralt"
@@ -792,16 +922,29 @@ tr_TR:
         perm_denied_expl: "Bildirimler için izinleri reddettin. Bildirimlere, tarayıcı ayarlarından izin verebilirsin. "
         disable: "Bildirimleri Devre Dışı Bırak"
         enable: "Bildirimleri Etkinleştir"
-        each_browser_note: "Not: Bu ayarı kullandığın her tarayıcıda değiştirmelisin."
+        each_browser_note: 'Not: Kullandığınız her tarayıcıda bu ayarı değiştirmeniz gerekir. Bu ayardan bağımsız olarak, "rahatsız etmeyin" modundayken tüm bildirimler devre dışı bırakılır.'
         consent_prompt: "Gönderilerine cevap verildiğinde anlık bildirim almak ister misin?"
       dismiss: "Yoksay"
       dismiss_notifications: "Tümünü Yoksay"
       dismiss_notifications_tooltip: "Tüm okunmamış bildirileri okunmuş olarak işaretle"
+      no_messages_title: "Hiç mesajınız yok"
       first_notification: "İlk bildirimin! Başlamak için seç. "
       dynamic_favicon: "Sayacı, tarayıcı ikonunda göster"
+      skip_new_user_tips:
+        description: "Yeni kullanıcı katılımı ipuçlarını ve rozetlerini atlayın"
+        not_first_time: "İlk defa değil mi?"
+        skip_link: "İpuçlarını atla"
       theme_default_on_all_devices: "Bu temayı bütün cihazlarımda varsayılan yap"
+      color_scheme_default_on_all_devices: "Tüm cihazlarımda varsayılan renk düzenlerini ayarla"
+      color_scheme: "Renk uyumu"
       color_schemes:
+        default_description: "Tema varsayılanı"
+        disable_dark_scheme: "Normal ile aynı"
+        dark_instructions: "Cihazınızın karanlık moduna geçerek karanlık mod renk düzenini önizleyebilirsiniz."
         undo: "Sıfırla"
+        regular: "Müdavim"
+        dark: "Karanlık Mod"
+        default_dark_scheme: "(site varsayılanı)"
       dark_mode: "Karanlık Mod"
       dark_mode_enable: "Karanlık mod renk düzenini otomatik etkinleştir"
       text_size_default_on_all_devices: "Bu metin boyutunu bütün cihazlarımda varsayılan yap"
@@ -819,6 +962,7 @@ tr_TR:
       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"
       email_activity_summary: "Aktivite özeti"
       mailing_list_mode:
         label: "Gönderi listesi modu"
@@ -847,6 +991,7 @@ tr_TR:
       muted_categories: "Sessiz"
       muted_categories_instructions: "Bu kategorilerdeki yeni konular hakkında bildirim almayacaksınız ve son soyfalarda görmeyeceksiniz."
       muted_categories_instructions_dont_hide: "Bu kategorilerdeki yeni konular hakkında hiçbir şey size bildirilmeyecek."
+      regular_categories: "Düzenli"
       regular_categories_instructions: "Bu kategorileri \"En son\" ve \"Popüler\" konu listelerinde göreceksiniz."
       no_category_access: "Bir moderatör olarak kategori erişimin sınırlı ve kaydetme devre dışıdır."
       delete_account: "Hesabımı Sil"
@@ -857,7 +1002,12 @@ tr_TR:
       admin_delete: "Sil"
       users: "Kullanıcılar"
       muted_users: "Sessiz"
+      muted_users_instructions: "Bu kullanıcılardan gelen tüm bildirimleri ve PM'leri engelleyin."
+      allowed_pm_users: "İzin Ver"
+      allowed_pm_users_instructions: "Yalnızca bu kullanıcıların PM'lerine izin verin."
+      allow_private_messages_from_specific_users: "Yalnızca belirli kullanıcıların bana kişisel mesajlar göndermesine izin ver"
       ignored_users: "Yoksayıldı"
+      ignored_users_instructions: "Bu kullanıcılardan gelen tüm gönderileri, bildirimleri ve PM'leri engelle."
       tracked_topics_link: "Göster"
       automatically_unpin_topics: "Sayfa sonuna geldiğimde en yukarıda sabitlenmiş tüm konuları kaldır. "
       apps: "Uygulamalar"
@@ -866,6 +1016,7 @@ tr_TR:
       api_approved: "Onaylanmış:"
       api_last_used_at: "Son kullanılan:"
       theme: "Tema"
+      save_to_change_theme: 'Tema "%{save_text}” tıkladıktan sonra güncellenecektir'
       home: "Varsayılan Anasayfa"
       staged: "Aşamalı"
       staff_counters:
@@ -874,6 +1025,7 @@ tr_TR:
         deleted_posts: "silinen gönderiler"
         suspensions: "ertelenenler"
         warnings_received: "uyarılar"
+        rejected_posts: "reddedilen gönderiler"
       messages:
         all: "Hepsi"
         inbox: "Gelen Kutusu"
@@ -888,6 +1040,7 @@ tr_TR:
         tags: "Etiketler"
       preferences_nav:
         account: "Hesap"
+        security: "Güvenlik"
         profile: "Profil"
         emails: "E-postalar"
         notifications: "Bildirimler"
@@ -900,25 +1053,38 @@ tr_TR:
         success: "(e-posta gönderildi)"
         in_progress: "(e-posta gönderiliyor)"
         error: "(hata)"
-        action: "Şifre Sıfırlama E-postası Gönder"
-        set_password: "Şifre Belirle"
-        choose_new: "Yeni bir şifre seç"
-        choose: "Şifre seç"
+        emoji: "emojiyi kilitle"
+        action: "Parola Sıfırlama E-postası Gönder"
+        set_password: "Parola Belirle"
+        choose_new: "Yeni bir parola seç"
+        choose: "Parola seç"
       second_factor_backup:
+        title: "İki Faktörlü Yedekleme Kodları"
         regenerate: "Yeniden oluştur"
         disable: "Devre dışı bırak"
         enable: "Etkinleştir"
         enable_long: "Yedek kodları etkinleştir"
+        manage:
+          one: "Yedek kodları yönetin. <strong>%{count}</strong> yedek kodunuz kaldı."
+          other: "Yedek kodları yönetin. <strong>%{count}</strong> yedek kodunuz kaldı."
         copy_to_clipboard: "Kopyala"
         copy_to_clipboard_error: "Panoya kopyalanırken hata oluştu"
         copied_to_clipboard: "Panoya kopyalandı"
+        download_backup_codes: "Yedekleme kodlarını indir"
+        remaining_codes:
+          one: "<strong>%{count}</strong> yedek kodunuz kaldı."
+          other: "<strong>%{count}</strong> yedek kodunuz kaldı."
         use: "Bir yedekleme kodu kullanın"
+        enable_prerequisites: "Yedekleme kodları oluşturmadan önce birincil iki faktörlü bir yöntemi etkinleştirmeniz gerekir."
         codes:
           title: "Yedek kod oluşturuldu"
           description: "İlgili yedek kodlar sadece bir kez kullanılabilir. Kodları güvenli ama erişilebilir bir yerde tutmalısın. "
       second_factor:
-        forgot_password: "Şifrenizi mi unuttunuz?"
-        confirm_password_description: "Devam etmek için lütfen şifrenizi onaylayın"
+        title: "İki Faktörlü Kimlik Doğrulama"
+        enable: "İki Faktörlü Kimlik Doğrulamasını Yönet"
+        disable_all: "Tümünü devre dışı bırak"
+        forgot_password: "Parolanızı mı unuttunuz?"
+        confirm_password_description: "Devam etmek için lütfen parolanızı onaylayın"
         name: "İsim"
         label: "Kod"
         rate_limit: "Yeni bir doğrulama kodu girmeden önce lütfen bekleyin."
@@ -928,22 +1094,35 @@ tr_TR:
         show_key_description: "Manuel olarak gir"
         short_description: |
           Hesabınızı tek kullanımlık güvenlik kodlarıyla koruyun.
+        extended_description: |
+          İki faktörlü kimlik doğrulama, parolanıza ek olarak bir kerelik belirteç gerektirerek hesabınıza ekstra güvenlik ekler. Simgeler <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a> ve <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a> cihazlarında oluşturulabilir.
+        oauth_enabled_warning: "Hesabınızda iki faktörlü kimlik doğrulama etkinleştirildikten sonra sosyal oturum açma işlemlerinin 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ğrulamayı etkinleştirmeniz gerekir."
         disable: "Devre dışı bırak"
+        disable_confirm: "Tüm iki faktörlü yöntemleri devre dışı bırakmak istediğinizden emin misiniz?"
         save: "Kaydet"
         edit: "Düzenle"
+        edit_title: "Kimlik Doğrulayıcıyı Düzenle"
+        edit_description: "Kimlik Doğrulayıcı Adı"
+        enable_security_key_description: |
+          <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">donanım güvenlik anahtarınızı</a> hazırlattığınızda, aşağıdaki Kayıt düğmesine basın.
         totp:
           title: "Token Tabanlı Doğrulayıcılar"
+          add: "Kimlik Doğrulayıcı Ekle"
           default_name: "Benim Doğrulayıcım"
+          name_and_code_required_error: "Kimlik doğrulayıcı uygulamanızdan bir ad ve kod girmeniz gerekir."
         security_key:
           register: "Kayıt Ol"
           title: "Güvenlik Sözcükleri"
+          add: "Güvenlik Anahtarı Ekleyin"
           default_name: "Ana Güvenlik Anahtarı"
           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ı"
+          name_required_error: "Güvenlik anahtarınız için bir ad girmeniz gerekir."
       change_about:
         title: "\"Hakkımda\"yı Değiştir"
         error: "Bu değeri değiştirirken bir hata oluştu."
@@ -953,20 +1132,27 @@ tr_TR:
         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:
+        title: "E-posta Ekle"
         add: "ekle"
       change_email:
         title: "\"E-posta Adresi\"ni Değiştir"
         taken: "Üzgünüz, bu e-posta kullanılabilir değil."
         error: "\"E-posta Adresi\"ni değiştirirken bir hata oluştu. Bu adres zaten kullanımda olabilir! "
         success: "Adresine bir e-posta gönderdik. Lütfen onaylama talimatlarını takip et."
+        success_via_admin: "Bu adrese bir e-posta gönderdik. Kullanıcının e-postadaki onay talimatlarını uygulaması gerekecektir."
         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='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>"
+        gravatar_title: "Avatarınızı %{gravatarName} web sitesinde değiştirin"
+        gravatar_failed: "Bu e-posta adresiyle %{gravatarName} bulamadık."
+        refresh_gravatar_title: "%{gravatarName} yenileyin"
         letter_based: "Sistem profil görseli atadı"
         uploaded_avatar: "Kişisel resim"
         uploaded_avatar_empty: "Kişisel bir resim ekle"
         upload_title: "Resmini yükle"
         image_is_not_a_square: "Uyarı: Genişliği ve yüksekliği eşit olmadığı için görseli kesmek durumunda kaldık."
+        logo_small: "Sitenin küçük logosu. Varsayılan olarak kullanılır."
       change_profile_background:
         title: "Profil Başlığı"
         instructions: "Profil başlıkları ortalanacak ve varsayılan olarak 1110 piksel boyutunda olacaktır."
@@ -981,13 +1167,23 @@ tr_TR:
         primary: "Öncelikli E-posta"
         secondary: "İkincil E-postalar"
         primary_label: "Ana"
+        unconfirmed_label: "doğrulanmamış"
+        resend_label: "Doğrulama epostasını yeniden gönder"
+        resending_label: "gönderiyor..."
+        resent_label: "e-posta gönderildi"
         update_email: "\"E-posta Adresi\"ni Değiştir"
-        sso_override_instructions: "E-posta SSO sağlayıcısından güncellenebilir."
+        set_primary: "Birincil E-postayı Ayarla"
+        destroy: "E-posta Kaldır"
+        add_email: "Alternatif E-posta Ekle"
+        auth_override_instructions: "E-posta, kimlik doğrulama sağlayıcısından güncellenebilir."
         no_secondary: "İkincil e-posta adresi mevcut değil"
         instructions: "Hiç kimseye gösterilmedi."
+        admin_note: "Not: Yönetici olmayan başka bir kullanıcının e-postasını değiştiren bir yönetici kullanıcı, kullanıcının orijinal e-posta hesabına erişimini kaybettiğini gösterir, bu nedenle yeni adreslerine bir şifre sıfırlama e-postası gönderilir. Parola sıfırlama işlemi tamamlanana kadar kullanıcının e-postası değişmeyecektir."
         ok: "Onaylaman için sana e-posta göndereceğiz"
+        required: "Lütfen bir e-posta adresi giriniz"
         invalid: "Lütfen geçerli bir e-posta adresi gir"
         authenticated: "E-posta adresin %{provider} tarafından doğrulandı"
+        invite_auth_email_invalid: "Davet e-postanız %{provider} tarafından doğrulanan e-postayla eşleşmiyor."
         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."
@@ -1006,6 +1202,7 @@ tr_TR:
         title: "İsim"
         instructions: "tam adın (opsiyonel)"
         instructions_required: "Tam adın"
+        required: "Lütfen bir isim girin"
         too_short: "İsmin çok kısa"
         ok: "İsmin iyi görünüyor"
       username:
@@ -1019,13 +1216,18 @@ tr_TR:
         too_long: "Kullanıcı adın çok uzun"
         checking: "Kullanıcı adı müsait mi kontrol ediliyor..."
         prefilled: "E-posta bu kullanıcı adı ile eşleşiyor"
+        required: "Lütfen bir kullanıcı adı girin"
+        edit: "Kullanıcı adı düzenle"
       locale:
         title: "Arayüz dili"
         instructions: "Kullanıcı arayüz dili. Sayfayı yenilediğin zaman değişecek. "
         default: "(varsayılan)"
         any: "hiçbir"
       password_confirmation:
-        title: "Şifre tekrarı"
+        title: "Parola tekrarı"
+      invite_code:
+        title: "Davet Kodu"
+        instructions: "Kaydolmak için bir davet kodu gereklidir"
       auth_tokens:
         title: "Son Kullanılan Cihazlar"
         details: "Detaylar"
@@ -1034,10 +1236,13 @@ tr_TR:
         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."
+        was_this_you_description: "Siz değilseniz, parolanızı değiştirmenizi ve her yerden oturumu kapatmanızı öneririz."
         browser_and_device: "%{browser} şunda %{device}"
         secure_account: "Hesabımı güven altına al"
         latest_post: "En son gönderdiğiniz ..."
+        device_location: '<span class="auth-token-device">%{device}</span> &ndash; <span title="IP: %{ip}">%{location}</span>'
+        browser_active: '%{browser} | <span class="active">şu anda aktif</span>'
+        browser_last_seen: "%{browser} | %{date}"
       last_posted: "Son Gönderi"
       last_emailed: "Gönderilen Son E-posta"
       last_seen: "Görüldü"
@@ -1050,6 +1255,7 @@ tr_TR:
       enable_physical_keyboard: "iPad'de fiziksel klavye desteğini etkinleştir"
       text_size:
         title: "Yazı Boyutu"
+        smallest: "En küçük"
         smaller: "Daha küçük"
         normal: "Normal"
         larger: "Daha büyük"
@@ -1108,54 +1314,69 @@ tr_TR:
         after_10_minutes: "10 dakika sonra"
       notification_level_when_replying: "Bir konuya gönderi yaptığımda, konuyu şuna ayarla"
       invited:
-        search: "davet etmek için yaz..."
         title: "Davetler"
+        pending_tab: "Bekleyen"
+        pending_tab_with_count: "Beklemede (%{count})"
+        expired_tab: "Süresi dolmuş"
+        expired_tab_with_count: "Süresi dolmuş (%{count})"
+        redeemed_tab: "Kabul Edildi"
+        redeemed_tab_with_count: "Kabul edildi (%{count})"
+        invited_via: "Davet"
+        groups: "Gruplar"
+        topic: "Konu"
+        expires_at: "Bitiş tarihi"
+        edit: "Düzenle"
+        remove: "Kaldır"
+        reinvited: "Davet tekrar gönderildi"
+        search: "davet etmek için yaz..."
         user: "Davet Edilen Kullanıcı"
-        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."
         redeemed: "Kabul Edilen Davetler"
-        redeemed_tab: "Kabul Edildi"
-        redeemed_tab_with_count: "Kabul edildi (%{count})"
         redeemed_at: "Kabul Edildi"
         pending: "Bekleyen Davetler"
-        pending_tab: "Bekleyen"
-        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ı"
-        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"
-        reinvite_all: "Tüm davetleri tekrar gönder"
+        remove_all: "Süresi Dolan Davetleri Kaldır"
+        removed_all: "Tüm Süresi Dolmuş Davetiyeler kaldırıldı!"
+        remove_all_confirm: "Süresi dolmuş tüm davetiyeleri kaldırmak istediğinizden emin misiniz?"
         reinvite_all_confirm: "Tüm davetleri tekrar göndermek istediğine emin misin?"
-        reinvited: "Davet tekrar gönderildi"
-        reinvited_all: "Tüm davetler tekrar gönderildi!"
         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 et"
+        generate_link: "Davet Bağlantısı Oluşturun"
+        link_generated: "İşte davet bağlantınız!"
         valid_for: "Davet bağlantısı sadece bu adres için geçerli: %{email}"
+        single_user: "E-posta ile davet et"
+        multiple_user: "Bağlantıyla davet et"
         invite_link:
+          title: "Bağlantıyla davet et"
           success: "Davet bağlantısı başarılı bir şekilde oluşturuldu! "
+          error: "Davet bağlantısı oluşturulurken bir hata meydana geldi"
+          max_redemptions_allowed_label: "Bu bağlantıyı kullanarak kaç kişinin kaydolmasına izin verilsin?"
+          expires_at: "Bu davet bağlantısının süresi ne zaman dolacak?"
+        invite:
+          expires_in_time: "Süresi dolacak: %{time}."
+          expired_at_time: "Süresi dolmuş: %{time}."
+          show_advanced: "Gelişmiş Seçenekleri Göster"
+          hide_advanced: "Gelişmiş Seçenekleri Gizle"
         bulk_invite:
-          success: "Dosya başarıyla yüklendi. İşlem tamamlandığında mesaj yoluyla bilgilendirileceksin."
+          none: "Bu sayfada görüntülenecek davetiye yok."
+          text: "Toplu Davet"
           error: "Üzgünüz, dosya CSV formatında olmalı. "
-          confirmation_message: "Yüklenen dosyadaki herkese davetleri e-posta ile göndermek üzeresiniz."
       password:
-        title: "Şifre"
-        too_short: "Şifren çok kısa"
-        common: "Bu şifre çokça kullanılan bir şifre"
-        same_as_username: "Şifren kullanıcı adınla aynı."
-        same_as_email: "Şifren e-posta adresinle aynı."
-        ok: "Şifren iyi gözüküyor."
+        title: "Parola"
+        too_short: "Parolanız çok kısa"
+        common: "Bu parola çok yaygın."
+        same_as_username: "Parolanız kullanıcı adınızla aynı."
+        same_as_email: "Parolanız e-posta adresinizle aynı."
+        ok: "Parolanız iyi görünüyor."
         instructions: "en az %{count} karakter"
+        required: "lütfen bir şifre girin"
       summary:
         title: "Özet"
         stats: "İstatistik"
@@ -1210,6 +1431,8 @@ tr_TR:
       avatar:
         title: "Profil Resmi"
         header_title: "profil, mesajlar, işaretlenenler ve tercihler"
+        name_and_description: "%{name} - %{description}"
+        edit: "Profil resmi düzenle"
       title:
         title: "Başlık"
         none: "(hiçbiri)"
@@ -1245,8 +1468,8 @@ tr_TR:
         fixed: "Sayfayı Yükle"
     modal:
       close: "kapat"
+      dismiss_error: "Hatayı kapat"
     close: "Kapat"
-    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"
@@ -1260,19 +1483,11 @@ tr_TR:
       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 "
-    year: "yıl"
-    year_desc: "son 365 günde oluşturulan konular"
-    month: "ay"
-    month_desc: "son 30 günde oluşturulan konular"
-    week: "hafta"
-    week_desc: "son 7 günde oluşturulan konular"
-    day: "gün"
     first_post: İlk gönderi
     mute: Sessiz
     unmute: Sessiz iptali
     last_post: Gönderilen
+    local_time: "Yerel zaman"
     time_read: Okunan
     time_read_recently: "%{time_read} son günlerde"
     time_read_tooltip: "%{time_read} toplam okuma zamanı"
@@ -1285,13 +1500,13 @@ tr_TR:
       sign_up: "Kayıt Ol"
       hide_session: "Yarın bana hatırlat"
       hide_forever: "hayır teşekkürler"
-      hidden_for_session: "Tamam, sana yarın soracağım. Her zaman \"Giriş Yap\" kısmını kullanarak da hesap oluşturabilirsin.."
       intro: "Merhaba! Tartışmanın tadını çıkarıyor gibisiniz, ancak henüz bir hesap için kaydolmadınız."
       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:
+        one: "<b>%{count}</b> adet cevap var."
+        other: "<b>%{count}</b> adet cevap var."
       enable: "Bu Konuyu Özetle"
       disable: "Tüm Gönderileri Göster"
     deleted_filter:
@@ -1301,6 +1516,10 @@ tr_TR:
       disable: "Silinen Gönderileri Göster"
     private_message_info:
       title: "Mesaj"
+      invite: "Başkalarını Davet Et ..."
+      edit: "Ekle veya sil..."
+      remove: "Kaldır..."
+      add: "Ekle..."
       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?"
@@ -1312,16 +1531,18 @@ tr_TR:
     trust_level: "Güven Seviyesi"
     search_hint: "kullanıcı adı, e-posta veya IP adresi"
     create_account:
+      header_title: "Hoşgeldiniz!"
+      subheader_title: "Haydi, hesabınızı oluşturalım"
       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. "
+      failed: "Bir şeyler ters gitti. Bu e-posta ile daha önce bir kayıt oluşturulmuş olabilir. \"Parolamı unuttum\" bağlantısına tıklayarak ilerlemeni öneririz."
     forgot_password:
-      title: "Şifre Sıfırlama"
-      action: "Şifremi unuttum"
-      invite: "Kullanıcı adını ya da e-posta adresini gir. Sana şifre sıfırlama e-postası göndereceğiz. "
-      reset: "Şifre Sıfırlama "
-      complete_username: " <b>%{username}</b> kullanıcı adı ile eşleşen bir hesap bulunması durumunda, kısa bir süre içerisinde şifreni nasıl sıfırlayacağını açıklayan bir e-posta alacaksın. "
-      complete_email: " <b>%{email}</b> adresi ile eşleşen bir hesap bulunması durumunda, kısa bir süre içerisinde şifreni nasıl sıfırlayacağını açıklayan bir e-posta alacaksın. "
+      title: "Parola Sıfırlama"
+      action: "Parolamı unuttum"
+      invite: "Kullanıcı adınızı veya e-posta adresinizi girin, size bir parola sıfırlama e-postası gönderelim."
+      reset: "Parola Sıfırlama"
+      complete_username: "<b>%{username}</b> kullanıcı adı ile eşleşen bir hesap bulunması durumunda, kısa bir süre içerisinde parolanızı nasıl sıfırlayacağınızı açıklayan bir e-posta alacaksınız."
+      complete_email: "<b>%{email}</b> adresi ile eşleşen bir hesap bulunması durumunda, kısa bir süre içerisinde parolanızı nasıl sıfırlayacağınızı açıklayan bir e-posta alacaksınız."
       complete_username_not_found: "Hiçbir hesap kullanıcı adı <b>%{username}</b> ile eşleşmiyor"
       complete_email_not_found: "Hiçbir hesap <b>%{email}</b> adresi ile eşleşmiyor"
       help: "Email ulaşmadı mı? Öncelikle spam kutunuza düşmediğinden emin olun. <p> Hangi email adresini kullandığınızdan emin değil misiniz? Bir email adresi girin, kayıtlı olup olmadığını size bildirelim.</p><p> Eğer hesabınızla ilişkili email adresini kullanamıyorsanız, lütfen<a href='%{basePath}/about'> yardımsever ekibimizle</a> iletişime geçin.</p>"
@@ -1330,6 +1551,8 @@ tr_TR:
     email_login:
       link_label: "Bana \"Giriş Bağlantısı\"nı e-posta ile gönder"
       button_label: "e-posta ile"
+      login_link: "Şifreyi atla; bana e-posta ile bir giriş bağlantısı gönder"
+      emoji: "emojiyi kilitle"
       complete_username: "<b>%{username}</b> kullanıcı adı bir hesap ile eşleşirse, kısa bir süre içinde giriş bağlantısına sahip bir e-posta alacaksınız."
       complete_email: "<b>%{email}</b> e-posta adresi bir hesap ile eşleşirse, kısa bir süre içinde giriş bağlantısına sahip bir e-posta alacaksınız."
       complete_username_found: "<b>%{username}</b> kullanıcı adıyla eşleşen bir hesap bulduk, kısa bir süre içerisinde giriş bağlantısına sahip bir e-posta alacaksınız."
@@ -1340,11 +1563,13 @@ tr_TR:
       logging_in_as: '%{email} olarak giriş yapılıyor'
       confirm_button: Giriş yapmayı bitir
     login:
-      title: "Giriş Yap"
+      subheader_title: "Hesabınıza giriş yapın"
       username: "Kullanıcı"
-      password: "Şifre"
+      password: "Parola"
+      second_factor_title: "İki Faktörlü Kimlik Doğrulama"
       second_factor_description: "Lütfen uygulamadan \"Kimlik Doğrulama Kodu\"nu gir:"
       second_factor_backup: "Bir yedekleme kodu kullanarak giriş yapın"
+      second_factor_backup_title: "İki Faktörlü Yedekleme"
       second_factor_backup_description: "Lütfen yedek kodlarından birini gir:"
       second_factor: "Authenticator uygulamasını kullanarak giriş yapın"
       security_key_description: "Fiziksel güvenlik anahtarınızı hazırladığınızda, aşağıdaki Güvenlik Anahtarıyla Kimlik Doğrula düğmesine basın."
@@ -1353,23 +1578,25 @@ tr_TR:
       security_key_not_allowed_error: "Güvenlik anahtarı kimlik doğrulama işlemi zaman aşımına uğradı veya iptal edildi."
       security_key_no_matching_credential_error: "Sağlanan güvenlik anahtarında eşleşen kimlik bilgisi bulunamadı."
       security_key_support_missing_error: "Geçerli cihazınız veya tarayıcınız güvenlik tuşlarının kullanımını desteklemiyor. Lütfen farklı bir yöntem kullanın."
-      email_placeholder: "e-posta veya kullanıcı adı"
+      email_placeholder: "Email / Kullanıcı Adı"
       caps_lock_warning: "Caps Lock açık"
       error: "Bilinmeyen hata"
       cookies_error: "Tarayıcınızda çerezler devre dışı bırakılmış görünüyor. Giriş yapabilmek için önce çerezleri etkinleştirmeniz gerekmektedir."
       rate_limit: "Tekrar giriş yapmayı denemeden önce lütfen bekle. "
       blank_username: "Lütfen e-posta adresinizi ya da kullanıcı adınızı girin."
-      blank_username_or_password: "Lütfen e-posta adresini ya da kullanıcı adını ve şifreni gir."
-      reset_password: "Şifre Sıfırlama"
+      blank_username_or_password: "Lütfen e-postanızı veya kullanıcı adınızı ve parolanızı girin."
+      reset_password: "Parola Sıfırlama"
       logging_in: "Oturum açılıyor..."
       or: "ya da"
       authenticating: "Kimliğin doğrulanıyor..."
-      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_activation: "Hesabın etkinleştirme işlemini bekliyor. Başka bir etkinleştirme e-postası göndermek için \"Parolamı 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_allowed_from_ip_address: "Bu IP adresinden giriş yapamazsınız."
       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. "
+      omniauth_disallow_totp: "Hesabınızda iki faktörlü kimlik doğrulama etkinleştirilmiştir. Lütfen şifreniz ile giriş yapınız."
       resend_title: "Aktivasyon e-postasını tekrar gönder"
       change_email: "E-posta adresini değiştir"
       provide_new_email: "Yeni bir adres gir. Onay e-postanı tekrar gönderelim."
@@ -1402,6 +1629,7 @@ tr_TR:
         backup_code: "Bunun yerine bir yedekleme kodu kullanın"
     invites:
       accept_title: "Davet"
+      emoji: "emojiyi etkinleştir"
       welcome_to: "%{site_name} hoş geldin!"
       invited_by: "Davet gönderen:"
       social_login_available: "Ayrıca bu e-posta adresini kullanan tüm sosyal ağ girişleriyle oturum açabileceksin."
@@ -1409,6 +1637,7 @@ tr_TR:
       accept_invite: "Daveti kabul et"
       success: "Hesabın oluşturuldu ve şimdi giriş yaptın."
       name_label: "İsim"
+      password_label: "Parola"
       optional_description: "(isteğe bağlı)"
     password_reset:
       continue: "%{site_name} devam et"
@@ -1416,7 +1645,6 @@ tr_TR:
       apple_international: "Apple/Uluslararası"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (eski adıyla EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1435,6 +1663,7 @@ tr_TR:
     conditional_loading_section:
       loading: Yükleniyor...
     select_kit:
+      select_to_filter: "Filtrelemek için bir değer seçin"
       default_header_text: Seç...
       no_content: Hiçbir eşleşme bulunamadı
       filter_placeholder: Ara...
@@ -1446,11 +1675,15 @@ tr_TR:
       min_content_not_reached:
         one: "En azından %{count} konu seçiniz"
         other: "En azından %{count}konuları seçiniz"
+      invalid_selection_length:
+        one: "Seçim en az %{count} karakter olmalıdır."
+        other: "Seçim en az %{count} karakter olmalıdır."
+      components:
+        categories_admin_dropdown:
+          title: "Kategorileri Yönetin"
     date_time_picker:
       from: Kimden
       to: Kime
-      errors:
-        to_before_from: "Bugüne kadar olan tarihten itibaren olmalıdır."
     emoji_picker:
       filter_placeholder: Emoji ara
       smileys_&_emotion: Emojiler ve Duygular
@@ -1472,7 +1705,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 paylaşılan taslakları yayınlayabilenler 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?"
@@ -1483,7 +1716,6 @@ tr_TR:
       options: "Seçenekler"
       whisper: "fısıltı"
       unlist: "listelenmedi"
-      blockquote_text: "Blok-alıntı"
       add_warning: "Bu resmi bir uyarıdır."
       toggle_whisper: "Fısıldamayı Aç/Kapa"
       toggle_unlisted: "Listelenmemiş değişiklik"
@@ -1492,6 +1724,9 @@ tr_TR:
       similar_topics: "Konun şunlara benziyor..."
       drafts_offline: "çevrimdışı taslaklar"
       edit_conflict: "çakışmayı düzenle"
+      group_mentioned_limit:
+        one: "<b>Uyarı!</b> <a href='%{group_link}'>%{group}</a> bahsettiniz, ancak bu grubun yönetici tarafından yapılandırılan %{count} kullanıcılı ifade sınırından daha fazla üyesi var. Kimseye haber verilmeyecek."
+        other: "<b>Uyarı!</b> Bahsettiğiniz <a href='%{group_link}'>%{group}</a>  bu grubun yöneticisi tarafından yapılandırılmış %{count} kullanıcı  sınırından daha fazla üyesi vardır. Kimseye haber verilmeyecek."
       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?"
@@ -1502,12 +1737,18 @@ tr_TR:
       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:
+          one: "Başlık en az %{count} karakter olmalıdır"
+          other: "Başlık en az %{count} karakter olmalıdır"
+        title_too_long:
+          one: "Başlık %{count} karakterden fazla olamaz"
+          other: "Başlık %{count} karakterden fazla olamaz"
         post_missing: "Gönderi boş olamaz"
-        post_length: "Gönderi en az %{min} karakter olmalı"
         try_like: "%{heart} düğmesini denediniz mi?"
         category_missing: "Bir kategori seçmelisin"
+        tags_missing:
+          one: "En az %{count} etiket seçmelisiniz"
+          other: "En az %{count} etiket seçmelisiniz"
         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"
@@ -1535,8 +1776,6 @@ tr_TR:
       saved: "Kaydedildi!"
       saved_draft: "Gönderi taslağı devam ediyor. Devam etmek için dokunun."
       uploading: "Yükleniyor..."
-      show_preview: "önizlemeyi göster &raquo;"
-      hide_preview: "&laquo; önizlemeyi gizle"
       quote_post_title: "Tüm gönderiyi göster"
       bold_label: "B"
       bold_title: "Güçlü"
@@ -1549,8 +1788,8 @@ tr_TR:
       link_dialog_title: "Hyperlink ekle"
       link_optional_text: "isteğe bağlı başlık"
       link_url_placeholder: "Arama konularına bir URL yapıştırın veya yazın"
-      quote_title: "Blok-alıntı"
-      quote_text: "Blok-alıntı"
+      blockquote_title: "Alıntı"
+      blockquote_text: "Blok-alıntı"
       code_title: "Önceden biçimlendirilmiş yazı"
       code_text: "paragraf girintisi 4 boşluktan oluşan, önceden biçimlendirilen yazı"
       paste_code_text: "kodu buraya gir veya yapıştır"
@@ -1566,6 +1805,8 @@ tr_TR:
       abandon: "yazım alanını kapat ve taslağı sil"
       enter_fullscreen: "tam ekran yaratıcıya gir"
       exit_fullscreen: "tam ekran yaratıcıdan çık"
+      show_toolbar: "editör araç çubuğunu göster"
+      hide_toolbar: "editör araç çubuğunu gizle"
       modal_ok: "Tamam"
       modal_cancel: "İptal"
       cant_send_pm: "Üzgünüz, %{username} kullanıcısına mesaj gönderemezsin."
@@ -1578,11 +1819,15 @@ tr_TR:
         draft: Taslak
         edit: Düzenle
         reply_to_post:
+          label: Bir gönderiyi %{postUsername} ile yanıtla
           desc: İlgili gönderiyi cevapla
         reply_as_new_topic:
           label: Bağlantılı konu olarak yanıtla
           desc: Bu konuyla bağlantılı yeni bir konu oluştur
           confirm: Bağlantılı bir konu oluşturduğunuzda üzerine yazılacak yeni bir konu taslağınız var.
+        reply_as_new_group_message:
+          label: Yeni grup mesajı olarak yanıtla
+          desc: Aynı alıcılarla yeni bir özel mesaj oluşturun
         reply_as_private_message:
           label: Yeni Mesaj
           desc: Kişisel bir mesaj oluştur
@@ -1596,10 +1841,12 @@ tr_TR:
           label: "Yeni Konu"
         shared_draft:
           label: "Paylaşılan Taslak"
-          desc: "Sadece görevli tarafından görülebilecek bir konu tasarla"
+          desc: "Yalnızca izin verilen kullanıcılar tarafından görülebilecek bir konu taslağı oluşturun"
         toggle_topic_bump:
           label: "Konu detaylarını değiştir"
           desc: "Son cevap tarihini değiştirmeden yanıtla"
+      reload: "Yeniden Yükle"
+      ignore: "Yoksay"
     notifications:
       tooltip:
         regular:
@@ -1608,6 +1855,9 @@ tr_TR:
         message:
           one: "%{count} okunmamış ileti"
           other: "%{count} okunmamış mesaj"
+        high_priority:
+          one: "%{count} okunmamış yüksek öncelikli bildirim"
+          other: "%{count} okunmamış yüksek öncelikli bildirim"
       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."
@@ -1621,6 +1871,10 @@ tr_TR:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username}, %{username2} ve %{count} diğer</span> %{description}"
+        other: "<span class='multi-user'>%{username}, %{username2} ve %{count} diğerleri</span> %{description}"
       liked_consolidated_description:
         one: "gönderilerinizden %{count} tanesi beğenildi"
         other: "gönderilerinizden %{count} tanesi beğenildi"
@@ -1635,6 +1889,12 @@ tr_TR:
       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:
+        one: "'%{group_name}' için %{count} açık üyelik talebi"
+        other: "'%{group_name}' için %{count} açık üyelik isteği"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
+      votes_released: "%{description} - tamamlandı"
       group_message_summary:
         one: "%{group_name} gelen kutunuzdaki %{count} mesaj var"
         other: "%{group_name} gelen kutunuzda %{count} mesajları"
@@ -1662,6 +1922,8 @@ tr_TR:
         posted: "yeni gönderi"
         moved_post: "gönderi taşındı"
         linked: "bağlantılı"
+        bookmark_reminder: "yer imi hatırlatıcısı"
+        bookmark_reminder_with_name: "yer imi hatırlatıcısı - %{name}"
         granted_badge: "rozet verildi"
         invited_to_topic: "konuya davet edildi"
         group_mentioned: "belirtilen grup"
@@ -1671,20 +1933,20 @@ tr_TR:
         liked_consolidated: "yeni beğeniler"
         post_approved: "gönderi onaylandı"
         membership_request_consolidated: "Yeni üyelik talepleri"
+        reaction: "yeni tepki"
+        votes_released: "Oyladınız"
     upload_selector:
       title: "Resim ekle"
       title_with_attachments: "Resim ya da dosya ekle"
       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}"
       local_tip: "cihazından resimler seç"
-      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"
       select_file: "Dosya seç"
       default_image_alt_text: resim
+      supported_formats: "desteklenen formatlar"
     search:
       sort_by: "Sırala"
       relevance: "Uygunluk "
@@ -1710,6 +1972,7 @@ tr_TR:
       or_search_google: "Ya da Google'la aramayı dene:"
       search_google: "Google'la aramayı dene:"
       search_google_button: "Google"
+      search_button: "Ara"
       context:
         user: "@%{username} kullancısına ait gönderilerde ara"
         category: "#%{category} kategorisini ara"
@@ -1754,16 +2017,27 @@ tr_TR:
           noreplies: sıfır cevabı olan
           single_user: tek kullanıcı içeren
         post:
+          count:
+            label: Gönderi
+          min:
+            placeholder: en az
+          max:
+            placeholder: en fazla
           time:
             label: Gönderilen
             before: önce
             after: sonra
+        views:
+          label: Görüntüleme
+        min_views:
+          placeholder: en az
+        max_views:
+          placeholder: en fazla
     hamburger_menu: "Diğer bir konu ya da kategoriye git"
     new_item: "yeni"
     go_back: "geri dön"
     not_logged_in_user: "güncel aktivitelerin ve tercihlerin özetinin bulunduğu kullanıcı sayfası"
     current_user: "kendi kullanıcı sayfana git"
-    view_all: "tümünü görüntüle"
     topics:
       new_messages_marker: "son ziyaret"
       bulk:
@@ -1784,7 +2058,9 @@ tr_TR:
         change_category: "Kategori düzenle"
         close_topics: "Konuları Kapat"
         archive_topics: "Konuları Arşivle"
+        move_messages_to_inbox: "Gelen kutusuna taşı"
         notification_level: "Bildirimler"
+        change_notification_level: "Bildirim Düzeyini Değiştir"
         choose_new_category: "Konular için yeni bir kategori seç:"
         selected:
           one: "<b>%{count}</b> konu seçtiniz."
@@ -1794,16 +2070,22 @@ tr_TR:
         choose_new_tags: "Bu konular için yeni etiketler seç:"
         choose_append_tags: "Konulara uygulanacak yeni etiketleri seçin:"
         changed_tags: "Bu konuların etiketleri değiştirildi."
+        remove_tags: "Tüm Etiketleri Kaldır"
+        progress:
+          one: "İlerleme: <strong>%{count}</strong> konu"
+          other: "İlerleme: <strong>%{count}</strong> konu"
       none:
         unread: "Okunmamış konun yok."
         new: "Yeni konun yok."
         read: "Henüz herhangi bir konu okumadın."
         posted: "Henüz herhangi bir konuda gönderi yapmadın"
+        ready_to_create: "Hazır "
+        latest: "Hepiniz yakalandınız!"
         bookmarks: "Henüz bir konu işaretlememişsin. "
         category: "%{category} konusu yok."
         top: "Popüler bir konu yok."
         educate:
-          unread: '<p>Okumadığın konular burada görünecek.</p><p>Öntanımlı olarak, konuların okunmamış sayılması ve kaç tane<span class="badge new-posts badge-notification">1</span> okunmamış mesaj olduğunun gösterilmesi için </p><ul><li>Konuyu oluşturmuş olman</li><li>Konuya cevap vermiş olman</li><li>Konuyu 4 dakikadan fazla okumuş olman</li></ul><p>Veya, konuyu her konunun altında bulunan bildirim kontrol alanından Gözleniyor veya Takip Ediliyor olarak seçmen gerekir.</p><p><a href="%{userPrefsUrl}">tercihler</a> sayfanı ziyaret ederek bunu değiştirebilirsin.</p>'
+          new: '<p>Yeni konularınız burada görünecektir. Varsayılan olarak, konular yeni kabul edilir ve son 2 gün içinde oluşturulmuşlarsa <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> göstergesi gösterilir.</p><p>Bunu değiştirmek için <a href="%{userPrefsUrl}"> tercihinizi</a> ziyaret edin.</p>'
       bottom:
         latest: "Daha fazla güncel konu yok."
         posted: "Daha fazla gönderilmiş konu yok."
@@ -1811,6 +2093,7 @@ tr_TR:
         new: "Daha fazla yeni konu yok."
         unread: "Daha fazla okunmamış konu yok."
         category: "Daha fazla %{category} konusu yok."
+        tag: "%{tag} bu etikette daha fazla konu yok."
         top: "Daha fazla popüler konu yok."
         bookmarks: "Daha fazla işaretlenmemiş konu yok."
     topic:
@@ -1879,34 +2162,53 @@ tr_TR:
       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}."
       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."
       browse_all_categories: Bütün kategorilere göz at
+      browse_all_tags: Tüm etiketlere göz atın
       view_latest_topics: Son konuları görüntüle
       jump_reply_up: Önceki cevaba geç
       jump_reply_down: Sonraki cevaba geç
       deleted: "Konu silindi "
+      slow_mode_update:
+        title: "Yavaş mod"
+        select: "Kullanıcılar bu konuda yalnızca bir kez gönderi yapabilir:"
+        description: "Hızlı cevaplanan veya ateşi yüksek tartışmalarda, mantıklı ve kaliteli cevaplar verilmesi amacıyla kullanıcıların bu konuya tekrar cevap yazabilmesi için beklemesi gerekir."
+        save: "Etkin"
+        remove: "Devredışı"
+        hours: "Saat:"
+        minutes: "Dakika:"
+        seconds: "Saniye:"
+        durations:
+          10_minutes: "10 Dakika"
+          15_minutes: "Dakika"
+          30_minutes: "30 Dakika"
+          45_minutes: "45 Dakika"
+          1_hour: "1 saat"
+          2_hours: "2 saat"
+          4_hours: "4 saat"
+          8_hours: "8 saat"
+          12_hours: "12 saat"
+          24_hours: "24 saat"
+          custom: "Özel Süre"
       topic_status_update:
         title: "Konu Zamanlayıcısı"
         save: "Zamanlayıcıyı Ayarla"
         num_of_hours: "Saat:"
+        num_of_days: "Bildirilenlerin sayısı:"
         remove: "Zamanlayıcıyı Kaldır"
         publish_to: "Şuraya Yayınla:"
         when: "Ne zaman:"
-        time_frame_required: Bir zaman dilimi seç
+        time_frame_required: "Bir zaman dilimi seç"
+        min_duration: "Süre sıfırdan büyük olmalıdır"
+        max_duration: "Süre 20 yıldan az olmalıdır"
       auto_update_input:
         none: "Zaman aralığı seç"
+        now: "Şimdi"
         later_today: "Bugün ilerleyen saatlerde"
         tomorrow: "Yarın"
         later_this_week: "Bu hafta içinde"
         this_weekend: "Bu hafta sonu"
         next_week: "Gelecek hafta"
-        two_weeks: "İki Hafta"
         next_month: "Gelecek ay"
-        two_months: "İki ay"
-        three_months: "Üç Ay"
-        four_months: "Dört ay"
-        six_months: "Altı Ay"
-        one_year: "Bir Yıl"
         forever: "Sonsuza dek"
         pick_date_and_time: "Tarih ve saat seç"
         set_based_on_last_post: "Son gönderiye göre kapat"
@@ -1920,23 +2222,27 @@ tr_TR:
         title: "Geçici Olarak Kapat"
       auto_close:
         title: "Konuyu Otomatik Kapat"
-        label: "Konunun otomatik kapatılacağı saatler:"
         error: "Lütfen geçerli bir değer gir."
         based_on_last_post: "Konudaki son gönderi en az bu kadar eski olmadıkça kapatma."
+      auto_close_after_last_post:
+        title: "Son Gönderiden Sonra Konuyu Otomatik Kapat"
       auto_delete:
         title: "Konuyu Otomatik Sil"
       auto_bump:
         title: "Konuyu Otomatik Patlat"
       reminder:
         title: "Bana hatırlat"
+      auto_delete_replies:
+        title: "Yanıtları Otomatik Sil"
       status_update_notice:
         auto_open: "Bu konu %{timeLeft} otomatik olarak açılacak."
         auto_close: "Bu konu %{timeLeft} otomatik olarak kapanacak."
         auto_publish_to_category: "Bu konu %{timeLeft} <a href=%{categoryUrl}>#%{categoryName}</a> kategorisinde yayınlanacak."
-        auto_close_based_on_last_post: "Bu konu son cevaptan %{duration} sonra kapanacak."
+        auto_close_after_last_post: "Bu konu son cevaptan %{duration} sonra kapanacak."
         auto_delete: "Bu konu otomatik olarak silinecek %{timeLeft}."
         auto_bump: "Bu konu otomatik olarak patlayacak%{timeLeft}."
         auto_reminder: "%{timeLeft} Bu konu hakkında hatırlatılacaksınız"
+        auto_delete_replies: "Bu konudaki cevaplar yazıldıktan %{duration} sonra otomatik olarak silinir."
       auto_close_title: "Otomatik Kapatma Ayarları"
       auto_close_immediate:
         one: "Konudaki son gönderi zaten %{count} saat eski, bu yüzden konu hemen kapatılacak."
@@ -1952,7 +2258,9 @@ tr_TR:
         go: "git"
         jump_bottom: "son gönderiye geç"
         jump_prompt: "geç"
-        jump_prompt_of: " %{count} gönderinin"
+        jump_prompt_of:
+          one: "%{count} gönderi"
+          other: "%{count} gönderi"
         jump_prompt_long: "Atla..."
         jump_bottom_with_number: "%{post_number} numaralı gönderiye geç"
         jump_prompt_to_date: "şimdiye kadar"
@@ -1964,12 +2272,15 @@ tr_TR:
         reasons:
           mailing_list_mode: "Duyuru listesi modunu etkinleştirdin. Bu sebeple bu konuya gelen cevaplarla ilgili bildirimleri e-posta yoluyla alacaksın. "
           "3_10": "Bu konuyla ilgili bir etiketi izlediğin için bildirimleri alacaksın."
+          "3_10_stale": "Geçmişte bu konuyla ilgili bir etiketi izlediğiniz için bildirimler alacaksınız."
           "3_6": "Bu kategoriyi izlediğin için bildirimleri alacaksın."
+          "3_6_stale": "Geçmişte bu kategoriyi izlediğiniz için bildirimler alacaksınız."
           "3_5": "Bu konuyu otomatik olarak izlemeye başladığın için bildirimleri alacaksın."
           "3_2": "Bu konuyu izlediğin için bildirimleri alacaksın."
           "3_1": "Bu konuyu sen oluşturduğun için bildirimleri alacaksın."
           "3": "Bu konuyu izlediğin için bildirimleri alacaksın."
           "2_8": "Bu kategoriyi takip ettiğiniz için yeni cevapların sayısını göreceksiniz."
+          "2_8_stale": "Geçmişte bu kategoriyi izlediğiniz için bir dizi yeni yanıt 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": '<a href="%{basePath}/u/%{username}/preferences/notifications">Bu konuyu okuduğunuz</a> için yeni cevapların sayısını göreceksiniz.'
@@ -2036,6 +2347,7 @@ tr_TR:
         title: "Paylaş"
         extended_title: "Bağlantı paylaş"
         help: "bu konunun bağlantısını paylaş"
+        invite_users: "Davet"
       print:
         title: "Yazdır"
         help: "Bu konunun yazıcı dostu olan sürümünü aç"
@@ -2087,14 +2399,13 @@ tr_TR:
         username_placeholder: "kullanıcı adı"
         action: "Davet Gönder"
         help: "e-posta veya bildiri aracılığıyla başkalarını bu konuya davet et"
-        to_forum: "Arkadaşına, giriş yapması gerekmeden, bağlantıya tıklayarak katılabilmesi için kısa bir e-posta göndereceğiz. "
-        sso_enabled: "Bu konuya davet etmek istediğin kişinin kullanıcı adını gir."
+        discourse_connect_enabled: "Bu konuya davet etmek istediğin kişinin kullanıcı adını gir."
         to_topic_blank: "Bu konuya davet etmek istediğin kişinin kullanıcı adını veya e-posta adresini gir."
         to_topic_email: "Bir e-posta adresi girdin. Arkadaşının bu konuya hemen cevap verebilmesini sağlayacak bir davetiyeyi e-posta ile göndereceğiz. "
         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>%{invitee}</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."
@@ -2147,6 +2458,7 @@ tr_TR:
         action: "seçili gönderileri birleştir"
         error: "Seçili gönderileri birleştirirken bir hata oluştu."
       publish_page:
+        title: "Sayfa Yayınlama"
         public: "Herkese Açık"
       change_owner:
         title: "Sahibini Değiştir"
@@ -2193,8 +2505,6 @@ tr_TR:
       edit_reason: "Neden: "
       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:"
@@ -2234,16 +2544,11 @@ tr_TR:
         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."
-      abandon_edit:
-        confirm: "Değişikliklerinizi silmek istediğinizden emin misiniz?"
-        no_value: "Hayır, kalsın"
-        no_save_draft: "Hayır, taslağı kaydet"
-        yes_value: "Evet, düzenlemeyi iptal et"
-      abandon:
-        confirm: "Gönderinden vazgeçtiğine emin misin?"
-        no_value: "Hayır, kalsın"
-        no_save_draft: "Hayır, taslağı kaydet"
-        yes_value: "Evet, vazgeç"
+      cancel_composer:
+        confirm: "Gönderiyi ne yapmak istersiniz?"
+        discard: "Çöpe at"
+        save_draft: "Taslağı kaydet"
+        keep_editing: "Düzenlemeye devam et"
       via_email: "bu gönderi e-posta ile iletildi"
       via_auto_generated_email: "bu gönderi otomatik bir e-posta yoluyla gönderildi"
       whisper: "bu gönderi yöneticiler için özel bir fısıltıdır"
@@ -2281,6 +2586,7 @@ tr_TR:
         convert_to_moderator: "Görevli Rengi Ekle"
         revert_to_regular: "Görevli Rengini Kaldır"
         rebake: "HTML'i Yeniden Yapılandır"
+        publish_page: "Sayfa Yayınlama"
         unhide: "Gizleme"
         change_owner: "Sahipliğini Değiştir"
         grant_badge: "Hibe Kartı"
@@ -2290,9 +2596,18 @@ tr_TR:
         unlock_post_description: "Yayımda bu pankarta izin ver"
         delete_topic_disallowed_modal: "Bu konuyu silme iznin yok. Gerçekten silinmesini istiyorsan, nedenini de belirterek moderatöre bir bilgilendirme gönder."
         delete_topic_disallowed: "bu konuyu silme iznin yok"
+        delete_topic_confirm_modal:
+          one: "Bu konu şu anda %{count} okunmaya sahip ve popüler bir arama hedefi olabilir. Düzenlemek yerine bu konuyu tamamen silmek istediğinizden emin misiniz?"
+          other: "Bu konu şu anda %{count} görüntülemeye sahip ve popüler bir arama hedefi olabilir. Düzenlemek yerine bu konuyu tamamen silmek istediğinizden emin misiniz?"
+        delete_topic_confirm_modal_yes: "Evet, bu konuyu sil"
+        delete_topic_confirm_modal_no: "Hayır, bu konuyu silme"
+        delete_topic_error: "Bu konuyu silerken bir hata oluştu"
         delete_topic: "konuyu sil"
         add_post_notice: "Personel Bildirimi Ekle"
+        change_post_notice: "Personel Bildirimini Değiştir"
+        delete_post_notice: "Personel Bildirimini Sil"
         remove_timer: "zamanlayıcıyı kaldır"
+        edit_timer: "zamanlayıcıyı düzenle"
       actions:
         people:
           like:
@@ -2329,6 +2644,7 @@ tr_TR:
           last: "Son revizyon"
           hide: "Düzenlemeyi gizle"
           show: "Düzenlemeyi göster"
+          revert: "%{revision} düzeltmeye 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}"
@@ -2355,9 +2671,31 @@ tr_TR:
             button: "HTML"
       bookmarks:
         create: "Yer işareti oluştur"
+        edit: "Yer işaretini düzenleyin"
         created: "Oluşturuldu"
         updated: "Güncellenmiş"
         name: "İsim"
+        name_placeholder: "Bu yer imi ne için?"
+        set_reminder: "Bana hatırlat"
+        actions:
+          delete_bookmark:
+            name: "Yer işaretini sil"
+            description: "Yer işaretini profilinizden kaldırır ve tüm yer işareti hatırlatıcıları durdurur"
+          edit_bookmark:
+            name: "Yer işaretini düzenleyin"
+            description: "Yer imi adını düzenleyin veya hatırlatıcı tarih ve saatini değiştirin"
+          pin_bookmark:
+            name: "Yer işaretini sabitle"
+            description: "Yer işaretini sabitleyin. Yer işaretleri listenizin en üstünde görünmesini sağlar."
+          unpin_bookmark:
+            name: "Yer işaretini kaldır"
+            description: "Yer işaretini kaldırın. Artık yer işaretleri listenizin en üstünde görünmez."
+      filtered_replies:
+        viewing_posts_by: "%{post_count} gönderi görüntüleyen"
+        viewing_subset: "Bazı yanıtlar daraltıldı"
+        viewing_summary: "Bu konunun özetini göster"
+        post_number: "%{username}, post #%{post_number}"
+        show_all: "Hepsini Göster ↓"
     category:
       can: "yapabilir&hellip;"
       none: "(kategori yok)"
@@ -2366,6 +2704,7 @@ tr_TR:
       edit: "Düzenle"
       edit_dialog_title: "Düzenle: %{categoryName}"
       view: "Bu Kategorideki Konuları Görüntüle"
+      back: "Kategoriye dön"
       general: "Genel"
       settings: "Ayarlar"
       topic_template: "Konu Şablonu"
@@ -2375,6 +2714,7 @@ tr_TR:
       tags_placeholder: "(Seçmeli) izin verilen etiketlerin listesi"
       tags_tab_description: "Yukarıda belirtilen etiketler ve etiket grupları yalnızca bu kategoride ve bunları belirten diğer kategorilerde bulunur. Diğer kategorilerde kullanılamazlar."
       tag_groups_placeholder: "(Seçmeli) izin verilen etiket gruplarının listesi"
+      manage_tag_groups_link: "Etiket gruplarını yönetin"
       allow_global_tags_label: "Diğer etiketlere de izin ver"
       tag_group_selector_placeholder: "(Opsiyonel) Etiket grubu"
       required_tag_group_description: "Bir etiket grubundaki etiketleresahip olmak için için yeni konular gerekiyor:"
@@ -2406,9 +2746,17 @@ tr_TR:
       change_in_category_topic: "Açıklamayı Düzenle"
       already_used: "Bu renk başka bir kategori için kullanıldı"
       security: "Güvenlik"
+      security_add_group: "Bir grup ekleyin"
       permissions:
+        group: "Grup"
+        see: "Bak"
         reply: "Cevapla"
         create: "Oluştur"
+        no_groups_selected: "Hiçbir gruba erişim izni verilmedi; bu kategori yalnızca personel tarafından görülebilir."
+        everyone_has_access: 'Bu kategori herkese açıktır, herkes görebilir, yanıtlayabilir ve gönderiler oluşturabilir. İzinleri kısıtlamak için "herkes" grubuna verilen izinlerden birini veya birkaçını kaldırın.'
+        toggle_reply: "Yanıtlama iznini aç / kapat"
+        toggle_full: "Yanıtlama iznini aç / kapat"
+        inherited: 'Bu izin "herkesten" devralınır'
       special_warning: "Uyarı: Bu kategori önceden ayarlanmış bir kategoridir ve güvenlik ayarları değiştirilemez. Eğer bu kategoriyi kullanmak istemiyorsan, başka bir amaçla kullanmak yerine sil."
       uncategorized_security_warning: "Bu kategori özeldir. Kategorisi olmayan konular için tutma alanı olarak tasarlanmıştır; güvenlik ayarlarına sahip olamaz."
       uncategorized_general_warning: 'Bu kategori özeldir. Kategori seçilmeyen yeni konular için varsayılan kategori olarak kullanılır. Bu davranışı önlemek ve kategori seçimini zorlamak istiyorsanız, <a href="%{settingLink}">lütfen buradaki ayarı</a> devre dışı bırakın. Adı veya açıklamayı değiştirmek istiyorsanız, <a href="%{customizeLink}">Özelleştir / Metin İçeriği</a>''ne gidin.'
@@ -2420,15 +2768,19 @@ tr_TR:
       email_in_disabled_click: '"e-posta" ayarını etkinleştir'
       mailinglist_mirror: "Kategori bir e-posta listesini yansıtır"
       show_subcategory_list: "Bu kategorideki alt kategori listesini üst başlıklarda göster"
+      read_only_banner: "Kullanıcı bu kategoride konu oluşturamadığında başlık metni:"
       num_featured_topics: "Kategoriler sayfasında gösterilen konu sayısı:"
       subcategory_num_featured_topics: "Üst kategori sayfasındaki öne çıkan konuların sayısı:"
       all_topics_wiki: "Yeni konuları wiki'nin varsayılanı yap"
+      allow_unlimited_owner_edits_on_first_post: "İlk gönderide gönderi sahibinin sınırsız düzenlemesine izin ver"
       subcategory_list_style: "Alt Kategori Liste Biçimi:"
       sort_order: "Konu Listesini Şuna Göre Sırala:"
       default_view: "Varsayılan Konu Listesi:"
       default_top_period: "Varsayılan Üst Periyot:"
+      default_list_filter: "Varsayılan Liste Filtresi:"
       allow_badges_label: "Bu kategoride rozetle ödüllendirilmesine izin ver"
       edit_permissions: "İzinleri Düzenle"
+      reviewable_by_group: "Personele ek olarak, bu kategorideki içerik şu kişiler tarafından da incelenebilir:"
       review_group_name: "grup adı"
       require_topic_approval: "Tüm yeni konular moderatör onayını gerektirir"
       require_reply_approval: "Tüm yeni cevaplar moderatör onayı gerektirir"
@@ -2444,19 +2796,17 @@ tr_TR:
       notifications:
         watching:
           title: "İzleniyor"
-          description: "Bu kategorilerdeki tüm konuları otomatik olarak izleyeceksin. Tüm konulardaki her yeni gönderiden haberdar olacak ve yeni cevapların sayısını göreceksin. "
+          description: "Bu kategorideki tüm konuları otomatik olarak izleyeceksiniz. Her konudaki her yeni gönderi size bildirilecek ve bir dizi yeni yanıt gösterilecektir."
         watching_first_post:
           title: "İlk Gönderi İzleme"
           description: "Bu kategorideki yeni konular size bildirilecektir ancak konulara cevap verilmeyecektir."
         tracking:
           title: "Takip Ediliyor"
-          description: "Bu kategorilerdeki tüm yeni konuları otomatik olarak takip edeceksin. Birisi @isminden bahsederse veya gönderine cevap verirse bildirim alacak, ayrıca yeni cevapların sayısını da göreceksin. "
         regular:
           title: "Normal"
           description: "Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın."
         muted:
           title: "Sessiz"
-          description: "Bu kategorilerdeki yeni konular hakkında herhangi bir bildiri almayacaksın ve en son gönderiler de gözükmeyecek. "
       search_priority:
         label: "Arama Önceliği"
         options:
@@ -2491,10 +2841,17 @@ tr_TR:
     flagging:
       title: "Topluluğumuzun nezaket kuralları içerisinde kalmasına sağladığın destek için teşekkürler!"
       action: "Gönderiyi Bayrakla İşaretle"
+      take_action_options:
+        default:
+          title: "Harekete Geç"
+          details: "Grubundan daha fazla bayrak beklemek yerine bunu hızlıca yaparak alt sınıra erişebilirsin"
+        suspend:
+          title: "Kullanıcıyı Askıya Al"
+        silence:
+          title: "Kullanıcıyı Sustur"
       notify_action: "Mesaj"
       official_warning: "Resmi uyarı"
       delete_spammer: "İstenmeyen e-postayı göndereni sil"
-      delete_confirm_MF: "Bu kullanıcının {POSTS, plural, one {<b>1</b> gönderisini} other {<b>#</b> gönderisini}} ve {TOPICS, plural, one {<b>1</b> konusunu} other {<b>#</b> konusunu}} silmek üzeresin, ayrıca kullanıcının hesabı kaldırılacak, giriş yaptığı <b>{ip_address}</b> IP adresinden giriş yapması engellenecek ve <b>{email}</b> e-posta adresi kalıcı yasaklı listesine eklenecek. Bu kullanıcının gerçekten bir spamcı olduğuna emin misin?"
       yes_delete_spammer: "Evet, İstenmeyen E-postayı Göndereni Sil"
       ip_address_missing: "(uygulanamaz)"
       hidden_email_address: "(gizli)"
@@ -2561,12 +2918,6 @@ tr_TR:
         title: "Bu konu kişisel bir mesajdır"
         help: "Bu konu kişisel bir mesajdır"
     posts: "Gönderiler"
-    posts_likes_MF: |
-      Bu konuda {count, plural, one {1 cevap} other {# cevap}} {ratio, select,
-      low {ve yüksek beğeni/gönderi oranı}
-      med {ve çok yüksek beğeni/gönderi oranı}
-      high {ve aşırı yüksek beğeni/gönderi oranı}
-      other {}} var
     original_post: "Orjinal Gönderi"
     views: "Görüntülenenler"
     views_lowercase:
@@ -2586,7 +2937,6 @@ tr_TR:
       one: "kullanıcı"
       other: "kullanıcılar"
     category_title: "Kategori"
-    history: "Geçmiş"
     changed_by: "Yazan %{author}"
     raw_email:
       title: "Gelen e-posta"
@@ -2672,6 +3022,7 @@ tr_TR:
       close: "Kapat (Esc)"
       content_load_error: '<a href="%url%">İçerik</a> yüklenemedi.'
       image_load_error: '<a href="%url%">Resim</a> yüklenemedi.'
+    cannot_render_video: Tarayıcınız codec bileşenini desteklemediği için bu video gösterilemiyor.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ","
       shortcut_key_delimiter_plus: "+"
@@ -2875,12 +3226,21 @@ 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. "
+    forced_anonymous_login_required: "Site şu an aşırı yük altında ve yüklenemiyor, lütfen birkaç dakika sonra tekrar deneyin."
     footer_nav:
       back: "Geri"
       share: "Paylaş"
       dismiss: "Yoksay"
     safe_mode:
       enabled: "Güvenli mod etkin, çıkmak için bu tarayıcı penceresini kapat"
+    do_not_disturb:
+      remaining: "%{remaining} kaldı"
+      options:
+        half_hour: "30 dakika"
+        one_hour: "1 saat"
+        two_hours: "2 saat"
+        custom: "Özel ayarlar"
+      set_schedule: "Bildirim zamanlaması ayarla"
   admin_js:
     type_to_filter: "filtrelemek için yaz..."
     admin:
@@ -2908,6 +3268,8 @@ tr_TR:
         installed_version: "Yüklendi"
         latest_version: "En son"
         problems_found: "Mevcut site ayarlarınıza göre bazı öneriler"
+        new_features:
+          dismiss: "Yoksay"
         last_checked: "Son kontrol"
         refresh_problems: "Yenile"
         no_problems: "Herhangi bir sorun bulunamadı."
@@ -2960,6 +3322,9 @@ tr_TR:
           view_table: "tablo"
           view_graph: "grafik"
           refresh_report: "Raporu Yenile"
+          daily: Günlük
+          monthly: Aylık
+          weekly: Haftalık
           groups: "Tüm gruplar"
           disabled: "Bu rapor devre dışı"
           totals_for_sample: "Örnek toplamlar"
@@ -2990,10 +3355,6 @@ tr_TR:
             available: "Grup adı uygun"
             not_available: "Grup adı mevcut değil"
             blank: "Grup adı boş olamaz"
-        bulk_add:
-          title: "Toplu Grup Ekle"
-          complete_users_not_added: "Bu kullanıcılar eklenmedi (kullanıcıların hesaplarının olduğundan emin ol):"
-          paste: "Kullanıcı adlarının veya e-postalarının bir listesini, her satıra birer adet olacak şekilde yapıştır:"
         add_members:
           as_owner: "Kullanıcıyı/Kullanıcıları, bu grubun sahibi/sahipleri olarak ayarla"
         manage:
@@ -3030,6 +3391,7 @@ tr_TR:
         delete: "Sil"
         delete_confirm: "Grup silinsin mi?"
         delete_failed: "Grup silinemedi. Bu otomatik oluşturulmuş bir grup ise, yok edilemez."
+        delete_automatic_group: Bu otomatik bir gruptur ve silinemez.
         delete_owner_confirm: "'%{username}' için sahiplik izni kaldırılsın mı?"
         add: "Ekle"
         custom: "Özel ayarlar"
@@ -3072,6 +3434,7 @@ tr_TR:
         continue: Devam et
         scopes:
           resource: Kaynak
+          action: Eylem
       web_hooks:
         title: "Web Kancaları"
         none: "Şu anda bir web kancası yok."
@@ -3086,7 +3449,6 @@ tr_TR:
         go_back: "Listeye geri dön"
         payload_url: "URL Veri yükü "
         payload_url_placeholder: "https://ornek.com/gonderial"
-        warn_local_payload_url: "Öyle görünüyor ki, web kancasını yerel bir URL'ye ayarlamaya çalışıyorsun. Yerel bir adrese iletilen etkinlik beklenmedik durumlara neden olabilir. Devam etmek istiyor musun?"
         secret_invalid: "Gizli alanda boş karakter olamaz."
         secret_too_short: "Gizli alan en az 12 karakter olmalı."
         secret_placeholder: "İmza oluşturmak için isteğe bağlı metin"
@@ -3114,7 +3476,6 @@ tr_TR:
           details: "Yeni bir cevap olduğunda, düzenlendiğinde veya silindiğinde."
         user_event:
           name: "Kullanıcı Etkinliği"
-          details: "Bir kullanıcı giriş yaptığında, çıkış yaptığında, oluşturulduğunda, onaylandığında veya güncellendiğinde.."
         group_event:
           name: "Grup Etkinliği"
           details: "Bir grup oluşturulduğunda, güncellendiğinde veya iptal edildiğinde."
@@ -3130,6 +3491,12 @@ tr_TR:
         notification_event:
           name: "Bildirim etkinliği"
           details: "Bir kullanıcı yayınında bir bildirim aldığında."
+        group_user_event:
+          name: "Grup Kullanıcı Etkinliği"
+          details: "Bir gruba bir kullanıcı eklendiğinde veya çıkarıldığında."
+        like_event:
+          name: "Beğeni olayı"
+          details: "Bir kullanıcı bir gönderiyi beğendiğinde."
         delivery_status:
           title: "Teslim Durumu"
           inactive: "Aktif Değil"
@@ -3350,6 +3717,7 @@ tr_TR:
           is_private: "Tema özel bir git veri havuzunda"
           remote_branch: "Şube adı (isteğe bağlı)"
           public_key: "Repo'ya aşağıdaki genel anahtar erişimini ver:"
+          public_key_note: "Yukarıya geçerli bir özel depo URL'i girildiğinde, bir SSH anahtarı oluşturulacak ve burada görüntülenecektir."
           install: "Yükle"
           installed: "Yüklendi"
           install_popular: "Gözde"
@@ -3658,6 +4026,7 @@ tr_TR:
             api_key_update: "api anahtarını güncelleştir"
             api_key_destroy: "api anahtarını yok et"
             override_upload_secure_status: "yükleme güvenlik durumunu geçersiz kıl"
+            delete_group: "grubu sil"
         screened_emails:
           title: "Taranmış E-postalar"
           description: "Biri yeni bir hesap oluşturmaya çalıştığında aşağıdaki e-posta adresleri kontrol edilecek ve kayıt önlenecek ya da başka bir eylem gerçekleşecek."
@@ -3704,31 +4073,25 @@ tr_TR:
         title: "İzlenen Kelimeler"
         search: "ara"
         clear_filter: "Temizle"
-        show_words: "kelimeleri göster"
-        one_word_per_line: "Satır başına bir kelime"
         download: İndir
         clear_all: Tümünü Temizle
-        clear_all_confirm_block: "Engelleme işlemi için izlenen tüm kelimeleri silmek istediğinizden emin misiniz?"
-        clear_all_confirm_censor: "Sansür eylemi için izlenen tüm kelimeleri silmek istediğinizden emin misiniz?"
-        clear_all_confirm_flag: "Bayrak eylemi için izlenen tüm kelimeleri silmek istediğinizden emin misiniz?"
-        clear_all_confirm_require_approval: "Onay İstemek işlemi için izlenen tüm kelimeleri silmek istediğinizden emin misiniz?"
-        word_count:
-          one: "%{count} kelime"
-          other: "%{count} kelimeler"
+        clear_all_confirm: "%{action} eylemi için izlenen tüm kelimeleri temizlemek istediğinizden emin misiniz?"
         actions:
           block: "Engelle"
           censor: "Sansür"
           require_approval: "Onay gerektir"
           flag: "Bayrakla işaretle"
+          replace: "Değiştir"
         action_descriptions:
           block: "Bu kelimeleri içeren gönderilerin yayımlanmasını önle. Kullanıcı, gönderilerini yayımlamaya çalışırken bir hata mesajı görecek."
           censor: "Bu kelimeleri içeren yayımlara izin ver ancak bu kelimeleri sansürlenmiş kelimeleri gizleyen karakterlerle değiştir. "
           require_approval: "Bu kelimeleri içeren gönderiler yayımlanmadan önce personel onayı gerektirir."
           flag: "Bu kelimeleri içeren yayımlara izin ver ancak bunları uygunsuz olarak bayrakla işaretle. Böylece moderatörler bunları inceleyebilir."
+          replace: "Yazılardaki kelimeleri başka kelimeler veya bağlantılarla değiştirin"
         form:
-          label: "Yeni Kelime: "
-          placeholder: "tam kelime veya * özel karakter olarak"
           placeholder_regexp: "güvenilir ifade"
+          replacement_label: "Değiştirme"
+          replacement_placeholder: "örnek veya https://example.com"
           add: "Ekle"
           success: "Başarılı"
           exists: "Zaten mevcut"
@@ -3781,6 +4144,9 @@ tr_TR:
         check_email:
           title: "Bu kullanıcının e-posta adresini ortaya çıkar"
           text: "Göster"
+        check_sso:
+          title: "SSO yükünü göster"
+          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}"
@@ -3788,6 +4154,7 @@ tr_TR:
         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."
         suspend_reason: "Sebep"
+        suspend_reason_title: "Askıya Alma Sebebi"
         suspend_message: "E Posta Mesajı"
         suspend_message_placeholder: "İsteğe bağlı olarak, askıya alma sebebini daha uzun yazabilirsin. Askıya alma sebebi kullanıcıya e-postayla gönderilecek."
         suspended_by: "Askıya alan"
@@ -3813,7 +4180,6 @@ tr_TR:
         clear_penalty_history:
           title: "Ceza Geçmişini Temizle"
           description: "ceza puanı olan kullanıcılar TL3'e ulaşamaz"
-        delete_all_posts_confirm_MF: "{POSTS, plural, one {1 gönderi} other {# gönderi}} ve {TOPICS, plural, one {1 konu} other {# konu}} silmek üzeresin. Emin misin?"
         silence: "Sustur"
         unsilence: "Susturma"
         silenced: "Susturuldu?"
@@ -3944,12 +4310,11 @@ tr_TR:
           on_grace_period: "Şu an terfisi tolerans süresinde, seviyesi düşürülmeyecek"
           locked_will_not_be_promoted: "Güven seviyesi kilitlendi. Seviyesi hiçbir zaman yükseltilmeyecek."
           locked_will_not_be_demoted: "Güven seviyesi kilitlendi. Seviyesi hiçbir zaman düşürülmeyecek."
-        sso:
-          title: "Tek Oturum Açma"
+        discourse_connect:
           external_id: "Harici Kimlik"
-          external_username: "Kullanıcı adı"
+          external_username: "Kullanıcı Adı"
           external_name: "İsim"
-          external_email: "E-posta"
+          external_email: "Eposta"
           external_avatar_url: "Profil URL Resmi"
       user_fields:
         title: "Kullanıcı Alanları"
@@ -3981,6 +4346,10 @@ tr_TR:
           title: "Kullanıcı profilinde gösterilsin mi?"
           enabled: "kullanıcı profilinde gösterildi"
           disabled: "kullanıcı profilinde gösterilmiyor"
+        searchable:
+          title: "Aranabilir mi?"
+          enabled: "aranabilir"
+          disabled: "aranamaz"
         field_types:
           text: "Metin Alanı"
           confirm: "Onay"
@@ -3995,12 +4364,17 @@ tr_TR:
         go_back: "Aramaya geri dön"
         recommended: "Sıradaki metni isteğine göre uyarlamanı öneririz:"
         show_overriden: "Sadece iptal edilenleri göster"
+        locale: "Dil:"
         more_than_50_results: "50 den fazla sonuç var. Lütfen aramanızı daraltın."
       settings:
         show_overriden: "Sadece değiştirdiklerimi göster"
         reset: "sıfırla"
         none: "hiçbiri"
       site_settings:
+        emoji_list:
+          invalid_input: "Emoji listesi yalnızca geçerli emoji adlarını içermelidir, örneğin: hugs"
+          add_emoji_button:
+            label: "Emoji ekle"
         title: "Ayarlar"
         no_results: "Hiç sonuç bulunamadı."
         more_than_30_results: "30'dan fazla sonuç var. Lütfen aramanı daralt veya bir kategori seç."
@@ -4051,6 +4425,8 @@ tr_TR:
           modal_description: "Bu değişikliği tarihsel olarak uygulamak ister misiniz? Bu, %{count}mevcut kullanıcı için tercihlerini ​​değiştirecek."
           modal_yes: "Evet"
           modal_no: "Hayır, yalnızca ileriye dönük değişiklikleri uygulayın"
+        json_schema:
+          modal_title: "Düzenle: %{name}"
       badges:
         title: Rozetler
         new_badge: Yeni Rozet
@@ -4087,8 +4463,11 @@ tr_TR:
         enabled: Rozeti etkinleştir
         icon: Simge
         image: Görsel
+        graphic: Grafik
         icon_help: "Font Awesome simge adı girin (normal simgeler için 'far-' önünü ve marka simgeleri için 'fab-' kullanın)"
-        image_help: "Görüntünün URL'sini gir (her ikisi de ayarlanmışsa, simge alanını geçersiz kıl)"
+        select_an_icon: "Bir ikon seçin"
+        upload_an_image: "İmaj Yükle"
+        read_only_setting_help: "Metni özelleştir"
         query: Rozet Sorgusu (SQL)
         target_posts: Sorgu hedefleri gönderileri
         auto_revoke: Günlük iptal sorgusunu çalıştır
@@ -4157,6 +4536,9 @@ tr_TR:
         embed_post_limit: "Yerleştirmek için en fazla gönderi sayısı"
         embed_title_scrubber: "Gönderilerin başlığını temizlemek için kullanılan düzenli ifade"
         embed_truncate: "Saklı gönderileri kırp"
+        allowed_embed_selectors: "Gömülü olarak izin verilen öğeler için CSS seçici"
+        blocked_embed_selectors: "Gömülmüş öğelerden kaldırılan öğeler için CSS seçici"
+        allowed_embed_classnames: "İzin verilen CSS sınıfı isimleri"
         save: "Gömme Ayarlarını Kaydet"
       permalink:
         title: "Kalıcı Bağlantılar"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 7339ae74c5..02caac70cb 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -202,6 +202,9 @@ uk:
     topic_admin_menu: "дії теми"
     wizard_required: "Запрошуємо до вашого нового Discourse! Давайте розпочнемо з <a href='%{url}' data-auto-route='true'>майстра налаштування</a> ✨"
     emails_are_disabled: "Надсилання повідомлень електронною поштою було глобально вимкнено адміністратором. Жодне сповіщення електронною поштою не буде надіслано."
+    software_update_prompt:
+      message: "Ми оновили цей сайт, <span>оновіть</span>, інакше у вас може виникнути неочікувана поведінка."
+      dismiss: "Відкласти"
     bootstrap_mode_enabled:
       one: "Задля спрощення запуску вашого нового сайту, сайт зараз у режимі початкового спеціального режиму. Усі нові користувачі отримають рівень довіри 1 та увімкнена щоденна розсилка підсумків електронною поштою. Цей режим буде автоматично вимкнено, коли буде мінімально потрібна кількість зареєстрованих користувачів — %{count}."
       few: "Задля спрощення запуску вашого нового сайту, сайт зараз у режимі початкового спеціального режиму. Усі нові користувачі отримають рівень довіри 1 та увімкнена щоденна розсилка підсумків електронною поштою. Цей режим буде автоматично вимкнено, коли буде мінімально потрібна кількість зареєстрованих користувачів — %{count}."
@@ -215,6 +218,7 @@ uk:
       regions:
         ap_northeast_1: "Азія (Токіо)"
         ap_northeast_2: "Азія (Сеул)"
+        ap_east_1: "Азіатсько-Тихоокеанський регіон (Гонконг)"
         ap_south_1: "Азія (Мумбай)"
         ap_southeast_1: "Азія (Сингапур)"
         ap_southeast_2: "Азія (Сідней)"
@@ -233,6 +237,7 @@ uk:
         us_gov_west_1: "AWS GovCloud (захід США)"
         us_west_1: "Захід США (Пн. Каліфорнія)"
         us_west_2: "Захід США (Орегон)"
+    clear_input: "Очистити"
     edit: "редагувати назву та розділ цієї теми"
     expand: "Розгорнути"
     not_implemented: "Цей функціонал ще не реалізовано, даруйте!"
@@ -269,6 +274,11 @@ uk:
     now: "щойно"
     read_more: "читати більше"
     more: "Більше"
+    x_more:
+      one: "Ще %{count}"
+      few: "Ще %{count}"
+      many: "Ще %{count}"
+      other: "Ще %{count}"
     less: "Менше"
     never: "ніколи"
     every_30_minutes: "кожні 30 хвилин"
@@ -299,8 +309,9 @@ uk:
       moderators: "Модератори"
       stat:
         all_time: "За весь час"
-        last_7_days: "Останні 7"
-        last_30_days: "Останні 30"
+        last_day: "Останні 24 години"
+        last_7_days: "Останні 7 днів"
+        last_30_days: "Останні 30 днів"
       like_count: "Вподобання"
       topic_count: "Теми"
       post_count: "Дописи"
@@ -336,18 +347,6 @@ uk:
       search_placeholder: "Пошук закладок за назвою, назвою теми або вмістом публікації"
       search: "Пошук"
       reminders:
-        later_today: "Пізніше сьогодні"
-        next_business_day: "Наступний робочий день"
-        tomorrow: "Завтра"
-        next_week: "На наступному тижні"
-        post_local_date: "Дата повідомлення"
-        later_this_week: "Пізніше на цьому тижні"
-        start_of_next_business_week: "Понеділок"
-        start_of_next_business_week_alt: "Наступного понеділка"
-        next_month: "В наступному місяці"
-        custom: "Вибрана дата та час"
-        last_custom: "Останні"
-        none: "Нагадування не потрібне"
         today_with_time: "сьогодні о %{time}"
         tomorrow_with_time: "завтра о %{time}"
         at_time: "на %{date_time}"
@@ -357,13 +356,14 @@ uk:
     drafts:
       resume: "Продовжити"
       remove: "Вилучити"
+      remove_confirmation: "Ви дійсно бажаєте видалити цю чернетку?"
       new_topic: "Нова чернетка теми"
       new_private_message: "Нова чернетка приватного повідомлення"
       topic_reply: "Чернетка відповіді"
       abandon:
-        confirm: "Ви уже відкрили іншу чернетку у цій темі. Ви впевнені, що хочете покинути її?"
-        yes_value: "Так, відмовитись"
-        no_value: "Ні, зачекайте"
+        confirm: "У вас є чернетка для цієї теми. Що б ви хотіли з цим зробити?"
+        yes_value: "Відкинути"
+        no_value: "Відновити редагування"
     topic_count_latest:
       one: "Переглянути %{count} нову чи оновлену тему"
       few: "Переглянути %{count} нові чи оновлені теми"
@@ -468,6 +468,7 @@ uk:
       topic: "Тема:"
       filtered_topic: "Ви відфільтрували контент до перегляду у одній темі."
       filtered_user: "Користувач"
+      filtered_reviewed_by: "Переглянуто"
       show_all_topics: "показати усі теми"
       deleted_post: "(допис вилучено)"
       deleted_user: "(користувача вилучено)"
@@ -478,12 +479,13 @@ uk:
         email: "Електронна пошта"
         name: "Ім'я"
         fields: "Поля"
+        reject_reason: "Причина"
       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} (останнього прапорця)"
+          few: "%{agreed}, %{disagreed}, %{ignored} (останніх %{count} прапорців)"
+          many: "%{agreed}, %{disagreed}, %{ignored} (останніх %{count} прапорців)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (останніх %{count} прапорців)"
         agreed:
           one: "%{count}% згод"
           few: "%{count}% згодні"
@@ -536,7 +538,8 @@ uk:
           created_at_asc: "Створено (зворотний порядок)"
         priority:
           title: "Мінімальний пріоритет"
-          low: "(будь-який)"
+          any: "(будь-який)"
+          low: "Низький"
           medium: "Середній"
           high: "Високий"
       conversation:
@@ -574,6 +577,8 @@ uk:
           title: "Допис у черзі"
         reviewable_user:
           title: "Користувач"
+        reviewable_post:
+          title: "Допис"
       approval:
         title: "Допис потребує схвалення"
         description: "Ми отримали ваш новий допис, але він потребує схвалення модератором, перш ніж з'явиться. Будь ласка, будьте терплячі."
@@ -584,6 +589,50 @@ uk:
           other: "У вас <strong>%{count}</strong> дописів очікують схвалення."
         ok: "Гаразд"
       example_username: "ім’я користувача"
+      reject_reason:
+        title: "Чому ви збираєтеся відключити користувача?"
+        send_email: "Надіслати лист відмови"
+    relative_time_picker:
+      minutes:
+        one: "хвилини"
+        few: "хвилин"
+        many: "хвилин"
+        other: "хвилин"
+      hours:
+        one: "година"
+        few: "години"
+        many: "годин"
+        other: "годин"
+      days:
+        one: "день"
+        few: "дні"
+        many: "днів"
+        other: "днів"
+      months:
+        one: "місяць"
+        few: "місяці"
+        many: "місяців"
+        other: "місяців"
+      years:
+        one: "рік"
+        few: "роки"
+        many: "років"
+        other: "років"
+      relative: "Відносна"
+    time_shortcut:
+      later_today: "Пізніше сьогодні"
+      next_business_day: "Наступний робочий день"
+      tomorrow: "Завтра"
+      next_week: "На наступному тижні"
+      post_local_date: "Дата повідомлення"
+      later_this_week: "Пізніше на цьому тижні"
+      start_of_next_business_week: "Понеділок"
+      start_of_next_business_week_alt: "Наступного понеділка"
+      next_month: "В наступному місяці"
+      custom: "Вибрати дату та час"
+      relative: "Через вказаний час"
+      none: "Нічого не потрібно"
+      last_custom: "Використовувати раніше встановлені дату та час"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a> створив(ла) <a href='%{topicUrl}'>тему</a>"
       you_posted_topic: "<a href='%{userUrl}'>Ви</a> створили <a href='%{topicUrl}'>тему</a>"
@@ -672,6 +721,10 @@ uk:
             imap_ssl: "Використовувати SSL для IMAP"
             username: "Ім'я користувача"
             password: "Пароль"
+          settings:
+            title: "Налаштування"
+            allow_unknown_sender_topic_replies: "Дозволити у темі відповіді невідомого відправника."
+            allow_unknown_sender_topic_replies_hint: "Дозволяє невідомим відправникам відповідати на теми групи. Якщо це не ввімкнено, відповіді з електронних адрес, які ще не включені в групу, або не запрошені до теми, створять нову тему."
           mailboxes:
             synchronized: "Синхронізована поштова скринька"
             none_found: "Не знайдено поштових скриньок в цьому обліковому записі."
@@ -775,7 +828,22 @@ uk:
         make_owner_description: "Зробити <b>%{username}</b> власником цієї групи"
         remove_owner: "Вилучити як власника"
         remove_owner_description: "Вилучити <b>%{username}</b> з власників цієї групи"
+        make_primary: "Зробити основною"
+        make_primary_description: "Зробити основною групою для <b>%{username}</b>"
+        remove_primary: "Видалити як основну"
+        remove_primary_description: "Видалити як основну групу для <b>%{username}</b>"
+        remove_members: "Видалити учасників"
+        remove_members_description: "Вилучити вибраних користувачів з цієї групи"
+        make_owners: "Зробити власником"
+        make_owners_description: "Зробити вибраних користувачів власниками цієї групи"
+        remove_owners: "Вилучити власників"
+        remove_owners_description: "Вилучити вибраних користувачів як власників цієї групи"
+        make_all_primary: "Зробити основною для усіх"
+        make_all_primary_description: "Зробити основною групою для всіх вибраних користувачів"
+        remove_all_primary: "Видалити як основну"
+        remove_all_primary_description: "Видалити цю групу як основну"
         owner: "Власник"
+        primary: "Основна"
         forbidden: "Ви не можете переглядати учасників."
       topics: "Теми"
       posts: "Дописи"
@@ -847,7 +915,6 @@ uk:
       posts: "Повідомлення"
       topics: "Теми"
       latest: "Останні"
-      latest_by: "Останні від"
       toggle_ordering: "показати/сховати елемент керування для впорядкування"
       subcategories: "Підкатегорії"
       muted: "Приглушені категорії"
@@ -856,6 +923,19 @@ uk:
         few: "%{count} теми"
         many: "%{count} тем"
         other: "%{count} теми"
+      topic_stat:
+        one: "%{number} / %{unit}"
+        few: "%{number} / %{unit}"
+        many: "%{number} / %{unit}"
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "тиждень"
+        month: "місяць"
+      topic_stat_all_time:
+        one: "Усього %{number}"
+        few: "Усього %{number}"
+        many: "Усього %{number}"
+        other: "Усього %{number}"
       topic_stat_sentence_week:
         one: "%{count} нова тема за минулий тиждень."
         few: "%{count} нові теми за минулий тиждень."
@@ -920,7 +1000,23 @@ uk:
         mute_option_title: "Ви не отримуватимете жодних сповіщень, пов'язаних з цим користувачем."
         normal_option: "Нормальний"
         normal_option_title: "Ви отримаєте сповіщення, коли цей користувач відповість вам, цитуватиме або згадуватиме вас."
+      notification_schedule:
+        title: "Розклад сповіщень"
+        label: "Увімкнути користувацький розклад сповіщень"
+        tip: "За межами цих годин ви будете автоматично у режимі «не турбувати»."
+        midnight: "Опівночі"
+        none: "Немає"
+        monday: "Понеділок"
+        tuesday: "Вівторок"
+        wednesday: "Середа"
+        thursday: "Четвер"
+        friday: "П’ятниця"
+        saturday: "Субота"
+        sunday: "Неділя"
+        to: "до"
       activity_stream: "Активність"
+      read: "Прочитані"
+      read_help: "Нещодавно прочитані теми"
       preferences: "Налаштування"
       feature_topic_on_profile:
         open_search: "Виберіть нову тему"
@@ -949,11 +1045,15 @@ uk:
         perm_denied_expl: "Ви заборонили сповіщення. Дозвольте сповіщення у налаштуваннях свого браузера."
         disable: "Вимкнути сповіщення"
         enable: "Увімкнути сповіщення"
-        each_browser_note: "Зверніть увагу: Вам треба змінити це налаштування у кожному браузері, який ви використовуєте."
+        each_browser_note: 'Примітка: Ви повинні змінити цей параметр на кожному використаному браузері. Всі сповіщення будуть вимкнені, коли вибрано "не турбувати", незалежно від цього налаштування.'
         consent_prompt: "Чи хочете отримувати сповіщення наживо, коли люди відповідають на ваші дописи?"
       dismiss: "Відкинути"
       dismiss_notifications: "Відкинути все"
       dismiss_notifications_tooltip: "Позначити всі сповіщення як прочитані"
+      no_messages_title: "У вас немає повідомлень"
+      no_messages_body: >
+        Потрібна особиста розмова з кимось, поза звичайним спілкуванням? Надішліть їм повідомлення, вибравши їх аватар і натиснувши кнопку повідомлення %{icon}<br><br> Якщо вам потрібна допомога, ви можете <a href='%{aboutUrl}'>надіслати повідомлення співробітнику</a>.
+      no_bookmarks_title: "Ви ще нічого не додали до закладок"
       first_notification: "Ваше перше сповіщення! Оберіть його, щоб почати."
       dynamic_favicon: "Показувати кількість на іконці браузера"
       skip_new_user_tips:
@@ -964,7 +1064,7 @@ uk:
       color_scheme_default_on_all_devices: "Встановити типові схеми кольорів на всіх моїх пристроях"
       color_scheme: "Схема кольорів"
       color_schemes:
-        default_description: "За замовчуванням"
+        default_description: "Тема за замовчуванням"
         disable_dark_scheme: "Те саме, що і звичайне"
         dark_instructions: "Ви можете переглянути кольорову схему темного режиму, увімкнувши темний режим на вашому пристрої."
         undo: "Скинути"
@@ -1068,6 +1168,7 @@ uk:
         tags: "Теги"
       preferences_nav:
         account: "Обліковий запис"
+        security: "Безпека"
         profile: "Профіль"
         emails: "Листи"
         notifications: "Сповіщення"
@@ -1205,7 +1306,7 @@ uk:
         set_primary: "Вказати основну адресу ел. пошти"
         destroy: "Вилучити адресу електронної пошти"
         add_email: "Додати альтернативну електронну пошту"
-        sso_override_instructions: "Електронну пошту можна оновити через SSO-провайдера."
+        auth_override_instructions: "Електронну пошту можна оновити постачальником аутентифікації."
         no_secondary: "Немає другорядних електронних скриньок"
         instructions: "Ніколи не показується публічно."
         admin_note: "Примітка: якщо адміністратор змінює електронну адресу іншого користувача, який не є адміністратором, це означає, що користувач втратив доступ до свого початкового облікового запису електронної пошти, тому електронний лист для скидання пароля буде надіслано на його нову адресу. Електронна адреса користувача не зміниться, доки він не завершить процес скидання пароля."
@@ -1213,6 +1314,7 @@ uk:
         required: "Будь ласка, введіть адресу електронної пошти"
         invalid: "Будь ласка, введіть вірний email"
         authenticated: "Вашу адресу електронної пошти підтверджено %{provider}"
+        invite_auth_email_invalid: "Електронна пошта для запрошення не відповідає тій, яку автентифіковано через %{provider}"
         frequency_immediately: "Отримувати повідомлення про нові непрочитані повідомлення негайно."
         frequency:
           one: "Ми відправимо вам лист тільки в тому випадку, якщо ви більше %{count} хвилини перебуваєте оффлайн."
@@ -1248,6 +1350,7 @@ uk:
         checking: "Перевірка доступності імені користувача..."
         prefilled: "Адреса електронної пошти збігається із зареєстрованим псевдонімом"
         required: "Будь ласка, введіть ім'я користувача"
+        edit: "Редагувати ім'я користувача"
       locale:
         title: "Мова інтерфейсу"
         instructions: "Мова сайту. Необхідно перезавантажити сторінку, щоб зміни вступили в силу."
@@ -1344,10 +1447,27 @@ uk:
         after_10_minutes: "після 10 хвилин"
       notification_level_when_replying: "Коли я пишу в темі, встановити цю тему для"
       invited:
-        search: "шукати запрошення..."
         title: "Запрошення"
+        pending_tab: "Очікують"
+        pending_tab_with_count: "Очікують (%{count})"
+        expired_tab: "Термін дії закінчився"
+        expired_tab_with_count: "Термін дії минув (%{count})"
+        redeemed_tab: "Прийнято"
+        redeemed_tab_with_count: "Прийняті (%{count})"
+        invited_via: "Запрошення"
+        invited_via_link: "Посилання %{key} (прийнято %{count} з %{max})"
+        groups: "Групи"
+        topic: "Тема"
+        sent: "Створено/Востаннє надіслано"
+        expires_at: "Закінчується"
+        edit: "Редагувати"
+        remove: "Вилучити"
+        copy_link: "Отримати посилання"
+        reinvite: "Повторно надіслати лист"
+        reinvited: "Запрошення надіслано повторно"
+        removed: "Вилучені"
+        search: "шукати запрошення..."
         user: "Запрошений користувач"
-        sent: "Останній відправлений"
         none: "Немає запрошень для відображення."
         truncated:
           one: "перше запрошення"
@@ -1355,37 +1475,21 @@ uk:
           many: "Перші %{count} запрошень"
           other: "Перші %{count} запрошень"
         redeemed: "Прийняті запрошення"
-        redeemed_tab: "Прийнято"
-        redeemed_tab_with_count: "Прийняті (%{count})"
         redeemed_at: "Прийнято"
         pending: "Запрошення, що очікують"
-        pending_tab: "Очікують"
-        pending_tab_with_count: "Очікують (%{count})"
         topics_entered: "Тем переглянуто"
         posts_read_count: "Прочитано дописів"
         expired: "Термін дії цього запрошення сплив."
-        rescind: "Видалити"
-        rescinded: "Запрошення видалено"
-        rescind_all: "Видалити прострочені запрошення"
-        rescinded_all: "Всі прострочені запрошення видалені!"
-        rescind_all_confirm: "Ви впевнені, що хочете видалити всі прострочені запрошення?"
-        reinvite: "повторити запрошення"
-        reinvite_all: "Повторити всі запрошення"
+        remove_all: "Видаліть запрошення, термін дії яких минув"
+        removed_all: "Всі прострочені запрошення видалені!"
+        remove_all_confirm: "Ви впевнені, що хочете видалити всі прострочені запрошення?"
+        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_redemption_stats: "Прийняті запрошення"
-        link_groups: Групи
-        link_expires_at: Закінчується
-        copy_link: "Показати посилання"
+        create: "Запрошення"
         generate_link: "Створити посилання для запрошення"
         link_generated: "Ось ваше посилання для запрошення!"
         valid_for: "Запрошувальне посилання дійсне тільки для цієї адреси електропошти:%{email}"
@@ -1397,11 +1501,35 @@ uk:
           error: "Помилка під час генерації посилання для запрошення"
           max_redemptions_allowed_label: "Скільки людей можуть зареєструватися за допомогою цього посилання?"
           expires_at: "Коли мине це посилання для запрошення?"
+        invite:
+          new_title: "Створити запрошення"
+          edit_title: "Редагувати запрошення"
+          instructions: "Поділіться цим посиланням для миттєвого надання доступу до цього сайту:"
+          copy_link: "копіювати посилання"
+          expires_in_time: "Завершується через %{time}."
+          expired_at_time: "Термін дії минув %{time}."
+          show_advanced: "Показати додаткові параметри"
+          hide_advanced: "Сховати додаткові параметри"
+          max_redemptions_allowed: "Максимальна кількість використань:"
+          add_to_groups: "Додати до груп:"
+          invite_to_topic: "Направляти до теми під час першого входу:"
+          expires_at: "Завершується після:"
+          custom_message: "Необов’язкове особисте повідомлення:"
+          send_invite_email: "Зберегти та надіслати Email"
+          save_invite: "Зберегти запрошення"
+          invite_saved: "Запрошення збережено."
+          invite_copied: "Посилання на запрошення скопійовано."
+          blank_email: "Посилання не скопійовано. Необхідна адреса електронної пошти."
         bulk_invite:
+          none: "Немає запрошень для відображення на цій сторінці."
           text: "Масове запрошення"
+          instructions: |
+            <p>Запросіть якомога більше користувачів, щоб ваша спільнота швидко розвивалась. Підготуйте <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">файл CSV</a> що містить електронні адреси користувачів по одному в рядку, яких ви хочете запросити. Наступні дані, відокремлені комами, можна використати, якщо ви хочете додати людей до груп або надіслати їх до певної теми під час першого входу.</p>
+            <pre>john@smith.com, first_group_name; second_group_name, topic_id</pre>
+            <p>На кожну електронну адресу у завантаженому файлі CSV буде надіслано запрошення, і ви зможете ним керувати пізніше.</p>
+          progress: "Завантажено %{progress}%..."
           success: "Файл успішно завантажений, ви отримаєте повідомлення, коли процес буде завершений."
           error: "Вибачте, але файл повинен бути у форматі CSV."
-          confirmation_message: "Ви збираєтеся відправити запрошення електронною поштою всім в завантаженому файлі."
       password:
         title: "Пароль"
         too_short: "Ваш пароль надто короткий."
@@ -1481,6 +1609,8 @@ uk:
       avatar:
         title: "Аватар"
         header_title: "профіль, повідомлення, закладки та налаштування"
+        name_and_description: "%{name} - %{description}"
+        edit: "Редагувати зображення профілю"
       title:
         title: "Назва"
         none: "(немає)"
@@ -1518,7 +1648,7 @@ uk:
       close: "сховати"
       dismiss_error: "Помилка видалення"
     close: "Закрити"
-    assets_changed_confirm: "Сайт тільки що був оновлений. Перезавантажити сторінку для переходу до нової версії?"
+    assets_changed_confirm: "Для цього сайту існує оновлення програмного забезпечення. Отримати останню версію зараз?"
     logout: "Ви вийшли."
     refresh: "Оновити"
     home: "Головна"
@@ -1538,15 +1668,6 @@ uk:
       exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} few {# errors/hour} many {# errors/hour} other {# errors/hour}}</a> досягнуто обмеження налаштувань сайту {limit, plural, one {# error/hour} few {# errors/hour} many {# errors/hour} other {# errors/hour}}."
       exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} few {# errors/minute} many {# errors/minute} other {# errors/minute}}</a> досягнуто обмеження налаштувань сайту {limit, plural, one {# error/minute} few {# errors/minute} many {# errors/minute} other {# errors/minute}}."
     learn_more: "дізнатися більше..."
-    all_time: "всього"
-    all_time_desc: "всього створено тем"
-    year: "рік"
-    year_desc: "теми, що були створені у останні 365 днів"
-    month: "місяць"
-    month_desc: "теми, що були створені у останні 30 днів"
-    week: "тиждень"
-    week_desc: "теми, що були створені у останні 7 днів"
-    day: "день"
     first_post: Перший допис
     mute: Mute
     unmute: Unmute
@@ -1566,13 +1687,16 @@ uk:
       sign_up: "Зареєструватись"
       hide_session: "Нагадати мені завтра"
       hide_forever: "ні дякую"
-      hidden_for_session: "Добре, нагадаю завтра. До речі, зареєструватися можна також та за допомогою кнопки \"Увійти\"."
       intro: "Вітаємо! Схоже, вам подобається обговорення, але ви ще не зареєстрували акаунт."
       value_prop: "Коли ви створюєте обліковий запис, ми точно пам’ятаємо, що ви прочитали, тому ви завжди повертаєтеся туди, де зупинилися. Ви також отримуєте повідомлення, тут та електронною поштою, коли хтось відповідає вам. І ви можете, в повідомленнях, поставити - мені подобається. :heartpulse:"
     summary:
       enabled_description: "Ви переглядаєте витяг з теми - тільки найцікавіші повідомлення на думку спільноти."
-      description: "Є <b>%{replyCount}</b> відповідей."
-      description_time: "<b>%{replyCount}</b> відповідей з передбачуваним часом прочитання близько <b>%{readingTime} хвилин</b>."
+      description:
+        one: "Існує <b>%{count}</b> відповідь."
+        few: "Існує <b>%{count}</b> відповіді."
+        many: "Існує <b>%{count}</b> відповідей."
+        other: "Існує <b>%{count}</b> відповідей."
+      description_time_MF: "Існує {replyCount, plural, one {відповідь <b>#</b> } few {є <b>#</b> відповіді} many {є <b>#</b> відповідей} other {є <b>#</b> відповідей}} з розрахунковим часом читання <b>{readingTime, plural, one {# хвилина} few {# хвилини} many {# хвилин} other {# хвилин}}</b>."
       enable: "Підсумки цієї теми"
       disable: "Показати всі дописи"
     deleted_filter:
@@ -1597,8 +1721,10 @@ uk:
     trust_level: "Рівень довіри"
     search_hint: "ім'я користувача, email або IP-адреса"
     create_account:
+      header_title: "Ласкаво просимо!"
+      subheader_title: "Створимо ваш обліковий запис"
       disclaimer: "Реєструючись, ви погоджуєтеся з <a href='%{privacy_link}' target='blank'>політикою конфіденційності</a> та <a href='%{tos_link}' target='blank'>умовами надання послуг</a>."
-      title: "Створити Новий Обліковий Запис"
+      title: "Створити обліковий запис"
       failed: "Щось пішло не так; скоріше за все, цю електронну пошту вже зареєстровано, спробуйте посилання Забув пароль"
     forgot_password:
       title: "Скидання пароля"
@@ -1617,6 +1743,7 @@ uk:
     email_login:
       link_label: "Надішліть мені посилання для входу "
       button_label: "E-mail"
+      login_link: "Пропустіть пароль; надішліть мені посилання для входу"
       emoji: "блокування смайлів"
       complete_username: "Якщо обліковий запис збігається з ім’ям користувача <b>%{username}</b>, ви повинні отримати електронного листа з посиланням для входу в систему найближчим часом."
       complete_email: "Якщо дані облікового запису збігаються з <b>%{email}</b>, ви повинні отримати електронного листа з посиланням для входу в систему найближчим часом."
@@ -1628,6 +1755,8 @@ uk:
       logging_in_as: Ввійти як %{email}
       confirm_button: Завершити Вхід
     login:
+      header_title: "З поверненням"
+      subheader_title: "Увійти до облікового запису"
       title: "Увійти"
       username: "Користувач"
       password: "Пароль"
@@ -1643,7 +1772,7 @@ uk:
       security_key_not_allowed_error: "Час перевірки автентичності ключа безпеки минув або було скасовано."
       security_key_no_matching_credential_error: "У зазначеному ключі безпеки не знайдено відповідних облікових даних."
       security_key_support_missing_error: "Ваше поточне пристрій або браузер не підтримує використання ключів безпеки. Будь ласка, використовуйте інший метод."
-      email_placeholder: "електронна скринька або ім'я користувача"
+      email_placeholder: "Email / Ім’я користувача"
       caps_lock_warning: "Caps Lock увімкнено"
       error: "Невідома помилка"
       cookies_error: "Схоже, що в вашому браузері вимкнені куки. Це завадить входу на сайт під своїм обліковим записом."
@@ -1710,7 +1839,6 @@ uk:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (ранее EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1734,7 +1862,19 @@ uk:
         few: "%{count} теми в цій категорії"
         many: "%{count} тем в цій категорії"
         other: "%{count} теми в цій категорії"
+      plus_subcategories_title:
+        one: "%{name} та одна підкатегорія"
+        few: "%{name} і %{count} підкатегорій"
+        many: "%{name} і %{count} підкатегорій"
+        other: "%{name} і %{count} підкатегорій"
+      plus_subcategories:
+        one: "+ %{count} підкатегорія"
+        few: "+ %{count} підкатегорії"
+        many: "+ %{count} підкатегорій"
+        other: "+ %{count} підкатегорій"
     select_kit:
+      filter_by: "Фільтрувати за: %{name}"
+      select_to_filter: "Оберіть значення для фільтрації"
       default_header_text: Вибрати...
       no_content: Збігів, не знайдено
       filter_placeholder: Пошук...
@@ -1761,8 +1901,6 @@ uk:
     date_time_picker:
       from: Від
       to: До
-      errors:
-        to_before_from: "На сьогоднішній день має бути пізніше, ніж з дати."
     emoji_picker:
       filter_placeholder: Шукати emoji
       smileys_&_emotion: Смайли та емоції
@@ -1784,7 +1922,7 @@ uk:
       default: Призначені для користувача смайли
     shared_drafts:
       title: "загальні Чернетки"
-      notice: "Ці теми видно тільки тим, хто може бачити <b>%{category}</b> категорію."
+      notice: "Цю тему бачать лише ті, хто може публікувати спільні чернетки."
       destination_category: "Категорія Призначення"
       publish: "Публікація Спільної чернетки"
       confirm_publish: "Ви впевнені, що хочете опублікувати цю чернетку?"
@@ -1795,7 +1933,6 @@ uk:
       options: "Налаштування"
       whisper: "Внутрішнє повідомлення"
       unlist: "Виключена зі списків тем"
-      blockquote_text: "Цитата"
       add_warning: "Це офіційне попередження."
       toggle_whisper: "Внутрішнє повідомлення"
       toggle_unlisted: "Сховати зі списків тем"
@@ -1821,10 +1958,22 @@ uk:
       reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Заголовок є необхідним"
-        title_too_short: "Заголовок має бути мінімум %{min} символів"
-        title_too_long: "Заголовок не може бути менше, ніж %{max} символів"
+        title_too_short:
+          one: "Заголовок повинен мати принаймні %{count} символ"
+          few: "Заголовок повинен мати принаймні %{count} символи"
+          many: "Заголовок має бути не менше %{count} символів"
+          other: "Заголовок має бути не менше %{count} символів"
+        title_too_long:
+          one: "Заголовок не може бути більше %{count} символ"
+          few: "Заголовок не може бути більше %{count} символи"
+          many: "Заголовок не може бути більше %{count} символів"
+          other: "Заголовок не може бути більше %{count} символів"
         post_missing: "Повідомлення не може бути порожнім"
-        post_length: "Найменший розмір допису має бути %{min} символів"
+        post_length:
+          one: "Повідомлення має бути не менше %{count} символ"
+          few: "Повідомлення має бути не менше %{count} символів"
+          many: "Повідомлення має бути не менше %{count} символів"
+          other: "Повідомлення має бути не менше %{count} символів"
         try_like: "Ви пробували натиснути на %{heart} кнопку?"
         category_missing: "Ви повинні обрати категорію"
         tags_missing:
@@ -1859,8 +2008,8 @@ uk:
       saved: "Збережено!"
       saved_draft: "Розмістити чернетку в процесі роботи. Натисніть, щоб продовжити."
       uploading: "Завантаження..."
-      show_preview: "попередній перегляд &raquo;"
-      hide_preview: "&laquo; сховати попередній перегляд"
+      show_preview: "показати попередній перегляд"
+      hide_preview: "приховати попередній перегляд"
       quote_post_title: "Процитувати весь допис повністю"
       bold_label: "Ж"
       bold_title: "Сильне виділення"
@@ -1873,8 +2022,8 @@ uk:
       link_dialog_title: "Вставити гіперпосилання"
       link_optional_text: "необов'язкова назва"
       link_url_placeholder: "Вставте URL або введіть для пошуку теми"
-      quote_title: "Цитата"
-      quote_text: "Цитата"
+      blockquote_title: "Цитата"
+      blockquote_text: "Цитата"
       code_title: "Попередньо форматований текст"
       code_text: "Впишіть сюди текст; також, відключити форматування тексту можна, почавши рядок з 4х прогалин"
       paste_code_text: "Надрукуйте або вставте сюди код"
@@ -1898,8 +2047,6 @@ uk:
       yourself_confirm:
         title: "Забули вказати одержувачів?"
         body: "У списку одержувачів зараз тільки ви самі!"
-      slow_mode:
-        error: "Ця тема знаходиться у повільному режимі. Для того, щоб сприяти виваженому та вдумливому обговоренню, ви можете писати лише один раз на %{duration}."
       admin_options_title: "Необов’язкові налаштування персоналу для цієї теми"
       composer_actions:
         reply: Відповісти
@@ -1928,7 +2075,7 @@ uk:
           label: "Нова тема"
         shared_draft:
           label: "Загальний Проект"
-          desc: "Проект теми, яку буде видно тільки співробітникам"
+          desc: "Створити тему, яка буде видима лише обраним користувачам"
         toggle_topic_bump:
           label: "Не піднімати тему"
           desc: "Відповісти без зміни дати останньої відповіді"
@@ -2042,14 +2189,15 @@ uk:
       from_my_computer: "З мого пристрою"
       from_the_web: "З інтернету"
       remote_tip: "посилання на зображення"
-      remote_tip_with_attachments: "посилання на зображення або файл %{authorized_extensions}"
+      remote_tip_with_attachments: "посилання на зображення або файл"
       local_tip: "вибрати зображення з вашого пристрою"
-      local_tip_with_attachments: "вибрати зображення або файли з вашого пристрою %{authorized_extensions}"
-      hint: "(Ви також можете перетягувати зображення в редактор, щоб їх завантажити)"
+      local_tip_with_attachments: "виберіть зображення або файли зі свого пристрою"
+      hint: "(Ви також можете перетягнути об’єкт у редактор, щоб завантажити)"
       hint_for_supported_browsers: "ви так само можете перетягнути або скопіювати зображення в редактор"
       uploading: "Завантаження"
       select_file: "Обрати файл"
       default_image_alt_text: зображення
+      supported_formats: "підтримувані формати"
     search:
       sort_by: "Сортувати за"
       relevance: "За змістом"
@@ -2077,6 +2225,7 @@ uk:
       or_search_google: "Або спробуйте пошукати в Google:"
       search_google: "Спробуйте пошукати в Google:"
       search_google_button: "Google"
+      search_button: "Пошук"
       context:
         user: "Шукати повідомлення від @%{username}"
         category: "Шукати в розділі #%{category}"
@@ -2142,7 +2291,7 @@ uk:
     go_back: "повернутися назад"
     not_logged_in_user: "сторінка користувача з підсумком поточної діяльності та налаштуваннями"
     current_user: "перейти до Вашої сторінки користувача"
-    view_all: "подивитись все"
+    view_all: "Переглянути всі %{tab}"
     topics:
       new_messages_marker: "останнє відвідування"
       bulk:
@@ -2163,7 +2312,9 @@ uk:
         change_category: "Задати розділ"
         close_topics: "Закрити теми"
         archive_topics: "Архівувати теми"
+        move_messages_to_inbox: "Перемістити у Вхідні"
         notification_level: "Сповіщення"
+        change_notification_level: "Змінити рівень сповіщень"
         choose_new_category: "Виберіть новий розділ для цих тем:"
         selected:
           one: "Ви вибрали <b>%{count}</b> тему."
@@ -2175,7 +2326,12 @@ uk:
         choose_new_tags: "Виберіть нові мітки для цих тем:"
         choose_append_tags: "Виберіть нові мітки, щоб додати що цих тем:"
         changed_tags: "Мітки цих тем було змінено."
-        remove_tags: "Видалити теги"
+        remove_tags: "Видалити всі теги"
+        confirm_remove_tags:
+          one: "Усі теги будуть видалені з цієї теми. Ви впевнені?"
+          few: "Усі теґи будуть видалені з <b>%{count}</b> тем. Ви впевнені?"
+          many: "Усі теґи будуть видалені з <b>%{count}</b> тем. Ви впевнені?"
+          other: "Усі теґи буде видалено з <b>%{count}</b> тем. Ви впевнені?"
         progress:
           one: "Прогрес: <strong>%{count}</strong> тема"
           few: "Прогрес: <strong>%{count}</strong> теми"
@@ -2193,7 +2349,7 @@ uk:
         top: "There are no top topics."
         educate:
           new: '<p>Ваші нові теми з’являтимуться тут. За замовчуванням теми вважаються новими і відображатимуть індикатор <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span>, якщо її створено за останні 2 дні.</p><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>'
+          unread: "<p>Ваші непрочитані теми скоро з’являться тут.</p><p>За замовчуванням теми отримують лічильник <span class=\"badge new-posts badge-notification\">1</span>, якщо:</p><ul><li>Створена тема</li><li>Відповіли в темі</li><li>Тема прочитана впродовж більш як 4 хвилин</li></ul><p>Можна задати власні налаштування відстеження, натиснувши \U0001F514 в цільовій темі.</p><p>За потреби зміни стандартних налаштувань перейдіть у <a href=\"%{userPrefsUrl}\">налаштування</a> профілю користувача.</p>"
       bottom:
         latest: "Більше немає останніх тем."
         posted: "Створених тем більше немає."
@@ -2298,19 +2454,25 @@ uk:
         select: "Користувачі можуть дописувати в цій темі лише один раз на:"
         description: "Щоб сприяти продуманому обговоренню в активних або суперечливих дискусіях, користувачі повинні почекати, перш ніж знову публікувати дописи в цю тему."
         save: "Увімкнути"
+        enabled_until: "Увімкнено до:"
         remove: "Вимкнути"
         hours: "Годин:"
         minutes: "Хвилин:"
         seconds: "Секунд:"
         durations:
+          10_minutes: "10 хвилин"
           15_minutes: "15 хвилин"
+          30_minutes: "30 хвилин"
+          45_minutes: "45 хвилин"
           1_hour: "1 Година"
+          2_hours: "2 години"
           4_hours: "4 години"
-          1_day: "1 день"
-          1_week: "1 тиждень"
+          8_hours: "8 годин"
+          12_hours: "12 годин"
+          24_hours: "24 години"
           custom: "Користувацька тривалість"
       slow_mode_notice:
-        duration: "Вам необхідно зачекати %{duration} між повідомленнями у цій темі"
+        duration: "Будь ласка, зачекайте %{duration} між дописами в цій темі"
       topic_status_update:
         title: "Таймер Теми"
         save: "Встановити Таймер"
@@ -2319,7 +2481,9 @@ uk:
         remove: "Видалити Таймер"
         publish_to: "Публікувати в:"
         when: "Коли:"
-        time_frame_required: Будь ласка, виберіть період часу
+        time_frame_required: "Будь ласка, виберіть період часу"
+        min_duration: "Тривалість повинна бути більше 0"
+        max_duration: "Тривалість повинна бути менше 20 років"
       auto_update_input:
         none: "Вибір таймфрейма"
         now: "Зараз"
@@ -2348,9 +2512,11 @@ uk:
         title: "Закрити на час"
       auto_close:
         title: "Автоматичне закриття теми"
-        label: "Закрити тему через:"
+        label: "Автоматично закривати тему через:"
         error: "Будь ласка, введіть коректне значення."
         based_on_last_post: "Не закривайте, поки останній пост в темі не стане занадто старим."
+      auto_close_after_last_post:
+        title: "Автоматичне закриття теми після останнього повідомлення"
       auto_delete:
         title: "Автоматичне видалення теми"
       auto_bump:
@@ -2363,7 +2529,7 @@ uk:
         auto_open: "Ця тема автоматично відкриється через %{timeLeft}."
         auto_close: "Ця тема автоматично закриється %{timeLeft}."
         auto_publish_to_category: "Ця тема буде опублікована в розділі <a href=%{categoryUrl}>#%{categoryName}</a> через %{timeLeft}."
-        auto_close_based_on_last_post: "Ця тема буде закрита через %{duration} після останньої відповіді."
+        auto_close_after_last_post: "Ця тема буде закрита через %{duration} після останньої відповіді."
         auto_delete: "Ця тема буде автоматично видалена через %{timeLeft}."
         auto_bump: "Ця тема буде автоматично піднята %{timeLeft}."
         auto_reminder: "Вам прийде нагадування про цю тему через %{timeLeft}."
@@ -2374,6 +2540,11 @@ uk:
         few: "Останнє повідомлення в цій темі відправлено %{count} години назад, а тому дана тема буде закрита негайно."
         many: "Останнє повідомлення в цій темі відправлено %{count} годин тому, а тому дана тема буде закрита негайно."
         other: "Останнє повідомлення в цій темі відправлено %{count} годин тому, а тому дана тема буде закрита негайно."
+      auto_close_momentarily:
+        one: "Останнє повідомлення в цій темі відправлено %{count} годину тому, а тому дана тема буде закрита негайно."
+        few: "Останнє повідомлення в цій темі відправлено %{count} години назад, а тому дана тема буде закрита негайно."
+        many: "Останнє повідомлення в цій темі відправлено %{count} годин тому, а тому дана тема буде закрита негайно."
+        other: "Останнє повідомлення в цій темі відправлено %{count} годин тому, а тому дана тема буде закрита негайно."
       timeline:
         back: "Назад"
         back_description: "Переглянути останнє непрочитане повідомлення"
@@ -2385,7 +2556,11 @@ uk:
         go: "=>"
         jump_bottom: "перейти до останнього допису"
         jump_prompt: "перейти до..."
-        jump_prompt_of: "з %{count} повідомлень"
+        jump_prompt_of:
+          one: "з %{count} повідомлення"
+          few: "з %{count} повідомлень"
+          many: "з %{count} повідомлень"
+          other: "з %{count} повідомлень"
         jump_prompt_long: "Перейти до..."
         jump_bottom_with_number: "перейти до допису %{post_number}"
         jump_prompt_to_date: "дата"
@@ -2470,6 +2645,17 @@ uk:
         title: "Поширити"
         extended_title: "Поділитися посиланням"
         help: "Поширити посилання на цю тему"
+        instructions: "Поширити посилання на цю тему:"
+        copied: "Посилання на тему скопійовано."
+        notify_users:
+          title: "Повідомляти"
+          instructions: "Повідомте таких користувачів про цю тему:"
+          success:
+            one: "Успішно повідомлено %{username} про цю тему."
+            few: "Успішно повідомлено %{username} про цю тему."
+            many: "Успішно повідомлено %{username} про цю тему."
+            other: "Успішно повідомлено всіх користувачів про цю тему."
+        invite_users: "Запрошення"
       print:
         title: "Друк"
         help: "Відкрити версію для друку"
@@ -2531,14 +2717,14 @@ uk:
         username_placeholder: "ім'я користувача"
         action: "Надіслати запрошення"
         help: "запросити інших в цю тему за допомогою email або повідомлень"
-        to_forum: "Буде відправлено короткого листа, яке дозволить вашому другу приєднатися просто клікнувши на посилання без необхідності входу на сайт."
-        sso_enabled: "Введіть псевдонім користувача, якого ви хочете запросити в цю тему."
+        to_forum: "Ми надішлемо короткий лист, який дозволить вашому другові негайно приєднатися, просто натиснувши посилання."
+        discourse_connect_enabled: "Введіть ім'я користувача, якого ви хотіли б запросити до цієї теми."
         to_topic_blank: "Введіть псевдонім або email користувача, якого ви хочете запросити в цю тему."
         to_topic_email: "Ви вказали адресу електронної пошти. Ми відправимо запрошення, яке дозволить вашому другу негайно відповісти в цій темі."
         to_topic_username: "Ви вказали псевдонім користувача. Ми відправимо йому повідомлення з посиланням, щоб запросити його в цю тему."
         to_username: "Введіть псевдонім користувача, якого ви хочете запросити в цю тему. Ми відправимо йому повідомлення про те що ви запрошуєте його приєднатися до цієї теми."
         email_placeholder: "електронна скринька"
-        success_email: "Запрошення відправлено за адресою <b>%{emailOrUsername}</b>. Ми повідомимо Вас, коли цим запрошенням скористаються. Перевірте вкладку Запрошення на вашій сторінці користувача, щоб дізнатися про стан всіх ваших запрошень."
+        success_email: "Запрошення відправлено за адресою <b>%{invitee}</b>. Ми повідомимо Вас, коли цим запрошенням скористаються. Перевірте вкладку Запрошення на вашій сторінці користувача, щоб дізнатися про стан всіх ваших запрошень."
         success_username: "Ми запросили цього користувача взяти участь в темі."
         error: "На жаль, ми не змогли запросити цю людину. Можливо, він уже був запрошений? (Запрошення обмежені рейтингом)"
         success_existing_email: "Користувач з електронною поштою <b>%{emailOrUsername}</b> вже існує. Ми запросили цього користувача взяти участь в цій темі."
@@ -2670,8 +2856,8 @@ uk:
       edit_reason: "Причина: "
       post_number: "допис %{number}"
       ignored: "проігнороване зміст"
-      wiki_last_edited_on: "вики редагував"
-      last_edited_on: "допис востаннє редаговано"
+      wiki_last_edited_on: "останнє редагування wiki %{dateTime}"
+      last_edited_on: "останнє редагування повідомлення %{dateTime}"
       reply_as_new_topic: "Відповісти в новій пов’язаної темі"
       reply_as_new_private_message: "Відповісти новим повідомленням тем же адресатам"
       continue_discussion: "В продовження дискусії %{postLink}:"
@@ -2700,6 +2886,7 @@ uk:
         few: "%{count} відповіді"
         many: "%{count} відповідей"
         other: "%{count} відповідей"
+      has_replies_count: "%{count}"
       unknown_user: "(невідомий/видалений користувач)"
       has_likes_title:
         one: "Це повідомлення сподобалося %{count} людині"
@@ -2712,6 +2899,18 @@ uk:
         few: "Вам та ще %{count} людям сподобалося це повідомлення"
         many: "Вам та ще %{count} людям сподобалося це повідомлення"
         other: "Вам та ще %{count} людям сподобалося це повідомлення"
+      filtered_replies_hint:
+        one: "Переглянути цей допис і його відповідь"
+        few: "Переглянути цей допис і його %{count} відповіді"
+        many: "Переглянути цей допис і його %{count} відповідей"
+        other: "Переглянути цей допис і його %{count} відповідей"
+      filtered_replies_viewing:
+        one: "Перегляд %{count} відповіді"
+        few: "Перегляд %{count} відповіді"
+        many: "Перегляд %{count} відповідей"
+        other: "Перегляд %{count} відповідей"
+      in_reply_to: "Завантажити батьківське повідомлення"
+      view_all_posts: "Переглянути всі повідомлення"
       errors:
         create: "Даруйте, під час створення допису трапилася помилка. Будь ласка, спробуйте ще раз."
         edit: "Даруйте, під час редагування допису трапилася помилка. Будь ласка, спробуйте ще раз."
@@ -2727,16 +2926,11 @@ uk:
         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: "Так, облишити"
+      cancel_composer:
+        confirm: "Що ви хотіли б зробити зі своїм дописом?"
+        discard: "Відмовити"
+        save_draft: "Зберегти чернетку на потім"
+        keep_editing: "Продовжити редагування"
       via_email: "це повідомлення прийшло з пошти"
       via_auto_generated_email: "це повідомлення прийшло з автоматично згенерованого e-mail"
       whisper: "Це внутрішнє повідомлення, тобто воно видно тільки модераторам"
@@ -2788,13 +2982,20 @@ uk:
         unlock_post_description: "Дозволити автору редагувати цей пост"
         delete_topic_disallowed_modal: "У вас немає дозволу на видалення цієї теми. Якщо ви дійсно хочете, щоб вона була видалена, використовуйте функцію прапора модератору разом з аргументацією."
         delete_topic_disallowed: "у вас немає дозволу на видалення цієї теми"
-        delete_topic_confirm_modal: "На даний момент ця тема має понад %{minViews} переглядів і може бути популярним місцем для пошуку. Ви впевнені, що хочете повністю видалити цю тему, а не редагувати її, щоб покращити?"
+        delete_topic_confirm_modal:
+          one: "На даний момент ця тема має понад %{count} переглядів і може бути популярною для пошуку. Ви впевнені, що хочете повністю видалити цю тему, а не редагувати її, щоб покращити?"
+          few: "На даний момент ця тема має понад %{count} переглядів і може бути популярною для пошуку. Ви впевнені, що хочете повністю видалити цю тему, а не відредагувати її, щоб покращити?"
+          many: "На даний момент ця тема має понад %{count} переглядів і може бути популярною для пошуку. Ви впевнені, що хочете повністю видалити цю тему, а не відредагувати її, щоб покращити?"
+          other: "На даний момент ця тема має понад %{count} переглядів і може бути популярною для пошуку. Ви впевнені, що хочете повністю видалити цю тему, а не відредагувати її, щоб покращити?"
         delete_topic_confirm_modal_yes: "Так, видалити цю тему"
         delete_topic_confirm_modal_no: "Ні, зберегти цю тему"
         delete_topic_error: "Сталася помилка під час видалення теми"
         delete_topic: "видалити тему"
         add_post_notice: "Повідомлення модератору"
+        change_post_notice: "Змінити повідомлення модератору"
+        delete_post_notice: "Видалити повідомлення модератору"
         remove_timer: "скасувати таймер"
+        edit_timer: "Редагувати таймер"
       actions:
         people:
           like:
@@ -2883,6 +3084,18 @@ uk:
           edit_bookmark:
             name: "Редагувати закладку"
             description: "Редагувати ім'я закладки або змінити дату нагадування та час"
+          pin_bookmark:
+            name: "Закріпити закладку"
+            description: "Закріпити закладку. Вона з'явиться у верхній частині списку закладок."
+          unpin_bookmark:
+            name: "Відкріпити закладку"
+            description: "Відкріпити закладку. Закладка більше не буде з'являтися у верхній частині списку закладок."
+      filtered_replies:
+        viewing_posts_by: "Перегляд %{post_count} повідомлень від"
+        viewing_subset: "Деякі відповіді згорнуті"
+        viewing_summary: "Перегляд резюме цієї теми"
+        post_number: "%{username}, повідомлення #%{post_number}"
+        show_all: "Показати всі"
     category:
       can: "може&hellip; "
       none: "(без категорії)"
@@ -2933,6 +3146,17 @@ uk:
       change_in_category_topic: "Редагувати опис"
       already_used: "Цей колір вже використовується іншою категорією"
       security: "Безпека"
+      security_add_group: "Додати групу"
+      permissions:
+        group: "Група"
+        see: "Переглянути"
+        reply: "Відповідь"
+        create: "Створити"
+        no_groups_selected: "Жодній групі не було надано доступ. Ця категорія буде доступна тільки співробітникам."
+        everyone_has_access: 'Ця категорія є загальнодоступною, кожен може бачити, відповідати і створювати дописи. Щоб обмежити дозволи, видаліть один або кілька дозволів, наданих групі «всі».'
+        toggle_reply: "Перемкнути дозвіл на відповідь"
+        toggle_full: "Увімкнути або вимкнути дозвіл на створення"
+        inherited: 'Цей дозвіл успадковується від "усіх"'
       special_warning: "Увага: даний розділ був встановлений та налаштування безпеки не можуть бути змінені. Якщо не хочете використовувати цей розділ, видаліть його замість зміни."
       uncategorized_security_warning: "Ця категорія особлива. Він призначений для зберігання тем, які не мають категорії; у нього не може бути налаштувань безпеки."
       uncategorized_general_warning: 'Ця категорія особлива. Він використовується в якості категорії за замовчуванням для нових тем, для яких не обрана категорія. Якщо ви хочете запобігти таку поведінку та примусово вибрати категорію, вимкніть настройку тут</a>. Якщо ви хочете змінити ім’я або опис, перейдіть до <a href="%{customizeLink}"> Налаштувати / текстовий вміст</a>.'
@@ -2948,6 +3172,7 @@ uk:
       num_featured_topics: "Кількість тем на сторінці розділів"
       subcategory_num_featured_topics: "Кількість обраних тем на сторінці батьківської категорії:"
       all_topics_wiki: "Створення нових тем Wikis за замовчуванням"
+      allow_unlimited_owner_edits_on_first_post: "Дозволяти власнику першого повідомлення необмежену можливість редагування"
       subcategory_list_style: "Стиль списку підрозділів:"
       sort_order: "Порядок сортування тем:"
       default_view: "Вид списку тем за умовчанням:"
@@ -2971,13 +3196,13 @@ uk:
       notifications:
         watching:
           title: "Слідкувати"
-          description: "Спостерігати за всіма темами цього розділу. Повідомляти про кожне нове повідомленні в будь-який з часом та показувати лічильник нових відповідей."
+          description: "Спостерігати за всіма темами цього розділу. Повідомляти про кожне нове повідомленні в будь-який час та показувати лічильник нових відповідей."
         watching_first_post:
           title: "Слідкувати за першим дописом"
           description: "Ви будете повідомлені про нові теми в цій категорії, але не на відповіді в них."
         tracking:
           title: "Стежити"
-          description: "Відстежувати всі теми цього розділу. Повідомляти якщо хтось згадає ваше @name або відповість вам, показувати лічильник нових відповідей."
+          description: "Автоматично відстежувати всі теми цієї категорії. Отримувати сповіщення, якщо хтось згадає моє @name або відповість мені. Показувати кількість нових відповідей."
         regular:
           title: "Нормальний"
           description: "Ви будете сповіщені, якщо хтось згадує ваше @ім'я чи відповідає вам."
@@ -3018,6 +3243,7 @@ uk:
       list_filters:
         all: "всі теми"
         none: "немає підкатегорій"
+      colors_disabled: "Не можна вибрати кольори, тому що не визначено стиль категорії."
     flagging:
       title: "Дякую за вашу допомогу в підтримці порядку!"
       action: "Поскаржитися на допис"
@@ -3035,7 +3261,8 @@ uk:
       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> в чорный список. Ви дійсно впевнені, що ваші помисли чисті та дії не продиктовані гнівом?"
+      flag_for_review: "Черга для перегляду"
+      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: "(не доступно)"
       hidden_email_address: "(приховано)"
@@ -3145,7 +3372,7 @@ uk:
       many: "користувача"
       other: "користувача"
     category_title: "Категорія"
-    history: "Історія"
+    history: "Історія та останні 100 змін"
     changed_by: "%{author}"
     raw_email:
       title: "Вхідне повідомлення"
@@ -3245,6 +3472,7 @@ uk:
       close: "Закрити (Esc)"
       content_load_error: '<a href="%url%">Вміст</a> не вдалося завантажити.'
       image_load_error: '<a href="%url%">Зображення</a> не вдалося завантажити.'
+    cannot_render_video: Це відео неможливо відтворити, оскільки ваш браузер не підтримує цей кодек.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -3437,6 +3665,7 @@ uk:
         many: "%{tags} і ще %{count} "
         other: "%{tags} і ще %{count}"
       delete_no_unused_tags: "Немає невикористаних тегів."
+      tag_list_joiner: ", "
       delete_unused: "Вилучити невикористовувані мітки"
       delete_unused_description: "Вилучити усі мітки, які не прикріплені до жодної теми чи особистих повідомлень"
       cancel_delete_unused: "Скасувати"
@@ -3477,6 +3706,7 @@ uk:
         everyone_can_use: "Мітки може використовувати будь-хто"
         usable_only_by_groups: "Мітки видимі для всіх, але використовувати їх можуть лише такі групи"
         visible_only_to_groups: "Теги відображаються лише для наступних груп"
+        cannot_save: "Не вдається зберегти групу тегів. Переконайтеся, що присутній принаймні один тег, ім’я групи тегів не є порожнім, а група вибрана з дозволом тегів."
       topics:
         none:
           unread: "У Вас немає непрочитаних тем."
@@ -3489,10 +3719,11 @@ uk:
     invite:
       custom_message: "Зробити запрошення трохи більш особистим, написавши <a href> повідомлення користувачеві</a>."
       custom_message_placeholder: "Напишіть сюди ваше особисте повідомлення"
-      approval_not_required: "Користувач буде автоматично схвалений, як тільки він прийме це запрошення."
+      approval_not_required: "Користувач буде автоматично підтверджений, як тільки він прийме це запрошення."
       custom_message_template_forum: "Вітання. Подумав, що тобі буде цікаво зареєструватися на цьому форумі!"
       custom_message_template_topic: "Вітання! Подумав, що тебе може зацікавити ця тема!"
     forced_anonymous: "Через надмірне навантаження, це тимчасово показується всім, як якщо б користувач вийшов з системи."
+    forced_anonymous_login_required: "Сайт під надзвичайним навантаженням, і наразі його неможливо завантажити, спробуйте ще раз за кілька хвилин."
     footer_nav:
       back: "Назад"
       forward: "Вперед"
@@ -3501,6 +3732,17 @@ uk:
     safe_mode:
       enabled: "Включено безпечний режим, щоб вийти з безпечного режиму, закрийте поточне вікно браузера"
     image_removed: "(зображення видалено)"
+    do_not_disturb:
+      title: "Не турбувати ..."
+      label: "Не турбувати"
+      remaining: "%{remaining} залишилось"
+      options:
+        half_hour: "30 хвилин"
+        one_hour: "1 година"
+        two_hours: "2 години"
+        tomorrow: "До завтра"
+        custom: "Користувацька"
+      set_schedule: "Налаштування розкладу сповіщень"
   admin_js:
     type_to_filter: "введіть, щоб фільтрувати..."
     admin:
@@ -3528,6 +3770,10 @@ uk:
         installed_version: "Встановлена"
         latest_version: "Остання"
         problems_found: "Кілька порад по вашим поточним налаштуванням сайту"
+        new_features:
+          title: "\U0001F381 Нові можливості"
+          dismiss: "Відхилити"
+          learn_more: "Дізнатися більше"
         last_checked: "Остання перевірка"
         refresh_problems: "Оновити"
         no_problems: "Не виявлено жодних проблем."
@@ -3618,10 +3864,6 @@ uk:
             available: "Назва групи є"
             not_available: "Назва групи недоступно"
             blank: "Ім’я групи не може бути порожнім"
-        bulk_add:
-          title: "Масове додавання в групу"
-          complete_users_not_added: "Ці користувачі не були додані (переконайтеся, що у них є обліковий запис):"
-          paste: "Вставити список імен користувачів або e-mail, по одному в рядку:"
         add_members:
           as_owner: "Встановити користувача (їй) в якості власника (ів) цієї групи"
         manage:
@@ -3648,7 +3890,11 @@ uk:
             effects: Ефекти
             trust_levels_none: "Відсутня"
             automatic_membership_email_domains: "Користувачі, зареєстровані c адресою електронної пошти, яка точно збігається з доменом в цьому списку, будуть автоматично додані до цієї групи: "
-            automatic_membership_user_count: "%{count} користувачів мають нові домени електронної пошти і будуть додані до групи."
+            automatic_membership_user_count:
+              one: "%{count} користувач має новий домен електронної пошти і буде доданий до групи."
+              few: "%{count} користувачі мають нові домени електронної пошти і будуть додані до групи."
+              many: "%{count} користувачів мають нові домени електронної пошти і будуть додані до групи."
+              other: "%{count} користувачів мають нові домени електронної пошти і будуть додані до групи."
             primary_group: "Автоматично встановлюється в якості основної групи"
         name_placeholder: "Group name, no spaces, same as username rule"
         primary: "Primary Group"
@@ -3660,7 +3906,13 @@ uk:
         group_members: "Учасники групи"
         delete: "Видалити"
         delete_confirm: "Видалити цю групу?"
+        delete_with_messages_confirm:
+          one: "Видалення цієї групи спричинить обмеження для %{count} повідомлення, учасники групи більше не матимуть до нього доступу.<br><br>Ви впевнені?"
+          few: "Видалення цієї групи спричинить обмеження для %{count} повідомлень, учасники групи більше не матимуть до нього доступу.<br><br>Ви впевнені?"
+          many: "Видалення цієї групи спричинить обмеження для %{count} повідомлень, учасники групи більше не матимуть до нього доступу.<br><br>Ви впевнені?"
+          other: "Видалення цієї групи спричинить обмеження для %{count} повідомлень, учасники групи більше не матимуть до нього доступу.<br><br>Ви впевнені?"
         delete_failed: "Не вдалося видалити групу. Якщо це - автоматична група, її неможливо знищити."
+        delete_automatic_group: Це автоматична група, яку не можна видалити.
         delete_owner_confirm: "Відкликати права власника у користувача '%{username}'?"
         add: "Додати"
         custom: "Налаштовуються"
@@ -3722,9 +3974,15 @@ uk:
               wordpress: Необхідний для роботи WordPress плагін wp-discourse.
             users:
               bookmarks: Список закладок користувача. Це повертає нагадування під час використання ICS формату.
-              sync_sso: Синхронізація користувача за допомогою SSO.
+              sync_sso: Синхронізувати користувача за допомогою DiscourseConnect.
               show: Отримати інформацію про користувача.
               check_emails: Список emails користувача.
+              update: Оновити інформацію в профілі користувача.
+              log_out: Вийти з усіх сессій для користувача.
+              anonymize: Анонімізувати облікові записи.
+              delete: Видалення облікових записів користувачів.
+            email:
+              receive_emails: Об'єднайте цю область з поштовим отримувачем для обробки вхідних листів електронної пошти.
       web_hooks:
         title: "Вебгуки"
         none: "Зараз вебгуків немає."
@@ -3739,7 +3997,7 @@ uk:
         go_back: "Повернутися до списку"
         payload_url: "Посилання для відправки"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Здається, ви намагаєтеся налаштувати вебгук на локальний URL. Подія, доставлена на локальну адресу, може дати побічний ефект або неочікувану поведінку. Продовжити?"
+        warn_local_payload_url: "Здається, ви намагаєтеся налаштувати web-хук для локального посилання. Подія, доставлена на локальну адресу, може призвести до побічних ефектів або непередбачуваних дій. Продовжити?"
         secret_invalid: "Ключ не повинен містити порожніх символів."
         secret_too_short: "Ключ повинен бути не менше 12 символів."
         secret_placeholder: "Додатковий рядок, використовується для створення підпису"
@@ -3767,7 +4025,7 @@ uk:
           details: "Відбувається, коли повідомлення створюється, редагується, видаляється або відновлюється."
         user_event:
           name: "подія користувача"
-          details: "Коли користувач входить, виходить, створюється, підтверджується або змінюється."
+          details: "Коли користувач входить в систему, реєструється, підтверджує свою електронну пошту, схвалено або оновлено."
         group_event:
           name: "групове Захід"
           details: "При створенні, оновленні або видаленні групи."
@@ -3786,6 +4044,12 @@ uk:
         user_badge_event:
           name: "Подія вручення значка"
           details: "Коли користувач отримує значок."
+        group_user_event:
+          name: "Подія користувача групи"
+          details: "Коли користувач додається або видаляється з групи."
+        like_event:
+          name: "Подія Подобається"
+          details: "Коли користувач вподобав допис."
         delivery_status:
           title: "Стан доставки"
           inactive: "Неактивно"
@@ -3968,6 +4232,7 @@ uk:
           is_default: "Активувати за замовчуванням"
           user_selectable: "Користувачі можуть вибирати стиль"
           color_scheme_user_selectable: "Схема кольорів може бути вибрана користувачами"
+          auto_update: "Автоматичне оновлення при оновленні Discourse"
           color_scheme: "Колірна палітра"
           default_light_scheme: "Світла (за замовчуванням)"
           color_scheme_select: "Виберіть кольори для стилю"
@@ -3977,7 +4242,9 @@ uk:
           convert: "Конвертувати"
           convert_component_alert: "Ви впевнені, що хочете перетворити цей компонент у тему? Він буде вилучений як компонент з%{relatives}."
           convert_component_tooltip: "Перетворити цей компонент в тему"
+          convert_component_alert_generic: "Ви впевнені, що хочете перетворити цей компонент на тему?"
           convert_theme_alert: "Ви впевнені, що хочете перетворити цю тему в компонент? Він буде вилучений як батько з%{relatives}."
+          convert_theme_alert_generic: "Ви впевнені, що хочете перетворити цю тему на компонент?"
           convert_theme_tooltip: "Перетворити цю тему в компонент"
           inactive_themes: "Неактивні теми:"
           inactive_components: "Невикористані компоненти:"
@@ -4011,17 +4278,20 @@ uk:
           included_components: "Входять компоненти"
           add_all: "Додати все"
           import_web_tip: "Репозиторій стилю"
+          direct_install_tip: "Ви дійсно хочете встановити <strong>%{name}</strong> зі сховища, наведеного нижче?"
           import_web_advanced: "Додатково..."
           import_file_tip: ".tar.gz, .zip, або .dcstyle .json файл, який містить тему"
           is_private: "Тема знаходиться в приватному репозиторії git"
           remote_branch: "Назва гілки (не обов’язково)"
           public_key: "Надайте доступ до сховища з наступним відкритим ключем:"
+          public_key_note: "Після введення коректної адреси приватного сховища вище, тут буде згенеровано і показано SSH ключ."
           install: "Install"
           installed: "Встановлена"
           install_popular: "Популярні"
           install_upload: "З вашого пристрою"
           install_git_repo: "Зі сховища git"
           install_create: "Створити новий"
+          duplicate_remote_theme: "Компонент теми «%{name}» уже встановлений. Ви впевнені, що хочете встановити іншу копію?"
           about_theme: "Про"
           license: "Ліцензія"
           version: "Версія:"
@@ -4041,6 +4311,7 @@ uk:
           check_for_updates: "Перевірити оновлення"
           updating: "Оновлюю..."
           up_to_date: "Стиль поточної версії, остання перевірка:"
+          has_overwritten_history: "Поточна версія теми вже не існує, оскільки історія Git була перезаписана примусово."
           add: "Додати"
           theme_settings: "Налаштування теми"
           no_settings: "Ця тема не має налаштувань."
@@ -4052,6 +4323,7 @@ uk:
             many: "Тема знаходиться на %{count} комітів позаду!"
             other: "Тема знаходиться на %{count} комітів позаду!"
           compare_commits: "(Дивіться нові комміти)"
+          remote_theme_edits: "Якщо ви хочете відредагувати цю тему, ви повинні <a href='%{repoURL}' target='_blank'>надіслати зміни до її сховища</a>"
           repo_unreachable: "Не вдалося зв’язатися з Git-репозиторієм цієї теми. Повідомлення про помилку:"
           imported_from_archive: "Ця тема була імпортована з .zip файлу"
           scss:
@@ -4078,11 +4350,9 @@ uk:
 
               Приклад:
 
-              :root {
-              --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};
-              }
+              %{example}
 
-              Настійно рекомендується вводити префікси до назв властивостей, щоб уникнути конфліктів з плагінами та/або ядром.
+              Рекомендується вводити префікси до назв властивостей, щоб уникнути конфліктів з плагінами та / або ядром.
           head_tag:
             text: "</head>"
             title: "HTML-код, який буде вставлений перед міткою </head>"
@@ -4110,6 +4380,10 @@ uk:
           primary:
             name: "основний"
             description: "Більшість текстів, іконок та кордонів."
+          primary-medium:
+            name: "первинний, середня насиченість"
+          primary-low-mid:
+            name: "первинний, середньо-низька насиченість"
           secondary:
             name: "вторинний"
             description: "Основний колір фону та колір тексту для деяких кнопок."
@@ -4128,6 +4402,12 @@ uk:
           highlight:
             name: "висвітлення"
             description: "Фоновий колір виділених елементів на сторінці, таких як повідомлення та теми."
+          highlight-high:
+            name: "виділення, висока насиченість"
+          highlight-medium:
+            name: "виділення, середня насиченість"
+          highlight-low:
+            name: "виділення, низька насиченість"
           danger:
             name: "небезпека"
             description: "Колір виділення для таких дій, як видалення повідомлень та тем."
@@ -4314,6 +4594,7 @@ uk:
             post_edit: "редагувати повідомлення"
             post_unlocked: "повідомлення розморожено"
             check_personal_message: "перевірити приватне повідомлення"
+            disabled_second_factor: "вимкнути двофакторну автентифікацію"
             topic_published: "тема опублікована"
             post_approved: "повідомлення затверджено"
             post_rejected: "повідомлення відхилено"
@@ -4352,6 +4633,7 @@ uk:
             topic_unarchived: "тема повернута"
             post_staff_note_create: "додати примітку для персоналу"
             post_staff_note_destroy: "знищити записку персоналу"
+            delete_group: "видалити групу"
         screened_emails:
           title: "Screened Emails"
           description: "Коли хтось намагатиметься створити новий обліковий запис, наступні електронні скриньки буде перевірено, і реєстрацію заблоковано, або вжито якихось інших дій."
@@ -4399,33 +4681,33 @@ uk:
         title: "Відслідковувані слова"
         search: "Пошук"
         clear_filter: "Очистити"
-        show_words: "Показати слова"
-        one_word_per_line: "Одне слово в рядку"
+        show_words:
+          one: "показати %{count} слово"
+          few: "показати %{count} слів"
+          many: "показати %{count} слів"
+          other: "показати %{count} слів"
         download: Завантажити
         clear_all: Скинути все
-        clear_all_confirm_block: "Ви впевнені, що хочете видалити всі Популярні слова для дії Блокувати?"
-        clear_all_confirm_censor: "Ви впевнені, що хочете очистити всі Популярні слова для дії Цензора?"
-        clear_all_confirm_flag: "Ви впевнені, що хочете видалити всі Популярні слова для дії Прапор?"
-        clear_all_confirm_require_approval: "Ви впевнені, що хочете видалити всі Популярні слова для дії Вимагати затвердження?"
-        word_count:
-          one: "%{count} слово"
-          few: "%{count} слова"
-          many: "%{count} слів"
-          other: "%{count} слів"
+        clear_all_confirm: "Ви впевнені, що хочете видалити всі контрольні слова на %{action}?"
         actions:
           block: "Заблокувати"
           censor: "Цензура"
           require_approval: "Що вимагають схвалення"
           flag: "Поскаржитися"
+          replace: "Замінити"
+          tag: "Тег"
         action_descriptions:
           block: "Заборонити публікацію повідомлень, що містять ці слова. Користувач побачить повідомлення про помилку при спробі відправити своє повідомлення."
           censor: "Дозволити повідомлення, що містять ці слова, але замінювати їх символами, які приховують цензурні вирази."
           require_approval: "Коментарі, що містять ці слова, вимагатимуть схвалення персоналу, перш ніж їх можна буде побачити."
           flag: "Дозволити повідомлення, що містять ці слова, але позначати їх як неприйнятні, щоб модератори могли їх оцінювати."
+          replace: "Замініть слова в публікаціях іншими словами або посиланнями"
         form:
-          label: "Нове слово:"
-          placeholder: "слово цілком, зірочка (*) використовується як знак підстановки "
           placeholder_regexp: "Регулярний вираз"
+          replacement_label: "Замінити текст"
+          replacement_placeholder: "слово або https://example.com"
+          tag_label: "Тег"
+          tag_placeholder: "тег1, тег2, тег3"
           add: "Додати"
           success: "Успіх"
           exists: "Вже існує"
@@ -4478,6 +4760,9 @@ uk:
         check_email:
           title: "Відкрити e-mail цього користувача"
           text: "Показати"
+        check_sso:
+          title: "Показати корисне навантаження на SSO"
+          text: "Показати"
       user:
         suspend_failed: "Щось трапилося під час призупинення цього користувача: %{error}"
         unsuspend_failed: "Щось трапилося під час скасування призупинення цього користувача: %{error}"
@@ -4485,6 +4770,14 @@ uk:
         suspend_reason_label: "Чому Ви призупиняєте цього користувача? Цей текст <b>буде видимим для всіх</b> на сторінці профілю цього користувача, і його буде показано користувачу при спробі увійти в систему. Будьте лаконічні."
         suspend_reason_hidden_label: "Чому ви призупиняєте користувача? Цей текст буде показаний користувачеві, коли він спробує увійти в систему. Будьте лаконічним."
         suspend_reason: "Причина"
+        suspend_reason_title: "Причина призупинення"
+        suspend_reasons:
+          not_listening_to_staff: "Не послухав рекомендації персоналу"
+          consuming_staff_time: "Витрачається забагато часу персоналу"
+          combatative: "Занадто агресивний"
+          in_wrong_place: "Не в тому місці"
+          no_constructive_purpose: "Немає конструктиву його дій, окрім створення розколу у спільноті"
+          custom: "Власний..."
         suspend_message: "Повідомлення пошти"
         suspend_message_placeholder: "При бажанні, надайте додаткову інформацію про припинення, та вона буде відправлена ​​користувачеві по електронній пошті."
         suspended_by: "Призупинено"
@@ -4543,6 +4836,7 @@ uk:
         private_topics_count: Приватних тем
         posts_read_count: Дописів прочитано
         post_count: Дописів створено
+        second_factor_enabled: Двофакторна автентифікація
         topics_entered: Тем переглянуто
         flags_given_count: Скарг подано
         flags_received_count: Скарг отримано
@@ -4558,6 +4852,9 @@ uk:
         anonymize_yes: "Так, приховати цей обліковий запис"
         anonymize_failed: "Не вдалося анонімізувати обліковий запис."
         delete: "Видалити користувача"
+        delete_posts:
+          progress:
+            title: "Хід видалення дописів"
         merge:
           button: "Об' єднати"
           prompt:
@@ -4569,6 +4866,8 @@ uk:
             target_username_placeholder: "Ім'я користувача нового власника"
             transfer_and_delete: "Передача і видалення @%{username}"
             cancel: "Скасувати"
+          progress:
+            title: "Прогрес злиття"
           confirmation:
             title: "Передача і видалення @%{username}"
             description: |
@@ -4669,16 +4968,16 @@ uk:
           on_grace_period: "В даний момент в періоді довіри та не може бути розжалуваний."
           locked_will_not_be_promoted: "Рівень довіри заморожений, тому користувач ніколи не буде просунутий до цього рівня."
           locked_will_not_be_demoted: "Рівень довіри заморожений, тому користувач ніколи не буде розжалуваний."
-        sso:
-          title: "Технологія єдиного входу SSO"
+        discourse_connect:
+          title: "DiscourseСonnect єдиний вхід"
           external_id: "Зовнішній ID"
-          external_username: "Ім'я користувача"
-          external_name: "Ім'я"
-          external_email: "Електронна пошта"
-          external_avatar_url: "URL фону профілю"
+          external_username: "Ім’я користувача"
+          external_name: "Назва"
+          external_email: "E-mail"
+          external_avatar_url: "URL зображення профілю"
           last_payload: "Останнє корисне навантаження"
           delete_sso_record: "Видалити запис SSO"
-          confirm_delete: "Ви впевнені, що хочете видалити цей запис системи єдиного входу (SSO)?"
+          confirm_delete: "Ви впевнені, що хочете видалити цей запис DiscourseConnect?"
       user_fields:
         title: "Поля користувача"
         help: "Додати поля, які користувачі зможуть заповнювати."
@@ -4723,12 +5022,19 @@ uk:
         go_back: "Повернутись до пошуку"
         recommended: "Ми рекомендуємо змінити наступний текст під ваші потреби:"
         show_overriden: "Показувати тільки перевизначені"
+        locale: "Мова:"
+        fallback_locale_warning: "Ви редагуєте мову на основі %{fallback}. Користувачі, які обрали %{fallback} як мову інтерфейсу, не бачитимуть ваших змін."
         more_than_50_results: "Знайдено понад 50 результатів. Будь ласка виправте параметри пошуку."
       settings:
         show_overriden: "Показувати тільки перевизначені"
+        history: "Переглянути історію змін"
         reset: "скинути"
         none: "немає"
       site_settings:
+        emoji_list:
+          invalid_input: "Список емодзі повинен містити лише дійсні імена емодзі, наприклад: hugs"
+          add_emoji_button:
+            label: "Додати емодзі"
         title: "Налаштування"
         no_results: "Не знайдено результатів."
         more_than_30_results: "Знайдено понад 30 результатів. Будь ласка виправте параметри пошуку або виберіть розділ."
@@ -4781,6 +5087,9 @@ uk:
           modal_no: "Ні, тільки застосувати зміни в майбутньому"
         simple_list:
           add_item: "Додати елемент..."
+        json_schema:
+          edit: Відкрити редактор
+          modal_title: "Редагувати %{name}"
       badges:
         title: Нагороди
         new_badge: Нова нагорода
@@ -4817,8 +5126,12 @@ uk:
         enabled: Включити відзнаки
         icon: Іконка
         image: Зображення
+        graphic: Іконка бейджа
         icon_help: "Введіть назву значка Font Awesome (використовуйте префікс 'far-' для звичайних значків та 'fab-' для значків брендів)"
-        image_help: "Введіть URL-адресу зображення (переопределяет поле Нагороди, якщо встановлені обидва)"
+        image_help: "Завантаження зображення для заміни значка, якщо встановлено обидва."
+        select_an_icon: "Виберіть піктограму"
+        upload_an_image: "Завантажити зображення"
+        read_only_setting_help: "Налаштувати текст"
         query: Вибірка нагороди (SQL)
         target_posts: Вибірка цільових повідомлень
         auto_revoke: Запускати запит на відкликання щодня
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 7240f90bdb..7f51f273f9 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -149,6 +149,8 @@ ur:
         disabled: "اِس بینر کو ہٹا دیا %{when}۔ یہ اب ہر صفحے کے سب سے اوپر دکھایا نہیں جائے گا۔"
     wizard_required: "اپنے نئے ڈِسکورس پر خوش آمدید! <a href='%{url}' data-auto-route='true'>سیٹ اَپ وزرڈ</a> سے آغاز کرتے ہیں۔✨"
     emails_are_disabled: " ای میل کو منتظم کی طرف سے غیر فعال کر دیا گیا ہے. کسی بھی قسم کی ای میل نہیں بھیجی جائیں گی۔"
+    software_update_prompt:
+      dismiss: "بر خاست کریں"
     bootstrap_mode_disabled: "بُوٹسٹرَیپ مَوڈ 24 گھنٹوں کے اندر غیر فعال کر دیا جائے گا۔"
     themes:
       default_description: "ڈِیفالٹ"
@@ -209,6 +211,9 @@ ur:
     now: "ابھی "
     read_more: "مزید پڑھیں "
     more: "مزید "
+    x_more:
+      one: "%{count} مزید"
+      other: "%{count} مزید"
     less: "کم "
     never: "کبھی نہیں "
     every_30_minutes: "ہر 30 منٹ"
@@ -237,8 +242,6 @@ ur:
       moderators: "ماڈریٹرز"
       stat:
         all_time: "تمام اوقات"
-        last_7_days: "آخری 7"
-        last_30_days: "آخری 30"
       like_count: "لائیکس"
       topic_count: "ٹاپک"
       post_count: "پوسٹ"
@@ -257,13 +260,10 @@ ur:
       remove: "بُک مارک ہٹائیں"
       confirm_clear: "کیا آپ کو یقین ہے کہ آپ اِس ٹاپک سے اپنے تمام بُک مارکس ہٹانا چاہتے ہیں؟"
       save: "محفوظ کریں"
+      no_user_bookmarks: "آپ کے پاس کوئی بُک مارک کی ہوئی پوسٹس نہیں ہیں؛ بُک مارکس آپ کو مخصوص پوسٹس کے فوری حوالہ فراہم کرتے ہیں۔"
+      auto_delete_preference:
+        never: "کبھی نہیں "
       search: "تلاش کریں"
-      reminders:
-        later_today: "آج بعد میں"
-        tomorrow: "کَل"
-        next_week: "اگلے ہفتے"
-        later_this_week: "اِس ہفتے بعد میں"
-        next_month: "اگلے ماہ"
     drafts:
       resume: "جاری رکھیں"
       remove: "خارج کریں"
@@ -271,9 +271,7 @@ ur:
       new_private_message: "نئے ذاتی پیغام کا ڈرافٹ"
       topic_reply: "جواب ڈرافٹ کریں"
       abandon:
-        confirm: "آپ نے پہلے ہی اِس ٹاپک میں ایک اور ڈرافٹ کھولا ہوا ہے۔ کیا آپ واقعی اُس کو چھوڑنا چاہتے ہیں؟"
-        yes_value: "جی ہاں، تَرک کریں"
-        no_value: "نہیں، رکھیں"
+        yes_value: "منسوخ"
     topic_count_latest:
       one: "%{count} نیا یا اَپ ڈیٹ کردہ ٹاپک دیکھیں۔"
       other: "%{count} نئے یا اَپ ڈیٹ کردہ ٹاپک دیکھیں۔"
@@ -363,6 +361,7 @@ ur:
       topic: "ٹاپک:"
       filtered_topic: "آپ نے ایک ٹاپک میں قابل تجدید مواد کو فِلٹر کر دیا ہے۔"
       filtered_user: "صارف"
+      filtered_reviewed_by: "کی طرف سے جائزہ کردہ"
       show_all_topics: "تمام ٹاپکس دکھائیں"
       deleted_post: "(پوسٹ حذف کر دی گئی)"
       deleted_user: "(صارف حذف کر دیا گیا)"
@@ -372,10 +371,8 @@ ur:
         email: "اِی میل"
         name: "نام"
         fields: "فیلڈز"
+        reject_reason: "وجہ"
       user_percentage:
-        summary:
-          one: "%{agreed}، %{disagreed}، %{ignored} (%{count} کُل فلَیگ)"
-          other: "%{agreed}، %{disagreed}، %{ignored} (%{count} کُل فلَیگز)"
         agreed:
           one: "%{count}٪ متفق"
           other: "%{count}٪ متفق"
@@ -417,7 +414,8 @@ ur:
           created_at_asc: "کو بنایا گیا (ریوَرس)"
         priority:
           title: "کم از کم ترجیح"
-          low: "(کوئی بھی)"
+          any: "(کوئی بھی)"
+          low: "کم"
           medium: "درمیانی"
           high: "زیادہ"
       conversation:
@@ -455,6 +453,8 @@ ur:
           title: "قطار شدہ پوسٹ"
         reviewable_user:
           title: "صارف"
+        reviewable_post:
+          title: "پوسٹ"
       approval:
         title: "پوسٹ کو منظوری کی ضرورت ہے"
         description: "ہمیں آپ کی نئی پوسٹ موصول ہو چکی ہے لیکن یہ ظاہر ہونے سے پہلے ایک منتظم سے منظور ہونا ضروری ہے۔ براہ مہربانی صبر کریں۔"
@@ -462,6 +462,17 @@ ur:
           one: "آپ کی <strong>%{count}</strong> پوسٹ زیرِاِلتوَاء ہے۔"
           other: "آپ کی <strong>%{count}</strong> پوسٹس زیرِاِلتوَاء ہیں۔"
         ok: "ٹھیک"
+      example_username: "صارف نام"
+    relative_time_picker:
+      days:
+        one: "دن"
+        other: "دن"
+    time_shortcut:
+      later_today: "آج بعد میں"
+      tomorrow: "کَل"
+      next_week: "اگلے ہفتے"
+      later_this_week: "اِس ہفتے بعد میں"
+      next_month: "اگلے ماہ"
     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> پوسٹ کیا"
@@ -477,6 +488,7 @@ ur:
       sent_by_user: "<a href='%{userUrl}'>%{user}</a> نے بھیجا"
       sent_by_you: "<a href='%{userUrl}'>آپ</a> نے بھیجا"
     directory:
+      username: "صارف کا نام"
       filter_name: "صارفین کے ناموں کے حساب سے فلٹر کریں"
       title: "صارفین"
       likes_given: "دیا گیا"
@@ -532,9 +544,17 @@ ur:
           credentials:
             username: "صارف کا نام"
             password: "پاسورڈ"
+          settings:
+            title: "سیٹِنگ"
+          mailboxes:
+            disabled: "غیر فعال"
         membership:
           title: ممبرشپ
           access: رسائی
+        categories:
+          title: زُمرَہ جات
+        tags:
+          title: ٹیگز
         logs:
           title: "لاگز"
           when: "کب"
@@ -545,6 +565,8 @@ ur:
           details: "تفصیلات"
           from: "سے"
           to: "کیلئے"
+      permissions:
+        title: "اجازتیں"
       public_admission: "صارفین کو آزادی سے گروپ میں شمولیت اختیار کرنے کی اجازت دیں (گروپ کا عوامی طور پر ظاہر ہونا لاذمی ہو)"
       public_exit: "صارفین کو آزادانہ طور پر گروپ چھوڑنے کی اجازت دیں"
       empty:
@@ -673,18 +695,21 @@ ur:
       posts: "پوسٹ"
       topics: "ٹاپک"
       latest: "تازہ ترین"
-      latest_by: "تک تازہ ترین"
       toggle_ordering: "ترتیب کاری کا کنٹرول ٹاگل کریں"
       subcategories: "ذیلی زمرے"
       topic_sentence:
         one: "%{count} ٹاپک"
         other: "%{count} ٹاپک"
+      topic_stat_unit:
+        week: "ہفتہ"
+        month: "مہینہ"
       topic_stat_sentence_week:
         one: "%{count} نیا ٹاپک گزشتہ ہفتے میں۔"
         other: "%{count} نئے ٹاپک گزشتہ ہفتے میں۔"
       topic_stat_sentence_month:
         one: "%{count} نیا ٹاپک گزشتہ ماہ میں۔"
         other: "%{count} نئے ٹاپک گزشتہ ماہ میں۔"
+      n_more: "زمرہ جات (%{count} مزید)..."
     ip_lookup:
       title: IP ایڈریس کا سراغ
       hostname: ہوسٹ کا نام
@@ -735,7 +760,11 @@ ur:
         mute_option_title: "آپ کو اِس صارف سے متعلق اطلاعات نہیں ملیں گی۔"
         normal_option: "عمومی"
         normal_option_title: " آپ کو مطلع کر دیا جائے گا اگر یہ صارف آپ کو جواب دیتا ہے، آپ کا اقتباس کرتا ہے، یا آپ کا ذکر کرتا ہے۔"
+      notification_schedule:
+        none: "کوئی نہیں"
+        to: "کیلئے"
       activity_stream: "سرگرمی"
+      read: "پڑھ لیا گیا"
       preferences: "ترجیحات"
       feature_topic_on_profile:
         save: "محفوظ کریں"
@@ -759,7 +788,6 @@ ur:
         perm_denied_expl: "آپ نے اطلاعات کے لئے اجازت دینے سے انکار کر دیا۔ اپنے براؤزر کی سیٹِنگ سے اطلاعات کی اجازت دیں۔"
         disable: "اطلاعات غیر فعال کریں"
         enable: "اطلاعات فعال کریں"
-        each_browser_note: "نوٹ: آپ کو ہر براؤزر پر اس سیٹنگ کو تبدیل کرنا ہوگا."
         consent_prompt: "جب لوگ آپ کی پوسٹس کا جواب دیں تو کیا آپ لائیو اطلاعات چاہتے ہیں؟"
       dismiss: "بر خاست کریں"
       dismiss_notifications: "سب بر خاست کریں"
@@ -767,6 +795,9 @@ ur:
       first_notification: "آپ کی پہلی نوٹیفکیشن! شروع کرنے کے لئے اسے منتخب کریں۔"
       dynamic_favicon: "براؤزر آئکن پر پر شمار دکھائیں"
       theme_default_on_all_devices: "میری تمام ڈیوائسز پر اِس کو ڈیفالٹ تھیم بنائیں"
+      color_schemes:
+        undo: "رِی سَیٹ"
+        regular: "معمولی"
       text_size_default_on_all_devices: "میری تمام ڈیوائسز پر اِس کو ڈیفالٹ ٹیکسٹ سائز بنائیں"
       allow_private_messages: "دوسرے صارفین کو مجھے ذاتی پیغامات بھیجنے کی اجازت دیں"
       external_links_in_new_tab: "تمام بیرونی ویب سائٹ کے لنکس ایک نئے ٹیب میں کھولیں"
@@ -781,6 +812,7 @@ ur:
       suspended_notice: "یہ صارف %{date} تک معطل ہے۔"
       suspended_permanently: "یہ صارف معطل ہے۔"
       suspended_reason: "وجہ:"
+      github_profile: "گِٹ ہَب"
       email_activity_summary: "سرگرمی کا خلاصہ"
       mailing_list_mode:
         label: "میلنگ لسٹ کے موڈ"
@@ -811,6 +843,7 @@ ur:
       muted_categories: "خاموش کِیا ہوا"
       muted_categories_instructions: "آپ کو اِن زمرہ جات میں موجود نئے ٹاپکس کی کسی بھی چیز کے بارے میں مطلع نہیں کیا جائے گا، اور یہ زمرہ جات یا تازہ ترین صفحات پر نظر نہیں آئیں گے۔"
       muted_categories_instructions_dont_hide: "آپ کو اِن زمرہ جات میں نئے ٹاپک کی کسی بھی چیز کے بارے میں مطلع نہیں کیا جائے گا۔"
+      regular_categories: "معمولی"
       no_category_access: "ایک ماڈریٹر کے طور پر آپ کو زمرہ پر محدود رسائی حاصل ہے، محفوظ کرنا غیر فعال ہے۔"
       delete_account: "میرا اکاؤنٹ حذف کریں"
       delete_account_confirm: "کیا آپ واقعی مستقل طور پر اپنا اکاؤنٹ حذف کرنا چاہتے ہیں؟ اس عمل کو کالعدم نہیں کیا جا سکتا!"
@@ -851,6 +884,7 @@ ur:
         tags: "ٹیگز"
       preferences_nav:
         account: "اکاؤنٹ"
+        security: "سیکورٹی"
         profile: "پروفائل"
         emails: "اِی مَیل"
         notifications: "اطلاعات"
@@ -930,7 +964,6 @@ ur:
         secondary: "ثانوی ایمیلز"
         primary_label: "بنیادی"
         update_email: "اِی میل تبدیل کریں"
-        sso_override_instructions: "SSO پرووَائیڈر سے ایمیل کو اَپ ڈیٹ کیا جا سکتا ہے۔"
         no_secondary: "کوئی ثانوی ایمیلز نہیں"
         instructions: "کبھی بھی عوام کو دکھایا نہیں گیا۔"
         ok: "ہم تصدیق کے لئے آپ کو اِی میل کریں گے"
@@ -1056,45 +1089,41 @@ ur:
         after_10_minutes: "10 منٹ کے بعد"
       notification_level_when_replying: "جب میں ایک ٹاپک میں پوسٹ کروں، اُس ٹاپک کو مقرر کریں"
       invited:
-        search: "دعوتیں تلاش کرنے کے لئے ٹائپ کریں..."
         title: "دعوتیں"
+        pending_tab: "زیرِاِلتوَاء"
+        pending_tab_with_count: "زیرِاِلتوَاء (%{count})"
+        redeemed_tab: "فائدہ اٹھا لیا گیا"
+        redeemed_tab_with_count: "فائدہ اٹھا لیا گیا (%{count})"
+        invited_via: "دعوت نامہ"
+        groups: "گروپس"
+        topic: "ٹاپک"
+        edit: "ترمیم"
+        remove: "خارج کریں"
+        reinvited: "دعوت دوبارہ بھیج دی گئی"
+        search: "دعوتیں تلاش کرنے کے لئے ٹائپ کریں..."
         user: "مدعو کیا گیا صارف"
         none: "ظاہر کرنے کے لئے کوئی دعوتیں نہیں ہیں۔"
         truncated:
           one: "پہلی دعوت دکھائی جا رہی ہیں۔"
           other: "پہلی %{count} دعوتیں دکھائی جا رہی ہیں۔"
         redeemed: "دعوتیں جِن سے فائدہ اٹھا لیا گیا ہے"
-        redeemed_tab: "فائدہ اٹھا لیا گیا"
-        redeemed_tab_with_count: "فائدہ اٹھا لیا گیا (%{count})"
         redeemed_at: "فائدہ اٹھا لیا گیا"
         pending: "زیرِاِلتوَاء دعوتیں"
-        pending_tab: "زیرِاِلتوَاء"
-        pending_tab_with_count: "زیرِاِلتوَاء (%{count})"
         topics_entered: " دیکھ لیے گئے ٹاپک"
         posts_read_count: "پڑھی گئیں پوسٹس"
         expired: "اِس دعوت کی میعاد ختم ہو چکی ہے۔"
-        rescind: "خارج کریں"
-        rescinded: "دعوت خارج کر دی گئی"
-        rescinded_all: "تمام میعاد ختم ہوئی دعوتیں منسوخ کر دی گئیں!"
-        rescind_all_confirm: "کیا آپ واقعی تمام میعاد ختم ہوئی دعوتیں منسوخ کر دینا چاہتے ہیں؟"
-        reinvite: "دعوت دوبارہ بھیجیں"
-        reinvite_all: "تمام دعوتیں دوبارہ بھیجیں"
+        removed_all: "تمام میعاد ختم ہوئی دعوتیں منسوخ کر دی گئیں!"
+        remove_all_confirm: "کیا آپ واقعی تمام میعاد ختم ہوئی دعوتیں منسوخ کر دینا چاہتے ہیں؟"
         reinvite_all_confirm: "کیا آپ واقعی تمام دعوتیں دوبارہ بھیجنا چاہتے ہیں؟"
-        reinvited: "دعوت دوبارہ بھیج دی گئی"
-        reinvited_all: "تمام دعوتیں دوبارہ بھیج دی گئیں!"
         time_read: "پڑھنے کیلئے اِستعمال ہونے والا وقت"
         days_visited: "دورہ کیے گئے دن"
         account_age_days: "دنوں میں اکاؤنٹ کی عمر"
-        links_tab: "لنکس"
-        link_created_at: "بنایا گیا"
-        link_groups: گروپس
+        create: "دعوت دیں"
         valid_for: "دعوت لنک صرف اِس اِی میل اِیڈریس کے لئے درست ہے:%{email}"
         invite_link:
           success: "دعوت لنک کامیابی سے بن گیا!"
         bulk_invite:
-          success: "فائل کامیابی سے اَپ لوڈ کر دی گئی، عمل مکمل ہونے پر آپ کو پیغام کے ذریعے مطلع کر دیا جائے گا۔"
           error: "معذرت، فائل CSV فارمیٹ میں ہونا ضروری ہے۔"
-          confirmation_message: "آپ اَپ لوڈ شدہ فائل میں موجود سبھی کو دعوت نامے ایمیل کرنے لگے ہیں۔"
       password:
         title: "پاسورڈ"
         too_short: "آپ کا پاسورڈ بہت چھوٹا ہے"
@@ -1193,7 +1222,6 @@ ur:
     modal:
       close: "بند کریں"
     close: "بند کریں"
-    assets_changed_confirm: "یہ ویب سائٹ ابھی ابھی اَپ ڈیٹ کی گئی ہے۔ تازہ ترین ورژن کے لئے ابھی رِیفریش کریں؟"
     logout: "آپ لاگ آؤٹ ہو گئے تھے۔"
     refresh: "رِیفریش"
     home: "ہَوم"
@@ -1202,15 +1230,6 @@ ur:
       login_disabled: "جب تک سائٹ صرف پڑھنے کے مَوڈ میں ہے لاگ اِن غیر فعال رہے گا۔"
       logout_disabled: "جب تک سائٹ صرف پڑھنے کے مَوڈ میں ہے لاگ آؤٹ غیر فعال رہے گا۔"
     learn_more: "اورجانیے..."
-    all_time: "کُل"
-    all_time_desc: "کُل ٹاپک بنائے گئے"
-    year: "سال"
-    year_desc: "پچھلے 365 دنوں میں بنائے گئے ٹاپک"
-    month: "مہینہ"
-    month_desc: "پچھلے 30 دنوں میں بنائے گئے ٹاپک"
-    week: "ہفتہ"
-    week_desc: "پچھلے 7 دنوں میں بنائے گئے ٹاپک"
-    day: "دن"
     first_post: پہلی پوسٹ
     mute: خاموش کریں
     unmute: آواز چالو کریں
@@ -1227,13 +1246,10 @@ ur:
       sign_up: "سائن اپ"
       hide_session: "مجھے کل یاد دلائیں"
       hide_forever: "نہیں شکریہ"
-      hidden_for_session: "ٹھیک ہے، میں تم سے کَل پوچھوں گا۔ آپ جب چاہیں، اکاؤنٹ بنانے کے لئے 'لاگ اِن' بھی استعمال کر سکتے ہیں."
       intro: "ہیلو! ایسا لگتا ہے کہ آپ بحث سے لطف اندوز ہو رہے ہیں، لیکن آپ نے اکاؤنٹ کے لئے سائن اَپ نہیں کیا۔"
       value_prop: "جب آپ ایک اکاؤنٹ بناتے ہیں، ہم بالکل یاد رکھتے ہیں کہ آپ نے کیا پڑھا ہے، تاکہ جہاں سے آپ نے پڑھنا چھوڑا ہو بلکل وہاں ہی پر آپ کو ہمیشہ واپس پہنچایا جا سکے۔ جب بھی کوئی آپ کو جواب دیتا ہے، آپ کو یہاں اور اِی میل پر اطلاع بھی دے دی جاتی ہے۔ اور آپ محبت کو بانٹںے کیلئے پوسٹ لائیک کر سکتے ہیں۔ :heartpulse:"
     summary:
       enabled_description: "آپ اس ٹاپک کا خلاصہ ملاحظہ کررہے ہیں: سب سے دلچسپ پوسٹ کمیونٹی کی طرف سے متعین کی جاتی ہیں۔"
-      description: "<b>%{replyCount}<b/> جوابات موجود ہیں۔"
-      description_time: "<b>%{replyCount}</b> جوابات موجود ہیں جن کو پڑھنے کے وقت کا تخمینہ < %{readingTime} </b منٹ<b> ہے۔"
       enable: "اس ڑاپک کا خلاصہ کریں"
       disable: "تمام پوسٹیں دکھائیں"
     deleted_filter:
@@ -1243,6 +1259,9 @@ ur:
       disable: "حذف شدہ پوسٹس کو ظاہر کریں"
     private_message_info:
       title: "پیغام"
+      invite: "دوسروں کو مدعو کریں..."
+      edit: "شامل کریں یا ہٹائیں..."
+      add: "اضافہ کریں..."
       leave_message: "کیا آپ واقعی یہ پیغام بھیجنا چاہتے ہیں؟"
       remove_allowed_user: "کیا آپ واقعی اِس پیغام سے %{name} ہٹانا چاہتے ہیں؟"
       remove_allowed_group: "کیا آپ واقعی اِس پیغام سے %{name} ہٹانا چاہتے ہیں؟"
@@ -1254,8 +1273,8 @@ ur:
     trust_level: "ٹرسٹ لَیول"
     search_hint: "صارف نام، ای میل یا IP ایڈریس"
     create_account:
+      header_title: "خوش آمدید!"
       disclaimer: "رجسٹر کرنے پر آپ <a href='%{privacy_link}' target='blank'>پرائیوِیسی پالیسی</a> اور <a href='%{tos_link}' target='blank'>سروس کی شرائط</a> سے اتفاق کرتے ہیں۔"
-      title: "نیا اکاؤنٹ بنائیں"
       failed: "کچھ غلط ہو گیا، شاید یہ ای میل پہلے ہی سے رجسٹرڈ ہے، پاسورڈ بھول جانے والا لنک اِستعمال کر کے دیکھیں"
     forgot_password:
       title: "پاسورڈ رِی سَیٹ"
@@ -1282,12 +1301,10 @@ ur:
       logging_in_as: '%{email} کے طور پر لاگ اِن'
       confirm_button: لاگ اِن مکمل
     login:
-      title: "لاگ اِن"
       username: "صارف"
       password: "پاسورڈ"
       second_factor_description: "براہ مہربانی اپنی اَیپ میں سے توثیقی کَوڈ درج کریں:"
       second_factor_backup_description: "براہ مہربانی اپنے بیک اپ کوڈز میں سے ایک درج کریں:"
-      email_placeholder: "اِی میل یا صارف نام"
       caps_lock_warning: "کیپس لاک آن ہے"
       error: "نامعلوم خرابی"
       cookies_error: "آپ کے براؤزر پر کُوکِیز غیر فعال لگ رہے ہیں۔ اُن کو فعال کیے بغیر آپ لاگ اِن شائد نہ کر سکیں۔"
@@ -1343,6 +1360,7 @@ ur:
       accept_invite: "دعوت قبول کریں"
       success: "آپ کا اکاؤنٹ بنا دیا گیا ہے اور اب آپ لاگ اِن کر سکتے ہیں۔"
       name_label: "نام"
+      password_label: "پاسورڈ"
       optional_description: "(اختیاری)"
     password_reset:
       continue: "%{site_name} پر جاری رکھیں"
@@ -1382,8 +1400,6 @@ ur:
     date_time_picker:
       from: سے
       to: کیلئے
-      errors:
-        to_before_from: "'کب تک' کی تاریخ 'کب سے' کی تاریخ کے بعد ہونا ضروری ہے۔"
     emoji_picker:
       filter_placeholder: اِیمَوجی تلاش کریں
       smileys_&_emotion: سمائیلیاں اور جذبات
@@ -1405,7 +1421,6 @@ ur:
       default: اپنی مرضی کے اِیمَوجی
     shared_drafts:
       title: "مشترکہ ڈرافٹس"
-      notice: "یہ ٹاپک صرف اُن لوگوں کیلئے نظر آتا ہے جو <b>%{category}</b> زُمرَہ کو دیکھ سکتے ہیں۔"
       destination_category: "مطلوبہ زُمرَہ"
       publish: "مشترکہ ڈرافٹس شائع کریں"
       confirm_publish: "کیا آپ واقعی اِس ڈرافٹ کو شائع کرنا چاہتے ہیں؟"
@@ -1416,7 +1431,6 @@ ur:
       options: "اختیارات"
       whisper: "سرگوشی"
       unlist: "غیر مندرج"
-      blockquote_text: "بلاک متن"
       add_warning: "یہ ایک آفیشل انتباہ ہے۔"
       toggle_whisper: "سرگوشی ٹَوگل کریں"
       toggle_unlisted: "غیر مندرج ٹَوگل کریں"
@@ -1435,10 +1449,7 @@ ur:
       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: "ایک زمرہ کا انتخاب کرنا ضروری ہے"
         topic_template_not_modified: "براہ مہربانی ٹاپک ٹَیمپلیٹ میں ترمیم کرکے اپنے ٹاپک میں تفصیلات اور مخصوصیات شامل کریں۔"
@@ -1467,8 +1478,6 @@ ur:
       saving: "محفوظ کیا جا رہا ہے"
       saved: "محفوظ کر لیا گیا!"
       uploading: "اَپ لوڈ کیا جا رہا ہے..."
-      show_preview: "پیش نظارہ دکھائیں &raquo;"
-      hide_preview: "&laquo; پیش نظارہ چھپائیں"
       quote_post_title: "پوری پوسٹ کا اقتباس کریں"
       bold_label: "B"
       bold_title: "گہرا"
@@ -1480,8 +1489,8 @@ ur:
       link_description: "یہاں لِنک کی تفصیل درج کریں"
       link_dialog_title: "ہائپرلِنک ڈالیں"
       link_optional_text: "اختیاری عنوان"
-      quote_title: "بلاک کوٹ"
-      quote_text: "بلاک کوٹ"
+      blockquote_title: "بلاک متن"
+      blockquote_text: "بلاک متن"
       code_title: "پہلے سے فارمیٹ کیا گیا ٹَیکسٹ"
       code_text: "حاشیہ نے ٹَیکسٹ کو پہلے سے 4 خالی جگہوں سے فارمیٹ کر دیا"
       paste_code_text: "کوڈ یہاں ٹائپ یا پیسٹ کریں"
@@ -1526,10 +1535,10 @@ ur:
           label: "نیا ٹاپک"
         shared_draft:
           label: "مشترکہ ڈرافٹ"
-          desc: "ایک ٹاپک ڈرافٹ کریں جو صرف سٹاف کو نظر آسکے"
         toggle_topic_bump:
           label: "ٹاپک بَمپ ٹَوگل کریں"
           desc: "تازہ ترین جواب کی تاریخ تبدیل کیے بغیر جواب دیں"
+      ignore: "نظر انداز کریں"
     notifications:
       tooltip:
         regular:
@@ -1551,6 +1560,10 @@ ur:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span class='multi-user'>%{username2}، %{username} اور %{count} مزید</span> %{description}"
+        other: "<span class='multi-user'>%{username2}، %{username} اور %{count} مزید</span> %{description}"
       liked_consolidated_description:
         one: "آپ کی %{count} پوسٹس کو لائیک کیا"
         other: "آپ کی %{count} پوسٹس کو لائیک کیا"
@@ -1565,6 +1578,8 @@ ur:
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>نیا ٹاپک</span> %{description}"
       membership_request_accepted: "'%{group_name}' میں رکنیت قبول کر لی گئی"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       group_message_summary:
         one: "آپ کے %{group_name} اِن باکس میں %{count} پیغام"
         other: "آپ کے %{group_name} اِن باکس میں %{count} پیغامات"
@@ -1606,10 +1621,7 @@ ur:
       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: "آپ تصاویر کو ایڈیٹر میں ڈرَیگ & ڈراپ یا پَیسٹ بھی کر سکتے ہیں"
       uploading: "اَپ لوڈ کیا جا رہا ہے"
       select_file: "فائل منتخب کریں"
@@ -1639,6 +1651,7 @@ ur:
       or_search_google: "یا اس کے بجائے گُوگَل کے ساتھ تلاش کرنے کی کوشش کریں:"
       search_google: "اس کے بجائے گُوگَل کے ساتھ تلاش کرنے کی کوشش کریں:"
       search_google_button: "گُوگَل"
+      search_button: "تلاش کریں"
       context:
         user: "@%{username} کے حساب سے پوسٹس تلاش کریں"
         category: "#%{category} زُمرَہ میں تلاش کریں"
@@ -1680,16 +1693,19 @@ ur:
           noreplies: کے صفر جوابات ہوں
           single_user: صرف ایک صارف پر مشتمل ہوں
         post:
+          count:
+            label: پوسٹ
           time:
             label: پوسٹ کیا
             before: سے پہلے
             after: کے بعد
+        views:
+          label: وِیوز
     hamburger_menu: "ایک اور ٹاپک فہرست یا زمرہ پر جائیں"
     new_item: "نیا"
     go_back: "واپس جائیں"
     not_logged_in_user: "موجودہ سرگرمی کے خلاصہ اور ترجیحات کے ساتھ صفحہِ صارف"
     current_user: "اپنے صفحہِ صارف پر جائیں"
-    view_all: "سب دیکھیں"
     topics:
       new_messages_marker: "آخری وزٹ"
       bulk:
@@ -1710,6 +1726,7 @@ ur:
         change_category: "زمرہ تبدیل کریں"
         close_topics: "ٹاپکس بند کریں"
         archive_topics: "ٹاپکس آر کائیو کریں"
+        move_messages_to_inbox: "اِنباکس میں منتقل کریں"
         notification_level: "اطلاعات"
         choose_new_category: "ٹاپکس کیلئے نئے زمرہ کا انتخاب کریں:"
         selected:
@@ -1728,8 +1745,6 @@ ur:
         bookmarks: "ابھی تک آپ کے بُک مارک کیے ہوے کوئی ٹاپک نہیں ہیں۔"
         category: "کوئی %{category} کے ٹاپک موجود نہیں ہیں۔"
         top: "کوئی ٹاپ ٹاپک موجود نہیں ہیں۔"
-        educate:
-          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: "کوئی مزید تازہ ترین ٹاپک موجود نہیں ہیں۔"
         posted: "کوئی مزید پوسٹ کیے گئے ٹاپک موجود نہیں ہیں۔"
@@ -1737,6 +1752,7 @@ ur:
         new: "کوئی مزید نئے ٹاپک موجود نہیں ہیں۔"
         unread: "کوئی مزید بغیر پڑھے ٹاپک موجود نہیں ہیں۔"
         category: "مزید کوئی %{category} کے ٹاپک موجود نہیں۔"
+        tag: "مزید کوئی %{tag} کے ٹاپک موجود نہیں۔"
         top: "مزید کوئی ٹاپ ٹاپک موجود نہیں۔"
         bookmarks: "مزید کوئی بک مارک کیے ہوئے ٹاپک موجود نہیں۔"
     topic:
@@ -1798,12 +1814,14 @@ ur:
       read_more_in_category: "مزید پڑھنا چاہتے ہیں؟ %{catLink} اور %{latestLink} میں دوسرے ٹاپک دیکھیں۔"
       read_more: "مزید پڑھنا چاہتے ہیں؟ %{catLink} یا %{latestLink}۔"
       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 {}}"
       browse_all_categories: تمام زمرہ جات براؤز کریں
       view_latest_topics: تازہ ترین ٹاپک دیکھیے
       jump_reply_up: اِس سے پرانے جواب پر جائیں
       jump_reply_down: اِس سے نئے جواب پر جائیں
       deleted: "ٹاپک حذف کردیا گیا ہے"
+      slow_mode_update:
+        save: "فعال کریں"
+        remove: "غیر فعال کریں"
       topic_status_update:
         title: "ٹاپک ٹائمر"
         save: "ٹائمر مقرر کریں"
@@ -1811,7 +1829,7 @@ ur:
         remove: "ٹائمر ہٹائیں"
         publish_to: "شائع کریں:"
         when: "کب:"
-        time_frame_required: براہ کرم ایک ٹائم فریم منتخب کریں
+        time_frame_required: "براہ کرم ایک ٹائم فریم منتخب کریں"
       auto_update_input:
         none: "ایک ٹائم فریم منتخب کریں"
         later_today: "آج بعد میں"
@@ -1819,13 +1837,7 @@ ur:
         later_this_week: "اِس ہفتے بعد میں"
         this_weekend: "اِس ہفتےکےآخر میں"
         next_week: "اگلے ہفتے"
-        two_weeks: "دو ہفتے"
         next_month: "اگلے ماہ"
-        two_months: "دو مہینے"
-        three_months: "تین مہینے"
-        four_months: "چار مہینے"
-        six_months: "چھ مہینے"
-        one_year: "ایک سال"
         forever: "ہمیشہ کیلئے"
         pick_date_and_time: "تاریخ اور وقت منتخب کریں"
         set_based_on_last_post: "آخری پوسٹ کی بنیاد پر بند کریں"
@@ -1839,7 +1851,6 @@ ur:
         title: "عارضی طور پر بند کریں"
       auto_close:
         title: "خود کار طریقے سے ٹاپک بند کریں"
-        label: "خود کار طریقے سے ٹاپک بند کرنے کے گھنٹے:"
         error: "براہ کرم، ایک قابلِ قبول قدر درج کریں۔"
         based_on_last_post: "بند نہ کریں جب تک ٹاپک کی آخری پوسٹ کم از کم اتنی پرانی نہ ہو۔"
       auto_delete:
@@ -1852,7 +1863,7 @@ ur:
         auto_open: "یہ ٹاپک خود کار طریقے سے کھول دیا جائے گا %{timeLeft}۔"
         auto_close: "یہ ٹاپک خود کار طریقے سے بند کر دیا جائے گا %{timeLeft}۔"
         auto_publish_to_category: "یہ ٹاپک <a href=%{categoryUrl}>#%{categoryName}</a> میں شائع کر دیا جائے گا %{timeLeft}۔"
-        auto_close_based_on_last_post: "یہ ٹاپک آخری جواب کے %{duration} بعد بند ہو جائے گا۔"
+        auto_close_after_last_post: "یہ ٹاپک آخری جواب کے %{duration} بعد بند ہو جائے گا۔"
         auto_delete: "یہ ٹاپک خود کار طریقے سے حذف کر دیا جائے گا %{timeLeft}۔"
         auto_bump: "یہ ٹاپک خود کار طریقے سے بَمپ کر دیا جائے گا %{timeLeft}۔"
         auto_reminder: "آپ کو اس ٹاپک کے بارے میں یاد دہانی کرائی جائے گا %{timeLeft}۔"
@@ -1871,7 +1882,6 @@ ur:
         go: "جائیں"
         jump_bottom: "آخری پوسٹ پر جائیں"
         jump_prompt: "پر جائیں..."
-        jump_prompt_of: "%{count} پوسٹس کے"
         jump_prompt_long: "پر جائیں..."
         jump_bottom_with_number: "پوسٹ %{post_number} پر جائیں"
         jump_prompt_to_date: "اِس تاریخ تک"
@@ -1955,6 +1965,7 @@ ur:
         title: "شیئر"
         extended_title: "لِنک شیئر کریں"
         help: "اِس ٹاپک کا لنک شئیر کریں"
+        invite_users: "دعوت دیں"
       print:
         title: "پرنٹ"
         help: "اس ٹاپک کا \"پرنٹر فرینڈلی\" ورژن کھولیں"
@@ -2006,14 +2017,13 @@ ur:
         username_placeholder: "صارف نام"
         action: "دعوت بھیجیں"
         help: "اِی میل یا اطلاعات کے ذریعے اس ٹاپک کے لیے دوسروں کو مدعو کریں"
-        to_forum: "ہم آپ کے دوست کو ایک مختصر ای میل بھیجیں گے تاکہ وہ ایک لنک پر کلک کر کہ فوری طور پر شامل ہو سکے، لاگ اِن کی ضرورت بھی نہیں۔"
-        sso_enabled: "اُس شخص کا صارف نام درج کریں جسے آپ اِس ٹاپک میں مدعو کرنا چاہتے ہیں۔"
+        discourse_connect_enabled: "اُس شخص کا صارف نام درج کریں جسے آپ اِس ٹاپک میں مدعو کرنا چاہتے ہیں۔"
         to_topic_blank: "اُس شخص کا صارف نام یا اِیمیل ایڈریس درج کریں جسے آپ اِس ٹاپک میں مدعو کرنا چاہتے ہیں۔"
         to_topic_email: "آپ نے ایک اِیمیل ایڈریس درج کیا ہے۔ ہم ایک دعوت نامہ اِیمیل کریں گے جس سے آپ کے دوست کو فوری طور پر اِس ٹاپک پر جواب دینے کی اجازت مل جائے گی۔"
         to_topic_username: "آپ نے ایک صارف نام درج کیا ہے۔ ہم اِطلاع کے طور پر اُنہیں ایک لنک بھیجیں گے جس میں اِس ٹاپک کیلئے اُنہیں مدعو کیا جائے گا۔"
         to_username: "اُس شخص کا صارف نام درج کریں جسے آپ اِس ٹاپک میں مدعو کرنا چاہتے ہیں۔ ہم اِطلاع کے طور پر اُنہیں ایک لِنک بھیجیں گے جس میں اِس ٹاپک کیلئے اُنہیں مدعو کیا جائے گا۔"
         email_placeholder: "name@example.com"
-        success_email: "ہم نے <b>%{emailOrUsername}</b> کو ایک دعوت نامہ اِیمیل کیا ہے۔ جب دعوت نامہ اِستعمال ہو گا تو ہم آپ کو مطلع کریں گے۔ اپنی دعوتوں کا ٹریک رکھنے کیلئے اپنے صارف صفحہ پر دعوت ناموں والی ٹیب چیک کریں۔"
+        success_email: "ہم نے <b>%{invitee}</b> کو ایک دعوت نامہ اِیمیل کیا ہے۔ جب دعوت نامہ اِستعمال ہو گا تو ہم آپ کو مطلع کریں گے۔ اپنی دعوتوں کا ٹریک رکھنے کیلئے اپنے صارف صفحہ پر دعوت ناموں والی ٹیب چیک کریں۔"
         success_username: "ہم نے اِس ٹاپک میں حصہ لینے کے لئے اُس صارف کو مدعو کیا ہے۔"
         error: "معزرت، ہم اس شخص کو دعوت نہ دے سکے۔ شاید وہ پہلے ہی مدعو کیے جا چکے ہیں؟ (دعوتیں شرح محدود ہیں)"
         success_existing_email: "آیک صارف <b>%{emailOrUsername}</b> والے ای میل کے ساتھ پہلے ہی موجود ہے۔ ہم نے اِس ٹاپک میں حصہ لینے کے لئے اُس صارف کو مدعو کر دیا ہے۔"
@@ -2108,11 +2118,10 @@ ur:
         other: "(مصنف نے ٹاپک واپس لے لیا، %{count} گھنٹوں میں یہ خود کار طریقے سے حذف کر دیا جائے گا الا یہ کہ اِسے فلیگ کیا گیا ہو)"
     post:
       quote_reply: "اقتباس کریں"
+      quote_share: "شیئر"
       edit_reason: "وجہ:"
       post_number: "پوسٹ %{number}"
       ignored: "نظر انداز کردہ مواد"
-      wiki_last_edited_on: "وِکی کو آخری بار ترمیم کیا گیا"
-      last_edited_on: "پوسٹ کو آخری بار ترمیم کیا گیا"
       reply_as_new_topic: "منسلک ٹاپک کے طور پر جواب دیں"
       reply_as_new_private_message: "اُنہی وصول کنندگان کو نئے پیغام کے طور پر جواب دیں"
       continue_discussion: "%{postLink} سے بحث جاری:"
@@ -2152,14 +2161,8 @@ ur:
         image_upload_not_allowed_for_new_user: "معذرت، نئے صارفین تصاویر اَپ لوڈ نہیں کر سکتے۔"
         attachment_upload_not_allowed_for_new_user: "معذرت، نئے صارفین اٹیچمنٹس اَپ لوڈ نہیں کر سکتے۔"
         attachment_download_requires_login: "معذرت، اٹیچمنٹس ڈائونلوڈ کرنے کیلیے آپ کا لاگ اِن ہونا ضروری ہے۔"
-      abandon_edit:
-        no_value: "نہیں، رکھیں"
-        no_save_draft: "نہیں، ڈرافٹ محفوظ کریں"
-      abandon:
-        confirm: "کیا آپ واقعی اپنی پوسٹ کو تَرک کرنا چاہتے ہیں؟"
-        no_value: "نہیں، رکھیں"
-        no_save_draft: "نہیں، ڈرافٹ محفوظ کریں"
-        yes_value: "جی ہاں، تَرک کریں"
+      cancel_composer:
+        discard: "منسوخ"
       via_email: "یہ پوسٹ بذریعہ اِی میل پہنچی"
       via_auto_generated_email: "یہ پوسٹ ایک خود کار طریقے سے تخلیق کردہ اِی میل کے ذریعے پہنچی"
       whisper: "یہ پوسٹ ماڈریٹرز کے لئے ایک نجی وِھسپر ہے"
@@ -2211,6 +2214,9 @@ ur:
         remove_timer: "ٹائمر ہٹائیں"
       actions:
         people:
+          like:
+            one: "اِس کو لائیک کیا"
+            other: "اِس کو لائیک کیا"
           like_capped:
             one: "اور %{count} دوسرے شخص نے اِس کو لائیک کیا"
             other: "اور %{count} دوسرے لوگوں نے اِس کو لائیک کیا"
@@ -2306,6 +2312,11 @@ ur:
       change_in_category_topic: "تفصیل ترمیم کریں"
       already_used: "یہ رنگ دوسرے زمرہ کیلیے استعمال ہو چکا ہے۔"
       security: "سیکورٹی"
+      permissions:
+        group: "گروپ"
+        see: "ملاحظہ کریں"
+        reply: "جواب"
+        create: "بنائیں"
       special_warning: "انتباہ: یہ زمرہ ایک پہلے سے بنایا ہوا زمرہ ہے اور اِس کی سیکورٹی سیٹِنگ میں ترمیم نہیں کی جا سکتی۔ اگر آپ اِس زمرہ کو استعمال کرنے کی خواہش نہیں رکھتے، تو اِسے کسی اور حوالے سے استعمال کرنے کی بجائے، حذف کردیں۔"
       uncategorized_security_warning: "یہ زمرہ خاص ہے۔ اِس کا مقصد بغیر زمرہ والے ٹاپکس کیلئے جگہ فراہم کرنا ہے؛ اِس میں سیکورٹی کی ترتیبات نہیں ہو سکتیں۔"
       uncategorized_general_warning: 'یہ زمرہ خاص ہے۔ یہ نئے ٹاپکس جن کیلئے کسی زمرہ کا انتخاب نہ ہوا ہو، اُن کیلئے پہلے سے طے شدہ زمرہ کے طور پر استعمال ہوتا ہے۔ اگر آپ اِس رویے کو روکنے اور کسی زمرہ کے انتخاب کو لازمی کرنا چاہتے ہیں، تو <a href="%{settingLink}">برائے مہربانی یہاں ترتیب کو غیر فعال کریں</a>۔ اگر آپ نام یا تفصیل تبدیل کرنا چاہتے ہیں، تو <a href="%{customizeLink}">مرضی کے مطابق / ٹَیکسٹ متن</a> پر جائیں۔'
@@ -2341,19 +2352,16 @@ ur:
       notifications:
         watching:
           title: "نظر رکھی ہوئی ہے"
-          description: "آپ خود کار طریقے سے اِن زمرہ جات میں موجود تمام ٹاپکس کو دیکھیں گے۔ تمام ٹاپکس میں ہر نئی پوسٹ کے بارے میں آپ کو مطلع کیا جائے گا، اور نئے جوابات کی گنتی دیکھائی جائے گی۔"
         watching_first_post:
           title: "پہلی پوسٹ پر نظر رکھی ہوئی ہے"
           description: "آپ کو اِس زمرہ میں نئے ٹاپکس کے بارے میں مطلع کیا جائے گا لیکن ٹاپکس کے جوابات پر نہیں۔"
         tracking:
           title: "ٹریک کیا جا رہا"
-          description: "آپ خود کار طریقے سے اِن زمرہ جات میں موجود تمام ٹاپکس کو ٹریک کریں گے۔ اگر کوئی آپ کا @نام زکر کرتا ہے یا کوئی جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا، اور نئے جوابات کی گنتی دیکھائی جائے گی۔"
         regular:
           title: "عمومی"
           description: "اگر کوئی آپ کا @نام زکر کرتا ہے یا کوئی جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا۔"
         muted:
           title: "خاموش کِیا ہوا"
-          description: "آپ کو اِن زمرہ جات میں موجود نئے ٹاپکس کی کسی بھی چیز کے بارے میں کبھی بھی مطلع نہیں کیا جائے گا، اور یہ تازہ ترین میں بھی نظر نہیں آئیں گے۔"
       search_priority:
         label: "سرچ ترجیحات"
         options:
@@ -2388,10 +2396,17 @@ ur:
     flagging:
       title: "ہماری کمیونٹی کو مہذب رکھنے کے لئے مدد کا شکریہ!"
       action: "پوسٹ فلَیگ کریں"
+      take_action_options:
+        default:
+          title: "کارروائی کریں"
+          details: "بجائے مزید کمیونٹی کی طرف سے فلَیگز کا انتظارکرنے کے، فوری طور پرفلَیگز کی حد تک پہنچ جائیں"
+        suspend:
+          title: "صارف معطل کریں"
+        silence:
+          title: "صارف خاموش کریں"
       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> ٹاپکس}} حذف کرنے، اُن کا اکائونٹ ختم کرنے، ان کے آئی پی ایڈریس <b>{ip_address}</b> سے سائن اَپ بلاک کرنے، اور اُن کے اِیمیل ایڈریس کو <b>{email}</b> مستقل بلاک کی فہرست میں ڈالنے لگے ہیں۔ کیا آپ کو یقین ہے کہ یہ صارف واقعی ایک سپیمر ہے؟"
       yes_delete_spammer: "جی ہاں، سپیم کرنے والے کو حذف کریں"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(مخفی)"
@@ -2458,12 +2473,6 @@ ur:
         title: "یہ ٹاپک ایک ذاتی پیغام ہے"
         help: "یہ ٹاپک ایک ذاتی پیغام ہے"
     posts: "پوسٹس"
-    posts_likes_MF: |
-      اِس ٹاپک {count, plural, one {کا 1 جواب} other {کے # جوابات ہیں}} {ratio, select,
-      low {لائیک پر پوسٹ کے اونچے تناسب کے ساتھ}
-      med {لائیک پر پوسٹ کے بہت اونچے تناسب کے ساتھ}
-      high {لائیک پر پوسٹ کے انتہائی اونچے تناسب کے ساتھ}
-      other {}}
     original_post: "اصل پوسٹ"
     views: "وِیوز"
     views_lowercase:
@@ -2483,7 +2492,6 @@ ur:
       one: "صارف"
       other: "صارفین"
     category_title: "زمرہ"
-    history: "ہسٹری"
     changed_by: "%{author} کی طرف سے"
     raw_email:
       title: "آنے والی اِیمیل"
@@ -2754,6 +2762,10 @@ ur:
       dismiss: "بر خاست کریں"
     safe_mode:
       enabled: "سیف موڈ فعال ہے، سیف موڈ سے باہر نکلنے کے لئے اِس براؤزر وِنڈو کو بند کریں"
+    do_not_disturb:
+      remaining: "%{remaining} باقی رہتا ہے..."
+      options:
+        custom: "اپنی مرضی کا"
   admin_js:
     type_to_filter: "فِلٹر کرنے کے لئے ٹائپ کریں..."
     admin:
@@ -2781,6 +2793,8 @@ ur:
         installed_version: "انسٹال کیا ہوا"
         latest_version: "تازہ ترین"
         problems_found: "آپ کی موجودہ سائٹ ترتیبات کے مطابق کچھ مشورے"
+        new_features:
+          dismiss: "بر خاست کریں"
         last_checked: "آخری دفعہ چیک کیا گیا"
         refresh_problems: "رِیفریش"
         no_problems: "کوئی مسائل نہیں پائے گئے۔"
@@ -2833,6 +2847,9 @@ ur:
           view_table: "ٹیبل"
           view_graph: "گراف"
           refresh_report: "رپورٹ رِیفریش کریں"
+          daily: روزانہ
+          monthly: ماہانہ
+          weekly: ہفتہ وار
           groups: "تمام گروپس"
           disabled: "یہ رپورٹ غیر فعال ہے"
           totals_for_sample: "نمونہ کیلئے کل"
@@ -2863,10 +2880,6 @@ ur:
             available: "گروپ کا نام دستیاب ہے"
             not_available: "گروپ کا نام دستیاب نہیں ہے"
             blank: "گروپ کا نام خالی نہیں ہو سکتا"
-        bulk_add:
-          title: "گروپ میں کئی شامل کریں"
-          complete_users_not_added: "یہ صارفین شامل نہیں ہو سکے (اس بات کو یقینی بنائیں کہ ان کا اکاؤنٹ موجود ہے):"
-          paste: "صارف ناموں اور یا اِیمیلز کی فہرست پَیسٹ کریں، فی سطر ایک:"
         add_members:
           as_owner: "صارف(ین) کو اِس گروپ کے مالک(ین) کے طور پر مقرر کریں"
         manage:
@@ -2925,6 +2938,8 @@ ur:
         description: تفصیل
         save: محفوظ کریں
         continue: جاری رکھی
+        scopes:
+          action: عمل
       web_hooks:
         title: "وَیب ھُوک٘س٘"
         none: "اِس وقت کوئی وَیب ھُوک٘س٘ نہیں ہیں۔"
@@ -2939,7 +2954,6 @@ ur:
         go_back: "واپس فہرست پر"
         payload_url: "پَیلوڈ یو.آر.ایل."
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "ایسا لگتا ہے کہ آپ وَیب ھُوک٘ کو ایک مقامی یو.آر.ایل. پر قائم کرنے کی کوشش کر رہے ہیں۔ ایک لوکَل ایڈریس پر واقعہ پہنچانے پر ضمنی اثرات یا غیر متوقع طرزِِ عمل پیش آسکتا ہے۔ جاری رکھیں؟"
         secret_invalid: "سیکرٹ میں کوئی بھی خالی حروف نہ ہونا ضروری ہے۔"
         secret_too_short: "سیکرٹس کا کم از کم 12 حروف پر مشتمل ہونا ضروری ہے۔"
         secret_placeholder: "ایک اختیاری سٹرنگ، سِگنَیچر تخلیق کرنے کیلئے استعمال کیا جاتا ہے"
@@ -2967,7 +2981,6 @@ ur:
           details: "جب ایک نیا جواب، ترمیم، حذف یا رِِیکور کیا جائے۔"
         user_event:
           name: "صارف واقعہ"
-          details: "جب ایک صارف لاگ اِن، لاگ آؤٹ، بنایا، منظور یا اَپ ڈیٹ کیا جاتا ہے۔"
         group_event:
           name: "گروپ واقعہ"
           details: "جب ایک گروپ بنایا، اَپ ڈیٹ یا ختم کیا جاتا ہے۔"
@@ -3251,7 +3264,7 @@ ur:
             text: "</head>"
             title: "HTML جو </head> ٹیگ سے پہلے داخل کی جائے گی"
           body_tag:
-            text: "</body>"
+            text: "</‎body>"
             title: "HTML جو </body> ٹیگ سے پہلے داخل کی جائے گی"
           yaml:
             text: "YAML"
@@ -3544,30 +3557,20 @@ ur:
         title: "نظر رکھے ہوئے الفاظ"
         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}الفاظ "
         actions:
           block: "بلاک کریں"
           censor: "سَینسَر"
           require_approval: "منظوری کی ضرورت ہے"
           flag: "فلَیگ"
+          replace: "بدلیں"
         action_descriptions:
           block: "اِن الفاظ پر مشتمل پوسٹس شائع ہونے سے روکیں۔ جب صارف اپنی پوسٹ شائع کرنے کی کوشش کرے گا تو اُسے ایک خرابی کا پیغام دکھایا جائے گا۔"
           censor: "اِن الفاظ پر مشتمل پوسٹس کوشائع ہونے دیں، لیکن سینسر کیے گئے الفاظ کو چھپانے والے حروف کے ساتھ تبدیل کریں۔"
           require_approval: "اِن الفاظ پر مشتمل پوسٹس کے نظر آنے سے پہلے اسٹاف کی طرف سے منظوری کی ضرورت ہوگی۔"
           flag: "اِن الفاظ پر مشتمل پوسٹس کوشائع ہونے دیں، لیکن ان کو غیر مناسب کے طور پر فلَیگ کریں تاکہ منتظمین ان کا جائزہ لے سکیں۔"
         form:
-          label: "نیا لفظ:"
-          placeholder: "مکمل لفظ یا * وائلڈ کارڈ کے طور پر"
           placeholder_regexp: "رَیگولر اَیکسپرَیشَن"
           add: "شامل کریں"
           success: "کامیابی"
@@ -3621,6 +3624,8 @@ ur:
         check_email:
           title: "اِس صارف کا اِیمیل ایڈریس ظاہر کریں"
           text: "دکھائیں"
+        check_sso:
+          text: "دکھائیں"
       user:
         suspend_failed: "اِس صارف کو معطل کرتے ہوے کچھ غلط ہو گیا %{error}"
         unsuspend_failed: "اِس صارف کی معطلی ختم کرتے ہوے کچھ غلط ہو گیا %{error}"
@@ -3628,6 +3633,7 @@ ur:
         suspend_reason_label: "آپ معطل کیوں کر رہے ہیں؟ یہ ٹَیکسٹ اِس صارف کے پروفائل پیج پر <b>ہر کسی کے لیے ظاہر ہو گا</b>، اور جب صارف لاگ اِن کرنے کی کوشش کریں گے تو اُنہیں دکھایا جائے گا۔ اِسے مختصر رکھیں۔"
         suspend_reason_hidden_label: "آپ کیوں معطل کر رہے ہیں؟ صارف جب لاگ اِن کرنے کی کوشش کرے گا تو اُسے یہ ٹیکسٹ دکھایا جائے گا۔ اِسے مختصر رکھیں۔"
         suspend_reason: "وجہ"
+        suspend_reason_title: "وجہ معطلی"
         suspend_message: "اِی مَیل پیغام"
         suspend_message_placeholder: "اختیاریطور پر معطلی کے بارے میں مزید معلومات فراہم کریں اور یہ صارف کو ای میل کر دی جائیں گی۔"
         suspended_by: "کی طرف سے معطل کیا گیا"
@@ -3653,7 +3659,6 @@ ur:
         clear_penalty_history:
           title: "سزا ہِسٹری صاف کریں"
           description: "سزاوں والے صارفین TL3 تک نہیں پہنچ سکتے"
-        delete_all_posts_confirm_MF: "آپ {POSTS, plural, one {1 پوسٹ} other {# پوسٹس}} and {TOPICS, plural, one {1 ٹاپک} other {# ٹاپکس}} حذف کرنے والے ہیں۔ کیا آپ کو یقین ہے؟"
         silence: "خاموش کریں"
         unsilence: "خاموشی ختم کریں"
         silenced: "خاموش کیا ہوا؟"
@@ -3784,8 +3789,7 @@ ur:
           on_grace_period: "فی الحال ترقی کے رعایتی مدت میں، تنزلی نہیں کی جائے گی۔"
           locked_will_not_be_promoted: "ٹرسٹ کی سطح مقفل۔ کبھی بھی ترقی نہیں دی جائے گی۔"
           locked_will_not_be_demoted: "ٹرسٹ کی سطح مقفل۔ کبھی بھی تنزلی نہیں کی جائے گی۔"
-        sso:
-          title: "انفرادی سائن آن"
+        discourse_connect:
           external_id: "بیرونی آئی ڈی"
           external_username: "صارف کا نام"
           external_name: "نام"
@@ -3926,7 +3930,6 @@ ur:
         icon: آئیکن
         image: تصویر
         icon_help: "ایک فونٹ اَوسم آئیکن کا نام درج کریں (عام آئیکنز کیلئے 'far-' سابقہ اور برانڈ آئیکنز کیلئے 'fab-' سابقہ استعمال کریں)"
-        image_help: "تصویر کا یو آر ایل درج کریں (آئیکن فیلڈ کی جگے لے لیگا اگر دونوں سیٹ کیے ہوں)"
         query: بَیج قُوَیری (SQL)
         target_posts: ھدف پوسٹس کو قُوَیری کریں
         auto_revoke: روزانہ رَیوَوکَیشَن قُوَیری چلائیں
@@ -3988,6 +3991,9 @@ ur:
         embed_post_limit: "پعسٹس اَیمبَیڈ کرنے کی زیادہ سے زیادہ تعداد۔"
         embed_title_scrubber: "پوسٹس کے عنوان صاف کرنے کیلئے استعمال ہونے والا رَیگولَر اَیکسپرَیشن"
         embed_truncate: "اَیمبَیڈ کی گئی پوسٹس کو تراشیں"
+        allowed_embed_selectors: "عناصر کیلئے CSS سلیکٹر جن کی اَیمبَیڈ میں اجازت ہے"
+        blocked_embed_selectors: "عناصر کیلئے CSS سلیکٹر جن کو اَیمبَیڈ سے ہٹایا گیا ہے"
+        allowed_embed_classnames: "اجازت یافتہ CSS کلاسوں کے نام"
         save: "اَیمبَیڈ کرنے کی سیٹِنگ محفوظ کریں"
       permalink:
         title: "دائمی لِنکس"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index e4e5cbea3c..7384f9b1eb 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -136,6 +136,8 @@ vi:
     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."
+    software_update_prompt:
+      dismiss: "Hủy bỏ"
     bootstrap_mode_enabled:
       other: "Để đơn giản hoá quá trình triển khai trang web, bạn đang ở trong chế độ bootstrap. Mọi người dùng mới đều có mức độ tin cậy 1 và sẽ nhận được email cập nhật thông tin mỗi ngày. Chế độ này sẽ tự động tắt khi số người dùng vượt qua %{count}"
     bootstrap_mode_disabled: "Chế độ bootstrap sẽ bị vô hiệu trong 24 giờ tới."
@@ -197,6 +199,8 @@ vi:
     now: "ngay lúc này"
     read_more: "đọc thêm"
     more: "Nhiều hơn"
+    x_more:
+      other: "%{count} Thêm"
     less: "Ít hơn"
     never: "không bao giờ"
     every_30_minutes: "mỗi 30 phút"
@@ -224,8 +228,6 @@ vi:
       moderators: "Điều hành viên"
       stat:
         all_time: "Từ trước tới nay"
-        last_7_days: "7 ngày gần nhất"
-        last_30_days: "30 ngày gần nhất"
       like_count: "Lượt thích"
       topic_count: "Các chủ đề"
       post_count: "Các bài viết"
@@ -261,18 +263,6 @@ vi:
       search_placeholder: "Tìm kiếm dấu trang theo tên, tiêu đề chủ đề hoặc nội dung bài đăng"
       search: "Tìm kiếm"
       reminders:
-        later_today: "Sau ngày hôm nay"
-        next_business_day: "Ngày làm việc tiếp theo"
-        tomorrow: "Ngày mai"
-        next_week: "Tuần tới"
-        post_local_date: "Ngày trong bài"
-        later_this_week: "Cuối tuần này"
-        start_of_next_business_week: "Thứ hai"
-        start_of_next_business_week_alt: "Thứ hai tới"
-        next_month: "Tháng t"
-        custom: "Ngày giờ tùy chỉnh"
-        last_custom: "Cuối cùng"
-        none: "Không cần nhắc nhở"
         today_with_time: "hôm nay lúc %{time}"
         tomorrow_with_time: "ngày mai lúc %{time}"
         at_time: "lúc %{date_time}"
@@ -287,9 +277,7 @@ vi:
       new_private_message: "Tin nhắn nháp mới"
       topic_reply: "Trả lời nháp"
       abandon:
-        confirm: "Bạn đã tạo một bản nháp trong chủ đề này. Bạn có chắc muốn từ bỏ nó?"
-        yes_value: "Đồng ý, bỏ"
-        no_value: "Không, giữ lại"
+        yes_value: "Hủy bỏ"
     topic_count_latest:
       other: "Xem %{count} chủ đề mới hoặc được cập nhật"
     topic_count_unread:
@@ -382,6 +370,7 @@ vi:
       topic: "Chủ đề:"
       filtered_topic: "Bạn đã lọc đến nội dung có thể xem lại trong một chủ đề."
       filtered_user: "Người dùng"
+      filtered_reviewed_by: "Xét bởi"
       show_all_topics: "hiển thị toàn bộ chủ đề"
       deleted_post: "(bài viết đã bị xóa)"
       deleted_user: "(người dùng đã bị xóa)"
@@ -392,9 +381,8 @@ vi:
         email: "Email"
         name: "Tên"
         fields: "Trường tùy biến"
+        reject_reason: "Lý do"
       user_percentage:
-        summary:
-          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} tổng cộng gắn cờ)"
         agreed:
           other: "%{count}đồng ý"
         disagreed:
@@ -432,7 +420,8 @@ vi:
           created_at_asc: "Tạo tại (đảo ngược)"
         priority:
           title: "Ưu tiên tối thiểu"
-          low: "(bất kỳ)"
+          any: "(bất kỳ)"
+          low: "Thấp"
           medium: "Trung bình"
           high: "Cao"
       conversation:
@@ -470,6 +459,8 @@ vi:
           title: "Bài viết được xếp lịch"
         reviewable_user:
           title: "Người dùng"
+        reviewable_post:
+          title: "Bài viết"
       approval:
         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."
@@ -477,6 +468,24 @@ vi:
           other: "Bạn có <strong>%{count}</strong> bài viết đang chờ."
         ok: "OK"
       example_username: "tên người dùng"
+    relative_time_picker:
+      minutes:
+        other: "phút"
+      hours:
+        other: "giờ"
+      days:
+        other: "ngày"
+    time_shortcut:
+      later_today: "Sau ngày hôm nay"
+      next_business_day: "Ngày làm việc tiếp theo"
+      tomorrow: "Ngày mai"
+      next_week: "Tuần tới"
+      post_local_date: "Ngày trong bài"
+      later_this_week: "Cuối tuần này"
+      start_of_next_business_week: "Thứ hai"
+      start_of_next_business_week_alt: "Thứ hai tới"
+      next_month: "Tháng t"
+      custom: "Ngày giờ tùy chỉnh"
     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>"
@@ -562,6 +571,8 @@ vi:
             imap_ssl: "Sử dụng SSL cho IMAP"
             username: "Tên đăng nhập"
             password: "Mật khẩu"
+          settings:
+            title: "Xác lập"
           mailboxes:
             synchronized: "Hộp thư được đồng bộ hóa"
             none_found: "Không tìm thấy hộp thư nào trong tài khoản email này."
@@ -734,12 +745,14 @@ vi:
       posts: "Bài viết"
       topics: "Chủ đề"
       latest: "Mới nhất"
-      latest_by: "mới nhất bởi"
       toggle_ordering: "chuyển lệnh kiểm soát"
       subcategories: "Phân loại phụ"
       muted: "Các danh mục bị ẩn"
       topic_sentence:
         other: "%{count} chủ đề"
+      topic_stat_unit:
+        week: "tuần"
+        month: "tháng"
       topic_stat_sentence_week:
         other: "%{count}chủ đề mới trong tuần qua."
       topic_stat_sentence_month:
@@ -798,7 +811,12 @@ vi:
         mute_option_title: "Bạn sẽ không nhận được bất kỳ thông báo nào liên quan đến người dùng này."
         normal_option: "Bình thường"
         normal_option_title: "Bạn sẽ được thông báo nếu người dùng này trả lời bạn, trích dẫn bạn hoặc đề cập đến bạn."
+      notification_schedule:
+        none: "Không có gì"
+        monday: "Thứ hai"
+        to: "tới"
       activity_stream: "Hoạt động"
+      read: "Đã đọc"
       preferences: "Tùy chỉnh"
       feature_topic_on_profile:
         open_search: "Chọn chủ đề mới"
@@ -827,7 +845,7 @@ vi:
         perm_denied_expl: "Bạn đã từ chối nhận thông báo, để nhận lại bạn cần thiết lập trình duyệt."
         disable: "Khóa Notification"
         enable: "Cho phép Notification"
-        each_browser_note: "Lưu ý: Bạn phải thay đổi trong cấu hình mỗi trình duyệt bạn sử dụng."
+        each_browser_note: 'Lưu ý: Bạn phải thay đổi cài đặt này trên mọi trình duyệt bạn sử dụng. Tất cả thông báo sẽ bị tắt khi ở chế độ "không làm phiền", bất kể cài đặt này là gì.'
         consent_prompt: "Bạn có muốn thông báo trực tiếp khi mọi người trả lời bài đăng của bạn không?"
       dismiss: "Hủy bỏ"
       dismiss_notifications: "Bỏ qua tất cả"
@@ -842,7 +860,6 @@ vi:
       color_scheme_default_on_all_devices: "Đặt (các) bảng màu mặc định trên tất cả các thiết bị của tôi"
       color_scheme: "Sơ đồ màu"
       color_schemes:
-        default_description: "Mặc định"
         disable_dark_scheme: "Giống như thông thường"
         dark_instructions: "Bạn có thể xem trước bảng màu ở chế độ tối bằng cách chuyển sang chế độ tối của thiết bị."
         undo: "Cài lại"
@@ -948,6 +965,7 @@ vi:
         tags: "Thẻ"
       preferences_nav:
         account: "Tài khoản"
+        security: "Bảo mật"
         profile: "Hồ sơ"
         emails: "Email"
         notifications: "Thông báo"
@@ -1079,7 +1097,6 @@ vi:
         set_primary: "Đặt email chính"
         destroy: "Xóa email"
         add_email: "Thêm email thay thế"
-        sso_override_instructions: "Email có thể được cập nhật từ nhà cung cấp SSO."
         no_secondary: "Không có email thứ hai"
         instructions: "Không hiển thị công cộng"
         admin_note: "Lưu ý: Quản trị viên thay đổi email của người không phải là quản trị viên tức là người dùng đã mất quyền truy cập vào tài khoản email ban đầu của họ, do đó, email đặt lại mật khẩu sẽ được gửi đến địa chỉ mới của họ. Email của người dùng sẽ không thay đổi cho đến khi họ hoàn tất quá trình đặt lại mật khẩu."
@@ -1215,45 +1232,37 @@ vi:
         after_10_minutes: "sau 10 phút"
       notification_level_when_replying: "Khi tôi đăng một chủ đề, hãy đặt chủ đề đó thành"
       invited:
-        search: "gõ để tìm kiếm thư mời "
         title: "Lời mời"
+        pending_tab: "Đang treo"
+        pending_tab_with_count: "Đang xử lý (%{count})"
+        redeemed_tab: "Làm lại"
+        redeemed_tab_with_count: "Làm lại (%{count})"
+        invited_via: "Lời mời"
+        groups: "Nhóm"
+        topic: "Chủ đề"
+        expires_at: "Hết hạn"
+        edit: "Sửa"
+        remove: "Xoá"
+        reinvited: "Gửi lại lời mời"
+        search: "gõ để tìm kiếm thư mời "
         user: "User được mời"
-        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"
         redeemed: "Lời mời bù lại"
-        redeemed_tab: "Làm lại"
-        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})"
         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."
-        rescind: "Xoá"
-        rescinded: "Lời mời bị xóa"
-        rescind_all: "Xóa lời mời đã hết hạn"
-        rescinded_all: "Tất cả lời mời đã hết hạn đã bị xóa!"
-        rescind_all_confirm: "Bạn có chắc chắn muốn xóa tất cả các lời mời đã hết hạn không?"
-        reinvite: "Mời lại"
-        reinvite_all: "Gửi lại tất cả lời mời"
+        remove_all: "Xóa lời mời đã hết hạn"
+        removed_all: "Tất cả lời mời đã hết hạn đã bị xóa!"
+        remove_all_confirm: "Bạn có chắc chắn muốn xóa tất cả các lời mời đã hết hạn không?"
         reinvite_all_confirm: "Bạn có chắc chắn gửi lại tất cả các lời mời?"
-        reinvited: "Gửi lại lời mời"
-        reinvited_all: "Tất cả lời mời đã được gửi lại"
         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"
-        source: "Được mời Qua"
-        links_tab: "Liên kết"
-        links_tab_with_count: "Liên kết (%{count})"
-        link_url: "Liên kết"
-        link_created_at: "Tạo bởi"
-        link_redemption_stats: "Đổi thưởng"
-        link_groups: Nhóm
-        link_expires_at: Hết hạn
-        copy_link: "Hiển thị liên kết"
+        create: "Mời"
         generate_link: "Tạo liên kết mời"
         link_generated: "Đây là liên kết mời của bạn!"
         valid_for: "Link mời chỉ có hiệu lực với địa chỉ email: %{email}"
@@ -1268,9 +1277,7 @@ vi:
         bulk_invite:
           none: "Không có lời mời để hiển thị trên trang này."
           text: "Mời hàng loạt"
-          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."
-          confirmation_message: "Bạn sắp gửi lời mời qua email tới mọi người trong dữ liệu đã tải lên."
       password:
         title: "Mật khẩu"
         too_short: "Mật khẩu của bạn quá ngắn."
@@ -1363,7 +1370,6 @@ vi:
       close: "đóng"
       dismiss_error: "Loại bỏ lỗi"
     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"
     refresh: "Tải lại"
     home: "Trang chủ"
@@ -1383,15 +1389,6 @@ vi:
       exceeded_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, other {# lỗi / giờ}}</a> vượt quá giới hạn thiết lập trang web của {limit, plural, other {# lỗi / giờ}}."
       exceeded_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, other {# lỗi / phút}}</a> vượt quá giới hạn thiết lập trang web của {limit, plural, other {# lỗi / phút}}."
     learn_more: "tìm hiểu thêm..."
-    all_time: "tổng cộng"
-    all_time_desc: "tổng số chủ đề đã tạo"
-    year: "năm"
-    year_desc: "chủ đề được tạo ra trong 365 ngày qua"
-    month: "tháng"
-    month_desc: "chủ đề được tạo ra trong 30 ngày qua"
-    week: "tuần"
-    week_desc: "chủ đề được tạo ra trong 7 ngày qua"
-    day: "ngày"
     first_post: Bài viết đầu tiên
     mute: Im lặng
     unmute: Bỏ im lặng
@@ -1408,13 +1405,12 @@ vi:
       sign_up: "Đăng ký"
       hide_session: "Nhắc vào ngày mai"
       hide_forever: "không, cảm ơn"
-      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."
       intro: "Xin chào! Có vẻ như bạn đang thích cuộc thảo luận, nhưng bạn chưa đăng ký tài khoản."
       value_prop: "Khi bạn tạo tài khoản, chúng tôi nhớ chính xác những gì bạn đã đọc, vì vậy bạn luôn quay lại ngay nơi bạn đã dừng lại. Bạn cũng nhận được thông báo, tại đây và qua email, bất cứ khi nào ai đó trả lời bạn. Và bạn có thể thích bài viết để chia sẻ. :heartpulse:"
     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:
+        other: "Có <b>%{count}</b> trả lời."
       enable: "Tóm tắt lại chủ đề"
       disable: "HIển thị tất cả các bài viết"
     deleted_filter:
@@ -1439,8 +1435,8 @@ vi:
     trust_level: "Độ tin tưởng"
     search_hint: "username, email or IP address"
     create_account:
+      header_title: "Chào mừng!"
       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:
       title: "Đặt lại mật khẩu"
@@ -1470,7 +1466,6 @@ vi:
       logging_in_as: Đăng nhập bằng %{email}
       confirm_button: Kết thúc đăng nhập
     login:
-      title: "Đăng nhập"
       username: "Thành viên"
       password: "Mật khẩu"
       second_factor_title: "Xác thực hai yếu tố"
@@ -1485,7 +1480,6 @@ vi:
       security_key_not_allowed_error: "Quá trình xác thực khóa bảo mật đã hết thời gian chờ hoặc đã bị hủy."
       security_key_no_matching_credential_error: "Không thể tìm thấy thông tin xác thực phù hợp trong khóa bảo mật được cung cấp."
       security_key_support_missing_error: "Thiết bị hoặc trình duyệt hiện tại của bạn không hỗ trợ việc sử dụng khóa bảo mật. Vui lòng sử dụng một phương pháp khác."
-      email_placeholder: "Email hoặc tên đăng nhập "
       caps_lock_warning: "Phím Caps Lock đang được bật"
       error: "Không xác định được lỗi"
       cookies_error: "Trình duyệt của bạn dường như đã tắt cookie. Bạn có thể không đăng nhập được nếu không bật chúng trước."
@@ -1552,7 +1546,6 @@ vi:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels (trước đây là EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1573,6 +1566,10 @@ vi:
     category_row:
       topic_count:
         other: "%{count} chủ đề trong danh mục này"
+      plus_subcategories_title:
+        other: "%{name} và %{count} danh mục phụ"
+      plus_subcategories:
+        other: "+ %{count} danh mục phụ"
     select_kit:
       default_header_text: Chọn...
       no_content: Không tìm thấy
@@ -1591,8 +1588,6 @@ vi:
     date_time_picker:
       from: Từ
       to: Tới
-      errors:
-        to_before_from: "\"Đến ngày\" phải sau \"từ ngày\"."
     emoji_picker:
       filter_placeholder: Tìm kiếm emoji
       smileys_&_emotion: Biểu tượng mặt cười và cảm xúc
@@ -1614,7 +1609,6 @@ vi:
       default: Biểu tượng cảm xúc tùy chỉnh
     shared_drafts:
       title: "Thư nháp được Chia sẻ"
-      notice: "Chủ đề này chỉ hiển thị cho những người có thể xem danh mục <b>%{category}</b>."
       destination_category: "Loại điểm đến"
       publish: "Xuất bản bản nháp"
       confirm_publish: "Bạn có chắc chắn muốn xuất bản bản nháp này không?"
@@ -1625,7 +1619,6 @@ vi:
       options: "Lựa chọn"
       whisper: "nói chuyện"
       unlist: "chưa được liệt kê"
-      blockquote_text: "Trích dẫn"
       add_warning: "Đây là một cảnh báo chính thức"
       toggle_whisper: "Chuyển chế độ Nói chuyện"
       toggle_unlisted: "Chuyển sang chế độ Không công khai"
@@ -1645,10 +1638,13 @@ vi:
       reference_topic_title: "Trả lời đến: %{title}"
       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ự"
+        title_too_short:
+          other: "Tiêu để phải có ít nhất %{count} ký tự"
+        title_too_long:
+          other: "Tiêu đề có tối đa %{count} ký tự"
         post_missing: "Bài đăng không được để trống"
-        post_length: "Bài viết phải có ít nhất %{min} ký tự"
+        post_length:
+          other: "Bài viết phải có ít nhất %{count} ký tự"
         try_like: "Bạn đã thử nút %{heart} chưa?"
         category_missing: "Bạn phải chọn một phân loại"
         tags_missing:
@@ -1680,8 +1676,6 @@ vi:
       saved: "Đã lưu"
       saved_draft: "Đang đăng bản nháp. Nhấn để tiếp tục."
       uploading: "Đang đăng "
-      show_preview: "Xem trước &raquo;"
-      hide_preview: "&laquo;ẩn xem trước"
       quote_post_title: "Trích dẫn cả bài viết"
       bold_label: "B"
       bold_title: "In đậm"
@@ -1694,8 +1688,8 @@ vi:
       link_dialog_title: "Chèn liên kết"
       link_optional_text: "tiêu đề tùy chọn"
       link_url_placeholder: "Dán URL hoặc nhập vào chủ đề tìm kiếm"
-      quote_title: "Trích dẫn"
-      quote_text: "Trích dẫn"
+      blockquote_title: "Blockquote"
+      blockquote_text: "Trích dẫn"
       code_title: "Văn bản định dạng trước"
       code_text: "lùi đầu dòng bằng 4 dấu cách"
       paste_code_text: "gõ hoặc dẫn code vào đây"
@@ -1719,8 +1713,6 @@ vi:
       yourself_confirm:
         title: "Bạn có quên chưa thêm người nhận?"
         body: "Ngay bây giờ tin nhắn này chỉ được gửi cho chính bạn!"
-      slow_mode:
-        error: "Chủ đề này đang ở chế độ chậm. Để những người khác có thời gian trả lời, bạn chỉ có thể đăng một lần sau mỗi %{duration}."
       admin_options_title: "Tùy chọn quản trị viên cho chủ đề này"
       composer_actions:
         reply: Trả lời
@@ -1749,7 +1741,7 @@ vi:
           label: "Chủ đề Mới"
         shared_draft:
           label: "Bản nháp được Chia sẻ"
-          desc: "Soạn thảo một chủ đề sẽ chỉ hiển thị cho nhân viên"
+          desc: "Nháp một chủ đề sẽ chỉ hiển thị cho người dùng được phép"
         toggle_topic_bump:
           label: "Chuyển đổi phần mở rộng chủ đề"
           desc: "Trả lời mà không thay đổi ngày trả lời gần nhất"
@@ -1842,10 +1834,7 @@ 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}"
       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"
-      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"
       select_file: "Chọn Tài liệu"
@@ -1874,6 +1863,7 @@ vi:
       or_search_google: "Hoặc thử tìm kiếm bằng Google thay thế:"
       search_google: "Hãy thử tìm kiếm bằng Google để thay thế:"
       search_google_button: "G"
+      search_button: "Tìm kiếm"
       context:
         user: "Tìm bài viết của @%{username}"
         category: "Tìm kiếm danh mục #%{category}"
@@ -1939,7 +1929,6 @@ vi:
     go_back: "quay trở lại"
     not_logged_in_user: "Trang cá nhân với tóm tắt các hoạt động và cấu hình"
     current_user: "đi đến trang cá nhân của bạn"
-    view_all: "xem tất cả"
     topics:
       new_messages_marker: "lần thăm cuối"
       bulk:
@@ -1960,6 +1949,7 @@ vi:
         change_category: "Đặt danh mục"
         close_topics: "Đóng các chủ đề"
         archive_topics: "Chủ đề Lưu trữ"
+        move_messages_to_inbox: "Chuyển sang hộp thư"
         notification_level: "Thông báo"
         choose_new_category: "Chọn chuyên mục mới cho chủ đề này:"
         selected:
@@ -1969,7 +1959,6 @@ vi:
         choose_new_tags: "Chọn thẻ mới cho các chuyên mục sau:"
         choose_append_tags: "Chọn các thẻ mới để thêm vào cho các chủ đề này:"
         changed_tags: "Các thẻ của các chủ đề đó đã được thay đổi."
-        remove_tags: "Xóa thẻ"
         progress:
           other: "Tiến độ: <strong>%{count}</strong> chủ đề"
       none:
@@ -1984,7 +1973,6 @@ vi:
         top: "Không có chủ đề top."
         educate:
           new: '<p>Các chủ đề mới của bạn sẽ xuất hiện ở đây. Theo mặc định, các chủ đề được coi là mới và sẽ hiển thị chỉ báo <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> nếu chúng được tạo trong 2 ngày qua.</p><p>Truy cập <a href="%{userPrefsUrl}">tùy chọn</a> của bạn để thay đổi.</p>'
-          unread: '<p>Chủ đề chưa đọc của bạn sẽ hiển thị ở đây.</p><p>Mặc định, chủ đề được coi là chưa đọc và sẽ hiển thị số <span class="badge new-posts badge-notification">1</span> nếu bạn:</p><ul><li>Đã tạo chủ đề</li><li>Đã trả lời chủ đề</li><li>Đọc chủ đề trong hơn 4 phút</li></ul><p>Hoặc nếu bạn đã thiết lập một cách rõ ràng các chủ đề Theo dõi hoặc Xem thông qua việc kiểm soát thông báo ở dưới cùng của mỗi chủ đề.</p><p>Xem <a href="%{userPrefsUrl}">thiết lập</a> của bạn nếu muốn thay đổi.</p>'
       bottom:
         latest: "Không còn thêm chủ đề nào nữa."
         posted: "Ở đây không có thêm chủ đề nào được đăng."
@@ -2054,7 +2042,6 @@ vi:
       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}"
       unread_indicator: "Chưa có thành viên nào đọc bài cuối cùng của chủ đề này."
-      read_more_MF: "Có { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 chủ đề chưa đọc</a> } other { <a href='{basePath}/unread'># chủ đề chưa đọc</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{và } false {} other{}} <a href='{basePath}/new'>1 chủ đề mới</a>} other { {BOTH, select, true{và } false {} other{}} <a href='{basePath}/new'># chủ đề mới</a>} }, hoặc {CATEGORY, select, true {xem những chủ đề khác ở mục {catLink}} false {{latestLink}} other {}}"
       bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Duyệt tất cả các hạng mục
       browse_all_tags: Duyệt qua tất cả các thẻ
@@ -2073,14 +2060,17 @@ vi:
         minutes: "Phút:"
         seconds: "Giây:"
         durations:
+          10_minutes: "10 phút"
           15_minutes: "15 phút"
+          30_minutes: "30 Phút"
+          45_minutes: "45 phút"
           1_hour: "1 giờ"
+          2_hours: "2 Tiếng"
           4_hours: "4 giờ"
-          1_day: "1 Ngày"
-          1_week: "1 Tuần"
+          8_hours: "8 giờ"
+          12_hours: "12 giờ"
+          24_hours: "24 giờ"
           custom: "Thời lượng tùy chỉnh"
-      slow_mode_notice:
-        duration: "Bạn cần đợi %{duration} giữa các bài viết trong chủ đề này"
       topic_status_update:
         title: "Bộ hẹn giờ chủ đề"
         save: "Đặt hẹn giờ"
@@ -2089,7 +2079,7 @@ vi:
         remove: "Xoá bộ đếm"
         publish_to: "Xuất bản tới:"
         when: "Khi:"
-        time_frame_required: Vui lòng chọn một khung thời gian
+        time_frame_required: "Vui lòng chọn một khung thời gian"
       auto_update_input:
         none: "Chọn khung thời gian"
         now: "Bây giờ"
@@ -2098,13 +2088,7 @@ vi:
         later_this_week: "Cuối tuần này"
         this_weekend: "Cuối tuần này"
         next_week: "Tuần tới"
-        two_weeks: "Hai tuần"
         next_month: "Tháng t"
-        two_months: "Hai tháng"
-        three_months: "Ba tháng"
-        four_months: "Bốn tháng"
-        six_months: "Sáu tháng"
-        one_year: "Một năm"
         forever: "Mãi mãi"
         pick_date_and_time: "Chọn ngày và giờ"
         set_based_on_last_post: "Đóng dựa trên bài viết cuối cùng"
@@ -2118,7 +2102,6 @@ vi:
         title: "Tạm đóng"
       auto_close:
         title: "Tự động đóng chủ đề"
-        label: "Giờ chủ đề tự động đóng:"
         error: "Hãy nhập giá trị hợp lệ."
         based_on_last_post: "Không đóng cho đến khi bài viết cuối cùng trong chủ đề này trở thành bài cũ"
       auto_delete:
@@ -2133,7 +2116,7 @@ vi:
         auto_open: "Chủ đề này sẽ tự động mở trong %{timeLeft}."
         auto_close: "Chủ đề này sẽ tự đóng trong %{timeLeft}."
         auto_publish_to_category: "Chủ đề này sẽ được xuất bản lên <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Chủ đề này sẽ đóng %{duration} sau trả lời cuối cùng."
+        auto_close_after_last_post: "Chủ đề này sẽ đóng %{duration} sau trả lời cuối cùng."
         auto_delete: "Chủ đề này sẽ tự động bị xóa %{timeLeft}."
         auto_bump: "Chủ đề này sẽ tự động được đưa vào %{timeLeft}."
         auto_reminder: "Bạn sẽ được nhắc nhở về chủ đề này %{timeLeft}."
@@ -2152,7 +2135,8 @@ vi:
         go: "đi tới"
         jump_bottom: "nhảy tới bài viết cuối cùng"
         jump_prompt: "Nhảy đến..."
-        jump_prompt_of: "của %{count} bài viết"
+        jump_prompt_of:
+          other: "của %{count} bài viết"
         jump_prompt_long: "Chuyển đến ..."
         jump_bottom_with_number: "nhảy tới bài viết %{post_number}"
         jump_prompt_to_date: "đến nay"
@@ -2237,6 +2221,7 @@ vi:
         title: "Chia sẻ"
         extended_title: "Chia sẻ một liên kết"
         help: "Chia sẻ một liên kết đến chủ đề này"
+        invite_users: "Mời"
       print:
         title: "In"
         help: "Mở phiên bản thân thiện với máy in của chủ đề này"
@@ -2289,14 +2274,13 @@ vi:
         username_placeholder: "tên người dùng"
         action: "Gửi Lời Mời"
         help: "mời người khác tham gia chủ đề thông qua email hoặc thông báo"
-        to_forum: "Chúng tôi sẽ gửi một email tóm tắt cho phép bạn của bạn gia nhập trực tiệp bằng cách nhấp chuột vào một đường dẫn, không cần phải đăng nhập."
-        sso_enabled: "Nhập tên đăng nhập hoặc địa chỉ email của người mà bạn muốn mời vào chủ đề này."
+        discourse_connect_enabled: "Nhập tên đăng nhập hoặc địa chỉ email của người mà bạn muốn mời vào chủ đề này."
         to_topic_blank: "Nhập tên đăng nhập hoặc địa chỉ email của người bạn muốn mời đến chủ đề này."
         to_topic_email: "Bạn vừa điền địa chỉ email, website sẽ gửi lời mời cho phép bạn bè của bạn có thể trả lời chủ đề này."
         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>%{invitee}</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)"
         success_existing_email: "Người dùng có email <b>%{emailOrUsername}</b> đã tồn tại. Chúng tôi đã mời người dùng đó tham gia vào chủ đề này."
@@ -2401,8 +2385,6 @@ vi:
       edit_reason: "Lý do: "
       post_number: "bài viết %{number}"
       ignored: "Nội dung bị bỏ qua"
-      wiki_last_edited_on: "wiki được chỉnh sửa lần cuối vào"
-      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ủ đề"
       reply_as_new_private_message: "Trả lời dưới dạng tin nhắn mới cho cùng người nhận"
       continue_discussion: "Tiếp tục thảo luận từ %{postLink}:"
@@ -2422,12 +2404,18 @@ vi:
       unread: "Bài viết chưa đọc"
       has_replies:
         other: "%{count} Trả lời"
+      has_replies_count: "%{count}"
       unknown_user: "(người dùng không xác định / đã xóa)"
       has_likes_title:
         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"
+      filtered_replies_hint:
+        other: "Xem bài đăng này và %{count} câu trả lời của nó"
+      filtered_replies_viewing:
+        other: "Xem %{count} câu trả lời cho"
+      in_reply_to: "Tải bài đăng gốc"
       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."
@@ -2440,17 +2428,8 @@ vi:
         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."
-      abandon_edit:
-        confirm: "Bạn có chắc chắn muốn hủy các thay đổi của mình không?"
-        no_value: "Không, giữ lại"
-        no_save_draft: "Không, lưu bản nháp"
-        yes_value: "Có, hủy chỉnh sửa"
-      abandon:
-        title: "Từ bỏ bản nháp"
-        confirm: "Bạn có chắc muốn bỏ bài viết của bạn?"
-        no_value: "Không, giữ lại"
-        no_save_draft: "Không, lưu bản nháp"
-        yes_value: "Đồng ý, bỏ"
+      cancel_composer:
+        discard: "Hủy bỏ"
       via_email: "bài viết này đăng qua email"
       via_auto_generated_email: "bài đăng này đến qua một email được tạo tự động"
       whisper: "bài viết này là lời nhắn từ điều hành viên"
@@ -2496,7 +2475,8 @@ vi:
         unlock_post_description: "cho phép người đăng chỉnh sửa bài đăng này"
         delete_topic_disallowed_modal: "Bạn không có quyền xóa chủ đề này. Nếu bạn thực sự muốn xóa nó, hãy gửi cờ để người kiểm duyệt chú ý cùng với lý do."
         delete_topic_disallowed: "bạn không có quyền xóa chủ đề này"
-        delete_topic_confirm_modal: "Chủ đề này hiện có hơn %{minViews} lượt xem và có thể là điểm đến tìm kiếm phổ biến. Bạn có chắc chắn muốn xóa hoàn toàn chủ đề này thay vì chỉnh sửa để cải thiện chủ đề không?"
+        delete_topic_confirm_modal:
+          other: "Chủ đề này hiện có hơn %{count} lượt xem và có thể là điểm đến tìm kiếm phổ biến. Bạn có chắc chắn muốn xóa hoàn toàn chủ đề này thay vì chỉnh sửa để cải thiện chủ đề không?"
         delete_topic_confirm_modal_yes: "Có, xóa chủ đề này"
         delete_topic_confirm_modal_no: "Không, giữ chủ đề này"
         delete_topic_error: "Đã xảy ra lỗi khi xóa chủ đề này"
@@ -2575,6 +2555,12 @@ vi:
           edit_bookmark:
             name: "Chỉnh sửa dấu trang"
             description: "Chỉnh sửa tên dấu trang hoặc thay đổi ngày giờ lời nhắc"
+      filtered_replies:
+        viewing_posts_by: "Đang xem %{post_count} bài viết của"
+        viewing_subset: "Một số câu trả lời bị thu gọn"
+        viewing_summary: "Xem tóm tắt về chủ đề này"
+        post_number: "%{username}, bài số #%{post_number}"
+        show_all: "Hiển thị tất cả"
     category:
       can: "can&hellip;"
       none: "(không danh mục)"
@@ -2632,10 +2618,10 @@ vi:
         reply: "Trả lời"
         create: "Tạo"
         no_groups_selected: "Không có nhóm nào được cấp quyền truy cập; danh mục này sẽ chỉ hiển thị cho nhân viên."
-        everyone_has_access: "Danh mục này là công khai, mọi người đều có thể xem, trả lời và tạo bài viết. Để hạn chế quyền, hãy xóa một hoặc nhiều quyền được cấp cho nhóm \"mọi người\"."
+        everyone_has_access: 'Danh mục này là công khai, mọi người đều có thể xem, trả lời và tạo bài viết. Để hạn chế quyền, hãy xóa một hoặc nhiều quyền được cấp cho nhóm "mọi người".'
         toggle_reply: "Chuyển đổi quyền Trả lời"
         toggle_full: "Chuyển đổi quyền Tạo"
-        inherited: "Sự cho phép này được thừa hưởng từ “tất cả mọi người”"
+        inherited: 'Sự cho phép này được thừa hưởng từ “tất cả mọi người”'
       special_warning: "Cảnh báo: Đây là chuyên mục có sẵn nên bạn không thể chỉnh sửa các thiết lập bảo mật. Nếu bạn muốn sử dụng chuyên mục này, hãy xóa nó thay vì tái sử dụng."
       uncategorized_security_warning: "Danh mục này là đặc biệt. Nó được thiết kế như một khu vực tổ chức cho các chủ đề không có danh mục; nó không thể có cài đặt bảo mật."
       uncategorized_general_warning: 'Danh mục này là đặc biệt. Nó được sử dụng làm danh mục mặc định cho các chủ đề mới chưa chọn danh mục. Nếu bạn muốn ngăn hành vi này và buộc lựa chọn danh mục, <a href="%{settingLink}">vui lòng tắt cài đặt tại đây</a>. Nếu bạn muốn thay đổi tên hoặc mô tả, hãy chuyển đến <a href="%{customizeLink}">Tùy chỉnh / Nội dung Văn bản</a>.'
@@ -2674,19 +2660,16 @@ vi:
       notifications:
         watching:
           title: "Theo dõi"
-          description: "Bạn sẽ tự động xem tất cả các chủ đề trong các danh mục này. Bạn sẽ được thông báo về mọi bài đăng mới trong mọi chủ đề và một số câu trả lời mới sẽ được hiển thị."
         watching_first_post:
           title: "Xem bài viết đầu tiên"
           description: "Bạn sẽ được thông báo về các chủ đề mới trong danh mục này nhưng không phải trả lời các chủ đề."
         tracking:
           title: "Đang theo dõi"
-          description: "Bạn sẽ tự động theo dõi tất cả các chủ đề trong các danh mục này. Bạn sẽ được thông báo nếu ai đó đề cập đến @name của bạn hoặc trả lời cho bạn và một số câu trả lời mới sẽ được hiển thị."
         regular:
           title: "Bình thường"
           description: "Bạn sẽ được thông báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn"
         muted:
           title: "Im lặng"
-          description: "Bạn sẽ không nhận được thông báo về bất cứ chủ đề mới nào trong các chuyên mục này, và chúng sẽ không hiển thị là mới nhất."
       search_priority:
         label: "Ưu tiên tìm kiếm"
         options:
@@ -2738,7 +2721,6 @@ vi:
       notify_action: "Tin nhắn"
       official_warning: "Cảnh báo chính thức"
       delete_spammer: "Xóa người Spam"
-      delete_confirm_MF: "Bạn sắp xóa {POSTS, plural, other {<b>#</b> bài viết}} và {TOPICS, plural, other {<b>#</b> bài viết}} từ người dùng này, xóa tài khoản của họ, chặn đăng ký khỏi địa chỉ IP của họ <b>{ip_address}</b>và thêm địa chỉ email <b>{email}</b> vào danh sách chặn vĩnh viễn. Bạn có chắc người dùng này thực sự là người gửi thư rác không?"
       yes_delete_spammer: "Có, xóa người spam"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(ẩn)"
@@ -2800,17 +2782,6 @@ vi:
         title: "Chủ đề này là một tin nhắn cá nhân"
         help: "Chủ đề này là một tin nhắn cá nhân"
     posts: "Bài viết"
-    posts_likes_MF: |2
-
-      Chủ đề này có {count, plural, one {1 reply} other {# replies}} {ratio, select,
-
-      low {with a high like to post ratio}
-
-      med {with a very high like to post ratio}
-
-      high {with an extremely high like to post ratio}
-
-      other {}}
     original_post: "Bài viết gốc"
     views: "Lượt xem"
     views_lowercase:
@@ -2826,7 +2797,6 @@ vi:
     users_lowercase:
       other: "người dùng"
     category_title: "Danh mục"
-    history: "Lịch sử"
     changed_by: "bởi %{author}"
     raw_email:
       title: "Email đến"
@@ -3119,7 +3089,6 @@ vi:
     invite:
       custom_message: "Làm cho lời mời của bạn trở nên cá nhân hơn một chút bằng cách viết <a href>tin nhắn tùy chỉnh</a>."
       custom_message_placeholder: "Nhập thông điệp tùy chỉnh của bạn"
-      approval_not_required: "Người dùng sẽ được tự động phê duyệt ngay sau khi họ chấp nhận lời mời này."
       custom_message_template_forum: "Hey, bạn nên tham gia diễn đàn này!"
       custom_message_template_topic: "Hey, tôi nghĩ bạn có thể thích chủ đề này!"
     forced_anonymous: "Do quá tải, thông báo này tạm thời được hiển thị cho mọi người."
@@ -3131,6 +3100,16 @@ vi:
     safe_mode:
       enabled: "Chế độ an toàn được bật, để thoát khỏi chế độ an toàn, hãy đóng cửa sổ trình duyệt này"
     image_removed: "(hình ảnh đã bị xóa)"
+    do_not_disturb:
+      title: "Không làm phiền..."
+      label: "Không làm phiền"
+      remaining: "còn lại %{remaining}"
+      options:
+        half_hour: "30 phút"
+        one_hour: "1 tiếng"
+        two_hours: "2 tiếng"
+        tomorrow: "Cho tới ngày mai"
+        custom: "Tùy biến"
   admin_js:
     type_to_filter: "gõ để lọc..."
     admin:
@@ -3158,6 +3137,8 @@ vi:
         installed_version: "Đã cài đặt"
         latest_version: "Mới nhất"
         problems_found: "Một số lời khuyên dựa trên cài đặt trang web hiện tại của bạn"
+        new_features:
+          dismiss: "Hủy bỏ"
         last_checked: "Kiểm tra lần cuối"
         refresh_problems: "Làm mới"
         no_problems: "Không phát hiện vấn đề"
@@ -3245,10 +3226,6 @@ vi:
             available: "Tên nhóm dùng được"
             not_available: "Tên nhóm đã sử dụng"
             blank: "Tên nhóm không thể trống"
-        bulk_add:
-          title: "Thêm vào nhóm theo lô"
-          complete_users_not_added: "Những người dùng này chưa được thêm vào (hãy đảm bảo rằng họ có tài khoản):"
-          paste: "Dán danh sách username hoặc email, mỗi mục một dòng:"
         add_members:
           as_owner: "Đặt user làm chủ sở hữu của nhóm này"
         manage:
@@ -3275,7 +3252,8 @@ vi:
             effects: Các hiệu ứng
             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_user_count: "%{count} người dùng có domain email mới và sẽ được thêm vào nhóm."
+            automatic_membership_user_count:
+              other: "%{count} người dùng có domain email mới và sẽ được thêm vào nhóm."
             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"
@@ -3349,9 +3327,12 @@ vi:
               wordpress: Cần thiết để plugin wp-discourse của WordPress hoạt động.
             users:
               bookmarks: Liệt kê các dấu trang của người dùng. Nó trả về lời nhắc đánh dấu khi sử dụng định dạng ICS.
-              sync_sso: Đồng bộ hóa người dùng bằng SSO.
               show: Nhận thông tin về người dùng.
               check_emails: Liệt kê các email của người dùng.
+              update: Cập nhật thông tin hồ sơ người dùng.
+              log_out: Đăng xuất tất cả
+              anonymize: Ẩn danh tài khoản người dùng.
+              delete: Xóa tài khoản người dùng.
       web_hooks:
         title: "Webhooks"
         none: "Không có webhook nào ngay bây giờ."
@@ -3366,7 +3347,6 @@ vi:
         go_back: "Quay lại danh sách"
         payload_url: "Payload URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Có vẻ như bạn đang cố gắng thiết lập webhook thành một url cục bộ. Sự kiện được gửi đến một địa chỉ địa phương có thể gây ra tác dụng phụ hoặc các hành vi không mong muốn. Tiếp tục?"
         secret_invalid: "Bí mật không được có bất kỳ ký tự trống nào."
         secret_too_short: "Bí mật phải có ít nhất 12 ký tự."
         secret_placeholder: "Một chuỗi tùy chọn, được sử dụng để tạo chữ ký"
@@ -3394,7 +3374,6 @@ vi:
           details: "Khi có trả lời mới, hãy chỉnh sửa, xóa hoặc khôi phục."
         user_event:
           name: "Sự kiện người dùng"
-          details: "Khi người dùng đăng nhập, đăng xuất, được tạo, phê duyệt hoặc cập nhật."
         group_event:
           name: "Sự kiện nhóm"
           details: "Khi một nhóm được tạo, cập nhật hoặc hủy."
@@ -3689,17 +3668,6 @@ vi:
           color_definitions:
             text: "Màu sắc"
             title: "Nhập màu tùy chỉnh (chỉ dành cho người dùng nâng cao)"
-            placeholder: |2-
-
-              Sử dụng biểu định kiểu này để thêm màu tùy chỉnh vào danh sách các thuộc tính tùy chỉnh CSS.
-
-              Ví dụ:
-
-              : root {
-              --mytheme-tertiary-or-quaternary: # {dark-light-select ($tertiary, $quaternary)};
-              }
-
-              nên đặt tiền tố tên thuộc tính để tránh xung đột với các plugin và / hoặc lõi.
           head_tag:
             text: "</head>"
             title: "HTML sẻ thêm trước thẻ </head>"
@@ -4007,11 +3975,10 @@ vi:
           title: "Log lỗi"
       watched_words:
         title: "Từ đã xem"
+        search: "Tìm kiếm"
         clear_filter: "Xóa"
-        show_words: "hiển thị từ"
         download: Tải xuống
         clear_all: Xóa tất cả
-        clear_all_confirm_block: "Bạn có chắc chắn muốn xóa tất cả các từ đã xem cho hành động Chặn không?"
         actions:
           block: "Khóa"
           flag: "Gắn cờ"
@@ -4037,6 +4004,8 @@ vi:
           active: "Kích hoạt"
           staff: "Nhân viên"
           suspended: "Đã tạm khóa"
+          silenced: "Im lặng"
+          staged: "Theo giai đoạn"
         approved: "Đã duyệt?"
         titles:
           active: "Thành viên kích hoạt"
@@ -4055,6 +4024,8 @@ vi:
         check_email:
           title: "Khám phá email của tài khoản này"
           text: "Hiển thị"
+        check_sso:
+          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}"
@@ -4091,7 +4062,6 @@ vi:
         clear_penalty_history:
           title: "Xóa lịch sử hình phạt"
           description: "người dùng bị phạt không thể đạt đến TL3"
-        delete_all_posts_confirm_MF: "Bạn sắp xóa {POSTS, plural, one {1 bài đăng} other {# bài đăng}} và {TOPICS, plural, one {1 chủ đề} other {# chủ đề}}. . Bạn có chắc không?"
         silence: "Im lặng"
         unsilence: "Không im lặng"
         silenced: "Im lặng?"
@@ -4235,15 +4205,13 @@ vi:
           on_grace_period: "Hiện đang trong khoảng thời gian gia hạn thăng chức, sẽ không thể giáng chức."
           locked_will_not_be_promoted: "Mức độ tin cậy đang khóa, sẽ không thể thăng chức."
           locked_will_not_be_demoted: "Mức độ tin cậy đang khóa, sẽ không thể giáng chức."
-        sso:
-          title: "Single Sign On"
+        discourse_connect:
           external_id: "ID Bên ngoài"
           external_username: "Tên đăng nhập"
           external_name: "Tên"
           external_email: "Email"
           external_avatar_url: "URL Ảnh đại diện"
           delete_sso_record: "Xóa bản ghi SSO"
-          confirm_delete: "Bạn có chắc chắn muốn xóa bản ghi đăng nhập một lần (SSO) này không?"
       user_fields:
         title: "Trường tài khoản"
         help: "Thêm trường dữ liệu cho người dùng nhập."
@@ -4384,7 +4352,6 @@ vi:
         icon: Biểu tượng
         image: Hình ảnh
         icon_help: "Nhập tên biểu tượng Font Awesome (sử dụng tiền tố 'far-' cho các biểu tượng thông thường và 'fab-' cho các biểu tượng thương hiệu)"
-        image_help: "Nhập URL của hình ảnh (ghi đè trường biểu tượng nếu cả hai đều được đặt)"
         query: Truy vấn huy hiệu (SQL)
         target_posts: Truy vấn bài viết mục tiêu
         auto_revoke: Chạy truy vấn hủy bỏ hàng ngày
@@ -4452,6 +4419,8 @@ vi:
         embed_by_username: "Tên thành viên để tạo chủ đề"
         embed_post_limit: "Số lượng tối đa bài viết được nhúng"
         embed_truncate: "Cắt ngắn các bài viết được nhúng"
+        allowed_embed_selectors: "Bộ chọn các thành phần CSS được hỗ trợ khi nhúng"
+        blocked_embed_selectors: "CSS selector for elements that are removed from embeds"
         allowed_embed_classnames: "Tên lớp CSS được phép"
         save: "Lưu thiết lập nhúng"
       permalink:
@@ -4473,12 +4442,14 @@ vi:
         action:
           label: "Thay thế Văn bản…"
         modal:
+          title: "Thay thế Văn bản"
           categories: "Thư mục"
           topics: "Chủ đề"
   wizard_js:
     wizard:
       done: "Hoàn tất"
       back: "Quay lại"
+      step: "%{current} trên %{total}"
       upload: "Tải lên"
       uploading: "Đang tải lên..."
       upload_error: "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."
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index edc7797b09..9c3470bfcc 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -94,58 +94,62 @@ zh_CN:
       next_month: "下个月"
       placeholder: 日期
     share:
-      topic_html: '主题: <span class="topic-title">%{topicTitle}</span>'
+      topic_html: '话题：<span class="topic-title">%{topicTitle}</span>'
       post: "帖子 #%{postNumber}"
       close: "关闭"
-      twitter: "分享到Twitter"
-      facebook: "分享到Facebook"
+      twitter: "分享到 Twitter"
+      facebook: "分享到 Facebook"
       email: "通过电子邮件发送"
       url: "复制并分享网址"
     action_codes:
-      public_topic: "于%{when}将此主题设为公开"
-      private_topic: "于%{when}将该主题转换为私信"
-      split_topic: "于%{when}拆分了此主题"
-      invited_user: "于%{when}邀请了 %{who}"
-      invited_group: "于%{when}邀请了 %{who}"
-      user_left: "%{who} 于%{when}离开了该私信"
-      removed_user: "于%{when}移除了%{who}"
-      removed_group: "于%{when}移除了%{who}"
-      autobumped: "于%{when}自动顶帖"
+      public_topic: "于 %{when} 将此话题设为公开"
+      private_topic: "于 %{when} 将该话题转换为私信"
+      split_topic: "于 %{when} 拆分了此话题"
+      invited_user: "于 %{when} 邀请了 %{who}"
+      invited_group: "于 %{when} 邀请了 %{who}"
+      user_left: "%{who} 于 %{when} 离开了该私信"
+      removed_user: "于 %{when} 移除了 %{who}"
+      removed_group: "于 %{when} 移除了 %{who}"
+      autobumped: "于 %{when} 自动顶帖"
       autoclosed:
-        enabled: "于%{when}关闭"
-        disabled: "于%{when}打开"
+        enabled: "于 %{when} 关闭"
+        disabled: "于 %{when} 打开"
       closed:
-        enabled: "于%{when}关闭"
-        disabled: "于%{when}打开"
+        enabled: "于 %{when} 关闭"
+        disabled: "于 %{when} 打开"
       archived:
-        enabled: "于%{when}存档"
-        disabled: "于%{when}解除存档"
+        enabled: "于 %{when} 归档"
+        disabled: "于 %{when} 取消归档"
       pinned:
-        enabled: "于%{when}置顶"
-        disabled: "于%{when}解除置顶"
+        enabled: "于 %{when} 置顶"
+        disabled: "于 %{when} 取消置顶"
       pinned_globally:
-        enabled: "于%{when}全站置顶"
-        disabled: "于%{when}解除全站置顶"
+        enabled: "于 %{when} 全站置顶"
+        disabled: "于 %{when} 取消全站置顶"
       visible:
-        enabled: "于%{when}列出"
-        disabled: "于%{when}隐藏"
+        enabled: "于 %{when} 显示"
+        disabled: "于 %{when} 隐藏"
       banner:
-        enabled: "于%{when}将此设置为横幅。用户关闭横幅前，横幅将显示在每一页的顶部。"
-        disabled: "于%{when}移除了该横幅。横幅将不再显示在每一页的顶部。"
+        enabled: "于 %{when} 将此设置为横幅，在用户关闭前将会在每个页面的顶部显示。"
+        disabled: "于 %{when} 移除了该横幅，将不再显示在每个页面的顶部。"
       forwarded: "转发上述邮件"
-    topic_admin_menu: "管理主题"
-    wizard_required: "欢迎来到你的全新的Discourse！让我们跟随<a href='%{url}' data-auto-route='true'>设置向导</a>开始吧✨"
-    emails_are_disabled: "所有的出站邮件都已被管理员全局禁用。任何类型的邮件通知都不会被发出。"
+    topic_admin_menu: "操作话题"
+    wizard_required: "欢迎来到你全新的Discourse！让我们跟随<a href='%{url}' data-auto-route='true'>安装向导</a>开始吧✨"
+    emails_are_disabled: "所有的出站邮件都已被管理员全局，任何类型的邮件提醒都不会发出。"
+    software_update_prompt:
+      message: "我们已经更新了网站，请 <span>刷新页面</span>，否则可能会遇到未知故障。"
+      dismiss: "忽略"
     bootstrap_mode_enabled:
-      other: "为方便你的新站点冷启动，现正处于初始化模式中。所有新用户都将被授予信任等级 1，并为他们启用每日邮件摘要。初始化模式会在达到%{count}个用户时自动关闭。"
-    bootstrap_mode_disabled: "初始化模式将会在24小时内关闭。"
+      other: "为了使你的新站点更易启用，现正处于引导模式中，所有的新用户的信任等级都将设为 1，并为他们启用每日摘要邮件。引导模式会在达到 %{count} 个用户时自动关闭。"
+    bootstrap_mode_disabled: "引导模式将会在 24 小时内关闭。"
     themes:
       default_description: "默认"
-      broken_theme_alert: "因为主题或组件%{theme}有错误，你的站点可能无法正常运行。 在%{path}禁用它。"
+      broken_theme_alert: "因为主题或组件 %{theme} 有错误，你的站点可能无法正常运行， 在 %{path} 它。"
     s3:
       regions:
         ap_northeast_1: "亚太地区（东京）"
         ap_northeast_2: "亚太地区（首尔）"
+        ap_east_1: "亚太地区（香港）"
         ap_south_1: "亚太地区（孟买）"
         ap_southeast_1: "亚太地区（新加坡）"
         ap_southeast_2: "亚太地区（悉尼）"
@@ -164,7 +168,8 @@ zh_CN:
         us_gov_west_1: "AWS 政府云（US-West）"
         us_west_1: "美国西部（N. California）"
         us_west_2: "美国西部（Oregon）"
-    edit: "编辑该主题的标题和分类"
+    clear_input: "清空输入"
+    edit: "编辑该话题的标题和分类"
     expand: "展开"
     not_implemented: "非常抱歉，这个功能仍在开发中！"
     no_value: "否"
@@ -197,9 +202,11 @@ zh_CN:
     now: "刚才"
     read_more: "阅读更多"
     more: "更多"
+    x_more:
+      other: "%{count} 更多"
     less: "更少"
     never: "从未"
-    every_30_minutes: "每30分钟"
+    every_30_minutes: "每 30 分钟"
     every_hour: "每小时"
     daily: "每天"
     weekly: "每周"
@@ -213,21 +220,22 @@ zh_CN:
       title: "相关消息"
       see_all: '查看来自 @%{username} 的<a href="%{path}">所有消息</a> ...'
     suggested_topics:
-      title: "推荐主题"
-      pm_title: "推荐私信"
+      title: "推荐话题"
+      pm_title: "推荐消息"
     about:
       simple_title: "关于"
-      title: "关于%{title}"
+      title: "关于 %{title}"
       stats: "站点统计"
       our_admins: "我们的管理员"
       our_moderators: "我们的版主"
       moderators: "版主"
       stat:
         all_time: "不限时间"
-        last_7_days: "过去7天"
-        last_30_days: "过去30天"
+        last_day: "过去 24 小时"
+        last_7_days: "过去 7 天"
+        last_30_days: "过去 30 天"
       like_count: "赞"
-      topic_count: "主题"
+      topic_count: "话题"
       post_count: "帖子"
       user_count: "用户"
       active_user_count: "活跃用户"
@@ -237,65 +245,53 @@ zh_CN:
       title: "收藏"
       clear_bookmarks: "取消收藏"
       help:
-        bookmark: "点击收藏该主题的第一个帖子"
-        unbookmark: "点击删除本主题的所有收藏"
-        unbookmark_with_reminder: "点击以移除该主题上的所有收藏和提醒。你在该主题中设定了一个于%{reminder_at}的提醒。"
+        bookmark: "点击收藏该话题的第一个帖子"
+        unbookmark: "点击移除本话题的所有收藏"
+        unbookmark_with_reminder: "点击以移除该话题上的所有收藏和提醒，你在该话题中设定了一个于 %{reminder_at} 的提醒。"
     bookmarks:
-      created: "你已收藏了该帖子。%{name}"
+      created: "你已收藏了该帖子，%{name}"
       not_bookmarked: "收藏此帖"
-      created_with_reminder: "你已收藏了该帖子并设置了一个于%{date}的提醒。%{name}"
+      created_with_reminder: "你已收藏了该帖子并设置了一个于 %{date} 的提醒，%{name}"
       remove: "取消收藏"
       delete: "删除收藏"
       confirm_delete: "你确定要删除该收藏吗？你所设置的提醒也会被一并删除。"
-      confirm_clear: "你确定要清空这个主题中的所有收藏？"
+      confirm_clear: "你确定要清空这个话题中的所有收藏？"
       save: "保存"
-      no_timezone: '你尚未设置时区。您将无法设置提醒。在 <a href="%{basePath}/my/preferences/profile">你的个人资料中</a>设置。'
+      no_timezone: '你尚未设置时区，将无法设置提醒，在 <a href="%{basePath}/my/preferences/profile">你的个人资料中</a>设置。'
       invalid_custom_datetime: "你所提供的日期和时间无效，请重试。"
       list_permission_denied: "你没有权限查看该用户的收藏。"
-      no_user_bookmarks: "你没有已收藏的帖子；收藏可让你快速定位特定的帖子。"
+      no_user_bookmarks: "你没有已收藏的帖子，收藏可让你快速定位指定的帖子。"
       auto_delete_preference:
         label: "自动删除"
         never: "从不"
         when_reminder_sent: "发送提醒时"
-        on_owner_reply: "在我回复此主题之后"
-      search_placeholder: "按名称、主题标题或帖子内容搜索书签"
+        on_owner_reply: "在我回复此话题之后"
+      search_placeholder: "按名称、话题标题或帖子内容搜索收藏内容"
       search: "搜索"
       reminders:
-        later_today: "今天的某个时候"
-        next_business_day: "下一个工作日"
-        tomorrow: "明天"
-        next_week: "下个星期"
-        post_local_date: "发布日期"
-        later_this_week: "这周的某个时候"
-        start_of_next_business_week: "星期一"
-        start_of_next_business_week_alt: "下周一"
-        next_month: "下个月"
-        custom: "自定义日期和时间"
-        last_custom: "最近"
-        none: "无需提醒"
-        today_with_time: "今天%{time}"
-        tomorrow_with_time: "明天%{time}"
-        at_time: "于%{date_time}"
-        existing_reminder: "你为该收藏所设定的提醒将被在%{at_date_time}发出"
+        today_with_time: "今天 %{time}"
+        tomorrow_with_time: "明天 %{time}"
+        at_time: "于 %{date_time}"
+        existing_reminder: "你为该收藏所设定的提醒将在 %{at_date_time} 发出"
     copy_codeblock:
       copied: "已复制！"
     drafts:
-      resume: "复位"
+      resume: "恢复"
       remove: "移除"
-      remove_confirmation: "你确定要删除这草稿吗？"
-      new_topic: "新主题草稿"
-      new_private_message: "新私信草稿"
+      remove_confirmation: "你确定要删除草稿吗？"
+      new_topic: "新建话题草稿"
+      new_private_message: "新建私信草稿"
       topic_reply: "草稿回复"
       abandon:
-        confirm: "你已在此主题中打开了另一个草稿。 你确定要舍弃它吗？"
-        yes_value: "是的，舍弃"
-        no_value: "不，保持"
+        confirm: "你正在为这个话题起草一个草稿，你想对它做什么？"
+        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: "取消"
     deleting: "删除中..."
@@ -305,13 +301,14 @@ zh_CN:
     upload: "上传"
     uploading: "上传中…"
     uploading_filename: "上传中：%{filename}..."
+    processing_filename: "正在处理：%{filename}…"
     clipboard: "剪贴板"
     uploaded: "上传成功！"
     pasting: "粘贴中…"
     enable: "启用"
-    disable: "停用"
+    disable: "禁用"
     continue: "继续"
-    undo: "重置"
+    undo: "重做"
     revert: "撤销"
     failed: "失败"
     switch_to_anon: "进入匿名模式"
@@ -320,28 +317,28 @@ zh_CN:
       close: "隐藏横幅。"
       edit: "编辑该横幅 >>"
     pwa:
-      install_banner: "你想要<a href>安装%{title}在此设备上吗？</a>"
+      install_banner: "你想要<a href>安装 %{title} 在此设备上吗？</a>"
     choose_topic:
-      none_found: "没有找到主题。"
+      none_found: "没有找到话题。"
       title:
-        search: "搜索主题"
-        placeholder: "在此处输入主题标题、URL 或 ID"
+        search: "搜索话题"
+        placeholder: "在此处输入话题标题、链接或 ID"
     choose_message:
-      none_found: "无符合的结果"
+      none_found: "没有找到消息"
       title:
-        search: "搜索私信"
-        placeholder: "在此处输入私信的标题、URL或ID"
+        search: "搜索消息"
+        placeholder: "在此处输入消息的标题、链接或ID"
     review:
       order_by: "排序依据"
       in_reply_to: "回复给"
       explain:
-        why: "解释为什么该项目最终进入队列"
+        why: "解释为什么该条目最终进入队列"
         title: "需审核评分"
         formula: "公式"
         subtotal: "小计"
         total: "总计"
-        min_score_visibility: "可见的最低分数"
-        score_to_hide: "隐藏帖子的分数"
+        min_score_visibility: "可见的最低评分"
+        score_to_hide: "隐藏帖子的评分"
         take_action_bonus:
           name: "立即执行"
           title: "当工作人员选择采取行动时，会给标记加分。"
@@ -350,7 +347,7 @@ zh_CN:
           title: "先前已同意其标记的用户将获得奖励。"
         trust_level_bonus:
           name: "信任等级"
-          title: "待审阅项目由较高信任级别且具有较高分数的用户创建的。"
+          title: "待审阅条目由较高信任级别且具有较高分数的用户创建的。"
         type_bonus:
           name: "奖励类型"
           title: "某些可审核类型可以由管理人员加权，以使其具有更高的优先级。"
@@ -358,9 +355,9 @@ zh_CN:
         optional: "你可以认领此条目以避免被他人审核。"
         required: "在你审核之前你必须认领此条目。"
         claimed_by_you: "你已认领此条目现在可以审核了。"
-        claimed_by_other: "此条目仅可被<b>%{username}</b>审核。"
+        claimed_by_other: "此条目仅可被 <b>%{username}</b> 审核。"
       claim:
-        title: "认领该主题"
+        title: "认领该话题"
       unclaim:
         help: "移除该认领"
       awaiting_approval: "需要审核"
@@ -373,16 +370,17 @@ zh_CN:
           title: "需审核优先级"
       moderation_history: "管理日志"
       view_all: "查看全部"
-      grouped_by_topic: "依据主题分组"
-      none: "没有项目需要审核"
+      grouped_by_topic: "按话题分组"
+      none: "没有需要审核的条目"
       view_pending: "查看待审核"
       topic_has_pending:
-        other: "该主题中有 <b>%{count}</b> 个帖等待审核中"
+        other: "该话题中有 <b>%{count}</b> 个帖子等待审核"
       title: "审核"
-      topic: "主题："
-      filtered_topic: "您正在选择性地查看这一主题中的可审核内容。"
+      topic: "话题："
+      filtered_topic: "您正在选择性地查看这一话题中的可审核内容。"
       filtered_user: "用户"
-      show_all_topics: "显示所有主题"
+      filtered_reviewed_by: "审核者"
+      show_all_topics: "显示所有话题"
       deleted_post: "(已删除的帖子)"
       deleted_user: "(已删除的用户)"
       user:
@@ -392,53 +390,55 @@ zh_CN:
         email: "邮箱"
         name: "名称"
         fields: "字段"
+        reject_reason: "原因"
       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: "计数"
-        reported_by: "报告人"
-        deleted: "[已删除的主题]"
-        original: "（原主题）"
+        topic: "话题"
+        reviewable_count: "总数"
+        reported_by: "举报人"
+        deleted: "[已删除的话题]"
+        original: "（原话题）"
         details: "详情"
         unique_users:
           other: "%{count} 位用户"
       replies:
-        other: "%{count} 个回复"
+        other: "%{count} 条回复"
       edit: "编辑"
       save: "保存"
       cancel: "取消"
-      new_topic: "批准此条目将会创建一个新的主题"
+      new_topic: "批准此条目将会创建一个新的话题"
       filters:
         all_categories: "（所有分类）"
         type:
           title: "类型"
-          all: "(全部类型)"
+          all: "（全部类型）"
         minimum_score: "最低分："
         refresh: "刷新"
         status: "状态"
         category: "分类"
         orders:
           score: "评分"
-          score_asc: "分数（倒序）"
+          score_asc: "评分（倒序）"
           created_at: "创建时间"
           created_at_asc: "创建时间（倒序）"
         priority:
           title: "最低优先级"
-          low: "（所有）"
+          any: "（任何）"
+          low: "低"
           medium: "中"
           high: "高"
       conversation:
         view_full: "查看完整对话"
       scores:
-        about: "该分数是根据报告者的信任等级、该用户以往举报的准确性以及被举报条目的优先级计算得出的。"
+        about: "该分数是根据举报者的信任等级、该用户以往举报的准确性以及被举报条目的优先级计算得出的。"
         score: "评分"
         date: "日期"
         type: "类型"
@@ -451,9 +451,9 @@ zh_CN:
         approved:
           title: "已批准"
         rejected:
-          title: "拒绝"
+          title: "已驳回"
         ignored:
-          title: "忽略"
+          title: "已忽略"
         deleted:
           title: "已删除"
         reviewed:
@@ -465,25 +465,56 @@ zh_CN:
           title: "被标记的帖子"
           flagged_by: "标记者"
         reviewable_queued_topic:
-          title: "队列中到主题"
+          title: "队列中话题"
         reviewable_queued_post:
-          title: "队列中的帖子"
+          title: "队列中帖子"
         reviewable_user:
           title: "用户"
+        reviewable_post:
+          title: "帖子"
       approval:
-        title: "等待审核中"
-        description: "我们已经收到了你的发帖，不过帖子需要由版主审核才能显示。请耐心等待。"
+        title: "需要批准的帖子"
+        description: "我们已经收到了你的发帖，不过帖子需要由版主审核才能显示，请耐心等待。"
         pending_posts:
-          other: "你有 <strong>%{count}</strong> 个帖子在等待审核中。"
+          other: "你有 <strong>%{count}</strong> 个帖子在等待审核。"
         ok: "确认"
       example_username: "用户名"
+      reject_reason:
+        title: "你为什么驳回这个用户？"
+        send_email: "发送驳回邮件"
+    relative_time_picker:
+      minutes:
+        other: "分钟"
+      hours:
+        other: "小时"
+      days:
+        other: "天"
+      months:
+        other: "月"
+      years:
+        other: "年"
+      relative: "相对的"
+    time_shortcut:
+      later_today: "今天晚些时候"
+      next_business_day: "下一个工作日"
+      tomorrow: "明天"
+      next_week: "下周"
+      post_local_date: "发布日期"
+      later_this_week: "本周晚些时候"
+      start_of_next_business_week: "星期一"
+      start_of_next_business_week_alt: "下周一"
+      next_month: "下个月"
+      custom: "自定义日期和时间"
+      relative: "相对时间"
+      none: "不需要"
+      last_custom: "上次自定义日期时间"
     user_action:
-      user_posted_topic: "<a href='%{userUrl}'>%{user}</a>发表了<a href='%{topicUrl}'>该主题</a>"
-      you_posted_topic: "<a href='%{userUrl}'>你</a>发表了<a href='%{topicUrl}'>该主题</a>"
+      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_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>"
@@ -495,13 +526,13 @@ zh_CN:
       username: "用户名"
       filter_name: "按用户名筛选"
       title: "用户"
-      likes_given: "送出"
-      likes_received: "收到"
-      topics_entered: "浏览"
-      topics_entered_long: "浏览主题"
+      likes_given: "已送出"
+      likes_received: "已收到"
+      topics_entered: "已浏览"
+      topics_entered_long: "已浏览话题"
       time_read: "阅读时长"
-      topic_count: "主题"
-      topic_count_long: "创建的主题"
+      topic_count: "话题"
+      topic_count_long: "话题已创建"
       post_count: "回复"
       post_count_long: "回帖数"
       no_results: "没有找到结果。"
@@ -523,7 +554,7 @@ zh_CN:
       member_added: "已添加"
       member_requested: "请求于"
       add_members:
-        title: "添加成员到%{group_name}"
+        title: "添加成员到 %{group_name}"
         description: "你也可以粘贴一个以逗号分隔的列表。"
         usernames: "输入用户名或电子邮件地址"
         input_placeholder: "用户名或电子邮件"
@@ -542,7 +573,7 @@ zh_CN:
         name: "名字"
         full_name: "全名"
         add_members: "添加成员"
-        delete_member_confirm: "要从“%{group}”群组中移除用户“%{username}”吗？"
+        delete_member_confirm: "要从群组 %{group} 中移除用户 %{username} 吗？"
         profile:
           title: 个人资料
         interaction:
@@ -551,7 +582,7 @@ zh_CN:
           notification: 通知
         email:
           title: "邮箱"
-          status: "已通过IMAP同步了%{old_emails}/%{total_emails}的电子邮件。"
+          status: "已通过 IMAP 同步了 %{old_emails} / %{total_emails} 封邮件。"
           credentials:
             title: "认证"
             smtp_server: "SMTP 服务器"
@@ -562,38 +593,42 @@ zh_CN:
             imap_ssl: "为 IMAP 使用 SSL"
             username: "用户名"
             password: "密码"
+          settings:
+            title: "设置"
+            allow_unknown_sender_topic_replies: "允许从未知发件人话题的回复。"
+            allow_unknown_sender_topic_replies_hint: "允许未知发件人回复群组话题，如果未启用此功能，那么不在 IMAP 邮件对话中，且未被邀请至该话题的邮件地址的回复，将会创建一个新的话题。"
           mailboxes:
             synchronized: "已同步的邮箱"
             none_found: "未在此电子邮件帐户中找到任何邮箱。"
-            disabled: "停用"
+            disabled: "已"
         membership:
-          title: 成员资格
+          title: 成员
           access: 访问
         categories:
-          title: 类别管理
-          long_title: "类别默认通知"
-          description: "将用户添加到此组时，其类别通知将设置为这样的默认值。在这之后，还可以改变类别通知。"
-          watched_categories_instructions: "自动监控这些类别中的所有主题。组成员将收到所有新帖子和主题的通知，主题旁边还会显示新帖子的计数。"
-          tracked_categories_instructions: "自动跟踪这些类别中的所有主题。新帖子的计数将显示在主题旁边。"
-          watching_first_post_categories_instructions: "用户将收到这些类别中每个新主题的第一篇文章的通知。"
-          regular_categories_instructions: "如果这些分类已经被静音，将为群组成员取消静音。用户被提及到或被回复时会被通知。"
-          muted_categories_instructions: "用户不会收到有关这些类别中新主题的任何通知，也不会出现在类别或最新主题页面上。"
+          title: 分类
+          long_title: "分类默认通知"
+          description: "将用户添加到此组时，其分类通知将默认设置为此，在这之后，他们还可以自行修改。"
+          watched_categories_instructions: "自动关注这些分类中的所有话题，组成员将收到所有新帖子和话题的通知，话题旁还会显示新帖子的数量。"
+          tracked_categories_instructions: "自动跟踪这些分类中的所有话题，新帖子的数量将显示在话题旁边。"
+          watching_first_post_categories_instructions: "用户将收到这些分类中每个新话题的第一篇文章的通知。"
+          regular_categories_instructions: "如果这些分类已经被静音，将为群组成员取消静音，用户被提及到或被回复时会被通知。"
+          muted_categories_instructions: "用户不会收到有关这些类别中新话题的任何通知，也不会出现在分类或最新话题页面上。"
         tags:
           title: 标签
           long_title: "标签默认通知"
           description: "将用户添加到此组时，其标签的通知将默认为这些设置。在这之后，还可以修改。"
-          watched_tags_instructions: "自动监控带有这些标签的所有主题。组成员将收到所有新帖子和主题的通知，主题旁边还会显示新帖子的计数。"
-          tracked_tags_instructions: "使用这些标签自动跟踪所有主题。新帖子的计数将显示在主题旁边。"
-          watching_first_post_tags_instructions: "用户将收到每个新主题中带有这些标签的第一篇文章的通知。"
-          regular_tags_instructions: "如果这些分类已经被静音，将为群组成员取消静音。用户被提及到或被回复时会被通知。"
-          muted_tags_instructions: "用户不会收到任何有关这些标签的新主题的通知，也不会显示在最新通知中。"
+          watched_tags_instructions: "自动关注带有这些标签的所有话题。组成员将收到所有新帖子和话题的通知，话题旁边还会显示新帖子的数量。"
+          tracked_tags_instructions: "自动跟踪有这些标签的所有话题，新帖子的数量将显示在话题旁边。"
+          watching_first_post_tags_instructions: "用户将收到带有这些标签的每个新话题的第一篇文章的通知。"
+          regular_tags_instructions: "如果这些标签已经被静音，将为群组成员取消静音，用户被提及到或被回复时会被通知。"
+          muted_tags_instructions: "用户不会收到有关这些标签的新话题的任何通知，也不会出现在最新话题中。"
         logs:
           title: "日志"
-          when: "时间"
+          when: "何时"
           action: "操作"
-          acting_user: "模拟用户"
+          acting_user: "操作用户"
           target_user: "目标用户"
-          subject: "主题"
+          subject: "话题"
           details: "详情"
           from: "从"
           to: "到"
@@ -609,20 +644,20 @@ zh_CN:
         requests: "没有请求加入此群组的请求。"
         mentions: "群组从未被提及过。"
         messages: "群组从未发送过私信。"
-        topics: "群组的成员从未发表主题。"
+        topics: "群组的成员从未发表话题。"
         logs: "没有关于群组的日志。"
       add: "添加"
       join: "加入"
       leave: "离开"
       request: "请求"
-      message: "私信"
+      message: "消息"
       confirm_leave: "你确定要离开这个群组吗？"
-      allow_membership_requests: "允许用户向群组所有者发送成员资格请求（需要公开可见的群组）"
-      membership_request_template: "用户发送会员请求时向其显示的自定义模板"
+      allow_membership_requests: "允许用户向群组所有者发送成员申请（需要公开可见的群组）"
+      membership_request_template: "用户发送成员申请时向其显示的自定义模板"
       membership_request:
-        submit: "提交成员申请"
-        title: "申请加入%{group_name}"
-        reason: "向群组拥有者说明你为何属于这个群组"
+        submit: "提交申请"
+        title: "申请加入 %{group_name}"
+        reason: "向群组所有者说明你为什么要进入这个群组"
       membership: "成员资格"
       name: "名称"
       group_name: "群组名"
@@ -635,8 +670,8 @@ zh_CN:
         all: "所有群组"
         empty: "没有可见的群组。"
         filter: "根据群组类型筛选"
-        owner_groups: "拥有的群组"
-        close_groups: "关闭的群组"
+        owner_groups: "我拥有的群组"
+        close_groups: "已关闭群组"
         automatic_groups: "自动群组"
         automatic: "自动"
         closed: "已关闭"
@@ -646,7 +681,7 @@ zh_CN:
         automatic_group: 自动群组
         close_group: 关闭群组
         my_groups: "我的群组"
-        group_type: "群组类别"
+        group_type: "群组类型"
         is_group_user: "成员"
         is_group_owner: "所有者"
       title:
@@ -657,37 +692,52 @@ zh_CN:
         filter_placeholder_admin: "用户名或电子邮件"
         filter_placeholder: "用户名"
         remove_member: "移除成员"
-        remove_member_description: "从群组中移除<b>%{username}</b>"
+        remove_member_description: "从群组中移除 <b>%{username}</b>"
         make_owner: "设为所有者"
-        make_owner_description: "使<b>%{username}</b>成为群组所有者"
+        make_owner_description: "使 <b>%{username}</b> 成为群组所有者"
         remove_owner: "撤销所有者"
-        remove_owner_description: "把<b>%{username}</b>从群组所有者中移除"
+        remove_owner_description: "把 <b>%{username}</b> 从群组所有者中移除"
+        make_primary: "设为主要成员"
+        make_primary_description: "设为 <b>%{username}</b> 的主要群组"
+        remove_primary: "移除主要"
+        remove_primary_description: "为 <b>%{username}</b> 移除这个主要群组"
+        remove_members: "移除成员"
+        remove_members_description: "从该群组中删除选定的用户"
+        make_owners: "设为所有者"
+        make_owners_description: "使选定的用户成为该群组的所有者"
+        remove_owners: "移除所有者"
+        remove_owners_description: "从该群组中移除选定的所有者"
+        make_all_primary: "全部设为主要"
+        make_all_primary_description: "为选定的用户设置这个主要群组"
+        remove_all_primary: "移除主要"
+        remove_all_primary_description: "移除这个主要群组"
         owner: "所有者"
+        primary: "主要"
         forbidden: "你不可以查看成员列表。"
-      topics: "主题"
+      topics: "话题"
       posts: "帖子"
       mentions: "提及"
-      messages: "私信"
-      notification_level: "群组私信的默认通知等级"
+      messages: "消息"
+      notification_level: "群组消息的默认通知等级"
       alias_levels:
-        mentionable: "谁能@该群组"
-        messageable: "谁能私信此群组"
+        mentionable: "谁能 @提及 该群组"
+        messageable: "谁能向此群组发送消息"
         nobody: "没有人"
-        only_admins: "管理员"
+        only_admins: "仅管理员"
         mods_and_admins: "仅版主和管理员"
-        members_mods_and_admins: "组员、版主与管理员"
-        owners_mods_and_admins: "仅群组成员、版主与管理员"
+        members_mods_and_admins: "仅组员、版主与管理员"
+        owners_mods_and_admins: "仅所有者、版主与管理员"
         everyone: "任何人"
       notifications:
         watching:
-          title: "跟踪"
-          description: "你将会在该私信中的每个新帖子发布后收到通知，并且会显示新回复数量。"
+          title: "关注"
+          description: "你将会在该消息中的每个新帖子发布后收到通知，并且会显示新回复数量。"
         watching_first_post:
-          title: "监看新主题"
+          title: "关注新帖子"
           description: "你将收到有关此组中新消息的通知，但不会回复消息。"
         tracking:
           title: "跟踪"
-          description: "你会在别人@你或回复你时收到通知，并且新帖数量也将在这些主题后显示。"
+          description: "你会在别人@你或回复你时收到通知，并且新帖数量也将在这些话题后显示。"
         regular:
           title: "常规"
           description: "如果有人@你或回复你，将通知你。"
@@ -695,7 +745,7 @@ zh_CN:
           title: "静音"
           description: "你不会收到有关此组中消息的任何通知。"
       flair_url: "头像图片"
-      flair_upload_description: "使用边长不小于20px的正方形图片。"
+      flair_upload_description: "使用边长不小于 20px 的正方形图片。"
       flair_bg_color: "头像背景颜色"
       flair_bg_color_placeholder: "（可选）十六进制色彩值"
       flair_color: "头像颜色"
@@ -709,14 +759,14 @@ zh_CN:
       "1": "点赞"
       "2": "获得赞"
       "3": "收藏"
-      "4": "主题"
+      "4": "话题"
       "5": "回复"
       "6": "回应"
       "7": "提及"
       "9": "引用"
       "11": "编辑"
       "12": "发送"
-      "13": "收件"
+      "13": "收件箱"
       "14": "待定"
       "15": "草稿"
     categories:
@@ -726,25 +776,31 @@ zh_CN:
       category: "分类"
       category_list: "显示分类列表"
       reorder:
-        title: "重新分类排序"
+        title: "分类排序"
         title_long: "重新对分类列表进行排序"
         save: "保存排序"
         apply_all: "应用"
         position: "位置"
       posts: "新帖"
-      topics: "主题"
+      topics: "话题"
       latest: "最新"
-      latest_by: "最新发表："
       toggle_ordering: "排序控制"
       subcategories: "子分类"
-      muted: "静音的分类"
+      muted: "已静音分类"
       topic_sentence:
-        other: "%{count} 主题"
+        other: "%{count} 话题"
+      topic_stat:
+        other: "%{number} / %{unit}"
+      topic_stat_unit:
+        week: "周"
+        month: "月"
+      topic_stat_all_time:
+        other: "总计 %{number}"
       topic_stat_sentence_week:
-        other: "过去一周有%{count}个新主题。"
+        other: "过去一周有 %{count} 个新话题。"
       topic_stat_sentence_month:
-        other: "过去一个月有%{count}个新主题。"
-      n_more: "分类 （还有%{count}个分类）"
+        other: "过去一个月有 %{count} 个新话题。"
+      n_more: "分类 （还有 %{count} 个分类）"
     ip_lookup:
       title: IP 地址查询
       hostname: 主机名
@@ -757,32 +813,32 @@ zh_CN:
       username: "用户名"
       trust_level: "信任等级"
       read_time: "阅读时间"
-      topics_entered: "进入的主题"
+      topics_entered: "进入的话题"
       post_count: "# 帖子"
       confirm_delete_other_accounts: "确定要删除这些账户？"
-      powered_by: "使用<a href='https://maxmind.com'>MaxMindDB</a>"
+      powered_by: "使用 <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "已复制"
     user_fields:
       none: "（选择一项）"
-      required: '请为“%{name}”输入一个值。'
+      required: '请为 “%{name}” 输入一个值。'
     user:
       said: "%{username}："
       profile: "个人资料"
-      mute: "防打扰"
+      mute: "静音"
       edit: "修改设置"
       download_archive:
         button_text: "全部下载"
         confirm: "你确定要下载你的帖子吗？"
         success: "下载开始，完成后将有私信通知你。"
-        rate_limit_error: "帖子只能每天下载一次，请明天再重试。"
-      new_private_message: "发新私信"
+        rate_limit_error: "帖子只能每天下载一次，请明天再试。"
+      new_private_message: "新建消息"
       private_message: "私信"
       private_messages: "私信"
       user_notifications:
         filters:
           filter_by: "筛选"
           all: "全部"
-          read: "阅读"
+          read: "已读"
           unread: "未读"
         ignore_duration_title: "忽略的用户"
         ignore_duration_username: "用户名"
@@ -790,30 +846,46 @@ zh_CN:
         ignore_duration_save: "忽略"
         ignore_duration_note: "请注意所有忽略的项目会在忽略的时间段过去后被自动移除"
         ignore_duration_time_frame_required: "请选择时间范围"
-        ignore_no_users: "你没有忽视任何用户"
-        ignore_option: "忽略"
+        ignore_no_users: "你没有忽略任何用户"
+        ignore_option: "已忽略"
         ignore_option_title: "你将不会收到关于此用户的通知并且隐藏其所有帖子及回复。"
         add_ignored_user: "添加..."
-        mute_option: "静音"
+        mute_option: "已静音"
         mute_option_title: "你不会收到任何关于此用户的通知"
         normal_option: "普通"
         normal_option_title: "如果用户回复、引用或提到你，你将会收到消息。"
+      notification_schedule:
+        title: "定时通知"
+        label: "启用自定义定时通知"
+        tip: "在这些时间之外，你将自动进入 “勿扰” 状态。"
+        midnight: "午夜"
+        none: "无"
+        monday: "星期一"
+        tuesday: "星期二"
+        wednesday: "星期三"
+        thursday: "星期四"
+        friday: "星期五"
+        saturday: "星期六"
+        sunday: "星期日"
+        to: "到"
       activity_stream: "活动"
+      read: "阅读"
+      read_help: "最近阅读的话题"
       preferences: "设置"
       feature_topic_on_profile:
-        open_search: "选择一个新主题"
-        title: "选择一个主题"
-        search_label: "通过标题搜索主题"
+        open_search: "选择一个新话题"
+        title: "选择一个话题"
+        search_label: "通过标题搜索话题"
         save: "保存"
         clear:
           title: "清除"
-          warning: "你确定要清除精选主题吗？"
+          warning: "你确定要清除精选话题吗？"
       use_current_timezone: "使用现在的时区"
       profile_hidden: "此用户公共信息已被隐藏。"
       expand_profile: "展开"
-      collapse_profile: "折叠"
+      collapse_profile: "收起"
       bookmarks: "收藏"
-      bio: "我是谁"
+      bio: "关于我"
       timezone: "时区"
       invited_by: "邀请人"
       trust_level: "信任等级"
@@ -821,19 +893,26 @@ zh_CN:
       statistics: "统计"
       desktop_notifications:
         label: "实时通知"
-        not_supported: "通知功能暂不支持该浏览器。抱歉。"
+        not_supported: "通知功能暂不支持该浏览器，抱歉。"
         perm_default: "启用通知"
         perm_denied_btn: "拒绝授权"
-        perm_denied_expl: "你拒绝了通知提醒的权限。设置浏览器以启用通知提醒。"
-        disable: "停用通知"
+        perm_denied_expl: "你拒绝了通知提醒的权限，设置浏览器以启用通知提醒。"
+        disable: "通知"
         enable: "启用通知"
-        each_browser_note: "注意：你必须在你使用的所用浏览器中更改这项设置。"
+        each_browser_note: '注意：你必须在你使用的每个浏览器上更改此设置，在 “勿扰” 状态下，所有通知都将被，无视具体设置。'
         consent_prompt: "有回复时是否接收通知？"
       dismiss: "忽略"
       dismiss_notifications: "忽略所有"
       dismiss_notifications_tooltip: "标记所有未读通知为已读"
-      first_notification: "你的头一个通知！选中它开始。"
-      dynamic_favicon: "在浏览器图标上显示计数"
+      no_messages_title: "你没有消息"
+      no_messages_body: >
+        想要直接与某人对话而不是公开的讨论？选择他的头像后点击 %{icon} 私信按钮。<br><br> 如果你需要帮助，你可以 <a href='%{aboutUrl}'>联系管理员</a>。
+      no_bookmarks_title: "你还没有任何收藏"
+      no_bookmarks_body: >
+        用 %{icon} 按钮收藏帖子，它们将出现在这里，便于参考。你也可以安排一个提醒!
+      no_notifications_title: "你还没有任何通知"
+      first_notification: "你的第一个通知！选中它以开始。"
+      dynamic_favicon: "在浏览器图标上显示数量"
       skip_new_user_tips:
         description: "跳过新用户流程提示和徽章"
         not_first_time: "不是第一次？"
@@ -842,7 +921,7 @@ zh_CN:
       color_scheme_default_on_all_devices: "为我所有的设备上设置默认配色方案"
       color_scheme: "配色方案"
       color_schemes:
-        default_description: "默认"
+        default_description: "主题默认"
         disable_dark_scheme: "与常规相同"
         dark_instructions: "你可以通过切换你的设备的深色模式来预览深色模式的配色方案。"
         undo: "重置"
@@ -855,15 +934,15 @@ zh_CN:
       allow_private_messages: "允许其他用户发送私信给我"
       external_links_in_new_tab: "在新标签页打开外部链接"
       enable_quoting: "在选择文字时显示引用回复按钮"
-      enable_defer: "启用延迟以标记未读主题"
+      enable_defer: "启用延迟以标记未读话题"
       change: "修改"
-      featured_topic: "精选主题"
-      moderator: "%{user}是版主"
-      admin: "%{user}是管理员"
-      moderator_tooltip: "用户是版主"
-      admin_tooltip: "用户是管理员"
+      featured_topic: "精选话题"
+      moderator: "%{user} 是版主"
+      admin: "%{user} 是管理员"
+      moderator_tooltip: "此用户是版主"
+      admin_tooltip: "此用户是管理员"
       silenced_tooltip: "该用户已被禁言。"
-      suspended_notice: "该用户将被禁止登录，直至 %{date}。"
+      suspended_notice: "该用户已被封禁到 %{date}。"
       suspended_permanently: "该用户被封禁了。"
       suspended_reason: "原因： "
       github_profile: "GitHub"
@@ -873,52 +952,52 @@ zh_CN:
         enabled: "启用邮件列表模式"
         instructions: |
           此设置将覆盖活动摘要。<br />
-          静音主题和分类不包含在这些邮件中。
+          已静音话题和分类不包含在这些邮件中。
         individual: "为每个新帖发送一封邮件通知"
         individual_no_echo: "为每个除了我发表的新帖发送一封邮件通知"
         many_per_day: "为每个新帖给我发送邮件（大约每天 %{dailyEmailEstimate} 封）"
         few_per_day: "为每个新帖给我发送邮件（大约每天 2 封）"
-        warning: "邮件列表模式启用。邮件通知设置被覆盖。"
+        warning: "邮件列表模式启用，邮件通知设置被覆盖。"
       tag_settings: "标签"
-      watched_tags: "关注"
-      watched_tags_instructions: "你将自动关注所有含有这些标签的主题。你会收到所有新帖子和主题的通知，且新帖子的数量也会显示在主题旁边。"
-      tracked_tags: "跟踪"
-      tracked_tags_instructions: "你将自动跟踪所有含有这些标签的主题，新帖数量将会显示在主题旁边。"
+      watched_tags: "已关注"
+      watched_tags_instructions: "你将自动关注所有含有这些标签的话题。你会收到所有新帖子和话题的通知，且新帖子的数量也会显示在话题旁边。"
+      tracked_tags: "已跟踪"
+      tracked_tags_instructions: "你将自动跟踪所有含有这些标签的话题，新帖数量将会显示在话题旁边。"
       muted_tags: "静音"
-      muted_tags_instructions: "你将不会收到有这些标签的新主题任何通知，它们也不会出现在“最新”主题列表。"
-      watched_categories: "监看"
-      watched_categories_instructions: "你将自动关注这些分类中的所有主题。你会收到所有新帖子和新主题的通知，新帖数量也会显示在主题旁边。"
-      tracked_categories: "跟踪"
-      tracked_categories_instructions: "你将自动跟踪这些分类中的所有主题。新帖数量将会显示在主题旁边。"
-      watched_first_post_categories: "监看新主题"
-      watched_first_post_categories_instructions: "在这些分类里面，每一个新主题的第一帖会通知你。"
-      watched_first_post_tags: "监看新主题"
-      watched_first_post_tags_instructions: "在有了这些标签的每一个新主题，第一帖会通知你。"
-      muted_categories: "静音"
-      muted_categories_instructions: "你不会收到这些分类中任何关于新主题的通知，并且这些新主题也不会出现在分类或最新的页面上。"
-      muted_categories_instructions_dont_hide: "你将不会收到在这些分类中的新主题通知。"
+      muted_tags_instructions: "你将不会收到有这些标签的新话题任何通知，它们也不会出现在最新话题中。"
+      watched_categories: "已关注"
+      watched_categories_instructions: "你将自动关注这些分类中的所有话题，你会收到所有新帖子和新话题的通知，新帖数量也会显示在话题旁边。"
+      tracked_categories: "已跟踪"
+      tracked_categories_instructions: "你将自动跟踪这些分类中的所有话题，新帖数量将会显示在话题旁边。"
+      watched_first_post_categories: "关注新贴"
+      watched_first_post_categories_instructions: "这些分类里面每一个新话题的第一帖会通知你。"
+      watched_first_post_tags: "关注新贴"
+      watched_first_post_tags_instructions: "有这些标签的每一个新话题第一帖会通知你。"
+      muted_categories: "已静音"
+      muted_categories_instructions: "你不会收到这些分类中任何关于新话题的通知，并且这些新话题也不会出现在分类或最新的页面上。"
+      muted_categories_instructions_dont_hide: "你将不会收到在这些分类中的新话题通知。"
       regular_categories: "活跃用户"
-      regular_categories_instructions: "你会在“最新”和“热门”主题列表中看到这些分类。"
-      no_category_access: "无法保存，作为审核人你仅具有受限的 分类 访问权限"
+      regular_categories_instructions: "你会在“最新”和“热门”话题列表中看到这些分类。"
+      no_category_access: "无法保存，作为审核者你仅具有受限的分类访问权限"
       delete_account: "删除我的账户"
       delete_account_confirm: "你真的要永久删除自己的账户吗？删除之后无法恢复！"
       deleted_yourself: "你的账户已被删除。"
       delete_yourself_not_allowed: "想删除账户请联系管理人员。"
-      unread_message_count: "私信"
+      unread_message_count: "消息"
       admin_delete: "删除"
       users: "用户"
-      muted_users: "静音"
+      muted_users: "已静音"
       muted_users_instructions: "屏蔽来自这些用户的所有通知以及私信。"
-      allowed_pm_users: "允许的"
+      allowed_pm_users: "已允许"
       allowed_pm_users_instructions: "仅允许来自这些用户的私信。"
       allow_private_messages_from_specific_users: "仅允许特定用户向我发送私信"
-      ignored_users: "忽视"
+      ignored_users: "已忽略"
       ignored_users_instructions: "屏蔽这些用户的所有帖子、通知和私信。"
       tracked_topics_link: "显示"
-      automatically_unpin_topics: "当我完整阅读了主题时自动解除置顶。"
+      automatically_unpin_topics: "当我完整阅读了话题后自动取消置顶。"
       apps: "应用"
-      revoke_access: "撤销许可"
-      undo_revoke_access: "解除撤销许可"
+      revoke_access: "撤销访问权限"
+      undo_revoke_access: "重做撤销访问权限"
       api_approved: "已批准："
       api_last_used_at: "最后使用于："
       theme: "主题"
@@ -936,16 +1015,17 @@ zh_CN:
         all: "所有"
         inbox: "收件箱"
         sent: "已发送"
-        archive: "存档"
+        archive: "归档"
         groups: "我的群组"
-        bulk_select: "选择私信"
+        bulk_select: "选择消息"
         move_to_inbox: "移动到收件箱"
-        move_to_archive: "存档"
-        failed_to_move: "移动选中私信失败（可能你的网络出问题了）"
+        move_to_archive: "归档"
+        failed_to_move: "移动选中消息失败（可能你的网络出问题了）"
         select_all: "全选"
         tags: "标签"
       preferences_nav:
         account: "账户"
+        security: "安全"
         profile: "个人信息"
         emails: "邮件"
         notifications: "通知"
@@ -966,22 +1046,22 @@ zh_CN:
       second_factor_backup:
         title: "双重认证备份码"
         regenerate: "重新生成"
-        disable: "停用"
+        disable: "禁用"
         enable: "启用"
         enable_long: "启用备份码"
         manage:
-          other: "管理备份码。你还剩下<strong>%{count}</strong>个可用的备份码。"
+          other: "管理备份码，你还剩下 <strong>%{count}</strong> 个可用的备份码。"
         copy_to_clipboard: "复制到剪贴板"
         copy_to_clipboard_error: "复制到剪贴板时出错"
         copied_to_clipboard: "已复制到剪贴板"
         download_backup_codes: "下载备份码"
         remaining_codes:
-          other: "你还剩下<strong>%{count}</strong>个可用的备份码。"
+          other: "你还剩下 <strong>%{count}</strong> 个可用的备份码。"
         use: "使用备份码"
         enable_prerequisites: "在生成备份码之前你必须选用一个双重验证方式。"
         codes:
           title: "备份码生成"
-          description: "每个备份码只能使用一次。请存放于安全可读的地方。"
+          description: "每个备份码只能使用一次，请存放于安全可读的地方。"
       second_factor:
         title: "双重认证"
         enable: "管理双重认证"
@@ -989,21 +1069,21 @@ zh_CN:
         forgot_password: "忘记密码？"
         confirm_password_description: "请确认密码后继续"
         name: "名称"
-        label: "编码"
+        label: "代码"
         rate_limit: "请等待另一个验证码。"
         enable_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" target="_blank">iOS</a>) 扫描此二维码并输入您的授权码。
-        disable_description: "请输入来自 app 的验证码"
+        disable_description: "请输入来自应用的验证码"
         show_key_description: "手动输入"
         short_description: |
           使用一次性安全码保护你的账户。
         extended_description: |
-          双重验证要求你的密码之外的一次性令牌，从而为你的账户增加额外的安全性。可以在<a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a>和<a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a>设备上生成令牌。
+          双重验证要求你的密码之外的一次性令牌，从而为你的账户增加额外的安全性。可以在<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_confirm: "你确定要停用所有的双重认证措施吗？"
+        disable: "禁用"
+        disable_confirm: "你确定要禁用所有的双重认证措施吗？"
         save: "保存"
         edit: "编辑"
         edit_title: "添加认证器"
@@ -1011,7 +1091,7 @@ zh_CN:
         enable_security_key_description: |
           当你准备好<a href="https://www.google.com/search?q=hardware+security+key" target="_blank">物理安全密钥</a>后，请按下面的“注册”按钮。
         totp:
-          title: "基于凭证的身份验证器"
+          title: "基于令牌的身份验证器"
           add: "添加身份验证器"
           default_name: "我的身份验证器"
           name_and_code_required_error: "你必须提供你的身份验证器应用的名称和代码。"
@@ -1028,14 +1108,14 @@ zh_CN:
           name_required_error: "你必须提供安全密钥的名称。"
       change_about:
         title: "更改个人信息"
-        error: "提交修改时出错了"
+        error: "修改时出错了"
       change_username:
         title: "更换用户名"
         confirm: "你确定要更改用户名吗？"
         taken: "抱歉，此用户名已经有人使用了。"
         invalid: "此用户名不合法，用户名只能包含字母和数字"
       add_email:
-        title: "添加邮箱地址"
+        title: "添加邮箱"
         add: "添加"
       change_email:
         title: "更换邮箱"
@@ -1047,44 +1127,46 @@ zh_CN:
       change_avatar:
         title: "更换头像"
         gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>，基于"
-        gravatar_title: "在%{gravatarName}网站修改你的头像"
-        gravatar_failed: "我们无法找到此电子邮件的%{gravatarName}。"
-        refresh_gravatar_title: "刷新你的%{gravatarName}"
+        gravatar_title: "在 %{gravatarName} 网站修改你的头像"
+        gravatar_failed: "我们无法找到此电子邮件的 %{gravatarName}。"
+        refresh_gravatar_title: "刷新你的 %{gravatarName}"
         letter_based: "默认头像"
         uploaded_avatar: "自定义图片"
         uploaded_avatar_empty: "上传自定义图片"
         upload_title: "上传图片"
         image_is_not_a_square: "注意：图片不是正方形的，我们裁剪了部分图像。"
+        logo_small: "网站的小徽标，默认情况下使用。"
       change_profile_background:
-        title: "个人档头部"
-        instructions: "个人资料的页头会被居中显示且默认宽度为1110px。"
+        title: "个人资料顶部"
+        instructions: "个人资料的顶部会被居中显示且默认宽度为1110px。"
       change_card_background:
-        title: "用户卡背景"
+        title: "用户卡片背景"
         instructions: "显示在用户卡片中，上传的图片将被居中且默认宽度为 590px。"
       change_featured_topic:
-        title: "精选主题"
-        instructions: "此主题的链接会显示在你的用户卡片和资料中。"
+        title: "精选话题"
+        instructions: "此话题的链接会显示在你的用户卡片和资料中。"
       email:
         title: "邮箱"
-        primary: "主邮箱"
-        secondary: "次邮箱"
+        primary: "主要邮箱"
+        secondary: "次要邮箱"
         primary_label: "主要"
         unconfirmed_label: "未确认"
         resend_label: "重新发送确认邮件"
         resending_label: "发送中..."
         resent_label: "邮件已发送"
         update_email: "更换邮箱"
-        set_primary: "设置为主邮箱"
+        set_primary: "设置为主要邮箱"
         destroy: "删除邮箱"
         add_email: "添加次要邮箱"
-        sso_override_instructions: "电子邮件地址可以通过SSO登录来更新。"
-        no_secondary: "没有次邮箱"
+        auth_override_instructions: "身份验证提供商可以更新电子邮件。"
+        no_secondary: "没有次要邮箱"
         instructions: "绝不会被公开显示"
         admin_note: "注意：一位管理员用户更改另一位非管理员用户的电子邮件，则表明该用户已失去了其原始电子邮件帐户的访问权限，因此重置密码的电子邮件将发送到其新邮箱。在用户完成重置密码流程之前，用户的电子邮件不会被更改。"
         ok: "将通过邮件验证确认"
-        required: "请输入一个电子邮件地址"
+        required: "请输入一个邮箱地址"
         invalid: "请填写正确的邮箱地址"
-        authenticated: "你的邮箱已被%{provider}验证过了"
+        authenticated: "你的邮箱已被 %{provider} 验证过了"
+        invite_auth_email_invalid: "您的邀请电子邮件与 %{provider} 验证的电子邮件不匹配"
         frequency_immediately: "如果你没有阅读过摘要邮件中的相关内容，将立即发送电子邮件给你。"
         frequency:
           other: "仅在 %{count} 分钟内没有访问时发送邮件给你。"
@@ -1094,36 +1176,37 @@ zh_CN:
         revoke: "撤销"
         cancel: "取消"
         not_connected: "（没有连接）"
-        confirm_modal_title: "连接%{provider}帐号"
+        confirm_modal_title: "连接 %{provider} 帐号"
         confirm_description:
-          account_specific: "你的%{provider}帐号“%{account_description}”会被用作认证。"
-          generic: "你的%{provider}帐号会被用作认证。"
+          account_specific: "你的 %{provider} 帐号“%{account_description}”会被用作认证。"
+          generic: "你的 %{provider} 帐号会被用作认证。"
       name:
-        title: "昵称"
+        title: "名称"
         instructions: "你的全名（可选）"
-        instructions_required: "你的昵称"
-        required: "请输入一个名字"
-        too_short: "昵称过短"
-        ok: "昵称可用"
+        instructions_required: "你的全名"
+        required: "请输入一个名称"
+        too_short: "名称过短"
+        ok: "名称可用"
       username:
         title: "用户名"
         instructions: "独一无二，没有空格，简短"
         short_instructions: "其他人可以用 @%{username} 来提及你"
         available: "用户名可用"
-        not_available: "不可用。试试 %{suggestion} ？"
+        not_available: "不可用，试试 %{suggestion} ？"
         not_available_no_suggestion: "不可用"
         too_short: "用户名过短"
         too_long: "用户名过长"
         checking: "查看用户名是否可用…"
         prefilled: "邮箱与用户匹配成功"
         required: "请输入一个用户名"
+        edit: "编辑用户名"
       locale:
         title: "界面语言"
-        instructions: "用户界面语言。将在你刷新页面后改变。"
+        instructions: "用户界面语言，将在你刷新页面后改变。"
         default: "默认"
         any: "任意"
       password_confirmation:
-        title: "请再次输入密码"
+        title: "重复密码"
       invite_code:
         title: "邀请码"
         instructions: "账户注册需要邀请码"
@@ -1136,7 +1219,7 @@ zh_CN:
         show_few: "显示部分"
         was_this_you: "这是你吗？"
         was_this_you_description: "如果不是你，我们建议你更改密码并退出所有登录。"
-        browser_and_device: "%{browser}在%{device}"
+        browser_and_device: "%{browser} 在 %{device}"
         secure_account: "保护我的账户"
         latest_post: "你上次发布了......"
         device_location: '<span class="auth-token-device">%{device}</span> &ndash; <span title="IP: %{ip}">%{location}</span>'
@@ -1146,12 +1229,12 @@ zh_CN:
       last_emailed: "最后邮寄"
       last_seen: "最后活动"
       created: "加入时间"
-      log_out: "退出"
+      log_out: "登出"
       location: "地点"
       website: "网址"
       email_settings: "邮箱"
       hide_profile_and_presence: "隐藏我的公开个人资料和状态功能"
-      enable_physical_keyboard: "在iPad上启用物理键盘支持"
+      enable_physical_keyboard: "在 iPad 上启用物理键盘支持"
       text_size:
         title: "文本大小"
         smallest: "最小"
@@ -1160,30 +1243,30 @@ zh_CN:
         larger: "更大"
         largest: "最大"
       title_count_mode:
-        title: "背景页面标题显示计数："
+        title: "背景页面标题显示数量："
         notifications: "新通知"
         contextual: "新建页面内容"
       like_notification_frequency:
-        title: "被赞时通知提醒"
+        title: "被赞时通知"
         always: "始终"
         first_time_and_daily: "每天帖子首个被赞"
         first_time: "帖子第一次被赞"
         never: "从不"
       email_previous_replies:
         title: "邮件底部包含历史回复"
-        unless_emailed: "首次"
+        unless_emailed: "之前未发送过"
         always: "始终"
         never: "从不"
       email_digests:
-        title: "长期未访问时发送热门主题和回复的摘要邮件"
+        title: "长期未访问时发送热门话题和回复的摘要邮件"
         every_30_minutes: "每半小时"
         every_hour: "每小时"
         daily: "每天"
         weekly: "每周"
         every_month: "每月"
-        every_six_months: "每6个月"
+        every_six_months: "每六个月"
       email_level:
-        title: "当有人引用和回复我的帖子、@我或邀请我至主题时，给我发送邮件"
+        title: "当有人引用和回复我的帖子、@我或邀请我至话题时，给我发送邮件"
         always: "始终"
         only_when_away: "只在离开时"
         never: "从不"
@@ -1193,14 +1276,14 @@ zh_CN:
       other_settings: "其它"
       categories_settings: "分类"
       new_topic_duration:
-        label: "近期主题条件："
-        not_viewed: "未读主题"
+        label: "何时被当作新话题"
+        not_viewed: "我没有看过的"
         last_here: "上次访问后发布"
         after_1_day: "一天内发布"
         after_2_days: "两天内发布"
         after_1_week: "一周内发布"
         after_2_weeks: "两周内发布"
-      auto_track_topics: "自动跟踪我浏览的主题"
+      auto_track_topics: "自动跟踪我浏览的话题"
       auto_track_options:
         never: "从不"
         immediately: "立即"
@@ -1211,48 +1294,48 @@ zh_CN:
         after_4_minutes: "4分钟后"
         after_5_minutes: "5分钟后"
         after_10_minutes: "10分钟后"
-      notification_level_when_replying: "当我在主题中回复后，将主题设置至"
+      notification_level_when_replying: "当我在话题中回复后，将话题设置至"
       invited:
-        search: "输入以搜索邀请…"
         title: "邀请"
+        pending_tab: "待确认"
+        pending_tab_with_count: "待确认（%{count}）"
+        expired_tab: "已过期"
+        expired_tab_with_count: "已过期（%{count}）"
+        redeemed_tab: "已确认"
+        redeemed_tab_with_count: "已确认（%{count}）"
+        invited_via: "邀请"
+        invited_via_link: "链接 %{key}（%{count} / %{max} 已激活）"
+        groups: "群组"
+        topic: "话题"
+        sent: "创建/发送时间"
+        expires_at: "过期"
+        edit: "编辑"
+        remove: "移除"
+        copy_link: "获取链接"
+        reinvite: "重新发送电子邮件"
+        reinvited: "邀请已重新发送"
+        removed: "已移除"
+        search: "输入以搜索邀请…"
         user: "邀请用户"
-        sent: "上次发送"
         none: "无邀请显示。"
         truncated:
           other: "只显示前 %{count} 个邀请。"
         redeemed: "确认邀请"
-        redeemed_tab: "已确认"
-        redeemed_tab_with_count: "已确认（%{count}）"
         redeemed_at: "已确认"
-        pending: "待验证邀请"
-        pending_tab: "等待中"
-        pending_tab_with_count: "待确认（%{count}）"
-        topics_entered: "已阅主题"
+        pending: "待确认邀请"
+        topics_entered: "已查看话题"
         posts_read_count: "已读帖子"
         expired: "邀请已过期。"
-        rescind: "移除"
-        rescinded: "邀请已删除"
-        rescind_all: "删除过期的邀请"
-        rescinded_all: "所有过期邀请已删除！"
-        rescind_all_confirm: "你确定你想要移除所有过期邀请么？"
-        reinvite: "重新发送邀请"
-        reinvite_all: "重发所有邀请"
+        remove_all: "移除过期的邀请"
+        removed_all: "已移除所有已过期的邀请！"
+        remove_all_confirm: "你确定要移除所有已过期的邀请吗？"
+        reinvite_all: "重新发送所有邀请"
         reinvite_all_confirm: "确定要重发这些邀请吗？"
-        reinvited: "邀请已重新发送"
-        reinvited_all: "所有邀请已重新发送！"
+        reinvited_all: "所有的邀请都已发出！"
         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}"
@@ -1262,14 +1345,38 @@ zh_CN:
           title: "邀请链接"
           success: "邀请链接生成成功！"
           error: "生成邀请链接时出错"
-          max_redemptions_allowed_label: "多少人被允许通过这个链接注册？"
+          max_redemptions_allowed_label: "允许多少人通过这个链接注册？"
           expires_at: "邀请链接多久失效？"
+        invite:
+          new_title: "创建邀请"
+          edit_title: "编辑邀请"
+          instructions: "分享此链接可立即授予访问此站点的权限："
+          copy_link: "复制链接"
+          expires_in_time: "%{time} 内过期"
+          expired_at_time: "过期时间为 %{time}"
+          show_advanced: "显示高级选项"
+          hide_advanced: "隐藏高级选项"
+          restrict_email: "将邀请限制为一个电子邮件地址"
+          max_redemptions_allowed: "最大使用次数："
+          add_to_groups: "添加到群组："
+          invite_to_topic: "首次登录时邀请至话题："
+          expires_at: "过期时间："
+          custom_message: "可选私信："
+          send_invite_email: "保存并发送电子邮件"
+          save_invite: "保存邀请"
+          invite_saved: "邀请已保存。"
+          invite_copied: "邀请链接已复制。"
+          blank_email: "邀请链接未复制，电子邮件地址为必填项。"
         bulk_invite:
           none: "此页面没有要显示的邀请。"
           text: "批量邀请"
-          success: "文件上传成功，当操作完成时将通过私信通知你。"
+          instructions: |
+            <p>邀请用户可以加速你的社区的发展，准备一个<a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank"> CSV 文件</a>，每行至少含有一个你想要邀请的邮件地址。如果你想要将他们添加到群组或者在首次登录时引导至特定的话题中，下列由逗号分隔的信息可选填。</p>
+            <pre>john@smith.com,first_group_name;second_group_name,topic_id</pre>
+            <p>你所上传的 CSV 文件中的每一个电子邮件地址都将被发送一个邀请，你可以稍后进行管理。</p>
+          progress: "已上传 %{progress}%..."
+          success: "文件上传成功，操作完成时会通过私信通知你。"
           error: "抱歉，文件必须是CSV格式。"
-          confirmation_message: "你将通过电子邮件将邀请发送给在上传的文件中的每一个人。"
       password:
         title: "密码"
         too_short: "密码过短"
@@ -1277,7 +1384,7 @@ zh_CN:
         same_as_username: "密码不能与用户名相同"
         same_as_email: "密码不能与邮箱相同"
         ok: "密码符合要求"
-        instructions: "至少%{count}个字符"
+        instructions: "至少 %{count} 个字符"
         required: "请输入一个密码"
       summary:
         title: "概要"
@@ -1285,17 +1392,17 @@ zh_CN:
         time_read: "阅读时间"
         recent_time_read: "近期阅读时间"
         topic_count:
-          other: "创建主题"
+          other: "已创建话题"
         post_count:
-          other: "发表帖子"
+          other: "已发表帖子"
         likes_given:
-          other: "送出"
+          other: "已发出"
         likes_received:
-          other: "收到"
+          other: "已收到"
         days_visited:
           other: "访问天数"
         topics_entered:
-          other: "已阅主题"
+          other: "已阅话题"
         posts_read:
           other: "已读帖子"
         bookmark_count:
@@ -1303,9 +1410,9 @@ zh_CN:
         top_replies: "热门回复"
         no_replies: "暂无回复。"
         more_replies: "更多回复"
-        top_topics: "热门主题"
-        no_topics: "暂无主题。"
-        more_topics: "更多主题"
+        top_topics: "热门话题"
+        no_topics: "暂无话题。"
+        more_topics: "更多话题"
         top_badges: "热门徽章"
         no_badges: "暂无徽章。"
         more_badges: "更多徽章"
@@ -1316,7 +1423,7 @@ zh_CN:
         most_replied_to_users: "最多回复至"
         no_likes: "暂无赞。"
         top_categories: "热门分类"
-        topics: "主题"
+        topics: "话题"
         replies: "回复"
       ip_address:
         title: "最后使用的 IP 地址"
@@ -1324,7 +1431,9 @@ zh_CN:
         title: "注册 IP 地址"
       avatar:
         title: "头像"
-        header_title: "个人信息、私信、收藏和设置"
+        header_title: "个人信息、消息、收藏和设置"
+        name_and_description: "%{name} - %{description}"
+        edit: "编辑个人资料图片"
       title:
         title: "头衔"
         none: "（无）"
@@ -1337,7 +1446,7 @@ zh_CN:
         posted_by: "发送人"
         sent_by: "发送时间"
         private_message: "私信"
-        the_topic: "本主题"
+        the_topic: "本话题"
     loading: "载入中…"
     errors:
       prev_page: "无法载入"
@@ -1362,40 +1471,31 @@ zh_CN:
       close: "关闭"
       dismiss_error: "忽略错误"
     close: "关闭"
-    assets_changed_confirm: "此网站刚刚已更新，你要刷新页面以获得最新版本吗？"
-    logout: "你已退出登录。"
+    assets_changed_confirm: "该站点刚才收到了一个软件更新，是否马上获取最新版本？"
+    logout: "你已登出。"
     refresh: "刷新"
     home: "首页"
     read_only_mode:
-      enabled: "站点正处于只读模式。你可以继续浏览，但是回复、点赞和其它操作暂时被禁用。"
+      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>个帖子}}。此消息仅管理人员可见。
+      让我们<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>个主题}}。此消息仅管理人员可见。
+      让我们<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>个帖子}}。此消息仅管理人员可见。
+      让我们<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}}。"
-      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>1 – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} other {# errors/minute}}</a>已经超出站点设置限制 {limit, plural, one {# error/minute} other {# errors/minute}}。"
+      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# 错误/小时} other {# 错误/小时}}</a>达到了站点设置中的限制{limit, plural, one {# error/hour} other {# errors/hour}}。"
+      reached_minute_MF: "<b>{relativeAge}</b>1 – <a href='{url}' target='_blank'>{rate, plural, one {# 错误/分钟} other {# 错误/分钟}}</a>已经达到站点设置限制 {limit, plural, one {# 错误/分钟} other {# 错误/分钟}}。"
+      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# 错误/小时} other {# 错误/小时}}</a>超出了站点设置中的限制{limit, plural, one {# 错误/小时} other {# 错误/小时}}。"
+      exceeded_minute_MF: "<b>{relativeAge}</b>1 – <a href='{url}' target='_blank'>{rate, plural, one {# 错误/分钟} other {# 错误/分钟}}</a>已经超出站点设置限制 {limit, plural, one {# 错误/分钟} other {# 错误/分钟}}。"
     learn_more: "了解更多…"
-    all_time: "总量"
-    all_time_desc: "创建的主题总量"
-    year: "年"
-    year_desc: "365 天内创建的主题"
-    month: "月"
-    month_desc: "30 天内创建的主题"
-    week: "周"
-    week_desc: "7 天内创建的主题"
-    day: "天"
     first_post: 最早帖子
     mute: 静音
     unmute: 取消静音
     last_post: 最后发帖
-    local_time: "当地时间"
+    local_time: "本地时间"
     time_read: 阅读
     time_read_recently: "最近 %{time_read}"
     time_read_tooltip: "合计阅读时间 %{time_read}"
@@ -1406,19 +1506,20 @@ zh_CN:
     signup_cta:
       sign_up: "注册"
       hide_session: "明天提醒我"
-      hide_forever: "不了"
-      hidden_for_session: "好的，我会在明天提醒你。不过你随时都可以使用“登录”来创建账户。"
+      hide_forever: "不，谢谢"
+      hidden_for_session: "好的，我们会在明天提醒你，不过你随时都可以使用“登录”来创建账户。"
       intro: "你好！看起来你正在享受讨论，但还没有注册一个账户。"
-      value_prop: "当你创建了账户，我们就可以准确地记录你的阅读进度，你再次访问时就可以回到之前离开的地方。当有人回复你，你可以通过这里或电子邮件收到通知。并且你还可以通过点赞帖子向他人分享你的喜爱之情。:heartpulse:"
+      value_prop: "当你创建了账户，我们就可以准确地记录你的阅读进度，你再次访问时就可以回到之前离开的地方。当有人回复你，你可以通过这里或电子邮件收到通知，并且你还可以通过点赞帖子向他人分享你的喜爱之情。:heartpulse:"
     summary:
-      enabled_description: "你正在查看主题的精简摘要版本：一些社区公认有意思的帖子。"
-      description: "有 <b>%{replyCount}</b> 个回复。"
-      description_time: "有 <b>%{replyCount}</b> 个回复，大约要花 <b>%{readingTime} 分钟</b>阅读。"
-      enable: "概括本主题"
+      enabled_description: "你正在查看话题的精简摘要版本：一些社区公认有意思的帖子。"
+      description:
+        other: "总计 <b>%{count}</b> 个回复。"
+      description_time_MF: "总计 {replyCount, plural, one {<b>#</b>} other {<b>#</b>}} 个回复，预计阅读时间为 <b>{readingTime, plural,one {#}other {#}} 分钟</b>。"
+      enable: "概括本话题"
       disable: "显示所有帖子"
     deleted_filter:
-      enabled_description: "这个主题包含已删除的帖子，他们已经被隐藏。"
-      disabled_description: "显示了主题中已删除的帖子。"
+      enabled_description: "这个话题包含已删除的帖子，他们已经被隐藏。"
+      disabled_description: "显示了话题中已删除的帖子。"
       enable: "隐藏已删除的帖子"
       disable: "显示已删除的帖子"
     private_message_info:
@@ -1427,7 +1528,7 @@ zh_CN:
       edit: "添加或移除"
       remove: "移除"
       add: "添加"
-      leave_message: "你真的想要发送消息么？"
+      leave_message: "你真的想要离开私信么？"
       remove_allowed_user: "确定将 %{name} 从本条私信中移除？"
       remove_allowed_group: "确定将 %{name} 从本条私信中移除？"
     email: "邮箱"
@@ -1438,9 +1539,11 @@ zh_CN:
     trust_level: "信任等级"
     search_hint: "用户名、电子邮件或 IP 地址"
     create_account:
+      header_title: "欢迎！"
+      subheader_title: "创建你的帐户"
       disclaimer: "注册即表示你同意<a href='%{privacy_link}' target='blank'>隐私策略</a>和<a href='%{tos_link}' target='blank'>服务条款</a>。"
-      title: "创建新账户"
-      failed: "出问题了，有可能这个邮箱已经被注册了。试试忘记密码链接？"
+      title: "创建你的帐户"
+      failed: "出问题了，有可能这个邮箱已经被注册了，试试忘记密码链接？"
     forgot_password:
       title: "重置密码"
       action: "我忘记了密码"
@@ -1448,47 +1551,50 @@ zh_CN:
       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_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>"
-      button_ok: "OK"
+      button_ok: "确认"
       button_help: "帮助"
     email_login:
       link_label: "给我通过邮件发送一个登录链接"
       button_label: "通过邮件"
+      login_link: "不用密码，通过电子邮件发送登录链接"
       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}登录
+      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:
+      header_title: "欢迎回来"
+      subheader_title: "登录到你的帐户"
       title: "登录"
       username: "用户"
       password: "密码"
       second_factor_title: "双重认证"
-      second_factor_description: "请输入来自 app 的验证码："
+      second_factor_description: "请输入来自应用的验证码："
       second_factor_backup: "使用备用码登录"
       second_factor_backup_title: "双重认证备份"
       second_factor_backup_description: "请输入你的备份码："
-      second_factor: "使用身份验证器app登录"
+      second_factor: "使用身份验证器应用登录"
       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: "电子邮件或者用户名"
+      email_placeholder: "电子邮件 / 用户名"
       caps_lock_warning: "大写锁定开启"
       error: "未知错误"
-      cookies_error: "你的浏览器似乎禁用了Cookie。如果不先启用它们，你可能无法登录。"
-      rate_limit: "请请稍后再重试"
+      cookies_error: "你的浏览器似乎禁用了 Cookie，如果不先启用它们，你可能无法登录。"
+      rate_limit: "请稍后再尝试登录"
       blank_username: "请输入你的邮件地址或用户名。"
       blank_username_or_password: "请输入你的邮件地址或用户名，以及密码。"
       reset_password: "重置密码"
@@ -1496,10 +1602,10 @@ zh_CN:
       or: "或"
       authenticating: "验证中…"
       awaiting_activation: "你的账户尚未激活，点击忘记密码链接以重新发送激活邮件。"
-      awaiting_approval: "你的账户尚未被论坛版主审核。请等待一段时间，当你的账户被审核时会收到一封电子邮件。"
+      awaiting_approval: "你的账户尚未被论坛版主审核，请等待一段时间，当你的账户被审核时会收到一封电子邮件。"
       requires_invite: "抱歉，本论坛仅接受邀请注册。"
       not_activated: "你还不能登录。我们已经发送了一封邮件至 <b>%{sentTo}</b>，请打开它并完成账户激活。"
-      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: "你的账户已启用双重认证，请使用密码登录。"
@@ -1508,10 +1614,10 @@ zh_CN:
       provide_new_email: "给个新地址！然后我们会再给你发一封确认邮件。"
       submit_new_email: "更新邮件地址"
       sent_activation_email_again: "我们又向 <b>%{currentEmail}</b> 发送了一封激活邮件，邮件送达可能需要几分钟；请检查一下你邮箱的垃圾邮件文件夹。"
-      sent_activation_email_again_generic: "我们发送了另一封激活邮件。它可能需要几分钟才能到达；记得检查你的垃圾邮件文件夹。"
+      sent_activation_email_again_generic: "我们发送了另一封激活邮件，它可能需要几分钟才能到达；记得检查你的垃圾邮件文件夹。"
       to_continue: "请登录"
       preferences: "需要登入后更改设置"
-      not_approved: "你的账户还未通过审核。一旦审核通过，我们将邮件通知你。"
+      not_approved: "你的账户还未通过审核，一旦审核通过，我们将邮件通知你。"
       google_oauth2:
         name: "Google"
         title: "Google 登录"
@@ -1529,17 +1635,17 @@ zh_CN:
         title: "GitHub 登录"
       discord:
         name: "Discord"
-        title: "with Discord"
+        title: "Discord 登录"
       second_factor_toggle:
-        totp: "改用身份验证APP"
+        totp: "改用身份验证应用"
         backup_code: "使用备份码"
     invites:
       accept_title: "邀请"
       emoji: "信封表情符号"
-      welcome_to: "欢迎来到%{site_name}！"
+      welcome_to: "欢迎来到 %{site_name}！"
       invited_by: "邀请你的是："
       social_login_available: "你也可以通过任何使用这个邮箱的社交网站登录。"
-      your_email: "你的账户的邮箱地址为<b>%{email}</b>。"
+      your_email: "你的账户的邮箱地址为 <b>%{email}</b>。"
       accept_invite: "接受邀请"
       success: "已创建你的账户，你现在可以登录了。"
       name_label: "昵称"
@@ -1551,17 +1657,16 @@ zh_CN:
       apple_international: "Apple/国际化"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "JoyPixels （曾用名EmojiOne）"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "仅分类"
-      categories_with_featured_topics: "有推荐主题的分类"
-      categories_and_latest_topics: "分类和最新主题"
-      categories_and_top_topics: "分类和最热主题"
+      categories_with_featured_topics: "有精选话题的分类"
+      categories_and_latest_topics: "分类和最新话题"
+      categories_and_top_topics: "分类和最热话题"
       categories_boxes: "带子分类的框"
-      categories_boxes_with_topics: "有特色主题的框"
+      categories_boxes_with_topics: "有精选话题的框"
     shortcut_modifier_key:
       shift: "Shift"
       ctrl: "Ctrl"
@@ -1571,12 +1676,14 @@ zh_CN:
       loading: 载入中……
     category_row:
       topic_count:
-        other: "这个分类下共有%{count}个主题"
+        other: "这个分类下共有 %{count} 个话题"
       plus_subcategories_title:
         other: "%{name} 和 %{count} 子类别"
       plus_subcategories:
         other: "+ %{count} 个子类别"
     select_kit:
+      filter_by: "筛选器：%{name}"
+      select_to_filter: "选择要筛选的值"
       default_header_text: 选择…
       no_content: 无符合的结果
       filter_placeholder: 搜索……
@@ -1585,17 +1692,17 @@ zh_CN:
       max_content_reached:
         other: "你只能选择 %{count} 条记录。"
       min_content_not_reached:
-        other: "选择至少%{count}条。"
+        other: "选择至少 %{count} 条。"
       invalid_selection_length:
-        other: "至少选择%{count}个字符。"
+        other: "至少选择 %{count} 个字符。"
       components:
+        tag_drop:
+          filter_for_more: 筛选更多...
         categories_admin_dropdown:
           title: "分类管理"
     date_time_picker:
       from: 从
       to: 发至
-      errors:
-        to_before_from: "截至日期必须晚于开始日期。"
     emoji_picker:
       filter_placeholder: 查找表情符号
       smileys_&_emotion: 笑脸与情感
@@ -1606,7 +1713,7 @@ zh_CN:
       activities: 活动
       objects: 物品
       symbols: 符号
-      flags: 标记
+      flags: 旗帜
       recent: 近期使用
       default_tone: 无肤色
       light_tone: 浅色肤色
@@ -1617,28 +1724,27 @@ zh_CN:
       default: 自定义表情符号
     shared_drafts:
       title: "共享草稿"
-      notice: "只有那些可以看到<b>%{category}</b>分类的人才能看到此主题。"
+      notice: "这个话题只有可发布共享草稿的用户可见。"
       destination_category: "目标分类"
       publish: "发布共享草稿"
       confirm_publish: "你确定要发布此草稿吗？"
-      publishing: "发布主题中......"
+      publishing: "发布话题中......"
     composer:
       emoji: "Emoji :)"
       more_emoji: "更多…"
       options: "选项"
       whisper: "密语"
       unlist: "隐藏"
-      blockquote_text: "引用"
-      add_warning: "正式警告"
-      toggle_whisper: "折叠或展开密语"
-      toggle_unlisted: "显示/隐藏于主题列表"
-      posting_not_on_topic: "你想回复哪一个主题？"
-      saved_local_draft_tip: "已本地保存"
-      similar_topics: "你的主题有点类似于…"
+      add_warning: "这是一个官方警告"
+      toggle_whisper: "切换密语"
+      toggle_unlisted: "切换隐藏"
+      posting_not_on_topic: "你想回复哪一个话题？"
+      saved_local_draft_tip: "已保存到本地"
+      similar_topics: "你的话题有点相似于…"
       drafts_offline: "离线草稿"
       edit_conflict: "编辑冲突"
       group_mentioned_limit:
-        other: "<b>警告！</b>你提到了<a href='%{group_link}'> %{group} </a>，但是这个群组的成员数量超过了管理员所设置的可提及最大数量限制%{count}个用户。没有人会收到通知。"
+        other: "<b>警告！</b>你提及了 <a href='%{group_link}'> %{group} </a>，但是这个群组的成员数量超过了管理员所设置的可提及最大数量限制 %{count} 个用户，没有人会收到通知。"
       group_mentioned:
         other: "提及 %{group} 时，你将通知 <a href='%{group_link}'>%{count} 人</a> － 确定吗？"
       cannot_see_mention:
@@ -1648,22 +1754,25 @@ zh_CN:
       reference_topic_title: "回复：%{title}"
       error:
         title_missing: "标题为空"
-        title_too_short: "标题过短，至少 %{min} 个字"
-        title_too_long: "标题过长，最多 %{max} 个字"
+        title_too_short:
+          other: "标题至少需要 %{count} 个字符"
+        title_too_long:
+          other: "标题不能多于 %{count} 个字符"
         post_missing: "帖子不能为空"
-        post_length: "帖子至少要有%{min} 个字符"
-        try_like: "你尝试过使用%{heart}按钮了吗？"
-        category_missing: "未选择分类"
+        post_length:
+          other: "帖子至少需要 %{count} 个字符"
+        try_like: "你尝试过使用 %{heart} 按钮了吗？"
+        category_missing: "你必须选择一个分类"
         tags_missing:
-          other: "你至少应选择%{count}个标签"
-        topic_template_not_modified: "请通过编辑主题模板来为主题添加详情。"
+          other: "你必须选择至少 %{count} 个标签"
+        topic_template_not_modified: "请通过编辑话题模板来为话题添加详情。"
       save_edit: "保存编辑"
       overwrite_edit: "覆盖编辑"
-      reply_original: "回复原始主题"
+      reply_original: "回复原始话题"
       reply_here: "在此回复"
       reply: "回复"
       cancel: "取消"
-      create_topic: "创建主题"
+      create_topic: "创建话题"
       create_pm: "私信"
       create_whisper: "密语"
       create_shared_draft: "创建共享草稿"
@@ -1674,17 +1783,17 @@ zh_CN:
       title_or_link_placeholder: "输入标题，或粘贴一个链接"
       edit_reason_placeholder: "编辑理由"
       topic_featured_link_placeholder: "在标题里输入链接"
-      remove_featured_link: "从主题中移除链接。"
-      reply_placeholder: "在此键入。使用 Markdown，BBCode 或 HTML 格式。可拖拽或粘贴图片。"
-      reply_placeholder_no_images: "在此输入。 使用 Markdown，BBCode 或 HTML 格式。"
+      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: "正在编辑草稿。点击继续。"
+      saved_draft: "正在编辑草稿，点击继续。"
       uploading: "上传中…"
-      show_preview: "显示预览 &raquo;"
-      hide_preview: "&laquo; 隐藏预览"
+      show_preview: "显示预览"
+      hide_preview: "隐藏预览"
       quote_post_title: "引用整个帖子"
       bold_label: "B"
       bold_title: "加粗"
@@ -1696,9 +1805,9 @@ zh_CN:
       link_description: "在此输入链接描述"
       link_dialog_title: "插入链接"
       link_optional_text: "可选标题"
-      link_url_placeholder: "粘贴 URL 或键入以搜索主题"
-      quote_title: "引用"
-      quote_text: "引用"
+      link_url_placeholder: "粘贴 URL 或键入以搜索话题"
+      blockquote_title: "引用"
+      blockquote_text: "引用"
       code_title: "预格式化文本"
       code_text: "预格式化文本将缩进 4 格"
       paste_code_text: "输入或粘贴代码"
@@ -1723,40 +1832,40 @@ zh_CN:
         title: "你忘记添加收信人了吗？"
         body: "目前该私信只发给了你自己！"
       slow_mode:
-        error: "这个这个主题正处于慢速模式中。为了提高讨论质量，每%{duration}只能回复一次。"
-      admin_options_title: "本主题可选设置"
+        error: "本帖处于慢速模式下。你刚刚已经发帖；可以在 %{timeLeft} 再次发帖。"
+      admin_options_title: "本话题可选设置"
       composer_actions:
         reply: 回复
         draft: 草稿
         edit: 编辑
         reply_to_post:
-          label: 以%{postUsername}的身份回复
+          label: 以 %{postUsername} 的身份回复
           desc: 回复特定帖子
         reply_as_new_topic:
-          label: 回复为联结主题
-          desc: 创建一个新主题链接到这一主题
-          confirm: 您保存了新的主题草稿，如果您创建链接主题该草稿将被覆盖。
+          label: 回复为联结话题
+          desc: 创建一个新话题链接到这一话题
+          confirm: 您保存了新的话题草稿，如果您创建链接话题该草稿将被覆盖。
         reply_as_new_group_message:
-          label: 回复为新群组私信/消息
-          desc: 向相同的收件人创建新私信/消息
+          label: 回复为新群组消息
+          desc: 向相同的收件人创建新私信
         reply_as_private_message:
           label: 新消息
           desc: 新建一个私信
         reply_to_topic:
-          label: 回复主题
-          desc: 回复主题，不是任何特定的帖子
+          label: 回复话题
+          desc: 回复话题，不是任何特定的帖子
         toggle_whisper:
           label: 切换密语
           desc: 只有管理人员才能看到密语
         create_topic:
-          label: "新主题"
+          label: "新话题"
         shared_draft:
           label: "共享草稿"
-          desc: "起草一个只对管理人员可见的主题"
+          desc: "起草一个只对允许的用户可见的话题"
         toggle_topic_bump:
-          label: "切换主题顶帖"
+          label: "切换话题顶帖"
           desc: "回复但不改变最新回复的日期"
-      reload: "重新加载"
+      reload: "重载"
       ignore: "忽略"
     notifications:
       tooltip:
@@ -1793,27 +1902,27 @@ zh_CN:
       linked: "<span>%{username}</span> %{description}"
       granted_badge: "获得 “%{description}”"
       topic_reminder: "<span>%{username}</span> %{description}"
-      watching_first_post: "<span>新主题</span> %{description}"
+      watching_first_post: "<span>新话题</span> %{description}"
       membership_request_accepted: "接受来自“%{group_name}”的邀请"
       membership_request_consolidated:
-        other: "%{count}个申请加入“%{group_name}”群组的请求"
+        other: "%{count} 个申请加入“%{group_name}”群组的请求"
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}， %{username2}</span> %{description}"
-      votes_released: "%{description} -已完成"
+      votes_released: "%{description} - 已完成"
       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: "新回复"
@@ -1821,7 +1930,7 @@ zh_CN:
         edited: "编辑"
         liked: "新的赞"
         private_message: "新私信"
-        invited_to_private_message: "邀请进行私下交流"
+        invited_to_private_message: "邀请进行私信"
         invitee_accepted: "邀请已接受"
         posted: "新帖子"
         moved_post: "帖子已移动"
@@ -1829,13 +1938,13 @@ zh_CN:
         bookmark_reminder: "收藏提醒"
         bookmark_reminder_with_name: "收藏提醒 - %{name}"
         granted_badge: "勋章授予"
-        invited_to_topic: "邀请到主题"
+        invited_to_topic: "邀请到话题"
         group_mentioned: "群组提及"
         group_message_summary: "新建群组消息"
-        watching_first_post: "近期主题"
-        topic_reminder: "主题提醒"
+        watching_first_post: "近期话题"
+        topic_reminder: "话题提醒"
         liked_consolidated: "新的赞"
-        post_approved: "帖子已审批"
+        post_approved: "帖子已批准"
         membership_request_consolidated: "新的成员申请"
         reaction: "新的反应"
         votes_released: "投票已发布"
@@ -1845,43 +1954,45 @@ zh_CN:
       from_my_computer: "来自我的设备"
       from_the_web: "来自网络"
       remote_tip: "图片链接"
-      remote_tip_with_attachments: "链接到图片或文件 %{authorized_extensions}"
+      remote_tip_with_attachments: "链接到图像或文件"
       local_tip: "从你的设备中选择图片"
-      local_tip_with_attachments: "从你的设备 %{authorized_extensions} 选择图片或文件"
+      local_tip_with_attachments: "从你的设备中选择图片或文件"
       hint: "（你也可以通过拖放到编辑器的方式来上传）"
       hint_for_supported_browsers: "可以拖放或复制粘帖至编辑器以上传"
       uploading: "上传中"
       select_file: "选择文件"
       default_image_alt_text: 图片
+      supported_formats: "支持的格式"
     search:
       sort_by: "排序"
       relevance: "最相关"
       latest_post: "最新发帖"
-      latest_topic: "最新主题"
-      most_viewed: "最多阅读"
+      latest_topic: "最新话题"
+      most_viewed: "最多查看"
       most_liked: "最多赞"
       select_all: "全选"
       clear_all: "清除所有"
-      too_short: "你的搜索词太短。"
+      too_short: "你的搜索关键词太短。"
       result_count:
-        other: "<span>%{count}%{plus}结果</span><span class='term'>%{term}</span>"
-      title: "搜索主题、帖子、用户或分类"
-      full_page_title: "搜索主题或帖子"
+        other: "<span>%{count}%{plus} 条关于</span><span class='term'>%{term}</span>的结果"
+      title: "搜索话题、帖子、用户或分类"
+      full_page_title: "搜索话题或帖子"
       no_results: "没有找到结果。"
       no_more_results: "没有找到更多结果。"
       post_format: "#%{post_number} 来自于 %{username}"
       results_page: "关于“%{term}”的搜索结果"
-      more_results: "还有更多结果。请增加你的搜索条件。"
+      more_results: "还有更多结果，请增加你的搜索条件。"
       cant_find: "找不到你要找的内容？"
-      start_new_topic: "不如创建一个新主题？"
-      or_search_google: "或者尝试使用Google进行搜索："
-      search_google: "尝试使用Google进行搜索："
+      start_new_topic: "不如创建一个新话题？"
+      or_search_google: "或者尝试使用 Google 进行搜索："
+      search_google: "尝试使用 Google 进行搜索："
       search_google_button: "Google"
+      search_button: "搜索"
       context:
         user: "搜索 @%{username} 的帖子"
         category: "搜索 #%{category} 分类"
-        tag: "搜索＃%{tag}标签"
-        topic: "搜索本主题"
+        tag: "搜索 #%{tag} 标签"
+        topic: "搜索本话题"
         private_messages: "搜索私信"
       advanced:
         title: 高级搜索
@@ -1894,14 +2005,14 @@ zh_CN:
         with_badge:
           label: 有该徽章
         with_tags:
-          label: 标签
+          label: 拥有标签
         filters:
-          label: 只返回主题/帖子……
+          label: 只返回话题/帖子……
           title: 仅在标题中匹配
           likes: 我赞过的
           posted: 我参与发帖
           created: 我创建的
-          watching: 我正在监看
+          watching: 我正在关注
           tracking: 我正在追踪
           private: 在我的私信中
           bookmarks: 我收藏了
@@ -1913,11 +2024,11 @@ zh_CN:
           images: 包含图片
           all_tags: 上述所有标签
         statuses:
-          label: 当主题
+          label: 当话题
           open: 是开放的
           closed: 是关闭的
           public: 是公开的
-          archived: 已经存档的
+          archived: 已归档
           noreplies: 没有回复
           single_user: 只有一个用户参与
         post:
@@ -1932,82 +2043,86 @@ zh_CN:
             before: 早于
             after: 晚于
         views:
-          label: 浏览
+          label: 查看
         min_views:
           placeholder: 最小值
         max_views:
           placeholder: 最大值
-    hamburger_menu: "转到另一个主题列表或分类"
+    hamburger_menu: "转到另一个话题列表或分类"
     new_item: "新"
     go_back: "返回"
     not_logged_in_user: "显示当前活动和设置的用户页面"
     current_user: "转到用户页面"
-    view_all: "查看全部"
+    view_all: "查看全部 %{tab}"
     topics:
       new_messages_marker: "上次访问"
       bulk:
         select_all: "选择全部"
         clear_all: "清除全部"
-        unlist_topics: "隐藏主题"
-        relist_topics: "把主题重新置于主题列表中"
+        unlist_topics: "隐藏话题"
+        relist_topics: "显示话题"
         reset_read: "设为未读"
-        delete: "删除主题"
+        delete: "删除话题"
         dismiss: "忽略"
-        dismiss_read: "忽略所有未读主题"
+        dismiss_read: "忽略所有未读话题"
         dismiss_button: "忽略…"
-        dismiss_tooltip: "仅忽略新帖子或停止跟踪主题"
-        also_dismiss_topics: "停止追踪这些主题，这样这些主题就不再显示为未读了"
+        dismiss_tooltip: "忽略新帖或停止跟踪话题"
+        also_dismiss_topics: "停止追踪这些话题以不再显示为未读"
         dismiss_new: "设为已读"
-        toggle: "切换至批量选择"
+        toggle: "切换话题批量选择"
         actions: "批量操作"
         change_category: "设置分类"
-        close_topics: "关闭主题"
-        archive_topics: "存档主题"
+        close_topics: "关闭话题"
+        archive_topics: "归档话题"
+        move_messages_to_inbox: "移至收件箱"
         notification_level: "通知"
-        choose_new_category: "选择新分类："
+        change_notification_level: "更改通知级别"
+        choose_new_category: "选择话题新分类："
         selected:
-          other: "已选择 <b>%{count}</b>个主题"
+          other: "已选择 <b>%{count}</b> 个话题"
         change_tags: "替换标签"
         append_tags: "添加标签"
-        choose_new_tags: "为主题选择新标签："
-        choose_append_tags: "为这些主题添加新标签："
-        changed_tags: "主题的标签被修改"
-        remove_tags: "移除标签"
+        choose_new_tags: "为话题选择新标签："
+        choose_append_tags: "为这些话题添加新标签："
+        changed_tags: "话题的标签已被修改"
+        remove_tags: "移除所有标签"
+        confirm_remove_tags:
+          other: "所有的标签将从 <b>%{count}</b> 个话题中移除，你确定吗？"
         progress:
-          other: "进度： <strong>%{count}</strong> 主题"
+          other: "进度： <strong>%{count}</strong> 话题"
       none:
-        unread: "你没有未读主题。"
-        new: "你没有近期主题可读。"
-        read: "你尚未阅读任何主题。"
-        posted: "你尚未在任何主题中发帖。"
+        unread: "你没有未读话题。"
+        new: "你没有近期话题可读。"
+        read: "你尚未阅读任何话题。"
+        posted: "你尚未在任何话题中发帖。"
         ready_to_create: "准备好 "
         latest: "你全都看过了！"
-        bookmarks: "你没有收藏任何主题。"
-        category: "%{category}分类中没有主题。"
-        top: "没有热门主题。"
+        bookmarks: "你没有收藏任何话题。"
+        category: "%{category} 分类中没有话题。"
+        top: "没有热门话题。"
         educate:
-          new: '<p>这里会显示近期的新主题。 默认情况下，会显示近 2 天内创建的主题，还会显示一个<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">近期</span>的标志。</p><p>你可以在<a href="%{userPrefsUrl}">用户设置</a>中修改。</p>'
-          unread: '<p>这里显示你的未读主题。</p><p>默认情况下，下述主题会被放在未读中。并且会在旁边显示未读的数量<span class="badge new-posts badge-notification">1</span>。如果你：</p><ul><li>创建了该主题</li><li>回复了该主题</li><li>阅读该主题超过 4 分钟</li></ul><p>或者你在主题底部的通知控制中选择了跟随或关注。</p><p>你可以在<a href="%{userPrefsUrl}">用户设置</a>中修改未读设置。</p>'
+          new: '<p>这里显示近期话题， 默认情况下显示近 2 天内创建的话题，还会显示一个<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">近期</span>的标志。</p><p>你可以在<a href="%{userPrefsUrl}">用户设置</a>中修改。</p>'
+          unread: "<p>你的未读话题显示在这里，</p><p>下列情况中的话题会被认为是未读的并显示未读计数<span class=\"badge new-posts badge-notification\">1</span>：</p><ul><li>创建话题</li><li>回复话题</li><li>阅读话题的时长超过4分钟</li></ul><p>或者曾使用每个话题中的\U0001F514手动调整话题的提醒等级为关注或跟踪。</p><p>查看你的<a href=\"%{userPrefsUrl}\">设置</a>可进行修改</p>"
       bottom:
-        latest: "没有更多主题可看了。"
-        posted: "没有更多已发布主题可看了。"
-        read: "没有更多已阅主题可看了。"
-        new: "没有更多的近期主题。"
-        unread: "没有更多未读主题了。"
-        category: "没有更多%{category}分类的主题了。"
-        tag: "没有更多带有%{tag}标签的主题了。"
-        top: "没有更多的热门主题."
-        bookmarks: "没有更多收藏的主题了。"
+        latest: "没有更多话题了。"
+        posted: "没有更多已发布话题了。"
+        read: "没有更多已阅话题了。"
+        new: "没有更多的近期话题了。"
+        unread: "没有更多未读话题了。"
+        category: "没有更多%{category}的话题了。"
+        tag: "没有更多带有%{tag}的话题了。"
+        top: "没有更多的热门话题了."
+        bookmarks: "没有更多收藏的话题了。"
     topic:
       filter_to:
-        other: "本主题中的 %{count} 帖"
-      create: "创建新主题"
-      create_long: "创建新的主题"
+        other: "话题中 %{count} 个帖子"
+      create: "新建话题"
+      create_long: "创建新的话题"
       open_draft: "打开草稿"
       private_message: "开始发私信"
       archive_message:
-        help: "移动私信到存档"
-        title: "存档"
+        help: "移动私信到归档"
+        title: "归档"
       move_to_inbox:
         title: "移动到收件箱"
         help: "移动私信到收件箱"
@@ -2018,81 +2133,89 @@ zh_CN:
         help: "标记为未读"
         title: "推迟处理"
       feature_on_profile:
-        help: "添加此主题的链接到你的用户卡片和资料中。"
+        help: "添加此话题的链接到你的用户卡片和资料中。"
         title: "精选到个人资料"
       remove_from_profile:
-        warning: "你的个人资料中已存在精选主题。如果继续，此主题会替换存在的主题。"
-        help: "在你的个人资料中移除指向该主题的链接"
+        warning: "你的个人资料中已存在精选话题。如果继续，此话题会替换存在的话题。"
+        help: "在你的个人资料中移除指向该话题的链接"
         title: "从个人资料中移除"
-      list: "主题"
-      new: "近期主题"
+      list: "话题"
+      new: "近期话题"
       unread: "未读"
       new_topics:
-        other: "%{count} 近期主题"
+        other: "%{count} 近期话题"
       unread_topics:
-        other: "%{count} 未读主题"
-      title: "主题"
+        other: "%{count} 未读话题"
+      title: "话题"
       invalid_access:
-        title: "这是私密主题"
-        description: "抱歉，你没有没有权限浏览此主题。"
-        login_required: "此主题需要登录后浏览。"
+        title: "这是私密话题"
+        description: "抱歉，你没有没有权限浏览此话题。"
+        login_required: "此话题需要登录后浏览。"
       server_error:
-        title: "载入主题失败"
-        description: "抱歉，无法加载该主题，有可能是网络连接出现了问题。请重试。如果问题依然存在，请联系我们。"
+        title: "载入话题失败"
+        description: "抱歉，无法加载该话题，有可能是网络连接出现了问题。请重试。如果问题依然存在，请联系我们。"
       not_found:
-        title: "未找到主题"
-        description: "抱歉，无法找到此主题。可能已经被删除了。"
+        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}。"
+      options: "话题选项"
+      show_links: "显示此话题中的链接"
+      toggle_information: "切换话题详情"
+      read_more_in_category: "想阅读更多？浏览%{catLink}的其他话题或%{latestLink}。"
       read_more: "想阅读更多？%{catLink}或%{latestLink}。"
-      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 {}}"
+      unread_indicator: "还没有成员读过此话题的最新帖子。"
+      read_more_MF: "还有{ UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1个未读话题</a>} other {<a href='{basePath}/unread'>#个未读话题</a> }}{BOTH, select, true{和} false{} other{}}{NEW, plural, =0{} one{<a href='{basePath}/new'>#1个新话题</a>} other{<a href='{basePath}/new'>#个新话题 </a>}}, 或者{CATEGORY,select,true{浏览其它的{catLink}话题} false{{latestLink}} other{}}"
       bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: 浏览所有分类
       browse_all_tags: 浏览所有标签
-      view_latest_topics: 查阅最新主题
+      view_latest_topics: 查阅最新话题
       suggest_create_topic: 开始讨论一个新的话题？
       jump_reply_up: 转到更早的回复
       jump_reply_down: 转到更新的回复
-      deleted: "此主题已被删除"
+      deleted: "此话题已被删除"
       slow_mode_update:
         title: "慢速模式"
-        select: "用户只能在这个主题中发言一次："
-        description: "为了提高回帖太快或有争议内容的主题的讨论质量，用户再次发言之前必须稍作等待。"
+        select: "用户只能在这个话题中发言一次："
+        description: "为了提高回帖太快或有争议内容的话题的讨论质量，用户再次发言之前必须稍作等待。"
         save: "启用"
+        enabled_until: "启用直到："
         remove: "停用"
         hours: "小时："
         minutes: "分钟："
         seconds: "秒："
         durations:
+          10_minutes: "10 分钟"
           15_minutes: "15分钟"
+          30_minutes: "30 分钟"
+          45_minutes: "45 分钟"
           1_hour: "1小时"
+          2_hours: "2 小时"
           4_hours: "4小时"
-          1_day: "1天"
-          1_week: "1周"
+          8_hours: "8 小时"
+          12_hours: "12 小时"
+          24_hours: "24 小时"
           custom: "自定义持续时间"
       slow_mode_notice:
-        duration: "这个主题下每个发帖之间需要等待%{duration}"
+        duration: "这个话题下的每个发帖之间需要等待 %{duration}"
       topic_status_update:
-        title: "主题计时器"
+        title: "话题计时器"
         save: "设置计时器"
         num_of_hours: "小时数："
         num_of_days: "天数"
         remove: "撤销计时器"
         publish_to: "发布至："
         when: "时间："
-        time_frame_required: 请选择一个时间范围
+        time_frame_required: "请选择一个时间范围"
+        min_duration: "持续时间必须大于0"
+        max_duration: "持续时间必须少于 20 年"
       auto_update_input:
         none: "选择时间范围"
         now: "当前"
@@ -2110,22 +2233,24 @@ zh_CN:
         one_year: "一年"
         forever: "永远"
         pick_date_and_time: "选择日期和时间"
-        set_based_on_last_post: "按照最新帖子关闭"
+        set_based_on_last_post: "根据最后发帖关闭"
       publish_to_category:
         title: "定时发布"
       temp_open:
         title: "临时开启"
       auto_reopen:
-        title: "自动开启主题"
+        title: "自动开启话题"
       temp_close:
         title: "临时关闭"
       auto_close:
-        title: "自动关闭主题"
-        label: "自动关闭于几小时后："
+        title: "自动关闭话题"
+        label: "自动关闭话题前等待："
         error: "请输入一个有效值。"
-        based_on_last_post: "最后回复发布之后的多少时间内不自动关闭主题。"
+        based_on_last_post: "最后发帖之后的多长时间内不自动关闭话题。"
+      auto_close_after_last_post:
+        title: "最后发帖后自动关闭话题"
       auto_delete:
-        title: "自动删除主题"
+        title: "自动删除话题"
       auto_bump:
         title: "自动顶帖"
       reminder:
@@ -2133,29 +2258,32 @@ zh_CN:
       auto_delete_replies:
         title: "自动删除回复"
       status_update_notice:
-        auto_open: "本主题将在%{timeLeft}自动开启。"
-        auto_close: "本主题将在%{timeLeft}自动关闭。"
-        auto_publish_to_category: "主题将在%{timeLeft}后被发布到<a href=%{categoryUrl}>#%{categoryName}</a> 。"
-        auto_close_based_on_last_post: "如在 %{duration}内没有新回复后主题将被关闭。"
-        auto_delete: "主题在%{timeLeft}后将被自动删除。"
-        auto_bump: "这个主题将在%{timeLeft}后自动顶帖。"
-        auto_reminder: "你将在%{timeLeft}后收到该主题的提醒。"
-        auto_delete_replies: "此主题的回复会在%{duration}后自动删除。"
+        auto_open: "本话题将在 %{timeLeft} 自动开启。"
+        auto_close: "本话题将在 %{timeLeft} 自动关闭。"
+        auto_publish_to_category: "话题将在%{timeLeft}后被发布到<a href=%{categoryUrl}>#%{categoryName}</a> 。"
+        auto_close_after_last_post: "如在 %{duration} 内没有新回复后话题将被关闭。"
+        auto_delete: "话题在 %{timeLeft} 后将被自动删除。"
+        auto_bump: "这个话题将在 %{timeLeft} 后自动顶帖。"
+        auto_reminder: "你将在 %{timeLeft} 后收到该话题的提醒。"
+        auto_delete_replies: "此话题的回复会在 %{duration} 后自动删除。"
       auto_close_title: "自动关闭设置"
       auto_close_immediate:
-        other: "主题中的最后一个帖子已经存在 %{count} 小时，因此该主题将立即关闭。"
+        other: "话题中的最后一个帖子已经存在 %{count} 小时，因此该话题将立即关闭。"
+      auto_close_momentarily:
+        other: "最后的回帖已经是 %{count} 小时前了，因此这个话题将会被立即关闭。"
       timeline:
         back: "返回"
         back_description: "回到最后一个未读帖子"
         replies_short: "%{current} / %{total}"
       progress:
-        title: 主题进度
+        title: 话题进度
         go_top: "顶部"
         go_bottom: "底部"
         go: "前往"
         jump_bottom: "跳至最后一个帖子"
         jump_prompt: "跳到…"
-        jump_prompt_of: "%{count} 帖子"
+        jump_prompt_of:
+          other: "第 %{count} 帖"
         jump_prompt_long: "跳到……"
         jump_bottom_with_number: "跳至第 %{post_number} 帖"
         jump_prompt_to_date: "至今"
@@ -2163,36 +2291,39 @@ zh_CN:
         total: 全部帖子
         current: 当前帖子
       notifications:
-        title: 改变你收到该主题通知的频率
+        title: 改变你收到该话题通知的频率
         reasons:
-          mailing_list_mode: "邮件列表模式已启用，将以邮件通知你关于该主题的回复。"
-          "3_10": "因为你正监看该主题上的标签，你将会收到通知。"
-          "3_6": "因为你正在监看该分类，你将会收到通知。"
-          "3_5": "因为你自动地开始监看该主题，你将会收到通知。"
-          "3_2": "因为你正在监看该主题，你将会收到通知。"
-          "3_1": "因为你创建了这个主题，你将会收到通知。"
-          "3": "因为你正在监看该主题，你将会收到通知。"
+          mailing_list_mode: "邮件列表模式已启用，将以邮件通知你关于该话题的回复。"
+          "3_10": "因为你关注了该话题上的标签，你将会收到通知。"
+          "3_10_stale": "因为你之前关注了该话题上的标签，你会收到通知。"
+          "3_6": "因为你关注了该分类，你将会收到通知。"
+          "3_6_stale": "因为你之前关注了该分类，你会收到通知。"
+          "3_5": "因为你自动关注了该话题，你将会收到通知。"
+          "3_2": "因为你关注了该话题，你将会收到通知。"
+          "3_1": "因为你创建了这个话题，你将会收到通知。"
+          "3": "因为你关注了该话题，你将会收到通知。"
           "2_8": "因为你追踪了该分类，所以你会看到新回复的数量。"
-          "2_4": "你会看到新回复的数量的原因是你曾经回复过该主题。"
-          "2_2": "你会看到新回复数量的原因是你正在追踪该主题。"
-          "2": '你会看到新回复的计数是因为你<a href="%{basePath}/u/%{username}/preferences/notifications">浏览过该主题</a>。'
+          "2_8_stale": "因为你之前追踪了该分类，你会看到新回复的数量。"
+          "2_4": "你会看到新回复的数量的原因是你曾经回复过该话题。"
+          "2_2": "你会看到新回复数量的原因是你追踪了该话题。"
+          "2": '你会看到新回复的计数是因为你<a href="%{basePath}/u/%{username}/preferences/notifications">浏览过该话题</a>。'
           "1_2": "有人@你或回复你时会通知你。"
           "1": "如果有人@你或回复你，将通知你。"
           "0_7": "你将忽略关于该分类的所有通知。"
-          "0_2": "你将忽略关于该主题的所有通知。"
-          "0": "你将忽略关于该主题的所有通知。"
+          "0_2": "你将忽略关于该话题的所有通知。"
+          "0": "你将忽略关于该话题的所有通知。"
         watching_pm:
           title: "关注"
           description: "私信有新回复时提醒我，并显示新回复数量。"
         watching:
-          title: "监看"
-          description: "你将收到该主题所有新回复的通知，还会显示新回复的数量。"
+          title: "关注"
+          description: "你将收到该话题所有新回复的通知，还会显示新回复的数量。"
         tracking_pm:
           title: "跟踪"
           description: "在私信标题后显示新回复数量。你只会在别人@你或回复你的帖子时才会收到通知。"
         tracking:
           title: "跟踪"
-          description: "将为该主题显示新回复的数量。你会在有人@你或回复你的时候收到通知。"
+          description: "将为该话题显示新回复的数量，你会在有人@你或回复你的时候收到通知。"
         regular:
           title: "普通"
           description: "如果有人@你或回复你，将通知你。"
@@ -2204,177 +2335,185 @@ zh_CN:
           description: "你永远都不会收到任何关于此私信的通知。"
         muted:
           title: "静音"
-          description: "你不会收到关于此主题的任何通知，它也不会出现在“最新”主题列表中。"
+          description: "你不会收到关于此话题的任何通知，它也不会出现在最新话题中。"
       actions:
-        title: "动作"
-        recover: "撤销删除主题"
-        delete: "删除主题"
-        open: "打开主题"
-        close: "关闭主题"
+        title: "操作"
+        recover: "撤销删除话题"
+        delete: "删除话题"
+        open: "打开话题"
+        close: "关闭话题"
         multi_select: "选择帖子…"
         slow_mode: "设为慢速模式"
-        timed_update: "设置主题计时器…"
-        pin: "置顶主题…"
-        unpin: "取消置顶主题…"
-        unarchive: "取消存档主题"
-        archive: "存档主题"
-        invisible: "隐藏主题"
-        visible: "取消隐藏主题"
+        timed_update: "设置话题计时器…"
+        pin: "置顶话题…"
+        unpin: "取消置顶话题…"
+        unarchive: "取消归档话题"
+        archive: "归档话题"
+        invisible: "隐藏"
+        visible: "取消隐藏"
         reset_read: "重置阅读数据"
-        make_public: "设置为公共主题"
+        make_public: "设置为公开话题"
         make_private: "设置为私信"
         reset_bump_date: "重置顶帖日期"
       feature:
-        pin: "置顶主题"
-        unpin: "取消置顶主题"
-        pin_globally: "全局置顶主题"
-        make_banner: "横幅主题"
-        remove_banner: "取消横幅主题"
+        pin: "置顶话题"
+        unpin: "取消置顶话题"
+        pin_globally: "全局置顶话题"
+        make_banner: "横幅话题"
+        remove_banner: "移除横幅话题"
       reply:
         title: "回复"
-        help: "开始撰写此主题的回复"
+        help: "开始撰写此话题的回复"
       clear_pin:
         title: "取消置顶"
-        help: "取消本主题的置顶状态，将不再固定显示在主题列表顶部。"
+        help: "取消本话题的置顶状态，将不再固定显示在话题列表顶部。"
       share:
         title: "分享"
         extended_title: "分享一个链接"
-        help: "分享指向这个主题的链接"
+        help: "分享指向这个话题的链接"
+        instructions: "分享此话题的链接："
+        copied: "话题链接已复制。"
+        notify_users:
+          title: "通知"
+          instructions: "通知以下用户有关此话题的信息："
+          success:
+            other: "此话题已成功通知选中用户"
+        invite_users: "邀请"
       print:
         title: "打印"
-        help: "打开该主题对打印友好的版本"
+        help: "打开该话题的印刷版本"
       flag_topic:
         title: "标记"
-        help: "背地里标记该帖以示警示，或发送关于它的私下通知"
-        success_message: "你已经成功标记该主题。"
+        help: "私下标记此话题以警告，或发送一个关于它的私人通知"
+        success_message: "你已经成功标记该话题。"
       make_public:
-        title: "转换到公开主题"
-        choose_category: "请选择公共主题分类："
+        title: "转换为公开话题"
+        choose_category: "请为公开话题选择分类："
       feature_topic:
-        title: "置顶主题"
-        pin: "将该主题置于%{categoryLink}分类最上方至"
-        unpin: "从%{categoryLink}分类最上方移除主题。"
-        unpin_until: "从%{categoryLink}分类最上方移除主题或者移除于<strong>%{until}</strong>。"
-        pin_note: "允许用户取消置顶。"
-        pin_validation: "置顶该主题需要一个日期。"
-        not_pinned: "%{categoryLink}没有置顶主题。"
+        title: "精选此话题"
+        pin: "将该话题置于 %{categoryLink} 分类顶端直到"
+        unpin: "从 %{categoryLink} 分类顶端移除话题。"
+        unpin_until: "从 %{categoryLink} 分类顶端移除话题，或等到 <strong>%{until}</strong>。"
+        pin_note: "用户可以取消他们的置顶话题。"
+        pin_validation: "置顶该话题需要一个日期。"
+        not_pinned: "%{categoryLink} 没有置顶话题。"
         already_pinned:
-          other: "%{categoryLink}分类的置顶主题数：<strong class='badge badge-notification unread'>%{count}</strong>"
-        pin_globally: "将主题置于所有主题列表最上方至"
+          other: "%{categoryLink} 分类的置顶话题数：<strong class='badge badge-notification unread'>%{count}</strong>"
+        pin_globally: "将话题置于全部话题列表顶端直到"
         confirm_pin_globally:
-          other: "已经有%{count}个全局置顶的主题。太多的置顶主题可能会困扰新用户和匿名访客。确定还要全局置顶主题吗？"
-        unpin_globally: "将主题从所有主题列表的最上方移除。"
-        unpin_globally_until: "从所有主题列表最上方移除主题或者移除于<strong>%{until}</strong>。"
-        global_pin_note: "用户可以自行取消全局置顶。"
-        not_pinned_globally: "没有全局置顶的主题。"
+          other: "已经有 %{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>"
-        make_banner: "将主题设置为出现在所有页面顶端的横幅主题。"
-        remove_banner: "移除所有页面顶端的横幅主题。"
-        banner_note: "用户能够通隐藏横幅。在同一时间内只能设置一个横幅主题。"
-        no_banner_exists: "没有横幅主题。"
-        banner_exists: "当前<strong class='badge badge-notification unread'>设置</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: "受邀人的邮箱或用户名"
-        email_or_username_placeholder: "电子邮件地址或者用户名"
+        email_or_username_placeholder: "邮箱地址或者用户名"
         action: "邀请"
         success: "成功邀请了用户至该私信。"
         success_group: "成功邀请了群组至该私信。"
         error: "抱歉，邀请时出了点小问题。"
         not_allowed: "对不起，该用户无法被邀请。"
         group_name: "群组名"
-      controls: "主题控件"
+      controls: "话题控件"
       invite_reply:
         title: "邀请"
         username_placeholder: "用户名"
         action: "发送邀请"
-        help: "通过电子邮件或通知邀请其他人到该主题"
-        to_forum: "将发送一封简洁的邮件，让你的朋友无需注册即可用链接参与讨论。"
-        sso_enabled: "输入其用户名，邀请其人到本主题。"
-        to_topic_blank: "输入你要邀请到这个主题的用户名或电子邮件地址。"
-        to_topic_email: "你输入了邮箱地址。我们将发送一封邮件邀请，让你的朋友可直接回复该主题。"
-        to_topic_username: "你输入了用户名。我们将发送一个至该主题链接的邀请通知。"
-        to_username: "输入你想邀请的人的用户名。我们将发送一个至该主题链接的邀请通知。"
+        help: "通过邮箱或通知邀请其他人到该话题"
+        to_forum: "我们会发送一封简短的邮件，让你的朋友通过点击链接即可参与讨论。"
+        discourse_connect_enabled: "输入你要邀请到这个话题的用户名。"
+        to_topic_blank: "输入你要邀请到这个话题的用户名或邮箱地址。"
+        to_topic_email: "你输入了邮箱地址，我们将发送一封邮件，邀请你的朋友直接回复该话题。"
+        to_topic_username: "你输入了用户名，我们将发送一个至该话题链接的邀请通知。"
+        to_username: "输入你想邀请的人的用户名，我们将发送一个至该话题链接的邀请通知。"
         email_placeholder: "name@example.com"
-        success_email: "我们发了一封邮件邀请<b>%{emailOrUsername}</b>。邀请被接受后你会收到通知。检查用户页中的邀请标签页来追踪你的邀请。"
-        success_username: "我们已经邀请了该用户参与该主题。"
-        error: "抱歉，我们不能邀请这个人。可能他已经被邀请了？（邀请有频率限制）"
-        success_existing_email: "用户<b>%{emailOrUsername}</b>已存在。我们已经邀请了该用户参与该主题。"
+        success_email: "我们已发送了一封邀请邮件到 <b>%{invitee}</b>，邀请被接受后我们会通知你。查看你的用户页面中的邀请选项卡可以追踪你的邀请进展。"
+        success_username: "我们已经邀请了该用户参与该话题。"
+        error: "抱歉，我们不能邀请这个人，可能他已经被邀请了？（邀请有频率限制）"
+        success_existing_email: "用户 <b>%{emailOrUsername}</b> 已存在，我们邀请过该用户参与该话题。"
       login_reply: "登录以回复"
       filters:
         n_posts:
           other: "%{count} 个帖子"
-        cancel: "取消筛选"
+        cancel: "移除筛选"
       move_to:
         title: "移动到"
         action: "移动到"
         error: "移动帖子时发生了错误。"
       split_topic:
-        title: "拆分主题"
-        action: "拆分主题"
-        topic_name: "新主题的标题"
-        radio_label: "创建新主题"
-        error: "拆分主题时发生错误。"
+        title: "拆分话题"
+        action: "拆分话题"
+        topic_name: "新话题的标题"
+        radio_label: "新建话题"
+        error: "拆分话题时发生错误。"
         instructions:
-          other: "你将创建一个新的主题，并包含你选择的 <b>%{count}</b> 个帖子。"
+          other: "你将创建一个新话题，并包含你选择的 <b>%{count}</b> 个帖子。"
       merge_topic:
-        title: "合并主题"
-        action: "合并主题"
-        error: "合并主题时发生错误。"
-        radio_label: "现存的主题"
+        title: "合并话题"
+        action: "合并话题"
+        error: "合并话题时发生错误。"
+        radio_label: "现有话题"
         instructions:
-          other: "请选择一个主题以便移动这 <b>%{count}</b> 个帖子。"
+          other: "请选择一个话题以便移动这 <b>%{count}</b> 个帖子。"
       move_to_new_message:
-        title: "移动到新的即时信息"
-        action: "移动到新的私信"
-        message_title: "新私信的标题"
-        radio_label: "创建新私信"
+        title: "拆分消息"
+        action: "拆分消息"
+        message_title: "新消息的标题"
+        radio_label: "新建消息"
         participants: "参与者"
         instructions:
-          other: "你正在发送<b>%{count}</b>篇帖子到一条新的私信/消息。"
+          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: "合并帖子时发生了错误。"
+        title: "合并已选定的帖子"
+        action: "合并已选定的帖子"
+        error: "合并选定帖子时发生了错误。"
       publish_page:
         title: "页面发布"
-        publish: "出版"
-        description: "当一个主题被发布为页面，其链接可以是共享的，并且会以自定义的样式显示。"
-        slug: "Slug"
+        publish: "发布"
+        description: "当一个话题被发布为页面后，其链接可被共享，并且可以以自定义样式显示。"
+        slug: "缩写"
         public: "公开"
-        public_description: "即使关联的主题是私有的，用户也可以看到该页面。"
+        public_description: "即使关联的话题是私有的，用户也可以看到该页面。"
         publish_url: "你的页面已发布在："
-        topic_published: "你的主题已发布在："
+        topic_published: "你的话题已发布在："
         preview_url: "你的页面将被发布在："
         invalid_slug: "抱歉，您不能发布该页面。"
         unpublish: "取消发布"
-        unpublished: "你的页面已经取消出版并且不再可用。"
+        unpublished: "你的页面已经取消发布，因此无法再访问。"
         publishing_settings: "发布设置"
       change_owner:
         title: "更改所有者"
-        action: "更改作者"
-        error: "更改帖子作者时发生错误。"
-        placeholder: "新作者的用户名"
+        action: "更改所有者"
+        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: "修改时间"
-        invalid_timestamp: "不能是未来的时间。"
-        error: "更改主题时间时发生错误。"
-        instructions: "请为主题选择新的时间。主题中的所有帖子将按照相同的时间差更新。"
+        title: "更改时间戳"
+        action: "更改时间戳"
+        invalid_timestamp: "时间戳不能为未来。"
+        error: "更改话题时间戳时发生错误。"
+        instructions: "请为话题选择新的时间戳，话题中的所有帖子将按照相同的时间差更新。"
       multi_select:
         select: "选择"
         selected: "已选择（%{count}）"
@@ -2385,28 +2524,28 @@ zh_CN:
           label: "已选中"
           title: "单击以将帖子从中移除"
         select_replies:
-          label: "选择与回复"
+          label: "选择回复"
           title: "选择帖子及其所有回复"
         select_below:
-          label: "选择 +以下"
+          label: "选择下方"
           title: "选择帖子及其后的所有内容"
         delete: 删除所选项
         cancel: 取消选择
         select_all: 全选
-        deselect_all: 全不选
+        deselect_all: 取消全选
         description:
           other: "已选择 <b>%{count}</b> 个帖子。"
       deleted_by_author:
-        other: "（主题被作者删除，如无标记将在 %{count} 小时后自动删除）"
+        other: "（话题被作者删除，如无标记将在 %{count} 小时后自动删除）"
     post:
       quote_reply: "引用"
       quote_share: "分享"
-      edit_reason: "理由： "
+      edit_reason: "理由："
       post_number: "帖子 %{number}"
-      ignored: "忽视的内容"
-      wiki_last_edited_on: "维基最后修改于"
-      last_edited_on: "最后修改于"
-      reply_as_new_topic: "回复为联结主题"
+      ignored: "已忽略内容"
+      wiki_last_edited_on: "维基最后编辑于 %{dateTime}"
+      last_edited_on: "帖子最后编辑于 %{dateTime}"
+      reply_as_new_topic: "回复为联结话题"
       reply_as_new_private_message: "向相同的收件人回复新私信"
       continue_discussion: "自 %{postLink} 继续讨论："
       follow_quote: "转到所引用的帖子"
@@ -2416,44 +2555,45 @@ zh_CN:
         other: "（帖子被作者删除，如无标记将在 %{count} 小时后自动删除）"
       collapse: "折叠"
       expand_collapse: "展开/折叠"
-      locked: "一管理人员锁定了该帖的编辑"
+      locked: "一个管理人员锁定了该帖的编辑"
       gap:
         other: "查看 %{count} 个隐藏回复"
       notice:
-        new_user: "这是%{user}的首个发帖 - 让我们欢迎他加入社区吧！"
-        returning_user: "从我们上一次看到 %{user} 有一阵子了 — 他上次发帖是 %{time}."
+        new_user: "这是 %{user} 的首个发帖 - 让我们欢迎他加入社区吧！"
+        returning_user: "从我们上一次看到 %{user} 有一阵子了 — 他上次发帖是 %{time}。"
       unread: "未读帖子"
       has_replies:
         other: "%{count} 回复"
+      has_replies_count: "%{count}"
       unknown_user: "（未知或已删除的用户）"
       has_likes_title:
-        other: "%{count}人赞了该贴"
+        other: "%{count} 人赞了该贴"
       has_likes_title_only_you: "你赞了这个帖子"
       has_likes_title_you:
-        other: "你和另外的%{count}人赞了帖"
+        other: "你和另外的 %{count} 人赞了该帖"
+      filtered_replies_hint:
+        other: "查看此帖子及其 %{count} 个回复"
+      filtered_replies_viewing:
+        other: "查看 %{count} 个回复"
+      in_reply_to: "加载父帖子"
+      view_all_posts: "查看所有帖子"
       errors:
-        create: "抱歉，在创建你的帖子时发生了错误。请重试。"
-        edit: "抱歉，在编辑你的帖子时发生了错误。请重试。"
-        upload: "抱歉，在上传文件时发生了错误。请重试。"
-        file_too_large: "抱歉，该文件太大（最大大小为 %{max_size_kb}KB）。为什么不将您的大文件上传到云共享服务，然后粘贴链接？"
+        create: "抱歉，在创建你的帖子时发生了错误，请重试。"
+        edit: "抱歉，在编辑你的帖子时发生了错误，请重试。"
+        upload: "抱歉，在上传文件时发生了错误，请重试。"
+        file_too_large: "抱歉，该文件太大（最大大小为 %{max_size_kb}KB），为什么不将您的大文件上传到云共享服务，然后粘贴链接？"
         too_many_uploads: "抱歉，一次只能上传一张图片。"
         too_many_dragged_and_dropped_files:
-          other: "抱歉，一次只能上传%{count}个文件。"
+          other: "抱歉，一次只能上传 %{count} 个文件。"
         upload_not_authorized: "抱歉，你没有上传文件的权限（验证扩展：%{authorized_extensions}）。"
         image_upload_not_allowed_for_new_user: "抱歉，新用户无法上传图片。"
         attachment_upload_not_allowed_for_new_user: "抱歉，新用户无法上传附件。"
         attachment_download_requires_login: "抱歉，你需要登录后才能下载附件。"
-      abandon_edit:
-        confirm: "您确定要放弃所做的更改吗？"
-        no_value: "不，保持"
-        no_save_draft: "不，保存草稿"
-        yes_value: "是的，忽略编辑"
-      abandon:
-        title: "放弃草稿"
-        confirm: "确定要放弃编辑帖子吗？"
-        no_value: "否"
-        no_save_draft: "不，保存草稿"
-        yes_value: "是"
+      cancel_composer:
+        confirm: "你想对自己的帖子做什么？"
+        discard: "丢弃"
+        save_draft: "保存草稿供以后使用"
+        keep_editing: "继续编辑"
       via_email: "通过邮件发表的帖子"
       via_auto_generated_email: "通过自动生成邮件发表的帖子"
       whisper: "设置帖子为密语，只对版主可见"
@@ -2471,43 +2611,45 @@ zh_CN:
         edit: "编辑本帖"
         edit_action: "编辑"
         edit_anonymous: "抱歉，需要登录后才能编辑该贴。"
-        flag: "背地里标记该帖以示警示，或发送关于它的私下通知"
+        flag: "私下标记此贴以警告，或发送一个关于它的私人通知"
         delete: "删除本帖"
         undelete: "恢复本帖"
         share: "分享指向这个帖子的链接"
         more: "更多"
         delete_replies:
-          confirm: "你也想删除该贴的回复？"
+          confirm: "是否要删除该贴的回复？"
           direct_replies:
-            other: "是，%{count}个直接回复"
+            other: "是，%{count} 个直接回复"
           all_replies:
-            other: "是，所有%{count}个回复"
+            other: "是，以及共计 %{count} 个回复"
           just_the_post: "不，只是这篇帖子"
-        admin: "帖子管理"
-        wiki: "公共编辑"
-        unwiki: "限制公共编辑"
+        admin: "帖子管理操作"
+        wiki: "设为维基"
+        unwiki: "移除维基"
         convert_to_moderator: "添加管理人员颜色标识"
         revert_to_regular: "移除管理人员颜色标识"
         rebake: "重建 HTML"
         publish_page: "页面发布"
         unhide: "显示"
-        change_owner: "更改作者"
+        change_owner: "更改所有者"
         grant_badge: "授予徽章"
         lock_post: "锁定帖子"
         lock_post_description: "禁止发帖者编辑这篇帖子"
         unlock_post: "解锁帖子"
         unlock_post_description: "允许发布者编辑帖子"
-        delete_topic_disallowed_modal: "你无权删除该贴。如果你真想删除，向版主提交原因并标记。"
-        delete_topic_disallowed: "你无权删除此主题"
-        delete_topic_confirm_modal: "这个话题目前有超过 %{minViews} 个浏览，可能是一个受欢迎的搜索目标。 你确定要完全删除该主题，而不是对其进行编辑以改善它吗？"
-        delete_topic_confirm_modal_yes: "是，删除此主题"
+        delete_topic_disallowed_modal: "你无权删除该贴，如果你真想删除，向版主提交原因并标记。"
+        delete_topic_disallowed: "你无权删除此话题"
+        delete_topic_confirm_modal:
+          other: "当前话题已被浏览超过 %{count} 次，因此可能是一个受欢迎的搜索结果。你确定要完全删除该话题，而不是对其进行编辑以改善它吗？"
+        delete_topic_confirm_modal_yes: "是，删除此话题"
         delete_topic_confirm_modal_no: "不，保留这个话题"
-        delete_topic_error: "删除此主题时发生错误"
-        delete_topic: "删除主题"
+        delete_topic_error: "删除此话题时发生错误"
+        delete_topic: "删除话题"
         add_post_notice: "添加管理人员通知"
         change_post_notice: "变更管理人员通知"
-        delete_post_notice: "移除管理人员通知"
+        delete_post_notice: "删除管理人员通知"
         remove_timer: "移除计时器"
+        edit_timer: "编辑计时器"
       actions:
         people:
           like:
@@ -2515,18 +2657,18 @@ zh_CN:
           read:
             other: "看过"
           like_capped:
-            other: "还有其他%{count}人赞了它"
+            other: "还有其他 %{count} 人赞了它"
           read_capped:
-            other: "还有%{count}个其他用户看过"
+            other: "还有 %{count} 个其他用户看过"
         by_you:
-          off_topic: "你标记其偏离主题"
-          spam: "你标记其为垃圾信息"
-          inappropriate: "你标记其为不恰当的言辞"
-          notify_moderators: "你标记了本帖要求管理人员处理"
+          off_topic: "你已标记其为偏离话题"
+          spam: "你已标记其为垃圾信息"
+          inappropriate: "你已标记其为不恰当的言辞"
+          notify_moderators: "你已标记了本帖要求管理人员处理"
           notify_user: "你已经通知了该用户"
       delete:
         confirm:
-          other: "你确定要删除%{count}个帖子吗？"
+          other: "你确定要删除这 %{count} 个帖子吗？"
       merge:
         confirm:
           other: "确定要合并这 %{count} 个帖子吗？"
@@ -2538,7 +2680,7 @@ zh_CN:
           last: "最新版"
           hide: "隐藏版本历史"
           show: "显示版本历史"
-          revert: "还原到版本%{revision}"
+          revert: "还原到版本 %{revision}"
           edit_wiki: "编辑维基"
           edit_post: "编辑帖子"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
@@ -2558,15 +2700,15 @@ zh_CN:
             title: "显示原始邮件地址"
             button: "原始"
           text_part:
-            title: "显示邮件的文字部分"
-            button: "文字"
+            title: "显示邮件的文本部分"
+            button: "文本"
           html_part:
             title: "显示邮件的 HTML 部分"
             button: "HTML"
       bookmarks:
-        create: "创建收藏夹"
+        create: "创建收藏"
         edit: "编辑收藏"
-        created: "创建日期"
+        created: "已创建"
         updated: "已更新"
         name: "名称"
         name_placeholder: "这个收藏是做什么用的？"
@@ -2574,10 +2716,22 @@ zh_CN:
         actions:
           delete_bookmark:
             name: "删除收藏"
-            description: "从你的个人资料中删除收藏并停止所有有关该收藏的提醒"
+            description: "从你的个人资料中删除收藏并停止所有关于该收藏的提醒"
           edit_bookmark:
             name: "编辑收藏"
             description: "编辑收藏名称或修改提醒的日期和时间"
+          pin_bookmark:
+            name: "置顶收藏"
+            description: "置顶收藏，这将使其显示在收藏列表的顶部。"
+          unpin_bookmark:
+            name: "取消置顶收藏"
+            description: "取消置顶收藏，它将不再出现在收藏列表的顶部。"
+      filtered_replies:
+        viewing_posts_by: "查看 %{post_count} 个帖子"
+        viewing_subset: "一些回复已被折叠"
+        viewing_summary: "查看此话题的摘要"
+        post_number: "%{username}，帖子 #%{post_number}"
+        show_all: "显示全部"
     category:
       can: "能够&hellip; "
       none: "（未分类）"
@@ -2585,35 +2739,35 @@ zh_CN:
       choose: "分类&hellip;"
       edit: "编辑"
       edit_dialog_title: "编辑: %{categoryName}"
-      view: "浏览分类的主题"
+      view: "浏览分类的话题"
       back: "返回分类"
       general: "常规"
       settings: "设置"
-      topic_template: "主题模板"
+      topic_template: "话题模板"
       tags: "标签"
       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: "也允许其它标签"
       tag_group_selector_placeholder: "（可选）标签组"
-      required_tag_group_description: "要求新主题包含标签组中的标签："
+      required_tag_group_description: "要求新话题包含标签组中的标签："
       min_tags_from_required_group_label: "标签数量："
       required_tag_group_label: "标签组："
       topic_featured_link_allowed: "允许在该分类中发布特色链接标题"
       delete: "删除分类"
-      create: "新分类"
+      create: "新建分类"
       create_long: "创建新的分类"
       save: "保存分类"
-      slug: "分类 Slug"
-      slug_placeholder: "（可选）用于分类的 URL"
+      slug: "分类简称"
+      slug_placeholder: "（可选）用于 URL 以“-”分割的单词"
       creation_error: 创建此分类时发生了错误。
       save_error: 在保存此分类时发生了错误。
       name: "分类名称"
       description: "描述"
-      topic: "分类主题"
+      topic: "分类话题"
       logo: "分类标志图片"
       background_image: "分类背景图片"
       badge_colors: "徽章颜色"
@@ -2625,76 +2779,77 @@ zh_CN:
       delete_error: "在删除此分类时发生了错误。"
       list: "列出分类"
       no_description: "请为本分类添加描述信息。"
-      change_in_category_topic: "访问分类主题来编辑描述信息"
+      change_in_category_topic: "访问分类话题来编辑描述信息"
       already_used: "此色彩已经被另一个分类使用"
       security: "安全性"
       security_add_group: "新增群组"
       permissions:
         group: "群组"
-        see: "看到"
+        see: "阅读"
         reply: "回复"
         create: "创建"
-        no_groups_selected: "没有群组被授予访问权限；此类别仅对管理员可见。"
-        everyone_has_access: "这个分类是公开的，任何人都可以看到，回复和创建帖子。要限制权限，请删除“所有人”组的一个或多个权限。"
+        no_groups_selected: "没有群组被授予访问权限，此类别仅对管理员可见。"
+        everyone_has_access: '这个分类是公开的，任何人都可以阅读，回复和创建帖子。要限制权限，请删除“everyone”组的一个或多个权限。'
         toggle_reply: "切换回复权限"
         toggle_full: "切换创建权限"
-        inherited: "此权限继承自 “所有人”"
+        inherited: '此权限继承自 “everyone”'
       special_warning: "警告：这是一个预设的分类，它的安全设置不能被更改。如果你不想要使用这个分类，直接删除它，而不是另作他用。"
       uncategorized_security_warning: "这是个特殊的分类。如果不知道应该话题属于哪个分类，那么请使用这个分类。这个分类没有安全设置。"
-      uncategorized_general_warning: '这个分类是特殊的。它用作未选择分类的新主题的默认分类。如果你想要避免此行为并强制选择分类，<a href="%{settingLink}">请在此处禁用该设置</a>。如果你要修改其名称或描述，请转到<a href="%{customizeLink}">自定义/文本内容</a>。'
-      pending_permission_change_alert: "你还没有添加%{group}到此分类；点击此按钮添加。"
+      uncategorized_general_warning: '这个分类是特殊的，它用作未选择分类的新话题的默认分类。如果你想要避免此行为并强制选择分类，<a href="%{settingLink}">请在此处禁用该设置</a>。如果你要修改其名称或描述，请转到<a href="%{customizeLink}">自定义/文本内容</a>。'
+      pending_permission_change_alert: "你还没有添加 %{group} 到此分类；点击此按钮添加。"
       images: "图片"
       email_in: "自定义进站电子邮件地址："
       email_in_allow_strangers: "接受无账户的匿名用户的邮件"
-      email_in_disabled: "站点设置中禁用了通过电子邮件发布新主题的功能。要启用通过电子邮件发布新主题， "
+      email_in_disabled: "站点设置中禁用了通过电子邮件发布新话题的功能，要启用通过电子邮件发布新话题，"
       email_in_disabled_click: '启用“邮件发表”设置。'
       mailinglist_mirror: "分类镜像了一个邮件列表"
-      show_subcategory_list: "在这个分类中把子分类列表显示在主题的上面"
-      read_only_banner: "当一名用户不能在该分类创建主题时显示的横幅文字："
-      num_featured_topics: "分类页面上显示的主题数量："
-      subcategory_num_featured_topics: "父分类页面上的推荐主题数量："
-      all_topics_wiki: "默认将新主题设为维基主题"
+      show_subcategory_list: "在这个分类中把子分类列表显示在话题的上面"
+      read_only_banner: "当一名用户不能在该分类创建话题时显示的横幅文字："
+      num_featured_topics: "分类页面上显示的话题数量："
+      subcategory_num_featured_topics: "父分类页面上的精选话题数量："
+      all_topics_wiki: "默认将新话题设为维基"
+      allow_unlimited_owner_edits_on_first_post: "允许所有者对话题中的第一篇帖子进行无限的编辑"
       subcategory_list_style: "子分类列表样式："
-      sort_order: "主题排序依据："
-      default_view: "默认主题列表："
+      sort_order: "话题排序依据："
+      default_view: "默认话题列表："
       default_top_period: "默认热门时长："
       default_list_filter: "默认列表筛选"
       allow_badges_label: "允许在此分类中授予徽章"
       edit_permissions: "编辑权限"
       reviewable_by_group: "除管理人员外，该分类的内容还可以被以下用户审核："
       review_group_name: "群组名"
-      require_topic_approval: "所有新主题需要版主审批"
+      require_topic_approval: "所有新话题需要版主审批"
       require_reply_approval: "所有新回复需要版主审批"
       this_year: "今年"
       position: "分类页面位置："
       default_position: "默认位置"
       position_disabled: "分类按照其活跃程度的顺序显示。要固定分类列表的显示顺序， "
       position_disabled_click: '启用“固定分类位置”设置。'
-      minimum_required_tags: "在一个主题中至少含有多少个标签："
+      minimum_required_tags: "在一个话题中至少含有多少个标签："
       parent: "上级分类"
-      num_auto_bump_daily: "每天自动顶贴的主题的数量"
-      navigate_to_first_post_after_read: "阅读主题后导航到第一个帖子"
+      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: "追踪"
-          description: "你将自动跟踪这些分类中的所有主题。如果有人@你或回复你，将通知你，还将显示新回复的数量。"
+          description: "你将自动跟踪这个分类中的所有话题，如果有人 @ 你或回复你，将通知你，还将显示新回复的数量。"
         regular:
           title: "普通"
           description: "如果有人@你或回复你，将通知你。"
         muted:
           title: "静音"
-          description: "在这些分类里面，你将不会收到新主题任何通知，它们也不会出现在“最新”主题列表。"
+          description: "你将不会收到有这些个分类新话题的任何通知，它们也不会出现在最新话题中。"
       search_priority:
         label: "搜索优先级"
         options:
           normal: "普通"
-          ignore: "忽视"
+          ignore: "忽略"
           very_low: "非常低"
           low: "低"
           high: "高"
@@ -2705,47 +2860,49 @@ zh_CN:
         op_likes: "原始帖子的赞"
         views: "浏览"
         posts: "帖子"
-        activity: "最后活跃时间"
-        posters: "发表人"
+        activity: "活跃"
+        posters: "发帖者"
         category: "分类"
         created: "创建日期"
       sort_ascending: "升序"
       sort_descending: "降序"
       subcategory_list_styles:
         rows: "行"
-        rows_with_featured_topics: "有推荐主题的行"
-        boxes: "盒子"
-        boxes_with_featured_topics: "有推荐主题的盒子"
+        rows_with_featured_topics: "有精选话题的行"
+        boxes: "方框"
+        boxes_with_featured_topics: "有推荐话题的方框"
       settings_sections:
         general: "常规"
         moderation: "审核"
-        appearance: "主题"
+        appearance: "外观"
         email: "邮箱"
       list_filters:
-        all: "所有主题"
+        all: "所有话题"
         none: "无子分类"
+      colors_disabled: "你无法选择颜色，因为你没有类别样式。"
     flagging:
       title: "感谢你帮助我们建设文明社区！"
       action: "标记帖子"
-      take_action: "立即执行..."
+      take_action: "执行操作..."
       take_action_options:
         default:
-          title: "立即执行"
+          title: "执行操作"
           details: "立即采取标记达到阈值时的措施，而不是等待更多的社区标记"
         suspend:
           title: "封禁用户"
-          details: "达到设置阈值，并暂停用户"
+          details: "立即采取标记达到阈值时的措施，并封禁用户"
         silence:
           title: "禁言用户"
-          details: "达到设置阈值，并禁言用户"
-      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>加入黑名单。你确定该用户是垃圾广告发布者吗？"
+          details: "立即采取标记达到阈值时的措施，并禁言用户"
+      notify_action: "消息"
+      official_warning: "官方警告"
+      delete_spammer: "删除垃圾内容发布者"
+      flag_for_review: "加入审查队列"
+      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: "提交非公开的标记"
+      submit_tooltip: "私下提交标记"
       take_action_tooltip: "立即采取标记达到阈值时的措施，而不是等待更多的社区标记"
       cant: "抱歉，当前你不能标记该帖子。"
       notify_staff: "私下通知管理人员"
@@ -2753,7 +2910,7 @@ zh_CN:
         off_topic: "偏离话题"
         inappropriate: "这是不当言论"
         spam: "这是广告内容"
-      custom_placeholder_notify_user: "请具体说明，有建设性的，保持友善。"
+      custom_placeholder_notify_user: "详细说明，易于理解，保持友善。"
       custom_placeholder_notify_moderators: "让我们知道你关心的是什么，并尽可能地提供相关链接和例子。"
       custom_message:
         at_least:
@@ -2764,10 +2921,10 @@ zh_CN:
           other: "剩余 %{count}"
     flagging_topic:
       title: "感谢你帮助我们建设文明社区！"
-      action: "标记帖子"
-      notify_action: "私信"
+      action: "标记话题"
+      notify_action: "消息"
     topic_map:
-      title: "主题摘要"
+      title: "话题摘要"
       participants_title: "主要发帖者"
       links_title: "热门链接"
       links_shown: "显示更多链接…"
@@ -2776,38 +2933,38 @@ zh_CN:
     post_links:
       about: "为本帖展开更多链接"
       title:
-        other: "%{count} 更多"
+        other: "还有 %{count} 篇"
     topic_statuses:
       warning:
-        help: "这是一个正式的警告。"
+        help: "这是一个官方警告。"
       bookmarked:
-        help: "你已经收藏了此主题"
+        help: "你已经收藏了此话题"
       locked:
-        help: "这个主题已被关闭；不再接受新的回复"
+        help: "这个话题已被关闭，不再接受新的回复"
       archived:
-        help: "本主题已归档；即已经冻结，无法修改"
+        help: "本话题已归档，即已经冻结，无法修改"
       locked_and_archived:
-        help: "这个主题已被关闭并存档；不再接受新的回复且不能被修改"
+        help: "这个话题已被关闭并归档，不再接受新的回复且不能被修改"
       unpinned:
-        title: "解除置顶"
-        help: "主题已经解除置顶；它将以默认顺序显示"
+        title: "取消置顶"
+        help: "话题已经取消置顶；它将以默认顺序显示"
       pinned_globally:
         title: "全局置顶"
-        help: "本主题已全局置顶；它始终会在最新列表以及它所属的分类中置顶"
+        help: "本话题已全局置顶，它始终会在最新列表以及它所属的分类中置顶"
       pinned:
         title: "置顶"
-        help: "本主题已置顶；它将始终显示在它所属分类的顶部"
+        help: "本话题已置顶，它将始终显示在它所属分类的顶端"
       unlisted:
-        help: "本主题被设置为不显示在主题列表中，只能通过链接来访问"
+        help: "本话题被设置为不显示在话题列表中，只能通过链接来访问"
       personal_message:
-        title: "此主题是一条私信"
-        help: "此主题是一条私信"
+        title: "此话题是一条私信"
+        help: "此话题是一条私信"
     posts: "帖子"
     posts_likes_MF: |
-      这个主题共有{count, plural, other {#个回复}}{ratio, select,
-      low {，赞/帖比较高}
-      med {，赞/帖比很高}
-      high {，赞/帖比非常之高}
+      这个话题共有{count, plural, other {# 条回复}}{ratio, select,
+      low {，点赞比例比较高}
+      med {，点赞比例很高}
+      high {，点赞比例非常之高}
       other {}}
     original_post: "原始帖"
     views: "浏览"
@@ -2815,7 +2972,7 @@ zh_CN:
       other: "浏览"
     replies: "回复"
     views_long:
-      other: "本主题已经被浏览过 %{number} 次"
+      other: "本话题已经被浏览过 %{number} 次"
     activity: "活动"
     likes: "赞"
     likes_lowercase:
@@ -2824,32 +2981,32 @@ zh_CN:
     users_lowercase:
       other: "用户"
     category_title: "分类"
-    history: "历史"
+    history: "历史，最近100次修订"
     changed_by: "由 %{author}"
     raw_email:
       title: "进站邮件"
       not_available: "不可用！"
     categories_list: "分类列表"
     filters:
-      with_topics: "%{filter}主题"
-      with_category: "%{category}的%{filter}主题"
+      with_topics: "%{filter} 话题"
+      with_category: "%{category} 的 %{filter} 话题"
       latest:
         title: "最新"
         title_with_count:
           other: "最新（%{count}）"
-        help: "有了新帖的活动主题"
+        help: "有新帖的话题"
       read:
         title: "已读"
-        help: "你已经阅读过的主题"
+        help: "你阅读过的话题，以你阅读的顺序排序"
       categories:
         title: "分类"
         title_in: "分类 - %{categoryName}"
-        help: "归入各种类别的所有主题"
+        help: "归入各种类别的所有话题"
       unread:
         title: "未读"
         title_with_count:
           other: "未读（%{count}）"
-        help: "你目前监看或跟踪有了未读帖子的主题"
+        help: "你目前关注或跟踪有了未读帖子的话题"
         lower_title_with_count:
           other: "%{count} 未读"
       new:
@@ -2859,21 +3016,21 @@ zh_CN:
         title: "近期"
         title_with_count:
           other: "近期（%{count}）"
-        help: "最近几天里创建的主题"
+        help: "最近几天里创建的话题"
       posted:
         title: "我的帖子"
-        help: "你发表过帖子的主题"
+        help: "你发表过帖子的话题"
       bookmarks:
         title: "收藏"
-        help: "你收藏的主题"
+        help: "你收藏的话题"
       category:
         title: "%{categoryName}"
         title_with_count:
           other: "%{categoryName} (%{count})"
-        help: "%{categoryName}分类中热门的主题"
+        help: "%{categoryName}分类中热门的话题"
       top:
         title: "热门"
-        help: "在最近的一年，一月，一周或一天最活跃的主题"
+        help: "在最近的一年，一月，一周或一天最活跃的话题"
         all:
           title: "不限时间"
         yearly:
@@ -2906,6 +3063,7 @@ zh_CN:
       close: "关闭(Esc)"
       content_load_error: '<a href="%url%">内容</a>无法加载'
       image_load_error: '<a href="%url%">图像</a>无法加载'
+    cannot_render_video: 由于你的浏览器不支持编解码器，因此无法播放此视频。
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: "，"
       shortcut_key_delimiter_plus: "+"
@@ -2925,27 +3083,27 @@ zh_CN:
         profile: "%{shortcut} 个人页面"
         messages: "%{shortcut} 私信"
         drafts: "%{shortcut}草稿"
-        next: "%{shortcut} 下一个主题"
-        previous: "%{shortcut} 上一个主题"
+        next: "%{shortcut} 下一个话题"
+        previous: "%{shortcut} 上一个话题"
       navigation:
         title: "导航"
         jump: "%{shortcut} 前往帖子 #"
         back: "%{shortcut} 返回"
         up_down: "%{shortcut} 移动选择焦点 &uarr; &darr;"
-        open: "%{shortcut} 打开选择的主题"
+        open: "%{shortcut} 打开选择的话题"
         next_prev: "%{shortcut} 下一个/前一个段落"
         go_to_unread_post: "%{shortcut}前往第一个未读帖子"
       application:
         title: "应用"
-        create: "%{shortcut} 创建新主题"
+        create: "%{shortcut} 创建新话题"
         notifications: "%{shortcut} Open notifications"
         hamburger_menu: "%{shortcut} 打开汉堡菜单"
         user_profile_menu: "%{shortcut} 打开用户菜单"
-        show_incoming_updated_topics: "%{shortcut} 显示更新主题"
+        show_incoming_updated_topics: "%{shortcut} 显示更新话题"
         search: "%{shortcut} 搜索"
         help: "%{shortcut} 打开键盘帮助"
         dismiss_new_posts: "%{shortcut} 解除新/帖子提示"
-        dismiss_topics: "%{shortcut} 解除主题提示"
+        dismiss_topics: "%{shortcut} 解除话题提示"
         log_out: "%{shortcut} 退出登录"
       composing:
         title: "编辑"
@@ -2966,12 +3124,12 @@ zh_CN:
         delete: "%{shortcut} 删除收藏"
       actions:
         title: "动作"
-        bookmark_topic: "%{shortcut} 切换主题收藏状态"
-        pin_unpin_topic: "%{shortcut} 置顶/截至置顶主题"
-        share_topic: "%{shortcut} 分享主题"
+        bookmark_topic: "%{shortcut} 切换话题收藏状态"
+        pin_unpin_topic: "%{shortcut} 置顶/截至置顶话题"
+        share_topic: "%{shortcut} 分享话题"
         share_post: "%{shortcut} 分享帖子"
-        reply_as_new_topic: "%{shortcut} 回复为联结主题"
-        reply_topic: "%{shortcut} 回复主题"
+        reply_as_new_topic: "%{shortcut} 回复为联结话题"
+        reply_topic: "%{shortcut} 回复话题"
         reply_post: "%{shortcut} 回复帖子"
         quote_post: "%{shortcut} 引用帖子"
         like: "%{shortcut} 点赞帖子"
@@ -2979,13 +3137,13 @@ zh_CN:
         bookmark: "%{shortcut} 收藏帖子"
         edit: "%{shortcut} 编辑帖子"
         delete: "%{shortcut} 删除帖子"
-        mark_muted: "%{shortcut} 忽略主题"
-        mark_regular: "%{shortcut} 常规（默认）主题"
-        mark_tracking: "%{shortcut} 追踪主题"
-        mark_watching: "%{shortcut} 看主题"
-        print: "%{shortcut} 打印主题"
-        defer: "%{shortcut}延迟主题"
-        topic_admin_actions: "%{shortcut}打开主题管理"
+        mark_muted: "%{shortcut} 忽略话题"
+        mark_regular: "%{shortcut} 常规（默认）话题"
+        mark_tracking: "%{shortcut} 追踪话题"
+        mark_watching: "%{shortcut} 看话题"
+        print: "%{shortcut} 打印话题"
+        defer: "%{shortcut}延迟话题"
+        topic_admin_actions: "%{shortcut}打开话题管理"
       search_menu:
         title: "搜索菜单"
         prev_next: "%{shortcut}上下移动所选内容"
@@ -3045,7 +3203,7 @@ zh_CN:
       delete_synonym_confirm: '您确定要删除同义词“ %{tag_name}”吗？'
       delete_tag: "删除标签"
       delete_confirm:
-        other: "你确定你想要删除这个标签以及撤销在%{count}个主题中的关联么？"
+        other: "你确定你想要删除这个标签以及撤销在%{count}个话题中的关联么？"
       delete_confirm_no_topics: "你确定你想要删除这个标签吗？"
       delete_confirm_synonyms:
         other: "其%{count}个同义词也将被删除。"
@@ -3055,40 +3213,41 @@ zh_CN:
       sort_by_count: "总数"
       sort_by_name: "名称"
       manage_groups: "管理标签组"
-      manage_groups_description: "管理标签的群组"
+      manage_groups_description: "定义组以整理标签"
       upload: "上传标签"
-      upload_description: "上传csv文件以批量创建标签"
-      upload_instructions: "每行一个，可选带有'tag_name，tag_group'格式的标签组。"
+      upload_description: "上传 csv 文件以批量创建标签"
+      upload_instructions: "每行一个，可以使用 ‘tag_name，tag_group’ 格式附带标签组。"
       upload_successful: "标签上传成功"
       delete_unused_confirmation:
-        other: "%{count}标签将被删除：%{tags}"
+        other: "%{count} 个标签将被删除：%{tags}"
       delete_unused_confirmation_more_tags:
-        other: "%{tags}和%{count}更多"
+        other: "%{tags} 及其他 %{count} 个"
       delete_no_unused_tags: "没有未使用的标签。"
+      tag_list_joiner: ", "
       delete_unused: "删除未使用的标签"
-      delete_unused_description: "删除所有未与主题或私信关联的标签"
+      delete_unused_description: "删除所有未与话题或私信关联的标签"
       cancel_delete_unused: "取消"
       filters:
-        without_category: "%{tag}的%{filter}主题"
-        with_category: "%{filter} %{tag}主题在%{category}"
-        untagged_without_category: "无标签的%{filter}主题"
-        untagged_with_category: "%{category}无标签的%{filter}主题"
+        without_category: "%{tag} 的 %{filter} 话题"
+        with_category: "%{category}中带有 %{tag} 的 %{filter} 话题"
+        untagged_without_category: "无标签的 %{filter} 话题"
+        untagged_with_category: "%{category} 中无标签的 %{filter} 话题"
       notifications:
         watching:
-          title: "监看"
-          description: "你将自动监看所有含有此标签的主题。你将收到所有新帖子和主题的通知，此外，主题旁边还会显示未读和新帖子的数量。"
+          title: "关注"
+          description: "你将自动关注所有含有此标签的话题。你将收到所有新帖子和话题的通知，此外，话题旁边还会显示未读和新帖子的数量。"
         watching_first_post:
-          title: "监控新主题"
-          description: "你将会收到此标签中的新主题的通知，但对主题的回复则不会。"
+          title: "关注新话题"
+          description: "你将会收到此标签中的新话题的通知，但对话题的回复则不会。"
         tracking:
           title: "跟踪"
-          description: "你将自动监看所有含有此标签的主题。未读和新帖的计数将显示在主题旁边。"
+          description: "你将自动监看所有含有此标签的话题，未读和新帖的计数将显示在话题旁边。"
         regular:
           title: "普通"
           description: "有人@你或回复你的帖子时将会通知你"
         muted:
           title: "静音"
-          description: "你不会收到任何含有此标签的新主题的通知，也不会在未读栏。"
+          description: "你不会收到任何含有此标签的新话题的通知，也不会在未读栏。"
       groups:
         title: "标签组"
         about: "将标签分组以便管理。"
@@ -3096,7 +3255,7 @@ zh_CN:
         tags_label: "标签组内标签："
         parent_tag_label: "上级标签："
         parent_tag_description: "未设置上级标签前不能使用标签组内的标签。"
-        one_per_topic_label: "只可给主题设置一个该组内的标签"
+        one_per_topic_label: "本组中的每个话题限制一个标签"
         new_name: "新建标签组"
         name_placeholder: "标签组名称"
         save: "保存"
@@ -3105,22 +3264,24 @@ zh_CN:
         everyone_can_use: "每个人都可以使用标签"
         usable_only_by_groups: "标签对所有人可见，但只有管理人员可以添加它们"
         visible_only_to_groups: "标签仅对以下群组可见"
+        cannot_save: "无法保存标签组。确保至少有一个标签存在，标签组名称不为空，并且为标签组选择一个权限。"
       topics:
         none:
-          unread: "你没有未读主题。"
-          new: "你没有新的主题"
-          read: "你尚未阅读任何主题。"
-          posted: "你尚未在任何主题中发帖。"
-          latest: "没有最新主题。"
-          bookmarks: "你还没有收藏主题。"
-          top: "没有热门主题。"
+          unread: "你没有未读话题。"
+          new: "你没有新的话题"
+          read: "你尚未阅读任何话题。"
+          posted: "你尚未在任何话题中发帖。"
+          latest: "没有最新话题。"
+          bookmarks: "你还没有收藏话题。"
+          top: "没有热门话题。"
     invite:
       custom_message: "通过编写<a href>自定义消息</a>，使你的邀请更个性化。"
       custom_message_placeholder: "输入留言"
-      approval_not_required: "一旦用户接受此邀请，他们将被自动批准。"
+      approval_not_required: "用户一旦接受此邀请，就会被自动批准。"
       custom_message_template_forum: "你好，你应该加入这个论坛！"
-      custom_message_template_topic: "你好，我觉得你可能会喜欢这个主题！"
+      custom_message_template_topic: "你好，我觉得你可能会喜欢这个话题！"
     forced_anonymous: "由于负载过大，暂时对所有用户都显示匿名用户所见的内容。"
+    forced_anonymous_login_required: "该站点正处于极端负载状态，当前无法加载，请在数分钟后重试。"
     footer_nav:
       back: "返回"
       forward: "继续"
@@ -3128,7 +3289,18 @@ zh_CN:
       dismiss: "忽略"
     safe_mode:
       enabled: "安全模式已经开启，关闭该浏览器窗口以退出安全模式"
-    image_removed: "(图像被移除)"
+    image_removed: "（图像被移除）"
+    do_not_disturb:
+      title: "勿扰..."
+      label: "勿扰"
+      remaining: "剩余 %{remaining}"
+      options:
+        half_hour: "30分钟"
+        one_hour: "1 小时"
+        two_hours: "2 小时"
+        tomorrow: "直到明天"
+        custom: "自定义"
+      set_schedule: "设定一个定时通知"
   admin_js:
     type_to_filter: "输入以筛选…"
     admin:
@@ -3140,11 +3312,11 @@ zh_CN:
           only_muted: "单独或与其它静音的标签一起使用时"
           never: "从不"
       reports:
-        title: "可用报告列表"
+        title: "可用举报列表"
       dashboard:
         title: "仪表盘"
         last_updated: "仪表盘更新于："
-        discourse_last_updated: "Discourse更新于："
+        discourse_last_updated: "Discourse 更新于："
         version: "安装的版本"
         up_to_date: "你正在运行最新的论坛版本。"
         critical_available: "有一个关键更新可用。"
@@ -3156,6 +3328,10 @@ zh_CN:
         installed_version: "已安装"
         latest_version: "最新版本"
         problems_found: "根据您当前的站点设置提供一些建议"
+        new_features:
+          title: "\U0001F381 新功能"
+          dismiss: "忽略"
+          learn_more: "了解更多"
         last_checked: "上次检查"
         refresh_problems: "刷新"
         no_problems: "找不到问题."
@@ -3243,10 +3419,6 @@ zh_CN:
             available: "群组名可用"
             not_available: "群组名不可用"
             blank: "群组名不能为空"
-        bulk_add:
-          title: "批量添加到群组"
-          complete_users_not_added: "这些用户还没有被添加（请确保他们已经有账户了）："
-          paste: "粘贴用户名邮件列表，一行一个："
         add_members:
           as_owner: "设置用户为此群组拥有者"
         manage:
@@ -3273,7 +3445,8 @@ zh_CN:
             effects: 影响
             trust_levels_none: "无"
             automatic_membership_email_domains: "用户注册时邮箱域名若与列表完全匹配则自动添加至这个群组："
-            automatic_membership_user_count: "拥有新邮件域名的 %{count} 位用户将被添加到群组中。"
+            automatic_membership_user_count:
+              other: "%{count}个拥有域名邮件地址的用户将会被添加到这个群组中。"
             primary_group: "自动设置为主要群组"
         name_placeholder: "群组名，没有空格，和用户名一样的规则"
         primary: "主要群组"
@@ -3285,7 +3458,10 @@ zh_CN:
         group_members: "群组成员"
         delete: "删除"
         delete_confirm: "删除这个群组吗？"
+        delete_with_messages_confirm:
+          other: "删除此群组将导致 %{count} 条消息被孤立，群组成员将无法再访问它们。<br><br>你确定吗？"
         delete_failed: "无法删除群组。如果该群组是自动生成的，则不可删除。"
+        delete_automatic_group: 这是一个自动群组，不能删除。
         delete_owner_confirm: "移除“%{username}”的权限？"
         add: "添加"
         custom: "定制"
@@ -3341,15 +3517,19 @@ zh_CN:
           allowed_urls: 允许的URL
           descriptions:
             topics:
-              read: 阅读一个主题或其中的一个帖子。支持RSS。
-              write: 创建一个新的主题或发表到一个现有的主题。
-              read_lists: 阅读如热门、最新、新的主题这样的主题列表。支持RSS。
+              read: 阅读一个话题或其中的一个帖子。支持RSS。
+              write: 创建一个新的话题或发表到一个现有的话题。
+              read_lists: 阅读如热门、最新、新的话题这样的话题列表。支持RSS。
               wordpress: 需要 WordPress 才能使 wp-discourse 插件正常工作。
             users:
-              bookmarks: 列出用户书签。使用 ICS 格式时，它将返回书签提醒。
-              sync_sso: 使用 SSO 同步用户。
+              bookmarks: 列出用户收藏。使用 ICS 格式时返回收藏提醒。
+              sync_sso: 使用 DiscoursetConnect 同步用户。
               show: 获取有关用户的信息。
               check_emails: 列出用户电子邮件。
+              update: 更新用户个人资料信息。
+              log_out: 注销用户的所有会话。
+              anonymize: 匿名用户帐户。
+              delete: 删除用户帐户。
             email:
               receive_emails: 将此范围与邮件收件人结合起来处理传入的电子邮件。
       web_hooks:
@@ -3366,7 +3546,7 @@ zh_CN:
         go_back: "返回列表"
         payload_url: "Payload URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "你好像将 webhook 指向了一个本地地址。把相关事件发送到本地可能产生副作用或未预期的行为。继续吗？"
+        warn_local_payload_url: "似乎您正在尝试将 Webhook 设置为本地 URL。传递到本地地址的事件可能会导致副作用或意外行为。继续吗？"
         secret_invalid: "密钥不能包含空白字符。"
         secret_too_short: "密钥必须至少有 12 个字符。"
         secret_placeholder: "可选字符，用于生成签名"
@@ -3387,14 +3567,14 @@ zh_CN:
         groups_filter: "触发的群组"
         delete_confirm: "删除这个 webhook？"
         topic_event:
-          name: "主题事件"
-          details: "当有新主题、主题被修订、修改或者删除时。"
+          name: "话题事件"
+          details: "当有新话题、话题被修订、修改或者删除时。"
         post_event:
           name: "帖子事件"
           details: "当有新回复、编辑、帖子被删除或者恢复时。"
         user_event:
           name: "用户事件"
-          details: "当登录、退出、创建、批准或更新一个用户时。"
+          details: "用户登录，注销后，确认其电子邮件已创建，批准或更新。"
         group_event:
           name: "群组事件"
           details: "当群组创建，更新或销毁时。"
@@ -3413,6 +3593,12 @@ zh_CN:
         user_badge_event:
           name: "徽章授予事件"
           details: "当一个用户收到一个徽章时。"
+        group_user_event:
+          name: "组用户事件"
+          details: "在组中添加或删除用户时。"
+        like_event:
+          name: "点赞事件"
+          details: "当用户点赞一个贴子时"
         delivery_status:
           title: "分发状态"
           inactive: "不活跃"
@@ -3547,8 +3733,8 @@ zh_CN:
         theme_owner: "禁止编辑，拥有者："
         email_templates:
           title: "邮箱"
-          subject: "主题"
-          multiple_subjects: "这个邮件模板包括多个主题。"
+          subject: "话题"
+          multiple_subjects: "这个邮件模板包括多个话题。"
           body: "内容"
           revert: "撤销变更"
           revert_confirm: "你确定要撤销你的修改吗？"
@@ -3560,8 +3746,8 @@ zh_CN:
           component_name: "组件名称"
           themes_intro: "选择现有主题或安装新主题即可开始使用"
           themes_intro_emoji: "女艺术家表情符号"
-          beginners_guide_title: "使用Discourse主题的初学者指导"
-          developers_guide_title: "Discourse主题的开发者指导"
+          beginners_guide_title: "Discourse 主题的初学者使用指导"
+          developers_guide_title: "Discourse 主题的开发者指导"
           browse_themes: "浏览社区主题"
           customize_desc: "定制："
           title: "主题"
@@ -3570,7 +3756,7 @@ zh_CN:
           create_name: "名称"
           long_title: "修改你的站点的色彩、CSS 和HTML内容"
           edit: "编辑"
-          edit_confirm: "这是一个远程主题。如果你编辑了CSS/HTML，在下一次更新该主题后这些自定义项目将会被删除。"
+          edit_confirm: "这是一个远程主题，如果你编辑了 CSS/HTML，在下一次更新时这些变动将会被删除。"
           update_confirm: "这些本地更改将被更新删除。你确定你要继续吗？"
           update_confirm_yes: "是，继续更新"
           common: "通用"
@@ -3599,7 +3785,9 @@ zh_CN:
           convert: "转换"
           convert_component_alert: "你确定转换此组件到主题吗？将会从组件%{relatives}中移除。"
           convert_component_tooltip: "转换此组件到主题"
-          convert_theme_alert: "你确定转换此组件到主题吗？它将作为%{relatives}的父级删除。"
+          convert_component_alert_generic: "你确定要将这个组件转换成主题吗？"
+          convert_theme_alert: "你确定转换此组件到主题吗？它将作为%{relatives}的上级删除。"
+          convert_theme_alert_generic: "你确定要将这个主题转换成组件吗？"
           convert_theme_tooltip: "转换此主题到组件"
           inactive_themes: "未使用的主题："
           inactive_components: "未使用的组件："
@@ -3633,17 +3821,20 @@ zh_CN:
           included_components: "包含的组件"
           add_all: "添加所有"
           import_web_tip: "目录包含主题"
+          direct_install_tip: "你确定要从下面列出的仓库中安装<strong>%{name}</strong>吗？"
           import_web_advanced: "高级..."
           import_file_tip: "包含主题的.tar.gz、.zip或.dcstyle.json文件"
           is_private: "主题在私有git存储库中"
           remote_branch: "分支名称（可选）"
           public_key: "授予对repo的以下公钥访问权限："
+          public_key_note: "在上面输入一个有效的私有仓库 URL 后，将生成一个 SSH 密钥并显示在这里。"
           install: "安装"
           installed: "已安装"
           install_popular: "热门"
           install_upload: "来自你的设备"
           install_git_repo: "从 git 仓库"
           install_create: "创建新的"
+          duplicate_remote_theme: "主题组件 “%{name}” 已经安装，你确定要安装另一个副本吗？"
           about_theme: "关于"
           license: "许可证"
           version: "版本："
@@ -3663,6 +3854,7 @@ zh_CN:
           check_for_updates: "检查更新"
           updating: "更新…"
           up_to_date: "主题已经是最新版本，上次检查："
+          has_overwritten_history: "当前主题版本不再存在，因为 Git 历史记录已被强制推送覆盖。"
           add: "添加"
           theme_settings: "主题设置"
           no_settings: "这个主题内没有设置"
@@ -3671,6 +3863,7 @@ zh_CN:
           commits_behind:
             other: "主题落后了 %{count} 个变更！"
           compare_commits: "（查看新提交）"
+          remote_theme_edits: "如果你想要编辑此主题，你必须 <a href='%{repoURL}' target='_blank'>在其资源库上提交一个更改</a>"
           repo_unreachable: "无法联系此主题的Git存储库。错误信息："
           imported_from_archive: "此主题是从一个.zip文件导入的"
           scss:
@@ -3693,14 +3886,11 @@ zh_CN:
             title: "输入自定义颜色配置（仅限高级用户）"
             placeholder: |2-
 
-              使用这个样式表将自定义颜色添加到CSS自定义属性。
+              使用这个样式表将自定义的颜色添加到CSS自定义属性列表。
 
               例如：
 
-
-              :root {
-              --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};
-              }
+              %{example}
 
               强烈建议使用前缀为属性命名以避免与插件或核心程序冲突。
           head_tag:
@@ -3712,6 +3902,8 @@ zh_CN:
           yaml:
             text: "YAML"
             title: "用 YAML 格式定义主题设置"
+          scss_color_variables_warning: "不建议在主题中使用核心 SCSS 颜色变量，请改用 CSS 自定义属性，详细信息参见 <a href=\"https://meta.discourse.org/t/-/77551#color-variables-2\" target=\"_blank\">本指南</a>"
+          scss_warning_inline: "不建议在主题中使用核心 SCSS 颜色变量。"
         colors:
           select_base:
             title: "选择基色调色板"
@@ -3751,7 +3943,7 @@ zh_CN:
             description: "顶栏的文字和图标"
           highlight:
             name: "高亮显示"
-            description: "页面中高亮元素的背景色，如帖子和主题。"
+            description: "页面中高亮元素的背景色，如帖子和话题。"
           highlight-high:
             name: "高亮-高"
           highlight-medium:
@@ -3760,7 +3952,7 @@ zh_CN:
             name: "高亮-低"
           danger:
             name: "危险"
-            description: "突出显示删除帖子和主题等操作的颜色。"
+            description: "突出显示删除帖子和话题等操作的颜色。"
           success:
             name: "成功"
             description: "用于指示操作成功。"
@@ -3799,7 +3991,7 @@ zh_CN:
         skipped: "跳过"
         bounced: "退回"
         received: "收到"
-        rejected: "拒绝"
+        rejected: "已驳回"
         sent_at: "发送时间"
         time: "时间"
         user: "用户"
@@ -3826,7 +4018,7 @@ zh_CN:
           from_address: "来自"
           to_addresses: "发至"
           cc_addresses: "抄送"
-          subject: "主题"
+          subject: "话题"
           error: "错误"
           none: "没有找到进站邮件。"
           modal:
@@ -3835,12 +4027,12 @@ zh_CN:
             headers: "头部"
             subject: "标题"
             body: "内容"
-            rejection_message: "拒绝邮件"
+            rejection_message: "驳回邮件"
           filters:
             from_placeholder: "from@example.com"
             to_placeholder: "to@example.com"
             cc_placeholder: "cc@example.com"
-            subject_placeholder: "主题…"
+            subject_placeholder: "话题…"
             error_placeholder: "错误"
         logs:
           none: "未发现日志。"
@@ -3858,7 +4050,7 @@ zh_CN:
           suspend_user: "封禁的用户"
           silence_user: "禁言的用户"
           delete_post: "删除的帖子"
-          delete_topic: "删除的主题"
+          delete_topic: "删除的话题"
           post_approved: "帖子已审批"
       logs:
         title: "日志"
@@ -3867,7 +4059,7 @@ zh_CN:
         last_match_at: "最近匹配"
         match_count: "匹配"
         ip_address: "IP"
-        topic_id: "主题 ID"
+        topic_id: "话题 ID"
         post_id: "帖子 ID"
         category_id: "分类 ID"
         delete: "删除"
@@ -3883,7 +4075,7 @@ zh_CN:
           clear_filters: "显示全部"
           staff_user: "用户"
           target_user: "目标用户"
-          subject: "主题"
+          subject: "话题"
           when: "时间"
           context: "环境"
           details: "详情"
@@ -3909,7 +4101,7 @@ zh_CN:
             grant_badge: "授予徽章"
             revoke_badge: "撤销徽章"
             check_email: "查看电子邮件"
-            delete_topic: "删除主题"
+            delete_topic: "删除话题"
             recover_topic: "撤销删除帖子"
             delete_post: "删除帖子"
             impersonate: "模拟用户"
@@ -3947,14 +4139,14 @@ zh_CN:
             disabled_second_factor: "停用双重认证"
             topic_published: "帖子已发布"
             post_approved: "帖子已审批"
-            post_rejected: "帖子已拒绝"
+            post_rejected: "帖子已驳回"
             create_badge: "创建徽章"
             change_badge: "更换徽章"
             delete_badge: "删除徽章"
             merge_user: "合并用户"
             entity_export: "导出实体"
             change_name: "更换名称"
-            topic_timestamps_changed: "主题时间戳已更改"
+            topic_timestamps_changed: "话题时间戳已更改"
             approve_user: "批准的用户"
             web_hook_create: "创建webhook"
             web_hook_update: "更新webhook"
@@ -3977,12 +4169,13 @@ zh_CN:
             add_email: "添加邮箱"
             update_email: "更新邮箱"
             destroy_email: "删除邮箱"
-            topic_closed: "主题已关闭"
-            topic_opened: "主题已开放"
-            topic_archived: "主题已存档"
-            topic_unarchived: "取消主题存档"
+            topic_closed: "话题已关闭"
+            topic_opened: "话题已开放"
+            topic_archived: "话题已归档"
+            topic_unarchived: "取消话题归档"
             post_staff_note_create: "添加管理人员注释"
             post_staff_note_destroy: "删除管理人员注释"
+            delete_group: "删除群组"
         screened_emails:
           title: "已屏蔽的邮件地址"
           description: "当有人试图用以下邮件地址注册时，将受到阻止或其它系统操作。"
@@ -4030,30 +4223,33 @@ zh_CN:
         title: "敏感词"
         search: "搜索"
         clear_filter: "清除"
-        show_words: "显示敏感词"
-        one_word_per_line: "每行一个词"
+        show_words:
+          other: "显示%{count}个字词"
         download: 下载
         clear_all: 清除全部
-        clear_all_confirm_block: "你确定要清除所有封禁的敏感词吗？"
-        clear_all_confirm_censor: "你确定要清除所有审查的敏感词吗？"
-        clear_all_confirm_flag: "你确定要清除所有打旗标的敏感词吗？"
-        clear_all_confirm_require_approval: "你确定要清除所有需审核的敏感词吗？"
-        word_count:
-          other: "%{count}个敏感词"
+        clear_all_confirm: "您确定要清除 %{action} 动作的所有敏感词吗？"
         actions:
           block: "封禁"
           censor: "审查"
           require_approval: "需要审核"
           flag: "标记"
+          replace: "替换"
+          tag: "标签"
         action_descriptions:
           block: "防止发布包含这些敏感词的帖子。用户提交帖子时会收到错误提示。"
           censor: "允许包含这些敏感词的帖子，但将其替换为隐藏敏感词的字符。"
           require_approval: "包含这些敏感词的帖子需通过人工审核才能被看到。"
           flag: "允许包含这些敏感词的帖子，但将其标记为不当，以便版主审核。"
+          replace: "使用另外的字词替换帖子中的字词"
+          tag: "根据第一个帖子自动为话题打标签"
         form:
-          label: "新敏感词："
-          placeholder: "完整字词或 * 作为通配符"
+          label: "包含字词"
+          placeholder: "输入字词（*为通配符）"
           placeholder_regexp: "正则表达式"
+          replacement_label: "替换"
+          replacement_placeholder: "示例 https://example.com"
+          tag_label: "标签"
+          tag_placeholder: "标签1,标签2,标签3"
           add: "新增"
           success: "成功"
           exists: "已存在"
@@ -4106,6 +4302,9 @@ zh_CN:
         check_email:
           title: "显示用户电子邮件"
           text: "显示"
+        check_sso:
+          title: "显示 SSO 有效负载"
+          text: "显示"
       user:
         suspend_failed: "封禁此用户时发生了错误 %{error}"
         unsuspend_failed: "解禁此用户时发生了错误 %{error}"
@@ -4146,7 +4345,7 @@ zh_CN:
         clear_penalty_history:
           title: "清除处罚历史"
           description: "有处罚的用户无法达到信任等级3"
-        delete_all_posts_confirm_MF: "你将要删除 {POSTS, plural, one {1 个帖子} other {# 个帖子}}和 {TOPICS, plural, one {1 个主题} other {# 个主题}}。确定吗？"
+        delete_all_posts_confirm_MF: "你将要删除 {POSTS, plural, one {1 个帖子} other {# 个帖子}}和 {TOPICS, plural, one {1 个话题} other {# 个话题}}。确定吗？"
         silence: "禁言"
         unsilence: "解除禁言"
         silenced: "已禁言？"
@@ -4176,11 +4375,11 @@ zh_CN:
         activity: 活动
         like_count: 点赞 / 获赞
         last_100_days: "在最近 100 天"
-        private_topics_count: 私有主题数量
+        private_topics_count: 私有话题数量
         posts_read_count: 已阅帖子数量
         post_count: 发表的帖子数量
         second_factor_enabled: 双重认证已启用
-        topics_entered: 已查看的主题数量
+        topics_entered: 已查看的话题数量
         flags_given_count: 提交标记数量
         flags_received_count: 被他人标记数量
         warnings_received_count: 收到警告
@@ -4195,6 +4394,9 @@ zh_CN:
         anonymize_yes: "是的，匿名化该账户"
         anonymize_failed: "在匿名化该账户时遇到问题。"
         delete: "删除用户"
+        delete_posts:
+          progress:
+            title: "删除帖子的进度"
         merge:
           button: "合并"
           prompt:
@@ -4202,10 +4404,12 @@ zh_CN:
             description: |
               <p>请为<b>@%{username} </b>的内容选择一个新的主人。</p>
 
-              <p>所有主题、帖子、消息或其它由<b>@%{username}</b>所创作的内容将被过户。</p>
+              <p>所有话题、帖子、消息或其它由<b>@%{username}</b>所创作的内容将被过户。</p>
             target_username_placeholder: "新的所有者的用户名"
             transfer_and_delete: "迁移并删除 @%{username}"
             cancel: "取消"
+          progress:
+            title: "合并进度"
           confirmation:
             title: "迁移并删除 @%{username}"
             description: |
@@ -4242,7 +4446,7 @@ zh_CN:
         deactivate_failed: "在停用用户帐号时发生了错误。"
         unsilence_failed: "解除禁言时出错了。"
         silence_failed: "禁言用户时出错了。"
-        silence_confirm: "你确定要禁言该用户吗？他们将不能发或创建主题。"
+        silence_confirm: "你确定要禁言该用户吗？他们将不能发或创建话题。"
         silence_accept: "是的，禁言该用户"
         bounce_score: "累计退信分值"
         reset_bounce_score:
@@ -4251,8 +4455,8 @@ zh_CN:
         visit_profile: "访问<a href='%{url}'>用户设置页面</a>编辑他们的个人页"
         deactivate_explanation: "已停用的用户必须重新验证他们的电子邮件。"
         suspended_explanation: "已禁封的用户不能登录。"
-        silence_explanation: "已禁言的用户不能发帖或创建主题。"
-        staged_explanation: "暂存用户只能通过邮件回复指定主题。"
+        silence_explanation: "已禁言的用户不能发帖或创建话题。"
+        staged_explanation: "暂存用户只能通过邮件回复指定话题。"
         bounce_score_explanation:
           none: "近期该邮箱没有退信。"
           some: "近期该邮箱有少量退信。"
@@ -4274,9 +4478,9 @@ zh_CN:
           requirement_heading: "要求"
           visits: "访问"
           days: "天数"
-          topics_replied_to: "回复的主题"
-          topics_viewed: "已读主题"
-          topics_viewed_all_time: "已阅的主题（全部）"
+          topics_replied_to: "回复的话题"
+          topics_viewed: "已读话题"
+          topics_viewed_all_time: "已阅的话题（全部）"
           posts_read: "已读帖子"
           posts_read_all_time: "已读的帖子（全部）"
           flagged_posts: "被标记的帖子"
@@ -4294,16 +4498,16 @@ zh_CN:
           on_grace_period: "目前在升级宽限期，不会被降级。"
           locked_will_not_be_promoted: "信任等级被锁定。将不再被提升。"
           locked_will_not_be_demoted: "信任等级被锁定。将不再被降级。"
-        sso:
-          title: "单点登录"
+        discourse_connect:
+          title: "DiscourseConnect 单点登录"
           external_id: "外部 ID"
           external_username: "用户名"
-          external_name: "外部系统中的名字"
-          external_email: "电子邮件"
-          external_avatar_url: "头像URL"
+          external_name: "昵称"
+          external_email: "邮箱"
+          external_avatar_url: "头像 URL"
           last_payload: "上次 Payload"
-          delete_sso_record: "删除SSO记录"
-          confirm_delete: "你确定要删除此单点登录（SSO）记录吗？"
+          delete_sso_record: "删除 SSO 记录"
+          confirm_delete: "你确定要删除 DiscourseConnect 记录吗？"
       user_fields:
         title: "用户属性"
         help: "增加用户能填写的字段。"
@@ -4334,6 +4538,10 @@ zh_CN:
           title: "在用户卡片上显示？"
           enabled: "在用户卡片上显示"
           disabled: "在用户卡片上隐藏"
+        searchable:
+          title: "可搜索？"
+          enabled: "可搜索"
+          disabled: "不可搜索"
         field_types:
           text: "文本字段"
           confirm: "确认"
@@ -4348,6 +4556,8 @@ zh_CN:
         go_back: "返回搜索"
         recommended: "我们建议自定义以下文本以符合你的需求："
         show_overriden: "只显示修改过的"
+        locale: "语言："
+        fallback_locale_warning: "您正在基于 %{fallback}编辑语言。选择 %{fallback} 作为界面语言的用户将看不到你的更改。"
         more_than_50_results: "有超过50个结果。请优化您的搜索。"
       settings:
         show_overriden: "只显示被覆盖"
@@ -4355,6 +4565,10 @@ zh_CN:
         reset: "重置"
         none: "无"
       site_settings:
+        emoji_list:
+          invalid_input: "Emoji 列表只能包含有效的 Emoji 名，例如 hugs"
+          add_emoji_button:
+            label: "添加 Emoji"
         title: "设置"
         no_results: "找不到结果。"
         more_than_30_results: "超过30个结果。请优化你的搜索或选择一个分类。"
@@ -4407,6 +4621,9 @@ zh_CN:
           modal_no: "不，仅应用以后的更改"
         simple_list:
           add_item: "添加项..."
+        json_schema:
+          edit: 打开编辑器
+          modal_title: "编辑 %{name}"
       badges:
         title: 徽章
         new_badge: 新徽章
@@ -4422,7 +4639,7 @@ zh_CN:
           modal_title: 徽章组
         granted_by: 授予由
         granted_at: 授予于
-        reason_help: '（一个至主题或帖子的链接）'
+        reason_help: '（一个至话题或帖子的链接）'
         save: 保存
         delete: 删除
         delete_confirm: 你确定要删除此徽章吗？
@@ -4443,8 +4660,12 @@ zh_CN:
         enabled: 启用徽章系统
         icon: 图标
         image: 图片
+        graphic: 图形
         icon_help: "输入一个 Font Awsome 图标的名称（使用前缀“far-”表示常规图标，“fab-”表示品牌图标）"
-        image_help: "输入图像的 URL（如果同时设置了 URL 和图标，则 URL 会覆盖图标）"
+        image_help: "如果两者都已设置，正在上传的图像将覆盖图标字段。"
+        select_an_icon: "选择一个图标"
+        upload_an_image: "上传图片"
+        read_only_setting_help: "自定义文本"
         query: 徽章查询（SQL）
         target_posts: 查询到的帖子
         auto_revoke: 每天运行撤销查询
@@ -4502,7 +4723,7 @@ zh_CN:
       embedding:
         get_started: "如果你想要将 Discourse 嵌入至其他网站，请添加他们的域名。"
         confirm_delete: "你确定要删除这个主机吗？"
-        sample: "使用下列 HTML 代码至你的站点创建和嵌入 Discourse 主题。把<b>REPLACE_ME</b> 替换成你将嵌入至的网址。"
+        sample: "使用下列 HTML 代码至你的站点创建和嵌入 Discourse 话题。把<b>REPLACE_ME</b> 替换成你将嵌入至的网址。"
         title: "嵌入"
         host: "允许的主机"
         class_name: "类名"
@@ -4512,12 +4733,12 @@ zh_CN:
         add_host: "增加主机"
         settings: "嵌入设置"
         crawling_settings: "爬虫设置"
-        crawling_description: "当 Discourse 为你的帖子创建了主题时，如果没有 RSS/ATOM 流存在，它将尝试从 HTML 中解析内容。有时分离其中的内容时可能是很有挑战性的，所以我们提供了指定 CSS 规则的能力来帮助分离过程。"
-        embed_by_username: "主题创建者的用户名"
+        crawling_description: "当 Discourse 为你的帖子创建了话题时，如果没有 RSS/ATOM 流存在，它将尝试从 HTML 中解析内容。有时分离其中的内容时可能是很有挑战性的，所以我们提供了指定 CSS 规则的能力来帮助分离过程。"
+        embed_by_username: "话题创建者的用户名"
         embed_post_limit: "嵌入的最大帖子数量。"
         embed_title_scrubber: "从帖子中提取标题的正则表达式"
         embed_truncate: "截断嵌入的帖子"
-        embed_unlisted: "直到有一个回复前，导入的主题不会被列出。"
+        embed_unlisted: "直到有一个回复前，导入的话题不会被列出。"
         allowed_embed_selectors: "允许嵌入的元素的CSS选择器"
         blocked_embed_selectors: "从嵌入中移除的元素的CSS选择器"
         allowed_embed_classnames: "允许的CSS类名"
@@ -4526,8 +4747,8 @@ zh_CN:
         title: "永久链接"
         description: "所应用的重定向链接无法被论坛识别。"
         url: "URL"
-        topic_id: "主题 ID"
-        topic_title: "主题"
+        topic_id: "话题 ID"
+        topic_title: "话题"
         post_id: "帖子 ID"
         post_title: "帖子"
         category_id: "分类 ID"
@@ -4544,12 +4765,12 @@ zh_CN:
       reseed:
         action:
           label: "替换文本..."
-          title: "用翻译替换分类和主题的文本"
+          title: "用翻译替换分类和话题的文本"
         modal:
           title: "替换文本"
-          subtitle: "用最新的翻译替换系统生成的类别和主题的文本"
+          subtitle: "用最新的翻译替换系统生成的类别和话题的文本"
           categories: "分类"
-          topics: "主题"
+          topics: "话题"
           replace: "替换"
   wizard_js:
     wizard:
@@ -4572,7 +4793,7 @@ zh_CN:
           moderator: "版主"
           regular: "普通用户"
       previews:
-        topic_title: "讨论主题"
+        topic_title: "讨论话题"
         font_title: "%{font}字体"
         share_button: "分享"
         reply_button: "回复"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 05307ec83f..40cc1a991e 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -127,6 +127,10 @@ zh_TW:
         disabled: "已於 %{when} 移除該橫幅主題。將不再出現於任何頁面。"
     wizard_required: "是時候配置你的論壇啦！<a href='%{url}' data-auto-route='true'>點擊開始設置嚮導</a>！"
     emails_are_disabled: "管理員已停用了全域的外部信件功能。將不再寄出任何類型的電子郵件。"
+    software_update_prompt:
+      dismiss: "忽略"
+    bootstrap_mode_enabled:
+      other: "為了讓您更輕鬆地建設網站，您正處於初始模式。將會自動授予所有新註冊的使用者信任等級 1，並自動啟用每日摘要電子郵件。該功能將於 %{count} 個使用者註冊後自動關閉。"
     bootstrap_mode_disabled: "初始模式將會在 24 小時後自動禁用。"
     themes:
       default_description: "預設"
@@ -134,6 +138,7 @@ zh_TW:
       regions:
         ap_northeast_1: "亞太地區 (東京)"
         ap_northeast_2: "亞太地區 (首爾)"
+        ap_east_1: "亞太地區 (香港)"
         ap_south_1: "亞太地區 (孟買)"
         ap_southeast_1: "亞太地區 (新加坡)"
         ap_southeast_2: "亞太地區 (雪梨)"
@@ -184,6 +189,8 @@ zh_TW:
     now: "就在剛才"
     read_more: "閱讀更多"
     more: "更多"
+    x_more:
+      other: "%{count} 更多"
     less: "較少"
     never: "永不"
     every_30_minutes: "每 30 分鐘"
@@ -211,8 +218,6 @@ zh_TW:
       moderators: "板主"
       stat:
         all_time: "所有時間"
-        last_7_days: "最近 7"
-        last_30_days: "最近 30"
       like_count: "讚"
       topic_count: "話題"
       post_count: "貼文"
@@ -234,20 +239,12 @@ zh_TW:
       confirm_clear: "確定要移除該話題上的所有書籤嗎？"
       save: "儲存"
       no_timezone: '您尚未設定時區。將無法設定提醒事項。在<a href="%{basePath}/my/preferences/profile">您的設定檔</a>中設定一個 。'
+      no_user_bookmarks: "您沒有加入書籤的貼文，書籤能夠讓您快速的找到特定貼文。"
       auto_delete_preference:
+        never: "永不"
         on_owner_reply: "在我回复這個話題之後"
       search: "搜索"
       reminders:
-        later_today: "今日稍晚"
-        tomorrow: "明天"
-        next_week: "下週"
-        post_local_date: "張貼日期"
-        later_this_week: "本週稍晚"
-        start_of_next_business_week: "星期一"
-        start_of_next_business_week_alt: "下個星期一"
-        next_month: "下個月"
-        custom: "自定義日期和時間"
-        none: "無需提醒"
         existing_reminder: "您為此書籤設置了一個提醒，該提醒將在 %{at_date_time} 被發送"
     drafts:
       resume: "恢復"
@@ -256,9 +253,7 @@ zh_TW:
       new_private_message: "新私訊草稿"
       topic_reply: "回覆草稿"
       abandon:
-        confirm: "您已在此話題中打開了另一個草稿。 你確定要放棄嗎？"
-        yes_value: "是的，我要放棄。"
-        no_value: "不，我要保留。"
+        yes_value: "捨棄"
     topic_count_latest:
       other: "檢視 %{count} 則新發佈或更新的話題"
     topic_count_unread:
@@ -324,6 +319,7 @@ zh_TW:
       topic: "話題："
       filtered_topic: "您已篩選到單個主題中的可審閱內容。"
       filtered_user: "使用者"
+      filtered_reviewed_by: "審核由"
       show_all_topics: "顯示所有話題"
       deleted_post: "（貼文已被刪除）"
       deleted_user: "（使用者已被刪除）"
@@ -332,9 +328,8 @@ zh_TW:
         email: "電子信箱"
         name: "名稱"
         fields: "欄位"
+        reject_reason: "原因"
       user_percentage:
-        summary:
-          other: "%{agreed}, %{disagreed}, %{ignored} (共%{count}則檢舉)"
         agreed:
           other: "%{count}%同意"
         disagreed:
@@ -366,6 +361,7 @@ zh_TW:
         orders:
           score: "分數"
         priority:
+          low: "低"
           medium: "中間的"
           high: "高"
       conversation:
@@ -397,12 +393,28 @@ zh_TW:
           title: "排定的貼文"
         reviewable_user:
           title: "使用者"
+        reviewable_post:
+          title: "貼文"
       approval:
         title: "貼文需等待審核"
         description: "我們已收到您的貼文，但需要先經過版主審核後才會顯示出來。敬請稍後。"
         pending_posts:
           other: "你有 <strong>%{count}</strong> 篇貼文在等待審核中"
         ok: "確定"
+      example_username: "username"
+    relative_time_picker:
+      days:
+        other: "天"
+    time_shortcut:
+      later_today: "今日稍晚"
+      tomorrow: "明天"
+      next_week: "下週"
+      post_local_date: "張貼日期"
+      later_this_week: "本週稍晚"
+      start_of_next_business_week: "星期一"
+      start_of_next_business_week_alt: "下個星期一"
+      next_month: "下個月"
+      custom: "自定義日期和時間"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a> 開啟了 <a href='%{topicUrl}'>此話題</a>"
       you_posted_topic: "<a href='%{userUrl}'>你</a> 開啟了 <a href='%{topicUrl}'>此話題</a>"
@@ -418,6 +430,7 @@ zh_TW:
       sent_by_user: "由 <a href='%{userUrl}'>%{user}</a> 寄出"
       sent_by_you: "由 <a href='%{userUrl}'>你</a> 寄出"
     directory:
+      username: "使用者名稱"
       filter_name: "以使用者名稱過濾"
       title: "使用者"
       likes_given: "送出的"
@@ -472,9 +485,17 @@ zh_TW:
           credentials:
             username: "使用者名稱"
             password: "密碼"
+          settings:
+            title: "設定"
+          mailboxes:
+            disabled: "停用"
         membership:
           title: 會員身份
           access: 存取
+        categories:
+          title: 分類
+        tags:
+          title: 標籤
         logs:
           title: "日誌"
           when: "時間"
@@ -485,6 +506,8 @@ zh_TW:
           details: "詳情"
           from: "自"
           to: "至"
+      permissions:
+        title: "權限"
       public_admission: "允許使用者自由加入群組（需要將群組設為公開瀏覽）"
       public_exit: "允許使用者自由離開群組"
       empty:
@@ -610,11 +633,13 @@ zh_TW:
       posts: "貼文"
       topics: "話題"
       latest: "最新"
-      latest_by: "最新自"
       toggle_ordering: "顯示/隱藏排序控制"
       subcategories: "次分類"
       topic_sentence:
         other: "%{count} 個話題"
+      topic_stat_unit:
+        week: "週"
+        month: "月"
       topic_stat_sentence_week:
         other: "%{count}過去一週的新話題"
       topic_stat_sentence_month:
@@ -669,7 +694,12 @@ zh_TW:
         mute_option_title: "您將不會收到與此使用者相關的任何通知。"
         normal_option: "一般"
         normal_option_title: "如果有人@你或回覆你的帖子，將通知你。"
+      notification_schedule:
+        none: "無"
+        monday: "星期一"
+        to: "至"
       activity_stream: "活動"
+      read: "已讀"
       preferences: "偏好設定"
       feature_topic_on_profile:
         save: "儲存"
@@ -692,7 +722,6 @@ zh_TW:
         perm_denied_expl: "你拒絶了通知提醒的權限。請在瀏覽器設定中允許桌面通知。"
         disable: "停用通知"
         enable: "啟用通知"
-        each_browser_note: "注意：你必須在你使用的所用瀏覽器中更改這個設定。"
         consent_prompt: "當別人回覆您的貼文時，您想要收到即時通知嗎？"
       dismiss: "忽略"
       dismiss_notifications: "忽略全部"
@@ -700,6 +729,9 @@ zh_TW:
       first_notification: "你的第一則通知！選擇以開始。"
       dynamic_favicon: "在瀏覽器小圖示上顯示計數\\bIcon"
       theme_default_on_all_devices: "在所有裝置上設為預設佈景主題"
+      color_schemes:
+        undo: "重置"
+        regular: "普通"
       text_size_default_on_all_devices: "在所有裝置上設為預設文字大小"
       allow_private_messages: "允許其他使用者寄送個人訊息給我"
       external_links_in_new_tab: "在新分頁中開啟所有外部連結"
@@ -713,6 +745,7 @@ zh_TW:
       suspended_notice: "該使用者已被停權至 %{date}。"
       suspended_permanently: "該使用者已被停權。"
       suspended_reason: "原因: "
+      github_profile: "GitHub"
       email_activity_summary: "活動摘要"
       mailing_list_mode:
         label: "郵件列表模式"
@@ -742,6 +775,7 @@ zh_TW:
       watched_first_post_tags_instructions: "你將會收到這些標籤中新話題的第一則貼文的通知。"
       muted_categories: "靜音"
       muted_categories_instructions: "你將不會在收到任何與這些分類中的新話題有關的通知。它們亦不會再出現於分類或最新頁面中。"
+      regular_categories: "普通"
       no_category_access: "板主權限不足，無法使用儲存功能"
       delete_account: "刪除我的帳號"
       delete_account_confirm: "你真的要刪除帳號嗎？刪除後將無法還原。"
@@ -782,6 +816,7 @@ zh_TW:
         tags: "標籤"
       preferences_nav:
         account: "帳號"
+        security: "安全性"
         profile: "基本資料"
         emails: "電子郵件"
         notifications: "通知"
@@ -806,6 +841,8 @@ zh_TW:
         copy_to_clipboard: "複製至剪貼簿"
         copy_to_clipboard_error: "複製至剪貼簿時發生錯誤"
         copied_to_clipboard: "複製至剪貼簿"
+        remaining_codes:
+          other: "你還剩下 <strong>%{count}</strong> 個可使用的備用碼"
         codes:
           title: "已產生備用碼"
           description: "每個備用碼僅可使用一次。請將它們保存在安全且可被找到的地方。"
@@ -858,7 +895,6 @@ zh_TW:
         secondary: "次要電子郵件"
         primary_label: "一級"
         update_email: "修改電子郵件地址"
-        sso_override_instructions: "單一登入服務提供者可更新電子郵件"
         no_secondary: "無次要電子郵件"
         instructions: "不會公開顯示"
         ok: "我們將寄一封確認郵件給您。"
@@ -979,44 +1015,40 @@ zh_TW:
         after_10_minutes: "十分鐘後"
       notification_level_when_replying: "當我在話題中回覆後，將話題設置至"
       invited:
-        search: "輸入要搜尋邀請的文字..."
         title: "邀請"
+        pending_tab: "等待中"
+        pending_tab_with_count: "等待中 (%{count})"
+        redeemed_tab: "接受日期"
+        redeemed_tab_with_count: "接受日期 (%{count})"
+        invited_via: "邀請函"
+        groups: "群組"
+        topic: "話題"
+        edit: "編輯"
+        remove: "移除"
+        reinvited: "邀請已經重送"
+        search: "輸入要搜尋邀請的文字..."
         user: "受邀請的使用者"
         none: "沒有可顯示的邀請"
         truncated:
           other: "只顯示前 %{count} 個邀請。"
         redeemed: "已接受的邀請"
-        redeemed_tab: "接受日期"
-        redeemed_tab_with_count: "接受日期 (%{count})"
         redeemed_at: "接受日期"
         pending: "尚未接受的邀請"
-        pending_tab: "等待中"
-        pending_tab_with_count: "等待中 (%{count})"
         topics_entered: "參與的話題"
         posts_read_count: "已讀的貼文"
         expired: "此邀請已過期"
-        rescind: "移除"
-        rescinded: "邀請已刪除"
-        rescinded_all: "已移除所有過期的邀請！"
-        rescind_all_confirm: "您是否確定要移除所有過期的邀請？"
-        reinvite: "重送邀請"
-        reinvite_all: "重送所有邀請"
+        removed_all: "已移除所有過期的邀請！"
+        remove_all_confirm: "您是否確定要移除所有過期的邀請？"
         reinvite_all_confirm: "您確定要重新寄出所有邀請嗎?"
-        reinvited: "邀請已經重送"
-        reinvited_all: "所有邀請已經重送"
         time_read: "閱讀時間"
         days_visited: "到訪天數"
         account_age_days: "帳號已建立 (天)"
-        links_tab: "連結"
-        link_created_at: "已建立"
-        link_groups: 群組
+        create: "邀請"
         valid_for: "邀請連結只對這個郵件地址有效：%{email}"
         invite_link:
           success: "邀請連結生成成功！"
         bulk_invite:
-          success: "檔案已上傳成功，處理完畢後將以私人訊息通知你。"
           error: "上傳的檔案必須是 csv 格式。"
-          confirmation_message: "您即將寄email邀請給上傳文件中的所有人。"
       password:
         title: "密碼"
         too_short: "你的密碼太短。"
@@ -1107,7 +1139,6 @@ zh_TW:
     modal:
       close: "關閉"
     close: "關閉"
-    assets_changed_confirm: "此網站剛剛已更新，你要重整頁面以獲得最新版本嗎？"
     logout: "已登出"
     refresh: "重新整理"
     home: "主頁"
@@ -1116,15 +1147,6 @@ zh_TW:
       login_disabled: "在唯讀模式下不能登入"
       logout_disabled: "站點在只讀模式下無法登出。"
     learn_more: "進一步了解..."
-    all_time: "總數"
-    all_time_desc: "開啟的話題總量"
-    year: "年"
-    year_desc: "最近 365 天內開啟的話題"
-    month: "月"
-    month_desc: "最近 30 天內開啟的話題"
-    week: "週"
-    week_desc: "最近 7 天內開啟的話題"
-    day: "天"
     first_post: 第一篇貼文
     mute: 靜音
     unmute: 取消靜音
@@ -1140,13 +1162,12 @@ zh_TW:
       sign_up: "註冊"
       hide_session: "明天提醒我"
       hide_forever: "不了"
-      hidden_for_session: "好的，我會在明天提醒你。不過你隨時都可以使用「登入」來註冊帳號。"
       intro: "你好！:heart_eyes: 看起來你挺喜歡這樣的討論，可是你還沒有註冊帳號。"
       value_prop: "當你註冊帳號後，我們可以準確地記錄你的閲讀進度，這樣你能夠在下一次造訪時回到你上次閲讀到的地方。你也可以選擇接受新貼文的網頁和郵件通知，也可以按任何貼文讚來分享你的感謝。:heartbeat:"
     summary:
       enabled_description: "你正在檢視此話題的摘要：在這個社群裡最熱門的貼文。"
-      description: "有 <b>%{replyCount}</b> 個回覆。"
-      description_time: "有 <b>%{replyCount}</b> 個回覆，大約要花 <b>%{readingTime} 分鐘</b>閲讀。"
+      description:
+        other: "有 <b>%{count}</b> 個回覆。"
       enable: "以摘要檢視此話題"
       disable: "顯示所有貼文"
     deleted_filter:
@@ -1156,6 +1177,7 @@ zh_TW:
       disable: "顯示已刪除的貼文"
     private_message_info:
       title: "訊息"
+      add: "加入..."
       leave_message: "確定要移除這個訊息嗎？"
       remove_allowed_user: "確定將 %{name} 從對話中移除？"
       remove_allowed_group: "確定將 %{name} 從對話中移除？"
@@ -1167,7 +1189,7 @@ zh_TW:
     trust_level: "信任等級"
     search_hint: "使用者名稱、電子郵件、或是IP位址"
     create_account:
-      title: "建立新帳號"
+      header_title: "歡迎!"
       failed: "發生了某些錯誤，可能此電子郵件地址已經註冊過，請試試看忘記密碼連結"
     forgot_password:
       title: "寄出密碼"
@@ -1192,12 +1214,10 @@ zh_TW:
       complete_email_not_found: "沒有符合<b>%{email}</b>的帳號"
       confirm_title: 繼續連接至 %{site_name}
     login:
-      title: "登入"
       username: "使用者"
       password: "密碼"
       second_factor_description: "請輸入應用程式中的驗證碼："
       second_factor_backup_description: "請輸入一組您的備用碼"
-      email_placeholder: "電子郵件地址或使用者名稱"
       caps_lock_warning: "大寫鎖定中"
       error: "未知的錯誤"
       rate_limit: "嘗試重新登入前請先等待"
@@ -1249,6 +1269,7 @@ zh_TW:
       accept_invite: "接受邀請"
       success: "你的帳號已被建立，且您已經登入了。"
       name_label: "姓名"
+      password_label: "密碼"
       optional_description: "(選擇性)"
     password_reset:
       continue: "繼續連接至 %{site_name}"
@@ -1272,6 +1293,9 @@ zh_TW:
       alt: "Alt"
     conditional_loading_section:
       loading: 載入中...
+    category_row:
+      topic_count:
+        other: "%{count}個話題在此分類"
     select_kit:
       default_header_text: 選擇...
       no_content: 找不到符合的項目
@@ -1306,7 +1330,6 @@ zh_TW:
       default: 自訂表情符號
     shared_drafts:
       title: "共享草稿"
-      notice: "\\b只有能瀏覽<b>%{category}</b>分類的使用者能看到這個話題"
       destination_category: "指定分類"
       publish: "發佈共享草稿"
       confirm_publish: "您確定要發佈這份草稿嗎？"
@@ -1317,7 +1340,6 @@ zh_TW:
       options: "選項"
       whisper: "密談"
       unlist: "不公開"
-      blockquote_text: "塊引用"
       add_warning: "這是正式警告。"
       toggle_whisper: "切換密談"
       toggle_unlisted: "切換 不公開"
@@ -1326,6 +1348,8 @@ zh_TW:
       similar_topics: "與你的話題類似的討論..."
       drafts_offline: "離線草稿"
       edit_conflict: "編輯衝突"
+      group_mentioned_limit:
+        other: "<b>提醒</b>你提及了<a href='%{group_link}'>%{group}</a>，但此群組的人數多於管理員配置的提及人數上限（%{count}位），因此不會有任何人收到通知。"
       group_mentioned:
         other: "提及 %{group} 時，你將通知 <a href='%{group_link}'>%{count} 人</a> － 確定嗎？"
       cannot_see_mention:
@@ -1334,11 +1358,16 @@ zh_TW:
       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:
+          other: "標題必須至少 %{count} 個字"
+        title_too_long:
+          other: "標題不能超過 %{count} 個字"
+        post_length:
+          other: "貼文必須至少 %{count} 個字。"
         try_like: "您用過%{heart}了嗎？"
         category_missing: "你必須選擇一個分類。"
+        tags_missing:
+          other: "您至少必須選擇%{count}個標籤"
       save_edit: "儲存編輯"
       overwrite_edit: "覆寫編輯"
       reply_original: "回覆至原始的話題"
@@ -1364,8 +1393,6 @@ zh_TW:
       saving: "正在儲存"
       saved: "儲存完畢!"
       uploading: "正在上傳..."
-      show_preview: "顯示預覽 &raquo;"
-      hide_preview: "&laquo; 隱藏預覽"
       quote_post_title: "引用完整貼文"
       bold_label: "B"
       bold_title: "粗體"
@@ -1377,8 +1404,8 @@ zh_TW:
       link_description: "在此輸入超連結的描述"
       link_dialog_title: "插入超連結"
       link_optional_text: "標題 (可選填)"
-      quote_title: "引用"
-      quote_text: "引用"
+      blockquote_title: "塊引用"
+      blockquote_text: "塊引用"
       code_title: "預先格式化文字"
       code_text: "以 4 格空白將文字縮排"
       paste_code_text: "輸入或貼上代碼"
@@ -1423,10 +1450,10 @@ zh_TW:
           label: "新增話題"
         shared_draft:
           label: "共享草稿"
-          desc: "建立只有管理員可見的話題草稿"
         toggle_topic_bump:
           label: "回應但不讓貼文浮上來"
           desc: "回覆而不改變最新回應日期"
+      ignore: "忽略"
     notifications:
       tooltip:
         regular:
@@ -1446,6 +1473,9 @@ zh_TW:
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
       liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span class='double-user'>%{username}、%{username2}</span> %{description}"
+      liked_many:
+        other: "<span class='multi-user'>%{username}、%{username2} 和其他 %{count} 個人都</span> %{description}"
       liked_consolidated_description:
         other: "說你的%{count}則貼文讚"
       liked_consolidated: "<span>%{username}</span> %{description}"
@@ -1458,6 +1488,8 @@ zh_TW:
       granted_badge: "得到 '%{description}'"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>新話題</span> %{description}"
+      reaction: "<span>%{username}</span> %{description}"
+      reaction_2: "<span>%{username}、%{username2}</span> %{description}"
       group_message_summary:
         other: "您的收件匣中有%{count}則訊息"
       popup:
@@ -1483,10 +1515,7 @@ zh_TW:
       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: "可以拖放或複製粘帖至編輯器以上傳"
       uploading: "正在上傳"
       select_file: "選取檔案"
@@ -1515,6 +1544,7 @@ zh_TW:
       or_search_google: "或是嘗試利用 Google 搜尋:"
       search_google: "嘗試利用 Google 搜尋:"
       search_google_button: "Google"
+      search_button: "搜索"
       context:
         user: "搜尋 @%{username} 的貼文"
         category: "搜索 #%{category} 分類"
@@ -1556,16 +1586,19 @@ zh_TW:
           noreplies: 沒有回覆
           single_user: 只有一個使用者參與
         post:
+          count:
+            label: 貼文
           time:
             label: 發表於
             before: 之前
             after: 之後
+        views:
+          label: 瀏覽
     hamburger_menu: "轉到另一個話題列表或分類"
     new_item: "新增"
     go_back: "返回"
     not_logged_in_user: "使用者頁面（包含目前活動及喜好的摘要）"
     current_user: "到你的使用者頁面"
-    view_all: "查看全部"
     topics:
       new_messages_marker: "上次到訪"
       bulk:
@@ -1586,6 +1619,7 @@ zh_TW:
         change_category: "設定分類"
         close_topics: "關閉話題"
         archive_topics: "已封存的話題"
+        move_messages_to_inbox: "移動到收件匣"
         notification_level: "通知"
         choose_new_category: "為話題選擇新類別："
         selected:
@@ -1603,8 +1637,6 @@ zh_TW:
         bookmarks: "您目前沒有把任何話題加入書籤。"
         category: "沒有 %{category} 的話題。"
         top: "沒有精選話題。"
-        educate:
-          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: "已經沒有其它最近的話題了。"
         posted: "已經沒有其它話題了。"
@@ -1612,6 +1644,7 @@ zh_TW:
         new: "已經沒有其它新話題了。"
         unread: "已經沒有其它未讀的話題了。"
         category: "%{category} 分類已經沒有其它話題了。"
+        tag: "%{tag} 分類已經沒有其它話題了。"
         top: "沒有更多精選話題。"
         bookmarks: "書籤裡沒有更多的話題了。"
     topic:
@@ -1664,12 +1697,14 @@ zh_TW:
       toggle_information: "切換話題詳情"
       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: 檢視最近的貼文
       jump_reply_up: 跳到更早的回覆
       jump_reply_down: 跳到更晚的回覆
       deleted: "此話題已被刪除"
+      slow_mode_update:
+        save: "啟用"
+        remove: "停用"
       topic_status_update:
         title: "話題計時器"
         save: "設定計時器"
@@ -1677,7 +1712,7 @@ zh_TW:
         remove: "移除計時器"
         publish_to: "發佈至："
         when: "當："
-        time_frame_required: 請選擇一個有效時間範圍
+        time_frame_required: "請選擇一個有效時間範圍"
       auto_update_input:
         none: "選擇有效時間範圍"
         later_today: "今日稍晚"
@@ -1685,13 +1720,7 @@ zh_TW:
         later_this_week: "本週稍晚"
         this_weekend: "這週末"
         next_week: "下週"
-        two_weeks: "兩週"
         next_month: "下個月"
-        two_months: "兩個月"
-        three_months: "三個月"
-        four_months: "四個月"
-        six_months: "六個月"
-        one_year: "一年"
         forever: "永久"
         pick_date_and_time: "挑選日期與時間"
         set_based_on_last_post: "依照上一篇貼文來關閉"
@@ -1705,7 +1734,6 @@ zh_TW:
         title: "暫時關閉"
       auto_close:
         title: "自動關閉話題"
-        label: "自動關閉話題的期限:"
         error: "請輸入一個有效的值。"
         based_on_last_post: "在最後一個文章發表後，不自動關閉話題。"
       auto_delete:
@@ -1718,7 +1746,7 @@ zh_TW:
         auto_open: "此話題將在%{timeLeft}後自動開啟"
         auto_close: "此話題將在%{timeLeft}後自動關閉"
         auto_publish_to_category: "這個話題會被發佈到<a href=%{categoryUrl}>#%{categoryName}</a>%{timeLeft}。"
-        auto_close_based_on_last_post: "這個話題在最後一個回覆後%{duration}將關閉。"
+        auto_close_after_last_post: "這個話題在最後一個回覆後%{duration}將關閉。"
         auto_delete: "這個話題將會被自動刪除%{timeLeft}。"
         auto_bump: "話題在%{timeLeft}後會自動浮上來"
         auto_reminder: "您會收到關於這個話題的提醒%{timeLeft}。"
@@ -1736,7 +1764,9 @@ zh_TW:
         go: "前往"
         jump_bottom: "跳至最後一則貼文"
         jump_prompt: "跳到..."
-        jump_prompt_of: "%{count} 貼文"
+        jump_prompt_of:
+          other: "%{count} 貼文"
+        jump_prompt_long: "跳到..."
         jump_bottom_with_number: "跳至第 %{post_number} 篇貼文"
         jump_prompt_to_date: "至今"
         jump_prompt_or: "或"
@@ -1819,6 +1849,7 @@ zh_TW:
         title: "分享"
         extended_title: "分享連結"
         help: "分享此話題的連結"
+        invite_users: "邀請"
       print:
         title: "列印"
         help: "打開此討論話題列印友善的版本"
@@ -1837,6 +1868,8 @@ zh_TW:
         already_pinned:
           other: "%{categoryLink}分類的置頂話題數：<strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "將話題置於所有話題列表最上方至"
+        confirm_pin_globally:
+          other: "已有%{count}個全局置頂話題。太多的置頂話題可能會困擾新使用者和訪客。確定想再全局置頂一個話題？"
         unpin_globally: "將話題從所有話題列表的最上方移除。"
         unpin_globally_until: "從所有話題列表最上方移除話題或者移除於<strong>%{until}</strong>。"
         global_pin_note: "允許使用者取消全局置頂。"
@@ -1865,14 +1898,13 @@ zh_TW:
         username_placeholder: "使用者名稱"
         action: "送出邀請"
         help: "通過電子郵件或通知邀請其他人到該話題"
-        to_forum: "我們將向你的朋友發出一封電子郵件，他不必登入，他只要按電子郵件裡的連結就可以加入此論壇。"
-        sso_enabled: "輸入其使用者名，邀請其人到本話題。"
+        discourse_connect_enabled: "輸入其使用者名，邀請其人到本話題。"
         to_topic_blank: "輸入你想邀請的使用者的使用者名稱或電子郵件地址到該話題"
         to_topic_email: "你輸入了郵箱地址。我們將發送一封郵件邀請，讓你的朋友可直接回覆該話題。"
         to_topic_username: "你輸入了使用者名。我們將發送一個至該話題連結的邀請通知。"
         to_username: "輸入你想邀請的人的使用者名。我們將發送一個至該話題連結的邀請通知。"
         email_placeholder: "電子郵件地址"
-        success_email: "我們發了一封郵件邀請<b>%{emailOrUsername}</b>。邀請被接受後你會收到通知。檢查使用者頁中的邀請標籤頁來追蹤你的邀請。"
+        success_email: "我們發了一封郵件邀請<b>%{invitee}</b>。邀請被接受後你會收到通知。檢查使用者頁中的邀請標籤頁來追蹤你的邀請。"
         success_username: "我們已經邀請該使用者加入此話題討論"
         error: "抱歉，我們不能邀請這個人。可能他已經被邀請了？（邀請有頻率限制）"
         success_existing_email: "已經有一個有此電子郵件 <b>%{emailOrUsername}</b> 的使用者存在。我們已邀請那位使用者來參與這個話題。"
@@ -1959,11 +1991,10 @@ zh_TW:
         other: "（主題已被作者撤回，將在%{count}小時內自動刪除，若有標記便不會刪除）"
     post:
       quote_reply: "引用"
+      quote_share: "分享"
       edit_reason: "原因: "
       post_number: "貼文 %{number}"
       ignored: "忽略內容"
-      wiki_last_edited_on: "共筆最後編輯時間"
-      last_edited_on: "貼文最近編輯的時間"
       reply_as_new_topic: "回覆為關連的話題"
       reply_as_new_private_message: "回覆作為新訊息給同一收件人"
       continue_discussion: "繼續 %{postLink} 的討論:"
@@ -1994,16 +2025,14 @@ zh_TW:
         upload: "抱歉，上傳你的檔案時發生錯誤，請再試一次。"
         file_too_large: "檔案過大（最大 %{max_size_kb}KB）。為什麼不就大檔案上傳至雲存儲服務後再分享連結呢？"
         too_many_uploads: "抱歉，一次只能上傳一個檔案。"
+        too_many_dragged_and_dropped_files:
+          other: "抱歉，您一次最多只能上傳%{count}個檔案。"
         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:
-        no_value: "不，我要保留。"
-      abandon:
-        confirm: "你確定要捨棄你的貼文嗎?"
-        no_value: "否"
-        yes_value: "是"
+      cancel_composer:
+        discard: "捨棄"
       via_email: "本貼文透過電子郵件送達"
       via_auto_generated_email: "通過自動生成郵件發表的貼文"
       whisper: "這貼文是版主私人密談"
@@ -2051,6 +2080,8 @@ zh_TW:
         add_post_notice: "加入工作人員通知"
       actions:
         people:
+          like:
+            other: "已按讚"
           like_capped:
             other: "和其他%{count}人都說讚"
         by_you:
@@ -2148,6 +2179,11 @@ zh_TW:
       change_in_category_topic: "編輯描述"
       already_used: "此顏色已經用於其它分類"
       security: "安全性"
+      permissions:
+        group: "群組"
+        see: "觀看"
+        reply: "回覆"
+        create: "建立"
       special_warning: "警告：這個分類是已經自動建立好的分類，它的安全設置不能被更改。如果你不想要使用這個分類，直接刪除它，而不是另作他用。"
       uncategorized_security_warning: "此為特殊分類，僅作為沒有分類的話題暫存區，無法有安全設定。"
       uncategorized_general_warning: '此為特殊分類，作為尚未選定分類的新話題的預設分類。若您要停用此行為並強制使用者選擇分類，請在<a href="%{settingLink}">停用此設定，若您要更改名稱或說明，請到<a href="%{customizeLink}">自訂 / 文字內容</a>。'
@@ -2182,19 +2218,16 @@ zh_TW:
       notifications:
         watching:
           title: "關注"
-          description: "你將自動關注這些分類中的所有話題。每一個話題的每一個新帖，將通知你，還將顯示新回覆的數量。"
         watching_first_post:
           title: "關注新的發文"
           description: "您會收到此分類中的新話題通知，話題回應則不會。"
         tracking:
           title: "追蹤"
-          description: "你將自動追蹤這些分類中的所有話題。如果有人@你或回覆你，將通知你，還將顯示新回覆的數量。"
         regular:
           title: "一般"
           description: "如果有人@你或回覆你，將通知你。"
         muted:
           title: "靜音"
-          description: "在這些分類裡面，你將不會收到新話題任何通知，它們也不會出現在“最新”話題列表。 "
       search_priority:
         label: "優先搜尋"
         options:
@@ -2229,10 +2262,17 @@ zh_TW:
     flagging:
       title: "感謝幫助社群遠離邪惡！"
       action: "檢舉貼文"
+      take_action_options:
+        default:
+          title: "執行動作"
+          details: "使其立刻達到檢舉門檻，不用等待更多人檢舉"
+        suspend:
+          title: "將使用者停權"
+        silence:
+          title: "將使用者靜音"
       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: "是的，刪除垃圾貼文發送者"
       ip_address_missing: "(N/A)"
       hidden_email_address: "( 隱藏) "
@@ -2291,12 +2331,6 @@ zh_TW:
       unlisted:
         help: "此話題已被隱藏，不會顯示於話題列表，只能由直接連結存取。"
     posts: "貼文"
-    posts_likes_MF: |
-      This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
-      low {with a high like to post ratio}
-      med {with a very high like to post ratio}
-      high {with an extremely high like to post ratio}
-      other {}}
     original_post: "原始貼文"
     views: "觀看"
     views_lowercase:
@@ -2312,7 +2346,6 @@ zh_TW:
     users_lowercase:
       other: "使用者"
     category_title: "分類"
-    history: "歷史"
     changed_by: "作者 %{author}"
     raw_email:
       title: "寄來的郵件"
@@ -2563,6 +2596,10 @@ zh_TW:
       dismiss: "忽略"
     safe_mode:
       enabled: "安全模式已經開啟，關閉該瀏覽器窗口以退出安全模式"
+    do_not_disturb:
+      remaining: "剩餘 %{remaining}"
+      options:
+        custom: "客製"
   admin_js:
     type_to_filter: "輸入要搜尋的文字..."
     admin:
@@ -2587,6 +2624,8 @@ zh_TW:
         installed_version: "已安裝"
         latest_version: "最新版本"
         problems_found: "根據您現在網站設定的建議"
+        new_features:
+          dismiss: "忽略"
         last_checked: "上次檢查的時間"
         refresh_problems: "重新整理"
         no_problems: "未發現任何問題。"
@@ -2638,6 +2677,9 @@ zh_TW:
           view_table: "表格"
           view_graph: "圖表"
           refresh_report: "重新整理報告"
+          daily: 日
+          monthly: 月
+          weekly: 周
           groups: "所有群組"
           disabled: "該使用者已被禁言"
           totals_for_sample: "樣本總計"
@@ -2667,10 +2709,6 @@ zh_TW:
             available: "可以使用此群組名稱"
             not_available: "無法使用此群組名稱"
             blank: "群組名稱不能空白"
-        bulk_add:
-          title: "批次加入群組"
-          complete_users_not_added: "這些使用者沒有被加入 (請確認他們都已有帳號)："
-          paste: "請貼上使用者名稱或 email，一行一個："
         add_members:
           as_owner: "將使用者設為此群組的擁有者"
         manage:
@@ -2722,6 +2760,8 @@ zh_TW:
         description: 描述
         save: 儲存
         continue: 繼續
+        scopes:
+          action: 動作
       web_hooks:
         title: "Webhooks"
         none: "當前沒有 Webhooks。"
@@ -2736,7 +2776,6 @@ zh_TW:
         go_back: "返回列表"
         payload_url: "Payload URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "你好像將 webhook 指向了一個本地地址。把相關事件發送到本地可能產生副作用或未預期的行為。繼續嗎？"
         secret_invalid: "密鑰不能包含空白字元。"
         secret_too_short: "密鑰必須至少有 12 個字元。"
         secret_placeholder: "選填的字串，用來產生簽章"
@@ -2764,7 +2803,6 @@ zh_TW:
           details: "當有新回覆、編輯、貼文被刪除或者恢復時。"
         user_event:
           name: "使用者事件"
-          details: "當使用者註冊、審核通過或更新時。"
         group_event:
           name: "群組活動"
           details: "當群組被建立、更新或刪除時"
@@ -3317,24 +3355,20 @@ zh_TW:
         title: "已關注的文字"
         search: "搜尋"
         clear_filter: "清除"
-        show_words: "顯示文字"
         download: 下載
         clear_all: 清除全部
-        word_count:
-          other: "%{count}個字"
         actions:
           block: "封鎖"
           censor: "審核"
           require_approval: "需要審核"
           flag: "檢舉"
+          replace: "取代"
         action_descriptions:
           block: "防止含有這些文字的貼文被發佈，當使用者嘗試發送貼文時，會看見錯誤訊息。"
           censor: "允許貼文含有這些文字，但以符碼來取代被禁用的文字。"
           require_approval: "含有這些文字的貼文需要經過管理員審查才能被發佈。"
           flag: "允許貼文含有這些文字，但標註成不當的用字以讓管理員能審核。"
         form:
-          label: "新的單字"
-          placeholder: "完整單字或萬用字元（*）"
           placeholder_regexp: "正規表示法"
           add: "新增"
           success: "成功"
@@ -3383,6 +3417,8 @@ zh_TW:
         check_email:
           title: "顯示使用者 Email"
           text: "顯示"
+        check_sso:
+          text: "顯示"
       user:
         suspend_failed: "將此使用者停權時發生錯誤 %{error}"
         unsuspend_failed: "恢復此使用者的權限時發生錯誤 %{error}"
@@ -3390,6 +3426,7 @@ zh_TW:
         suspend_reason_label: "你為什麼要將此使用者停權？你輸入的原因將在此使用者登入時顯示，及顯示在此使用者的基本資料頁面，且<b>任何人都可以看見</b>，請簡短說明原因。"
         suspend_reason_hidden_label: "您為何要將該使用者停權？使用者在登入時會看見這段文字，請簡短描述。"
         suspend_reason: "原因"
+        suspend_reason_title: "停權原因"
         suspend_message: "Email 訊息"
         suspend_message_placeholder: "提供更多停權使用者的原因，並且會以郵件發信給該使用者。（可選）"
         suspended_by: "將其停權者"
@@ -3414,7 +3451,6 @@ zh_TW:
         clear_penalty_history:
           title: "清除違規紀錄"
           description: "有違規紀錄的使用者無法抵達 TL3"
-        delete_all_posts_confirm_MF: "你將要刪除 {POSTS, plural, one {1 個貼文} other {# 個貼文}}和 {TOPICS, plural, one {1 個話題} other {# 個話題}}。確定嗎？"
         silence: "靜音"
         unsilence: "取消靜音"
         silenced: "靜音？"
@@ -3539,12 +3575,11 @@ zh_TW:
           on_grace_period: "目前在升級優惠階段，將不會被降級。"
           locked_will_not_be_promoted: "信任等級鎖定。將不會再被升級。"
           locked_will_not_be_demoted: "信任等級鎖定。將不會再被降級。"
-        sso:
-          title: "單一登入"
+        discourse_connect:
           external_id: "外部 ID"
           external_username: "使用者名稱"
           external_name: "名稱"
-          external_email: "電子郵件"
+          external_email: "電子信箱"
           external_avatar_url: "個人資料圖片 URL"
       user_fields:
         title: "使用者欄位"
@@ -3680,7 +3715,6 @@ zh_TW:
         enabled: 啟用徽章
         icon: 圖示
         image: 圖片
-        image_help: "請輸入圖片的網址（如果兩者設置皆一樣，將會覆寫 Icon）"
         query: 徽章查詢語法 (SQL)
         target_posts: 查詢貼文張貼目標
         auto_revoke: 每日執行撤銷用的 SQL 語法
@@ -3741,6 +3775,9 @@ zh_TW:
         embed_post_limit: "嵌入的最大貼文數量。"
         embed_title_scrubber: "從貼文中提取標題的正則表達式 \"regular expression\""
         embed_truncate: "截斷嵌入的貼文"
+        allowed_embed_selectors: "使用 CSS 選擇器選擇允許的嵌入元素"
+        blocked_embed_selectors: "使用 CSS 選擇器移除嵌入元素"
+        allowed_embed_classnames: "允許 CSS class 名稱"
         save: "儲存崁入設定"
       permalink:
         title: "固定連結"
diff --git a/config/locales/names.yml b/config/locales/names.yml
index c6b2c6dade..16901aa97c 100644
--- a/config/locales/names.yml
+++ b/config/locales/names.yml
@@ -111,11 +111,11 @@ el:
   name: Greek
   nativeName: ελληνικά
 en:
-  name: English
-  nativeName: English
-en_US:
-  name: English (United States)
-  nativeName: English (United States)
+  name: English (US)
+  nativeName: English (US)
+en_GB:
+  name: English (UK)
+  nativeName: English (UK)
 eo:
   name: Esperanto
   nativeName: Esperanto
@@ -388,7 +388,7 @@ pi:
   nativeName: पाऴि
 pl:
   name: Polish
-  nativeName: język polski
+  nativeName: polski
 ps:
   name: Pashto
   nativeName: پښتو
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 9dc1e472df..014524cad6 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -15,6 +15,7 @@ ar:
       short_no_year: "%-d %B"
       date_only: "%-d %B %Y"
       long: "%-d %B %Y، %l:%M%P"
+      no_day: "%B %Y"
   date:
     month_names:
     - null
@@ -38,6 +39,7 @@ ar:
   title: "دِسكورس"
   topics: "المواضيع"
   posts: "المشاركات"
+  views: "المشاهدات"
   loading: "يُحمّل"
   powered_by_html: 'تدعمه <a href="http://www.discourse.org">دِسكورس </a>، يفضّل عرضه بتفعيل جافاسكربت'
   sign_up: "سجّل حسابًا"
@@ -48,18 +50,29 @@ ar:
   anonymous: "مجهول"
   remove_posts_deleted_by_author: "حذفها الكاتب"
   redirect_warning: "تعذّر تأكيد أنّ الرابط الذي حدّدته نُشر في هذا المنتدى حقًا. مع ذلك إن أردت المواصلة، فحدّد الرابط أسفله."
+  on_another_topic: "في موضوع آخر"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} بواسطة %{username}"
   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: "السمات ذات السمات الفرعية لا يمكن أن تكون موضوعات فرعية نفسها"
     settings_errors:
       invalid_yaml: "ملف YAML الذي قُدّم غير صالح."
       data_type_not_a_number: "ضبط النوع ”%{name}“ غير مدعوم. الأنواع المدعومة هي: الأعداد الصحيحة ”integer“ والقيم المنطقية ”bool“ والقوائم ”list“ والتعدادات ”enum“ والرفع ”upload“"
@@ -151,7 +164,6 @@ ar:
         many: طول خاطئ (يجب أن يكون حروف كثيرة)
         other: طول خاطئ (يجب أن يكون %{count} حروف)
       other_than: "يجب أن تكون غير %{count}"
-      sso_overrides_username: "يجب تحديث اسم المستخدم من جهة مُقدّم خدمة ”الولوج مرة واحدة SSO“، إذ أنّ إعداد `sso_overrides_username` مفعّل."
     template:
       body: ! "حدثت مشاكل بالحقول الآتية:"
       header:
@@ -171,6 +183,9 @@ ar:
       s3_backup_requires_s3_settings: "لا يمكنك استعمال S3 كمكان للنسخ الاحتياطي طالما لم تُقدّم ”%{setting_name}“."
       s3_bucket_reused: "لا يمكنك استعمال نفس الحاوية لِ‍ ”s3_upload_bucket“ و”s3_backup_bucket“ معًا. اختر حاويةً أخرى أو استعمل مسارًا مختلف لكلّ حاوية."
       secure_media_requirements: "عليك تفعيل ”الرفع إلى S3“ قبل تفعيل الوسائط الآمنة."
+  invite:
+    disabled_errors:
+      invalid_access: "ليس مسموحًا لك عرض المورد المطلوب."
   bulk_invite:
     file_should_be_csv: "الملف المرفوع يجب أن يكون بنسق csv . "
     error: "حدث عطل أثناء رفع الملفّ. رجاء أعد المحاولة لاحقًا."
@@ -212,6 +227,13 @@ ar:
     permalink: "الرابط الثابت"
     imported_from: "هذا موضوع نقاش مصاحب للمدخل الأصلي على %{link}"
     in_reply_to: "◀ %{username}"
+    replies:
+      zero: "%{count} ردًا"
+      one: "ردّ واحد"
+      two: "%{count} ردّ"
+      few: "%{count} ردّ"
+      many: "%{count} ردّ"
+      other: "%{count} ردًا"
     last_reply: "آخر ردّ"
     created: "أُنشئ في"
     new_topic: "افتح موضوعًا جديدًا"
@@ -251,6 +273,7 @@ ar:
   user_is_suspended: "غير مسموح للأعضاء المعلّقة عضويتهم النشر."
   topic_not_found: "حدث خطب ما. قد يكون الموضوع أُغلق أو حُذف وأنت تشاهده؟"
   not_accepting_pms: "نأسف، لا يقبل %{username} الرّسائل حاليًّا."
+  slow_mode_enabled: "هذا الموضوع يخضع للوضع البطيء."
   just_posted_that: "هذا مشابة جدا لما نشرتة مؤخراً"
   invalid_characters: "يحتوي احرف غير صالحة "
   is_invalid: "تبدو غير واضحة، هل هذه عبارة كاملة؟"
@@ -261,6 +284,13 @@ ar:
   topics_in_category: "المواضيع في قسم '%{category}'"
   rss_posts_in_topic: "مغذي RSS لـ'%{topic}'"
   rss_topics_in_category: "تغذية RSS للموضوعات من قسم'%{category}'"
+  rss_num_posts:
+    zero: "%{count} مشاركة"
+    one: "مشاركة واحدة"
+    two: "مشاركتان"
+    few: "%{count} مشاركات"
+    many: "%{count} مشاركة"
+    other: "%{count} مشاركة"
   read_full_topic: "اقرأ كامل الموضوع"
   private_message_abbrev: "رسالة"
   rss_description:
@@ -280,9 +310,11 @@ ar:
     reminders:
       at_desktop: "في المرة القادمة سأكون عند مكتبي"
       later_today: "في وقت لاحق اليوم"
+      next_business_day: "يوم العمل التالي"
       tomorrow: "غداً"
       next_week: "الاسبوع القادم"
       next_month: "الشهر القادم"
+      custom: "تاريخ ووقت مخصّصين"
   groups:
     errors:
       can_not_modify_automatic: "لا يمكنك تعديل مجموعة تم انشائها تلقائيا"
@@ -318,26 +350,6 @@ ar:
       few: "%{count} مشاركات"
       many: "%{count} مشاركة"
       other: "%{count} منشور"
-    "new-topic": |
-      مرحبا بك في %{site_name} &mdash; **شكرا لك لأجل بدء محادثه جديدة!**
-
-      هل يبدو عنوان الموضوع مثيرا للإهتمام إذا قراتة بصوت عال؟ العنوان ملخص هام جدا؟
-
-      - من هو الشخص الذي سيكون مهتما بهذا؟ لماذا يهتم؟ أي نوع من ردود تريد؟
-
-      - استخدم أكثر الكلمات الشائعة في موضوعك بحيث يمكن للآخرين أن * يجدوها* لاضافة موضوعك مع المواضيع ذات الصلة، حدد قسم الموضوع.
-
-      لمعلومات أكثر ، [انظر مبادئ المجتمع](%{base_path}/guidelines). هذا الاعلان سيظهر لك لأول مرة %{education_posts_text}.
-    "new-reply": |
-      مرحباً بك في %{site_name} &mdash; **شكراً لمشاركتك**!
-
-      -هل يُحسن ردّك المحادثة في جانب معين؟
-
-      -كن لطيفا مع أصدقاءك أعضاء المجتمع.
-
-      -نرحب بالنقد البناء، ولكن انتقد الأفكار ولا تنتقد الأشخاص!
-
-      للمزيد, [انظر مبادئ المجتمع](%{base_path}/guidelines). هذا الاعلان سيظهر فقط لأول %{education_posts_text} لك.
     avatar: |
       ### هل صورة حسابك الشخصي مميزة
 
@@ -636,7 +648,6 @@ ar:
       unknown: "متصفّح مجهول"
     device:
       android: "جهاز أندرويد"
-      chromebook: "كروم‌بوك"
       ipad: "آي‌باد"
       iphone: "آي‌فون"
       ipod: "آي‌بود"
@@ -647,7 +658,6 @@ ar:
       unknown: "جهاز مجهول"
     os:
       android: "أندرويد"
-      chromeos: "كروم‌أو‌إس"
       ios: "آي‌آو‌إس"
       linux: "لينكس"
       macos: "ماك‌أو‌إس"
@@ -708,6 +718,7 @@ ar:
       description: "أنت تُحرّر المسودّة في نافذة أخرى. من فضلك أعِد تحميل هذه الصفحة."
   user_activity:
     no_bookmarks:
+      self: "ما من مشاركات عليها علامة. تُتيح لك العلامات الرجوع إلى المشاركات التي تريد بسرعة."
       others: "لا علامات."
     no_likes_given:
       self: "لم تعجبك أيّة منشور."
@@ -746,9 +757,7 @@ ar:
     mute_topic: "اكتم كلّ إشعارات هذا الموضوع، %{link}"
     unwatch_category: "ألغِ مراقبة كلّ الموضوعات في %{category}"
     mailing_list_mode: "الغاء وضعية قائمة المراسلات"
-    all: "لا ترسل إليّ أيّ بريد من %{sitename}"
     different_user_description: "أنت حالياً سجلت دخولك كمستخدم مختلف عن الذي كان يُرسله له الملخص. الرجاء تسجيل الخروج ثم الدخول مرة أخرى والمحاولة مجدداً."
-    not_found_description: "نأسف ، لم نستطيع أن نلغي اشتراكك . من الممكن أن الرابط المرسل إليك قد انتهت مدته . "
     log_out: "تسجيل خروج"
     digest_frequency:
       never: "أبدا"
@@ -766,6 +775,8 @@ ar:
     description: '"%{application_name}": يطلب الصلاحيات التالية لحسابك'
     otp_confirmation:
       confirm_title: تابع إلى %{site_name}
+      logging_in_as: تسجيل الدخول باسم %{username}
+      confirm_button: إنهاء تسجيل الدخول
     no_trust_level: "نأسف، لست بمستوى الثّقة الكافي للوصول إلى واجهة برمجة التّطبيقات (API) للمستخدمين"
     generic_error: "نأسف، لا نستطيع إصدار مفاتيح API للمستخدمين؛ عطّل مدير الموقع هذه الميزة"
     scopes:
@@ -777,6 +788,7 @@ ar:
   reports:
     default:
       labels:
+        count: العد
         day: اليوم
     post_edits:
       labels:
@@ -787,6 +799,7 @@ ar:
     user_flagging_ratio:
       labels:
         user: مستخدم
+        score: نقاط
     moderators_activity:
       labels:
         moderator: مشرف
@@ -829,6 +842,7 @@ ar:
       title: "اﻹعجابات"
       xaxis: "اليوم"
       yaxis: "عدد اﻹعجابات الجديدة"
+      description: "عدد اﻹعجابات الجديدة."
     flags:
       title: "الأبلاغ"
       xaxis: "يوم"
@@ -841,6 +855,7 @@ ar:
       title: "الأعضاء في مستوى الثقة"
       xaxis: "مستوى الثقة"
       yaxis: "عدد المستخدمين"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       xaxis: "النوع"
       yaxis: "عدد المستخدمين"
@@ -1019,6 +1034,7 @@ ar:
     show_pinned_excerpt_mobile: "اظهر مقتطفات من المواضيع المثبتة فى منظر المحمول."
     show_pinned_excerpt_desktop: "اظهر مقتطفات من المواضيع المثبتة فى منظر سطح المكتب."
     post_onebox_maxlength: "الحد الأقصى بالاحرف لطول منشور هذا الموقع عندما يتم وضعة بلوحة مُعاينة."
+    blocked_onebox_domains: "قائمة بعناوين المواقع التي يمنع وضع روابطها بلوحة مُعاينة."
     notification_email: "عنوان البريد الالكتروني المُرسِل للرسائل الصادرة من الموقع, العنوان المحدد يجب ان يكون له SPF و DKIM و reverse PTR في سجلات الDNS"
     email_custom_headers: "قائمة قناة محددة لرؤوس بريد إلكتروني مخصص."
     force_https: "ارغام الموقع على استخدام HTTPS فقط. تحذير: لا تفعل هذا الاختيار الا بعد التأكد أن HTTPS مفعلة وتعمل بالكامل فى جميع أنحاء الموقع! هل اختبرت جميع الخوادم CDN، جميع تسجيلات الدخول من شبكات التواصل الاجتماعى، أية صور أو تبعيات خارجية للتأكد من أنها كلها متوافقه مع HTTPS؟"
@@ -1041,6 +1057,7 @@ ar:
     pending_users_reminder_delay: "نبه المشرفين إذا وجد اعضاء ينتظرون الموافقة لمدة اطول من الساعات ، قم بوضع الخيار -1 لايقاف التنبيهات ."
     maximum_session_age: "سيظل المستخدم مسجل دخول لهذا العدد من الساعات منذ زيارته اﻷخيرة."
     cors_origins: "اسمح بالأصول للطلبات عبر المنشأ (CORS). كل أصل يجب أن يتضمن http:// أو https://. متغير env لـ DISCOURSE_ENABLE_CORS يجب أن يعين إلى true ليعمل CORS."
+    use_admin_ip_allowlist: "المدير فقط يمكنه تسجيل الدخول إذا كانت عناوين IP لهم معرفة في قائمة IP المحجوبة. (المدير > السجلات > IP المحجوبة)"
     top_menu: "حدد العناصر التي تظهر في قائمة ملاحة الصفحة الرئيسية، و ترتيبها."
     post_menu: "تحديد العناصر التي تظهر في القائمة المختصرة للمنشور، و ترتيبها. مثل ( اعجاب | تحرير | تبليغ | حذف | مشاركة | علّم | رد )"
     post_menu_hidden_items: "العناصر المخفية بشكل افتراضي في القائمة المختصره للمنشور مالم يتم الضغط علي زر الاظهار"
@@ -1058,6 +1075,8 @@ ar:
     email_token_valid_hours: "أمارات نسيان كلمة السّرّ/تنشيط الحساب صالحة لمدّة (n) ساعة."
     enable_badges: "فعّل نظام الشارات."
     enable_whispers: "السماح للطاقم بعمل نقاشات سرية داخل الموضوعات."
+    blocked_email_domains: "قائمة pipe-delimited المجالات البريد الإلكتروني الذي لا يسمح للمستخدمين تسجيل حسابات مع. مثال: mailinator.com | trashmail.net"
+    allowed_email_domains: "قائمة pipe-delimited من مجالات البريد الإلكتروني التي يجب على المستخدمين تسجيل حسابات مع. تحذير: لن يسمح للمستخدمين مع مجالات البريد الإلكتروني الأخرى غير المذكورة هنا!"
     hide_email_address_taken: "لا تُخبر المستخدمين بوجود حساب بنفس عنوان البريد الإلكتروني أثناء تسجيل الحسابات وفي استمارة نسيان كلمة السر."
     log_out_strict: "عند الخروج، اخرج من كلّ جلسات المستخدم في كلّ الأجهزة"
     new_version_emails: "إرسال بريد إلكتروني إلى عنوان contact_email عندما نسخة جديدة من ديسكورس هو متاح."
@@ -1068,10 +1087,7 @@ ar:
     min_password_length: "أدنى طول لكلمة السّرّ."
     min_admin_password_length: "أدنى طول لكلمة سرّ الإداريّ."
     block_common_passwords: "لا تسمح بكلمات السر الموجودة ضمن كلمات السر ال‍ ١٠٬٠٠٠ الشائعة."
-    enable_sso: " اسمح تسجيل دخول واحد عبر موقع خارجي(تحذير :عنوان بريد المستخدم *يجب* ان يتم التحقق من صحته عبر الموقع الخارجي)"
-    sso_secret: "السلسلة السرية استخدمت لتشفير مصادقة معلومات SSO, كن متأكداً أنها 10 حروف أو أكثر"
-    sso_overrides_bio: "تخطى التعريف المبسط بالعضو، ولا تسمح له بتغييره."
-    sso_not_approved_url: "إعادة التوجيه لم توافق على حسابات SSO لهذا URL"
+    discourse_connect_overrides_bio: "تخطى التعريف المبسط بالعضو، ولا تسمح له بتغييره."
     allow_new_registrations: "السماح بتسجيل حسابات جديدة. عطل هذه الخاصية إذا كنت تريد منع الكل من عمل حساب جديد علي الموقع."
     enable_signup_cta: "اعرض تنبية للزوار المجهولين المترددين يحثهم علي تسجيل حساب جديد."
     google_oauth2_client_id: "رقم التعريف لتطبيق جوجل الخاص بك"
@@ -1109,7 +1125,6 @@ ar:
     avatar_sizes: "قائمة أحجام الرمزية إنشاؤه تلقائيا."
     external_system_avatars_enabled: "استخدم خدمات الهه النظام الخارجي "
     allow_all_attachments_for_group_messages: "اسمح بجميع ملحقات البريد للرسائل الجماعيه "
-    enable_flash_video_onebox: "فعّل تضمين روابط swf وflv (أدوبي فلاش) في لوحات المعاينة. تحذير: قد يتسبّب بمخاطر أمنيّة."
     default_invitee_trust_level: "مستوى الثقة الإفتراضي (0-4) للأعضاء المدعوين."
     default_trust_level: "مستوى الثقة الإفتراضي (0-4) للأعضاء المدعوين.تحذير! التغيرات ستضعك تحت خطر البريد الغير هام."
     tl1_requires_topics_entered: "عدد المواضيع التي على المستخدم الجديد دخولها قبل ترقيته إلى مستوى الثّقة الأوّل."
@@ -1147,6 +1162,7 @@ ar:
     desktop_category_page_style: "أسلوب العرض لصفحة الأقسام."
     category_colors: "قائمة الألوان المسموحة لتمييز الأقسام بترميز الhexadecimal."
     category_style: "أسلوب العرض لشارة القسم."
+    dark_mode_none: "لا شيء"
     max_attachment_size_kb: "أقصى حجم لتحميل المرفقات الملفات بالكيلوبايت. وهذا يجب أن يتم تكوينه في nginx (client_max_body_size) / أباتشي أو الوكيل. "
     authorized_extensions: "قائمة بالملفات المسموح رفعها (أستخدم '*' للسماح لجميع الأنواع)"
     max_similar_results: "عدد المواضيع المشابهة لتُعرض فوق المحرّر عند إنشاء موضوع جديد. المقارنة تعتمد عنوان الموضوع ومتنه."
@@ -1166,6 +1182,7 @@ ar:
     faq_url: "إن كانت صفحة الأسئلة الشائعة موجودة في مكان آخر وتريد استعمالها، أدخِل هنا عنوانها كاملًا."
     tos_url: "إن كانت صفحة شروط الخدمة موجودة في مكان آخر وتريد استعمالها، أدخِل هنا عنوانها كاملًا."
     privacy_policy_url: "اذا كان لديك وثيقه سياسه خصوصيه مستضيفها في مكان ما و نريد استخدمها. وفر url الكامل هنا"
+    allowed_spam_host_domains: "قائمة النطاقات المستثناة من اختبار مضيف البريد المزعج. لن يتم تقييد المستخدمين الجدد من إنشاء المشاركات مع الروابط إلى هذه النطاقات."
     topic_view_duration_hours: "احسب عدد المواضيع التي تمت مشاهدتها مره واحده عبر ip/مستخدم كل N ساعات"
     user_profile_view_duration_hours: "احسب عدد ملفات التعريف للعضو التي تمت مشاهدتها مرة لكل IP/عضو في N ساعات."
     levenshtein_distance_spammer_emails: "عند ربط رسائل البريد الإلكتروني spammer، الأرقام والحروف تختلف التي ستبقى تسمح بربط غامض."
@@ -1238,14 +1255,12 @@ ar:
     embed_username_required: "إسم المستخدم مطلوب لإضافة مقالة"
     show_create_topics_notice: "إذا كان الموقع يحتوي على أقل من 5 مواضيع عامة , إظهار إشعار مطالبة المسؤولين إنشاء بعض المواضيع."
     delete_drafts_older_than_n_days: "حذف المسودات مضى عليها أكثر من (ن) يوما."
-    prevent_anons_from_downloading_files: "امنع المستخدمين المجهولين من تحميل المرفقات. تحذير:سوف تمنع اي شخص ليس لديه صوره موقع اصول نشره كمرفقات من العمل."
     slug_generation_method: "اختر طريقه توليد سبيكه . 'مشفره' سوف تقوم بتوليد سلسله مئويه مشفره.'لاشي' سوف يعطل السبيكه"
     enable_emoji: "فعّل الإيموجي"
     emoji_set: "كيف تريد أن تبدو الإيموجي؟"
     approve_post_count: "عدد المنشورات للمستخدم الجديد او الاساسي يجب ان تتم الموافقه عليه "
     approve_unless_trust_level: "مشاركات للأعضاء أدنى من مستوى الثقة هذا يجب أن تتم الموافقة عليها."
     default_email_mailing_list_mode: "ارسل بريد إلكتروني لكل مشاركة جديدة افتراضيا."
-    disable_mailing_list_mode: "عدم السماح للمستخدمين بتفعيل خيار المراسله الجماعيه"
     default_email_previous_replies: "ارفق الردود السابقه في رسائل البريد افتراضياً"
     default_email_in_reply_to: "ارفق مقتبسات الرد على المنشور في رسائل البريد افتراضياً"
     default_other_new_topic_duration_minutes: "الشروط العالمية الافتراضية لموضوع يعتبر جديد."
@@ -1253,6 +1268,7 @@ ar:
     default_other_external_links_in_new_tab: "افتح الرّوابط الخارجيّة في ألسنة جديدة افتراضيًّا."
     default_other_enable_quoting: "فعل إقتباس الردود لتحديد النص إفتراضيا."
     default_other_dynamic_favicon: "إعرض عدد المواضيع الجديدة/الحديثة في أيقونة المتصفح إفتراضيا."
+    default_other_skip_new_user_tips: "تخطي نصائح وتهيئة المستخدم الجديد والشارات."
     default_other_like_notification_frequency: "اجعل تنبيه الأعضاء بالإعجابات الجديدة افتراضي. "
     default_topics_automatic_unpin: "تلقائياً قم إزالة تثبيت المواضيع عندما يصل العضو إلى الأسفل \"إفتراضيا\"."
     default_categories_watching: "قائمة الأقسام المضبوطة إفتراضيا علي الوضع \"مُراقب\"."
@@ -1282,7 +1298,8 @@ ar:
       category: "الأقسام"
       topic: "نتائج "
       user: "مستخدمين "
-  sso:
+    results_page: "نتائج البحث عن ”%{term}“"
+  discourse_connect:
     not_found: "تعذّر العثور على الحساب. رجاء تواصل مع مدير الموقع."
     unknown_error: "ثمّة مشكلة بالحساب. رجاء تواصل مع مدير الموقع."
     timeout_expired: "انتهت مهلة جلسة الولوج، رجاء جرّب الولوج ثانيةً."
@@ -1346,6 +1363,12 @@ ar:
     autoclosed_disabled: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة "
     autoclosed_disabled_lastpost: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة "
   login:
+    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: "جهازك الحالي أو متصفحك لا يدعم استخدام مفاتيح الأمان. يرجى استخدام طريقة مختلفة."
     not_approved: "لم تتم عملية الموافقة على حسابك حتى الآن. سيتم إعلامك عبر البريد الإلكتروني الخاص بك عندما يكون حسابك جاهزًا لتسجيل الدخول."
     incorrect_username_email_or_password: "اسم المستخدم او كلمة المرور او البريد الالكتروني غير صحيح"
     wait_approval: "شكرًا على التسجيل. سيتم إبلاغك عندما تتم عملية الموافقة على حسابك."
@@ -1364,6 +1387,10 @@ ar:
     email_too_long: "عنوان البريد الإلكترونيّ الذي قدّمته طويل جدًّا. لا يجب أن يزيد طول أسماء صناديق البريد على 254 محرفًا، ولا يجب أن يزيد طول أسماء النّطاقات على 253 محرفًا."
     reserved_username: "اسم المستخدم ذلك غير مسموح."
     missing_user_field: "لم تُكمل كافة الحقول المطلوبة "
+    second_factor_title: "الاستيثاق بخطوتين"
+    second_factor_backup_description: "الرجاء إدخال أحد الرموز الاحتياطية الخاصة بك:"
+    second_factor_toggle:
+      backup_code: "استخدام رمز النسخ الاحتياطي بدلاً من ذلك"
   admin:
     email:
       sent_test: "أُرسلت!"
@@ -1406,6 +1433,8 @@ ar:
     post_hidden:
       title: "المشاركة مخفية"
       subject_template: "المشاركة مخفية بتصويت الاعضاء"
+    queued_by_staff:
+      title: "المنشور يحتاج موافقة"
     welcome_user:
       title: "ترحيب المستخدم"
       subject_template: "مرحبا بك في %{site_name}!"
@@ -1511,6 +1540,8 @@ ar:
       subject_template: "حسابك الجديد [%{email_prefix}]"
     confirm_new_email:
       subject_template: "أكّد عنوان بريد الإلكتروني الجديد %{email_prefix}"
+    confirm_new_email_via_admin:
+      subject_template: "أكّد عنوان بريد الإلكتروني الجديد %{email_prefix}"
     confirm_old_email:
       subject_template: "أكّد عنوان بريد الإلكتروني الحالي %{email_prefix}"
     confirm_old_email_add:
@@ -1519,6 +1550,8 @@ ar:
       subject_template: "عنوان بريد الإلكتروني تم تغييرة %{email_prefix}"
     signup_after_approval:
       subject_template: "قد وافقت على %{site_name}!"
+    post_approved:
+      title: "حصلت مشاركتك على الموافقة"
   page_not_found:
     popular_topics: "نَشط"
     recent_topics: "الأحدث"
@@ -1563,6 +1596,7 @@ ar:
     sender_body_blank: "محتوى فارغ "
   color_schemes:
     base_theme_name: "قاعدة"
+    default_theme_name: "المبدئي"
   edit_this_page: "تعديل هذه الصفحة"
   csv_export:
     boolean_yes: "نعم"
@@ -1840,6 +1874,8 @@ ar:
     title: "الأوسمة"
   finish_installation:
     congratulations: "تهانينا على تثبيت دسكورس!"
+    register:
+      button: "تسجيل"
     resend_email:
       title: "اعد ارسال رسالة التفعيل"
   wizard:
@@ -1848,12 +1884,27 @@ ar:
         title: "الإسم"
       privacy:
         title: "صلاحية"
+        fields:
+          privacy:
+            choices:
+              open:
+                label: "عامة"
+              restricted:
+                label: "خاص"
       contact:
         fields:
           contact_email:
             placeholder: "name@example.com"
+          contact_url:
+            placeholder: "https://www.example.com/contact-us"
       corporate:
         title: "منظمات"
+      colors:
+        title: "الألوان"
+      fonts:
+        fields:
+          font_preview:
+            label: "معاينة"
       icons:
         title: "أيقونة"
       homepage:
@@ -1870,8 +1921,8 @@ ar:
                 label: "أقسام ذات مواضيع مُميزة"
               categories_and_latest_topics:
                 label: "الأقسام والمواضيع الأخيرة"
-      emoji:
-        title: "الرموز التعبيرية"
+              categories_and_top_topics:
+                label: "التصنيفات و أفضل المواضيع"
       invites:
         title: "ادعو للانظمام الى الطاقم"
       finished:
@@ -1885,10 +1936,25 @@ ar:
       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}"
+  staff_action_logs:
+    api_key:
+      revoked: سُحب
   reviewables:
+    priorities:
+      low: "منخفض"
+      medium: "متوسّطة"
+      high: "عالية"
+    sensitivity:
+      low: "منخفض"
+      medium: "متوسّطة"
+      high: "عالية"
     actions:
       agree_and_suspend:
         title: "عضو موقوف"
+      agree_and_silence:
+        title: "كتم المستخدم"
       delete_spammer:
         title: "احذف ناشر السبام"
       delete_single:
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index fadbd4fbf3..90d727e1e6 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -39,6 +39,7 @@ be:
   title: "гаворка"
   topics: "тэмы"
   posts: "паведамленняў"
+  views: "прагляды"
   loading: "загрузка"
   powered_by_html: 'Працуе на <a href="https://www.discourse.org">Discourse</a>. Не выключай JavaScript, боўдзіла.'
   sign_up: "рэгістрацыя"
@@ -143,8 +144,9 @@ be:
       s3_bucket_reused: "Вы не можаце выкарыстоўваць той жа вядро для «s3_upload_bucket» і «s3_backup_bucket». Трэба выбраць іншае вядро або выкарыстаць іншы шлях для кожнага сегмента."
     conflicting_google_user_id: 'Google Account ID для гэтага ўліковага запісу змяніўся; ўмяшанне персаналу патрабуецца па меркаваннях бяспекі. <br>Калі ласка, звяжыцеся з супрацоўнікамі і накіруйце іх да <a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   invite:
-    error_message: "Была памылка прыняцця запрашэння. Калі ласка, звярніцеся да адміністратара сайта."
     confirm_email: "<p> Вы амаль скончылі! Мы даслалі ліст з кодам актывацыі на ваш адрас электроннай пошты. </p><p>Калі ласка, прытрымлівайцеся дасланым інструкцыям для актывацыі акаўнта. </p>"
+    disabled_errors:
+      invalid_access: "Вы не дазваляецца праглядаць запытаны рэсурс."
   bulk_invite:
     file_should_be_csv: "Загружаны файл павінен мець фармат CSV."
     error: "Была памылка загрузкі гэтага файла. Калі ласка паспрабуйце зноў пазней."
@@ -206,6 +208,11 @@ be:
   page_num: "Старонка %{num}"
   home_title: "дома"
   topics_in_category: "Тэмы ў '%{category}' катэгорыі"
+  rss_num_posts:
+    one: "%{count} запіс"
+    few: "%{count}запісаў"
+    many: "%{count}запісаў"
+    other: "%{count}запісаў"
   read_full_topic: "Чытаць тэму цалкам"
   private_message_abbrev: "Паведамленне"
   rss_description:
@@ -260,24 +267,6 @@ be:
       few: "%{count}запісаў"
       many: "%{count}запісаў"
       other: "%{count}запісаў"
-    "new-topic": |
-      Сардэчна запрашаем %{site_name} mdash; ** дзякуй за пачатак новай размовы! **
-
-      - Ці гучала назва цікава, калі вы чыталі яе ўслых? Ці з'яўляецца гэта добрым рэзюмэ?
-
-      - Хто быў бы зацікаўлены ў гэтым? Чаму гэта важна? Якія адказы вы хочаце?
-      - Уключыце часта выкарыстоўваемыя словы ў вашай тэме, каб іншыя маглі * знайсці * гэта. Каб згрупаваць тэму з роднаснымі тэмамі, выберыце катэгорыю.
-      Дадаткова [глядзіце нашыя прынцыпы супольнасці] (%{base_path}/гайдлан). Гэтая панэль з'явіцца толькі для вашага першага %{education_posts_text}.
-    "new-reply": |
-      Сардэчна запрашаем %{site_name} mdash; ** Дзякуем за ўдзел! **
-
-      - Палепшылася ці ваш адказ размова нейкім чынам?
-
-      - Будзьце добрыя да сваім калегам членаў супольнасці.
-
-      - Канструктыўная крытыка вітаецца, але крытыкюцца * ідэі *, а не людзі.
-
-      Дадаткова [глядзіце нашыя прынцыпы супольнасці] (%{base_path}/гайдлан). Гэтая панэль з'явіцца толькі для вашага першага %{education_posts_text}.
     avatar: |
       ### Як наконт малюнкаў для вашага ўліковага запісу?Вы адправілі некалькі тэм і адказы, але ваша выява профілю не ўнікальнае, як вы - гэта проста ліст.Разглядалі вы ** [наведвання вашага профілю карыстальніка] (% {PROFILE_PATH}) ** і загрузіць малюнак, якое ўяўляе вас?Гэта лягчэй сачыць за ходам абмеркаванняў і знайсці цікавых людзей у размовах, калі кожны чалавек мае унікальны профіль карціну!
     sequential_replies: |
@@ -372,6 +361,9 @@ be:
       uncategorized_parent: "Без не можа мець бацькоўскую катэгорыю"
       self_parent: "Бацька падкатэгорыі не можа быць самім сабой"
       depth: "Вы не можаце укладваць падкатэгорыя пад іншым"
+      invalid_email_in: "'%{email}' не з'яўляецца дапушчальным адрасам электроннай пошты."
+      email_already_used_in_group: "'%{email}' ужо выкарыстоўваецца групай '%{group_name}'."
+      email_already_used_in_category: "'%{email}' ужо выкарыстоўваецца ў катэгорыі '%{category_name}'."
       description_incomplete: "Апісанне катэгорыі пост павінен мець па крайняй меры адзін пункт."
       disallowed_topic_tags: "Гэтая тэма мае тэгі не дазволеныя гэтай катэгорыяй: '%{tags}'"
     cannot_delete:
@@ -396,8 +388,6 @@ be:
   rate_limiter:
     slow_down: "Вы выканалі гэтае дзеянне занадта шмат разоў, калі ласка паспрабуйце яшчэ раз пазней."
     too_many_requests: "Вы выканалі гэта дзеянне занадта шмат разоў. Калі ласка, пачакайце%{time_left}, затым паўтарыце спробу."
-    by_type:
-      first_day_replies_per_day: "Вы дасягнулі максімальнай колькасці адказаў якую новы карыстальнік можа стварыць у першы дзень. Калі ласка, пачакайце%{time_left}, затым паўтарыце спробу."
     hours:
       one: "%{count} гадзіну"
       few: "%{count}гадзін"
@@ -417,11 +407,33 @@ be:
   datetime:
     distance_in_words:
       half_a_minute: "<1 хв"
+      less_than_x_minutes:
+        one: "< %{count}хв"
+        few: "< %{count}хв"
+        many: "< %{count}хв"
+        other: "< %{count}хв"
+      x_minutes:
+        one: "%{count}хв"
+        few: "%{count}хв"
+        many: "%{count}хв"
+        other: "%{count}хв"
     distance_in_words_verbose:
       half_a_minute: "толькі што"
       less_than_x_seconds: "толькі што"
+      about_x_hours:
+        one: "0%{count}:00 таму"
+        few: "гадзін таму: %{count}"
+        many: " %{Count} гадзін таму"
+        other: " %{Count} гадзін таму"
+      x_days:
+        one: "%{count} дзень таму"
+        few: "дзён таму: %{count}"
+        many: "%{Count} дзён таму"
+        other: " %{Count} дзён таму"
   password_reset:
     choose_new: "Абярыце новы пароль"
+    choose: "% Менш, чым {лік} хвілін таму........................................................."
+    save: "ўсталяваць пароль"
     title: "скінуць пароль"
   user_auth_tokens:
     browser:
@@ -549,7 +561,6 @@ be:
     title: "Адмовіцца ад падпіскі"
     mailing_list_mode: "Выключыць рэжым спісу рассылання"
     different_user_description: "Вы ў цяперашні час ўвайшлі ў сістэму як іншы карыстальнік, чым той, які мы па электроннай пошце. Калі ласка, выйдзіце з сістэмы, або ўвесці ананімны рэжым і паспрабуйце ізноў."
-    not_found_description: "На жаль, мы не змаглі знайсці гэта адмовіцца ад падпіскі. Гэта можна спасылку ў вашай электроннай пошце скончыўся?"
     log_out: "выхад"
     submit: "захаваць налады"
     digest_frequency:
@@ -670,8 +681,10 @@ be:
       description: "Колькасць карыстальнікаў, якія спадабаліся або вывешаныя ў апошні дзень."
     profile_views:
       title: "Прагляды профілю карыстальніка"
+      xaxis: "дзень"
     topics:
       title: "тэмы"
+      xaxis: "дзень"
       yaxis: "Колькасць новых тэм"
       description: "Новыя тэмы створаны ў гэты перыяд."
     posts:
@@ -738,6 +751,10 @@ be:
     system_private_messages:
       title: "сістэма"
       xaxis: "дзень"
+      yaxis: "Колькасць паведамленняў"
+    moderator_warning_private_messages:
+      xaxis: "дзень"
+      yaxis: "Колькасць паведамленняў"
     notify_moderators_private_messages:
       title: "Паведаміць мадэратарам"
       xaxis: "дзень"
@@ -889,10 +906,8 @@ be:
     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: "Дазволіць тым, каб стварыць без катэгорыі. УВАГА: Калі ёсць якія-небудзь пытанні Uncategorized, вы павінны Рэкласіфікацыя іх перад уключэннем гэтага выключэння."
     allow_duplicate_topic_titles: "Дазволіць тэмы з аднолькавымі, дублюючымі назвамі."
     unique_posts_mins: "Колькі хвілін да карыстальніка могуць зрабіць запіс з тым жа зместам зноў"
@@ -919,6 +934,8 @@ be:
     show_pinned_excerpt_mobile: "Паказаць ўрывак на ўскладалі тэмы ў мабільным рэжыме."
     show_pinned_excerpt_desktop: "Паказаць ўрывак на ўскладалі тэмы з улікам працоўнага стала."
     post_onebox_maxlength: "Максімальная даўжыня oneboxed дыскурсу паста у знаках."
+    blocked_onebox_domains: "Спіс даменаў, якія ніколі не будуць oneboxed."
+    allowed_inline_onebox_domains: "Спіс даменаў, якія будуць oneboxed ў мініятурным выглядзе, калі звязаныя без назвы"
     max_oneboxes_per_post: "Максімальную колькасць у раздзелах Onebox пасады."
     logo: "Малюнак лагатыпа ў левым верхнім куце сайта. Выкарыстоўвайце шырокае прамавугольнае малюнак з вышынёй 120 і суадносінамі бакоў больш, чым 3: 1. Калі пакінуць пустым, то назва сайта будзе паказаны тэкст."
     logo_small: "Невялікі лагатып малюнак у левым верхнім куце сайта, відаць пры прагортцы ўніз. Выкарыстоўвайце квадрат 120 × 120 малюнак. Калі пакінуць пустым, дом глиф будзе паказаны."
@@ -932,7 +949,6 @@ be:
     notification_email: "Ад: адрас электроннай пошты выкарыстоўваецца пры адпраўцы ўсе неабходныя сістэмы электроннай пошты. Дамен, паказаны тут павінен мець SPF, DKIM і зваротны PTR запісы зададзены правільна для электроннай пошты, каб прыбыць."
     email_custom_headers: "Труба косак спісу карыстацкіх загалоўкаў паведамленняў электроннай пошты"
     force_https: "Прымусьце свой сайт, каб выкарыстоўваць толькі HTTPS. УВАГА: Не ўключайце гэта, пакуль вы не пераканайцеся, HTTPS цалкам настроена і працуе абсалютна ўсюды! Праверылі Ці вы свой CDN, усе сацыяльныя лагіны, і ўсе знешнія лагатыпы"
-    same_site_cookies: "Выкарыстоўвайце тыя ж печыва сайта, яны ліквідуюць ўсе вектары Cross Site Request Падробка на падтрымоўваных браўзэраў (LAX або Strict). Увага: Строгі будзе працаваць толькі на сайтах, якія прымушаюць лагін і выкарыстоўваць адзіны ўваход."
     summary_score_threshold: "Мінімальная колькасць балаў, неабходныя для пасады, якія будуць уключаны ў «Сумаваць гэтую тэму»"
     summary_percent_filter: "Калі карыстальнік націскае «Сумаваць гэтую тэму», паказваюць верхнюю% паведамленняў"
     summary_max_results: "Максімум паведамлення якiя вяртаюцца «Абагульніць Гэтую тэму»"
@@ -960,6 +976,8 @@ be:
     post_undo_action_window_mins: "Колькасць хвілін карыстальнікаў дазволена адмяніць апошнія дзеянні на пасадзе (напрыклад, сцяг, і г.д.)."
     pending_users_reminder_delay: "Апавяшчаць мадэратараў, калі новыя карыстальнікі чакалі адабрэння даўжэй, чым гэта шмат гадзін. Усталюйце на -1, каб адключыць паведамлення."
     maximum_session_age: "Карыстальнік будзе заставацца ў сістэме для рускіх гадзін з моманту апошняга наведвання"
+    blocked_ip_blocks: "Спіс прыватных IP-блокаў, якія ніколі не павінны сканіравацца дыскурсе"
+    allowed_internal_hosts: "Спіс ўнутраных хастоў, дыскурс можа бяспечна паўзці для oneboxing і іншых мэтаў"
     allowed_iframes: "Спіс прэфіксаў дамена IFrame Src Дыскурс можа бяспечна дазволіць у паведамленнях"
     slow_down_crawler_user_agents: "Агенты карыстальнікаў вэб-робатаў, якія павінны быць абмежаваныя ў хуткасці robots.txt з дапамогай дырэктывы Crawl затрымкі"
     slow_down_crawler_rate: "Калі slow_down_crawler_user_agents паказаны гэтая стаўка будзе прымяняцца да ўсіх сканэра (колькасць секунд затрымкі паміж запытамі)"
@@ -989,6 +1007,8 @@ be:
     email_token_valid_hours: "Забыліся на пароль"
     enable_badges: "Уключыць сістэму жэтона"
     enable_whispers: "Дазволіць супрацоўнік асабістых зносін у рамках тэмы."
+    blocked_email_domains: "Труба косак спіс паштовых даменаў, якія не могуць рэгістраваць ўліковыя запісы с. Прыклад: mailinator.com | trashmail.net"
+    allowed_email_domains: "Труба косак спіс паштовых даменаў, якія карыстальнікі павінны зарэгістраваць рахунку. УВАГА: Карыстальнікі з электроннымі, выдатнымі ад пералічаных даменаў не будуць дазволеныя!"
     hide_email_address_taken: "Не інфармаваць карыстальнікаў аб тым, што уліковы запіс існуе з паказаным адрасам электроннай пошты пры рэгістрацыі і ад формы забыліся пароль."
     log_out_strict: "Пры ўваходзе ў сістэму з, выйдзіце з усіх сеансаў для карыстальніка на ўсіх прыладах"
     version_checks: "Ping Дыскурс канцэнтратар для абнаўлення версій і паказаць новыя версіі паведамленняў на старонцы <A HREF = '% {базовый_путь}"
@@ -1004,15 +1024,7 @@ be:
     min_admin_password_length: "Мінімальная даўжыня пароля для адміністратара."
     password_unique_characters: "Мінімальная колькасць унікальных сімвалаў, пароль павінен мець."
     block_common_passwords: "Не дапускаць паролі, якія ў 10000 найбольш распаўсюджаных пароляў."
-    sso_secret: "Сакрэтная радок, якая выкарыстоўваецца для крыптаграфічнай AUTHENTICATE інфармацыі SSO, пераканайцеся, што ён 10 або больш сімвалаў"
-    sso_overrides_bio: "Пераазначэнне карыстальніка бія ў профілі карыстальніка і прадухіляе карыстачу змяняць яго"
-    sso_overrides_groups: "Сінхранізаваць ўсе ўручную сяброўства ў групе з гуртамі, указаных у групах SSO атрыбуту (УВАГА: калі не паказаць групы ўсяго членства ўручную груп будзе далёка для карыстальніка)"
-    sso_overrides_avatar: "Замяняе Аватар карыстальніка з вонкавым сайтам аватар ад 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 (па змаўчанні вяртання шляху павінен быць на бягучым сайце)"
-    enable_local_logins: "Ўключэнне лакальных уліковых запісаў на аснове лагіна карыстальніка і пароля. Гэта павінна быць уключана для запрашэння на працу. УВАГА: калі ён адключаны, вы можаце быць не ў стане увайсці ў сістэму, калі вы не настроены раней, па меншай меры адзін альтэрнатыўны метад ўваходу."
+    discourse_connect_overrides_bio: "Пераазначэнне карыстальніка бія ў профілі карыстальніка і прадухіляе карыстачу змяняць яго"
     enable_local_logins_via_email: "Дазволіць карыстальнікам запытваць адзін клік лагін спасылку на для адпраўкі іх па электроннай пошце."
     allow_new_registrations: "Дазволіць рэгістрацыю новых карыстальнікаў. Здыміце гэты сцяжок, каб ніхто ад стварэння новай ўліковага запісу."
     enable_signup_cta: "Паказаць апавяшчэнне аб вяртанні ананімных карыстальнікаў, якія падахвочваюць іх, каб падпісацца на рахунак."
@@ -1035,7 +1047,6 @@ be:
     active_user_rate_limit_secs: "Як часта мы абнаўляем «last_seen_at» полі, у секундах"
     verbose_localization: "Паказаць пашыраныя парады па лакалізацыі ў карыстацкім інтэрфейсе"
     previous_visit_timeout_hours: "Як доўга доўжыцца візіт, перш чым мы разгледзім яго «папярэдні» візіт у гадзінах"
-    rebake_old_posts_count: "Колькасць старых паведамленняў неабходна прокаливать кожныя 15 хвілін."
     enable_safe_mode: "Дазволіць карыстальнікам ўводзіць у бяспечны рэжым адладкі убудоў."
     rate_limit_create_topic: "Пасля стварэння тэмы, карыстальнікі павінны чакаць (N) секунд, перш чым ствараць іншую тэму."
     rate_limit_create_post: "Пасля стварэння тэмы, карыстальнікі павінны чакаць (N) секунд, перш чым ствараць іншую тэму...."
@@ -1050,8 +1061,6 @@ be:
     max_topic_invitations_per_day: "Максімальную колькасць тэматычных запрашэнняў элемент можа адправіць у дзень."
     max_logins_per_ip_per_hour: "Максімальную колькасць уваходаў дазволена ў IP-адрас у гадзіну"
     max_logins_per_ip_per_minute: "Максімальную колькасць уваходаў дазволена ў IP-адрасы ў хвіліну"
-    max_post_deletions_per_minute: "Максімальную колькасць паведамленняў, карыстальнік можа выдаліць за хвіліну."
-    max_post_deletions_per_day: "Максімальную колькасць паведамленняў, карыстальнік можа выдаліць за дзень."
     alert_admins_if_errors_per_minute: "Колькасць памылак у хвіліну для таго, каб выклікаць трывогу адміністратара. Значэнне 0 адключае гэтую функцыю. Заўвага: патрабуецца перазапуск."
     alert_admins_if_errors_per_hour: "Колькасць памылак у гадзіну для таго, каб выклікаць трывогу адміністратара. Значэнне 0 адключае гэтую функцыю. Заўвага: патрабуецца перазапуск."
     suggested_topics: "Колькасць прапанаваных тэм, паказаных ў ніжняй частцы падзелу."
@@ -1079,7 +1088,6 @@ be:
     strip_image_metadata: "Газу метададзеныя малюнка."
     min_ratio_to_crop: "Каэфіцыент выкарыстоўваецца для абразання высокіх малюнкаў. Ўвядзіце вынік шырыні"
     simultaneous_uploads: "Максімальную колькасць файлаў, якія можна перацягваць кампазітар"
-    enable_flash_video_onebox: "Ўключыць ўкладанне SWF і FLV (Adobe Flash) спасылкі на раздзелы Onebox. ПАПЯРЭДЖАНЬНЕ: можа ўвесці пагрозы бяспекі."
     default_invitee_trust_level: "Узровень па змаўчанні даверу (0-4) для запрошаных карыстальнікаў."
     default_trust_level: "Узровень па змаўчанні даверу (0-4) для ўсіх новых карыстальнікаў. УВАГА! Змена гэта паставіць вас на сур'ёзны рызыка для спаму."
     tl1_requires_topics_entered: "Колькі тым новы карыстальнік павінен увесці перад тым прасоўванне давяраць 1-га ўзроўню."
@@ -1114,6 +1122,7 @@ be:
     min_trust_to_send_messages: "Мінімальны ўзровень даверу, неабходны для стварэння новых асабістых паведамленняў."
     min_trust_to_flag_posts: "Мінімальны ўзровень даверу патрабуецца сцяг паведамленняў"
     min_trust_to_post_links: "Мінімальны ўзровень даверу павінен ўключаць спасылкі ў паведамленнях"
+    allowed_link_domains: "Дамены, якія карыстальнікі могуць спасылаюцца нават калі яны не маюць адпаведны ўзровень даверу да паведамлення спасылкі"
     newuser_max_links: "Колькі спасылак новы карыстальнік можа дадаць да паведамлення."
     newuser_max_attachments: "Колькі укладанняў новы карыстальнік можа дадаць да паведамлення."
     newuser_max_mentions_per_post: "Максімальную колькасць @name абвесткі новы карыстальнік можа выкарыстоўваць ў паведамленні."
@@ -1154,6 +1163,7 @@ be:
     privacy_policy_url: "Калі ў вас ёсць дакумент Палітыка прыватнасці размяшчаецца ў іншых месцах, якія вы хочаце выкарыстоўваць, забяспечыць поўны URL тут."
     log_anonymizer_details: "Незалежна ад таго, каб трымаць дэталі карыстальніка ў часопісе пасля ананімнай. Пры выкананні ў GDPR вам трэба выключыць."
     newuser_spam_host_threshold: "Колькі разоў новы карыстальнік можа апублікаваць спасылку на той жа хост ў іх `newuser_spam_host_threshold` паведамленняў перад тым, як лічыцца спамам."
+    allowed_spam_host_domains: "Спіс даменаў, выключаных з праверкі спам-гаспадара. Новыя карыстальнікі не будуць абмежаваныя ствараць паведамленні са спасылкамі на гэтыя дамены."
     topic_view_duration_hours: "Граф новага віду тэмы адзін раз у IP"
     user_profile_view_duration_hours: "Граф новы від профіляў карыстальнікаў адзін раз у IP"
     levenshtein_distance_spammer_emails: "Пры супастаўленні спамерскіх лістоў, колькасць знакаў розніцы, што будзе па-ранейшаму дазваляе невыразны матч."
@@ -1223,6 +1233,7 @@ be:
     ignored_users_count_message_threshold: "Апавяшчаць мадэратараў, калі канкрэтны карыстальнік ігнаруе многіх іншых карыстальнікаў."
     ignored_users_message_gap_days: "Як доўга чакаць, перш чым зноў паведамляючы мадэратарам пра карыстальніка, які быў праігнараваны многімі іншымі."
     clean_up_inactive_users_after_days: "Колькасць дзён да неактыўнага карыстальніка (давер ўзроўню 0 без якіх-небудзь паведамленняў) выдаляецца. Каб адключыць ачыстку набору 0."
+    allowed_user_website_domains: "Сайт карыстальніка будзе правераны ў дачыненні да гэтых даменаў. Pipe коскамі спіс."
     allow_profile_backgrounds: "Дазволіць карыстальнікам загружаць профілю фону."
     sequential_replies_threshold: "Колькасць паведамленняў карыстача павінен зрабіць запар у тэме да напамінку аб занадта многіх паслядоўных адказах."
     get_a_room_threshold: "Колькасць паведамленняў карыстальнік павінен зрабіць тое ж асоба ў той жа тэме, перш чым папярэджваюцца."
@@ -1248,6 +1259,7 @@ be:
     autohighlight_all_code: "Force прымяніць падсвятленне кода для ўсіх адфарматаваных блокаў кода, нават калі яны не відавочна паказаць мову."
     embed_truncate: "Абрэзаць укаранёныя паведамленні."
     embed_support_markdown: "Падтрымка Markdown фарматавання ўкладзеных паведамленняў."
+    allowed_embed_selectors: "Падзелены коскамі спіс CSS элементаў, якія дазволены ў убудаваныя элементы."
     allowed_href_schemes: "Схемы дазволілі ў сувязі ў дадатак да HTTP і HTTPS."
     embed_post_limit: "Максімальную колькасць паведамленняў для ўбудавання."
     embed_username_required: "Імя карыстальніка для стварэння тэмы патрабуецца."
@@ -1255,7 +1267,6 @@ be:
     show_create_topics_notice: "Калі сайт мае менш за 5 грамадскія тэма, паказаць апавяшчэнне з просьбай адмін стварыць некаторыя тэмы."
     delete_drafts_older_than_n_days: "Выдаліць чарнавікі старэй (п) дзён."
     bootstrap_mode_min_users: "Мінімальная колькасць карыстальнікаў, неабходных для адключэння рэжыму пачатковай загрузкі (вызначана нацыянальным 0, каб адключыць)"
-    prevent_anons_from_downloading_files: "Забарона ананімных карыстальнікаў загрузкі укладанняў. ПАПЯРЭДЖАНЬНЕ: гэта дазволіць прадухіліць любыя актывы сайта без малюнкаў, размешчаных у выглядзе укладанняў ад працы."
     slug_generation_method: "Выбар спосабу генерацыі кулі. «Закадаваны» будзе генераваць працэнт радок кадавання. «Ніхто» не адключыць смоўж наогул."
     enable_emoji: "ўключыць смайлікі"
     enable_emoji_shortcuts: "Агульны смайлік тэкст, такія як :): р :( будзе ператвораны ў смайлікі"
@@ -1281,7 +1292,6 @@ be:
     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: "Глябальны стан па змаўчанні, для якога тэма лічыцца новым."
@@ -1302,7 +1312,6 @@ be:
     retry_web_hook_events: "Аўтаматычна паўтараць няўдалы вэб гаплікі падзея ў 4 разы. прамежкі часу паміж паўторнымі роўныя 1, 5, 25 і 125 хвілін."
     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: "Дазволена URL для праверкі сапраўднасці перасылак для ключоў карыстальнікаў API. Зорачкі * Джокер можа быць выкарыстаны, каб адпавядаць любой яго часткі (напрыклад, www.example.com"
     allowed_user_api_push_urls: "Дазволеныя URL-адрас для сервера штуршка да карыстацкага API"
@@ -1311,12 +1320,13 @@ be:
     max_tags_per_topic: "Максімальныя тэгі, якія могуць быць ужытыя да тэмы."
     max_tag_length: "Максімальную колькасць сімвалаў, якія могуць быць выкарыстаны ў тэгу."
     max_tag_search_results: "Пры пошуку па тэгах, максімальную колькасць вынікаў, каб паказаць."
-    show_filter_by_tag: "Паказаць выпадальны спіс для фільтрацыі спісу раздзелаў па метцы."
     max_tags_in_filter_list: "Максімальную колькасць тэгаў, каб паказаць у фільтры выпадальнага меню. Ў частым выкарыстанні тэгі будуць паказаны."
     tags_sort_alphabetically: "Паказаць тэгі ў алфавітным парадку. Па змаўчанні паказваць у парадку папулярнасці."
     tag_style: "Візуальны стыль для тэгаў значкоў."
     allow_staff_to_tag_pms: "Дазволіць супрацоўнікам пазначыць любыя асабістыя паведамленні"
     min_trust_level_to_tag_topics: "Мінімальны ўзровень даверу каб адзначаць тэмы"
+    company_name: "Назва кампаніі"
+    governing_law: "Правам, якія рэгулююць"
     city_for_disputes: "Горад для спрэчак"
     shared_drafts_category: "Ўключыць функцыю агульных Шашкі шляхам прызначэння катэгорыі для тэматычных праектаў. Тэмы ў гэтай катэгорыі будуць душыцца са спісу тэмы для карыстальнікаў персаналу."
     push_notifications_prompt: "Дысплей згоды карыстальніка запрашэнне."
@@ -1338,35 +1348,29 @@ be:
       email_editable_enabled: "Вы павінны адключыць «электронную пошту рэдагуемы» перад уключэннем гэтага параметру."
       staged_users_disabled: "Вы павінны спачатку ўключыць «паставілі карыстальнік» перад уключэннем гэтага параметру."
       reply_by_email_disabled: "Вы павінны спачатку ўключыць «адказ па электроннай пошце», перад тым як уключыць гэтую наладу."
-      sso_url_is_empty: "Вы павінны ўсталяваць «SSO URL», перш чым ўключаць гэты параметр."
-      sso_invite_only: "Вы не можаце ўключыць SSO і запрасіць толькі адначасова."
       enable_local_logins_disabled: "Вы павінны спачатку ўключыць «каб мясцовыя лагіны» перад уключэннем гэтага параметру."
       min_username_length_range: "Вы не можаце ўсталяваць мінімум вышэй максімуму."
       max_username_length_range: "Вы не можаце ўсталяваць максімум ніжэй мінімуму."
       invalid_hex_value: "Значэння колеру павінны быць 6-значныя шаснаццаткавыя коды."
-      category_search_priority:
-        very_low_weight_invalid: "Вы не можаце ўсталяваць вага, каб быць больш, чым «category_search_priority_low_weight»."
-        low_weight_invalid: "Вы не можаце ўсталяваць вага, каб быць больш або роўная 1 або менш «category_search_priority_very_low_weight»."
-        very_high_weight_invalid: "Вы не можаце ўсталяваць вага менш, чым «category_search_priority_high_weight»."
+      allowed_unicode_usernames:
+        leading_trailing_slash: "Рэгулярны выраз не павінна пачынацца і заканчвацца касой рысай."
       unicode_usernames_avatars: "Унутраныя сістэмы аватар не падтрымліваюць Unicode імёнаў карыстальнікаў."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "SSO сакрэт"
   search:
     types:
       category: "катэгорыі"
       topic: "вынікі"
       user: "карыстальнікаў"
     results_page: "Вынікі пошуку для '%{term}'"
-  sso:
+  discourse_connect:
     login_error: "Памылка ўваходу"
     not_found: "Ваш уліковы запіс не можа быць знойдзены. Калі ласка, звярніцеся да адміністратара сайта."
     account_not_approved: "Ваш уліковы запіс чакае адабрэння. Вы атрымаеце апавяшчэнне па электроннай пошце."
     unknown_error: "Існуе праблема з вашым акаўнтам. Калі ласка, звярніцеся да адміністратара сайта."
     timeout_expired: "Уваход у рахункак занадта доўгі (timed out). Калі ласка, паспрабуйце увайсці зноў."
     no_email: "Не быў прадстаўлены адрас электроннай пошты. Калі ласка, звярніцеся да адміністратара сайта."
-    email_error: "Кошт не можа быць зарэгістраваны з адрасам электроннай пошты <б>% {адрас электроннай пошты} <"
   original_poster: "арыгінальны плакат"
   most_posts: "большасць паведамленняў"
   most_recent_poster: "Самыя апошнія аўтары"
@@ -1483,6 +1487,8 @@ be:
     post_hidden_again:
       title: "Паведамленне Hidden зноў"
       subject_template: "Паведамленне ўтоена супольнасць сцягоў, персанал апавешчаны"
+    queued_by_staff:
+      title: "Паведамленне мае патрэбу ў падцверджанні"
     flags_agreed_and_post_deleted:
       title: "Пазначаныя пост выдалены супрацоўнікамі"
       subject_template: "Пазначаныя пост выдалены супрацоўнікамі"
@@ -1898,13 +1904,9 @@ be:
     account_suspended:
       title: "Аккаунт прыпынены"
       subject_template: "[%{email_prefix}] Ваш рахунак быў заблякаваны"
-      text_body_template: |
-        Вы не былі адхіленыя ад форума да% {suspended_till}.% {Прычына}% {Паведамленне}
     account_silenced:
       title: "Аккаунт прыпынены"
       subject_template: "[% {Email_prefix}] Ваш уліковы запіс была адключаная"
-      text_body_template: |
-        Вы не былі адключаныя ад форума да% {silenced_till}.% {Прычына}% {Паведамленне}
     account_exists:
       title: "Лік ужо існуе"
       subject_template: "[% {Email_prefix}] Лік ужо існуе"
@@ -1971,6 +1973,9 @@ be:
     confirm_new_email:
       title: "Пацвердзіце новы Email"
       subject_template: "[%{email_prefix}] Пацвердзіце свой новы адрас электроннай пошты"
+    confirm_new_email_via_admin:
+      title: "Пацвердзіце новы Email"
+      subject_template: "[%{email_prefix}] Пацвердзіце свой новы адрас электроннай пошты"
     confirm_old_email:
       title: "Пацвердзіце стары адрас электроннай пошты"
       subject_template: "[%{email_prefix}] Пацвердзіце свой бягучы адрас электроннай пошты"
@@ -2458,6 +2463,12 @@ be:
           city_for_disputes:
             label: "Горад для спрэчак"
             placeholder: "Сан - Францыска, Каліфорнія"
+      colors:
+        title: "<......"
+      fonts:
+        fields:
+          font_preview:
+            label: "папярэдні прагляд"
       logos:
         title: "лагатыпы"
         fields:
@@ -2496,9 +2507,6 @@ be:
                 label: "катэгорыі скрынкі"
               categories_boxes_with_topics:
                 label: "Катэгорыі скрынка з Тэмай"
-      emoji:
-        title: "Emoji"
-        description: "Які Emoji стыль вы аддаеце перавагу для вашага супольнасці? Вы можаце дадаць больш карыстацкага Emoji пазней з дапамогай адміністратара, налада Emoji."
       invites:
         title: "запрасіць Staff"
         description: "Вы амаль скончылі! Давайце запросім людзей, каб дапамагчы <HTTPS A HREF = ':"
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index 221b0af8c0..d9c178678b 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -14,6 +14,7 @@ bg:
       short: "%m-%d-%Y"
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
+      no_day: "%Y %B"
   date:
     month_names:
     - null
@@ -33,6 +34,7 @@ bg:
   title: "Discourse"
   topics: "Теми"
   posts: "публикации"
+  views: "преглеждания"
   loading: "Зареждане"
   sign_up: "Регистрирай се"
   log_in: "Вход"
@@ -41,6 +43,8 @@ bg:
   disable_remote_images_download_reason: "Изтеглянето на отдалечени изображения беше изключено, защото няма достатъчно място на хард диска."
   anonymous: "Анонимен"
   remove_posts_deleted_by_author: "Изтрит от автора"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} от %{username} "
   themes:
     other_error: "Нещо се обърка при актуализирането на стила"
   emails:
@@ -96,6 +100,9 @@ bg:
         other: ! "%{count} грешки възпрепятстват запазването на този %{model} "
     embed:
       load_from_remote: "Получи се грешка при зареждането на тази публикация."
+  invite:
+    disabled_errors:
+      invalid_access: "Вие нямате права да разглеждате този ресурс."
   topic_invite:
     user_exists: "Съжеляваме, но този потребител е вече поканен. Вие можете да каните потребител за дадена тема само веднъж."
   backup:
@@ -123,6 +130,9 @@ bg:
     permalink: "Постоянен адрес"
     imported_from: "Това е упътваща дискусионна тема за първоначалното влизане в %{link}"
     in_reply_to: "▶ %{username}"
+    replies:
+      one: "%{count} отговор"
+      other: "%{count} отговора"
     created: "Създадени"
   no_mentions_allowed: "Съжаляваме, не може да споменавате други потребители."
   too_many_mentions:
@@ -154,6 +164,9 @@ bg:
   topics_in_category: "Теми в '%{category}' група"
   rss_posts_in_topic: "RSS поддържа '%{topic}'"
   rss_topics_in_category: "RSS поддържа темите в '%{category}' категория"
+  rss_num_posts:
+    one: "%{count} публикация"
+    other: "%{count} публикации"
   read_full_topic: "Прочети цялата тема"
   private_message_abbrev: "Съобщение"
   rss_description:
@@ -203,26 +216,6 @@ bg:
     until_posts:
       one: "%{count} публикация"
       other: "%{count} публикации"
-    "new-topic": |
-      Добре дошли в %{site_name} &mdash; **Благодарим ви за създаването на нова тема!**
-
-      - Заглавието и звучи ли ви интересно като го прочетете на глас?Достатъчно описващо ли е?
-
-      - На кого би била интересна тази тема? Защо е важна за обсъждане? Каква реакция от останалите потребители очаквате?
-
-      - Постарайте се да включите в заглавието лесни за намиране думи/фрази. Изберете подходяща по смисъл категория към която вашата тема да принадлежи.
-
-      За повече информация, вижте нашето [ръководство на потребителя] (/guidelines). Този панел ще изчезне след като създадете първата си публикация %{education_posts_text}.
-    "new-reply": |
-      Добре дошли в %{site_name} &mdash; **Благодарим Ви за съдействието!**
-
-      - Вашият отговор допринася ли за разговора по някакъв начин?
-
-      - Бъдете любезен с вашите колеги от общността.
-
-      - Конструктивната критика е добре дошла, но когато се критикуват *идеи*, не хора.
-
-      За повече информация [виж Правилата на Общността](%{base_path}/guidelines). Този панел ще бъде видим до вашето първо %{education_posts_text}.
   activerecord:
     attributes:
       category:
@@ -288,12 +281,8 @@ bg:
     change_failed_explanation: "Опитахте се да понижите %{user_name} на '%{new_trust_level}'. Обаче тяхното ниво на доверие е вече '%{current_trust_level}'. %{user_name} ще остане на '%{current_trust_level}' - ако искате да понижите потребителското ниво, ниво на доверие първо"
   rate_limiter:
     by_type:
-      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:
       one: "%{count} час"
       other: "%{count} часове "
@@ -515,6 +504,7 @@ bg:
       title: "Харесвания"
       xaxis: "Ден"
       yaxis: "Брой нови харесвания"
+      description: "Брой нови харесвания."
     flags:
       title: "Сигнали"
       xaxis: "Ден"
@@ -722,6 +712,8 @@ bg:
     redirect_users_to_top_page: "Автоматично пренасочване на нови и дълго отсъстващи потребители към началната страница."
     email_token_valid_hours: "Забравена парола / символите за активиране на акаунта са валидни (n) часа."
     enable_badges: "Активирай системата за значки"
+    blocked_email_domains: "Разделен със знака \"|\" списък на имейл домейните, от които потребителите нямат право да се регистрират. Например: mailinator.com|trashmail.net "
+    allowed_email_domains: "Разделен със знака \"|\" списък на имейл домейните, от които потребителите трябва да се регистрират. ВНИМАНИЕ: Потребители с имейл домейни, различни от тези в списъка, няма да бъдат допуснати!"
     log_out_strict: "При изход, да се прекратяват ВСИЧКИ сесии на този потребител на всички устройства "
     new_version_emails: "Изпратете имейл до contact_email адрес когато има нова версия на Discourse."
     invite_expiry_days: "Колко дълго са валидни ключовете за покана, в дни"
@@ -729,9 +721,6 @@ bg:
     min_password_length: "Минимална дължина на парола."
     min_admin_password_length: "Минимална дължина на парола за Админ."
     block_common_passwords: "Не са разрешени паролите, които са в топ 10,000 от най-често използваните."
-    enable_sso: "Активиране на SSO чрез външен сайт (ВНИМАНИЕ: Имейл адресите на потребителите трябва да бъдат потвърдени от външния сайт!)"
-    sso_secret: "Таен стринг използван за криптографско удостоверяване на SSO информацията, уверете се, че е минимум 10 символа"
-    sso_not_approved_url: "Пренасочване на неодобрените SSO акаунти към този URL"
     allow_new_registrations: "Позволи регистрация на нови потребители. Махни отметката, за да не може никой да създаде нов акаунт."
     google_oauth2_client_id: "Client ID за Google приложение."
     google_oauth2_client_secret: "Client secret за Google приложение."
@@ -761,7 +750,6 @@ bg:
     s3_upload_bucket: "Име на Amazon S3 bucket в което ще се качват файловете. ВНИМАНИЕ: трябва да съдържа само малки букви, без разстояния и долни черти."
     s3_cdn_url: "URL адресът на URL да се използва за всички s3 авоари (например: https://cdn.somewhere.com). ВНИМАНИЕ: след промяната на тази настройка трябва да преработите всичките си публикации."
     avatar_sizes: "Списък от автоматично генерираните размери на аватари"
-    enable_flash_video_onebox: "Разрешаване на ембедване на swf и flv (Adobe Flash) линкове в oneboxes. ВНИМАНИЕ: това може да създаде проблеми със сигурността."
     default_invitee_trust_level: "По подразбиране ниво на доверие (0-4) за невалидни потребители."
     default_trust_level: "Ниво на доверие (0-4) по подразбиране за всички нови потребители. ВНИМАНИЕ! Промяната на това ще ви постави в сериозен риск за спам."
     tl1_requires_topics_entered: "Колко теми трябва да отвори нов потребител, за да премине към ниво на доверие 1."
@@ -796,6 +784,7 @@ bg:
     min_title_similar_length: "Минимална дължина на заглавието на темата, като тя ще бъде проверена за наличие на подобна."
     category_colors: "Списък от шестнадесетични цветови стойности разрешени за категориите."
     category_style: "Визуален стил за категорията със значки."
+    dark_mode_none: "Без"
     max_attachment_size_kb: "Максимална големина на прикачените файлове в kB. Това също трябва да се конфигурира в nginx (client_max_body_size), apache или прокси сървъра."
     authorized_extensions: "Списък от разширения на файлове разрешени за качване (използвайте '*' за да разрешите всички)"
     max_similar_results: "Брой подобни теми показвани на потребителя при създаването на нова тема. Сравнението е базирано на заглавието и текста на темата."
@@ -815,6 +804,7 @@ bg:
     faq_url: "Въведете пълен URL към страницата FAQ, ако искате да използвате собствена версия."
     tos_url: "Ако имате документ с \"Правила за ползване\" който се хоства някъде другаде и желаете да го използвате, въведете пълния път до URL адреса тук. "
     privacy_policy_url: "Ако имате документ \"Декларация за поверителност\", който се хоства някъде другаде и желаете да го използвате, въведете пълния път до URL адреса тук. "
+    allowed_spam_host_domains: "Списък с домейните изключени от спам хост теста. Новите потребители никога няма да бъдат ограничавани в създаването на публикации с линкове към тези домейни."
     levenshtein_distance_spammer_emails: "Колко символа разлика в съвпадението може да има, когато се проверява имейла за спам, за да има приблизително съвпадение."
     max_new_accounts_per_registration_ip: "Ако вече има (n) в ниво на доверие 0 акаунта от това IP (и никой не е от екипа или от по-високо ниво на доверие 2), спри да приемаш нови регистрации от този IP адрес."
     min_ban_entries_for_roll_up: "Когато щракнете на бутона Сливане, ще създадете нов бан на подмрежа, ако в същата има повече от (N) записа."
@@ -865,7 +855,6 @@ bg:
     embed_post_limit: "Максимален брой публикации за вграждане."
     show_create_topics_notice: "Ако на сайта има по-малко от 5 теми, покажи на персонала съобщение с молба за създаване на още теми."
     delete_drafts_older_than_n_days: "Изтрий чернови по-стари от (n) дни."
-    prevent_anons_from_downloading_files: "Предотврати свалянето на приложения от анонимни потребители. ВНИМАНИЕ: това ще попречи на работата на всички авоари ,които са публикувани на сайта като приложения без изображения. "
     slug_generation_method: "Изберете метод за генериране на URL. 'кодирано' ще използва букви URL, кодирани с проценти. 'не' ще откаже генерацията като цяло."
     enable_emoji: "Разреши емотикони"
     emoji_set: "Как бихте искали да е вашата емотикона?"
@@ -1042,6 +1031,8 @@ bg:
     ignored: "Благодарим Ви за информацията. Вече разглеждаме проблема. "
     ignored_and_deleted: "Благодарим,Ви за информацията. Вече премахнахме публикацията."
   system_messages:
+    queued_by_staff:
+      title: "Публикацията изисква одобрение"
     welcome_user:
       subject_template: "Добре дошли в %{site_name}!"
     welcome_invite:
@@ -1144,6 +1135,7 @@ bg:
     sender_body_blank: "съдържанието е празно"
   color_schemes:
     base_theme_name: "Основа"
+    default_theme_name: "По подразбиране"
   edit_this_page: "Редактирайте тази страница"
   csv_export:
     boolean_yes: "Да"
@@ -1307,6 +1299,8 @@ bg:
             label: "Автоматизирани съобщения"
       corporate:
         title: "Организация"
+      colors:
+        title: "Цветове"
       logos:
         title: "Логота"
         fields:
@@ -1321,9 +1315,6 @@ bg:
             choices:
               latest:
                 label: "Последни теми"
-      emoji:
-        title: "Емотикони"
-        description: "Какъв стил Емотикони предпочитате за вашата общност? Можете да добавите още персонализирани Емотикони по-късно чрез Админ, Персонализация, Емотикони."
       invites:
         title: "Поканете персонал"
       finished:
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 3af6d640b7..5b925cd37e 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -39,6 +39,7 @@ bs_BA:
   title: "Discourse"
   topics: "Teme"
   posts: "objave"
+  views: "pregleda"
   loading: "Učitava"
   powered_by_html: 'Pokretano sa <a href="https://www.discourse.org">Discourse</a>, za najbolje sučelje uključiti JavaScript'
   sign_up: "Registruj se"
@@ -50,6 +51,8 @@ bs_BA:
   remove_posts_deleted_by_author: "Izbrisan od strane autora"
   redirect_warning: "Nismo bili u stanju da verifikujemo da je link koji ste označili zapravo bio objavljen na forumu. Ukoliko u svakom slučaju želite da nastavite dalje, označite link ispod."
   on_another_topic: "Na drugu temu"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} od %{username}"
   themes:
     bad_color_scheme: "Ne može se ažurirati tema, nevažeća paleta boja"
     other_error: "Nešto je krenulo loše pri ažuriranju izgleda teme."
@@ -155,9 +158,14 @@ bs_BA:
   next_page: "next page →"
   prev_page: "← previous page"
   page_num: "Page %{num}"
+  home_title: "Naslovnica"
   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"
+  rss_num_posts:
+    one: "%{count} objava"
+    few: "%{count} objave"
+    other: "%{count} objava"
   read_full_topic: "Read full topic"
   private_message_abbrev: "PM"
   rss_description:
@@ -168,6 +176,7 @@ bs_BA:
     reminders:
       at_desktop: "Sljedeći put sam za svojim desktop kompjuterom"
       later_today: "Danas"
+      next_business_day: "Sljedeći radni dan"
       tomorrow: "Sutra"
       next_week: "Sljedeće sedmice"
       next_month: "Sljedeći mjesec"
@@ -184,26 +193,10 @@ bs_BA:
       trust_level_3: "trust_level_3"
       trust_level_4: "trust_level_4"
   education:
-    "new-topic": |
-      Welcome to %{site_name} &mdash; **thanks for starting a new conversation!**
-
-      - Does the title accurately describe your topic? Does it sound interesting?
-
-      - What is this about? Who would be interested in it? Why does it matter? What kind of responses are you hoping for from the community?
-
-      - Include good search words in your topic so others can *find* it. To group your topic with related topics, select a category.
-
-      For more, [see our community guidelines](%{base_path}/guidelines). This panel will only appear for your first %{education_posts_text}.
-    "new-reply": |
-      Welcome to %{site_name} &mdash; **thanks for contributing!**
-
-      - Does your reply improve the conversation in some way?
-
-      - Be kind to your fellow community members.
-
-      - Constructive criticism is welcome, but criticize *ideas*, not people.
-
-      For more, [see our community guidelines](%{base_path}/guidelines). This panel will only appear for your first %{education_posts_text}.
+    until_posts:
+      one: "%{count} objava"
+      few: "%{count} objave"
+      other: "%{count} objava"
   activerecord:
     attributes:
       category:
@@ -268,6 +261,14 @@ bs_BA:
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
+      less_than_x_seconds:
+        one: "< %{count}s"
+        few: "< %{count}s"
+        other: "< %{count}s"
+      x_seconds:
+        one: "%{count}s"
+        few: "%{count}s"
+        other: "%{count}s"
       less_than_x_minutes:
         one: "< %{count}m"
         few: "< %{count}m"
@@ -276,6 +277,34 @@ bs_BA:
         one: "%{count}m"
         few: "%{count}m"
         other: "%{count}m"
+      about_x_hours:
+        one: "%{count}h"
+        few: "%{count}h"
+        other: "%{count}h"
+      x_days:
+        one: "%{count}d"
+        few: "%{count}d"
+        other: "%{count}d"
+      about_x_months:
+        one: "%{count} mjeseci"
+        few: "%{count} mjeseca"
+        other: "%{count} mjeseci"
+      x_months:
+        one: "%{count} mjeseci"
+        few: "%{count} mjeseca"
+        other: "%{count} mjeseci"
+      about_x_years:
+        one: "%{count} god."
+        few: "%{count} god."
+        other: "%{count} god."
+      over_x_years:
+        one: "> %{count} god."
+        few: "> %{count} god."
+        other: "> %{count} god."
+      almost_x_years:
+        one: "%{count} god."
+        few: "%{count} god."
+        other: "%{count} god."
     distance_in_words_verbose:
       half_a_minute: "just now"
       less_than_x_seconds: "upravo sada"
@@ -283,6 +312,14 @@ bs_BA:
         one: "Pred %{count} sat"
         few: "Pred par sati"
         other: "Pred %{count} sata"
+      x_days:
+        one: "prije %{count} dan"
+        few: "Prije par dana "
+        other: "prije %{count} dana"
+      x_months:
+        one: "prije %{count} mjesec"
+        few: "prije %{count} mjeseca"
+        other: "prije %{count} mjeseci"
   password_reset:
     choose_new: "Izaberite novu šifru"
     choose: "Izaberite šifru"
@@ -329,6 +366,8 @@ bs_BA:
       description: "Lajkuj ovaj post"
       short_description: "Lajkuj ovaj post"
   user_activity:
+    no_bookmarks:
+      self: "Nemate zabilježene postove; zabilješke omogućuju brzo pozivanje na određene postove."
     no_replies:
       others: "Nema odgovora."
   topic_flag_types:
@@ -368,8 +407,10 @@ bs_BA:
       every_month: "svaki mjesec"
       every_six_months: "svakih šest mjeseci"
   user_api_key:
+    read: "čitaj"
     otp_confirmation:
       confirm_title: Nastavi ka %{site_name}
+      logging_in_as: Prijavite se kao %{username}
       confirm_button: Završi prijavu
   reports:
     default:
@@ -427,6 +468,7 @@ bs_BA:
       title: "Likes"
       xaxis: "Day"
       yaxis: "Number of new likes"
+      description: "Number of new likes."
     flags:
       title: "Flags"
       xaxis: "Day"
@@ -439,6 +481,7 @@ bs_BA:
       title: "Users per Trust Level"
       xaxis: "Trust Level"
       yaxis: "Number of Users"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       xaxis: "Tip"
       yaxis: "Number of Users"
@@ -560,7 +603,6 @@ bs_BA:
     host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname."
     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>.'
     memory_warning: "Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended."
-    update_mail_receiver: "Otkrili smo zastarjelu verziju mail-prijemnika. Kliknite <a href='https://meta.discourse.org/t/-/133491'>ovdje</a> za upute za ažuriranje. Nakon ažuriranja ova poruka može trajati još 24 sata prije nego nestane."
   site_settings:
     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."
@@ -616,12 +658,13 @@ bs_BA:
     redirect_users_to_top_page: "Automatically redirect new and long absent users to the top page."
     email_token_valid_hours: "Forgot password / activate account tokens are valid for (n) hours."
     enable_badges: "Enable the badge system"
+    blocked_email_domains: "A list of email domains that users are not allowed to register accounts with. Example: mailinator.com trashmail.net"
+    allowed_email_domains: "A list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!"
     new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available."
     invite_expiry_days: "How long user invitation keys are valid, in days"
     login_required: "Require authentication to read content on this site, disallow anonymous access."
     min_password_length: "Minimum password length."
     block_common_passwords: "Don't allow passwords that are in the 10,000 most common passwords."
-    sso_secret: "Secret string used to encrypt/decrypt SSO information, be sure it is 10 chars or longer"
     allow_new_registrations: "Allow new user registrations. Uncheck this to prevent anyone from creating a new account."
     google_oauth2_client_id: "Client ID of your Google application."
     google_oauth2_client_secret: "Client secret of your Google application."
@@ -647,7 +690,7 @@ bs_BA:
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
     enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods."
-    enable_flash_video_onebox: "Enable embedding of swf and flv (Adobe Flash) links in oneboxes. WARNING: may introduce security risks."
+    selectable_avatars: "Popis avatara koje korisnici mogu izabrati."
     default_invitee_trust_level: "Default trust level (0-4) for invited users."
     default_trust_level: "Default trust level (0-4) for all new users."
     tl1_requires_topics_entered: "How many topics a new user must enter before promotion to trust level 1."
@@ -679,6 +722,7 @@ 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."
+    dark_mode_none: "Ništa"
     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."
@@ -695,6 +739,7 @@ bs_BA:
     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."
+    allowed_spam_host_domains: "A list of domains excluded from spam host testing. New users will never be restricted from creating posts with links to these domains."
     levenshtein_distance_spammer_emails: "When matching spammer emails, number of characters difference that will still allow a fuzzy match."
     min_ban_entries_for_roll_up: "Kada kliknete tipku Roll up, stvorit ćete novi unos za subnet ban ako ima najmanje (N) unosa."
     reply_by_email_enabled: "Enable replying to topics via email."
@@ -731,7 +776,6 @@ bs_BA:
     embed_truncate: "Truncate the embedded posts."
     embed_post_limit: "Maximum number of posts to embed."
     show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
-    prevent_anons_from_downloading_files: "Prevent anonymous users from downloading files. WARNING: this will prevent any site assets posted as attachments from working."
     enable_emoji: "Omogući smajlije"
     default_other_skip_new_user_tips: "Preskoči savjete i upute za novoregistrirane korisnike."
     errors:
@@ -772,6 +816,7 @@ bs_BA:
     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č."
+    security_key_support_missing_error: "Vaš trenutni uređaj ili preglednik ne podržava korištenje sigurnosnih ključeva. Molimo koristite drugačiju metodu."
     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."
@@ -789,6 +834,8 @@ bs_BA:
     missing_user_field: "You have not completed all the user fields"
     click_to_continue: "Klikni ovdje da nastavite dalje"
     second_factor_backup_description: "Molim ukucajte jedan od vaši rezevni kodova"
+    second_factor_toggle:
+      backup_code: "Umjesto toga koristite sigurnosni kod"
   admin:
     email:
       sent_test: "sent!"
@@ -815,10 +862,14 @@ bs_BA:
     ignored: "Thanks for letting us know. We're looking into it."
     ignored_and_deleted: "Thanks for letting us know. We've removed the post."
   system_messages:
+    queued_by_staff:
+      title: "Post treba odobrenje"
     welcome_user:
       subject_template: "Dobrodošli na %{site_name}!"
     welcome_invite:
       subject_template: "Dobrodošli na %{site_name}!"
+    tl2_promotion_message:
+      subject_template: "Čestitamo na povišenju vašeg nivoa povjerenja!"
     backup_succeeded:
       subject_template: "Backup completed successfully"
     backup_failed:
@@ -889,6 +940,8 @@ bs_BA:
       title: "Postavi šifru"
     signup_after_approval:
       subject_template: "You've been approved on %{site_name}!"
+    post_approved:
+      title: "Vaš post je odobren"
   page_not_found:
     popular_topics: "Popularno"
     recent_topics: "Nove"
@@ -923,6 +976,7 @@ bs_BA:
     sender_body_blank: "body is blank"
   color_schemes:
     base_theme_name: "Base"
+    default_theme_name: "Uobičajen"
   edit_this_page: "Edit this page"
   csv_export:
     boolean_yes: "Da"
@@ -1013,8 +1067,16 @@ bs_BA:
         fields:
           contact_email:
             placeholder: "name@example.com"
+          contact_url:
+            placeholder: "https://www.example.com/contact-us"
       corporate:
         title: "Organizacija"
+      colors:
+        title: "Colors"
+      fonts:
+        fields:
+          font_preview:
+            label: "Pregled"
       homepage:
         fields:
           homepage_style:
@@ -1027,8 +1089,6 @@ bs_BA:
                 label: "Kategorije i Novije teme"
               categories_and_top_topics:
                 label: "Kategorije i Top teme"
-      emoji:
-        title: "Emoji"
   joined: "Registrovan"
   discourse_push_notifications:
     popup:
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index dfea4cf7b6..5c840a7995 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -39,6 +39,7 @@ ca:
   title: "Discourse"
   topics: "Temes"
   posts: "publicacions"
+  views: "vistes"
   loading: "Carregant"
   powered_by_html: 'Funciona gràcies a <a href="https://www.discourse.org">Discourse</a>. Per a una millor experiència visiteu-nos amb JavaScript activat.'
   sign_up: "Registre"
@@ -50,6 +51,8 @@ ca:
   remove_posts_deleted_by_author: "Suprimit per l'autor"
   redirect_warning: "No hem pogut comprovar que l'enllaç que heu seleccionat s'hagi enviat al fòrum. Si així i tot voleu continuar, feu clic en l'enllaç següent."
   on_another_topic: "Sobre un altre tema"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} per %{username}"
   themes:
     bad_color_scheme: "No es pot actualitzar l'aparença, paleta de colors incorrecta"
     other_error: "S'ha produït un error mentre s'actualitzava l'aparença"
@@ -156,7 +159,6 @@ ca:
         one: té una mida errònia (hauria de contenir %{count} caràcter)
         other: té una longitud errònia (hauria de contenir %{count} caràcters)
       other_than: "ha de ser diferent de %{count}"
-      sso_overrides_username: "El nom d’usuari s’ha d’actualitzar en el proveïdor SSO, ja que la configuració `sso_overrides_username` està habilitada."
     template:
       body: ! "Hi ha hagut problemes amb els següents camps:"
       header:
@@ -178,9 +180,10 @@ ca:
   invite:
     not_found: "El testimoni d'invitació no és vàlid. <a href='%{base_url}/about'>Poseu-vos en contacte amb l'equip responsable</a>."
     not_found_json: "El testimoni d'invitació no és vàlid. Poseu-vos en contacte amb l'equip responsable."
-    error_message: "Hi ha hagut un error en acceptar la invitació. Contacteu amb l'administrador del lloc web."
     user_exists: "No cal convidar <b>%{email}</b>, <a href='%{base_path}/u/%{username}/summary'>ja tenen un compte!</a>"
     confirm_email: "<p>Gairebé heu acabat! Hem enviat un missatge d'activació a la vostra adreça de correu. Seguiu les instruccions en el missatge per a activar el compte.</p><p>Si no arriba, comproveu la carpeta de correu brossa.</p>"
+    disabled_errors:
+      invalid_access: "No teniu permís per a veure el recurs sol·licitat."
   bulk_invite:
     file_should_be_csv: "El fitxer carregat hauria de tenir format CSV."
     max_rows: "S'han enviat les primeres %{max_bulk_invites} invitacions. Proveu de dividir el fitxer en parts més petites."
@@ -283,6 +286,9 @@ 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}' "
+  rss_num_posts:
+    one: "%{count} publicació"
+    other: "%{count} publicacions"
   read_full_topic: "Llegeix tot el tema"
   private_message_abbrev: "Missatge"
   rss_description:
@@ -309,9 +315,11 @@ ca:
   bookmarks:
     reminders:
       later_today: "Més tard avui"
+      next_business_day: "El pròxim dia feiner"
       tomorrow: "Demà"
       next_week: "La setmana que ve"
       next_month: "El mes que ve"
+      custom: "Data i hora personalitzades"
   groups:
     success:
       bulk_add:
@@ -345,26 +353,6 @@ ca:
     until_posts:
       one: "%{count} publicació"
       other: "%{count} publicacions"
-    "new-topic": |
-      Us donem la benvinguda a %{site_name} &mdash; **gràcies per obrir una nova conversa!**
-
-      - El títol sona interessant si el llegiu en veu alta? És un bon resum?
-
-      - Qui pot interessar-s'hi? Per què és important? Quina mena de reaccions voleu?
-
-      - Incloeu mots emprats sovint en el tema perquè la resta el puguin *trobar*. Per a agrupar el vostre tema amb altres relacionats, trieu una categoria.
-
-      Per a saber-ne més, [doneu un cop d'ull a la guia de la comunitat](%{base_path}/guidelines). Aquest avís sols apareixerà per al vostre primer %{education_posts_text}.
-    "new-reply": |
-      Benvingut a %{site_name}. **Gràcies per col·laborar!**
-
-      - La vostra resposta millora d'alguna manera la conversa?
-
-      - Siguem amables amb la resta de membres de la comunitat.
-
-      - Les crítiques constructives són benvingudes, però per a criticar *idees* no pas persones.
-
-      Per a saber-ne més, [doneu un cop d'ull a la guia de la comunitat](%{base_path}/guidelines). Aquest avís només apareixerà en el vostre primer/la vostra primera %{education_posts_text}.
     avatar: |
       ### Què us sembla si poseu una fotografia per al vostre compte?
 
@@ -559,20 +547,8 @@ ca:
     slow_down: "Heu fet aquesta acció moltes vegades. Torneu-ho a provar més tard."
     too_many_requests: "Heu fet aquesta acció moltes vegades. Espereu %{time_left} abans de tornar-ho a provar."
     by_type:
-      first_day_replies_per_day: "Heu arribat al nombre màxim de respostes que un nou usuari pot crear el primer dia. Espereu %{time_left} abans de tornar-ho a provar."
-      first_day_topics_per_day: "Heu arribat al nombre màxim de temes que un usuari nou pot crear el primer dia. Espereu %{time_left} abans de tornar-ho a provar."
-      create_topic: "Creeu temes massa de pressa. Espereu %{time_left} abans de tornar-ho a provar."
-      create_post: "Responeu massa de pressa. Espereu %{time_left} abans de tornar-ho a provar."
-      delete_post: "Suprimiu publicacions massa de pressa. Espereu %{time_left} abans de tornar-ho a provar."
-      public_group_membership: "Us uniu a grups o els deixeu amb massa freqüència. Espereu %{time_left} abans de tornar-ho a provar."
-      topics_per_day: "Heu arribat al nombre màxim de temes nous. Espereu %{time_left} abans de tornar-ho a provar."
-      pms_per_day: "Heu arribat al nombre màxim de missatges. Espereu %{time_left} abans de tornar-ho a provar."
-      create_like: "Heu arribat al nombre màxim de 'M'agrada'. Espereu %{time_left} abans de tornar-ho a provar."
-      create_bookmark: "Heu arribat al nombre màxim d'adreces d'interès. Espereu %{time_left} abans de tornar-ho a provar."
-      edit_post: "Heu arribat al nombre màxim d'edicions. Espereu %{time_left} abans de tornar-ho a provar."
       live_post_counts: "Sol·liciteu recomptes de publicacions en directe massa de pressa. Espereu %{time_left} abans de tornar-ho a provar."
       unsubscribe_via_email: "Heu arribat al nombre màxim de cancel·lacions de subscripcions per correu electrònic. Espereu %{time_left} abans de tornar-ho a provar."
-      topic_invitations_per_day: "Heu arribat al nombre màxim d'invitacions al tema. Espereu %{time_left} abans de tornar-ho a provar."
     hours:
       one: "%{count} hora"
       other: "%{count} hores"
@@ -676,7 +652,6 @@ ca:
       unknown: "navegador desconegut"
     device:
       android: "Dispositiu Android"
-      chromebook: "Chromebook"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -687,7 +662,6 @@ ca:
       unknown: "dispositiu desconegut"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -844,9 +818,7 @@ ca:
     mute_topic: "Silencia totes les notificacions per a aquest tema, %{link}"
     unwatch_category: "Deixa de vigilar tots els temes en %{category}"
     mailing_list_mode: "Apaga el mode de llista de correu"
-    all: "No m'enviïs cap correu de %{sitename}"
     different_user_description: "Actualment heu iniciat la sessió amb una identitat diferent d'aquella a la qual hem enviat un correu. Tanqueu la sessió o entreu anònimament, i torneu a provar-ho."
-    not_found_description: "No hem pogut trobar aquesta cancel·lació de subscripció. És possible que hagi caducat l'enllaç en el vostre correu?"
     log_out: "Tanca la sessió"
     submit: "Desa les preferències"
     digest_frequency:
@@ -1013,6 +985,7 @@ ca:
       labels:
         level: Nivell
       description: "Nombre d'usuaris agrupats per nivell de confiança."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Usuaris per tipus"
       xaxis: "Tipus"
@@ -1223,7 +1196,6 @@ ca:
     force_https_warning: "El vostre lloc web utilitza SSL. Però ` <a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https`</a> encara no és activat en la configuració del vostre lloc web."
     out_of_date_themes: "Hi ha actualitzacions disponibles per a les aparences següents:"
     unreachable_themes: "No hem pogut comprovar si hi ha actualitzacions de les aparences següents:"
-    watched_word_regexp_error: "L'expressió regular de les paraules vigilades %{action} no és vàlida. Comproveu la <a href='%{base_path}/admin/logs/watched_words'>configuració de les paraules vigilades</a> o desactiveu el paràmetre de configuració 'les paraules vigilades són expressions regulars'."
   site_settings:
     censored_words: "Paraules que es reemplaçaran automàticament amb &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Suprimeix automàticament qualsevol publicació que resti oculta durant més de 30 dies."
@@ -1248,10 +1220,8 @@ ca:
     search_query_log_max_size: "Nombre màxim de cerques que cal conservar"
     search_query_log_max_retention_days: "Temps màxim que es mantenen les cerques, en dies."
     search_ignore_accents: "Ignora els accents en cercar text."
-    category_search_priority_very_low_weight: "Pes aplicat al rànquing per a la prioritat molt baixa de cerca de categories."
     category_search_priority_low_weight: "Pes aplicat al rànquing per a la prioritat baixa de cerca de categories."
     category_search_priority_high_weight: "Pes aplicat al rànquing per a la prioritat alta de cerca de categories."
-    category_search_priority_very_high_weight: "Pes aplicat al rànquing per a la prioritat molt alta de cerca de categories."
     allow_uncategorized_topics: "Permet crear temes sense categoria. ATENCIÓ: si hi ha temes sense categoria, haureu de categoritzar-los abans de desactivar aquesta opció."
     allow_duplicate_topic_titles: "Permet temes amb títols idèntics, duplicats."
     unique_posts_mins: "Quants minuts abans que un usuari pugui fer una publicació amb el mateix contingut una altra vegada"
@@ -1260,7 +1230,6 @@ ca:
     site_description: "Descriviu el lloc web amb una frase per a la metaetiqueta de descripció."
     short_site_description: "Descripció breu per a l'etiqueta de títol de la pàgina d'inici."
     contact_email: "Adreça de correu de contacte del responsable del lloc web. S'utilitza per a notificacions crítiques, i també per al formulari de contacte <a href='%{base_path}/about' target='_blank'>/about</a> per a qüestions urgents."
-    contact_url: "URL de contacte per a aquest lloc web. S'utilitza en el formulari de contacte <a href='%{base_path}/about' target='_blank'>/about</a> per a qüestions urgents."
     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)"
@@ -1284,6 +1253,8 @@ ca:
     show_pinned_excerpt_mobile: "Mostra l'extracte en els temes afixats en la vista per a mòbils."
     show_pinned_excerpt_desktop: "Mostra l'extracte en els temes afixats en la vista d'escriptori."
     post_onebox_maxlength: "Longitud màxima en caràcters d'una publicació en onebox de Discourse."
+    blocked_onebox_domains: "Llista de dominis que no es posaran mai en onebox."
+    allowed_inline_onebox_domains: "Llista de dominis que es mostraran en miniatura 'onebox' si s'enllacen sense títol"
     max_oneboxes_per_post: "Nombre màxim de onebox en una publicació"
     logo: "La imatge del logotip a la part superior esquerra del vostre lloc web. Utilitzeu una imatge rectangular ampla amb una alçada de 120 i una relació d'aspecte superior a 3: 1. Si es deixa en blanc, es mostrarà el text del títol del lloc web."
     logo_small: "Imatge petita del logotip a la part superior esquerra del lloc web, que es veu quan es fa un desplaçament cap avall. Utilitzeu una imatge quadrada de 120 × 120. Si es deixa en blanc, es mostrarà un glif d'estar per casa."
@@ -1300,7 +1271,6 @@ ca:
     email_subject: "Format d'assumpte personalitzable per a correus electrònics estàndard. Vegeu <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: "Proporciona més detalls als usuaris sobre per què no poden accedir a un tema concret. Nota: això és menys segur perquè els usuaris sabran si un URL enllaça amb un tema vàlid."
     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"
@@ -1338,7 +1308,11 @@ ca:
     maximum_session_age: "L'usuari romandrà amb la sessió iniciada durant n hores des de la darrera visita"
     enable_escaped_fragments: "Torna a l'API Ajax-Crawling de Google si no es detecta cap rastrejador web. Consulteu <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>."
     cors_origins: "Orígens permesos per a peticions d'origen encreuat (CORS). Cada origen ha d'incloure http:// o https://. La variable DISCOURSE_ENABLE_CORS ha de ser \"true\" per a habilitar CORS."
+    use_admin_ip_allowlist: "Els administradors sols poden iniciar la sessió des d'una adreça IP definida en la llista d'IPs sota supervisió (Administració > Registres > IPs sota supervisió)."
+    blocked_ip_blocks: "Una llista de blocs d'IP privades que no han de ser rastrejats mai per Discourse"
+    allowed_internal_hosts: "Llista d'amfitrions interns que Discourse pot rastrejar de manera segura per a onebox i altres finalitats."
     allowed_iframes: "Llista dels prefixos de domini en el codi d'iframe que Discourse pot permetre de manera segura en les publicacions"
+    allowed_crawler_user_agents: "Agents d'usuari dels rastrejadors web als quals es permet accedir al lloc web. ATENCIÓ! ESTABLIR AIXÒ IMPEDIRÀ ACTUAR A TOTS ELS RASTREJADORS NO LLISTATS AQUÍ!"
     slow_down_crawler_user_agents: "Agents d'usuari dels rastrejadors web que haurien de ser limitats en robots.txt utilitzant la directiva de retard (Crawl-delay)."
     slow_down_crawler_rate: "Si s'especifica slow_down_crawler_user_agents, aquesta ràtio s'aplicarà a tots els rastrejadors (nombre de segons de retard entre les sol·licituds)."
     content_security_policy: "Activa Content-Security-Policy (CSP)"
@@ -1369,6 +1343,8 @@ ca:
     enable_badges: "Activa el sistema d'insígnies."
     enable_whispers: "Permet la comunicació privada de l'equip responsable dins dels temes."
     allow_index_in_robots_txt: "Especifiqueu en robots.txt que els motors de cerca web poden indexar aquest lloc. En casos excepcionals, podeu <a href='%{base_path}/admin/customize/robots'>substituir robots.txt</a> de manera permanent."
+    blocked_email_domains: "Llista de dominis de correu delimitada amb barres verticals amb els quals  els usuaris no poden registrar comptes. Exemple: mailinator.com|trashmail.net"
+    allowed_email_domains: "Llista de dominis de correu delimitada amb barres verticals amb els quals els usuaris HAN DE registrar els comptes. ATENCIÓ: Els usuaris amb dominis de correu diferents dels llistats no són autoritzats!"
     hide_email_address_taken: "No informis els usuaris que hi ha un compte amb una adreça de correu determinada durant el registre i des del formulari de contrasenya oblidada."
     log_out_strict: "Quan es tanca la sessió, tanca TOTES les sessions de l'usuari en tots els dispositius"
     version_checks: "Fes ping al Discourse Hub per a actualitzacions de versions i per a mostrar missatges de versió nova en el tauler <a href='%{base_path}/admin' target='_blank'>/admin</a>."
@@ -1384,20 +1360,7 @@ ca:
     min_admin_password_length: "Longitud mínima de la contrasenya per a administrador"
     password_unique_characters: "Nombre mínim de caràcters únics que ha de tenir una contrasenya."
     block_common_passwords: "No permetis contrasenyes que siguin de les 10.000 més comunes."
-    enable_sso: "Activa l'autenticació única des d'un lloc web extern (ATENCIÓ: LES ADRECES DE CORREU *HAN* DE SER VALIDADES PER UN LLOC EXTERN!)"
-    verbose_sso_logging: "Registres detallats de diagnòstics relacionats amb SSO en <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    enable_sso_provider: "Implementeu el protocol de proveïdor SSO de Discourse en el punt final /session/sso_provider. Requereix que sso_provider_secrets estigui establert."
-    sso_url: "Adreça URL d'autenticació única en el punt final (ha d'incloure http:// o https://)"
-    sso_secret: "Cadena secreta emprada per a autenticar criptogràficament la informació SSO. Assegureu-vos que té 10 caràcters o més."
-    sso_provider_secrets: "Llista de parells domini-secret que utilitzen Discourse com a proveïdor SSO. Assegureu-vos que el secret SSO tingui 10 caràcters o més. El símbol de comodí * es pot utilitzar per a fer coincidir qualsevol domini o només una part d'aquest (p. ex. *.example.com)."
-    sso_overrides_bio: "Sobreescriu la biografia d'usuari en el perfil i impedeix que es pugui canviar"
-    sso_overrides_groups: "Sincronitza totes les afiliacions de grup manuals amb els grups especificats en l'atribut SSO de grups (ADVERTÈNCIA: Si no especifiqueu grups, s'eliminaran totes les afiliacions de grup manuals per a l'usuari)"
-    sso_overrides_avatar: "Substitueix l'avatar de l'usuari amb l'avatar del lloc web extern de la càrrega útil SSO. Si està activat, els usuaris no podran pujar avatars a Discourse."
-    sso_overrides_profile_background: "Sobreescriu el fons del perfil d'usuari amb un avatar d'un lloc web extern de la càrrega útil SSO."
-    sso_overrides_card_background: "Substitueix el fons de la targeta d'usuari amb un avatar de lloc web extern de la càrrega útil SSO."
-    sso_not_approved_url: "Redirigeix els comptes SSO no aprovats a aquest URL"
-    sso_allows_all_return_paths: "No restringeixis el domini per a return_paths facilitat per SSO (per defecte el camí de retorn ha de ser el lloc web actual)."
-    enable_local_logins: "Habilita els comptes basats en nom d'usuari local i inici de sessió amb contrasenya. Cal habilitar aquesta opció perquè funcionin les invitacions. ADVERTÈNCIA: si està desactivada, és possible que no pugueu iniciar la sessió si no heu configurat prèviament com a mínim un mètode d'inici de sessió alternatiu."
+    discourse_connect_overrides_bio: "Sobreescriu la biografia d'usuari en el perfil i impedeix que es pugui canviar"
     enable_local_logins_via_email: "Permet als usuaris sol·licitar un enllaç d'inici de sessió d'un sol clic que se'ls enviarà per correu electrònic."
     allow_new_registrations: "Permet nous registres d'usuari. Desmarqueu-ho per a evitar que qualsevol pugui crear un compte nou."
     enable_signup_cta: "Mostra un avís als usuaris anònims que tornin convidant-los a registrar-se amb un compte."
@@ -1434,7 +1397,6 @@ ca:
     top_topics_formula_log_views_multiplier: "valor del multiplicador (n) de vistes (en logaritme) en la fórmula de temes principals: `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: "valor del multiplicador (n) dels 'M'agrada' de la primera publicació en la fórmula de temes principals: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "valor del multiplicador (n) de publicacions amb menys 'M'agrada' en la fórmula de temes principals: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Nombre de publicacions antigues que es regeneren cada 15 minuts."
     enable_safe_mode: "Permet als usuaris entrar en el mode segur per a depurar els connectors (plugins)."
     rate_limit_create_topic: "Després de crear un tema, els usuaris han d'esperar (n) segons abans de crear-ne un altre."
     rate_limit_create_post: "Després de fer una publicació, els usuaris han d'esperar (n) segons abans de fer-ne una altra."
@@ -1449,8 +1411,6 @@ ca:
     max_topic_invitations_per_day: "Nombre màxim d'invitacions a temes que un usuari pot enviar cada dia."
     max_logins_per_ip_per_hour: "Nombre màxim de connexions permeses per adreça IP per hora"
     max_logins_per_ip_per_minute: "Nombre màxim de connexions permeses per adreça IP per minut"
-    max_post_deletions_per_minute: "Nombre màxim de publicacions que pot suprimir un usuari per minut."
-    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)."
@@ -1481,7 +1441,6 @@ ca:
     strip_image_metadata: "Retireu les metadades de la imatge."
     min_ratio_to_crop: "Relació utilitzada per a retallar imatges altes. Introduïu el resultat d'amplada/alçada."
     simultaneous_uploads: "Nombre màxim de fitxers que es poden arrossegar i deixar anar en el tauler de redacció"
-    enable_flash_video_onebox: "Habilita la incrustació d'enllaços swf i flv (Adobe Flash) en onebox. ATENCIÓ: Pot comportar riscos de seguretat."
     default_invitee_trust_level: "Nivell de confiança per defecte (0-4) per a usuaris convidats."
     default_trust_level: "Nivell de confiança (0-4) per defecte per a tots els usuaris nous. ATENCIÓ! En canviar-ho us exposeu a un risc seriós de brossa."
     tl1_requires_topics_entered: "Quants temes ha d'introduir un usuari nou abans de ser promogut al nivell de confiança 1."
@@ -1517,6 +1476,7 @@ ca:
     min_trust_to_send_messages: "Nivell de confiança mínim necessari per a crear nous missatges personals."
     min_trust_to_flag_posts: "Nivell de confiança mínim necessari per a marcar amb bandera les publicacions"
     min_trust_to_post_links: "Nivell de confiança mínim necessari per a incloure enllaços en els missatges"
+    allowed_link_domains: "Dominis als quals els usuaris poden enllaçar fins i tot si no tenen el nivell de confiança adequat per a publicar enllaços"
     newuser_max_links: "Quants enllaços pot afegir un usuari nou a una publicació."
     newuser_max_attachments: "Quants adjunts pot afegir un usuari nou a una publicació"
     newuser_max_mentions_per_post: "Nombre màxim de mencions a @usuaris que un usuari nou pot usar en una publicació."
@@ -1539,6 +1499,7 @@ 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."
+    dark_mode_none: "Cap"
     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)"
@@ -1566,6 +1527,7 @@ ca:
     privacy_policy_url: "Si teniu un document de política de privacitat que voleu utilitzar allotjat en un altre lloc, faciliteu l'adreça URL completa aquí."
     log_anonymizer_details: "Si s'han de mantenir o no els detalls d'un usuari en el registre (log) després de ser anonimitzat. Si compliu amb GDPR, heu de desactivar-ho."
     newuser_spam_host_threshold: "Quantes vegades un usuari nou pot publicar un enllaç al mateix amfitrió dins de les seves `newuser_spam_host_threshold` publicacions abans de ser considerat brossa."
+    allowed_spam_host_domains: "Llista de dominis exclosos de la comprovació de brossa. No s'impedirà mai als usuaris nous crear publicacions amb enllaços a aquests dominis."
     topic_view_duration_hours: "Compta una nova vista de tema una vegada per IP/usuari cada N hores"
     user_profile_view_duration_hours: "Compta una nova vista de perfil d'usuari una vegada per IP/usuari cada N hores."
     levenshtein_distance_spammer_emails: "En cercar coincidències de correus brossa, diferència de nombre de caràcters que encara permetrà una coincidència difusa (fuzzy match)."
@@ -1599,6 +1561,7 @@ ca:
     max_emails_per_day_per_user: "Nombre màxim de correus per a enviar als usuaris cada dia. 0 per a inhabilitar el límit"
     enable_staged_users: "Crea automàticament usuaris ficticis en processar correus entrants."
     maximum_staged_users_per_email: "Nombre màxim d'usuaris ficticis creats en processar un correu entrant."
+    auto_generated_allowlist: "Llista d'adreces de correu que no es revisaran per a contingut autogenerat. Per exemple: foo@bar.com|discourse@bar.com."
     block_auto_generated_emails: "Bloca correus entrants identificats com a autogenerats."
     ignore_by_title: "Ignora els correus entrants segons el títol."
     mailgun_api_key: "Clau API secreta de Mailgun emprada per a verificar els missatges webhook."
@@ -1609,7 +1572,6 @@ ca:
     forwarded_emails_behaviour: "Com s'ha de tractar un correu electrònic reenviat a Discourse"
     always_show_trimmed_content: "Mostra sempre la part retallada dels correus entrants. AVÍS: Pot revelar adreces de correu."
     private_email: "No incloguis contingut de publicacions o temes en el títol o el cos del correu electrònic. NOTA: també desactiva els correus electrònics de resum."
-    email_total_attachment_size_limit_kb: "Mida total màxima dels fitxers adjuntats als correus sortints. 0 per a inhabilitar l’enviament d'adjunts."
     post_excerpts_in_emails: "En els correus de notificació, envia sempre fragments en lloc de publicacions completes."
     raw_email_max_length: "Quants caràcters s’han d’emmagatzemar per al correu electrònic entrant."
     raw_rejected_email_max_length: "Quants caràcters s’han d’emmagatzemar per al correu electrònic entrant rebutjat."
@@ -1670,6 +1632,7 @@ ca:
     ignored_users_message_gap_days: "Quant de temps haureu d'esperar abans de notificar de nou als moderadors sobre un usuari ignorat per molts altres."
     clean_up_inactive_users_after_days: "Nombre de dies abans d'eliminar un usuari inactiu (nivell de confiança 0 sense publicacions). Per a desactivar la neteja, poseu 0."
     user_selected_primary_groups: "Permet als usuaris configurar el seu propi grup principal"
+    allowed_user_website_domains: "El lloc web de l'usuari serà verificat contra aquests dominis. Llista delimitada amb barres verticals."
     allow_profile_backgrounds: "Permet que els usuaris carreguin fons de perfil."
     sequential_replies_threshold: "Nombre de publicacions seguides que un usuari ha de fer en un tema abans de ser advertit de fer massa respostes seqüencials."
     get_a_room_threshold: "Nombre de publicacions que un usuari ha de fer al mateix usuari en el mateix tema abans de ser advertit."
@@ -1704,6 +1667,7 @@ ca:
     embed_topics_list: "Permet incrustació HTML de llistes de temes"
     embed_truncate: "Trunca les publicacions incrustades."
     embed_support_markdown: "Admet el format de Markdown per a les publicacions incrustades."
+    allowed_embed_selectors: "Llista separada per comes d'elements CSS permesos en les incrustacions."
     allowed_href_schemes: "Esquemes permesos en enllaços a més de http i https."
     embed_post_limit: "Nombre màxim de publicacions que s'incrusten."
     embed_username_required: "Cal un nom d'usuari per a crear un tema."
@@ -1711,7 +1675,6 @@ ca:
     show_create_topics_notice: "Si el lloc web té menys de 5 temes públics, mostra un avís demanant als administradors que en creï uns quants. "
     delete_drafts_older_than_n_days: "Suprimeix esborranys amb més de (n) dies."
     bootstrap_mode_min_users: "Nombre mínim d'usuaris necessaris per a desactivar el mode d'arrencada (deixeu-ho a 0 per a desactivar-lo)."
-    prevent_anons_from_downloading_files: "Impedeix que els usuaris anònims puguin descarregar fitxers adjunts. ATENCIÓ: Això impedirà que funcioni cap fitxer que no sigui una imatge publicat com a adjunt."
     slug_generation_method: "Trieu un mètode de generació de slugs (adreces amigables). 'encoded' generarà una cadena amb codificacions %. 'none' anul·larà totalment l'adreça amigable."
     enable_emoji: "Activa emojis"
     enable_emoji_shortcuts: "El text típic d'emojis com ara :): p :( serà convertit en emojis."
@@ -1737,7 +1700,6 @@ ca:
     default_email_messages_level: "Definiu el nivell de notificació per correu electrònic predeterminat quan algú envia un missatge a l'usuari."
     default_email_mailing_list_mode: "Envia un correu per cada nova publicació per defecte."
     default_email_mailing_list_mode_frequency: "Els usuaris que activin el mode de llista de correu rebran correus amb aquesta freqüència per defecte."
-    disable_mailing_list_mode: "Impedeix als usuaris activar el mode de llista de correu."
     default_email_previous_replies: "Inclou per defecte les respostes prèvies en els correus."
     default_email_in_reply_to: "Inclou per defecte en els correus l'extracte de la publicació a la qual es respon."
     default_other_new_topic_duration_minutes: "Condició global per defecte en què es considera nou un tema."
@@ -1764,7 +1726,6 @@ ca:
     revoke_api_keys_days: "Nombre de dies abans que una clau d’API no utilitzada sigui revocada  automàticament (0 per a mai)"
     allow_user_api_keys: "Permet la generació de claus API d'usuari"
     allow_user_api_key_scopes: "Llista d'àmbits permesos per a les claus d'API d'usuari"
-    max_api_keys_per_user: "Nombre màxim de claus API personals per usuari"
     min_trust_level_for_user_api_key: "Nivell de confiança necessari per a generar claus API d'usuari."
     allowed_user_api_auth_redirects: "URL permès per a la redirecció d'autenticació per a les claus de l'API d'usuari. El símbol de comodí * es pot utilitzar per a fer coincidir qualsevol part de l'URL (p. ex. www.example.com/*)."
     allowed_user_api_push_urls: "Adreces URL permeses per al 'server push' a l'API d'usuari"
@@ -1774,7 +1735,6 @@ ca:
     max_tags_per_topic: "Nombre màxim d'etiquetes que es poden aplicar a un tema."
     max_tag_length: "Nombre màxim de caràcters que es poden fer servir en una etiqueta."
     max_tag_search_results: "Nombre màxim de resultats que es mostren en cercar etiquetes."
-    show_filter_by_tag: "Mostra un desplegable per a filtrar una llista de temes per etiquetes."
     max_tags_in_filter_list: "Nombre màxim d'etiquetes que es mostren en el filtre desplegable. S'hi mostraran les etiquetes més emprades."
     tags_sort_alphabetically: "Mostra les etiquetes per ordre alfabètic. Per defecte es mostren ordenades per popularitat."
     tags_listed_by_group: "Llista les etiquetes per grups d'etiquetes en la <a href='%{base_path}/tags' target='_blank'>pàgina d'etiquetes</a>."
@@ -1818,24 +1778,20 @@ ca:
       email_editable_enabled: "Cal desactivar \"editable per correu\" abans d'activar aquest paràmetre."
       staged_users_disabled: "Cal activar 'usuaris ficticis' abans d'activar aquest paràmetre."
       reply_by_email_disabled: "Cal habilitar primer 'resposta per correu' abans d'habilitar aquesta opció."
-      sso_url_is_empty: "Cal definir un 'URL SSO' abans d'habilitar aquesta opció."
-      sso_invite_only: "No podeu habilitar SSO i `invite_only` al mateix temps."
       enable_local_logins_disabled: "Primer cal habilitar \"habilita els inicis de sessió locals\" abans d'habilitar aquesta opció."
       min_username_length_exists: "No podeu establir la longitud mínima del nom d'usuari per damunt del nom d'usuari més curt (%{username})."
       min_username_length_range: "No podeu definir el mínim per damunt del màxim."
       max_username_length_exists: "No podeu establir la longitud màxima del nom d'usuari per sota del nom d'usuari més llarg (%{username})."
       max_username_length_range: "No podeu definir el màxim per sota del mínim."
       invalid_hex_value: "Els valors de color han de ser codis hexadecimals de 6 dígits."
-      category_search_priority:
-        very_low_weight_invalid: "No podeu establir un pes més gran que 'category_search_priority_low_weight'."
-        low_weight_invalid: "No podeu establir que el pes sigui més gran que o igual a 1 o més petit que 'category_search_priority_very_low_weight'."
-        very_high_weight_invalid: "No podeu establir que el pes sigui més petit que 'category_search_priority_high_weight'."
+      allowed_unicode_usernames:
+        regex_invalid: "L'expressió regular no és vàlida: %{error}"
+        leading_trailing_slash: "L'expressió regular no ha de començar ni acabar amb una barra inclinada."
       unicode_usernames_avatars: "Els avatars de sistema interns no admeten noms d'usuari amb caràcters Unicode."
       list_value_count: "La llista ha de contenir exactament %{count} valors."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "Secret SSO"
   search:
     extreme_load_error: "El lloc web està sota una càrrega extrema, la cerca està desactivada, torneu-ho a provar més tard."
     within_post: "#%{post_number} per %{username}"
@@ -1846,7 +1802,7 @@ ca:
     results_page: "Resultats de la cerca per a '%{term}'"
     audio: "[àudio]"
     video: "[vídeo]"
-  sso:
+  discourse_connect:
     login_error: "Error d'inici de sessió"
     not_found: "No s'ha trobat el vostre compte. Contacteu amb l'administrador del lloc web."
     account_not_approved: "El vostre compte està pendent d'aprovació. Rebreu un correu d'avís quan sigui aprovat."
@@ -1854,7 +1810,6 @@ ca:
     timeout_expired: "La connexió del compte ha caducat. Torneu-ho a provar."
     no_email: "No s'ha proporcionat cap adreça de correu electrònic. Poseu-vos en contacte amb l'administrador del lloc web."
     email_error: "No s'ha pogut registrar un compte amb l'adreça <b>%{email}</b>. Poseu-vos en contacte amb l'administrador del lloc web."
-    missing_secret: "S'ha produït un error en l'autenticació SSO perquè manca el secret. Poseu-vos en contacte amb els administradors del lloc per a solucionar el problema."
   original_poster: "Autor original"
   most_posts: "La majoria de publicacions"
   most_recent_poster: "Qui ha publicat més recentment"
@@ -2096,6 +2051,8 @@ ca:
       title: "Publicació amagada una altra vegada"
       subject_template: "Publicació amagada per les banderes de la comunitat. S'ha notificat l'equip responsable. "
       text_body_template: "Bon dia, \n\nAixò és un missatge automàtic de %{site_name} per a fer-vos saber que la vostra publicació ha estat amagada de nou. \n\n<%{base_url}%{url}>\n\n%{flag_reason} \n\nDiversos membres de la comunitat han marcat amb bandera aquesta publicació i ara és amagada. **Atès que la publicació ha estat amagada més d'una vegada, romandrà amagada fins que no sigui revisada per un membre de l'equip responsable.** \n\nPer a obtenir més informació, consulteu les nostres [directrius comunitàries](%{base_url}/guidelines).\n"
+    queued_by_staff:
+      title: "Cal aprovar la publicació"
     flags_disagreed:
       title: "Publicació marcada amb bandera restablerta per l'equip responsable"
       subject_template: "Publicació marcada amb bandera restablerta per l'equip responsable"
@@ -2103,7 +2060,6 @@ ca:
     flags_agreed_and_post_deleted:
       title: "Publicació marcada amb bandera eliminada per l'equip responsable"
       subject_template: "Publicació marcada amb bandera eliminada per l'equip responsable"
-      text_body_template: "Bon dia,\n\nAquest és un missatge automàtic de %{site_name} per a fer-vos saber que [el vostre missatge](%{base_url}%{url}) s'ha eliminat.\n\n %{flag_reason}\n\nLa comunitat ha marcat aquest missatge amb una bandera, i un membre de l'equip responsable ha optat per eliminar-lo. \n\n[details = 'Feu clic per a ampliar la publicació eliminada']\n``` markdown \n%{flagged_post_raw_content}\n```\n[/details]\n\nConsulteu les nostres [directrius comunitàries](%{base_url}/guidelines) per a obtenir més informació.\n"
     usage_tips:
       text_body_template: "Per a obtenir uns quants consells ràpids sobre com començar com a usuari nou, [consulteu aquesta entrada del bloc](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/). \n\nA mesura que hi participeu, us coneixerem i es retiraran les limitacions temporals d'usuari nou. Amb el pas del temps guanyareu [nivells de confiança](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) que inclouen capacitats especials per a ajudar-nos a gestionar la comunitat junts.\n"
     welcome_user:
@@ -2131,6 +2087,8 @@ ca:
       title: "Benvingut convidat"
       subject_template: "Benvingut a %{site_name}!"
       text_body_template: "Gràcies per acceptar la invitació a %{site_name}. Benvingut!\n\n- Us hem creat el compte **%{username}**. Canvieu el nom o la contrasenya visitant [el perfil d'usuari][prefs]. \n\n- Quan inicieu sessió, **utilitzeu la mateixa adreça de correu de la invitació original**. En cas contrari, no podrem dir que sou vós. \n\n%{new_user_tips} \n\nCreiem en un [comportament civilitzat de la comunitat](%{base_url}/guidelines) en tot moment. Gaudiu de l'estada!\n\n[prefs]: %{user_preferences_url}\n"
+    tl2_promotion_message:
+      subject_template: "Enhorabona per la vostra promoció de nivell de confiança!"
     backup_succeeded:
       title: "Còpia de seguretat reeixida"
       subject_template: "Còpia de seguretat completada amb èxit"
@@ -2589,11 +2547,9 @@ ca:
     account_suspended:
       title: "Compte suspès"
       subject_template: "[%{email_prefix}] El vostre compte ha estat suspès."
-      text_body_template: "Heu estat suspès en el fòrum fins a %{suspended_till}. \n\n%{reason} \n\n%{message}\n"
     account_silenced:
       title: "Compte silenciat"
       subject_template: "[%{email_prefix}] El vostre compte ha estat silenciat"
-      text_body_template: "Heu estat silenciat del fòrum fins a %{silenced_till}.\n\n %{reason} \n\n%{message}\n"
     account_exists:
       title: "El compte ja existeix"
       subject_template: "[%{email_prefix}] El compte ja existeix"
@@ -2642,6 +2598,9 @@ ca:
     confirm_new_email:
       title: "Confirmeu l'adreça de correu nova"
       subject_template: "[%{email_prefix}] Confirmeu la vostra nova adreça de correu"
+    confirm_new_email_via_admin:
+      title: "Confirmeu l'adreça de correu nova"
+      subject_template: "[%{email_prefix}] Confirmeu la vostra nova adreça de correu"
     confirm_old_email:
       title: "Confirmeu l'adreça de correu antiga"
       subject_template: "[%{email_prefix}] Confirmeu la vostra adreça de correu actual"
@@ -2668,6 +2627,8 @@ ca:
       title: "Notificació d'inici de sessió nou"
       subject_template: "[%{site_name}] Inici de sessió nou des de %{location}"
       text_body_template: "Bon dia, \n\nHem notat un inici de sessió des d'un dispositiu o una ubicació que normalment no utilitzeu. Heu estat vós? \n\n- Ubicació: %{location} (%{client_ip}) \n- Navegador: %{browser} \n- Dispositiu: %{device} - %{os} \n\nSi heu estat vós, perfecte! No cal fer res més. \n\nSi no heu estat vós, [reviseu les vostres sessions existents](%{base_url}/my/preferences/account) i considereu canviar la contrasenya.\n"
+    post_approved:
+      title: "La vostra publicació ha estat aprovada"
   page_not_found:
     title: "Ai! Aquesta pàgina no existeix o és privada."
     popular_topics: "Populars"
@@ -2740,6 +2701,7 @@ ca:
     latte: "Latte"
     summer: "Estiu"
     dark_rose: "Rosa fosc"
+    default_theme_name: "Per defecte"
     light_theme_name: "Clar"
     dark_theme_name: "Fosc"
     neutral_theme_name: "Neutre"
@@ -3026,9 +2988,6 @@ ca:
       restricted_to:
         one: '"%{tag_name}" està restringit a la categoria "%{category_names}"'
         other: '"%{tag_name}" és restringit a les següents categories: %{category_names}'
-    required_tags_from_group:
-      one: "Heu d’incloure almenys %{count} etiqueta %{tag_group_name}."
-      other: "Heu d’incloure com a mínim %{count} etiquetes %{tag_group_name}."
   rss_by_tag: "Temes etiquetats amb %{tag}"
   finish_installation:
     congratulations: "Enhorabona, heu instal·lat Discourse!"
@@ -3128,6 +3087,12 @@ ca:
           city_for_disputes:
             label: "Ciutat per a les disputes"
             placeholder: "San Francisco, Califòrnia"
+      colors:
+        title: "Colors"
+      fonts:
+        fields:
+          font_preview:
+            label: "Previsualitza"
       logos:
         title: "Logos"
         fields:
@@ -3166,9 +3131,6 @@ ca:
                 label: "Quadres de categories"
               categories_boxes_with_topics:
                 label: "Quadres de categories amb temes"
-      emoji:
-        title: "Emoji"
-        description: "¿Quin estil d'Emoji us estimeu més per a la vostra comunitat? Més tard podeu afegir-hi més emojis personalitzats, en Administració > Personalitza > Emoji."
       invites:
         title: "Convida l'equip responsable"
         description: "Esteu a punt d'acabar! Convidem unes quantes persones a ajudar a <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>generar les discussions</a> amb temes i respostes interessants per a posar en marxa la comunitat."
@@ -3223,7 +3185,6 @@ ca:
       new_topics_unless_trust_level: "Els temes dels usuaris amb nivells baixos de confiança han de ser aprovats per l'equip responsable. Vegeu `approve_new_topics_unless_trust_level`."
       fast_typer: "Un usuari nou ha escrit la seva primera publicació sospitosament de pressa. És un comportament sospitós de bot o de generador de brossa. Vegeu `min_first_post_typing_time`."
       auto_silence_regexp: "Usuari nou el primer missatge del qual coincideix amb el paràmetre `auto_silence_first_post_regex`."
-      watched_word: "Aquesta publicació incloïa una paraula vigilada. Vegeu la vostra <a href='%{base_url}/admin/logs/watched_words'>llista de paraules vigilades</a> ."
       staged: "Els temes i les publicacions noves per a usuaris ficticis han de ser aprovats per l'equip responsable. Vegeu `approve_unless_staged`."
       category: "Les publicacions d'aquesta categoria requereixen l'aprovació manual de l'equip responsable. Vegeu la configuració de la categoria."
       must_approve_users: "Tots els usuaris nous han de ser aprovats per l'equip responsable. Vegeu `must_approve_users`."
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 553373387d..e41b539e30 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -15,6 +15,7 @@ cs:
       short_no_year: "%-d. %B"
       date_only: "%-d %B %Y"
       long: "%B %-d, %Y, %l:%M%P"
+      no_day: "%B %Y"
   date:
     month_names:
     - null
@@ -38,6 +39,7 @@ cs:
   title: "Discourse"
   topics: "Témata"
   posts: "příspěvky"
+  views: "zobrazení"
   loading: "Nahrávám"
   powered_by_html: 'Systém běží na <a href="https://www.discourse.org">Discourse</a>, nejlépe funguje se zapnutým JavaScriptem'
   sign_up: "Registrovat se"
@@ -47,6 +49,8 @@ cs:
   disable_remote_images_download_reason: "Stahování obrázků z cizích serverů bylo vypnuto protože na disku není dostatek místa."
   anonymous: "Anonymní"
   remove_posts_deleted_by_author: "Smazáno autorem"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} od %{username}"
   themes:
     other_error: "Něco se pokazilo při aktualizaci skinu (theme)"
   emails:
@@ -125,6 +129,8 @@ cs:
       s3_upload_bucket_is_required: "Nemůžete nahrávat na S3 dokud nezadáte 's3_upload_bucket'."
   invite:
     user_exists: "Netřeba posílat pozvánku na <b>%{email}</b>. Tento email <a href='%{base_path}/u/%{username}/summary'>je veden u tohoto účtu!</a>"
+    disabled_errors:
+      invalid_access: "Nemáte oprávnění na zobrazení požadovaného zdroje."
   bulk_invite:
     file_should_be_csv: "Nahraný soubor by měl být ve formátu csv."
     error: "Nastala chyba při nahrávání souboru. Prosím opakujte akci později."
@@ -162,6 +168,11 @@ cs:
     permalink: "Permalink"
     imported_from: "Diskuze k původnímu příspěvku na blogu: %{link}"
     in_reply_to: "▶ %{username}"
+    replies:
+      one: "%{count} odpověď"
+      few: "%{count} odpovědí"
+      many: "%{count} odpovědí"
+      other: "%{count} odpovědí"
     created: "Vytvořený"
   no_mentions_allowed: "Bohužel, nemůžete zmiňovat ostatní uživatele."
   too_many_mentions:
@@ -203,6 +214,11 @@ 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}'"
+  rss_num_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ů"
   read_full_topic: "Číst celé téma"
   private_message_abbrev: "Msg"
   rss_description:
@@ -228,9 +244,11 @@ cs:
   bookmarks:
     reminders:
       later_today: "Později během dnešního dne"
+      next_business_day: "Následující pracovní den"
       tomorrow: "Zítra"
       next_week: "Další týden"
       next_month: "Další měsíc"
+      custom: "Vlastní datum a čas"
   groups:
     errors:
       can_not_modify_automatic: "Nelze měnit automatické skupiny"
@@ -257,26 +275,6 @@ cs:
       few: "%{count} příspěvky"
       many: "%{count} příspěvků"
       other: "%{count} příspěvků"
-    "new-topic": |
-      Vítejte na %{site_name} &mdash; **díky za nové téma!**
-
-      - Zní název zajímavě, když si jej přečtete nahlas? Je to dobré shrnutí daného tématu?
-
-      - Koho by to mohlo zajímat? Proč na tom záleží? Jaké typy odpovědí očekáváte?
-
-      - Používejte ve svém tématu klíčová slova, aby jej ostatní mohli *najít*. Zařaďte své téma do vhodné kategorie.
-
-      Více se dozvíte v [pravidlech komunity](%{base_path}/guidelines). Tenhle panel se zobrazí pouze pro vaše první %{education_posts_text}.
-    "new-reply": |
-      Vítejte na %{site_name} &mdash; **díky za přispěvek!**
-
-      - Přispívá nějak vaše odpověď k diskuzi?
-
-      - Buďte na ostatní členy komunity milí.
-
-      - Konstruktivní kritika je vítaná, ale kritizujte *myšlenky*, ne lidi.
-
-      Další doporučení máme v [pravidlech komunity](%{base_path}/guidelines). Tenhle panel se zobrazí pouze pro vaše první %{education_posts_text}.
     avatar: |
       ### Nechcete si nastavit svůj profilový obrázek?
 
@@ -580,6 +578,7 @@ cs:
       short_description: "Tento příspěvek se mi líbí"
   user_activity:
     no_bookmarks:
+      self: "Nemáte žádné záložky; záložky vám umožňují rychle odkazovat na konkrétní příspěvky."
       others: "Žádné záložky."
     no_likes_given:
       self: "Zatím se ti nelíbil žádný příspěvek."
@@ -619,6 +618,7 @@ cs:
       every_month: "každý měsíc"
       every_six_months: "každých šest měsíců"
   user_api_key:
+    read: "přečteno"
     otp_confirmation:
       confirm_title: Pokračovat na %{site_name}
     scopes:
@@ -631,12 +631,14 @@ cs:
         day: Den
     post_edits:
       labels:
+        edited_at: Datum
         post: Příspěvek
         editor: Editor
         edit_reason: Reason
     user_flagging_ratio:
       labels:
         user: Uživatel
+        score: Skóre
     moderators_activity:
       labels:
         moderator: Moderátor
@@ -692,6 +694,7 @@ cs:
       title: "Uživatelé podle věrohodnosti"
       xaxis: "Věrohodnost"
       yaxis: "Počet uživatelů"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Uživatelé podle typu"
       xaxis: "Typ"
@@ -832,10 +835,12 @@ cs:
     min_search_term_length: "Minimální délka hledaného výrazu ve znacích"
     allow_duplicate_topic_titles: "Povolit témata se stejným, duplicitním názvem"
     unique_posts_mins: "Kolik minut musí uplynout, než může uživatel zaslat příspěvek se stejným obsahem"
+    manifest_screenshots: "Snímky obrazovky, které na stránce s výzvou k instalaci předvádějí funkce vaší instance a funkce. Všechny obrázky by měly být lokálně nahrávány a mít stejné rozměry."
     email_custom_headers: "Seznam vlastních hlaviček emailů, oddělený svislítkem"
     enable_long_polling: "'Message bus' smí používat dlouhé výzvy"
     anon_polling_interval: "Jak často se mají zasílat výzvy anonymním uživatelům v milisekundách"
     post_menu: "Určuje, které položky se zobrazí v menu u příspěvku a v jakém pořadí. Příklad: like|edit|flag|delete|share|bookmark|reply"
+    send_welcome_message: "Poslat všem novým uživatelům uvítací zprávu s rychlým návodem jak začít."
     enable_badges: "Povolit odznaky"
     invite_expiry_days: "Platnost uživatelských pozvánek ve dnech"
     min_password_length: "Minimální povolená délka hesla."
@@ -852,6 +857,7 @@ cs:
     clean_orphan_uploads_grace_period_hours: "Grace period (in hours) before an orphan upload is removed."
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
+    dark_mode_none: "Žádná"
     title_prettify: "Zabrání běžným překlepům a chybám v názvu tématu, včetně psaní velkými písmeny, malé písmeno na začátku, vícenásobné vykřičníky a otazníky, atd."
     faq_url: "Pokud máte dokument FAQ hostovaný samostatně, napište sem jeho plnou URL."
     tos_url: "Pokud máte dokument 'Podmínky používání' hostovaný samostatně, napište sem jeho plnou URL."
@@ -863,6 +869,8 @@ cs:
     digest_posts: "Maximální počet populárních příspěvků zařazených do email přehledu."
     enable_mobile_theme: "Používat na mobilních zařízeních verzi přizpůsobenou pro mobily s možností přejít na plnou verzi. Zruště pokud chcete používat vlastní plně responzivní kaskádový styl."
     short_progress_text_threshold: "After the number of posts in a topic goes above this number, the progress bar will only show the current post number. If you change the progress bar's width, you may need to change this value."
+    embed_truncate: "Useknout zabudované příspěvky."
+    embed_post_limit: "Maximální počet příspěvků k zabudování."
     tags_sort_alphabetically: "Zobrazit štítky dle abecedy. Standardně jsou setříděny dle popularity."
     errors:
       invalid_email: "Neplatná emailová adresa."
@@ -903,6 +911,7 @@ cs:
     something_already_taken: "Nastala chyba při zpracování, zřejmě je dané uživatelské jméno nebo email již zaregistrován. Zkuste odkaz pro obnovení hesla."
     omniauth_confirm_button: "Pokračovat"
     click_to_continue: "Pro pokračování klikněte zde."
+    second_factor_title: "Dvoufaktorové ověření"
     second_factor_backup_description: "Prosíme zadejte jeden ze svých záložních kódů:"
   admin:
     email:
@@ -915,6 +924,8 @@ cs:
       not_allowed: "není povolen od tohoto emailového poskytovatele. Prosím použijte jinou emailovou adresu."
       blocked: "není povolen."
   system_messages:
+    queued_by_staff:
+      title: "Příspěvek potřebuje schválení"
     welcome_user:
       subject_template: "Vítejte na %{site_name}!"
       text_body_template: |
@@ -1012,6 +1023,8 @@ cs:
     sender_message_to_blank: "message.to is blank"
     sender_text_part_body_blank: "text_part.body is blank"
     sender_body_blank: "body is blank"
+  color_schemes:
+    default_theme_name: "Výchozí"
   csv_export:
     boolean_yes: "Ano"
     boolean_no: "Ne"
@@ -1098,6 +1111,8 @@ cs:
   tags:
     title: "Tagy"
   finish_installation:
+    register:
+      button: "Registrovat"
     resend_email:
       title: "Znovu odeslat aktivační email"
   wizard:
@@ -1119,8 +1134,16 @@ cs:
         fields:
           contact_email:
             placeholder: "jmeno@priklad.cz"
+          contact_url:
+            placeholder: "https://www.example.com/contact-us"
       corporate:
         title: "Organizace"
+      colors:
+        title: "Barvy"
+      fonts:
+        fields:
+          font_preview:
+            label: "Náhled"
       logos:
         title: "Loga"
         fields:
@@ -1146,8 +1169,6 @@ cs:
                 label: "Kategorie a nejnovější témata"
               categories_and_top_topics:
                 label: "Kategorie a populární témata"
-      emoji:
-        title: "Smajlíky :)"
       invites:
         title: "Pozvi redakci"
       finished:
@@ -1164,6 +1185,12 @@ cs:
       confirm_title: "Upozornění zapnuta - %{site_title}"
       confirm_body: "Upozornění úspěšně zapnuta."
   reviewables:
+    priorities:
+      medium: "Střední"
+      high: "Vysoká"
+    sensitivity:
+      medium: "Střední"
+      high: "Vysoká"
     actions:
       agree_and_keep:
         title: "Uchovat příspěvek"
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 263640661b..b822f74fda 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -11,7 +11,7 @@ da:
     long_date: "MMMM D, YYYY h:mma"
   datetime_formats: &datetime_formats
     formats:
-      short: "%d-%m--%Y"
+      short: "%d-%m-%Y"
       short_no_year: "%-d. %B"
       date_only: "%-d. %B, %Y"
       long: "%-d. %B %Y, %H:%M"
@@ -39,34 +39,45 @@ da:
   title: "Discourse"
   topics: "Emner"
   posts: "indlæg"
+  views: "visninger"
   loading: "Indlæser"
-  powered_by_html: 'Drives med brug af <a href="https://www.discourse.org">Discourse</a>, ses bedst med JavaScript slået til'
+  powered_by_html: 'Drivet af <a href="https://www.discourse.org">Discourse</a>, ses bedst med JavaScript slået til'
   sign_up: "Tilmeld dig"
   log_in: "Log ind"
-  submit: "Færdiggør"
+  submit: "Udfør"
   purge_reason: "Automatisk slettet som forladt, deaktiveret konto"
-  disable_remote_images_download_reason: "Fjerndownload af billeder deaktiveret grundet utilstrækkelig diskplads"
+  disable_remote_images_download_reason: "Fjernhentning af billeder deaktiveret grundet utilstrækkelig ledig diskplads"
   anonymous: "Anonym"
   remove_posts_deleted_by_author: "Slettet af forfatteren"
-  redirect_warning: "Vi kunne ikke bekræfte, at det link, du valgte, faktisk blev sendt til forummet. Hvis du alligevel ønsker at fortsætte, så vælg nedenstående link."
+  redirect_warning: "Vi kunne ikke bekræfte, at det link, du valgte, faktisk blev sendt til forummet. Hvis du alligevel ønsker at fortsætte, så benyt nedenstående link."
   on_another_topic: "På et andet emne"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} af %{username}"
   themes:
-    bad_color_scheme: "Kan ikke opdatere tema, ugyldigt farvepalet"
+    bad_color_scheme: "Kan ikke opdatere tema, ugyldigt farvepalette"
     other_error: "Der opstod en fejl under opdatering af temaet"
+    ember_selector_error: "Beklager — brug af #ember eller .ember-view CSS-vælgere er ikke tilladt, da disse navne genereres dynamisk på kørselstidspunktet og ændres over tid, hvilket i sidste ende resulterer i ødelagt CSS. Prøv en anden vælger."
     compile_error:
-      unrecognized_extension: "Ikke anerkendt filtypenavn: %{extension}"
+      unrecognized_extension: "Ikke-genkendt filtypenavn: %{extension}"
     import_error:
+      generic: Der opstod en fejl under importering af dette tema
+      about_json: "Importfejl: about.json eksisterer ikke, eller er ugyldig. Er du sikker på, at dette er et Discourse tema?"
       about_json_values: "about.json indeholder ugyldige værdier: %{errors}"
-      git: "Fejl ved kloning af git repo, adgang nægtes, eller depot findes ikke"
+      modifier_values: "about.json modifikatorer indeholder ugyldige værdier: %{errors}"
+      git: "Fejl ved kloning af git-arkiv, adgang nægtes, eller arkiv ikke fundet"
       unpack_failed: "Kunne ikke pakke filen ud"
-      unknown_file_type: "Den fil, du uploadede, ser ikke ud til at være et gyldigt Discourse-tema."
+      file_too_big: "Den ukomprimerede fil er for stor."
+      unknown_file_type: "Den fil, du overførte, ser ikke ud til at være et gyldigt Discourse-tema."
     errors:
-      component_no_user_selectable: "Temakomponenter kan ikke vælges af en bruger"
+      component_no_user_selectable: "Temakomponenter må ikke kunne vælges af brugere"
       component_no_default: "Temakomponenter kan ikke være standard temaet"
       component_no_color_scheme: "Temakomponenter kan ikke have farvepaletter"
-      no_multilevels_components: "Temaer med børnetemaer kan ikke selv være børn af andre temaer"
+      no_multilevels_components: "Temaer med underordnede temaer kan ikke selv være et underordnet tema"
+      optimized_link: Optimerede billedlinks er midlertidige og bør ikke indgå i tema kildekode.
     settings_errors:
-      invalid_yaml: "Forsynet YAML er ugyldig."
+      invalid_yaml: "Leveret YAML er ugyldig."
+      data_type_not_a_number: "Indstilling`%{name}` typen understøttes ikke. Understøttede typer er `integer`, `bool`, `list`, `enum` og `upload`"
       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."
@@ -82,31 +93,37 @@ da:
       string_value_not_valid_max: "Den skal højst være %{max} tegn langt."
     locale_errors:
       top_level_locale: "Den øverste nøgle i en locale fil skal matche det relevante locale's navn."
+      invalid_yaml: "Oversættelse YAML ugyldig"
   emails:
     incoming:
       default_subject: "Emnet mangler en titel"
-      show_trimmed_content: "Vis trimmet indhold"
+      show_trimmed_content: "Vis beskåret indhold"
       maximum_staged_user_per_email_reached: "Maksimalt antal af brugere oprettet pr. email."
       no_subject: "(intet emne)"
+      no_body: "(intet meddelelsesindhold)"
       missing_attachment: "(Vedhæftning %{filename} mangler)"
       errors:
         empty_email_error: "Dette sker når den rå email der modtages er tom."
         no_message_id_error: "Dette sker når emailen ikke har nogen 'Message-Id' header."
         auto_generated_email_error: "Dette sker når headeren 'precedence' er angivet til: list, junk, bulk eller auto_reply, eller når enhver anden header indeholder: auto-submitted, auto-replied eller auto-generated."
         no_body_detected_error: "Dette sker når vi ikke kunne trække noget indhold ud og der heller ikke var nogen vedhæftninger."
-        no_sender_detected_error: "Det sker, når vi ikke kunne finde en gyldig emailadresse i Fra-overskriften."
-        from_reply_by_address_error: "Det sker, når Fra-overskriften matcher svaret via e-mail-adresse."
+        no_sender_detected_error: "Der sker, når vi ikke kunne finde en gyldig e-mail-adresse i Fra headeren (From)."
+        from_reply_by_address_error: "Dette sker, når Fra headeren matcher svar via e-mail-adressen."
         inactive_user_error: "Dette sker når afsenderen ikke er aktiv."
         silenced_user_error: "Det sker, når afsenderen er silenced."
+        bad_destination_address: "Sker, når ingen af e-mail-adresserne i Til/Cc-felterne passede på en konfigureret indgående e-mail-adresse."
         strangers_not_allowed_error: "Dette sker når en bruger prøver at oprette et nyt emne i en kategori som de ikke er medlem af."
-        insufficient_trust_level_error: "Dette sker når en bruger prøvede at oprette et nyt emne i en kategori som de ikke har den krævne \"trust level\" til."
+        insufficient_trust_level_error: "Dette sker når en bruger prøvede at oprette et nyt emne i en kategori hvortil de ikke har det påkrævede tillidsniveau."
         reply_user_not_matching_error: "Dette sker når et svar kom fra en anden email adresse end den notifikationen blev sendt til."
-        topic_not_found_error: "Dette sker når et svar er kommet, men det relaterede emne er blevet slettet."
-        topic_closed_error: "Dette sker når et svar er kommet, men det relaterede emne er blevet lukket."
+        topic_not_found_error: "Dette sker når et svar er modtaget, men det relaterede emne er blevet slettet."
+        topic_closed_error: "Dette sker når et svar er modtaget, men det relaterede emne er blevet lukket."
         bounced_email_error: "Emailen er en \"bounced email\" rapport"
         screened_email_error: "Dette sker når afsenderens email adresse allerede er screenet."
         unsubscribe_not_allowed: "Det sker, når afmelding via e-mail ikke er tilladt for denne bruger."
-      unrecognized_error: "Ukendt fejl"
+        email_not_allowed: "Det sker, når emailadressen ikke er på tilladelseslisten eller er på blokeringslisten."
+      unrecognized_error: "Ikke-genkendt Fejl"
+    secure_media_placeholder: "Bortredigeret: Dette websted har aktiveret sikre medier, gå til emnet, eller klik på Vis medier for at se det vedhæftede medie."
+    view_redacted_media: "Vis Medie"
   errors: &errors
     format: ! "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>: %{message}"
@@ -119,28 +136,32 @@ da:
       present: skal være tomt
       confirmation: ! "matcher ikke %{attribute}"
       empty: kan ikke være tom
-      equal_to: skal være %{count}
+      equal_to: skal være lig med %{count}
       even: skal være et lige tal
       exclusion: er reserveret
       greater_than: skal være større end %{count}
       greater_than_or_equal_to: skal være større eller lig med %{count}
       has_already_been_used: "er allerede blevet brugt"
       inclusion: er ikke inkluderet i listen
-      invalid: er ikke gyldig
+      invalid: er ugyldig
       is_invalid: "virker upræcis, er det en hel sætning?"
-      contains_censored_words: "indeholder følgende censurerede ord: %{censurerede ord}"
+      is_invalid_meaningful: "virker uklart, de fleste af ordene indeholder de samme bogstaver igen og igen?"
+      is_invalid_unpretentious: "virker uklart, et eller flere ord er meget langt?"
+      is_invalid_quiet: "virker uklart, var det meningen at du skrev det MED STORE BOGSTAVER?"
+      invalid_timezone: "“%{tz}'er ikke en gyldig tidszone"
+      contains_censored_words: "indeholder følgende censurerede ord: %{censored_words}"
       less_than: skal være mindre end %{count}
       less_than_or_equal_to: skal være mindre end eller lig med %{count}
       not_a_number: er ikke et nummer
       not_an_integer: skal være et heltal
       odd: skal være et ulige tal
       record_invalid: ! "Kunne ikke valideres: %{errors}"
-      max_emojis: "kan ikke have mere end %{max_emojis_count}humørikoner"
+      max_emojis: "kan ikke have mere end %{max_emojis_count} humørikoner"
       emojis_disabled: "kan ikke have humørikon"
       ip_address_already_screened: "er allerede inkluderet i en eksisterende regel"
       restrict_dependent_destroy:
-        one: "Kan ikke slette fordi en afhængighed %{record} findes"
-        many: "Kan ikke slette fordi en afhængighed %{record} findes"
+        one: "Kan ikke slette registrering fordi et afhængig %{record} findes"
+        many: "Kan ikke slette registrering fordi afhængig %{record} findes"
       too_long:
         one: er for lang (maximum er %{count} tegn)
         other: er for lang (maximum er %{count} tegn)
@@ -151,41 +172,83 @@ da:
         one: har forkert længde (burde være %{count} tegn)
         other: har forkert længde (burde være %{count} tegn)
       other_than: "skal være andet end %{count}"
+      auth_overrides_username: "Brugernavn skal opdateres på godkendelsesudbyderens side, da indstillingen `auth_overrides_username` er aktiveret."
     template:
       body: ! "Der var problemer med følgende felter:"
       header:
-        one: "Een fejl forhindrede denne %{model} for at gemme."
-        other: ! "%{count} fejl forhindrede denne %{model} i at gemme."
+        one: "%{count} fejl forhindrede denne %{model} i at blive gemt."
+        other: ! "%{count} fejl forhindrede denne %{model} i at blive gemt."
     embed:
       load_from_remote: "Der opstod en fejl ved indlæsningen af dette indlæg."
     site_settings:
-      invalid_category_id: "Du specificerede en kategori, der ikke findes"
+      invalid_category_id: "Du angav en kategori, der ikke findes"
       invalid_choice:
-        one: "Du specificerede det ugyldige valg %{name}"
-        other: "Du specificerede de ugyldige valg %{name}"
+        one: "Du angav det ugyldige valg %{name}"
+        other: "Du angav de ugyldige valg %{name}"
       default_categories_already_selected: "Du kan ikke vælge en kategori der er brugt i en anden liste."
-      s3_upload_bucket_is_required: "Du kan ikke oploade til S3 med mindre du har angivet 's3_upload_bucket'."
+      default_tags_already_selected: "Du kan ikke vælge et mærke, der bruges i en anden liste."
+      s3_upload_bucket_is_required: "Du kan ikke aktivere overførsler til S3 med mindre du har angivet 's3_upload_bucket'."
       enable_s3_uploads_is_required: "Du kan ikke aktivere beholdning til S3, medmindre du har aktiveret S3-uploads."
+      page_publishing_requirements: "Sideudgivelse kan ikke aktiveres, hvis sikre medier er aktiveret."
       s3_backup_requires_s3_settings: "Du kan ikke bruge S3 som backupplacering, medmindre du har angivet '%{setting_name}'."
+      s3_bucket_reused: "Du kan ikke bruge den samme spand til 's3_upload_bucket' og 's3_backup_bucket'. Vælg en anden spand, eller brug en anden sti til hver spand."
+      secure_media_requirements: "S3-overførsler skal være aktiveret, før sikre medier aktiveres."
+      share_quote_facebook_requirements: "Du skal indstille et Facebook-app-id for at aktivere citatdeling for Facebook."
+      second_factor_cannot_enforce_with_socials: "Du kan ikke gennemtvinge 2FA med sociale logins aktiveret. Du skal først deaktivere login via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Du kan ikke gennemtvinge 2FA, hvis lokale logins er deaktiveret."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "Du kan ikke gennemtvinge 2FA, hvis DiscourseConnect er aktiveret."
+      local_login_cannot_be_disabled_if_second_factor_enforced: "Du kan ikke deaktivere lokalt login, hvis 2FA gennemtvinges. Deaktiver gennemtvunget 2FA, før du deaktiverer lokale logins."
+      cannot_enable_s3_uploads_when_s3_enabled_globally: "Du kan ikke aktivere S3-overførsler, fordi S3-overførsler allerede er aktiveret globalt, og aktivering af dette på webstedsniveau kan forårsage kritiske problemer med overførsler"
+      cors_origins_should_not_have_trailing_slash: "Du skal ikke tilføje den efterfølgende skråstreg (/) til CORS adresser."
+    conflicting_google_user_id: 'Google-konto-id''et for denne konto er ændret. Personalets indgriben er påkrævet af sikkerhedsmæssige årsager. Kontakt venligst personalet og send dem til <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+    onebox:
+      invalid_address: "Beklager, vi kunne ikke generere en forhåndsvisning for denne webside, fordi serveren '%{hostname}' ikke kunne findes. I stedet for en forhåndsvisning vises kun et link i dit indlæg. :cry:"
+      error_response: "Beklager, vi kunne ikke generere en forhåndsvisning for denne webside, da webserveren returnerede en fejlkode på %{status_code}. I stedet for en forhåndsvisning vises kun et link i dit indlæg. :cry:"
+      missing_data:
+        one: "Vi kunne desværre ikke generere en forhåndsvisning af denne webside, da følgende oEmbed / OpenGraph tag ikke blev fundet: %{missing_attributes}"
+        other: "Vi kunne desværre ikke generere en forhåndsvisning af denne webside, da følgende oEmbed / OpenGraph tags ikke blev fundet: %{missing_attributes}"
+  word_connector:
+    comma: ", "
   invite:
-    not_found: "Dit invitationstoken er ugyldigt. Kontakt venligst <a href='%{base_url}/about'>personale</a> ."
-    not_found_json: "Dit invitationstoken er ugyldigt. Kontakt venligst personale."
+    expired: "Dit invitationstoken er ugyldigt. Kontakt venligst <a href='%{base_url}/about'>personalet</a>."
+    not_found: "Dit invitationstoken er ugyldigt. Kontakt venligst <a href='%{base_url}/about'>personalet</a> ."
+    not_found_json: "Dit invitationstoken er ugyldigt. Kontakt venligst personalet."
+    not_matching_email: "Din e-mailadresse og den e-mailadresse, der er knyttet til invitationstoken, stemmer ikke overens. Kontakt venligst personalet."
+    not_found_template: |
+      <p>Din invitation til <a href="%{base_url}">%{site_name}</a> er allerede blevet indløst.</p>
+
+      <p>Hvis du husker din adgangskode, kan du <a href="%{base_url}/login">Log på</a>.</p>
+
+      <p>Ellers bedes du <a href="%{base_url}/password-reset">Nulstille adgangskode</a>.</p>
+    not_found_template_link: |
+      <p>Invitationen til <a href="%{base_url}">%{site_name}</a> kan ikke længere anvendes. Bed den person, der inviterede dig, om at sende dig en ny invitation.</p>
     user_exists: "Der er ingen grund til at invitere <b>%{email}</b>, personen <a href='%{base_path}/u/%{username}/summary'>har allerede en profil!</a>"
     confirm_email: "<p> Du er næsten færdig! Vi har sendt en aktiveringsmail til din emailadresse. Følg instruktionerne i mailen for at aktivere din konto. </p><p> Hvis den ikke ankommer, så tjek din spam-mappe. </p>"
+    cant_invite_to_group: "Du har ikke tilladelse til at invitere brugere til angivne gruppe(r). Sørg for, at du er ejer af de(n) gruppe(r), du prøver at invitere til."
+    disabled_errors:
+      discourse_connect_enabled: "Invitationer er deaktiveret, fordi DiscourseConnect er aktiveret."
+      invalid_access: "Du har ikke tilladelse til at se den ønskede ressource."
   bulk_invite:
-    file_should_be_csv: "Den uploadede fil skal være i csv format."
+    file_should_be_csv: "Den overførte fil skal være i csv format."
     max_rows: "De første %{max_bulk_invites} invitationer er blevet sendt. Prøv at opdele filen i mindre dele."
-    error: "Der skete en fejl ved upload af filen. Prøv venligst igen senere."
+    error: "Der opstod en fejl under overførsel af filen. Prøv venligst igen senere."
+  invite_link:
+    email_taken: "Denne e-mail er allerede i brug. Hvis du allerede har en konto, skal du logge ind eller nulstille adgangskoden."
+    max_redemptions_limit: "bør være mellem 2 og %{max_limit}."
   topic_invite:
     failed_to_invite: "Brugeren kan ikke inviteres til dette emne uden et gruppemedlemskab i en af følgende grupper: %{group_names}."
     user_exists: "Beklager, men brugeren er allerede inviteret. Du kan kun invitere en bruger til et emne én gang."
+    muted_invitee: "Beklager, denne bruger har slukket for dig."
+    muted_topic: "Beklager, denne bruger ønsker tavshed i dette emne."
+    receiver_does_not_allow_pm: "Beklager, denne bruger tillader dig ikke at sende private beskeder til sig."
+    sender_does_not_allow_pm: "Beklager, du tillader ikke denne bruger sender dig private beskeder."
+    user_cannot_see_topic: "%{username} kan ikke se emnet."
   backup:
-    operation_already_running: "Der kører allerede en %{operation}. Kan ikke starte et nyt %{operation} job lige nu."
+    operation_already_running: "En handling kører i øjeblikket. Kan ikke starte et nyt job lige nu."
     backup_file_should_be_tar_gz: "Backup filen skal være et .tar.gz arkiv."
-    not_enough_space_on_disk: "Der er ikke nok diskplads til at uploade denne backup."
+    not_enough_space_on_disk: "Der er ikke nok diskplads til at overføre denne backup."
     invalid_filename: "Backup filnavnet indeholder ugyldige tegn. Gyldige tegn er a-z 0-9 . - _."
-    file_exists: "Den fil, du prøver at uploade, findes allerede."
+    file_exists: "Den fil, du prøver at overføre, findes allerede."
     location:
       local: "Lokal"
       s3: "Amazon S3"
@@ -198,10 +261,16 @@ da:
   provider_not_enabled: "Du har ikke tilladelse til at se den ønskede ressource. Godkendelsesudbyderen er ikke aktiveret."
   provider_not_found: "Du har ikke tilladelse til at se den ønskede ressource. Godkendelsesudbyderen findes ikke."
   read_only_mode_enabled: "Forummet er i \"kun læsning\" tilstand. Interaktioner er deaktiverede."
+  invalid_grant_badge_reason_link: "Ekstern eller ugyldig discourse link er ikke tilladt i emblembegrundelse"
   email_template_cant_be_modified: "Denne email skabelon kan ikke ændres"
   invalid_whisper_access: "Enten er hvisken ikke aktiveret, eller du har ikke adgang til at oprette hviskende indlæg"
   not_in_group:
+    title_topic: "Du skal anmode om medlemskab af gruppen '%{group}' for at se dette emne."
+    title_category: "Du skal være i en gruppe for at se denne kategori."
+    request_membership: "Anmod om medlemskab"
     join_group: "Bliv medlem af gruppen"
+  deleted_topic: "Ups! Dette emne er blevet slettet og er ikke længere tilgængeligt."
+  delete_topic_failed: "Der opstod en fejl under sletning af dette emne. Kontakt venligst webstedets administrator."
   reading_time: "Læsetid"
   likes: "Synes godt om"
   too_many_replies:
@@ -215,6 +284,7 @@ da:
     continue: "Fortsæt diskussion"
     error: "Fejl ved indlejring"
     referer: "Henviser:"
+    error_topics: "Webstedsindstillingen for 'integrer emner' var ikke aktiveret"
     mismatch: "Henviseren blev enten ikke sendt eller matchede ikke nogen af følgende værter:"
     no_hosts: "Ingen værter var konfigureret til indlejring."
     configure: "Konfigurér indlejring"
@@ -228,21 +298,30 @@ da:
     replies:
       one: "%{count} svar"
       other: "%{count} svar"
+    likes:
+      one: "%{count} Synes om"
+      other: "%{count} Synes om"
     last_reply: "Sidste svar"
     created: "Oprettet"
+    new_topic: "Opret nyt emne"
   no_mentions_allowed: "Beklager, du kan ikke nævne andre brugere."
   too_many_mentions:
-    one: "Beklager, men du kan kun nævne %{count} brugere i et indlæg."
+    one: "Beklager, men du kan kun nævne %{count} bruger i et indlæg."
     other: "Beklager, men du kan kun nævne %{count} brugere i et indlæg."
   no_mentions_allowed_newuser: "Beklager, nye brugere kan ikke nævne andre brugere."
   too_many_mentions_newuser:
     one: "Beklager, nye brugere kan kun nævne en bruger i et indlæg."
     other: "Beklager, nye brugere kan kun nævne %{count} brugere i et indlæg."
-  no_attachments_allowed: "Beklager, nye brugere kan ikke vedhæfte filer i et indlæg."
+  no_embedded_media_allowed_trust: "Beklager, du kan ikke integrere medieelementer i et indlæg."
+  no_embedded_media_allowed: "Beklager, men nye brugere kan ikke integrere medieelementer i indlæg."
+  too_many_embedded_media:
+    one: "Beklager, nye brugere kan kun indsætte ét indlejret medieelement i et indlæg."
+    other: "Beklager, nye brugere kan kun indsætte %{count} indlejrede medieelementer i et indlæg."
+  no_attachments_allowed: "Beklager, nye brugere kan ikke vedhæfte filer i indlæg."
   too_many_attachments:
     one: "Beklager, nye brugere kan kun vedhæfte en fil i et indlæg."
     other: "Beklager, nye brugere kan kun vedhæfte %{count} filer i et indlæg."
-  no_links_allowed: "Beklager, nye brugere kan ikke bruge links i indlæg."
+  no_links_allowed: "Beklager, nye brugere kan ikke indsætte links i indlæg."
   links_require_trust: "Beklager, du kan ikke inkludere links i dine indlæg."
   too_many_links:
     one: "Beklager, nye brugere kan kun indsætte et link i et indlæg."
@@ -252,11 +331,15 @@ da:
   spamming_host: "Beklager, du kan ikke indsætte et link til det pågældende domæne."
   user_is_suspended: "Suspenderede brugere tilllades ikke at oprette indlæg."
   topic_not_found: "Der er gået noget galt. Måske er emnet blevet lukket eller slettet mens du kiggede på det?"
-  not_accepting_pms: "Beklager, %{username} tager ikke imod beskeder i øjeblikket."
-  max_pm_recipients: "Du kan desværre kun sende til %{recipients_limit} modtagere."
+  not_accepting_pms: "Beklager, %{username} accepterer ikke meddelelser i øjeblikket."
+  max_pm_recipients: "Du kan desværre kun sende en meddelelse til %{recipients_limit} modtagere."
   pm_reached_recipients_limit: "Beklager, du kan ikke have mere end %{recipients_limit}-modtagere i en meddelelse."
-  removed_direct_reply_full_quotes: "Fjernet citat af hele tidligere indlæg automatisk."
-  just_posted_that: "ligner et andet indlæg, som du har skrevet for nyligt, for meget"
+  removed_direct_reply_full_quotes: "Automatisk fjernet citat af hele forrige indlæg."
+  watched_words_auto_tag: "Automatisk mærket emne"
+  secure_upload_not_allowed_in_public_topic: "Beklager, følgende sikre overførsler kan ikke bruges i et offentligt emne: %{upload_filenames}."
+  create_pm_on_existing_topic: "Beklager, du kan ikke oprette en PM på et eksisterende emne."
+  slow_mode_enabled: "Dette emne er i langsom tilstand."
+  just_posted_that: "ligner et andet indlæg for meget, som du har skrevet for nyligt"
   invalid_characters: "indeholder ugyldige tegn"
   is_invalid: "lader til at være uklart - er det en komplet sætning?"
   next_page: "næste side →"
@@ -266,6 +349,12 @@ 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}'"
+  rss_num_posts:
+    one: "%{count} indlæg"
+    other: "%{count} indlæg"
+  rss_num_participants:
+    one: "%{count} deltager"
+    other: "%{count} deltagere"
   read_full_topic: "Læs hele emnet"
   private_message_abbrev: "Besked"
   rss_description:
@@ -284,56 +373,76 @@ da:
     user_posts: "Seneste indlæg af @%{username}"
     user_topics: "Sidste emner af @%{username}"
     tag: "Markerede emner"
-    badge: "%{display_name} badge på %{site_title}"
-  too_late_to_edit: "Dette indlæg er gammelt og kan ikke længere redigeres eller slettes."
-  edit_conflict: "Dette indlæg blev redigeret af en anden bruger, og dine ændringer kan ikke længere gemmes."
-  revert_version_same: "Den nuværende udgave er den samme udgave/version som den du prøver at vende tilbage til."
+    badge: "%{display_name} emblem på %{site_title}"
+  too_late_to_edit: "Dette indlæg blev oprettet for længe siden og kan ikke længere redigeres eller slettes."
+  edit_conflict: "Dette indlæg blev redigeret af en anden bruger, og dine ændringer kan ikke længere blive gemt."
+  revert_version_same: "Den nuværende udgave er den samme udgave som den du prøver at vende tilbage til."
   excerpt_image: "billede"
   bookmarks:
+    errors:
+      already_bookmarked_post: "Du kan ikke bogmærke det samme indlæg to gange."
+      cannot_set_past_reminder: "Du kan ikke oprette en bogmærke-påmindelse i fortiden."
+      cannot_set_reminder_in_distant_future: "Du kan ikke oprette en bogmærke-påmindelse længere end 10 år ud i fremtiden"
+      time_must_be_provided: "Der skal angives tid for alle påmindelser"
     reminders:
+      at_desktop: "Næste gang jeg er på mit skrivebord"
       later_today: "Senere i dag"
+      next_business_day: "Næste arbejdsdag"
       tomorrow: "I morgen"
       next_week: "Næste uge"
-      next_month: "Næste Månede"
+      next_month: "Næste måned"
       custom: "Valgfri dato og tid"
   groups:
     success:
       bulk_add:
-        one: "%{count} bruger er føjet til gruppen."
-        other: "%{count} brugere er blevet føjet til gruppen."
+        one: "%{count} bruger er blevet tilføjet til gruppen."
+        other: "%{count} brugere er blevet tilføjet til gruppen."
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' er ikke et gyldigt tillidsniveau."
-      can_not_modify_automatic: "Du kan ikke modificere en automatisk gruppe"
+      can_not_modify_automatic: "Du kan ikke ændre en automatisk gruppe"
       member_already_exist:
         one: "'%{username}' er allerede medlem af denne gruppe."
         other: "Følgende brugere er allerede medlemmer af denne gruppe: %{username}"
       invalid_domain: "'%{domain}' er ikke et gyldigt domæne."
       invalid_incoming_email: "'%{email}' er ikke en gyldig email adresse."
-      email_already_used_in_group: "'%{email}' er allerede brugt af en bruger i gruppen '%{group_name}'."
-      email_already_used_in_category: "'%{email}' er allerede brugt af en bruger i kategorien '%{category_name}'."
-      cant_allow_membership_requests: "Du kan ikke tillade medlemskabsanmodninger om en gruppe uden nogen ejere."
+      email_already_used_in_group: "'%{email}' er allerede brugt af gruppen '%{group_name}'."
+      email_already_used_in_category: "'%{email}' er allerede brugt af kategorien '%{category_name}'."
+      cant_allow_membership_requests: "Du kan ikke tillade medlemskabsanmodninger til en gruppe uden nogen ejere."
+      already_requested_membership: "Du har allerede anmodet om medlemskab af denne gruppe."
+      adding_too_many_users:
+        one: "Maksimum %{count} bruger kan tilføjes på én gang"
+        other: "Maksimum %{count} brugere kan tilføjes på én gang"
+      usernames_or_emails_required: "Brugernavne eller e-mails skal være til stede"
+      no_invites_with_discourse_connect: "Du kan kun invitere registrerede brugere, når DiscourseConnect er aktiveret"
+      no_invites_without_local_logins: "Du kan kun invitere registrerede brugere, når lokale logins er deaktiveret"
     default_names:
       everyone: "Alle"
       admins: "admins"
       moderators: "moderatorer"
-      staff: "staff"
+      staff: "personale"
       trust_level_0: "tillidsniveau_0"
       trust_level_1: "tillidsniveau_1"
       trust_level_2: "tillidsniveau_2"
       trust_level_3: "tillidsniveau_3"
       trust_level_4: "tillidsniveau_4"
+    request_membership_pm:
+      title: "Anmodning om medlemskab af @%{group_name}"
+    request_accepted_pm:
+      title: "Du er blevet accepteret på @%{group_name}"
+      body: |
+        Din anmodning om at blive en del af @%{group_name} er blevet accepteret, og du er nu medlem.
   education:
     until_posts:
-      one: "indlæg"
+      one: "%{count} indlæg"
       other: "%{count} indlæg"
     "new-topic": |
       Velkommen til %{site_name} &mdash; **Tak fordi du starter en ny samtale!**
 
-      - Lyder title interessant hvis du læser den højt? Er det et godt resumé?
+      - Lyder titlen interessant hvis du læser den højt? Er det et godt resumé?
       - Hvem ville være interesseret i dette? Hvorfor er det vigtigt? Hvilken type svar ønsker du?
-      - Inkludér relevante ord i dit emne så andre kan *finde* det. For at gruppere dit emne med relaterede emner, så vælg en kategori.
+      - Inkludér relevante ord i dit emne så andre kan *finde* det. For at gruppere dit emne med relaterede emner, så vælg en kategori (eller et mærke).
 
-      For mere info, [se vores retningslinjer](%{base_path}/guidelines). Dette panel vil kun vises første gang for %{education_posts_text}.
+      For mere info, [se vores retningslinjer](%{base_path}/guidelines). Dette panel vil kun blive vist for dit første %{education_posts_text}.
     "new-reply": |
       Velkommen til %{site_name} &mdash; **tak for at du deltager i samtalen!**
 
@@ -351,17 +460,31 @@ da:
 
       Du har oprettet et par emner og svar, men dit profilbillede er ikke så unik som du er -- det er bare et bogstav.
 
-      Har du overvejet at **[gå til din brugerprofil](%{profile_path})** og uploade et billede, der repræsenterer dig?
+      Har du overvejet at **[gå til din brugerprofil](%{profile_path})** og overføre et billede, der repræsenterer dig?
 
-      Det er lettere at følge diskussioner og finde interessant mennesker i samtaler, hvor alle har en unik avatar!
+      Det er lettere at følge diskussioner og finde interessante mennesker i samtaler, hvor alle har et unikt profilbillede!
     sequential_replies: |
       ### Overvej at svare på flere indlæg på én gang
 
-      I stedet for at lave mange svar i stribe til et emne, bør du overveje at lave et enkelt svar, som indeholder citater fra tidligere indlæg eller @navn-referencer til tidligere indlæg.
+      I stedet for at lave mange svar på stribe til et emne, bør du overveje at lave et enkelt svar, som indeholder citater fra tidligere indlæg eller @navn-referencer til tidligere indlæg.
 
       Du kan redigere dit forrige svar for at tilføje et citat ved at markere teksten og vælge <b>citér svar</b>-knappen som dukker op.
 
       Det er nemmere for alle at læse emner som har færre detaljerede svar i stedet for mange mindre, individuelle svar.
+    dominating_topic: |
+      ### Lad andre deltage i samtalen
+
+      Dette emne er helt klart vigtigt for dig &ndash; du har skrevet mere end %{percent}% af svarene her.
+
+      Det kunne være endnu bedre, hvis du gav andre mennesker plads til at dele deres synspunkter, også. Kan du invitere dem hertil?
+    get_a_room: |
+      ### Opfordre alle til at blive involveret i samtalen
+
+      Du har svaret %{count} gange til @%{reply_username} i dette emne!
+
+      En god diskussion indeholder mange stemmer og perspektiver. Kan du få andre involveret?
+
+      Og glem ikke, hvis du gerne vil fortsætte din længereverende samtale med denne særlige bruger uden for den offentlige visning, [send dem en personlig besked](%{base_path}/u/%{reply_username}).
     too_many_replies: |
       ### Du kan ikke skrive flere indlæg i dette emne
 
@@ -385,9 +508,15 @@ da:
         topic:
           attributes:
             base:
+              warning_requires_pm: "Du kan kun vedhæfte advarsler til personlige meddelelser."
               too_many_users: "Du kan kun sende advarsler til en bruger ad gangen."
+              cant_send_pm: "Beklager, du kan ikke sende en personlig besked til denne bruger."
               no_user_selected: "Du skal vælge en gyldig bruger."
               reply_by_email_disabled: "Svar via email er slået fra"
+              send_to_email_disabled: "Beklager, du kan ikke sende personlige beskeder til e-mail."
+              target_user_not_found: "En af de brugere, du sender denne besked til, kunne ikke findes."
+              unable_to_update: "Der opstod en fejl under opdatering af dette emne."
+              unable_to_tag: "Der opstod en fejl under mærkning af emnet."
             featured_link:
               invalid: "er ugyldig. URL'en skal indeholde http:// eller https://. "
               invalid_category: "kan ikke redigeres i denne kategori."
@@ -399,17 +528,25 @@ da:
               same_as_email: "er det samme som din email. Brug venligst en mere sikker adgangskode."
               same_as_current: "er det samme som din nuværende adgangskode."
               same_as_name: "er det samme som dit navn."
-              unique_characters: "har for mange af de samme tegn. Brug venligst en mere sikkert adgangskode."
+              unique_characters: "har for mange af de samme tegn. Brug venligst en mere sikker adgangskode."
             username:
-              same_as_password: "er det samme som dit kodeord"
+              same_as_password: "er det samme som din adgangskode"
             name:
               same_as_password: "er det samme som dit kodeord."
             ip_address:
-              signup_not_allowed: "Tilmelding er ikke tilladt fra den aktuelle adresse."
+              signup_not_allowed: "Tilmelding er ikke tilladt fra denne konto."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Dette emne kan ikke blive vist på din profil."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Gentildeling af en primær e-mail til en anden bruger er ikke tilladt."
         color_scheme_color:
           attributes:
             hex:
-              invalid: "er ikke en gyldig fave"
+              invalid: "er ikke en gyldig farve"
         post_reply:
           base:
             different_topic: "Indlæg og svar skal tilhøre det samme emne."
@@ -420,23 +557,30 @@ da:
         custom_emoji:
           attributes:
             name:
-              taken: er allerede i brug af en anden emoji
+              taken: er allerede i brug af et anden humørikon
         topic_timer:
           attributes:
             execute_at:
               in_the_past: "skal være i fremtiden."
+            duration_minutes:
+              cannot_be_zero: "skal være større end 0."
+              exceeds_maximum: "kan ikke være mere end 20 år."
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'Følgende interpolationsnøgle(r) er ugyldige: "%{keys}"'
         watched_word:
           attributes:
             word:
               too_many: "For mange ord til den handling"
       <<: *errors
-  uncategorized_category_name: "Andet"
+  uncategorized_category_name: "Ukategoriseret"
   vip_category_name: "Lounge"
   vip_category_description: "En ekslusiv kategori der kun er tilgængelig for medlemmer med tillidsniveu 3 eller højere."
   meta_category_name: "Site Feedback"
-  meta_category_description: "Diskussion om dette site, hvordan det er indrettet, hvordan det virker og hvordan vi kan forbedre det."
-  staff_category_name: "Staff"
-  staff_category_description: "Privat gruppe for staff diskussioner. Emner er kun synlige for administratorer og moderatorer."
+  meta_category_description: "Diskussion om dette websted, hvordan det er organiseret, hvordan det virker og hvordan vi kan forbedre det."
+  staff_category_name: "Personale"
+  staff_category_description: "Privat kategori for personale diskussioner. Emner er kun synlige for administratorer og moderatorer."
   discourse_welcome_topic:
     title: "Velkommen til Discourse"
     body: |2
@@ -454,8 +598,31 @@ da:
       Du bør eventuelt lukke dette emne via administratorfunktionen :wrench: (øverst til højre og i bunden), således at der ikke hober sig svar op til denne meddelelse.
   lounge_welcome:
     title: "Velkommen i loungen"
+    body: |2
+
+      Tillykke! :confetti_ball:
+
+      Hvis du kan se dette emne, blev du for nylig forfremmet til **almindelig** (tillidsniveau 3).
+
+      Du kan nu &hellip;
+
+      * Rediger titlen på ethvert emne
+      * Skift kategorien for ethvert emne
+      * Få alle dine links fulgt ([automatisk nofollow](https://en.wikipedia.org/wiki/Nofollow) fjernes )
+      * Adgang til en privat Lounge-kategori, der kun er synlig for brugere på tillidsniveau 3 og højere
+      * Skjul spam med en enkelt anmeldelse
+
+      Her er den [aktuelle liste over andre almindelige brugere](%{base_path}/badges/3/regular). Sørg for at sige hej.
+
+      Tak for at være en vigtig del af dette fællesskab!
+
+      (For mere information om tillidsniveauer, [se dette emne][trust]. Bemærk, at kun medlemmer, der fortsat overholder kravene over tid, vil fastholde deres status.)
+
+      [trust]: https://translate.google.dk/translate?hl=da&sl=en&u=https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/&prev=search&pto=aue
+  admin_quick_start_title: "LÆS ME FØRST: Admin Quick Start Guide"
   category:
     topic_prefix: "Kategoridefinition for %{category}"
+    replace_paragraph: "(Erstat dette første afsnit med en kort beskrivelse af din nye kategori. Denne vejledning vises i kategoriudvælgelsesområdet, så prøv at holde det under 200 tegn)."
     post_template: "%{replace_paragraph}\n\nBrug de følgende afsnit for en længere beskrivelse, eller introducere kategorien:\n\n- Hvorfor skal man anvende denne kategori? Hvad er formålet?\n\n- Hvordan er kategorien anderledes end de eksisterende kategorier?\n\n- Hvad skal emner i denne kategori indeholde?\n\n- Behøver vi denne kategori? Kan vi ikke flette indholdet ind i en eksisterende kategori, eller subkategori?\n"
     errors:
       not_found: "Denne kategori blev ikke fundet!"
@@ -465,8 +632,16 @@ da:
       invalid_email_in: "'%{email}' er ikke en gyldig email adresse."
       email_already_used_in_group: "'%{email}' anvendes allerede af gruppen '%{group_name}'."
       email_already_used_in_category: "'%{email}' bruges allerede af kategorien '%{category_name}'."
+      description_incomplete: "Kategori beskrivelsesindlægget skal have mindst et afsnit."
+      permission_conflict: "Enhver gruppe, der har tilladelse til at få adgang til en underkategori, skal også have adgang til den overordnede kategori. Følgende grupper har adgang til en af underkategorierne, men ingen adgang til overordnet kategori: %{group_names}."
+      disallowed_topic_tags: "Dette emne har mærker der ikke er tilladt af denne kategori: '%{tags}“"
+      disallowed_tags_generic: "Dette emne har ikke tilladte mærker."
     cannot_delete:
+      uncategorized: "Denne kategori er speciel. Den er beregnet som et opholdsområde for emner, der ikke har nogen kategori; den kan ikke slettes."
       has_subcategories: "Kan ikke slette denne kategori, fordi den har under kategorier."
+      topic_exists:
+        one: "Kan ikke slette denne kategori, fordi den har %{count} emne. Det ældste emne er %{topic_link}."
+        other: "Kan ikke slette denne kategori, fordi den har %{count} emner. Det ældste emne er %{topic_link}."
       topic_exists_no_oldest: "Kan ikke slette denne kategori fordi antallet af emner er %{count}"
     uncategorized_description: "Emner der ikke behøver kategori, eller ikke passer i eksisterende kategori."
   trust_levels:
@@ -481,7 +656,15 @@ da:
     leader:
       title: "Veteran"
     change_failed_explanation: "Du har forsøgt at degradere %{user_name} til '%{new_trust_level}'. Imidlertid er deres niveau af tillid allerede '%{current_trust_level}'. %{user_name} vil forblive'%{current_trust_level}' - hvis du ønsker at degradere brugeren, skal du først låse brugerens tillids niveau / Trust Level"
+  post:
+    image_placeholder:
+      broken: "Dette billede er i stykker"
+    has_likes:
+      one: "%{count} Synes om"
+      other: "%{count} Synes om"
   rate_limiter:
+    slow_down: "Du har udført denne handling for mange gange, prøv venligst igen senere."
+    too_many_requests: "Du har udført denne handling for mange gange. Vent venligst %{time_left} før du prøver igen."
     hours:
       one: "%{count} time"
       other: "%{count} timer"
@@ -491,6 +674,7 @@ da:
     seconds:
       one: "%{count} sekund"
       other: "%{count} sekunder"
+    short_time: "et par sekunder"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
@@ -507,7 +691,7 @@ da:
         one: "%{count}m"
         other: "%{count}m"
       about_x_hours:
-        one: "%{count}h"
+        one: "%{count}t"
         other: "%{count}t"
       x_days:
         one: "%{count}d"
@@ -546,14 +730,14 @@ da:
         one: "%{count} dag siden"
         other: "%{count} dage siden"
       about_x_months:
-        one: "ca. %{count} måned siden"
-        other: "ca. %{count} måneder siden"
+        one: "omkring %{count} måned siden"
+        other: "omkring %{count} måneder siden"
       x_months:
         one: "%{count} måned siden"
         other: "%{count} måneder siden"
       about_x_years:
-        one: "ca. %{count} år siden"
-        other: "ca. %{count} år siden"
+        one: "omkring %{count} år siden"
+        other: "omkring %{count} år siden"
       over_x_years:
         one: "over %{count} år siden"
         other: "over %{count} år siden"
@@ -561,34 +745,82 @@ da:
         one: "næsten %{count} år siden"
         other: "næsten %{count} år siden"
   password_reset:
-    no_token: "Beklager, dit kodeords-reset link er udløbet. Vælg 'Log ind' knappen og brug 'Jeg har glemt mit kodeord' for at få et nyt link."
+    no_token: "Beklager, dit skift-kodeords link er udløbet. Vælg 'Log ind' knappen og brug 'Jeg har glemt min adgangskode' for at få et nyt link."
     choose_new: "Vælg en ny adgangskode"
     choose: "Vælg en adgangskode"
-    update: "opdatér kodeord"
-    save: "Set kodeord"
-    title: "nulstil kodeord"
-    success: "Dit kodeord er ændret og du er nu logget ind."
-    success_unapproved: "Dit kodeord er ændret."
+    update: "Opdatér Adgangskode"
+    save: "Gem Adgangskode"
+    title: "Nulstil Adgangskode"
+    success: "Din adgangskode er ændret og du er nu logget ind."
+    success_unapproved: "Din adgangskode er nu ændret."
+  email_login:
+    title: "E-mail login"
   user_auth_tokens:
     browser:
       chrome: "Google Chrome"
+      discoursehub: "DiscourseHub app"
+      edge: "Microsoft Edge"
+      firefox: "Firefox"
+      ie: "Internet Explorer"
+      opera: "Opera"
+      safari: "Safari"
+      unknown: "ukendt browser"
+    device:
+      android: "Android-enhed"
+      chromebook: "Chrome OS"
+      ipad: "iPad"
+      iphone: "iPhone"
+      ipod: "iPod"
+      linux: "GNU/Linux Computer"
+      mac: "Mac"
+      mobile: "Mobil Enhed"
+      windows: "Windows Computer"
+      unknown: "ukendt enhed"
+    os:
+      android: "Android"
+      chromeos: "Chrome OS"
+      ios: "iOS"
+      linux: "Linux"
+      macos: "macOS"
+      windows: "Microsoft Windows"
+      unknown: "ukendt operativsystem"
   change_email:
-    confirmed: "Din e-mail-adresse er opdateret."
+    wrong_account_error: "Du er logget ind på den forkerte konto, log venligst ud og prøv igen."
+    confirmed: "Din e-mail-adresse er blevet opdateret."
     please_continue: "Fortsæt til %{site_name}"
-    error: "Der opstod en fejl under opdateringen af din e-mail-adresse. Måske er adressen allerede i brug?"
+    error: "Der opstod en fejl under ændringen af din e-mail-adresse. Måske er adressen allerede i brug?"
+    doesnt_exist: "Denne e-mailadresse er ikke knyttet til din konto."
     error_staged: "Der opstod en fejl under opdateringen af din e-mail-adresse. Måske er adressen allerede i brug?"
-    already_done: "Beklager, linket er ikke længere gyldigt - har du ændret din emal adresse?"
+    already_done: "Beklager, dette bekræftelseslink er ikke længere gyldigt. Måske er din email adresse allerede blevet ændret?"
+    confirm: "Bekræft"
+    max_secondary_emails_error: "Du har nået den maksimalt tilladte grænse for sekundære e-mails."
+    authorizing_new:
+      title: "Bekræft din nye e-mail"
+      description: "Bekræft venligst, at du gerne vil have din e-mailadresse ændret til:"
+      description_add: "Bekræft venligst, at du gerne vil tilføje en alternativ e-mailadresse:"
+    authorizing_old:
+      title: "Skift din e-mailadresse"
+      description: "Bekræft venligst din e-mail adresse ændring"
+      description_add: "Bekræft venligst, at du gerne vil tilføje en alternativ e-mailadresse:"
+      old_email: "Gammel e-mail: %{email}"
+      new_email: "Ny e-mail: %{email}"
+      almost_done_title: "Bekræfter ny e-mailadresse"
+      almost_done_description: "Vi har sendt en e-mail til din nye e-mail-adresse for at bekræfte ændringen!"
+  associated_accounts:
+    revoke_failed: "Det lykkedes ikke at tilbagekalde din konto med %{provider_name}."
+    connected: "(tilsluttet)"
   activation:
     action: "Klik her for at aktivere din konto"
     already_done: "Beklager, dette bekræftelses-link er ikke længere gyldigt. Måske er din konto allerede aktiv?"
-    please_continue: "Din nye konto er bekræftet; du bliver nu ledt til forsiden."
+    please_continue: "Din nye konto er bekræftet; du bliver nu omdirigeret til forsiden."
     continue_button: "Fortsæt til %{site_name}"
     welcome_to: "Velkommen til %{site_name}!"
-    approval_required: "En moderator skal godkende din nye konto før du kan tilgå forummet. Du får en e-mail, når din konto er godkendt!"
+    approval_required: "En moderator skal manuelt godkende din nye konto før du kan tilgå forummet. Du får en e-mail, når din konto er godkendt!"
     missing_session: "Vi kan ikke se om din konto blev oprettet, venligst tjek at cookies er accepteret."
-    activated: "Desværre, denne konto er allerede aktiveret."
+    activated: "Beklager, denne konto er allerede blevet aktiveret."
     admin_confirm:
       title: "Bekræft Admin Konto"
+      description: "Er du sikker på, at du vil have <b>%{target_username} (%{target_email})</b> til at være administrator?"
       grant: "Tildel Admin Adgang"
       complete: "<b>%{target_username}</b> er nu administrator."
       back_to: "Gå tilbage til %{title}"
@@ -598,20 +830,28 @@ da:
   post_action_types:
     off_topic:
       title: "Uden for emnet"
-      description: "Dette indlæg er ikke relevant for denne diskussion som defineret af titlen og det første indlæg. Det skal nok flyttes et andet sted hen."
+      description: "Dette indlæg er ikke relevant for denne diskussion som defineret af overskriften og det første indlæg. Det skal nok flyttes et andet sted hen."
+      short_description: "Ikke relevant for diskussionen"
     spam:
       title: "Spam"
-      email_title: '"%{title}" blev markeret som spam'
+      description: "Dette indlæg er en annonce, eller hærværk. Det er ikke nyttigt eller relevant for det aktuelle emne."
+      short_description: "Dette er en annonce eller hærværk"
+      email_title: '"%{title}" blev anmeldt som spam'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: "Upassende"
+      description: 'Dette indlæg indeholder indhold, som en fornuftig person ville anse offensiv, misbrug, eller en overtrædelse af <a href="%{base_path}/guidelines">vores retningslinjer for fællesskabet</a>.'
+      short_description: 'En overtrædelse af <a href="%{base_path}/guidelines">vores retningslinjer for fællesskabet</a>'
     notify_user:
       title: "Send @%{username} en besked"
+      description: "Jeg vil gerne tale med denne person direkte og personligt om deres indlæg."
+      short_description: "Jeg vil gerne tale med denne person direkte og personligt om deres indlæg."
       email_title: 'Dit indlæg i "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Noget andet"
       description: "Dette indlæg kræver moderatorernes opmærksomhed baseret på <a href=\"%{base_path}/faq\">Den Gode Tone</a>, <a href=\"%{tos_url}\">Brugerbetingelser</a> eller en anden grund, som ikke er nævnt ovenfor."
+      short_description: "Kræver personalets opmærksomhed af en anden grund"
       email_title: 'Et indlæg i "%{title}" afkræver stillingtagen hos administrator'
       email_body: "%{link}\n\n%{message}"
     bookmark:
@@ -620,32 +860,76 @@ da:
       short_description: "Bogmærk dette indlæg"
     like:
       title: "Like"
-      description: "Du liker dette indlæg"
-      short_description: "Du liker dette indlæg"
+      description: "Du 'Synes godt om' dette indlæg"
+      short_description: "Du 'synes godt om' dette indlæg"
+  draft:
+    sequence_conflict_error:
+      title: "kladdefejl"
+      description: "Kladde redigeres i et andet vindue. Genindlæs venligst denne side."
+  draft_backup:
+    pm_title: "Sikkerhedskopiér Kladder fra igangværende emner"
+    pm_body: "Emne, der indeholder backup-kladder"
   user_activity:
     no_default:
       self: "Du har endnu ingen aktivitet."
       others: "Ingen aktivitet."
     no_bookmarks:
+      self: "Du har ingen bogmærkede indlæg; bogmærker giver dig mulighed for hurtigt at henvise til bestemte indlæg."
+      search: "Ingen bogmærker fundet med den angivne søgeforespørgsel."
       others: "Ingen bogmærker"
     no_likes_given:
       self: "Du har ikke liket nogen indlæg."
       others: "Ingen 'synes om'-beskeder."
+    no_replies:
+      self: "Du har ikke svaret på nogen indlæg."
+      others: "Ingen svar."
+    no_drafts:
+      self: "Du har ingen udkast; begynd at skrive et svar i et hvilket som helst emne og det vil blive gemt automatisk som et nyt udkast."
+  email_settings:
+    pop3_authentication_error: "Der var et problem med de angivne POP3-legitimationsoplysninger, tjek brugernavnet og adgangskoden, og prøv igen."
+    imap_authentication_error: "Der var et problem med de leverede IMAP-legitimationsoplysninger, tjek brugernavnet og adgangskoden, og prøv igen."
+    imap_no_response_error: "Der opstod en fejl under kommunikation med IMAP-serveren. %{message}"
+    smtp_authentication_error: "Der var et problem med de angivne SMTP-legitimationsoplysninger, tjek brugernavnet og adgangskoden, og prøv igen."
+    smtp_server_busy_error: "SMTP-serveren er i øjeblikket optaget, prøv igen senere."
+    smtp_unhandled_error: "Der opstod en uhåndteret fejl under kommunikation med SMTP-serveren. %{message}"
+    connection_error: "Der var et problem med forbindelsen til serveren, tjek serverens navn og port og prøv igen."
+    timeout_error: "Forbindelsen til serveren fik timeout, tjek serverens navn og port og prøv igen."
+    unhandled_error: "Uhåndteret fejl ved test af e-mail-indstillinger. %{message}"
+  webauthn:
+    validation:
+      invalid_type_error: "Den angivne webauthn-type var ugyldig. Gyldige typer er webauthn.get og webauthn.create."
+      challenge_mismatch_error: "Den leverede udfordring svarer ikke til den udfordring, der genereres af godkendelsesserveren."
+      invalid_origin_error: "Oprindelsen af godkendelsesanmodningen matcher ikke serverens oprindelse."
+      malformed_attestation_error: "Der opstod en fejl under afkodningen af attesteringsdataene."
+      user_verification_error: "Brugerbekræftelse er påkrævet."
+      unsupported_attestation_format_error: "Attestationsformatet understøttes ikke af serveren."
+      credential_id_in_use_error: "Det angivne legitimations-ID er allerede i brug."
+      ownership_error: "Sikkerhedsnøglen er ikke ejet af brugeren."
+      not_found_error: "En sikkerhedsnøgle med det angivne legitimationsoplysnings-id kunne ikke findes."
+      unknown_cose_algorithm_error: "Algoritmen, der bruges til sikkerhedsnøglen, genkendes ikke."
   topic_flag_types:
     spam:
       title: "Spam"
       description: "Dette emne minder mere om en reklame end et debatindlæg. Det er ikke nyttigt eller relevant for diskussionen."
-      long_form: "markerede dette som spam"
+      long_form: "anmeldte dette som spam"
+      short_description: "Dette er en annonce"
     inappropriate:
       title: "Upassende"
-      long_form: "markeret upassende"
+      description: 'Dette emne indeholder indhold, som en fornuftig person anser for stødende, krænkende eller en overtrædelse af <a href="%{base_path}/guidelines">vores retningslinjer for fællesskabet</a>.'
+      long_form: "anmeldte dette som upassende"
+      short_description: 'En overtrædelse af <a href="%{base_path}/guidelines">vores retningslinjer for fællesskabet</a>'
     notify_moderators:
       title: "Noget andet"
-      long_form: "markerede dette til gennemsyn"
+      description: 'Dette emne kræver generel opmærksomhed fra personalet baseret på <a href="%{base_path}/guidelines">retningslinjerne</a>, <a href="%{tos_url}">TOS</a>eller af en anden grund ikke nævnt ovenfor.'
+      long_form: "anmeldte dette til moderator gennemsyn"
+      short_description: "Kræver personalets opmærksomhed af en anden grund"
       email_title: 'Emnet "%{title}" kræver moderator-opmærksomhed'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    user_must_edit: "<p>Dette indlæg er blevet markert af fællesskabet, og er midlertidigt skjult.</p>"
+    you_must_edit: '<p>Dit indlæg blev anmeldt af fællesskabet. Venligst <a href="%{path}">se dine beskeder</a>.</p>'
+    user_must_edit: "<p>Dette indlæg er blevet anmeldt af fællesskabet, og er midlertidigt skjult.</p>"
+  ignored:
+    hidden_content: "<p>Ignoreret indhold</p>"
   archetypes:
     regular:
       title: "Almindeligt emne"
@@ -655,18 +939,27 @@ da:
         make: "Dette emne er nu et banner-emne. Det optræder i toppen af alle sider indtil brugeren fjerner det."
         remove: "Dette emne er ikke mere et banner-emne. Det optræder ikke længere i toppen af alle sider."
   unsubscribed:
+    title: "E-mail-præferencer opdateret!"
+    description: "email præferencer for <b>%{email}</b> blev opdateret. For at ændre dine e-mail indstillinger, kan du <a href='%{url}'>besøg dine brugerindstillinger</a>."
     topic_description: "For at følge %{link}, brug notifikationsindstillinger i bunden, eller til højre for emnet."
+    private_topic_description: "For at genabonnere skal du bruge notifikationskontrollen nederst eller til højre for emnet."
+  uploads:
+    marked_insecure_from_theme_component_reason: "overførsel anvendt i temakomponenten"
   unsubscribe:
     title: "Frameld"
     stop_watching_topic: "Følg ikke længere dette emne, %{link}"
-    mute_topic: "Nulstil alle notifikationer for dette emne/indlæg, %{link}"
+    mute_topic: "Tavshed fra alle notifikationer for dette emne/indlæg, %{link}"
     unwatch_category: "Følg ikke længere disse emner i %{category}"
     mailing_list_mode: "Sluk mailing list modus"
-    all: "Send ikke email fra %{sitename} til mig"
+    all: "Send mig ikke nogen mail fra %{sitename}"
     different_user_description: "Du er i øjeblikket logget ind som en anden bruger, end den vi har emailet. Venligst log ud, eller gå i anonym modus, og prøv igen"
-    not_found_description: "Beklager, men vi kunne ikke finde denne afmeldelse. Er det muligt at linket i emailen er udløbet?"
+    not_found_description: "Beklager, vi kunne ikke finde denne afmelding. Det er muligt at linket i din e-mail er for gammel og nu er udløbet?"
     log_out: "Log ud"
+    submit: "Gem indstillinger"
     digest_frequency:
+      title: "Du modtager oversigtsmails %{frequency}"
+      never_title: "Du modtager ikke oversigtsmails"
+      select_title: "Angiv hyppighed af oversigtsmails til"
       never: "aldrig"
       every_30_minutes: "hvert 30. minut"
       every_hour: "hver time"
@@ -678,13 +971,16 @@ da:
     title: "Autoriser venligst at applikationen kan få adgang"
     authorize: "Autoriser"
     read: "læst"
-    read_write: "læs/skriv"
+    read_write: "læse/skrive"
     description: '"%{application_name}" anmoder om følgende adgang til din konto:'
+    instructions: 'Vi har netop genereret en ny bruger-API-nøgle, som du kan bruge med "%{application_name}", indsæt venligst følgende nøgle i din applikation:'
+    otp_description: 'Vil du tillade at "%{application_name}" får adgang til dette websted?'
     otp_confirmation:
       confirm_title: Fortsæt til %{site_name}
+      logging_in_as: Logger ind som %{username}
       confirm_button: Afslut login
-    no_trust_level: "Beklager, du har ikke adgang til brugerens API"
-    generic_error: "Beklager, vi er ikke i stand til at give dig API nøgler, denne funktionalitet er muligvis bestemt af sitets administrator"
+    no_trust_level: "Beklager, du har ikke det krævede tillidsniveau for at få adgang til bruger-API'en"
+    generic_error: "Beklager, vi er ikke i stand til at udstede bruger-API-nøgler. Denne funktion kan muligvis være deaktiveret af webstedsadministratoren"
     scopes:
       message_bus: "Live opdateringer"
       notifications: "Læs og ryd notifikationer"
@@ -692,67 +988,128 @@ da:
       session_info: "Læs brugersession-info"
       read: "Læs alt"
       write: "Skriv alt"
+      one_time_password: "Opret et engangs login token"
+      bookmarks_calendar: "Læse bogmærkepåmindelser"
+    invalid_public_key: "Beklager, den offentlige nøgle er ugyldig."
+    invalid_auth_redirect: "Beklager, denne auth_redirect vært er ikke tilladt."
+    invalid_token: "Manglede, ugyldigt eller udløbet token."
+  flags:
+    errors:
+      already_handled: "Anmeldelsen var allerede håndteret"
   reports:
     default:
       labels:
         count: Tælle
+        percent: Procent
         day: Dag
     post_edits:
+      title: "Indlægs Redigeringer"
       labels:
         edited_at: Dato
         post: Indlæg
         editor: Redaktør
+        author: Forfatter
         edit_reason: Grund
+      description: "Antal nye indlægsredigeringer."
     user_flagging_ratio:
+      title: "Bruger Anmeldelses Fordeling"
       labels:
-        user: bruger
+        user: Bruger
+        agreed_flags: Godkendte Anmeldelser
+        disagreed_flags: Afviste Anmeldelser
+        ignored_flags: Ignorerede anmeldelser
         score: Score
     moderators_activity:
+      title: "Moderator aktivitet"
       labels:
         moderator: Moderator
+        flag_count: Anmeldelser Gennemgået
+        time_read: Læsningstid
+        topic_count: Emner oprettet
+        post_count: Oprettede indlæg
+        pm_count: PM'er oprettet
+        revision_count: Revisioner
+      description: Liste over moderator-aktivitet, herunder gennemgåede anmeldelser, læsetid, oprettede emner, oprettede indlæg, oprettede personlige meddelelser og revisioner.
     flags_status:
+      title: "Anmeldelses Status"
+      values:
+        agreed: Enig
+        disagreed: Uenig
+        deferred: Udskudt
+        no_action: Ingen handling
       labels:
         flag: Type
+        assigned: Tildelt
+        flagger: Indberetter
     visits:
       title: "Brugerbesøg"
       xaxis: "Dag"
       yaxis: "Antal besøg"
+      description: "Antal af alle brugerbesøg."
     signups:
+      title: "Tilmeldinger"
       xaxis: "Dag"
+      yaxis: "Antal tilmeldinger"
+      description: "Nye kontoregistreringer i denne periode."
     new_contributors:
+      title: "Nye Bidragydere"
       xaxis: "Dag"
+      yaxis: "Antal nye bidragsydere"
+      description: "Antal brugere, der har foretaget deres første indlæg i denne periode."
     trust_level_growth:
+      title: "Tillidsniveau vækst"
+      xaxis:
+        tl1_reached: "Nået TL1"
+        tl2_reached: "Nået TL2"
+        tl3_reached: "Nået TL3"
+        tl4_reached: "Nået TL4"
       yaxis: "Dag"
     consolidated_page_views:
+      title: "Konsoliderede Sidevisninger"
+      xaxis:
+        page_view_crawler: "Crawlere"
+        page_view_anon: "Anonyme brugere"
+        page_view_logged_in: "Brugere logget på"
       yaxis: "Dag"
       labels:
         post: Indlæg
         editor: Redaktør
+        author: Forfatter
         edit_reason: Grund
     dau_by_mau:
+      title: "DAU/MAU"
       xaxis: "Dag"
+      yaxis: "DAU/MAU"
     daily_engaged_users:
+      title: "Dagligt Engagerede Brugere"
       xaxis: "Dag"
+      yaxis: "Engagerede Brugere"
+      description: "Antal brugere, der har 'Syntes godt om' eller skrevet den seneste dag."
     profile_views:
-      title: "Bruger Profil Visninger"
+      title: "Brugerprofilvisninger"
       xaxis: "Dag"
       yaxis: "Antag sete brugerprofiler"
+      description: "Samlet antal nye visninger af brugerprofiler."
     topics:
       title: "Emner"
       xaxis: "Dag"
       yaxis: "Antal nye emner"
+      description: "Nye emner oprettet i denne periode."
     posts:
       title: "Indlæg"
       xaxis: "Dag"
       yaxis: "Antal nye indlæg"
+      description: "Nye indlæg oprettet i denne periode"
     likes:
       title: "Likes"
       xaxis: "Dag"
       yaxis: "Antal nye likes"
+      description: "Antal nye 'Synes godt om'."
     flags:
-      title: "Flag"
+      title: "Anmeldelser"
       xaxis: "Dag"
-      yaxis: "Antal flag"
+      yaxis: "Antal anmeldelser"
+      description: "Antal nye anmeldelser."
     bookmarks:
       title: "Bogmærker"
       xaxis: "Dag"
@@ -761,7 +1118,12 @@ da:
       title: "Brugere pr. tillidsniveau"
       xaxis: "Tillidsniveau"
       yaxis: "Antal brugere"
+      labels:
+        level: Niveau
+      description: "Antal brugere grupperet efter tillidsniveau."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
+      title: "Brugere pr. type"
       xaxis: "Type"
       yaxis: "Antal brugere"
       labels:
@@ -772,6 +1134,7 @@ da:
         suspended: Suspenderet
         silenced: Mådeholdt (silenced)
     trending_search:
+      title: Populære Søgetermer
       labels:
         term: Betingelse
         searches: søgninger
@@ -780,39 +1143,49 @@ da:
       title: "Sendte e-mails"
       xaxis: "Dag"
       yaxis: "Antal e-mails"
+      description: "Antal nye e-mails sendt."
     user_to_user_private_messages:
+      title: "Bruger-til-Bruger (eksklusive svar)"
       xaxis: "Dag"
       yaxis: "Antal beskeder"
+      description: "Antal nystartede personlige meddelelser."
     user_to_user_private_messages_with_replies:
+      title: "Bruger-til-Bruger (med svar)"
       xaxis: "Dag"
       yaxis: "Antal beskeder"
+      description: "Antal nye personlige beskeder og svar."
     system_private_messages:
       title: "System"
       xaxis: "Dag"
       yaxis: "Antal beskeder"
+      description: "Antal personlige beskeder sendt automatisk af systemet."
     moderator_warning_private_messages:
       title: "Moderatoradvarsler"
       xaxis: "Dag"
       yaxis: "Antal beskeder"
+      description: "Antal advarsler sendt som personlige beskeder fra moderatorer."
     notify_moderators_private_messages:
       title: "Underret moderatorer"
       xaxis: "Dag"
       yaxis: "Antal beskeder"
+      description: "Antal gange moderatorer er blevet underrettet privat af en anmeldelse."
     notify_user_private_messages:
-      title: "Underret bruger"
+      title: "Giv brugeren besked"
       xaxis: "Dag"
       yaxis: "Antal beskeder"
+      description: "Antal gange, brugere har fået privat besked af en anmeldelse."
     top_referrers:
       title: "Top henvisere"
-      xaxis: "bruger"
+      xaxis: "Bruger"
       num_clicks: "Klik"
       num_topics: "Emner"
       labels:
-        user: "bruger"
+        user: "Bruger"
         num_clicks: "Klik"
         num_topics: "Emner"
+      description: "Brugere opført efter antal klik på links, de har delt."
     top_traffic_sources:
-      title: "Top trafikkilder"
+      title: "Top Trafik Kilder"
       xaxis: "Domæne"
       num_clicks: "Klik"
       num_topics: "Emner"
@@ -822,7 +1195,7 @@ da:
         num_clicks: Klik
         num_topics: Emner
     top_referred_topics:
-      title: "Top henviste emner"
+      title: "Top Henviste Emner"
       labels:
         num_clicks: "Klik"
         topic: "Emne"
@@ -830,10 +1203,12 @@ da:
       title: "Anonym"
       xaxis: "Dag"
       yaxis: "Anonyme Sidevisninger"
+      description: "Antal nye sidevisninger af besøgende, der ikke er logget ind på en konto."
     page_view_logged_in_reqs:
       title: "Logget ind"
       xaxis: "Dag"
       yaxis: "Logged in Sidevisninger"
+      description: "Antal nye sidevisninger fra brugere, der er logget ind."
     page_view_crawler_reqs:
       title: "Web Crawler Sidevisninger"
       xaxis: "Dag"
@@ -842,14 +1217,17 @@ da:
       title: "Sidevisninger"
       xaxis: "Dag"
       yaxis: "Totalt antal Sidevisninger"
+      description: "Antal nye sidevisninger fra alle besøgende."
     page_view_logged_in_mobile_reqs:
       title: "Logged in Sidevisninger"
       xaxis: "Dag"
       yaxis: "Sidevisninger fra mobile enheder"
+      description: "Antal nye sidevisninger fra brugere på mobile enheder og logget ind på en konto."
     page_view_anon_mobile_reqs:
       title: "Anonyme Sidevisninger"
       xaxis: "Dag"
       yaxis: "anonyme mobile sidevisninger"
+      description: "Antal nye sidevisninger fra besøgende på en mobil enhed, der ikke er logget ind."
     http_background_reqs:
       title: "Baggrund"
       xaxis: "Dag"
@@ -859,146 +1237,316 @@ da:
       xaxis: "Dag"
       yaxis: "Succesfulde anmodninger (Status 2xx)"
     http_3xx_reqs:
-      title: "HTTP 3xx (Redirect)"
+      title: "HTTP 3xx (Omdirigering)"
       xaxis: "Dag"
-      yaxis: "Redirect anmodninger (Status 3xx)"
+      yaxis: "Omdirigerings anmodninger (Status 3xx)"
     http_4xx_reqs:
-      title: "HTTP 4xx (Client Error)"
+      title: "HTTP 4xx (Klientfejl)"
       xaxis: "Dag"
-      yaxis: "Client Errors (Status 4xx)"
+      yaxis: "Klientfejl (Status 4xx)"
     http_5xx_reqs:
-      title: "HTTP 5xx (Server Error)"
+      title: "HTTP 5xx (Serverfejl)"
       xaxis: "Dag"
-      yaxis: "Server Fejl (Status 5xx)"
+      yaxis: "Serverfejl (Status 5xx)"
     http_total_reqs:
       title: "Total"
       xaxis: "Dag"
       yaxis: "Total antal anmodninger"
     time_to_first_response:
-      title: "Time to first response"
+      title: "Tid til første svar"
       xaxis: "Dag"
       yaxis: "Gennemsnitlig tid (timer)"
+      description: "Gennemsnitlig tid (i timer) for det første svar på nye emner."
     topics_with_no_response:
       title: "Emner uden svar"
       xaxis: "Dag"
       yaxis: "Total"
+      description: "Antal nye emner, der blev oprettet, og som ikke fik svar."
     mobile_visits:
+      title: "Brugerbesøg (mobil)"
       xaxis: "Dag"
       yaxis: "Antal besøg"
+      description: "Antal unikke brugere, der besøgte ved hjælp af en mobil enhed."
     web_crawlers:
+      title: "Web Crawler Bruger Agenter"
       labels:
+        user_agent: "Bruger Agent"
         page_views: "Sidevisninger"
     suspicious_logins:
+      title: "Mistænkelige Logins"
       labels:
-        user: bruger
+        user: Bruger
+        client_ip: Klient IP
         location: Sted
+        browser: Browser
+        device: Enhed
+        os: Operativsystem
+        login_time: Login Tid
+      description: "Detaljer om nye logins, der afviger mistænkeligt fra tidligere logins."
     staff_logins:
+      title: "Admin Logins"
       labels:
-        user: bruger
+        user: Bruger
         location: Sted
+        login_at: Logintidspunkt
+      description: "Liste over admin login tider med placeringer."
     top_uploads:
+      title: "Top Overførsler"
       labels:
         filename: Filnavn
-        extension: Udvidelse
+        extension: Filtypenavn
+        author: Forfatter
         filesize: Filstørrelse
+      description: "Liste over alle overførsler efter udvidelse, filstørrelse og forfatter."
+    top_ignored_users:
+      title: "Top Ignorerede / Tavse Brugere"
+      labels:
+        ignored_user: Ignoreret Bruger
+        mutes_count: Tavsheds tæller
+      description: "Brugere, der er gjort tavse og/eller ignoreret af mange andre brugere."
   dashboard:
     rails_env_warning: "Din server kører i %{env}-tilstand."
-    host_names_warning: "Filen config/database.yml bruger localhost som værtsnavn. Opdatér den med sitets værtsnavn."
-    sidekiq_warning: 'Sidekiq kører ikke. Mange opgaver, som f.eks. udsendelse af e-mail, afvikles asynkront af sidekiq. Du skal sikre dig at der kører mindst én sidekiq-proces. <a href="https://github.com/mperham/sidekiq" target="_blank">Læs mere om Sidekiq her</a>.'
-    queue_size_warning: "Antallet af job i kø er %{queue_size}, hvilket er højt. Dette kunne indikere at der er et problem med Sidekiq processerne, eller du behøver at tilføre flere Sidekiq resurser."
+    host_names_warning: "Din config/database.yml fil bruger standardnavnet localhost som værtsnavn. Opdatér den med webstedets værtsnavn."
+    sidekiq_warning: 'Sidekiq kører ikke. Mange opgaver, som f.eks. udsendelse af e-mails, afvikles asynkront af sidekiq. Du skal sikre dig at der kører mindst én sidekiq-proces. <a href="https://github.com/mperham/sidekiq" target="_blank">Læs mere om Sidekiq her</a>.'
+    queue_size_warning: "Antallet af job i kø er %{queue_size}, hvilket er højt. Dette kunne indikere at der er et problem med Sidekiq processerne, eller at du kan være nødt til at tilføre flere Sidekiq arbejder-resurser."
     memory_warning: "Din server kører med mindre end 1 GB samlet hukommelse. Det anbefales at have mindst 1 GB hukommelse."
-    subfolder_ends_in_slash: "Din undermappe er ikke opsat korrekt; DISCOURSE_RELATIVE_URL_ROOT ender med en slash."
+    google_oauth2_config_warning: 'Serveren er konfigureret til at tillade tilmelding og login med Google OAuth2 (enable_google_oauth2_logins), men klient-id''et og klientens hemmelige værdier er ikke indstillet. Gå til <a href="%{base_path}/admin/site_settings">Webstedsindstillinger</a> og opdater indstillingerne. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Se denne vejledning for at lære mere</a>.'
+    facebook_config_warning: 'Serveren er konfigureret til at tillade tilmelding og login med Google OAuth2 (enable_facebook_logins), men app-id''et og den hemmelige værdi er ikke indstillet. Gå til <a href="%{base_path}/admin/site_settings">Webstedsindstillinger</a> og opdater indstillingerne. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Se denne vejledning for at lære mere</a>.'
+    twitter_config_warning: 'Serveren er konfigureret til at tillade tilmelding og login med Twitter (enable_twitter_logins), men nøgle- og hemmelige værdier er ikke indstillet. Gå til <a href="%{base_path}/admin/site_settings">Webstedsindstillinger</a> og opdater indstillingerne. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Se denne vejledning for at lære mere</a>.'
+    github_config_warning: 'Serveren er konfigureret til at tillade tilmelding og login med GitHub (enable_github_logins), men klient-id og hemmelig værdie er ikke indstillet. Gå til <a href="%{base_path}/admin/site_settings">Webstedsindstillinger</a> og opdater indstillingerne. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Se denne vejledning for at lære mere</a>.'
+    s3_config_warning: 'Serveren er konfigureret til at overføre filer til S3, men mindst en af følgende indstillinger er ikke indstillet: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile eller s3_upload_bucket. Gå til <a href="%{base_path}/admin/site_settings">Webstedsindstillinger</a> og opdater indstillingerne. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Se "Sådan konfigureres overførsel af billeder til S3?" for at lære mere</a>.'
+    s3_backup_config_warning: 'Serveren er konfigureret til at overføre sikkerhedskopier til S3, men mindst en af følgende indstillinger er ikke indstillet: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile eller s3_backup_bucket. Gå til <a href="%{base_path}/admin/site_settings">Webstedsindstillinger</a> og opdater indstillingerne. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Se "Sådan konfigureres overførsel af billeder til S3?" for at lære mere</a>.'
+    s3_cdn_warning: 'Serveren er konfigureret til at overføre filer til S3, men der er ingen S3 CDN konfigureret. Dette kan føre til dyre S3-omkostninger og langsommere webstedsydelse. <a href="https://meta.discourse.org/t/-/148916" target="_blank">Se "Brug af objektlagring til overførsler" for at lære mere</a>.'
+    image_magick_warning: 'Serveren er konfigureret til at oprette miniaturebilleder af store billeder, men ImageMagick er ikke installeret. Installer ImageMagick hjælp af din foretrukne pakkehåndtering eller <a href="https://www.imagemagick.org/script/download.php" target="_blank">hent den nyeste version</a>.'
+    failing_emails_warning: 'Der er %{num_failed_jobs} e-mail-job(s), der mislykkedes. Tjek din app.yml, og sørg for, at mailserverindstillingerne er korrekte. <a href="%{base_path}/sidekiq/retries" target="_blank">Se de mislykkede job i Sidekiq</a>.'
+    subfolder_ends_in_slash: "Din undermappe opsætning er forkert; DISCOURSE_RELATIVE_URL_ROOT ender med en skråstreg."
     email_polling_errored_recently:
       one: "Email afstemning har afstedkommet en fejl i de seneste 24 timer. Venligst se <a href='%{base_path}/logs' target='_blank'>the logs</a> for detaljer."
       other: "Email afstemning har afstedkommet %{count} fejl i de seneste 24 timer. Se venligst <a href='%{base_path}/logs' target='_blank'>the logs</a> for detaljer."
-    poll_pop3_timeout: "Forbindelsen til til POP3 serveren er udløbet. Indkomne mail kunne ikke hentes. Venligst tjek <a href='%{base_path}/admin/site_settings/category/email'>POP3 settings</a> og udbyderen."
-    poll_pop3_auth_error: "Forbindelsen til POP3 serveren melder fejl. Venligst tjek <a href='%{base_path}/admin/site_settings/category/email'>POP3 settings</a>."
+    missing_mailgun_api_key: "Serveren er konfigureret til at sende e-mails via Mailgun, men du har ikke angivet en API-nøgle, der bruges til at bekræfte webhook-meddelelserne."
+    bad_favicon_url: "Favicon ikonet kunne ikke indlæses. Kontroller din favicon-indstilling i <a href='%{base_path}/admin/site_settings'>Webstedsindstillinger</a>."
+    poll_pop3_timeout: "Forbindelsen til POP3-serveren udløber. Indgående e-mail kunne ikke hentes. Kontroller dine <a href='%{base_path}/admin/site_settings/category/email'>POP3-indstillinger</a> og tjenesteudbyder."
+    poll_pop3_auth_error: "Forbindelsen til POP3-serveren mislykkes med en godkendelsesfejl. Kontroller dine <a href='%{base_path}/admin/site_settings/category/email'>POP3-indstillinger</a>."
+    force_https_warning: "Dit websted bruger SSL. Men '<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>' er endnu ikke aktiveret i dine webstedsindstillinger."
+    out_of_date_themes: "Opdateringer er tilgængelige for følgende temaer:"
+    unreachable_themes: "Vi kunne ikke tjekke for opdateringer til følgende temaer:"
   site_settings:
+    display_local_time_in_user_card: "Vis den lokale tid baseret på en brugers tidszone, når deres brugerkort åbnes."
     censored_words: "Ord der automatisk vil blive erstattet med &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Slet automatisk skjulte indlæg der forbliver skjulte i mere end 30 dage."
+    default_locale: "Standardsproget for denne Discourse instans. Du kan erstatte teksten for systemgenererede kategorier og emner på <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Tilpas / Tekst</a>."
     allow_user_locale: "Tillad brugere at vælge egne sprog præferencer på site"
+    set_locale_from_accept_language_header: "indstil grænsefladesprog for anonyme brugere ud fra deres webbrowsers sprog headere"
+    support_mixed_text_direction: "Understøt blandede tekstretninger fra venstre til højre og højre mod venstre."
     min_post_length: "Minimumlængde tilladt for indlæg i tegn"
     min_first_post_length: "Minimum tilladte antal tegn (i emne felt) i første indlæg"
     min_personal_message_post_length: "Minimumlængde tilladt for indlæg i tegn"
     max_post_length: "Maksimal længde af indlæg i tegn"
     topic_featured_link_enabled: "Tillad opslag af et link med emner."
     show_topic_featured_link_in_digest: "Vis link med det fremhævede emne i e-mail-sammendraget."
+    min_topic_views_for_delete_confirm: "Minimum antal visninger et emne skal have før en bekræftelse popup vises, når det bliver slettet"
     min_topic_title_length: "Minimumslængde af emnetitel i tegn."
     max_topic_title_length: "Maksimumslængde af emnetitel i tegn."
     min_personal_message_title_length: "Minimumslængde af emnetitel i tegn."
+    max_emojis_in_title: "Maksimum tilladte humørikoner i emnetitel"
     min_search_term_length: "Antal tegn i søgefeltet skal have et minimum"
     search_tokenize_chinese_japanese_korean: "Tving søg til at \"tokenize\" Chinese/Japanese/Korean selv på sites som ikke er CJK"
     search_prefer_recent_posts: "Såfremt søgning på forum er langsomt, kan denne option indeksere og vise nyeste indlæg først"
     search_recent_posts_size: "Hvor mange nye indlæg skal der gemmes i index"
+    log_search_queries: "Log søgeforespørgsler udført af brugere"
+    search_query_log_max_size: "Maksimalt antal søgeforespørgsler, der skal gemmes"
+    search_query_log_max_retention_days: "Maksimal tid søgeforespørgsler skal gemmes i antal dage."
+    search_ignore_accents: "Ignorér accenter ved søgning efter tekst."
+    category_search_priority_low_weight: "Vægt anvendt på rangering for lav kategori søgeprioritet."
+    category_search_priority_high_weight: "Vægt anvendt på rangering for høj kategori søgeprioritet."
     allow_uncategorized_topics: "Tillad at emner kan oprettes uden et kategori. ADVARSEL: Hvis der er nogen ikke-kategoriserede emner, skal du først kategorisere dem inden du deaktiverer dette."
     allow_duplicate_topic_titles: "Tillad emner med identiske titler ."
+    allow_duplicate_topic_titles_category: "Tillad emner med identiske, duplikerede titler, hvis kategorien er anderledes. allow_duplicate_topic_titles skal være falsk."
     unique_posts_mins: "Hvor mange minutter der skal gå før en bruger kan skrive et indlæg med det samme indhold igen."
     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: "Sitets navn, som anvendt i tittel."
     site_description: "Beskriv denne side i én sætning, som anvendt i meta beskrivelsen."
+    short_site_description: "Kort beskrivelse, som bruges i titelmærket på websiden."
     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)"
     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."
+    staff_edit_locks_post: "Indlæg vil være låst fra redigering, hvis de redigeres af personalet"
     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."
     delete_removed_posts_after: "Indlæg, fjernet af forfatteren, vil blive automatisk slettet efter (n) hours. Såfremt værdien sat til 0 vil indlæg blive fjernet straks."
     max_image_width: "Maximum thumbnail width of images in a post"
     max_image_height: "Maksimum miniaturebillede højde for billeder i et indlæg"
     fixed_category_positions: "Hvis krydset af, vil du være i stand til at arrangere ordnet visning af kategorier. Hvis ikke afkrydset vil de være listet i en rækkefølge baseret på aktivitet."
     fixed_category_positions_on_create: "Hvis afkrydset vil kategori visning blive vedligeholdt baseret på emne (kræver manuelt valgt visning af kategorier)."
+    add_rel_nofollow_to_user_content: 'Tilføj rel nofollow til alt indsendt brugerindhold, undtagen interne links (herunder overordnede domæner). Hvis du ændrer dette, skal du gen-bage alle indlæg med: "rake indlæg:rebake“'
+    exclude_rel_nofollow_domains: "En liste over domæner, hvor nofollow ikke skal føjes til links. eksempel.dk tillader automatisk også sub.eksempel.dk. Som et minimum bør du tilføje domænet på dette websted for at hjælpe webcrawlere med at finde alt indhold. Hvis andre dele af dit websted er på andre domæner, bør du også tilføje dem."
     post_excerpt_maxlength: "Max længde på uddrag af indlæg / opsummering."
+    topic_excerpt_maxlength: "Maksimal længde på et emneuddrag / resume, genereret fra det første indlæg i et emne."
     show_pinned_excerpt_mobile: "Vis uddrag af fastgjorte emner på mobilen."
     show_pinned_excerpt_desktop: "Vis uddrag af fastgjorte emner i desktop visning"
     post_onebox_maxlength: "Max længde af Discourse indlæg i tegn"
+    blocked_onebox_domains: "En liste af domæner som aldrig vil blive onebox'et."
+    allowed_inline_onebox_domains: "En liste over domæner, der vil blive onebox'et i miniatureform, hvis de linkes uden en titel"
+    enable_inline_onebox_on_all_domains: "Ignorer webstedsindstilling for inline_onebox_domain_allowlist, og tillad indlejret onebox på alle domæner."
     max_oneboxes_per_post: "Maksimalt antal onebox-forekomster i et opslag."
+    facebook_app_access_token: "Et token genereret fra dit Facebook-app-id og hemmelighed. Bruges til at generere Instagram oneboxes."
+    mobile_logo: "Logoet, der bruges på mobilversionen af dit websted. Brug et bredt rektangulært billede med en højde på 120 og et billedformat, der er større end 3: 1. Hvis det er tomt, bruges billedet fra 'logo'-indstillingen."
+    favicon: "Et favicon til dit websted, se <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. For at fungere korrekt over et CDN skal det være en png. Ændres til 32x32. Hvis det er tomt, vil large_icon blive brugt."
+    apple_touch_icon: "Ikon der bruges til Apple touch-enheder. Vil automatisk blive skaleret til 180x180. Hvis feltet er tomt, vil large_icon blive brugt."
     notification_email: "Afsender email adresse, anvendt når der sendes esentielle system emails. Domænet her skal have korrekt opsatte SPF, DKIM og 'PTR records', for succesfuld afskibning af mails."
     email_custom_headers: "En liste af brugerdefinerede e-mail-headers adskilt af |-tegn."
+    detailed_404: "Giver flere detaljer til brugerne om, hvorfor de ikke kan få adgang til et bestemt emne. Bemærk: Dette er mindre sikkert, fordi brugerne vil vide, om en URL oversættes til et gyldigt emne."
+    enforce_second_factor: "Tvinger brugere til at aktivere to-faktor godkendelse. Vælg 'alle' for at håndhæve det for alle brugere. Vælg 'personale' for kun at håndhæve den til medarbejderbrugere."
     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: "Minimumsopslag i et emne før 'Opsummér dette emne' er aktiveret. Ændringer af denne indstilling vil blive anvendt med tilbagevirkende kraft inden for en uge."
+    summary_likes_required: "Minimum antal 'Synes godt om' i et emne, før 'Opsummer dette emne' er aktiveret. Ændringer af denne indstilling anvendes med tilbagevirkende kraft inden for en uge."
     summary_percent_filter: "Når en bruger kllikker 'Opsummer dette Emne' vises top % af indlæg"
+    summary_max_results: "Maksimum antal indlæg returneret af 'Opsummer dette emne'"
     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_system_message_replies: "Tillader brugere at svare på systemmeddelelser, også selvom personlige meddelelser er deaktiveret"
     enable_long_polling: "Message bus til underretninger kan bruge long polling"
     long_polling_base_url: "URL anvendt for afsteminger (når CDN leverer dynamisk indhold, så sæt dette til oprindelig / orginal) f.eks: http://origin.site.com"
     long_polling_interval: "Mængde tid før serveren bør vente før den svarer klienter når der ikke er ny data at sende (kun for brugere der er logget ind)"
     polling_interval: "Når der ikke hentes data langsomt, hvor tit skal en klient der er logget på hente ny data i millisekunder"
     anon_polling_interval: "Hvor ofte skal anonyme brugere polle, i millisekunder."
     background_polling_interval: "Hvor tit skal klienter hente data i millisekunder (når vinduet er i baggrunden)"
-    cooldown_minutes_after_hiding_posts: "Antal minutter en bruger må vente indtil de kan redigere et indlæg der er blevet gemt via et flag"
+    hide_post_sensitivity: "Sandsynligheden for, at et anmeldt indlæg bliver skjult"
+    auto_close_topic_sensitivity: "Sandsynligheden for at et anmeldt emne automatisk vil blive lukket"
+    cooldown_minutes_after_hiding_posts: "Antal minutter en bruger må vente indtil de kan redigere et indlæg der er blevet skjult via fællesskabs-anmeldelse"
     max_topics_in_first_day: "Det maksimale antal af emner en bruger må lave i en 24 timers periode efter at have skrevet det første indlæg"
     max_replies_in_first_day: "Det maksimale antal af svar en bruger må foretage i 24 timers perioden efter at have skrevet deres første indlæg"
-    tl2_additional_likes_per_day_multiplier: "Øg antallet af likes pr dag for tl2 (member) ved at gange med dette tal"
-    tl3_additional_likes_per_day_multiplier: "Øg antallet af likes pr. dag for tl3 (regular) ved at gange med dette tal"
-    tl4_additional_likes_per_day_multiplier: "Øg antallet af likes pr. dag for tl4 (leader) ved at gange med dette tal"
+    tl2_additional_likes_per_day_multiplier: "Øg antallet af 'synes godt om' pr dag for tl2 (medlemmer) ved at gange med dette tal"
+    tl3_additional_likes_per_day_multiplier: "Øg antallet af 'synes godt om' pr. dag for tl3 (regular) ved at gange med dette tal"
+    tl4_additional_likes_per_day_multiplier: "Øg antallet af 'synes godt om' pr. dag for tl4 (leader) ved at gange med dette tal"
+    num_users_to_silence_new_user: "Hvis en ny brugers indlæg får num_spam_flags_to_silence_new_user spam-flag fra disse mange forskellige brugere, så skjul alle deres indlæg og forhindre fremtidige indlæg. 0 for at deaktivere."
+    num_tl3_flags_to_silence_new_user: "Hvis en ny brugers indlæg får så mange rapporteringer fra num_tl3_users_to_silence_new_user forskellige tillidsniveauer 3 brugere, skal du skjule alle deres indlæg og forhindre fremtidige indlæg. 0 for at deaktivere."
+    num_tl3_users_to_silence_new_user: "Hvis en ny brugers indlæg får num_tl3_flags_to_silence_new_user rapporteringer fra så mange forskellige tillidsniveau 3-brugere, skal du skjule alle deres indlæg og forhindrer fremtidige indlæg. 0 til at deaktivere."
+    flag_sockpuppets: "Hvis en ny bruger svarer på et emne fra den samme IP-adresse som den bruger, der startede emnet, skal begges deres indlæg anmeldes som potentiel spam."
     traditional_markdown_linebreaks: "Brug traditionelle linjeskift i Markdown, som kræver 2 mellemrum i slutningen af sætningen."
-    post_undo_action_window_mins: "Antal minutter som brugere er tilladt at fortryde handlinger på et indlæg (like, flag, etc)."
+    markdown_linkify_tlds: "Liste over top-level domæner, der automatisk behandles som links"
+    post_undo_action_window_mins: "Antal minutter som brugere er tilladt at fortryde handlinger på et indlæg ('Synes godt om', anmeldelser, osv.)."
+    must_approve_users: "Personalet skal godkende alle nye brugerkonti, før de får adgang til webstedet."
+    invite_code: "Brugeren skal skrive denne kode for at kunne registrere en konto, ignoreret når den er tom (ingen forskel på store og små bogstaver)"
+    approve_suspect_users: "Føj mistænkelige brugere til gennemgangskøen. Mistænkelige brugere har indtastet en bio/et websted, men har ingen læseaktivitet."
     pending_users_reminder_delay: "Underret moderatorer hvis nye brugere har ventet på godkendelse i længere end så mange timer. Skriv -1 for at deaktivere notifikationer."
+    persistent_sessions: "Brugere vil forblive logget ind, når webbrowseren er lukket"
     maximum_session_age: "Bruger vil forblive logget in for n hours siden sidste besøg"
+    ga_version: "Version af Google Universal Analytics der skal benyttes: v3 (analytics.js), v4 (gtag)"
+    ga_universal_tracking_code: "Google Universal Analytics tracking code ID, fx: UA-12345678-9; se <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    moderators_manage_categories_and_groups: "Tillad moderatorer at administrere kategorier og grupper"
+    use_admin_ip_allowlist: "Administratorer kan kun logge ind, hvis de kommer fra en IP-adresse, der er defineret i listen Screenede IP'er (Admin> Logs> Screenede Ip'er)."
+    blocked_ip_blocks: "En liste over private IP-blokke, der aldrig bør gennemsøges af Discourse"
+    allowed_internal_hosts: "En liste over interne værter, som discourse sikkert kan gennemsøge til brug for oneboxing og andre formål"
+    allowed_onebox_iframes: "En liste over iframe src-domæner som er tilladt via Onebox-integrering. `*` tillader alle standard Onebox moduler."
+    allowed_iframes: "En liste over iframe src-domænepræfikser, som discourse på sikker vis kan tillade i indlæg"
+    allowed_crawler_user_agents: "Brugeragenter for webcrawlere, der skal have adgang til webstedet. ADVARSEL! INDSTILLES DETTE VIL ALLE CRAWLERE, DER IKKE ER ANGIVET HER BLIVE NÆGTET!"
+    blocked_crawler_user_agents: "Entydigt store og små bogstaver i brugeragentstrengen, der identificerer webcrawlere, der ikke skal have adgang til webstedet. Gælder ikke, hvis tilladelsesliste er defineret."
+    slow_down_crawler_user_agents: "Brugeragenter for webcrawlere, der bør hastighedsbegrænses i robots.txt ved hjælp af Crawl-delay direktivet"
+    slow_down_crawler_rate: "Hvis der er angivet slow_down_crawler_user_agents, gælder denne sats for alle crawlere (antal sekunders forsinkelse mellem anmodninger)"
+    content_security_policy: "Aktivér indholds-sikkerheds-politik"
+    content_security_policy_report_only: "Aktivér indholds-sikkerheds-politik-kun-rapportering"
+    content_security_policy_collect_reports: "Aktivér CSP-overtrædelsesrapportindsamling på /csp_reports"
+    invalidate_inactive_admin_email_after_days: "Administratorkonti, der ikke har besøgt webstedet i dette antal dage, skal validere deres e-mailadresse igen, før de logger ind. Indstil til til 0 for at deaktivere."
     top_menu: "Afklar hvilke ting fremgår af sidens navigations bar, og i hvilken rækkefølge. Eksempel: latest|new|unread|categories|top|read|posted|bookmarks"
-    post_menu: "Angiv hvilke elementer der skal vises i indlægsmenuen, og i hvilken rækkefølge. Eksempel: like|edit|flag|delete|share|bookmark|reply."
+    post_menu: "Angiv hvilke elementer der skal vises i indlægsmenuen, og i hvilken rækkefølge. Eksempel: 'Synes godt om'|rediger|anmeld|slet|del|bogmærke|svar."
     post_menu_hidden_items: "Menuen vil automatisk gemme disse elementer i indlægs menuen, med mindre en udvidelse er tilvalgt."
     share_links: "Angiv hvilke elementer der skal vises i “del“-dialogboksen og i hvilken rækkefølge."
+    site_contact_username: "Et gyldigt personale-brugernavn, som alle automatiske meddelelser skal sendes fra. Hvis den er tom, bruges standard systemkontoen."
     send_welcome_message: "Send alle nye brugere en velkomstbesked, med en hurtig start guide."
+    send_tl1_welcome_message: "Send nye tillidsniveau 1 brugere en velkomst meddelelse."
+    send_tl2_promotion_message: "Send nye brugere af tillidsniveau 2 en besked om forfremmelse."
+    remove_full_quote: "Fjern automatisk fulde citater ved direkte svar."
     topics_per_period_in_top_summary: "Antallet af top emner der vises som standard i top emner"
     topics_per_period_in_top_page: "Antallet af top emner der vises når 'Vis Mere' er aktiveret."
+    redirect_users_to_top_page: "Automatisk omdirigere af nye og længere tids fraværende brugere til top siden."
+    moderators_view_emails: "Tillad moderatorer at se brugernes e-mails"
+    prioritize_username_in_ux: "Vis brugernavn først på brugersiden, brugerkort og indlæg (når deaktiveret vises navnet først)"
+    enable_rich_text_paste: "Aktivér automatisk HTML til Markdown-konvertering, når du indsætter tekst i editoren. (Eksperimentel)"
+    send_old_credential_reminder_days: "Påmind om gamle legitimationsoplysninger efter dage"
     email_token_valid_hours: "Glemte password / konto aktiverings muligheder er gyldige i (n) timer."
-    enable_badges: "Aktiver badge systemet"
+    enable_badges: "Aktiver emblem systemet"
     enable_whispers: "Tillad at hjælperteamet har private samtaler i emner."
+    allow_index_in_robots_txt: "Angiv i robots.txt, at dette websted må indekseres af websøgemaskiner. I undtagelsestilfælde kan du permanent <a href='%{base_path}/admin/customize/robots'>tilsidesætte robots.txt</a>."
+    blocked_email_domains: "En liste, der er afgrænset via pipe (lodret steg), over e-mail-domæner, som brugere ikke har tilladelse til at registrere konti med. Eksempel: mailinator.com|trashmail.net"
+    allowed_email_domains: "En pipesepareret liste over e-mail-domæner, som brugerne SKAL registrere konti med. ADVARSEL: Brugere med andre e-mail-domæner end dem, der er angivet, vil ikke være tilladt!"
+    auto_approve_email_domains: "Brugere med e-mailadresser fra denne liste over domæner vil automatisk blive godkendt."
+    hide_email_address_taken: "Informer ikke brugerne om, at der findes en konto med en given e-mailadresse under tilmelding eller fra glemt adgangskodeformularen."
     log_out_strict: "Når brugeren logger af, log da ud af alle sessioner, på alle enheder"
+    version_checks: "Ping Discourse Hub for versionopdateringer, og vis meddelelser om ny version på instrumentbrættet <a href='%{base_path}/admin' target='_blank'>/admin</a>"
     new_version_emails: "Send en email til contact_email adressen når der er en ny version af Discourse tilgængelig."
     invite_expiry_days: "Hvor længe brugerinvitationsnøgler er gyldige, i dage."
+    invite_only: "Alle nye brugere skal udtrykkeligt inviteres af betroede brugere eller medarbejdere. Offentlig registrering er deaktiveret."
     login_required: "Kræv godkendelse til at læse indhold på dette site, og tillad ikke anonym adgang."
+    min_username_length: "Minimumslængde på brugernavne i tegn. ADVARSEL: Hvis eksisterende brugere eller grupper har kortere navne end dette, vil dit websted gå i stykker!"
+    max_username_length: "Maksimallængden på brugernavne i tegn. ADVARSEL: Hvis eksisterende brugere eller grupper har længere navne end dette, vil dit websted gå i stykker!"
+    unicode_usernames: "Tillad, at brugernavne og gruppenavne indeholder Unicode bogstaver og tal."
+    allowed_unicode_username_characters: "Regulært udtryk, der kun tillader nogle Unicode-tegn i brugernavne. ASCII-bogstaver og tal vil altid være tilladt og behøver ikke at blive inkluderet i tilladelseslisten."
+    reserved_usernames: "Brugernavne, hvor tilmelding ikke er tilladt. Jokertegn * kan bruges til at matche ethvert tegn nul eller flere gange."
     min_password_length: "Mindste adgangskodelængde."
     min_admin_password_length: "Minimumslængde for Admin adgangskoder."
+    password_unique_characters: "Minimum antal unikke tegn, som en adgangskode skal have."
     block_common_passwords: "Tillad ikke adgangskoder som findes i de 10.000 mest benyttede adgangskoder."
-    google_oauth2_client_id: "Client ID of your Google application."
-    google_oauth2_client_secret: "Client secret of your Google application."
+    auth_skip_create_confirm: Ved tilmelding via ekstern godkendelse, skal popop'en oprettelse af konto springes over. Bedst brugt sammen med auth_overrides_email, auth_overrides_username og auth_overrides_name.
+    auth_immediately: "Omdiriger automatisk til det eksterne login-system uden brugerinteraktion. Dette træder kun i kraft, når login_required er sandt, og der kun er én ekstern godkendelsesmetode"
+    enable_discourse_connect: "Aktivér loin via DiscourseConnect (tidligere 'Discourse SSO') (ADVARSEL: BRUGERNES e-mailadresser *SKAL* VALIDERES AF DEN EKSTERNE SIDE!)"
+    verbose_discourse_connect_logging: "Log detaljeret DiscourseConnect relateret diagnostik til <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    enable_discourse_connect_provider: "Implementer DiscourseConnect (tidligere 'Discourse SSO') providerprotokollen på /session/sso_provider slutpunktet, kræver, at discourse_connect_provider_secrets indstilles"
+    discourse_connect_url: "URL til DiscourseConnect-slutpunkt (skal indeholde http:// eller https://)"
+    discourse_connect_secret: "Hemmelig streng, der bruges til kryptografisk godkendelse af DiscourseConnect-oplysninger, sørg for at der er 10 tegn eller mere"
+    discourse_connect_overrides_bio: "Tilsidesætter brugerbio i brugerprofilen og forhindrer brugeren i at ændre den"
+    discourse_connect_overrides_groups: "Synkronisér alle manuelle gruppemedlemskaber med grupper angivet i grupper-attributten (ADVARSEL: hvis du ikke angiver grupper, vil alle manuelle gruppemedlemmer blive ryddet for brugeren)"
+    discourse_connect_not_approved_url: "Omdiriger ikke-godkendte DiscourseConnect konti til denne URL"
+    discourse_connect_allows_all_return_paths: "Begræns ikke domænet for retur_stier leveret af DiscourseConnect (som standard skal retur_sti være på nuværende websted)"
+    enable_local_logins: "Aktivér lokale \"brugernavn og adgangskode\" login-baserede konti. ADVARSEL: Hvis deaktiveret, kan du muligvis ikke logge ind, hvis du ikke tidligere har konfigureret mindst én alternativ loginmetode."
+    enable_local_logins_via_email: "Tillad brugere at anmode om et enkelt-klik login link bliver sendt til dem via e-mail."
+    allow_new_registrations: "Tillad nye brugerregistreringer. Fjern markeringen for at forhindre enhver i at oprette en ny konto."
+    enable_signup_cta: "Vis en meddelelse til tilbagevendende anonyme brugere, der beder dem om at tilmelde sig en konto."
+    enable_google_oauth2_logins: "Aktiver Google Oauth2 godkendelse. Dette er den godkendelsesmetode, som Google i øjeblikket understøtter. Kræver nøgle og hemmelighed. Se <a href='https://meta.discourse.org/t/15858' target='_blank'>Konfigurer Google-login til Discourse</a>."
+    google_oauth2_client_id: "Klient ID til din Google application."
+    google_oauth2_client_secret: "Klient hemmelighed til din Google-applikation."
+    google_oauth2_prompt: "En valgfri mellemrums-afgrænset liste over strengværdier, der specificerer, om godkendelsesserveren beder brugeren om gen-godkendelse og samtykke. Se <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> for de mulige værdier."
+    enable_twitter_logins: "Aktivér Twitter-godkendelse, kræver twitter_consumer_key og twitter_consumer_secret. Se <a href='https://meta.discourse.org/t/13395' target='_blank'>Konfiguration af Twitter-login (og rige indlejringer) for Discourse</a>."
+    twitter_consumer_key: "Forbrugernøgle til Twitter-godkendelse, registreret på <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
+    twitter_consumer_secret: "Forbrugerhemmelighed til Twitter-godkendelse, registreret på <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
+    enable_facebook_logins: "Aktivér Facebook-godkendelse, kræver facebook_app_id og facebook_app_secret. Se <a href='https://meta.discourse.org/t/13394' target='_blank'>Konfiguration af Facebook-login til Discourse</a>."
+    facebook_app_id: "App-id til Facebook godkendelse og deling, registreret på <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    facebook_app_secret: "App hemmelighed til Facebook-godkendelse, registreret på <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    enable_github_logins: "Aktivér GitHub-godkendelse, kræver github_client_id og github_client_secret. Se <a href='https://meta.discourse.org/t/13745' target='_blank'>Konfiguration af GitHub-login til Discourse</a>."
+    github_client_id: "Klient-id til GitHub-godkendelse, registreret på <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    github_client_secret: "Klient hemmelighed til GitHub-godkendelse, registreret på <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    enable_discord_logins: "Tillad brugere at godkende ved hjælp af Discord?"
+    discord_client_id: 'Discord Client ID (brug for en? besøg <a href="https://discordapp.com/developers/applications/me">Discord udviklerportalen</a>)'
+    discord_secret: "Discord Hemmelig Nøgle"
+    enable_backups: "Tillad administratorer at oprette sikkerhedskopier af forummet"
     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."
+    previous_visit_timeout_hours: "Hvor længe et besøg varer, før vi betragter det som det 'forrige' besøg i timer"
+    enable_safe_mode: "Tillad brugere at gå i sikker tilstand for at foretage fejlfinding af plugins."
+    rate_limit_create_topic: "Efter at have oprettet et emne, skal brugerne vente (n) sekunder før de opretter et andet emne."
+    rate_limit_create_post: "Efter at have skrevet et indlæg, skal brugerne vente (n) sekunder, før de opretter et nyt indlæg."
     max_likes_per_day: "Maksimalt antal likes per bruger per dag."
-    max_flags_per_day: "Maksimalt antal flagmarkeringer per bruger per dag."
+    max_flags_per_day: "Maksimalt antal anmelelser per bruger per dag."
+    max_bookmarks_per_day: "Maksimalt antal bogmærker pr. Bruger pr. Dag."
+    max_edits_per_day: "Maksimalt antal redigeringer pr. Bruger pr. Dag."
+    max_topics_per_day: "Maksimalt antal emner, en bruger kan oprette pr. dag."
+    max_personal_messages_per_day: "Maksimalt antal nye personlige meddelelsesemner, en bruger kan oprette pr. dag."
+    max_invites_per_day: "Maksimalt antal invitationer, som en bruger kan sende pr. Dag."
+    max_topic_invitations_per_day: "Maksimalt antal emneinvitationer, en bruger kan sende pr. dag."
+    limit_suggested_to_category: "Vis kun emner fra den aktuelle kategori i foreslåede emner."
     clean_orphan_uploads_grace_period_hours: "Grace-periode (i timer) før et forældreløst upload bliver fjernet."
     purge_deleted_uploads_grace_period_days: "Grace-periode (i dage) før et slettet upload bliver fjernet."
+    avatar_sizes: "Liste over automatisk genererede avatarstørrelser."
+    external_emoji_url: "URL til den eksterne tjeneste for humørikon-billeder. Lad det være tomt for at deaktivere det."
+    restrict_letter_avatar_colors: "En liste med 6-cifrede hexadecimale farveværdier til brug for bogstavesavatar baggrund."
+    selectable_avatars_enabled: "Tving brugere til at vælge en avatar fra listen."
+    selectable_avatars: "Liste over avatarer, som brugere kan vælge imellem."
+    allow_all_attachments_for_group_messages: "Tillad alle vedhæftede filer (e-mail) for gruppemeddelelser."
+    png_to_jpg_quality: "Kvaliteten af den konverterede JPG-fil (1 er laveste kvalitet, 99 er bedste kvalitet, 100 for at deaktivere)."
+    recompress_original_jpg_quality: "Kvaliteten af overførte billedfiler (1 er laveste kvalitet, 99 er bedste kvalitet, 100 for at deaktivere)."
+    image_preview_jpg_quality: "Kvaliteten af skalerede billedfiler (1 er laveste kvalitet, 99 er bedste kvalitet, 100 for at deaktivere)."
+    allow_staff_to_upload_any_file_in_pm: "Tillad personale at overføre filer i PM."
+    strip_image_metadata: "Fjern billedmetadata."
     tl1_requires_topics_entered: "Hvor mange emner en ny bruger skal læse før vedkommende forfremmes til tillidsniveau 1."
     tl1_requires_read_posts: "Hvor mange indlæg en ny bruger skal læse før vedkommende forfremmes til tillidsniveau 1."
     tl1_requires_time_spent_mins: "Hvor mange minutter en ny bruger skal læse indlæg før vedkommende forfremmes til tillidsniveau 1."
@@ -1008,31 +1556,110 @@ da:
     tl2_requires_days_visited: "Hvor mange dage en bruger skal besøge siden før vedkommende forfremmes til tillidsniveau 2."
     tl2_requires_likes_received: "Hvor mange likes en bruger skal modtage inden forfremmelse til tillidsniveau 2."
     tl2_requires_likes_given: "Hvor mange likes en bruger skal give inden forfremmelse til tillidsniveau 2."
-    tl3_requires_max_flagged: "Brugere må ikke have mere end x indlæg flagmarkeret af x forskellige brugere i løbet a de sidste (tl3 time period) dage for at kvalificere sig til forfremmelse til tillidsniveau 3. X er indstillingens værdi (0 eller mere)."
+    tl2_requires_topic_reply_count: "Hvor mange emner, brugeren skal svare på, før forfremmelse til tillidsniveau 2."
+    tl3_requires_days_visited: "Minimum antal dage, som en bruger skal have besøgt webstedet inden for de sidste (tl3 tidsperiode) dage for at kvalificere sig til forfremmelse til tillidsniveau 3. Sæt højere end tl3 tidsperiode for at deaktivere forfremmelser til tl3. (0 eller højere)"
+    tl3_requires_topics_replied_to: "Mindste antal emner, en bruger skal have svaret på inden for de sidste (tl3-tidsperiode) dage for at kvalificere sig til forfremmelse til tillidsniveau 3. (0 eller højere)"
+    tl3_requires_topics_viewed: "Procentdelen af emner, der er oprettet i de sidste (tl3-tidsperiode) dage, som en bruger skal have set for at kvalificere sig for oprykning til tillidsniveau 3. (0 til 100)"
+    tl3_requires_topics_viewed_cap: "Det maksimale antal emner, der er kræves set i de sidste (tl3 tidsperiode) dage."
+    tl3_requires_posts_read: "Procentdelen af emner, der er oprettet i de sidste (tl3-tidsperiode) dage, som en bruger skal have set for at kvalificere sig for oprykning til tillidsniveau 3. (0 til 100)"
+    tl3_requires_posts_read_cap: "Det maksimale krævede antal indlæg læst i de sidste (tl3 tidsperiode) dage."
+    tl3_requires_topics_viewed_all_time: "Det mindste samlede antal emner, en bruger skal have set for at kvalificere sig til tillidsniveau 3."
+    tl3_requires_posts_read_all_time: "Det mindste samlede antal indlæg, en bruger skal have læst for at kvalificere sig til tillidsniveau 3."
+    tl3_requires_max_flagged: "Brugere må ikke have mere end x indlæg anmeldt af x forskellige brugere i løbet a de sidste (tl3 time period) dage for at kvalificere sig til forfremmelse til tillidsniveau 3. Hvor x er indstillingens værdi (0 eller mere)."
+    tl3_promotion_min_duration: "Det mindste antal dage, som en forfremmelse til tillidsniveau 3 varer, før en bruger kan degraderes tilbage til tillidsniveau 2."
+    tl3_links_no_follow: "Fjern ikke rel=nofollow fra links indsendt af tillidsniveau 3-brugere."
+    trusted_users_can_edit_others: "Tillad brugere med højt tillidsniveau at redigere indhold fra andre brugere"
     min_trust_to_create_topic: "Det mindste tillidsniveau der skal til for at oprette et nyt emne."
+    allow_flagging_staff: "Hvis aktiveret, kan brugerne anmelde indlæg fra personalekonti."
+    min_trust_to_edit_wiki_post: "Det mindste tillidsniveau, der kræves for at redigere indlæg markeret som wiki."
+    min_trust_to_edit_post: "Det mindste tillidsniveau, der kræves for at redigere indlæg."
+    min_trust_to_allow_self_wiki: "Det mindste tillidsniveau, der kræves for at gøre brugerens egen post til wiki."
+    min_trust_to_send_messages: "Det mindste tillidsniveau, der kræves for at oprette nye personlige beskeder."
+    min_trust_to_send_email_messages: "Det mindste tillidsniveau, der kræves for at sende personlige beskeder via e-mail."
+    min_trust_to_flag_posts: "Det mindste tillidsniveau, der kræves for at anmelde indlæg"
+    min_trust_to_post_links: "Det mindste tillidsniveau, der kræves for at medtage links i indlæg"
+    min_trust_to_post_embedded_media: "Det mindste tillidsniveau, der kræves for at indlejre medieelementer i et indlæg"
+    min_trust_level_to_allow_profile_background: "Det mindste tillidsniveau, der kræves for at overføre en profilbaggrund"
+    min_trust_level_to_allow_user_card_background: "Det mindste tillidsniveau, der kræves for at overføre en brugerkort baggrund"
+    min_trust_level_to_allow_invite: "Det mindste tillidsniveau, der kræves for at invitere brugere"
+    min_trust_level_to_allow_ignore: "Det mindste tillidsniveau, der kræves for at ignorere brugere"
+    allowed_link_domains: "Domæner, som brugere kan linke til, selvom de ikke har det rette tillidsniveau til at sende links"
+    newuser_max_links: "Hvor mange links en ny bruger kan føje til et indlæg."
+    newuser_max_embedded_media: "Hvor mange integrerede medieelementer en ny bruger kan føje til et indlæg."
+    newuser_max_attachments: "Hvor mange vedhæftede filer en ny bruger kan føje til et indlæg."
+    newuser_max_mentions_per_post: "Maksimalt antal @navn notifikationer, som en ny bruger kan bruge i et indlæg."
+    newuser_max_replies_per_topic: "Maksimalt antal svar, en ny bruger kan afgive i et enkelt emne, indtil nogen svarer på dem."
+    max_mentions_per_post: "Maksimalt antal @navn notifikationer, som enhver kan bruge i et indlæg."
+    enable_mentions: "Tillad brugere at nævne andre brugere."
+    title_max_word_length: "Den maksimale tilladte ordlængde, i tegn, i en emnetitel."
+    allow_uppercase_posts: "Tillad 'KUN STORE BOGSTAVER' i en emnetitel eller i et emneindlæg"
+    title_fancy_entities: "Konverter almindelige ASCII-tegn til smarte HTML-entiteter i emnetitler, ala SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
+    min_title_similar_length: "Minimumslængden af en titel før den vil blive kontrolleret for lignende emner."
     desktop_category_page_style: "Visuel stil for siden /categories."
     category_colors: "En liste med hexadecimal farveværdier som er tilladte for kategorier."
     category_style: "Visuel stil for kategoribadges."
+    default_dark_mode_color_scheme_id: "Farveskemaet der bruges ved mørk tilstand."
+    dark_mode_none: "Ingen"
+    max_image_size_kb: "Den maksimale billedupload størrelse i kB. Dette skal konfigureres i nginx (client_ max_ body_ size) / apache eller proxy. Billeder større end dette og mindre end client_max_body_size vil blive mindsket så så de opfylder betingelserne for upload."
+    max_attachment_size_kb: "Den maksimale uploadstørrelse af vedhæftede filer i kB. Dette skal konfigureres i nginx (client_ max_ body_ size) / apache eller proxy."
+    authorized_extensions: "En liste over filendelser tilladt for overførsel (brug '*' for at aktivere alle filtyper)"
+    authorized_extensions_for_staff: "En liste over filendelser, der er tilladt for overførsel for personalebrugere ud over den liste, der er defineret i webstedsindstillingen `authorized_extensions` (brug '*' for at tillade alle filtyper)"
+    max_similar_results: "Hvor mange lignende emner der skal vises over editoren når du opretter et nyt emne. Sammenligning er baseret på titel og indhold."
+    max_image_megapixels: "Maksimalt antal megapixel tilladt for et billede. Billeder med et højere antal megapixel vil blive afvist."
     title_prettify: "Undgå hyppige tastefejl i titlen, inklusive overforbrug af store bogstaver, første bogstav med småt, gentagne ! og ?, ekstra . i slutningen, etc."
-    topic_post_like_heat_low: "Når forholdet likes:indlæg overstiger dette tal, bliver antal indlæg let fremhævet."
-    topic_post_like_heat_medium: "Når forholdet likes:indlæg overstiger dette tal, bliver antal indlæg moderat fremhævet."
-    faq_url: "Hvis du hoster en FAQ et andet sted kan du indtaste den fulde URL her."
+    topic_post_like_heat_low: "Når forholdet imellem 'synes godt om' og indlæg overstiger dette tal, bliver antal indlæg let fremhævet."
+    topic_post_like_heat_medium: "Når forholdet imellem 'synes godt om' og indlæg overstiger dette tal, bliver antal indlæg moderat fremhævet."
+    faq_url: "Hvis du hoster en OSS et andet sted kan du indtaste den fulde URL her."
     tos_url: "Hvis du hoster dine forretningsbetingelser et andet sted kan du indtaste den fulde URL her."
     privacy_policy_url: "Hvis du hoster din privatlivspolitik et andet sted kan du indtaste den fulde URL her."
+    staff_like_weight: "Hvor meget vægt der gives for personalets 'Synes godt om' (ikke-personale har en vægt på 1.)"
     max_new_accounts_per_registration_ip: "Hvis der allerede er (n) kontoer med tillidsniveau 0 fra en IP (og ingen er en del af hjælperteamet eller på TL2 eller højere), så accepteres nye kontooprettelser fra denne IP ikke."
-    num_flaggers_to_close_topic: "Minimum antal flagmarkeringer fra unikke brugere, der skal til for automatisk at pause et emne til ingriben"
-    auto_respond_to_flag_actions: "Aktivér automatisk besvarelse, når en flagmarkering fjernes."
+    num_flaggers_to_close_topic: "Minimum antal anmeldelser fra unikke brugere, der skal til for automatisk at sætte et emne på pause for ingriben"
+    auto_respond_to_flag_actions: "Aktivér automatisk besvarelse, når en anmeldelse fjernes."
+    reviewable_low_priority_threshold: "Prioritetsfilteret skjuler anmeldelser, der ikke opfylder denne score, medmindre filteret '(enhver)' bruges."
+    high_trust_flaggers_auto_hide_posts: "Nye brugerindlæg skjules automatisk efter at være blevet anmeldt som spam af en TL3+ bruger"
+    cooldown_hours_until_reflag: "Hvor lang tid brugerne skal vente, indtil de kan genanmelde et indlæg"
     reply_by_email_enabled: "Aktivér muligheden for at svare til emner via email."
     reply_by_email_address: "Skabelon for e-mail-adressen i formularen, for eksempel: %%{reply_key}@reply.myforum.com."
+    incoming_email_prefer_html: "Brug HTML i stedet for tekst til indgående e-mail."
+    disable_emails: "Forhindre Discourse i at sende nogen form for e-mails. Vælg 'ja' for at deaktivere e-mails for alle brugere. Vælg 'ikke-personale' for at deaktivere e-mails for ikke-personale brugere."
     strip_images_from_short_emails: "Undlad at inkludere billeder fra emails som fylder mindre end 2800 Bytes"
     short_email_length: "Kort email i Bytes"
     display_name_on_email_from: "Vis fulde navne på emails fra felter"
     unsubscribe_via_email: "Tillad brugere at afmelde sig fra emails ved at sende en email med \"unsubscribe\" i emne eller indholdsfeltet"
+    delete_email_logs_after_days: "Slet e-mail logs efter (N) dage. 0 for at holde på ubestemt tid"
+    disallow_reply_by_email_after_days: "Tillad ikke svar via e-mail efter (N) dage. 0 for at holde på ubestemt tid"
+    max_emails_per_day_per_user: "Maksimalt antal e-mails at sende brugere pr. dag. 0 for at deaktivere grænsen"
+    block_auto_generated_emails: "Bloker indgående e-mails identificeret som værende auto genereret."
     ignore_by_title: "Ignorér indgående emails baseret på deres titel."
     mailgun_api_key: "Mailgun Secret API key used to verify webhook messages."
+    reset_bounce_score_after_days: "Nulstil automatisk bounce score efter X dage."
+    blocked_attachment_filenames: "Liste over nøgleord, der bruges til at blokere vedhæftede filer baseret på filavnet."
+    forwarded_emails_behaviour: "Sådan behandles en videresendt e-mail til Discourse"
     always_show_trimmed_content: "Vis altid beskåret del af indgående e-mails. ADVARSEL: afslører muligvis e-mail-adresser."
+    trim_incoming_emails: "Beskær en del af de indgående e-mails, der ikke er relevante."
+    delete_rejected_email_after_days: "Slet afviste e-mails, der er ældre end (n) dage."
+    pop3_polling_enabled: "Hent via POP3 for e-mail svar"
+    pop3_polling_ssl: "Brug SSL under tilslutning til POP3-serveren. (Anbefalet)"
+    pop3_polling_openssl_verify: "Verificér TLS-servercertifikat (Standard: aktiveret)"
+    pop3_polling_port: "Porten der skal anvendes til POP3 kontoen."
+    pop3_polling_host: "Værten hvorfra der skal hentes email via POP3"
+    pop3_polling_username: "Brugernavnet til POP3-kontoen til kontrol for e-mail."
+    pop3_polling_password: "Adgangskoden til POP3-kontoen til kontrol for e-mail."
+    pop3_polling_delete_from_server: "Slet e-mails fra serveren. BEMÆRK: Hvis du deaktiverer dette, skal du manuelt rense din postindbakke"
+    log_mail_processing_failures: "Log alle e-mail-behandlingsfejl til <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    email_in_min_trust: "Det mindste tillidsniveau, som en bruger skal have, skal have for have lov til at oprette nye emner via e-mail."
+    enable_imap: "Aktiver IMAP til synkronisering af gruppemeddelelser."
+    enable_imap_write: "Aktiver to-vejs IMAP-synkronisering. Hvis deaktiveret, er alle skriveoperationer på IMAP-konti deaktiveret."
+    enable_imap_idle: "Brug IMAP-IDLE-mekanismen til at vente på nye e-mails."
+    enable_smtp: "Aktiver SMTP for afsendelse af notifikationer for gruppemeddelelser."
+    email_site_title: "Titlen på webstedet der bruges som afsender af e-mails fra webstedet. Standard er 'titel', hvis ikke angivet. Hvis din 'titel' indeholder tegn, der ikke er tilladt i e-mail-afsenderstrenge, så brug denne indstilling."
     delete_all_posts_max: "Det maksimale antal indlæg der kan slettes på én gang med “Slet alle indlæg”-knappen. Hvis en bruger har mere end dette antal indlæg, kan indlæggene ikke slettes på én gang og brugeren kan ikke slettes."
     email_editable: "Lad brugerne skifte deres e-mail-adresse efter oprettelsen."
+    logout_redirect: "Placering at omdirigere browseren til efter logout (fx: https://example.dk/logud)"
+    allow_uploaded_avatars: "Tillad brugere at uploade brugerdefinerede profilbilleder."
+    default_avatars: "URL'er til avatarer, der vil blive brugt som standard for nye brugere, indtil de ændrer dem."
+    automatically_download_gravatars: "Download Gravatars til brugere ved oprettelse af konto eller ændring af e-mail."
     digest_topics: "Maximalt antal af populære emner vist i mails med sammendrag."
     digest_posts: "Maximalt antal af populære indlæg vist i mails med sammendrag."
     digest_other_topics: "Maximalt antal emner vist i 'Nyt i emner og kategorier du følger'-sektionen i mails med sammendrag."
@@ -1040,20 +1667,37 @@ da:
     suppress_digest_email_after_days: "Udelad mails med sammendrag til brugere, som ikke har besøgt siden i mere end (n) dage."
     digest_suppress_categories: "Udelad disse kategorier fra mails med sammendrag"
     disable_digest_emails: "Deaktiver mails med sammendrag for alle brugere."
+    email_link_color: "Farven på links i HTML-e-mails. Indtast et farvenavn ('blue') eller hex-værdi ('#0000FF')."
+    staff_user_custom_fields: "En liste over brugertilpassede felter, der kan hentes for personale med API'en."
     enable_user_directory: "Gør det muligt at gennemse et indeks af brugere "
     allow_anonymous_posting: "Tillad brugere at skifte til en anonym tilstand"
     allow_profile_backgrounds: "Tillad brugere at uploade en profil baggrund."
     enable_mobile_theme: "Mobile enheder bruger et mobilvenligt tema, med mulighed for at skifte til det fulde site. Deaktivér dette hvis du ønsker at anvende et brugerdefineret stylesheet som er fuldstændigt responsivt."
     disable_avatar_education_message: "Deaktivér hjælpetekst for at skifte sin avatar."
+    suppress_uncategorized_badge: "Vis ikke emblemet for ikke-kategoriserede emner i emnelister."
+    topic_page_title_includes_category: "Emneside <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>titelmærke</a> inkluderer kategorienavnet."
+    share_anonymized_statistics: "Del anonymiseret brugsstatistik."
     full_name_required: "Fuldt navn er et påkrævet felt på en brugerprofil."
     short_progress_text_threshold: "Når antallet af indlæg overstiger dette tal viser statuslinjen kun det aktuelle indlægsnummer. Hvis du ændrer bredden af statuslinjen kan det være nødvendigt at opdatere denne værdi."
+    autohighlight_all_code: "Gennemtving anvendelsen af kodefremhævning på alle præformaterede kodeblokke, selv når de ikke eksplicit angiver sproget."
+    show_copy_button_on_codeblocks: "Tilføj en knap til kodeblokke for at kopiere blokindholdet til brugerens udklipsholder. Denne funktion understøttes ikke i Internet Explorer."
+    embed_topics_list: "Understøt HTML indlejring af emne lister"
     embed_truncate: "Afkort de indlejrede indlæg."
     embed_support_markdown: "Support markdown formatering af indlejrede indlæg."
+    allowed_embed_selectors: "En kommasepareret liste over CSS-elementer, der er tilladt i embeds."
     embed_post_limit: "Maksimum antal indlæg, der skal indlejres."
     embed_username_required: "Brugernavnet til oprettelse af emne er påkrævet."
+    notify_about_flags_after: "Hvis der er anmeldelser, der ikke er blevet håndteret efter mange timer, skal der sendes en personlig besked til moderatorer. Sæt til 0 for at deaktivere."
     delete_drafts_older_than_n_days: "Slet kladder, der er ældre end (n) dage."
-    enable_emoji: "Aktivér emojis"
-    emoji_set: "Hvordan kunne du tænke dig din emoji?"
+    enable_emoji: "Aktivér humørikon"
+    enable_emoji_shortcuts: "Almindelig smiley-tekst såsom :) :p :( vil blive konverteret til humørikoner"
+    emoji_set: "Hvordan kunne du tænke dig diT humørikon?"
+    emoji_autocomplete_min_chars: "Minimum antal tegn krævet for at aktivere autofuldførelses humørikoner-popup"
+    enable_inline_emoji_translation: "Aktiverer oversættelse for inline humørikoner (uden mellemrum eller tegnsætning før)"
+    approve_post_count: "Antallet af indlæg fra en ny eller grundlæggende bruger, der skal godkendes"
+    max_allowed_message_recipients: "Maksimalt antal modtagere tilladt i en meddelelse."
+    blur_tl0_flagged_posts_media: "Tilslør anmeldte indlægs billeder for at skjule potentielt NSFW-indhold."
+    show_published_pages_login_required: "Anonyme brugere kan se udgivne sider, selv når login er påkrævet."
     default_email_digest_frequency: "Hvor ofte brugere som standard modtager mails med sammendrag."
     default_include_tl0_in_digests: "Inkluder som standard indlæg fra nye brugre i mails med sammendrag. Brugere kan ændre dette i deres indstillinger."
     default_email_mailing_list_mode: "Send som standard en email for hvert nyt indlæg."
@@ -1062,40 +1706,96 @@ da:
     default_other_external_links_in_new_tab: "Åbn som standard links på et nyt faneblad."
     default_other_enable_quoting: "Slå som standard \"svar på den markerede tekst\" til."
     default_other_dynamic_favicon: "Vis som standard nyt / opdateret emnetal på browserikon"
+    default_other_skip_new_user_tips: "Spring nye bruger-onboarding tips og emblemer over."
     default_categories_watching: "Liste over kategorier der som standard overvåges."
     default_categories_tracking: "Liste over kategorier der som standard følges."
-    default_categories_muted: "Liste over kategorier der som standard ignoreres."
+    default_categories_muted: "Liste over kategorier der som standard har tavshed."
+    default_categories_regular: "Liste over kategorier som ikke er tavse som standard. Nyttigt når `mute_all_categories_by_default` webstedsindstilling er aktiveret."
+    mute_all_categories_by_default: "Indstil standardunderretningsniveauet for alle kategorier til tavshed. Kræv, at brugerne tilmelder sig kategorier for at de skal vises på 'seneste' og 'kategorisider'. Hvis du ønsker at ændre standardindstillingerne for anonyme brugere, skal du indstille 'default_category_settings'."
+    default_tags_watching: "Liste over mærker, der er overvåget som standard."
+    default_tags_tracking: "Liste over mærker, der spores som standard."
+    default_tags_muted: "Liste over mærker, der er tavse som standard."
+    default_tags_watching_first_post: "Liste over mærker, hvor første indlæg i hvert nyt emne vil blive overvåget som standard."
+    allow_user_api_keys: "Tillad generering af bruger API nøgler"
+    allow_user_api_key_scopes: "Liste over tilladte anvendelsesområder for bruger-API-nøgler"
+    min_trust_level_for_user_api_key: "Tillidsniveau påkrævet til generering af bruger API-nøgler"
+    expire_user_api_keys_days: "Antal dage før en bruger API-nøgle automatisk udløber (0 for aldrig)"
+    tagging_enabled: "Aktivér mærker på emner?"
+    max_tags_per_topic: "Det maksimale antal mærker, der kan anvendes i et emne."
+    max_tag_search_results: "Ved søger efter mærker, skal der maksimalt vises følgende antal resultater."
+    max_tags_in_filter_list: "Maksimalt antal mærker, der skal vises i filter-rullelisten. De mest brugte mærker vil blive vist."
+    tags_sort_alphabetically: "Vis mærker i alfabetisk rækkefølge. Standard er at vise i rækkefølge efter popularitet."
+    tags_listed_by_group: "Vis mærker efter mærkegruppe på <a href='%{base_path}/tags' target='_blank'>Siden Mærker</a>."
+    tag_style: "Visuel stil for mærke emblemer."
+    suppress_overlapping_tags_in_list: "Hvis mærkerne matcher nøjagtige ord i emnetitler, skal du ikke vise mærket"
+    remove_muted_tags_from_latest: "Vis ikke emner, der kun er mærket med tavse mærker på den seneste emneliste."
+    force_lowercase_tags: "Tving alle nye mærker til at kun benytte små bogstaver."
+    company_name: "Virksomhedens navn"
+    governing_law: "Gældende Lov"
+    city_for_disputes: "By for tvister"
+    shared_drafts_min_trust_level: "Tillad brugere at se og redigere Delte kladder."
+    push_notifications_icon: "Emblemikonet, der vises i meddelelseshjørnet. Et monokromatisk PNG på 96×96 med gennemsigtighed anbefales."
     errors:
       invalid_email: "Ugyldig e-mail-adresse"
       invalid_username: "Der er ingen bruger med det brugernavn."
+      invalid_group: "Der er ingen gruppe med dette navn."
       invalid_integer_min_max: "Værdien skal være mellem %{min} og %{max}."
-      invalid_integer_min: "Værdien skal være %{min} eller højere."
+      invalid_integer_min: "Værdien skal være %{min} eller større."
       invalid_integer_max: "Værdien kan ikke være højere end %{max}."
       invalid_integer: "Værdien skal være et heltal."
       regex_mismatch: "Værdien passer ikke til det påkrævede format."
-      must_include_latest: "Topmenuen skal inkludere \"Latest\" fanen."
+      must_include_latest: "Topmenuen skal inkludere 'seneste' fanen."
       invalid_string: "Ugyldig værdi."
       invalid_string_min_max: "Skal være mellem %{min} og %{max} tegn."
       invalid_string_min: "Skal være mindst %{min} tegn."
       invalid_string_max: "Må ikke være mere end %{max} tegn."
+      invalid_json: "Ugyldig JSON."
+      invalid_reply_by_email_address: "Værdien skal indeholde '%{reply_key}' og være forskellig fra notifikations e-mail."
+      invalid_alternative_reply_by_email_addresses: "Alle værdier skal indeholde '%{reply_key}' og være forskellige fra notifikations e-mail."
+      pop3_polling_authentication_failed: "POP3 godkendelse mislykkedes. Kontroller venligst dine pop3 legitimationsoplysninger."
+      reply_by_email_address_is_empty: "Du skal angive en 'svar via email-adresse', før du aktiverer svar via e-mail."
       min_username_length_range: "Du kan ikke sætte minimum til mere end maksimum."
       max_username_length_range: "Du kan ikke sætte maksimum til mindre end minimum."
+      invalid_hex_value: "Farveværdier skal være 6-cifrede hexadecimale koder."
+      empty_selectable_avatars: "Du skal først overføre mindst to valgbare avatarer før du aktiverer denne indstilling."
+    placeholder:
+      discourse_connect_provider_secrets:
+        key: "www.eksempel.dk"
+        value: "DiscourseConnect hemmelighed"
   search:
+    extreme_load_error: "Webstedet er under ekstrem belastning, søgning er deaktiveret, prøv igen senere"
     within_post: "#%{post_number} af %{username}"
     types:
       category: "Kategorier"
       topic: "Resultater"
       user: "Brugere"
     results_page: "Søgeresultater for '%{term}'"
+    audio: "[audio]"
+    video: "[video]"
+  discourse_connect:
+    login_error: "Login fejl"
+    not_found: "Din konto blev ikke fundet. Kontakt venligst webstedets administrator."
+    account_not_approved: "Din konto afventer godkendelse. Du vil modtage en e-mail meddelelse, når du er godkendt."
+    unknown_error: "Der er et problem med din konto. Kontakt venligst webstedets administrator."
+    no_email: "Der blev ikke angivet nogen e-mailadresse. Kontakt venligst webstedets administrator."
+    blank_id_error: "`eksternt_id` er påkrævet men var tomt"
+    invite_redeem_failed: "Invitationsindløsning mislykkedes. Kontakt venligst webstedets administrator."
   original_poster: "Oprindelig forfatter"
   most_posts: "Flest indlæg"
   most_recent_poster: "Seneste forfatter"
   frequent_poster: "Hyppig forfatter"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "Velkommen til fællesskabet! Dette er de seneste mest populære emner."
+  merge_posts:
+    errors:
+      max_post_length: "Indlæg kan ikke flettes, fordi den samlede indlægslængde er mere end tilladt."
+  change_owner:
+    post_revision_text: "Ejerskab overført"
   publish_page:
     slug_errors:
       blank: "kan ikke være tom"
+      unavailable: "er ikke tilgængelig"
       invalid: "indeholder ugyldige tegn"
   topic_statuses:
     autoclosed_enabled_days:
@@ -1118,20 +1818,31 @@ da:
       other: "Dette emne blev automatisk lukket %{count} minutter efter det seneste svar. Nye svar er ikke længere tilladt."
     autoclosed_disabled: "Dette emne er nu åbnet. Nye svar er tilladt."
     autoclosed_disabled_lastpost: "Dette emne er nu åbent. Nye svar er tilladt."
+    auto_deleted_by_timer: "Automatisk slettet af timeren."
   login:
-    not_approved: "Din konto er ikke blevet godkendt af en moderator endnu. Du får en e-mail når den bliver godkendt."
-    incorrect_username_email_or_password: "Ugyldigt navn, e-mail eller adgangskode"
+    invalid_second_factor_method: "Den valgte to-faktor-metode er ugyldig."
+    security_key_description: "Når du har forberedt din fysiske sikkerhedsnøgle, skal du trykke på knappen Godkend med sikkerhedsnøgle nedenfor."
+    security_key_alternative: "Prøv en anden måde"
+    security_key_authenticate: "Godkend med sikkerhedsnøgle"
+    security_key_not_allowed_error: "Godkendelsesprocessen for sikkerhedsnøgle fik enten timeout eller blev annulleret."
+    security_key_no_matching_credential_error: "Ingen matchende legitimationsoplysninger kunne findes i den angivne sikkerhedsnøgle."
+    security_key_support_missing_error: "Din aktuelle enhed eller browser understøtter ikke brugen af sikkerhedsnøgler. Brug en anden metode."
+    not_approved: "Din konto er ikke blevet godkendt endnu. Du vil blive underrettet via e-mail når du er klar til at logge ind."
+    incorrect_username_email_or_password: "Ugyldigt brugernavn, e-mail eller adgangskode"
+    incorrect_password: "Forkert adgangskode"
     wait_approval: "Tak for din tilmelding. Du får besked, når din konto er blevet godkendt."
     active: "Din konto er aktiv og klar."
     activate_email: "<p>Du er næsten færdig! Vi har sendt en aktiveringsmail til <b>%{email}</b>. Følg instruktionerne i mailen for at aktivere din konto. </p><p>Tjek din spammappe, hvis du ikke modtager mailen.</p>"
     not_activated: "Du kan ikke logge ind endnu. Vi har sendt en aktiverings-e-mail til dig. Følg venligst instruktionerne i e-mail’en for at aktivere din konto."
     not_allowed_from_ip_address: "Du kan ikke logge ind som %{username} fra den IP-adresse."
     admin_not_allowed_from_ip_address: "Du kan ikke logge ind som admin fra den IP-adresse."
+    reset_not_allowed_from_ip_address: "Du kan ikke anmode om nulstilling af en adgangskode fra den pågældende IP-adresse."
     suspended: "Du kan ikke logge ind før %{date}."
     suspended_with_reason: "Kontoen er suspenderet indtil %{date}: %{reason}"
     errors: "%{errors}"
     not_available: "Ikke ledigt. Prøv %{suggestion}?"
     something_already_taken: "Noget gik galt, måske er brugernavnet eller e-mail-adressen allerede registreret. Prøv “Glemt adgangskode“-linket."
+    omniauth_confirm_title: "Log ind med %{provider}"
     omniauth_confirm_button: "Fortsæt"
     authenticator_error_no_valid_email: "Mailadresser, der har tilknytning til %{account}, er ikke tilladt. Du er måske nødt til at bruge en anden mailadresse i forbindelse med din konto."
     new_registrations_disabled: "Det er ikke tilladt at oprette nye brugerkonti på nuværende tidspunkt."
@@ -1139,17 +1850,43 @@ da:
     email_too_long: "Den mailadresse, du har opgivet, er for lang. Navnet i mailadressen må ikke overstige 254 tegn, og domænenavnet må ikke overstige 253 tegn."
     reserved_username: "Dette brugernavn er ikke tilladt."
     missing_user_field: "Du har ikke udfyldt alle felterne"
+    auth_complete: "Godkendelsen er gennemført."
+    click_to_continue: "Klik her for at fortsætte."
+    second_factor_title: "To-faktor Godkendelse"
     second_factor_backup_description: "Indtast en af dine backup koder:"
+    missing_second_factor_name: "Angiv venligst et navn."
+    missing_second_factor_code: "Angiv venligst en kode."
+    second_factor_toggle:
+      totp: "Brug i stedet en autentificerings-app eller sikkerhedsnøgle"
+      backup_code: "Brug en backup kode i stedet"
   admin:
     email:
       sent_test: "sendt!"
+    user:
+      merge_user:
+        updating_username: "Opdaterer brugernavn..."
+        changing_post_ownership: "Ændrer ejerskab af indlæg..."
+        merging_given_daily_likes: "Sammenfletter de givne daglige 'Synes godt om'..."
+        merging_post_timings: "Fletter indlægs tider..."
+        merging_user_visits: "Fletter brugerbesøg..."
+        updating_site_settings: "Opdaterer webstedsindstillinger..."
+        updating_user_stats: "Opdaterer brugerstatistik..."
+        merging_user_attributes: "Fletter brugerattributter..."
+        updating_user_ids: "Opdaterer bruger-id'er..."
+        deleting_source_user: "Sletter kildebruger..."
   user:
+    deactivated: "Blev deaktiveret på grund af for mange returnerede e-mails til '%{email}'."
     deactivated_by_staff: "Deaktiveret af hjælperteamet"
+    deactivated_by_inactivity:
+      one: "Deaktiveret automatisk efter %{count} dag med inaktivitet"
+      other: "Deaktiveret automatisk efter %{count} dages inaktivitet"
     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."
       long: "skal være kortere end %{max} tegn"
+      too_long: "er for lang"
+      characters: "må kun indeholde tal, bogstaver, bindestreger, prikker og understregninger"
       unique: "skal være unik"
       blank: "skal udfyldes"
       must_begin_with_alphanumeric_or_underscore: "skal begynde med et bogstav, et nummer eller en underscore"
@@ -1157,11 +1894,21 @@ da:
       must_not_contain_two_special_chars_in_seq: "må ikke indeholde en sekvens af 2 eller flere specielle karakterer (.-_)"
       must_not_end_with_confusing_suffix: "må ikke ende med en forvirrende endelse som f.eks. .json eller .png etc."
     email:
+      invalid: "er ugyldig."
       not_allowed: "er ikke tilladt fra den e-mail-udbyder. Brug venligst en anden e-mail-adresse."
       blocked: "er ikke tilladt."
+      revoked: "Vil ikke sende e-mails til '%{email}' indtil %{date}."
+      does_not_exist: "I/T"
     ip_address:
       blocked: "Nye registreringer er ikke tilladt fra din IP adresse."
       max_new_accounts_per_registration_ip: "Nye kontoer kan ikke oprettes fra din IP-adresse (max antal er nået). Kontakt et medlem af hjælperteamet."
+    website:
+      domain_not_allowed: "Webstedet er ugyldigt. Tilladte domæner er: %{domains}"
+    auto_rejected: "Afvist automatisk på grund af alder. Se auto_handle_queued_age webstedsindstilling."
+    destroy_reasons:
+      same_ip_address: "Samme IP-adresse (%{ip_address}) som andre brugere"
+      inactive_user: "Inaktiv bruger"
+    email_in_spam_header: "Brugerens første e-mail blev anmeldt som spam"
   unsubscribe_mailer:
     subject_template: "Bekræft at du ikke længere ønsker at modtage email opdateringer fra %{site_title}"
     text_body_template: |
@@ -1172,6 +1919,70 @@ da:
       %{confirm_unsubscribe_link}
 
       Hvis du ønsker at fortsætte med at modtage mailopdateringer, kan du bare ignorere denne mail.
+  invite_mailer:
+    subject_template: "%{inviter_name} inviterede dig til '%{topic_title}' på %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} inviterede dig til en diskussion
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      på
+
+      > %{site_title} - %{site_description}
+
+      Hvis du er interesseret, klik på nedenstående link:
+
+      %{invite_link}
+  custom_invite_mailer:
+    subject_template: "%{inviter_name} inviterede dig til '%{topic_title}' på %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} inviterede dig til en diskussion
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      på
+
+      > %{site_title} - %{site_description}
+
+      Med denne note
+
+      > %{user_custom_message}
+
+      Hvis du er interesseret, klik på nedenstående link:
+
+      %{invite_link}
+  invite_forum_mailer:
+    subject_template: "%{inviter_name} inviterede dig til at deltage på %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} inviterede dig til at deltage på
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      Hvis du er interesseret, skal du klikke på nedenstående link:
+
+      %{invite_link}
+  custom_invite_forum_mailer:
+    subject_template: "%{inviter_name} inviterede dig til at deltage på %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} inviterede dig til at deltage på
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      Med denne note
+
+      > %{user_custom_message}
+
+      Hvis du er interesseret, skal du klikke på nedenstående link:
+
+      %{invite_link}
   invite_password_instructions:
     subject_template: "Opret password til din %{site_name}-konto"
     text_body_template: |
@@ -1193,38 +2004,296 @@ da:
   admin_confirmation_mailer:
     title: "Bekræftelse af admin"
     subject_template: "[%{email_prefix}] Bekræft ny admin-konto"
+    text_body_template: |
+      Bekræft venligst, at du vil tilføje **%{target_username} (%{target_email})** som administrator på dit forum.
+
+      [Bekræft administratorkonto](%{admin_confirm_url})
+  test_mailer:
+    subject_template: "[%{email_prefix}] E-mail-leveringstest"
+    text_body_template: |
+      Dette er en test e-mail fra
+
+      [**%{base_url}**][0]
+
+      E-mail leverbarhed er kompliceret. Her er et par vigtige ting, du bør tjekke først:
+
+      - Vær *sikker* på at angive `notifikations e-mail` from: adressen korrekt i dine indstillinger for webstedet. **Domænet angivet i "fra" adressen på de e-mails, du sender, er domænet din e-mail vil blive valideret imod**.
+
+      - Vid, hvordan du kan se den rå kilde til e-mailen i din mail-klient, så du kan undersøge e-mail-headere for vigtige indikatorer. I Gmail er det "vis original" i rullemenuen øverst til højre for hver mail.
+
+      - **VIGTIGT:** Har din internetudbyder en omvendt DNS-registrering indtastet for at tilknytte domænenavne og IP-adresser, du sender mail fra? [Test din omvendte PTR-registrering][2] her. Hvis din internetudbyder ikke indtaster den korrekte omvendte DNS pege-registrering, er det meget usandsynligt, at nogen af dine e-mails vil blive leveret.
+
+      - Er dit domænes [SPF-registrering][8] korrekt? [Test din SPF-registrering][1] her. Bemærk, at TXT er den korrekte officielle registreringstype for SPF.
+
+      - Er dit domænes [DKIM-registrering][3] korrekt? Dette vil forbedre leveringen af e-mails betydeligt. [Test din DKIM-registrering][7] her.
+
+      - Hvis du kører din egen mailserver, tjek for at sikre, at IP'erne på din mailserver [ikke er på nogen e-mail-bloklister][4]. Kontroller også, at den helt sikkert sender et fuldt kvalificeret værtsnavn (FQDN), der kan slås op i DNS i sin HELO besked. Hvis ikke, vil dette gøre at din e-mail vil blive afvist af mange posttjenester.
+
+      - Vi anbefaler dig at **sende en test e-mail til [mail-tester.com][mt]** for at verificere, at alt ovenstående fungerer korrekt.
+
+      (Den *lette* måde er at oprette en konto på [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] eller [Mailjet][mj], som har lave mail-omkostnings abonnementer og vil være fint til små fællesskaber. Du skal dog stadig oprette SPF og DKIM-registreringer i din DNS, selvfølgelig!)
+
+      Vi håber, at du har modtaget denne e-mail leveringstest OK!
+
+      Held og lykke,
+
+      Dine venner på [Discourse](https://www.discourse.org)
+
+      [0]: %{base_url}
+      [1]: https://www.kitterman.com/spf/validate.html
+      [2]: https://mxtoolbox.com/ReverseLookup. spx
+      [3]: http://www.dkim.org/
+      [4]: https://whatismyipaddress.com/blacklist-check
+      [7]: https://www.mail-tester. om/spf-dkim-check
+      [8]: http://www.openspf.org/SPF_Record_Syntax
+      [sg]: https://goo.gl/r1WMF6
+      [sp]: https://www. parkpost.com/
+      [mg]: https://www.mailgun.com/
+      [mj]: https://www.mailjet.com/pricing/
+      [mt]: https://www.mail-tester.com/
   new_version_mailer:
-    subject_template: "[%{email_prefix}] Ny version af Discourse, opdatering tilgængelig"
+    subject_template: "[%{email_prefix}] Ny Discourse version, opdatering tilgængelig"
   new_version_mailer_with_notes:
     subject_template: "[%{email_prefix}] opdatering tilgængelig"
   flag_reasons:
-    off_topic: "Dit indlæg blev flagmarkeret som **off-topic**: Fællesskabet synes ikke, at det passer godt ind i emnet, som er blevet defineret af titlen og det første indlæg."
-    inappropriate: "Dit indlæg blev markeret som **upassende**: Fællesskabet synes, at det er stødende, groft eller krænker [vores fællesskabs retningslinier](%{base_path}/guidelines)."
-    spam: "Dit indlæg blev markeret som **spam**: Fællesskabet synes, at det er en reklame, noget der er overdrevent salgsfremmende i stedet for at være brugbart eller relevant for emnet."
-    notify_moderators: "Dit indlæg var markeret **til moderation**: Fællesskabet synes, at noget ved indlægget kræver ingriben af et medlem af hjælperteamet."
+    off_topic: "Dit indlæg blev anmeldt som **undenfor-emnet**: Fællesskabet synes ikke, at det passer godt ind i emnet, som er blevet defineret af titlen og det første indlæg."
+    inappropriate: "Dit indlæg blev anmeldt som **upassende**: Fællesskabet synes, at det er stødende, groft eller krænker [vores fællesskabs retningslinier](%{base_path}/guidelines)."
+    spam: "Dit indlæg blev anmeldt som **spam**: Fællesskabet synes, at det er en reklame, noget der er overdrevent salgsfremmende i stedet for at være brugbart eller relevant for emnet."
+    notify_moderators: "Dit indlæg var anmeldt **til moderation**: Fællesskabet synes, at noget ved indlægget kræver ingriben af et medlem af hjælperteamet."
   flags_dispositions:
     agreed: "Tak for din henvendelse. Vi er enige i, at der er et problem, og vi kigger på det."
     agreed_and_deleted: "Tak for din henvendelse. Vi er enige i, at der er et problem, og vi har fjernet indlægget."
     disagreed: "Tak for din henvendelse. Vi kigger på det."
     ignored: "Tak for din henvendelse. Vi kigger på det."
     ignored_and_deleted: "Tak for din henvendelse. Vi har fjernet indlægget."
+  temporarily_closed_due_to_flags:
+    one: "Dette emne er midlertidigt lukket i mindst %{count} time på grund af et stort antal fællesskabsanmeldelser."
+    other: "Dette emne er midlertidigt lukket i mindst %{count} timer på grund af et stort antal fællesskabsanmeldelser."
   system_messages:
     private_topic_title: "Emne #%{id}"
     contents_hidden: "Gå venligst til indlægget for at se indholdet."
     post_hidden:
-      subject_template: "Inlægget er skjult pga. flagmarkeringer"
+      title: "Indlæg Skjult"
+      subject_template: "Indlægget er skjult pga. fællesskabs-anmeldelser"
+      text_body_template: |
+        Hej,
+
+        Dette er en automatisk besked fra %{site_name} for at fortælle dig, at dit indlæg er blevet skjult.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Dette indlæg er blevet skjult på grund af anmeldelser fra fællesskabet, så overvej hvordan du kan revidere dit indlæg for at afspejle deres feedback. **Du kan redigere dit indlæg efter %{edit_delay} minutter, og det vil automatisk blive synligt igen.**
+
+        Hvis indlægget bliver skjulet af fællesskabet endnu en gang, forbliver det skjult, indtil det håndteres af personalet.
+
+        For yderligere vejledning henvises til vores [fællesskabs-retningslinjer](%{base_url}/guidelines).
+    post_hidden_again:
+      title: "Indlæg Skjult igen"
+      subject_template: "Indlæg skjult af fællesskabsmarkeringer, personale underrettet"
+      text_body_template: |
+        Hej,
+
+        Dette er en automatiseret besked fra %{site_name} for at fortælle dig, at dit indlæg blev skjult igen.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Fællesskabet anmeldte dette indlæg, og det er nu skjult. **Da dette indlæg er skjult mere end én gang, forbliver dit indlæg nu skjult, indtil det håndteres af en medarbejder.**
+
+        For yderligere vejledning henvises til vores [retningslinjer for fællesskabet](%{base_url}/guidelines).
+    queued_by_staff:
+      title: "Indlæg Kræver Godkendelse"
+      subject_template: "Indlæg skjult af personale, afventer godkendelse"
+      text_body_template: |
+        Hej,
+
+        Dette er en automatisk besked fra %{site_name} for at fortælle dig, at dit indlæg er blevet skjult.
+
+        <%{base_url}%{url}>
+
+        Dit indlæg vil forblive skjult, indtil en medarbejder har gennemgår det.
+
+        For yderligere vejledning henvises til vores [fællesskabs-retningslinjer](%{base_url}/guidelines).
+    flags_disagreed:
+      title: "Anmeldt indlæg genoprettet af personale"
+      subject_template: "Anmeldt indlæg genoprettet af personale"
+      text_body_template: |
+        Hej,
+
+        Dette er en automatisk besked fra %{site_name} for at fortælle dig, at [dit indlæg](%{base_url}%{url}) blev gendannet.
+
+        Dette indlæg blev anmeldt af fællesskabet, og en medarbejder valgte at gendanne det.
+
+        [details="Klik for at udvide gendannet post"]
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+        [/details]
+    flags_agreed_and_post_deleted:
+      title: "Anmeldt indlæg fjernet af personalet"
+      subject_template: "Anmeldt indlæg fjernet af personalet"
+      text_body_template: |
+        Hej,
+
+        Dette er en automatisk besked fra %{site_name} for at fortælle dig, at [dit indlæg](%{base_url}%{url}) blev fjernet.
+
+        %{flag_reason}
+
+        Dette indlæg blev anmeldt af fællesskabet, og en medarbejder valgte at fjerne det.
+
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+
+        Gennemse vores [fællesskabs-retningslinjer](%{base_url}/guidelines) for detaljer.
     welcome_user:
       title: "Velkomst til bruger"
       subject_template: "Velkommen til %{site_name}!"
+      text_body_template: |
+        Tak for din tilmelding til %{site_name}, og velkommen!
+
+        %{new_user_tips}
+
+        Vi tror på [civiliseret fællesskabsadfærd](%{base_url}/guidelines) til hver en tid.
+
+        Nyd dit ophold!
+    welcome_tl1_user:
+      title: "Velkommen TL1-bruger"
+      subject_template: "Tak fordi du tilbragte tid sammen med os"
+      text_body_template: |
+        Hejsa. Vi ser du har haft travlt med at læse, hvilket er fantastisk, så vi har forfremmet dig til et højere [tillidsniveau!](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
+
+        Vi er virkelig glade for, at du bruger tid sammen med os, og vi vil elske at vide mere om dig. Brug et øjeblik på at [udfylde din profil](%{base_url}/my/preferences/profile), eller vær velkommen til at [starte et nyt emne](%{base_url}/categories).
+    welcome_staff:
+      title: "Velkommen Personale"
+      subject_template: "Tillykke, du har fået %{role} status!"
+      text_body_template: |
+        Du har nu fået status %{role} af en medarbejder.
+
+        Som %{role} har du nu adgang til <a href='%{base_url}/admin' target='_blank'>admin-interfacet</a>.
+
+        Med stor magt kommer stort ansvar. Hvis du er ny til at moderere, henvises til [Moderationsvejledningen](https://meta.discourse.org/t/discourse-moderation-guide/63116).
     welcome_invite:
       title: "Velkomst til inviterede brugere"
       subject_template: "Velkommen til %{site_name}!"
+      text_body_template: |
+        Tak, fordi du accepterede din invitation til %{site_name} - velkommen!
+
+        - Vi har oprettet denne nye konto **%{username}** til dig. Skift dit navn eller din adgangskode ved at gå til [din brugerprofil][prefs].
+
+        - Når du logger ind, bedes du **bruge den samme e-mail-adresse fra din oprindelige invitation** — ellers kan vi ikke se, at det er dig!
+
+        %{new_user_tips}
+
+        Vi tror på [civiliseret fællesskabsadfærd](%{base_url}/guidelines) til hver en tid.
+
+        Nyd dit ophold!
+
+        [prefs]: %{user_preferences_url}
+    tl2_promotion_message:
+      subject_template: "Tillykke med din tillidsniveau forfremmelse!"
+      text_body_template: |
+        Vi har forfremmet dig et andet [tillidsniveau](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+
+        Som erfaren bruger kan det være at du vil sætte pris på [denne liste over praktiske tips og tricks](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
+        Vi inviterer dig til fortsat at blive involveret – vi nyder at have dig omkring os.
+    backup_succeeded:
+      title: "Sikkerhedskopiering Gennemført"
+      subject_template: "Sikkerhedskopiering er gennemført"
+      text_body_template: |
+        Sikkerhedskopieringen lykkedes.
+
+        Besøg afsnittet [admin > backup](%{base_url}/admin/backupsr) for at hente din nye sikkerhedskopi.
+
+        Her er loggen:
+
+        ``` text
+        %{logs}
+        ```
+    backup_failed:
+      title: "Sikkerheskopiering Mislykkedes"
+      subject_template: "Sikkerhedskopiering mislykkedes"
+      text_body_template: |
+        Sikkerhedskopieringen mislykkedes.
+
+        Her er loggen:
+
+        ``` text
+        %{logs}
+        ```
+    restore_succeeded:
+      title: "Gendannelse Gennemført"
+      subject_template: "Gendannelse fuldført"
+    restore_failed:
+      title: "Gendannelse Mislykkedes"
+      subject_template: "Gendannelse mislykkedes"
+    user_added_to_group_as_owner:
+      title: "Tilføjet til gruppe som ejer"
+    user_added_to_group_as_member:
+      title: "Tilføjet til gruppen som medlem"
+    csv_export_succeeded:
+      title: "CSV Eksport Lykkedes"
+      subject_template: "[%{export_title}] Dataeksport fuldført"
+      text_body_template: |
+        Din dataeksport var vellykket! :dvd:
+
+        %{download_link}
+
+        Ovenstående downloadlink er gyldigt i 48 timer.
+
+        Dataene er komprimeret som et zip-arkiv. Hvis arkivet ikke udpakker sig selv, når du åbner det, skal du bruge det værktøj, der anbefales her: https://www.7-zip.org/
+    csv_export_failed:
+      title: "Csv- Eksport Mislykkedes"
+      subject_template: "Data eksport mislykkedes"
+      text_body_template: "Vi beklager, men din dataeksport mislykkedes. Kontroller logfilerne eller [kontakt en medarbejder](%{base_url}/about)."
+    email_reject_insufficient_trust_level:
+      title: "Email Afvist utilstrækkelig tillidsniveau"
+      subject_template: "[%{email_prefix}] E-mail-problem -- Utilstrækkeligt tillidsniveau"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Din konto har ikke det krævede tillidsniveau til at sende nye emner til denne e-mail-adresse. Hvis du mener, dette er en fejl, [kontakt en medarbejder](%{base_url}/about).
+    email_reject_user_not_found:
+      title: "E-Mail Afvist Bruger Ikke Fundet"
+      subject_template: "[%{email_prefix}] E-mail problem -- Bruger ikke fundet"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Dit svar blev sendt fra en ukendt e-mail-adresse. Prøv at sende fra en anden e-mail-adresse, eller [kontakt en medarbejder](%{base_url}/about).
+    email_reject_screened_email:
+      title: "E-mail afvist screenet e-mail"
+      subject_template: "[%{email_prefix}] E-mail problem -- Blokeret e-mail"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Dit svar blev sendt fra en blokeret e-mail-adresse. Prøv at sende fra en anden e-mail-adresse, eller [kontakt en medarbejder](%{base_url}/about).
+    email_reject_not_allowed_email:
+      title: "E-Mail Afvist Ikke Tilladt E-Mail"
+      subject_template: "[%{email_prefix}] E-mail problem -- Blokeret e-mail"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Dit svar blev sendt fra en blokeret e-mail-adresse. Prøv at sende fra en anden e-mail-adresse, eller [kontakt en medarbejder](%{base_url}/about).
     email_reject_inactive_user:
+      title: "E-Mail Afvist Inaktiv Bruger"
+      subject_template: "[%{email_prefix}] E-mail problem -- Inaktiv bruger"
       text_body_template: |
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
 
         Den konto, der er knyttet til denne mailadresse, er ikke aktiveret. Aktiver din konto, før du sendere flere mails ind.
+    email_reject_reply_user_not_matching:
+      title: "E-mail Afvist Bruger Matcher Ikke"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Dit svar blev sendt fra en anden e-mail-adresse end den, vi forventede, så vi er ikke sikre på, om dette er den samme person. Prøv at sende fra en anden e-mail-adresse, eller [kontakt en medarbejder](%{base_url}/about).
     email_reject_empty:
+      title: "E-Mail Afvist Tom"
+      subject_template: "[%{email_prefix}] E-mail-problem -- Intet indhold"
       text_body_template: |
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
 
@@ -1232,16 +2301,35 @@ da:
 
         Hvis du modtager dette og du _har_ inkluderet et svar, så prøv igen med en mere simpel formattering.
     email_reject_parsing:
+      subject_template: "[%{email_prefix}] E-mail problem -- Indhold ikke genkendt"
       text_body_template: |
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
 
         Vi kunne ikke finde dit svar i mailen. **Sørg for at dit svar står øverst i mailen** -- vi kan ikke behandle svar, der er indsat i den oprindelige tekst.
+    email_reject_invalid_access:
+      title: "E-mail Afvist ugyldig adgang"
+      subject_template: "[%{email_prefix}] E-mail-problem -- Ugyldig adgang"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Din konto har ikke tilladelse til at sende nye emner til denne kategori. Hvis du mener, dette er en fejl, [kontakt en medarbejder](%{base_url}/about).
+    email_reject_strangers_not_allowed:
+      title: "E-mail Afvist fremmede ikke tilladt"
+      subject_template: "[%{email_prefix}] E-mail-problem -- Ugyldig adgang"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Den kategori, du sendte denne e-mail til, tillader kun svar fra brugere med gyldige konti og kendte e-mail-adresser. Hvis du mener, dette er en fejl, [kontakt en medarbejder](%{base_url}/about).
     email_reject_invalid_post:
+      title: "E-mail Afvist Ugyldigt Indlæg"
+      subject_template: "[%{email_prefix}] E-mail problem -- Indlægsfejl"
       text_body_template: |
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
 
         Mulige årsager er: indviklet formattering, beskeden er for stor, beskeden er for lille. Prøv igen, eller send via websitet, hvis det fortsætter.
     email_reject_invalid_post_specified:
+      title: "E-mail Afvist ugyldigt indlæg angivet"
+      subject_template: "[%{email_prefix}] E-mail problem -- Indlægsfejl"
       text_body_template: |
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
 
@@ -1250,17 +2338,139 @@ da:
         %{post_error}
 
         Hvis du får rettet problemet, kan du prøve igen.
+    email_reject_post_too_short:
+      title: "E-Mail Afvist Indlæg For Kort"
+      subject_template: "[%{email_prefix}] E-mail-problem -- Indlægget er for kort"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) virkede ikke.
+
+        For at fremme mere dybtgående samtaler er meget korte svar ikke tilladt. Kan du venligst svare med mindst %{count} tegn? Alternativt kan du 'Synes godt om' et indlæg via e-mail ved at svare med "+1".
     email_reject_invalid_post_action:
+      title: "E-Mail Afvist Ugyldig Indlægshandling"
+      subject_template: "[%{email_prefix}] E-mail-problem -- Ugyldig indlægshandling"
       text_body_template: |
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
 
         Send-handlingen blev ikke genkendt. Prøv igen, eller send via websitet, hvis det fortsætter.
+    email_reject_reply_key:
+      title: "Email Afvist Svarnøgle"
+      subject_template: "[%{email_prefix}] E-mail-problem -- Ukendt Svarnøgle"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Svarnøglen i e-mailen er ugyldig eller ukendt, så vi kan ikke finde ud af, hvad denne e-mail er som svar på. [Kontakt en medarbejder](%{base_url}/about).
+    email_reject_old_destination:
+      title: "E-mail Afvist Gammel Destination"
+      subject_template: "[%{email_prefix}] E-mail-problem -- Du forsøger at besvare en gammel notifikation"
+      text_body_template: |
+        Vi beklager, men din e-mail meddelelse til %{destination} (med titlen %{former_title}) virkede ikke.
+
+        Vi accepterer kun svar på originale notifikationer i %{number_of_days} dage. [besøg emnet](%{short_url}) for at fortsætte samtalen.
+    email_reject_topic_not_found:
+      title: "E-Mail Afvist Emne Ikke Fundet"
+      subject_template: "[%{email_prefix}] E-mail problem -- Emne ikke fundet"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Det emne, du svarer på, findes ikke længere - måske blev det slettet? Hvis du mener, dette er en fejl, [kontakt en medarbejder](%{base_url}/about).
+    email_reject_topic_closed:
+      title: "E-mail Afvist Emne Lukket"
+      subject_template: "[%{email_prefix}] E-mail-problem — Emne lukket"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Emnet, du svarer på, er i øjeblikket lukket og accepterer ikke længere svar. Hvis du mener, dette er en fejl, [kontakt en medarbejder](%{base_url}/about).
+    email_reject_auto_generated:
+      title: "E-Mail Afvist Automatisk Genereret"
+      subject_template: "[%{email_prefix}] E-mail-problem -- Automatisk Genereret Svar"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Din e-mail blev markeret som "automatisk genereret", hvilket betyder, at den blev oprettet automatisk af en computer i stedet for at blive skrevet af et menneske; vi kan ikke acceptere den slags e-mails. Hvis du mener, dette er en fejl, [kontakt en medarbejder](%{base_url}/about).
+    email_reject_unrecognized_error:
+      title: "E-mail Afvist Ukendt Fejl"
+      subject_template: "[%{email_prefix}] E-mail-problem -- Ukendt Fejl"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Der opstod en ukendt fejl under behandling af din e-mail, og den blev ikke sendt. Du skal prøve igen eller [kontakte en medarbejder](%{base_url}/about).
+    email_reject_attachment:
+      title: "E-mail Vedhæftning Afvist"
+      subject_template: "[%{email_prefix}] E-mail problem -- Vedhæftning Afvist"
+      text_body_template: |
+        Desværre blev nogle vedhæftede filer i din e-mail til %{destination} (med titlen %{former_title}) afvist.
+
+        Detaljer:
+        %{rejected_errors}
+
+        Hvis du mener, at dette er en fejl, [kontakt en medarbejder](%{base_url}/about).
+    email_reject_reply_not_allowed:
+      title: "E-Mail Afvist Svar Ikke Tilladt"
+      subject_template: "[%{email_prefix}] E-mail problem -- Svar Ikke Tilladt"
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Du har ikke tilladelse til at svare på emnet. Hvis du mener, dette er en fejl, [kontakt en medarbejder](%{base_url}/about).
+    email_reject_reply_to_digest:
+      text_body_template: |
+        Vi beklager, men din e-mail til %{destination} (med titlen %{former_title}) fungerede ikke.
+
+        Du svarede på en Resume-e-mail, som ikke accepteres.
+
+        Hvis du mener, dette er en fejl, [kontakt en medarbejder](%{base_url}/about).
+    email_error_notification:
+      text_body_template: |
+        Desværre var der en godkendelsesfejl under hentning af mails fra POP-serveren.
+
+        Sørg for, at du har konfigureret POP-legitimationsoplysningerne korrekt i [indstillingerne](%{base_url}/admin/site_settings/category/email).
+
+        Hvis der er en webbrugerflade til POP-e-mail-kontoen, kan du være nødt til at logge ind på webbrugerfladen og kontrollere dine indstillinger der.
+    email_revoked:
+      title: "E-mail Tilbagekaldt"
+      subject_template: "Er din e-mailadresse korrekt?"
+      text_body_template: |
+        Vi beklager, men vi har problemer med at kontakte dig via e-mail. Vores sidste par e-mails til dig er alle vendt tilbage som "kan ikke leveres".
+
+        Kan du sikre dig, at [din e-mailadresse](%{base_url}/my/preferences/email) er gyldig og fungerer? Du kan også tilføje vores e-mailadresse til din adressebog / kontaktliste for at forbedre leveringen.
+    email_bounced: |
+      Meddelelsen til %{email} kom retur uleveret.
+
+      ### Detaljer
+
+      ``` text
+      %{raw}
+      ```
+    ignored_users_summary:
+      text_body_template: |
+        Hej,
+
+        Dette er en automatisk besked fra %{site_name} at informere dig om, at @%{username} er blevet ignoreret af %{ignores_threshold} brugere. Dette kan indikere, at der er ved at udvikle sig et problem i dit fællesskab.
+
+        Du vil måske [gennemgå de seneste indlæg](%{base_url}/u/%{username}/resume) fra denne bruger og potentielt andre brugere i [ignoreret og tavs brugerrapport] (%{base_url}/admin/reports/top_ignored_users).
+
+        For yderligere vejledning henvises til vores [fællesskabs-retningslinjer](%{base_url}/guidelines).
     too_many_spam_flags:
-      title: "For Mange Flagmarkeringer for Spam"
+      title: "For Mange anmeldelser for Spam"
       subject_template: "Nyoprettet konto sat på hold"
+      text_body_template: |
+        Hej,
+
+        Dette er en automatisk besked fra %{site_name} for at fortælle dig, at dine indlæg midlertidigt er blevet skjult, fordi de blev anmeldt af fællesskabet.
+
+        Som en sikkerhedsforanstaltning er din nye konto blevet begrænset og kan derfor ikke oprette svar eller emner, før en medarbejder kan gennemgå din konto. Vi beklager ulejligheden.
+
+        For yderligere vejledning henvises til vores [fællesskabs-retningslinjer](%{base_url}/guidelines).
     too_many_tl3_flags:
-      title: "For Mange TL3 Flagmarkeringer"
+      title: "For Mange TL3 Anmeldelser"
       subject_template: "Nyoprettet konto sat på hold"
+      text_body_template: |
+        Hej,
+
+        Dette er en automatiseret besked fra %{site_name} for at fortælle dig, at din konto er blevet sat i venteposition på grund af et stort antal fællesskabs-anmeldelser.
+
+        Som en sikkerhedsforanstaltning er din nye konto blevet begrænset fra at oprette nye svar eller emner, indtil en medarbejder kan gennemgå din konto. Vi beklager ulejligheden.
+
+        For yderligere vejledning henvises til vores [fællesskabs-retningslinjer](%{base_url}/guidelines).
     silenced_by_staff:
       subject_template: "Konto midlertidigt sat på hold"
       text_body_template: |
@@ -1290,9 +2500,22 @@ da:
     download_remote_images_disabled:
       subject_template: "Download af eksterne billeder er slået fra"
       text_body_template: "Indstillingen `download_remote_images_to_local` blev slået fra fordi grænsen for bug af diskplads i `download_remote_images_threshold` blev nået."
+    dashboard_problems:
+      text_body_template: |
+        Vi har nogle nye råd og anbefalinger til dig baseret på dine nuværende webstedsindstillinger.
+
+        [Besøg dit webside dashboard](%{base_url}/admin) for at se det.
+
+        Hvis intet er synligt på dit dashboard, kan en anden medarbejder muligvis allerede have handlet på dette råd. En liste over medarbejderhandlinger kan findes under dine [Personale Handlingslogs] (%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Du er månedens nye bruger!"
       subject_template: "Du er månedens nye bruger!"
+      text_body_template: |
+        Tillykke, du har optjent **Månedens nye bruger for %{month_year}**. :trophy:
+
+        Denne pris tildeles kun to nye brugere om måneden, og den vil være permanent synlig på [emblemsiden](%{url}).
+
+        Du er hurtigt blevet et værdifuldt medlem af vores fællesskab. Tak for tilmeldingen, og fortsæt det store arbejde!
     queued_posts_reminder:
       title: "Påmindelse om indlæg, der skal godkendes"
   unsubscribe_link: |
@@ -1303,19 +2526,65 @@ da:
     Du får dette, fordi du har slået funktionen mailingliste til.
 
     [Afmeld](%{unsubscribe_url}).
-  subject_re: "Re:"
-  subject_pm: "[PB] "
+  subject_re: "Sv: "
+  subject_pm: "[PM] "
   user_notifications:
-    previous_discussion: "Forrige svar"
+    previous_discussion: "Tidligere Svar"
     in_reply_to: "Som svar på"
     unsubscribe:
       title: "Frameld"
       description: "Ønsker du ikke at modtage disse e-mails? Intet problem! Klik herunder for at framelde med det samme:"
     reply_by_email: "[Besøg emnet](%{base_url}%{url}) eller svar på denne email for at svare."
+    reply_by_email_pm: "[Besøg Meddelelse](%{base_url}%{url}) eller svar på denne e-mail for at svare %{participants}."
     only_reply_by_email: "Besvar denne mail for at svare."
+    only_reply_by_email_pm: "Svar på denne e-mail for at svare %{participants}."
     visit_link_to_respond: "[Gå til emne](%{base_url}%{url}) for at svare."
     posted_by: "Oprettet af %{username} den %{post_date}"
+    invited_group_to_private_message_body: |
+      %{username} inviterede @%{group_name} til en besked
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      på
+
+      > %{site_title} - %{site_description}
+
+      Klik på nedenstående link for at deltage i meddelelsen:
+
+      %{topic_url}
+    invited_to_private_message_body: |
+      %{username} inviterede dig til en meddelelse
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      på
+
+      > %{site_title} - %{site_description}
+
+      For at deltage i meddelelsen skal du klikke på nedenstående link:
+
+      %{topic_url}
+    invited_to_topic_body: |
+      %{username} inviterede dig til en diskussion
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      på
+
+      > %{site_title} - %{site_description}
+
+      Klik på nedenstående link for at deltage i diskussionen:
+
+      %{topic_url}
     user_invited_to_private_message_pm_group:
+      title: "Brugeren inviterede Gruppe til PM"
+      subject_template: "[%{email_prefix}] %{username} inviterede @%{group_name} til beskeden '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -1324,7 +2593,7 @@ da:
         %{respond_instructions}
     user_invited_to_private_message_pm:
       title: "Bruger inviteret til PB"
-      subject_template: "[%{site_name}] %{username} inviterede dig til en privat besked '%{topic_title}'"
+      subject_template: "[%{email_prefix}] %{username} inviterede dig til en meddelelse '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -1332,7 +2601,7 @@ da:
 
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
-      subject_template: "[%{site_name}] %{username} inviterede dig til en privat besked '%{topic_title}'"
+      subject_template: "[%{email_prefix}] %{username} inviterede dig til en privat meddelelse '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -1360,6 +2629,7 @@ da:
 
         %{respond_instructions}
     user_replied_pm:
+      title: "Bruger Besvarede PM"
       subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -1403,6 +2673,7 @@ da:
 
         %{respond_instructions}
     user_mentioned_pm:
+      title: "Bruger Nævnte PM"
       subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -1413,6 +2684,7 @@ da:
 
         %{respond_instructions}
     user_group_mentioned:
+      title: "Brugergruppe Nævnte"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -1460,22 +2732,49 @@ da:
       text_body_template: |2
 
         %{message}
+    account_suspended:
+      title: "Konto Suspenderet"
+      subject_template: "[%{email_prefix}] Din konto er blevet suspenderet"
+      text_body_template: |
+        Du er blevet suspenderet fra forummet indtil %{suspended_till}.
+
+        Årsag - %{reason}
     account_exists:
       title: "Konto findes allerede"
+      subject_template: "[%{email_prefix}] Kontoen findes allerede"
+      text_body_template: |
+        Du har lige prøvet at oprette en konto på %{site_name} eller prøvet at ændre e-mailen til en konto til %{email}. Der findes dog allerede en konto til %{email}.
+
+        Hvis du har glemt din adgangskode, [kan du nulstille den nu](%{base_url}/password-reset).
+
+        Hvis du ikke forsøgte at oprette en konto til %{email} eller ændre din e-mail-adresse, skal du ikke bekymre dig - du kan med sikkerhed ignorere denne meddelelse.
+
+        Hvis du har spørgsmål, [kontakt vores venlige personale](%{base_url}/about).
+    account_second_factor_disabled:
+      title: "To-Faktor godkendelse deaktiveret"
+      subject_template: "[%{email_prefix}] To-Faktor godkendelse deaktiveret"
+      text_body_template: |
+        To-faktor-godkendelse er blevet deaktiveret for din konto på %{site_name}. Du kan nu logge ind ved kun at bruge din adgangskode; en ekstra godkendelseskode er ikke længere påkrævet.
+
+        Hvis du ikke valgte at deaktivere tofaktorautentificering, kan nogen have kompromitteret din konto.
+
+        Hvis du har spørgsmål, [kontakt vores venlige personale](%{base_url}/about).
     digest:
       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"
+      new_topics: "Nye Emner"
       unread_notifications: "Ulæste beskeder"
-      liked_received: "Modtagne \"Synes om\""
-      new_users: "Nye brugere"
-      popular_topics: "Populære emner"
+      liked_received: "Modtagne \"Synes godt om\""
+      new_users: "Nye Brugere"
+      popular_topics: "Populære Emner"
       follow_topic: "Følg dette emne"
       join_the_discussion: "Læs mere"
-      popular_posts: "Populære indlæg"
+      popular_posts: "Populære Indlæg"
       more_new: "Nyt for dig"
       subject_template: "[%{email_prefix}] Sammendrag"
+      your_email_settings: "dine e-mail-indstillinger"
       click_here: "klik her"
+      from: "%{site_name}"
       preheader: "Et kort resume siden de sidste besøg %{last_seen_at}"
     forgot_password:
       title: "Glemt adgangskode"
@@ -1487,45 +2786,180 @@ da:
 
         Klik på linket som følger for at vælge en ny adgangskode:
         %{base_url}/u/password-reset/%{email_token}
+    email_login:
+      title: "Log ind via link"
+      subject_template: "[%{email_prefix}] Log ind via link"
+      text_body_template: |
+        Her er dit link til at logge ind på [%{site_name}](%{base_url}).
+
+        Hvis du ikke har anmodet om dette link, kan du med sikkerhed ignorere denne e-mail.
+
+        Klik på følgende link for at logge ind:
+        %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "Angiv adgangskode"
       subject_template: "[%{email_prefix}] Angiv adgangskode"
+      text_body_template: |
+        Nogen bad om at tilføje en adgangskode til din konto på [%{site_name}](%{base_url}). Alternativt kan du logge ind ved hjælp af enhver understøttet onlinetjeneste (Google, Facebook osv.), Der er knyttet til denne validerede e-mail-adresse.
+
+        Hvis du ikke står bag denne anmodning, kan du med sikkerhed ignorere denne e-mail.
+
+        Klik på følgende link for at vælge en adgangskode:
+        %{base_url}/u/password-reset/%{email_token}
     admin_login:
+      title: "Admin Login"
       subject_template: "[%{email_prefix}] Login"
+      text_body_template: |
+        Nogen bad om at logge ind på din konto på [%{site_name}](%{base_url}).
+
+        Hvis du ikke har anmodet om dette, kan du med sikkerhed ignorere denne e-mail.
+
+        Klik på følgende link for at logge ind:
+        %{base_url}/session/email-login/%{email_token}
     account_created:
+      title: "Konto Oprettet"
       subject_template: "[%{email_prefix}] Din Nye Konto"
+      text_body_template: |
+        En ny konto blev oprettet til dig på %{site_name}
+
+        Klik på følgende link for at vælge en adgangskode til din nye konto:
+        %{base_url}/u/password-reset/%{email_token}
     confirm_new_email:
+      title: "Bekræft Ny E-Mail"
       subject_template: "[%{email_prefix}] Bekræft din nye e-mail-adresse"
+      text_body_template: |
+        Bekræft din nye e-mail-adresse til %{site_name} ved at klikke på følgende link:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
+
+        Hvis du ikke har anmodet om denne ændring, bedes du kontakte en [websteds administrator](%{base_url}/about).
+    confirm_new_email_via_admin:
+      title: "Bekræft Ny E-Mail"
+      subject_template: "[%{email_prefix}] Bekræft din nye e-mail-adresse"
+      text_body_template: |
+        Bekræft din nye e-mail-adresse til %{site_name} ved at klikke på følgende link:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
+
+        Hvis du ikke har anmodet om denne ændring, bedes du kontakte en [websteds administrator](%{base_url}/about).
     confirm_old_email:
+      title: "Bekræft Gammel E-Mail"
       subject_template: "[%{email_prefix}] Bekræft din nuværende e-mail-adresse"
+      text_body_template: |
+        Inden vi kan ændre din e-mail-adresse, skal vi bekræfte, at du kontrollerer
+        den aktuelle e-mail-konto. Når du har gennemført dette trin, får vi dig til at bekræfte
+        den nye e-mail-adresse.
+
+        Bekræft din nuværende e-mail-adresse for %{site_name} ved at klikke på følgende link:
+
+        %{base_url}/u/confirm-old-email/%{email_token}
     confirm_old_email_add:
+      title: "Bekræft Gammel E-Mail (Tilføj)"
       subject_template: "[%{email_prefix}] Bekræft din nuværende e-mail-adresse"
+      text_body_template: |
+        Inden vi kan tilføje din e-mail-adresse, skal vi bekræfte, at du kontrollerer
+        den aktuelle e-mail-konto. Når du har gennemført dette trin, får vi dig til at bekræfte
+        den nye e-mail-adresse.
+
+        Bekræft din nuværende e-mail-adresse for %{site_name} ved at klikke på følgende link:
+
+        %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
-      subject_template: "[%{email_prefix}] Din e-mail-adresse er ændret"
+      title: "Advisér Gammel E-Mail"
+      subject_template: "[%{email_prefix}] Din e-mail-adresse er blevet ændret"
+      text_body_template: |
+        Dette er en automatisk besked, for at fortælle dig, at din e-mail-adresse til
+        %{site_name} er blevet ændret. Hvis dette blev gjort ved en fejl, bedes du kontakte
+        en websteds administrator.
+
+        Din e-mail-adresse er blevet ændret til:
+
+        %{new_email}
+    notify_old_email_add:
+      title: "Advisér Gammel E-Mail (Tilføj)"
+      subject_template: "[%{email_prefix}] En ny e-mailadresse er blevet tilføjet"
+      text_body_template: |
+        Dette er en automatisk besked, for at give dig besked om, at en e-mail adresse til
+        %{site_name} er blevet tilføjet. Hvis dette blev gjort ved en fejl, bedes du kontakte
+        en webstedsadministrator.
+
+        Din tilføjede e-mail-adresse er:
+
+        %{new_email}
     signup_after_approval:
+      title: "Tilmelding Efter Godkendelse"
       subject_template: "Du er blevet godkendt på %{site_name}!"
+      text_body_template: |
+        Velkommen til %{site_name}!
+
+        En medarbejder godkendte din konto på %{site_name}..
+
+        Du kan nu få adgang til din nye konto ved at logge ind på:
+        %{base_url}
+
+        Hvis ovenstående link ikke kan klikkes på, kan du prøve at kopiere og indsætte den i adresselinjen i din webbrowser.
+
+        %{new_user_tips}
+
+        Vi tror på [civiliseret fællesskabsadfærd](%{base_url}/guidelines) til hver en tid.
+
+        Nyd dit ophold!
+    signup_after_reject:
+      title: "Tilmelding efter Afvisning"
+      subject_template: "Du er blevet afvist på %{site_name}"
+      text_body_template: |
+        En medarbejder afviste din konto på %{site_name}.
+
+        %{reject_reason}
     signup:
       subject_template: "[%{email_prefix}] Bekræft din nye konto"
+      text_body_template: |
+        Velkommen til %{site_name}!
+
+        Klik på følgende link for at bekræfte og aktivere din nye konto:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Hvis ovenstående link ikke kan klikkes på, kan du prøve at kopiere og indsætte det i adresselinjen i din webbrowser.
+    activation_reminder:
+      text_body_template: |
+        Velkommen til %{site_name}!
+
+        Dette er en venlig påmindelse om aktivering af din konto
+
+        Klik på følgende link for at bekræfte og aktivere din nye konto:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Hvis ovenstående link ikke kan klikkes på, kan du prøve at kopiere og indsætte det i adresselinjen i din webbrowser.
+    post_approved:
+      title: "Dit indlæg blev godkendt"
   page_not_found:
     title: "Ups! Den side eksisterer ikke eller også er den privat."
     popular_topics: "Populære"
     recent_topics: "Nye"
     see_more: "Flere"
-    search_title: "Søg på denne side"
+    search_title: "Søg på dette websted"
     search_button: "Søg"
   deleted: "slettet"
   image: "billede"
   upload:
-    unauthorized: "Beklager, filen, som du forsøger at uploade er ikke autoriseret (autoriserede filendelser: %{authorized_extensions})."
+    unauthorized: "Beklager, filen, som du forsøger at overføre er ikke godkendt (godkente filendelser: %{authorized_extensions})."
     pasted_image_filename: "Indsat billede"
-    file_missing: "Du skal angive en fil til overførsel."
+    file_missing: "Beklager, Du skal vælge en fil at overføre."
+    png_to_jpg_conversion_failure_message: "Der opstod en fejl ved konvertering fra PNG til JPG."
+    optimize_failure_message: "Der opstod en fejl under optimering af det overførte billede."
     attachments:
       too_large: "Beklager, men den fil du prøver at overføre er for stor (maksimumstørelsen er %{max_size_kb}KB)"
     images:
-      too_large: "Beklager, men billedet som du forsøger at uploade er for stort (den maksimale størrelse er %{max_size_kb}KB). Gør det venligst mindre og prøv igen."
+      too_large: "Beklager, men billedet som du forsøger at overføre er for stort (den maksimale størrelse er %{max_size_kb}KB). Gør det venligst mindre og prøv igen."
+      larger_than_x_megapixels: "Beklager, det billede, du prøver at overføre, er for stort (maks. Dimension er %{max_image_megapixels}-megapixels), du bedes ændre størrelsen på det og prøve igen."
       size_not_found: "Beklager, men vi kunne ikke fastslå billedets størrelse. Måske er dit billede ødelagt?"
+    placeholders:
+      too_large: "(Billede større end %{max_size_kb}KB)"
+  avatar:
+    missing: "Beklager, vi kan ikke finde nogen avatar forbundet med denne e-mailadresse. Kan du prøve at overføre den igen?"
   flag_reason:
-    sockpuppet: "En ny bruger oprettede et emne, og en anden ny bruger med den samme IP-adresse (%{ip_address}) besvarede. Se indstillinger for <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
+    sockpuppet: "En ny bruger oprettede et emne, og en anden ny bruger med den samme IP-adresse (%{ip_address}) svarede. Se indstillinger for <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
+    spam_hosts: "Denne nye bruger forsøgte at oprette flere indlæg med links til det samme domæne. Alle indlæg fra denne bruger, der indeholder links, bør gennemgås. Se <a href='%{base_path}/admin/site_settings/category/spam'>'newuser_spam_host_threshold'</a> webstedsindstillingen."
   skipped_email_log:
     exceeded_emails_limit: "Overskredet max_emails_per_day_per_user"
     exceeded_bounces_limit: "Overskredet bounce_score_threshold"
@@ -1536,166 +2970,707 @@ da:
     user_email_seen_recently: "Bruger har været logget på for nyligt"
     user_email_notification_already_read: "Den notifikation som denne email handler om er allerede læst"
     user_email_notification_topic_nil: "post.topic er nul"
-    user_email_post_user_deleted: "Brugeren af dette svar er blevet slettet."
+    user_email_post_user_deleted: "Brugeren af dette indlæg er blevet slettet."
     user_email_post_deleted: "indlægget er blevet slettet af forfatteren"
-    user_email_user_suspended: "brugeren blev suspenderet"
+    user_email_user_suspended: "brugeren var suspenderet"
     user_email_already_read: "brugeren har allerede læst dette indlæg"
+    user_email_access_denied: "bruger har ikke lov til at se dette indlæg"
+    user_email_no_email: "Ingen e-mail tilknyttet bruger-id %{user_id}"
     sender_message_blank: "beskeden er tom"
     sender_message_to_blank: "message.to er tom"
     sender_text_part_body_blank: "text_part.body er tom"
     sender_body_blank: "brødtekst er tom"
+    sender_post_deleted: "indlæg er blevet slettet"
+    sender_message_to_invalid: "modtager har ugyldig e-mailadresse"
+    sender_topic_deleted: "emne er blevet slettet"
   color_schemes:
     base_theme_name: "Base"
     light: "Lys"
     dark: "Mørk"
+    neutral: "Neutral"
+    shades_of_blue: "Blå nuancer"
+    latte: "Latte"
+    summer: "Sommer"
+    wcag: "WCAG lys"
+    wcag_theme_name: "WCAG lys"
+    wcag_dark: "WCAG Mørk"
+    wcag_dark_theme_name: "WCAG Mørk"
+    default_theme_name: "Standard"
     light_theme_name: "Lys"
     dark_theme_name: "Mørk"
+    neutral_theme_name: "Neutral"
+    shades_of_blue_theme_name: "Blå nuancer"
+    latte_theme_name: "Latte"
+    summer_theme_name: "Sommer"
   edit_this_page: "Rediger denne side"
   csv_export:
     boolean_yes: "Ja"
     boolean_no: "Nej"
-    rate_limit_error: "Indlæg kan downloades en gang om dagen, prøv igen i morgen."
+    rate_limit_error: "Indlæg kan hentes en gang om dagen, prøv igen i morgen."
   static_topic_first_reply: |
     Rediger det første indlæg i dette emne for at ændre indholdet af siden %{page_name}
   guidelines_topic:
-    title: "FAQ/Retningslinjer"
+    title: "OSS/Retningslinjer"
+    body: |
+      <a name="civilized"></a>
+
+      ## [Dette er et civiliseret sted for offentlig diskussion](#civilized)
+
+      Behandl dette diskussionsforum med den samme respekt, som du ville med en offentlig park. Vi er også en fællesskabs-ressource &mdash; et sted at dele færdigheder, viden og interesser gennem løbende samtale.
+
+      Dette er ikke hårde og hurtige regler, kun retningslinjer for at hjælpe den menneskelige vurdering af vores fællesskab og holde dette til et rent og godt oplyst sted for civiliseret offentlig discourse.
+
+      <a name="improve"></a>
+
+      ## [Forbedre diskussionen](#improve)
+
+      Hjælp os med at gøre dette til et godt sted for diskussion ved altid at arbejde på at forbedre diskussionen på en eller anden måde, uanset hvor lille den er. Hvis du ikke er sikker på, at dit indlæg føjer til samtalen, skal du overveje, hvad du vil sige, og prøve igen senere.
+
+      De emner, der diskuteres her, betyder noget for os, og vi vil have dig til at handle som om de også betyder noget for dig. Vær respektfuld for emnerne og de mennesker, der diskuterer dem, selvom du er uenig i noget af det, der bliver sagt.
+
+      En måde at forbedre diskussionen på er at opdage dem, der allerede sker. Brug tid på at gennemse emnerne her, før du svarer eller starter dine egne, og du har en bedre chance for at møde andre, der deler dine interesser.
+
+      <a name="agreeable"></a>
+
+      ## [Vær behagelig, selv når du er uenig](#agreeable)
+
+      Du ønsker måske at svare på noget ved at være uenig i det. Det er fint. Men husk at _kritisere ideer, ikke mennesker_. Undgå venligst:
+
+      * Øgenavne
+      * Ad hominem-angreb
+      * Svar på et indlægs tone i stedet for dets faktiske indhold
+      * Knæstød selvmodsigelse
+
+      Angiv i stedet begrundede modargumenter, der forbedrer samtalen.
+
+      <a name="participate"></a>
+
+      ## [Din deltagelse tæller](#participate)
+
+      De samtaler, vi har her, sætter tonen for hver ny ankomst. Hjælp os med at påvirke fremtiden for dette fællesskab ved at vælge at deltage i diskussioner, der gør dette forum til et interessant sted at være &mdash; og undgå dem, der ikke gør det.
+
+      Discourse giver værktøjer, der gør det muligt for fællesskabet til kollektivt at identificere de bedste (og værste) bidrag: bogmærker, 'synes godt om', rapporteringer, svar, redigeringer osv. Brug disse værktøjer til at forbedre din egen oplevelse og alle andres også.
+
+      Lad os efterlade vores fællesskab bedre, end vi fandt det.
+
+      <a name="flag-problems"></a>
+
+      ## [Hvis du ser et problem, skal du rapportere det](#flag-problems)
+
+      Moderatorer har særlig autoritet; de er ansvarlige for dette forum. Men det er du også. Med din hjælp kan moderatorer være fællesskabs facilitatorer, ikke kun pedeller eller politi.
+
+      Når du ser dårlig opførsel, skal du ikke svare. Det tilskynder til den dårlige opførsel ved at anerkende det, forbruger din energi og spilder alles tid. _Bare rapporter det_. Hvis der kommer nok rapporteringer, vil der blive handlet enten automatisk eller ved moderator indgriben.
+
+      For at opretholde vores fællesskab forbeholder moderatorer sig retten til at fjerne ethvert indhold og enhver brugerkonto af enhver grund til enhver tid. Moderatorer får ikke vist nye indlæg; moderatorerne og webstedsoperatørerne tager intet ansvar for noget indhold, der er indsendt af fællesskabet.
+
+      <a name="be-civil"></a>
+
+      ## [Vær altid civiliseret](#be-civil)
+
+      Intet saboterer en sund samtale som uhøflighed:
+
+      * Vær civiliseret. Send ikke noget, som en fornuftig person vil betragte som stødende, voldelig eller hadefuld tale.
+      * Hold det rent. Send ikke noget uanstændigt eller seksuelt eksplicit.
+      * Respekter hinanden. Du må ikke chikanere eller bringe sorg over nogen, efterligne folk eller afsløre deres private oplysninger.
+      * Respekter vores forum. Du må ikke sende spam eller på anden måde hærge forummet.
+
+      Dette er ikke konkrete vilkår med præcise definitioner &mdash; undgå endda _udseendet_ af nogen af disse ting. Hvis du er i tvivl, så spørg dig selv, hvordan du har det, hvis dit indlæg blev vist på forsiden af New York Times.
+
+      Dette er et offentligt forum, og søgemaskiner indekserer disse diskussioner. Sørg for, at sprog, links og billeder er sikre for familie og venner.
+
+      <a name="keep-tidy"></a>
+
+      ## [Hold det ryddeligt](#keep-tidy)
+
+      Gør en indsats for at placere tingene på det rigtige sted, så vi kan bruge mere tid på at diskutere og mindre oprydning. Så:
+
+      * Start ikke et emne i den forkerte kategori.
+      * Kryds-indlæg ikke den samme ting i flere emner.
+      * Send ikke svar uden indhold.
+      * Undlad at omdirigere et emne ved at ændre det midtvejs.
+      * Underskriv ikke dine indlæg &mdash; hvert indlæg har dine profiloplysninger knyttet til sig.
+
+      I stedet for at sende "+1" eller "Aftalt" skal du bruge knappen 'Synes godt om'. I stedet for at tage et eksisterende emne i en radikalt anden retning, skal du bruge Svar som et sammenkædet emne.
+
+      <a name="stealing"></a>
+
+      ## [Send kun dine egne ting](#stealing)
+
+      Du må muligvis ikke sende noget digitalt, der tilhører en anden uden tilladelse. Du må ikke sende beskrivelser af, links til eller metoder til at stjæle andres intellektuelle ejendomsret (software, video, lyd, billeder) eller til at bryde nogen anden lov.
+
+      <a name="power"></a>
+
+      ## [Drevet af dig](#power)
+
+      Dette websted drives af dit [venlige lokale personale](%{base_path}/about) og *dig*, fællesskabet. Hvis du har yderligere spørgsmål om, hvordan ting skal fungere her, skal du åbne et nyt emne i [site feedback-kategori](%{base_path}/c/site-feedback) og lad os diskutere! Hvis der er et kritisk eller presserende problem, der ikke kan håndteres af et meta-emne eller rapportering, skal du kontakte os via [Om siden](%{base_path}/about).
+
+      <a name="tos"></a>
+
+      ## [Servicevilkår](#tos)
+
+      Ja, juridiske aftaler er kedelige, men vi skal beskytte os selv &ndash; og i forlængelse, dig og dine data &ndash; mod uvenlige folk. Vi har [Servicevilkår](%{base_path}/tos), der beskriver din (og vores) adfærd og rettigheder relateret til indhold, privatliv og love. For at bruge denne tjeneste skal du acceptere at overholde vores [Servicevilkår](%{base_path}/tos).
   tos_topic:
     title: "Vilkår"
+    body: |
+      Disse vilkår vedrører brugen af Internet forummet på <%{base_url}>. For at bruge dette forum, skal du acceptere disse vilkår med %{company_name}, virksomheden der driver dette forum.
+
+      Virksomheden kan tilbyde andre produkter og tjenester, under forskellige vilkår. Disse vilkår finder kun anvendelse på dette forum.
+
+      Spring til:
+
+      - [Vigtige Vilkår](#heading--important-terms)
+      - [Din Tilladelse til at Bruge dette Forum](#heading--permission)
+      - [Betingelser for Brugen af dette Forum](#heading--conditions)
+      - [Acceptabel Brug](#heading--acceptable-use)
+      - [Indholds Standarder](#heading--content-standards)
+      - [Håndhævelse](#heading--enforcement)
+      - [Din Konto](#heading--your-account)
+      - [Dit Indhold](#heading--your-content)
+      - [Dit Ansvar](#heading--responsibility)
+      - [Forbehold](#heading--disclaimers)
+      - [Grænser for Ansvar](#heading--liability)
+      - [Tilbagemelding](#heading--feedback)
+      - [Opsigelse](#heading--termination)
+      - [Tvister](#heading--disputes)
+      - [Generelle Vilkår](#heading--general)
+      - [Kontakt](#heading--contact)
+      - [Ændringer](#heading--changes)
+
+      <h2 id="heading--important-terms"><a href="#heading--important-terms">Vigtige Vilkår</a></h2>
+
+      ***Disse vilkår indeholder et antal af vigtige bestemmelser der berører dine rettigheder og dit ansvar såsom Forbehold i [Forbehold](#heading--disclaimers), begrænsninger i virksomhedens ansvar overfor dig i [Grænser for Ansvar](#heading--liability), din aftale om at dække virksomhedens skader forsaget af dit forkerte brug af dette forum i [Ansvar for Dit Brug](#heading--responsibility), og en aftale om at mægle Tvister i [Tvister](#heading--disputes).***
+
+      <h2 id="heading--permission"><a href="#heading--permission">Din Tilladelse til at Bruge dette Forum</a></h2>
+
+      Med forbehold for disse vilkår, giver virksomheden dig tilladelse til at benytte dette forum. Alle skal acceptere disse vilkår for at benytte dette forum.
+
+      <h2 id="heading--conditions"><a href="#heading--conditions">Betingelser for Brugen af dette Forum</a></h2>
+
+      Din Tilladelse til at Bruge dette Forum er underlagt følgende betingelser:
+
+      1. Du skal være mindst tretten år gammel.
+
+      2. Du må ikke længere benytte dette forum, hvis virksomheden Kontakter dig direkte for at sige at du ikke må.
+
+      3. Du skal benytte forummet i overensstemmelse med [Acceptabel Brug](#heading--acceptable-use) og [Indholds Standarder](#heading--content-standards).
+
+      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Acceptabel Brug</a></h2>
+
+      1. Du må ikke bryde loven ved hjælp af dette forum.
+
+      2. Du må ikke bruge eller forsøge at bruge en andens konto på forummet uden deres udtrykkelige tilladelse.
+
+      3. Du må ikke købe, sælge, eller på anden vis bytte brugernavne eller andre unikke kendetegn på dette forum.
+
+      4. Du må ikke sende reklamer, kædebreve, eller andre anmodninger igennem dette forum, eller bruge forummet til at indsamle adresser eller andre personlige data for kommercielle adresse-lister eller databaser.
+
+      5. Du må ikke automatisere adgang til forummet, eller overvåge forummet, såsom med brug af en gennemsøger (web crawler), browser udvidelser eller tilføjelser, eller andet computer program der ikke er en web browser. Du må gennemsøge forummet for at indeksere dette for en offentligt tilgængelig søgemaskine, hvis du driver en sådanne.
+
+      6. Du må ikke benytte dette forum til at sende e-mais til distributionslister, nyhedsgrupper, eller gruppe e-mail-aliaser .
+
+      7. Du må ikke fejlagtigt antyde at du er tilknyttet eller godkendt af virksomheden.
+
+      8. Du må ikke hyperlinke til billeder eller andet ikke-hypertekst indhold på forummet eller andre websteder.
+
+      9. Du må ikke fjerne nogen mærker der viser proprietært ejerskab over materialer som du har hentet fra forummet.
+
+      10. Du må ikke vise nogen dele af dette forum på andre websteder med `<iframe>`.
+
+      11. Du må ikke deaktivere, undgå eller omgå nogensomhelst sikkerheds ellers adgangsbegrænsninger på dette forum.
+
+      12. Du må ikke belaste infrastukturen bag dette forum med en urimelig mængde forespørgsler, eller forespørgsler indrettet til at påføre en urimelig belastning på informationssystemer, der ligger til grund for dette forum.
+
+      13. Du må ikke udgive dig for at være andre igennem dette forum.
+
+      14. Du må ikke opfordre eller hjælpe nogen til at overtræde disse vikår.
+
+      <h2 id="heading--content-standards"><a href="#heading--content-standards">Indholds Standarder</a></h2>
+
+      1. Du må ikke sende indhold til forummet der er ulovligt, stødende, eller på anden måde skadeligt for andre. Dette inkluderer indhold der er chikanerende, upassende eller voldeligt.
+
+      2. Du må ikke sende indhold til forummet der er i strid med loven, krænker andres interllektuelle ejemdomsrettigheder, krænker andres privatliv, eller bryder aftaler du har med andre.
+
+      3. Du må ikke sende indhold til forummet der indeholde skadelig computer kode, såsom computer viraer eller spyware.
+
+      4. Du må ikke sende indhold til forummet som en simpel pladsholder, der indeholder en bestemt adresse, brugernavn eller anden unik identifikator.
+
+      5. Du må ikke bruge dette forum til at afsløre oplysninger, som du ikke har ret til at afsløre, såsom andres fortrolige eller personlige oplysninger..
+
+      <h2 id="heading--enforcement"><a href="#heading--enforcement">Håndhævelse</a></h2>
+
+      Virksomheden må undersøge og retsforfølge overtrædelser af disse vilkår i videst muligt omfang i henhold til gældende lov. Virksomheden må underette og samarbejde med retshåndhævende myndigheder for retsforfølgning af lovovertrædelser og disse vilkår.
+
+      Virksomheden forbeholder sig retten til at ændre, redigere og slette indhold på forummet af enhver grund. Hvis du mener at nogen har indsendt indhold til forummet i strid med disse vilkår, [Kontakt os straks](#heading--contact).
+
+      <h2 id="heading--your-account"><a href="#heading--your-account">Din Konto</a></h2>
+
+      Du skal oprette og logge ind med en konto for at bruge nogle af forummets funktioner.
+
+      For at oprette en konto, skal du give nogle oplysninger om dig selv. Hvis du opretter en konto, accepter du som minumum at oplyse en gyldig e-mail adresse, og at holde denne adresse opdateret.
+      Du kan lukke din konto til enhver tid ved at sende en e-mail til <%{contact_email}>.
+
+      Du accepterer at være ansvarlig for alle handlinger udført ved brug af din konto, hvad enten det er godkendt af dig selv eller ej, indtil du enten lukker som konto eller underretter virksomheden om, at din konto er blevet kompromitteret. Du accepterer straks at underrette virksomheden, hvis du har mistanke om at din komto er blevet kompromiteret. Du accepterer at vælge en sikker adgangskode til din konto, og holde denne hemmelig.
+
+      Virksomheden må begrændse, suspendere, eller lukke din konto på forummet i henhold til sin politik for håndtering af copyrigth-relaterede fjernelsesanmodninger, eller hvis virksomheden med rimelighed mener, at du har brudt enhver regel i disse vilkår.
+
+      <h2 id="heading--your-content"><a href="#heading--your-content">Dit Indhold</a></h2>
+
+      Intet i disse vilkår giver virksomheden ejendomsrettigheder over intellektuel ejendomsret du deler med forummet, såsom din konto, indlæg, eller andet indhold du sender til dette forum.
+      Intet i disse vilkår giver ligeledes ikke dig nogen ejendomsret over virksomhedens intellektuelle ejendom.
+
+      Mellem dig og virksomheden, forbliver du eneansvarlig for det indhold du sender til forummet. Du accepterer ikke at antyde på forkert grundlag, at indhold du sender til forummet er sponsoreret eller godkendt af virksomheden. Disse vilkår forpligter ikke virksomheden til at gemme, vedligeholde, eller udlevere kopier af indhold du sender, og til at ændre det i henhold til disse vilkår.
+
+      Indhold du sender til forummet tilhører dig, og du kan afgøre hvilke tilladelser (for indholdet) du giver til andre. Men i udgangspunktet, licenserer du virksomheden, til at levere indhold som du sender til forummet til andre brugere af forummet. Denne særlige licens giver virksomheden mulighed for at kopiere, offentliggøre og analysere indhold, du sender til forummet.
+
+      Når indhold du sender bliver fjernet fra forummet, af dig eller af virksomheden, slutter virksomhedesn specielle licens, når den sidste kopi forsvinder fra virksomhedens backup, cache, og andre systemer. Andre licenser du anvender på indhold du sender, såsom [Creative Commons](https://creativecommons.org) licenser, kan fortsætte efter dit indhold er blevet fjernet. Disse licenser kan give andre, eller virksomheden self, retten til at dele dit indhold igennem forummet igen.
+
+      Andre som modtager indhold du sender til forummetm kan overtræde vilkårene som du licenserer dit indhold under. Du accepteret at virksomheden ikke vil blive holdt ansvarlig overfor dig, for disse overtrædelser eller deres konsekvenser.
+
+      <h2 id="heading--responsibility"><a href="#heading--responsibility">Dit Ansvar</a></h2>
+
+      Du accepterer at holde virksomheden skadesløs overfor juridiske krav fra andre i forbindelse med din overtrædelse af disse vilkør, eller overtrædelse af disse vilkår begået af andre under brug af din konto på forummet.
+      Både du og virksomheden er enige om at underrette modparten om eventuelle juridiske krav, som du muligvis er nødt til at friholde virksomheden hurtigst muligt. Hvis virksomheden ikke straks underretter di om et juridisk krav, behøver du ikke at skadesløsholde virksomheden for skader som, du kunne have forsvarer eller mildnet med hurtig varsling. Du accepterer at tillade virksomheden, at kontrollere efterforskning, forsvar og forlig, af juridiske krav, som du ville skulle holde virksomheden skadeløst for, og til at samarbejde med disse bestræbelser. Virksomheden accepterer, ikke-at-acceptere nogen forlig, der indrømmer skyld for dig eller pålægger dig forpligtigelser uden din forudgående aftale.
+
+      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Forbehold</a></h2>
+
+      ***Du accepterer al risiko ved brug af dette forum og indhold på forummet. Så vidt lovgivningen tillader, leverer virksomheden og dets leverandører forummet som der er uden nogen som helst garanti.***
+
+      Forummet må hyper-linke til og integrere foraer og tjenester der drives af andre. Virksomheden giver ingen garanti for tjenester der drives af andre, eller indhold de måtte levere. Brug af tjenester der drives af andre, kan være underlagt andre vilkår mellem dig og den enkelte kørende tjeneste.
+
+      <h2 id="heading--liability"><a href="#heading--liability">Grænser for Ansvar</a></h2>
+
+      ***Hverken virksomheden eller dets leverandører vil være ansvarlige overfor dig for skader på kontraktbrud, som deres personale ikke med rimelighed kunne have forudset, da du accepterede disse vilkår.***
+
+      ***Så langt som lovgivningen tillader, vil det totale ansvar overfor dig, for krav af enhver art, der er relateret til forummet eller indhold på forummet være begrændset til et beløb svarende til $50 USD.***
+
+      <h2 id="heading--feedback"><a href="#heading--feedback">Tilbagemelding</a></h2>
+
+      Virksomheden byder dine tilbagemeldinger og forslag til forummet velkommen. Se [Kontakt](#heading--contact) sektionen nedenunder for måder du kan komme i forbindelse med os.
+
+      Du accepterer at virksomheden frit kan handle på tilbagemeldingen du kommer med, og at virksomheden ikke behøver at give dig besked, om at din tilbagemelding blev fulgt, indhente din tilladelse til at bruge den, eller betale dig. Du accepterer, ikke at sende tilbagemelding med forslag du tror kan være fortroligt eller proprietært, for dig eller andre.
+
+      <h2 id="heading--termination"><a href="#heading--termination">Opsigelse</a></h2>
+
+      Enten du eller virksomheden kan til enhver tid afslutte aftalen, der er skrevet i disse vilkår. Når vores aftale slutter, slutter også din tilladelse til at bruge dette forum.
+
+      Følgende bestemmelser bistår slutningen af vores aftale: [Dit Indhold](#heading--your-content), [Tilbagemelding](#heading--feedback), [Dit Ansvar](#heading--responsibility), [Forbehold](#heading--disclaimers), [Grænser for Ansvar](#heading--liability), og [Generelle Vilkår](#heading--general).
+
+      <h2 id="heading--disputes"><a href="#heading--disputes">Tvister</a></h2>
+
+      %{governing_law} vil afgøre enhver tvist i forbindelse med disse vilkår eller din brug af forummet.
+
+      Du og virksomheden er enige om kun at søge påbud relateret til disse vilkår behandlet i byretten eller landsretten i %{city_for_disputes}. Hverken du eller virksomheden vil gøre indsigelse mod jurisdiktion, forum eller mødested ved disse domstole..
+
+      ***Ud over at søge et påbud eller for krav under gældende lovgivning, vil du og virksomheden løse enhver tvist ved en voldgiftsret. Voldgiftsretten vil følger Regler og Gældende Procedurer for Forbruger Relaterede Tvister. Voldgift skal udredes i %{city_for_disputes}. Du vil afgøre enhver uoverensstemmelse som et individ, og ikke som en del af en gruppesag eller anden repræsentativ procedure, hverken som sagsøger eller klasse medlem. Ingen voldgiftsmand vil konsolidere enhver tvist med nogen anden voldgift uden virksomhedens tilladelse.***
+
+      Enhver voldgiftskendelse inkluderer omkostninger til voldgift, rimelige advokatsalærer og rimelige omkostninger for vidner. Du og virksomheden kan optage voldgiftskendelser i enhver domstol med jurisdiktion.
+
+      <h2 id="heading--general"><a href="#heading--general">Generelle Vilkår</a></h2>
+
+      Hvis en bestemmelse i disse vilkår ikke kan håndhæves som skrevet, men kan ændres for at gøre det muligt, skal bestemmelsen ændres i det mindst mulige omfang for at gøre det muligt at håndtere. Ellers bør denne bestemmelse fjernes.
+
+      Du må ikke overdrage din aftale med virksomheden. Virksomheden må overdrage din aftale med enhver tilknyttet selvskab, ethvert andet selvskab der får kontrol over virksomheden, eller ethvert andet firma der køber aktier i virksomheden relateret til forummet. Ethvert forsøg på at overdrage disse vilkår, vil ikke have nogen retsbindende virkning.
+
+      Hverken udøvelsen af nogen rettighed i henhold til denne Aftale eller afkald på enhver overtrædelse af denne Aftale frafalder andre brud på denne Aftale.
+
+      Disse vilkår indeholder alle vilkårene for aftale mellem dig og virksomheden om brug af forummet. Disse vilkår erstatter helt andre aftaler om din brug af forummet, skrevet eller ej.
+
+      <h2 id="heading--contact"><a href="#heading--contact">Kontakt</a></h2>
+
+      Du kan underrette virksomheden under disse vilkår, og sende spørgsmål til virksomheden, på <%{contact_email}>.
+
+      Virksomheden kan underrette dig under disse vilkår, ved at benytte den e-mail adresse du angiver for din konto på forummet, eller ved at sende en meddelelse til websiden for forummet eller din kontoside.
+
+      <h2 id="heading--changes"><a href="#heading--changes">Ændringer</a></h2>
+
+      Virksomheden har sidst opdateret disse vilkår d. 12. juli 2018, og må opdatere disse vilkår igen. Virksomheden vil skrive alle opdateringer på forummet. For opdateringer der indeholder væsentlige ændringer, vil virksomheden orientere dig via e-mail, hvis du har oprettet en konto, og har oplyst en gyldig e-mail adresse. Virksomheden kan også annoncere opdateringer med specielle meddelelser eller advarsler på forummet.
+
+      Så snart du informeres om opdateringen af disse vilkår, skal du godkende de nye vilkår, for at kunne fortsætte med at benytte forummet.
   privacy_topic:
     title: "Privatlivspolitik"
+    body: |
+      <a name="collect"></a>
+
+      ## [Hvilke oplysninger indsamler vi?](#collect)
+
+      Vi indsamler oplysninger fra dig når du registrerer dig på vores websted og indsamler data når du deltager i forummet ved læsning, skrift, og vurdering af indhold delt her.
+
+      Når du registerer dig på vores websted, kan du blive spurgt om at indtaste dit navn og e-mail adresse. Du må dog, besøge vores websted uden registrering. Din e-mail adresse vil blive bekræftet ved at sende en e-mail, indeholdende et unikt link. Hvis dette link besøges, ved vi, at du styrer e-mail-adressen.
+
+      Når du er registreret og skriver indlæg, gemmer vi IP adressen som indlægget bliver skrevet fra. Vi kan også gemme server-logfiler, der indeholder IP adressen for hver forespørgsel til vores server.
+
+      <a name="use"></a>
+
+      ## [Hvad bruger vi dine oplysninger til?](#use)
+
+      Enhver af de oplysninger, vi indsamler fra dig, kan bruges på en af følgende måder:
+
+      * Til at personalisere din oplevelse &mdash; dine oplysninger hjælper os til bedre at reagere på dine individuelle behov.
+      * Til at forbedre vores websted &mdash; vi stræber løbende efter at forbedre vores webstedstilbud baseret på den information og feedback, vi modtager fra dig.
+      * Til at forbedre kundeservice &mdash; dine oplysninger hjælper os til mere effektiv behandling af din kundeservice forespørgsel og support behov.
+      * Til at sende periodiske e-mails &mdash; E-mail adressen du angiver, kan blive brugt til at sende dig information, notifikationer som din forespørgsel vedr. ændringer til emner eller som svar til dit brugernavn, svar på forespørgsler, og/eller andre forespørgsler eller spørgsmål.
+
+      <a name="protect"></a>
+
+      ## [Hvordan beskytter vi dine oplysninger?](#protect)
+
+      Vi implementerer en række sikkerhedsforanstaltninger for at opretholde sikkerheden af dine personlige oplysninger, når du indtaster, indsender eller får adgang til dine personlige oplysninger.
+
+      <a name="data-retention"></a>
+
+      ## [Hvad er din politik for opbevaring af data?](#data-retention)
+
+      Vi bestræber os i god tro på at:
+
+      * Gem serverlogfiler, der indeholder IP-adressen på alle anmodninger til denne server, i ikke mere end 90 dage.
+      * Beholde IP-adresserne, der er knyttet til registrerede brugere, og deres indlæg i ikke mere end 5 år.
+
+      <a name="cookies"></a>
+
+      ## [Benytter vi cookies?](#cookies)
+
+      Ja. Cookies er små filer, som et websted eller dets tjenesteudbyder overfører til din computers harddisk gennem din webbrowser (hvis du tillader det). Disse cookies gør det muligt for webstedet at genkende din browser, og hvis du har en registreret konto, knytte den til din registrerede konto.
+
+      Vi bruger cookies til at forstå og gemme dine præferencer til fremtidige besøg og samle samlede data om webstrafik og webstedsinteraktion, så vi kan tilbyde bedre webstedsoplevelser og værktøjer i fremtiden. Vi kan indgå kontrakt med tredjepartsudbydere for at hjælpe os med bedre forståelse af vores besøgende. Disse tjenesteudbydere har ikke tilladelse til at bruge de oplysninger, der er indsamlet på vores vegne, undtagen for at hjælpe os med at drive og forbedre vores forretning.
+
+      <a name="disclose"></a>
+
+      ## [Videregiver vi nogen oplysninger til eksterne parter?](#disclose)
+
+      Vi sælger, handler eller på anden måde overfører ikke dine personligt identificerbare oplysninger til eksterne parter. Dette inkluderer ikke pålidelige tredjeparter, der hjælper os med at betjene vores websted, drive vores forretning eller servicere dig, så længe disse parter er enige om at holde disse oplysninger fortrolige. Vi kan også frigive dine oplysninger, når vi mener, at frigivelse er passende for at overholde loven, håndhæve vores webstedspolitikker eller beskytte vores eller andres rettigheder, ejendom eller sikkerhed. Ikke-personligt identificerbar besøgsinformation kan dog leveres til andre parter til markedsføring, reklame eller anden anvendelse.
+
+      <a name="third-party"></a>
+
+      ## [Tredjeparts links](#third-party)
+
+      Lejlighedsvis kan vi, efter vores skøn, inkludere eller tilbyde tredjepartsprodukter eller tjenester på vores websted. Disse tredjepartswebsteder har separate og uafhængige privatlivspolitikker. Vi har derfor intet ansvar eller ansvar for indholdet og aktiviteterne på disse linkede sider. Ikke desto mindre forsøger vi at beskytte integriteten af vores websted og hilser enhver feedback om disse websteder velkommen.
+
+      <a name="coppa"></a>
+
+      ## [Overholdelse af børns online privatlivslov](#coppa)
+
+      Vores side, produkter og tjenester er alle rettet mod mennesker, der er mindst 13 år eller ældre. Hvis denne server er i USA, og du er under 13 år, i henhold til kravene i COPPA ([Children's Online Privacy Protection Act] (https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), skal du ikke bruge dette websted.
+
+      <a name="online"></a>
+
+      ## [Kun privatlivspolitik online](#online)
+
+      Denne fortrolighedspolitik online gælder kun for information indsamlet via vores websted og ikke for information indsamlet offline.
+
+      <a name="consent"></a>
+
+      ## [Dit samtykke](#consent)
+
+      Ved at bruge vores side giver du dit samtykke til vores fortrolighedspolitik for webstedet.
+
+      <a name="changes"> </a>
+
+      ## [Ændringer i vores fortrolighedspolitik](#changes)
+
+      Hvis vi beslutter at ændre vores fortrolighedspolitik, offentliggør vi disse ændringer på denne side.
+
+      Dette dokument er CC-BY-SA. Det blev sidst opdateret 31. maj 2013.
   badges:
+    mass_award:
+      errors:
+        badge_disabled: Aktiver venligst %{badge_name} emblemet først.
     editor:
       name: Redaktør
       description: Rettet første indlæg
+      long_description: |
+        Dette emblem tildeles første gang, du redigerer et af dine indlæg. Selvom du ikke vil være i stand til at redigere dine indlæg for evigt, opfordres du til at redigere dine indlæg — hvis du kan forbedre formateringen, rette små fejl eller tilføje noget du glemte, da du oprindeligt gemte. Rediger for at gøre dine indlæg endnu bedre!
+    wiki_editor:
+      description: Første wiki redigering
+      long_description: |
+        Dettee emblem tildeles første gang du redigerer et wiki-indlæg.
     basic_user:
       name: Basis
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Tildelt</a> alle væsentlige fællesskabsfunktioner
+      long_description: |
+        Dette emblem tildeles, når du når tillidsniveau 1. Tak, fordi du bliver hængende og læser et par emner for at lære, hvad vores fællesskab handler om. Nye brugerrestriktioner er ophævet; du har fået alle væsentlige fællesskabsevner, såsom personlig besked, anmeldelse, wiki-redigering og muligheden for at sende flere billeder og links.
     member:
       name: Medlem
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Tildelt</a> invitationer, gruppe meddelelser, flere 'Synes godt om'
+      long_description: |
+        Dette emblem gives, når du når tillidsniveau 2. Tak, fordi du har deltaget i en ugesperiode for virkelig at deltage i vores samfund. Du kan nu sende invitationer fra din brugerside eller individuelle emner, oprette personlige gruppemeddelelser og have flere 'Synes godt om' pr. Dag.
     regular:
       name: Regulær
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Tildelt</a> omklassificering, omdøbning, fulgte links, wiki, flere 'Synes godt om'
+      long_description: |
+        Dette emblem tildeles, når du når tillidsniveau 3. Tak, fordi du er en fast del af vores fællesskab over en periode på flere måneder. Du er nu en af de mest aktive læsere og en pålidelig bidragyder, der gør vores samfund godt. Du kan nu omklassificere og omdøbe emner, drage fordel af mere kraftfulde anmeldelser, få adgang til et privat loungeområde, og du får også mange flere 'Synes godt om' om dagen.
     leader:
       name: Leder
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Tildelt</a> global redigering, pin, luk, arkiv, split og flet, flere 'Synes godt om'
+      long_description: |
+        Dette emblem tildeles, når du når tillidsniveau 4. Du er en leder i dette fællesskab som valgt af personalet, og du er et positivt eksempel for resten af samfundet i dine handlinger og ord her. Du har evnen til at redigere alle indlæg, foretage almindelige emne-moderatorhandlinger såsom pin, luk, unlist, arkiv, split og flet.
     welcome:
       name: Velkommen
       description: Modtog et like
+      long_description: |
+        Dette emblem tildeles, når du modtager dit første 'Synes godt om' på et indlæg. Tillykke, du har sendt noget, som andre medlemmer har fundet interessant, sejt eller nyttigt!
     autobiographer:
       name: Selvbiograf
+      description: Udfyldte <a href="%{base_uri}/my/preferences/profile">profil</a> oplysninger
+      long_description: |
+        Dette emblem tildeles til at udfylde <a href="%{base_uri}/my/preferences/profile">din brugerprofil</a> og vælge et profilbillede. At lade samfundet vide lidt mere om, hvem du er, og hvad du er interesseret i, skaber et bedre og mere forbundet fællesskab. Kom med os!
     anniversary:
       name: Jubilæum
       description: Aktivt medlem i et år, som har skrevet mindst et indlæg
+      long_description: |
+        Dette emblem tildeles, når du har været medlem i et år med mindst et indlæg i det år. Tak fordi du holder fast og bidrager til vores samfund. Vi kunne ikke gøre det uden dig.
     nice_post:
       name: Fint svar
       description: Modtog 10 likes på et svar
+      long_description: |
+        Dette emblem tildeles, når dit svar får 10 'Synes godt om'. Dit svar gjorde et indtryk på fællesskabet og hjalp med at flytte samtalen fremad.
     good_post:
       name: Godt svar
       description: Modtog 25 likes på et svar
+      long_description: |
+        Dette emblem tildeles, når dit svar får 25 'Synes godt om'. Dit svar var usædvanligt og gjorde samtalen meget mere interessant.
     great_post:
       name: Rigtigt godt svar
+      description: Modtog 50 synes godt om for et emne
+      long_description: |
+        Dette emblem tildeles, når dit svar får 50 'Synes godt om'. Wow! Dit svar var inspirerende, fascinerende, sjovt eller indsigtsfuldt, og fællesskabet elskede det!
     nice_topic:
       name: Fint emne
       description: Modtog 10 likes på et emne
+      long_description: |
+        Dette emblem tildeles, når dit emne får 10 'Synes godt om'. Du startede en interessant samtale, som fællesskabet nød.
     good_topic:
       name: Godt emne
+      description: Modtog 25 synes godt om for et emne
+      long_description: |
+        Dette emblem tildeles, når dit emne får 25 'Synes godt om'. Du startede en levende samtale, som fællesskabet mødtes omkring.
     great_topic:
       name: Glimrende emne
       description: Modtog 50 synes godt om for et emne
+      long_description: |
+        Dette emblem tildeles, når dit emne får 50 'Synes godt om'. Du startede en fascinerende samtale, og fællesskabet elskede den livlige diskussion, der resulterede!
     nice_share:
       name: God deling
       description: Delt et emne med 25 unikke besøgende
+      long_description: |
+        Dette emblem tildeles for deling af et link, som 25 eksterne besøgende har klikket på. Tak for at sprede budskabet om vores diskussioner og dette fællesskab.
     good_share:
       name: God deling
       description: Delte et indlæg med 300 unikke besøgende
+      long_description: |
+        Dette emblem tildeles for til deling af et link, som 300 eksterne besøgende har klikket på. Godt arbejde! Du har vist en god diskussion for en flok nye mennesker og hjulpet dette fællesskab med at vokse.
     great_share:
       name: Fantastisk deling
       description: Delt et indlæg med 1000 unikke besøgende
+      long_description: |
+        Dette emblem tildeles for deling af et link, der blev klikket på af 1000 eksterne besøgende. Wow! Du har promoveret en interessant diskussion til et stort nyt publikum og hjulpet vores fællesskab med at vokse på en stor måde!
     first_like:
       name: Første like
       description: Synes om et indlæg
+      long_description: |
+        Dette emblem tildeles første gang du 'Synes godt om' et indlæg ved hjælp af :heart: knappen. Det at 'Synes godt om' indlæg er en fantastisk måde at fortælle andre medlemmer, at det, de skrev om, var interessant, nyttigt, sejt eller sjovt. Del kærligheden!
     first_flag:
-      name: Første Flagmarkering
-      description: Flagmarkerede et indlæg
+      name: Første Anmeldelse
+      description: Anmeldte et indlæg
+      long_description: |
+        Dette emblem tildeles første gang du anmelder et indlæg. Anmeldelser er, måden vi alle hjælper med at gøre og holde dette til et godt sted for alle. Hvis du bemærker nogle indlæg, der kræver opmærksomhed fra moderator af en eller anden grund, så tøv ikke med at anmelde. Hvis du ser et problem, skal du anmelde :flag_black: det!
     promoter:
       name: Promoter
       description: Inviterede en bruger
+      long_description: |
+        Dette emblem tildeles, når du inviterer nogen til at deltage i fællesskabet via invitationsknappen på din brugerside eller nederst i et emne. At invitere venner, der måske er interesseret i specifikke diskussioner, er en fantastisk måde at introducere nye mennesker til vores fællesskab, så tak!
     campaigner:
       name: Kampagnechef
       description: Inviterede 3 basis brugere
+      long_description: |
+        Dette emblem tildeles, når du har inviteret 3 personer, der efterfølgende tilbragte nok tid på webstedet til at blive grundlæggende brugere. Et levende samfund har brug for en regelmæssig infusion af nykommere, der regelmæssigt deltager og tilføjer nye stemmer til samtalerne.
     champion:
       name: Champion
       description: Inviterede 5 medlemmer
+      long_description: |
+        Dette emblem tildeles, når du har inviteret 5 personer, der efterfølgende tilbragte nok tid på webstedet til at blive fulde medlemmer. Wow! Tak for at udvide mangfoldigheden i vores fællesskab med nye medlemmer!
     first_share:
       name: Første deling
       description: Delte et indlæg
+      long_description: |
+        Dette emblem tildeles første gang du deler et link til et svar eller et emne ved hjælp af deleknappen. Deling af links er en fantastisk måde at dele interessante diskussioner med resten af verden og udvide dit fællesskab.
     first_link:
       name: Første link
       description: Tilføjede et link til et andet emne
+      long_description: |
+        Dette emblem tildeles første gang du tilføjer et link til et andet emne. At linke emner hjælper medlæsere med at finde interessante relaterede samtaler ved at vise forbindelsen mellem emner i begge retninger. Link frit!
     first_quote:
-      name: Første citering
+      name: Første Citering
       description: Citerede et indlæg
+      long_description: |
+        Dette emblem tildeles første gang du citerer et indlæg i dit svar. Citering af relevante dele af tidligere indlæg i dit svar hjælper med at holde sammen på diskussioner og fastholder emnet. Den nemmeste måde at citere er at fremhæve et afsnit i et indlæg og derefter trykke på en vilkårlig svarsknap. Citér generøst!
     read_guidelines:
-      name: Læst retningslinierne
+      name: Læste retningslinierne
+      description: Læste <a href="%{base_uri}/guidelines">retningslinjerne for fællesskabet</a>
+      long_description: |
+        Dette emblem tildes for at <a href="%{base_uri}/guidelines">læse fællesskabsretningslinjerne</a>. At følge og dele disse enkle retningslinjer hjælper med at opbygge et sikkert, sjovt og bæredygtigt samfund for alle. Husk altid, at der er et andet menneske, meget lig dig selv, på den anden side af skærmen. Vær sød!
     reader:
       name: Læser
       description: Har læst hvert eneste svar i et emne med mere end 100 svar
+      long_description: |
+        Dette emblem tildeles første gang du læser et langt emne med mere end 100 svar. At læse en samtale tæt hjælper dig med at følge diskussionen, forstå forskellige synspunkter og fører til mere interessante samtaler. Jo mere du læser, jo bedre bliver samtalen. Som vi kan lide at sige, Læsning grundlæggende! :slight_smile:
     popular_link:
       name: Populært link
       description: Postede et eksternt link med 50 klik
       long_description: |
-        Dette badge bliver tildelt, når et link du har delt er blevet klikket på 50 gange. Tak fordi du delte et brugbart link, som tilføjede interessant indhold til samtalen.
+        Dette emblem bliver tildelt, når et link du har delt er blevet klikket på 50 gange. Tak fordi du delte et brugbart link, som tilføjede interessant indhold til samtalen.
     hot_link:
       name: Hot link
+      description: Delte et eksternt link med 300 klik
+      long_description: |
+        Dette emblem tildeles, når et link, du har delt, får 300 klik. Tak for indlægget af et fascinerende link, der kørte samtalen frem og oplyste diskussionen!
     famous_link:
-      name: Berømt link
+      name: Berømt Link
+      description: Delte et eksternt link med 1000 klik
+      long_description: |
+        Dette emblem gives, når et link, du har delt, får 1000 klik. Wow! Du indsendte et link, der forbedrede samtalen markant ved at tilføje vigtige detaljer, kontekst og information. Flot arbejde!
     appreciated:
       name: Værdsat
       description: Modtog 1 like på 20 indlæg
       long_description: |
-        Dette badge bliver tildelt, når du har modtaget mindst et like på 20 forskellige indlæg. Fællesskabet sætter pris på dine bidrag til samtalerne.
+        Dette emblem bliver tildelt, når du har modtaget mindst ét 'synes godt om' på 20 forskellige indlæg. Fællesskabet sætter pris på dine bidrag til samtalerne.
     respected:
       name: Respekteret
       description: Modtog 2 likes på 100 indlæg
       long_description: |
-        Dette badge bliver tildelt, når du har modtaget mindst 2 likes på 100 forskellige indlæg. Fællesskabet har voksende respekt for dine mange bidrag til samtalerne.
+        Dette emblem bliver tildelt, når du har modtaget mindst 2 'synes godt om' på 100 forskellige indlæg. Fællesskabet har voksende respekt for dine mange bidrag til samtalerne.
     admired:
       name: Beundret
       description: Modtog 5 likes på 300 indlæg
       long_description: |
-        Dette badge bliver tildelt, når du har modtaget mindst 5 likes på 300 forskellige indlæg. Vild! Fællesskabet beundrer din hyppige, gode bidrag til samtalerne.
+        Dette emblem bliver tildelt, når du har modtaget mindst 5 'synes godt om' på 300 forskellige indlæg. Vildt! Fællesskabet beundrer din hyppige, gode bidrag til samtalerne.
     out_of_love:
-      name: Ren kærlighed
+      name: Ud af kærlighed
+      description: Brugte %{max_likes_per_day} synes godt om på en dag
+      long_description: |
+        Dette emblem tildeles, når du bruger alle %{max_likes_per_day} af dine daglige 'Synes godt om'. At huske at tage et øjeblik og og trykke på 'Synes godt om' på de indlæg, du nyder og sætter pris på, opmuntrer andre medlemmer til at skabe endnu flere gode diskussioner i fremtiden.
     higher_love:
-      name: Mere kærlighed
+      name: Højere Kærlighed
+      description: Brugte %{max_likes_per_day} synes godt om på en dag 5 gange
+      long_description: |
+        Dette emblem tildeles, når du bruger alle %{max_likes_per_day} af dine daglige 'Synes godt om' i 5 dage. Tak, fordi du tog dig tid til aktivt at opmuntre de bedste samtaler hver dag!
     crazy_in_love:
       name: Vildt forelsket
+      description: Brugte %{max_likes_per_day} synes godt om på en dag 20 gange
+      long_description: |
+        Dette emblem tildeles, når du bruger alle %{max_likes_per_day} af dine daglige 'Synes godt om' i 20 dage. Vildt! Du er en rollemodel til at opmuntre andre medlemmer!
     thank_you:
       name: Tak
+      description: Har 20 synes godt om indlæg og synes selv godt om 10 indlæg
+      long_description: |
+        Dette emblem tildeles, når du har 20 indlæg, du 'Synes godt om' og giver 10 eller flere 'Synes godt om' til gengæld. Når nogen kan lide dine indlæg, finder du også tid til at trykke på 'Synes godt om', om det andre skriver.
     gives_back:
       name: Giver tilbage
+      description: Har 100 syntes godt om indlæg og synes selv godt om 100 indlæg
+      long_description: |
+        Dette emblem tildeles, når du har 100 indlæg, du 'Synes godt om', og giver 100 eller flere 'Synes godt om' til gengæld. Tak for at give det videre!
     empathetic:
       name: Empatisk
       description: Har 500 likede indlæg og givet 1000 likes
+      long_description: |
+        Dette emblem tildeles, når du har 500 indlæg, du 'Synes godt om', og giver 1000 eller flere 'Synes godt om' til gengæld. Vildt! Du er en model for generøsitet og gensidig påskønnelse :two_hearts:.
+    first_emoji:
+      name: Første humørikon
+      description: Brugte et humørikon i et indlæg
+      long_description: |
+        Dette emblem tildeles første gang du føjer et humørikon til dit indlæg :thumbsup:. Humørikoner giver dig mulighed for at formidle følelser i dine indlæg, fra lykke :smiley: til tristhed :anguished: til vrede :angry: og alt imellem :sunglasses:. Skriv bare et : (kolon) eller tryk på knappen Humørikoner-værktøjslinjen i editoren for at vælge blandt hundredvis af valg :ok_hand:
+    first_mention:
+      name: Første Omtale
+      description: Nævnte en bruger i et indlæg
+      long_description: |
+        Dette emblem tildeles første gang du nævner andres @brugernavn i dit indlæg. Hver omtale genererer en meddelelse til den person, så de kender til dit indlæg. Bare start med at skrive @ (Snabel-A symbol) for at nævne enhver bruger eller, hvis det er tilladt, en gruppe - det er en bekvem måde at bringe noget til deres opmærksomhed.
+    first_onebox:
+      name: Første "Onebox"
+      description: Sendte et link, der blev "oneboxed"
+      long_description: |
+        Dette emblem tildeles første gang du udgiver et link på en linje i sig selv, som automatisk udvides til en onebox med et resumé, titel og (når tilgængeligt) billede.
     first_reply_by_email:
       name: Første svar via email
+      description: Besvaret et indlæg via e-mail
       long_description: |
         Dette emblem gives første gang du svarer til et indlæg via email :e-mail:.
-    badge_title_metadata: "%{display_name} badge på %{site_title}"
+    new_user_of_the_month:
+      name: "Månedens nye bruger"
+      long_description: |
+        Dette emblem tildeles for at lykønske to nye brugere hver måned for deres fremragende samlede bidrag, målt ved hvor ofte deres indlæg blev markeret med 'Synes godt om', og af hvem.
+    enthusiast:
+      name: Entusiast
+      description: Besøgte 10 dage i træk
+      long_description: |
+        Dette emblem gives for at besøge webstedet 10 på hinanden følgende dage. Tak for at holde fast i os i over en uge!
+    aficionado:
+      description: Besøgte 100 dage i træk
+      long_description: |
+        Dette emblem tildeles for at besøge webstedet 100 på hinanden følgende dage. Det er mere end tre måneder!
+    devotee:
+      name: Dedikeret
+      description: Besøgte 365 dage i træk
+      long_description: |
+        Dette emblem tildeles for at besøge webstedet 365 på hinanden følgende dage. Wauw, det er mere end et helt år!
+    badge_title_metadata: "%{display_name} emblem på %{site_title}"
   admin_login:
-    success: "Email sendt"
-    email_input: "Admin email"
-    submit_button: "Send email"
+    success: "E-mail Sendt"
+    errors:
+      unknown_email_address: "Ukendt e-mail-adresse."
+      invalid_token: "Ugyldigt token."
+    email_input: "Admin E-Mail"
+    submit_button: "Send E-Mail"
   performance_report:
     initial_post_raw: Dette emne inkluderer daglige præstationsrapporter for dit site.
     initial_topic_title: Website præstationsrapport
   tags:
     title: "Tags"
+    restricted_tag_disallowed: 'Du kan ikke anvende mærket "%{tag}".'
+    restricted_tag_remove_disallowed: 'Du kan ikke fjerne mærket "%{tag}".'
+    minimum_required_tags:
+      one: "Du skal vælge mindst %{count}-mærke."
+      other: "Du skal vælge mindst %{count}-mærker."
+    upload_row_too_long: "CSV-filen skal have ét mærke pr. linje. Eventuelt kan mærket efterfølges af et komma og derefter navnet på mærkegruppen."
+    forbidden:
+      invalid:
+        one: "Det mærke, du valgte, kan ikke bruges"
+        other: "Ingen af de mærker, du har valgt, kan bruges"
+      in_this_category: '"%{tag_name}" kan ikke bruges i denne kategori'
+      restricted_to:
+        one: '"%{tag_name}" er begrænset til kategorien "%{category_names}"'
+        other: '"%{tag_name}" er begrænset til følgende kategorier: %{category_names}'
+      synonym: 'Synonymer er ikke tilladt. Brug "%{tag_name}" i stedet.'
+      has_synonyms: '"%{tag_name}" kan ikke bruges, fordi den har synonymer.'
+    invalid_target_tag: "kan ikke være synonym for et synonym"
+    synonyms_exist: "er ikke tilladt, mens synonymer eksisterer"
   rss_by_tag: "Emner tagget %{tag}"
   finish_installation:
+    congratulations: "Tillykke, du har installeret Discourse!"
     register:
       button: "Registrer"
+      title: "Registrer Admin Konto"
+      help: "registrere en ny konto for at komme i gang"
+    confirm_email:
+      title: "Bekræft din e-mail"
+      message: "<p>Vi sendte en aktiveringsmail til <b>%{email}</b>. Følg venligst instruktionerne i e-mailen for at aktivere din konto.</p><p>Hvis den ikke ankommer, bør du tjekke din spam-mappe, og <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>sikre, at du har opsat din e-mail korrekt</a>.</p>"
     resend_email:
       title: "Gensend Aktiverings-e-mail"
+      message: "<p>Vi har gensendt aktiverings-e-mailen til <b>%{email}</b>"
+  safe_mode:
+    title: "Gå ind i fejlsikret tilstand"
+    description: "Fejlsikret tilstand giver dig mulighed for at teste dit websted uden at indlæse plugins eller tilpasninger af webstedet."
+    no_customizations: "Deaktiver det aktuelle tema"
+    only_official: "Deaktiver uofficielle udvidelser"
+    no_plugins: "Deaktiver alle udvidelsesmoduler"
+    enter: "Gå ind i fejlsikret tilstand"
+    must_select: "Du skal vælge mindst én mulighed for at gå i fejlsikret tilstand."
   wizard:
+    title: "Discourse Opsætning"
     step:
+      locale:
+        title: "Velkommen til dit Discourse!"
+        fields:
+          default_locale:
+            description: "Hvad er standardsproget for dit fællesskab?"
       forum_title:
         title: "Navn"
         description: "Dit navn er et tegn, der er synligt på afstand - den <i>første</i> ting som potentielle besøgende lægger mærke til i forhold til dit fællesskab. Hvad siger dit navn og titel om dit fællesskab?"
@@ -1706,40 +3681,88 @@ da:
           site_description:
             label: "Beskriv dit fællesskab med en kort sætning"
             placeholder: "Et sted hvor Jane og hendes venner kan diskutere fede emner"
+          short_site_description:
+            label: "Beskriv dit fællesskab med nogle få ord"
+            placeholder: "Bedste fællesskab nogensinde"
       introduction:
         title: "Introduktion"
+        disabled: "<p>Vi kunne ikke finde noget emne med titlen “%{topic_title}”.</p> <ul> <li>Hvis du har ændret titlen, skal du redigere dette emne for at ændre dit websteds indledningstekst.</li> <li>Hvis du har slettet dette emne, skal du oprette et andet emne med “%{topic_title}” som titel. Indholdet af det første indlæg er dit websteds indledningstekst.</li> </ul>"
         fields:
           welcome:
-            label: "Velkomstemne"
+            label: "Velkomst Emne"
             description: "<p>Hvordan vil du beskrive dit fællesskab for en fremmed i en elevator på cirka 1 minut?</p> <ul> <li>Hvem er disse diskussioner beregnet for?</li> <li>Hvad kan jeg finde her?</li> <li>Hvorfor bør jeg gå på besøg?</li> </ul> <p>Dit velkomstemner er det første som nyankomne vil læse. Betragt det som dit <b>eneste éne afsnit</b> og 'salgstale' eller 'missionserklæring'. </p>"
             one_paragraph: "Begræns venligst din velkomstbesked til et afsnit."
+            extra_description: "Hvis du ikke er sikker, kan du springe dette trin over og redigere dit velkomstemne senere."
       privacy:
         title: "Adgang"
+        description: "<p>Er dit fællesskab åbent for alle, eller er det begrænset af medlemskab, invitation eller godkendelse? Hvis du foretrækker det, kan du opsætte alt som privat og så ændre det til offentligt senere.</p>"
         fields:
           privacy:
             choices:
               open:
                 label: "Offentlig"
+                description: "Alle kan få adgang til dette fællesskab"
               restricted:
                 label: "Privat"
+                description: "Kun brugere, der er logget ind, har adgang til dette fællesskab"
+          privacy_options:
+            description: "Hvordan tilmelder nye brugere sig en konto?"
+            choices:
+              open:
+                label: "Brugere kan tilmelde sig på egen hånd."
+              invite_only:
+                label: "Brugere skal inviteres af betroede brugere eller personale, før de kan tilmelde sig."
+              must_approve:
+                label: "Brugere kan tilmelde sig alene, men skal godkendes af personalet."
       contact:
         title: "Kontakt"
         fields:
           contact_email:
             label: "Mail"
-            placeholder: "name@example.com"
+            placeholder: "navn@eksempel.dk"
+            description: "E-mail-adresse for den person eller gruppe, der er ansvarlig for dette fællesskab. Bruges til vigtige meddelelser, f.eks. uhåndterede anmeldelser, sikkerhedsopdateringer og på <a href='%{base_path}/about' target='_blank'>din 'om' side</a> for vigtig kontakt fra fællesskabet."
           contact_url:
-            label: "Hjemmeside"
+            label: "Webside"
+            placeholder: "https://www.example.dk/kontakt-os"
+            description: "Generel kontakt webside for dig eller din organisation. Vil blive vist på <a href='%{base_path}/about' target='_blank'>din om side</a>."
+          site_contact:
+            label: "Automatiske Meddelelser"
       corporate:
         title: "Organisation"
+        description: "Disse oplysninger vil blive indtastet i dine <a href='%{base_path}/tos' target='blank'>servicevilkår</a>, som er et emne, du kan redigere i kategorien personale. Hvis du ikke har et firma, er du velkommen til at springe dette trin over nu."
+        fields:
+          company_name:
+            label: "Virksomhedens Navn"
+            placeholder: "Eksempel Organisation"
+          governing_law:
+            label: "Gældende Lov"
+            placeholder: "Californiens lov"
+          city_for_disputes:
+            label: "By for tvister"
+            placeholder: "San Francisco, Californien"
+      colors:
+        title: "Farver"
+      fonts:
+        title: "Skrifttyper"
+        fields:
+          body_font:
+            label: "Indholds skrifttype"
+          heading_font:
+            label: "Overskrifts skrifttype"
+          font_preview:
+            label: "Forhåndsvisning"
       logos:
         title: "Logoer"
         fields:
           logo:
             label: "Primært logo"
+          logo_small:
+            label: "Firkantet Logo"
       icons:
         title: "Ikoner"
         fields:
+          favicon:
+            label: "Browser Ikon"
           large_icon:
             label: "Stort ikon"
       homepage:
@@ -1758,13 +3781,12 @@ da:
                 label: "Kategorier og Seneste Emner"
               categories_and_top_topics:
                 label: "Kategorier og top emner"
-      emoji:
-        title: "Emoji"
-        description: "Hvilken Emoji-stil foretrækker du for dit fællesskab? Du kan tilføje flere brugerdefinerede Emoji'er senere via Admin, Tilpas, Emoji."
       invites:
         title: "Inviter hjælpere"
       finished:
         title: "Discourse er gjort klar til dig!"
+  search_logs:
+    graph_title: "Antal søgninger"
   joined: "Tilmeldt"
   discourse_push_notifications:
     popup:
@@ -1773,12 +3795,27 @@ da:
       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}'
+      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}"
+      confirm_body: "Succes! notifikationer er blevet aktiveret."
+      custom: "Notifikation fra %{username} på %{site_title}"
+  staff_action_logs:
+    not_found: "ikke fundet"
+    unknown: "ukendt"
+    user_merged: "%{username} blev flettet ind i denne konto"
+    user_delete_self: "Slettet af bruger selv fra %{url}"
+    webhook_deactivation_reason: "Din webhook er automatisk blevet deaktiveret. Vi har modtaget flere '%{status}' HTTP-statusfejls svar."
+    api_key:
+      automatic_revoked:
+        one: "Automatisk tilbagekaldt, sidste aktivitet for mere end %{count} dag siden"
+        other: "Automatisk tilbagekaldt, sidste aktivitet for mere end %{count} dage siden"
+      revoked: Tilbagekaldt
+      restored: Gendannet
   reviewables:
+    already_handled: "Tak, men vi har allerede gennemgået dette indlæg og besluttet, at det ikke behøver at blive anmeldt igen."
+    already_handled_and_user_not_exist: "Tak, men nogen har allerede gennemgået, og den bruger eksisterer ikke længere."
     priorities:
       low: "Lav"
       medium: "Medium"
@@ -1788,30 +3825,79 @@ da:
       low: "Lav"
       medium: "Medium"
       high: "Høj"
+    missing_version: "Du skal angive en versionsparameter"
+    conflict: "Der var en opdateringskonflikt, der forhindrede dig i at gøre dette."
+    reasons:
+      post_count: "De første par indlæg fra hver bruger skal godkendes af personalet. Se `godkend_indlæg_antal`."
+      trust_level: "Brugere på lavt tillidsniveau skal have svar godkendt af personalet. Se `approve_unless_trust_level`."
+      new_topics_unless_trust_level: "Brugere på lavt tillidsniveau skal have emner godkendt af personalet. Se `approve_new_topics_unless_trust_level`."
+      fast_typer: "Ny bruger skrev deres første indlæg mistænkeligt hurtigt, mistænkelig adfærd fra bot eller spammer. Se 'min_first_post_typing_time'."
+      category: "Indlæg i denne kategori kræver manuel godkendelse af personalet. Se kategoriindstillingerne."
+      must_approve_users: "Alle nye brugere skal godkendes af personalet. Se `must_approve_users`."
+      invite_only: "Alle nye brugere skal inviteres. Se `invite_only`."
+      email_auth_res_enqueue: "Denne e-mail fejlede et DMARC tjek, den er højst sandsynligt ikke fra hvem den ser ud til at være fra. Tjek de rå e-mail-headere for mere information."
+      email_spam: "Denne e-mail blev markeret som spam af headeren defineret i `email_in_spam_header`."
+      queued_by_staff: "En medarbejder mener, at dette indlæg har brug for gennemgang. Den forbliver skjult indtil da."
     actions:
+      agree:
+        title: "Enig..."
+      agree_and_keep:
+        title: "Behold Indlæg"
+      agree_and_keep_hidden:
+        title: "Behold Indlæg Skjult"
       agree_and_suspend:
-        title: "Suspendér bruger"
+        title: "Suspendér Bruger"
       agree_and_silence:
         title: "Mådehold (silence) Bruger"
+      agree_and_restore:
+        title: "Gendan Indlæg"
+        description: "Gendan indlægget, så alle brugere kan se det."
       agree_and_hide:
         title: "Skjul Indlæg"
+        description: "Skjul dette indlæg og send automatisk brugeren en meddelelse, der opfordrer dem til at redigere det."
       delete_spammer:
-        title: "Slet spammer"
+        title: "Slet Spammer"
+        description: "Fjern brugeren og alle deres indlæg og emner."
+        confirm: "Er du sikker på, at du vil slette alle brugerens indlæg, emner og blokere deres IP-adresse og e-mailadresser?"
       delete_single:
         title: "Slet"
+      delete:
+        title: "Slet..."
+      delete_and_ignore:
+        title: "Slet Indlæg og Ignorer"
+      disagree_and_restore:
+        description: "Gendan indlægget, så alle brugere kan se det."
       disagree:
         title: "Uenig"
       ignore:
         title: "Ignorér"
       approve:
         title: "Godkend"
+      approve_post:
+        title: "Godkend Indlæg"
+      reject_post:
+        title: "Afvis Indlæg"
+      approve_user:
+        title: "Godkend Bruger"
       reject_user:
+        title: "Slet Bruger..."
         delete:
-          title: "Slet bruger"
+          title: "Slet Bruger"
+          description: "Brugeren vil blive slettet fra forummet."
+        block:
+          title: "Slet og Blokér Bruger"
+          description: "Brugeren vil blive slettet, og vi vil blokere deres IP og e-mail-adresse."
       reject:
         title: "Afvis"
       delete_user:
-        title: "Slet bruger"
+        title: "Slet Bruger"
+        confirm: "Er du sikker på, at du vil slette denne bruger? Dette vil fjerne alle deres indlæg og blokere deres e-mail og IP-adresse."
+        reason: "Slettet via gennemgangskø"
+  email_style:
+    html_missing_placeholder: "HTML-skabelonen skal indeholde %{placeholder}"
+  notification_level:
+    ignore_error: "Beklager, du kan ikke ignorere denne bruger."
+    mute_error: "Beklager, du kan ikke gøre denne bruger tavs."
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 15ffbd28f3..9e9b0c653a 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -51,9 +51,13 @@ de:
   remove_posts_deleted_by_author: "Gelöscht vom Verfasser"
   redirect_warning: "Wir konnten nicht überprüfen, dass der ausgewählte Link tatsächlich im Forum geschrieben wurde. Wenn du trotzdem fortfahren möchtest, wähle den Link unten aus."
   on_another_topic: "Zu einem anderen Thema"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} von %{username}"
   themes:
     bad_color_scheme: "Kann Theme nicht aktualisieren, weil die Farbpalette ungültig ist"
     other_error: "Etwas ist schief gelaufen beim Aktualisieren des Theme"
+    ember_selector_error: "Tut uns leid, die Verwendung von #ember- oder .ember-view-CSS-Selektoren ist nicht zulässig, da diese zur Laufzeit dynamisch generiert werden und sich im Laufe der Zeit ändern werden, was schließlich zu defektem CSS führt. Probiere einen anderen Selektor."
     compile_error:
       unrecognized_extension: "Unbekannte Dateiendung: %{extension}"
     import_error:
@@ -62,11 +66,13 @@ de:
       about_json_values: "about.json enthält ungültige Werte: %{errors}"
       modifier_values: "about.json Modifikatoren enthalten ungültige Werte: %{errors}"
       git: "Fehler beim Klonen des git-Repository, Zugriff verboten oder Repository nicht gefunden."
+      git_ref_not_found: "Git-Referenz kann nicht ausgecheckt werden: %{ref}"
       unpack_failed: "Fehler beim Entpacken der Datei"
       file_too_big: "Die unkomprimierte Datei ist zu groß."
       unknown_file_type: "Die Datei, die du hochgeladen hast, scheint kein gültiges Discourse-Theme zu sein."
+      not_allowed_theme: "`%{repo}` ist nicht in der Liste der zulässigen Themes (überprüfe die globale Einstellung `allowed_theme_repos`)."
     errors:
-      component_no_user_selectable: "Theme Komponenten können nicht Benutzer auswählbar sein "
+      component_no_user_selectable: "Theme Komponenten können nicht Benutzer auswählbar sein"
       component_no_default: "Theme Komponenten können nicht Standard Theme sein"
       component_no_color_scheme: "Theme-Komponenten können keine Farbpalette haben"
       no_multilevels_components: "Themes mit Unter-Themes können nicht selber Unter-Themes sein"
@@ -168,7 +174,7 @@ de:
         one: hat die falsche Länge (sollte %{count} Zeichen lang sein)
         other: hat die falsche Länge (sollte %{count} Zeichen lang sein)
       other_than: "darf nicht %{count} sein"
-      sso_overrides_username: "Der Benutzername muss von der SSO Anbieterseite aus aktualisiert werden, da `sso_overrides_username` aktiviert ist."
+      auth_overrides_username: "Benutzername muss auf der Authentifizierungsanbieterseite aktualisiert werden, da die Einstellung `auth_overrides_username` aktiviert ist."
     template:
       body: ! "Es gab Probleme mit diesen Feldern:"
       header:
@@ -181,7 +187,7 @@ de:
       invalid_choice:
         one: "Du hast die ungültige Auswahl %{name} getroffen"
         other: "Du hast die ungültige Auswahl %{name} getroffen"
-      default_categories_already_selected: "Du kannst keine Kategorie auswählen, welche bereits in einer anderen Liste benutzt wird. "
+      default_categories_already_selected: "Du kannst keine Kategorie auswählen, welche bereits in einer anderen Liste benutzt wird."
       default_tags_already_selected: "Du kannst keinen Tag wählen, der in einer anderen Liste verwendet wird."
       s3_upload_bucket_is_required: "Uploads auf Amazon S3 können nicht aktiviert werden, bevor der 's3_upload_bucket' eingetragen wurde."
       enable_s3_uploads_is_required: "Der S3-Bestand setzt voraus, dass S3-Uploads aktiviert sind."
@@ -192,7 +198,7 @@ de:
       share_quote_facebook_requirements: "Sie müssen eine Facebook-App-ID festlegen, um das Teilen von Zitaten für Facebook zu aktivieren."
       second_factor_cannot_enforce_with_socials: "Sie können 2FA nicht erzwingen, wenn soziale Logins aktiviert sind. Sie müssen zuerst die Anmeldung deaktivieren über: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Du kannst kein 2FA erzwingen, wenn lokale Anmeldungen deaktiviert sind."
-      second_factor_cannot_be_enforced_with_sso_enabled: "Sie können 2FA nicht erzwingen, wenn SSO aktiviert ist."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "Du kannst 2FA nicht erzwingen, wenn DiscourseConnect aktiviert ist."
       local_login_cannot_be_disabled_if_second_factor_enforced: "Du kannst lokale Anmeldung nicht deaktivieren, wenn 2FA erzwungen wird. Deaktiviere erzwungenes 2FA vor dem Deaktivieren lokaler Anmeldungen."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "Du kannst S3 Uploads nicht aktivieren, weil S3 Uploads bereits global aktiviert sind. Aktivieren auf Seiten-Ebene kann zu kritischen Problemen mit Uploads führen"
       cors_origins_should_not_have_trailing_slash: "Sie sollten den abschließenden Schrägstrich (/) nicht zu CORS-Ursprüngen hinzufügen."
@@ -208,20 +214,23 @@ de:
   invite:
     expired: "Dein Einladungstoken ist abgelaufen. Bitte <a href='%{base_url}/about'>kontaktiere das Team</a>."
     not_found: "Dein Einladungstoken ist ungültig. Bitte <a href='%{base_url}/about'>kontaktiere das Team</a>."
-    not_found_json: "Dein Einladungstoken ist ungültig. Bitte kontaktiere das Team. "
+    not_found_json: "Dein Einladungstoken ist ungültig. Bitte kontaktiere das Team."
+    not_matching_email: "Deine E-Mail-Adresse und die mit dem Einladungstoken verknüpfte E-Mail-Adresse stimmen nicht überein. Bitte kontaktiere das Support Team."
     not_found_template: |
       <p>Deine Einladung zu <a href="%{base_url}">%{site_name}</a> wurde bereits zurückgezogen.</p>
 
       <p>Wenn du dein Passwort noch weißt, kannst du dich <a href="%{base_url}/login">anmelden</a>.</p>
 
       <p>Ansonsten kannst du <a href="%{base_url}/password-reset">dein Passwort zurücksetzen</a>.</p>
-    error_message: "Fehler beim Akzeptieren der Einladung aufgetreten. Bitte kontaktiere den Administrator dieser Seite."
+    not_found_template_link: |
+      <p>Die Einladung an <a href="%{base_url}">%{site_name}</a> kann nicht mehr eingelöst werden. Bitte frage die Person, die Dich eingeladen hat, Dir eine neue Einladung zu senden.</p>
     user_exists: "Es ist nicht nötig, <b>%{email}</b> einzuladen, er/sie <a href='%{base_path}/u/%{username}/summary'>hat schon ein Konto!</a>"
+    invite_exists: "Du hast bereits <b>%{email}</b>eingeladen."
+    invalid_email: "%{email}' ist keine gültige E-Mail-Adresse."
     confirm_email: "<p>Du bist fast fertig! Wir haben eine Aktivierungsmail an deine E-Mail-Adresse geschickt. Bitte folge den Anweisungen in der E-Mail, um dein Konto zu aktivieren.</p><p>Wenn keine E-Mail ankommt, überprüfe bitte deinen Spam-Ordner.</p>"
     cant_invite_to_group: "Sie sind nicht berechtigt, Benutzer zu bestimmten Gruppe(n) einzuladen. Stellen Sie sicher, dass Sie Eigentümer der Gruppe(n) sind, in die Sie einladen möchten."
     disabled_errors:
-      sso_enabled: "Einladungen sind deaktiviert, da SSO aktiviert ist."
-      local_logins_disabled: "Einladungen sind deaktiviert, da die Einstellung „Lokale Anmeldungen aktivieren“ deaktiviert ist."
+      discourse_connect_enabled: "Einladungen sind deaktiviert, da DiscourseConnect aktiviert ist."
       invalid_access: "Du hast nicht die Erlaubnis, die angeforderte Ressource zu betrachten."
   bulk_invite:
     file_should_be_csv: "Die hochzuladende Datei sollte im CSV-Format vorliegen."
@@ -237,7 +246,7 @@ de:
     muted_topic: "Entschuldigung, dieser Benutzer hat dieses Thema stummgeschaltet."
     receiver_does_not_allow_pm: "Entschuldigung, dieser Benutzer erlaubt es dir nicht, ihm private Nachrichten zu senden."
     sender_does_not_allow_pm: "Entschuldigung, du erlaubst diesem Benutzer nicht, dir private Nachrichten zu senden."
-    receiver_does_not_allow_other_user_pm: "Entschuldigung, dieser Benutzer erlaubt es einem bestehenden Teilnehmer nicht, ihm private Nachrichten zu senden."
+    user_cannot_see_topic: "%{username} kann das Thema nicht sehen."
   backup:
     operation_already_running: "Eine Arbeitsschritt wird momentan bearbeitet. Im Moment kann kein neuer Vorgang gestartet werden."
     backup_file_should_be_tar_gz: "Die Sicherungsdatei sollte ein .tar.gz-Archiv sein."
@@ -260,6 +269,7 @@ de:
   email_template_cant_be_modified: "Diese E-Mail-Vorlag kann nicht bearbeitet werden."
   invalid_whisper_access: "Enweder ist Flüstern nicht aktiviert oder du hast keinen Zugang zu Flüster-Beiträgen"
   not_in_group:
+    title_topic: "Um dieses Thema zu sehen, musst du die Mitgliedschaft der Gruppe '%{group}' beantragen."
     title_category: "Du musst in einer Gruppe sein um diese Kategorie zu sehen."
     request_membership: "Mitgliedschaft anfordern"
     join_group: "Gruppe beitreten"
@@ -329,6 +339,7 @@ de:
   max_pm_recipients: "Sorry, du kannst eine Nachricht nur an maximal %{recipients_limit} Emfpänger senden."
   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."
+  watched_words_auto_tag: "Thema automatisch markiert"
   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."
   slow_mode_enabled: "Dieses Thema befindet sich im langsamen Modus."
@@ -370,11 +381,12 @@ de:
   too_late_to_edit: "Dieser Beitrag wurde vor zu langer Zeit erstellt. Er kann nicht mehr bearbeitet oder gelöscht werden."
   edit_conflict: "Dieser Beitrag wurde von einem anderen Benutzer bearbeitet und deine Änderungen können nicht länger gespeichert werden."
   revert_version_same: "Die aktuelle Version entspricht der Version, zu der du zurückkehren möchtest."
-  cannot_edit_on_slow_mode: "Dieses Thema befindet sich im langsamen Modus. Um nachdenkliche, überlegte Diskussionen anzuregen, ist das Bearbeiten alter Beiträge derzeit nicht zulässig."
+  cannot_edit_on_slow_mode: "Dieses Thema befindet sich im langsamen Modus. Um nachdenkliche, überlegte Diskussionen anzuregen, ist das Bearbeiten alter Beiträge in diesem Thema während des langsamen Modus nicht zulässig."
   excerpt_image: "Bild"
   bookmarks:
     errors:
       already_bookmarked_post: "Du kannst denselben Beitrag nicht zweimal zu deinen Lesezeichen hinzufügen."
+      too_many: "Leider kannst Du nicht mehr als %{limit} Lesezeichen hinzufügen. Besuche <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> , um einige zu entfernen."
       cannot_set_past_reminder: "Sie können in der Vergangenheit keine Lesezeichenerinnerung festlegen."
       cannot_set_reminder_in_distant_future: "Sie können eine Lesezeichenerinnerung nicht länger als 10 Jahre in der Zukunft festlegen."
       time_must_be_provided: "die Zeit muss für alle Erinnerungen angegeben werden"
@@ -403,7 +415,12 @@ de:
       email_already_used_in_category: "'%{email}' wird bereits von der Kategorie '%{category_name}' verwendet."
       cant_allow_membership_requests: "Du kannst Mitgliedschaftsanfragen nicht für eine Gruppe ohne Eigentümer erlauben."
       already_requested_membership: "Du hast die Gruppenmitgliedschaft für diese Gruppe bereits angefragt."
-      adding_too_many_users: "Maximal %{limit} Benutzer können auf einmal hinzugefügt werden"
+      adding_too_many_users:
+        one: "Maximal %{count} Benutzer kann auf einmal hinzugefügt werden"
+        other: "Maximal %{count} Benutzer können auf einmal hinzugefügt werden"
+      usernames_or_emails_required: "Benutzernamen oder E-Mails müssen vorhanden sein"
+      no_invites_with_discourse_connect: "Du kannst nur registrierte Benutzer einladen, wenn DiscourseConnect aktiviert ist"
+      no_invites_without_local_logins: "Sie können nur registrierte Benutzer einladen, wenn lokale Anmeldungen deaktiviert sind"
     default_names:
       everyone: "jeder"
       admins: "admins"
@@ -425,23 +442,23 @@ de:
       one: "%{count} Beitrag"
       other: "%{count} Beiträge"
     "new-topic": |
-      Willkommen bei %{site_name} &mdash; **danke, dass du ein neues Thema erstellst!**
+      Willkommen bei %{site_name} &mdash; **danke, für das Erstellen eines neuen Themas!**
 
       - Klingt der Titel interessant, wenn du ihn laut liest? Ist er eine gute Zusammenfassung?
 
-      - Wer sollte sich für dieses Thema interessieren? Warum ist es wichtig? Welche Art Antworten wünschst du dir?
+      - Wer würde sich für dieses Thema interessieren? Warum ist es wichtig? Welche Art Antworten wünschst du dir?
 
-      - Verwende gebräuchliche, gut definierte Wörter, damit dein Thema *gefunden* werden kann. Wähle eine Kategorie, um es mit ähnlichen Themen zu gruppieren.
+      - Verwende gebräuchliche, gut definierte Wörter, damit andere das Thema *finden* können. Wähle eine Kategorie (oder einen Tag), um es mit ähnlichen Themen zu gruppieren.
 
       Mehr Tipps findest du in [unseren Community-Richtlinien](%{base_path}/guidelines). Dieses Panel wird nur bei deinen ersten %{education_posts_text} angezeigt.
     "new-reply": |
-      Willkommen bei %{site_name} &mdash; **Danke für deinen Beitrag zum Thema!**
+      Willkommen bei %{site_name} &mdash; **Danke für deinen Beitrag!**
 
-      - Fügt dein Beitrag dem Gespräch etwas Neues hinzu, und sei es auch wenig?
+      - Sei nett zu deinen Community-Mitgliedern.
 
-      - Behandle deine Gesprächspartner mit demselben Respekt, den du von ihnen erwartest.
+      - Verbessert dein Beitrag das Gespräch?
 
-      - Kritik ist in Ordnung, aber bitte kritisiere nur *Ideen*, nicht Menschen.
+      - Konstruktive Kritik ist willkommen, aber kritisiere *Ideen*, nicht Menschen.
 
       Beachte bitte auch [unsere Richtlinien](%{base_path}/guidelines). Dieser Hilfetext wird nur bei deinen ersten %{education_posts_text} angezeigt.
     avatar: |
@@ -508,6 +525,7 @@ de:
               cant_send_pm: "Entschuldige, du kannst keine Nachricht an diese Person verschicken."
               no_user_selected: "Du musst einen gültigen Benutzer auswählen."
               reply_by_email_disabled: "Antwort per E-Mail ist deaktiviert."
+              send_to_email_disabled: "Entschuldige, du kannst keine persönlichen Nachrichen an E-Mail senden."
               target_user_not_found: "Einer der Empfänger dieser Nachricht konnte nicht gefunden werden."
               unable_to_update: "Beim Aktualisieren dieses Themas ist ein Fehler aufgetreten."
               unable_to_tag: "Beim Markieren des Themas ist ein Fehler aufgetreten."
@@ -556,6 +574,9 @@ de:
           attributes:
             execute_at:
               in_the_past: "muss in der Zukunft liegen."
+            duration_minutes:
+              cannot_be_zero: "muss größer als 0 sein."
+              exceeds_maximum: "darf nicht mehr als 20 Jahre betragen."
         translation_overrides:
           attributes:
             value:
@@ -590,7 +611,27 @@ de:
       Du solltest dieses Thema eventuell mittels Themen-Administration :wrench: (oben rechts oder unten) schließen, damit sich bei dieser Ankündigung nicht die Antworten anhäufen.
   lounge_welcome:
     title: "Willkommen in der Lounge"
-    body: "\nGratuliere! :confetti_ball:\n\nWenn du dieses Thema sehen kannst, wurdest du vor Kurzem zum **Stammgast** (Vertrauensstufe 3) befördert.\n \nDu kannst nun &hellip;\n\n* den Titel eines jeden Themas ändern\n* Themen in andere Kategorien verschieben\n* Links veröffentlichen, die von Suchmaschinen weiterverfolgt werden (das automatische [nofollow](https://de.wikipedia.org/wiki/Nofollow) wird entfernt)\n* auf die private Lounge-Kategorie zugreifen, die für Benutzer mit Vertrauensstufe 3 oder höher sichtbar ist\n* Spam durch eine einzige Meldung ausblenden\n\nHier ist die [aktuelle Liste aller Stammgäste](%{base_path}/badges/3/regular). Vergiss nicht, hallo zu sagen!\n\nVielen Dank dafür, dass du ein wichtiger Teil dieser Community bist!\n\n(Wenn du mehr über Vertrauensstufen wissen möchtest, kannst du [dieses Thema lesen][trust]. Beachte bitte, dass nur jene Mitglieder Stammgäste bleiben, die auch im Laufe der Zeit die Anforderungen erfüllen.)\n\n[trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\n"
+    body: |2
+
+      Gratuliere! :confetti_ball:
+
+      Wenn du dieses Thema sehen kannst, wurdest du vor Kurzem zum **Stammgast** (Vertrauensstufe 3) befördert.
+
+      Du kannst nun &hellip;
+
+      * den Titel eines jeden Themas ändern
+      * Themen in andere Kategorien verschieben
+      * Links veröffentlichen, die von Suchmaschinen weiterverfolgt werden (das automatische [nofollow](https://de.wikipedia.org/wiki/Nofollow) wird entfernt)
+      * auf die private Lounge-Kategorie zugreifen, die für Benutzer mit Vertrauensstufe 3 oder höher sichtbar ist
+      * Spam durch eine einzige Meldung ausblenden
+
+      Hier ist die [aktuelle Liste aller Stammgäste](%{base_path}/badges/3/regular). Vergiss nicht, hallo zu sagen!
+
+      Vielen Dank dafür, dass du ein wichtiger Teil dieser Community bist!
+
+      (Wenn du mehr über Vertrauensstufen wissen möchtest, kannst du [dieses Thema lesen][trust]. Beachte bitte, dass nur jene Mitglieder Stammgäste bleiben, die auch im Laufe der Zeit die Anforderungen erfüllen.)
+
+      [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
   admin_quick_start_title: "ZUERST LESEN: Admin Schnellstart Lotse"
   category:
     topic_prefix: "Über die Kategorie %{category}"
@@ -638,20 +679,20 @@ de:
     slow_down: "Du hast diese Aktion zu oft durchgeführt. Bitte versuche es später noch einmal."
     too_many_requests: "Du hast diese Aktion zu häufig ausgeführt. Bitte warte %{time_left}, ehe du es erneut versuchst."
     by_type:
-      first_day_replies_per_day: "Du hast die maximale Anzahl an Antworten erreicht, die ein neuer Benutzer am ersten Tag erstellen kann. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      first_day_topics_per_day: "Du hast die maximale Anzahl an Themen erreicht, die ein neuer Benutzer am ersten Tag erstellen kann. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      create_topic: "Du erstellst zu schnell zu viele Themen hintereinander. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      create_post: "Du antwortest zu schnell. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      delete_post: "Du löschst zu schnell Beiträge. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      public_group_membership: "Du wechselst die Gruppenzugehörigkeit zu häufig. Bitte warte %{time_left}, bevor du es erneut versuchst."
-      topics_per_day: "Du hast die maximale Anzahl an neuen Themen erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      pms_per_day: "Du hast die maximale Anzahl an Nachrichten erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      create_like: "Du hast die maximale Anzahl an Likes erreicht. Bitte warte %{time_left}, bevor du es wieder versuchst."
-      create_bookmark: "Du hast die maximale Anzahl an Lesezeichen erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      edit_post: "Du hast die maximale Anzahl an Bearbeitungen erreicht. Bitte warte %{time_left}, bevor du es wieder versuchst."
+      first_day_replies_per_day: "Wir bedanken uns für Deine Begeisterung, mach Sie weiter so! Aus Sicherheitsgründen hast Du jedoch die maximale Anzahl von Antworten erreicht, die ein neuer Benutzer am ersten Tag erstellen kann. Bitte warte %{time_left}, dann kannst Du weitere Antworten erstellen."
+      first_day_topics_per_day: "Wir bedanken uns für Deine Begeisterung! Aus Sicherheitsgründen hast Du jedoch die maximale Anzahl von Themen erreicht, die ein neuer Benutzer am ersten Tag erstellen kann. Bitte warte %{time_left}, dann kannst Du weitere neue Themen erstellen."
+      create_topic: "Du erstellst etwas zu schnell zu viele Themen hintereinander. Bitte warte %{time_left}, bis Du es wieder versuchst."
+      create_post: "Du antwortest etwas zu schnell. Bitte warte %{time_left}, bis Du es wieder versuchst."
+      delete_post: "Du löschst etwas zu schnell Beiträge. Bitte warte %{time_left}, bis Du es wieder versuchst."
+      public_group_membership: "Du wechselst die Gruppenzugehörigkeit etwas zu häufig. Bitte warte %{time_left}, bevor du es erneut versuchst."
+      topics_per_day: "Du hast die maximal zulässigen neuen Themen pro Tag erreicht. Du kannst weitere neue Themen in %{time_left}erstellen."
+      pms_per_day: "Du hast die maximal zulässigen Nachrichten pro Tag erreicht. Du kannst weitere neue Nachrichten in %{time_left}erstellen."
+      create_like: "Beeindruckend! Du hast viel Liebe geteilt! Du hast die maximalen täglichen Likes für heute erreicht, aber wenn du Vertrauensstufen gewinnst, wirst du mehr tägliche Likes verdienen. Du wirst Beiträge in %{time_left}wieder mögen können."
+      create_bookmark: "Du hast die maximale Anzahl täglicher Lesezeichen erreicht. Du kannst weitere Lesezeichen in %{time_left}erstellen."
+      edit_post: "Du hast die maximale Anzahl täglicher Bearbeitungen erreicht. Du kannst weitere Bearbeitungen in %{time_left}einreichen."
       live_post_counts: "Du forderst die Live-Anzahl der Antworten zu schnell neu an. Bitte warte %{time_left}, bis du es wieder versuchst."
       unsubscribe_via_email: "Du hast die maximale Anzahl an Abbestellungen per E-Mail erreicht. Bitte warte %{time_left}, vor einem neuen Versuch."
-      topic_invitations_per_day: "Du hast die maximale Zahl an neuen Thema-Einladungen erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
+      topic_invitations_per_day: "Du hast die maximale Anzahl von Themeneinladungen erreicht. Du kannst weitere Einladungen in %{time_left}senden."
     hours:
       one: "%{count} Stunde"
       other: "%{count} Stunden"
@@ -755,7 +796,7 @@ de:
       unknown: "unbekannter Browser"
     device:
       android: "Android-Gerät"
-      chromebook: "Chromebook"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -766,7 +807,7 @@ de:
       unknown: "unbekanntes Gerät"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -781,6 +822,7 @@ de:
     error_staged: "Es gab einen Fehler beim Ändern deiner E-Mail-Adresse. Die Adresse wird bereits von einem vorbereiteten Benutzer verwendet."
     already_done: "Entschuldige, dieser Bestätigungs-Link ist nicht mehr gültig. Wurde vielleicht die E-Mail-Adresse bereits geändert?"
     confirm: "Bestätigen"
+    max_secondary_emails_error: "Sie haben das maximal zulässige Limit für sekundäre E-Mails erreicht."
     authorizing_new:
       title: "Bestätige deine neue E-Mail"
       description: "Bitte bestätigen Sie, dass Ihre E-Mail-Adresse geändert werden soll in:"
@@ -872,6 +914,16 @@ de:
       others: "Keine Antworten."
     no_drafts:
       self: "Du hast keine Entwürfe; beginne eine Antwort in einem beliebigen Thema und es wird automatisch als neuer Entwurf gespeichert."
+  email_settings:
+    pop3_authentication_error: "Es gab ein Problem mit den bereitgestellten POP3-Anmeldeinformationen, überprüfe bitte den Benutzernamen und das Passwort und versuche es erneut."
+    imap_authentication_error: "Es gab ein Problem mit den bereitgestellten IMAP-Anmeldeinformationen, überprüfe bitte den Benutzernamen und das Passwort und versuche es erneut."
+    imap_no_response_error: "Bei der Kommunikation mit dem IMAP-Server ist ein Fehler aufgetreten. %{message}"
+    smtp_authentication_error: "Es gab ein Problem mit den bereitgestellten SMTP-Anmeldeinformationen, überprüfe bitte den Benutzernamen und das Passwort und versuche es erneut."
+    smtp_server_busy_error: "Der SMTP-Server ist derzeit ausgelastet, versuche es später erneut."
+    smtp_unhandled_error: "Es gab einen unbehandelten Fehler bei der Kommunikation mit dem SMTP-Server. %{message}"
+    connection_error: "Es gab ein Problem beim Verbinden mit dem Server, überprüfe den Servernamen und den Port und versuche es erneut."
+    timeout_error: "Zeitüberschreitung bei der Verbindung zum Server, überprüfe den Servernamen und den Port und versuche es erneut."
+    unhandled_error: "Unbehandelter Fehler beim Testen der E-Mail-Einstellungen. %{message}"
   webauthn:
     validation:
       invalid_type_error: "Der gesendete webauthn Typ war ungültig. Gültige Typen sind webauthn.get und webauthn.create."
@@ -933,7 +985,7 @@ de:
     mailing_list_mode: "Mailinglisten-Modus ausschalten"
     all: "Sende mir keine E-Mail mehr von %{sitename}"
     different_user_description: "Du bist gerade als ein anderer Benutzer angemeldet als der, an den die Zusammenfassung gesendet wurde. Bitte melde dich ab oder beginne den anonymen Modus und versuche es erneut."
-    not_found_description: "Entschuldige, wir konnten dein Abo nicht abbestellen. Kann es sein, dass der Link aus deiner E-Mail abgelaufen ist?"
+    not_found_description: "Entschuldigung, wir konnten diese Abmeldung nicht finden. Es ist möglich, dass der Link in deiner E-Mail zu alt ist und zwischenzeitlich abgelaufen ist?"
     log_out: "Abmelden"
     submit: "Präferenzen speichern"
     digest_frequency:
@@ -1311,6 +1363,7 @@ de:
     github_config_warning: 'Der Server erlaubt die Anmeldung mit GitHub (enable_github_logins), aber die Kunden-ID und der Geheimcode sind nicht gesetzt. Besuche <a href="%{base_path}/admin/site_settings">die Einstellungen</a> um die fehlenden Einträge hinzuzufügen. <a href="https://github.com/discourse/discourse/wiki/The-Discourse-Admin-Quick-Start-Guide" target="_blank">Besuche den Leitfaden um mehr zu erfahren</a>.'
     s3_config_warning: 'Der Server ist so eingestellt, dass Dateien auf S3 hochgeladen werden, aber mindestens eine der folgenden Einstellungen ist nicht gesetzt: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_upload_bucket. Gehe zu <a href="%{base_path}/admin/site_settings">den Seiten-Einstellungen</a> und aktualisiere die Einstellungen. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Siehe „How to set up image uploads to S3?“ um mehr zu erfahren</a>.'
     s3_backup_config_warning: 'Der Server ist so eingestellt, dass Backups auf S3 hochgeladen werden, aber mindestens eine der folgenden Einstellungen ist nicht gesetzt: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_backup_bucket. Gehe zu <a href="%{base_path}/admin/site_settings">den Seiten-Einstellungen</a> und aktulisiere die Einstellungen. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Siehe „How to set up image uploads to S3?“ um mehr zu erfahren</a>.'
+    s3_cdn_warning: 'Der Server ist so konfiguriert, dass er Dateien nach S3 hochlädt, aber es ist kein S3 CDN konfiguriert. Dies kann zu teuren S3-Kosten und langsamerer Seitenleistung führen. <a href="https://meta.discourse.org/t/-/148916" target="_blank">Siehe "Objektspeicher für Uploads verwenden", um mehr zu erfahren</a>.'
     image_magick_warning: 'Der Server wurde konfiguriert um Vorschaubilder von grossen Bildern zu erstellen, aber ImageMagick ist nicht installiertd. Installiere ImageMagick mit deinem bevorzugten Packetmanager oder besuche <a href="https://www.imagemagick.org/script/download.php" target="_blank">um das aktuelle Paket herunterzuladen</a>.'
     failing_emails_warning: "%{num_failed_jobs} E-Mails konnten nicht versendet werden. Überprüfe deine app.yml und stelle sicher, dass die E-Mail Servereinstellungen korrekt gesetzt sind. \n<a href=\"%{base_path}/sidekiq/retries\" target=\"_blank\">Sieh dir hier die nicht versendeten E-Mails an.</a>"
     subfolder_ends_in_slash: "Deine Installation in einem Pfad ist nicht korrekt, DISCOURSE_RELATIVE_URL_ROOT endet mit einem Schrägstrich."
@@ -1319,19 +1372,17 @@ de:
       other: "Beim Abrufen von E-Mails sind in den letzten 24 Stunden %{count} Fehler aufgetreten. Weitere Informationen findest du <a href='%{base_path}/logs' target='_blank'>im Fehlerprotokoll</a>."
     missing_mailgun_api_key: "Der Server ist so eingestellt, dass E-Mails über Mailgun versendet werden, aber du hast keinen API-Schlüssel angegeben, um Webhook-Nachrichten zu überprüfen."
     bad_favicon_url: "Das Favicon lässt sich nicht laden. Prüfe die Favicon-Einstellung in den <a href='%{base_path}/admin/site_settings'>Einstellungen</a>."
-    deprecated_api_usage: "Wir haben eine API Anfrage festgestellt, die eine überholte Authentifizierungsmethode verwendet. Bitte aktualisiere sie, um <a href='https://meta.discourse.org/t/-/22706'>header based auth</a> zu verwenden. Nach dem Update kann es bis zu 24 Stunden dauern, bis dieser Hinweis verschwindet."
-    update_mail_receiver: "Wir haben eine veraltete Version des mail-receivers festgestellt. Klicke <a href='https://meta.discourse.org/t/-/133491'>hier</a>, um eine Update Anleitung zu erhalten. Nach dem Update kann es 24 Stunden dauern, bis dieser Hinweis verschwindet."
     poll_pop3_timeout: "Die Verbindung zum POP3-Server schlägt mit einer Zeitüberschreitung fehl. Eingehende E-Mails konnten nicht abgerufen werden. Überprüfe deine <a href='%{base_path}/admin/site_settings/category/email'>POP3-Einstellungen</a>."
     poll_pop3_auth_error: "Die Verbindung zum POP3-Server schlägt mit einem Authentisierungsfehler fehl. Überprüfe deine <a href='%{base_path}/admin/site_settings/category/email'>POP3-Einstellungen</a>."
     force_https_warning: "Deine Webseite verwendet SSL, aber die `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` ist in deinen Website-Einstellungen noch nicht aktiviert."
     out_of_date_themes: "Updates sind zu folgenden Themes verfügbar:"
     unreachable_themes: "Wir konnten die folgenden Themes nicht auf Updates prüfen:"
-    watched_word_regexp_error: "Der reguläre Ausdruck für %{action} beobachtete Wörter ist ungültig. Bitte prüfe deine <a href='%{base_path}/admin/logs/watched_words'> Einstellungen für beobachtete Wörter</a>, oder deaktiviere die 'reguläre Ausdrücke beobachteter Wörter' Seiteneinstellung."
+    watched_word_regexp_error: "Regular expression für %{action} beobachtete Wörter ist ungültig. Bitte überprüfe deine <a href='%{base_path}/admin/customize/watched_words'>Beobachtete Wörter Einstellungen</a>oder deaktiviere die Einstellung 'Beobachtete Wörter regular expressions."
   site_settings:
     display_local_time_in_user_card: "Zeigt die lokale Zeit basierend auf der Zeitzone eines Benutzers an, wenn die Benutzerkarte geöffnet wird."
     censored_words: "Wörter, die automatisch durch &#9632;&#9632;&#9632;&#9632; ersetzt werden"
     delete_old_hidden_posts: "Automatisch alle Beiträge löschen, die länger als 30 Tage versteckt bleiben."
-    default_locale: "Die Standardsprache dieser Discourse Instanz. Du kannst die Texte der system-generierten Kategorien und Themen auf  <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Customize / Text</a> anpassen."
+    default_locale: "Die Standardsprache dieser Discourse Instanz. Du kannst die Texte der system-generierten Kategorien und Themen auf <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Customize / Text</a> anpassen."
     allow_user_locale: "Erlaube Benutzern, ihre eigene Oberflächensprache zu wählen"
     set_locale_from_accept_language_header: "Legen Sie die Sprache der Benutzeroberfläche für anonyme Benutzer in den Sprachheadern ihres Webbrowsers fest"
     support_mixed_text_direction: "Unterstütze die Vermischung von rechtsläufigem und linksläufigem Text"
@@ -1354,10 +1405,8 @@ de:
     search_query_log_max_size: "Maximale Anzahl von Suchanfragen, die vorgehalten werden"
     search_query_log_max_retention_days: "Maximale Aufbewahrungszeit für Suchanfragen, in Tagen."
     search_ignore_accents: "Ignoriere Akzente bei der Textsuche."
-    category_search_priority_very_low_weight: "Gewichtung der Rangfolge für sehr geringe Kagegorie-Such Priorität."
     category_search_priority_low_weight: "Gewichtung der Rangfolge für geringe Kagegorie-Such Priorität."
     category_search_priority_high_weight: "Gewichtung der Rangfolge für hohe Kagegorie-Such Priorität."
-    category_search_priority_very_high_weight: "Gewichtung der Rangfolge für sehr hohe Kagegorie-Such Priorität."
     allow_uncategorized_topics: "Erlaube Themen ohne Kategorie zu erstellen. ACHTUNG: Falls es unkategorisierte Themen gibt, musst du sie neu kategorisieren, bevor du diese Option abschaltest."
     allow_duplicate_topic_titles: "Erlaube Themen mit identischen und doppelten Titeln."
     allow_duplicate_topic_titles_category: "Lassen Sie Themen mit identischen, doppelten Titeln zu, wenn die Kategorie unterschiedlich ist. allow_duplicate_topic_titles muss false sein."
@@ -1367,7 +1416,7 @@ de:
     site_description: "Beschreibe diese Site in einem Satz. Wird für das \"description\" Meta-Tag verwendet."
     short_site_description: "Kurze Beschreibung, die im Title-Tag auf der Webseite verwendet wird."
     contact_email: "E-Mail-Adresse einer verantwortlichen Person für diese Community. Wird verwendet für kritische Benachrichtigungen sowie auf dem <a href='%{base_path}/about' target='_blank'>/about</a> Kontaktformular für dringende Anfragen."
-    contact_url: "URL für Kontaktanfragen bezüglich dieser Site. Wird unter <a href='%{base_path}/about' target='_blank'>/about</a> im Kontaktformular verwendet für dringende Angelegenheiten."
+    contact_url: "Kontakt-URL für diese Seite. Angezeigt auf der <a href='%{base_path}/about' target='_blank'>/about</a> Seite für dringende Fragen."
     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)"
@@ -1406,8 +1455,9 @@ de:
     logo_small_dark: "Alternative für ein dunkles Schema für die Site-Einstellung \"kleines Logo\"."
     mobile_logo_dark: "Alternative für ein dunkles Schema für die Site-Einstellung \"mobile Logo\"."
     large_icon: "Das Bild, das als Basis für andere Metadaten Icons genutzt wird. Es sollte idealerweise größer als 512 x 512 sein. Falls leer, wird logo_small genutzt."
-    manifest_icon: "Das Bild, das als Logo/Splash Bild auf Android benutzt wird. Es wird automatisch auf 512 x 512 gesetzt. Falls leer, wird large_icon genutzt. "
-    favicon: "Ein Favicon für die Seite, siehe <a href='https://de.wikipedia.org/wiki/Favicon' target='_blank'>https://de.wikipedia.org/wiki/Favicon</a>. Damit es auch über eine CDN richtig funktioniert, muss es ein PNG sein. Wird auf eine Größe von 32x32 gesetzt. Falls leer, wird large_icon verwendet. "
+    manifest_icon: "Das Bild, das als Logo/Splash Bild auf Android benutzt wird. Es wird automatisch auf 512 x 512 gesetzt. Falls leer, wird large_icon genutzt."
+    manifest_screenshots: "Screenshots, die die Merkmale und Funktionen Ihrer Instanz auf der Seite mit der Installationsaufforderung zeigen. Alle Bilder sollten lokale Uploads sein und die gleichen Abmessungen haben."
+    favicon: "Ein Favicon für die Seite, siehe <a href='https://de.wikipedia.org/wiki/Favicon' target='_blank'>https://de.wikipedia.org/wiki/Favicon</a>. Damit es auch über eine CDN richtig funktioniert, muss es ein PNG sein. Wird auf eine Größe von 32x32 gesetzt. Falls leer, wird large_icon verwendet."
     apple_touch_icon: "Icon für Apple Touch Geräte. Wird automatisch auf eine Größe von 180 x 180 gesetzt. Falls leer, wird large_icon verwendet."
     opengraph_image: "Standard Opengraph Bild, verwendet wenn die Seite kein anderes passendes Bild hat. Falls leer, wird large_icon verwendet."
     twitter_summary_large_image: "Twitter Karten 'summary large image' (sollte mindestens 280 breit und 150 hoch sein). Falls leer, werden Standard Karten Metadaten mit Hilfe des Opengraph Bildes generiert."
@@ -1417,7 +1467,7 @@ de:
     detailed_404: "Liefert mehr Details für Benutzer darüber, warum sie keinen Zugriff auf ein spezielles Thema haben. Hinweis: Dies ist weniger sicher, weil Benutzer so herausfinden, ob eine URL zu einem existierenden Thema führt."
     enforce_second_factor: "Zwingt die Benutzer, die Zwei-Faktor-Authentifizierung zu aktivieren. Wähle \"all\", um sie für alle Benutzer zu erzwingen. Wähle \"staff\", um sie nur für Teammitglieder zu erzwingen."
     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."
+    same_site_cookies: "Benutze dieselben Site-Cookies, sie entfernen alle Vektoren Cross Site Request Forgery auf unterstützten Browsern (Lax oder Strict). Warnung: Strict funktioniert nur auf Seiten, die das Login erzwingen und eine externe Authentifizierungsmethode verwenden."
     summary_score_threshold: "Mindestpunktzahl, die ein Beitrag benötigt, um in der \"Thema zusammenfassen\"-Ansicht zu erscheinen."
     summary_posts_required: "Minimale Beiträge in einem Thema, bevor „Dieses Thema zusammenfassen“ aktiviert ist. Änderungen dieser Einstellung werden rückwirkend innerhalb einer Woche angewendet."
     summary_likes_required: "Minimale Likes in einem Thema, bevor „Dieses Thema zusammenfassen“ aktiviert ist. Änderungen dieser Einstellung werden rückwirkend innerhalb einer Woche angewendet."
@@ -1455,13 +1505,14 @@ de:
     must_approve_users: "Alle neuen Benutzerkonten müssen von Mitarbeitern freigeschaltet werden, bevor sie Zugriff auf die Seite erhalten."
     invite_code: "Der Benutzer muss diesen Code eingeben, damit die Kontoregistrierung zugelassen wird. Wird ignoriert, wenn er leer ist (Groß-/Kleinschreibung wird nicht beachtet)"
     approve_suspect_users: "Fügen Sie verdächtige Benutzer zur Warteschlange hinzu. Verdächtige Benutzer haben eine Biografie/Website eingegeben, haben aber keine Leseaktivität."
+    review_every_post: "Alle Beiträge müssen überprüft werden. WARNUNG! NICHT FÜR STARK FREQUENTIERTE WEBSITES EMPFOHLEN."
     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."
     persistent_sessions: "Benutzer bleiben angemeldet, wenn der Webbrowser geschlossen wird"
     maximum_session_age: "Benutzer bleiben (n) Stunden nach ihrem letzten Besuch angemeldet"
     ga_version: "Zu verwendende Version von Google Universal Analytics: v3 (analyse.js), v4 (gtag)"
     ga_universal_tracking_code: "Google Universal Analytics Tracking-Code-ID, z. B.: UA-12345678-9; siehe <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
     ga_universal_domain_name: "Google Universal Analytics Domainname, z. B.: mysite.com; siehe <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
-    ga_universal_auto_link_domains: "Aktiviere die domänenübergreifende Verfolgung von Google Universal Analytics. Bei ausgehenden Links zu diesen Domänen wird die Client-ID hinzugefügt. Siehe <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Googles Cross-Domain-Tracking-Handbuch.</a>"
+    ga_universal_auto_link_domains: "Aktiviere die domänenübergreifende Verfolgung von Google Universal Analytics. Bei ausgehenden Links zu diesen Domänen wird die Client-ID hinzugefügt. Siehe <a href='https://support.google.com/analytics/answer/1034342?hl=de' target='_blank'>Googles Cross-Domain-Tracking-Handbuch.</a>"
     gtm_container_id: "Google Tag Manager Container-ID. z.B.: GTM-ABCDEF. <br/>Hinweis: Skripte von Drittanbietern, die von GTM geladen werden, müssten in der 'content security policy script src' Liste erlaubt werden."
     enable_escaped_fragments: "Als Fallback die Ajax-Crawling-API von Google verwenden, wenn keine Suchmaschine deaktiviert wurde. Siehe <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     moderators_manage_categories_and_groups: "Moderatoren erlauben, Kategorien und Gruppen zu verwalten"
@@ -1478,6 +1529,7 @@ de:
     content_security_policy: "Aktiviere Content-Security-Policy"
     content_security_policy_report_only: "Aktiviere Content-Security-Policy-Report-Only"
     content_security_policy_collect_reports: "Aktiviere die Sammlung von Berichten zu CSP-Verstößen unter /csp_reports"
+    content_security_policy_frame_ancestors: "Begrenzen, wer diese Seite über CSP in iframes einbetten kann. Kontrolle erlaubter Hosts auf <a href='%{base_path}/admin/customize/embedding'>Einbetten</a>"
     content_security_policy_script_src: "Zusätzlich erlaubte Skriptquellen. Der aktuelle Host und CDN sind standardmäßig enthalten. Siehe <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Mitigate XSS Attacks with Content Security Policy.</a>"
     invalidate_inactive_admin_email_after_days: "Admin-Konten, die die Seite diese Anzahl Tage nicht mehr besucht haben, müssen ihre E-Mail-Adresse neu bestätigen, bevor sie sich anmelden. Ein Wert von 0 deaktiviert die Funktion."
     top_menu: "Legt fest, welche Elemente in der Navigationsleiste der Startseite auftauchen sollen, und in welcher Reihenfolge. Beispiel: latest|new|unread|categories|top|read|posted|bookmarks"
@@ -1525,27 +1577,27 @@ de:
     min_admin_password_length: "Minimale Passwortlänge für Administratoren."
     password_unique_characters: "Minimale Anzahl unterschiedlicher Zeichen, die ein Passwort enthalten muss."
     block_common_passwords: "Erlaube kein Passwort unter den 10000 meist verwendeten Passwörter."
-    external_auth_skip_create_confirm: Beim Anmelden über externe Authentifizierung überspringen Sie das Konto-Popup des Erstellen-Kontos. Am besten verwendet neben sso_overrides_email, sso_overrides_username und sso_overrides_name.
-    external_auth_immediately: "Automatische Weiterleitung zum externen Anmeldesystem ohne Benutzerinteraktion. Dies wirkt nur, wenn login_required wahr ist und es nur eine externe Authentifizierungsmethode gibt"
-    enable_sso: "Aktiviere Single Sign-on über eine externe Site (WARNUNG: DIE E-MAIL-ADRESSE DES BENUTZERS *MUSS* VON DER EXTERNEN SITE VERIFIZIERT WERDEN)."
-    verbose_sso_logging: "Protokolliere ausführliche SSO-bezogene Diagnose in <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    enable_sso_provider: "Aktiviere das Discourse SSO-Provider-Protokoll unter /session/sso_provider; setzt voraus, dass sso_provider_secret gesetzt ist."
-    sso_url: "URL des Single Sign-On-Endpunkts (muss http:// oder https:// enthalten)"
-    sso_secret: "Geheimer Schlüssel für die Authentifizierung von SSO-Informationen. Sollte unbedingt 10 Zeichen oder länger sein."
-    sso_provider_secrets: "Eine Liste mit Domain-Secret-Paaren, die Discourse als SSO-Provider verwenden. Stelle sicher, dass SSO-Secrets mindestens 10 Zeichen lang sind. Das Wildcard-Symbol * kann verwendet werden, um jede Domain oder nur einen Teil davon auszuwählen (z.B. *.example.com). "
-    sso_overrides_bio: "Überschreibt \"Über mich\" im Benutzerprofil und verhindert Änderungen durch den Benutzer"
-    sso_overrides_groups: "Synchronisiert alle manuellen Gruppenmitgliedschaften mit den Gruppen, die im SSO-Attribut „groups“ angegeben ist (WARNUNG: wenn du keine Gruppen angibst, werden alle Gruppenmitgliedschaften des Benutzers aufgehoben)"
-    sso_overrides_email: "Überschreibt lokale E-Mails bei jedem Login mit externen Site-E-Mails von SSO-Nutzdaten und verhindert lokale Änderungen. Gilt für alle Authentifizierungsanbieter. (WARNUNG: Aufgrund der Normalisierung lokaler E-Mails können Abweichungen auftreten.)"
-    sso_overrides_username: "Überschreibt den lokalen Benutzernamen bei jedem Login mit dem Benutzernamen der externen Site aus der SSO-Nutzlast und verhindert lokale Änderungen. Gilt für alle Authentifizierungsanbieter. (WARNUNG: Abweichungen können aufgrund unterschiedlicher Länge / Anforderungen des Benutzernamens auftreten.)"
-    sso_overrides_name: "Überschreibt den lokalen vollständigen Namen mit dem vollständigen Namen des externen Standorts aus der SSO-Nutzlast bei jeder Anmeldung und verhindert lokale Änderungen. Gilt für alle Authentifizierungsanbieter."
-    sso_overrides_avatar: "Überschreibt das Profilbild des Benutzers mit dem Profilbild aus dem SSO-Payload. Wenn aktiv, wird Benutzern nicht gestattet, Avatare auf Discourse hochzuladen."
-    sso_overrides_location: "Überschreibt den Benutzerstandort mit dem externen Standort der SSO-Nutzdaten und verhindert lokale Änderungen."
-    sso_overrides_website: "Überschreibt die Benutzerwebsite mit externem Speicherort von der SSO-Nutzlast und verhindert lokale Änderungen."
-    sso_overrides_profile_background: "Ersetzt das Hintergrundbild des Benutzerprofils mit dem Avatar der externen Seite aus den SSO-Daten"
-    sso_overrides_card_background: "Ersetzt das Hintergrundbild der Benutzerkarte mit dem Avatar der externen Seite aus den SSO-Daten"
-    sso_not_approved_url: "Nicht genehmigte SSO-Konten zu dieser URL weiterleiten"
-    sso_allows_all_return_paths: "Alle Domain für SSO-Return-Paths zulassen (standardmäßig muss der Return Path auf der aktuellen Seite sein)"
-    enable_local_logins: "Aktiviert lokale Konten mit Anmeldung über Benutzername und Passwort. Dies muss aktiviert sein, damit Einladungen funktionieren. WARNUNG: Wenn deaktiviert, kannst du dich möglicherweise nicht mehr anmelden, wenn du nicht vorher mindestens eine alternative Login-Methode konfiguriert hast."
+    auth_skip_create_confirm: Überspringe bei der Anmeldung über externe Authentifizierung das Konto-Popup für das Erzeugen des Accounts. Am besten verwendet neben auth_overrides_email, auth_overrides_username und auth_overrides_name.
+    auth_immediately: "Automatische Weiterleitung zum externen Loginsystem ohne Benutzerinteraktion. Dies wirkt nur, wenn login_required wahr ist und es nur eine externe Authentifizierungsmethode gibt"
+    enable_discourse_connect: "Aktiviere die Anmeldung über DiscourseConnect (ehemals „Discourse SSO') (WARNUNG: E-MAIL-ADRESSEN DER BENUTZER *MÜSSEN VON DER EXTERNEN SITE VALIDIERT WERDEN!)"
+    verbose_discourse_connect_logging: "Protokolliere ausführliche DiscourseConnect-bezogene Diagnose in <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    enable_discourse_connect_provider: "Implementierung des DiscourseConnect (früher „Discourse SSO) -Anbieterprotokolls am /session/sso_provider Endpunkt, erfordert das Festlegen von discourse_connect_provider_secrets"
+    discourse_connect_url: "URL des DiscourseConnect Endpunkts (muss http://oder https://enthalten)"
+    discourse_connect_secret: "Geheime Zeichenfolge zur kryptografischen Authentifizierung von DiscourseConnect Informationen. Stelle sicher, dass diese 10 Zeichen oder länger sind"
+    discourse_connect_provider_secrets: "Eine Liste von Domain-Secret-Paaren, die DiscourseConnect verwenden. Stelle sicher, dass DiscourseConnect Secret 10 Zeichen oder länger beträgt. Das Platzhaltersymbol * kann verwendet werden, um einer Domain oder nur einem Teil davon zu entsprechen (z. B. * .example.com)."
+    discourse_connect_overrides_bio: "Überschreibt die Benutzerbiografie im Benutzerprofil und verhindert, dass der Benutzer sie ändert"
+    discourse_connect_overrides_groups: "Synchronisiere alle manuellen Gruppenmitgliedschaften mit Gruppen, die im Gruppenattribut angegeben sind (WARNUNG: Wenn du keine Gruppen angobst, werden alle manuellen Gruppenmitgliedschaften für den Benutzer gelöscht)"
+    auth_overrides_email: "Überschreibt lokale E-Mail mit externer Website-E-Mail bei jedem Login und verhindert lokale Änderungen. Gilt für alle Authentifizierungsanbieter. (WARNUNG: Abweichungen können aufgrund der Normalisierung lokaler E-Mails auftreten)"
+    auth_overrides_username: "Überschreibt lokalen Benutzernamen mit externem Site-Benutzernamen bei jedem Login und verhindert lokale Änderungen. Gilt für alle Authentifizierungsanbieter. (WARNUNG: Abweichungen können aufgrund von unterschiedlichen Benutzernamenslängen/-voraussetzungen auftreten)"
+    auth_overrides_name: "Überschreibt den lokalen vollständigen Namen mit dem vollständigen Namen der externen Site bei jeder Anmeldung und verhindert lokale Änderungen. Gilt für alle Authentifizierungsanbieter."
+    discourse_connect_overrides_avatar: "Überschreibt den Benutzeravatar mit dem externen Site-Avatar von DiscourseConnect-Nutzdaten. Wenn diese Option aktiviert ist, dürfen Benutzer keine Avatare auf Discourse hochladen."
+    discourse_connect_overrides_location: "Überschreibt den Benutzerstandort mit dem externen Standort der DiscourseConnect-Nutzdaten und verhindert lokale Änderungen."
+    discourse_connect_overrides_website: "Überschreibt die Benutzerwebsite mit externem Standort von DiscourseConnect-Nutzdaten und verhindert lokale Änderungen."
+    discourse_connect_overrides_profile_background: "Überschreibt den Benutzerprofilhintergrund mit einem externen Site-Avatar aus DiscourseConnect-Nutzdaten."
+    discourse_connect_overrides_card_background: "Überschreibt den Hintergrund der Benutzerkarte mit dem Avatar einer externen Site aus der Nutzlast von DiscourseConnect."
+    discourse_connect_not_approved_url: "Umleiten nicht genehmigter DiscourseConnect-Konten auf diese URL"
+    discourse_connect_allows_all_return_paths: "Beschränke die von DiscourseConnect bereitgestellte Domain für return_paths nicht (standardmäßig muss der Rückkehrpfad auf der aktuellen Website liegen)"
+    enable_local_logins: "Aktiviere lokale Benutzer- und Passwort-basierte Konten. WARNUNG: Wenn deaktiviert, kannst Du Dich möglicherweise nicht einloggen, wenn Du noch nicht mindestens eine alternative Login-Methode konfiguriert hast."
     enable_local_logins_via_email: "Erlaube Benutzern, einen einmaligen Anmeldelink anzufordern, der ihnen als E-Mail geschickt wird."
     allow_new_registrations: "Erlaube das Registrieren neuer Benutzerkonten. Wird dies deaktiviert, so kann niemand mehr ein neues Konto erstellen."
     enable_signup_cta: "Zeige wiederkehrenden Gästen einen Hinweis, dass diese sich Anmelden oder Registrieren sollen."
@@ -1588,7 +1640,6 @@ de:
     top_topics_formula_log_views_multiplier: "Wert von Log Ansichten Multiplikator (n) in Top Themen Formel: `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: "Wert für den Multiplikator (n) für die ersten „Gefällt mir“-Angaben pro Beitrag in der Formel für die besten Beiträge: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "Wert für den Multiplikator (n) für die wenigsten „Gefällt mir“-Angaben pro Beitrag in der Formel für die besten Beiträge: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Anzahl alter Beiträge, die im 15 Minuten-Intervall neu generiert werden sollen"
     enable_safe_mode: "Erlaube Benutzern, den abgesicherten Modus zu betreten, um Plugins zu debuggen."
     rate_limit_create_topic: "Nach Erstellen eines Themas muss ein Benutzer (n) Sekunden warten, bevor ein weiteres Thema erstellt werden kann."
     rate_limit_create_post: "Nach Schreiben eines Beitrags muss ein Benutzer (n) Sekunden warten, bevor ein weiterer Beitrag erstellt werden kann."
@@ -1604,15 +1655,16 @@ de:
     max_topic_invitations_per_day: "Maximale Zahl an Thema-Einladungen, die ein Benutzer pro Tag verschicken kann."
     max_logins_per_ip_per_hour: "Maximale Anzahl der erlaubten Anmeldungen pro IP-Adresse und Stunde"
     max_logins_per_ip_per_minute: "Maximale Anzahl der erlaubten Anmeldungen pro IP-Adresse und Stunde"
-    max_post_deletions_per_minute: "Maximale Anzahl der Beiträge, die ein Benutzer pro Minute löschen kann."
-    max_post_deletions_per_day: "Maximale Anzahl an Beiträgen, die ein Benutzer pro Tag löschen kann."
+    max_post_deletions_per_minute: "Maximale Anzahl von Beiträgen, die ein Benutzer pro Minute löschen kann. Auf 0 setzen, um das Löschen von Beiträgen zu deaktivieren."
+    max_post_deletions_per_day: "Maximale Anzahl von Beiträgen, die ein Benutzer pro Tag löschen kann. Auf 0 setzen, um das Löschen von Beiträgen zu deaktivieren."
     invite_link_max_redemptions_limit: "Die maximal zulässigen Einlösungen für Einladungslinks dürfen diesen Wert nicht überschreiten."
+    invite_link_max_redemptions_limit_users: "Die maximal zulässige Einlösung für von regulären Benutzern generierte Einladungslinks darf diesen Wert nicht überschreiten."
     alert_admins_if_errors_per_minute: "Anzahl der Fehler pro Minute, bei der ein Administrator benachrichtigt werden soll. Ein Wert von 0 deaktiviert diese Funktion. Achtung: Benötigt einen Neustart."
     alert_admins_if_errors_per_hour: "Anzahl der Fehler pro Stunde, bei der ein Administrator benachrichtigt werden soll. Ein Wert von 0 deaktiviert diese Funktion. Achtung: Benötigt einen Neustart."
-    categories_topics: "Anzahl der Themen, die in der /Kategorien Seite angezeigt werden. Bei 0 wird versucht, automatisch einen Wert zu finden, der die beiden Spalten (Kategorien und Themen) symmetrisch hält. "
+    categories_topics: "Anzahl der Themen, die in der /Kategorien Seite angezeigt werden. Bei 0 wird versucht, automatisch einen Wert zu finden, der die beiden Spalten (Kategorien und Themen) symmetrisch hält."
     suggested_topics: "Anzahl der empfohlenen Themen am Ende eines Themas."
     limit_suggested_to_category: "Zeige nur Themen der aktuellen Kategorie in vorgeschlagenen Themen."
-    suggested_topics_max_days_old: "Vorgeschlagene Themen sollten nicht älter als (n) Tage alt sein."
+    suggested_topics_max_days_old: "Vorgeschlagene Themen sollten nicht älter als n Tage alt sein."
     suggested_topics_unread_max_days_old: "Vorgeschlagene ungelesene Themen sollten nicht älter als n Tage sein."
     clean_up_uploads: "Lösche verwaiste Uploads, um illegales Hosting zu vermeiden. ACHTUNG: du solltest ein Backup deines /uploads-Verzeichnis erstellen, bevor du diese Funktion aktivierst."
     clean_orphan_uploads_grace_period_hours: "Schonfrist (in Stunden), bevor ein verwaister Upload entfernt wird."
@@ -1622,12 +1674,14 @@ de:
     s3_use_iam_profile: 'Verwende ein <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">AWS EC2 Instanz-Profil</a>, um Zugriff auf den S3-Bucket zu gewähren. BEACHTE: Das Aktivieren setzt voraus, dass Discourse in einer entsprechend konfigurierten EC2-Instanz läuft, und überschreibt die Einstellungen „s3 access key id“ und „s3 secret access key”.'
     s3_upload_bucket: "Der Name des Amazon S3 Buckets, in dem hochgeladene Dateien gespeichert werden sollen. ACHTUNG: nur Kleinbuchstaben, keine Punkte, keine Unterstriche."
     s3_access_key_id: "Die Amazon S3 Zugangsschlüssel-ID, die für den Upload von Bildern, Anhängen und Backups verwendet wird."
-    s3_secret_access_key: "Die Amazon S3 geheime Zugangsschlüssel-ID, die für den Upload von Bildern, Anhängen und Backups verwendet wird. "
-    s3_region: "Der Name der Amazon S3 Region, die für das Hochladen von Bildern und Sicherungen verwendet wird "
+    s3_secret_access_key: "Die Amazon S3 geheime Zugangsschlüssel-ID, die für den Upload von Bildern, Anhängen und Backups verwendet wird."
+    s3_region: "Der Name der Amazon S3 Region, die für das Hochladen von Bildern und Sicherungen verwendet wird."
     s3_cdn_url: "Die CDN URL für alle S3 Anlagen (bspw. https://cdn.somewhere.com). ACHTUNG: Nachdem diese Einstellung abgeändert wurde, musst du alle alten Beiträge neu generieren."
     avatar_sizes: "Liste der Größe von automatisch generierten Profilbildern."
     external_system_avatars_enabled: "Benutze einen externen Avatar Service"
     external_system_avatars_url: "URL des externen Profilbild-Dienstes. Erlaubte Platzhalter sind {username} {first_letter} {color} {size}"
+    external_emoji_url: "URL des externen Dienstes für Emoji-Bilder. Lasse das Feld leer, um es zu deaktivieren."
+    use_site_small_logo_as_system_avatar: "Verwende das kleine Logo der Website anstelle des Avatars des Systembenutzers. Das Logo muss vorhanden sein."
     restrict_letter_avatar_colors: "Eine Liste 6stelliger hexadezimaler Farbwerte für den Letter Avatar Hintergrund."
     selectable_avatars_enabled: "Forciere Benutzer, ein Avatar aus der Liste auszuwählen."
     selectable_avatars: "Liste von Avataren, aus der Benutzer wählen können."
@@ -1639,7 +1693,6 @@ de:
     strip_image_metadata: "Bild-Metadaten entfernen."
     min_ratio_to_crop: "Seitenverhältnis zum Ausschneiden großer Bilder. Angabe als Ergebnis von Breite / Höhe."
     simultaneous_uploads: "Maximale Anzahl an Dateien, die per Drag & Drop in den Editor gezogen werden können."
-    enable_flash_video_onebox: "Aktiviere das Einbinden von swf und flv (Adobe Flash) Links in einer Onebox. ACHTUNG: Kann ein Sicherheitsrisiko sein."
     default_invitee_trust_level: "Standardwert für die Vertrauensstufe eines eingeladenen Benutzers (0-4)."
     default_trust_level: "Standardwert für die Vertrauensstufe (0-4) für alle neuen Benutzer. ACHTUNG! Diesen Wert anzuheben kann zu erhöhtem Spam-Aufkommen führen!"
     tl1_requires_topics_entered: "Die Anzahl der Themen, die ein neuer Benutzer betrachten muss, bevor er in die Vertrauensstufe 1 befördert wird."
@@ -1659,8 +1712,8 @@ de:
     tl3_requires_topics_viewed_cap: "Maximale Anzahl gelesener Themen in den letzten (tl3 time period) Tagen."
     tl3_requires_posts_read: "Prozentualer Anteil aller Beiträge der letzten (tl3 time period) Tage, die ein Benutzer mindestens gelesen haben muss, um die Vertrauensstufe 3 erreichen zu können. (0 bis 100)"
     tl3_requires_posts_read_cap: "Maximale Anzahl gelesener Themen in den letzten (tl3 time period) Tagen."
-    tl3_requires_topics_viewed_all_time: "Mindestanzahl Themen, die ein Benutzer gelesen haben muss, um die Vertrauensstufe Anführer (3) erreichen zu können."
-    tl3_requires_posts_read_all_time: "Mindestanzahl Beiträge, die ein Benutzer gelesen haben muss, um die Vertrauensstufe Anführer (3) erreichen zu können."
+    tl3_requires_topics_viewed_all_time: "Mindestanzahl Themen, die ein Benutzer gelesen haben muss, um die Vertrauensstufe 3 erreichen zu können."
+    tl3_requires_posts_read_all_time: "Mindestanzahl Beiträge, die ein Benutzer gelesen haben muss, um die Vertrauensstufe 3 erreichen zu können."
     tl3_requires_max_flagged: "Um die Vertrauensstufe 3 erhalten zu können, dürfen in den letzten (tl3 time period) Tagen höchstens X Beiträge eines Benutzer von X verschiedenen anderen Benutzer gemeldet worden sein, wobei X diesem Wert entspricht. (0 oder mehr)"
     tl3_promotion_min_duration: "Mindestanzahl an Tagen, die ein Benutzer auf Vertrauensstufe 3 beförderter Benutzer auf dieser Stufe verbleibt, bevor er automatisch wieder auf Vertrauensstufe 2 heruntergestuft werden kann."
     tl3_requires_likes_given: "Mindestanzahl an Likes, die ein Benutzer innerhalb der letzten (tl3 time period) gegeben haben muss, um Vertrauensstufe 3 erreichen zu können."
@@ -1673,6 +1726,7 @@ de:
     min_trust_to_edit_post: "Die minimal benötigte Vertrauensstufe, um Beiträge bearbeiten zu können."
     min_trust_to_allow_self_wiki: "Die minimale Vertrauensstufe, die ein Benutzer haben muss, um einen eigenen Wiki Eintrag zu erstellen."
     min_trust_to_send_messages: "Die minimale Vertrauensstufe zur Erstellung neuer Nachrichten."
+    min_trust_to_send_email_messages: "Die minimale Vertrauensstufe, um persönliche Nachrichten per E-Mail zu versenden."
     min_trust_to_flag_posts: "Die minimale Vertrauensstufe zur Meldung von Beiträgen."
     min_trust_to_post_links: "Die minimale Vertrauensstufe zum Einfügen von Links in Beiträgen."
     min_trust_to_post_embedded_media: "Die Mindestvertrauensstufe, die zum Einbetten von Medienelementen in einen Beitrag erforderlich ist"
@@ -1699,6 +1753,7 @@ de:
     body_min_entropy: "Für den Text neuer Beiträge minimal erforderliche Entropie (einzigartige Zeichen)."
     allow_uppercase_posts: "Beiträge oder Titel von Themen mit ausschließlich Großschreibweise erlauben."
     max_consecutive_replies: "Anzahl an aufeinanderfolgenden Beiträgen, die ein Benutzer in einem Thema schreiben kann, bevor eine weitere Antwort verhindert wird."
+    enable_filtered_replies_view: 'Die Schaltfläche "(n) Antworten" reduziert alle anderen Beiträge und zeigt nur den aktuellen Beitrag und seine Antworten an.'
     title_fancy_entities: "Konvertiere HTML-Entitäten in Themen-Überschriften, nach dem Smarty-Pants-Schema <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Minimale Länge eines Titels, bevor nach ähnlichen Titeln gesucht wird."
     desktop_category_page_style: "Visueller Stil für die /categories Seite"
@@ -1748,10 +1803,11 @@ de:
     min_first_post_typing_time: "Minimale Zeit die ein Benutzer mindestens aufwenden muss, um einen Beitrag zu schreiben. Wenn diese Zeit unterschritten wird, wird der Beitrag automatisch in die Warteschlange für freizuschaltende Beiträge verschoben. Setze diesen Wert auf 0 um dieses Verhalten zu deaktivieren (nicht empfohlen)."
     auto_silence_fast_typers_on_first_post: "Benutzer automatisch stummschalten, die nicht der min_first_post_typing_time entsprechen."
     auto_silence_fast_typers_max_trust_level: "Maximale Vertrauensstufe, um „Schnelltipper“ stummzuschalten."
-    auto_silence_first_post_regex: "Regulärer Ausdruck (ohne Groß- und Kleinschreibung), der dafür sorgt dass entsprechende erste Beiträge von Benutzern stummgeschaltet und in die Genehmigungswarteschlange verschoben werden. Beispiel: raging|a[bc]a sorgt dafür, dass Beiträge, die raging, aba oder aca enthalten, zunächst stummgeschaltet werden. Dies betrifft jedoch nur den ersten Beitrag."
+    auto_silence_first_post_regex: "Regex ohne Berücksichtigung der Groß-/Kleinschreibung, die bei Übernahme dazu führt, dass der erste Beitrag des Benutzers stummgeschaltet und an die Genehmigungswarteschlange gesendet wird. Beispiel: wüten|a[bc]a, wird dazu führen, dass alle Posts, die wüten oder aba oder aca enthalten, zuerst stummgeschaltet werden. Gilt nur für den ersten Beitrag."
     reviewable_claiming: "Muss überprüfbarer Inhalt reserviert werden, bevor er bearbeitet werden kann?"
     reviewable_default_topics: "Zeige überprüfbaren Inhalt standardmäßig nach Themen gruppiert."
-    reviewable_default_visibility: "Zeige überpüftbare Elemente nicht, solange sie diese Priorität nicht haben"
+    reviewable_default_visibility: "Zeige überprüfbare Elemente nicht, solange sie diese Priorität nicht haben"
+    reviewable_low_priority_threshold: "Der Prioritätsfilter blendet überprüfbare Elemente aus, die diese Punktzahl nicht erfüllen, es sei denn, der Filter '(any)' wird verwendet."
     high_trust_flaggers_auto_hide_posts: "Neue Benutzerbeiträge werden automatisch ausgeblendet, nachdem sie von einem TL3 + -Benutzer als Spam gekennzeichnet wurden"
     cooldown_hours_until_reflag: "Wie viel Zeit Benutzer warten müssen, bis sie einen Beitrag neu kennzeichnen können"
     reply_by_email_enabled: "Aktviere das Antworten auf Themen via E-Mail."
@@ -1782,10 +1838,11 @@ de:
     blocked_attachment_filenames: "Liste der Schlüsselwörter für die Ablehnung von Anhängen basierend auf dem Dateinamen."
     forwarded_emails_behaviour: "Wie an Discourse weitergeleitete E-Mails behandelt werden"
     always_show_trimmed_content: "Immer den gekürzten Teil von eingehenden E-Mails anzeigen. WARNUNG: lässt möglicherweise E-Mail-Adressen erkennen."
+    trim_incoming_emails: "Schneide einen Teil der eingehenden E-Mails ab, der nicht relevant ist."
     private_email: "Keine Inhalte von Beiträgen oder Themen in E-Mail Titeln oder E-Mail Bodies einschließen. Außerdem werden Digest E-Mails deaktiviert."
-    email_total_attachment_size_limit_kb: "Maximale Gesamtzahl von Dateien an ausgehenden E-Mails. Auf 0 setzen, um das Versenden von Dateianhängen zu deaktivieren."
+    email_total_attachment_size_limit_kb: "Maximale Gesamtgröße der an ausgehende E-Mails angehängten Dateien in KB. Auf 0 setzen, um das Senden von Anhängen zu deaktivieren."
     post_excerpts_in_emails: "Sende in Notifizierungs E-Mails immer Auszüge anstelle vollständiger Beiträge"
-    raw_email_max_length: "Wie viele Zeichen für eingehende E-Mails  gespeichert werden sollen."
+    raw_email_max_length: "Wie viele Zeichen für eingehende E-Mails gespeichert werden sollen."
     raw_rejected_email_max_length: "Wie viele Zeichen für abgelehnte E-Mails gespeichert werden sollen."
     delete_rejected_email_after_days: "Lösche abgelehnte E-Mails, die älter als (n) Tage sind."
     manual_polling_enabled: "Eingehende E-Mails über die API für E-Mail-Antworten annehmen."
@@ -1872,12 +1929,12 @@ de:
     global_notice: "Zeigt allen Besuchern eine DRINGENDE NOTFALL-Meldung in Form eines nicht ausblendbaren, global sichtbaren Banners an. Leere den Inhalt, um sie wieder auszublenden (HTML ist erlaubt)."
     disable_system_edit_notifications: "Unterdrückt Bearbeitungshinweise durch den System-Benutzer, wenn die 'download_remote_images_to_local' Einstellung aktiviert ist."
     notification_consolidation_threshold: "Anzahl von Like- oder Mitgliedschaftsanfragen-Benachrichtigungen, bevor die Benachrichtigungen zu einer einzelnen zusammengefasst werden. Zum Deaktivieren 0 setzen."
-    likes_notification_consolidation_window_mins: "Zeitfenster in Minuten, in dem mehrere Like-Benachrichtigungen zu einer einzelnen Benachrichtigung zusammengefasst werden, sobald der Schwellenwert erreicht wird. Der Schwellenwert kann mittels `SiteSetting.notification_consolidation_threshold` eingestellt werden. "
+    likes_notification_consolidation_window_mins: "Zeitfenster in Minuten, in dem mehrere Like-Benachrichtigungen zu einer einzelnen Benachrichtigung zusammengefasst werden, sobald der Schwellenwert erreicht wird. Der Schwellenwert kann mittels `SiteSetting.notification_consolidation_threshold` eingestellt werden."
     automatically_unpin_topics: "Themen automatisch loslösen, wenn ein Benutzer das Ende erreicht."
     read_time_word_count: "Wörter pro Minute für die Berechnung der geschätzten Lesezeit."
     topic_page_title_includes_category: "Themen-Seite <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>title tag</a> enthält einen Kategorienamen."
     native_app_install_banner_ios: "Zeigt das DiscourseHub Applikationsbanner auf iOS Geräten für Stammgäste (Vertrauensstufe 1 und höher) an."
-    native_app_install_banner_android: "Zeigt das DiscourseHub Applikationsbanner auf Android Geräten für Stammgäste (Vertrauensstufe 1 und höher) an. "
+    native_app_install_banner_android: "Zeigt das DiscourseHub Applikationsbanner auf Android Geräten für Stammgäste (Vertrauensstufe 1 und höher) an."
     app_association_android: "Inhalte vom <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> Endpunkt, für Googles Digital Asset Links API verwendet."
     app_association_ios: "Inhalte vom <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> Endpunkt, zum Anlegen von Universal Links zwischen dieser Sieite und iOS Apps verwendet."
     share_anonymized_statistics: "Anonymisierte Nutzungsdaten teilen."
@@ -1908,7 +1965,7 @@ de:
     show_create_topics_notice: "Administratoren eine Warnmeldung anzeigen, wenn im Forum weniger als 5 öffentlich sichtbare Themen existieren."
     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."
+    prevent_anons_from_downloading_files: "Verhindert, dass anonyme Benutzer Anhänge herunterladen können."
     secure_media: 'Beschränkt den Zugriff auf ALLE Uploads (Bilder, Videos, Audio, Text, PDFs, Zips und andere). Wenn „Login erforderlich“ aktiviert ist, können nur angemeldete Benutzer auf Uploads zugreifen. Andernfalls ist der Zugriff nur für Medienhochladungen in privaten Nachrichten und privaten Kategorien beschränkt. WARNUNG: Diese Einstellung ist komplex und erfordert ein tiefes administratives Verständnis. Siehe <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">das Secure Media Thema auf Meta</a> für Details.'
     secure_media_allow_embed_images_in_emails: "Ermöglicht das Einbetten sicherer Bilder, die normalerweise in E-Mails geschwärzt werden würden, wenn ihre Größe kleiner ist als die Einstellung 'Secure Media max E-Mail eingebettete Bildgröße kb'."
     secure_media_max_email_embed_image_size_kb: "Der Größengrenzwert für sichere Bilder, die in E-Mails eingebettet werden, wenn die Einstellung \"Sichere Medien ermöglichen das Einbetten in E-Mails\" aktiviert ist. Ohne diese Einstellung hat diese Einstellung keine Auswirkung."
@@ -1929,6 +1986,7 @@ de:
     code_formatting_style: "Code-Schaltfläche im Editor wird standardmäßig diesen Formatierungsstil anwenden"
     max_allowed_message_recipients: "Maximale Anzahl von Empfängern in einer Nachricht."
     watched_words_regular_expressions: "Beobachtete Wörter sind reguläre Ausdrücke."
+    enable_diffhtml_preview: "Experimentelle Funktion, die diffHTML verwendet, um die Vorschau zu synchronisieren, anstatt sie vollständig neu zu rendern"
     old_post_notice_days: "Anzahl Tage, bevor eine Beitragsnotiz alt wird"
     new_user_notice_tl: "Minimale Vertrauensstufe, die für das Sehen von Beitrags Benachrichtigungen neuer Benutzer erforderlich ist."
     returning_user_notice_tl: "inimale Vertrauensstufe, die für das Sehen von Beitrags Benachrichtigungen wiederkehrender Benutzer erforderlich ist."
@@ -1937,17 +1995,18 @@ de:
     blur_tl0_flagged_posts_media: "Mit Unschärfe gekennzeichnete Beiträge Bilder, um potenziell NSFW-Inhalte zu verbergen."
     enable_page_publishing: "Erlauben Sie Mitarbeitern, Themen in neuen URLs mit ihrem eigenen Styling zu veröffentlichen."
     show_published_pages_login_required: "Anonyme Benutzer können veröffentlichte Seiten sehen, auch wenn eine Anmeldung erforderlich ist."
+    skip_auto_delete_reply_likes: "Beim automatischen Löschen alter Antworten Beiträge mit mindestens dieser Anzahl von Likes auslassen."
     default_email_digest_frequency: "Wie häufig sollen Benutzer standardmäßig E-Mail-Zusammenfassungen erhalten?"
     default_include_tl0_in_digests: "Beiträge von neuen Benutzern in E-Mail-Zusammenfassungen standardmäßig anzeigen. Benutzer können dies in ihren Einstelllungen ändern."
     default_email_level: "Setze die Standard E-Mail Benachrichtigungs-Stufe für reguläre Themen."
     default_email_messages_level: "Standard E-Mail Benachrichtigungs-Stufe wenn jemand einem Benutzer Nachrichten schickt."
     default_email_mailing_list_mode: "Sende standardmäßig eine E-Mail für jeden neuen Beitrag."
     default_email_mailing_list_mode_frequency: "Benutzer, die den Mailinglisten-Modus einschalten, werden standardmäßig so häufig eine E-Mail erhalten."
-    disable_mailing_list_mode: "Verhindere, dass Benutzer den Mailinglisten-Modus aktivieren können."
+    disable_mailing_list_mode: "Benutzern das Aktivieren des Mailinglisten-Modus verbieten (verhindert, dass E-Mails von Mailinglisten gesendet werden.)"
     default_email_previous_replies: "Standardmäßig vorhergehende Antworten in E-Mails einschließen."
     default_email_in_reply_to: "Standardmäßig einen Anriss des Beitrags, auf den geantwortet wurde, in E-Mails einfügen."
-    default_other_new_topic_duration_minutes: "Zeit wie lange ein Thema als \"Neu\" markiert werden soll. "
-    default_other_auto_track_topics_after_msecs: "Zeit bevor ein Thema automatisch verfolg wird. "
+    default_other_new_topic_duration_minutes: "Zeit wie lange ein Thema als \"Neu\" markiert werden soll."
+    default_other_auto_track_topics_after_msecs: "Zeit bevor ein Thema automatisch verfolg wird."
     default_other_notification_level_when_replying: "Globales Standard-Benachrichtigungslevel, wenn ein Benutzer auf ein Thema antwortet."
     default_other_external_links_in_new_tab: "Öffne externe Links standardmäßig in einem neuen Tab."
     default_other_enable_quoting: "Aktiviere standardmäßig die Zitat-Antwort Funktion für hervorgehobenen Text."
@@ -1973,7 +2032,6 @@ de:
     revoke_api_keys_days: "Anzahl der Tage, bevor ein nicht verwendeter API Schlüssel automatisch zurückgezogen wird (0 für nie)"
     allow_user_api_keys: "Erlaube das Generieren von Benutzer-API-Schlüsseln"
     allow_user_api_key_scopes: "Liste erlaubter Scopes für Benutzer-API-Schlüssel"
-    max_api_keys_per_user: "Maximale Zahl der Benutzer API Anfragen pro Benutzer"
     min_trust_level_for_user_api_key: "Erforderliche Vertrauensstufe für die Generierung von Benutzer API Schlüsseln"
     allowed_user_api_auth_redirects: "Zulässige URL für Authentifizierungs-Umleitung für Benutzer-API-Schlüssel. Das Platzhaltersymbol * kann verwendet werden, um jeden Bestandteil der Adresse zu ersetzen (z.B. www.example.com/*)."
     allowed_user_api_push_urls: "Erlaubte URL für Server-Push zur Benutzer API"
@@ -1983,7 +2041,6 @@ de:
     max_tags_per_topic: "Maximale Anzahl an Schlagwörtern, die einem Thema hinzugefügt werden können."
     max_tag_length: "Die maximale Anzahl von Zeichen, die in einem Schlagwort verwendet werden kann."
     max_tag_search_results: "Maximale Ergebnisanzahl bei der Suche nach Schlagwörtern."
-    show_filter_by_tag: "Zeige eine Dropdown-Liste, um eine Themenliste nach Schlagwort zu filtern."
     max_tags_in_filter_list: "Maximale Anzahl von Schlagwörtern, die in einer Dropdown-Liste angezeigt werden. Es werden die am häufigsten verwendeten Schlagwörter angezeigt."
     tags_sort_alphabetically: "Zeige Schlagwörter in alphabetischer Reihenfolge. Standardmäßig werden sie nach Beliebtheit sortiert."
     tags_listed_by_group: "Zeige Schlagwörter auf der <a href='%{base_path}/tags' target='_blank'>Schlagwort-Seite</a> geordnet nach Schlagwort-Gruppe an."
@@ -1997,6 +2054,7 @@ de:
     governing_law: "Anzuwendendes Recht"
     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."
+    shared_drafts_min_trust_level: "Ermöglichen Sie Benutzern das Anzeigen und Bearbeiten von freigegebenen Entwürfen."
     push_notifications_prompt: "Zeige eine Aufforderung zur Benutzerzustimmung an."
     push_notifications_icon: "Das Abzeichensymbol, das in der Benachrichtigungsecke angezeigt wird. Ein 96 × 96 monochromatisches PNG mit Transparenz wird empfohlen."
     base_font: "Basisschriftart für die meisten Texte auf der Website. Themes können über die `--font-family` CSS-benutzerdefinierte Eigenschaft überschrieben werden."
@@ -2025,6 +2083,7 @@ de:
       invalid_string_min_max: "Anzahl der Zeichen muss zwischen %{min} und %{max} liegen."
       invalid_string_min: "Muss mindestens %{min} Zeichen lang sein."
       invalid_string_max: "Darf nicht länger als %{max} Zeichen sein."
+      invalid_json: "Ungültiges JSON."
       invalid_reply_by_email_address: "Adresse muss '%{reply_key}' enthalten und sich von der E-Mail-Benachrichtigung unterscheiden."
       invalid_alternative_reply_by_email_addresses: "Alle Werte müssen '%{reply_key}' enthalten und sich von der Benachrichtigungsmail unterscheiden."
       pop3_polling_host_is_empty: "Du musst 'pop3 polling host' definieren, um POP3 Abfragen zu aktivieren."
@@ -2038,8 +2097,8 @@ de:
       email_editable_enabled: "Du musst die Einstellung 'email editable' deaktivieren, bevor du diese Einstellung aktivierst."
       staged_users_disabled: "Du musst erst 'vorbereitete Benutzer' aktivieren, bevor du diese Einstellung aktivierst."
       reply_by_email_disabled: "Du musst erst 'Antwort per E-Mail' aktivieren, bevor du diese Einstellung aktivierst."
-      sso_url_is_empty: "Du musst erst eine 'sso url' angeben, bevor du diese Einstellung aktivierst."
-      sso_invite_only: "Du kannst die Einstellungen „enable sso“ und „invite only“ nicht gleichzeitig aktivieren."
+      discourse_connect_url_is_empty: "Du musst eine „Discourse Connect URL“ festlegen, bevor du diese Einstellung aktivierst."
+      discourse_connect_invite_only: "Du kannst DiscourseConnect nicht gleichzeitig aktivieren und einladen."
       enable_local_logins_disabled: "Du musst erst die Einstellung „enable local logins“ aktivieren, bevor du diese Einstellung aktivierst."
       min_username_length_exists: "Sie können die Minimallänge des Benutzernamens länger machen als der kürzeste Benutzername (%{username})."
       min_username_length_range: "Sie können nicht das Minimum größer setzen als das Maximum."
@@ -2048,19 +2107,17 @@ de:
       invalid_hex_value: "Farben müssen als 6stelliger Hexadezimalcode angegeben werden."
       empty_selectable_avatars: "Sie müssen zuerst mindestens zwei auswählbare Avatare hochladen, bevor Sie diese Einstellung aktivieren."
       category_search_priority:
-        very_low_weight_invalid: "Die Gewichtung kann nicht größer als 'category_search_priority_low_weight' sein."
-        low_weight_invalid: "Die Gewichtung kann nicht größer oder gleich 1, oder kleiner als 'category_search_priority_very_low_weight' sein. "
-        high_weight_invalid: "Die Gewichtung kann nicht kleiner oder gleich 1, oder größer als  'category_search_priority_very_high_weight' sein."
-        very_high_weight_invalid: "Die Gewichtung kann nicht kleiner als 'category_search_priority_high_weight' sein. "
+        low_weight_invalid: "Du kannst das Gewicht nicht auf größer oder gleich 1 setzen."
+        high_weight_invalid: "Du kannst das Gewicht nicht auf kleiner oder gleich 1 festlegen."
       allowed_unicode_usernames:
         regex_invalid: "Der reguläre Ausdruck ist ungültig: %{error}"
         leading_trailing_slash: "Der reguläre Ausdruck darf nicht mit einem Schrägstrich beginnen und enden."
       unicode_usernames_avatars: "Die internen System-Profilbilder unterstützten Unicode Benutzernamen nicht."
       list_value_count: "Die Liste muss genau %{count} Werte enthalten."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "SSO-Secret"
+        value: "DiscourseConnect Secret"
   search:
     extreme_load_error: "Die Seite ist extreme unter Last, die Suche ist deaktiviert. Bitte versuche es später noch einmal."
     within_post: "#%{post_number} von %{username}"
@@ -2071,20 +2128,22 @@ de:
     results_page: "Suchergebnisse für '%{term}'"
     audio: "[Audio]"
     video: "[Video]"
-  sso:
-    login_error: "Fehler bei der Anmeldung"
-    not_found: "Dein Konto wurde nicht erkannt. Bitte kontaktiere den Administrator dieser Site."
+  discourse_connect:
+    login_error: "Login Fehler"
+    not_found: "Dein Konto konnte nicht gefunden werden. Bitte wende dich an den Administrator der Website."
     account_not_approved: "Dein Konto wurde noch nicht genehmigt. Du bekommst eine E-Mail, sobald das geschehen ist."
-    unknown_error: "Es besteht ein Problem mit deinem Konto. Bitte kontaktiere den Administrator dieser Site."
-    timeout_expired: "Die Anmeldung ist abgelaufen, bitte versuch dich erneut anzumelden."
-    no_email: "Es wurde keine E-Mail-Adresse angegeben. Bitte kontaktiere den Administrator dieser Seite."
-    blank_id_error: "Die `external_id` wird benötigt, war jedoch leer"
-    email_error: "Ein Konto konnte nicht registriert werden mit der E-Mail-Adresse <b>%{email}</b>. Bitte kontaktiere den Administrator dieser Seite."
-    missing_secret: "SSO Authentifizierung wegen fehlendem Secret fehlgeschlagen. Kontaktiere die Seiten-Aministration, damit dieses Problem behoben wird."
+    unknown_error: "Es liegt ein Problem mit deinem Konto vor. Bitte wende dich an den Administrator der Website."
+    timeout_expired: "Zeitüberschreitung bei der Kontoanmeldung. Bitte versuche erneut dich anzumelden."
+    no_email: "Es wurde keine E-Mail-Adresse angegeben. Bitte wenden dich an den Administrator der Website."
+    blank_id_error: "Die `external_id` ist erforderlich, war aber leer"
+    email_error: "Ein Konto konnte nicht mit der E-Mail-Adresse <b>%{email}</b>registriert werden. Bitte wenden dich an den Administrator der Website."
+    missing_secret: "Die Authentifizierung wegen fehlendem Secret fehlgeschlagen. Kontaktiere die Seiten-Administration, damit dieses Problem behoben wird."
+    invite_redeem_failed: "Einlösung der Einladung fehlgeschlagen. Bitte kontaktiere den Administrator der Website."
   original_poster: "Autor des ersten Beitrags"
   most_posts: "Autor der meisten Beiträge"
   most_recent_poster: "Autor des jüngsten Beitrags"
   frequent_poster: "Autor vieler Beiträge"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "Willkommen bei unserer Community! Dies sind die derzeit beliebtesten Themen."
     not_seen_in_a_month: "Willkommen zurück! Wir haben dich länger nicht gesehen. Während deiner Abwesenheit waren dies die beliebtesten Themen."
@@ -2095,6 +2154,7 @@ de:
     errors:
       different_topics: "Beiträge unterschiedlicher Themen können nicht zusammengeführt werden."
       different_users: "Beiträge unterschiedlicher Benutzer können nicht zusammengeführt werden."
+      max_post_length: "Beiträge können nicht zusammengeführt werden, da die Länge des kombinierten Beitrags länger als erlaubt ist."
   move_posts:
     new_topic_moderator_post:
       one: "Ein Beitrag wurde in ein neues Thema verschoben: %{topic_link}"
@@ -2103,8 +2163,8 @@ de:
       one: "Ein Beitrag wurde in eine neue Nachricht verschoben: %{topic_link}"
       other: "%{count} Beiträge wurden in eine neue Nachricht verschoben: %{topic_link}"
     existing_topic_moderator_post:
-      one: "Ein Beitrag wurde in ein existierendes Thema verschoben: %{topic_link} "
-      other: " %{count} Beiträge wurden in ein existierendes Thema verschoben: %{topic_link} "
+      one: "Ein Beitrag wurde in ein existierendes Thema verschoben: %{topic_link}"
+      other: "%{count} Beiträge wurden in ein existierendes Thema verschoben: %{topic_link}"
     existing_message_moderator_post:
       one: "Ein Beitrag wurde in eine existierende Nachricht verschoben: %{topic_link}"
       other: "%{count} Beiträge wurden in eine existierende Nachricht verschoben: %{topic_link}"
@@ -2218,6 +2278,18 @@ de:
   admin:
     email:
       sent_test: "gesendet!"
+    user:
+      merge_user:
+        updating_username: "Aktualisiere Benutzername..."
+        changing_post_ownership: "Ändern des Beitragbesitzers ..."
+        merging_given_daily_likes: "Zusammenführen gegebener täglicher Likes ..."
+        merging_post_timings: "Beitragszeiten zusammenführen ..."
+        merging_user_visits: "Zusammenführen von Benutzerbesuchen ..."
+        updating_site_settings: "Site-Einstellungen aktualisieren..."
+        updating_user_stats: "Aktualisiere Benutzerstatistik..."
+        merging_user_attributes: "Benutzerattribute zusammenführen..."
+        updating_user_ids: "Aktualisiere Benutzer-Ids..."
+        deleting_source_user: "Lösche Quellbenutzer..."
   user:
     deactivated: "Deaktiviert wegen zu vielen unzustellbaren E-Mails an '%{email}'."
     deactivated_by_staff: "Deaktiviert vom Team"
@@ -2255,6 +2327,8 @@ de:
       fixed_primary_email: "Primäre E-Mail-Adresse für vorbereitetes Benutzerkonto korrigiert"
       same_ip_address: "Gleiche IP-Adresse (%{ip_address}) wie andere Benutzer"
       inactive_user: "Deaktivierter Benutzer"
+      reviewable_reject_auto: "Überprüfbare Elemente in der Warteschlange automatisch verarbeiten"
+      reviewable_reject: "Überprüfbarer Benutzer abgelehnt"
     email_in_spam_header: "Die erste E-Mail des Benutzers wurde als Spam gekennzeichnet"
     already_silenced: "Benutzer wurde bereits von %{staff} %{time_ago} stumm geschaltet."
     already_suspended: "Benutzer wurde bereits von %{staff} %{time_ago}gesperrt."
@@ -2421,28 +2495,28 @@ de:
     text_body_template: |
       Hurra, eine neue Version von [Discourse](https://www.discourse.org) ist verfügbar!
 
-      Ihre Version: %{installed_version}
+      Deine Version: %{installed_version}
       Neue Version: **%{new_version}**
 
-      - Upgrade mit unserem einfachen ** [Ein-Klick-Browser-Upgrade] (%{base_url}/admin/upgrade)**
+      - Aktualisierung mit dem einfachen **[Ein-Klick-Browser-Upgrade](%{base_url}/admin/upgrade)** durchführen
 
-      - Sehen Sie sich die Neuerungen in den [Versionshinweisen] (https://meta.discourse.org/tag/release-notes) an oder sehen Sie sich das [rohe GitHub Changelog] an (https://github.com/discourse/discourse/commits/master)
+      - Sieh dir die Neuerungen in den [Versionshinweisen](https://meta.discourse.org/tag/release-notes) an oder wirf einen Blick auf alle [Änderungen bei GitHub](https://github.com/discourse/discourse/commits/master)
 
-      - Visit [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Unterstützung für den Diskurs
+      - Besuche [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Unterstützung rund um Discourse
   new_version_mailer_with_notes:
     title: "Neue Version mit Versionshinweisen"
     subject_template: "[%{email_prefix}] Update verfügbar"
     text_body_template: |
       Hurra, eine neue Version von [Discourse](https://www.discourse.org) ist verfügbar!
 
-      Ihre Version: %{installed_version}
+      Deine Version: %{installed_version}
       Neue Version: **%{new_version}**
 
-      - Upgrade mit unserem einfachen ** [Ein-Klick-Browser-Upgrade] (%{base_url}/admin/upgrade)**
+      - Aktualisierung mit dem einfachen **[Ein-Klick-Browser-Upgrade](%{base_url}/admin/upgrade)** durchführen
 
-      - Sehen Sie sich die Neuerungen in den [Versionshinweisen] (https://meta.discourse.org/tag/release-notes) an oder sehen Sie sich das [rohe GitHub Changelog] an (https://github.com/discourse/discourse/commits/master)
+      - Sieh dir die Neuerungen in den [Versionshinweisen](https://meta.discourse.org/tag/release-notes) an oder wirf einen Blick auf alle [Änderungen bei GitHub](https://github.com/discourse/discourse/commits/master)
 
-      - Visit [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Unterstützung für Diskurs
+      - Besuche [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Unterstützung rund um Discourse
 
       ### Versionshinweise
 
@@ -2480,7 +2554,7 @@ de:
 
         Falls er jedoch noch einmal von der Community verborgen wird, bleibt er dies, bis ein Teammitglied ihn prüft.
 
-        Für zusätzliche Hinweise informiere dich bitte über unsere  [Community Richtlinien](%{base_url}/guidelines).
+        Für zusätzliche Hinweise informiere dich bitte über unsere [Community Richtlinien](%{base_url}/guidelines).
     post_hidden_again:
       title: "Beitrag wieder ausgeblendet"
       subject_template: "Beitrag ausgeblendet wegen Community-Meldungen, Team wurde informiert"
@@ -2496,6 +2570,19 @@ de:
         Die Community hat den Beitrag gemeldet und er ist nun verborgen. **Da er mehr als einmal verborgen wurde, wird er es bleiben, bis ein Teammitglied ihn prüft.**
 
         Für zusätzliche Hinweise informiere dich bitte über unsere [Community Richtlinien](%{base_url}/guidelines).
+    queued_by_staff:
+      title: "Beitrag muss genehmigt werden"
+      subject_template: "Beitrag vom Team ausgeblendet, warte auf Genehmigung"
+      text_body_template: |
+        Hallo,
+
+        Dies ist eine automatisierte Nachricht von %{site_name} , um dich darüber zu informieren, dass dein Beitrag ausgeblendet wurde.
+
+        <%{base_url}%{url}>
+
+        Dein Beitrag bleibt verborgen, bis ein Teammitglied ihn überprüft.
+
+        Weitere Informationen findest du in unseren [community guidelines](%{base_url}/guidelines).
     flags_disagreed:
       title: "Gemeldeter Beitrag vom Team wiederhergestellt"
       subject_template: "Gemeldeter Beitrag vom Team wiederhergestellt"
@@ -2523,13 +2610,11 @@ de:
 
         Dieser Beitrag wurde von der Community gemeldet und ein Team-Mitglied hat entschieden, ihn zu entfernen.
 
-        [details="Klicke, um den gelöschten Beitrag auszuklappen"]
         ``` markdown
         %{flagged_post_raw_content}
         ```
-        [/details]
 
-        Bitte sieh Dir unsere [Verhaltensregeln](%{base_url}/guidelines) für weitere Informationen an.
+        Bitte sieh dir unsere [Verhaltensregeln](%{base_url}/guidelines) für weitere Informationen an.
     usage_tips:
       text_body_template: |
         Für einige schnelle Tipps, um als neuer Benutzer loszulegen, [schaue einmal diesen Blog-Beitrag an](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2580,11 +2665,13 @@ de:
 
         [prefs]: %{user_preferences_url}
     tl2_promotion_message:
-      subject_template: "Herzlichen Glückwunsch zur Beförderung ihrer Vertrauensstufe!"
+      subject_template: "Herzlichen Glückwunsch zur Beförderung deiner Vertrauensstufe!"
       text_body_template: |
-        Wir haben Sie auf eine [Vertrauensstufe] befördert (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+        Wir haben dich um eine weitere [Vertrauensstufe](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) befördert!
 
-        Wir laden Sie ein, sich weiter zu engagieren - wir freuen uns, Sie bei uns zu haben.
+        Als erfahrener Benutzer weißt du [diese Liste nützlicher Tipps und Tricks](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/) vielleicht zu schätzen.
+
+        Wir laden dich ein, dich weiter zu engagieren – es ist schön, dass du da bist.
     backup_succeeded:
       title: "Backup erfolgreich"
       subject_template: "Sicherung erfolgreich abgeschlossen"
@@ -2677,7 +2764,7 @@ de:
       text_body_template: |
         Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Du hast nicht die erforderliche Vertrauensstufe, um neue Themen an diese E-Mail-Adresse zu schreiben. Wenn du denkst, dass dies ein Fehler ist, dann [kontaktiere ein Team-Mitglied]%{base_url}/about).
+        Du hast nicht die erforderliche Vertrauensstufe, um neue Themen an diese E-Mail-Adresse zu schreiben. Wenn du denkst, dass dies ein Fehler ist, dann [kontaktiere ein Team-Mitglied](%{base_url}/about).
     email_reject_user_not_found:
       title: "E-Mail abgelehnt weil Benutzer nicht gefunden"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Benutzer nicht gefunden"
@@ -2742,14 +2829,14 @@ de:
       text_body_template: |
         Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Dein Benutzerkonto hat nicht die erforderlichen Rechte, um neue Themen in dieser Kategorie zu erstellen. Wenn du denkst, dass dies ein Fehler ist, dann [kontaktiere ein Team-Mitglied]%{base_url}/about).
+        Dein Benutzerkonto hat nicht die erforderlichen Rechte, um neue Themen in dieser Kategorie zu erstellen. Wenn du denkst, dass dies ein Fehler ist, dann [kontaktiere ein Team-Mitglied](%{base_url}/about).
     email_reject_strangers_not_allowed:
       title: "E-Mail abgelehnt weil Zugriff nicht erlaubt"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Zugriff ungültig"
       text_body_template: |
         Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Die Kategorie, an die du diese E-Mail geschickt hast, erlaubt nur Antworten von Benutzern mit gültigen Benutzerkonten und bekannten E-Mail-Adressen. Wenn du denkst, dass dies ein Fehler ist, dann [kontaktiere ein Team-Mitglied]%{base_url}/about).
+        Die Kategorie, an die du diese E-Mail geschickt hast, erlaubt nur Antworten von Benutzern mit gültigen Benutzerkonten und bekannten E-Mail-Adressen. Wenn du denkst, dass dies ein Fehler ist, dann [kontaktiere ein Team-Mitglied](%{base_url}/about).
     email_reject_invalid_post:
       title: "E-Mail abgelehnt weil ungültiger Beitrag"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Beitrag fehlerhaft"
@@ -2794,9 +2881,17 @@ de:
       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 Ihre E-Mail-Nachricht an %{destination} (mit dem Titel %{former_title}) hat nicht funktioniert.
+        Es tut uns leid, aber Deine E-Mail an %{destination} (Titel %{former_title}) hat nicht funktioniert.
 
-        Verwenden Sie mehr als eine E-Mail-Adresse? Haben Sie von einer anderen E-Mail-Adresse aus geantwortet? Für E-Mail-Antworten müssen Sie bei der Beantwortung dieselbe E-Mail-Adresse verwenden. Alternativ wurde möglicherweise der Message-ID-Header in der E-Mail geändert.
+        Hier sind einige Dinge zu überprüfen:
+
+          - Verwendest Du mehr als eine E-Mail-Adresse? Hast Du von einer anderen E-Mail-Adresse als der ursprünglich verwendeten geantwortet? E-Mail-Antworten erfordern, dass Du dieselbe E-Mail-Adresse verwendest, wenn Du antwortest.
+
+          - Hat Deine E-Mail-Software die Antwort-an: E-Mail-Adresse beim Beantworten richtig verwendet? Leider sendet manche E-Mail-Software fehlerhaft Antworten an die Von: Adresse, die nicht funktionieren wird.
+
+          - Wurde der Nachrichten-ID-Header in der E-Mail geändert? Die Nachrichten-ID muss konsistent und unverändert sein.
+
+        Brauchst Du weitere Hilfe? Kontaktiere uns über die Kontaktdetails unter %{base_url}/about
     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"
@@ -2824,7 +2919,7 @@ de:
       text_body_template: |
         Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Deine E-Mail war als "auto generated" markiert, was bedeutet, dass sie automatisch von einem Computer erstellt und nicht von einem Menschen verfasst wurde; wir können diese Art von E-Mails nicht akzeptieren. Wenn du denkst, dass dies ein Fehler ist, dann [kontaktiere ein Team-Mitglied]%{base_url}/about).
+        Deine E-Mail war als "auto generated" markiert, was bedeutet, dass sie automatisch von einem Computer erstellt und nicht von einem Menschen verfasst wurde; wir können diese Art von E-Mails nicht akzeptieren. Wenn du denkst, dass dies ein Fehler ist, dann [kontaktiere ein Team-Mitglied](%{base_url}/about).
     email_reject_unrecognized_error:
       title: "E-Mail abgelehnt weil unbekannter Fehler"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Unbekannter Fehler"
@@ -2888,7 +2983,7 @@ de:
       text_body_template: |
         Hallo,
 
-        dies ist eine automatische Nachricht von %{site_name}, um dich darüber zu informieren, dass  @%{username} von %{ignores_threshold} Benutzern ignoriert wird. Dies könnte auf ein in deiner Community entstehendes Problem hindeuten.
+        dies ist eine automatische Nachricht von %{site_name}, um dich darüber zu informieren, dass @%{username} von %{ignores_threshold} Benutzern ignoriert wird. Dies könnte auf ein in deiner Community entstehendes Problem hindeuten.
 
         Eventuell möchtest du [letzte Beiträge](%{base_url}/u/%{username}/summary) dieses Benutzers prüfen, und potentielle weitere Benutzer im [ignorierte und stummgeschaltete Benutzer-Report](%{base_url}/admin/reports/top_ignored_users).
 
@@ -2963,7 +3058,7 @@ de:
         one: "Es gibt einen nicht freigegebenen Benutzer"
         other: "Es gibt %{count} nicht freigegebene Benutzer"
       text_body_template: |
-        Es warten neuen Benutzer auf ihre Freigabe.[Bitte überprüfe diese im Administrationsbereich]
+        Es warten neuen Benutzer auf ihre Freigabe (oder Ablehnung) bevor sie auf dieses Forum zugreifen können.
 
         [Bitte überprüfe diese](%{base_url}/review).
     download_remote_images_disabled:
@@ -2973,7 +3068,12 @@ de:
     dashboard_problems:
       title: "Dashboard-Probleme"
       subject_template: "Neue Ratschläge auf deinem Website-Dashboard"
-      text_body_template: "Basierend auf deinen aktuellen Seiteneinstellungen haben wir  einige neue Ratschläge und Empfehlungen für dich. \n\n[Besuche das Dashboard deiner Seite](%{base_url}/admin), um sie zu sehen.\n\nSollte im Dashboard nichts sichtbar sein, hat bereits ein anderes Teammitglied auf die Ratschläge reagiert. Eine Liste der Team Handlungen finden sich in den  [Team Handlungs Logs](%{base_url}/admin/logs/staff_action_logs).\n"
+      text_body_template: |
+        Basierend auf deinen aktuellen Seiteneinstellungen haben wir einige neue Ratschläge und Empfehlungen für dich.
+
+        [Besuche das Dashboard deiner Seite](%{base_url}/admin), um sie zu sehen.
+
+        Sollte im Dashboard nichts sichtbar sein, hat bereits ein anderes Teammitglied auf die Ratschläge reagiert. Eine Liste der Team Handlungen finden sich in den [Team Handlungs Logs](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Du bist ein neuer Benutzer des Monats!"
       subject_template: "Du bist ein neuer Benutzer des Monats!"
@@ -3218,20 +3318,16 @@ de:
       title: "Konto gesperrt"
       subject_template: "[%{email_prefix}] Dein Konto wurde gesperrt"
       text_body_template: |
-        Du wurdest vom Forum gesperrt bis %{suspended_till}.
+        Du wurdest vom Forum bis zum %{suspended_till}gesperrt.
 
-        %{reason}
-
-        %{message}
+        Grund - %{reason}
     account_silenced:
       title: "Konto stummgeschaltet"
       subject_template: "[%{email_prefix}] Dein Konto wurde stummgeschaltet"
       text_body_template: |
-        Du wurdest im Forum stummgeschaltet bis %{silenced_till}.
+        Du wurdest vom Forum bis zum %{silenced_till} stumm geschaltet.
 
-        %{reason}
-
-        %{message}
+        Grund - %{reason}
     account_exists:
       title: "Konto existiert bereits"
       subject_template: "[%{email_prefix}] Konto existiert bereits"
@@ -3375,7 +3471,7 @@ de:
 
         %{new_email}
     signup_after_approval:
-      title: "Konto bestätigen nach Genehmigung"
+      title: "Anmelden nach Genehmigung"
       subject_template: "Dein Konto bei %{site_name} wurde genehmigt!"
       text_body_template: |
         Willkommen bei %{site_name}!
@@ -3392,6 +3488,13 @@ de:
         Wir glauben an [zivilisiertes Community-Verhalten](%{base_url}/guidelines) zu jeder Zeit.
 
         Genieße deinen Aufenthalt!
+    signup_after_reject:
+      title: "Anmelden nach Ablehnung"
+      subject_template: "Du wurdest von %{site_name} abgelehnt"
+      text_body_template: |
+        Ein Team-Mitglied hat dein Konto bei %{site_name} abgelehnt.
+
+        %{reject_reason}
     signup:
       title: "Konto bestätigen nach Anmeldung"
       subject_template: "[%{email_prefix}] Bestätige dein neues Konto"
@@ -3429,8 +3532,16 @@ de:
         Wenn du das warst, hervorragend! Es gibt nichts anderes, was du tun musst.
 
         Wenn du das nicht gewesen bist, [überprüfe bitte deine aktiven Sitzungen](%{base_url}/my/preferences/account) und erwäge, dein Passwort zu ändern.
+    post_approved:
+      title: "Dein Beitrag wurde genehmigt"
+      subject_template: "[%{site_name}] Dein Beitrag wurde genehmigt"
+      text_body_template: |
+        Hallo,
+
+        dies ist eine automatisierte Nachricht von %{site_name} , um dich darüber zu informieren, dass [dein Beitrag] (%{base_url}%{post_url}) genehmigt wurde.
   page_forbidden:
     title: "Hoppla! Diese Seite ist privat."
+  site_setting_missing: "„%{name}“ Site-Einstellung muss festgelegt werden."
   page_not_found:
     title: "Hoppla! Diese Seite existiert nicht oder ist privat."
     popular_topics: "Beliebt"
@@ -3455,7 +3566,7 @@ de:
     unauthorized: "Entschuldigung, die Datei die du hochladen möchtest ist nicht erlaubt (erlaubte Dateiendungen sind: %{authorized_extensions})."
     pasted_image_filename: "Hinzugefügtes Bild"
     store_failure: "Hochladen von #%{upload_id} für Benutzer #%{user_id} ist fehlgeschlagen."
-    file_missing: "Bitte wähle eine Datei zum Hochladen aus. "
+    file_missing: "Bitte wähle eine Datei zum Hochladen aus."
     empty: "Entschuldige, aber die angegebene Datei ist leer."
     png_to_jpg_conversion_failure_message: "Ein Fehler ist aufgetreten bei der Umwandlung von PNG nach JPG."
     optimize_failure_message: "Beim Optimieren des hochgeladenen Bildes ist ein Fehler aufgetreten."
@@ -3476,7 +3587,7 @@ de:
     exceeded_emails_limit: "max_emails_per_day_per_user überschritten"
     exceeded_bounces_limit: "bounce_score_threshold wurde überschritten"
     mailing_list_no_echo_mode: "Mailinglisten-Benachrichtigung für eigene Beiträge deaktivieren"
-    user_email_no_user: "Kann Benutzer mit ID %{user_id} nicht finden "
+    user_email_no_user: "Kann Benutzer mit ID %{user_id} nicht finden"
     user_email_post_not_found: "Kann Beitrag mit ID %{post_id} nicht finden"
     user_email_anonymous_user: "Benutzer ist anonym"
     user_email_user_suspended_not_pm: "Benutzer ist gesperrt, keine Nachricht"
@@ -3888,6 +3999,7 @@ de:
     mass_award:
       errors:
         invalid_csv: In Zeile %{line_number}ist ein Fehler aufgetreten. Bitte bestätigen Sie, dass die CSV eine E-Mail pro Zeile hat.
+        badge_disabled: Bitte aktivieren Sie zuerst das %{badge_name} -Abzeichen.
     editor:
       name: Bearbeiter
       description: Hat den ersten Beitrag bearbeitet
@@ -3900,7 +4012,7 @@ de:
         Dieses Abzeichen wird verliehen, wenn du das erste Mal einen Wiki-Beitrag bearbeitest.
     basic_user:
       name: Anwärter
-      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Ermöglicht</a> das Nutzen alle wesentlichen Community-Funktionen
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Ermöglicht</a> das Nutzen aller wesentlichen Community-Funktionen
       long_description: |
         Dieses Abzeichen wird verliehen, wenn du Vertrauensstufe 1 erreichst. Danke, dass du dabeigeblieben bist und ein paar Themen gelesen hast um zu lernen, worum es in unserer Community geht. Für dich gelten die Einschränkungen für neue Nutzer nicht mehr und du hast nun Zugriff auf alle wichtigen Funktionen, beispielsweise persönliche Nachrichten, die Melden-Funktion, das Bearbeiten von Wiki-Beiträgen und die Fähigkeit, mehrere Bilder und Links in Beiträgen zu verwenden.
     member:
@@ -3982,7 +4094,7 @@ de:
       name: Erster Like
       description: Hat einen Beitrag mit „Gefällt mir“ markiert
       long_description: |
-        Das Abzeichen wird verliehen, wenn du das erste Mal auf die :heart:-Schaltfläche unter einem Beitrag klickst. Beiträge mit „Gefällt mir“ zu markieren, ist eine tolle Art, den Community-Kollegen wissen zu lassen, dass sein Beitrag interessant, nützlich, cool oder witzig war. Teile die Liebe!
+        Das Abzeichen wird verliehen, wenn du das erste Mal auf die :heart:-Schaltfläche unter einem Beitrag klickst. Beiträge mit „Gefällt mir“ zu markieren ist eine tolle Art, um Mitglieder wissen zu lassen, dass ihr Beitrag interessant, nützlich, cool oder witzig war. Teile die Liebe!
     first_flag:
       name: Erste Meldung
       description: Hat einen Beitrag gemeldet
@@ -4145,7 +4257,7 @@ de:
     restricted_tag_remove_disallowed: 'Sie können das Schlagwort "%{tag} " nicht entfernen.'
     minimum_required_tags:
       one: "Du muss mindestens %{count} Schlagwort auswählen."
-      other: "Du musst mindestens %{count} Schlagwörter auswählen. "
+      other: "Du musst mindestens %{count} Schlagwörter auswählen."
     upload_row_too_long: "Die CSV-Datei sollte ein Schlagwort pro Zeile haben. Optional kann das Schlagwort von einem Komma und dem Namen einer Schlagwortgruppe gefolgt sein."
     forbidden:
       invalid:
@@ -4158,8 +4270,8 @@ de:
       synonym: 'Synonyme sind nicht erlaubt. Verwenden Sie stattdessen "%{tag_name}".'
       has_synonyms: '"%{tag_name}" kann nicht verwendet werden, da es Synonyme hat.'
     required_tags_from_group:
-      one: "Sie müssen mindestens %{count} %{tag_group_name} Schlagwort enthalten."
-      other: "Sie müssen mindestens %{count} %{tag_group_name} Schlagwörter enthalten."
+      one: "Du musst mindestens %{count} %{tag_group_name} Schlagwort hinzufügen. Die Schlagworte in dieser Gruppe sind: %{tags}."
+      other: "Du musst mindestens %{count} %{tag_group_name} Schlagwörter einschließen. Die Schlagwörter in dieser Gruppe sind: %{tags}."
     invalid_target_tag: "kann kein Synonym für ein Synonym sein"
     synonyms_exist: "ist nicht erlaubt, solange Synonyme existieren"
   rss_by_tag: "Themen mit dem Schlagwort %{tag}"
@@ -4251,7 +4363,7 @@ de:
             description: "Alle automatischen Discourse-Nachrichten werden von diesem Benutzer geschickt, wie zum Beispiel Warnungen zu Meldungen und Benachrichtigungen über den Abschluss von Sicherungen."
       corporate:
         title: "Organisation"
-        description: "Diese Informationen werden einfügt in deine <a href='%{base_path}/tos' target='blank'>Nutzungsbedingungen</a>. Dies ist ein Thema, das du in der Team-Kategorie bearbeiten kannst. Wenn du keine Firma hast, kannst du diesen Schritt einfach überspringen. "
+        description: "Diese Informationen werden einfügt in deine <a href='%{base_path}/tos' target='blank'>Nutzungsbedingungen</a>. Dies ist ein Thema, das du in der Team-Kategorie bearbeiten kannst. Wenn du keine Firma hast, kannst du diesen Schritt einfach überspringen."
         fields:
           company_name:
             label: "Firmenname"
@@ -4290,7 +4402,7 @@ de:
             description: "Icon, um deine Seite in Browsern zu repräsentieren, das in kleinen Größen gut aussieht. Empfohlene Formate sind PNG oder JPG. Wir werden standardmäßig das quadratische Logo verwenden."
           large_icon:
             label: "Großes Icon"
-            description: "Icon, um deine Seite auf modernen Geräten zu repräsentieren, das in größeren Größen gut aussieht. Idealerweise größer als 512 x 512. Wir werden standardmäßig das quadratische Logo verwenden. "
+            description: "Icon, um deine Seite auf modernen Geräten zu repräsentieren, das in größeren Größen gut aussieht. Idealerweise größer als 512 x 512. Wir werden standardmäßig das quadratische Logo verwenden."
       homepage:
         description: "Wir empfehlen, die aktuellen Themen auf deiner Startseite anzuzeigen, aber du kannst dich auch dafür entscheiden, Kategorien (Gruppen von Themen) auf der Startseite anzuzeigen, wenn dir das lieber ist."
         title: "Homepage"
@@ -4311,9 +4423,6 @@ de:
                 label: "Kategorie-Boxen"
               categories_boxes_with_topics:
                 label: "Kategorie-Boxen mit Themen"
-      emoji:
-        title: "Emoji"
-        description: "Welches Emoji-Design bevorzugst du für deine Community? Du kannst später jederzeit mehr benutzerdefinierte Emoji einfügen unter Administration, Anpassen, Emoji."
       invites:
         title: "Team einladen"
         description: "Du hast es fast geschafft! Lass’ uns ein paar Leute einladen, die dabei helfen <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>eure Diskussionen anzuregen</a> mit interessanten Themen und Beiträgen, um deine Community zu starten."
@@ -4354,6 +4463,7 @@ de:
       restored: Wiederhergestellt
   reviewables:
     already_handled: "Vielen Dank, aber wir haben diesen Beitrag bereits überprüft und festgestellt, dass er nicht erneut markiert werden muss."
+    already_handled_and_user_not_exist: "Danke, aber jemand hat es bereits überprüft und dieser Benutzer existiert nicht mehr."
     priorities:
       low: "Niedrig"
       medium: "Mittel"
@@ -4372,8 +4482,8 @@ de:
       trust_level: "Antworten von Benutzern in niedrigen Vertrauensstufen müssen von Team-Mitgliedern genehmigt werden. Siehe `approve_unless_trust_level`."
       new_topics_unless_trust_level: "Themen von Benutzern in niedrigen Vertrauensstufen müssen von Team-Mitgliedern genehmigt werden. Siehe `approve_new_topics_unless_trust_level`."
       fast_typer: "Ein neuer Benutzer hat seinen ersten Beitrag verdächtig schnell getippt, Verdacht auf Bot oder Spammer-Verhalten. Siehe `min_first_post_typing_time`."
-      auto_silence_regexp: "Neuer Benutzer, dessen erster Beitrag der `auto_silence_first_post_regex` entspricht."
-      watched_word: "Dieser Beitrag enthielt ein beobachtetes Wort. Siehe deine <a href='%{base_url}/admin/logs/watched_words'>Liste beobachteter Wörter</a>."
+      auto_silence_regexp: "Neuer Benutzer, dessen erster Beitrag mit der Einstellung „auto_silence_first_post_regex“ übereinstimmt."
+      watched_word: "Dieser Beitrag enthielt ein beobachtetes Wort. Siehe deine <a href='%{base_url}/admin/customize/watched_words'>Liste der beobachteten Wörter</a>."
       staged: "Neue Themen und Beiträge für aufgeführte Benutzer müssen von Team-Mitgliedern genehmigt werden. Siehe `approve_unless_staged`."
       category: "Beiträge in dieser Kategorie benötigen manuelle Genehmigung von Team-Mitgliedern. Siehe in den Kategorie-Einstellungen."
       must_approve_users: "Alle neuen Benutzer müssen von Team-Mitgliedern bestätigt werden. Siehe `must_approve_users`. "
@@ -4382,6 +4492,7 @@ de:
       email_spam: "Diese E-Mail wurde durch den in `email_in_spam_header` definierten Header als Spam gekennzeichnet."
       suspect_user: "Dieser neue Benutzer hat Profilinformationen eingegeben, ohne irgendwelche Themen oder Beiträge zu lesen, was stark darauf hindeutet, dass sie ein Spammer sein könnten. Siehe `approve_suspect_users`."
       contains_media: "Dieser Beitrag enthält eingebettete Medien. Siehe `review_media_unless_trust_level`."
+      queued_by_staff: "Ein Team-Mitglied ist der Meinung, dass dieser Beitrag überprüft werden muss. Bis dahin wird er versteckt bleiben."
     actions:
       agree:
         title: "Zustimmen..."
@@ -4451,6 +4562,17 @@ de:
           description: "Der Benutzer wird gelöscht, und wir blockieren seine IP und E-Mail Adresse."
       reject:
         title: "Ablehnen"
+        bundle_title: "Ablehnen..."
+      reject_and_suspend:
+        title: "Benutzer ablehnen und sperren"
+      reject_and_silence:
+        title: "Benutzer ablehnen und stummschalten"
+      reject_and_delete:
+        title: "Den Beitrag ablehnen und löschen"
+      reject_and_keep_deleted:
+        title: "Beitrag gelöscht lassen"
+      approve_and_restore:
+        title: "Beitrag genehmigen und wiederherstellen"
       delete_user:
         title: "Benutzer löschen"
         confirm: "Möchtest du diesen Benutzer wirklich löschen? Dies wird alle seien Beiträge löschen und seine E-Mail-Adresse und IP-Adresse sperren."
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 1510b0c8e3..14f992a082 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -39,6 +39,7 @@ el:
   title: "Discourse"
   topics: "Νήματα"
   posts: "αναρτήσεις"
+  views: "προβολές"
   loading: "Φόρτωση"
   powered_by_html: 'Powered by Discourse, best viewed with JavaScript enabled'
   sign_up: "Εγγραφείτε"
@@ -50,6 +51,8 @@ el:
   remove_posts_deleted_by_author: "Διαγράφηκε από τον συγγραφέα"
   redirect_warning: "Δε μπορέσαμε να επαληθεύσουμε ότι ο σύνδεσμος που επιλέξατε ήταν πράγματι αναρτημένος στο forum. Αν θέλετε να προχωρήσετε ούτως ή άλλως, επιλέξτε τον παρακάτω σύνδεσμο."
   on_another_topic: "Σε άλλο θέμα"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} από %{username}"
   themes:
     bad_color_scheme: "Δεν είναι δυνατή η ενημέρωση του θέματος, μη έγκυρη παλέτα χρωμάτων"
     other_error: "Κάτι πήγε στραβά κατά την ενημέρωση του θέματος"
@@ -156,7 +159,6 @@ el:
         one: έχει λάθος μήκος (πρέπει να είναι %{count} χαρακτήρα)
         other: έχει λάθος μήκος (πρέπει να είναι %{count} χαρακτήρες)
       other_than: "πρέπει να μην είναι %{count}"
-      sso_overrides_username: "Το όνομα χρήστη πρέπει να ενημερωθεί από την πλευρά του παρόχου SSO, καθώς είναι ενεργοποιημένη η ρύθμιση «sso_overrides_username`."
     template:
       body: ! "Παρουσιάστηκαν προβλήματα με τα παρακάτω πεδία:"
       header:
@@ -182,10 +184,11 @@ el:
   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>Έχετε σχεδόν τελειώσει! Στείλαμε ένα email ενεργοποίησης στη διεύθυνση email σας. Παρακαλούμε ακολουθήστε τις οδηγίες στο μήνυμα για να ενεργοποιήσετε τον λογαριασμό σας.</p><p>Εάν δε φτάσει, ελέγξτε τον φάκελο ανεπιθύμητων μηνυμάτων.</p>"
     cant_invite_to_group: "Δεν επιτρέπεται να προσκαλέσετε χρήστες σε συγκεκριμένες ομάδες. Βεβαιωθείτε ότι είστε ιδιοκτήτης των ομάδων στις οποίες προσπαθείτε να προσκαλέσετε."
+    disabled_errors:
+      invalid_access: "Δεν έχεις δικαίωμα να δεις τους πόρους που ζήτησες."
   bulk_invite:
     file_should_be_csv: "To ανεβασμένο αρχείο πρέπει να έχει μορφή csv."
     max_rows: "Οι πρώτες %{max_bulk_invites} προσκλήσεις έχουν σταλεί. Δοκιμάστε να χωρίσετε το αρχείο σε μικρότερα μέρη."
@@ -283,6 +286,9 @@ el:
   topics_in_category: "Νήματα στην κατηγορία '%{category}'"
   rss_posts_in_topic: "RSS feed του '%{topic}'"
   rss_topics_in_category: "Ροή RSS των νημάτων στην κατηγορία '%{category}'"
+  rss_num_posts:
+    one: "%{count} ανάρτηση"
+    other: "%{count} αναρτήσεις"
   read_full_topic: "Διαβάστε όλο το νήμα"
   private_message_abbrev: "Μνμ"
   rss_description:
@@ -306,10 +312,13 @@ el:
   excerpt_image: "εικόνα"
   bookmarks:
     reminders:
+      at_desktop: "Την επόμενη φορά που θα είμαι στην επιφάνεια εργασίας μου"
       later_today: "Αργότερα σήμερα"
+      next_business_day: "Επόμενη εργάσιμη ημέρα"
       tomorrow: "Αύριο"
       next_week: "Την άλλη εβδομάδα"
       next_month: "Τον άλλο μήνα"
+      custom: "Προσαρμοσμένη ημερομηνία και ώρα"
   groups:
     errors:
       can_not_modify_automatic: "Δεν μπορείς να τροποποιήσεις μια αυτόματη ομάδα"
@@ -334,28 +343,6 @@ el:
     until_posts:
       one: "%{count} ανάρτηση"
       other: "%{count} αναρτήσεις"
-    "new-topic": |2
-
-      Καλώς ήρθατε στην %{site_name} &mdash. **ευχαριστούμε που αρχίσατε μιά νέα συνομιλία!**
-
-      - Είστε σίγουροι οτι ο τίτλος παρουσιάζει ενδιαφέρον; Είναι αντιπροσωπευτικός του περιεχομένου του νήματος;
-
-      - Ποιος θα ενδιαφερόταν για αυτό; Γιατί αυτό έχει σημασία; Τί είδους απαντήσεις περιμένετε;
-
-      - Συμπεριλάβετε κοινές λέξεις στο νήμα σας έτσι ώστε να μπορούν να το *βρουν* οι άλλοι. Για να κατηγοριοποιήσετε το νήμα σας με άλλα παρόμοια νήματα, επιλέξτε μια κατηγορία.
-
-      - Για περισσότερα, [δείτε τον οδηγό χρήσης της κοινότητάς μας](%{base_path}/guidelines). Αυτός ο πίνακας θα παρουσιαστεί μόνο για την πρώτη σας %{education_posts_text}
-    "new-reply": |2
-
-      Καλώς ήρθατε στην %{site_name} &mdash; **ευχαριστούμε για την συνεισφορά σας**
-
-      - Βελτιώνει/προχωράει η απάντηση σας την συζήτηση με κάποιο τρόπο;
-
-      - Να είστε ευγενικοί με όλους τους φίλους μέλη της κοινότητας μας.
-
-      Η εποικοδομητική κριτική είναι ευπρόσδεκτη, αλλά να γίνεται κριτική σε *ιδέες*, όχι ανθρώπους.
-
-      Για περισσότερες πληροφορίες, [δείτε τις οδηγίες της κοινότητας μας ](%{base_path}/guidelines). Αυτό το παράθυρο θα εμφανιστεί μόνο για την πρώτη σας %{education_posts_text}.
     avatar: |2
 
       ### Τι θα λέγατε για μια εικόνα στο λογαριασμό σας;
@@ -495,6 +482,9 @@ el:
   post:
     image_placeholder:
       broken: "Η εικόνα είναι χαλασμένη"
+    has_likes:
+      one: "%{count} «Μου αρέσει»"
+      other: "%{count} «Μου αρέσει»"
   rate_limiter:
     hours:
       one: "%{count} ώρα"
@@ -642,6 +632,7 @@ el:
       self: "Δεν έχετε ακόμη καμία δραστηριότητα."
       others: "Χωρίς δραστηριότητα."
     no_bookmarks:
+      self: "Δεν έχετε σελιδοδείκτες. Οι σελιδοδείκτες σας επιτρέπουν να ανατρέξετε γρήγορα σε συγκεκριμένες αναρτήσεις."
       others: "Κανένας σελιδοδείκτης."
     no_likes_given:
       self: "Δεν σου αρέσει καμία ανάρτηση."
@@ -682,9 +673,7 @@ el:
     mute_topic: "Σίγαση όλων των ειδοποιήσεων για αυτό το νήμα, %{link}"
     unwatch_category: "Διακοπή επιτήρησης όλων των νημάτων της κατηγορίας %{category}"
     mailing_list_mode: "Απενεργοποιήστε τη λειτουργία της ταχυδρομικής λίστας"
-    all: "Μη μου στέλνετε mail από την %{sitename}"
     different_user_description: "Έχετε συνδεθεί ως διαφορετικός χρήστης από αυτόν που επικοινωνήσαμε μέσω email. Παρακαλούμε αποσυνδεθείτε ή χρησιμοποιήστε την ανώνυμη λειτουργία και δοκιμάστε ξανά."
-    not_found_description: "Λυπούμαστε, δεν μπορέσαμε να βρούμε την συγκεκριμένη απεγγραφή. Είναι πιθανό ο σύνδεσμος στο email σας να έληξε; "
     log_out: "Αποσύνδεση"
     digest_frequency:
       never: "ποτέ"
@@ -693,6 +682,7 @@ el:
       daily: "καθημερινά"
       weekly: "κάθε εβδομάδα"
       every_month: "κάθε μήνα"
+      every_six_months: "κάθε έξι μήνες"
   user_api_key:
     title: "Εξουσιοδότηση πρόσβασης στην εφαρμογή"
     authorize: "Εξουσιοδότηση"
@@ -701,6 +691,8 @@ el:
     description: '"%{application_name}" ζητά την ακολόλουθη πρόσβαση στον λογαριασμό σου:'
     otp_confirmation:
       confirm_title: Συνεχίστε στην %{site_name}
+      logging_in_as: Σύνδεση ως %{username}
+      confirm_button: Ολοκληρώστε τη σύνδεση
     no_trust_level: "Συγγνώμη, δεν έχεις το απαιτούμενο επίπεδο εμπιστοσύνης για να έχεις πρόσβαση στο API χρήστη"
     generic_error: "Συγνώμη, δεν μπορούμε να εκδώσουμε σε χρήστη API keys, αυτή η πράξη μπορεί να μην είναι διαθέδιμη από τον διαχειριστή της ιστοσελίδας. "
     scopes:
@@ -713,15 +705,18 @@ el:
   reports:
     default:
       labels:
+        count: Άθροισμα
         day: Ημέρα
     post_edits:
       labels:
+        edited_at: Ημερομηνία
         post: Ανάρτηση
         editor: Συντάκτης
         edit_reason: Αιτία
     user_flagging_ratio:
       labels:
         user: Χρήστης
+        score: Βαθμολογία
     moderators_activity:
       labels:
         moderator: Συντονιστής
@@ -776,6 +771,7 @@ el:
       title: "Χρήστες ανάλογα με το Επίπεδο Εμπιστοσύνης"
       xaxis: "Επίπεδο Εμπιστοσύνης"
       yaxis: "Αριθμός χρηστών"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       xaxis: "Τύπος"
       yaxis: "Αριθμός χρηστών"
@@ -790,6 +786,7 @@ el:
       labels:
         term: Όρος
         searches: Αναζητήσεις
+        click_through: CTR
     emails:
       title: "Απεσταλμένα Emails"
       xaxis: "Ημέρα"
@@ -967,11 +964,12 @@ el:
     show_pinned_excerpt_mobile: "Εμφάνιση περίληψης σε καρφιτσωμένα νήματα στην περιήγηση από κινητά τηλέφωνα."
     show_pinned_excerpt_desktop: "Εμφάνιση περίληψης σε καρφιτσωμένα νήματα στην περιήγηση από ηλεκτρονικούς υπολογιστές."
     post_onebox_maxlength: "Μέγιστο μέγεθος μιας oneboxed ανάρτησης σε χαρακτήρες."
+    blocked_onebox_domains: "Μία λίστα τομέων που δεν θα είναι ποτέ oneboxed."
+    allowed_inline_onebox_domains: "Μια λίστα από domains τα οποία θα γίνουν onebox σε σκίκρυνση αν αναφερθούν χωρίς τίτλο"
     max_oneboxes_per_post: "Ανώτατος αριθμός oneboxes σε μια ανάρτηση. "
     notification_email: "Η από: διεύθυνση email που χρησιμοποιείται για την αποστολή όλων των απαραιτήτων μηνυμάτων του συστήματος. Ο τομέας που καθορίζεται εδώ πρέπει να έχει SPF, DKIM και reverse PTR αρχεία ρυθμισμένα σωστά για να φθάσει το μήνυμα."
     email_custom_headers: "Μια pipe-delimited λίστα που περιέχει τις προσαρμοσμένες κεφαλίδες των μηνυμάτων email. "
     force_https: "Αναγκάζει το site σας να χρησιμοποιεί μόνο HTTPS. ΠΡΟΣΟΧΗ: Μην το ενεργοποιήσετε, μέχρι να επαληθεύσετε ότι το HTTPS είναι πλήρως εγκατεστημένο και λειτουργεί απολύτως παντού! Ελέγξατε το CDN σας, όλες τις κοινωνικές συνδέσεις και τα εξωτερικά σας λογότυπα / εξαρτήσεις για να βεβαιωθείτε ότι είναι όλα συμβατά με HTTPS;"
-    same_site_cookies: "Χρησιμοποίηση των ίδιων cookies της σελίδας, το οποίο καταργεί όλα τα vectors Cross Site Request Forgery σε υποστηριζόμενους περιηγητές (Lax ή Strict). Προσοχή: Το Strict θα λειτουργήσει μόνο σε σελίδες που εξαναγκάζουν την σύνδεση και την χρήση SSO"
     summary_score_threshold: "Η ελάχιστη βαθμολογία που απαιτείται από μια ανάρτηση για να συμπεριληφθεί στο «Συνοψίστε αυτό το θέμα»"
     summary_percent_filter: "Όταν ο χρήστης επιλέξει «Συνοψίστε αυτό το θέμα», δείξε το κορυφαίο % των αναρτήσεων"
     enable_personal_messages: "Επίτρεψε στους χρήστες επιπέδου εμπιστοσύνης 1 (ρυθμιζόμενο μέσω min trust level to send messages) να δημιουργήσουν μηνύματα και να απαντήσουν σε μηνύματα. Σημειώστε ότι οι συνεργάτες μπορούν πάντα να στέλνουν μηνύματα."
@@ -996,6 +994,9 @@ el:
     pending_users_reminder_delay: "Ειδοποίηση των συντονιστών αν υπάρχουν νέοι χρήστες που περιμένουν για αποδοχή του λογαριασμού τους για μεγαλύτερο απο αυτό το χρονικό διάστημα. Όρισέ το στο -1 για να απενεργοποιηθούν οι ειδοποιήσεις."
     maximum_session_age: "Ο χρήστης θα παραμείνει συνδεδεμένος για n ώρες από την τελευταία του επίσκεψη"
     cors_origins: "Επιτρεπόμενες πηγές για αιτήσεις πολλαπλής προέλευσης (cross-origin requests, CORS). Η κάθε προέλευση πρέπει να περιέχει http:// or https://. Η env μεταβλητή DISCOURSE_ENABLE_CORS πρέπει να οριστεί σε αληθινή για να ενεργοποιηθεί το CORS."
+    use_admin_ip_allowlist: "Οι διαχειριστές μπορούν να συνδέονται μόνο αν βρίσκονται σε μια διευθυνση IP καθορισμένη στη λίστα Screened IPs (Admin > Logs > Screened Ips)."
+    blocked_ip_blocks: "Μια λίστα από private IP blocks η οποία ποτέ δεν θα ανιχνεύεται από το Discourse"
+    allowed_internal_hosts: "Μια λίστα από internal hosts την οποία το discourse μπορεί να ανιχνεύει με ασφάλεια για oneboxing και άλλους λόγους"
     allowed_iframes: "Μία λίστα από iframe src domain prefixes τα οποία το discourse μπορεί με ασφάλεια να επιτρέπει στις αναρτήσεις."
     top_menu: "Καθόρισε ποια αντικείμενα θα εμφανίζονται στην πλοήγηση της αρχικής σελίδας και με ποια σειρά. Παράδειγμα τελευταία/νέα/μη αναγνωσμένα/κατηγορίες/κορυφαία/αναγνωσμένα/δημοσιευμένα/σελιδοδείκτες"
     post_menu: "Αποφάσισε ποια αντικείμενα θα εμφανίζονται στο μενού των δημοσιεύσεων, και με ποια σειρά. Παράδειγμα μου αρέσει/επεξεργασία/επισήμανση/διαγραφή/κοινοποίηση/σελιδοδείκτης/απάντηση"
@@ -1015,6 +1016,8 @@ el:
     email_token_valid_hours: "Τα tokens ανάκτησης κωδικού / ενεργοποίησης λογαριασμού παραμένουν έγκυρα για (ν) ώρες."
     enable_badges: "Ενεργοποίηση συστήματος παρασήμων"
     enable_whispers: "Επιτρέπεται στο προσωπικό η ιδιωτική επικοινωνία μεταξύ νημάτων"
+    blocked_email_domains: "Μία λίστα με διευθύνσεις email τις οποίες οι χρήστες δεν μπορούν να χρησιμοποιήσουν για να δημιουργήσουν λογαριασμό. Πχ: mailinator.com|trashmail.net"
+    allowed_email_domains: "Μία λίστα με διευθύνσεις email τις οποίες οι χρήστες ΘΑ ΠΡΕΠΕΙ να χρησιμοποιήσουν για να δημιουργήσουν λογαριασμό. ΠΡΟΣΟΧΗ: οι χρήστες με διευθύνσεις email οι οποίες δεν βρίσκονται σε αυτή τη λίστα δεν θα μπορούν να δημιουργήσουν λογαριασμό."
     hide_email_address_taken: "Μην ενημερώνεις του χρήστες ότι υπάρχει λογαριασμός χρήστη με αυτήν την διεύθυνση email κατά την εγγραφή και στην φόρμα επαναφοράς κωδικού."
     log_out_strict: "Όταν αποσυνδεθείτε, ΟΛΕΣ οι δραστηριότητες σας σε ΟΛΕΣ τις συσκευές θα αποσυνδεθούν"
     new_version_emails: "Αποστολή email στην contact_email διεύθυνση όταν μια νέα έκδοση του Discourse είναι διαθέσιμη."
@@ -1027,12 +1030,7 @@ el:
     min_admin_password_length: "Ελάχιστο μήκος κωδικού πρόσβασης για το διαχειριστή"
     password_unique_characters: "Ελάχιστος αριθμός μοναδικών χαρακτήρων που πρέπει να έχει ένας κωδικός."
     block_common_passwords: "Μην επιτρέπεις τους κωδικούς πρόσβασης που είναι ανάμεσα στους 10,000 πιο κοινούς κωδικούς πρόσβασης."
-    enable_sso: "Ενεργοποίηση καθολικής σύνδεσης μέσω ενός εξωτερικού συνδέσμου (ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ΟΙ ΔΙΕΥΘΥΝΣΕΙΣ EMAiL ΤΩΝ ΧΡΗΣΤΩΝ ΘΑ ΠΡΕΠΕΙ ΝΑ ΕΠΙΚΥΡΩΘΟΥΝ ΑΠΟ ΤΟΝ ΕΞΩΤΕΡΙΚΟ ΣΥΝΔΕΣΜΟ!)"
-    sso_url: "URL του single sign on endpoint (πρέπει να περιέχει http:// or https://)"
-    sso_secret: "Η μυστική συμβολοσειρά που χρησιμοποιείται για να πιστοποιήσει κρυπτογραφικά πληροφορίες SSO, σιγουρευτείτε οτι έχει 10 χαρακτήρες ή περισσότερους."
-    sso_overrides_bio: "Παρακάμπτει την βιογραφία του χρήστη στο προφίλ του χρήστη και τον αποτρέπει να την αλλάξει. "
-    sso_not_approved_url: "Ανακατευθύνετε μη εγκεκριμένους λογαριασμούς SSO σε αυτό το URL"
-    sso_allows_all_return_paths: "Do not restrict the domain for return_paths provided by SSO (by default return path must be on current site)"
+    discourse_connect_overrides_bio: "Παρακάμπτει την βιογραφία του χρήστη στο προφίλ του χρήστη και τον αποτρέπει να την αλλάξει. "
     allow_new_registrations: "Επιτρέψτε τις νέες εγγραφές χρηστών. Απενεργοποιήστε την επιλογή αυτή για να αποτρέψετε σε οποιονδήποτε να δημιουργήσει ένα νέο λογαριασμό"
     enable_signup_cta: "Δείξε μια ανακοίνωση στους ανώνυμους χρήστες που επιστρέφουν, η οποία να τους παροτρύνει να δημιουργήσουν λογαριασμό."
     google_oauth2_client_id: "Client ID της Google εφαρμογής σας."
@@ -1049,7 +1047,6 @@ el:
     top_topics_formula_log_views_multiplier: "value of log views multiplier (n) in top topics formula: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_first_post_likes_multiplier: "value of first post likes multiplier (n) in top topics formula: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "value of least likes per post multiplier (n) in top topics formula: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Ο αριθμός των παλιών αναρτήσεων ο οποίος θα αναθεωρείται κάθε 15 λεπτά."
     rate_limit_create_topic: "Μετά τη δημιουργία νήματος, οι χρήστες πρέπει να περιμένουν (n) δευτερόλεπτα πριν τη δημιουργία άλλου νήματος."
     rate_limit_create_post: "Μετά την ανάρτηση, οι χρήστες πρέπει να περιμένουν (n) δευτερόλεπτα πριν τη δημιουργία άλλης ανάρτησης."
     rate_limit_new_user_create_topic: "Μετά τη δημιουργία νήματος, οι νέοι χρήστες πρέπει να περιμένουν (n) δευτερόλεπτα πριν τη δημιουργία άλλου νήματος."
@@ -1078,11 +1075,11 @@ el:
     avatar_sizes: "Κατάλογος από αυτόματα δημιουργημένα μεγέθη άβαταρ."
     external_system_avatars_enabled: "Χρησιμοποιήσε εξωτερική υπηρεσία για avatars."
     external_system_avatars_url: "URL της εξωτερικής υπηρεσίας avatars. Επιτρεπτές αντικαταστάσεις είναι {username} {first_letter} {color} {size}"
+    selectable_avatars: "Λίστα των 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: "Strip image metadata."
-    enable_flash_video_onebox: "Ενεργοποίηση της ενσωμάτωσης συνδέσμων swf και flv (Adobe Flash) σε oneboxes. ΠΡΟΣΟΧΗ: μπορεί να εισαγάγει κινδύνους για την ασφάλεια."
     default_invitee_trust_level: "Προεπιλεγμένο επίπεδο εμπιστοσύνης (0-4) για τους χρήστες που έχουν προσκληθεί."
     default_trust_level: "Προεπιλεγμένο επίπεδο εμπιστοσύνης (0-4) για όλους τους νέους χρήστες. Προειδοποίηση! Αλλάζοντάς το θα εκτεθείς σε σοβαρό κίνδυνο για ανεπιθύμητα μηνύματα."
     tl1_requires_topics_entered: "Πόσα νήματα πρέπει να επισκεφτεί ένας νέος χρήστης προτού προαχθεί στο επίπεδο εμπιστοσύνης 1."
@@ -1131,6 +1128,7 @@ el:
     desktop_category_page_style: "Οπτικό στυλ για τη σελίδα /Categories."
     category_colors: "Μια λίστα με τιμές δεκαεξαδικού χρώματος, που επιτρέπεται για τις κατηγορίες."
     category_style: "Οπτικό στυλ για τα εμβλημάτα κατηγορίας ."
+    dark_mode_none: "Κανένα"
     max_attachment_size_kb: "Το μέγιστο μέγεθος συννημένων αρχείων για μεταφόρτωση σε kB. Αυτό πρέπει να ρυθμιστεί στο nginx (client_max_body_size) / apache ή και στο proxy."
     authorized_extensions: "Μια λίστα με επεκτάσεις αρχείου οι οποιες επιτρέπονται για ανέβασμα (use '*' to enable all file types)"
     theme_authorized_extensions: "Μια λίστα από επεκτάσεις οι οποίες επιτρέπονται για τις μεταφορτώσεις θεμάτων ('*' για ενεργοποίηση όλων των τύπων αρχείων)"
@@ -1152,6 +1150,7 @@ el:
     tos_url: "Εάν έχετε ένα έγγραφο Όρων Χρήσης το οποίο φιλοξενείται αλλού και θέλετε να το χρησιμοποιήσετε, καταχωρήστε την πλήρη διεύθυνση URL εδώ."
     privacy_policy_url: "Εάν έχετε ένα έγγραφο πολιτικής προστασίας προσωπικών δεδομένων το οποίο φιλοξενείται αλλού και θέλετε να το χρησιμοποιήσετε, καταχωρήστε την πλήρη διεύθυνση URL εδώ."
     newuser_spam_host_threshold: "Πόσες φορές ένας νέος χρήστης μπορεί να αναρτήσει ένα σύνδεσμο προς την ίδια ιστοσελίδα εντός του ορίου 'newuser_spam_host_threshold' αναρτήσεων, πριν αυτές θεωρηθούν spam."
+    allowed_spam_host_domains: "Μια λίστα από domains που εξαιρούνται από τον έλεγχο spam. Οι νέοι χρήστες δεν θα περιορίζονται στη δημιουργία αναρτήσεων με συνδέσμους προς αυτά τα domains."
     topic_view_duration_hours: "Μετρήστε μια νέα προβολή νήματος μία φορά ανά IP/User κάθε N ώρες"
     user_profile_view_duration_hours: "Μετρήστε μια νέα προβολή προφίλ χρήστη μία φορά ανά IP/User κάθε N ώρες"
     levenshtein_distance_spammer_emails: "Στην αντιστοίχιση διευθύνσεων email των σπάμερ, η διαφορά στον αριθμό των χαρακτήρων η οποία θα επιτρέπει μια ασαφή αντιστοίχιση."
@@ -1178,6 +1177,7 @@ el:
     max_emails_per_day_per_user: "Ο μέγιστος αριθμός email που θα στέλνονται στους χρήστες ανά μέρα. 0 για να απενεργοποιηθεί το όριο. "
     enable_staged_users: "Αυτόματη δημιουργία σταδιακών χρηστών όταν επεξεργάζεται ένα εισερχόμενο μήνυμα email."
     maximum_staged_users_per_email: "Μέγιστος αριθμός σταδιακών χρηστών που δημιουργούνται όταν επεξεργάζεται ένα εισερχόμενο μήνυμα email."
+    auto_generated_allowlist: "Κατάλογος διευθύνσεων email που δεν θα ελεγχθούν για αυτοπαραγόμενο περιεχόμενο. Παράδειγμα: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Αποκλεισμός εισερχόμενων μηνυμάτων email που ταυτοποιούνται ως αυτόματα δημιουργημένα."
     ignore_by_title: "Αγνόησε εισερχόμενα email σύμφωνα με τον τίτλο τους."
     mailgun_api_key: "Mailgun Secret API key το οποίο χρησιμοποιείται για να επιβεβαιωθούν τα μηνύματα του webhook."
@@ -1227,6 +1227,7 @@ el:
     anonymous_account_duration_minutes: "Για να προστατευθεί η ανωνυμία δημιούργησε ένα νέο ανώνυμο λογαριασμό κάθε Ν λεπτά για κάθε χρήστη. Παράδειγμα: εάν τεθεί στο 600, μόλις περάσουν 600 λεπτά από την τελευταία ανάρτηση ΚΑΙ ο χρήστης αλλάξει σε ανώνυμος, ένας νέος ανώνυμος λογαριασμός δημιουργείται."
     hide_user_profiles_from_public: "Απενεργοποιήσε τις κάρτες χρηστών, τα προφίλ χρηστών και τον κατάλογο χρηστών για ανώνυμους χρήστες. "
     hide_suspension_reasons: "Να μην εμφανίζονται οι λόγοι αποβολής δημόσια στα προφίλ των χρηστών."
+    allowed_user_website_domains: "Ο ιστότοπος του χρήστη θα επιβεβαιώνεται με αυτά τα domains. Pipe-delimited λίστα"
     allow_profile_backgrounds: "Επίτρεψε στους χρήστες να μεταφορτώνουν εικόνες φόντου στο προφίλ."
     sequential_replies_threshold: "Ο αριθμός των αναρτήσεων που πρέπει να κάνει ένας χρήστης στη σειρά για το ίδιο θέμα πριν ειδοποιηθεί για παρα πολλές συνεχόμενες απαντήσεις."
     get_a_room_threshold: "Ο αριθμός των αναρτήσεων που πρέπει να κάνει ένας χρήστης στον ίδιο άνθρωπο και στο ίδιο θέμα προτού να προειδοποιηθεί. "
@@ -1255,7 +1256,6 @@ el:
     show_create_topics_notice: "Εάν η ιστοσελίδα έχει λιγότερα από 5 δημόσια νήματα, κάνε μια παρατήρηση ζητώντας από τον διαχειριστή να δημιουργήσει μερικά νήματα."
     delete_drafts_older_than_n_days: "Διαγραφή προχείρων παλαιότερα απο (ν) ημερων "
     bootstrap_mode_min_users: "Μέγιστος αριθμός χρηστών που απαιτούνται για την απενεργοποίηση της κατάστασης bootstrap (0 για απενεργοποίηση)"
-    prevent_anons_from_downloading_files: "Αποτρέψτε ανώνυμους χρήστες από το να κατεβάζουν συνημμένα. ΠΡΟΣΟΧΗ: αυτό θα αποτρέψει οποιαδήποτε στοιχεία του ιστοτόπου που δεν είναι εικόνες και δημοσιεύονται ως συνημμένα από το να λειτουργούν."
     slug_generation_method: "Επιλέξτε μια μέθοδο παραγωγής slug. «Κωδικοποιημένη» θα δημιουργήσει μια συμβολοσειρά για ποσοστιαία κωδικοποίηση. «Κανένα» θα απενεργοποιήσει τα slug."
     enable_emoji: "Ενεργοποίηση emoji"
     emoji_set: "Πως θα ήθελες το emoji σου;"
@@ -1271,7 +1271,6 @@ el:
     default_include_tl0_in_digests: "Συμπεριέλαβε αναρτήσεις από νέους χρήστες στα συνοπτικά email από προεπιλογή. Οι χρήστες μπορούν να το αλλάξουν αυτό στις προτιμήσεις τους. "
     default_email_mailing_list_mode: "Στείλε email για κάθε νέα ανάρτηση από προεπιλογή."
     default_email_mailing_list_mode_frequency: "Οι χρήστες, οι οποίοι έχουν ενεργοποιήσει την λειτουργία ταχυδρομικής λίστας θα λαμβάνουν emails τόσο συχνά από προεπιλογή."
-    disable_mailing_list_mode: "Απαγόρευσε στους χρήστες να ενεργοποιούν την λειτουργία ταχυδρομικής λίστας. "
     default_email_previous_replies: "Συμπεριέλαβε προηγούμενες απαντήσεις στα emails από προεπιλογή."
     default_email_in_reply_to: "Συμπερίλαβε στα emails απόσπασμα της ανάρτησης η οποία απαντήθηκε από προεπιλογή."
     default_other_new_topic_duration_minutes: "Προεπιλεγμένη γενική κατάσταση κατά την οποία ένα νήμα θεωρείται νέο."
@@ -1280,6 +1279,7 @@ el:
     default_other_external_links_in_new_tab: "Άνοιγε τους εξωτερικούς συνδέσμους σε νέα καρτέλα από προεπιλογή."
     default_other_enable_quoting: "Ενεργοποίηση απάντησης με παράθεση για επιλεγμένο κείμενο από προεπιλογή"
     default_other_dynamic_favicon: "Δείχνε τον αριθμό νέων/ενημερωμένων θεμάτων στο εικονίδιο του προγράμματος περιήγησης από προεπιλογή. "
+    default_other_skip_new_user_tips: "Παράλειψη συμβουλών και σημάτων για την ενσωμάτωση νέου χρήστη."
     default_other_like_notification_frequency: "Ειδοποίησε τους χρήστες όταν έχουν 'μου αρέσει' απο προεπιλογή. "
     default_topics_automatic_unpin: "Αυτόματο ξεκαρφίτσωμα των νημάτων, όταν ο χρήστης φτάνει στο κάτω μέρος από προεπιλογή."
     default_categories_watching: "Λίστα κατηγοριών που επιτηρούνται από προεπιλογή."
@@ -1289,7 +1289,6 @@ el:
     retain_web_hook_events_period_days: "Number of days to retain web hook event records."
     allow_user_api_keys: "Επιτρέψτε την δημιουργία των user API keys"
     allow_user_api_key_scopes: "Λίστα των πεδίων που επιτρέπεται για τα user API keys"
-    max_api_keys_per_user: "Μέγιστος αριθμός user API keys ανά χρήστη. "
     min_trust_level_for_user_api_key: "Επίπεδο εμπιστοσύνης που απαιτείται για την δημιουργία user API keys. "
     allowed_user_api_push_urls: "Επιτρεπόμενοι συνδέσμοι για την ώθηση του διακομιστή στο user API"
     tagging_enabled: "Ενεργοποίηση ετικετών στα θέματα; "
@@ -1297,7 +1296,6 @@ el:
     max_tags_per_topic: "Ο μέγιστος αριθμός ετικετών που μπορούν να εφαρμοσθούν σε ένα θέμα. "
     max_tag_length: "Ο μέγιστος αριθμός χαρακτήρων που μπορούν να χρησιμοποιηθούν σε μία ετικέτα. "
     max_tag_search_results: "Ο μέγιστος αριθμός αποτελεσμάτων που μπορούν να εμφανιστούν όταν γίνεται αναζήτηση ετικετών. "
-    show_filter_by_tag: "Εμφάνιση ενός αναπτυσσόμενου μενού για το φιλτράρισμα νήματος ανά ετικέτα. "
     max_tags_in_filter_list: "Μέγιστος αριθμός ετικετών που εμφανίζονται στο αναπτυσσόμενο μενού φίλτρων. Θα εμφανίζονται οι πιο συχνά χρησιμοποιημένες ετικέτες. "
     tags_sort_alphabetically: "Εμφάνιζε τις ετικέτες με αλφαβητική σειρά. Η προεπιλογή είναι να εμφανίζονται με σειρά δημοτικότητας. "
     tag_style: "Οπτικό στυλ για εμβλήματα ετικετών. "
@@ -1338,7 +1336,7 @@ el:
       topic: "Αποτελέσματα"
       user: "Χρήστες"
     results_page: "Αποτελέσματα αναζήτησης για '%{term}'"
-  sso:
+  discourse_connect:
     login_error: "Σφάλμα Σύνδεσης"
     not_found: "Ο λογαριασμός σου δεν ήταν δυνατόν να βρεθεί. Παρακαλώ επικοινώνησε με το διαχειριστή της ιστοσελίδας."
     account_not_approved: "Ο λογαριασμός σας βρίσκεται σε αναμονή εγκρίσεως. Θα λάβετε ειδοποίηση με email όταν εγκριθεί. "
@@ -1411,6 +1409,12 @@ el:
     autoclosed_disabled_lastpost: "Αυτό το νήμα είναι τώρα ανοικτό. Επιτρέπονται νέες απαντήσεις."
     auto_deleted_by_timer: "Διεγράφη αυτόματα με χρονοπρογραμματισμό."
   login:
+    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: "Η τρέχουσα συσκευή ή το πρόγραμμα περιήγησής σας δεν υποστηρίζει τη χρήση κλειδιών ασφαλείας. Παρακαλώ χρησιμοποιήστε διαφορετική μέθοδο."
     not_approved: "Ο λογαριασμός σου δεν έχει εγκριθεί ακόμα. Θα λάβεις ειδοποίηση με email όταν θα είσαι έτοιμος να συνδεθείς."
     incorrect_username_email_or_password: "Λάθος όνομα χρήστη, διεύθυνση email ή κωδικός προσβασης"
     wait_approval: "Ευχαριστούμε για την εγγραφή σας. Θα σας ενημερώσουμε όταν ο λογαριασμός σας εγκριθεί."
@@ -1424,6 +1428,7 @@ el:
     errors: "%{errors}"
     not_available: "Δεν είναι διαθέσιμο. Προσπάθησε %{suggestion};"
     something_already_taken: "Κάτι πήγε στραβά, ίσως το όνομα χρήστη ή η διεύθυνση email υπάρχει ήδη. Δοκίμασε τον σύνδεσμο \"ξέχασα τον κωδικό μου\"."
+    omniauth_confirm_button: "Συνεχίστε"
     authenticator_error_no_valid_email: "Δεν επιτρέπονται διευθύνσεις email σχετικές με %{account}. ίσως να χρειαστεί να διαμορφώσετε τον λογαριασμό σας με μια διαφορετική διεύθυνση email. "
     new_registrations_disabled: "Νέες εγγραφές λογαριασμών δεν επιτρέπονται αυτή τη στιγμή."
     password_too_long: "Οι κωδικοί πρόσβασης περιορίζονται σε 200 χαρακτήρες."
@@ -1432,6 +1437,9 @@ el:
     missing_user_field: "Δεν έχετε συμπληρώσει όλα τα πεδία χρήστη"
     auth_complete: "Η ταυτοποιήση έχει ολοκληρωθεί."
     click_to_continue: "Κλικ εδώ για να συνεχίσετε."
+    second_factor_backup_description: "Παρακαλώ εισαγάγετε έναν από τους εφεδρικούς κωδικούς σας:"
+    second_factor_toggle:
+      backup_code: "Χρησιμοποιήστε αντ 'αυτού έναν εφεδρικό κωδικό"
   admin:
     email:
       sent_test: "στάλθηκε!"
@@ -1534,6 +1542,8 @@ el:
     post_hidden:
       title: "Η ανάρτηση κρύφτηκε"
       subject_template: "Η ανάρτηση κρύφτηκε λόγω των επισημάνσεων της κοινότητας"
+    queued_by_staff:
+      title: "Απαιτείται Έγκριση Ανάρτησης"
     welcome_user:
       title: "Καλωσόρισμα Χρήστη"
       subject_template: "Καλώς ήλθατε στην %{site_name}!"
@@ -1564,6 +1574,8 @@ el:
         Να περάσετε καλά!
 
         [prefs]: %{user_preferences_url}
+    tl2_promotion_message:
+      subject_template: "Συγχαρητήρια για τον προβιβασμό του επιπέδου εμπιστοσύνης σας!"
     backup_succeeded:
       title: "Το αντίγραφο ασφαλείας πέτυχε"
       subject_template: "Το αντίγραφο ασφαλείας ολοκληρώθηκε επιτυχώς"
@@ -2032,23 +2044,9 @@ el:
     account_suspended:
       title: "Χρήστης σε Αποβολη"
       subject_template: "[%{email_prefix}] Ο λογαριασμός σου είναι σε κατάσταση αποβολής"
-      text_body_template: |2
-
-        Αποβλήθηκες από την ιστοσελίδα έως %{suspended_till}.
-
-        %{reason}
-
-        %{message}
     account_silenced:
       title: "Λογαριασμός σε Σίγαση"
       subject_template: "[%{email_prefix}] Ο λογαριασμός σας είναι σε σίγαση"
-      text_body_template: |2
-
-        Είστε σε κατάσταση σίγασης μέχρι %{silenced_till}.
-
-        %{reason}
-
-        %{message}
     account_exists:
       title: "Ο λογαριασμός υπάρχει ήδη"
       subject_template: "[%{email_prefix}] Ο λογαριασμός υπάρχει ήδη"
@@ -2118,6 +2116,9 @@ el:
     confirm_new_email:
       title: "Επιβεβαίωση νέας διεύθυνσης email"
       subject_template: "[%{email_prefix}] Επικυρώστε την νέα σας διεύθυνση email"
+    confirm_new_email_via_admin:
+      title: "Επιβεβαίωση νέας διεύθυνσης email"
+      subject_template: "[%{email_prefix}] Επικυρώστε την νέα σας διεύθυνση email"
     confirm_old_email:
       title: "Επιβεβαίωση παλιάς διεύθυνσης email"
       subject_template: "[%{email_prefix}] Επικυρώστε την νέα σας διεύθυνση email"
@@ -2152,6 +2153,8 @@ el:
         %{base_url}/u/activate-account/%{email_token}
 
         Αν για κάποιο λόγο δεν μπορείτε να κάνετε κλικ στον παραπάνω σύνδεσμο, παρακαλούμε αντιγράψτε ολόκληρη την διεύθυνση και επικολλήστε την στην γραμμή διευθύνσεων του περιηγητή σας.
+    post_approved:
+      title: "Η ανάρτησή σας εγκρίθηκε"
   page_not_found:
     title: "Ουπς! Αυτή η σελίδα δεν υπάρχει ή είναι ιδιωτική."
     popular_topics: "Δημοφιλή"
@@ -2214,6 +2217,7 @@ el:
     base_theme_name: "Βάση"
     light: "Ανοιχτό"
     dark: "Σκούρο"
+    default_theme_name: "Προεπιλογή"
     light_theme_name: "Ανοιχτό"
     dark_theme_name: "Σκούρο"
   edit_this_page: "Επεξεργασία αυτής της σελίδας"
@@ -2678,12 +2682,19 @@ el:
             description: "Διεύθυνση email του ατόμου ή της ομάδας που είναι υπεύθυνα για αυτή την κοινότητα. Χρησιμοποιείται για σημαντικές ειδοποιήσεις όπως σημάνσεις χωρίς διαχείριση, ανανεώσεις ασφάλειας και στην σελίδα <a href='%{base_path}/about' target='_blank'>σχετικά</a> για έκτακτη επικοινωνία με την κοινότητα."
           contact_url:
             label: "Ιστοσελίδα"
+            placeholder: "https://www.example.com/contact-us"
             description: "Ιστοσελίδα γενικής επικοινωνίας με εσάς και τον οργανισμό σας. Θα εμφανίζεται στην επιλογή <a href='%{base_path}/about' target='_blank'>σχετικά με τη σελίδα</a>."
           site_contact:
             label: "Αυτόματα Μηνύματα"
             description: "Όλα τα αυτοματοποιημένα συστημικά μηνύματα, όπως οι προειδοποιήσεις σημάνσεων και η ειδοποίηση ολοκλήρωσης των αντιγράφων ασφαλείας, θα στέλνονται από αυτόν τον χρήστη."
       corporate:
         title: "Οργάνωση"
+      colors:
+        title: "Χρώματα"
+      fonts:
+        fields:
+          font_preview:
+            label: "Προεπισκόπηση"
       logos:
         title: "Λογότυπα"
         fields:
@@ -2708,9 +2719,8 @@ el:
                 label: "Κατηγορίες με Προτεινόμενα Νήματα"
               categories_and_latest_topics:
                 label: "Κατηγορίες και Τελευταία Νήματα"
-      emoji:
-        title: "Emoji"
-        description: "Ποιο στυλ Emoji προτιμάς στην κοινότητά σου; Μπορείς να προσθέσεις πιο εξατομικευμένα Emoji αργότερα μέσω της επιλογής Διαχείριση, Εξατομίκευση, Emoji."
+              categories_and_top_topics:
+                label: "Κατηγορίες και κορυφαία θέματα"
       invites:
         title: "Πρόσκληση Συνεργάτη"
         description: "Έχεις σχεδόν τελειώσει! Ας προσκαλέσουμε μερικούς χρήστες να <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>συμμετάσχουν στις συζητήσεις</a> με ενδιαφέροντα νήματα και αναρτήσεις ώστε να ξεκινήσει να λειτουργεί η κοινότητα. "
@@ -2725,7 +2735,23 @@ el:
       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}"
+  staff_action_logs:
+    api_key:
+      revoked: Ανακλήθηκε
   reviewables:
+    priorities:
+      low: "Χαμηλή"
+      medium: "Μεσαία"
+      high: "Υψηλή"
+    sensitivity:
+      disabled: "Απενεργοποιημένο"
+      low: "Χαμηλή"
+      medium: "Μεσαία"
+      high: "Υψηλή"
     actions:
       agree_and_keep:
         description: "Αποδοχή επισήμανσης και διατήρηση της ανάρτησης αμετάβλητης."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 197bf433fe..feb1bc0755 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3,20 +3,20 @@ en:
     # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
     short_date_no_year: "D MMM"
     # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-    short_date: "D MMM YYYY"
+    short_date: "D MMM, YYYY"
     # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-    long_date: "D MMMM YYYY LT"
+    long_date: "MMMM D, YYYY h:mma"
 
   datetime_formats: &datetime_formats
     formats:
       # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
-      short: "%d-%m-%Y"
+      short: "%m-%d-%Y"
       # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
-      short_no_year: "%-d %B"
+      short_no_year: "%B %-d"
       # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
-      date_only: "%-d %B %Y"
+      date_only: "%B %-d, %Y"
       # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
-      long: "%-d %B %Y %H:%M"
+      long: "%B %-d, %Y, %l:%M%P"
       # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
       no_day: "%B %Y"
   date:
@@ -59,9 +59,13 @@ en:
   redirect_warning: "We were unable to verify that the link you selected was actually posted to the forum. If you wish to proceed anyway, select the link below."
   on_another_topic: "On another topic"
 
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} by %{username}"
   themes:
     bad_color_scheme: "Can not update theme, invalid color palette"
     other_error: "Something went wrong updating theme"
+    ember_selector_error: "Sorry – using #ember or .ember-view CSS selectors is not permitted, because these names are dynamically generated at runtime and will change over time, eventually resulting in broken CSS. Try a different selector."
     compile_error:
       unrecognized_extension: "Unrecognized file extension: %{extension}"
     import_error:
@@ -74,6 +78,7 @@ en:
       unpack_failed: "Failed to unpack file"
       file_too_big: "The uncompressed file is too big."
       unknown_file_type: "The file you uploaded does not appear to be a valid Discourse theme."
+      not_allowed_theme: "`%{repo}` is not in the list of allowed themes (check `allowed_theme_repos` global setting)."
     errors:
       component_no_user_selectable: "Theme components can't be user-selectable"
       component_no_default: "Theme components can't be default theme"
@@ -178,7 +183,7 @@ en:
         one: is the wrong length (should be %{count} character)
         other: is the wrong length (should be %{count} characters)
       other_than: "must be other than %{count}"
-      sso_overrides_username: "Username needs to be updated on SSO provider side, since `sso_overrides_username` setting is enabled."
+      auth_overrides_username: "Username needs to be updated on authentication provider side, since `auth_overrides_username` setting is enabled."
     template:
       body: ! "There were problems with the following fields:"
       header:
@@ -202,7 +207,7 @@ en:
       share_quote_facebook_requirements: "You must set a Facebook app id to enable quote sharing for Facebook."
       second_factor_cannot_enforce_with_socials: "You cannot enforce 2FA with social logins enabled. You must first disable login via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "You cannot enforce 2FA if local logins are disabled."
-      second_factor_cannot_be_enforced_with_sso_enabled: "You cannot enforce 2FA if SSO is enabled."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "You cannot enforce 2FA if DiscourseConnect is enabled."
       local_login_cannot_be_disabled_if_second_factor_enforced: "You cannot disable local login if 2FA is enforced. Disable enforced 2FA before disabling local logins."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "You cannot enable S3 uploads because S3 uploads are already globally enabled, and enabling this site-level could cause critical issues with uploads"
       cors_origins_should_not_have_trailing_slash: "You should not add the trailing slash (/) to CORS origins."
@@ -211,8 +216,8 @@ en:
       invalid_address: "Sorry, we were unable to generate a preview for this web page, because the server '%{hostname}' could not be found. Instead of a preview, only a link will appear in your post. :cry:"
       error_response: "Sorry, we were unable to generate a preview for this web page, because the web server returned an error code of %{status_code}. Instead of a preview, only a link will appear in your post. :cry:"
       missing_data:
-        one:  "Sorry, we were unable to generate a preview for this web page, because the following oEmbed / OpenGraph tag could not be found: %{missing_attributes}"
-        other:  "Sorry, we were unable to generate a preview for this web page, because the following oEmbed / OpenGraph tags could not be found: %{missing_attributes}"
+        one: "Sorry, we were unable to generate a preview for this web page, because the following oEmbed / OpenGraph tag could not be found: %{missing_attributes}"
+        other: "Sorry, we were unable to generate a preview for this web page, because the following oEmbed / OpenGraph tags could not be found: %{missing_attributes}"
 
   word_connector:
     # Connects words with a comma. Example: "foo, bar"
@@ -226,19 +231,22 @@ en:
     expired: "Your invite token has expired. Please <a href='%{base_url}/about'>contact staff</a>."
     not_found: "Your invite token is invalid. Please <a href='%{base_url}/about'>contact staff</a>."
     not_found_json: "Your invite token is invalid. Please contact staff."
+    not_matching_email: "Your email address and the email address associated with the invite token do not match. Please contact staff."
     not_found_template: |
       <p>Your invite to <a href="%{base_url}">%{site_name}</a> has already been redeemed.</p>
 
       <p>If you remember your password you can <a href="%{base_url}/login">Log In</a>.</p>
 
       <p>Otherwise please <a href="%{base_url}/password-reset">Reset Password</a>.</p>
-    error_message: "There was an error accepting invite. Please contact the site's administrator."
+    not_found_template_link: |
+      <p>The invitation to <a href="%{base_url}">%{site_name}</a> can no longer be redeemed. Please ask the person who invited you to send you a new invitation.</p>
     user_exists: "There's no need to invite <b>%{email}</b>, they <a href='%{base_path}/u/%{username}/summary'>already have an account!</a>"
+    invite_exists: "You already invited <b>%{email}</b>."
+    invalid_email: "%{email} isn't a valid email address."
     confirm_email: "<p>You’re almost done! We sent an activation mail to your email address. Please follow the instructions in the mail to activate your account.</p><p>If it doesn’t arrive, check your spam folder.</p>"
     cant_invite_to_group: "You are not allowed to invite users to specified group(s). Make sure you are owner of the group(s) you are trying to invite to."
     disabled_errors:
-      sso_enabled: "Invites are disabled because SSO is enabled."
-      local_logins_disabled: "Invites are disabled because the 'enable local logins' setting is disabled."
+      discourse_connect_enabled: "Invites are disabled because DiscourseConnect is enabled."
       invalid_access: "You are not permitted to view the requested resource."
 
   bulk_invite:
@@ -257,7 +265,7 @@ en:
     muted_topic: "Sorry, that user muted this topic."
     receiver_does_not_allow_pm: "Sorry, that user does not allow you to send them private messages."
     sender_does_not_allow_pm: "Sorry, you do not allow that user to send you private messages."
-    receiver_does_not_allow_other_user_pm: "Sorry, that user does not allow an existing participant to send them private messages."
+    user_cannot_see_topic: "%{username} cannot see the topic."
 
   backup:
     operation_already_running: "An operation is currently running. Can't start a new job right now."
@@ -359,6 +367,7 @@ en:
   max_pm_recipients: "Sorry, you can send a message to maximum %{recipients_limit} recipients."
   pm_reached_recipients_limit: "Sorry, you can't have more than %{recipients_limit} recipients in a message."
   removed_direct_reply_full_quotes: "Automatically removed quote of whole previous post."
+  watched_words_auto_tag: "Automatically tagged topic"
   secure_upload_not_allowed_in_public_topic: "Sorry, the following secure upload(s) cannot be used in a public topic: %{upload_filenames}."
   create_pm_on_existing_topic: "Sorry, you can't create a PM on an existing topic."
   slow_mode_enabled: "This topic is in slow mode."
@@ -404,13 +413,14 @@ en:
   too_late_to_edit: "That post was created too long ago. It can no longer be edited or deleted."
   edit_conflict: "That post was edited by another user and your changes can no longer be saved."
   revert_version_same: "The current version is same as the version you are trying to revert to."
-  cannot_edit_on_slow_mode: "This topic is in slow mode. To encourage thoughtful, considered discussion, editing old posts is not currently allowed."
+  cannot_edit_on_slow_mode: "This topic is in slow mode. To encourage thoughtful, considered discussion, editing old posts in this topic is not currently allowed during slow mode."
 
   excerpt_image: "image"
 
   bookmarks:
     errors:
       already_bookmarked_post: "You cannot bookmark the same post twice."
+      too_many: "Sorry, you cannot add more than %{limit} bookmarks, visit <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> to remove some."
       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"
@@ -441,7 +451,12 @@ en:
       email_already_used_in_category: "'%{email}' is already used by the category '%{category_name}'."
       cant_allow_membership_requests: "You cannot allow membership requests for a group without any owners."
       already_requested_membership: "You have already requested membership for this group."
-      adding_too_many_users: "Maximum %{limit} users can be added at once"
+      adding_too_many_users:
+        one: "Maximum %{count} user can be added at once"
+        other: "Maximum %{count} users can be added at once"
+      usernames_or_emails_required: "Usernames or emails must be present"
+      no_invites_with_discourse_connect: "You can invite only registered users when DiscourseConnect is enabled"
+      no_invites_without_local_logins: "You can invite only registered users when local logins are disabled"
     default_names:
       everyone: "everyone"
       admins: "admins"
@@ -471,17 +486,17 @@ en:
 
       - Who would be interested in this? Why does it matter? What kind of responses do you want?
 
-      - Include commonly used words in your topic so others can *find* it. To group your topic with related topics, select a category.
+      - Include commonly used words in your topic so others can *find* it. To group your topic with related topics, select a category (or tag).
 
       For more, [see our community guidelines](%{base_path}/guidelines). This panel will only appear for your first %{education_posts_text}.
 
     "new-reply": |
       Welcome to %{site_name} &mdash; **thanks for contributing!**
 
-      - Does your reply improve the conversation in some way?
-
       - Be kind to your fellow community members.
 
+      - Does your reply improve the conversation?
+
       - Constructive criticism is welcome, but criticize *ideas*, not people.
 
       For more, [see our community guidelines](%{base_path}/guidelines). This panel will only appear for your first %{education_posts_text}.
@@ -559,6 +574,7 @@ en:
               cant_send_pm: "Sorry, you cannot send a personal message to that user."
               no_user_selected: "You must select a valid user."
               reply_by_email_disabled: "Reply by email has been disabled."
+              send_to_email_disabled: "Sorry, you cannot send personal messages to email."
               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."
               unable_to_tag: "There was an error tagging the topic."
@@ -607,6 +623,9 @@ en:
           attributes:
             execute_at:
               in_the_past: "must be in the future."
+            duration_minutes:
+              cannot_be_zero: "must be greater than 0."
+              exceeds_maximum: "cannot be more than 20 years."
         translation_overrides:
           attributes:
             value:
@@ -718,20 +737,20 @@ en:
     slow_down: "You’ve performed this action too many times, please try again later."
     too_many_requests: "You’ve performed this action too many times. Please wait %{time_left} before trying again."
     by_type:
-      first_day_replies_per_day: "You’ve reached the maximum number of replies a new user can create on their first day. Please wait %{time_left} before trying again."
-      first_day_topics_per_day: "You’ve reached the maximum number of topics a new user can create on their first day. Please wait %{time_left} before trying again."
-      create_topic: "You’re creating topics too quickly. Please wait %{time_left} before trying again."
-      create_post: "You’re replying too quickly. Please wait %{time_left} before trying again."
-      delete_post: "You’re deleting posts too quickly. Please wait %{time_left} before trying again."
-      public_group_membership: "You’re joining/leaving groups too frequently. Please wait %{time_left} before trying again."
-      topics_per_day: "You’ve reached the maximum number of new topics. Please wait %{time_left} before trying again."
-      pms_per_day: "You’ve reached the maximum number of messages. Please wait %{time_left} before trying again."
-      create_like: "You’ve reached the maximum number of likes. Please wait %{time_left} before trying again."
-      create_bookmark: "You’ve reached the maximum number of bookmarks. Please wait %{time_left} before trying again."
-      edit_post: "You’ve reached the maximum number of edits. Please wait %{time_left} before trying again."
+      first_day_replies_per_day: "We appreciate your enthusiasm, keep it up! That said, for the safety of our community, you’ve reached the maximum number of replies a new user can create on their first day. Please wait %{time_left} and you’ll be able to create more replies."
+      first_day_topics_per_day: "We appreciate your enthusiasm! That said, for the safety of our community, you’ve reached the maximum number of topics a new user can create on their first day. Please wait %{time_left} and you’ll be able to create more new topics."
+      create_topic: "You’re creating topics a bit too quickly. Please wait %{time_left} before trying again."
+      create_post: "You’re replying a bit too quickly. Please wait %{time_left} before trying again."
+      delete_post: "You’re deleting posts a bit too quickly. Please wait %{time_left} before trying again."
+      public_group_membership: "You’re joining/leaving groups a bit too frequently. Please wait %{time_left} before trying again."
+      topics_per_day: "You’ve reached the maximum new topics allowed per day. You can create more new topics in %{time_left}."
+      pms_per_day: "You’ve reached the maximum messages allowed per day. You can create more new messages in %{time_left}."
+      create_like: "Wow! You’ve been sharing a lot of love! You’ve reached the maximum daily likes for today, but as you gain trust levels, you’ll earn more daily likes. You’ll be able to like posts again in %{time_left}."
+      create_bookmark: "You’ve reached the maximum number of daily bookmarks. You can create more bookmarks in %{time_left}."
+      edit_post: "You’ve reached the maximum number of daily edits. You can submit more edits in %{time_left}."
       live_post_counts: "You’re asking for live post counts too quickly. Please wait %{time_left} before trying again."
       unsubscribe_via_email: "You’ve reached the maximum number of unsubscribes via email. Please wait %{time_left} before trying again."
-      topic_invitations_per_day: "You’ve reached the maximum number of topic invitations. Please wait %{time_left} before trying again."
+      topic_invitations_per_day: "You’ve reached the maximum number of topic invitations. You can send more invitations in %{time_left}."
 
     hours:
       one: "%{count} hour"
@@ -841,7 +860,7 @@ en:
       unknown: "unknown browser"
     device:
       android: "Android Device"
-      chromebook: "Chromebook"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -852,7 +871,7 @@ en:
       unknown: "unknown device"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -868,6 +887,7 @@ en:
     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"
+    max_secondary_emails_error: "You have reached the maximum allowed secondary emails limit."
 
     authorizing_new:
       title: "Confirm your new email"
@@ -966,6 +986,16 @@ en:
     no_drafts:
       self: "You have no drafts; begin composing a reply in any topic and it will be auto-saved as a new draft."
 
+  email_settings:
+    pop3_authentication_error: "There was an issue with the POP3 credentials provided, check the username and password and try again."
+    imap_authentication_error: "There was an issue with the IMAP credentials provided, check the username and password and try again."
+    imap_no_response_error: "An error occurred when communicating with the IMAP server. %{message}"
+    smtp_authentication_error: "There was an issue with the SMTP credentials provided, check the username and password and try again."
+    smtp_server_busy_error: "The SMTP server is currently busy, try again later."
+    smtp_unhandled_error: "There was an unhandled error when communicating with the SMTP server. %{message}"
+    connection_error: "There was an issue connecting with the server, check the server name and port and try again."
+    timeout_error: "Connection to the server timed out, check the server name and port and try again."
+    unhandled_error: "Unhandled error when testing email settings. %{message}"
   webauthn:
     validation:
       invalid_type_error: "The webauthn type provided was invalid. Valid types are webauthn.get and webauthn.create."
@@ -1032,9 +1062,9 @@ en:
     mute_topic: "Mute all notifications for this topic, %{link}"
     unwatch_category: "Stop watching all topics in %{category}"
     mailing_list_mode: "Turn off mailing list mode"
-    all: "Don't send me any mail from %{sitename}"
+    all: "Don’t send me any mail from %{sitename}"
     different_user_description: "You are currently logged in as a different user than the one we emailed. Please log out, or enter anonymous mode, and try again."
-    not_found_description: "Sorry, we couldn't find this unsubscribe. It's possible the link in your email has expired?"
+    not_found_description: "Sorry, we couldn't find this unsubscribe. It’s possible the link in your email is too old and has expired?"
     log_out: "Log Out"
     submit: "Save preferences"
     digest_frequency:
@@ -1415,6 +1445,7 @@ en:
     github_config_warning: 'The server is configured to allow signup and login with GitHub (enable_github_logins), but the client id and secret values are not set. Go to <a href="%{base_path}/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">See this guide to learn more</a>.'
     s3_config_warning: 'The server is configured to upload files to S3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_upload_bucket. Go to <a href="%{base_path}/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     s3_backup_config_warning: 'The server is configured to upload backups to S3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_backup_bucket. Go to <a href="%{base_path}/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
+    s3_cdn_warning: 'The server is configured to upload files to S3, but there is no S3 CDN configured. This can lead to expensive S3 costs and slower site performance. <a href="https://meta.discourse.org/t/-/148916" target="_blank">See "Using Object Storage for Uploads" to learn more</a>.'
     image_magick_warning: 'The server is configured to create thumbnails of large images, but ImageMagick is not installed. Install ImageMagick using your favorite package manager or <a href="https://www.imagemagick.org/script/download.php" target="_blank">download the latest release</a>.'
     failing_emails_warning: 'There are %{num_failed_jobs} email jobs that failed. Check your app.yml and ensure that the mail server settings are correct. <a href="%{base_path}/sidekiq/retries" target="_blank">See the failed jobs in Sidekiq</a>.'
     subfolder_ends_in_slash: "Your subfolder setup is incorrect; the DISCOURSE_RELATIVE_URL_ROOT ends in a slash."
@@ -1423,14 +1454,12 @@ en:
       other: "Email polling has generated %{count} errors in the past 24 hours. Look at <a href='%{base_path}/logs' target='_blank'>the logs</a> for more details."
     missing_mailgun_api_key: "The server is configured to send emails via Mailgun but you haven't provided an API key used to verify the webhook messages."
     bad_favicon_url: "The favicon is failing to load. Check your favicon setting in <a href='%{base_path}/admin/site_settings'>Site Settings</a>."
-    deprecated_api_usage: "We detected an API request using a deprecated authentication method. Please update it to use <a href='https://meta.discourse.org/t/-/22706'>header based auth</a>. After updating this message may take 24 hours to disappear."
-    update_mail_receiver: "We detected an outdated version of mail-receiver. Click <a href='https://meta.discourse.org/t/-/133491'>here</a> for update instructions. After updating this message may take 24 hours to disappear."
     poll_pop3_timeout: "Connection to the POP3 server is timing out. Incoming email could not be retrieved. Please check your <a href='%{base_path}/admin/site_settings/category/email'>POP3 settings</a> and service provider."
     poll_pop3_auth_error: "Connection to the POP3 server is failing with an authentication error. Please check your <a href='%{base_path}/admin/site_settings/category/email'>POP3 settings</a>."
     force_https_warning: "Your website is using SSL. But `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` is not yet enabled in your site settings."
     out_of_date_themes: "Updates are available for the following themes:"
     unreachable_themes: "We were unable to check for updates on the following themes:"
-    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."
+    watched_word_regexp_error: "The regular expression for %{action} watched words is invalid. Please check your <a href='%{base_path}/admin/customize/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."
@@ -1459,10 +1488,8 @@ en:
     search_query_log_max_size: "Maximum amount of search queries to keep"
     search_query_log_max_retention_days: "Maximum amount of time to keep search queries, in days."
     search_ignore_accents: "Ignore accents when searching for text."
-    category_search_priority_very_low_weight: "Weight applied to ranking for very low category search priority."
     category_search_priority_low_weight: "Weight applied to ranking for low category search priority."
     category_search_priority_high_weight: "Weight applied to ranking for high category search priority."
-    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."
@@ -1472,7 +1499,7 @@ en:
     site_description: "Describe this site in one sentence, as used in the meta description tag."
     short_site_description: "Short description, as used in the title tag on homepage."
     contact_email: "Email address of key contact responsible for this site. Used for critical notifications, as well as on the <a href='%{base_path}/about' target='_blank'>/about</a> contact form for urgent matters."
-    contact_url: "Contact URL for this site. Used on the <a href='%{base_path}/about' target='_blank'>/about</a> contact form for urgent matters."
+    contact_url: "Contact URL for this site. Displayed on the <a href='%{base_path}/about' target='_blank'>/about</a> page for urgent matters."
     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)"
@@ -1514,6 +1541,7 @@ en:
     mobile_logo_dark: "Dark scheme alternative for the 'mobile logo' site setting."
     large_icon: "Image used as the base for other metadata icons. Should ideally be larger than 512 x 512. If left blank, logo_small will be used."
     manifest_icon: "Image used as logo/splash image on Android. Will be automatically resized to 512 × 512. If left blank, large_icon will be used."
+    manifest_screenshots: "Screenshots that showcase your instance features and functionality on its install prompt page. All images should be local uploads and of the same dimensions."
     favicon: "A favicon for your site, see <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. To work correctly over a CDN it must be a png. Will be resized to 32x32. If left blank, large_icon will be used."
     apple_touch_icon: "Icon used for Apple touch devices. Will be automatically resized to 180x180. If left blank, large_icon will be used."
     opengraph_image: "Default opengraph image, used when the page has no other suitable image. If left blank, large_icon will be used"
@@ -1525,7 +1553,7 @@ en:
     detailed_404: "Provides more details to users about why they can’t access a particular topic. Note: This is less secure because users will know if a URL links to a valid topic."
     enforce_second_factor: "Forces users to enable two-factor authentication. Select 'all' to enforce it to all users. Select 'staff' to enforce it to staff users only."
     force_https: "Force your site to use HTTPS only. WARNING: do NOT enable this until you verify HTTPS is fully set up and working absolutely everywhere! Did you check your CDN, all social logins, and any external logos / dependencies to make sure they are all HTTPS compatible, too?"
-    same_site_cookies: "Use same site cookies, they eliminate all vectors Cross Site Request Forgery on supported browsers (Lax or Strict). Warning: Strict will only work on sites that force login and use SSO."
+    same_site_cookies: "Use same site cookies, they eliminate all vectors Cross Site Request Forgery on supported browsers (Lax or Strict). Warning: Strict will only work on sites that force login and use an external auth method."
     summary_score_threshold: "The minimum score required for a post to be included in 'Summarize This Topic'"
     summary_posts_required: "Minimum posts in a topic before 'Summarize This Topic' is enabled. Changes to this setting will be applied retroactively within a week."
     summary_likes_required: "Minimum likes in a topic before 'Summarize This Topic' is enabled. Changes to this setting will be applied retroactively within a week."
@@ -1569,6 +1597,7 @@ en:
     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 (case-insensitive)"
     approve_suspect_users: "Add suspicious users to the review queue. Suspicious users have entered a bio/website but have no reading activity."
+    review_every_post: "All posts must be reviewed. WARNING! NOT RECOMMENDED FOR BUSY SITES."
     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."
     persistent_sessions: "Users will remain logged in when the web browser is closed"
     maximum_session_age: "User will remain logged in for n hours since last visit"
@@ -1592,6 +1621,7 @@ en:
     content_security_policy: "Enable Content-Security-Policy"
     content_security_policy_report_only: "Enable Content-Security-Policy-Report-Only"
     content_security_policy_collect_reports: "Enable CSP violation report collection at /csp_reports"
+    content_security_policy_frame_ancestors: "Restrict who can embed this site in iframes via CSP. Control allowed hosts on <a href='%{base_path}/admin/customize/embedding'>Embedding</a>"
     content_security_policy_script_src: "Additional allowlisted script sources. The current host and CDN are included by default. See <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Mitigate XSS Attacks with Content Security Policy.</a>"
     invalidate_inactive_admin_email_after_days: "Admin accounts that have not visited the site in this number of days will need to re-validate their email address before logging in. Set to 0 to disable."
     top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|new|unread|categories|top|read|posted|bookmarks"
@@ -1649,29 +1679,29 @@ en:
     password_unique_characters: "Minimum number of unique characters that a password must have."
     block_common_passwords: "Don't allow passwords that are in the 10,000 most common passwords."
 
-    external_auth_skip_create_confirm: When signing up via external auth, skip the create account popup. Best used alongside sso_overrides_email, sso_overrides_username and sso_overrides_name.
-    external_auth_immediately: "Automatically redirect to the external login system without user interaction. This only takes effect when login_required is true, and there is only one external authentication method"
+    auth_skip_create_confirm: When signing up via external auth, skip the create account popup. Best used alongside auth_overrides_email, auth_overrides_username and auth_overrides_name.
+    auth_immediately: "Automatically redirect to the external login system without user interaction. This only takes effect when login_required is true, and there is only one external authentication method"
 
-    enable_sso: "Enable single sign on via an external site (WARNING: USERS' EMAIL ADDRESSES *MUST* BE VALIDATED BY THE EXTERNAL SITE!)"
-    verbose_sso_logging: "Log verbose SSO related diagnostics to <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    enable_sso_provider: "Implement Discourse SSO provider protocol at the /session/sso_provider endpoint, requires sso_provider_secrets to be set"
-    sso_url: "URL of single sign on endpoint (must include http:// or https://)"
-    sso_secret: "Secret string used to cryptographically authenticate SSO information, be sure it is 10 characters or longer"
-    sso_provider_secrets: "A list of domain-secret pairs that are using Discourse as an SSO provider. Make sure SSO secret is 10 characters or longer. Wildcard symbol * can be used to match any domain or only a part of it (e.g. *.example.com)."
-    sso_overrides_bio: "Overrides user bio in user profile and prevents user from changing it"
-    sso_overrides_groups: "Synchronize all manual group membership with groups specified in the groups sso attribute (WARNING: if you do not specify groups all manual group membership will be cleared for user)"
-    sso_overrides_email: "Overrides local email with external site email from SSO payload on every login, and prevent local changes. Applies to all authentication providers. (WARNING: discrepancies can occur due to normalization of local emails)"
-    sso_overrides_username: "Overrides local username with external site username from SSO payload on every login, and prevent local changes.  Applies to all authentication providers. (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.  Applies to all authentication providers."
-    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"
-    sso_allows_all_return_paths: "Do not restrict the domain for return_paths provided by SSO (by default return path must be on current site)"
+    enable_discourse_connect: "Enable sign on via DiscourseConnect (formerly 'Discourse SSO') (WARNING: USERS' EMAIL ADDRESSES *MUST* BE VALIDATED BY THE EXTERNAL SITE!)"
+    verbose_discourse_connect_logging: "Log verbose DiscourseConnect related diagnostics to <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    enable_discourse_connect_provider: "Implement DiscourseConnect (formerly 'Discourse SSO') provider protocol at the /session/sso_provider endpoint, requires discourse_connect_provider_secrets to be set"
+    discourse_connect_url: "URL of DiscourseConnect endpoint (must include http:// or https://)"
+    discourse_connect_secret: "Secret string used to cryptographically authenticate DiscourseConnect information, be sure it is 10 characters or longer"
+    discourse_connect_provider_secrets: "A list of domain-secret pairs that are using DiscourseConnect. Make sure DiscourseConnect secret is 10 characters or longer. Wildcard symbol * can be used to match any domain or only a part of it (e.g. *.example.com)."
+    discourse_connect_overrides_bio: "Overrides user bio in user profile and prevents user from changing it"
+    discourse_connect_overrides_groups: "Synchronize all manual group membership with groups specified in the groups attribute (WARNING: if you do not specify groups all manual group membership will be cleared for user)"
+    auth_overrides_email: "Overrides local email with external site email on every login, and prevent local changes. Applies to all authentication providers. (WARNING: discrepancies can occur due to normalization of local emails)"
+    auth_overrides_username: "Overrides local username with external site username on every login, and prevent local changes.  Applies to all authentication providers. (WARNING: discrepancies can occur due to differences in username length/requirements)"
+    auth_overrides_name: "Overrides local full name with external site full name on every login, and prevent local changes.  Applies to all authentication providers."
+    discourse_connect_overrides_avatar: "Overrides user avatar with external site avatar from DiscourseConnect payload. If enabled, users will not be allowed to upload avatars on Discourse."
+    discourse_connect_overrides_location: "Overrides user location with external location from DiscourseConnect payload and prevent local changes."
+    discourse_connect_overrides_website: "Overrides user website with external location from DiscourseConnect payload and prevent local changes."
+    discourse_connect_overrides_profile_background: "Overrides user profile background with external site avatar from DiscourseConnect payload."
+    discourse_connect_overrides_card_background: "Overrides user card background with external site avatar from DiscourseConnect payload."
+    discourse_connect_not_approved_url: "Redirect unapproved DiscourseConnect accounts to this URL"
+    discourse_connect_allows_all_return_paths: "Do not restrict the domain for return_paths provided by DiscourseConnect (by default return path must be on current site)"
 
-    enable_local_logins: "Enable local username and password login based accounts. This must be enabled for invites to work. WARNING: if disabled, you may be unable to log in if you have not previously configured at least one alternate login method."
+    enable_local_logins: "Enable local username and password login based accounts. WARNING: if disabled, you may be unable to log in if you have not previously configured at least one alternate login method."
     enable_local_logins_via_email: "Allow users to request a one-click login link to be sent to them via email."
     allow_new_registrations: "Allow new user registrations. Uncheck this to prevent anyone from creating a new account."
     enable_signup_cta: "Show a notice to returning anonymous users prompting them to sign up for an account."
@@ -1723,7 +1753,6 @@ en:
     top_topics_formula_first_post_likes_multiplier: "value of first post likes multiplier (n) in top topics formula: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "value of least likes per post multiplier (n) in top topics formula: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
 
-    rebake_old_posts_count: "Number of old posts to be rebaked every 15 minutes."
     enable_safe_mode: "Allow users to enter safe mode to debug plugins."
 
     rate_limit_create_topic: "After creating a topic, users must wait (n) seconds before creating another topic."
@@ -1743,10 +1772,11 @@ en:
     max_logins_per_ip_per_hour: "Maximum number of logins allowed per IP address per hour"
     max_logins_per_ip_per_minute: "Maximum number of logins allowed per IP address per minute"
 
-    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."
+    max_post_deletions_per_minute: "Maximum number of posts a user can delete per minute. Set to 0 to disable post deletions."
+    max_post_deletions_per_day: "Maximum number of posts a user can delete per day. Set to 0 to disable post deletions."
 
     invite_link_max_redemptions_limit: "Maximum redemptions allowed for invite links can't be more than this value."
+    invite_link_max_redemptions_limit_users: "Maximum redemptions allowed for invite links generated by regular users 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."
@@ -1773,6 +1803,8 @@ en:
 
     external_system_avatars_enabled: "Use external system avatars service."
     external_system_avatars_url: "URL of the external system avatars service. Allowed substitutions are {username} {first_letter} {color} {size}"
+    external_emoji_url: "URL of the external service for emoji images. Leave blank to disable."
+    use_site_small_logo_as_system_avatar: "Use the site's small logo instead of the system user's avatar. Requires the logo to be present."
     restrict_letter_avatar_colors: "A list of 6-digit hexadecimal color values to be used for letter avatar background."
 
     selectable_avatars_enabled: "Force users to choose an avatar from the list."
@@ -1792,8 +1824,6 @@ en:
 
     simultaneous_uploads: "Maximum number of files that can be dragged & dropped in the composer"
 
-    enable_flash_video_onebox: "Enable embedding of swf and flv (Adobe Flash) links in oneboxes. WARNING: may introduce security risks."
-
     default_invitee_trust_level: "Default trust level (0-4) for invited users."
     default_trust_level: "Default trust level (0-4) for all new users. WARNING! Changing this will put you at serious risk for spam."
 
@@ -1835,6 +1865,7 @@ en:
     min_trust_to_allow_self_wiki: "The minimum trust level required to make user's own post wiki."
 
     min_trust_to_send_messages: "The minimum trust level required to create new personal messages."
+    min_trust_to_send_email_messages: "The minimum trust level requred to send personal messages via email."
     min_trust_to_flag_posts: "The minimum trust level required to flag posts"
     min_trust_to_post_links: "The minimum trust level required to include links in posts"
     min_trust_to_post_embedded_media: "The minimum trust level required to embed media items in a post"
@@ -1864,6 +1895,7 @@ en:
     body_min_entropy: "The minimum entropy (unique characters, non-english count for more) required for a post body."
     allow_uppercase_posts: "Allow all caps in a topic title or a post body."
     max_consecutive_replies: "Number of posts a user has to make in a row in a topic before being prevented from adding another reply."
+    enable_filtered_replies_view: '"(n) replies" button collapses all other posts and only shows the current post and its replies.'
 
     title_fancy_entities: "Convert common ASCII characters to fancy HTML entities in topic titles, ala SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
 
@@ -1935,6 +1967,7 @@ en:
     reviewable_claiming: "Does reviewable content need to be claimed before it can be acted upon?"
     reviewable_default_topics: "Show reviewable content grouped by topic by default"
     reviewable_default_visibility: "Don't show reviewable items unless they meet this priority"
+    reviewable_low_priority_threshold: "The priority filter hides reviewable that doesn't meet this score unless the '(any)' filter is used."
     high_trust_flaggers_auto_hide_posts: "New user posts are automatically hidden after being flagged as spam by a TL3+ user"
     cooldown_hours_until_reflag: "How much time users will have to wait until they are able to reflag a post"
 
@@ -1973,8 +2006,9 @@ en:
 
     forwarded_emails_behaviour: "How to treat a forwarded email to Discourse"
     always_show_trimmed_content: "Always show trimmed part of incoming emails. WARNING: might reveal email addresses."
+    trim_incoming_emails: "Trim part of the incoming emails that isn't relevant."
     private_email: "Don't include content from posts or topics in email title or email body. NOTE: also disables digest emails."
-    email_total_attachment_size_limit_kb: "Max total size of files attached to outgoing emails. Set to 0 to disable sending of attachments."
+    email_total_attachment_size_limit_kb: "Max total size of files attached to outgoing emails in kB. Set to 0 to disable sending of attachments."
     post_excerpts_in_emails: "In notification emails, always send excerpts instead of full posts"
     raw_email_max_length: "How many characters should be stored for incoming email."
     raw_rejected_email_max_length: "How many characters should be stored for rejected incoming email."
@@ -2145,7 +2179,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."
+    prevent_anons_from_downloading_files: "Prevent anonymous users from downloading attachments."
     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.'
     secure_media_allow_embed_images_in_emails: "Allows embedding secure images that would normally be redacted in emails, if their size is smaller than the 'secure media max email embed image size kb' setting."
     secure_media_max_email_embed_image_size_kb: "The size cutoff for secure images that will be embedded in emails if the 'secure media allow embed in emails' setting is enabled. Without that setting enabled, this setting has no effect."
@@ -2171,6 +2205,8 @@ en:
     max_allowed_message_recipients: "Maximum recipients allowed in a message."
     watched_words_regular_expressions: "Watched words are regular expressions."
 
+    enable_diffhtml_preview: "Experimental feature which uses diffHTML to sync preview instead of full re-render"
+
     old_post_notice_days: "Days before post notice becomes old"
     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."
@@ -2179,6 +2215,7 @@ en:
     blur_tl0_flagged_posts_media: "Blur flagged posts images to hide potentially NSFW content."
     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."
+    skip_auto_delete_reply_likes: "When automatically deleting old replies, skip deleting posts with this number of likes or more."
 
     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."
@@ -2186,7 +2223,7 @@ en:
     default_email_messages_level: "Set default email notification level when someone messages user."
     default_email_mailing_list_mode: "Send an email for every new post by default."
     default_email_mailing_list_mode_frequency: "Users who enable mailing list mode will receive emails this often by default."
-    disable_mailing_list_mode: "Disallow users from enabling mailing list mode."
+    disable_mailing_list_mode: "Disallow users from enabling mailing list mode (prevents any mailing list emails from being sent.)"
     default_email_previous_replies: "Include previous replies in emails by default."
 
     default_email_in_reply_to: "Include excerpt of replied to post in emails by default."
@@ -2226,7 +2263,6 @@ en:
 
     allow_user_api_keys: "Allow generation of user API keys"
     allow_user_api_key_scopes: "List of scopes allowed for user API keys"
-    max_api_keys_per_user: "Maximum number of user API keys per user"
     min_trust_level_for_user_api_key: "Trust level required for generation of user API keys"
     allowed_user_api_auth_redirects: "Allowed URL for authentication redirect for user API keys. Wildcard symbol * can be used to match any part of it (e.g. www.example.com/*)."
     allowed_user_api_push_urls: "Allowed URLs for server push to user API"
@@ -2237,7 +2273,6 @@ en:
     max_tags_per_topic: "The maximum tags that can be applied to a topic."
     max_tag_length: "The maximum amount of characters that can be used in a tag."
     max_tag_search_results: "When searching for tags, the maximum number of results to show."
-    show_filter_by_tag: "Show a dropdown to filter a topic list by tag."
     max_tags_in_filter_list: "Maximum number of tags to show in the filter dropdown. The most used tags will be shown."
     tags_sort_alphabetically: "Show tags in alphabetical order. Default is to show in order of popularity."
     tags_listed_by_group: "List tags by tag group on the <a href='%{base_path}/tags' target='_blank'>Tags page</a>."
@@ -2253,6 +2288,7 @@ en:
     city_for_disputes: "City for Disputes"
 
     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."
+    shared_drafts_min_trust_level: "Allow users to see and edit Shared Drafts."
 
     push_notifications_prompt: "Display user consent prompt."
     push_notifications_icon: "The badge icon that appears in the notification corner. A 96×96 monochromatic PNG with transparency is recommended."
@@ -2289,6 +2325,7 @@ en:
       invalid_string_min_max: "Must be between %{min} and %{max} characters."
       invalid_string_min: "Must be at least %{min} characters."
       invalid_string_max: "Must be no more than %{max} characters."
+      invalid_json: "Invalid JSON."
       invalid_reply_by_email_address: "Value must contain '%{reply_key}' and be different from the notification email."
       invalid_alternative_reply_by_email_addresses: "All values must contain '%{reply_key}' and be different from the notification email."
       pop3_polling_host_is_empty: "You must set a 'pop3 polling host' before enabling POP3 polling."
@@ -2302,8 +2339,8 @@ en:
       email_editable_enabled: "You must disable 'email editable' before enabling this setting."
       staged_users_disabled: "You must first enable 'staged users' before enabling this setting."
       reply_by_email_disabled: "You must first enable 'reply by email' before enabling this setting."
-      sso_url_is_empty: "You must set a 'sso url' before enabling this setting."
-      sso_invite_only: "You cannot enable sso and invite only at the same time."
+      discourse_connect_url_is_empty: "You must set a 'discourse connect url' before enabling this setting."
+      discourse_connect_invite_only: "You cannot enable DiscourseConnect and invite only at the same time."
       enable_local_logins_disabled: "You must first enable 'enable local logins' before enabling this setting."
       min_username_length_exists: "You cannot set the minimum username length above the shortest username (%{username})."
       min_username_length_range: "You cannot set the minimum above the maximum."
@@ -2312,10 +2349,8 @@ en:
       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'."
-        high_weight_invalid: "You cannot set the weight to be smaller or equal to 1 or greater than 'category_search_priority_very_high_weight'."
-        very_high_weight_invalid: "You cannot set the weight to be smaller than 'category_search_priority_high_weight'."
+        low_weight_invalid: "You cannot set the weight to be greater or equal to 1."
+        high_weight_invalid: "You cannot set the weight to be smaller or equal to 1."
       allowed_unicode_usernames:
         regex_invalid: "The regular expression is invalid: %{error}"
         leading_trailing_slash: "The regular expression must not start and end with a slash."
@@ -2323,9 +2358,9 @@ en:
       list_value_count: "The list must contain exactly %{count} values."
 
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "SSO secret"
+        value: "DiscourseConnect secret"
 
   search:
     extreme_load_error: "Site is under extreme load, search is disabled, try again later"
@@ -2338,7 +2373,7 @@ en:
     audio: "[audio]"
     video: "[video]"
 
-  sso:
+  discourse_connect:
     login_error: "Login Error"
     not_found: "Your account couldn't be found. Please contact the site's administrator."
     account_not_approved: "Your account is pending approval. You will receive an email notification when you are approved."
@@ -2347,12 +2382,15 @@ en:
     no_email: "No email address was provided. Please contact the site's administrator."
     blank_id_error: "The `external_id` is required but was blank"
     email_error: "An account could not be registered with the email address <b>%{email}</b>. Please contact the site's administrator."
-    missing_secret: "SSO authentication failed due to missing secret. Contact the site administrators to fix this problem."
+    missing_secret: "Authentication failed due to missing secret. Contact the site administrators to fix this problem."
+    invite_redeem_failed: "Invite redemption failed. Please contact the site's administrator."
 
   original_poster: "Original Poster"
   most_posts: "Most Posts"
   most_recent_poster: "Most Recent Poster"
   frequent_poster: "Frequent Poster"
+  # Example: "Original Poster, Most Recent Poster"
+  poster_description_joiner: ", "
 
   redirected_to_top_reasons:
     new_user: "Welcome to our community! These are the most popular recent topics."
@@ -2365,6 +2403,7 @@ en:
     errors:
       different_topics: "Posts belonging to different topics cannot be merged."
       different_users: "Posts belonging to different users cannot be merged."
+      max_post_length: "Posts cannot be merged because the combined post length is more than allowed."
 
   move_posts:
     new_topic_moderator_post:
@@ -2496,7 +2535,18 @@ en:
   admin:
     email:
       sent_test: "sent!"
-
+    user:
+      merge_user:
+        updating_username: "Updating username..."
+        changing_post_ownership: "Changing post ownership..."
+        merging_given_daily_likes: "Merging given daily likes..."
+        merging_post_timings: "Merging post timings..."
+        merging_user_visits: "Merging user visits..."
+        updating_site_settings: "Updating site settings..."
+        updating_user_stats: "Updating user stats..."
+        merging_user_attributes: "Merging user attributes..."
+        updating_user_ids: "Updating user ids..."
+        deleting_source_user: "Deleting source user..."
   user:
     deactivated: "Was deactivated due to too many bounced emails to '%{email}'."
     deactivated_by_staff: "Deactivated by staff"
@@ -2534,6 +2584,8 @@ en:
       fixed_primary_email: "Fixed primary email for staged user"
       same_ip_address: "Same IP address (%{ip_address}) as other users"
       inactive_user: "Inactive user"
+      reviewable_reject_auto: "Auto handle queued reviewables"
+      reviewable_reject: "Reviewable user rejected"
     email_in_spam_header: "User's first email was flagged as spam"
     already_silenced: "User was already silenced by %{staff} %{time_ago}."
     already_suspended: "User was already suspended by %{staff} %{time_ago}."
@@ -2795,6 +2847,20 @@ en:
 
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
 
+    queued_by_staff:
+      title: "Post Needs Approval"
+      subject_template: "Post hidden by staff, awaiting approval"
+      text_body_template: |
+        Hello,
+
+        This is an automated message from %{site_name} to let you know that your post was hidden.
+
+        <%{base_url}%{url}>
+
+        Your post will remain hidden until a staff member reviews it.
+
+        For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
+
     flags_disagreed:
       title: "Flagged post restored by staff"
       subject_template: "Flagged post restored by staff"
@@ -2823,11 +2889,9 @@ en:
 
         This post was flagged by the community and a staff member opted to remove it.
 
-        [details="Click to expand removed post"]
         ``` markdown
         %{flagged_post_raw_content}
         ```
-        [/details]
 
         Please review our [community guidelines](%{base_url}/guidelines) for details.
 
@@ -2887,7 +2951,9 @@ en:
     tl2_promotion_message:
       subject_template: "Congratulations on your trust level promotion!"
       text_body_template: |
-        We’ve promoted you up a [trust level](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+        We’ve promoted you up another [trust level](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+
+        As an experienced user, you might appreciate [this list of handy tips and tricks](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
 
         We invite you to keep getting involved – we enjoy having you around.
 
@@ -3127,7 +3193,15 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        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.
+        Here are some things to check:
+
+          - Do you use more than one email address? Did you reply from a different email address than the one you originally used? Email replies require that you use the same email address when replying.
+
+          - Did your email software properly use the Reply-To: email address when replying? Unfortunately, some email software incorrectly sends replies to the From: address, which won’t work.
+
+          - Was the Message-ID header in the email modified? The Message-ID must be consistent and unchanged.
+
+        Need more help? Reach out to us via the Contact Us details at %{base_url}/about
 
     email_reject_old_destination:
       title: "Email Reject Old Destination"
@@ -3605,9 +3679,7 @@ en:
       text_body_template: |
         You have been suspended from the forum until %{suspended_till}.
 
-        %{reason}
-
-        %{message}
+        Reason - %{reason}
 
     account_silenced:
       title: "Account Silenced"
@@ -3615,9 +3687,7 @@ en:
       text_body_template: |
         You have been silenced from the forum until %{silenced_till}.
 
-        %{reason}
-
-        %{message}
+        Reason - %{reason}
 
     account_exists:
       title: "Account already exists"
@@ -3823,6 +3893,14 @@ en:
 
         Enjoy your stay!
 
+    signup_after_reject:
+      title: "Signup After Reject"
+      subject_template: "You've been rejected on %{site_name}"
+      text_body_template: |
+        A staff member rejected your account on %{site_name}.
+
+        %{reject_reason}
+
     signup:
       title: "Signup"
       subject_template: "[%{email_prefix}] Confirm your new account"
@@ -3863,9 +3941,18 @@ en:
 
         If this was not you, please [review your existing sessions](%{base_url}/my/preferences/account) and consider changing your password.
 
+    post_approved:
+      title: "Your post was approved"
+      subject_template: "[%{site_name}] Your post was approved"
+      text_body_template: |
+        Hello,
+
+        This is an automated message from %{site_name} to let you know that [your post](%{base_url}%{post_url}) was approved.
   page_forbidden:
     title: "Oops! That page is private."
 
+  site_setting_missing: "`%{name}` site setting has to be set."
+
   page_not_found:
     title: "Oops! That page doesn’t exist or is private."
     popular_topics: "Popular"
@@ -4339,6 +4426,7 @@ en:
     mass_award:
       errors:
         invalid_csv: We encountered an error on line %{line_number}. Please confirm the CSV has one email per line.
+        badge_disabled: Please enable the %{badge_name} badge first.
     editor:
       name: Editor
       description: First post edit
@@ -4612,8 +4700,8 @@ en:
       synonym: 'Synonyms are not allowed. Use "%{tag_name}" instead.'
       has_synonyms: '"%{tag_name}" cannot be used because it has synonyms.'
     required_tags_from_group:
-      one: "You must include at least %{count} %{tag_group_name} tag."
-      other: "You must include at least %{count} %{tag_group_name} tags."
+      one: "You must include at least %{count} %{tag_group_name} tag. The tags in this group are: %{tags}."
+      other: "You must include at least %{count} %{tag_group_name} tags. The tags in this group are: %{tags}."
     invalid_target_tag: "cannot be a synonym of a synonym"
     synonyms_exist: "is not allowed while synonyms exist"
   rss_by_tag: "Topics tagged %{tag}"
@@ -4795,10 +4883,6 @@ en:
               categories_boxes_with_topics:
                 label: "Categories boxes with Topics"
 
-      emoji:
-        title: "Emoji"
-        description: "Which Emoji style do you prefer for your community? You can add more custom Emoji later via Admin, Customize, Emoji."
-
       invites:
         title: "Invite Staff"
         description: "You’re almost done! Let’s invite some people to help <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>seed your discussions</a> with interesting topics and replies to get your community started."
@@ -4845,6 +4929,7 @@ en:
 
   reviewables:
     already_handled: "Thanks, but we've already reviewed that post and determined it does not need to be flagged again."
+    already_handled_and_user_not_exist: "Thanks, but someone already reviewed and that user no longer exists."
     priorities:
       low: "Low"
       medium: "Medium"
@@ -4864,7 +4949,7 @@ en:
       new_topics_unless_trust_level: "Users at low trust levels must have topics approved by staff. See `approve_new_topics_unless_trust_level`."
       fast_typer: "New user typed their first post suspiciously fast, suspected bot or spammer behavior. See `min_first_post_typing_time`."
       auto_silence_regexp: "New user whose first post matches the `auto_silence_first_post_regex` setting."
-      watched_word: "This post included a Watched Word. See your <a href='%{base_url}/admin/logs/watched_words'>list of watched words</a>."
+      watched_word: "This post included a Watched Word. See your <a href='%{base_url}/admin/customize/watched_words'>list of watched words</a>."
       staged: "New topics and posts for staged users must be approved by staff. See `approve_unless_staged`."
       category: "Posts in this category require manual approval by staff. See the category settings."
       must_approve_users: "All new users must be approved by staff. See `must_approve_users`."
@@ -4873,6 +4958,7 @@ en:
       email_spam: "This email was flagged as spam by the header defined in `email_in_spam_header`."
       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`."
       contains_media: "This post includes embedded media. See `review_media_unless_trust_level`."
+      queued_by_staff: "A staff member thinks this post needs review. It'll remain hidden until then."
 
     actions:
       agree:
@@ -4943,6 +5029,17 @@ en:
           description: "The user will be deleted, and we'll block their IP and email address."
       reject:
         title: "Reject"
+        bundle_title: "Reject..."
+      reject_and_suspend:
+        title: "Reject and Suspend user"
+      reject_and_silence:
+        title: "Reject and Silence user"
+      reject_and_delete:
+        title: "Reject and Delete the post"
+      reject_and_keep_deleted:
+        title: "Keep post deleted"
+      approve_and_restore:
+        title: "Approve and Restore post"
       delete_user:
         title: "Delete User"
         confirm: "Are you sure you want to delete that user? This will remove all of their posts and block their email and IP address."
diff --git a/config/locales/server.en_GB.yml b/config/locales/server.en_GB.yml
new file mode 100644
index 0000000000..61d29aacd4
--- /dev/null
+++ b/config/locales/server.en_GB.yml
@@ -0,0 +1,179 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
+  dates:
+    short_date_no_year: "D MMM"
+    short_date: "D MMM YYYY"
+    long_date: "D MMMM YYYY LT"
+  datetime_formats: &datetime_formats
+    formats:
+      short: "%d-%m-%Y"
+      short_no_year: "%-d %B"
+      date_only: "%-d %B %Y"
+      long: "%-d %B %Y %H:%M"
+      no_day: "%B %Y"
+  date:
+    month_names:
+    - null
+    - January
+    - February
+    - March
+    - April
+    - May
+    - June
+    - July
+    - August
+    - September
+    - October
+    - November
+    - December
+    <<: *datetime_formats
+  themes:
+    bad_color_scheme: "Can not update theme, invalid colour palette"
+    compile_error:
+      unrecognized_extension: "Unrecognised file extension: %{extension}"
+    import_error:
+      generic: An error occurred whilst importing that theme
+    errors:
+      component_no_color_scheme: "Theme components can't have colour palettes"
+      optimized_link: Optimised image links are ephemeral and should not be included in theme source code.
+  emails:
+    incoming:
+      unrecognized_error: "Unrecognised Error"
+  activerecord:
+    errors:
+      models:
+        color_scheme_color:
+          attributes:
+            hex:
+              invalid: "is not a valid colour"
+  webauthn:
+    validation:
+      unknown_cose_algorithm_error: "The algorithm used for the security key is not recognised."
+  site_settings:
+    email_subject: "Customisable subject format for standard emails. See <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>"
+    restrict_letter_avatar_colors: "A list of 6-digit hexadecimal colour values to be used for letter avatar background."
+    category_colors: "A list of hexadecimal colour values allowed for categories."
+    default_dark_mode_color_scheme_id: "The colour scheme used when in dark mode."
+    log_anonymizer_details: "Whether to keep a user's details in the log after being anonymised. When complying to GDPR you'll need to turn this off."
+    pop3_polling_ssl: "Use SSL when connecting to the POP3 server. (Recommended)"
+    email_accent_bg_color: "The accent colour to be used as the background of some elements in HTML emails. Enter a colour name ('red') or hex value ('#FF0000')."
+    email_accent_fg_color: "The colour of text rendered on the email bg colour in HTML emails. Enter a colour name ('white') or hex value ('#FFFFFF')."
+    email_link_color: "The colour of links in HTML emails. Enter a colour name ('blue') or hex value ('#0000FF')."
+    group_in_subject: "Set %%{optional_pm} in email subject to name of first group in PM, see: <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>Customise subject format for standard emails</a>"
+    share_anonymized_statistics: "Share anonymised usage statistics."
+    errors:
+      invalid_hex_value: "Colour values have to be 6-digit hexadecimal codes."
+  system_messages:
+    welcome_user:
+      text_body_template: |
+        Thanks for joining %{site_name}, and welcome!
+
+        %{new_user_tips}
+
+        We believe in [civilized community behaviour](%{base_url}/guidelines) at all times.
+
+        Enjoy your stay!
+    welcome_invite:
+      text_body_template: |
+        Thanks for accepting your invitation to %{site_name} -- welcome!
+
+        - We've created this new account **%{username}** for you. Change your name or password by visiting [your user profile][prefs].
+
+        - When you log in, please **use the same email address from your original invitation** — otherwise we won't be able to tell it's you!
+
+        %{new_user_tips}
+
+        We believe in [civilized community behaviour](%{base_url}/guidelines) at all times.
+
+        Enjoy your stay!
+
+        [prefs]: %{user_preferences_url}
+    email_reject_parsing:
+      subject_template: "[%{email_prefix}] Email issue -- Content Unrecognised"
+    email_reject_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 recognised. Please try again, or post via the website if this continues.
+    email_reject_unrecognized_error:
+      title: "Email Reject Unrecognised Error"
+      subject_template: "[%{email_prefix}] Email issue -- Unrecognised Error"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        There was an unrecognised error whilst processing your email and it wasn't posted. You should try again, or [contact a staff member](%{base_url}/about).
+    email_error_notification:
+      text_body_template: |
+        Unfortunately, there was an authentication error whilst 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.
+    too_many_spam_flags:
+      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 apologise for the inconvenience.
+
+        For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
+    too_many_tl3_flags:
+      text_body_template: |
+        Hello,
+
+        This is an automated message from %{site_name} to let you know you that your account has been placed on hold due to a large number of community flags.
+
+        As a precautionary measure, your new account has been silenced from creating new replies or topics until a staff member can review your account. We apologise for the inconvenience.
+
+        For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
+    silenced_by_staff:
+      text_body_template: |
+        Hello,
+
+        This is an automated message from %{site_name} to let you know that your account has been temporarily placed on hold as a precautionary measure.
+
+        Please do continue to browse, but you won't be able to reply or create topics until a [staff member](%{base_url}/about) reviews your most recent posts. We apologise for the inconvenience.
+
+        For additional guidance, refer to our [community guidelines](%{base_url}/guidelines).
+  user_notifications:
+    signup_after_approval:
+      text_body_template: |
+        Welcome to %{site_name}!
+
+        A staff member approved your account on %{site_name}.
+
+        You can now access your new account by logging in at:
+        %{base_url}
+
+        If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
+
+        %{new_user_tips}
+
+        We believe in [civilized community behaviour](%{base_url}/guidelines) at all times.
+
+        Enjoy your stay!
+  upload:
+    unauthorized: "Sorry, the file you are trying to upload is not authorised (authorised extensions: %{authorized_extensions})."
+    optimize_failure_message: "An error occurred whilst optimising the uploaded image."
+  wizard:
+    step:
+      corporate:
+        title: "Organisation"
+      colors:
+        title: "Colours"
+      finished:
+        description: |
+          <p>If you ever feel like changing these settings, <b>re-run this wizard any time</b>, or visit <a href='%{base_path}/admin' target='_blank'>your admin section</a>; find it next to the wrench icon in the site menu.</p>
+          <p>It is easy to customise your Discourse even further using our powerful theming system. For examples, check out the <a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">top themes and components</a> on <a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a>.</p>
+          <p>Have fun, and good luck <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>building your new community!</a></p>
+  reviewables:
+    reasons:
+      fast_typer: "New user typed their first post suspiciously fast, suspected bot or spammer behaviour. See `min_first_post_typing_time`."
+  time:
+    <<: *datetime_formats
diff --git a/config/locales/server.en_US.yml b/config/locales/server.en_US.yml
deleted file mode 100644
index 3b4512908b..0000000000
--- a/config/locales/server.en_US.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-en_US:
-  dates:
-    # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-    short_date_no_year: "D MMM"
-    # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-    short_date: "D MMM, YYYY"
-    # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-    long_date: "MMMM D, YYYY h:mma"
-
-  datetime_formats: &datetime_formats
-    formats:
-      # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
-      short: "%m-%d-%Y"
-      # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
-      short_no_year: "%B %-d"
-      # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
-      date_only: "%B %-d, %Y"
-      # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
-      long: "%B %-d, %Y, %l:%M%P"
-      # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
-      no_day: "%B %Y"
-  date:
-    <<: *datetime_formats
-  time:
-    <<: *datetime_formats
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index a34cd5ccba..bcecca7e77 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -41,7 +41,7 @@ es:
   posts: "publicaciones"
   views: "visitas"
   loading: "Cargando"
-  powered_by_html: 'Creado con <a href="https://www.discourse.org">Discourse</a>, se ve mejor con JavaScript habilitado'
+  powered_by_html: 'Creado con <a href="https://www.discourse.org">Discourse</a>, se ve mejor con JavaScript activado'
   sign_up: "Registrarse"
   log_in: "Iniciar sesión"
   submit: "Enviar"
@@ -51,9 +51,13 @@ es:
   remove_posts_deleted_by_author: "Eliminado por el autor"
   redirect_warning: "No pudimos verificar que el enlace que seleccionaste realmente se haya publicado en el foro. Si deseas continuar de todos modos, selecciona el siguiente enlace."
   on_another_topic: "En otro tema"
+  inline_oneboxer:
+    topic_page_title_post_number: "nº %{post_number}"
+    topic_page_title_post_number_by_user: "nº %{post_number} por %{username}"
   themes:
     bad_color_scheme: "No se puede actualizar el tema, paleta de colores inválida"
     other_error: "Algo salió mal al actualizar el tema"
+    ember_selector_error: "Lo sentimos. No se permite usar selectores #ember o .ember-view, porque los nombres se generan dinámicamente al ejecutarse y cambiarán con el tiempo, lo que hará que se rompa el CSS en el futuro. Prueba con otro selector."
     compile_error:
       unrecognized_extension: "Extensión de archivo no reconocida: %{extension}"
     import_error:
@@ -62,9 +66,11 @@ es:
       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"
+      git_ref_not_found: "No se ha podido hacer checkout de git reference: %{ref}"
       unpack_failed: "Error al descomprimir el archivo"
       file_too_big: "El archivo sin comprimir es demasiado grande."
       unknown_file_type: "El archivo que cargaste no parece ser un tema de Discourse válido."
+      not_allowed_theme: "`%{repo}` no está en la lista de temas permitidos (ver el ajuste global `allowed_theme_repos`)."
     errors:
       component_no_user_selectable: "Los componentes del tema no pueden ser seleccionables por el usuario"
       component_no_default: "Los componentes del tema no pueden ser tema predeterminado"
@@ -168,7 +174,7 @@ es:
         one: tiene una longitud incorrecta (debería ser de %{count} carácter)
         other: tiene una longitud incorrecta (debería ser de %{count} caracteres)
       other_than: "debe ser distinto a %{count}"
-      sso_overrides_username: "El nombre de usuario tiene que actualizarse del lado del proveedor de SSO puesto que la configuración «sso_overrides_username» se encuentra activa."
+      auth_overrides_username: "El proveedor de autenticación debe actualizar los nombres de usuario porque el ajuste `auth_overrides_username` está activado."
     template:
       body: ! "Hubo problemas con los siguientes campos:"
       header:
@@ -184,15 +190,15 @@ es:
       default_categories_already_selected: "No se puede seleccionar una categoría ya utilizada en otra lista."
       default_tags_already_selected: "No puedes seleccionar una etiqueta utilizada en otra lista."
       s3_upload_bucket_is_required: "No se pueden activar las subidas a S3 a menos que se haya proporcionado un valor a «s3_upload_bucket»."
-      enable_s3_uploads_is_required: "No puedes activar el inventario en S3 a menos que se haya habilitado las subidas en S3."
+      enable_s3_uploads_is_required: "No puedes activar el inventario en S3 a menos que se hayan activado las subidas a S3."
       page_publishing_requirements: "No se puede activar la publicación de páginas si secure media está activado."
       s3_backup_requires_s3_settings: "No puedes usar S3 como método de respaldo salvo que hayas rellenado «%{setting_name}»."
       s3_bucket_reused: "No puedes usar el mismo bucket para «s3_upload_bucket» y «s3_backup_bucket». Por favor, selecciona otro bucket o usa una ruta diferente para cada bucket."
       secure_media_requirements: "Se debe habilitar la subida de S3 antes de habilitar medios seguros."
       share_quote_facebook_requirements: "Debes establecer la app id de Facebook para activar compartir citas en Facebook."
       second_factor_cannot_enforce_with_socials: "No puedes obligar el uso de 2FA con inicios de sesión usando redes sociales. Desactiva primero los inicios de sesión con %{auth_provider_names}"
-      second_factor_cannot_be_enforced_with_disabled_local_login: "No puede obligar a usar la autenticación de dos factores si los inicios de sesión locales están desactivados."
-      second_factor_cannot_be_enforced_with_sso_enabled: "No puedes obligar el uso de 2FA si SSO está activado."
+      second_factor_cannot_be_enforced_with_disabled_local_login: "No puedes obligar a usar la autenticación de dos factores si los inicios de sesión locales están desactivados."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "No puedes obligar el uso de 2FA si DiscourseConnect está activado."
       local_login_cannot_be_disabled_if_second_factor_enforced: "No puede deshabilitar el inicio de sesión local si se aplica 2FA. Deshabilite 2FA antes de deshabilitar los inicios de sesión locales."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "No puedes habilitar las cargas S3 porque las cargas S3 ya están habilitadas globalmente, y habilitar este nivel de sitio podría causar problemas críticos con las cargas."
       cors_origins_should_not_have_trailing_slash: "No deberías añadir una barra al final (/) a los CORS origins."
@@ -200,25 +206,31 @@ es:
     onebox:
       invalid_address: "Lo sentimos, no hemos podido generar una vista previa para esta página web porque el servidor '%{hostname}' no se ha encontrado. En lugar de una vista previa, solo aparecerá un enlace en tu publicación. :cry:"
       error_response: "Lo sentimos, no hemos podido generar una vista previa para esta página web porque el servidor web ha devuelto un código de error %{status_code}. En lugar de una vista previa, solo aparecerá un enlace en tu publicación. :cry:"
+      missing_data:
+        one: "Lo sentimos, no hemos podido generar una vista previa para esta página web porque no se ha podido encontrar la siguiente etiqueta Embed / OpenGraph: %{missing_attributes}"
+        other: "Lo sentimos, no hemos podido generar una vista previa para esta página web porque no se han podido encontrar las siguientes etiquetas Embed / OpenGraph: %{missing_attributes}"
   word_connector:
     comma: ", "
   invite:
     expired: "Su token de invitación ha caducado. Por favor, <a href='%{base_url}/about'>póngase en contacto con el personal</a>."
     not_found: "El código de invitación es inválido. Por favor, <a href='%{base_url}/about'>ponte en contacto con nuestro equipo</a>."
     not_found_json: "El código de invitación es inválido. Por favor, ponte en contacto con nuestro equipo."
+    not_matching_email: "Tu dirección de correo y la dirección asociada a la invitación no coinciden. Por favor, contacta con la administración del sitio."
     not_found_template: |
       <p>Tu invitación a <a href="%{base_url}">%{site_name}</a> ya ha sido utilizada.</p>
 
       <p>Si te acuerdas de tu contraseña puedes <a href="%{base_url}/login">iniciar sesión</a>.</p>
 
       <p>Si no, por favor, <a href="%{base_url}/password-reset">restablece tu contraseña</a>.</p>
-    error_message: "Se produjo un error al aceptar la invitación. Por favor, contacta al administrador del sitio."
+    not_found_template_link: |
+      <p>La invitación a <a href="%{base_url}">%{site_name}</a> ya no se puede usar. Por favor, pídele a la persona que te invitó que te vuelva a mandar una.</p>
     user_exists: "No hay necesidad de invitar a <b>%{email}</b>, <a href='%{base_path}/u/%{username}/summary'>¡ya tienen una cuenta!</a>"
+    invite_exists: "Ya has invitado a <b>%{email}</b>."
+    invalid_email: "%{email} no es un correo electrónico válido."
     confirm_email: "<p>¡Ya casi terminas! Te enviamos un correo de activación a tu dirección de correo electrónico. Por favor, sigue las instrucciones que allí se encuentran para activar tu cuenta.</p><p>Si no llega, revisa la carpeta de spam o correo no deseado.</p>"
     cant_invite_to_group: "No tienes permisos para invitar usuarios a los grupos especificados. Asegúrate de que eres dueño en los grupos a los que estás intentando invitar."
     disabled_errors:
-      sso_enabled: "Las invitaciones están desactivadas porque SSO está habilitado."
-      local_logins_disabled: "Las invitaciones están desactivadas porque el ajuste «enable local logins» está desactivado."
+      discourse_connect_enabled: "Las invitaciones están desactivadas porque DiscourseConnect está activado."
       invalid_access: "No tienes permitido ver el recurso solicitado."
   bulk_invite:
     file_should_be_csv: "El archivo subido debería estar en formato csv."
@@ -234,7 +246,7 @@ es:
     muted_topic: "Lo sentimos, el usuario ha silenciado este tema."
     receiver_does_not_allow_pm: "Lo sentimos, el usuario no permite que le envíes mensajes privados."
     sender_does_not_allow_pm: "Lo sentimos, no permites que el usuario te mande mensajes privados."
-    receiver_does_not_allow_other_user_pm: "Lo sentimos, el usuario no permite a un participante enviar mensajes privados."
+    user_cannot_see_topic: "%{username} no puede ver el tema."
   backup:
     operation_already_running: "Actualmente se está ejecutando una operación. No se puede iniciar un nuevo trabajo en este momento."
     backup_file_should_be_tar_gz: "El archivo de la copia de respaldo debería ser formato .tar.gz"
@@ -257,6 +269,7 @@ es:
   email_template_cant_be_modified: "Esta plantilla de correo electrónico no se puede modificar"
   invalid_whisper_access: "O los susurros no están habilitados o no tienes permitido crear susurros"
   not_in_group:
+    title_topic: "Necesitas solicitar formar parte del grupo «%{group}» para ver este tema"
     title_category: "Debes estar en grupo para ver esta categoría."
     request_membership: "Solicitar membresía"
     join_group: "Unirse al grupo"
@@ -275,10 +288,10 @@ es:
     continue: "Continuar discusión"
     error: "Error al insertar"
     referer: "Referente:"
-    error_topics: "La configuración del sitio «lista de temas insertados» no está activada"
+    error_topics: "La el ajuste «embed topics list» no está activado."
     mismatch: "El remitente no se envió o no coincide con ninguno de los siguientes hosts:"
-    no_hosts: "No se han definido hosts para el insertado"
-    configure: "Configurar insertado"
+    no_hosts: "No se han definido hosts para el incrustado."
+    configure: "Configurar incrustado"
     more_replies:
       one: "%{count} respuesta más"
       other: "%{count} respuestas más"
@@ -326,6 +339,7 @@ es:
   max_pm_recipients: "Lo sentimos, puedes enviar un mensaje a un máximo de %{recipients_limit} destinatarios."
   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."
+  watched_words_auto_tag: "Tema etiquetado 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."
   slow_mode_enabled: "Este tema está en modo lento."
@@ -367,11 +381,12 @@ es:
   too_late_to_edit: "Esa publicación se publicó hace demasiado tiempo. No se puede editar ni eliminar."
   edit_conflict: "La publicación ha sido editada por otro usuario y tus cambios no se pueden guardar."
   revert_version_same: "La versión actual es la misma que la versión a la que intentas volver."
-  cannot_edit_on_slow_mode: "Este tema está en modo lento. Para fomentar un debate considerado y adecuado, no se pueden editar las publicaciones antiguas."
+  cannot_edit_on_slow_mode: "Este tema está en modo lento. Mientras dure, no se pueden editar mensajes antiguos, para animar a que la conversación sea considerada y apropiada."
   excerpt_image: "imagen"
   bookmarks:
     errors:
       already_bookmarked_post: "No puedes guardar la misma publicación en marcadores dos veces."
+      too_many: "Lo sentimos, pero no puedes añadir más de %{limit} publicaciones a marcadores. Visita <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> para quitar algunos."
       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 indicar el tiempo para todos los recordatorios"
@@ -380,7 +395,7 @@ es:
       later_today: "Más tarde, hoy"
       next_business_day: "Siguiente día hábil"
       tomorrow: "Mañana"
-      next_week: "Próxima semana"
+      next_week: "La próxima semana"
       next_month: "Próximo mes"
       custom: "Fecha y hora personalizadas"
   groups:
@@ -399,8 +414,13 @@ es:
       email_already_used_in_group: "«%{email}» ya está siendo utilizado por el grupo «%{group_name}»."
       email_already_used_in_category: "«%{email}» ya está siendo utilizado por la categoría «%{category_name}»."
       cant_allow_membership_requests: "No puedes permitir solicitudes de membresía de un grupo sin ningún propietario."
-      already_requested_membership: "Ya has solicitado la membresía de este grupo."
-      adding_too_many_users: "Se pueden añadir un máximo de %{limit} usuarios a la vez"
+      already_requested_membership: "Ya has solicitado unirte al grupo."
+      adding_too_many_users:
+        one: "Se puede añadir un máximo de %{count} usuario a la vez"
+        other: "Se puede añadir un máximo de %{count} usuarios a la vez"
+      usernames_or_emails_required: "Debe haber nombres de usuario o correos electrónicos"
+      no_invites_with_discourse_connect: "Solo puedes invitar a usuarios ya registrados cuando DiscourseConnect está activado"
+      no_invites_without_local_logins: "Solo puedes invitar usuarios ya registrados cuando los inicios de sesión locales están desactivados"
     default_names:
       everyone: "todos"
       admins: "administradores"
@@ -422,25 +442,25 @@ es:
       one: "%{count} post"
       other: "%{count} publicaciones"
     "new-topic": |
-      Bienvenido a %{site_name} &mdash; **¡gracias por comenzar una nueva conversación!**
+      Te damos la bienvenida a %{site_name}. **¡Gracias por empezar un nuevo tema!**
 
-      - ¿El título suena interesante si lo lees en voz alta? ¿Es un buen resumen de lo que trata?
+      - ¿Suena el título interesante si lo lees en alto? ¿Es un buen resumen del contenido?
 
-      - ¿Quién estaría interesado en leer esto? ¿Por qué es importante? ¿Qué tipo de respuestas quisieras suscitar?
+      - ¿A quién le podría interesar? ¿Por qué importa? ¿Qué tipo de respuestas buscas?
 
-      - Incluye palabras de uso frecuente en tu tema para que otros puedan *encontrarlo*. Para agrupar tu tema con otros relacionados, selecciona una categoría.
+      - Incluye palabras comúnmente utilizadas en tu tema para que los demás puedan **encontrarlo**. Para agrupar el tema con otros relacionados, selecciona una categoría (o etiqueta).
 
-      Para más información, [visita nuestras directrices de la comunidad](%{base_path}/guidelines). Este panel solo aparecerá para tus primeras %{education_posts_text}.
+      Para más información [consulta nuestra nuestra guía](%{base_path}/guidelines). Este panel solo aparecera para tus primeros %{education_posts_text} mensajes.
     "new-reply": |
-      Bienvenido a %{site_name} &mdash; **¡gracias por contribuir a la conversación!**
+      Te damos la bienvenida a %{site_name}. **¡Gracias por contribuir!**
 
-      - ¿Tu respuesta mejora la conversación de alguna forma, aunque sea un poco?
+      - Sé amable con las demás personas de la comunidad.
 
-      - Sé amable con tus compañeros, miembros de la comunidad.
+      - ¿Aporta tu respuesta a la conversación?
 
-      - Las críticas constructivas son bienvenidas, pero recuerda criticar las *ideas*, no a las personas.
+      - Las críticas constructivas son bienvenidas, pero recuerda criticar las *ideas*, y no a las personas.
 
-      Para más consejos, [visita las directrices de la comunidad](%{base_path}/guidelines). Este panel solo aparecerá para tus primeras %{education_posts_text}.
+      Para más información [consulta nuestra guía](%{base_path}/guidelines). Este panel solo aparecerá para tus primeros %{education_posts_text} mensajes.
     avatar: |
       ### ¿Que tal si agregas una imagen para tu cuenta?
 
@@ -480,7 +500,7 @@ es:
     reviving_old_topic: |
       ### ¿Revivir este tema?
 
-      La última respuesta a este tema fue **%{time_ago}**. Tu publicación reactivará el tema subiéndolo a la parte superior de la lista y notificará a aquellos previamente involucrados en la conversación.
+      La última respuesta a este tema fue **%{time_ago}**. Tu publicación reactivará el tema, subiéndolo a la parte superior de la lista y notificando a aquellos previamente involucrados.
 
       ¿Estás seguro de que quieres continuar esta conversación antigua?
   activerecord:
@@ -505,6 +525,7 @@ es:
               cant_send_pm: "Lo sentimos, no puedes enviar un mensaje personal a este usuario."
               no_user_selected: "Debes seleccionar un usuario válido."
               reply_by_email_disabled: "Las respuestas por correo electrónico han sido desactivadas."
+              send_to_email_disabled: "Lo sentimos, no puedes enviar mensajes personales a direcciones de correo."
               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."
               unable_to_tag: "Hubo un error al etiquetar el tema."
@@ -544,7 +565,7 @@ es:
         web_hook:
           attributes:
             payload_url:
-              invalid: "La URL es inválida. La URL debería incluir http:// o https://. No está permitido ningún espacio en blanco."
+              invalid: "La URL no es válida. Debe incluir http:// o https://. No está permitido ningún espacio en blanco."
         custom_emoji:
           attributes:
             name:
@@ -553,6 +574,9 @@ es:
           attributes:
             execute_at:
               in_the_past: "debe ser en el futuro."
+            duration_minutes:
+              cannot_be_zero: "debe ser mayor que 0."
+              exceeds_maximum: "no puede ser más de 20 años."
         translation_overrides:
           attributes:
             value:
@@ -573,18 +597,18 @@ es:
     title: "Te damos la bienvenida a Discourse"
     body: |2
 
-      El primer párrafo de este tema destacado será visible para todos los usuarios como mensaje de bienvenida en tu página principal. ¡Es importante!
+      El primer párrafo de este tema fijado será visible para todos los usuarios como mensaje de bienvenida en tu página principal. ¡Es importante!
 
       **Edita esto** y describe brevemente a tu comunidad:
 
       - ¿Para quién es?
-      - ¿Qué pueden encontrar aquí?
+      - ¿Qué se puede encontrar aquí?
       - ¿Por qué deben venir aquí?
-      - ¿Dónde pueden leer más sobre la comunidad (enlaces, recursos, etc)?
+      - ¿Dónde pueden leer más sobre la comunidad (enlaces, recursos, etc.)?
 
       <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Quizás quieras cerrar este tema a través del administrador :wrench: (en la parte superior derecha o en la parte de abajo), para que las respuestas nuevas no se acumulen en el anuncio.
+      Quizás quieras cerrar este tema a través del administrador :wrench: (en la parte superior derecha o en la parte de abajo), para que las respuestas nuevas no se acumulen en un anuncio.
   lounge_welcome:
     title: "Te damos la bienvenida a la Sala VIP"
     body: |2
@@ -655,20 +679,20 @@ es:
     slow_down: "Has realizado esta acción demasiadas veces. Por favor, inténtalo de nuevo más tarde."
     too_many_requests: "Has realizado esta acción demasiadas veces. Por favor, espera %{time_left} antes de intentar nuevamente."
     by_type:
-      first_day_replies_per_day: "Has alcanzado el número máximo de respuestas que un usuario nuevo puede publicar en su primer día. Por favor, espera %{time_left} antes de intentar de nuevo."
-      first_day_topics_per_day: "Has alcanzado el número máximo de temas que un usuario nuevo puede publicar en su primer día. Por favor, espera %{time_left} antes de intentar de nuevo."
-      create_topic: "Estás creando temas a un ritmo muy rápido. Por favor, espera %{time_left} antes de intentar de nuevo."
-      create_post: "Has respondido muy rápido. Por favor, espera %{time_left} antes de intentar de nuevo."
-      delete_post: "Estás eliminando publicaciones muy rápido. Por favor, espera %{time_left} antes de intentar de nuevo."
-      public_group_membership: "Estás ingresando/saliendo de grupos muy frecuentemente. Por favor, espera %{time_left} antes de intentar de nuevo."
-      topics_per_day: "Has alcanzado el número máximo de temas nuevos. Por favor, espera %{time_left} antes de intentar de nuevo."
-      pms_per_day: "Has alcanzado el número máximo de mensajes. Por favor, espera %{time_left} antes de intentar de nuevo."
-      create_like: "Has alcanzado el número máximo de me gusta. Por favor, espera %{time_left} antes de intentar de nuevo."
-      create_bookmark: "Alcanzaste el número máximo de elementos guardados en marcadores. Por favor, espera %{time_left} antes de intentar de nuevo."
-      edit_post: "Has alcanzado el número máximo de ediciones. Por favor, espera %{time_left} antes de intentar de nuevo."
+      first_day_replies_per_day: "Te agradecemos el entusiasmo, ¡sigue así! Dicho esto, has llegado al límite máximo de respuestas que por seguridad un usuario nuevo puede publicar en su primer día. Por favor, espera %{time_left} para seguir respondiendo."
+      first_day_topics_per_day: "¡Te agradecemos el entusiasmo! Dicho esto, has llegado al límite de temas que los usuarios nuevos pueden por seguridad crear en su primer día. Por favor, espera %{time_left}, y podrás seguir creando nuevos temas."
+      create_topic: "Estás creando temas un poco rápido. Por favor, espera %{time_left} antes de intentarlo de nuevo."
+      create_post: "Estás respondiendo un poco rápido. Por favor, espera %{time_left} antes de volverlo a intentar."
+      delete_post: "Estás borrando publicaciones un poco rápido. Por favor, espera %{time_left} antes de volverlo a intentar."
+      public_group_membership: "Estás uniéndote o saliendo de grupos con mucha frecuencia. Por favor, espera %{time_left} antes de volverlo a intentar."
+      topics_per_day: "Has llegado al límite de nuevos temas permitidos al día. Podrás crear más en %{time_left}."
+      pms_per_day: "Has llegado al máximo de mensajes permitidos al día. Podrás publicar más en %{time_left}."
+      create_like: "¡Guau! ¡Has estado dándole mucho a me gusta! Has llegado al límite diario, pero conforme vayas subiendo de nivel de confianza, tu límite aumentará. Podrás seguir dándole a me gusta en %{time_left}."
+      create_bookmark: "Has llegado al límite de nuevos marcadores al día. Podrás añadir más cosas a marcadores en %{time_left}."
+      edit_post: "Has llegado al límite de ediciones en un día. Podrás seguir editando en %{time_left}."
       live_post_counts: "Estás pidiendo recuentos de publicaciones en vivo muy rápido. Por favor, espera %{time_left} antes de intentar de nuevo."
       unsubscribe_via_email: "Has alcanzado el número máximo de cancelaciones de subscripción por correo electrónico. Por favor, espera %{time_left} antes de intentar de nuevo."
-      topic_invitations_per_day: "Has alcanzado el número máximo de invitaciones al tema. Por favor, espera %{time_left} antes de intentar de nuevo."
+      topic_invitations_per_day: "Has llegado al límite de invitaciones a temas. Podrás enviar más invitaciones en %{time_left}."
     hours:
       one: "%{count} hora"
       other: "%{count} horas"
@@ -772,7 +796,7 @@ es:
       unknown: "navegador desconocido"
     device:
       android: "Dispositivo Android"
-      chromebook: "Chromebook"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -783,7 +807,7 @@ es:
       unknown: "dispositivo desconocido"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -798,6 +822,7 @@ es:
     error_staged: "Se produjo un error al cambiar tu correo electrónico. La dirección ya está en uso por un usuario temporal."
     already_done: "Lo sentimos, este enlace de confirmación ya no es válido. ¿Quizá tu correo electrónico ya fue cambiado?"
     confirm: "Confirmar"
+    max_secondary_emails_error: "Has llegado al límite de cuentas de correo secundarias."
     authorizing_new:
       title: "Confirmar tu nuevo correo electrónico"
       description: "Por favor, confirma que quieres cambiar tu dirección de correo electrónico a:"
@@ -948,9 +973,9 @@ es:
     mute_topic: "Silenciar todas las notificaciones de este tema, %{link}"
     unwatch_category: "Dejar de vigilar todos los temas de %{category}"
     mailing_list_mode: "Desactivar el modo lista de correo"
-    all: "No enviarme ningún correo electrónico desde %{sitename}"
+    all: "No enviarme ningún correo desde %{sitename}"
     different_user_description: "Actualmente has iniciado sesión con un usuario diferente al que te hemos enviado el correo electrónico. Por favor, cierra sesión o entra en modo anónimo antes de intentarlo de nuevo."
-    not_found_description: "Lo sentimos, no pudimos encontrar esta cancelación de suscripción. ¿Es posible que el enlace de tu correo electrónico haya caducado?"
+    not_found_description: "Lo sentimos, pero no hemos encontrado este enlace de baja. ¿Es posible que el enlace en el correo sea antiguo y haya expirado?"
     log_out: "Cerrar sesión"
     submit: "Guardar preferencias"
     digest_frequency:
@@ -1167,7 +1192,7 @@ es:
       yaxis: "Número de mensajes"
       description: "Número de mensajes personales enviados automáticamente por el sistema."
     moderator_warning_private_messages:
-      title: "Advertencias al moderador"
+      title: "Advertencias de moderación"
       xaxis: "Día"
       yaxis: "Número de mensajes"
       description: "Número de advertencias enviadas a través de mensaje personal por moderadores."
@@ -1322,8 +1347,13 @@ es:
     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."
+    google_oauth2_config_warning: 'El servidor está configurado para permitir registrarse e iniciar sesión con Google OAuth2 (enable_google_oauth2_logins), pero la ID de cliente y el secreto no están configurados. Ve a <a href="%{base_path}/admin/site_settings">los ajustes del sitio</a> y actualízalos. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Mira esta guía para más información</a>.'
+    facebook_config_warning: 'El servidor está configurado para permitir registrarse e iniciar sesión con Facebook (enable_facebook_logins), pero la ID de cliente y el secreto no están configurados. Ve a <a href="%{base_path}/admin/site_settings">los ajustes del sitio</a> y actualízalos.<a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Mira esta guía para más información</a>.'
+    twitter_config_warning: 'El servidor está configurado para permitir registrarse e iniciar sesión con Twitter (enable_twitter_logins), pero la ID de cliente y el secreto no están configurados. Ve a <a href="%{base_path}/admin/site_settings">los ajustes del sitio</a> y actualízalos.<a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Mira esta guía para más información</a>.'
+    github_config_warning: 'El servidor está configurado para permitir registrarse e iniciar sesión con GitHub (enable_github_logins), pero la ID de cliente y el secreto no están configurados. Ve a <a href="%{base_path}/admin/site_settings">los ajustes del sitio</a> y actualízalos. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Mira esta guía para más información</a>.'
     s3_config_warning: 'El servidor está configurado para permitir subir archivos a S3, pero por al menos una de las siguientes configuraciones no se ha establecido: s3_access_key_id, s3_secret_access_key o s3_upload_bucket. Ve a <a href="%{base_path}/admin/site_settings">los ajustes del sitio</a> y actualiza la configuración. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Revisa «How to set up image uploads to S3?» para aprender más</a>.'
     s3_backup_config_warning: 'El servidor está configurado para permitir subir los respaldos a S3, pero por al menos una de las siguientes configuraciones no se ha establecido: : s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, o s3_backup_bucket. Ve a <a href="%{base_path}/admin/site_settings">los ajustes del sitio</a> y actualiza la configuración. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Revisa «How to set up image uploads to S3?» para aprender más</a>.'
+    s3_cdn_warning: 'El servidor está configurado para cargar los archivos a S3, pero no hay CDN de S3 configurado. Esto puede llevar a grandes costes de S3 y mal rendimiento del sitio. <a href="https://meta.discourse.org/t/-/148916" target="_blank">Ver "Using Object Storage for Uploads" para más detalles</a>.'
     image_magick_warning: 'El servidor está configurado para permitir miniaturas de imágenes grandes, pero ImageMagick no está instalado. Instala ImageMagick usando tu administrador de paquetes favorito o <a href="https://www.imagemagick.org/script/download.php" target="_blank">descarga la última versión</a>.'
     failing_emails_warning: 'Hay %{num_failed_jobs} tareas de correo electrónico que fallaron. Revisa tu app.yml y asegúrate de que la configuración del servidor de correo es correcta. <a href="%{base_path}/sidekiq/retries" target="_blank">Mira las tareas que fallaron en Sidekiq</a>.'
     subfolder_ends_in_slash: "La configuación del subdirectorio no es correcta; el campo DISCOURSE_RELATIVE_URL_ROOT termina con una barra."
@@ -1332,14 +1362,11 @@ es:
       other: "El polling por correo electrónico ha generado %{count} errores en las últimas 24 horas. Revisa <a href='%{base_path}/logs' target='_blank'>los registros</a> para más detalles."
     missing_mailgun_api_key: "El servidor está configurado para enviar correos electrónicos a través de Mailgun pero no has proporcionado una clave API que se utiliza para verificar los mensajes de webhook."
     bad_favicon_url: "El favicon está produciendo errores en el proceso de carga. Revisa la opción favicon en los <a href='%{base_path}/admin/site_settings'>ajustes del sitio</a>."
-    deprecated_api_usage: "Detectamos una solicitud de API utilizando un método de autenticación obsoleto. Actualicelo para usar la autenticación <a href='https://meta.discourse.org/t/-/22706'>basada en un encabezado</a>. Después de actualizar, este mensaje puede tardar 24 horas en desaparecer."
-    update_mail_receiver: "Detectamos una versión desactualizada del receptor de correo. Clic <a href='https://meta.discourse.org/t/-/133491'>aquí</a> para instrucciones de actualización. Después de actualizar, este mensaje puede tardar 24 horas en desaparecer."
     poll_pop3_timeout: "La conexión al servidor POP3 está superando el tiempo de espera. No se pudieron recuperar los correos electrónicos entrantes. Por favor, revisa los <a href='%{base_path}/admin/site_settings/category/email'>ajustes de POP3</a> y tu proveedor de servicio."
     poll_pop3_auth_error: "La conexión al servidor POP3 está fallando debido a un error de autenticación. Por favor, revisa los <a href='%{base_path}/admin/site_settings/category/email'>ajustes POP3</a>."
     force_https_warning: "Tu sitio web está usando SSL. Pero «<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>» no está habilitado todavía en la configuración de tu sitio."
     out_of_date_themes: "Hay actualizaciones disponibles para los siguientes temas:"
     unreachable_themes: "No pudimos verificar actualizaciones de los siguientes temas:"
-    watched_word_regexp_error: "La expresión regular para %{action} las palabras vigiladas es inválida. Por favor, revisa tu <a href='%{base_path}/admin/logs/watched_words'>configuración de palabras vigiladas</a> o desactiva la opción «expresiones regulares de palabras vigiladas»"
   site_settings:
     display_local_time_in_user_card: "Mostrar la hora local basada en el la zona horaria cuando se abra la tarjeta de un usuario."
     censored_words: "Las palabras serán reemplazadas con &#9632;&#9632;&#9632;&#9632;"
@@ -1367,10 +1394,8 @@ es:
     search_query_log_max_size: "Cantidad máxima de consultas que se conservan"
     search_query_log_max_retention_days: "Tiempo máximo que se mantienen las consultas de búsqueda, en días."
     search_ignore_accents: "Ignorar los acentos en busquedas de texto."
-    category_search_priority_very_low_weight: "Peso aplicado para la ordenación de categorías con prioridad muy baja."
     category_search_priority_low_weight: "Peso aplicado para la ordenación de categorías con prioridad baja."
     category_search_priority_high_weight: "Peso aplicado para la ordenación de categorías con prioridad alta."
-    category_search_priority_very_high_weight: "Peso aplicado para la ordenación de categorías con prioridad muy alta."
     allow_uncategorized_topics: "Permitir la creación de temas sin categoría. AVISO: Si ya hay algún tema sin categoría, debes recategorizarlo antes de deshabilitar esta opción."
     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 si la categoría es diferente. allow_duplicate_topic_titles debe tener el valor false."
@@ -1380,7 +1405,7 @@ es:
     site_description: "Describe este sitio en una frase, utilizada en la etiqueta meta description."
     short_site_description: "Descripción breve, utilizada como el título de la etiqueta en la página principal."
     contact_email: "Dirección de correo electrónico del responsable de este sitio. Utilizado para notificaciones críticas, así como en la página de <a href='%{base_path}/about' target='_blank'>/información</a> de contacto para asuntos urgentes."
-    contact_url: "URL de contacto para este sitio. Utilizada en el formulario de contacto para temas urgentes en <a href='%{base_path}/about' target='_blank'>/información</a>."
+    contact_url: "Dirección URL de contacto para el sitio. Se mostrará en la página de <a href='%{base_path}/about' target='_blank'>/about</a> (acerca de) para temas urgentes."
     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)"
@@ -1402,14 +1427,15 @@ es:
     exclude_rel_nofollow_domains: "Una lista de dominios a cuyos enlaces no se les añadirá la etiqueta nofollow. ejemplo.com permitirá automáticamente sub.ejemplo.com también. Como mínimo, deberías añadir el dominio de este sitio para ayudar a los rastreadores web a encontrar todo el contenido. Si otras partes de este sitio web están en otros dominios, añádelos también."
     post_excerpt_maxlength: "Extensión máxima del resumen / extracto de una publicación."
     topic_excerpt_maxlength: "Longitud máxima de un extracto o resumen de tema, generado a partir de la primera publicación de un tema."
-    show_pinned_excerpt_mobile: "Mostrar extracto de temas destacados en la vista móvil."
-    show_pinned_excerpt_desktop: "Mostrar extracto de temas destacados en la vista de escritorio."
+    show_pinned_excerpt_mobile: "Mostrar extracto de temas fijados en la vista móvil."
+    show_pinned_excerpt_desktop: "Mostrar extracto de temas fijados en la vista de escritorio."
     post_onebox_maxlength: "Extensión máxima en caracteres de una publicación de Discourse en formato onebox."
     blocked_onebox_domains: "Una lista de dominios que nunca será oneboxed."
     allowed_inline_onebox_domains: "Una lista de dominios que serán oneboxed en forma de miniatura si están vinculados sin título"
     enable_inline_onebox_on_all_domains: "Ignorar el ajuste del sitio inline_onebox_domain_allowlist y permitir inline onebox en todos los dominios."
     force_custom_user_agent_hosts: "Hosts que se utilizará para el agente usuario personalizado de onebox en todas las solicitudes. (Especialmente útil para hosts que limitan el acceso por usuario agente)."
     max_oneboxes_per_post: "Número máximo de oneboxes en una publicación."
+    facebook_app_access_token: "Token generado desde app ID y secreto de Facebook. Usado para generar oneboxes de Instagram."
     logo: "La imagen del logotipo en la parte superior izquierda de tu sitio. Utiliza una imagen rectangular ancha con una altura de 120 y una relación de aspecto superior a 3:1. Si se deja en blanco, se mostrará el texto del título del sitio."
     logo_small: "La pequeña imagen del logotipo en la parte superior izquierda de tu sitio al desplazarse hacia abajo. Utiliza un cuadrado de 120 x 120. Si se deja en blanco, se mostrará un glifo local."
     digest_logo: "La imagen de logotipo alternativa utilizada en la parte superior del resumen de correo electrónico de su sitio. Utiliza un rectángulo ancho. No debe ser una imagen SVG. Si se deja en blanco, se utilizará la imagen del «logo»."
@@ -1419,6 +1445,7 @@ es:
     mobile_logo_dark: "Alternativa para el ajuste «mobile logo» en la paleta de colores oscura."
     large_icon: "Imagen utilizada como base para otros iconos de metadatos. Lo ideal sería que fuera mayor que 512 x 512. Si se deja en blanco, se utilizará logo_small."
     manifest_icon: "Imagen utilizada como logo/imagen de bienvenida en Android. Se cambiará automáticamente el tamaño a 512 × 512. Si se deja en blanco, se utilizará large_icon."
+    manifest_screenshots: "Capturas de pantalla para mostrar las funcionalidades del sitio web en la pantalla de instalación. Todas las imágenes deben ser alojadas localmente y tener las mismas dimensiones."
     favicon: "Un favicon para su sitio, ve <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://es.wikipedia.org/wiki/Favicon</a>. Para trabajar correctamente sobre un CDN debe ser un png. Se cambiará automáticamente el tamaño a 32x32. Si se deja en blanco, se utilizará large_icon."
     apple_touch_icon: "Icono utilizado para dispositivos táctiles de Apple. Se redimensionará automáticamente a 180x180. Si se deja en blanco, se utilizará el icono grande."
     opengraph_image: "Imagen de gráfico abierto predeterminada, utilizada cuando la página no tiene otra imagen adecuada. Si se deja en blanco, se utilizará large_icon"
@@ -1429,7 +1456,6 @@ es:
     detailed_404: "Proporciona más detalles a los usuarios acerca de por qué no pueden acceder a un tema en particular. Nota: esto es menos seguro dado que los usuarios sabrán si una URL enlaza a un tema válido."
     enforce_second_factor: "Obligar a usar la autenticación de dos factores. Seleccionar «all» para obligar a todos y «staff» para obligar sólo a usuarios del personal."
     force_https: "Forzar al sitio a utilizar solo HTTPS. AVISO: ¡NO actives esta opción a menos que verifiques completamente la configuración y funcione correctamente en todas partes! ¿Has verificado también que el CDN, los inicios de sesión a través de redes sociales y cualquier logo externo / dependencia son compatibles con HTTPS?"
-    same_site_cookies: "Usar las mismas cookies del sitio, 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."
@@ -1438,6 +1464,7 @@ es:
     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."
     enable_system_message_replies: "Permite a los usuarios responder a los mensajes del sistema, incluso si los mensajes privados están inhabilitados."
     enable_long_polling: "Los mensajes usados para notificaciones pueden usar el long polling"
+    enable_chunked_encoding: "Activar respuestas en lotes del servidor. Esta funcionalidad debería funcionar en casi todos los entornos, pero algunos proxies pueden causar que las respuestas tarden"
     long_polling_base_url: "URL base usada para el long polling (cuando un CDN esta sirviendo contenido dinámico, asegúrate de ajustar esto al pull de origen) ejemplo: http://origin.site.com"
     long_polling_interval: "Cantidad de tiempo que el servidor debe de esperar antes de responder a los clientes que no hay datos para enviar (solamente usuarios con sesión iniciada)."
     polling_interval: "Cuando no este en long polling, frecuencia con la que los clientes con sesión iniciada hacen poll en milisegundos"
@@ -1466,18 +1493,29 @@ es:
     must_approve_users: "El staff debe aprobar todas las cuentas nuevas antes de que se les permita acceder al sitio."
     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."
+    review_every_post: "Todas las publicaciones deben ser revisadas. ¡ADVERTENCIA! NO SE RECOMIENDA PARA SITIOS CON MUCHA ACTIVIDAD."
     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."
     persistent_sessions: "Los usuarios permanecerán con la sesión abierta aunque cierren su navegador"
     maximum_session_age: "El usuario permanecerá con su sesión iniciada n horas desde su última visita"
+    ga_version: "Versión de Google Universal Analytics a usar: v3 (analytics.js), v4 (gtag)"
+    ga_universal_tracking_code: "ID de código de seguimiento de Google Universal Analytics, ej.: UA-12345678-9. Ver <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_domain_name: "Nombre de dominio para Google Universal Analytics. Ver <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "Activar seguimiento multi-dominio de Google Universal Analytics. Los enlaces salientes a estos dominios tendrán la id de cliente añadida a ellos. Ver <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Google's Cross-Domain Tracking guide.</a>"
+    gtm_container_id: "ID de contenedor de Google Tag Manager. Ej.: GTM-ABCDEF. <br/>Nota: puede que los scripts de terceros cargados por GTM tengan que ser añadidos a la lista de admitidos en «content security policy script src»."
     enable_escaped_fragments: "Ir a la API Ajax-Crawling de Google si no se detecta ningún webcrawler. Visita </a>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     moderators_manage_categories_and_groups: "Permitir a los moderadores administrar categorías y grupos"
     cors_origins: "Orígenes permitidos para las solicitudes de origen cruzado (CORS). Cada origen debe incluir http:// or https://. La variable env DISCOURSE_ENABLE_CORS debe establecerse como verdadero para activar CORS."
+    use_admin_ip_allowlist: "Los administradores solo pueden iniciar sesión si están en una dirección IP definida en la lista de direcciones IP revisadas (Administrados > Registros > Direcciones IP)."
+    blocked_ip_blocks: "Lista de direcciones IP privadas en las que Discourse no debería hacer crawling"
+    allowed_internal_hosts: "Lista de hosts internos sobre los que discourse puede hacer crawl de forma segura para oneboxes y otras finalidades."
     allowed_iframes: "Una lista de prefijos de dominios para iframe src que discourse puede permitir de forma segura en publicaciones"
+    allowed_crawler_user_agents: "Agentes de usuario de crawlers a los que se debe permitir el acceso al sitio. ¡ADVERTENCIA! ¡CONFIGURAR ESTO INHABILITARÁ A TODOS LOS CRAWLERS QUE NO SE ENCUENTRAN AQUÍ!"
     slow_down_crawler_user_agents: "Agentes de usuario de crawlers a los que se debe aplicar una cuota limitada en robots.txt utilizando la directiva de retardo de rastreo"
     slow_down_crawler_rate: "Si slow_down_crawler_user_agents es especificado, esta proporción aplicará para todos los crawlers (número de segundos de demora entre solicitudes)"
     content_security_policy: "Activar la política de seguridad de contenido (CSP)"
     content_security_policy_report_only: "Activar solo el informe de la política de seguridad de contenido (CPS)"
     content_security_policy_collect_reports: "Habilitar la recolección de reportes de violación de CSP en /csp_reports"
+    content_security_policy_frame_ancestors: "Restringir quién puede incrustar este sitio en iframes a través de CSP. Controla los hosts permitidos en <a href='%{base_path}/admin/customize/embedding'>Insertado</a>"
     invalidate_inactive_admin_email_after_days: "Las cuentas administrativas que no hayan visitado la página en este número de días deberán validar de nuevo su dirección de correo electrónico antes de iniciar sesión. Establecer a 0 para desactivar."
     top_menu: "Determinar los elementos que aparecen en el menú de navegación de la página de inicio y su orden. Ejemplo últimos|nuevos|no leídos|categorías|destacados|leídos|publicados|marcadores"
     post_menu: "Determinar los elementos que aparecen en el menú de publicación  y su orden. Ejemplo: me gusta|editar|reportar|eliminar|compartir|guardar en marcadores|responder"
@@ -1524,27 +1562,26 @@ es:
     min_admin_password_length: "Longitud mínima de la contraseña para un administrador."
     password_unique_characters: "Número mínimo de caracteres únicos que la contraseña debe tener."
     block_common_passwords: "No permitir contraseñas que formen parte de las 10.000 contraseñas más comunes."
-    external_auth_skip_create_confirm: Al registrarse a través de autenticación externa, omitir la ventana emergente de Crear cuenta. Mejor usado junto con sso_overrides_email, sso_overrides_username y sso_overrides_name.
-    external_auth_immediately: "Redirigir automáticamente al sistema de inicio de sesión externo sin interacción por parte de los usuarios. Esto solo tiene efecto cuando login_required es verdadero y solo hay un método de autenticación externo"
-    enable_sso: "Habilitar el inicio de sesión único a través de un sitio externo (AVISO: ¡LAS DIRECCIONES DE CORREO ELECTRÓNICO DE LOS USUARIOS *TIENEN* QUE SER VALIDADAS EN EL SITIO EXTERNO!)"
-    verbose_sso_logging: "Registrar diagnósticos detallados relacionados con SSO en <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    enable_sso_provider: "Implementar el protocolo del proveedor de SSO de Discourse en el /session/sso_provider endpoint, requiere que se configure sso_provider_secrets"
-    sso_url: "URL del endpoint para inicio de sesión único (debe incluir http:// o https://)"
-    sso_secret: "Cadena secreta utilizada para autenticar criptográficamente la información del SSO, asegúrate de que tenga 10 caracteres o más"
-    sso_provider_secrets: "Una lista de pares de dominio secreto que utiliza Discourse como proveedor de SSO. Asegúrate de que la clave secreta SSO tenga de 10 caracteres o más. El símbolo de comodín * se puede usar para hacer coincidir cualquier dominio o solo una parte de él (por ejemplo, * .example.com)."
-    sso_overrides_bio: "Sobrescribe la biografía del usuario en su perfil y deshabilita la posibilidad de cambiarla"
-    sso_overrides_groups: "Sincronice todas la membresías manuales de grupo con los grupos especificados en el atributo sso de grupos (ADVERTENCIA: si no especificas grupos, todas la membresías manuales de grupo se eliminarán para el usuario)"
-    sso_overrides_email: "Sobreescribe el correo electrónico local con el correo electrónico del SSO en cada inicio de sesión y evita los cambios locales. Se aplica a todos los proveedores de autenticación. (ADVERTENCIA: pueden ocurrir discrepancias debido a la normalización de los correos electrónicos locales)"
-    sso_overrides_username: "Sobreescribe el nombre de usuario local con el nombre de usuario de SSO en cada inicio de sesión y evita cambios locales. Se aplica a todos los proveedores de autenticación. (ADVERTENCIA: pueden ocurrir discrepancias debido a diferencias en la longitud/requisitos del nombre de usuario)"
-    sso_overrides_name: "Sobreescribe el nombre completo local con el nombre completo de SSO en cada inicio de sesión y evita cambios locales. Se aplica a todos los proveedores de autenticación."
-    sso_overrides_avatar: "Sobrescribe el avatar del usuario con el avatar del sitio externo del payload del SSO. Si está habilitado, los usuarios no podrán subir avatares en Discourse."
-    sso_overrides_location: "Sobreescribe la ubicación del usuario con la ubicación del usuario de SSO y evita cambios locales."
-    sso_overrides_website: "Sobreescribe la página web del usuario con la página que venga en SSO y evita cambios locales."
-    sso_overrides_profile_background: "Sobrescribe el fondo del perfil del usuario con el avatar del sitio externo desde el payload del SSO."
-    sso_overrides_card_background: "Sobrescribe el fondo de la tarjeta de usuario con el avatar de sitio externo desde el payload del SSO."
-    sso_not_approved_url: "Redireccionar cuentas SSO sin aprobar a esta URL"
-    sso_allows_all_return_paths: "No restringe el dominio para return_paths provisto por SSO (por defecto, el return_paths debe ser sobre el sitio actual)."
-    enable_local_logins: "Habilitar las cuentas basadas en el inicio de sesión con nombre de usuario y contraseña locales. Esto debe estar habilitado para que las invitaciones funcionen. ADVERTENCIA: si está deshabilitado, es posible que no puedas iniciar sesión si no has configurado previamente al menos un método de inicio de sesión alternativo."
+    auth_skip_create_confirm: Al registrarse a través de autenticación externa, saltarse la ventana de creación de cuenta. Funciona mejor si los ajustes auth_overrides_email, auth_overrides_username y auth_overrides_name están activados.
+    auth_immediately: "Redireccionar automáticamente al sistema de inicio de sesión externo sin interacción del usuario. Solo funciona cuando el ajuste login_required está activado, y solo hay un método de autenticación externo."
+    enable_discourse_connect: "Activar inicio de sesión a través de DiscourseConnect (antiguamente «Discourse SSO») (CUIDADO: ¡LAS DIRECCIONES DE CORREO *DEBEN* SER VALIDADAS POR EL SITIO EXTERNO!)"
+    verbose_discourse_connect_logging: "Guardar registros detallados de diagnóstico de DiscourseConnect en <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    enable_discourse_connect_provider: "Implementar el proveedor de protocolo DiscourseConnect (antiguamente «Discourse SSO») en la ruta /session/sso_provider, discourse_connect_provider_secrets debe estar rellenado."
+    discourse_connect_url: "URL del endpoint de DiscourseConnect (debe incluir http:// o https://)"
+    discourse_connect_secret: "Secreto usado para autenticar criptográficamente la información de DiscourseConnect, asegúrate de que tiene 10 o más caracteres de longitud"
+    discourse_connect_overrides_bio: "Sobreescribir la biografía del usuario y evita que los usuarios la cambien"
+    discourse_connect_overrides_groups: "Sincronizar todas las membresías manuales a grupos con los grupos especificados en el atributo groups (CUIDADO: si indicas grupos, todas las membresías manuales del usuario serán borradas)"
+    auth_overrides_email: "Sobreescribir la dirección de correo local con la del sitio externo en cada inicio de sesión, y evitar cambios locales. Aplica a todos los proveedores de autenticación (CUIDADO: puede haber diferencias por la normalización de direcciones locales de correo)"
+    auth_overrides_username: "Sobreescribir nombre de usuari locale con el del sitio externo en cada inicio de sesión, y evitar cambios locales. Aplica a todos los proveedores de autenticación. (CUIDADO: puede haber diferencias si hay distintos requisitos en los nombres de usuarios, como los caracteres o la longitud)"
+    auth_overrides_name: "Sobreescribir nombre completo local con el del sitio externo en cada inicio de sesión, y evitar cambios locales. Aplica a todos los proveedores de autenticación."
+    discourse_connect_overrides_avatar: "Sobreescribir el avatar del usuario por el dado por DiscourseConnect. Si se activa, los usuarios no podrán cambiar su avatar ni subir nuevos desde Discourse."
+    discourse_connect_overrides_location: "Sobreescribir la ubicación del usuario con la dada por DiscourseConnect, y evitar cambios locales."
+    discourse_connect_overrides_website: "Sobreescribir página web de los usuarios con la dada por DiscourseConnect, y evitar cambios locales."
+    discourse_connect_overrides_profile_background: "Sobreescribir el fondo de usuario con el externo dado por DiscourseConnect."
+    discourse_connect_overrides_card_background: "Sobreescribir el fondo de la tarjeta de usuario con el dado por DiscourseConnect."
+    discourse_connect_not_approved_url: "Redireccionar cuentas no aprobadas a esta URL al iniciar sesión con DiscourseConnect."
+    discourse_connect_allows_all_return_paths: "No restringir el dominio para return_paths (rutas de vuelta) de DiscourseConnect (por defecto, la ruta de vuelta debe estar en el sitio actual)"
+    enable_local_logins: "Activar inicio de sesión local con usuario y contraseña. CUIDADO: si lo desactivas, puede que no puedas iniciar sesión si no has configurado otro medio alternativo primero."
     enable_local_logins_via_email: "Permitir a los usuarios que soliciten un enlace de inicio de sesión único que se les enviará por correo electrónico."
     allow_new_registrations: "Permitir el registro de usuarios nuevos. Desactiva esta opción para que nadie pueda crear una cuenta nueva."
     enable_signup_cta: "Mostrar un aviso a los usuarios anónimos que vuelvan a visitar el sitio animándoles a registrarse."
@@ -1559,9 +1596,13 @@ es:
     enable_facebook_logins: "Activar autenticación mediante Facebook, requiere una facebook_app_id y un facebook_app_secret. Ver <a href='https://meta.discourse.org/t/13394' target='_blank'>configuración del inicio de sesión mediante Facebook para Discourse</a>."
     facebook_app_id: "App id de Facebook para inicio de sesión y compartir, registrada en <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
     facebook_app_secret: "Clave secreta de la app para la autenticación mediante Facebook, registrado en <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    enable_github_logins: "Activar la autenticación con GitHub, github_client_id y github_client_secret son obligatorios. Ver <a href='https://meta.discourse.org/t/13745' target='_blank'>Configuring GitHub login for Discourse</a>."
+    github_client_id: "Id de cliente para la autenticación con GitHub, registrada en <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    github_client_secret: "Secreto de cliente para la autenticación con GitHub, registrado en <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     enable_discord_logins: "¿Permitir a los usuarios la autenticación mediante Discord?"
     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 iniciar sesión con Discord a miembros de estas guilds de Discord. Usa la ID numérica del guild. Para más información, mira las instrucciones <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">aquí</a>. Deja en blanco para permitir cualquier guild.'
     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"
@@ -1583,7 +1624,6 @@ es:
     top_topics_formula_log_views_multiplier: "valor del multiplicador de visitas (n) en la fórmula de temas destacados: `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: "valor del multiplicador de me gusta en la primera publicación (n) en la fórmula de temas destacados:: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "valor del multiplicador de me gusta por publicación (n) en la fórmula de temas destacados: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Número de publicaciones antiguas objeto de rebake cada 15 minutos."
     enable_safe_mode: "Permitir a los usuarios ingresar al modo seguro para depurar plugins."
     rate_limit_create_topic: "Después de crear un tema, los usuarios deben esperar (n) segundos antes de crear otro tema."
     rate_limit_create_post: "Después de realizar una publicación, los usuarios deben esperar (n) segundos antes de crear otra publicación."
@@ -1594,13 +1634,15 @@ es:
     max_bookmarks_per_day: "Máximo número de marcadores por usuario por día."
     max_edits_per_day: "Máximo número de ediciones por usuario por día."
     max_topics_per_day: "Máximo número de temas que un usuario puede crear al día."
+    max_personal_messages_per_day: "Número máximo de nuevos mensajes personales que un usuario puede crear al día."
     max_invites_per_day: "Máximo número de invitaciones que un usuario puede enviar al día."
     max_topic_invitations_per_day: "Máximo número de invitaciones a un tema que un usuario puede enviar por día."
     max_logins_per_ip_per_hour: "Máximo número de inicios de sesión permitidos por dirección IP por hora."
     max_logins_per_ip_per_minute: "Máximo número de inicios de sesión permitidos por dirección IP por minuto."
-    max_post_deletions_per_minute: "Número máximo de publicaciones que un usuario puede eliminar por minuto."
-    max_post_deletions_per_day: "Número máximo de publicaciones que un usuario puede eliminar por día."
+    max_post_deletions_per_minute: "Número máximo de publicaciones que un usuario puede borrar por minuto. Poner a 0 para no dejar borrar publicaciones."
+    max_post_deletions_per_day: "Número máximo de publicaciones que un usuario puede borrar al día. Poner a 0 para no permitir borrar publicaciones."
     invite_link_max_redemptions_limit: "Los canjes máximos permitidos para los enlaces de invitación no pueden ser más que este valor."
+    invite_link_max_redemptions_limit_users: "El número máximo de usuarios que pueden registrarse desde un enlace de invitación generado por usuarios regulares no puede sobrepasar este valor."
     alert_admins_if_errors_per_minute: "Número de errores por minuto que activa la alerta a los administradores. Un valor de 0 desactiva esta funcionalidad. NOTA: requiere reiniciar."
     alert_admins_if_errors_per_hour: "Número de errores por hora que activa la alerta a los administradores. Un valor de 0 desactiva esta funcionalidad. NOTA: requiere reiniciar."
     categories_topics: "Número de temas que se muestran en la pagina de /categories. Si estableces el valor en 0, automáticamente intentará conseguir un valor para mantener las dos columnas simétricas (categorías y temas)."
@@ -1622,6 +1664,8 @@ es:
     avatar_sizes: "Lista de tamaños de los avatares generados automáticamente."
     external_system_avatars_enabled: "Usar un servicio externo para los avatares."
     external_system_avatars_url: "Dirección URL del servicio externo para los avatares. Las sustituciones permitidas son {username} {first_letter} {color} {size}"
+    external_emoji_url: "URL del servicio externo para imágenes de emoji. Dejar en blanco para desactivar."
+    use_site_small_logo_as_system_avatar: "Usar el logo pequeño del sitio como avatar del usuario del sistema. El logo debe haber sido cargado previamente."
     restrict_letter_avatar_colors: "Una lista de códigos de color hexadecimales de 6 dígitos usados para los fondos de los avatares de letras."
     selectable_avatars_enabled: "Obligar a los usuarios a elegir una foto de perfil de la lista."
     selectable_avatars: "Lista de avatares que los usuarios pueden elegir."
@@ -1633,7 +1677,6 @@ es:
     strip_image_metadata: "Eliminar metadatos de imágenes."
     min_ratio_to_crop: "Proporción utilizada para recortar imágenes altas. Ingresa el resultado de anchura / altura."
     simultaneous_uploads: "Número máximo de archivos que se pueden arrastrar y soltar en el editor"
-    enable_flash_video_onebox: "Habilitar el insertado de enlaces swf y flv (Adobe Flash) en formato Onebox. AVISO: podría introducir riesgos de seguridad."
     default_invitee_trust_level: "Nivel de confianza por defecto (0-4) para usuarios invitados."
     default_trust_level: "Nivel de confianza por defecto (0-4) para todos los usuarios nuevos. ¡AVISO! Cambiar esto puede resultar en alto riesgo de spam."
     tl1_requires_topics_entered: "Cantidad de temas a los que un usuario nuevo debe entrar antes de que sea promovido al nivel de confianza 1"
@@ -1662,11 +1705,12 @@ es:
     tl3_links_no_follow: "No quitar rel=nofollow de los enlaces publicados por usuarios con nivel de confianza 3."
     trusted_users_can_edit_others: "Permitir a los usuarios con alto nivel de confianza editar el contenido de otros usuarios"
     min_trust_to_create_topic: "El nivel mínimo de confianza requerido para crear un nuevo tema."
-    allow_flagging_staff: "Si está habilitado, los usuarios pueden reportar publicaciones hechas desde cuentas del staff."
+    allow_flagging_staff: "Si está activado, los usuarios pueden reportar publicaciones hechas desde cuentas del staff."
     min_trust_to_edit_wiki_post: "El nivel mínimo de confianza requerido para editar una publicación marcada como wiki."
     min_trust_to_edit_post: "El nivel mínimo de confianza requerido para editar publicaciones."
     min_trust_to_allow_self_wiki: "El nivel mínimo de confianza requerido para que un usuario convierta sus propias publicaciones a wiki."
     min_trust_to_send_messages: "El nivel mínimo de confianza requerido para crear nuevos mensajes personales."
+    min_trust_to_send_email_messages: "Nivel de confianza mínimo para mandar mensajes personales a través de correo electrónico."
     min_trust_to_flag_posts: "El nivel mínimo de confianza requerido para reportar publicaciones"
     min_trust_to_post_links: "El nivel mínimo de confianza requerido para incluir enlaces en una publicación"
     min_trust_to_post_embedded_media: "Nivel confianza mínimo para incluir imágenes en una publicación"
@@ -1693,6 +1737,7 @@ es:
     body_min_entropy: "La mínima entropía permitida (caracteres únicos) requerida para el cuerpo de un publicación."
     allow_uppercase_posts: "Permitir todas mayúsculas en el título de un tema o en el cuerpo del mensaje"
     max_consecutive_replies: "Número de mensajes seguidos que un usuario debe publicar en un tema antes de que se le prohíba añadir otra respuesta."
+    enable_filtered_replies_view: 'Hacer que el botón «(n) respuestas» colapse todas las demás publicaciones y solo muestre la publicación actual y sus respuestas.'
     title_fancy_entities: "Convertir caracteres ASCII comunes en entidades HTML de adorno en el título de los temas, como SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "La extensión mínima que un título debe tener antes de que se revise la existencia de temas similares."
     desktop_category_page_style: "Estilo visual de la página de /categorías."
@@ -1742,10 +1787,11 @@ es:
     min_first_post_typing_time: "Período mínimo en milisegundos durante el que un usuario debe escribir en su primera publicación, si no se llega a este umbral, la publicación entrará automáticamente a la cola de moderación. Establece esta opción a 0 para deshabilitar (no recomendado)."
     auto_silence_fast_typers_on_first_post: "Silenciar automáticamente a usuarios que no cumplan el umbral establecido en min_first_post_typing_time"
     auto_silence_fast_typers_max_trust_level: "Nivel máximo de confianza hasta el que se podrán silenciar usuarios que escriban demasiado rápido en su primera publicación"
-    auto_silence_first_post_regex: "Expresión regular que no distingue mayúsculas y minúsculas que si es detectada hará que la primera publicación de un usuario sea silenciada y colocada en espera de aprobación. Ejemplo: furia|a[bc]a hará que todos los publicaciones que contengan furia, aba o aca sean silenciados. Solo tiene efecto en el primer mensaje de un usuario."
+    auto_silence_first_post_regex: "Expresión regular (que ignora mayúsculas/minúsculas) que, si coincide con la primera publicación de un usuario, lo silenciará y mandará el mensaje a la cola de aprobación. Por ejemplo: enfadado|a[bc]a hará que todas las primeras publicaciones que contengan enfadado, aba o aca se manden a la cola y se silencie al autor. Solo se ejecutará en el primer mensaje de cada usuario."
     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"
+    reviewable_low_priority_threshold: "El filtro de prioridades oculta elementos a revisar que no lleguen a esta puntuación, salvo que se use el filtro «(cualquiera)»."
     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."
@@ -1776,8 +1822,9 @@ es:
     blocked_attachment_filenames: "Lista de palabras clave utilizadas para bloquear los archivos adjuntos según el nombre del archivo."
     forwarded_emails_behaviour: "Cómo tratar un correo electrónico enviado a Discourse"
     always_show_trimmed_content: "Mostrar siempre la parte recortada de los correos electrónicos entrantes. AVISO: podría revelar direcciones de correo."
+    trim_incoming_emails: "Recortar las partes irrelevantes de mensajes de correo entrantes."
     private_email: "No incluir contenido de publicaciones o temas en el título o el cuerpo del correo electrónico. NOTA: también desactiva los boletines por correo electrónico."
-    email_total_attachment_size_limit_kb: "Tamaño máximo total de archivos adjuntos a correos electrónicos salientes. Establece el valor en 0 para desactivar el envío de archivos adjuntos."
+    email_total_attachment_size_limit_kb: "Tamaño máximo de archivos adjuntos de mensajes de correo salientes en kB. Poner a 0 para desactivar el envío de adjuntos."
     post_excerpts_in_emails: "En los correos electrónicos de notificación, siempre incluye extractos en lugar de publicaciones enteras."
     raw_email_max_length: "Cuántos caracteres deben almacenarse para el correo electrónico entrante."
     raw_rejected_email_max_length: "Cuántos caracteres deben almacenarse para el correo electrónico entrante rechazado."
@@ -1883,12 +1930,14 @@ es:
     display_name_on_posts: "Mostrar el nombre completo de un usuario en sus publicaciones, además de su @usuario."
     show_time_gap_days: "Si entre dos publicaciones han pasado este número de días, mostrar el lapso de tiempo en el tema."
     short_progress_text_threshold: "Después de que el número de publicaciones en un tema alcance esta cifra, la barra de progreso solo mostrará el número de publicaciones actual. Si cambias la anchura de la barra de progreso, deberías revisar este valor."
+    default_code_lang: "Lenguaje de programación que se usará para colorear los bloques de código de GitHub («auto» para automático, «nohighlight» para no colorear, ruby, python, etc.)"
     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: "Establecer la URL canónica para temas incrustados a la URL del contenido incrustado."
     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."
@@ -1900,7 +1949,7 @@ es:
     show_create_topics_notice: "Si el sitio tiene menos de 5 temas abiertos al público, mostrar un aviso pidiendo a los administradores crear más temas."
     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."
+    prevent_anons_from_downloading_files: "Impedir que usuarios anónimos descarguen archivos adjuntos."
     secure_media: 'Limita el acceso a los medios subidos (imágenes, video, audio). Si está 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.'
     secure_media_allow_embed_images_in_emails: "Permite incrustar imágenes seguras que normalmente serían quitadas de los correos electrónicos si su tamaño es menor que la configuración de 'secure media max email embed image size kb'."
     slug_generation_method: "Elegir un método de generación de slug. «encoded» generará cadenas con código porcentual. «none» deshabilitará completamente el slug."
@@ -1910,7 +1959,7 @@ es:
     emoji_autocomplete_min_chars: "Número mínimo de caracteres necesarios para que aparezca el diálogo de selección de emoji"
     enable_inline_emoji_translation: "Habilita la traducción de emojis en línea (sin ningún espacio ni puntuación antes)"
     approve_post_count: "La cantidad de publicaciones de usuarios nuevos o de nivel básico que deben ser aprobadas"
-    approve_unless_trust_level: "Las publicaciones de usuarios con un nivel de confianza inferior a este deberán ser aprobados"
+    approve_unless_trust_level: "Las publicaciones de usuarios con un nivel de confianza inferior a este deberán ser aprobadas"
     approve_new_topics_unless_trust_level: "Los temas nuevos de usuarios por debajo de este nivel de confianza deben ser aprobados"
     approve_unless_staged: "Temas y mensajes nuevos de usuarios temporales deben ser aprobados"
     notify_about_queued_posts_after: "Si hay publicaciones que han estado esperando para ser revisadas por más de este número de horas, enviar una notificación a todos los moderadores. Establece el valor en 0 para desactivar estas notificaciones."
@@ -1920,6 +1969,7 @@ es:
     code_formatting_style: "El botón de código en el editor establecerá por defecto este estilo de formato de código"
     max_allowed_message_recipients: "Máxima cantidad de destinatarios permitidos en un mensaje."
     watched_words_regular_expressions: "Las palabras vigiladas son expresiones regulares."
+    enable_diffhtml_preview: "Funcionalidad experimental, usar diffHTML para sincronizar la previsualización en lugar de volver a renderizar toda de nuevo."
     old_post_notice_days: "Tiempo a partir del cual una publicación se considera antigua"
     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."
@@ -1928,13 +1978,14 @@ es:
     blur_tl0_flagged_posts_media: "Difuminar imágenes en publicaciones reportadas para ocultar contenido potencialmente delicado."
     enable_page_publishing: "Permitir que los miembros del personal publiquen temas en nuevas URL con su propio estilo."
     show_published_pages_login_required: "Los usuarios anónimos pueden ver páginas publicadas, incluso cuando sea necesario iniciar sesión."
+    skip_auto_delete_reply_likes: "Al eliminar automáticamente respuestas antiguas, no eliminar mensajes con este número de \"me gusta\" o más."
     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."
     default_email_messages_level: "Establecer el nivel por defecto de notificaciones por correo electrónico cuando alguien envía un mensaje a un usuario."
     default_email_mailing_list_mode: "Enviar por defecto un correo electrónico por cada publicación nueva."
     default_email_mailing_list_mode_frequency: "Los usuarios que activen el modo lista de correo recibirán correos con esta frecuencia por defecto."
-    disable_mailing_list_mode: "No permitir que los usuarios activen el modo lista de correo."
+    disable_mailing_list_mode: "No permitir que los usuarios activen el modo lista de correo (y evitar que se envíe cualquier mensaje de tipo lista de correo)."
     default_email_previous_replies: "Incluir por defecto respuestas previas en los correos electrónicos."
     default_email_in_reply_to: "Incluir por defecto un extracto de la publicación a la que se ha respondido en los correos electrónicos."
     default_other_new_topic_duration_minutes: "Condición por defecto para que un tema sea considerado nuevo."
@@ -1964,7 +2015,6 @@ es:
     revoke_api_keys_days: "Número de días antes de que una clave de API sin usar sea revocada automáticamente (0 para nunca)"
     allow_user_api_keys: "Permitir que se generen claves de API de usuario"
     allow_user_api_key_scopes: "Lista de ámbitos permitidos para las claves API de usuario"
-    max_api_keys_per_user: "Número máximo de claves API de usuario por usuario"
     min_trust_level_for_user_api_key: "Nivel de confianza necesario para generar claves API de usuario"
     allowed_user_api_auth_redirects: "URL permitida para autentificar redirección para claves API de usuario. Símbolo comodín * puede ser usado para que coincida cualquier parte de la misma (por ejemplo www.ejemplo.com/*)."
     allowed_user_api_push_urls: "URLs permitidas para el push del servidor al API de usuario"
@@ -1974,7 +2024,6 @@ es:
     max_tags_per_topic: "El número máximo de etiquetas que se pueden añadir a un tema."
     max_tag_length: "Máximo número de caracteres que puede tener una etiqueta."
     max_tag_search_results: "Al buscar etiquetas, el número máximo de resultados que se muestran."
-    show_filter_by_tag: "Mostrar un desplegable para filtrar una lista de temas por etiqueta."
     max_tags_in_filter_list: "Número máximo de etiquetas en el desplegable de filtro. Se mostrarán primero aquellas más utilizadas."
     tags_sort_alphabetically: "Mostrar etiquetas en orden alfabético. Por defecto se mostrarán por popularidad."
     tags_listed_by_group: "Listar etiquetas por grupo de etiquetas en la <a href='%{base_path}/tags' target='_blank'>página de etiquetas</a>."
@@ -1988,6 +2037,7 @@ es:
     governing_law: "Ley que rige"
     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."
+    shared_drafts_min_trust_level: "Permitir a los usuarios ver y editar borradores compartidos."
     push_notifications_prompt: "Mostrar aviso del consentimiento del usuario."
     push_notifications_icon: "El icono de la medalla que aparece en el menú de notificaciones. Se recomienda un PNG monocromático de 96 × 96 con transparencia."
     base_font: "Fuente base para la mayoría de texto en el sitio. Los temas lo pueden sobreescribir a través de la propiedad personalizada de CSS `--font-family`."
@@ -2016,6 +2066,7 @@ es:
       invalid_string_min_max: "Debe tener entre %{min} y %{max} caracteres."
       invalid_string_min: "Debe tener un mínimo de %{min} caracteres. "
       invalid_string_max: "No debe exceder los %{max} caracteres. "
+      invalid_json: "JSON no válido."
       invalid_reply_by_email_address: "El valor debe contener «%{reply_key}» y debe ser diferente al correo electrónico de notificación."
       invalid_alternative_reply_by_email_addresses: "Todas los valores deben contener «%{reply_key}» y deben ser diferentes al correo electrónico de notificación"
       pop3_polling_host_is_empty: "Debes establecer un host de «pop3 polling» antes de activar el polling POP3."
@@ -2029,8 +2080,8 @@ es:
       email_editable_enabled: "Debes desactivar primero «correo electrónico editable» antes de activar esta opción."
       staged_users_disabled: "Primero debes habilitar «usuarios provisionales» para poder habilitar esta configuración."
       reply_by_email_disabled: "Primero debes habilitar «responder por correo electrónico» antes de habilitar esta configuración."
-      sso_url_is_empty: "Debe establecer una «url de sso» antes de habilitar esta configuración."
-      sso_invite_only: "No puedes activar SSO y el modo de solo invitaciones al mismo tiempo."
+      discourse_connect_url_is_empty: "Debes rellenar «discourse connect url» antes de activar este ajuste."
+      discourse_connect_invite_only: "No puedes activar SSO y el modo de solo invitaciones al mismo tiempo."
       enable_local_logins_disabled: "Primero debes activar «habilitar inicio de sesión local» antes de habilitar esta configuración."
       min_username_length_exists: "No puede establecer la longitud de usuario mínima por encima del nombre de usuario más corto (%{username})"
       min_username_length_range: "No puedes establecer el mínimo por encima del máximo."
@@ -2039,19 +2090,17 @@ es:
       invalid_hex_value: "Los colores debe ser códigos hexadecimalesde 6 dígitos."
       empty_selectable_avatars: "Debes cargar al menos dos avatares seleccionables antes de habilitar esta configuración."
       category_search_priority:
-        very_low_weight_invalid: "No puedes establecer el peso a un valor superior a «category_search_priority_low_weight»."
-        low_weight_invalid: "No puedes poner el peso a un valor superior o igual a 1 o menor que «category_search_priority_very_low_weight»."
-        high_weight_invalid: "No puedes establecer el peso como menor o igual a 1 ni mayor a 'category_search_priority_very_high_weight'."
-        very_high_weight_invalid: "No puedes poner el peso a un valor inferior a «category_search_priority_high_weight»."
+        low_weight_invalid: "El peso no puede ser mayor o igual a 1."
+        high_weight_invalid: "El peso no puede ser menor o igual a 1."
       allowed_unicode_usernames:
         regex_invalid: "La expresión regular no es válida: %{error}"
         leading_trailing_slash: "La expresión regular no puede empezar y terminar con una barra."
       unicode_usernames_avatars: "El sistema interno de avatares no soporta nombres de usuario Unicode."
       list_value_count: "La lista debe contener exactamente %{count} valores."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.ejemplo.com"
-        value: "SSO secreta"
+        value: "Secreto de DiscourseConnect"
   search:
     extreme_load_error: "La página está soportando una carga extrema, por lo que se ha desactivado la búsqueda. Inténtalo de nuevo más tarde"
     within_post: "#%{post_number} por %{username}"
@@ -2062,20 +2111,22 @@ es:
     results_page: "Resultados de búsqueda para «%{term}»"
     audio: "[audio]"
     video: "[video]"
-  sso:
+  discourse_connect:
     login_error: "Error al iniciar sesión"
-    not_found: "No se pudo encontrar tu cuenta. Por favor, contacta al administrador del sitio."
-    account_not_approved: "Tu cuenta está pendiente de aprobación. Recibirás una notificación por correo electrónico cuando se apruebe."
-    unknown_error: "Hay un problema con tu cuenta. Por favor, contacta al administrador del sitio."
-    timeout_expired: "Se superó el tiempo para el inicio de sesión. Por favor, inténtalo de nuevo."
-    no_email: "No se ha provisto ninguna dirección de correo electrónico. Por favor, contacta al administrador del sitio."
-    blank_id_error: "La `external_id` es necesaria pero se encuentra en blanco"
-    email_error: "Una cuenta no puede ser registrada con el correo electrónico <b>%{email}</b>. Por favor, contacta al administrador del sitio web."
-    missing_secret: "La autentificación del SSO falló porque falta el secreto. Contacta al administrador de la página para solucionar este problema."
+    not_found: "No se ha podido encontrar tu cuenta. Por favor, contacta con la administración del sitio."
+    account_not_approved: "Su cuenta está pendiente de aprobación. Recibirás una notificación por correo electrónico cuando sea aprobada."
+    unknown_error: "Hay un problema con tu cuenta. Por favor, contacta con la administración del sitio."
+    timeout_expired: "Se ha superado el tiempo máximo para iniciar sesión. Por favor, inténtalo de nuevo."
+    no_email: "No se ha provisto una dirección de correo electrónico. Por favor, contacta con la administración del sitio."
+    blank_id_error: "El campo `external_id` es obligatorio, pero estaba en blanco"
+    email_error: "No se ha podido registrar una cuenta con la dirección de correo electrónico <b>%{email}</b>. Por favor, ponte en contacto con la administración del sitio."
+    missing_secret: "La autenticación ha fallado porque no se ha incluido el secreto. Ponte en contacto con la administración del sitio web para arreglar este problema."
+    invite_redeem_failed: "No se ha podido canjear la invitación. Por favor, contacta con la administración del sitio."
   original_poster: "Autor original"
   most_posts: "Con más publicaciones"
   most_recent_poster: "Autor más reciente"
   frequent_poster: "Autor frecuente"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "¡Bienvenido a nuestra comunidad! Estos son los temas recientes mas populares."
     not_seen_in_a_month: "¡Bienvenido de vuelta! No te habíamos visto durante algún tiempo. Estos son los temas mas populares desde que nos visitaste por última vez."
@@ -2086,6 +2137,7 @@ es:
     errors:
       different_topics: "No se pueden fusionar publicaciones que pertenecen a temas diferentes."
       different_users: "No se pueden fusionar mensajes que pertenezcan a diferentes usuarios."
+      max_post_length: "No se pueden juntar las publicaciones porque la longitud del conjunto supera la máxima permitida por mensaje."
   move_posts:
     new_topic_moderator_post:
       one: "Un mensaje ha sido separado a un nuevo tema: %{topic_link}"
@@ -2154,6 +2206,7 @@ es:
     auto_deleted_by_timer: "Eliminado automáticamente por el temporizador."
   login:
     invalid_second_factor_method: "El método de verificación de dos factores seleccionado no es válido."
+    not_enabled_second_factor_method: "El método de dos factores seleccionado no está activado en tu cuenta."
     security_key_description: "Cuando tengas tu clave de seguridad física preparada, presiona el botón de autenticar con clave de seguridad que se encuentra debajo."
     security_key_alternative: "Intenta de otra manera"
     security_key_authenticate: "Autenticar con clave de seguridad"
@@ -2208,6 +2261,18 @@ es:
   admin:
     email:
       sent_test: "¡enviado!"
+    user:
+      merge_user:
+        updating_username: "Actualizando nombre de usuario..."
+        changing_post_ownership: "Cambiando la propiedad de la publicación ..."
+        merging_given_daily_likes: "Fusionando los me gusta diarios dados..."
+        merging_post_timings: "Fusionando tiempos de publicación ..."
+        merging_user_visits: "Fusionando visitas de usuarios..."
+        updating_site_settings: "Actualizando ajustes del sitio..."
+        updating_user_stats: "Actualizando estadísticas de los usuarios..."
+        merging_user_attributes: "Fusionando atributos de usuario..."
+        updating_user_ids: "Actualizando identificadores de usuario..."
+        deleting_source_user: "Eliminando usuario de origen..."
   user:
     deactivated: "Ha sido desactivado debido a muchos correod electrónicos rechazados a «%{email}»."
     deactivated_by_staff: "Desactivado por el staff"
@@ -2245,6 +2310,7 @@ es:
       fixed_primary_email: "Correo electrónico fijo principal para el usuario temporal"
       same_ip_address: "Misma dirección de IP (%{ip_address}) de otros usuarios"
       inactive_user: "Usuario inactivo"
+      reviewable_reject: "Usuario revisable rechazado"
     email_in_spam_header: "El primer correo electrónico del usuario se marcó como spam."
     already_silenced: "El usuario ya fue silenciado por %{staff} %{time_ago}."
     already_suspended: "El usuario ya fue suspendido por %{staff} %{time_ago}."
@@ -2415,7 +2481,7 @@ es:
     contents_hidden: "Por favor, visita la publicación para ver su contenido."
     post_hidden:
       title: "Publicación oculta"
-      subject_template: "Mensaje ocultado debido a varios reportes de la comnuidad"
+      subject_template: "Mensaje ocultado debido a reportes de la comunidad"
       text_body_template: |
         Hola:
 
@@ -2445,6 +2511,19 @@ es:
         La comunidad reportó esta publicación y ahora se encuentra oculta. **Dado que esta publicación se ha ocultado más de una vez, tu publicación se mantendrá oculta hasta que la gestione un miembro del staff.**
 
         Para más consejos, por favor, consulta nuestras [directrices de la comunidad](%{base_url}/guidelines).
+    queued_by_staff:
+      title: "Una publicación está esperando aprobación"
+      subject_template: "Publicación oculta por el staff, esperando aprobación"
+      text_body_template: |
+        Hola,
+
+        Esto es un mensaje automático de %{site_name} para hacerte saber que hemos ocultado tu publicación.
+
+        <%{base_url}%{url}>
+
+        Tu publicación ha sido ocultada hasta que la revisemos.
+
+        Para más información, consulta nuestras [directrices de la comunidad](%{base_url}/guidelines).
     flags_disagreed:
       title: "Publicación reportada recuperada por el staff"
       subject_template: "Publicación reportada recuperada por el staff"
@@ -2466,19 +2545,17 @@ es:
       text_body_template: |
         Hola,
 
-        Esto es un mensaje automático de %{site_name} para hacerte saber que [tu publicación](%{base_url}%{url}) fue eliminada.
+        Esto es un mensaje automático de %{site_name} para hacerte saber que [tu publicación](%{base_url}%{url}) ha sido eliminada.
 
         %{flag_reason}
 
-        La publicación ha sido reportada por la comunidad y un miembro del equipo de la página decidió eliminarla.
+        La publicación ha sido reportada por la comunidad, y un miembro del equipo ha decidido eliminarla.
 
-        [details="Haz clic para expandir la publicación eliminada"]
         ``` markdown
         %{flagged_post_raw_content}
         ```
-        [/details]
 
-        Por favor, revisa las [directrices de la comunidad](%{base_url}/directrices) para más información.
+        Por favor, revisa las [normas de la comunidad](%{base_url}/guidelines) para más información.
     usage_tips:
       text_body_template: |
         Si quieres unos consejos para empezar, [echa un vistazo a esta entrada de blog](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2533,9 +2610,11 @@ es:
     tl2_promotion_message:
       subject_template: "¡Enhorabuena por llegar a un nivel de confianza más!"
       text_body_template: |
-        Te hemos subido al siguiente [nivel de confianza](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
+        ¡Te hemos pasado al siguiente [nivel de confianza](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
 
-        Te invitamos a que sigas participando en la comunidad. Nos gusta tenerte por aquí.
+        Ahora que ya tienes experiencia con nosotros, puede que te interese [esta lista con consejos útiles](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
+        Te animamos a que sigas participando, nos gusta que estés por aquí.
     backup_succeeded:
       title: "Copia de respaldo realizada con éxito"
       subject_template: "La copia de respaldo se completó exitosamente"
@@ -2745,9 +2824,17 @@ es:
       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, pero tu mensaje de correo electrónico a %{destination} (titulado %{former_title}) no ha funcionado.
+        Lo sentimos, pero tu correo a %{destination} (con título %{former_title}) no ha funcionado.
 
-        ¿Usas más de una dirección de correo electrónico? ¿Has respondido desde una dirección diferente? Las respuestas por correo electrónico requieren que use la misma dirección al responder. Alternativamente, el encabezado de ID de mensaje en el correo electrónico puede haber sido modificado.
+        Algunas cosas que comprobar:
+
+        - ¿Usas más de una dirección de correo? ¿Has respondido desde la dirección que usaste originalmente? Es necesario que uses la misma dirección para responder que la que usaste originalmente
+
+        - ¿Ha usado correctamente tu programa de correo la propiedad Reply-To: al responder? Por desgracia, algunos programas responden a propiedad From:, que en este caso no funciona.
+
+        - ¿Se ha modificado el encabezado del correo Message-ID? No debe cambiarse. Es importante que sea consistente.
+
+        ¿Necesitas más ayuda? Puedes contactarnos en %{base_url}/about
     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"
@@ -2891,6 +2978,14 @@ es:
     spam_post_blocked:
       title: "Publicación con spam bloqueada"
       subject_template: "Publicaciones del usuario nuevo %{username} bloqueadas debido a la repetición de enlaces."
+      text_body_template: |
+        Esto es un mensaje automático.
+
+        El usuario nuevo [%{username}](%{user_url}) ha intentado crear varias publicaciones con enlaces a %{domains}, pero han sido bloqueadas para prevenir spam. El usuario todavía puede crear nuevas publicaciones, siempre que no enlacen a %{domains}.
+
+        Por favor, [revisa el usuario](%{user_url}).
+
+        Puedes cambiar este comportamiento a través de los ajustes `newuser_spam_host_threshold` y `allowed_spam_host_domains`. Considera añadir %{domains} a la lista de dominios permitidos si deberían estar exentos.
     unsilenced:
       title: "Dejar de silenciar"
       subject_template: "Cuenta reestablecida"
@@ -2914,8 +3009,8 @@ es:
       subject_template: "La descarga de imágenes remotas fue deshabilitada"
       text_body_template: "La opción `download_remote_images_to_local` ha sido deshabilitada porque se ha llegado al límite de espacio en disco configurado en `download_remote_images_threshold`."
     dashboard_problems:
-      title: "Problemas de dashboard "
-      subject_template: "Nuevos consejos en tu dashboard"
+      title: "Problemas del panel"
+      subject_template: "Nuevos consejos en tu panel del sitio"
       text_body_template: |
         Tenemos nuevos consejos y recomendaciones para ti basados en tus ajustes del sitio actuales.
 
@@ -3166,20 +3261,16 @@ es:
       title: "Cuenta suspendida"
       subject_template: "[%{email_prefix}] Tu cuenta ha sido suspendida"
       text_body_template: |
-        Has sido suspendido del foro hasta %{suspended_till}.
+        Te han suspendido del foro hasta %{suspended_till}.
 
-        %{reason}
-
-        %{message}
+        Motivo: %{reason}
     account_silenced:
       title: "Cuenta silenciada"
       subject_template: "[%{email_prefix}] Tu cuenta ha sido silenciada"
       text_body_template: |
-        Has sido silenciado en el foro hasta %{silenced_till}.
+        Te han silenciado en el foro hasta %{silenced_till}.
 
-        %{reason}
-
-        %{message}
+        Motivo: %{reason}
     account_exists:
       title: "Cuenta ya existente"
       subject_template: "[%{email_prefix}] La cuenta ya existe"
@@ -3194,6 +3285,12 @@ es:
     account_second_factor_disabled:
       title: "Autenticación de dos factores desactivada"
       subject_template: "[%{email_prefix}] Autenticación de dos factores desactivada"
+      text_body_template: |
+        La autenticación de dos factores ha sido desactivada en tu cuenta en %{site_name}. Ahora podrás iniciar sesión tan solo con tu contraseña, ya no hace falta que introduzcas tu código de autenticación.
+
+        Si no has sido tú quien ha desactivado la autenticación en dos factores, puede que alguien más tenga acceso a tu cuenta.
+
+        Si tienes alguna pregunta, [ponte en contacto con nosotros](%{base_url}/about).
     digest:
       why: "Un breve resumen de %{site_link} desde tu última visita el %{last_seen_at}"
       since_last_visit: "Desde tu última visita"
@@ -3246,6 +3343,13 @@ es:
     admin_login:
       title: "Incicio de sesión de administrador"
       subject_template: "[%{email_prefix}] Inicio de sesión"
+      text_body_template: |
+        Alguien ha solicitado iniciar sesión en tu cuenta de [%{site_name}](%{base_url}).
+
+        Si no lo has pedido tú, puedes ignorar sin problema este mensaje.
+
+        Haz clic en el siguiente enlace para iniciar sesión:
+        %{base_url}/session/email-login/%{email_token}
     account_created:
       title: "Cuenta creada"
       subject_template: "[%{email_prefix}] Tu nueva cuenta"
@@ -3257,6 +3361,12 @@ es:
     confirm_new_email:
       title: "Confirmar correo electrónico nuevo"
       subject_template: "[%{email_prefix}] Confirma tu nueva dirección de correo electrónico"
+      text_body_template: |
+        Confirma tu nueva dirección de correo electrónico en %{site_name} haciendo clic en el siguiente enlace:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
+
+        Si no has solicitado este cambio, ponte en contacto con [la administración del sitio](%{base_url}/about).
     confirm_new_email_via_admin:
       title: "Confirmar nuevo correo electrónico"
       subject_template: "[%{email_prefix}] Confirma tu nueva dirección de correo electrónico"
@@ -3325,6 +3435,13 @@ es:
         Creemos en una comunidad con un [comportamiento civilizado en comunidad](%{base_url}/directrices) en todo momento.
 
         ¡Disfruta tu estadía!
+    signup_after_reject:
+      title: "Registro: después de rechazo"
+      subject_template: "Te han rechazado la cuenta en %{site_name}"
+      text_body_template: |
+        Un miembro del equipo de %{site_name} ha rechazado la creación de tu cuenta.
+
+        %{reject_reason}
     signup:
       title: "Regístrate"
       subject_template: "[%{email_prefix}] Confirma tu cuenta nueva"
@@ -3362,6 +3479,13 @@ 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.
+    post_approved:
+      title: "Tu publicación ha sido aprobada"
+      subject_template: "[%{site_name}] Tu publicación ha sido aprobada"
+      text_body_template: |
+        Hola,
+
+        Esto es un mensaje automático de %{site_name} para hacerte saber que [tu publicación](%{base_url}%{post_url}) ha sido aprobada.
   page_forbidden:
     title: "¡Ups! Esa página es privada."
   page_not_found:
@@ -3821,6 +3945,7 @@ es:
     mass_award:
       errors:
         invalid_csv: Encontramos un error en la línea %{line_number}. Por favor, asegúrate de que el CSV tiene un solo correo electrónico por línea.
+        badge_disabled: Activa primero la insignia %{badge_name}.
     editor:
       name: Editor
       description: Primera edición de una publicación
@@ -4006,7 +4131,7 @@ es:
       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:
-      name: Agradecido/a
+      name: Gracias
       description: Ha recibido me gusta en 20 publicaciones y dado 10 me gusta
       long_description: |
         Esta medalla se concede cuando has recibido 20 me gusta en tus publicaciones y has dado 10 o más de vuelta. Cuando a alguien le gustan tus publicaciones, también encuentras el tiempo para agradecer las publicaciones de otras personas.
@@ -4090,8 +4215,8 @@ es:
       synonym: 'Los sinónimos no están permitidos. Utiliza "%{tag_name}" en su lugar.'
       has_synonyms: '"%{tag_name}" no se puede utilizar porque tiene sinónimos.'
     required_tags_from_group:
-      one: "Debes incluir al menos %{count} etiqueta %{tag_group_name}."
-      other: "Debes incluir al menos %{count} etiquetas %{tag_group_name}."
+      one: "Debes incluir al menos %{count} etiqueta de %{tag_group_name}. Las etiquetas en este grupo son: %{tags}."
+      other: "Debes incluir al menos %{count} etiquetas de %{tag_group_name}. Las etiquetas en este grupo son: %{tags}."
     invalid_target_tag: "no puede ser el sinónimo de un sinónimo"
     synonyms_exist: "no está permitido mientras existan sinónimos"
   rss_by_tag: "Temas con la etiqueta %{tag}"
@@ -4100,7 +4225,7 @@ es:
     register:
       button: "Registrarse"
       title: "Registrar cuenta de administrador"
-      help: "registra una nueva cuenta para empezar"
+      help: "registra una cuenta para empezar"
       no_emails: "Por desgracia, no se definió ningún correo electrónico de administrador durante la configuración inicial, por lo que terminar de instalar el foro será complicado. Por favor, añade un correo de desarrollador en el archivo de configuración o <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>crea una cuenta de administrador desde la consola</a>."
     confirm_email:
       title: "Confirmar tu correo electrónico"
@@ -4115,12 +4240,12 @@ es:
     only_official: "Desactivar plugins no oficiales"
     no_plugins: "Desactivar todos los plugins"
     enter: "Activar modo seguro"
-    must_select: "Debes escoger al menos una opción para ingresar al modo seguro."
+    must_select: "Debes escoger al menos una opción para entrar en el modo seguro."
   wizard:
     title: "Instalación de Discourse"
     step:
       locale:
-        title: "¡Bienvenido a tu foro de Discourse!"
+        title: "¡Te damos la bienvenida a tu foro de Discourse!"
         fields:
           default_locale:
             description: "¿Cuál es el idioma por defecto de tu comunidad?"
@@ -4129,7 +4254,7 @@ es:
         description: "Tu nombre es un aviso que se ve desde lejos, lo <i>primero</i> que los visitantes en potencia verán acerca tu comunidad. ¿Qué dice el nombre y el título de tu comunidad?"
         fields:
           title:
-            label: "El nombre de la comunidad"
+            label: "El nombre de tu comunidad"
             placeholder: "Reunión de Juana"
           site_description:
             label: "Describe tu comunidad en una frase corta"
@@ -4243,15 +4368,16 @@ es:
                 label: "Cuadros de categorías"
               categories_boxes_with_topics:
                 label: "Cuadros de categorías con temas"
-      emoji:
-        title: "Emoji"
-        description: "¿Qué estilo de emoji prefieres para tu comunidad? Siempre puedes añadir más emojis personalizados a través de Administrador, Personalizar, Emoji."
       invites:
         title: "Invitar staff"
         description: "¡Ya casi estás listo! Vamos a invitar otras personas para que ayuden a <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>iniciar discusiones</a> con temas interesantes y respuestas para que comience tu comunidad."
         disabled: "Ya que los inicios de sesión locales están desactivados, no es posible enviar invitaciones a nadie. Por favor, ve al siguiente paso."
       finished:
         title: "¡Tu foro de Discourse está listo!"
+        description: |
+          <p>Si en algún momento quieres cambiar estos ajustes, <b>vuelve a lanzar este proceso en cualquier momento</b>, o visita <a href='%{base_path}/admin' target='_blank'>tu panel de administración</a>, que podrás encontrar enlazado al lado del icono de la llave inglesa en el menú.</p>
+          <p>Personalizar más todavía tu Discourse es fácil usando nuestro potente sistema de temas. Para ver ejemplos, mira los <a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">temas y componentes más populares</a> en <a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a>.</p>
+          <p>Pásalo bien, y ¡buena suerte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construyendo tu nueva comunidad!</a></p>
   search_logs:
     graph_title: "Análisis de búsquedas"
   joined: "Registrado"
@@ -4265,8 +4391,8 @@ es:
       private_message: '%{username} te envió un mensaje privado en «%{topic}» - %{site_title}'
       linked: '%{username} enlazó tu publicación desde «%{topic}» - %{site_title}'
       watching_first_post: '%{username} creó un tema nuevo «%{topic}» - %{site_title}'
-      confirm_title: "Notificaciones habilitadas - %{site_title}"
-      confirm_body: "¡Éxito! Las notificaciones han sido habilitadas."
+      confirm_title: "Notificaciones activadas - %{site_title}"
+      confirm_body: "¡Bien! Las notificaciones han sido activadas."
       custom: "Notificación de %{username} on %{site_title}"
   staff_action_logs:
     not_found: "no encontrado"
@@ -4300,8 +4426,8 @@ es:
       trust_level: "Los usuarios con niveles de confianza bajos deben tener respuestas aprobadas por el staff. Consulta `approve_unless_trust_level`."
       new_topics_unless_trust_level: "Los usuarios con niveles de confianza bajos deben tener temas aprobados por el staff. Consulta `approve_new_topics_unless_trust_level`."
       fast_typer: "El usuario nuevo escribió su primer mensaje de forma sospechosamente rápida. Podría ser un bot o comportamiento de spammer. Consulta `min_first_post_typing_time`."
-      auto_silence_regexp: "Usuario nuevo cuya primera publicación coincide con la configuración `auto_silence_first_post_regex`."
-      watched_word: "Esta publicación incluye una palabra observada. Ver tu <a href='%{base_url}/admin/logs/watched_words'>lista de palabras observadas</a>."
+      auto_silence_regexp: "Usuario nuevo cuya primera publicación coincide con el ajuste `auto_silence_first_post_regex`."
+      watched_word: "Esta publicación contiene una palabra vigilada. Mira tu <a href='%{base_url}/admin/customize/watched_words'>lista de palabras vigiladas</a>."
       staged: "Los temas y publicaciones nuevas para usuarios provisionales deben ser aprobados por el staff. Consulta `approve_unless_staged`."
       category: "Los mensajes en esta categoría requieren la aprobación manual del staff. Consulta la configuración de la categoría."
       must_approve_users: "Todos los usuarios nuevos deben ser aprobados por el staff. Consulta `must_approve_users`."
@@ -4309,6 +4435,8 @@ es:
       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: "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`."
+      contains_media: "Esta publicación incluye medios incrustados. Ver `review_media_unless_trust_level`."
+      queued_by_staff: "Un miembro del staff cree que esta publicación debe que ser revisada. Se mantendrá oculta hasta entonces."
     actions:
       agree:
         title: "Concordar..."
@@ -4329,7 +4457,7 @@ es:
         description: "Restaurar la publicación para que los usuarios puedan verla."
       agree_and_hide:
         title: "Ocultar publicación"
-        description: "Ocultar la publicación y enviar un mensaje automaticamente al usuario para que lo edite."
+        description: "Ocultar la publicación y enviar un mensaje automáticamente al usuario animándole a que la edite."
       delete_spammer:
         title: "Eliminar spammer"
         description: "Eliminar el usuario y todas sus publicaciones y temas."
@@ -4367,7 +4495,7 @@ es:
       reject_post:
         title: "Rechazar publicación"
       approve_user:
-        title: "Aprobar Usuario"
+        title: "Aprobar usuario"
       reject_user:
         title: "Eliminar usuario..."
         delete:
@@ -4378,6 +4506,17 @@ es:
           description: "El usuario será eliminado y bloquearemos su IP y su dirección de correo electrónico."
       reject:
         title: "Rechazar"
+        bundle_title: "Rechazar..."
+      reject_and_suspend:
+        title: "Rechazar y suspender usuario"
+      reject_and_silence:
+        title: "Rechazar y silenciar usuario"
+      reject_and_delete:
+        title: "Rechazar y eliminar la publicación"
+      reject_and_keep_deleted:
+        title: "Mantener publicación eliminada"
+      approve_and_restore:
+        title: "Aprobar y restaurar publicación"
       delete_user:
         title: "Eliminar usuario"
         confirm: "¿Estás seguro de que quieres eliminar a este usuario? Eliminará todas sus publicaciones y bloqueará su correo electrónico y dirección IP."
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index 79bdb0dcf4..e95dac88eb 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -15,6 +15,7 @@ et:
       short_no_year: "%-d. %B"
       date_only: "%-d. %B %Y"
       long: "%B %-d, %Y, %l:%M%P"
+      no_day: "%B. %Y"
   date:
     month_names:
     - null
@@ -38,6 +39,7 @@ et:
   title: "Discourse"
   topics: "Teemad"
   posts: "postitused"
+  views: "vaatamisi"
   loading: "Laetakse"
   sign_up: "Liitu"
   log_in: "Logi sisse"
@@ -46,6 +48,8 @@ et:
   disable_remote_images_download_reason: "Väliste piltide allalaadimine keelati, kuna polnud polnud piisavalt vaba ruumi."
   anonymous: "Anonüümne"
   remove_posts_deleted_by_author: "Autori poolt kustutatud"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "postituse nr%{post_number} tegi %{username}"
   emails:
     incoming:
       default_subject: "See teema vajab pealkirja"
@@ -114,6 +118,9 @@ et:
     site_settings:
       default_categories_already_selected: "Sa ei saa valida teises nimekirjas valitud liiki."
       s3_upload_bucket_is_required: "Ei saa aktiveerida S3 üleslaadimist, kui 's3_upload_bucket' ei ole määratud."
+  invite:
+    disabled_errors:
+      invalid_access: "Päritud ressursi vaatamiseks puuduvad õigused."
   bulk_invite:
     file_should_be_csv: "Üles laetav fail peab olema CSV vormingus."
     error: "Selle faili üleslaadimisel tekkis viga. Palun proovi hiljem uuesti."
@@ -150,6 +157,9 @@ et:
     permalink: "Püsilink"
     imported_from: "See on kaasnev vestlusteema originaalsisestusele %{link}"
     in_reply_to: "▶ %{username}"
+    replies:
+      one: "%{count} vastus"
+      other: "%{count} vastust"
     created: "Loodud"
   no_mentions_allowed: "Vabandust, sa ei saa teisi kasutajaid mainida."
   too_many_mentions:
@@ -181,6 +191,9 @@ et:
   topics_in_category: "Teemad '%{category}' liigis"
   rss_posts_in_topic: "'%{topic}' RSS-kanal"
   rss_topics_in_category: "Liigi '%{category}' teemade RSS-kanal"
+  rss_num_posts:
+    one: "%{count} postitus"
+    other: "%{count} postitust"
   read_full_topic: "Loe kogu teemat"
   private_message_abbrev: "PS"
   rss_description:
@@ -198,9 +211,11 @@ et:
   bookmarks:
     reminders:
       later_today: "Täna hiljem"
+      next_business_day: "Järgmisel tööpäeval"
       tomorrow: "Homme"
       next_week: "Järgmisel nädalal"
       next_month: "Järgmisel kuul"
+      custom: "Vali kuupäev ja kellaaeg"
   groups:
     errors:
       can_not_modify_automatic: "Autommatset gruppi ei saa muuta"
@@ -222,26 +237,6 @@ et:
     until_posts:
       one: "%{count} postitus"
       other: "%{count} postitust"
-    "new-topic": |
-      Teretulemast saidile %{site_name} &mdash; **tänud uue vestluse alustamise eest!**
-
-      - Kas pealkiri kõlab kuvitavalt kui sa seda kõvasti loed? Kas see on hea kokkuvõte?
-
-      - Kas võiksid olla sellest huvitatud? Miks see oluline on? Millist tagasisidet sa soovid?
-
-      - Lisa enim kasutatud sõnad oma teemasse et teised *leiaksid* selle üles. Et grupeerida oma teema teiste sarnaste teemadega vali liik.
-
-      Rohkema info saamiseks [vaata meie kommuuni juhiseid](%{base_path}/guidelines). See paneel ilmub ainult esimesel %{education_posts_text}.
-    "new-reply": |
-      Teretulemast saidile %{site_name} &mdash; **täname osalemast!**
-
-      - Kas sinu vastus parandab vestlust mingil moel?
-
-      - Ole kommuuni liikmete vastu lahke.
-
-      - Konstruktiivne kriitika on tervitatav aga kritiseeri *ideid*, mitte inimesi.
-
-      Rohkema info saamiseks [vaata meie kommuuni juhiseid](%{base_path}/guidelines). See paneel ilmub ainult esimesel %{education_posts_text}.
   activerecord:
     attributes:
       category:
@@ -293,7 +288,7 @@ et:
   staff_category_name: "Meeskond"
   staff_category_description: "Privaatfoorum meeskonnasisesteks aruteludeks. Teemad on nähtavad vaid adminnidele ja moderaatoritele."
   discourse_welcome_topic:
-    title: "Teretulemast Discourse'i"
+    title: "Tere tulemast Discourse'i"
     body: |2
 
       Selle märgistatud teema esimene lõik saab olema kõikidele uutele külastajatele nähtav kui tervitustekst sinu avalehel. See on oluline!
@@ -309,7 +304,7 @@ et:
 
       Ilmselt peaksid sa selle teema administreerimise alt sulgema :wrench: (üleval paremal ja allääres), et teadandele vastuseid ei kuhjuks.
   lounge_welcome:
-    title: "Teretulemast Lounge'i"
+    title: "Tere tulemast Lounge'i"
   category:
     topic_prefix: "Liigist %{category}"
     post_template: "%{replace_paragraph}\n\nKasuta järgnevaid lõikusid pikema kirjelduse jaoks või foorumi juhendi või reeglite jaoks:\n\n- Miks peaksid inimesed seda foorumit kasutama? Mille jaoks see on?\n\n- Mille poolest erineb see meie teistest foorumitest?\n\n- Mis infot peaksid selle foorumi teemad sisaldama?\n\n- Kas meil on seda foorumit vaja? Kas me saame seda foorumit ühendada teise foorumiga või alamfoorumiga?\n"
@@ -502,6 +497,7 @@ et:
     no_default:
       others: "Tegevusi pole."
     no_bookmarks:
+      self: "Sul pole järjehoidjatesse lisatud postitusi; järjehoidjad võimaldavad kiiresti konkreetsetele postitustele viidata."
       others: "Järjehoidjad puuduvad."
     no_likes_given:
       self: "Sa pole oma meeldimist ühelegi postitusele andnud."
@@ -537,6 +533,8 @@ et:
       every_hour: "iga tund"
       daily: "iga päev"
       weekly: "iga nädal"
+      every_month: "iga kuu"
+      every_six_months: "iga kuue kuu tagant"
   user_api_key:
     title: "Autoriseeri rakenduse ligipääs"
     authorize: "Autoriseeri"
@@ -562,6 +560,7 @@ et:
     user_flagging_ratio:
       labels:
         user: Kasutaja
+        score: Skoor
     moderators_activity:
       labels:
         moderator: Moderaator
@@ -613,6 +612,7 @@ et:
       title: "Meeldimisi"
       xaxis: "Päev"
       yaxis: "Uute meeldimiste arv"
+      description: "Uute meeldimiste arv."
     flags:
       title: "Tähised"
       xaxis: "Päev"
@@ -626,6 +626,7 @@ et:
       yaxis: "Kasutajate arv"
       labels:
         level: Tase
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       xaxis: "Liik"
       yaxis: "Kasutajate arv"
@@ -755,6 +756,7 @@ et:
     max_topic_title_length: "Maksimaalne lubatud teema pealkirja pikkus tähemärkides"
     min_personal_message_title_length: "Minimaalne lubatud teema pealkirja pikkus tähemärkides"
     min_admin_password_length: "Minimaalne administraatori parooli pikkus."
+    dark_mode_none: "Pole"
     enable_staged_users: "Sissetulevate meilide töötlemisel loo kasutajad ettevalmistamiseks automaatselt."
     maximum_staged_users_per_email: "Ettevalmistamisel olevate kasutajate maksimaalne arv sai sissetuleva meili töötlemisel täis."
     dominating_topic_minimum_percent: "Mitu protsenti teema postitustest peab kasutaja tegema, et talle saadetaks meeldetuletus teema liigse domineerimise kohta."
@@ -765,7 +767,6 @@ et:
     max_tags_per_topic: "Teemale liidetavate siltide maksimaalne arv."
     max_tag_length: "Sildis kasutatavate tähemärkide maksimaalne arv."
     max_tag_search_results: "Siltide otsimisel maksimaalselt kuvatavate tulemuste arv."
-    show_filter_by_tag: "Näita rippmenüüd teemade loetelu filtreerimiseks siltide alusel."
     max_tags_in_filter_list: "Filtri rippmenüüs kuvatavate siltide maksimaalne arv. Kuvatakse enimkasutatud sildid."
     tags_sort_alphabetically: "Kuva sildid tähestikulises järjekorras. Vaikimisi kuvatakse need populaarsuse järjekorras."
     tag_style: "Siltide vimplite visuaalne stiil."
@@ -799,6 +800,8 @@ et:
   flags_dispositions:
     agreed: "Täname, et teada andsite. Tegeleme sellega."
   system_messages:
+    queued_by_staff:
+      title: "Postitus vajab kinnitust"
     welcome_user:
       subject_template: "Tere tulemast %{site_name}!"
     welcome_invite:
@@ -880,6 +883,7 @@ et:
     dark: "Tume"
     neutral: "Neutraalne"
     summer: "Suvi"
+    default_theme_name: "Vaikimisi"
     light_theme_name: "Hele"
     dark_theme_name: "Tume"
     neutral_theme_name: "Neutraalne"
@@ -905,7 +909,7 @@ et:
     leader:
       name: Vedaja
     welcome:
-      name: Teretulemast
+      name: Tere tulemast
       description: Sai like'i
     autobiographer:
       name: Autobiograaf
@@ -1063,10 +1067,17 @@ et:
             placeholder: "nimi@kuskil.ee"
           contact_url:
             label: "Veebileht"
+            placeholder: "https://www.example.com/contact-us"
           site_contact:
             label: "Automaatsed sõnumid"
       corporate:
         title: "Organisatsioon"
+      colors:
+        title: "Värvid"
+      fonts:
+        fields:
+          font_preview:
+            label: "Eelvaade"
       logos:
         title: "Logod"
         fields:
@@ -1090,8 +1101,6 @@ et:
                 label: "Foorumid esiletõstetud teemadega"
               categories_and_latest_topics:
                 label: "Foorumid ja viimased teemad"
-      emoji:
-        title: "Emotikon"
       invites:
         title: "Kutsu meeskonda"
       finished:
@@ -1109,8 +1118,13 @@ et:
     not_found: "ei leitud"
     unknown: "tundmatu"
   reviewables:
+    priorities:
+      medium: "Keskmine"
+      high: "Kõrge"
     sensitivity:
       disabled: "Välja lülitatud"
+      medium: "Keskmine"
+      high: "Kõrge"
     actions:
       agree_and_suspend:
         title: "Peata kasutaja"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index f040d4096a..20d25031ef 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -51,6 +51,8 @@ fa_IR:
   remove_posts_deleted_by_author: "پاک شده توسط نویسنده"
   redirect_warning: "ما قادر به تایید این پیوند نمی‌باشیم. پیوند انتخابی شما قبلا به انجمن پست شده است. اگر در هر‌صورت مایل به انجام این کار هستید بر روی پیوند زیر کلیک کنید."
   on_another_topic: "در یک مبحث دیگر"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} توسط %{username}"
   themes:
     bad_color_scheme: "نمی‌توان پوسته را بروزرسانی کرد، جعبه رنگ نامعتبر"
     other_error: "در بروزرسانی قالب مشکلی پیش آمده"
@@ -130,19 +132,21 @@ fa_IR:
     site_settings:
       default_categories_already_selected: "شما نمیتوانید دسته‌بندی‌ای را که در یک فهرست دیگر استفاده شده را انتخاب کنید."
       s3_upload_bucket_is_required: "شما نمیتوانید بارگذاری به S3 را فعال کنید مگر اینکه 's3_upload_bucket' را ارائه دهید."
-      second_factor_cannot_be_enforced_with_sso_enabled: "اگر SSO فعال باشد، نمی‌توانید 2FA را اجرا کنید."
   word_connector:
     comma: "، "
   invite:
     expired: "توکن دعوت‌نامه شما منقضی شده است. لطفا با <a href='%{base_url}/about'>مدیران تماس</a> بگیرید."
     user_exists: "نیازی به دعوت <b>%{email}</b> نیست، در حال حاضر <a href='%{base_path}/u/%{username}/summary'>حساب کاربری دارند!</a> "
+    invite_exists: "شما قبلا <b>%{email}</b> را دعوت کرده‌اید."
+    invalid_email: "آدرس ایمیل %{email} معتبر نیست."
     disabled_errors:
-      sso_enabled: "دعوت نامه‌ها به خاطر فعال بودن SSO، غیرفعال هستند."
+      invalid_access: "شما اجازه مشاهده منبع درخواست شده را ندارید."
   bulk_invite:
     file_should_be_csv: "فرمت فایل بارگذاری شده می بایست csv باشد."
     error: "خطایی هنگام آپلود فایل مربوطه رخ داده است. لطفا بعدا امتحان کنید."
   topic_invite:
     user_exists: "با عرض پوزش،‌ این کاربر قبلا دعوت شده. هر کاربر را فقط یک بار می‌توانید دعوت کنید."
+    user_cannot_see_topic: "%{username} نمی‌تواند موضوع را ببیند."
   backup:
     operation_already_running: "یک عملیات در حال اجراست. در حال حاضر امکان شروع عملیات جدید وجود ندارد."
     backup_file_should_be_tar_gz: "فایل پشتیبان باید یک فایل فشرده با پسوند tar.gz. باشد."
@@ -203,6 +207,7 @@ fa_IR:
   topic_not_found: "یک مشکلی وجود دارد. شاید این موضوع همزمان که شما در حال خواندن آن بودید بسته شده یا پاک شده."
   not_accepting_pms: "با عرض پوزش، کاربر %{username} در حال حاضر پیام نمی‌پذیرد."
   max_pm_recipients: "متاسفیم. فقط می‌توانید که پیغام را نهایتا به %{recipients_limit} گیرنده بفرستید."
+  watched_words_auto_tag: "موضوع به صورت خودکار برچسب گذاری شده"
   just_posted_that: "بسیار شبیه به چیزی است که به تازگی فرستادید"
   invalid_characters: "شامل نویسه‌های نامعتبر است"
   is_invalid: "نامفهوم است.آیا جمله کامل است؟"
@@ -213,6 +218,9 @@ fa_IR:
   topics_in_category: "موضوعات دسته‌بندی '%{category}'"
   rss_posts_in_topic: "خوراک '%{topic}'"
   rss_topics_in_category: "خوارک موضوعات دسته‌‌بندی '%{category}'"
+  rss_num_posts:
+    one: "%{count} نوشته"
+    other: "%{count} نوشته"
   read_full_topic: "مشاهده متن کامل موضوع"
   private_message_abbrev: "پیام"
   rss_description:
@@ -266,26 +274,6 @@ fa_IR:
     until_posts:
       one: "%{count} فرسته"
       other: "%{count} نوشته"
-    "new-topic": |
-      به %{site_name} &mdash خوش آمدید؛ **سپاس که گفت‌وگوی تازه‌ای را می‌آغازید!**
-
-      - اگر عنوان را با صدای بلند بخوانید، جالب به نظر می‌رسد؟‌ خلاصه‌ی خوبی است؟
-
-      - چه کسانی به این موضوع علاقه‌مند خواهند شد؟ چرا موضوع مهم است؟ چه جور پاسخ‌هایی می‌خواهید؟
-
-      - در موضوع خود از کلمه‌های رایج استفاده کنید تا دیگران بتوانند آن را *بیابند*. برای گروه‌بندی موضوع خود با موضوعات مرتبط، یک دسته انتخاب کنید.
-
-      برای اطلاعات بیشتر [دستورالعمل های انجمن را ببینید](%{base_path}/guidelines). این کادر فقط برای اولین %{education_posts_text} شما ظاهر می‌شود.
-    "new-reply": |
-      به %{site_name} &mdash; خوش آمدید **با تشکر از شما برای همکارییتان!**
-
-      - آیا پاسخ شما سطح گفتگو رو بالا می‌برد؟
-
-      - با اعضای انجمن مهربان باشید.
-
-      - از انتقاد سازنده استقبال می‌کنیم, ولی از *نظرات*، انتقاد کنید نه مردم.
-
-      برای اطلاعات بیشتر، [راهنمای انجمن را ببینید](%{base_path}/guidelines). این قسمت برای %{education_posts_text} نمایش داده می‌شود.
     avatar: |
       ### با یک تصویر برای حساب کاربری چطورید؟
 
@@ -519,7 +507,6 @@ fa_IR:
       unknown: "مرورگر ناشناخته"
     device:
       android: "دستگاه اندروید"
-      chromebook: "کروم‌بوک"
       ipad: "آی‌پد"
       iphone: "آیفون"
       ipod: "آی‌پاد"
@@ -530,7 +517,6 @@ fa_IR:
       unknown: "دستگاه ناشناس"
     os:
       android: "اندروید"
-      chromeos: "کروم‌اواس"
       ios: "آی‌او‌اس"
       linux: "لینوکس"
       macos: "مک‌او‌اس"
@@ -596,6 +582,7 @@ fa_IR:
       short_description: "پسندیدن این فرسته"
   user_activity:
     no_bookmarks:
+      self: "شما هیچ نوشته نشانک‌ شده‌ای ندارید؛ نشانک‌‌ها به شما اجازه می‌دهد به سرعت به نوشته‌های خاص مراجعه کنید."
       search: "هیچ نشانکی با درخواست جستجوی شده یافت نشد."
       others: "نشانه‌گذاری وجود ندارد"
     no_likes_given:
@@ -619,7 +606,7 @@ fa_IR:
       email_title: 'موضوع "%{title}" نیاز به توجه مدیر دارد. '
       email_body: "%{link}\n\n%{message}"
   flagging:
-    user_must_edit: "<p>این فرسته را انجمن پرچم‌گذاری کرده و بطور موقت مخفی است.</p>"
+    user_must_edit: "<p>این نوشته را انجمن پرچم‌گذاری کرده و بطور موقت مخفی است.</p>"
   archetypes:
     regular:
       title: "موضوع عادی"
@@ -636,9 +623,7 @@ fa_IR:
     mute_topic: "نادیده گرفتن تمام اطلاعیه‌های این موضوع، %{link}"
     unwatch_category: "موضوعات دسته‌بندی %{category} را مشاهده نکنید"
     mailing_list_mode: "غیرفعال سازی حالت فهرست ایمیل"
-    all: "برای من ایمیلی از %{sitename} اسال نکن"
     different_user_description: "در حال حاضر با نام کاربری متفاوتی با آن که برایتان ایمیل شده است وارد شده‌اید. لطفا خارج شوید یا در حالت ناشناس وارد شده و دوباره تلاش کنید."
-    not_found_description: "با عرض پوزش، نمی‌توانیم لغو اشتراک را پیدا کنیم. ممکن است لینک موجود در ایمیل شما باطل شده باشد."
     log_out: "خروج"
     digest_frequency:
       never: "هیچوقت"
@@ -656,6 +641,7 @@ fa_IR:
     description: '"%{application_name}" درخواست دسترسی به حساب کاربری شما را دارد:'
     otp_confirmation:
       confirm_title: ورود به %{site_name}
+      logging_in_as: ورود با %{username}
       confirm_button: اتمام ورود
     no_trust_level: "با عرض پوزش٬ شما سطح اعتماد مورد نیاز با برای دسترسی به api کاربر ندارید."
     generic_error: "با عرض پوزش، نمی‌توانیم کلید API کاربر را حل کنیم، شاید این ویژگی در قسمت مدیریت غیر‌فعال شده."
@@ -723,6 +709,7 @@ fa_IR:
       title: "پسندها"
       xaxis: "روز"
       yaxis: "تعداد پسندهای تازه"
+      description: "تعداد پسندهای تازه."
     flags:
       title: "پرچم‌ها"
       xaxis: "روز"
@@ -927,11 +914,11 @@ fa_IR:
     show_pinned_excerpt_mobile: "نمایش خلاصه موضوعات سنجاق شده در موبایل."
     show_pinned_excerpt_desktop: "نمایش خلاصه موضوعات سنجاق شده در کامپیوتر."
     post_onebox_maxlength: "حداکثر طول متن پیشنمایش لینک به نویسه."
+    blocked_onebox_domains: "لیست دامنه‌هایی که نباید پیش‌نمایش داشته باشند."
     max_oneboxes_per_post: "حداکثر تعداد پیش نمایش پیوند در یک نوشته"
     notification_email: "از: ایمیل آدرس زمان ارسال تمام ایمیل های ضروری سیستم استفاده شد. .دامنه مشخص شده در اینجا باید SPF, DKIM داشته باشد و سوابق PTR معکوس به درستی برای ورود ایمیل تنظیم شده باشد. "
     email_custom_headers: "فهرست pipe-delimited از سربرگ‌های ایمیل سفارشی "
     force_https: "اجبار به استفاده از HTTPS ، تا زمانی که HTTPS را کامل تنظیم نکرده‌اید این گزینه را فعال نکنید. آیا تمام CDN ها و شبکه‌های اجتماعی جهت ورود را بررسی کردید و تمام لوگو‌ها و وابستگی‌ها بدون مشکل با HTTPS کار می‌کنند؟"
-    same_site_cookies: "استفاده از همان کوکی ها، آن‌ها از تمام درخواست های vector cross site جلوگیری می‌کنند(Lax یا Strict). توجه: این کار سختگیرانه فقط در سایت‌هایی که ورود اجباری دارند و از SSO استفاده می‌کنند قابل استفاده است."
     summary_score_threshold: "حداقل امتیاز برای یک نوشته که بتواند شامل \" خلاصه این موضوع\" شود"
     summary_percent_filter: "وقتی کاربر بر روی ' خلاصه این موضوع' کلیک کرد٬‌ % بهترین نوشته‌ها را نشان بده"
     enable_personal_messages: "اجازه ارسال پیام به کاربران سطح اعتماد 1 (قابل تنظیم با حداقل سطح اعتماد برای ارسال پیام). توجه کنید که همکاران در هر شرایطی می‌توانند پیام ارسال کنند."
@@ -950,9 +937,11 @@ fa_IR:
     traditional_markdown_linebreaks: "در مدل‌های نشانه گزاری از خط جدید سنتی استفاده کن،‌ که برای linebreak نیاز به دو فضای انتهایی دارد ."
     post_undo_action_window_mins: "تعداد دقایقی که کاربران اجازه دارند اقدامی را که در نوشته انجام داده اند باز گردانند. (پسند، پرچم گذاری،‌ چیزهای دیگر)."
     must_approve_users: "مدیران باید کاربران جدید را قبل از اجازه دسترسی به سایت تایید کنند."
+    review_every_post: "همه نوشته‌ها باید بررسی شوند. هشدار! برای وب‌سایت‌های فعال و مشغول توصیه نمی‌شود."
     pending_users_reminder_delay: "اگر کاربر‌ها بیشتر از این مقدار ساعت منتظر تایید بودند به مدیران اعلام کن. مقدار -1 برای غیرفعال‌سازی."
     maximum_session_age: "کاربر برای n ساعت از آخرین بازدید در حالت وارد شده می‌ماند."
     cors_origins: "ریشه های مجاز برای cross-origin requests درخواست متقابل منشاء (CORS). هر منشاء باید دارای http:// or https://. The DISCOURSE_ENABLE_CORS env برای تنظیم به کارگیری CORS باید متغیر باشد."
+    use_admin_ip_allowlist: "مدیر‌ها فقط در صورتی می‌توانند وارد شوند که در لیست آیپی‌های نمایش داده شده باشند. (مدیریت > گزارش‌ها > آیپی‌های نمایش داده شده)"
     top_menu: "مشخص کنید کدام موارد و با چه ترتیبی در ناوبری صفحه خانگی نشان داده شوند. برای مثال: آخرین‌ها|تازه‌ها|نخوانده‌ها|دسته‌ها|خوانده‌ها|فرسته‌ها|نشانک‌ها"
     post_menu: "مشخص کنید کدام موارد بر روی فهرست نوشته ها نشان داده شوند٬ و بر اساس چه ترتیبی. برای مثال : پسند|ویرایش|پرچم|پاک کردن|همرسانی|نشانک|پاسخ"
     post_menu_hidden_items: "فهرست موارد مخفی شود بطور پیش فرض در فهرست نوشته مگر اینکه رفع گسترش به حالت روشن باشد."
@@ -972,6 +961,8 @@ fa_IR:
     email_token_valid_hours: "رمز عبور فراموش شده/ حساب کاربری فعال تا (n) ساعت اعتبار دارد."
     enable_badges: "فعال سازی سیستم نشان‌دهی"
     enable_whispers: "به همکاران اجازه ارتباط خوصی در موضوعات داده شود"
+    blocked_email_domains: "لیست pipe-delimit دامنه های ایمیل که کاربران اجازه ندارند با آن حساب کاربری ثبت‌نام کنند. برای مثال: mailinator.com|trashmail.net"
+    allowed_email_domains: "لیست pipe-delimit دامنه های ایمیل که کاربران اجازه باید با آن حساب کاربری ثبت نام کنند. اخطار: کاربرانی با دامنه‌های ایمیلی به غیر از آن‌هایی که در لیست هستند اجازه ندارند. "
     log_out_strict: "وقتی از سیستم خارج می شود، کاربر را از تمام session‌ها بر روی تمام دستگاه‌ها خارج کن "
     new_version_emails: "ارسال ایمیل به contact_email address وقتی نسخه جدید Discourse موجود است. "
     invite_expiry_days: "کلید دعوتنامه فراخوان برای چه مدت اعتبار دارد، واحد روز"
@@ -983,12 +974,7 @@ fa_IR:
     min_admin_password_length: "حداقل طول رمز عبور برای مدیریت"
     password_unique_characters: "حداقل تعداد نویسه یکتا برای یک رمز‌عبور"
     block_common_passwords: "رمز عبوری که جزء 10,000 رمز عبور رایج است را قبول نکنید. "
-    enable_sso: "اجازه single sign on از طریق سایت‌های دیگر داده شود (هشدار: آدرس ایمیل کاربر *باید* توسط سایت دیگر معتبر تشخیص داده شود!)"
-    sso_url: "لینک ورود یکپارچه (باید شامل http:// یا https://) باشد"
-    sso_secret: "مطمئن شوید که secret string استفاده شده در تصدیق رمزنویسی اطلاعات SSO ٬ 10 نویسه یا بیشتر است."
-    sso_overrides_bio: "بیوگرافی کاربر در پروفایل را از بین می‌برد و به کاربر اجازه تغییر نمی‌دهد."
-    sso_not_approved_url: "حساب‌های تأیید نشده SSO را به این URL بفرست"
-    sso_allows_all_return_paths: "از دامنه برای return_paths که توسط SSO فراهم شده جلوگیری نکن (به صورت پیشفرض مسیر برگشتی باید در همین سایت باشد)"
+    discourse_connect_overrides_bio: "بیوگرافی کاربر در پروفایل را از بین می‌برد و به کاربر اجازه تغییر نمی‌دهد."
     allow_new_registrations: "به کاربر جدید اجازه ثبت‌نام بده. لغو این انتخاب برای جلوگیری از ساخت حساب‌کاربری جدید. "
     enable_signup_cta: "نمایش اطلاعیه برای کاربران ناشناسی که سعی در ایجاد حساب کاربری دارند."
     google_oauth2_client_id: "Client ID برای نرم افزار گوگل شما. "
@@ -1005,7 +991,6 @@ fa_IR:
     top_topics_formula_log_views_multiplier: "مقدار نمایش گزارش ضربدر (n) در بالای موضوعات است فرمول: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_first_post_likes_multiplier: "مقدار پسند‌های نوشته اول ضربدر (n) در موضوعات برتر است فرمول: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "مقدار پسند‌های حداقل هر نوشته ضربدر (n) در موضوعات برتر است فرمول: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "تعداد نوشته‌های قبلی برای پخت دوباره در هر 15 دقیقه."
     rate_limit_create_topic: "بعد از ایجاد موضوع،‌ کاربر باید (n) ثانیه قبل از اینکه موضوع دیگری ایجاد کند صبر کند. "
     rate_limit_create_post: "بعد از نوشته،‌ کاربر باید (n) ثانیه قبل از ساختن نوشته‌ی دیگر صبر کند. "
     rate_limit_new_user_create_topic: "بعد از ایجاد یک موضوع، کاربر جدید باید (n) ثانیه قبل از ایجاد موضوع دیگر صبر کند."
@@ -1037,7 +1022,6 @@ fa_IR:
     png_to_jpg_quality: "کیفیت تبدیل فایل‌های JPG (1 کمترین کیفیت، 99 بالاترین کیفیت، 100 برای غیر‌فعال)"
     allow_staff_to_upload_any_file_in_pm: "به مدیران اجازه بده که هر فایلی در پیغام خصوصی آپلود کنند."
     strip_image_metadata: "فراداده های عکس را حذف کن."
-    enable_flash_video_onebox: "بکارگیری جاسازی لینک های swf و flv (ادوبی فلاش Adobe Flash) در oneboxes. اخطار: شاید باعث ایجاد خطرات امنیتی شود."
     default_invitee_trust_level: "سطح اعتماد پیشفرض (0-4) برای دعوت کاربران"
     default_trust_level: "سطح اعتماد پیشفرض(0-4) برای تمام کاربران جدید. اخطار! تغییر این ممکن است شما را در معرض خطر جدی هرزنامه قرار دهد."
     tl1_requires_topics_entered: "یک کاربر جدید چه تعداد موضوع بایستی بخواند تا به سطح اعتماد ۱ ارتقا پیدا کند."
@@ -1086,6 +1070,7 @@ fa_IR:
     desktop_category_page_style: "سبک بصری برای صفحه‌ی دسته‌بندی"
     category_colors: "لیست مقادیر رنگ هگزا دسیمال مجاز برای دسته‌بندی‌ها."
     category_style: "سبک بصری برای نشان دسته‌بندی"
+    dark_mode_none: "هیچ کدام"
     max_attachment_size_kb: "حداکثر سایز فایل پیوست شده به واحد کیلوبایت. این باید در پیکربندی nginx باشد (client_max_body_size) / همچنین apache یا proxy."
     authorized_extensions: "لیست پسوند‌های مجاز فایل برای بارگذاری ( از '*' برای اجازه به تمام فایل‌ها استفاده کنید)"
     theme_authorized_extensions: "لیست پسوند‌های قابل بارگذاری برای قالب (از '*' برای اجازه به تمامی فایل‌ها استفاده کنید)"
@@ -1107,6 +1092,7 @@ fa_IR:
     tos_url: "اگر شرایط استفاده از خدمات را در میزبان دیگری قرار دادید و می‌خواهید از آن استفاده کنید، لینک کامل را در اینجا قرار دهید."
     privacy_policy_url: "اگر سیاست حفظ حریم خصوصی را در میزبان دیگری قرار دادید و می‌خواهید از آن استفاده کنید، لینک کامل را در اینجا قرار دهید."
     newuser_spam_host_threshold: "یک کاربر چند بار می‌تواند به یک هاست لینک دهد تا `newuser_spam_host_threshold` به عنوان هرزنامه شناخته شود."
+    allowed_spam_host_domains: "لیست دامنه‌ها محروم از میزبان تست هرزنامه. هرگز از ساخت نوشته‌ی جدید با پیوند‌هایی از این دامنه‌ها محدود نمی‌شوند. "
     topic_view_duration_hours: "بازدید‌های موضوعات را به ازای هر آیپی/کاربر در N ساعت محاسبه کن"
     user_profile_view_duration_hours: "بازدید‌های پروفایل کاربران را به ازای هر آیپی/کاربر در N ساعت محاسبه کن"
     levenshtein_distance_spammer_emails: "هنگامی که تطبیق ایمیل هرزنامه باشد٬ تعداد نویسه‌های متفاوت که هنوز هم به یک تطبق مبهم اجازه خواهد داد."
@@ -1130,6 +1116,7 @@ fa_IR:
     max_emails_per_day_per_user: "حداکثر تعداد ایمیل ارسالی روزانه به کاربران. 0 برای نامحدود."
     enable_staged_users: "در زمان پردازش ایمیل های دریافتی به صورت خودکار کاربر نمایشی ایجاد کن."
     maximum_staged_users_per_email: "حداکثر تعداد کاربر خودکار در زمان پردازش ایمیل‌های ورودی"
+    auto_generated_allowlist: "فهرست ایمیل‌هایی که برای محتوای خودکار بررسی نمی‌شوند. مثال: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "ایمیل‌های دریافتی خودکار را مسدود کن."
     ignore_by_title: "ایمیل‌های دریافتی را بر اساس عنوان نادیده بگیر."
     mailgun_api_key: "Secret API سرویس Mailgun برای تایید پیام‌های وب هوک"
@@ -1175,6 +1162,7 @@ fa_IR:
     anonymous_posting_min_trust_level: "حداقل سطح اعتماد برای فعال‌سازی نوشته گذاشتن در حالت ناشناس"
     anonymous_account_duration_minutes: "برای محافظت از ناشناس ماندن هر N دقیقه برای هر کاربر یک حساب‌کاربری ناشناس بساز. برای مثال: اگر به 600 تنظیم شد٬‌ به محض اینکه 600 دقیقه از نوشته گذشت و کاربر سوئیچ شد چند لحظه بعد٬‌ حساب کاربری جدید ناشناس ساخته می شود. "
     hide_user_profiles_from_public: "غیر‌فعال‌سازی کارت کاربری، پروفایل کاربر و فهرست راهنمای کاربر برای کاربران ناشناس."
+    allowed_user_website_domains: "سایت کاربر بر خلاف این دامنه‌ها تایید می‌شود. فهرست مرز‌های مشخص."
     allow_profile_backgrounds: "به کاربر اجازه بده تا پس‌زمینه نمایه خود را بارگذاری کند."
     sequential_replies_threshold: "تعداد نوشته‌های کاربر که باید یکجا در موضوع انجام شود تا اخطار پاسخ زیاد پی در پی به او داده شود."
     get_a_room_threshold: "تعداد نوشته‌هایی که کاربر باید در یک موضوع ایجاد کند تا به او اخطار داده شود."
@@ -1202,7 +1190,6 @@ fa_IR:
     show_create_topics_notice: "اگر سایت کمتر از 5 موضوع عمومی دارد٬ مدیران اطلاع بده تا موضوعات بیشتری بسازند."
     delete_drafts_older_than_n_days: "پیش‌نویس‌های قدیمی‌تر از (n) روز را حذف کن"
     bootstrap_mode_min_users: "حداقل تعداد کاربرانی که نیاز است تا حالت خود‌راه‌انداز غیر‌فعال شود (0 برای غیر‌فعال)"
-    prevent_anons_from_downloading_files: "جلوگیری از دانلود کردن فایل پیوست توسط افراد ناشناس. اخطار: این گزینه از هر سایت بدون عکسی جلوگیری می کند. "
     slug_generation_method: "یک روش ایجاد نام یکتا انتخاب کنید. 'encoded' رشته‌ای شامل درصد ایجاد می‌کند. 'none' اسم یکتا را به صورت کلی غیر‌فعال می‌نماید."
     enable_emoji: "فعالسازی شکلک"
     emoji_set: "می‌خواهید شکلک شما چطور باشد؟"
@@ -1216,7 +1203,6 @@ fa_IR:
     default_include_tl0_in_digests: "قرار دادن نوشته‌های کاربران جدید در خلاصه ایمیل به صورت پیشفرض. کاربران می‌توانند این تنظیمات را از طریق تنظیمات شخصیشان ویرایش کنند."
     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: "وضعیت پیشفرض سراسری برای جدید در نظر گرفته شدن موضوع"
@@ -1233,7 +1219,6 @@ fa_IR:
     default_categories_watching_first_post: "لیست دسته‌بندی‌هایی که نوشته‌هایشان در هر موضوع به صورت پیشفرض تحت نظر هستند."
     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_push_urls: "لینک‌های مجاز برای سرور و ارسال به API کاربری"
     tagging_enabled: "فعالسازی برچسب در موضوعات؟"
@@ -1241,7 +1226,6 @@ fa_IR:
     max_tags_per_topic: "حداکثر برچسب‌هایی که می‌توانند در یک موضوع به کار برده شوند."
     max_tag_length: "حداکثر تعداد نویسه قابل استفاده در یک برچسب"
     max_tag_search_results: "وقتی برای برچسب جستجو می‌شود، حداکثر تعداد نتایج برای نمایش."
-    show_filter_by_tag: "نمایش منو کشویی برای فیلتر لیست موضوعات بر اساس برچسب."
     max_tags_in_filter_list: "حداکثر تعداد برچسب‌ها برای نمایش در منو کشویی. بیشترین استفاده شده ها نمایش داده می‌شوند."
     tags_sort_alphabetically: "نمایش برچسب‌ها به ترتیب الفبا. پیشفرض نمایش به ترتیب محبوبیت است."
     tag_style: "سبک بصری نشان برچسب‌ها."
@@ -1272,6 +1256,9 @@ fa_IR:
       invalid_regex: "الگوی regex نامعتبر یا غیر‌مجاز است."
       min_username_length_range: "شما نمیتوانید مقدار حداقل را بیشتر از حداکثر قرار دهید."
       max_username_length_range: "شما نمی‌توانید حداکثر را کمتر از حداقل قرار دهید."
+    placeholder:
+      discourse_connect_provider_secrets:
+        key: "www.example.com"
   search:
     within_post: "#%{post_number} توسط %{username}"
     types:
@@ -1279,7 +1266,7 @@ fa_IR:
       topic: "نتایج"
       user: "کاربران"
     results_page: "نتایج جستجو برای '%{term}'"
-  sso:
+  discourse_connect:
     login_error: "خطا در ورود"
     not_found: "حساب کاربری پیدا نشد. لطفا با مدیریت سایت تماس بگیرید."
     account_not_approved: "حساب کاربری شما در انتظار تایید است. با یک ایمیل به شما اطلاع رسانی خواهد شد."
@@ -1291,6 +1278,7 @@ fa_IR:
   most_posts: "بیشترین نوشته‌ها"
   most_recent_poster: "جدیدترین نویسنده‌ها"
   frequent_poster: "نویسنده مکرر"
+  poster_description_joiner: "، "
   redirected_to_top_reasons:
     new_user: "به انجمن ما خوش آمدید! این‌ها آخرین موضوعات ما هستند. "
     not_seen_in_a_month: "خوش آمدید دوباره!‌ شما را برای مدت طولانی ندیده‌ایم. اینها بهترین موضعات از وقتی که شما نبودید، هستند."
@@ -1362,9 +1350,12 @@ fa_IR:
     autoclosed_disabled_lastpost: "این موضوع در حال حاضر باز است. پاسخ‌های جدید اجازه‌ی ثبت دارند."
     auto_deleted_by_timer: "به صورت خودکار توسط زمان‌سنج حذف شده."
   login:
+    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: "دستگاه و یا مرورگر فعلی شما امکان استفاده از کلید امنیتی را ندارد. لطفا از روش ورود جایگزین استفاده شود."
     not_approved: "حساب کاربری شما هنوز تایید نشده است. وقتی شما آماده ورود به سیستم شوید به شما اطلاع داده می شود."
     incorrect_username_email_or_password: "نام کاربری، ایمیل یا رمز عبور نادرست است"
     wait_approval: "به تشکر از ثبت‌نام شما. وقتی حساب کاربری فعال شود به شما اطلاع خواهیم داد."
@@ -1385,6 +1376,7 @@ fa_IR:
     email_too_long: "ایمیل شما بسیار طولانی است. ایمیل باکس ها نباید بیش از 254 نویسه و نام دامنه نباید بیش از 253 نویسه باشد."
     reserved_username: "این نام کاربری مجاز نیست."
     missing_user_field: "شما تمام فیلد‌های کاربری را تکمیل نکرده اید"
+    second_factor_title: "ورود دو مرحله ای"
     second_factor_backup_description: "لطفا یکی از کدهای پشتیبان را وارد کنید:"
     second_factor_toggle:
       backup_code: "به جای آن از یک کد پشتیبان استفاده کنید"
@@ -1483,6 +1475,8 @@ fa_IR:
     post_hidden:
       title: "نوشته مخفی"
       subject_template: "نوشته مخفی شده توسط پرچم‌های اعضا"
+    queued_by_staff:
+      title: "نوشته نیاز به تایید دارد"
     welcome_user:
       title: "خوش‌آمد کاربر"
       subject_template: "به %{site_name} خوش آمدید!"
@@ -1513,10 +1507,6 @@ fa_IR:
         [prefs]: %{user_preferences_url}
     tl2_promotion_message:
       subject_template: "تبریک می‌گویم به خاطر ارتقا شما به سطح اعتماد!"
-      text_body_template: |
-        ما، شما را به [سطح اعتماد](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) ارتقا دادیم!
-
-        ما از شما دعوت می‌کنیم که همیشه در حال تعامل باشید - ما از بودن شما در بین خودمان خوش‌حال هستیم.
     backup_succeeded:
       title: "پشتیبان گیری موفق"
       subject_template: "پشتیبان‌گیری با موفقیت انجام شد"
@@ -1858,12 +1848,6 @@ fa_IR:
     account_suspended:
       title: "حساب کاربری معلق شد"
       subject_template: "[%{email_prefix}] حساب کاربری شما معلق شده است"
-      text_body_template: |
-        شما از انجمن گفتگو معلق شده اید تا %{suspended_till}.
-
-        %{reason}
-
-        %{message}
     account_exists:
       title: "حساب کاربری وحود دارد"
       subject_template: "[%{email_prefix}] حساب کاربری وحود دارد"
@@ -1938,6 +1922,13 @@ fa_IR:
     signup_after_approval:
       title: "ثبت نام بعد از تایید"
       subject_template: "شما در %{site_name} تایید شدید!"
+    signup_after_reject:
+      title: "بعد از رد شدن ثبت‌نام کنید"
+      subject_template: "شما در %{site_name} رد شدید"
+      text_body_template: |
+        یکی از کارمندان حساب کاربری شما را در %{site_name} رد کرد.
+
+        %{reject_reason}
     signup:
       title: "ثبت‌نام"
       subject_template: "[%{email_prefix}] حساب کاربری خود را تایید کنید."
@@ -1948,6 +1939,13 @@ fa_IR:
         %{base_url}/u/activate-account/%{email_token}
 
         اگر لینک بالا قابل کلیک نیست، آن را در نوار آدرس مرورگر خود کپی کنید.
+    post_approved:
+      title: "نوشته‌ی شما تایید شد"
+      subject_template: "%{site_name} نوشته‌ی شما تایید شد"
+      text_body_template: |
+        سلام،
+
+        این یک پیغام خودکار از %{site_name} که به شما اطلاع می‌دهد، که [نوشته‌ی شما](%{base_url}%{post_url}) تایید شده است.
   page_not_found:
     title: "اوه! صفحه وجود ندارد یا خصوصی‌ است."
     popular_topics: "محبوب"
@@ -2001,6 +1999,7 @@ fa_IR:
     base_theme_name: "پایه"
     light: "روشن"
     dark: "تیره"
+    default_theme_name: "پیش‌فرض"
     light_theme_name: "روشن"
     dark_theme_name: "تیره"
   edit_this_page: "ویرایش این صفحه"
@@ -2062,6 +2061,9 @@ fa_IR:
   privacy_topic:
     title: "سیاست حفظ حریم خصوصی"
   badges:
+    mass_award:
+      errors:
+        badge_disabled: لطفا ابتدا نشان %{badge_name} را فعال کنید.
     editor:
       name: ویرایشگر
       description: نخستین ویرایش نوشته
@@ -2256,7 +2258,7 @@ fa_IR:
     title: "راه اندازی Discourse"
     step:
       locale:
-        title: "به Discoue خوش آمدید!"
+        title: "به دیسکورس خوش آمدید!"
         fields:
           default_locale:
             description: "زبان پیشفرض انجمن شما چیست؟"
@@ -2295,11 +2297,14 @@ fa_IR:
             description: "ایمیل شخص یا گروه پاسخگوی انجمن. برای اطلاعات مهمی مانند پرچم‌های کنترل نشده، به‌روز‌رسانی‌های امنیتی و تماس‌های فوری در <a href='%{base_path}/about' target='_blank'>صفحه دباره‌ما</a> "
           contact_url:
             label: "صفحه وب"
+            placeholder: "https://www.example.com/contact-us"
             description: "صفحه تماس عمومی شما در <a href='%{base_path}/about' target='_blank'>صفحه درباره ما</a> نمایش داده می‌شود."
           site_contact:
             label: "پیام‌های خودکار"
       corporate:
         title: "سازمان"
+      colors:
+        title: "رنگ‌ها"
       fonts:
         fields:
           font_preview:
@@ -2330,9 +2335,6 @@ fa_IR:
                 label: "دسته‌بندی‌ها و آخرین موضوعات"
               categories_and_top_topics:
                 label: "دسته بندی ها و مباحث داغ"
-      emoji:
-        title: "شکلک"
-        description: "نوع شکلک مورد نظرتان را انتخاب کنید. می‌توانید از بخش مدیریت شکلک های سفارشی اضافه کنید."
       invites:
         title: "دعوت همکاران"
       finished:
@@ -2378,6 +2380,7 @@ fa_IR:
           title: "حذف کاربر"
       reject:
         title: "رد کردن"
+        bundle_title: "رد کردن..."
       delete_user:
         title: "حذف کاربر"
   activemodel:
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index ec573a0e07..35620dfe23 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -39,6 +39,7 @@ fi:
   title: "Discourse"
   topics: "Ketjut"
   posts: "viestit"
+  views: "katselua"
   loading: "Lataa"
   powered_by_html: 'Voimanlähteenä <a href="https://www.discourse.org">Discourse</a>, toimii parhaiten, kun JavaScript on käytössä'
   sign_up: "Luo tili"
@@ -50,18 +51,26 @@ fi:
   remove_posts_deleted_by_author: "Kirjoittajan poistama"
   redirect_warning: "Emme pystyneet varmistamaan että klikkaamasi linkki on oikeasti lähetetty palstalle. Jos haluat silti jatkaa, klikkaa alla olevaa linkkiä."
   on_another_topic: "Toisessa ketjussa"
+  inline_oneboxer:
+    topic_page_title_post_number: "%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} käyttäjältä %{username}"
   themes:
     bad_color_scheme: "Ei voi päivittää teemaa, väripaletti ei kelpaa"
     other_error: "Jotakin meni vikaan, kun teemaa päivitettiin"
+    ember_selector_error: "Valitettavasti #ember- tai .ember-näkymän CSS-valitsimien käyttö ei ole sallittua, koska nämä nimet luodaan dynaamisesti ajon aikana ja ne muuttuvat ajan myötä, mikä johtaa lopulta rikkoutuneeseen CSS: ään. Kokeile toista valitsinta."
     compile_error:
       unrecognized_extension: "Tuntematon tiedostomuoto: %{extension}"
     import_error:
+      generic: Teeman tuomisessa tapahtui virhe
       about_json: "Virhe tuotaessa: about.json ei ole olemassa tai ei kelpaa. Oletko varma, että tämä on Discourse-teema?"
       about_json_values: "about.json sisältää arvoja, jotka eivät kelpaa: %{errors}"
+      modifier_values: "about.json sisältää virheellisiä arvoja: %{errors}"
       git: "Virhe git-tietovarastoa kloonattaessa: ei ole pääsyoikeutta tai tietovarastoa ei löytynyt"
+      git_ref_not_found: "git checkout epäonnistui kohteelle: %{ref}"
       unpack_failed: "Tiedoston purku epäonnistui"
       file_too_big: "Purettu tiedosto on liian suuri."
       unknown_file_type: "Lähettämäsi tiedosto ei vaikuta olevan käypä Discourse-teema."
+      not_allowed_theme: "`%{repo}` ei ole sallittujen teemojen luettelossa (tarkista `allowed_theme_repos` -asetus)."
     errors:
       component_no_user_selectable: "Teemakomponentti ei voi olla käyttäjän valittavissa"
       component_no_default: "Teemakomponentti ei voi olla oletusteema"
@@ -113,7 +122,10 @@ fi:
         bounced_email_error: "Sähköposti on palautetun sähköpostin raportti"
         screened_email_error: "Näin käy, kun lähettäjän sähköpostiosoite on jo seulottu."
         unsubscribe_not_allowed: "Näin käy, kun tämä käyttäjä ei voi perua tilausta sähköpostitse."
+        email_not_allowed: "Näin käy, kun sähköpostiosoite ei ole sallittujen listalla tai on kiellettyjen listalla."
       unrecognized_error: "Tuntematon virhe"
+    secure_media_placeholder: "Piilotettu: Tällä sivustolla on suojattu sisältö käytössä, vieraile ketjussa tai näytä sisältö napsauttamalla Näytä sisältö -painiketta."
+    view_redacted_media: "Näytä sisältö"
   errors: &errors
     format: ! "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>: %{message}"
@@ -135,6 +147,9 @@ fi:
       inclusion: ei ole listalla
       invalid: ei kelpaa
       is_invalid: "vaikuttaa epäselvältä, olihan se kokonainen virke?"
+      is_invalid_meaningful: "vaikuttaa epäselvältä, suurin osa sanoista sisältää samat kirjaimet uudestaan ja uudestaan?"
+      is_invalid_unpretentious: "vaikuttaa epäselvältä, yksi tai useampi sana on hyvin pitkä?"
+      is_invalid_quiet: "vaikuttaa epäselvältä, kirjoititko tarkoituksella KAIKKI ISOILLA KIRJAIMILLA?"
       invalid_timezone: "'%{tz}' ei ole käypä aikavyöhyke"
       contains_censored_words: "sisältää nämä sensuroidut sanat: %{censored_words}"
       less_than: täytyy olla vähemmän kuin %{count}
@@ -159,7 +174,7 @@ fi:
         one: on väärän mittainen (pitäisi olla %{count} merkki)
         other: on väärän mittainen (pitäisi olla %{count} merkkiä)
       other_than: "pitää olla muu kuin %{count}"
-      sso_overrides_username: "Käyttäjänimeä täytyy muokata SSO-tarjoajan päässä, sillä `sso_overrides_username` -asetus on kytketty."
+      auth_overrides_username: "Käyttäjänimeä täytyy muokata SSO-tarjoajan päässä, sillä `sso_overrides_username` -asetus on kytketty."
     template:
       body: ! "Seuraavien kenttien kanssa oli ongelmia:"
       header:
@@ -176,26 +191,62 @@ fi:
       default_tags_already_selected: "Et voi valita aluetta, joka on käytössä toisella listalla"
       s3_upload_bucket_is_required: "Et voi ottaa s3 latausta käyttöön, jos et ole määrittänyt 's3_upload_bucket'."
       enable_s3_uploads_is_required: "Et voi ottaa S3-inventorya käyttöön, jollei S3-lataukset ole käytössä."
+      page_publishing_requirements: "Sivun julkaisua ei voida ottaa käyttöön, jos suojattu media on käytössä."
       s3_backup_requires_s3_settings: "Et voi käyttää S3:a varmuuskopiosijaintina, jos %{setting_name} ei ole määritetty."
       s3_bucket_reused: "Sama säiliö ei voi olla sekä 's3_upload_bucket' että 's3_backup_bucket'. Valitse eri säiliö tai määritä eri polku jokaiselle säiliölle."
       secure_media_requirements: "S3-lataukset täytyy ottaa käyttöön, jotta voi ottaa käyttöön suojatut medialataukset."
+      share_quote_facebook_requirements: "Facebook-sovellustunnus on määritettävä jotta lainausten jakaminen Facebookiin on mahdollista."
+      second_factor_cannot_enforce_with_socials: "Et voi pakottaa 2FA-asetusta käyttöön kun yhteisökirjautuminen on aktiivisena. Poista yhteisökirjautuminen käytöstä täällä: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Et voi pakottaa kaksivaiheista tunnistautumista, jos paikallinen kirjautuminen on pois käytöstä."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "Et voi pakottaa 2FA-asetusta käyttöön kun DiscourseConnect on aktiivisena."
       local_login_cannot_be_disabled_if_second_factor_enforced: "Et voi ottaa paikallista kirjautumista käytöstä, jos kaksivaiheinen tunnistautuminen on pakollinen. Kun otat kaksivaiheisen tunnistautumisen pakollisuuden käytöstä, voit ottaa käytöstä paikallisen kirjautumisen."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "Et voi ottaa S3-latauksia käyttöön, koska S3-lataukset ovat käytössä globaalisti. Päälle kytkeminen sivustonlaajuisesti voisi aiheuttaa kriittisiä latauksiin liittyviä ongelmia"
+      cors_origins_should_not_have_trailing_slash: "CORS-poluissa ei tulisi olla kauttaviivaa (/) lopussa."
     conflicting_google_user_id: 'Tämän käyttäjätilin Google Account ID on muuttunut. Henkilökunnan toimenpiteet ovat tarpeen tietoturvasyistä. Ota yhteyttä henkilökuntaan ja ohjaa heidät osoitteeseen<br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+    onebox:
+      invalid_address: "Valitettavasti emme voineet luoda esikatselua tälle verkkosivulle, koska palvelinta '%{hostname}' ei löydy. Esikatselun sijaan viestissä näkyy vain linkki. :cry:"
+      error_response: "Valitettavasti emme voineet luoda esikatselua tälle verkkosivulle, koska palvelin palautti virhekoodin %{status_code}. Esikatselun sijaan viestissä näkyy vain linkki. :cry:"
+      missing_data:
+        one: "Valitettavasti emme voineet luoda esikatselua tälle verkkosivulle, koska seuraavaa oEmbed / OpenGraph-tunnistetta ei löytynyt: %{missing_attributes}"
+        other: "Valitettavasti emme voineet luoda esikatselua tälle verkkosivulle, koska seuraavia oEmbed / OpenGraph-tunnisteita ei löytynyt: %{missing_attributes}"
+  word_connector:
+    comma: ", "
   invite:
+    expired: "Kutsun tunniste on vanhentunut. <a href='%{base_url}/about'>Ota yhteys henkilökuntaan</a>."
     not_found: "Kutsusi tunnistusväline ei kelpaa. <a href='%{base_url}/about'>Ota yhteyttä henkilökuntaan</a>."
     not_found_json: "Kutsusi tunnistusväline ei kelpaa. Ota yhteyttä henkilökuntaan."
-    error_message: "Kutsun hyväksyminen epäonnistui. Ota yhteyttä sivuston ylläpitäjään."
+    not_matching_email: "Sähköpostiosoitteesi ja kutsun tunnisteeseen liitetty sähköpostiosoite eivät täsmää. Ota yhteyttä henkilökuntaan."
+    not_found_template: |
+      <p>Kutsusi sivustolle<a href="%{base_url}">%{site_name}</a> on jo käytetty.</p>
+
+      <p>Jos muistat salasanasi voit <a href="%{base_url}/login">kirjautua sisään</a>.</p>
+
+      <p>Muussa tapauksessa <a href="%{base_url}/password-reset">vaihda salasanasi</a>.</p>
+    not_found_template_link: |
+      <p>Kutsua sivustolle <a href="%{base_url}">%{site_name}</a> ei voida enää lunastaa. Pyydä henkilöä, joka kutsui sinut lähettämään sinulle uusi kutsu.</p>
     user_exists: "Ei ole tarpeen lähettää kutsua osoitteeseen <b>%{email}</b>, sillä kutsuttavalla <a href='%{base_path}/u/%{username}/summary'>on jo tunnus!</a>"
+    invite_exists: "Olet jo lähettänyt kutsun osoitteeseen <b>%{email}</b>."
+    invalid_email: "%{email} ei ole kelvollinen sähköpostiosoite."
     confirm_email: "<p>Melkein valmista! Lähetimme aktivointiviestin sähköpostiosoitteeseesi. Aktivoi tilisi noudattamalla sähköpostissa kerrottuja ohjeita.</p><p>Jos viesti ei saavu, tarkistathan roskapostikansiosi.</p>"
+    cant_invite_to_group: "Sinulla ei ole oikeuksia kutsua käyttäjiä määriteltyihin ryhmiin. Varmista, että olet sen ryhmän/ryhmien omistaja, joihin yrität kutsua."
+    disabled_errors:
+      discourse_connect_enabled: "Kutsut on poistettu käytöstä, koska DiscourseConnect on aktiivinen."
+      invalid_access: "Sinulla ei ole oikeutta nähdä pyydettyä resurssia."
   bulk_invite:
     file_should_be_csv: "Ladattavan tiedoston tulee olla CSV-muodossa."
     max_rows: "Ensimmäiset %{max_bulk_invites} kutsua lähetettiin. Jaa tiedosto pienempiin osiin."
     error: "Tiedoston lataus epäonnistui. Yritä myöhemmin uudelleen."
+  invite_link:
+    email_taken: "Tämä sähköpostiosoite on jo käytössä. Jos sinulla on jo tili, kirjaudu sisään tai vaihda salasana."
+    max_redemptions_limit: "tulisi olla välillä 2 ja %{max_limit}."
   topic_invite:
     failed_to_invite: "Käyttäjää ei voi kutsua ketjuun, jollei hän ole jonkun näistä ryhmistä jäsen: %{group_names}."
     user_exists: "Pahoittelut, tämä käyttäjä on jo kutsuttu. Voit kutsua toisen käyttäjän ketjuun vain yhden kerran."
+    muted_invitee: "Valitettavasti tämä käyttäjä on hiljentänyt sinut."
+    muted_topic: "Valitettavasti käyttäjä on hiljentänyt tämän ketjun."
+    receiver_does_not_allow_pm: "Valitettavasti tämä käyttäjä ei salli sinun lähettää hänelle yksityisiä viestejä."
+    sender_does_not_allow_pm: "Valitettavasti et salli käyttäjän lähettää sinulle yksityisiä viestejä."
+    user_cannot_see_topic: "%{username} ei näe tätä ketjua."
   backup:
     operation_already_running: "Tehtävä on parhaillaan käynnissä. Uutta tehtävää ei voi aloittaa juuri nyt."
     backup_file_should_be_tar_gz: "Varmuuskopion tulisi olla .tar.gz-pakattu tiedosto."
@@ -218,6 +269,7 @@ fi:
   email_template_cant_be_modified: "Tätä sähköpostipohjaa ei voi muokata"
   invalid_whisper_access: "Joko kuiskaukset eivät ole käytössä tai sinulla ei ole oikeutta kuiskata."
   not_in_group:
+    title_topic: "Ketjun lukeminen vaatii jäsenyyden ryhmässä '%{group}'."
     title_category: "Täytyy kuulua ryhmään, jotta näkee tämän alueen."
     request_membership: "Hae jäsenyyttä"
     join_group: "Liity ryhmään"
@@ -264,6 +316,11 @@ fi:
   too_many_mentions_newuser:
     one: "Pahoittelut, uusi käyttäjä voi mainita viestissä vain yhden käyttäjän."
     other: "Pahoittelut, uusi käyttäjä voi mainita viestissä vain %{count} käyttäjää."
+  no_embedded_media_allowed_trust: "Valitettavasti et saa upottaa mediaobjekteja viesteihin."
+  no_embedded_media_allowed: "Valitettavasti uudet käyttäjät eivät saa upottaa mediaobjekteja viesteihin."
+  too_many_embedded_media:
+    one: "Valitettavasti uudet käyttäjät voivat upottaa vain yhden mediaobjektin viesteihin."
+    other: "Valitettavasti uudet käyttäjät voivat upottaa vain %{count} mediaobjektia viesteihin."
   no_attachments_allowed: "Pahoittelut, uusi käyttäjä ei voi liittää liitteitä viesteihin."
   too_many_attachments:
     one: "Pahoittelut, uusi käyttäjä voi liittää vain yhden liitteen viestiin."
@@ -282,7 +339,10 @@ fi:
   max_pm_recipients: "Pahoittelut, voit lähettää viestin enintään %{recipients_limit} vastaanottajalle."
   pm_reached_recipients_limit: "Pahoittelut, yksityisviestillä ei voi olla yli %{recipients_limit} vastaanottajaa."
   removed_direct_reply_full_quotes: "Jos edellinen viesti lainataan kokonaan, poista lainaus automaattisesti."
+  watched_words_auto_tag: "Automaattisesti merkitty ketju"
   secure_upload_not_allowed_in_public_topic: "Pahoittelut, näitä suojattuja latauksia ei voi käyttää julkisessa ketjussa: %{upload_filenames}"
+  create_pm_on_existing_topic: "Valitettavasti et voi luoda yksityisviestiä olemassa olevasta ketjusta."
+  slow_mode_enabled: "Tämä ketju on hidastetussa tilassa."
   just_posted_that: "on liian samanlainen kuin aiempi viestisi"
   invalid_characters: "sisältää epäkelpoja merkkejä"
   is_invalid: "vaikuttaa epäselvältä, olihan se kokonainen virke?"
@@ -293,11 +353,17 @@ 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"
+  rss_num_posts:
+    one: "%{count} viesti"
+    other: "%{count} viestiä"
+  rss_num_participants:
+    one: "%{count} osallistuja"
+    other: "%{count} osallistujaa"
   read_full_topic: "Lue koko ketju"
   private_message_abbrev: "YV"
   rss_description:
     latest: "Tuoreimmat viestiketjut"
-    top: "Kuumat ketjut"
+    top: "Suositut ketjut"
     top_all: "Kaikkien aikojen parhaat ketjut"
     top_yearly: "Vuoden parhaat ketjut"
     top_quarterly: "Vuosineljänneksen parhaat ketjut"
@@ -315,12 +381,15 @@ fi:
   too_late_to_edit: "Tämä viesti luotiin liian kauan sitten. Sitä ei voi enää muokata tai poistaa."
   edit_conflict: "Toinen käyttäjä muokkasi viestiä, minkä vuoksi sinun tekemääsi muutosta ei voi enää tallentaa."
   revert_version_same: "Nykyinen revisio on sama, kuin jonka yrität palauttaa."
+  cannot_edit_on_slow_mode: "Tämä aihe on hidastetussa tilassa. Huolellisen, harkitun keskustelun kannustamiseksi vanhojen viestien muokkaaminen tässä aiheessa ei ole tällä hetkellä sallittua."
   excerpt_image: "kuva"
   bookmarks:
     errors:
       already_bookmarked_post: "Samaa viestiä ei voi kirjanmerkitä kahdesti."
+      too_many: "Valitettavasti et voi lisätä enempää kuin %{limit} kirjanmerkkiä. Voit poistaa kirjanmerkkejä <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> kautta."
       cannot_set_past_reminder: "Kirjanmerkkimuistutusta ei voi asettaa menneisyyteen."
       cannot_set_reminder_in_distant_future: "Kirjanmerkkimuistutusta ei voi asettaa yli 10 vuoden päähän tulevaisuuteen."
+      time_must_be_provided: "Kaikkiin muistutuksiin on asetettava kellonaika."
     reminders:
       at_desktop: "Ensi kerralla kun olen työpöytäympäristössäni"
       later_today: "Myöhemmin tänään"
@@ -346,6 +415,11 @@ fi:
       email_already_used_in_category: "'%{email}' on jo käytössä alueella '%{category_name}'."
       cant_allow_membership_requests: "Et voi sallia ryhmäjäsenyyden hakemista, jos ryhmällä ei ole isäntää."
       already_requested_membership: "Olet jo hakenut tämän ryhmän jäsenyyttä."
+      adding_too_many_users:
+        one: "Enintään %{count} käyttäjä voidaan lisätä kerralla"
+        other: "Enintään %{count} käyttäjää voidaan lisätä kerralla"
+      no_invites_with_discourse_connect: "Voit kutsua vain rekisteröityneitä käyttäjiä, kun DiscourseConnect on käytössä"
+      no_invites_without_local_logins: "Voit kutsua vain rekisteröityneitä käyttäjiä, kun paikalliset kirjautumistiedot on poistettu käytöstä"
     default_names:
       everyone: "kaikki"
       admins: "yllapitajat"
@@ -364,28 +438,28 @@ fi:
         Pyyntösi ryhmään @%{group_name} liittymiseksi on hyväksytty ja olet nyt jäsen.
   education:
     until_posts:
-      one: "ensimmäisen viestisi"
-      other: "%{count} ensimmäistä viestiäsi"
+      one: "ensimmäisen %{count} viestin"
+      other: "ensimmäisen %{count} viestin"
     "new-topic": |
       Tervetuloa, tämä on %{site_name} &mdash; **kiitos uuden viestiketjun aloittamisesta!**
 
-      - Kuulostaako otsikko mielenkiintoiselta, jos luet sen ääneen? Onko se hyvä kiteytys?
+      - Kuulostaako otsikko mielenkiintoiselta jos luet sen ääneen? Kuvaako se ketjua hyvin?
 
-      - Ketä tämä ketju voisi kiinnostaa? Mikä on sen merkitys? Minkälaisia vastauksia odotat?
+      - Ketä tämä ketju voisi kiinnostaa? Mikä on sen tarkoitus? Minkälaisia vastauksia haluaisit?
 
-      - Sisällytä tekstiin usein käytettyjä sanoja, jotta muut voivat *löytää* sen. Yhdistääksesi ketjun muihin siihen liittyviin ketjuihin, valitse sille sopiva alue.
+      - Sisällytä tekstiin yleisesti käytettyjä sanoja, jotta muut voivat *löytää* sen. Voit ryhmitellä ketjun vastaavien viestiketjujen kanssa valitsemalla sille sopivan keskustelualueen (tai tunnisteen)
 
-      Saadaksesi lisätietoa, [käy tutkimassa ohjeet](%{base_path}/guidelines). Tämä ohje näytetään vain kirjoittaessasi %{education_posts_text}.
+      Lue lisää vinkkejä [ohjeista](%{base_path}/guidelines). Tämä ohjepaneeli näytetään vain %{education_posts_text} ajan.
     "new-reply": |
       Tervetuloa, tämä on %{site_name} &mdash; **kiitos keskusteluun osallistumisesta!**
 
-      - Parantaako vastauksesi keskustelua jollain tapaa?
-
       - Ole ystävällinen muille käyttäjille.
 
+      - Parantaako vastauksesi keskustelua jollain tapaa?
+
       - Rakentava palaute on tervetullutta, mutta kritisoi *ideoita*, älä ihmisiä.
 
-      Saadaksesi lisätietoa, [käy tutkimassa palstan säännöt](%{base_path}/guidelines). Tämä ohje näytetään vain kirjoittaessasi %{education_posts_text}.
+      Lue lisää vinkkejä [ohjeista](%{base_path}/guidelines). Tämä ohjepaneeli näytetään vain %{education_posts_text} ajan.
     avatar: |
       ### Mitäpä jos lisäisit kuvan käyttäjätiliisi?
 
@@ -407,17 +481,25 @@ fi:
 
       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?
+      Ketju voisi olla vieläkin parempi, jos useammilla olisi tilaa jakaa omia näkökulmiaan. Voisit kutsua heitä tänne?
+    get_a_room: |
+      ### Rohkaise kaikkia osallistumaan keskusteluun
+
+      Olet vastannut %{count} kertaa käyttäjälle @%{reply_username} tässä ketjussa!
+
+      Parhaissa keskusteluissa on monia ääniä ja näkökulmia. Voitko saada jonkun liittymään keskusteluun?
+
+      Pidä mielessä, että jos haluat keskustella syvällisemmin tämän käyttäjän kanssa ei-julkisesti, [lähetä hänelle yksityisviesti](%{base_path}/u/%{reply_username}).
     too_many_replies: |
       ### Olet kirjoittanut enimmäismäärän vastauksia tähän ketjuun
 
-      Olemme pahoillamme, mutta uusien käyttäjien viestien määrä on rajoitettu %{newuser_max_replies_per_topic} vastaukseen samassa ketjussa.
+      Valitettavasti uusien käyttäjien viestien määrä on rajoitettu %{newuser_max_replies_per_topic} vastaukseen samassa ketjussa.
 
       Harkitse edellisten viestiesi muokkaamista uuden viestin kirjoittamisen sijaan tai vieraile muissa ketjuissa.
     reviving_old_topic: |
-      ### Elvytä ketju?
+      ### Herätetäänkö tämä ketju?
 
-      Viimeisimmästä vastauksesta ketjuun on jo **%{time_ago}**. Vastauksesi nostaa ketjun listausten kärkeen ja siitä lähtee ilmoitus aiemmin keskusteluun osallistuneille.
+      Tähän ketjuun on vastattu viimeksi **%{time_ago}**. Vastauksesi nostaa ketjun listauksien kärkeen ja siitä lähtee ilmoitus aiemmin keskusteluun osallistuneille.
 
       Oletko varma, että haluat jatkaa tätä vanhaa keskustelua?
   activerecord:
@@ -442,8 +524,10 @@ fi:
               cant_send_pm: "Pahoittelut, et voi lähettää yksityisviestiä tällä käyttäjälle."
               no_user_selected: "Sinun täytyy valita kelpaava käyttäjä."
               reply_by_email_disabled: "Sähköpostilla vastaaminen ei ole käytössä."
+              send_to_email_disabled: "Valitettavasti et voi lähettää yksityisviestejä sähköpostiin."
               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."
+              unable_to_tag: "Tunnisteen asettaminen ketjuun 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."
@@ -489,6 +573,9 @@ fi:
           attributes:
             execute_at:
               in_the_past: "täytyy olla tulevaisuudessa."
+            duration_minutes:
+              cannot_be_zero: "on oltava suurempi kuin 0."
+              exceeds_maximum: "voi olla enintään 20 vuotta."
         translation_overrides:
           attributes:
             value:
@@ -589,22 +676,22 @@ fi:
       other: "%{count} tykkäystä"
   rate_limiter:
     slow_down: "Olet suorittanut toiminnon liian monta kertaa. Kokeile myöhemmin uudelleen."
-    too_many_requests: "Olet suorittanut toiminnon liian monta kertaa. Odota %{time_left} ennen kuin yrität uudelleen."
+    too_many_requests: "Olet suorittanut toiminnon liian monta kertaa. Odota %{time_left} ja yritä sitten uudelleen."
     by_type:
-      first_day_replies_per_day: "Olet jo lähettänyt niin monta viestiä kuin uusi käyttäjä ensimmäisenä päivänään voi. Odota %{time_left} ennen kuin yrität uudelleen."
-      first_day_topics_per_day: "Olet jo aloittanut niin monta ketjua kuin uusi käyttäjä ensimmäisenä päivänään voi. Odota %{time_left} ennen kuin yrität uudelleen."
-      create_topic: "Aloitat ketjuja liian taajaan. Odota %{time_left} ennen kuin yrität uudelleen."
-      create_post: "Lähetät vastauksia liian taajaan. Odota %{time_left} ennen kuin yrität uudelleen."
-      delete_post: "Poistat viestejä liian taajaan. Odota %{time_left} ennen kuin yrität uudelleen."
-      public_group_membership: "Liityt tai poistut ryhmistä liian taajaan. Odota %{time_left} ennen kuin yrität uudelleen."
-      topics_per_day: "Olet aloittanut enimmäismäärän uusia ketjuja. Odota %{time_left} ennen kuin yrität uudelleen."
-      pms_per_day: "Olet lähettänyt enimmäismäärän yksityisviestejä. Odota %{time_left} ennen kuin yrität uudelleen."
-      create_like: "Olet jakanut enimmäismäärän tykkäyksiä. Odota %{time_left} ennen kuin yrität uudelleen."
-      create_bookmark: "Olet lisännyt enimmäismäärän kirjanmerkkejä. Odota %{time_left} ennen kuin yrität uudelleen. "
-      edit_post: "Olet tehnyt enimmäismäärän muokkauksia. Odota %{time_left} ennen kuin yrität uudelleen."
+      first_day_replies_per_day: "Arvostamme innostustasi, jatka samaan malliin! Yhteisömme turvallisuuden vuoksi olet saavuttanut enimmäismäärän vastauksia, jotka uusi käyttäjä voi luoda ensimmäisenä päivänä. Odota %{time_left} ja yritä sitten uudelleen."
+      first_day_topics_per_day: "Arvostamme innostustasi! Yhteisömme turvallisuuden vuoksi olet saavuttanut enimmäismäärän ketjuja, jotka uusi käyttäjä voi luoda ensimmäisenä päivänä. Odota %{time_left} ja yritä sitten uudelleen."
+      create_topic: "Olet luomassa aiheita liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
+      create_post: "Vastaat hieman liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
+      delete_post: "Poistat viestejä hieman liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
+      public_group_membership: "Liityt / poistut ryhmistä hieman liian usein. Odota %{time_left} ja yritä sitten uudelleen."
+      topics_per_day: "Olet saavuttanut päivittäin sallittujen uusien aiheiden enimmäismäärän. Odota %{time_left} ja yritä sitten uudelleen."
+      pms_per_day: "Olet saavuttanut päivässä sallitun viestien enimmäismäärän. Odota %{time_left} ja yritä sitten uudelleen."
+      create_like: "Vau! Olet jakanut paljon rakkautta! Olet saavuttanut päivittäisten tykkäysten ylärajan tälle päivälle, mutta kun saavutat luottamustason, ansaitset enemmän päivittäisiä tykkäyksiä. Odota %{time_left} ja yritä sitten uudelleen."
+      create_bookmark: "Olet saavuttanut päivittäisten kirjanmerkkien enimmäismäärän. Odota %{time_left} ja yritä sitten uudelleen."
+      edit_post: "Olet saavuttanut päivittäisten muokkausten enimmäismäärän. Odota %{time_left} ja yritä sitten uudelleen."
       live_post_counts: "Kysyt viestimääriä liian nopealla tahdilla. Odota %{time_left} ja yritä sitten uudelleen."
       unsubscribe_via_email: "Olet perunut enimmäismäärän sähköpostitse. Odota %{time_left} ja yritä sitten uudelleen."
-      topic_invitations_per_day: "Olet kutsunut enimmäismäärän käyttäjiä ketjuihin. Odota %{time_left} ja yritä sitten uudelleen."
+      topic_invitations_per_day: "Olet lähettänyt enimmäismäärän kutsuja ketjuihin. Odota %{time_left} niin voit lähettää lisää kutsuja."
     hours:
       one: "%{count} tunti"
       other: "%{count} tuntia"
@@ -708,7 +795,7 @@ fi:
       unknown: "tuntematon selain"
     device:
       android: "Android-laite"
-      chromebook: "Chromebook"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -719,7 +806,7 @@ fi:
       unknown: "tuntematon laite"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -730,14 +817,19 @@ fi:
     confirmed: "Sähköpostiosoite päivitetty."
     please_continue: "Jatka sivustolle %{site_name}"
     error: "Sähköpostiosoitteen vaihdossa tapahtui virhe. Ehkäpä tämä sähköpostiosoite on jo käytössä?"
+    doesnt_exist: "Sähköpostiosoitetta ei ole liitetty tiliisi."
     error_staged: "Sähköpostiosoitetta muutettaessa tapahtui virhe. Osoite on automaattisesti luodun esikäyttäjän käytössä."
     already_done: "Pahoittelut, tämä varmennuslinnkki ei ole enää voimassa. Ehkäpä sähköpostiosoitteesi on jo vaihdettu?"
     confirm: "Vahvista"
+    max_secondary_emails_error: "Olet saavuttanut sallitun toissijaisten sähköpostiosoitteiden enimmäismäärän."
     authorizing_new:
       title: "Vahvista uusi sähköpostiosoite"
+      description: "Vahvista, että haluat sähköpostiosoitteesi muutettavan seuraavasti:"
+      description_add: "Vahvista, että haluat lisätä vaihtoehtoisen sähköpostiosoitteen:"
     authorizing_old:
       title: "Vaihda sähköpostiosoitettasi"
       description: "Vahvista sähköpostiosoitteesi vaihdos"
+      description_add: "Vahvista, että haluat lisätä vaihtoehtoisen sähköpostiosoitteen:"
       old_email: "Vanha sähköposti: %{email}"
       new_email: "Uusi sähköposti: %{email}"
       almost_done_title: "Vahvista uusi sähköpostiosoite"
@@ -811,6 +903,7 @@ fi:
       others: "Ei ole tehnyt mitään mainittavaa."
     no_bookmarks:
       self: "Kirjanmerkeissäsi ei ole mitään. Kirjanmerkitsemällä viestejä löydät ne myöhemmin helposti."
+      search: "Kirjanmerkkejä ei löytynyt näillä hakusanoilla."
       others: "Ei kirjanmerkkejä."
     no_likes_given:
       self: "Et ole tykännyt yhdestäkään viestistä."
@@ -881,11 +974,12 @@ fi:
     mailing_list_mode: "Poistu postituslistatilasta"
     all: "Älä lähetä minulle sähköpostia sivustolta %{sitename}"
     different_user_description: "Olet kirjautunut sisään eri käyttäjänä kuin jolle sähköposti lähetettiin. Kirjaudu ulos tai siirry anonyymitilaan ja yritä sitten uudelleen."
-    not_found_description: "Pahoittelut, tätä tilauksen perumista ei löytynyt. Kenties sinulle lähetetty linkki on vanhentunut?"
+    not_found_description: "Valitettavasti emme löytäneet tilauksen peruutusta. Kenties sinulle lähetetty linkki on vanhentunut?"
     log_out: "Kirjaudu ulos"
     submit: "Tallenna asetukset"
     digest_frequency:
       title: "Saat sähköpostikoosteita %{frequency}"
+      never_title: "Sinulle ei lähetetä yhteenvetoja sähköpostitse"
       select_title: "Sähköpostikoosteiden taajuus:"
       never: "ei koskaan"
       every_30_minutes: "puolen tunnin välein"
@@ -916,6 +1010,7 @@ fi:
       read: "Kaikkien luku"
       write: "Kaikkiin kirjaittaminen"
       one_time_password: "Luo kertakäyttöinen kirjautumiskoodi"
+      bookmarks_calendar: "Lue kirjanmerkkimuistutuksia"
     invalid_public_key: "Pahoittelut, julkinen avain ei kelpaa."
     invalid_auth_redirect: "Pahoittelut, tämä auth_redirect host ei ole sallittu."
     invalid_token: "Tunnistusväline puuttuu, ei kelpaa tai on vanhentunut."
@@ -1251,8 +1346,13 @@ fi:
     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."
+    google_oauth2_config_warning: 'Palvelin on konfiguroitu hyväksymään liittyminen ja kirjautuminen Google OAuth2:n kautta (enable_google_oauth2_logins), mutta client id- ja client secret -arvoja ei ole asetettu. Aseta arvot <a href="%{base_path}/admin/site_settings">sivuston asetuksissa</a>. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Lue lisää tästä oppaasta</a>.'
+    facebook_config_warning: 'Palvelin on konfiguroitu hyväksymään liittyminen ja kirjautuminen Facebookin kautta (enable_facebook_logins), mutta app id- ja app secret -arvoja ei ole asetettu. Aseta arvot <a href="%{base_path}/admin/site_settings">sivuston asetuksissa</a>. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Lue lisää tästä oppaasta</a>.'
+    twitter_config_warning: 'Palvelin on konfiguroitu hyväksymään liittyminen ja kirjautuminen Twitterin kautta (enable_twitter_logins), mutta key- ja secret-arvoja ei ole asetettu. Aseta arvot <a href="%{base_path}/admin/site_settings">sivuston asetuksissa</a>. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Lue lisää tästä oppaasta</a>.'
+    github_config_warning: 'Palvelin on konfiguroitu hyväksymään liittyminen ja kirjautuminen GitHubin kautta (enable_github_logins), mutta client id- ja app secret -arvoja ei ole asetettu. Aseta arvot <a href="%{base_path}/admin/site_settings">sivuston asetuksissa</a>. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Lue lisää tästä oppaasta</a>.'
     s3_config_warning: 'Palvelin on konfiguroitu tallentamaan sivustolle ladatut tiedostot S3:een, mutta vähintään yksi tiedoista on asettamatta: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile tai s3_upload_bucket. Päivitä ne <a href="/admin/site_settings">sivuston asetuksissa</a>. Lisätietoa englanninkielisestä ketjusta <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">"How to set up image uploads to S3?"</a>.'
     s3_backup_config_warning: 'Palvelin on konfiguroitu tallentamaan varmuuskopiot S3:een, mutta vähintään yksi tiedoista on asettamatta: s3_access_key_id, s3_secret_access_key tai s3_upload_bucket . Päivitä ne <a href="/admin/site_settings">sivuston asetuksissa</a>. Lisätietoa englanninkielisestä ketjusta <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">"How to set up image uploads to S3?"</a>.'
+    s3_cdn_warning: 'Palvelin on määritetty käyttämään S3-latausta, mutta S3 CDN-asetuksia ei ole määritelty. Tämä voi johtaa kalliisiin S3-kustannuksiin ja hitaampaan sivuston suorituskykyyn. <a href="https://meta.discourse.org/t/-/148916" target="_blank"> Lue lisää aiheesta täältä</a>.'
     image_magick_warning: 'Palvelin on konfiguroitu luomaan esikatselukuvia suurista kuvista, mutta ImageMagickia ei ole asennettu. Asenna ImageMagick paketinhallinnasta tai <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">lataa uusin versio</a>.'
     failing_emails_warning: '%{num_failed_jobs} sähköpostitehtävää on epäonnistunut. Tarkista app.yml ja varmista, että sähköpostipalvelimen asetukset ovat kunnossa. <a href="/sidekiq/retries" target="_blank">Katsele epäonnistuneita tehtäviä Sidekiqissa</a>.'
     subfolder_ends_in_slash: "Alihakemiston asetuksesi ei kelpaa; DISCOURSE_RELATIVE_URL_ROOT päättyy vinoviivaan."
@@ -1261,14 +1361,11 @@ fi:
       other: "Sähköpostin pollaus aiheutti %{count} virhettä edellisen 24 tunnin aikana. Tarkastele <a href='%{base_path}/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja."
     missing_mailgun_api_key: "Palvelin on määritelty lähettämään sähköpostit Mailgunin avulla, muttet ole määritellyt rajapinta-avainta, jolla varmistetaan webhook-viestien aitous."
     bad_favicon_url: "Favicon ei lataudu. Tarkista favicon-asetus <a href='%{base_path}/admin/site_settings'>sivuston asetuksissa</a>."
-    deprecated_api_usage: "Havaitsimme rajapintapyynnön, joka käytti vanhentunutta todennusmenetelmää. Päivitä se käyttämään  <a href='https://meta.discourse.org/t/-/22706'>headeriin perustuvaa todennusta</a>.  Kun olet päivittänyt, voi mennä 24 tuntia ennen kuin tämä viesti katoaa."
-    update_mail_receiver: "Huomasimme, että sähköpostipalvelin (mail-receiver) on vanhentunut. Klikkaa <a href='https://meta.discourse.org/t/-/133491'>tästä</a> päivitysohjeet. Kun olet päivittänyt, voi mennä 24 tuntia ennen kuin tämä viesti katoaa."
     poll_pop3_timeout: "Yhteyttä POP3-palvelimelle aikakatkaistaan ja saapuvaa sähköpostia ei voitu hakea. Tarkista <a href='%{base_path}/admin/site_settings/category/email'>POP3-asetukset</a> ja palveluntarjoaja."
     poll_pop3_auth_error: "Yhteys POP3-palvelimelle epäonnistuu autentikaatiovirheen vuoksi. Tarkista <a href='%{base_path}/admin/site_settings/category/email'>POP3-asetukset</a>."
     force_https_warning: "Sivusto käyttää SSL-salausta, mutta `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` ei ole valittuna asetuksissa."
     out_of_date_themes: "Päivityksiä on saatavilla näihin teemoihin:"
     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;"
@@ -1282,6 +1379,7 @@ fi:
     max_post_length: "Viestin merkkien minimimäärä"
     topic_featured_link_enabled: "Ota käyttöön ketjulinkit."
     show_topic_featured_link_in_digest: "Näytä ketjulinkki tiivistelmäsähköpostissa."
+    min_topic_views_for_delete_confirm: "Vähimmäismäärä katselukertoja, joita ketjussa on oltava jotta vahvistusikkuna näytetään poiston yhteydessä"
     min_topic_title_length: "Viestin otsikon merkkien minimimäärä"
     max_topic_title_length: "Viestin otsikon merkkien maksimimäärä"
     min_personal_message_title_length: "Yksityisviestin otsikon vähimmäismerkkimäärä"
@@ -1294,19 +1392,18 @@ fi:
     search_query_log_max_size: "Kuinka monta hakukyselyä säilötään enintään"
     search_query_log_max_retention_days: "Kuinka pitkään hakukyselyä enintään säilötään päivissä."
     search_ignore_accents: "Älä välitä aksenteista, kun haetaan tekstiä"
-    category_search_priority_very_low_weight: "Erittäin matalan hakuprioriteetin painoarvo."
     category_search_priority_low_weight: "Matalan hakuprioriteetin painoarvo."
     category_search_priority_high_weight: "Korkean hakuprioriteetin painoarvo."
-    category_search_priority_very_high_weight: "Erittäin korkean hakuprioriteetin painoarvo."
     allow_uncategorized_topics: "Salli ketjujen aloittaminen valitsematta aluetta. VAROITUS: Alueettomat ketjut täytyy siirtää jollekin alueelle ennen kuin poistat asetuksen käytöstä."
     allow_duplicate_topic_titles: "Salli ketjun aloittaminen identtisellä otsikolla."
+    allow_duplicate_topic_titles_category: "Salli ketjut joilla on identtiset otsikot, jos ketjut on eri alueella. allow_duplicate_topic_titles on oltava pois päältä."
     unique_posts_mins: "Kuinka monen minuutin kuluttua käyttäjä voi lähettää uudestaan samansisältöisen viestin"
     educate_until_posts: "Näytä uuden käyttäjän ohje, kun käyttäjä alkaa kirjoittamaan ensimmäistä (n) viestiään viestikenttään."
     title: "Palstan nimi, käytetään title tagissa."
     site_description: "Kuvaile sivustoa yhdellä lauseella, jota käytetään meta description tagissa."
     short_site_description: "Lyhyt kuvaus, jota käytetään etusivulla otsikkotagissa (title tag)."
     contact_email: "Sivustosta vastaavan henkilön sähköpostiosoite. Siihen lähetetään kriittiset ilmoitukset ja se näkyy <a href='%{base_path}/about' target='_blank'>/about</a>-sivulla kiireellisiä yhteydenottoja varten."
-    contact_url: "Verkko-osoite, jonka kautta voi ottaa yhteyttä sivustoon. Näkyy <a href='%{base_path}/about' target='_blank'>/about</a>-sivulla kiireellisiä yhteydenottoja varten."
+    contact_url: "URL-osoite sivuston yhteydenottoja varten. Näytetään <a href='%{base_path}/about' target='_blank'>Tietoja</a> -sivulla kiireellisiä yhteydenottoja varten."
     crawl_images: "Lataa linkatut kuvat kuvan 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)"
@@ -1326,14 +1423,21 @@ fi:
     add_rel_nofollow_to_user_content: 'Lisää rel nofollow kaikkeen käyttäjien lähettämään sisältöön, paitsi sivuston sisäisiin linkkeihin (sisältäen ylemmät verkkotunnukset). Jos muutat asetusta, sinun täytyy rakentaa viestit uudelleen komennolla: "rake posts:rebake"'
     exclude_rel_nofollow_domains: "Lista verkkotunnuksista, joihin osoittaviin linkkeihin nofollow:ta ei lisätä. esimerkki.fi sallii automaattisesti myös sub.esimerkki.fin. Sinun tulisi vähintäänkin lisätä tämän sivuston verkkotunnus, jotta hakurobotit löytävät kaiken sisällön. Jos sivustosi muita osia on toisen verkkotunnuksen alaisuudessa, lisää nekin."
     post_excerpt_maxlength: "Viestin katkelman merkkien maksimimäärä."
+    topic_excerpt_maxlength: "Ketjun katkelman / tiivistelmän enimmäispituus, luodaan ketjun ensimmäisestä viestistä."
     show_pinned_excerpt_mobile: "Näytä katkelma kiinnitetyistä ketjuista mobiilinäkymässä."
     show_pinned_excerpt_desktop: "Näytä katkelma kiinnitetyistä ketjuista työpöytänäkymässä."
     post_onebox_maxlength: "Discourse-viestin Onebox-esikatselun merkkien maksimimäärä."
+    blocked_onebox_domains: "Verkko-osoitteet, joista ei luoda Onebox-esikatselua."
+    allowed_inline_onebox_domains: "Verkko-osoitteet, joista luodaan minimoitu Onebox-esikatselu, jos niihin linkitetään määrittämättä otsikkoa."
+    enable_inline_onebox_on_all_domains: "Ohita inline_onebox_domain_whitelist -asetus ja salli Onebox-esikatselut kaikista verkko-osoitteista."
     max_oneboxes_per_post: "Oneboxien enimmäismäärä yhdessä viestissä"
     logo: "Kuva, joka toimii sivuston logona sivuston vasemmassa yläkulmassa. Valitse suorakulmion muotoinen kuva, jolla on korkeutta vähintään 120 ja jonka kuvasuhde on vähintään 3:1. Jos jätetty tyhjäksi, tilalla näytetään sivuston nimi."
     logo_small: "Kuva, joka toimii sivuston pienenä logona sivuston yläkulmassa, kun vieritetään alaspäin. Valitse neliönmuotoinen kuva. Valitse neliönmallinen, 120×120-kokoinen kuva. Jos jätetty tyhjäksi, tilalla näytetään koti-merkki."
     digest_logo: "Vaihtoehtoinen logo, jota käytetään sivustosi sähköpostitiivistelmien yläosassa. Valitse leveä suorakulmainen kuva. Älä käytä SVG-kuvaa. Jos jätetty tyhjäksi, `logo`-kuvaketta käytetään."
     mobile_logo: "Logo, jota sivuston mobiiliversio käyttää. Valitse suorakulmion muotoinen kuva, jolla on korkeutta vähintään 120 ja jonka kuvasuhde on vähintään 3:1. Jos jätetty tyhjäksi, `logo`-kuvaketta käytetään."
+    logo_dark: "Vaihtoehtoinen 'logo' -asetus sivuston tummaa värimallia varten."
+    logo_small_dark: "Vaihtoehtoinen 'logo small' -asetus sivuston tummaa värimallia varten."
+    mobile_logo_dark: "Vaihtoehtoinen 'mobile logo' -asetus sivuston tummaa värimallia varten."
     large_icon: "Kuva, josta rakennetaan muut metadata-ikonit. Tulisi ideaalitapauksessa olla suurempi kuin 512×512. Jos jätetty tyhjäksi, logo_small -kuvaketta käytetään."
     manifest_icon: "Kuva, jota käytetään logo/splash -kuvana Androidissa. Skaalataan automaattisesti kokoon 512×512. Jos jätetty tyhjäksi, large_icon -kuvaketta käytetään."
     favicon: "Palstan favicon, ks. <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Täytyy olla pgn, jotta toimii CDN:n kanssa. Skaalataan kokoon 32x32. Jos jätetty tyhjäksi, large_icon -kuvaketta käytetään."
@@ -1377,16 +1481,32 @@ fi:
     markdown_typographer_quotation_marks: "Luettelo (puoli)lainausmerkkipareista, joilla korvataan"
     post_undo_action_window_mins: "Kuinka monta minuuttia käyttäjällä on aikaa perua viestiin kohdistuva toimi (tykkäys, liputus, etc)."
     must_approve_users: "Henkilökunnan täytyy hyväksyä kaikki tilit, ennen uusien käyttäjien päästämistä sivustolle."
+    invite_code: "Käyttäjän on kirjoitettava tämä koodi, jotta tilin rekisteröinti sallitaan. Ohitetaan, kun se on tyhjä (kirjainkoko ei eroa)"
+    approve_suspect_users: "Lisää epäilyttävät käyttäjät tarkastusjonoon. Epäilyttävät käyttäjät ovat täydentäneet kuvauksen tai sivuston käyttäjäprofiiliin, mutta heillä ei ole lukuaktiivisuutta."
+    review_every_post: "Kaikki viestit on tarkastettava. VAROITUS! EI SUOSITELLA RUUHKAISILLE SIVUSTOILLE."
     pending_users_reminder_delay: "Ilmoita valvojille, jos uusi käyttäjä on odottanut hyväksyntää kauemmin kuin näin monta tuntia. Aseta -1, jos haluat kytkeä ilmoitukset pois päältä."
+    persistent_sessions: "Käyttäjät pysyvät sisäänkirjautuneena, vaikka selain on suljettuna"
     maximum_session_age: "Käyttäjä pysyy sisäänkirjautuneena n tuntia vierailunsa jälkeen"
+    ga_version: "Käytettävä Google Universal Analytics -versio: v3 (analytics.js), v4 (gtag)"
+    ga_universal_tracking_code: "Google Universal Analytics -seurantakoodin tunnus, esim .: UA-12345678-9; katso <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_domain_name: "Google Universal Analytics -verkkotunnus, esimerkiksi: mysite.com; katso <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "Ota käyttöön Google Universal Analytics -verkkotunnusten seuranta. Asiakastunniste liitetään näihin verkkotunnuksiin ulospäin suuntautuvissa linkeissä. Tutustu <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Googlen Verkkotunnusten välisen seurannan määrittäminen-ohjeeseen.</a>"
     enable_escaped_fragments: "Käytä Googlen Ajax-sivustoille tarkoitettua API:a, jos webcrawleria ei tunnisteta. Katso <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
+    moderators_manage_categories_and_groups: "Salli valvojien hallita alueita ja ryhmiä"
     cors_origins: "Salli lähteet CORS-pyynnöille (cross-origin request). Jokaisen lähteen pitää sisältää http:// tai https://. DISCOURSE_ENABLE_CORS asetus pitää olla valittuna ottaaksesi CORSin käyttöön."
+    use_admin_ip_allowlist: "Ylläpitäjät voivat kirjautua vain IP-osoitteista, jotka on määritetty Seulottavien IP:iden listassa (Ylläpito > Lokit > Seulottavat IP:t)"
+    blocked_ip_blocks: "Luettelo yksityisistä IP-lohkoista, joita Discourse ei tulisi koskaan indeksoida"
+    allowed_internal_hosts: "Luettelo sisäisistä isännistä joita Discourse voi turvallisesti indeksoida onebox-esikatselua ja muita tarkoituksia varten"
+    allowed_onebox_iframes: "Luettelo iframe src -verkkotunnuksista, jotka sallitaan Onebox-upotusten kautta. `*` sallii kaikki Onebox-oletusmoottorit."
     allowed_iframes: "Iframe src -verkkotunnukset, jotka Discourse voi turvallisesti sallia viesteissä"
+    allowed_crawler_user_agents: "Hakurobottien käyttäjäagentit, jotka saavat tulla sivustolle. VAROITUS! TÄMÄ ASETUS ESTÄÄ KAIKKI HAKUROBOTIT, JOITA EI LISTATA TÄSSÄ!"
+    blocked_crawler_user_agents: "Käyttäjäagentin nimessä oleva kirjainkoosta riippumaton yksilöllinen merkkijono, jolla tunnistetaan estettävät hakurobotit. Ei sovelleta, jos sallittujen hakurobottien lista on määriteltynä."
     slow_down_crawler_user_agents: "Hakurobottien käyttäjäagentit, joiden toiminnan nopeutta rajoitetaan hakuviivemääräyksen (Crawl-delay directive) mukaisesti"
     slow_down_crawler_rate: "Jos slow_down_crawler_user_agents on määritelty tämä nopeusrajoitus koskee kaikkia hakurobotteja (kuinka monta sekuntia pitää kulua pyyntöjen välillä)"
     content_security_policy: "Ota käyttöön epäilyttävän sisällön seulonta (Content-Security-Policy)"
     content_security_policy_report_only: "Ota käyttöön epäilyttävästä sisällöstä raportointi (Content-Security-Policy-Report-Only)"
     content_security_policy_collect_reports: "Ota käyttöön CSP-seulontojen kerääminen lokiin /csp_reports"
+    content_security_policy_frame_ancestors: "Rajoita kuka voi upottaa iframe-kehyksiin CSP:n kautta tällä sivustolla. Hallitse sallittuja isäntiä <a href='%{base_path}/admin/customize/embedding'>Upottaminen</a> -sivulla"
     invalidate_inactive_admin_email_after_days: "Ylläpitäjätunnukset jotka eivät ole vierailleet sivustolla näin moneen päivään joutuvat vahvistamaan sähköpostiosoitteensa uudelleen ennen sisäänkirjautumista. Aseta 0 poistaaksesi käytöstä."
     top_menu: "Mitkä painikkeet näytetään kotisivun navigointipalkissa, ja missä järjestyksessä. Esimerkiksi latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Mitkä painikkeet näytetään viestin valikossa, ja missä järjestyksessä. Esimerkiksi like|edit|flag|delete|share|bookmark|reply"
@@ -1396,22 +1516,26 @@ fi:
     site_contact_group_name: "Käypä ryhmän nimi, joka kutsutaan kaikkiin automaattisesti luotuihin yksityiskeskusteluihin."
     send_welcome_message: "Lähetä kaikille uusille käyttäjille tervetuliaisviesti, jossa on pikakäyttöopas"
     send_tl1_welcome_message: "Lähetä luottamustason 1 saavuttaville käyttäjille yksityinen tervetuloviesti."
+    send_tl2_promotion_message: "Lähetä uusille luottamustason 2 käyttäjille viesti ylennyksestä."
     suppress_reply_directly_below: "Älä näytä vastausten lukumäärää viestissä, jos ainoa vastaus on seuraavassa viestissä."
     suppress_reply_directly_above: "Älä näytä vastauksena-painiketta viestin yläreunassa, jos viestissä on vastattu vain edelliseen viestiin."
     remove_full_quote: "Poista koko viestin lainaukset suorista vastauksista automaattisesti."
     suppress_reply_when_quoting: "Älä näytä vastauksena-painiketta viestin yläreunassa, kun viestissä on lainaus."
     max_reply_history: "Maksimimäärä vastauksia, jotka avataan klikattaessa 'vastauksena' painiketta"
-    topics_per_period_in_top_summary: "Ketjujen lukumäärä, joka näytetään oletuksena Kuumat-listauksissa."
-    topics_per_period_in_top_page: "Ketjujen lukumäärä, joka näytetään laajennetussa Kuumat-listauksessa."
-    redirect_users_to_top_page: "Ohjaa uudet ja kauan poissa olleet käyttäjät automaattisesti kuumat-sivulle."
-    top_page_default_timeframe: "Kuumat-sivun oletusaikajakso."
+    topics_per_period_in_top_summary: "Ketjujen lukumäärä, joka näytetään oletuksena Suositut-listauksissa."
+    topics_per_period_in_top_page: "Ketjujen lukumäärä, joka näytetään laajennetussa Suositut-listauksessa."
+    redirect_users_to_top_page: "Ohjaa uudet ja kauan poissa olleet käyttäjät automaattisesti suositut-sivulle."
+    top_page_default_timeframe: "Suositut-sivun oletusaikajakso."
     moderators_view_emails: "Salli valvojien tarkastella käyttäjien sähköpostiosoitteita"
     prioritize_username_in_ux: "Näytä käyttäjänimi ensimmäisenä käyttäjäsivulla, -kortissa ja viesteissä (jos poistetaan käytöstä, nimi näytetään ensin)"
     enable_rich_text_paste: "Ota käyttöön automaattinen muunnos HTML:stä Markdowniin, kun tekstiä liitetään kirjoitusalueelle (kokeellinen)"
+    send_old_credential_reminder_days: "Muistuta vanhoista tunnistetiedoista"
     email_token_valid_hours: "Unohtuneen salasanan / tilin vahvistamisen tokenit ovat voimassa (n) tuntia."
     enable_badges: "Ota käyttöön ansiomerkkijärjestelmä"
     enable_whispers: "Salli henkilökunnan yksityiskeskustelu ketjujen sisällä."
     allow_index_in_robots_txt: "Määritä robots.txt -tiedostossa, että hakurobotit saavat indeksoida tätä sivustoa. Poikkeuksellisissa tapauksissa voit kokonaan <a href='%{base_path}/admin/customize/robots'>kustomoida robots.txt:n</a>."
+    blocked_email_domains: "Pystyviivalla eroteltu lista sähköposti-verkkotunnuksista, joista käyttäjät eivät voi luoda tiliä. Esimerkiksi mailinator.com|trashmail.net"
+    allowed_email_domains: "Pystyviivalla eroteltu lista sähköposti-verkkotunnuksista, joista käyttäjien pitää luoda tilinsä. VAROITUS: Käyttäjiä, joiden sähköpostiosoite on muusta verkkotunnuksesta ei sallita!"
     hide_email_address_taken: "Älä kerro käyttäjälle, että käyttäjätili annetulla sähköpostiosoitteella on jo olemassa, kun hän liittyy palstalle tai kun hän pyytää salasanan palauttamista."
     log_out_strict: "Kun kirjaudutaan ulos, kirjaa käyttäjä ulos kaikilta laitteilta"
     version_checks: "Pingaa Discourse Hubia päivityksistä ja näytä ilmoitus <a href='%{base_path}/admin' target='_blank'>/admin</a>-hallintapaneelissa, kun uusi versio on saatavilla"
@@ -1427,18 +1551,7 @@ fi:
     min_admin_password_length: "Ylläpitäjän salasanan vähimmäispituus."
     password_unique_characters: "Vähimmäismäärä eri merkkejä salasanassa."
     block_common_passwords: "Älä salli salasanoja, jotka ovat 10 000 yleisimmän salasanan joukossa."
-    enable_sso: "Ota käyttöön single sign on ulkopuolisen sivuston kautta (VAROITUS: ULKOPUOLISEN SIVUSTON TÄYTYY VALIDOIDA SÄHKÖPOSTIOSOITTEET!)"
-    verbose_sso_logging: "Kirjaa runsaat SSO-diagnostiikat lokiin <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    sso_url: "Kertakirjautumisen päätepisteen URL (täytyy sisältää http:// tai https://)"
-    sso_secret: "Salausavain, jolla todennetaan SSO tiedot, varmista että se on vähintään 10 merkkiä pitkä"
-    sso_provider_secrets: "Luettelo verkkotunnus-salausavain-pareista, jotka käyttävät Discoursea kertakirjautumistarjoajana. Varmistu, että kertakirjautumissalausavain on vähintään 10 merkin pituinen. Jokerimerkkiä * voi käyttää kelpuuttamaan mikä tahansa verkkotunnus tai sitä voi käyttää verkkotunnuksen osan vapauttamiseen (esim. *.esimerkki.fi)."
-    sso_overrides_bio: "Syrjäyttää käyttäjän kuvauksen itsestään käyttäjäprofiilissa ja estää sen muokkaamisen"
-    sso_overrides_avatar: "Syrjäyttää käyttäjän avatarin ulkoisella kertakirjautumisen kautta haetulla avatarilla. Jos tämä on käytössä, käyttäjä ei voi ladata avataria Discourseen."
-    sso_overrides_profile_background: "Syrjäyttää käyttäjän profiilin taustakuvan ulkoisella kertakirjautumisen kautta haetulla avatarilla."
-    sso_overrides_card_background: "Syrjäyttää käyttäjän käyttäjäkortin taustakuvan ulkopuolisella kertakirjautumisen kautta haetulla avatarilla."
-    sso_not_approved_url: "Uudelleenohjaa hyväksymättömät SSO-tilit tähän osoitteeseen"
-    sso_allows_all_return_paths: "Älä rajoita SSO:n antamien palautuspolkujen verkkotunnusta (oletuksena palautuspolun on oltava nykyisellä sivustolla)"
-    enable_local_logins: "Salli kirjautuminen paikallisesti käyttäjänimen ja salasanan avulla. Tämä tulee olla päällä, jotta kutsuminen voi toimia. VAROITUS: jos ei ole käytössä, voi sinun olla mahdotonta kirjautua sisään, jollet ole aiemmin määritellyt ainakin yhtä muuta kirjautumistapaa."
+    discourse_connect_overrides_bio: "Syrjäyttää käyttäjän kuvauksen itsestään käyttäjäprofiilissa ja estää sen muokkaamisen"
     enable_local_logins_via_email: "Salli käyttäjän pyytää klikattava kirjautumislinkki, joka lähetetään hänen sähköpostiinsa."
     allow_new_registrations: "Salli uusien käyttäjien rekisteröityminen. Ota tämä asetus pois käytöstä estääksesi uusien käyttäjätilien luomisen."
     enable_signup_cta: "Näytä palaaville kirjautumattomille käyttäjille ilmoitus, jossa kehotetaan heitä luomaan tili."
@@ -1470,10 +1583,9 @@ fi:
     active_user_rate_limit_secs: "Kuinka usein 'last_seen_at' kenttä päivitetään, sekunneissa"
     verbose_localization: "Näytä laajennetut lokalisointitiedot käyttöliittymässä"
     previous_visit_timeout_hours: "Kuinka kauan vierailun on täytynyt kestää, jotta se lasketaan 'edelliseksi' vierailuksi, tunneissa"
-    top_topics_formula_log_views_multiplier: "katselukertojen logaritmin kerroin (n) Kuumat-listauksen kaavassa: `log(katselut) * (n) + avausviestin tykkäykset * 0.5 + PIENEMPI(tykkäysten määrä / viestien määrä, 3) + 10 + log(viestien määrä)`"
-    top_topics_formula_first_post_likes_multiplier: "avausviestin tykkäysmäärän kerroin (n) Kuumat-listauksen kaavassa: `log(katselut) * 2 + avausviestin tykkäykset * (n) + PIENEMPI(tykkäysten määrä / viestien määrä, 3) + 10 + log(viestien määrä)`"
-    top_topics_formula_least_likes_per_post_multiplier: "tykkäykset/viestit -suhteen enimmäisarvo (n) Kuumat-listauksen kaavassa: `log(katselut) * 2 + avausviestin tykkäykset * 0.5 + PIENEMPI(tykkäysten määrä / viestien määrä, (n)) + 10 + log(viestien määrä)`"
-    rebake_old_posts_count: "Kuinka monta vanhaa viestiä rakennetaan uudelleen 15 minuutissa."
+    top_topics_formula_log_views_multiplier: "katselukertojen logaritmin kerroin (n) Suositut-listauksen kaavassa: `log(katselut) * (n) + avausviestin tykkäykset * 0.5 + PIENEMPI(tykkäysten määrä / viestien määrä, 3) + 10 + log(viestien määrä)`"
+    top_topics_formula_first_post_likes_multiplier: "avausviestin tykkäysmäärän kerroin (n) Suositut-listauksen kaavassa: `log(katselut) * 2 + avausviestin tykkäykset * (n) + PIENEMPI(tykkäysten määrä / viestien määrä, 3) + 10 + log(viestien määrä)`"
+    top_topics_formula_least_likes_per_post_multiplier: "tykkäykset/viestit -suhteen enimmäisarvo (n) Suositut-listauksen kaavassa: `log(katselut) * 2 + avausviestin tykkäykset * 0.5 + PIENEMPI(tykkäysten määrä / viestien määrä, (n)) + 10 + log(viestien määrä)`"
     enable_safe_mode: "Salli käyttäjän mennä vikasietotilaan, jotta hän voi rajata pois ongelmanaiheuttajista lisäosat."
     rate_limit_create_topic: "Ketjun aloittamisen jälkeen käyttäjän täytyy odottaa (n) sekuntia voidakseen aloittaa toisen ketjun."
     rate_limit_create_post: "Viestin luomisen jälkeen käyttäjän täytyy odottaa (n) sekuntia voidakseen luoda uuden viestin."
@@ -1488,8 +1600,6 @@ fi:
     max_topic_invitations_per_day: "Maksimimäärä ketjukutsuja, jonka yksittäinen käyttäjä voi lähettää päivässä"
     max_logins_per_ip_per_hour: "Enimmäismäärä kirjautumisia IP-osoitetta kohden tunnissa"
     max_logins_per_ip_per_minute: "Enimmäismäärä kirjautumisia IP-osoitetta kohden minuutissa"
-    max_post_deletions_per_minute: "Kuinka monta viestiä käyttäjä voi poistaa minuutissa."
-    max_post_deletions_per_day: "Kuinka monta viestiä käyttäjä voi poistaa päivässä."
     alert_admins_if_errors_per_minute: "Virheiden määrä minuutissa, jonka seurauksena hälytetään ylläpitäjä. 0 ottaa toiminnon pois käytöstä. HUOM: vaatii uudelleenkäynnistyksen."
     alert_admins_if_errors_per_hour: "Virheiden määrä tunnissa, jonka seurauksena hälytetään ylläpitäjä. 0 ottaa toiminnon pois käytöstä. HUOM: vaatii uudelleenkäynnistyksen."
     categories_topics: "Kuinka monta ketjua näytetään Alueet-sivulla (/categories). Jos 0, etsitään automaattisesti arvoa, jolla kaksi saraketta pysyvät symmetrisinä (alueet ja ketjut)."
@@ -1519,7 +1629,6 @@ fi:
     strip_image_metadata: "Poista metadata kuvista."
     min_ratio_to_crop: "Suhde, jolla korkeat kuvat cropataan. Syötä tulos suhteena leveys / korkeus."
     simultaneous_uploads: "Kuinka monta tiedostoa voi enintään raahata viestieditoriin"
-    enable_flash_video_onebox: "Ota käyttöön swf- ja flv-linkkien (Adobe Flash) onebox-tuki. VAROITUS: saattaa lisätä tietoturvariskejä."
     default_invitee_trust_level: "Oletus luottamustaso (0-4) kutsutuille käyttäjille."
     default_trust_level: "Uusien käyttäjien oletusarvoinen luottamustaso (0-4). VAROITUS! Tämän muuttaminen altistaa roskapostille."
     tl1_requires_topics_entered: "Kuinka monessa ketjussa uuden käyttäjän täytyy käydä ennen ylentämistä luottamustasolle 1."
@@ -1555,6 +1664,7 @@ fi:
     min_trust_to_send_messages: "Vähimmäisluottamustaso, jolla voi aloittaa yksityisviestiketjuja."
     min_trust_to_flag_posts: "Vähimmäisluottamustaso, jolla voi liputtaa viestejä"
     min_trust_to_post_links: "Vähimmäisluottamustaso, jolla voi lisätä linkkejä viesteihin"
+    allowed_link_domains: "Verkkotunnukset, joihin voi linkittää vaikkei olisikaan riittävällä luottamustasolla, jotta muuten voisi lisätä linkkejä viesteihin"
     newuser_max_links: "Kuinka monta linkkiä uusi käyttäjä voi lisätä viestiin."
     newuser_max_attachments: "Kuinka monta liitettä uusi käyttäjä voi lisätä viestiin."
     newuser_max_mentions_per_post: "Kuinka monta @nimi mainintaa uusi käyttäjä voi lisätä viestiin."
@@ -1577,6 +1687,8 @@ fi:
     desktop_category_page_style: "/Keskustelualueet-sivun visuaalinen tyyli."
     category_colors: "Lista alueiden sallituista väriarvoista, heksadesimaaleina."
     category_style: "Aluemerkin tyyli."
+    default_dark_mode_color_scheme_id: "Värimalli, jota käytetään tummassa tilassa."
+    dark_mode_none: "Ei valittu"
     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)"
@@ -1602,6 +1714,7 @@ fi:
     privacy_policy_url: "Jos haluat ylläpitää tietosuojaselostetta sivuston ulkopuolella, syötä URL tähän."
     log_anonymizer_details: "Pidetäänkö käyttäjästä tietoa lokeissa anonymisoinnin jälkeen. Jos noudatat GDPR:ää sinun on kytkettävä tämä pois käytöstä."
     newuser_spam_host_threshold: "Kuinka monta kertaa uusi käyttäjä voi linkittää samalle sivustolle `newuser_spam_host_posts` viesteissään, ennen kuin se tulkitaan roskapostin lähettämiseksi."
+    allowed_spam_host_domains: "Lista verkkotunnuksista, joita ei oteta huomioon roskapostin tunnistamisessa. Uusilla käyttäjillä ei ole rajoituksia linkkaamisessa näihin tunnuksiin."
     topic_view_duration_hours: "Laske uusi ketjun katselu kerran per IP/käyttäjä joka N:s tunti"
     user_profile_view_duration_hours: "Laske uusi profiilin katselu kerran per IP/käyttäjä joka N:s tunti"
     levenshtein_distance_spammer_emails: "Verrattaessa sähköpostiosoitteita tunnettuihin roskapostittajiin, näin monen merkin ero saa vielä aikaan löydöksen."
@@ -1635,6 +1748,7 @@ fi:
     max_emails_per_day_per_user: "Käyttäjälle päivässä lähetettävien sähköpostien enimmäismäärä. Aseta 0, jos et halua rajoittaa."
     enable_staged_users: "Luo automaattisesti esikäyttäjiä, kun saapuvia sähköposteja käsitellään."
     maximum_staged_users_per_email: "Enimmäismäärä automaattisesti luotuja esikäyttäjiä, kun käsitellään saapuvaa sähköpostia."
+    auto_generated_allowlist: "Lista sähköpostiosoitteista, joiden viestejä ei tarkasteta automaattisesti luodun sisällön osalta. Esimerkki: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Estä saapuvat sähköpostit, jotka tunnistetaan automaattisesti luoduiksi."
     ignore_by_title: "Jätä sähköpostit huomiotta niiden otsikon perusteella."
     mailgun_api_key: "Mailgunin Secret API key, jolla verifioidaan webhook-viestit."
@@ -1645,7 +1759,6 @@ fi:
     forwarded_emails_behaviour: "Kuinka Discourseen välitettyjä sähköposteja käsitellään"
     always_show_trimmed_content: "Näytä kaikkialla saapuvien sähköpostien karsitut osat. VAROITUS: voi paljastaa sähköpostiosoitteita."
     private_email: "Älä sisällytä sähköpostien otsikoihin äläkä leipäteksteihin viestien tai ketjujen sisältöä. HUOM: tämä ottaa käytöstä myös tiivistelmäsähköpostit."
-    email_total_attachment_size_limit_kb: "Lähetettäviin sähköposteihin liitettyjen tiedostojen enimmäiskoko. Arvo 0 poistaa liittämisen käytöstä."
     post_excerpts_in_emails: "Sähköposti-ilmoituksiin laita aina katkelmia kokonaisten viestien sijaan."
     raw_email_max_length: "Enintään kuinka monta merkkiä säilytetään saapuvasta sähköpostista."
     raw_rejected_email_max_length: "Enintään kuinka monta merkkiä säilytetään hylätystä saapuvasta sähköpostista."
@@ -1704,12 +1817,13 @@ fi:
     ignored_users_message_gap_days: "Millaisin väliajoin henkilökuntaa huomautetaan käyttäjästä, jonka monet muut ovat estäneet."
     clean_up_inactive_users_after_days: "Kuinka monen päivän kuluttua epäaktiivinen käyttäjä (luottamustaso 0 eikä yhtään viestiä) poistetaan. Arvo 0 poistaa siivouksen käytöstä."
     user_selected_primary_groups: "Salli käyttäjän asettaa ensisijainen ryhmänsä itse"
+    allowed_user_website_domains: "Käyttäjän kotisivu voi olla näiden verkkotunnusten alainen. Pystyviivoin erotettu lista."
     allow_profile_backgrounds: "Salli käyttäjien ladata profiilin taustakuva."
     sequential_replies_threshold: "Kuinka monen peräkkäisen viestin jälkeen yhdessä ketjussa käyttäjää muistutetaan peräkkäisistä vastauksista."
     get_a_room_threshold: "Kuinka monta viestiä tulee kohdistaa samalle käyttäjälle samassa ketjussa, jotta näytetään varoitus."
     enable_mobile_theme: "Mobiililaitteet käyttävät erillistä teemaa ja kahden välillä on mahdollista vaihtaa. Poista asetus käytöstä, jos haluat käyttää omaa tyylitiedostoa, joka on mukautuva eri laitteille."
     dominating_topic_minimum_percent: "Kuinka monta prosenttia ketjun viesteistä käyttäjän täytyy kirjoittaa, ennen kuin tulee muistutetuksi ketjun dominoinnista."
-    disable_avatar_education_message: "Piilota opastusviesti, joka näytetään kun profiilikuvaa vaihdetaan."
+    disable_avatar_education_message: "Poista opastusviesti käytöstä, joka näytetään kun profiilikuvaa vaihdetaan."
     suppress_uncategorized_badge: "Älä näytä alueettomille ketjuille tunnusta ketjujen listauksissa."
     header_dropdown_category_count: "Kuinka monta aluetta näytetään yläpalkin pudotusvalikossa."
     permalink_normalizations: "Sovella tätä säännöllistä lauseketta ennen ikilinkkien sovittamista, esim. /(topic.*)\\?.*/\\1 riisuu hakulausekkeet ketjujen reiteistä. Muoto on regex+string, \\1 jne. avulla pääset käsiksi captureihin."
@@ -1737,6 +1851,7 @@ fi:
     embed_topics_list: "Tue ketjulistausten HTML-upottamista"
     embed_truncate: "Typistä upotetut viestit."
     embed_support_markdown: "Tue Markdown-muotoilua upotetuissa viesteissä."
+    allowed_embed_selectors: "Pilkuin eroteltu luettelo CSS-elementeistä, jotka on sallittu upotuksissa."
     allowed_href_schemes: "Linkeissä sallitut skeemat http:n ja https:n lisäksi."
     embed_post_limit: "Upotettavien viestien maksimimäärä."
     embed_username_required: "Käyttäjänimi vaaditaan ketjun luomiseksi."
@@ -1744,7 +1859,6 @@ fi:
     show_create_topics_notice: "Jos palstalla on vähemmän kuin 5 julkista ketjua, kehota ylläpitäjiä aloittamaan ketjuja."
     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."
     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"
@@ -1771,7 +1885,6 @@ fi:
     default_email_messages_level: "Aseta oletusarvo sähköposti-ilmoitustasolle, kun joku lähettää käyttäjälle yksityisviestin."
     default_email_mailing_list_mode: "Lähetä oletuksena sähköposti jokaisesta uudesta viestistä."
     default_email_mailing_list_mode_frequency: "Postituslistatilassa käyttäjä saa sähköpostia oletuksena näin usein."
-    disable_mailing_list_mode: "Älä salli käyttäjien valita sähköpostilista-moodia."
     default_email_previous_replies: "Sisällytä aiemmat vastaukset sähköposteihin oletuksena."
     default_email_in_reply_to: "Sisällytä lyhennelmä vastattavasta viestistä sähköpostiin oletuksena."
     default_other_new_topic_duration_minutes: "Yleinen oletusarvo sille, koska ketju tulkitaan uudeksi."
@@ -1781,6 +1894,7 @@ fi:
     default_other_enable_quoting: "Ota oletuksena käyttöön lainaaminen valitsemalla tekstiä."
     default_other_enable_defer: "Ota ketjun lykkäystoiminto käyttöön oletuksena."
     default_other_dynamic_favicon: "Näytä oletuksena uusien/päivittyneiden ketjujen määrä selaimen ikonissa."
+    default_other_skip_new_user_tips: "Ohita uuden käyttäjän aloittamisvinkit ja -ansiomerkit."
     default_other_like_notification_frequency: "Ilmoita käyttäjiä tykkäyksistä oletuksena"
     default_topics_automatic_unpin: "Aseta oletukseksi, että ketjun kiinnitys poistuu automaattisesti, jos käyttäjä selaa keskustelun loppuun"
     default_categories_watching: "Lista oletuksena tarkkailtavista alueista."
@@ -1799,7 +1913,6 @@ fi:
     revoke_api_keys_days: "Kuinka monen päivän kuluttua käyttämätön rajapinta-avain mitätöidään automaattisesti (0 niin ei koskaan)"
     allow_user_api_keys: "Salli rajapinnan käyttäjäavainten muodostaminen"
     allow_user_api_key_scopes: "Lista rajapinnan käyttäjäavaimiin liittyvistä oikeuksista"
-    max_api_keys_per_user: "Enimmäismäärä rajapinnan käyttäjäavaimia käyttäjää kohden"
     min_trust_level_for_user_api_key: "Vähimmäisluottamustaso, joka vaaditaan rajapinnan käyttäjäavainten muodostamiseen"
     allowed_user_api_push_urls: "Sallitut URL-osoitteet "
     expire_user_api_keys_days: "Kuinka monessa päivässä rajapinnan käyttäjäavain vanhenee automaattisesti (0 niin ei koskaan)"
@@ -1808,7 +1921,6 @@ fi:
     max_tags_per_topic: "Suurin tunnisteiden määrä, joka voi liittyä ketjuun."
     max_tag_length: "Enimmäismerkkimäärä tunnisteen nimelle."
     max_tag_search_results: "Kun haetaan tunnisteita, enintään näin monta hakutulosta näytetään."
-    show_filter_by_tag: "Näytä pudotusvalikko, jolla voi suodattaa ketjulistausta tunnisteen mukaan."
     max_tags_in_filter_list: "Enimmäismäärä tunnisteita, joka näytetään suodatuspudotusvalikossa. Käytetyimmät tunnisteet näytetään."
     tags_sort_alphabetically: "Näytä tunnisteet aakkosjärjestyksessä. Oletusasetus on näyttäminen suosion mukaan."
     tags_listed_by_group: "Ryhmittele tunnisteet tunnisteryhmittäin <a href='%{base_path}/tags' target='_blank'>Tunnisteet-sivulla</a>."
@@ -1852,25 +1964,20 @@ fi:
       email_editable_enabled: "Asetus 'email editable' on otettava pois käytöstä ennen tämän asetuksen käyttöönottoa."
       staged_users_disabled: "\"Esikäyttäjät\" on otettava käyttöön ennen tämän asetuksen käyttöönottoa."
       reply_by_email_disabled: "Asetus \"reply by email\" täytyy ottaa käyttöön ennen tämän asetuksen käyttöönottoa."
-      sso_url_is_empty: "\"Sso url\" täytyy määritellä ennen tämän asetuksen päällekytkemistä."
-      sso_invite_only: "SSO ja vain kutsulla -tila eivät voi olla käytössä samaan aikaan."
       enable_local_logins_disabled: "Asetus \"enable local logins\" täytyy kytkeä päälle ennen tämän asetuksen päällekytkemistä."
       min_username_length_exists: "Käyttäjänimen vähimmäispituus ei voi olla suurempi kuin lyhin käyttäjänimi (%{username})."
       min_username_length_range: "Vähimmäisarvo ei voi olla suurempi kuin enimmäisarvo."
       max_username_length_exists: "Käyttäjänimen enimmäispituus ei voi olla suurempi kuin pisin käyttäjänimi (%{username})."
       max_username_length_range: "Enimmäisarvo ei voi olla pienempi kuin vähimmäisarvo."
       invalid_hex_value: "Väriarvon täytyy olla kuusinumeroinen heksadesimaalikoodi."
-      category_search_priority:
-        very_low_weight_invalid: "Tämä painokerroin ei voi olla suurempi kuin 'category_search_priority_low_weight'."
-        low_weight_invalid: "Tämä painokerroin ei voi olla suurempi tai yhtä suuri kuin 1 eikä pienempi kuin 'category_search_priority_very_low_weight'."
-        high_weight_invalid: "Tämä painokerroin ei voi olla pienempi tai yhtä suuri kuin 1 eikä suurempi kuin 'category_search_priority_very_high_weight'."
-        very_high_weight_invalid: "Tämä painokerroin ei voi olla pienempi kuin 'category_search_priority_high_weight'. "
+      allowed_unicode_usernames:
+        regex_invalid: "Säännöllinen lauseke ei kelpaa: %{error}"
+        leading_trailing_slash: "Säännöllinen lauseke ei voi alkaa eikä loppua kauttaviivalla."
       unicode_usernames_avatars: "Sisäinen avatarjärjestelmä ei tue Unicode-käyttäjänimiä."
       list_value_count: "Luettelon täytyy sisältää täsmälleen %{count} arvoa."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "SSO-salausavain"
   search:
     extreme_load_error: "Sivusto on erittäin raskaan kuormituksen alla, yritä myöhemmin uudelleen"
     within_post: "#%{post_number} käyttäjältä %{username}"
@@ -1881,7 +1988,7 @@ fi:
     results_page: "Tulokset hakusanalle '%{term}'"
     audio: "[audio]"
     video: "[video]"
-  sso:
+  discourse_connect:
     login_error: "Virhe kirjauduttaessa"
     not_found: "Tiliäsi ei löydetty. Ota yhteyttä sivuston ylläpitäjään."
     account_not_approved: "Tilisi odottaa hyväksyntää. Saat sähköpostin, kun tunnuksesi on hyväksytty."
@@ -1890,11 +1997,11 @@ fi:
     no_email: "Sähköpostiosoitetta ei annettu. Ota yhteyttä sivuston ylläpitäjään."
     blank_id_error: " Vaaditaan `external_id` mutta se oli tyhjä"
     email_error: "Tunnusta ei voitu luoda osoitteelle <b>%{email}</b>. Ota yhteyttä sivuston ylläpitäjään."
-    missing_secret: "SSO-todentaminen epäonnistui puuttuvan salausavaimen (secret) vuoksi. Ota yhteyttä sivuston ylläpitoon ongelman korjaamiseksi."
   original_poster: "Alkuperäinen kirjoittaja"
   most_posts: "Eniten viestejä"
   most_recent_poster: "Uusin kirjoittaja"
   frequent_poster: "Usein kirjoittava"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "Tervetuloa yhteisöömme! Nämä ovat suosituimmat viimeaikaiset viestiketjut."
     not_seen_in_a_month: "Tervetuloa takaisin! Emme ole nähneet sinua vähään aikaan. Tässä ovat suosituimmat viestiketjut sitten viime näkemän."
@@ -2007,6 +2114,7 @@ fi:
     missing_user_field: "Et ole täyttänyt kaikkia kenttiä"
     auth_complete: "Todentaminen suoritettu."
     click_to_continue: "Jatka klikkaamalla tästä."
+    second_factor_title: "Kaksivaiheinen tunnistautuminen"
     second_factor_description: "Syötä vaadittava todennuskoodi sovelluksestasi:"
     second_factor_backup_description: "Syötä yksi varmuuskoodeistasi"
     invalid_second_factor_code: "Todennuskoodi ei kelpaa. Yhtä koodia voi käyttää vain kerran."
@@ -2248,6 +2356,8 @@ fi:
         Yhteisö liputti viestin ja se on nyt piilotettu. **Koska viestisi on piilotettu useammin kuin kerran, se pysyy piilotettuna kunnes henkilökunnan jäsen selvittää tilanteen.**
 
         Saat lisätietoa [yhteisön säännöistä](%{base_url}/guidelines).
+    queued_by_staff:
+      title: "Viesti odottaa hyväksyntää"
     flags_disagreed:
       title: "Henkilökunta palautti viestin"
       subject_template: "Henkilökunta palautti viestin"
@@ -2266,22 +2376,6 @@ fi:
     flags_agreed_and_post_deleted:
       title: "Henkilökunta poisti liputetun viestin"
       subject_template: "Henkilökunta poisti liputetun viestin"
-      text_body_template: |
-        Hei,
-
-        Tämä automaattinen viesti lähetettiin sivustolta %{site_name} kertoaksemme sinulle että [viestisi](%{base_url}%{url}) poistettiin.
-
-        %{flag_reason}
-
-        Yhteisö liputti viestin ja henkilökunnan jäsen päätti poistaa sen.
-
-        [details="Katsele poistettua viestiä klikkaamalla"]
-        ``` markdown
-        %{flagged_post_raw_content}
-        ```
-        [/details]
-
-        Kertaa [yhteisön säännöt](%{base_url}/guidelines) jos kaipaat lisätietoa.
     usage_tips:
       text_body_template: |
         [Tässä blogikirjoituksessa](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/) on joitakin käteviä vinkkejä uudelle käyttäjälle.
@@ -2331,6 +2425,8 @@ fi:
         Toivottavasti viihdyt!
 
         [prefs]: %{user_preferences_url}
+    tl2_promotion_message:
+      subject_template: "Onnittelut luottamustasonoususta!"
     backup_succeeded:
       title: "Varmuuskopiointi onnistui"
       subject_template: "Varmuuskopiointi suoritettu onnistuneesti"
@@ -2937,21 +3033,9 @@ fi:
     account_suspended:
       title: "Tili hyllytetty"
       subject_template: "[%{email_prefix}] Tilisi on hyllytetty"
-      text_body_template: |
-        Sinut hyllytettiin palstalta %{suspended_till} asti.
-
-        %{reason}
-
-        %{message}
     account_silenced:
       title: "Käyttäjätili hiljennetty"
       subject_template: "[%{email_prefix}] Tilisi on hiljennetty"
-      text_body_template: |
-        Sinut on hiljennetty palstalta %{silenced_till} asti.
-
-        %{reason}
-
-        %{message}
     account_exists:
       title: "Tili on jo olemassa"
       subject_template: "[%{email_prefix}] TIli on jo olemassa"
@@ -3025,6 +3109,9 @@ fi:
     confirm_new_email:
       title: "Vahvista uusi sähköpostiosoite"
       subject_template: "[%{email_prefix}] Vahvista uusi sähköpostiosoite"
+    confirm_new_email_via_admin:
+      title: "Vahvista uusi sähköpostiosoite"
+      subject_template: "[%{email_prefix}] Vahvista uusi sähköpostiosoite"
     confirm_old_email:
       title: "Vahvista vanha sähköpostiosoite"
       subject_template: "[%{email_prefix}] Vahvista nykyinen sähköpostiosoitteesi"
@@ -3063,6 +3150,13 @@ fi:
         Uskomme [sivistyneeseen yhteisökäyttäytymiseen](%{base_url}/guidelines) kaikissa tilanteissa.
 
         Nauti palstastamme!
+    signup_after_reject:
+      title: "Rekisteröidy hylkäyksen jälkeen"
+      subject_template: "Sinut on hylätty palveluta %{site_name}"
+      text_body_template: |
+        Palvelun %{site_name} ylläpitäjät ovat hylänneet tilisi.
+
+        %{reject_reason}
     signup:
       title: "Liity"
       subject_template: "[%{email_prefix}] Vahvista uusi käyttäjätilisi"
@@ -3100,6 +3194,11 @@ fi:
         Jos se olit sinä, hyvä! Sinun ei tarvitse reagoida mitenkään.
 
         Jollet se ollut sinä, [tarkastele käynnissä olevia istuntojasi](%{base_url}/my/preferences/account) ja harkitse salasanasi vaihtamista.
+    post_approved:
+      title: "Viestisi hyväksyttiin"
+  page_forbidden:
+    title: "Hups! Tämä sivu on yksityinen."
+  site_setting_missing: "\"%{name}\" -asetus on pakollinen."
   page_not_found:
     title: "Hups! Sivua ei ole tai se on yksityinen."
     popular_topics: "Suosittuja"
@@ -3127,6 +3226,7 @@ fi:
     file_missing: "Pahoittelut, sinun täytyy valita tiedosto joka ladataan."
     empty: "Pahoittelut, mutta tiedostosi on tyhjä."
     png_to_jpg_conversion_failure_message: "PNG:n muuttamisessa JPG:ksi tapahtui virhe."
+    optimize_failure_message: "Lähetetyn kuvan optimoinniss tapahtui virhe."
     attachments:
       too_large: "Pahoittelut, tiedosto jonka latausta yritit on liian suuri ( suurin tiedostokoko on %{max_size_kb}KB)."
     images:
@@ -3143,12 +3243,12 @@ fi:
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user ylitettiin"
     exceeded_bounces_limit: "bounce_score_threshold ylitettiin"
-    mailing_list_no_echo_mode: "Postitustilailmoituksia ei lähetetä käyttäjän omista viesteistä"
+    mailing_list_no_echo_mode: "Postituslistan ilmoitukset on poistettu käytöstä käyttäjän omilta viesteiltä"
     user_email_no_user: "Käyttäjää jonka id on %{user_id} ei löytynyt"
     user_email_post_not_found: "Viestiä jonka id on %{post_id} ei löytynyt"
     user_email_anonymous_user: "Käyttäjä on anonyymi"
     user_email_user_suspended_not_pm: "Käyttäjä on hyllytetty, ei yksityisviesti"
-    user_email_seen_recently: "Käyttäjä oli paikalla hiljattain"
+    user_email_seen_recently: "Käyttäjä nähtiin äskettäin"
     user_email_notification_already_read: "Ilmoitus luettiin jo ennen kuin tämä sähköposti lähetettiin"
     user_email_notification_topic_nil: "post.topic on nil"
     user_email_post_user_deleted: "Viestin lähettänyt käyttäjä on poistettu"
@@ -3156,12 +3256,14 @@ fi:
     user_email_user_suspended: "käyttäjä hyllytettiin"
     user_email_already_read: "käyttäjä luki jo viestin"
     user_email_access_denied: "käyttäjällä ei ole oikeutta nähdä tätä viestiä"
+    user_email_no_email: "Käyttäjätunnukseen %{user_id} ei ole liitetty sähköpostiosoitetta"
     sender_message_blank: "viesti on tyhjä"
     sender_message_to_blank: "message.to on tyhjä"
     sender_text_part_body_blank: "text_part.body on tyhj"
     sender_body_blank: "body on tyhjä"
     sender_post_deleted: "viesti on poistettu"
     sender_message_to_invalid: "vastaanottajan sähköpostiosoite ei kelpaa"
+    sender_topic_deleted: "ketju poistettiin"
   color_schemes:
     base_theme_name: "Perus"
     light: "Vaalea"
@@ -3172,6 +3274,9 @@ fi:
     latte: "Latte"
     summer: "Kesäinen"
     dark_rose: "Tumma ruusu"
+    wcag_dark: "WCAG Tumma"
+    wcag_dark_theme_name: "WCAG Tumma"
+    default_theme_name: "Oletus"
     light_theme_name: "Vaalea"
     dark_theme_name: "Tumma"
     neutral_theme_name: "Neutraali"
@@ -3643,9 +3748,6 @@ fi:
         other: 'Tunnistetta "%{tag_name}" voi käyttää ainoastaan alueilla: %{category_names}'
       synonym: 'Synonyymit kielletty. Käytä sijasta tunnistetta "%{tag_name}".'
       has_synonyms: 'Tunnistetta "%{tag_name}" ei voi käyttää koska sillä on synonyymejä.'
-    required_tags_from_group:
-      one: "Täytyy valita ainakin %{count} tunnisteryhmän %{tag_group_name} tunniste."
-      other: "Täytyy valita ainakin %{count} tunnisteryhmän %{tag_group_name} tunnistetta."
     invalid_target_tag: "ei voi olla synonyymin synonyymi"
     synonyms_exist: "ei ole sallittua, kun synonyymejä on olemassa"
   rss_by_tag: "Ketjut tunnisteella %{tag}"
@@ -3674,22 +3776,22 @@ fi:
     title: "Discoursen asennus"
     step:
       locale:
-        title: "Tervetuloa Discourseesi!"
+        title: "Tervetuloa Discourse-asennukseen!"
         fields:
           default_locale:
-            description: "Mikä on yhteisösi oletuskieli?"
+            description: "Mikä on yhteisön oletuskieli?"
       forum_title:
         title: "Nimi"
         description: "Nimi on merkittävä asia, sillä se on <i>ensimmäinen</i> asia, jonka potentiaalinen vierailija saa tietää yhteisöstäsi. Mitä valitsemasi nimi kertoo yhteisöstä?"
         fields:
           title:
-            label: "Yhteisösi nimi"
+            label: "Yhteisön nimi"
             placeholder: "Jennin mesta"
           site_description:
             label: "Kuvaile yhteisöä yhdellä lyhyellä lauseella"
             placeholder: "Paikka, jossa Jenni ja hänen ystävänsä voivat keskustella kivoista jutuista"
           short_site_description:
-            label: "Kuvaile yhteisöäsi muutamalla sanalla"
+            label: "Kuvaile yhteisöä muutamalla sanalla lyhyesti"
             placeholder: "Paras yhteisö ikinä missään"
       introduction:
         title: "Johdanto"
@@ -3699,101 +3801,114 @@ fi:
             label: "Tervetuloa-ketju"
             description: "<p>Kuinka kuvailisit yhteisöä hississä ventovieraalle, jos sinulla olisi minuutti aikaa?</p> <ul> <li>Keille nämä keskustelut on suunnattu?</li> <li>Mistä täällä puhutaan?</li> <li>Miksi täällä kannattaa käydä?</li> </ul> <p>Tervetuloa-ketju on ensimmäinen asia, jonka palstalle saapunut näkee. Ajattele sitä <b>yhden kappaleen mittaisena</b> \"hissipuheena\" tai \"perimmäisenä tavoitteena\".</p>"
             one_paragraph: "Pidä tervetuloviesti yhden kappaleen mittaisena."
+            extra_description: "Jos olet epävarma, voit ohittaa tämän vaiheen ja muokata tervetuloa-ketjua myöhemmin."
       privacy:
         title: "Käyttöoikeudet"
-        description: "<p>IsOnko yhteisöösi avoimet ovat vai onko pääsy riippuvainen jäsenyydestä, kutsusta tai hyväksynnästä? Jos haluat, voit laittaa kaiken alulle yksityisesti ja muuttaa palstan julkiseksi myöhemmin.</p>"
+        description: "<p>Onko yhteisö avoin kaikille vai onko sitä rajattu jäsenyyden, kutsujen tai hyväksynnän avulla? Jos haluat, voit määritellä asioita aluksi yksityisesti ja muuttaa sivuston julkiseksi myöhemmin.</p>"
         fields:
           privacy:
             choices:
               open:
                 label: "Julkinen"
-                description: "Kenellä vain on pääsy yhteisöön"
+                description: "Kenellä tahansa on pääsy yhteisöön"
               restricted:
                 label: "Yksityinen"
                 description: "Vain kirjautuneilla käyttäjillä on pääsy yhteisöön"
           privacy_options:
-            description: "Kuinka uusi käyttäjä luo käyttäjätilin?"
+            description: "Kuinka uudet käyttäjät voivat luoda käyttäjätilin?"
             choices:
               open:
-                label: "Käyttäjä voi liittyä itsenäisesti."
+                label: "Käyttäjät voivat luoda tilin itsenäisesti."
               invite_only:
-                label: "Luotettujen käyttäjien tai henkilökunnan tulee kutsua käyttäjä, jotta hän voi liittyä."
+                label: "Luotettujen käyttäjien tai henkilökunnan on kutsuttava käyttäjät tilin luomista varten."
               must_approve:
-                label: "Käyttäjä voi liittyä itsenäisesti, mutta henkilökunnan tulee hyväksyä hänet."
+                label: "Käyttäjät voivat luoda tilin itsenäisesti, mutta henkilökunnan on hyväksyttävä ne."
       contact:
         title: "Yhteystiedot"
         fields:
           contact_email:
             label: "Sähköposti"
             placeholder: "nimi@esimerkki.fi"
-            description: "Sähköpostiosoite, josta tavoittaa henkilön tai ryhmän, joka vastaa palstan ylläpidosta. Siihen lähetetään kriittisiä huomautuksia käsittelemättömistä liputuksista ja turvallisuuspäivityksistä, ja se näkyy Tietoja-sivulla yhteysosoitteena kiireellisiä yhteydenottoja varten."
+            description: "Tätä yhteisöä ylläpitävän henkilön tai ryhmän sähköpostiosoite. Käytetään vastaanottamaan kriittisiä huomautuksia käsittelemättömistä liputuksista ja tietoturvapäivityksistä. Se näkyy myös <a href='%{base_path}/about' target='_blank'>Tietoja</a> -sivulla kiireellisiä yhteydenottoja varten."
           contact_url:
-            label: "Internet-sivu"
+            label: "Verkkosivu"
             placeholder: "https://www.esimerkki.fi/ota-yhteytta"
-            description: "Sinun tai organisaatiosi yleinen yhteydenottosivu. Näytetään <a href='%{base_path}/about' target='_blank'>Tietoja-sivulla</a>."
+            description: "Sinun tai organisaatiosi yleinen yhteydenottosivu. Näkyy <a href='%{base_path}/about' target='_blank'>Tietoja</a> -sivulla."
           site_contact:
             label: "Automaattiset viestit"
-            description: "Tämän käyttäjän nimissä Discourse lähettää käyttäjille kaikki automaattiset yksityisviestit, kuten liputusvaroitukset ja ilmoitukset valmistuneista varmuuskopioista."
+            description: "Kaikki Discoursen automaattiset yksityisviestit lähetetään tältä käyttäjältä, kuten varoitukset liputuksista ja ilmoitukset valmistuneista varmuuskopioista."
       corporate:
         title: "Organisaatio"
-        description: "Tämä tieto tulee <a href='%{base_path}/tos' target='blank'>palveluehtoihisi</a>, joka on henkilökunta-alueella sijaitseva ketju, jota voi muokata tarpeen mukaan. Jos sinulla ei ole yritystä, voit hypätä tämän vaiheen yli."
+        description: "Tämä tieto syötetään <a href='%{base_path}/tos' target='blank'>Palveluehdot</a> -sivulle, joka on henkilökunta-alueella sijaitseva ketju jota voit muokata tarpeen mukaan. Jos sinulla ei ole yritystä, voit hypätä tämän vaiheen yli."
         fields:
           company_name:
             label: "Yrityksen nimi"
             placeholder: "Esimerkkiorganisaatio"
           governing_law:
-            label: "Minkä lakeja noudatetaan"
+            label: "Sovellettava lainsäädäntö"
             placeholder: "Kalifornian laki"
           city_for_disputes:
             label: "Kaupunki jonka oikeudessa riidat ratkotaan"
             placeholder: "San Francisco, Kalifornia"
+      colors:
+        title: "Värimallit"
+      fonts:
+        title: "Fontit"
+        fields:
+          body_font:
+            label: "Leipätekstin fontti"
+          heading_font:
+            label: "Otsikon fontti"
+          font_preview:
+            label: "Esikatselu"
       logos:
         title: "Logot"
         fields:
           logo:
             label: "Ensisijainen logo"
-            description: "Kuva, joka toimii sivuston logona sivuston vasemmassa yläkulmassa. Valitse suorakulmion muotoinen kuva, jolla on korkeutta vähintään 120 ja jonka kuvasuhde on vähintään 3:1"
+            description: "Sivuston vasemmassa yläkulmassa oleva logokuva. Käytä leveää suorakulmaista kuvaa, jonka korkeus on 120 ja kuvasuhde suurempi kuin 3:1"
           logo_small:
             label: "Neliömäinen logo"
-            description: "Neliömäinen versio sivustosi logosta. Näkyy vasemmalla ylhäällä kun selailee alas, selaimessa sekä kun jaetaan sosiaalisen median alustoilla. Tulisi mielellään olla suurempi kuin 512x512."
+            description: "Neliön muotoinen versio sivuston logosta. Näkyy sivuston vasemmassa yläkulmassa kun vierität selaimessa sivua alaspäin sekä sosiaalisen median julkaisuissa. Mielellään suurempi kuin 512x512."
       icons:
-        title: "Ikonit"
+        title: "Kuvakkeet"
         fields:
           favicon:
-            label: "Selainkuvake"
-            description: "Ikonikuva, joka edustaa sivustoasi selaimissa ja joka näyttää hyvältä pienessä koossa. Suositeltu kuvatietotyyppi on PNG tai JPG. Neliömäistä logoa käytetään oletuksena."
+            label: "Selaimen kuvake"
+            description: "Favicon-kuvake, jota käytetään kuvaamaan sivustoa selaimissa ja joka näyttää hyvältä pienissä kokoluokissa. Suositellut tiedostomuodot ovat PNG tai JPG. Käytämme oletuksena neliömäistä logoa."
           large_icon:
             label: "Suuri kuvake"
-            description: "Ikonikuva joka edustaa sivustoasi nykypäivän laitteilla ja joka näyttää hyvältä suuremmissa koissa. Tulisi mielellään olla suurempi kuin 512 × 512. Neliömäistä logoa käytetään oletuksena."
+            description: "Kuvake jota käytetään kuvaamaan sivustoa moderneilla laitteilla ja joka näyttää hyvältä suuremmissa kokoluokissa. Mielellään suurempi kuin 512 × 512. Käytämme oletuksena neliömäistä logoa."
       homepage:
-        description: "Suosittelemme, että kotisivusi on Tuoreimmat-näkymä, mutta voit valita Keskustelualueet-näkymän (ketjut ryhmitelty aihepiirin mukaan) kotisivuksi, jos haluat."
-        title: "Kotisivu"
+        description: "Suosittelemme tuoreimmat ketjut -näkymää etusivuksi, mutta voit halutessasi näyttää myös keskustelualueet (ketjut ryhmitelty aihealueen mukaan) etusivulla."
+        title: "Etusivu"
         fields:
           homepage_style:
             choices:
               latest:
                 label: "Tuoreimmat ketjut"
               categories_only:
-                label: "Vain alueet"
+                label: "Vain keskustelualueet"
               categories_with_featured_topics:
                 label: "Alueet ja esiteltyjä ketjuja"
               categories_and_latest_topics:
                 label: "Alueet ja tuoreimmat ketjut"
               categories_and_top_topics:
-                label: "Alueet ja kuumia ketjuja"
+                label: "Alueet ja suosittuja ketjuja"
               categories_boxes:
                 label: "Alueet laatikoissa"
               categories_boxes_with_topics:
                 label: "Alueet laatikoissa, joissa ketjuja"
-      emoji:
-        title: "Emojit"
-        description: "Minkä emojityylin haluat yhteisöösi? Voit milloin vain lisätä mukautettuja emojeita navigoimalla Ylläpito --> Mukauta --> Emoji."
       invites:
-        title: "Kutsu henkiökuntaa"
-        description: "Melkein valmista! Kutsutaan ihmisiä <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>pohjustamaan keskusteluita</a> kiintoisilla ketjunavauksilla ja vastauksilla, jotta yhteisö pääsee alkuun."
+        title: "Kutsu henkilökuntaa"
+        description: "Melkein valmista! Kutsu vielä joitakin ihmisiä <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>pohjustamaan keskusteluita</a> mielenkiintoisilla aiheilla ja vastauksilla, jotta yhteisösi pääsee alkuun."
         disabled: "Koska paikalliset kirjautumiset ovat pois käytöstä, ei ole mahdollista kutsua ketään. Ole hyvä jatka seuraavaan vaiheeseen."
       finished:
-        title: "Discoursesi on valmis!"
+        title: "Discourse -sivustosi on valmis!"
+        description: |
+          <p>Jos haluat muuttaa näitä asetuksia myöhemmin, <b>suorita tämä asetustoiminto uudelleen</b> tai vieraile <a href='%{base_path}/admin' target='_blank'>ylläpitopaneelissa</a>; löydät sen jakoavainkuvakkeen vierestä sivuston valikosta.</p>
+          <p>Discoursea on helppo mukauttaa entisestään sen tehokkaalla teemajärjestelmällä. <a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a> -sivustosta löydät esimerkkejä <a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">suosituista teemoista ja komponenteista</a>.</p>
+          <p>Onnittelut ja pidä hauskaa <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>rakentaessasi uutta yhteisöäsi!</a></p>
   search_logs:
     graph_title: "Hakujen määrä"
   joined: "Liittyi"
@@ -3822,55 +3937,62 @@ fi:
       revoked: Jäädytetty
       restored: Palautettiin
   reviewables:
+    already_handled: "Kiitos, mutta olemme jo tarkistanut viestin ja arvioineet, että sitä ei tarvitse liputtaa uudelleen."
+    already_handled_and_user_not_exist: "Kiitos, mutta joku muu on tehnyt jo tarkistuksen, eikä kyseistä käyttäjää ei ole enää olemassa."
     priorities:
       low: "Matala"
-      medium: "Keskiverto"
+      medium: "Keskitaso"
       high: "Korkea"
     sensitivity:
       disabled: "Pois käytöstä"
       low: "Matala"
-      medium: "Keskiverto"
+      medium: "Keskitaso"
       high: "Korkea"
     must_claim: "Sinun täytyy osoittaa asia itsellesi ennen kuin voit toimia sen suhteen."
     user_claimed: "Tämä asia on osoitettu toiselle käyttäjälle."
-    missing_version: "Sinun täytyy tarjota vesioparametri"
-    conflict: "Päivityskonflikti esti sinua tekemästä mitä olit tekemässä."
+    missing_version: "Sinun on annettava version parametri"
+    conflict: "Tapahtui muutosristiriita, joka estää tämän toimenpiteen."
     reasons:
       post_count: "Muutama ensimmäinen viesti jokaiselta uudelta käyttäjältä tulee henkilökunnan hyväksyttäväksi. Ks.  `approve_post_count`."
       trust_level: "Matalan luottamustason käyttäjien vastaukset tulevat henkilökunnan hyväksyttäviksi. Ks. `approve_unless_trust_level`."
       new_topics_unless_trust_level: "Matalan luottamustason käyttäjien aloittamat ketjut tulevat henkilökunnan hyväksyttäviksi. Ks. `approve_new_topics_unless_trust_level`."
-      fast_typer: "Uusi käyttäjä näppäili ensimmäisen viestinsä epäilyttävän nopeasti. Käyttäytyminen viittaa bottiin tai roskapostittajaan. Ks. `min_first_post_typing_time`."
+      fast_typer: "Uusi käyttäjä kirjoitti ensimmäisen viestinsä epäilyttävän nopeasti. Käyttäytyminen viittaa bottiin tai roskapostittajaan. Katso `min_first_post_typing_time` -asetus."
       auto_silence_regexp: "Uusi käyttäjä jonka ensimmäinen viesti täsmää `auto_silence_first_post_regex` -asetukseen."
-      watched_word: "Viesti sisälsi \"tarkkaillun sanan\". Ks. <a href='%{base_url}/admin/logs/watched_words'>luettelo tarkkailemistanne sanoista</a>."
+      watched_word: "Tämä viesti sisältää tarkkailussa olevan sanan. Katso <a href='%{base_url}/admin/customize/watched_words'>tarkkailtavien sanojen luettelosi</a>."
       staged: "Henkilökunnan täytyy hyväksyä esikäyttäjien uudet ketjut ja viestit. Katso `approve_unless_staged`."
-      category: "Tämän alueen viestit vaativat henkilökunnan manuaalisen hyväksynnän. Ks. alueen asetukset."
-      must_approve_users: "Kaikki uudet käyttäjät tulevat henkilökunnan hyväksyttäviksi. Ks. `must_approve_users`."
-      invite_only: "Kaikki uudet käyttäjät täytyy kutsua. Ks. `invite_only`."
+      category: "Tämän alueen viestit vaativat henkilökunnan hyväksyntää. Katso alueen asetukset."
+      must_approve_users: "Kaikki uudet käyttäjät tulevat henkilökunnan hyväksyttäviksi. Katso `must_approve_users`."
+      invite_only: "Kaikki uudet käyttäjät täytyy kutsua. Katso `invite_only`."
+      email_auth_res_enqueue: "Tämän sähköpostiviestin DMARC-tarkistus epäonnistui, todennäköisesti se ei ole kyseiseltä henkilöltä. Tarkista sähköpostin otsaketiedot saadaksesi lisätietoja."
+      email_spam: "Tämä sähköposti merkittiin roskapostiksi kohdassa `email_in_spam_header` määritellyllä otsikolla."
+      suspect_user: "Tämä uusi käyttäjä täytti profiilitiedot lukematta aiheita tai viestejä, mikä viittaa vahvasti siihen, että hän saattaa olla roskapostittaja. Katso `approve_suspect_users`."
+      contains_media: "Tämä viesti sisältää upotettua mediaa. Katso `review_media_unless_trust_level`."
+      queued_by_staff: "Henkilökunnan kokee että tämä viesti on tarkistettava. Se pysyy piilotettuna kunnes se on tarkastettu."
     actions:
       agree:
-        title: "Ole samaa mieltä..."
+        title: "Hyväksy..."
       agree_and_keep:
         title: "Säilytä viesti"
-        description: "Ole samaa mieltä lipun kanssa ja pidä viesti ennallaan"
+        description: "Hyväksy liputus ja pidä viesti ennallaan"
       agree_and_keep_hidden:
         title: "Jätä viesti piiloon"
-        description: "Ole samaa mieltä lipusta ja jätä viesti piiloon."
+        description: "Hyväksy liputus ja jätä viesti piiloon."
       agree_and_suspend:
         title: "Hyllytä käyttäjä"
-        description: "Ole samaa mieltä lipun kanssa ja hyllytä käyttäjä."
+        description: "Hyväksy liputus ja hyllytä käyttäjä."
       agree_and_silence:
         title: "Hiljennä käyttäjä"
-        description: "Ole samaa mieltä lipun kanssa ja hiljennä käyttäjä."
+        description: "Hyväksy liputus ja hiljennä käyttäjä."
       agree_and_restore:
         title: "Palauta viesti"
         description: "Palauta viesti niin että kaikki käyttäjät näkevät sen."
       agree_and_hide:
         title: "Piilota viesti"
-        description: "Piilota viesti ja lähetä automaattinen yksityisviesti, joka kehottaa käyttäjää muokkaamaan viestiä."
+        description: "Piilota viesti ja lähetä käyttäjälle yksityisviesti, jossa pyydetään käyttäjää muokkaamaan viestiä."
       delete_spammer:
         title: "Poista roskapostittaja"
-        description: "Poista käyttäjä ja kaikki hänen viestinsä ja aloittamansa ketjut."
-        confirm: "Oletko varma että haluat poistaa kaikki käyttäjän viestit ja aloittamansa ketjut sekä blokata hänen IP-osoitteensa ja sähköpostiosoitteensa?"
+        description: "Poista käyttäjä ja kaikki hänen viestinsä sekä aloittamansa ketjut."
+        confirm: "Oletko varma että haluat poistaa kaikki käyttäjän viestit ja aloittamansa ketjut sekä estää hänen IP-osoitteensa ja sähköpostiosoitteensa?"
       delete_single:
         title: "Poista"
       delete:
@@ -3880,49 +4002,65 @@ fi:
         description: "Poista viesti: jos on ketjunaloitusviesti, poista myös ketju"
       delete_and_ignore_replies:
         title: "Poista viesti + vastaukset ja sivuuta"
-        description: "Poista viesti kaikkine vastauksineen; jos on ketjunaloitusviesti, poista myös ketju"
+        description: "Poista viesti ja kaikki sen vastaukset; jos ensimmäinen viesti, poista koko ketju"
         confirm: "Oletko varma että haluat poistaa myös viestiin kohdistetut vastaukset?"
       delete_and_agree:
-        title: "Poista viesti ja ole samaa mieltä"
-        description: "Poista viesti: jos on ketjunaloitusviesti, poista myös ketju"
+        title: "Poista viesti ja hyväksy liputus"
+        description: "Poista viesti; jos ensimmäinen viesti, poista koko ketju"
       delete_and_agree_replies:
-        title: "Poista viesti + vastaukset ja ole samaa mieltä"
-        description: "Poista viesti kaikkine vastauksineen; jos on ketjunaloitusviesti, poista myös ketju"
+        title: "Poista viesti + vastaukset ja hyväksy liputus"
+        description: "Poista viesti ja kaikki sen vastaukset; jos ensimmäinen viesti, poista koko ketju"
         confirm: "Oletko varma että haluat poistaa myös viestiin kohdistetut vastaukset?"
       disagree_and_restore:
-        title: "Ole eri mieltä ja palauta viesti"
+        title: "Hylkää liputus ja palauta viesti"
         description: "Palauta viesti niin että kaikki käyttäjät näkevät sen."
       disagree:
-        title: "Ole eri mieltä"
+        title: "Hylkää"
       ignore:
         title: "Sivuuta"
       approve:
         title: "Hyväksy"
       approve_post:
         title: "Hyväksy viesti"
-        confirm_closed: "Ketju on suljettu. Haluatko luoda viestin silti?"
+        confirm_closed: "Tämä ketju on suljettu. Haluatko silti luoda viestin?"
       reject_post:
         title: "Hylkää viesti"
       approve_user:
-        title: "Hyväksy käytätjä"
+        title: "Hyväksy käyttäjä"
       reject_user:
         title: "Poista käyttäjä.."
         delete:
           title: "Poista käyttäjä"
-          description: "Käyttäjä poistetaan palstalta."
+          description: "Käyttäjä poistetaan sivustolta."
         block:
           title: "Poista ja estä käyttäjä"
-          description: "Käyttäjä poistetaan ja hänen IP:nsä sekä sähköpostiosoitteensa estetään."
+          description: "Käyttäjä poistetaan ja hänen IP-osoite sekä sähköpostiosoite estetään."
       reject:
         title: "Hylkää"
+        bundle_title: "Hylkää..."
+      reject_and_suspend:
+        title: "Hylkää ja hyllytä käyttäjä"
+      reject_and_silence:
+        title: "Hylkää ja hiljennä käyttäjä"
+      reject_and_delete:
+        title: "Hylkää ja poista viesti"
+      reject_and_keep_deleted:
+        title: "Pidä viesti poistettuna"
+      approve_and_restore:
+        title: "Hyväksy ja palauta viesti"
       delete_user:
         title: "Poista käyttäjä"
         confirm: "Haluatko varmasti poistaa käyttäjän? Kaikki hänen viestinsä poistetaan ja hänen sähköpostiosoitteensa sekä IP-osoitteensa estetään."
         reason: "Poistettiin hyväksyntäjonon kautta"
   email_style:
     html_missing_placeholder: "HTML-pohjan täytyy sisältää %{placeholder}"
+  notification_level:
+    ignore_error: "Valitettavasti et voi sivuuttaa kyseistä käyttäjää."
+    mute_error: "Valitettavasti et voi hiljentää kyseistä käyttäjää."
   discord:
     not_in_allowed_guild: "Todennus epäonnistui. Et ole sallitun Discord-killan jäsen."
+  old_keys_reminder:
+    title: "Muistutus vanhoista tunnistetiedoista"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index ef6bb00835..83acd0344a 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -19,18 +19,18 @@ fr:
   date:
     month_names:
     - null
-    - janvier
-    - février
-    - mars
-    - avril
-    - mai
-    - juin
-    - juillet
-    - août
-    - septembre
-    - octobre
-    - novembre
-    - décembre
+    - Janvier
+    - Février
+    - Mars
+    - Avril
+    - Mai
+    - Juin
+    - Juillet
+    - Août
+    - Septembre
+    - Octobre
+    - Novembre
+    - Décembre
     <<: *datetime_formats
   time:
     am: "am"
@@ -39,6 +39,7 @@ fr:
   title: "Discourse"
   topics: "Sujets"
   posts: "messages"
+  views: "vues"
   loading: "Chargement"
   powered_by_html: 'Propulsé par <a href="https://www.discourse.org">Discourse</a>, le rendu est meilleur quand JavaScript est activé.'
   sign_up: "S'inscrire"
@@ -50,9 +51,13 @@ fr:
   remove_posts_deleted_by_author: "Supprimé par l'auteur"
   redirect_warning: "Nous n'avons pas été en mesure de vérifier que le lien que vous avez sélectionné a bien été posté sur le forum. Si vous souhaitez quand même continuer, sélectionnez le lien ci-dessous."
   on_another_topic: "Sur un autre sujet"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} par %{username}"
   themes:
     bad_color_scheme: "Impossible de mettre à jour le thème, la palette de couleur est invalide"
     other_error: "Il y a eu un problème pendant la mise à jour du thème"
+    ember_selector_error: "Désolé, utiliser un sélecteur CSS nommé #ember ou .ember-view n'est pas permis, car ces noms sont générés dynamiquement au moment de l'exécution et sont amenés à changer au cours du temps, ce qui entraînera potentiellement des dysfonctionnements des définitions CSS. Veuillez choisir un autre sélecteur."
     compile_error:
       unrecognized_extension: "Extension de fichier non reconnue : %{extension}"
     import_error:
@@ -61,9 +66,11 @@ fr:
       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é."
+      git_ref_not_found: "Impossible de récupérer la référence git: %{ref}"
       unpack_failed: "Impossible de décompresser le fichier"
       file_too_big: "Le fichier non compressé est trop gros."
       unknown_file_type: "Le fichier que vous avez essayé d'envoyer ne semble pas être un thème Discourse valide."
+      not_allowed_theme: "`%{repo}` n'est pas dans la liste des thèmes autorisés (vérifier le paramètre général `allowed_theme_repos`)."
     errors:
       component_no_user_selectable: "Les composants du thème ne peuvent pas être sélectionnés par les utilisateurs"
       component_no_default: "Les composants du thème ne peuvent pas être un thème par défaut"
@@ -72,7 +79,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`"
+      data_type_not_a_number: "Le type `%{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 du paramètre `%{name}` ne correspond pas au type du paramètre."
@@ -96,7 +103,7 @@ fr:
       maximum_staged_user_per_email_reached: "Vous avez atteint le nombre maximal d'utilisateurs distants qui peuvent être créés par courriel."
       no_subject: "(aucun objet)"
       no_body: "(aucun texte)"
-      missing_attachment: "(Fichier %{filename} introuvé)"
+      missing_attachment: "(Fichier %{filename} non trouvé)"
       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 »."
@@ -117,6 +124,8 @@ fr:
         unsubscribe_not_allowed: "Se produit lorsque le désabonnement via courriel n'est pas autorisé pour cet utilisateur."
         email_not_allowed: "Se produit quand l'adresse courriel n'est pas dans la liste autorisée ou est dans la liste des indésirables."
       unrecognized_error: "Erreur non reconnue"
+    secure_media_placeholder: "Masqué : Ce site a activé la sécurisation des médias. Visitez le sujet ou cliquez sur Afficher le média pour le voir."
+    view_redacted_media: "Afficher le média"
   errors: &errors
     format: ! "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b> : %{message}"
@@ -138,6 +147,9 @@ fr:
       inclusion: n'est pas inclus dans la liste
       invalid: est invalide
       is_invalid: "ne semble pas clair, est-ce une phrase complète ?"
+      is_invalid_meaningful: "ne semble pas clair, la plupart des mots contiennent les mêmes lettres répétées."
+      is_invalid_unpretentious: "ne semble pas clair, un ou plusieurs mots sont très longs ?"
+      is_invalid_quiet: "ne semble pas clair, vouliez-vous le saisir en MAJUSCULES ?"
       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}
@@ -146,8 +158,8 @@ fr:
       not_an_integer: doit être un entier
       odd: doit être impair
       record_invalid: ! "Validation échouée : %{errors}"
-      max_emojis: "limité à %{max_emojis_count} emojis"
-      emojis_disabled: "emoji indisponibles"
+      max_emojis: "ne peut pas contenir plus de %{max_emojis_count} émojis"
+      emojis_disabled: "ne peut pas contenir des émojis"
       ip_address_already_screened: "est déjà inclus dans une règle existante"
       restrict_dependent_destroy:
         one: "Impossible de supprimer l'enregistrement car certains %{record} existent et en dépendent"
@@ -162,12 +174,12 @@ fr:
         one: c'est la mauvaise longueur (devrait être de %{count} caractère)
         other: est de la mauvaise longueur (devrait être de %{count} caractères)
       other_than: "doit être différent de %{count}"
-      sso_overrides_username: "Le nom d'utilisateur doit être mis à jour côté fournisseur SSO, car le paramètre `sso_overrides_username` est activé."
+      auth_overrides_username: "Le nom d'utilisateur doit être mis à jour du côté du fournisseur d'authentification, car le paramètre `auth_overrides_username` est activé."
     template:
-      body: ! "Des problèmes ont été rencontrés sur les champs suivants : "
+      body: ! "Des problèmes ont été rencontrés sur les champs suivants :"
       header:
-        one: "Une erreur empêche ce %{model} d'être sauvegardé"
-        other: ! "%{count} erreurs empêchent ce %{model} d'être sauvegardé"
+        one: "%{count} erreur a empêché l'enregistrement de ce %{model}"
+        other: ! "%{count} erreurs ont empêché l'enregistrement de ce %{model}"
     embed:
       load_from_remote: "Il y a eu une erreur lors du chargement de ce message."
     site_settings:
@@ -179,37 +191,70 @@ fr:
       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}'."
+      page_publishing_requirements: "La publication de pages ne peut pas être activée si la sécurisation des médias est activée."
+      s3_backup_requires_s3_settings: "Utiliser S3 comme emplacement de sauvegarde nécessite de renseigner le paramètre '%{setting_name}'."
       s3_bucket_reused: "Il n'est pas possible d'utiliser le même bucket pour 's3_upload_bucket' and 's3_backup_bucket'. Choisir un autre bucket ou utiliser un chemin d'accès différent pour chaque bucket."
       secure_media_requirements: "L'envoi de fichiers sur S3 doit être activé avant d'activer la sécurisation des médias."
-      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."
+      share_quote_facebook_requirements: "Vous devez définir un identifiant d'application Facebook pour activer le partage de citation vers Facebook."
+      second_factor_cannot_enforce_with_socials: "Vous ne pouvez pas rendre obligatoire l'authentification à deux facteurs lorsque des connexions sociales sont activées. Vous devez d'abord désactiver la connexion via : %{auth_provider_names}"
+      second_factor_cannot_be_enforced_with_disabled_local_login: "Vous ne pouvez pas rendre obligatoire l'authentification à deux facteurs lorsque les connexions locales sont désactivées."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "Vous ne pouvez pas appliquer 2FA si DiscourseConnect est activé."
+      local_login_cannot_be_disabled_if_second_factor_enforced: "Vous ne pouvez pas désactiver les connexions locales lorsque l'authentification à deux facteurs est obligatoire. Veuillez désactiver l'obligation d'authentification à deux facteurs avant de désactiver les connexions locales."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "Il n'est pas possible d'activer l'envoi de fichiers sur S3 car il est déjà activé globalement, et l'activer au niveau du site pourrait provoquer des problèmes majeurs avec les fichiers envoyés."
+      cors_origins_should_not_have_trailing_slash: "Vous ne devez pas ajouter la barre oblique finale (/) aux origines CORS."
     conflicting_google_user_id: 'Le Google Account ID a changé pour ce compte ; un responsable doit intervenir pour des raisons de sécurité. Merci de contacter les responsables et les renvoyer vers <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+    onebox:
+      invalid_address: "Désolé, nous n'avons pas pu générer d'aperçu pour cette page web car le serveur « %{hostname} » n'a pas pu être trouvé. Au lieu d'un aperçu, seul un lien apparaîtra dans votre message. :cry:"
+      error_response: "Désolé, nous n'avons pas pu générer d'aperçu pour cette page web car le serveur a retourné le code d'erreur %{status_code}. Au lieu d'un aperçu, seul un lien apparaîtra dans votre message. :cry:"
+      missing_data:
+        one: "Désolé, nous n'avons pas pu générer d'aperçu pour cette page web car la balise oEmbed / OpenGraph suivante n'a pas pu être trouvée : %{missing_attributes}"
+        other: "Désolé, nous n'avons pas pu générer d'aperçu pour cette page web car les balises oEmbed / OpenGraph suivantes n'ont pas pu être trouvées : %{missing_attributes}"
+  word_connector:
+    comma: ", "
   invite:
+    expired: "Votre jeton d'invitation a expiré. Veuillez <a href='%{base_url}/about'>contacter les responsables</a>."
     not_found: "Votre jeton d'invitation est invalide. Veuillez <a href='%{base_url}/about'>contacter le personnel</a>."
     not_found_json: "Votre jeton d'invitation est invalide. Veuillez contacter le personnel."
-    error_message: "Il y a eu une erreur lors de l'acceptation d'une invitation. Merci de contacter l'administrateur du site."
+    not_matching_email: "Votre adresse de courriel ne correspond pas à celle qui a été définie dans votre invitation. Nous vous invitons à joindre un responsable."
+    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>Sinon, veuillez <a href="%{base_url}/password-reset">réinitialiser mot de passe</a>.</p>
+    not_found_template_link: |
+      <p>L'invitation à <a href="%{base_url}">%{site_name}</a> a dépassé sa date d'expiration. Nous vous invitons à demander à la personne qui vous a invité de vous faire parvenir une nouvelle invitation.</p>
     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> !"
+    invite_exists: "Vous avez déjà invité <b>%{email}</b>."
+    invalid_email: "%{email} n'est pas une adresse de courriel valable."
     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>"
     cant_invite_to_group: "Vous n'êtes pas autorisé à inviter des utilisateurs dans le(s) groupe(s) spécifié(s). Assurez-vous que vous êtes le propriétaire du ou des groupes dans lesquels vous essayez d'inviter."
+    disabled_errors:
+      discourse_connect_enabled: "Les invitations sont désactivées car DiscourseConnect est activé."
+      invalid_access: "Vous n'êtes pas autorisé à afficher la ressource demandée."
   bulk_invite:
     file_should_be_csv: "Le fichier envoyé doit être au format CSV."
     max_rows: "Les premières %{max_bulk_invites} invitations ont été envoyées. Essayez de diviser le fichier en parties plus petites."
     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."
+    muted_invitee: "Désolé, cet utilisateur vous a mis sous silence."
+    muted_topic: "Désolé, cet utilisateur a mis ce sujet sous silence."
+    receiver_does_not_allow_pm: "Désolé, cet utilisateur ne vous autorise pas à lui envoyer des messages directs."
+    sender_does_not_allow_pm: "Désolé, vous n'autorisez pas cet utilisateur à vous envoyer des messages directs."
+    user_cannot_see_topic: "%{username} n'a pas la possibilité de consulter ce sujet."
   backup:
     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."
+    backup_file_should_be_tar_gz: "Le fichier de sauvegarde doit être une archive au format .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 d'envoyer existe déjà."
     location:
-      local: "Locale"
+      local: "Local"
       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."
@@ -224,6 +269,7 @@ fr:
   email_template_cant_be_modified: "Ce modèle de courriel ne peut pas être modifié"
   invalid_whisper_access: "Les murmures ne sont pas activés ou vous n'avez pas accès à la création des messages murmurés."
   not_in_group:
+    title_topic: "Vous devez demander l'adhésion au groupe « %{group} » pour voir ce sujet."
     title_category: "Vous devez être dans un groupe pour voir cette catégorie."
     request_membership: "Demande d'adhésion"
     join_group: "Rejoindre le groupe"
@@ -270,6 +316,11 @@ fr:
   too_many_mentions_newuser:
     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_embedded_media_allowed_trust: "Désolé, il ne vous est pas possible d'inclure des médias dans un message."
+  no_embedded_media_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas inclure des médias dans les messages."
+  too_many_embedded_media:
+    one: "Désolé, les nouveaux utilisateurs ne peuvent inclure qu'un seul média dans un message."
+    other: "Désolé, les nouveaux utilisateurs ne peuvent inclure que %{count} médias dans un message."
   no_attachments_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas ajouter de fichiers dans leurs messages."
   too_many_attachments:
     one: "Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'un fichier dans leurs messages."
@@ -282,14 +333,16 @@ fr:
   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 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."
+  user_is_suspended: "Les utilisateurs suspendus ne sont pas autorisés à publier des messages."
   topic_not_found: "Une erreur est survenue. Peut-être que ce sujet a été fermé ou supprimé pendant que vous le regardiez ?"
   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 complète du message précédent a été supprimée automatiquement."
+  watched_words_auto_tag: "Sujet automatiquement étiqueté"
   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."
+  slow_mode_enabled: "Ce sujet est en mode ralenti."
   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 ?"
@@ -323,25 +376,27 @@ fr:
     group_mentions: "Dernières mentions de %{group_name}"
     user_posts: "Derniers messages de @%{username}"
     user_topics: "Derniers sujets de @%{username}"
-    tag: "Sujets étiquettés"
+    tag: "Sujets étiqueté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 un autre utilisateur et vos modifications ne peuvent plus être sauvegardées."
+  edit_conflict: "Vos modifications ne peuvent plus être enregistrées car ce message a été modifié par un autre utilisateur."
   revert_version_same: "La version actuelle est la même que la version vers laquelle vous essayez de revenir."
+  cannot_edit_on_slow_mode: "Le mode ralenti a été activé sur ce sujet. Dans le but de favoriser une discussion réfléchie, la modifications de messages déjà publiés n'est pas autorisée pour le moment."
   excerpt_image: "image"
   bookmarks:
     errors:
       already_bookmarked_post: "Il n'est pas possible de mettre plus d'un signet sur un même message."
+      too_many: "Navré, vous ne pouvez pas créer plus de %{limit} signets. Pour en supprimer certains, rendez-vous sur <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> ."
       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 que je suis à mon bureau"
-      later_today: "Plus tard aujourd'hui"
+      later_today: "Plus tard dans la journée"
       next_business_day: "Prochain jour ouvré"
       tomorrow: "Demain"
-      next_week: "Semaine prochaine"
-      next_month: "Mois prochain"
+      next_week: "La semaine prochaine"
+      next_month: "Le mois prochain"
       custom: "Date et heure personnalisées"
   groups:
     success:
@@ -356,15 +411,20 @@ fr:
         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 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} »."
+      email_already_used_in_group: "« %{email} » est déjà utilisée par le groupe « %{group_name} »."
+      email_already_used_in_category: "« %{email} » est déjà utilisée 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."
-      adding_too_many_users: "Un maximum de %{limit} utilisateurs peuvent être ajoutés à la fois"
+      adding_too_many_users:
+        one: "Au maximum %{count} utilisateur peut être ajouté à la fois"
+        other: "Au maximum %{count} utilisateurs peuvent être ajoutés à la fois"
+      usernames_or_emails_required: "Des noms d'utilisateur ou des adresses de courriel doivent être indiqués"
+      no_invites_with_discourse_connect: "Il vous est seulement possible d'inviter des utilisateurs enregistrés, car DiscourseConnect est activé."
+      no_invites_without_local_logins: "Il est vous seulement possible d'inviter des utilisateurs enregistrés, car l'authentification locale est désactivée."
     default_names:
       everyone: "tous"
       admins: "administrateurs"
-      moderators: "moderateurs"
+      moderators: "modérateurs"
       staff: "responsables"
       trust_level_0: "niveau_confiance_0"
       trust_level_1: "niveau_confiance_1"
@@ -388,19 +448,19 @@ fr:
 
       - Qui pourrait être intéressé par cette conversation ? Pourquoi est-elle importante ? Quel genre de réponses attendez-vous ?
 
-      - 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.
+      - 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 (ou une étiquette).
 
-      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}.
+      Pour plus d'informations, [consultez 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 !**
 
-      - Votre réponse améliore-t-elle la discussion ?
-
       - Soyez respectueux envers les membres de la communauté.
 
+      - Votre réponse améliore-t-elle la discussion ?
+
       - 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 vos premiers %{education_posts_text}.
+      Pour plus d'informations, [consultez la charte de la communauté](%{base_path}/guidelines). Ce message apparaîtra uniquement pour vos premiers %{education_posts_text}.
     avatar: |
       ### Avez-vous pensé à une photo de profil ?
 
@@ -423,6 +483,14 @@ fr:
       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 tout le monde à intervenir dans la discussion
+
+      Vous avez répondu %{count} fois à @%{reply_username} dans ce sujet !
+
+      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 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
 
@@ -457,8 +525,10 @@ 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."
+              send_to_email_disabled: "Désolé, vous ne pouvez pas faire parvenir de message personnel par courriel."
               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."
+              unable_to_tag: "Une erreur s'est produite en ajoutant une étiquette à 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."
@@ -499,11 +569,14 @@ fr:
         custom_emoji:
           attributes:
             name:
-              taken: est déjà utilisé par un autre emoji
+              taken: est déjà utilisé par un autre émoji
         topic_timer:
           attributes:
             execute_at:
               in_the_past: "doit être dans le futur"
+            duration_minutes:
+              cannot_be_zero: "doit être supérieur à 0."
+              exceeds_maximum: "ne peut pas dépasser 20 ans."
         translation_overrides:
           attributes:
             value:
@@ -526,7 +599,7 @@ 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é :
+      **Modifiez le** en une brève description de votre communauté :
 
       - À qui est-elle destinée ?
       - Que peuvent-ils y trouver ?
@@ -565,13 +638,13 @@ fr:
     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 !"
+      not_found: "Catégorie non trouvée !"
       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 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} »."
+      email_already_used_in_group: "« %{email} » est déjà utilisée par le groupe « %{group_name} »."
+      email_already_used_in_category: "« %{email} » est déjà utilisée 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}"
@@ -601,25 +674,25 @@ fr:
       broken: "Cette image ne fonctionne pas"
     has_likes:
       one: "%{count} J'aime"
-      other: "%{count} J'aimes"
+      other: "%{count} J'aime"
   rate_limiter:
     slow_down: "Vous avez réalisé cette action un trop grand nombre de fois, veuillez réessayer plus tard."
     too_many_requests: "Vous avez effectué cette action 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. 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 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."
+      first_day_replies_per_day: "Votre enthousiasme est très apprécié, nous espérons qu'il va perdurer ! Cependant, par mesure de sécurité, afin de protéger notre communauté, nous avons défini une limite au nombre de réponses qu'il vous est possible de publier le jour de votre inscription. Nous vous invitons à patienter %{time_left}, après quoi vous serez en mesure de publier de nouvelles réponses."
+      first_day_topics_per_day: "Votre enthousiasme est très apprécié, nous espérons qu'il va perdurer ! Cependant, par mesure de sécurité, afin de protéger notre communauté, nous avons défini une limite au nombre de nouveaux sujets qu'il vous est possible de créer le jour de votre inscription. Nous vous invitons à patienter %{time_left}, après quoi vous serez en mesure de créer de nouveaux sujets."
+      create_topic: "Vous créez de nouveaux sujets à un rythme un peu trop élevé. Nous vous invitons à patienter %{time_left} avant de réessayer."
+      create_post: "Vous publiez des réponses à un rythme un peu trop élevé. Nous vous invitons à patienter %{time_left} avant de réessayer."
+      delete_post: "Vous supprimez des messages à un rythme un peu trop élevé. Nous vous invitons à patienter %{time_left} avant de réessayer."
+      public_group_membership: "Vous rejoignez ou quittez des groupes à rythme un peu trop élevé. Nous vous invitons à patienter %{time_left} avant de réessayer."
+      topics_per_day: "Vous avez atteint la limite quotidienne de nouveaux sujets qu'il vous est possible de créer. Vous pourrez créer de nouveaux sujets d'ici %{time_left}."
+      pms_per_day: "Vous avez atteint la limite quotidienne de messages qu'il vous est possible de publier. Vous pourrez publier de nouveaux messages d'ici %{time_left}."
+      create_like: "Woah, vous avez beaucoup d'amour à partager ! Vous avez atteint la limite quotidienne du nombre de « J'aime » qu'ils vous est possible de donner. Cependant, vous aurez le droit d'en donner davantage à mesure que votre niveau de confiance augmentera. Vous pourrez à nouveau laisser des « J'aime » d'ici %{time_left}."
+      create_bookmark: "Vous avez atteint la limite quotidienne du nombre de signets qu'il vous est possible de créer. Vous pourrez créer de nouveaux signets d'ici %{time_left}."
+      edit_post: "Vous avez atteint la limite quotidienne du nombre de modifications qu'il vous est possible d'apporter à des messages. Vous pourrez faire de nouvelles modifications d'ici %{time_left}."
       live_post_counts: "Vous demandez le nombre de messages en activité trop rapidement. Veuillez patienter %{time_left} avant de réessayer."
       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."
+      topic_invitations_per_day: "Vous avez atteint la limite quotidienne du nombre d'invitations qu'il vous est possible d'envoyer. Vous pourrez envoyer de nouvelles invitations d'ici %{time_left}."
     hours:
       one: "%{count} heure"
       other: "%{count} heures"
@@ -652,7 +725,7 @@ fr:
         one: "%{count}j"
         other: "%{count}j"
       about_x_months:
-        one: "%{count} mois "
+        one: "%{count} mois"
         other: "%{count} mois"
       x_months:
         one: "%{count} mois"
@@ -703,7 +776,7 @@ fr:
     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 "
+    update: "Mettre à jour le mot de passe"
     save: "Définir le mot de passe"
     title: "Réinitialiser le mot de passe"
     success: "Vous avez modifié votre mot de passe avec succès et vous êtes maintenant connecté."
@@ -723,7 +796,7 @@ fr:
       unknown: "navigateur inconnu"
     device:
       android: "Appareil Android"
-      chromebook: "Chromebook"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -749,6 +822,7 @@ fr:
     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"
+    max_secondary_emails_error: "Vous avez atteint la limite autorisée du nombre d'adresses de courriel secondaires."
     authorizing_new:
       title: "Confirmer votre nouvelle adresse courriel"
       description: "Veuillez confirmer que vous souhaitez changer votre adresse courriel à :"
@@ -775,7 +849,7 @@ fr:
     activated: "Désolé, ce compte a déjà été activé."
     admin_confirm:
       title: "Confirmer le compte administrateur"
-      description: "Êtes-vous sûr de vouloir <b>%{target_username} (%{target_email})</b> comme administrateur ?"
+      description: "Êtes-vous sûr de vouloir que <b>%{target_username} (%{target_email})</b> soit un administrateur ?"
       grant: "Accorder l'accès administrateur"
       complete: "<b>%{target_username}</b> est maintenant un administrateur."
       back_to: "Retourner à %{title}"
@@ -795,12 +869,12 @@ fr:
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: "Inapproprié"
-      description: 'Ce message contient du contenu qu''une personne raisonnable jugerait offensant, abusif ou en violation de la <a href="%{base_path}/guidelines">charte communautaire</a>.'
+      description: 'Ce message contient du contenu qu''une personne raisonnable jugerait offensant, abusif ou en transgression de la <a href="%{base_path}/guidelines">charte communautaire</a>.'
       short_description: 'Une transgression de <a href="%{base_path}/guidelines">notre charte communautaire</a>'
     notify_user:
-      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."
+      title: "Envoyer un message à @%{username}"
+      description: "J'aimerais parler à cette personne directement et personnellement au sujet de son message."
+      short_description: "J'aimerais parler à cette personne directement et personnellement au sujet de son message."
       email_title: 'Votre message sur « %{title} »'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
@@ -822,14 +896,15 @@ 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: "Brouillons sauvegardés de sujets en cours."
-    pm_body: "Sujet contenant des brouillons sauvegardés"
+    pm_title: "Brouillons relatifs à des sujets en cours de discussion."
+    pm_body: "Sujet contenant des brouillons enregistrés"
   user_activity:
     no_default:
       self: "Vous n'avez aucune activité pour le moment."
       others: "Aucune activité."
     no_bookmarks:
       self: "Vous n'avez pas de sujet dans vos signets ; les signets vous permettent de retrouver rapidement des sujets d'intérêt."
+      search: "Aucun signet trouvé avec la requête de recherche fournie."
       others: "Aucun signet."
     no_likes_given:
       self: "Vous n'avez aimé aucun message."
@@ -838,13 +913,24 @@ fr:
       self: "Vous n'avez répondu à aucun message."
       others: "Aucune réponse."
     no_drafts:
-      self: "Vous n'avez pas de brouillons ; commencez à répondre à un sujet et la réponse sera automatiquement sauvegardée comme un nouveau brouillon."
+      self: "Vous n'avez pas de brouillons ; lorsque vous commencerez à répondre à un sujet, cette réponse sera automatiquement enregistrée sous forme de nouveau brouillon."
+  email_settings:
+    pop3_authentication_error: "L'authentification auprès du serveur POP3 a échoué. Vérifiez le nom d'utilisateur et le mot de passe avant de réessayer."
+    imap_authentication_error: "L'authentification auprès du serveur IMAP a échoué. Vérifiez le nom d'utilisateur et le mot de passe avant de réessayer."
+    imap_no_response_error: "Une erreur est survenue lors de la communication avec le serveur IMAP. %{message}"
+    smtp_authentication_error: "L'authentification auprès du serveur SMTP a échoué. Vérifiez le nom d'utilisateur et le mot de passe avant de réessayer."
+    smtp_server_busy_error: "Le serveur SMTP indique qu'il subit une trop forte charge. Patientez un moment avant de réessayer."
+    smtp_unhandled_error: "Une erreur non prise en charge est survenue lors de la communication avec le serveur SMTP. %{message}"
+    connection_error: "Un problème de connexion au serveur s'est produit. Vérifiez le nom du serveur et le numéro de port avant de réessayer."
+    timeout_error: "Le délai d'établissement de la connexion au serveur s'est écoulé. Vérifiez le nom du serveur et le numéro de port avant de réessayer."
+    unhandled_error: "Une erreur non prise en charge est survenue lors du test des paramètres de courriel. %{message}"
   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."
+      invalid_relying_party_id_error: "L'identifiant de la partie de confiance qui a été transmise par le serveur ne correspond pas à l'identifiant de la partie de confiance associée à cette demande d'authentification."
       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."
@@ -866,7 +952,7 @@ 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 d''utilisation</a> ou pour une autre raison.'
+      description: 'Ce sujet nécessite l''intervention des responsables, selon 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 des responsables pour une autre raison"
       email_title: 'Le sujet « %{title} » nécessite l''attention d''un modérateur'
@@ -882,7 +968,7 @@ fr:
     banner:
       title: "Sujet à la une"
       message:
-        make: "Ce sujet est maintenant à la une. Il sera affiché en haut de chaque page jusqu’à ce qu'il soit ignoré par un utilisateur."
+        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 de courriel enregistrées !"
@@ -899,11 +985,12 @@ fr:
     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."
-    not_found_description: "Désolé, nous ne pouvons pas vous désabonner. Il est possible que le lien de votre courriel soit expiré."
+    not_found_description: "Désolé, nous n'avons pas pu trouver ce désabonnement. Il est possible que le lien dans votre courriel soit trop ancien et ait expiré."
     log_out: "Déconnexion"
-    submit: "Sauvegarder les préférences"
+    submit: "Enregistrer les préférences"
     digest_frequency:
       title: "Vous recevez des courriels de résumé %{frequency}"
+      never_title: "Vous ne recevez pas de courriels de résumé"
       select_title: "Régler la fréquence des courriels de résumé à :"
       never: "jamais"
       every_30_minutes: "toutes les 30 minutes"
@@ -934,6 +1021,7 @@ fr:
       read: "Tout lire"
       write: "Tout écrire"
       one_time_password: "Créer un jeton à accès unique"
+      bookmarks_calendar: "Lire les rappels de signet"
     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."
@@ -974,7 +1062,7 @@ fr:
         post_count: Messages créés
         pm_count: Messages directs créés
         revision_count: 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.
+      description: Détail de l'activité des modérateurs, y compris l'examen d'éléments signalés, le temps de lecture, les sujets créés, les messages créés, les messages directs créés et les révisions de messages publiées.
     flags_status:
       title: "Statut des signalements"
       values:
@@ -1085,7 +1173,7 @@ fr:
         moderator: Modérateur
         suspended: Suspendu
         silenced: Sous silence
-      description: "Nombre d'utilisateurs groupés par administrateurs, modérateurs, suspendus et mis sous silence."
+      description: "Nombre d'utilisateurs regroupés par administrateurs, modérateurs, suspendus et mis sous silence."
     trending_search:
       title: Critères de recherche tendance
       labels:
@@ -1240,7 +1328,7 @@ fr:
         device: Appareil
         os: Système d'exploitation
         login_time: Heure de connexion
-      description: "Détails de nouveaux identifiants qui ont des différences suspectes avec les précédents."
+      description: "Détails des nouvelles connexions qui diffèrent de manière suspecte avec les connexions précédentes."
     staff_logins:
       title: "Connexions des administrateurs"
       labels:
@@ -1269,8 +1357,13 @@ fr:
     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 valeurs de l''identifiant client et le secret client ne sont pas renseignés. Allez dans les <a href="%{base_path}/admin/site_settings">paramètres du site</a> et configurez ces valeurs. <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>.'
+    twitter_config_warning: 'Le serveur est configuré pour permettre l''authentification par Twitter (enable_twitter_logins), mais les paramètres key et 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-twitter-login-for-discourse/13395" target="_blank">Voir le guide pour en savoir plus</a>.'
+    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>.'
+    s3_cdn_warning: 'Le serveur est configuré pour télécharger des fichiers vers S3, mais aucun CDN S3 n''est configuré. Cela peut entraîner des coûts S3 élevés et des performances du site moindres. <a href="https://meta.discourse.org/t/-/148916" target="_blank">Voir « Using Object Storage for Uploads » 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 <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 ."
@@ -1279,20 +1372,19 @@ 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 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>."
     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."
     out_of_date_themes: "Des mises à jour sont disponibles pour les thèmes suivants :"
     unreachable_themes: "Nous n'avons pas pu vérifier les mises à jour pour les thèmes suivants :"
-    watched_word_regexp_error: "L'expression régulière pour 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'"
+    watched_word_regexp_error: "L'expression régulière pour %{action} des mots surveillés n'est pas valable. Veuillez vérifier la <a href='%{base_path}/admin/customize/watched_words'>configuration des Mots Surveillés</a>, ou désactiver le paramètre nommé \"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 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: "définir la langue de l'interface pour les utilisateurs anonymes à partir des en-têtes de langue de leur navigateur web"
     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"
@@ -1300,10 +1392,11 @@ fr:
     max_post_length: "Longueur maximale autorisée des messages en nombres de caractères"
     topic_featured_link_enabled: "Activer la création de sujets avec lien"
     show_topic_featured_link_in_digest: "Afficher le lien du sujet à la une dans le résumé par courriel."
+    min_topic_views_for_delete_confirm: "Nombre minimum de vues qu'un sujet doit avoir pour qu'une fenêtre de confirmation apparaisse quand il est supprimé"
     min_topic_title_length: "Longueur minimale autorisée des titres de sujet en nombre de caractères"
     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"
+    max_emojis_in_title: "Nombre maximum d'émojis permis dans le titre d'un sujet"
     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'indexation des messages les plus récents en premier"
@@ -1312,20 +1405,18 @@ fr:
     search_query_log_max_size: "Nombre maximum de requêtes de recherche à conserver"
     search_query_log_max_retention_days: "Durée maximum de conservation de requêtes de recherche"
     search_ignore_accents: "Ignorer les accents dans les recherches textuelles."
-    category_search_priority_very_low_weight: "Poids appliqué au classement des résultats de recherche pour les catégories à très basse priorité."
     category_search_priority_low_weight: "Poids appliqué au classement des résultats de recherche pour les catégories à basse priorité."
     category_search_priority_high_weight: "Poids appliqué au classement des résultats de recherche pour les catégories à haute priorité."
-    category_search_priority_very_high_weight: "Poids appliqué au classement des résultats de recherche pour les catégories à très haute priorité."
     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."
     allow_duplicate_topic_titles_category: "Autoriser les sujets avec un titre identique si la catégorie est différente. Le paramètre allow_duplicate_topic_titles doit être désactivé."
-    unique_posts_mins: "Combien de temps avant qu'un utilisateur puisse poster le même contenu à nouveau"
+    unique_posts_mins: "Combien de temps avant qu'un utilisateur puisse publier le même contenu à nouveau"
     educate_until_posts: "Lors de la rédaction des (n) premiers nouveaux sujets de l'utilisateur, afficher le panneau d'aide à la saisie."
     title: "Le nom du site, utilisé dans la balise title."
     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 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: "URL de contact pour ce site. Elle est utilisée sur le formulaire de contact de la page <a href='%{base_path}/about' target='_blank'>À propos</a> pour des faits urgents."
+    contact_url: "URL de contact pour ce site. Elle est affichée sur la page <a href='%{base_path}/about' target='_blank'>À propos</a> et les utilisateurs sont invités à l'utiliser en cas de problèmes urgents."
     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)"
@@ -1350,14 +1441,22 @@ fr:
     show_pinned_excerpt_mobile: "Afficher les extraits des sujets épinglés en vue mobile."
     show_pinned_excerpt_desktop: "Afficher les extraits des sujets épinglés en vue bureau."
     post_onebox_maxlength: "Longueur maximale en caractères d'un message Discourse intégré comme Onebox."
+    blocked_onebox_domains: "Une liste de domaines que ne seront jamais transformés en Onebox."
+    allowed_inline_onebox_domains: "Une liste de domaines qui seront transformés en Onebox s'ils ont été insérés sans titre"
+    enable_inline_onebox_on_all_domains: "Ignorer le paramètre inline_onebox_domain_allowlist et permettre des Onebox en ligne pour tous les domaines."
     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."
+    facebook_app_access_token: "Un jeton généré à partir de votre identifiant d'application Facebook et de votre secret. Utilisé pour générer des Onebox Instagram."
     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. "
+    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."
+    logo_dark: "Alternative au paramètre 'logo' pour le mode sombre."
+    logo_small_dark: "Alternative au paramètre 'logo small' pour le mode sombre."
+    mobile_logo_dark: "Alternative au paramètre 'mobile logo' pour le mode sombre."
     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."
+    manifest_screenshots: "Captures d'écrans qui mettent en valeur les atouts et les fonctionnalités de votre instance du logiciel. Ces images doivent toutes être enregistrées localement sur le serveur et posséder des dimensions identiques."
     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"
@@ -1366,8 +1465,9 @@ fr:
     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: "Force les utilisateurs à activer l'authentification à deux facteurs. 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."
+    same_site_cookies: "Délivrer des cookies avec l'attribut SameSite. Cela permet d'éliminer tous les vecteurs de requêtes illégitimes par rebond (attaques de type « CSRF ») dans les navigateurs qui le prennent en charge (en mode \"Lax\" ou \"Strict\"). Attention : le mode \"Strict\" ne fonctionnera que sue des sites qui obligent à s'authentifier et qui utilisent un système d'authentification externe."
     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."
@@ -1376,11 +1476,12 @@ fr:
     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."
+    enable_chunked_encoding: "Activer les réponses d'encodage par bloc par le serveur. Cette fonctionnalité fonctionne pour la plupart des configurations, mais certains proxys peuvent mettre les réponses en mémoire tampon, ce qui peut les retarder"
     long_polling_base_url: "Racine de l'URL utilisée pour les requêtes longues (dans le cas de l'utilisation d'un CDN pour fournir du contenu dynamique, pensez à le configurer en mode \"origin pull\") par exemple : http://origin.site.com"
     long_polling_interval: "Délai d'attente du serveur avant de répondre aux clients lorsqu'il n'y a pas de données à envoyer\n(réservé aux utilisateurs connectés)"
     polling_interval: "À quelle fréquence les clients connectés devraient-ils requêter le serveur, en millisecondes (sans utiliser les requêtes longues)"
-    anon_polling_interval: "À quelle fréquence en millisecondes les clients anonymes doivent requêter le serveur"
-    background_polling_interval: "À quelle fréquence les clients devraient-ils requêter le serveur, en millisecondes (lorsque la fenêtre est en arrière-plan)"
+    anon_polling_interval: "À quelle fréquence en millisecondes les clients anonymes doivent envoyer une requête au serveur"
+    background_polling_interval: "À quelle fréquence en millisecondes les clients doivent envoyer une requête au serveur (lorsque la fenêtre est en arrière-plan)"
     hide_post_sensitivity: "La probabilité qu'un message marqué soit masqué"
     silence_new_user_sensitivity: "La probabilité qu'un nouvel utilisateur soit mis sous silence en fonction des indicateurs de spam"
     auto_close_topic_sensitivity: "La probabilité qu'un sujet signalé soit automatiquement fermé"
@@ -1390,30 +1491,46 @@ 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 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é."
+    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 publier à 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 publier à 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 publier à 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."
     flag_sockpuppets: "Si un nouvel utilisateur répond à un sujet avec la même adresse IP que l'utilisateur qui a commencé le sujet, alors leurs messages seront automatiquement marqués comme spam."
     traditional_markdown_linebreaks: "Utiliser le retour à la ligne traditionnel dans Markdown, qui nécessite deux espaces pour un saut de ligne."
-    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_typographer: "Utiliser des règles typographiques pour améliorer la lisibilité du texte : remplacer les guillemets simples ' par des guillemets bouclés ’, (c) (tm) par des symboles, -- par des tirets longs –, 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 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: "Un responsable doit approuver tous les nouveaux utilisateurs avant qu'ils 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."
+    approve_suspect_users: "Ajouter les utilisateurs suspects à la file des éléments en attente d'examen. Les utilisateurs qui ont renseigné une biographie ou un site web sur leur profil mais n'ont pas parcouru le forum sont définis comme suspects."
+    review_every_post: "Chaque message doit être examiné par un responsable avant sa publication. AVERTISSEMENT ! DÉCONSEILLÉ POUR UN SITE À FORTE FRÉQUENTATION."
     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."
+    persistent_sessions: "Les utilisateurs resteront connectés lorsque le navigateur web sera fermé"
     maximum_session_age: "L'utilisateur restera connecté pour n heures après la dernière visite"
+    ga_version: "Version de Google Universal Analytics à utiliser : v3 (analytics.js), v4 (gtag)"
+    ga_universal_tracking_code: "Code de suivi Google Universal Analytics, 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, par exemple : monsite.com ; voir <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "Activer le suivi de plusieurs domaines pour Google Universal Analytics. Les liens sortants vers ces domaines auront l'identifiant client ajouté. Voir le guide <a href='https://support.google.com/analytics/answer/1034342?hl=fr' target='_blank'>Configurer le suivi de plusieurs domaines</a>."
+    gtm_container_id: "Identifiant de conteneur Google Tag Manager, par exemple : GTM-ABCDEF. <br/>Note : les scripts tiers chargés par GTM devront peut-être être ajoutés à la liste d'autorisation 'content security policy script src'."
     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_manage_categories_and_groups: "Autoriser les modérateurs à gérer les catégories et les groupes"
     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_allowlist: "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)."
+    blocked_ip_blocks: "Une liste de blocs IP privés qui ne doivent jamais être indexés par Discourse"
+    allowed_internal_hosts: "Une liste de domaines internes que Discourse peut indexer en sécurité pour les Onebox et autres"
+    allowed_onebox_iframes: "Liste de domaines dans l'attribut 'src' des iframes qui sont autorisés dans les prévisualisations Onebox. '*' autorise tous les moteurs Onebox par défaut."
     allowed_iframes: "Une liste des préfixes du domaine src iframe que Discourse peut autoriser en toute sécurité dans les messages"
+    allowed_crawler_user_agents: "Les agents utilisateurs des robots d'indexation qui sont autorisés à accéder au site. ATTENTION ! CE PARAMÈTRE BLOQUERA TOUS LES ROBOTS D'INDEXATION NON LISTÉS ICI !"
+    blocked_crawler_user_agents: "Mot unique insensible à la casse dans la chaîne de caractères de l'agent utilisateur identifiant les robots d'exploration web qui ne devraient pas être autorisés à accéder au site. Ne s'applique pas si la liste d'autorisation 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"
     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_frame_ancestors: "Limiter les parties autorisées à intégrer ce site dans une iframe par le biais de l'attribut 'csp'. Appliquer les restrictions d'hôtes définis dans la page <a href='%{base_path}/admin/customize/embedding'>Intégration externe</a>."
+    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"
@@ -1423,6 +1540,7 @@ fr:
     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."
+    send_tl2_promotion_message: "Envoyer aux nouveaux utilisateurs de niveau de confiance 2 un message à propos de la promotion."
     suppress_reply_directly_below: "Ne pas afficher le panneau extensible des réponses d'un message quand la seule réponse est juste en dessous ce dernier."
     suppress_reply_directly_above: "Ne pas afficher « en réponse à » sur un message quand il n'y a qu'une réponse au dessus de ce message."
     remove_full_quote: "Supprimer automatiquement les citation de message complet dans les réponses directes."
@@ -1439,7 +1557,9 @@ fr:
     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: "Indiquer dans le fichier robots.txt que ce site peut être indexé par les moteurs de recherche web. Dans des cas exceptionnels, vous pouvez remplacer définitivement le fichier <a href='%{base_path}/admin/customize/robots'>robots.txt</a>."
+    blocked_email_domains: "Une liste de domaines de courriels, séparés par des barres verticales (caractère '|') que les utilisateurs ne sont pas autorisés à utiliser pour s'inscrire. Exemple : mailinator.com|trashmail.net"
+    allowed_email_domains: "Une liste de domaines de courriels, séparés par des barres verticales (caractère '|') que les utilisateurs DOIVENT utiliser pour s'inscrire. ATTENTION : les utilisateurs avec une adresse de courriel d'un domaine non-listé ne seront pas autorisés à s'inscrire !"
     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"
@@ -1451,56 +1571,67 @@ fr:
     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: "Autoriser les noms d'utilisateur et noms de groupe à contenir des lettres et des chiffres Unicode."
+    allowed_unicode_username_characters: "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."
     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."
     block_common_passwords: "Ne pas autoriser les mots de passe qui font partie des 10 000 les plus utilisés."
-    enable_sso: "Activer l'authentification unique via un site externe (ATTENTION : LES ADRESSES COURRIEL *DOIVENT* ÊTRE VALIDÉES PAR LE SITE EXTERNE !)"
-    verbose_sso_logging: "Conserver les diagnostics étendus liés au SSO dans <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    enable_sso_provider: "Implémenter le procotole Discourse de provider SSO à /session/sso_provider, requiert sso_providers_secrets"
-    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 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_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 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 moins une autre méthode de connexion."
+    auth_skip_create_confirm: Lors de l'inscription via une authentification externe, ignorer la fenêtre contextuelle de création de compte. À utiliser de préférence avec les paramètres sso_overrides_email, sso_overrides_username et sso_overrides_name.
+    auth_immediately: "Rediriger automatiquement vers le système d'authentification externe, sans interaction avec l'utilisateur. Cela n'a d'effet que lorsque le paramètre login_required est activé et qu'un seul système d'authentification externe est défini."
+    enable_discourse_connect: "Activer le système d''authentification DiscourseConnect (précédemment appelé 'Discourse SSO'). (ATTENTION : LES ADRESSES DE COURRIEL DES UTILISATEURS *DOIVENT* ÊTRE VALIDÉES PAR LE SITE EXTERNE !)"
+    verbose_discourse_connect_logging: "Journaliser les diagnostics étendus liés au fonctionnement de DiscourseConnect dans le répertoire <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    enable_discourse_connect_provider: "Implémenter le protocole fournisseur de DiscourseConnect (précédemment appelé 'Discourse SSO') au point de terminaison /session/sso_provider, nécessite que le paramètre discourse_connect_provider soit défini"
+    discourse_connect_url: "URL du point de terminaison DiscourseConnect (comprenant http:// ou https://)"
+    discourse_connect_secret: "Secret partagé servant à authentifier par cryptographie les informations liées à DiscourseConnect, assurez-vous qu'il compte au minimum 10 caractères"
+    discourse_connect_provider_secrets: "Une liste de couples nom de domaine - clé secrète utilisant DiscourseConnect. Assurez-vous que la clé secrète DiscourseConnect compte au minimum 10 caractères. Le caractère de remplacement '*' peut servir à désigner n'importe quel nom de domaine ou n'importe quelle sous-partie d'un nom de domaine (ex : *.exemple.com)."
+    discourse_connect_overrides_bio: "Écrase la biographie du profil utilisateur et empêche l'utilisateur de la modifier"
+    discourse_connect_overrides_groups: "Synchroniser l'ensemble des appartenances à des groupes définies manuellement avec les groupes spécifiés dans l'attribut 'groups' (ATTENTION : si vous ne spécifiez aucun groupe, toutes les appartenances à des groupes définies manuellement par l'utilisateur seront remises à zéro)"
+    auth_overrides_email: "Écrase l'adresse de courriel définie localement en la remplaçant par l'adresse de courriel définie sur le site externe à chaque connexion, et interdit de la modifier localement. S'applique à tous les fournisseurs de service d'authentification. (ATTENTION : des divergences peuvent se produire en raison d'un algorithme de normalisation des adresses de courriel locales)"
+    auth_overrides_username: "Écrase le nom d'utilisateur défini localement en le remplaçant par le nom d'utilisateur défini sur le site externe à chaque connexion, et interdit de le modifier localement. S'applique à tous les fournisseurs de service d'authentification. (ATTENTION : des divergences peuvent se produire en raison de contraintes de longueur ou de complexité des noms d'utilisateur)"
+    auth_overrides_name: "Écrase le nom complet défini localement en le remplaçant par le nom complet défini sur le site externe à chaque connexion, et interdit de le modifier localement. S'applique à tous les fournisseurs de service d'authentification."
+    discourse_connect_overrides_avatar: "Écrase l'image de profil en la remplaçant par une image de profil définie dans les données transmises par le biais de DiscourseConnect. Si ce paramètre est activité, les utilisateurs ne seront pas autorisés à charger des images de profils sur le serveur Discourse."
+    discourse_connect_overrides_location: "Écrase le champ 'Localisation' défini localement en le remplaçant par une valeur définie par un site externe par le biais de données transmises avec le protocole DiscourseConnect, et interdit sa modification locale."
+    discourse_connect_overrides_website: "Écrase le champ 'Site internet' défini localement en le remplaçant par une valeur définie par un site externe par le biais de données transmises avec le protocole DiscourseConnect, et interdit sa modification locale."
+    discourse_connect_overrides_profile_background: "Écrase l'arrière-plan du profil défini localement en le remplaçant par une image définie par un site externe par le biais de données transmises avec le protocole DiscourseConnect."
+    discourse_connect_overrides_card_background: "Écrase l'arrière-plan de la carte de l'utilisateur défini localement en le remplaçant par une image définie par un site externe par le biais de données transmises avec le protocole DiscourseConnect."
+    discourse_connect_not_approved_url: "Rediriger les comptes DiscourseConnect non validés vers cette URL"
+    discourse_connect_allows_all_return_paths: "Ne pas restreindre le nom de domaine du champ return_paths indiqué par DiscourseConnect (si ce paramètres est désactivé, l'emplacement indiqué par 'return path' doit se trouver sur le site actuel)"
+    enable_local_logins: "Activer l'authentification locale avec nom d'utilisateur et mot de passe. ATTENTION : si ce paramètre est désactivé, il vous sera possiblement impossible de vous connecter si vous n'avez pas configuré au moins une méthode d'authentification alternative."
     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: "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."
+    enable_google_oauth2_logins: "Activer l'authentification Google Oauth2. C'est la méthode d'authentification que Google prend désormais en charge. Nécessite un identifiant et une clé secrète. Voir <a href='https://meta.discourse.org/t/15858' target='_blank'>Comment configurer l'authentification Google pour Discourse</a> (en anglais)."
+    google_oauth2_client_id: "Identifiant client de votre application Google."
     google_oauth2_client_secret: "Clé secrète du client de votre application Google."
-    google_oauth2_prompt: "Liste facultative de valeurs de chaînes de caractères délimitées par des espaces, qui spécifie si le serveur d'autorisation invite l'utilisateur à se réauthentifier et à donner son consentement. Voir <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> pour des valeurs possibles."
+    google_oauth2_prompt: "Liste facultative de valeurs de chaînes de caractères délimitées par des espaces, qui spécifie si le serveur d'autorisation invite l'utilisateur à s'authentifier à nouveau et à donner son consentement. Voir <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> pour des valeurs possibles."
     google_oauth2_hd: "Un domaine optionnel Google Apps Hosted auquel la connexion sera limitée. Voir <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> pour plus de détails."
     enable_twitter_logins: "Activer l'authentification Twitter, nécessite twitter_consumer_key et twitter_consumer_secret. Voir <a href='https://meta.discourse.org/t/13395' target='_blank'>Configurer Twitter login (avec rich embeds) pour Discourse</a>."
     twitter_consumer_key: "Clé consommateur pour l'authentification Twitter, enregistrée sur <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Secret consommateur pour l'authentification Twitter, enregistrée sur <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     enable_facebook_logins: "Activer l'authentification Facebook, nécessite facebook_app_id et facebook_app_secret. Voir <a href='https://meta.discourse.org/t/13394' target='_blank'>Configurer Facebook login pour Discourse</a>."
+    facebook_app_id: "Identifiant d'application pour l'authentification et le partage 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 la connexion GitHub pour Discourse</a>."
+    github_client_id: "Identifiant 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"
+    discord_trusted_guilds: 'Seuls les membres de ces guildes Discord peuvent se connecter via Discord. Utilisez les identifiants numériques des guildes. Pour plus d''informations, suivez les instructions <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">ici</a>. Laissez vide pour autoriser toutes les guildes.'
     enable_backups: "Autoriser les administrateurs à créer des sauvegardes du forum"
-    allow_restore: "Autoriser la restauration, qui peut remplacer TOUTES les données du site ! Laissez ce paramètre désactivé sauf si vous envisagez de restaurer une sauvegarde"
+    allow_restore: "Autoriser la restauration, qui peut écraser TOUTES les données du site ! Laissez ce paramètre désactivé sauf si vous envisagez de restaurer une sauvegarde"
     maximum_backups: "Nombre maximum de sauvegardes à conserver sur le disque. Les anciennes sauvegardes seront automatiquement supprimées"
-    automatic_backups_enabled: "Activer les sauvegardes automatiques suivant la fréquence configurée"
+    automatic_backups_enabled: "Créer automatiquement des sauvegardes suivant la fréquence définie dans le paramètre `backup frequency`"
     backup_frequency: "Nombre de jours entre chaque sauvegarde"
     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: "Empêcher la suppression des anciennes sauvegardes sur S3 lorsqu'il y a plus de sauvegardes que le maximum autorisé."
-    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). "
+    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 sauvegardes. IMPORTANT : S3 nécessite des identifiants valides dans les paramètres de fichiers."
+    backup_location: "Emplacement de stockage des sauvegardes. IMPORTANT : S3 nécessite la saisie d'identifiants valides dans la section `Fichiers` des paramètres du site."
     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."
@@ -1509,24 +1640,25 @@ fr:
     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é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_create_post: "Après avoir publié un message, les utilisateurs doivent attendre (n) secondes avant de pouvoir en publier un autre."
     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."
-    rate_limit_new_user_create_post: "Après avoir posté un message, les nouveaux utilisateurs doivent attendre (n) secondes avant de pouvoir en poster un nouveau."
+    rate_limit_new_user_create_post: "Après avoir publié un message, les nouveaux utilisateurs doivent attendre (n) secondes avant de pouvoir en publier un autre."
     max_likes_per_day: "Nombre maximum de J'aime par utilisateur chaque jour."
     max_flags_per_day: "Nombre maximum de signalement par utilisateur chaque jour."
     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 directs différents qu'utilisateur peut créer par 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"
     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."
+    max_post_deletions_per_minute: "Nombre maximum de messages qu'un utilisateur peut supprimer par minute. Réglez sur 0 pour désactiver les suppressions de messages."
+    max_post_deletions_per_day: "Nombre maximum de messages qu'un utilisateur peut supprimer par jour. Réglez sur 0 pour désactiver les suppressions de messages."
     invite_link_max_redemptions_limit: "Le nombre maximum d'utilisations des liens d'invitation doit être inférieur à cette valeur."
+    invite_link_max_redemptions_limit_users: "Le nombre maximum d'utilisation d'un lien d'invitation généré par un utilisateur normal ne peut excéder 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."
@@ -1544,20 +1676,23 @@ fr:
     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."
     s3_region: "Le nom de la région Amazon S3 qui va être utilisée pour envoyer des images et sauvegardes."
-    s3_cdn_url: "L'adresse du CDN à utiliser pour toutes les ressources s3 (par exemple : https://cdn.monsite.com). ATTENTION : après avoir changé ce paramètre, vous devez régénérer la totalité des messages existants. "
+    s3_cdn_url: "L'adresse du CDN à utiliser pour toutes les ressources s3 (par exemple : https://cdn.monsite.com). ATTENTION : après avoir changé ce paramètre, vous devez régénérer la totalité des messages existants."
     avatar_sizes: "Liste des tailles des avatars automatiquement générés"
     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}"
+    external_emoji_url: "URL du service externe de fourniture d'images d'émojis. Laisser ce champ vierge pour désactiver cette fonctionnalité."
+    use_site_small_logo_as_system_avatar: "Utiliser le logo de petit format du site à la place de l'avatar de l'utilisateur 'system'. Nécessite que ce logo soit défini."
     restrict_letter_avatar_colors: "Une liste de couleurs au format hexadécimal à 6 chiffres utilisées pour l'arrière-plan des avatars en forme de lettres."
     selectable_avatars_enabled: "Obliger les utilisateurs à sélectionner un avatar de la liste."
     selectable_avatars: "Liste d'avatars que les utilisateurs peuvent sélectionner."
     allow_all_attachments_for_group_messages: "Autoriser toutes les pièces-jointes pour les messages de groupes."
     png_to_jpg_quality: "Qualité du fichier JPEG converti (1 est la plus faible, 99 est la meilleure, 100 pour désactiver)."
+    recompress_original_jpg_quality: "Qualité des fichiers image téléchargés (1 est la plus faible, 99 est la meilleure, 100 pour désactiver)."
+    image_preview_jpg_quality: "Qualité des fichiers image redimensionnés (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."
     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 et déposés dans l'éditeur"
-    enable_flash_video_onebox: "Activer l'utilisation de swf et flv (Adobe Flash) dans les Onebox. 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."
     tl1_requires_topics_entered: "À combien de sujets un nouvel utilisateur doit avoir participé pour être promu au niveau de confiance 1."
@@ -1591,9 +1726,17 @@ fr:
     min_trust_to_edit_post: "Le niveau de confiance minimum requis pour modifier des messages."
     min_trust_to_allow_self_wiki: "Le niveau de confiance minimum requis pour transformer ses propres messages en type wiki."
     min_trust_to_send_messages: "Le niveau de confiance minimum pour être autorisé à créer des nouveaux messages directs."
+    min_trust_to_send_email_messages: "Niveau de confiance minimum autorisant à envoyer un message privé par courriel."
     min_trust_to_flag_posts: "Le niveau de confiance minimum requis pour signaler des messages"
     min_trust_to_post_links: "Le niveau de confiance minimum requis pour inclure des liens dans les messages"
+    min_trust_to_post_embedded_media: "Le niveau de confiance minimum requis pour intégrer des éléments multimédia dans un message"
+    min_trust_level_to_allow_profile_background: "Le niveau de confiance minimum requis pour télécharger un arrière-plan de profil"
+    min_trust_level_to_allow_user_card_background: "Le niveau de confiance minimum requis pour télécharger un arrière-plan de carte utilisateur"
+    min_trust_level_to_allow_invite: "Le niveau de confiance minimum requis pour inviter des utilisateurs"
+    min_trust_level_to_allow_ignore: "Le niveau de confiance minimum requis pour ignorer les utilisateurs"
+    allowed_link_domains: "Domaines vers lesquels les utilisateurs peuvent créer des liens même s'ils n'ont pas le niveau de confiance suffisant pour publier des liens."
     newuser_max_links: "Combien de liens un nouvel utilisateur peut-il ajouter à un message."
+    newuser_max_embedded_media: "Combien de médias 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 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."
@@ -1609,12 +1752,15 @@ fr:
     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."
+    max_consecutive_replies: "Nombre de messages consécutifs qu'un utilisateur peut publier dans un sujet avant de ne plus pouvoir ajouter de nouvelle réponse."
+    enable_filtered_replies_view: 'Le bouton "(n) réponses" réduit tous les autres messages et n''affiche que le message actuel et ses réponses.'
     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 valeur hexadécimale autorisées pour les catégories."
     category_style: "Style visuel pour les badges de catégorie."
+    default_dark_mode_color_scheme_id: "Le jeu de couleurs utilisé en mode sombre."
+    dark_mode_none: "Aucune"
     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)"
@@ -1640,8 +1786,10 @@ 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: "Conserver les détails d'un utilisateur rendu anonyme dans les journaux. Si vous vous conformerez au RGPD, vous devez désactiver cette fonction."
+    log_anonymizer_details: "Conserver les détails relatifs aux utilisateurs dans les fichiers de journalisation après qu'ils aient été rendus anonymes. Vous devrez désactiver cette fonction pour être en conformité avec le RGPD."
     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."
+    allowed_spam_host_domains: "Une liste des domaines exclus des hôtes testés pour spam. Les nouveaux utilisateurs ne seront jamais empêchés de créer des messages contenant des liens vers ces domaines."
+    staff_like_weight: "Le poids à accorder aux J'aime provenant d'un responsable (les autres J'aime ont un poids de 1)."
     topic_view_duration_hours: "Compter la vue d'un sujet une seule fois par IP ou par utilisateur toutes les N heures"
     user_profile_view_duration_hours: "Compter la vue d'un profil d'utilisateur une seule fois par IP ou par utilisateur qui visite toutes les N heures"
     levenshtein_distance_spammer_emails: "Une adresse courriel sera attribuée à un spammeur connu même si elle diffère par ce nombre de caractères."
@@ -1655,10 +1803,11 @@ fr:
     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: "Expression régulière non sensible à la casse qui, si elle est correspond, mettra sous silence le premier message de l'utilisateur et l'enverra dans la file d'attente pour approbation. Exemple : « rageux|a[bc]a » mettra sous silence 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é"
+    auto_silence_first_post_regex: "Expression régulière non sensible à la casse qui, si elle est détectée, déclenchera la mise sous silence du premier message de tout utilisateur et ajoutera ce message à la liste des messages à valider. Exemple : « rageux|a[bc]a » mettra sous silence les premiers messages contenant « rageux » ou « aba » ou « aca »."
+    reviewable_claiming: "Les éléments à examiner doivent-ils être réservés avant de pouvoir être traités ?"
+    reviewable_default_topics: "Par défaut, afficher les éléments à examiner en les regroupant par sujet"
+    reviewable_default_visibility: "Ne pas afficher les éléments à examiner à moins qu'ils n'aient ce niveau de priorité"
+    reviewable_low_priority_threshold: "Le filtre de niveau de priorité masque les éléments à examiner dont le score est inférieur au niveau spécifié, sauf lorsque le filtre '(tous)' est appliqué."
     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."
@@ -1677,6 +1826,7 @@ fr:
     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 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_allowlist: "Liste des adresses courriel qui ne seront pas vérifiées pour du contenu généré automatiquement. Exemple : foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Bloquer les courriels entrants identifiés comme 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."
@@ -1684,10 +1834,13 @@ fr:
     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."
+    blocked_attachment_content_types: "Liste des mots-clés utilisés pour filtrer les pièces jointes en fonction du type de contenu."
+    blocked_attachment_filenames: "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 courriel."
+    trim_incoming_emails: "Débarrasser les courriels entrants des passages qui ne sont pas pertinents."
     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."
+    email_total_attachment_size_limit_kb: "Taille totale maximale des fichiers joints aux courriels expédiés, en Ko. Si ce paramètre est défini à la valeur 0, l'envoi de pièces jointes sera désactivé."
     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é."
@@ -1708,17 +1861,24 @@ fr:
     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."
     enable_imap: "Activer IMAP pour synchroniser les messages de groupes."
+    enable_imap_write: "Activer la synchronisation IMAP bidirectionnelle. Si désactivée, toutes les opérations d'écriture sur les comptes IMAP sont désactivées."
+    enable_imap_idle: "Utiliser le mécanisme IMAP IDLE pour attendre de nouveaux courriels."
+    enable_smtp: "Activer SMTP pour l'envoi de notifications pour les messages de groupe."
+    imap_polling_period_mins: "La durée en minutes entre chaque vérification des comptes IMAP pour les nouveaux courriels."
+    imap_polling_old_emails: "Le nombre maximum d'anciens courriels (traités) à mettre à jour chaque fois qu'une boîte IMAP est interrogée (0 pour tous)."
+    imap_polling_new_emails: "Le nombre maximum de nouveaux courriels (non traités) à mettre à jour chaque fois qu'une boîte IMAP est interrogée."
+    imap_batch_import_email: "Le nombre minimum de nouveaux courriels qui déclenchent le mode d'importation (désactive les alertes de messages)."
     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, utilisez ce paramètre."
     find_related_post_with_key: "N'utiliser 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)"
+    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)"
+    logout_redirect: "URL vers laquelle rediriger le navigateur après déconnexion (par exemple : https://example.com/logout)"
     allow_uploaded_avatars: "Autoriser les utilisateurs à envoyer une photo de profil personnalisée."
     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 des utilisateurs lors de la création du compte ou la modification de l'adresse courriel."
@@ -1739,11 +1899,13 @@ fr:
     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: "Activer le répertoire d'utilisateurs"
     enable_group_directory: "Activer le répertoire de groupes"
+    enable_category_group_moderation: "Autoriser les groupes à modérer le contenu dans des catégories spécifiques"
     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, 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: "Désactiver les cartes, les profils et le répertoire d'utilisateurs pour les visiteurs."
+    allow_users_to_hide_profile: "Autoriser les utilisateurs à masquer leur profil et leur présence"
     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."
@@ -1754,8 +1916,9 @@ fr:
     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 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."
+    allowed_user_website_domains: "Le site web de l'utilisateur sera vérifié par rapport à ces domaines. Liste délimitée par des barres verticales."
     allow_profile_backgrounds: "Autoriser les utilisateurs à envoyer des arrières-plans de profil."
-    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."
+    sequential_replies_threshold: "Nombre de messages consécutifs qu'un utilisateur peut publier dans un sujet avant d'être averti d'avoir publié trop de réponses à 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 pourcentage de messages un utilisateur doit publier dans un sujet avant d'être averti de laisser la communauté répondre."
@@ -1772,8 +1935,10 @@ fr:
     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 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)."
+    app_association_android: "Contenu de <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>, utilisé par l'API Digital Asset Links de Google."
+    app_association_ios: "Contenu de <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>, utilisé pour créer des Universal Links entre ce site et des applications iOS."
     share_anonymized_statistics: "Partager les statistiques d'utilisation anonymes."
-    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."
+    auto_handle_queued_age: "Après tant de jours écoulés, traiter automatiquement les éléments en attente d'examen. Les signalements seront ignorés, les messages et les utilisateurs en attente d'examen 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."
@@ -1781,15 +1946,18 @@ fr:
     display_name_on_posts: "Afficher le nom complet de l'utilisateur dans ses messages en plus de son nom d'utilisateur."
     show_time_gap_days: "Si deux messages sont publiés avec ce nombre de jours d'écart, afficher cette durée dans le sujet."
     short_progress_text_threshold: "Si le nombre de messages dans un sujet dépasse cette valeur, la barre de progression affichera uniquement le 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 aux blocs de code GitHub (auto, nohighlight, 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."
     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_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 la mise en forme Markdown pour les messages intégrés."
+    allowed_embed_selectors: "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."
@@ -1797,37 +1965,44 @@ 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: "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."
+    prevent_anons_from_downloading_files: "Empêcher les utilisateurs anonymes de télécharger les pièces jointes."
     secure_media: 'Limite l''accès à TOUS les fichiers envoyés (image, vidéo, audio, texte, PDF, ZIP, etc.). Si le paramètre « 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.'
+    secure_media_allow_embed_images_in_emails: "Autorise l'intégration d'images sécurisées (qui seraient autrement expurgées) dans les courriels, si leur taille est inférieure à la valeur du paramètre 'secure media max email embed image size kb'."
+    secure_media_max_email_embed_image_size_kb: "La taille maximale d'images sécurisées qui seront intégrées dans des courriels si le paramètre 'secure media allow embed in emails' est activé. Si celui-ci n'est pas activé, ce paramètre est sans effet."
     slug_generation_method: "Choisissez une méthode de génération d'identifiant. « encoded » générera des chaînes de caractères encodées avec des pourcentages. « none » désactivera complètement les identifiants."
-    enable_emoji: "Activer les 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: "Active la traduction d'emojis en ligne (non précédés par une espace ou une ponctuation)"
+    enable_emoji: "Activer les émojis"
+    enable_emoji_shortcuts: "Les textes de smiley courants :) :p :( seront convertis en émojis"
+    emoji_set: "Comment aimeriez-vous votre émoji ?"
+    emoji_autocomplete_min_chars: "Nombre minimum de caractères nécessaires pour activer la fenêtre contextuelle d'émojis"
+    enable_inline_emoji_translation: "Active la traduction d'émojis 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"
     approve_unless_staged: "Les nouveaux sujets et messages des utilisateurs distants doivent être approuvés"
-    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."
+    notify_about_queued_posts_after: "Après tant d'heures écoulées, envoyer un courriel à tous les modérateurs si des messages sont en attente d'examen. Désactiver l'envoi de ces courriels en renseignant la valeur \"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)"
+    auto_close_topics_create_linked_topic: "Créer un nouveau sujet lié lorsqu'un sujet est fermé automatiquement par l'activation du paramètre 'auto close topics post count'"
     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."
+    enable_diffhtml_preview: "Fonctionnalité expérimentale utilisant diffHTML pour synchroniser la prévisualisation plutôt que de redéclencher un traitement d'affichage entier."
     old_post_notice_days: "Jours avant que la remarque de publication ne devienne obsolète"
     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."
+    review_media_unless_trust_level: "Les messages envoyés par des utilisateurs ayant un niveau de confiance inférieur à celui-ci et qui contiennent des médias intégrés devront être examinés par un responsable."
+    blur_tl0_flagged_posts_media: "Flouter les images des messages signalés pour masquer du contenu potentiellement NSFW."
     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."
+    skip_auto_delete_reply_likes: "Lorsque des réponses anciennes sont automatiquement supprimées, ignorer la suppression des messages avec ce nombre de J'aime ou plus."
     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."
     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."
-    disable_mailing_list_mode: "Interdire aux utilisateurs l'activation de la liste de diffusion."
+    disable_mailing_list_mode: "Interdire aux utilisateurs d'activer le mode \"liste de diffusion\" (empêche tout courriel d'être expédié vers une 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: "Condition par défaut pour considérer un sujet comme nouveau."
@@ -1837,12 +2012,14 @@ fr:
     default_other_enable_quoting: "Par défaut, proposer de citer le 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_skip_new_user_tips: "Ignorer les conseils et badges d'intégration des nouveaux utilisateurs."
     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 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."
+    default_categories_regular: "Liste des catégories qui ne sont pas mises sous silence par défaut. Utile lorsque le paramètre `mute_all_categories_by_default` est activé."
     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."
@@ -1855,7 +2032,6 @@ fr:
     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"
-    max_api_keys_per_user: "Nombre maximum de clés de l'API utilisateur par utilisateur"
     min_trust_level_for_user_api_key: "Niveau de confiance requis pour générer des clés pour l'API utilisateur"
     allowed_user_api_auth_redirects: "URL autorisée pour la redirection d'un utilisateur lors de l'authentification via clés d'API. Le symbole * peut être utilisé pour remplacer n'importe quelle partie de celle-ci (ex : www.exemple.fr/*)."
     allowed_user_api_push_urls: "URL autorisées pour le service push du serveur vers l'API utilisateur"
@@ -1865,7 +2041,6 @@ fr:
     max_tags_per_topic: "Le nombre maximum d'étiquettes pouvant être ajoutées à un sujet."
     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é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>."
@@ -1879,8 +2054,11 @@ fr:
     governing_law: "Droit applicable"
     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."
+    shared_drafts_min_trust_level: "Autoriser les utilisateurs à afficher et à modifier les brouillons partagés."
     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. Une image monochrome de taille 96×96 et au format PNG avec transparence est recommandée."
+    base_font: "Police de base à utiliser pour la plupart des textes du site. Les thèmes peuvent remplacer cette police via la propriété personnalisée CSS `--font-family`."
+    heading_font: "Police à utiliser pour les titres du site. Les thèmes peuvent remplacer cette police via la propriété personnalisée CSS `--heading-font-family`."
     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."
@@ -1888,6 +2066,9 @@ fr:
     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"
+    share_quote_buttons: "Choisissez les éléments qui apparaissent dans le bouton de partage de citation, ainsi que leur ordre."
+    share_quote_visibility: "Choisissez quand afficher le bouton de partage de citation : jamais, uniquement aux utilisateurs anonymes ou à tous les utilisateurs. "
+    create_revision_on_bulk_topic_moves: "Créer une révision pour les premiers messages lorsque les sujets sont déplacés en masse dans une nouvelle catégorie."
     errors:
       invalid_email: "Adresse courriel invalide."
       invalid_username: "Il n'y a pas d'utilisateur ayant ce nom d'utilisateur."
@@ -1902,12 +2083,13 @@ fr:
       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_json: "Données JSON non valides."
       invalid_reply_by_email_address: "La valeur doit contenir « %{reply_key} » et être différente du courriel de notification."
       invalid_alternative_reply_by_email_addresses: "Toutes les valeurs doivent contenir « %{reply_key} » et être différentes du courriel de notification."
       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."
+      pop3_polling_authentication_failed: "Échec d'authentification 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."
@@ -1915,8 +2097,8 @@ fr:
       email_editable_enabled: "Vous devez désactiver « email editable » avant d'activer ce paramètre."
       staged_users_disabled: "Vous devez d'abord activer « staged users » avant d'activer ce paramètre."
       reply_by_email_disabled: "Vous devez d'abord activer « reply by email » avant d'activer ce paramètre."
-      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."
+      discourse_connect_url_is_empty: "Avant d'activer ce paramètre, vous devez d'abord définir le paramètre \"discourse connect url\"."
+      discourse_connect_invite_only: "Il ne vous est pas possible d'activer simultanément DiscourseConnect et le paramètre \"invite only\"."
       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."
@@ -1925,16 +2107,17 @@ fr:
       invalid_hex_value: "Les valeurs de couleurs doivent être au format hexadécimal à 6 chiffres."
       empty_selectable_avatars: "Vous devez d'abord envoyer au moins deux avatars sélectionnables avant d'activer ce paramètre."
       category_search_priority:
-        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'."
+        low_weight_invalid: "Il ne vous est pas possible de définir un poids supérieur ou égal à 1."
+        high_weight_invalid: "Il ne vous est pas possible de définir un poids inférieur ou égal à 1."
+      allowed_unicode_usernames:
+        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 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:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "Clé secrète du SSO"
+        value: "Clé secrète DiscourseConnect"
   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}"
@@ -1945,20 +2128,22 @@ fr:
     results_page: "Résultats de recherche pour « %{term} »"
     audio: "[audio]"
     video: "[vidéo]"
-  sso:
+  discourse_connect:
     login_error: "Erreur de connexion"
-    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. Veuillez contacter l'administrateur du site."
-    timeout_expired: "La connexion au compte a expiré, veuillez essayer de vous reconnecter."
+    not_found: "Votre compte est introuvable. Veuillez contacter l'administrateur du site."
+    account_not_approved: "Votre compte est en attente d'approbation. Vous recevrez une notification par courriel lorsqu'il aura été approuvé."
+    unknown_error: "Votre compte présente un problème. Nous vous invitons à joindre l'administrateur du site."
+    timeout_expired: "Le délai de connexion au compte est arrivé à expiration, nous vous invitons à réessayer."
     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."
+    blank_id_error: "Le champ 'external_id' est requis mais il a été laissé vierge."
+    email_error: "Il n'a pas été possible de créer un compte avec l'adresse de courriel <b>%{email}</b>. Nous vous invitons à joindre un administrateur du site."
+    missing_secret: "L'authentification a échoué du fait de l'absence d'une clé secrète. Nous vous invitons à joindre un administrateur du site afin de résoudre ce problème."
+    invite_redeem_failed: "Il n'a pas été possible d'utiliser ce lien d'invitation. Nous vous invitons à joindre un administrateur du site."
   original_poster: "Créateur du sujet"
   most_posts: "Le plus de messages"
   most_recent_poster: "Auteur le plus récent"
   frequent_poster: "Auteur fréquent"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "Bienvenue dans notre communauté ! Voici les sujets récents les plus populaires."
     not_seen_in_a_month: "Heureux de vous revoir parmi nous ! Nous ne vous avons pas vu depuis un moment. Voici les sujets les plus populaires depuis votre absence."
@@ -1969,6 +2154,7 @@ fr:
     errors:
       different_topics: "Des messages appartenant à différents sujets ne peuvent pas être fusionnés."
       different_users: "Des messages appartenant à différents utilisateurs ne peuvent pas être fusionnés."
+      max_post_length: "Ces messages ne peuvent pas être fusionnées car la taille du message résultant serait supérieure à la limite autorisée."
   move_posts:
     new_topic_moderator_post:
       one: "Un message a été scindé en un nouveau sujet : %{topic_link}"
@@ -2036,6 +2222,8 @@ fr:
     autoclosed_disabled_lastpost: "Ce sujet est maintenant ouvert. Les nouvelles réponses sont autorisées."
     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."
     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é"
@@ -2063,8 +2251,9 @@ 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: "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"
+    omniauth_confirm_button: "Continuer"
     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 nouveaux comptes n'est pas autorisée pour le moment."
     password_too_long: "Les mots de passe sont limités à 200 caractères."
@@ -2074,8 +2263,11 @@ fr:
     missing_user_field: "Vous n'avez pas renseigné l'ensemble des champs utilisateur"
     auth_complete: "Authentification terminée."
     click_to_continue: "Cliquez ici pour continuer."
-    second_factor_description: "Veuillez saisir le code d'authentification requise de votre app :"
+    already_logged_in: "Désolé ! Cette invitation est destinée aux nouveaux utilisateurs qui n'ont pas encore de compte existant."
+    second_factor_title: "Authentification à deux facteurs"
+    second_factor_description: "Veuillez saisir le code d'authentification généré par votre application :"
     second_factor_backup_description: "Veuillez entrer un de vos codes de secours :"
+    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."
@@ -2086,6 +2278,18 @@ fr:
   admin:
     email:
       sent_test: "envoyé !"
+    user:
+      merge_user:
+        updating_username: "Mise à jour du nom d'utilisateur…"
+        changing_post_ownership: "Modification de la propriété du message…"
+        merging_given_daily_likes: "Fusion des J'aime quotidiens…"
+        merging_post_timings: "Fusion des horaires des messages…"
+        merging_user_visits: "Fusion des visites utilisateur…"
+        updating_site_settings: "Mise à jour des paramètres du site…"
+        updating_user_stats: "Mise à jour des statistiques utilisateur…"
+        merging_user_attributes: "Fusion des attributs utilisateur…"
+        updating_user_ids: "Mise à jour des identifiants utilisateur…"
+        deleting_source_user: "Suppression de l'utilisateur source…"
   user:
     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"
@@ -2111,6 +2315,7 @@ fr:
       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}."
+      does_not_exist: "N/A"
     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."
@@ -2122,14 +2327,18 @@ fr:
       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"
+      reviewable_reject_auto: "Traiter automatiquement les éléments à examiner en file d'attente"
+      reviewable_reject: "L'inscription de cet utilisateur a été refusée"
     email_in_spam_header: "Le premier courriel de l'utilisateur a été signalé comme spam"
+    already_silenced: "L'utilisateur a déjà été mis sous silence par %{staff} %{time_ago}."
+    already_suspended: "L'utilisateur a déjà été suspendu par %{staff} %{time_ago}."
   reviewables_reminder:
     submitted:
-      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)."
+      one: "Ces éléments ont été soumis il y a plus de %{count} heure. [Nous vous invitons à les examiner](%{base_path}/review)."
+      other: "Ces éléments ont été soumis il y a plus de %{count} heures. [Nous vous invitons à les examiner](%{base_path}/review)."
     subject_template:
-      one: "Un élément à passer en revue"
-      other: "%{count} éléments à passer en revue"
+      one: "%{count} élément à examiner"
+      other: "%{count} éléments à examiner"
   unsubscribe_mailer:
     title: "Désabonnement"
     subject_template: "Confirmez que vous ne souhaitez plus recevoir de courriels de mises à jour de %{site_title}"
@@ -2142,7 +2351,7 @@ fr:
 
       Si vous souhaitez continuer à recevoir ces courriels, vous pouvez ignorer ce message.
   invite_mailer:
-    title: "Invitiation"
+    title: "Invitation"
     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
@@ -2219,7 +2428,7 @@ fr:
       %{invite_link}
   invite_password_instructions:
     title: "Instructions du mot de passe d'invité"
-    subject_template: "Choisissez un mot de passe pour votre compte sur %{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 !
 
@@ -2232,13 +2441,12 @@ fr:
     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é.
+      Voici le lien vers la [sauvegarde du site](%{backup_file_path}) que vous avez demandée.
 
-      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
+      Nous vous avons envoyé ce lien par courriel validée pour des raisons de sécurité.
 
+      (Si vous *n'avez pas* effectué cette demande, il y a lieu de vous inquiéter : quelqu'un a accès à l'administration de votre site.)
+    no_token: |
       Désolé, ce lien de téléchargement a déjà été utilisé ou a expiré.
   admin_confirmation_mailer:
     title: "Confirmation de l'administrateur"
@@ -2250,6 +2458,47 @@ fr:
   test_mailer:
     title: "Envoyer un courriel de test"
     subject_template: "[%{email_prefix}] Test de délivrabilité courriel"
+    text_body_template: |
+      Ceci est un message de test envoyé par
+
+      [**%{base_url}**][0]
+
+      La bonne remise des courriels est une affaire un peu compliquée. Voici quelques points importants qu'il vous faudra examiner en premier lieu :
+
+      - Soyez *certain* de définir l'adresse d'expéditeur (le champ « from: ») utilisé par les courriels de notification dans les paramètres de votre site. **Le nom de domaine indiqué dans le champ « from: » des courriels que vous émettez est examiné par des entités tierces pour déterminer si ces courriels sont légitimes ou non**.
+
+      - Assurez-vous de savoir afficher la source d'un courriel dans votre client de messagerie, afin d'en inspecter les en-têtes et d'y chercher des indices importants. Dans Gmail, la fonctionnalité "afficher l'original" (accessible depuis le menu déroulant situé en haut à droite lorsque vous affichez un message) vous permet de le faire.
+
+      - **IMPORTANT:** Votre fournisseur d'accès à Internet a-t-il créé un enregistrement dans le DNS inversé qui permette de faire correspondre le nom de domaine avec les adresses IP depuis lesquels vos courriels sont expédiés ? Vous pouvez [examiner les enregistrement de DNS inversé][2] ici. Si votre fournisseur d'accès n'a pas défini les enregistrements de DNS inversé requis, il est très peu probable que le moindre de vos courriels soit remis à son destinataire.
+
+      - L'[enregistrement SPF][8] de votre nom de domaine est-il valable ? [Examinez votre enregistrement SPF][1] ici. Notez que le type d'enregistrement TXT est celui qui est officiellement requis par le système SPF.
+
+      - L'[enregistrement DKIM][3] de votre nom de domaine est-il valable ? Cela entraînera une amélioration significative de la bonne remise des courriels. [Examinez votre enregistrement DKIM][7] ici.
+
+      - Si vous exploitez votre propre serveur de courriel, assurez-vous que les adresses IP de celui-ci [ne soient pas inscrites sur une ou plusieurs listes de blocage][4]. Assurez-vous aussi que votre serveur, lorsqu'il émet son message HELO, indique un nom d'hôte pleinement qualifié qu'une requête DNS permette de résoudre en adresse IP. Si cette condition n'est pas satisfaite, de nombreux services de courriel rejetteront vos courriels.
+
+      - Nous vous recommandons chaudement d'**expédier un courriel de test à l'adresse [mail-tester.com][mt]** pour vous assurer que l'ensemble des choses indiquées ci-dessus fonctionnent correctement.
+
+      (*Le plus simple* est de créer un compte chez [SendGrid][sg], chez [SparkPost][sp], chez [Mailgun][mg] ou chez [Mailjet][mj]. Ces fournisseurs proposent des forfaits d'envoi de courriel à bas coût, qui suffiront aux petites communautés. Néanmoins, il vous faudra tout de même configurer les enregistrement DNS ayant trait à SPF et à DKIM !)
+
+      En espérant que ce test de bonne remise vous aura bien été remis !
+
+      Bonne chance,
+
+      Vos comparses du projet [Discourse](https://www.discourse.org)
+
+      [0]: %{base_url}
+      [1]: https://www.kitterman.com/spf/validate.html
+      [2]: https://mxtoolbox.com/ReverseLookup.aspx
+      [3]: http://www.dkim.org/
+      [4]: https://whatismyipaddress.com/blacklist-check
+      [7]: https://www.mail-tester.com/spf-dkim-check
+      [8]: http://www.openspf.org/SPF_Record_Syntax
+      [sg]: https://goo.gl/r1WMF6
+      [sp]: https://www.sparkpost.com/
+      [mg]: https://www.mailgun.com/
+      [mj]: https://www.mailjet.com/pricing/
+      [mt]: https://www.mail-tester.com/
   new_version_mailer:
     title: "Nouvelle version"
     subject_template: "[%{email_prefix}] Nouvelle version de Discourse, mise à jour disponible"
@@ -2284,7 +2533,7 @@ fr:
       %{notes}
   flag_reasons:
     off_topic: "Votre message a été signalé comme étant **hors sujet** : la communauté considère qu'il ne correspond pas au sujet en 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)."
+    inappropriate: "Votre message a été signalé comme étant **inapproprié** : la communauté considère que son contenu est offensant, abusif, ou qu'il enfreint notre [charte communautaire](%{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:
@@ -2305,28 +2554,52 @@ fr:
       text_body_template: |
         Bonjour,
 
-        Ceci est un message automatique de %{site_name} vous informant que votre message a été masqué.
+        Ce message vous est envoyé de manière automatisée par %{site_name} pour vous informer que votre message a été masqué.
 
         <%{base_url}%{url}>
 
         %{flag_reason}
 
-        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.**
+        Ce message a été masqué suite à des signalements de la communauté. Nous vous invitons par conséquent à envisager de le modifier en prenant en considération leurs commentaires. **Vous pourrez modifier votre message d'ici %{edit_delay} minutes, et il sera ensuite rendu automatiquement visible à nouveau.**
 
-        Toutefois, si le message est masqué par la communauté une seconde fois, il le restera jusqu'à ce qu'il soit traité par des responsables.
+        Toutefois, si ce message était masqué par la communauté une seconde fois, il le resterait jusqu'à ce qu'il soit examiné par des responsables.
 
-        Pour plus d'informations, veuillez consulter notre [charte communautaire](%{base_url}/charte).
+        Pour obtenir davantage de conseils, nous vous invitons à consulter notre [charte communautaire](%{base_url}/charte).
     post_hidden_again:
       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"
+      text_body_template: |
+        Bonjour,
+
+        Ce message vous est envoyé de manière automatisée par %{site_name} pour vous informer que votre message a été masqué à nouveau.
+
+         <%{base_url}%{url}>
+
+         %{flag_reason}
+
+        La 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.**
+
+        Pour obtenir davantage de conseils, nous vous invitons à consulter notre [charte communautaire](%{base_url}/charte).
+    queued_by_staff:
+      title: "Message En Attente de Vérification"
+      subject_template: "Message masqué par un responsable, en attente de vérification"
+      text_body_template: |
+        Bonjour,
+
+        Ce message vous est envoyé de manière automatisée par %{site_name} pour vous informer que votre message a été masqué.
+
+        <%{base_url}%{url}>
+
+        Votre message restera masqué jusqu'à ce qu'un responsable en prenne connaissance et l'examine.
+
+        Pour obtenir davantage de conseils, nous vous invitons à consulter notre [charte communautaire](%{base_url}/guidelines).
     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 vous est envoyé de manière automatisée par %{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.
 
@@ -2341,19 +2614,17 @@ fr:
       text_body_template: |
         Bonjour,
 
-        Ceci est un message automatique de %{site_name} pour vous informer que [votre message](%{base_url}%{url}) a été retiré.
+        Ce message vous est envoyé de manière automatisée par %{site_name} pour vous informer que [votre message](%{base_url}%{url}) a été supprimé.
 
         %{flag_reason}
 
-        Ce message a été signalé par la communauté et un responsable a décidé de le retirer.
+        Ce message a été signalé par la communauté et un responsable a décidé de le supprimer.
 
-        [details="Cliquez pour voir le message retiré"]
         ``` markdown
         %{flagged_post_raw_content}
         ```
-        [/details]
 
-        Pour plus d'informations, veuillez consulter notre [charte communautaire](%{base_url}/guidelines).
+        Pour plus d'informations, nous vous invitons à consulter notre [charte communautaire](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
         Pour connaître quelques astuces qui 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/).
@@ -2385,7 +2656,7 @@ fr:
 
         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).
+        Qui dit pouvoir, dit responsabilité. Si vous débutez dans le rôle de modérateur, nous vous invitons à 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} !"
@@ -2403,15 +2674,23 @@ fr:
         Amusez-vous bien !
 
         [prefs] : %{user_preferences_url}
+    tl2_promotion_message:
+      subject_template: "Félicitations pour votre promotion de niveau de confiance !"
+      text_body_template: |
+        Nous vous avons promu à un [niveau de confiance ](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) supérieur !
+
+        En votre qualité d'utilisateur expérimenté, vous apprécierez peut-être [ces différents trucs et astuces (en anglais)](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
+        Votre présence est appréciée, et nous vous encourageons à continuer de vous impliquer.
     backup_succeeded:
-      title: "Sauvegarde réussie"
+      title: "Sauvegarde effectuée"
       subject_template: "Sauvegarde terminée avec succès"
       text_body_template: |
-        La sauvegarde a réussi.
+        La sauvegarde s'est terminée avec succès.
 
-        Rendez-vous dans la section [Administration > Sauvegardes](%{base_url}/admin/backups) pour la télécharger.
+        Pour la télécharger, rendez-vous dans la section [Administration > Sauvegardes](%{base_url}/admin/backups) du site.
 
-        Voici le détail :
+        Voici les détails journalisés :
 
         ```text
         %{logs}
@@ -2422,7 +2701,7 @@ fr:
       text_body_template: |
         La sauvegarde a échoué.
 
-        Voici le détail :
+        Voici les détails journalisés :
 
         ```text
         %{logs}
@@ -2465,12 +2744,12 @@ fr:
         %{logs}
         ```
     user_added_to_group_as_owner:
-      title: "Ajouté au groupe en tant que propriétaire"
-      subject_template: "Vous avez été ajouté en tant que propriétaire du groupe %{group_name}"
+      title: "Désigné comme propriétaire du groupe"
+      subject_template: "Vous avez été désigné comme l'un des propriétaire du groupe %{group_name}"
       text_body_template: |
-        Vous avez été ajouté en tant que propriétaire du groupe [%{group_name}] (%{base_url}%{group_path}).
+        Vous avez été désigné comme l'un des propriétaires du groupe [%{group_name}] (%{base_url}%{group_path}).
     user_added_to_group_as_member:
-      title: "Ajouté au groupe en tant que membre"
+      title: "Désigné comme membre du groupe"
       subject_template: "Vous êtes maintenant membre du groupe %{group_name}."
       text_body_template: |
         Vous êtes maintenant membre du groupe [%{group_name}](%{base_url}%{group_path}).
@@ -2478,20 +2757,20 @@ 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 s'est terminé correctement ! :dvd:
 
         %{download_link}
 
-        Le lien de téléchargement sera valide pendant 48 heures.
+        Ce lien de téléchargement fonctionnera 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 dans une archive au format <em>zip</em>. Si vous ne parvenez pas à en extraire les fichiers, nous vous recommandons d'utiliser l'outil suivant&nbsp;: https://www.7-zip.org/.
     csv_export_failed:
       title: "Export CSV échoué"
-      subject_template: "Échec de l'exportation des données "
+      subject_template: "Échec de l'exportation des données"
       text_body_template: "Nous sommes désolés, votre export de données a échoué. Veuillez consulter les journaux ou [contacter un responsable](%{base_url}/about)."
     email_reject_insufficient_trust_level:
-      title: "Courriel rejeté - Niveau de confiance insuffisant "
-      subject_template: "[%{email_prefix}] Problème de courriel -- Niveau de confiance insuffisant "
+      title: "Courriel rejeté - Niveau de confiance insuffisant"
+      subject_template: "[%{email_prefix}] Problème de courriel -- Niveau de confiance insuffisant"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
@@ -2612,9 +2891,17 @@ fr:
       title: "Courriel rejeté - Mauvaise adresse de destination"
       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é.
+        Nous sommes désolés, votre courriel adressé à %{destination} (intitulé %{former_title}) n'a pas pu être expédié.
 
-        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.
+        Voici quelques points à vérifier :
+
+          - Utilisez-vous plusieurs adresses de courriel ? Avez-vous répondu en utilisant une adresse différente de celle que vous avez utilisé au départ ? Les réponses par courriel nécessitent que vous utilisiez la même adresse de courriel.
+
+          - Votre client de messagerie a-t-il correctement utilisé le champ Reply-To: pour définir le destinataire de votre réponse ? Certains logiciels utilisent malheureusement le champ From: à la place, ce qui est incorrect et ne fonctionne pas dans le cas qui nous préoccupe.
+
+          - L'en-tête 'Message-ID' du courriel a-t-il été modifié ? Cet en-tête doit conserver une valeur constante.
+
+        En cas de besoin, vous pourrez obtenir davantage d'aide en consultant la page %{base_url}/about.
     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"
@@ -2663,11 +2950,19 @@ 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é.
+
+        Vous n'êtes pas autorisé à répondre au sujet. Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).
     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"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoie de courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Vous avez répondu à un courriel de résumé, ce qui n'est pas accepté.
+
+        Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).
     email_error_notification:
       title: "Notification d'erreur courriel"
       subject_template: "[%{email_prefix}] Problème de courriel -- Erreur d'authentification POP3"
@@ -2678,7 +2973,7 @@ 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é"
+      title: "Courriel révoqué"
       subject_template: "Est-ce que votre adresse courriel est correcte ?"
       text_body_template: |
         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.
@@ -2695,73 +2990,80 @@ 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 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"
+      text_body_template: "Bonjour, \n\nCe message vous est envoyé de manière automatisée par %{site_name} pour vous informer que @%{username} a été ignoré par %{ignores_threshold} utilisateurs. Cela pourrait être le signe qu'un problème est en train de se développer au sein de votre communauté.\n\nVous souhaiterez peut-être [examiner les messages récents](%{base_url}/u/%{username}/summary) de cet utilisateur et, éventuellement, examiner la situation d'autres utilisateurs figurant dans le [rapport d'utilisateurs ignorés et mis sous silence](%{base_url}/admin/reports/top_ignored_users).\n\nPour obtenir davantage de conseils, nous vous invitons à consulter notre [charte communautaire](%{base_url}/guidelines).\n"
     too_many_spam_flags:
       title: "Trop de signalements de spam"
       subject_template: "Nouveau compte bloqué"
-      text_body_template: |2
-
+      text_body_template: |
         Bonjour,
 
-        Ceci est un message automatique de %{site_name} pour vous informer que vos messages ont été temporairement masqués suite à des signalements de la communauté.
+        Ce message vous est envoyé de manière automatisée par %{site_name} pour vous informer que vos messages ont été provisoirement masqués suite à des signalements de la communauté.
 
-        Par mesure de précaution, votre nouveau compte a été mis sous silence et vous ne pourrez plus créer de nouvelles réponses et sujets tant qu'un responsable n'a pas vérifié votre compte. Veuillez nous excuser pour la gêne occasionnée.
+        Par mesure de précaution, votre nouveau compte a été mis sous silence. Vous ne pourrez plus publier de réponses ni de nouveaux sujets tant qu'un responsable n'aura pas examiné la situation de votre compte. Nous vous prions de nous excuser pour la gêne occasionnée.
 
-        Pour plus d'informations, merci de vous référer à la [charte de la communauté](%{base_url}/guidelines).
+        Pour obtenir davantage de conseils, nous vous invitons à consulter notre [charte communautaire](%{base_url}/guidelines).
     too_many_tl3_flags:
       title: "Trop de signalements en provenance d'utilisateurs de niveau de confiance 3"
       subject_template: "Nouveau compte bloqué"
       text_body_template: |
         Bonjour,
 
-        Ceci est un message automatique de %{site_name} pour vous informer que votre compte a été bloqué suite à un grand nombre de signalements de la communauté.
+        Ce message vous est envoyé de manière automatisée par %{site_name} pour vous informer que votre compte a été restreint suite à un grand nombre de signalements de la communauté.
 
-        Par mesure de précaution, votre nouveau compte a été mis sous silence et vous ne pourrez par créer de nouvelles réponses ou sujets tant qu'un responsable n'a pas vérifié votre compte. Veuillez nous excuser pour la gêne occasionnée.
+        Par mesure de précaution, votre nouveau compte a été mis sous silence. Vous ne pourrez pas publier de réponses ni de nouveaux sujets tant qu'un responsable n'aura pas examiné la situation de votre compte. Nous vous prions de nous excuser pour la gêne occasionnée.
 
-        Pour plus d'informations, merci de vous en référer à la [charte de la communauté](%{base_url}/guidelines).
+        Pour obtenir davantage de conseils, nous vous invitons à consulter notre [charte communautaire](%{base_url}/guidelines).
     silenced_by_staff:
       title: "Mis sous silence par un responsable"
       subject_template: "Compte temporairement bloqué"
       text_body_template: |
         Bonjour,
 
-        Ceci est un message automatique de %{site_name} pour vous informer que votre compte a été temporairement bloqué par mesure de précaution.
+        Ceci est un message automatique de %{site_name} pour vous informer que votre compte a été provisoirement restreint par mesure de précaution.
 
-        Vous pouvez continuer à naviguer mais vous ne pourrez plus répondre ou créer de sujets tant qu'un [responsable](%{base_url}/about) n'a pas vérifié vos messages les plus récents. Veuillez nous excuser pour la gêne occasionnée.
+        Vous pouvez continuer de consulter le forum, mais vous ne pourrez plus répondre ni créer de sujets tant qu'[un responsable](%{base_url}/about) n'aura pas examiné vos messages récents. Nous vous prions de nous excuser pour la gêne occasionnée.
 
-        Pour plus d'informations, merci de vous référer à la [charte de la communauté](%{base_url}/guidelines).
+        Pour obtenir davantage de conseils, nous vous invitons à consulter notre [charte communautaire](%{base_url}/guidelines).
     user_automatically_silenced:
       title: "Utilisateur automatiquement mis sous silence"
       subject_template: "Nouvel utilisateur %{username} mis sous silence suite à des signalements de la communauté"
       text_body_template: |
-        Ceci est un message automatique
+        Ce message vous est envoyé de manière automatisée.
 
-        Le nouvel utilisateur [%{username}](%{user_url}) a été automatiquement mis sous silence suite à plusieurs signalements par des utilisateurs.
+        Le nouvel utilisateur [%{username}](%{user_url}) a été automatiquement mis sous silence car plusieurs utilisateurs ont signalé des messages publiés par %{username}.
 
-        Merci de [vérifier les signalements](%{base_url}/admin/flags). Si %{username} a été injustement mis sous silence, cliquez sur le bouton d'annulation de la mise sous silence sur la [page d'administration de cet utilisateur](%{user_url}).
+        Nous vous invitons à [examiner ces signalements](%{base_url}/admin/flags). Si %{username} a été mis sous silence de façon injustifiée, utilisez le bouton d'annulation de la mise sous silence situé sur la [page d'administration de cet utilisateur](%{user_url}).
 
-        Ce seuil peut être changé par le paramètre `silence_new_user`.
+        Le seuil de signalements déclenchant l'envoi de ce message peut être modifié avec le paramètre `silence_new_user`.
     spam_post_blocked:
       title: "Message spam bloqué"
       subject_template: "Les messages du nouvel utilisateur %{username} sont bloqués pour des liens répétés"
+      text_body_template: |
+        Ce message vous est envoyé de manière automatisée.
+
+        Le nouvel utilisateur [%{username}](%{user_url}) a tenté de créer plusieurs messages contenant des liens vers %{domains}, et ces messages ont été bloqués pour prévenir la publicité indésirable. Cet utilisateur reste autorisé à créer des messages qui ne contiennent pas de liens vers %{domains}.
+
+        Nous vous invitons à [examiner la situation de cet utilisateur](%{user_url}).
+
+        Cette règle peut être modifiée avec les paramètres `newuser_spam_host_threshold` et `allowed_spam_host_domains`. Le paramètre `allowed_spam_host_domains` constitue une liste d'autorisation qui vous permettra d'exempter %{domains} de cette vérification.
     unsilenced:
       title: "Mise sous silence annulée"
       subject_template: "Compte débloqué"
       text_body_template: |
         Bonjour,
 
-        Ceci est un message automatique de %{site_name} pour vous informer que votre compte a été débloqué après vérification d'un responsable.
+        Ceci est un message automatique de %{site_name} pour vous informer que les restrictions sur votre compte ont été levées suite à l'intervention d'un responsable.
 
-        Vous pouvez à nouveau créer des nouveaux messages et sujets. Merci pour votre patience.
+        Vous pouvez à nouveau publier des messages. Nous vous remercions de votre patience.
     pending_users_reminder:
       title: "Rappel d'utilisateurs en attente"
       subject_template:
         one: "%{count} utilisateur en attente d'approbation"
         other: "%{count} utilisateurs en attente d'approbation"
       text_body_template: |
-        Il y a de nouvelles inscriptions utilisateurs en attente d'approbation (ou rejet).
+        De nouvelles inscriptions d'utilisateurs sont en attente d'approbation (ou de rejet).
 
-        [Veuillez les examiner](%{base_url}/review).
+        Nous vous invitons à [les examiner](%{base_url}/review).
     download_remote_images_disabled:
       title: "Téléchargement d'images distantes désactivé"
       subject_template: "Téléchargement d'images distantes désactivé"
@@ -2770,7 +3072,7 @@ fr:
       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.
+        Nous avons de nouveaux conseils et recommandations pour vous d'après vos paramètres actuels.
 
         [Rendez-vous sur votre tableau de bord](%{base_url}/admin) pour les voir.
 
@@ -2787,12 +3089,12 @@ fr:
     queued_posts_reminder:
       title: "Messages dans la file d'attente"
       subject_template:
-        one: "%{count} message en attente de vérification"
-        other: "%{count} messages en attente de vérification"
+        one: "%{count} message en attente d'examen"
+        other: "%{count} messages en attente d'examen"
       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).
+        Des messages de nouveaux utilisateurs sont en attente de modération. Nous vous invitons à [les approuver ou les rejeter](%{base_url}/review?type=ReviewableQueuedPost).
   unsubscribe_link: |
     Pour se désabonner de ces courriels, [cliquez ici](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2801,8 +3103,8 @@ fr:
     Vous recevez ce courriel car vous avez activé la liste de diffusion.
 
     Pour se désabonner de ces courriels, [cliquez ici](%{unsubscribe_url}).
-  subject_re: "Re :"
-  subject_pm: "[MD]"
+  subject_re: "Re : "
+  subject_pm: "[MD] "
   email_from: "%{user_name} via %{site_name}"
   user_notifications:
     previous_discussion: "Réponses précédentes"
@@ -2819,7 +3121,7 @@ fr:
     only_reply_by_email_pm: "Répondre à ce courriel pour répondre à %{participants}."
     visit_link_to_respond: "[Voir le sujet](%{base_url}%{url}) pour répondre."
     visit_link_to_respond_pm: "[Voir le message](%{base_url}%{url}) pour répondre à %{participants}."
-    posted_by: "Redigé par %{username} le %{post_date}"
+    posted_by: "Publié par %{username} le %{post_date}"
     pm_participants: "Participants : %{participants}"
     invited_group_to_private_message_body: |
       %{username} a invité @%{group_name} à un message
@@ -3019,20 +3321,16 @@ fr:
       title: "Compte suspendu"
       subject_template: "[%{email_prefix}] Votre compte a été suspendu"
       text_body_template: |
-        Vous avez été suspendu du forum jusqu'au %{suspended_till}.
+        Votre compte sur le forum a été suspendu jusqu'à %{suspended_till}.
 
-        %{reason}
-
-        %{message}
+        Motif : %{reason}
     account_silenced:
       title: "Compte mis sous silence"
       subject_template: "[%{email_prefix}] Votre compte a été mis sous silence"
       text_body_template: |
-        Vous avez été mis sous silence sur le forum jusqu'au %{silenced_till}.
+        Votre compte sur le forum a été mis en sourdine jusqu'à %{silenced_till}.
 
-        %{reason}
-
-        %{message}
+        Motif : %{reason}
     account_exists:
       title: "Le compte existe déjà"
       subject_template: "[%{email_prefix}] Le compte existe déjà"
@@ -3043,6 +3341,15 @@ fr:
 
         Si vous n'avez pas essayé de créer un compte pour %{email} ou de changer votre adresse courriel, ne vous inquiétez pas – vous pouvez ignorer ce message.
 
+        Si vous avez des questions, [contactez notre équipe](%{base_url}/about).
+    account_second_factor_disabled:
+      title: "Authentification à deux facteurs désactivée"
+      subject_template: "[%{email_prefix}] Authentification à deux facteurs désactivée"
+      text_body_template: |
+        L'authentification à deux facteurs a été désactivée sur votre compte à %{site_name}. Vous pouvez maintenant vous connecter uniquement avec votre mot de passe ; un code d'authentification supplémentaire n'est plus nécessaire.
+
+        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 é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}"
@@ -3099,6 +3406,14 @@ fr:
     admin_login:
       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"
@@ -3111,9 +3426,21 @@ 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}
+
+        Si vous n'avez pas demandé ce changement, veuillez contacter un [administrateur](%{base_url}/about).
     confirm_new_email_via_admin:
-      title: "Confirmer votre nouvelle adresse courriel"
-      subject_template: "[%{email_prefix}] Confirmez votre nouvelle adresse courriel"
+      title: "Confirmer votre nouvelle adresse de courriel"
+      subject_template: "[%{email_prefix}] Confirmez votre nouvelle adresse de 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}
+
+        Ce changement de courriel a été demandé par un administrateur du site. Si vous n'avez pas demandé ce changement, veuillez contacter un [administrateur](%{base_url}/about).
     confirm_old_email:
       title: "Confirmez votre ancienne adresse courriel"
       subject_template: "[%{email_prefix}] Confirmez votre adresse courriel actuelle"
@@ -3124,6 +3451,7 @@ fr:
 
         %{base_url}/u/confirm-old-email/%{email_token}
     confirm_old_email_add:
+      title: "Confirmez votre ancienne adresse courriel (Ajout)"
       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.
@@ -3143,6 +3471,7 @@ fr:
 
         %{new_email}
     notify_old_email_add:
+      title: "Notifier l'ancienne adresse courriel (ajout)"
       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.
@@ -3169,6 +3498,13 @@ fr:
         Nous croyons au [comportement communautaire civilisé](%{base_url}/guidelines).
 
         Amusez-vous bien !
+    signup_after_reject:
+      title: "Inscription Suite À Un Refus"
+      subject_template: "Votre inscription à %{site_name} a été rejetée"
+      text_body_template: |
+        Un responsable a refusé votre inscription sur %{site_name}.
+
+        Motif : %{reject_reason}
     signup:
       title: "Inscription"
       subject_template: "[%{email_prefix}] Activez votre nouveau compte"
@@ -3185,7 +3521,7 @@ fr:
       text_body_template: |
         Bienvenue sur %{site_name} !
 
-        Ceci est un rappel pour activer votre compte.
+        Ceci est un rappel poli que votre compte doit être activé.
 
         Cliquez sur le lien ci-dessous pour confirmer et activer votre compte :
         %{base_url}/u/activate-account/%{email_token}
@@ -3197,17 +3533,25 @@ fr:
       text_body_template: |
         Bonjour,
 
-        Nous avons remarqué une connexion depuis un lieu ou appareil que vous n'utilisez pas habituellement. Était-ce vous ?
+        Nous avons remarqué une connexion provenant d'un lieu ou d'un appareil que vous n'utilisez pas d'habitude. Était-ce bien vous ?
 
          - Lieu : %{location} (%{client_ip})
          - Navigateur : %{browser}
          - Appareil : %{device} – %{os}
 
-        Si c'était effectivement vous, il n'y a rien besoin de faire.
+        Si c'était bien vous, tant mieux ! Rien à signaler.
 
-        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.
+        Si ça n'est pas vous, nous vous prions d'[examiner les connexions établies récemment](%{base_url}/my/preferences/account) et d'envisager un changement de votre mot de passe.
+    post_approved:
+      title: "La publication de votre message a été autorisée"
+      subject_template: "[%{site_name}] La publication de votre message a été autorisée"
+      text_body_template: |
+        Bonjour,
+
+        Ce message vous est envoyé automatiquement par %{site_name} pour vous informer que la publication de [votre message](%{base_url}%{post_url}) a été autorisée.
   page_forbidden:
     title: "Oups ! Cette page est privée."
+  site_setting_missing: "Le paramètre `%{name}` doit être défini."
   page_not_found:
     title: "Oups ! Cette page n'existe pas ou est privée."
     popular_topics: "Populaires"
@@ -3235,6 +3579,7 @@ 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:
@@ -3247,7 +3592,7 @@ fr:
     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>."
+    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 examinés. Cette règle peut être ajustée avec 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é"
@@ -3282,6 +3627,11 @@ fr:
     latte: "Latte"
     summer: "Été"
     dark_rose: "Rose foncé"
+    wcag: "WCAG Clair"
+    wcag_theme_name: "WCAG Clair"
+    wcag_dark: "WCAG Sombre"
+    wcag_dark_theme_name: "WCAG Sombre"
+    default_theme_name: "Par défaut"
     light_theme_name: "Clair"
     dark_theme_name: "Sombre"
     neutral_theme_name: "Neutre"
@@ -3299,8 +3649,7 @@ fr:
     Modifiez le premier message de ce sujet pour changer le contenu de la page %{page_name}.
   guidelines_topic:
     title: "FAQ/Charte"
-    body: |2
-
+    body: |
       <a name="civilized"></a>
 
       ## [Ceci est un endroit civilisé, merci de le respecter](#civilized)
@@ -3343,7 +3692,7 @@ fr:
 
       Discourse fournit des outils qui permettent à la communauté d'identifier collectivement le meilleur (et le pire) des contributions : signets, des *J'aime*, des signalements, des réponses, des vérifications et ainsi de suite. Utilisez ces outils pour améliorer votre propre expérience et celle de tous les autres aussi.
 
-      Liassons notre communauté en meilleur état que nous l'avons trouvé.
+      Laissons notre communauté en meilleur état que nous l'avons trouvé.
 
       <a name="flag-problems"></a>
 
@@ -3671,6 +4020,7 @@ fr:
     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.
+        badge_disabled: Veuillez préalablement activer le badge %{badge_name}.
     editor:
       name: Éditeur
       description: Première modification d'un message
@@ -3685,7 +4035,7 @@ 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é 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.
+        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 publier 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
@@ -3695,7 +4045,7 @@ fr:
       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 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.
+        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 recaté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
@@ -3755,7 +4105,7 @@ fr:
       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é à 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 à beaucoup de nouvelles personnes et nous avez aidé à grandir.
     great_share:
       name: Super partage
       description: Message partagé avec 1000 visiteurs uniques
@@ -3815,12 +4165,12 @@ fr:
       name: Lien populaire
       description: A posté un lien externe avec au moins 50 clics
       long_description: |
-        Ce badge est accordé quand un lien que vous avez partagé obtient 50 clics. Merci de poster un lien utile qui a ajouté un contexte intéressant à la conversation !
+        Ce badge est accordé quand un lien que vous avez partagé obtient 50 clics. Merci de publier un lien utile qui a ajouté un contexte intéressant à la conversation !
     hot_link:
       name: Lien tendance
       description: A posté un lien externe avec au moins 300 clics
       long_description: |
-        Ce badge est accordé quand un lien que vous avez partagé obtient 300 clics. Merci de poster un lien fascinant qui a conduit la conversation vers l'avant et a illuminé la discussion !
+        Ce badge est accordé quand un lien que vous avez partagé obtient 300 clics. Merci de publier un lien fascinant qui a fait avancer la conversation et a éclairé la discussion !
     famous_link:
       name: Lien célèbre
       description: A posté un lien externe avec 1000 clic
@@ -3828,7 +4178,7 @@ fr:
         Ce badge est accordé quand un lien que vous avez partagé obtient 1000 clics. Whaou ! Vous avez posté un lien qui a notablement amélioré la discussion en ajoutant des détails et des informations essentielles. Bon travail !
     appreciated:
       name: Apprécié
-      description: A recu 1 J'aime sur 20 messages
+      description: A reçu 1 J'aime sur 20 messages
       long_description: |
         Ce badge est accordé lorsque vous recevez au moins un J'aime sur 20 messages différents. La communauté apprécie vos contributions aux conversations !
     respected:
@@ -3858,7 +4208,7 @@ fr:
         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
+      description: A 20 messages ayant reçu un J'aime et a donné 10 J'aime
       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:
@@ -3869,12 +4219,13 @@ fr:
     empathetic:
       name: Empathique
       description: A 500 messages ayant reçu un J'aime et a donné 1000 J'aime
-      long_description: "Ce badge est accordé quand vous avez reçu 500 J'aime et en avez donné 1000 ou plus en retour. Whaou ! Vous êtes un modèle de générosité et d'amour mutuel :two_hearts:. \n"
-    first_emoji:
-      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 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:
+        Ce badge est accordé quand vous avez reçu 500 J'aime et en avez donné 1000 ou plus en retour. Whaou ! Vous êtes un modèle de générosité et d'amour mutuel :two_hearts:.
+    first_emoji:
+      name: Premier émoji
+      description: A utilisé un émoji dans un message
+      long_description: |
+        Ce badge est accordé la première fois que vous ajoutez un émoji à votre message :thumbsup:. Les émojis 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 Émoji 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
@@ -3897,17 +4248,17 @@ fr:
         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é
-      description: Visité 10 jours consécutifs
+      description: A visité 10 jours consécutifs
       long_description: |
         Ce badge est décerné pour avoir visité 10 jours consécutifs. Merci d'être resté avec nous pendant plus d'une semaine !
     aficionado:
       name: Aficionado
-      description: Visité 100 jours consécutifs
+      description: A visité 100 jours consécutifs
       long_description: |
         Ce badge est décerné pour avoir visité 100 jours consécutifs. C'est plus de trois mois !
     devotee:
       name: Adepte
-      description: Visité 365 jours consécutifs
+      description: A 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: "Badge %{display_name} sur %{site_title}"
@@ -3923,6 +4274,8 @@ fr:
     initial_topic_title: Rapports de performances du site
   tags:
     title: "Étiquettes"
+    restricted_tag_disallowed: 'Vous ne pouvez pas ajouter l''étiquette « %{tag} ».'
+    restricted_tag_remove_disallowed: 'Vous ne pouvez pas supprimer l''étiquette « %{tag} ».'
     minimum_required_tags:
       one: "Vous devez choisir au moins %{count} étiquette."
       other: "Vous devez choisir au moins %{count} étiquettes."
@@ -3938,8 +4291,8 @@ fr:
       synonym: 'Les synonymes ne sont pas autorisés. Utilisez « %{tag_name} ».'
       has_synonyms: 'L''étiquette « %{tag_name} » ne peut pas être utilisée car elle a des synonymes.'
     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}."
+      one: "Vous devez inclure au moins %{count} étiquette %{tag_group_name}. Les étiquettes associées à ce groupe sont : %{tags}"
+      other: "Vous devez inclure au moins %{count} étiquettes %{tag_group_name}. Les étiquettes associées à ce groupe sont : %{tags}"
     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}"
@@ -3980,7 +4333,7 @@ fr:
             label: "Nom de votre communauté"
             placeholder: "Le repaire de Jeanne"
           site_description:
-            label: "Dévrivez votre communauté en une courte phrase"
+            label: "Décrivez votre communauté en une courte phrase"
             placeholder: "Un endroit de discussion pour Jeanne et ses amis"
           short_site_description:
             label: "Décrivez votre communauté en quelques mots"
@@ -3993,9 +4346,10 @@ fr:
             label: "Sujet de bienvenue"
             description: "<p>Comment décririez-vous votre communauté à un inconnu en environ 1 minute ?</p> <ul> <li>Pour qui sont destinées ces discussions ?</li> <li>Que puis-je trouver ici ?</li> <li>Pourquoi dois-je la visiter ?</li> </ul> <p>Votre sujet de bienvenue est la première chose que les nouveaux visiteurs vont voir. Voyez le comme votre <b>unique paragraphe</b> qui définit votre mission et différence. </p>"
             one_paragraph: "Veuillez restreindre votre message de bienvenue à un paragraphe."
+            extra_description: "Si vous n'êtes pas sûr, vous pouvez ignorer cette étape et modifier votre sujet de bienvenue ultérieurement."
       privacy:
         title: "Accès"
-        description: "<p>Votre communauté est-elle ouverte à tous ou restreinte par adhésion, invitation et approbation ? Si vous préférez, vous pouvez préparer le site en mode privé puis passer en public par la suite.</p> "
+        description: "<p>Votre communauté est-elle ouverte à tous ou restreinte par adhésion, invitation et approbation ? Si vous préférez, vous pouvez préparer le site en mode privé puis passer en public par la suite.</p>"
         fields:
           privacy:
             choices:
@@ -4006,7 +4360,7 @@ fr:
                 label: "Privé"
                 description: "Seuls les utilisateurs connectés peuvent accéder à cette communauté"
           privacy_options:
-            description: "Comment est-ce que les nouveaux utilisateurs s'inscrivent pour un compte ?"
+            description: "Comment les nouveaux utilisateurs peuvent-ils créer un compte ?"
             choices:
               open:
                 label: "Les utilisateurs peuvent s'inscrire eux-mêmes."
@@ -4020,14 +4374,14 @@ fr:
           contact_email:
             label: "Courriel"
             placeholder: "nom@exemple.com"
-            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."
+            description: "Adresse courriel de la personne ou groupe responsable de cette communauté. Elle est utilisée pour des notifications critiques comme des signalements non traité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"
             placeholder: "https://www.exemple.com/contacter-nous"
             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."
+            description: "Tous les messages directs émis par Discourse, tels que les signalements, ou les notifications de sauvegarde, seront envoyés par cet utilisateur."
       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 passer cette étape pour l'instant."
@@ -4041,9 +4395,15 @@ fr:
           city_for_disputes:
             label: "Ville pour les litiges"
             placeholder: "San Francisco, Californie"
+      colors:
+        title: "Couleurs"
       fonts:
         title: "Polices"
         fields:
+          body_font:
+            label: "Police de contenu"
+          heading_font:
+            label: "Police de titre"
           font_preview:
             label: "Aperçu"
       logos:
@@ -4060,10 +4420,10 @@ fr:
         fields:
           favicon:
             label: "Icône du navigateur"
-            description: "L'image d'icône utilisée pour représenter votre site dans les navigateurs Web présente bien dans les petites tailles. Les extensions d’image recommandées sont PNG ou JPG. Nous utiliserons le logo carré par défaut."
+            description: "L'image d'icône utilisée pour représenter votre site dans les navigateurs Web et qui s'affiche correctement en petites tailles. Les extensions d'image recommandées sont PNG ou JPG. Nous utiliserons le logo carré par défaut."
           large_icon:
             label: "Grande icône"
-            description: "Icône d’image utilisée pour représenter votre site sur des appareils modernes, de bonne qualité pour les grandes tailles. Idéalement plus grand que 512 × 512. Nous utiliserons le logo carré par défaut."
+            description: "Icône d’image utilisée pour représenter votre site sur des appareils modernes et qui s'affiche correctement en grandes tailles. Idéalement plus grand que 512 × 512. Nous utiliserons le logo carré par défaut."
       homepage:
         description: "Nous recommandons d'afficher les sujets récents sur votre page d'accueil mais vous pouvez choisir d'y afficher les catégories (groupes de sujets) si vous préférez."
         title: "Page d'accueil"
@@ -4084,15 +4444,16 @@ fr:
                 label: "Boîtes catégories"
               categories_boxes_with_topics:
                 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 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 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."
+        disabled: "Étant 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 l'envie vous prenait de changer ces réglages, vous pourriez <b>exécuter cet assistant à tout moment</b>, ou consulter <a href='%{base_path}/admin' target='_blank'>l'espace d'administration</a>; vous le trouverez à côté de l'icône en forme de clé anglaise dans le menu principal du site.</p>
+          <p>Personnaliser davantage votre forum Discourse est facile grâce à son puissant système de thèmes. Vous pouvez notamment jeter un œil aux <a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">thèmes et composants les plus appréciés</a> sur <a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a>.</p>
+          <p>Nous vous souhaitons des moments agréables et une bonne chance dans le <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>lancement de votre nouvelle communauté !</a></p>
   search_logs:
     graph_title: "Nombre de recherches"
   joined: "Inscrit"
@@ -4122,7 +4483,8 @@ fr:
       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."
+    already_handled: "Merci, mais nous avons déjà examiné ce message et avons décidé d'approuver sa publication."
+    already_handled_and_user_not_exist: "Merci, mais cet élément a déjà été examiné entre-temps, et l'utilisateur concerné n'est plus inscrit."
     priorities:
       low: "Basse"
       medium: "Moyenne"
@@ -4140,9 +4502,9 @@ fr:
       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`."
       new_topics_unless_trust_level: "Les sujets d'utilisateurs dont le niveau de confiance est bas doivent être approuvées par un responsable. Voir `approve_new_topics_unless_trust_level`."
-      fast_typer: "Un nouvel utilisateur a tapé son premier message avec une rapidité suspecte, un comportement suspect de bot ou de spammeur. Voir `min_first_post_typing_time`."
-      auto_silence_regexp: "Nouvel utilisateur dont le premier message correspond au paramètre `auto_silence_first_post_regex`."
-      watched_word: "Ce message comprenait un mot surveillé. Voir votre <a href='%{base_url}/admin/logs/watched_words'>liste de mots surveillés</a> ."
+      fast_typer: "Le nouvel utilisateur a écrit son premier message avec une rapidité suspecte, un comportement typique des robots et spammeurs. Voir `min_first_post_typing_time`."
+      auto_silence_regexp: "Nouvel utilisateur dont le premier message correspond à la règle `auto_silence_first_post_regex`."
+      watched_word: "Ce message contient un Mot Surveillé. Vous pouvez consulter la <a href='%{base_url}/admin/customize/watched_words'>liste des mots surveillés</a>."
       staged: "Les nouveaux sujets et messages des utilisateurs distants doivent être approuvés par un responsable. Voir `approve_unless_staged`."
       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`."
@@ -4150,6 +4512,8 @@ fr:
       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`."
+      contains_media: "Ce message contient un média intégré. Voir `review_media_unless_trust_level`."
+      queued_by_staff: "Un responsable a estimé que ce message devait être examiné avant sa publication. Il restera masqué jusqu'à son approbation par un modérateur."
     actions:
       agree:
         title: "Accepter…"
@@ -4219,10 +4583,21 @@ fr:
           description: "L'utilisateur sera supprimé et nous bloquerons ses adresses courriel et IP."
       reject:
         title: "Rejeter"
+        bundle_title: "Refuser…"
+      reject_and_suspend:
+        title: "Refuser et Suspendre cet utilisateur"
+      reject_and_silence:
+        title: "Refuser et Mettre en Sourdine cet utilisateur"
+      reject_and_delete:
+        title: "Refuser et Supprimer ce message"
+      reject_and_keep_deleted:
+        title: "Laisser ce message à l'état supprimé"
+      approve_and_restore:
+        title: "Autoriser et Restaurer ce message"
       delete_user:
         title: "Supprimer l'utilisateur"
         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"
+        reason: "Supprimé via la file des messages en attente d'examen"
   email_style:
     html_missing_placeholder: "Le modèle HTML doit inclure %{placeholder}"
   notification_level:
@@ -4240,6 +4615,12 @@ fr:
       %{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.
+  create_linked_topic:
+    topic_title_with_sequence:
+      one: "%{topic_title} (partie %{count})"
+      other: "%{topic_title} (partie %{count})"
+    post_raw: "Suite de la discussion de %{parent_url}.\n\nDiscussions précédentes :\n\n%{previous_topics}"
+    small_action_post_raw: "Continuer la discussion sur %{new_title}."
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index 48694bf542..2d800436fc 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -39,131 +39,140 @@ gl:
   title: "Discourse"
   topics: "Temas"
   posts: "publicacións"
+  views: "visualizacións"
   loading: "Cargando"
-  powered_by_html: 'Con tecnoloxía de <a href="https://www.discourse.org">Discourse</a>, vese mellor con Java habilitado'
-  sign_up: "Rexistrarse"
-  log_in: "Iniciar sesión"
+  powered_by_html: 'Con tecnoloxía de <a href="https://www.discourse.org">Discourse</a>, vese mellor con Java activado'
+  sign_up: "Crear conta"
+  log_in: "Acceder"
   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."
+  disable_remote_images_download_reason: "Desactivouse a descarga remota de imaxes por non haber espazo abondo 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."
+  redirect_warning: "Non puidemos verificar que a ligazón que seleccionou está publicada agora mesmo no foro. Se quere continuar igualmente, seleccione a seguinte ligazón."
   on_another_topic: "Noutro tema"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} de %{username}"
   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"
+    other_error: "Xurdiu un problema ao actualizar o tema"
+    ember_selector_error: "Desculpe: non se permite o uso de selectores CSS #ember ou .ember-view, porque estes nomes xéranse dinamicamente no tempo de execución e cambiarán co paso do tempo, resultando finalmente en CSS rotos. Probe cun selector diferente."
     compile_error:
       unrecognized_extension: "Extensión de ficheiro non recoñecida: %{extension}"
     import_error:
-      about_json: "Erro importante: about.json non existe ou non é válido. Seguro que este é un tema de Discourse?"
+      generic: Produciuse un erro ao importar este tema
+      about_json: "Erro de importación: about.json non existe ou non é válido. Confirma que este é un tema de Discourse?"
       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"
+      modifier_values: "os modificadores about.json conteñen valores non válidos: %{errors}"
+      git: "Erro ao clonar o repositorio git; o acceso está denegado ou non foi posíbel atopar 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."
+      file_too_big: "O ficheiro descomprimido é grande de máis."
+      unknown_file_type: "O ficheiro que cargou 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ñentes 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.
+      no_multilevels_components: "Os temas con temas secundarios non poden ser temas secundarios eles mesmos"
+      optimized_link: As ligazóns de imaxe optimizadas son efémeras e non deberían 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"
+      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."
+      default_out_range: "O valor por defecto do axuste `%{name}` non está no intervalo 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: "O novo valor non está dentro do intervalo 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_min: "Debe ter polo 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:
-      default_subject: "Este tema necesita un título"
+      default_subject: "Este tema precisa 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."
+      maximum_staged_user_per_email_reached: "Alcanzouse o número máximo de usuarios transitorios creados por correo electrónico."
       no_subject: "(sen asunto)"
       no_body: "(sen mensaxe)"
-      missing_attachment: "(falta o ficheiro anexo %{filename})"
+      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'. "
-        auto_generated_email_error: "Sucede cando a cabeceira de \"precedencia\" está establecida en: listaxe, lixo, en masa ou auto-resposta, ou cando algunha outra cabeceira contén: auto-enviado, auto-respondido ou auto-xerado. "
-        no_body_detected_error: "Sucede cando non puidemos extraer o corpo da mensaxe e non hai ficheiros anexos."
-        no_sender_detected_error: "Sucede cando non puidemos atopar un enderezo de correo electrónico válido na cabeceira De."
+        no_message_id_error: "Sucede cando o correo electrónico non ten a cabeceira de «Id da mensaxe»."
+        auto_generated_email_error: "Sucede cando a cabeceira de \"precedencia\" está estabelecida en: listaxe, lixo, en masa ou auto-resposta, ou cando algunha outra cabeceira contén: auto-enviado, auto-respondido ou auto-xerado."
+        no_body_detected_error: "Sucede cando non se puido extraer o corpo da mensaxe e non hai ficheiros anexos."
+        no_sender_detected_error: "Sucede cando non se puido atopar un enderezo electrónico válido na cabeceira De."
         from_reply_by_address_error: "Sucede cando a cabeceira De coincide coa resposta vía correo electrónico."
         inactive_user_error: "Sucede cando o remitente non está activo."
-        silenced_user_error: "Sucede cando o destinatario foi silenciado."
+        silenced_user_error: "Sucede cando o remitente 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."
+        reply_user_not_matching_error: "Sucede cando unha resposta procede dun 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 xa se eliminou."
+        topic_closed_error: "Sucede cando entra unha resposta pero o tema relacionado xa se pechou."
         bounced_email_error: "O correo electrónico é un informe dun correo devolto."
-        screened_email_error: "Sucede cando o enderezo electrónico do destinatario xa foi bloqueado. "
+        screened_email_error: "Sucede cando o enderezo electrónico do remitente xa foi examinado."
         unsubscribe_not_allowed: "Sucede cando a este usuario non se lle permite cancelar a subscrición vía correo electrónico."
         email_not_allowed: "Sucede cando o enderezo electrónico non está na listaxe de elementos permitidos ou está na de bloqueados."
       unrecognized_error: "Erro non recoñecido"
-    secure_media_placeholder: "Redactado: este sitio ten habilitados elementos multimedia seguros; visita o tema ou preme en Ver contido multimedia para ver o contido multimedia anexado."
+    secure_media_placeholder: "Redactado: este sitio ten activados elementos multimedia seguros; visite o tema ou prema en Ver contido multimedia para ver o contido multimedia anexado."
     view_redacted_media: "Ver contido multimedia"
   errors: &errors
     format: ! "%{attribute} %{message}"
     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"
+      too_long_validation: "límite de %{max} caracteres; inseriu %{length}."
+      invalid_boolean: "Booleano non válido."
       taken: "xa está en uso"
       accepted: debe ser aceptado
       blank: non pode quedar en branco
       present: debe quedar en branco
-      confirmation: ! " non coincide con %{attribute}"
+      confirmation: ! "non coincide con %{attribute}"
       empty: non pode quedar en branco
       equal_to: debe ser igual a %{count}
       even: debe ser par
       exclusion: está reservado
       greater_than: debe ser maior que %{count}
       greater_than_or_equal_to: debe ser igual ou maior que %{count}
-      has_already_been_used: "xa está en uso"
-      inclusion: no está incluído na listaxe
+      has_already_been_used: "xa se está usando"
+      inclusion: non está incluído na listaxe
       invalid: non é válido
       is_invalid: "parece pouco claro, é unha oración completa?"
+      is_invalid_meaningful: "parece pouco claro, a maioría das palabras conteñen as mesmas letras unha e outra vez?"
+      is_invalid_unpretentious: "parece pouco claro, unha ou varias palabras son moi longas?"
+      is_invalid_quiet: "parece pouco claro, quería escribilo TODO EN MAIÚSCULAS?"
       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 que %{count}
       less_than_or_equal_to: debe ser igual ou menor que %{count}
       not_a_number: non é un número
-      not_an_integer: debe ser un enteiro
+      not_an_integer: debe ser un número enteiro
       odd: debe ser impar
       record_invalid: ! "Erro na 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 é posible eliminalo porque existe outro %{record} dependente"
-        many: "Non é posible eliminalo porque existen outros %{record} dependentes"
+        one: "Non se pode eliminar porque existe outro %{record} dependente"
+        many: "Non se pode eliminar porque existen outros %{record} dependentes"
       too_long:
-        one: é demasiado longo (o máximo é %{count}caracter)
-        other: é demasiado longo (o máximo son %{count} caracteres)
+        one: é longo de máis (o máximo é %{count}caracter)
+        other: é longo de máis (o máximo son %{count} caracteres)
       too_short:
-        one: é demasiado curto (o mínimo é %{count} caracter)
-        other: é demasiado curto (o mínimo son %{count} caracteres)
+        one: é curto de máis (o mínimo é %{count} caracter)
+        other: é curto de máis (o mínimo son %{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."
+      auth_overrides_username: "O nome de usuario ten que actualizarse do lado do fornecedor de autenticación, dado que o axuste «auth_overrides_username» está activado."
     template:
       body: ! "Producíronse problemas cos seguintes campos:"
       header:
@@ -172,72 +181,101 @@ gl:
     embed:
       load_from_remote: "Produciuse un erro ao cargar esta publicación."
     site_settings:
-      invalid_category_id: "Especificaches unha categoría que non existe"
+      invalid_category_id: "Especificou 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'."
-      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>'
+        one: "Especificou a opción non válida %{name}"
+        other: "Especificou opcións non válidas %{name}"
+      default_categories_already_selected: "Non pode seleccionar unha categoría utilizada noutra listaxe."
+      default_tags_already_selected: "Non pode seleccionar unha etiqueta utilizada noutra listaxe."
+      s3_upload_bucket_is_required: "Non se poden activar as cargas a S3 a menos que proporcione un valor 's3_upload_bucket'."
+      enable_s3_uploads_is_required: "Non se pode activar o inventario a S3 a menos que active as cargas en S3."
+      page_publishing_requirements: "A publicación de páxinas non se pode activar se está activados multimedia seguros."
+      s3_backup_requires_s3_settings: "Non se pode utilizar S3 como localización da copia de seguranza a menos que proporcionara '%{setting_name}'."
+      s3_bucket_reused: "Non pode utilizar o mesmo contedor (bucket) para 's3_upload_bucket' e 's3_backup_bucket'. Elixa un contedor diferente ou utilice un camiño distinto para cada un deles."
+      secure_media_requirements: "Débese activar a carga de S3 antes de habilitar multimedia seguros."
+      share_quote_facebook_requirements: "Debe definir un ID de aplicación de Facebook para activar o reparto de cota para Facebook."
+      second_factor_cannot_enforce_with_socials: "Non pode forzar 2FA tendo o activo o inicio de sesión con redes sociais. Primeiro debe desactivar o inicio de sesión con: %{auth_provider_names}"
+      second_factor_cannot_be_enforced_with_disabled_local_login: "Non pode aplicar 2FA se os inicios de sesión locais están desactivados."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "Non pode forzar 2FA se DiscourseConnect está activado."
+      local_login_cannot_be_disabled_if_second_factor_enforced: "Non pode desactivar o inicio de sesión local se se aplica 2FA. Deshabilite 2FA antes de deshabilitar os inicios de sesión locais."
+      cannot_enable_s3_uploads_when_s3_enabled_globally: "Non pode activar as cargas S3 porque xa están habilitadas globalmente e habilitar este nivel de sitio podería provocar problemas moi graves coas cargas"
+      cors_origins_should_not_have_trailing_slash: "Non debe engadir a barra final (/) ás orixes de CORS."
+    conflicting_google_user_id: 'O ID de conta de Google desta conta cambiou; requírese a intervención do equipo por razóns de seguranza. Contacte con el e envíelle esta referencia <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+    onebox:
+      invalid_address: "Sentímolo, non se puido xerar unha visualización desta páxina web porque non se puido atopar o servidor «%{hostname}». En lugar dunha visualización previa, só aparecerá unha ligazón na súa publicación. :cry:"
+      error_response: "Sentímolo, non se puido xerar unha visualización desta páxina web porque o servidor devolveu un código de erro %{status_code}. En lugar dunha visualización previa, só aparecerá unha ligazón na súa publicación. :cry:"
+      missing_data:
+        one: "Sentímolo, non se puido xerar unha visualización desta páxina web porque a seguinte etiqueta oEmbed / OpenGraph non se puido atopar: %{missing_attributes}"
+        other: "Sentímolo, non se puido xerar unha visualización desta páxina web porque as seguintes etiquetas oEmbed / OpenGraph non se puideron atopar: %{missing_attributes}."
+  word_connector:
+    comma: ", "
   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."
-    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>"
-    cant_invite_to_group: "Non tes permitido convidar a usuarios a grupo(s) específico(s). Asegúrate de seres o propietario do(s) grupo(s) ao que estás tentando convidar."
+    expired: "O seu token de invitación expirou. <a href='%{base_url}/about'>Contacte co equipo</a>."
+    not_found: "O seu token de invitación non é válido. <a href='%{base_url}/about'>Contacte co noso equipo</a>."
+    not_found_json: "O seu token de invitación non é válido. Contacte co noso equipo."
+    not_matching_email: "O seu enderezo de correo e o enderezo de correo asociado co token de convite non coinciden. Póñase en contacto co persoal."
+    not_found_template: |
+      <p>A súa invitación a<a href="%{base_url}">%{site_name}</a>xa se devolveu</p>
+
+      <p>Se lembra o seu contrasinal, pode<a href="%{base_url}/login">iniciar sesión</a></p>
+
+      <p>Se non, <a href="%{base_url}/password-reset">restableza o contrasinal</a></p>
+    user_exists: "Non necesita 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ámoslle un correo de activación ao seu enderezo electrónico. Siga as instrucións para activar a súa conta.</p><p>Se non lle chegan, comprobe o cartafol de correo lixo.</p>"
+    cant_invite_to_group: "Non ten permisos para convidar a usuarios a grupo(s) específico(s). Asegúrese de ser o propietario do(s) grupo(s) a que está tentando convidar."
+    disabled_errors:
+      discourse_connect_enabled: "Os convites están desactivados porque está activado DiscourseConnect"
+      invalid_access: "Non ten permiso para ver o recurso solicitado."
   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."
+    file_should_be_csv: "O ficheiro que se carga debe ter o formato CSV."
+    max_rows: "As primeiras %{max_bulk_invites} invitacións xa foron enviadas. Tente dividir o ficheiro en partes máis pequenas."
+    error: "Houbo un erro ao cargar o ficheiro. Ténteo máis tarde."
   invite_link:
+    email_taken: "Este enderezo de correo xa está en uso. Se xa ten unha conta, inicie sesión ou restableza 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."
+    muted_invitee: "Sentímolo, ese usuario silenciouno."
+    muted_topic: "Sentímolo, ese usuario silenciou este tema."
+    receiver_does_not_allow_pm: "Sentímolo, ese usuario non lle permite enviarlles mensaxes privadas."
+    sender_does_not_allow_pm: "Sentímolo, vostede non permite que ese usuario lle envíe mensaxes privadas."
   backup:
-    operation_already_running: "Estase a executar unha operación. Nestes intres non se pode iniciar un novo traballo."
+    operation_already_running: "Estase a executar unha operación. Nestes intres non se pode comezar 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."
+    not_enough_space_on_disk: "Non hai espazo abondo no disco para cargar a copia de seguranza."
+    invalid_filename: "O nome do ficheiro de copia de seguranza contén caracteres non válidos. Os caracteres que se admiten son a-z 0-9 . - _."
+    file_exists: "O ficheiro que está 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."
+  invalid_params: "Proporcionou parámetros non válidos para a solicitude: %{message}"
+  not_logged_in: "Debe iniciar sesión para facer iso."
   not_found: "Non foi posible atopar o recurso ou o URL solicitado."
-  invalid_access: "Non tes permiso para 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."
+  invalid_access: "Non ten permiso para ver o recurso solicitado."
+  authenticator_not_found: "O método de autenticación non existe ou foi desactivado."
+  invalid_api_credentials: "Non ten permiso para ver o recurso solicitado. O nome de usuario da API ou a chave non son válidas."
+  provider_not_enabled: "Non ten permiso para ver o recurso solicitado. O provedor de autenticación non está activado."
+  provider_not_found: "Non ten 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."
-  invalid_grant_badge_reason_link: "A ligazón externa ou non válida a Discourse non está permitida como motivo da insignia."
-  email_template_cant_be_modified: "Este modelo de correo electrónico non pode ser modificado."
-  invalid_whisper_access: "Ou bisbar non está habilitado ou non o tes permitido facer."
+  invalid_grant_badge_reason_link: "A ligazón externa ou non válida a Discourse non está permitida como motivo da insignia"
+  email_template_cant_be_modified: "Este modelo de correo electrónico non pode ser modificado"
+  invalid_whisper_access: "Ou bisbar non está activado ou non o ten permitido facer"
   not_in_group:
-    title_category: "Debes estar no grupo para ver esta categoría."
+    title_topic: "Debe solicitar a incorporación ao grupo «%{group}» para ver este tema."
+    title_category: "Debe 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."
+  deleted_topic: "Oopa! Este tema foi eliminado e xa non está dispoñible."
+  delete_topic_failed: "Houbo un erro ao eliminar este tema. Contacte co administrador do sitio."
   reading_time: "Tempo de lectura"
-  likes: "Gústames"
+  likes: "Gústame"
   too_many_replies:
-    one: "Sentímolo, mais os novos usuarios teñen temporalmente o límite de %{count} respostas no mesmo tema."
+    one: "Sentímolo, mais os novos usuarios teñen temporalmente un límite de %{count} resposta 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."
+    one: "Non se permiten respostas consecutivas. Edite a súa resposta anterior ou agarde a que alguén lle responda."
+    other: "Non se permiten máis de %{count} respostas consecutivas. Edite a súa resposta anterior ou agarde a que alguén lle responda."
   embed:
     start_discussion: "Comezar discusión"
     continue: "Continuar discusión"
@@ -252,26 +290,26 @@ gl:
       other: "%{count} respostas máis"
     loading: "Cargando discusión..."
     permalink: "Ligazón permanente"
-    imported_from: "Este é un tema de discusión derivado da entrada %{link}"
+    imported_from: "Este é un tema de discusión complementario da entrada %{link}"
     in_reply_to: "▶ %{username}"
     replies:
       one: "%{count} resposta"
       other: "%{count} repostas"
     likes:
       one: "%{count} gústame"
-      other: "%{count} gústames"
+      other: "%{count} gústame"
     last_reply: "Última resposta"
     created: "Creado"
     new_topic: "Crear novo tema"
-  no_mentions_allowed: "Sentímolo, mais non podes mencionar outros usuarios."
+  no_mentions_allowed: "Sentímolo, mais non pode 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."
+    one: "Sentímolo, pero só pode mencionar un outro usuario nunha publicación."
+    other: "Sentímolo, mais non pode 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_embedded_media_allowed_trust: "Non podes inserir elementos multimedia nunha publicación."
+  no_embedded_media_allowed_trust: "Non pode inserir elementos multimedia nunha publicación."
   no_embedded_media_allowed: "Os novos usuarios non poden inserir elementos multimedia nas publicacións."
   too_many_embedded_media:
     one: "Os novos usuarios só poden inserir un elemento multimedia nunha publicación."
@@ -281,22 +319,24 @@ gl:
     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."
+  links_require_trust: "Sentímolo, non pode incluír ligazóns nas sú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."
+  contains_blocked_word: "A súa publicación contén unha palabra que non está permitida: %{word}"
+  contains_blocked_words: "A súa publicación contén varias palabras que non están permitidas: %{words}"
+  spamming_host: "Sentímolo, non pode publicar unha ligazón a ese servidor."
   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?"
+  topic_not_found: "Algo foi mal. Talvez este tema se pechou ou se eliminou mentres o estaba a consultar?"
   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."
+  max_pm_recipients: "Sentímolo, pode enviarlle mensaxes a un máximo de %{recipients_limit} destinatarios."
+  pm_reached_recipients_limit: "Sentímolo, non pode ter máis de %{recipients_limit} destinatarios nunha mensaxe."
+  removed_direct_reply_full_quotes: "Cita de toda a publicación anterior retirada automaticamente."
+  watched_words_auto_tag: "Tema etiquetado automaticamente"
+  secure_upload_not_allowed_in_public_topic: "Sentímolo, a(s) seguinte(s) carga(s) segura(s) non pode(n) ser utilizada(s) nun tema público: %{upload_filenames}."
+  create_pm_on_existing_topic: "Sentímolo, non pode crear unha mensaxe privada nun tema existente."
+  slow_mode_enabled: "Este tema está en modo lento."
+  just_posted_that: "é moi semellante ao que xa publicou hai pouco"
   invalid_characters: "contén caracteres non válidos"
   is_invalid: "parece pouco claro, é unha oración completa?"
   next_page: "páxina seguinte →"
@@ -304,7 +344,7 @@ gl:
   page_num: "Páxina %{num}"
   home_title: "Inicio"
   topics_in_category: "Temas na categoría '%{category}'"
-  rss_posts_in_topic: "Fonte RSS feed de '%{topic}'"
+  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"
@@ -313,7 +353,7 @@ gl:
     one: "%{count} participante"
     other: "%{count} participantes"
   read_full_topic: "Ler todo o tema"
-  private_message_abbrev: "Msx."
+  private_message_abbrev: "Msx"
   rss_description:
     latest: "Últimos temas"
     top: "Temas destacados"
@@ -332,15 +372,15 @@ gl:
     tag: "Temas etiquetados"
     badge: "%{display_name} insignia en %{site_title}"
   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."
+  edit_conflict: "Esta publicación foi editada por outro usuario e os cambios que vostede fixo non se poden gardar."
+  revert_version_same: "A versión actual é a mesma ca aquela á que intenta 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"
+      already_bookmarked_post: "Non pode gardar a mesma publicación nos marcadores dúas veces."
+      cannot_set_past_reminder: "Non pode estabelecer un recordatorio de marcador no pasado."
+      cannot_set_reminder_in_distant_future: "Non pode estabelecer un recordatorio de marcador máis de 10 anos cara ao futuro."
+      time_must_be_provided: "débese facilitar o período para todos os recordatorios"
     reminders:
       at_desktop: "A vindeira vez que estea no meu ordenador"
       later_today: "Hoxe, máis tarde"
@@ -352,21 +392,26 @@ gl:
   groups:
     success:
       bulk_add:
-        one: "%{count} usuario foi engadido ao grupo."
-        other: "%{count} usuarios foron engadidos ao grupo."
+        one: "Engadiuse %{count} usuario ao grupo."
+        other: "Engadíronse %{count} usuarios 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"
+      can_not_modify_automatic: "Non pode 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. "
-      adding_too_many_users: "Máximo de %{limit} usuarios que poden ser engadidos á vez"
+      email_already_used_in_group: "O grupo '%{group_name}' xa está usando '%{email}'."
+      email_already_used_in_category: "A categoría '%{category_name}' xa está usando '%{email}'."
+      cant_allow_membership_requests: "Non pode admitir solicitudes de ser membros para grupos que carecen de propietario."
+      already_requested_membership: "Xa solicitou ser membro deste grupo."
+      adding_too_many_users:
+        one: "Pódese engadir un máximo de %{count} usuario á vez"
+        other: "Pódese engadir un máximo de %{count} usuarios á vez"
+      usernames_or_emails_required: "Os nomes de usuario ou enderezos de correos deben estar presentes"
+      no_invites_with_discourse_connect: "Só pode convidar a usuarios rexistrados cando DiscourseConnect estea activado"
+      no_invites_without_local_logins: "Só pode convidar a usuarios rexistrados cando o rexistro local está desactivado"
     default_names:
       everyone: "todos"
       admins: "administradores"
@@ -380,74 +425,82 @@ gl:
     request_membership_pm:
       title: "Solicitude de ser membro para @%{group_name}"
     request_accepted_pm:
-      title: "Aceptouse a túa solicitude para  @%{group_name}"
+      title: "Aceptouse a súa solicitude para @%{group_name}"
       body: |
-        A túa solicitude para entrar no grupo @%{group_name} foi aceptada e agora xa es membro.
+        A súa solicitude para entrar no grupo @%{group_name} foi aceptada, así que agora xa é membro.
   education:
     until_posts:
       one: "%{count} publicación"
       other: "%{count} publicacións"
     "new-topic": |
-      Benvido/a a %{site_name} &mdash; **grazas por iniciares unha nova conversa!**
+      Dámoslle a benvida a %{site_name} &mdash; , **grazas por comezar unha nova conversa!**
 
-      - Se o les en voz alta, soa ben o seu título? É un bo resumo do que trata?
+      - Soa ben o seu título, se o le en voz alta? Resume ben o contido?
 
-      - Quen terá interese por ler isto? Por que é importante? A que tipo de respostas queres dar pé?
+      - A quen lle interesaría ler isto? Por que é importante? Que tipo de respostas busca?
 
-      - 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.
+      - Inclúa palabras de uso frecuente no seu tema para facilitar que poida ser *atopado*. Para agrupalo con outros temas relacionados, seleccione unha categoría (ou etiqueta).
 
-      Para máis información, [visita as directrices da nosa comunidade](%{base_path}/directrices). Este panel só aparecerá nas túas %{education_posts_text} primeiras publicacións.
+      Para saber máis, [visite as normas da nosa comunidade](%{base_path}/guidelines). Este panel só lle aparecerá na primeira conversa %{education_posts_text}.
     "new-reply": |
-      Benvido/a a %{site_name} &mdash; **grazas pola túa contribución!**
+      Dámoslle a benvida a %{site_name} &mdash; **grazas por contribuír!**
 
-      - Dalgún xeito a túa resposta mellora a conversa?
+      - Sexa amábel cos outros membros da comunidade.
 
-      - Sé amable cos demais membros da comunidade.
+      - A súa resposta mellora a conversa?
 
-      - A crítica construtiva é benvida, mais lembra criticar as ideas non as persoas.
+      - A crítica construtiva é benvida pero critique as *ideas*, non as persoas.
 
-      Para máis información, [visita as directrices da nosa comunidade](%{base_path}/directrices). Este panel só aparecerá nas túas %{education_posts_text} primeiras publicacións.
+      Para saber máis, [consulte as nosas normas da comunidade] (%{base_path}/guidelines). Este panel só lle aparecerá nas súas primeiras conversas %{education_posts_text}.
     avatar: |
-      ### Que tal se lle engades unha imaxe á túa conta?
+      ### E se lle engade unha imaxe á súa conta?
 
-      Xa publicaches uns cantos temas e respostas, mais a túa imaxe de perfil non é única coma ti; é simplemente unha letra.
+      Xa publicou uns cantos temas e respostas, mais a súa imaxe de perfil non é única coma vostede; é simplemente unha letra.
 
-      Pensaches na posibilidade de **[visitar o teu perfil de usuario](%{profile_path})** e subir unha imaxe que te represente?
+      Pensou en **[visitar o seu perfil de usuario](%{profile_path})** e subir unha imaxe que o 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
+      ### Valore a posibilidade de responder varias publicacións 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.
+      No canto de publicar varias respostas seguidas nun mesmo tema, pense 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.
+      Pode editar a súa resposta e engadir unha cita seleccionando o texto e premendo no botón <b>citar resposta</b> que aparece.
 
       É máis sinxelo para a comunidade ler temas con menos respostas, pero con máis contido, que moitas respostas pequenas e individuais.
     dominating_topic: |
-      ### Permite que máis xente se una á conversa
+      ### Permita que máis xente se una á conversa
 
-      Parece claro que este tema che importa &ndash; publicaches máis do %{percent}% das respostas.
+      Está claro que este tema lle importa &ndash; publicou 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?
+      Aínda podería ser mellor se lles dese espazo a outras persoas para compartiren o seu punto de vista. Que tal se as convida?
+    get_a_room: |
+      ###Anime a todos a participar na conversa
+
+      Respondeu %{count} veces a @%{reply_username} neste tema en particular!
+
+      Unha gran discusión inclúe moitas voces e perspectivas. Pode atraer a alguén máis?
+
+      E non o esqueza, se quere continuar a conversa en extenso con este usuario en particular fóra da vista pública, [envíelle unha mensaxe persoal] (%{base_path}/u/%{reply_username}).
     too_many_replies: |
-      ### Alcanzaches o límite de respostas para este tema.
+      ### Alcanzou 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.
+      No canto de engadir unha outra resposta, pense na posibilidade de editar algunhas das anteriores ou visitar outros temas.
     reviving_old_topic: |
-      ### Queres revivir este tema?
+      ### Quere 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.
+      A última resposta que ten é de hai **%{time_ago}**. A sú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?
+      Confirma que quere continuar con esta antiga conversa?
   activerecord:
     attributes:
       category:
         name: "Nome da categoría"
       topic:
         title: "Título"
-        featured_link: "Ligazón destacada"
+        featured_link: "Ligazón salientada"
         category_id: "Categoría"
       post:
         raw: "Mensaxe"
@@ -458,35 +511,37 @@ gl:
         topic:
           attributes:
             base:
-              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."
+              warning_requires_pm: "Só pode enviar advertencias en mensaxes privadas."
+              too_many_users: "Só pode enviar advertencias a un usuario de cada vez."
+              cant_send_pm: "Sentímolo, non pode enviarlle unha mensaxe privada a este usuario."
+              no_user_selected: "Debe seleccionar un usuario válido."
+              reply_by_email_disabled: "A resposta vía correo electrónico está desactivada."
+              send_to_email_disabled: "Sentímolo, non pode enviarlle unha mensaxe privada a este usuario."
+              target_user_not_found: "Non se atopou un dos usuarios aos que lles envía esta mensaxe."
               unable_to_update: "Produciuse un erro ao actualizar este tema."
+              unable_to_tag: "Produciuse un erro etiquetando o tema."
             featured_link:
-              invalid: "non é válido. Un URL debe incluír http:// or https://."
+              invalid: "non é válido. Un URL debe incluír http:// ou https://."
               invalid_category: "non se pode editar nesta categoría."
         user:
           attributes:
             password:
-              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."
+              common: "é un dos 10000 contrasinais máis habituais. Utilice un máis seguro."
+              same_as_username: "é igual ca o seu nome de usuario. Utilice un contrasinal máis seguro."
+              same_as_email: "é igual ca o seu correo electrónico. Utilice un contrasinal máis seguro."
+              same_as_current: "é igual ca o seu contrasinal actual."
+              same_as_name: "é igual ca o seu nome."
+              unique_characters: "ten demasiados caracteres repetidos. Utilice un contrasinal máis seguro."
             username:
-              same_as_password: "é igual ao teu contrasinal."
+              same_as_password: "é igual ca o seu contrasinal."
             name:
-              same_as_password: "é igual ao teu contrasinal."
+              same_as_password: "é igual ca o seu 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."
+              invalid: "Este tema non pode ser salientada no seu perfil."
         user_email:
           attributes:
             user_id:
@@ -501,15 +556,18 @@ gl:
         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."
+              invalid: "O URL non é válido. Debería incluír http:// ou https://. Non está permitido ningún espazo en branco."
         custom_emoji:
           attributes:
             name:
-              taken: xa está en uso por outro emoji
+              taken: xa está sendo usado por outro emoji
         topic_timer:
           attributes:
             execute_at:
               in_the_past: "debe ser no futuro."
+            duration_minutes:
+              cannot_be_zero: "debe ser maior que 0"
+              exceeds_maximum: "non pode ser ter máis de 20 anos."
         translation_overrides:
           attributes:
             value:
@@ -525,14 +583,14 @@ gl:
   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 visibles unicamente para administradores e moderadores."
+  staff_category_description: "Categoría privada para discusións do equipo. Os temas son visíbeis unicamente para administradores e moderadores."
   discourse_welcome_topic:
-    title: "Benvido/a a Discourse"
+    title: "Dámoslle a benvida 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!
+      O primeiro parágrafo deste tema pegado será visible como mensaxe de benvida para todos os novos visitantes na súa páxina de inicio. É, pois, importante!
 
-      **Edita isto** e describe brevemente a túa comunidade:
+      **Edite isto** e describa brevemente a súa comunidade:
 
       - Para quen é?
       - Que van poder atopar aquí?
@@ -541,46 +599,46 @@ gl:
 
       <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.
+      Quizais queira pechar este tema a través do administrador :wrench: (na parte superior dereita ou na parte inferior) para que as respostas non se acumulen no anuncio.
   lounge_welcome:
-    title: "Benvido/a á Sala VIP"
+    title: "Dámoslle a benvida á Sala VIP"
     body: |2
 
       Parabéns! :confetti_ball:
 
-      Se podes ver este tema é porque fuches promovido recentemente a usuario **habitual** (nivel de confianza 3).
+      Se pode ver este tema é porque hai pouco que foi promovido a usuario **habitual** (nivel de confianza 3).
 
-      Agora podes &hellip;
+      Agora pode &hellip;
 
       * Editar o título de calquera tema
       * Cambiar a categoría de calquera tema
-      * As túas ligazóns ([deixarán automaticamente de levar a etiqueta nofollow](https://en.wikipedia.org/wiki/Nofollow))
-      * Acceder á categoría privada Sala VIP só visible para usuarios cun nivel de confianza 3 ou superior
-      * Agochar o correo elixo cunha soa denuncia
+      * As súas ligazóns serán fiábeis (retirarase [a etiqueta nofollow](https://en.wikipedia.org/wiki/Nofollow))
+      * Acceder á categoría privada Sala VIP só visíbel para usuarios cun nivel de confianza 3 ou superior
+      * Agochar o lixo cunha soa alerta
 
-      Consulta aquí a [listaxe actual de usuarios habituais](%{base_path}/badges/3/regular). Asegúrate de saudares.
+      Consulte aquí a [listaxe actual de usuarios habituais](%{base_path}/badges/3/regular). Asegúrese de saudar.
 
-      Grazas por seres parte importante da comunidade!
+      Grazas por ser parte importante da comunidade!
 
-      (Para máis información sobre os niveis de confianza, [mira este tema][trust]. Repara en que só os membros que continúen cumprindo os requirimentos ao longo do tempo seguirán considerándose habituais.)
+      (Para máis información sobre os niveis de confianza, [mire este tema][trust]. Repare en que só os membros que continúen cumprindo os requirimentos ao longo do tempo seguirán considerándose habituais.)
 
       [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
-  admin_quick_start_title: "LER PRIMEIRO: Guía rápida de inicio para administradores"
+  admin_quick_start_title: "LER PRIMEIRO: Guía de comezo rápido para administradores"
   category:
     topic_prefix: "Acerca da 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"
+    replace_paragraph: "(Substitúa este parágrafo cunha breve descrición da súa nova categoría. Este texto aparecerá na área de selección de categoría, así que procure que non supere os 200 caracteres.)"
+    post_template: "%{replace_paragraph}\n\nUtilice os seguintes parágrafos para unha descrición máis detallada ou para estabelecer 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- Que a distingue exactamente 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!"
+      not_found: "Non foi posíbel atopar a categoría!"
       uncategorized_parent: "Sen categoría non pode ter unha categoría principal"
       self_parent: "A categoría principal dunha subcategoría non pode ser ela mesma"
-      depth: "Non podes aniñar unha subcategoría dentro doutra"
+      depth: "Non pode 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}'"
+      email_already_used_in_group: "'%{email}' xa está sendo usado polo grupo '%{group_name}'."
+      email_already_used_in_category: "'%{email}' xa está sendo usado pola categoría '%{category_name}'."
+      description_incomplete: "A publicación que contén a descrición da categoría debe ter a polo menos un parágrafo."
+      permission_conflict: "Calquera grupo que teña acceso a unha subcategoría debe telo 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 etiquetas 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."
@@ -601,31 +659,19 @@ gl:
       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."
+    change_failed_explanation: "Tratou 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 quere rebaixarlle o nivel, primeiro bloquee o seu nivel de confianza"
   post:
     image_placeholder:
       broken: "Esta imaxe está rota"
     has_likes:
       one: "%{count} gústame"
-      other: "%{count} gústames"
+      other: "%{count} gústame"
   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."
+    slow_down: "Executou esta acción demasiadas veces, ténteo máis tarde."
+    too_many_requests: "Executou esta acción demasiadas veces. Agarde %{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."
+      live_post_counts: "Está a solicitar o número de mensaxes rápido de máis. Agarde %{time_left} antes de volvelo tentar."
+      unsubscribe_via_email: "Alcanzou o número máximo de baixas en subscricións por correo electrónico. Agarde %{time_left} antes de volvelo tentar."
     hours:
       one: "%{count} hora"
       other: "%{count} horas"
@@ -638,40 +684,40 @@ gl:
     short_time: "uns poucos segundos"
   datetime:
     distance_in_words:
-      half_a_minute: "< 1m"
+      half_a_minute: "< 1 m"
       less_than_x_seconds:
-        one: "< %{count}s"
-        other: "< %{count}s"
+        one: "< %{count} s"
+        other: "< %{count} s"
       x_seconds:
-        one: "%{count}s"
-        other: "%{count}s"
+        one: "%{count} s"
+        other: "%{count} s"
       less_than_x_minutes:
-        one: "< %{count}m"
-        other: "< %{count}m"
+        one: "< %{count} m"
+        other: "< %{count} m"
       x_minutes:
-        one: "%{count}m"
-        other: "%{count}m"
+        one: "%{count} m"
+        other: "%{count} m"
       about_x_hours:
-        one: "%{count}h"
-        other: "%{count}h"
+        one: "%{count} h"
+        other: "%{count} h"
       x_days:
-        one: "%{count}d"
-        other: "%{count}d"
+        one: "%{count} d"
+        other: "%{count} d"
       about_x_months:
-        one: "%{count}mes"
-        other: "%{count}meses"
+        one: "%{count} mes"
+        other: "%{count} meses"
       x_months:
-        one: "%{count}mes"
-        other: "%{count}meses"
+        one: "%{count} mes"
+        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} ano"
+        other: "> %{count} anos"
       almost_x_years:
-        one: "%{count}ano"
-        other: "%{count}anos"
+        one: "%{count} ano"
+        other: "%{count} anos"
     distance_in_words_verbose:
       half_a_minute: "agora mesmiño"
       less_than_x_seconds: "agora mesmiño"
@@ -706,16 +752,16 @@ gl:
         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."
+    no_token: "Sentímolo, esa ligazón de cambio de contrasinal é antiga de máis. Prema no botón Iniciar sesión e déalle 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: "Establecer o contrasinal"
-    title: "Contrasinal restablecido"
-    success: "Cambiaches satisfactoriamente o teu contrasinal e agora iniciaches sesión."
-    success_unapproved: "Cambiaches satisfactoriamente o teu contrasinal."
+    update: "Actualizar o contrasinal"
+    save: "Estabelecer o contrasinal"
+    title: "Restabelecer contrasinal"
+    success: "Cambiou correctamente o seu contrasinal e agora iniciou sesión."
+    success_unapproved: "Cambiou correctamente o seu 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."
+    invalid_token: "Sentímolo, a ligazón para iniciar sesión a través do correo electrónico é antiga de máis. Prema no botón Iniciar sesión e déalle a «Esquecín o meu contrasinal» para obter unha nova."
     title: "Iniciar sesión vía correo electrónico"
   user_auth_tokens:
     browser:
@@ -729,7 +775,7 @@ gl:
       unknown: "navegador descoñecido"
     device:
       android: "Dispositivo Android"
-      chromebook: "Chromebook"
+      chromebook: "SO Chrome"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -740,48 +786,48 @@ gl:
       unknown: "dispositivo descoñecido"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "SO Chrome"
       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."
+    wrong_account_error: "Iniciou sesión cunha conta incorrecta; saia e vólvao tentar."
+    confirmed: "O seu enderezo electrónico foi actualizado."
     please_continue: "Continuar a %{site_name}"
-    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?"
+    error: "Produciuse un erro ao cambiar o enderezo electrónico. Estarase usando xa ese enderezo?"
+    doesnt_exist: "Este enderezo electrónico non está asociado coa súa conta."
+    error_staged: "Produciuse un erro ao cambiar o enderezo electrónico. O enderezo xa está sendo usado por un usuario transitorio."
+    already_done: "Sentímolo, a ligazón de confirmación xa non está dispoñible. Cambiaría xa o seu correo electrónico?"
     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:"
+      title: "Confirme o seu novo correo electrónico"
+      description: "Confirme que quere cambiar o seu enderezo electrónico a:"
+      description_add: "Confirme que quere 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}"
+      title: "Cambiar o seu enderezo electrónico"
+      description: "Confirme o seu cambio de enderezo electrónico"
+      description_add: "Confirme que quere engadir un enderezo electrónico alternativo:"
+      old_email: "Correo 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!"
+      almost_done_description: "Enviámoslle unha mensaxe ao seu novo enderezo electrónico para confirmar o cambio!"
   associated_accounts:
-    revoke_failed: "Erro ao revogar a túa conta con %{provider_name}."
+    revoke_failed: "Erro ao revogar a súa conta con %{provider_name}."
     connected: "(conectadas)"
   activation:
-    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."
+    action: "Prema aquí para activar a súa conta"
+    already_done: "Sentímolo, esta ligazón de confirmación da conta xa non está dispoñible. Estará xa a súa conta activada?"
+    please_continue: "A súa nova conta está confirmada; redirixirémolo á 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."
+    welcome_to: "Dámoslle a benvida a %{site_name}!"
+    approval_required: "Un moderador debe aprobar manualmente a súa nova conta antes de que poida acceder a este foro. Recibirá un correo electrónico cando a súa conta sexa aprobada!"
+    missing_session: "Non podemos detectar se se creou a súa conta; asegúrese de ter os rastros activados."
     activated: "Sentímolo, esta conta xa foi activada."
     admin_confirm:
-      title: "Confirmar conta de administrador"
-      description: "Confirmas que queres converter a <b>%{target_username} (%{target_email})</b> en administrador?"
+      title: "Confirmar Conta de administrador"
+      description: "Confirma que quere 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}"
@@ -802,23 +848,23 @@ gl:
     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">directrices da nosa comunidade</a>.'
-      short_description: 'Unha violación das<a href="%{base_path}/guidelines">directrices da nosa comunidade</a> '
+      short_description: 'Unha violación das <a href="%{base_path}/guidelines">directrices da nosa comunidade</a>'
     notify_user:
-      title: "Enviar unha mensaxe a @%{username}"
+      title: "Enviarlle 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."
-      email_title: 'A túa publicación en "%{title}"'
+      email_title: 'A sú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 responsables do sitio por unha razón non listada arriba."
+      description: "Esta publicación require a atención dos equipo por unha razón non indicada arriba."
       short_description: "Require a atención do equipo por outro motivo"
-      email_title: 'Unha publicación en «%{title}» require a atención dos responsables do sitio'
+      email_title: 'Unha publicación en «%{title}» require a atención do equipo'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: "Marcador"
       description: "Engadir esta publicación aos marcadores"
-      short_description: "Engadir esta publicación a marcadores"
+      short_description: "Engadir esta publicación aos marcadores"
     like:
       title: "Gústame"
       description: "Gústame esta publicación"
@@ -826,61 +872,62 @@ gl:
   draft:
     sequence_conflict_error:
       title: "erro no borrador"
-      description: "O borrador está a ser editado noutra xanela. Volve cargar esta páxina."
+      description: "O borrador está a ser editado noutra xanela. Volva cargar esta páxina."
   draft_backup:
-    pm_title: "Borradores de apoio de temas en curso"
-    pm_body: "O tema contén borradores de copia de seguranza"
+    pm_title: "Borradores de seguranza procedentes de temas en curso"
+    pm_body: "O tema contén borradores de seguranza"
   user_activity:
     no_default:
-      self: "Aínda non tes actividade."
+      self: "Aínda non ten 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"
+      self: "Non ten publicacións engadidas aos marcadores; os marcadores permítenlle volver rapidamente a publicacións específicas."
+      search: "Non se atoparon marcadores coa busca fornecida."
+      others: "Sen marcadores."
     no_likes_given:
-      self: "Non lle deches Gústame a ningunha publicación."
-      others: "Ningún gústame en publicacións."
+      self: "Non premeu en Gústame en ningunha publicación."
+      others: "Ningún Gústame en publicacións."
     no_replies:
-      self: "Non respondiches a ningunha publicación."
+      self: "Non respondeu 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."
+      self: "Non ten borradores; comece a 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."
-      challenge_mismatch_error: "O desafío proporcionado non coincide co desafío xerado polo servidor de autenticación."
+      challenge_mismatch_error: "O desafío proporcionado non coincide co desafío que xerou o servidor de autenticación."
       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."
       invalid_relying_party_id_error: "A ID do usuario de confianza na solicitude de autenticación non coincide coa ID do usuario de confianza do servidor."
       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_public_key_algorithm_error: "O algoritmo de chave pública facilitado non é compatible co servidor."
       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."
+      public_key_error: "Produciuse un erro ao verificar a chave pública da credencial."
+      ownership_error: "A chave de seguranza non pertence ao usuario."
+      not_found_error: "Non se atopou ningunha chave de seguranza coa ID da credencial facilitada."
+      unknown_cose_algorithm_error: "Non se recoñece o algoritmo utilizado para a chave de seguranza."
   topic_flag_types:
     spam:
       title: "Correo lixo"
-      description: "Este tema é publicidade. Non é util nin relevante para este sitio; a súa natureza é de carácter promocional."
+      description: "Este tema é publicidade. Non é util nin relevante para este sitio; ten carácter promocional."
       long_form: "denunciou isto como correo lixo"
       short_description: "Isto é publicidade"
     inappropriate:
       title: "Inapropiado"
       description: 'Este tema ten contido que unha persoa razoable podería considerar ofensivo, abusivo ou supor unha violación das <a href="%{base_path}/guidelines">directrices da nosa comunidade</a>.'
       long_form: "denunciou isto como inapropiado"
-      short_description: 'Unha violación das<a href="%{base_path}/guidelines">directrices da nosa comunidade</a> '
+      short_description: 'Unha violación das <a href="%{base_path}/guidelines">directrices da nosa 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">directrices</a>, <a href="%{tos_url}">os termos de servizo</a> ou por calquera outro motivo non listado enriba.'
-      long_form: "denunciou isto para ser atendido polos moderadores"
+      long_form: "denunciou isto para que sexa estudado polos moderadores"
       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>"
+    you_must_edit: '<p>A súa publicación foi denunciada pola comunidade. Por favor, <a href="%{path}">revise as súas mensaxes</a>.</p>'
+    user_must_edit: "<p>Esta publicación foi denunciada pola comunidade e permanecerá oculta temporalmente.</p>"
   ignored:
     hidden_content: "<p>Contido ignorado</p>"
   archetypes:
@@ -889,13 +936,13 @@ gl:
     banner:
       title: "Tema da cabeceira"
       message:
-        make: "Este tema agora está na cabeceira. Aparecerá na parte superior de cada páxina ata que sexa descartado polo usuario."
-        remove: "Este tema xa non é máis tema cabeceira. Xa non aparecerá na parte superior de cada páxina."
+        make: "Este tema está agora na cabeceira. Aparecerá na parte superior de cada páxina ata que sexa descartado polo usuario."
+        remove: "Este tema deixou de ser tema de cabeceira. Xa non aparecerá na parte superior de cada páxina."
   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."
+    description: "as preferencias para <b>%{email}</b> foron actualizadas. Para cambiar a configuración do seu correo electrónico <a href='%{url}'>visite as súas preferencias de usuario</a>."
+    topic_description: "Para volver subscribirse a%{link}, utilice o control de notificacións na parte inferior ou á dereita do tema."
+    private_topic_description: "Para volver subscribirse, utilice o control de notificacións na parte inferior ou á dereita do tema."
   uploads:
     marked_insecure_from_theme_component_reason: "subida utilizada no compoñente do tema"
   unsubscribe:
@@ -903,16 +950,16 @@ gl:
     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?"
+    mailing_list_mode: "Desactivar o modo de listaxe de correo"
+    all: "Non me envíe ningún correo electrónico de %{sitename}"
+    different_user_description: "Actualmente ten a sesión iniciada cun usuario diferente ao que lle enviamos un correo electrónico. Saia, ou entre en modo anónimo, e vólvao tentar."
+    not_found_description: "Non puidemos atopar a cancelación da subscrición. Será porque a ligazón de que dispón é vella de máis ou xa expiraría?"
     log_out: "Saír da sesión"
     submit: "Gardar preferencias"
     digest_frequency:
-      title: "Estás a recibir correos electrónicos de resumo %{frequency}"
-      never_title: "Non estás a recibir correos electrónicos de resumo"
-      select_title: "Establecer a frecuencia dos correos electrónicos resumo:"
+      title: "Está a recibir correos electrónicos de resumo %{frequency}"
+      never_title: "Non está a recibir correos electrónicos de resumo"
+      select_title: "Estabelecer a frecuencia dos correos electrónicos de resumo:"
       never: "nunca"
       every_30_minutes: "cada 30 minutos"
       every_hour: "cada hora"
@@ -925,26 +972,27 @@ gl:
     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?'
+    description: '"%{application_name}" está a solicitar o seguinte acceso á súa conta:'
+    instructions: 'Acabamos de xerar unha nova chave API de usuario para que utilice con "%{application_name}"; pegue a seguinte chave na súa aplicación:'
+    otp_description: 'Gustaríalle darlle permiso a "%{application_name}" para 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."
+    no_trust_level: "Sentímolo, non ten 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."
+      read: "Lelo todo"
+      write: "Escribilo todo"
+      one_time_password: "Crear un token de inicio de sesión dun só uso"
+      bookmarks_calendar: "Ler recordatorios de marcadores"
+    invalid_public_key: "Sentímolo, a chave pública non é válida."
+    invalid_auth_redirect: "Sentímolo, este servidor auth_redirect non está permitido."
+    invalid_token: "Token non válido, caducado ou ausente."
   flags:
     errors:
       already_handled: "A denuncia xa foi atendida"
@@ -961,29 +1009,33 @@ gl:
         post: Publicación
         editor: Editor
         author: Autor
-        edit_reason: Razón
-      description: "Número de edicións de novas publicacións"
+        edit_reason: Motivo
+      description: "Número de edicións de novas publicacións."
     user_flagging_ratio:
       title: "Porcentaxe de denuncias do usuario"
       labels:
         user: Usuario
-        ignored_flags: Denuncias ignoradas
+        agreed_flags: Alertas con acordo
+        disagreed_flags: Alertas en desacordo
+        ignored_flags: Alertas ignoradas
         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)."
+      description: "Listaxe de usuarios ordenada segundo a porcentaxe de respostas do equipo ás súas alertas (en desacordo ou con acordo)."
     moderators_activity:
       title: "Actividade do moderador"
       labels:
         moderator: Moderador
-        flag_count: Marcas revisadas
+        flag_count: Alertas 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.
+      description: Listaxe da actividade de moderación que inclúe as alertas revisadas, o tempo de lectura, os temas creados, as mensaxes privadas e as revisións.
     flags_status:
-      title: "Estado das denuncias"
+      title: "Estado das alertas"
       values:
+        agreed: Con acordo
+        disagreed: En desacordo
         deferred: Descartadas
         no_action: Sen acción
       labels:
@@ -992,12 +1044,12 @@ gl:
         poster: Autor
         flagger: Denunciante
         time_to_resolution: Tempo de resolución
-      description: "Listaxe do estado das denuncias que inclúe o tipo de denuncia, o usuario denunciado e o denunciante e o tempo de resolución. "
+      description: "Listaxe do estado das alertas que inclúe o tipo de alerta, o usuario denunciado, o denunciante e o 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"
+      description: "Número de todas as visitas do usuario."
     signups:
       title: "Rexistros"
       xaxis: "Día"
@@ -1016,20 +1068,20 @@ gl:
         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"
+      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"
+        page_view_logged_in: "Usuarios con sesión iniciada"
       yaxis: "Día"
-      description: "Visualizacións de páxinas para usuarios conectados, anónimos e rastrexadores."
+      description: "Visualizacións de páxinas para usuarios con sesión iniciada, anónimos e rastrexadores."
       labels:
         post: Publicación
         editor: Editor
         author: Autor
-        edit_reason: Razón
+        edit_reason: Motivo
     dau_by_mau:
       title: "UAD/UAM"
       xaxis: "Día"
@@ -1039,7 +1091,7 @@ gl:
       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."
+      description: "Número de usuarios que lle premeron en Gústame ou publicaron no último día."
     profile_views:
       title: "Visualizacións dos perfís de usuario"
       xaxis: "Día"
@@ -1056,15 +1108,15 @@ gl:
       yaxis: "Número de novas publicacións"
       description: "Novas publicacións creadas durante este período"
     likes:
-      title: "Gústames"
+      title: "Gústame"
       xaxis: "Día"
-      yaxis: "Número de novos gústames"
-      description: "Número de novos gústames."
+      yaxis: "Número de novos gústame"
+      description: "Número de novos gústame."
     flags:
-      title: "Denuncias"
+      title: "Alertas"
       xaxis: "Día"
-      yaxis: "Número de denuncias"
-      description: "Número de novas denuncias."
+      yaxis: "Número de alertas"
+      description: "Número de novas alertas."
     bookmarks:
       title: "Marcadores"
       xaxis: "Día"
@@ -1095,18 +1147,18 @@ gl:
       labels:
         term: Termo
         searches: Buscas
-        click_through: CTR
+        click_through: (CTR) taxa de clics
       description: "Termos de busca máis populares coa súa taxa de clics."
     emails:
       title: "Correos electrónicos enviados"
       xaxis: "Día"
-      yaxis: "Número de correos electrónicos enviados"
-      description: "Número de novos correos electrónicos enviados"
+      yaxis: "Número de correos electrónicos"
+      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"
+      description: "Número de mensaxes persoais iniciadas recentemente."
     user_to_user_private_messages_with_replies:
       title: "Usuario a usuario (con respostas)"
       xaxis: "Día"
@@ -1118,20 +1170,20 @@ gl:
       yaxis: "Número de mensaxes"
       description: "Número de mensaxes persoais enviadas automaticamente polo sistema."
     moderator_warning_private_messages:
-      title: "Avisos do moderador"
+      title: "Advertencia do moderador"
       xaxis: "Día"
       yaxis: "Número de mensaxes"
-      description: "Número de avisos enviados a través de mensaxes persoais polos moderadores."
+      description: "Número de advertencias enviados polos moderadores a través de mensaxes persoais."
     notify_moderators_private_messages:
       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."
+      description: "Número de veces que os moderadores foron notificados por privado dunha alerta."
     notify_user_private_messages:
-      title: "Notificacións a usuarios"
+      title: "Notificar aos usuarios"
       xaxis: "Día"
       yaxis: "Número de mensaxes"
-      description: "Número de veces que os usuarios foron notificados por privado dunha denuncia."
+      description: "Número de veces que os usuarios foron notificados por privado dunha alerta."
     top_referrers:
       title: "Referenciadores populares"
       xaxis: "Usuario"
@@ -1143,7 +1195,7 @@ gl:
         num_topics: "Temas"
       description: "Usuarios listados polo número de clics nas ligazóns que compartiron."
     top_traffic_sources:
-      title: "Maiores fontes de tráfico"
+      title: "Fontes con máis tráfico"
       xaxis: "Dominio"
       num_clicks: "Clics"
       num_topics: "Temas"
@@ -1152,7 +1204,7 @@ gl:
         domain: Dominio
         num_clicks: Clics
         num_topics: Temas
-      description: "Fontes externas que mais ligaron con este sitio."
+      description: "Fontes externas que máis ligaron con este sitio."
     top_referred_topics:
       title: "Temas con máis referencias"
       labels:
@@ -1163,16 +1215,16 @@ gl:
       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."
+      description: "Número de novas visualizacións de páxinas por parte de visitantes sen sesión iniciada."
     page_view_logged_in_reqs:
       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."
+      description: "Número de novas visualizacións de páxinas por parte de usuarios con sesión iniciada."
     page_view_crawler_reqs:
-      title: "Visualizacións de páxina por rastrexadores web"
+      title: "Visualizacións de páxina desde rastrexadores web"
       xaxis: "Día"
-      yaxis: "Visualizacións de páxina por rastrexadores web"
+      yaxis: "Visualizacións de páxina desde rastrexadores web"
       description: "Total de visualizacións desde rastrexadores web ao longo do tempo."
     page_view_total_reqs:
       title: "Visualizacións de páxinas"
@@ -1182,13 +1234,13 @@ gl:
     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."
+      yaxis: "Visualizacións de páxina coa sesión iniciada desde un móbil"
+      description: "Número de novas visualizacións de páxina por parte 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."
+      description: "Número de novas visualizacións de páxina por parte de visitantes desde un dispositivo móbil sen a sesión iniciada."
     http_background_reqs:
       title: "Fondo"
       xaxis: "Día"
@@ -1229,9 +1281,9 @@ gl:
       yaxis: "Número de visitas"
       description: "Número de usuarios únicos que utilizaron un dispositivo móbil."
     web_crawlers:
-      title: "Agentes de usuario de rastrexadores web"
+      title: "Axentes de usuario de rastrexadores web"
       labels:
-        user_agent: "Axentes de usuario"
+        user_agent: "Axente de usuario"
         page_views: "Visualizacións de páxinas"
       description: "Listaxe dos axentes de usuario dos rastrexadores web, ordenados por visualizacións de páxina."
     suspicious_logins:
@@ -1253,6 +1305,7 @@ gl:
         login_at: Inicio de sesión ás
       description: "Listaxe de inicios de sesión dos administradores coa súa localización."
     top_uploads:
+      title: "Cargas importantes"
       labels:
         filename: Nome do ficheiro
         extension: Extensión
@@ -1267,294 +1320,344 @@ gl:
         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."
-    s3_config_warning: 'O servidor está configurado para subir ficheiros a S3, pero ao menos un dos seguintes axustes non esta definido: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile ou s3_upload_bucket. 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/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Revisa esta guía para saber máis</a>.'
-    s3_backup_config_warning: 'O servidor está configurado para subir copias de seguranza a S3, pero ao menos un dos seguintes axustes non esta definido: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile ou s3_upload_bucket. 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/how-to-set-up-image-uploads-to-s3/7229" 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>.'
+    rails_env_warning: "O seu servidor está a executarse en modo %{env}."
+    host_names_warning: "O ficheiro config/database.yml está a usar o nome do servidor predeterminado. Actualíceo para utilizar o nome do servidor do seu sitio."
+    sidekiq_warning: 'Sidekiq non está a funcionar. Moitas tarefas, como o envío de correos electrónicos, sidekiq está a realizaas de forma asíncrona. Asegúrese de que, polo menos un proceso de sidekiq está en execución. <a href="https://github.com/mperham/sidekiq" target="_blank">Aprenda máis sobre Sidekiq aquí</a>.'
+    queue_size_warning: "O número de tarefas na cola é de %{queue_size}, que é unha cifra alta. Isto pode indicar un problema co(s) proceso(s) de Sidekiq ou ten que engadir máis traballadores de Sidekiq."
+    memory_warning: "O seu servidor está a funcionar con menos de 1 GB de memoria total. Recoméndase polo menos unha memoria de 1 GB."
+    google_oauth2_config_warning: 'O servidor está configurado para permitir o rexistro e o inicio de sesión con Google OAuth2 (enable_google_oauth2_logins) pero o id do cliente e os valores secretos de cliente non están definidos. Vaia a <a href="%{base_path}/admin/site_settings">Configuración do sitio</a> e actualice a configuración. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Consulte esta guía para saber máis</a>.'
+    facebook_config_warning: 'O servidor está configurado para permitir o rexistro e o inicio de sesión con Facebook (enable_facebook_logins) pero o id da aplicación e os valores secretos da aplicación non están definidos. Vaia a <a href="%{base_path}/admin/site_settings">Configuración do sitio</a> e actualice a configuración. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Consulte esta guía para saber máis</a>.'
+    twitter_config_warning: 'O servidor está configurado para permitir o rexistro e o inicio de sesión con Twitter (enable_twitter_logins), pero a clave e os valores secretos non están definidos. Vaia a <a href="%{base_path}/admin/site_settings">Configuración do sitio</a> e actualice a configuración. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Consulte esta guía para saber máis</a>.'
+    github_config_warning: 'O servidor está configurado para permitir o rexistro e o inicio de sesión con GitHub (enable_github_logins), pero o id do cliente e os valores secretos non están definidos. Vaia a <a href="%{base_path}/admin/site_settings">Configuración do sitio</a> e actualice a configuración. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Consulte esta guía para saber máis</a>.'
+    s3_config_warning: 'O servidor está configurado para subir ficheiros a S3, pero polo menos un dos seguintes axustes non esta definido: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile ou s3_upload_bucket. Vaia a <a href="%{base_path}/admin/site_settings">Axustes do sitio</a> e actualice a configuración. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Revise esta guía para saber máis</a>.'
+    s3_backup_config_warning: 'O servidor está configurado para subir copias de seguranza a S3, pero polo menos un dos seguintes axustes non esta definido: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile ou s3_upload_bucket. Vaia a <a href="%{base_path}/admin/site_settings">Axustes do sitio</a> e actualice a configuración. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Revise esta guía para saber máis</a>.'
+    s3_cdn_warning: 'O servidor está configurado para cargar ficheiros en S3, pero non hai ningún CDN S3 configurado. Isto pode supoñer elevados custos de S3 e un rendemento do sitio máis lento. <a href="https://meta.discourse.org/t/-/148916" target="_blank">Vexa «Usar o almacenamento de obxectos para cargas» para saber máis</a>.'
+    image_magick_warning: 'O servidor está configurado para crear miniaturas de imaxes grandes, pero ImageMagick non está instalado. Instáleo utilizando o administrador de paquetes que lle guste ou <a href="https://www.imagemagick.org/script/download.php" target="_blank"> descargue a última versión</a>.'
+    failing_emails_warning: 'Hai %{num_failed_jobs} procesos de correo electrónico que fallaron. Comprobe o seu app.yml e asegúrese de que a configuración do servidor de correo é correcta. <a href="%{base_path}/sidekiq/retries" target="_blank">Revise os procesos 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."
     email_polling_errored_recently:
-      one: "A sondaxe do correo electrónico xerou  un erro nas últimas 24 horas. Revisa <a href='%{base_path}/logs' target='_blank'>os rexistros</a> para máis detalles."
-      other: "A sondaxe do correo electrónico xerou %{count} erros nas últimas 24 horas. Revisa <a href='%{base_path}/logs' target='_blank'>os rexistros</a> para máis detalles."
-    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>."
-    deprecated_api_usage: "Detectamos unha solicitude de API utilizando un método de autenticación obsoleto. Actualíceo para utilizar unha autenticación <a href='https://meta.discourse.org/t/-/22706'>baseada nunha cabeceira</a>. Despois da actualización, esta mensaxe pode tardar 24 horas en desaparecer. "
-    update_mail_receiver: "Detectamos unha versión desactualizada do receptor de correo. Preme <a href='https://meta.discourse.org/t/-/133491'>aquí</a> para actualizar as instrucións. Despois da actualización, esta mensaxe pode tardar 24 horas en desaparecer."
-    poll_pop3_timeout: "A conexión ao servidor POP3 está a superar o tempo de espera. Non se puido recuperar o correo electrónico entrante. Comproba os teus <a href='%{base_path}/admin/site_settings/category/email'>axustes POP3</a> e o provedor do servizo."
-    poll_pop3_auth_error: "A conexión ao servidor POP3 está a fallar por un erro na autenticación. Comproba os teus <a href='%{base_path}/admin/site_settings/category/email'>axustes POP3</a>."
-    force_https_warning: "O teu sitio web está a utilizar SSL, pero `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` non está aínda habilitado nos axuste do teu sitio."
+      one: "A recollida de correo electrónico xerou un erro nas últimas 24 horas. Revise <a href='%{base_path}/logs' target='_blank'>os rexistros</a> para máis detalles."
+      other: "A recollida de correo electrónico xerou %{count} erros nas últimas 24 horas. Revise <a href='%{base_path}/logs' target='_blank'>os rexistros</a> para máis detalles."
+    missing_mailgun_api_key: "O servidor está configurado para enviar correos electrónicos a través de Mailgun, pero non proporcionou unha chave API que se utiliza para verificar as mensaxes de webhook."
+    bad_favicon_url: "Erro ao cargar a favicona. Comprobe a configuración de icona de páxina en <a href='%{base_path}/admin/site_settings'>Configuración do sitio</a>."
+    poll_pop3_timeout: "A conexión ao servidor POP3 está a superar o tempo de espera. Non se puido recuperar o correo electrónico entrante. Comprobe os seus <a href='%{base_path}/admin/site_settings/category/email'>axustes POP3</a> e o provedor do servizo."
+    poll_pop3_auth_error: "A conexión ao servidor POP3 está a fallar por un erro na autenticación. Comprobe os seus <a href='%{base_path}/admin/site_settings/category/email'>axustes POP3</a>."
+    force_https_warning: "O seu sitio web está a utilizar SSL, pero `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` non está aínda activado nos seus axustes de sitio."
     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:"
-    watched_word_regexp_error: "A expresión regular para %{action} as palabras vistas non é válida. Comproba a <a href='%{base_path}/admin/logs/watched_words'>Cconfiguración das palabras vistas</a> ou desactiva a opción de 'expresións regulares para palabras vistas'. "
   site_settings:
-    display_local_time_in_user_card: "Mostrar a hora local con base no fuso horario do usuario cando se abre a túa tarxeta."
+    display_local_time_in_user_card: "Amosar a hora local con base no fuso horario do usuario cando se abre a súa tarxeta."
     censored_words: "As palabras serán automaticamente substituídas por &#9632;&#9632;&#9632;&#9632;"
-    delete_old_hidden_posts: "Eliminar automaticamente as publicacións ocultas durante máis de 30 días."
-    default_locale: "O idioma por defecto desta instancia de Discourse. Podes substituír o texto das categorías e dos temas xerados en <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Personalizar / Texto</a>."
-    allow_user_locale: "Permitir aos usuarios escoller o idioma da interface da súa preferencia"
+    delete_old_hidden_posts: "Eliminar automaticamente as publicacións ocultas máis de 30 días."
+    default_locale: "O idioma predefinido desta instancia de Discourse. Pode substituír o texto das categorías e dos temas xerados en <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Personalizar / Texto</a>."
+    allow_user_locale: "Permite que os usuarios escollan o idioma de interface que prefiran"
     set_locale_from_accept_language_header: "definir o idioma da interface para usuarios anónimos a partir das cabeceiras de idioma do seu navegador"
     support_mixed_text_direction: "Admite direccións mixtas de texto de esquerda a dereita e de dereita a esquerda."
     min_post_length: "Extensión mínima das publicacións en número de caracteres"
-    min_first_post_length: "Extensión mínima na primeira publicación (corpo do tema) en número de caracteres"
+    min_first_post_length: "Extensión mínima da primeira publicación (corpo do tema) en número de caracteres"
     min_personal_message_post_length: "Número mínimo de caracteres permitido para unha mensaxe"
     max_post_length: "Extensión máxima das publicacións en número de caracteres"
     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."
+    show_topic_featured_link_in_digest: "Mostrar a ligazón salientada do tema no correo electrónico de resumo."
+    min_topic_views_for_delete_confirm: "Cantidade mínima de vistas que debe ter un tema para que apareza unha xanela emerxente de confirmación cando se elimina"
     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_prefer_recent_posts: "Se a busca no foro é lenta, esta opción proba primeiro nun índice daquelas publicacións máis recentes"
+    search_tokenize_chinese_japanese_korean: "Forzar a busca para tokenizar chinés/xaponés/coreano incluso en sitios que non sexan CXC"
+    search_prefer_recent_posts: "Se a busca no foro é lenta, esta opción proba primeiro nun índice das publicacións máis recentes"
     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."
-    category_search_priority_very_low_weight: "Peso aplicado para a ordenación de categorías con prioridade moi baixa."
     category_search_priority_low_weight: "Peso aplicado para a ordenación de categorías con prioridade baixa."
     category_search_priority_high_weight: "Peso aplicado para a ordenación de categorías con prioridade alta."
-    category_search_priority_very_high_weight: "Peso aplicado para a ordenación de categorías con prioridade moi alta."
-    allow_uncategorized_topics: "Permitir a creación de temas sen categoría. AVISO: se hai algún tema sen categoría, debes categorizalos antes de desactivar esta opción."
-    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"
+    allow_uncategorized_topics: "Permitir a creación de temas sen categoría. AVISO: se hai algún tema sen categoría, debe recategorizalos antes de desactivar esta opción."
+    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 un 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."
+    site_description: "Describa o sitio nunha única frase, utilizada na etiqueta metadescrición."
+    short_site_description: "Descrición curta, utilizada como o título da etiqueta na páxina principal."
+    contact_email: "Enderezo electrónico da/do responsable deste sitio. Utilízase para notificacións moi importantes e mais na páxina de <a href='%{base_path}/about' target='_blank'>información</a> 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."
+    download_remote_images_to_local: "Converter imaxes remotas en locais ao descargalas; isto prevén que haxa imaxes rotas."
+    download_remote_images_threshold: "Espazo mínimo que cómpre no disco 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 verticais."
+    editing_grace_period: "Durante (n) segundos despois de publicar, pódese editar sen chegar a crear unha nova versión no historial."
     editing_grace_period_max_diff: "Número máximo de caracteres que se poden cambiar no período de graza de edición; se hai más cambios, almacenarase unha outra revisión da publicación (nivel de confianza 0 e 1)"
     editing_grace_period_max_diff_high_trust: "Número máximo de caracteres que se poden cambiar no período de graza de edición; se hai más cambios, almacenarase unha outra revisión da publicación (nivel de confianza 2 e superiores)"
-    staff_edit_locks_post: "Bloquearase a posibilidade de editar publicacións se estas son editadas por un membro do equipo."
-    post_edit_time_limit: "Un autor con nivel de confianza 0 ou 1 pode editar as súas publicacións despois de (n) minutos. Establézase en 0 para poder editar sempre."
-    tl2_post_edit_time_limit: "Un autor con nivel de confianza 2 ou superior pode editar as súas publicacións despois de (n) minutos. Establézase en 0 para poder editar sempre."
-    edit_history_visible_to_public: "Permitir que todos poida ver as versións previas dunha publicación editada. Se se deshabilita, unicamente os membros do equipo poderán velas."
-    delete_removed_posts_after: "As publicacións eliminadas polo seu autor serán automaticamente eliminadas despois de (n) horas. Se se establece en 0, as publicacións serán eliminadas ao momento."
+    staff_edit_locks_post: "Bloquearase a posibilidade de editar publicacións se estas son editadas por un membro do equipo"
+    post_edit_time_limit: "Un autor con nivel de confianza 0 ou 1 pode editar as súas publicacións despois de (n) minutos. Se se estabelece en 0 pódese editar sempre."
+    tl2_post_edit_time_limit: "Un autor con nivel de confianza 2 ou superior pode editar as súas publicacións despois de (n) minutos. Se se estabelece en 0 pódese editar sempre."
+    edit_history_visible_to_public: "Permitir que todos poidan ver as versións previas dunha publicación editada. Se se desactiva, unicamente os membros do equipo poderán velas."
+    delete_removed_posts_after: "As publicacións retiradas polo seu autor borraranse automaticamente despois de (n) horas. Se se estabelece en 0, as publicacións eliminaranse ao momento."
     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"
-    responsive_post_image_sizes: "Cambiar o tamaño das imaxes da caixa para permitir a súa visualización en pantallas de alto DPI das seguintes proporcións de píxeles. Elimina todos os valores para desactivar imaxes adaptativas."
-    fixed_category_positions: "De estar marcado, poderás organizar as categorías nunha orde determinada. De non o estar, as categorías aparecerán listadas segundo a súa actividade recente."
+    responsive_post_image_sizes: "Cambiar o tamaño das imaxes da caixa para permitir a súa visualización en pantallas de alto DPI das seguintes proporcións de píxeles. Retire todos os valores para desactivar imaxes adaptativas."
+    fixed_category_positions: "De estar marcado, poderá organizar as categorías nunha orde determinada. De non o estar, as categorías aparecerán listadas segundo a súa actividade recente."
     fixed_category_positions_on_create: "De estar marcado, a orde das categorías manterase na caixa de diálogo da creación de temas (require fixed_category_positions)."
-    add_rel_nofollow_to_user_content: 'Engadir a etiqueta rel nofollow a todo o contido inserido polos usuarios, agás polas ligazóns internas (incluídos os dominios pai). Se cambias isto, deberás refacer todas as publicacións con:  «rake posts:rebake»'
-    exclude_rel_nofollow_domains: "Unha listaxe de dominios a cuxas ligazóns non se lles engadirá a etiqueta nofollow. exemplo.com permitirá automaticamente sub.exemplo.com tamén. Como mínimo, deberías engadir o dominio deste sitio para axudar os rastrexadores web a atoparen todo o contido. Se outras partes deste sitio web están noutros dominios, engádeos tamén."
+    add_rel_nofollow_to_user_content: 'Engadirlle a etiqueta rel nofollow a todo o contido inserido polos usuarios, agás para as ligazóns internas (incluídos os dominios pai). Se cambia isto, deberá reconstruír todas as publicacións con: «rake posts:rebake»'
+    exclude_rel_nofollow_domains: "Unha listaxe de dominios a cuxas ligazóns non se lles engadirá a etiqueta nofollow. exemplo.com permitirá automaticamente sub.exemplo.com tamén. Como mínimo, debería engadir o dominio deste sitio para axudar os rastrexadores web a atoparen todo o contido. Se outras partes deste sitio web están noutros dominios, engádaos tamé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."
+    topic_excerpt_maxlength: "Lonxitude máxima do extracto/resumo dun tema xerado a partir da primeira publicación nun tema."
+    show_pinned_excerpt_mobile: "Mostrar o extracto de temas pegados na vista móbil."
+    show_pinned_excerpt_desktop: "Mostrar o extracto de temas pegados na vista de escritorio."
     post_onebox_maxlength: "Lonxitude máxima en caracteres dunha publicación de Discourse en formato caixa (onebox)."
     blocked_onebox_domains: "Unha listaxe de dominios que nunca se mostrarán en formato onebox."
-    allowed_inline_onebox_domains: "Unha listaxe de dominios que se mostrarán en formato onebox en miniatura se son ligados sen un título."
+    allowed_inline_onebox_domains: "Unha listaxe de dominios que se mostrarán en formato onebox en miniatura se son ligados sen un título"
     enable_inline_onebox_on_all_domains: "Ignorar o axuste do sitio inline_onebox_domain_whitelist e permitir incluír onebox en todos os dominios."
-    force_custom_user_agent_hosts: "Hosts que se utilizarán para o axente usuario personalizado de onebox en todas as solicitudes (especialmente útil para hosts que limitan o acceso por usuario axente)."
-    max_oneboxes_per_post: "Número máximo de caixas (onboxes) nunha publicación."
-    logo: "A imaxe do logotipo na parte superior esquerda do teu sitio. Utiliza unha imaxe rectangular larga cunha altura de 120 e unha relación de aspecto superior a 3:1. Se se deixa en branco, mostrarase o texto do título do sitio."
-    logo_small: " A imaxe pequena do logotipo na parte superior esquerda do teu sitio ao te desprazares cara a abaixo. Utiliza un cadrado de 120 x 120. Se se deixa en branco, mostrarase un glifo local."
-    digest_logo: "A imaxe de logotipo alternativa utilizada na parte superior do resumo de correo electrónico do teu sitio. Utiliza un rectángulo largo. Non debe ser unha imaxe SVG. Se se deixa en branco, utilizarase a imaxe do «logo»."
-    mobile_logo: "O logotipo utilizado na versión móbil do teu sitio. Utiliza unha imaxe rectangular cunha anchura de 120 e unha proporción maior que 3:1. Se se deixa en branco, utilizarase a imaxe que se configurou como logotipo."
-    large_icon: " Imaxe utilizada como base para outras iconas de metadatos. O ideal sería que fose maior que 512 x 512. Se se deixa en branco, utilizarase logo_small."
-    manifest_icon: " Imaxe utilizada como logo/imaxe de benvida en Android. Cambiarase automaticamente o tamaño a 512 × 512. Se se deixa en branco, utilizarase large_icon."
-    favicon: "Unha favicona para o teu sitio, mira <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Para funcionar correctamente sobre un CDN debe ser PNG. Redimensionarase automaticamente a 32x32. Se se deixa en branco, utilizarase large_icon."
+    force_custom_user_agent_hosts: "Hosts que se utilizarán para o axente de usuario personalizado de onebox en todas as solicitudes (especialmente útil para hosts que limitan o acceso por axente de usuario)."
+    max_oneboxes_per_post: "Número máximo de caixas (oneboxes) nunha publicación."
+    facebook_app_access_token: "Un token xerado a partir do ID da súa app de Facebook e o seu segredo. Utilízase para xerar caixas (oneboxes) de Instagram."
+    logo: "A imaxe do logotipo na parte superior esquerda do seu sitio. Utilice unha imaxe rectangular larga cunha altura de 120 e unha relación de aspecto superior a 3:1. Se se deixa en branco, mostrarase o texto do título do sitio."
+    logo_small: "A imaxe pequena do logotipo na parte superior esquerda do seu sitio, visible ao desprazarse cara a abaixo. Utilice un cadrado de 120 x 120. Se se deixa en branco, mostrarase un glifo local."
+    digest_logo: "A imaxe de logotipo alternativa utilizada na parte superior do resumo de correo electrónico do seu sitio. Utilice un rectángulo largo. Non debe ser unha imaxe SVG. Se se deixa en branco, utilizarase a imaxe configurada como logotipo."
+    mobile_logo: "O logotipo utilizado na versión móbil do seu sitio. Utilice unha imaxe rectangular cunha anchura de 120 e unha proporción maior que 3:1. Se se deixa en branco, utilizarase a imaxe configurada como logotipo."
+    logo_dark: "Alternativa de esquema escuro para o axuste de «logo»."
+    logo_small_dark: "Alternativa de esquema escuro para o axuste do «logo pequeno»."
+    mobile_logo_dark: "Alternativa de esquema escuro para o axuste de «logo para móbil»."
+    large_icon: "Imaxe utilizada como base para outras iconas de metadatos. O ideal sería que fose maior que 512 x 512. Se se deixa en branco, utilizarase logo_small."
+    manifest_icon: "Imaxe utilizada como logo/imaxe de benvida en Android. Cambiarase automaticamente o tamaño a 512 × 512. Se se deixa en branco, utilizarase large_icon."
+    manifest_screenshots: "Capturas de pantalla que presentan as funcionalidades da súa instalación e funcionalidade na páxina de arranque da instalación. Todas as imaxes deberían ser cargas en local e das mesmas dimensións."
+    favicon: "Unha favicona para o seu sitio, mire <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Para funcionar correctamente sobre un CDN debe ser PNG. Redimensionarase automaticamente a 32x32. Se se deixa en branco, utilizarase large_icon."
     apple_touch_icon: "Icona utilizada para dispositivos Apple. Redimensionarase automaticamente a 180x180. Se se deixa en branco, utilizarase large_icon."
-    opengraph_image: "Imaxe de gráfico aberto predeterminada que se utiliza cando a páxina non ten ningunha outra imaxe adecuada."
-    twitter_summary_large_image: "A 'imaxe grande de resumo' da tarxeta de Twitter (debe ter ao menos 280 de largura e ao menos 150 de altura). Se se deixa en branco, xeraranse metadatos de tarxetas normais utilizando opengraph_image."
+    opengraph_image: "Imaxe de gráfico aberto predeterminada que se utiliza cando a páxina non ten ningunha outra imaxe adecuada"
+    twitter_summary_large_image: "A «imaxe grande de resumo» da tarxeta de Twitter (debe ter polo menos 280 de largura e 150 de altura). Se se deixa en branco, xeraranse metadatos de tarxetas normais utilizando opengraph_image."
     notification_email: "O enderezo electrónico remitente utilizado ao enviar todos os correos electrónicos esenciais do sistema. O dominio especificado debe ter correctamente configurados os rexistros SPF, DKIM e PTR inversos para que os correos electrónicos se reciban correctamente."
-    email_custom_headers: "Unha listaxe de correos electrónicos personalizados separados por barras"
-    email_subject: "Formato de asunto personalizable para correos electrónicos estándar. Mira <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>"
+    email_custom_headers: "Unha listaxe de cabeceiras de correo personalizadas separadas por barras verticais"
+    email_subject: "Formato de asunto personalizábel para correos electrónicos estándar. Véxase <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: "Proporciónalles máis información aos usuarios sobre os motivos polos que non poden acceder a un tema en concreto. Nota: isto é menos seguro porque os usuarios saberán se o URL liga cun tema válido."
-    force_https: "Forzar o sitio a utilizar só HTTPS. AVISO: ¡NON actives esta opción a non ser que verifiques completamente a configuración e esta funcione correctamente en todas partes! Comprobaches tamén que o CDN, os inicios de sesión a través de redes sociais e calquera logo externo/dependencia son compatibles con HTTPS?"
-    same_site_cookies: "Utilizar as mesmas cookies do sitio; elas eliminan todos os vectores CSRF (falsificación de petición en sitios cruzados) dos navegadores compatibles (Lax o Strict). Advertencia: Strict só funcionará en sitios que forcen o inicio de sesión e utilicen SSO. "
-    summary_score_threshold: "A puntuación mínima que se require para que unha publicación sexa incluída no resumo deste tema."
-    summary_posts_required: "Número mínimo de publicacións antes de que 'Resumir este tema' estea habilitado. Os cambios neste axuste aplicaranse retroactivamente dentro dunha semana."
-    summary_likes_required: "Número mínimo de gústames nun tema antes de que 'Resumir este tema' estea habilitado. Os cambios neste axuste aplicaranse retroactivamente dentro dunha semana."
-    summary_percent_filter: "Cando un usuario preme en 'Resumir este tema' mostrar a porcentaxe de publicacións destacadas."
-    summary_max_results: "Número máximo de publicacións que devolve a opción 'Resumir este tema'"
-    enable_personal_messages: " Permitir aos usuarios con nivel de confianza 1 (configurable a través do mínimo nivel de confianza para enviar mensaxes) crear mensaxes e respondelas. Repara en que o equipo sempre pode enviar mensaxes pase o que pasar."
-    enable_system_message_replies: "Permitirlles aos usuarios responder mensaxes do sistema, mesmo aínda que as mensaxes persoais estean desactivadas."
-    long_polling_interval: "Tempo que o servidor debe de esperar antes de responder aos clientes que non hai datos para enviar (soamente usuarios con sesión iniciada)."
-    hide_post_sensitivity: "A probabilidade de que unha publicación denunciada sexa ocultada."
-    silence_new_user_sensitivity: "A probabilidade de que un usuario novo sexa silenciado por denuncias de mensaxes lixo."
-    auto_close_topic_sensitivity: "A probabilidade de que un tema denunciado sexa pechado automaticamente."
-    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"
-    tl3_additional_likes_per_day_multiplier: "Incrementar o límite de gústames por día para usuarios con nivel de confianza 3 (regular) 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 4 (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 de confianza 3, 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 de confianza 3, agochar todas as súas publicacións e evitar que publique no futuro. Valor en 0 para deshabilitar."
+    enforce_second_factor: "Obriga os usuarios a activar a autenticación de dobre paso. Seleccione «todo» para aplicalo a todos os usuarios. Seleccione «equipo» para forzalo en usuarios do equipo."
+    force_https: "Forzar o sitio a utilizar só HTTPS. AVISO: NON active esta opción ata que verifique completamente a configuración e esta funcione correctamente en todas as partes! Comprobou tamén que o CDN, os inicios de sesión a través de redes sociais e calquera logo externo/dependencia son compatibles con HTTPS?"
+    same_site_cookies: "Utilizar os mesmos rastros do sitio; eliminan todos os vectores CSRF -falsificación de petición en sitios cruzados- dos navegadores compatíbeis (laxo ou estrito). AVISO: O estrito só funcionará en sitios que forcen o inicio de sesión e utilicen un método externo de autenticación."
+    summary_score_threshold: "A puntuación mínima que se require para que unha publicación sexa incluída en «Resumir este tema»."
+    summary_posts_required: "Número mínimo de publicacións antes de que «Resumir este tema» estea activado. Os cambios neste axuste aplicaranse retroactivamente despois dunha semana."
+    summary_likes_required: "Número mínimo de gústame nun tema antes de que «Resumir este tema» estea activado. Os cambios neste axuste aplicaranse retroactivamente despois dunha semana."
+    summary_percent_filter: "Cando un usuario preme en «Resumir este tema» mostrar a porcentaxe de publicacións destacadas"
+    summary_max_results: "Número máximo de publicacións que devolve a opción «Resumir este tema»"
+    enable_personal_messages: "Permitirlles aos usuarios con nivel de confianza 1 (configurable a través de nivel mínimo de confianza para enviar mensaxes) crear mensaxes e respondelas. Repare en que o equipo sempre pode enviar mensaxes pasar o que pasar."
+    enable_system_message_replies: "Permitirlles aos usuarios responder mensaxes do sistema, mesmo aínda que as mensaxes persoais estean desactivadas"
+    enable_long_polling: "O bus de mensaxes utilizado para a notificación pode utilizar «long polling»"
+    enable_chunked_encoding: "Active as respostas mediante codificación fragmentaria do servidor. Esta funcionalidade serve na maioría das configuracións, pero algúns servidores intermedios poden retelas, o que provocaría o atraso nas respostas"
+    long_polling_base_url: "URL base empregado para o «long polling» (cando unha rede de distribución de contido serve contido dinámico, asegúrese de axustalo como «origin pull»); por exemplo: http://origin.site.com"
+    long_polling_interval: "Tempo que o servidor debe de esperar antes de responderlles aos clientes que non hai datos para enviar (soamente usuarios con sesión iniciada)."
+    polling_interval: "Se non se utilizar «long polling», con que frecuencia -en milisegundos- deben iniciar sesión os clientes"
+    anon_polling_interval: "Con que frecuencia -en milisegundos- deberían recoller mostras os clientes anónimos"
+    background_polling_interval: "Con que frecuencia -en milisegundos- deberían recoller mostras os clientes (se a xanela está en segundo plano)"
+    hide_post_sensitivity: "A probabilidade de que unha publicación denunciada sexa ocultada"
+    silence_new_user_sensitivity: "A probabilidade de que un usuario novo sexa silenciado por denuncias de mensaxes lixo"
+    auto_close_topic_sensitivity: "A probabilidade de que un tema denunciado sexa pechado automaticamente"
+    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 permiso para crear nas 24 horas seguintes á creación da súa primeira publicación"
+    max_replies_in_first_day: "Número máximo de respostas que un usuario ten permiso para crear nas 24 horas seguintes á creación da súa primeira publicación"
+    tl2_additional_likes_per_day_multiplier: "Incrementar o número de gústame por día para usuarios con nivel de confianza 2 (membros) multiplicándoo por este número"
+    tl3_additional_likes_per_day_multiplier: "Incrementar o límite de gústame por día para usuarios con nivel de confianza 3 (habituais) multiplicándoo por este número"
+    tl4_additional_likes_per_day_multiplier: "Incrementar o número de gústame por día para usuarios con nivel de confianza 4 (líderes) multiplicándoo por este número"
+    num_users_to_silence_new_user: "Se as publicacións dun usuario novo 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 desactivar."
+    num_tl3_flags_to_silence_new_user: "Se as publicacións dun usuario novo reciben este número de denuncias num_tl3_users_to_silence_new_user de diferentes usuarios con nivel de confianza 3, agochar todas as súas publicacións e evitar que publique no futuro. Valor en 0 para desactivar."
+    num_tl3_users_to_silence_new_user: "Se as publicacións dun usuario novo reciben num_tl3_users_to_silence_new_user denuncias deste número de usuarios con nivel de confianza 3, agochar todas as súas publicacións e evitar que publique no futuro. Valor en 0 para desactivar."
     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."
+    flag_sockpuppets: "Se un usuario novo responde a un tema desde o mesmo enderezo IP que o usuario que comezou o tema, denunciar as publicacións de ambos como posible lixo."
+    traditional_markdown_linebreaks: "Utilizar saltos de liña tradicionais en Markdown, que requiren dous espazos ao final 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)."
+    post_undo_action_window_mins: "Número de minutos que os usuarios teñen para desfacer accións recentes nunha publicación (gústame, 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. "
-    persistent_sessions: "Os usuarios permanecerán conectados cando o navegador estea pechado"
-    maximum_session_age: "O usuario permanecerá coa sesión iniciada durante n horas desde a última visita."
-    enable_escaped_fragments: "Ir á API Ajax-Crawling de Google se non se detecta ningún  webcrawler is detected. Visita <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
-    moderators_manage_categories_and_groups: "Permitir aos moderadores administrar categorías e grupos"
-    cors_origins: "Orixes permitidas para as solicitudes de orixe cruzada (CORS). Cada orixe debe incluír http:// ou https://. A variable env DISCOURSE_ENABLE_CORS debe establecerse como verdadeiro para activar CORS."
+    invite_code: "O usuario debe inserir este código para que se lle permita rexistrar a conta, ignórase cando está baleiro (non distingue entre maiúsculas e minúsculas)"
+    approve_suspect_users: "Engadir usuarios sospeitosos á cola de revisión. Os usuarios sospeitosos inseriron unha biografía ou sitio web, pero non teñen actividade de lectura."
+    pending_users_reminder_delay: "Notificarlles aos moderadores se hai usuarios novos que leven á espera da súa aprobación un tempo superior a este número de horas. Estabelecer en -1 para desactivar notificacións."
+    persistent_sessions: "Os usuarios conservarán a sesión iniciada cando o navegador estea pechado"
+    maximum_session_age: "O usuario permanecerá coa sesión iniciada durante n horas desde a última visita"
+    ga_version: "Versión de Google Universal Analytics que usar: v3 (analytics.js), v4 (gtag)"
+    ga_universal_tracking_code: "Id de código de seguimento de Google Universal Analytics, por exemplo: UA-12345678-9; véxase <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_domain_name: "Nome de dominio de Google Universal Analytics, por exemplo: mysite.com; véxase <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "Active o seguimento entre dominios de Google Universal Analytics. As ligazóns de saída a estes dominios engadirán o id do cliente. Consulte a <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Guía de seguimento entre dominios de Google.</a>"
+    gtm_container_id: "Id do contedor de Google Tag Manager. Por exemplo: GTM-ABCDEF. <br/>Nota: pode ser que teñan que estar listados os scripts de terceiros cargados con GTM na «pantalla de script da política de seguridade de contido\"."
+    enable_escaped_fragments: "Ir á API Ajax-Crawling de Google se non se detecta ningún rastrexador web. Véxase <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
+    moderators_manage_categories_and_groups: "Permitir que os moderadores administren categorías e grupos"
+    cors_origins: "Orixes permitidas para as solicitudes de orixe cruzada (CORS). Cada orixe debe incluír http:// ou https://. A variábel env DISCOURSE_ENABLE_CORS débese estabelecer como verdadeira para activar CORS."
     use_admin_ip_allowlist: "Os administradores só poden iniciar sesión se están nun enderezo IP definido na listaxe de enderezos IP revisados (Administración > Rexistros > IP revisados)."
+    blocked_ip_blocks: "Unha listaxe de bloques IP privados que Discourse nunca debería rastrexar"
+    allowed_internal_hosts: "Unha listaxe de servidores internos que Discourse pode rastrexar de forma segura para as oneboxing e outros fins"
+    allowed_onebox_iframes: "Unha listase de dominios iframe src que se permiten a través de incorporación Onebox. \"*\" permitirá todos os motores Onebox predeterminados."
     allowed_iframes: "Unha listaxe de prefixos de dominios para iframe src que Discourse pode permitir de forma segura en publicacións"
+    allowed_crawler_user_agents: "Axentes de usuario de rastreadores web aos que se lles debería permitir o acceso ao sitio. AVISO! AO CONFIGURAR ISTO, VETARÁ TODOS OS RASTREXADORES NON LISTADOS AQUÍ!"
+    blocked_crawler_user_agents: "Palabra única insensíbel a maiúsculas e minúsculas na cadea de axente de usuario que identifica rastrexadores web que non deberían ter permitido o acceso ao sitio. Non se lle aplica se está definida a listaxe de permitidos."
     slow_down_crawler_user_agents: "Axentes de usuario de rastrexadores web aos que se lles debe aplicar unha cota limitada en robots.txt utilizando a directiva de atraso no rastrexo"
     slow_down_crawler_rate: "Se slow_down_crawler_user_agents está especificado, este valor aplicarase a todos os rastrexadores (número de segundos de demora entre respostas)"
     content_security_policy: "Activar a política de seguridade de contido (CSP)"
     content_security_policy_report_only: "Activar só o informe de política de seguridade de contido"
-    content_security_policy_collect_reports: "Habilitar a recolección de informes de violación de CSP en /csp_reports"
-    invalidate_inactive_admin_email_after_days: "As contas administrativas que non visiten o sitio neste número de días  terán que volver validar o seu enderezo electrónico antes de iniciar sesión. Establézase en 0 para desactivalo."
+    content_security_policy_collect_reports: "Activar a recolección de informes de violación de CSP en /csp_reports"
+    content_security_policy_frame_ancestors: "Restrinxir quen pode incorporar este sitio en iframes mediante CSP. O control de servidores permitidos en <a href='%{base_path}/admin/customize/embedding'>Incorporación</a>"
+    content_security_policy_script_src: "Fontes de script adicionais permitidas. O servidor actual e a rede de distribución de contido CDN inclúense de xeito predeterminado. Consulte <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Mitigar os ataques XSS coa política de seguridade de contido.</a>"
+    invalidate_inactive_admin_email_after_days: "As contas administrativas que non visiten o sitio neste número de días terán que volver validar o seu enderezo electrónico antes de iniciar sesión. Estabelecer en 0 para desactivalo."
     top_menu: "Determinar que elementos aparecen no menú de navegación da páxina de inicio e en que orde. Exemplo últimos|recentes|senler|categorías|destacados|publicados|marcadores"
     post_menu: "Determinar os elementos que aparecen no menú de publicación e en que orde. Exemplo: gústame|editar|denunciar|eliminar|compartir|gardar en marcadores|responder"
-    post_menu_hidden_items: "Os elementos do menú que se ocultan por defecto no menú de publicación a menos que se prema no botón para expandir as opcións."
+    post_menu_hidden_items: "Os elementos do menú que se ocultan por defecto no menú de publicación salvo que se prema no botón para expandir as opcións."
     share_links: "Determinar que elementos aparecen no cadro de compartir e en que orde."
-    site_contact_username: "Nome de usuario do membro do equipo desde onde se enviarán todas as mensaxes automáticas. Se se deixa en branco, utilizarase a conta por defecto do sistema."
+    site_contact_username: "Nome de usuario do membro do equipo desde onde se enviarán todas as mensaxes automáticas. Se se deixa en branco, utilizarase a conta predeterminada do sistema."
     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 de confianza 1 unha mensaxe de benvida."
+    send_welcome_message: "Enviarlles aos usuarios novos unha mensaxe de benvida cunha guía de comezo rápido."
+    send_tl1_welcome_message: "Enviarlles aos usuarios novos con nivel de confianza 1 unha mensaxe de benvida."
+    send_tl2_promotion_message: "Envíe unha nova mensaxe aos usuarios de nivel 2 de confianza sobre a promoción."
     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."
+    remove_full_quote: "Retirar 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."
+    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 aos usuarios novos e aos que estiveron ausentes durante moito tempo."
     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 editor. (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."
+    moderators_view_emails: "Permitir que os moderadores vexan 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 nas publicacións (cando está desactivado, o nome móstrase primeiro)"
+    enable_rich_text_paste: "Activar conversión automática de HTML a Markdown ao pegar texto no editor. (Experimental)"
+    send_old_credential_reminder_days: "Lembrar as credenciais antigas despois de días"
+    email_token_valid_hours: "Os tokens para restabelecer 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."
-    auto_approve_email_domains: "Os usuarios con enderezos electrónicos desta listaxe de dominios serán automaticamente aprobados."
-    hide_email_address_taken: "Non informar aos usuarios da existencia dunha conta cun correo electrónico dado durante o rexistro e desde o formulario de contrasinal esquecido."
+    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, pode <a href='%{base_path}/admin/customize/robots'>sobrescribir robots.txt</a>permanentemente."
+    blocked_email_domains: "Unha listaxe dominios de correo electrónico separados por barras verticais cos cales os usuarios non poden rexistrar contas. Exemplo: mailinator.com | trashmail.net"
+    allowed_email_domains: "Unha listaxe de dominios de correo electrónico separados por barras verticais cos que os usuarios DEBEN rexistrar contas. AVISO: Non se permitirán usuarios con dominios de correo electrónico distintos aos da listaxe!"
+    auto_approve_email_domains: "Os usuarios con enderezos electrónicos desta listaxe de dominios serán aprobados automaticamente."
+    hide_email_address_taken: "Non informar aos usuarios da existencia dunha conta cun correo electrónico determinado durante o rexistro e desde o formulario de contrasinal esquecido."
     log_out_strict: "Ao pechar a sesión, pechar TODAS as sesións en todos os dispositivos do usuario"
+    version_checks: "Faga ping ao Discourse Hub para obter actualizacións de versións e amose mensaxes de nova versión no panel de control do<a href='%{base_path}/admin' target='_blank'>/admin</a>"
     new_version_emails: "Enviar un correo electrónico a contact_email address cando haxa dispoñible unha nova versión de Discourse."
-    invite_expiry_days: "Tempo de duración que as claves para convidar usuarios son válidas, en días"
-    invite_only: "Todos os usuarios novos deben ser invitados de forma explícita por usuarios de confianza ou membros do equipo. Os rexistros públicos están desactivados."
+    invite_expiry_days: "Tempo de validez das claves para convidar usuarios, en días"
+    invite_only: "Todos os usuarios novos deben ser invitados directamente por usuarios de confianza ou membros do equipo. Os rexistros públicos están desactivados."
     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."
-    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"
+    min_username_length: "Lonxitude mínima do nome de usuario en caracteres. AVISO: se hai usuarios ou grupos cunha extensión menor, o seu sitio quebrará!"
+    max_username_length: "Lonxitude máxima do nome de usuario en caracteres. AVISO: 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."
+    allowed_unicode_username_characters: "Expresión regular para permitir só algúns caracteres Unicode dentro dos nomes de usuario. Sempre se permitirán letras e números ASCII e non precisarán ser incluídos na listaxe de permitidos."
+    reserved_usernames: "Nomes de usuario que non están permitidos para rexistrarse. 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 debe ter un contrasinal."
     block_common_passwords: "Non permitir contrasinais que estean entre os 10.000 contrasinais máis comúns."
-    external_auth_skip_create_confirm: Ao rexistrarse cun método de autenticación externo, saltar a ventá emerxente de creación de conta. Utilízase mellor xunto con sso_overrides_email, sso_overrides_username e sso_overrides_name.
-    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>"
-    enable_sso_provider: "Implementar o protocolo do provedor de SSO de Discourse no /session/sso_provider endpoint, require que se configure sso_provider_secrets"
-    sso_url: "URL do extremo para o inicio de sesión único (debe incluír http:// ou https://)"
-    sso_secret: "Cadea secreta utilizada para autenticar criptograficamente a información do SSO, asegúrate de que teña 10 caracteres ou máis"
-    sso_provider_secrets: "Unha listaxe de pares de dominios secretos que utiliza Discourse como provedor de SSO. Asegúrate de que a clave secreta SSO teña 10 caracteres ou máis. O símbolo do comodín * pódese utilizar para facer coincidir calquera dominio ou só unha parte del (por exemplo, * .exemplo.com)."
-    sso_overrides_bio: "Sobrescribe a biografía do usuario no seu perfil e deshabilita a posibilidade de cambiala"
-    sso_overrides_email: "Anula o correo electrónico local co correo electrónico externo do sitio da carga útil de SSO en cada inicio de sesión e evita os cambios locais. Aplícase a todos os provedores de autenticación. (ADVERTENCIA: poden producirse discrepancias debido á normalización dos correos electrónicos locais)"
-    sso_overrides_username: "Anula o nome de usuario local co nome de usuario externo do sitio da carga útil de SSO en cada inicio de sesión e evita os cambios locais. Aplícase a todos os provedores de autenticación. (ADVERTENCIA: poden producirse discrepancias debido á normalización dos correos electrónicos locais)"
-    sso_overrides_name: "Anula o nome completo co nome completo do sitio da carga útil de SSO en cada inicio de sesión e evita os cambios locais. Aplícase a todos os provedores de autenticación."
-    sso_overrides_avatar: "Anula o avatar do usuario co avatar do sitio externo da carga útil de SSO. Se está habilitado, os usuarios non poderán cargar avatares en Discourse."
-    sso_overrides_location: "Anula a localización do usuario coa localización externa da carga útil de SSO e evita os cambios locais."
-    sso_overrides_website: "Anula o sitio web do usuario coa localización externa da carga útil de SSO e evita os cambios locais."
-    sso_overrides_profile_background: "Anula o fondo do perfil de usuario cun avatar de sitio externo da carga útil de SSO."
-    sso_overrides_card_background: "Anula o fondo da tarxeta de usuario cun avatar de sitio externo da carga útil de SSO."
-    sso_not_approved_url: "Redireccionar contas SSO sen aprobar a este URL"
-    sso_allows_all_return_paths: "Habilitar as contas baseadas no inicio de sesión con nome de usuario e contrasinal locais. Isto debe estar habilitado para que as invitacións funcionen. ADVERTENCIA: se está deshabilitado, é posible que non poidas iniciar sesión se non configuraches previamente ao menos un método de inicio de sesión alternativo."
-    enable_local_logins: "Habilita as contas baseadas no nome de usuario e contrasinal locais. Isto debe estar habilitado para convites a traballar. ADVERTENCIA: se está desactivado, é posible que non poida iniciar sesión se non configurou previamente ao menos un método de inicio de sesión alternativo.\n "
-    enable_local_logins_via_email: "Permitir aos usuarios que soliciten unha ligazón de inicio de sesión que se lle enviará por correo electrónico."
-    allow_new_registrations: "Permitir o rexistro de novos usuarios. Desactiva esta opción para evitar que ninguén cre unha nova conta."
+    auth_skip_create_confirm: Ao rexistrarse cun método de autenticación externo, saltar a xanela emerxente de creación de conta. Utilízase mellor xunto con auth_overrides_email, auth_overrides_username e auth_overrides_name.
+    auth_immediately: "Redirecciona automaticamente ao sistema de inicio de sesión externo sen a interacción do usuario. Isto só ten efecto cando login_required é unha variábel verdadeira e só hai un método de autenticación externo"
+    enable_discourse_connect: "Activar o inicio de sesión a través de DiscourseConnect (anteriormente «Discourse SSO») (AVISO: OS ENDEREZOS DE CORREO DOS USUARIOS *DEBEN DE* SER VALIDADOS POLO SITIO EXTERNO!)"
+    verbose_discourse_connect_logging: "Rexistrar diagnósticos detallados relacionados con DiscourseConnect en <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    enable_discourse_connect_provider: "Implementar o protocolo do fornecedor de DiscourseConnect (antes «Discourse SS0») no punto de destino en /session/sso_provider, require que se definan sso_provider_secrets"
+    discourse_connect_url: "URL do destino de DiscourseConnect (debe incluír http:// ou https://)"
+    discourse_connect_secret: "Cadea secreta utilizada para autenticar criptograficamente a información de DiscourseConnect, asegúrese de que teña 10 caracteres ou máis"
+    discourse_connect_provider_secrets: "Unha listaxe de pares de dominios secretos que utilizan DiscourseConnect. Asegúrese de que a clave secreta de DiscourseConnect teña 10 caracteres ou máis. O símbolo do comodín * pódese utilizar para facer coincidir calquera dominio ou só unha parte del (por exemplo, *.exemplo.com)."
+    discourse_connect_overrides_bio: "Sobrescribe info biográfica do usuario no seu perfil e evita a posibilidade de que o usuario a cambie."
+    discourse_connect_overrides_groups: "Sincronice todas as incorporacións manuais a grupos con grupos especificados no atributo dos grupos (AVISO: se non especifica grupos, o usuario terá en branco toda pertenza a grupos de incorporación manual)"
+    auth_overrides_email: "Sobrescribe o enderezo de correo local co enderezo de correo do sitio externo, e evita os cambios locais. Aplícase a todos os fornecedores de autenticación. (AVISO: poden producirse discrepancias debido á normalización dos enderezos de correo locais)"
+    auth_overrides_username: "Sobrescribe o nome de usuario local co nome de usuario do sitio externo en cada inicio de sesión e evita os cambios locais. Aplícase a todos os fornecedores de autenticación. (AVISO: poden producirse discrepancias debido á normalización dos enderezos de correo locais)"
+    auth_overrides_name: "Sobrescribe o nome completo co nome completo do sitio externo en cada inicio de sesión e evita os cambios locais. Aplícase a todos os fornecedores de autenticación."
+    discourse_connect_overrides_avatar: "Sobrescribe o avatar do usuario co avatar do sitio externo que transporta a carga de DiscourseConnect. Se está activado, os usuarios non poderán cargar avatares en Discourse."
+    discourse_connect_overrides_location: "Sobrescribe a localización do usuario coa localización do sitio externo que transporta a carga de DiscourseConnect e evita os cambios locais."
+    discourse_connect_overrides_website: "Sobrescribe a localización do sitio web do usuario coa localización do sitio externo que transporta a carga de DiscourseConnect e evita os cambios locais."
+    discourse_connect_overrides_profile_background: "Sobrescribe o fondo do perfil de usuario cun avatar de sitio externo que transporte DiscourseConnect."
+    discourse_connect_overrides_card_background: "Sobrescribe o fondo da tarxeta de usuario cun avatar de sitio externo que transporte a carga de DiscourseConnect."
+    discourse_connect_not_approved_url: "Redireccionar contas de DiscourseConnect sen aprobar a este URL"
+    discourse_connect_allows_all_return_paths: "Non restrinxa o dominio para return_paths fornecidos por DiscourseConnect (o camiño de devolución debe estar no sitio actual, de modo predeterminado)"
+    enable_local_logins: "Active as contas co nome de usuario local e o contrasinal de inicio de sesión. ATENCIÓN: de estar desactivado, quizais non poida iniciar sesión se non configurou previamente cando menos unha método de inicio alternativo."
+    enable_local_logins_via_email: "Permitir que os usuarios soliciten unha ligazón de inicio de sesión que se lles enviará por correo electrónico."
+    allow_new_registrations: "Permitir o rexistro de novos usuarios. Desactive esta opción para evitar que alguén cree unha nova conta."
     enable_signup_cta: "Mostrar un aviso aos usuarios anónimos que volven animándoos a que se rexistren."
-    enable_google_oauth2_logins: "Habilitar a autenticación con Google Oauth2. Este é o método de autenticación que actualmente admite Google. Require unha chave de cliente e unha chave secreta. Revisa <a href='https://meta.discourse.org/t/15858' target='_blank'>a configuración de inicio de sesión de Google para Discourse</a>."
-    google_oauth2_client_id: "ID de cliente da túa aplicación de Google."
-    google_oauth2_client_secret: "Clave secreta do cliente da túa aplicación de Google."
-    google_oauth2_prompt: "Unha listaxe opcional delimitada por valores de cadea que especifica se o servidor solicita ao usuario a reautenticación e o consentimento. Revisa <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> para os valores posibles."
-    google_oauth2_hd: "Un dominio opcional hospedado por Google Apps limiatará o inicio de sesión. Revisa <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> para máis detalles."
-    enable_twitter_logins: "Habilitar a autenticación con Twitter require twitter_consumer_key e twitter_consumer_secret. Revisa <a href='https://meta.discourse.org/t/13395' target='_blank'>a configuración do inicio de sesión mediante Twitter (e insercións) para Discourse</a>."
-    enable_facebook_logins: "Habilitar a autenticación con Facebook require facebook_app_id e facebook_app_secret. Revisa <a href='https://meta.discourse.org/t/13394' target='_blank'>a configuración do inicio de sesión mediante Facebook para Discourse</a>."
+    enable_google_oauth2_logins: "Activar a autenticación con Google Oauth2. Este é o método de autenticación que actualmente admite Google. Require unha chave de cliente e unha chave secreta. Revise <a href='https://meta.discourse.org/t/15858' target='_blank'>a configuración de inicio de sesión de Google para Discourse</a>."
+    google_oauth2_client_id: "ID de cliente da súa aplicación de Google."
+    google_oauth2_client_secret: "Clave secreta do cliente da súa aplicación de Google."
+    google_oauth2_prompt: "Unha listaxe opcional de valores de cadea delimitada por espazos que especifica se o servidor solicita ao usuario a reautenticación e o consentimento. Revise <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> para os valores posibles."
+    google_oauth2_hd: "Un dominio opcional hospedado por Google Apps limitará o inicio de sesión. Revise <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> para máis detalles."
+    enable_twitter_logins: "Activar a autenticación con Twitter require twitter_consumer_key e twitter_consumer_secret. Revise <a href='https://meta.discourse.org/t/13395' target='_blank'>a configuración do inicio de sesión mediante Twitter (e insercións) para Discourse</a>."
+    twitter_consumer_key: "Clave de consumidor para a autenticación con Twitter, rexistrada en <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
+    twitter_consumer_secret: "Segredo de consumidor para a autenticación con Twitter, rexistrado en <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
+    enable_facebook_logins: "Activar a autenticación con Facebook require facebook_app_id e facebook_app_secret. Revise <a href='https://meta.discourse.org/t/13394' target='_blank'>a configuración do inicio de sesión mediante Facebook para Discourse</a>."
+    facebook_app_id: "Id de aplicación para autenticación e compartición con Facebook, rexistrado en <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
     facebook_app_secret: "Chave secreta para a autenticación mediante Facebook, rexistrada en <a href='https://developers.facebook.com/apps/' target='_blank'> https://developers.facebook.com/apps</a>"
-    enable_discord_logins: "Permitir aos usuarios a autenticación mediante Discord?"
-    discord_client_id: 'ID de cliente de Discord (necesitas unha? Visita <a href="https://discordapp.com/developers/applications/me">o portal de programadores de Discord</a>)'
+    enable_github_logins: "Activar a autenticación con GitHub, require github_client_id e github_client_secret. Véxase <a href='https://meta.discourse.org/t/13745' target='_blank'>Configurar o inicio de sesión con GitHub para Discourse</a>."
+    github_client_id: "Id de cliente para a autenticación con GitHub, rexistrada en <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    github_client_secret: "Segredo de cliente para a autenticación con GitHub, rexistrado en <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    enable_discord_logins: "Permitir que os usuarios se autentiquen mediante Discord?"
+    discord_client_id: 'ID de cliente de Discord (necesita unha? Visite <a href="https://discordapp.com/developers/applications/me">o portal de programadores de Discord</a>)'
     discord_secret: "Chave secreta de Discord"
-    enable_backups: "Permitir que os administradores cren copias de seguranza do foro"
-    allow_restore: "Permitir restaurar, o cal pode substituír TODOS os datos do sitio! Deixar en False a non ser que planees restaurar desde unha copia de seguranza"
-    maximum_backups: "Número máximo de copias de seguranza que se manterán no disco. Aquelas máis antigas serán eliminadas automaticamente."
-    automatic_backups_enabled: "Executar copias de seguranza automáticas definidas pola frecuencia das copias de seguranza"
+    discord_trusted_guilds: 'Só lles permite aos membros destes colectivos de Discord iniciar sesión a través de Discord. Utilice o identificador numérico para o colectivo. Para saber máis, consulte as instrucións <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">aquí</a>. Déixeo en branco para permitirllo a calquera colectivo.'
+    enable_backups: "Permitir que os administradores creen copias de seguranza do foro"
+    allow_restore: "Permitir restaurar, o que pode substituír TODOS os datos do sitio! Deixar en False a non ser que prevexa restaurar desde unha copia de seguranza"
+    maximum_backups: "Número máximo de copias de seguranza que se manterán no disco. Aquelas máis antigas eliminaranse automaticamente"
+    automatic_backups_enabled: "Executar copias de seguranza automáticas segundo se defina en Frecuencia das copias de seguranza"
     backup_frequency: "O número de días entre unha e outra copia de seguranza."
-    s3_configure_tombstone_policy: "Habilitar a política de eliminación automática para cargas tombstone. IMPORTANTE: se está deshabilitado, non se reclamará ningún espazo despois de eliminar as cargas."
-    s3_disable_cleanup: "Evitar a eliminación de antigas copias de seguranza de S3 cando o número delas supere o máximo permitido"
+    s3_backup_bucket: "O contedor remoto para facer copias de seguranza. AVISO: Asegúrese de que se trata dun contedor privado."
+    s3_endpoint: "O punto final pódese modificar para facer unha copia de seguranza nun servizo compatíbel con S3 como DigitalOcean Spaces ou Minio. AVISO: Déixeo en branco se usa AWS S3."
+    s3_configure_tombstone_policy: "Activar a política de eliminación automática para cargas tombstone. IMPORTANTE: se está desactivado, non se reclamará ningún espazo despois de eliminar as cargas."
+    s3_disable_cleanup: "Evitar a retirada de antigas copias de seguranza de S3 cando o número delas supere o máximo permitido."
     enable_s3_inventory: "Xerar informes e verificar as cargas utilizando o inventario de Amazon S3. IMPORTANTE: require credenciais S3 válidas (tanto a chave de acceso como a chave de acceso secreta)."
-    backup_time_of_day: "Hora do día UTC cando se debería executar a copia de seguranza."
-    backup_with_uploads: "Incluír os ficheiros subidos nas copias de seguranza programadas. De se deshabilitar esta opción, unicamente se executará a copia de seguranza da base de datos."
+    backup_time_of_day: "Hora do día UTC á se debería executar a copia de seguranza."
+    backup_with_uploads: "Incluír os ficheiros subidos nas copias de seguranza programadas. De se desactiva esta opción, unicamente se executará a copia de seguranza da base de datos."
     backup_location: "Localización onde están almacenadas as copias de seguranza. IMPORTANTE: S3 require credenciais S3 válidas inseridas na configuración de ficheiros."
     backup_gzip_compression_level_for_uploads: "Nivel de compresión Gzip utilizado para comprimir ficheiros subidos."
-    include_thumbnails_in_backups: "Incluír miniaturas xeradas nas copias de seguranza. Deshabilitar isto fará que as copias sexan máis pequenas, mais require o rebake de todas as publicacións logo dunha restauración."
+    include_thumbnails_in_backups: "Incluír miniaturas xeradas nas copias de seguranza. Desactivar isto fará que as copias sexan máis pequenas, mais require reconstruír todas as publicacións logo dunha restauración."
     active_user_rate_limit_secs: "Frecuencia en segundos con que actualizaremos o campo «last_seen_at»"
     verbose_localization: "Mostrar suxestións de localización estendida na interface de usuario"
-    previous_visit_timeout_hours: "Tempo que debe pasar antes de que unha visita sexa considerada 'visita previa', en horas"
+    previous_visit_timeout_hours: "Tempo que debe pasar antes de que unha visita sexa considerada «visita previa», en horas"
     top_topics_formula_log_views_multiplier: "valor do multiplicador de visitas (n) na fórmula de temas destacados: `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: "valor do multiplicador de gústames na primeira publicación (n) na fórmula de temas destacados:: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
-    top_topics_formula_least_likes_per_post_multiplier: "valor do multiplicador de gústames por publicación (n) na fórmula de temas destacados: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    enable_safe_mode: "Permitir aos usuarios entrar no modo seguro para depurar complementos."
+    top_topics_formula_first_post_likes_multiplier: "valor do multiplicador de gústame na primeira publicación (n) na fórmula de temas destacados:: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_least_likes_per_post_multiplier: "valor do multiplicador de gústame por publicación (n) na fórmula de temas destacados: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
+    enable_safe_mode: "Permitir que os usuarios entren no modo seguro para depurar complementos."
     rate_limit_create_topic: "Despois de crear un tema, os usuarios deben agardar (n) segundos antes de crear un outro."
     rate_limit_create_post: "Despois de publicar, os usuarios deben agardar (n) segundos antes de crear unha outra publicación."
     rate_limit_new_user_create_topic: "Despois de crear un tema, os novos usuarios deben agardar (n) segundos antes de crear un outro."
     rate_limit_new_user_create_post: "Despois de publicar, os novos usuarios deben agardar (n) segundos antes de crear unha outra publicación."
-    max_likes_per_day: "Número máximo de gústames por usuario e día."
+    max_likes_per_day: "Número máximo de gústame por usuario e día."
     max_flags_per_day: "Número máximo de denuncias por usuario e día."
     max_bookmarks_per_day: "Número máximo de marcadores por usuario e día."
     max_edits_per_day: "Número máximo de edicións por usuario e día."
     max_topics_per_day: "Número máximo de temas que un usuario pode crear por día."
-    max_invites_per_day: "Número máximo de invitacións que un usuario pode enviar por días."
+    max_personal_messages_per_day: "Número máximo de novos temas de mensaxes persoais que un usuario pode crear ao día."
+    max_invites_per_day: "Número máximo de invitacións que un usuario pode enviar por día."
     max_topic_invitations_per_day: "Número máximo de invitacións a un tema que un usuario pode enviar por día."
-    max_logins_per_ip_per_hour: "Número máximo de inicios de sesión permitidos por enderezo IP por hora"
-    max_logins_per_ip_per_minute: "Número máximo de inicios de sesión permitidos por enderezo IP por minuto"
+    max_logins_per_ip_per_hour: "Número máximo de inicios de sesión permitidos por enderezo IP e hora"
+    max_logins_per_ip_per_minute: "Número máximo de inicios de sesión permitidos por enderezo IP e minuto"
     max_post_deletions_per_minute: "Número máximo de publicacións que un usuario pode eliminar por minuto."
     max_post_deletions_per_day: "Número máximo de publicacións que un usuario pode eliminar por día."
     invite_link_max_redemptions_limit: "O número máximo de trocos permitidos para as ligazóns de invitación non pode ser superior a este valor."
-    alert_admins_if_errors_per_minute: "Número de erros por minuto para activar unha alerta aos administradores. O valor 0 desactiva esta funcionalidade. Nota: cómpre reiniciar."
-    alert_admins_if_errors_per_hour: "Número de erros por hora para activar unha alerta aos administradores. O valor 0 desactiva esta funcionalidade. Nota: cómpre reiniciar."
-    categories_topics: "Número de temas que se mostran na páxina de /categorías. Se se establece en 0, automaticamente tentará atopar un valor para manter as dúas columnas simétricas (categorías e temas)."
+    invite_link_max_redemptions_limit_users: "O máximo de ofrecementos permitidos para enviar ligazóns de convite xerados por usuarios regulares non poden superar este valor."
+    alert_admins_if_errors_per_minute: "Número de erros por minuto para activar unha alerta aos administradores. O valor 0 desactiva esta funcionalidade. Nota: cómpre rearrancar."
+    alert_admins_if_errors_per_hour: "Número de erros por hora para activar unha alerta aos administradores. O valor 0 desactiva esta funcionalidade. Nota: cómpre rearrancar."
+    categories_topics: "Número de temas que se mostran na páxina de /categorías. Se se estabelece en 0, automaticamente tentará atopar un valor para manter as dúas columnas simétricas (categorías e temas)."
     suggested_topics: "Número de temas suxeridos que se mostran na parte inferior do tema."
-    limit_suggested_to_category: "Só mostrar temas da categoría actual nos temas suxeridos."
-    suggested_topics_max_days_old: "Os temas suxeridos non deben ser máis antigos que n días."
-    suggested_topics_unread_max_days_old: "Os temas suxeridos sen ler non deben ser máis antigos que n días."
-    clean_up_uploads: "Eliminar ficheiros subidos orfos sen referencia para previr o hosting ilegal. AVISO: antes de habilitar esta opción quizais queiras facer unha copia de seguranza do teu directorio de /uploads"
-    clean_orphan_uploads_grace_period_hours: "Período de graza (en horas) antes de que un ficheiro orfo subido sexa eliminado."
-    purge_deleted_uploads_grace_period_days: "Período de graza (en días) antes de que un ficheiro orfo subido sexa eliminado."
-    purge_unactivated_users_grace_period_days: "Período de graza (en días) antes de que un usuario cuxa conta non ten actividade sexa eliminado. Establézase en 0 para que ningún usuario sen actividade sexa expulsado."
+    limit_suggested_to_category: "Mostrar só temas da categoría actual nos temas suxeridos."
+    suggested_topics_max_days_old: "Os temas suxeridos non deben ter máis de n días de antigüidade."
+    suggested_topics_unread_max_days_old: "Os temas suxeridos sen ler non ter máis de n días de antigüidade."
+    clean_up_uploads: "Retirar ficheiros orfos subidos sen referencia para previr o hosting ilegal. AVISO: antes de activar esta opción quizais queiras facer unha copia de seguranza do seu directorio de /uploads."
+    clean_orphan_uploads_grace_period_hours: "Período de graza (en horas) antes de que un ficheiro orfo subido sexa retirado."
+    purge_deleted_uploads_grace_period_days: "Período de graza (en días) antes de que un ficheiro subido eliminado sexa borrado."
+    purge_unactivated_users_grace_period_days: "Período de graza (en días) antes de que un usuario cuxa conta non ten actividade sexa eliminado. Estabelecer en 0 para que ningún usuario sen actividade sexa expulsado."
     enable_s3_uploads: "Colocar os ficheiros subidos no almacén Amazon S3. IMPORTANTE: require credenciais de S3 validas. (tanto a chave de acceso e a chave de acceso secreta)."
+    s3_use_iam_profile: 'Utilice un <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">perfil AWS EC2 da instancia</a> para conceder acceso ao contedor S3. NOTA: Para activar isto, requírese que Discourse estea funcionando nunha instancia EC2 configurada adecuadamente e sobrescribe a configuración de «clave de acceso s3»" e a de «clave de acceso segredo s3».'
+    s3_upload_bucket: "O nome do contedor de Amazon S3 no que se cargarán os ficheiros. AVISO: debe ser en minúsculas, sen puntos, sen liñas de subliñado."
     s3_access_key_id: "A ID da chave de acceso de Amazon S3 que se utilizará para subir imaxes, ficheiros anexos e copias de seguranza."
     s3_secret_access_key: "A chave secreta de acceso a Amazon S3 que se utilizará para subir imaxes, ficheiros anexos e copias de seguranza."
     s3_region: "O nome de rexión de Amazon S3 que utilizará para subir imaxes e copias de seguranza."
+    s3_cdn_url: "O URL de CDN que se utilizará para todos os recursos s3 (por exemplo: https://cdn.somewhere.com). AVISO: despois de cambiar este axuste debe volver reconstruír todas as publicacións antigas."
     avatar_sizes: "Listaxe de tamaños dos avatares xerados automaticamente."
     external_system_avatars_enabled: "Utilizar un servizo externo de avatares."
-    external_system_avatars_url: "Enderezo URL do servizo externo para os avatares. As substitucións permitidas son {username} {first_letter} {color} {size}"
+    external_system_avatars_url: "Enderezo URL do servizo externo de avatares. As substitucións permitidas son {username} {first_letter} {color} {size}"
+    external_emoji_url: "URL do servizo externo de imaxes emoticonas. Déixeo en branco para desactivalo."
+    use_site_small_logo_as_system_avatar: "Utilice o pequeno logotipo do sitio no canto do avatar de usuario do sistema. Require que estea presente o logotipo."
     restrict_letter_avatar_colors: "Unha listaxe de valores hexadecimais das cores permitidas para os fondos dos avatares de letras."
     selectable_avatars_enabled: "Obrigar os usuarios a elixiren un avatar da listaxe."
     selectable_avatars: "Listaxe de avatares que os usuarios poden elixir."
     allow_all_attachments_for_group_messages: "Permitir todos os ficheiros anexos para mensaxes de grupo."
     png_to_jpg_quality: "Calidade do ficheiro JPG convertido (1 é calidade mínima; 99 é a mellor; 100 para desactivar)"
+    recompress_original_jpg_quality: "Calidade dos ficheiros de imaxe cargados (1 é a de menor calidade, 99 é a de mellor calidade, 100 para desactivar)."
+    image_preview_jpg_quality: "Calidade dos ficheiros de imaxe redimensionados (1 é a máis baixa calidade, 99 é a mellor calidade, 100 para desactivar)."
     allow_staff_to_upload_any_file_in_pm: "Permitir que os membros do equipo poidan subir calquera ficheiro nas mensaxes privadas."
-    min_ratio_to_crop: "Proporción utilizada para recortar imaxes altas. Insire o resultado de largura/altura."
+    strip_image_metadata: "Elimina os metadatos da imaxe."
+    min_ratio_to_crop: "Proporción utilizada para recortar imaxes altas. Insira o resultado de largura/altura."
     simultaneous_uploads: "Número máximo de ficheiros que se poden arrastrar e soltar no editor"
-    enable_flash_video_onebox: "Habilitar a inserción de ligazóns swf e flv (Adobe Flash) no formato Onebox. AVISO: podería supor riscos de seguridade."
     default_invitee_trust_level: "Nivel de confianza por defecto (0-4) para usuarios convidados."
     default_trust_level: "Nivel de confianza por defecto (0-4) para todos os novos usuarios. Advertencia! Cambiar isto pode derivar nun alto risco de correo lixo."
     tl1_requires_topics_entered: "Número de temas que un novo usuario debe inserir antes de ser promovido ao nivel de confianza 1."
@@ -1564,191 +1667,325 @@ gl:
     tl2_requires_read_posts: "Número de publicacións que un novo usuario debe ler antes de ser promovido ao nivel de confianza 2."
     tl2_requires_time_spent_mins: "Número de minutos que un novo usuario debe permanecer lendo publicacións antes de ser promovido ao nivel de confianza 2."
     tl2_requires_days_visited: "Número de días que un novo usuario debe visitar o sitio antes de ser promovido ao nivel de confianza 2."
-    tl2_requires_likes_received: "Número de gústames que un novo usuario debe recibir antes de ser promovido ao nivel de confianza 2."
-    tl2_requires_likes_given: "Número de gústames que un novo usuario debe dar antes de ser promovido ao nivel de confianza 2."
+    tl2_requires_likes_received: "Número de gústame que un novo usuario debe recibir antes de ser promovido ao nivel de confianza 2."
+    tl2_requires_likes_given: "Número de gústame que un novo usuario debe dar antes de ser promovido ao nivel de confianza 2."
     tl2_requires_topic_reply_count: "Número de temas que un novo usuario debe responder antes de ser promovido ao nivel de confianza 2."
     tl3_time_period: "Período obrigatorio para obter o nivel de confianza 3 (en días)"
-    tl3_requires_days_visited: " Número mínimo de días que un usuario debe ter visitado o sitio nos últimos (período nc3) días para poder ser promovido ao nivel de confianza 3. Establece un valor superior para desactivar a posibilidade de subir a nivel de confianza 3 (0 ou máis)."
-    tl3_requires_topics_replied_to: " Número mínimo de temas en que un usuario debe ter respondido nos últimos (período nc3) días para poder ser promovido ao nivel de confianza 3 (0 ou máis)."
-    tl3_requires_topics_viewed: "Porcentaxe de temas creados nos últimos (período nc3) días que un usuario necesita ter visto para poder ser promovido ao nivel de confianza 3 (de 0 a 100)."
+    tl3_requires_days_visited: "Número mínimo de días que un usuario debe visitar o sitio nos últimos (período nc3) días para poder ser promovido ao nivel de confianza 3. Estabelece un valor superior para desactivar a posibilidade de subir a nivel de confianza 3 (0 ou máis)."
+    tl3_requires_topics_replied_to: "Número mínimo de temas en que un usuario debe responder nos últimos (período nc3) días para poder ser promovido ao nivel de confianza 3 (0 ou máis)."
+    tl3_requires_topics_viewed: "Porcentaxe de temas creados nos últimos (período nc3) días que un usuario necesita ver para poder ser promovido ao nivel de confianza 3 (de 0 a 100)."
     tl3_requires_topics_viewed_cap: "O número máximo de temas vistos obrigatorio nos últimos (período nc3) días."
-    tl3_requires_posts_read: "Porcentaxe de publicacións creadas nos últimos (período nc3) días que un usuario necesita ter visto para poder ser promovido ao nivel de confianza 3 (de 0 a 100)."
+    tl3_requires_posts_read: "Porcentaxe de publicacións creadas nos últimos (período nc3) días que un usuario necesita ver para poder ser promovido ao nivel de confianza 3 (de 0 a 100)."
     tl3_requires_posts_read_cap: "O número máximo de publicacións lidas obrigatorio nos últimos (período nc3) días."
-    tl3_requires_topics_viewed_all_time: "O número total mínimo de temas que un usuario debe ter visto para poder ser promovido ao nivel de confianza 3."
-    tl3_requires_posts_read_all_time: "O número total mínimo de publicacións que un usuario debe ter lido para poder ser promovido ao nivel de confianza 3."
+    tl3_requires_topics_viewed_all_time: "O número total mínimo de temas que un usuario debe ver para poder ser promovido ao nivel de confianza 3."
+    tl3_requires_posts_read_all_time: "O número total mínimo de publicacións que un usuario debe ler para poder ser promovido ao nivel de confianza 3."
     tl3_requires_max_flagged: "O usuario non debe levar máis de x publicacións denunciadas por x diferentes usuarios nos últimos (período nc3) días para cumprir cos requisitos de promoción ao nivel de confianza 3, onde x é o valor desta opción (0 ou máis)."
     tl3_promotion_min_duration: "O número mínimo de días que unha promoción ao nivel de confianza 3 debe ter antes de que o usuario poida ser rebaixado de volta ao nivel de confianza 2."
-    tl3_requires_likes_given: " Número mínimo de gústames que un usuario debe dar nos últimos (período nc3) días para poder ser promovido ao nivel de confianza 3."
-    tl3_requires_likes_received: " Número mínimo de gústames que un usuario debe ter recibido nos últimos (período nc3) días para poder ser promovido ao nivel de confianza 3."
+    tl3_requires_likes_given: "Número mínimo de gústame que un usuario debe dar nos últimos (período nc3) días para poder ser promovido ao nivel de confianza 3."
+    tl3_requires_likes_received: "Número mínimo de gústame que un usuario debe recibir nos últimos (período nc3) días para poder ser promovido ao nivel de confianza 3."
     tl3_links_no_follow: "Non retirar rel=nofollow das ligazóns publicadas por usuarios con nivel de confianza 3."
     trusted_users_can_edit_others: "Permitir aos usuarios con altos niveis de confianza editar contido doutros usuarios"
     min_trust_to_create_topic: "O nivel de confianza mínimo requirido para crear un novo tema."
-    allow_flagging_staff: "De estar habilitado, os usuarios poden denunciar publicacións feitas desde contas do equipo."
+    allow_flagging_staff: "De estar activado, os usuarios poden denunciar publicacións feitas desde contas do equipo."
     min_trust_to_edit_wiki_post: "O nivel de confianza mínimo requirido para editar unha publicación marcada como wiki."
     min_trust_to_edit_post: "O nivel de confianza mínimo requirido para editar publicacións."
     min_trust_to_allow_self_wiki: "O nivel de confianza mínimo requirido para facer que un usuario converta as súas publicacións a wiki."
     min_trust_to_send_messages: "O nivel de confianza mínimo requirido para crear novas mensaxes persoais."
     min_trust_to_flag_posts: "O nivel de confianza mínimo requirido para denunciar publicacións"
-    min_trust_to_post_links: "O nivel de confianza mínimo requirido para incluír ligazóns nas publicacións."
+    min_trust_to_post_links: "O nivel de confianza mínimo requirido para incluír ligazóns nas publicacións"
+    min_trust_to_post_embedded_media: "O nivel de confianza mínimo requirido para incorporar elementos multimedia a unha publicación"
+    min_trust_level_to_allow_profile_background: "O nivel de confianza mínimo requirido para cargar un fondo de perfil"
+    min_trust_level_to_allow_user_card_background: "O nivel de confianza mínimo requirido para cargar un fondo de tarxeta de usuario"
+    min_trust_level_to_allow_invite: "O nivel de confianza mínimo requirido para invitar usuarios"
+    min_trust_level_to_allow_ignore: "O nivel de confianza mínimo requirido para ignorar usuarios"
+    allowed_link_domains: "Dominios que os usuarios poden vincular mesmo se non teñen o nivel de confianza apropiado para publicar ligazóns"
     newuser_max_links: "Número de ligazóns que un novo usuario pode engadir nunha publicación."
+    newuser_max_embedded_media: "Cantos elementos multimedia incorporados pode engadir un novo usuario a unha publicación."
     newuser_max_attachments: "Número de ficheiros anexos que un novo usuario pode engadir nunha publicación."
     newuser_max_mentions_per_post: "Número máximo de mencións a @usuarios que un novo usuario pode facer nunha publicación."
     newuser_max_replies_per_topic: "Número máximo de respostas que un usuario novo pode dar no mesmo tema antes de que alguén responda."
     max_mentions_per_post: "Número máximo de mencións a @usuarios que alguén pode facer nunha publicación."
     max_users_notified_per_group_mention: "Número máximo de usuarios que serán notificados se se menciona un grupo (se se chega ao límite, non se enviará notificación ningunha)"
     enable_mentions: "Permitir aos usuarios mencionar outros usuarios."
+    create_thumbnails: "Crear miniaturas e imaxes en modo galería cando son demasiado grandes para encaixar nunha publicación."
     email_time_window_mins: "Agardar (n) minutos antes de enviar correos electrónicos a modo de notificación para darlles aos usuarios a posibilidade de editaren e remataren as súas publicacións."
     personal_email_time_window_seconds: "Agardar (n) minutos antes de enviar correos electrónicos a modo de mensaxe persoal para darlles aos usuarios a posibilidade de editaren e remataren as súas publicacións."
     email_posts_context: "Número de respostas previas que se inclúen como contexto nos correos electrónicos das notificacións."
     flush_timings_secs: "Frecuencia en segundos con que se sincronizan os datos co servidor."
     title_max_word_length: "Extensión máxima permitida dunha palabra, en caracteres, no título dun tema."
-    title_min_entropy: "A mínima entropía mínima (caracteres únicos) que se require para o título do tema."
-    body_min_entropy: "A mínima entropía mínima (caracteres únicos) que se require para o corpo dunha publicación."
+    title_min_entropy: "A entropía mínima (caracteres únicos) que se require para o título do tema."
+    body_min_entropy: "A entropía mínima (caracteres únicos) que se require para o corpo dunha publicación."
     allow_uppercase_posts: "Permitir todas en maiúsculas no título dun tema ou no corpo dunha publicación."
     max_consecutive_replies: "Número de publicacións continuadas que un usuario ten que facer antes de que se lle prohiba engadir outra resposta."
-    title_fancy_entities: "Converter caracteres ASCII en entidades HTML de adorno no título dos temas, como SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
+    enable_filtered_replies_view: 'O botón «(n) respostas» contrae todas as demais publicacións e só amosa a publicación actual e as súas respostas.'
+    title_fancy_entities: "Converter caracteres ASCII en entidades HTML elegantes no título dos temas, como SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "A lonxitude mínima dun título antes de se comprobar para temas similares."
     desktop_category_page_style: "Estilo visual para a páxina de /categorías."
     category_colors: "Unha listaxe de valores hexadecimais das cores permitidas para as categorías."
     category_style: "Estilo visual para as insignias das categorías."
+    default_dark_mode_color_scheme_id: "O esquema de cores empregado no modo escuro."
+    dark_mode_none: "Ningún"
     max_image_size_kb: "O tamaño máximo dunha imaxe en kB. Isto configúrase en nginx (client_max_body_size) / apache ou proxy tamén. As imaxes cun tamaño superior e inferior ao client_max_body_size serán adaptadas para se axustar ao tamaño de subida."
     max_attachment_size_kb: "O tamaño máximo dos ficheiros anexos en kB. Isto configúrase en nginx (client_max_body_size) / apache ou proxy tamén."
-    authorized_extensions: "Unha listaxe das extensións de ficheiro permitidas para subir (utiliza '*' para habilitar todos os tipos de ficheiro)"
-    authorized_extensions_for_staff: "Unha listaxe das extensións de ficheiro permitidas para subir aos membros do equipo sumada á listaxe definida na configuración `authorized_extensions` (utiliza '*' para habilitar todos os tipos de ficheiros)"
-    theme_authorized_extensions: "Unha listaxe das extensións de ficheiro permitidas para subir temas (utiliza '*' para habilitar todos os tipos de ficheiro)"
+    authorized_extensions: "Unha listaxe das extensións de ficheiro permitidas para subir (utiliza '*' para activar todos os tipos de ficheiro)"
+    authorized_extensions_for_staff: "Unha listaxe das extensións de ficheiro permitidas para subir aos membros do equipo sumada á listaxe definida na configuración `authorized_extensions` (utiliza '*' para activar todos os tipos de ficheiros)"
+    theme_authorized_extensions: "Unha listaxe das extensións de ficheiro permitidas para subir temas (utiliza '*' para activar todos os tipos de ficheiro)"
     max_similar_results: "Número de temas similares que se mostran na parte superior do editor cando se está a redactar un novo tema. A comparación baséase no título e mais no corpo da mensaxe."
     max_image_megapixels: "Número máximo de megapíxeles permitidos para unha imaxe. Aquelas cun número superior serán rexeitadas."
-    title_prettify: "Previr erros comúns no título, incluídos os títulos escritos con todo en maiúsculas, coa primeira letra en minúscula, con múltiples signos ! ou ?, punto final etc."
-    title_remove_extraneous_space: "Eliminar os espazos en branco diante da puntuación final."
+    title_prettify: "Previr erros frecuentes no título, incluídos os títulos escritos con todo en maiúsculas, coa primeira letra en minúscula, con múltiples signos ! ou ?, punto final etc."
+    title_remove_extraneous_space: "Retirar os espazos en branco diante da puntuación final."
+    automatic_topic_heat_values: 'Actualizar automaticamente a configuración de «vista de temas candentes» e «popularidade en valoracións de tema» en función da actividade do sitio.'
     topic_views_heat_low: "Despois deste número de vistas, o campo Vistas resaltarase lixeiramente."
     topic_views_heat_medium: "Despois deste número de vistas, o campo Vistas resaltarase moderadamente."
     topic_views_heat_high: "Despois deste número de vistas, o campo Vistas resaltarase fortemente."
     cold_age_days_low: "Despois destes días de conversa, a data da última actividade atenuarase lixeiramente."
     cold_age_days_medium: "Despois destes días de conversa, a data da última actividade atenuarase moderadamente."
     cold_age_days_high: "Despois destes días de conversa, a data da última actividade atenuarase fortemente."
-    history_hours_low: "Unha publicación editada dentro deste número en horas ten o indicador de edición lixeiramente resaltado."
+    history_hours_low: "Unha publicación editada dentro deste número en horas ten o indicador de edición lixeiramente resaltado"
     history_hours_medium: "Unha publicación editada dentro deste número en horas ten o indicador de edición moderadamente resaltado."
     history_hours_high: "Unha publicación editada dentro deste número en horas ten o indicador de edición fortemente resaltado."
-    topic_post_like_heat_low: "Despois de que a proporción gústame:publicacións supere esta porcentaxe, o campo onde se contan as publicacións resaltarase lixeiramente."
-    topic_post_like_heat_medium: "Despois de que a proporción gústame:publicacións supere esta porcentaxe, o campo onde se contan as publicacións resaltarase moderadamente."
-    topic_post_like_heat_high: "Despois de que a proporción gústame:publicacións supere esta porcentaxe, o campo onde se contan as publicacións resaltarase fortemente."
-    faq_url: "Se tes un documento con preguntas frecuentes aloxado en calquera outro sitio e queres usalo, insire aquí o seu URL completo."
-    tos_url: "Se tes un documento cos termos do servizo aloxado en calquera outro sitio e queres usalo, insire aquí o seu URL completo."
-    privacy_policy_url: "Se tes un documento coa política de privacidade aloxado en calquera outro sitio e queres usalo, insire aquí o seu URL completo."
-    log_anonymizer_details: "Manter ou non os detalles dun usuario no rexistro despois de seren anonimizados. Para cumprir co RXPD, deberás desactivalo."
-    newuser_spam_host_threshold: "Número de veces que un novo usuario pode publicar unha ligazón ao mesmo dominio dentro de `newuser_spam_host_threshold` das súas publicacións antes de ser considerado lixo."
+    topic_post_like_heat_low: "Despois de que a proporción gústame:publicacións supere esta porcentaxe, o campo de reconto de publicacións resaltarase lixeiramente."
+    topic_post_like_heat_medium: "Despois de que a proporción gústame:publicacións supere esta porcentaxe, o campo de reconto de publicacións resaltarase moderadamente."
+    topic_post_like_heat_high: "Despois de que a proporción gústame:publicacións supere esta porcentaxe, o campo de reconto de publicacións resaltarase fortemente."
+    faq_url: "Se ten un documento con preguntas frecuentes aloxado en calquera outro sitio e quere usalo, insira aquí o seu URL completo."
+    tos_url: "Se ten un documento cos termos do servizo aloxado en calquera outro sitio e quere usalo, insira aquí o seu URL completo."
+    privacy_policy_url: "Se ten un documento coa política de privacidade aloxado en calquera outro sitio e quere usalo, insira aquí o seu URL completo."
+    log_anonymizer_details: "Manter ou non os detalles dun usuario no rexistro despois de seren anonimizados. Para cumprir co RXPD, deberá desactivalo."
+    newuser_spam_host_threshold: "Número de veces que un novo usuario pode publicar unha ligazón ao mesmo dominio dentro do seu `newuser_spam_host_threshold` das publicacións antes de ser considerado lixo."
+    allowed_spam_host_domains: "Unha listaxe de dominios excluídos das probas de servidores lixo. Nunca se lles restrinxirá aos usuarios novos a creación de publicacións con ligazóns a estes dominios."
+    staff_like_weight: "Canto peso terán as valoracións do equipo (as valoracións dos que non son do grupo terán un peso de 1.)"
     topic_view_duration_hours: "Contar unha visita a un novo tema por IP/usuario cada N horas"
     user_profile_view_duration_hours: "Contar unha visita de perfil por IP/usuario cada N horas"
     levenshtein_distance_spammer_emails: "Ao revisar coincidencias en correos electrónicos de remitentes non desexados, número de caracteres diferentes que permiten una coincidencia parcial."
-    max_new_accounts_per_registration_ip: "Se hai xa (n) contas con nivel de confianza 0 desde esta IP (e ningunha é dun membro do equipo ou de nivel de confianza 2 ou superior), prohibir rexistros novos desde esa IP."
+    max_new_accounts_per_registration_ip: "Se hai xa (n) contas con nivel de confianza 0 desde este IP (e ningunha é dun membro do equipo ou de nivel de confianza 2 ou superior), prohibir rexistros novos desde ese IP."
+    min_ban_entries_for_roll_up: "Ao premer no botón Pregar, crearase unha nova entrada de veto de subrede se hai polo menos (N) entradas."
     max_age_unmatched_emails: "Eliminar entradas de correos electrónicos prohibidos que non coincidan despois de (N) días."
     max_age_unmatched_ips: "Eliminar entradas de IP prohibidas que non coincidan despois de (N) días."
-    num_flaggers_to_close_topic: "Número mínimo de denunciantes únicos necesario para automaticamente pausar un tema para a súa intervención"
-    num_hours_to_close_topic: "Número de horas que se pausa un tema para a súa intervención."
+    num_flaggers_to_close_topic: "Número mínimo de denunciantes únicos necesario para pausar automaticamente un tema co fin de intervilo"
+    num_hours_to_close_topic: "Número de horas que se pausa un tema co fin de intervilo."
     auto_respond_to_flag_actions: "Activar a resposta automática ao desfacer unha denuncia."
-    min_first_post_typing_time: "Período mínimo en milisegundos durante o que un usuario debe escribir na súa primeira publicación; se non chega a este limiar, a publicación pasará automaticamente á cola de moderación. Establézase en 0 para desactivar (non recomendado)."
-    auto_silence_fast_typers_on_first_post: "Silenciar automaticamente a aqueles usuarios que non cumpran o limiar establecido en min_first_post_typing_time"
+    min_first_post_typing_time: "Período mínimo en milisegundos durante o cal un usuario debe escribir na súa primeira publicación; se non chega a este limiar, a publicación pasará automaticamente á cola de moderación. Estabelecer en 0 para desactivar (non recomendado)."
+    auto_silence_fast_typers_on_first_post: "Silenciar automaticamente a aqueles usuarios que non cumpran o limiar estabelecido en min_first_post_typing_time"
     auto_silence_fast_typers_max_trust_level: "Nivel máximo de confianza para silenciar automaticamente a quen escribe moi rápido"
+    auto_silence_first_post_regex: "Expresión regular indiferente ás maiúsculas que de pasarse provocará que a primeira publicación do usuario se vexa silenciada e remitida á cola de aprobación. Exemplo: rabia|a[bc]a, fará que primeiro se silencien todas as mensaxes que conteñan rabia ou aba ou aca. Só se aplica á primeira publicación."
     reviewable_claiming: "É necesario reclamar o contido revisable antes de poder actuar sobre el?"
     reviewable_default_topics: "Mostrar por defecto o contido revisable agrupado por tema"
     reviewable_default_visibility: "Non mostrar os elementos revisables a non ser que cumpran con esta prioridade"
     high_trust_flaggers_auto_hide_posts: "As publicacións de usuarios novos ocúltanse automaticamente tras ser denunciadas como lixo ou non desexadas por un usuario con NC3 ou superior"
     cooldown_hours_until_reflag: "Tempo que os usuarios deberán agardar antes de volver denunciar unha publicación"
-    reply_by_email_enabled: "Habilitar a resposta aos temas por correo electrónico."
+    reply_by_email_enabled: "Activar a resposta aos temas por correo electrónico."
+    reply_by_email_address: "Modelo para responder a enderezos de correo electrónico entrantes, por exemplo: %%{reply_key}@reply.example.com ou respostas+%%{reply_key}@example.com"
+    alternative_reply_by_email_addresses: "Lista de modelos alternativos para responder a enderezos de correo electrónico entrantes. Exemplo: %%{reply_key}@reply.example.com|respostas+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Utilizar HTML no canto de texto para o correo entrante."
-    strip_incoming_email_lines: "Elimina os espazos en branco iniciais e finais de cada liña de correos electrónicos entrantes."
-    disable_emails: "Evite que Discourse envíe calquera clase de correo electrónico. Seleccione «si» para desactivar os correos electrónicos a todos os usuarios. Seleccione «non equipo» para desactivar os correos electrónicos só para usuarios que non sexan do equipo."
+    strip_incoming_email_lines: "Retirar os espazos en branco iniciais e finais de cada liña de correos electrónicos entrantes."
+    disable_emails: "Evita que Discourse envíe calquera clase de correo electrónico. Seleccione «si» para desactivar os correos electrónicos a todos os usuarios. Seleccione «non do equipo» para desactivar os correos electrónicos só para usuarios que non sexan do equipo."
+    strip_images_from_short_emails: "Elimina as imaxes de correos electrónicos que teñan un tamaño inferior a 2800 bytes"
     short_email_length: "Lonxitude dun correo curto en bytes"
-    display_name_on_email_from: "Mostrar nomes completos nos campos de remitente do correo"
+    display_name_on_email_from: "Amosar nomes completos nos campos de remitente do correo"
     unsubscribe_via_email: "Permitir aos usuarios darse de baixa dos correos electrónicos ao responder co texto «cancelar subscrición» no asunto ou no corpo da mensaxe"
     unsubscribe_via_email_footer: "Anexar unha ligazón para se dar de baixa no pé dos correos electrónicos"
-    delete_email_logs_after_days: "Eliminar os rexistros dos correos electrónicos despois de (N) días. Establézase en 0 para manter indefinidamente."
-    disallow_reply_by_email_after_days: "Deshabilitar a resposta por correo electrónico despois de (N) días. Establézase en 0 para manter indefinidamente."
-    max_emails_per_day_per_user: "Número máximo de correos electrónicos que se enviarán aos usuarios por día. Establézase en 0 para desactivar este límite."
-    enable_staged_users: "Crear usuarios provisorios automaticamente ao procesar correos electrónicos entrantes."
-    maximum_staged_users_per_email: "Número máximo de usuarios provisorios creados ao procesar un correo electrónico entrante."
+    delete_email_logs_after_days: "Eliminar os rexistros dos correos electrónicos despois de (N) días. Establézase en 0 para manter indefinidamente"
+    disallow_reply_by_email_after_days: "Deshabilitar a resposta por correo electrónico despois de (N) días. Establézase en 0 para manter indefinidamente"
+    max_emails_per_day_per_user: "Número máximo de correos electrónicos que se enviarán aos usuarios por día. Establézase en 0 para desactivar este límite"
+    enable_staged_users: "Crear usuarios transitorios automaticamente ao procesar correos electrónicos entrantes."
+    maximum_staged_users_per_email: "Número máximo de usuarios transitorios creados ao procesar un correo electrónico entrante."
+    auto_generated_allowlist: "Lista de enderezos de correo electrónico que non se comprobarán no seu contido xerado automaticamente. Exemplo: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Bloquear correo electrónico entrante que se identificou como xerado automaticamente."
     ignore_by_title: "Ignorar correos electrónicos entrantes con base no seu título."
     mailgun_api_key: "Chave secreta da API de Mailgun utilizada para verificar mensaxes vía webhook."
+    soft_bounce_score: "Puntuación de devolución engadida ao usuario cando se produce unha devolución temporal."
+    hard_bounce_score: "Puntuación de devolución engadida ao usuario cando se produce unha devolución permanente."
+    bounce_score_threshold: "Puntuación máxima de devolución antes de retirar os envíos por correo a un usuario."
+    reset_bounce_score_after_days: "Restabelece automaticamente a puntuación de devolución despois de X días."
+    blocked_attachment_content_types: "Listaxe de palabras clave empregadas para bloquear anexos en función do tipo de contido."
+    blocked_attachment_filenames: "Listaxe de palabras clave usadas para bloquear anexos en función do nome do ficheiro."
     forwarded_emails_behaviour: "Como tratar o correo electrónico reenviado en Discourse"
-    always_show_trimmed_content: "Mostrar sempre a parte recortada dos correos electrónicos entrantes. AVISO: podería supor revelar enderezos de correo."
+    always_show_trimmed_content: "Mostrar sempre a parte recortada dos correos electrónicos entrantes. AVISO: podería supor ofrecer enderezos de correo."
     private_email: "Non incluír contido de publicacións ou temas no título ou o corpo do correo electrónico. NOTA: tamén desactiva os boletíns por correo electrónico."
-    email_total_attachment_size_limit_kb: "Tamaño máximo total dos ficheiros anexos a correos electrónicos saíntes. Establézase o valor en 0 para desactivar o envío de ficheiros anexos."
-    post_excerpts_in_emails: "Nos correos de notificación, enviar sempre extractos no canto de publicacións completas."
+    post_excerpts_in_emails: "Nos correos de notificación, enviar sempre extractos no canto de publicacións completas"
     raw_email_max_length: "Número de caracteres que deben almacenarse para o correo entrante."
     raw_rejected_email_max_length: "Número de caracteres que deben almacenarse para o correo entrante rexeitado."
     delete_rejected_email_after_days: "Eliminar correos entrantes con máis de (n) días de antigüidade."
+    manual_polling_enabled: "Enviar correos electrónicos usando a API de resposta ao correo."
+    pop3_polling_enabled: "Recoller a través de POP3 as respostas por correo."
     pop3_polling_ssl: "Utilizar SSL mentres se conecta ao servidor POP3 (recomendado)"
     pop3_polling_openssl_verify: "Verificar certificado TLS (por defecto: activado)"
-    pop3_polling_period_mins: "Período en minutos entre revisións de correo da conta POP3. NOTA: cómpre reiniciar."
-    pop3_polling_delete_from_server: "Eliminar correos do servidor. NOTA: se deshabilitas isto, deberás limpar manualmente a caixa de entrada"
+    pop3_polling_period_mins: "Período en minutos entre revisións de correo da conta POP3. NOTA: cómpre rearrancar."
+    pop3_polling_port: "O porto no que recoller unha conta POP3 activa."
+    pop3_polling_host: "O servidor no que recoller o correo vía POP3."
+    pop3_polling_username: "O nome de usuario da conta POP3 na que recoller o correo."
+    pop3_polling_password: "O contrasinal da conta POP3 na que recoller o correo."
+    pop3_polling_delete_from_server: "Eliminar correos do servidor. NOTA: se desactiva isto, deberá limpar manualmente a caixa de entrada"
     log_mail_processing_failures: "Rexistrar todos os erros de procesamento do correo en <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    email_in: 'Permitir aos usuarios publicar temas novos por correo electrónico (require unha recollida manual ou con pop3). Configure os enderezos na lapela «Configuración» de cada categoría.'
     email_in_min_trust: "O nivel de confianza mínimo requirido para poder publicar vía correo electrónico."
     email_in_authserv_id: "O identificador do servizo que realiza revisións de autenticación no correo entrante. Revisa <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> para obter instrucións sobre como configurar isto."
-    email_in_spam_header: "A cabeceira do correo para detectar correo lixo."
-    enable_imap: "Habilitar IMAP para sincronizar mensaxes de grupo."
-    imap_polling_period_mins: "Período en minutos entre revisións das contas IMAP para correos electrónicos"
+    email_in_spam_header: "A cabeceira de correo para detectar correo lixo."
+    enable_imap: "Activar IMAP para sincronizar mensaxes de grupo."
+    enable_imap_write: "Activar a sincronización IMAP bidireccional. Se está desactivada, todas as operacións de escritura das contas IMAP están desactivadas."
+    enable_imap_idle: "Utilice o mecanismo IMAP IDLE para agardar por novos correos electrónicos."
+    enable_smtp: "Active SMTP para enviar notificacións de mensaxes de grupo."
+    imap_polling_period_mins: "Período en minutos entre revisións das contas IMAP para correos electrónicos."
+    imap_polling_old_emails: "Número máximo de correos electrónicos antigos (procesados) que se actualizarán cada vez que se recolla unha caixa de correo IMAP (0 para todos)."
+    imap_polling_new_emails: "Número máximo de correos electrónicos novos (sen procesar) que se actualizarán cada vez que se recolla unha caixa de correo IMAP."
+    imap_batch_import_email: "O número mínimo de correos electrónicos novos que disparan o modo de importación (desactiva as alertas de publicación)."
+    email_prefix: "A [label] utilizada no asunto dos correos. Será «título» se non se define."
+    email_site_title: "O título do sitio utilizado como remitente de correos electrónicos do sitio. Será o de «título» se non se estabelece. Se o seu «título» contén caracteres que non están permitidos nas cadeas do remitente de correo electrónico, utilice este axuste."
+    find_related_post_with_key: "Utilice só a «clave de resposta» para atopar a publicación respondida. AVISO: desactivar isto permite a suplantación de identidade do usuario baseada no enderezo de correo electrónico."
     minimum_topics_similar: "Número de temas que ten que haber no foro para que ao ir crear outros novos se mostren temas similares."
-    relative_date_duration: "Número de días posteriores a unha publicación a partir de cando as datas se mostran como relativas (7 d) no canto de absolutas (20 feb)."
+    relative_date_duration: "Número de días posteriores a unha publicación a partir dos cales as datas se mostran como relativas (7 d) no canto de absolutas (20 feb)."
     delete_user_max_post_age: "Non permitir eliminar usuarios cuxa primeira publicación teña unha antigüidade de (x) días."
     delete_all_posts_max: "Número máximo de publicacións que se poden eliminar de vez co botón Eliminar todas as publicacións. Se un usuario ten un número de publicacións maior, estas non se poderán eliminar e tampouco o usuario."
-    delete_user_self_max_post_count: "Número máximo de publicacións que pode ter un usuario ao tempo que permite a autoeliminación da conta. Establézase en -1 para deshabilitar a dita autoeliminación."
+    delete_user_self_max_post_count: "Número máximo de publicacións que pode ter un usuario ao tempo se que permite a autoeliminación da conta. Estabelecer en -1 para desactivar esa autoeliminación."
     username_change_period: "Número máximo de días, despois do rexistro, durante os que se pode mudar de nome de usuario (0 para desactivar o cambio de nome de usuario)."
-    email_editable: "Permitir aos usuarios cambiar o seu enderezo electrónico despois de se rexistraren."
+    email_editable: "Permitir que os usuarios cambien o seu enderezo electrónico despois de se rexistraren."
     logout_redirect: "Localización a onde redirixir o navegador despois de pechar sesión (ex.: https://example.com/logout)"
-    allow_uploaded_avatars: "Permitir aos usuarios subir imaxes de perfil personalizadas."
+    allow_uploaded_avatars: "Permitir que os usuarios suban imaxes de perfil personalizadas."
     default_avatars: "URL dos avatares que se utilizarán para os usuarios novos ata que estes os cambien."
     automatically_download_gravatars: "Descargar Gravatars para os usuarios ao crear unha conta ou cambiar de correo electrónico."
-    digest_topics: "Número máximo de publicacións destacadas que se mostran no correo electrónico de resumo."
-    digest_posts: "Número máximo de temas destacados que se mostran no correo electrónico de resumo."
-    digest_other_topics: "Número máximo de temas para mostrar na sección 'Novidades en temas e categorías que segues' do correo electrónico de resumo."
+    digest_topics: "Número máximo de publicacións destacadas que se amosan no correo electrónico de resumo."
+    digest_posts: "Número máximo de temas destacados que se amosan no correo electrónico de resumo."
+    digest_other_topics: "Número máximo de temas para mostrar na sección «Novidades dos temas e categorías que segue» do correo electrónico de resumo."
     digest_min_excerpt_length: "Extensión mínima, en caracteres, do extracto das publicacións nos correos electrónicos resumo."
     suppress_digest_email_after_days: "Suprimir os correos electrónicos de resumo para aqueles usuarios que non visitan o sitio desde hai máis de (n) días."
     digest_suppress_categories: "Suprimir estas categorías dos correos electrónicos de resumo."
-    disable_digest_emails: "Deshabilitar os correos electrónicos de resumo para todos os usuarios."
+    disable_digest_emails: "Desactivar os correos electrónicos de resumo para todos os usuarios."
     apply_custom_styles_to_digest: "Os modelos de correo electrónico e css aplícanse aos correos electrónicos de resumo."
-    email_accent_bg_color: " A cor para realizar que se utiliza como fondo nalgúns elementos nos correos electrónicos HTML. Insire un nome («vermello») ou un valor hexadecimal («#FF0000»)."
-    max_daily_gravatar_crawls: "Número máximo de veces ao día que Discourse comprobará Gravatar  na procura de avatares personalizadas."
-    enable_user_directory: "Proporcionar un directorio de usuarios para explorar"
-    allow_anonymous_posting: "Permitir aos usuarios cambiar ao modo anónimo"
+    email_accent_bg_color: "A cor de énfase que se utiliza como fondo nalgúns elementos nos correos electrónicos HTML. Insira un nome («vermello») ou un valor hexadecimal («#FF0000»)."
+    email_accent_fg_color: "A cor do texto representado na cor de fondo do correo electrónico nos correos HTML. Introduza un nome de cor («branco») ou un valor hexadecimal («#FFFFFF»)."
+    email_link_color: "A cor das ligazóns nos correos HTML. Introduza un nome de cor («azul») ou un valor hexadecimal («# 0000FF»)."
+    detect_custom_avatars: "Comprobar se os usuarios cargaron imaxes personalizadas ao perfil ou non."
+    max_daily_gravatar_crawls: "Número máximo de veces ao día que Discourse comprobará Gravatar na procura de avatares personalizados"
+    public_user_custom_fields: "Unha listaxe de campos personalizados do usuario que se poden recuperar coa API."
+    staff_user_custom_fields: "Unha listaxe de campos personalizados que poden ser recuperados polo equipo coa API."
+    enable_user_directory: "Fornecer un directorio de usuarios para explorar"
+    enable_group_directory: "Fornecer un directorio de grupos para explorar"
+    enable_category_group_moderation: "Permitirlles aos grupos moderar contido en categorías específicas"
+    group_in_subject: "Estabelece %%{optional_pm} no asunto do correo electrónico co nome do primeiro grupo en MP, véxase: <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>Personaliza o formato do asunto para correos estándar</a>"
+    allow_anonymous_posting: "Permitir que os usuarios cambien ao modo anónimo"
     anonymous_posting_min_trust_level: "O nivel de confianza mínimo requirido para activar a publicación anónima"
-    anonymous_account_duration_minutes: "Para protexer o anonimato, crear unha nova conta anónima cada N minutos para cada usuario. Exemplo: se se establece en 600, axiña que pasen 600 minutos desde a última publicación E o usuario cambie a anónimo, crearase unha nova conta anónima."
-    allow_featured_topic_on_user_profiles: "Permitir aos usuarios destacar unha ligazón a un tema da súa tarxeta de usuario e perfil."
+    anonymous_account_duration_minutes: "Para protexer o anonimato, crear unha nova conta anónima cada N minutos para cada usuario. Exemplo: se se estabelece en 600, así que pasen 600 minutos desde a última publicación E o usuario cambie a anónimo, crearase unha nova conta anónima."
+    hide_user_profiles_from_public: "Desactivar tarxetas de usuario, perfís de usuario e directorio de usuarios para usuarios anónimos."
+    allow_users_to_hide_profile: "Permitirlles aos usuarios agochar o seu perfil e presenza"
+    allow_featured_topic_on_user_profiles: "Permitir aos usuarios salientar unha ligazón a un tema da súa tarxeta de usuario e perfil."
     show_inactive_accounts: "Permitir aos usuarios coa sesión iniciada ver os perfís de contas inactivas."
-    hide_suspension_reasons: "Non mostrar publicamente os motivos de suspensión nos perfís dos usuarios."
+    hide_suspension_reasons: "Non amosar publicamente os motivos de suspensión nos perfís dos usuarios."
+    log_personal_messages_views: "Rexistra as visualizacións de mensaxes persoais por parte do administrador para outros usuarios/grupos."
     ignored_users_count_message_threshold: "Notificar aos moderadores se un usuario en particular é ignorado por moitos outros."
     ignored_users_message_gap_days: "Tempo de espera antes de lles volver notificar aos moderadores que un usuario é ignorado por moitos outros."
-    clean_up_inactive_users_after_days: "Número de días antes de que se elimine un usuario inactivo (nivel de confianza 0 sen publicacións). Para desactivar esta opción establézase en 0."
-    clean_up_unused_staged_users_after_days: "Número de días antes de que un usuario temporal (sen actividade) sexa eliminado. Para desactivar esta opción establézase en 0."
-    max_notifications_per_user: "Número máximo de notificacións por usuario. Se se supera este número, as notificacións antigas eliminaranse; aplicación semanal. Establézase en 0 para desactivalo."
-    allow_profile_backgrounds: "Permitir aos usuarios subir fondos de perfil."
+    clean_up_inactive_users_after_days: "Número de días antes de que se retire un usuario inactivo (nivel de confianza 0 sen publicacións). Para desactivar esta opción establézase en 0."
+    clean_up_unused_staged_users_after_days: "Número de días antes de que un usuario transitorio (sen actividade) sexa retirado. Para desactivar esta opción establézase en 0."
+    user_selected_primary_groups: "Permitirlles aos usuarios estabelecer o seu propio grupo principal"
+    max_notifications_per_user: "Número máximo de notificacións por usuario. Se se supera este número, as notificacións antigas eliminaranse. Aplicación semanal. Estabelecer en 0 para desactivalo"
+    allowed_user_website_domains: "O sitio web do usuario verificarase respecto destes dominios. Listaxe separada por barras verticais."
+    allow_profile_backgrounds: "Permitir que os usuarios suban fondos de perfil."
     sequential_replies_threshold: "Número de publicacións seguidas que un usuario ten que facer nun tema antes de que se lle lembre que son demasiadas repostas consecutivas."
     get_a_room_threshold: "Número de publicacións que un usuario debe facerlle á mesma persoa e no mesmo tema antes de recibir unha advertencia."
+    enable_mobile_theme: "Os dispositivos móbiles utilizan un tema adaptado para móbiles, coa posibilidade de trocar o sitio completo. Desactíveo se quere utilizar unha folla de estilo personalizada que sexa completamente adaptábel."
+    dominating_topic_minimum_percent: "Que porcentaxe de publicacións ten que facer un usuario nun tema antes de recordarlle que está sendo acaparado nese tema."
+    disable_avatar_education_message: "Desactiva a mensaxe educativa para cambiar o avatar."
     suppress_uncategorized_badge: "Non mostrar a insignia para temas sen categoría nas listaxes de temas."
-    header_dropdown_category_count: "Número de categorías que se poden mostrar no menú despregable da cabeceira."
+    header_dropdown_category_count: "Número de categorías que se poden amosar no menú despregable da cabeceira."
+    permalink_normalizations: "Aplica a seguinte expresión regular antes de que coincidan con ligazóns permanentes, como por exemplo: /(topic.*)\\?.*/\\1 eliminará as cadeas de consulta das rutas temáticas. O formato é regex+string use \\1 etc. para acceder ás capturas"
+    global_notice: "Amosar un aviso de báner global URXENTE, DE EMERXENCIA e non rexeitábel a todos os visitantes, cambialo a branco para agochalo (permítese HTML)."
+    disable_system_edit_notifications: "Desactiva as notificacións de edición por parte do usuario do sistema cando está activado «download_remote_images_to_local»."
+    notification_consolidation_threshold: "Número de gústame ou solicitudes de adhesión recibidas antes de que as notificacións se fusionen nunha soa. Estabelecer en 0 para desactivar."
     likes_notification_consolidation_window_mins: "Minutos durante os que as notificacións se consolidan nunha única notificación, unha vez que se alcance o limite. O límite pódese configurar en `SiteSetting.notification_consolidation_threshold`."
-    automatically_unpin_topics: "Despegar os temas automaticamente cando o usuario chega ao fondo."
+    automatically_unpin_topics: "Soltar os temas automaticamente cando o usuario chega ao fondo."
     read_time_word_count: "Número de palabras por minuto para calcular o tempo estimado de lectura."
     topic_page_title_includes_category: "A <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>etiqueta do título</a> da páxina do tema inclúe o nome da categoría."
-    native_app_install_banner_ios: "Mostra o anuncio da aplicación DiscourseHub en dispositivos iOS a usuarios habituais (nivel de confianza 1 e superior)."
+    native_app_install_banner_ios: "Amosa o anuncio da aplicación DiscourseHub en dispositivos iOS a usuarios habituais (nivel de confianza 1 e superior)."
+    native_app_install_banner_android: "Amosa o anuncio da aplicación DiscourseHub en dispositivos Android a usuarios habituais (nivel de confianza 1 e superior)."
+    app_association_android: "Contido do <a href='%{base_path}/.well-known/assetlinks.json'>punto de chegada .well-known/assetlinks.json</a>, utilizado para a API Google's Digital Asset Links."
+    app_association_ios: "Contido de <a href='%{base_path}/apple-app-site-association'>punto de chegada de apple-app-site-association</a> , utilizado para crear ligazóns universais entre este sitio e as aplicacións de iOS."
     share_anonymized_statistics: "Compartir estatísticas de uso anonimizadas."
+    auto_handle_queued_age: "Xestione automaticamente rexistros que levan moitos días en espera de seren revisados. As alertas ignoraranse. Rexeitaranse as publicacións e os usuarios en cola. Estabelecer en 0 para desactivar esta funcionalidade."
+    svg_icon_subset: "Engada 5 iconas FontAwesome adicionais que lle gustaría incluír nos seus recursos. Use o prefixo «fa-» para iconas sólidas, «far-» para iconas normais e «fab-» para iconas de marca."
+    max_prints_per_hour_per_user: "Número máximo de accesos/impresións de páxina (estabelecer en 0 para desactivar)"
     full_name_required: "O nome completo no perfil do usuario é obrigatorio."
-    enable_names: "Mostrar o nome completo do usuario no seu perfil, tarxeta de usuario e correos electrónicos. Deshabilitar para agochar o nome completo en todas partes."
+    enable_names: "Mostrar o nome completo do usuario no seu perfil, tarxeta de usuario e correos electrónicos. Desactivar para agochar o nome completo en todas as partes."
     display_name_on_posts: "Mostrar o nome completo de usuario nas súas publicacións, ademais do seu @nomedeusuario."
+    show_time_gap_days: "Se hai dúas publicacións separadas por moitos días, amosar a fenda temporal no tema."
+    short_progress_text_threshold: "Despois de que o número de publicacións nun tema supere este número, a barra de progreso só amosará o número de publicación actual. Se cambia o largo da barra de progreso, pode que precise cambiar este valor."
+    default_code_lang: "O realzado predeterminado da sintaxe da linguaxe de programación aplicado aos bloques de código GitHub (auto, nohighlight, ruby, python etc.)"
+    warn_reviving_old_topic_age: "Cando alguén comeza a responder a un tema onde a última resposta é máis antiga que uns días, amosará un aviso. Desactívase estabelecendo en 0."
+    autohighlight_all_code: "Forza a aplicación do resaltado de código en todos os bloques de código preformatados, mesmo aínda que non se especificase a linguaxe de xeito explícito."
+    highlighted_languages: "Regras de realzado de sintaxe incluídas. (Aviso: incluír demasiadas linguaxes pode afectar o rendemento) véxase: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> para unha demostración"
+    show_copy_button_on_codeblocks: "Engadir un botón aos bloques de código para copiar o contido do bloque ao portapapeis do usuario. Esta funcionalidade non é compatíbel con Internet Explorer."
+    embed_any_origin: "Permitir contido incorporábel independentemente da orixe. Isto é necesario para as aplicacións móbiles con HTML estático."
+    embed_topics_list: "Admite a incorporación en HTML de listaxes de temas"
+    embed_set_canonical_url: "Estableza o URL canónico dos temas incorporados no URL do contido incorporado."
+    embed_truncate: "Truncar as publicacións incorporadas."
+    embed_unlisted: "Os temas importados non serán listados ata que un usuario responda."
+    embed_support_markdown: "Admite o formatado Markdown para publicacións incorporadas."
+    allowed_embed_selectors: "Unha listaxe separada por comas de elementos CSS que se permiten nas incorporacións."
+    allowed_href_schemes: "Esquemas permitidos en ligazóns ademais de http e https."
+    embed_post_limit: "Número máximo de publicacións que incorporar."
     embed_username_required: "O nome de usuario para a creación de temas é obrigatorio."
+    notify_about_flags_after: "Se hai alertas que non se manexaron despois destas horas, envíelles unha mensaxe persoal aos moderadores. Estabelecer en 0 para desactivar."
+    show_create_topics_notice: "Se o sitio ten menos de 5 temas públicos, amosará un aviso pedindo aos administradores que creen algúns temas."
     delete_drafts_older_than_n_days: "Eliminar borradores con máis de (n) días de antigüidade."
+    bootstrap_mode_min_users: "Número mínimo de usuarios necesarios para desactivar o modo de arranque (estabelecer en 0 para desactivar)"
+    prevent_anons_from_downloading_files: "Evitar que usuarios anónimos descarguen anexos."
+    secure_media: 'Limita o acceso a TODO o que se cargase (imaxes, vídeo, son, texto, pdf, zip e outros). Se está activado o «requírese inicio de sesión», só os usuarios con sesión activa poden acceder ás cargas. En caso contrario, o acceso limitarase só para as cargas de multimedia en mensaxes privadas e categorías privadas. AVISO: este axuste é complexo e require unha comprensión administrativa profunda. Véxase <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">o tema de multimedia seguro en Meta</a> para saber máis.'
+    secure_media_allow_embed_images_in_emails: "Permite incorporar imaxes seguras que normalmente se engadirían nos correos electrónicos, se o seu tamaño é menor que o axuste de tamaño máx. de imaxe incorporada en correo en kb."
+    secure_media_max_email_embed_image_size_kb: "O tamaño de corte para imaxes seguras que se incorporarán nos correos se está activado o axuste «multimedia seguro que se permite incorporar nas mensaxes de correo». Se este axuste non está activado, non terá efecto."
+    slug_generation_method: "Escolla un método de xeración de abreviacións. Con «codificado» xerarase unha cadea con codificación porcentual, con «ningún» desactivarase a abreviación amigábel."
     enable_emoji: "Activar emojis"
-    code_formatting_style: "O botón de código no editor establecerá por defecto este estilo de formato de código"
+    enable_emoji_shortcuts: "As cariñas habituais en texto como :) :p :( converterase en emojis"
+    emoji_set: "Como lle gustaría o seu emoji?"
+    emoji_autocomplete_min_chars: "Número mínimo de caracteres necesarios para disparar a xanela emerxente de autocompletar emoji"
+    enable_inline_emoji_translation: "Activar a tradución de emojis en liña (sen ningún espazo nin puntuación anterior)"
+    approve_post_count: "A cantidade de publicacións dun usuario novo ou básico que deba aprobarse"
+    approve_unless_trust_level: "As publicacións dirixidas a usuarios por debaixo deste nivel de confianza deben ser aprobadas"
+    approve_new_topics_unless_trust_level: "Os novos temas dirixidos a usuarios por debaixo deste nivel de confianza deben ser aprobados"
+    approve_unless_staged: "Novos temas e publicacións para usuarios transitorios que se deben aprobar"
+    notify_about_queued_posts_after: "Se hai publicacións que levan máis de varias horas agardando ser revisadas, envíese unha notificación a todos os moderadores. Estabelecer en 0 para desactivar estas notificacións."
+    auto_close_messages_post_count: "Número máximo de publicacións permitidas nunha mensaxe antes do peche automático (0 para desactivar)"
+    auto_close_topics_post_count: "Número máximo de publicacións permitidas nun tema antes do peche automático (0 para desactivar)"
+    auto_close_topics_create_linked_topic: "Crear un novo tema ligado cando un tema se pecha automaticamente conforme o axuste de «número de publicacións para peche automático de temas»"
+    code_formatting_style: "O botón de código no editor estabelecerá por defecto este estilo de formato de código"
     max_allowed_message_recipients: "Número máximo de destinatarios que se permiten nunha mensaxe."
-    new_user_notice_tl: "O nivel de confianza mínimo requirido para ver avisos de novos usuarios."
+    watched_words_regular_expressions: "As palabras vixiadas son expresións regulares."
+    enable_diffhtml_preview: "Función experimental que utiliza diffHTML para sincronizar a visualización e non renderizar completamente"
+    old_post_notice_days: "Días antes de que o aviso de publicación quede obsoleto"
+    new_user_notice_tl: "Nivel de confianza mínimo requirido para ver avisos de novos usuarios."
+    returning_user_notice_tl: "Nivel de confianza mínimo requirido para ver avisos de usuarios que volven."
     returning_users_days: "Número de días que deben transcorrer para considerar que un usuario está de volta."
+    review_media_unless_trust_level: "O equipo revisará as publicacións de usuarios con niveis de confianza máis baixos se conteñen elementos multimedia inseridos."
+    blur_tl0_flagged_posts_media: "Desenfocar imaxes con publicacións sinaladas para agochar contido potencialmente inapropiado (NSFW)."
+    enable_page_publishing: "Permitirlles aos membros do equipo publicar temas en novos URL co seu propio estilo."
+    show_published_pages_login_required: "Os usuarios anónimos poden ver as páxinas publicadas, aínda que se pida iniciar sesión."
+    skip_auto_delete_reply_likes: "Cando se eliminen automaticamente respostas antigas, saltar as publicacións con este número de gústame ou máis."
     default_email_digest_frequency: "Frecuencia por defecto con que os usuarios reciben correos electrónicos de resumo."
-    default_other_external_links_in_new_tab: "Abrir as ligazóns externas nunha nova pestana por defecto."
+    default_include_tl0_in_digests: "Incluír de xeito predeterminado publicacións de novos usuarios en resumos de correo electrónico. Os usuarios poden cambiar isto nas súas preferencias."
+    default_email_level: "Estabelece o nivel predefinido de notificación por correo electrónico para temas habituais."
+    default_email_messages_level: "Estabelece o nivel predefinido de notificación por correo electrónico cando alguén lle envía mensaxes ao usuario."
+    default_email_mailing_list_mode: "Envía un correo electrónico para cada nova publicación de xeito predefinido."
+    default_email_mailing_list_mode_frequency: "Os usuarios que activen o modo de listaxe de correo recibirán os correos coa frecuencia predeterminada."
+    disable_mailing_list_mode: "Retirar o permiso para que os usuarios activen o modo de lista de correo (evita que se envíen mensaxes por lista de correo)."
+    default_email_previous_replies: "Inclúense, de modo predeterminado, as respostas anteriores nos correos."
+    default_email_in_reply_to: "Inclúese, de modo predeterminado, o limiar da publicación respondida nos correos."
+    default_other_new_topic_duration_minutes: "Condición predefinida global para que un tema se considere novo."
+    default_other_auto_track_topics_after_msecs: "Tempo predefinido global antes de que un tema se siga automaticamente."
+    default_other_notification_level_when_replying: "Nivel de notificación predefinida global cando o usuario responde a un tema."
+    default_other_external_links_in_new_tab: "Abrir as ligazóns externas nunha nova lapela por defecto."
     default_other_enable_quoting: "Activar resposta citando o texto seleccionado por defecto."
+    default_other_enable_defer: "Activar, de xeito predeterminado, a función de aprazar o tema."
     default_other_dynamic_favicon: "Mostrar o número de temas novos/actualizados na icona do navegador por defecto."
-    default_other_like_notification_frequency: "Notificarlles aos usuarios os gústames por defecto"
+    default_other_skip_new_user_tips: "Saltar os consellos iniciais e as insignias dos novos usuarios."
+    default_other_like_notification_frequency: "Notificarlles aos usuarios os gústame por defecto"
+    default_topics_automatic_unpin: "Soltar automaticamente temas cando o usuario acada o fondo, de modo predeterminado."
+    default_categories_watching: "Listaxe de categorías que se vixían por defecto."
+    default_categories_tracking: "Listase de categorías que se seguen por defecto."
     default_categories_muted: "Listaxe de categorías que están silenciadas por defecto."
+    default_categories_watching_first_post: "Listaxe de categorías en que se verá por defecto a primeira publicación de cada novo tema."
+    default_categories_regular: "Lista de categorías que non están silenciadas de modo predeterminado. Útil cando o axuste do sitio `mute_all_categories_by_default` está activada."
+    mute_all_categories_by_default: "Estableza o nivel de notificación predeterminado de todas as categorías como silenciado. Requírelles aos usuarios que opten por categorías para que aparezan nas páxinas «últimas» e «categorías». Se desexa modificar os valores predeterminados para usuarios anónimos, configure os axustes «default_categories_»."
+    default_tags_watching: "Listaxe de etiquetas que se vixían por defecto."
+    default_tags_tracking: "Listaxe de etiquetas seguidas por defecto."
     default_tags_muted: "Listaxe de etiquetas que están silenciadas por defecto."
+    default_tags_watching_first_post: "Listaxe de etiquetas en que se verá por defecto a primeira publicación de cada novo tema."
     default_text_size: "Tamaño do texto seleccionado por defecto"
     default_title_count_mode: "Modo predefinido para a páxina do contador do título"
     retain_web_hook_events_period_days: "Número de días para reter rexistros de eventos de web hook."
@@ -1756,69 +1993,94 @@ gl:
     revoke_api_keys_days: "Número de días antes de que unha chave API sen usar sexa revogada automaticamente (0 para nunca)"
     allow_user_api_keys: "Permitir a xeración de chaves API de usuario"
     allow_user_api_key_scopes: "Listaxe de ámbitos permitidos para as chaves API de usuario"
-    max_api_keys_per_user: "Número máximo de chaves API de usuario por usuario"
     min_trust_level_for_user_api_key: "Nivel de confianza necesario para xerar chaves API de usuario"
     allowed_user_api_auth_redirects: "URL permitido para redireccionar a autenticación das chaves API de usuario. O símbolo do comodín pódese utilizar para que coincida calquera parte súa (ex.: www.exemplo.com/*)."
+    allowed_user_api_push_urls: "Enderezos URL permitidos para que servidor envíe á API de usuario"
     expire_user_api_keys_days: "Número de días antes de que a chave API de usuario caduque automaticamente (0 para nunca)"
     tagging_enabled: "Activar etiquetas nos temas?"
-    min_trust_to_create_tag: "O nivel de confianza mínimo para crear un etiqueta."
+    min_trust_to_create_tag: "O nivel de confianza mínimo para crear unha etiqueta."
     max_tags_per_topic: "O número máximo de etiquetas aplicables a un tema."
     max_tag_length: "O número máximo de caracteres que se poden utilizar nunha etiqueta."
     max_tag_search_results: "Nas buscas por etiquetas, o número máximo de resultados que se mostran."
-    show_filter_by_tag: "Mostrar unha listaxe despregable para filtrar os temas por etiquetas."
     max_tags_in_filter_list: "Número máximo de etiquetas que se mostran na listaxe despregable do filtro. Móstranse primeiro as etiquetas máis usadas."
     tags_sort_alphabetically: "Mostrar etiquetas en orde alfabética. Por defecto móstranse segundo a súa popularidade."
     tags_listed_by_group: "Listar etiquetas por grupos de etiquetas na <a href='%{base_path}/tags' target='_blank'>páxina de etiquetas</a>."
     tag_style: "Estilo visual para as insignias das etiquetas."
-    allow_staff_to_tag_pms: "Permitir aos membros do equipo etiquetar calquera mensaxe persoal"
+    allow_staff_to_tag_pms: "Permitir que os membros do equipo etiqueten calquera mensaxe persoal"
     min_trust_level_to_tag_topics: "O nivel de confianza mínimo requirido para etiquetar temas"
     suppress_overlapping_tags_in_list: "Se unha etiqueta coincide con palabras exactas do título dun tema, non se mostrará"
     remove_muted_tags_from_latest: "Non mostrar na listaxe de temas máis recentes aqueles etiquetados unicamente con etiquetas silenciadas."
     force_lowercase_tags: "Forzar que todas as etiquetas estean integramente en minúsculas."
     company_name: "Nome da empresa"
     governing_law: "Lei que rexe"
-    push_notifications_prompt: "Mostrar  aviso do consentimento do usuario."
+    city_for_disputes: "Cidade para disputas"
+    shared_drafts_category: "Active a funcionalidade Borradores compartidos designando unha categoría para os borradores de temas. Os temas desta categoría suprimiranse das listaxes de temas para os usuarios do equipo."
+    shared_drafts_min_trust_level: "Permitir que os usuarios vexan e editen borradores compartidos."
+    push_notifications_prompt: "Amosar aviso do consentimento do usuario."
     push_notifications_icon: "A icona da insignia aparece na esquina da notificación. Recoméndase un PNG monocromático de 96x96 con transparencia."
+    base_font: "Tipo de letra base para empregar na maioría dos textos do sitio. Os temas poden sobrescribilo a través da propiedade personalizada CSS «--font-family»."
+    heading_font: "Tipo de letra para usar nos títulos do sitio. Os temas poden sobrescribilo a través da propiedade personalizada CSS «--heading-font-family»."
     short_title: "O título curto utilizarase na páxina de inicio do usuario, no iniciador ou naqueles sitios onde o espazo é limitado. Debe limitarse a 12 caracteres."
+    dashboard_hidden_reports: "Permitir agochar os informes específicos do panel de control."
+    dashboard_visible_tabs: "Escolla que lapelas do panel son visíbeis."
+    dashboard_general_tab_activity_metrics: "Escolla os informes que se amosarán como métricas de actividade na lapela xeral."
     gravatar_name: "Nome do provedor de Gravatar"
     gravatar_base_url: "URL da API base do provedor de Gravatar"
-    gravatar_login_url: "URL relativo a gravatar_base_url, que prové ao usuario o acceso ao servizo de Gravatar"
+    gravatar_login_url: "URL relativo a gravatar_base_url, que lle fornece ao usuario acceso ao servizo de Gravatar"
+    share_quote_buttons: "Determinar que elementos aparecen no trebello de compartir cota e a súa orde."
+    share_quote_visibility: "Determine cando amosar os botóns de compartir cota: nunca, só para usuarios anónimos ou para todos os usuarios. "
+    create_revision_on_bulk_topic_moves: "Crear revisión para as primeiras publicacións cando os temas se moven a unha nova categoría en masa."
     errors:
-      invalid_email: "Enderezo electrónico non válido"
-      invalid_username: "Non hai un usuario con este nome de usuario."
+      invalid_email: "Enderezo electrónico non válido."
+      invalid_username: "Non hai un usuario con este nome."
       invalid_group: "Non hai un grupo con este nome."
       invalid_integer_min_max: "O valor debe ser entre %{min} e %{max}."
       invalid_integer_min: "O valor debe ser %{min} ou maior."
       invalid_integer_max: "O valor non pode ser maior que %{max}."
       invalid_integer: "O valor debe ser un número enteiro."
       regex_mismatch: "O valor non ten o formato que se require."
-      must_include_latest: "O menú superior debe incluír a pestana 'Recentes'."
+      must_include_latest: "O menú superior debe incluír a lapela «Recentes»."
       invalid_string: "Valor non válido."
       invalid_string_min_max: "Debe ter entre %{min} e %{max} caracteres."
-      invalid_string_min: "Debe ter ao menos %{min} caracteres."
+      invalid_string_min: "Debe ter polo menos %{min} caracteres."
       invalid_string_max: "Non debe ter máis de %{max} caracteres."
+      invalid_json: "JSON non válido."
       invalid_reply_by_email_address: "O valor debe conter '%{reply_key}' e ser diferente ao correo electrónico da notificación."
       invalid_alternative_reply_by_email_addresses: "Todos os valores deben conter '%{reply_key}' e ser diferentes ao correo electrónico da notificación."
-      pop3_polling_authentication_failed: "Erro na autenticación POP3. Verifica as túas credenciais POP3."
-      reply_by_email_address_is_empty: "Debes habilitar 'enderezo para responder vía correo electrónico' antes de activar resposta por correo electrónico."
-      user_locale_not_enabled: "Debes habilitar primeiro «permitir usuario local» antes de activar esta opción."
+      pop3_polling_host_is_empty: "Debe estabelecer un «servidor de recollida pop3» antes de activar a recollida POP3."
+      pop3_polling_username_is_empty: "Debe estabelecer un «nome de usuario de recollida pop3» antes de activar a recollida POP3."
+      pop3_polling_password_is_empty: "Debe estabelecer un «contrasinal de usuario de recollida pop3» antes de activar a recollida POP3."
+      pop3_polling_authentication_failed: "Erro na autenticación POP3. Verifique as súas credenciais POP3."
+      reply_by_email_address_is_empty: "Debe habilitar «responder vía correo electrónico» antes de activar resposta por correo electrónico."
+      email_polling_disabled: "Debe activar ou a recollida manual ou POP3 antes de activar a resposta por correo electrónico."
+      user_locale_not_enabled: "Debe activar primeiro «permitir usuario local» antes de activar esta opción."
       invalid_regex: "A expresión regular non é válida ou non está permitida."
-      email_editable_enabled: "Debes desactivar 'correo electrónico editable' antes de activar esta opción. "
-      staged_users_disabled: "Primeiro debes habilitar 'usuarios provisionais' antes de activar esta opción."
-      reply_by_email_disabled: "Primeiro debes habilitar 'responder vía correo electrónico' antes de activar esta opción."
-      sso_url_is_empty: "Debes establecer un 'URL de sso' antes de activar esta opción."
+      email_editable_enabled: "Debe desactivar «correo electrónico editable» antes de activar esta opción."
+      staged_users_disabled: "Primeiro debe activar «usuarios transitorios» antes de activar esta opción."
+      reply_by_email_disabled: "Primeiro debe activar «responder vía correo electrónico» antes de activar esta opción."
+      discourse_connect_url_is_empty: "Debe estabelecer un «URL de discourse connect» antes de activar este axuste."
+      discourse_connect_invite_only: "Non pode activar o DiscourseConnect e ter «só por convite» ao mesmo tempo."
+      enable_local_logins_disabled: "Debe activar primeiro «activar inicios de sesión locais» antes de activar esta opción."
+      min_username_length_exists: "Non pode estabelecer que a largura mínima do nome de usuario sexa maior có nome de usuario máis curto (%{username})."
       min_username_length_range: "O mínimo non pode ser maior que o máximo."
-      max_username_length_range: "Non podes establecer o máximo por debaixo do mínimo."
+      max_username_length_exists: "Non pode estabelecer que a largura máxima do nome de usuario sexa menor que o nome de usuario máis longo (%{username})."
+      max_username_length_range: "Non pode estabelecer o máximo por debaixo do mínimo."
       invalid_hex_value: "Os valores das cores deben ser códigos de 6 díxitos hexadecimais."
-      empty_selectable_avatars: "Primeiro debes subir ao menos dous avatares seleccionables antes de activar esta opción."
+      empty_selectable_avatars: "Debe subir polo menos dous avatares seleccionables antes de activar esta opción."
+      category_search_priority:
+        low_weight_invalid: "Non pode definir que o peso sexa maior ou igual a 1."
+        high_weight_invalid: "Non pode definir que o peso sexa menor ou igual a 1."
+      allowed_unicode_usernames:
+        regex_invalid: "A expresión regular non é válida: %{error}"
+        leading_trailing_slash: "A expresión regular non debe comezar e rematar con barra."
       unicode_usernames_avatars: "O sistema interno de avatares non admite nomes de usuario Unicode."
       list_value_count: "A listaxe debe conter exactamente %{count} valores."
     placeholder:
-      sso_provider_secrets:
-        key: "www.exemplo.com"
-        value: "Inicio de sesión secreto"
+      discourse_connect_provider_secrets:
+        key: "www.example.com"
+        value: "Clave secreta de DiscourseConnect"
   search:
-    extreme_load_error: "O sitio está a soportar unha carga extrema polo que se desactivaron as buscas. Téntao máis tarde."
+    extreme_load_error: "O sitio está a soportar unha carga extrema polo que se desactivaron as buscas. Ténteo máis tarde"
     within_post: "#%{post_number} de %{username}"
     types:
       category: "Categorías"
@@ -1827,23 +2089,25 @@ gl:
     results_page: "Buscar resultados para '%{term}'"
     audio: "[audio]"
     video: "[vídeo]"
-  sso:
+  discourse_connect:
     login_error: "Erro ao iniciar sesión"
-    not_found: "Non se puido atopar a túa conta. Contacta cos administrador do sitio."
-    account_not_approved: "A túa conta está pendente de aprobación. Recibirás unha notificación por correo electrónico cando se aprobe."
-    unknown_error: "Hai un problema coa túa conta. Contacta co administrador do sitio."
-    timeout_expired: "Superouse o tempo para iniciar sesión; téntao de novo."
-    no_email: "Non se forneceu un enderezo de correo electrónico. Contacta co administrador do sitio."
-    blank_id_error: "A `external_id` é obrigatoria pero está en branco"
-    email_error: "Non se puido rexistrar un conta con este enderezo electrónico <b>%{email}</b>. Contacta co administrador do sitio."
-    missing_secret: "Erro na autenticación SSO porque falta o segredo. Contacta co administrador do sitio para amañar este problema."
+    not_found: "Non se puido atopar a súa conta. Contacte co administrador do sitio."
+    account_not_approved: "A súa conta está pendente de aprobación. Recibirá unha notificación por correo electrónico cando se aprobe."
+    unknown_error: "Hai un problema coa súa conta. Por favor, contacte co administrador do sitio."
+    timeout_expired: "Esgotouse o tempo para iniciar sesión; ténteo de novo máis adiante."
+    no_email: "Non se forneceu un enderezo de correo. Por favor, contacte co administrador do sitio."
+    blank_id_error: "O «external_id» é obrigatorio pero está en branco"
+    email_error: "Non se puido rexistrar unha conta con este enderezo de correo <b>%{email}</b>. Por favor, contacte co administrador do sitio."
+    missing_secret: "Fallou a autenticación porque falta a clave secreta. Contacte co administrador do sitio para amañar este problema."
+    invite_redeem_failed: "Fallou a recuperación do convite. Póñase en contacto co administrador do sitio."
   original_poster: "Publicador orixinal"
   most_posts: "Con máis publicacións"
   most_recent_poster: "Publicador máis recente"
   frequent_poster: "Publicador frecuente"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
-    new_user: "Benvido/a á nosa comunidade. Estes son os temas recentes máis populares."
-    not_seen_in_a_month: "Benvido/a de novo! Non te vimos durante este tempo. Estes son os temas máis populares desde que te fuches."
+    new_user: "Dámoslle a benvida á nosa comunidade. Estes son os temas recentes máis populares."
+    not_seen_in_a_month: "Dámoslle a benvida outra vez! Canto tempo sen velo/la. Estes son os temas máis populares na súa ausencia."
   merge_posts:
     edit_reason:
       one: "Unha publicación foi fusionada por %{username}"
@@ -1859,11 +2123,11 @@ gl:
       one: "Unha publicación foi separada a unha nova mensaxe: %{topic_link}"
       other: "%{count} publicacións foron separadas a unha nova mensaxe: %{topic_link}"
     existing_topic_moderator_post:
-      one: "Unha publicación foi fusionada a un tema xa existente: %{topic_link}"
-      other: "%{count} publicacións foron fusionadas a un tema xa existente: %{topic_link}"
+      one: "Unha publicación foi fusionada cun tema xa existente: %{topic_link}"
+      other: "%{count} publicacións foron fusionadas cun tema xa existente: %{topic_link}"
     existing_message_moderator_post:
-      one: "Unha publicación foi fusionada a unha mensaxe xa existente: %{topic_link}"
-      other: "%{count} publicacións foron fusionadas a unha mensaxe xa existente: %{topic_link}"
+      one: "Unha publicación foi fusionada cunha mensaxe xa existente: %{topic_link}"
+      other: "%{count} publicacións foron fusionadas cunha mensaxe xa existente: %{topic_link}"
   change_owner:
     post_revision_text: "Transferiuse a propiedade"
   publish_page:
@@ -1874,10 +2138,10 @@ gl:
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Esta mensaxe pechouse automaticamente despois de alcanzar o límite máximo de %{count} resposta."
-      other: "Esta mensaxe pechouse automaticamente despois de alcanzar o límite máximo de  %{count} respostas."
+      other: "Esta mensaxe pechouse automaticamente despois de alcanzar o límite máximo de %{count} respostas."
     autoclosed_topic_max_posts:
       one: "Este tema pechouse automaticamente despois de alcanzar o límite máximo de %{count} resposta."
-      other: "Este tema pechouse automaticamente despois de alcanzar o límite máximo de  %{count} respostas."
+      other: "Este tema pechouse automaticamente despois de alcanzar o límite máximo de %{count} respostas."
     autoclosed_enabled_days:
       one: "Este tema pechouse automaticamente despois de %{count} día. Xa non se permiten máis respostas."
       other: "Este tema pechouse automaticamente despois de %{count} días. Xa non se admiten máis respostas."
@@ -1918,104 +2182,138 @@ gl:
     autoclosed_disabled_lastpost: "Este tema agora está aberto. Permítense novas respostas."
     auto_deleted_by_timer: "Eliminado automaticamente polo temporizador."
   login:
-    security_key_description: "Cando teñas a chave de seguranza preparada, preme no botón Autenticar con chave de seguranza que se mostra a continuación."
+    invalid_second_factor_method: "O método en dous pasos seleccionado non é válido."
+    not_enabled_second_factor_method: "O método en dous pasos seleccionado non está activado para a súa conta."
+    security_key_description: "Cando teña preparada a súa chave de seguranza física, prema no botón Autenticar con chave de seguranza que se mostra a continuación."
     security_key_alternative: "Tentalo doutro xeito"
     security_key_authenticate: "Autenticar con chave de seguranza"
+    security_key_not_allowed_error: "O proceso de autenticación da chave de seguranza excedeu o tempo de espera ou anulouse."
     security_key_no_matching_credential_error: "As credenciais non coinciden coa chave de seguranza introducida."
-    security_key_support_missing_error: "O teu dispositivo ou navegador actual non admite o uso de chaves de seguranza. Utiliza outro método."
-    security_key_invalid: "Produciuse un erro ao validar a chave de seguridade."
-    not_approved: "A túa conta non foi aínda aprobada. Notificaráseche por correo electrónico cando poidas iniciar a sesión."
-    incorrect_username_email_or_password: "Nome de usuario, correo electrónico ou contrasinal incorrectos."
+    security_key_support_missing_error: "O seu dispositivo ou navegador actual non admite o uso de chaves de seguranza. Utilice outro método."
+    security_key_invalid: "Produciuse un erro ao validar a chave de seguranza."
+    not_approved: "A súa conta non foi aínda aprobada. Notificaráselle por correo electrónico cando poida iniciar a sesión."
+    incorrect_username_email_or_password: "Nome de usuario, correo electrónico ou contrasinal incorrectos"
     incorrect_password: "Contrasinal incorrecto"
-    wait_approval: "Grazas por te rexistrares. Avisarémoste cando a túa conta sexa aprobada."
-    active: "A túa conta está activada e pronta para usar."
-    activate_email: "<p>Xa case rematamos! Enviámosche un correo de activación a <b>%{email}</b>. Sigue as instrucións que contén para activar a túa conta.</p><p>Se non che chega, revista o cartafol de correo lixo.</p>"
-    not_activated: "Aínda non podes iniciar sesión. Enviámosche un correo de activación. Sigue as instrucións desta mensaxe para activar a túa conta."
-    not_allowed_from_ip_address: "Non podes iniciar sesión como %{username} desde ese enderezo IP."
-    admin_not_allowed_from_ip_address: "Non podes acceder como administrador desde este enderezo IP."
-    reset_not_allowed_from_ip_address: "Non podes solicitar o restablecemento do contrasinal desde ese enderezo IP."
-    suspended: "Non podes iniciar sesión ata o %{date}."
+    wait_approval: "Grazas por se rexistrar. Avisarémolo/la cando se aprobe a súa conta."
+    active: "A súa conta está activada e pronta para usar."
+    activate_email: "<p>Xa case rematamos! Enviámoslle un correo de activación a <b>%{email}</b>. Siga as instrucións que contén para activar a súa conta.</p><p>Se non a atopa, revise o cartafol de correo lixo.</p>"
+    not_activated: "Aínda non pode iniciar sesión. Enviámoslle un correo de activación. Siga as instrucións desta mensaxe para activar a súa conta."
+    not_allowed_from_ip_address: "Non pode iniciar sesión como %{username} desde ese enderezo IP."
+    admin_not_allowed_from_ip_address: "Non pode acceder como administrador desde este enderezo IP."
+    reset_not_allowed_from_ip_address: "Non pode solicitar o restabelecemento do contrasinal desde ese enderezo IP."
+    suspended: "Non pode iniciar sesión ata o %{date}."
     suspended_with_reason: "Conta suspendida ata o %{date}: %{reason}"
     errors: "%{errors}"
     not_available: "Non dispoñíbel. Tentar %{suggestion}?"
-    something_already_taken: "Algo foi mal, quizais o nome de usuario ou o correo electrónico xa están rexistrados. Proba coa ligazón de esquecín o contrasinal."
+    something_already_taken: "Algo foi mal, quizais o nome de usuario ou o correo electrónico xa están rexistrados. Probe coa ligazón de Esquecín o contrasinal."
     omniauth_error:
-      generic: "Sentímolo, produciuse un erro ao autorizar a túa conta. Téntao de novo."
-      csrf_detected: "Esgotouse o tempo de autorización ou cambiaches de navegador. Téntao de novo."
-      request_error: "Produciuse un erro ao iniciar a autorización. Téntao de novo."
-      invalid_iat: "Non se puido verificar o token de autorización por mor de diferenzas no horario do servidor. Téntao de novo."
+      generic: "Sentímolo, produciuse un erro ao autorizar a súa conta. Ténteo de novo."
+      csrf_detected: "Esgotouse o tempo de autorización ou cambiou de navegador. Ténteo de novo."
+      request_error: "Produciuse un erro ao comezar coa autorización. Ténteo de novo."
+      invalid_iat: "Non se puido verificar o token de autorización por mor de diferenzas no horario do servidor. Ténteo de novo."
+    omniauth_error_unknown: "Produciuse un erro ao procesar o seu rexistro. Ténteo de novo, por favor."
     omniauth_confirm_title: "Iniciar sesión usando %{provider}"
     omniauth_confirm_button: "Continuar"
-    authenticator_error_no_valid_email: "Non hai ningún enderezo electrónico asociado con %{account} que estea permitido. Debes configurar a túa conta cun enderezo electrónico diferente."
+    authenticator_error_no_valid_email: "Non hai ningún enderezo electrónico asociado con %{account} que estea permitido. Debe configurar a súa conta cun enderezo electrónico diferente."
     new_registrations_disabled: "Neste momento non se permite o rexistro de novas contas."
     password_too_long: "Os contrasinais teñen de límite 200 caracteres."
     email_too_long: "O correo electrónico facilitado é demasiado longo. Os nomes dos correos electrónicos non deben superar os 254 caracteres e os nomes de dominio non deben ter máis de 253."
+    wrong_invite_code: "O código de convite que introduciu era incorrecto."
     reserved_username: "Este nome de usuario non está permitido."
-    missing_user_field: "Non completaches todos os campos de usuario"
-    auth_complete: "Autenticación completada."
-    click_to_continue: "Preme aquí para continuar."
-    second_factor_description: "Insire o código de autenticación desde a túa aplicación:"
-    second_factor_backup_description: "Escribe un dos códigos de copia de seguranza"
-    invalid_security_key: "Chave de seguridade non válida."
-    missing_second_factor_name: "Insire un nome"
-    missing_second_factor_code: "Insire un código."
+    missing_user_field: "Non completou todos os campos de usuario"
+    auth_complete: "Completouse a autenticación."
+    click_to_continue: "Prema aquí para continuar."
+    already_logged_in: "Perdoe! Esta invitación está destinada a novos usuarios, que aínda non teñen unha conta."
+    second_factor_title: "Autenticación en dous pasos"
+    second_factor_description: "Insira o código de autenticación desde a súa aplicación:"
+    second_factor_backup_description: "Escriba un dos códigos de copia de seguranza:"
+    second_factor_backup_title: "Código de copia de seguranza en dous pasos"
+    invalid_second_factor_code: "Código de autenticación non válido. Cada código só se pode usar unha vez."
+    invalid_security_key: "Chave de seguranza non válida."
+    missing_second_factor_name: "Insira un nome."
+    missing_second_factor_code: "Insira un código."
     second_factor_toggle:
-      totp: "Utilizar unha aplicación de autenticación ou no seu lugar unha chave de seguridade"
+      totp: "Utilizar unha aplicación de autenticación ou no seu lugar unha chave de seguranza"
       backup_code: "Usar no seu lugar un código de copia de seguranza"
   admin:
     email:
       sent_test: "enviado!"
+    user:
+      merge_user:
+        updating_username: "Actualizando nome de usuario..."
+        changing_post_ownership: "Cambiando o propietario da publicación ..."
+        merging_given_daily_likes: "Combinando os gústame diarios..."
+        merging_post_timings: "Combinando os intres de publicación..."
+        merging_user_visits: "Combinando as visitas de usuario..."
+        updating_site_settings: "Actualizando a configuración do sitio..."
+        updating_user_stats: "Actualizando as estatísticas de usuario..."
+        merging_user_attributes: "Combinando os atributos de usuario..."
+        updating_user_ids: "Actualizando os id de usuario..."
+        deleting_source_user: "Eliminando o usuario orixe..."
   user:
+    deactivated: "Desactivado debido a excesivos correos devoltos con «%{email}»."
+    deactivated_by_staff: "Desactivado polo equipo"
     deactivated_by_inactivity:
       one: "Desactivado automaticamente despois de %{count} día de inactividade"
       other: "Desactivado automaticamente despois de %{count} días de inactividade"
     activated_by_staff: "Activado polo equipo"
-    new_user_typed_too_fast: "O novo usuario escribe moi rápido."
+    new_user_typed_too_fast: "O novo usuario escribe moi rápido"
     content_matches_auto_block_regex: "O contido coincide cunha expresión regular de bloqueo"
     username:
-      short: "debe ter ao menos %{min} caracteres."
+      short: "debe ter polo menos %{min} caracteres"
       long: "non debe ter máis de %{max} caracteres"
       too_long: "é demasiado longo"
       characters: "só debe incluír números, letras, guións, puntos e guións baixos"
       unique: "debe ser único"
       blank: "debe estar presente"
-      must_begin_with_alphanumeric_or_underscore: "debe comezar cunha letra, número ou un guión baixo"
+      must_begin_with_alphanumeric_or_underscore: "debe comezar cunha letra, un 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."
+      must_not_end_with_confusing_suffix: "non debe rematar cun sufixo confuso do tipo .json ou .png etc."
     email:
       invalid: "non é válido."
-      blocked: "non está permtido."
+      not_allowed: "non está permitido desde ese fornecedor. Utilice outro enderezo de correo electrónico."
+      blocked: "non está permitido."
       revoked: "Non se enviarán máis correos electrónicos a '%{email}' ata %{date}."
+      does_not_exist: "N/D"
     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."
+      max_new_accounts_per_registration_ip: "Non están permitidos novos rexistros desde o seu enderezo IP (alcanzouse o límite). Contacte cun membro do equipo."
     website:
       domain_not_allowed: "O sitio web non é válido. Os dominios permitidos son: %{domains}"
+    auto_rejected: "Rexeitouse automaticamente debido á idade. Véxase o axuste do sitio auto_handle_queued_age."
     destroy_reasons:
-      same_ip_address: "Mesmo enderezo IP (%{ip_address}) que outros usuarios."
+      unused_staged_user: "Usuario transitorio non utilizado"
+      fixed_primary_email: "Corrixido o correo electrónico principal do usuario transitorio"
+      same_ip_address: "Mesmo enderezo IP (%{ip_address}) que outros usuarios"
       inactive_user: "Usuario inactivo"
+      reviewable_reject_auto: "Control automático de revisións en cola"
+      reviewable_reject: "Rexeitouse o usuario revisábel"
     email_in_spam_header: "O primeiro correo electrónico do usuario marcouse como correo lixo"
+    already_silenced: "O usuario xa foi silenciado por %{staff} %{time_ago}."
+    already_suspended: "O usuario xa foi suspendido por %{staff} %{time_ago}."
   reviewables_reminder:
     submitted:
-      one: "Hai elementos enviados desde hai máis de %{count} hora. [Revísaos](%{base_path}/review)."
-      other: "Hai elementos enviados desde hai máis de %{count} horas. [Revísaos](%{base_path}/review)."
+      one: "Hai elementos enviados desde hai máis de %{count} hora. [Revíseos](%{base_path}/review)."
+      other: "Hai elementos enviados desde hai máis de %{count} horas. [Revíseos](%{base_path}/review)."
     subject_template:
-      one: "%{count} elemento necesita ser revisado"
-      other: "%{count} elementos necesitan ser reservados"
+      one: "%{count} elemento precisa ser revisado"
+      other: "%{count} elementos precisan ser revisados"
   unsubscribe_mailer:
-    subject_template: "Confirmar que xa non queres recibir actualizacións por correo electrónico de %{site_title}"
+    title: "Anular a subscrición ao servizo de correo"
+    subject_template: "Confirme que xa non quere recibir actualizacións por correo electrónico de %{site_title}"
     text_body_template: |
-      Alguén (posiblemente ti?) solicitou non recibir máis actualizacións por correo electrónico de %{site_domain_name} a este enderezo.
-      Se queres confirmar isto, preme nesta ligazón:
+      Alguén (posiblemente vostede) solicitou non recibir máis actualizacións por correo electrónico de %{site_domain_name} a este enderezo.
+      Se quere confirmar isto, prema nesta ligazón:
 
       %{confirm_unsubscribe_link}
 
-      Se queres continuar recibindo actualizacións por correo electrónico, ignora esta mensaxe.
+      Se quere continuar recibindo actualizacións por correo electrónico, ignore esta mensaxe.
   invite_mailer:
-    subject_template: "%{inviter_name} invitoute a '%{topic_title}' en%{site_domain_name}"
+    title: "Mensaxe de correo de convite"
+    subject_template: "%{inviter_name} invitouno a '%{topic_title}' en%{site_domain_name}"
     text_body_template: |
-      %{inviter_name} invitoute á discusión
+      %{inviter_name} invitouno á discusión
 
       > **%{topic_title}**
       >
@@ -2025,13 +2323,14 @@ gl:
 
       > %{site_title} -- %{site_description}
 
-      Se che interesa, preme na seguinte ligazón:
+      Se lle interesa, prema na seguinte ligazón:
 
       %{invite_link}
   custom_invite_mailer:
-    subject_template: "%{inviter_name} invitoute a '%{topic_title}' en%{site_domain_name}"
+    title: "Mensaxe de correo de convite personalizado"
+    subject_template: "%{inviter_name} invitouno a '%{topic_title}' en%{site_domain_name}"
     text_body_template: |
-      %{inviter_name} invitoute á discusión
+      %{inviter_name} invitouno á discusión
 
       > **%{topic_title}**
       >
@@ -2045,25 +2344,27 @@ gl:
 
       > %{user_custom_message}
 
-      Se che interesa, preme na seguinte ligazón:
+      Se lle interesa, prema na seguinte ligazón:
 
       %{invite_link}
   invite_forum_mailer:
-    subject_template: "%{inviter_name} invitoute a unirte a %{site_domain_name}"
+    title: "Mensaxe de correo de convite ao foro"
+    subject_template: "%{inviter_name} invitouno a unirse a %{site_domain_name}"
     text_body_template: |
-      %{inviter_name} invitoute a unirte a
+      %{inviter_name} invitouno a unirse a
 
       > **%{site_title}**
       >
       > %{site_description}
 
-      Se che interesa, preme na seguinte ligazón:
+      Se lle interesa, prema na seguinte ligazón:
 
       %{invite_link}
   custom_invite_forum_mailer:
-    subject_template: "%{inviter_name} invitoute a unirte a %{site_domain_name}"
+    title: "Mensaxe de correo personalizada de convite ao foro"
+    subject_template: "%{inviter_name} invitouno a unirse a %{site_domain_name}"
     text_body_template: |
-      %{inviter_name} invitoute a unirte a
+      %{inviter_name} invitouno a unirse a
 
       > **%{site_title}**
       >
@@ -2073,93 +2374,246 @@ gl:
 
       > %{user_custom_message}
 
-      Se che interesa, preme na seguinte ligazón:
+      Se lle interesa, prema na seguinte ligazón:
 
       %{invite_link}
   invite_password_instructions:
-    subject_template: "Establece un contrasinal para a túa conta en %{site_name}"
+    title: "Instrucións de contrasinal de convidado"
+    subject_template: "Estabelece un contrasinal para a súa conta en %{site_name}"
     text_body_template: |
-      Grazas por aceptares a invitación a %{site_name} -- Benvido/a!
+      Grazas por aceptar a invitación a %{site_name} -- Dámoslle a benvida!
 
-      Agora preme nesta ligazón para elixir un contrasinal:
+      Agora prema nesta ligazón para elixir un contrasinal:
       %{base_url}/u/password-reset/%{email_token}
 
-      (Se a ligazón anterior xa caducou, elixe "Esquecín o meu contrasinal" cando vaias iniciar sesión co teu enderezo electrónico.)
+      (Se a ligazón anterior xa caducou, elixa "Esquecín o meu contrasinal" cando vaia iniciar sesión co seu enderezo electrónico.)
+  download_backup_mailer:
+    title: "Descargar a copia de seguranza do servizo de correo"
+    subject_template: "[%{email_prefix}] Descarga de copia de seguranza do sitio"
+    text_body_template: |
+      Aquí está a [descarga de copia de seguranza do sitio] (%{backup_file_path}) que pediu.
+
+      Por motivos de seguranza, enviamos esta ligazón de descarga ao seu enderezo de correo electrónico validado.
+
+      (Se vostede *non* solicitou esta descarga, debería preocuparse seriamente: alguén ten acceso como administrador ao seu sitio.)
+    no_token: |
+      Esta ligazón de descarga de copia de seguranza xa expirou ou foi utilizada.
   admin_confirmation_mailer:
     title: "Confirmación do administrador"
     subject_template: "[%{email_prefix}] Confirmar nova conta de administrador"
     text_body_template: |
-      Confirma que queres engadir a **%{target_username} (%{target_email})** como un administrador do teu foro.
+      Confirme que quere engadir a **%{target_username} (%{target_email})** como un administrador do seu foro.
 
       [Confirmar conta de administrador](%{admin_confirm_url})
+  test_mailer:
+    title: "Proba de servizo de correo"
+    subject_template: "[%{email_prefix}] Proba de entrega de correo"
+    text_body_template: |
+      Esta é unha proba de correo de
+
+      [**%{base_url}**][0]
+
+      A entrega do correo é complicada. Aquí están unhas poucas cousas que debería comprobar en primeiro lugar:
+
+      - *Asegúrese* de axustar correctamente o enderezo do «correo electrónico de notificación» de: na configuración do seu sitio. **O dominio especificado no enderezo «de» dos correos que envíe é o dominio contra o que será validado o seu correo**.
+
+      - Aprenda como ver a forma en bruto do correo no seu cliente de correo, de modo que poida examinar as cabeceiras de correo para obter pistas importantes. En Gmail, é o que se chama «show original» no menú despregábel que está na parte superior dereita de cada mensaxe de correo.
+
+      - **IMPORTANTE:** Ten o seu ISP un rexistro de DNS reverso asociado aos nomes de dominio e aos enderezos IP desde os que vostede envía o correo? [Comprobe o seu rexistro PTR reverso[2] aquí. Se o seu ISP non introduce o rexistro apuntador de DNS reverso adecuado, é moi pouco probábel que o seu correo se poida entregar.
+
+      - É o [rexistro SPF][8] do seu dominio correcto? [Probe o seu rexistro SPF][1] aquí. Vexa que TXT é o tipo de rexistro oficial correcto para SPF.
+
+      - É o [rexistro DKIM][3] do seu dominio correcto? Isto mellorará a entrega do correo. [Probe o seu rexistro DKIM][7] aquí.
+
+      - Se ten en marcha o seu propio servidor de correo, comprobe que os IP do seu servidor de correo [non están en ningunha listaxe de bloqueo de correo][4]. Comprobe tamén que se envía un nome de servidor totalmente cualificado que resolve o DNS na súa mensaxe HELO. En caso de que non, o seu correo será rexeitado por moitos servizos de correo.
+
+      - Recomendámoslle encarecidamente que **envíe un correo de probe a [mail-tester.com][mt]** para comprobar que todo o anterior está funcionando correctamente.
+
+      (A maneira *doada* é crear unha conta en [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] ou [Mailjet][mj], que teñen plans de correo de baixo custo e funcionarán ben para pequenas comunidades. Aínda con todo iso, necesitará configurar os rexistros SPF e DKIM no seu DNS!)
+
+      Agardamos que recibise correctamente esta proba de entrega de correo!
+
+      Boa sorte,
+
+      Os amigos de [Discourse](https://www.discourse.org)
+
+      [0]: %{base_url}
+      [1]: https://www.kitterman.com/spf/validate.html
+      [2]: https://mxtoolbox.com/ReverseLookup.aspx
+      [3]: http://www.dkim.org/
+      [4]: https://whatismyipaddress.com/blacklist-check
+      [7]: https://www.mail-tester.com/spf-dkim-check
+      [8]: http://www.openspf.org/SPF_Record_Syntax
+      [sg]: https://goo.gl/r1WMF6
+      [sp]: https://www.sparkpost.com/
+      [mg]: https://www.mailgun.com/
+      [mj]: https://www.mailjet.com/pricing/
+      [mt]: https://www.mail-tester.com/
   new_version_mailer:
+    title: "Nova versión de servizo de correo"
     subject_template: "[%{email_prefix}] Nova versión de Discourse, actualización dispoñible"
+    text_body_template: |
+      Hurra, está dispoñíbel unha nova versión de [Discourse](https://www.discourse.org).
+
+      A súa versión: %{installed_version}
+      A nova versión: **%{new_version}**
+
+      - Actualice facilmente mediante ** [actualización cun só clic] (%{base_url}/admin/upgrade) **
+
+      - Vexa as novidades nas [notas da edición] (https://meta.discourse.org/tag/release-notes) ou vexa o [rexistro en bruto de cambios en GitHub](https://github.com/discourse/discourse/commits/master)
+
+      - Visite [meta.discourse.org](https://meta.discourse.org) para novas, discusións e apoiar a Discourse
   new_version_mailer_with_notes:
+    title: "Nova versión do servizo de correo con notas"
     subject_template: "[%{email_prefix}] actualización dispoñible"
+    text_body_template: |
+      Hurra, está dispoñíbel unha nova versión de [Discourse](https://www.discourse.org).
+
+      A súa versión: %{installed_version}
+      A nova versión: **%{new_version}**
+
+      - Actualice facilmente mediante ** [actualización cun só clic] (%{base_url}/admin/upgrade) **
+
+      - Vexa as novidades nas [notas da edición] (https://meta.discourse.org/tag/release-notes) ou vexa o [rexistro en bruto de cambios en GitHub](https://github.com/discourse/discourse/commits/master)
+
+      - Visite [meta.discourse.org](https://meta.discourse.org) para novas, discusións e apoiar a Discourse
+
+      ### Notas da edición
+
+      %{notes}
   flag_reasons:
-    off_topic: "A túa publicación foi denunciada como **fóra de tema**: a comunidade pensa que non se axusta como debe ao tema que está definido polo seu título e primeira publicación."
-    inappropriate: "A túa publicación foi denunciada como **inapropiada**: a comunidade pensa que é ofensiva, abusiva ou viola as [as directrices da nosa comunidade](%{base_path}/directrices)."
-    notify_moderators: "A túa publicación foi denunciada para requirir a **atención do moderador**: a comunidade cre que algo dela precisa da intervención manual dun membro do equipo."
+    off_topic: "A súa publicación foi denunciada como **fóra de tema**: a comunidade pensa que non se axusta como debe ao tema, tal como está definido no seu título e na primeira publicación."
+    inappropriate: "A súa publicación foi denunciada como **inapropiada**: a comunidade pensa que é ofensiva, abusiva ou viola as [as directrices da nosa comunidade](%{base_path}/guidelines)."
+    spam: "A súa publicación foi sinalada como **lixo**: a comunidade considera que é publicidade, algo que ten un carácter excesivamente promocional en lugar de ser útil ou relevante para o tema como se esperaba."
+    notify_moderators: "A súa publicación foi denunciada para requirir a **atención do moderador**: a comunidade cre que algo dela precisa da intervención manual dun membro do equipo."
   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."
+    agreed_and_deleted: "Grazas por comunicárnolo. Estamos de acordo en que hai un problema e xa retiramos a publicación."
     disagreed: "Grazas por comunicárnolo. Estamos botándolle un ollo."
     ignored: "Grazas por comunicárnolo. Estamos botándolle un ollo."
-    ignored_and_deleted: "Grazas por comunicárnolo. Xa eliminamos a publicación."
+    ignored_and_deleted: "Grazas por comunicárnolo. Xa retiramos a publicación."
   temporarily_closed_due_to_flags:
-    one: "Este tema está temporalmente pechado ao menos durante %{count} hora por mor dun elevado número de denuncias da comunidade."
-    other: "Este tema está temporalmente pechado ao menos durante %{count} horas por mor dun elevado número de denuncias da comunidade."
+    one: "Este tema está temporalmente pechado polo menos durante %{count} hora por mor dun elevado número de denuncias da comunidade."
+    other: "Este tema está temporalmente pechado polo menos durante %{count} horas por mor dun elevado número de denuncias da comunidade."
   system_messages:
     private_topic_title: "Tema #%{id}"
-    contents_hidden: "Visita a publicación para ver o seu contido."
+    contents_hidden: "Visite a publicación para ver o seu contido."
     post_hidden:
       title: "Publicación oculta"
       subject_template: "Publicación ocultada polas denuncias da comunidade"
       text_body_template: |
         Ola,
 
-        Esta é unha mensaxe automática de %{site_name} para comunicarche que a túa publicación foi ocultada.
+        Esta é unha mensaxe automática de %{site_name} para comunicarlle que a súa publicación foi ocultada.
 
         <%{base_url}%{url}>
 
         %{flag_reason}
 
-        Esta publicación foi ocultada por mor das denuncias da comunidade. Daquela, por favor, considera a posibilidade de revisala tendo en conta esta reacción da comunidade. **Podes editar a túa publicación despois de %{edit_delay} minutos e automaticamente volverá estar visible.**
+        Esta publicación foi ocultada por mor das denuncias da comunidade. Daquela, considere a posibilidade de revisala tendo en conta esta reacción da comunidade. **Pode editar a súa publicación despois de %{edit_delay} minutos e automaticamente volverá estar visible.**
 
         Porén, se a publicación volvese ser ocultada de segundas, permanecerá oculta ata que un membro do equipo a xestione.
 
-        Para máis información, visita as [directrices da nosa comunidade](%{base_url}/directrices).
+        Para máis información, visite as [directrices da nosa comunidade](%{base_url}/guidelines).
+    post_hidden_again:
+      title: "Publicación agochada de novo"
+      subject_template: "Publicación agochada por alertas da comunidade, notificóuselle ao equipo"
+      text_body_template: |
+        Ola,
+
+        Esta é unha mensaxe automática de %{site_name} para informalo de que a súa publicación volveu ser agochada outra vez.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        A comunidade alertou desta publicación e agora está agochada. **Debido a que esta publicación foi agochada máis dunha vez, seguirá así ata que sexa xestionada por un membro do equipo.**
+
+        Para obter máis axuda, consulte as [directrices da comunidade] (%{base_url}/guidelines).
+    queued_by_staff:
+      title: "A publicación necesita aprobación"
+      subject_template: "Publicación agochada polo equipo, agarda aprobación"
+      text_body_template: |
+        Ola,
+
+        Esta é unha mensaxe automática de %{site_name} que lle permite saber que a súa publicación queda agochada.
+
+        <%{base_url}%{url}>
+
+        A publicación permanecerá agochada ata que un membro do equipo a revise.
+
+        Para indicacións a maiores, consulte as [directrices da comunidade](%{base_url}/guidelines).
     flags_disagreed:
-      title: "Publicación denunciada restaurada polo equipo"
-      subject_template: "Publicación denunciada restaurada polo equipo"
+      title: "Publicación sinalizada restaurada polo equipo"
+      subject_template: "Publicación sinalizada restaurada polo equipo"
+      text_body_template: |
+        Ola,
+
+        Esta é unha mensaxe automática desde %{site_name} para facerlle saber que [a súa publicación](%{base_url}%{url}) foi restaurada.
+
+        A comunidade sinalou esta publicación pero un membro do equipo optou por restaurala.
+
+        [detalles="Prema para expandir a publicación restaurada"]
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+        [/details]
+    flags_agreed_and_post_deleted:
+      title: "O equipo retirou a publicación sinalada"
+      subject_template: "O equipo retirou a publicación sinalada"
+      text_body_template: |
+        Ola,
+
+        Esta é unha mensaxe automatica de %{site_name} para facerlle saber que [a súa publicación](%{base_url}%{url}) foi retirada.
+
+        %{flag_reason}
+
+        A comunidade alertou desta publicación e un membro do equipo optou por retirala.
+
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+
+        Vexa as [normas da comunidade](%{base_url}/guidelines) para máis detalles.
+    usage_tips:
+      text_body_template: |
+        Para algúns consellos rápidos sobre como comezar como novo usuario, [consulte esta publicación do blog] (https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
+        A medida que participe aquí, irémolo coñecendo e as limitacións temporais como novo usuario irán desaparecendo. Co tempo gañará [niveis de confianza] (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) que inclúen funcionalidades especiais para axudarnos a xestionar xuntos esta comunidade.
     welcome_user:
       title: "Benvida ao usuario"
-      subject_template: "Benvido/a a %{site_name}!"
+      subject_template: "Dámoslle a benvida a %{site_name}!"
       text_body_template: |
-        Grazas por te unires a %{site_name} e benvido/a!
+        Grazas por se unir a %{site_name} e benvido/a!
 
         %{new_user_tips}
 
-        Cremos nunha [comunidade cun comportamento civilizado](%{base_url}/directrices) en todo momento.
+        Cremos nunha [comunidade cun comportamento civilizado](%{base_url}/guidelines) en todo momento.
 
-        Desfruta da túa estancia!
+        Goce da súa estadía!
     welcome_tl1_user:
-      subject_template: "Grazas por pasares o tempo connosco"
+      title: "Dámoslle a benvida ao usuario TL1"
+      subject_template: "Grazas por pasar tempo connosco"
+      text_body_template: |
+        Boas. Vemos que estivo ocupado lendo, o que é fantástico, así que lle incrementamos un nivel de confianza! (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
+
+        Estamos realmente contentos de que pase tempo con nós e encantaríanos saber máis sobre vostede. Dedique un momento a [cubrir o seu perfil] (%{base_url}/my/preferences/profile), ou anímese a [comezar un novo tema] (%{base_url}/categories).
     welcome_staff:
-      title: "Benvida ao equipo do foro"
-      subject_template: "Parabéns! Alcanzaches o status de %{role}!"
+      title: "Dámoslle a benvida ao equipo"
+      subject_template: "Parabéns! Alcanzou o status de %{role}!"
       text_body_template: |
-        Un membro do equipo concedeuche o status de %{role}.
+        Un membro do equipo concedeulle o status de %{role}.
 
-        Como %{role}, agora tes acceso á <a href='%{base_url}/admin' target='_blank'>interface de administración</a>.
+        Como %{role}, agora ten acceso á <a href='%{base_url}/admin' target='_blank'>interface de administración</a>.
 
-        Canda o poder vén a responsabilidade. Se non tes experiencia moderando, visita a [Guía de moderación](https://meta.discourse.org/t/discourse-moderation-guide/63116).
+        Canda o poder vén a responsabilidade. Se non ten experiencia moderando, visite a [Guía de moderación](https://meta.discourse.org/t/discourse-moderation-guide/63116).
     welcome_invite:
-      subject_template: "Benvido/a a %{site_name}!"
+      title: "Convite de benvida"
+      subject_template: "Dámoslle a benvida a %{site_name}!"
       text_body_template: |
-        Grazas por aceptares a invitación a  %{site_name} -- dámosche a benvida!
+        Grazas por aceptar a invitación a %{site_name} -- dámoslle a benvida!
 
-        - Creamos esta nova conta **%{username}** para ti. Cambia o teu nome de usuario ou contrasinal visitando [o teu perfil de usuario][preferencias].
+        - Creamos esta nova conta **%{username}** para vostede. Cambie o seu nome de usuario ou contrasinal visitando [o teu perfil de usuario][preferencias].
 
         - Cando inicies sesión, **utiliza o mesmo enderezo electrónico que na invitación** — De non ser así, non seremos capaces de recoñecerte!
 
@@ -2167,18 +2621,26 @@ gl:
 
         Cremos nunha comunidade [cun comportamento civilizado](%{base_url}/guidelines) en todo momento.
 
-        Desfruta da túa estancia!
+        Goce da súa estadía!
 
         [preferencias]: %{user_preferences_url}
+    tl2_promotion_message:
+      subject_template: "Parabéns pola súa promoción a un novo nivel de confianza!"
+      text_body_template: |
+        Promocionámolo a outro [nivel de confianza](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+
+        Como usuario experimentado, debería valorar [esta listaxe de consellos e trucos](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
+        Animámolo a que siga participando. Gústanos telo por aquí.
     backup_succeeded:
-      title: "Copia de seguranza feita satisfactoriamente"
+      title: "Copia de seguranza feita correctamente"
       subject_template: "A copia de seguranza completouse correctamente"
       text_body_template: |
-        Copia de seguranza realizada satisfactoriamente.
+        Copia de seguranza realizada correctamente.
 
-        Visita a sección [administración > copias de seguranza](%{base_url}/admin/backups) para descargar a túa nova copia de seguranza.
+        Visite a sección [administración > copias de seguranza](%{base_url}/admin/backups) para descargar a súa nova copia de seguranza.
 
-        Aquí está o rexistro:
+        Velaquí está o rexistro:
 
         ``` text
         %{logs}
@@ -2189,18 +2651,18 @@ gl:
       text_body_template: |
         Erro na copia de seguranza.
 
-        Aquí está o rexistro:
+        Velaquí está o rexistro:
 
         ``` text
         %{logs}
         ```
     restore_succeeded:
-      title: "Restauración realizada satisfactoriamente"
-      subject_template: "Restauración completada de forma satisfactoria"
+      title: "Restauración realizada correctamente"
+      subject_template: "Restauración completada correctamente"
       text_body_template: |
-        A restauración completouse satisfactoriamente.
+        A restauración completouse correctamente.
 
-        Aquí está o rexistro:
+        Velaquí está o rexistro:
 
         ``` text
         %{logs}
@@ -2211,239 +2673,262 @@ gl:
       text_body_template: |
         Erro na restauración.
 
-        Aquí está o rexistro:
+        Velaquí está o rexistro:
 
         ``` text
         %{logs}
         ```
     bulk_invite_succeeded:
-      title: "Convite en grupo satisfactorio"
-      subject_template: "O convite en bloque procesouse correctamente"
-      text_body_template: "O teu ficheiro de convites en grupo foi procesado; enviáronse %{sent} convites por correo electrónico."
+      title: "Convite en masa correcto"
+      subject_template: "O convite en masa procesouse correctamente"
+      text_body_template: "O seu ficheiro de convites en masa foi procesado; enviáronse %{sent} convites por correo electrónico."
     bulk_invite_failed:
-      title: "Erro no convite en grupo"
-      subject_template: "Convites en grupo procesados con algúns erros"
+      title: "Erro no convite en masa"
+      subject_template: "Convites en masa procesados con algúns erros"
       text_body_template: |
-        O teu ficheiro de convites en grupo foi procesado; enviarónse %{sent} convites por correo electrónico con %{failed} erros.
+        O seu ficheiro de convites en masa foi procesado; enviáronse %{sent} convites por correo electrónico con %{failed} erros.
 
-        Aquí está o rexistro:
+        Velaquí está o rexistro:
 
         ``` text
         %{logs}
         ```
+    user_added_to_group_as_owner:
+      title: "Engadido ao grupo como propietario"
+      subject_template: "Vostede foi engadido como un propietario do grupo %{group_name}"
+      text_body_template: |
+        Vostede foi engadido como un propietario do grupo [%{group_name}](%{base_url}%{group_path}).
+    user_added_to_group_as_member:
+      title: "Engadido ao grupo como membro"
+      subject_template: "Vostede foi engadido como un membro do grupo %{group_name}"
+      text_body_template: |
+        Vostede foi engadido como un membro do grupo [%{group_name}] (%{base_url}%{group_path}).
     csv_export_succeeded:
-      title: "Exportacion de datos en CSV feita satisfactoriamente"
+      title: "Exportación de datos en CSV correcta"
       subject_template: "[%{export_title}] exportación de datos completada"
       text_body_template: |
-        Os teus datos exportáronse satisfactoriamente! :dvd:
+        Os seus datos exportáronse correctamente! :dvd:
 
         %{download_link}
 
-        A ligazón de descarga anterior será válida durante 48 horas.
+        A ligazón de descarga de arriba será válida durante 48 horas.
 
-        Os datos están comprimidos nun ficheiro ZIP. Se o ficheiro non se extrae automaticamente ao abrilo, utiliza a ferramenta que se recomenda aquí: https://www.7-zip.org/
+        Os datos están comprimidos nun ficheiro ZIP. Se o ficheiro non se extrae automaticamente ao abrilo, utilice a ferramenta que se recomenda aquí: https://www.7-zip.org/
     csv_export_failed:
       title: "Erro na exportación de datos en CSV"
       subject_template: "Erro na exportación de datos"
-      text_body_template: "Sentímolo, mais houbo un erro na exportación dos teu datos. Comproba os rexistros ou [contacta cun membro do equipo](%{base_url}/about)."
+      text_body_template: "Sentímolo, mais houbo un erro na exportación dos seus datos. Comprobe os rexistros ou [contacte cun membro do equipo](%{base_url}/about)."
     email_reject_insufficient_trust_level:
-      title: "Correo electrónico de rexeitamento por un nivel de confianza insuficiente"
+      title: "Correo electrónico de rexeitamento por nivel de confianza insuficiente"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Nivel de confianza insuficiente"
       text_body_template: |
-        Sentímolo, mais a túa mensaxe de correo electrónico a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo a %{destination} (co título %{former_title}) non funcionou.
 
-        A túa conta non ten o nivel de confianza que se require para publicar novos temas con este enderezo electrónico. Se pensas que isto é un erro, [contacta cun membro do equipo](%{base_url}/about).
+        A súa conta non ten o nivel de confianza que se require para publicar novos temas con este enderezo de correo. Se pensa que isto é un erro, [contacte cun membro do equipo](%{base_url}/about).
     email_reject_user_not_found:
       title: "Correo electrónico de rexeitamento. Usuario non atopado"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Usuario non atopado"
       text_body_template: |
-        Sentímolo, mais o teu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais o seu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
 
-        A túa resposta foi enviada desde un enderezo electrónico descoñecido. Proba a facer o envío desde outro enderezo ou [contacta cun membro do equipo](%{base_url}/acercade).
+        A súa resposta foi enviada desde un enderezo electrónico descoñecido. Probe a facer o envío desde outro enderezo ou [contacte cun membro do equipo](%{base_url}/about).
     email_reject_screened_email:
       title: "Correo electrónico de rexeitamento. Correo bloqueado"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Correo electrónico bloqueado"
       text_body_template: |
-        Sentímolo, mais o teu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais o seu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
 
-        A túa resposta foi enviada desde un enderezo electrónico que está bloqueado. Proba a facer o envío desde outro enderezo ou [contacta cun membro do equipo](%{base_url}/acercade).
+        A súa resposta foi enviada desde un enderezo electrónico que está bloqueado. Probe a facer o envío desde outro enderezo ou [contacte cun membro do equipo](%{base_url}/about).
     email_reject_not_allowed_email:
       title: "Correo electrónico de rexeitamento por ser un correo non permitido"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Correo electrónico bloqueado"
       text_body_template: |
-        Sentímolo, mais o teu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a mensaxe de correo enviada a %{destination} (co título %{former_title}) non funcionou.
 
-        A túa resposta foi enviada desde un enderezo electrónico que está bloqueado. Proba a facer o envío desde outro enderezo ou [contacta cun membro do equipo](%{base_url}/acercade).
+        A súa resposta foi enviada desde un enderezo de correo que está bloqueado. Probe a facer o envío desde outro enderezo ou [contacte cun membro do equipo](%{base_url}/about).
     email_reject_inactive_user:
       title: "Correo electrónico de rexeitamento. Usuario inactivo"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Usuario inactivo"
       text_body_template: |
-        Sentímolo, mais o teu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais o seu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
 
-        A conta asociada con este enderezo electrónico non está activada. Actívaa antes de enviar correos electrónicos.
+        A conta asociada con este enderezo electrónico non está activada. Actívea antes de enviar correos electrónicos.
     email_reject_silenced_user:
       title: "Correo electrónico de rexeitamento. Usuario silenciado"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Usuario silenciado"
       text_body_template: |
-        Sentímolo, mais o teu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais o seu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
 
         A conta asociada con este enderezo electrónico foi silenciada.
     email_reject_reply_user_not_matching:
       title: "Correo electrónico de rexeitamento por non coincidir o usuario"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Enderezo de resposta non esperado"
       text_body_template: |
-        Sentímolo, mais o teu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo enviada a %{destination} (co título %{former_title}) non funcionou.
 
-        A túa resposta foi enviada desde un enderezo electrónico diferente do que esperabamos polo que non estamos seguros de sexas a mesma persoa. Proba a facer o envío desde outro enderezo ou [contacta cun membro do equipo](%{base_url}/about).
+        A súa resposta foi enviada desde un enderezo de correo diferente do que esperabamos polo que non estamos seguros de sexa a mesma persoa. Probe a facer o envío desde outro enderezo ou [contacte cun membro do equipo](%{base_url}/about).
     email_reject_empty:
       title: "Correo electrónico de rexeitamento por estar baleiro"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Sen contido"
       text_body_template: |
-        Sentímolo, mais a túa mensaxe de correo electrónico a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo electrónico a %{destination} (co título %{former_title}) non funcionou.
 
-        Non puidemos atopar ningunha resposta con contido no teu correo electrónico.
+        Non puidemos atopar ningunha resposta con contido no seu correo electrónico.
 
-        Se estás a ter este problema e si incluíches contido na resposta, téntao cun formato máis simple.
+        Se está a ter este problema e si incluíu contido na resposta, ténteo cun formato máis simple.
     email_reject_parsing:
+      title: "Procesamento do rexeitamento do correo"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Contido non recoñecido"
       text_body_template: |
-        Sentímolo, mais a túa mensaxe de correo electrónico a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo electrónico a %{destination} (co título %{former_title}) non funcionou.
 
-        Non puidemos atopar a túa resposta no correo electrónico. **Asegúrate de que escribes a túa resposta na parte superior do correo** -- non podemos procesar respostas entre liñas.
+        Non puidemos atopar a súa resposta no correo electrónico. **Asegúrese de que escribe a súa resposta na parte superior do correo** -- non podemos procesar respostas entre liñas.
     email_reject_invalid_access:
       title: "Correo electrónico de rexeitamento. Acceso non válido"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Acceso non válido"
       text_body_template: |
-        Sentímolo, mais a túa mensaxe de correo electrónico a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo a %{destination} (co título %{former_title}) non funcionou.
 
-        A túa conta non ten privilexios para publicar novos temas nesta categoría. Se pensas que isto é un erro, [contacta cun membro do equipo](%{base_url}/about).
+        A súa conta non ten permisos para publicar novos temas nesta categoría. Se pensa que isto é un erro, [contacte cun membro do equipo](%{base_url}/about).
     email_reject_strangers_not_allowed:
       title: "Correo electrónico de rexeitamento. Correos estraños non permitidos"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Acceso non válido"
       text_body_template: |
-        Sentímolo, mais a túa mensaxe de correo electrónico enviada a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo electrónico enviada a %{destination} (co título %{former_title}) non funcionou.
 
-        A categoría a que enviaches este correo electrónico só permite respostas de usuarios con contas válidas e enderezos electrónicos coñecidos. Se pensas que isto é un erro, [contacta cun membro do equipo](%{base_url}/about).
+        A categoría á que enviou este correo electrónico só permite respostas de usuarios con contas válidas e enderezos de correo coñecidos. Se pensa que isto é un erro, [contacte cun membro do equipo](%{base_url}/about).
     email_reject_invalid_post:
       title: "Correo electrónico de rexeitamento. Publicación non válida"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Erro ao publicar"
       text_body_template: |
-        Sentímolo, mais o teu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais o seu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
 
-        Algunhas posibles causas: formato complexo, mensaxe demasiado longa ou breve. Téntao de novo ou, se o problema continúa, publica vía sitio web.
+        Algunhas posibles causas: formato complexo, mensaxe demasiado longa ou breve. Ténteo de novo ou, se o problema continúa, publique a través do sitio web.
     email_reject_invalid_post_specified:
       title: "Correo electrónico de rexeitamento. Publicación especificada non válida"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Erro ao publicar"
       text_body_template: |
-        Sentímolo, mais o teu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais o seu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
 
         Motivo:
 
         %{post_error}
 
-        Se podes corrixiri o problema, téntao de novo.
+        Se pode corrixir o problema, ténteo de novo.
+      date_invalid: "Non se atopou ningunha data de creación da publicación. Falta no correo unha cabeceira de data?"
     email_reject_post_too_short:
       title: "Correo electrónico de rexeitamento. Publicación demasiado curta"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Publicacións demasiado curta"
-      text_body_template: "Sentímolo, mais a túa mensaxe de correo electrónico a %{destination} (co título %{former_title}) non funcionou.\n\nPara fomentar unhas conversas máis profundas, non se permiten respostas demasiado breves. Podes responder ao menos con %{count} caracteres?  Alternativamente, podes darlle a gústame a unha publicación respondendo por correo electrónico con +1. \n"
+      text_body_template: |
+        Sentímolo, mais a súa mensaxe de correo electrónico a %{destination} (co título %{former_title}) non funcionou.
+
+        Para fomentar unhas conversas máis profundas, non se permiten respostas demasiado breves. Pode responder polo menos con %{count} caracteres? Como alternativa, pode darlle a gústame a unha publicación respondendo por correo electrónico con "+1".
     email_reject_invalid_post_action:
       title: "Correo electrónico de rexeitamento. Acción de publicación non válida"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Acción de publicación non válida"
       text_body_template: |
-        Sentímolo, mais o teu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais o seu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
 
-        A acción de publicación non foi recoñecida. Téntao de novo ou, se o problema continúa, publica vía sitio web.
+        A acción de publicación non foi recoñecida. Ténteo de novo ou, se o problema continúa, publique a través do sitio web.
     email_reject_reply_key:
       title: "Correo electrónico de rexeitamento. Chave de resposta"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Chave de resposta descoñecida"
       text_body_template: |
-        Sentímolo, mais o teu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo enviada a %{destination} (co título %{former_title}) non funcionou.
 
-        A chave de resposta no correo electrónico non é válida ou é descoñecida, de modo que non podemos determinar a que estás a responder. [Contacta cun membro do equipo](%{base_url}/about).
+        A chave de resposta no correo electrónico non é válida ou é descoñecida, de modo que non podemos determinar a que está a responder. [Contacte cun membro do equipo](%{base_url}/about).
     email_reject_bad_destination_address:
       title: "Correo electrónico de rexeitamento. Enderezo de destino incorrecto"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Enderezo descoñecido"
       text_body_template: |
-        Sentímolo, mais o teu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, pero a súa mensaxe de correo a %{destination} (titulada %{former_title}) non funcionou.
 
-        Utilizas máis dun correo electrónico? Respondiches desde un enderezo electrónico diferente? As respostas vía correo electrónico requiren que utilices o mesmo enderezo ao responder. Alternativamente, a ID da mensaxe na cabeceira do correo debe ser modificada.
+        Aquí ten algunhas cousas que debe comprobar:
+
+          - Utiliza máis dun enderezo de correo? Respondeu desde un enderezo de correo diferente ao que utilizaba orixinalmente? As respostas por correo requiren que utilice o mesmo enderezo de correo electrónico ao responder.
+
+          - O seu software de correo electrónico emprega correctamente a función Responder a: enderezo de correo cando responde? Desafortunadamente, algúns programas de correo envían incorrectamente respostas a De:enderezo de correo, que non funcionará.
+
+          - Modificouse a cabeceira do ID da mensaxe no correo electrónico? O ID da mensaxe debe ser consistente e sen cambios.
+
+        Necesita máis axuda? Contacte connosco a través de Contacto en %{base_url}/about
     email_reject_old_destination:
       title: "Correo electrónico de rexeitamento. Destino antigo"
-      subject_template: "[%{email_prefix}] Problema de correo electrónico -- Estás tentando responder a unha notificación antiga"
+      subject_template: "[%{email_prefix}] Problema de correo electrónico -- Está tentando responder a unha notificación antiga"
       text_body_template: |
-        Sentímolo, mais o teu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais o seu correo electrónico enviado a %{destination} (co título %{former_title}) non funcionou.
 
-        Só aceptamos respostas ás notificacións orixinais durante  %{number_of_days} días. Por favor, [visita o tema](%{short_url}) para continuar coa conversa.
+        Só aceptamos respostas ás notificacións orixinais durante %{number_of_days} días. Por favor, [visite o tema](%{short_url}) para continuar coa conversa.
     email_reject_topic_not_found:
       title: "Correo electrónico de rexeitamento por non se atopar o tema"
-      subject_template: "[%{email_prefix}] Problema de correo electrónico -- Tema non atopado"
+      subject_template: "[%{email_prefix}] Problema de correo electrónico -- Non se atopou o tema"
       text_body_template: |
-        Sentímolo, mais a túa mensaxe de correo electrónico enviada a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo enviada a %{destination} (co título %{former_title}) non funcionou.
 
-        O tema ao que estás respondendo xa non existe -- talvez foi eliminado? Se pensas que isto é un erro, [contacta cun membro do equipo](%{base_url}/about).
+        O tema ao que está respondendo xa non existe -- talvez foi eliminado? Se pensa que isto é un erro, [contacte cun membro do equipo](%{base_url}/about).
     email_reject_topic_closed:
       title: "Correo electrónico de rexeitamento por estar pechado o tema"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Tema pechado"
       text_body_template: |
-        Sentímolo, mais a túa mensaxe de correo electrónico enviada a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo enviada a %{destination} (co título %{former_title}) non funcionou.
 
-        O tema ao que estás respondendo xa está pechado e non admite máis respostas. Se pensas que isto é un erro, [contacta cun membro do equipo](%{base_url}/about).
+        O tema ao que está respondendo xa está pechado e non admite máis respostas. Se pensa que isto é un erro, [contacte cun membro do equipo](%{base_url}/about).
     email_reject_auto_generated:
-      title: "Correo electrónico de rexeitamento. Autoxerado"
+      title: "Correo electrónico de rexeitamento xerado automaticamente"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Resposta xerada automaticamente"
       text_body_template: |
-        Sentímolo, mais a túa mensaxe de correo electrónico enviada a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo enviada a %{destination} (co título %{former_title}) non funcionou.
 
-        O teu correo foi marcado como "xerado automaticamente", é dicir, que foi xerado de forma automática por un ordenador no canto de por unha persoa; non podemos aceptar este tipo de correos. Se pensas que isto é un erro, [contacta cun membro do equipo](%{base_url}/about).
+        O seu correo foi marcado como «xerado automaticamente», é dicir, que foi xerado de forma automática por un computador no canto de por unha persoa; non podemos aceptar este tipo de correos. Se pensa que isto é un erro, [contacte cun membro do equipo](%{base_url}/about).
     email_reject_unrecognized_error:
       title: "Correo electrónico de rexeitamento. Erro descoñecido"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Erro descoñecido"
       text_body_template: |
-        Sentímolo, mais a túa mensaxe de correo electrónico a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo a %{destination} (co título %{former_title}) non funcionou.
 
-        Produciuse un erro descoñecido ao procesar o teu correo electrónico e non foi publicado. Deberías volver tentalo ou [contactar cun membro do equipo](%{base_url}/about).
+        Produciuse un erro descoñecido ao procesar a súa mensaxe de correo e non foi publicada. Debería volver tentalo ou [contactar cun membro do equipo](%{base_url}/about).
     email_reject_attachment:
-      title: "Correo electrónico de rexeitamento do ficheiro anexo"
+      title: "Anexo de correo electrónico rexeitado"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Ficheiro anexo rexeitado"
       text_body_template: |
-        Desafortunadamente algúns ficheiros anexos na túa mensaxe con destino a %{destination} (co título %{former_title}) foron rexeitados.
+        Por desgraza, algúns ficheiros anexos na súa mensaxe con destino a %{destination} (co título %{former_title}) foron rexeitados.
 
         Detalles:
         %{rejected_errors}
 
-        Se pensas que isto é un erro, [contacta cun membro do equipo](%{base_url}/about).
+        Se pensa que isto é un erro, [contacte cun membro do equipo](%{base_url}/about).
     email_reject_reply_not_allowed:
       title: "Correo electrónico de rexeitamento por resposta non permitida"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Resposta non permitida"
       text_body_template: |
-        Sentímolo, mais a túa mensaxe de correo electrónico a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo a %{destination} (co título %{former_title}) non funcionou.
 
-        Non tes permiso para responder no tema. Se pensas que isto é un erro, [contacta cun membro do equipo](%{base_url}/about).
+        Non ten permisos para responder no tema. Se pensa que isto é un erro, [contacte cun membro do equipo](%{base_url}/about).
     email_reject_reply_to_digest:
       title: "Correo electrónico de rexeitamento por responder a un resumo"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Resposta a un resumo"
       text_body_template: |
-        Sentímolo, mais a túa mensaxe de correo electrónico a %{destination} (co título %{former_title}) non funcionou.
+        Sentímolo, mais a súa mensaxe de correo a %{destination} (co título %{former_title}) non funcionou.
 
-        Respondiches a un correo electrónico de resumo, o cal non está permitido.
+        Respondeu a un correo electrónico de resumo, o cal non está permitido.
 
-        Se pensas que isto é un erro, [contacta cun membro do equipo](%{base_url}/about).
+        Se pensa que isto é un erro, [contacte cun membro do equipo](%{base_url}/about).
     email_error_notification:
       title: "Correo electrónico de notificación de erros"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Erro de autenticación POP"
       text_body_template: |
-        Desafortunadamente houbo un erro de autenticación durante a sondaxe de correos do servidor POP.
+        Por desgraza, houbo un erro de autenticación durante a recollida de correos do servidor POP.
 
-        Asegúrate da correcta configuración das credencias POP nos [axustes do sitio](%{base_url}/admin/site_settings/category/email).
+        Asegúrese da correcta configuración das credencias POP nos [axustes do sitio](%{base_url}/admin/site_settings/category/email).
 
-        Se dispóns dunha interface de usuario para a conta de correo POP, é posible que teñas que rexistrarte na páxina web e comprobar alí a configuración.
+        Se dispón dunha interface de usuario para a conta de correo POP, é posible que teña que rexistrarse na páxina web e comprobar alí a configuración.
     email_revoked:
       title: "Correo electrónico revogado"
-      subject_template: "O teu correo electrónico é correcto?"
+      subject_template: "O seu enderezo electrónico é correcto?"
       text_body_template: |
-        Sentímolo, mais estamos a ter problemas para contactar contigo vía correo electrónico. As nosas últimas mensaxes foron devoltas como imposibles de entregar.
+        Sentímolo, mais estamos a ter problemas para contactar con vostede a través do correo electrónico. As nosas últimas mensaxes foron devoltas como imposibles de entregar.
 
-        Podes asegurar que [o teu enderezo electrónico](%{base_url}/my/preferences/email) é válido e está a funcionar? Tamén podes engadir o noso enderezo electrónico á túa axenda para mellorar a entregabilidade das mensaxes.
+        Está seguro/ra de que [o su enderezo electrónico](%{base_url}/my/preferences/email) é válido e está a funcionar? Tamén pode engadir o noso enderezo electrónico á súa axenda para mellorar a entregabilidade das mensaxes.
     email_bounced: |
       A mensaxe a %{email} foi devolta.
 
@@ -2453,49 +2938,49 @@ gl:
       %{raw}
       ```
     ignored_users_summary:
-      title: "Ignorado. O usuario superou o limiar"
+      title: "Superou o limiar de Usuario ignorado"
       subject_template: "Un usuario está a ser ignorado por moitos outros"
       text_body_template: |
         Ola,
 
-        Esta é unha mensaxe automática de %{site_name} para informarte de que @%{username} foi ignorado por %{ignores_threshold} usuarios. Isto podería ser indicativo de que hai un problema na túa comunidade.
+        Esta é unha mensaxe automática de %{site_name} para informalo/la de que @%{username} foi ignorado por %{ignores_threshold} usuarios. Isto podería ser indicativo de que hai un problema na súa comunidade.
 
-        É posible que queiras [revisar as publicacións recentes](%{base_url}/u/%{username}/summary) deste usuario e potencialmente doutros usuarios no [informe de usuario ignorado e silenciado](%{base_url}/admin/reports/top_ignored_users).
+        É posible que queira [revisar as publicacións recentes](%{base_url}/u/%{username}/summary) deste usuario e potencialmente doutros usuarios no [informe de usuario ignorado e silenciado](%{base_url}/admin/reports/top_ignored_users).
 
-        Para máis información, visita as [directrices da nosa comunidade](%{base_url}/guidelines).
+        Para máis información, visite as [directrices da nosa comunidade](%{base_url}/guidelines).
     too_many_spam_flags:
       title: "Demasiadas denuncias de mensaxes lixo"
       subject_template: "Conta nova suspendida"
       text_body_template: |
         Ola,
 
-        Esta é unha mensaxe automática de %{site_name} para comunicarche que as túas publicacións foron ocultadas temporalmente por mor dun importante número de denuncias da comunidade.
+        Esta é unha mensaxe automática de %{site_name} para comunicarlle que as súas publicacións foron agochadas temporalmente por mor dun importante número de alertas da comunidade.
 
-        Como medida preventiva, a túa nova conta foi silenciada para crear novas respostas ou temas ata que un membro do equipo a revise. Sentimos as molestias.
+        Como medida preventiva, a súa nova conta foi silenciada e non poderá crear novas respostas ou temas ata que un membro do equipo a revise. Sentimos as molestias.
 
-        Para máis información, visita as [directrices da nosa comunidade](%{base_url}/guidelines).
+        Para máis información, visite as [directrices da nosa comunidade](%{base_url}/guidelines).
     too_many_tl3_flags:
       title: "Demasiadas denuncias NC3"
       subject_template: "Conta nova suspendida"
       text_body_template: |
         Ola,
 
-        Esta é unha mensaxe automática de %{site_name} para comunicarche que a túa conta foi suspendida por mor dun importante número de denuncias da comunidade.
+        Esta é unha mensaxe automática de %{site_name} para comunicarlle que a súa conta foi suspendida por mor dun importante número de alertas da comunidade.
 
-        Como medida preventiva, a túa nova conta foi silenciada para crear novas respostas ou temas ata que un membro do equipo a revise. Sentimos as molestias.
+        Como medida preventiva, a súa nova conta foi silenciada e non poderá crear novas respostas ou temas ata que un membro do equipo a revise. Sentimos as molestias.
 
-        Para máis información, visita as [directrices da nosa comunidade](%{base_url}/directrices).
+        Para máis información, visite as [directrices da nosa comunidade](%{base_url}/guidelines).
     silenced_by_staff:
       title: "Silenciada polo equipo"
       subject_template: "Conta temporalmente suspendida"
       text_body_template: |
         Ola,
 
-        Esta é unha mensaxe automática de %{site_name} para comunicarche que a túa conta foi temporalmente suspendida como medida preventiva.
+        Esta é unha mensaxe automática de %{site_name} para comunicarlle que a súa conta foi temporalmente suspendida como medida preventiva.
 
-        Sigue navegando, mais non poderás responder nin crear temas ata que un [membro do equipo](%{base_url}/about) revise as túas publicacións máis recentes. Sentimos as molestias.
+        Siga navegando, mais non poderá responder nin crear temas ata que un [membro do equipo](%{base_url}/about) revise as súas publicacións máis recentes. Sentimos as molestias.
 
-        Para máis información, visita as [directrices da nosa comunidade](%{base_url}/guidelines).
+        Para máis información, visite as [directrices da nosa comunidade](%{base_url}/guidelines).
     user_automatically_silenced:
       title: "Usuario silenciado automaticamente"
       subject_template: "Usuario novo %{username} silenciado polas denuncias da comunidade"
@@ -2504,52 +2989,60 @@ gl:
 
         O novo usuario [%{username}](%{user_url}) foi silenciado automaticamente porque moitos usuarios denunciaron as publicacións de %{username}.
 
-        [Revisa as denuncias](%{base_url}/admin/flags). Se %{username} foi silenciado incorrectamente, preme o botón de retirar o silencio na [páxina de administración para este usuario](%{user_url}).
+        [Revise as denuncias](%{base_url}/admin/flags). Se %{username} foi silenciado incorrectamente, prema o botón de retirar o silencio na [páxina de administración para este usuario](%{user_url}).
 
-        Isto pode ser cambiado co axuste `silence_new_user` na configuración do sitio.
+        Isto pode cambiarse co axuste `silence_new_user` na configuración do sitio.
     spam_post_blocked:
       title: "Publicación lixo bloqueada"
       subject_template: "As publicacións do novo usuario %{username} foron bloqueadas por repetir ligazóns"
+      text_body_template: |
+        Esta é unha mensaxe automática.
+
+        O novo usuario [%{username}](%{user_url}) tentou crear múltiples publicacións con ligazóns a %{domains}, pero esas publicacións foron bloqueadas co fin de evitar mensaxes lixo. O usuario aínda pode crear novas publicacións sempre e cando non conteñan ligazóns a %{domains}.
+
+        [Bótelle un ollo ao usuario](%{user_url}).
+
+        Isto pode modificarse nos axustes do sitio `newuser_spam_host_threshold` e `white_listed_spam_host_domains`. Considere a opción de engadir %{domains} á listaxe de permitidos se quere estabelecer unha excepción con eles.
     unsilenced:
       title: "Sen silenciar"
-      subject_template: "Conta reestablecida"
+      subject_template: "Conta restabelecida"
       text_body_template: |
         Ola,
 
-        Esta é unha mensaxe automática de %{site_name} para comunicarche que a túa conta xa non está suspendida logo de ser revisada polo equipo.
+        Esta é unha mensaxe automática de %{site_name} para comunicarlle que a súa conta xa non está suspendida logo de ser revisada polo equipo.
 
-        Agora podes volver crear novas respostas e temas. Grazas pola túa paciencia.
+        Agora pode volver crear novas respostas e temas. Grazas pola súa paciencia.
     pending_users_reminder:
       title: "Recordatorio de usuarios pendentes"
       subject_template:
         one: "%{count} usuario á espera de ser aprobado"
         other: "%{count} usuarios á espera de seren aprobados"
       text_body_template: |
-        Hai rexistros de novos usuarios á espera de seren aprobados (ou rexeitados) antes de que eles poidan acceder a este foro.
+        Hai rexistros de novos usuarios á espera de seren aprobados (ou rexeitados) para poderen acceder a este foro.
 
-        [Revísaos]%{base_url}/review).
+        [Revíseos]%{base_url}/review).
     download_remote_images_disabled:
-      title: "Descarga de imaxes remotas deshabilitada"
-      subject_template: "A descarga de imaxes remotas foi deshabilitada"
-      text_body_template: "O axuste `download_remote_images_to_local` foi deshabilitado porque se alcanzou o límite do espazo do disco configurado en `download_remote_images_threshold`."
+      title: "Descarga de imaxes remotas desactivada"
+      subject_template: "A descarga de imaxes remotas foi desactivada"
+      text_body_template: "O axuste `download_remote_images_to_local` foi desactivada porque se alcanzou o límite do espazo do disco configurado en `download_remote_images_threshold`."
     dashboard_problems:
       title: "Problemas do panel"
-      subject_template: "Novo consello no panel do teu sitio"
+      subject_template: "Novo consello no seu panel de sitio"
       text_body_template: |
-        Temos algúns novos consellos e recomendacións con base na configuración actual do teu sitio.
+        Temos algúns novos consellos e recomendacións con base na configuración actual do seu sitio.
 
-        [Visita o teu panel](%{base_url}/admin) e bótalles un ollo.
+        [Visite o seu panel](%{base_url}/admin) e bótelles un ollo.
 
-        Se non ves nada no teu panel, pode ser porque outro membro do equipo xa actuase sobre el. Podes atopar unha listaxe de accións nos teus [rexistros de accións do equipo](%{base_url}/admin/logs/staff_action_logs).
+        Se non ve nada no seu panel, pode ser porque outro membro do equipo xa actuara sobre el. Pode atopar unha listaxe de accións nos seus [rexistros de accións do equipo](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
-      title: "Es o usuario novo do mes!"
-      subject_template: "Es o usuario novo do mes!"
+      title: "É o usuario novo do mes!"
+      subject_template: "É o usuario novo do mes!"
       text_body_template: |
-        Parabéns! Gañaches o **Premio ao Usuario Novo do Mes de %{month_year}**. :trophy:
+        Parabéns! Gañou o **Premio ao Usuario Novo do Mes de %{month_year}**. :trophy:
 
         Este premio só o gañan dous novos usuarios ao mes e estará permanentemente visible na [páxina de insignias](%{url}).
 
-        Convertícheste en nada nun membro de moito valor para a nosa comunidade. Grazas por te unires e continúa con este bo traballo!
+        Converteuse en nada nun membro de moito valor para a nosa comunidade. Grazas por se unir e continúe con este bo traballo!
     queued_posts_reminder:
       title: "Recordatorio de publicacións na cola"
       subject_template:
@@ -2558,33 +3051,33 @@ gl:
       text_body_template: |
         Ola,
 
-        As publicacións de novos usuarios foron son retidas para a súa moderación e están actualmente pendentes de revisión. [Apróbaas ou rexéitaas aquí](%{base_url}/review?type=ReviewableQueuedPost).
+        As publicacións de novos usuarios foron retidas para a súa moderación e están agora pendentes de revisión. [Apróbeas ou rexéiteas aquí](%{base_url}/review?type=ReviewableQueuedPost).
   unsubscribe_link: |
-    Para darte de baixa destes correos electrónicos, [preme aquí](%{unsubscribe_url}).
+    Para darse de baixa destes correos electrónicos, [prema aquí](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
-    Para darte de baixa destes correos electrónicos, [preme aquí](%{unsubscribe_url}).
+    Para darse de baixa destes correos electrónicos, [prema aquí](%{unsubscribe_url}).
   unsubscribe_mailing_list: |
-    Recibes isto porque activaches o modo listaxe de correo electrónico.
+    Recibe isto porque activou o modo listaxe de correo electrónico.
 
-    Para te dares de baixa destes correos electrónicos, [preme aquí](%{unsubscribe_url}).
+    Para se dar de baixa destes correos electrónicos, [prema aquí](%{unsubscribe_url}).
   subject_re: "Re: "
   subject_pm: "[MP] "
   email_from: "%{user_name} vía %{site_name}"
   user_notifications:
     previous_discussion: "Respostas anteriores"
     reached_limit:
-      one: "Advertencia: enviamos un máximo de %{count} correo electrónico diario. Comproba no sitio o número os que se poden reter."
-      other: "Advertencia: enviamos un máximo de  %{count} correos electrónicos diarios. Comproba no sitio o número os que se poden reter. Grazas por seres tan popular!"
+      one: "Advertencia: enviamos un máximo de %{count} correo electrónico diario. Comprobe no sitio o número dos que se poden reter."
+      other: "Advertencia: enviamos un máximo de %{count} correos electrónicos diarios. Comprobe no sitio o número dos que se poden reter. Grazas por ser tan popular!"
     in_reply_to: "En resposta a"
     unsubscribe:
       title: "Cancelar subscrición"
-      description: "Non tes interese en recibir estes correos electrónicos? Sen problema! Preme embaixo para darte de baixa ao momento:"
-    reply_by_email: "[Visita o tema](%{base_url}%{url}) ou responde a este correo."
-    reply_by_email_pm: "[Visita a mensaxe](%{base_url}%{url}) ou responde a este correo para responder a %{participants}."
+      description: "Non ten interese en recibir estes correos electrónicos? Sen problema! Prema embaixo para darse de baixa agora mesmo:"
+    reply_by_email: "[Visite o tema](%{base_url}%{url}) ou responda a este correo."
+    reply_by_email_pm: "[Visite a mensaxe](%{base_url}%{url}) ou responda a este correo para contestar a %{participants}."
     only_reply_by_email: "Responder a este correo para publicar."
     only_reply_by_email_pm: "Responder a este correo para responder a %{participants}."
-    visit_link_to_respond: "[Visita o tema](%{base_url}%{url}) para responder."
-    visit_link_to_respond_pm: "[Visita a mensaxe](%{base_url}%{url}) para responder a %{participants}."
+    visit_link_to_respond: "[Visite o tema](%{base_url}%{url}) para responder."
+    visit_link_to_respond_pm: "[Visite a mensaxe](%{base_url}%{url}) para responder a %{participants}."
     posted_by: "Publicado por %{username} o %{post_date}"
     pm_participants: "Participantes: %{participants}"
     invited_group_to_private_message_body: |
@@ -2598,11 +3091,11 @@ gl:
 
       > %{site_title} -- %{site_description}
 
-      Para te unires á mensaxe, preme na seguinte ligazón:
+      Para se unir á mensaxe, prema na seguinte ligazón:
 
       %{topic_url}
     invited_to_private_message_body: |
-      %{username} convidoute a unha mensaxe
+      %{username} convidouno/na a unha mensaxe
 
       > **[%{topic_title}](%{topic_url})**
       >
@@ -2612,11 +3105,11 @@ gl:
 
       > %{site_title} -- %{site_description}
 
-      Para te unires á mensaxe, preme na seguinte ligazón:
+      Para se unir á mensaxe, prema na seguinte ligazón:
 
       %{topic_url}
     invited_to_topic_body: |
-      %{username} convidoute a unha discusión
+      %{username} convidouno/na a unha discusión
 
       > **[%{topic_title}](%{topic_url})**
       >
@@ -2626,7 +3119,7 @@ gl:
 
       > %{site_title} -- %{site_description}
 
-      Para te unires á discusión, preme na seguinte ligazón:
+      Para se unir á discusión, prema na seguinte ligazón:
 
       %{topic_url}
     user_invited_to_private_message_pm_group:
@@ -2640,7 +3133,7 @@ gl:
         %{respond_instructions}
     user_invited_to_private_message_pm:
       title: "Usuario convidado a MP"
-      subject_template: "[%{email_prefix}] %{username} convidoute a unha mensaxe '%{topic_title}'"
+      subject_template: "[%{email_prefix}] %{username} convidouno/na a unha mensaxe '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -2648,8 +3141,8 @@ gl:
 
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
-      title: "Usuario convidado á MP provisoria"
-      subject_template: "[%{email_prefix}] %{username} convidoute a unha mensaxe '%{topic_title}'"
+      title: "Usuario convidado á MP transitoria"
+      subject_template: "[%{email_prefix}] %{username} convidouno/na a unha mensaxe '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -2658,7 +3151,7 @@ gl:
         %{respond_instructions}
     user_invited_to_topic:
       title: "Usuario convidado ao tema"
-      subject_template: "[%{email_prefix}] %{username} convidoute a '%{topic_title}'"
+      subject_template: "[%{email_prefix}] %{username} convidouno/na a '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -2776,206 +3269,242 @@ gl:
 
         %{respond_instructions}
     user_posted_pm_staged:
-      title: "Usuario enviou unha MP provisoria"
+      title: "Usuario enviou unha MP transitoria"
       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"
+      subject_template: "[%{email_prefix}] A súa conta foi suspendida"
       text_body_template: |
-        Fuches suspendido no foro ata %{suspended_till}.
+        Queda suspendida a súa participación no foro ata %{suspended_till}.
 
-        %{reason}
-
-        %{message}
+        Razón - %{reason}
     account_silenced:
       title: "Conta silenciada"
-      subject_template: "[%{email_prefix}] A túa conta foi silenciada"
+      subject_template: "[%{email_prefix}] A súa conta foi silenciada"
       text_body_template: |
-        Permanecerás en silencio no foro ata %{silenced_till}.
+        Queda silenciado no foro ata %{silenced_till}.
 
-        %{reason}
-
-        %{message}
+        Razón - %{reason}
     account_exists:
       title: "A conta xa existe"
       subject_template: "[%{email_prefix}] A conta xa existe"
       text_body_template: |
-        Tentaches crear unha conta en %{site_name}ou tentaches cambiar o correo electrónico dunha conta para %{email}. Porén, xa existe unha conta para %{email}.
+        Tentou crear unha conta en %{site_name}ou tentou cambiar o correo electrónico dunha conta para %{email}. Porén, xa existe unha conta para %{email}.
 
-        Se esqueciches o contrasinal, [restabléceo agora](%{base_url}/password-reset).
+        Se esqueceu o contrasinal, [restablézao agora](%{base_url}/password-reset).
 
-        Se non tentaches crear unha conta para %{email} nin pretendiches cambiar o enderezo electrónico, non te preocuupes. Podes ignorar esta mensaxe.
+        Se non tentou crear unha conta para %{email} nin pretendeu cambiar o enderezo electrónico, non se preocupe. Pode ignorar esta mensaxe.
 
-        If you have any questions, [contact our friendly staff](%{base_url}/about).
+        Se ten calquera pregunta, [contacte co noso equipo](%{base_url}/about).
+    account_second_factor_disabled:
+      title: "Autenticación en dous pasos desactivada"
+      subject_template: "[%{email_prefix}] Autenticación en dous pasos desactivada"
+      text_body_template: |
+        A autenticación de dobre paso desactivouse na súa conta en %{site_name}. Agora pode iniciar sesión con só o seu contrasinal; xa non se vai precisar un código adicional de autenticación.
+
+        Se non elixiu desactivar a autenticación de dobre paso, pode que alguén comprometese a seguridade da súa conta.
+
+        Se ten calquera pregunta, [contacte co noso equipo](%{base_url}/about).
     digest:
-      why: "Un breve resumo de %{site_link} desde a túa última visita o %{last_seen_at}"
-      since_last_visit: "Desde a túa última visita"
+      why: "Un breve resumo de %{site_link} desde a súa última visita o %{last_seen_at}"
+      since_last_visit: "Desde a sú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"
+      liked_received: "Gústame recibidos"
       new_users: "Novos usuarios"
       popular_topics: "Temas populares"
       follow_topic: "Seguir este tema"
       join_the_discussion: "Ler máis"
       popular_posts: "Publicacións máis populares"
-      more_new: "Novo para ti"
+      more_new: "Novo para vostede"
       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í"
+      unsubscribe: "Este resumo envíaselle desde %{site_link} cando levamos tempo sen velo. Cambie %{email_preferences_link} ou %{unsubscribe_link} para cancelar a subscrición."
+      your_email_settings: "a configuración do seu correo electrónico"
+      click_here: "prema aquí"
       from: "%{site_name}"
-      preheader: "Un breve resumo desde a túa última visita o %{last_seen_at}"
+      preheader: "Un breve resumo desde a súa última visita o %{last_seen_at}"
     forgot_password:
       title: "Esquecín o contrasinal"
-      subject_template: "[%{email_prefix}] Restablecer contrasinal"
+      subject_template: "[%{email_prefix}] Restabelecemento do contrasinal"
       text_body_template: |
-        Alguén solicitou restablecer o teu contrasinal en [%{site_name}](%{base_url}).
+        Alguén solicitou restabelecer o seu contrasinal en [%{site_name}](%{base_url}).
 
-        Se non fuches ti, podes tranquilamente ignorar este correo electrónico.
+        Se non foi vostede, pode ignorar tranquilamente este correo electrónico.
 
-        Preme na seguinte ligazón para elixir un novo contrasinal:
+        Prema 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}).
+        Velaquí a súa ligazón para iniciar sesión en [%{site_name}](%{base_url}).
 
-        Se non solicitaches esta ligazón, podes tranquilamente ignorar este correo electrónico.
+        Se non solicitou esta ligazón, pode ignorar tranquilamente este correo electrónico.
 
-        Preme na seguinte ligazón para iniciar sesión en:
+        Prema na seguinte ligazón para iniciar sesión en:
         %{base_url}/session/email-login/%{email_token}
     set_password:
-      title: "Establecer o contrasinal"
-      subject_template: "[%{email_prefix}] Establecer o contrasinal"
+      title: "Estabelecer o contrasinal"
+      subject_template: "[%{email_prefix}] Estabelecer 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.
+        Alguén solicitou engadir un contrasinal á súa conta en [%{site_name}](%{base_url}). Como alternativa, pode iniciar sesión utilizando calquera dos servizos en liña compatibles (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.
+        Se vostede non fixo esta solicitude, pode ignorar tranquilamente este correo electrónico.
 
-        Click the following link to choose a password:
+        Prema na seguinte ligazón para elixir un contrasinal:
         %{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 súa conta en [%{site_name}](%{base_url}).
+
+        Se non foi vostede, pode ignorar este correo electrónico.
+
+        Prema 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"
+      subject_template: "[%{email_prefix}] A súa nova conta"
       text_body_template: |
-        Creouse unha nova conta para ti en %{site_name}
+        Creouse unha nova conta para vostede en %{site_name}
 
-        Preme na seguinte ligazón para elixir un contrasinal para a túa nova conta:
+        Prema na seguinte ligazón para elixir un contrasinal para a sú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"
+      subject_template: "[%{email_prefix}] Confirme o seu novo enderezo de correo electrónico"
+      text_body_template: |
+        Confirme o seu novo enderezo electrónico para %{site_name} premendo na seguinte ligazón:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
+
+        Se non solicitou este cambio, contacte cun [administrador do sitio](%{base_url}/about).
+    confirm_new_email_via_admin:
+      title: "Confirme o novo correo electrónico"
+      subject_template: "[%{email_prefix}] Confirme o seu novo enderezo electrónico"
+      text_body_template: |
+        Confirme o seu novo enderezo electrónico para %{site_name} premendo na seguinte ligazón:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
+
+        Este cambio de enderezo electrónico foi solicitado por un administrador do sitio. Se vostede non solicitou este cambio, contacte cun [administrador do sitio](%{base_url}/about).
     confirm_old_email:
       title: "Confirmar o correo electrónico antigo"
-      subject_template: "[%{email_prefix}] Confirma o teu enderezo de correo electrónico actual"
+      subject_template: "[%{email_prefix}] Confirme o seu 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
+        Antes de cambiar o seu enderezo electrónico, necesitamos que confirme que o correo
+        electrónico actual está baixo o seu 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:
+        Confirme o seu 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"
+      subject_template: "[%{email_prefix}] Confirme o seu 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
+        Antes de que poidamos engadir un novo enderezo electrónico, necesitamos que confirme que o actual
+        está baixo o seu 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:
+        Confirme o seu correo electrónico actual para %{site_name} premendo na seguinte ligazón:
 
         %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
       title: "Notificar correo electrónico antigo"
-      subject_template: "[%{email_prefix}] O teu enderezo de correo electrónico foi cambiado"
+      subject_template: "[%{email_prefix}] Cambiouse o seu enderezo de correo electrónico"
       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
+        Esta é unha mensaxe automática para comunicarlle que se cambiou o seu enderezo electrónico para
+        %{site_name}. Se isto é un erro, contacte co administrador
         do sitio.
 
-        O teu enderezo de correo electrónico cambiouse a:
+        O seu enderezo de correo electrónico cambiouse a:
 
         %{new_email}
     notify_old_email_add:
       title: "Notificar correo electrónico antigo (engadir)"
       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
+        Esta é unha mensaxe automática para comunicarlle que se engadiu un enderezo electrónico
+        para %{site_name}. Se isto é un erro, contacte
         co administrador do sitio.
 
-        O teu enderezo de correo electrónico engadido é:
+        O seu 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}!"
+      subject_template: "A súa solicitude foi aprobada en %{site_name}!"
       text_body_template: |
-        Benvido/a a %{site_name}!
+        Dámoslle a benvida a %{site_name}!
 
-        Un membro do equipo aprobou a túa conta en %{site_name}.
+        Un membro do equipo aprobou a súa conta en %{site_name}.
 
-        Agora podes acceder á túa nova conta iniciando sesión en:
+        Agora pode acceder á sú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.
+        Se non pode premer na ligazón, probe a copiala e pegala na barra de enderezos do seu navegador.
 
         %{new_user_tips}
 
-        Cremos nunha comunidade cun [comportamento civilizado](%{base_url}/directrices) en todo momento.
+        Cremos nunha comunidade cun [comportamento civilizado](%{base_url}/guidelines) en todo momento.
 
-        Desfruta a túa estancia!
+        Goce da súa estadía!
+    signup_after_reject:
+      title: "Rexistro despois do rexeitamento"
+      subject_template: "Resultou rexeitado en %{site_name}"
+      text_body_template: |
+        Un membro do grupo rexeitou a súa conta en %{site_name}.
+
+        %{reject_reason}
     signup:
       title: "Rexistrarse"
-      subject_template: "[%{email_prefix}] Confirma a túa nova conta"
+      subject_template: "[%{email_prefix}] Confirme a súa nova conta"
       text_body_template: |
-        Benvido/a a %{site_name}!
+        Dámoslle a benvida a %{site_name}!
 
-        Preme na seguinte ligazón para confirmar e activar a túa nova conta:
+        Prema na seguinte ligazón para confirmar e activar a sú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.
+        Se non pode premer na ligazón, probe a copiala e pegala na barra de enderezos do seu navegador.
     activation_reminder:
       title: "Recordatorio de activación"
-      subject_template: "[%{email_prefix}] Recordatorio para confirmar a túa conta"
+      subject_template: "[%{email_prefix}] Recordatorio para confirmar a súa conta"
       text_body_template: |
-        Benvido/a a %{site_name}!
+        Dámoslle a benvida a %{site_name}!
 
-        Este é un recordatorio para activar a túa conta.
+        Este é un recordatorio para activar a súa conta.
 
-        Preme na seguinte ligazón para confirmar e activar a túa nova conta:
+        Prema na seguinte ligazón para confirmar e activar a sú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.
+        Se non pode premer na ligazón, probe a copiala e pegala na barra de enderezos do seu 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?
+        Detectamos un inicio de sesión desde un dispositivo ou localización que non adoita utilizar. Foi vostede?
 
          - Localización: %{location} (%{client_ip})
          - Navegador: %{browser}
          - Dispositivo: %{device} – %{os}
 
-        Se fuches ti, perfecto! Non tes que facer máis nada.
+        Se foi vostede, perfecto! Non ten 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.
+        Se non o foi, [revise a súa sesión actual](%{base_url}/my/preferences/account) e valore cambiar o de contrasinal.
+    post_approved:
+      title: "A súa publicación foi aprobada"
   page_forbidden:
-    title: "Vaites! Esta páxina é privada."
+    title: "Oopa! Esta páxina é privada."
   page_not_found:
-    title: "Vaites! A páxina non existe ou é privada."
+    title: "Oopa! Esta páxina non existe ou é privada."
     popular_topics: "Destacados"
     recent_topics: "Recentes"
     see_more: "Máis"
@@ -2983,47 +3512,48 @@ gl:
     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."
+    offline_page_message: "Parece que non está conectado/a! Comprobe a súa conexión á rede e vólvao tentar."
   login_required:
     welcome_message: |
-      ## [Benvido/a a %{title}](#welcome)
-      Requírese unha conta. Crea unha ou inicia sesión para continuar.
+      ## [Dámoslle a benvida a %{title}](#welcome)
+      Requírese unha conta. Cree unha ou inicie 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.
+      ## [Dámoslle a benvida a %{title}](#welcome)
+      Requírese unha conta. Pídalle a un membro que o convide ou inicie sesión para continuar.
   deleted: "eliminado"
   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})."
+    unauthorized: "Sentímolo, o ficheiro que tenta 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."
+    file_missing: "Sentímolo, debe facilitar un ficheiro para subir."
+    empty: "Sentímolo, mais o ficheiro que facilitou 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)."
+      too_large: "Sentímolo, o ficheiro que tenta subir é grande de máis (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?"
+      too_large: "Sentímolo, a imaxe que tenta subir é grande de máis (o tamaño máximo é de %{max_size_kb} KB); redimensiónea e vólvao tentar."
+      larger_than_x_megapixels: "Sentímolo, a imaxe que tenta subir é grande de máis (o tamaño máximo é de %{max_image_megapixels} megapíxeles); redimensiónea e vólvao tentar."
+      size_not_found: "Sentímolo, mais non puidemos determinar o tamaño da imaxe. Estará se cadra 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?"
+    missing: "Sentímolo, non puidemos atopar ningún avatar asociado con ese correo electrónico. Pode 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>."
+    sockpuppet: "Un novo usuario creou un tema e outro novo usuario respondeu desde a mesma IP (%{ip_address}). Revise 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. Revise 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."
+    exceeded_emails_limit: "Superouse o max_emails_per_day_per_user"
+    exceeded_bounces_limit: "Superouse o bounce_score_threshold"
+    mailing_list_no_echo_mode: "Notificacións da listaxe de correo desactivadas 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_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"
@@ -3045,334 +3575,721 @@ gl:
     neutral: "Neutro"
     grey_amber: "Gris ámbar"
     shades_of_blue: "Azulado"
+    latte: "Latte"
     summer: "Verán"
     dark_rose: "Rosa escuro"
+    wcag: "WCAG Claro"
+    wcag_theme_name: "WCAG Claro"
+    wcag_dark: "WCAG Escuro"
+    wcag_dark_theme_name: "WCAG Escuro"
+    default_theme_name: "Predeterminado"
     light_theme_name: "Claro"
     dark_theme_name: "Escuro"
     neutral_theme_name: "Neutro"
     grey_amber_theme_name: "Gris ámbar"
     shades_of_blue_theme_name: "Azulado"
+    latte_theme_name: "Latte"
     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ñá."
+    rate_limit_error: "Só se poden descargar as publicacións unha vez por día. Ténteo de novo mañá."
   static_topic_first_reply: |
     Editar a primeira publicación deste tema para cambiar o contido da páxina %{page_name}.
   guidelines_topic:
     title: "Preguntas frecuentes/directrices"
+    body: |
+      <a name="civilized"></a>
+
+      ## [Este é un espazo civilizado para a discusión pública](#civilized)
+
+      Por favor, trate este foro de discusión co mesmo respecto co que trataría un parque público. Tamén nós somos un recurso comunitario compartido&mdash; un lugar para compartir capacidades, coñecementos e intereses mediante unha conversa fluída.
+
+      Non estamos diante de regras férreas, só normas para axudar ao xuízo humano da nosa comunidade e manter este como un lugar limpo e ben iluminado para o discurso público civilizado.
+
+      <a name="improve"></a>
+
+      ##[Mellorar a discusión](#improve)
+
+      Axude a facer deste un gran espazo de debate, traballando sempre para mellorar a discusión nalgún aspecto, por pequeno que sexa. Se non está seguro de que a súa publicación sumará á conversa, pense no que quere dicir e ténteo novamente máis tarde.
+
+      Os temas que discutimos aquí son importantes para nós, e queremos que actúe como se tamén o fosen para vostede. Respecte os temas e as persoas que discuten sobre eles, mesmo se está en desacordo con algo do que se está a dicir.
+
+      Unha forma de mellorar a discusión é descubrir outras que xa están a acontecer. Dedique tempo a navegar polos temas antes de responder ou comezar o seu propio, e terá mais oportunidades de atopar outras persoas que compartan os seus intereses.
+
+      <a name="agreeable"></a>
+
+      ## [Sexa conciliador, mesmo cando estea en desacordo](#agreeable)
+
+      Pode querer responder a algo co que está en desacordo. Moi ben. Mais lembre que se trata de _criticar ideas, non persoas_. Por favor, evite:
+
+      * Alcumar
+      * Ataques ad hominem
+      * Responder ao ton dunha mensaxe en vez de ao seu contido real
+      * Reaccionar impulsivamente
+
+      En vez diso, achegue contraargumentos fundamentados que melloren a conversa.
+
+      <a name="participate"></a>
+
+      ## [A súa participación conta](#participate)
+
+      As conversas que aquí temos estabelecen o ton para os novos que chegan. Axude a marcar o futuro desta comunidade, escollendo participar en discusións que fan deste foro un lugar interesante para estar &mdash; e evitando aquelas que non o fan.
+
+      Discourse fornece ferramentas que lle permiten á comunidade identificar colectivamente as mellores (e as peores) contribucións: marcadores de favoritos, gústames, alertas, respostas, edicións e outras semellantes. Utilíceas para mellorar a súa propia experiencia, e a de todos os demais tamén.
+
+      Deixemos a nosa comunidade mellor do que a atopamos.
+
+      <a name="flag-problems"></a>
+
+      ## [Se ve un problema, sináleo](#flag-problems)
+
+      Os moderadores teñen unha autoridade especial; eles son responsábeis deste foro. Mais vostede tamén o é. Coa súa axuda, os moderadores poden ser facilitadores da comunidade, e non só porteiros ou policías.
+
+      Cando vexa un mal comportamento, non responda. Responder, alimenta o mal comportamento, pois recoñéceo, consume a súa enerxía, e estraga o tempo de todos. _Limítese a alertar del_. De se acumular alertas suficientes, tomaranse medidas, automaticamente ou por intervención de moderadores.
+
+      Co fin de manter a nosa comunidade, os moderadores resérvanse o dereito de retirar calquera contido e calquera conta de usuario, por calquera razón, en calquera momento. Os moderadores non visualizan previamente as mensaxes novas; os moderadores e operadores do sitio non asumen ningunha responsabilidade por ningún contido publicado pola comunidade.
+
+      <a name="be-civil"></a>
+
+      ## [Sexa sempre cívico](#be-civil)
+
+      Nada sabota unha conversa saudábel como a grosería:
+
+      * Sexa cívico. Non publique nada que unha persoa razoábel podería considerar ofensivo, abusivo, ou discurso de odio.
+      * Mantéñao limpo. Non publique nada obsceno ou sexualmente explícito.
+      * Respecte ao outro. Non acose nin berre a ninguén, non ridiculice persoas nin expoña información privada.
+      * Respecte o noso foro. Non publique lixo nin se permita vandalizar o foro de ningunha outra forma.
+
+      Estes non son termos concretos con definicións precisas &mdash; evite mesmo a _aparencia_ de calquera destas cousas. Se non está seguro, pregúntese como se sentiría se a súa publicación aparecese na primeira páxina do New York Times.
+
+      Este é un foro público, e os motores de busca indexan estas discusións. Manteña a linguaxe, as ligazóns e as imaxes aptas para todos os públicos.
+
+      <a name="keep-tidy"></a>
+
+      ## [Limpeza e orde no foro](#keep-tidy)
+
+      Faga o esforzo de colocar as cousas no lugar adecuado, para que poidamos pasar máis tempo a discutir e menos tempo a limpar. Por iso:
+
+      * Non inicie un tema na categoría equivocada.
+      * Non repita o mesmo en múltiplos temas.
+      * Non publique respostas sen contido.
+      * Non desvíe un tema cambiando o foco central a medio camiño.
+      * Non asine as súas publicacións &mdash; cada publicación ten xa a súa información de perfil anexada a ela.
+
+      En vez de publicar «+1 » ou «Concordo», use o botón de valoración. En vez de desviar un tema cara a unha dirección radicalmente diferente, utilice a opción Responder como Tema ligado.
+
+      <a name="stealing"></a>
+
+      ## [Publique só a súa produción](#stealing)
+
+      Non pode publicar nada dixital que pertenza a outra persoa sen autorización. Non pode publicar descricións, ligazóns ou métodos para roubar a propiedade intelectual de ninguén (software, vídeo, son, imaxes), nin para infrinxir ningunha outra lei.
+
+      <a name="power"></a>
+
+      ## [Impulsado por vostede](#power)
+
+      Este sitio é xestionado polo seu [amábel grupo local](%{base_path}/about) e por *vostede*, a comunidade. Se ten algunha pregunta sobre como deberían funcionar as cousas, abra un novo tema en [categoría comentario do sitio](%{base_path}/c/site-feedback) e discutámolo! De haber algún asunto moi importante ou urxente que non se poida tratar cun metatema ou alerta, contacte con nós a través da [páxina do equipo](%{base_path}/about).
+
+      <a name="tos"></a>
+
+      ## [Termos do servizo](#tos)
+
+      Desde logo, os legalismos son aborrecidos pero debemos protexernos a nós mesmos &ndash; e por extensión a vostede e os seus datos &ndash; contra xente hostil. Temos uns [Termos de servizo](%{base_path}/tos) que describen o seu (e o noso) comportamento e dereitos relativos ao contido, normas de privacidade e legalidade. Para utilizar este servizo, debe estar de acordo en cumprir cos nosos [TOS](%{base_path}/tos).
   tos_topic:
     title: "Termos do servizo"
+    body: |
+      Estes termos rexen a utilización do foro da Internet en <%{base_url}>. Para utilizar o foro, debe aceptar estes termos con %{company_name}, a empresa que dirixe o foro.
+
+      A empresa pode ofrecer outros produtos e servizos, con distintos termos. Estes termos aplícanse só á utilización do foro.
+
+      Saltar a:
+
+      - [Termos importantes](#heading--important-terms)
+      - [Permiso para utilizar o foro](#heading--permission)
+      - [Condicións de utilización do foro](#heading--conditions)
+      - [Utilización aceptábel](#heading--acceptable-use)
+      - [Normas de contido](#heading--content-standards)
+      - [Cumprimento da legalidade](#heading--enforcement)
+      - [A súa conta](#heading--your-account)
+      - [O seu contido](#heading--your-content)
+      - [A súa responsabilidade](#heading--responsibility)
+      - [Exencións de responsabilidade](#heading--disclaimers)
+      - [Límites de responsabilidade](#heading--liability)
+      - [Comentarios](#heading--feedback)
+      - [Finalización](#heading--termination)
+      - [Disputas](#heading--disputes)
+      - [Termos xerais](#heading--general)
+      - [Contacto](#heading--contact)
+      - [Cambios](#heading--changes)
+
+      <h2 id="heading--important-terms"><a href="#heading--important-terms">Termos importantes</a></h2>
+
+      ***Estes termos inclúen unha serie de disposicións importantes que afectan os seus dereitos e responsabilidades, tales como as exencións en [Exencións de responsabilidade]](#heading--disclaimers), límites da responsabilidade da empresa para con vostede en [Límites de responsabilidade](#heading--liability), o seu acordo para pagar á empresa por danos causados pola súa mala utilización do foro en [A súa responsibilidade](#heading--responsibility), e un acordo para arbitrar disputas en [Disputas](#heading--disputes).***
+
+
+      <h2 id="heading--permission"><a href="#heading--permission">Permiso para utilizar o foro</a></h2>
+
+      Suxeito a estes termos, a empresa dálle permiso para utilizar o foro. Todos precisan de aceptar estes termos para utilizar o foro.
+
+      <h2 id="heading--conditions"><a href="#heading--conditions">Condicións de utilización do foro</a></h2>
+
+      O seu permiso para utilizar o foro está suxeito ás seguintes condicións:
+
+      1. Debe ter polo menos trece anos de idade.
+
+      2. Non pode utilizar o foro se a empresa contacta directamente con vostede para lle dicir que non pode.
+
+      3. Debe utilizar o foro de acordo coa [Utilización aceptábel](#heading--acceptable-use) e as [Normas de contido](#heading--content-standards).
+
+      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Utilización aceptábel</a></h2>
+
+      1. Non se pode infrinxir a lei usando o foro.
+
+      2. Non pode utilizar ou tentar utilizar a conta doutro no foro sen a súa autorización explícita.
+
+      3. Non pode comprar, vender, ou comerciar doutra forma con nomes de usuario ou outros identificadores únicos no foro.
+
+      4. Non pode enviar anuncios, cadeas de mensaxes ou outras solicitudes a través do foro, nin utilizar o foro para recoller enderezos ou outros datos persoais para listas de correo comerciais ou bases de datos.
+
+      5. Non pode automatizar o acceso ao foro, ou monitorizar o foro, como por exemplo cun "rastrexador web", cun complemento do navegador, ou con outro programa de computador que non sexa un navegador web. Pode rastrexar o foro para indexalo nun motor de busca aberto ao público, se xestiona algún.
+
+      6. Non pode utilizar o foro para enviar correo electrónico a listas de distribución, grupos de novas, ou pseudónimos de correo en grupo.
+
+      7. Non pode dar a entender falsamente que é afiliado ou está apoiado pola empresa.
+
+      8. Non pode estabelecer hiperligazóns a imaxes ou outros contidos non hipertextuais do foro noutras páxinas web.
+
+      9. Non pode retirar ningunha marca que mostre a propiedade exclusiva de materiais que descargue do foro.
+
+      10. Non pode amosar calquera parte do foro noutros sitios web con `<iframe>`.
+
+      11. Non pode desactivar, evitar, ou esquivar calquera restrición de seguranza ou de acceso ao foro.
+
+      12. Non pode sobrecargar a infraestrutura do foro cun volume esaxerado de consultas, ou con consultas destinadas a ser unha carga desmesurada nos sistemas de información subxacentes ao foro.
+
+      13. Non pode facerse pasar por outros a través do foro.
+
+      14. Non pode animar ou axudar a ninguén a infrinxir estes termos.
+
+
+      <h2 id="heading--content-standards"><a href="#heading--content-standards">Normas de contido</a></h2>
+
+      1. Non pode enviar contidos ao foro que sexan ilegais, ofensivos, ou de calquera outra forma daniños para terceiros. Isto inclúe contido que sexa acosador, inapropiado ou abusivo.
+
+      2. Non pode enviar ao foro contido que viole a lei, infrinxa os dereitos de propiedade intelectual de ninguén, viole a privacidade de ninguén ou rompa os acordos que teña con outros.
+
+      3. Non pode enviar contido ao foro que conteña código informático malicioso, tal como virus informáticos ou software espía.
+
+      4. Non pode enviar contido ao foro como simple marcador de posición para manter un enderezo específico, nome de usuario ou outro identificador único.
+
+      5. Non pode utilizar o foro para divulgar informacións que non teña o dereito de divulgar, como informacións confidenciais ou persoais doutros.
+
+      <h2 id="heading--enforcement"><a href="#heading--enforcement">Cumprimento da legalidade</a></h2>
+
+      A empresa pode investigar e procesar xudicialmente as violacións destes termos en toda a extensión legal. A empresa pode notificar e cooperar coas autoridades responsábeis de aplicar a lei na persecución de violacións da lei e destes termos.
+
+      A empresa resérvase o dereito a cambiar, redactar e eliminar o contido no foro por calquera razón. Se cre que alguén enviou contido ao foro violando estes termos, [contacte con nós inmediatamente](#heading--contact).
+
+      <h2 id="heading--your-account"><a href="#heading--your-account">A súa conta</a></h2>
+
+      Debe crear e iniciar sesión nunha conta para utilizar algunhas funcionalidades do foro.
+
+      Para crear unha conta, debe fornecer algunhas informacións sobre vostede mesmo. Se crea unha conta, acepta fornecer, como mínimo, un enderezo de correo electrónico válido, e manter ese enderezo actualizado. Pode pechar a súa conta en calquera momento, enviando un correo a <%{contact_email}>.
+
+      Acepta ser responsábel de calquera acción que se produza utilizando a súa conta, autorizada ou non por vostede mesmo, ata que a peche ou lle notifique á empresa que a súa conta foi manipulada. Está de acordo con notificarlle inmediatamente á empresa a sospeita de que a súa conta foi comprometida. Acepta seleccionar un contrasinal seguro para a súa conta, e mantelo en segredo.
+
+      A empresa pode restrinxir, suspender ou pechar a súa conta no foro, conforme á súa política de tratamento de peticións de cesamentos relacionados con dereitos de autor ou se a empresa cre razoabelmente que rompeu algunha regra destes termos.
+
+      <h2 id="heading--your-content"><a href="#heading--your-content">O seu contido</a></h2>
+
+      Ningún destes termos lle dá á empresa ningún dereito de propiedade sobre a propiedade intelectual que comparta co foro, tal como información da súa conta, mensaxes, ou outros contidos que envíe ao foro. Nada nestes termos lle dá a vostede ningún dereito de propiedade sobre a propiedade intelectual da empresa, tampouco.
+
+      Entre vostede e a empresa, vostede é o único responsábel do contido que envíe ao foro. Está de acordo en non suxerir implicitamente que o contido que envía ao fórum está patrocinado ou aprobado pola empresa. Estes termos non obrigan á empresa a almacenar, manter ou fornecer copias do contido que vostede envía, e a cambialo, de acordo con estes termos.
+
+      O contido que envía ao foro perténcelle, e é o usuario quen decide cal o permiso que sobre el lles dá a terceiros. Mais, como mínimo, concede permiso á empresa para fornecer o contido que envía ao foro a outros usuarios do foro. Esa licenza especial permítelle á empresa copiar, publicar, e analizar o contido que envía ao foro.
+
+      Cando o contido que envía se retira do foro, sexa pola súa vontade ou pola da empresa, a licenza especial da empresa termina cando a última copia desaparece das copias de seguranza, cachés e outros sistemas de empresa. Outras licenzas que vostede aplique ao contido que envía, tales como as licenzas [Creative Commons](https://creativecommons.org), poden continuar vixentes logo de que retire o seu contido. Esas licenzas poden dar a outros, ou á propia empresa, o dereito de compartir novamente o seu contido no foro.
+
+      Outros que reciben o contido que envía ao foro poden violar os termos en que licenciou o seu contido. Acepta que a empresa non será responsábel ante vostede desas violacións ou das súas consecuencias.
+
+      <h2 id="heading--responsibility"><a href="#heading--responsibility">A súa responsabilidade</a></h2>
+
+      Acepta en indemnizar a empresa diante de reclamacións legais feitas por terceiros relacionadas coa súa violación destes termos, ou coa violación destes termos por terceiros que utilicen a súa conta no foro. Tanto vostede como a empresa acordan notificarlle á outra parte calquera reclamación legal pola cal poida ter que indemnizar a empresa o máis rapidamente posíbel. Se a empresa non lle notificase axiña unha reclamación legal, vostede non terá que indemnizar a empresa por danos dos que se podería defender ou minimizar co aviso inmediato. O cliente acepta permitir que a empresa teña o control da investigación, defensa e resolución de reclamacións legais polas cales vostede tería que indemnizar a empresa, e cooperar con eses esforzos. A empresa acepta non acordar ningunha resolución que admita a súa culpa ou impoña obrigas sen o seu acordo previo.
+
+
+      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Exencións de responsabilidade</a></h2>
+
+      ***Acepta todo o risco de utilizar o foro e o contido do foro. Tanto canto a lei o permita, a empresa e as súas auxiliares fornecen o foro tal como está, sen ningunha garantía.***
+
+      O foro pode hiperligar e integrar foros e servizos xestionados por outros. A empresa non ofrece ningunha garantía sobre os servizos xestionados por terceiros, ou contidos que estes poidan fornecer. A utilización de servizos xestionados por outros pode estar rexida por outros termos entre vostede e o servizo en funcionamento.
+
+      <h2 id="heading--liability"><a href="#heading--liability">Límites de responsabilidade</a></h2>
+
+      ***Nin a empresa nin as súas auxiliares serán responsábeis ante vostede por danos causados pola quebra de contrato que o seu persoal non puidese prever razoabelmente cando vostede aceptou estes termos.***
+
+      *** Na medida en que a lei o permita, a responsabilidade ante vostede por reclamacións de calquera tipo relacionadas co foro ou contido do foro estará limitada a $50.***
+
+      <h2 id="heading--feedback"><a href="#heading--feedback">Comentarios</a></h2>
+
+      A empresa agradece os seus comentarios e suxestións sobre o foro. Consulte a sección [Contacto](#heading--contact) seguinte para ver formas de poñerse en contacto connosco.
+
+      Está de acordo con que a empresa será libre de actuar con base nos seus comentarios e suxestións, e que a empresa non terá que notificarlle que os seus comentarios foron utilizados, obter o seu permiso para os utilizar, ou pagarlle. Acepta non enviar comentarios ou suxestións que crea que poidan ser confidenciais ou privados, da súa propiedade, ou da de outros.
+
+      <h2 id="heading--termination"><a href="#heading--termination">Terminación</a></h2>
+
+      Tanto vostede como a empresa poden pór fin ao acordo escrito nestes termos en calquera momento. Cando o noso acordo termine, o permiso para utilizar o foro tamén termina.
+
+      As disposicións seguintes sobreviven ao fin do noso acordo: [O seu contido](#heading--your-content), [Comentarios](#heading--feedback), [A súa responsabilidade](#heading--responsibility), [Exencións de responsabilidade](#heading--disclaimers), [Límites de responsabilidade](#heading--liability), e [Termos xerais](#heading--general).
+
+      <h2 id="heading--disputes"><a href="#heading--disputes">Disputas</a></h2>
+
+      %{governing_law} dirimirá calquera disputa relacionada con estes termos ou a súa utilización do foro.
+
+      Vostede e a empresa aceptan solicitar ordes xudiciais relacionadas con estes termos só nos xulgados de %{city_for_disputes}. Nin o cliente nin a empresa se oporán á xurisdición, foro ou venia neses tribunais.
+
+      ***Alén de solicitar unha orde xudicial ou para demandas ao abeiro da Lei de fraude e abuso informático, o cliente e a empresa resolverán calquera disputa a través de arbitraxe vinculante da Asociación Americana de Arbitraxe. A arbitraxe seguirá as Regras de arbitraxe comercial da AAA e os procedementos suplementarios para conflitos relacionados co consumidor. A arbitraxe desenvolverase en %{city_for_disputes}. Resolverá calquera disputa como individuo, e non como parte dunha acción colectiva ou outro procedemento representativo, quer como queixoso quer como membro da clase. Ningunha árbitraxe consolidará calquera disputa con ningunha outra arbitraxe sen a autorización da empresa.***
+
+      Calquera decisión arbitral incluirá os custos da arbitraxe, honorarios razoábeis dos avogados, e custos razoábeis para as testemuñas. Vostede e a empresa poden introducir as decisións arbitrais en calquera tribunal con xurisdición.
+
+      <h2 id="heading--general"><a href="#heading--general">Termos xerais</a></h2>
+
+      Se unha disposición destes termos for inaplicábel tal como está escrita, pero puidese ser cambiada para facela cumpríbel, esa disposición debe ser modificada na medida mínima necesaria para volvela aplicábel. En caso contrario, esa disposición deberá ser suprimida.
+
+      Non pode traspasar o seu acordo coa empresa. A empresa pode traspasar o seu acordo a calquera filial da empresa, a calquera outra empresa que obteña o control da empresa, ou a calquera outra empresa que compre bens da empresa relacionados co foro. Calquera tentativa de cesión contra estes termos non ten ningún efecto legal.
+
+      Nin o exercicio de calquera dereito ao abeiro do presente acordo, nin a renuncia a calquera ruptura do presente acordo, renuncia a calquera outra ruptura do presente acordo.
+
+      Estes termos incorporan todos os termos do acordo entre o cliente e a empresa sobre a utilización do foro. Estes termos substitúen enteiramente calquera dos outros acordos sobre a utilización por vostede do foro, escritos ou non.
+
+      <h2 id="heading--contact"><a href="#heading--contact">Contacto</a></h2>
+
+      Pode facer notificacións á empresa sobre estes termos, e enviar preguntas á empresa, en <%{contact_email}>.
+
+      A empresa pode facerlle notificacións sobre estes termos utilizando o enderezo de correo electrónico que forneceu para a súa conta no foro, ou publicando unha mensaxe na páxina inicial do foro ou na páxina da súa conta.
+
+      <h2 id="heading--changes"><a href="#heading--changes">Cambios</a>></h2>
+
+      A empresa actualizou por última vez estes termos o 12 de xullo de 2018, e pode actualizar estes termos outra vez. A empresa publicará todas as actualizacións no foro. Para actualizacións que conteñan alteracións substanciais, a empresa acepta enviarlle un correo, no caso de que crease unha conta e fornecese un enderezo de correo válido. A empresa pode tamén anunciar actualizacións con mensaxes especiais ou alertas no foro.
+
+      Unha vez que reciba unha actualización destes termos, deberá aceptar os novos termos para continuar a utilizar o foro.
   privacy_topic:
     title: "Política de privacidade"
+    body: |
+      <a name="collect"></a>
+
+      ## [Que información recollemos?](#collect)
+
+      Recollemos información súa cando se rexistra no noso sitio e compilamos datos cando participa no foro lendo, escribindo e avaliando o contido que se comparte aquí.
+
+      Cando se rexistre no noso sitio, pediráselle que introduza o seu nome e enderezo de correo electrónico. No entanto, pode visitar o sitio sen rexistrarse. O seu enderezo de correo electrónico comprobarase mediante un correo electrónico que contén unha ligazón de único uso. Se esa ligazón se visita, sabemos que vostede controla ese enderezo de correo electrónico.
+
+      Cando se rexistra e publica, rexistramos o enderezo IP desde o que se realizou o envío. Tamén podemos conservar os rexistros do servidor que inclúen o enderezo IP de cada solicitude ao noso servidor.
+
+      <a name="use"></a>
+
+      ##[Que facemos coa súa información?](#use)
+
+      Calquera información que compilemos de vostede pode ser utilizada dunha das seguintes maneiras:
+
+      * Para personalizar a súa experiencia &mdash; a súa información axúdanos a responder mellor ás súas necesidades individuais.
+      * Para mellorar o noso sitio web&mdash; esforzámonos a cotío por mellorar as propostas do noso sitio baseándonos na información e nos comentarios que recibimos de vostede.
+      * Para mellorar o servizo de atención ao cliente &mdash; a súa información axúdanos a responder máis eficazmente ás peticións de servizo ao cliente e ás súas necesidades de asistencia.
+      * Para enviar correos electrónicos periódicos &mdash; O enderezo de correo electrónico que nos proporcione pode utilizarse para enviarlle información, notificacións que solicite sobre cambios en temas ou en resposta ao seu nome de usuario, respostas a consultas e/ou outras peticións e cuestións.
+
+      <a name="protect"></a>
+
+      ## [Como protexemos esta información súa?](#protect)
+
+      Implementamos una variedade de medidas de seguranza para asegurar a súa información persoal cando entra, envía ou accede á súa información persoal.
+
+      <a name="data-retention"></a>
+
+      ## [Cal é súa política de retención de datos?](#data-retention)
+
+      Faremos en boa fe, esforzos para..:
+
+      * Conservar os rexistros do servidor que conteñan o enderezo IP de todas as solicitudes a este servidor non máis de 90 días.
+      * Conservar os enderezos IP asociados aos usuarios rexistrados e ás súas mensaxes non máis de 5 anos.
+
+      <a name="cookies"></a>
+
+      ## [Usamos rastros?](#cookies)
+
+      Si. As rastros son pequenos ficheiros que un sitio ou o seu fornecedor de servizos transfire ao disco duro do seu computador a través do seu navegador web (se o permite). Estas rastros permiten que o sitio recoñeza o seu navegador e, se ten unha conta rexistrada, a asocie coa súa conta rexistrada.
+
+      Utilizamos rastros para comprender e gardar as súas preferencias para futuras visitas e compilar datos agregados sobre o tráfico do sitio e a interacción nel, de modo que poidamos ofrecer mellores experiencias e ferramentas no futuro. Podemos contratar fornecedores de servizos de terceiros para que nos axuden a comprender mellor os visitantes do noso sitio. Estes fornecedores de servizos non están autorizados a utilizar a información compilada no noso nome, agás que sexa para axudarnos a levar a cabo e mellorar o noso obxectivo.
+
+      <a name="disclose"></a>
+
+      ## [Revelamos algunha información a terceiros?](#disclose)
+
+      Non vendemos, comerciamos nin transferimos a terceiros a súa información persoal identificábel. Isto non inclúe os terceiros de confianza que nos axudan a operar o noso sitio, a levar a cabo o noso obxectivo ou a prestarlle servizos, sempre e cando esas partes acorden manter esta información confidencial. Tamén podemos revelar a súa información cando creamos que é apropiado para cumprir coa lei, facer cumprir as políticas do noso sito ou protexer os nosos dereitos e os doutros, propiedade ou seguranza. No entanto, a información que non sexa de identificación persoal dos visitantes pode ser fornecida a outras partes para mercadotecnia, publicidade ou outros usos.
+
+      <a name="third-party"></a>
+
+      ## [Ligazóns de terceiros](#third-party)
+
+      Ocasionalmente, ao noso criterio, podemos incluír ou ofrecer produtos ou servizos de terceiros no noso sitio. Estes sitios de terceiros teñen políticas de privacidade separadas e independentes. Polo tanto, non temos ningunha responsabilidade sobre o contido e as actividades destes sitios ligados. Aínda así, buscamos protexer a integridade do noso sitio e agradecemos calquera comentario sobre estes sitios.
+
+      <a name="coppa"></a>
+
+      ## [Cumprimento da Lei de protección da privacidade dos menores na Internet](#coppa)
+
+      O noso sitio, produtos e servizos están dirixidos a persoas que teñen polo menos 13 anos de idade ou máis. Se este servidor está nos EE.UU., e vostede é menor de 13 anos, segundo os requisitos de COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), non utilice este sitio.
+
+      <a name="online"></a>
+
+      ## [Política de privacidade en liña soamente](#online)
+
+      Esta política de privacidade en liña aplícase só á información recollida a través do noso sitio e non á información recollida sen conexión en liña.
+
+      <a name="consent"></a>
+
+      ## [O seu consentimento](#consent)
+
+      Ao utilizar o sitio, acepta a política de privacidade do noso sitio web.
+
+      <a name="changes"></a>
+
+      ## [Cambios na nosa política de privacidade](#changes)
+
+      De decidirmos cambios na nosa política de privacidade, publicarémolos nesta páxina.
+
+      Este documento ten licenza CC-BY-SA. A súa última actualización é de do 31 de maio de 2013.
   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.
+        invalid_csv: Atopamos un erro na liña %{line_number}. Confirme que o CSV ten un único correo electrónico por liña.
+        badge_disabled: Active a insignia %{badge_name} primeiro.
     editor:
       name: Editor
       description: Edición da publicación inicial
       long_description: |
-        Esta insignia concédese a primeira vez que editas unha das túas publicacións. Aínda que non sempre o poderás facer, editar é unha boa idea; permíteche melloralas, amañar pequenos erros ou engadir algo que che esquecera na publicación orixinal. Edita para mellorar as túas publicacións!
+        Esta insignia concédese a primeira vez que edita unha das súas publicacións. Aínda que non sempre o poderá facer, editar é unha boa idea; permítelle melloralas, amañar pequenos erros ou engadir algo que lle esquecera na publicación orixinal. Edite para mellorar as súas publicacións!
     wiki_editor:
       name: Editor wiki
       description: Primeira edición wiki
       long_description: |
-        Esta insignia concédese a primeira vez que editas unha publicación wiki
+        Esta insignia concédese a primeira vez que edita unha publicación wiki.
     basic_user:
       name: Básico
       description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Acceso</a> a todas as funcións esenciais da comunidade
       long_description: |
-        Esta insignia concédese cando alcanzas o nivel de confianza 1. Grazas por permaneceres e leres uns cantos temas e así coñecer mellor esta comunidade. Elimináronse as restricións dos novos usuarios; terás acceso ás funcionalidades básicas da comunidade, caso da mensaxaría privada a outras persoas, edición wiki e a opción de publicar múltiples imaxes e ligazóns.
+        Esta insignia concédese cando alcanza o nivel de confianza 1. Grazas por permanecer e ler uns cantos temas e así coñecer mellor esta comunidade. Elimináronse as restricións do novo usuario; terá acceso ás funcionalidades básicas da comunidade, caso da mensaxaría privada a outras persoas, edición wiki e a opción de publicar múltiples imaxes e ligazóns.
     member:
       name: Membro
-      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Acceso</a> a convites, mensaxaría de grupo, máis gústames
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Acceso</a> a convites, mensaxaría de grupo, máis gústame
       long_description: |
-        Esta insignia concédese cando alcanzas o nivel de confianza 2. Grazas por participares durante estas semanas e unirte de veras a esta comunidade. Agora podes enviar invitacións desde a túa páxina de usuario ou desde os propios temas, crear mensaxes persoais para grupos e ter máis gústames diarios.
+        Esta insignia concédese cando alcanza o nivel de confianza 2. Grazas por participar durante estas semanas e unirse de verdade a esta comunidade. Agora pode enviar invitacións desde a súa páxina de usuario ou desde os propios temas, crear mensaxes persoais para grupos e ter máis gústame diarios.
     regular:
       name: Normal
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Concedido</a> recategorizar, renomear, seguimento de ligazóns, wiki, máis gústame
       long_description: |
-        Esta insignia concédese cando alcanzas o nivel de confianza 3. Grazas por seres parte habitual da nosa comunidade ao longo destes meses. Ti es agora un dos lectores máis activos e fonte de confianza que fai mellor a comunidade. Agora podes recategorizar e renomear temas, as túas denuncias teñen máis peso, podes acceder á área privada da sala VIP, alén de poder dar moitos máis gústames por día.
+        Esta insignia concédese cando alcanza o nivel de confianza 3. Grazas por ser parte habitual da nosa comunidade ao longo destes meses. Vostede é agora un dos lectores máis activos e un colaborador fiable que mellora a comunidade. Agora pode recategorizar e renomear temas, as súas denuncias teñen máis peso, pode acceder á área privada da sala VIP, alén de poder dar moitos máis gústame por día.
     leader:
       name: Líder
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Concedida</a> a edición global, fixar, pechar, arquivar, dividir e combinar, máis gústame
       long_description: |
-        Esta insignia concédese cando alcanzas o nivel de confianza 4. Es un líder da comunidade, así elixido/a polos administradores e cos teus xestos e palabras serves de exemplo positivo para o resto de membros. Tes a posibilidade de editar todas as publicacións e realizar accións propias dun moderador caso de salientar temas, pechalos, arquivalos, facelos invisibles, dividilos ou fusionalos.
+        Esta insignia concédese cando alcanza o nivel de confianza 4. É un líder da comunidade, así elixido/a polos administradores e cos seus xestos e palabras serve de exemplo positivo para o resto de membros. Ten a posibilidade de editar todas as publicacións e realizar accións propias dun moderador, como salientar temas, pechalos, arquivalos, facelos invisíbei, dividilos ou fusionalos.
     welcome:
-      name: Benvido/a
+      name: Dámoslle a benvida
       description: Recibiu un gústame
       long_description: |
-        Esta insignia concédese cando recibes o teu primeiro gústame nunha publicación. Parabéns! Publicaches algo que os demais membros da comunidade consideraron útil, interesante ou entretido!
+        Esta insignia concédese cando recibe o seu primeiro gústame nunha publicación. Parabéns! Publicou algo que os demais membros da comunidade consideraron útil, interesante ou entretido!
     autobiographer:
       name: Autobiógrafo
       description: Completou a información do <a href="%{base_uri}/my/preferences/profile">perfil</a>
       long_description: |
-        Esta insignia concédese por encheres <a href="%{base_uri}/my/preferences/profile">o teu perfil de usuario</a> e seleccionares unha imaxe. Ao contares máis sobre ti e os teus intereses, contribúes a mellorar a comunidade e facela máis próxima. Anímate!
+        Esta insignia concédese por encher <a href="%{base_uri}/my/preferences/profile">o seu perfil de usuario</a> e seleccionar unha imaxe. Ao contar máis sobre vostede e os seus intereses, contribúe a mellorar a comunidade e facela máis próxima. Anímese!
     anniversary:
       name: Aniversario
-      description: Membro activo durante un ano, publicou cando menos unha vez
+      description: Membro activo durante un ano, publicou polo menos unha vez
       long_description: |
-        Esta insignia concédese cando cumpres un ano como membro da comunidade e ao menos fixeches unha publicación. Grazas por permaneceres aí e contribuíres á nosa comunidade. Isto non sería o mesmo sen ti!
+        Esta insignia concédese cando cumpre un ano como membro da comunidade se fixo polo menos unha publicación. Grazas por estar aí e contribuír á nosa comunidade. Isto non sería o mesmo sen vostede.
     nice_post:
       name: Boa resposta
-      description: Recibiu 10 gústames
+      description: Recibiu 10 gústame
       long_description: |
-        Esta insignia concédese cando unha das túas respostas obtén 10 gústames. A túa resposta foi do gusto da comunidade e axudaron a manter viva a conversa.
+        Esta insignia concédese cando unha das súas respostas obtén 10 gústame. A súa resposta foi do gusto da comunidade e axudou a manter viva a conversa.
     good_post:
       name: Moi boa resposta
-      description: Recibiu 25 gústames
+      description: Recibiu 25 gústame
       long_description: |
-        Esta insignia concédese cando unha das túas respostas obtén 25 gústames. A túa resposta foi excepcional e fixo moito máis interesante a conversa.
+        Esta insignia concédese cando unha das súas respostas obtén 25 gústame. A súa resposta foi excepcional e fixo moito máis interesante a conversa.
     great_post:
       name: Excelente resposta
-      description: Recibiu 50 gústames
+      description: Recibiu 50 gústame
       long_description: |
-        Esta insignia concédese cando unha das túas respostas obtén 50 gústames. Bravo! A túa resposta resultou inspiradora, graciosa ou estivo moi pensado. O caso é que lle encantou á comunidade.
+        Esta insignia concédese cando unha das súas respostas acada 50 gústame. Bravo! A súa resposta resultou inspiradora, graciosa ou moi precisa. O conto é que á comunidade encantoulle!
     nice_topic:
-      name: Tema riquiño
-      description: Recibiu 10 gústames
+      name: Bo tema
+      description: Recibiu 10 gústame
       long_description: |
-        Esta insignia concédese cando un tema teu obtén 10 gústames. Iniciaches unha conversa interesante que gustou á comunidade.
+        Esta insignia concédese cando un tema seu obtén 10 gústame. Comezou unha conversa interesante que lle gustou á comunidade.
     good_topic:
-      name: Tema bo
-      description: Recibiu 25 gústames
+      name: Moi bo tema
+      description: Recibiu 25 gústame
       long_description: |
-        Esta insignia concédese cando un tema teu obtén 25 gústames. Iniciaches unha conversa que a comunidade desfrutou.
+        Esta insignia concédese cando un tema seu obtén 25 gústame. Iniciou unha conversa que coa que a comunidade gozou.
     great_topic:
       name: Gran tema
-      description: Recibiu 50 gústames
+      description: Recibiu 50 gústame
       long_description: |
-        Esta insignia concédese cando un tema teu obtén 50 gústames. Comezaches un tema fascinante e á comunidade encantoulle a conversa que provocou!
+        Esta insignia concédese cando un tema seu obtén 50 gústame. Comezou un tema fascinante e á comunidade encantoulle a conversa que provocou!
     nice_share:
-      name: Compartición riquiña
-      description: Compartiu unha publicación con 25 visistantes únicos
+      name: Boa compartición
+      description: Compartiu unha publicación con 25 visitantes únicos
       long_description: |
-        Esta insignia concédese por compartir unha ligazón que foi visitada 25 veces por visitantes externos. Grazas por difundires as nosas discusións e a comunidade en xeral.
+        Esta insignia concédese por compartir unha ligazón en que premeron 25 veces visitantes externos. Grazas por difundir as nosas discusións e a comunidade en xeral.
     good_share:
-      name: Compartición boa
-      description: Compartiu unha publicación con 300 visistantes únicos
+      name: Moi boa compartición
+      description: Compartiu unha publicación con 300 visitantes únicos
       long_description: |
-        Esta insignia concédese por compartir unha ligazón que foi visitada 300 veces por visitantes externos. Bo traballo! Mostráchelles unha conversa excelente a moitas persoas novas e axudaches á comunidade a medrar.
+        Esta insignia concédese por compartir unha ligazón que foi visitada 300 veces por visitantes externos. Bo traballo! Mostroulle unha conversa excelente a moitas persoas novas e axudou á comunidade a medrar.
     great_share:
       name: Gran compartición
-      description: Compartiu unha publicación con 1000 visistantes únicos
+      description: Compartiu unha publicación con 1000 visitantes únicos
       long_description: |
-        Esta insignia concédese por compartir unha ligazón que foi visitada 1000 veces por visitantes externos. Brutal! Promoviches unha conversa moi interesante a unha  grande audiencia e contribuíches enormemente a que a comunidade medrase.
+        Esta insignia concédese por compartir unha ligazón en que premeron 1000 veces por visitantes externos. Bravo! Difundiu unha conversa moi interesante entre unha grande audiencia e contribuíu enormemente a que a comunidade medrase!
     first_like:
       name: Primeiro gústame
-      description: Gustou unha publicación
+      description: Premeu gústame nunha publicación
       long_description: |
-        Esta insignia concédese a primeira vez que che gusta unha publicación e usas o botón :heart:. Darlles Gústame ás publicacións é un bo xeito de lles dicir aos membros da comunidade que publicaron algo interesante, útil, entretido ou divertido. Comparte o amor!
+        Esta insignia concédese a primeira vez que preme en gústame nunha publicación e usa o botón :heart:. Premer en gústame é un bo xeito de lles dicir aos membros da comunidade que publicaron algo interesante, útil, entretido ou divertido. Comparta o amor!
     first_flag:
       name: Primeira denuncia
       description: Denunciou unha publicación
       long_description: |
-        Esta insignia concédese a primeira vez que denuncias unha publicación. Denunciar é como axudamos a facer da comunidade un lugar agradable para tod@s. Se advirtes que por calquera razón unha publicación require a atención do moderador, non dubides en denunciala. Se ves un problema... :flag_black: denúnciao!
+        Esta insignia concédese a primeira vez que denuncia unha publicación. Denunciar é a forma de axudar a facer da comunidade un lugar agradable para tod@s. Se advirte que por calquera razón unha publicación require a atención do moderador, non dubide en denunciala. Se ve un problema... :flag_black: denúncieo!
     promoter:
       name: Promotor
       description: Convidou un usuario
       long_description: |
-        Esta insignia concédese cando convidas a alguén a se unir á comunidade mediante o botón de invitacións na túa páxina de perfil ou ao final dun tema. Convidar amizades que poden estar interesadas en debates específicos é un bo xeito de introducir novas persoas na comunidade. Grazas!
+        Esta insignia concédese cando convida a alguén a se unir á comunidade mediante o botón de invitacións na súa páxina de perfil ou ao final dun tema. Convidar amizades que poden estar interesadas en debates específicos é un bo xeito de introducir novas persoas na comunidade. Grazas!
     campaigner:
       name: Padriño
       description: Convidou a 3 usuarios básicos
       long_description: |
-        Esta insignia concédese cando convidas a tres persoas que levan tempo neste sitio e convertéronse en usuarios básicos. Unha comunidade viva precisa dun fluxo constante de voces que se sumen ás conversas.
+        Esta insignia concédese cando convida a tres persoas que neste sitio tempo abondo como para converterse en usuarios básicos. Unha comunidade viva precisa dun fluxo constante de voces que se sumen ás conversas.
     champion:
       name: Campión
+      description: Convidou a 5 membros
       long_description: |
-        Esta insignia concédese cando convidas a cinco persoas que levan neste sitio o tempo suficiente como para se converteren membros de pleno dereito. Fantástico! Grazas por aumentar a diversidade da comunidade con novos membros!
+        Esta insignia concédese cando convida a cinco persoas que levan neste sitio o tempo suficiente como para se converteren membros de pleno dereito. Fantástico! Grazas por aumentar a diversidade da comunidade con novos membros!
     first_share:
       name: Primeira compartición
       description: Compartiu unha publicación
       long_description: |
-        Esta insignia concédese a primeira vez que compartes unha ligazón nunha resposta ou nun tema utilizando o botón de Compartir. Compartir ligazóns é un bo xeito de mostrar interese polas discusións co resto da comunidade e contribuír a facela medrar.
+        Esta insignia concédese a primeira vez que comparte unha ligazón nunha resposta ou nun tema utilizando o botón de Compartir. Compartir ligazóns é un bo xeito de mostrar interese polas discusións co resto da comunidade e contribuír a facela medrar.
     first_link:
       name: Primeira ligazón
       description: Engadiu unha ligazón a outro tema
       long_description: |
-        Esta insignia concédese a primeira vez que engades unha ligazón a outro tema. Ligar con outros temas axuda ao resto de usuarios a atopar discusións do seu interese e amosa as conexións nos dous sentidos entre distintos temas. Achega ligazóns!
+        Esta insignia concédese a primeira vez que engade unha ligazón a outro tema. Ligar con outros temas axuda ao resto de usuarios a atopar discusións do seu interese e amosa as conexións nos dous sentidos entre distintos temas. Achegue ligazóns!
     first_quote:
       name: Primeira cita
       description: Citou unha publicación
-      long_description: "Esta insignia concédese a primeira vez que citas unha publicación nunha resposta túa. Citar partes relevantes de publicacións anteriores nas túas respostas axuda a manter conectada a conversa e non saírse do tema. O xeito máis fácil para citar é resaltando un treito concreto e despois premer no botón de Responder. Cita sen medo! \n"
+      long_description: |
+        Esta insignia concédese a primeira vez que cita unha publicación nunha resposta súa. Citar partes relevantes de publicacións anteriores nas súas respostas axuda a manter conectada a conversa e a non saír do tema. O xeito máis fácil de citar é resaltar un fragmento concreto e despois premer no botón de Responder. Cite sen medo!
     read_guidelines:
       name: Ler as directrices
       description: Ler as <a href="%{base_uri}/guidelines">directrices da comunidade</a>
       long_description: |
-        Esta insignia concédese por <a href="%{base_uri}/guidelines">ler as directrices da comunidade</a>. Con seguires e compartires estas simples pautas contribúes a facer unha comunidade segura, agradable e sustentable para tod@s. Lembra sempre que detrás dun usuario hai unha persoa coma ti. Sé agradable!
+        Esta insignia concédese por <a href="%{base_uri}/guidelines">ler as directrices da comunidade</a>. Con seguir e compartir estas simples pautas contribúe a facer unha comunidade segura, agradable e sustentable para tod@s. Lembre sempre que detrás dun usuario hai unha persoa coma vostede. Sexa agradábel!
     reader:
       name: Lector
       description: Leu todas as respostas nun tema con máis de 100 respostas
       long_description: |
-        Esta insignia concédese a primeira vez que les un tema longo que ten máis de 100 respostas. Ler unha conversa con atención axuda a seguir a discusión, entender os diferentes puntos de vista e suscitar argumentos máis interesantes. Canto máis les, mellor é a conversa. Como nos gusta dicir: Ler é fundamental! slight_smile:
+        Esta insignia concédese a primeira vez que le un tema longo que ten máis de 100 respostas. Ler unha conversa con atención axuda a seguir a discusión, entender os diferentes puntos de vista e suscitar argumentos máis interesantes. Canto máis le, mellor é a conversa. Como nos gusta dicir: Ler é fundamental! slight_smile:
     popular_link:
       name: Ligazón popular
       description: Publicou unha ligazón externa con 50 clics
       long_description: |
-        Esta insignia concédese cando a ligazón que compartiches alcanza os 50 clics. Grazas por publicares unha ligazón de utilidade que proporciona un contexto interesante á conversa!
+        Esta insignia concédese cando a ligazón que compartiu alcanza os 50 clics. Grazas por publicar unha ligazón de utilidade que proporciona un contexto interesante á conversa!
     hot_link:
-      name: Ligazón quente
+      name: Ligazón moi popular
       description: Publicou unha ligazón externa con 300 clics
       long_description: |
-        Esta insignia concédese cando a ligazón que compartiches alcanza os 300 clics. Grazas por publicares unha ligazón fascinante que fixo avanzar a conversa e mellorou a discusión!
+        Esta insignia concédese cando a ligazón que compartiu alcanza os 300 clics. Grazas por publicar unha ligazón fascinante que fixo avanzar a conversa e mellorou a discusión!
     famous_link:
-      name: Ligazón popular
+      name: Ligazón famosa
       description: Publicou unha ligazón externa con 1000 clics
       long_description: |
-        Esta insignia concédese cando a ligazón que compartiches alcanza os 1000 clics. Brutal! Publicaches unha ligazón que mellorou significativamente a conversa ao engadir detalles esenciais, máis contexto e información. Bo traballo!
+        Esta insignia concédese cando a ligazón que compartiu alcanza os 1000 clics. Brutal! Publicou unha ligazón que mellorou significativamente a conversa ao engadir detalles esenciais, máis contexto e información. Bo traballo!
     appreciated:
+      name: Apreciado
       description: Recibiu 1 gústame en 20 publicacións
       long_description: |
-        Esta insignia concédese cando recibes ao menos un gústame en 20 publicacións diferentes. A comunidade está a desfrutar das túas achegas ás conversas!
+        Esta insignia concédese cando recibe polo menos un gústame en 20 publicacións diferentes. A comunidade está a gozar das súas achegas ás conversas!
     respected:
-      description: Recibiu 2 gústames en 100 publicacións
+      name: Respectado
+      description: Recibiu 2 gústame en 100 publicacións
       long_description: |
-        Esta insignia concédese cando recibes ao menos 2 gústames en 100 publicacións diferentes. A comunidade está a apreciar as túas numerosas achegas ás conversas!
+        Esta insignia concédese cando recibe polo menos 2 gústame en 100 publicacións diferentes. A comunidade está a apreciar as súas numerosas achegas ás conversas.
     admired:
-      description: Recibiu 5 gústames en 300 publicacións
+      name: Admirado
+      description: Recibiu 5 gústame en 300 publicacións
       long_description: |
-        Esta insignia concédese cando recibes ao menos 5 gústames en 300 publicacións diferentes. A comunidade admira as túas achegas ás conversas pola súa frecuencia e tamén pola súa calidade!
+        Esta insignia concédese cando recibe polo menos 5 gústame en 300 publicacións diferentes. A comunidade admira as súas achegas ás conversas pola súa frecuencia e tamén pola súa calidade.
     out_of_love:
-      description: Utilizou %{max_likes_per_day} gústames nun día
+      name: Con amor
+      description: Utilizou %{max_likes_per_day} gústame nun día
       long_description: |
-        Esta insignia concédese canto utilizas todos os teus %{max_likes_per_day} gústames diarios. Lembra que dedicarlle tempo a valorar as publicacións que son do teu gusto anima os membros da comunidade a crear debates aínda mellores no futuro.
+        Esta insignia concédese canto utiliza todos os teus %{max_likes_per_day} gústame diarios. Lembre que dedicarlle tempo a valorar as publicacións que son do seu gusto anima os membros da comunidade a crear debates aínda mellores no futuro.
     higher_love:
-      description: Utilizou %{max_likes_per_day} gústames nun día 5 veces
+      name: Con moito amor
+      description: Utilizou 5 veces %{max_likes_per_day} gústame nun día
       long_description: |
-        Esta insignia concédese canto utilizas todos os teus %{max_likes_per_day} gústames diarios durante 5 días. Grazas por lle dedicares tempo a incentivar e premiar as mellores conversas cada día.
+        Esta insignia concédese cando utiliza todos os seus %{max_likes_per_day} gústame diarios durante 5 días. Grazas por lle dedicar tempo a estimular e premiar as mellores conversas cada día!
     crazy_in_love:
-      description: Utilizou %{max_likes_per_day} gústames nun día 20 veces
+      name: Tolo de amor
+      description: Utilizou 20 veces %{max_likes_per_day} gústame nun día
       long_description: |
-        Esta insignia concédese canto utilizas todos os teus %{max_likes_per_day} gústames diarios durante 20 días. Fantástico! Es un modelo para toda a comunidade por animares os demais membros da comunidade.
+        Esta insignia concédese canto utiliza todos os seus %{max_likes_per_day} gústame diarios durante 20 días. Fantástico! É vostede un exemplo por animar aos demais membros da comunidade!
     thank_you:
-      description: Recibiu 20 gústames en publicacións e deu 10
+      name: Agradecido
+      description: Recibiu 20 gústame en publicacións e deu 10
       long_description: |
-        Esta insignia concédese cando recibiches 20 gústames nas túas publicacións e deches 10 ou máis de volta. Cando a alguén lle gusta o que publicas, procura atopar tempo tamén para agradecer as publicacións dos demais.
+        Esta insignia concédese despois de recibir 20 gústame nas súas publicacións e dar 10 ou máis de volta. Cando a alguén lle gusta o que publica, procura atopar tempo tamén para agradecer as publicacións dos demais.
     gives_back:
-      description: Recibiu 100 gústames en publicacións e deu 100
+      name: Recíproco
+      description: Recibiu 100 gústame en publicacións e deu 100
       long_description: |
-        Esta insignia concédese cando recibiches 100 gústames nas túas publicacións e deches 100 ou máis de volta. Grazas por dares tanto e agradecelo de volta!
+        Esta insignia concédese despois de recibir 100 gústame nas súas publicacións e dar 100 ou máis de volta. Grazas por devolver o favor!
     empathetic:
-      description: Recibiu 500 gústames en publicacións e deu 1000
+      name: Empático
+      description: Recibiu 500 gústame en publicacións e deu 1000
       long_description: |
-        Esta insignia concédese cando recibiches 500 gústames nas túas publicacións e deches 1000 ou máis de volta. Xenial! Serves de modelo de xenerosidade e apreciación mutua :two_hearts:.
+        Esta insignia concédese despois de recibir 500 gústame nas súas publicacións e dar 1000 ou máis de volta. Xenial! É un exemplo de xenerosidade e aprezo mutuo :two_hearts:.
     first_emoji:
       name: Primeiro emoji
       description: Utilizou un emoji nunha publicación
       long_description: |
-        Esta insignia concédese a primeira vez que engades un emoji á túa publicación :thumbsup:. Os emojis permítenche engadir emocións ás túas mensaxes desde felicidade :smiley: ata tristeza :anguished: pasando por enfado :angry: ou calquera outra expresión :sunglasses:. Comeza escribindo dous puntos ou preme no botón dos emojis na barra do editor para seleccionar entre centos de opcións :ok_hand:
+        Esta insignia concédese a primeira vez que engade un emoji á súa publicación :thumbsup:. Os emojis permítenlle engadir emocións ás súas mensaxes, desde felicidade :smiley: ata tristeza :anguished: pasando por enfado :angry: ou calquera outra expresión :sunglasses:. Simplemente escriba dous puntos (:) ou prema no botón dos emojis na barra do editor para seleccionar entre centos de opcións :ok_hand:
     first_mention:
       name: Primeira mención
       description: Mencionou a un usuario nunha publicación
       long_description: |
-        Esta insignia concédese a primeira vez que mencionas a un @usuario nunha publicación túa. Cada mención xera unha notificación á persoa en cuestión para que saiban que a estás a mencionar. Simplemente comeza escribindo con @ para mencionar a alguén ou, se está permitido, a un grupo; é unha forma conveniente para chamar a atención.
+        Esta insignia concédese a primeira vez que menciona a un @usuario nunha publicación súa. Cada mención xera unha notificación á persoa en cuestión para que saiba que a está a mencionar. Simplemente comece escribindo con @ para mencionar a alguén ou, se está permitido, a un grupo; é unha forma apropiada para reclamar a atención.
     first_onebox:
+      name: Primeiro Onebox
+      description: Publicou unha ligazón que estaba en formato onebox
       long_description: |
-        Esta insignia concédese a primeira vez que publicas unha ligazón nunha liña que automaticamente se expande nunha caixa (onebox) cun título, resumo e, cando está dispoñible, unha imaxe.
+        Esta insignia concédese a primeira vez que publica unha ligazón nunha liña que automaticamente se expande nunha caixa (onebox) cun título, resumo e, cando está dispoñible, unha imaxe.
     first_reply_by_email:
       name: Primeira resposta vía correo electrónico
       description: Respondeu a unha publicación vía correo electrónico
       long_description: |
-        Esta insignia concédese a primeira vez que respondes a unha publicación vía correo electrónico :e-mail:.
+        Esta insignia concédese a primeira vez que responde a unha publicación vía correo electrónico :e-mail:.
     new_user_of_the_month:
+      name: "Novo usuario do mes"
+      description: Contribucións destacadas no seu primeiro mes
       long_description: |
-        Esta insignia concédese para felicitar a dous novos usuarios polas súas excelentes colaboracións en función da frecuencia con que reciben gústames e de quen proveñen.
+        Esta insignia concédese para felicitar a dous novos usuarios polas súas excelentes colaboracións en función da frecuencia con que reciben gústame e de quen proveñen.
     enthusiast:
-      name: Entusiasta
+      name: Seguidor
+      description: Visitounos 10 días seguidos
       long_description: |
-        Esta insignia concédese por nos visitares durante 10 días consecutivos. Grazas ficar connosco máis dunha semana!
+        Esta insignia concédese por nos visitar durante 10 días seguidos. Grazas por ficar connosco máis dunha semana!
     aficionado:
+      name: Seareiro
+      description: Visitounos 100 días seguidos
       long_description: |
-        Esta insignia concédese por nos visitares durante 100 días consecutivos. Máis de tres meses!
+        Esta insignia concédese por nos visitar durante 100 días seguidos. Máis de tres meses!
     devotee:
+      name: Devoto
+      description: Visitounos 365 días seguidos
       long_description: |
-        Esta insignia concédese por nos visitares durante 365 días consecutivos. Un ano enteiriño!
+        Esta insignia concédese por nos visitar durante 365 días consecutivos. Un ano enteiriño!
     badge_title_metadata: "%{display_name} insignia en %{site_title}"
   admin_login:
     success: "Correo electrónico enviado"
     errors:
-      unknown_email_address: "Enderezo de correo electrónico descoñecido"
-      invalid_token: "Código non válido."
+      unknown_email_address: "Enderezo de correo electrónico descoñecido."
+      invalid_token: "Token non válido."
+    email_input: "Correo electrónico do administrador"
     submit_button: "Enviar correo electrónico"
   performance_report:
-    initial_post_raw: Este tema inclúe informes diarios sobre o rendemento do teu sitio.
+    initial_post_raw: Este tema inclúe informes diarios sobre o rendemento do seu sitio.
     initial_topic_title: Informes sobre o rendemento do sitio web
   tags:
     title: "Etiquetas"
+    restricted_tag_disallowed: 'Non pode aplicar a etiqueta «%{tag}».'
+    restricted_tag_remove_disallowed: 'Non pode retirar a etiqueta «%{tag}».'
     minimum_required_tags:
-      one: "Debes seleccionar ao menos %{count} etiqueta."
-      other: "Debes seleccionar ao menos %{count} etiquetas."
+      one: "Debe seleccionar polo menos %{count} etiqueta."
+      other: "Debe seleccionar polo 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"
+        one: "A etiqueta que seleccionou non pode ser utilizada"
+        other: "Ningunha das etiquetas que seleccionou 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}"'
+        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.'
+      synonym: 'Non están permitidos os sinónimos. Utilice "%{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!"
+    congratulations: "Parabéns! Instalou Discourse!"
     register:
       button: "Rexistrarse"
       title: "Rexistrar conta de administrador"
       help: "rexistrar unha nova conta para comezar"
+      no_emails: "Por desgraza, non se determinaron enderezos de correo de administrador durante a definición inicial, polo que pode ser difícil finalizar a configuración. Engada, por favor, un correo de desenvolvedor no ficheiro de configuración ou <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>mire de crear unha conta de administrador desde a consola</a>."
     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>"
+      title: "Confirme o seu correo electrónico"
+      message: "<p>Enviámoslle un correo de activación a <b>%{email}</b>. Siga as instrucións para activar a súa conta.</p><p>Se non lle chega, comprobe o cartafol de correo lixo e <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>asegúrese de configurar correctamente o seu 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>"
+      message: "<p>Volvémoslle 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."
+    description: "O modo seguro permítelle probar o seu 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."
+    must_select: "Debe seleccionar polo menos unha opción para entrar no modo seguro."
   wizard:
     title: "Configuración de Discourse"
     step:
       locale:
-        title: "Benvido/a ao teu Discourse!"
+        title: "Dámoslle a benvida ao seu Discourse!"
         fields:
           default_locale:
-            description: "Cal é o idioma por defecto da túa comunidade?"
+            description: "Cal é o idioma predefinido da súa comunidade?"
       forum_title:
         title: "Nome"
-        description: "O nome é o signo visible na distancia, o <i>primeiro</i> que os visitantes potencias saberán sobre a túa comunidade. Que din sobre ti o nome e o título da túa comunidade?"
+        description: "O nome é un sinal visible a distancia, o <i>primeiro</i> que os visitantes potenciais saberán sobre a súa comunidade. Que di o nome e o título da súa comunidade sobre ela?"
         fields:
           title:
-            label: "O nome da túa comunidade"
+            label: "O nome da súa comunidade"
             placeholder: "Reunión de Helena"
           site_description:
-            label: "Describe a túa comunidade cunha frase curta"
+            label: "Describa a súa comunidade cunha frase curta"
             placeholder: "Un lugar para que Helena e as súas amizades discutan sobre cousas interesantes"
           short_site_description:
-            label: "Describe a túa comunidade nunhas poucas palabras"
+            label: "Describa a súa comunidade nunhas poucas palabras"
             placeholder: "A mellor comunidade do mundo"
       introduction:
         title: "Introdución"
-        disabled: "<p>Non atopamos tema ningún co título “%{topic_title}”.</p> <ul> <li>Se cambiaches o título, edita ese tema para cambiar tamén o texto introdutorio do teu foro. </li> <li>Se eliminaches este tema, crea un outro co título “%{topic_title}”. O contido da primeira publicación será o texto introdutorio do teu foro.</li> </ul>"
+        disabled: "<p>Non atopamos tema ningún co título “%{topic_title}”.</p> <ul> <li>Se cambiou o título, edite ese tema para cambiar tamén o texto introdutorio do seu foro. </li> <li>Se eliminou este tema, cree outro co título “%{topic_title}”. O contido da primeira publicación será o texto introdutorio do seu foro.</li> </ul>"
         fields:
           welcome:
             label: "Tema de benvida"
-            description: "<p>Como lle describirías a túa comunidade a alguén que non a coñece nun minuto?</p> <ul> <li>A quen están enfocadas as súas discusións?</li> <li>Que podo atopar aquí?</li> <li>Por que debería visitala?</li> </ul> <p>O teu tema de benvida é a primeira cousa que lerán os novos visitantes. Pensa que é o <b>parágrafo</b> a modo de presentación exprés ou introdución á misión. </p>"
-            one_paragraph: "Limita a túa mensaxe de benvida a un único parágrafo."
+            description: "<p>Como lle describiría nun minuto a súa comunidade a alguén que non a coñece?</p> <ul> <li>A quen se dirixen os debates?</li> <li>Que podo atopar aquí?</li> <li>Por que debería visitala?</li> </ul> <p>O seu tema de benvida é o primeiro que os seus visitantes lerán. Pense nel como no seu argumento de vendas <b>nun minuto</b> ou a súa declaración de intencións. </p>"
+            one_paragraph: "Limite a súa mensaxe de benvida a un único parágrafo."
+            extra_description: "Se non está seguro, pode saltar este paso e editar o seu texto de benvida máis tarde."
       privacy:
         title: "Acceso"
-        description: "<p>A túa comunidade é aberta a todo o mundo ou está restrinxida só aos seus membros afiliados, con invitación ou aprobación? Se o prefires, podes facer que inicialmente sexa privada e despois convertela en aberta.</p>"
+        description: "<p>A súa comunidade é aberta a todo o mundo ou está restrinxida só aos seus membros afiliados, con invitación ou aprobación? Se o prefire, pode facer que inicialmente sexa privada e despois convertela en aberta.</p>"
         fields:
           privacy:
             choices:
@@ -3397,17 +4314,17 @@ gl:
           contact_email:
             label: "Correo electrónico"
             placeholder: "nome@exemplo.com"
-            description: "Enderezo electrónico da persoa ou grupo responsable desta comunidade. Utilízase para notificacións críticas como denuncias sen atender, actualizacións de seguridade e tamén aparecerá na túa <a href='%{base_path}/about' target='_blank'>páxina Acerca de</a> para comunicar cuestións urxentes."
+            description: "Enderezo electrónico da persoa ou grupo responsable desta comunidade. Utilízase para notificacións moi importantes como denuncias sen atender, actualizacións de seguridade e tamén aparecerá na súa <a href='%{base_path}/about' target='_blank'>páxina Acerca de</a> para comunicar cuestións urxentes."
           contact_url:
             label: "Páxina web"
             placeholder: "https://www.exemplo.com/contactanos"
-            description: "A túa páxina de contacto xeral contigo ou coa túa organización. Mostrarase na túa <a href='%{base_path}/about' target='_blank'>páxina Acerca de</a>."
+            description: "Páxina de contacto xeral con vostede ou a súa organización. Amosarase na súa <a href='%{base_path}/about' target='_blank'>páxina Acerca de</a>."
           site_contact:
             label: "Mensaxes automáticas"
-            description: "Todas as mensaxes privadas automáticas de Discourse serán enviadas deste este usuario, sexan notificacións de denuncias sexan apoios recibidos."
+            description: "Todas as mensaxes privadas automáticas de Discourse serán enviadas deste este usuario, sexan advertencias de denuncias sexan apoios recibidos."
       corporate:
         title: "Organización"
-        description: "Esta información será inserida nos teus <a href='%{base_path}/tos' target='blank'>Termos de servizo</a>, que poderás editar en todo momento na sección Equipo. Se non tes unha empresa, podes omitir este paso por agora."
+        description: "Esta información inserirase nos seus <a href='%{base_path}/tos' target='blank'>Termos de servizo</a>, que poderá editar en calquera momento na sección Equipo. Se non ten unha empresa, pode omitir este paso por agora."
         fields:
           company_name:
             label: "Nome da empresa"
@@ -3415,26 +4332,40 @@ gl:
           governing_law:
             label: "Lei que rexe"
             placeholder: "Lei de California"
+          city_for_disputes:
+            label: "Cidade para disputas"
+            placeholder: "San Francisco, California"
+      colors:
+        title: "Cores"
+      fonts:
+        title: "Tipos de letra"
+        fields:
+          body_font:
+            label: "Tipo de letra do corpo"
+          heading_font:
+            label: "Tipo de letra de título"
+          font_preview:
+            label: "Visualizar"
       logos:
         title: "Logotipos"
         fields:
           logo:
             label: "Logotipo principal"
-            description: " A imaxe do logotipo na parte superior esquerda da páxina. Utiliza unha imaxe larga e rectangular, cunha altura de 120 e unha relación de aspecto maior de 3:1."
+            description: "A imaxe do logotipo na parte superior esquerda do sitio. Utilice unha imaxe larga e rectangular, cunha altura de 120 e unha proporción de aspecto maior de 3:1"
           logo_small:
             label: "Logotipo cadrado"
-            description: "Unha versión cadrada do teu logotipo. Móstrase na parte superior esquerda do teu sitio cando se despraza cara a abaixo no navegador e cando se comparte en plataformas sociais. Idealmente debe ser máis grande que 512x512."
+            description: "Unha versión cadrada do seu logotipo. Móstrase na parte superior esquerda do seu sitio cando se despraza cara a abaixo no navegador e cando se comparte en plataformas sociais. Idealmente debe ser máis grande que 512x512."
       icons:
         title: "Iconas"
         fields:
           favicon:
             label: "Icona do navegador"
-            description: " Imaxe de icona utilizada para representar o teu sitio en navegadores web que se ve ben a tamaños pequenos. As extensión de imaxe recomendas son PNG ou JPG. Utilizaremos o logotipo cadrado por defecto."
+            description: "Imaxe de icona que se usa para representar o seu sitio en navegadores web que se ve ben a tamaños pequenos. As extensións recomendadas son PNG ou JPG. Utilizaremos o logotipo cadrado por defecto."
           large_icon:
             label: "Icona grande"
-            description: "Imaxe de icona utilizada para representar o teu sitio en dispositivos modernos que se ve ben en tamaños máis grandes. Idealmente debe ser maior que 512 × 512. Utilizaremos o logo cadrado por defecto."
+            description: "Imaxe de icona utilizada para representar o seu sitio en dispositivos modernos que se ve ben en tamaños máis grandes. Idealmente debe ser maior que 512 × 512. Utilizaremos o logo cadrado por defecto."
       homepage:
-        description: "Recomendamos mostrar os últimos temas na túa páxina principal, mais, se o prefires, tamén podes mostrar categorías (grupos de temas)."
+        description: "Recomendamos mostrar os últimos temas na súa páxina principal, mais, se o prefire, tamén pode mostrar categorías (grupos de temas)."
         title: "Páxina de inicio"
         fields:
           homepage_style:
@@ -3444,7 +4375,7 @@ gl:
               categories_only:
                 label: "Só categorías"
               categories_with_featured_topics:
-                label: "Categorías con temas destacados"
+                label: "Categorías con temas salientados"
               categories_and_latest_topics:
                 label: "Categorías e últimos temas"
               categories_and_top_topics:
@@ -3453,39 +4384,42 @@ gl:
                 label: "Caixas de categorías"
               categories_boxes_with_topics:
                 label: "Caixas de categorías con temas"
-      emoji:
-        title: "Emoji"
-        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."
+        title: "Convidar o equipo"
+        description: "Xa case está! 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 súa comunidade."
+        disabled: "Como os inicios de sesión locais están desactivados, non é posible enviar invitacións a ninguén. Vaia ao seguinte paso."
       finished:
-        title: "O teu Discourse está pronto!"
+        title: "O seu Discourse está listo!"
+        description: |
+          <p>Se xa comprende como cambiar esta configuración, <b>volva executar este asistente en calquera momento</b>, ou visite <a href='%{base_path}/admin' target='_blank'>a sección de administración</a>; atoparaa xunto á icona de chave inglesa no menú do sitio.</p>
+          <p>É doado personalizar Discourse aínda máis usando o noso poderoso sistema de temas. Para ver exemplos, consulte os <a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">principais temas e compoñentes</a> en <a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a>.</p>
+          <p>Páseo ben e moita sorte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>organizando a sú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}'
-      group_mentioned: '%{username} mencionoute en "%{topic}" - %{site_title}'
-      quoted: '%{username} citoute en "%{topic}" - %{site_title}'
-      replied: '%{username} respondeute en "%{topic}" - %{site_title}'
+      mentioned: '%{username} mencionouno en "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} mencionouno en "%{topic}" - %{site_title}'
+      quoted: '%{username} citouno en "%{topic}" - %{site_title}'
+      replied: '%{username} respondeulle 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}'
+      private_message: '%{username} envioulle unha mensaxe privada en "%{topic}" - %{site_title}'
+      linked: '%{username} ligou á sú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."
+      confirm_title: "Notificacións activadas - %{site_title}"
+      confirm_body: "Perfecto! As notificacións están activadas."
       custom: "Notificación de %{username} en %{site_title}"
   staff_action_logs:
-    not_found: "non atopado"
-    unknown: "decoñecido"
+    not_found: "non foi posíbel atopalo"
+    unknown: "descoñecido"
     user_merged: "%{username} combinouse con esta conta"
     user_delete_self: "Eliminouse a si mesmo/a de %{url}"
+    webhook_deactivation_reason: "O seu enganche de web desactivouse automaticamente. Recibimos múltiplas respostas de status de fallo HTTP «%{status}»."
     api_key:
       automatic_revoked:
         one: "Revogada automaticamente, última actividade hai máis de %{count} día"
-        other: "Revogada automaticamente, última actividade hai máis de %{count} días."
+        other: "Revogada automaticamente, última actividade hai máis de %{count} días"
       revoked: Revogada
       restored: Restaurada
   reviewables:
@@ -3499,24 +4433,28 @@ gl:
       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."
-    missing_version: "Debes incluír un parámetro de versión"
-    conflict: "Hai un conflito de actualización que non che permitiu realizar esta acción"
+    must_claim: "Debe reclamar os elementos antes de actuar sobre eles."
+    user_claimed: "Outro usuario reclamou por este elemento."
+    missing_version: "Debe incluír un parámetro de versión"
+    conflict: "Hai un conflito de actualización que non lle permitiu realizar esta acción."
     reasons:
-      post_count: "As primeiras publicacións dun usuario deben ser aprobadas polo equipo. Revisa `approve_post_count`."
-      trust_level: "Os usuarios con niveis de confianza baixos deben ter respostas aprobadas polo equipo. Revisa `approve_unless_trust_level`."
-      new_topics_unless_trust_level: "Os usuarios con niveis de confianza baixos deben ter temas aprobados polo equipo. Revisa `approve_new_topics_unless_trust_level`."
-      fast_typer: "O usuario novo escribiu a súa primeira publicación sospeitosamente rápido; pode ser un bot ou alguén cun comportamento de remitente non desexado. Revisa `min_first_post_typing_time`."
-      auto_silence_regexp: "O usuario novo cuxa primeira publicación coincide coa configuración `auto_silence_first_post_regex`."
-      staged: "Os novos temas e publicacións de usuarios provisorios deben ser aprobados polo equipo. Revisa `approve_unless_staged`."
-      category: "As publicacións nesta categoría requiren a aprobación manual do equipo. Consulta os axustes das categorías."
-      must_approve_users: "Todos os novos usuarios deben ser aprobados polo equipo. Consulta `must_approve_users`."
-      invite_only: "Todos os novos usuarios deben ser convidados. Revisa `invite_only`."
-      email_auth_res_enqueue: "Neste correo fallou a comprobación DMARC polo que posiblemente non é de quen semella ser. Comproba as cabeceiras do correo para máis información."
+      post_count: "As primeiras publicacións dun usuario deben ser aprobadas polo equipo. Revise `approve_post_count`."
+      trust_level: "Os usuarios con niveis de confianza baixos deben ter respostas aprobadas polo equipo. Revise `approve_unless_trust_level`."
+      new_topics_unless_trust_level: "Os usuarios con niveis de confianza baixos deben ter temas aprobados polo equipo. Revise `approve_new_topics_unless_trust_level`."
+      fast_typer: "O usuario novo escribiu a súa primeira publicación sospeitosamente rápido; pode ser un bot ou alguén cun comportamento de remitente non desexado. Revise `min_first_post_typing_time`."
+      auto_silence_regexp: "Usuario novo cuxa primeira publicación coincide coa configuración `auto_silence_first_post_regex`."
+      staged: "Os novos temas e publicacións de usuarios transitorios deben ser aprobados polo equipo. Revise `approve_unless_staged`."
+      category: "As publicacións nesta categoría requiren a aprobación manual do equipo. Consulte os axustes das categorías."
+      must_approve_users: "Todos os novos usuarios deben ser aprobados polo equipo. Consulte `must_approve_users`."
+      invite_only: "Todos os novos usuarios deben ser convidados. Revise `invite_only`."
+      email_auth_res_enqueue: "Neste correo fallou a comprobación DMARC polo que máis seguro que non sexa de quen semella ser. Comprobe as cabeceiras de correo para máis información."
       email_spam: "Este correo electrónico foi denunciado como lixo pola cabeceira definida en `email_in_spam_header`."
-      suspect_user: "Este novo usuario inseriu información de perfil sen ler antes ningún tema nin publicación, o cal suxire claramente que pode ser un remitente cun comportamento non desexado. Revisa `approve_suspect_users`."
+      suspect_user: "Este novo usuario inseriu información de perfil sen ler antes ningún tema nin publicación, o cal suxire claramente que pode ser un remitente cun comportamento non desexado. Revise `approve_suspect_users`."
+      contains_media: "Esta publicación inclúe elementos multimedia inseridos. Vexa `review_media_unless_trust_level`."
+      queued_by_staff: "Un membro do equipo pensa que esta publicación necesita revisión. Permanecerá agochada ata entón."
     actions:
+      agree:
+        title: "De acordo..."
       agree_and_keep:
         title: "Manter publicación"
         description: "De acordo con esta denuncia e manter a publicación sen modificar."
@@ -3537,8 +4475,8 @@ gl:
         description: "Agocha esta publicación e automaticamente lle envía ao usuario unha mensaxe que o insta a editala."
       delete_spammer:
         title: "Eliminar remitente non desexado"
-        description: "Eliminar o usuario e todas as súas publicacións e temas."
-        confirm: "Tes a certeza de querer eliminar todas as publicacións e temas deste usuario e bloquear as súas IP e enderezos electrónicos?"
+        description: "Retirar o usuario e todas as súas publicacións e temas."
+        confirm: "Confirma que quere eliminar todas as publicacións e temas deste usuario e bloquear as súas IP e enderezos electrónicos?"
       delete_single:
         title: "Eliminar"
       delete:
@@ -3548,13 +4486,15 @@ gl:
         description: "Eliminar publicación; se é a primeira, eliminar tamén o tema"
       delete_and_ignore_replies:
         title: "Eliminar publicación + respostas e ignorar"
-        description: "Eliminar publicación e todas as súas respostas; se é a primeira publicación, eliminar o tema tamén."
-        confirm: "Confirmas a eliminación das respostas desta publicación tamén?"
+        description: "Eliminar publicación e todas as súas respostas; se é a primeira publicación, eliminar o tema tamén"
+        confirm: "Confirma que quere eliminar as respostas desta publicación tamén?"
       delete_and_agree:
+        title: "Eliminar publicación e aceptar"
         description: "Eliminar publicación; se é a primeira, eliminar tamén o tema"
       delete_and_agree_replies:
-        description: "Eliminar publicación e todas as súas respostas; se é a primeira publicación, eliminar o tema tamén."
-        confirm: "Confirmas a eliminación das respostas desta publicación tamén?"
+        title: "Eliminar Publicación + Respostas e aceptar"
+        description: "Eliminar publicación e todas as súas respostas; se é a primeira publicación, eliminar o tema tamén"
+        confirm: "Confirma que quere eliminar as respostas desta publicación tamén?"
       disagree_and_restore:
         title: "Discrepar e restaurar publicación"
         description: "Restaurar a publicación para que todos os usuarios a poidan ver."
@@ -3566,7 +4506,7 @@ gl:
         title: "Aprobar"
       approve_post:
         title: "Aprobar publicación"
-        confirm_closed: "Este tema está pechado. Gustaríache igualmente crear a publicación?"
+        confirm_closed: "Este tema está pechado. Gustaríalle crear a publicación igualmente?"
       reject_post:
         title: "Rexeitar a publicación"
       approve_user:
@@ -3583,25 +4523,31 @@ gl:
         title: "Rexeitar"
       delete_user:
         title: "Eliminar usuario"
-        confirm: "Tes a certeza de querer eliminar este usuario? Isto eliminará todas as súas publicacións e bloqueará o seu correo electrónico e enderezo IP."
-        reason: "Eliminado vía cola de revisións"
+        confirm: "Confirma que quere eliminar este usuario? Isto retirará todas as súas publicacións e bloqueará o seu correo electrónico e enderezo IP."
+        reason: "Eliminado a través da cola de revisións"
   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."
+    ignore_error: "Sentímolo, non pode ignorar este usuario."
+    mute_error: "Sentímolo, non pode ignorar este usuario."
   discord:
-    not_in_allowed_guild: "Erro na autenticación. Non es membro de ningún clan de Discord."
+    not_in_allowed_guild: "Erro na autenticación. Non é membro de ningún colectivo de Discord."
   old_keys_reminder:
-    title: "Recordatorio de vellas credenciais"
+    title: "Recordatorio de credenciais antigas"
     body: |
-      Ola! Este é un recordatorio anual de seguridade para a túa instancia en Discourse.
+      Ola! Este é un recordatorio anual de seguridade para a súa instancia en Discourse.
 
-      Queremos lembrarche que as seguintes credenciais, utilizadas en Discourse, levan sen actualizar desde hai máis de dus anos:
+      Queremos lembrarlle que as seguintes credenciais, utilizadas en Discourse, levan sen actualizar desde hai máis de dous anos:
 
       %{keys}
 
-      Arestora non se precisa realizar acción ningunha, mais repara en que é unha boa práctica de seguridade renovar todas as credencias importantes cada poucos anos.
+      Arestora non se precisa realizar acción ningunha, mais repare en que é unha boa práctica de seguridade renovar todas as credencias importantes cada poucos anos.
+  create_linked_topic:
+    topic_title_with_sequence:
+      one: "%{topic_title} (Parte %{count})"
+      other: "%{topic_title} (Partes %{count})"
+    post_raw: "Continuando a discusión de %{parent_url}.\n\nDiscusións previas:\n\n%{previous_topics}"
+    small_action_post_raw: "Continuar a discusión en %{new_title}."
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 9b0711f7bc..a3bffef764 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -51,9 +51,13 @@ he:
   remove_posts_deleted_by_author: "נמחק על ידי הכותב"
   redirect_warning: "לא הצלחנו לאמת שהקישור שבחרת אכן פורסם לפורום. כדי להמשיך בכל אופן, נא לבחור בקישור שלהלן."
   on_another_topic: "בנושא אחר"
+  inline_oneboxer:
+    topic_page_title_post_number: "מס׳ %{post_number}"
+    topic_page_title_post_number_by_user: "מס׳ %{post_number} מאת %{username}"
   themes:
     bad_color_scheme: "לא ניתן לעדכן ערכת עיצוב, מבחר הצבעים שגוי"
     other_error: "משהו השתבש בעת עדכון ערכת העיצוב"
+    ember_selector_error: "עמך הסליחה – השימוש בבוררי ה־CSS‏ ‎#ember או ‎.ember-view אסור, כיוון שאלו שמות שנוצרים אוטומטית בזמן ההפעלה והם יישתנו עם הזמן, מה שיוביל לפגם ב־CSS. נא לנסות בורר אחר."
     compile_error:
       unrecognized_extension: "סיומת הקובץ אינה מוכרת: %{extension}"
     import_error:
@@ -65,6 +69,7 @@ he:
       unpack_failed: "חילוץ הקובץ נכשל"
       file_too_big: "הקובץ גדול מדי ללא דחיסה."
       unknown_file_type: "הקובץ שהעלית הוא כפי הנראה אינה ערכת עיצוב תקנית של Discourse."
+      not_allowed_theme: "‚%{repo}’ אינו ברשימת הנושאים המורשים (יש לבדוק את ההגדרה הגלובלית `allowed_theme_repos` - מאגרי ערכות עיצוב מורשים)."
     errors:
       component_no_user_selectable: "רכיבי ערכת העיצוב לא יכולים להיות לבחירת המשתמש"
       component_no_default: "רכיבי ערכת העיצוב לא יכולים להיות בררת המחדל של ערכת העיצוב"
@@ -174,7 +179,7 @@ he:
         many: באורך שגוי (אמור להיות באורך של %{count} תווים)
         other: באורך שגוי (אמור להיות באורך של %{count} תווים)
       other_than: "צריך להיות שונה מ־%{count}"
-      sso_overrides_username: "יש לעדכן את שם המשתמש בצד ספק ה־SSO, מאחר שההגדרה `sso_overrides_username` (דריסת שם משתמש מצד ה־SSO) פעילה."
+      auth_overrides_username: "יש לעדכן את שם המשתמש בצד ספק האימות, מאחר שההגדרה `auth_overrides_username` (דריסת שם משתמש מצד האימות) פעילה."
     template:
       body: ! "ישנן תקלות עם השדות הבאים:"
       header:
@@ -202,7 +207,7 @@ he:
       share_quote_facebook_requirements: "עליך להגדיר מזהה יישומון פייסבוק כדי להפעיל שיתוף ציטוטים עבור פייסבוק"
       second_factor_cannot_enforce_with_socials: "לא ניתן לאכוף אימות דו־שלבי כאשר מופעלת כניסה דרך רשתות חברתיות. תחילה עליך להשבית כניסה דרך: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "אי אפשר לאכוף אימות דו־שלבי אם כניסה מקומית מושבתת."
-      second_factor_cannot_be_enforced_with_sso_enabled: "אי אפשר לאכוף אימות דו־שלבי אם מופעל SSO."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "אי אפשר לאכוף אימות דו־שלבי אם מופעל DiscourseConnect."
       local_login_cannot_be_disabled_if_second_factor_enforced: "אי אפשר להשבית כניסה מקומית אם נאכף אימות דו־שלבי. יש להשבית את אכיפת האימות הדו־שלבי בטרם השבתת כניסה מקומית."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "לא ניתן להפעיל העלאות ל־S3 כיוון שהעלאות ל־S3 כבר פעילות באופן גלובלי והפעלת האפשרות הזאת ברמת האתר עשויה להוביל לתקלות חמורות בהעלאה."
       cors_origins_should_not_have_trailing_slash: "אין להוסיף לוכסן (/) לסוף מקורות ה־CORS."
@@ -221,19 +226,22 @@ he:
     expired: "תוקף אסימון ההזמנה שלך פג. נא <a href='%{base_url}/about'>ליצור קשר עם הסגל</a>."
     not_found: "אסימון ההזמנה שלך שגוי. נא <a href='%{base_url}/about'>ליצור קשר עם הסגל</a>."
     not_found_json: "אסימון ההזמנה שלך שגוי. נא ליצור קשר עם הסגל."
+    not_matching_email: "כתובת הדוא״ל שלך וכתובת הדוא״ל שמשויכת לאסימון ההזמנה אינן תואמות. נא ליצור קשר עם הסגל."
     not_found_template: |
-      <p>הזמנתך אל <a href="%{base_url}">%{site_name}</a> כבר נפדתה.</p>
+      <p>הזמנתך אל <a href="%{base_url}">%{site_name}</a> כבר נוצלה.</p>
 
       <p>אם ססמתך זכורה לך יש לך אפשרות <a href="%{base_url}/login">להיכנס</a>.</p>
 
-      <p>אם לא נא <a href="%{base_url}/password-reset">לאפס ססמה</a>.</p>
-    error_message: "אירעה שגיאה בקבלת ההזמנה. נא ליצור קשר עם הנהלת האתר."
+      <p>אם לא אז נא <a href="%{base_url}/password-reset">לאפס ססמה</a>.</p>
+    not_found_template_link: |
+      <p>לא ניתן עוד לממש את ההזמנה שנשלח אל <a href="%{base_url}">%{site_name}</a>. נא לבקש מיוזם או יוזמת ההזמנה לשלוח לך הזמנה חדשה.</p>
     user_exists: "אין צורך להזמין את <b>%{email}</b>, כבר <a href='%{base_path}/u/%{username}/summary'>קיים חשבון לכתובת זו!</a>"
+    invite_exists: "כבר הזמנת את <b>%{email}</b>."
+    invalid_email: "%{email} אינה כתובת דוא״ל תקפה."
     confirm_email: "<p>כמעט סיימת! שלחנו הודעת הפעלה לכתובת הדוא״ל שלך. נא לעקוב אחר ההנחיות המופיעות בהודעה כדי להפעיל את החשבון שלך.</p><p>אם ההודעה לא הגיעה אליך כדאי לבדוק בתיקיית הספאם.</p>"
     cant_invite_to_group: "אסור לך להזמין משתמשים לקבוצות מסוימות. נא לוודא שהקבוצות אליהן ייעדת להזמין הן בבעלותך."
     disabled_errors:
-      sso_enabled: "הזמנות מושבתות כיוון שה־SSO מופעל."
-      local_logins_disabled: "הזמנות מושבתות כיוון שההגדרה ‚הפעלת כניסה מקומית’ מושבתת."
+      discourse_connect_enabled: "הזמנות מושבתות כיוון ש־DiscourseConnect מופעל."
       invalid_access: "אין לך הרשאות לצפות במשאב המבוקש."
   bulk_invite:
     file_should_be_csv: "הקובץ שנשלח אמור להיות בתסדיר csv."
@@ -249,7 +257,7 @@ he:
     muted_topic: "המשתמש הזה השתיק את הנושא הזה, עמך הסליחה."
     receiver_does_not_allow_pm: "משתמש זה לא מאשר לך לשלוח אליו הודעות פרטיות, עמך הסליחה."
     sender_does_not_allow_pm: "אסרת על משתמש זה לשלוח אליך הודעות פרטיות, עמך הסליחה."
-    receiver_does_not_allow_other_user_pm: "משתמש זה לא מאשר למשתתף קיים לשלוח אליו הודעות פרטיות, עמך הסליחה."
+    user_cannot_see_topic: "הנושא לא חשוף בפני %{username}."
   backup:
     operation_already_running: "פעולה רצה כרגע. לא ניתן להתחיל משימה חדשה כרגע."
     backup_file_should_be_tar_gz: "על קובץ הגיבוי להיות ‎.tar.gz."
@@ -272,6 +280,7 @@ he:
   email_template_cant_be_modified: "לא ניתן לערוך את תבנית הדוא״ל הזו"
   invalid_whisper_access: "או שלחישות אינן פעילות או שאין לך גישה ליצור פוסטים של לחישות"
   not_in_group:
+    title_topic: "עליך לבקש חברות בקבוצה ‚%{group}’ כדי לצפות בנושא הזה."
     title_category: "עליך להיות בקבוצה כדי לצפות בקטגוריה זו."
     request_membership: "בקשת חברות"
     join_group: "הצטרפות לקבוצה"
@@ -361,6 +370,7 @@ he:
   max_pm_recipients: "ניתן לשלוח הודעה ל־%{recipients_limit} נמענים לכל היותר, עמך הסליחה."
   pm_reached_recipients_limit: "להודעה לא יכולים להיות למעלה מ־%{recipients_limit} נמענים, עמך הסליחה."
   removed_direct_reply_full_quotes: "הוסר ציטוט של כל הפוסט הקודם אוטומטית."
+  watched_words_auto_tag: "נושא שתויג אוטומטית"
   secure_upload_not_allowed_in_public_topic: "לא ניתן להשתמש בהעלאות המאובטחות הבאות בנושא ציבורי: %{upload_filenames}, עמך הסליחה."
   create_pm_on_existing_topic: "אין לך אפשרות ליצור הודעה פרטית על נושא קיים, עמך הסליחה."
   slow_mode_enabled: "נושא זה הוא במצב אטי."
@@ -406,11 +416,12 @@ he:
   too_late_to_edit: "פוסט זה נוצר לפני זמן רב מידי. לא ניתן יותר לערוך או להסיר אותו."
   edit_conflict: "פוסט זה נערך על ידי משתמש אחר ואין אפשרות עוד לשמור את השינויים שלך."
   revert_version_same: "הגרסה הנוכחית זהה לגרסה שמועמדת להחזרה."
-  cannot_edit_on_slow_mode: "נושא זה נכנס למצב אטי. כדי לעודד דיון מתחשב ואחראי אסור כרגע לערוך פוסטים ישנים."
+  cannot_edit_on_slow_mode: "נושא זה נכנס למצב אטי. כדי לעודד דיון מתחשב ואחראי אסור כרגע לערוך פוסטים ישנים בנושא הזה במהלך המצב האטי."
   excerpt_image: "תמונה"
   bookmarks:
     errors:
       already_bookmarked_post: "אי אפשר לסמן את אותו הפוסט פעמיים"
+      too_many: "לא ניתן להוסיף למעלה מ־%{limit} סימניות, נא לבקר ב<a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> כדי להסיר כמה מהנוכחיות."
       cannot_set_past_reminder: "אי אפשר להגדיר תזכורת סימנייה למועד שעבר."
       cannot_set_reminder_in_distant_future: "לא ניתן להגדיר תזכורת סימנייה למעבר ל־10 שנים בעתיד."
       time_must_be_provided: "יש לספק זמן לכל התזכורות"
@@ -443,7 +454,14 @@ he:
       email_already_used_in_category: "‚%{email}’ כבר בשימוש על ידי הקטגוריה ‚%{category_name}’."
       cant_allow_membership_requests: "אין לך אפשרות לאפשר בקשות חברות לקבוצה ללא בעלים."
       already_requested_membership: "כבר ביקשת חברות בקבוצה זו."
-      adding_too_many_users: "ניתן להוסיף %{limit} משתמשים לכל היותר בבת אחת"
+      adding_too_many_users:
+        one: "ניתן להוסיף עד משתמש %{count} בבת־אחת"
+        two: "ניתן להוסיף עד %{count} משתמשים בבת־אחת"
+        many: "ניתן להוסיף עד %{count} משתמשים בבת־אחת"
+        other: "ניתן להוסיף עד %{count} משתמשים בבת־אחת"
+      usernames_or_emails_required: "שמות משתמשים או כתובות דוא״ל חייבים להיות נוכחים"
+      no_invites_with_discourse_connect: "ניתן להזמין רק משתמשים רשומים כאשר DiscourseConnect מופעל"
+      no_invites_without_local_logins: "ניתן להזמין רק משתמשים רשומים כאשר כניסות מקומיות מושבת"
     default_names:
       everyone: "כולם"
       admins: "מנהלים"
@@ -473,16 +491,16 @@ he:
 
       - את מי היא עשויה לעניין? מה התכלית שלה? אילו תגובות רצויות בעיניך?
 
-      - כדאי לכלול מילים שמשתמשים בהן הרבה בנושא כדי שאחרים יוכלו *למצוא* אותו. כדי לקבץ את הנושא שלך לנושאים קשורים, יש לבחור בקטגוריה.
+      - כדאי לכלול מילים שמשתמשים בהן הרבה בנושא כדי שאחרים יוכלו *למצוא* אותו. כדי לקבץ את הנושא שלך לנושאים קשורים, יש לבחור בקטגוריה (או תגית).
 
       למידע נוסף, [יש לעיין בהנחיות הקהילה שלנו](%{base_path}/guidelines). חלונית זו תופיע רק עבור %{education_posts_text} הראשונים שלך.
     "new-reply": |
       ברוך בואך אל %{site_name} &mdash; ** תודה על תרומתך! **
 
-      - האם התגובה שלך משפרת את השיחה בדרך כלשהיא?
-
       - מוטב להציג את פניך היפות לחברים בקהילה
 
+      - האם התגובה שלך משפרת את השיחה בדרך כלשהיא?
+
       - ביקורת בונה היא רצויה, אבל חשוב לזכור לבקר *רעיונות*, לא אנשים.
 
       למידע נוסף מופיע ב[הנחיות הקהילה](%{base_path}/guidelines) שלנו. חלונית זו תופיע רק ב־%{education_posts_text} התגובות הראשונות שלך.
@@ -550,6 +568,7 @@ he:
               cant_send_pm: "אין לך אפשרות לשלוח הודעה אישית למשתמש זה, עמך הסליחה."
               no_user_selected: "יש לבחור במשתמש תקני."
               reply_by_email_disabled: "האפשרות להגיב בדוא״ל נוטרלה."
+              send_to_email_disabled: "אין לך אפשרות לשלוח הודעה אישית לדוא״ל, עמך הסליחה."
               target_user_not_found: "אחד הנמענים לא נמצא."
               unable_to_update: "אירעה שגיאה בעדכון הנושא הזה."
               unable_to_tag: "אירעה שגיאה בתיוג הנושא."
@@ -598,6 +617,9 @@ he:
           attributes:
             execute_at:
               in_the_past: "חייב להיות בעתיד."
+            duration_minutes:
+              cannot_be_zero: "חייב להיות גדול מ־0."
+              exceeds_maximum: "לא יכול להיות יותר מ־20 שנה."
         translation_overrides:
           attributes:
             value:
@@ -684,20 +706,19 @@ he:
     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} בטרם ביצוע ניסיון חוזר."
+      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} בטרם ביצוע ניסיון חוזר."
+      topic_invitations_per_day: "הגעת לכמות המרבית המותרת של הזמנות לנושא. ניתן לשלוח הזמנות נוספות בעוד %{time_left}."
     hours:
       one: "שעה"
       two: "שעתיים"
@@ -849,7 +870,7 @@ he:
       unknown: "דפדפן בלתי ידוע"
     device:
       android: "מכשיר Android"
-      chromebook: "Chromebook"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -860,7 +881,7 @@ he:
       unknown: "מכשיר לא ידוע"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "לינוקס"
       macos: "macOS"
@@ -875,6 +896,7 @@ he:
     error_staged: "אירעה שגיאה בהחלפת כתובת הדוא״ל שלך. הכתובת כבר נמצאת בשימוש על ידי משתמשים מבוימים במערכת."
     already_done: "קישור אימות זה אינו תקף עוד, עמך הסליחה. אולי כתובת הדוא״ל שלך כבר הוחלפה?"
     confirm: "אישור"
+    max_secondary_emails_error: "הגעת למגבלת כתובות הדוא״ל המשניות."
     authorizing_new:
       title: "אישור כתובת הדוא״ל החדשה שלך"
       description: "נא לאשר שכתובת הדוא״ל שלך תשתנה לכדי:"
@@ -966,6 +988,16 @@ he:
       others: "אין תגובות."
     no_drafts:
       self: "אין לך טיוטות, ניתן להתחיל לכתוב תגובה בכל נושא שהוא והוא יישמר אוטומטית כטיוטה חדשה."
+  email_settings:
+    pop3_authentication_error: "אירעה תקלה עם פרטי הגישה שסופקו עבור POP3, נא לבדוק את שם המשתמש והססמה ולנסות שוב."
+    imap_authentication_error: "אירעה תקלה עם פרטי הגישה שסופקו עבור IMAP, נא לבדוק את שם המשתמש והססמה ולנסות שוב."
+    imap_no_response_error: "אירעה שגיאה ביצירת קשר עם שרת ה־IMAP. ‏%{message}"
+    smtp_authentication_error: "אירעה תקלה עם פרטי הגישה שסופקו עבור SMTP, נא לבדוק את שם המשתמש והססמה ולנסות שוב."
+    smtp_server_busy_error: "שרת ה־SMTP עסוק, נא לנסות שוב בהמשך."
+    smtp_unhandled_error: "קרתה תקלה שלא טופלה בעת יצירת הקשר עם שרת ה־SMTP. ‏%{message}"
+    connection_error: "אירעה שגיאה בהתחברות לשרת, נא לבדוק את שם השרת ואת הפתחה ולנסות שוב."
+    timeout_error: "הזמן שהוקצב להתחברות לשרת תם, נא לבדוק את שם השרת ואת הפתחה ולנסות שוב."
+    unhandled_error: "שגיאה שלא טופלה בעת בדיקת הגדרות הדוא״ל. %{message}"
   webauthn:
     validation:
       invalid_type_error: "סוג ה־webauthn שסופק שגוי. הסוגים התקינים הם webauthn.get ו־webauthn.create."
@@ -1025,9 +1057,9 @@ he:
     mute_topic: "השתיקו את כל ההתראות של נושא זה, %{link}"
     unwatch_category: "הפסיקו לצפות בכל הנושאים בקטגוריה %{category}"
     mailing_list_mode: "כבו את מצב ״רשימת תפוצה״"
-    all: "לא לשלוח אלי עוד הודעות מאת %{sitename} בדוא״ל"
+    all: "לא לשלוח לי הודעות דוא״ל מאת %{sitename}"
     different_user_description: "התחברת כמשתמש אחר מזה שאליו נשלחה הודעת דוא״ל. נא להתנתק או לעבור למצב אלמוני ולנסות שוב."
-    not_found_description: ",לא מצאנו את הקישור לביטול המנוי זה, עמך הסליחה. ייתכן שהקישור בהודעה שקיבלת לדוא״ל שלך כבר לא בתוקף?"
+    not_found_description: "לא הצלחנו למצוא את ביטול המינוי הזה עמך הסליחה. יכול להיות שהקישור בהודעה שקיבלת ישן מדי או שתוקפו פג?"
     log_out: "התנתקות"
     submit: "שמירת העדפות"
     digest_frequency:
@@ -1063,7 +1095,7 @@ he:
       read: "קריאה להכל"
       write: "כתיבה להכל"
       one_time_password: "יצירת אסימון כניסה חד־פעמי"
-      bookmarks_calendar: "תזכורת סימון שנקראו"
+      bookmarks_calendar: "לקרוא תזכורות לסימניות"
     invalid_public_key: "המפתח הציבורי שגוי, עמך הסליחה."
     invalid_auth_redirect: "מארח auth_redirect זה אינו מורשה, עמך הסליחה."
     invalid_token: "אסימון חסר, שגוי או פג תוקף."
@@ -1405,6 +1437,7 @@ he:
     github_config_warning: 'השרת מוגדר לאפשר הרשמה דרך GitHub‏ (enable_github_logins), אך לא הוגדרו ערכים למפתח ולסוד. יש לגשת אל <a href="%{base_path}/admin/site_settings">הגדרות האתר</a> ולעדכן את ההגדרות. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">מדריך זה יסביר לך כיצד</a>.'
     s3_config_warning: 'השרת מוגדר להעלות קבצים ל־S3, אך לפחות אחת מההגדרות הבאות חסרה: s3_access_key_id,‏ s3_secret_access_key,‏ s3_use_iam_profile, או s3_upload_bucket. עליך לגשת אל <a href="%{base_path}/admin/site_settings">הגדרות האתר</a> ולעדכן את ההגדרות. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">ניתן לעיין בעמוד „איך להגדיר העלאת תמונות ל־S3?” כדי ללמוד עוד</a>.'
     s3_backup_config_warning: 'השרת מוגדר להעלות גיבויים ל־S3, אך לפחות אחת מההגדרות הבאות חסרה: s3_access_key_id,‏ s3_secret_access_key,‏ s3_use_iam_profile, או s3_backup_bucket. עליך לגשת אל <a href="%{base_path}/admin/site_settings">הגדרות האתר</a> ולעדכן את ההגדרות. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">ניתן לעיין בעמוד „איך להגדיר העלאת תמונות ל־S3?” כדי ללמוד עוד</a>.'
+    s3_cdn_warning: 'השרת מוגדר להעלות קבצים ל־S3, אך לא מוגדר CDN של S3. זה יכול להוביל לעלויות S3 גבוהות ולביצועים ירודים של האתר. <a href="https://meta.discourse.org/t/-/148916" target="_blank">ניתן לעיין בעמוד „שימוש באחסון אובייקטים להעלאות” למידע נוסף</a>.'
     image_magick_warning: 'השרת שלך מוגדר ליצור תמונות מוקטנות של תמונות גדולות אך אין התקנה של ImageMagick. יש להתקין את ImageMagick בעזרת מנהל החבילות החביב עליך או <a href="https://www.imagemagick.org/script/download.php" target="_blank">להוריד את הגרסה העדכנית ביותר</a>.'
     failing_emails_warning: 'ישנן %{num_failed_jobs} משימות דוא״ל שנכשלו. נא לבדוק את ה־app.yml שלך ולוודא שהגדרות כתובת שרת הדוא״ל נכונות. <a href="%{base_path}/sidekiq/retries" target="_blank">ניתן לעיין במשימות שנכשלו ב־Sidekiq</a>.'
     subfolder_ends_in_slash: "הגדרת תיקיית המשנה שלך שגויה, הנתיב DISCOURSE_RELATIVE_URL_ROOT צריך להסתיים בלוכסן."
@@ -1415,14 +1448,12 @@ he:
       other: "ניסיונות שליפת הודעות דוא״ל יצרו %{count} תקלות ב־24 השעות האחרונות. ניתן לעיין ב<a href='%{base_path}/logs' target='_blank'>יומנים</a> לפרטים נוספים."
     missing_mailgun_api_key: "השרת מוגדר לשלוח דוא״ל דרך Mailgun אך לא סיפקת מפתח API שישמש לאימות ההודעות דרך ההתליה."
     bad_favicon_url: "טעינת סמל האתר נכשלה. נא לבדוק את הגדרות סמל האתר שלך תחת <a href='%{base_path}/admin/site_settings'>הגדרות האתר</a>."
-    deprecated_api_usage: "זיהינו בקשת API שהשתמשה בשיטת אימות ישנה. נא לעדכן את הלקוח להשתמש ב<a href='https://meta.discourse.org/t/-/22706'>אימות בכותרת</a>. לאחר העדכון ההודעה הזו תיעלם תוך 24 שעות."
-    update_mail_receiver: "זיהינו גרסה מיושנת של 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> שלכם."
     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> או לנטרל את הגדרות האתר ‚ביטוי רגולרי למילים במעקב’."
+    watched_word_regexp_error: "הביטוי הרגולרי למילים במעקב %{action} שגוי. נא לבדוק את <a href='%{base_path}/admin/customize/watched_words'>הגדרות המילים במעקב</a> או ךהשבית את הגדרת האתר ‚ביטוי רגולרי למילים במעקב’."
   site_settings:
     display_local_time_in_user_card: "להציג את הזמן המקומי בהתאם לאזור הזמן של המשתמש כאשר כרטיס המשתמש שלו נפתח."
     censored_words: "מלים שיוחלפו אוטומטית ב־&#9632;&#9632;&#9632;&#9632;"
@@ -1450,10 +1481,8 @@ he:
     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: "לאפשר נושאים עם כותרות זהות או כפולות."
     allow_duplicate_topic_titles_category: "לאפשר נושאים עם כותרות זהות, כפולות אם הם לא באותה הקטגוריה. ההגדרה allow_duplicate_topic_titles (לאפשר כותרות נושאים כפולות) חייבת להיות שקר."
@@ -1463,7 +1492,7 @@ he:
     site_description: "תארו את האתר הזה במשפט אחד, כפי שהוא מופיע במטא-תגית התיאור."
     short_site_description: "תיאור קצר, כפי שמתואר בתגית הכותרת באתר הבית."
     contact_email: "כתובת דוא״ל של איש קשר מוביל שאחראי על האתר הזה. משמש להתראות קריטיות, כמו גם לטובת טופס יצירת הקשר ב־<a href='%{base_path}/about' target='_blank'>‎/about</a> לטיפול בנושאים דחופים."
-    contact_url: "כתובת יצירת הקשר של האתר הזה. נעשה בה שימוש בטופס יצירת הקשר תחת <a href='%{base_path}/about' target='_blank'>‎/about</a> לטיפול בנושאים דחופים."
+    contact_url: "כתובת יצירת הקשר של האתר הזה. מופיעה בעמוד <a href='%{base_path}/about' target='_blank'>‎/about</a> לנושאים דחופים."
     crawl_images: "לקבל תמונות מכתובות מרוחקות כדי לציין את ממדי הרוחב והגובה הנכונים."
     download_remote_images_to_local: "המרת תמונות מרוחקות למקומיות על ידי הורדתן, פעולה זו מסייעת במניעת תמונות שבורות."
     download_remote_images_threshold: "שטח האחסון המזערי (באחוזים) הנדרש להורדת תמונות כדי לאחסן אותן מקומית"
@@ -1503,6 +1532,7 @@ he:
     mobile_logo_dark: "חלופה לערכת עיצוב כהה עבור הגדרת האתר ‚mobile logo’."
     large_icon: "תמונה שתשמש לסמלי נתוני על נוספים. אמורה להיות גדולה מאשר 512 × 512. אם השדה נשאר ריק, ייעשה שימוש ב־logo_small (לוגו קטן)."
     manifest_icon: "תמונה שתשמש בתור לוגו/תמונת פתיח ב־Android. גודלה ישתנה אוטומטית לכדי 512 × 512. במקרה של העדר בחירה, ייעשה שימוש ב־large_icon (סמל גדול)."
+    manifest_screenshots: "צילומי מסך שמציגים לראווה את היכולות והתכונות של העותק שלך בעמוד תהליך ההתקנה. כל התמונות חייבות להיות העלאות מקומיות ובאותם הממדים."
     favicon: "סמל האתר שלך, לפרטים <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://he.wikipedia.org/wiki/Favicon</a>. כדי שהסמל יפעל כראוי גם דרך CDN עליו להיות מסוג png. גודל הסמל ישתנה לכדי 32×32. בהעדר בחירה, ייעשה שימוש ב־large_icon."
     apple_touch_icon: "סמל שמשמש למכשירי מגע של Apple. גודלו ישתנה אוטומטית לכדי 180 × 180. במקרה של העדר בחירה ייעשה שימוש ב־large_icon (סמל גדול)."
     opengraph_image: "תמונת opengraph כבררת מחדל, נעשה בה שימוש כאשר לעמוד אין תמונות אחרות מתאימות. אם השדה נשאר ריק, ייעשה שימוש ב־large_icon (סמל גדול)."
@@ -1513,7 +1543,6 @@ he:
     detailed_404: "מספק פרטים נוספים למשתמשים בנוגע לסיבה שבגינה אין להם גישה לנושא מסוים. לתשומת לבך: מדובר בתצורה לא מאובטחת כיוון שמשתמשים ידעו אם כתובת מקשרת לנושא תקף."
     enforce_second_factor: "מאלץ משתמשים להפעיל אימות דו־שלבי. יש לבחור ב‚הכול’ כדי לאלץ את כל המשתמשים. יש לבחור ב‚סגל’ כדי לאכוף על חברי סגל בלבד."
     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: "כמות לייקים מזערית בנושא בטרם מופעל ‚תקציר לנושא זה’. שינויים בהגדרה זו יחולו רטרואקטיבית תוך שבוע."
@@ -1551,6 +1580,7 @@ he:
     must_approve_users: "על הסגל לאשר את כל חשבונות המשתמשים החדשים בטרם מתאפשרת כניסתם לאתר."
     invite_code: "על המשתמש להקליד את הקוד הזה כדי שיתאפשר לו להירשם לחשבון, כשריק אין לזה משמעות (אין משמעות לאותיות גדולות/קטנות)"
     approve_suspect_users: "הוספת משתמשים חשודים לתור הסקירה. משתמשים חשודים מילאו ביוגרפיה/אתר אבל לא קראו שום דבר."
+    review_every_post: "כל הפוסטים חייבים בסקירה. אזהרה! לא מומלץ לאתרים עמוסים."
     pending_users_reminder_delay: "יש להודיע למפקחים אם משתמשים חדשים ממתינים לעדכון מעבר לכמות כזו של שעות. יש להגדיר ל־‎-1 כדי לנטרל את ההתראות."
     persistent_sessions: "המשתמשים יישארו במערכת כאשר הדפדפן סגור"
     maximum_session_age: "משתמשים ישארו מחוברים ל n שעות מאז ביקורם האחרון"
@@ -1574,6 +1604,7 @@ he:
     content_security_policy: "הפעלת Content-Security-Policy (מדיניות אבטחת תוכן)"
     content_security_policy_report_only: "הפעלת Content-Security-Policy-Report-Only (מדיניות אבטחת תוכן בדיווח בלבד)"
     content_security_policy_collect_reports: "הפעלת איסוף דוחות הפרה של CSP (מדיניות אבטחת תוכן) תחת ‎/csp_reports"
+    content_security_policy_frame_ancestors: "להגביל מי יכול להטמיע את האתר הזה עם מסגרות iframes דרך CSP. ניתן לשלוח במארחים המורשים דרך <a href='%{base_path}/admin/customize/embedding'>הטמעה</a>"
     content_security_policy_script_src: "מקורות סקריפטים נוספים ברשימת ההיתר. המארח וה־CDN הנוכחיים נכללים כבררת מחדל. ניתן לעיין ב<a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>התקפות XSS בעזרת CSP - מדיניות אבטחת תוכן.</a>"
     invalidate_inactive_admin_email_after_days: "חשבונות מנהלים שלא ביקרו באתר מעל כמות כזו של ימים יאלצו לאמת מחדש את כתובת הדוא״ל שלהם כדי לשוב ולהיכנס. להגדיר כ־0 כדי לנטרל."
     top_menu: "החליטו אילו פריטים יופיעו בניווט עמוד הבית ובאיזה סדר לדוגמה |אחרונים|חדשים|קטגוריות|מובילים|נקראו|פורסמו|סימניות"
@@ -1621,27 +1652,27 @@ he:
     min_admin_password_length: "אורך ססמה מזערי לחברי הנהלה."
     password_unique_characters: "מספר מינימלי של תווים ייחודיים שחייבים להיות בסיסמאות."
     block_common_passwords: "אל תאפשרו סיסמאות מתוך 10,000 הסיסמאות הנפוצות ביותר."
-    external_auth_skip_create_confirm: בעת הרשמה דרך אימות חיצוני, יש לדלג על החלונית ליצירת חשבון. עדיף להשתמש לצד sso_overrides_email (דריסת דוא״ל מאימות חיצוני), sso_overrides_username (דריסת שם משתמש מאימות חיצוני) ו־sso_overrides_name (דריסת שם מאימות חיצוני).
-    external_auth_immediately: "להפנות למערת הכניסה החיצונית ללא מעורבות המשתמש. מתרחש רק כאשר login_required (נדרשת כניסה) הוא true (אמת) ויש לפחות שיטת אימות חיצונית אחת."
-    enable_sso: "הפעלת כניסה אחודה (Single Sign On) באמצעות אתר חיצוני (א-ז-ה-ר-ה: כתובות הדוא״ל של משתמשים *חייבות* לעבור אימות על ידי האתר החיצוני!)"
-    verbose_sso_logging: "תיעוד ניתוח מורחב בנושא SSO אל <a href='%{base_path}/logs' target='_blank'>‎/logs</a>"
-    enable_sso_provider: "הטמעת פרוטוקול ספק SSO מטעם Discourse תחת נקודת הקצה ‎/session/sso_provider, נדרשת הפעלת ההגדרה sso_provider_secrets (סודות ספק SSO)"
-    sso_url: "URL of single sign on endpoint (must include http:// or 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_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 (כברירת מחדל, נתיבי החזרה חייבים להיות באתר הנוכחי)"
-    enable_local_logins: "הפעלת חשבונות כניסה עם שם משתמש וססמה. יש להפעיל אפשרות זו כדי לאפשר שליחת הזמנות. אזהרה: השבתה עשויה למנוע את כניסתך אלמלא הגדרת לפחות שיטת כניסה חלופית אחת נוספת."
+    auth_skip_create_confirm: בעת הרשמה דרך אימות חיצוני, יש לדלג על החלונית ליצירת חשבון. עדיף להשתמש לצד auth_overrides_email (דריסת דוא״ל מאימות חיצוני), auth_overrides_username (דריסת שם משתמש מאימות חיצוני) ו־auth_overrides_name (דריסת שם מאימות חיצוני).
+    auth_immediately: "להפנות למערכת הכניסה החיצונית ללא מעורבות המשתמש. מתרחש רק כאשר login_required (נדרשת כניסה) הוא true (אמת) ויש לפחות שיטת אימות חיצונית אחת."
+    enable_discourse_connect: "הפעלת כניסה דרך DiscourseConnect (לשעבר ‚הכניסה האחודה של Discourse’) (אזהרה: *חובה* לאמת את כתובות הדוא״ל של המשתמשים על ידי האתר החיצוני!)"
+    verbose_discourse_connect_logging: "תיעוד ניתוח נרחב בכל מה שקשור ב־DiscourseConnect אל <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    enable_discourse_connect_provider: "הטמעת פרוטוקול ספק DiscourseConnect ‏(‚Discourse SSO’ לשעבר) בנקודת הגישה ‎/session/sso_provider, דורשת את ההגדרה discourse_connect_provider_secrets (סודות ספק השירות)"
+    discourse_connect_url: "כתובת נקודת הגישה אל DiscourseConnect (חייבת לכלול http://‎ או https://‎)"
+    discourse_connect_secret: "מחרוזת סודית המשמשת לאמת מידע של DiscourseConnect באופן מוצפן, נא לוודא שאורכה 10 תווים לפחות"
+    discourse_connect_provider_secrets: "רשימת צמדי סודות שמות תחום שמשתמשים ב־DiscourseConnect. עליך לוודא שאורך הסוד של DiscourseConnect הוא 10 תווים ומעלה. ניתן להשתמש בתו המכליל * כדי להרחיב את ההתאמה לכל שם תחום שהוא או לחלק מסוים משם תחום (למשל: ‎*.example.com)"
+    discourse_connect_overrides_bio: "דריסת הביוגרפיה בפרופיל המשתמש ומניעת השינוי מצד המשתמש"
+    discourse_connect_overrides_groups: "סנכרון כל החברויות הידניות בקבוצות מול הקבוצות שהוגדרו במאפיין הקבוצות (אזהרה: אם לא תצויינה קבוצות כל החברויות הידניות בקבוצות יוסרו עבור המשתמש)"
+    auth_overrides_email: "דריסת כתובת הדוא״ל המקומית בכתובת הדוא״ל מהאתר המרוחק עם כל כניסה למערכת ומניעת שינויים מקומיים. חל על כל ספקי האימות. (אזהרה: עשויות להופיע אי התאמות עקב שינויים באורך/דרישות שם המשתמש)"
+    auth_overrides_username: "דריסת שם המשתמש המקומי בשם המשתמש מהאתר המרוחק עם כל כניסה למערכת ומניעת שינויים מקומיים. חל על כל ספקי האימות. (אזהרה: עשויות להופיע אי התאמות עקב שינויים באורך/דרישות שם המשתמש)"
+    auth_overrides_name: "דריסת השם המלא המקומי בשם מלא חיצוני עם כל כניסה ולמנוע שינויים מקומיים. חל על כל ספקי האימות."
+    discourse_connect_overrides_avatar: "דריסת התמונה הייצוגית בתמונה ייצוגית חיצונית ממטען ה־DiscourseConnect. אם אפשרות זו פעילה, למשתמשים לא תהיה אפשרות להעלות תמונות ייצוגיות ל־Discourse."
+    discourse_connect_overrides_location: "דריסת מיקום המשתמש במיקום חיצוני ממטען ה־DiscourseConnect ולמנוע שינויים מקומיים."
+    discourse_connect_overrides_website: "דריסת אתר המשתמש במיקום חיצוני ממטען ה־DiscourseConnect ולמנוע שינויים מקומיים."
+    discourse_connect_overrides_profile_background: "דריסת רקע פרופיל המשתמש בתמונה ייצוגית חיצונית ממטען ה־DiscourseConnect."
+    discourse_connect_overrides_card_background: "דריסת רקע כרטיס המשתמש בתמונה ייצוגית חיצונית ממטען ה־DiscourseConnect."
+    discourse_connect_not_approved_url: "הפניית חשבונות DiscourseConnect ללא אישור לכתובת הזאת"
+    discourse_connect_allows_all_return_paths: "לא להגביל את שמות התחום של נתיבי החזרה (return_paths) שמסופקים על ידי DiscourseConnect (כבררת מחדל, נתיבי החזרה חייבים להיות באתר הנוכחי)"
+    enable_local_logins: "הפעלת חשבונות כניסה עם שם משתמש וססמה. אזהרה: השבתה עשויה למנוע את כניסתך אלמלא הגדרת לפחות שיטת כניסה חלופית אחת נוספת."
     enable_local_logins_via_email: "לאפשר למשתמשים לבקש לשלוח אליהם קישור לכניסה בלחיצה אחת בדוא״ל."
     allow_new_registrations: "לאפשר הרשמות של משתמשים חדשים. יש לבטל סימון זה כדי למנוע יצירת חשבונות חדשים."
     enable_signup_cta: "להציג מודעה למשתמשים אלמוניים חוזרים שמציעה להם להירשם כדי לקבל חשבון."
@@ -1679,12 +1710,11 @@ he:
     backup_gzip_compression_level_for_uploads: "רמת דחיסת Gzip המשמשת לדחיסת העלאות."
     include_thumbnails_in_backups: "לכלול בגיבוי תמונות ממוזערות שנוצרו. השבתת הגדרה זו יקטין את הגיבויים אך ידרוש להכין מחדש את כל הפוסטים לאחר שחזור."
     active_user_rate_limit_secs: "כל כמה זמן אנחנו מעדכנים את השדה 'last_seen_at', בשניות"
-    verbose_localization: "הצגת טיפים מורחבים של לוקליזציה בממשק המשתמש."
+    verbose_localization: "הצגת עצות תרגום נרחבות במנשק המשתמש"
     previous_visit_timeout_hours: "כמה זמן ביקור נארך לפני שהוא נחשב הביקור ה״קודם״, בשעות"
     top_topics_formula_log_views_multiplier: "מכפיל של לוג כמות הצפיות (n) בנוסחת הנושאים המובילים: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_first_post_likes_multiplier: "מכפיל של לייקים על הפוסט הראשון (n) בנוסת הנושאים המובילים: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "מכפיל של כמות לייקים מינימלית לפוסט (n) בנוסחת הנושאים המובילים: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "מספר הפוסטים הישנים לאפייה מחדש בכל 15 דקות."
     enable_safe_mode: "לאפשר למשתמשים להיכנס למצב בטוח כדי לנפות שגיאות בתוספים."
     rate_limit_create_topic: "לאחר יצירת נושא, על המשתמשים להמתין (n) שניות לפני יצירת נושא אחר."
     rate_limit_create_post: "לאחר הפרסום על המשתמשים להמתין (n) שניות לפני יצירת פוסט חדש."
@@ -1700,9 +1730,10 @@ he:
     max_topic_invitations_per_day: "מספר מירבי של הזמנות לנושא שמשתמשים יכולים לשלוח ביום. "
     max_logins_per_ip_per_hour: "מספר מקסימלי של התחברויות מורשות לכל כתובת IP בשעה"
     max_logins_per_ip_per_minute: "מספר מקסימלי של התחברויות מורשות לכתובת IP לדקה"
-    max_post_deletions_per_minute: "מספר הפוסטים המרבי שמשתמש יכול למחוק בדקה."
-    max_post_deletions_per_day: "מספר הפוסטים המרבי שמשתמש יכול למחוק ביום."
+    max_post_deletions_per_minute: "מספר הפוסטים המרבי שמשתמש יכול למחוק בדקה אחת. 0 ישבית מחיקת פוסטים."
+    max_post_deletions_per_day: "מספר הפוסטים המרבי שמשתמש יכול למחוק ביום אחד. 0 ישבית מחיקת פוסטים."
     invite_link_max_redemptions_limit: "כמות הניצולים המרבית שמורשית לקישורים הזמנה לא יכולה לעבור את הערך הזה."
+    invite_link_max_redemptions_limit_users: "כמות הניצולים המרבית שמורשית לקישורי הזמנה שנוצרו על ידי משתמשים רגילים לא יכולה לעבור את הערך הזה."
     alert_admins_if_errors_per_minute: "מספר השגיאות בדקה לפני ששולחים התראה למנהל. ערך של 0 מנטרל אפשרות זו. שימו לב: מצריך הרצה מחדש."
     alert_admins_if_errors_per_hour: "מספר השגיאות בשעה לפני ששולחים התראה למנהל. ערך של 0 מנטרל אפשרות זו. שימו לב: מצריך הרצה מחדש."
     categories_topics: "מספר הנושאים להציג בעמוד ה־‎/categories (קטגוריות). אם הוגדר ל־0, יתבצע ניסיון למצוא ערך שישאיר את שתי העמודות סימטריות (קטגוריות ונושאים)."
@@ -1724,6 +1755,8 @@ he:
     avatar_sizes: "רשימה של גדלי דמויות שנוצרת אוטומטית."
     external_system_avatars_enabled: "שימוש בשירות של מערכת אווטארים חיצונית."
     external_system_avatars_url: "כתובת של שירות דמויות חיצוני. החלפות מותרות הן {username} {first_letter} {color} {size}"
+    external_emoji_url: "כתובת שירות תמונות האמוג׳י החיצוני. ריק משבית את ההגדרה."
+    use_site_small_logo_as_system_avatar: "להשתמש בלוגו הקטן של האתר במקום התמונה הייצוגית של המשתמש מהמערכת. דורש שהלוגו יהיה קיים."
     restrict_letter_avatar_colors: "רשימה של ערכי צבעים בייצוג של 6 תווים הקסדצימליים לשימוש כרקע לאות מייצגת."
     selectable_avatars_enabled: "לאלץ משתמשים לבחור בתמונה ייצוגית מהרשימה."
     selectable_avatars: "רשימת תמונות ייצוגיות מהן המשתמשים יכולים לבחור."
@@ -1735,7 +1768,6 @@ he:
     strip_image_metadata: "הסרת מטה-דאטה מהתמונה"
     min_ratio_to_crop: "יחס לחיתוך תמונות גבוהות. יש להקליד את התוצאה ברוחב / גובה."
     simultaneous_uploads: "מספר הקבצים המרבי שניתן לגרור ולהשליך אל מחבר ההודעות"
-    enable_flash_video_onebox: "הפעלת הטמעת קישורי swf ו־flv (Flash מבית Adobe) בתיבות תחימה. אזהרה: עשוי לחשוף פרצות אבטחה."
     default_invitee_trust_level: "ברירת מחדל של רמת אמון (0-4) של משתמשים מוזמנים."
     default_trust_level: "רמת אמון (0-4) לכל המשתמשים החדשים. אזהרה! שינוי של משתנה זה שם אתכם בסיכון רציני לספאם."
     tl1_requires_topics_entered: "כמה נושאים משתמשים חדשים צריכים להתחיל עד שישודרגו לרמת אמון 1."
@@ -1769,6 +1801,7 @@ he:
     min_trust_to_edit_post: "דרגת האמון המזערית הנדרשת לעריכת פוסטים."
     min_trust_to_allow_self_wiki: "דרגת האמון המזערית הנדרשת להפיכת פוסט עצמי של משתמש לוויקי."
     min_trust_to_send_messages: "דרגת האמון המזערית שנדרשת ליצירת הודעות פרטיות."
+    min_trust_to_send_email_messages: "דרגת האמון המזערית שנדרשת לשליחת הודעות פרטיות בדוא״ל."
     min_trust_to_flag_posts: "דרגת האמון המזערית הנדרשת לסימון פוסטים בדגל"
     min_trust_to_post_links: "דרגת האמון המזערית להוספת קישורים לפוסטים"
     min_trust_to_post_embedded_media: "דרגת האמון המזערית הנדרשת להטמעת מדיה בפוסט"
@@ -1788,13 +1821,14 @@ he:
     create_thumbnails: "יצירת תמונות מוקטנות והארת תמונות גדולות מידי מלהיכלל בפוסט."
     email_time_window_mins: "המתינו (n) דקות לפני משלוח כל התראת מייל, כדי לאפשר למשתמשים הזדמנות לערוך ולוודא באופן סופי את הפוסטים שלהם."
     personal_email_time_window_seconds: "להמתין (n) שניות בטרם שליחת הודעות בדוא״ל עם התראות על הודעות אישיות, כדי לתת למשתמשים הזדמנות לסיים את עריכת ההודעות שלהם."
-    email_posts_context: "כמה תגובות קודמות יש לכלול כהקשר במיילים עם התראות."
+    email_posts_context: "כמה תגובות קודמות יש לכלול כהקשר בהתראות בדוא״ל."
     flush_timings_secs: "באיזו תדירות אנחנו מזרימים מידע לשרת, בשניות."
     title_max_word_length: "האורך המקסימלי המותר למילה בכותרת נושא, בתווים. "
     title_min_entropy: "האנטרופיה (תווים ייחודים שאינם בשפת הכתיבה) המינימלית הנדרשת בכותרת נושא."
     body_min_entropy: "האנטרופיה (תוים ייחודיים, תווים שאינם באנגלית נחשבים יותר) המינימלית הנדרשת בגוף הפוסט."
     allow_uppercase_posts: "אפשרו אותיות אנגליות גדולות (Capitalized) בכותרת נושא או בגוף פוסט."
     max_consecutive_replies: "מספר הפוסטים שמשתמש עושה ברצף בתוך נושא בטרם החלת איסור על הוספת תגובות."
+    enable_filtered_replies_view: 'הכפתור „(n) תגובות” מצמצם את כל הפוסטים האחרים ומציג רק את הפוסט הנוכחי ואת התגובות עליו.'
     title_fancy_entities: "המרת תווי ASCII נפוצים ליישויות HTML מהודרות בכותרות הנושאים, בסגנון SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "האורך המינימלי של כותרת לפני שהיא נבדקת עבור איתור נושאים דומים."
     desktop_category_page_style: "סגנון ויזואלי לדף /categories."
@@ -1848,6 +1882,7 @@ he:
     reviewable_claiming: "האם צריך לדרוש תוכן שמיועד לסקירה לפני שאפשר לפעול לגביו?"
     reviewable_default_topics: "הצגת תוכן שמיועד לסקירה בקיבוץ לפי נושא כבררת מחדל"
     reviewable_default_visibility: "לא להציג פריטים שמיועדים לסקירה אלמלא הם תואמים את העדיפות הזו"
+    reviewable_low_priority_threshold: "מסנן העדיפות מסתיר פריטים לסקירה שלא תואמים לציון אלא אם כן נעשה שימוש במסנן ‚(כלשהו)’"
     high_trust_flaggers_auto_hide_posts: "פוסטים של משתמש חדש מוסתרים אוטומטים לאחר שסומנו כספאם על ידי משתמש בדרגת אמון 3 ומעלה"
     cooldown_hours_until_reflag: "כמה זמן יהיה על משתמשים לחכות לפני שיוכלו לסמן פוסט כספאם פעם נוספת"
     reply_by_email_enabled: "הפעלת תגובה לנושאים דרך דוא״ל."
@@ -1858,17 +1893,17 @@ he:
     disable_emails: "למנוע מ־Discourse לשלוח כל סוג של הודעות דוא״ל. יש לבחור ב־‚כן’ כדי לנטרל את כל הודעות הדוא״ל לכל המשתמשים. ניתן גם לבחור ב־‚ללא סגל’ כדי לנטרל את ההודעות למשתמשים שאינם נמנים עם הסגל."
     strip_images_from_short_emails: "הסרת תמונות מהודעות דוא״ל שגודלן אינו עולה על 2800 בתים"
     short_email_length: "אורכו של דוא״ל קצר בבתים"
-    display_name_on_email_from: "הצגת שמות מלאים בשדה ה״מאת״ במיילים"
+    display_name_on_email_from: "להציג שמות מלאים בשדה „מאת” בדוא״ל"
     unsubscribe_via_email: "אפשרו למשתמשים לבטל מנוי אימייל באמצעות שליחת מייל עם המילה ״unsubscribe״ בנושא או גוף המייל"
-    unsubscribe_via_email_footer: "צירוף ״ביטול מנוי באמצעות קישור מייל mailto:״ בתחתית מיילים נשלחים"
-    delete_email_logs_after_days: "מחיקת יומני מיילים אחרי (N) ימים. 0 ישמור אותם ללא הגבלה"
+    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 למשלוח ללא הגבלה."
+    max_emails_per_day_per_user: "המספר המרבי של הודעות דוא״ל שניתן לשלוח למשתמש ביום. 0 להשבתת ההגבלה."
     enable_staged_users: "יצירת משתמשים מבוימים באופן אוטומטי בזמן עיבוד הודעות דוא״ל נכנסות."
     maximum_staged_users_per_email: "מספר מרבי של משתמשים מבוימים שנוצרים בזמן עיבוד הודעת דוא״ל נכנסת."
     auto_generated_allowlist: "רשימת כתובות דואר מהן לא ייבדק אם התוכן נוצר-אוטומטית. למשל: foo@bar.com|discourse@bar.com"
-    block_auto_generated_emails: "חסימת מיילים נכנסים שמזוהים ככאלו שנוצרו אוטומטית."
-    ignore_by_title: "התעלמות ממיילים נכנסים לפי הכותרת שלהם."
+    block_auto_generated_emails: "לחסום הודעות דוא״ל נכנסות שזוהו ככאלו שנוצרו אוטומטית."
+    ignore_by_title: "להתעלם מהודעות דוא״ל נכנסות לפי הכותרת שלהן."
     mailgun_api_key: "מפתח API סודי של Mailgun לאימות של הודעות webhook."
     soft_bounce_score: "ניקוד-החזר מתווסף למשתמש כאשר מתרחשת החזרה זמנית."
     hard_bounce_score: "ניקוד-החזר מתווסף למשתמש כאשר מתרחשת החזרה קבועה."
@@ -1878,8 +1913,9 @@ he:
     blocked_attachment_filenames: "רשימת מילות מפתח לרשימת חסימה של קבצים מצורפים לפי שם."
     forwarded_emails_behaviour: "איך להתייחס להודעת דוא״ל שהועברה ל־Discourse"
     always_show_trimmed_content: "תמיד להציג מקטע חלקי מתוך הודעות דוא״ל נכנסות. אזהרה: עשוי לחשוף כתובות דוא״ל."
+    trim_incoming_emails: "לחתוך את החלק בהודעות הדוא״ל הנכנסות שאינו רלוונטי."
     private_email: "לא כלול תוכן מפוסטים או נושאים בכותרת או בגוף הודעת הדוא״ל. לתשומת לבך: גם הודעות התמצית תבוטלנה."
-    email_total_attachment_size_limit_kb: "הגודל הכולל המרבי של קבצים שמצורפים להודעות דוא״ל יוצאות. 0 כדי לנטרל שליחת צרופות."
+    email_total_attachment_size_limit_kb: "הגודל הכולל המרבי של קבצים שמצורפים להודעות דוא״ל יוצאות בקילו בתים. 0 כדי להשבית שליחת צרופות."
     post_excerpts_in_emails: "בהודעות ההתראה, תמיד לשלוח מקטעים קצרים במקום את כל הפוסט"
     raw_email_max_length: "כמה תווים יאוחסנו מדוא״ל שנכנס."
     raw_rejected_email_max_length: "כמה תווים יאוחסנו מדוא״ל שנדחה."
@@ -2004,7 +2040,7 @@ he:
     show_create_topics_notice: "אם לאתר פחות מ־5 נושאים פומביים, יש להציג מודעה המבקשת מהמנהלים ליצור נושאים נוספים."
     delete_drafts_older_than_n_days: "מחקו טיוטות בנות יותר מ (n) ימים."
     bootstrap_mode_min_users: "מספר משתמשים מינימלי שנדרש כדי לנטרל מצב איתחול (קבעו ל 0 כדי לנטרל)"
-    prevent_anons_from_downloading_files: "למנוע ממשתמשים אלמוניים להוריד קבצים מצורפים. אזהרה: הגדרה זו תמנע מכל קובץ מצורף שהוא משאב שאינו תמונה לעבוד."
+    prevent_anons_from_downloading_files: "למנוע ממשתמשים אלמוניים להוריד קבצים מצורפים."
     secure_media: 'מגביל גישה לכל ההעלאות (תמונות, סרטונים, שמע, טקסט, קובצי PDF, ארכיוני zip ועוד). אם מופעלת האפשרות „דרישת כניסה”, רק משתמשים שנכנסו למערכת יכולים לגשת להעלאות. אחרת, הגישה תוגבל רק להעלאות מסוגי מדיה בהודעות פרטיות ובקטגוריות פרטיות. אזהרה: מדובר בהגדרה מסובכת שדורשת הבנה עמוקה בניהול המערכת. יש לעיין ב<a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">נושא המדיה המאובטחת ב־Meta</a> לקבלת פרטים נוספים.'
     secure_media_allow_embed_images_in_emails: "מאפשר להטמיע תמונות מאובטחות שבדרך כלל יידחסו אם הגודל שלהן קטן מההגדרה ‚secure media max email embed image size kb’ (גודל תמונה מרבי להטמעה כמדיה מאובטחת בקילובתים)."
     secure_media_max_email_embed_image_size_kb: "גודל החיתוך לתמונות מאובטחות שיוטמעו בהודעות דוא״ל אם ההגדרה ‚secure media allow embed in emails’ (לאפשר הטמעת מדיה מאובטחת בהודעות דוא״ל) פעילה. אם ההגדרה הזאת אינה פעולה להגדרה זו אין שום משמעות."
@@ -2025,6 +2061,7 @@ he:
     code_formatting_style: "כפתור קוד בדפדפן יציע אוטומטית סגנון קידוד זה"
     max_allowed_message_recipients: "מספר מקסימלי של נמענים מותר בהודעה."
     watched_words_regular_expressions: "מילים במעקב הן ביטויים רגולריים."
+    enable_diffhtml_preview: "יכולת ניסיונית שמשתמשת ב־diffHTML כדי לסנכרן תצוגה מקדימה במקום עיבוד מלא מחדש"
     old_post_notice_days: "ימים לפני שהתראת נושא מתיישנת"
     new_user_notice_tl: "דרגת האמון המזערית הדרושה לצפייה בהתראות על פוסט של משתמש חדש."
     returning_user_notice_tl: "דרגת האמון המזערית הדרושה לצפייה בהתראות משתמש חוזר."
@@ -2033,13 +2070,14 @@ he:
     blur_tl0_flagged_posts_media: "לטשטש פוסטים שסומנו בדגל כדי להסתיר תוכן שעוי להיות פוגעני."
     enable_page_publishing: "לאפשר לחברי סגל לפרסם נושאים לכתובות חדשות עם סגנון עצמאי."
     show_published_pages_login_required: "משתמשים אלמוניים יכולים לראות דפים שפורסמו, אפילו כשנדרשת כניסה למערכת."
+    skip_auto_delete_reply_likes: "בעת מחיקה אוטומטית של תגובות ישנות, לדלג על פוסטים עם כמות כזאת או יותר של לייקים."
     default_email_digest_frequency: "באיזו תדירות משתמשים יקבלו סיכומי מיילים כברירת מחדל."
     default_include_tl0_in_digests: "כללו פוסטים ממשתמשים חדשים בדוא\"ל מסכם כברירת מחדל. משתמשים יוכלו לשנות זאת בהעדפות האישיות."
     default_email_level: "הגדרת רמת ההתראה בדוא״ל כבררת מחדל לנושאים רגילים."
     default_email_messages_level: "הגדרת רמת ההתראה בדוא״ל כבררת מחדל בעת שליחת הודעה למשתמש."
     default_email_mailing_list_mode: "שלח מייל עבור כל פוסט חדש בתור ברירת מחדל. "
     default_email_mailing_list_mode_frequency: "משתמשים שאיפשרו את מצב רשימת התפוצה יקבלו מיילים בתדירות זו כברירת מחדל."
-    disable_mailing_list_mode: "לא לאפשר למשתמשים לעבור למצב רשימת תפוצה."
+    disable_mailing_list_mode: "לאסור על משתמשים להפעיל את מצב רשימת הדיוור (מונע שליחת הודעות דיוור.)"
     default_email_previous_replies: "כלילת תגובות קודמות במיילים כברירת מחדל."
     default_email_in_reply_to: "הכללת קטע של פוסט עליו עונים במיילים כברירת מחדל."
     default_other_new_topic_duration_minutes: "ברירת המחדל הגלובאלית עבור תנאי שבשבילו נושא ייחשב חדש."
@@ -2069,7 +2107,6 @@ he:
     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 של משתמש. בסימן התו־כל * ניתן להשתמש כדי ללכוד חלק ממנה (למשל: www.example.com/*‎)."
     allowed_user_api_push_urls: "URLים מורשים לדחיפת שרת ל API של משתמשים."
@@ -2079,7 +2116,6 @@ he:
     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>."
@@ -2093,6 +2129,7 @@ he:
     governing_law: "החוק המחייב"
     city_for_disputes: "עיר המחלוקת"
     shared_drafts_category: "הפעלת תכונת הטיוטות המשותפות על ידי הקצאת קטגוריה שתשמש לטובת טיוטות לנושאים. נושאים בקטגוריה זו יוסתרו מרשימות הנושאים לחברי הסגל."
+    shared_drafts_min_trust_level: "לאפשר למשתמשים לראות ולערוך טיוטות משותפות."
     push_notifications_prompt: "הצגת בקשה להסכמת המשתמש."
     push_notifications_icon: "סמל העיטור שמופיע בפינת ההתרעה. מומלץ PNG בצבעים אחידים עם שקיפות בגודל 96 × 96."
     base_font: "גופן בסיס לשימוש רוב הטקסט באתר. ערכות עיצוב יכולות לדרוס אותו באמצעות מאפיין ה־CSS‏ ‎`--font-family`‎."
@@ -2121,6 +2158,7 @@ he:
       invalid_string_min_max: "חייב להיות בין %{min} ל- %{max} תווים."
       invalid_string_min: "חייב להיות לפחות %{min} תווים."
       invalid_string_max: "נדרשים לא יותר מ-%{max} תווים."
+      invalid_json: "JSON פגום."
       invalid_reply_by_email_address: "הערך חייב להכיל '%{reply_key}' ולהיות שונה ממייל ההתראה."
       invalid_alternative_reply_by_email_addresses: "על כל הערכים לכלול ‚%{reply_key}’ ולהיות שונים מהדוא״ל לעדכונים."
       pop3_polling_host_is_empty: "עליכם לקבוע 'שרת תשאול pop3' לפני שתאפשרו תשאול POP3."
@@ -2134,8 +2172,8 @@ he:
       email_editable_enabled: "עליך לנטרל את ‚עריכת דוא״ל אפשרית’ בטרם הפעלת הגדרה זו."
       staged_users_disabled: "עליך לאפשר ‚משתמשים מבוימים’ בטרם הפעלת הגדרה זו."
       reply_by_email_disabled: "עליך להפעיל את ‚תגובה בדוא״ל’ בטרם הפעלת הגדרה זו."
-      sso_url_is_empty: "עליך להגדיר ‚כתובת SSO’ בטרם הפעלת הגדרה זו."
-      sso_invite_only: "לא ניתן להפעיל SSO ולסגור להזמנות בלבד בעת ובעונה אחת."
+      discourse_connect_url_is_empty: "עליך להגדיר ‚כתובת discourse connect’ בטרם הפעלת הגדרה זו."
+      discourse_connect_invite_only: "לא ניתן להפעיל את DiscourseConnect ולסגור להזמנות בלבד בעת ובעונה אחת."
       enable_local_logins_disabled: "עליך תחילה להפעיל את ‚הפעלת כניסה מקומית’ בטרם הפעלת הגדרה זו."
       min_username_length_exists: "לא ניתן להגדיר את האורך המזערי לשם המשתמש לפחות תווים מאשר שם המשתמש הקצר ביותר במערכת (%{username})."
       min_username_length_range: "לא ניתן לקבוע את המינימום מעל המקסימום."
@@ -2144,19 +2182,17 @@ he:
       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’."
-        high_weight_invalid: "לא ניתן להגדיר את המשקל לפחות או שווה ל־1 או מעל ‚category_search_priority_very_high_weight’ (משקל כבד מאוד לעדיפות חיפוש בקטגוריה)"
-        very_high_weight_invalid: "לא ניתן להגדיר משקל מתחת ל־‚category_search_priority_high_weight’ (משקל גבוה לעדיפות חיפוש בקטגוריות)."
+        low_weight_invalid: "אי אפשר להגדיר את המשקל ל־1 ומעלה."
+        high_weight_invalid: "אי אפשר להגדיר את המשקל ל־1 ומטה."
       allowed_unicode_usernames:
         regex_invalid: "הביטוי הרגולרי שגוי: %{error}"
         leading_trailing_slash: "אסור שהביטוי הרגולרי יתחיל או יסתיים בלוכסן."
       unicode_usernames_avatars: "התמונות הייצוגיות הפנימיות של המערכת אינן תומכות בשמות משתמשים עם יוניקוד."
       list_value_count: "הרשימה חייבת להכיל בדיוק %{count} ערכים."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "סוד SSO"
+        value: "סוד של DiscourseConnect"
   search:
     extreme_load_error: "האתר נתון תחת עומס קיצוני, החיפוש מושבת, נא לנסות שוב בהמשך"
     within_post: "#%{post_number} פוסטים של %{username}"
@@ -2167,20 +2203,22 @@ he:
     results_page: "תוצאות לחיפוש אחר ‚%{term}’"
     audio: "[שמע]"
     video: "[וידאו]"
-  sso:
-    login_error: "תקלת התחברות"
-    not_found: "לא מצאנו את החשבון שלכם. אנא צרו קשר עם מנהל האתר."
+  discourse_connect:
+    login_error: "שגיאת כניסה"
+    not_found: "החשבון שלך לא נמצא. נא ליצור קשר עם הנהלת האתר."
     account_not_approved: "החשבון שלך ממתין לאישור. תישלח אליך הודעת דוא״ל לעדכון כאשר הוא יאושר."
-    unknown_error: "יש בעיה עם החשבון שלכם. אנא צרו קשר עם מנהל האתר."
-    timeout_expired: "הכניסה לחשבון פקעה, אנא נסו להתחבר שוב."
-    no_email: "לא סופקה כתובת דוא״ל. נא ליצור קשר עם מנהל האתר."
+    unknown_error: "יש בעיה עם החשבון שלך. נא ליצור קשר עם הנהלת האתר."
+    timeout_expired: "זמן ההמתנה לכניסה לחשבון פגה, נא לנסות להיכנס שוב."
+    no_email: "לא סופקה כתובת דוא״ל. נא ליצור קשר עם הנהלת האתר."
     blank_id_error: "ה־`external_id` (מזהה חיצוני) נדרש אבל נותר ריק"
     email_error: "לא ניתן להירשם לחשבון עם כתובת הדוא״ל <b>%{email}</b>. נא ליצור קשר עם הנהלת האתר."
-    missing_secret: "הזדהות SSO נכשלה בשל secret חסר. יש ליצור קשר עם מנהלי האתר כדי לתקן בעיה זו."
+    missing_secret: "האימות נכשל כי חסר סוד. יש ליצור קשר עם ההנהלה כדי לתקן את התקלה הזאת."
+    invite_redeem_failed: "ניצול ההזמנה נכשל. נא ליצור קשר עם הנהלת האתר."
   original_poster: "מפרסמים מקוריים"
   most_posts: "מירב הפוסטים"
   most_recent_poster: "המפרסמים האחרונים"
   frequent_poster: "מפרסמים מתמידים"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "ברוכים הבאים לקהילה! אלה הנושאים הפופולריים האחרונים אצלנו."
     not_seen_in_a_month: "ברוך שובכם! לא ראינו אתכם כבר כמה זמן, אה? הנה כמה נושאים פופולאריים שהתווספו מאז שהייתם כאן."
@@ -2193,6 +2231,7 @@ he:
     errors:
       different_topics: "לא ניתן למזג פוסטים ששייכים לנושאים שונים."
       different_users: "לא ניתן למזג פוסטים ששייכים למשתמשים שונים."
+      max_post_length: "לא ניתן למזג את הפוסטים כיוון שאורך הפוסט המשולב ארוך מהמותר."
   move_posts:
     new_topic_moderator_post:
       one: "אחד הפוסטים פוצל לנושא חדש: %{topic_link}"
@@ -2352,8 +2391,20 @@ he:
   admin:
     email:
       sent_test: "נשלח!"
+    user:
+      merge_user:
+        updating_username: "שם המשתמש מעודכן…"
+        changing_post_ownership: "הבעלות על הפוסט מתחלפת…"
+        merging_given_daily_likes: "הלייקים היומיים שחולקו ממוזגים…"
+        merging_post_timings: "תזמוני הפוסטים ממוזגים…"
+        merging_user_visits: "ביקורי המשתמש מתמזגים…"
+        updating_site_settings: "הגדרות האתר מתמזגות…"
+        updating_user_stats: "סטטיסטיקת המשתמש מתעדכנת…"
+        merging_user_attributes: "מאפייני המשתמש מתמזגים…"
+        updating_user_ids: "מזהי המשתמש מתעדכנים…"
+        deleting_source_user: "משתמש המקור נמחק…"
   user:
-    deactivated: "הושבת בעקבות מיילים רבים מידי שהוחזרו ל '%{email}'."
+    deactivated: "הושבת בעקבות כמות גדולה מדי של הודעות דוא״ל שהוחזרו אל ‚%{email}’."
     deactivated_by_staff: "הושבת על ידי הצוות"
     deactivated_by_inactivity:
       one: "להשבית אוטומטית לאחר יום (%{count}) ללא פעילות"
@@ -2636,6 +2687,19 @@ he:
         הקהילה סימנה את הפוסט הזה בדגל והוא מוסתר כעת. **כיוון שהפוסט הזה הוסתר למעלה מפעם אחת, הפוסט שלך יוסתר מעתה ועד לסריקה מצד חבר סגל.**
 
         להנחיות נוספות, נא לפנות אל [הנחיות הקהילה](%{base_url}/guidelines).
+    queued_by_staff:
+      title: "הפוסט זקוק לאישור"
+      subject_template: "הפוסט הוסתר על ידי הצוות, בהמתנה לאישור"
+      text_body_template: |
+        שלום,
+
+        זו הודעה אוטומטית מהאתר %{site_name} שנועדה לעדכן אותך שהפוסט שלך הוסתר.
+
+        <%{base_url}%{url}>
+
+        הפוסט שלך יישאר מוסתר על שמישהו מחברי הסגל יסקור אותו.
+
+        להנחיות נוספות ניתן לגשת אל [הנחיות הקהילה](%{base_url}/guidelines) שלנו.
     flags_disagreed:
       title: "פוסט שסומן בגדל שוחזר על ידי הסגל"
       subject_template: "פוסט שסומן בגדל שוחזר על ידי הסגל"
@@ -2655,19 +2719,15 @@ he:
       title: "הפוסט שסומן הוסר על ידי הסגל"
       subject_template: "הפוסט שסומן הוסר על ידי הסגל"
       text_body_template: |
-        שלום רב,
-
-        זו הודעה אוטומטית מאת %{site_name} שנועדה ליידע אותך כי [הפוסט שלך](%{base_url}%{url}) הוסר.
+        זו הודעה אוטומטית מהאתר %{site_name} כדי ליידע אותך שה[פוסט שלך](%{base_url}%{url}) הוסר.
 
         %{flag_reason}
 
-        הפוסט הזה סומן בדגל על ידי הקהילה וחבר סגל הורה להסיר אותו.
+        הפוסט הזה סומן על ידי הקהילה וחברי הסגל בחרו להסיר אותו.
 
-        [details="יש ללחוץ כדי להרחיב את הפוסטים שנמחקו"]
         ``` markdown
         %{flagged_post_raw_content}
         ```
-        [/details]
 
         נא לקרוא בעיון את [הנחיות הקהילה](%{base_url}/guidelines) שלנו לפרטים נוספים.
     usage_tips:
@@ -2721,9 +2781,11 @@ he:
     tl2_promotion_message:
       subject_template: "ברכותינו על התקדמותך בסולם דרגות האמון!"
       text_body_template: |
-        קידמנו אותך בסולם [דרגות האמון](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+        קידמנו אותך ב[דרגת אמון](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) נוספת!
 
-        אנו מעודדים אותך להמשיך ולגלות מעורבות – נוכחותך חשובה לנו.
+        בזכות היכולות המתקדמות שרכשת, יכול להיות ש[רשימת העצות והתכסיסים השימושיים](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/) תעניין אותך.
+
+        מזמינים אותך להמשיך ולהשתתף בפעילות - נוכחותך חשובה לנו.
     backup_succeeded:
       title: "גיבוי הצליח"
       subject_template: "הגיבוי הושלם בהצלחה."
@@ -2778,7 +2840,7 @@ he:
       title: "הזמנה קבוצתית נכשלה"
       subject_template: "ההזמנה המרוכזת עובדה עם שגיאות"
       text_body_template: |
-        ההזמנה הקבוצתית שלך עברה עיבור,  %{sent} הזמנות נשלחו בדוא״ל עם %{failed} תקלה/ות.
+        ההזמנה הקבוצתית שלך עברה עיבוד, %{sent} הזמנות נשלחו בדוא״ל עם %{failed} תקלה/ות.
 
         הנה התיעוד:
         ``` text
@@ -2842,9 +2904,9 @@ he:
       title: "מייל נדחה, משתמש לא פעיל"
       subject_template: "[%{email_prefix}] בעיית מייל -- משתמש לא-פעיל"
       text_body_template: |
-        אנחנו מצטערים, אך הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
+        הודעת הדוא״ל שלך אל %{destination} (עם הכותרת %{former_title}) לא נשלחה, מחילה.
 
-        החשבון שלכם שמקושר לכתובת המייל הזו לא הופעל. אנא הפעילו את החשבון שלכם לפני שאתם שולחים מיילים למערכת.
+        החשבון שלך שמקושר לכתובת הדוא״ל הזו לא הופעל. נא להפעיל את החשבון שלך בטרם שליחת הודעות למערכת.
     email_reject_silenced_user:
       title: "דחיית דוא״ל עקב השתקה על משתמש"
       subject_template: "[%{email_prefix}] בעיית דוא״ל -- משתמש מושתק"
@@ -2933,9 +2995,17 @@ he:
       title: "דחיית דוא״ל כתובת יעד שגויה"
       subject_template: "[%{email_prefix}] בעיית דוא״ל -- כתובת אל: לא מוכרת"
       text_body_template: |
-        ההודעה שניסית לשלוח בדוא״ל אל %{destination} (עם הכותרת %{former_title}) לא נשלחה, עמך הסליחה.
+        אנו מתנצלים אך הודעת הדוא״ל שלך אל %{destination} (עם הכותרת %{former_title}) לא הועברה.
 
-        יכול להיות שיש לך יותר מכתובת דוא״ל אחת? ניסית לענות מכתובת דוא״ל אחרת? תגובות בדוא״ל דורשות שימוש באותה כתובת הדוא״ל גם למענה. לחלופין, ייתכן שכותרת מזהה ההודעה (Message-ID) השתנתה.
+        הנה מה אפשר לבדוק:
+
+          - יש לך יותר מכתובת דוא״ל אחת? הגבת מכתובת דוא״ל שונה מזו שהשתמשת בה במקור? תגובות דוא״ל דורשות ממך להשתמש באותה כתובת הדוא״ל כדי להגיב.
+
+          - האם תכנית הדוא״ל שלך השתמשה בכתובת הדוא״ל שב־Reply-To:‎ (להגיב אל) כדי להגיב? לרוע המזל, חלק מתכניות הדוא״ל שולחות בשוגג לכתובת ה־From:‎ (מאת), שלא עבדה.
+
+          - האם כותרת ה־Message-ID (מזהה הודעה) בהודעה התחלפה? ה־Message-ID חייב להיות אחיד ולא להתחלף.
+
+        אפשר להציע עזרה נוספת? ניתן ליצור אתנו קשר דרך פרטי יצירת הקשר בכתובת ‎%{base_url}/about
     email_reject_old_destination:
       title: "דחיית דוא״ל יעד ישן"
       subject_template: "[%{email_prefix}] בעיית דוא״ל -- ניסית להגיב להתראה ישנה"
@@ -3001,11 +3071,11 @@ he:
       title: "התראת בעיית מייל"
       subject_template: "[%{email_prefix}] בעיית מייל -- בעיית אימות POP"
       text_body_template: |
-        למרבה הצער, ארעה תקלה בזמן תשאול מיילים משרת ה POP.
+        למרבה הצער התרחשה שגיאת אימות בעת תשאול הודעות דוא״ל משרת ה־POP.
 
-        אנא וודאו שקבעתם נכון את הרשאות ה POP ב[הגדרות האתר](%{base_url}/admin/site_settings/category/email).
+        נא לוודא שהגדרת את הרשאות ה־POP ב[הגדרות האתר](%{base_url}/admin/site_settings/category/email) כראוי.
 
-        אם יש ממשק ווב לחשבון ה POP, ייתכן ותצטרכו להתחבר לאתר וקבוע את ההגדרות שלכם שם.
+        אם לחשבון הדוא״ל POP יש מנשק גישה דרך הדפדפן, מוטב להיכנס אליו ולבדוק את ההגדרות שם.
     email_revoked:
       title: "דוא״ל נשלל"
       subject_template: "כתובת הדוא״ל שלך נכונה?"
@@ -3154,10 +3224,10 @@ he:
   user_notifications:
     previous_discussion: "תגובות קודמות"
     reached_limit:
-      one: "שימו לב: אנחנו שולחים לכל היותר מייל %{count} יומי. בידקו באתר כדי לראות את אלו שעלולים להשאר מאחור."
-      two: "שימו לב: אנחנו שולחים לכל היותר %{count} מיילים יומיים. בידקו באתר כדי לראות את אלו שעלולים להשאר מאחור. נ.ב: תודה שאתם פופולאריים!"
-      many: "שימו לב: אנחנו שולחים לכל היותר %{count} מיילים יומיים. בידקו באתר כדי לראות את אלו שעלולים להשאר מאחור. נ.ב: תודה שאתם פופולאריים!"
-      other: "שימו לב: אנחנו שולחים לכל היותר %{count} מיילים יומיים. בידקו באתר כדי לראות את אלו שעלולים להשאר מאחור. נ.ב: תודה שאתם פופולאריים!"
+      one: "לתשומת לבך: אנו שולחים הודעת דוא״ל %{count} בכל יום לכל היותר. מומלץ לבדוק באתר אם יש כאלו שהוחזקו."
+      two: "לתשומת לבך: אנו שולחים %{count} הודעות דוא״ל בכל יום לכל היותר. מומלץ לבדוק באתר אם יש כאלו שהוחזקו. דרך אגב, תודה על הפופולריות שלך!"
+      many: "לתשומת לבך: אנו שולחים %{count} הודעות דוא״ל בכל יום לכל היותר. מומלץ לבדוק באתר אם יש כאלו שהוחזקו. דרך אגב, תודה על הפופולריות שלך!"
+      other: "לתשומת לבך: אנו שולחים %{count} הודעות דוא״ל בכל יום לכל היותר. מומלץ לבדוק באתר אם יש כאלו שהוחזקו. דרך אגב, תודה על הפופולריות שלך!"
     in_reply_to: "בתגובה ל"
     unsubscribe:
       title: "ביטול מנוי"
@@ -3357,18 +3427,14 @@ he:
       text_body_template: |
         הושעית מהפורום עד %{suspended_till}.
 
-        %{reason}
-
-        %{message}
+        סיבה - %{reason}
     account_silenced:
       title: "חשבון מושתק"
       subject_template: "[%{email_prefix}] חשבונך הושתק"
       text_body_template: |
-        קולך בפורום הושתק עד %{silenced_till}.
+        הושתקת בפורום עד %{silenced_till}.
 
-        %{reason}
-
-        %{message}
+        סיבה - %{reason}
     account_exists:
       title: "החשבון כבר קיים"
       subject_template: "[%{email_prefix}] החשבון כבר קיים"
@@ -3532,6 +3598,13 @@ he:
         אנו דוגלים ב[התנהלות קהילתית מתורבתת](%{base_url}/guidelines) בכל עת.
 
         השתתפות מהנה!
+    signup_after_reject:
+      title: "הרשמה לאחר דחייה"
+      subject_template: "נדחית מהאתר %{site_name}"
+      text_body_template: |
+        מישהו מחברי הסגל דחה את החשבון שלך באתר %{site_name}.
+
+        %{reject_reason}
     signup:
       title: "הרשמה"
       subject_template: "[%{email_prefix}] אשרו את חשבונכם החדש"
@@ -3569,8 +3642,16 @@ he:
         אם זאת הייתה פעילות שלך, נהדר! לא צריך לעשות שום דבר.
 
         אם לא מדובר בפעולות מטעמך, אנא [לסקור את ההפעלות הנוכחיות שלך](%{base_url}/my/preferences/account) לצד שיקול בכובד ראש להחלפת הססמה שלך.
+    post_approved:
+      title: "הפוסט שלך אושר"
+      subject_template: "[%{site_name}] הפוסט שלך אושר"
+      text_body_template: |
+        שלום,
+
+        זו הודעה אוטומטית מהאתר %{site_name} שנשלחה כדי להודיע לך ש[ההודעה שלך] (%{base_url}%{post_url}) אושרה.
   page_forbidden:
     title: "אופס! זה עמוד פרטי."
+  site_setting_missing: "יש להגדיר את ההגדרה `%{name}` באתר."
   page_not_found:
     title: "אופס! הדף לא קיים או שהוא פרטי."
     popular_topics: "פופלארי"
@@ -3778,6 +3859,196 @@ he:
       אכן, קשקשת משפטית זה שעמום אחד גדול, עם זאת, עלינו להגן על עצמנו &ndash; וכפועל יוצא מזה עליך ועל הנתונים שלך &ndash; מפני מגוון מרעין בישין. יש לנו [תנאי שירות](%{base_path}/tos) המתארים את ההתנהגות והזכויות שלך (וגם שלנו) על תוכן, פרטיות וחוקיות. כדי להשתמש בשירות זה, עליך לציית ל[תנאי השירות](%{base_path}/tos).
   tos_topic:
     title: "תנאי השימוש"
+    body: |
+      תנאים אלו משמשים לאכיפת אופן השימוש בפורום המקוון שבכתובת <%{base_url}>. כדי להשתמש בפורום, עליך להסכים לתנאים האלה מול %{company_name}, החברה שמפעילה את הפורום.
+
+      חוזה זה מנוסח בחלקו בלשון זכר אך פונה לשני המגדרים באופן שווה, עמכן הסליחה.
+
+      החברה עשויה להציע מוצרים ושירותים נוספים, תחת תנאים שונים. תנאים אלו חלים אך ורק על השימוש בפורום.
+
+      דילוג אל:
+
+      - [תנאים חשובים](#heading--important-terms)
+
+      - [הרשאתך להשתמש בפורום](#heading--permission)
+
+      - [תנאים לשימוש בפורום](#heading--conditions)
+
+      - [שימוש הולם](#heading--acceptable-use)
+
+      - [תקינת תוכן](#heading--content-standards)
+
+      - [אכיפה](#heading--enforcement)
+
+      - [החשבון שלך](#heading--your-account)
+
+      - [התוכן שלך](#heading--your-content)
+
+      - [האחריות שלך](#heading--responsibility)
+
+      - [הצהרות](#heading--disclaimers)
+
+      - [הגבלות אחריות](#heading--liability)
+
+      - [משוב](#heading--feedback)
+
+      - [סיום התקשרות](#heading--termination)
+
+      - [ערעורים](#heading--disputes)
+
+      - [תנאים כלליים](#heading--general)
+
+      - [יצירת קשר](#heading--contact)
+
+      - [שינויים](#heading--changes)
+
+      <h2 id="heading--important-terms"><a href="#heading--important-terms">תנאים חשובים</a></h2>
+
+      ***כללים אלו מכילים מספר תחומי פיקוח שמשפיעים על הזכויות ועל תחומי האחריות כלפיך, כגון ההצהרות שתחת [הצהרות](#heading--disclaimers), הגבלת חבות החברה אליך תחת [הגבלות אחריות](#heading--liability), הסכמתך לשפות את החברה על נזקים שייגרמו על ידי שימוש לקוי בפורום תחת [אחריות על השימוש שלך](#heading--responsibility) והסכמתך ליישב סכסוכים תחת [ערעורים](#heading--disputes).***
+
+      <h2 id="heading--permission"><a href="#heading--permission">רשותך להשתמש בפורום</a></h2>
+
+      בכפוף לתנאים אלו, החברה מעניקה לך את הרשות להשתמש בפורום. על כלל משתמשי הפורום להסכים לתנאים אלו כדי להשתמש בו.
+
+      <h2 id="heading--conditions"><a href="#heading--conditions">תנאים לשימוש בפורום</a></h2>
+
+      הסכמתך לשימוש בפורום כפופה לתנאים הבאים:
+
+      1. גילך הוא שלוש עשרה שנים ומעלה.
+
+      2. לא יתאפשר לך להמשיך ולהשתמש בפורום אם החברה יצרה אתך קשר ישירות ואמרה שאסור לך להמשיך.
+
+      3. עליך להשתמש בפורום בהתאם ל[שימוש הולם](#heading--acceptable-use) ול[תקני תוכן](#heading--content-standards).
+
+      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">שימוש הולם</a></h2>
+
+      1. אסור לך לעבור על החוק בעזרת הפורום.
+
+      2. אסור לך לנסות להשתמש בחשבון של מישהו אחר בפורום ללא הסכמה מפורשת לכך.
+
+      2. אסור לך לרכוש, למכור או לסחור בשמות משתמשים או במזהים יחודיים אחרים בפורום.
+
+      4. אסור לך לשלוח דברי פרסום, הודעות שרשרת או כל ניסיון שידול אחרת דרך הפורום או להשתמש בפורום כדי לאסוף כתובות או נתונים אישיים אחרים לרשימות תפוצה או מסד נתונים מסחריים.
+
+      5. אסור לך לייצר מערכת לגישה אוטומטית לפורום, או לעקוב אחר הפורום כמו למשל בעזרת מתעדי רשת אוטומטיים, תוספים או הרחבות לדפדפנים או כל תכנית מחשב אחרת שאינה דפדפן. אפשר לתעד את הפורום לפרוטרוט כדי לתעד אותו באינדקס של מנוע חיפוש שזמין לציבור הרחב, אם יש לך אחד כזה.
+
+      6. אסור לך להשתמש בפורום כדי לשלוח הודעות בדוא״ל לקבוצות תפוצה, רשימות דיוור או כינויים של קבוצות דוא״ל.
+
+      7. אסור לך לרמוז במרמה שיש לך קשר עם או שהחברה מעודדת את הפעילות שלך.
+
+      8. אסור לך לקשר לתמונות או לתוכן שאינו היפר-טקסט בפורום באתרים אחרים.
+
+      9. אסור לך להסיר סימנים שמייצגים בעלות קניינית מחומרים שהורדת מהפורום.
+
+      10. אסור לך להציג אף חלק מהפורום באתר אחר באמצעות `<iframe>`.
+
+      1111. אסור לך להשבית, להתעלם או לחבל באמצעי אבטחה או הגבלות גישה לפורום.
+
+      12. אסור לך להעמיס על תשתית הפורום בכמות בלתי סבירה של בקשות או בקשות שמיועדות להעמיס בצורה בלתי סבירה על מערכות המידע שמחזיקות את הפורום.
+
+      13. אסור לך להתחזות לאחרים דרך הפורום.
+
+      14. אסור לך לעודד או לסייע למישהו להפר את התנאים האלו.
+
+      <h2 id="heading--content-standards"><a href="#heading--content-standards">תקינת תוכן</a></h2>
+
+      1. אסור לך להגיש לפורום תוכן בלתי־חוקי, פוגעני או מזיק לאחרים. לרבות תוכן מטריד, בלתי הולם או משפיל.
+
+      2. אסור לך להגיש לפורום תוכן שמפר את החוק, פוגע בזכויות הקניין הרוחני של גוף כלשהו או מפר הסכמים שיש לך מול גופים אחרים.
+
+      3. אסור לך להגיש לפורום תוכן שמכיל קוד מחשב זדוני כגון וירוסים או תכניות ריגול.
+
+      4. אסור לך להגיש לפורום תוכן שאמור לתפוס מקום, כדי להחזיק בכתובת מסוימת, שם משתמש או כל מזהה ייחודי אחר.
+
+      5. אסור לך להשתמש בפורום כדי לחשוף מידע שאין לך זכות לחשוף כגון פרטים חסויים או אישיים של אחרים.
+
+      <h2 id="heading--enforcement"><a href="#heading--enforcement">אכיפה</a></h2>
+
+      החברה רשאית לחקור ולפעול במקרים של הפרות לתנאים האלו עד המותר בחוק. החברה עשויה להודיע ולשתף פעולה עם רשויות אכיפה למיצוי הדין בהתאם להפרות בחוק והתנאים האלה.
+
+      החברה שומרת את הזכות לשנות, לערוך ולמחוק תוכן בפורום מכל סיבה שהיא. אם לדעתך הוגש לפורום תוכן כלשהו שמפר את התנאים האלו [יש ליצור אתנו קשר באופן מיידי](#heading--contact).
+
+      <h2 id="heading--your-account"><a href="#heading--your-account">החשבון שלך</a></h2>
+
+      עליך ליצור חשבון ולהיכנס אליו כדי להשתמש בחלק מהתכונות של הפורום.
+
+      כדי ליצור חשבון עליך לספק כמה פרטים עליך. יצירת חשבון מאלצת אותך לספק, לכל הפחות, כתובת דוא״ל תקנית ולדאוג לעדכן במקרים של שינוי. ניתן לסגור את חשבונך בכל עת על ידי שליחת הודעה בדוא״ל אל <%{contact_email}>.
+
+      מוסכם עליך לקחת אחריות על כל פעולה שמבוצעת דרך החשבון שלך, בין אם בהרשאתך ובין אם לא, עד לסגירת החשבון או שליחת הודעה לחברה על כך שחשבונך נפרץ. מוסכם עליך להודיע לחברה מיידית אם יש לך חשד שהחשבון שלך נפרץ. מוסכם עליך לבחור בססמה מאובטחת לחשבון שלך ולשמור עליה בסוד.
+
+      החברה רשאית להגביל, להשעות או לסגור את חשבונך בפורום בהתאם למדיניות שלה בטיפול בבקשות השבתה שקשורות בזכויות יוצרים או אם החברה מאמינה בצורה סבירה שעברת על החוק במובנים האלה.
+
+      <h2 id="heading--your-content"><a href="#heading--your-content">התוכן שלך</a></h2>
+
+      אף חלק בחוזה הזה לא מעניק לחברה זכויות בעלות על קניין רוחני שבחרת לשתף עם הפורום כגון פרטי החשבון שלך, פורטים או תוכן אחר שהגשת לפורום. אף חלק בחוזה הזה אינו מעניק לך זכויות בעלות על הקניין הרוחני של החברה, מאידך גיסא.
+
+      בינך ובין החברה, חלה עליך האחריות הבלעדית על התוכן שבחרת להגיש לפורום. מוסכם עליך לא לרמוז באופן מטעה שהתוכן שמוגש על ידיך לפורום ממומן או מאושר על ידי החברה. התנאים האלו לא מחייבים את החברה לאחסן, לתחזק או לספק עותקים של התוכן שבחרת להגיש ולשנות אותו בהתאם לתנאים האלו.
+
+      תוכן שבחרת להגיש לפורום שייך לך ויש לך את הזכות להחליט אילו הרשאות להעניק לאחרים לגביו. אך ברמה הבסיסית ביותר, את/ה מסכים לתת לחברה רישיון לספק תוכן שבחרת להגיש לפורום למשתמשים אחרים בפורום. הרישיון המיוחד הזה מאפשר לחברה להעתיק, לפרסם ולנתח את התוכן שהגשת לפורום.
+
+      כאשר תוכן שהגשת נמחק מהפורום, בין אם על ידיך ובין אם על ידי החברה, הרישיון המיוחד של החברה מסתיים כאשר העותק האחרון נמחק מהגיבויים, זיכרון המטמון ומערכות אחרות של החברה. כל רישיון אחר שבחרת להחיל על התוכן המוגש, כגון רישיונות [Creative Commons](https://creativecommons.org) עשויים להמשיך לחול גם לאחר הסרת התוכן שלך. הרישיונות האלו מעניקים לאחרים או לחברה עצמה את הזכות לשתף את התוכן שלך בפורום שוב.
+
+      אחרים המקבלים את התוכן שבחרת להגיש לפורום עשויים להפר את התנאים שבחרת לכפוף את התוכן שלך אליהם. מוסכם עליך שהחברה לא תהיה מחויבת אליך במקרים של ההפרות האלו או של ההשלכות שלהן.
+
+      <h2 id="heading--responsibility"><a href="#heading--responsibility">האחריות שלך</a></h2>
+
+      מוסכם עליך לזכות את החברה מטענות משפטיות שהועלו על ידי גורמי צד־שלישי שקשורים להפרת התנאים האלו על ידיך, או הפרת התנאים האלו על ידי אחרים שהשתמשו בחשבון שלך בפורום. את/ה לרבות החברה מסכימים להודיע לגורם הצד־השלישי על כל טענות כלשהן שבגינן יהיה עליך לזכות את החברה במהירות האפשרית. אם החברה לא מודיעה לך על הצהרה משפטית במהירות, לא יהיה עליך לזכות את החברה על נזקים שיכולת להגן מפניהם או להפחית אותם בזכות התראה קצרה יותר. מוסכם עליך לאפשר לחבר לשלוט בחקירה, הגנה ויישוב הטענות המשפטיות שבגינן עליך לזכות את החברה ולשתף פעולה עם המאמצנים האלו. החברה מסכימה שלא להסכים לכל הסכם פשרה שמטיל עליך אשמה או מחויבות ללא הסכמתך מראש.
+
+      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">הצהרות</a></h2>
+
+      ***כל הסיכונים הכרוכים בשימוש בפורום והחשיפה לתוכן שבו מוסכמים עליך. עד לרמה המותרת החוק, החברה והספקים שלה מספקים את הפורום כמו שהוא, ללא אחריות מכל סוג שהוא.***
+
+      הפורום עשוי לשלב בתוכו פורומים ושירותים שמופעלים על ידי גורמים אחרים. החברה אינה אחראית על השירותים שמופעלים שלא על ידיה או על התוכן שסופק על ידי גורמים אחרים. השימוש בשירותים שמופעלים על ידי גורמים אחרים מותנה בתנאים שהוסכמו בינך לבין הגורם המפעיל.
+
+      <h2 id="heading--liability"><a href="#heading--liability">הגבלות אחריות</a></h2>
+
+      ***אין החברה או מפיציה אחראים לנזקים שנגרמו עקב הפרת החוזה שאנשי הסגל שלה לא יכלו לחזות בעת הסכמתך לתנאים האלה.***
+
+      ***עד כמה שהחוק מאפשר, החבות לטענות מכל סוג שהן, הקשורות בפורום או לתוכן הפורום יוגבלו ל־50$.***
+
+      <h2 id="heading--feedback"><a href="#heading--feedback">משוב</a></h2>
+
+      החברה מקבלת בברכה משוב והצעות לפורום. יש לעיין בפסקה [יצירת קשר](#heading--contact) שלהלן להצגת דרכים לשמור אתנו על קשר.
+
+      נתת את הסכמתך לכך שלחברה יהיה חופש מוחלט לפעול בהתאם למשוב והצעות שסיפקת ושהחברה לא תחויב ליידע אותך איך נעשה שימוש במשוב הזה או לקבל את הרשאתך להשתמש בו או לשלם עליו. כמו כן, נתת את הסכמתך לא להגיש משוב או הצעות שלעניות דעתך עשויות להיות חסויות או קנייניות עבורך ובעבור אחרים.
+
+      <h2 id="heading--termination"><a href="#heading--termination">סיום ההתקשרות</a></h2>
+
+      את/ה או החברה רשאים לסיים את ההסכם כמפורט בתנאים כאלה בכל עת. סיום ההתקשרות משליך גם על סיום הרשאתך להשתמש בפורום.
+
+      ההוראות הבאות חלות גם לאחר סיום ההסכם בינינו: [התוכן שלך](#heading--your-content), [משוב](#heading--feedback), [האחריות שלך](#heading--responsibility), [הצהרות](#heading--disclaimers), [הגבלות אחריות](#heading--liability) ו[תנאים כלליים](#heading--general).
+
+      <h2 id="heading--disputes"><a href="#heading--disputes">ערעורים</a></h2>
+
+      %{governing_law} תהיה רשאית לפסוק בכל מקרה של מחלוקת על התנאים האלו או על השימוש שלך בפורום.
+
+      לך ולחברה יש את הזכות לבקש צווי מניעה שכפופים לתנאים אלו בבית המשפט השלום או בית המשפט העליון שב%{city_for_disputes}. לא לך ולא לחברה יש את הסמכות להתנגד לשיפוט, הרכב השופטים או מקום השיפוט בבתי משפט אלו.
+
+      ***למעט למטרות הגשת צווי מניעה לטענות שעולות מחוק המחשבים הפדרלי (CFAA), עליך ועל החברה ליישב מחלוקות בהתאם לבוררות של מוסד הבוררות האמריקאי. הבוררות תיערך בהתאם לכללי המסחר של מוסד הבוררות האמריקאי (AAA) ולנהלים המשלימים בדבר מחלוקות בתחום הצרכנות. הבוררות תיערך בעיר %{city_for_disputes}. עליך ליישב כל מחלוקות שיש לך כאדם פרטי ולא כחלק מתביעה ייצוגית או כל הליך ייצוגי אחר, בין אם כתובע או בין אם כחבר בתביעה הייצוגית. אף בורר לא יוכל ליישב מחלוקת בכל מקרה בוררות שהוא מבלי הסכמת החברה.***
+
+      כל פסק בוררות יכלול את עלות הבוררות, עמלה הולמת לעורכי דין ועלות הוגנת לעדים. את/ה והחברה יכולים להיכנס לפסקי בוררות בכל בית משפט שבאזור השיפוט.
+
+      <h2 id="heading--general"><a href="#heading--general">תנאים כלליים</a></h2>
+
+      אם אכיפת התנאים האלו אינה ניתנת לאכיפה כפי שכתוב, אך ניתן לשנות את הכתוב כדי להתאים אותם לאכיפה, האכיפה תשתנה למידה המזערית ביותר הנדרשת כדי להפוך אותו למותאם לאכיפה. אחרת, יש להסיר את האכיפה הזאת.
+
+      אסור לך להקצות את ההסכם שלך מול החברה לצד־שלישי. החברה יכולה להקצות את החוזה שלך לכל נספח או שותף של החברה, כל חברה אחרת שמקבלת שליטה על החברה או כל חברה אחרת שרוכשת חלקים בחברה שקשורה לפורום. לכל ניסיון הקצאה בניגוד לתנאים האלו אין תוקף חוקי.
+
+      מימוש של כל אחת מהזכויות תחת הסכם זה או הסכם ויתור להפרה של הסכם זה אינו מסלק הפרה מכל סוג שהוא של הסכם זה.
+
+      תנאים אלו כוללים את כל תנאי ההסכם בינך לבין החברה בנוגע לשימוש בפורום הזה. תנאים אלו מחליפים את כל ההסכמים האחרים בנוגע לשימושך בפורום, בין בכתב או בכל דרך אחרת.
+
+      <h2 id="heading--contact"><a href="#heading--contact">יצירת קשר</a></h2>
+
+      החברה מאפשרת לשלוח אליה הודעות ושאלות, תחת התנאים האלו, אל <%{contact_email}>.
+
+      החברה עשויה להודיע לך תחת תנאים אלה דרך כתובת הדוא״ל שסיפקת לחשבון שלך בפורום או על ידי פרסום הודעה בדף הבית של בפורום או בעמוד החשבון שלך.
+
+      <h2 id="heading--changes"><a href="#heading--changes">שינויים</a></h2>
+
+      החברה עדכנה את התנאים האלה לאחרונה ב־12 ביולי, 2018 והיא רשאית לעדכן אותם שוב. החברה תפרסם את כל העדכונים בפורום. לעדכונים שעשויים להכיל שינויים משמעותיים, החברה מסכימה לשלוח אליך הודעת דוא״ל בהנחה שיצרת חשבון וסיפקת כתובת דוא״ל תקפה. החברה עשויה גם להכריז על עדכונים עם הודעות מיוחדות או התראות על הנעשה בפורום.
+
+      לאחר שקיבלת הודעת עדכון לתנאים האלו, עליך להסכים לתנאים החדשים כדי להמשיך להשתמש בפורום.
   privacy_topic:
     title: "מדיניות פרטיות"
     body: |
@@ -3785,75 +4056,75 @@ he:
 
       ## [איזה מידע אנחנו אוספים?](#collect)
 
-      אנחנו אוספים מכם מידע כאשר אתם נרשמים לאתר שלנו ואוספים מידע מכם כאשר אתם משתתפים בפורום על ידי קריאה, כתיבה, והערכת התוכן שמשותף כאן.
+      אנחנו אוספים מידע ממך עם ההרשמה לאתר שלנו ואוספים מידע בעקבות פעילות בפורום בין אם קריאה, כתיבה, והערכת התוכן שמשותף כאן.
 
-      כאשר אתם נרשמים לאתר שלנו, ייתכן ותיתבקשו להכניס את שמכם וכתובת המייל שלכם. יחד עם זאת אתם יכולים לבקר באתר שלנו מבלי להרשם. כתובת המייל שלכם תאומת באמצעות מייל שמכיל קישור ייחודי. אם הקישור הזה מבוקר, אנחנו יודעים שאתם שולטים בכתובת המייל.
+      במהלך הרשמה לאתר שלנו, יתכן שיהיה עליך למלא את שמך ואת כתובת הדוא״ל שלך. עם זאת, ניתן לבקר באתר שלנו מבלי להירשם. כתובת הדוא״ל שלך תאומת באמצעות הודעה שמכילה קישור ייחודי. אם היה ביקור בקישור הזה, אנו יכולים להיות בטוחים שכתובת הדוא״ל הזו בשליטתך.
 
-      כאשר אתם רשומים ומפרסמים, אנחנו שומרים את כתובת ה IP ממנה פורסם הפוסט. אנחנו יכולים גם לשמור יומני שרת שכוללים את כתובת ה IP של כל קריאה לשרת שלנו.
+      בעת הרשמה ופרסום, אנו שומרים את כתובת ה־IP ממנה פורסם הפוסט. אנחנו יכולים גם לשמור יומני שרת שכוללים את כתובת ה־IP של כל פנייה לשרת שלנו.
 
       <a name="use"></a>
 
-      ## [למה אנחנו משתמשים במידע שלכם?](#use)
+      ## [לאיזו מטרה אנו משתמשים במידע שלך?](#use)
 
-      כל מידע שאנחנו אוספים מכם יכול לשמש בכל אחת מהדרכים הבאות:
+      כל מידע שאנו אוספים ממך יכול לשמש בכל אחת מהדרכים הבאות:
 
-      * כדי להתאים אישית את החוויה שלכם &mdash; המידע שלכם עוזר לנו לענות טוב יותר על צרכיכם האישיים.
-      * כדי לשפר את האתר שלנו &mdash; אנחנו כל הזמן שואפים לשפר את מה שהאתר שלנו מציע בהתחשב במידע ובמשוב שאנחנו מקבלים מכם.
-      * כדי לשפר את שירות הלקוחות &mdash; המידע שלכם מסייע לנו להגיב בצורה אפקטיבית יותר לבקשות שירות הלקוחות שלכם וצרכי התמיכה.
-      * כדי לשלח מיילים תקופתיים &mdash; כתובת המייל שאתם מספקים יכולה לשמש כדי לשלוח לכם אינפורמציה, התראות שביקשתם לגבי שינויים בנושאים או בתגובה לשם המשתמש שלכם, לענות לשאלות, ו/או בקשות או שאלות אחרות.
+      * כדי להתאים אישית את החוויה שלך &mdash; המידע שלך עוזר לנו לענות טוב יותר על צרכיך האישיים.
+      * כדי לשפר את האתר שלנו &mdash; אנו כל הזמן שואפים לשפר את מה שהאתר שלנו מציע בהתחשב במידע ובמשוב שאנחנו מקבלים ממך.
+      * כדי לשפר את שירות הלקוחות &mdash; המידע שלכם מסייע לנו להגיב בצורה אפקטיבית יותר לבקשות שירות הלקוחות שלך ולצורכי התמיכה.
+      * כדי לשלוח הודעות תקופתיות &mdash; כתובת הדוא״ל שמסופקת עשויה לשמש כדי לשלוח לך מידע, התראות שביקשת לגבי שינויים בנושאים או בתגובה לשם המשתמש שלך, לענות לשאילתות, ו/או לבקשות או לשאלות אחרות.
 
       <a name="protect"></a>
 
-      ## [כיצד אנחנו מגנים על האינפורמציה שלכם?](#protect)
+      ## [כיצד אנו מגנים על המידע שלך?](#protect)
 
-      אנחנו נוקטים במגוון של אמצעי אבטחה כדי לשמור על הבטיחות של המידע הפרטי שלכם כאשר אתם נכנסים, שולחים, או ניגשים למידע הפרטי שלכם.
+      אנו נוקטים במגוון אמצעי אבטחה כדי לאבטח את המידע הפרטי שלך עם כניסה, שליחה, או גישה למידע הפרטי שלך.
 
       <a name="data-retention"></a>
 
       ## [מה מדיניות שמירת המידע שלכם?](#data-retention)
 
-      אנחנו נעשה מאמץ בתום לב:
+      נעשה את מיטב המאמצים:
 
-      * לשמור יומנים שמכילים כתובות IP של כל הבקשות לשרת זה לא יותר מ 90 יום.
-      * לשמור על כתובות IP שמקושרות עם משתמשים רשומים ופוסטים שלהם לא יותר מ 5 שנים.
+      * לשמור יומנים שמכילים כתובות IP של כל הבקשות לשרת זה לא יותר מ־90 יום.
+      * לשמור על כתובות IP שמקושרות עם משתמשים רשומים והפוסטים שלהם למשך לא יותר מ־5 שנים.
 
       <a name="cookies"></a>
 
       ## [האם אנחנו משתמשים בעוגיות?](#cookies)
 
-      כן. עוגיות הן קבצים קטנים שאתר או מספק השירות שלו מעביר לכונן הקשיח של מחשבכם דרך הדפדפן שלכם (אם אתם מרשים). עוגיות אלו מאפשרות לאתר להכיר את הדפדפן שלכם ו, אם יש לכם חשבון רשום, לקשר אותו עם חשבונכם הרשום.
+      כן. עוגיות הן קבצים קטנים שאתר או מספק השירות שלו מעביר לכונן הקשיח של מחשבך דרך הדפדפן שלך (בכפוף להסכמתך). עוגיות אלו מאפשרות לאתר להכיר את הדפדפן שלך וגם, אם יש לך חשבון רשום, לקשר אותו עם חשבונך הרשום.
 
-      אנחנו משתמשים בעוגיות כדי להבין ולשמור את ההעדפות שלכם לביקורים עתידיים ולהכין נתונים מצרפיים בנוגע לתנועה באתר ואינטראקציה באתר כדי שנוכל להציע חוויית משתמש טובה יותר וכלים בעתיד. אנחנו יכולים לכרות חוזים עם מספקי שירות שהם צד-שלישי כדי לסייע לנו להבין טוב יותר את מבקרי האתר שלנו. נותני שרותים אלו לא מורשים להשתמש בנתונים שנאספים בשמנו למעט כדי לסייע לנו לקיים ולשפר את השירות שלנו.
+      אנו משתמשים בעוגיות כדי להבין ולשמור את ההעדפות שלך לביקורים עתידיים ולהכין נתונים מצרפיים בנוגע לתנועה והאינטראקציה באתר כדי שנוכל להציע חוויות שימוש טובות יותר וכלים עתידיים. אנחנו יכולים לכרות חוזים עם ספקי שירות צד־שלישי כדי לסייע לנו להבין טוב יותר את מבקרי האתר שלנו. נותני שרותים אלו לא מורשים להשתמש בנתונים שנאספים בשמנו למעט כדי לסייע לנו לקיים ולשפר את השירות שלנו.
 
       <a name="disclose"></a>
 
-      ## [האם אנחנו מוסרים אינפורמציה כלשהי לצדדים שלישיים?](#disclose)
+      ## [האם אנחנו מוסרים מידע כלשהו לגורמי צד־שלישי?](#disclose)
 
-      איננו מוכרים, סוחרים, או מעבירים בצורה אחרת לצדדים שלישיים מידע אישי מזוהה שלכם. זה אינו כולל צדדים שלישיים עליהם אנחנו סומכים שמסייעים לנו בתפעול האתר שלנו, לתפעל את העסק שלנו, או לשרת אתכם, כל עוד צדדים אלו מסכימים לשמור על מידע זה סודי. אנחנו יכולים גם לשחרר את המידע שלכם כאשר אנחנו מאמינים ששחרור שלו הולם כדי לעמוד בחוק, לקיים את מדיניות האתר שלנו, או כדי להגן על זכויות שלנו או של אחרים, לשמור על רכוש או בטיחות. עם זאת, מידע של מבקרים שאינו מזוהה אישית עלול להיות מסופק לצדדים אחרים לצורך שיווק, פרסום או שימושים אחרים.
+      איננו מוכרים, סוחרים או מעבירים בצורה אחרת מידע שמאפשר לזהות אותך לגורמי צד־שלישי. זה אינו כולל גורמי צד־שלישי עליהם אנחנו סומכים ומסייעים לנו בתפעול האתר, העסק שלנו, או לשרת אותך, כל עוד צדדים אלו מסכימים לשמור על מידע זה סודי. אנו יכולים גם לשחרר את המידע שלך כאשר אנחנו מאמינים ששחרור שלו הולם בהתאם לחוק, לקיים את מדיניות האתר שלנו או כדי להגן על זכויות שלנו או של אחרים וגם כדי לשמור על רכוש או בטיחות. עם זאת, מידע של מבקרים שאינו מאפשר לזהות אותם אישית עלול להימסר על ידינו לגורמים אחרים לצורך שיווק, פרסום או שימושים אחרים.
 
       <a name="third-party"></a>
 
-      ## [קישורי צד שלישי](#third-party)
+      ## [קישורים לגורמי צד־שלישי](#third-party)
 
-      לעיתים, לפי שיקול דעתנו, אנחנו יכולים לכלול או להציע מוצרים של צדדים שלישיים באתר שלנו. לאתרי צד שלישי אלו יש מדיניות פרטיות נפרדת ובלתי-תלויה. לכן אין לנו כל אחריות או התחייבות לתכנים או פעילויות של אתרים מקושרים אלו. יחד עם זאת אנחנו מבקשים לשמור על השלמות של האתר שלנו ומברכים כל משוב בנוגע לאתרים אלו.
+      לעיתים, לפי שיקול דעתנו, אנחנו יכולים לכלול או להציע מוצרים של גורמי צד־שלישי באתר שלנו. לאתרי צד־שלישי אלו יש מדיניות פרטיות נפרדת ובלתי תלויה. לכן אין לנו כל אחריות או התחייבות לתכנים או פעילויות של אתרים מקושרים אלו. יחד עם זאת אנחנו מבקשים לשמור על שלמות האתר שלנו ומברכים כל משוב בנוגע לאתרים אלו.
 
       <a name="coppa"></a>
 
-      ## [תאימות ל Children's Online Privacy Protection Act](#coppa)
+      ## [תאימות ל־Children's Online Privacy Protection Act (אמנת הגנת פרטיות ילדים ברשת)](#coppa)
 
-      האתר שלנו, המוצרים, והשירותים - כולם מוכוונים לאנשים מגיל 13 ומעלה. אם שרת זה נמצא בארה״ב, ואתם מתחת לגיל 13, לפי דרישות COPPA כאן - [Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act), אל תשתמשו באתר זה.
+      האתר שלנו, המוצרים, והשירותים - כולם מוכוונים לאנשים מגיל 13 ומעלה. אם שרת זה נמצא בארה״ב, וגילך מתחת ל־13, לפי דרישות COPPA כאן - [Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act), אסור לך להשתמש באתר זה.
 
       <a name="online"></a>
 
       ## [מדיניות פרטיות מקוונת בלבד](#online)
 
-      מדיניות פרטיות מקוונת זו חלה רק על מידע שנאסף באמצעות האתר שלנו ולא על מידע שנאסף בצורה בלתי-מקוונת.
+      מדיניות פרטיות מקוונת זו חלה רק על מידע שנאסף באמצעות האתר שלנו ולא על מידע שנאסף בצורה בלתי מקוונת.
 
       <a name="consent"></a>
 
-      ## [הסכמתכם](#consent)
+      ## [הסכמתך](#consent)
 
-      על ידי שימוש באתר שלנו, אתם מסכימים למדיניות הפרטיות של האתר.
+      השימוש באתר שלנו מהווה את הסכמתך למדיניות הפרטיות שלו.
 
       <a name="changes"></a>
 
@@ -3861,11 +4132,12 @@ he:
 
       אם נחליט לשנות את מדיניות הפרטיות שלנו, נפרסם שינויים אלו בדף זה.
 
-      מסמך זה הוא CC-BY-SA. הוא עודכן לאחרונה ב 25 לספטמבר 2016.
+      מסמך זה כפוף ל־CC-BY-SA. והוא עודכן לאחרונה ב־20 בינואר 2021.
   badges:
     mass_award:
       errors:
         invalid_csv: נתקלנו בשגיאה בשורה מס׳ %{line_number}. נא לוודא שב־CSV יש כתובת דוא״ל אחת בכל שורה.
+        badge_disabled: נא לפעיל את העיטור %{badge_name} תחילה.
     editor:
       name: עורכים
       description: עריכת פוסט ראשונה
@@ -3997,7 +4269,7 @@ he:
       long_description: |
         עיטור זה מוענק על הפעם הראשונה שציטטת פוסט בתגובה שלך. ציטוט חלקים רלוונטיים של פוסטים קודמים בתגובה שלך מסייעת בקישורים הפנימיים של הדיון. הדרך הקלה ביותר לצטט היא להדגיש קטע כלשהו מתוך פוסט ואז ללחוץ על כפתור התגובה. מומלץ לצטט בנדיבות!
     read_guidelines:
-      name: קראו את ההנחיות
+      name: לקריאת ההנחיות
       description: מוטב לעיין ב<a href="%{base_uri}/guidelines">כללי הקהילה</a>
       long_description: |
         עיטור זה מוענק על <a href="%{base_uri}/guidelines">קריאת הנחיות הקהילה</a>. התנהלות לפי הכללים המנחים הפשוטים האלה ושיתופים מסייעים בבניית קהילה בטוחה, מהנה וצומחת. תמיד עליך לזכור כי יש שם בן אדם אחר, בדיוק כמוך, בצד השני של המסך. יש לנהוג בצורה נאותה!
@@ -4005,7 +4277,7 @@ he:
       name: קוראים
       description: קראו כל תגובה בנושא עם למעלה מ 100 תגובות
       long_description: |
-        עיטור זה מוענק בפעם הראשונה שאתם קוראים נושא ארוך עם למעלה מ 100 תגובות. קריאת דיון מקרוב מסייעת לכם לעקוב אחר השיחה, להבין נקודות מבט שונות, ומובילה לדיונים מעניינים יותר. ככל שתקראו יותר, כך תשתפר השיחה. כמו שאנחנו אוהבים לומר, קריאה היא יסודית! :slight_smile:
+        עיטור זה מוענק על הפעם הראשונה שקראת נושא ארוך עם למעלה מ־100 תגובות. קריאת דיונים בקפידה מסייעת לך לעקוב אחר מהות הדיון, להבין את נקודות המבט השונות ומובילה לדיון מעניין יותר. ככל שקוראים יותר, ככה הדיון יותר מעניין. כפי שאנו אוהבים לציין, קריאה זה ערך יסודי! :slight_smile:
     popular_link:
       name: קישור פופולארי
       description: פרסמו קישור חיצוני עם 50 קליקים
@@ -4142,10 +4414,10 @@ he:
       synonym: 'אסור להשתמש במילים נרדפות. יש להשתמש ב־„%{tag_name}” במקום.'
       has_synonyms: 'לא ניתן להשתמש ב־„%{tag_name}” כיוון שיש לו מילים נרדפות.'
     required_tags_from_group:
-      one: "עליך לכלול תגית %{tag_group_name} %{count} לפחות"
-      two: "עליך לכלול %{count} תגיות %{tag_group_name} לפחות"
-      many: "עליך לכלול %{count} תגיות %{tag_group_name} לפחות"
-      other: "עליך לכלול %{count} תגיות %{tag_group_name} לפחות"
+      one: "עליך לכלול לפחות תגית %{tag_group_name} %{count}. התגיות בקבוצה הזאת הן: %{tags}."
+      two: "עליך לכלול לפחות %{count} תגיות %{tag_group_name}. התגיות בקבוצה הזאת הן: %{tags}."
+      many: "עליך לכלול לפחות %{count} תגיות %{tag_group_name}. התגיות בקבוצה הזאת הן: %{tags}."
+      other: "עליך לכלול לפחות %{count} תגיות %{tag_group_name}. התגיות בקבוצה הזאת הן: %{tags}."
     invalid_target_tag: "לא יכול להיות מילה נרדפת של מילה נרדפת"
     synonyms_exist: "אסור לשימוש כל עוד קיימות מילים נרדפות"
   rss_by_tag: "נושאים מתוייגים %{tag}"
@@ -4297,9 +4569,6 @@ he:
                 label: "תיבות קטגוריות"
               categories_boxes_with_topics:
                 label: "תיבות קטגוריות עם נושאים"
-      emoji:
-        title: "אמוג׳י"
-        description: "איזה סגנון אמוג׳יז תעדיפו לקהילה שלכם? אתם יכולים להוסיף עוד אמוג׳יז מותאמים אישית תחת ניהול, התאמה אישית, אמוג׳י."
       invites:
         title: "הזמנת סגל"
         description: "כמעט סיימת! אולי נזמין כמה אנשים כדי <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>לעורר דיונים</a> עם נושאים מעניינים ותגובות שיניעו קדימה את הקהילה שלך."
@@ -4342,6 +4611,7 @@ he:
       restored: שוחזר
   reviewables:
     already_handled: "תודה לך, כבר בדקנו את הפוסט הזה והחלטנו שאין צורך לסמן אותו בדגל פעם נוספת."
+    already_handled_and_user_not_exist: "תודה, אבל כבר נערכה בדיקה והמשתמש הזה אינו קיים עוד."
     priorities:
       low: "נמוכה"
       medium: "בינונית"
@@ -4361,7 +4631,7 @@ he:
       new_topics_unless_trust_level: "הפוסטים של משתמשים בדרגות אמון נמוכות חייבות לעבור את אישור הסגל. יש לעיין ב־`approve_new_topics_unless_trust_level` (אישור פוסטים חדשים למעט דרגת אמון)."
       fast_typer: "ההקלדה של הפוסט הראשון של משתמש מסוים הייתה מהירה באופן שמעלה חשד שמדובר בהתנהגות של בוט או הפצת ספאם. יש לעיין ב־`min_first_post_typing_time` (זמן מזערי להקלדת פוסט ראשון)."
       auto_silence_regexp: "הפוסט הראשון שפורסם על ידי משתמש חדש תואם להגדרה `auto_silence_first_post_regex` (השתקה אוטומטית של פוסט ראשון לפי ביטוי רגולרי)."
-      watched_word: "פוסט זה הכיל מילה במעקב. יש לעיין ב<a href='%{base_url}/admin/logs/watched_words'>רשימת המילים שבמעקב</a>."
+      watched_word: "פוסט זה הכיל מילה במעקב. יש לעיין ב<a href='%{base_url}/admin/customize/watched_words'>רשימת המילים שבמעקב</a>."
       staged: "נושאים ופוסטים חדשים של משתמשים מבוימים חייבים לקבל את אישור הסגל. למידע נוסף `approve_unless_staged` (אישור אלמלא מבוים)."
       category: "פוסטים בקטגוריה זו דורשים אימות ידני של הסגל. יש לעיין בהגדרות הקטגוריה."
       must_approve_users: "כל המשתמשים החדשים חייבים לעבור את אישור הסגל. יש לעיין בנושא `must_approve_users` (חובת אישור משתמשים)."
@@ -4370,6 +4640,7 @@ he:
       email_spam: "הודעת דוא״ל זו סומנה כספאם עקב הכותרת שהוגדרה תחת `email_in_spam_header` (כותרת דוא״ל לספאם)."
       suspect_user: "המשתמש החדש הזה מילא פרטי חשבון מבלי לקרוא נושאים או פוסטים, מה שעשוי לרמז על כך שייתכן שמדובר בתוקף ספאם. יש לעיין ב־`approve_suspect_users` (אישור משתמשים חשודים).  "
       contains_media: "הפוסט הזה כולל מדיה מוטמעת. ניתן לעיין ב־`review_media_unless_trust_level` (סקירת מדיה מחוץ לדרגות אמון)."
+      queued_by_staff: "אחד מחברי הסגל חושב שהפוסט הזה דורש סקירה. עד אז הוא יישאר מוסתר."
     actions:
       agree:
         title: "הסכמה…"
@@ -4439,6 +4710,17 @@ he:
           description: "המשתמש יימחק ואנו נחסום את כתובת ה־IP והדוא״ל שלו."
       reject:
         title: "לדחות"
+        bundle_title: "לדחות..."
+      reject_and_suspend:
+        title: "לדחות ולהשעות את המשתמש"
+      reject_and_silence:
+        title: "לדחות ולהשתיק את המשתמש"
+      reject_and_delete:
+        title: "לדחות ולמחוק את הפוסט"
+      reject_and_keep_deleted:
+        title: "להשאיר את הפוסט מחוק"
+      approve_and_restore:
+        title: "אישור ושחזור הפוסט"
       delete_user:
         title: "מחק משתמש"
         confirm: "למחוק את המשתמש הזה? פעולה זו תסיר את כל הפוסטים של המשתמש ותחסום את כתובת הדוא״ל וה־IP שלו."
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index 2d44241840..337f1889d8 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -39,6 +39,7 @@ hu:
   title: "Discourse"
   topics: "Témák"
   posts: "bejegyzések"
+  views: "megtekintés"
   loading: "Betöltés"
   powered_by_html: 'A motorháztető alatt: <a href="https://www.discourse.org">Discourse</a>, a megtekintése JavaScript engedélyezésével ajánlott'
   sign_up: "Regisztráció"
@@ -50,6 +51,8 @@ hu:
   remove_posts_deleted_by_author: "Szerző által törölve"
   redirect_warning: "Nem tudtuk megerősíteni, hogy a kiválasztott hivatkozás tényleg közzé lett-e téve a fórumban. Ha mindenképp folytatni szeretné, akkor kattintson a lenti hivatkozásra."
   on_another_topic: "Egy másik témában"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} általa: %{username}"
   themes:
     bad_color_scheme: "A téma nem frissíthető, érvénytelen színpaletta"
     other_error: "Hiba történt az oldal stílusának frissítésekor"
@@ -97,6 +100,7 @@ hu:
         no_message_id_error: "Akkor történik, ha a levélnek nincs „Message-Id” fejléce."
         inactive_user_error: "Akkor fordul elő, ha a feladó nem aktív."
         strangers_not_allowed_error: "Akkor fordul elő, ha a felhasználó új témát akar létrehozni egy olyan kategóriában, amelynek nem tagja."
+        unsubscribe_not_allowed: "Akkor történik, ha e-mailben történő leiratkozás nem engedélyezett ennek a felhasználónak."
       unrecognized_error: "Ismeretlen hiba"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -147,11 +151,18 @@ hu:
     site_settings:
       default_categories_already_selected: "Nem választhat olyan kategóriát, amely már szerepel egy másik listában."
       s3_upload_bucket_is_required: "Nem lehet engedélyezni a feltöltést az S3-ba, amíg nincs megadva az „s3_upload_bucket”."
+    onebox:
+      invalid_address: "Sajnos nem tudtunk előnézetet generálni ehhez a weboldalhoz, mert a (z) „%{hostname}” szerver nem található. Az előnézet helyett csak egy link jelenik meg a bejegyzésben. :cry:"
   invite:
     not_found: "A meghívási token érvénytelen. Lépjen kapcsolatba a <a href='%{base_url}/about'>stábbal</a>."
     not_found_json: "A meghívási token érvénytelen. Lépjen kapcsolatba a stábbal."
-    error_message: "Hiba történt a meghívó elfogadásakor. Lépjen kapcsolatba az oldal rendszergazdájával."
     user_exists: "Nincs szükség <b>%{email}</b> meghívására, már <a href='%{base_path}/u/%{username}/summary'>rendelkezik fiókkal.</a>"
+    confirm_email: "<p>Mindjárt készen is vagyunk! Elküldtünk egy megerősítő e-mailt a <b>%{email}</b> címre. Kérlek, kövesd a benne található instrukciókat, és aktiváld a fiókodat.</p><p>Ha pár percen belül nem érkezne meg, ne felejtsd el a <b>SPAM</b> és a <b>Promóciók</b> mappában is ellenőrizni!</p>"
+    disabled_errors:
+      invalid_access: "Nincs engedélye a kért erőforrás megtekintéséhez."
+  topic_invite:
+    receiver_does_not_allow_pm: "Sajnáljuk, de a felhasználó nem engedélyezi, hogy privát üzeneteket küldj nekik."
+    sender_does_not_allow_pm: "Sajnáljuk, nem engedélyezed, hogy a felhasználó személyes üzeneteket küldjön neked."
   backup:
     operation_already_running: "Egy művelet jelenleg is fut. Most nem indítható új feladat."
     backup_file_should_be_tar_gz: "A biztonsági mentésnek .tar.gz archívumnak kell lennie."
@@ -192,6 +203,7 @@ hu:
       one: "%{count} kedvelés"
       other: "%{count} kedvelés"
     created: "Létrehozott"
+    new_topic: "Új téma létrehozása"
   no_mentions_allowed: "Sajnáljuk, de nem említhet meg más felhasználókat."
   too_many_mentions:
     one: "Sajnáljuk, de csak egy felhasználót említhet meg egy bejegyzésben."
@@ -208,8 +220,10 @@ hu:
   too_many_links:
     one: "Sajnáljuk, de az új felhasználók csak egy hivatkozást tehetnek egy bejegyzésbe."
     other: "Sajnáljuk, de az új felhasználók csak %{count} hivatkozást tehetnek egy bejegyzésbe."
+  contains_blocked_word: "A bejegyzésed egy olyan szót tartalmaz, amely nem megengedett: %{word}"
   user_is_suspended: "A felfüggesztett felhasználók nem hozhatnak létre új bejegyzést."
   topic_not_found: "Valami hiba történt. Esetleg lezárták vagy törölték ezt a témát, míg megnézte?"
+  create_pm_on_existing_topic: "Sajnáljuk, nem hozhatsz létre PM-et egy meglévő témakörben."
   just_posted_that: "túl hasonló ahhoz, amit legutóbb megosztott"
   invalid_characters: "érvénytelen karaktereket tartalmaz"
   next_page: "következő oldal →"
@@ -219,6 +233,9 @@ 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"
+  rss_num_posts:
+    one: "%{count} bejegyzés"
+    other: "%{count} bejegyzés"
   read_full_topic: "Teljes téma elolvasása"
   private_message_abbrev: "Üzenet"
   rss_description:
@@ -237,14 +254,17 @@ hu:
     user_topics: "Legújabb témák @%{username} felhasználótól"
     tag: "Megjelölt témák"
   too_late_to_edit: "Ez a bejegyzés túl régen lett létrehozva. Már nem lehet szerkeszteni vagy törölni."
+  edit_conflict: "Ezt a bejegyzést egy másik felhasználó szerkesztette, és a változtatásokat már nem lehet menteni."
   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"
+      next_business_day: "Következő munkanap"
       tomorrow: "Holnap"
       next_week: "Jövő héten"
       next_month: "Jövő hónapban"
+      custom: "Egyéni dátum és idő"
   groups:
     errors:
       can_not_modify_automatic: "Nem módosíthat egy automata csoportot"
@@ -262,10 +282,35 @@ hu:
       trust_level_2: "bizalmi_szint_2"
       trust_level_3: "bizalmi_szint_3"
       trust_level_4: "bizalmi_szint_4"
+    request_accepted_pm:
+      title: "Felvettek a @%{group_name} csoportba."
   education:
     until_posts:
       one: "%{count} bejegyzés"
       other: "%{count} bejegyzés"
+    "new-topic": |
+      Üdvözlünk a %{site_name} &mdash; -ben! **Köszönjük, hogy új beszélgetést indítaszl!**
+
+      - Érdekesnek tűnik a cím, ha hangosan felolvasod? Jó az összefoglaló?
+
+      - Kit érdekelne ez? Miért számít? Milyen válaszokat szeretnél kapni?
+
+      - Helyezz el a témában gyakran használt, releváns szavakat, hogy mások megtalálhassák. Ha a témát csoportosítani szeretnéd a kapcsolódó témákkal, válassz ki egy kategóriát (vagy címkét).
+
+      További információért lásd [közösségi irányelveinket](%{base_path}/guidelines). Ez a panel csak az első %{education_posts_text} alkalommal jelenik meg.
+    "new-reply": "Üdözöllek a %{site_name} &mdash; n - **köszönjük, hogy aktív vagy!**\n\n- Kérlek, szelíden fogalmazz!\n\n- Mielőtt elküldöd a választ, gondold végig, hogy építő-e, amit írtál!\n\n- Az építő kritikáknak mindig örülünk, de vigyázz, hogy a *felvetést* kritizáld, ne a hozzászólót. \n\nA szabályzatunkat megtalálod ide kattintva: [see our community guidelines](%{base_path}/guidelines). Ez a panel csak az első %{education_posts_text} megírásakor fog megjelenni, utána magától eltűnik.\n"
+    too_many_replies: |
+      ### Elérted a válaszkorlátot ebben a témában
+
+      Sajnáljuk, de az új felhasználók ideiglenesen %{newuser_max_replies_per_topic} válaszra korlátozódnak ugyanabban a témában.
+
+      Új válasz hozzáadása helyett fontold meg korábbi válaszaid szerkesztését vagy más témák felkeresését.
+    reviving_old_topic: |
+      ### Biztosan fel akarod éleszteni ezt a témát?
+
+      A témára az utolsó válasz **%{time_ago}** volt. Ha válaszolsz, a téma a lista tetejére kerül, és értesítünk róla mindenkit, aki korábban részt vett a beszélgetésben.
+
+      Biztosan ezt a régi beszélgetést szeretnéd folytatni?
   activerecord:
     attributes:
       category:
@@ -284,6 +329,7 @@ hu:
             base:
               too_many_users: "Egyszerre csak egy felhasználónak küldhet figyelmeztetést."
               no_user_selected: "Érvényes felhasználót kell választania."
+              reply_by_email_disabled: "Az e-mailes válasz letiltva."
         user:
           attributes:
             password:
@@ -293,6 +339,10 @@ hu:
               same_as_current: "azonos a jelenlegi jelszavával."
             ip_address:
               signup_not_allowed: "A regisztráció nem lehetséges ezzel a fiókkal."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Ez a témakör nem jeleníthető meg a profilodban."
         color_scheme_color:
           attributes:
             hex:
@@ -311,10 +361,48 @@ hu:
   meta_category_description: "Beszélgetés erről az oldalról, a szervezéséről, a működéséről és arról, hogyan tudnánk jobbá tenni."
   staff_category_name: "Stáb"
   staff_category_description: "Privát kategória a stáb számára. Ezeket a témákat csak az adminisztrátorok és moderátorok látják."
+  discourse_welcome_topic:
+    title: "Üdvözöljük a Discourse-ban"
+    body: |2
+
+      A rögzített téma első bekezdése üdvözlő üzenetként fog megjelenni a kezdőlap összes új látogatója előtt. Ez fontos!
+
+      ** Szerkeszd át ezt ** a közösség rövid leírására:
+
+      - Kinek szól?
+      - Mit találhatnak itt?
+      - Miért kellene idejönniük?
+      - Hol tudnak többet olvasni (linkek, források stb.)?
+
+      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+
+      Érdemes bezárnod ezt a témát az admin :wrench: en keresztül (a jobb felső és az alsó részen), hogy a válaszok ne halmozódjanak fel egy bejelentésre.
   lounge_welcome:
     title: "Üdvözöljük a társalgóban"
+    body: |2
+
+      Gratulálunk! :confetti_ball:
+
+      Ha látod ezt a témát, a közelmúltban ** rendes tag** (3. bizalmi szint) rangra emelkedtél.
+
+      Mostantól &hellip;
+
+      * Bármely téma címét szerkesztheted
+      * Bármely téma kategóriáját megváltoztathatod
+      * Minden link követése (az [automatikus nofollow] (https://en.wikipedia.org/wiki/Nofollow) eltávolításra került )
+      * Hozzáférhetsz egy privát társalgó kategóriához, amelyet csak a 3. vagy annál magasabb szintű bizalmas felhasználók láthatnak.
+      * El tudod rejteni a problémás bejegyzéseket egyetlen kattintással a zászlóra.
+
+      Itt található a [törzsvendégek aktuális listája] (%{base_path}/ badges / 3 / regular). Mindenképpen köszönj be hozzánk!
+
+      Köszönjük, hogy fontos része vagytok ennek a közösségnek!
+
+      (További információért a bizalmi szintekről [nyisd meg ezt a témát].[trust]Felhívjuk figyelmedet, hogy csak azok a tagok maradnak törzsvendégek, akik idővel továbbra is megfelelnek a követelményeknek.)
+
+      [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
   category:
     topic_prefix: "A(z) %{category} kategóriáról"
+    replace_paragraph: "(Cseréld le ezt az első bekezdést az új kategória rövid leírására. Ez az útmutató a kategória kiválasztási területén jelenik meg, ezért próbálj 200 karakter alatt maradni.)"
     errors:
       not_found: "A kategória nem található."
       uncategorized_parent: "Nem kategorizált elem nem rendelkezhet szülő kategóriával"
@@ -347,7 +435,7 @@ hu:
     slow_down: "Túl sokszor hajtotta végre ezt a műveletet, próbálja újra később."
     too_many_requests: "Túl sokszor hajtotta végre ezt a műveletet. Az újrapróbálkozás előtt várjon ennyi időt: %{time_left}."
     by_type:
-      create_like: "Elérte a kedvelések maximális számát. Az újrapróbálkozásig ennyit várjon: %{time_left}."
+      unsubscribe_via_email: "Elérted az e-mailben történő leiratkozások maximális számát. Várj %{time_left}t mielőtt újra megpróbálod."
     hours:
       one: "%{count} óra"
       other: "%{count} óra"
@@ -442,12 +530,28 @@ hu:
     confirmed: "Az e-mail címe frissítve lett."
     please_continue: "Tovább a(z) %{site_name} oldalra"
     error: "Hiba történt az e-mail cím módosításakor. Lehet, hogy már használatban van?"
+    doesnt_exist: "Ez az e-mail cím nincs társítva a fiókodhoz."
+    authorizing_new:
+      title: "Erősítse meg az új e-mail címét"
+      description: "Kérjük, erősítsd meg, hogy szeretnéd az e-mail címedet a következőre módosítani:"
+      description_add: "Kérjük, erősítsd meg, hogy alternatív e-mail címet szeretnél hozzáadni:"
+    authorizing_old:
+      title: "E-mail-cím módosítása"
+      description: "Kérjük, erősítsd meg az e-mail címed megváltoztatását"
+      description_add: "Kérjük, erősítsd meg, hogy alternatív e-mail címet szeretnél hozzáadni:"
+      old_email: "Régi e-mail: %{email}"
+      new_email: "Új e-mail: %{email}"
+      almost_done_title: "Új e-mail cím megerősítése"
+      almost_done_description: "Küldtünk egy e-mailt az új e-mail címedre, hogy megerősítsük a változást!"
   activation:
     action: "Kattintson ide a felhasználói fiókja aktiválásához"
     already_done: "Ez a fiók megerősítési hivatkozás már nem érvényes. Lehet, hogy a fiókja már aktiválva lett?"
     please_continue: "Megerősítettük a fiókját, most visszairányítjuk a kezdőoldalra."
     continue_button: "Tovább a(z) %{site_name} oldalra"
     welcome_to: "Üdvözöljük a(z) %{site_name} oldalon."
+    approval_required: "Egy moderátornak manuálisan kell jóváhagynia az új fiókodat, mielőtt hozzáférhetnél ehhez a fórumhoz. Fogsz kapni egy e-mailt, amint jóváhagytuk a fiókodat!"
+    missing_session: "Nem tudjuk észlelni, hogy létrejött-e a fiókod. Kérjük, ellenőrizd, hogy engedélyezve van-e a sütik használata a böngésződben."
+    activated: "Ezt a fiókot már aktiválták."
     admin_confirm:
       title: "Adminisztrátori fiók megerősítése"
       grant: "Adminisztrátori hozzáférés adása"
@@ -483,12 +587,16 @@ hu:
       self: "Még nincsenek tevékenységek."
       others: "Nincsenek tevékenységek."
     no_bookmarks:
+      self: "Nincsenek könyvjelzővel ellátott bejegyzéseid; a könyvjelzők segítségével gyorsan hivatkozhatsz bizonyos bejegyzésekre."
       others: "Nincsenek könyvjelzők."
     no_likes_given:
       self: "Egyetlen bejegyzést sem kedvelt."
       others: "Nincsenek kedvelt bejegyzések."
     no_replies:
+      self: "Nem válaszoltál még egyetlen bejegyzésre sem."
       others: "Nincsenek válaszok."
+    no_drafts:
+      self: "Nincsenek még piszkozataid. Kezdj választ írni bármelyik témához, és ha nem küldöd el, automatikusan elmentjük piszkozatként."
   topic_flag_types:
     spam:
       title: "Szemét"
@@ -501,6 +609,8 @@ hu:
       title: "Valami más"
       email_title: 'A(z) „%{title}” téma moderátori figyelmet igényel'
       email_body: "%{link}\n\n%{message}"
+  ignored:
+    hidden_content: "<p>Letiltott tartalom</p>"
   archetypes:
     regular:
       title: "Általános téma"
@@ -508,10 +618,26 @@ hu:
       title: "Kiemelt téma"
       message:
         remove: "Ez a téma már nem kiemelt. Ezt követően nem jelenik meg minden oldal tetején."
+  unsubscribed:
+    title: "Az e-mail beállítások frissítve!"
+    description: "a (z) <b>%{email}</b> e-mail beállításai frissültek. Az e-mail beállítások módosításához <a href='%{url}'>keresse fel a felhasználói beállításokat</a>."
+    topic_description: "A %{link}újbóli feliratkozásához használja a téma alján vagy jobbján található értesítési vezérlőt."
+    private_topic_description: "A újbóli feliratkozásához használja a téma alján vagy jobbján található értesítési vezérlőt."
   unsubscribe:
     title: "Leiratkozás"
+    stop_watching_topic: "Ne figyelje tovább ezt a kategóriát: %{link}"
+    mute_topic: "A téma összes értesítésének némítása, %{link}"
+    unwatch_category: "Ne figyelje tovább ezt a kategóriát: %{category}"
+    mailing_list_mode: "Levelezőlista mód kikapcsolása"
+    all: "Ne küldjön nekem semmilyen e-mailt a %{sitename} oldalról"
+    different_user_description: "Jelenleg más felhasználóként van bejelentkezve, mint amit e-mailben küldtünk. Kérjük, jelentkezz ki, vagy lépj be anonim módban, és próbálkozz újra."
+    not_found_description: "Sajnáljuk, nem találtuk ezt a leiratkozást. Lehetséges, hogy az e-mailben szereplő link túl régi és lejárt?"
     log_out: "Kijelentkezés"
+    submit: "Beállítások mentése"
     digest_frequency:
+      title: "Igyen gyakran kapsz összefoglaló e-maileket: %{frequency}"
+      never_title: "Nem kapsz összefoglaló e-maileket"
+      select_title: "Az összefoglaló e-mailek gyakoriságának beállítása:"
       never: "soha"
       every_30_minutes: "30 percenként"
       every_hour: "óránként"
@@ -526,6 +652,10 @@ hu:
     otp_description: 'Szeretné, hogy a(z) „%{application_name}” hozzáférjen ehhez az oldalhoz?'
     otp_confirmation:
       confirm_title: Tovább a(z) %{site_name} oldalra
+      logging_in_as: Bejelentkezés %{username}ként
+      confirm_button: Bejelentkezés befejezése
+    scopes:
+      one_time_password: "Hozzon létre egyszeri bejelentkezési tokent"
   reports:
     default:
       labels:
@@ -578,6 +708,7 @@ hu:
       title: "Felhasználói profil megtekintések"
       xaxis: "Nap"
       yaxis: "Felhasználói profil megtekintések száma"
+      description: "A felhasználói profilok összes új nézete."
     topics:
       title: "Témák"
       xaxis: "Nap"
@@ -605,6 +736,7 @@ hu:
       yaxis: "Felhasználók száma"
       labels:
         level: Szint
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       xaxis: "Típus"
       yaxis: "Felhasználók száma"
@@ -623,28 +755,35 @@ hu:
       title: "Elküldött levelek"
       xaxis: "Nap"
       yaxis: "Levelek száma"
+      description: "Elküldött új e-mailek száma."
     user_to_user_private_messages:
       xaxis: "Nap"
       yaxis: "Üzenetek száma"
+      description: "Az újonnan kezdeményezett személyes üzenetek száma."
     user_to_user_private_messages_with_replies:
       xaxis: "Nap"
       yaxis: "Üzenetek száma"
+      description: "Az összes új személyes üzenet és válasz száma."
     system_private_messages:
       title: "Rendszer"
       xaxis: "Nap"
       yaxis: "Üzenetek száma"
+      description: "A rendszer által automatikusan elküldött személyes üzenetek száma."
     moderator_warning_private_messages:
       title: "Moderátori figyelmeztetés"
       xaxis: "Nap"
       yaxis: "Üzenetek száma"
+      description: "A moderátorok személyes üzeneteivel küldött figyelmeztetések száma."
     notify_moderators_private_messages:
       title: "Moderátorok értesítése"
       xaxis: "Nap"
       yaxis: "Üzenetek száma"
+      description: "Azon alkalmak száma, amikor a moderátorokat privát módon értesítették."
     notify_user_private_messages:
       title: "Felhasználó értesítése"
       xaxis: "Nap"
       yaxis: "Üzenetek száma"
+      description: "Azon alkalmak száma, amikor a moderátorokat privát módon értesítették."
     top_referrers:
       xaxis: "Felhasználó"
       num_clicks: "Kattintások"
@@ -735,22 +874,51 @@ hu:
       labels:
         filename: Fájlnév
         author: Szerző
+    top_ignored_users:
+      title: "Top letiltott/elnémított felhasználók"
+      labels:
+        ignored_user: Letiltott felhasználó
+        ignores_count: Letiltások száma
+        mutes_count: Némítások száma
+      description: "Olyan felhasználók, akiket sok más felhasználó némított el és / vagy tiltott le."
   dashboard:
     rails_env_warning: "A kiszolgáló jelenleg %{env} módban fut."
     host_names_warning: "A config/database.yml fájl az alapértelmezett „localhost” domaint használja. Állítsa be az oldala saját domain nevét."
     memory_warning: "A kiszolgáló kevesebb mint 1 GB memóriával rendelkezik. Legalább 1 GB memória ajánlott."
   site_settings:
     max_emojis_in_title: "A témacímekben lévő emodzsik legnagyobb száma"
+    post_excerpt_maxlength: "A bejegyzés kivonatának / összefoglalójának maximális hossza."
+    topic_excerpt_maxlength: "A témakör kivonatának / összefoglalójának maximális hossza a téma első bejegyzéséből generálva."
+    enforce_second_factor: "Kényszeríti a felhasználókat, hogy engedélyezzék a kétfaktoros hitelesítést. Válassza az 'all' lehetőséget, hogy érvényesítse az összes felhasználó számára. Válassza a „személyzet” lehetőséget, hogy csak a személyzet felhasználói számára érvényesítse."
+    use_admin_ip_allowlist: "Az adminokk csak akkor tudnak bejelentkezni, ha a Screened IPs listában megadott IP-címmel vannak megadva (Admin > Naplók > Screened Ips)."
     enable_badges: "A jelvény rendszer engedélyezése"
     min_password_length: "Minimum jelszóhossz."
     block_common_passwords: "A 10 000 leggyakoribb jelszó tiltása."
+    discourse_connect_overrides_profile_background: "Felülírja a felhasználói profil hátterét a külső webhely-avatarral a DiscourseConnect payloadból."
+    rate_limit_new_user_create_topic: "Egy téma létrehozása után az új felhasználóknak (n) másodpercet kell várniuk, mielőtt új témát hoznának létre."
+    suggested_topics: "A javasolt témák száma a téma alján láthatók."
+    limit_suggested_to_category: "Csak a javasolt kategóriákból származó témakörök jelenhetnek meg a javasolt témakörökben."
+    suggested_topics_max_days_old: "A javasolt olvasatlan témák nem lehetnek több, mint n naposak."
+    suggested_topics_unread_max_days_old: "A javasolt olvasatlan témák nem lehetnek több, mint n naposak."
+    selectable_avatars: "A felhasználó által választható avatarok listája."
     recompress_original_jpg_quality: "A feltöltött képfájlok minősége (1 – legalacsonyabb, 99 – legjobb, 100 – letiltás)."
     image_preview_jpg_quality: "Az átméretezett képfájlok minősége (1 – legalacsonyabb, 99 – legjobb, 100 – letiltás)."
+    dark_mode_none: "Egyik sem"
+    cold_age_days_low: "Ennyi nap beszélgetés után az utolsó tevékenység dátuma kissé elhomályosul."
     reply_by_email_enabled: "E-mail válaszok engedélyezése."
+    block_auto_generated_emails: "Az automatikusan generáltként azonosított bejövő e-mailek letiltása."
+    email_editable: "Engedélyezi a felhasználóknak, hogy a regisztráció után megváltoztassák az e-mail címüket."
+    suppress_digest_email_after_days: "Letiltja az összefoglaló e-maileket azon felhasználók számára, akik nem láttak a webhelyen (n) napnál hosszabb ideig."
+    digest_suppress_categories: "Letiltom ezeket a kategóriákat az összefoglaló e-mailekből."
+    embed_truncate: "Beágyazott bejegyzések rövidítése."
+    embed_post_limit: "A bejegyzések maximális száma a beágyazásban."
     enable_emoji: "Emodzsi engedélyezése"
     enable_emoji_shortcuts: "A gyakori mosolyt jelző szövegek, mint a :) :p és :( emodzsikká lesznek alakítva"
     emoji_set: "Hogy szeretné az emodzsiját?"
     auto_close_topics_create_linked_topic: "Új összekapcsolt téma létrehozása, ha a téma a „témák automatikus lezárása bejegyzésszám alapján” beállítás miatt automatikusan lezárásra kerül."
+    default_email_digest_frequency: "Alapértelmezés szerint a felhasználók milyen gyakran kapnak összefoglaló e-maileket."
+    default_other_skip_new_user_tips: "A tippek és jelvények kihagyása az új felhasználók regisztrációjakor"
+    default_other_like_notification_frequency: "A felhasználók értesítése a kedvelésekről alapértelmezett esetben."
     company_name: "Cégnév"
     errors:
       invalid_email: "Érvénytelen e-mail cím."
@@ -773,6 +941,9 @@ hu:
       topic: "Eredmények"
       user: "Felhasználók"
     results_page: "Találatok erre: „%{term}”"
+  discourse_connect:
+    not_found: "A fiókod nem található. Kérjük, lépj kapcsolatba a webhely rendszergazdájával."
+    account_not_approved: "A fiókod jóváhagyásra vár. A jóváhagyásról e-mailben küldünk majd neked értesítést."
   original_poster: "Eredeti szerző"
   most_posts: "Legtöbb bejegyzés"
   most_recent_poster: "Legutóbbi szerzők"
@@ -788,10 +959,14 @@ hu:
     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á."
   login:
+    invalid_second_factor_method: "A kiválasztott kéttényezős hitelesítés-módszer érvénytelen."
+    not_enabled_second_factor_method: "A kiválasztott kéttényezős hitelesítés-módszer nincs engedélyezve a fiókjában."
+    security_key_no_matching_credential_error: "A megadott biztonsági kulcsban nem található megfelelő hitelesítő adat."
     not_approved: "A fiókját még nem engedélyezték. Értesítve lesz, amint bejelentkezhet."
     incorrect_username_email_or_password: "Hibás felhasználónév, e-mail vagy jelszó"
     wait_approval: "Köszönjük, hogy regisztrált! Értesíteni fogjuk, amint elfogadták a kérelmét."
     active: "A fiókja aktív és készen áll a használatra."
+    activate_email: "<p>Mindjárt készen is vagyunk! Elküldtünk egy megerősítő e-mailt a <b>%{email}</b> címre. Kérlek, kövesd a benne található instrukciókat, és aktiváld a fiókodat.</p><p>Ha pár percen belül nem érkezne meg, ne felejtsd el a <b>SPAM</b> és a <b>Promóciók</b> mappában is ellenőrizni!</p>"
     admin_not_allowed_from_ip_address: "Nem léphet be erről az IP-címről adminisztrátorként."
     suspended: "Nem jelentkezhet be eddig: %{date}."
     suspended_with_reason: "A fiók felfüggesztve eddig: %{date}: %{reason}"
@@ -804,11 +979,13 @@ hu:
     reserved_username: "Ez a felhasználónév nem engedélyezett."
     missing_user_field: "Nem töltötte ki az összes felhasználói mezőt"
     click_to_continue: "Kattintson ide a folytatáshoz."
+    second_factor_title: "Kéttényezős hitelesítés"
     second_factor_backup_description: "Írja be valamelyik biztonsági kódját:"
   admin:
     email:
       sent_test: "elküldve."
   user:
+    deactivated: "Deaktiváltuk a túl sok innen visszapattanó e-mail miatt: '%{email}'."
     username:
       short: "nem lehet rövidebb, mint %{min} karakter"
       long: "nem lehet hosszabb, mint %{max} karakter"
@@ -818,15 +995,134 @@ hu:
       must_end_with_alphanumeric: "betűvel vagy számmal kell végződnie"
     email:
       blocked: "nem engedélyezett."
+    ip_address:
+      blocked: "Új regisztrációk nem engedélyezettek az te IP-címedről."
+      max_new_accounts_per_registration_ip: "Új regisztráció az Ön IP-címéről nem engedélyezett (elérte a maximális korlátot). Vegye fel a kapcsolatot egy munkatársával."
+  unsubscribe_mailer:
+    subject_template: "Erősítsd meg, hogy a továbbiakban nem szeretnél e-mailes frissítéseket kapni a %{site_title} oldalról."
+    text_body_template: |
+      Valaki (esetleg te?) Azt kérte, hogy ne küldjünk több e-mailes frissítést a %{site_domain_name} ról erre a címre.
+      Ha meg akarja erősíteni ezt, kattints erre a linkre:
+
+      %{confirm_unsubscribe_link}
+
+      Ha továbbra is szeretnéd megkapni az e-mailes frissítéseket, csak hagyd figyelmen kívül ezt az e-mailt.
+  invite_password_instructions:
+    text_body_template: |
+      Köszönjük, hogy elfogadtad a %{site_name} szóló meghívót - üdvözlünk!
+
+      Kattints erre a linkre a jelszó kiválasztásához:
+      %{base_url}/u/password-reset /%{email_token}
+
+      (Ha a fenti link lejárt, válaszd az "Elfelejtettem a jelszavamat" lehetőséget, amikor bejelentkezel ezzel az e-mail címeddel.)
   flags_dispositions:
+    agreed: "Köszönjük, hogy szóltál! Mi is úgy látjuk, hogy van itt egy probléma, vizsgáljuk!"
+    agreed_and_deleted: "Köszönjük, hogy szóltál! Mi is úgy látjuk, hogy van itt egy probléma, ezért letöröltük a posztot."
     disagreed: "Köszönjük, hogy jelezte, utánanézünk."
-    ignored: "Köszönjük, hogy jelezte, utánanézünk."
-    ignored_and_deleted: "Köszönjük, hogy jelezte, eltávolítottuk a bejegyzést."
+    ignored: "Köszönjük, hogy jelezted, utánanézünk!"
+    ignored_and_deleted: "Köszönjük, hogy jelezted, eltávolítottuk a bejegyzést."
   system_messages:
+    private_topic_title: "Téma #%{id}"
+    contents_hidden: "Kérjük, látogass el a bejegyzésre, hogy a tartalom megtekintéséhez!"
+    post_hidden:
+      text_body_template: |
+        Szia!
+
+        Ez egy automatikus üzenet a %{site_name}ról, hogy tudassa veled: a bejegyzésed elrejtettük.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Ezt a bejegyzést a közösség jelzései miatt rejtettük el, ezért kérjük, fontold meg, hogyan módosíthatnád úgy a bejegyzésedet, hogy ne keltsen a tagjainkban rossz érzést. **A bejegyzésedet %{edit_delay} perc múlva szerkesztheted, és utána automatikusan feloldjuk az elrejtését.**
+
+        Ha azonban a közösség másodszor is elrejti a bejegyzést, rejtve marad, amíg a munkatársak nem kezelik a problémát.
+
+        További útmutatásért olvasd el a [fórumunk szabályzatát](%{base_url}/guidelines).
+    post_hidden_again:
+      text_body_template: |
+        Szia,
+
+        Ez egy automatikus üzenet a %{site_name}tól, hogy tudassa veled: a bejegyzésed ismét el lett rejtve.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        A közösség megjelölte ezt a bejegyzést, és most el van rejtve. ** Mivel ez a bejegyzés már egynél többször lett problémásként megjelölve, a bejegyzés most már rejtve marad, amíg valamelyik admin személyesen meg nem nézi, és esetleg fel nem oldja a láthatatlanná tételt. **
+
+        További útmutatásért olvasd el a [fórumunk szabályzatát](%{base_url}/guidelines).
+    queued_by_staff:
+      title: "A bejegyzés jóváhagyásra vár."
+    flags_disagreed:
+      text_body_template: |
+        Szia!
+
+        Ez egy automatikus üzenet a %{site_name}ról, hogy tudassa veled: [a bejegyzésed](%{base_url}%{url}) visszaállítottuk.
+
+        A közösség megjelölte ezt a bejegyzést, de egy moderátorunk úgy döntött, hogy visszaállítja azt.
+
+        [részletek= Kattints a helyreállított bejegyzés kibontásához"]
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+        [/details]
+    flags_agreed_and_post_deleted:
+      text_body_template: |
+        Szia!
+
+        Ez egy automatikus üzenet a %{site_name}ról, hogy tudassa veled: [a bejegyzésed](%{base_url}%{url}) töröltük.
+
+        %{flag_reason}
+
+        A közösség megjelölte ezt a bejegyzést, de egy moderátorunk úgy döntött, hogy törli azt.
+
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+        További útmutatásért olvasd el a [fórumunk szabályzatát](%{base_url}/guidelines)!
     welcome_user:
       subject_template: "Üdvözöljük a(z) %{site_name} oldalon."
+      text_body_template: |
+        Köszönjük, hogy csatlakoztál a %{site_name}hoz, és üdvözlünk!
+
+        %{new_user_tips}
+
+        Olvasd el [a fórumunk használatának szabályait](%{base_url}/guidelines).
+
+        Örülünk, hogy itt vagy!
+    welcome_tl1_user:
+      subject_template: "Köszönjük, hogy velünk töltötted az idődet!"
+      text_body_template: |
+        Halihó! Örmmel látjuk, hogy hasznos és aktív tagja vagy a fórumunknak. Úgy gondoljuk, itt az idő, hogy előléptessünk egy bizalmi szinttel! [trust level!] (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
+
+        Nagyon örülünk, hogy közöttünk vagy, és szívesen megtudnánk többet rólad. Ha még nem tetted. szánj egy percet [a profilod kötöltésére] (%{base_url}/my/preferences/profile), vagy nyugodtan [indíts egy új témát] (%{base_url}/categories).
+    welcome_staff:
+      subject_template: "%{role} státuszt kaptál. Gratulálunk!"
+      text_body_template: |
+        Az egyik admin %{role} státuszt adott neked.
+
+         %{role}ként hozzáférsz az <a href='%{base_url}/admin' target='_blank'>adminisztrációs felülethez</a>.
+
+        A nagyobb hatalom nagyobb felelősséggel is jár. Ha még nem voltál soha moderátor, olvasd el a következő [moderációs útmutatót](https://meta.discourse.org/t/discourse-moderation-guide/63116), és bármikor, bármilyen kérdéssel keresd a tapasztaltabb moderátorokat bizalommal!
     welcome_invite:
       subject_template: "Üdvözöljük a(z) %{site_name} oldalon."
+      text_body_template: |
+        Köszönjük, hogy elfogadtad a %{site_name}ra szóló meghívót - üdvözlünk!
+
+        - Ezt az új fiókot **%{username}** hoztuk létre a számodra. Változtasd meg nevedet és a jelszavadat a [felhasználói profilod][prefs] meglátogatásával.
+
+        - Bejelentkezéskor kérjük, ** ugyanazt az e-mail címet használd, mint amelyre az eredeti meghívódat küldtük ** - különben nem fogunk tudni azonosítani!
+
+        %{new_user_tips}
+
+        Kérünk, olvasd el a [fórumunk szabályzatát] (%{base_url}/guidelines), és tartsd szem előtt mindig, amikor írsz.
+
+        Üdvözlünk a fórumon!
+
+        [prefs]: %{user_preferences_url}
+    tl2_promotion_message:
+      subject_template: "Gratulálunk a bizalmi szint előléptetésedhez!"
     backup_succeeded:
       subject_template: "A biztonsági mentés sikeresen befejeződött"
     backup_failed:
@@ -842,12 +1138,156 @@ hu:
       text_body_template: "A csoportos felhasználó-meghívás feldolgozása sikeres, %{sent} meghívó lett kiküldve."
     bulk_invite_failed:
       subject_template: "Hiba a csoportos felhasználó-meghívás feldolgozásakor"
+    csv_export_succeeded:
+      text_body_template: |
+        Az adatok exportálása sikeres volt! :dvd:
+
+        %{download_link}
+
+        A fenti letöltési link 48 órán keresztül érvényes lesz.
+
+        Az adatokat zip archívumként tömörítik. Ha az archívum nem bontja ki magát a megnyitásakor, használd az itt ajánlott eszközt: https://www.7-zip.org/
     csv_export_failed:
       title: "CSV exportálás sikertelen"
       subject_template: "Az adatok exportálása sikertelen"
+    email_reject_user_not_found:
+      text_body_template: |
+        Sajnáljuk, de az ide küldött %{destination} e-mail üzeneted (címe %{former_title}) nem ért célba.
+
+        Ismeretlen e-mail címről válaszoltál. Kérünk, használd azt az e-mail címet, amit a regisztrációkor adtál meg!
+
+        Ha úgy gondolod, hogy ez egy hiba, [lépj kapcsolatba a személyzet tagjaial] (%{base_url}/about).
+    email_reject_screened_email:
+      text_body_template: |
+        Sajnáljuk, de az ide küldött %{destination} e-mail üzeneted (címe %{former_title}) nem ért célba.
+
+        Az e-mail cím, amiről válaszoltál le van tiltva.
+
+        Ha úgy gondolod, hogy ez egy hiba, [lépj kapcsolatba a személyzet tagjaial] (%{base_url}/about).
+    email_reject_not_allowed_email:
+      text_body_template: |
+        Sajnáljuk, de az ide küldött %{destination} e-mail üzeneted (címe %{former_title}) nem ért célba.
+
+        Az e-mail cím, amiről válaszoltál le van tiltva.
+
+        Ha úgy gondolod, hogy ez egy hiba, [lépj kapcsolatba a személyzet tagjaial] (%{base_url}/about).
+    email_reject_auto_generated:
+      text_body_template: |
+        Sajnáljuk, de az ide: %{destination} küldött e-mailed (%{former_title} címmel) nem működött.
+
+        A te e-mailedet "automatikusan generáltként" jelölték meg, ami azt jelenti, hogy automatikusan egy számítógép hozta létre, ahelyett, hogy emberi gépelte volna; nem tudjuk elfogadni az ilyen típusú e-maileket. Ha úgy gondolod, hogy ez tévedés lesz, [vedd fel a kapcsolatot egy munkatársunkkal](%{base_url}/about)!
+    email_reject_reply_not_allowed:
+      text_body_template: |
+        Sajnáljuk, de az ide küldött %{destination} e-mail üzeneted (címe %{former_title}) nem ért célba.
+
+        Nincs jogosultságod válaszolni a témára. Ha úgy gondolod, hogy ez egy hiba, [lépj kapcsolatba a személyzet tagjaial] (%{base_url}/about).
+    email_reject_reply_to_digest:
+      text_body_template: |
+        Sajnáljuk, de az ide küldött %{destination} e-mail üzeneted (címe %{former_title}) nem ért célba.
+
+        Egy összefoglaló levélre válaszoltál, amit nem tudunk kézbesíteni.
+
+        Ha úgy gondolod, hogy ez egy hiba, [lépj kapcsolatba a személyzet tagjaial] (%{base_url}/about).
+    email_revoked:
+      text_body_template: |
+        Sajnáljuk, de gondjaink vannak az e-mailben történő eléréseddel. Az neked küldött legutóbbi néhány e-mailt mind kézbesíthetetlenül kaptuk vissza.
+
+        Ellenőriznéd, hogy ez az [e-mail címed] (%{base_url}/my/preferences/email) érvényes és működik? A kézbesítés javítása érdekében kérjük, add hozzá e-mail címünket a címjegyzékedhez / névjegyzékedhez!
+    ignored_users_summary:
+      subject_template: "Egy felhasználót már túl sokat tiltottak le"
+      text_body_template: |
+        Szia!
+
+        Ez egy automatikus üzenet a %{site_name}tól, amelyben tájékoztatunk, hogy @%{username} felhasználóót már %{ignores_threshold} felhasználó tiltotta. Ez azt jelezheti, hogy probléma merült fel vele kapcsolatban a közösségben.
+
+        Érdemes lehet [átnézned a legutóbbi bejegyzéseit](%{base_url}/u/%{username}/summary) és potenciálisan más felhasználóktól is a [tiltott és némított felhasználói jelentésben](%{base_url}/admin/reports/top_ignored_users).
+
+        További útmutatásért olvasd el a [fórumunk szabályzatát](%{base_url}/guidelines)!
+    too_many_spam_flags:
+      text_body_template: |
+        Szia!
+
+        Ez egy automatikus üzenet a %{site_name}ról, hogy tudassuk veled: a bejegyzéseidet ideiglenesen elrejtettük, mert a közösség megjelölte őket.
+
+        Óvintézkedésként az új fiókod el lett némítva, és nem tud válaszokat vagy témákat létrehozni, amíg egy adminisztrátor nem ellenőrizni azt. Elnézésedet kérjük a kellemetlenségért.
+
+        További útmutatásért, kérünk, olvasd el a [közösségi irányelveket](%{base_url}/ irányelvek)!
+    too_many_tl3_flags:
+      text_body_template: |
+        Szia!
+
+        Ez egy automatikus üzenet a %{site_name}ról, hogy tudassuk veled: a bejegyzéseidet ideiglenesen elrejtettük, mert a közösség megjelölte őket.
+
+        Óvintézkedésként az új fiókod el lett némítva, és nem tud válaszokat vagy témákat létrehozni, amíg egy adminisztrátor nem ellenőrizni azt. Elnézésedet kérjük a kellemetlenségért.
+
+        További útmutatásért, kérünk, olvasd el a [közösségi irányelveket](%{base_url}/ irányelvek)!
+    silenced_by_staff:
+      text_body_template: |
+        Szia!
+
+        Ez egy automatikus üzenet a %{site_name}ról, hogy tudassuk veled: a fiókodat ideiglenesen elővigyázatosságból felfüggesztettük.
+
+        Nyugodtan folytathatod a böngészést, de nem leszel képest válaszokat vagy témákat létrehozni, amíg egy [adminisztrátor](%{base_url}/about) nem ellenőrzi a legutóbbi hozzászólásaidat. Elnézésedet kérjük a kellemetlenségért.
+
+        További útmutatásért olvasd el a [fórumunk szabályzatát](%{base_url}/guidelines)!
+    user_automatically_silenced:
+      text_body_template: |
+        Ez egy automatikus üzenet.
+
+        Az új felhasználó [%{username}](%{user_url}) automatikusan el lett némítva, mert több felhasználó megjelölte %{username} bejegyzését.
+
+        Kérjük, [nézd át a jelöléseket](%{base_url}/admin/flags). Ha %{username}-t helytelenül hallgatták el, kattints a Némítás feloldása gombra a [felhasználó adminisztrációs oldalán](%{user_url}).
+
+        Ez a küszöb az „új felhasználók némítása” beállításon keresztül változtatható meg.
+    spam_post_blocked:
+      text_body_template: |
+        Ez egy automatikus üzenet.
+
+        Ez az új felhasználó [%{username}](%{user_url}) megpróbált több hozzászólást létrehozni a %{domains} linkre mutató linkkel, de ezeket a bejegyzéseket blokkoltuk a spam elkerülése érdekében. A felhasználó továbbra is képes új bejegyzéseket létrehozni, amelyek nem kapcsolódnak a %{domains}hoz.
+
+        Kérjük, [vizsgáld meg a felhasználót](%{user_url}), hogy nem egy fake profil-e!
+
+        Ez a beállítás módosítható az `newuser_spam_host_threshold` és az `allowed_spam_host_domains` beállításokon keresztül. Fontol meg %{domains}ek hozzáadását at az engedélylistához.
+    unsilenced:
+      title: "Némítás feloldva"
+      subject_template: "A fiók már nincs felfüggesztve"
+      text_body_template: |
+        Szia!
+
+        Ez egy automatikus üzenet a %{site_name}ról, hogy tudassa veled: a fiókodat felülvizsgáltuk, és nincs már felfüggesztve.
+
+        Most újra létrehozhatsz új válaszokat és témákat. Köszönjük a türelmedet!
     download_remote_images_disabled:
       subject_template: "A távoli képek letöltése le lett tiltva"
       text_body_template: "A `download_remote_images_to_local` beállítás le lett tiltva, mert az erre szánt `download_remote_image_threshold` tárhelykorlát elérésre került."
+    dashboard_problems:
+      subject_template: "Új tanácsok a webhely irányítópultján"
+      text_body_template: |
+        Van néhány új tanácsunk és javaslatunk a jelenlegi webhelybeállításaid alapján.
+
+        [Látogasd meg a webhely irányítópultját] (%{base_url}/ admin) ezek megtekintéséhez.
+
+        Ha semmi nem látható az irányítópulton, lehet, hogy egy másik munkatársunk már eljárt aktivizálta magát. A személyzeti műveletek listája megtalálható a [Staff Action Logs] (%{base_url}/ admin / logs / staff_action_logs) könyvtárban.
+    new_user_of_the_month:
+      text_body_template: |
+        Elnyerted ** A hónap új felhasználója %{month_year}** díjat. :trophy:
+
+        Ezt a díjat havonta csak két új felhasználónak ítéljük oda, és állandóan látható lesz a [jelvényeid között](%{url}).
+
+        Gyorsan értékes tagjává váltál közösségünknek. Köszönjük, hogy csatlakoztál, és folytasd ugyanilyen nagyszerűen! Bravo!
+    queued_posts_reminder:
+      text_body_template: |
+        Szia!
+
+        Egy új felhasználó bejegyzéseit moderálásra küldtük, és jelenleg felülvizsgálatra várnak. [Itt hagyhatod jóvá vagy utasíthatod el őket](%{base_url}/review?type=ReviewableQueuedPost).
+  unsubscribe_link: |
+    Ha le szeretne iratkozni ezekről az e-mailekről, [kattints ide](%{unsubscribe_url}).
+  unsubscribe_link_and_mail: |
+    Ha le szeretne iratkozni ezekről az e-mailekről, [kattints ide](%{unsubscribe_url}).
+  unsubscribe_mailing_list: |
+    Azért kapod ezt a levelet, mert engedélyezted a levelezőlista módot.
+
+    Ha le szeretne iratkozni ezekről az e-mailekről, [kattints ide] (%{unsubscribe_url}).
   subject_re: "Re: "
   subject_pm: "[PÜ]"
   user_notifications:
@@ -856,6 +1296,10 @@ hu:
     unsubscribe:
       title: "Leiratkozás"
       description: "Nem szeretné ezeket az e-maileket megkapni? Nem probléma! Kattintson ide és iratkozzon le azonnal:"
+    reply_by_email: "[Látogass el a témára](%{base_url}%{url}), vagy válaszolj erre az e-mailre a válaszadáshoz."
+    only_reply_by_email: "Válaszolj erre az e-mailre a válaszadáshoz!"
+    only_reply_by_email_pm: "Válaszolj erre az e-mailre, hogy válaszolj neki: %{participants}."
+    visit_link_to_respond: "[Látogassd meg a témát](%{base_url}%{url}) a válaszadáshoz."
     posted_by: "Beküldte: %{username}, ekkor: %{post_date}"
     pm_participants: "Résztvevők: %{participants}"
     user_invited_to_private_message_pm_group:
@@ -1007,6 +1451,23 @@ hu:
         %{message}
     account_exists:
       subject_template: "[%{email_prefix}] A fiók már létezik"
+      text_body_template: |
+        Most próbáltál létrehozni egy fiókot a %{site_name} oldalon, vagy megpróbáltad megváltoztatni a fiók e-mail címét %{email}. Viszont már létezik fiók ezzel az e-mail címmel: %{email}.
+
+        Ha elfelejtetted a jelszavadat, [állítsd vissza most](%{base_url}/password-reset).
+
+        Ha nem te próbáltál meg fiókot próbált létrehozni ezzel az e-mail címmel: %{email} vagy nem te akartad változtatta meg az e-mail címet, ne aggódj - hagyd nyugodtan figyelmen kívül ezt az üzenetet.
+
+        Ha kérdése van, [vedd fel a kapcsolatot barátságos munkatársainkkal](%{base_url}/about.).
+    account_second_factor_disabled:
+      title: "Kéttényezős hitelesítés kikapcsolva"
+      subject_template: "[%{email_prefix}] A kéttényezős hitelesítés letiltva"
+      text_body_template: |
+        A kétfaktoros hitelesítést letiltottuk fiókjában %{site_name}. Most már csak a jelszavaddal is be tud jelentkezni; további hitelesítési kód már nem szükséges.
+
+        Ha nem te kapcsoltad ki a kétfaktoros hitelesítést, akkor valaki feltörhette a fiókodat.
+
+        Ha kérdésed van, [vedd fel a kapcsolatot barátságos munkatársainkkal] (%{base_url}/about).
     digest:
       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"
@@ -1019,18 +1480,156 @@ hu:
       join_the_discussion: "Tovább"
       popular_posts: "Népszerű bejegyzések"
       subject_template: "[%{email_prefix}] Összefoglaló"
+      unsubscribe: "Ezt az összefoglalót %{site_link} tól küldjük, mert már egy ideje nem látunk. Az %{email_preferences_link} vagy a %{unsubscribe_link} oldalon tudod a beállításokat változtatni vagy leiratkozni."
       your_email_settings: "e-mail beállítások"
       click_here: "kattintson ide"
+      preheader: "Rövid összefoglaló a legutóbbi látogatásod óta, ami ekkor történt: %{last_seen_at}"
     forgot_password:
       title: "Elfelejtett jelszó"
       subject_template: "[%{email_prefix}] Jelszó visszaállítás"
+      text_body_template: |
+        Valaki a jelszavad visszaállítását kérte az oldalunkon, itt: [%{site_name}] (%{base_url}).
+
+        Ha nem te voltál, nyugodtan figyelmen kívül hagyhatod ezt az e-mailt.
+
+        Kattints a következő linkre az új jelszó létrehozásához:
+        %{base_url}/u/ password-reset/%{email_token}
+    email_login:
+      text_body_template: |
+        Itt van a link a bejelentkezéshez a [%{site_name}](%{base_url}) címen.
+
+        Ha nem te kérted ezt a linket, nyugodtan hagyd figyelmen kívül ezt az e-mailt.
+
+        Kattintson a következő linkre a belépéshez:
+        %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "Állítson be jelszót"
+      text_body_template: |
+        Valaki szeretne jelszót adni a fiókodhoz a [%{site_name}] (%{base_url}) oldalon. Alternatív megoldásként bejelentkezhetsz bármely támogatott online szolgáltatással (Google, Facebook stb.), amely ehhez az érvényes e-mail címedhez tartozik.
+
+        Ha nem te kérted a módosítást, nyugodtan figyelmen kívül hagyhatod ezt az e-mailt.
+
+        Kattintson a következő linkre a jelszó kiválasztásához:
+        %{base_url}/u/password-reset/%{email_token}
     admin_login:
       subject_template: "[%{email_prefix}] Bejelentkezés"
+      text_body_template: |
+        Valaki be szeretne jelentkezni a fiókodba a [%{site_name}] (%{base_url}) oldalon.
+
+        Ha nem te kérted, nyugodtan figyelmen kívül hagyhatod ezt az e-mailt.
+
+        Kattints a következő linkre a bejelentkezéshez:
+        %{base_url}/session/email-login/%{email_token}
+    account_created:
+      title: "Fiók létrehozva"
+      subject_template: "[%{email_prefix}] Az új fiókod"
+      text_body_template: |
+        Egy új fiók készült a számodta a %{site_name}n.
+
+        Kattints az alábbi linkre az új fiókodhoz tartozó jelszó kiválasztásához:
+        %{base_url}/u/password-reset/%{email_token}
+    confirm_new_email:
+      subject_template: "[%{email_prefix}] Erősítsd meg új e-mail címedet!"
+      text_body_template: |
+        A következő linkre kattintva erősítsd meg a nálunk, a %{site_name}n használandó új e-mail címét :
+
+        %{base_url}/u/confirm-new-email /%{email_token}
+
+        Ha nem te kérted ezt a módosítást, kérjük, lépj kapcsolatba a [site adminisztrátorával](%{base_url}/about)!
+    confirm_new_email_via_admin:
+      subject_template: "[%{email_prefix}] Erősítsd meg új e-mail címedet!"
+      text_body_template: |
+        A következő linkre kattintva erősítsd meg a nálunk, a %{site_name}n használandó új e-mail címét :
+
+        %{base_url}/u/confirm-new-email /%{email_token}
+
+        Ha nem te kérted ezt a módosítást, kérjük, lépj kapcsolatba a [site adminisztrátorával](%{base_url}/about)!
+    confirm_old_email:
+      text_body_template: |
+        Mielőtt megváltoztathatnánk az e-mail címedet, meg kell erősítened, hogy te irányítod a jelenlegi e-mail fiókodat, nem törte azt fel senki. A lépés végrehajtása után meg kell erősítenünk az új e-mail címedet.
+
+        Erősítsd meg a jelenlegi e-mail címedet, amit a %{site_name}n használsz a következő linkre kattintva:
+
+        %{base_url}/u/confirm-old-email/%{email_token}
+    confirm_old_email_add:
+      text_body_template: |
+        Mielőtt megváltoztathatnánk az e-mail címedet, meg kell erősítened, hogy te irányítod a jelenlegi e-mail fiókodat, nem törte azt fel senki. A lépés végrehajtása után meg kell erősítenünk az új e-mail címedet.
+
+        Erősítsd meg a jelenlegi e-mail címedet, amit a %{site_name}n használsz a következő linkre kattintva:
+
+        %{base_url}/u/confirm-old-email/%{email_token}
+    notify_old_email:
+      text_body_template: |
+        Ez egy automatikus üzenet, amely arról tájékoztat, hogy a
+        %{site_name}n használt e-mail címed megváltozott. Ha ez tévedésből történt, kérjük, fordulj az
+        adminisztrátorainkhoz!
+
+        Ez lett az új e-mail címed:
+
+        %{new_email}
+    notify_old_email_add:
+      text_body_template: |
+        Ez egy automatikus üzenet, amely arról tájékoztat, hogy a
+        %{site_name}n használt e-mail címed megváltozott. Ha ez tévedésből történt, kérjük, fordulj az
+        adminisztrátorainkhoz!
+
+        Ez lett az új e-mail címed:
+
+        %{new_email}
+    signup_after_approval:
+      subject_template: "Felhasználóvá váltál a %{site_name} oldalon!"
+      text_body_template: |
+        Üdvözölünk a %{site_name}n!
+
+        Egy adminisztrátorunk jóváhagyta a fiókodat a %{site_name}.n, most már beléphetsz, ha bejelentkezel az alábbi oldalon:
+        %{base_url}
+
+        Ha a fenti link nem kattintható, próbáld meg másolni és beilleszteni a webböngésző címsorába.
+
+        %{new_user_tips}
+
+        Kérünk, mindig tartsd be [a fórum szabályzatát](%{base_url}/guidelines).
+
+        Örülünk, hogy közöttünk vagy!
+    signup_after_reject:
+      subject_template: "A jelentkezésedet visszautasítottuk a %{site_name} oldalon."
     signup:
       title: "Feliratkozás"
+      subject_template: "[%{email_prefix}] Erősítsd meg új e-mail címedet!"
+      text_body_template: |
+        Üdvözöl a %{site_name}!
+
+        Kattints az alábbi linkre, hogy megerősítésd és aktiváld a fiókodat:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Ha a fenti link valamiért nem működne, másold ki és illeszd be a böngésződ címsorába!
+    activation_reminder:
+      text_body_template: |
+        Üdvözöl a %{site_name}!
+
+        Kattints az alábbi linkre, hogy megerősítsd és aktiváld a fiókodat:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Ha a fenti link valamiért nem működne, másold ki és illeszd be a böngésződ címsorába!
+    suspicious_login:
+      text_body_template: |
+        Szia!
+
+        Észrevettünk egy bejelentkezést egy olyan eszközről vagy helyről, amelyet általában te nem használsz. Te voltál az?
+
+         - Hely: %{location} (%{client_ip})
+         - Böngésző: %{browser}
+         - Eszköz: %{device} - %{os}
+
+        Ha te voltál, nagyszerű! Nincsen további teendőd.
+
+        Ha nem te voltál, kérlek [nézd át a meglévő munkameneteidet](%{base_url}/my/preferences/account), és változtasd meg a jelszavad!
+    post_approved:
+      title: "A bejegyzésedet jóváhagytuk"
+  page_forbidden:
+    title: "Hoppá! Az az oldal magánjellegű."
   page_not_found:
+    title: "Hoppá! Az az oldal nem létezik, vagy magánjellegű."
     popular_topics: "Népszerű"
     recent_topics: "Friss"
     see_more: "Több"
@@ -1042,7 +1641,17 @@ hu:
     images:
       size_not_found: "Sajnáljuk, de nem tudtuk megállapítani a kép méretét. Lehet, hogy a kép sérült?"
   skipped_email_log:
+    user_email_anonymous_user: "A felhasználó anonim"
+    user_email_seen_recently: "Nemrég látták a felhasználót"
+    user_email_post_user_deleted: "A bejegyzés felhasználóját törölték."
+    user_email_post_deleted: "a bejegyzést a szerző törölte"
     user_email_user_suspended: "felhasználó felfüggesztve"
+    user_email_already_read: "a felhasználó már elolvasta ezt a bejegyzést"
+    user_email_no_email: "Nincs e-mail hozzárendelve a %{user_id} felhasználói azonosítóhoz"
+    sender_message_blank: "az üzenet üres"
+    sender_post_deleted: "a választ törölték"
+    sender_message_to_invalid: "a címzett e-mail címe érvénytelen"
+    sender_topic_deleted: "Ez a témakör ki lett törölve"
   color_schemes:
     base_theme_name: "Alap"
     light: "Világos"
@@ -1053,6 +1662,7 @@ hu:
     latte: "Tejeskávé"
     summer: "Nyár"
     dark_rose: "Sötét rózsa"
+    default_theme_name: "Alapértelmezett"
     light_theme_name: "Világos"
     dark_theme_name: "Sötét"
     neutral_theme_name: "Semleges"
@@ -1076,79 +1686,185 @@ hu:
     editor:
       name: Szerkesztő
       description: Első bejegyzés szerkesztése
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor először szerkeszted az egyik bejegyzést. Noha örökké nem tudod szerkeszteni a bejegyzéseidet, a szerkesztés javasolt - javíthatod a formázást, kijavíthatod az apróbb hibákat, vagy hozzáadhatsz bármit, amit az eredetileg közzétett üzenetnél kihagytál. Szerkeszd, hogy a bejegyzéseid még jobbak legyenek!
     wiki_editor:
       name: Wikiszerkesztő
       description: Első wikiszerkesztés
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor először válaszolsz egy bejegyzésre e-mailben.
     basic_user:
       name: Alapvető
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor eléred az 1. bizalmi szintet. Köszönjük, hogy kitartottál és elolvastál néhány témát, hogy megtudd, miről szól a közösségünk. Több felhasználói funkció életbe lépett: megkaptad az összes alapvető közösségi képességet, például a személyes üzenetküldést, a megjelölést, a wiki szerkesztését, valamint több kép és link közzétételének lehetőségét.
     member:
       name: Tag
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor eléred a 2. bizalmi szintet. Köszönjük, hogy heteken át részt vettél a közösségünk építésében. Mostantól küldhetsz meghívókat a felhasználói oldalról vagy az egyes témákról, csoportos személyes üzeneteket hozhatsz létre, és naponta több lájkot szerezhetsz.
     regular:
       name: Rendes tag
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor eléred a 3. bizalmi szintet. Köszönjük, hogy hónapok óta rendszeresen részt veszel a közösségünk építésében. Az egyik legaktívabb olvasó vagy és megbízható közreműködő, aki nagyszerűvé teszi közösségünket. Mostantól kategorizálhatod és átnevezheted a témákat, használhatod az erősebb spamzászlókat, hozzáférhetsz egy privát társalgóhoz és naponta sokkal több kedvelést is szerezhetsz.
     leader:
       name: Vezető
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor eléred a 4. bizalmi szintet. A közösség egyik vezetője vagy, akit a többi tag választott ki, és itt bemutatott aktivitásoddal és szavaiddal pozitív példát mutatsz a közösség többi tagjának. Már képes vagy szerkeszteni az összes bejegyzést, elvégezheted a témakör moderátorának olyan műveleteit, mint a rögzítés, bezárás, kilistázás, archiválás, felosztás és egyesítés.
     welcome:
       name: Üdvözöljük
       description: Kedvelést kapott
+      long_description: |
+        Ez a jelvény akkor jár, ha megkapod az első lájkolást egy bejegyzésed után. Gratulálunk, közzétettél valamit, amit a közösség tagjai érdekesnek, jónak vagy hasznosnak találtak!
     autobiographer:
       name: Életrajzíró
       description: Kitöltötte a <a href="%{base_uri}/my/preferences/profile">profilinformációit</a>
+      long_description: |
+        Ezt a jelvényt <a href="%{base_uri}/my/preferences/profile">a felhasználói profil</a> kitöltése és a profilkped kiválasztása után kapod. Ha a közösségnek egy kicsit többet szeretnél megtudni arról, hogy ki vagy és mi érdekel, egy jobb, összetartóbb közösséggé válhatunk. Csatlakozz hozzánk!
     anniversary:
       name: Évforduló
       description: Egy éve aktív tag, legalább egyszer bejegyzést tett közzé
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha egy éve a fórum tagja vagy, és abban az évben legalább egy bejegyzést írtál. Köszönjük, hogy kitartottál és hozzájárultál közösségünkhöz. Nélküled nem tudtuk volna megcsinálni.
     nice_post:
       name: Szép válasz
       description: 10 kedvelést kapott egy válaszra
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha a válaszodra 10 kedvelést kaptál. Válaszod hatással volt a közösségre és elősegítette a beszélgetés előrehaladását.
     good_post:
       name: Jó válasz
+      description: 25 kedvelést kaptál egy válaszra
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha a válaszodra 25 kedvelést kaptál. Válaszod kivételes volt, és sokkal érdekesebbé tette a beszélgetést.
     great_post:
       name: Nagyszerű válasz
+      description: 50 kedvelést kaptál egy válaszra
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha a válaszodra 25 kedvelést kaptál. Azta! Válaszod inspiráló, lenyűgöző, vidám vagy éleslátó volt, és ezt a közösség szerette!
     nice_topic:
       name: Szép téma
+      description: 10 kedvelést kaptál egy válaszra
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha a témád 10 lájkot kap. Érdekes beszélgetést indítottál, amelyet a közösség élvezett.
     good_topic:
       name: Jó téma
+      description: 25 kedvelést kaptál egy válaszra
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha a témád 25 lájkot kap. Érdekes beszélgetést indítottál, amelyet a közösség élvezett.
     great_topic:
       name: Nagyszerű téma
+      description: 50 kedvelést kaptál egy válaszra
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha a témád 50 lájkot kap. Lenyűgöző beszélgetést indítottál, és a közösség szerette az élénk vitát!
     nice_share:
       name: Szép megosztás
+      description: A megosztásod 25 felhasználót ért el.
+      long_description: |
+        Ezt a jelvényt olyan link megosztásáért kapod, amelyre 25 külső látogató kattintott. Köszönjük, hogy terjesztetted a hírt beszélgetéseinkről és erről a közösségről.
     good_share:
       name: Jó megosztás
+      description: A megosztásod 300 felhasználót ért el.
+      long_description: |
+        Ezt a jelvényt olyan link megosztásáért kapod, amelyre 300 külső látogató kattintott. Szép munka! Remek beszélgetést mutattál meg egy csomó új embernek, és segítetted a közösség növekedését.
     great_share:
       name: Nagyszerű megosztás
+      description: A megosztásod 1000 felhasználót ért el.
+      long_description: |
+        Ezt a jelvényt olyan link megosztásáért kapod, amelyre 1000 külső látogató kattintott. Azta! Érdekes beszélgetést hirdettél egy hatalmas új közönség számára, és nagyban hozzájárultál a közösségünk növekedéséhez!
     first_like:
       name: Első kedvelés
+      description: Tetszett egy bejegyzés
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor először kedvelsz egy bejegyzést a :heart: gombbal. A bejegyzések kedvelése nagyszerű módja annak, hogy a közösség tagjai tudják, hogy amit közzé tettek, érdekesek, hasznosak, jók vagy szórakoztatók voltak számodra. Oszd meg a szeretetet!
+    first_flag:
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor először jelölsz meg egy bejegyzést. A megjelöléssel segíthetsz, hogy mindenki számára kellemes hely maradjon a fórum. Ha bármi olyan bejegyzést észlelsz, amely valamilyen okból moderátori figyelmet igényel, ne habozz megjelölni. Ha problémát látsz, :flag_black: jelöld meg!
     promoter:
       name: Népszerűsítő
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha valakit meghívsz a közösségbe a felhasználói oldal meghívó gombjával vagy egy téma alján. Olyan barátok meghívása, akik érdeklődhetnek konkrét beszélgetések iránt, nagyszerű módja annak, hogy új embereket mutass be közösségünknek. Köszönjük!
     campaigner:
       name: Kampányoló
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha meghívtál 3 embert, akik később elegendő időt töltöttek a webhelyen ahhoz, hogy alapvető felhasználók legyenek. Az élettel teli közösségnek rendszeresen szüksége van újonnan érkezőkre, akik rendszeresen részt vesznek és új hangokat adnak a beszélgetésekhez.
     champion:
       name: Bajnok
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha meghívsz 5 embert, akik később elegendő időt töltöttek a webhelyen, hogy teljes jogú tagokká váljanak. Köszönjük, hogy új tagokkal bővítetted közösségünk sokszínűségét!
     first_share:
       name: Első megosztás
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor először megosztasz egy válaszra vagy témára mutató linket a megosztás gomb használatával. A linkek megosztása nagyszerű módja annak, hogy érdekes beszélgetéseket mutass be és gyarapítsd a közösséget.
     first_link:
       name: Első hivatkozás
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor először adsz linket egy másik témához. A témák összekapcsolása segít az olvasótársaknak érdekes kapcsolódó beszélgetéseket találni, megmutatva a témák közötti összefüggéseket mindkét irányba. Linkelj szabadon!
     first_quote:
       name: Első idézet
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor első alkalommal idézel egy bejegyzést a válaszodban. A válaszban a korábbi bejegyzések releváns részeinek idézése segít a megbeszélések és témák összekapcsolódásában. Az idézés legegyszerűbb módja, ha kiemeled a bejegyzés egy részét, majd megnyomod bármelyik válasz gombot. Idézz nagylelkűen!
     read_guidelines:
       name: Irányelvek elolvasva
+      long_description: |
+        Ezt a jelvényt <a href="%{base_uri}/guidelines">adjuk, ha elolvasod a közösségi irányelveket</a>. Ezen egyszerű irányelvek betartása és megosztása biztonságos, szórakoztató és fenntartható közösséget kínál mindenki számára. Mindig emlékezz arra, hogy van egy másik ember a képernyő másik oldalán. Kedvesnek lenni menő!
     reader:
       name: Olvasó
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor először olvasol el egy hosszú témát, amely több, mint 100 választ tartalmaz. A beszélgetés olvasása segít a téma nyomon követésében, a különböző nézőpontok megértésében, és érdekesebb beszélgetésekhez vezet. Minél többet olvasol, annál jobb a beszélgetés. Mint azt szeretjük mondani, az olvasás alapvető! :slight_smile:
     popular_link:
       name: Népszerű hivatkozás
+      description: Külső linket tett közzé 50 kattintással
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha egy megosztott linked 50 kattintást kap. Köszönjük, hogy közzétettél egy hasznos linket, amely érdekes kontextust adott a beszélgetéshez!
     hot_link:
       name: Forró hivatkozás
+      description: Külső linket tett közzé 300 kattintással
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha egy megosztott linked 300 kattintást kap. Köszönjük, hogy egy szuper linket tettél közzé, amely elősegítette a beszélgetést és megvilágítottad a vitát!
     famous_link:
       name: Híres hivatkozás
+      description: Külső linket tett közzé 1000 kattintással
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha egy megosztott linked 1000 kattintást kap. Azta! Olyan linket tettél közzé, amely jelentős részleteket, kontextust és információkat adott hozzá, ami javítva a beszélgetést. Nagyszerű munkát végeztél!
     appreciated:
       name: Kedvelt
+      description: 1 kedvelést kaptál egy válaszra
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha legalább egy kedvelést kapsz 20 különböző bejegyzésben. A közösség élvezi az itteni beszélgetésekhez való hozzájárulásodat!
     respected:
       name: Tisztelt
+      description: 2 kedvelést kaptál egy válaszra
+      long_description: |
+        Ezt a jelvényt akkor kapjod meg, ha legalább 2 kedvelést kapsz 100 különböző bejegyzésről. Azta! A közösség csodálja, hogy gyakran, magas színvonalon működsz közre az itteni beszélgetésekben.
     admired:
       name: Csodált
+      description: 5 kedvelést kaptál egy válaszra
+      long_description: |
+        Ezt a jelvényt akkor kapjod meg, ha legalább 5 kedvelést kapsz 300 különböző bejegyzésről. Azta! A közösség csodálja, hogy gyakran, magas színvonalon működsz közre a beszélgetésekben.
+    out_of_love:
+      description: '%{max_likes_per_day} lájkot használtál el egy nap alatt'
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha a maximális %{max_likes_per_day} napi kedvelésedet felhasználod. Kedveld a posztokat, amiket élveztél olvasni. A számodra kedves és értékes bejegyzések kedvelésével arra ösztönzöd a közösség tagjait, hogy a jövőben még több nagyszerű vitát hozzanak létre.
+    higher_love:
+      description: 5 %{max_likes_per_day} lájkot használtál el egy nap alatt
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha 5 napig az összes %{max_likes_per_day} napi lájkodat felhasználod. Köszönjük, hogy minden nap aktívan ösztönzöd a legjobb beszélgetéseket!
+    crazy_in_love:
+      description: 20 %{max_likes_per_day} lájkot használtál el egy nap alatt
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha 20 napig az összes %{max_likes_per_day} kedvelésedet felhasználod. Példakép vagy a közösség tagjai ösztönzésére!
     thank_you:
       name: Köszönöm
+      description: 20 kedvelt hozzászólásod és 10 kedvelésed van
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha 20 kedvelt bejegyzésed van, és 10 vagy több kedvelést adtál cserébe. Ha valakinek tetszenek a bejegyzéseid, cserébe kövesd és kedveld mások által közzétett posztokat is!
+    gives_back:
+      description: 100 kedvelt hozzászólásod és 100 kedvelésed van
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha 100 kedvelt bejegyzésed van, és 100 vagy több kedevelést adtál cserébe.
     empathetic:
       name: Empatikus
+      description: 500 kedvelt hozzászólásod és 1000 kedvelésed van
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, ha 500 kedvelt bejegyzésed van, és 1000 vagy több kedvelést adsz cserébe. Azta! A nagylelkűség és a kölcsönös megbecsülés :two_hearts:példaképe vagy.
     first_emoji:
       name: Első emodzsi
       description: Egy emodzsit használt egy bejegyzésben
@@ -1156,14 +1872,27 @@ hu:
       name: Első megemlítés
     first_reply_by_email:
       name: Első e-mail válasz
+      long_description: |
+        Ezt a jelvényt akkor kapod meg, amikor először válaszolsz egy bejegyzésre :e-mail: e-mailben.
     new_user_of_the_month:
       name: "A hónap új felhasználója"
+      long_description: |
+        Ez a jelvény minden hónapban két új felhasználónak jár, a fórumhoz való hozzáállásukért annak mérésével, hogy kiknek és milyen gyakran kedvelték a bejegyzéseiket.
     enthusiast:
       name: Lelkes
+      description: 10 egymást követő napon jártál nálunk
+      long_description: |
+        Ezt a jelvényt 10 egymást követő nap meglátogatására kapod meg. Köszönjük, hogy több mint egy hétig velünk tartottál!
     aficionado:
       name: Rajongó
+      description: 100 egymást követő napon jártál nálunk
+      long_description: |
+        Ezt a jelvényt azok kapják, akik 100 egymást követő napon látogatják meg a fórumunkat. Wow, egy több, mint három hónap!
     devotee:
       name: Elkötelezett
+      description: 365 egymást követő napon jártál nálunk
+      long_description: |
+        Ezt a jelvényt azok kapják, akik 365 egymást követő napon látogatják meg a fórumunkat. Wow, egy egész év!
   admin_login:
     success: "E-mail elküldve"
     errors:
@@ -1187,6 +1916,7 @@ hu:
       help: "a kezdéshez regisztráljon egy új fiókot"
     confirm_email:
       title: "Erősítse meg az e-mail címét"
+      message: "<p>Aktiváló levelet küldtünk az <b>%{email}</b>címre, pár percen belül a postaládádban kell lennie. A fiók aktiválásához kövesd az e-mailben található utasításokat.</p><p>Ha nem érkezik meg, ellenőrizd a spam (és Gmail esetén a Promóciók) mappát is, és <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>ellenőrizd, hogy jó e-mail címet adtál-e meg!</a>.</p>"
     resend_email:
       title: "Aktiváló e-mail újraküldése"
   wizard:
@@ -1195,8 +1925,12 @@ hu:
         title: "Név"
       introduction:
         title: "Bemutatkozás"
+        fields:
+          welcome:
+            extra_description: "Ha nem vagy biztos benne, kihagyhatod ezt a lépést, és később szerkesztheted az üdvözlő témát."
       privacy:
         title: "Hozzáférés"
+        description: "<p>A közösséged mindenki előtt nyitva áll, vagy tagság, meghívás vagy jóváhagyás korlátozza? Ha szeretnéd, beállíthatod először titkosra ezt, majd később átválthatsz a nyilvánosra is.</p>"
         fields:
           privacy:
             choices:
@@ -1212,6 +1946,7 @@ hu:
             placeholder: "name@example.com"
           contact_url:
             label: "Weboldal"
+            placeholder: "https://www.example.com/contact-us"
           site_contact:
             label: "Automatikus üzenetek"
       corporate:
@@ -1220,6 +1955,12 @@ hu:
           company_name:
             label: "Cégnév"
             placeholder: "Példa szervezet"
+      colors:
+        title: "Színek"
+      fonts:
+        fields:
+          font_preview:
+            label: "Előnézet"
       logos:
         title: "Logók"
         fields:
@@ -1245,8 +1986,6 @@ hu:
                 label: "Kategóriák és legutóbbi témák"
               categories_and_top_topics:
                 label: "Kategóriák és legnépszerűbb témák"
-      emoji:
-        title: "Emodzsi"
       invites:
         title: "Stáb meghívása"
       finished:
@@ -1259,6 +1998,9 @@ hu:
       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}'
+      linked: '%{username} válaszolt neked itt: "%{topic}" - %{site_title}'
+      watching_first_post: '%{username} új témát hozott létre: "%{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}"
@@ -1276,6 +2018,8 @@ hu:
       low: "Alacsony"
       medium: "Közepes"
       high: "Magas"
+    reasons:
+      suspect_user: "Ez az új felhasználó anélkül adta meg a profil adatait, hogy bármilyen témát vagy bejegyzést olvasott volna, ami erősen azt sugallja, hogy spamelők lehetnek. See `approve_suspect_users`."
     actions:
       agree_and_keep:
         title: "Bejegyzés megtartása"
@@ -1298,21 +2042,23 @@ hu:
       delete:
         title: "Törlés…"
       delete_and_ignore:
-        title: "Bejegyzés törlése és figyelmen kívül hagyás"
+        title: "Bejegyzés törlése és letiltás"
         description: "Bejegyzés törlése, és ha ez az első bejegyzés, akkor a téma törlése"
       delete_and_ignore_replies:
-        title: "Bejegyzés törlése a válaszokkal együtt, és figyelmen kívül hagyás"
+        title: "Bejegyzés törlése a válaszokkal együtt, és letiltás"
         description: "Bejegyzés törlése a válaszokkal együtt, és ha ez az első bejegyzés, akkor a téma törlése"
+        confirm: "Biztos vagy benne, hogy törölni szeretnéd a hozzászólásra adott válaszokat is?"
       delete_and_agree:
         description: "Bejegyzés törlése, és ha ez az első bejegyzés, akkor a téma törlése"
       delete_and_agree_replies:
         description: "Bejegyzés törlése a válaszokkal együtt, és ha ez az első bejegyzés, akkor a téma törlése"
+        confirm: "Biztos vagy benne, hogy törölni szeretnéd a hozzászólásra adott válaszokat is?"
       disagree_and_restore:
         description: "A bejegyzés visszaállítása, hogy minden felhasználó láthassa."
       disagree:
         title: "Elutasítás"
       ignore:
-        title: "Figyelmen kívül hagyás"
+        title: "Letiltás"
       approve:
         title: "Jóváhagyás"
       approve_post:
@@ -1324,10 +2070,23 @@ hu:
         title: "Elutasítás"
       delete_user:
         title: "Felhasználó törlése"
+  notification_level:
+    ignore_error: "Sajnáljuk, de nem tilthatod le ezt a felhasználót"
+  old_keys_reminder:
+    body: |
+      Szia! Ez egy szokásos éves biztonsági emlékeztető a Discourse példányától.
+
+      Jóvoltából szerettük volna tudatni Önnel, hogy a Discourse példányában használt következő hitelesítő adatokat két évnél hosszabb ideig nem frissítették:
+
+      %{keys}
+
+      Jelenleg nincs szükség semmilyen intézkedésre, azonban jó biztonsági gyakorlatnak tekinthető néhány évente körözze le az összes fontos hitelesítő adatot.
   create_linked_topic:
     topic_title_with_sequence:
       one: "%{topic_title} (%{count}. rész)"
       other: "%{topic_title} (%{count}. rész)"
+    post_raw: "Beszélgetés folytatása innen: %{parent_url}.\n\nElőző beszélgetések:\n\n%{previous_topics}"
+    small_action_post_raw: "Beszélgetés folytatása itt: %{new_title}."
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index f3c7f17e61..224a1aafdd 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -39,6 +39,7 @@ hy:
   title: "Discourse"
   topics: "Թեմաներ"
   posts: "գրառումներ"
+  views: "դիտումների"
   loading: "Բեռնում"
   powered_by_html: 'Գործարկված է <a href="https://www.discourse.org">Discourse</a>-ի կողմից, լավագույնս աշխատում է, երբ JavaScript-ը միացված է'
   sign_up: "Գրանցվել"
@@ -50,6 +51,8 @@ hy:
   remove_posts_deleted_by_author: "Ջնջված է հեղինակի կողմից"
   redirect_warning: "Մենք չկարողացանք հաստատել, որ Ձեր ընտրած հղումը իրականում հրապարակվել է ֆորումում: Եթե ամեն դեպքում ցանկանում եք շարունակել, ընտրեք ներքևի հղումը:"
   on_another_topic: "Մեկ այլ թեմայում"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} %{username}-ի կողմից"
   themes:
     bad_color_scheme: "Անհնար է թարմացնել թեման, անվավեր գունապնակ"
     other_error: "Թեման թարմացնելիս ինչ-որ բան այնպես չէ ընթացել"
@@ -169,9 +172,10 @@ hy:
       s3_bucket_reused: "Դուք չեք կարող օգտագործել միևնույն արկղը 's3_upload_bucket' -ի և 's3_backup_bucket' -ի համար: Ընտրեք այլ արկղ կամ օգտագործեք տարբեր ուղիներ յուրաքանչյուր արկղի համար:"
     conflicting_google_user_id: 'Այս հաշվի Google Account ID -ն փոփոխվել է; պահանջվում է անձնակազմի միջամտություն անվտանգության պատճառներից ելնելով: Խնդրում ենք կապվել անձնակազմի հետ ր նշել նրանց հետևյալը՝ <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   invite:
-    error_message: "Հրավերն ընդունելիս տեղի է ունեցել սխալ: Խնդրում ենք կապվել կայքի ադմինիստրատորի հետ:"
     user_exists: "Կարիք չկա հրավիրել <b>%{email}</b> -ին, նա <a href='%{base_path}/u/%{username}/summary'>արդեն իսկ ունի հաշիվ!</a>"
     confirm_email: "<p>Դուք գրեթե վերջացրել եք! Մենք ակտիվացման նամակ ենք ուղարկել Ձեր էլ. հասցեին: Խնդրում ենք հետևել նամակի հրահանգներին Ձեր հաշվի ակտիվացման համար: </p><p>Եթե այն չի հասնում, ստուգեք Ձեր սպամի թղթապանակը: </p>"
+    disabled_errors:
+      invalid_access: "Դուք թույլտվություն չունեք դիտելու հարցված ռեսուրսը:"
   bulk_invite:
     file_should_be_csv: "Վերբեռնվող ֆայլը պետք է լինի csv ֆորմատի:"
     error: "Այդ ֆայլը վերբեռնելիս տեղի է ունեցել սխալ: Խնդրում ենք փորձել կրկին ավելի ուշ: "
@@ -259,6 +263,9 @@ hy:
   topics_in_category: "'%{category}' կատեգորիայի թեմաները"
   rss_posts_in_topic: "RSS լրահոս հետևյալի համար՝ '%{topic}'"
   rss_topics_in_category: "RSS լրահոս '%{category}' կատեգորիայի թեմաների համար"
+  rss_num_posts:
+    one: "%{count} հրապարակում"
+    other: "%{count} գրառում"
   read_full_topic: "Կարդալ ամբողջական թեման"
   private_message_abbrev: "Նմկ"
   rss_description:
@@ -319,26 +326,6 @@ hy:
     until_posts:
       one: "%{count} գրառում"
       other: "%{count} գրառում"
-    "new-topic": |
-      Բարի գալուստ %{site_name} &mdash; **շնորհակալ ենք նոր խոսակցություն սկսելու համար!**
-
-      - Վերնագիրը հետաքրքի՞ր է հնչում, երբ Դուք կարդում եք այն բարձրաձայն: Այն լա՞վ ամփոփում է:
-
-      - Ո՞ւմ կհետաքրքրի սա: Ինչո՞ւ է այն էական: Ինչ տեսակի արձագանքներ եք ցանկանում:
-
-      - Ներառեք ընդհանուր օգտագործվող բառեր Ձեր թեմայում, որպեսզի մյուսները կարողանան *գտնել* այն: Ձեր թեման համանման թեմաների հետ խմբավորելու համար ընտրեք կատեգորիա:
-
-      Ավելին իմանալու համար [դիտեք մեր համայնքի ուղեցույցը](%{base_path}/ուղեցույց:. Այս հարթակը կհայտնվի միայն Ձեր առաջին %{education_posts_text}-ում:
-    "new-reply": |
-      Բարի գալուստ %{site_name} &mdash; **շնորհակալություն մասնակցության համար!**
-
-      - Ձեր պատասխանը որևէ կերպ բարելավո՞ւմ է խոսակցությունը:
-
-      - Եղեք բարի Ձեր համայնքի ընկեր անդամների հանդեպ:
-
-      - Կառուցողական քննադատությունը ողջունվում է, սակայն քննադատեք *մտքերը*, ոչ թե մարդկանց:
-
-      Ավելին իմանալու համար [այցելեք մեր համայնքի ուղեցույց](%{base_path}/guidelines): Այս կառավարման հարթակը կհայտնվի միայն Ձեր առաջին %{education_posts_text}-ում:
     avatar: |
       ### Ի՞նչ կասեք Ձեր հաշվի համար նկարի մասին:
 
@@ -485,20 +472,8 @@ hy:
     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: "Դուք կատարում եք այժմեական (live) գրառումների քանակի հարցում շատ արագ: Խնդրում ենք սպասել%{time_left} մինչ կրկին փորձելը:"
       unsubscribe_via_email: "Դուք հասել եք էլ. հասցեի միջոցով բաժանորդագրումից դուրս գալու առավելագույն քանակին: Խնդրում ենք սպասել %{time_left} մինչ կրկին փորձելը:"
-      topic_invitations_per_day: "Դուք հասել եք թեմաների հրավերների առավելագույն թվին: Խնդրում ենք սպասել %{time_left} մինչ կրկին փորձելը:"
     hours:
       one: "%{count} ժամ"
       other: "%{count} ժամ"
@@ -729,9 +704,7 @@ hy:
     mute_topic: "Խլացնել այս թեմայի բոլոր ծանուցւոմները, %{link}"
     unwatch_category: "Դադարել դիտել %{category} -ի բոլոր թեմաները"
     mailing_list_mode: "Անջատել փոստային ցուցակի ռեժիմը"
-    all: "Չուղարկել ինձ որևէ էլ. նամակ%{sitename}-ից"
     different_user_description: "Դուք ներկայումս մուտքագրված եք որպես մեկ այլ օգտատեր, քան այն, ում մենք ուղարկել ենք էլ. նամակ: Խնդրում ենք դուրս գրվել կամ մուտք գործել անանուն ռեժիմ և փորձել կրկին:"
-    not_found_description: "Ներողություն, մենք չկարողացանք գտնել այս բաժանորդագրումից հրաժարումը: Հնարավոր է՝ Ձեր էլ.նամակի հղումը ժամկետանց է:"
     log_out: "Դուրս Գրվել"
     digest_frequency:
       never: "երբեք"
@@ -750,6 +723,7 @@ hy:
     instructions: 'Մենք հենց նոր գեներացրինք նոր օգտատիրոջ API key՝ "%{application_name}" -ի հետ պգտագործելու համար, խնդրում ենք տեղադրել հետևյալ key -ը Ձեր հավելվածում.'
     otp_confirmation:
       confirm_title: Շարունակել դեպի %{site_name}
+      logging_in_as: Մուտք գործել որպես %{username}
       confirm_button: Ավարտել Մուտքը
     no_trust_level: "Ներողություն, Դուք չունեք օգտատիրոջ API -ի համար պահանջվող վստահության մակարդակը "
     generic_error: "Ներողություն, մենք չկարողացանք թողարկել օգտատիրոջ API key-եր, հնարավոր է՝ այս հատկանիշը անջատված է կայքի ադմինի կողմից:"
@@ -888,6 +862,7 @@ hy:
       labels:
         level: Մակարդակ
       description: "Ըստ վստահության մակարդակի խմբավորված օգտատերերի քանակ:"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Օգտատերեր ըստ Տիպի"
       xaxis: "Տիպ"
@@ -1117,10 +1092,8 @@ hy:
     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: "Քանի րոպե պետք է անցնի, մինչ օգտատերը կարողանա կրկին կատարել միևնույն բովանդակությամբ գրառում"
@@ -1129,7 +1102,6 @@ hy:
     site_description: "Նկարագրեք այս կայքը մեկ նախադասությամբ, ինչպես որ օգտագործված է մետա-նկարագրության թեգում:"
     short_site_description: "Կարճ նկարագրություն, ինչպես որ օգտագործված է գլխավոր էջի վերնագրի թեգում:"
     contact_email: "Այս կայքի համար պատասխանատու key կոնտակտի էլ. հասցեն: Օգտագործվում է ծայրահեղ ծանուցումների համար, ինչպես նաև՝ <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: "Հեռակա նկարները տեղայնորեն ներբեռնելու համար դիսկի նվազագույն անհրաժեշտ տարածքը (տոկոսներով)"
@@ -1151,6 +1123,8 @@ hy:
     show_pinned_excerpt_mobile: "Ցուցադրել հատվածը ամրագրված թեմաների վրա հեռախոսային տարբերակում:"
     show_pinned_excerpt_desktop: "Ցուցադրել հատվածը ամրագրված թեմաների վրա համակարգչային տարբերակում:"
     post_onebox_maxlength: "Սմարթ ներդիրի վերածված Discourse գրառման առավելագույն երկարությունը սիմվոլներով:"
+    blocked_onebox_domains: "Դոմենների ցանկը, որոնք երբեք չեն վերածվի սմարթ-ներդիրի:"
+    allowed_inline_onebox_domains: "Դոմենների ցանկ, որոնք կվերածվեն սմարթ-ներդիրի փոքրացված տեսքով՝ առանց վերնագրի կապակցված լինելու դեպքում"
     max_oneboxes_per_post: "Գրառման մեջ սմարթ-ներդիրների առավելագույն քանակը:"
     logo: "Ձեր կայքի վերևի ձախ կողմում գտնվող լոգոյի նկարը: Օգտագործեք լայն ուղղանկյուն նկար 120 երկարությամբ և 3:1 -ից բարձր հարաբերակցությամբ: Եթե թողնեք դատարկ, կցուցադրվի կայքի վերնագրի տեքստը:"
     logo_small: "Ձեր կայքի վերևի ձախ կողմում գտնվող փոքր լոգոյի նկարը, որը ցուցադրվում է ներքև իջնելիս: Օգտագործեք քառակուսի 120 × 120 նկար: Եթե թողնեք դատարկ, կցուցադրվի հիմնական նկարը:"
@@ -1160,7 +1134,6 @@ hy:
     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>"
     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_percent_filter: "Երբ օգտատերը սեղմում է 'Ամփոփել Այս Թեման' , ցուցադրել գրառումների թոփ %-ը"
     summary_max_results: "'Ամփոփել Այս Թեման' -ի կողմից վերադարձված առավելագույն գրառումները"
@@ -1192,6 +1165,9 @@ hy:
     maximum_session_age: "Օգտատերը կմնա մուտքագրված վերջին այցելությունից n ժամ անց"
     enable_escaped_fragments: "Վերադարձ դեպի Google's Ajax-Crawling API , եթե ոչ մի ցանցային տվայլների հավաքագրիչ (webcrawler) հայտնաբերված չէ: Այցելեք <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     cors_origins: "Թույլատրելի origin-ներ խաչաձև origin հարցումների համար (CORS): Յուրաքանչյուր origin պետք է ներառի http:// կամ https://: DISCOURSE_ENABLE_CORS env փոփոխականը պետք է սահմանված լինի true ՝ CORS -ի միացման համար:"
+    use_admin_ip_allowlist: "Ադմինները կարող են մուտք գործել, եթե միայն ունեն Ցուցադրված IP-ների ցանկում սահմանված IP հասցե (Admin > Logs > Screened Ips):"
+    blocked_ip_blocks: "Մասնավոր IP արգելափակումների ցանկ, որոնք երբեք չպետք է ենթարկվեն տվյալների հավաքագրման Discourse-ի կողմից:"
+    allowed_internal_hosts: "Ներքին հոսթերի ցանկ, որը discourse-ը կարող է ապահով հավաքագրել սմարթ-ներդիրի և այլ նպատակների համար"
     allowed_iframes: "iframe src դոմենի նախամասնիկներ, որ discourse-ը կարող է ապահով թույլատրել գրառումներում"
     slow_down_crawler_user_agents: "Ցանցային տվյալների հավաքագրիչների օգտատերերի գործակալներ, որոնք պետք է սահմանափակված լինեն robots.txt-ով՝ օգտագործելով Crawl-delay ուղղորդիչը"
     slow_down_crawler_rate: "Եթե slow_down_crawler_user_agents -ը որոշված է, այս գնահատականը կկիրառվի տվյալների բոլոր հավաքագրիչների նկատմամբ (հարցումների միջև դադարի վայրկյանների քանակը)"
@@ -1222,6 +1198,8 @@ hy:
     email_token_valid_hours: "Մոռացել եմ գաղտնաբառը / ակտիվացնել հաշիվը տոկենները վավեր են (n) ժամ: "
     enable_badges: "Միացնել կրծքանշանների համակարգը"
     enable_whispers: "Թույլատրել անձնակազմի մասնավոր հաղորդակցությունը թեմաների ներսում:"
+    blocked_email_domains: "Էլ. փոստի դոմենների ցանկ՝ բաժանված խողովակի սիմվոլով( | ), որոնցով օգտատերերին չի թույլատրվում գրանցել հաշիվ: Օրինակ՝ mailinator.com|trashmail.net"
+    allowed_email_domains: "Էլ. փոստի դոմենների ցանկ՝ բաժանված խողովակի սիմվոլով( | ), որոնցով օգտատերերը ՊԵՏՔ Է գրանցեն հաշիվներ: ՈՒՇԱԴՐՈՒԹՅՈՒՆ՝ այս ցանկի դոմեններից տարբեր էլ. հասցեներ ունեցող օգտատերերին չի թույլատրվի!"
     hide_email_address_taken: "Գրանցման ընթացքում և ՛մոռացել եմ գաղտնաբառը՛ էջում օգտատերերին ցույց չտալ, որ տրված էլ. հասցեով հաշիվ գոյություն ունի:"
     log_out_strict: "Ելքագրվելիս դուրս գալ օգտատիրոջ ԲՈԼՈՐ գործընթացներից բոլոր սարքերի վրա:"
     version_checks: "Ստուգել Discourse Hub -ը տարբերակի թարմացումների համար և ցուցադրել նոր տարբերակի հաղորդագրությունները <a href='%{base_path}/admin' target='_blank'>/admin</a> կառավարման հարթակում:"
@@ -1235,19 +1213,7 @@ hy:
     min_admin_password_length: "Ադմինի գաղտնաբառի նվազագույն երկարությունը:"
     password_unique_characters: "Եզակի սիմվոլների նվազագույն քանակը, որ պետք է ունենա գաղտնաբառը:"
     block_common_passwords: "Չթույլատրել գաղտնաբառերը, որոնք գտնվում են 10000 ամենատարածված գաղտնաբառերի ցանկում:"
-    enable_sso: "Միացնել միասնական մուտքը արտաքին կայքի միջոցով (ՈՒՇԱԴՐՈՒԹՅՈՒՆ՝ ՕԳՏԱՏԵՐԵՐԻ ԷԼ. ՀԱՍՑԵՆԵՐԸ *ՊԵՏՔ Է* ՎԱՎԵՐԱՑՎԵՆ ԱՐՏԱՔԻՆ ԿԱՅՔԻ ԿՈՂՄԻՑ!)"
-    verbose_sso_logging: "Գրառել SSO-ի հետ կապված բառային բնորոշումները <a href='%{base_path}/logs' target='_blank'>/logs</a>-ում"
-    enable_sso_provider: "Իրականացնել Discourse SSO մատակարարի պրոտոկոլը /session/sso_provider վերջնակետում. պահանջվում է տեղադրել sso_provider_secrets "
-    sso_url: "Վերջնակետի եզակի նշանի URL (պետք է պարունակի http:// կամ https://)"
-    sso_secret: "Գաղտնի տող, որը օգտագործվում է կրիպտոգրաֆիկ կերպով SSO տեղեկատվությունը նույնականացնելու համար, համոզվեք, որ այն ունի 10 կամ ավելի սիմվոլ"
-    sso_overrides_bio: "Վերասահմանում է օգտատիրոջ կենսագրությունը իր պրոֆիլում և կանխարգելում է օգտատիրոջը այն փոփոխելուց"
-    sso_overrides_groups: "Համաժամանակեցնել բոլոր ձեռքով գրված խմբերի անդամակցությունները՝ խմբերի 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_path -երը (լռելյայն կերպով վերադարձի ուղին պետք է լինի ընթացիկ կայքում)"
-    enable_local_logins: "Միացնել տեղական օգտանվամբ և գաղտնաբառով մուտքերի վրա հիմնված հաշիվները: Սա պետք է միացված լինի, որպեսզի հրավերները աշխատեն: ՈՒՇԱԴՐՈՒԹՅՈՒՆ՝ անջատված լինելու դեպքում հնարավոր է, որ Դուք չկարողանաք մուտք գործել, եթե նախկինում չեք սահմանել առնվազն մեկ այլընտրանքային մուտքի մեթոդ:"
+    discourse_connect_overrides_bio: "Վերասահմանում է օգտատիրոջ կենսագրությունը իր պրոֆիլում և կանխարգելում է օգտատիրոջը այն փոփոխելուց"
     enable_local_logins_via_email: "Թույլատրել օգտատերերին պահանջել մեկ սեղմումով մուտքի հղում, որը կուղարկվի նրանց էլ. նամակի միջոցով:"
     allow_new_registrations: "Թույլատրել նոր օգտատերերի գրանցումները: Հանեք այս նշումը՝ արգելելու նոր հաշիվների ստեղծումը:"
     enable_signup_cta: "Վերադարձող անանուն օգտատերերին ցուցադրել նշում, որը կօգնի նրանց գրանցել հաշիվ:"
@@ -1281,7 +1247,6 @@ hy:
     top_topics_formula_log_views_multiplier: "դիտումների գրառումների բազմապատկիչի արժեքը (n) թոփ թեմաների բանաձևում՝ `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_first_post_likes_multiplier: "առաջին գրառման հավանումների բազմապատկիչի արժեքը (n) թոփ թեմաների բանաձևում՝ `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "յուրաքանչյուր գրառման նվազագույն հավանումների բազմապատկիչի արժեքը (n) թոփ թեմաների բանաձևում՝ `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Յուրաքանչյուր 15 րոպեն մեկ թարմացվող հին գրառումների քանակը"
     enable_safe_mode: "Թույլատրել օգտատերերին մուտք գործել անվտանգ ռեժիմ՝ հավելումները վրիպազերծելու համար:"
     rate_limit_create_topic: "Թեմա ստեղծելուց հետո օգտատերերը պետք է սպասեն (n) վայրկյան՝ մինչ մեկ այլ թեմա ստեղծելը:"
     rate_limit_create_post: "Գրառումից հետո օգտատերերը պետք է սպասեն (n) վայրկյան՝ մինչև մեկ այլ գրառում կատարելը:"
@@ -1296,8 +1261,6 @@ hy:
     max_topic_invitations_per_day: "Թեմայի հրավերների առավելագույն քանակը, որ օգտատերը կարող է ուղարկել ամեն օր:"
     max_logins_per_ip_per_hour: "Յուրաքանչյուր IP հասցեից յուրաքանչյուր ժամվա մեջ թույլատրված մուտքերի առավելագույն քանակը"
     max_logins_per_ip_per_minute: "Յուրաքանչյուր IP հասցեից յուրաքանչյուր րոպեում թույլատրված մուտքերի առավելագույն քանակը"
-    max_post_deletions_per_minute: "Գրառումների առավելագույն քանակը, որ օգտատերը կարող է ջնջել յուրաքանչյուր րոպեում:"
-    max_post_deletions_per_day: "Գրառումների առավելագույն քանակը, որ օգտատերը կարող է ջնջել յուրաքանչյուր օրում:"
     alert_admins_if_errors_per_minute: "Ադմինին զգուշացում ուղարկելու համար յուրաքանչյուր րոպեում սխալների քանակը: 0 արժեքը անջատում է այս հատկանիշը: ՆՇՈՒՄ՝ պահանջում է վերսկսում(restart):"
     alert_admins_if_errors_per_hour: "Ադմինին զգուշացում ուղարկելու համար յուրաքանչյուր ժամում սխալների քանակը: 0 արժեքը անջատում է այս հատկանիշը: ՆՇՈՒՄ՝ պահանջում է վերագործարկում:"
     suggested_topics: "Թեմայի ներքևում ցուցադրվող առաջարկվող թեմաների քանակը:"
@@ -1326,7 +1289,6 @@ hy:
     strip_image_metadata: "Առանձնացնել նկարի մետա-տվյալները"
     min_ratio_to_crop: "Մեծ բարձրությամբ նկարները կտրելու հարաբերակցությունը: Մուտքագրեք լայնության և երկարության հարաբերությունը:"
     simultaneous_uploads: "Ֆայլերի առավելագույն քանակը, որ կարելի է քաշել և գցել կոմպոզեր"
-    enable_flash_video_onebox: "Միացնել swf և flv (Adobe Flash) հղումների ներկառուցումը սմարթ-ներդիրներում: ՈՒՇԱԴՐՈՒԹՅՈՒՆ՝ կարող է հանդիսանալ ապահովության վտանգ:"
     default_invitee_trust_level: "Լռելյայն վստահության մակարդակը (0-4) հրավիրված օգտատերերի համար:"
     default_trust_level: "Լռելյայն վստահության մակարդակը (0-4) բոլոր նոր օգտատերերի համար: ՈՒՇԱԴՐՈՒԹՅՈՒՆ! Սա փոփոխելը Ձեզ համար կներկայացնի սպամի լուրջ վտանգ:"
     tl1_requires_topics_entered: "Քանի թեմա պետք է մուտքագրի նոր օգտատերը՝ մինչև վստահության 1-ին մակարդակի բարձրանալը:"
@@ -1362,6 +1324,7 @@ hy:
     min_trust_to_send_messages: "Նոր անձնական նամակ ստեղծելու համար պահանջվող նվազագույն վստահության մակարդակը:"
     min_trust_to_flag_posts: "Գրառումների դրոշակավորման համար անհրաժեշտ նվազագույն վստահության մակարդակը"
     min_trust_to_post_links: "Գրառումներում հղումներ ներառելու համար պահանջվող նվազագույն վստահության մակարդակը:"
+    allowed_link_domains: "Դոմենները, որոնց օգտատերերը կարող են հղում կատարել, անգամ եթե չունեն հղում հրապարակելու համապատասխան վստահության մակարդակ:"
     newuser_max_links: "Քանի հղում կարող է նոր օգտատերը ավելացնել գրառմանը:"
     newuser_max_attachments: "Քանի կցորդ կարող է նոր օգտատերն ավելացնել գրառմանը:"
     newuser_max_mentions_per_post: "Maximum number of @անվան ծանուցումների առավելագույն քանակը, որ նոր օգտատերը կարող է օգտատործել գրառման մեջ:"
@@ -1384,6 +1347,7 @@ hy:
     desktop_category_page_style: "Արտաքին ոճ /կատեգորիաներ էջի համար:"
     category_colors: "Կատեգորիաների համար թույլատրելի գույների տանսվեցերորդական արժեքների ցանկ:"
     category_style: "Կատեգորիայի կրծքանշանների համար արտաքին ոճը:"
+    dark_mode_none: "Ոչ մի"
     max_attachment_size_kb: "Կցված ֆայլերի վերբեռնման առավելագույն չափը կԲ-երով: Սա պետք էկլարգավորվի nginx-ում (client_max_body_size) / apache -ում, ինչպես նաև՝ proxy -ում:"
     authorized_extensions: "Վերբեռնման համար թույլատրելի ֆայլերի ընդլայնումների ցանկը (օգտագործեք '*' ֆայլերի բոլոր տիպերը միացնելու համար)"
     authorized_extensions_for_staff: "Ֆայլերի ընդլայնումների ցանկ, որոնք թույլատրելի են վերբեռնման համար անձնակազմի անդամ օգտատերերի համար, ի հավելումն `authorized_extensions` կայքի կարգավորման մեջ սահմանված ցանկի: (օգտագործեք '*' ֆայլերի բոլոր տիպերը միացնելու համար)"
@@ -1407,6 +1371,7 @@ hy:
     privacy_policy_url: "Եթե ունեք այլ վայրում տեղադրված Գաղտնիության Քաղաքականության փաստաթուղթ, որը ցանկանում եք օգտագործել, տեղադրեք ամբողջական URL-ը այստեղ:"
     log_anonymizer_details: "Պահպանել արդյոք օգտատիրոջ տվյլաները գրառումներում անվանազրկումից հետո: GDPR -ի օգտագործման ժամանակ Դուք պետք է անջատեք սա:"
     newuser_spam_host_threshold: "Քանի անգամ նոր օգտատերը կարող է հրապարակել միևնույն հոսթի հղումը` ըստ իր `newuser_spam_host_threshold` գրառումների սահմանաչափի՝ մինչև սպամ համարվելը:"
+    allowed_spam_host_domains: "Սպամ հոսթի փորձարկումից բացառված դոմենների ցանկ: Նոր օգտատերերին երբեք չի արգելվի այս դոմենների հղումներով գրառումների ստեղծումը:"
     topic_view_duration_hours: "Հաշվարկել թեմայի նոր դիտում՝ ըստ յուրաքանչյուր IP-ի/Օգտատիրոջ յուրաքանչյուր N ժամը մեկ"
     user_profile_view_duration_hours: "Հաշվարկել օգտատիրոջ պրոֆիլի նոր դիտում՝ ըստ յուրաքանչյուր IP-ի/Օգտատիրոջ յուրաքանչյուր N ժամը մեկ"
     levenshtein_distance_spammer_emails: "Սպամմերի էլ. նամակների համապատասխանեցման ժամանակ սիմվոլների տարբերության քանակը, որը դեռևս թույլ կտա անորոշ համընկնում:"
@@ -1436,6 +1401,7 @@ hy:
     max_emails_per_day_per_user: "Օգտատերերին ամեն օր ուղարկվող էլ. նամակների առավելագույն քանակը: 0՝ սահմանափակումը անջատելու համար"
     enable_staged_users: "Ավտոմատ կերպով ստեղծել աստիճանավորված օգտատերեր՝ մուտքային նամակները մշակելիս:"
     maximum_staged_users_per_email: "Մուտքային էլ. նամակ մշակելիս ստեղծվող աստիճանավորված օգտատերերի առավելագույն քանակը:"
+    auto_generated_allowlist: "Էլ. հասցեների ցանկ, որոնք չեն ստուգվի ավտո-գեներացված բովանդակության նկատմամբ: Օրինակ՝ foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Խոչընդոտել մուտքային էլ. նամակները, որոնք ճանաչվել են որպես ավտոմատ գեներացված:"
     ignore_by_title: "Անտեսել մուտքային էլ. նամակները՝ կախված վերնագրից:"
     mailgun_api_key: "Mailgun Գաղտնի API Key-ն, որը օգտագործվում է webhook հաղորդագրությունները հաստատելու համար:"
@@ -1497,6 +1463,7 @@ hy:
     log_personal_messages_views: "Գրանցել անձնական նամակների դիտումները Ադմինի կողմից այլ օգտատերերի/խմբերի համար:"
     ignored_users_count_message_threshold: "Ծանուցել մոդերատորներին, եթե մասնավորապես որևէ օգտատեր անտեսվում է այսքան այլ օգտատերերի կողմից:"
     ignored_users_message_gap_days: "Որքան սպասել՝ մինչ մոդերատորներին կրկին ծանուցելը օգտատիրոջ մասին, որը անտեսվել է շատ այլոց կողմից:"
+    allowed_user_website_domains: "Օգտատիրոջ վեբ-կայքը կստուգվի այս դոմենների հանդեպ: Խողովակի սիմվոլով( | ) բաժանված ցանկ:"
     allow_profile_backgrounds: "Թույլատրել օգտատերերին վերբեռնել պրոֆիլի ֆոն:"
     sequential_replies_threshold: "Գրառումների քանակը, որ պետք է կատարի օգտատերը թեմայում անընդմեջ՝ մինչ չափազանց շատ հաջորդական պատասխանների մասին հիշեցում ստանալը:"
     get_a_room_threshold: "Գրառումների քանակը, որ օգտատերը պետք է կատարի նույն մարդուն նույն թեմայում՝ մինչ զգուշացում ստանալը:"
@@ -1524,6 +1491,7 @@ hy:
     highlighted_languages: "Ներառված շարադասության ընդգծման կանոնները: (Ուշադրություն՝ չափազանց շատ լեզուների ներառումը կարող է ազդել կատարողականության վրա) այցելեք՝ <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> դեմոյի համար:"
     embed_truncate: "Կտրել ներկառուցված գրառումները:"
     embed_support_markdown: "Ապահովել Markdown ֆորմատավորումը զետեղված գրառումների համար:"
+    allowed_embed_selectors: "ստորակետներով անջատված CSS տարրերի ցանկ, որոնք թույլատրված են ներկառուցումներում:"
     allowed_href_schemes: "Հղումներում http-ից և https -ից բացի թույլատրվող սխեմաները:"
     embed_post_limit: "Զետեղման ենթակա գրառումների առավելագույն քանակը"
     embed_username_required: "Թեմայի ստեղծման համար օգտանունը պարտադիր է:"
@@ -1531,7 +1499,6 @@ hy:
     show_create_topics_notice: "Եթե կայքն ունի 5-ից քիչ հանրային թեմա, ցուցադրել նշում՝ ադմիններին խնդրելով ստեղծել որոշ թեմաներ:"
     delete_drafts_older_than_n_days: "Ջնջել (n) օրվանից ավելի հին սևագրերը:"
     bootstrap_mode_min_users: "Օգտատերերի նվազագույն քանակը, որ պահանջվում է սկզբնաբեռնման (bootstrap) ռեժիմը անջատելու համար (սահմանեք 0՝ անջատելու համար)"
-    prevent_anons_from_downloading_files: "Արգելել անանուն օգտատերերին ներբեռնել կցորդներ: ՈՒՇԱԴՐՈՒԹՅՈՒՆ՝ սա կկանխի ցանկացած ոչ-պատկերային կայքի ակտիվների աշխատանքը, որոնք հրապարակված են որպես կցորդ:"
     slug_generation_method: "Ընտրեք սլագի գեներացման մեթոդ: 'կոդավորված' -ը կգեներացնի տոկոսային կոդավորման տող: 'ոչ մի' -ն ընդհանրապես կանջատի սլագը:"
     enable_emoji: "Միացնել էմոջի"
     enable_emoji_shortcuts: "Հայտնի սմայլիկների տեքստը, օրինակ՝ :) :p :( , կփոխարկվի էմոջիով"
@@ -1555,7 +1522,6 @@ hy:
     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: "Գլոբալ լռելյայն վիճակը, որի պարագայում թեման համարվում է նոր:"
@@ -1575,7 +1541,6 @@ hy:
     retry_web_hook_events: "Ավտոմատ կերպով կրկին փորձել ձախողված վեբ hook-ի իրադարձությունները 4 անգամ: Փորձերի միջև ժամանակային հատվածներն են՝ 1, 5, 25 և 125 րոպե:"
     allow_user_api_keys: "Թույլատրել օգտատիրոջ API key-երի գեներացիան"
     allow_user_api_key_scopes: "Օգտատիրոջ API key-երի համար թույլատրելի սահմանների ցանկ"
-    max_api_keys_per_user: "Օգտատիրոջ API key-երի առավելագույն քանակ յուրաքանչյուր օգտատիրոջ համար"
     min_trust_level_for_user_api_key: "Օգտատիրոջ API key-երի գեներացման համար անհրաժեշտ վստահության մակարդակը"
     allowed_user_api_auth_redirects: "Թույլատրելի URL նույնականացման վերաուղարկման համար օգտատիրոջ API key -երի համար: * նշանը կարող օգտագործվել դրա ցանկացած մասի հետ համընկնման համար (օրինակ՝ www.example.com/*)."
     allowed_user_api_push_urls: "Օգտատիրոջ API -ին սերվերի push անելու համար թույլատրված URL-ները"
@@ -1584,7 +1549,6 @@ hy:
     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>-ում:"
@@ -1625,21 +1589,15 @@ hy:
       email_editable_enabled: "Դուք պետք է անջատեք 'email editable'մինչև այս կարգավորումը միացնելը:"
       staged_users_disabled: "Դուք պետք է սկզբում միացնեք 'staged users' ՝ մինչև այս կարգավորումը միացնելը"
       reply_by_email_disabled: "Դուք պետք է սկզբում միացնեք 'reply by email'' ՝ մինչև այս կարգավորումը միացնելը"
-      sso_url_is_empty: "Դուք պետք է սահմանեք 'sso url' ՝ մինչ այս կարգավորումը միացնելը:"
       enable_local_logins_disabled: "Դուք պետք է սկզբում միացնեք 'enable local logins' ՝ մինչև այս կարգավորումը միացնելը"
       min_username_length_exists: "Դուք չեք կարող սահմանել օգտանվան նվազագույն երկարություն ամենակարճ օգտանունից բարձր (%{username})"
       min_username_length_range: "Դուք չեք կարող սահմանել նվազագույնը առավելագույնից բարձր:"
       max_username_length_exists: "Դուք չեք կարող սահմանել օգտանվան առավելագույն երկարություն ամենաերկար օգտանունից ցածր (%{username}):"
       max_username_length_range: "Դուք չեք կարող սահմանել առավելագույնը նվազագույնից ցածր:"
       invalid_hex_value: "Գույների արժեքները պետք է լինեն 6-նիշանոց տասնվեցերորդական կոդեր:"
-      category_search_priority:
-        very_low_weight_invalid: "Դուք չեք կարող սահմանել 'category_search_priority_low_weight' -ից ավելի բարձր քաշ:"
-        low_weight_invalid: "Դուք չեք կարող սահմանել 'category_search_priority_very_low_weight' -ից փոքր կամ 1-ից մեծ կամ հավասար քաշ:"
-        very_high_weight_invalid: "Դուք չեք կարող սահմանել 'category_search_priority_high_weight' -ից ցածր քաշ:"
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "SSO գաղտնի արժեք"
   search:
     within_post: "#%{post_number} %{username} -ի կողմից"
     types:
@@ -1647,7 +1605,7 @@ hy:
       topic: "Արդյունքներ"
       user: "Օգտատերեր"
     results_page: "Որոնման արդյունքներ '%{term}' -ի համար"
-  sso:
+  discourse_connect:
     login_error: "Մուտքի Սխալ"
     not_found: "Ձեր հաշիվը չի գտնվել: Խնդրում ենք կապվել կայքի ադմինիստրատորի հետ:"
     account_not_approved: "Ձեր հաշիվը սպասում է հաստատման: Դուք կստանաք էլ. ծանուցում, երբ այն հաստատվի:"
@@ -1926,25 +1884,11 @@ hy:
     post_hidden_again:
       title: "Գրառումը կրկին Թաքցված է"
       subject_template: "Գրառումը թաքցված է համայնքի դրոշակներով, անձնակազմը ծանուցված է"
+    queued_by_staff:
+      title: "Գրառումը Հաստատման Կարիք Ունի"
     flags_agreed_and_post_deleted:
       title: "Դրոշակավորված գրառումը հեռացված է անձնակազմի կողմից:"
       subject_template: "Դրոշակավորված գրառումը հեռացված է անձնակազմի կողմից:"
-      text_body_template: |
-        Ողջույն,
-
-        Սա ավտոմատացված հաղորդագրություն է%{site_name}-ից՝ Ձեզ տեղեկացնելու համար, որ [Ձեր գրառումը](%{base_url}%{url}) հեռացված է:
-
-        %{flag_reason}
-
-        Այս գրառումը դրոշակավորվել է համայնքի կողմից, և անձնակազմի անդամներից մեկը որոշել է ջնջել այն:
-
-        [details="Սեղմեք՝ ջնջված գրառումը տեսնելու համար"]
-        ``` markdown
-        %{flagged_post_raw_content}
-        ```
-        [/մանրամասներ]
-
-        Խնդրում ենք այցելել մեր [համայնքի ուղեցույց](%{base_url}/guidelines) մանրամասների համար:
     usage_tips:
       text_body_template: |
         Նոր օգտատիրոջ մեկնարկի համար մի քանի խորդհուրդների համար [դիտեք այս բլոգի գրառումը](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2505,21 +2449,9 @@ hy:
     account_suspended:
       title: "Հաշիվը Սառեցված է"
       subject_template: "[%{email_prefix}] Ձեր հաշիվը սառեցվել է"
-      text_body_template: |
-        Դուք սառեցվել եք ֆորումում մինչև %{suspended_till}:
-
-        %{reason}
-
-        %{message}
     account_silenced:
       title: "Հաշիվը Լռեցված է"
       subject_template: "[%{email_prefix}] Ձեր հաշիվը լռեցված է"
-      text_body_template: |
-        Դուք սառեցվել եք ֆորումից մինչև %{silenced_till}:
-
-        %{reason}
-
-        %{message}
     account_exists:
       title: "Հաշիվը արդեն գոյություն ունի"
       subject_template: "[%{email_prefix}] Հաշիվը արդեն գոյություն ունի"
@@ -2585,6 +2517,9 @@ hy:
     confirm_new_email:
       title: "Հաստատել Նոր Էլ. հասցեն"
       subject_template: "[%{email_prefix}] Հաստատեք Ձեր նոր էլ. հասցեն"
+    confirm_new_email_via_admin:
+      title: "Հաստատել Նոր Էլ. հասցեն"
+      subject_template: "[%{email_prefix}] Հաստատեք Ձեր նոր էլ. հասցեն"
     confirm_old_email:
       title: "Հաստատել Հին Էլ. Հասցեն"
       subject_template: "[%{email_prefix}] Հաստատել Ձեր ընթացիկ էլ. հասցեն"
@@ -2644,6 +2579,8 @@ hy:
         Եթե դա Դուք էիք, հիանալի է! Այլևս ոչինչ պետք չէ անել:
 
         Եթե դա Դուք չէիք, խնդրում ենք [վերանայել Ձեր գոյություն ունեցող գործընթացները](%{base_url}/my/preferences/account) և ավելի լավ է՝ փոխեք Ձեր գաղնտաբառը:
+    post_approved:
+      title: "Ձեր գրառումը հաստատված է"
   page_not_found:
     title: "Օյ! Այդ էջը գոյություն չունի կամ մասնավոր է:"
     popular_topics: "Տարածված"
@@ -2714,6 +2651,7 @@ hy:
     latte: "Լատտե"
     summer: "Ամառ"
     dark_rose: "Մուգ Վարդագույն"
+    default_theme_name: "Լռելյայն"
     light_theme_name: "Բաց"
     dark_theme_name: "Մուգ"
     neutral_theme_name: "Նեյտրալ"
@@ -3153,6 +3091,12 @@ hy:
           city_for_disputes:
             label: "Վեճերի Քաղաք"
             placeholder: "Սան-Ֆրանցիսկո, Կալիֆորնիա"
+      colors:
+        title: "Գույներ"
+      fonts:
+        fields:
+          font_preview:
+            label: "Նախադիտում"
       logos:
         title: "Լոգոներ"
         fields:
@@ -3184,9 +3128,6 @@ hy:
                 label: "Կատեգորիաների արկղեր"
               categories_boxes_with_topics:
                 label: "Կատեգորիաների արկղեր Թեմաներով"
-      emoji:
-        title: "Էմոջի"
-        description: "Էմոջիների ո՞ր ոճն եք նախընտրում Ձեր համայնքի համար: Դուք կարող եք ավելի ուշ ավելացնել առավել անհատականացված Էմոջիներ Ադմինի, Անահատականացնելու, Էմոջիի միջոցով:"
       invites:
         title: "Հրավիրել Անձնակազմին"
         description: "Դուք գրեթե վերջացրել եք! Եկեք հրավիրենք որոշ մարդկանց՝ օգնելու <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>լցնել Ձեր քննարկումները</a> հետաքրքիր թեմաներով և պատասխաններով՝ Ձեր համայնքին սկիզբ դնելու համար:"
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index a508411802..1ca3d97846 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -15,6 +15,7 @@ id:
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
+      no_day: "%Y %B"
   date:
     month_names:
     - null
@@ -110,6 +111,9 @@ id:
       load_from_remote: "Ada kesalahan dalam memuat posting itu."
     site_settings:
       default_categories_already_selected: "Anda tidak boleh memilih kategori yang digunakan di daftar lainnya."
+  invite:
+    disabled_errors:
+      invalid_access: "Anda tidak diijinkan untuk melihat sumber yang diminta."
   backup:
     operation_already_running: "Proses lain sedang berjalan. Tidak dapat menjalankan proses baru saat ini."
     backup_file_should_be_tar_gz: "File backup harus berupa arsip .tar.gz."
@@ -132,6 +136,8 @@ id:
     loading: "Sedang memuat diskusi..."
     imported_from: "Ini adalah topik diskusi tambahan untuk topik utama di %{link}"
     in_reply_to: "▶ %{username}"
+    replies:
+      other: "%{count} balasan"
     created: "Dibuat"
   no_mentions_allowed: "Maaf, Anda tidak dapat menyebut pengguna lain."
   too_many_mentions:
@@ -158,6 +164,8 @@ 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}'"
+  rss_num_posts:
+    other: "%{count} post"
   read_full_topic: "Baca topik sepenuhnya"
   private_message_abbrev: "Psn"
   rss_description:
@@ -171,6 +179,11 @@ id:
   bookmarks:
     reminders:
       at_desktop: "Lain kali saat saya di depan komputer"
+      later_today: "Nanti hari ini"
+      next_business_day: "Hari kerja berikutnya"
+      tomorrow: "Besok"
+      next_week: "Minggu depan"
+      next_month: "Bulan depan"
       custom: "Tanggal dan waktu tersuai"
   groups:
     errors:
@@ -258,6 +271,28 @@ id:
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
+      less_than_x_seconds:
+        other: "< %{count}s"
+      x_seconds:
+        other: "%{count}s"
+      less_than_x_minutes:
+        other: "%{count}m"
+      x_minutes:
+        other: "%{count}m"
+      about_x_hours:
+        other: "%{count}h"
+      x_days:
+        other: "%{count}d"
+      about_x_months:
+        other: "%{count}senin"
+      x_months:
+        other: "%{count}senin"
+      about_x_years:
+        other: "%{count}y"
+      over_x_years:
+        other: "> %{count}y"
+      almost_x_years:
+        other: "%{count}y"
     distance_in_words_verbose:
       half_a_minute: "baru saja"
       less_than_x_seconds: "baru saja"
@@ -349,6 +384,7 @@ id:
     read_write: "baca/tulis"
     otp_confirmation:
       confirm_title: Lanjut ke %{site_name}
+      logging_in_as: Masuk sebagai %{username}
   reports:
     default:
       labels:
@@ -400,6 +436,7 @@ id:
       title: "Suka"
       xaxis: "Hari"
       yaxis: "Jumlah suka baru"
+      description: "Jumlah suka baru."
     flags:
       title: "Flags"
       xaxis: "Haru"
@@ -521,7 +558,9 @@ id:
   site_settings:
     allow_user_locale: "Perbolehkan pengguna untuk memilih bahasa sendiri"
     allow_duplicate_topic_titles: "Perbolehkan topik dengan judul yang sama."
+    send_welcome_message: "Kirim semua pengguna ucapan selamat datang dengan panduan awal singkat."
     maximum_backups: "Jumlah maksimum backup yang disimpan dalam disk. Backup lama akan dihapus secara otomatis."
+    dark_mode_none: "Tidak ada"
     email_editable: "Perbolehkan pengguna untuk mengganti alamat email setelah registrasi."
     emoji_set: "Bagaimana dengan emoji Anda?"
     errors:
@@ -531,6 +570,7 @@ id:
   search:
     types:
       category: "Kategori"
+      topic: "Hasil"
       user: "Pengguna"
   publish_page:
     slug_errors:
@@ -553,10 +593,14 @@ id:
       blocked: "Registrasi baru dari alamat IP Anda tidak diijinkan."
       max_new_accounts_per_registration_ip: "Registrasi baru dari alamat IP Anda tidak diijinkan (telah mencapai batas maksimum). Silahkan hubungi staff."
   system_messages:
+    queued_by_staff:
+      title: "Pesan Membutuhkan Persetujuan"
     welcome_user:
       subject_template: "Selamat datang ke %{site_name}!"
     welcome_invite:
       subject_template: "Selamat datang ke %{site_name}!"
+    tl2_promotion_message:
+      subject_template: "Selamat atas promosi tingkat kepercayaan Anda!"
     spam_post_blocked:
       subject_template: "Pengguna baru %{username} disuspensi atas penulisan tautan yang berulang-ulang kali"
     pending_users_reminder:
@@ -572,8 +616,12 @@ id:
       title: "Lupa Password"
     set_password:
       title: "Atur Kata Sandi"
+    post_approved:
+      title: "Tulisan Anda telah disetujui"
   page_not_found:
     see_more: "Selengkapnya"
+    search_button: "Cari"
+  deleted: "dihapus"
   image: "gambar"
   upload:
     images:
@@ -581,6 +629,8 @@ id:
   skipped_email_log:
     user_email_no_user: "Tidak dapat menemukan pengguna dengan id %{user_id}"
     user_email_post_not_found: "Tidak dapat menemukan post dengan id %{post_id}"
+  color_schemes:
+    default_theme_name: "Asal"
   csv_export:
     boolean_yes: "Ya"
     boolean_no: "Tidak"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 7da8f3d359..4a9043a57f 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -51,9 +51,13 @@ it:
   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"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} di %{username}"
   themes:
     bad_color_scheme: "Impossibile aggiornare il tema, paletta dei colori non valida"
     other_error: "Qualcosa è andato storto durante l'aggiornamento del tema"
+    ember_selector_error: "Spiacenti, l'utilizzo dei selettori CSS #ember o .ember-view non è consentito perché questi nomi vengono generati dinamicamente in fase di runtime e cambieranno nel tempo generando un errore CSS. Prova un altro selettore."
     compile_error:
       unrecognized_extension: "Estensione del file non riconosciuta: %{extension}"
     import_error:
@@ -62,9 +66,11 @@ it:
       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"
+      git_ref_not_found: "Impossibile eseguire il checkout del riferimento git: %{ref}"
       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 valido di Discourse."
+      not_allowed_theme: "`%{repo}` non è nella lista dei temi consentiti (controlla l'impostazione globale `allowed_theme_repos`)."
     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"
@@ -168,7 +174,7 @@ 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: "Il nome utente deve essere aggiornato nel provider SSO, poichè l'impostazione del sito `sso_overrides_username` è abilitata."
+      auth_overrides_username: "L'impostazione `auth_overrides_username` é abilitata e il nome utente deve essere aggiornato sul provider di autenticazione (SSO)."
     template:
       body: ! "Sono stati riscontrati problemi con i seguenti campi:"
       header:
@@ -192,7 +198,7 @@ it:
       share_quote_facebook_requirements: "Devi impostare un ID app Facebook per attivare la condivisione delle citazioni per Facebook."
       second_factor_cannot_enforce_with_socials: "Non si può applicare l'autenticazione a due fattori se il login tramite social è attivo. Devi prima disattivarlo tramite %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Non è possibile applicare 2FA se i login locali sono disabilitati."
-      second_factor_cannot_be_enforced_with_sso_enabled: "Non si può applicare 2FA se SSO è attivato."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "Non è possibile attivare il 2FA quando DiscourseConnect è abilitato."
       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"
       cors_origins_should_not_have_trailing_slash: "Non aggiungere la barra finale (/) alle origini CORS."
@@ -200,25 +206,31 @@ it:
     onebox:
       invalid_address: "Purtroppo è stato impossibile creare un'anteprima per questa pagina, perché non è stato trovato il server '%{hostname}'. Nel tuo post apparirà solo un link senza anteprima. :cry:"
       error_response: "Purtroppo è stato impossibile creare un'anteprima per questa pagina, perché il server ha dato un codice d'errore %{status_code}. Nel tuo post apparirà solo un link senza anteprima. :cry:"
+      missing_data:
+        one: "Siamo spiacenti, non è stato possibile generare un'anteprima per questa pagina web perché non è stato trovato il seguente tag oEmbed / OpenGraph: %{missing_attributes}"
+        other: "Siamo spiacenti, non è stato possibile generare un'anteprima per questa pagina web, perché i seguenti tag oEmbed / OpenGraph non sono stati trovati: %{missing_attributes}"
   word_connector:
     comma: ", "
   invite:
     expired: "Il tuo token di invito è scaduto. <a href='%{base_url}/about'>Contatta lo staff</a>."
     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_matching_email: "Il tuo indirizzo email e l'indirizzo email associato al token di invito non corrispondono. Contatta lo staff."
     not_found_template: |
       <p>Il tuo invito a <a href="%{base_url}">%{site_name}</a> è già stato riscattato.</p>
 
       <p>Se ti ricordi la password, puoi fare il <a href="%{base_url}/login">login</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."
+    not_found_template_link: |
+      <p>L'invito a <a href="%{base_url}">%{site_name}</a> non può più essere riscattato. Chiedi alla persona che ti ha invitato di inviarti un nuovo invito.</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>"
+    invite_exists: "Hai già invitato <b>%{email}</b>."
+    invalid_email: "%{email} non è un indirizzo email valido."
     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>"
     cant_invite_to_group: "Non hai il permesso di invitare utenti ai gruppi specificati. Assicurati di essere il proprietario dei gruppi a cui stai provando a invitarli."
     disabled_errors:
-      sso_enabled: "Gli inviti sono disattivati perché SSO è attivato."
-      local_logins_disabled: "Gli inviti sono disattivati perché l'impostazione 'abilita login locali' è disattivata."
+      discourse_connect_enabled: "Gli inviti sono disabilitati perché è abilitato DiscourseConnect."
       invalid_access: "Non hai il permesso di visualizzare la risorsa richiesta."
   bulk_invite:
     file_should_be_csv: "Il file caricato deve essere in formato csv."
@@ -234,7 +246,7 @@ it:
     muted_topic: "Spiacenti, quell'utente ha silenziato questo argomento."
     receiver_does_not_allow_pm: "Spiacenti, quell'utente non ti permette di inviargli messaggi privati."
     sender_does_not_allow_pm: "Spiacenti, non permetti a quell'utente di inviarti messaggi privati."
-    receiver_does_not_allow_other_user_pm: "Spiacenti, quell'utente non permette a un partecipante esistente di inviargli messaggi privati."
+    user_cannot_see_topic: "%{username} non può vedere l'argomento."
   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"
@@ -257,10 +269,11 @@ it:
   email_template_cant_be_modified: "Questo modello di email non può essere modificato."
   invalid_whisper_access: "I sussurri non sono abilitati oppure non hai i permessi per creare sussurri"
   not_in_group:
+    title_topic: "Devi richiedere l'iscrizione al gruppo \"%{group}\" per visualizzare 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."
+  deleted_topic: "Ops! 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"
@@ -326,6 +339,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."
+  watched_words_auto_tag: "Argomento etichettato 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."
   slow_mode_enabled: "Questo argomento è in modalità lenta."
@@ -367,11 +381,11 @@ it:
   too_late_to_edit: "Quel messaggio è stato creato troppo tempo fa. Non può più essere modificato né cancellato."
   edit_conflict: "Il messaggio è stato modificato da un altro utente e le tue modifiche non possono più essere salvate."
   revert_version_same: "La versione attuale è la stessa versione che stai cercando di ripristinare."
-  cannot_edit_on_slow_mode: "Questo argomento è in modalità lenta. Per incoraggiare discussioni cortesi e ponderate, non è attualmente permesso modificare vecchi post."
   excerpt_image: "immagine"
   bookmarks:
     errors:
       already_bookmarked_post: "Non puoi aggiungere due volte lo stesso messaggio nei segnalibri."
+      too_many: "Siamo spiacenti, non puoi aggiungere più di %{limit} segnalibri, visita <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> per rimuoverne alcuni."
       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"
@@ -400,7 +414,12 @@ it:
       email_already_used_in_category: "L'indirizzo '%{email}' è stato già usato dalla categoria '%{category_name}'."
       cant_allow_membership_requests: "Non è possibile permettere le richieste di adesione in un gruppo senza proprietari."
       already_requested_membership: "Hai già richiesto di iscriverti a questo gruppo."
-      adding_too_many_users: "È possibile aggiungere un massimo di %{limit} utenti contemporaneamente"
+      adding_too_many_users:
+        one: "È possibile aggiungere un massimo di %{count} utenti contemporaneamente"
+        other: "È possibile aggiungere al massimo %{count} utenti contemporaneamente"
+      usernames_or_emails_required: "I nomi utente o le e-mail devono essere presenti"
+      no_invites_with_discourse_connect: "Puoi invitare solo utenti registrati quando DiscourseConnect è abilitato"
+      no_invites_without_local_logins: "Puoi invitare solo utenti registrati quando i login locali sono disabilitati"
     default_names:
       everyone: "chiunque"
       admins: "amministratori"
@@ -422,25 +441,25 @@ it:
       one: "%{count} messaggio"
       other: "%{count} messaggi"
     "new-topic": |
-      Benvenuto su %{site_name} &mdash; **grazie per voler iniziare una nuova conversazione!**
+      Benvenuto in %{site_name} &mdash; **grazie per aver iniziato una nuova conversazione!**
 
-      - Il titolo ti sembra interessante se lo leggi ad alta voce? E' un buon riassunto?
+      - Il titolo sembra interessante se lo leggi ad alta voce? È una buona sintesi?
 
-      - Chi potrebbe esserne interessato? Perché è importante? Che tipo di risposte vorresti?
+      - Chi sarebbe interessato a questo argomento? Perché è importante? Che tipo di risposte vuoi?
 
-      - 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.
+      - Includi le parole comunemente usate nel tuo argomento in modo che gli altri possano *trovarlo*. Per raggruppare il tuo argomento con argomenti correlati, seleziona una categoria (o un'etichetta).
 
-      Per maggiori informazioni, [leggi le linee guida della comunità](%{base_path}/guidelines). Questo pannello sarà visualizzato solo per i tuoi primi %{education_posts_text}.
+      Per ulteriori informazioni, [vedi le linee guida della nostra comunità](%{base_path}/guidelines). Questo pannello apparirà solo per il tuo primo %{education_posts_text}.
     "new-reply": |
-      Benvenuto su %{site_name} &mdash; **grazie per il tuo contributo!**
+      Benvenuti a %{site_name} &mdash; **grazie per aver contribuito!**
 
-      - La tua risposta migliora in qualche modo la conversazione?
+      - Sii gentile con i membri della tua comunità.
 
-      - Sii gentile con gli altri membri della comunità.
+      - La tua risposta migliora la conversazione?
 
-      - Le critiche costruttive sono benvenute, ma critica le *idee* non le persone.
+      - La critica costruttiva è benvenuta, ma critica le idee*, non le persone.
 
-      Per maggiori informazioni, [leggi le linee guida della nostra comunità](%{base_path}/guidelines). Questo pannello sarà visualizzato soltanto per i tuoi primi %{education_posts_text}.
+      Per ulteriori informazioni, [vedi le nostre linee guida della comunità](%{base_path}/guidelines). Questo pannello apparirà solo per i primi %{education_posts_text}.
     avatar: |
       ### Che ne dici di aggiungere un'immagine al tuo account?
 
@@ -494,6 +513,7 @@ it:
               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."
+              send_to_email_disabled: "Spiacenti, non puoi inviare messaggi personali all'e-mail."
               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."
               unable_to_tag: "Si è verificato un errore etichettando l'argomento."
@@ -542,6 +562,9 @@ it:
           attributes:
             execute_at:
               in_the_past: "deve essere in data futura."
+            duration_minutes:
+              cannot_be_zero: "deve essere maggiore di 0."
+              exceeds_maximum: "non può essere più di 20 anni."
         translation_overrides:
           attributes:
             value:
@@ -644,20 +667,8 @@ 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 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"
@@ -761,7 +772,7 @@ it:
       unknown: "browser sconosciuto"
     device:
       android: "Dispositivo Android"
-      chromebook: "Chromebook"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -772,7 +783,7 @@ it:
       unknown: "dispositivo sconosciuto"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -787,6 +798,7 @@ it:
     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"
+    max_secondary_emails_error: "Hai raggiunto il limite massimo consentito per le email secondarie."
     authorizing_new:
       title: "Conferma il tuo nuovo indirizzo email"
       description: "Conferma di voler cambiare il tuo indirizzo email in:"
@@ -868,6 +880,7 @@ it:
       others: "Nessuna attività."
     no_bookmarks:
       self: "Non hai aggiunto messaggi nei segnalibri. I segnalibri ti consentono di accedere velocemente a specifici messaggi."
+      search: "Nessun segnalibro trovato con la query di ricerca fornita."
       others: "Nessun segnalibro."
     no_likes_given:
       self: "Non hai messo \"Mi piace\" ad alcun messaggio."
@@ -877,6 +890,16 @@ 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"
+  email_settings:
+    pop3_authentication_error: "Si è verificato un problema con le credenziali POP3 fornite. Controlla il nome utente e la password e riprova."
+    imap_authentication_error: "Si è verificato un problema con le credenziali IMAP fornite. Controlla il nome utente e la password e riprova."
+    imap_no_response_error: "Si è verificato un errore durante la comunicazione con il server IMAP. %{message}"
+    smtp_authentication_error: "Si è verificato un problema con le credenziali SMTP fornite. Controlla il nome utente e la password e riprova."
+    smtp_server_busy_error: "Il server SMTP è attualmente occupato. Riprova più tardi."
+    smtp_unhandled_error: "Si è verificato un errore non gestito durante la comunicazione con il server SMTP. %{message}"
+    connection_error: "Si è verificato un problema durante la connessione con il server. Controlla il nome e la porta del server e riprova."
+    timeout_error: "Connessione al server scaduta. Controlla il nome e la porta del server e riprova."
+    unhandled_error: "Errore non gestito durante il test delle impostazioni e-mail. %{message}"
   webauthn:
     validation:
       invalid_type_error: "Il tipo di webauthn fornito non era valido. I tipi validi sono webauthn.get e webauthn.create."
@@ -936,9 +959,9 @@ it:
     mute_topic: "Silenziare tutte le notifiche per questo argomento, %{link}"
     unwatch_category: "Smetti di osservare tutti gli argomenti in %{category}"
     mailing_list_mode: "Disabilita la modalità mailing list"
-    all: "Non inviare alcuna email da %{sitename}"
+    all: "Non inviarmi nessuna email da %{sitename}"
     different_user_description: "Sei attualmente connesso con un utente diverso da quello a cui abbiamo scritto. Per favore disconnettiti, oppure attiva la modalità anonima, e riprova."
-    not_found_description: "Spiacenti, non siamo riusciti a trovare questa cancellazione. È possibile che il collegamento nell'email sia scaduto?"
+    not_found_description: "Spiacenti, non siamo riusciti ad annullare questa iscrizione. È possibile che il collegamento nella tua email sia troppo vecchio e sia scaduto?"
     log_out: "Disconnetti"
     submit: "Salva preferenze"
     digest_frequency:
@@ -1307,15 +1330,16 @@ it:
   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."
-    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>.'
+    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</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."
-    google_oauth2_config_warning: 'Il server è configurato per permettere l''iscrizione e il login con Google Oauth2 (enable_google_oauth2_logins), ma il client id e il client secret non sono impostati. Vai nelle <a href="%{base_path}/admin/site_settings">Impostazioni del sito</a> e aggiornale. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Per ulteriori informazioni segui questa guida</a>.'
-    facebook_config_warning: 'Il server è configurato per consentire l''iscrizione e il login con Facebook (enable_facebook_logins), ma l''app id e l''app secret non sono impostati. Vai nelle <a href="%{base_path}/admin/site_settings">Impostazioni del sito</a> e aggiornale. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Vedi questa guida per saperne di più</a> .'
-    twitter_config_warning: 'Il server è configurato per consentire la registrazione e l''accesso con Twitter (enable_twitter_logins), ma la chiave e i valori segreti non sono impostati. Vai alle <a href="%{base_path}/admin/site_settings">Impostazioni del Sito</a> e aggiorna le impostazioni. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Vedi questa guida per saperne di più</a>.'
-    github_config_warning: 'Il server è configurato per consentire la registrazione e l''accesso con GitHub (enable_github_logins), ma l''id client e i valori segreti non sono impostati. Vai alle <a href="%{base_path}/admin/site_settings">Impostazioni del Sito</a> e aggiorna le impostazioni. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Vedi questa guida per saperne di più</a>.'
-    s3_config_warning: 'Il server è configurato per caricare file su S3, ma almeno una delle seguenti impostazioni non è impostata: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile o s3_upload_bucket. Vai a <a href="%{base_path}/admin/site_settings">Impostazioni sito</a> e aggiorna le impostazioni. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Vedi "How to set up image uploads to S3?" per saperne di più</a>'
+    google_oauth2_config_warning: 'Il server è configurato per permettere la registrazione e l''accesso con Google Oauth2 (enable_google_oauth2_logins), ma l''id e il secret del client non sono impostati. Vai nelle <a href="%{base_path}/admin/site_settings">Impostazioni del sito</a> e aggiornale. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Per ulteriori informazioni segui questa guida</a>.'
+    facebook_config_warning: 'Il server è configurato per consentire la registrazione e l''accesso con Facebook (enable_facebook_logins), ma l''id e il secret dell''app non sono impostati. Vai nelle <a href="%{base_path}/admin/site_settings">Impostazioni del sito</a> e aggiornale. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Vedi questa guida per saperne di più</a> .'
+    twitter_config_warning: 'Il server è configurato per consentire la registrazione e l''accesso con Twitter (enable_twitter_logins), ma la chiave e il secret non sono impostati. Vai alle <a href="%{base_path}/admin/site_settings">Impostazioni del sito</a> e aggiorna le impostazioni. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Vedi questa guida per saperne di più</a>.'
+    github_config_warning: 'Il server è configurato per consentire la registrazione e l''accesso con GitHub (enable_github_logins), ma l''id e il secret del client non sono impostati. Vai alle <a href="%{base_path}/admin/site_settings">Impostazioni del sito</a> e aggiorna le impostazioni. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Vedi questa guida per saperne di più</a>.'
+    s3_config_warning: 'Il server è configurato per caricare file su S3, ma almeno una delle seguenti impostazioni non è impostata: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile o s3_upload_bucket. Vai alle <a href="%{base_path}/admin/site_settings">Impostazioni sito</a> e aggiorna le impostazioni. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Vedi "How to set up image uploads to S3?" per saperne di più</a>'
     s3_backup_config_warning: 'Il server è configurato per caricare i backup su S3, ma almeno una delle seguenti impostazioni non è impostata: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile o s3_backup_bucket. Vai a <a href="%{base_path}/admin/site_settings">Impostazioni sito</a> e aggiorna le impostazioni. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Vedi ""How to set up image uploads to S3?" per saperne di più</a>'
+    s3_cdn_warning: 'Il server è configurato per caricare file su S3, ma non è configurato nessuna CDN S3. Questo può portare a costi S3 onerosi e a prestazioni più lente del sito. <a href="https://meta.discourse.org/t/-/148916" target="_blank">Vedi "Using Object Storage for Uploads" per saperne di più</a>.'
     image_magick_warning: 'Il server è configurato per creare miniature di immagini di grandi dimensioni, ma ImageMagick non è installato. Installa ImageMagick usando il tuo gestore di pacchetti preferito o <a href="https://www.imagemagick.org/script/download.php" target="_blank">scarica l''ultima versione</a> .'
     failing_emails_warning: 'Ci sono %{num_failed_jobs} job di posta elettronica che sono falliti. Controlla il tuo app.yml e assicurati che le impostazioni del server di posta siano corrette. <a href="%{base_path}/sidekiq/retries" target="_blank">Vedi i job falliti in Sidekiq</a> .'
     subfolder_ends_in_slash: "L'impostazione della sottocartella è errata; DISCOURSE_RELATIVE_URL_ROOT finisce con uno slash."
@@ -1324,14 +1348,12 @@ 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."
-    update_mail_receiver: "Abbiamo rilevato una versione obsoleta del destinatario della posta. Clicca <a href='https://meta.discourse.org/t/-/133491'>qui</a> per le istruzioni di aggiornamento. 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."
     out_of_date_themes: "Sono disponibili aggiornamenti per i seguenti temi:"
     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'."
+    watched_word_regexp_error: "L'espressione regolare per %{action} per le parole osservate non è valida. Per favore verifica le tue <a href='%{base_path}/admin/customize/watched_words'>Impostazioni Parole Osservate</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;"
@@ -1359,10 +1381,8 @@ it:
     search_query_log_max_size: "Quantità massima di query di ricerca da mantenere"
     search_query_log_max_retention_days: "Periodo massimo di conservazione delle query di ricerca, in giorni."
     search_ignore_accents: "Ignora gli accenti durante la ricerca di testo."
-    category_search_priority_very_low_weight: "Peso attribuito alla classifica per priorità di ricerca di categoria molto bassa."
     category_search_priority_low_weight: "Peso attribuito alla classifica per priorità di ricerca di categoria bassa."
     category_search_priority_high_weight: "Peso applicato alla classifica per priorità di ricerca di categoria elevata."
-    category_search_priority_very_high_weight: "Peso attribuito alla classifica per priorità di ricerca di categoria molto alta."
     allow_uncategorized_topics: "Permetti la creazione di argomenti senza categoria. ATTENZIONE: se ci sono argomenti senza categoria, devi ricategorizzarli prima di disabilitare questa opzione."
     allow_duplicate_topic_titles: "Permetti più argomenti con lo stesso identico titolo"
     allow_duplicate_topic_titles_category: "Permetti argomenti con titoli identici e duplicati se la categoria è diversa. allow_duplicate_topic_titles deve essere falso."
@@ -1372,7 +1392,7 @@ it:
     site_description: "Descrivi questo sito in una frase, da usare nell'attributo meta description."
     short_site_description: "Breve descrizione, come usata nel titolo dell'Etichetta in homepage."
     contact_email: "Indirizzo email del contatto principale responsabile di questo sito. Utilizzato per notifiche critiche, nonché sul modulo di contatto <a href='%{base_path}/about' target='_blank'>/ su</a> per questioni urgenti."
-    contact_url: "URL di contatto per questo sito. Utilizzato sul <a href='%{base_path}/about' target='_blank'>/ sul</a> modulo di contatto per questioni urgenti."
+    contact_url: "URL di contatto per questo sito. Visualizzato nella pagina <a href='%{base_path}/about' target='_blank'>/ Informazioni</a> , sezione contatti urgenti."
     crawl_images: "Recupera le immagini dagli URL remoti per inserire le dimensioni corrette di ampiezza e altezza nel tag."
     download_remote_images_to_local: "Scarica localmente le immagini remote; ciò permettei di evitare immagini assenti."
     download_remote_images_threshold: "Minimo spazio disco necessario per scaricare le immagini remote in locale (in percentuale)"
@@ -1402,6 +1422,7 @@ it:
     enable_inline_onebox_on_all_domains: "Ignora l'impostazione del sito inline_onebox_domain_allowlist e consenti onebox in linea per tutti i domini."
     force_custom_user_agent_hosts: "Host per i quali utilizzare l'user agent onebox personalizzato su tutte le richieste. (Particolarmente utile per gli host che limitano l'accesso da parte dell'user agent)."
     max_oneboxes_per_post: "Numero massimo di oneboxe in un messaggio."
+    facebook_app_access_token: "Un token generato dall' ID e dal secret della tua app Facebook. Utilizzato per generare onebox di Instagram."
     logo: "L'immagine del logo in alto a sinistra del tuo sito. Utilizzare un'immagine rettangolare ampia con un'altezza di 120 e un rapporto di forma superiore a 3: 1. Se lasciato vuoto, verrà mostrato il testo del titolo del sito."
     logo_small: "La piccola immagine del logo in alto a sinistra del tuo sito, vista quando scorri verso il basso. Usa un'immagine quadrata di 120 × 120. Se lasciato vuoto, verrà mostrato un simbolo Home."
     digest_logo: "L'immagine del logo alternativo utilizzata nella parte superiore del riepilogo dell'email del tuo sito. Usa un'immagine a rettangolo largo. Non usare un'immagine SVG. Se lasciato vuoto, verrà utilizzata l'immagine dall'impostazione `logo`."
@@ -1411,6 +1432,7 @@ it:
     mobile_logo_dark: "Schema scuro alternativo per l'impostazione 'logo mobile' del sito."
     large_icon: "Immagine utilizzata come base per altre icone di metadati. Idealmente dovrebbe essere più grande di 512 x 512. Se lasciato vuoto, verrà usato logo_small."
     manifest_icon: "Immagine utilizzata come immagine logo / splash su Android. Verrà automaticamente ridimensionato a 512 × 512. Se lasciato vuoto, verrà utilizzato large_icon."
+    manifest_screenshots: "Schermate che mostrano le caratteristiche e le funzionalità nella pagina di installazione. Tutte le immagini devono essere caricate in locale e delle stesse dimensioni."
     favicon: "Una favicon per il tuo sito, vedi <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a> . Per funzionare correttamente su un CDN deve essere una PNG. Verrà ridimensionata a 32x32. Se lasciato vuoto, verrà usato large_icon."
     apple_touch_icon: "Icona utilizzata per i dispositivi touch Apple. Verrà automaticamente ridimensionato a 180x180. Se lasciato vuoto, verrà usato large_icon."
     opengraph_image: "Immagine opengraph predefinita, utilizzata quando la pagina non ha altra immagine adatta. Se lasciato vuoto, verrà usato large_icon"
@@ -1421,7 +1443,6 @@ it:
     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: "Impone agli utenti di abilitare l'autenticazione a due fattori. Seleziona \"all\" per applicarlo a tutti gli utenti. Seleziona \"staff\" per applicarlo solo agli utenti staff."
     force_https: "Forza il tuo sito ad usare solo HTTPS. ATTENZIONE: NON abilitare questa opzione finché non hai verificato che HTTPS è pienamente configurato e sta funzionando ovunque! Hai verificato il tuo CDN, tutti 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."
@@ -1430,6 +1451,7 @@ it:
     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."
     enable_system_message_replies: "Consente agli utenti di rispondere ai messaggi di sistema, anche se i messaggi personali sono disabilitati"
     enable_long_polling: "Il message bus per le notifiche può usare il long polling"
+    enable_chunked_encoding: "Abilita le risposte di codifica in blocchi dal server. Questa funzione funziona sulla maggior parte delle configurazioni, tuttavia alcuni proxy possono eseguire il buffer, provocando un ritardo nelle risposte"
     long_polling_base_url: "URL di base usato per il long polling (quando una CDN serve contenuto dinamico, bisogna impostarlo come origin pull) es. http://origin.site.com"
     long_polling_interval: "Tempo di attesa prima che il server risponda ai client che non ci sono dati da trasmettere (solo per utenti autenticati)"
     polling_interval: "Se non si esegue il long polling, quanto spesso i client autenticati devono fare poll in millisecondi"
@@ -1457,20 +1479,31 @@ it:
     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)"
+    approve_suspect_users: "Aggiungi utenti sospetti alla coda di revisione. Gli utenti sospetti hanno inserito una biografia o un sito web ma non hanno attività di lettura."
+    review_every_post: "Tutti i messaggi devono essere revisionati. ATTENZIONE! NON CONSIGLIATO PER SITI MOLTO ATTIVI."
     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."
+    persistent_sessions: "Gli utenti rimarranno connessi alla chiusura del browser"
     maximum_session_age: "L'utente resterà connesso per n ore dall'ultima visita"
     ga_version: "Versione di Google Universal Analytics da usare: v3 (analytics.js), v4 (gtag)"
+    ga_universal_tracking_code: "ID del codice di monitoraggio di Google Universal Analytics, ad esempio: UA-12345678-9; vedi <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_domain_name: "Nome del dominio di Google Universal Analytics, ad esempio: mysite.com; vedi <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "Abilita il monitoraggio tra domini di Google Universal Analytics. I collegamenti in uscita a questi domini avranno l'ID del client aggiunto. Vedi <a href='https://support.google.com/analytics/answer/1034342?hl=it' target='_blank'>Impostare il monitoraggio interdominio.</a>"
+    gtm_container_id: "ID contenitore di Google Tag Manager. ad esempio: GTM-ABCDEF. <br/>Nota: potrebbe essere necessario inserire gli script di terze parti caricati da GTM in \"Content Security Policy Script src\"."
     enable_escaped_fragments: "Tornare all'API Ajax-Crawling di Google se non viene rilevato alcun webcrawler. Vedi <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     moderators_manage_categories_and_groups: "Permetti ai moderatori di gestire categorie e gruppi"
     cors_origins: "Origini permesse per richieste cross-origin (CORS). Ogni origine deve includere http:// o https://. La variabile d'ambiente DISCOURSE_ENABLE_CORS deve essere impostata come true per abilitare CORS."
     use_admin_ip_allowlist: "Gli amministratori possono effettuare il login solo se usano un indirizzo IP definito nell'elenco degli IP schermati (Admin > Logs > IP schermati)."
+    blocked_ip_blocks: "Un range di indirizzi IP privati che non dovrebbero mai essere sottoposti a scansione da Discourse"
+    allowed_internal_hosts: "Un elenco di host interni che Discourse può eseguire in modo sicuro per la scansione onebox e altri scopi"
     allowed_onebox_iframes: "Un elenco dei domini iframe src permessi tramite gli incorporamenti di Onebox. `*` permetterà tutti i motori Onebox predefiniti."
     allowed_iframes: "Un elenco di prefissi di dominio src iframe che discourse può consentire in modo sicuro nei messaggi"
+    allowed_crawler_user_agents: "User Agent dei crawler Web che dovrebbero poter accedere al sito. AVVERTIMENTO! IMPOSTANDO QUESTO VERRÀ DISALLOW TUTTI CRAWLERS NON QUI ELENCATI!"
     slow_down_crawler_user_agents: "Agenti utente di crawler Web che devono essere limitati in frequenza in robots.txt utilizzando la direttiva di ritardo della scansione"
     slow_down_crawler_rate: "Se viene specificato slow_down_crawler_user_agents, tale frequenza verrà applicata a tutti i crawler (numero di secondi di ritardo tra le richieste)"
     content_security_policy: "Abilita Content-Security-Policy"
     content_security_policy_report_only: "Abilita Content-Security-Policy-Report-Only"
     content_security_policy_collect_reports: "Abilita raccolta di report di violazione CSP in /csp_reports"
+    content_security_policy_frame_ancestors: "Limita chi può incorporare questo sito in iframes tramite CSP. Controlla gli host ammessi su <a href='%{base_path}/admin/customize/embedding'>Incorpora</a>"
     invalidate_inactive_admin_email_after_days: "Gli account amministratore che non hanno visitato il sito in questo numero di giorni dovranno riconvalidare il proprio indirizzo email prima di accedere. Impostare su 0 per disabilitare."
     top_menu: "Determina quali oggetti appaiono nella navigazione della pagina iniziale, e in quale ordine. Esempio latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Determina quali elementi vengono mostrati nel menu del messaggio, e in quale ordine. Esempio like|edit|flag|delete|share|bookmark|reply"
@@ -1480,6 +1513,7 @@ it:
     site_contact_group_name: "Un nome di gruppo valido da invitare a tutti i messaggi automatici."
     send_welcome_message: "Invia a tutti i nuovi utenti un messaggio di benvenuto con una guida di avvio rapido."
     send_tl1_welcome_message: "Invia ai nuovi utenti del Livello Esperienza 1 un messaggio di benvenuto."
+    send_tl2_promotion_message: "Invia ai nuovi utenti di livello 2 un messaggio sulla promozione."
     suppress_reply_directly_below: "Non mostrare il conteggio espandibile delle risposte quando c'è una sola risposta sotto quel messaggio."
     suppress_reply_directly_above: "Non mostrare in-risposta-a espandibile in un messaggio quando c'è una sola risposta sopra quel messaggio. "
     remove_full_quote: "Rimuovi automaticamente le citazioni complete dalle risposte dirette."
@@ -1492,13 +1526,16 @@ it:
     moderators_view_emails: "Consenti ai moderatori di visualizzare le email degli utenti"
     prioritize_username_in_ux: "Nella pagina utente mostra prima il nome utente, la sua scheda e i suoi messaggi (quando l'opzione è disabilitata viene mostrato prima il nome)"
     enable_rich_text_paste: "Abilita la conversione automatica da HTML a Markdown quando si incolla del testo nel composer. (Sperimentale)"
+    send_old_credential_reminder_days: "Attiva promemoria per le vecchie credenziali dopo giorni"
     email_token_valid_hours: "I messaggi di password dimenticata / attivazione account sono validi per (n) ore."
     enable_badges: "Attiva il sistema a distintivi"
     enable_whispers: "Consenti allo staff comunicazioni private all'interno degli argomenti."
     allow_index_in_robots_txt: "Specifica in robots.txt che questo sito permette l'indicizzazione da parte dei motori di ricerca. In casi eccezionali puoi permanentemente <a href='%{base_path}/admin/customize/robots'>ignorare robots.txt</a>."
+    blocked_email_domains: "Una lista di domini email separati dal carattere pipe \"|\" con cui gli utenti non possono registrare un account. Ad esempio: mailinator.com/trashmail.net"
+    allowed_email_domains: "Una lista di domini email delimitati da carattere pipe (|) che gli utenti DEVONO usare per poter registrare i propri account. ATTENZIONE: gli utenti con domini email differenti da questi non saranno accettati!"
     hide_email_address_taken: "Durante l'iscrizione e nel modulo per la password dimenticata, non informare gli utenti che già esiste un account con un dato indirizzo email."
     log_out_strict: "Quando ci si disconnette, esci da TUTTE le sessioni dell'utente su tutti i dispositivi"
-    version_checks: "Controlla in Pinga Discourse la presenza di aggiornamenti della versione e mostra i nuovi messaggi nel Cruscotto <a href='%{base_path}/admin' target='_blank'>/ admin</a>"
+    version_checks: "Controlla in Discourse Hub la presenza di aggiornamenti della versione e mostra i messaggi della nuova versione nel cruscotto <a href='%{base_path}/admin' target='_blank'>/ di amministrazione</a>"
     new_version_emails: "Invia un'email all'indirizzo contact_email quando è disponibile una nuova versione di Discourse."
     invite_expiry_days: "Per quanti giorni le chiavi per inviti utente sono valide"
     invite_only: "Tutti i nuovi utenti devono essere invitati esplicitamente da utenti o dallo Staff. La registrazione pubblica è disabilitata."
@@ -1512,27 +1549,8 @@ it:
     min_admin_password_length: "Lunghezza minima password Amministratore."
     password_unique_characters: "Numero minimo di caratteri unici che una password deve avere."
     block_common_passwords: "Non permettere password che sono nelle 10.000 password più comuni."
-    external_auth_skip_create_confirm: Quando ti registri tramite autenticazione esterna, salta il popup di creazione account. Utilizzalo al meglio insieme a sso_overrides_email, sso_overrides_username e sso_overrides_name.
-    external_auth_immediately: "Reindirizza automaticamente al sistema di login esterno senza l'interazione dell'utente. Questo ha effetto solo quando login_required è true e esiste un solo metodo di autenticazione esterno"
-    enable_sso: "Abilita il single sign on da sito esterno (ATTENZIONE: L'INDIRIZZO EMAIL DEGLI UTENTI *DEVE* ESSERE VALIDATO DAL SITO ESTERNO!)"
-    verbose_sso_logging: "Registra la diagnostica dettagliata SSO su <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    enable_sso_provider: "Implementa il protocollo SSO Discourse nell'endpoint /session/sso_provider. È necessario che sia impostata l'opzione sso_provider_secrets"
-    sso_url: "URL per l'endpoint del single sign on (deve includere http:// o https://)"
-    sso_secret: "Stringa segreta utilizzata per autenticare crittograficamente le informazioni SSO, assicurati che sia lunga almeno 10 caratteri"
-    sso_provider_secrets: "Un elenco di coppie dominio-secret che utilizzano Discourse come provider SSO. Assicurati che l'SSO secret sia di almeno 10 caratteri. Il simbolo jolly * può essere utilizzato per abbinare qualsiasi dominio o solo una parte di esso (ad esempio *. Esempio.com)."
-    sso_overrides_bio: "Sovrascrive la biografia utente nel profilo utente ed impedisce agli utenti di cambiarla"
-    sso_overrides_groups: "Sincronizza tutte le appartenenze ai gruppi manuali con i gruppi specificati nell'attributo SSO dei gruppi (ATTENZIONE: se non si specificano i gruppi, l'appartenenza al gruppo manuale verrà cancellata per l'utente)"
-    sso_overrides_email: "Sovrascrive l'email locale con l'email del sito esterno dal payload SSO ad ogni accesso e impedisce le modifiche locali. Si applica a tutti i provider di autenticazione. (ATTENZIONE: possono verificarsi discrepanze dovute alla normalizzazione delle email locali)"
-    sso_overrides_username: "Sovrascrive il nome utente locale con il nome utente del sito esterno dal payload SSO ad ogni accesso e previene le modifiche locali. Si applica a tutti i provider di autenticazione. (ATTENZIONE: possono verificarsi discrepanze a causa di differenze nella lunghezza/requisiti del nome utente)"
-    sso_overrides_name: "Sovrascrive il nome completo locale con il nome completo del sito esterno dal payload SSO ad ogni accesso e impedisce modifiche locali. Si applica a tutti i provider di autenticazione."
-    sso_overrides_avatar: "Sostituisce l'avatar dell'utente con l'avatar del sito esterno dal payload SSO. Se abilitato, gli utenti non potranno caricare avatar su Discourse."
-    sso_overrides_location: "Sovrascrive la posizione utente con la posizione esterna dal payload SSO e impedisce le modifiche locali."
-    sso_overrides_website: "Sovrascrive il sito web dell'utente con la posizione esterna dal payload SSO e impedisce le modifiche locali."
-    sso_overrides_profile_background: "Sostituisce lo sfondo del profilo utente con l'avatar del sito esterno dal payload SSO."
-    sso_overrides_card_background: "Sostituisce lo sfondo della scheda utente con l'avatar del sito esterno dal payload SSO."
-    sso_not_approved_url: "Ridirigi a questa URL gli account SSO non approvati"
-    sso_allows_all_return_paths: "Non restringere il dominio per i return_paths forniti da SSO (per default il return path deve essere sul sito corrente)"
-    enable_local_logins: "Abilita gli account di accesso basati su username e password locali. Questo deve essere abilitato affinché gli inviti funzionino. ATTENZIONE: se disabilitato, potresti non riuscire ad accedere se non hai precedentemente configurato almeno un metodo di accesso alternativo."
+    auth_immediately: "Reindirizza automaticamente al sistema di login esterno senza l'interazione dell'utente. Questo ha effetto solo quando login_required è true e esiste un solo metodo di autenticazione esterno"
+    discourse_connect_overrides_bio: "Sovrascrive la biografia utente nel profilo utente ed impedisce agli utenti di cambiarla"
     enable_local_logins_via_email: "Consenti agli utenti di richiedere un collegamento di accesso usa e getta, che gli verrà inviato tramite email."
     allow_new_registrations: "Abilita la registrazione di nuovi utenti. Se deselezionato, non sarà possibile creare nuovi account."
     enable_signup_cta: "Mostra una notifica agli utenti anonimi che ritornano chiedendo loro di registrare un account."
@@ -1546,7 +1564,7 @@ it:
     twitter_consumer_secret: "Consumer secret per l'autenticazione Twitter, registrato su <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     enable_facebook_logins: "Abilita l'autenticazione di Facebook, richiede facebook_app_id e facebook_app_secret. Vedi <a href='https://meta.discourse.org/t/13394' target='_blank'>Configurazione dell'accesso a Facebook per Discourse</a> ."
     facebook_app_id: "Id dell'app per l'autenticazione e la condivisione di Facebook, registrata su <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
-    facebook_app_secret: "App secret per l'autenticazione di Facebook, registrato su <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    facebook_app_secret: "Secret per l'autenticazione dell'app di Facebook, registrato su <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
     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'>Configuring GitHub login for Discourse</a>."
     github_client_id: "Client id per l'autenticazione di 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 di GitHub, registrato su <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
@@ -1575,7 +1593,6 @@ it:
     top_topics_formula_log_views_multiplier: "valore del moltiplicatore (n) delle visualizzazioni nella formula dei migliori argomenti: `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: "valore del moltiplicatore (n) dei mi piace sul primo messaggio nella formula dei migliori argomenti: `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: "valore del moltiplicatore (n) dei mi piace per messaggio nella formula dei migliori argomenti: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Numero di vecchi messaggi da rigenerare ogni 15 minuti."
     enable_safe_mode: "Consenti agli utenti di accedere alla modalità provvisoria per eseguire il debug dei plug-in."
     rate_limit_create_topic: "Dopo aver creato un argomento, gli utenti devono aspettare (n) secondi prima di poterne creare un altro."
     rate_limit_create_post: "Dopo aver inviato un messaggio, gli utenti devono aspettare (n) secondi prima di creare un altro messaggio. "
@@ -1591,9 +1608,8 @@ it:
     max_topic_invitations_per_day: "Numero massimo di inviti ad argomenti che un utente può inviare al giorno."
     max_logins_per_ip_per_hour: "Numero massimo di accessi consentiti per indirizzo Ip per ora"
     max_logins_per_ip_per_minute: "Numero massimo di accessi consentiti per indirizzo IP per minuto"
-    max_post_deletions_per_minute: "Numero massimo di post che un utente può eliminare al minuto."
-    max_post_deletions_per_day: "Numero massimo di post che un utente può eliminare al giorno."
     invite_link_max_redemptions_limit: "Il numero massimo di riscatti consentiti per i link di invito non può essere superiore a questo valore."
+    invite_link_max_redemptions_limit_users: "Il numero massimo di riscatti consentiti per i link di invito generati da utenti regolari non può superare questo valore."
     alert_admins_if_errors_per_minute: "Soglia di errori al minuto che 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)."
@@ -1605,7 +1621,7 @@ it:
     clean_orphan_uploads_grace_period_hours: "Dopo quante ore un caricamento orfano (senza riferimenti) viene rimosso."
     purge_deleted_uploads_grace_period_days: "Dopo quanti giorni un caricamento cancellato viene rimosso."
     purge_unactivated_users_grace_period_days: "Il periodo di grazia (in giorni) prima che un utente che non ha attivato il suo account venga eliminato. Impostare su 0 per non eliminare mai gli utenti non attivati."
-    enable_s3_uploads: "Mette i caricamenti sullo spazio disco Amazon S3. IMPORTANTE: richiede che siano inserite valide credenziali S3 (sia l'access key id sia l'access key secret)."
+    enable_s3_uploads: "Mette i caricamenti sullo spazio di archiviazione Amazon S3. IMPORTANTE: richiede che siano inserite valide credenziali S3 (sia l'access key id sia l'access key secret)."
     s3_use_iam_profile: 'Utilizzare un <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">profilo di istanza di AWS EC2</a> per concedere l''accesso al bucket S3. NOTA: questa abilitazione richiede che Discourse sia in esecuzione in un''istanza EC2 configurata in modo appropriato e sovrascriva le impostazioni "s3 access key id" e "s3 secret access key".'
     s3_upload_bucket: "Il nome del bucket Amazon S3 sul quale verranno caricati i file. ATTENZIONE: deve essere tutto minuscolo, senza punti, senza trattini bassi."
     s3_access_key_id: "L'Amazon S3 access key che verrà utilizzato per caricare immagini, allegati e backup."
@@ -1626,7 +1642,6 @@ it:
     strip_image_metadata: "Rimuovi i metadati dalle immagini."
     min_ratio_to_crop: "Rapporto usato per ritagliare immagini alte. Immettere il risultato di larghezza / altezza."
     simultaneous_uploads: "Numero massimo di file che possono essere trascinati e rilasciati nel composer"
-    enable_flash_video_onebox: "Attiva l'inserimento di collegamenti swf e flv (Adobe Flash) in onebox. ATTENZIONE: comporta rischi per la sicurezza."
     default_invitee_trust_level: "Livello di esperienza (0-4) assegnato di default agli utenti invitati."
     default_trust_level: "Livello di esperienza (da 0 a 4) assegnato ai nuovi utenti. ATTENZIONE! Modificare questa opzione ti espone ad un serio rischio di ricevere posta indesiderata."
     tl1_requires_topics_entered: "Quanti argomenti deve inserire un utente per essere promosso a livello di esperienza 1."
@@ -1660,6 +1675,7 @@ it:
     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 di esperienza minimo richiesto per creare nuovi messaggi personali."
+    min_trust_to_send_email_messages: "Il livello di fiducia minimo richiesto per inviare messaggi personali via email."
     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_embedded_media: "Il livello minimo di esperienza richiesto per incorporare elementi multimediali in un messaggio"
@@ -1692,6 +1708,7 @@ it:
     category_colors: "Un elenco di valori esadecimali di colori permessi per le categorie."
     category_style: "Stile grafico dei distintivi relativi alle categorie."
     default_dark_mode_color_scheme_id: "Lo schema di colori usato in modalità scuro."
+    dark_mode_none: "Nessuno"
     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) "
@@ -1719,6 +1736,7 @@ it:
     privacy_policy_url: "Se vuoi usare un documento sulle Politiche di Privacy ospitato da qualche altra parte, fornisci qui la sua URL completa."
     log_anonymizer_details: "Mantenere o meno i dettagli di un utente nel registro dopo essere stato reso anonimo. Per obbedire al GDPR, è necessario disattivarle questa opzione."
     newuser_spam_host_threshold: "Quante volte un nuovo utente può pubblicare un collegamento allo stesso host all'interno dei messaggi `newuser_spam_host_threshold` prima di essere considerato spam."
+    allowed_spam_host_domains: "Una lista di domini esclusi dal controllo antispam. Ai nuovi utenti non verrà mai impedito di creare messaggi con collegamenti a tali domini."
     topic_view_duration_hours: "Conteggia una nuova visita dell'argomento una volta per IP/Utente ogni N ore"
     user_profile_view_duration_hours: "Conteggia una nuova visita del profilo utente una volta per IP/Utente ogni N ore"
     levenshtein_distance_spammer_emails: "Quanti caratteri di differenza faranno comunque scattare una corrispondenza approssimativa nell'analisi delle email di spam. "
@@ -1736,7 +1754,9 @@ it:
     reviewable_claiming: "È necessario rivendicare il contenuto revisionabile prima che possa essere manipolato?"
     reviewable_default_topics: "Mostra contenuto revisionabile raggruppato per argomento per impostazione predefinita"
     reviewable_default_visibility: "Non mostrare elementi revisionabili a meno che non soddisfino questa priorità"
+    reviewable_low_priority_threshold: "Il filtro di priorità nasconde le recensioni che non soddisfano questo punteggio a meno che non venga utilizzato il filtro '(qualsiasi)'."
     high_trust_flaggers_auto_hide_posts: "I messaggi di nuovi utenti vengono automaticamente nascosti dopo essere stati contrassegnati come spam da un utente TL3 +"
+    cooldown_hours_until_reflag: "Quanto tempo gli utenti dovranno aspettare prima di poter segnalare nuovamente un messaggio"
     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"
@@ -1753,6 +1773,7 @@ it:
     max_emails_per_day_per_user: "Numero massimo di email da inviare agli utenti per giorno. 0 per disabilitare il limite"
     enable_staged_users: "Crea automaticamente utenti temporanei quando si elaborano le email in arrivo."
     maximum_staged_users_per_email: "Numero massimo di utenti temporanei creati quando si elaborano le email in arrivo."
+    auto_generated_allowlist: "Lista degli indirizzi email che non verranno verificati per i contenuti generati automaticamente. Esempio: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Bloccare le email in arrivo identificate come generate automaticamente."
     ignore_by_title: "Ignora le email in arrivo in base al loro titolo."
     mailgun_api_key: "Chiave API Segreta di Mailgun usata per verificare i messaggi webhook. "
@@ -1762,9 +1783,10 @@ it:
     reset_bounce_score_after_days: "Ripristina automaticamente il punteggio di rimbalzo dopo X giorni."
     forwarded_emails_behaviour: "Come gestire una mail inoltrata a Discourse"
     always_show_trimmed_content: "Mostra sempre la parte tagliata delle email in arrivo. ATTENZIONE: potrebbe rivelare indirizzi email."
+    trim_incoming_emails: "Taglia la parte delle email in arrivo che non è rilevante."
     private_email: "Non includere contenuti da messaggi o argomenti nel titolo o nel corpo dell'email. NOTA: disabilita anche le email riassuntive."
-    email_total_attachment_size_limit_kb: "Dimensione massima dei files allegati alle email in uscita. Imposta a 0 per disabilitare l'invio di allegati."
     post_excerpts_in_emails: "Nelle emails di notifica, invia sempre un estratto invece del messaggio completo"
+    delete_rejected_email_after_days: "Elimina le email rifiutate più vecchie di (n) giorni."
     manual_polling_enabled: "Push delle email utilizzando le API per le risposte email."
     pop3_polling_enabled: "Cerca le risposte via email tramite POP3."
     pop3_polling_ssl: "Usa SSL per la connessione al server POP3 (raccomandato)."
@@ -1822,6 +1844,7 @@ it:
     ignored_users_count_message_threshold: "Informare i moderatori se un determinato utente viene ignorato da molti altri utenti."
     ignored_users_message_gap_days: "Quanto a lungo attendere prima di informare nuovamente i moderatori di un utente che è stato ignorato da molti altri."
     clean_up_inactive_users_after_days: "Numero di giorni prima che un utente inattivo (Livello Esperienza 0 e senza messaggi= venga rimosso. Per disabilitare la pulizia, imposta a 0."
+    allowed_user_website_domains: "Verrà verificato il sito web dell'utente per questi domini. Lista delimitata dal carattere pipe."
     allow_profile_backgrounds: "Permetti agli utenti di caricare immagini di sfondo per il profilo."
     sequential_replies_threshold: "Numero di messaggi che un utente deve pubblicare di fila in un argomento prima che gli venga ricordato delle troppe risposte sequenziali."
     get_a_room_threshold: "Numero di messaggi che un utente deve inviare alla stessa persona nello stesso argomento prima di essere avvertito."
@@ -1854,6 +1877,7 @@ it:
     embed_truncate: "Tronca i messaggi incorporati."
     embed_unlisted: "Gli argomenti importati non saranno in elenco finché un utente non risponderà."
     embed_support_markdown: "Supporta la formattazione Markdown per i messaggi incorporati."
+    allowed_embed_selectors: "Un elenco separato da virgole di elementi CSS consentiti negli incorporamenti."
     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."
@@ -1861,7 +1885,6 @@ it:
     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)"
-    prevent_anons_from_downloading_files: "Impedire agli utenti anonimi di scaricare gli allegati. ATTENZIONE: questo impedirà a qualsiasi risorsa del sito pubblicata come allegato di funzionare ad eccezione delle immagini."
     secure_media: 'Limita l''accesso a TUTTI i caricamenti (immagini, video, audio, testo, pdf, zip, ecc.). Se “login richiesto” è attivato, solo gli utenti registrati possono accedere ai caricamenti. In caso contrario, l''accesso sarà limitato solo per i media caricati in messaggi privati e categorie private. ATTENZIONE: Questa impostazione è complessa e richiede una profonda competenza amministrativa. Per maggiori dettagli visita <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">l''argomento sui media sicuri su Meta</a>.'
     slug_generation_method: "Scegli un metodo di generazione delle abbreviazioni. 'encoded' genererà la stringa di codifica percentuale. 'none' disattiverà completamente le abbreviazioni."
     enable_emoji: "Attiva gli emoji"
@@ -1891,7 +1914,6 @@ it:
     default_email_messages_level: "Imposta il livello di notifica email predefinito quando un utente invia messaggi all'utente."
     default_email_mailing_list_mode: "Invia una email per ogni nuovo messaggio di default."
     default_email_mailing_list_mode_frequency: "Con quale frequenza gli utenti che hanno attivato la modalità mailing list riceveranno email di default."
-    disable_mailing_list_mode: "Impedisci agli utenti di attivare la modalità mailing list."
     default_email_previous_replies: "Includi risposte precedenti nelle email di default."
     default_email_in_reply_to: "Includi un estratto della risposta ad un messaggio nelle email di default."
     default_other_new_topic_duration_minutes: "Condizione globale predefinita per cui un argomento viene considerato nuovo."
@@ -1901,10 +1923,11 @@ it:
     default_other_enable_quoting: "Attiva rispondi citando per il testo evidenziato di default."
     default_other_enable_defer: "Abilita la funzionalità di rinvio dell'argomento per impostazione predefinita."
     default_other_dynamic_favicon: "Per impostazione predefinita mostra il conteggio degli argomenti nuovi/aggiornati sull'icona del browser."
+    default_other_skip_new_user_tips: "Salta i suggerimenti e i distintivi per l'inserimento dei nuovi utenti."
     default_other_like_notification_frequency: "Per impostazione predefinita invia una notifica agli utenti sui mi piace"
     default_topics_automatic_unpin: " Per impostazione predefinita spunta automaticamente gli argomenti quando l'utente arriva in fondo. "
     default_categories_watching: "Elenco di categorie osservate per default."
-    default_categories_tracking: "Elenco di categorie seguite per default."
+    default_categories_tracking: "Elenco di categorie seguite di default."
     default_categories_muted: "Elenco di categorie silenziate per default."
     default_categories_watching_first_post: "Elenco di categorie in cui il primo messaggio di ogni nuovo argomento verrà osservato per impostazione predefinita."
     default_tags_tracking: "Elenco di etichette seguite di default."
@@ -1915,7 +1938,6 @@ it:
     retry_web_hook_events: "Riprova automaticamente gli eventi di hook Web falliti per 4 volte. Gli intervalli di tempo tra i tentativi sono 1, 5, 25 e 125 minuti."
     allow_user_api_keys: "Consenti la generazione di chiavi API utente"
     allow_user_api_key_scopes: "Elenco di ambiti consentiti per le chiavi API utente"
-    max_api_keys_per_user: "Numero massimo di chiavi API utente per utente"
     min_trust_level_for_user_api_key: "Livello di esperienza richiesto per la generazione di chiavi API utente"
     allowed_user_api_auth_redirects: "URL consentito per il reindirizzamento dell'autenticazione per le chiavi API utente. Il simbolo jolly * può essere utilizzato per abbinare qualsiasi parte di esso (ad esempio www.example.com/*)."
     allowed_user_api_push_urls: "URL consentiti per il push del server alla API utente"
@@ -1925,7 +1947,6 @@ it:
     max_tags_per_topic: "Il numero massimo di etichette che si possono applicare ad un argomento."
     max_tag_length: "La quantità massima di caratteri utilizzabili in un'etichetta."
     max_tag_search_results: "Il numero massimo di risultati da mostrare nella ricerca di etichette."
-    show_filter_by_tag: "Mostra un menu a discesa per filtrare gli Argomenti per Etichetta."
     max_tags_in_filter_list: "Numero massimo di etichette da mostrare nell'elenco a discesa del filtro. Saranno mostrate le etichette più usate."
     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> ."
@@ -1939,6 +1960,7 @@ it:
     governing_law: "Diritto applicabile"
     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."
+    shared_drafts_min_trust_level: "Consenti agli utenti di visualizzare e modificare le bozze condivise."
     push_notifications_prompt: "Visualizza richiesta di consenso dell'utente."
     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."
@@ -1961,6 +1983,7 @@ it:
       invalid_string_min_max: "Il numero di caratteri deve essere tra %{min} e %{max}."
       invalid_string_min: "Il numero di caratteri deve essere di almeno %{min}."
       invalid_string_max: "Il numero di caratteri non deve eccedere %{max}."
+      invalid_json: "JSON non valido."
       invalid_reply_by_email_address: "Il valore deve contenere '%{reply_key}' ed essere differente dalla email di notifica."
       invalid_alternative_reply_by_email_addresses: "Tutti i valori devono contenere '%{reply_key}' ed essere differenti dalla email di notifica."
       pop3_polling_host_is_empty: "È necessario impostare 'pop3 polling host' prima di attivare il polling POP3."
@@ -1974,24 +1997,20 @@ it:
       email_editable_enabled: "Prima di attivare questa impostazione, devi disabilitare 'email editable'."
       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 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})."
       max_username_length_range: "Non puoi impostare il massimo inferiore al minimo."
       invalid_hex_value: "I valori di colore devono essere codici esadecimali a 6 cifre."
-      category_search_priority:
-        very_low_weight_invalid: "Non puoi impostare un peso maggiore di 'category_search_priority_low_weight'."
-        low_weight_invalid: "Non puoi impostare un peso maggiore o uguale a 1 o inferiore a 'category_search_priority_very_low_weight'"
-        very_high_weight_invalid: "Non puoi impostare il peso in modo che sia inferiore a 'category_search_priority_high_weight'."
+      allowed_unicode_usernames:
+        regex_invalid: "L'espressione regolare non è valida: %{error}"
+        leading_trailing_slash: "L'espressione regolare non può iniziare o terminare con una barra."
       unicode_usernames_avatars: "Gli avatar di sistema interni non supportano i nomi utente Unicode."
       list_value_count: "La lista contiene esattamente %{count} valori."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "SSO secret"
   search:
     extreme_load_error: "Il sito è sovraccarico, la ricerca disabilitata, riprovare più tardi"
     within_post: "n°%{post_number} di %{username}"
@@ -2002,7 +2021,7 @@ it:
     results_page: "Risultati della ricerca per '%{term}'"
     audio: "[audio]"
     video: "[video]"
-  sso:
+  discourse_connect:
     login_error: "Errore Login"
     not_found: "Impossibile trovare il tuo account. Si prega di contattare l'amministratore del sito."
     account_not_approved: "Il tuo account è in attesa di approvazione. Riceverai una notifica email una volta approvato. "
@@ -2010,7 +2029,7 @@ it:
     timeout_expired: "Il tempo di connessione dell'account è scaduto, prova a connetterti di nuovo."
     no_email: "Nessun indirizzo email è stato fornito. Si prega di contattare l'amministratore del sito."
     email_error: "Non è possibile registrare un account con l'indirizzo email <b>%{email}</b>. Si prega di contattare l'amministratore del sito."
-    missing_secret: "L'autenticazione SSO è fallita a causa di un segreto mancante. Contatta gli amministratori del sito per risolvere il problema."
+    invite_redeem_failed: "Riscatto dell'invito non riuscito. Contatta l'amministratore del sito."
   original_poster: "Autore iniziale"
   most_posts: "Maggioranza Messaggi"
   most_recent_poster: "Autore più recente"
@@ -2025,6 +2044,7 @@ it:
     errors:
       different_topics: "I messaggi appartenenti a diversi argomenti non possono essere fusi."
       different_users: "I messaggi appartenenti a diversi utenti non possono essere fusi."
+      max_post_length: "I messaggi non possono essere uniti perché la lunghezza dei messaggi combinati è maggiore di quella consentita."
   move_posts:
     new_topic_moderator_post:
       one: "Un messaggio è stato spostato in un nuovo argomento: %{topic_link}"
@@ -2171,6 +2191,8 @@ it:
       fixed_primary_email: "Risolto il problema dell'email principale per l'utente temporaneo"
       same_ip_address: "Lo stesso indirizzo IP (%{ip_address}) di altri utenti"
       inactive_user: "Utente inattivo"
+      reviewable_reject_auto: "Gestione automatica delle revisioni in coda"
+      reviewable_reject: "Utente verificabile rifiutato"
     already_silenced: "L'utente è già stato silenziato da %{staff} %{time_ago}."
     already_suspended: "L'utente è già stato sospeso da %{staff} %{time_ago}."
   reviewables_reminder:
@@ -2326,13 +2348,15 @@ it:
         La comunità ha segnalato questo messaggio ed è ora nascosto. **Siccome questo messaggio è stato nascosto più di una volta, il tuo messaggio rimarrà ora nascosto fino ad intervento dello staff.**
 
         Per ulteriori informazioni, per favore fai riferimento alle nostre [community guidelines](%{base_url}/guidelines).
+    queued_by_staff:
+      title: "Messaggio da approvare"
+      subject_template: "Messaggio nascosto dallo staff, in attesa di approvazione"
     flags_disagreed:
       title: "Messaggio segnalato ripristinato dallo saff"
       subject_template: "Messaggio segnalato ripristinato dallo saff"
     flags_agreed_and_post_deleted:
       title: "Post segnalato rimosso dallo staff"
       subject_template: "Post segnalato rimosso dallo staff"
-      text_body_template: "Ciao,\n\nQuesto è un messaggio automatico da %{site_name} per informarti che [il tuo messaggio] (%{base_url}%{url}) è stato rimosso. \n\n%{flag_reason}\n\nIl messaggio è stato segnalato dalla comunità e un membro dello staff ha deciso di rimuoverlo. \n\n[details=\"Fai clic per espandere il post rimosso\"] \n```markdown\n%{flagged_post_raw_content}\n```[/ details]\n\nPer ulteriori dettagli, consulta le nostre [linee guida della community] (%{base_url}/guidelines).\n"
     usage_tips:
       text_body_template: |
         Per leggere alcuni veloci suggerimenti su come iniziare se sei un nuovo utente [dai una lettura a questo articolo](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)
@@ -2370,6 +2394,8 @@ it:
         Buona permanenza!
 
         [prefs]: %{user_preferences_url}
+    tl2_promotion_message:
+      subject_template: "Congratulazioni per la promozione a un livello di fiducia superiore!"
     backup_succeeded:
       title: "Backup Riuscito"
       subject_template: "Backup completato correttamente"
@@ -2950,21 +2976,9 @@ it:
     account_suspended:
       title: "Account Sospeso"
       subject_template: "[%{email_prefix}] Il tuo account è stato sospeso"
-      text_body_template: |
-        Sei stato sospeso dal forum fino a %{suspended_till}.
-
-        %{reason}
-
-        %{message}
     account_silenced:
       title: "Account Silenziato"
       subject_template: "[%{email_prefix}] Il tuo account è stato silenziato"
-      text_body_template: |
-        Sei silenziato dal forum fino %{silenced_till}.
-
-        %{reason}
-
-        %{message}
     account_exists:
       title: "L'account esiste già"
       subject_template: "[%{email_prefix}] L'account esiste già"
@@ -3062,6 +3076,7 @@ it:
 
         %{new_email}
     notify_old_email_add:
+      title: "Notifica Vecchia Email (Aggiungi)"
       subject_template: "[%{email_prefix}] È stato aggiunto un nuovo indirizzo email"
       text_body_template: |
         Questo è un messaggio automatico per farti sapere che è stato aggiunto un indirizzo email per
@@ -3107,10 +3122,18 @@ it:
       title: "Nuovo avviso di accesso"
       subject_template: "[%{site_name}] Nuovo accesso da %{location}"
       text_body_template: "Ciao, \n\nabbiamo notato un accesso da un dispositivo o da una posizione che non utilizzi abitualmente. Sei stato tu? \n\n- Posizione: %{location} (%{client_ip}) \n- Browser: %{browser} \n- Dispositivo: %{device} - %{os} \n\nSe eri tu, fantastico! Non c'è nient'altro che devi fare. Se non sei stato tu, ti preghiamo di [controllare le tue sessioni esistenti] (%{base_url}/my/preferences/account) e prendere in considerazione la possibilità di cambiare la tua password.\n"
+    post_approved:
+      title: "Il tuo messaggio è stato approvato"
+      subject_template: "[%{site_name}] Il tuo messaggio è stato approvato"
+      text_body_template: |
+        Ciao,
+
+        Questo è un messaggio automatico da %{site_name} per farti sapere che [il tuo messaggio](%{base_url}%{post_url}) è stato approvato.
   page_forbidden:
     title: "Ops! Quella pagina è privata."
+  site_setting_missing: "Deve essere impostata l'impostazione del sito `%{name}`."
   page_not_found:
-    title: "La pagina richiesta non esiste oppure è privata."
+    title: "Ops! La pagina richiesta non esiste oppure è privata."
     popular_topics: "Di successo"
     recent_topics: "Recenti"
     see_more: "Altro"
@@ -3660,9 +3683,6 @@ it:
         other: '"%{tag_name}" è limitato alle seguenti categorie: %{category_names}'
       synonym: 'I sinonimi non sono ammessi. Utilizza invece &quot;%{tag_name}&quot;.'
       has_synonyms: '&quot;%{tag_name}&quot; non può essere utilizzato perché ha dei sinonimi.'
-    required_tags_from_group:
-      one: "Devi includere almeno %{count} %{tag_group_name} etichetta."
-      other: "Devi includere almeno %{count} %{tag_group_name} etichette."
     invalid_target_tag: "non può essere sinonimo di un sinonimo"
     synonyms_exist: "non è consentito finché esistono sinonimi"
   rss_by_tag: "Argomenti etichettati %{tag}"
@@ -3697,7 +3717,7 @@ it:
             description: "Qual è il linguaggio predefinito della tua comunità?"
       forum_title:
         title: "Nome"
-        description: "Il tuo nome è un segno visibile in lontananza, la <i>prima</i> cosa che i visitatori potenziali noteranno sulla tua comunità. Cosa dice il tuo nome e il tuo titolo sulla tua comunità?"
+        description: "Il tuo nome è un segno visibile in lontananza, la <i>prima</i> cosa che i visitatori potenziali noteranno della tua comunità. Cosa dice il tuo nome e il tuo titolo della tua comunità?"
         fields:
           title:
             label: "Il nome della tua comunità"
@@ -3714,12 +3734,12 @@ it:
         fields:
           welcome:
             label: "Argomento di Benvenuto"
-            description: "<p>Come descriveresti la tua comunità ad un estraneo su un ascensore in circa 1 minuto?</p><ul><li>Per chi sono queste discussioni?</li><li>Cosa posso trovare qui?</li><li>Perché dovrei visitare il sito?</li></ul><p>Il tuo argomento di benvenuto è la prima cosa che i nuovi arrivati leggeranno. Pensalo come al <b>tuo paragrafo</b> 'discorso da ascensore' o 'dichiarazione di intenti'.</p>"
+            description: "<p>Come descriveresti la tua comunità ad uno sconosciuto su un ascensore in circa 1 minuto?</p><ul><li>Per chi sono queste discussioni?</li><li>Cosa posso trovare qui?</li><li>Perché dovrei visitare il sito?</li></ul><p>Il tuo argomento di benvenuto è la prima cosa che i nuovi arrivati leggeranno. Pensalo come al <b>tuo paragrafo</b> 'discorso da ascensore' o 'dichiarazione di intenti'.</p>"
             one_paragraph: "Restringi il tuo messaggio di benvenuto a un paragrafo."
-            extra_description: "In caso d'incertezza, puoi saltare questo passaggio e modificare il tuo argomento di benvenuto più tardi."
+            extra_description: "Se non si è sicuri, è possibile saltare questo passaggio e modificare l'argomento di benvenuto in un secondo momento."
       privacy:
         title: "Accesso"
-        description: "<p> La tua comunità è aperta a tutti, o è limitata da adesione, invito o approvazione? Se preferisci, puoi impostare le cose in privato, quindi passare a pubblico più avanti. </p>"
+        description: "<p>La tua comunità è aperta a tutti o è limitata da appartenenza, invito o approvazione? Se si preferisce, puoi configurare le cose in privato, quindi passare a pubblico in seguito.</p>"
         fields:
           privacy:
             choices:
@@ -3735,7 +3755,7 @@ it:
               open:
                 label: "Gli utenti possono registrarsi autonomamente."
               invite_only:
-                label: "Gli utenti devono essere invitati da utenti o dallo staff prima che possano registrarsi."
+                label: "Gli utenti devono essere invitati da utenti attendibili o dallo staff prima di potersi registrare."
               must_approve:
                 label: "Gli utenti possono registrarsi autonomamente, ma devono essere approvati dallo staff."
       contact:
@@ -3744,14 +3764,14 @@ it:
           contact_email:
             label: "Email"
             placeholder: "nome@esempio.com"
-            description: "Indirizzo email della persona o del gruppo responsabile di questa comunità. Utilizzato per notifiche critiche quali segnalazioni non gestite, aggiornamenti sulla protezione e sulla tua pagina <a href='%{base_path}/about' target='_blank'>informazioni</a> per un contatto urgente."
+            description: "Indirizzo email della persona o del gruppo responsabile di questa comunità. Utilizzato per notifiche critiche come segnalazioni non gestite, aggiornamenti di sicurezza e sulla tua <a href='%{base_path}/about' target='_blank'>pagina Informazioni</a> per un contatto urgente."
           contact_url:
             label: "Sito Web"
             placeholder: "https://www.example.com/contact-us"
             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, come avvisi per le segnalazione e avvisi di completamento backup."
+            description: "Tutti i messaggi personali automatici di Discourse saranno inviati da questo utente, come avvisi di segnalazione e notifiche di completamento del 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."
@@ -3790,12 +3810,12 @@ it:
         fields:
           favicon:
             label: "Icona del Browser"
-            description: "Icona usata per rappresentare il tuo sito sul browser web, che si veda bene in piccole dimensioni. Le estensioni raccomandate sono PNG e JPG. Useremo il logo quadrato come predefinito."
+            description: "Icona usata per rappresentare il tuo sito sul browser web, che si veda bene in piccole dimensioni. Le estensioni di immagini consigliate sono PNG e JPG. Per impostazione predefinita useremo il logo quadrato."
           large_icon:
             label: "Icona Grande"
-            description: "Icona usata per rappresentare il tuo sito sul dispositivi moderni, che si veda bene in grandi dimensioni. Idealmente più grande di 512x512. Useremo il logo quadrato come predefinito."
+            description: "Icona usata per rappresentare il tuo sito sul dispositivi moderni, che si veda bene in grandi dimensioni. Idealmente più grande di 512 x 512. Per impostazione predefinita useremo il logo quadrato."
       homepage:
-        description: "Ti consigliamo di mostrare gli ultimi argomenti nella tua homepage, ma puoi anche visualizzare le categorie (gruppi di argomenti) sulla homepage, se preferisci."
+        description: "Ti consigliamo di mostrare gli ultimi argomenti sulla tua homepage, ma se preferisci puoi anche mostrare le categorie (gruppi di argomenti)."
         title: "Homepage"
         fields:
           homepage_style:
@@ -3814,17 +3834,14 @@ it:
                 label: "Riquadri Categorie"
               categories_boxes_with_topics:
                 label: "Riquadri Categorie con Argomenti"
-      emoji:
-        title: "Emoji"
-        description: "Quale stile di emoji preferisci per la tua comunità? Puoi aggiungere più Emoji personalizzate in seguito tramite Amministrazione, Personalizza, Emoji."
       invites:
         title: "Invita lo Staff"
-        description: "Hai quasi finito! Invita alcune persone a <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>contribuire alle discussioni</a> con argomenti e risposte interessanti per far partire la tua comunità. "
+        description: "Hai quasi finito! Invita alcune persone a <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>contribuire alle discussioni</a> con argomenti e risposte interessanti per iniziare la tua comunità."
         disabled: "Poiché le connessioni locali sono disabilitate, non è possibile inviare inviti a nessuno. Per favore, prosegui con il passo successivo."
       finished:
         title: "Il tuo Discourse è Pronto!"
         description: |
-          <p>Se vorrai cambiare queste impostazioni, <b>esegui nuovamente questa procedura guidata in qualsiasi momento</b>, o visita <a href='%{base_path}/admin' target='_blank'>la sezione admin</a>; lo trovi accanto all'icona della chiave chiave nel menu del sito.</p>
+          <p>Se vuoi cambiare queste impostazioni, <b>riesegui questa procedura guidata in qualsiasi momento</b>, o visita <a href='%{base_path}/admin' target='_blank'>il pannello amministrativo</a>; lo trovi accanto all'icona della chiave inglese nel menu del sito.</p>
           <p>È facile personalizzare il tuo Discourse ancora di più utilizzando il nostro potente sistema di temi. Per esempio, consulta i <a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">temi e componenti principali</a> su <a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a>.</p>
           <p>Divertiti e buona fortuna <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>nel costruire la tua nuova comunità!</a></p>
   search_logs:
@@ -3857,6 +3874,7 @@ it:
       restored: Ripristinato
   reviewables:
     already_handled: "Grazie, ma abbiamo già esaminato il messaggio e stabilito che non è necessario segnalarlo di nuovo."
+    already_handled_and_user_not_exist: "Grazie ma qualcuno ha già revisionato e l’utente non esiste più."
     priorities:
       low: "Bassa"
       medium: "Media"
@@ -3874,9 +3892,8 @@ it:
       post_count: "I primi messaggi di ogni utente devono essere approvati dallo staff. Vedi 'approve_post_count'."
       trust_level: "Le risposte degli utenti con un basso Livello di Esperienza devono essere approvate dallo Staff. Vedi `approve_unless_trust_level`."
       new_topics_unless_trust_level: "Gli Argomenti di utenti con basso Livello Esperienza devono essere approvati dallo staff. Vedi `approve_new_topics_unless_trust_level`."
-      fast_typer: "Il nuovo utente ha digitato il suo primo post in modo sospettosamente rapido, sembrerebbe un comportamento di bot o spammer. Vedi `min_first_post_typing_time`."
+      fast_typer: "Il nuovo utente ha digitato il suo primo messaggio in modo sospettosamente rapido, sembrerebbe il comportamento di un bot o di uno spammer. Vedi `min_first_post_typing_time`."
       auto_silence_regexp: "Nuovo utente il cui primo post corrisponde all'impostazione `auto_silence_first_post_regex`."
-      watched_word: "Questo post include una parola monitorata. Guarda il tuo <a href='%{base_url}/admin/logs/watched_words'>elenco di parole monitorate</a> ."
       staged: "Nuovi argomenti e post per gli Utenti Temporanei devono essere approvati dallo staff. Vedi `approve_unless_staged`."
       category: "I post in questa Categoria richiedono l'approvazione manuale da parte dello staff. Vedi le impostazioni della categoria."
       must_approve_users: "Tutti i nuovi utenti devono essere approvati dallo staff. Vedi 'must_approve_users'."
@@ -3954,6 +3971,17 @@ it:
           description: "L'utente sarà eliminato, e ne bloccheremo l'IP e l'indirizzo email."
       reject:
         title: "Scarta"
+        bundle_title: "Rifiuta..."
+      reject_and_suspend:
+        title: "Rifiuta e Sospendi l'utente"
+      reject_and_silence:
+        title: "Rifiuta e Silenzia l'utente"
+      reject_and_delete:
+        title: "Rifiuta ed elimina il messaggio"
+      reject_and_keep_deleted:
+        title: "Mantieni il messaggio cancellato"
+      approve_and_restore:
+        title: "Approva e ripristina il messaggio"
       delete_user:
         title: "Cancella utente"
         confirm: "Sei sicuro di voler eliminare quell'utente? Ciò cancellerà tutti i suoi messaggi e bloccherà il suo indirizzo email e l'IP."
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 65f053a363..87ebcef0c4 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -15,6 +15,7 @@ ja:
       short_no_year: "%B %-d"
       date_only: "%B%-d、%Y"
       long: "%B%-d、%Y、%I:%M%P"
+      no_day: "%Y %m"
   date:
     month_names:
     - null
@@ -38,6 +39,7 @@ ja:
   title: "Discourse"
   topics: "トピック"
   posts: "投稿"
+  views: " 閲覧"
   loading: "読み込み中"
   powered_by_html: '<a href="https://www.discourse.org">Discourse</a>により提供されています。最適な表示のために、Javascriptを有効にしてください。'
   sign_up: "アカウントを作成"
@@ -49,25 +51,36 @@ ja:
   remove_posts_deleted_by_author: "削除者"
   redirect_warning: "選択されたリンクがこのフォーラムに投稿されたものと確認できませんでした。このまま進むには、下のリンクを選択してください。"
   on_another_topic: "別のトピックで"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} %{username}から"
   themes:
     bad_color_scheme: "テーマを更新できません、無効なカラーパレットです"
     other_error: "サーバーに不具合があるので、テーマを更新してください。"
     compile_error:
       unrecognized_extension: "ファイルの拡張子が認識できません。: %{extension}"
     import_error:
+      generic: テーマをインポートするときにエラーが起こりました
+      about_json: "インポート エラー: about.json が存在しないか、無効です。これはDiscourseのテーマですか？"
       about_json_values: "about.jsonは無効な値があります: %{errors}"
+      modifier_values: "about.json修飾子に無効な値が含まれています: %{errors}"
       git: "gitレポジトリのクローニングに失敗しました。アクセスが許可されていないか、レポジトリが見つかりません。"
       unpack_failed: "ファイルの解凍に失敗しました"
+      file_too_big: "非圧縮ファイルが大きすぎます。"
+      unknown_file_type: "アップロードしたファイルは、有効なDiscourseテーマではないようです。"
     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}の間になければなりません。"
@@ -75,6 +88,8 @@ ja:
       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:
       invalid_yaml: "翻訳YAMLが無効です"
   emails:
@@ -83,9 +98,23 @@ ja:
       show_trimmed_content: "続きを読む"
       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_body_detected_error: "本文を展開できず、添付ファイルがない場合に発生します。"
+        no_sender_detected_error: "Fromヘッダーに有効なメールアドレスが見つからなかった場合に発生します。"
+        from_reply_by_address_error: "Fromヘッダーが返信のメールアドレスと一致する場合に発生します。"
+        inactive_user_error: "送信者がアクティブでない場合に発生します。"
+        silenced_user_error: "送信者が沈黙したときに発生します。"
+        bad_destination_address: "To/Ccフィールドのいずれのメールアドレスも、設定された受信メールアドレスと一致しない場合に発生します。"
+        strangers_not_allowed_error: "ユーザーがメンバーではないカテゴリに新しいトピックを作成しようとしたときに発生します。"
+        insufficient_trust_level_error: "必要なトラストレベルを持たないユーザーが新しいトピックを作成しようとしたときに発生します。"
         bounced_email_error: "Eメールは返送されたEメールレポートです。"
+        screened_email_error: "送信者の電子メールアドレスがすでにブロックされている場合に発生します。"
       unrecognized_error: "認識されていないエラー"
+    view_redacted_media: "メディアを表示"
   errors: &errors
     format: ! "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>%{message}"
@@ -107,6 +136,8 @@ ja:
       inclusion: は一覧にありません
       invalid: は正しくありません
       is_invalid: "文章に不適切な文字、または文字列があるようです。\n文章をもう一度確認してやり直してください。"
+      invalid_timezone: "'%{tz}' は有効なタイムゾーンではありません"
+      contains_censored_words: "次の検閲された単語が含まれています： %{censored_words}"
       less_than: は%{count}より小さい値にしてください
       less_than_or_equal_to: は%{count}以下の値にしてください
       not_a_number: は数値で入力してください
@@ -134,11 +165,16 @@ ja:
     site_settings:
       default_categories_already_selected: "他のリストで使われているカテゴリーは選択できません。"
       s3_upload_bucket_is_required: "'s3_upload_bucket'がない場合、S3にアップロードを有効にすることはできません。"
+  invite:
+    user_exists: "<b>%{email}</b>を招待する必要はありません。 <a href='%{base_path}/u/%{username}/summary'>すでにアカウントを持っています！</a>"
+    disabled_errors:
+      invalid_access: "リクエストしたリソースの閲覧が許可されていません"
   bulk_invite:
     file_should_be_csv: "アップロードファイルはcsv形式である必要があります。"
     error: "アップロードファイルにエラーが発生しました。時間が経ってから再度お試しください。"
   topic_invite:
     user_exists: "ごめんなさい、そのユーザーはすでに招待されています。一つのトピックにつき一度しかユーザーを招待できません。"
+    sender_does_not_allow_pm: "申し訳ありませんが、そのユーザーがプライベートメッセージを送信することを許可していません。"
   backup:
     operation_already_running: "操作を実行しています。他の操作はできません。"
     backup_file_should_be_tar_gz: "バックアップファイルは .tar.gz形式である必要があります。"
@@ -196,6 +232,8 @@ ja:
   topics_in_category: "'%{category}' カテゴリ内のトピック"
   rss_posts_in_topic: "'%{topic}' の RSS フィード"
   rss_topics_in_category: "'%{category}' カテゴリ内のトピックの RSS フィード"
+  rss_num_posts:
+    other: "%{count} 件"
   read_full_topic: "完全なトピックを読む"
   private_message_abbrev: "メッセージ"
   rss_description:
@@ -219,9 +257,11 @@ ja:
   bookmarks:
     reminders:
       later_today: "今日中"
+      next_business_day: "翌営業日"
       tomorrow: "明日"
       next_week: "来週"
       next_month: "来月"
+      custom: "カスタムの日付と時刻"
   groups:
     errors:
       invalid_incoming_email: "%{email}のメール認証に失敗しました\U0001F62D"
@@ -240,16 +280,6 @@ ja:
   education:
     until_posts:
       other: "%{count} 投稿"
-    "new-topic": |
-      %{site_name} へようこそ。 **新しい投稿をありがとうございます！**
-
-      - タイトルは声に出して読んでみた時に関心を惹くように聞こえますか？適切な要約になっていますか？
-
-      - 誰がこれに興味を持ちますか？なぜ問題ですか？どのような反応を期待しますか？
-
-      - 他の人が*見つけ*やすいよう、一般的な単語を使ってください。関連するトピックとまとめるため、カテゴリを選んでください。
-
-      その他、[我々のコミュニティガイドラインをご覧ください](%{base_path}/guidelines)。 この案内は初めの %{education_posts_text}だけ表示されます。
     too_many_replies: |
       ### このトピックへの返信数の制限に達しました
 
@@ -335,19 +365,7 @@ ja:
     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}後に再度お試しください！"
       unsubscribe_via_email: "メールから不登録の上限に達しました。どうか%{time_left}後に再度お試しください！"
-      topic_invitations_per_day: "トピック招待の上限に達しました。どうか%{time_left}後に再度お試しください！"
     hours:
       other: "%{count} 時間"
     minutes:
@@ -519,9 +537,7 @@ ja:
     mute_topic: "%{link}通知をミュートにする"
     unwatch_category: "%{category}内の全トピックのウォッチを解除"
     mailing_list_mode: "メーリンリストモードを無効にする"
-    all: "%{sitename}からのメールを私に送信しないでください。"
     different_user_description: "電子メールで送信したものとは別のユーザーとしてログインしています。 ログアウトするか、匿名モードになり、もう一度やり直してください。"
-    not_found_description: "申し訳ありませんが購読解除に失敗しました。メールのリンクの有効期限が切れていませんか？"
     log_out: "ログアウト"
     digest_frequency:
       never: "追跡しない"
@@ -539,6 +555,8 @@ ja:
     description: '"%{application_name}" があなたのアカウントへのアクセスを要求しています: '
     otp_confirmation:
       confirm_title: '%{site_name}へ'
+      logging_in_as: '%{username} としてログイン'
+      confirm_button: ログイン完了
     no_trust_level: "申し訳ありませんが、ユーザーAPIへのアクセスはできません。"
     generic_error: "申し訳ありませんが、この機能は管理者が使用できなくしています。"
     scopes:
@@ -549,6 +567,7 @@ ja:
   reports:
     default:
       labels:
+        count: カウント
         day: 日
     post_edits:
       labels:
@@ -603,6 +622,7 @@ ja:
       title: "いいね"
       xaxis: "日"
       yaxis: "新規「いいね!」数"
+      description: "新規「いいね!」数."
     flags:
       title: "通報"
       xaxis: "日"
@@ -815,6 +835,7 @@ ja:
     share_links: "シェアダイアログに表示する項目、表示順を指定"
     site_contact_username: "自動送信メールのfromに使用される有効なスタッフのユーザー名。空欄の場合デフォルトのシステムアカウントが使用される"
     send_welcome_message: "全ての新規ユーザにクイックスタートガイド付きのウェルカムメッセージを送信する。"
+    send_tl1_welcome_message: "新しい信頼レベル1のユーザーにウェルカムメッセージを送信します。"
     suppress_reply_directly_below: "ポストに回答が１つしかない場合、ポストの回答数を表示しない"
     suppress_reply_directly_above: "ポストに回答が１つしかない場合、ポストのin-reply-toを表示しない"
     suppress_reply_when_quoting: "ポストが引用返信だった場合、ポストのin-reply-toを表示しない"
@@ -824,15 +845,14 @@ ja:
     redirect_users_to_top_page: "新規ユーザーと長く不在のユーザーをトップページに自動的にリダイレクトさせる"
     email_token_valid_hours: "パスワードリマインダ、アカウントアクティベート時のトークンを何時間有効にするか"
     enable_badges: "バッジ機能を有効にする"
+    blocked_email_domains: "ユーザーがアカウント登録をすることができない、パイプ区切りのドメイン名のリスト。 例 : mailinator.com|trashmail.net"
+    allowed_email_domains: "ユーザー登録に必要なパイプ区切りのメールドメインのリスト。警告: 指定したメールドメイン以外のユーザは許可されません！"
     log_out_strict: "ログアウトした際に、そのユーザーの全デバイスのセッションをログアウトさせる"
     new_version_emails: "Discourseの新しいバージョンが利用可能になった際に contact_email アドレスにメールで通知する"
     invite_expiry_days: "招待キーの有効期間 (日)"
     login_required: "サイトのコンテンツを閲覧するには認証を必須にして、匿名アクセスを拒否する"
     min_password_length: "パスワードの最小の長さ"
     block_common_passwords: "最もよく使われている10,000個のパスワードを許可しない"
-    enable_sso: "外部サイトを経由したシングルサインオンを有効にします(警告：ユーザーのメールアドレスは必ず外部サイトで認証されなければなりません)"
-    sso_secret: "SSO認証情報の暗号化に利用する秘密の文字列。10文字以上である必要があります"
-    sso_not_approved_url: "このURLに承認されていないSSOアカウントをリダイレクト"
     allow_new_registrations: "新しいユーザの登録を許可。ユーザを誰でも作れないようにするためには、チェックを外してください。"
     google_oauth2_client_id: "あなたのGoogleアプリケーションのクライアントID"
     google_oauth2_client_secret: "あなたの Google アプリケーションのクライアント Secret。"
@@ -853,8 +873,6 @@ ja:
     max_topics_per_day: "ユーザが一日に作成できるトピックの最大数"
     max_invites_per_day: "ユーザが一日に招待できる最大数"
     max_topic_invitations_per_day: "ユーザが一日にトピックに招待できる最大数"
-    max_post_deletions_per_minute: "ユーザーが1分間に削除できる投稿の最大数です。"
-    max_post_deletions_per_day: "ユーザーが1日に削除できる投稿の最大数です。"
     suggested_topics: "トピック下部に表示されるおすすめトピックの数"
     limit_suggested_to_category: "現在参照しているトピックのカテゴリからトピックをサジェストする"
     suggested_topics_max_days_old: "関連トピックはn日より前のものであってはいけません。"
@@ -866,7 +884,6 @@ ja:
     s3_cdn_url: "s3アセットに利用するCDNのURL(例: https://cdn.somewhere.com) 警告: 変更後は過去の投稿をrebakeする必要があります"
     avatar_sizes: "自動生成するアバターサイズのリスト"
     external_system_avatars_enabled: "外部のアバターシステムサービスを使用します。"
-    enable_flash_video_onebox: "onebox で、swf の埋め込みと flv(Adobe Flash) リンクを許可する。注意: セキュリティリスクになる可能性があります"
     default_invitee_trust_level: "招待したユーザのデフォルトトラストレベル(0-4)"
     default_trust_level: "新規ユーザのデフォルトトラストレベル(0-4) 警告: 変更すると深刻なスパムのリスクがあります"
     tl1_requires_topics_entered: "新規ユーザーがトラストレベル1に昇格するために閲覧しなければならないトピックの数"
@@ -902,6 +919,7 @@ ja:
     min_title_similar_length: "類似トピックのチェックに必要な最小タイトル長"
     category_colors: "カテゴリに利用可能な色 (16進数指定) のリスト"
     category_style: "カテゴリバッジのスタイル"
+    dark_mode_none: "なし"
     max_attachment_size_kb: "添付可能なファイルの最大サイズ (kB) nginx 側での設定 (client_max_body_size) / apache または proxy における設定も同時に行う必要があります"
     authorized_extensions: "アップロード可能なファイルの拡張子のリスト('*'で全ての拡張子が有効になります)"
     max_similar_results: "新規トピック編集中に類似トピックをいくつ表示するか。比較はタイトルと本文に基づきます"
@@ -921,6 +939,7 @@ ja:
     faq_url: "FAQが他のサイトにある場合、URLをここに指定します。"
     tos_url: "他のサイトに利用規約を掲載している場合は、URLをここに指定してください。"
     privacy_policy_url: "他のサイトにプライバシーポリシーを掲載している場合は、URLをここに指定してください。"
+    allowed_spam_host_domains: "スパムホスト検査から除外するドメインのリスト。新規ユーザはこれらのドメインでポスト内にリンクを作成することを制限されません"
     levenshtein_distance_spammer_emails: "スパマーのメールアドレスとマッチさせるとき、数文字違いの曖昧な一致でも許可する"
     max_new_accounts_per_registration_ip: "もし既にトラストレベル0のユーザーがそのIPから(N)個作成されていたら、そのIPから登録できないようにする(スタッフメンバー、トラストレベル2以上は除く)"
     min_ban_entries_for_roll_up: "When clicking the Roll up button, will create a new subnet ban entry if there are at least (N) entries."
@@ -972,12 +991,13 @@ ja:
     embed_post_limit: "表示可能な投稿の最大数を埋め込む"
     show_create_topics_notice: "サイトにpublicなトピックが5よりも少ない場合、トピックを作成するための通知が管理者に表示される"
     delete_drafts_older_than_n_days: "(n) 日間経過したドラフトを削除"
-    prevent_anons_from_downloading_files: "匿名ユーザーが添付ファイルをダウンロードするのを防止。警告: 画像ではなく、添付ファイルとして投稿された全てのファイルが対象です"
     slug_generation_method: "slugを生成するメソッドを選択。 'encode'はパーセントエンコードされた文字列を生成します。 'none'は、slugを無効にします"
     enable_emoji: "絵文字を有効にする"
     emoji_set: "How would you like your emoji?"
     approve_unless_trust_level: "トラストレベル以下のユーザーの投稿には承認が必要"
+    skip_auto_delete_reply_likes: "古い返信を自動的に削除する場合は、この数以上のいいねの投稿の削除をスキップしてください。"
     default_email_previous_replies: "デフォルトでメールの文章に以前の返信を含める"
+    default_other_skip_new_user_tips: "新規ユーザーのヒントとバッジをスキップする."
     tagging_enabled: "トピックでタグを有効にしますか？"
     tag_style: "カテゴリバッジのスタイル"
     errors:
@@ -1001,7 +1021,7 @@ ja:
       category: "カテゴリ"
       topic: "結果"
       user: "ユーザ"
-  sso:
+  discourse_connect:
     timeout_expired: "アカウントへのログインがタイムアウトになりました。もう一度トップページからログインしてください。"
   original_poster: "Original Poster"
   most_posts: "Most Posts"
@@ -1037,6 +1057,12 @@ ja:
     autoclosed_disabled: "このトピックは再オープンされました。新しい回答が投稿できるようになりました。。"
     autoclosed_disabled_lastpost: "このトピックは再オープンされました。新しい回答が投稿できます"
   login:
+    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: "現在のデバイスまたはブラウザは、セキュリティキーの使用をサポートしていません。別の方法を使用してください。"
     not_approved: "あなたのアカウントはまだ承認されていません。ログイン可能になった際にメールで通知いたします。"
     incorrect_username_email_or_password: "ユーザ名、メールアドレス、またはパスワードが違います"
     incorrect_password: "パスワードが違います"
@@ -1058,7 +1084,10 @@ ja:
     missing_user_field: "全てのユーザーフィールドの入力が終わっていません"
     auth_complete: "認証が完了しました。"
     click_to_continue: "クリックして続けてください。"
+    second_factor_title: "2段階認証"
     second_factor_backup_description: "バックアップコードを入力: "
+    second_factor_toggle:
+      backup_code: "代わりにバックアップコードを使用する"
   admin:
     email:
       sent_test: "送信完了!"
@@ -1073,6 +1102,7 @@ ja:
     email:
       not_allowed: "はこのメールプロバイダーを許可していません。他のメールアドレスを使用してください。"
       blocked: "は許可されていません。"
+      does_not_exist: "該当なし"
     ip_address:
       blocked: "あなたのIPアドレスからの新規登録は許可されていません"
       max_new_accounts_per_registration_ip: "あなたのIPアドレスからの新規登録は行えません(登録可能な数を超えています)。スタッフへお問い合わせください。"
@@ -1164,7 +1194,10 @@ ja:
     post_hidden_again:
       title: "再度非表示"
       subject_template: "コミュニティーフラッグにより非表示になりました。"
+    queued_by_staff:
+      title: "この投稿は承認が必要です"
     welcome_user:
+      title: "ようこそ：ユーザー"
       subject_template: "%{site_name} へようこそ!"
       text_body_template: |
         %{site_name}に参加ありがとうございます！
@@ -1234,6 +1267,13 @@ ja:
     reply_by_email: "回答するにはこのメールに返信するか、 (%{base_url}%{url}) に[ブラウザでアクセスしてください]。"
     visit_link_to_respond: "回答するには(%{base_url}%{url})に[ブラウザでアクセスしてください]。"
     posted_by: "%{post_date} に %{username} が投稿"
+    account_second_factor_disabled:
+      text_body_template: |
+        アカウントの2要素認証が %{site_name}で無効になっています。これで、パスワードのみでログインできます。追加の認証コードは不要になりました。
+
+        2要素認証を無効にすることを選択しなかった場合、誰かがあなたのアカウントを侵害した可能性があります。
+
+        不明な点がございましたら、[スタッフにお問い合わせください]（%{base_url}/ about）。
     digest:
       why: "あなたが最後にアクセスした %{last_seen_at} 以降の %{site_link} のまとめです"
       since_last_visit: "最後の訪問"
@@ -1258,7 +1298,7 @@ ja:
 
         もしあなたでなければ、メールを無視していただいて構いません。
 
-        以下をのリンクをチェックして新しいパスワードを設定してください:
+        以下をのリンクをクリックして新しいパスワードを設定してください:
         %{base_url}/u/password-reset/%{email_token}
     email_login:
       title: "リンク経由のログイン"
@@ -1272,11 +1312,22 @@ ja:
         %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "パスワードを設定"
+    admin_login:
+      text_body_template: |
+        [%{site_name}](%{base_url})にログインするためのリンクです。
+
+        もし、このリンクをリクエストしていなければ、メールを無視しても問題ありません。
+
+        ログインするには以下のリンクをクリックしてください:
+        %{base_url}/session/email-login/%{email_token}
     account_created:
       subject_template: "[%{email_prefix}]新しいアカウント"
     confirm_new_email:
       title: "メールを確認してください"
       subject_template: "[%{email_prefix}]新しいメールアドレスを確認してください"
+    confirm_new_email_via_admin:
+      title: "メールを確認してください"
+      subject_template: "[%{email_prefix}]新しいメールアドレスを確認してください"
     confirm_old_email:
       title: "古いメールの確認"
       subject_template: "[%{email_prefix}]現在のメールアドレスの確認"
@@ -1294,6 +1345,8 @@ ja:
         %{base_url}/u/activate-account/%{email_token}
 
         もし上のリンクがクリックできなければ、webサイトのアドレスバーに直接コピーして貼り付けてください。
+    post_approved:
+      title: "あなたの投稿は承認されました"
   page_not_found:
     title: "ページが見つからないか、アクセス出来ない場所にあります。"
     popular_topics: "人気"
@@ -1335,8 +1388,12 @@ ja:
     sender_message_to_blank: "メッセージの宛先(to)が空"
     sender_text_part_body_blank: "テキストの本文が空です"
     sender_body_blank: "本文が空です"
+    sender_post_deleted: "投稿が削除されました"
+    sender_message_to_invalid: "受信者のメールアドレスが無効です"
+    sender_topic_deleted: "トピックは削除されました"
   color_schemes:
     base_theme_name: "ベース"
+    default_theme_name: "デフォルト"
   edit_this_page: "ページを編集"
   csv_export:
     boolean_yes: "はい"
@@ -1607,6 +1664,8 @@ ja:
   tags:
     title: "タグ"
   finish_installation:
+    register:
+      button: "登録"
     resend_email:
       title: "アクティベーションメールの再送"
   wizard:
@@ -1628,6 +1687,14 @@ ja:
             placeholder: "name@example.com"
       corporate:
         title: "組織"
+      colors:
+        title: "カラー"
+      fonts:
+        fields:
+          font_preview:
+            label: "プレビュー"
+      icons:
+        title: "アイコン"
       homepage:
         description: "ホームページへは最新トピックの表示を推薦しますが、カテゴリー（トピックのまとまり）のみの表示も可能です。"
         title: "ホームページ"
@@ -1644,8 +1711,6 @@ ja:
                 label: "カテゴリーと最新トピック"
               categories_and_top_topics:
                 label: "カテゴリーと人気トピック"
-      emoji:
-        title: "絵文字"
   joined: "参加日"
   discourse_push_notifications:
     popup:
@@ -1655,6 +1720,8 @@ ja:
       replied: '%{username}が"%{topic}"へ返信しました - %{site_title}'
       posted: '%{username} が投稿しました "%{topic}" - %{site_title}'
       linked: '"%{topic}"にあるあなたの投稿に%{username}がリンクしました - %{site_title}'
+      watching_first_post: '%{username} が "%{topic}" - %{site_title}を投稿しました'
+      confirm_title: "通知を有効にしました - %{site_title}"
       confirm_body: "成功！通知を可能にしました！"
   reviewables:
     priorities:
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index e0f31e01c1..8d679bb09b 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -51,9 +51,13 @@ ko:
   remove_posts_deleted_by_author: "글쓴이에 의해 삭제된 글"
   redirect_warning: "선택한 링크가 실제로 포럼에 게시되어 있는지 확인할 수 없습니다. 계속 진행하려면 아래 링크를 선택하십시오."
   on_another_topic: "다른 주제에"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "%{username}님의 글 #%{post_number}"
   themes:
     bad_color_scheme: "테마, 유효하지 않은 색상 표를 업데이트 할 수 없습니다"
     other_error: "테마를 업데이트할 수 없습니다"
+    ember_selector_error: "죄송합니다. #ember 또는 .ember-view CSS 선택기를 사용하는 것은 허용되지 않습니다. 이러한 이름은 런타임에 동적으로 생성되고 시간이 지남에 따라 변경되어 결국 CSS가 깨지기 때문입니다. 다른 선택기를 사용해보십시오."
     compile_error:
       unrecognized_extension: "인식 할 수없는 파일 확장자 : %{extension}"
     import_error:
@@ -62,6 +66,7 @@ ko:
       about_json_values: "about.json에 유효하지 않은 값이 있습니다 : %{errors}"
       modifier_values: "about.json 수정 자에 유효하지 않은 값이 있습니다 : %{errors}"
       git: "git 저장소를 복제하는 동안 오류가 발생했습니다. 접근이 거부되었거나 저장소를 찾을 수 없습니다."
+      git_ref_not_found: "git 에서 체크 아웃 할 수 없습니다: %{ref}"
       unpack_failed: "파일 압축을 풀지 못했습니다"
       file_too_big: "압축되지 않은 파일이 너무 큽니다."
       unknown_file_type: "업로드 한 파일이 유효한 담화 테마가 아닙니다."
@@ -141,7 +146,9 @@ ko:
       inclusion: 리스트에 없음
       invalid: 올바르지 않음
       is_invalid: "문장이 불분명합니다."
+      is_invalid_meaningful: "불분명해 보이지만, 대부분의 단어에 같은 문자가 계속해서 포함되어 있습니까?"
       is_invalid_unpretentious: "명확하지 않은 것 같습니다. 하나 이상의 단어가 매우 깁니다."
+      is_invalid_quiet: "명확하지 않은 것 같습니다. 모두 대문자로 입력 하시겠습니까?"
       invalid_timezone: "&#39;%{tz}&#39;은 (는) 유효한 시간대가 아닙니다"
       contains_censored_words: "검열된 단어가 있습니다: %{censored_words}"
       less_than: '%{count}보다 작아야 함'
@@ -163,7 +170,7 @@ ko:
       wrong_length:
         other: 잘못된 길이 (%{count} 글자여야 함)
       other_than: " %{count} 글자가 아니어야 합니다."
-      sso_overrides_username: "`sso_overrides_username` 설정이 활성화되어 있으므로 SSO 제공자 측에서 사용자 이름을 업데이트해야합니다."
+      auth_overrides_username: "`auth_overrides_username` 설정이 활성화되어 있으므로 인증 제공자 측에서 사용자 이름을 업데이트해야합니다."
     template:
       body: ! "다음 필드에 문제가 있음:"
       header:
@@ -185,28 +192,38 @@ ko:
       share_quote_facebook_requirements: "페이스북으로의 공유를 활성화 하려면 페이스북 앱 ID를 설정해야 합니다."
       second_factor_cannot_enforce_with_socials: "소셜 로그인이 활성화된 상태에서는 2FA를 적용할 수 없습니다. 먼저 다음을 통해 로그인을 비활성화해야합니다: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "로컬 로그인이 비활성화 된 경우 2FA를 시행 할 수 없습니다."
-      second_factor_cannot_be_enforced_with_sso_enabled: "SSO가 활성화된 경우 2FA를 적용할 수 없습니다."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "DiscourseConnect가 활성화 된 경우 2FA를 적용할 수 없습니다."
       local_login_cannot_be_disabled_if_second_factor_enforced: "2FA가 적용되는 경우 로컬 로그인을 비활성화 할 수 없습니다. 로컬 로그인을 비활성화하기 전에 강제 2FA를 비활성화하십시오."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "S3 업로드가 이미 전체적으로 활성화되어 있으므로이 사이트 수준을 활성화하면 S3 업로드를 활성화 할 수 없습니다."
       cors_origins_should_not_have_trailing_slash: "CORS 원점에 후행 슬래시 (/) 를 추가해서는 안됩니다."
     conflicting_google_user_id: '이 계정의 Google 계정 ID가 변경되었습니다. 보안상의 이유로 직원의 개입이 필요합니다. 직원에게 연락하여 <br> <a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+    onebox:
+      invalid_address: "죄송합니다. '%{hostname}'서버를 찾을 수 없어 웹 페이지에 대한 미리보기를 생성 할 수 없습니다. 미리보기 대신 게시물에 링크만 표시됩니다. :cry:"
+      error_response: "죄송합니다. 웹 서버에서 오류 코드 %{status_code} 를 반환했기 때문에 웹 페이지에 대한 미리보기를 생성 할 수 없습니다. 미리보기 대신 게시물에 링크만 표시됩니다. :cry:"
+      missing_data:
+        other: "죄송합니다. 다음 oEmbed / OpenGraph 태그를 찾을 수 없어 웹 페이지에 대한 미리보기를 생성 할 수 없습니다: %{missing_attributes}"
+  word_connector:
+    comma: ", "
   invite:
     expired: "초대 토큰이 만료되었습니다. <a href='%{base_url}/about'>관리자에게 문의</a>하십시오."
     not_found: "초대 토큰이 유효하지 않습니다. <a href='%{base_url}/about'>직원에게 문의</a> 하십시오."
     not_found_json: "초대 토큰이 유효하지 않습니다. 직원에게 문의하십시오."
+    not_matching_email: "사용자님의 이메일 주소와 초대 토큰에 연결된 이메일 주소가 일치하지 않습니다. 관리자에게 문의하십시오."
     not_found_template: |
       <p><a href="%{base_url}">%{site_name}</a>의 초대가 이미 사용되었습니다.</p>
 
       <p>비밀번호가 기억 나시면 <a href="%{base_url}/login">로그인</a>을 하십시오.</p>
 
       <p>그렇지 않으면 <a href="%{base_url}/password-reset">비밀번호 재설정</a>을 하십시오.</p>
-    error_message: "초대를 수락하는 중에 오류가 발생했습니다. 사이트 관리자에게 문의하십시오."
+    not_found_template_link: |
+      <p> <a href="%{base_url}">%{site_name}</a>의 초대장은 더 이상 사용할 수 없습니다. 초대 한 사람에게 새 초대장을 보내달라고 요청하십시오.</p>
     user_exists: "<b>%{email}</b>님은 초대하지 않아도 됩니다. <a href='%{base_path}/u/%{username}/summary'>이미 회원이거든요!</a>"
+    invite_exists: "<b>%{email}</b> 이메일로 이미 초대되었습니다."
+    invalid_email: "%{email} 은 유효한 이메일 주소가 아닙니다."
     confirm_email: "<p> 거의 다 끝났습니다! 귀하의 이메일 주소로 활성화 메일을 보냈습니다. 메일의 지침에 따라 계정을 활성화하십시오. </p><p> 도착하지 않으면 스팸 폴더를 확인하십시오. </p>"
     cant_invite_to_group: "사용자를 지정된 그룹에 초대 할 수 없습니다. 초대하려는 그룹의 소유자인지 확인하십시오."
     disabled_errors:
-      sso_enabled: "SSO가 활성화되어 있기 때문에 초대가 비활성화되었습니다."
-      local_logins_disabled: "'로컬 로그인 사용' 설정이 비활성화되어 있으므로 초대를 사용할 수 없습니다."
+      discourse_connect_enabled: "DiscourseConnect가 활성화되어 있기 때문에 초대가 비활성화됩니다."
       invalid_access: "요청한 리소스를 볼 수 없습니다."
   bulk_invite:
     file_should_be_csv: "업로드 파일은 CSV형식이어야 합니다."
@@ -222,7 +239,7 @@ ko:
     muted_topic: "죄송합니다. 해당 사용자는 이 글을 관심없음으로 설정했습니다."
     receiver_does_not_allow_pm: "죄송합니다. 해당 사용자는 비공개 메시지를 보낼 수 있도록 허용하지 않습니다."
     sender_does_not_allow_pm: "죄송합니다. 해당 사용자는 비공개 메시지를 보낼 수 있도록 허용하지 않습니다."
-    receiver_does_not_allow_other_user_pm: "죄송합니다. 해당 사용자는 기존 참가자들에게 비공개 메시지를 보낼 수 있도록 허용하지 않습니다."
+    user_cannot_see_topic: "%{username}은 글을 볼 수 없습니다."
   backup:
     operation_already_running: "현재 작업이 실행중입니다. 지금은 새로운 일을 시작할 수 없습니다."
     backup_file_should_be_tar_gz: "백업 파일은 .tar.gz형식의 파일이어야 합니다."
@@ -245,6 +262,7 @@ ko:
   email_template_cant_be_modified: "이 이메일 템플릿은 수정할 수 없습니다"
   invalid_whisper_access: "속삭임이 활성화되어 있지 않거나 속삭임 게시물을 작성할 수있는 권한이 없습니다"
   not_in_group:
+    title_topic: "이 항목을 보려면 '%{group}' 그룹의 가입을 요청해야 합니다."
     title_category: "이 카테고리를 보려면 그룹에 속해 있어야합니다."
     request_membership: "회원 신청"
     join_group: "그룹 참여하기"
@@ -304,6 +322,7 @@ ko:
   max_pm_recipients: "죄송합니다. 최대 %{recipients_limit} 명의 수신자에게만 메시지를 보낼 수 있습니다."
   pm_reached_recipients_limit: "메시지에 수신자가 %{recipients_limit} 명을 초과 할 수 없습니다."
   removed_direct_reply_full_quotes: "이전 전체 게시물의 인용을 자동으로 제거했습니다."
+  watched_words_auto_tag: "자동으로 태그가 지정된 글"
   secure_upload_not_allowed_in_public_topic: "죄송합니다, 공개 보안 주제로는 %{upload_filenames}을 (를) 사용할 수 없습니다."
   create_pm_on_existing_topic: "기존 주제에 대해 PM을 만들 수 없습니다."
   slow_mode_enabled: "이 항목은 느린 모드입니다."
@@ -343,11 +362,11 @@ ko:
   too_late_to_edit: "이 글은 작성된 지 너무 오랜 기간이 지났습니다. 수정 또는 삭제할 수 없습니다."
   edit_conflict: "해당 게시물은 다른 사용자가 수정했으며 변경 사항을 더 이상 저장할 수 없습니다."
   revert_version_same: "복구하려는 버전과 현재 버전이 똑같습니다."
-  cannot_edit_on_slow_mode: "이 항목은 느린 모드입니다. 신중한 글 작성을 장려하기 위해 현재는 이전 게시물을 편집 할 수 없습니다."
   excerpt_image: "이미지"
   bookmarks:
     errors:
       already_bookmarked_post: "동일한 게시물을 두 번 북마크 할 수 없습니다."
+      too_many: "죄송합니다. 북마크를 %{limit}개 이상 추가 할 수 없습니다. <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> 을 방문하여 일부를 제거하십시오."
       cannot_set_past_reminder: "과거에는 북마크 미리 알림을 설정할 수 없습니다."
       cannot_set_reminder_in_distant_future: "앞으로 10 년 이상 책갈피 알림을 설정할 수 없습니다."
       time_must_be_provided: "모든 알림은 시간이 설정되어야합니다."
@@ -374,7 +393,11 @@ ko:
       email_already_used_in_category: "'%{email}' 는 '%{category_name}' 카테고리에서 이미 사용중입니다."
       cant_allow_membership_requests: "그룹 가입을 승인하려면 그룹 소유자의 승인이 필요합니다."
       already_requested_membership: "이 그룹의 회원 자격을 이미 요청하셨습니다."
-      adding_too_many_users: "한 번에 최대 %{limit}명의 사용자를 추가 할 수 있습니다."
+      adding_too_many_users:
+        other: "한 번에 최대 %{count}명의 사용자를 추가 할 수 있습니다."
+      usernames_or_emails_required: "아이디 또는 이메일이 있어야합니다."
+      no_invites_with_discourse_connect: "DiscourseConnect가 활성화 된 경우 등록된 사용자만 초대 할 수 있습니다."
+      no_invites_without_local_logins: "로컬 로그인이 비활성화된 경우 등록된 사용자만 초대할 수 있습니다."
     default_names:
       everyone: "모든 사람"
       admins: "관리자"
@@ -394,28 +417,26 @@ ko:
   education:
     until_posts:
       other: "글 %{count}개"
-    "new-topic": |2
+    "new-topic": |
+      %{site_name} &mdash;에 오신 것을 환영합니다. **새로운 대화를 시작해 주셔서 감사합니다!**
 
-      %{site_name}에 오신 것을 환영합니다 &mdash; **새로운 대화를 시작해서 감사합니다.**
+      - 제목을 소리 내어 읽었을 때 흥미롭게 들리나요? 잘 요약되었나요?
 
-      - 제목을 큰소리로 읽어봤을 때 흥미롭게 들리던가요? 좋은 요약문인가요?
+      - 누가 관심을 가질까요? 왜 중요한가요? 어떤 종류의 응답을 원하시나요?
 
-      - 누가 무엇때문에 관심을 보일까요? 어떤 대답을 듣고 싶나요?
-
-      - 사람들이 *검색*할 수 있도록 토픽에 흔히 사용하는 단어를 집어넣으세요. 관련 토픽과 같이 엮으려면 해당 카테고리를 선택하시고요.
+      - 다른 사람들이 찾을 수 있도록 주제에 자주 사용되는 단어를 포함하세요. 주제를 관련 주제로 그룹화하려면 카테고리 (또는 태그)를 선택하십시오.
 
       이 글은 당신의 첫 %{education_posts_text} 에서만 나옵니다. 자세한 내용은 [커뮤니티 가이드라인](%{base_path}/guidelines)을 참조하세요.
-    "new-reply": |2
+    "new-reply": |
+      %{site_name} &mdash; ** 참여해 주셔서 감사합니다! **
 
-      %{site_name}에 오신것을 환영합니다! &mdash; **참여해주셔서 감사합니다!**
+      - 다른 커뮤니티 회원에게 친절하게 대하세요.
 
-      - 당신의 댓글이 어떤 식으로든 토론을 발전시키나요?
+      - 댓글이 대화를 개선합니까?
 
-      - 당신의 커뮤니티 회원에게 예의를 갖춰주세요.
+      - 건설적인 비판은 환영하지만 사람이 아닌 *글 내용*을 비판하십시오.
 
-      - 건설적인 비판은 환영입니다만, 사람 말고 *아이디어*를 비판해주세요.
-
-      이 도움말은 최초 %{education_posts_text}번 글을 올릴 때까지만 나타납니다. 자세한 내용은 [커뮤니티 가이드라인](%{base_path}/guidelines)를 참조하여 주세요.
+      자세한 내용은 [커뮤니티 가이드 라인 참조](%{base_path}/guidelines). 이 패널은 처음 %{education_posts_text}에 대해서만 표시됩니다.
     avatar: |2
 
       ### 계정에 사진을 걸어두는 건 어떠세요?
@@ -483,6 +504,7 @@ ko:
               cant_send_pm: "죄송합니다. 해당 사용자에게 개인 메시지를 보낼 수 없습니다."
               no_user_selected: "유효한 사용자를 선택해주십시오"
               reply_by_email_disabled: "이메일로 답글쓰기가 비활성화되었습니다."
+              send_to_email_disabled: "죄송합니다. 개인 메시지를 이메일로 보낼 수 없습니다."
               target_user_not_found: "이 메시지를 보내는 사용자 중 하나를 찾을 수 없습니다."
               unable_to_update: "해당 주제를 업데이트하는 중에 오류가 발생했습니다."
               unable_to_tag: "글에 태그를 지정하는 중에 오류가 발생했습니다."
@@ -531,6 +553,9 @@ ko:
           attributes:
             execute_at:
               in_the_past: "미래값으로 설정되어야 합니다."
+            duration_minutes:
+              cannot_be_zero: "0보다 커야합니다."
+              exceeds_maximum: "20년을 초과 할 수 없습니다."
         translation_overrides:
           attributes:
             value:
@@ -634,20 +659,19 @@ ko:
     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}을 기다리십시오."
+      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_bookmark: "일일 북마크의 최대 수에 도달했습니다. %{time_left}후에 추가로 북마크를 할 수 있습니다."
+      edit_post: "일일 최대 편집 수에 도달했습니다. %{time_left}후에 추가로 수정 할 수 있습니다."
       live_post_counts: "실시간 게시물 수를 너무 빨리 요구하고 있습니다. 다시 시도하기 전에 %{time_left}을 기다리십시오."
       unsubscribe_via_email: "이메일을 통해 최대 수신 거부 수에 도달했습니다. 다시 시도하기 전에 %{time_left}을 기다리십시오."
-      topic_invitations_per_day: "최대 주제 초대 수에 도달했습니다. 다시 시도하기 전에 %{time_left}을 기다리십시오."
+      topic_invitations_per_day: "최대 글 초대 수에 도달했습니다. %{time_left}후에 추가로 초대장을 보낼 수 있습니다."
     hours:
       other: "%{count}시간"
     minutes:
@@ -727,7 +751,7 @@ ko:
       unknown: "알수없는 브라우저"
     device:
       android: "안드로이드 기기"
-      chromebook: "크롬 북"
+      chromebook: "크롬 OS"
       ipad: "아이패드"
       iphone: "아이폰"
       ipod: "아이팟"
@@ -738,7 +762,7 @@ ko:
       unknown: "알수없는 디바이스"
     os:
       android: "안드로이드"
-      chromeos: "ChromeOS"
+      chromeos: "크롬 OS"
       ios: "iOS"
       linux: "리눅스"
       macos: "맥OS"
@@ -753,6 +777,7 @@ ko:
     error_staged: "이메일 주소 변경중에 에러가 발생했습니다. 이 주소는 격리된 사용자가 이미 사용중입니다."
     already_done: "죄송합니다. 이 확인 링크는 더 이상 유효하지 않습니다. 이메일이 이미 변경되지는 않았나요?"
     confirm: "확인"
+    max_secondary_emails_error: "허용되는 최대 보조 이메일 한도에 도달했습니다."
     authorizing_new:
       title: "새 이메일 확인"
       description: "이메일 주소를 다음으로 변경할 것인지 확인하십시오:"
@@ -844,6 +869,9 @@ ko:
       others: "답글이 없습니다."
     no_drafts:
       self: "임시 저장 글이 없습니다. 글에 대한 댓글 작성을 시작하면 새 초안으로 자동 저장됩니다."
+  email_settings:
+    smtp_server_busy_error: "SMTP 서버가 현재 사용 중입니다. 나중에 다시 시도하십시오."
+    unhandled_error: "이메일 설정을 테스트할 때 처리되지 않은 오류가 발생했습니다. %{message}"
   webauthn:
     validation:
       invalid_type_error: "제공된 웹 인증 유형이 잘못되었습니다. 유효한 유형은 webauthn.get 및 webauthn.create입니다."
@@ -905,7 +933,7 @@ ko:
     mailing_list_mode: "메일링 리스트 모드 끄기"
     all: "%{sitename}에서 오는 메일은 전부 받지 않기"
     different_user_description: "우리가 메일을 보낸 사용자가 아닌 다른 사용자로 로그인되어 있습니다. 로그아웃하시거나, 익명 모드를 켜시고 다시 시도해주세요."
-    not_found_description: "죄송합니다. 구독 해지할 수 없습니다. 이메일의 구독해지 링크 기한이 만료되지는 않았나요?"
+    not_found_description: "죄송합니다. 구독 취소를 찾을 수 없습니다. 이메일의 링크가 너무 오래되어 만료되었을 수 있습니다."
     log_out: "로그아웃"
     submit: "환경 설정 저장"
     digest_frequency:
@@ -1283,6 +1311,7 @@ ko:
     github_config_warning: '서버가 GitHub(enable_github_logins)으로 가입 및 로그인을 허용하도록 구성되어 있지만, 클라이언트 ID 및 시크릿 값이 설정되지 않았습니다. <a href="%{base_path}/admin/site_settings">사이트 설정</a>으로 이동하여 설정을 업데이트하십시오. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">자세한 내용은 이 가이드를 참조하십시오</a>.'
     s3_config_warning: '서버가 S3에 파일을 업로드하도록 구성되었지만 s3_access_key_id, s3_secret_access_key, s3_use_iam_profile 또는 s3_upload_bucket 설정 중 하나 이상이 설정되지 않았습니다. <a href="%{base_path}/admin/site_settings">사이트 설정</a>에서 설정을 업데이트하십시오. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">"S3에 이미지 업로드를 설정하는 방법"을 참조하십시오. 자세히 알아보기</a>.'
     s3_backup_config_warning: '서버가 백업을 S3에 업로드하도록 구성되었지만 s3_access_key_id, s3_secret_access_key, s3_use_iam_profile 또는 s3_backup_bucket 중 하나 이상이 설정되지 않았습니다. <a href="%{base_path}/admin/site_settings">사이트 설정으로</a> 이동하여 <a href="%{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_cdn_warning: '서버가 S3에 파일을 업로드하도록 구성되어 있지만 S3 CDN이 구성되어 있지 않습니다. 이로 인해 S3 비용이 많이 들고 사이트 성능이 저하 될 수 있습니다. <a href="https://meta.discourse.org/t/-/148916" target="_blank">자세한 내용은 "Using Object Storage for Uploads"을 참조하십시오</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 다음에 슬래시가 있습니다."
@@ -1290,14 +1319,11 @@ ko:
       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:
     display_local_time_in_user_card: "사용자 카드 페이지가 열릴 때 사용자의 시간대를 기준으로 현지 시간을 표시합니다."
     censored_words: "단어는 자동적으로 `&#9632;&#9632;&#9632;&#9632;` 로 대체 됩니다."
@@ -1325,22 +1351,20 @@ ko:
     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: "같은 제목의 동일한 주제 허용"
     allow_duplicate_topic_titles_category: "카테고리가 다른 경우 동일한 중복 제목을 가진 글을 허용합니다. allow_duplicate_topic_titles는 false 여야합니다."
-    unique_posts_mins: "같은 컨텐츠를 다시 글 할 수 있는 기간(분)"
+    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: "이미지를 다운로드하면 원격 이미지를 로컬이미지로 변경. 이미지가 깨지는 것을 막을 수 있습니다."
+    contact_url: "이 사이트의 연락처 URL입니다. 긴급한 사항의 문의는 <a href='%{base_path}/about' target='_blank'>/about</a> 페이지에서 확인하세요."
+    crawl_images: "원격 URL에서 이미지를 가져와 올바른 너비 및 높이 치수를 삽입합니다."
+    download_remote_images_to_local: "원격 이미지를 다운로드하여 로컬 이미지로 변환합니다. 이렇게 하면 이미지가 손상되지 않습니다."
     download_remote_images_threshold: "원격의 이미지를 로컬에 다운받기 위한 최소 디스크 공간(%)"
     disabled_image_download_domains: "이 도메인을 통해서 원격 이미지를 다운로드 하지 않는다. ` | `를 구분자로 한 리스트"
     editing_grace_period: "글 작성 후, 편집해도 히스토리에 남기지 않는 시간 (단위: 초)"
@@ -1378,6 +1402,7 @@ ko:
     mobile_logo_dark: "'모바일 로고'사이트 설정에 대한 어두운 구성표 대안."
     large_icon: "다른 메타 데이터 아이콘의 기본으로 사용되는 이미지. 이상적으로 512 x 512보다 커야합니다. 비워두면 logo_small이 사용됩니다."
     manifest_icon: "Android에서 로고 / 스플래쉬 이미지로 사용되는 이미지. 512 × 512로 자동 크기가 조정됩니다. 비워두면 large_icon이 사용됩니다."
+    manifest_screenshots: "설치 프롬프트 페이지에서 인스턴스 기능을 보여주는 스크린 샷입니다. 모든 이미지는 로컬 업로드여야 하며 크기가 동일해야 합니다."
     favicon: "사이트의 즐겨 찾기 아이콘은 <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon을</a> 참조 <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이 사용됩니다"
@@ -1388,7 +1413,7 @@ ko:
     detailed_404: "특정 주제에 액세스 할 수없는 이유에 대한 자세한 정보를 사용자에게 제공합니다. 참고 : URL이 유효한 주제로 연결되는지 사용자가 알기 때문에 보안 수준이 떨어집니다."
     enforce_second_factor: "사용자가 2단계 인증을 사용하도록합니다. 모든 사용자에게 적용하려면 '모두'를 선택하십시오. 관리자에게만 적용하려면 '관리자'를 선택하십시오."
     force_https: "사이트가 HTTPS를 사용하도록 강제합니다. 경고: HTTPS가 완벽히 적용되어 있는 것을 확인하기 전까지는 이 옵션을 켜지마세요. CDN, 소셜 로그인, 외부 링크로 가져오는 자료, 로고들이 HTTPS호환성이 있는지 확인하셨나요?"
-    same_site_cookies: "동일 사이트 쿠키를 사용합니다. 지원되는 브라우저에서 사이트 간 요청 위조의 가능성이 있는 모든 매개체를 (관대 또는 엄격하게) 제거합니다. 경고: 엄격한 통제는 로그인을 강제하거나 SSO를 사용하는 경우에만 적용됩니다."
+    same_site_cookies: "동일한 사이트 쿠키를 사용하면 지원되는 브라우저 (Lax 또는 Strict)에서 모든 벡터 교차 사이트 요청 위조를 제거합니다. 경고 : Strict는 로그인을 강제하고 외부 인증 방법을 사용하는 사이트에서만 작동합니다."
     summary_score_threshold: "요약본에 포함되기 위한 글의 최소 점수 값"
     summary_posts_required: "&#39;이 주제 요약&#39;이 활성화되기 전에 주제의 최소 게시물. 이 설정에 대한 변경 사항은 일주일 이내에 소급 적용됩니다."
     summary_likes_required: "&#39;이 주제 요약&#39;이 활성화되기 전에 주제에서 최소 좋아요를 찾습니다. 이 설정에 대한 변경 사항은 일주일 이내에 소급 적용됩니다."
@@ -1426,6 +1451,7 @@ ko:
     must_approve_users: "관리자가 모든 사용자에 대해 사이트 접근 전에 허용을 해야 함"
     invite_code: "계정 등록이 가능하도록하려면이 코드를 입력해야합니다 (비어있을 경우 무시)."
     approve_suspect_users: "검토 대기열에 의심스러운 사용자를 추가하십시오. 의심스러운 사용자가 바이오 / 웹 사이트에 입장했지만 읽기 활동이 없습니다."
+    review_every_post: "모든 게시물을 검토해야합니다. 경고! 사용량이 많은 사이트에는 권장되지 않습니다."
     pending_users_reminder_delay: "새로운 사용자가 승인을 기다리는 시간이 여기에 지정된 시간횟수보다 더 길어길경우 운영자에게 알려줍니다. 알림을 해제하려면 -1로 설정하세요."
     persistent_sessions: "사용자는 웹 브라우저가 닫혀도 로그인 상태를 유지합니다."
     maximum_session_age: "마지막 방문으로 부터 n시간 동안 사용자의 로그인이 유지됩니다"
@@ -1496,27 +1522,17 @@ ko:
     min_admin_password_length: "관리자 계정 비밀번호 최소길이"
     password_unique_characters: "패스워드에 포함되어야 하는 최소 유일글자 수"
     block_common_passwords: "가장 흔히 사용되는 10,000개 비밀번호 목록에 있는 비밀번호를 사용하는 것을 허용하지 않음."
-    external_auth_skip_create_confirm: 외부 인증을 통해 가입하는 경우 계정 생성 팝업을 건너 뜁니다. sso_overrides_email, sso_overrides_username 및 sso_overrides_name과 함께 사용하는 것이 가장 좋습니다.
-    external_auth_immediately: "사용자 상호 작용없이 자동으로 외부 로그인 시스템으로 리디렉션됩니다. 이것은 login_required가 true이고 외부 인증 방법이 하나만 있는 경우에만 적용됩니다."
-    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_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를 위한 도메인 제한 해제 (기본 return path는 현재 사이트로 설정)"
-    enable_local_logins: "로컬 사용자 이름 및 비밀번호 로그인 기반 계정을 활성화하십시오. 초대가 작동하려면 활성화해야합니다. 경고 : 비활성화 된 경우 이전에 하나 이상의 대체 로그인 방법을 구성하지 않은 경우 로그인하지 못할 수 있습니다."
+    auth_skip_create_confirm: 외부 인증을 통해 가입하는 경우 계정 생성 팝업을 건너 뜁니다. auth_overrides_email, auth_overrides_username 및 auth_overrides_name과 함께 사용하는 것이 가장 좋습니다.
+    auth_immediately: "사용자 상호 작용없이 자동으로 외부 로그인 시스템으로 리디렉션합니다. 이는 login_required가 true이고 외부 인증 방법이 하나 뿐인 경우에만 적용됩니다."
+    verbose_discourse_connect_logging: "자세한 DiscourseConnect 관련 진단을 <a href='%{base_path}/logs' target='_blank'>/logs</a>에 기록"
+    discourse_connect_url: "DiscourseConnect 엔드포인트의 URL (반드시 http:// 또는 https:// 를 포함해야 함)"
+    discourse_connect_secret: "DiscourseConnect 정보를 암호화 방식으로 인증하는데 사용되는 비밀 문자열입니다. 10자 이상이어야 합니다."
+    discourse_connect_overrides_bio: "사용자 프로필의 사용자 소개 기능을 무시하고 사용자가 변경할 수 없도록 합니다."
+    discourse_connect_overrides_avatar: "외부 DiscourseConnect 페이로드의 아바타로 사용자 아바타를 재정의합니다. 활성화되면 사용자는 Discourse에서 아바타를 업로드 할 수 없습니다."
+    discourse_connect_overrides_card_background: "DiscourseConnect 페이로드의 외부 사이트 아바타로 사용자 카드 배경을 재설정 합니다."
+    discourse_connect_not_approved_url: "승인되지 않은 DiscourseConnect 계정을 이 URL로 리디렉션"
+    discourse_connect_allows_all_return_paths: "DiscourseConnect에서 제공하는 return_paths에 대한 도메인을 제한하지 마십시오 (기본적으로 반환 경로는 현재 사이트에 있어야 함)."
+    enable_local_logins: "로컬 사용자 아이디 및 암호 로그인 기반 계정을 활성화합니다. 경고: 비활성화 된 경우 이전에 하나 이상의 대체 로그인 방법을 구성하지 않은 경우 로그인하지 못할 수 있습니다."
     enable_local_logins_via_email: "사용자가 원 클릭 로그인 링크를 이메일을 통해 보내도록 요청할 수 있습니다."
     allow_new_registrations: "새로운 사용자 가입을 허락함. 새로운 계정 생성을 막으려면 체크하지 않음."
     enable_signup_cta: "재방문한 익명 사용자에게 가입 권유 공지 표시"
@@ -1559,25 +1575,25 @@ ko:
     top_topics_formula_log_views_multiplier: "인기 토픽 계산 공식의 뷰 가중치 설정: `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: "인기 토픽 계산 공식의 좋아요 가중치 설정: `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: "새로운 사용자 글타래를 생성하고 난 후 다음 글타래를 생성할 때 까지의 대기 기간(초)"
-    rate_limit_new_user_create_post: "새로운 사용자 포스팅을하고 난 후 다음 포스팅까지 대기 기간(초)"
+    rate_limit_create_topic: "글을 작성 후 다른 글을 작성하기 위해서는 (n)초 동안 기다려야 합니다."
+    rate_limit_create_post: "사용자가 댓글 작성 후 다른 댓글을 작성하기 위해서는 (n)초를 기다려야합니다."
+    rate_limit_new_user_create_topic: "새로 가입한 사용자가 글을 작성 후 다른 글을 작성하기 위해서는 (n)초를 기다려야합니다."
+    rate_limit_new_user_create_post: "새로 가입한 사용자가 댓글을 작성 후 다른 댓글을 작성하기 위해서는 (n)초를 기다려야합니다."
     max_likes_per_day: "사용자가 하루동안 할 수 있는 최대 좋아요 개수"
     max_flags_per_day: "사용자가 하루동안 할 수 있는 최대 신고 개수"
     max_bookmarks_per_day: "사용자가 하루동안 할 수 있는 최대 북마크 개수"
     max_edits_per_day: "사용자가 하루동안 할 수 있는 최대 편집 수"
-    max_topics_per_day: "사용자가 하루동안 생성할 수 있는 최대 글타래 개수"
+    max_topics_per_day: "사용자가 하루에 작성 할 수 있는 최대 글 수입니다."
     max_personal_messages_per_day: "사용자가 하루에 작성 할 수있는 최대 새 개인 메시지 수입니다."
     max_invites_per_day: "하루에 보낼 수 있는 초대장의 최대치입니다."
     max_topic_invitations_per_day: "하루에 유저가 최대로 보낼 수 있는 글타래 초대장 수"
     max_logins_per_ip_per_hour: "시간 당 동일 IP에서 로그인할 수 있는 최대 사용자 수"
     max_logins_per_ip_per_minute: "1분 당 동일 IP에서 로그인할 수 있는 최대 사용자 수"
-    max_post_deletions_per_minute: "사용자가 분당 삭제할 수있는 최대 게시물 수입니다."
-    max_post_deletions_per_day: "사용자가 하루에 삭제할 수있는 최대 게시물 수입니다."
+    max_post_deletions_per_minute: "사용자가 분당 삭제할 수있는 최대 게시물 수입니다. 게시물 삭제를 비활성화하려면 0으로 설정합니다."
+    max_post_deletions_per_day: "사용자가 하루에 삭제할 수있는 최대 게시물 수입니다. 게시물 삭제를 비활성화하려면 0으로 설정합니다."
     invite_link_max_redemptions_limit: "초대 링크에 허용되는 최대 사용 횟수는 이 값을 초과할 수 없습니다."
+    invite_link_max_redemptions_limit_users: "일반 사용자가 생성한 초대 링크에 허용되는 최대 사용 횟수는 이 값보다 클 수 없습니다."
     alert_admins_if_errors_per_minute: "관리자 경고를 발생시키기 위한 1분당 에러 수. 0으로 설정하면 기능 해제됨. 주의: 재시작이 필요합니다."
     alert_admins_if_errors_per_hour: "관리자 경고를 발생시키기 위한 시간당 에러 수. 0으로 설정하면 기능 해제됨. 주의: 재시작이 필요합니다."
     categories_topics: "/ 카테고리 페이지에 표시 할 주제 수입니다. 0으로 설정하면 두 열을 대칭 (범주 및 주제)으로 유지하는 값을 자동으로 찾습니다."
@@ -1599,6 +1615,8 @@ ko:
     avatar_sizes: "자동 생성 아바타 사이즈 목록"
     external_system_avatars_enabled: "외부 아바타 시스템을 사용하기"
     external_system_avatars_url: "외부 아바타 서비스의 URL. {username} {first_letter} {color} {size} 의 대체가 허용됨"
+    external_emoji_url: "이모티콘 이미지에 대한 외부 서비스의 URL입니다. 비활성화하려면 비워 두세요."
+    use_site_small_logo_as_system_avatar: "시스템 사용자 아바타 대신 사이트의 작은 로고를 사용하십시오. 로고가 있어야 합니다."
     restrict_letter_avatar_colors: "문자 아바타 배경에 사용되는 6 자리 16 진수 색상 값 목록입니다."
     selectable_avatars_enabled: "사용자가 목록에서 아바타를 선택하도록합니다."
     selectable_avatars: "사용자가 선택할 수있는 아바타 목록."
@@ -1606,11 +1624,10 @@ ko:
     png_to_jpg_quality: "변환된 JPG 파일의 퀄리티(1은 최하, 99는 최상, 100은 해제)"
     recompress_original_jpg_quality: "업로드된 이미지 파일의 품질 (1은 최저 품질, 99는 최고 품질, 100은 사용하지 않도록 설정)"
     image_preview_jpg_quality: "크기가 조정된 이미지 파일의 품질 (1은 가장 낮은 품질, 99는 최고 품질, 100은 사용하지 않도록 설정)"
-    allow_staff_to_upload_any_file_in_pm: "운영진이 보내는 개인메시지에 모든 파일 첨부 허용"
+    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). 경고! 이를 변경하면 스팸에 대한 심각한 위험에 처하게됩니다."
     tl1_requires_topics_entered: "회원레벨 1로 승격하기 위해 사용자가 작성 해야하는 글 수"
@@ -1644,12 +1661,14 @@ ko:
     min_trust_to_edit_post: "포스트를 편집하기 위한 최소 신뢰도"
     min_trust_to_allow_self_wiki: "사용자의 포스트 위키를 만들기 위한 최소 신뢰도"
     min_trust_to_send_messages: "새 개인 메시지를 작성하는데 필요한 최소 회원 레벨입니다."
+    min_trust_to_send_email_messages: "이메일을 통해 개인 메시지를 보내는 데 필요한 최소 회원 레벨입니다."
     min_trust_to_flag_posts: "게시물을 신고하는 데 필요한 최소 신뢰 수준"
     min_trust_to_post_links: "게시물에 링크를 포함하는 데 필요한 최소 신뢰 수준"
     min_trust_to_post_embedded_media: "게시물에 미디어 항목을 삽입하는데 필요한 최소 회원 레벨"
     min_trust_level_to_allow_profile_background: "프로필 배경을 업로드하는데 필요한 최소 회원 레벨"
     min_trust_level_to_allow_user_card_background: "사용자 카드 배경을 업로드하는데 필요한 최소 회원 레벨"
     min_trust_level_to_allow_invite: "사용자를 초대하는 데 필요한 최소 회원 등급"
+    min_trust_level_to_allow_ignore: "사용자를 무시하는데 필요한 최소 회원등급"
     allowed_link_domains: "링크를 삽입 할 수 있는 레벨이 아닌 사용자가 연결할 수 있는 도메인"
     newuser_max_links: "새로운 사용자가 글에 붙일 수 있는 최대 링크 개수"
     newuser_max_embedded_media: "새 사용자가 게시물에 추가 할 수있는 미디어 항목 수입니다."
@@ -1659,7 +1678,7 @@ ko:
     max_mentions_per_post: "글 당 사용할 수 있는 최대 @name 알림의 수"
     max_users_notified_per_group_mention: "그룹이 멘션을 받으면 알림을 받는 최대사용자의 수(최대치에 도달하면 알림이 전송되지 않음)"
     enable_mentions: "사용자가 다른 사용자를 언급 할 수 있도록합니다."
-    create_thumbnails: "글의 너무 큰 크기의 이미지는 thumnails와 lightbox를 만든다."
+    create_thumbnails: "게시물에 맞지 않는 큰 이미지는 썸네일 이미지와 라이트 박스 이미지를 만듭니다."
     email_time_window_mins: "알림 메일을 보내기 전 대기 기간(분), 사용자에게 글의 변경하고 완료할 수 있는 기회를 준다."
     personal_email_time_window_seconds: "개인 메시지 알림 이메일을 보내기 전에 사용자가 메시지를 편집하고 마무리 할 수 있도록 (n) 초 동안 기다리십시오."
     email_posts_context: "알림메일의 내용에 추가할 기존 답글 수"
@@ -1669,6 +1688,7 @@ ko:
     body_min_entropy: "글 본문에 필요한 최소 엔트로피(서로 다른 글자들이 몇개 존재해야하는지)"
     allow_uppercase_posts: "제목과 내용을 모두 대문자로 작성하는 것을 허용하기"
     max_consecutive_replies: "다른 답변을 추가하지 못하기 전에 사용자가 주제에서 한 행에 게시해야하는 게시물 수입니다."
+    enable_filtered_replies_view: '“(n)개의 댓글” 버튼은 다른 모든 게시물을 축소하고 현재 게시물과 해당 댓글만 표시합니다.'
     title_fancy_entities: "주제 제목에서 일반적인 ASCII 문자를 멋진 HTML 엔티티로 변환 <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>하십시오.</a>"
     min_title_similar_length: "유사 글타래에 대한 체크가 있기 전, 최소 제목 글자 수"
     desktop_category_page_style: "/categories 페이지의 비주얼 스타일"
@@ -1752,8 +1772,9 @@ ko:
     blocked_attachment_filenames: "파일 이름을 기준으로 첨부 파일을 차단하는데 사용되는 키워드 목록입니다."
     forwarded_emails_behaviour: "Discourse로 전달 된 이메일을 처리하는 방법"
     always_show_trimmed_content: "항상 수신 메일의 다듬어진 부분을 표시. 경고: 메일 주소가 드러날 수 있습니다."
+    trim_incoming_emails: "관련이 없는 수신 이메일의 일부를 잘라냅니다."
     private_email: "이메일 제목이나 이메일 본문에 게시물이나 주제의 컨텐츠를 포함하지 마십시오. 참고 : 다이제스트 이메일도 비활성화합니다."
-    email_total_attachment_size_limit_kb: "발신 이메일에 첨부 된 파일의 최대 총 크기입니다. 첨부 파일 전송을 비활성화하려면 0으로 설정하십시오."
+    email_total_attachment_size_limit_kb: "발신 이메일에 첨부되는 파일의 최대 총 크기(KB) 입니다. 첨부 파일 전송을 비활성화하려면 0 으로 설정합니다."
     post_excerpts_in_emails: "알림 이메일에서 항상 전체 게시물 대신 발췌문을 보내십시오."
     raw_email_max_length: "수신 이메일에 저장해야하는 문자 수"
     raw_rejected_email_max_length: "수신 거부 이메일에 저장해야하는 문자 수"
@@ -1878,7 +1899,7 @@ ko:
     show_create_topics_notice: "이 사이트에 5개 이하의 공개 글타래가 있으면, 관리자에게 글타래 좀 만들라고 알려줍니다."
     delete_drafts_older_than_n_days: "(n) 일지난 임시 보관글 삭제하기"
     bootstrap_mode_min_users: "부트 스트랩 모드를 비활성화하는 데 필요한 최소 사용자 수 (비활성화하려면 0으로 설정)"
-    prevent_anons_from_downloading_files: "익명 사용자가 다운로드를 받지 못하게 합니다. 경고: 이미지 파일 외 모든 첨부파일이 다운로드 받지 못하게 됩니다."
+    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> 를 참조하십시오.'
     secure_media_allow_embed_images_in_emails: "크기가 '이메일에 포함을 허용하는 보안 미디어 kb 크기' 설정보다 작은 경우 일반적으로 이메일에서 수정되는 보안 이미지를 포함 할 수 있습니다."
     secure_media_max_email_embed_image_size_kb: "'이메일에 포함을 허용하는 보안 미디어' 설정이 활성화 된 경우 이메일에 포함되는 보안 이미지의 크기 제한입니다. 해당 설정을 사용하지 않으면 이 설정이 적용되지 않습니다."
@@ -1899,20 +1920,23 @@ ko:
     code_formatting_style: "글 작성기의 코드 버튼은 기본적으로 이 코드 형식 스타일로 설정됩니다"
     max_allowed_message_recipients: "메시지에 허용되는 최대 수신자입니다."
     watched_words_regular_expressions: "시청 한 단어는 정규식입니다."
+    enable_diffhtml_preview: "전체 재 렌더링 대신 DiffHTML을 사용하여 미리보기를 동기화하는 실험 기능"
     old_post_notice_days: "게시물 알림이 오래되기 전날"
     new_user_notice_tl: "새로운 사용자 게시물 알림을 보려면 최소 신뢰 수준이 필요합니다."
     returning_user_notice_tl: "사용자에게 다시 게시 알림을 표시하는 데 필요한 최소 신뢰 수준입니다."
     returning_users_days: "사용자가 돌아오는 것으로 간주되기까지 며칠이 경과해야합니다."
     review_media_unless_trust_level: "관리자는 회원레벨이 낮은 사용자의 게시물에 임베디드 미디어가 포함 된 경우 이를 검토합니다."
+    blur_tl0_flagged_posts_media: "잠재적인 NSFW 콘텐츠를 숨기기 위해 신고된 게시물 이미지를 흐리게 처리합니다."
     enable_page_publishing: "직원이 자신의 스타일을 사용하여 주제를 새 URL에 게시 할 수 있습니다."
     show_published_pages_login_required: "익명 사용자는 로그인이 필요한 경우에도 게시된 페이지를 볼 수 있습니다."
+    skip_auto_delete_reply_likes: "이전 답글을 자동으로 삭제하는 경우 좋아요 수가 이 이상인 게시물 삭제를 건너 뜁니다."
     default_email_digest_frequency: "사용자가 기본적으로 요약 이메일을받는 빈도입니다."
     default_include_tl0_in_digests: "기본적으로 새 사용자의 게시물을 요약 이메일에 포함시킵니다. 사용자는 원하는대로이를 변경할 수 있습니다."
     default_email_level: "일반 주제에 대한 기본 이메일 알림 레벨을 설정하십시오."
     default_email_messages_level: "누군가가 사용자에게 메시지를 보낼 때 기본 이메일 알림 레벨을 설정하십시오."
     default_email_mailing_list_mode: "기본으로 새로운 포스트가 생길 때마다 이메일 보내기"
     default_email_mailing_list_mode_frequency: "이 빈도로 이메일 받기를 설정한 메일링 리스트 가입자"
-    disable_mailing_list_mode: "사용자가 메일 링리스트 모드를 사용하지 못하게합니다."
+    disable_mailing_list_mode: "사용자가 메일링 리스트 모드를 활성화하지 못하도록합니다. (메일 링리스트 이메일이 전송되지 않도록합니다.)"
     default_email_previous_replies: "기본적으로 이메일에 이전 회신을 포함시킵니다."
     default_email_in_reply_to: "기본적으로 이메일에 게시 된 답글을 포함시킵니다."
     default_other_new_topic_duration_minutes: "주제가 새로운 것으로 간주되는 전역 기본 조건."
@@ -1942,7 +1966,6 @@ ko:
     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"
@@ -1952,7 +1975,6 @@ ko:
     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> ."
@@ -1966,6 +1988,7 @@ ko:
     governing_law: "준거법"
     city_for_disputes: "분쟁의 도시"
     shared_drafts_category: "주제 초안의 범주를 지정하여 공유 초안 기능을 사용하십시오. 이 범주의 주제는 직원 사용자의 주제 목록에서 표시되지 않습니다."
+    shared_drafts_min_trust_level: "사용자가 공유 초안을 보고 편집할 수 있도록 허용합니다."
     push_notifications_prompt: "사용자 동의 프롬프트를 표시합니다."
     push_notifications_icon: "알림 모서리에 나타나는 배지 아이콘입니다. 투명도가 있는 96×96 단색 PNG 이미지를 사용하는 것이 좋습니다."
     base_font: "사이트에서 대부분의 텍스트에 사용할 기본 글꼴입니다. 테마는`--font-family` CSS 사용자 정의 속성을 통해 재정의 할 수 있습니다."
@@ -1979,6 +2002,7 @@ ko:
     gravatar_login_url: "사용자에게 Gravatar 서비스에 대한 로그인을 제공하는 gravatar_base_url과 관련된 URL"
     share_quote_buttons: "견적 공유 위젯에 표시되는 항목과 순서를 결정합니다."
     share_quote_visibility: "견적 공유 버턴을 표시할 시기를 결정합니다. 익명 사용자만 또는 모든 사용자에게 표시하지 않습니다. "
+    create_revision_on_bulk_topic_moves: "주제가 대량으로 새 카테고리로 이동되면 첫 번째 게시물에 대한 개정판을 만듭니다."
     errors:
       invalid_email: "유효하지 않은 이메일 주소입니다."
       invalid_username: "해당 이름의 사용자가 없습니다."
@@ -1993,6 +2017,7 @@ ko:
       invalid_string_min_max: "글자 수가 %{min}자 이상 %{max}자 이하이어야 합니다."
       invalid_string_min: "글자수가 %{min}자 이상이어야 합니다."
       invalid_string_max: "글자 수가 %{max}자 이상이어야 합니다."
+      invalid_json: "잘못된 JSON입니다."
       invalid_reply_by_email_address: "값이 반드시 '%{reply_key}'를 갖고 있어야하며 알림 이메일과 달라야합니다."
       invalid_alternative_reply_by_email_addresses: "모든 값은 &#39;%{reply_key}&#39;을 포함해야하며 알림 이메일과 달라야합니다."
       pop3_polling_host_is_empty: "POP3 폴링을 활성화하기 전에 &#39;pop3 폴링 호스트&#39;를 설정해야합니다."
@@ -2006,8 +2031,8 @@ ko:
       email_editable_enabled: "이 설정을 활성화하기 전에 &#39;이메일 편집 가능&#39;을 비활성화해야합니다."
       staged_users_disabled: "이 설정을 활성화하기 전에 먼저 &#39;단계별 사용자&#39;를 활성화해야합니다."
       reply_by_email_disabled: "이 설정을 활성화하기 전에 먼저 &#39;이메일로 회신&#39;을 활성화해야합니다."
-      sso_url_is_empty: "이 설정을 활성화하기 전에 &#39;sso url&#39;을 설정해야합니다."
-      sso_invite_only: "sso를 활성화하고 동시에 초대 할 수 없습니다."
+      discourse_connect_url_is_empty: "이 설정을 활성화하기 전에 'discourse connect url'을 설정해야 합니다."
+      discourse_connect_invite_only: "DiscourseConnect와 초대를 동시에 활성화할 수는 없습니다."
       enable_local_logins_disabled: "이 설정을 활성화하기 전에 먼저 &#39;로컬 로그인 활성화&#39;를 활성화해야합니다."
       min_username_length_exists: "최소 사용자 이름 길이를 가장 짧은 사용자 이름 (%{username}) 이상으로 설정할 수 없습니다."
       min_username_length_range: "최소값은 최대값보다 크게 설정할 수 없습니다."
@@ -2016,19 +2041,17 @@ ko:
       invalid_hex_value: "색상 값은 6 자리 16 진수 코드 여야합니다."
       empty_selectable_avatars: "이 설정을 활성화하기 전에 먼저 두 개 이상의 선택 가능한 아바타를 업로드해야합니다."
       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;보다 작게 설정할 수 없습니다."
+        low_weight_invalid: "가중치를 1보다 크거나 같게 설정할 수 없습니다."
+        high_weight_invalid: "가중치를 1보다 작거나 같게 설정할 수 없습니다."
       allowed_unicode_usernames:
         regex_invalid: "정규식이 잘못되었습니다: %{error}"
         leading_trailing_slash: "정규식은 슬래시로 시작하거나 끝나서는 안됩니다."
       unicode_usernames_avatars: "내부 시스템 아바타는 유니 코드 사용자 이름을 지원하지 않습니다."
       list_value_count: "목록에는 정확히 %{count} 값이 포함되어야합니다."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "SSO 비밀"
+        value: "DiscourseConnect 시크릿"
   search:
     extreme_load_error: "사이트의로드가 심하고 검색이 사용 중지되었습니다. 나중에 다시 시도하십시오."
     within_post: "#%{post_number} by %{username}"
@@ -2039,20 +2062,22 @@ ko:
     results_page: "&#39;%{term}&#39;에 대한 검색 결과"
     audio: "[오디오]"
     video: "[비디오]"
-  sso:
+  discourse_connect:
     login_error: "로그인 에러"
-    not_found: "귀하의 계정을 찾을 수 없습니다. 사이트 관리자에게 문의하십시오."
-    account_not_approved: "귀하의 계정은 승인 대기 중입니다. 승인되면 이메일 알림을 받게됩니다."
+    not_found: "사용자님의 계정을 찾을 수 없습니다. 사이트 관리자에게 문의하십시오."
+    account_not_approved: "사용자님의 계정은 승인 대기 중입니다. 승인되면 이메일 알림을 받게됩니다."
     unknown_error: "계정에 문제가 있습니다. 사이트 관리자에게 문의하십시오."
     timeout_expired: "계정 로그인 시간이 초과되었습니다. 다시 로그인하십시오."
     no_email: "이메일 주소가 제공되지 않았습니다. 사이트 관리자에게 문의하십시오."
-    blank_id_error: "`external_id`가 필요하지만 비어있었습니다"
-    email_error: "이메일 주소 <b>%{email}로</b> 계정을 등록 할 수 없습니다. 사이트 관리자에게 문의하십시오."
-    missing_secret: "비밀이 누락되어 SSO 인증에 실패했습니다. 이 문제를 해결하려면 사이트 관리자에게 문의하십시오."
+    blank_id_error: "'external_id'는 필수이지만 비어 있습니다."
+    email_error: "이메일 주소 <b>%{email}</b>으로는 계정을 등록 할 수 없습니다. 사이트 관리자에게 문의하십시오."
+    missing_secret: "시크릿이 없어 인증에 실패했습니다. 이 문제를 해결하려면 사이트 관리자에게 문의하십시오."
+    invite_redeem_failed: "초대 사용에 실패했습니다. 사이트 관리자에게 문의하십시오."
   original_poster: "원본 게시자"
   most_posts: "최대 게시자"
   most_recent_poster: "최근 게시자"
   frequent_poster: "빈번한 게시자"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "우리 커뮤니티에 오신 것을 환영합니다! 다음은 우리 사이트에서 가장 인기 많은 최근 글타래들입니다."
     not_seen_in_a_month: "잘 돌아오셨습니다. 다음은 당신이 오지 않은 동안 가장 인기있던 글타래들입니다."
@@ -2062,6 +2087,7 @@ ko:
     errors:
       different_topics: "다른 주제에 속하는 게시물은 병합 할 수 없습니다."
       different_users: "다른 사용자에게 속한 게시물은 병합 할 수 없습니다."
+      max_post_length: "게시물 길이가 허용 된 길이보다 길기 때문에 게시물을 병합 할 수 없습니다."
   move_posts:
     new_topic_moderator_post:
       other: "%{count}개의 게시물이 새 글로 분할되었습니다: %{topic_link}"
@@ -2167,6 +2193,18 @@ ko:
   admin:
     email:
       sent_test: "전송됨!"
+    user:
+      merge_user:
+        updating_username: "사용자명 업데이트 중..."
+        changing_post_ownership: "글 작성자 변경 중..."
+        merging_given_daily_likes: "일일 좋아요 병합 중..."
+        merging_post_timings: "게시 시간 병합 중..."
+        merging_user_visits: "사용자 방문 병합 중..."
+        updating_site_settings: "사이트 설정 업데이트 중..."
+        updating_user_stats: "사용자 통계 업데이트 중..."
+        merging_user_attributes: "사용자 속성 병합 중..."
+        updating_user_ids: "사용자 ID 업데이트 중..."
+        deleting_source_user: "소스 사용자 삭제 중..."
   user:
     deactivated: "&#39;%{email}&#39;에 반송 이메일이 너무 많아 비활성화되었습니다."
     deactivated_by_staff: "운영진에 의해 비활성화됨"
@@ -2203,6 +2241,8 @@ ko:
       fixed_primary_email: "단계별 사용자를위한 기본 이메일 수정"
       same_ip_address: "다른 사용자와 동일한 IP 주소 (%{ip_address})"
       inactive_user: "비활성 사용자"
+      reviewable_reject_auto: "대기중인 검토 가능 항목 자동 처리"
+      reviewable_reject: "검토 가능한 사용자가 거부됨"
     email_in_spam_header: "사용자의 첫 번째 이메일이 스팸으로 표시되었습니다"
     already_silenced: "사용자가 이미 %{time_ago}전 %{staff}의해 글 작성이 금지되었습니다."
     already_suspended: "사용자의 계정이 이미 %{time_ago}전 %{staff}의해 일시 중지되었습니다."
@@ -2428,6 +2468,19 @@ ko:
         이 게시물은 신고로 인해 숨겨졌습니다. **이 게시물은 두 번 이상 숨겨졌으므로 이제 이 게시물은 관리자가 처리 할 때까지 숨겨진 상태로 유지됩니다.**
 
         추가 지침은 [커뮤니티 가이드 라인](%{base_url}/guidelines)을 참조하세요.
+    queued_by_staff:
+      title: "승인이 필요한 게시물"
+      subject_template: "관리자가 숨긴 승인 대기중 게시물"
+      text_body_template: |
+        안녕하세요,
+
+        사용자님의 게시물이 숨겨 졌음을 알리기 위해 %{site_name}에서 보낸 자동 메시지입니다.
+
+        <%{base_url}%{url}>
+
+        사용자님의 게시물은 관리자가 검토 할 때까지 숨겨진 상태로 유지됩니다.
+
+        추가 안내는 [커뮤니티 가이드 라인](%{base_url}/guidelines)을 참조하세요.
     flags_disagreed:
       title: "직원이 복원 한 신고 된 게시물"
       subject_template: "직원이 복원 한 신고 된 게시물"
@@ -2449,19 +2502,17 @@ ko:
       text_body_template: |
         안녕하세요,
 
-        [사용자님의 게시물](%{base_url}%{url})이 삭제되었음을 알려 드리기 위해 %{site_name} 에서 보낸 자동 메시지입니다.
+        [사용자님의 게시물](%{base_url}%{url})이 삭제되었음을 알려 드리기 위해 %{site_name}에서 발송된 자동 메시지입니다.
 
         %{flag_reason}
 
-        이 게시물은 신고로 인해 관리자가 삭제하기로 결정했습니다.
+        이 게시물은 커뮤니티에서 신고되어 관리자에 의해 삭제되었습니다.
 
-        [details="클릭해 삭제된 게시물 확인"]
         ``` markdown
         %{flagged_post_raw_content}
         ```
-        [/details]
 
-        자세한 사항은 [커뮤니티 가이드라인](%{base_url}/guidelines)을 살펴보세요.
+        [커뮤니티 가이드라인](%{base_url}/guidelines)을 참조하시기 바랍니다.
     usage_tips:
       text_body_template: |
         신규 사용자를 위한 몇 가지 간단한 도움말은 [이 블로그 게시물](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)을 참조하세요.
@@ -2513,10 +2564,6 @@ ko:
         [prefs]: %{user_preferences_url}
     tl2_promotion_message:
       subject_template: "회원 레벨 승격을 축하합니다!"
-      text_body_template: |
-        [회원 레벨](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)으로 승격했습니다.
-
-        앞으로도 많은 참여를 부탁드립니다 - 사용자님들과 함께하는 것이 즐겁습니다.
     backup_succeeded:
       title: "백업 성공"
       subject_template: "백업 성공"
@@ -2718,10 +2765,6 @@ ko:
     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}] 이메일 문제-이전 알림에 답장하려고합니다"
@@ -3155,20 +3198,16 @@ ko:
       title: "계정 일시 중지"
       subject_template: "[%{email_prefix}] 귀하의 계정이 정지되었습니다"
       text_body_template: |
-        %{suspended_till}까지 사이트 이용이 일시 차단되었습니다.
+        사용자님은 %{suspended_till}까지 사이트의 사용이 중지되었습니다.
 
-        %{reason}
-
-        %{message}
+        이유 - %{reason}
     account_silenced:
       title: "계정이 쓰기 금지됨"
       subject_template: "[%{email_prefix}] 사용자님의 계정이 쓰기 금지 되었습니다"
       text_body_template: |
-        사용자님은 %{silenced_till}까지 사이트에서 글 작성이 중지되었습니다.
+        사용자님은 %{silenced_till}까지 사이트내 글쓰기가 일시적으로 차단되었습니다.
 
-        %{reason}
-
-        %{message}
+        이유 - %{reason}
     account_exists:
       title: "계정이 이미 존재합니다"
       subject_template: "[%{email_prefix}] 계정이 이미 존재합니다"
@@ -3329,6 +3368,13 @@ ko:
         사이트 이용은 [커뮤니티의 가이드라인](%{base_url}/guidelines)을 참고해 주시기 바랍니다.
 
         즐거운 시간 되세요!
+    signup_after_reject:
+      title: "거부 후 가입"
+      subject_template: "%{site_name}에서 거부되었습니다."
+      text_body_template: |
+        관리자가 %{site_name}의 사용자님 계정을 거부했습니다.
+
+        %{reject_reason}
     signup:
       title: "가입하기"
       subject_template: "[%{email_prefix}] 새 계정 확인"
@@ -3366,8 +3412,16 @@ ko:
         이것이 사용자님이 로그인 한 것이라면 다른 조치를 취하실 필요가 없습니다.
 
         만약 사용자님이 아니라면 [기존 세션을 검토](%{base_url}/my/preferences/account)하고 비밀번호 변경을 고려하십시오.
+    post_approved:
+      title: "사용자님의 게시물이 승인되었습니다."
+      subject_template: "[%{site_name}] 사용자님의 게시물이 승인되었습니다."
+      text_body_template: |
+        안녕하세요.
+
+        [사용자님의 게시물](%{base_url}%{post_url})이 승인되었음을 알리는 %{site_name}에서 발송된 자동 메시지 입니다.
   page_forbidden:
     title: "죄송합니다! 비공개 페이지 입니다."
+  site_setting_missing: "`%{name}' 사이트 설정을 해야합니다."
   page_not_found:
     title: "이런! 그 페이지는 더 이상 존재하지 않거나 비공개 상태입니다."
     popular_topics: "인기"
@@ -3473,13 +3527,13 @@ ko:
 
       사이트 운영자는 조건에 따라 다른 서비스를 제공 할 수 있습니다. 이 약관은 사이트 이용에만 적용됩니다.
 
-      건너 뛰기:
+      바로가기:
 
-      - [Important Terms](#heading--important-terms)
-      - [Your Permission to Use the Forum](#heading--permission)
-      - [Conditions for Use of the Forum](#heading--conditions)
-      - [Acceptable Use](#heading--acceptable-use)
-      - [Content Standards](#heading--content-standards)
+      - [중요 용어](#heading--important-terms)
+      - [사이트 사용 권한](#heading--permission)
+      - [사이트 이용 조건](#heading--conditions)
+      - [허용되는 사용](#heading--acceptable-use)
+      - [콘텐츠 표준](#heading--content-standards)
       - [Enforcement](#heading--enforcement)
       - [Your Account](#heading--your-account)
       - [Your Content](#heading--your-content)
@@ -3527,21 +3581,21 @@ ko:
 
       7. 사용자님은 이 사이트와 제휴하거나 이 사이트의 보증을 받았다고 거짓으로 암시해서는 안됩니다.
 
-      8. You may not hyperlink to images or other non-hypertext content on the forum on other webpages.
+      8. 다른 웹 페이지의 포럼에있는 이미지 또는 기타 하이퍼 텍스트가 아닌 콘텐츠에 하이퍼 링크를 사용할 수 없습니다.
 
-      9. You may not remove any marks showing proprietary ownership from materials you download from the forum.
+      9. 포럼에서 다운로드 한 자료의 소유권을 나타내는 표시를 제거 할 수 없습니다.
 
-      10. You may not show any part of the forum on other websites with `<iframe>`.
+      10. `<iframe>`을 사용하여 다른 웹 사이트를 표시 할 수 없습니다.
 
-      11. You may not disable, avoid, or circumvent any security or access restrictions of the forum.
+      11. 사이트의 보안 또는 접근 제한을 비활성화, 회피 또는 우회 할 수 없습니다.
 
-      12. You may not strain infrastructure of the forum with an unreasonable volume of requests, or requests designed to impose an unreasonable load on information systems underlying the forum.
+      12. 불합리한 양의 요청 또는 포럼 기반 정보 시스템에 불합리한 부하를 부과하도록 설계된 요청으로 사이트의 인프라에 부담을 주어서는 안됩니다.
 
-      13. You may not impersonate others through the forum.
+      13. 사이트를 통해 다른 사람을 사칭 할 수 없습니다.
 
-      14. You may not encourage or help anyone in violation of these terms.
+      14. 이 약관을 위반하는 사람을 격려하거나 도울 수 없습니다.
 
-      <h2 id="heading--content-standards"><a href="#heading--content-standards">Content Standards</a></h2>
+      <h2 id="heading--content-standards"><a href="#heading--content-standards">콘텐츠 표준</a></h2>
 
       1. You may not submit content to the forum that is illegal, offensive, or otherwise harmful to others. This includes content that is harassing, inappropriate, or abusive.
 
@@ -3646,6 +3700,7 @@ ko:
     mass_award:
       errors:
         invalid_csv: 라인 %{line_number}에서 오류가 발생했습니다. CSV에 한 줄에 하나의 이메일이 있는지 확인하십시오.
+        badge_disabled: 먼저 %{badge_name} 배지를 활성화하십시오.
     editor:
       name: 에디터
       description: 첫 포스트 편집
@@ -3925,7 +3980,7 @@ ko:
       synonym: '동의어는 허용되지 않습니다. 대신 &quot;%{tag_name}&quot;을 사용하십시오.'
       has_synonyms: '&quot;%{tag_name}&quot;에는 동의어가 있으므로 사용할 수 없습니다.'
     required_tags_from_group:
-      other: "최소한 %{count} %{tag_group_name} 태그를 포함해야합니다."
+      other: "%{count} %{tag_group_name} 태그를 포함해야합니다. 이 그룹의 태그는 다음과 같습니다. %{tags}."
     invalid_target_tag: "동의어의 동의어 일 수 없습니다"
     synonyms_exist: "동의어가 존재하는 동안 허용되지 않습니다"
   rss_by_tag: "토픽에%{tag}태그가 달렸습니다"
@@ -4077,9 +4132,6 @@ ko:
                 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> 을 시작하여 커뮤니티를 시작하는 데 도움을 줄 사람들을 초대합시다."
@@ -4119,6 +4171,7 @@ ko:
       restored: 복원
   reviewables:
     already_handled: "감사합니다. 이미 해당 게시물을 검토 한 후 다시 신고 할 필요가 없습니다."
+    already_handled_and_user_not_exist: "감사합니다. 누군가 이미 검토했으며 해당 사용자는 더 이상 존재하지 않습니다."
     priorities:
       low: "낮은"
       medium: "중간"
@@ -4137,8 +4190,7 @@ ko:
       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> 참조하십시오."
+      auto_silence_regexp: "첫 번째 게시물이`auto_silence_first_post_regex` 설정과 일치하는 새 사용자입니다."
       staged: "단계별 사용자를위한 새로운 주제와 게시물은 직원의 승인을 받아야합니다. `approve_unless_staged`를 참조하십시오."
       category: "이 카테고리의 게시물은 직원의 수동 승인이 필요합니다. 카테고리 설정을 참조하십시오."
       must_approve_users: "모든 신규 사용자는 직원의 승인을 받아야합니다. `must_approve_users`를 참조하십시오."
@@ -4147,6 +4199,7 @@ ko:
       email_spam: "이 이메일은`email_in_spam_header`에 정의 된 헤더에 의해 스팸으로 표시되었습니다."
       suspect_user: "이 새로운 사용자는 주제 나 게시물을 읽지 않고 프로필 정보를 입력했으며, 이는 스팸 발송자 일 수 있음을 강력하게 제안합니다. `approve_suspect_users`를 참조하십시오."
       contains_media: "이 게시물에는 임베디드 미디어가 포함되어 있습니다. `review_media_unless_trust_level`을 참조하십시오."
+      queued_by_staff: "관리자가 게시물의 검토가 필요하다고 판단했습니다. 그때까지는 숨겨져 있습니다."
     actions:
       agree:
         title: "동의..."
@@ -4216,6 +4269,17 @@ ko:
           description: "사용자가 삭제되고 IP 및 이메일 주소가 차단됩니다."
       reject:
         title: "거부"
+        bundle_title: "거부..."
+      reject_and_suspend:
+        title: "사용자 거부 및 일시 중지"
+      reject_and_silence:
+        title: "사용자 거부 및 글쓰기 금지"
+      reject_and_delete:
+        title: "게시물 거부 및 삭제"
+      reject_and_keep_deleted:
+        title: "게시물 삭제 유지"
+      approve_and_restore:
+        title: "게시물 승인 및 복원"
       delete_user:
         title: "사용자 삭제"
         confirm: "해당 사용자를 삭제 하시겠습니까? 그러면 모든 게시물이 삭제되고 이메일과 IP 주소가 차단됩니다."
diff --git a/config/locales/server.lt.yml b/config/locales/server.lt.yml
index ce8a60a765..ce235e5442 100644
--- a/config/locales/server.lt.yml
+++ b/config/locales/server.lt.yml
@@ -15,6 +15,7 @@ lt:
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
+      no_day: "%Y %B"
   date:
     month_names:
     - null
@@ -38,6 +39,7 @@ lt:
   title: "Discourse"
   topics: "Temos"
   posts: "žinutės"
+  views: "peržiūros"
   loading: "Kraunama"
   powered_by_html: 'Sukurta <a href="https://www.discourse.org">Discourse</a>, geriausias žiūrimumas su JavaScript igalinimu'
   sign_up: "Registruotis"
@@ -48,6 +50,8 @@ lt:
   anonymous: "Anonimas"
   remove_posts_deleted_by_author: "Pašalinta autoriaus"
   redirect_warning: "Negalėjome patvirtinti, kad jūsų pasirinkta nuoroda buvo faktiškai paskelbta forume. Jei vis tiek norite tęsti, pasirinkite žemiau esančią nuorodą."
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} nuo %{username}"
   themes:
     other_error: "Įvyko klaida atnaujinant temą"
     import_error:
@@ -114,6 +118,11 @@ lt:
     loading: "Kraunama diskusija..."
     permalink: "Nuoroda"
     in_reply_to: "▶ %{username}"
+    replies:
+      one: "%{count} atsakymas"
+      few: "%{count} atsakymai"
+      many: "%{count} atsakymai"
+      other: "%{count} atsakymai"
     created: "Sukurta"
   no_mentions_allowed: "Apgailestaujame, tačiau jūs negalite minėti kitų vartotojų."
   too_many_mentions:
@@ -133,6 +142,11 @@ lt:
   home_title: "Pradinis"
   topics_in_category: "Temos kategorijoje '%{category}'"
   rss_posts_in_topic: "RSS iš '%{topic}'"
+  rss_num_posts:
+    one: "%{count} įrašas"
+    few: "%{count} įrašai"
+    many: "%{count}įrašų"
+    other: "%{count}įrašai"
   read_full_topic: "Skaityti pilną temą"
   private_message_abbrev: "Žinutė"
   rss_description:
@@ -448,6 +462,8 @@ lt:
       every_hour: "kas valandą"
       daily: "kas dieną"
       weekly: "kas savaitę"
+      every_month: "kiekvieną mėnesį"
+      every_six_months: "kas šešis mėnesius"
   user_api_key:
     read: "skaityti"
     otp_confirmation:
@@ -458,6 +474,7 @@ lt:
   reports:
     default:
       labels:
+        count: Skaičiuoti
         day: Diena
     post_edits:
       labels:
@@ -469,6 +486,7 @@ lt:
     user_flagging_ratio:
       labels:
         user: Narys
+        score: Rezultatas
     moderators_activity:
       labels:
         moderator: Moderatorius
@@ -535,6 +553,7 @@ lt:
         admin: Administratorius
         moderator: Moderatorius
         suspended: Suspenduotas
+        silenced: Nutildytas
     emails:
       xaxis: "Diena"
     user_to_user_private_messages:
@@ -630,6 +649,10 @@ lt:
         filename: Dokumento pavadinimas
         author: Autorius
   site_settings:
+    send_welcome_message: "Siųskite visiems naujiems vartotojams sveikinimo pranešimą su greitu pradžios vadovu."
+    dark_mode_none: "Nieko"
+    embed_truncate: "Truncate the embedded posts."
+    embed_post_limit: "Maskimalus įterpiamų įrašų skaičius."
     enable_emoji: "Įgalinti Emoji"
   search:
     within_post: "#%{post_number} nuo %{username}"
@@ -669,6 +692,8 @@ lt:
     private_topic_title: "Tema #%{id}"
     post_hidden:
       title: "Įrašas paslėptas"
+    queued_by_staff:
+      title: "Įrašui reikalingas patvirtinimas"
     welcome_user:
       title: "Sveikas narį"
       subject_template: "Sveiki atvykę į %{site_name}!"
@@ -859,6 +884,8 @@ lt:
       subject_template: "[%{email_prefix}] Prisijungti"
     confirm_new_email:
       title: "Patvirtinti naują e-paštą"
+    confirm_new_email_via_admin:
+      title: "Patvirtinti naują e-paštą"
     signup:
       title: "Registruotis"
   page_not_found:
@@ -877,6 +904,7 @@ lt:
   color_schemes:
     light: "Šviesi"
     dark: "Tamsi"
+    default_theme_name: "Numatytasis"
     light_theme_name: "Šviesi"
     dark_theme_name: "Tamsi"
   edit_this_page: "Redaguoti šį puslapį"
@@ -1030,6 +1058,12 @@ lt:
             label: "Interneto svetainė"
       corporate:
         title: "Organizacija"
+      colors:
+        title: "Spalvos"
+      fonts:
+        fields:
+          font_preview:
+            label: "Peržiūrėti"
       logos:
         title: "Logotipas"
         fields:
@@ -1050,8 +1084,6 @@ lt:
                 label: "Kategorijos su Naujausiomis temomis"
               categories_and_top_topics:
                 label: "Kategorijos su Top temomis"
-      emoji:
-        title: "Emoji"
       invites:
         title: "Pakviesti valdytojus"
       finished:
@@ -1073,8 +1105,13 @@ lt:
     not_found: "nerastas"
     unknown: "nežinoma"
   reviewables:
+    priorities:
+      medium: "Vidutinis"
+      high: "Aukštas"
     sensitivity:
       disabled: "Uždrausta"
+      medium: "Vidutinis"
+      high: "Aukštas"
     actions:
       agree_and_keep:
         title: "Palikti įrašą"
diff --git a/config/locales/server.lv.yml b/config/locales/server.lv.yml
index 78d6cfea8e..3a45a49ee1 100644
--- a/config/locales/server.lv.yml
+++ b/config/locales/server.lv.yml
@@ -13,6 +13,7 @@ lv:
     formats:
       short: "%d-%m-%Y"
       short_no_year: "%B %-d"
+      no_day: "%Y %B"
   date:
     month_names:
     - null
@@ -32,11 +33,14 @@ lv:
   title: "Discourse"
   topics: "Tēmas"
   posts: "raksti"
+  views: "skatījumi"
   loading: "Ielāde"
   sign_up: "Reģistrēties"
   log_in: "Ienākt"
   submit: "Iesniegt"
   anonymous: "Anonīmi"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} - %{username}"
   emails:
     incoming:
       default_subject: "Šim ierakstam ir nepieciešams nosaukums"
@@ -55,13 +59,22 @@ lv:
       other: "vel %{count} atbildes"
     loading: "Diskusijas Ielādēšana..."
     in_reply_to: "▶ %{username}"
+    replies:
+      zero: "%{count} atbildes"
+      one: "%{count} atbilde"
+      other: "%{count} atbildes"
     created: "Radīts"
   next_page: "nākošo lapu →"
   prev_page: "← iepriekšējo lapu"
   page_num: "Lapa %{num}"
+  rss_num_posts:
+    zero: "%{count} ieraksti"
+    one: "%{count} ieraksts"
+    other: "%{count} ieraksti"
   read_full_topic: "Lasīt pilnu tēmu"
   rss_description:
     latest: "Jaunākās tēmas"
+  excerpt_image: "bilde"
   bookmarks:
     reminders:
       later_today: "Vēlāk šodien"
@@ -103,12 +116,63 @@ lv:
       title: "jauns lietotājs"
     member:
       title: "biedrs"
+    regular:
+      title: "regulārs"
+  rate_limiter:
+    hours:
+      zero: "%{count} stundas"
+      one: "%{count} stunda"
+      other: "%{count} stundas"
   datetime:
     distance_in_words:
       half_a_minute: "< 1 m"
+      less_than_x_seconds:
+        zero: "< %{count} s"
+        one: "< %{count} s"
+        other: "< %{count} s"
+      x_seconds:
+        zero: "%{count} s"
+        one: "%{count} s"
+        other: "%{count} s"
+      less_than_x_minutes:
+        zero: "< %{count} m"
+        one: "< %{count} m"
+        other: "< %{count} m"
+      x_minutes:
+        zero: "%{count} m"
+        one: "%{count} m"
+        other: "%{count} m"
+      about_x_hours:
+        zero: "%{count} h"
+        one: "%{count} h"
+        other: "%{count} h"
+      x_days:
+        zero: "%{count} d"
+        one: "%{count} d"
+        other: "%{count} d"
+      about_x_years:
+        zero: "%{count} g"
+        one: "%{count} g"
+        other: "%{count} g"
+      over_x_years:
+        zero: "> %{count} g"
+        one: "> %{count} g"
+        other: "> %{count} g"
+      almost_x_years:
+        zero: "%{count} g"
+        one: "%{count} g"
+        other: "%{count} g"
     distance_in_words_verbose:
       half_a_minute: "tikko"
       less_than_x_seconds: "tikko"
+      about_x_hours:
+        zero: "pirms %{count} stundām"
+        one: "pirms %{count} stundas"
+        other: "pirms %{count} stundām"
+      x_days:
+        zero: "pirms %{count} dienām"
+        one: "pirms %{count} dienas"
+        other: "pirms %{count} dienām"
   password_reset:
     choose_new: "Izvēlēties jaunu paroli"
     choose: "Izvēlēties paroli"
@@ -288,6 +352,9 @@ lv:
       labels:
         filename: Faila nosaukums
   site_settings:
+    dark_mode_none: "Nav"
+    embed_truncate: "Saīsināt iegultos ierakstus."
+    embed_post_limit: "Maksimālais iegulto ierakstu skaits."
     errors:
       invalid_email: "Nepareiza e-pasta adrese."
   search:
@@ -304,6 +371,8 @@ lv:
     email:
       sent_test: "nosūtīts!"
   system_messages:
+    queued_by_staff:
+      title: "Ieraksts gaida apstiprinājumu"
     welcome_user:
       subject_template: "Laipni lūdzam %{site_name}!"
     welcome_invite:
@@ -321,8 +390,11 @@ lv:
     see_more: "Vairāk"
     search_title: "Meklēt šajā vietnē"
     search_button: "Meklēt"
+  image: "bilde"
   upload:
     unauthorized: "Atvainojiet, fails, ko mēģināt augšuplādēt, nav atļauts (atļautie paplašinājumi: %{authorized_extensions})."
+  color_schemes:
+    default_theme_name: "Noklusējums"
   csv_export:
     boolean_yes: "Jā"
     boolean_no: "Nē"
@@ -359,6 +431,10 @@ lv:
             placeholder: "vards@piemers.com"
       corporate:
         title: "Organizācija"
+      fonts:
+        fields:
+          font_preview:
+            label: "Priekšskatījums"
       homepage:
         fields:
           homepage_style:
@@ -369,8 +445,6 @@ lv:
                 label: "Sadaļas un to labākās tēmas"
               categories_and_latest_topics:
                 label: "Sadaļas un jaunākās tēmas"
-      emoji:
-        title: "Smaidiņi"
   joined: "Pievienojās"
   discourse_push_notifications:
     popup:
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 03ade07658..d46acff6cf 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -15,6 +15,7 @@ nb_NO:
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
+      no_day: "%Y %B"
   date:
     month_names:
     - null
@@ -38,6 +39,7 @@ nb_NO:
   title: "Discourse"
   topics: "Emner"
   posts: "innlegg"
+  views: "visninger"
   loading: "Laster"
   powered_by_html: 'Drives av <a href="https://www.discourse.org">Discourse</a>, og ser best ut med JavaScript aktivert'
   sign_up: "Registrer deg"
@@ -48,6 +50,8 @@ nb_NO:
   anonymous: "Anonym"
   remove_posts_deleted_by_author: "Slettet av forfatter"
   redirect_warning: "Vi kunne ikke verifisere at lenken du valgte faktisk var publisert på forumet. Hvis du likevel ønsker å fortsette, velg lenken under."
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} av %{username}"
   themes:
     other_error: "Noe gikk galt under oppdateringen av drakten"
     import_error:
@@ -154,6 +158,8 @@ nb_NO:
     conflicting_google_user_id: 'Google Account ID for denne kontoen har endret seg; staben må manuelt godkjenne endringen av sikkerhetshensyn. Vennligst kontakt staben og pek dem til <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   invite:
     user_exists: "Det er ikke nødvendig å invitere <b>%{email}</b>, de <a href='%{base_path}/u/%{username}/summary'>har allerede en konto!</a>"
+    disabled_errors:
+      invalid_access: "Du har ingen tilgang til denne resurssen."
   bulk_invite:
     file_should_be_csv: "Filen som lastes opp burde være i csv format."
     error: "Det skjedde en feil når filen ble lastet opp. Prøv igjen senere. "
@@ -194,6 +200,9 @@ nb_NO:
     permalink: "Permalink"
     imported_from: "Dette er en relatert diskusjon ved siden av det originale innlegget ved %{link}"
     in_reply_to: "▶ %{username}"
+    replies:
+      one: "%{count} svar"
+      other: "%{count} svar"
     created: "Opprettet"
   no_mentions_allowed: "Beklager, du kan ikke nevne andre brukere."
   too_many_mentions:
@@ -228,6 +237,9 @@ 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"
+  rss_num_posts:
+    one: "%{count} innlegg"
+    other: "%{count} innlegg"
   read_full_topic: "Les hele emnet"
   private_message_abbrev: "Mld"
   rss_description:
@@ -286,26 +298,6 @@ nb_NO:
     until_posts:
       one: "%{count} innlegg"
       other: "%{count} innlegg"
-    "new-topic": |
-      Velkommen til %{site_name}. **Takk for at du starter en ny samtale!**
-
-      - Høres tittelen interessant ut hvis du leser den høyt? Er den en god oppsummering?
-
-      - Hvem vil være interessert i dette? Hvorfor har det noe å si? Hva slags respons er du ute etter?
-
-      - Bruk relevante begrep i emnet slik at andre kan *finne* det. Velg en kategori for å gruppere emnet ditt med andre lignende emner.
-
-      [Se retningslinjene for dette nettstedet](%{base_path}/guidelines) for mer informasjon. Denne meldingen vises kun for ditt/dine første %{education_posts_text}.
-    "new-reply": |
-      Velkommen til %{site_name} &mdash; **takk for at du bidrar!**
-
-      - Forbedrer innlegget ditt samtalen på noen måte?
-
-      - Vær snill mot andre brukere.
-
-      - Konstruktiv kritikk er velkommen, men husk å kritisere *idéer,* ikke mennesker.
-
-      For mer informasjon [se retningslinjene våre](%{base_path}/guidelines). Dette panelet vil kun vises for ditt/dine første %{education_posts_text}.
     avatar: |
       ### Hva med et bilde på kontoen din?
 
@@ -465,20 +457,8 @@ nb_NO:
     slow_down: "Du har utført denne handlingen for mange ganger, vennligst prøv igjen senere."
     too_many_requests: "Du har utført denne handlingen for mange ganger. Vennligst vent %{time_left} før du prøver igjen."
     by_type:
-      first_day_replies_per_day: "Du har nådd grensen for hvor mange innlegg en ny bruker kan skrive den første dagen. Vennligst vent %{time_left} før du prøver igjen."
-      first_day_topics_per_day: "Du har nådd grensen for hvor mange emner en ny bruker kan lage den første dagen. Vennligst vent %{time_left} før du prøver igjen."
-      create_topic: "Du lager emner i for høyt tempo! Vennligst vent %{time_left} før du prøver igjen."
-      create_post: "Du svarer for raskt. Vennligst vent %{time_left} før du prøver igjen."
-      delete_post: "Du sletter innlegg for fort. Vennligst vent %{time_left} før du prøver på nytt."
-      public_group_membership: "Du melder deg inn/ut av grupper for ofte. Vennligst vent %{time_left} før du prøver igjen."
-      topics_per_day: "Du har nådd grensen for publisering av nye emner. Vennligst vent %{time_left} før du prøver igjen."
-      pms_per_day: "Du har nådd grensen for antall meldinger. Vennligst vent %{time_left} før du prøver igjen."
-      create_like: "Du har nådd grensen for antall likte innlegg. Vennligst vent %{time_left} før du prøver igjen."
-      create_bookmark: "Du har nådd grensen for antall bokmerker. Vennligst vent %{time_left} før du prøver igjen."
-      edit_post: "Du har nådd grensen for antall redigeringer. Vennligst vent %{time_left} før du prøver igjen."
       live_post_counts: "Du ber om oppdateringer av antall innlegg for ofte. Vennligst vent %{time_left} før du prøver igjen."
       unsubscribe_via_email: "Du har nådd grensen for antall avmeldinger via e-post. Vennligst vent %{time_left} før du prøver igjen."
-      topic_invitations_per_day: "Du har nådd grensen for invitasjoner til emner. Vennligst vent %{time_left} før du prøver igjen."
     hours:
       one: "%{count} time"
       other: "%{count} timer"
@@ -678,9 +658,7 @@ nb_NO:
     mute_topic: "Ignorer alle varslene for dette emnet, %{link}"
     unwatch_category: "Slutt å følge alle emner i %{category}"
     mailing_list_mode: "Slå av e-postlistemodus"
-    all: "Ikke send meg noen e-poster fra %{sitename}"
     different_user_description: "Du er allerede logget inn som en annen bruker enn den vi sendte e-posten til. Vennligst logg ut eller bytt til anonym modus før du prøver igjen."
-    not_found_description: "Beklager, vi klarte ikke finne denne avmeldingen. Det kan tenkes lenken i e-posten har gått ut på dato?"
     log_out: "Logg ut"
     digest_frequency:
       never: "aldri"
@@ -790,6 +768,7 @@ nb_NO:
       title: "Likes"
       xaxis: "Dag"
       yaxis: "Antall nye likes"
+      description: "Antall nye likes."
     flags:
       title: "Flagg"
       xaxis: "Dag"
@@ -1011,11 +990,12 @@ nb_NO:
     show_pinned_excerpt_mobile: "Vis utdrag fra festede emner i mobil visning."
     show_pinned_excerpt_desktop: "Vis utdrag fra festede emner i desktop visning."
     post_onebox_maxlength: "Maksimal lengde på et onebox Discourse innlegg i antall tegn."
+    blocked_onebox_domains: "En liste over domener som aldri vil bli forsøkt oneboxet."
+    allowed_inline_onebox_domains: "En liste over domener hvor onebox brukes i miniatyrstørrelse hvis lenken ikke har en tittel"
     max_oneboxes_per_post: "Maksimalt antall oneboxer i hvert innlegg."
     notification_email: "Adressen som skal brukes som avsender: på alle viktige system e-poster. Domenet som spesifiseres her må ha SPF, DKIM og reverse PTR record satt korrekt for at e-post skal nå frem."
     email_custom_headers: "En liste over tilpassede e-posthoder med pipe-tegn mellom hvert element"
     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_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."
@@ -1037,8 +1017,10 @@ nb_NO:
     max_likes_per_day: "Maximum antall likes per bruker per dag"
     max_invites_per_day: "Maksimalt antall invitasjoner en bruker kan sende hver dag."
     max_logins_per_ip_per_hour: "Maksimalt antall innlogginger som tillates for hver IP-adresse per time."
+    selectable_avatars: "Liste over avatarer brukere kan velge mellom."
     allow_staff_to_upload_any_file_in_pm: "Tillat medlemmer av staben å laste opp hvilken som helst fil i private samtaler"
     newuser_max_links: "Hvor mange linker en ny bruker kan legge til i et innlegg."
+    dark_mode_none: "Ingen"
     title_prettify: "Unngå vanlige skrivefeil i titler, sånn som store bokstaver, liten bokstav først, mange !, ? og punktum på slutten, osv."
     faq_url: "Hvis du har O-S-S på et annet nettsted du gjerne vil bruke, skriv inn nettadressen her."
     tos_url: "Dersom du har et bruksvilkår-dokument et annet sted som du vil bruke, skriv inn den fullstendige URL-en her."
@@ -1058,6 +1040,7 @@ nb_NO:
     enable_mobile_theme: "Mobilenheter bruker et mobilvennlig drakt, med muligheten til å gå til den fulle siden. Deaktiver dette hvis du ønsker å bruke et tilpasset stilark."
     dominating_topic_minimum_percent: "Hvor mange innlegg en bruker kan lage innenfor en topic før de blir påminnet om dominering av en topic."
     automatically_unpin_topics: "Automatisk fjern feste for emner når brukeren når bunnen."
+    embed_truncate: "Forkort de innebygde innleggene."
     embed_post_limit: "Maksimalt antall innlegg som skal bygges inn."
     embed_username_required: "Brukernavn kreves for opprettelse av emne."
     enable_emoji: "Aktiver emoji."
@@ -1065,7 +1048,6 @@ nb_NO:
     default_email_digest_frequency: "Forvalgt innstilling for hvor ofte brukere mottar oppsummerings-e-poster"
     default_include_tl0_in_digests: "Inkluder innlegg fra nye brukere i oppsummerings-e-poster som forvalg. Brukere kan endre dette i innstillingene sine."
     default_email_mailing_list_mode_frequency: "Brukere som slår på e-postlistemodus, vil motta e-poster så ofte som forvalg"
-    disable_mailing_list_mode: "Forby brukere å slå på e-postlistemodus"
     default_email_previous_replies: "Inkluder tidligere svar i e-poster som forvalg."
     default_topics_automatic_unpin: "La det være forvalgt innstilling å fjerne feste for emner automatisk når brukeren når bunnen."
     default_categories_watching: "Liste med kategorier som følges som forvalg"
@@ -1154,6 +1136,8 @@ nb_NO:
     ignored: "Takk for at du sier ifra. Vi skal se på det. "
     ignored_and_deleted: "Takk for at du sier ifra. Vi har fjernet innlegget. "
   system_messages:
+    queued_by_staff:
+      title: "Innlegg trenger godkjenning"
     welcome_user:
       subject_template: "Velkommen til %{site_name}!"
     welcome_invite:
@@ -1196,12 +1180,6 @@ nb_NO:
     account_suspended:
       title: "Konto sperret"
       subject_template: "[%{email_prefix}] Kontoen din er blitt sperret"
-      text_body_template: |
-        Du er blitt utestengt fra forumet til %{suspended_till}.
-
-        %{reason}
-
-        %{message}
     digest:
       why: "Dette har skjedd på %{site_link} siden ditt forrige besøk %{last_seen_at}"
       since_last_visit: "Siden siste besøk"
@@ -1247,6 +1225,7 @@ nb_NO:
   color_schemes:
     light: "Lys"
     dark: "Mørk"
+    default_theme_name: "Forvalg"
     light_theme_name: "Lys"
     dark_theme_name: "Mørk"
   edit_this_page: "Endre denne siden"
@@ -1461,6 +1440,12 @@ nb_NO:
             label: "Automatiserte meldinger"
       corporate:
         title: "Organisasjon"
+      colors:
+        title: "Farger"
+      fonts:
+        fields:
+          font_preview:
+            label: "Forhåndsvis"
       logos:
         title: "Logoer"
         fields:
@@ -1486,8 +1471,6 @@ nb_NO:
                 label: "Kategorier og siste emner"
               categories_and_top_topics:
                 label: "Kategorier og toppemner"
-      emoji:
-        title: "Emoji"
   joined: "Medlem fra"
   discourse_push_notifications:
     popup:
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 0e4faff060..9c51dd2cd3 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -39,6 +39,7 @@ nl:
   title: "Discourse"
   topics: "Topics"
   posts: "berichten"
+  views: "weergaven"
   loading: "Laden"
   powered_by_html: 'Mogelijk gemaakt door <a href="https://www.discourse.org">Discourse</a>, best bekeken met JavaScript ingeschakeld'
   sign_up: "Registreren"
@@ -50,9 +51,13 @@ nl:
   remove_posts_deleted_by_author: "Verwijderd door gebruiker"
   redirect_warning: "We konden niet verifiëren of de koppeling die u hebt geselecteerd echt in het forum is geplaatst. Als u toch wilt doorgaan, selecteer dan de onderstaande koppeling."
   on_another_topic: "In een ander topic"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} door %{username}"
   themes:
     bad_color_scheme: "Kan thema niet bijwerken, ongeldig kleurenpalet"
     other_error: "Er is iets misgegaan bij het bijwerken van het thema"
+    ember_selector_error: "Sorry - het gebruik van #ember of .ember-view CSS-selectors is niet toegestaan, omdat deze namen dynamisch worden gegenereerd tijdens runtime en in de loop van de tijd zullen veranderen, wat uiteindelijk resulteert in defecte CSS. Probeer een andere selector."
     compile_error:
       unrecognized_extension: "Niet-herkende bestandsextensie: %{extension}"
     import_error:
@@ -166,7 +171,6 @@ nl:
         one: heeft de verkeerde lengte (moet %{count} teken zijn)
         other: heeft de verkeerde lengte (moet %{count} tekens zijn)
       other_than: "moet anders zijn dan %{count}"
-      sso_overrides_username: "Gebruikersnaam dient te worden bijgewerkt aan SSO-providerzijde, omdat de instelling `sso_overrides_username` is ingeschakeld."
     template:
       body: ! "Er waren problemen met de volgende velden:"
       header:
@@ -191,6 +195,14 @@ nl:
       cannot_enable_s3_uploads_when_s3_enabled_globally: "U kunt geen S3-uploads inschakelen, omdat S3-uploads al globaal zijn ingeschakeld, en inschakelen hiervan op websiteniveau kan kritieke problemen met uploads veroorzaken"
       cors_origins_should_not_have_trailing_slash: "U dient geen schuine streep (/) toe te voegen aan CORS-domeinen."
     conflicting_google_user_id: 'De Google-account-ID voor deze account is gewijzigd; om beveiligingsredenen is stafinterventie vereist. Neem contact op met een staflid en wijs hem of haar op <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+    onebox:
+      invalid_address: "Sorry, we konden geen voorbeeld voor deze webpagina genereren, omdat de server '%{hostname}' niet kon worden gevonden. In plaats van een voorbeeld verschijnt alleen een koppeling in uw bericht. :cry:"
+      error_response: "Sorry, we konden geen voorbeeld voor deze webpagina genereren, omdat de webserver een foutcode %{status_code} heeft geretourneerd. In plaats van een voorbeeld verschijnt alleen een koppeling in uw bericht. :cry:"
+      missing_data:
+        one: "Sorry, we konden geen voorbeeld voor deze webpagina genereren, omdat de volgende tag oEmbed / OpenGraph niet kon worden gevonden: %{missing_attributes}"
+        other: "Sorry, we konden geen voorbeeld voor deze webpagina genereren, omdat de volgende tags oEmbed / OpenGraph niet konden worden gevonden: %{missing_attributes}"
+  word_connector:
+    comma: ", "
   invite:
     expired: "Uw uitnodigingstoken is verlopen. <a href='%{base_url}/about'>Neem contact op</a> met een staflid."
     not_found: "Uw uitnodigingstoken is ongeldig. <a href='%{base_url}/about'>Neem contact op</a> met een staflid."
@@ -201,13 +213,11 @@ nl:
       <p>Als u uw wachtwoord nog weet, kunt u zich <a href="%{base_url}/login">Aanmelden</a>.</p>
 
       <p>Zo niet, kunt u uw <a href="%{base_url}/password-reset">Wachtwoord herinitialiseren</a>.</p>
-    error_message: "Er is een fout opgetreden bij het accepteren van de uitnodiging. Neem contact op met de beheerder van de website."
     user_exists: "<b>%{email}</b> hoeft niet te worden uitgenodigd; hij of zij <a href='%{base_path}/u/%{username}/summary'>heeft al een account!</a>"
+    invalid_email: "%{email} is geen geldig e-mailadres."
     confirm_email: "<p>U bent er bijna! We hebben een activeringsmail naar uw e-mailadres gestuurd. Volg de instructies in het e-mailbericht om uw account te activeren.</p><p>Als dit niet aankomt, controleer dan uw spammap.</p>"
     cant_invite_to_group: "U mag geen gebruikers uitnodigen voor bepaalde groepen. Zorg ervoor dat u eigenaar bent van de groep(en) waarvoor u probeert uit te nodigen."
     disabled_errors:
-      sso_enabled: "Uitnodigingen zijn uitgeschakeld, omdat SSO is ingeschakeld."
-      local_logins_disabled: "Uitnodigingen zijn uitgeschakeld, omdat de instelling 'lokale aanmeldingen inschakelen' is uitgeschakeld."
       invalid_access: "U mag de opgevraagde bron niet bekijken."
   bulk_invite:
     file_should_be_csv: "Het geüploade bestand dient de CSV-indeling te hebben."
@@ -218,6 +228,7 @@ nl:
   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."
+    muted_invitee: "Sorry, die gebruiker heeft u gedempt."
   backup:
     operation_already_running: "Er wordt al een bewerking uitgevoerd. Er kan nu geen nieuwe taak worden gestart."
     backup_file_should_be_tar_gz: "Het back-upbestand dient een .tar.gz-archief te zijn."
@@ -311,6 +322,7 @@ nl:
   removed_direct_reply_full_quotes: "Citaat van hele voorgaande bericht is automatisch verwijderd."
   secure_upload_not_allowed_in_public_topic: "Sorry, de volgende beveiligde upload(s) kan/kunnen niet in een publiek topic wordt gebruikt: %{upload_filenames}."
   create_pm_on_existing_topic: "Sorry, u kunt geen PM maken bij een bestaand topic."
+  slow_mode_enabled: "Dit topic bevindt zich in de langzame modus."
   just_posted_that: "lijkt te veel op wat u onlangs hebt geplaatst"
   invalid_characters: "bevat ongeldige tekens"
   is_invalid: "lijkt onduidelijk, is het een volledige zin?"
@@ -381,6 +393,9 @@ nl:
       email_already_used_in_category: "'%{email}' wordt al gebruikt door de categorie '%{category_name}'."
       cant_allow_membership_requests: "U kunt geen lidmaatschapsaanvragen toestaan voor een groep zonder eigenaren."
       already_requested_membership: "U hebt al om lidmaatschap voor deze groep gevraagd."
+      adding_too_many_users:
+        one: "Maximaal %{count} gebruiker kan in één keer worden toegevoegd"
+        other: "Maximaal %{count} gebruikers kunnen in één keer worden toegevoegd"
     default_names:
       everyone: "iedereen"
       admins: "beheerders"
@@ -401,26 +416,6 @@ nl:
     until_posts:
       one: "%{count} bericht"
       other: "%{count} berichten"
-    "new-topic": |
-      Welkom op %{site_name} &ndash; **bedankt voor het starten van een nieuwe conversatie!**
-
-      - Klinkt de titel interessant als u deze hardop leest? Is het een goede samenvatting?
-
-      - Wie zou hierin geïnteresseerd zijn? Waarom is het van belang? Wat voor reacties verwacht u te krijgen?
-
-      - Gebruik algemeen gebruikte woorden, zodat anderen uw topic kunnen *vinden*. Selecteer een categorie om uw topic met verwante topics te groeperen.
-
-      [Bekijk onze gemeenschapsrichtlijnen](%{base_path}/guidelines) voor meer informatie. Dit paneel verschijnt alleen bij uw eerste %{education_posts_text}.
-    "new-reply": |
-      Welkom op %{site_name} &ndash; **bedankt voor uw bijdrage!**
-
-      - Levert uw antwoord een nuttige bijdrage aan de conversatie, hoe klein dan ook?
-
-      - Wees aardig voor de andere gemeenschapsleden.
-
-      - Opbouwende kritiek is welkom, maar geef kritiek op *ideeën*, niet op mensen.
-
-      [Bekijk onze gemeenschapsrichtlijnen](%{base_path}/guidelines) voor meer informatie. Dit paneel verschijnt alleen bij uw eerste %{education_posts_text}.
     avatar: |
       ### Wat dacht u van een afbeelding voor uw account?
 
@@ -524,6 +519,9 @@ nl:
           attributes:
             execute_at:
               in_the_past: "moet in de toekomst zijn."
+            duration_minutes:
+              cannot_be_zero: "moet groter zijn dan 0."
+              exceeds_maximum: "kan niet meer dan 20 jaar zijn."
         translation_overrides:
           attributes:
             value:
@@ -626,20 +624,8 @@ nl:
     slow_down: "U hebt deze actie te vaak uitgevoerd; probeer het later opnieuw."
     too_many_requests: "U hebt deze actie te vaak uitgevoerd. Wacht %{time_left} voordat u het opnieuw probeert."
     by_type:
-      first_day_replies_per_day: "U hebt het maximale aantal antwoorden bereikt dat een nieuwe gebruiker de eerste dag kan aanmaken. Wacht %{time_left} voordat u het opnieuw probeert."
-      first_day_topics_per_day: "U hebt het maximale aantal topics bereikt dat een nieuwe gebruiker de eerste dag kan aanmaken. Wacht %{time_left} voordat u het opnieuw probeert."
-      create_topic: "U maakt te snel topics aan. Wacht %{time_left} voordat u het opnieuw probeert."
-      create_post: "U antwoordt te snel. Wacht %{time_left} voordat u het opnieuw probeert."
-      delete_post: "U verwijdert te snel berichten. Wacht %{time_left} voordat u het opnieuw probeert."
-      public_group_membership: "U verlaat of neemt te vaak deel aan groepen. Wacht %{time_left} voordat u het opnieuw probeert."
-      topics_per_day: "U hebt het maximale aantal nieuwe topics bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      pms_per_day: "U hebt het maximale aantal berichten bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      create_like: "U hebt het maximale aantal likes bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      create_bookmark: "U hebt het maximale aantal bladwijzers bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      edit_post: "U hebt het maximale aantal bewerkingen bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
       live_post_counts: "U vraagt te snel om het live-aantal berichten. Wacht %{time_left} voordat u het opnieuw probeert."
       unsubscribe_via_email: "U hebt het maximale aantal uitschrijvingen via e-mail bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      topic_invitations_per_day: "U hebt het maximale aantal topic-uitnodigingen bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
     hours:
       one: "%{count} uur"
       other: "%{count} uur"
@@ -726,8 +712,8 @@ nl:
     update: "Wachtwoord bijwerken"
     save: "Wachtwoord instellen"
     title: "Wachtwoord herinitialiseren"
-    success: "U hebt uw wachtwoord met succes gewijzigd en bent nu aangemeld."
-    success_unapproved: "U hebt uw wachtwoord met succes gewijzigd."
+    success: "U hebt uw wachtwoord succesvol gewijzigd en bent nu aangemeld."
+    success_unapproved: "U hebt uw wachtwoord succesvol gewijzigd."
   email_login:
     invalid_token: "Sorry, die koppeling voor het aanmelden via e-mail is te oud. Selecteer de knop Aanmelden en gebruik 'Ik ben mijn wachtwoord vergeten' om een nieuwe koppeling te ontvangen."
     title: "E-mailaanmelding"
@@ -743,7 +729,7 @@ nl:
       unknown: "onbekende browser"
     device:
       android: "Android-apparaat"
-      chromebook: "Chromebook"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -754,7 +740,7 @@ nl:
       unknown: "onbekend apparaat"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -765,6 +751,7 @@ nl:
     confirmed: "Uw e-mailadres is bijgewerkt."
     please_continue: "Doorgaan naar %{site_name}"
     error: "Er is een fout opgetreden bij het wijzigen van uw e-mailadres. Misschien is het adres al in gebruik?"
+    doesnt_exist: "Dat e-mailadres is niet aan uw account gekoppeld."
     error_staged: "Er is een fout opgetreden bij het wijzigen van uw e-mailadres. Het adres is al in gebruik door een staged gebruiker."
     already_done: "Sorry, deze bevestigingskoppeling is niet meer geldig. Misschien is uw e-mailadres al gewijzigd?"
     confirm: "Bevestigen"
@@ -846,6 +833,7 @@ nl:
       others: "Geen activiteit."
     no_bookmarks:
       self: "U hebt geen bladwijzers voor berichten; via bladwijzers kunt u snel bepaalde berichten raadplegen."
+      search: "Geen bladwijzers gevonden met de opgegeven zoekopdracht."
       others: "Geen bladwijzers."
     no_likes_given:
       self: "U hebt geen berichten geliket."
@@ -914,9 +902,7 @@ nl:
     mute_topic: "Alle meldingen voor dit topic negeren, %{link}"
     unwatch_category: "Geen topics in %{category} meer in de gaten houden"
     mailing_list_mode: "Mailinglijstmodus uitschakelen"
-    all: "Mij geen e-mail van %{sitename} sturen"
     different_user_description: "U bent momenteel aangemeld als een andere gebruiker dan die we een e-mail hebben gestuurd. Meld u af, of open de anonieme modus, en probeer het opnieuw."
-    not_found_description: "Sorry, we konden u niet uitschrijven. Is het mogelijk dat de koppeling in uw e-mail is verlopen?"
     log_out: "Afmelden"
     submit: "Voorkeuren opslaan"
     digest_frequency:
@@ -1301,14 +1287,11 @@ nl:
       other: "E-mailpolling heeft de afgelopen 24 uur %{count} fouten gegenereerd. Bekijk <a href='%{base_path}/logs' target='_blank'>de logboeken</a> voor meer details."
     missing_mailgun_api_key: "De server is geconfigureerd om e-mails via Mailgun te verzenden, maar u hebt geen API-sleutel opgegeven voor verificatie van de webhookberichten."
     bad_favicon_url: "De favicon wordt niet geladen. Controleer uw favicon-instelling in de <a href='%{base_path}/admin/site_settings'>Website-instellingen</a>."
-    deprecated_api_usage: "We hebben een API-aanvraag via een verouderde authenticatiemethode gedetecteerd. Werk deze bij zodat <a href='https://meta.discourse.org/t/-/22706'>op headers gebaseerde authenticatie</a> wordt gebruikt. Na het bijwerken zou dit bericht pas na 24 uur kunnen verschijnen."
-    update_mail_receiver: "We hebben een verouderde versie van mail-receiver gedetecteerd. Klik <a href='https://meta.discourse.org/t/-/133491'>hier</a> voor update-instructies. Na het bijwerken zou dit bericht pas na 24 uur kunnen verschijnen."
     poll_pop3_timeout: "Time-out voor verbinding met de POP3-server. Inkomende e-mail kon niet worden opgehaald. Controleer uw <a href='%{base_path}/admin/site_settings/category/email'>POP3-instellingen</a> en serviceprovider."
     poll_pop3_auth_error: "Verbinding met de POP3-server is mislukt met een authenticatiefout. Controleer uw <a href='%{base_path}/admin/site_settings/category/email'>POP3-instellingen</a>."
     force_https_warning: "Uw website gebruikt SSL, maar `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` is nog niet ingeschakeld in uw website-instellingen."
     out_of_date_themes: "Er zijn updates voor de volgende thema's beschikbaar:"
     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"
@@ -1336,10 +1319,8 @@ nl:
     search_query_log_max_size: "Maximale aantal te bewaren zoekopdrachten"
     search_query_log_max_retention_days: "Maximale tijd voor het bewaren van zoekopdrachten, in dagen."
     search_ignore_accents: "Accenten negeren bij het zoeken naar tekst"
-    category_search_priority_very_low_weight: "Op rangschikking toegepast gewicht voor zeer lage prioriteit bij doorzoeken van categorie."
     category_search_priority_low_weight: "Op rangschikking toegepast gewicht voor lage prioriteit bij doorzoeken van categorie."
     category_search_priority_high_weight: "Op rangschikking toegepast gewicht voor hoge prioriteit bij doorzoeken van categorie."
-    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."
@@ -1349,7 +1330,6 @@ nl:
     site_description: "Beschrijf deze website in één zin, zoals gebruikt in de meta-omschrijvingstag."
     short_site_description: "Korte beschrijving, zoals gebruikt in de titeltag op de startpagina."
     contact_email: "E-mailadres van de hoofdpersoon die verantwoordelijk is voor deze website. Wordt gebruikt voor kritieke meldingen, evenals op het <a href='%{base_path}/about' target='_blank'>/about</a>-contactformulier voor dringende zaken."
-    contact_url: "Contact-URL voor deze website. Wordt gebruikt op het <a href='%{base_path}/about' target='_blank'>/about</a>-contactformulier voor dringende zaken."
     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)"
@@ -1374,9 +1354,12 @@ nl:
     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."
+    blocked_onebox_domains: "Een lijst van domeinen die nooit in een onebox worden omgezet."
+    allowed_inline_onebox_domains: "Een lijst van domeinen die in een onebox als miniatuur worden omgezet wanneer gekoppeld zonder titel"
     enable_inline_onebox_on_all_domains: "Website-instelling inline_onebox_domain_allowlist negeren en inline onebox op alle domeinen toestaan."
     force_custom_user_agent_hosts: "Hosts waarvoor bij alle aanvragen de aangepaste onebox-useragent wordt gebruikt. (Met name handig voor hosts die toegang beperken via de useragent)."
     max_oneboxes_per_post: "Maximale aantal oneboxes in een bericht."
+    facebook_app_access_token: "Een token, gegenereerd op basis van uw Facebook-app-ID en -geheim. Gebruikt om Instagram-oneboxes te genereren."
     logo: "De logoafbeelding links bovenaan op uw website. Gebruik een brede rechthoekige afbeelding met een hoogte van 120 en een hoogte-breedteverhouding groter dan 3:1. Bij leeg laten wordt de titeltekst van de website getoond."
     logo_small: "De kleine logoafbeelding links bovenaan op uw website, zichtbaar bij omlaag scrollen. Gebruik een vierkante afbeelding van 120 × 120. Bij leeg laten wordt een startpaginasymbool getoond."
     digest_logo: "De alternatieve logoafbeelding bovenaan de e-mailsamenvatting van uw website. Gebruik een brede rechthoekige afbeelding. Gebruik geen SVG-afbeelding. Bij leeg laten wordt de afbeelding van de instelling `logo` gebruikt."
@@ -1392,7 +1375,6 @@ nl:
     email_subject: "Aanpasbare onderwerpnotatie voor standaard-e-mails. Zie <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: "Biedt gebruikers meer informatie over waarom ze geen toegang hebben tot een bepaald topic. Opmerking: dit is minder veilig, omdat gebruikers dan weten of een URL naar een geldig topic verwijst."
     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: "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."
@@ -1435,7 +1417,11 @@ nl:
     gtm_container_id: "Google Tag Manager-container-ID, bv. GTM-ABCDEF. <br/>Opmerking: scripts van derden die door GTM worden geladen, dienen mogelijk op de acceptatielijst te worden geplaatst in 'content security policy script src'."
     enable_escaped_fragments: "Terugvallen naar Google's Ajax-Crawling-API als geen webcrawler wordt gedetecteerd. Zie <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     cors_origins: "Toegestane domeinen voor cross-origin-aanvragen (CORS). Elk domein moet http:// of https:// bevatten. De omgevingsvariabele DISCOURSE_ENABLE_CORS moet op true zijn ingesteld om CORS in te schakelen."
+    use_admin_ip_allowlist: "Beheerders kunnen zich alleen aanmelden vanaf een IP-adres dat in de lijst Gecontroleerde IP-nummers is gedefinieerd (Beheer > Logboeken > Gecontroleerde IP-adressen)."
+    blocked_ip_blocks: "Een lijst van private IP-blokken die nooit door Discourse mogen worden verkend"
+    allowed_internal_hosts: "Een lijst van interne hosts die Discourse veilig kan verkennen voor oneboxing en andere doeleinden"
     allowed_iframes: "Een lijst van 'iframe src'-domeinvoorvoegsels die Discourse veilig kan toestaan in berichten"
+    allowed_crawler_user_agents: "Useragents van webcrawlers die toegang tot de website dienen te hebben. WAARSCHUWING! INSTELLEN HIERVAN BLOKKEERT ALLE CRAWLERS DIE HIER NIET WORDEN VERMELD!"
     slow_down_crawler_user_agents: "Useragents van webcrawlers waarvan aanvragen beperkt moeten zijn in robots.txt via de Crawl-delay-instructie"
     slow_down_crawler_rate: "Als slow_down_crawler_user_agents is opgegeven, is deze beperking op alle crawlers van toepassing (aantal seconden vertraging tussen aanvragen)"
     content_security_policy: "Content-Security-Policy inschakelen"
@@ -1470,6 +1456,7 @@ nl:
     enable_whispers: "Privécommunicatie van stafleden binnen topics toestaan."
     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."
     blocked_email_domains: "Een door een verticaal streepje (pipe) gescheiden lijst van e-maildomeinen waarbij gebruikers geen accounts mogen registreren. Voorbeeld: mailinator.com|trashmail.net"
+    allowed_email_domains: "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!"
     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"
@@ -1486,26 +1473,7 @@ nl:
     min_admin_password_length: "Minimale wachtwoordlengte voor beheerders."
     password_unique_characters: "Minimale aantal unieke tekens dat een wachtwoord moet hebben."
     block_common_passwords: "Geen wachtwoorden toestaan die in de 10.000 meest gebruikte wachtwoorden voorkomen."
-    external_auth_skip_create_confirm: Bij registreren via externe authenticatie, de pop-up voor het aanmaken van een account overslaan. Meest geschikt samen met sso_overrides_email, sso_overrides_username en sso_overrides_name.
-    enable_sso: "Eenmalige aanmelding via een externe website inschakelen (WAARSCHUWING: E-MAILADRESSEN VAN GEBRUIKERS *MOETEN* DOOR DE EXTERNE WEBSITE WORDEN GEVALIDEERD!)"
-    verbose_sso_logging: "Uitgebreide SSO-gerelateerde diagnosegegevens opslaan in <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    enable_sso_provider: "Discourse SSO provider-protocol aan het /session/sso_provider-eindpunt implementeren, vereist dat sso_provider_secrets is ingesteld"
-    sso_url: "URL van single-sign-on-eindpunt (moet http:// of https:// bevatten)"
-    sso_secret: "Geheime tekenreeks voor het cryptografisch authenticeren van SSO-informatie, zorg ervoor dat deze 10 tekens of langer is"
-    sso_provider_secrets: "Een lijst van domain-secret-paren die Discourse als SSO-provider gebruiken. Zorg ervoor dat het SSO-geheim 10 tekens of langer is. Het jokerteken * kan worden gebruikt om een domein of alleen een deel ervan (bv. *.example.com) te laten overeenkomen."
-    sso_overrides_bio: "Overschrijft biografie in gebruikersprofiel en voorkomt dat gebruiker deze kan wijzigen"
-    sso_overrides_groups: "Alle handmatige groepslidmaatschappen synchroniseren met opgegeven groepen in SSO-attribuut van de groep (WAARSCHUWING: als u geen groepen opgeeft, worden alle handmatige groepslidmaatschappen voor de gebruiker gewist)"
-    sso_overrides_email: "Overschrijft bij elke aanmelding lokaal opgegeven e-mailadres door e-mailadres uit SSO-payload van externe website, en voorkomt lokale wijzigingen. Van toepassing op alle authenticatieproviders. (WAARSCHUWING: er kunnen discrepanties optreden door normalisatie van lokale e-mailadressen)"
-    sso_overrides_username: "Overschrijft bij elke aanmelding lokaal opgegeven gebruikersnaam door gebruikersnaam uit SSO-payload van externe website, en voorkomt lokale wijzigingen. Van toepassing op alle authenticatieproviders. (WAARSCHUWING: er kunnen discrepanties optreden 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. Van toepassing op alle authenticatieproviders"
-    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"
-    sso_allows_all_return_paths: "Het domein niet beperken voor return_paths opgegeven door SSO (standaard moet retourpad zich op huidige website bevinden)"
-    enable_local_logins: "Accounts op basis van een lokale gebruikersnaam en wachtwoord toestaan. Dit moet ingeschakeld zijn om uitnodigingen te laten werken. WAARSCHUWING: als dit is uitgeschakeld, kunt u zich mogelijk niet aanmelden als u eerder niet minstens één alternatieve aanmeldingsmethode hebt geconfigureerd."
+    discourse_connect_overrides_bio: "Overschrijft biografie in gebruikersprofiel en voorkomt dat gebruiker deze kan wijzigen"
     enable_local_logins_via_email: "Gebruikers mogen vragen een koppeling voor aanmelding met één klik via e-mail te laten toesturen."
     allow_new_registrations: "Nieuwe gebruikersregistraties toestaan. Vink dit uit om te voorkomen dat iedereen een nieuwe account kan maken."
     enable_signup_cta: "Een melding tonen voor terugkerende anonieme gebruikers waarin wordt gevraagd zich voor een account te registreren"
@@ -1546,7 +1514,6 @@ nl:
     top_topics_formula_log_views_multiplier: "waarde van vermenigvuldiger (n) voor logboekweergaven in toptopicsformule: `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: "waarde van vermenigvuldiger (n) voor likes van eerste berichten in toptopicsformule: `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: "waarde van vermenigvuldiger (n) voor minste likes per bericht in toptopicsformule: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Aantal oude berichten dat elke 15 minuten opnieuw wordt opgebouwd."
     enable_safe_mode: "Gebruikers mogen de veilige modus betreden om plug-ins te debuggen."
     rate_limit_create_topic: "Na het maken van een topic moeten gebruikers (n) seconden wachten voordat ze een ander topic kunnen maken."
     rate_limit_create_post: "Na het plaatsen van een bericht moeten gebruikers (n) seconden wachten voor ze een ander bericht kunnen plaatsen."
@@ -1561,8 +1528,6 @@ nl:
     max_topic_invitations_per_day: "Maximale aantal uitnodigingen voor een topic dat een gebruiker per dag kan versturen."
     max_logins_per_ip_per_hour: "Maximale aantal toegestane aanmeldingen per IP-adres per uur"
     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."
@@ -1596,7 +1561,6 @@ nl:
     strip_image_metadata: "Metagegevens uit afbeeldingen verwijderen."
     min_ratio_to_crop: "Gebruikte verhouding voor het bijsnijden van hoge afbeeldingen. Voer het resultaat van breedte / hoogte in."
     simultaneous_uploads: "Maximale aantal bestanden dat naar de editor kan worden gesleept"
-    enable_flash_video_onebox: "Inbedden van swf- en flv- (Adobe Flash)-koppelingen in oneboxes toestaan. WAARSCHUWING: kan beveiligingsrisico's veroorzaken."
     default_invitee_trust_level: "Standaard vertrouwensniveau (0-4) voor uitgenodigde leden."
     default_trust_level: "Standaard vertrouwensniveau (0-4) voor alle nieuwe gebruikers. WAARSCHUWING! Wijzigen hiervan geeft een groot risico op spam."
     tl1_requires_topics_entered: "Hoeveel topics een nieuwe gebruiker moet maken voordat deze naar vertrouwensniveau 1 wordt gepromoveerd."
@@ -1632,7 +1596,12 @@ nl:
     min_trust_to_send_messages: "Het minimale vertrouwensniveau dat nodig is om nieuwe persoonlijke berichten te maken."
     min_trust_to_flag_posts: "Het minimale vertrouwensniveau dat nodig is om berichten te markeren"
     min_trust_to_post_links: "Het minimale vertrouwensniveau dat nodig is om koppelingen in berichten op te nemen"
+    min_trust_to_post_embedded_media: "Het minimale vertrouwensniveau dat nodig is om media-items in een bericht in te bedden"
+    min_trust_level_to_allow_profile_background: "Het minimale vertrouwensniveau dat nodig is om een profielachtergrond te uploaden"
+    min_trust_level_to_allow_user_card_background: "Het minimale vertrouwensniveau dat nodig is om een gebruikerskaartachtergrond te uploaden"
     min_trust_level_to_allow_invite: "Het minimale vertrouwensniveau dat nodig is om gebruikers uit te nodigen"
+    min_trust_level_to_allow_ignore: "Het minimale vertrouwensniveau dat nodig is om gebruikers te negeren"
+    allowed_link_domains: "Domeinen waarnaar gebruikers mogen verwijzen, zelfs als ze niet het juiste vertrouwensniveau hebben om koppelingen te plaatsen"
     newuser_max_links: "Hoeveel koppelingen een nieuwe gebruiker aan een bericht kan toevoegen."
     newuser_max_attachments: "Hoeveel bijlagen een nieuwe gebruiker aan een bericht kan toevoegen."
     newuser_max_mentions_per_post: "Maximale aantal @naam-vermeldingen dat een nieuwe gebruiker in een bericht kan gebruiken."
@@ -1684,6 +1653,7 @@ nl:
     privacy_policy_url: "Als u ergens anders een document met een Privacybeleid hebt gehost, geef hier dan de volledige URL op."
     log_anonymizer_details: "Of de details van een gebruiker in het logboek worden behouden nadat ze zijn geanonimiseerd. Om aan de GDPR te voldoen, dient u dit uit te schakelen."
     newuser_spam_host_threshold: "Hoe vaak een nieuwe gebruiker een koppeling naar dezelfde host kan plaatsen binnen de `newuser_spam_host_threshold` berichten ervan voordat deze als spam worden beschouwd."
+    allowed_spam_host_domains: "Een lijst met domeinen die niet op spam worden gecontroleerd. Nieuwe gebruikers kunnen onbeperkt koppelingen naar deze domeinen plaatsen."
     topic_view_duration_hours: "Elke N uur één keer per IP/Gebruiker een nieuw-topicweergave tellen."
     user_profile_view_duration_hours: "Elke N uur één keer per IP/Gebruiker een nieuw-gebruikersprofielweergave tellen."
     levenshtein_distance_spammer_emails: "Bij het vergelijken van spam-e-mails, het aantal verschillende tekens waarbij nog steeds een wazige overeenkomst kan bestaan."
@@ -1719,6 +1689,7 @@ nl:
     max_emails_per_day_per_user: "Maximale aantal e-mails dat per dag naar gebruikers wordt verzonden. 0 om de limiet uit te schakelen"
     enable_staged_users: "Automatisch staged gebruikers aanmaken bij het verwerken van inkomende e-mails."
     maximum_staged_users_per_email: "Maximale aantal staged gebruikers dat bij het verwerken van een inkomende e-mail wordt aangemaakt."
+    auto_generated_allowlist: "Lijst van e-mailadressen die niet op automatisch gegenereerde inhoud worden gecontroleerd. Voorbeeld: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Inkomende e-mails die als automatisch gegenereerd zijn herkend blokkeren."
     ignore_by_title: "Inkomende e-mails op basis van hun titel blokkeren."
     mailgun_api_key: "Geheime API-sleutel van Mailgun voor het verifiëren van webhookberichten."
@@ -1729,7 +1700,6 @@ nl:
     forwarded_emails_behaviour: "Hoe een doorgestuurde e-mail naar Discourse te behandelen"
     always_show_trimmed_content: "Altijd afgekapt deel van inkomende e-mails tonen. WAARSCHUWING: kan e-mailadressen onthullen."
     private_email: "Geen inhoud van berichten of topics in titel of tekst van e-mail opnemen. OPMERKING: schakelt ook e-mailsamenvattingen uit."
-    email_total_attachment_size_limit_kb: "Maximale totale grootte van aan uitgaande e-mails gekoppelde bestanden. Stel dit in op 0 om het verzenden van bijlagen uit te schakelen."
     post_excerpts_in_emails: "In meldingen per e-mail altijd fragmenten sturen in plaats van volledige berichten"
     raw_email_max_length: "Hoeveel tekens moeten worden opgeslagen voor inkomende e-mail."
     raw_rejected_email_max_length: "Hoeveel tekens moeten worden opgeslagen voor geweigerde inkomende e-mail."
@@ -1805,6 +1775,7 @@ nl:
     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."
+    allowed_user_website_domains: "Website van gebruiker wordt op deze domeinen gecontroleerd. Door pipes gescheiden lijst."
     allow_profile_backgrounds: "Gebruikers mogen profielachtergronden uploaden."
     sequential_replies_threshold: "Aantal berichten dat een gebruiker achter elkaar in één topic moet plaatsen voordat deze aan te veel opeenvolgende reacties wordt herinnerd."
     get_a_room_threshold: "Aantal berichten dat een gebruiker aan dezelfde persoon in hetzelfde topic moet richten voordat deze wordt gewaarschuwd."
@@ -1843,6 +1814,7 @@ nl:
     embed_truncate: "De ingebedde berichten inkorten."
     embed_unlisted: "Geïmporteerde topics zijn onzichtbaar totdat een gebruiker antwoordt."
     embed_support_markdown: "Markdown-opmaak voor ingebedde berichten ondersteunen."
+    allowed_embed_selectors: "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."
     embed_post_limit: "Maximale aantal in te bedden berichten."
     embed_username_required: "De gebruikersnaam voor het maken van topics is vereist."
@@ -1850,7 +1822,6 @@ nl:
     show_create_topics_notice: "Als de website minder dan 5 publieke topics heeft, een melding tonen waarin beheerders wordt gevraagd een aantal topics te maken."
     delete_drafts_older_than_n_days: "Concepten ouder dan (n) dagen verwijderen."
     bootstrap_mode_min_users: "Minimale aantal vereiste gebruikers om bootstrapmodus uit te schakelen (stel dit in op 0 om uit te schakelen)"
-    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 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"
@@ -1882,7 +1853,6 @@ nl:
     default_email_messages_level: "Standaard e-mailmeldingsniveau wanneer iemand een gebruiker bericht."
     default_email_mailing_list_mode: "Standaard een e-mail sturen voor elk nieuw bericht."
     default_email_mailing_list_mode_frequency: "Gebruikers die de mailinglijstmodus inschakelen, ontvangen standaard dit aantal keren e-mails."
-    disable_mailing_list_mode: "Inschakelen van mailinglijstmodus door gebruikers niet toestaan."
     default_email_previous_replies: "Vorige antwoorden in e-mails standaard bijvoegen."
     default_email_in_reply_to: "Fragment van antwoord op bericht in e-mails standaard bijvoegen."
     default_other_new_topic_duration_minutes: "Globale standaardvoorwaarde waarvoor een topic als nieuw wordt beschouwd."
@@ -1892,6 +1862,7 @@ nl:
     default_other_enable_quoting: "Antwoord-met-citaat voor gemarkeerde tekst standaard inschakelen."
     default_other_enable_defer: "Topicnegeerfunctionaliteit standaard inschakelen."
     default_other_dynamic_favicon: "Aantal nieuwe / bijgewerkte topics standaard tonen op browserpictogram."
+    default_other_skip_new_user_tips: "Onboarding-tips en -badges voor nieuwe gebruikers overslaan."
     default_other_like_notification_frequency: "Gebruikers standaard informeren bij likes"
     default_topics_automatic_unpin: "Topics standaard automatisch losmaken wanneer de gebruiker de onderkant bereikt."
     default_categories_watching: "Lijst van categorieën die standaard in de gaten worden gehouden."
@@ -1911,7 +1882,6 @@ nl:
     revoke_api_keys_days: "Aantal dagen voordat een niet-gebruikte API-sleutel van een gebruiker automatisch wordt ingetrokken (0 voor nooit)"
     allow_user_api_keys: "Genereren van API-sleutels van gebruiker toestaan"
     allow_user_api_key_scopes: "Lijst van toegestane scopes voor API-sleutels van gebruiker"
-    max_api_keys_per_user: "Maximale aantal API-aanvragen van gebruiker per gebruiker"
     min_trust_level_for_user_api_key: "Vereiste vertrouwensniveau voor genereren van API-sleutels van gebruiker"
     allowed_user_api_auth_redirects: "Toegestane URL voor authenticatie bij omleiden voor API-sleutels van gebruiker. Het jokerteken * kan worden gebruikt om een deel ervan te laten overeenkomen (bv. www.example.com/*)."
     allowed_user_api_push_urls: "Toegestane URL's voor server-push naar gebruikers-API"
@@ -1921,7 +1891,6 @@ nl:
     max_tags_per_topic: "De maximale tags die op een topic kunnen worden toegepast."
     max_tag_length: "De maximale hoeveelheid tekens die in een tag kunnen worden gebruikt."
     max_tag_search_results: "Bij het zoeken naar tags, het maximale aantal resultaten om te tonen."
-    show_filter_by_tag: "Een vervolgkeuzemenu tonen om een topiclijst op tag te filteren."
     max_tags_in_filter_list: "Maximale aantal te tonen tags in het vervolgkeuzemenu van het filter. De meest gebruikte tags worden getoond."
     tags_sort_alphabetically: "Tags in alfabetische volgorde tonen. Standaard is de volgorde van populariteit."
     tags_listed_by_group: "Tags vermelden op tag-groep op de <a href='%{base_path}/tags' target='_blank'>pagina Tags</a>."
@@ -1935,6 +1904,7 @@ nl:
     governing_law: "Toepasselijk recht"
     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."
+    shared_drafts_min_trust_level: "Gebruikers mogen gedeelde concepten zien en bewerken."
     push_notifications_prompt: "Prompt voor gebruikerstoestemming weergeven."
     push_notifications_icon: "Het badgepictogram dat in de meldingshoek verschijnt. Een eenkleurige PNG van 96×96 met transparantie wordt aanbevolen."
     heading_font: "Te gebruiken lettertypen voor kopteksten op de website. Thema's kunnen worden overschreven via de aangepaste CSS-eigenschap '--heading-font-family'."
@@ -1959,6 +1929,7 @@ nl:
       invalid_string_min_max: "Moet tussen %{min} en %{max} tekens zijn."
       invalid_string_min: "Moet uit minstens %{min} tekens bestaan."
       invalid_string_max: "Mag uit niet meer dan %{max} tekens bestaan."
+      invalid_json: "Ongeldige JSON."
       invalid_reply_by_email_address: "Waarde moet '%{reply_key}' bevatten en afwijken van de melding per e-mail."
       invalid_alternative_reply_by_email_addresses: "Alle waarden moeten '%{reply_key}' bevatten en afwijken van de melding per e-mail."
       pop3_polling_host_is_empty: "U moet een 'pop3 polling host' instellen voordat u POP3-polling inschakelt."
@@ -1972,8 +1943,6 @@ nl:
       email_editable_enabled: "U moet 'email editable' uitschakelen voordat u deze instelling inschakelt."
       staged_users_disabled: "U moet eerst 'staged users' inschakelen voordat u deze instelling inschakelt."
       reply_by_email_disabled: "U moet eerst 'reply by email' inschakelen voordat u deze instelling inschakelt."
-      sso_url_is_empty: "U moet een 'sso url' instellen voordat u deze instelling inschakelt."
-      sso_invite_only: "U kunt niet tegelijk SSO inschakelen en alleen uitnodigen."
       enable_local_logins_disabled: "U moet eerst 'enable local logins' inschakelen voordat u deze instelling inschakelt."
       min_username_length_exists: "U kunt de minimale gebruikersnaamlengte niet hoger instellen dan de kortste gebruikersnaam (%{username})."
       min_username_length_range: "U kunt het minimum niet hoger instellen dan het maximum."
@@ -1981,19 +1950,15 @@ nl:
       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'."
-        high_weight_invalid: "U kunt het gewicht niet kleiner of gelijk aan 1 of groter instellen dan 'category_search_priority_very_high_weight'."
-        very_high_weight_invalid: "U kunt het gewicht niet kleiner instellen dan 'category_search_priority_high_weight'."
       allowed_unicode_usernames:
         regex_invalid: "De reguliere expressie is ongeldig: %{error}"
+        leading_trailing_slash: "De reguliere expressie mag niet met een schuine streep beginnen en eindigen."
       unicode_usernames_avatars: "De interne systeemavatars ondersteunen geen Unicode-gebruikersnamen."
       list_value_count: "De lijst moet precies %{count} waarden bevatten."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "SSO-geheim"
+        value: "DiscourseConnect geheim"
   search:
     extreme_load_error: "Website wordt zwaar belast; zoeken is uitgeschakeld, probeer het later opnieuw"
     within_post: "#%{post_number} door %{username}"
@@ -2004,7 +1969,7 @@ nl:
     results_page: "Zoekresultaten voor '%{term}'"
     audio: "[audio]"
     video: "[video]"
-  sso:
+  discourse_connect:
     login_error: "Aanmeldingsfout"
     not_found: "Uw account kon niet worden gevonden. Neem contact op met de beheerder van de website."
     account_not_approved: "Uw account wacht op goedkeuring. U ontvangt een e-mailmelding zodra deze is goedgekeurd."
@@ -2013,11 +1978,11 @@ nl:
     no_email: "Er is geen e-mailadres opgegeven. Neem contact op met de beheerder van de website."
     blank_id_error: "De `external_id` is vereist, maar was leeg"
     email_error: "Er kon geen account met het e-mailadres <b>%{email}</b> worden geregistreerd. Neem contact op met de beheerder van de website."
-    missing_secret: "SSO-authenticatie mislukt vanwege ontbrekend geheim. Neem contact op met de websitebeheerders om dit probleem te verhelpen."
   original_poster: "Oorspronkelijk geplaatst door"
   most_posts: "Meer berichten"
   most_recent_poster: "Meest recente schrijver"
   frequent_poster: "Frequente schrijver"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "Welkom bij onze gemeenschap! Dit zijn de meest populaire recente topics."
     not_seen_in_a_month: "Welkom terug! We hebben u een tijdje niet gezien. Dit zijn de meest populaire topics sinds uw afwezigheid."
@@ -2134,6 +2099,7 @@ nl:
     missing_user_field: "U hebt niet alle gebruikersvelden ingevuld"
     auth_complete: "Authenticatie is voltooid."
     click_to_continue: "Klik hier om door te gaan."
+    second_factor_title: "Tweefactorauthenticatie"
     second_factor_description: "Voer de vereiste authenticatiecode van uw app in:"
     second_factor_backup_description: "Voer een van uw back-upcodes in:"
     invalid_second_factor_code: "Ongeldige authenticatiecode. Elke code kan maar eenmaal worden gebruikt."
@@ -2146,6 +2112,13 @@ nl:
   admin:
     email:
       sent_test: "verzonden!"
+    user:
+      merge_user:
+        updating_username: "Gebruikersnaam bijwerken..."
+        updating_site_settings: "Site-instellingen bijwerken..."
+        updating_user_stats: "Gebruikersstatistieken bijwerken ..."
+        merging_user_attributes: "Gebruikerskenmerken samenvoegen..."
+        deleting_source_user: "Brongebruiker verwijderen..."
   user:
     deactivated: "Gedeactiveerd vanwege te veel gebouncete e-mails naar '%{email}'."
     deactivated_by_staff: "Gedeactiveerd door staf"
@@ -2285,6 +2258,8 @@ nl:
       subject_template: "Bericht verborgen door gemeenschapsmarkeringen"
     post_hidden_again:
       title: "Bericht opnieuw verborgen"
+    queued_by_staff:
+      title: "Bericht heeft goedkeuring nodig"
     flags_disagreed:
       title: "Gemarkeerd bericht teruggezet door staflid"
       subject_template: "Gemarkeerd bericht teruggezet door staflid"
@@ -2313,13 +2288,9 @@ nl:
       subject_template: "Welkom bij %{site_name}!"
     tl2_promotion_message:
       subject_template: "Gefeliciteerd met de promotie van uw vertrouwensniveau!"
-      text_body_template: |
-        We hebben uw [vertrouwensniveau](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) gepromoveerd!
-
-        We nodigen u uit om mee te blijven doen – we vinden het leuk om u in de buurt te hebben.
     backup_succeeded:
       title: "Back-up geslaagd"
-      subject_template: "Back-up voltooid"
+      subject_template: "Back-up succesvol voltooid"
     backup_failed:
       title: "Back-up mislukt"
       subject_template: "Back-up mislukt"
@@ -2333,7 +2304,7 @@ nl:
         ```
     restore_succeeded:
       title: "Back-up teruggezet"
-      subject_template: "Back-up voltooid"
+      subject_template: "Back-up succesvol voltooid"
     restore_failed:
       title: "Terugzetten mislukt"
       subject_template: "Terugzetten mislukt"
@@ -2362,6 +2333,7 @@ nl:
       title: "CSV-export mislukt"
       subject_template: "Export mislukt"
     email_reject_inactive_user:
+      title: "E-mail weigeren inactieve gebruiker"
       text_body_template: |
         Het spijt ons, maar het plaatsen van uw e-mailbericht op %{destination} (met de titel %{former_title}) is niet gelukt.
 
@@ -2406,11 +2378,15 @@ 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.
+    email_error_notification:
+      title: "E-mailfoutmelding"
+    email_revoked:
+      subject_template: "Is uw e-mailadres correct?"
+    too_many_spam_flags:
+      title: "Te veel spammarkeringen"
+      subject_template: "Nieuwe account in wachtstand"
+    too_many_tl3_flags:
+      subject_template: "Nieuwe account in wachtstand"
     silenced_by_staff:
       title: "Gedempt door staflid"
       subject_template: "Account tijdelijk geblokkeerd"
@@ -2449,6 +2425,7 @@ nl:
       subject_template: "U bent een nieuwe gebruiker van de maand!"
   subject_re: "Re:"
   subject_pm: "[PM]"
+  email_from: "%{user_name} via %{site_name}"
   user_notifications:
     previous_discussion: "Vorige reacties"
     in_reply_to: "in reactie op"
@@ -2462,6 +2439,80 @@ nl:
     visit_link_to_respond: "[Bezoek het topic](%{base_url}%{url}) om te reageren."
     visit_link_to_respond_pm: "[Bezoek het bericht](%{base_url}%{url}) om op %{participants} te reageren."
     posted_by: "Geplaatst door %{username} op %{post_date}"
+    pm_participants: "Deelnemers: %{participants}"
+    user_replied:
+      title: "Gebruiker antwoordde"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_replied_pm:
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      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:
+      title: "Gebruiker gekoppeld"
+      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:
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_group_mentioned:
+      title: "Gebruikersgroep genoemd"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_posted:
       title: "Een gebruiker heeft iets geplaatst"
       subject_template: "[%{email_prefix}] %{topic_title}"
@@ -2484,6 +2535,7 @@ nl:
 
         %{respond_instructions}
     user_posted_pm:
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2500,12 +2552,6 @@ nl:
     account_suspended:
       title: "Account geschorst"
       subject_template: "[%{email_prefix}] Uw account is geschorst"
-      text_body_template: |
-        U bent geschorst op het forum tot %{suspended_till}.
-
-        %{reason}
-
-        %{message}
     account_silenced:
       title: "Account gedempt"
       subject_template: "[%{email_prefix}] Uw account is gedempt"
@@ -2595,6 +2641,9 @@ nl:
     suspicious_login:
       title: "Waarschuwing voor nieuwe aanmelding"
       subject_template: "[%{site_name}] Nieuwe aanmelding vanaf %{location}"
+    post_approved:
+      title: "Uw bericht is goedgekeurd"
+      subject_template: "[%{site_name}] Uw bericht is goedgekeurd"
   page_forbidden:
     title: "Oeps! Die pagina is privé."
   page_not_found:
@@ -2686,6 +2735,11 @@ nl:
     editor:
       name: Bewerker
       description: Eerste berichtbewerking
+    wiki_editor:
+      name: Wiki-editor
+      description: Eerste wiki bewerking
+      long_description: |
+        Deze badge wordt toegekend als u voor het eerst een wiki-bericht bewerkt.
     basic_user:
       name: Basis
       description: Alle essentiële gemeenschapsfuncties <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">toegekend</a>
@@ -2743,6 +2797,7 @@ nl:
       description: Heeft een gebruiker uitgenodigd
     campaigner:
       name: Campaigner
+      description: 3 basisgebruikers uitgenodigd
       long_description: |
         Deze badge wordt toegekend wanneer u 3 mensen hebt uitgenodigd die aansluitend genoeg tijd op deze website hebben doorgebracht om basisgebruiker te worden. Een levendige gemeenschap heeft een regelmatige inbreng van nieuwkomers nodig die regelmatig deelnemen en nieuwe geluiden aan de conversaties toevoegen.
     champion:
@@ -2759,9 +2814,13 @@ nl:
     read_guidelines:
       name: Richtlijnen gelezen
       description: Heeft de <a href="%{base_uri}/guidelines">gemeenschapsrichtlijnen</a> gelezen
+      long_description: |
+        Deze badge wordt toegekend als u de <a href="%{base_uri}/guidelines">richtlijnen hebt gelezen</a>. Het opvolgen en delen van deze eenvoudige richtlijnen draagt bij aan een veilige, leuke en duurzame community voor iedereen. Bedenk altijd dat er een mens, net zoals u, aan de andere kant van het scherm zit. Wees aardig!
     reader:
       name: Lezer
       description: Heeft alle antwoorden in een topic met meer dan 100 antwoorden gelezen
+      long_description: |
+        Deze badge wordt toegekend wanneer u voor het eerst een topic met meer dan 100 antwoorden hebt gelezen. Als u een gesprek zorgvuldig volgt, kan u de discussie volgen en de verschillende standpunten begrijpen; dit leidt tot interessantere gesprekken. Hoe meer u leest, hoe beter het gesprek wordt. Zoals we zeggen, lezen is fundamenteel! :slight_smile:
     popular_link:
       name: Populaire koppeling
       description: Heeft een externe koppeling met 50 klikken geplaatst
@@ -2794,6 +2853,10 @@ nl:
         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 medegemeenschapsleden!
     thank_you:
       name: Bedankt
+      description: Heeft 20 geliket en 10 likes gegeven
+    gives_back:
+      name: Geeft terug
+      description: Heeft 100 geliket en 100 likes gegeven
     empathetic:
       name: Empathisch
       description: Heeft 500 geliket en 1000 likes gegeven
@@ -2802,11 +2865,16 @@ nl:
       description: Heeft een emoji in een bericht gebruikt
     first_mention:
       description: Heeft een gebruiker genoemd in een bericht
+    first_onebox:
+      name: Eerste Onebox
     first_reply_by_email:
       name: Eerste antwoord via e-mail
       description: Bericht beantwoord via e-mail
     new_user_of_the_month:
       name: "Nieuwe gebruiker van de maand"
+      description: Uitstekende bijdragen in hun eerste maand
+      long_description: |
+        Deze badge wordt elke maand aan twee nieuwe gebruikers toegekend om hen te feliciteren met hun uitstekende bijdragen, gemeten aan de hand van hoe vaak hun berichten werden gewaardeerd en door wie.
     enthusiast:
       name: Liefhebber
       description: Heeft 10 opeenvolgende dagen bezocht
@@ -2830,6 +2898,7 @@ nl:
     initial_topic_title: Performancerapportages van de website
   tags:
     title: "Tags"
+    restricted_tag_disallowed: 'U kunt de tag "%{tag}” niet toepassen.'
     minimum_required_tags:
       one: "U moet minstens %{count} tag selecteren."
       other: "U moet minstens %{count} tags selecteren."
@@ -2860,6 +2929,7 @@ nl:
     no_plugins: "Alle plug-ins uitschakelen"
     enter: "Veilige modus starten"
   wizard:
+    title: "Discourse instellen"
     step:
       locale:
         title: "Welkom bij uw Discourse!"
@@ -2868,6 +2938,10 @@ nl:
             description: "Wat is de standaardtaal voor uw gemeenschap?"
       forum_title:
         title: "Naam"
+        fields:
+          title:
+            label: "Naam van uw community"
+            placeholder: "Jane's Hangout"
       introduction:
         fields:
           welcome:
@@ -2885,6 +2959,8 @@ nl:
                 description: "Alleen aangemelde gebruikers hebben toegang tot deze gemeenschap"
           privacy_options:
             choices:
+              open:
+                label: "Gebruikers kunnen zichzelf aanmelden."
               invite_only:
                 label: "Gebruikers moeten door vertrouwde gebruikers of een staflid worden uitgenodigd voordat ze kunnen registreren."
               must_approve:
@@ -2961,9 +3037,6 @@ nl:
                 label: "Categorievakken"
               categories_boxes_with_topics:
                 label: "Categorievakken met topics"
-      emoji:
-        title: "Emoji"
-        description: "Welke Emoji-stijl kiest u voor uw gemeenschap? U kunt later meer aangepaste Emoji toevoegen via Beheer, Aanpassen, Emoji."
       invites:
         title: "Staf uitnodigen"
         description: "U bent bijna klaar! Nodig wat mensen uit om te helpen met het <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>seeden van uw discussies</a> met interessante topics en berichten om uw gemeenschap op te zetten."
@@ -3096,6 +3169,7 @@ nl:
     topic_title_with_sequence:
       one: "%{topic_title} (Deel %{count})"
       other: "%{topic_title} (Deel %{count})"
+    post_raw: "De discussie wordt voortgezet vanaf %{parent_url}.\n\nEerdere discussies:\n\n%{previous_topics}"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index eaa43a2555..d9491bd4d4 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -14,7 +14,7 @@ pl_PL:
       short: "%d.%m.%Y"
       short_no_year: "%-d %B"
       date_only: "%-d %B %Y"
-      long: "%B %-d, %Y, %l:%M%P"
+      long: "%-d %B %Y %H:%M"
       no_day: "%B %Y"
   date:
     month_names:
@@ -51,9 +51,13 @@ pl_PL:
   remove_posts_deleted_by_author: "Usunięte przez autora"
   redirect_warning: "Nie byliśmy w stanie zweryfikować, że wybrany przez Ciebie link został rzeczywiście wysłany na forum. Aby kontynować mimo tego, wybierz link poniżej."
   on_another_topic: "Na innym temacie"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} przez %{username}"
   themes:
     bad_color_scheme: "Nie można zaktualizować szablonu, nieprawidłowa paleta kolorów"
     other_error: "Coś poszło nie tak podczas aktualizacji szablonu"
+    ember_selector_error: "Przepraszamy - używanie selektorów #ember lub .ember-view w CSS jest zabronione, ponieważ nazwy te są generowane dynamicznie w czasie pracy i z czasem się zmienią, co ostatecznie skończy się uszkodzenonym CSS. Wypróbuj inny selektor."
     compile_error:
       unrecognized_extension: "Nie rozpoznano rozszerzenia pliku: %{extension}"
     import_error:
@@ -62,9 +66,11 @@ pl_PL:
       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"
+      git_ref_not_found: "Nie można sprawdzić odwołania git: %{ref}"
       unpack_failed: "Błąd przy rozpakowywaniu pliku"
       file_too_big: "Nieskompresowany plik jest zbyt duży."
       unknown_file_type: "Przesłany plik nie spełnia wymagań poprawnego motywu Discourse."
+      not_allowed_theme: "`%{repo}` nie jest na liście dozwolonych motywów (sprawdź globalne ustawienie `allowed_theme_repos`)."
     errors:
       component_no_user_selectable: "Komponenty motywu nie mogą być dobieralne przez użytkowników"
       component_no_default: "Komponenty motywu nie mogą być domyślnym motywem"
@@ -94,12 +100,12 @@ pl_PL:
     incoming:
       default_subject: "Ten temat wymaga tytułu"
       show_trimmed_content: "Pokaż skróconą zawartość"
-      maximum_staged_user_per_email_reached: "Osiągnięto maksymalną ilość użytkowników zarejestrowanych przez email."
+      maximum_staged_user_per_email_reached: "Osiągnięto maksymalną ilość użytkowników etapowych zarejestrowanych przez email."
       no_subject: "(brak tematu)"
       no_body: "(brak treści wpisu)"
       missing_attachment: "(Brakuje załącznika %{filename})"
       errors:
-        empty_email_error: "Zdarza się kiedy mail jaki dostaliśmy jest pusty."
+        empty_email_error: "Zdarza się kiedy e-mail jaki dostaliśmy jest pusty."
         no_message_id_error: "Zdarza się kiedy email nie posiada nagłówka 'Message-Id'."
         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."
@@ -140,10 +146,10 @@ pl_PL:
       has_already_been_used: "został już użyty"
       inclusion: nie jest zawarty w liście
       invalid: jest nieprawidłowy
-      is_invalid: "wygląda niejasno, czy to cała wypowiedz ?"
-      is_invalid_meaningful: "wydaje się niejasne, większość słów zawiera w kółko te same litery?"
-      is_invalid_unpretentious: "wydaje się niejasne, jedno lub więcej słów jest bardzo długie?"
-      is_invalid_quiet: "wydaje się niejasne, czy chciałeś wpisać to WIELKIMI LITERAMI?"
+      is_invalid: "wygląda niejasno, czy to cała wypowiedź?"
+      is_invalid_meaningful: "wydaje się niejasny, większość słów zawiera w kółko te same litery?"
+      is_invalid_unpretentious: "wydaje się niejasny, jedno lub więcej słów jest bardzo długie?"
+      is_invalid_quiet: "wydaje się niejasny, czy chciałeś/łaś wpisać to WIELKIMI LITERAMI?"
       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}
@@ -174,7 +180,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."
+      auth_overrides_username: "Nazwa użytkownika musi być aktualizowana po stronie dostawcy uwierzytelniania, ponieważ opcja `auth_overrides_username` jest włączona."
     template:
       body: ! "Wystąpiły problemy z następującymi polami:"
       header:
@@ -202,7 +208,7 @@ pl_PL:
       share_quote_facebook_requirements: "Aby włączyć udostępnianie na Facebooku, musisz ustawić identyfikator aplikacji Facebook."
       second_factor_cannot_enforce_with_socials: "Nie można wymusić 2FA z włączonym logowaniu społecznościowym. Najpierw musisz wyłączyć logowanie przez: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Nie można wymusić 2FA, jeśli lokalne logowanie jest wyłączone."
-      second_factor_cannot_be_enforced_with_sso_enabled: "Nie możesz wymusić 2FA, jeśli SSO jest włączone."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "Nie możesz wymusić 2FA, jeśli DiscourseConnect jest włączony."
       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"
       cors_origins_should_not_have_trailing_slash: "Nie należy dodawać końcowego ukośnika (/) do źródeł CORS."
@@ -221,19 +227,21 @@ pl_PL:
     expired: "Twój token z zaproszeniem wygasł. Prosimy <a href='%{base_url}/about'>skontaktować się z personelem</a>."
     not_found: "Token do zaproszeń jest nieprawidłowy. <a href='%{base_url}/about'>Skontaktuj się z administracją strony</a>."
     not_found_json: "Token do zaproszeń jest nieprawidłowy. Skontaktuj się z administracją strony."
+    not_matching_email: "Twój adres e-mail i adres e-mail powiązany z tokenem zaproszenia nie są zgodne. Prosimy o kontakt z personelem."
     not_found_template: |
       <p>Twoje zaproszenie do <a href="%{base_url}">%{site_name}</a> zostało już zrealizowane.</p>
 
       <p>Jeśli pamiętasz hasło, możesz się <a href="%{base_url}/login">zalogować</a>.</p>
 
       <p>W przeciwnym razie <a href="%{base_url}/password-reset">zresetuj hasło</a>.</p>
-    error_message: "Podczas akceptowania zaproszenia wystąpił błąd. Skontaktuj się z administratorem strony."
-    user_exists: "Nie ma potrzeby zapraszania <b>%{email}</b>, <a href='%{base_path}/u/%{username}/summary'>obecnie posiada konto!"
-    confirm_email: "<p>Już prawie koniec! Wysłaliśmy email aktywacyjny na Twój adres mailowy. Postępuj zgodnie z instrukcjami w mailu, aby aktywować konto. </p><p>Jeśli email nie przyszedł, sprawdź folder ze spamem.</p>"
+    not_found_template_link: |
+      <p>Zaproszenia do <a href="%{base_url}">%{site_name}</a> nie można już zrealizować. Poproś osobę, która Cię zaprosiła, o przesłanie nowego zaproszenia.</p>
+    user_exists: "Nie ma potrzeby zapraszania <b>%{email}</b>, <a href='%{base_path}/u/%{username}/summary'>obecnie posiada konto!</a>"
+    invalid_email: "%{email} nie jest prawidłowym adresem e-mail."
+    confirm_email: "<p>Już prawie koniec! Wysłaliśmy na Twój adres e-mail aktywacyjny. Postępuj zgodnie z instrukcjami w e-mailu, aby aktywować konto.</p><p>Jeśli e-mail nie przyszedł, sprawdź folder ze spamem.</p>"
     cant_invite_to_group: "Nie możesz zapraszać użytkowników do określonej grupy. Upewnij się, że jesteś właścicielem grupy, do których próbujesz zaprosić."
     disabled_errors:
-      sso_enabled: "Zaproszenia są wyłączone, ponieważ SSO jest włączone."
-      local_logins_disabled: "Zaproszenia są wyłączone, ponieważ ustawienie 'enable local logins' jest wyłączone."
+      discourse_connect_enabled: "Zaproszenia są wyłączone, ponieważ DiscourseConnect jest włączony."
       invalid_access: "Nie masz uprawnień do przeglądania żądanego zasobu."
   bulk_invite:
     file_should_be_csv: "Wgrywany plik powinien być formatu csv."
@@ -249,7 +257,7 @@ pl_PL:
     muted_topic: "Przepraszamy, ten użytkownik wyciszył ten temat."
     receiver_does_not_allow_pm: "Przepraszamy, ten użytkownik nie pozwala na wysyłanie mu prywatnych wiadomości."
     sender_does_not_allow_pm: "Przepraszamy, nie pozwalasz temu użytkownikowi na wysyłanie Ci prywatnych wiadomości."
-    receiver_does_not_allow_other_user_pm: "Przepraszamy, ten użytkownik nie pozwala istniejącemu uczestnikowi na wysyłanie mu prywatnych wiadomości."
+    user_cannot_see_topic: "%{username} nie może zobaczyć tematu."
   backup:
     operation_already_running: "Operacja jest już uruchomiona. Nie można teraz utworzyć nowej."
     backup_file_should_be_tar_gz: "Plik z kopią zapasową powinien mieć postać archiwum .tar.gz."
@@ -261,7 +269,7 @@ pl_PL:
       s3: "Amazon S3"
   invalid_params: "Zapytanie zawiera nieprawidłowy parametr: %{message}."
   not_logged_in: "Aby to zrobić musisz się zalogować."
-  not_found: "Żądany URL lub źródło nie mógł zostać znaleziony."
+  not_found: "Żądany URL lub źródło nie mógł/mogła zostać znaleziony."
   invalid_access: "Nie jesteś uprawniony, by zobaczyć żądane źródło."
   authenticator_not_found: "Metoda uwierzytelnienia nie istnieje albo została zablokowana."
   invalid_api_credentials: "Nie masz dostępu do żądanego zasobu. Nazwa użytkownika lub klucz API jest nieprawidłowy."
@@ -272,6 +280,7 @@ pl_PL:
   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 wpisów szeptanych"
   not_in_group:
+    title_topic: "Aby wyświetlić ten temat, musisz poprosić o członkostwo w grupie '%{group}'."
     title_category: "Musisz być w grupie, aby zobaczyć tę kategorię."
     request_membership: "Poproś o członkostwo"
     join_group: "Dołącz do grupy"
@@ -308,10 +317,10 @@ pl_PL:
     imported_from: "Ten temat jest powiązany ze źródłową dyskusją: %{link}"
     in_reply_to: "▶ %{username}"
     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"
     likes:
       one: "%{count} polubienie"
       few: "%{count} polubienia"
@@ -361,12 +370,13 @@ 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."
+  watched_words_auto_tag: "Automatycznie otagowany wątek"
   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."
   slow_mode_enabled: "Ten temat jest w trybie zwolnionym."
-  just_posted_that: "jest zbyt podobne do tego co umieściłeś niedawno"
+  just_posted_that: "jest zbyt podobne do tego co umieściłeś/łaś niedawno"
   invalid_characters: "zawiera niepoprawne znaki"
-  is_invalid: "wygląda niejasno, czy to cała wypowiedz ?"
+  is_invalid: "wygląda niejasno, czy to cała wypowiedź?"
   next_page: "następna strona →"
   prev_page: "← poprzednia strona"
   page_num: "Strona %{num}"
@@ -375,10 +385,10 @@ pl_PL:
   rss_posts_in_topic: "Kanał RSS tematu '%{topic}'"
   rss_topics_in_category: "Kanał RSS tematów z kategorii '%{category}'"
   rss_num_posts:
-    one: "%{count} wpis"
-    few: "%{count} wpisy"
-    many: "%{count} wpisów"
-    other: " %{count} wpisów"
+    one: "%{count} post"
+    few: "%{count} posty"
+    many: "%{count} postów"
+    other: "%{count} postów"
   rss_num_participants:
     one: "%{count} uczestnik"
     few: "%{count} uczestników"
@@ -406,12 +416,13 @@ pl_PL:
   too_late_to_edit: "Ten wpis został utworzony zbyt dawno. Nie może być edytowany ani usunięty."
   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ć."
-  cannot_edit_on_slow_mode: "Ten temat jest w trybie zwolnionym. Aby zachęcić do przemyślanej oraz rozważanej dyskusji, edytowanie starych postów nie jest obecnie dozwolone."
+  cannot_edit_on_slow_mode: "Ten temat jest w trybie powolnym. Aby zachęcić do przemyślanej, rozważanej dyskusji, edycja starych postów w tym temacie nie jest obecnie dozwolona w trybie powolnym."
   excerpt_image: "zdjęcie"
   bookmarks:
     errors:
       already_bookmarked_post: "Nie możesz dodać zakładki do tego samego wpisu dwa razy."
-      cannot_set_past_reminder: "W przeszłości nie można ustawić przypomnienia o zakładce."
+      too_many: "Przepraszamy, nie możesz dodać więcej niż %{limit} zakładek. Odwiedź stronę <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> aby niektóre usunąć."
+      cannot_set_past_reminder: "Nie możesz ustawić przypomnienia o zakładce w przeszłości."
       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: "czas musi zostać podany dla wszystkich przypomnień"
     reminders:
@@ -438,12 +449,19 @@ pl_PL:
         many: "Użytkownicy %{username} są już członkami tej grupy"
         other: "Użytkownicy %{username} są już członkami tej grupy"
       invalid_domain: "'%{domain}' nie jest poprawną domeną."
-      invalid_incoming_email: "'%{domain}' nie jest poprawną domeną."
+      invalid_incoming_email: "'%{email}' nie jest poprawnym adresem email."
       email_already_used_in_group: "'%{email}' jest już używany przez grupę '%{group_name}'."
       email_already_used_in_category: "'%{email}' jest już używany przez kategorię '%{category_name}'."
       cant_allow_membership_requests: "Nie możesz zatwierdzić członkostwa w grupie bez żadnego właściela"
-      already_requested_membership: "Już zażądałaś/łeś dostępu do tej grupy."
-      adding_too_many_users: "Jednocześnie można dodać maksymalnie %{limit} użytkowników"
+      already_requested_membership: "Już zażądałaś/łeś/łaś dostępu do tej grupy."
+      adding_too_many_users:
+        one: "Jednocześnie można dodać maksymalnie %{count} użytkownika"
+        few: "Jednocześnie można dodać maksymalnie %{count} użytkowników"
+        many: "Jednocześnie można dodać maksymalnie %{count} użytkowników"
+        other: "Jednocześnie można dodać maksymalnie %{count} użytkowników"
+      usernames_or_emails_required: "Nazwy użytkowników lub adresy e-mail muszą być obecne"
+      no_invites_with_discourse_connect: "Gdy włączona jest opcja DiscourseConnect, możesz zapraszać tylko zarejestrowanych użytkowników"
+      no_invites_without_local_logins: "Możesz zaprosić tylko zarejestrowanych użytkowników, gdy logowanie lokalne jest wyłączone"
     default_names:
       everyone: "wszyscy"
       admins: "administratorzy"
@@ -473,7 +491,7 @@ pl_PL:
 
       - Kto będzie tym zainteresowany? Dlaczego temat jest istotny? Jakiego rodzaju odpowiedzi oczekujesz?
 
-      - Postaraj się umieścić słowa kluczowe w tytule, dzięki czemu inni będą mogli łatwo *wyszukać* temat. Przypisz go do kategorii o pokrewnej tematyce.
+      - Postaraj się umieścić słowa kluczowe w tytule, dzięki czemu inni będą mogli łatwo *wyszukać* temat. Przypisz go do kategorii (lub tagu) o pokrewnej tematyce.
 
       Aby dowiedzieć się więcej, [zobacz przewodnik społeczności](%{base_path}/guidelines). Ten panel pojawi się tylko przy pierwszym %{education_posts_text}.
     "new-reply": |
@@ -490,9 +508,9 @@ pl_PL:
     avatar: |
       ### Co powiesz na dodanie awatara?
 
-      Opublikowałeś parę tematów i odpowiedzi, lecz Twoje zdjęcie profilowe nie jest tak unikalne jak Ty – To tylko litera.
+      Opublikowałeś/łaś parę tematów i odpowiedzi, lecz Twoje zdjęcie profilowe nie jest tak unikalne jak Ty – To tylko litera.
 
-      Czy rozważyłeś **[odwiedzenie swojego profilu](%{profile_path})** i dodanie zdjęcia które Cię reprezentuje?
+      Czy rozważyłeś/łaś **[odwiedzenie swojego profilu](%{profile_path})** i dodanie zdjęcia które Cię reprezentuje?
 
       Łatwiej jest prowadzić dyskusję i znaleźć interesujące osoby podczas rozmowy kiedy każdy ma wyjątkowe zdjęcie profilowe!
     sequential_replies: |
@@ -506,7 +524,7 @@ pl_PL:
     dominating_topic: |
       ### Pozwól innym przyłączyć się do rozmowy
 
-      Ten temat jest dla Ciebie wyraźnie ważny &ndash; opublikowałeś tutaj ponad %{percent}% odpowiedzi.
+      Ten temat jest dla Ciebie wyraźnie ważny &ndash; opublikowałeś/łaś tutaj ponad %{percent}% odpowiedzi.
 
       Byłoby jeszcze lepiej, gdybyś dał innym ludziom przestrzeń do podzielenia się swoimi punktami widzenia. Możesz ich zaprosić?
     get_a_room: |
@@ -518,7 +536,7 @@ pl_PL:
 
       Nie zapominaj, że jeśli chciał(a)byś kontynuować rozmowę z tym użytkownikiem poza widokiem publicznym, to możesz [wysłać im prywatną wiadomość](%{base_path}/u/%{reply_username}).
     too_many_replies: |
-      ### Osiągnąłeś limit odpowiedzi w tym temacie
+      ### Osiągnąłeś/łaś limit odpowiedzi w tym temacie
 
       Przepraszamy, ale nowi użytkownicy są obecnie ograniczeni do %{newuser_max_replies_per_topic} odpowiedzi w tym samym temacie.
 
@@ -551,7 +569,8 @@ pl_PL:
               cant_send_pm: "Przepraszamy, nie możesz wysłać prywatnej wiadomości do tego użytkownika."
               no_user_selected: "Musisz wybrać poprawnego użytkownika,"
               reply_by_email_disabled: "Odpowiedź przez e-mail została wyłączona."
-              target_user_not_found: "Jeden z użytkowników, do których chciałaś/łeś wysłać tę wiadomość nie został znaleziony."
+              send_to_email_disabled: "Przepraszamy, nie możesz wysyłać prywatnych wiadomości na e-mail."
+              target_user_not_found: "Jeden z użytkowników, do których chciałaś/łeś/łaś wysłać tę wiadomość nie został znaleziony."
               unable_to_update: "Wystąpił błąd przy aktualizacji tego tematu."
               unable_to_tag: "Wystąpił błąd podczas tagowania tematu."
             featured_link:
@@ -594,11 +613,14 @@ pl_PL:
         custom_emoji:
           attributes:
             name:
-              taken: jest używane przez inną emotikonkę
+              taken: jest używane przez inne emoji
         topic_timer:
           attributes:
             execute_at:
               in_the_past: "musi być w przyszłości"
+            duration_minutes:
+              cannot_be_zero: "musi być większa niż 0."
+              exceeds_maximum: "nie może przekraczać 20 lat."
         translation_overrides:
           attributes:
             value:
@@ -637,7 +659,7 @@ pl_PL:
 
       Gratulacje! :confetti_ball:
 
-      Jeśli widzisz ten temat, niedawno awansowałeś na **regularny** (poziom zaufania 3).
+      Jeśli widzisz ten temat, niedawno awansowałeś/łaś na **regularny** (poziom zaufania 3).
 
       Możesz teraz &hellip;
 
@@ -702,23 +724,23 @@ pl_PL:
       many: "%{count} polubień"
       other: "%{count} polubień"
   rate_limiter:
-    slow_down: "Wykonałeś tę akcję zbyt wiele razy, spróbuj ponownie później."
-    too_many_requests: "Wykonałeś tę akcję zbyt wiele razy, spróbuj ponownie za %{time_left}."
+    slow_down: "Wykonałeś/łaś tę akcję zbyt wiele razy, spróbuj ponownie później."
+    too_many_requests: "Wykonałeś/łaś tę akcję zbyt wiele razy, spróbuj ponownie za %{time_left}."
     by_type:
-      first_day_replies_per_day: "Osiągnąłeś maksymalną liczbę odpowiedzi, jakie może napisać pierwszego dnia nowy użytkownik. Spróbuj ponownie za %{time_left}."
-      first_day_topics_per_day: "Osiągnąłeś maksymalną liczbę tematów, jakie może stworzyć pierwszego dnia nowy użytkownik. Spróbuj ponownie za %{time_left}."
-      create_topic: "Zbyt szybko tworzysz tematy. Spróbuj ponownie za %{time_left}."
-      create_post: "Zbyt szybko odpowiadasz. Spróbuj ponownie za %{time_left}."
-      delete_post: "Zbyt szybko usuwasz wpisy. Spróbuj ponownie za %{time_left}."
-      public_group_membership: "Zbyt szybko dołączasz do grup i/lub je opuszczasz. Spróbuj ponownie za %{time_left}."
-      topics_per_day: "Osiągnięto limit nowych tematów. Spróbuj ponownie za %{time_left}."
-      pms_per_day: "Osiągnięto limit wiadomości. Spróbuj ponownie za %{time_left}."
-      create_like: "Osiągnięto limit polubień. Spróbuj ponownie za %{time_left}."
-      create_bookmark: "Osiągnięto limit zakładek. Spróbuj ponownie za %{time_left}."
-      edit_post: "Osiągnięto limit edycji. Spróbuj ponownie za %{time_left}."
+      first_day_replies_per_day: "Doceniamy twój entuzjazm, tak trzymaj! Dla bezpieczeństwa naszej społeczności osiągnąłeś maksymalną liczbę odpowiedzi, które nowy użytkownik może utworzyć w pierwszym dniu. Poczekaj %{time_left}, a będziesz mógł utworzyć więcej odpowiedzi."
+      first_day_topics_per_day: "Doceniamy twój entuzjazm! Dla bezpieczeństwa naszej społeczności osiągnąłeś maksymalną liczbę tematów, które nowy użytkownik może stworzyć w pierwszym dniu. Poczekaj %{time_left}, a będziesz mógł utworzyć więcej tematów."
+      create_topic: "Tworzysz tematy zbyt szybko. Zaczekaj %{time_left} , zanim spróbujesz ponownie."
+      create_post: "Odpisujesz trochę za szybko. Zaczekaj %{time_left} , zanim spróbujesz ponownie."
+      delete_post: "Za szybko usuwasz posty. Zaczekaj %{time_left} , zanim spróbujesz ponownie."
+      public_group_membership: "Dołączasz/opuszczasz grupy zbyt często. Zaczekaj %{time_left} , zanim spróbujesz ponownie."
+      topics_per_day: "Osiągnąłeś maksymalną liczbę nowych tematów dziennie. Możesz utworzyć więcej tematów w %{time_left}."
+      pms_per_day: "Osiągnąłeś maksymalną liczbę dozwolonych wiadomości dziennie. Możesz utworzyć więcej nowych wiadomości za %{time_left}."
+      create_like: "Wow! Podzieliłeś się wielką miłością! Osiągnąłeś maksymalną liczbę polubień na dzisiaj, ale kiedy zdobędziesz większy poziom zaufania, zyskasz więcej dziennych polubień. Będziesz mógł polubić wpisy ponownie za %{time_left}."
+      create_bookmark: "Osiągnąłeś maksymalną liczbę zakładek na dziś. Możesz utworzyć więcej zakładek za %{time_left}."
+      edit_post: "Osiągnąłeś maksymalną liczbę edycji na dziś. Możesz przesłać więcej edycji za %{time_left}."
       live_post_counts: "Zbyt szybko prosisz o bieżące zliczanie wpisów. Spróbuj ponownie za %{time_left}."
-      unsubscribe_via_email: "Osiągnięto limit wypisań przez maila. Spróbuj ponownie za %{time_left}."
-      topic_invitations_per_day: "Osiągnięto limit zaproszeń do tematów. Spróbuj ponownie za %{time_left}."
+      unsubscribe_via_email: "Osiągnięto limit wypisań przez e-mail. Spróbuj ponownie za %{time_left}."
+      topic_invitations_per_day: "Osiągnąłeś maksymalną liczbę zaproszeń do tematów. Możesz wysłać więcej zaproszeń za %{time_left}."
     hours:
       one: "%{count} godzina"
       few: "%{count} godziny"
@@ -823,7 +845,7 @@ pl_PL:
         other: "%{count} dni temu"
       about_x_months:
         one: "około %{count} miesiąca temu"
-        few: "około %{count} miesiące temu"
+        few: "około %{count} miesięcy temu"
         many: "około %{count} miesięcy temu"
         other: "około %{count} miesięcy temu"
       x_months:
@@ -832,8 +854,8 @@ pl_PL:
         many: "%{count} miesięcy temu"
         other: "%{count} miesięcy temu"
       about_x_years:
-        one: "około %{count} rok temu"
-        few: "około %{count} lata temu"
+        one: "około %{count} roku temu"
+        few: "około %{count} lat temu"
         many: "około %{count} lat temu"
         other: "około %{count} lat temu"
       over_x_years:
@@ -857,7 +879,7 @@ pl_PL:
     success_unapproved: "Zmieniłeś(-a) swoje hasło."
   email_login:
     invalid_token: "Przepraszamy, ten link do logowania jest zbyt stary. Kliknij przycisk \"Zaloguj\" i użyj opcji \"Zapomniałem hasła\", aby otrzymać nowy link."
-    title: "Logowanie mailem"
+    title: "Logowanie e-mailem"
   user_auth_tokens:
     browser:
       chrome: "Google Chrome"
@@ -870,7 +892,7 @@ pl_PL:
       unknown: "nieznana przeglądarka"
     device:
       android: "Urządzenie z Androidem"
-      chromebook: "Chromebook"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -881,7 +903,7 @@ pl_PL:
       unknown: "nieznane urządzenie"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -894,8 +916,9 @@ pl_PL:
     error: "Podczas próby zmiany Twojego adresu email wystąpił błąd. Być może ten adres jest już używany?"
     doesnt_exist: "Ten adres e-mail nie jest powiązany z Twoim kontem."
     error_staged: "Podczas próby zmiany Twojego adresu email wystąpił błąd. Być może ten adres jest już używany?"
-    already_done: "Przepraszamy, ten link aktywujący konto jest już nieważny. Być może Twój mail został zmieniony?"
+    already_done: "Przepraszamy, ten link aktywujący konto jest już nieważny. Być może Twój e-mail został zmieniony?"
     confirm: "Potwierdź"
+    max_secondary_emails_error: "Osiągnąłeś maksymalny dozwolony limit dodatkowych e-maili."
     authorizing_new:
       title: "Potwierdź swój nowy adres e-mail"
       description: "Potwierdź, że chcesz zmienić swój adres e-mail na:"
@@ -1007,7 +1030,7 @@ pl_PL:
       title: "Spam"
       description: "Ten temat jest komercyjnym ogłoszeniem. Nie zawiera wartościowej treści, jedynie reklamową. "
       long_form: "oflagowano jako spam"
-      short_description: "To jest ogłoszenie\n \n \n \n \n \n "
+      short_description: "To jest reklama"
     inappropriate:
       title: "Niewłaściwe"
       description: 'Ten temat zawiera treści, które rozsądna osoba uznałaby za agresywne, obrażliwe lub sprzeczne z <a href="%{base_path}/guidelines">wytycznymi naszej społeczności</a>.'
@@ -1035,7 +1058,7 @@ pl_PL:
         remove: "Ten temat nie jest już banerem. Nie będzie pojawiać się na górze każdej strony."
   unsubscribed:
     title: "Zaktualizowano preferencje e-mail!"
-    description: "preferencje mailowe dla <b>%{email}</b>zostały zapisane. Aby zmienić ustawienia mailowe <a href='%{url}'>zajrzyj do ustawień użytkownika</a>."
+    description: "preferencje e-mailowe dla <b>%{email}</b> zostały zapisane. Aby zmienić ustawienia e-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 tematu."
   uploads:
@@ -1048,7 +1071,7 @@ pl_PL:
     mailing_list_mode: "Wyłącz tryb listy mailingowej"
     all: "Nie wysyłaj mi żadnych wiadomości z %{sitename}"
     different_user_description: "Jesteś zalogowany jako inny użytkownik niż ten do którego wysłano wysłaliśmy emaila. proszę wyloguj się, lub przejść do trybu incognito i spróbuj ponownie."
-    not_found_description: "Przepraszamy: nie mogliśmy Cię wypisać. Możliwe, że link wysłany w wiadomości email wygasł."
+    not_found_description: "Przepraszamy: nie mogliśmy Cię wypisać z subskrypcji. Możliwe, że link wysłany w wiadomości email wygasł."
     log_out: "Wyloguj"
     submit: "Zapisz ustawienia"
     digest_frequency:
@@ -1424,31 +1447,29 @@ pl_PL:
     facebook_config_warning: 'Serwer jest skonfigurowany tak, aby zezwalać na rejestrację i logowanie za pomocą Facebooka (enable_facebook_logins), ale identyfikator aplikacji i jej sekret 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 zezwalać na rejestrację i logowanie za pomocą Twittera (enable_twitter_logins), ale wartości dla klucza i sekretu 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 zezwalać na rejestrację i logowanie za pomocą GitHub (enable_github_logins), ale identyfikator klienta oraz jego sekret 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> .'
+    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>.'
+    s3_cdn_warning: 'Serwer jest skonfigurowany do przesyłania plików do S3, ale nie skonfigurowano S3 CDN. Może to prowadzić do wysokich kosztów S3 i spowolnienia działania witryny. <a href="https://meta.discourse.org/t/-/148916" target="_blank">Zobacz "Używanie Object Storage do wysyłania", 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>."
+      one: "Email polling wygenerował 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."
+    missing_mailgun_api_key: "Serwer jest skonfigurowany do wysyłania wiadomości e-mail za pośrednictwem Mailgun, ale nie podałeś/łaś klucza API używanego do weryfikacji wiadomości z webhooka."
+    bad_favicon_url: "Favicon nie ładuje się. Sprawdź ustawienia favicon w <a href='%{base_path}/admin/site_settings'>Ustawieniach witryny</a>."
+    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."
+    force_https_warning: "Twoja strona korzysta z SSL. Ale `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` nie jest jeszcze włączone w ustawieniach strony."
     out_of_date_themes: "Aktualizacje są dostępne dla następujących motywów:"
     unreachable_themes: "Nie byliśmy w stanie sprawdzić aktualizacji następujących tematów:"
-    watched_word_regexp_error: "Wyrażenie regularne dla 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:
     display_local_time_in_user_card: "Wyświetl czas lokalny w oparciu o strefę czasową użytkownika po otwarciu karty użytkownika."
     censored_words: "Wskazane słowa będą automatycznie zamieniane na &#9632;&#9632;&#9632;&#9632;"
     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> ."
+    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 anonimowych użytkowników na podstawie nagłówków języka z ich przeglądarki"
     support_mixed_text_direction: "Obsługa mieszanych wskazówek tekstowych od lewej do prawej i od prawej do lewej."
@@ -1457,7 +1478,7 @@ pl_PL:
     min_personal_message_post_length: "Minimalna długość treści wiadomości "
     max_post_length: "Maksymalna długość wpisu, w znakach"
     topic_featured_link_enabled: "Włącz dodawanie linków w tematach."
-    show_topic_featured_link_in_digest: "Pokazuj polecany link tematu w podsumowaniu mailowym."
+    show_topic_featured_link_in_digest: "Pokazuj polecany link tematu w podsumowaniu e-mailowym."
     min_topic_views_for_delete_confirm: "Minimalna liczba wyświetleń, które musi mieć wątek aby pojawił się po usunięciu okna potwierdzającego"
     min_topic_title_length: "Minimalna długość tytułu tematu, w znakach"
     max_topic_title_length: "Maksymalna długość tytułu tematu, w znakach"
@@ -1471,20 +1492,18 @@ 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."
     allow_duplicate_topic_titles_category: "Zezwalaj na tematy z identycznymi, zduplikowanymi tytułami, jeśli kategoria jest inna. Opcja allow_duplicate_topic_titles musi mieć wartość false."
-    unique_posts_mins: "Ile minut musi upłynąć zanim użytkownik będzie mógł ponownie zrobić wpis z tą samą treścią"
+    unique_posts_mins: "Ile minut musi upłynąć zanim użytkownik będzie mógł/mogła ponownie zrobić wpis z tą samą treścią"
     educate_until_posts: "Wyświetlaj okno edukacyjne po rozpoczęciu pisania dopóki nowy użytkownik nie napisze tylu wpisów."
     title: "Nazwa tej strony używana w tagu title."
     site_description: "Opis strony w jednym zdaniu, wykorzystywany w meta tagu description."
     short_site_description: "Krótki opis, użyty w tytule na stronie głównej."
     contact_email: "Adres e-mail 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."
+    contact_url: "Adres URL kontaktu dla tej witryny. Wyświetlany na stronie <a href='%{base_path}/about' target='_blank'>/about</a> dla pilnych spraw."
     crawl_images: "Pobieraj grafiki ze zdalnych URLi aby ustawić poprawną wysokość i szerokość w tagu img."
     download_remote_images_to_local: "Pobieraj zdalne grafiki i twórz ich lokalne kopie aby zapobiegać uszkodzonym/brakującym obrazkom na stronach."
     download_remote_images_threshold: "Minimalna ilość wolnego miejsca na dysku wymagana przez funkcję pobierania zdalnych grafik (w procentach)"
@@ -1513,7 +1532,7 @@ pl_PL:
     allowed_inline_onebox_domains: "Lista domen, które zostaną zamienione na osadzony onebox w zmniejszonej formie, jeśli będą umieszczone w poście bez tytułu"
     enable_inline_onebox_on_all_domains: "Ignoruj ustawienie witryny `inline_onebox_domain_whitelist` i zezwalaj na osadzanie ramek 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 we wpisie."
+    max_oneboxes_per_post: "Maksymalna ilość oneboxów we wpisie."
     facebook_app_access_token: "Token wygenerowany z Twojego identyfikatora aplikacji Facebook i sekret. Używany do generowania osadzonych oneboxów z serwisu Instagram."
     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."
@@ -1524,7 +1543,8 @@ pl_PL:
     mobile_logo_dark: "Ciemna alternatywa dla ustawienia witryny 'mobile 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."
+    manifest_screenshots: "Zrzuty ekranu, które pokazują możliwości i funkcjonalność Twojej instancji na stronie instalacyjnej. Wszystkie obrazy powinny być przesłane lokalnie i o tych samych wymiarach."
+    favicon: "Favicona dla Twojej strony, zobacz <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Aby działała poprawnie poprzez CDN, musi to być w formacie png. Zostanie przeskalowana do 32x32. Jeśli pozostanie pusta, zostanie użyte large_icon."
     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."
@@ -1533,8 +1553,8 @@ pl_PL:
     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: "Wymusza na użytkownikach włączenie uwierzytelniania dwuskładnikowego. Wybierz opcję 'wszystkie', aby wymusić na wszystkich użytkownikach. Wybierz 'personel', aby wymusić tylko użytkownikach z personelu."
-    force_https: "Wymuś używanie wyłącznie HTTPS na stronie. UWAGA: NIE włączaj tego dopóki nie zweryfikujesz, że HTTPS jest w pełni skonfigurowany i działa absolutnie wszędzie! Czy sprawdziłeś 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."
+    force_https: "Wymuś używanie wyłącznie HTTPS na stronie. UWAGA: NIE włączaj tego dopóki nie zweryfikujesz, że HTTPS jest w pełni skonfigurowany i działa absolutnie wszędzie! Czy sprawdziłeś/łaś swoje CDN, loginy z portali społecznościowych i wszystkie zewnętrzne loga / zależności żeby być pewnym, że są kompatybilne z HTTPS?"
+    same_site_cookies: "Używaj plików cookie tej samej witryny, eliminując wszystkie wektory Cross Site Request Forgery w obsługiwanych przeglądarkach (Lax lub Strict). Ostrzeżenie: ścisłe będzie działać tylko w witrynach, które wymagają logowania i używają zewnętrznej metody uwierzytelniania."
     summary_score_threshold: "Minimalny wynik wpisu wymagany do umieszczenia go w 'Podsumowaniu tematu'"
     summary_posts_required: "Minimalna liczba wpisów w temacie przed „Podsumowaniem tego tematu” jest włączona. Zmiany tego ustawienia zostaną zastosowane z mocą wsteczną w ciągu tygodnia."
     summary_likes_required: "Minimalna liczba polubień w temacie przed włączeniem „Podsumuj ten temat”. Zmiany tego ustawienia zostaną zastosowane z mocą wsteczną w ciągu tygodnia."
@@ -1544,7 +1564,7 @@ pl_PL:
     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"
     enable_chunked_encoding: "Włącz odpowiedzi fragmentaryczne serwera. Ta funkcja działa w większości konfiguracji, jednak niektóre serwery proxy mogą buforować odpowiedzi, powodując opóźnienia."
-    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_base_url: "Podstawowy URL używany dla long polling (kiedy CDN dostarcza dynamicznych treści, upewnij się że ustawiłeś/łaś 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)"
     polling_interval: "Kiedy nie long polling, jak często zalogowani klienci powinni poll w milisekundach"
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
@@ -1552,7 +1572,7 @@ pl_PL:
     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ć wpis ukryty w wyniku oflagowania przez społeczność"
+    cooldown_minutes_after_hiding_posts: "Liczba minut, ile musi odczekać użytkownik, zanim będzie mógł/mogła edytować wpis 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 wpisu"
     max_replies_in_first_day: "Maksymalna liczba odpowiedzi, jakie może stworzyć użytkownik w trakcie 24 godzin po utworzeniu pierwszego wpisu"
     tl2_additional_likes_per_day_multiplier: "Zwiększ limit polubień na dzień dla tl2 (członek), mnożąc przez tę liczbę"
@@ -1572,6 +1592,7 @@ pl_PL:
     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."
+    review_every_post: "Wszystkie posty muszą zostać sprawdzone. OSTRZEŻENIE! NIE ZALECA SIĘ DLA RUCHLIWYCH WITRYN."
     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. "
     persistent_sessions: "Użytkownicy pozostaną zalogowani po zamknięciu przeglądarki internetowej"
     maximum_session_age: "Użytkownik zostanie zalogowany przez n godzin od czasu ostatniej wizyty."
@@ -1595,6 +1616,7 @@ pl_PL:
     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_frame_ancestors: "Określ, kto może osadzić tę witrynę w ramkach iframe za pośrednictwem CSP. Kontroluj dozwolone hosty w <a href='%{base_path}/admin/customize/embedding'>ustawieniach osadzania</a>"
     content_security_policy_script_src: "Dodatkowe dozwolone źródła skryptów. Bieżący host i CDN są domyślnie uwzględniane. 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 zabezpieczeń zawartości (CSP).</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"
@@ -1622,13 +1644,13 @@ pl_PL:
     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> ."
+    allow_index_in_robots_txt: "W pliku robots.txt określ, że ta witryna może być indeksowana przez wyszukiwarki internetowe. W wyjątkowych przypadkach możesz trwale <a href='%{base_path}/admin/customize/robots'>zastąpić plik robots.txt</a>."
     blocked_email_domains: "Lista domen poczty e-mail rozdzielonych pionową kreską, z których użytkownicy nie mogą rejestrować kont. Przykład: mailinator.com|trashmail.net"
     allowed_email_domains: "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 tutaj nie będą mogli się zarejestrować!"
     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>"
+    version_checks: "Wyślij ping do Discourse Hub w celu uzyskania aktualizacji wersji i pokaż komunikaty o nowej wersji w panelu <a href='%{base_path}/admin' target='_blank'>admina</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."
@@ -1642,27 +1664,24 @@ pl_PL:
     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ł."
-    external_auth_skip_create_confirm: Podczas rejestracji przez zewnętrzne uwierzytelnianie pomiń wyskakujące okienko tworzenia konta. Najlepiej używać razem z sso_overrides_email, sso_overrides_username oraz sso_overrides_name.
-    external_auth_immediately: "Automatycznie przekieruj do zewnętrznego systemu logowania bez interakcji użytkownika. To staje się skuteczne tylko wtedy, gdy login_required ma wartość true i istnieje tylko jedna zewnętrzna metoda uwierzytelniania"
-    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: "Zastępuje lokalny e-mail adresem z witryny SSO przy każdym logowaniu i zapobiega zmianom lokalnym. Dotyczy wszystkich dostawców uwierzytelniania. (OSTRZEŻENIE: mogą wystąpić rozbieżności z powodu normalizacji lokalnych e-maili)"
-    sso_overrides_username: "Zastępuje lokalną nazwę użytkownika nazwą użytkownika z witryny zewnętrznej SSO przy każdym logowaniu i zapobiega zmianom lokalnym. Dotyczy wszystkich dostawców uwierzytelniania. (OSTRZEŻENIE: mogą wystąpić rozbieżności ze względu na różnice w długości/wymaganiach nazwy użytkownika)"
-    sso_overrides_name: "Zastępuje pełną nazwę lokalną na otrzymaną z witryny zewnętrznej SSO przy każdym logowaniu i zapobiegaj zmianom lokalnym. Dotyczy wszystkich dostawców uwierzytelniania."
-    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_location: "Zastąp określoną lokalizację użytkownika danymi z SSO i zapobiegaj ich zmianie"
-    sso_overrides_website: "Zastępuje witrynę użytkownika danymi z SSO i zapobiega ich modyfikacji."
-    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."
+    auth_skip_create_confirm: Podczas rejestracji przez zewnętrzne uwierzytelnianie pomiń wyskakujące okienko tworzenia konta. Najlepiej używać razem z auth_overrides_email, auth_overrides_username i auth_overrides_name.
+    auth_immediately: "Automatyczne przekierowanie do zewnętrznego systemu logowania bez interakcji użytkownika. Działa to tylko wtedy, gdy login_required ma wartość true i istnieje tylko jedna zewnętrzna metoda uwierzytelniania"
+    enable_discourse_connect: "Włącz logowanie przez DiscourseConnect (dawniej „Discourse SSO”) (OSTRZEŻENIE: ADRESY E-MAIL UŻYTKOWNIKÓW *MUSZĄ* BYĆ ZATWIERDZONE PRZEZ WITRYNĘ ZEWNĘTRZNĄ!)"
+    verbose_discourse_connect_logging: "Rejestruj szczegółowe informacje diagnostyczne związane z DiscourseConnect na <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    enable_discourse_connect_provider: "Wdrożenie protokołu dostawcy DiscourseConnect (dawniej 'Discourse SSO') w punkcie końcowym /session/sso_provider, który wymaga ustawienia discourse_connect_provider_secrets"
+    discourse_connect_url: "Adres URL punktu końcowego DiscourseConnect (musi zawierać http:// lub https://)"
+    discourse_connect_secret: "Sekretny ciąg znaków używany do uwierzytelniania kryptograficznego informacji DiscourseConnect, upewnij się, że ma 10 lub więcej znaków"
+    discourse_connect_overrides_bio: "Zastępuje biografię użytkownika w profilu użytkownika i uniemożliwia jej zmianę"
+    discourse_connect_overrides_groups: "Synchronizuj wszystkie ręczne członkostwo w grupie z grupami określonymi w atrybucie grup (OSTRZEŻENIE: jeśli nie określisz grup, wszystkie ręczne członkostwo w grupie zostanie wyczyszczone dla użytkownika)"
+    auth_overrides_username: "Zastępuje lokalną nazwę użytkownika nazwą użytkownika witryny zewnętrznej przy każdym logowaniu i zapobiega lokalnym zmianom. Dotyczy wszystkich dostawców uwierzytelniania. (OSTRZEŻENIE: mogą wystąpić rozbieżności ze względu na różnice w długości/wytycznych nazwy użytkownika)"
+    auth_overrides_name: "Zastępuje pełną nazwę lokalną pełną nazwą witryny zewnętrznej przy każdym logowaniu i zapobiega zmianom lokalnym. Dotyczy wszystkich dostawców uwierzytelniania."
+    discourse_connect_overrides_avatar: "Zastępuje awatar użytkownika awatarem witryny zewnętrznej z zapytania DiscourseConnect. Jeśli ta opcja jest włączona, użytkownicy nie będą mogli przesyłać awatarów na Discourse."
+    discourse_connect_overrides_location: "Zastępuje lokalizację użytkownika lokalizacją zewnętrzną z zapytania DiscourseConnect i zapobiega zmianom lokalnym."
+    discourse_connect_overrides_website: "Zastępuje witrynę użytkownika zewnętrzną lokalizacją z zapytania DiscourseConnect i zapobiega zmianom lokalnym."
+    discourse_connect_overrides_profile_background: "Zastępuje tło profilu użytkownika awatarem witryny zewnętrznej z zapytania DiscourseConnect."
+    discourse_connect_overrides_card_background: "Zastępuje tło karty użytkownika awatarem witryny zewnętrznej z zapytania DiscourseConnect."
+    discourse_connect_not_approved_url: "Przekieruj niezatwierdzone konta DiscourseConnect do tego adresu URL"
+    discourse_connect_allows_all_return_paths: "Nie ograniczaj domeny do return_paths dostarczanych przez DiscourseConnect (domyślnie ścieżka zwrotna musi znajdować się w bieżącej witrynie)"
     enable_local_logins_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."
@@ -1705,7 +1724,6 @@ pl_PL:
     top_topics_formula_log_views_multiplier: "wartość mnożnika odsłon dziennik (n) w tematach formuła : `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: "wartość mnożnika polubień pierwszego wpisu (n) w tematach formuła: `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: "wartość mnożnika najmniejszej liczby polubień na wpis w (n) tematach formuła: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Liczba starych wpisów, które są ponownie wypalane co 15 minut."
     enable_safe_mode: "Zezwól użytkownikom na wchodzenie do trybu awaryjnego w celu debudowania wtyczek."
     rate_limit_create_topic: "Po otworzeniu tematu użytkownicy muszą odczekać (n) sekund, zanim otworzą inny temat."
     rate_limit_create_post: "Po napisaniu wpisu użytkownicy muszą odczekać (n) sekund, zanim napiszą inny wpis."
@@ -1721,9 +1739,10 @@ pl_PL:
     max_topic_invitations_per_day: "Maksymalna dzienna liczba zaproszeń do tematu, jakie może wysłać użytkownik."
     max_logins_per_ip_per_hour: "Maksymalna liczba logowań dozwolona per adres IP na godzinę"
     max_logins_per_ip_per_minute: "Maksymalna liczba logowań dozwolona per adres IP na minutę"
-    max_post_deletions_per_minute: "Maksymalna liczba wpisów, które użytkownik może usunąć w minutę."
-    max_post_deletions_per_day: "Maksymalna liczba wpisów, które użytkownik może usunąć jednego dnia."
+    max_post_deletions_per_minute: "Maksymalna liczba postów, które użytkownik może usunąć w ciągu minuty. Ustaw na 0, aby wyłączyć usuwanie postów."
+    max_post_deletions_per_day: "Maksymalna liczba postów, które użytkownik może usunąć dziennie. Ustaw na 0, aby wyłączyć usuwanie postów."
     invite_link_max_redemptions_limit: "Maksymalna dozwolona liczba przypadków wykorzystania linków z zaproszeniem nie może przekraczać tej wartości."
+    invite_link_max_redemptions_limit_users: "Maksymalna dozwolona liczba przypadków wykorzystania linków z zaproszeniami generowanych przez zwykłych użytkowników nie może przekraczać tej wartości."
     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)."
@@ -1745,6 +1764,8 @@ pl_PL:
     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}"
+    external_emoji_url: "Adres URL zewnętrznej usługi dla obrazów emoji. Pozostaw puste, aby wyłączyć."
+    use_site_small_logo_as_system_avatar: "Użyj małego logo witryny zamiast awatara użytkownika system. Wymaga obecności logo."
     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."
@@ -1756,7 +1777,6 @@ pl_PL:
     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."
     tl1_requires_topics_entered: "Jak wiele tematów musi odwiedzić nowy użytkownik, przed promocją na 1-szy poziom zaufania."
@@ -1790,6 +1810,7 @@ pl_PL:
     min_trust_to_edit_post: "Minimalny poziom zaufania potrzebny do edytowania wpisów."
     min_trust_to_allow_self_wiki: "Wymagany poziom zaufania, by wpis użytkownika uczynić wiki."
     min_trust_to_send_messages: "Minimalny poziom zaufania wymagany do tworzenia wiadomości prywatnych."
+    min_trust_to_send_email_messages: "Minimalny poziom zaufania jest wymagany do wysyłania osobistych wiadomości pocztą e-mail."
     min_trust_to_flag_posts: "Minimalny poziom zaufania potrzebny do flagowania wpisów"
     min_trust_to_post_links: "Minimalny poziom zaufania potrzebny do umieszczania linków we wpisach"
     min_trust_to_post_embedded_media: "Minimalny poziom zaufania wymagany do osadzania elementów multimedialnych w poście"
@@ -1804,10 +1825,10 @@ pl_PL:
     newuser_max_mentions_per_post: "Maksymalna liczba powiadomień poprzez @nazwę w jednym wpisie (dla nowych użytkowników)."
     newuser_max_replies_per_topic: "Maksymalna liczba odpowiedzi, jakie nowy użytkownik może dodać w pojedynczym temacie zanim ktoś odpowie."
     max_mentions_per_post: "Maksymalna liczba powiadomień poprzez @nazwę w jednym wpisie (dla wszystkich)."
-    max_users_notified_per_group_mention: "Maksymalna liczba użytkowników, którzy mogą otrzymać powiadomienie jeśli ktoś wspomniał o grupie (jeśli próg został osiągnięty, nie będzie żadnych powiadomień)"
+    max_users_notified_per_group_mention: "Maksymalna liczba użytkowników, którzy mogą otrzymać powiadomienie jeśli ktoś wspomniał(a) o grupie (jeśli próg został osiągnięty, nie będzie żadnych powiadomień)"
     enable_mentions: "Zezwól użytkownikom na wzmianki innych użytkowników."
     create_thumbnails: "Stwórz miniatury i obrazy lightbox, które są za duże, aby pasować do wpisu."
-    email_time_window_mins: "Odczekaj (n) minut przed wysłaniem maila z powiadomieniem, aby dać użytkownikom szansę na edytowanie i ukończenie wpisów."
+    email_time_window_mins: "Odczekaj (n) minut przed wysłaniem e-maila z powiadomieniem, aby dać użytkownikom szansę na edytowanie i ukończenie wpisów."
     personal_email_time_window_seconds: "Poczekaj (n) sekund przed wysłaniem powiadomienia na e-mail o prywatnej wiadomości, by użytkownicy mogli edytować i dokończyć swoje wiadomości."
     email_posts_context: "Jak wiele poprzednich wiadomości zawrzeć jako kontekst i emailu powiadamiającym."
     flush_timings_secs: "W sekundach, jak często wysyłamy dane czasowe na serwer."
@@ -1816,6 +1837,7 @@ pl_PL:
     body_min_entropy: "Minimalna entropia treści wpisu (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 wpisu."
     max_consecutive_replies: "Liczba wpisów, które użytkownik musi wykonać w jednym rzędzie w temacie, zanim nie będzie można dodać kolejnej odpowiedzi."
+    enable_filtered_replies_view: 'Przycisk "(n) odpowiedzi" zwija wszystkie pozostałe posty i pokazuje tylko bieżący post i jego 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."
@@ -1823,14 +1845,14 @@ pl_PL:
     category_style: "Styl etykiet kategorii"
     default_dark_mode_color_scheme_id: "Schemat kolorów używany w trybie ciemnym."
     dark_mode_none: "Brak"
-    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_image_size_kb: "Maksymalny rozmiar przesyłanego obrazu w kB. Należy to również skonfigurować w nginx (client_max_body_size) / apache lub proxy. Obrazy większe niż ta wartość 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 tematów, jaka zostanie wyświetlona nad oknem edytora podczas tworzenia nowego tematu. Tematy 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_prettify: "Zapobiegaj typowym literówkom i błędom w tytułach, takimi jak cały tekst wielkimi literami, rozpoczęcie małą literą, wiele ! i ?, dodatkowa . na końcu, itp."
     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 „wpis 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."
@@ -1849,7 +1871,7 @@ pl_PL:
     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 wpisów `newuser_spam_host_threshold` przed rozważeniem spamu."
+    newuser_spam_host_threshold: "Jak wiele razy użytkownik może zamieścić link do tego samego hosta wewnątrz wpisów `newuser_spam_host_threshold` przed rozważeniem spamu."
     allowed_spam_host_domains: "Lista domen wykluczonych z testowania pod kątem spamu. Nowi użytkownicy nigdy nie będą ograniczani w dodawaniu wpisów z linkami do tych domen."
     staff_like_weight: "Jaką wagę polubienia przypisuje się personelowi (użytkownicy mają wagę 1)"
     topic_view_duration_hours: "Licz wyświetlanie nowego tematu na IP/Użytkownika co N godzin"
@@ -1881,14 +1903,14 @@ pl_PL:
     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"
+    unsubscribe_via_email_footer: "Dołącz link mailto: do anulacji subskrypcji przez e-mail do stopki wysłanych e-maili"
     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."
+    max_emails_per_day_per_user: "Maksymalna liczba e-maili, jakie użytkownik może wysłać w ciągu dnia. 0 wyłącza ograniczenie."
+    enable_staged_users: "Automatycznie twórz użytkowników etapowych podczas przetwarzania przychodzących wiadomości e-mail."
+    maximum_staged_users_per_email: "Maksymalna liczba użytkowników etapowych utworzonych podczas przetwarzania przychodzącej wiadomości e-mail."
     auto_generated_allowlist: "Lista adresów e-mail, które nie będą sprawdzane pod kątem zawartości generowanej automatycznie. Przykład: foo@bar.com|discourse@bar.com"
-    block_auto_generated_emails: "Odrzucaj maile przychodzące zidentyfikowane jako wysłane automatycznie."
+    block_auto_generated_emails: "Odrzucaj przychodzące e-maile zidentyfikowane jako generowane automatycznie."
     ignore_by_title: "Ignoruj przychodzące wiadomości e-mail w oparciu o ich tytuł."
     mailgun_api_key: "Klucz Mailgun Secret API używany do weryfikacji wiadomości webhook."
     soft_bounce_score: "Wynik odrzucania dodany do użytkownika, gdy ma miejsce tymczasowe odrzucanie."
@@ -1898,9 +1920,8 @@ pl_PL:
     blocked_attachment_content_types: "Lista słów kluczowych używanych do blokowania załączników na podstawie typu zawartości."
     blocked_attachment_filenames: "Lista słów kluczowych używanych do blokowania załączników na podstawie nazwy 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."
+    always_show_trimmed_content: "Zawsze pokazuj przyciętą część przychodzących e-maili. UWAGA: może ujawniać adresy e-mail."
     private_email: "Nie umieszczaj treści z wpisów lub tematów w tytule lub treści e-maila. UWAGA: wyłącza także przetrawianie wiadomości e-mail."
-    email_total_attachment_size_limit_kb: "Maksymalny 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 wpisów"
     raw_email_max_length: "Ile znaków należy przechowywać dla przychodzących wiadomości e-mail."
     raw_rejected_email_max_length: "Ile znaków należy przechowywać dla odrzuconego przychodzącego e-maila."
@@ -1913,7 +1934,7 @@ pl_PL:
     pop3_polling_port: "Port do przeglądania cyklicznego konta POP3."
     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_password: "Hasło dla konta POP3 do cyklicznego pobierania e-maili."
     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.'
@@ -1942,17 +1963,17 @@ pl_PL:
     allow_uploaded_avatars: "Zezwól użytkownikom na przesyłanie niestandardowych zdjęć profilowych."
     default_avatars: "Adresy URL awatarów wykorzystywanych jako domyślne w przypadku nowych użytkowników do momentu, gdy je zmienią."
     automatically_download_gravatars: "Pobierz Gravatary dla użytkowników podczas tworzenia konta lub zmiany hasła."
-    digest_topics: "Maksymalna liczba popularnych tematów wyświetlanych w podsumowaniu mailowym."
-    digest_posts: "Maksymalna liczba popularnych wpisów wyświetlanych w podsumowaniu mailowym."
-    digest_other_topics: "Maksymalna liczba tematów wyświetlanych w sekcji \"Śledzone tematy i kategorie\" podsumowania mailowego."
+    digest_topics: "Maksymalna liczba popularnych tematów wyświetlanych w podsumowaniu e-mailowym."
+    digest_posts: "Maksymalna liczba popularnych postów wyświetlanych w podsumowaniu e-mailowym."
+    digest_other_topics: "Maksymalna liczba tematów wyświetlanych w sekcji \"Śledzone tematy i kategorie\" podsumowania e-mailowego."
     digest_min_excerpt_length: "Minimalny wycinek wpisu (liczba znaków) w podsumowaniu e-mail."
     suppress_digest_email_after_days: "Znieś emaile podsumowujące dla użytkowników niewidocznych na stronie przez więcej niż (n) dni."
     digest_suppress_categories: "Znieś te kategorie z emaili podsumowujących."
-    disable_digest_emails: "Wyłącz podsumowania mailowe dla wszystkich użytkowników."
+    disable_digest_emails: "Wyłącz podsumowania e-mailowe dla wszystkich użytkowników."
     apply_custom_styles_to_digest: "Niestandardowe szablony wiadomości e-mail i css są stosowane do wiadomości e-mail z podsumowaniem."
     email_accent_bg_color: "Kolor akcentu używany jako tło niektórych elementów w wiadomościach HTML. Wprowadź angielską nazwę koloru ('red') lub wartość szesnastkową ('#FF0000')."
-    email_accent_fg_color: "Kolor tekstu wyświetlanego na kolorowym tle w mailach wysyłanych w trybie HTML. Wprowadź angielską nazwę koloru HTML (\"white\") lub wartość szesnastkową (\"#ffffff\")."
-    email_link_color: "Kolor linków w mailach wysyłanych w trybie HTML. Wprowadź angielską nazwę koloru HTML (\"blue\") lub wartość szesnastkową (\"#0000ff\")."
+    email_accent_fg_color: "Kolor tekstu wyświetlanego na kolorowym tle w e-mailach wysyłanych w trybie HTML. Wprowadź angielską nazwę koloru HTML (\"white\") lub wartość szesnastkową (\"#ffffff\")."
+    email_link_color: "Kolor linków w e-mailach wysyłanych w trybie HTML. Wprowadź angielską nazwę koloru HTML (\"blue\") lub wartość szesnastkową (\"#0000ff\")."
     detect_custom_avatars: "Czy sprawdzać, czy użytkownik wgrał własne zdjęcie profilowe?"
     max_daily_gravatar_crawls: "Maksymalna liczba razy Discourse sprawdzi Gravatar w poszukiwaniu nowych niestandardowych avatorów w czasie jednego dnia"
     public_user_custom_fields: "Lista niestandardowych pól użytkownika, które można uzyskać korzystających z interfejsu API."
@@ -2025,16 +2046,16 @@ pl_PL:
     show_create_topics_notice: "Jeśli na stronie jest mniej niż 5 publicznych tematów, pokaż powiadomienie proszące adminów, aby stworzyli nowe tematy."
     delete_drafts_older_than_n_days: "Usuń projekty starsze niż (n) dni."
     bootstrap_mode_min_users: "Minimalna liczba użytkowników potrzebnych do wyłączenia trybu rozruchowego (ustaw 0, aby wyłączyć)"
-    prevent_anons_from_downloading_files: "Zapobiegaj pobieraniu załączników przez anonimowych użytkowników. Ostrzeżenie: wszystkie dodane załączniku nie będące obrazkami nie będą działały."
+    prevent_anons_from_downloading_files: "Zablokuj możliwość pobierania załączników przez anonimowych użytkowników."
     secure_media: 'Ogranicza dostęp do WSZYSTKICH przesłanych plików (obrazów, wideo, audio, tekstu, plików PDF, zip i innych). Jeśli opcja „wymagane logowanie” jest włączona, tylko zalogowani użytkownicy mają dostęp do przesyłanych plików. W przeciwnym razie dostęp będzie ograniczony tylko do przesłanych multimediów w wiadomościach prywatnych i kategoriach prywatnych. OSTRZEŻENIE: to ustawienie jest złożone i wymaga głębokiego zrozumienia administracyjnego. Zobacz <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">ten artykuł</a>, aby dowiedzieć się więcej.'
     secure_media_allow_embed_images_in_emails: "Umożliwia osadzanie bezpiecznych obrazów, które normalnie byłyby redagowane w wiadomościach e-mail, jeśli ich rozmiar jest mniejszy niż ustawienie'secure media max email embed image size kb'."
     secure_media_max_email_embed_image_size_kb: "Limit rozmiaru dla zabezpieczonych obrazów, które zostaną osadzone w wiadomości e-mail, gdy włączone jest ustawienie 'secure media allow embed in emails'. Bez tego ustawienia podany limit nie ma zastosowania."
     slug_generation_method: "Wybierz metodę tworzenia ślimaka. 'Zakodowane\" stworzy procentowy ciąg kodujący, \"żadne\" wyłączy tą metodę."
     enable_emoji: "Włącz obsługę emoji"
-    enable_emoji_shortcuts: "Typowe tekstowe buźki, takie jak :) :p :( zostaną przekonwertowany na emotikony"
+    enable_emoji_shortcuts: "Typowe tekstowe buźki, takie jak :) :p :( zostaną przekonwertowane na emoji"
     emoji_set: "Jaki jest twój preferowany styl emoji?"
     emoji_autocomplete_min_chars: "Minimalna liczba znaków wymagana do wywołania wyskakującego okienka z autouzupełnianiem"
-    enable_inline_emoji_translation: "Włącza tłumaczenie wbudowanych emotikonów (bez spacji i znaków interpunkcyjnych przed)"
+    enable_inline_emoji_translation: "Włącza tłumaczenie wbudowanych emoji (bez spacji i znaków interpunkcyjnych przed)"
     approve_post_count: "Liczba wpisów od nowego lub podstawowego użytkownika, które muszą zostać zatwierdzone"
     approve_unless_trust_level: "Wpisy użytkowników poniżej tego poziomu zaufania muszą być zatwierdzane"
     approve_new_topics_unless_trust_level: "Nowe tematy dodawane przez użytkowników z poziomem zaufania poniżej muszą zostać zaakceptowane"
@@ -2046,6 +2067,7 @@ pl_PL:
     code_formatting_style: "Przycisk kodu w kompozytorze narzuci domyśl styl formatowania dla tego kodu"
     max_allowed_message_recipients: "Maksymalna dozwolona liczba odbiorców dla wiadomości."
     watched_words_regular_expressions: "Obserwowane słowa są wyrażeniami regularnymi."
+    enable_diffhtml_preview: "Funkcja eksperymentalna, która używa dyfHTML do synchronizacji podglądu zamiast pełnego renderowania"
     old_post_notice_days: "Dni przed tym, jak ogłoszenie pocztowe stanie się stare"
     new_user_notice_tl: "Minimalny poziom zaufania wymagany do wyświetlania powiadomień o wpisach nowych użytkowników."
     returning_user_notice_tl: "Minimalny poziom zaufania wymagany do wyświetlania powiadomień o postach powracających użytkowników."
@@ -2054,13 +2076,14 @@ pl_PL:
     blur_tl0_flagged_posts_media: "Rozmyj oflagowane obrazy z postów, aby ukryć potencjalną zawartość dla dorosłych (NSFW)."
     enable_page_publishing: "Zezwól personelowi na publikowanie tematów pod nowymi adresami URL z własnym stylem."
     show_published_pages_login_required: "Anonimowi użytkownicy mogą przeglądać opublikowane strony, nawet gdy wymagane jest zalogowanie."
+    skip_auto_delete_reply_likes: "Podczas automatycznego usuwania starych odpowiedzi pomiń usuwanie postów z taką lub większą liczbą polubień."
     default_email_digest_frequency: "Domyślnie, jak często użytkownicy otrzymują emaile podsumowujące."
-    default_include_tl0_in_digests: "Domyślnie uwzględniaj wpisy od nowych użytkowników w podsumowaniach mailowych. Użytkownicy mogą dokonywać zmian w swoich ustawieniach."
+    default_include_tl0_in_digests: "Domyślnie uwzględniaj posty od nowych użytkowników w podsumowaniach e-mailowych. Użytkownicy mogą zmienić to w swoich ustawieniach."
     default_email_level: "Ustaw domyślny poziom powiadomień e-mail dla zwykłych tematów."
     default_email_messages_level: "Ustaw domyślny poziom powiadomień e-mail, gdy ktoś napisze odpowiedź dla użytkownika."
     default_email_mailing_list_mode: "Domyślnie wyślij email dla każdego nowego wpisu."
-    default_email_mailing_list_mode_frequency: "Domyślnie użytkownicy, którzy włączą tryb listy mailingowej będą otrzymywać emaile tak często."
-    disable_mailing_list_mode: "Nie pozwól użytkownikom na aktywacja trybu listy mailingowej."
+    default_email_mailing_list_mode_frequency: "Domyślnie użytkownicy, którzy włączą tryb listy mailingowej będą otrzymywać e-maile tak często."
+    disable_mailing_list_mode: "Nie zezwalaj użytkownikom na włączanie trybu listy mailingowej (zapobiega wysyłaniu wiadomości e-mail z list mailingowych)."
     default_email_previous_replies: "Domyślnie uwzględniaj poprzednie odpowiedzi w emailach."
     default_email_in_reply_to: "Domyślnie uwzględniaj fragment odpowiedzi do wpisu w emailu."
     default_other_new_topic_duration_minutes: "Domyślny globalny warunek dla którego temat uznawany jest za nowy."
@@ -2090,7 +2113,6 @@ pl_PL:
     revoke_api_keys_days: "Liczba dni do automatycznego unieważnienia nieużywanego klucza API (0 oznacza brak)"
     allow_user_api_keys: "Pozwól na generację kluczy API użytkownika."
     allow_user_api_key_scopes: "Lista zakresów dozwolona dla kluczy API użytkownika."
-    max_api_keys_per_user: "Maksymalna liczba kluczy API użytkownika na użytkownika."
     min_trust_level_for_user_api_key: "Poziom zaufania wymagany dla generacji kluczy API użytkownika."
     allowed_user_api_auth_redirects: "Dozwolony adres URL do przekierowania uwierzytelniania dla kluczy interfejsu API użytkownika. Symbol wieloznaczny * może być użyty do dopasowania dowolnej jego części (np. www.example.com/*)."
     allowed_user_api_push_urls: "Dozwolone URLs dla serwera push do API użytkownika"
@@ -2100,7 +2122,6 @@ pl_PL:
     max_tags_per_topic: "Maksymalna liczba tagów, które mogą zostać połączone z tematem."
     max_tag_length: "Maksymalna liczba znaków, które mogą być użyte w tagu."
     max_tag_search_results: "Podczas wyszukiwania tagów, maksymalna liczba rezultatów do wyświetlenia."
-    show_filter_by_tag: "Pokaż rozwinięcie aby filtrować listę tematów przez tag."
     max_tags_in_filter_list: "Maksymalna liczba tagów do pokazania w rozwijanym filtrze. Pokazane będą najczęściej używane tagi."
     tags_sort_alphabetically: "Pokaż tagi w alfabetycznym porządku. Domyślne pokazywane są według popularności."
     tags_listed_by_group: "Wyświetl listę tagów według grup tagów na <a href='%{base_path}/tags' target='_blank'>liście tagów</a>."
@@ -2114,6 +2135,7 @@ pl_PL:
     governing_law: "Obowiązujące prawo"
     city_for_disputes: "Miasto dyskusji"
     shared_drafts_category: "Włącz funkcję współdzielonych szkiców przez wyznaczenie kategorii dla szkiców tematów. Tematy w tej kategorii zostaną ukryte z list tematów dla personelu."
+    shared_drafts_min_trust_level: "Zezwalaj użytkownikom na wyświetlanie i edycję wspólnych szkiców."
     push_notifications_prompt: "Wyświetl monit o zgodę użytkownika."
     push_notifications_icon: "Ikona odznaki pojawiająca się w rogu powiadomień. Zalecany jest monochromyczny PNG 96×96 z przezroczystym tłem."
     base_font: "Podstawowa czcionka używana dla większości tekstu w witrynie. Motywy można nadpisywać za pomocą niestandardowej właściwości CSS `--font-family`."
@@ -2142,7 +2164,8 @@ pl_PL:
       invalid_string_min_max: "Musi być między %{min} i %{max} znaków."
       invalid_string_min: "Musi być co najmniej %{min} znaków."
       invalid_string_max: "Musi być nie więcej niż %{max} znaków."
-      invalid_reply_by_email_address: "Wartość musi zawierać '%{reply_key}' i musi być inna niż mail z powiadomieniem."
+      invalid_json: "Nieprawidłowy JSON."
+      invalid_reply_by_email_address: "Wartość musi zawierać '%{reply_key}' i musi być inna niż e-mail z powiadomieniem."
       invalid_alternative_reply_by_email_addresses: "Wszystkie wartości muszą zawierać '%{reply_key}' i być inne niż w emailu powiadamiającym."
       pop3_polling_host_is_empty: "Musisz ustawić 'pop3 polling host' przed włączeniem przeglądania cyklicznego POP3."
       pop3_polling_username_is_empty: "Musisz ustawić 'pop3 polling username' przed włączeniem przeglądania cyklicznego POP3."
@@ -2155,8 +2178,8 @@ pl_PL:
       email_editable_enabled: "Musisz wyłączyć 'możliwość edycji emaili' przed włączeniem tych ustawień."
       staged_users_disabled: "Przed włączeniem tego ustawienia musisz najpierw włączyć 'staged users'."
       reply_by_email_disabled: "Przed włączeniem tego ustawienia musisz najpierw włączyć opcję 'reply by email'."
-      sso_url_is_empty: "Przed włączeniem tego ustawienia musisz ustawić 'sso url'."
-      sso_invite_only: "Nie możesz jednocześnie włączyć SSO i wymogu zaproszeń."
+      discourse_connect_url_is_empty: "Musisz ustawić 'discourse connect url' przed włączeniem tego ustawienia."
+      discourse_connect_invite_only: "Nie możesz włączyć DiscourseConnect i wymagać dołączenia przez zaproszenie w tym samym czasie."
       enable_local_logins_disabled: "Przed włączeniem tego ustawienia musisz najpierw włączyć opcję 'enable local logins'."
       min_username_length_exists: "Nie możesz ustawić minimalnej długości nazwy użytkownika powyżej najkrótszej nazwy użytkownika (%{username})."
       min_username_length_range: "Nie możesz ustawić minimum powyżej maksimum."
@@ -2165,19 +2188,17 @@ pl_PL:
       invalid_hex_value: "Wartości kolorów muszą być sześciocyfrowymi kodami szesnastkowymi."
       empty_selectable_avatars: "Przed włączeniem tego ustawienia należy najpierw przesłać co najmniej dwa wybrane awatary."
       category_search_priority:
-        very_low_weight_invalid: "Nie można ustawić wagi, aby była większa niż 'category_search_priority_low_weight'."
-        low_weight_invalid: "Nie możesz ustawić wagi na większą lub równą 1 lub mniejszą niż 'category_search_priority_very_low_weight'."
-        high_weight_invalid: "Nie możesz ustawić wagi na mniejszą lub równą 1 lub większą niż 'category_search_priority_very_high_weight'."
-        very_high_weight_invalid: "Nie możesz ustawić wagi na mniejszą niż 'category_search_priority_high_weight'."
+        low_weight_invalid: "Nie możesz ustawić wagi na większą lub równą 1."
+        high_weight_invalid: "Nie możesz ustawić wagi na mniejszą lub równą 1."
       allowed_unicode_usernames:
         regex_invalid: "Wyrażenie regularne jest nieprawidłowe: %{error}"
         leading_trailing_slash: "Wyrażenie regularne nie może zaczynać się ani kończyć ukośnikiem."
       unicode_usernames_avatars: "Wewnętrzne awatary systemowe nie obsługują nazw użytkowników zawierających unicode."
       list_value_count: "Lista musi zawierać dokładnie %{count} wartości."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "Sekret SSO"
+        value: "Sekret DiscourseConnect"
   search:
     extreme_load_error: "Strona jest pod ekstremalnym obciążeniem, wyszukiwanie jest wyłączone, spróbuj ponownie później"
     within_post: "#%{post_number} przez %{username}"
@@ -2188,20 +2209,22 @@ pl_PL:
     results_page: "Wyniki wyszukiwania dla '%{term}'"
     audio: "[dźwięk]"
     video: "[wideo]"
-  sso:
+  discourse_connect:
     login_error: "Błąd logowania"
-    not_found: "Nie znaleziono takiego konta. Skontaktuj się z administratorem."
-    account_not_approved: "Twoje konto oczekuje na zatwierdzenie. Gdy konto zostanie zatwierdzone, otrzymasz powiadomienie mailowe."
-    unknown_error: "Z twoim kontem jest problem. Skontaktuj się z administratorem."
-    timeout_expired: "Upłynął maksymalny czas logowania. Spróbuj ponownie."
-    no_email: "Żaden adres email nie został podany. Proszę skontaktować się z administratorem strony."
-    blank_id_error: "`external_id` jest wymagane, ale było puste"
-    email_error: "Konto nie mogło zostać zarejestrowane przy użyciu tego adresu email <b>%{email}</b>. Proszę skontaktować się z administratorem strony."
-    missing_secret: "Uwierzytelnianie SSO nie powiodło się z powodu braku sekretu. Skontaktuj się z administratorami witryny, aby rozwiązać ten problem."
+    not_found: "Nie można znaleźć Twojego konta. Skontaktuj się z administratorem serwisu."
+    account_not_approved: "Twoje konto oczekuje na zatwierdzenie. Otrzymasz powiadomienie e-mail, gdy zostanie zatwierdzone."
+    unknown_error: "Wystąpił problem z Twoim kontem. Skontaktuj się z administratorem witryny."
+    timeout_expired: "Upłynął limit czasu logowania, spróbuj zalogować się ponownie."
+    no_email: "Nie podano adresu e-mail. Skontaktuj się z administratorem witryny."
+    blank_id_error: "`external_id` jest wymagane, ale jest puste"
+    email_error: "Konto nie może być zarejestrowane pod adresem e-mail <b>%{email}</b>. Skontaktuj się z administratorem witryny."
+    missing_secret: "Uwierzytelnianie nie powiodło się z powodu braku sekretnego klucza. Skontaktuj się z administratorami, aby rozwiązać ten problem."
+    invite_redeem_failed: "Zaproszenie nie powiodło się. Skontaktuj się z administratorem serwisu."
   original_poster: "Autor pierwszego wpisu"
   most_posts: "Większość wpisów"
   most_recent_poster: "Autor najnowszego wpisu"
   frequent_poster: "Aktywny uczestnik"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "Witamy w naszej społeczności! Oto najpopularniejsze najnowsze tematy."
     not_seen_in_a_month: "Witamy ponownie! Długo tu nie zaglądałeś. Oto najpopularniejsze tematy z czasów, kiedy cię tu nie było."
@@ -2214,6 +2237,7 @@ pl_PL:
     errors:
       different_topics: "Nie można połączyć wpisów z różnych tematów."
       different_users: "Nie można połączyć wpisów różnych użytkowników."
+      max_post_length: "Nie można scalić postów, ponieważ łączna długość postów jest większa niż dozwolona."
   move_posts:
     new_topic_moderator_post:
       one: "Post został podzielony na nowy temat: %{topic_link}"
@@ -2326,7 +2350,7 @@ pl_PL:
     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."
     security_key_invalid: "Wystąpił błąd podczas weryfikacji klucza bezpieczeństwa."
-    not_approved: "Twoje konto nie zostało jeszcze aktywowane. Zostaniesz powiadomiony emailem gdy będziesz mógł się zalogować."
+    not_approved: "Twoje konto nie zostało jeszcze aktywowane. Zostaniesz powiadomiony emailem gdy będziesz mógł/mogła się zalogować."
     incorrect_username_email_or_password: "Niepoprawna nazwa użytkownika, email lub hasło"
     incorrect_password: "Nieprawidłowe hasło"
     wait_approval: "Dziękujemy za rejestrację. Powiadomimy Cię gdy Twoje konto zostanie aktywowane."
@@ -2352,7 +2376,7 @@ pl_PL:
     authenticator_error_no_valid_email: "Adresy e-mail powiązane z %{account} są niedozwolone. Musisz użyć innego adresu."
     new_registrations_disabled: "Aktualnie nie jest możliwe zarejestrowanie nowego konta."
     password_too_long: "Hasła są ograniczone do 200 znaków."
-    email_too_long: "Podałeś zbyt długi adres email. Nazwa skrzynki pocztowej nie może być dłuższa niż 254 znaki, a nazwa domeny nie może zawierać więcej niż 253 znaki."
+    email_too_long: "Podałeś/łaś zbyt długi adres email. Nazwa skrzynki pocztowej nie może być dłuższa niż 254 znaki, a nazwa domeny nie może zawierać więcej niż 253 znaki."
     wrong_invite_code: "Wprowadzony kod zaproszenia był nieprawidłowy."
     reserved_username: "Niedozwolona nazwa użytkownika."
     missing_user_field: "Nie wypełniłeś wszystkich pól użytkownika"
@@ -2373,6 +2397,18 @@ pl_PL:
   admin:
     email:
       sent_test: "wysłany!"
+    user:
+      merge_user:
+        updating_username: "Aktualizuję nazwę użytkownika ..."
+        changing_post_ownership: "Zmiana właściciela wpisu..."
+        merging_given_daily_likes: "Łączenie oddanych dziennych polubień..."
+        merging_post_timings: "Łączenie czasów postów..."
+        merging_user_visits: "Łączenie odwiedzin użytkownika..."
+        updating_site_settings: "Aktualizowanie ustawień strony..."
+        updating_user_stats: "Aktualizowanie statystyk użytkownika..."
+        merging_user_attributes: "Łączenie atrybutów użytkownika..."
+        updating_user_ids: "Aktualizuję identyfikatory użytkowników..."
+        deleting_source_user: "Usuwanie użytkownika źródłowego..."
   user:
     deactivated: "Został dezaktywowany w związku ze zbyt dużą liczbą odrzuconych emaili na '%{email}'."
     deactivated_by_staff: "Wyłączone przez personel"
@@ -2408,10 +2444,12 @@ pl_PL:
       domain_not_allowed: "Błędny adres strony internetowej. Dozwolone domeny: %{domains}"
     auto_rejected: "Odrzucono automatycznie ze względu na wiek. Zobacz ustawienia auto_handle_queued_age witryny."
     destroy_reasons:
-      unused_staged_user: "Nieużywany użytkownik wystawiony"
+      unused_staged_user: "Nieużywany użytkownik etapowy"
       fixed_primary_email: "Ustalony główny adres e-mail wystawionego użytkownika"
       same_ip_address: "Taki sam adres IP (%{ip_address}) jak inni użytkownicy"
       inactive_user: "Nieaktywny użytkownik"
+      reviewable_reject_auto: "Automatyczna obsługa użytkowników oczekujących sprawdzania"
+      reviewable_reject: "Użytkownik odrzucony po weryfikacji"
     email_in_spam_header: "Pierwszy e-mail użytkownika został oznaczony jako spam"
     already_silenced: "Użytkownik został już wyciszony przez %{staff} %{time_ago}."
     already_suspended: "Użytkownik został już zawieszony przez %{staff} %{time_ago}."
@@ -2428,14 +2466,14 @@ pl_PL:
       other: "%{count} wpisów czeka na przejrzenie"
   unsubscribe_mailer:
     title: "Przestań obserwować mailera"
-    subject_template: "Potwierdź, że nie chcesz już otrzymywać powiadomień mailowych ze strony %{site_title}"
+    subject_template: "Potwierdź, że nie chcesz już otrzymywać powiadomień e-mailowych z %{site_title}"
     text_body_template: |
-      Ktoś (może ty?) zażądał, by strona %{site_domain_name} nie wysyłała już powiadomień mailowych na ten adres.
-      Jeśli to potwierdzasz, kliknij w ten link:
+      Ktoś (może ty?) zażądał, by strona %{site_domain_name} nie wysyłała już powiadomień e-mailowych na ten adres.
+      Jeśli potwierdzasz, kliknij w ten link:
 
       %{confirm_unsubscribe_link}
 
-      Jeśli nadal chcesz otrzymywać powiadomienia mailowe, po prostu zignoruj ten mail.
+      Jeśli nadal chcesz otrzymywać powiadomienia e-mailowe, po prostu zignoruj ten e-mail.
   invite_mailer:
     title: "Zaproś mailera"
     subject_template: "%{inviter_name} zaprosił Cię do '%{topic_title}' na %{site_domain_name}"
@@ -2523,7 +2561,7 @@ pl_PL:
 
       Ze względów bezpieczeństwa wysłaliśmy link do ściągnięcia na twój potwierdzony adres email .
 
-      (Jeśli nie prosiłeś o ten link, powinieneś być poważnie zaniepokojony - ktoś ma dostęp admina do twojej strony).
+      (Jeśli nie prosiłeś/łaś o ten link, powinieneś być poważnie zaniepokojony - ktoś ma dostęp admina do twojej strony).
     no_token: |
       Przepraszamy, ten link do pobrania backupu został wcześniej użyty lub wygasł.
   admin_confirmation_mailer:
@@ -2535,7 +2573,7 @@ pl_PL:
       [Potwierdź konto administratora] (%{admin_confirm_url})
   test_mailer:
     title: "Test Powiadomień"
-    subject_template: "[%{site_name}] Test dostarczania poczty"
+    subject_template: "[%{email_prefix}] Test dostarczania poczty"
     text_body_template: |
       To jest wiadomość testowa od
 
@@ -2559,7 +2597,7 @@ pl_PL:
 
       (*Najłatwiejszy* sposób to utworzenie konta na [SendGrid][sg], [SparkPost][sp] [Mailgun][mg] lub [Mailjet][mj], które mają tanie plany mailingowe i będą dobre dla małych społeczności. Nadal będziesz musiał skonfigurować rekordy SPF i DKIM w swoim DNS!)
 
-      Mamy nadzieję, że otrzymałeś ten testowy e-mail.
+      Mamy nadzieję, że otrzymałeś/łaś ten testowy e-mail.
 
       Powodzenia,
 
@@ -2579,7 +2617,7 @@ pl_PL:
       [mt]: https://www.mail-tester.com/
   new_version_mailer:
     title: "Nowa wersja powiadomień"
-    subject_template: "[%{site_name}] Aktualizacja do nowej wersji Discourse jest dostępna."
+    subject_template: "[%{email_prefix}] Nowa wersja Discourse jest dostępna"
     text_body_template: |
       Hurra, nowa wersja [Discourse](https://www.discourse.org) jest dostępna!
 
@@ -2593,7 +2631,7 @@ pl_PL:
       - Odwiedź [meta.discourse.org](https://meta.discourse.org) dla nowości, dyskusji i wsparcia technicznego dla Discourse
   new_version_mailer_with_notes:
     title: "Nowa wersja powiadomień z uwagami"
-    subject_template: "[%{site_name}] dostępna aktualizacja"
+    subject_template: "[%{email_prefix}] dostępna aktualizacja"
     text_body_template: |
       Hurra, nowa wersja [Discourse](https://www.discourse.org) jest dostępna!
 
@@ -2659,6 +2697,19 @@ pl_PL:
 
         Społeczność oznaczyła ten post i teraz jest ukryty. **Ponieważ ten post był ukrywany więcej niż raz, Twój post pozostanie ukryty, dopóki nie zostanie zaakceptowany przez personel.**
 
+        Aby uzyskać dodatkowe wskazówki, zapoznaj się z naszymi [wytycznymi dla społeczności](%{base_url}/guidelines).
+    queued_by_staff:
+      title: "Post wymaga zatwierdzenia"
+      subject_template: "Post ukryty przez personel, oczekujący na zatwierdzenie"
+      text_body_template: |
+        Witaj,
+
+        To jest automatyczna wiadomość od %{site_name} aby poinformować Cię, że Twój post został ukryty.
+
+        <%{base_url}%{url}>
+
+        Twój post pozostanie ukryty, dopóki pracownik go nie przejrzy.
+
         Aby uzyskać dodatkowe wskazówki, zapoznaj się z naszymi [wytycznymi dla społeczności](%{base_url}/guidelines).
     flags_disagreed:
       title: "Oznaczony post został przywrócony przez personel"
@@ -2681,19 +2732,17 @@ pl_PL:
       text_body_template: |
         Witaj,
 
-        To jest automatyczna wiadomość od %{site_name} aby poinformować Cię, że [Twój post](%{base_url}%{url}) został usunięty.
+        Jest to automatyczna wiadomość od %{site_name} , aby poinformować Cię, że [twój wpis](%{base_url}%{url}) został usunięty.
 
         %{flag_reason}
 
-        Ten post został oflagowany przez społeczność i członek personelu zdecydował się go usunąć.
+        Ten post został oznaczony przez społeczność, a personel zdecydował się go usunąć.
 
-        [details="Kliknij, aby rozwinąć usunięty post"]
         ``` markdown
         %{flagged_post_raw_content}
         ```
-        [/details]
 
-        Aby uzyskać szczegółowe informacje, zapoznaj się z naszymi [wytycznymi dla społeczności](%{base_url}/guidelines).
+        Zapoznaj się z naszymi [wytycznymi społeczności](%{base_url}/guidelines) po więcej szczegółów.
     usage_tips:
       text_body_template: |
         Aby uzyskać kilka szybkich wskazówek, jak zacząć jako nowy użytkownik, [przeczytaj ten post na blogu](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2714,7 +2763,7 @@ pl_PL:
       title: "Witaj Użytkowniku TL1"
       subject_template: "Dzięki, że jesteś z nami"
       text_body_template: |
-        No hej. Widzimy, że byłeś zajęty czytaniem, co jest fantastyczne, więc awansowaliśmy Cię na następny [poziom zaufania!](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
+        No hej. Widzimy, że byłeś/łaś zajęty czytaniem, co jest fantastyczne, więc awansowaliśmy Cię na następny [poziom zaufania!](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
 
         Cieszymy się, że spędzasz z nami czas i chcielibyśmy dowiedzieć się o Tobie więcej. Poświęć chwilę, aby [wypełnić swój profil](%{base_url}/my/preferences/profile), lub śmiało [rozpocznij nowy temat](%{base_url}/categories).
     welcome_staff:
@@ -2736,7 +2785,7 @@ pl_PL:
 
         Aby zalogować się:
 
-        A) Zaloguj się przyciskiem logowania przez zewnętrzny serwis. Pamiętaj, aby podpięty pod wybrany serwis adres e-mail **był taki sam** jak ten na który dostałeś swoje zaproszenie. W przeciwnym wypadku nie będziemy mogli stwierdzić, że ty to Ty!
+        A) Zaloguj się przyciskiem logowania przez zewnętrzny serwis. Pamiętaj, aby podpięty pod wybrany serwis adres e-mail **był taki sam** jak ten na który dostałeś/łaś swoje zaproszenie. W przeciwnym wypadku nie będziemy mogli stwierdzić, że ty to Ty!
 
         B) Stwórz unikalne hasło w [swoich ustawieniach][prefs] i zaloguj się przy jego pomocy.
 
@@ -2750,9 +2799,11 @@ pl_PL:
     tl2_promotion_message:
       subject_template: "Gratulujemy awansu na następny poziom zaufania!"
       text_body_template: |
-        Awansowaliśmy Twój [poziom zaufania](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+        Awansowaliśmy Cię na kolejny [poziom zaufania] (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
 
-        Zapraszamy do dalszego angażowania się — cieszymy się, że jesteś w pobliżu.
+        Jako doświadczony użytkownik możesz docenić [tą listę przydatnych porad i sztuczek] (https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
+        Zapraszamy do angażowania się — cieszymy się, że jesteś w pobliżu.
     backup_succeeded:
       title: "Kopia zapasowa została utworzona "
       subject_template: "Kopia zapasowa jest gotowa"
@@ -2816,14 +2867,14 @@ pl_PL:
         ```
     user_added_to_group_as_owner:
       title: "Dodano do grupy jako właściciel"
-      subject_template: "Zostałeś dodany jako właściciel grupy %{group_name}"
+      subject_template: "Zostałeś/łaś dodany jako właściciel grupy %{group_name}"
       text_body_template: |
         Dodano Cię jako właściciela grupy [%{group_name}](%{base_url}%{group_path}).
     user_added_to_group_as_member:
       title: "Dodano do grupy jako członek"
-      subject_template: "Zostałeś dodany jako członek grupy %{group_name}"
+      subject_template: "Zostałeś/łaś dodany jako członek grupy %{group_name}"
       text_body_template: |
-        Zostałeś dodany jako członek grupy [%{group_name}] (%{base_url}%{group_path}).
+        Zostałeś/łaś dodany jako członek grupy [%{group_name}] (%{base_url}%{group_path}).
     csv_export_succeeded:
       title: "Eksport CSV udany "
       subject_template: "[%{export_title}] Eksport danych zakończony"
@@ -2838,7 +2889,7 @@ pl_PL:
     csv_export_failed:
       title: "Eksport CSV nieudany "
       subject_template: "Nieudany eksport danych"
-      text_body_template: "Przepraszamy, ale eksport danych zakończył się niepowodzeniem. Sprawdź logi lub skontaktuj się z operatorami serwisu."
+      text_body_template: "Przepraszamy, ale eksport danych zakończył się niepowodzeniem. Sprawdź logi lub [skontaktuj się z operatorami serwisu](%{base_url}/about)."
     email_reject_insufficient_trust_level:
       title: "Odrzucenie emaila niedostateczny poziom zaufania"
       subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - niewystarczający poziom zaufania"
@@ -2889,13 +2940,13 @@ pl_PL:
         Twoja odpowiedź została wysłana z innego adresu email niż się spodziewaliśmy. Nie jesteśmy pewni czy jest to ta sama osoba, spróbuj wysłać wiadomość z innego adresu email lub [skontaktuj się z obsługą] %{base_url}/about).
     email_reject_empty:
       title: "Email odrzucony Pusty"
-      subject_template: "[%{email_prefix}]email\" original-title=\"<span class=\"glossary-highlight\" title=\"email (click to copy)\" data-copy-glossary=\"email\">email (click to copy)\"> Problem z pocztą elektroniczną - brak zawartości"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - brak zawartości"
       text_body_template: |
         Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
 
         Nie znaleźliśmy żadnej zawartości w twoim emailu.
 
-        Jeśli otrzymałeś tą wiadomość, a dodałeś zawartość do odpowiedzi, spróbuj ponownie z prostszym formatowaniem.
+        Jeśli otrzymałeś/łaś tą wiadomość, a dodałeś/łaś zawartość do odpowiedzi, spróbuj ponownie z prostszym formatowaniem.
     email_reject_parsing:
       title: "Odrzucenie emaila Rozbiór gramatyczny zdania"
       subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - Nierozpoznana zawartość"
@@ -2961,9 +3012,17 @@ pl_PL:
       title: "Odrzucony email zły adres docelowy"
       subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną -- Nieznany: adres"
       text_body_template: |
-        Przepraszamy, ale Twoja wiadomość e-mail do %{destination} (zatytułowana %{former_title}) nie działa.
+        Przepraszamy, ale Twoja wiadomość e-mail do %{destination} (zatytułowana %{former_title}) nie została dostarczona.
 
-        Czy używasz więcej niż jednego adresu e-mail? Czy odpowiedziałeś z innego adresu e-mail? Odpowiedzi e-mailowe wymagają podania tego samego adresu e-mail podczas odpowiadania. Alternatywnie, nagłówek Message-ID w e-mailu mógł zostać zmodyfikowany.
+        Oto kilka rzeczy do sprawdzenia:
+
+          - Czy używasz więcej niż jednego adresu e-mail? Czy odpowiedziałeś/łaś z innego adresu e-mail niż ten, którego użyłeś/łaś pierwotnie? Odpowiedzi e-mailowe wymagają podania tego samego adresu e-mail podczas odpowiadania.
+
+          - Czy Twój program pocztowy prawidłowo używał adresu zwrotnego: podczas odpowiadania? Niestety, niektóre programy pocztowe niepoprawnie wysyłają odpowiedzi na adres From:, który nie działa.
+
+          - Czy nagłówek Message-ID w e-mailu został zmodyfikowany? Identyfikator wiadomości musi być spójny i niezmieniony.
+
+        Potrzebujesz więcej pomocy? Skontaktuj się z nami, korzystając z danych kontaktowych pod adresem %{base_url}/about
     email_reject_old_destination:
       title: "E-mail odrzucony: stare miejsce docelowe"
       subject_template: "[%{email_prefix}] Problem z e-mailem - próbujesz odpowiedzieć na stare powiadomienie"
@@ -2973,21 +3032,21 @@ pl_PL:
         Odpowiedzi na oryginalne powiadomienia przyjmujemy tylko przez %{number_of_days} dni. Proszę [odwiedź temat](%{short_url}), aby kontynuować rozmowę.
     email_reject_topic_not_found:
       title: "Odrzucenie emaila nie znaleziono tematu"
-      subject_template: "[%{site_name}] Problem z mailem -- Temat Nieznaleziony "
+      subject_template: "[%{email_prefix}] Problem z e-mailem -- Nie znaleziono tematu"
       text_body_template: |
         Przepraszamy, twoja wiadomość email do%{destination}( zatytułowana %{former_title}) nie została wysłana.
 
         Dany temat przestał istnieć - możliwe, że został usunięty? Jeśli wydaje ci się, że jest to błąd, [skontaktuj się obsługą] (%{base_url})/o nas).
     email_reject_topic_closed:
       title: "Email odrzucony Temat zamknięty"
-      subject_template: "[%{site_name}] Problem z mailem -- Temat Zamknięty"
+      subject_template: "[%{email_prefix}] Problem z e-mailem -- Temat zamknięty"
       text_body_template: |
         Przepraszamy, twoja wiadomość email do%{destination}( zatytułowana %{former_title}) nie została wysłana.
 
         Temat, w którym dokonujesz odpowiedzi jest obecnie zamknięty i nie można dodawać nowych komentarzy. Jeśli wydaję ci się, że jest to błąd, [skontaktuj się z obsługą](%{base_url}/o nas).
     email_reject_auto_generated:
       title: "Odrzucenie email wygenerowane automatycznie"
-      subject_template: "[%{site_name}] Problem z mailem -- Odpowiedź Wygenerowana Automatycznie "
+      subject_template: "[%{email_prefix}] Problem z e-mailem -- Odpowiedź wygenerowana automatycznie"
       text_body_template: |
         Przepraszamy, twoja wiadomość email do%{destination}( zatytułowana %{former_title}) nie została wysłana.
 
@@ -3022,18 +3081,18 @@ pl_PL:
       text_body_template: |
         Przepraszamy, ale Twoja wiadomość e-mail do %{destination} (zatytułowana %{former_title}) nie działa.
 
-        Odpowiedziałeś na wiadomość e-mail z podsumowaniem, która nie została zaakceptowana.
+        Odpowiedziałeś/łaś na wiadomość e-mail z podsumowaniem, która nie została zaakceptowana.
 
         Jeśli uważasz, że to błąd, [skontaktuj się z nami](%{base_url}/about).
     email_error_notification:
       title: "Błąd emaila powiadomienie"
       subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - błąd autoryzacji POP"
       text_body_template: |
-        Niestety, wystąpił błąd autoryzacji podczas odbierania maili z serwera POP.
+        Niestety, wystąpił błąd autoryzacji podczas odbierania e-maili z serwera POP.
 
-        Proszę upewnij się, że prawidłowo skonfigurowałeś referencje POP na [strona ustawień](%{base_url}/admin/strona_ustawień/kategoria/email).
+        Proszę upewnij się, że prawidłowo skonfigurowałeś/łaś referencje POP w [ustawieniach strony](%{base_url}/admin/site_settings/category/email).
 
-        Jeśli istnieję UI dla konta email POP, możesz potrzebować zalogować się na stronie i sprawdzić tam ustawienia.
+        Jeśli to konto e-mail ma UI, możesz należy zalogować się na stronie i sprawdzić tam ustawienia.
     email_revoked:
       title: "E-mail odwołany"
       subject_template: "Czy adres email jest poprawny?"
@@ -3085,7 +3144,7 @@ pl_PL:
     silenced_by_staff:
       title: "Wyciszony przez personel"
       subject_template: "Konto tymczasowo zawieszone"
-      text_body_template: "Dzień dobry, \n\nTo jest automatyczna wiadomość od %{site_name}, aby poinformować cię, że twoje konto zostało tymczasowo zablokowane jako środek zapobiegawczy.\n\nMożesz kontynuować przeglądanie, ale nie będzie mógł dodawać odpowiedzi lub tworzyć tematów dopóki [członek obsługi](%{base_url}/o nas) przejrzy twoje ostatnie wpisy. Przepraszamy za niedogodności.\n\nW celu uzyskania dodatkowych wskazówek, proszę przejść do naszych [wskazówek społeczności](%{base_url}/about).\n"
+      text_body_template: "Dzień dobry, \n\nTo jest automatyczna wiadomość od %{site_name}, aby poinformować cię, że twoje konto zostało tymczasowo zablokowane jako środek zapobiegawczy.\n\nMożesz kontynuować przeglądanie, ale nie będzie mógł/mogła dodawać odpowiedzi lub tworzyć tematów dopóki [członek obsługi](%{base_url}/o nas) przejrzy twoje ostatnie wpisy. Przepraszamy za niedogodności.\n\nW celu uzyskania dodatkowych wskazówek, proszę przejść do naszych [wskazówek społeczności](%{base_url}/about).\n"
     user_automatically_silenced:
       title: "Użytkownik automatycznie wyciszony"
       subject_template: "Nowy użytkownik %{username} wyciszony przez flagi społeczności"
@@ -3140,38 +3199,38 @@ pl_PL:
 
         [Odwiedź panel swojej witryny](%{base_url}/admin), aby je zobaczyć.
 
-        Jeśli nic nie jest widoczne w panelu, inny członek personelu mógł już skorzystać z tej porady. Listę działań personelu można znaleźć w [dziennikach działań personelu](%{base_url}/admin/logs/staff_action_logs).
+        Jeśli nic nie jest widoczne w panelu, inny członek personelu mógł/mogła już skorzystać z tej porady. Listę działań personelu można znaleźć w [dziennikach działań personelu](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Jesteś nowym użytkownikiem miesiąca!"
       subject_template: "Jesteś nowym użytkownikiem miesiąca!"
       text_body_template: |
-        Gratulacje, zdobyłeś nagrodę **Nowy użytkownik miesiąca za %{month_year}**. :trophy:
+        Gratulacje, zdobyłeś/łaś nagrodę **Nowy użytkownik miesiąca za %{month_year}**. :trophy:
 
-        Ta nagroda jest przyznawana tylko dwóm nowym użytkownikom miesięcznie i będzie widoczna na stronie [odznak](%{url}).
+        Ta nagroda jest przyznawana tylko dwóm nowym użytkownikom miesięcznie i będzie widoczna na [stronie odznak](%{url}).
 
-        Szybko stałeś się cennym członkiem naszej społeczności. Dziękujemy za dołączenie i robienie wspaniałej pracy!
+        Szybko stałeś/łaś się cennym członkiem naszej społeczności. Dziękujemy za dołączenie i robienie wspaniałej pracy!
     queued_posts_reminder:
       title: "Przypomnienie o wpisach w kolejce"
       subject_template:
-        one: "%{count}wpis czeka na przejrzenie"
-        few: "%{count}wpisy czekają na przejrzenie"
-        many: "%{count}wpisów czeka na przejrzenie;"
-        other: "%{count}wpisów czeka na przejrzenie"
+        one: "%{count} wpis czeka na przejrzenie"
+        few: "%{count} wpisy czekają na przejrzenie"
+        many: "%{count} wpisów czeka na przejrzenie;"
+        other: "%{count} wpisów czeka na przejrzenie"
       text_body_template: |
         Witam,
 
         Posty od nowych użytkowników zostały przekazane do moderacji i obecnie czekają na przejrzanie. [Zatwierdzić lub odrzucić je tutaj](%{base_url}/review?type=ReviewableQueuedPost).
   unsubscribe_link: |
-    Aby zrezygnować z otrzymywania tych wiadomości e-mail, [Kliknij tutaj](%{unsubscribe_url}).
+    Aby zrezygnować z otrzymywania tych e-maili, [kliknij tutaj](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
-    Aby zrezygnować z otrzymywania tych wiadomości e-mail, [Kliknij tutaj](%{unsubscribe_url}).
+    Aby zrezygnować z otrzymywania tych e-maili, [kliknij tutaj](%{unsubscribe_url}).
   unsubscribe_mailing_list: |
-    Otrzymujesz tą wiadomość, ponieważ włączyłeś tryb listy mailingowej.
+    Otrzymujesz tą wiadomość, ponieważ włączyłeś/łaś tryb listy mailingowej.
 
-    Aby zrezygnować z tych maili, [naciśnij tutaj](%{unsubscribe_url}).
+    Aby zrezygnować z tych e-maili, [kliknij tutaj](%{unsubscribe_url}).
   subject_re: "Re: "
   subject_pm: "[PW] "
-  email_from: "%{user_name}z%{site_name}"
+  email_from: "%{user_name} z %{site_name}"
   user_notifications:
     previous_discussion: "Poprzednie odpowiedzi"
     reached_limit:
@@ -3253,7 +3312,7 @@ pl_PL:
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
       title: "Użytkownik zaproszony do stopniowego PM"
-      subject_template: "[%{site_name}] %{username} zaprasza cie do wiadomości '%{topic_title}'"
+      subject_template: "[%{email_prefix}] %{username} zaprasza cię do wiadomości '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -3262,7 +3321,7 @@ pl_PL:
         %{respond_instructions}
     user_invited_to_topic:
       title: "Użytkownik zaprosił do Tematu"
-      subject_template: "[%{site_name}] %{username} zaprasił cie do '%{topic_title}'"
+      subject_template: "[%{email_prefix}] %{username} zaprasza cię do '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -3271,7 +3330,7 @@ pl_PL:
         %{respond_instructions}
     user_replied:
       title: "Użytkownik odpowiedział"
-      subject_template: "[%{site_name}] %{topic_title}"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3282,7 +3341,7 @@ pl_PL:
         %{respond_instructions}
     user_replied_pm:
       title: "Użytkownik odpowiedział przez PW"
-      subject_template: "[%{site_name}] [PW] %{topic_title}"
+      subject_template: "[%{email_prefix}] [PW] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3293,7 +3352,7 @@ pl_PL:
         %{respond_instructions}
     user_quoted:
       title: "Użytkownik Zacytował"
-      subject_template: "[%{site_name}] %{topic_title}"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3304,7 +3363,7 @@ pl_PL:
         %{respond_instructions}
     user_linked:
       title: "Użytkownik podał link"
-      subject_template: "[%{site_name}] %{topic_title}"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3315,7 +3374,7 @@ pl_PL:
         %{respond_instructions}
     user_mentioned:
       title: "Użytkownik Wspomniany"
-      subject_template: "[%{site_name}] %{topic_title}"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3325,8 +3384,8 @@ pl_PL:
 
         %{respond_instructions}
     user_mentioned_pm:
-      title: "Użytkownik wspomniał PW"
-      subject_template: "[%{site_name}] [PW] %{topic_title}"
+      title: "Użytkownik wspomniał(a) PW"
+      subject_template: "[%{email_prefix}] [PW] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3337,7 +3396,7 @@ pl_PL:
         %{respond_instructions}
     user_group_mentioned:
       title: "Grupa Użytkowników Wspomniana"
-      subject_template: "[%{site_name}] %{topic_title}"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3348,7 +3407,7 @@ pl_PL:
         %{respond_instructions}
     user_posted:
       title: "Użytkownik Opublikował"
-      subject_template: "[%{site_name}] %{topic_title}"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3359,7 +3418,7 @@ pl_PL:
         %{respond_instructions}
     user_watching_first_post:
       title: "Użytkownik Przegląda pierwszy wpis"
-      subject_template: "[%{site_name}] %{topic_title}"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3370,7 +3429,7 @@ pl_PL:
         %{respond_instructions}
     user_posted_pm:
       title: "Użytkownik Napisał PM"
-      subject_template: "[%{site_name}] [PW] %{topic_title}"
+      subject_template: "[%{email_prefix}] [PW] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3391,27 +3450,23 @@ pl_PL:
       text_body_template: |
         Zostałeś zawieszony na forum do %{suspended_till}.
 
-        %{reason}
-
-        %{message}
+        Powód - %{reason}
     account_silenced:
       title: "Konto uciszone"
       subject_template: "[%{email_prefix}] Twoje konto zostało wyciszone"
       text_body_template: |
         Zostałeś wyciszony na forum do %{silenced_till}.
 
-        %{reason}
-
-        %{message}
+        Powód - %{reason}
     account_exists:
       title: "Konto już istnieje"
       subject_template: "[%{email_prefix}] Konto już istnieje"
       text_body_template: |
-        Właśnie próbowałeś założyć konto na %{site_name} lub próbowałeś zmienić adres e-mail aktualnego konta na %{email}. Jednak konto z adresem %{email} już istnieje.
+        Właśnie próbowałeś/łaś założyć konto na %{site_name} lub próbowałeś/łaś zmienić adres e-mail aktualnego konta na %{email}. Jednak konto z adresem %{email} już istnieje.
 
-        Jeśli zapomniałeś hasła, [zresetuj je teraz](%{base_url}/password-reset).
+        Jeśli zapomniałeś/łaś hasła, [zresetuj je teraz](%{base_url}/password-reset).
 
-        Jeśli nie próbowałeś utworzyć konta dla %{email} lub zmienić adresu e-mail, nie martw się - możesz bezpiecznie zignorować tę wiadomość.
+        Jeśli nie próbowałeś/łaś utworzyć konta dla %{email} lub zmienić adresu e-mail, nie martw się - możesz bezpiecznie zignorować tę wiadomość.
 
         Jeśli masz jakieś pytania, [skontaktuj się z naszym przyjaznym personelem](%{base_url}/about).
     account_second_factor_disabled:
@@ -3420,7 +3475,7 @@ pl_PL:
       text_body_template: |
         Uwierzytelnianie dwuskładnikowe zostało wyłączone na Twoim koncie na %{site_name}. Teraz możesz zalogować się tylko przy użyciu hasła; dodatkowy kod uwierzytelniania nie jest już wymagany.
 
-        Jeśli nie zdecydowałeś się wyłączyć uwierzytelniania dwuskładnikowego, ktoś uzyskać niepowołany dostęp do Twojego konta.
+        Jeśli nie zdecydowałeś/łaś się wyłączyć uwierzytelniania dwuskładnikowego, ktoś uzyskać niepowołany dostęp do Twojego konta.
 
         Jeśli masz jakieś pytania, [skontaktuj się z naszym przyjaznym personelem](%{base_url}/about).
     digest:
@@ -3444,7 +3499,7 @@ pl_PL:
       preheader: "Podsumowanie aktywności od Twojej ostatniej wizyty w dniu %{last_seen_at}"
     forgot_password:
       title: "Zapomniane hasło"
-      subject_template: "[%{site_name}] Reset hasła"
+      subject_template: "[%{email_prefix}] Reset hasła"
       text_body_template: |
         Ktoś poprosił o zresetowanie Twojego hasła na [%{site_name}](%{base_url}).
 
@@ -3458,13 +3513,13 @@ pl_PL:
       text_body_template: |
         Oto Twój link do logowania się na [%{site_name}] (%{base_url}).
 
-        Jeśli nie prosiłeś o ten link, możesz bezpiecznie zignorować tę wiadomość e-mail.
+        Jeśli nie prosiłeś/łaś o ten link, możesz bezpiecznie zignorować tę wiadomość e-mail.
 
         Kliknij poniższy link, aby się zalogować:
         %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "Ustaw hasło"
-      subject_template: "[%{site_name}] Ustaw hasło"
+      subject_template: "[%{email_prefix}] Ustaw hasło"
       text_body_template: |
         Ktoś poprosił o dodanie hasła do twojego konta [%{site_name}](%{base_url}). Możesz się zalogować przy pomocy konta w i innym serwisie (Google, Facebook, itd.) które zostało powiązane z twoim potwierdzonym adresem email.
 
@@ -3474,17 +3529,17 @@ pl_PL:
         %{base_url}/u/password-reset/%{email_token}
     admin_login:
       title: "Logowanie administratora. "
-      subject_template: "[%{site_name}] Login"
+      subject_template: "[%{email_prefix}] Login"
       text_body_template: |
         Ktoś poprosił o zalogowanie się na Twoje konto na [%{site_name}] (%{base_url}).
 
-        Jeśli nie wysłałeś tej prośby, możesz bezpiecznie zignorować tę wiadomość e-mail.
+        Jeśli nie wysłałeś/łaś tej prośby, możesz bezpiecznie zignorować tę wiadomość e-mail.
 
         Kliknij poniższy link, aby się zalogować:
         %{base_url}/session/email-login/%{email_token}
     account_created:
       title: "Utworzono Konto"
-      subject_template: "[%{site_name}] Twoje Nowe Konto"
+      subject_template: "[%{email_prefix}] Twoje Nowe Konto"
       text_body_template: |
         Utworzyliśmy Twoje konto na %{site_name}
 
@@ -3498,7 +3553,7 @@ pl_PL:
 
         %{base_url}/u/confirm-new-email/%{email_token}
 
-        Ta zmiana e-mail została zgłoszona przez administratora witryny. Jeśli nie prosiłeś o tę zmianę, skontaktuj się z [administratorem witryny](%{base_url}/about).
+        Ta zmiana e-mail została zgłoszona przez administratora witryny. Jeśli nie prosiłeś/łaś o tę zmianę, skontaktuj się z [administratorem witryny](%{base_url}/about).
     confirm_new_email_via_admin:
       title: "Potwierdź nowy e-mail"
       subject_template: "[%{email_prefix}] Potwierdź swój nowy adres email"
@@ -3507,10 +3562,10 @@ pl_PL:
 
         %{base_url}/u/confirm-new-email/%{email_token}
 
-        Ta zmiana e-mail została zgłoszona przez administratora witryny. Jeśli nie prosiłeś o tę zmianę, skontaktuj się z [administratorem witryny](%{base_url}/about).
+        Ta zmiana e-mail została zgłoszona przez administratora witryny. Jeśli nie prosiłeś/łaś o tę zmianę, skontaktuj się z [administratorem witryny](%{base_url}/about).
     confirm_old_email:
       title: "Potwierdź stary email"
-      subject_template: "[%{site_name}] Potwierdź aktualny adres email"
+      subject_template: "[%{email_prefix}] Potwierdź aktualny adres email"
       text_body_template: |
         Zanim będziemy mogli zmienić Twój adres e-mail, musisz potwierdzić, że kontrolujesz
         bieżące konto e-mail. Po wykonaniu tego kroku poprosimy Cię o
@@ -3520,7 +3575,7 @@ pl_PL:
         %{base_url}/u/confirm-old-email/%{email_token}
     confirm_old_email_add:
       title: "Potwierdź stary adres e-mail (Dodaj)"
-      subject_template: "[%{site_name}] Potwierdź aktualny adres email"
+      subject_template: "[%{email_prefix}] Potwierdź aktualny adres email"
       text_body_template: |
         Zanim będziemy mogli dodać nowy adres e-mail, musisz potwierdzić, że kontrolujesz
         bieżące konto e-mail. Po wykonaniu tego kroku poprosimy Cię o
@@ -3531,7 +3586,7 @@ pl_PL:
         %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
       title: "Powiadom Stary Email"
-      subject_template: "[%{site_name}] Twój adres email został zmieniony"
+      subject_template: "[%{email_prefix}] Twój adres email został zmieniony"
       text_body_template: |
         To jest wiadomość automatyczna, aby cię poinformować, że twój adres email na stronie %{site_name}został zmieniony. Jeśli działania te zostały dokonane przez przypadek, proszę skontaktować się z administratorem strony.
 
@@ -3549,7 +3604,7 @@ pl_PL:
         %{new_email}
     signup_after_approval:
       title: "Zarejestruj się po zatwierdzeniu"
-      subject_template: "Zostałeś zaakceptowany na forum %{site_name}!"
+      subject_template: "Zostałeś/łaś zaakceptowany na forum %{site_name}!"
       text_body_template: |
         Witamy na %{site_name}!
 
@@ -3565,9 +3620,16 @@ pl_PL:
         Zawsze wierzymy w [zachowanie cywilizowanej społeczności](%{base_url}/guidelines).
 
         Życzymy udanego pobytu!
+    signup_after_reject:
+      title: "Zarejestruj się po odrzuceniu"
+      subject_template: "Odrzucono Cię na %{site_name}"
+      text_body_template: |
+        Członek obsługi odrzucił Twoje konto na %{site_name}.
+
+        %{reject_reason}
     signup:
       title: "Podpis"
-      subject_template: "[%{site_name}] Potwierdź swoje nowe konto"
+      subject_template: "[%{email_prefix}] Potwierdź swoje nowe konto"
       text_body_template: |
         Witaj na %{site_name}!
 
@@ -3591,15 +3653,22 @@ pl_PL:
       text_body_template: |
         Witaj,
 
-        Zauważyliśmy logowanie z urządzenia lub lokalizacji, z której zwykle nie korzystasz. Czy to byłeś ty?
+        Zauważyliśmy logowanie z urządzenia lub lokalizacji, z której zwykle nie korzystasz. Czy to byłeś/łaś ty?
 
          - Lokalizacja: %{location} (%{client_ip})
          - Przeglądarka: %{browser}
          - Urządzenie: %{device} - %{os}
 
-        Jeśli to byłeś ty, świetnie! Nie musisz nic więcej robić.
+        Jeśli to byłeś/łaś ty, świetnie! Nie musisz nic więcej robić.
 
-        Jeśli to nie byłeś Ty, proszę [przejrzyj swoje istniejące sesje](%{base_url}/my/preferences/account) i rozważ zmianę hasła.
+        Jeśli to nie byłeś/łaś Ty, proszę [przejrzyj swoje istniejące sesje](%{base_url}/my/preferences/account) i rozważ zmianę hasła.
+    post_approved:
+      title: "Twój post został zatwierdzony"
+      subject_template: "[%{site_name}] Twój post został zatwierdzony"
+      text_body_template: |
+        Witaj,
+
+        To jest automatyczna wiadomość od %{site_name} aby poinformować Cię, że [Twój post](%{base_url}%{post_url}) został zatwierdzony.
   page_forbidden:
     title: "Ups! Ta strona jest prywatna."
   page_not_found:
@@ -3627,7 +3696,7 @@ pl_PL:
     pasted_image_filename: "Wklejone zdjęcie"
     store_failure: "Błąd zapisu załączników #%{upload_id} dla użytkownika #%{user_id}."
     file_missing: "Przepraszamy, należy podać plik do przesłania."
-    empty: "Przepraszamy, plik który wysłałeś jest pusty."
+    empty: "Przepraszamy, plik który wysłałeś/łaś jest pusty."
     png_to_jpg_conversion_failure_message: "Wystąpił błąd podczas konwersji z PNG na JPG."
     optimize_failure_message: "Wystąpił błąd podczas optymalizacji przesłanego obrazu."
     attachments:
@@ -3646,7 +3715,7 @@ pl_PL:
   skipped_email_log:
     exceeded_emails_limit: "Przekroczono maksymalną, dzienną liczbę emaili dla użytkownika"
     exceeded_bounces_limit: "Przekroczono bounce_score_threshold "
-    mailing_list_no_echo_mode: "Powiadomienia listy mailingowej wyłączone dla wpisów własnych użytkowników."
+    mailing_list_no_echo_mode: "Powiadomienia listy mailingowej wyłączone dla własnych postów użytkownika."
     user_email_no_user: "Nie można znaleźć użytkownika z ID %{user_id}"
     user_email_post_not_found: "Nie można odnaleźć wpisu z numerem %{post_id}"
     user_email_anonymous_user: "Użytkownik anonimowy"
@@ -3796,7 +3865,7 @@ pl_PL:
 
       ## [Warunki](#tos)
 
-      Tak, język prawniczy jest nudny, ale musimy chronić siebie &ndash; a więc też Ciebie i twoje informacje &ndash;; przed nieprzyjaznymi ludźmi. Mamy [Warunki obsługi[(/tos) opisujące twoje (i nasze) zachowanie i prawa związane z treścią, prywatnością i prawami. Aby korzystać z tej usługi, musisz zgodzić się na ich przestrzeganie [TOS](%{base_path}/tos).
+      Tak, język prawniczy jest nudny, ale musimy chronić siebie &ndash; a więc też Ciebie i twoje informacje &ndash;; przed nieprzyjaznymi ludźmi. Mamy [Warunki obsługi](%{base_path}/tos) opisujące twoje (i nasze) zachowanie i prawa związane z treścią, prywatnością i prawami. Aby korzystać z tej usługi, musisz zgodzić się na ich przestrzeganie [TOS](%{base_path}/tos).
   tos_topic:
     title: "Warunki użytkowania"
     body: |
@@ -3898,7 +3967,7 @@ pl_PL:
 
       Zgadzasz się ponosić odpowiedzialność za wszystkie działania podejmowane przy użyciu Twojego konta, niezależnie od tego, czy zostały przez Ciebie autoryzowane, czy nie, dopóki nie zamkniesz konta lub nie powiadomisz firmy, że Twoje konto zostało przejęte. Zgadzasz się natychmiastowo powiadomić firmę, jeśli podejrzewasz, że Twoje konto zostało przejęte. Potwierdzasz również, że wybierzesz bezpieczne hasło dla swojego konta i zachowasz je w tajemnicy.
 
-      Firma może ograniczyć, zawiesić lub zamknąć Twoje konto na forum zgodnie ze swoją polityką dotyczącą żądań usunięcia treści związanych z prawami autorskimi lub jeśli firma ma uzasadnione powody, by sądzić, że złamałeś jakąkolwiek zasadę w niniejszych warunkach regulaminu.
+      Firma może ograniczyć, zawiesić lub zamknąć Twoje konto na forum zgodnie ze swoją polityką dotyczącą żądań usunięcia treści związanych z prawami autorskimi lub jeśli firma ma uzasadnione powody, by sądzić, że złamałeś/łaś jakąkolwiek zasadę w niniejszych warunkach regulaminu.
 
       <h2 id="heading--your-content"><a href="#heading--your-content">Twoje treści</a></h2>
 
@@ -3924,7 +3993,7 @@ pl_PL:
 
       <h2 id="heading--liability"><a href="#heading--liability">Ograniczenia odpowiedzialności</a></h2>
 
-      ***Ani firma, ani jej dostawcy nie będą ponosić odpowiedzialności za szkody wynikające z naruszenia umowy, których ich personel nie mógł racjonalnie przewidzieć, gdy wyraziłeś zgodę na niniejsze warunki.***
+      ***Ani firma, ani jej dostawcy nie będą ponosić odpowiedzialności za szkody wynikające z naruszenia umowy, których ich personel nie mógł/mogła racjonalnie przewidzieć, gdy wyraziłeś/łaś zgodę na niniejsze warunki.***
 
       ***O ile pozwalają na to przepisy prawa, całkowita odpowiedzialność wobec użytkownika za wszelkiego rodzaju roszczenia związane z forum lub zawartością forum będzie ograniczona do 50 USD.***
 
@@ -3960,11 +4029,11 @@ pl_PL:
 
       Możesz powiadomić firmę zgodnie z niniejszymi warunkami i wysłać pytania do firmy na adres <%{contact_email}>.
 
-      Firma może powiadomić Cię o zmianach w podanych warunkach, korzystając z adresu e-mail, który podałeś dla swojego konta na forum lub wysyłając wiadomość na stronie głównej forum lub na stronie Twojego konta.
+      Firma może powiadomić Cię o zmianach w podanych warunkach, korzystając z adresu e-mail, który podałeś/łaś dla swojego konta na forum lub wysyłając wiadomość na stronie głównej forum lub na stronie Twojego konta.
 
       <h2 id="heading--changes"><a href="#heading--changes">Zmiany</a></h2>
 
-      Firma ostatnio zaktualizowała niniejsze warunki 12 lipca 2018 r. I może je ponownie zaktualizować. Firma będzie publikować wszystkie aktualizacje na forum. W przypadku aktualizacji, które zawierają istotne zmiany, firma zgadza się na wysłanie Ci e-maila, jeśli utworzyłeś konto i podałeś prawidłowy adres e-mail. Firma może również ogłaszać aktualizacje za pomocą specjalnych wiadomości lub alertów na forum.
+      Firma ostatnio zaktualizowała niniejsze warunki 12 lipca 2018 r. I może je ponownie zaktualizować. Firma będzie publikować wszystkie aktualizacje na forum. W przypadku aktualizacji, które zawierają istotne zmiany, firma zgadza się na wysłanie Ci e-maila, jeśli utworzyłeś/łaś konto i podałeś/łaś prawidłowy adres e-mail. Firma może również ogłaszać aktualizacje za pomocą specjalnych wiadomości lub alertów na forum.
 
       Po otrzymaniu powiadomienia o aktualizacji niniejszych warunków musisz wyrazić zgodę na nowe warunki, aby móc dalej korzystać z forum.
   privacy_topic:
@@ -3974,9 +4043,9 @@ pl_PL:
 
       ## [Jakie dane o Tobie zbieramy?](#collect)
 
-      Zbieramy takie informacje jak: kiedy zarejestrowałeś się na naszej stronie; kiedy uczestniczyłeś w życiu forum poprzez czytanie, pisanie oraz udoskolananie zawartości tu udostępnianej.
+      Zbieramy takie informacje jak: kiedy zarejestrowałeś/łaś się na naszej stronie; kiedy uczestniczyłeś/łaś w życiu forum poprzez czytanie, pisanie oraz udoskolananie zawartości tu udostępnianej.
 
-      Podczas rejestracji na naszej stronie możesz być zapytany o twoje imię i nazwisko oraz adres email. Możesz też przeglądać naszą stronę bez konieczności rejestracji. Twój adres email będzie weryfikowany poprzez przesłanie na niego unikalnego linku. Jeżeli nacisnąłeś na ten link, wiemy że ten adres email należy do Ciebie.
+      Podczas rejestracji na naszej stronie możesz być zapytany o twoje imię i nazwisko oraz adres email. Możesz też przeglądać naszą stronę bez konieczności rejestracji. Twój adres email będzie weryfikowany poprzez przesłanie na niego unikalnego linku. Jeżeli nacisnąłeś/łaś na ten link, wiemy że ten adres email należy do Ciebie.
 
       Podczas rejestracji oraz pisania treści zbieramy dane o twoim adresie IP. Możemy też zachowywać logi serwera, które pobierają dane o twoim adresie IP zawsze kiedy logujesz się na nasz serwer.
 
@@ -3989,7 +4058,7 @@ pl_PL:
       * Aby przystosować naszą stronę dla Ciebie &mdash; twoje informacje pomagają nam lepiej odpowiadać na twoje indywidualne potrzeby.
       * Aby ulepszyć naszą stronę &mdash; cały czas ulepszamy naszą stronę na podstawie informacji otrzymanych od Ciebie.
       * Aby ulepszyć obsługę klienta &mdash; informacje pomagają nam na efektywniejsze obsługiwanie twoich próśb.
-      * Aby wysyłać Tobie okresowe wiadomości email &mdash; Adres email, który podałeś może być użyty aby wysyłać Tobie informację o stronie, powiadomienia, odpowiedzi, wiadomości i tematy skierowane do Ciebie.
+      * Aby wysyłać Tobie okresowe wiadomości email &mdash; Adres email, który podałeś/łaś może być użyty aby wysyłać Tobie informację o stronie, powiadomienia, odpowiedzi, wiadomości i tematy skierowane do Ciebie.
 
       <a name="protect"></a>
 
@@ -4055,11 +4124,12 @@ pl_PL:
     mass_award:
       errors:
         invalid_csv: Natrafiliśmy na błąd w linii %{line_number}. Upewnij się, że plik CSV zawiera jeden adres w każdej linii.
+        badge_disabled: Najpierw włącz odznakę %{badge_name}.
     editor:
       name: Edytor
       description: Pierwsza edycja
       long_description: |
-        Ta odznaka jest przyznawana, gdy po raz pierwszy edytujesz jeden ze swoich postów. Chociaż nie będziesz mógł edytować swoich postów na zawsze, zachęcamy do edycji - możesz poprawić formatowanie, naprawić drobne błędy lub dodać wszystko, co przegapiłeś, gdy pisałeś swój post po raz pierwszy. Edytuj, aby Twoje posty były jeszcze lepsze!
+        Ta odznaka jest przyznawana, gdy po raz pierwszy edytujesz jeden ze swoich postów. Chociaż nie będziesz mógł/mogła edytować swoich postów na zawsze, zachęcamy do edycji - możesz poprawić formatowanie, naprawić drobne błędy lub dodać wszystko, co przegapiłeś, gdy pisałeś/łaś swój post po raz pierwszy. Edytuj, aby Twoje posty były jeszcze lepsze!
     wiki_editor:
       name: Redaktor Wiki
       description: Pierwsza edycja Wiki
@@ -4119,17 +4189,17 @@ pl_PL:
       name: Niezły Temat
       description: Otrzymano 10 polubień w temacie.
       long_description: |
-        Ta odznaka jest przyznawana, gdy Twój temat uzyska 10 polubień. Rozpocząłeś interesującą rozmowę, która spodobała się społeczności.
+        Ta odznaka jest przyznawana, gdy Twój temat uzyska 10 polubień. Rozpocząłeś/łaś interesującą rozmowę, która spodobała się społeczności.
     good_topic:
       name: Dobry Temat
       description: Otrzymano 25 polubień w temacie.
       long_description: |
-        Ta odznaka jest przyznawana, gdy Twój temat uzyska 25 polubień. Rozpocząłeś ożywioną rozmowę, wokół której zebrała się społeczność.
+        Ta odznaka jest przyznawana, gdy Twój temat uzyska 25 polubień. Rozpocząłeś/łaś ożywioną rozmowę, wokół której zebrała się społeczność.
     great_topic:
       name: Świetny Temat
       description: Otrzymano 50 polubień w temacie.
       long_description: |
-        Ta odznaka jest przyznawana, gdy Twój temat uzyska 50 polubień. Rozpocząłeś fascynującą rozmowę, a społeczność pokochała ożywioną dyskusję, która zaowocowała w dobry temat!
+        Ta odznaka jest przyznawana, gdy Twój temat uzyska 50 polubień. Rozpocząłeś/łaś fascynującą rozmowę, a społeczność pokochała ożywioną dyskusję, która zaowocowała w dobry temat!
     nice_share:
       name: Niezłe udostępnienie
       description: Udostępniono wpis z 25 unikalnymi odwiedzającymi.
@@ -4139,12 +4209,12 @@ pl_PL:
       name: Dobre udostępnienie
       description: Udostępniono wpis z 300 unikalnymi odwiedzającymi.
       long_description: |
-        Ta odznaka jest przyznawana za udostępnienie linku, który został kliknięty przez 300 zewnętrznych gości. Dobra robota! Pokazałeś świetną dyskusję kilku nowym osobom i pomogłeś tej społeczności się rozwijać.
+        Ta odznaka jest przyznawana za udostępnienie linku, który został kliknięty przez 300 zewnętrznych gości. Dobra robota! Pokazałeś/łaś świetną dyskusję kilku nowym osobom i pomogłeś/łaś tej społeczności się rozwijać.
     great_share:
       name: Świetne udostępnienie
       description: Udostępniono wpis z 1000 unikalnych odwiedzających.
       long_description: |
-        Ta odznaka jest przyznawana za udostępnienie linku, który został kliknięty przez 1000 zewnętrznych gości. Wow! Wypromowałeś interesującą dyskusję wśród ogromnej liczby nowych odbiorców i pomogłeś nam w dużym stopniu rozwinąć naszą społeczność!
+        Ta odznaka jest przyznawana za udostępnienie linku, który został kliknięty przez 1000 zewnętrznych gości. Wow! Wypromowałeś/łaś interesującą dyskusję wśród ogromnej liczby nowych odbiorców i pomogłeś/łaś nam w dużym stopniu rozwinąć naszą społeczność!
     first_like:
       name: Pierwsze polubienie
       description: Polubiono wpis
@@ -4164,7 +4234,7 @@ pl_PL:
       name: Działacz
       description: Zaproszenie 3 użytkowników
       long_description: |
-        Ta odznaka jest przyznawana, gdy zaprosiłeś 3 osoby, które następnie spędziły wystarczająco dużo czasu na stronie, aby stać się regularnymi użytkownikami. Żywa społeczność potrzebuje regularnego napływu nowych osób, które regularnie uczestniczą i dodają swoje opinie do dyskusji.
+        Ta odznaka jest przyznawana, gdy zaprosiłeś/łaś 3 osoby, które następnie spędziły wystarczająco dużo czasu na stronie, aby stać się regularnymi użytkownikami. Żywa społeczność potrzebuje regularnego napływu nowych osób, które regularnie uczestniczą i dodają swoje opinie do dyskusji.
     champion:
       name: Mistrz
       description: Zaproszono 5 użytkowników
@@ -4199,17 +4269,17 @@ pl_PL:
       name: Popularny link
       description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 50 kliknięć
       long_description: |
-        Ta odznaka jest przyznawana, gdy link, który udostępniłeś zostanie otwarty przynajmniej 50 razy. Dziękujemy za dodawanie przydatnych linków, które mają wyraźny wkład w zawartość konwersacji!
+        Ta odznaka jest przyznawana, gdy link, który udostępniłeś/łaś zostanie otwarty przynajmniej 50 razy. Dziękujemy za dodawanie przydatnych linków, które mają wyraźny wkład w zawartość konwersacji!
     hot_link:
       name: Gorący link
       description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 300 kliknięć
       long_description: |
-        Ta odznaka jest przyznawana, gdy link, który udostępniłeś zostanie otwarty przynajmniej 300 razy. Dziękujemy za udostępnienie ciekawe linku, który pozwolił rozwinąć konwersację i dodać nowy punkt widzenia dyskusji!
+        Ta odznaka jest przyznawana, gdy link, który udostępniłeś/łaś zostanie otwarty przynajmniej 300 razy. Dziękujemy za udostępnienie ciekawe linku, który pozwolił rozwinąć konwersację i dodać nowy punkt widzenia dyskusji!
     famous_link:
       name: Popularny link
       description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 1000 kliknięć
       long_description: |
-        Ta odznaka jest przyznawana, gdy link, który udostępniłeś zostanie otwarty przynajmniej 1000 razy. Wow! Udostępniłeś link, który wyraźnie przyczynił się do ulepszenia konwersacji poprzez dodanie niezbędnych szczegółów, zawartości i informacji. Dobra robota!
+        Ta odznaka jest przyznawana, gdy link, który udostępniłeś/łaś zostanie otwarty przynajmniej 1000 razy. Wow! Udostępniłeś/łaś link, który wyraźnie przyczynił się do ulepszenia konwersacji poprzez dodanie niezbędnych szczegółów, zawartości i informacji. Dobra robota!
     appreciated:
       name: Doceniony
       description: Otrzymano 1 polubienie w 20 wpisach
@@ -4244,22 +4314,22 @@ pl_PL:
       name: Dziękuje
       description: Ma 20 polubionych wpisów i dał 10 polubień
       long_description: |
-        Ta odznaka jest przyznawana, gdy masz co najmniej 20 polubionych wpisów i dałeś w zamian 10 lub więcej polubień. Gdy ktoś polubi twój wpis, znajdź czas, by polubić również wpisy innych użytkowników.
+        Ta odznaka jest przyznawana, gdy masz co najmniej 20 polubionych wpisów i dałeś/łaś w zamian 10 lub więcej polubień. Gdy ktoś polubi twój wpis, znajdź czas, by polubić również wpisy innych użytkowników.
     gives_back:
       name: Oddać
       description: Ma 100 polubionych wpisów i dał 100 polubień
       long_description: |
-        Ta odznaka jest przyznawana, gdy masz co najmniej 100 polubionych wpisów i dałeś w zamian 100 lub więcej polubień. Dziękujemy za twoją aktywność!
+        Ta odznaka jest przyznawana, gdy masz co najmniej 100 polubionych wpisów i dałeś/łaś w zamian 100 lub więcej polubień. Dziękujemy za twoją aktywność!
     empathetic:
       name: Empatyczny
       description: Ma 500 polubionych wpisów i dał 1000 polubień
       long_description: |
-        Ta odznaka jest przyznawana, gdy posiadasz 500 polubionych postów i oddałeś 1000 lub więcej polubień w zamian. Wow! Jesteś wzorem hojności i wzajemnego uznania :two_hearts:.
+        Ta odznaka jest przyznawana, gdy posiadasz 500 polubionych postów i oddałeś/łaś 1000 lub więcej polubień w zamian. Wow! Jesteś wzorem hojności i wzajemnego uznania :two_hearts:.
     first_emoji:
-      name: Pierwszy Emoji
+      name: Pierwsze Emoji
       description: Użyto Emoji we Wpisie
       long_description: |
-        Ta odznaka jest przyznawana za pierwszym razem, gdy dodasz emotikon do swojego posta :thumbsup:. Emotikony pozwalają wyrazić emocje w swoich wypowiedziach, od szczęścia :smiley: przez smutek :anguished: po złość :angry: i wszystko pomiędzy :sunglasses:. Po prostu wpisz : (dwukropek) lub naciśnij przycisk paska narzędzi Emoji w edytorze, aby wybrać spośród setek opcji do wyboru :ok_hand:
+        Ta odznaka jest przyznawana za pierwszym razem, gdy dodasz Emoji do swojego posta :thumbsup:. Emoji pozwalają wyrazić emocje w swoich wypowiedziach, od szczęścia :smiley: przez smutek :anguished: po złość :angry: i wszystko pomiędzy :sunglasses:. Po prostu wpisz : (dwukropek) lub naciśnij przycisk Emoji na pasku narzędzi w edytorze, aby wybrać spośród setek opcji do wyboru :ok_hand:
     first_mention:
       name: Pierwsze Wspomnienie
       description: Wspomniano o użytkowniku we wpisie
@@ -4274,7 +4344,7 @@ pl_PL:
       name: Pierwsza Odpowiedz przez Email
       description: Odpowiedział na wpis poprzez email
       long_description: |
-        Ta odznaka jest przyznawana kiedy pierwszy raz odpowiesz na wpis poprzez maila:.
+        Ta odznaka jest przyznawana kiedy pierwszy raz odpowiesz na post przez e-mail. :e-mail:
     new_user_of_the_month:
       name: "Nowy Użytkownik Miesiąca"
       description: Wybitny wkład w pierwszym miesiącu
@@ -4303,10 +4373,10 @@ pl_PL:
       unknown_email_address: "Nieznany adres e-mail."
       invalid_token: "Nieprawidłowy token."
     email_input: "Email administratora. "
-    submit_button: "Wyślij Email. "
+    submit_button: "Wyślij Email"
   performance_report:
-    initial_post_raw: Ten temat zawiera codzienne raporty wydajności dla twojej witryny.
-    initial_topic_title: Testy wydajności witryny.
+    initial_post_raw: Ten temat zawiera codzienne raporty wydajności dla twojej strony.
+    initial_topic_title: Raporty wydajności strony
   tags:
     title: "Etykiety"
     restricted_tag_disallowed: 'Nie można zastosować tagu "%{tag}”.'
@@ -4332,15 +4402,15 @@ pl_PL:
       synonym: 'Synonimy nie są dozwolone. Zamiast tego użyj "%{tag_name}".'
       has_synonyms: 'Nie można użyć "%{tag_name}", ponieważ zawiera synonimy.'
     required_tags_from_group:
-      one: "Musisz dołączyć co najmniej %{count} %{tag_group_name} tag."
-      few: "Musisz dołączyć co najmniej %{count} %{tag_group_name} tagi."
-      many: "Musisz dołączyć co najmniej %{count} %{tag_group_name} tagów."
-      other: "Musisz dołączyć co najmniej %{count} %{tag_group_name} tagów."
+      one: "Musisz dołączyć co najmniej %{count} %{tag_group_name} tag. Tagi w tej grupie to: %{tags}."
+      few: "Musisz dołączyć co najmniej %{count} %{tag_group_name} tagi. Tagi w tej grupie to: %{tags}."
+      many: "Musisz dołączyć co najmniej %{count} %{tag_group_name} tagów. Tagi w tej grupie to: %{tags}."
+      other: "Musisz dołączyć co najmniej %{count} %{tag_group_name} tagów. Tagi w tej grupie to: %{tags}."
     invalid_target_tag: "nie może być synonimem synonimu"
     synonyms_exist: "nie jest dozwolone, gdy istnieją synonimy"
   rss_by_tag: "Tematy otagowane %{tag}"
   finish_installation:
-    congratulations: "Gratulacje, zainstalowałeś Discourse!"
+    congratulations: "Gratulacje, zainstalowałeś/łaś Discourse!"
     register:
       button: "Zarejestruj"
       title: "Zarejestrowano konto administratora"
@@ -4348,10 +4418,10 @@ pl_PL:
       no_emails: "Niestety, podczas instalacji nie zdefiniowano żadnych e-maili administratora, więc finalizacja konfiguracji może być trudna. Dodaj adres e-mail programisty w pliku konfiguracyjnym lub <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>utwórz konto administratora z konsoli</a>."
     confirm_email:
       title: "Potwierdzenie przez email"
-      message: "<p>Wysłaliśmy wiadomość aktywacyjną na adres <b>%{email}</b>. Postępuj zgodnie z instrukcjami zawartymi w wiadomości e-mail, aby aktywować swoje konto.</p><p>Jeśli nie dotrze, sprawdź folder spamu i <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>upewnij się, że poprawnie skonfigurowałeś e-maile</a>.</p>"
+      message: "<p>Wysłaliśmy wiadomość aktywacyjną na adres <b>%{email}</b>. Postępuj zgodnie z instrukcjami zawartymi w wiadomości e-mail, aby aktywować swoje konto.</p><p>Jeśli nie dotrze, sprawdź folder spamu i <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>upewnij się, że poprawnie skonfigurowałeś/łaś e-maile</a>.</p>"
     resend_email:
       title: "Ponowne przesyłanie emaila aktywacyjnego"
-      message: "<p>Powtórnie przesłaliśmy maila aktywacyjnego do <b>%{email}</b>"
+      message: "<p>Powtórnie przesłaliśmy e-maila aktywacyjnego do <b>%{email}</b>"
   safe_mode:
     title: "Wejście w tryb bezpieczny"
     description: "Tryb awaryjny pozwala na sprawdzenie twojej strony bez ładowania pluginów i modyfikacji."
@@ -4364,7 +4434,7 @@ pl_PL:
     title: "Instalacja Discourse"
     step:
       locale:
-        title: "Witaj w Discourse "
+        title: "Witaj w swoim Discourse!"
         fields:
           default_locale:
             description: "Jaki jest podstawowy język dla twojej społeczności?"
@@ -4383,11 +4453,11 @@ pl_PL:
             placeholder: "Najlepsza społeczność kiedykolwiek"
       introduction:
         title: "Wprowadzenie"
-        disabled: "<p>Nie znaleźliśmy żadnego tematu o tytule “%{topic_title}”.</p> <ul> <li>Jeśli zmieniłeś tytuł, edytuj ten temat, aby zmodyfikować tekst wprowadzający do witryny.</li> <li>Jeśli usunąłeś ten temat, utwórz kolejny temat z “%{topic_title}” jako tytuł. Treść pierwszego posta to tekst wprowadzający do Twojej witryny.</li> </ul>"
+        disabled: "<p>Nie znaleźliśmy żadnego tematu o tytule “%{topic_title}”.</p> <ul> <li>Jeśli zmieniłeś/łaś tytuł, edytuj ten temat, aby zmodyfikować tekst wprowadzający do witryny.</li> <li>Jeśli usunąłeś/łaś ten temat, utwórz kolejny temat z “%{topic_title}” jako tytuł. Treść pierwszego posta to tekst wprowadzający do Twojej witryny.</li> </ul>"
         fields:
           welcome:
             label: "Temat powitalny"
-            description: "<p>Jak opisałbyś twoją społeczność nieznajomemu w windzie mając tylko 1 minutę?</p><ul><li> Dla kogo są te dyskusje?</li><li>Gdzie mogę je znaleźć?</li><li>Dlaczego powinienem odwiedzić tą społeczność?</li></ul>Temat wprowadzający to pierwsza rzecz, którą nowi użytkownicy przeczytają. Pomyśl o tym, jak o <b>jednym paragrafie</b> 'sprzedanie pomysłu' lub 'misja przedsiębiorstwa'.</p>"
+            description: "<p>Jak opisałbyś twoją społeczność nieznajomemu w windzie mając tylko 1 minutę?</p> <ul> <li>Dla kogo są te dyskusje?</li> <li>Gdzie mogę je znaleźć?</li> <li>Dlaczego powinienem odwiedzić tą społeczność?</li> </ul><p>Temat wprowadzający to pierwsza rzecz, którą nowi użytkownicy przeczytają. Pomyśl o tym, jak o <b>jednym paragrafie</b> 'sprzedanie pomysłu' lub 'misja przedsiębiorstwa'.</p>"
             one_paragraph: "Ogranicz wiadomość powitalną do jednego akapitu."
             extra_description: "Jeśli nie masz pewności, możesz pominąć ten krok i edytować temat powitalny później."
       privacy:
@@ -4487,9 +4557,6 @@ pl_PL:
                 label: "Bloki kategorii"
               categories_boxes_with_topics:
                 label: "Bloki kategorii z tematami"
-      emoji:
-        title: "Emotikony"
-        description: "Który styl emoji preferujesz dla twojej społeczności? Możesz dodać więcej niestandardowym emoji poprzez Admin, Dostosuj, Emoji."
       invites:
         title: "Zaproś administrację"
         description: "Już prawie koniec! Teraz zaprośmy trochę ludzi, aby rozwinąć twoją społeczność i pomóc <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>zasiać nowe dyskusje</a> poprzez interesujące tematy i odpowiedzi."
@@ -4512,7 +4579,7 @@ pl_PL:
       posted: '%{username} pisze w "%{topic}" - %{site_title}'
       private_message: '%{username} wysłał Ci prywatną 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}'
+      watching_first_post: '%{username} utworzył(a) 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}"
@@ -4551,8 +4618,8 @@ pl_PL:
       new_topics_unless_trust_level: "Użytkownicy o niskim poziomie zaufania muszą mieć tematy zatwierdzone przez personel. Zobacz `approve_new_topics_unless_trust_level`."
       fast_typer: "Nowy użytkownik wpisał swój pierwszy post podejrzanie szybko, co sugeruje zachowanie bota lub spamera. Zobacz `min_first_post_typing_time`."
       auto_silence_regexp: "Nowy użytkownik, którego pierwszy post pasuje do ustawienia `auto_silence_first_post_regex`."
-      watched_word: "Ten post zawierał obserwowane słowo. Zobacz listę <a href='%{base_url}/admin/logs/watched_words'>obserwowanych słów</a>."
-      staged: "Nowe tematy i posty dla użytkowników przejściowych muszą zostać zatwierdzone przez personel. Zobacz `approve_unless_staged`."
+      watched_word: "Ten post zawierał obserwowane słowo. Zobacz listę <a href='%{base_url}/admin/customize/watched_words'>obserwowanych słów</a>."
+      staged: "Nowe tematy i posty dla użytkowników etapowych muszą zostać zatwierdzone przez personel. Zobacz `approve_unless_staged`."
       category: "Posty w tej kategorii wymagają ręcznego zatwierdzenia przez personel. Zobacz ustawienia kategorii."
       must_approve_users: "Wszyscy nowi użytkownicy muszą zostać zatwierdzeni przez personel. Zobacz `must_approve_users`."
       invite_only: "Wszyscy nowi użytkownicy powinni zostać zaproszeni. Zobacz `invite_only`."
@@ -4560,6 +4627,7 @@ pl_PL:
       email_spam: "Ten e-mail został oznaczony jako spam przez nagłówek zdefiniowany w `email_in_spam_header`."
       suspect_user: "Ten nowy użytkownik wprowadził informacje profilowe bez czytania żadnych tematów ani postów, co zdecydowanie sugeruje, że może być spamerem. Zobacz `approve_suspect_users`."
       contains_media: "Ten post zawiera osadzone multimedia. Zobacz `review_media_unless_trust_level`."
+      queued_by_staff: "Pracownik uważa, że ten wpis wymaga przeglądu. Do tego czasu pozostanie ukryty."
     actions:
       agree:
         title: "Zgadzam się..."
@@ -4629,6 +4697,17 @@ pl_PL:
           description: "Użytkownik zostanie usunięty, a my zablokujemy jego adres IP i e-mail."
       reject:
         title: "Odrzuć"
+        bundle_title: "Odrzuć..."
+      reject_and_suspend:
+        title: "Odrzuć i zawieś użytkownika"
+      reject_and_silence:
+        title: "Odrzuć i wycisz użytkownika"
+      reject_and_delete:
+        title: "Odrzuć i usuń post"
+      reject_and_keep_deleted:
+        title: "Zachowaj usunięcie postu"
+      approve_and_restore:
+        title: "Zatwierdź i przywróć post"
       delete_user:
         title: "Usuń użytkownika"
         confirm: "Czy na pewno chcesz usunąć tego użytkownika? Spowoduje to usunięcie wszystkich jego postów i zablokowanie adresu e-mail oraz IP."
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 7c5920a2cd..f7555b0c68 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -39,6 +39,7 @@ pt:
   title: "Discourse"
   topics: "Tópicos"
   posts: "mensagens"
+  views: "vistas"
   loading: "A carregar"
   powered_by_html: 'Desenvolvido por <a href="https://www.discourse.org">Discourse</a>, e melhor visualização com o JavaScript ativado'
   sign_up: "Inscrever-se"
@@ -50,6 +51,8 @@ pt:
   remove_posts_deleted_by_author: "Eliminado pelo autor"
   redirect_warning: "Nós não conseguimos verificar se a hiperligação que selecionou foi publicada no fórum. Se desejar continuar de qualquer maneira, selecione a hiperligação abaixo."
   on_another_topic: "Noutro tópico"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} por %{username}"
   themes:
     bad_color_scheme: "Não é possível atualizar o tema, a paleta de cores é inválida"
     other_error: "Ocorreu algo de errado ao atualizar o tema"
@@ -161,7 +164,6 @@ pt:
         one: tem o comprimento errado (deve ter %{count} caracter)
         other: tem o comprimento errado (deve ter %{count} caracteres)
       other_than: "tem que ser diferente de %{count}"
-      sso_overrides_username: "Nome de utilizador precisa de ser atualizado do lado do fornecedor de SSO, visto a configuração `sso_overrides_username` estar ativada."
     template:
       body: ! "Ocorreram problemas com os seguintes campos:"
       header:
@@ -185,15 +187,11 @@ pt:
       share_quote_facebook_requirements: "Você tem de definir um ID de Aplicação do Facebook para ativar a partilha de citações para o Facebook."
       second_factor_cannot_enforce_with_socials: "Você não pode aplicar o 2FA com logins sociais ativados. Você tem primeiro de desativar o login via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Não pode forçar 2FA se logins locais estiver desativado."
-      second_factor_cannot_be_enforced_with_sso_enabled: "Você não pode aplicar o 2FA se o SSO estiver ativado."
   invite:
     not_found_json: "O seu token de convite é inválido. Por favor contacte a equipa de apoio."
-    error_message: "Ocorreu um erro ao aceitar o convite. Entre em contato com o administrador do site."
     confirm_email: "<p>Está quase pronto! Enviámos um email de ativação para o seu endereço de e-mail. Por favor, siga as instruções no e-mail para ativar a sua conta.</p><p>Se não o tiver recebido, verifique a sua pasta de spam.</p>"
     cant_invite_to_group: "Você não tem permissão para convidar usuários para grupos específicos. Certifique-se de que você é o proprietário do(s) grupo(s) para o qual está tentando convidar."
     disabled_errors:
-      sso_enabled: "Os convites estão desativados porque o SSO está ativado."
-      local_logins_disabled: "Os convites são desativados porque a opção “ativar logins locais” está desativada."
       invalid_access: "Você não tem permissão para visualizar o recurso solicitado."
   bulk_invite:
     file_should_be_csv: "O ficheiro carregado deve ser do formato CSV."
@@ -207,7 +205,6 @@ pt:
     muted_topic: "Desculpe, esse usuário silenciou este tópico."
     receiver_does_not_allow_pm: "Desculpe, esse usuário não permite que você lhe envie mensagens privadas."
     sender_does_not_allow_pm: "Desculpe, você não permite que esse usuário lhe envie mensagens privadas."
-    receiver_does_not_allow_other_user_pm: "Desculpe, esse usuário não permite que um participante existente lhe envie mensagens privadas."
   backup:
     operation_already_running: "Existe atualmente uma operação em execução. Neste momento não é possível iniciar um novo trabalho. "
     backup_file_should_be_tar_gz: "O ficheiro da cópia de segurança deve ser um arquivo .tar.gz"
@@ -245,6 +242,9 @@ pt:
     permalink: "Hiperligação Permanente"
     imported_from: "Este é um tópico de discussão de acompanhamento para a entrada original em %{link}"
     in_reply_to: "▶ %{username}"
+    replies:
+      one: "%{count} resposta"
+      other: "%{count} respostas"
     created: "Criado"
     new_topic: "Criar novo tópico"
   no_mentions_allowed: "Pedimos desculpa, não pode mencionar outros utilizadores."
@@ -281,6 +281,9 @@ 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}'"
+  rss_num_posts:
+    one: "%{count} publicação"
+    other: "%{count} publicações"
   read_full_topic: "Ler tópico completo"
   private_message_abbrev: "Msg"
   rss_description:
@@ -304,9 +307,11 @@ pt:
   bookmarks:
     reminders:
       later_today: "Hoje, mais tarde"
+      next_business_day: "Próximo dia útil"
       tomorrow: "Amanhã"
       next_week: "Próxima semana"
       next_month: "Próximo mês"
+      custom: "Data e hora personalizadas"
   groups:
     errors:
       can_not_modify_automatic: "Não pode modificar um grupo automático"
@@ -331,28 +336,6 @@ pt:
     until_posts:
       one: "%{count} mensagem"
       other: "%{count} mensagens"
-    "new-topic": |2
-
-      Bem-vindo a %{site_name} &mdash; **obrigado por começar uma nova conversação!**
-
-      - O título parece-lhe interessante se o ler em voz alto? É um bom resumo?
-
-      - Quem estaria interessado no mesmo? Porque é importante? Que tipo de respostas pretende?
-
-      - Inclua palavras usadas com frequência no seu tópico para que outros possam *encontrá-lo*. Para agrupar o seu tópico com tópicos relacionados, selecione a categoria.
-
-      Para mais, [verifique as orientações da comunidade](%{base_path}/guidelines). Este painel irá aparecer apenas para o seu primeiro %{education_posts_text}.
-    "new-reply": |2
-
-      Bem-vindo a %{site_name} &mdash; **obrigado por contribuir!**
-
-      - A sua resposta melhora de alguma maneira esta conversação?
-
-      - Seja gentil com os restantes membros da comunidade.
-
-      - Críticas construtivas são bem-vindas, mas critique *ideias*, não pessoas.
-
-      Para mais, [verifique as orientações da comunidade](%{base_path}/guidelines). Este painel irá aparecer apenas para o seu primeiro %{education_posts_text}.
   activerecord:
     attributes:
       category:
@@ -589,6 +572,7 @@ pt:
       short_description: "Gostar desta publicação"
   user_activity:
     no_bookmarks:
+      self: "Você não tem posts marcados; os favoritos permitem-lhe consultar rapidamente posts específicos."
       others: "Sem marcadores."
     no_likes_given:
       self: "Ainda não gostou de nenhuma publicação."
@@ -625,9 +609,7 @@ pt:
     mute_topic: "Silenciar todas as notificações para este tópico, %{link}"
     unwatch_category: "Deixar de seguir todos os tópicos em %{category}"
     mailing_list_mode: "Desligar modo de lista de distribuição"
-    all: "Não me mandar email de %{sitename}"
     different_user_description: "Está ligado como um utilizador diferente do que aquele para o qual enviamos email. Por favor saia, ou entre em modo anónimo, e tente novamente."
-    not_found_description: "Pedimos desculpa, não conseguimos cancelar a sua subscrição. É possível que a ligação no seu email tenha expirado?"
     log_out: "Sair"
     digest_frequency:
       never: "nunca"
@@ -657,6 +639,7 @@ pt:
   reports:
     default:
       labels:
+        count: Contagem
         day: Dia
     post_edits:
       labels:
@@ -667,6 +650,7 @@ pt:
     user_flagging_ratio:
       labels:
         user: Utilizador
+        score: Pontuação
     moderators_activity:
       title: "Atividade de Moderador"
       labels:
@@ -716,6 +700,7 @@ pt:
       title: "Gostos"
       xaxis: "Dia"
       yaxis: "Número de novos gostos"
+      description: "Número de novos gostos."
     flags:
       title: "Sinalizações"
       xaxis: "Dia"
@@ -728,6 +713,7 @@ pt:
       title: "Utilizadores por Nível de Confiança"
       xaxis: "Nível de Confiança"
       yaxis: "Número de Utilizadores"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       xaxis: "Tipo"
       yaxis: "Número de Utilizadores"
@@ -909,7 +895,9 @@ pt:
     show_pinned_excerpt_mobile: "Mostrar excerto em publicações afixadas na vista móvel."
     show_pinned_excerpt_desktop: "Mostar excerto em publicações afixadas na vista de desktop."
     post_onebox_maxlength: "Tamanho máximo de uma mensagem Discourse de caixa única, em caracteres."
+    blocked_onebox_domains: "Uma lista de domínios para a qual nunca serão geradas pré-visualizações."
     max_oneboxes_per_post: "Número máximo de pré-visualizações numa publicação."
+    manifest_screenshots: "Capturas de tela que mostrem os recursos e a funcionalidade da instância na página de incentivo à instalação. Todas as imagens devem ser envios locais e das mesmas dimensões."
     notification_email: "Para: endereço de email usado ao enviar emails essenciais do sistema. O domínio especificado aqui deverá ter SPF, DKIM e registos PTR inversos configurados corretamente para a chegada do email."
     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?"
@@ -934,6 +922,7 @@ pt:
     pending_users_reminder_delay: "Notificar moderadores se novos utilizadores estiverem à espera de aprovação por mais que esta quantidade de horas. Configurar com -1 para desativar notificações."
     maximum_session_age: "Utilizador permanecerá ligado durante n horas desde a última visita"
     cors_origins: "Permitidos compartilhamentos de recursos de origem-cruzada (CORS). Cada origem deve incluir http:// ou https://. A variável de ambiente DISCOURSE_ENABLE_CORS tem que estar configurada a verdadeiro para ativar o CORS."
+    use_admin_ip_allowlist: "Os Administradores só podem iniciar sessão se estiverem num endereço IP definido na lista de IPs Rastreados (Admin > Logs > IPs Rastreados)."
     top_menu: "Determinar que elementos aparecem na navegação da página principal, e em que ordem. Exemplo últimos|novos|não lidos|categorias|topo|lidos|publicados|marcadores"
     post_menu: "Determine que itens irão aparecer no menu de mensagens, e em que ordem. Exemplo\ngostar|editar|sinalizar|eliminar|partilhar|marcar|responder"
     post_menu_hidden_items: "Os elementos do menu a serem escondidos por defeito no menu de mensagens a não ser que se clique na elipse de expansão."
@@ -952,6 +941,8 @@ pt:
     email_token_valid_hours: "Os símbolos para palavra-passe esquecida /conta ativada são válidos por (n) horas."
     enable_badges: "Ativar o sistema de distintivos"
     enable_whispers: "Permitir à equipa de apio comunicar de forma privada dentro de tópicos."
+    blocked_email_domains: "Lista de domínios de email que os utilizadores não podem usar para registo de contas. Exemplo: mailinator.com|trashmail.net"
+    allowed_email_domains: "Lista de domínios de email que os utilizadores DEVEM usar para registar contas. AVISO: Utilizadores com domínios de email diferentes dos listados não serão permitidos!"
     log_out_strict: "Ao terminar sessão, saia de TODAS as sessões do utilizador em todos dispositivos"
     new_version_emails: "Enviar um email para o endereço 'contact_email' quando uma nova versão do Discourse estiver disponível."
     invite_expiry_days: "Durante quantos dias as chaves de convite são válidas."
@@ -959,11 +950,7 @@ pt:
     min_password_length: "Tamanho mínimo da palavra-passe."
     min_admin_password_length: "Tamanho mínimo da palavra-passe para Administração."
     block_common_passwords: "Não permitir palavras-passe que estejam nas 10,000 palavras-passe mais comuns."
-    enable_sso: "Ativar inscrição única através de um sítio externo (AVISO: OS ENDEREÇOS DE EMAIL DOS UTILIZADORES *DEVEM* SER VALIDADOS PELO SÍTIO EXTERNO!)"
-    sso_url: "URL da terminação de single-sign-on (tem de incluir http:// ou https://)"
-    sso_secret: "String secreta usada para autenticar criptograficamente informação SSO, garanta que tem 10 ou mais caracteres"
-    sso_overrides_bio: "Sobrepõe-se à biografia do utilizador e previne o utilizador de a mudar"
-    sso_not_approved_url: "Redirecionar contas SSO não aprovadas para este URL"
+    discourse_connect_overrides_bio: "Sobrepõe-se à biografia do utilizador e previne o utilizador de a mudar"
     allow_new_registrations: "Permitir registo de novos utilizadores. Desmarcar isto para prevenir que alguém crie uma nova conta."
     enable_signup_cta: "Mostrar um aviso a utilizadores anónimos que retornem levando-os a inscreverem-se para uma conta."
     google_oauth2_client_id: "ID do cliente da sua aplicação Google."
@@ -980,7 +967,6 @@ pt:
     top_topics_formula_log_views_multiplier: "fórmula do multiplicador (n) de visualizações logarítmica nos melhores tópicos: `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: "valor do multiplicador (n) de gostos da primeira publicação na fórmula dos melhores tópicos: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "valor do multiplicador (n) de menos gostos por publicação na fórmula dos melhores tópicos: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Número de publicações antigas a serem re-cozidos cada 15 minutos."
     rate_limit_create_topic: "Após a criação de um tópico, os utilizadores devem esperar (n) segundos antes de criarem um novo tópico."
     rate_limit_create_post: "Após a publicação, os utilizadores devem esperar (n) segundos antes de criarem outra mensagem."
     rate_limit_new_user_create_topic: "Após a criação de um tópico, os novos utilizadores devem esperar (n) segundos antes de criarem um novo tópico."
@@ -992,6 +978,7 @@ pt:
     max_topics_per_day: "Número máximo de tópicos que um utilizador pode criar por dia."
     max_invites_per_day: "Número máximo de convites que um utilizador pode enviar por dia."
     max_topic_invitations_per_day: "Número máximo de convites para tópicos que um utilizador pode enviar por dia."
+    invite_link_max_redemptions_limit_users: "O máximo de resgates permitido para links de convite gerados por usuários comuns não pode ser superior a este valor."
     alert_admins_if_errors_per_minute: "Número de erros por minuto necessários para disparar um alerta de administração. Um valor maior que 0 desativa esta funcionalidade. NOTA: requer reinício."
     alert_admins_if_errors_per_hour: "Número de erros por hora necessários para disparar um alerta de administração. Um valor maior que 0 desativa esta funcionalidade. NOTA: requer reinício."
     suggested_topics: "Número de tópicos sugeridos mostrados no final de um tópico."
@@ -1007,7 +994,6 @@ pt:
     external_system_avatars_enabled: "Utilize o serviço do sistema externo de avatars."
     external_system_avatars_url: "URL do serviço de avatares externo do sistema. Substituições permitidas são {username} {first_letter} {color} {size}"
     allow_all_attachments_for_group_messages: "Permitir qualquer anexo de email nas mensagens de grupo."
-    enable_flash_video_onebox: "Ativar a incorporação de hiperligações swf e flv (Adobe Flash) em caixas únicas. AVISO: pode introduzir riscos de segurança."
     default_invitee_trust_level: "Nível de Confiança padrão (0-4) para utilizadores convidados."
     default_trust_level: "Nível de Confiança padrão (0-4) para todos os novos utilizadores. AVISO! Alterar isto irá colocá-lo em sério risco de spam."
     tl1_requires_topics_entered: "Quantos tópicos um novo utilizador deve introduzir antes de ser promovido para o Nível de Confiança 1."
@@ -1056,6 +1042,7 @@ 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."
+    dark_mode_none: "Nenhum"
     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."
@@ -1076,6 +1063,7 @@ pt:
     tos_url: "Se tem um documento de Termos de Serviço alojado noutro local e que queira usar, forneça a URL completa aqui."
     privacy_policy_url: "Se tem um documento de Política de Privacidade alojado noutro local e que queira usar, forneça a URL completa aqui."
     newuser_spam_host_threshold: "Quantas vezes um novo utilizador pode colocar um link para o mesmo endereço dentro do número de publicações `newuser_spam_host_threshold` , antes de ser considerado spam."
+    allowed_spam_host_domains: "Lista de domínios excluídos dos testes de spam. Novos utilizadores nunca irão ser restritos da criação de mensagens com hiperligações a esses domínios."
     topic_view_duration_hours: "Contar uma nova visualização do tópico uma vez por IP/Utilizador a cada N horas"
     user_profile_view_duration_hours: "Contar visualização de novo perfil de utilizador uma vez por IP/utilizador a cada N horas"
     levenshtein_distance_spammer_emails: "Ao fazer a correspondência de e-mails de spam, o número de caracteres de diferença que ainda permitirá uma correspondência difusa."
@@ -1099,6 +1087,7 @@ pt:
     max_emails_per_day_per_user: "Número máximo de emails para enviar aos utilizadores por dia. 0 para desativar o limite"
     enable_staged_users: "Automaticamente criar utilizadores temporários ao processar emails recebidos."
     maximum_staged_users_per_email: "Número máximo de utilizadores temporários criados ao processar um email recebido."
+    auto_generated_allowlist: "Lista de endereços de email que não serão verificados para conteúdo gerado automaticamente. Exemplo: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Bloquear as mensagens a receber que sejam identificadas como tendo sido geradas automaticamente."
     ignore_by_title: "Ignorar emails recebidos com base no seu título."
     mailgun_api_key: "Chave de API secreta de Mailgun usada para verificar mensagens."
@@ -1168,7 +1157,6 @@ pt:
     show_create_topics_notice: "Se o sítio tem menos de 5 tópicos públicos, mostrar um aviso pedindo aos administradores a criação de mais tópicos."
     delete_drafts_older_than_n_days: "Eliminar rascunhos mais antigos que (n) days."
     bootstrap_mode_min_users: "Número mínimo de utilizadores necessários para desactivar o modo de inicialização (coloque 0 para desactivar)"
-    prevent_anons_from_downloading_files: "Previna que utilizadores anónimos descarreguem anexos. AVISO: isto irá fazer com que quaisquer atributos (que não sejam imagens) publicados como anexos não funcionem."
     slug_generation_method: "Escolha um método de geração slug. 'encoded' irá gerar sequências de caracteres com código percentual. 'none' irá desativar slug por completo."
     enable_emoji: "Ativar emoji"
     emoji_set: "Como gostaria de ter o seu emoji?"
@@ -1178,12 +1166,13 @@ pt:
     auto_close_messages_post_count: "Número máximo de publicações numa mensagem antes de a fechar automáticamente (configurar a 0 para desactivar)"
     auto_close_topics_post_count: "Número máximo de publicações num tópico antes de o fechar automáticamente (configurar a 0 para desactivar)"
     code_formatting_style: "Botão de código no compositor por defeito usa este estilo de formatação"
+    watched_words_regular_expressions: "Palavras vigiadas são expressões regulares."
+    enable_diffhtml_preview: "Funcionalidade experimental que utiliza diffHTML para sincronizar a pré-visualização em vez da re-renderização completa"
     blur_tl0_flagged_posts_media: "Desfocar imagens sinalizadas para ocultar conteúdo potencialmente NSPT."
     default_email_digest_frequency: "Por defeito, quantas frequentemente os utilizadores recebem emails de resumo."
     default_include_tl0_in_digests: "Incluir publicações de novos utilizadores nos emails de resumo por defeito. Utilizadores podem alterar isto nas suas preferências."
     default_email_mailing_list_mode: "Por defeito, enviar um email por cada nova mensagem."
     default_email_mailing_list_mode_frequency: "Utilizadores que activem o modo de lista de distribuição receberão, por omissão, emails com esta frequência."
-    disable_mailing_list_mode: "Não permitir aos utilizadores habilitar o modo de lista de distribuição."
     default_email_previous_replies: "Incluir, por omissão, respostas prévias nos emails."
     default_email_in_reply_to: "Incluir, por omissão, um excerto da publicação respondida nos emails."
     default_other_new_topic_duration_minutes: "Condição global por defeito para o qual um tópico é considerado novo."
@@ -1192,6 +1181,7 @@ pt:
     default_other_external_links_in_new_tab: "Por defeito, abrir hiperligações externas num novo separador."
     default_other_enable_quoting: "Por defeito, ativar resposta por citação para texto destacado."
     default_other_dynamic_favicon: "Mostrar contagem de tópicos novos / atualizados no ícone do browser."
+    default_other_skip_new_user_tips: "Ignorar dicas e emblemas de integração de novos usuários."
     default_other_like_notification_frequency: "Notificar, por omissão, os utilizadores quando alguém gostar"
     default_topics_automatic_unpin: "Desafixar automaticamente tópicos quando um utilizador chega ao final, por defeito."
     default_categories_watching: "Lista de categorias que por defeito são vigiadas."
@@ -1200,7 +1190,6 @@ pt:
     default_categories_watching_first_post: "Lista de categorias em que a primeira publicação em cada novo tópico será vigiada por defeito."
     allow_user_api_keys: "Permitir geração de chaves de API de utilizador"
     allow_user_api_key_scopes: "Lista de esferas permitidas para chaves da API de utlizador"
-    max_api_keys_per_user: "Número máximo de chaves de API de utilizador por utlizador"
     min_trust_level_for_user_api_key: "Nível de confiança requerido para gerar chaves da API de utilizador"
     allowed_user_api_push_urls: "URLs permitidos para o servidor fazer push para a API de utilizador"
     tagging_enabled: "Permitir etiquetas em tópicos?"
@@ -1208,7 +1197,6 @@ pt:
     max_tags_per_topic: "O número máximo de etiquetas que podem ser aplicadas a um tópico."
     max_tag_length: "O número máximo de carateres que pode ser utilizado numa etiqueta."
     max_tag_search_results: "Ao pesquisar por etiquetas, o número máximo de resultados a mostrar."
-    show_filter_by_tag: "Mostrar filtro de etiquetas para a lista de tópicos."
     max_tags_in_filter_list: "Número máximo de etiquetas a mostrar no filtro de etiquetas. Serão mostradas as etiquetas mais utilizadas."
     tags_sort_alphabetically: "Mostrar etiquetas por ordem alfabética. São, por omissão, ordenadas por popularidade."
     tag_style: "Estilo visual dos distintivos das etiquetas."
@@ -1247,7 +1235,7 @@ pt:
       topic: "Resultados"
       user: "Utilizadores"
     results_page: "Resultados da pesquisa por '%{term}'"
-  sso:
+  discourse_connect:
     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."
     account_not_approved: "A sua conta ainda não foi aprovada. Receberá uma notificação por email quando a sua conta for aprovada."
@@ -1318,6 +1306,7 @@ pt:
     email_too_long: "O email fornecido é demasiado longo. Nomes de caixas de email não devem ter mais que 254 caracteres, e nomes de domínio não devem ter mais que 253 caracteres."
     reserved_username: "Esse nome de utilizador não é permitido."
     missing_user_field: "Não completou todos os campos de utilizador."
+    second_factor_title: "Autenticação em Dois Passos"
     second_factor_backup_description: "Por favor introduza um dos seus códigos de reserva:"
   admin:
     email:
@@ -1341,6 +1330,9 @@ pt:
     ip_address:
       blocked: "Novos registos não são permitidos a partir do seu endereço IP."
       max_new_accounts_per_registration_ip: "Novos registos não são permitidos a partir do seu endereço IP (limite máximo atingido).Contacte um membro do pessoal."
+    destroy_reasons:
+      reviewable_reject_auto: "Gerir automaticamente itens de revisão pendentes"
+      reviewable_reject: "Usuário em revisão rejeitado"
   unsubscribe_mailer:
     subject_template: "Confirme que não quer receber emails com actualizações de %{site_title}"
   invite_password_instructions:
@@ -1378,6 +1370,19 @@ pt:
     post_hidden:
       title: "Artigo Ocultado"
       subject_template: "Publicação oculta devido a denúncias da comunidade"
+    queued_by_staff:
+      title: "A Publicação Necessita de Aprovação"
+      subject_template: "Publicação ocultada pelo pessoal, aguardando aprovação"
+      text_body_template: |
+        Olá,
+
+        Esta é uma mensagem automática de %{site_name} a dar-lhe conta de que a sua publicação foi ocultada.
+
+        <%{base_url}%{url}>
+
+        A sua publicação permanecerá oculta até que um membro do pessoal a reveja.
+
+        Para orientações adicionais, por favor consulte as nossas [regras da comunidade](%{base_url}/guidelines).
     welcome_user:
       title: "Bem-vindo Utilizador"
       subject_template: "Bem-vindo a %{site_name}!"
@@ -1748,6 +1753,7 @@ pt:
     sender_body_blank: "corpo está em branco"
   color_schemes:
     base_theme_name: "Base"
+    default_theme_name: "Predefinição"
   edit_this_page: "Editar esta página"
   csv_export:
     boolean_yes: "Sim"
@@ -1850,6 +1856,9 @@ pt:
 
       Este documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013.
   badges:
+    mass_award:
+      errors:
+        badge_disabled: Por favor, ative o distintivo %{badge_name} primeiro.
     editor:
       name: Editor
       description: Primeira edição de publicação
@@ -2083,11 +2092,18 @@ pt:
             description: "Endereço de email da pessoa ou grupo responsáveis por esta comunidade. Usado para notificações críticas tais como denúncias não tratadas, actualizações de segurança, assim como <a href='%{base_path}/about' target='_blank'>na sua página de descrição</a> para comunicações urgentes com a comunidade."
           contact_url:
             label: "Página da Internet"
+            placeholder: "https://www.example.com/contact-us"
             description: "Página da internet com informação geral sobre si ou a sua organização. Será mostrada na <a href='%{base_path}/about' target='_blank'>sua página de descrição</a>."
           site_contact:
             label: "Mensagens Automatizadas"
       corporate:
         title: "Organização"
+      colors:
+        title: "Cores"
+      fonts:
+        fields:
+          font_preview:
+            label: "Pré-visualização"
       logos:
         title: "Logos"
         fields:
@@ -2113,8 +2129,6 @@ pt:
                 label: "Categorias e Tópicos Recentes"
               categories_and_top_topics:
                 label: "Categorias e Melhores Tópicos"
-      emoji:
-        title: "Emoji"
       invites:
         title: "Convidar Equipa de Apoio"
       finished:
@@ -2132,6 +2146,14 @@ pt:
       confirm_title: "Notificações ativas - %{site_title}"
       confirm_body: "Sucesso! As notificações foram ativadas."
   reviewables:
+    priorities:
+      medium: "Médio"
+      high: "Elevado"
+    sensitivity:
+      medium: "Médio"
+      high: "Elevado"
+    reasons:
+      queued_by_staff: "Um membro do pessoal considera que esta publicação necessita de ser revista. Ela permanecerá oculta até lá."
     actions:
       agree_and_suspend:
         title: "Utilizador Suspenso"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 0ac20527ad..d78fcc6199 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -39,6 +39,7 @@ pt_BR:
   title: "Discourse"
   topics: "Tópicos"
   posts: "mensagens"
+  views: "visualizações"
   loading: "Carregando"
   powered_by_html: 'Desenvolvido por <a href="https://www.discourse.org">Discourse</a>, melhor visualizado com JavaScript habilitado'
   sign_up: "Cadastrar-se"
@@ -50,6 +51,8 @@ pt_BR:
   remove_posts_deleted_by_author: "Deletado pelo autor"
   redirect_warning: "Não foi possível confirmar se o link selecionado foi publicado no fórum. Se você deseja continuar mesmo assim, selecione o link abaixo."
   on_another_topic: "Em outro tópico"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} por %{username}"
   themes:
     bad_color_scheme: "Não é possível atualizar o tema, paleta de cores inválida"
     other_error: "Algo de errado aconteceu ao atualizar o tema"
@@ -160,7 +163,6 @@ pt_BR:
         one: tem o tamanho errado (precisa ter %{count} caractere)
         other: tem o tamanho errado (precisa ser %{count} caracteres)
       other_than: "precisa ser outro que não %{count}"
-      sso_overrides_username: "O nome de usuário deve ser atualizado no provedor de SSO, visto que a configuração 'sso_overrides_username' está habilitada."
     template:
       body: ! "Houve problemas com os seguintes campos:"
       header:
@@ -182,12 +184,20 @@ pt_BR:
       secure_media_requirements: "Uploads S3 devem ser habilitados antes da habilitação de media segura."
       second_factor_cannot_be_enforced_with_disabled_local_login: "Você não pode forçar 2FA se a autenticação local está desabilitada."
     conflicting_google_user_id: 'O ID da Conta do Google para esta conta foi alterado. A intervenção do pessoal é necessária por razões de segurança. Por favor contate a equipe e aponte-os para <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+    onebox:
+      invalid_address: "Desculpe, não foi possível gerar uma visualização para esta página web, porque o servidor '%{hostname}' não pôde ser encontrado. Em vez de uma pré-visualização, apenas um link aparecerá em sua postagem. :cry:"
+      error_response: "Desculpe, não foi possível gerar uma visualização para esta página da Web, porque o servidor web retornou um código de erro %{status_code}. Em vez de uma pré-visualização, apenas um link aparecerá em sua postagem. :cry:"
+      missing_data:
+        one: "Desculpe, não foi possível gerar uma pré-visualização para esta página da Web, porque a seguinte tag OEmbed/OpenGraph não foi encontrada: %{missing_attributes}"
+        other: "Desculpe, não foi possível gerar uma pré-visualização para esta página da Web, porque as seguintes tags OEmbed/OpenGraph não foram encontradas: %{missing_attributes}"
   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."
-    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>"
+    invalid_email: "%{email}' não é um endereço de e-mail válido."
     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>"
+    disabled_errors:
+      invalid_access: "Você não tem permissão para ver o recurso solicitado."
   bulk_invite:
     file_should_be_csv: "O arquivo atualizado deve ter o formato csv."
     max_rows: "Os primeiros %{max_bulk_invites} convites foram enviados. Tente dividir o arquivo em partes menores."
@@ -291,6 +301,9 @@ 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}'"
+  rss_num_posts:
+    one: "%{count} mensagem"
+    other: "%{count} mensagens"
   read_full_topic: "Ler tópico completo"
   private_message_abbrev: "Msg"
   rss_description:
@@ -370,21 +383,21 @@ pt_BR:
 
       - O título parece interessante se você ler em voz alta? É um bom resumo?
 
-      - Quem estaria interessado nisto? Por que é relevante? Que tipo de resposta você quer?
+      - Quem estaria interessado nisto? Por que é relevante? Que tipo de respostas você quer?
 
-      - Incluir palavras geralmente usadas no seu tópico para que outros possam *encontrar*. Para agrupar seu tópico com outros relacionados, selecione uma categoria.
+      - Inclua as palavras mais usadas no seu tópico para que outros possam *encontrá-lo*. Para agrupar seu tópico com outros relacionados, selecione uma categoria (ou tag).
 
       Para mais, [veja os guias da comunidade](%{base_path}/guidelines). Este painel só irá aparecer para seu primeiro %{education_posts_text}.
     "new-reply": |
-      Bem-vindo ao %{site_name} &mdash; **obrigado por contribuir!**
+      Bem-vindo ao %{site_name} &mdash; ** obrigado por contribuir! **
 
-      - Sua resposta melhora a conversa de alguma forma?
+      - Seja gentil com os outros membros da comunidade.
 
-      - Seja gentil aos seus companheiros membros da comunidade.
+      - Sua resposta melhora a conversa?
 
-      - Críticas construtivas são bem-vindas, mas critique *idéias*, não pessoas.
+      - Crítica construtiva é bem-vinda, mas critique *ideias*, não pessoas.
 
-      Para mais, [veja nosso guia da comunidade](%{base_path}/guidelines). Esta mensagem aparecerá somente para o seu primeiro %{education_posts_text}.
+      Para saber mais, [consulte nossas diretrizes da comunidade] (%{base_path}/guidelines). Este painel aparecerá apenas para suas primeiras %{education_posts_text}.
     avatar: |
       ### Que tal usar uma imagem para a sua conta?
 
@@ -477,6 +490,8 @@ pt_BR:
           attributes:
             execute_at:
               in_the_past: "deve estar no futuro."
+            duration_minutes:
+              cannot_be_zero: "deve ser maior que 0."
         translation_overrides:
           attributes:
             value:
@@ -529,9 +544,9 @@ pt_BR:
 
       Obrigado por ser uma parte importante desta comunidade!
 
-      (Para mais informações sobre níveis de confiança, [veja este tópico][confiança]. Observe que somente os membros que continuarem a cumprir os requisitos ao longo do tempo permanecerão regulares.)
+      (Para mais informações sobre níveis de confiança, [veja este tópico][trust]. Observe que somente os membros que continuarem a cumprir os requisitos ao longo do tempo permanecerão regulares.)
 
-      [confiança]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
+      [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
   admin_quick_start_title: "LEIA-ME PRIMEIRO: Guia de Início Rápido do Administrador"
   category:
     topic_prefix: "Sobre a categoria %{category} "
@@ -579,20 +594,8 @@ pt_BR:
     slow_down: "Você executou essa ação muitas vezes. Tente novamente mais tarde."
     too_many_requests: "Você já executou essa ação muitas vezes. Por favor, espere%{time_left} antes de tentar novamente."
     by_type:
-      first_day_replies_per_day: "Você atingiu o número máximo de respostas que um novo usuário pode criar no primeiro dia. Por favor, espere %{time_left} antes de tentar novamente."
-      first_day_topics_per_day: "Você atingiu o número máximo de tópicos que um novo usuário pode criar no primeiro dia. Por favor, espere%{time_left} antes de tentar novamente."
-      create_topic: "Você está criando tópicos muito rapidamente. Por favor, espere%{time_left} antes de tentar novamente."
-      create_post: "Você está respondendo rápido demais. Por favor, espere %{time_left} antes de tentar novamente."
-      delete_post: "Você está excluindo as postagens muito rapidamente. Por favor, espere%{time_left} antes de tentar novamente."
-      public_group_membership: "Você está entrando / saindo de grupos com muita frequência. Por favor, espere %{time_left} antes de tentar novamente."
-      topics_per_day: "Você atingiu o número máximo de novos tópicos. Por favor, espere%{time_left}ates de tentar novamente."
-      pms_per_day: "Você atingiu o número máximo de mensagens. Por favor, espere %{time_left} antes de tentar novamente."
-      create_like: "Você atingiu o número máximo de curtidas. Por favor, espere%{time_left} antes de tentar novamente."
-      create_bookmark: "Você atingiu o número máximo de marcadores. Por favor, espere %{time_left} antes de tentar de novo."
-      edit_post: "Você atingiu o número máximo de edições. Por favor, espere%{time_left} antes de tentar de novo."
       live_post_counts: "Você está pedindo contagens de post em tempo real muito rapidamente. Por favor, espere %{time_left} antes de tentar novamente."
       unsubscribe_via_email: "Você atingiu o número máximo de descadastradas por e-mail. Por favor, espere%{time_left} antes de tentar novamente."
-      topic_invitations_per_day: "Você atingiu o número máximo de convites por tópico. Por favor, espere %{time_left} antes de tentar novamente."
     hours:
       one: "%{count} hora"
       other: "%{count} horas"
@@ -696,7 +699,6 @@ pt_BR:
       unknown: "navegador desconhecido"
     device:
       android: "Dispositivo Android"
-      chromebook: "Chromebook"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -707,7 +709,6 @@ pt_BR:
       unknown: "dispositivo desconhecido"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -767,7 +768,7 @@ pt_BR:
       description: 'Esta postagem contém conteúdo que uma pessoa razoável consideraria ofensiva, abusiva ou uma violação das <a href="%{base_path}/guidelines">nossas diretrizes da comunidade</a>.'
       short_description: 'Uma violação das <a href="%{base_path}/guidelines">nossas diretrizes da comunidade</a>'
     notify_user:
-      title: "Envie ao(à) @ %{nome de usuário} uma mensagem"
+      title: "Enviar uma mensagem para @%{username}"
       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."
       email_title: 'Sobre a sua postagem "%{title}"'
@@ -852,9 +853,7 @@ pt_BR:
     mute_topic: "Silenciar todas as notificações para este tópico, %{link} "
     unwatch_category: "Parar de observar todos os tópicos na categoria %{category}"
     mailing_list_mode: "Desativar o modo lista de discussão"
-    all: "Não me envie nenhum email de %{sitename}"
     different_user_description: "No momento, você está logado como um usuário diferente daquele para o qual mandamos email. Por favor, saia ou entre no modo anônimo de seu navegador e tente novamente."
-    not_found_description: "Desculpe, não conseguimos encontrar esse cancelamento de inscrição. É possível que o link no seu email tenha expirado?"
     log_out: "Sair"
     submit: "Salvar preferências"
     digest_frequency:
@@ -1022,6 +1021,7 @@ pt_BR:
       labels:
         level: Nível
       description: "Número de usuários agrupados por nível de confiança."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Usuários por tipo"
       xaxis: "Tipo"
@@ -1232,7 +1232,6 @@ 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."
@@ -1256,10 +1255,8 @@ pt_BR:
     search_query_log_max_size: "Quantidade máxima de consultas de pesquisa a serem mantidas"
     search_query_log_max_retention_days: "Quantidade máxima de tempo para manter as consultas de pesquisa em dias."
     search_ignore_accents: "Ignorar acentos ao pesquisar por texto."
-    category_search_priority_very_low_weight: "Peso aplicado ao ranking para prioridade de pesquisa de categoria muito baixa."
     category_search_priority_low_weight: "Peso aplicado à classificação para prioridade de pesquisa de categoria baixa."
     category_search_priority_high_weight: "Peso aplicado à classificação para prioridade de pesquisa de categoria alta."
-    category_search_priority_very_high_weight: "Peso aplicado ao ranking para prioridade de pesquisa de categoria muito alta."
     allow_uncategorized_topics: "Permitir criação de tópicos sem uma categoria. NOTA: Se existe algum tópico sem nenhuma categoria, você deve movê-los para uma categoria antes de desabilitar esta opção."
     allow_duplicate_topic_titles: "Permitir tópicos com títulos duplicados, idênticos."
     unique_posts_mins: "Quantos minutos antes para um utilizador poder criar uma postagem com o mesmo conteúdo outra vez?"
@@ -1268,7 +1265,6 @@ pt_BR:
     site_description: "Descreva este site com uma frase, como usado na tag de meta description."
     short_site_description: "Breve descrição, como usado na tag de título na página inicial."
     contact_email: "Endereço de e-mail do contato principal responsável por este site. Usado para notificações críticas, bem como no formulário de contato da <a href='%{base_path}/about' target='_blank'>/about</a> para questões urgentes."
-    contact_url: "URL de contato para este site. Usado no formulário de contato da <a href='%{base_path}/about' target='_blank'>/about</a> para assuntos urgentes."
     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 % )"
@@ -1290,6 +1286,8 @@ pt_BR:
     show_pinned_excerpt_mobile: "Mostrar excerto de tópicos fixos na exibição para celular."
     show_pinned_excerpt_desktop: "Mostrar excerto de tópicos fixos na exibição para desktop."
     post_onebox_maxlength: "Tamanho máximo para um Post em caracteres"
+    blocked_onebox_domains: "Uma lista de domínios que nunca serão transformados em oneboxes."
+    allowed_inline_onebox_domains: "Uma lista de domínios que serão colocados em miniatura se vinculados sem um título"
     max_oneboxes_per_post: "Número máximos de oneboxes em uma publicação."
     logo: "A imagem do logotipo no canto superior esquerdo do seu site. Use uma imagem retangular larga com uma altura de 120 e uma proporção maior que 3:1. Se deixado em branco, o texto do título do site será exibido."
     logo_small: "A pequena imagem do logotipo no canto superior esquerdo do site, vista ao rolar para baixo. Use uma imagem quadrada de 120 × 120. Se deixado em branco, um glifo de página inicial será exibido."
@@ -1305,7 +1303,6 @@ pt_BR:
     email_custom_headers: "A lista delimitada por barras verticais de cabeçalhos de e-mail personalizados"
     email_subject: "Formato de assunto personalizável para e-mails padrão. Veja <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>"
     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_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'"
@@ -1341,7 +1338,11 @@ pt_BR:
     maximum_session_age: "Usuário continuará logado por n horas desde a última visita"
     enable_escaped_fragments: "Voltar para a API do Google Ajax-Crawling se não for encontrado um webcrawler. Consulte <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     cors_origins: "Origens permitidas para pedidos de origem-cruzada (CORS). Cada origem deve incluir http:// ou https://. A variável de ambiente DISCOURSE_ENABLE_CORS deve ser definida como true para habilitar CORS."
+    use_admin_ip_allowlist: "Administradores só podem logar se estiverem na lista de IPs Filtrados (Administração > Logs > IPs Filtrados)."
+    blocked_ip_blocks: "Uma lista de blocos IP privados que nunca devem ser rastreados pelo Discourse"
+    allowed_internal_hosts: "Uma lista de hosts internos que o discurso pode rastrear com segurança para o oneboxing e outros fins"
     allowed_iframes: "Uma lista de prefixos de domínio iframe src que o discurso pode permitir com segurança em postagens"
+    allowed_crawler_user_agents: "Agentes de usuário de crawlers da Web que devem ter permissão para acessar o site. AVISO! ESTA CONFIGURAÇÃO NEGARÁ ACESSO A TODOS OS CRAWLERS NÃO LISTADOS AQUI!"
     slow_down_crawler_user_agents: "Agentes do usuário de rastreadores da web que devem ter uma taxa limitada em robots.txt usando a diretiva de rastreamento atrasado"
     slow_down_crawler_rate: "Se slow_down_crawler_user_agents for especificado, essa taxa será aplicada a todos os rastreadores (número de segundos de atraso entre as solicitações)"
     content_security_policy: "Habilitar Content-Security-Policy"
@@ -1371,6 +1372,8 @@ pt_BR:
     email_token_valid_hours: "Tokens de Esqueceu senha / ativar conta são válidas por (n) horas."
     enable_badges: "Habilita o sistema de emblemas"
     enable_whispers: "Permitir a comunicação pessoal da equipe nos tópicos."
+    blocked_email_domains: "Lista delimitada por barras (|) de domínios de email que não são permitidos registros de contas. Exemplo: mailinator.com|trashmail.net"
+    allowed_email_domains: "Lista separada por barra (|) de domínios de email que usuários DEVEM usar para registrar contas. CUIDADO: Usuário com domínio de email diferentes da lista não serão permitidos!"
     hide_email_address_taken: "Não informe os usuários de que existe uma conta com um determinado endereço de e-mail durante a inscrição e o formulário de senha esquecida."
     log_out_strict: "Quando deslogando, deslogar TODAS as sessões do usuário em todos os dispositivos"
     version_checks: "Verificar no Hub do Discourse por atualizações de versão e mostre novas mensagens de versão no painel <a href='%{base_path}/admin' target='_blank'>/admin</a>"
@@ -1386,20 +1389,7 @@ pt_BR:
     min_admin_password_length: "Tamanho de senha mínima para Administradores."
     password_unique_characters: "Número mínimo de caracteres únicos que uma senha deve ter."
     block_common_passwords: "Não permitir senhas que estiverem entre as 10,000 senhas mais comuns."
-    enable_sso: "Permite autenticação única atráves de site externo (AVISO: OS ENDEREÇOS DE E-MAIL *DEVEM* SER VALIDADOS PELO SITE EXTERNO!)"
-    verbose_sso_logging: "Registrar diagnósticos detalhados relacionados a SSO em <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    enable_sso_provider: "Implementar o protocolo do provedor Discourse SSO no terminal /session/sso_provider, requer que sso_provider_secrets seja definido"
-    sso_url: "URL do ponto final do logon único (SSO) (deve incluir http:// ou https://)"
-    sso_secret: "String secreta usada para autenticar criptograficamente informação de SSO, esteja certo de que possui 10 ou mais caracteres"
-    sso_provider_secrets: "Uma lista de pares de domínio-segredo que estão usando o Discourse como um provedor de SSO. Certifique-se de que o segredo de SSO tenha 10 caracteres ou mais. O símbolo curinga * pode ser usado para corresponder a qualquer domínio ou apenas parte dele (por exemplo, *.example.com)."
-    sso_overrides_bio: "Sobrescreve a bio de usuário e impede o usuário de mudá-la."
-    sso_overrides_groups: "Sincronize todos os membros do grupo manual com grupos especificados no atributo sso do grupo (ATENÇÃO: se você não especificar grupos, todos os membros do grupo manual serão limpos para o usuário)"
-    sso_overrides_avatar: "Substitui o avatar do usuário pelo avatar do site externo do payload do SSO. Se habilitado, os usuários não poderão fazer upload de avatares no Discourse."
-    sso_overrides_profile_background: "Substitui o plano de fundo do perfil do usuário pelo avatar do site externo da carga útil do SSO."
-    sso_overrides_card_background: "Substitui o plano de fundo do cartão do usuário pelo avatar do site externo da carga útil do SSO."
-    sso_not_approved_url: "Redireciona contas não aprovadas no login externo para este endereço"
-    sso_allows_all_return_paths: "Não restrinja o domínio para return_paths fornecidos pelo SSO (por padrão, o caminho de retorno deve estar no site atual)"
-    enable_local_logins: "Ativar contas locais de login com nome de usuário e senha. Isso deve estar ativado para convites para o trabalho. ATENÇÃO: se estiver desabilitado, você pode não conseguir fazer o login se você não configurou anteriormente pelo menos um método de login alternativo."
+    discourse_connect_overrides_bio: "Sobrescreve a bio de usuário e impede o usuário de mudá-la."
     enable_local_logins_via_email: "Permitir que os usuários solicitem um link de login com um clique para serem enviados por e-mail."
     allow_new_registrations: "Permitir registro de novos usuários. Desmarque isso para prevenir quem quer que seja de criar uma nova conta."
     enable_signup_cta: "Mostra um aviso aos usuários anônimos que retornem, solicitando que criem uma conta."
@@ -1434,7 +1424,6 @@ pt_BR:
     top_topics_formula_log_views_multiplier: "valor do multiplicador de visualizações logadas (n) na fórmula dos melhores tópicos: `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: "valor do multiplicador de curtidas do primeiro post (n) na fórmula dos melhores tópicos: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "valor do multiplicador da menor quantidade de curtidas por publicação (n) na fórmula de melhores tópicos: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Número de publicações antigas a serem renderizadas novamente a cada 15 minutos."
     enable_safe_mode: "Permitir que os usuários insiram o modo de segurança para depurar plug-ins."
     rate_limit_create_topic: "Após criar um tópico, os usuários devem aguardar (n) segundos antes de criar um outro tópico."
     rate_limit_create_post: "Após postar, os usuários devem aguardar (n) segundos antes de criar um outro post."
@@ -1449,8 +1438,6 @@ pt_BR:
     max_topic_invitations_per_day: "Número máximo de convites para tópicos que um usuário pode enviar por dia."
     max_logins_per_ip_per_hour: "Número máximo de logins permitidos por endereço IP por hora"
     max_logins_per_ip_per_minute: "Número máximo de logins permitidos por endereço IP por minuto"
-    max_post_deletions_per_minute: "Número máximo de postagens que um usuário pode excluir por minuto."
-    max_post_deletions_per_day: "Número máximo de postagens que um usuário pode excluir por dia."
     alert_admins_if_errors_per_minute: "Número de erros por minutos para desencadear um alerta aos administradores. Um valor igual a 0 desabilita esse recurso. NOTA: requer reinicialização."
     alert_admins_if_errors_per_hour: "Número de erros por hora para desencadear um alerta aos administradores. Um valor igual a 0 desabilita esse recurso. NOTA: requer reinicialização."
     suggested_topics: "Número de tópicos sugeridos mostrados no final de um tópico."
@@ -1480,7 +1467,6 @@ pt_BR:
     strip_image_metadata: "Retire os metadados da imagem."
     min_ratio_to_crop: "Taxa usada para cortar imagens altas. Digite o resultado da largura / altura."
     simultaneous_uploads: "Número máximo de arquivos que podem ser arrastados e soltos no compositor"
-    enable_flash_video_onebox: "Habilitar o embutir de links swf e flv (Adobe Flash) em oneboxes. AVISO: pode introduzir riscos de segurança."
     default_invitee_trust_level: "Nível de confiança (0-4) padrão para usuários convidados."
     default_trust_level: "Nível de confiança (0-4) para todos novos usuários. CUIDADO! Mudar irá colocar em sérios riscos de spam."
     tl1_requires_topics_entered: "Quantos tópicos um usuário novo deve entrar antes de ser promovido a nível de confiança 1."
@@ -1517,6 +1503,7 @@ pt_BR:
     min_trust_to_flag_posts: "O nível de confiança mínimo necessário para sinalizar postagens"
     min_trust_to_post_links: "O nível de confiança mínimo necessário para incluir links em postagens"
     min_trust_level_to_allow_invite: "Nível mínimo de confiança necessário para convidar usuários"
+    allowed_link_domains: "Domínios aos quais os usuários podem vincular, mesmo que não tenham o nível de confiança apropriado para postar links"
     newuser_max_links: "Quandos links um usuário novo pode adicionar a um post."
     newuser_max_attachments: "Quantos arquivos anexos um usuário novo pode adicionar a um post."
     newuser_max_mentions_per_post: "Número máximo de notificações @nome que um usuário novo pode usar em um post."
@@ -1539,6 +1526,7 @@ 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."
+    dark_mode_none: "Nenhum"
     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)"
@@ -1564,6 +1552,7 @@ pt_BR:
     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."
+    allowed_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."
     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."
@@ -1597,6 +1586,7 @@ pt_BR:
     max_emails_per_day_per_user: "Número máximo de emails para enviar usuários por dia. 0 para desabilitar o limite"
     enable_staged_users: "Crie automaticamente usuários temporários durante o processamento de emails recebidos."
     maximum_staged_users_per_email: "Número máximo de usuários preparados usando o processamento de um e-mail recebido."
+    auto_generated_allowlist: "Lista de endereços de e-mail que não serão verificados quanto a conteúdo gerado automaticamente. Exemplo: foo@bar.com | discourse@bar.com"
     block_auto_generated_emails: "Bloqueie os e-mails recebidos identificados como gerados automaticamente."
     ignore_by_title: "Ignore os e-mails recebidos com base no título deles."
     mailgun_api_key: "A chave da API Secreta do Mailgun é usada para verificar as mensagens do webhook."
@@ -1605,6 +1595,7 @@ pt_BR:
     bounce_score_threshold: "Pontuação máxima de rejeição antes de deixarmos de enviar um email a um usuário."
     reset_bounce_score_after_days: "Redefinir automaticamente a pontuação de rejeição após X dias."
     always_show_trimmed_content: "Sempre mostre a parte aparada dos emails recebidos. AVISO: pode revelar endereços de e-mail."
+    trim_incoming_emails: "Cortar parte dos e-mails recebidos que não são relevantes."
     private_email: "Não incluir conteúdo de postagens ou tópicos no título do e-mail ou no corpo do e-mail. NOTA: também desabilita e-mails de resumo."
     manual_polling_enabled: "Enviar e-mails usando a API para respostas por e-mail."
     pop3_polling_enabled: "POLLar via POP3 por respostas via email."
@@ -1620,7 +1611,7 @@ pt_BR:
     email_in: 'Permitir que os usuários postem novos tópicos por e-mail (requer pesquisa manual ou POP3). Configure os endereços na guia "Configurações" de cada categoria.'
     email_in_min_trust: "O nível de confiança mínimo que um usuário necessita ter para ser permitido a postar novos tópicos via email."
     email_in_spam_header: "O cabeçalho do email para detectar spam."
-    email_prefix: "A [etiqueta] usada no assunto dos emails. Ele será por padrão 'título' se não configurada."
+    email_prefix: "A [label] usada no assunto dos emails. Ele será por padrão 'título' se não configurada."
     email_site_title: "O título do site usado como o enviador dos emails do site. Por padrão será 'título' se não for configurado. Se o seu 'título' contiver caracteres que não são permitidos em strings de enviador de emails, utilize esta configuração."
     find_related_post_with_key: "Use somente a \"chave de resposta\" para encontrar a postagem respondida. AVISO: desativar isso permite a representação do usuário com base no endereço de e-mail."
     minimum_topics_similar: "Quantos tópicos devem existir antes que tópicos semelhantes sejam apresentados ao compor novos tópicos."
@@ -1660,6 +1651,7 @@ pt_BR:
     ignored_users_count_message_threshold: "Notificar moderadores se um usuário específico for ignorado por muitos outros usuários."
     ignored_users_message_gap_days: "Quanto tempo esperar antes de notificar novamente moderadores sobre um usuário que foi ignorado por muitos outros."
     clean_up_inactive_users_after_days: "Número de dias antes de um usuário inativo (nível de confiança 0 sem nenhuma postagem) ser removido. Para desativar a limpeza, defina como 0."
+    allowed_user_website_domains: "O website do usuário será verificado em relação a esses domínios. Lista delimitada por pipe."
     allow_profile_backgrounds: "Permitir usuários de fazerem upload de backgrounds para o perfil"
     sequential_replies_threshold: "Número de postagens que um usuário precisa fazer em uma linha em um tópico antes de ser lembrado sobre muitas respostas sequenciais."
     get_a_room_threshold: "Número de postagens que um usuário precisa fazer para a mesma pessoa no mesmo tópico antes de ser avisado."
@@ -1689,6 +1681,7 @@ pt_BR:
     highlighted_languages: "Regras de destaque de sintaxe incluídas. (Atenção: incluir muitos idiomas pode afetar o desempenho) veja: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> para uma demonstração"
     embed_truncate: "Cortar os posts embutidos."
     embed_support_markdown: "Suporte Markdown formatação para posts incorporados."
+    allowed_embed_selectors: "Uma lista de elementos CSS separados por vírgula permitidos em incorporações."
     allowed_href_schemes: "Esquemas permitidos em links, além de http e https."
     embed_post_limit: "Número máximo de respostas para embutir"
     embed_username_required: "Nome de usuário para criação do tópico é obrigatório."
@@ -1696,7 +1689,6 @@ pt_BR:
     show_create_topics_notice: "Se o site tem menos de 5 tópicos públicos, mostrar um aviso pedindo para os administradores criarem alguns tópicos."
     delete_drafts_older_than_n_days: "Apagar rascunhos mais antigos do que (N) dias."
     bootstrap_mode_min_users: "Número mínimo de usuários necessários para desativar o modo de bootstrap (definido como 0 para desativado)"
-    prevent_anons_from_downloading_files: "Impedir que usuários anônimos façam download de arquivos anexados. AVISO: isso irá impedir quaisquer componentes do site que não sejam imagens, tendo sido postados como anexos, de funcionar."
     slug_generation_method: "Escolha um método para geração de slug. 'Codificado' irá gerar strings com '%'. 'Nenhum' irá desabilitar a geração de slugs."
     enable_emoji: "Habilitar emoji"
     enable_emoji_shortcuts: "Texto em smiley comum como :): p :( será convertido em emojis"
@@ -1723,7 +1715,6 @@ pt_BR:
     default_email_messages_level: "Definir o nível de notificação por e-mail padrão quando alguém envia uma mensagem ao usuário."
     default_email_mailing_list_mode: "Envie um e-mail para cada nova postagem por padrão."
     default_email_mailing_list_mode_frequency: "Os usuários que ativam o modo de lista de e-mails receberão e-mails com frequência por padrão."
-    disable_mailing_list_mode: "Não permitir que os usuários ativem o modo de lista de discussão."
     default_email_previous_replies: "Inclua respostas anteriores em e-mails por padrão."
     default_email_in_reply_to: "Incluir trecho de resposta para postar em e-mails por padrão."
     default_other_new_topic_duration_minutes: "Condição padrão global para a qual um tópico é considerado novo."
@@ -1731,7 +1722,7 @@ pt_BR:
     default_other_notification_level_when_replying: "Nível de notificação padrão global quando o usuário responde a um tópico."
     default_other_external_links_in_new_tab: "Abrir links externos em uma nova aba por padrão."
     default_other_enable_quoting: "Ative a resposta de cotação para texto realçado por padrão."
-    default_other_enable_defer: "Habilitar a funcionalidade de tópico adiar por padrão."
+    default_other_enable_defer: "Habilitar a funcionalidade de adiar tópico por padrão."
     default_other_dynamic_favicon: "Mostrar contagem de tópicos novos / atualizados no ícone do navegador por padrão."
     default_other_like_notification_frequency: "Notificar usuários de curtidas por padrão"
     default_topics_automatic_unpin: "Desvincular tópicos automaticamente quando o usuário alcança a parte inferior por padrão."
@@ -1745,7 +1736,6 @@ pt_BR:
     retry_web_hook_events: "Repita automaticamente os eventos com falha do web hook por 4 vezes. Os intervalos de tempo entre as tentativas são de 1, 5, 25 e 125 minutos."
     allow_user_api_keys: "Permitir geração de chaves de API do usuário"
     allow_user_api_key_scopes: "Lista de escopos permitidos para chaves de API do usuário"
-    max_api_keys_per_user: "Número máximo de chaves da API do usuário por usuário"
     min_trust_level_for_user_api_key: "Nível de confiança necessário para geração de chaves de API do usuário"
     allowed_user_api_auth_redirects: "URL permitido para o redirecionamento de autenticação para as chaves da API do usuário. O símbolo curinga * pode ser usado para corresponder qualquer parte dele (por exemplo, www.example.com/*)."
     allowed_user_api_push_urls: "URLs permitidos para push de servidor para API do usuário"
@@ -1755,7 +1745,6 @@ pt_BR:
     max_tags_per_topic: "As tags máximas que podem ser aplicadas a um tópico."
     max_tag_length: "A quantidade máxima de caracteres que podem ser usados ​​em uma tag."
     max_tag_search_results: "Ao pesquisar por tags, o número máximo de resultados a serem exibidos."
-    show_filter_by_tag: "Mostrar uma lista suspensa para filtrar uma lista de tópicos por tag."
     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>."
@@ -1769,6 +1758,7 @@ pt_BR:
     governing_law: "Lei Aplicável"
     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."
+    shared_drafts_min_trust_level: "Permitir usuários visualizar e editar os Rascunhos Compartilhas"
     push_notifications_prompt: "Exibir o prompt de consentimento do usuário."
     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."
@@ -1799,23 +1789,19 @@ pt_BR:
       email_editable_enabled: "Você deve desativar o \"e-mail editável\" antes de ativar essa configuração."
       staged_users_disabled: "Você deve primeiro ativar os \"usuários preparados\" antes de ativar essa configuração."
       reply_by_email_disabled: "Você deve primeiro ativar \"responder por e-mail\" antes de ativar essa configuração."
-      sso_url_is_empty: "Você deve definir um 'sso url' antes de habilitar essa configuração."
-      sso_invite_only: "Você não pode habilitar o sso e convidar ao mesmo tempo."
       enable_local_logins_disabled: "Você deve primeiro habilitar 'habilitar logins locais' antes de ativar esta configuração."
       min_username_length_exists: "Você não pode definir o comprimento de nome de usuário mínimo acima do nome de usuário mais curto (%{username})."
       min_username_length_range: "Você não pode colocar o mínimo acima do máximo."
       max_username_length_exists: "Você não pode definir o comprimento máximo de nome de usuário abaixo do nome de usuário mais longo (%{username})."
       max_username_length_range: "Você não pode definir o máximo abaixo no mínimo."
       invalid_hex_value: "Os valores das cores precisam ser códigos hexadecimais de 6 dígitos."
-      category_search_priority:
-        very_low_weight_invalid: "Você não pode definir o peso para ser maior que 'category_search_priority_low_weight'."
-        low_weight_invalid: "Você não pode definir o peso como maior ou igual a 1 ou menor que 'category_search_priority_very_low_weight'."
-        very_high_weight_invalid: "Você não pode definir o peso para ser menor que 'category_search_priority_high_weight'."
+      allowed_unicode_usernames:
+        regex_invalid: "A expressão regular é inválida: %{error}"
+        leading_trailing_slash: "A expressão regular não deve começar e terminar com uma barra."
       unicode_usernames_avatars: "Os avatares internos do sistema não suportam nomes de usuário Unicode."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.exemplo.com.br"
-        value: "Segredo SSO"
   search:
     extreme_load_error: "O site está sob carga extrema, a busca está desabilitada, tente novamente mais tarde"
     within_post: "#%{post_number} por %{username}"
@@ -1824,9 +1810,9 @@ pt_BR:
       topic: "Resultados"
       user: "Utilizadores"
     results_page: "Buscar resultados para '%{term}'"
-    audio: "[áudio]"
-    video: "[vídeo]"
-  sso:
+    audio: "[audio]"
+    video: "[video]"
+  discourse_connect:
     login_error: "Erro de Login"
     not_found: "Sua conta não pode ser encontrada. Por favor, entre em contato com o administrador do site."
     account_not_approved: "Sua conta está aguardando aprovação. Você receberá uma notificação por email quando ela for aprovada."
@@ -1938,6 +1924,7 @@ pt_BR:
       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 ao processar 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."
@@ -1965,7 +1952,7 @@ pt_BR:
     content_matches_auto_block_regex: "Conteúdo corresponde a regex de bloco automático"
     username:
       short: "deve ter no mínimo %{min} caracteres"
-      long: "precisa ter não mais que ${max} 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"
@@ -1989,6 +1976,8 @@ 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"
+      reviewable_reject_auto: "Tratamento automático de revisáveis na fila"
+      reviewable_reject: "Usuário revisável rejeitado"
     email_in_spam_header: "O primeiro e-mail do usuário foi sinalizado como spam"
   reviewables_reminder:
     submitted:
@@ -2157,6 +2146,8 @@ pt_BR:
         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).
+    queued_by_staff:
+      title: "Postagem Precisa de Aprovação"
     flags_disagreed:
       title: "Postagem sinalizada restaurada pela staff"
       subject_template: "Postagem sinalizada restaurada pela staff"
@@ -2175,22 +2166,6 @@ pt_BR:
     flags_agreed_and_post_deleted:
       title: "Postagem sinalizada removida pela equipe"
       subject_template: "Postagem sinalizada removida pela equipe"
-      text_body_template: |
-        Olá,
-
-        Esta é uma mensagem automatizada de %{site_name} para informá-lo de que a [sua postagem](%{base_url}%{url}) foi removida.
-
-        %{flag_reason}
-
-        Esta postagem foi sinalizada pela comunidade e um membro da staff optou por removê-la.
-
-        [details="Clique para expandir a postagem removida"]
-        ``` markdown
-        %{flagged_post_raw_content}
-        ```
-        [/details]
-
-        Por favor, reveja nossas [diretrizes da comunidade](%{base_url}/guidelines) para detalhes.
     usage_tips:
       text_body_template: |
         Para algumas dicas rápidas sobre como começar como um novo usuário, [confira este post no blog](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2233,6 +2208,8 @@ pt_BR:
         Aproveite sua estadia!
 
         [prefs]: %{user_preferences_url}
+    tl2_promotion_message:
+      subject_template: "Parabéns pela sua promoção em nível de confiança!"
     backup_succeeded:
       title: "Backup foi bem-sucedido"
       subject_template: "Backup completado com sucesso"
@@ -2294,6 +2271,13 @@ pt_BR:
         ``` text
         %{logs}
         ```
+    user_added_to_group_as_owner:
+      title: "Adicionado ao Grupo como Proprietário"
+    user_added_to_group_as_member:
+      title: "Adicionado ao Grupo como Membro"
+      subject_template: "Você foi adicionado como membro do grupo %{group_name}"
+      text_body_template: |
+        Você foi adicionado como membro do grupo [%{group_name}] (%{base_url}%{group_path}).
     csv_export_succeeded:
       title: "Exportação CSV foi bem-sucedida"
       subject_template: "[%{export_title}] Exportação de dados completa"
@@ -2828,21 +2812,9 @@ pt_BR:
     account_suspended:
       title: "Conta Suspença"
       subject_template: "[%{email_prefix}] A sua conta foi suspensa"
-      text_body_template: |
-        Você foi suspenso do fórum até %{suspended_till}.
-
-        %{reason}
-
-        %{message}
     account_silenced:
       title: "Conta Silenciada"
       subject_template: "[%{email_prefix}] Sua conta foi silenciada"
-      text_body_template: |
-        Você foi silenciado do fórum até %{silenced_till}.
-
-        %{reason}
-
-        %{message}
     account_exists:
       title: "essa conta já existe"
       subject_template: "[%{email_prefix}] essa conta já existe"
@@ -2909,6 +2881,9 @@ pt_BR:
     confirm_new_email:
       title: "Confirmar novo e-mail"
       subject_template: "[%{email_prefix}] Confirme seu novo endereço de e-mail"
+    confirm_new_email_via_admin:
+      title: "Confirmar novo e-mail"
+      subject_template: "[%{email_prefix}] Confirme seu novo endereço de e-mail"
     confirm_old_email:
       title: "Confirmar Antigo e-mail"
       subject_template: "[%{email_prefix}] Confirme seu endereço de e-mail atual"
@@ -2980,6 +2955,8 @@ pt_BR:
 
         Se foi você, ótimo! Não há mais nada que você precise fazer.
         Se não foi você, por favor [revise suas sessões existentes](%{base_url}/my/preferences/account) e considere alterar sua senha.
+    post_approved:
+      title: "Sua postagem foi aprovada"
   page_not_found:
     title: "Oops! Essa página não existe ou é privada."
     popular_topics: "Popular"
@@ -3052,6 +3029,7 @@ pt_BR:
     latte: "Latte"
     summer: "Verão"
     dark_rose: "Rosa Escura"
+    default_theme_name: "Padrão"
     light_theme_name: "Claro"
     dark_theme_name: "Escuro"
     neutral_theme_name: "Neutro"
@@ -3299,7 +3277,7 @@ pt_BR:
       name: Leitor
       description: Leu todas as respostas em um tópico com mais de 100 respostas
       long_description: |
-        Esse emblema é concedido na primeira vez que você lê um tópico longo com mais de 100 respostas. Ler uma conversa de perto ajuda você a acompanhar a discussão, entender diferentes pontos de vista e leva a conversas mais interessantes. Quanto mais você lê, melhor a conversa fica. Como gostamos de dizer, a leitura é fundamental! : slight_smile:
+        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
@@ -3429,9 +3407,6 @@ pt_BR:
         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}"
@@ -3533,6 +3508,12 @@ pt_BR:
           city_for_disputes:
             label: "Cidade para Disputas"
             placeholder: "São Francisco, Califórnia"
+      colors:
+        title: "Cores"
+      fonts:
+        fields:
+          font_preview:
+            label: "Prévia"
       logos:
         title: "Logotipos"
         fields:
@@ -3571,9 +3552,6 @@ pt_BR:
                 label: "Caixas de categorias"
               categories_boxes_with_topics:
                 label: "Caixas de categorias com Tópicos"
-      emoji:
-        title: "Emoji"
-        description: "Qual estilo Emoji você prefere para sua comunidade? Você pode adicionar mais Emoji personalizado posteriormente via Admin, Personalizar, Emoji."
       invites:
         title: "Convidar um grupo"
         description: "Você está quase pronto! Vamos convidar algumas pessoas para ajudar <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>\nsemear suas discussões</a> com tópicos e respostas interessantes para iniciar sua comunidade."
@@ -3625,7 +3603,6 @@ pt_BR:
       new_topics_unless_trust_level: "Usuários com níveis de confiança baixos precisam ter tópicos aprovados pela staff. Veja `approve_new_topics_unless_trust_level`."
       fast_typer: "Novo usuário digitou sua primeira postagem desconfiadamente rápido, suspeita de comportamento de bot ou spammer. Veja `min_first_post_typing_time`."
       auto_silence_regexp: "Novo usuário cuja primeira postagem corresponde à configuração `auto_silence_first_post_regex`."
-      watched_word: "Esta postagem incluiu uma Palavra Observada. Veja sua <a href='%{base_url}/admin/logs/watched_words'>lista de palavras observadas</a>."
       staged: "Novos tópicos e postagens para usuários fictícios precisam ser aprovados pela staff. Veja `approve_unless_staged`."
       category: "Postagens nesta categoria exigem aprovação manual pela staff. Veja as configurações da categoria."
       must_approve_users: "Todos os novos usuários precisam ser aprovados pela staff. Veja `must_approve_users`."
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 8c3720ec10..cf5c140646 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -39,6 +39,7 @@ ro:
   title: "Discourse"
   topics: "Subiecte"
   posts: "Postări"
+  views: "vizualizări"
   loading: "Se încarcă"
   sign_up: "Înregistrare"
   log_in: "Autentificare"
@@ -47,6 +48,8 @@ ro:
   disable_remote_images_download_reason: "Descărcarea de imagini la distanță a fost dezactivată deoarece nu mai era spațiu suficient pe disc."
   anonymous: "Anonime"
   remove_posts_deleted_by_author: "Șters de către autor"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} de %{username}"
   emails:
     incoming:
       default_subject: "Acest subiect are nevoie de un titlu"
@@ -118,9 +121,10 @@ ro:
     site_settings:
       default_categories_already_selected: "Nu poți selecta o categorie folosită într-o altă listă."
       s3_upload_bucket_is_required: "Nu poți activa încărcările pe S3 dacă nu ai introdus 's3_upload_bucket'."
-      second_factor_cannot_be_enforced_with_sso_enabled: "Nu puteți impune 2FA dacă SSO este activat."
   invite:
     expired: "Codul tău de invitație a expirat. Te rugăm <a href='%{base_url}/about'>contactezi personalul</a> forumului."
+    disabled_errors:
+      invalid_access: "Nu ai permisiunea să vezi această resursă."
   bulk_invite:
     file_should_be_csv: "Fișierul de încărcat trebuie să fie în format csv."
     error: "A apărut o eroare la încărcarea acestui fișier. Te rugăm să încerci din nou, mai târziu."
@@ -158,6 +162,10 @@ ro:
     permalink: "Link permanent"
     imported_from: "Acesta este un subiect de discuție adăugat la discuția originală de la %{link}"
     in_reply_to: "▶ %{username}"
+    replies:
+      one: "%{count} răspuns"
+      few: "%{count} răspunsuri"
+      other: "%{count} răspunsuri"
     created: "Creat"
   no_mentions_allowed: "Ne pare rău, nu poți menționa alți utilizatori."
   too_many_mentions:
@@ -193,6 +201,10 @@ 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}'"
+  rss_num_posts:
+    one: "O postare"
+    few: "%{count} postări"
+    other: "%{count} de postări"
   read_full_topic: "Citește întregul subiect"
   private_message_abbrev: "Msg"
   rss_description:
@@ -209,10 +221,13 @@ ro:
   excerpt_image: "imagine"
   bookmarks:
     reminders:
+      at_desktop: "Data viitoare sunt la PC"
       later_today: "Mai târziu azi"
+      next_business_day: "Următoarea zi lucrătoare"
       tomorrow: "Mâine"
       next_week: "Săptămâna viitoare"
       next_month: "Luna viitoare"
+      custom: "Data și ora personalizată"
   groups:
     errors:
       can_not_modify_automatic: "Nu poți modifica un grup automat"
@@ -235,26 +250,6 @@ ro:
       one: "o postare"
       few: "%{count} postări"
       other: "%{count} de postări"
-    "new-topic": |
-      Bun venit pe %{site_name} &mdash; **îți mulțumim că ai început o nouă conversație!**
-
-      - Atunci când îl citești cu voce tare, titlul sună interesant ? Rezumă bine conținutul?
-
-      - Cine ar fi interesat de subiectul ăsta? De ce e el important? Ce fel de răspunsuri vrei?
-
-      - Include în subiect cuvinte folosite în mod obișnuit pentru a le da altora posibilitatea să îl *găsească*. Pentru a grupa subiectul tău laolaltă cu alte subiecte asemănătoare, alege o anumită categorie.
-
-      Pentru mai multe îndrumări, [citește ghidul comunității](%{base_path}/guidelines). Această secțiune de pagină va apărea doar pentru prima/primele %{education_posts_text}.
-    "new-reply": |
-      Bine ai venit la %{site_name} &mdash; **Îți mulțumim pentru contribuție!**
-
-      - Răspunsul tău îmbunătațește discuția în vreun fel?
-
-      - Fii amabil cu membrii comunității.
-
-      - Critica constructivă e binevenită, critică *ideea*, nu oamenii.
-
-      Pentru detalii, [verifică regulile comune](%{base_path}/reguli). Acest panel va apărea doar pentru prima %{education_posts_text}.
     avatar: |
       ### Ce zici de o poză atașată contului tău?
 
@@ -321,6 +316,8 @@ ro:
   meta_category_description: "Discuții despre acest forum, organizare, funcționare și cum îl putem îmbunătăți."
   staff_category_name: "Echipa"
   staff_category_description: "Categorie privată pentru discuțiile personalului. Subiectele sunt vizibile numai pentru admini și moderatori."
+  discourse_welcome_topic:
+    title: "Bine ai venit la Discourse"
   lounge_welcome:
     title: "Bine ai venit în sufragerie"
   category:
@@ -350,6 +347,8 @@ ro:
       title: "lider"
     change_failed_explanation: "Ai încercat să retrogradezi utilizatorul %{user_name} la nivelul '%{new_trust_level}'. Însă nivelul este deja '%{current_trust_level}'. %{user_name} va rămâne la '%{current_trust_level}' - dacă dorești să retrogradezi utilizatorul, trebuie să îi blochezi întâi nivelul de încredere."
   rate_limiter:
+    by_type:
+      create_bookmark: "Ați atins numărul maxim de semne de carde zilnice. Puteți crea mai multe în %{time_left}."
     hours:
       one: "o oră"
       few: "%{count} ore"
@@ -513,6 +512,7 @@ ro:
       short_description: "Apreciază această postare"
   user_activity:
     no_bookmarks:
+      self: "Nu ai link-uri de postări salvate; link-urile salvate îți permit revenirea la postări specifice"
       others: "Nu există semne de carte."
     no_likes_given:
       self: "Nu ai apreciat nicio postare."
@@ -549,9 +549,7 @@ ro:
     mute_topic: "Setează pe silențios toate notificările cu privire la acest subiect, %{link}"
     unwatch_category: "Încetează să urmărești activ toate subiectele din categoria %{category}"
     mailing_list_mode: "Dezactivează modul mailing list"
-    all: "Nu îmi trimite nici un mail de la %{sitename}"
     different_user_description: "Pe moment, ești înregistrat cu un nume de utilizator diferit de cel căruia i-am trimis email. Te rugăm sa ieși sau să intri în modul anonim, și apoi să încerci din nou."
-    not_found_description: "Ne pare rău, nu am putut găsi acest link de dezabonare. Poate că linkul de dezabonare pe care l-ai primit pe email a expirat?"
     log_out: "Ieșire"
     digest_frequency:
       never: "niciodată"
@@ -559,6 +557,8 @@ ro:
       every_hour: "În fiecare oră"
       daily: "Zilnic"
       weekly: "Săptămânal"
+      every_month: "în fiecare lună"
+      every_six_months: "la fiecare șase luni"
   user_api_key:
     title: "Autorizează accesul aplicației"
     authorize: "Autorizează"
@@ -567,6 +567,8 @@ ro:
     description: '„%{application_name}” cere accesul la contul tău de:'
     otp_confirmation:
       confirm_title: Continuă la %{site_name}
+      logging_in_as: Autentificare ca %{username}
+      confirm_button: Finalizează autentificarea
     no_trust_level: "Ne pare rău, nu ai nivelul de încredere necesar pentru a accesa API utilizator"
     generic_error: "Ne pare rău, nu putem să emitem chei API utilizator: această funcționalitate este probabil dezactivată din administrarea site-ului"
     scopes:
@@ -579,15 +581,18 @@ ro:
   reports:
     default:
       labels:
+        count: Număr
         day: Zi
     post_edits:
       labels:
+        edited_at: Dată
         post: Postare
         editor: Editor
         edit_reason: Motiv
     user_flagging_ratio:
       labels:
         user: Utilizatori
+        score: Scor
     moderators_activity:
       labels:
         moderator: Moderator
@@ -631,6 +636,7 @@ ro:
       title: "Aprecieri"
       xaxis: "Zi"
       yaxis: "Număr de aprecieri noi"
+      description: "Număr de aprecieri noi."
     flags:
       title: "Marcaje de avertizare"
       xaxis: "Zi"
@@ -643,6 +649,7 @@ ro:
       title: "Utilizatori pe nivel de încredre"
       xaxis: "Nivel de încredere"
       yaxis: "Număr de utilizatori"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       xaxis: "Tip"
       yaxis: "Număr de utilizatori"
@@ -831,6 +838,7 @@ ro:
     show_pinned_excerpt_mobile: "Arată fragmente din subiectele fixate în vizualizarea de mobil."
     show_pinned_excerpt_desktop: "Arată fragmente din subiectele fixate în vizualizarea de desktop."
     post_onebox_maxlength: "Lungimea maximă a unei postări afișate în Onebox (în caractere)"
+    blocked_onebox_domains: "O listă cu domenii care nu vor putea fi utilizate cu onebox."
     max_oneboxes_per_post: "Numărul maxim de utilizări onebox per post."
     notification_email: "Adresă expeditor: adresa de email folosită când se trimit toate emailurile esențiale ale sistemului. Domeniul specificat aici trebuie să aibă setate corect SPF, DKIM și reverse PTR pentru ca emailul să poată fi livrat."
     email_custom_headers: "O listă delimitată cu simbolul | (pipe) a header-elor personalizate de email"
@@ -856,6 +864,7 @@ ro:
     pending_users_reminder_delay: "Notifică moderatorii dacă noii utilizatori sunt în așteptarea aprobării de mai mult de atâtea ore. Setează la -1 pentru a dezactiva notificările."
     maximum_session_age: "Utilizatorul va rămâne autentificat pentru n ore de la ultima vizită"
     cors_origins: "Origini permise pentru interogările inter-origini (CORS). Fiecare origine trebuie să includă http:// sau https://. Variabila env DISCOURSE_ENABLE_CORS trebuie setată pe true pentru a activa CORS."
+    use_admin_ip_allowlist: "Adminii se pot autentifica numai dacă au o adresă IP definită în lista de IP-uri verificate (Admin > Rapoarte > IP-uri verificate) "
     top_menu: "Determină ce elemente apar în navigare pe pagina principală și în ce ordine. Exemplu: ultimele|noi|necitite|categorii|top|citite|semnedecarte"
     post_menu: "Determină ce elemente apar în meniul de postare și în ce ordine . Exemplu: apreciere|editează|marchează|șterge|distribuie|semne de carte|răspunde"
     post_menu_hidden_items: "Elemente de meniu care să fie ascunse implicit în meniul de postări dacă nu se dă click pe partea de extindere a meniului."
@@ -874,6 +883,8 @@ ro:
     email_token_valid_hours: "Tokenul uitat parolă / activează cont sunt valabili pentru (n) ore."
     enable_badges: "Activează sistemul de ecusoane"
     enable_whispers: "Permite membrilor echipei să comunice privat în cadrul subiectelor."
+    blocked_email_domains: "O listă de domenii de email separate cu simbolul | (pipe) ale căror utilizatori nu au permisiunea să înregistreze conturi. Exemplu: mailinator.com|trashmail.net"
+    allowed_email_domains: "O listă de domenii de email (separate cu simbolul | (pipe)) cu care utilizatorii TREBUIE să se înregistreze. ATENȚIE: utilizatorii cu alte domenii de email decât cele listate nu vor avea permisiunea să se înregistreze."
     log_out_strict: "La ieșire, închide TOATE sesiunile pentru utilizator, pe toate dispozitivele."
     new_version_emails: "Trimite un email la adresa contact_email când o nouă versiune de Discourse este disponibilă."
     invite_expiry_days: "Cât timp sunt valabile cheile de invitație ale utilizatorilor, în zile"
@@ -881,12 +892,7 @@ ro:
     min_password_length: "Lungimea minimă a parolei."
     min_admin_password_length: "Lungimea maximă a parolei pentru Admin."
     block_common_passwords: "Nu permite parole ce sunt printre cele 10,000 cele mai cunoscute parole."
-    enable_sso: "Activează opțiunea single sign on via site extern (ATENȚIE: ADRESELE DE EMAIL ALE UTILIZATORILOR *TREBUIE* VALIDATE DE SITE-UL EXTERN!)"
-    sso_url: "URL pentru autentificare unică la punct final (trebuie să includă http:// or https://)"
-    sso_secret: "șir secret folosit pentru autentificarea criptografică a SSO, asigură-te că este de minim 10 caractere"
-    sso_overrides_bio: "Suprascrie biografia utilizatorului în profil utilizator și nu-i permite acestuia să o modifice"
-    sso_not_approved_url: "Redirecționează conturile neaprobate SSO către acest URL"
-    sso_allows_all_return_paths: "Nu restricționa domeniul pentru return_paths furnizate de SSO (implicit, calea de întoarcere trebuie să fie pe site-ul curent)"
+    discourse_connect_overrides_bio: "Suprascrie biografia utilizatorului în profil utilizator și nu-i permite acestuia să o modifice"
     allow_new_registrations: "Permite înregistrarea noilor utilizatori. Debifați pentru a restricționa pe oricine să creeze un cont nou."
     enable_signup_cta: "Arată o notificare către utilizatorii anonimi care revin prin care să le ceri să se înscrie pentru a avea un cont pe site."
     google_oauth2_client_id: "ID client al aplicației tale Google."
@@ -903,7 +909,6 @@ ro:
     top_topics_formula_log_views_multiplier: "valoarea multiplicatorului (n) de vizualizări rapoarte în formula celor mai bune subiecte:\n`log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_first_post_likes_multiplier: "valoarea multiplicatorului (n) de prime aprecieri la postări în formula celor mai bune subiecte:\n`log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "valoarea multiplicatorului (n) de cele mai puține aprecieri în formula celor mai bune subiecte:\n`log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Numărul de postări care să fie regenerate la fiecare 15 minute."
     rate_limit_create_topic: "După crearea unui subiect, utilizatorii trebuie să aștepte (n) secunde până pot crea unul nou."
     rate_limit_create_post: "După postare, utilizatorii trebuie să aștepte (n) de secunde până să creeze alta postare."
     rate_limit_new_user_create_topic: "După crearea unui subiect, utilizatorii noi trebuie să aștepte (n) secunde până pot crea unul nou."
@@ -930,7 +935,6 @@ ro:
     external_system_avatars_enabled: "Folosiți un serviciu extern de sisteme de avataruri"
     external_system_avatars_url: "URL-ul serviciului extern de sisteme de avataruri. Înlocuirile permise sunt {username} {first_letter} {color} {size}"
     allow_all_attachments_for_group_messages: "Permite toate atașamentele de email pentru mesajele de grup."
-    enable_flash_video_onebox: "Activează încastrarea adreselor swf și flv (Adobe Flash) în onebox. ATENȚIE: poate aduce riscuri de securitate."
     default_invitee_trust_level: "Nivelul de încredere implicit (0-4) pentru utilizatorii invitați."
     default_trust_level: "Nivelul de încredere implicit (0-4) pentru toți noii utilizatori. ATENȚIE! Schimbarea acestui parametru crește serios riscul de spam."
     tl1_requires_topics_entered: "Câte subiecte trebuie să posteze un utilizator nou înainte să fie promovat la nivelul de încredere 1."
@@ -979,6 +983,7 @@ 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."
+    dark_mode_none: "Nimeni"
     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."
@@ -999,6 +1004,7 @@ ro:
     tos_url: "Dacă ai un document Condițiile generale de utilizare găzduit în altă parte pe care dorești să-l folosești, postează-i întregul URL aici."
     privacy_policy_url: "Dacă ai un document cu Politica de Confidențialitate găzduit în altă parte, pe care dorești să-l folosești, postează-i întregul URL aici."
     newuser_spam_host_threshold: "De câte ori poate un utilizator nou să posteze un link către aceeași gazdă în limita de `newuser_spam_host_threshold` postări înainte ca să fie considerat spam."
+    allowed_spam_host_domains: "O listă de domenii excluse de la testarea gazdelor spam. Noii utilizatori nu vor fi niciodată restricționați să creeze postări cu linkuri către aceste domenii."
     topic_view_duration_hours: "Contorizează încă o vizualizare a unui subiect nou o singură dată per IP/Utilizator la fiecare N ore."
     user_profile_view_duration_hours: "Contorizează câte vizualizare de profil utilizator o singură dată per IP/Utilizator la fiecare N ore"
     levenshtein_distance_spammer_emails: "Când se face detectarea spam pe bază de potrivire cu un set de criterii, care este diferența de numere de caractere care încă mai permite o potrivire aproximativă (fuzzy match)."
@@ -1021,6 +1027,7 @@ ro:
     max_emails_per_day_per_user: "Numărul maxim de emailuri de trimis utilizatorilor pe zi. 0 pentru a dezactiva limita"
     enable_staged_users: "Creează în mod automat utilizatori în așteptare pe parcursul procesării emailurilor primite."
     maximum_staged_users_per_email: "Numărul maxim de utilizatori în așteptare creați la procesarea unui email primit."
+    auto_generated_allowlist: "Lisă de adrese de email care nu vor fi verificate dacă au conținut autogenerat. Exemplu: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Blochează emailurile care sunt identificate ca fiind auto-generate."
     ignore_by_title: "Ignoră emailurile care sosesc, pe baza titlurilor lor."
     mailgun_api_key: "Cheie API secretă pentru Mailgun folosită la verificarea mesajelor webhook."
@@ -1092,7 +1099,6 @@ ro:
     show_create_topics_notice: "Dacă site-ul are mai puțin de 5 subiecte publice, afișează o notificare prin care se cere adminilor să creeze subiecte."
     delete_drafts_older_than_n_days: "șterge drafturile mai vechi de (n) zile."
     bootstrap_mode_min_users: "Numărul minim de utilizatori necesar pentru dezactivarea modului bootstrap (0 pentru dezactivare)"
-    prevent_anons_from_downloading_files: "Blochează utilizatorii anonimi de la descărcarea de atașamente. ATENȚIE: aceasta va face ca toate resursele site-ului care sunt postate ca atașamente să nu mai meargă."
     slug_generation_method: "Alege o metodă de generare de identificator. 'encodat' va genera șir de caractere encodate cu procentaje. 'nimic' va dezactiva complet identificatorii."
     enable_emoji: "Activează emoji"
     emoji_set: "Cum ți-ar placea să fie emoji tăi?"
@@ -1106,7 +1112,6 @@ ro:
     default_include_tl0_in_digests: "Implicit, include postări de la utilizatori noi în emailurile-rezumat. Utilizatorii pot schimba această opțiune din preferințele lor."
     default_email_mailing_list_mode: "Implicit, trimite un email pentru fiecare nou mesaj."
     default_email_mailing_list_mode_frequency: "Implicit, utilizatorii care activează modul mailing list vor primi emailuri cu această frecvență."
-    disable_mailing_list_mode: "Anulează utilizatorilor permisiunea de a activa modul mailing list."
     default_email_previous_replies: "Implicit, include răspunsurile anterioare în emailuri."
     default_email_in_reply_to: "Implicit, include în email un extras postarea căreia i se răspunde."
     default_other_new_topic_duration_minutes: "Condiție implicită globală referitoare la durata timpului pentru care subiectul este considerat nou"
@@ -1123,7 +1128,6 @@ ro:
     default_categories_watching_first_post: "Lista categoriilor în care prima postare din fiecare topic va fi urmărită activ în mod implicit."
     allow_user_api_keys: "Permite generarea de chei API pentru utilizator"
     allow_user_api_key_scopes: "Lista domeniilor pentru care se permit chei API pentru utilizatori"
-    max_api_keys_per_user: "Numărul maxim de chei API utilizator pe utilizator"
     min_trust_level_for_user_api_key: "Nivelul de încredere necesar pentru generarea de chei API utilizator"
     allowed_user_api_push_urls: "URL-uri permise pentru serviciul push al serverului la API utilizator"
     tagging_enabled: "Activează etichetele la subiecte?"
@@ -1131,7 +1135,6 @@ ro:
     max_tags_per_topic: "Numărul maxim de etichete care pot fi aplicate unui subiect."
     max_tag_length: "Numărul maxim de caractere care poate fi folosit într-o etichetă."
     max_tag_search_results: "La căutarea de etichete, numărul maxim de rezultate care să fie afișat."
-    show_filter_by_tag: "Afișează un drop-down pentru filtrarea unei liste de subiecte după etichetă."
     max_tags_in_filter_list: "Numărul maxim de etichete care să se afișeze într-un drop-down filtru. Vor fi afișate etichetele cele mai folosite."
     tags_sort_alphabetically: "Afișează etichetele în ordine alfabetică. Implicit, etichetele sunt afișate în ordinea popularității."
     tag_style: "Stil vizual pentru ecusoanele etichetă."
@@ -1169,7 +1172,7 @@ ro:
       topic: "Rezultate"
       user: "Utilizatori"
     results_page: "Caută rezultate pentru '%{term}'"
-  sso:
+  discourse_connect:
     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."
     unknown_error: "Există o problema legată de contul tău. Te rugăm contactează administratorul site-ului."
@@ -1290,6 +1293,8 @@ ro:
       subject_template: "Postare ascunsă din cauza marcajelor de avertizare ale comunității"
     post_hidden_again:
       subject_template: "Postare ascunsă de flagurile comunității, staff notificat"
+    queued_by_staff:
+      title: "Necesită aprobare"
     welcome_user:
       subject_template: "Bine ai venit pe %{site_name}!"
     welcome_tl1_user:
@@ -1468,6 +1473,7 @@ ro:
 
         %{respond_instructions}
     user_replied:
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1487,6 +1493,7 @@ ro:
 
         %{respond_instructions}
     user_quoted:
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1496,6 +1503,7 @@ ro:
 
         %{respond_instructions}
     user_linked:
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1505,6 +1513,7 @@ ro:
 
         %{respond_instructions}
     user_mentioned:
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1524,6 +1533,7 @@ ro:
 
         %{respond_instructions}
     user_group_mentioned:
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1533,6 +1543,7 @@ ro:
 
         %{respond_instructions}
     user_posted:
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1542,6 +1553,7 @@ ro:
 
         %{respond_instructions}
     user_watching_first_post:
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1584,6 +1596,8 @@ ro:
       title: "Parolă uitată"
     set_password:
       title: "Setează parola"
+    account_created:
+      subject_template: "[%{email_prefix}] Noul tău cont"
     notify_old_email:
       text_body_template: |
         Acesta este un mesaj automat pentru a te informa că adresa ta de email pentru %{site_name} a fost schimbată. Dacă acest lucru s-a întâmplat dintr-o eroare, contractează un administrator al site-lui.
@@ -1642,6 +1656,7 @@ ro:
     wcag_theme_name: "WCAG deschis"
     wcag_dark: "WCAG Închis"
     wcag_dark_theme_name: "WCAG Închis"
+    default_theme_name: "Implicit"
   edit_this_page: "Editează această pagină"
   csv_export:
     boolean_yes: "Da"
@@ -1954,11 +1969,18 @@ ro:
             description: "Adresa de email a persoanei sau grupului responsabil de aceasta comunitate. Folosită pentru notificări critice cum ar fi marcaje de avertizare negestionate, actualizări de securitate și afișată pe pagina <a href='%{base_path}/about' target='_blank'>Despre noi</a> pentru contactarea de urgență a comunității."
           contact_url:
             label: "Pagină web"
+            placeholder: "https://www.example.com/contact-us"
             description: "Pagina web generică cu date de contact pentru tine sau organizația ta. Se va afișa pe <a href='%{base_path}/about' target='_blank'>pagina despre noi</a>. "
           site_contact:
             label: "Mesaje automate"
       corporate:
         title: "Organizație"
+      colors:
+        title: "Culori"
+      fonts:
+        fields:
+          font_preview:
+            label: "Previzualizează"
       logos:
         title: "Logo-uri"
         fields:
@@ -1984,8 +2006,6 @@ ro:
                 label: "Categorii și cele mai noi discuții"
               categories_and_top_topics:
                 label: "Categorii și discuții de top"
-      emoji:
-        title: "Emoji"
       invites:
         title: "Invită membrii echipei"
         description: "Aproape ai încheiat ! Hai să invităm câțiva prieteni să te ajute <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>cu demararea comunității </a> prin discuții și răspunsuri interesante."
@@ -2002,11 +2022,19 @@ ro:
       private_message: '%{username} ți-a trimis un mesaj privat în discuția "%{topic}" - %{site_title}'
       linked: '%{username} a creat o legătură către postarea ta din discuția "%{topic}" - %{site_title}'
   reviewables:
+    priorities:
+      medium: "Medie"
+      high: "Ridicată"
+    sensitivity:
+      medium: "Medie"
+      high: "Ridicată"
     actions:
       agree_and_keep:
         title: "Păstrează postarea"
       agree_and_suspend:
         title: "Suspendă utilizator"
+      agree_and_silence:
+        title: "Suspendă utilizatorul"
       agree_and_restore:
         description: "Restabilește postarea pentru astfel încât toți utilizatorii să o poată vedea."
       agree_and_hide:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 1ad86cef96..a765c2cb1f 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -51,9 +51,13 @@ ru:
   remove_posts_deleted_by_author: "Удалено автором"
   redirect_warning: "Нам не удалось убедиться, что выбранная вами ссылка действительно была размещена на форуме. Если вы хотите продолжить, выберите ссылку ниже."
   on_another_topic: "По другой теме"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} от пользователя %{username}"
   themes:
     bad_color_scheme: "Не удаётся обновить тему, недопустимая цветовая палитра"
     other_error: "При обновлении темы оформления что-то пошло не так."
+    ember_selector_error: "К сожалению, использование CSS-селекторов #ember или .ember-view запрещено, поскольку эти имена создаются динамически во время выполнения кода и со временем будут меняться. Попробуйте другой селектор."
     compile_error:
       unrecognized_extension: "Нераспознанное расширение файла: %{extension}"
     import_error:
@@ -62,9 +66,11 @@ ru:
       about_json_values: "Файл about.json содержит недопустимые значения:%{errors}"
       modifier_values: "модификаторы about.json содержат недопустимые значения: %{errors}"
       git: "Ошибка клонирования git-репозитория: доступ запрещён или репозиторий не найден"
+      git_ref_not_found: "Невозможно получить объект по ссылке git: %{ref}"
       unpack_failed: "Не удалось распаковать файл"
       file_too_big: "Несжатый файл слишком велик."
       unknown_file_type: "Загруженный файл не является допустимой темой Discourse."
+      not_allowed_theme: "Репозиторий `%{repo}` отсутствует в списке разрешённых тем (см. параметр `allowed_theme_repos`)."
     errors:
       component_no_user_selectable: "Компоненты темы не могут быть выбраны пользователем"
       component_no_default: "Компоненты темы не могут быть темой по умолчанию"
@@ -93,7 +99,7 @@ ru:
   emails:
     incoming:
       default_subject: "Тема входящего письма по умолчанию."
-      show_trimmed_content: "Показывать сокращённый текст"
+      show_trimmed_content: "Показать обрезанный текст"
       maximum_staged_user_per_email_reached: "Достигнуто максимальное количество сымитированных пользователей, созданных по электронной почте."
       no_subject: "(нет темы)"
       no_body: "(нет содержимого)"
@@ -140,7 +146,7 @@ ru:
       has_already_been_used: "уже было использовано"
       inclusion: не включено в список
       invalid: неверное
-      is_invalid: "Не совсем ясно, это предложение закончено?"
+      is_invalid: "не совсем ясен, это предложение закончено?"
       is_invalid_meaningful: "выглядит странно, большинство слов содержат одни и те же повторяющиеся буквы."
       is_invalid_unpretentious: "выглядит странно, одно или несколько слов очень длинные."
       is_invalid_quiet: "выглядит странно, вы действительно хотели ввести весь текст ЗАГЛАВНЫМИ БУКВАМИ?"
@@ -152,8 +158,8 @@ ru:
       not_an_integer: должно быть целым
       odd: должно быть нечётным
       record_invalid: ! "Ошибка валидации: %{errors}"
-      max_emojis: "не может содержать более %{max_emojis_count} смайлов"
-      emojis_disabled: "не может содержать смайлики"
+      max_emojis: "не может содержать более %{max_emojis_count} эмодзи"
+      emojis_disabled: "не может содержать эмодзи"
       ip_address_already_screened: "уже включён в существующее правило"
       restrict_dependent_destroy:
         one: "Невозможно удалить запись, поскольку существует зависимая запись: %{record}"
@@ -174,7 +180,7 @@ ru:
         many: неправильная длина (должно быть %{count} символов)
         other: неправильная длина (должно быть %{count} символов)
       other_than: "не должно быть равно %{count}"
-      sso_overrides_username: "Имя пользователя должно быть обновлено на стороне поставщика SSO, так как включена настройка `sso_overrides_username`."
+      auth_overrides_username: "Имя пользователя должно быть обновлено на стороне поставщика аутентификации, так как включена настройка `sso_overrides_username`."
     template:
       body: ! "Обнаружены ошибки в следующих полях:"
       header:
@@ -202,7 +208,7 @@ ru:
       share_quote_facebook_requirements: "Вы должны установить идентификатор приложения, чтобы включить обмен цитатами для Фейсбука."
       second_factor_cannot_enforce_with_socials: "Вы не можете применить двухфакторную аутентификацию при включённом входе в социальные сети. Сначала вы должны отключить вход через: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Вы не можете применить двухфакторную аутентификацию, если локальный вход в систему отключён."
-      second_factor_cannot_be_enforced_with_sso_enabled: "Вы не можете применить двухфакторную аутентификацию, если используется технология единого входа (SSO)."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "Вы не можете применить двухфакторную аутентификацию, если используется технология единого входа DiscourseConnect."
       local_login_cannot_be_disabled_if_second_factor_enforced: "Вы не можете отключить локальный вход в систему, если применяется двухфакторная аутентификация. Отключите её перед отключением возможности локального входа."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "Вы не можете включить загрузку S3, потому что загрузка S3 уже включена глобально, и включение этого уровня сайта может вызвать критические проблемы с загрузками"
       cors_origins_should_not_have_trailing_slash: "Не следует добавлять завершающую косую черту (/) к источникам кросс-доменных запросов (CORS)."
@@ -221,19 +227,22 @@ ru:
     expired: "Срок действия токена приглашения истек. Пожалуйста, <a href='%{base_url}/about'>свяжитесь с персоналом</a>."
     not_found: "Неверный код приглашения. Пожалуйста, <a href='%{base_url}/about'>свяжитесь с персоналом</a>."
     not_found_json: "Неверный код приглашения. Пожалуйста, свяжитесь с персоналом."
+    not_matching_email: "Ваш адрес электронной почты и адрес электронной почты, связанный с токеном приглашения, не совпадают. Пожалуйста, свяжитесь с сотрудником."
     not_found_template: |
       <p>Ваше приглашение на сайт <a href="%{base_url}">%{site_name}</a> уже использовано.</p>
 
       <p>Если вы помните ваш пароль, вы можете <a href="%{base_url}/login">Войти в аккаунт</a>.</p>
 
       <p>В противном случае <a href="%{base_url}/password-reset">восстановите пароль</a>.</p>
-    error_message: "При приёме приглашения произошла ошибка. Пожалуйста, свяжитесь с администратором сайта."
+    not_found_template_link: |
+      <p>Приглашение на сайт <a href="%{base_url}">%{site_name}</a> более недействительно. Попросите пригласившего вас прислать вам новое приглашение.</p>
     user_exists: "Нет необходимости приглашать пользователя с адресом <b>%{email}</b>, у него уже есть <a href='%{base_path}/u/%{username}/summary'>аккаунт</a>!"
+    invite_exists: "Вы уже пригласили пользователя с адресом <b>%{email}</b>"
+    invalid_email: "Адрес '%{email}' не является корректным адресом электронной почты."
     confirm_email: "<p>Вы почти закончили! Мы отправили письмо активации на ваш адрес электронной почты. Пожалуйста, следуйте инструкциям в письме для активации учётной записи. </p><p> Если письмо не приходит, проверьте папку со спамом. </p>"
     cant_invite_to_group: "Вы не можете приглашать пользователей в указанные группы. Убедитесь, что вы являетесь владельцем группы (групп), в которую вы пытаетесь пригласить."
     disabled_errors:
-      sso_enabled: "Возможность использования приглашений отключена, поскольку включена технология единого входа (SSO)"
-      local_logins_disabled: "Возможность использования приглашений отключена, поскольку отключён параметр 'Включить локальные учетные записи'."
+      discourse_connect_enabled: "Возможность использования приглашений отключена, поскольку включена технология единого входа DiscourseConnect."
       invalid_access: "У вас нет прав для просмотра запрашиваемого ресурса."
   bulk_invite:
     file_should_be_csv: "Загружаемый файл должен быть в csv-формате."
@@ -249,7 +258,7 @@ ru:
     muted_topic: "Извините, но этот пользователь отключил возможность получать уведомления для этой темы."
     receiver_does_not_allow_pm: "Извините, но этот пользователь не позволяет вам отправлять ему личные сообщения."
     sender_does_not_allow_pm: "Извините, но вы не позволяете этому пользователю отправлять вам личные сообщения."
-    receiver_does_not_allow_other_user_pm: "Извините, но этот пользователь не позволяет существующим участникам отправлять ему личные сообщения."
+    user_cannot_see_topic: "Пользователь %{username} не видит эту тему."
   backup:
     operation_already_running: "Действие уже выполняется, поэтому невозможно начать новое действие прямо сейчас."
     backup_file_should_be_tar_gz: "Файл резервной копии должен быть архивом в формате .TAR.GZ."
@@ -272,6 +281,7 @@ ru:
   email_template_cant_be_modified: "Этот почтовый шаблон не может быть изменён"
   invalid_whisper_access: "Либо скрытые сообщения не разрешены, либо у вас нет прав на создание скрытых сообщений"
   not_in_group:
+    title_topic: "Вам нужно запросить членство в группе '%{group}', чтобы увидеть эту тему."
     title_category: "Вы должны быть членом группы, чтобы видеть этот раздел"
     request_membership: "Запрос на включение в группу"
     join_group: "Присоединиться к группе"
@@ -361,12 +371,13 @@ ru:
   max_pm_recipients: "Извините, но вы можете послать личное сообщение максимум %{recipients_limit} получателям."
   pm_reached_recipients_limit: "Извините, но вы не можете указать больше %{recipients_limit} получателей в личном сообщении."
   removed_direct_reply_full_quotes: "Автоматически удалять цитирование всего предыдущего сообщения."
+  watched_words_auto_tag: "Тема, помеченная автотегами"
   secure_upload_not_allowed_in_public_topic: "Извините, но следующие файлы с ограниченным доступом не могут быть использованы в публичной теме: %{upload_filenames}."
   create_pm_on_existing_topic: "Извините, но вы не можете создать личное сообщение в существующей теме."
   slow_mode_enabled: "Эта тема находится в замедленном режиме."
   just_posted_that: "слишком похоже на уже опубликованное вами ранее"
   invalid_characters: "содержит недопустимые символы"
-  is_invalid: "Не совсем ясно, это предложение закончено?"
+  is_invalid: "не совсем ясен, это предложение закончено?"
   next_page: "следующая страница →"
   prev_page: "← предыдущая страница"
   page_num: "Страница %{num}"
@@ -406,11 +417,12 @@ ru:
   too_late_to_edit: "Это сообщение нельзя изменить или удалить, поскольку оно было создано очень давно."
   edit_conflict: "Этот пост был отредактирован другим пользователем и ваши изменения не могут быть сохранены."
   revert_version_same: "Текущая версия такая же, как та, на которую вы хотите вернуться."
-  cannot_edit_on_slow_mode: "Эта тема находится в замедленном режиме. Для поощрения вдумчивого, взвешенного обсуждения редактирование старых сообщений в настоящее время запрещено."
+  cannot_edit_on_slow_mode: "Эта тема находится в замедленном режиме. Для поощрения вдумчивого, взвешенного обсуждения, редактирование старых сообщений в замедленном режиме запрещено."
   excerpt_image: "изображение"
   bookmarks:
     errors:
       already_bookmarked_post: "Вы не можете дважды добавить сообщение в закладки"
+      too_many: "К сожалению, вы не можете добавить больше %{limit} закладок, посетите страницу <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a>, чтобы удалить некоторые из них."
       cannot_set_past_reminder: "Нельзя указать уже прошедшую дату напоминания."
       cannot_set_reminder_in_distant_future: "Нельзя указать дату напоминания, отличающуюся от текущей более чем на 10 лет. "
       time_must_be_provided: "Время должно быть установлено для всех напоминаний"
@@ -443,7 +455,14 @@ ru:
       email_already_used_in_category: "Адрес '%{email}' уже используется разделом '%{category_name}'."
       cant_allow_membership_requests: "Вы не можете разрешить пользовательские запросы на включение в группу, не имеющей владельцев."
       already_requested_membership: "Вы уже запросили членство в этой группе."
-      adding_too_many_users: "Одновременно можно добавить не более %{limit} пользователей"
+      adding_too_many_users:
+        one: "Одновременно можно добавить не более %{count} пользователя"
+        few: "Одновременно можно добавить не более %{count} пользователей"
+        many: "Одновременно можно добавить не более %{count} пользователей"
+        other: "Одновременно можно добавить не более %{count} пользователей"
+      usernames_or_emails_required: "Необходимо указать имена пользователей или адреса электронной почты."
+      no_invites_with_discourse_connect: "При включении DiscourseConnect вы можете приглашать только зарегистрированных пользователей"
+      no_invites_without_local_logins: "При отключении локальных логинов вы можете приглашать только зарегистрированных пользователей"
     default_names:
       everyone: "все"
       admins: "администраторы"
@@ -475,19 +494,19 @@ ru:
 
       - О чём ваша тема? Кому она будет интересна? Почему она важна для обсуждения? Какой, по-вашему мнению, будет реакция сообщества на тему?
 
-      - Постарайтесь включить в текст сообщения подходящие теги, по которым другие смогут *найти* тему. Выберите раздел, к которому ваша тема подходит по смыслу.
+      - Постарайтесь включить в текст сообщения подходящие ключевые слова, по которым другие пользователи смогут *найти* эту тему. Для группировки этой темы с другими аналогичными темами - поместите её в соответствующий раздел, и, по возможности, пометьте её подходящим тегом.
 
-      Больше информации вы найдёте в нашем [руководстве пользователя](%{base_path}/guidelines). Данное окно будет показываться, пока вы создаёте свои первые %{education_posts_text}.
+      Больше информации вы найдёте в нашем [руководстве пользователя](%{base_path}/guidelines). Эта подсказка будет отображаться, пока вы создаёте свои первые %{education_posts_text}.
     "new-reply": |
       Добро пожаловать на сайт %{site_name} &mdash; **Спасибо за участие в обсуждении!**
 
-      - Как вы думаете, улучшит ли ваш ответ обсуждение в целом, хотя бы немного?
-
       - Будьте дружелюбны к участникам разговора.
 
+      - Как вы думаете, улучшит ли ваш ответ обсуждение, хотя бы немного?
+
       - Конструктивная критика приветствуется, но не забывайте критиковать *идеи*, а не людей.
 
-      Больше информации вы найдёте в нашем [руководстве пользователя](%{base_path}/guidelines). Данное окно будет показываться пока вы создаёте свои первые %{education_posts_text}.
+      Больше информации вы найдёте в нашем [руководстве пользователя](%{base_path}/guidelines). Эта подсказка будет отображаться, пока вы создаёте свои первые %{education_posts_text}.
     avatar: |
       ### Как насчёт добавления аватара к вашей учётной записи?
       Вы опубликовали несколько тем и ответы, но ваше изображение профиля не уникально - это просто первая буква вашего имени.
@@ -517,7 +536,7 @@ ru:
 
       И не забывайте, что если вы хотите продолжить приватный разговор с конкретным участником, то ему стоит отправить [личное сообщение](%{base_path}/u/%{reply_username}).
     too_many_replies: |
-      ###Вы дали максимально возможное количество ответов в этой теме.
+      ### Вы дали максимально возможное количество ответов в этой теме.
 
       К сожалению, новые пользователи временно ограничены %{newuser_max_replies_per_topic} сообщениями в рамках одной темы.
 
@@ -550,6 +569,7 @@ ru:
               cant_send_pm: "Извините, но вы не можете отправить личное сообщение этому пользователю."
               no_user_selected: "Вы должны выбрать пользователя."
               reply_by_email_disabled: "Ответ по Email был отключён."
+              send_to_email_disabled: "Извините, но вы не можете отправить личное сообщение на электронную почту."
               target_user_not_found: "Не удалось найти одного из пользователей, которым вы отправляете это сообщение."
               unable_to_update: "При обновлении темы произошла ошибка."
               unable_to_tag: "При добавлении тега произошла ошибка."
@@ -593,11 +613,14 @@ ru:
         custom_emoji:
           attributes:
             name:
-              taken: уже используется другим смайликом
+              taken: уже используется другим эмодзи
         topic_timer:
           attributes:
             execute_at:
               in_the_past: "должно быть в будущем."
+            duration_minutes:
+              cannot_be_zero: "Значение должно быть больше 0."
+              exceeds_maximum: "Период времени не должен быть более 20 лет."
         translation_overrides:
           attributes:
             value:
@@ -705,20 +728,20 @@ ru:
     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} перед следующей попыткой."
+      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: "Вы создали максимально допустимое количество отписок через Email. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      topic_invitations_per_day: "Вы создали максимально допустимое количество приглашений в темы. Пожалуйста, подождите %{time_left} перед следующей попыткой."
+      topic_invitations_per_day: "Вы достигли максимального количества приглашений в тему, которое можно создать за день. Вы можете создать новые приглашения через %{time_left}."
     hours:
       one: "%{count} час"
       few: "1 часа"
@@ -870,7 +893,7 @@ ru:
       unknown: "Неизвестный браузер"
     device:
       android: "Android-устройство"
-      chromebook: "Хромбук"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -881,7 +904,7 @@ ru:
       unknown: "Неизвестное устройство"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -896,6 +919,7 @@ ru:
     error_staged: "При смене электронного адреса произошла ошибка. Этот адрес уже используется сымитированным пользователем."
     already_done: "Извините, ссылка для подтверждения устарела. Возможно, ваш Email уже изменён?"
     confirm: "Подтверждение"
+    max_secondary_emails_error: "Вы указали максимально возможное количество дополнительных адресов электронной почты."
     authorizing_new:
       title: "Подтвердите свой новый Email"
       description: "Подтвердите, что Вы хотите поменять свой Email на новый:"
@@ -987,6 +1011,16 @@ ru:
       others: "Нет ответов"
     no_drafts:
       self: "У вас нет черновиков; начните составлять ответ в любой теме, и он будет автоматически сохранён как новый черновик."
+  email_settings:
+    pop3_authentication_error: "Возникла проблема с учётными данными POP3, проверьте имя пользователя и пароль и повторите попытку."
+    imap_authentication_error: "Возникла проблема с учётными данными IMAP, проверьте имя пользователя и пароль и повторите попытку."
+    imap_no_response_error: "Произошла ошибка при подключении к IMAP-серверу. %{message}"
+    smtp_authentication_error: "Возникла проблема с учётными данными SMTP, проверьте имя пользователя и пароль и повторите попытку."
+    smtp_server_busy_error: "SMTP-сервер сейчас занят, повторите попытку позже."
+    smtp_unhandled_error: "Произошла необработанная ошибка при подключении к SMTP-серверу. %{message}"
+    connection_error: "При подключении к серверу возникла проблема, проверьте имя сервера, порт и повторите попытку."
+    timeout_error: "Время подключения к серверу истекло, проверьте имя сервера, порт и повторите попытку."
+    unhandled_error: "Необработанная ошибка при тестировании настроек электронной почты. %{message}"
   webauthn:
     validation:
       invalid_type_error: "Указанный тип webauthn недействителен. Допустимые типы: webauthn.get и webauthn.create."
@@ -1035,7 +1069,7 @@ ru:
         remove: "Эта тема теперь не является объявлением и больше не будет отображаться в верхней части всех страниц."
   unsubscribed:
     title: "Настройки E-mail обновлены!"
-    description: "<b>Настройки</b> электронной почты для <b>%{email}</b> были обновлены. Чтобы изменить настройки электронной почты, зайдите в <a href='%{url}'>настройки пользователя</a> ."
+    description: "Настройки электронной почты для <b>%{email}</b> были обновлены. Чтобы изменить настройки электронной почты, зайдите в <a href='%{url}'>настройки пользователя</a>."
     topic_description: "Чтобы восстановить подписку на тему %{link}, воспользуйтесь кнопкой настройки уведомлений, расположенной справа и под последним сообщением темы."
     private_topic_description: "Чтобы повторно подписаться, воспользуйтесь кнопкой настройки уведомлений, расположенной справа и под последним сообщением темы."
   uploads:
@@ -1048,7 +1082,7 @@ ru:
     mailing_list_mode: "Отключить почтовую рассылку"
     all: "Не отправлять мне почту с сайта %{sitename}"
     different_user_description: "В данный момент вы вошли как другой пользователь, а не тот, которому мы отправили сообщение по электронной почте. Выйдите из системы или войдите в анонимный режим и повторите попытку."
-    not_found_description: "Извините, мы не можем отписать вас от рассылки. Возможно, ссылка, полученная вами по электронной почте, уже недействительна."
+    not_found_description: "Извините, мы не можем отписать вас от рассылки. Возможно, ссылка, полученная вами по электронной почте, устарела и уже недействительна."
     log_out: "Выйти"
     submit: "Сохранить настройки"
     digest_frequency:
@@ -1426,6 +1460,7 @@ ru:
     github_config_warning: 'Сервер настроен для разрешения регистрации и авторизации с помощью GitHub (enable_github_logins), но идентификатор клиента и секретные значения не установлены. Зайдите в <a href="%{base_path}/admin/site_settings">настройки сайта</a> и обновите их. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Смотрите это руководство, чтобы узнать больше</a>.'
     s3_config_warning: 'Сервер настроен для загрузки файлов в S3, но по крайней мере один из следующих параметров не задан: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile или s3_upload_bucket. Зайдите в <a href="%{base_path}/admin/site_settings">настройки сайта</a> и обновите их. См. тему <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Как настроить загрузку изображений в S3?</a>, чтобы узнать больше.'
     s3_backup_config_warning: 'Сервер настроен для загрузки резервных копий в S3, но по крайней мере один из следующих параметров не задан: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile или s3_backup_bucket. Зайдите в <a href="%{base_path}/admin/site_settings">настройки сайта</a> и обновите их. См. тему <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Как настроить загрузку изображений в S3?</a>, чтобы узнать больше.'
+    s3_cdn_warning: 'Сервер настроен на загрузку файлов в S3, но CDN не настроена. Это может привести к увеличению затрат на хранение данных и снижению производительности сайта. Детали см. в теме <a href="https://meta.discourse.org/t/-/148916" target="_blank">Using Object Storage for Uploads</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 заканчивается косой чертой."
@@ -1436,14 +1471,12 @@ ru:
       other: "Опрос электронной почты вызвал %{count} ошибок за последние 24 часа. Посмотрите <a href='%{base_path}/logs' target='_blank'>журналы</a> для более подробной информации."
     missing_mailgun_api_key: "Сервер настроен на отправку писем через Mailgun, но вы не предоставили ключ API, используемый для проверки сообщений вебхука."
     bad_favicon_url: "Иконка не загружается. Проверьте настройки избранного в настройках <a href='%{base_path}/admin/site_settings'>сайта</a>."
-    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> для получения инструкций по обновлению. После обновления это сообщение должно исчезнуть в течение 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> или отключите в настройках сайта поддержку регулярных выражений для контролируемых слов."
+    watched_word_regexp_error: "Недопустимое регулярное выражение для контролируемых слов в разделе '%{action}'. Пожалуйста, проверьте <a href='%{base_path}/admin/customize/watched_words'>корректность регулярных выражений</a> или отключите в настройках сайта настройку 'Контролируемые слова представлены регулярными выражениями'."
   site_settings:
     display_local_time_in_user_card: "Отображать местное время в карточке пользователя."
     censored_words: "Слова, которые будут автоматически заменены на &#9632;&#9632;&#9632;&#9632;"
@@ -1462,7 +1495,7 @@ ru:
     min_topic_title_length: "Минимально допустимое количество символов в названии темы"
     max_topic_title_length: "Максимально допустимое количество символов в названии темы"
     min_personal_message_title_length: "Минимально допустимое количество символов в заголовке личного сообщения"
-    max_emojis_in_title: "Максимальное количество смайликов в названии темы"
+    max_emojis_in_title: "Максимальное количество эмодзи в названии темы"
     min_search_term_length: "Минимальное количество символов в поисковом запросе"
     search_tokenize_chinese_japanese_korean: "Принудительный поиск для токенизации Китайского/Японского /Корейского языков даже на сайтах, не содержащих символы CJK"
     search_prefer_recent_posts: "Сначала индексировать последние сообщения. Актуально при медленном поиске на больших объёмах данных"
@@ -1471,10 +1504,8 @@ ru:
     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: "Разрешать создание тем с одинаковыми названиями."
     allow_duplicate_topic_titles_category: "Разрешать создание тем с одинаковыми названиями, если они создаются в разных разделах (параметр allow_duplicate_topic_titles должен быть отключён)."
@@ -1524,6 +1555,7 @@ ru:
     mobile_logo_dark: "Dark scheme alternative for the 'mobile logo' site setting."
     large_icon: "Изображение, используемое в качестве основы для других значков метаданных. В идеале должно быть больше 512 х 512. Если оставить поле пустым, будет использоваться уменьшенный логотип."
     manifest_icon: "Изображение, используемое в качестве логотипа на Android-устройствах. Размер будет автоматически изменён до 512 × 512. Если оставить поле пустым, будет использоваться большая иконка."
+    manifest_screenshots: "Скриншоты, демонстрирующие особенности и функциональные возможности вашего приложения, отображаемые на странице с запросом на установку. Все изображения должны быть загружены локально и иметь одинаковые размеры."
     favicon: "Иконка сайта, см. <a href='https://ru.wikipedia.org/wiki/Favicon' target='_blank'>https://ru.wikipedia.org/wiki/Favicon</a>. Для корректного отображения она должен быть в формате PNG. Размер будет автоматически изменён до 32x32. Если оставить поле пустым, будет использоваться большая иконка."
     apple_touch_icon: "Иконка, используемая на сенсорных устройствах Apple. Размер будет автоматически изменён до 180x180. Если оставить поле пустым, будет использоваться большая иконка."
     opengraph_image: "Стандартное изображение opengraph, используемое, если на странице нет другого подходящего изображения. Если оставить поле пустым, будет использоваться большая иконка."
@@ -1534,7 +1566,7 @@ ru:
     detailed_404: "Предоставление пользователям более подробной информации о том, почему они не могут получить доступ к определённой теме. Примечание: Это менее безопасно, поскольку пользователи будут знать, ссылается ли URL-адрес на допустимую тему."
     enforce_second_factor: "Принудительное включение двухфакторной аутентификации. Выберите 'all', чтобы применить его ко всем пользователям. Выберите 'staff', чтобы принудительно использовать её только сотрудниками."
     force_https: "Принудительное использование протокола HTTPS. ВНИМАНИЕ: НЕ включайте этот параметр, пока не убедитесь, что HTTPS полностью настроен и работает абсолютно везде! Вы проверили настройки сети, доступность учётных записей в социальных сетях, доступность внешних логотипов и зависимостей, чтобы убедиться, что они корректно работают при использовании HTTPS?"
-    same_site_cookies: "Использовать одни и те же файлы cookie, они предотвращают <a href='https://ru.wikipedia.org/wiki/Межсайтовая_подделка_запроса' target='_blank'>межсайтовую подделку запроса</a> в поддерживаемых браузерах (Lax или Strict). Предупреждение: Strict будет работать только на сайтах, которые поддерживают принудительный вход в систему и используют SSO."
+    same_site_cookies: "Использовать одни и те же файлы cookie, они предотвращают <a href='https://ru.wikipedia.org/wiki/Межсайтовая_подделка_запроса' target='_blank'>межсайтовую подделку запроса</a> в поддерживаемых браузерах (Lax или Strict). Предупреждение: Strict будет работать только на сайтах, которые поддерживают принудительный вход в систему и используют внешнюю аутентификацию."
     summary_score_threshold: "Минимальная оценка сообщения, необходимая для его включения в сводку по теме"
     summary_posts_required: "Минимальное количество сообщений, необходимое для получения сводки по теме. Изменения этого параметра будут применены к темам за прошедшую неделю."
     summary_likes_required: "Минимальное количество симпатий, необходимое для получения сводки по теме. Изменения этого параметра будут применены к темам за прошедшую неделю."
@@ -1572,6 +1604,7 @@ ru:
     must_approve_users: "Персонал должен подтвердить регистрацию новых пользователей перед тем, как им будет разрешён доступ к сайту."
     invite_code: "Пользователь должен ввести этот код для регистрации учётной записи (без учёта регистра)"
     approve_suspect_users: "Добавлять подозрительных пользователей в очередь премодерации. Пользователи с подозрительной активностью имеют доступ к своему профилю, но не могут читать сообщения."
+    review_every_post: "Проверять каждое сообщение. ПРЕДУПРЕЖДЕНИЕ! НЕ РЕКОМЕНДУЕТСЯ ВКЛЮЧАТЬ ЭТОТ ПАРАМЕТР НА ЗАГРУЖЕННЫХ САЙТАХ."
     pending_users_reminder_delay: "Уведомлять модераторов, если новые пользователи ждут одобрения больше, чем указанное здесь количество часов. Установите значение в -1 для отключения уведомлений."
     persistent_sessions: "Пользователи остаются авторизованными после закрытия веб-браузера"
     maximum_session_age: "Пользователь остаётся в системе в течение указанного здесь количества часов с момента последнего посещения"
@@ -1595,6 +1628,7 @@ ru:
     content_security_policy: "Включить политику безопасности контента (CSP)"
     content_security_policy_report_only: "Включить только отчёт о политике безопасности контента (CSP)"
     content_security_policy_collect_reports: "Включить отчёты о нарушениях CSP в /csp_reports"
+    content_security_policy_frame_ancestors: "Ограничить через CSP число тех, кто может встроить этот сайт в iframes. Перечень разрешённых хостов настраивается на закладке <a href='%{base_path}/admin/customize/embedding'>Встраивание</a>"
     content_security_policy_script_src: "Дополнительные источники сценариев в белом списке. Текущий хост и CDN включены по умолчанию. См. <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Mitigate XSS Attacks with Content Security Policy.</a>"
     invalidate_inactive_admin_email_after_days: "Учётные записи администраторов, которые не посещали сайт в течение указанного здесь количества дней, должны будут повторно подтвердить свой адрес электронной почты перед входом в систему. Для отключения этого параметра установите значение в 0."
     top_menu: "Укажите, какие элементы навигации должны располагаться на главной странице и в какой последовательности. Пример: latest|new|unread|categories|top|read|posted|bookmarks"
@@ -1642,27 +1676,27 @@ ru:
     min_admin_password_length: "Минимальная длина пароля для Администратора."
     password_unique_characters: "Минимальное количество уникальных символов, которое должен иметь пароль."
     block_common_passwords: "Не позволять использовать пароли из списка 10 000 самых часто используемых паролей."
-    external_auth_skip_create_confirm: При регистрации через внешнюю авторизацию пропустить всплывающее окно создания учётной записи. Лучше всего использовать вместе с sso_overrides_email, sso_overrides_username и sso_overrides_name.
-    external_auth_immediately: "Автоматическое перенаправление на внешнюю систему входа без вмешательства пользователя. Настройка сработает только в том случае, если параметр login_required установлен в true, и существует только один внешний метод аутентификации."
-    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-списка (по умолчанию возврат должен осуществляться на текущий сайт)"
-    enable_local_logins: "Включить локальные учётные записи на основе имени пользователя и пароля. Этот параметр должен быть включён для работы приглашений. ВНИМАНИЕ: если параметр отключён, вы не сможете войти в систему, если ранее не был настроен хотя бы один альтернативный метод входа."
+    auth_skip_create_confirm: При регистрации через внешнюю авторизацию пропустить всплывающее окно создания учётной записи. Лучше всего использовать вместе с параметрами auth_overrides_email, auth_overrides_username и auth_overrides_name.
+    auth_immediately: "Автоматически перенаправлять на внешнюю систему входа без вмешательства пользователя. Настройка сработает только в том случае, если параметр login_required установлен в 'true', и используется только один внешний метод аутентификации."
+    enable_discourse_connect: "Включить вход через DiscourseConnect (прежнее название - 'Discourse SSO') (ВНИМАНИЕ: ЭЛЕКТРОННЫЕ АДРЕСА ПОЛЬЗОВАТЕЛЕЙ *ДОЛЖНЫ* ПРОВЕРЯТЬСЯ НА ВНЕШНЕМ САЙТЕ!)"
+    verbose_discourse_connect_logging: "Записывать подробную диагностику, связанную с DiscourseConnect, в файл <a href='%{base_path}/logs' target='_blank'>журнала</a>"
+    enable_discourse_connect_provider: "Использовать протокол единого входа DiscourseConnect (прежнее название - 'Discourse SSO'). Необходимо настроить параметр discourse_connect_provider_secrets"
+    discourse_connect_url: "URL-адрес DiscourseConnect (должен содержать http:// или https://)"
+    discourse_connect_secret: "Секретный набор символов, используемый для проверки подлинности зашифрованного входа с помощью DiscourseConnect, убедитесь, что это 10 или более символов"
+    discourse_connect_provider_secrets: "Список секретных доменов, которые используют DiscourseConnect. Убедитесь, что это 10 или более символов. Может быть использован символ звёздочки для соответствия любому домену или части домена (пример: *.example.com)"
+    discourse_connect_overrides_bio: "Перезаписывать в профиле информацию о пользователе с последующим запретом на её редактирование"
+    discourse_connect_overrides_groups: "Перезаписывать все группы, указанные вручную, группами, указанными в соответствующем групповом атрибуте (ВНИМАНИЕ: Если группы не указаны, то список групп пользователя будет очищен)"
+    auth_overrides_email: "Перезаписывать локальную электронную почту электронной почтой внешнего сайта при каждом входе в систему и запретить её редактирование. Относится ко всем провайдерам аутентификации. (ВНИМАНИЕ: из-за этого могут возникать расхождения)"
+    auth_overrides_username: "Перезаписывать локальное имя пользователя пользователем внешнего сайта при каждом входе в систему и запретить его редактирование. Относится ко всем провайдерам аутентификации. (ВНИМАНИЕ: из-за этого могут возникать расхождения)"
+    auth_overrides_name: "Перезаписывать локальное полное имя пользователя полным именем пользователем внешнего сайта при каждом входе в систему и запретить его редактирование. Относится ко всем провайдерам аутентификации."
+    discourse_connect_overrides_avatar: "Перезаписывать локальный аватар аватаром, используемым в DiscourseConnect и запретить его изменение"
+    discourse_connect_overrides_location: "Перезаписывать указанное местонахождение пользователя данными с внешнего сайта и запретить их изменение при использовании DiscourseConnect"
+    discourse_connect_overrides_website: "Перезаписывать веб-сайт пользователя данными с внешнего сайта и запретить их изменение при использовании DiscourseConnect"
+    discourse_connect_overrides_profile_background: "Перезаписывать фон шапки профиля аватаром, используемым в DiscourseConnect"
+    discourse_connect_overrides_card_background: "Перезаписывать фон карточки пользователя аватаром, используемым в DiscourseConnect"
+    discourse_connect_not_approved_url: "Перенаправлять неподтверждённые DiscourseConnect-аккаунты на этот URL"
+    discourse_connect_allows_all_return_paths: "Не вводить ограничения для параметра return_paths на доменное имя, предоставляемое DiscourseConnect (по умолчанию возврат должен осуществляться на текущий сайт)"
+    enable_local_logins: "Включить локальные учётные записи на основе имени пользователя и пароля. ВНИМАНИЕ: если параметр отключён, вы не сможете войти в систему, если ранее не был настроен хотя бы один альтернативный метод входа."
     enable_local_logins_via_email: "Разрешать пользователям запрашивать получение ссылки для входа в систему по электронной почте."
     allow_new_registrations: "Разрешать регистрацию новых пользователей. Отключите этот параметр, если вы хотите запретить кому-либо создавать новые учётные записи."
     enable_signup_cta: "Показывать уведомление возвращающимся на форум анонимным пользователям, предложив им зарегистрировать учётную запись."
@@ -1705,7 +1739,6 @@ ru:
     top_topics_formula_log_views_multiplier: "значение множителя просмотров журнала (n) в формуле топики: `log (views_count) * (n) + op_likes_count * 0.5 + LEAST (likes_count / posts_count, 3) + 10 + log (posts_count)`"
     top_topics_formula_first_post_likes_multiplier: "значение первого поста множитель лайков (n) в формуле топики: `log (views_count) * 2 + op_likes_count * (n) + LEAST (likes_count / posts_count, 3) + 10 + log (posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "значение наименьшего количества лайков на множитель поста (n) в формуле топики: `log (views_count) * 2 + op_likes_count * 0.5 + LEAST (likes_count / posts_count, (n)) + 10 + log (posts_count)`"
-    rebake_old_posts_count: "Количество старых сообщений, которые нужно перепроверять каждые 15 минут."
     enable_safe_mode: "Разрешать пользователям входить в безопасный режим для отладки плагинов."
     rate_limit_create_topic: "Пользователи могут создавать новую тему после создания предыдущей только по прошествии указанного здесь количества секунд."
     rate_limit_create_post: "Пользователи могут создавать новое сообщение после создания предыдущего только по прошествии указанного здесь количества секунд."
@@ -1721,9 +1754,10 @@ ru:
     max_topic_invitations_per_day: "Максимальное количество приглашений в тему, которое может отправить пользователь за один день."
     max_logins_per_ip_per_hour: "Максимальное количество входов в систему с одного IP-адреса в течение часа"
     max_logins_per_ip_per_minute: "Максимальное количество входов в систему с одного IP-адреса в течение минуты"
-    max_post_deletions_per_minute: "Максимальное количество сообщений, которое пользователь может удалить в течение минуты."
-    max_post_deletions_per_day: "Максимальное количество сообщений, которое пользователь может удалить за день."
-    invite_link_max_redemptions_limit: "Количество пользователей, получающих приглашение по ссылке, не может превышать указанное здесь значение."
+    max_post_deletions_per_minute: "Максимальное количество сообщений, которые пользователь может удалить в минуту. Установите значение в 0, чтобы отключить удаление сообщений."
+    max_post_deletions_per_day: "Максимальное количество сообщений, которые пользователь может удалить за день. Установите значение в 0, чтобы отключить удаление сообщений."
+    invite_link_max_redemptions_limit: "Максимально допустимое количество использований пригласительных ссылок."
+    invite_link_max_redemptions_limit_users: "Максимальное допустимое количество использований пригласительных ссылок, созданных пользователями."
     alert_admins_if_errors_per_minute: "Количество ошибок в минуту, необходимое для предупреждения администратора. Для отключения этого параметра установите значение в 0. ВНИМАНИЕ: требуется перезагрузка."
     alert_admins_if_errors_per_hour: "Количество ошибок в час, необходимое для предупреждения администратора. Для отключения этого параметра установите значение в 0. ВНИМАНИЕ: требуется перезагрузка.."
     categories_topics: "Количество тем для отображения в секции 'Разделы'. Если значение установлено в 0, система автоматически попытается отобразить такое количество тем, чтобы оба столбца (разделы и темы) были одинаковой длины."
@@ -1736,7 +1770,7 @@ ru:
     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 access key id" и "s3 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 access key id" и "s3 secret access key".'
     s3_upload_bucket: "Название корзины Amazon S3, куда будут загружаться файлы. ВНИМАНИЕ: название должно быть в нижнем регистре, без пробелов, без подчёркиваний. См. \nhttp://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html"
     s3_access_key_id: "Идентификатор ключа доступа Amazon S3, который будет использоваться для загрузки изображений, вложений и резервных копий."
     s3_secret_access_key: "Секретный ключ доступа Amazon S3, который будет использоваться для загрузки изображений, вложений и резервных копий."
@@ -1745,6 +1779,8 @@ ru:
     avatar_sizes: "Перечень автоматически создаваемых размеров аватара."
     external_system_avatars_enabled: "Использовать внешний сервис для загрузки аватаров."
     external_system_avatars_url: "URL внешнего сервиса загрузки аватаров. Допустимые замены: {username} {first_letter} {color} {size}"
+    external_emoji_url: "URL-адрес внешнего сервиса эмодзи. Оставьте поле пустым, если внешний сервис не требуется."
+    use_site_small_logo_as_system_avatar: "Использовать логотип сайта вместо аватара пользователя системы. Требуется наличие логотипа."
     restrict_letter_avatar_colors: "Список 6-значных шестнадцатеричных значений цвета, которые будут использоваться для фона буквенного аватара."
     selectable_avatars_enabled: "Принудительный выбор аватара из списка."
     selectable_avatars: "Список доступных для выбора аватаров."
@@ -1756,7 +1792,6 @@ ru:
     strip_image_metadata: "Удалять метаданные из изображения."
     min_ratio_to_crop: "Отношение, используемое для обрезки высоких изображений. Введите необходимое отношение ширины к высоте."
     simultaneous_uploads: "Максимальное количество файлов, которые можно вставить в редактор сообщения."
-    enable_flash_video_onebox: "Разрешать умную вставку ссылок на файлы формата <b>sqf</b> и <b>flv</b> (Adobe Flash). ВНИМАНИЕ: Это разрешение с большой вероятностью может представлять угрозу безопасности сайта."
     default_invitee_trust_level: "Уровень доверия для приглашённых пользователей (от 0 до 4)."
     default_trust_level: "Уровень доверия по умолчанию для всех новых пользователей (0-4). ВНИМАНИЕ! Повышая уровень доверия для новых пользователей, вы можете столкнуться с большим количеством спама."
     tl1_requires_topics_entered: "Количество тем, в которых должен побывать новый пользователь для продвижения до уровня доверия 1."
@@ -1790,6 +1825,7 @@ ru:
     min_trust_to_edit_post: "Минимальный уровень доверия, требуемый для редактирования сообщений."
     min_trust_to_allow_self_wiki: "Минимальный уровень доверия, требуемый для создания своего вики-сообщения."
     min_trust_to_send_messages: "Минимальный уровень доверия, необходимый для создания личных сообщений."
+    min_trust_to_send_email_messages: "Минимальный уровень доверия, необходимый для отправки личных сообщений по электронной почте."
     min_trust_to_flag_posts: "Минимальный уровень доверия, необходимый для создания жалобы на сообщение."
     min_trust_to_post_links: "Минимальный уровень доверия, необходимый для включения ссылок в сообщения"
     min_trust_to_post_embedded_media: "Минимальный уровень доверия, необходимый для встраивания медиафайлов в сообщение"
@@ -1815,7 +1851,8 @@ ru:
     title_min_entropy: "Минимальная энтропия, требуемая для названия темы. Энтропия - количество уникальных символов, причём некоторые русские буквы могут считаться за 2 символа, а не за 1, как английские)."
     body_min_entropy: "Минимальная энтропия, требуемая для текста новой темы. Энтропия - количество уникальных символов, причём некоторые русские буквы могут считаться за 2 символа, а не за 1, как английские)."
     allow_uppercase_posts: "Разрешать создавать названия тем или сообщения заглавными буквами."
-    max_consecutive_replies: "Количество сообщений, которые пользователь должен создать подряд в теме, прежде чем он не сможет добавить ещё один ответ."
+    max_consecutive_replies: "Максимальное количество сообщений, которые пользователь может создать ПОДРЯД в теме, после чего у него не будет возможности добавить ещё один ответ."
+    enable_filtered_replies_view: 'Кнопка ответов отображает только текущее сообщение и ответы на него, свернув все остальные сообщения.'
     title_fancy_entities: "В заголовках тем преобразовывать обычные символы ASCII и пунктуацию <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>SmartyPants</a> в объекты HTML"
     min_title_similar_length: "Минимальная длина названия темы, при которой название будет проверено на наличие похожих тем."
     desktop_category_page_style: "Визуальный стиль для секции 'Разделы'."
@@ -1826,7 +1863,7 @@ ru:
     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. Укажите символ '*' для загрузки любых типов файлов."
+    authorized_extensions_for_staff: "Список расширений файлов, разрешенных для загрузки сотрудникам, в дополнение к списку, определённому в настройке 'authorized_extensions'. Укажите символ '*' для загрузки любых типов файлов."
     theme_authorized_extensions: "Список расширений файлов, разрешённых для загрузки тем оформления. Укажите символ '*' для загрузки любых типов файлов."
     max_similar_results: "Количество похожих тем, показываемых пользователю во время создания новой темы. Сравнение выполняется на основании названия и текста темы."
     max_image_megapixels: "Максимально допустимое количество мегапикселей в изображении. Изображения с большим количеством мегапикселей будут отклонены."
@@ -1865,10 +1902,11 @@ ru:
     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. Правило относится только к первому сообщению пользователя."
+    auto_silence_first_post_regex: "Не учитывающее регистр текста регулярное выражение, которое (если в тексте будет найдено совпадение) заблокирует пользователя и отправит его сообщение на премодерацию. Пример: выражение `raging|a[bc]a` заблокирует все сообщения, содержащие raging, aba или aca. Правило применяется только к первому сообщению пользователя."
     reviewable_claiming: "Нужно ли резервировать проверяемый контент за конкретным сотрудником, прежде чем отправить контент на премодерацию?"
     reviewable_default_topics: "Показывать модерируемый контент, сгруппированный по темам"
     reviewable_default_visibility: "Не показывать модерируемый контент, если он не соответствует этому приоритету"
+    reviewable_low_priority_threshold: "Фильтр приоритета скрывает проверяемые объекты, которые не соответствуют выбранному фильтру, только если не используется фильтр 'любой'."
     high_trust_flaggers_auto_hide_posts: "Сообщения нового пользователя автоматически скрываются, если они помечаются как спам пользователем с уровнем доверия 3 и выше"
     cooldown_hours_until_reflag: "Количество часов, в течение которых пользователи не смогут повторно пожаловаться на сообщение"
     reply_by_email_enabled: "Разрешать отвечать в темах с помощью электронных писем."
@@ -1899,8 +1937,9 @@ ru:
     blocked_attachment_filenames: "Список ключевых слов, используемых для добавления вложений в черный список на основе имени файла."
     forwarded_emails_behaviour: "Как обрабатывать переадресованное письмо в Discourse"
     always_show_trimmed_content: "Всегда показывать обрезанную часть входящих писем. ВНИМАНИЕ: может раскрыть адреса электронной почты."
+    trim_incoming_emails: "Обрезать часть входящих писем, если они не актуальны."
     private_email: "Не включать контент из сообщений или тем в заголовок или текст письма. ПРИМЕЧАНИЕ: в этом случае также отключается Email-дайджест."
-    email_total_attachment_size_limit_kb: "Максимальный общий размер файлов, прикрепляемых к исходящим письмам. Установите 0, если необходимо отключить отправку вложений."
+    email_total_attachment_size_limit_kb: "Максимальный общий размер файлов в килобайтах, прикрепляемых к исходящим письмам. Установите 0, если необходимо отключить отправку вложений."
     post_excerpts_in_emails: "В уведомлениях по электронной почте всегда отправлять выдержки вместо полных сообщений"
     raw_email_max_length: "Максимальное количество символов, сохраняющихся в сообщениях входящей электронной почты."
     raw_rejected_email_max_length: "Максимальное количество символов, сохраняющихся в отклонённых сообщениях входящей электронной почты."
@@ -1960,7 +1999,7 @@ ru:
     enable_user_directory: "Указать каталог пользователей для просмотра"
     enable_group_directory: "Указать каталог групп для просмотра"
     enable_category_group_moderation: "Разрешать группам модерировать контент в определённых разделах"
-    group_in_subject: "Установите %%{optional_pm} в теме электронного письма в соответствии с именем первой группы в личном кабинете, см. тему <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>Настройка формата темы для стандартных электронных писем</a>"
+    group_in_subject: "Установить переменную %%{optional_pm} в теме электронного письма в соответствии с именем первой группы в личном кабинете, см. тему <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>Настройка формата темы для стандартных электронных писем</a>"
     allow_anonymous_posting: "Разрешать пользователям переключаться в анонимный режим."
     anonymous_posting_min_trust_level: "Минимальный уровень доверия для возможности создавать темы от имени анонимного пользователя."
     anonymous_account_duration_minutes: "Защита от слишком частого создания новых учётных записей.\nПример: Если значение установлено в 600, это означает, что должно пройти не менее 600 минут с момента последнего сообщения пользователя И его выхода из системы, после чего он сможет создать новую учётную запись."
@@ -2025,16 +2064,16 @@ ru:
     show_create_topics_notice: "Если общее количество тем на сайте меньше 5, показывать персоналу сообщение с просьбой создать новые темы."
     delete_drafts_older_than_n_days: "Удалять черновики, которые старше указанного здесь количества дней."
     bootstrap_mode_min_users: "Минимальное количество пользователей, необходимое для отключения специального режима (Для отключения этого параметра установите значение в 0)"
-    prevent_anons_from_downloading_files: "Запретить анонимным пользователям скачивать вложения. ВНИМАНИЕ: при этом будут недоступны любые вложения, кроме картинок."
+    prevent_anons_from_downloading_files: "Запретить анонимным пользователям скачивать вложения."
     secure_media: 'Ограничивать доступ ко ВСЕМ загрузкам (изображения, видео, аудио, текст, PDF, ZIP-файлы и другие). Только зарегистрированные пользователи будут получать доступ к загрузкам. При отключённом параметре загрузки будут недоступны только в личных сообщениях и в закрытых разделах форума. ВНИМАНИЕ: Этот сложный параметр и администратор, используя его, должен отдавать себе отчёт в своих действиях. См. тему <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">Secure Media Uploads</a>.'
     secure_media_allow_embed_images_in_emails: "Разрешать встраивать изображения с ограниченным доступом в письма, если их размер не превышает значения, указанного в параметре 'secure_media_max_email_embed_image_size_kb'."
     secure_media_max_email_embed_image_size_kb: "Количество килобайт, до которого будет уменьшен размер встроенных в письма изображений с ограниченным доступом, если включён параметр 'secure_media_allow_embed_images_in_emails'."
     slug_generation_method: "Метод создания <a href='https://ru.wikipedia.org/wiki/Семантический_URL' target='_blank'>слагов</a>. При выборе 'encoded' будет выполняться процентное кодирование строки. При выборе 'none' слаги создаваться не будут."
-    enable_emoji: "Использовать смайлы (emoji)"
+    enable_emoji: "Использовать смайлы (эмодзи)"
     enable_emoji_shortcuts: "Текстовая альтернатива смайлика, например, сочетания :), :p или :( - будет преобразовываться в полноценный смайлик"
     emoji_set: "Какую коллекцию Emoji использовать?"
-    emoji_autocomplete_min_chars: "Минимальное количество символов, необходимое для появления всплывающего окна смайликов"
-    enable_inline_emoji_translation: "Включить перевод для встроенных смайликов (без пробелов и знаков препинания)"
+    emoji_autocomplete_min_chars: "Минимальное количество символов, необходимое для появления всплывающего окна с эмодзи"
+    enable_inline_emoji_translation: "Включить перевод для встроенных эмодзи (без пробелов и знаков препинания)"
     approve_post_count: "Минимальное количество сообщений от новичка или обычного пользователя, которые должны быть утверждены"
     approve_unless_trust_level: "Сообщения от пользователей с уровнем доверия ниже указанного должны быть одобрены"
     approve_new_topics_unless_trust_level: "Новые темы от пользователей с уровнем доверия ниже указанного должны быть одобрены"
@@ -2046,6 +2085,7 @@ ru:
     code_formatting_style: "Кнопка кода в редакторе будет использовать по умолчанию этот стиль форматирования кода"
     max_allowed_message_recipients: "Максимальное число получателей личного сообщения."
     watched_words_regular_expressions: "Контролируемые слова представлены регулярными выражениями."
+    enable_diffhtml_preview: "Экспериментальная функция, которая использует diffHTML для синхронизации предварительного просмотра вместо полного повторного рендеринга."
     old_post_notice_days: "Количество дней, после которого почтовое уведомление станет устаревшим"
     new_user_notice_tl: "Минимальный уровень доверия, необходимый для просмотра новых сообщений пользователей."
     returning_user_notice_tl: "Минимальный уровень доверия, необходимый для просмотра уведомлений о возвращающихся сообщениях."
@@ -2054,13 +2094,14 @@ ru:
     blur_tl0_flagged_posts_media: "Размывать изображения в находящихся на премодерации сообщениях для сокрытия возможного <a href='https://ru.wikipedia.org/wiki/NSFW' target='_blank'>NSFW-контента</a>."
     enable_page_publishing: "Разрешить сотрудникам публиковать темы на новых URL-адресах с их собственным стилем."
     show_published_pages_login_required: "Опубликованные страницы доступны анонимным пользователям, для этого не требуется регистрация на форуме."
+    skip_auto_delete_reply_likes: "При автоматическом удалении старых ответов не удалять сообщения, количество симпатий в которых равно или превышает указанное здесь значение."
     default_email_digest_frequency: "Как часто пользователи получают Email-дайджест по умолчанию."
     default_include_tl0_in_digests: "Включать по умолчанию сообщения от новых пользователей в Email-дайджест. Пользователи могут изменить эту настройку в своём профиле."
     default_email_level: "Уровень уведомления по электронной почте по умолчанию для обычных тем."
     default_email_messages_level: "Уровень уведомления по электронной почте по умолчанию, когда кто-то отправляет личное сообщение пользователю."
     default_email_mailing_list_mode: "По умолчанию присылать почтовое уведомление при каждом новом сообщении."
     default_email_mailing_list_mode_frequency: "Пользователи, которые включают режим почтовой рассылки, будут получать электронные письма с указанной здесь периодичностью."
-    disable_mailing_list_mode: "Запретить пользователям включать режим почтовой рассылки."
+    disable_mailing_list_mode: "Запретить пользователям включать режим почтовой рассылки (запрет отправки уведомлений о новых сообщениях)."
     default_email_previous_replies: "Включать по умолчанию предыдущие ответы в электронные письма."
     default_email_in_reply_to: "Включать по умолчанию выдержку из ответов на сообщения в электронные письма."
     default_other_new_topic_duration_minutes: "Глобальное условие по умолчанию, по которому темы считаются новыми."
@@ -2090,7 +2131,6 @@ ru:
     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: "Разрешенный URL для перенаправления аутентификации для API-ключей пользователя. Подстановочный знак * может использоваться для соответствия любой его части (например, www.example.com/*)."
     allowed_user_api_push_urls: "Разрешенные URL-адреса для отправки на сервер к пользовательскому API"
@@ -2100,7 +2140,6 @@ ru:
     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>."
@@ -2114,6 +2153,7 @@ ru:
     governing_law: "Регулирующий Закон"
     city_for_disputes: "Город для решения споров"
     shared_drafts_category: "Включить функцию «Общие черновики», назначив категорию для черновиков тем. Персонал не будет видеть подобные темы в секции 'Обсуждаемые'."
+    shared_drafts_min_trust_level: "Разрешить пользователям просматривать и редактировать общие черновики."
     push_notifications_prompt: "Отображать запрос согласия пользователя."
     push_notifications_icon: "Иконка значка, который появляется в углу уведомлений. Рекомендуется монохроматическое изображение в формате PNG размером 96 × 96 пикселей с поддержкой прозрачности."
     base_font: "Основной шрифт, используемый для большей части текста на сайте. Шрифт тем можно переопределить с помощью настраиваемого свойства CSS `--font-family`."
@@ -2142,6 +2182,7 @@ ru:
       invalid_string_min_max: "Допускается от %{min} до %{max} символов."
       invalid_string_min: "Требуется хотя бы %{min} знаков."
       invalid_string_max: "Допустимо не более %{max} знаков."
+      invalid_json: "Недопустимый формат JSON."
       invalid_reply_by_email_address: "Значение должно содержать '%{reply_key}' и должно отличаться от письма уведомления."
       invalid_alternative_reply_by_email_addresses: "Все значения должны содержать '%{reply_key}' и должны отличаться от письма уведомления."
       pop3_polling_host_is_empty: "Вы должны установить 'pop3 polling host' перед включением POP3 polling."
@@ -2155,8 +2196,8 @@ ru:
       email_editable_enabled: "Вы должны отключить «редактирование электронной почты» перед включением этого параметра."
       staged_users_disabled: "Перед включением этого параметра необходимо включить параметр 'Сымитированные пользователи'."
       reply_by_email_disabled: "Вы должны сначала включить параметр 'Ответить по электронной почте', прежде чем включить эту настройку."
-      sso_url_is_empty: "Вы должны установить 'sso url' перед включением этой настройки."
-      sso_invite_only: "Нельзя одновременно включить sso и пригласить."
+      discourse_connect_url_is_empty: "Вы должны ввести 'discourse connect url' перед включением этой настройки."
+      discourse_connect_invite_only: "Нельзя одновременно включить DiscourseConnect и регистрировать пользователей на форуме только через приглашения."
       enable_local_logins_disabled: "Перед включением этого параметра Вы должны включить параметр 'Включить локальные учетные записи' ."
       min_username_length_exists: "Вы не можете установить минимальную длину псевдонима более самого короткого - (%{username})."
       min_username_length_range: "Нельзя установить минимум больше максимума."
@@ -2165,22 +2206,20 @@ ru:
       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'."
-        high_weight_invalid: "Вы не можете установить вес меньше или равно 1 или больше, чем указано в 'category_search_priority_very_high_weight'."
-        very_high_weight_invalid: "Вы не можете установить вес меньше, чем указано в 'category_search_priority_high_weight'."
+        low_weight_invalid: "Вы не можете установить вес больше или равным 1."
+        high_weight_invalid: "Вы не можете установить вес меньше или равным 1."
       allowed_unicode_usernames:
         regex_invalid: "Недопустимое регулярное выражение: %{error}"
         leading_trailing_slash: "Регулярное выражение не должно начинаться и заканчиваться косой чертой (слешем)."
       unicode_usernames_avatars: "Внутренние системные аватары не поддерживают псевдонимы в формате Unicode."
       list_value_count: "Список должен содержать именно %{count} значений."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "SSO секрет"
+        value: "Ключ DiscourseConnect"
   search:
     extreme_load_error: "Сайт сильно загружен, поиск отключен, попробуйте повторить позже"
-    within_post: "#%{post_number} от %{username}"
+    within_post: "#%{post_number} от пользователя %{username}"
     types:
       category: "Разделы"
       topic: "Результаты"
@@ -2188,20 +2227,22 @@ ru:
     results_page: "Результаты поиска для '%{term}'"
     audio: "[аудио]"
     video: "[видео]"
-  sso:
+  discourse_connect:
     login_error: "Ошибка входа"
-    not_found: "Мы не можем найти вашу учетную запись. Пожалуйста, свяжитесь с администратором сайта."
-    account_not_approved: "Ваша учетная запись ожидает подтверждения. Вы получите уведомление по электронной почте, когда она будет подтверждена."
-    unknown_error: "Произошла проблема с учетной записью. Пожалуйста, свяжитесь с администратором сайта."
+    not_found: "Мы не можем найти вашу учётную запись. Пожалуйста, свяжитесь с администратором сайта."
+    account_not_approved: "Ваша учетная запись ожидает подтверждения. Вы получите уведомление по электронной почте, как только она будет подтверждена."
+    unknown_error: "Проблема с вашей учётной записью. Пожалуйста, свяжитесь с администратором сайта."
     timeout_expired: "Время авторизации истекло, пожалуйста, попробуйте войти снова."
     no_email: "Адрес электронной почты не указан. Пожалуйста, свяжитесь с администратором сайта."
-    blank_id_error: "Поле `External_id` является обязательным для заполнения"
+    blank_id_error: "Параметр 'external_id' является обязательным, но он не установлен"
     email_error: "Аккаунт не может быть зарегистрирован с электронным адресом <b>%{email}</b>. Пожалуйста, свяжитесь с администратором сайта."
-    missing_secret: "Сбой аутентификации SSO из-за отсутствия секрета. Обратитесь к администраторам сайта, чтобы решить эту проблему."
+    missing_secret: "Сбой аутентификации из-за отсутствия ключа. Обратитесь к администраторам сайта для решения этой проблемы."
+    invite_redeem_failed: "Не удалось осуществить приглашение по ссылке. Пожалуйста, свяжитесь с администратором сайта."
   original_poster: "Автор"
   most_posts: "Большинство сообщений"
   most_recent_poster: "Последний автор"
   frequent_poster: "Частый автор"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "Добро пожаловать в наше сообщество! Вот самые популярные недавние темы."
     not_seen_in_a_month: "С возвращением! Поскольку вас не было какое-то время, мы представляем вам список наиболее популярных тем, появившихся за время вашего отсутствия."
@@ -2214,6 +2255,7 @@ ru:
     errors:
       different_topics: "Сообщения, принадлежащие разным темам, не могут быть объединены."
       different_users: "Сообщения, принадлежащие разным пользователям, не могут быть объединены."
+      max_post_length: "Сообщения нельзя объединить, поскольку количество символов в объединённом сообщении превышает допустимое значение."
   move_posts:
     new_topic_moderator_post:
       one: "Сообщение было перенесено в новую тему: %{topic_link}"
@@ -2373,6 +2415,18 @@ ru:
   admin:
     email:
       sent_test: "Отправлено!"
+    user:
+      merge_user:
+        updating_username: "Обновление имени пользователя ..."
+        changing_post_ownership: "Изменение владельца сообщения..."
+        merging_given_daily_likes: "Объединение выданных ежедневных симпатий..."
+        merging_post_timings: "Объединение времени создания сообщений..."
+        merging_user_visits: "Объединение статистики посещений пользователей..."
+        updating_site_settings: "Обновление настроек сайта..."
+        updating_user_stats: "Обновление статистики пользователя..."
+        merging_user_attributes: "Объединение атрибутов пользователя..."
+        updating_user_ids: "Обновление идентификаторов пользователя..."
+        deleting_source_user: "Удаление исходного пользователя..."
   user:
     deactivated: "Был деактивирован из-за слишком большого количества возвращённых писем на адрес '%{email}'."
     deactivated_by_staff: "Выключено персоналом"
@@ -2412,6 +2466,8 @@ ru:
       fixed_primary_email: "Исправлен основной электронный адрес для сымитированного пользователя"
       same_ip_address: "Тот же IP-адрес (%{ip_address}), что и у других пользователей"
       inactive_user: "Неактивный пользователь"
+      reviewable_reject_auto: "Автоматическая обработка очереди просмотра"
+      reviewable_reject: "Пользователь отклонён после проверки"
     email_in_spam_header: "Первое электронное письмо пользователя было помечено как спам"
     already_silenced: "Пользователь уже был заблокирован сотрудником %{staff} %{time_ago}."
     already_suspended: "Пользователь уже был заморожен сотрудником %{staff} %{time_ago}."
@@ -2500,7 +2556,7 @@ ru:
       %{invite_link}
   invite_password_instructions:
     title: "Создание пароля"
-    subject_template: "Задайте пароль для вашей учетной записи на сайте %{site_name}"
+    subject_template: "Создание пароля для вашей учетной записи на сайте %{site_name}"
     text_body_template: |
       Благодарим Вас за принятие приглашения на сайт %{site_name} и - добро пожаловать!
 
@@ -2654,6 +2710,19 @@ ru:
         Сообщество пожаловалось на это сообщение, и теперь оно скрыто. **Поскольку сообщение было скрыто более одного раза, оно не появится на форуме до тех пор, пока не будет обработано персоналом**.
 
         За дополнительными рекомендациями обращайтесь к [основным принципам сообщества](%{base_url}/guidelines).
+    queued_by_staff:
+      title: "Модерируемые сообщения"
+      subject_template: "Сообщение скрыто сотрудником и отправлено на премодерацию"
+      text_body_template: |
+        Здравствуйте,
+
+        Это автоматическое сообщение с сайта %{site_name}, уведомляющее о том, что ваше сообщение было скрыто.
+
+        <%{base_url}%{url}>
+
+        Сообщение будет скрыто до тех пор, пока его не просмотрит сотрудник.
+
+         За дополнительными рекомендациями обращайтесь к [основным принципам сообщества](%{base_url}/guidelines).
     flags_disagreed:
       title: "Сообщение, на которое поступила жалоба, восстановлено персоналом"
       subject_template: "Сообщение, на которое поступила жалоба, восстановлено персоналом"
@@ -2675,19 +2744,17 @@ ru:
       text_body_template: |
         Здравствуйте,
 
-        Это автоматическое извещение с сайта %{site_name}, уведомляющее, что [ваше сообщение](%{base_url}%{url}) было удалено.
+        Это автоматическое сообщение с сайта %{site_name}, уведомляющее о том, что [ваше сообщение](%{base_url}%{url}) было удалено.
 
-         %{flag_reason}
+        %{flag_reason}
 
-        Сообщество пожаловалось на это сообщение, и сотрудник решил удалить его.
+        На это сообщение поступила жалоба от сообщества и сотрудник решил её удалить.
 
-        [details="Посмотреть удалённое сообщение"]
         ``` markdown
         %{flagged_post_raw_content}
         ```
-        [/details]
 
-        Пожалуйста, ознакомьтесь с [основными принципами сообщества](%{base_url}/guidelines) для получения подробной информации.
+        Пожалуйста, ознакомьтесь с [основными принципами сообщества](%{base_url}/guidelines), чтобы исключить повторения подобных ситуаций в дальнейшем.
     usage_tips:
       text_body_template: |
         Чтобы получить несколько быстрых советов по началу работы в качестве нового пользователя форума, [ознакомьтесь с этим блогом](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2742,6 +2809,8 @@ ru:
       text_body_template: |
         Мы повысили ваш [уровень доверия](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
 
+        Как опытный пользователь вы могли бы оценить [этот список полезных советов и трюков](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
         Продолжайте в том же духе - нам нравится, что вы с нами.
     backup_succeeded:
       title: "Успешное резервное копирование"
@@ -2879,7 +2948,7 @@ ru:
          Ваш ответ был отправлен с адреса электронной почты, отличного от того, который мы ожидали, поэтому мы не уверены, что вы тот, за кого себя выдаёте. Попробуйте отправить письмо с другого адреса электронной почты или [связаться с сотрудником](%{base_url}/about).
     email_reject_empty:
       title: "Email отклонен: нет содержимого"
-      subject_template: "[%{email_prefix}] Проблема с электронной почтой - Нет содержимого"
+      subject_template: "[%{email_prefix}] Проблема с электронной почтой - нет содержимого"
       text_body_template: |
         Приносим извинения, но ваше электронное сообщение, отправленное на адрес %{destination} (озаглавленное как %{former_title}), не опубликовано.
 
@@ -2942,7 +3011,7 @@ ru:
         Почтовое действие не было распознано. Пожалуйста, попробуйте ещё раз или отправьте сообщение через веб-сайт, если ситуация не изменится.
     email_reject_reply_key:
       title: "Email отклонён: неизвестный ключ ответа"
-      subject_template: "[%{email_prefix}] Неполадка электронной почты - неизвестный ключ ответа"
+      subject_template: "[%{email_prefix}] Проблема с электронной почтой - неизвестный ключ ответа"
       text_body_template: |
         Приносим извинения, но ваше электронное сообщение, отправленное на адрес %{destination} (озаглавленное как %{former_title}), не опубликовано.
 
@@ -2951,9 +3020,17 @@ ru:
       title: "Email отклонён: неверный адрес получателя"
       subject_template: "[%{email_prefix}] Проблема с электронной почтой - неверный адрес получателя"
       text_body_template: |
-        Приносим извинения, но ваше электронное сообщение, отправленное на адрес %{destination} (озаглавленное как %{former_title}), не опубликовано.
+        К сожалению, ваше электронное сообщение получателю %{destination} (с заголовком %{former_title}) не может быть отправлено.
 
-         Вы используете более одного электронного адре Вы отвечаете с различных электронных адресов? При ответе необходимо использовать один и тот же электронный адрес. В противном случае ID заголовка сообщения может быть изменён.
+        Вот несколько вещей, которые следует проверить:
+
+          - Вы используете более одного адреса электронной почты? Вы ответили с адреса электронной почты, отличающегося от того, который использовали изначально? Для ответов по электронной почте необходимо, чтобы вы использовали  один и тот же адрес электронной почты.
+
+          - Правильно ли ваш почтовый клиент использует заголовок 'Reply-To' при отправке ответа? К сожалению, некоторые программы  неправильно отправляют ответы на адрес отправителя, который может быть не предназначен для получения ответов.
+
+          - Был ли изменён идентификатор сообщения  (Message-ID) в электронном письме? Идентификатор должен быть согласованным и неизменным.
+
+        Нужна дополнительная помощь? Свяжитесь с нами  по электронному адресу, указанному на странице %{base_url}/about
     email_reject_old_destination:
       title: "Email отклонён: ответ на просроченное уведомление"
       subject_template: "[%{email_prefix}] Проблема с электронной почтой - вы пытаетесь ответить на старое уведомление"
@@ -2984,7 +3061,7 @@ ru:
         Ваше электронное письмо было помечено как «автоматически сгенерированное», что означает, что оно было автоматически создано компьютером, а не напечатано человеком; мы не можем принимать такие письма. Если вы считаете, что это ошибка, [свяжитесь с сотрудником](%{base_url}/about).
     email_reject_unrecognized_error:
       title: "Email отклонён: нераспознанная ошибка"
-      subject_template: "[%{email_prefix}] Проблема с e-mail почтой - нераспознанная ошибка"
+      subject_template: "[%{email_prefix}] Проблема с электронной почтой - нераспознанная ошибка"
       text_body_template: |
         Приносим извинения, но ваше электронное сообщение, отправленное на адрес %{destination} (озаглавленное как %{former_title}), не опубликовано.
 
@@ -3016,7 +3093,7 @@ ru:
         Если вы считаете, что это ошибка, [свяжитесь с администрацией сайта](%{base_url}/about).
     email_error_notification:
       title: "Email отклонён: ошибка аутентификации"
-      subject_template: "[%{email_prefix}] Ошибка электронной почты - ошибка аутентификации POP"
+      subject_template: "[%{email_prefix}] Проблема с электронной почтой - ошибка аутентификации POP"
       text_body_template: |
         К сожалению, произошла ошибка аутентификации при опросе почты с POP-сервера.
 
@@ -3343,7 +3420,7 @@ ru:
 
         %{respond_instructions}
     user_posted:
-      title: "Пользователь опубликовал сообщение"
+      title: "Публикация пользователем сообщения"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3365,7 +3442,7 @@ ru:
 
         %{respond_instructions}
     user_posted_pm:
-      title: "Пользователь опубликовал личное сообщение"
+      title: "Публикация пользователем личного сообщения"
       subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3376,7 +3453,7 @@ ru:
 
         %{respond_instructions}
     user_posted_pm_staged:
-      title: "Пользователь опубликовал сымитированное личное сообщение"
+      title: "Публикация пользователем сымитированного личного сообщения"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
@@ -3385,20 +3462,16 @@ ru:
       title: "Учётная запись заморожена"
       subject_template: "[%{email_prefix}] Ваш аккаунт был заморожен"
       text_body_template: |
-        Вы были отстранены от форума до %{suspended_till}.
+        Вы были заморожены на форуме до %{suspended_till}.
 
-        %{reason}
-
-        %{message}
+        Причина: %{reason}
     account_silenced:
       title: "Учётная запись заблокирована"
       subject_template: "[%{email_prefix}] Ваш аккаунт был заблокирован"
       text_body_template: |
         Вы были заблокированы на форуме до %{silenced_till}.
 
-        %{reason}
-
-        %{message}
+        Причина: %{reason}
     account_exists:
       title: "Учётная запись уже существует"
       subject_template: "[%{email_prefix}] Учётная запись уже существует"
@@ -3449,8 +3522,8 @@ ru:
         Нажмите следующую ссылку, чтобы выбрать новый пароль:
          %{base_url}/u/password-reset/%{email_token}
     email_login:
-      title: "Войти по ссылке"
-      subject_template: "[%{email_prefix}] Войти по ссылке"
+      title: "Вход по ссылке"
+      subject_template: "[%{email_prefix}] Вход по ссылке"
       text_body_template: |
         Ниже располагается ваша ссылка для входа на форум [%{site_name}](%{base_url}).
 
@@ -3459,8 +3532,8 @@ ru:
         Перейдите по ссылке для авторизации на форуме:
         %{base_url}/session/email-login/%{email_token}
     set_password:
-      title: "Установить пароль"
-      subject_template: "[%{email_prefix}] Установить пароль"
+      title: "Установка пароля"
+      subject_template: "[%{email_prefix}] Установка пароля"
       text_body_template: |
         Кто-то попросил добавить пароль к вашей учётной записи на сайте [%{site_name}](%{base_url}). Как вариант, вы можете войти в систему с помощью любого поддерживаемого онлайн-сервиса (Google, Facebook и т. д.), связанного с этим подтверждённым адресом электронной почты.
 
@@ -3486,8 +3559,8 @@ ru:
          Нажмите следующую ссылку, чтобы выбрать пароль для новой учётной записи:
          %{base_url}/u/password-reset/%{email_token}
     confirm_new_email:
-      title: "Подтвердить новый адрес электронной почты"
-      subject_template: "[%{email_prefix}] Подтвердите ваш новый адрес электронной почты"
+      title: "Подтверждение нового адреса электронной почты"
+      subject_template: "[%{email_prefix}] Подтверждение нового адреса электронной почты"
       text_body_template: |
         Подтвердите новый адрес электронной почты для сайта %{site_name}, перейдя по ссылке:
 
@@ -3496,7 +3569,7 @@ ru:
         Если вы не запрашивали это изменение, обратитесь к [администратору сайта](%{base_url}/about).
     confirm_new_email_via_admin:
       title: "Подтвердить адрес электронной почты"
-      subject_template: "[%{email_prefix}] Подтвердите новый адрес электронной почты"
+      subject_template: "[%{email_prefix}] Подтверждение нового адреса электронной почты"
       text_body_template: |
         Подтвердите адрес электронной почты для сайта %{site_name}, перейдя по ссылке:
 
@@ -3560,9 +3633,16 @@ ru:
         Старайесь следовать [основным принципам нашего сообщества](%{base_url}/guidelines).
 
          Приятного времяпровождения!
+    signup_after_reject:
+      title: "Оповещение об отказе в регистрации"
+      subject_template: "Отклонение учётной записи на сайте %{site_name}"
+      text_body_template: |
+        Сотрудник отклонил регистрацию вашей учётной записи на сайте %{site_name}.
+
+        %{reject_reason}
     signup:
       title: "Регистрация"
-      subject_template: "[%{email_prefix}] Подтвердите свой новый аккаунт"
+      subject_template: "[%{email_prefix}] Подтверждение новой учётной записи"
       text_body_template: |
         Добро пожаловать на сайт %{site_name}!
 
@@ -3597,8 +3677,16 @@ ru:
         Если это были вы, отлично! Вам не нужно ничего делать.
 
         Если это были не вы, пожалуйста [проверьте список ваших устройств](%{base_url}/my/preferences/account) и в случае необходимости смените пароль.
+    post_approved:
+      title: "Ваше сообщение было одобрено"
+      subject_template: "[%{site_name}] Ваше сообщение было одобрено"
+      text_body_template: |
+        Здравствуйте,
+
+        Это автоматическое сообщение с сайта %{site_name}, уведомляющее о том, что [ваше сообщение](%{base_url}%{post_url}) было одобрено.
   page_forbidden:
     title: "Ой! Вы не можете просмотреть эту страницу."
+  site_setting_missing: "Настройка сайта `%{name}` должна быть установлена."
   page_not_found:
     title: "Ой! Эта страница не существует или скрыта от публичного просмотра."
     popular_topics: "Популярные"
@@ -3959,6 +4047,7 @@ ru:
     mass_award:
       errors:
         invalid_csv: Мы обнаружили ошибку в строке %{line_number}. Пожалуйста, проверьте, что в CSV-файле указано одно электронное письмо на строку.
+        badge_disabled: Сначала активируйте использование награды %{badge_name}.
     editor:
       name: Редактор
       description: Первое редактирование сообщения
@@ -3988,7 +4077,7 @@ ru:
       name: Лидер
       description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Разрешено</a> глобальное редактирование, закрепление, закрытие, архивирование, разделение и объединение тем. Доступно для выражения ещё больше ежедневных симпатий.
       long_description: |
-        Эта награда выдаётся, когда вы достигаете уровня доверия 4. Вы являетесь одним из лидеров этого сообщества, которого выбрали сотрудники, и вы подаёте положительный пример остальному сообществу своими словами и действиями. Теперь у вас есть возможность редактировать все сообщения на форуме и выполнять основные действия модератора над темами, такие как: закрепление, закрытие, удаление из списка, архивирование, разделение и объединение.
+        Эта награда выдаётся, когда вы достигаете уровня доверия 4. Вы являетесь одним из лидеров этого сообщества, которого выбрали сотрудники, и вы подаёте положительный пример остальному сообществу своими словами и действиями. Теперь у вас есть возможность редактировать все сообщения на форуме и выполнять основные действия модератора над темами, такие как: закрепление, закрытие, скрытие, архивирование, разделение и объединение.
     welcome:
       name: Добро пожаловать
       description: Получил симпатию
@@ -4160,10 +4249,10 @@ ru:
       long_description: |
         Эта награда выдается, когда вы получили 500 симпатий и 1000 или более симпатий выразили взамен. Вот это да! Вы просто образец щедрости и взаимного обожания :two_hearts:.
     first_emoji:
-      name: Первый смайлик
-      description: Использовал смайлик в сообщении
+      name: Первый эмодзи
+      description: Использовал эмодзи в сообщении
       long_description: |
-        Эта награда выдается при первом добавлении смайлика в ваш пост :thumbsup:. Смайлики позволяет вам передавать эмоции в сообщениях: от счастья :smiley: и грусти :anguished:, до гнева :angry: и всего, что между ними :sunglasses:. Просто введите : (двоеточие) или нажмите кнопку <b>Смайлики</b> в панели инструментов  редактора, чтобы выбрать нужный смайлик из сотен вариантов :ok_hand:
+        Эта награда выдается при первом добавлении смайлика в ваш пост :thumbsup:. Смайлики позволяет вам передавать эмоции в сообщениях: от счастья :smiley: и грусти :anguished:, до гнева :angry: и всего, что между ними :sunglasses:. Просто введите : (двоеточие) или нажмите кнопку <b>Смайлики</b> в панели инструментов редактора, чтобы выбрать нужный смайлик или эмодзи из сотен вариантов :ok_hand:
     first_mention:
       name: Первое обращение
       description: Упомянул пользователя в сообщении
@@ -4235,10 +4324,10 @@ ru:
       synonym: 'Синонимы не допускаются. Вместо них используйте тег "%{tag_name}".'
       has_synonyms: 'Тег "%{tag_name}" не может быть использован, поскольку у него есть синонимы.'
     required_tags_from_group:
-      one: "Вы должны указать как минимум %{count} тег из группы %{tag_group_name}."
-      few: "Вы должны указать как минимум %{count} тега из группы %{tag_group_name}."
-      many: "Вы должны указать как минимум %{count} тегов из группы %{tag_group_name}."
-      other: "Вы должны указать как минимум %{count} тегов из группы %{tag_group_name}."
+      one: "Вы должны указать как минимум %{count} тег из группы %{tag_group_name}. Группа содержит следующие теги: %{tags}"
+      few: "Вы должны указать как минимум %{count} тега из группы %{tag_group_name}. Группа содержит следующие теги: %{tags}"
+      many: "Вы должны указать как минимум %{count} тегов из группы %{tag_group_name}. Группа содержит следующие теги: %{tags}"
+      other: "Вы должны указать как минимум %{count} тегов из группы %{tag_group_name}. Группа содержит следующие теги: %{tags}"
     invalid_target_tag: "не может быть синонимом синонима"
     synonyms_exist: "не допускается, пока существуют синонимы"
   rss_by_tag: "Темы, отмеченные тегом %{tag}"
@@ -4320,7 +4409,7 @@ ru:
           contact_email:
             label: "Электронная почта"
             placeholder: "name@example.com"
-            description: "Адрес электронной почты персоны или группы, ответственных за это сообщество. Используется для важных уведомлений, таких как необработанные жалобы и обновления безопасности. Также отображается на <a href='%{base_path}/about' target='_blank'>странице информации о сообществе</a> как контактная информация."
+            description: "Адрес электронной почты персоны или группы, ответственной за это сообщество. Используется для важных уведомлений, таких как необработанные жалобы и обновления безопасности. Также отображается на <a href='%{base_path}/about' target='_blank'>странице информации о сообществе</a> как контактная информация."
           contact_url:
             label: "Веб-страница"
             placeholder: "https://www.example.com/contact-us"
@@ -4390,9 +4479,6 @@ ru:
                 label: "Блоки с подразделами"
               categories_boxes_with_topics:
                 label: "Блоки с избранными темами"
-      emoji:
-        title: "Смайлы"
-        description: "Выберите стиль смайлов. В дальнейшем вы сможете добавить другие смайлы в Админке на закладке Оформление / Смайлы."
       invites:
         title: "Пригласить персонал"
         description: "Вы почти закончили! Давайте пригласим сюда людей, которые помогут вам <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>начать обсуждение </a> с интересных тем и ответов, чтобы ваше сообщество начало работу."
@@ -4435,6 +4521,7 @@ ru:
       restored: Восстановлен
   reviewables:
     already_handled: "Спасибо, но мы уже просмотрели этот пост и решили, что на него не нужно снова составлять жалобу."
+    already_handled_and_user_not_exist: "Спасибо, но кто-то уже просмотрел это сообщение, и указанный пользователь более не существует."
     priorities:
       low: "Низкий"
       medium: "Средний"
@@ -4453,8 +4540,8 @@ ru:
       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: "Новый пользователь, чье первое сообщение соответствует правилу, прописанному в параметре `auto_silence_first_post_regex`."
-      watched_word: "Это сообщение содержало контролируемые слова. См. <a href='%{base_url}/admin/logs/watched_words'>список контролируемых слов</a>."
+      auto_silence_regexp: "Новый пользователь, чье первое сообщение соответствует выражению, указанному в настройке 'auto_silence_first_post_regex'."
+      watched_word: "Это сообщение содержит контролируемое слово. См. <a href='%{base_url}/admin/customize/watched_words'>список контролируемых слов</a>."
       staged: "Новые темы и сообщения для сымитированных пользователей должны быть одобрены администрацией форума. См. параметр `approve_unless_staged`."
       category: "Сообщения в этом разделе требуют предварительного одобрения администрацией форума. Смотрите настройки раздела."
       must_approve_users: "Учётные записи всех новых пользователей должны быть одобрены администрацией форума. См. параметр `must_approve_users`."
@@ -4463,6 +4550,7 @@ ru:
       email_spam: "Это письмо было помечено как спам на основании заголовка, указанного в параметре `email_in_spam_header`."
       suspect_user: "Профайл нового пользователя не содержит информации о прочтённых темах или сообщениях. С большой долей вероятности можно предположить, что это спамер. См. параметр `approve_suspect_users`."
       contains_media: "Сообщение содержит встроенные медиафайлы. См. параметр `review_media_unless_trust_level`."
+      queued_by_staff: "Сотрудник считает, что это сообщение нуждается в проверке. До тех пор оно будет скрыто."
     actions:
       agree:
         title: "Согласиться..."
@@ -4532,6 +4620,17 @@ ru:
           description: "Пользователь будет удалён; мы заблокируем его IP-адрес и e-mail."
       reject:
         title: "Отклонить"
+        bundle_title: "Отклонить..."
+      reject_and_suspend:
+        title: "Отклонить и заморозить пользователя"
+      reject_and_silence:
+        title: "Отклонить и заблокировать пользователя"
+      reject_and_delete:
+        title: "Отклонить и удалить сообщение"
+      reject_and_keep_deleted:
+        title: "Оставить сообщение удалённым"
+      approve_and_restore:
+        title: "Одобрить и восстановить сообщение"
       delete_user:
         title: "Удалить пользователя"
         confirm: "Вы действительно хотите удалить этого пользователя? В результате будут удалены все его сообщения, будут заблокированы его электронная почта и IP-адрес."
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index bfd1479e73..d59a9731ff 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -14,6 +14,7 @@ sk:
       short: "%Y-%m-%d"
       short_no_year: "%B %-d"
       date_only: "%Y, %B %-d"
+      no_day: "%Y %B"
   date:
     month_names:
     - null
@@ -37,6 +38,7 @@ sk:
   title: "DIscourse"
   topics: "Témy"
   posts: "príspevky"
+  views: "zobrazení"
   loading: "Načítava sa"
   powered_by_html: 'Beží na <a href="https://www.discourse.org">Discourse</a>, najlepšie so zapnutým JavaScriptom'
   sign_up: "Registrovať sa"
@@ -47,6 +49,8 @@ sk:
   anonymous: "Anonymný"
   remove_posts_deleted_by_author: "Zmazané autorom"
   redirect_warning: "Neboli sme schopní overiť, či vami vybraný link bol pridaný na fórum. Ak chcete aj tak pokračovať, vyberte link nižšie."
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} podľa %{username}"
   themes:
     other_error: "počas aktualizácie tému sa niečo nepodarilo"
     import_error:
@@ -127,6 +131,9 @@ sk:
     site_settings:
       default_categories_already_selected: "Nemôžete vybrať kategóriu použitú v inom zozname."
       s3_upload_bucket_is_required: "Nemôžete nahrávať na S3 pokiaľ ste nezadali 's3_upload_bucket'."
+  invite:
+    disabled_errors:
+      invalid_access: "Nemáte oprávnenie na zobrazenie požadovaných údajov!"
   bulk_invite:
     file_should_be_csv: "Nahrávaný súbor by mal byť typu CSV."
     error: "Počas nahrávanie súboru sa vyskytla chyba. Prosím, vyskúšajte ho nahraď znovu neskôr."
@@ -159,6 +166,11 @@ sk:
     permalink: "Trvalý odkaz"
     imported_from: "Toto je sprievodná diskusia k pôvodnej téme na %{link}"
     in_reply_to: "▶ %{username}"
+    replies:
+      one: "%{count} odpoveď"
+      few: "%{count} odpovede"
+      many: "%{count} odpovedí"
+      other: "%{count} odpovedí"
     created: "Vytvorené"
   no_mentions_allowed: "Ľutujeme, nesmiete zmieňovať iných používateľov"
   too_many_mentions:
@@ -197,6 +209,11 @@ 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}'"
+  rss_num_posts:
+    one: "%{count} príspevok"
+    few: "%{count} príspevky"
+    many: "%{count} príspevkov"
+    other: "%{count} príspevkov"
   read_full_topic: "Čítať celý príspevok"
   private_message_abbrev: "Správa"
   rss_description:
@@ -242,28 +259,6 @@ sk:
       few: "%{count} príspevky"
       many: "%{count} príspevkov"
       other: "%{count} príspevkov"
-    "new-topic": |2
-
-      Víitajte na %{site_name} &mdash; **Ďakujeme za založenie novej konverzácie!**
-
-      - Znie titulok zaujímavo ak ho čítate nahlas ? Zodpovedá obsahu ?
-
-      - Koho by to mohlo zaujímať ? Prečo je to dôležité ? Akú reakciu očakávate ?
-
-      - Vložte často používane slová vo vašej téme aby ju ostatní vedeli "nájsť". Pre zlúčenie vašej témy so súvisiacimi témami vyberte kategóriu .
-
-      Pre viac informácií, [pozri návody](%{base_path}/guidelines). Tento panel sa zobrazí iba raz %{education_posts_text}.
-    "new-reply": |2
-
-      Vitajte na %{site_name} &mdash; **Ďakujeme za príspevok!**
-
-      - Vylepší vaša odpoveď nejakým spôsobom diskusiu ?
-
-      - Buďte ohľaduplní k ostatným členom komunity.
-
-      - Konštruktívna kritika je vítana, avšak kritizujte "nápady", nie ľudí.
-
-      Pre viac informácií, [pozri návody](%{base_path}/guidelines). Tento panel sa zobrazí iba raz %{education_posts_text}.
     avatar: |2
 
       ### Čo takto nastaviť svoj profilový obrázok?
@@ -564,8 +559,6 @@ sk:
     mute_topic: "Stíšiť všetky upozornenia pre túto tému, %{link}"
     unwatch_category: "Prestať pozerať všetky témy v kategórii %{category}"
     mailing_list_mode: "Vypnúť režim mailing listu"
-    all: "Neposielajte mi žiadne maily zo stránky %{sitename}"
-    not_found_description: "Ľutujeme, nedokázali sme Vás odhlásiť. Je možné, že platnosť odkazu vo Vašom emaile vypršala."
     log_out: "Odhlásiť sa"
     digest_frequency:
       never: "nikdy"
@@ -639,6 +632,7 @@ sk:
       title: "Páči sa mi"
       xaxis: "Deň"
       yaxis: "Počet nových páči sa mi"
+      description: "Počet nových páči sa mi."
     flags:
       title: "Označenia"
       xaxis: "Deň"
@@ -651,6 +645,7 @@ sk:
       title: "Používatelia podľa stupňa dôvery"
       xaxis: "Stupeň dôvery"
       yaxis: "Počet použivateľov"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       xaxis: "Typ"
       yaxis: "Počet použivateľov"
@@ -828,6 +823,7 @@ sk:
     post_undo_action_window_mins: "Počet minút počas ktorých môžu používatelia zrušiť poslednú akciu na príspevku (\"Páči sa\", označenie, atď..)."
     pending_users_reminder_delay: "Upozorni moderátora ak nový používateľ čaká na schválenie dlhšie ako tento počet hodín. Nastavte -1 pre vypnutie upozornenia."
     cors_origins: "Povoľ prameňom/origins použitie cross-origin dotazov (CORS). Každý prameň/origin musí obsahovať http:// alebo https://. Aby ste umožnili CORS, systémové premenná DISCOURSE_ENABLE_CORS musí byť nastavená na true."
+    use_admin_ip_allowlist: "Správcovia sa môťu prihlásiť iba pokiaľ pristupujú z adresy uvedenej v zozname kontrolovaných IP adries (Admin > Logs > Screened Ips)"
     top_menu: "Určuje, ktoré položky sa zobrazia na navigácií na domovskej stránke a v akom poradí. Napríklad posledné|neprečítané|kategórie|naj|prečítané|záložky"
     post_menu: "Určuje, ktoré položky sa objavia v menu príspevku a v akom poradí. Napríklad páči sa mi|upraviť|označiť|vymazať|zdieľať|záložka|odpovedať"
     post_menu_hidden_items: "Položky vo východzích nastaveniach menu schované pri príspevkovom menu, dokiaľ neni kliknuté na rozbaľovaciu elipsu."
@@ -844,6 +840,8 @@ sk:
     top_page_default_timeframe: "Východzí interval pre presmerovanie na hlavnú stránku."
     email_token_valid_hours: "Platnosť tokenov pre Zabudnuté heslo a aktiváciu účtu v (n) hodinách."
     enable_badges: "Povoliť systém odznakov"
+    blocked_email_domains: "Rúrou oddelený zoznam emailových domén, ktorých použitie nie je povolené pri registrácií. Napríklad: mailinator.com|trashmail.net"
+    allowed_email_domains: "Zoznam emailových domén oddelených zvislým oddelovačom \"|\", s použitím ktorých sa používateľ MUSÍ zaregistrovať. VAROVANIE: registrácia použivatelia s neuvedenými doménami nebude povolená!"
     log_out_strict: "Pri odhlasovaní odhlásiť VŠETKY sessiony používateľa, na všetkých zariadeniach."
     new_version_emails: "Poslať email na kontaktnú emailovú adresu ak je zistená nová verzia Discourse."
     invite_expiry_days: "Ako dlho je platná pozvánka pre používateľa, v dňoch"
@@ -851,9 +849,6 @@ sk:
     min_password_length: "Minimálna dĺžka hesla."
     min_admin_password_length: "Minimálna dĺžka hesla pre Administrátora."
     block_common_passwords: "Nepovoliť heslá, ktoré sú v zozname 10 000 najbežnejších hesiel."
-    enable_sso: "Povolit prihlasovanie pomocou externej stránky (VAROVANIE: POUŽÍVATEĽSKÉ EAMILOVÉ ADRESY *MUSIA* BYŤ OVERENÉ EXTERNOU STRÁNKOU)"
-    sso_secret: "Tajný text, použitý na kryptografické overenie SSO informácie, uistite sa, že má 10 alebo viac znakov"
-    sso_not_approved_url: "Presmeruj nepovolené SSO účty na URL"
     allow_new_registrations: "Povoliť registráciu nových používateľov. Odznačte to ak chcete zabrániť vytváraniu nových účtov. "
     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."
@@ -891,7 +886,6 @@ sk:
     s3_cdn_url: "CDN URL ktoré sa použije na všetky dáta v s3 (napríklad https://cdn.niekde.com). VAROVANIE: po zmene tohoto nastavenia musíte použiť príkaz rebake na všetky staré príspevky."
     avatar_sizes: "Zoznam automaticky generovaných veľkostí avatarov."
     external_system_avatars_enabled: "Použiť externú avatar službu."
-    enable_flash_video_onebox: "Povolenia vkladania odkazov na swf a flv (Adobe Flash) v onebox. VAROVANIE: môže vniesť bezpečnostné riziká."
     default_invitee_trust_level: "Predvolená stupeň dôvery (0-4) pre pozvaných používateľov."
     default_trust_level: "Východzí stupeň dôvery (0-4) pre všekých nových používateľov. UPOZORNENIE: Zmena nastavenia Vás môže vystaviť riziku spamovania. "
     tl1_requires_topics_entered: "Koľko tém musí nový používateľ zadať pred povýšením na stupeň dôvery 1."
@@ -928,6 +922,7 @@ 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."
+    dark_mode_none: "Žiadny"
     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."
@@ -947,6 +942,7 @@ sk:
     faq_url: "Ak máte FAQ stránku uloženú na iných stránkach, napište sem plný odkaz na ňu."
     tos_url: "Ak máte stránku s Podmienkami uloženú na iných stránkach, napište sem plný odkaz na ne."
     privacy_policy_url: "Ak máte stránku s Podmienkami súkromia uloženú na iných stránkach, napište sem plný odkaz na ne."
+    allowed_spam_host_domains: "Zoznam domén vylúčených z testovania spamových zdrojov. Novým používateľom nebude nikdy zabránené vytvárať príspevky s odkazmi na tieto domény."
     topic_view_duration_hours: "Započítaj nové pozretie témy raz za IP/používateľa každých N hodín."
     user_profile_view_duration_hours: "Započítaj nové pozretie používateľského profilu raz za IP/používateľa každých N hodín."
     levenshtein_distance_spammer_emails: "Počet rozdielnych znakov, ktoré stále umožnia fuzzy zhodu, keď sa hľadájú emaily od spammerov."
@@ -1010,7 +1006,6 @@ sk:
     embed_username_required: "Na vytvorenie téme je vyžadované používateľské meno."
     show_create_topics_notice: "Zobraz výzvu žiadajúcu administrátorov o vytvorenie nejakých tém, ak majú stránky menej ako 5 verejných tém."
     delete_drafts_older_than_n_days: "Vymazať návrhy staršie ako (n) dní."
-    prevent_anons_from_downloading_files: "Zabrániť anonymným používateľom sťahovať prílohy. VAROVANIE: toto nastavenie zneprístupní akékoľvek neobrázkové súbory na stánkach uložené ako prílohy."
     slug_generation_method: "Vybrať metódu generovania koncovej časti adresy. 'encoded' vygeneruje percentami zakódovaní reťazec. 'none' vypne koncovú časť adresy úplne."
     enable_emoji: "Zapnúť emoji"
     emoji_set: "Aké emoji chcete mať?"
@@ -1163,6 +1158,8 @@ sk:
     ignored: "Ďakujeme za upozornenie. Práve to riešime."
     ignored_and_deleted: "Ďakujeme za upozornenie. Daný príspevok sme odstránili."
   system_messages:
+    queued_by_staff:
+      title: "Príspevok vyžaduje schválenie"
     welcome_user:
       subject_template: "Vitajte na %{site_name}!"
     welcome_invite:
@@ -1294,6 +1291,7 @@ sk:
     sender_body_blank: "telo je prázdne"
   color_schemes:
     base_theme_name: "Základ"
+    default_theme_name: "Predvolené"
   edit_this_page: "Upraviť túto stránku"
   csv_export:
     boolean_yes: "Áno"
@@ -1517,8 +1515,16 @@ sk:
         fields:
           contact_email:
             placeholder: "meno@príklad.com"
+          contact_url:
+            placeholder: "https://www.example.com/contact-us"
       corporate:
         title: "Organizácia"
+      colors:
+        title: "Farby"
+      fonts:
+        fields:
+          font_preview:
+            label: "Ukážka"
       homepage:
         fields:
           homepage_style:
@@ -1527,8 +1533,6 @@ sk:
                 label: "Iba kategórie"
               categories_and_latest_topics:
                 label: "Kategórie a najnovšie témy"
-      emoji:
-        title: "Emoji"
       invites:
         title: "Pozvite členov"
   joined: "Vytvorený"
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index ab5560ae95..4215abedc4 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -39,6 +39,7 @@ sl:
   title: "Discourse"
   topics: "Teme"
   posts: "prispevkov"
+  views: "ogleda"
   loading: "Nalagam"
   powered_by_html: 'Uporablja tehnologijo <a href="https://www.discourse.org">Discourse</a>, za ogled te strani se priporoča omogočen JavaScript.'
   sign_up: "Registracija"
@@ -46,6 +47,9 @@ sl:
   submit: "Pošlji"
   anonymous: "Anonimni"
   on_another_topic: "Na drugi temi"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} uporabnika %{username}"
   emails:
     incoming:
       default_subject: "Tema potrebuje naslov"
@@ -88,16 +92,20 @@ sl:
         two: je napačne dolžine (mora biti najmanj %{count} znaka)
         few: je napačne dolžine (mora biti najmanj %{count} znake)
         other: je napačne dolžine (mora biti najmanj %{count} znakov)
+      auth_overrides_username: "Uporabniško ime je treba posodobiti na strani ponudnika overjanja, saj je omogočena nastavitev `auth_overrides_username`."
     template:
       header:
         one: "%{count} napaka preprečuje tej %{model} da se shrani"
         two: ! "%{count} napaki preprečujeta tej %{model} da se shrani"
         few: ! "%{count} napake preprečujejo tej %{model} da se shrani"
         other: ! "%{count} napak preprečuje tej %{model} da se shrani"
+    site_settings:
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "2FA ne morete nastaviti kot zahtevano, če je omogočena možnost DiscourseConnect."
   invite:
-    error_message: "Prišlo je do napake med sprejemom povabila. Kontaktirajte administratorja strani."
     user_exists: "Ni potrebe za povabilo <b>%{email}</b>, ker <a href='%{base_path}/u/%{username}/summary'>je že prijavljen!</a>"
     confirm_email: "<p>Ste skoraj na koncu! Poslali smo vam aktivacijsko e-sporočilo na vaš e-naslov. Sledite navodilom v e-sporočilu za aktivacijo računa.</p><p>Če e-sporočila ne prejmete, preverite predal z vsiljeno pošto.</p>"
+    disabled_errors:
+      discourse_connect_enabled: "Povabila so onemogočena, ker je omogočena možnost DiscourseConnect."
   topic_invite:
     failed_to_invite: "Uporabnika ne moremo povabiti v to temo ker ni član ene od naslednjih skupin uporabnikov: %{group_names}."
     user_exists: "Uporabnik je bil že povabljen. Uporabnika lahko povabite na vsako temo samo enkrat."
@@ -127,11 +135,18 @@ sl:
       two: "%{count} druga odgovora"
       few: "%{count} drugi odgovori"
       other: "%{count} drugih odgovorov"
+    imported_from: "To je spremljevalna tema objave na %{link}"
+    in_reply_to: "▶ %{username}"
     replies:
       one: "%{count} odgovor"
       two: "%{count} odgovora"
       few: "%{count} odgovori"
       other: "%{count} odgovorov"
+    likes:
+      one: "%{count} všeček"
+      two: "%{count} všečka"
+      few: "%{count} všečke"
+      other: "%{count} všečkov"
     last_reply: "Zadnji odgovor"
     created: "Ustvarjeno"
   no_mentions_allowed: "Ne morete omenjati drugih uporabnikov."
@@ -167,6 +182,11 @@ sl:
   prev_page: "← prejšnja stran"
   page_num: "Stran %{num}"
   home_title: "Domov"
+  rss_num_posts:
+    one: "%{count} prispevek"
+    two: "%{count} prispevka"
+    few: "%{count} prispevki"
+    other: "%{count} prispevkov"
   read_full_topic: "Preberi celo temo"
   private_message_abbrev: "Msg"
   rss_description:
@@ -176,13 +196,23 @@ sl:
   excerpt_image: "slika"
   bookmarks:
     reminders:
+      at_desktop: "Naslednjič, ko bom za svojim računalnikom"
       later_today: "Kasneje v dnevu"
+      next_business_day: "Naslednji delovni dan"
       tomorrow: "Jutri"
       next_week: "Naslednji teden"
       next_month: "Naslednji mesec"
+      custom: "Izberi datum in čas"
   groups:
     errors:
       already_requested_membership: "Za članstvo v tej skupini ste že zaprosili."
+      adding_too_many_users:
+        one: "Naenkrat lahko dodate največ %{count} uporabnika"
+        two: "Naenkrat lahko dodate največ %{count} uporabnika"
+        few: "Naenkrat lahko dodate največ %{count} uporabnike"
+        other: "Naenkrat lahko dodate največ %{count} uporabnikov"
+      no_invites_with_discourse_connect: "Ko je omogočena možnost DiscourseConnect, lahko povabite le registrirane uporabnike"
+      no_invites_without_local_logins: "Če so lokalne prijave onemogočene, lahko povabite le registrirane uporabnike"
     default_names:
       everyone: "vsi"
       admins: "administratorji"
@@ -194,26 +224,6 @@ sl:
       two: "%{count} prispevka"
       few: "%{count} prispevki"
       other: "%{count} prispevkov"
-    "new-topic": |
-      Dobrodošli na %{site_name} &mdash; **hvala za novo temo!**
-
-      - Ali je naslov teme dovolj zanimiv, če ga preberete naglas? Ali je dober povzetek vsebine?
-
-      - Koga bo to zanimalo? Zakaj je pomembno? Kakšne odzive želite?
-
-      - Uporabite splošno uporabljane izraze in tako omogočite da ostali uporabniki *najdejo* vašo temo. Izberite ustrezno kategorijo za vašo temo.
-
-      Preberite tudi [pravila skupnosti](%{base_path}/guidelines). To opozorilo se bo pojavilo samo prvi %{education_posts_text}.
-    "new-reply": |
-      Dobrodošli na %{site_name} &mdash; **hvala za vaš prispevek!**
-
-      - Ali vaš odgovor prispeva k boljši razpravi?
-
-      - Bodite prijazni do ostalih uporabnikov v skupnosti.
-
-      - Konstruktivna kritika je dobrodošla, vendar kritiziraj *ideje* in ne oseb.
-
-      Preberite tudi [pravila skupnosti](%{base_path}/guidelines). To opozorilo se bo pojavilo samo prvi %{education_posts_text}.
     avatar: |
       ### Dodaj sliko svojemu profilu?
 
@@ -265,6 +275,11 @@ sl:
               same_as_password: "je enako kot vaše geslo."
             name:
               same_as_password: "je enako kot vaše geslo."
+        topic_timer:
+          attributes:
+            duration_minutes:
+              cannot_be_zero: "mora biti večje od 0."
+              exceeds_maximum: "ne sme biti daljše od 20 let."
       <<: *errors
   uncategorized_category_name: "Neuvrščeno"
   staff_category_name: "Osebje"
@@ -607,6 +622,7 @@ sl:
       every_month: "vsak mesec"
       every_six_months: "vsakih 6 mesecev"
   user_api_key:
+    read: "prebrano"
     otp_description: 'Hočete dovoliti "%{application_name}" da dostopa do te strani?'
     otp_confirmation:
       confirm_title: Nadaljujte na %{site_name}
@@ -695,6 +711,10 @@ sl:
       title: "Anonimni"
     page_view_total_reqs:
       title: "Ogledov strani"
+    http_total_reqs:
+      title: "Skupaj"
+    topics_with_no_response:
+      yaxis: "Skupaj"
     web_crawlers:
       labels:
         page_views: "Ogledov strani"
@@ -710,9 +730,21 @@ sl:
       labels:
         filename: Ime datoteke
   dashboard:
+    s3_cdn_warning: 'Strežnik je konfiguriran za nalaganje datotek v S3, vendar hkrati ni konfiguriran tudi S3 CDN. To lahko privede do visokih stroškov uporabe S3 in počasnejšega delovanja strani. Če želite izvedeti več, glejte <a href="https://meta.discourse.org/t/-/148916" target="_blank">"Using Object Storage for Uploads"</a>.'
     out_of_date_themes: "Posodobitve so na voljo za naslednje prilagoditve:"
   site_settings:
+    send_welcome_message: "Pošlji sporočilo z dobrodošlico in kratkimi uvodnimi navodili vsem novim uporabnikom."
+    auth_skip_create_confirm: Pri prijavi s pomočjo zunanjega overjanja preskočite pojavno okno za ustvarjanje računa. Priporočena uporaba skupaj z auth_overrides_email, auth_overrides_username in auth_overrides_name.
+    auth_immediately: "Samodejno preusmeri na zunanji sistem za prijavo brez interakcije uporabnika. To začne veljati šele, ko je login_required vklopljen in ko obstaja samo en način zunanje overitve"
+    enable_discourse_connect: "Omogoči vpis s pomočjo DiscourseConnect (prej »Discourse SSO«) (OPOZORILO: E-POŠTNI NASLOVI UPORABNIKOV *MORAJO* BITI OVERJENI PRI ZUNANJEM PONUDNIKU!)"
     avatar_sizes: "Seznam samodejno ustvarjenih velikosti avatarjev."
+    use_site_small_logo_as_system_avatar: "Uporabi mali logotip spletnega mesta za avatar sistemskega uporabnika. Deluje le, če je logotip na voljo."
+    min_trust_level_to_allow_ignore: "Najmanjša raven zaupanja, potrebna za prezrtje uporabnikov"
+    enable_filtered_replies_view: 'Gumb "(n) odgovorov" strne vse druge objave in prikaže samo trenutno objavo in njene odgovore.'
+    dark_mode_none: "Brez"
+    skip_auto_delete_reply_likes: "Pri samodejnem brisanju starih odgovorov preskočite brisanje objav s tem ali večjim številom všečkov."
+    default_other_skip_new_user_tips: "Preskoči namige in značke za nove uporabnike."
+    shared_drafts_min_trust_level: "Uporabnikom omogočite ogled in urejanje osnutkov v skupni rabi."
   search:
     within_post: "#%{post_number} od %{username}"
     types:
@@ -723,6 +755,7 @@ sl:
   original_poster: "Originalni avtor"
   most_recent_poster: "Zadnji odgovarja"
   frequent_poster: "Pogosto odgovarja"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "Dobrodošli v naši skupnosti! To so najbolj popularne teme zadnjih dni."
     not_seen_in_a_month: "Dobrodošli nazaj! Nekaj časa vas nismo videli. To so najbolj popularne teme od kar vas ni bilo."
@@ -826,6 +859,12 @@ sl:
       other: "Ta tema se je samodejno odprla %{count} minut po zadnjem odgovoru."
     auto_deleted_by_timer: "Samodejno izbrisana s strani opomnika."
   login:
+    security_key_description: "Ko imate pripravljen fizični varnostni ključ, pritisnite spodnji gumb Preveri pristnost z varnostnim ključem."
+    security_key_alternative: "Poskusite na drug način"
+    security_key_authenticate: "Preverite z varnostnim ključem"
+    security_key_not_allowed_error: "Postopek preverjanja z varnostnim ključem je potekel ali pa je bil preklican."
+    security_key_no_matching_credential_error: "V podanem varnostnem ključu ni bilo mogoče najti ustreznih poverilnic."
+    security_key_support_missing_error: "Vaša trenutna naprava ali brskalnik ne podpira uporabe varnostnih ključev. Uporabite drug način."
     not_approved: "Vaš račun še ni bil potrjen. Obveščeni boste preko e-sporočila ko bo račun pripravljen za prijavo."
     incorrect_username_email_or_password: "Napačno uporabniško ime, e-naslov ali geslo"
     incorrect_password: "Napačno geslo"
@@ -849,11 +888,26 @@ sl:
     missing_user_field: "Niste vnesli vseh uporabniških podatkov."
     auth_complete: "Avtentikacija je končana."
     click_to_continue: "Kliknite tukaj za nadaljevanje."
+    second_factor_title: "Preverjanje v dveh korakih"
     second_factor_description: "Vnesite potrditveno kodo iz vaše aplikacije:"
     second_factor_backup_description: "Vnesite eno od vaših rezervnih potrditvenih kod:"
     invalid_second_factor_code: "Neustrezna potrditvena koda. Vsaka potrditvena koda je lahko uporabljena samo enkrat."
     second_factor_toggle:
       backup_code: "Namesto tega uporabite rezervno potrditveno kodo"
+  admin:
+    email:
+      sent_test: "poslano!"
+    user:
+      merge_user:
+        updating_username: "Posodabljanje uporabniškega imena ..."
+        changing_post_ownership: "Spreminjanje lastništva objave ..."
+        merging_given_daily_likes: "Združevanje danih dnevnih všečkov ..."
+        merging_user_visits: "Združevanje obiskov uporabnikov ..."
+        updating_site_settings: "Posodabljanje nastavitev mesta..."
+        updating_user_stats: "Posodabljanje uporabniške statistike ..."
+        merging_user_attributes: "Združevanje uporabniških atributov..."
+        updating_user_ids: "Posodabljanje uporabniških ID-jev ..."
+        deleting_source_user: "Brisanje izvornega uporabnika..."
   user:
     email:
       does_not_exist: "N/A"
@@ -968,25 +1022,11 @@ sl:
     post_hidden_again:
       title: "Prispevek ponovno skrit"
       subject_template: "Prispevek je bil ponovno skrit zaradi prijav iz skupnosti zato smo obvestili osebje"
+    queued_by_staff:
+      title: "Prispevek za odobritev."
     flags_agreed_and_post_deleted:
       title: "Prijavljen prispevek odstranjen s strani osebja"
       subject_template: "Prijavljen prispevek odstranjen s strani osebja"
-      text_body_template: |
-        Pozdravljeni,
-
-        To je samodejno sporočilo od %{site_name} da je bil [vaš prispevek](%{base_url}%{url}) odstranjen.
-
-        %{flag_reason}
-
-        Ta prispevek je bil prijavljen s strani skupnosti in član osebja foruma se je odločil da ga odstrani.
-
-        [details="Izberi za prikaz odstranjenega prispevka"]
-        ``` markdown
-        %{flagged_post_raw_content}
-        ```
-        [/details]
-
-        Za več informacij preberite [pravila skupnosti](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
         Za nekaj napotkov kot novemu uporabniku priporočamo [tole blog objavo (v angleščini)](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -1024,6 +1064,8 @@ sl:
         Lepo se imejte v naši družbi!
 
         [prefs]: %{user_preferences_url}
+    tl2_promotion_message:
+      subject_template: "Čestitamo vam za napredovanje na višjo raven zaupanja!"
     backup_succeeded:
       title: "Varnostna kopija uspela"
       subject_template: "Varnostna kopija uspela"
@@ -1537,21 +1579,9 @@ sl:
     account_suspended:
       title: "Suspendiran račun"
       subject_template: "[%{email_prefix}] Vaš uporabniški račun je bil suspendiran"
-      text_body_template: |
-        Suspendirani ste bili iz foruma do %{suspended_till}.
-
-        %{reason}
-
-        %{message}
     account_silenced:
       title: "Utišan račun"
       subject_template: "[%{email_prefix}] Vaš uporabniški račun je bil utišan"
-      text_body_template: |
-        Utišani ste bili na forumu do %{silenced_till}.
-
-        %{reason}
-
-        %{message}
     account_exists:
       title: "Račun že obstaja"
       subject_template: "[%{email_prefix}] Račun že obstaja"
@@ -1624,6 +1654,9 @@ sl:
     confirm_new_email:
       title: "Potrdite nov e-naslov"
       subject_template: "[%{email_prefix}] Potrdite vaš novi e-naslov"
+    confirm_new_email_via_admin:
+      title: "Potrdite nov e-naslov"
+      subject_template: "[%{email_prefix}] Potrdite vaš novi e-naslov"
     confirm_old_email:
       title: "Potrdite star e-naslov"
       subject_template: "[%{email_prefix}] Potrdite vaš trenutni e-naslov"
@@ -1656,6 +1689,13 @@ sl:
         Ker podpiramo prijazno komunikacijo, želimo da spoštujete [pravila skupnosti](%{base_url}/guidelines).
 
         Lepo se imejte v naši družbi!
+    signup_after_reject:
+      title: "Prijava po zavrnitvi"
+      subject_template: "Zavrnjeni ste bili na %{site_name}"
+      text_body_template: |
+        Član osebja je zavrnil vaš račun na %{site_name}.
+
+        %{reject_reason}
     signup:
       title: "Registracija"
       subject_template: "[%{email_prefix}] Potrdite nov uporabniški račun"
@@ -1693,6 +1733,8 @@ sl:
         Če ste bili to vi, ni problema! Ne potrebujete storiti ničesar.
 
         Če to niste bili vi, potem [preverite nedavno uporabljene naprave](%{base_url}/my/preferences/account) in razmislite o zamenjavi gesla.
+    post_approved:
+      title: "Vaš prispevek je bil odobren"
   page_not_found:
     title: "Oops! Ta stran ne obstaja ali je zasebna."
     popular_topics: "Zanimivo"
@@ -1707,12 +1749,15 @@ sl:
     welcome_message_invite_only: |
       ## [Dobrodošli na %{title}](#welcome)
       Za dostop potrebujete uporabniški račun. Prosite obstoječega uporabnika, da vas povabi ali pa se prijavite za nadaljevanje.
+  deleted: "izbrisano"
   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."
+  color_schemes:
+    default_theme_name: "Privzeto"
   edit_this_page: "Uredi to stran"
   csv_export:
     boolean_yes: "Da"
@@ -1974,6 +2019,8 @@ sl:
         few: '"%{tag_name}" oznaka je omejena samo za naslednje kategorije: %{category_names}'
         other: '"%{tag_name}" oznaka je omejena samo za naslednje kategorije: %{category_names}'
   finish_installation:
+    register:
+      button: "Registracija"
     confirm_email:
       title: "Potrdite e-naslov"
     resend_email:
@@ -2015,6 +2062,12 @@ sl:
             placeholder: "name@example.com"
       corporate:
         title: "Organizacija"
+      colors:
+        title: "Barve"
+      fonts:
+        fields:
+          font_preview:
+            label: "Predogled"
       homepage:
         fields:
           homepage_style:
@@ -2027,8 +2080,6 @@ sl:
                 label: "Kategorije in najnovejše teme"
               categories_and_top_topics:
                 label: "Kategorije in najboljše teme"
-      emoji:
-        title: "Emoji"
       invites:
         disabled: "Ker so prijave onemogočene, ni možno povabiti nikogar. Nadaljujte na naslednji korak."
   joined: "Pridružen"
@@ -2050,6 +2101,8 @@ sl:
     unknown: "neznano"
     user_merged: "%{username} je bil združen v ta račun"
     user_delete_self: "Izbrisan s strani sebe preko %{url}"
+    api_key:
+      revoked: Preklican
   reviewables:
     priorities:
       low: "Nizka"
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 18679c9a79..9b6ba7d7c8 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -15,6 +15,7 @@ sq:
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
+      no_day: "%Y %B"
   date:
     month_names:
     - null
@@ -38,6 +39,7 @@ sq:
   title: "Discourse"
   topics: "Tema"
   posts: "postime"
+  views: "shikime"
   loading: "Loading"
   sign_up: "Regjistrohu"
   log_in: "Identifikohu"
@@ -45,6 +47,8 @@ sq:
   disable_remote_images_download_reason: "Remote images download was disabled because there wasn't enough disk space available."
   anonymous: "Anonim"
   remove_posts_deleted_by_author: "Fshirë nga autori"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} nga %{username}"
   emails:
     incoming:
       default_subject: "Duhet të shkruani titullin"
@@ -93,6 +97,8 @@ sq:
       default_categories_already_selected: "Nuk mund të zgjidhni një kategori të përdorur në një tjetër listë."
   invite:
     user_exists: "Nuk keni nevojë të ftoni <b>%{email}</b>, ata <a href='%{base_path}/u/%{username}/summary'>kanë krijuar një llogari në faqe!</a>"
+    disabled_errors:
+      invalid_access: "Ju nuk jeni të drejta për të parë burimin e kërkuar."
   backup:
     operation_already_running: "An operation is currently running. Can't start a new job right now."
     backup_file_should_be_tar_gz: "The backup file should be a .tar.gz archive."
@@ -115,6 +121,9 @@ sq:
     permalink: "Permalink"
     imported_from: "This is a companion discussion topic for the original entry at %{link}"
     in_reply_to: "▶ %{username}"
+    replies:
+      one: "%{count} përgjigje"
+      other: "%{count} përgjigje"
     created: "Krijuar"
   no_mentions_allowed: "Na vjen keq, por s'mund të citosh anëtarë të tjerë."
   no_mentions_allowed_newuser: "Na vjen keq, anëtarët e rinj nuk mund të citojnë anëtarë të tjerë."
@@ -135,6 +144,9 @@ 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"
+  rss_num_posts:
+    one: "%{count} postim"
+    other: "%{count} postime"
   read_full_topic: "Lexo temën e plotë"
   private_message_abbrev: "Msg"
   rss_description:
@@ -159,26 +171,6 @@ sq:
     until_posts:
       one: "%{count} postim"
       other: "%{count} postime"
-    "new-topic": |
-      Mirë se vini te %{site_name} &mdash; **faleminderit që nisët një bisedë të re!**
-
-      - A ju duket tërheqës titulli nëse e lexoni me zë të lartë? A është e mirë përmbledhja?
-
-      - Kush do të tërhiqej nga kjo temë? Përse ka rëndësi? Çfarë reagimi prisni?
-
-      - Përfshini fjalë të përdorura zakonisht në temën tuaj kështu që të tjerët mund **ta gjejnë** atë. Për të grupuar temën tuaj me të ngjashmet, zgjidhni një kategori.
-
-      Për më tepër, [lexoni porositë e bashkësisë](%{base_path}/guidelines). Ky panel do t'ju shfaqet vetëm gjatë %{education_posts_text} tuaj të parë.
-    "new-reply": |
-      Mirë se vini tek %{site_name} &mdash; **faleminderit për pjesëmarrjen!**
-
-      - Jini të sjellshëm me anëtarët e tjerë të faqes.
-
-      - Kritikat janë të mirëpritura, ama mundohuni të kritikoni *idetë* e jo anëtarët.
-
-      - A i shton diçka diskutimit përgjigja juaj?
-
-      Për më shumë, shikoni [udhëzimet e faqes](%{base_path}/guidelines). Ky njoftim do të shfaqet vetëm për %{education_posts_text}.
   activerecord:
     attributes:
       category:
@@ -398,7 +390,6 @@ sq:
     title: "Çregjistrohuni"
     stop_watching_topic: "Ndaloni së ndjekuri këtë temë, %{link}"
     unwatch_category: "Ndaloni së ndjekuri të gjitha temat në %{category}"
-    all: "Mos më dërgoni më email nga %{sitename}"
     log_out: "Shkëputu"
     digest_frequency:
       never: "asnjëherë"
@@ -469,6 +460,7 @@ sq:
       title: "Pëlqime"
       xaxis: "Ditë"
       yaxis: "Numri i pëlqimeve të reja"
+      description: "Numri i pëlqimeve të reja."
     flags:
       title: "Sinjalizime"
       xaxis: "Ditë"
@@ -672,15 +664,14 @@ sq:
     redirect_users_to_top_page: "Automatically redirect new and long absent users to the top page."
     email_token_valid_hours: "Forgot password / activate account tokens are valid for (n) hours."
     enable_badges: "Aktivizo sistemin e targetave"
+    blocked_email_domains: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net"
+    allowed_email_domains: "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!"
     log_out_strict: "When logging out, log out ALL sessions for the user on all devices"
     new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available."
     invite_expiry_days: "How long user invitation keys are valid, in days"
     login_required: "Require authentication to read content on this site, disallow anonymous access."
     min_password_length: "Minimum password length."
     block_common_passwords: "Mos lejo fjalëkalimet që gjenden në 10,000 fjalëkalimet më të përdorshme."
-    enable_sso: "Enable single sign on via an external site (WARNING: USERS' EMAIL ADDRESSES *MUST* BE VALIDATED BY THE EXTERNAL SITE!)"
-    sso_secret: "Secret string used to cryptographically authenticate SSO information, be sure it is 10 characters or longer"
-    sso_not_approved_url: "Redirect unapproved SSO accounts to this URL"
     allow_new_registrations: "Allow new user registrations. Uncheck this to prevent anyone from creating a new account."
     google_oauth2_client_id: "Client ID of your Google application."
     google_oauth2_client_secret: "Client secret of your Google application."
@@ -710,7 +701,6 @@ sq:
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods, no underscores."
     s3_cdn_url: "The CDN URL to use for all s3 assets (for example: https://cdn.somewhere.com). WARNING: after changing this setting you must rebake all old posts."
     avatar_sizes: "List of automatically generated avatar sizes."
-    enable_flash_video_onebox: "Enable embedding of swf and flv (Adobe Flash) links in oneboxes. WARNING: may introduce security risks."
     default_invitee_trust_level: "Default trust level (0-4) for invited users."
     default_trust_level: "Default trust level (0-4) for all new users. WARNING! Changing this will put you at serious risk for spam."
     tl1_requires_topics_entered: "How many topics a new user must enter before promotion to trust level 1."
@@ -744,6 +734,7 @@ 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."
+    dark_mode_none: "Asnjë"
     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."
@@ -763,6 +754,7 @@ sq:
     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."
+    allowed_spam_host_domains: "A list of domains excluded from spam host testing. New users will never be restricted from creating posts with links to these domains."
     levenshtein_distance_spammer_emails: "When matching spammer emails, number of characters difference that will still allow a fuzzy match."
     max_new_accounts_per_registration_ip: "If there are already (n) trust level 0 accounts from this IP (and none is a staff member or at TL2 or higher), stop accepting new signups from that IP."
     min_ban_entries_for_roll_up: "When clicking the Roll up button, will create a new subnet ban entry if there are at least (N) entries."
@@ -817,7 +809,6 @@ sq:
     embed_post_limit: "Maximum number of posts to embed."
     show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
     delete_drafts_older_than_n_days: "Delete drafts older than (n) days."
-    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."
     slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all."
     enable_emoji: "Enable emoji"
     emoji_set: "How would you like your emoji?"
@@ -932,6 +923,8 @@ sq:
   system_messages:
     post_hidden:
       subject_template: "Postimi u fsheh ngaqë u sinjalizua nga komuniteti"
+    queued_by_staff:
+      title: "Postimi ka nevojë për aprovim"
     welcome_user:
       subject_template: "Mirë se vini tek %{site_name}!"
       text_body_template: |
@@ -1144,6 +1137,8 @@ sq:
       title: "Vendos Fjalëkalim"
     confirm_new_email:
       subject_template: "[%{email_prefix}] Konfirmoni adresën tuaj të re të emailit"
+    confirm_new_email_via_admin:
+      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:
@@ -1203,6 +1198,7 @@ sq:
     sender_body_blank: "përmbajtja është bosh"
   color_schemes:
     base_theme_name: "Baza"
+    default_theme_name: "Paracaktuar"
   edit_this_page: "Modifiko këtë faqe"
   csv_export:
     boolean_yes: "Po"
@@ -1387,6 +1383,12 @@ sq:
             placeholder: "emri@adresa.com"
       corporate:
         title: "Organizata"
+      colors:
+        title: "Ngjyrat"
+      fonts:
+        fields:
+          font_preview:
+            label: "Parashikimi"
       homepage:
         fields:
           homepage_style:
@@ -1397,8 +1399,6 @@ sq:
                 label: "Kategoritë dhe temat e zgjedhura"
               categories_and_latest_topics:
                 label: "Kategoritë dhe temat e fundit"
-      emoji:
-        title: "Emoji"
   joined: "Anëtarësuar"
   discourse_push_notifications:
     popup:
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index e152c2a1b0..c1e5d971a5 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -14,6 +14,7 @@ sr:
       short: "%m-%d-%Y"
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
+      no_day: "%Y %B"
   date:
     month_names:
     - null
@@ -33,12 +34,16 @@ sr:
   title: "Discourse"
   topics: "Teme"
   posts: "poruke"
+  views: "pregledi"
   loading: "Učitavanje"
   sign_up: "Registrujte se"
   log_in: "Prijava"
+  submit: "Potvrdi"
   disable_remote_images_download_reason: "Daljinske slike za download je onemogućeno zato što nije bilo dovoljno slobodnog prostora na disku."
   anonymous: "Anonimno"
   remove_posts_deleted_by_author: "Izbrisano od strane autora"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} od %{username}"
   emails:
     incoming:
       default_subject: "Ovoj temi je potreban naslov"
@@ -59,6 +64,9 @@ sr:
       load_from_remote: "Došlo je do greške prilikom učitavanja poruke."
     site_settings:
       default_categories_already_selected: "Ne možete izabrati kategoriju koja se koristi u drugoj listi."
+  invite:
+    not_found_template_link: |
+      <p>Pozivnica za <a href="%{base_url}">%{site_name}</a> je istekla. Molimo vas da pitate osobu koja vam je poslala pozivnicu da posalje novu.</p>
   bulk_invite:
     file_should_be_csv: "Izabrani fajl bi trebalo biti u csv formatu."
   topic_invite:
@@ -75,6 +83,7 @@ sr:
   embed:
     start_discussion: "Započnite diskusiju"
     continue: "Nastavite diskusiju"
+    in_reply_to: "▶ %{username}"
     created: "Napravljeno"
   no_links_allowed: "Žao nam je, novi korisnici ne mogu postavljati linkove u svoje postove."
   user_is_suspended: "Suspendovanim korisnicima nije dozvoljeno da objavljuju postove."
@@ -87,6 +96,10 @@ sr:
   page_num: "Strana %{num}"
   home_title: "Home"
   topics_in_category: "Teme u '%{category}' kategoriji"
+  rss_num_posts:
+    one: "%{count} poruka"
+    few: "%{count} poruka"
+    other: "%{count} poruka"
   read_full_topic: "Pročitajte celu temu"
   rss_description:
     latest: "Poslednje teme"
@@ -96,12 +109,25 @@ sr:
     tag: "Označene teme"
   revert_version_same: "Trenutna verzija je ista onoj na koju pokušavate da se vratite."
   excerpt_image: "slika"
+  bookmarks:
+    reminders:
+      later_today: "Kasnije ovog dana"
+      next_business_day: "Naredni radni dan"
+      tomorrow: "Sutra"
+      next_week: "Sledeće sedmice"
+      next_month: "Naredni mesec"
+      custom: "Prilagođen datum i vreme"
   groups:
     default_names:
       everyone: "svi"
       admins: "admini"
       moderators: "moderatori"
       staff: "osoblje"
+  education:
+    until_posts:
+      one: "%{count} poruka"
+      few: "%{count} poruka"
+      other: "%{count} poruka"
   activerecord:
     attributes:
       category:
@@ -120,15 +146,85 @@ sr:
               same_as_username: "je ista kao vaše korisničko ime. Molimo Vas izaberite sigurniju šifru."
       <<: *errors
   staff_category_name: "Osoblje"
+  trust_levels:
+    member:
+      title: "član"
+    regular:
+      title: "stalni član"
+    leader:
+      title: "vođa"
+  rate_limiter:
+    hours:
+      one: "%{count} sat"
+      few: "%{count} sata"
+      other: "%{count} sati"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
+      less_than_x_seconds:
+        one: "< %{count} s"
+        few: "< %{count} s"
+        other: "< %{count} s"
+      x_seconds:
+        one: "%{count} sek."
+        few: "%{count} sek."
+        other: "%{count} sek."
+      less_than_x_minutes:
+        one: "< %{count}m"
+        few: "< %{count}m"
+        other: "< %{count}m"
+      x_minutes:
+        one: "%{count} min"
+        few: "%{count} min"
+        other: "%{count} min"
+      about_x_hours:
+        one: "%{count} sat"
+        few: "%{count} sat"
+        other: "%{count} sat"
+      x_days:
+        one: "%{count} dan"
+        few: "%{count} dan"
+        other: "%{count} dan"
+      about_x_months:
+        one: "%{count}mes"
+        few: "%{count}mes"
+        other: "%{count}mes"
+      x_months:
+        one: "%{count}mes"
+        few: "%{count}mes"
+        other: "%{count}mes"
+      about_x_years:
+        one: "%{count} godina"
+        few: "%{count} godina"
+        other: "%{count} godina"
+      over_x_years:
+        one: "> %{count} godina"
+        few: "> %{count} godina"
+        other: "> %{count} godina"
+      almost_x_years:
+        one: "%{count} godina"
+        few: "%{count} godina"
+        other: "%{count} godina"
     distance_in_words_verbose:
       half_a_minute: "upravo sad"
       less_than_x_seconds: "upravo sad"
+      about_x_hours:
+        one: "pre %{count} sat"
+        few: "pre %{count} sata"
+        other: "pre %{count} sati"
+      x_days:
+        one: "pre %{count} dan"
+        few: "pre %{count} dana"
+        other: "pre %{count} dana"
+      x_months:
+        one: "pre %{count} mesec dana"
+        few: "pre %{count} mesec dana"
+        other: "pre %{count} mesec dana"
   password_reset:
     save: "Postavi Šifru"
     title: "Resetujte Šifru"
+  change_email:
+    max_secondary_emails_error: "Dosegli ste maksimalni dozvoljeni broj sekundarne e-pošte."
   activation:
     welcome_to: "Dobrodošao na %{site_name}!"
   reviewable_score_types:
@@ -139,6 +235,9 @@ sr:
       title: "Nepoželjno"
     bookmark:
       title: "Markiraj"
+  user_activity:
+    no_bookmarks:
+      self: "Nemate obeleženih poruka; obeleživači vam omogućavaju da se brzo uputite ka određenoj poruci."
   topic_flag_types:
     spam:
       title: "Nepoželjno"
@@ -152,7 +251,14 @@ sr:
       every_30_minutes: "svakih 30 minuta"
       daily: "svakodnevno"
       weekly: "nedeljno"
+      every_month: "svaki mesec"
+      every_six_months: "svakih šest meseci"
+  user_api_key:
+    read: "pročitano"
   reports:
+    default:
+      labels:
+        count: Broj
     post_edits:
       labels:
         editor: Urednik
@@ -163,6 +269,9 @@ sr:
     moderators_activity:
       labels:
         moderator: Moderator
+    flags_status:
+      labels:
+        flag: Tip
     consolidated_page_views:
       labels:
         editor: Urednik
@@ -180,6 +289,9 @@ sr:
     users_by_trust_level:
       xaxis: "Nivo poverenja"
     users_by_type:
+      xaxis: "Tip"
+      labels:
+        type: Tip
       xaxis_labels:
         admin: Admin
         moderator: Moderator
@@ -204,6 +316,10 @@ sr:
         topic: "Tema"
     page_view_anon_reqs:
       title: "Anonimno"
+    http_total_reqs:
+      title: "Ukupno"
+    topics_with_no_response:
+      yaxis: "Ukupno"
     suspicious_logins:
       labels:
         user: Korisnik
@@ -223,6 +339,8 @@ 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"
+    send_welcome_message: "Pošalji svim novim korisnicima poruku dobrodošlice sa kratkim uputstvom za početnike."
+    dark_mode_none: "Ništa"
     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."
@@ -269,6 +387,7 @@ sr:
     within_post: "#%{post_number} od %{username}"
     types:
       category: "Kategorije"
+      topic: "Rezultati"
       user: "Korisnici"
   publish_page:
     slug_errors:
@@ -276,10 +395,13 @@ sr:
   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}?"
+    omniauth_confirm_button: "Nastavi"
   admin:
     email:
       sent_test: "poslato!"
   system_messages:
+    queued_by_staff:
+      title: "Potrebno odobrenje"
     welcome_user:
       subject_template: "Dobrodošao na %{site_name}!"
     welcome_invite:
@@ -294,7 +416,10 @@ sr:
       title: "Postavi Šifru"
   page_not_found:
     see_more: "Više"
+    search_button: "Pretraži"
   image: "slika"
+  color_schemes:
+    default_theme_name: "zadato"
   csv_export:
     boolean_yes: "Da"
     boolean_no: "Ne"
@@ -382,12 +507,18 @@ sr:
             placeholder: "ime@primer.com"
       corporate:
         title: "Organizacija"
-      emoji:
-        title: "Emoji"
+      colors:
+        title: "Boje"
       finished:
         title: "Vaš Discource je spreman!"
   joined: "Pridružen"
   reviewables:
+    priorities:
+      medium: "Srednje"
+      high: "Visoko"
+    sensitivity:
+      medium: "Srednje"
+      high: "Visoko"
     actions:
       agree_and_suspend:
         title: "Suspenduj Korisnika"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 451f42d1ae..465ccaa1e0 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -51,9 +51,13 @@ sv:
   remove_posts_deleted_by_author: "Borttaget av författaren"
   redirect_warning: "Vi kunde inte verifiera att länken som du valt faktiskt har lagts upp i forumet. Välj länken nedan om du vill fortsätta ändå."
   on_another_topic: "I ett annat ämne"
+  inline_oneboxer:
+    topic_page_title_post_number: "Nr %{post_number}"
+    topic_page_title_post_number_by_user: "Nr %{post_number} av %{username}"
   themes:
     bad_color_scheme: "Kan inte uppdatera tema, ogiltig färgpalett"
     other_error: "Något blev fel när temat uppdaterades"
+    ember_selector_error: "Tyvärr — det är inte tillåtet att använda CSS-selektorerna #ember eller .ember-view, eftersom dessa namn genereras dynamiskt under körning och kommer att ändras över tid, vilket resulterar i trasig CSS. Prova en annan selektor."
     compile_error:
       unrecognized_extension: "Okänt filnamnstillägg: %{extension}"
     import_error:
@@ -62,9 +66,11 @@ sv:
       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"
+      git_ref_not_found: "Det gick inte att ta ut git-referens: %{ref}"
       unpack_failed: "Det gick inte att packa upp filen"
       file_too_big: "Den okomprimerade filen är för stor."
       unknown_file_type: "Filen som du laddade upp verkar inte vara ett giltigt Discourse-tema."
+      not_allowed_theme: "`%{repo}` finns inte i listan över tillåtna teman (bocka för den globala inställningen `allowed_theme_repos`)."
     errors:
       component_no_user_selectable: "Temakomponenter kan inte väljas av användaren"
       component_no_default: "Temakomponenter kan inte vara standardtema"
@@ -168,7 +174,7 @@ sv:
         one: har fel längd (borde vara %{count} tecken)
         other: har fel längd (borde vara %{count} tecken)
       other_than: "måste vara skilt från %{count}"
-      sso_overrides_username: "Användarnamn måste uppdateras på SSO-leverantörssidan eftersom inställningen `sso_overrides_username` är aktiverad."
+      auth_overrides_username: "Användarnamnet måste uppdateras hos autentiseringsleverantören, eftersom inställningen `auth_overrides_username` är aktiverad."
     template:
       body: ! "Det uppstod problem med följande fält:"
       header:
@@ -192,7 +198,7 @@ sv:
       share_quote_facebook_requirements: "Du måste ange ett Facebook-app-id för att möjliggöra delning av citat på Facebook."
       second_factor_cannot_enforce_with_socials: "Du kan inte tvinga 2FA med sociala inloggningar aktiverade. Du måste först inaktivera inloggning via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Du kan inte genomdriva 2FA om lokala inloggningar är inaktiverade."
-      second_factor_cannot_be_enforced_with_sso_enabled: "Du kan inte genomdriva 2FA om SSO har aktiverats."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "Du kan inte genomdriva 2FA om DiscourseConnect har aktiverats."
       local_login_cannot_be_disabled_if_second_factor_enforced: "Du kan inte inaktivera lokal inloggning om 2FA har genomdrivits. Inaktivera genomdriven 2FA innan du inaktiverar lokala inloggningar."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "Du kan inte aktivera S3-uppladdningar eftersom S3-uppladdningar redan är aktiverade globalt, och aktivering av denna webbplatsnivå kan orsaka kritiska problem med uppladdningar"
       cors_origins_should_not_have_trailing_slash: "Du bör inte lägga till det avslutande snedstrecket (/) till CORS-ursprung."
@@ -209,19 +215,22 @@ sv:
     expired: "Din inbjudningskod har löpt ut. <a href='%{base_url}/about'>Kontakta personalen</a>."
     not_found: "Din inbjudningskod är ogiltig. <a href='%{base_url}/about'>Kontakta personalen</a>."
     not_found_json: "Din inbjudningskod är ogiltig. Kontakta personalen."
+    not_matching_email: "Din e-postadress och den e-postadress som är kopplad till inbjudningskoden stämmer inte överens. Kontakta personalen."
     not_found_template: |
       <p>Din inbjudan till <a href="%{base_url}">%{site_name}</a> har redan lösts in.</p>
 
       <p>Om du kommer ihåg ditt lösenord kan du <a href="%{base_url}/login">logga in</a>.</p>
 
       <p>Annars ber vi dig att <a href="%{base_url}/password-reset">återställa lösenordet</a>.</p>
-    error_message: "Det uppstod ett fel när inbjudan skulle godkännas. Kontakta webbplatsens administratör."
+    not_found_template_link: |
+      <p>Inbjudan till <a href="%{base_url}">%{site_name}</a> kan inte längre lösas in. Be personen som bjöd in dig att skicka en ny inbjudan till dig.</p>l
     user_exists: "Det finns inget behov av att bjuda in <b>%{email}</b>: De har <a href='%{base_path}/u/%{username}/summary'>redan ett konto!</a>"
+    invite_exists: "Du har redan bjudit in <b>%{email}</b>."
+    invalid_email: "%{email} är inte en giltig e-postadress."
     confirm_email: "<p>Du är nästan klar! Vi skickade ett aktiveringsmeddelande till din e-postadress. Följ instruktionerna i e-postmeddelandet för att aktivera ditt konto.</p><p>Om du inte ser det kan du kolla i din skräppostmapp.</p>"
     cant_invite_to_group: "Du är inte behörig att bjuda in användare till specificerade grupper. Kontrollera att du är ägare för de grupper som du försöker bjuda in till."
     disabled_errors:
-      sso_enabled: "Inbjudningar är inaktiverade eftersom SSO är aktiverat."
-      local_logins_disabled: "Inbjudningar är inaktiverade eftersom inställningen 'enable local logins' (aktivera lokala inloggningar) är inaktiverad."
+      discourse_connect_enabled: "Inbjudningar är inaktiverade eftersom DiscourseConnect har aktiverats."
       invalid_access: "Du har inte behörighet att visa den efterfrågade resursen."
   bulk_invite:
     file_should_be_csv: "De uppladdade filerna skall vara i csv-format."
@@ -237,7 +246,7 @@ sv:
     muted_topic: "Tyvärr tystade den användaren detta ämne."
     receiver_does_not_allow_pm: "Tyvärr tillåter inte den användaren att du skickar privata meddelanden till dem."
     sender_does_not_allow_pm: "Tyvärr tillåter du inte den användaren att skicka privata meddelanden till dig."
-    receiver_does_not_allow_other_user_pm: "Tyvärr tillåter inte den användaren att en befintlig deltagare skickar privata meddelanden till henne/honom."
+    user_cannot_see_topic: "%{username} kan inte se ämnet."
   backup:
     operation_already_running: "En operation är redan igång och därför kan inte ett nytt jobb snartas just nu."
     backup_file_should_be_tar_gz: "Säkerhetskopiefilen ska vara ett .tar.gz-arkiv."
@@ -260,6 +269,7 @@ sv:
   email_template_cant_be_modified: "Den här e-postmallen kan inte ändras"
   invalid_whisper_access: "Antingen är viskningar inte aktiverade eller så har du inte behörighet för att skapa viskningsinlägg"
   not_in_group:
+    title_topic: "Du måste begära medlemskap i gruppen '%{group}' för att se detta ämne."
     title_category: "Du måste vara i en grupp för att se denna kategori."
     request_membership: "Begär medlemskap"
     join_group: "Gå med i grupp"
@@ -329,6 +339,7 @@ sv:
   max_pm_recipients: "Tyvärr kan du maximalt skicka ett meddelande till %{recipients_limit} mottagare."
   pm_reached_recipients_limit: "Tyvärr kan du inte ha fler än %{recipients_limit} mottagare för ett meddelande."
   removed_direct_reply_full_quotes: "Automatiskt borttaget citat av hela det föregående inlägget."
+  watched_words_auto_tag: "Automatiskt taggat ämne"
   secure_upload_not_allowed_in_public_topic: "Tyvärr kan följande säkra uppladdning(ar) inte användas i ett offentligt ämne: %{upload_filenames}."
   create_pm_on_existing_topic: "Tyvärr kan du inte skapa ett PM för ett befintligt ämne."
   slow_mode_enabled: "Detta ämne är i långsamt läge."
@@ -370,11 +381,12 @@ sv:
   too_late_to_edit: "Inlägget skapades för långt tillbaka i tiden. Det kan inte längre redigeras eller tas bort."
   edit_conflict: "Det inlägget redigerades av en annan användare och dina ändringar kan inte längre sparas."
   revert_version_same: "Nuvarande version är den samma som du försöker återgå till."
-  cannot_edit_on_slow_mode: "Detta ämne är i långsamt läge. För att uppmuntra eftertänksam och övervägd diskussion är det för närvarande inte tillåtet att redigera gamla inlägg."
+  cannot_edit_on_slow_mode: "Detta ämne är i långsamt läge. För att uppmuntra eftertänksam och övervägd diskussion är det för närvarande inte tillåtet att redigera gamla inlägg i långsamt läge."
   excerpt_image: "bild"
   bookmarks:
     errors:
       already_bookmarked_post: "Du kan inte bokmärka samma inlägg två gånger."
+      too_many: "Tyvärr kan du inte lägga till fler än %{limit} bokmärken, gå till <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> för att ta bort några."
       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 anges för alla påminnelser"
@@ -403,7 +415,12 @@ sv:
       email_already_used_in_category: "'%{email}' används redan av kategorin '%{category_name}'."
       cant_allow_membership_requests: "Du kan inte tillåta begäran om medlemskap för en grupp utan ägare."
       already_requested_membership: "Du har redan begärt medlemskap i denna grupp."
-      adding_too_many_users: "Max %{limit} användare kan läggas till på en gång"
+      adding_too_many_users:
+        one: "Maximalt %{count} användare kan läggas till samtidigt"
+        other: "Maximalt %{count} användare kan läggas till samtidigt"
+      usernames_or_emails_required: "Användarnamn eller e-postadresser måste finnas"
+      no_invites_with_discourse_connect: "Du kan bara bjuda in registrerade användare när DiscourseConnect har aktiverats"
+      no_invites_without_local_logins: "Du kan bara bjuda in registrerade användare när lokala inloggningar har inaktiverats"
     default_names:
       everyone: "alla"
       admins: "administratörer"
@@ -425,22 +442,22 @@ sv:
       one: "%{count} inlägg"
       other: "%{count} inlägg"
     "new-topic": |
-      Välkommen till %{site_name} &mdash; **tack för att du startade ett nytt samtal!**
+      Välkommen till %{site_name} &mdash; **tack för att du startade en ny konversation**
 
-      - Låter rubriken intressant om du läser det högt? Är det en bra sammanfattning?
+      - Låter rubriken intressant om du läser den högt? Ger det en bra sammanfattning?
 
       - Vem skulle kunna vara intresserad av detta? Varför är det viktigt? Vad för typ av svar förväntar du dig?
 
-      - Inkludera vanligt förekommande ord i ditt ämne så att andra kan *hitta* det. För att gruppera ditt ämne med relaterade ämnen, välj en kategori.
+      - Inkludera vanliga förekommande ord i ditt ämne så att andra kan *hitta* det. För att gruppera ditt ämne med relaterade ämnen, välj en kategori (eller tagg).
 
       För mer information kan du läsa [riktlinjerna](%{base_path}/guidelines). Detta meddelande visas enbart vid ditt första %{education_posts_text}.
     "new-reply": |
       Välkommen till %{site_name} &mdash; **tack för att du bidrar!**
 
-      - Bidrar ditt svar till samtalet på något sätt?
-
       - Var snäll mot andra medlemmar.
 
+      - Bidrar ditt svar till samtalet på något sätt?
+
       - Konstruktiv kritik välkomnas, men kritisera då *idéer* och inte personer.
 
       För mer information kan du läsa [forumets riktlinjer](%{base_path}/guidelines). Detta meddelande visas enbart vid ditt första %{education_posts_text}.
@@ -508,6 +525,7 @@ sv:
               cant_send_pm: "Tyvärr kan du inte skicka ett privat meddelande till den användaren."
               no_user_selected: "Du måste välja en giltig användare."
               reply_by_email_disabled: "Svar via e-post har inaktiverats."
+              send_to_email_disabled: "Tyvärr kan du inte skicka privata meddelanden som e-post."
               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."
               unable_to_tag: "Det uppstod ett fel vid taggning av ämnet."
@@ -556,6 +574,9 @@ sv:
           attributes:
             execute_at:
               in_the_past: "måste vara i framtiden."
+            duration_minutes:
+              cannot_be_zero: "måste vara mer än 0."
+              exceeds_maximum: "får inte vara mer än 20 år."
         translation_overrides:
           attributes:
             value:
@@ -638,20 +659,20 @@ sv:
     slow_down: "Du har utfört den här åtgärden för många gånger, försök igen senare."
     too_many_requests: "Du har utfört den här åtgärden för många gånger. Vänta %{time_left} innan du försöker igen."
     by_type:
-      first_day_replies_per_day: "Du har uppnått maximalt antal svar som nya användare kan skapa under första dagen. Vi ber dig vänta %{time_left} innan du försöker igen."
-      first_day_topics_per_day: "Du har uppnått maximalt antal nya ämnen som nya användare kan skapa under första dagen. Vi ber dig vänta %{time_left} innan du försöker igen."
-      create_topic: "Du skapar nya ämnen för snabbt. Vi ber dig vänta %{time_left} innan du försöker igen."
-      create_post: "Du svarar för snabbt. Vi ber dig vänta %{time_left} innan du försöker igen."
-      delete_post: "Du raderar inlägg för snabbt. Vi ber dig vänta %{time_left} innan du försöker igen."
-      public_group_membership: "Du går med i/lämnar grupper för ofta. Vi ber dig vänta %{time_left} innan du försöker igen."
-      topics_per_day: "Du har uppnått maximalt antal nya ämnen. Vi ber dig vänta %{time_left} innan du försöker igen."
-      pms_per_day: "Du har uppnått maximalt antal meddelanden. Vi ber dig vänta %{time_left} innan du försöker igen."
-      create_like: "Du har uppnått maximalt antal gillningar. Vi ber dig vänta %{time_left} innan du försöker igen."
-      create_bookmark: "Du har uppnått maximalt antal bokmärken. Vi ber dig vänta %{time_left} innan du försöker igen."
-      edit_post: "Du har uppnått maximalt antal redigeringar. Var god vänta %{time_left} innan du försöker igen."
+      first_day_replies_per_day: "Vi uppskattar din entusiasm, fortsätt så! Med detta sagt, för säkerheten för vårt forum har du nått det maximala antalet svar som en ny användare kan skapa den första dagen. Vänta %{time_left}, så kan du skapa fler svar."
+      first_day_topics_per_day: "Vi uppskattar din entusiasm! Med detta sagt, för säkerheten för vårt forum har du nått det maximala antalet ämnen som en ny användare kan skapa den första dagen. Vänta %{time_left}, så kan du skapa fler ämnen."
+      create_topic: "Du skapar nya ämnen lite för snabbt. Vi ber dig vänta %{time_left} innan du försöker igen."
+      create_post: "Du svarar lite för snabbt. Vi ber dig vänta %{time_left} innan du försöker igen."
+      delete_post: "Du raderar inlägg lite för snabbt. Vi ber dig vänta %{time_left} innan du försöker igen."
+      public_group_membership: "Du går med i/lämnar grupper lite för ofta. Vi ber dig vänta %{time_left} innan du försöker igen."
+      topics_per_day: "Du har uppnått det högsta tillåtna antalet nya ämnen per dag. Du kan skapa fler nya ämnen om %{time_left}."
+      pms_per_day: "Du har uppnått det maximala antalet meddelanden per dag. Du kan skapa fler nya meddelanden om %{time_left}."
+      create_like: "Wow! Du har delat med dig av så mycket kärlek! Du har uppnått det maximala antalet dagliga gillningar för idag, men i takt med att du når högre förtroendenivåer kommer du att kunna dela ut fler gillningar per dag. Du kan gilla inlägg igen om %{time_left}."
+      create_bookmark: "Du har uppnått det maximala antalet dagliga bokmärken. Du kan skapa fler bokmärken om %{time_left}."
+      edit_post: "Du har uppnått det maximala antalet dagliga redigeringar. Du kan göra fler redigeringar om %{time_left}."
       live_post_counts: "Du ber om beräkning av live-inlägg för ofta. Var god vänta %{time_left} innan du försöker igen."
       unsubscribe_via_email: "Du har uppnått maximalt antal avregistreringar via e-post. Var god vänta %{time_left} innan du försöker igen."
-      topic_invitations_per_day: "Du har uppnått maximalt antal inbjudningar till ämne. Vi ber dig vänta %{time_left} innan du försöker igen."
+      topic_invitations_per_day: "Du har uppnått det maximala antalet ämnesinbjudningar. Du kan skicka fler inbjudningar om %{time_left}."
     hours:
       one: "%{count} timme"
       other: "%{count} timmar"
@@ -755,7 +776,7 @@ sv:
       unknown: "okänd webbläsare"
     device:
       android: "Android-enhet"
-      chromebook: "Chromebook"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -766,7 +787,7 @@ sv:
       unknown: "okänd enhet"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -781,6 +802,7 @@ sv:
     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 har din e-postadress ändrats redan?"
     confirm: "Bekräfta"
+    max_secondary_emails_error: "Du har nått gränsen för maximalt antal sekundära e-postmeddelanden."
     authorizing_new:
       title: "Bekräfta din nya e-postadress"
       description: "Bekräfta att du önskar ändra din e-postadress till:"
@@ -872,6 +894,16 @@ sv:
       others: "Inga svar."
     no_drafts:
       self: "Du har inga utkast; börja att skriva ett svar i ett ämne så sparas det automatiskt som ett nytt utkast."
+  email_settings:
+    pop3_authentication_error: "Det uppstod ett problem med de angivna POP3-autentiseringsuppgifterna. Kontrollera användarnamn och lösenord och försök igen."
+    imap_authentication_error: "Det uppstod ett problem med de angivna IMAP-autentiseringsuppgifterna. Kontrollera användarnamn och lösenord och försök igen."
+    imap_no_response_error: "Det uppstod ett fel vid kommunikation med IMAP-servern. %{message}"
+    smtp_authentication_error: "Det uppstod ett problem med de angivna SMTP-autentiseringsuppgifterna. Kontrollera användarnamn och lösenord och försök igen."
+    smtp_server_busy_error: "SMTP-servern är för närvarande upptagen. Försök igen senare."
+    smtp_unhandled_error: "Det uppstod ett ohanterat fel vid kommunikation med SMTP-servern. %{message}"
+    connection_error: "Det uppstod ett problem vid anslutning till servern. Kontrollera serverns namn och port och försök igen."
+    timeout_error: "Tidsgränsen för anslutning till servern uppnåddes. Kontrollera serverns namn och port och försök igen."
+    unhandled_error: "Ohanterat fel vid testning av e-postinställningar. %{message}"
   webauthn:
     validation:
       invalid_type_error: "webauthn-typen som angavs var ogiltig. Giltiga typer är webauthn.get eller webauthn.create."
@@ -933,7 +965,7 @@ sv:
     mailing_list_mode: "Stäng av utskicksläge"
     all: "Skicka mig inga fler e-postmeddelanden från %{sitename}"
     different_user_description: "Du är för tillfället inloggad som en annan användare än den som vi skickade e-post till. Logga ut, eller aktivera anonymt läge, och försök igen."
-    not_found_description: "Tyvärr kunde vi inte hitta den här avprenumerationen. Är det möjligt att länken i din e-post har löpt ut?"
+    not_found_description: "Tyvärr kunde vi inte hitta den här avprenumerationen. Kan länken i din e-post vara för gammal och ha löpt ut?"
     log_out: "Logga ut"
     submit: "Spara inställningar"
     digest_frequency:
@@ -1311,6 +1343,7 @@ sv:
     github_config_warning: 'Servern är konfigurerad till att tillåta registrering och inloggning med GitHub (enable_github_logins), men klient-id och hemlighetsvärden har inte ställts in. Gå till <a href="%{base_path}/admin/site_settings">webbplatsinställningarna</a> och uppdatera inställningarna. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Läs den här guiden för att lära dig mer</a>.'
     s3_config_warning: 'Servern är konfigurerad till att ladda upp filer till S3, men minst en av följande inställningar har inte ställts in: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, eller s3_upload_bucket. Gå till <a href="%{base_path}/admin/site_settings">webbplatsinställningarna</a> och uppdatera dem. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Se "How to set up image uploads to S3?" för att lära dig mer</a>.'
     s3_backup_config_warning: 'Servern är konfigurerad till att ladda upp reservfiler till S3, men minst en av följande inställningar har inte ställts in: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, eller s3_backup_bucket. Gå till <a href="%{base_path}/admin/site_settings">webbplatsinställningarna</a> och uppdatera dem. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Se "How to set up image uploads to S3?" för att lära dig mer</a>.'
+    s3_cdn_warning: 'Servern är konfigurerad att ladda upp filer till S3, men det finns ingen konfigurerad S3 CDN. Detta kan leda till dyra S3-kostnader och långsammare prestanda. <a href="https://meta.discourse.org/t/-/148916" target="_blank">Läs mer i "Använda objektlagring för uppladdningar"</a>.'
     image_magick_warning: 'Servern är konfigurerad att skapa ikoner av stora bilder, men ImageMagick är inte installerad. Installera ImageMagick med din föredragna pakethanterare eller <a href="https://www.imagemagick.org/script/download.php" target="_blank">hämta den senaste utgåvan</a>.'
     failing_emails_warning: 'Det finns %{num_failed_jobs} e-postutskick som har misslyckats. Kontrollera din app.yml för att säkerställa att serverinställningarna för e-post är korrekta. <a href="%{base_path}/sidekiq/retries" target="_blank">Se alla misslyckade utskick i Sidekiq</a>.'
     subfolder_ends_in_slash: "Inställningarna för dina undermappar är inte korrekt; DISCOURSE_RELATIV_URL_ROOT slutar med ett snedstreck."
@@ -1319,14 +1352,12 @@ sv:
       other: "E-postpolling har genererat %{count} fel de senaste 24 timmarna. Se <a href='%{base_path}/logs' target='_blank'>loggarna</a> för mer detaljer."
     missing_mailgun_api_key: "Servern är konfigurerad att skicka e-post via Mailgun, men du har inte tillhandahållit en API-nyckel som ska användas för att verifiera webhook-meddelandena."
     bad_favicon_url: "Favoritikonen kan inte laddas. Kontrollera dina inställningar för favoritikonen i <a href='%{base_path}/admin/site_settings'>webbplatsinställningarna</a>."
-    deprecated_api_usage: "Vi upptäckte en API-begäran genom en utfasad autentiseringsmetod. Uppdatera den att använda <a href='https://meta.discourse.org/t/-/22706'>rubrikbaserad autentisering</a>. Det kan ta upp till 24 timmar innan detta meddelande försvinner efter att du har uppdaterat."
-    update_mail_receiver: "Vi upptäckte en utgången version av e-postmottagare. Klicka <a href='https://meta.discourse.org/t/-/133491'>här</a> för att uppdatera instruktionerna. Det kan ta upp till 24 timmar innan detta meddelande försvinner efter att du har uppdaterat."
     poll_pop3_timeout: "Anslutningen till POP3-servern har nått tidsgränsen. Inkommande e-postmeddelanden kunde inte mottas. Kontrollera dina <a href='%{base_path}/admin/site_settings/category/email'>POP3-inställningar</a> och tjänsteleverantör."
     poll_pop3_auth_error: "Anslutning till POP3-servern misslyckas med ett autentiseringsfel. Kontrollera dina <a href='%{base_path}/admin/site_settings/category/email'>POP3-inställningar</a>."
     force_https_warning: "Din webbplats använder SSL, men `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` har inte aktiverats i inställningarna för din webbplats."
     out_of_date_themes: "Uppdateringar finns tillgängliga för följande teman:"
     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'."
+    watched_word_regexp_error: "Det reguljära uttrycket för %{action}-bevakade ord är ogiltigt. Kontrollera dina <a href='%{base_path}/admin/customize/watched_words'>inställningar för bevakade ord</a>eller inaktivera webbplatsinställningen 'Reguljära uttryck för bevakade ord'."
   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;"
@@ -1354,10 +1385,8 @@ sv:
     search_query_log_max_size: "Maximal mängd sökfrågor att behålla"
     search_query_log_max_retention_days: "Maximal tidsperiod att spara sökfrågor, i dagar."
     search_ignore_accents: "Ignorera accenttecken när du söker efter text."
-    category_search_priority_very_low_weight: "Vikt tillämpad på rangordning vid mycket låg sökprioritet för kategori."
     category_search_priority_low_weight: "Vikt tillämpad på rangordning vid låg sökprioritet för kategori"
     category_search_priority_high_weight: "Vikt tillämpad på rangordning vid hög sökprioritet för kategori"
-    category_search_priority_very_high_weight: "Vikt tillämpad på rangordning 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."
@@ -1367,7 +1396,7 @@ sv:
     site_description: "Beskriv denna webbplats i en mening, som sedan används i metabeskrivningstaggen."
     short_site_description: "Kort beskrivning, som används i titel-taggen på hemsidan."
     contact_email: "E-postadress till huvudansvarig för denna webbplats. Används för kritiska meddelanden såväl som på <a href='%{base_path}/about' target='_blank'>/about</a> kontaktformuläret för brådskande ärenden."
-    contact_url: "Kontakt URL för denna webbplats. Används på <a href='%{base_path}/about' target='_blank'>/about</a>-kontaktformuläret för brådskande ärenden."
+    contact_url: "Kontakt-URL för denna webbplats. Visas på <a href='%{base_path}/about' target='_blank'>/about</a>-sidan för brådskande ärenden."
     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 hämta 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)"
@@ -1407,6 +1436,7 @@ sv:
     mobile_logo_dark: "Mörkt schemaalternativ för webbplatsinställningen 'logotyp mobil'."
     large_icon: "Bild som används som bas för andra metadata-ikoner. Bör helst vara större än 512 x 512. Om detta lämnas tomt kommer logo_small att användas."
     manifest_icon: "Bild som används som logotyp/startbild på Android. Storleken ändras automatiskt till 512 × 512. Om detta lämnas tomt används large_icon."
+    manifest_screenshots: "Skärmdumpar som visar dina instansfunktioner och funktionaliteten på dess installationsfrågesida. Alla bilder ska vara lokala uppladdningar, med samma dimensioner."
     favicon: "En favoritikon för din webbplats, se <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>http://en.wikipedia.org/wiki/Favicon</a>. För att fungera korrekt över en CDN måste det vara en png. Storleken ändras automatiskt till 32 x 32. Om detta lämnas tomt används large_icon."
     apple_touch_icon: "Ikon som används för Apples pekskärmsenheter. Storleken ändras automatiskt till 180 x 180. Om detta lämnas tomt används large_icon."
     opengraph_image: "Standard Open Graph bild, används när sidan inte har någon annan lämplig bild. Om detta lämnas tomt används large_icon."
@@ -1417,7 +1447,7 @@ sv:
     detailed_404: "Ger mer information till användarna om varför de inte kan komma åt ett visst ämne. Notera: Det här är mindre säkert eftersom användare vet om att en URL länkar till ett giltigt ämne."
     enforce_second_factor: "Tvingar användare att aktivera tvåfaktorsautentisering. Välj 'alla' för att kräva det för alla användare. Välj 'personal' för att bara kräva det av personal."
     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å webbläsare som stöds (Löst eller Strikt). Varning: Strikt fungerar bara på webbplatser som tvingar inloggning och använder SSO."
+    same_site_cookies: "Använd samma webbplatskakor, detta eliminerar alla vektorer för Cross Site Request Forgery på webbläsare som stöds (Löst eller Strikt). Varning: Strikt fungerar bara på webbplatser som tvingar inloggning och använder en extern autentiseringsmetod."
     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. Ä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."
@@ -1455,6 +1485,7 @@ sv:
     must_approve_users: "Personal måste godkänna alla nya användarkonton innan de tillåts använda webbplatsen."
     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änkta användare i kön för granskning. Misstänkta användare har angett en bio/webbsida men har ingen läsaktivitet."
+    review_every_post: "Alla inlägg måste granskas. VARNING! REKOMMENDERAS INTE FÖR MYCKET AKTIVA WEBBPLATSER."
     pending_users_reminder_delay: "Avisera 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 aviseringar."
     persistent_sessions: "Användarna förblir inloggade när webbläsaren stängs"
     maximum_session_age: "Användaren kommer fortsättningsvis att vara inloggad i n timmar sedan senaste besöket"
@@ -1478,6 +1509,7 @@ sv:
     content_security_policy: "Aktivera säkerhetspolicy för innehåll"
     content_security_policy_report_only: "Aktivera enbart säkerhetspolicy för innehåll"
     content_security_policy_collect_reports: "Aktivera insamling av CSP-överträdelserapporter på /csp_reports"
+    content_security_policy_frame_ancestors: "Begränsa vem som kan bädda in denna webbplats i iframes via CSP. Kontrollera tillåtna värdar på <a href='%{base_path}/admin/customize/embedding'>Inbäddning</a>"
     content_security_policy_script_src: "Ytterligare vitlistade skriptkällor. Den aktuella värden och CDN ingår som standard. Se <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Minska XSS-attacker genom policy för innehållssäkerhet.</a>"
     invalidate_inactive_admin_email_after_days: "Administratörskonton som inte har besökt webbplatsen under detta antal dagar kommer att behöva validera sin e-postadress innan de loggar in. Ställ in till 0 för att inaktivera."
     top_menu: "Bestäm vilka objekt som visas i hemsidans navigation, och i vilken ordning. Exempel: latest|new|unread|categories|top|read|posted|bookmarks"
@@ -1525,27 +1557,27 @@ sv:
     min_admin_password_length: "Minsta lösenordslängd för administratör."
     password_unique_characters: "Minsta antalet unika tecken som ett lösenord måste ha."
     block_common_passwords: "Tillåt inte lösenord som är bland de 10 000 vanligaste lösenorden."
-    external_auth_skip_create_confirm: Vid registrering genom extern auktorisering, hoppa över popup-fönster för att skapa konto. Används med fördel tillsammans med sso_overides_email, sso_overrides_username och sso_overrides_name.
-    external_auth_immediately: "Omdirigera automatiskt till det externa inloggningssystemet utan användarinteraktion. Detta träder endast i kraft när login_required är sant, och det bara finns en extern autentiseringsmetod"
-    enable_sso: "Aktivera Single sign on via en extern sida (VARNING: ANVÄNDARENS E-POSTADRESS *MÅSTE* HA VALIDERATS AV DEN EXTERNA SIDAN!)"
-    verbose_sso_logging: "Logga detaljerad SSO-relaterad diagnostik till <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    enable_sso_provider: "Implementera Discourse SSO leverantörsprotokoll vid ändpunkten /session/sso_provider, kräver att sso_provider_secrets är inställd"
-    sso_url: "URL för single sign on endpoint (måste inkludera http:// eller https://)"
-    sso_secret: "Hemlig sträng som används för att kryptografiskt autentisera SSO-information, se till att den är 10 tecken eller mer"
-    sso_provider_secrets: "En lista över domänhemliga par som använder Discourse som en SSO-leverantör. Se till att SSO-hemligheten är 10 tecken eller längre. Jokertecknet * kan användas för att matcha valfri domän eller bara en del av den (t.ex. *.exempel.com)."
-    sso_overrides_bio: "Åsidosätter användarbiografi i användarprofil och förhindrar användare från att ändra den"
-    sso_overrides_groups: "Synkronisera alla manuella gruppmedlemskap med grupper som anges i gruppens sso-attribut (VARNING: om du inte anger grupper kommer alla manuella gruppmedlemskap att rensas för användaren)"
-    sso_overrides_email: "Åsidosätter lokal e-post med externa webbplatsers e-post från SSO-data vid varje inloggning samt förhindrar lokala ändringar. (VARNING: diskrepanser kan inträffa på grund av normalisering av lokala e-postadresser)"
-    sso_overrides_username: "Åsidosätter lokala användarnamn med externa webbplatsers användarnamn från SSO-data vid varje inloggning samt 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-data vid varje inloggning samt förhindrar lokala ändringar. Gäller för alla tjänster för auktorisering."
-    sso_overrides_avatar: "Åsidosätter användaravatar med extern webbplatsavatar från SSO-nyttolast. Om detta ä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 plats 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"
-    sso_allows_all_return_paths: "Begränsa inte domänen för return_paths som tillhandahålls av SSO (som standard måste retursökvägen finnas på den aktuella webbplatsen)"
-    enable_local_logins: "Aktivera konton baserade på lokala användarnamn och lösenordsinloggning. Detta måste ha aktiverats för inbjudningar till arbete. VARNING: om detta har inaktiverats kan du kanske inte logga in om du inte tidigare har konfigurerat minst en alternativ inloggningsmetod."
+    auth_skip_create_confirm: När du registrerar dig via extern auth, hoppa över skapa konto-popup. Används med fördel tillsammans med auth_overrides_email, auth_overrides_username och auth_overrides_name.
+    auth_immediately: "Omdirigera automatiskt till det externa inloggningssystemet utan användarinteraktion. Detta träder endast i kraft när login_required är sant, och det bara finns en extern autentiseringsmetod"
+    enable_discourse_connect: "Aktivera inloggning via DiscourseConnect (tidigare 'Discourse SSO') (VARNING: ANVÄNDARES E-POSTADRESSER *MÅSTE* VALIDERAS AV DEN EXTERNA WEBBPLATSEN!)"
+    verbose_discourse_connect_logging: "Logga detaljerad DiscourseConnect-relaterad diagnostik i <a href='%{base_path}/logs' target='_blank'>/loggar</a>"
+    enable_discourse_connect_provider: "Implementera leverantörsprotokoll för DiscourseConnect (tidigare 'Discourse SSO') vid slutpunkten /session/sso_provider, kräver att discourse_connect_provider_secrets är inställd"
+    discourse_connect_url: "URL till DiscourseConnect-slutpunkt (måste innehålla http:// eller https://)"
+    discourse_connect_secret: "Hemlig sträng som används för att kryptografiskt autentisera DiscourseConnect-information, se till att den är 10 tecken eller längre"
+    discourse_connect_provider_secrets: "En lista med domänhemliga par som använder DiscourseConnect. Se till att DiscourseConnect-hemligheten är 10 tecken eller längre. Jokertecknet * kan användas för att matcha valfri domän eller bara en del av den (t.ex. * .exempel.com)."
+    discourse_connect_overrides_bio: "Åsidosätter användarbiografi i användarprofilen och hindrar användare från att ändra den"
+    discourse_connect_overrides_groups: "Synkronisera alla manuella gruppmedlemskap med grupper som anges i attributet för grupper (VARNING: om du inte anger grupper kommer alla manuella gruppmedlemskap att rensas för användare)"
+    auth_overrides_email: "Åsidosätter lokal e-post med externa webbplatsers e-post vid varje inloggning samt förhindrar lokala ändringar. (VARNING: diskrepanser kan inträffa på grund av normalisering av lokala e-postadresser)"
+    auth_overrides_username: "Åsidosätter lokala användarnamn med externa webbplatsers användarnamn vid varje inloggning samt förhindrar lokala ändringar. (VARNING: diskrepanser kan inträffa på grund av skillnader i användarnamnets längd/krav)"
+    auth_overrides_name: "Åsidosätter lokala fullständiga namn med externa webbplatsers fullständiga namn vid varje inloggning samt förhindrar lokala ändringar. Gäller för alla tjänster för auktorisering."
+    discourse_connect_overrides_avatar: "Åsidosätter användaravatar med extern webbplatsavatar från DiscourseConnect-nyttolast. Om detta är aktiverat kan användare inte ladda upp avatarer på Discourse."
+    discourse_connect_overrides_location: "Åsidosätter användarens plats med plats hämtad externt från DiscourseConnect-nyttolast och förhindrar sedan lokala ändringar."
+    discourse_connect_overrides_website: "Åsidosätter användarens webbplats med plats hämtad externt från DiscourseConnect-nyttolast och förhindrar sedan lokala ändringar."
+    discourse_connect_overrides_profile_background: "Åsidosätter användarprofilbakgrund med extern webbplatsavatar från DiscourseConnect-nyttolast."
+    discourse_connect_overrides_card_background: "Åsidosätter användarkortsbakgrund med extern webbplatsavatar från DiscourseConnect-nyttolast."
+    discourse_connect_not_approved_url: "Omdirigera icke-godkända DiscourseConnect-konton till den här URL:en"
+    discourse_connect_allows_all_return_paths: "Begränsa inte domänen för return_paths som tillhandahålls av DiscourseConnect (som standard måste retursökvägen finnas på den aktuella webbplatsen)"
+    enable_local_logins: "Aktivera konton baserade på lokala användarnamn och lösenordsinloggning. VARNING: om detta har inaktiverats kan du kanske inte logga in om du inte tidigare har konfigurerat minst en alternativ inloggningsmetod."
     enable_local_logins_via_email: "Tillåt användare att begära en engångsinloggningslänk som skickas till dem via e-post."
     allow_new_registrations: "Tillåt nya användarregistreringar. Avbocka detta för att förhindra vem som helst från att skapa ett nytt konto."
     enable_signup_cta: "Visa en notis för återvändande anonyma användare för att förmå dem att registrera ett nytt konto."
@@ -1588,7 +1620,6 @@ sv:
     top_topics_formula_log_views_multiplier: "värde av loggvisningsmultiplikatorn (n) i formeln för toppämnen: `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: "värde av första inläggsgillningsmultiplikatorn (n) i formeln för toppämnen: `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: "värde av minsta inläggsgillningsmultiplikatorn (n) i formeln för toppämnen: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Antalet gamla inlägg som kommer att bakas in var 15:e minut"
     enable_safe_mode: "Tillåt användare att gå in i säkert läge för att felsöka tillägg."
     rate_limit_create_topic: "Efter att ha skapat ett ämne, måste användare vänta (n) sekunder innan de kan skapa ett nytt."
     rate_limit_create_post: "Efter att ha skrivit ett inlägg, måste användare vänta (n) sekunder innan de skriver ett nytt."
@@ -1604,9 +1635,10 @@ sv:
     max_topic_invitations_per_day: "Max antal ämnesinbjudningar en användare kan skicka per dag."
     max_logins_per_ip_per_hour: "Maximalt antal inloggningar tillåtna per IP-adress per timme"
     max_logins_per_ip_per_minute: "Maximalt antal inloggningar tillåtna per IP-adress per minut"
-    max_post_deletions_per_minute: "Maximalt antal inlägg som en användare kan radera per minut."
-    max_post_deletions_per_day: "Maximalt antal inlägg som en användare kan radera per dag."
+    max_post_deletions_per_minute: "Maximalt antal inlägg som en användare kan radera per minut. Ställ in till 0 för att inaktivera inläggsraderingar."
+    max_post_deletions_per_day: "Maximalt antal inlägg som en användare kan radera per dag. Ställ in till 0 för att inaktivera inläggsraderingar."
     invite_link_max_redemptions_limit: "Maximalt antal återinbjudningar tillåtna för inbjudningslänkar kan inte vara större än detta värde."
+    invite_link_max_redemptions_limit_users: "Maximalt antal inlösningar som tillåts för inbjudningslänkar som genererats av vanliga användare 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 funktionen. OBS: kräver omstart."
     categories_topics: "Antal ämnen som ska visas i /kategorisida. Om detta ställs in till 0 kommer systemet automatiskt att försöka hitta ett värde så att de två kolumnerna hålls symmetriskt (kategorier och ämnen.)"
@@ -1628,6 +1660,8 @@ sv:
     avatar_sizes: "Lista över automatiskt genererade avatar-storlekar."
     external_system_avatars_enabled: "Använd externt system för avatar-tjänster."
     external_system_avatars_url: "URL till externt system för avatar-tjänster. Tillåtna ersättningar är {username} {first_letter} {color} {size}"
+    external_emoji_url: "URL till den externa tjänsten för emoji-bilder. Lämna tomt om du vill inaktivera den."
+    use_site_small_logo_as_system_avatar: "Använd webbplatsens lilla logotyp istället för systemanvändarens avatar. Kräver att logotypen är närvarande."
     restrict_letter_avatar_colors: "En lista med sexsiffriga hexadecimala färgvärden som ska användas för bakgrund av avatarer i brev."
     selectable_avatars_enabled: "Tvinga användare att välja en avatar från listan."
     selectable_avatars: "Lista på avatarer som användare kan välja från"
@@ -1639,7 +1673,6 @@ sv:
     strip_image_metadata: "Radera metadata för bild."
     min_ratio_to_crop: "Förhållandet används för att beskära höga bilder. Ange resultatet av bredd/höjd."
     simultaneous_uploads: "Maximalt antal filer som kan dras och släppas in i redigeraren"
-    enable_flash_video_onebox: "Aktivera inbäddning av swf- och fic-länkar (Adobe Flash) i onebox. VARNING: det kan introducera säkerhetsrisker."
     default_invitee_trust_level: "Förvald förtroendenivå (0-4) för inbjudna användare."
     default_trust_level: "Förvald förtroendenivå (0-4) för alla nya användare. VARNING! En ändring av detta sätter dig i stor risk för skräppost."
     tl1_requires_topics_entered: "Antal ämnen en användare måste öppna innan en befordran till förtroendenivå 1."
@@ -1673,6 +1706,7 @@ sv:
     min_trust_to_edit_post: "Lägsta förtroendenivå som krävs för att skapa ett inlägg."
     min_trust_to_allow_self_wiki: "Lägsta förtroendenivå som krävs för att göra användares egna inlägg wiki."
     min_trust_to_send_messages: "Lägsta förtroendenivå som krävs för att skapa nya privata meddelanden."
+    min_trust_to_send_email_messages: "Lägsta förtroendenivå som krävs för att skicka privata meddelanden via e-post."
     min_trust_to_flag_posts: "Lägsta förtroendenivå som krävs för att flagga ett inlägg."
     min_trust_to_post_links: "Lägsta förtroendenivå som krävs för att inkludera länkar i ett inlägg."
     min_trust_to_post_embedded_media: "Lägsta förtroendenivå som krävs för att bädda in medieobjekt i ett inlägg"
@@ -1699,6 +1733,7 @@ sv:
     body_min_entropy: "Minsta tillåtna entropi (unika tecken) som krävs för ett inläggs innehåll."
     allow_uppercase_posts: "Tillåt enbart versaler i ämnets rubrik eller innehåll."
     max_consecutive_replies: "Antal inlägg som en användare måste göra i rad inom ett ämne innan användaren hindras lägga till ytterligare ett svar."
+    enable_filtered_replies_view: '(n)-svarsknappen förminskar alla andra inlägg och visar bara det aktuella inlägget och dess svar.'
     title_fancy_entities: "Konvertera vanliga ASCII-tecken till häftiga HTML-enheter i ämnesrubriker, à la SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>http://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Minsta längd för en rubrik innan den kommer att kontrolleras för liknande ämnen."
     desktop_category_page_style: "Visuell stil för /kategorier-sidan."
@@ -1748,10 +1783,11 @@ sv:
     min_first_post_typing_time: "Minsta tid i millisekunder en användare måste skriva vid redigeringen av sitt första inlägg. Om gränsen inte är uppnådd så kommer inlägget automatiskt att hamna i kön av saker som behöver granskas. Ange 0 för att inaktivera (rekommenderas ej)"
     auto_silence_fast_typers_on_first_post: "Tysta automatiskt användare som inte når upp till min_first_post_typing_time"
     auto_silence_fast_typers_max_trust_level: "Högsta förtroendenivå för att automatiskt tysta snabba författare"
-    auto_silence_first_post_regex: "Ärendekänsligt vanligt uttryck som vid matchning kommer att göra att det första inlägget av användaren tystas och skickas till kön för godkännande. Exempel: rasande|a[bc]a, kommer att göra att alla inlägg som innehåller rasande eller aba eller aca tystas först. Gäller endast för första inlägget."
+    auto_silence_first_post_regex: "Skiftlägesokänsligt reguljärt uttryck som, om det godkänns, leder till att användarens första inlägg tystas och skickas till godkännandekön. Till exempel kommer rasande|a[bc]a att tysta alla inlägg som innehåller rasande eller aba eller aca i första inlägget. Gäller bara första inlägget."
     reviewable_claiming: "Måste det göras anspråk på granskningsbart innehåll innan det kan ageras?"
     reviewable_default_topics: "Visa granskningsbart innehåll grupperat efter ämne som standard"
     reviewable_default_visibility: "Visa inte artiklar som kan granskas om de inte uppfyller denna prioritering"
+    reviewable_low_priority_threshold: "Prioriteringsfiltret döljer granskningsbara som inte uppfyller denna poäng såvida inte filtret '(valfritt)' används."
     high_trust_flaggers_auto_hide_posts: "Ny användares inlägg döljs automatiskt efter att de har flaggats som skräppost av en användare med minst FN3"
     cooldown_hours_until_reflag: "Hur lång tid användare måste avvakta tills de kan flagga ett inlägg igen"
     reply_by_email_enabled: "Aktivera möjlighet att svara på ämnen via e-post."
@@ -1782,8 +1818,9 @@ sv:
     blocked_attachment_filenames: "Lista med nyckelord som används för att blockera bilagor baserat på filnamn."
     forwarded_emails_behaviour: "Hur man behandlar ett vidarebefordrat e-postmeddelande till Discourse"
     always_show_trimmed_content: "Visa alltid trimmade delar av inkommande e-post. VARNING: kan avslöja e-postadresser."
+    trim_incoming_emails: "Trimma en del av de inkommande e-postmeddelandena som inte är relevant."
     private_email: "Inkludera inte innehåll från inlägg eller ämnen i e-posttitel eller e-postinnehåll. NOTERA: inaktiverar även sammanfogade e-postmeddelanden."
-    email_total_attachment_size_limit_kb: "Maximal storlek på filer som är bifogade till utgående e-post. Ställ in till 0 för att inaktivera sändningar av bilagor."
+    email_total_attachment_size_limit_kb: "Maximal storlek på filer som bifogas till utgående e-post, i kB. Ställ in till 0 för att inaktivera sändningar av bilagor."
     post_excerpts_in_emails: "Skicka alltid utdrag istället för fullständiga inlägg i e-postmeddelanden"
     raw_email_max_length: "Hur många tecken ska lagras för inkommande e-post."
     raw_rejected_email_max_length: "Hur många tecken ska lagras för avvisad inkommande e-post."
@@ -1908,7 +1945,7 @@ sv:
     show_create_topics_notice: "Visa ett meddelande som ber administratörerna att skapa några ämnen om webbplatsen har färre än 5 publika ämnen."
     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 att anonyma användare hämtar 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."
+    prevent_anons_from_downloading_files: "Förhindra att anonyma användare hämtar bilagor."
     secure_media: 'Begränsar åtkomst för ALLA uppladdningar (bilder, video, ljud, text, pdf, zip med flera). Om "inloggning krävs" har aktiverats kan endast inloggade användare komma åt uppladdningar. Annars begränsas åtkomst endast till uppladdning av media i privata meddelanden samt privata kategorier. VARNING: Den här inställningen är komplex och kräver djupa administrativa kunskaper. Se detaljer i <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">ämnet för säkra media i Meta</a>.'
     secure_media_allow_embed_images_in_emails: "Gör det möjligt att bädda in säkra bilder som normalt skulle begränsas i e-postmeddelanden, under förutsättning att deras storlek är mindre än inställningen för säkra medias maxstorlek för inbäddning av bild, 'secure media max email embed image size kb'."
     secure_media_max_email_embed_image_size_kb: "Storleksbegränsningen för säkra bilder som kommer att bäddas in i e-postmeddelanden om inställningen för att tillåta inbäddningar för säkra media i e-post är aktiverad, 'secure media allow embed in emails' . Om inställningen inte är aktiverad har den här inställningen ingen effekt."
@@ -1929,6 +1966,7 @@ sv:
     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."
+    enable_diffhtml_preview: "Experimentell funktion som använder diffHTML för att synkronisera förhandsgranskning istället för fullständig omrendering"
     old_post_notice_days: "Dagar innan inläggsmeddelandet blir gammalt"
     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 att se återkommande användares inläggsnoteringar."
@@ -1937,13 +1975,14 @@ sv:
     blur_tl0_flagged_posts_media: "Diffusera flaggade inläggsbilder för att dölja innehåll som kanske är bäst att inte visa på arbetet."
     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."
+    skip_auto_delete_reply_likes: "När gamla svar tas bort automatiskt, hoppa över att radera inlägg med det här antalet gillningar eller mer."
     default_email_digest_frequency: "Standardinställning för hur ofta användare mottar sammanfattningen som skickas via e-post."
     default_include_tl0_in_digests: "Omfatta som standard inlägg från nya användare i sammanfattningar som skickas via e-post. Användare kan ändra detta i sina inställningar."
     default_email_level: "Ställ in standardnivå för e-postmeddelanden för vanliga ämnen."
     default_email_messages_level: "Som standard skickas e-postavisering när någon skickar meddelande till användaren."
     default_email_mailing_list_mode: "Som standard skickas ett e-postmeddelande för varje nytt inlägg."
     default_email_mailing_list_mode_frequency: "Användare som aktiverar utskicksläge kommer att motta e-post så här ofta som standard."
-    disable_mailing_list_mode: "Tillåt inte användare att aktivera utskicksläge."
+    disable_mailing_list_mode: "Tillåt inte att användare aktiverar utskicksläget för e-postlistor (förhindrar att meddelanden till e-postlistan skickas.)"
     default_email_previous_replies: "Som standard omfattas tidigare svar i e-postmeddelanden."
     default_email_in_reply_to: "Omfatta ett utdrag av svar på inlägg i e-post som standard."
     default_other_new_topic_duration_minutes: "Generellt standardvillkor för när ett ämne anses nytt."
@@ -1973,7 +2012,6 @@ sv:
     revoke_api_keys_days: "Antal dagar innan en oanvänd API-nyckel automatiskt återkallas (0 för aldrig)"
     allow_user_api_keys: "Tillåt generering av API-nycklar för användare"
     allow_user_api_key_scopes: "Lista över samtliga tillåtna användar-API-nycklar"
-    max_api_keys_per_user: "Maximalt antal användar-API-nycklar per användare"
     min_trust_level_for_user_api_key: "Förtroendenivå som krävs för att generera användar-API-nycklar"
     allowed_user_api_auth_redirects: "Tillåten URL för omdirigering efter verifiering av användares API-nycklar. Jokersymbol * kan användas för att matcha vilken del som helst av denna (t.ex. www.exempel.se/*)."
     allowed_user_api_push_urls: "Tillåtna URL:er för serverframstötning till användar-API"
@@ -1983,7 +2021,6 @@ sv:
     max_tags_per_topic: "Högsta antal taggar som kan tillskrivas ett ämne."
     max_tag_length: "Högsta antal tecken som kan användas i en tagg."
     max_tag_search_results: "Maximalt antal resultat som visas vid sökning efter taggar"
-    show_filter_by_tag: "Visa en rullgardinsmeny för att filtrera ämneslistor efter taggar."
     max_tags_in_filter_list: "Högsta antal taggar att visa i filtreringsrullgardinmenyn. De taggar som används mest kommer att visas."
     tags_sort_alphabetically: "Visa taggar i alfabetisk ordning. Standard är att visa i popularitetsordning."
     tags_listed_by_group: "Lista taggar per tagg-grupp från <a href='%{base_path}/tags' target='_blank'>tagg-sidan</a>."
@@ -1997,6 +2034,7 @@ sv:
     governing_law: "Gällande lag"
     city_for_disputes: "Domstol vid tvist"
     shared_drafts_category: "Aktivera funktionen Delade utkast genom att ange en kategori för ämnesutkast. Ämnen i den här kategorin undantas från ämneslistor för personalanvändare."
+    shared_drafts_min_trust_level: "Tillåt användare att se och redigera delade utkast."
     push_notifications_prompt: "Visa användarens samtycke genast."
     push_notifications_icon: "Utmärkelseikonen som visas i aviseringshörnet. En svartvit 96 x 96 stor PNG med genomskinlighet rekommenderas."
     base_font: "Bastypsnitt att använda för de flesta texter på webbplatsen. Teman kan åsidosätta via CSS-anpassade egenskapen `--font-family`."
@@ -2025,6 +2063,7 @@ sv:
       invalid_string_min_max: "Måste vara mellan %{min} och %{max} tecken."
       invalid_string_min: "Måste vara minst %{min} tecken."
       invalid_string_max: "Måste vara högst %{max} tecken."
+      invalid_json: "Ogiltig JSON."
       invalid_reply_by_email_address: "Värdet måste innehålla '%{reply_key}' och vara annorlunda från e-postaviseringen."
       invalid_alternative_reply_by_email_addresses: "Alla värden måste innehålla '%{reply_key}' och vara annorlunda från e-postaviseringen."
       pop3_polling_host_is_empty: "Du måste ställa in en 'pop3 polling host' innan du aktiverar POP3-polling."
@@ -2038,8 +2077,8 @@ sv:
       email_editable_enabled: "Du måste inaktivera 'e-post kan redigeras' innan du aktiverar den här inställningen."
       staged_users_disabled: "Du måste först aktivera \"arrangerade användare\" innan du aktiverar denna inställning."
       reply_by_email_disabled: "Du måste först aktivera 'svara med e-post' innan du aktiverar denna inställning."
-      sso_url_is_empty: "Du måste ange en 'sso url' innan du aktiverar denna inställning."
-      sso_invite_only: "Du kan inte aktivera sso samt bjuda in enbart samtidigt."
+      discourse_connect_url_is_empty: "Du måste ange en 'discourse connect url' innan du aktiverar denna inställning."
+      discourse_connect_invite_only: "Du kan inte aktivera DiscourseConnect och bara bjuda in samtidigt."
       enable_local_logins_disabled: "Du måste först 'aktivera lokala inloggningar' innan du aktiverar denna inställning."
       min_username_length_exists: "Du kan inte ställa in kortast tillåtna längd på användarnamn till att vara längre än det kortaste användarnamnet (%{username})."
       min_username_length_range: "Du kan inte ställa in minimum till att vara högre än maximum"
@@ -2048,19 +2087,17 @@ sv:
       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 till att vara större än eller lika med 1 eller mindre än 'category_search_priority_very_low_weight'."
-        high_weight_invalid: "Du kan inte ställa in vikten till att vara mindre än eller lika med 1 eller större än 'category_search_priority_very_high_weight'."
-        very_high_weight_invalid: "Du kan inte ställa in vikten till att vara mindre än 'category_search_priority_high_weight'."
+        low_weight_invalid: "Du kan inte ställa in vikten till större eller lika med 1."
+        high_weight_invalid: "Du kan inte ställa in vikten till mindre eller lika med 1."
       allowed_unicode_usernames:
         regex_invalid: "Det reguljära uttrycket är ogiltigt: %{error}"
         leading_trailing_slash: "Det reguljära uttrycket får inte börja och sluta med ett snedstreck."
       unicode_usernames_avatars: "De interna systemavatarerna stöder inte Unicode-användarnamn."
       list_value_count: "Listan måste innehålla exakt %{count} värden."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.exempel.se"
-        value: "SSO-hemlighet"
+        value: "DiscourseConnect-hemlighet"
   search:
     extreme_load_error: "Webbplatsen är högt belastad, sökning är inaktiverad, försök igen senare"
     within_post: "#%{post_number} av %{username}"
@@ -2071,20 +2108,22 @@ sv:
     results_page: "Sökresultat för '%{term}'"
     audio: "[audio]"
     video: "[video]"
-  sso:
+  discourse_connect:
     login_error: "Inloggningsfel"
     not_found: "Ditt konto kunde inte hittas. Vi ber dig kontakta forumets administratör."
-    account_not_approved: "Ditt konto inväntar godkännande. Du kommer få en e-postavisering när ditt konto har godkänts."
+    account_not_approved: "Ditt konto inväntar godkännande. Du får en e-postavisering när ditt konto har godkänts."
     unknown_error: "Det har uppstått ett problem med ditt konto. Vi ber dig kontakta forumets administratör."
-    timeout_expired: "Inloggningen avbröts, försök logga in på nytt."
+    timeout_expired: "Kontoinloggningen har gått ut, försök att logga in igen."
     no_email: "Ingen e-postadress angavs. Vi ber dig kontakta webbplatsens administratör."
-    blank_id_error: "'external_id' krävs, men var tomt"
+    blank_id_error: "`external_id` krävs, men var tomt"
     email_error: "Ett konto kunde inte registreras med e-postadressen <b>%{email}</b>. Vi ber dig kontakta webbplatsens administratör."
-    missing_secret: "SSO-autentisering misslyckades på grund av saknad hemlighet. Kontakta webbplatsens administratör för att åtgärda problemet."
+    missing_secret: "Autentisering misslyckades på grund av saknad hemlighet. Kontakta webbplatsens administratör för att åtgärda problemet."
+    invite_redeem_failed: "Inbjudan kunde inte lösas in. Kontakta webbplatsens administratör."
   original_poster: "Ursprunglig skribent"
   most_posts: "Flest inlägg"
   most_recent_poster: "Senaste skribent"
   frequent_poster: "Flitig skribent"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "Välkommen till vårt forum! De här är våra mest populära nya ämnen."
     not_seen_in_a_month: "Välkommen tillbaka! Vi har inte sett dig på ett tag. Dessa ämnen var mest aktiva medan du var borta."
@@ -2095,6 +2134,7 @@ sv:
     errors:
       different_topics: "Inlägg som härrör sig till olika ämnen kan inte läggas ihop."
       different_users: "Inlägg som tillhör olika användare kan inte läggas ihop."
+      max_post_length: "Inlägg kan inte slås samman eftersom kombinerad inläggslängd är längre än den tillåtna."
   move_posts:
     new_topic_moderator_post:
       one: "Ett inlägg delades upp till ett nytt ämne: %{topic_link}"
@@ -2218,6 +2258,18 @@ sv:
   admin:
     email:
       sent_test: "skickat!"
+    user:
+      merge_user:
+        updating_username: "Uppdaterar användarnamn..."
+        changing_post_ownership: "Ändrar äganderätt till inlägget..."
+        merging_given_daily_likes: "Sammanslagning av dagliga gillanden..."
+        merging_post_timings: "Sammanslagning av tidpunkter för inlägg..."
+        merging_user_visits: "Sammanslagning av användarbesök..."
+        updating_site_settings: "Uppdaterar webbplatsinställningar..."
+        updating_user_stats: "Uppdaterar användarstatistik..."
+        merging_user_attributes: "Sammanslagning av användarattribut..."
+        updating_user_ids: "Uppdaterar användar-id..."
+        deleting_source_user: "Tar bort källanvändare..."
   user:
     deactivated: "Inaktiverades på grund av för många studsade e-postmeddelanden till '%{email}'."
     deactivated_by_staff: "Avaktiverades av personalen"
@@ -2255,6 +2307,8 @@ sv:
       fixed_primary_email: "Fast primär e-postadress för påhittade användare"
       same_ip_address: "Samma IP-adress (%{ip_address}) som andra användare"
       inactive_user: "Inaktiv användare"
+      reviewable_reject_auto: "Automatisk hantering av köade granskningsbara"
+      reviewable_reject: "Granskningsbar användare avvisades"
     email_in_spam_header: "Användarens första e-post flaggades som skräppost"
     already_silenced: "Användaren har redan tystats av %{staff} %{time_ago}."
     already_suspended: "Användaren har redan avstängts av %{staff} %{time_ago}."
@@ -2473,6 +2527,19 @@ sv:
         Ett flertal forummedlemmar flaggade det här meddelandet innan det doldes. **Eftersom ditt inlägg har dolts mer än en gång kommer det att förbli dolt tills ärendet har hanterats av personalen.**
 
         För ytterligare information, se våra [gemensamma riktlinjer](%{base_url}/guidelines).
+    queued_by_staff:
+      title: "Inlägget måste godkännas"
+      subject_template: "Inlägg dolt av personalen i väntan på godkännande"
+      text_body_template: |
+        Hej,
+
+        Detta är ett automatiserat meddelande från %{site_name} för att informera dig om att ditt inlägg är dolt.
+
+        <%{base_url}%{url}>
+
+        Ditt inlägg förblir dolt tills personalen kan granska det.
+
+        För mer information, se våra [forumriktlinjer](%{base_url}/guidelines).
     flags_disagreed:
       title: "Flaggat inlägg återställt av personal"
       subject_template: "Flaggat inlägg återställt av personal"
@@ -2493,21 +2560,19 @@ sv:
       title: "Flaggat inlägg raderat av personal"
       subject_template: "Flaggat inlägg raderat av personal"
       text_body_template: |
-        Hejsan,
+        Hej,
 
-        Detta är ett automatiskt meddelande från %{site_name} för att informera dig om att [ditt inlägg](%{base_url}%{url}) togs bort.
+        Det här är ett automatiskt meddelande från %{site_name} för att informera dig om att [ditt inlägg](%{base_url}%{url}) har tagits bort.
 
         %{flag_reason}
 
-        Detta inlägg flaggades av forumet och personalen valde att radera det.
+        Det här inlägget flaggades av forumet och personalen valde att ta bort det.
 
-        [details="Klicka för att expandera raderade inlägget"]
         ``` markdown
         %{flagged_post_raw_content}
         ```
-        [/details]
 
-        Läs våra [forumriktlinjer](%{base_url}/riktlinjer) för mer information.
+        Läs mer ingående information i våra [forumriktlinjer](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
         För att få ett par tips och förslag hur du kommer igång som ny användare, [gå till detta blogginlägg](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2547,9 +2612,11 @@ sv:
     tl2_promotion_message:
       subject_template: "Grattis till din högre förtroendenivå!"
       text_body_template: |
-        Vi har gett dig en högre [förtroendenivå](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+        Vi har uppgraderat dig till en annan [tillitsnivå] (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
 
-        Vi hoppas att du fortsätter att engagera dig - vi tycker om att ha dig här!
+        Som erfaren användare kanske du uppskattar [denna lista med praktiska tips och tricks] (https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
+        Vi välkomnar dig att fortsätta engagera dig — vi tycker om att ha dig i närheten.
     backup_succeeded:
       title: "Säkerhetskopieringen var framgångsrik"
       subject_template: "Säkerhetskopia skapades utan problem"
@@ -2743,7 +2810,18 @@ 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\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 rubriken Meddelande-id i e-postmeddelandet ha modifierats.\n"
+      text_body_template: |
+        Tyvärr fungerade inte ditt e-postmeddelande till %{destination} (med titeln %{former_title}).
+
+        Här är några saker att kontrollera:
+
+          - Använder du mer än en e-postadress? Svarade du från en annan e-postadress än den du använde ursprungligen? Svar per e-post kräver att du använder samma e-postadress när du svarar.
+
+          - Använde din e-postprogramvara korrekt Svar till-e-postadress när du svarade? Tyvärr skickar vissa e-postprogram felaktigt svar till Från-adressen vilket inte fungerar.
+
+          - Modifierades rubriken Meddelande-ID i e-postmeddelandet? Meddelande-ID måste vara konsekvent och oförändrat.
+
+        Behöver du mer hjälp? Nå oss via Kontakta oss på %{base_url}/about
     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"
@@ -3082,20 +3160,16 @@ sv:
       title: "Konto avstängt"
       subject_template: "[%{email_prefix}] Ditt konto har stängts av"
       text_body_template: |
-        Du har blivit avstängd från forumet tills %{suspended_till}.
+        Du har blivit avstängd från forumet till och med %{suspended_till}.
 
-        %{reason}
-
-        %{message}
+        Orsak - %{reason}
     account_silenced:
       title: "Konto tystat"
       subject_template: "[%{email_prefix}] Ditt konto har tystats"
       text_body_template: |
-        Du har tystats från forumet tills %{silenced_till}.
+        Du har tystats i forumet till och med %{silenced_till}.
 
-        %{reason}
-
-        %{message}
+        Orsak - %{reason}
     account_exists:
       title: "Konto finns redan"
       subject_template: "[%{email_prefix}] Konto finns redan"
@@ -3220,6 +3294,13 @@ sv:
       title: "Ny medlem efter godkännande"
       subject_template: "Du har blivit godkänd på %{site_name}!"
       text_body_template: "Välkommen till %{site_name}! \n\nEn administratör har godkänt ditt konto hos %{site_name}.\n\nDu har nu tillgång till ditt nya konto genom att logga in från:\n%{base_url}\n\nOm länken ovan inte går att klicka på kan du kopiera och klistra in länken i adressfältet i din webbläsare.\n\n%{new_user_tips}\n\nVi tror på ett [civiliserat beteende i forumet](%{base_url}/guidelines) vid alla tillfällen.\n\nNjut av din vistelse!\n"
+    signup_after_reject:
+      title: "Registrering efter avslag"
+      subject_template: "Du har avvisats på %{site_name}"
+      text_body_template: |
+        Personal avvisade ditt konto på %{site_name}.
+
+        %{reject_reason}
     signup:
       title: "Bli medlem"
       subject_template: "%{email_prefix} Bekräfta ditt nya konto"
@@ -3246,8 +3327,16 @@ 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, ber vi dig [granska dina befintliga sessioner](%{base_url}/my/preferences/account) samt överväga att ändra ditt lösenord.\n"
+    post_approved:
+      title: "Ditt inlägg godkändes"
+      subject_template: "[%{site_name}] Ditt inlägg godkändes"
+      text_body_template: |
+        Hej,
+
+        Detta är ett automatiserat meddelande från %{site_name} för att meddela dig om att [ditt inlägg](%{base_url}%{post_url}) godkändes.
   page_forbidden:
     title: "Hoppsan! Den sidan är privat."
+  site_setting_missing: "Webbplatsinställningen `%{name}` måste ställas in."
   page_not_found:
     title: "Hoppsan! Den sidan finns inte eller så är den privat."
     popular_topics: "Populära"
@@ -3534,6 +3623,7 @@ sv:
     mass_award:
       errors:
         invalid_csv: Vi stötte på ett fel på rad %{line_number}. Bekräfta att CSV har en e-postadress per rad.
+        badge_disabled: Aktivera först utmärkelsen %{badge_name}.
     editor:
       name: Redigerare
       description: Första inläggsredigeringen
@@ -3804,8 +3894,8 @@ sv:
       synonym: 'Synonymer tillåts inte. Använd "%{tag_name}" istället.'
       has_synonyms: '"%{tag_name}" kan inte användas eftersom den har synonymer.'
     required_tags_from_group:
-      one: "Du måste inkludera åtminstone %{count} %{tag_group_name} tagg."
-      other: "Du måste inkludera åtminstone %{count} %{tag_group_name} taggar."
+      one: "Du måste omfatta minst %{count} %{tag_group_name}-tagg. Taggarna i den här gruppen är: %{tags}."
+      other: "Du måste omfatta minst %{count} %{tag_group_name}-taggar. Taggarna i den här gruppen är: %{tags}."
     invalid_target_tag: "kan inte vara en synonym till en synonym"
     synonyms_exist: "tillåts inte medan synonymer finns"
   rss_by_tag: "Ämnen taggade med %{tag}"
@@ -3957,9 +4047,6 @@ sv:
                 label: "Kategorilådor"
               categories_boxes_with_topics:
                 label: "Kategorilådor med ämnen"
-      emoji:
-        title: "Emoji"
-        description: "Vilken emojistil föredrar du för ditt forum? Du kan lägga till fler anpassade emojier senare via Admin > Anpassa > Emoji."
       invites:
         title: "Invitera personal"
         description: "Du är nästan klar! Låt oss bjuda in lite folk som kan hjälpa till med att <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>fylla dina diskussioner</a> med intressanta ämnen och svar för att komma igång med ditt forum."
@@ -4000,6 +4087,7 @@ sv:
       restored: Återställd
   reviewables:
     already_handled: "Tack, men vi har redan granskat det inlägget och beslutat att det inte behöver flaggas igen."
+    already_handled_and_user_not_exist: "Tack, men någon har redan granskat detta och den användaren finns inte längre."
     priorities:
       low: "Låg"
       medium: "Medium"
@@ -4019,7 +4107,7 @@ sv:
       new_topics_unless_trust_level: "Användare med låg förtroendenivå måste få ämnen godkända av personalen. Se `approve_new_topics_unless_trust_level`."
       fast_typer: "Ny användare skrev sitt första inlägg misstänkt snabbt, alltså misstänkt bot eller skräppostarbeteende. Se `min_first_post_typing_time`."
       auto_silence_regexp: "Ny användare vars första inlägg matchar inställningen `auto_silence_first_post_regex`."
-      watched_word: "Detta inlägg innehåller ett bevakat ord. Se din <a href='%{base_url}/admin/logs/watched_words'>lista över bevakade ord</a>."
+      watched_word: "Detta inlägg innehöll ett bevakat ord. Se din <a href='%{base_url}/admin/customize/watched_words'>lista över bevakade ord</a>."
       staged: "Nya ämnen och inlägg för arrangerade användare måste godkännas av personalen. Se `approve_unless_staged`."
       category: "Inlägg i denna kategori kräver manuellt godkännande av personalen. Se kategoriinställningarna."
       must_approve_users: "Alla nya användare måste godkännas av personalen. Se `must_approve_users`."
@@ -4028,6 +4116,7 @@ sv:
       email_spam: "Det här e-postmeddelandet flaggades som skräppost av rubriken som definierats i `email_in_spam_header."
       suspect_user: "Denna nya användare angav profilinformation utan att ha läst några ämnen eller inlägg, vilket mycket sannolikt betyder att det kan röra sig om en skräppostare. Se `approve_suspect_users`."
       contains_media: "Detta inlägg omfattar inbäddade medier. Se `review_media_unless_trust_level`."
+      queued_by_staff: "Personalen tycker att det här inlägget behöver granskas. Det kommer att förbli dolt fram till dess."
     actions:
       agree:
         title: "Godkänn..."
@@ -4097,6 +4186,17 @@ sv:
           description: "Användaren kommer att raderas, och vi blockerar också hens IP och e-postadress."
       reject:
         title: "Avvisa"
+        bundle_title: "Avvisa..."
+      reject_and_suspend:
+        title: "Avvisa och stäng av användare"
+      reject_and_silence:
+        title: "Avvisa och tysta användare"
+      reject_and_delete:
+        title: "Avvisa och radera inlägget"
+      reject_and_keep_deleted:
+        title: "Behåll inlägg raderat"
+      approve_and_restore:
+        title: "Godkänn och återställ inlägg"
       delete_user:
         title: "Ta bort användare"
         confirm: "Är du säker på att du vill radera den här användaren? Detta kommer att ta bort användarens alla inlägg och blockera användarens e-postadress och IP-adress."
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index 57ce813a04..af3c6408ac 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -15,6 +15,7 @@ sw:
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
+      no_day: "%Y %B"
   date:
     month_names:
     - null
@@ -38,6 +39,7 @@ sw:
   title: "Discourse"
   topics: "Mada"
   posts: "machapisho"
+  views: "Imeonwa"
   loading: "Inapakuliwa"
   powered_by_html: 'Imetengenezwa na <a href="https://www.discourse.org">Discourse</a>, inaonekana vizuri ukiruhusu JavaScript'
   sign_up: "Jiunge"
@@ -48,6 +50,8 @@ sw:
   anonymous: "Mtumiaji Asiyejulikana"
   remove_posts_deleted_by_author: "Imefutwa na Mwandishi"
   redirect_warning: "Tumeshindwa kuthibitisha kua kiungo ulichokichagua kipo kwenye hii jamii. Kama ungependa kuendelea, chagua kiungo hapo chini."
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} za %{username}"
   themes:
     other_error: "Tatizo limetokea kwenye kusasisha mandhari"
     import_error:
@@ -128,6 +132,8 @@ sw:
     conflicting_google_user_id: 'Utambulisho wa Akaunti ya Google imebadilishwa; msaidizi ataipitia kwa ajili ya sababu za ulinzi. Tafadhali wasiliana na msaidizi na waonyeshe <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   invite:
     user_exists: "Hakuna haja ya kumualika <b>%{email}</b>, tayaru wana <a href='%{base_path}/u/%{username}/summary'>miliki akaunti!</a>"
+    disabled_errors:
+      invalid_access: "Hauna ruhusa kuona rasilimali uliyoomba kuona."
   bulk_invite:
     file_should_be_csv: "Faili unalopakia inabidi liwe na csv umbizo "
     error: "Tatizo limetokea wakati wa kupakia faili. Tafadhali jaribu tena."
@@ -152,6 +158,9 @@ sw:
     loading: "Inapakua Majadiliano..."
     permalink: "Kiungo cha mtandao cha Mda Mrefu"
     in_reply_to: "▶ %{username}"
+    replies:
+      one: "%{count} jibu"
+      other: "%{count} majibu"
     created: "Imetengenezwa"
   no_mentions_allowed: "Samahani, hauwezi kutaja watumiaji wengine."
   no_mentions_allowed_newuser: "Samahani, watumiaji wapya hawawezi kutaja watumiaji wengine."
@@ -174,6 +183,9 @@ 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}'"
+  rss_num_posts:
+    one: "%{count} chapisho"
+    other: "%{count} machapisho"
   read_full_topic: "Soma mada yote"
   private_message_abbrev: "Msg"
   rss_description:
@@ -224,26 +236,9 @@ sw:
     request_membership_pm:
       title: "Ombi la Uanachama wa @%{group_name}"
   education:
-    "new-topic": |
-      Karibu kwenye %{site_name} &mdash; **asante kwa kuanzisha majadiliano mapya!**
-
-      - Je kichwa cha habari ni kizuri ukikisoma kwa sauti? Je Muhtasari ni nzuri?
-
-      - Nani angependa kusoma hiki? Kwa nini ni muhimu? Unategemea upate majibu ya aina gani?
-
-      - Tumia maneno ambayo yanatumika mara kwa mara kwenye mada zako ili watu wengine waweze *kupata* ulichoandika. Kuweka mada yako pamoja na zingine zinazoendana na yako, chagua kategoria.
-
-      Kwa taarifa zaidi, [angalia mwongozo wa jamii yetu](%{base_path}/mwongozo). Paneli hii itatokea wakati wa %{education_posts_text} ya kwanza tu.
-    "new-reply": |
-      Karibu kwenye %{site_name} &mdash; **asante kwa kuchangia!**
-
-      - Jibu lako linaendeleza majadiliano kwa njia moja au nyingine?
-
-      - Kuwa mstaarabu na wanachama wenzako.
-
-      - Ukosoaji Unaendeleza unakaribishwa, ila kosoa *fikra au wazo*, sio watu.
-
-      Kwa mengine zaidi, [angalia mwongozo wa jamii](%{base_path}/mwongozo). Paneli hii itatokea wakati wa %{education_posts_text} tu.
+    until_posts:
+      one: "%{count} chapisho"
+      other: "%{count} machapisho"
     avatar: |2
        ### Unaonaje ukiongeza picha kwenye akaunti yako?
 
@@ -379,26 +374,53 @@ sw:
     slow_down: "Umefanya kitendo hiki mara nyingi sana, tafadhali jaribu tena baadae."
     too_many_requests: "Umefanya kitendo hiki mara nyingi sana. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
     by_type:
-      first_day_replies_per_day: "Umefika kiwango cha juu cha majibu mtumiaji mpya anaweza kutengeneza ndani ya siku yake ya kwanza. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
-      first_day_topics_per_day: "Umefika kiwango cha juu cha mada mtumiaji mpya anaweza kutengeneza ndani ya siku yake ya kwanza. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
-      create_topic: "Unatengeneza machapisho kwa haraka sana. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
-      create_post: "Unajibu machapisho kwa haraka sana. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
-      delete_post: "Unafuta machapisho kwa haraka sana. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
-      public_group_membership: "Unajiunga/kuacha vikundi kwa haraka sana. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
-      topics_per_day: "Umefika kiwango cha juu cha kutengeneza mada mpya. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
-      pms_per_day: "Umefika kiwango cha juu cha ujumbe. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
-      create_like: "Umefika kiwango cha juu cha upendo. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
-      create_bookmark: "Umefika kiwango cha juu cha mialamisho. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
-      edit_post: "Umefika kiwango cha juu cha uhariri. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
       live_post_counts: "Unaomba idadi ya chapisho zilizo hewani kwa haraka sana. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
       unsubscribe_via_email: "Umefika kiwango cha juu cha kujitoa kupitia barua pepe. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
-      topic_invitations_per_day: "Umefika kiwango cha juu cha kualika watu kwenye mada. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+    hours:
+      one: "saa %{count}"
+      other: "masaa %{count}"
   datetime:
     distance_in_words:
       half_a_minute: "< 1d"
+      less_than_x_seconds:
+        one: "< %{count}s"
+        other: "< %{count}s"
+      x_seconds:
+        one: "%{count}s"
+        other: "%{count}s"
+      x_minutes:
+        one: "%{count}m"
+        other: "%{count}m"
+      about_x_hours:
+        one: "%{count}h"
+        other: "%{count}h"
+      x_days:
+        one: "%{count}d"
+        other: "%{count}d"
+      about_x_months:
+        one: "%{count} miezi"
+        other: "%{count} miezi"
+      x_months:
+        one: "%{count} miezi"
+        other: "%{count} miezi"
+      about_x_years:
+        one: "%{count}y"
+        other: "%{count}y"
+      over_x_years:
+        one: "> %{count}y"
+        other: "> %{count}y"
+      almost_x_years:
+        one: "%{count}y"
+        other: "%{count}y"
     distance_in_words_verbose:
       half_a_minute: "sasa hivi"
       less_than_x_seconds: "sasa hivi"
+      about_x_hours:
+        one: "saa %{count} iliyopita"
+        other: "masaa%{count} yaliyopita"
+      x_days:
+        one: "siku %{count} iliyopita"
+        other: "siku %{count} zilizopita"
   password_reset:
     no_token: "Samahani, kiungo hicho cha kuingia kupitia barua pepe ni cha mda sana. Bonyeza kitufe cha Kuingia na tumia 'Nimesahau nywila' ili upate kiungo kipya."
     choose_new: "Chagua nywila"
@@ -512,9 +534,7 @@ sw:
     stop_watching_topic: "Acha kuangalia mada hii, %{link}"
     mute_topic: "Nyamazisha taarifa zote za mada hii, %{link}"
     unwatch_category: "Acha kuangalia mada zote kwenye %{category}"
-    all: "Usinitumie barua yoyote kutoka %{sitename}"
     different_user_description: "Umeingia kama mtu mwingine tofauti na mtu tuliyemtumia barua pepe. Tafadhali toka, au ingia kwenye hali-tumizi ya mtu asiyejulikana, na jaribu tena."
-    not_found_description: "Samahani hatujaona kujiengua. Inawezekana kiungo kwenye barua pepe yako kimepita mda?"
     log_out: "Toka"
     digest_frequency:
       never: "kamwe"
@@ -596,6 +616,7 @@ sw:
       title: "Upendo"
       xaxis: "Siku"
       yaxis: "Idadi ya upendo mpya"
+      description: "Idadi ya upendo mpya."
     flags:
       title: "Bendera"
       xaxis: "Siku"
@@ -608,6 +629,7 @@ sw:
       title: "Watumiaji kwenye Kila Kiwango cha Uaminifu"
       xaxis: "Kiwango cha Uaminifu"
       yaxis: "Idadi ya Watumiaji"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Watumiaji wa kila aina"
       xaxis: "Aina"
@@ -780,6 +802,8 @@ sw:
     max_image_width: "Kiwango cha juu cha upana wa kijipicha za picha kwenye chapisho"
     max_image_height: "Kiwango cha juu cha urefu wa kijipicha za picha kwenye chapisho"
     add_rel_nofollow_to_user_content: 'Ongeza rel nofollow kwenye maandishi yote mtumiaji aliyotoa, isipokuwa viungo vya ndani (pamoja na kikoa baba). Ukibadilisha hii, lazima urebake machapisho yote na: "rake machapishi:rebake"'
+    blocked_onebox_domains: "Orodha ya anwani za mitandao ambazo hazijawekwa kwenye boxi."
+    allowed_inline_onebox_domains: "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_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."
@@ -804,7 +828,6 @@ sw:
     min_admin_password_length: "Kiwango cha chini cha urefu wa nywila ya Kiongozi."
     password_unique_characters: "Idadi ya chini ya herufi pekee nywila inahitaji."
     block_common_passwords: "Usiruhusu nywila amabazo zipo kati ya nywila 10,000 zinazotumika mara kwa mara."
-    enable_sso: "Ruhusu uingiaji kwa kupitia tovuti ya nje (ONYO: BARUA PEPE ZA WATUMIAJI *LAZIMA* ZITHIBITISHWE NA TOVUTI YA NJE!)"
     enable_local_logins_via_email: "Ruhusu watumiaji kuomba kuingia kupitia kiungo ambacho kitatumwa kupitia barua pepe."
     allow_new_registrations: "Ruhusu usajili wa watumiaji wapya. Ondoa hii kusitisha mtu yoyote kutengeneza akaunti mpya."
     enable_signup_cta: "Onyesha ilani kwa watumiaji wasiojulikana itakayowaambia watengeneze akaunti."
@@ -874,6 +897,7 @@ sw:
     personal_email_time_window_seconds: "Subiria sekunde (n) kabla ya kutuma ujumbe binafsi barua pepe za taarifa, kuwapa watumiaji nafasi kuhariri na kumalizia ujumbe wao."
     title_max_word_length: "Kiwango cha juu cha urefu wa neno, kwenye herufi, kwenye kichwa cha mada inachoruhusiwa."
     allow_uppercase_posts: "Ruhusu herufi kubwa kwenye kichwa cha mada au mwili wa chapisho."
+    dark_mode_none: "Hakuna"
     topic_views_heat_low: "Baada ya kuangaliwa na namba fulani ya watu, namba ya watu walioiangalia itaangaza kwa kiasi kidogo."
     topic_views_heat_medium: "Baada ya kuangaliwa na namba fulani ya watu, namba ya watu walioiangalia itaangaza kwa wastani."
     topic_views_heat_high: "Baada ya kuangaliwa na namba fulani ya watu, namba ya watu walioiangalia itaangaza kwa kiasi kikubwa."
@@ -881,6 +905,7 @@ sw:
     cold_age_days_medium: "Baada ya siku nyingi za majadiliano, tarehe ya mwisho ya shughuli itaangaza kiasi."
     cold_age_days_high: "Baada ya siku hizi nyingi za majadiliano, tarehe ya mwisho ya shughuli itaangaza kiasi."
     newuser_spam_host_threshold: "Mara ngapi mtumiaji mpya anaweza kuchapisha kiungo kwenye komputa mwenyeji ndani ya machapisho ya `newuser_spam_host_threshold` kabla ya taarifa kuitwa barua taka."
+    allowed_spam_host_domains: "Orodha ya vikoa vilivyotengwa kutoka kwenye majaribio ya komputa mwenyeji ya barua taka. Watumiaji wapya hawatazuiliwa kutengeneza machapisho yenye viungo kwenda kwenye vikoa hivi."
     topic_view_duration_hours: "Hesabu utembezi wa mada mpya mara moja kuendana na anwani ya mtandao/Mtumiaji kila baada ya masaa N"
     user_profile_view_duration_hours: "Hesabu utembezi wa mada mpya mara moja kuendana na anwani ya mtandao/Mtumiaji kila baada ya masaa N"
     max_new_accounts_per_registration_ip: "Kama kuna akaunti 0 zenye kiwango (n) cha uaminifu kutoka kwenye anwani hii ya mtandao (na hakuna hata mmoja ambaye ni msaidizi or kwenye kiwango cha 2 cha uaminifu au zaidi), kataa usajili kutoka kwenye anwani hiyo."
@@ -927,7 +952,6 @@ sw:
     default_categories_watching: "Orodha ya kategoria zinazoangaliwa kama chaguo-msingi."
     default_categories_tracking: "Orodha ya kategoria zinazofuatiliwa kama chaguo-msingi."
     default_categories_muted: "Orodha ya kategoria zinazonyamazishwa kama chaguo-msingi."
-    max_api_keys_per_user: "Kiwango cha juu cha funguo za API za mtumiaji kwa kila mtumiaji"
     min_trust_level_for_user_api_key: "Kiwango cha uaminifu kinachohitajika kutengeneza funguo za API za mtumiaji"
     tagging_enabled: "Ruhusu lebo kwenye mada?"
     min_trust_to_create_tag: "kiwango cha chini cha uaminifu kinachohitajika kutengeneza lebo."
@@ -952,7 +976,6 @@ sw:
       reply_by_email_address_is_empty: "Lazima uweke 'jibu kupitia barua pepe' kabla ya kuruhusu jibu kupitia barua pepe."
       staged_users_disabled: "Kwanza ruhusu 'watumiaji walio staged' kabla ya kuruhusu mpangilio huu."
       reply_by_email_disabled: "Kwanza ruhusu 'jibu kupitia barua pepe' kabla ya kuruhusu mpangilio huu."
-      sso_url_is_empty: "Kwanza ruhusu 'sso url' kabla ya kuruhusu mpangilio huu."
       enable_local_logins_disabled: "Kwanza ruhusu 'ruhusu programu-jalizi ' kabla ya kuruhusu mpangilio huu."
       min_username_length_range: "Hauwezi ukaseti kiwango cha chini kiwe zaidi ya kiwango cha juu."
       max_username_length_range: "Hauwezi ukaweka kiwango cha juu kiwe kidogo ya kiwango cha chini."
@@ -963,7 +986,7 @@ sw:
       topic: "Majibu"
       user: "Watumiaji"
     results_page: "Majibu ya utafiti ya '%{term}'"
-  sso:
+  discourse_connect:
     login_error: "Hitilafu Wakati wa Kuingia."
     not_found: "Akaunti yako haijapatikana. Tafadhali wasiliana na msimamizi wa tovuti."
     account_not_approved: "Akaunti yako inasubiria kuthibitishwa. Utapata taarifa kwa barua pepe ukithibitishwa."
@@ -1163,6 +1186,8 @@ sw:
     post_hidden_again:
       title: "Chapisho Limefichwa tena"
       subject_template: "Chapisho limefichwa sababu ya ripoti nyingi za jumuiya, msaidizi amejulishwa"
+    queued_by_staff:
+      title: "Chapisho Linahitaji Kibali"
     welcome_user:
       title: "Karibu Mtumiaji"
       subject_template: "Karibu kwenye %{site_name}!"
@@ -1599,21 +1624,9 @@ sw:
     account_suspended:
       title: "Akaunti Imesimamishwa"
       subject_template: "[%{email_prefix}] Akaunti yako imesimamishwa"
-      text_body_template: |
-        Umesimamishwa kwenye jumuia mpaka %{suspended_till}
-
-        %{reason}
-
-        %{message}
     account_silenced:
       title: "Akaunti imenyamazishwa"
       subject_template: "[%{email_prefix}] Akaunti yako imenyamazishwa"
-      text_body_template: |
-        Umenyamazishwa kwenye jumuia mpaka %{silenced_till}.
-
-        %{reason}
-
-        %{message}
     account_exists:
       title: "Akaunti tayari ipo"
       subject_template: "[%{email_prefix}] Akaunti tayari ipo"
@@ -1686,6 +1699,9 @@ sw:
     confirm_new_email:
       title: "Thibitisha Barua Pepe Mpya"
       subject_template: "[%{email_prefix}] Thibitisha barua pepe mpya"
+    confirm_new_email_via_admin:
+      title: "Thibitisha Barua Pepe Mpya"
+      subject_template: "[%{email_prefix}] Thibitisha barua pepe mpya"
     confirm_old_email:
       title: "Thibitisha Barua pepe ya Zamani"
       subject_template: "[%{email_prefix}] Thibitisha barua pepe ya sasa"
@@ -1787,6 +1803,7 @@ sw:
   color_schemes:
     light: "Hafifu"
     dark: "Nyeusi"
+    default_theme_name: "Halisi"
     light_theme_name: "Hafifu"
     dark_theme_name: "Nyeusi"
   edit_this_page: "Hariri ukurasa huu"
@@ -2126,12 +2143,19 @@ sw:
             description: "Barua pepe ya mtu au kikundi anayesimamia jumuiya hii. Inatumika kwa ajili ya taarifa muhimu sana, mfano ripoti ambazo hazijashughulikiwa, masasisho ya ulinzi, na <a href='%{base_path}/about' target='_blank'>ukurasa kuhusu wewe</a> kwa ajili ya mawasiliano muhimu /kuhusiana"
           contact_url:
             label: "Ukurasa wa Tovuti"
+            placeholder: "https://www.example.com/contact-us"
             description: "Ukurasa wa mawasiliano wa shirika lako. Utaonyeshwa kwenye <a href='%{base_path}/about' target='_blank'>kurasa wa kuhusu wewe</a>."
           site_contact:
             label: "Ujumbe uliotomatiki"
             description: "Ujumbe wote wa kibinafsi utatumwa kutoka kwa mtumiaji huyu, kama ripoti za onyo na ilani ya umalizaji wa chelezo."
       corporate:
         title: "Shirika"
+      colors:
+        title: "Rangi"
+      fonts:
+        fields:
+          font_preview:
+            label: "Kihakiki"
       logos:
         title: "Nembo"
         fields:
@@ -2158,8 +2182,6 @@ sw:
                 label: "Kategoria na Mada za Hivi Karibuni"
               categories_and_top_topics:
                 label: "Kategoria na Mada za Juu"
-      emoji:
-        title: "Emoji"
       invites:
         title: "Alika Wasaidizi"
         description: "Una karibia kumaliza! Karibisha watu kadhaa kusaidia <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>kuanzisha majadiliano</a>na mada nzuri na majibu kufanya jumuiya yako ianze."
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index f8629bcf07..8ab67d3709 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -27,11 +27,14 @@ te:
   title: "డిస్కోర్స్"
   topics: "విషయాలు"
   posts: "టపాలు"
+  views: "చూపులు"
   loading: "లోడవుతోంది"
   sign_up: "సైన్ అప్"
   log_in: "లాగిన్"
   disable_remote_images_download_reason: "సుదూర బొమ్మల దిగుమతి అచేతనమైంది ఎందుకంటే డిస్క్ జాగా తక్కువగా ఉంది."
   anonymous: "అనామక"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "%{username} నుండి #%{post_number}"
   errors: &errors
     format: ! "%{attribute} %{message}"
     messages:
@@ -77,6 +80,9 @@ te:
         other: ! "%{count} దోషాల వల్ల %{model} భద్రపరుచుట వీలవలేదు"
     embed:
       load_from_remote: "ఈ టపా లోడింగులో దోషం"
+  invite:
+    disabled_errors:
+      invalid_access: "అభ్యర్థించిన వనరు వీక్షించడానికి మీకు అనుమతి లేదు."
   backup:
     operation_already_running: "ఒక పరిక్రియ ప్రస్తుతం జరుగుతోంది. కొత్త పని ఇప్పుడు మొదలుపెట్టవీలవదు."
     backup_file_should_be_tar_gz: "బ్యాకప్ దస్త్రం తప్పనిసరి .tar.gz కట్ట అయి ఉండాలి."
@@ -114,6 +120,9 @@ te:
   page_num: "పుట %[num]"
   topics_in_category: "'%{category}' వర్గంలోని విషయాలు"
   rss_posts_in_topic: "'%{topic}' యొక్క ఆర్ యస్ యస్ వడ్డన"
+  rss_num_posts:
+    one: "%{count} టపా"
+    other: "%{count} టపాలు"
   read_full_topic: "పూర్తి విషయం చదువు"
   rss_description:
     latest: "తాజా విషయాలు"
@@ -139,16 +148,6 @@ te:
     until_posts:
       one: "ఒక టపా"
       other: "%{count} టపాలు"
-    "new-reply": |
-      స్వాగతం %{site_name} &mdash; **పాల్గొన్నందుకు ధన్యవాదాలు!**
-
-      - మీ సమాధానం సంభాషణను కొంత మెరుగు పరిచిందా ?
-
-      - తోటి కమ్యూనిటి సభ్యులతో మర్యాదగా ఉండండి .
-
-      - నిర్మాణాత్మక విమర్శలకు స్వాగతం, కానీ *ఆలోచన*లను విమర్శించండి,వ్యక్తులని కాదు.
-
-      మరింత సమాచారం కోసం ,[వర్గ మార్గదర్శక సూత్రాలను చూడండి](%{base_path}/guidelines).ఈ పట్టిక మొదట మీకే కనిపిస్తుంది%{education_posts_text}.
   activerecord:
     attributes:
       category:
@@ -356,6 +355,7 @@ te:
       daily: "ప్రతిరోజూ"
       weekly: "ప్రతీవారం"
   user_api_key:
+    read: "చదివిన"
     otp_confirmation:
       confirm_title: '%{site_name} కు కొనసాగండి'
   reports:
@@ -408,6 +408,7 @@ te:
       title: "ఇష్టాలు"
       xaxis: "రోజు"
       yaxis: "కొత్త ఇష్టాల సంఖ్య"
+      description: "కొత్త ఇష్టాల సంఖ్య."
     flags:
       title: "కేతనాలు"
       xaxis: "రోజు"
@@ -659,6 +660,7 @@ te:
     sender_body_blank: "ముఖ్యభాగం ఖాళీగా ఉంది"
   color_schemes:
     base_theme_name: "ఆధారం"
+    default_theme_name: "అప్రమేయ"
   edit_this_page: "ఈ పేజిని సవరించు"
   csv_export:
     boolean_yes: "అవును"
@@ -742,14 +744,14 @@ te:
             placeholder: "name@example.com"
       corporate:
         title: "సంస్థ"
+      colors:
+        title: "రంగులు"
       homepage:
         fields:
           homepage_style:
             choices:
               categories_only:
                 label: "వర్గాలు మాత్రమే"
-      emoji:
-        title: "ఇమోజి"
   joined: "చేరినారు"
   reviewables:
     actions:
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
index 8ea32b0656..a1cb8cbade 100644
--- a/config/locales/server.th.yml
+++ b/config/locales/server.th.yml
@@ -15,6 +15,7 @@ th:
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
+      no_day: "%Y %B"
   date:
     month_names:
     - null
@@ -38,6 +39,7 @@ th:
   title: "ดิสคอส"
   topics: "หัวข้อ"
   posts: "โพสต์"
+  views: "ดู"
   loading: "กำลังโหลด"
   powered_by_html: 'บอร์ดนี้ใช้<a href="https://www.discourse.org">Discourse</a> จะแสดงได้สมบูรณ์เมื่อเปิดการใช้งาน JavaScript'
   sign_up: "สมัคร"
@@ -46,6 +48,8 @@ th:
   disable_remote_images_download_reason: "ไม่สามารถดาวน์โหลดรูปได้เนื่องจากพื้นที่ไม่เพียงพอ"
   anonymous: "ไม่ระบุชื่อ"
   remove_posts_deleted_by_author: "ถูกลบโดยผู้โพส"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} โดย %{username}"
   emails:
     incoming:
       errors:
@@ -62,6 +66,9 @@ th:
     start_discussion: "เริ่มการสนทนา"
     continue: "ดำเนินการสนทนาต่อ"
     loading: "กำลังโหลดการสนทนา"
+    in_reply_to: "▶ %{username}"
+    replies:
+      other: "%{count} ตอบ"
     created: "สร้างเมื่อ"
   user_is_suspended: "ผู้ใช้ที่ถูกระงับการใช้งานไม่สามารถโพสได้"
   just_posted_that: "คล้ายกับสิ่งคุณเพิ่งโพสมากเกินไป"
@@ -70,6 +77,8 @@ th:
   prev_page: "← หน้าก่อนหน้า"
   page_num: "หน้า %{num}"
   home_title: "หน้าแรก"
+  rss_num_posts:
+    other: "%{count} โพสต์"
   excerpt_image: "รูปภาพ"
   bookmarks:
     reminders:
@@ -78,6 +87,7 @@ th:
       tomorrow: "พรุ่งนี้"
       next_week: "สัปดาห์หน้า"
       next_month: "เดือนหน้า"
+      custom: "วันและเวลาที่กำหนดเอง"
   groups:
     default_names:
       everyone: "ทุกคน"
@@ -99,12 +109,48 @@ th:
   staff_category_name: "ทีมงาน"
   category:
     topic_prefix: "เกี่ยวกับหมวด %{category}"
+  trust_levels:
+    member:
+      title: "สมาชิก"
+    regular:
+      title: "ทั่วไป"
+  rate_limiter:
+    hours:
+      other: "%{count} ชั่วโมง"
   datetime:
     distance_in_words:
       half_a_minute: "< 1 นาที"
+      less_than_x_seconds:
+        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} วัน"
+      about_x_months:
+        other: "%{count}เดือน"
+      x_months:
+        other: "%{count}เดือน"
+      about_x_years:
+        other: "%{count} ปี"
+      over_x_years:
+        other: "> %{count} ปี"
+      almost_x_years:
+        other: "%{count} ปี"
     distance_in_words_verbose:
       half_a_minute: "เมื่อสักครู่นี้"
       less_than_x_seconds: "เมื่อสักครู่นี้"
+      about_x_hours:
+        other: "%{count} ชั่วโมงที่แล้ว"
+      x_days:
+        other: "%{count} วันที่แล้ว"
+      x_months:
+        other: "%{count}เดือนที่แล้ว"
   password_reset:
     choose_new: "เลือกรหัสผู้ใช้ใหม่"
     choose: "เลือกรหัสผู้ใช้"
@@ -143,8 +189,10 @@ th:
       every_month: "ทุกเดือน"
       every_six_months: "ทุกหกเดือน"
   user_api_key:
+    read: "อ่าน"
     otp_confirmation:
       confirm_title: ดำเนินการต่อไปยัง %{site_name}
+      logging_in_as: กำลังเข้าสู่ระบบด้วย %{username}
       confirm_button: เสร็จสิ้นการเข้าสู่ระบบ
   reports:
     post_edits:
@@ -224,6 +272,8 @@ th:
     top_uploads:
       labels:
         filename: ชื่อไฟล์
+  site_settings:
+    dark_mode_none: "ไม่มี"
   search:
     within_post: "#%{post_number} ด้วย %{username}"
     types:
@@ -242,6 +292,8 @@ th:
     email:
       sent_test: "ส่งแล้ว!"
   system_messages:
+    queued_by_staff:
+      title: "โพสต์นี้ต้องได้รับการอนุมัติ"
     welcome_user:
       subject_template: "ยินดีต้อนรับสู่ %{site_name}!"
     welcome_invite:
@@ -350,12 +402,17 @@ th:
       title: "ลืมรหัสผ่าน"
     set_password:
       title: "ตั้งรหัสผ่าน"
+    post_approved:
+      title: "โพสต์ของคุณได้รับการอนุมัติ"
   page_not_found:
     popular_topics: "ยอดนิยม"
     see_more: "อื่น"
     search_title: "ค้นหาเว็บไซต์นี้"
     search_button: "ค้นหา"
+  deleted: "ลบ"
   image: "รูปภาพ"
+  color_schemes:
+    default_theme_name: "ค่าเริ่มต้น"
   csv_export:
     boolean_yes: "ใช่"
     boolean_no: "ไม่ใช่"
@@ -401,18 +458,24 @@ th:
             placeholder: "name@example.com"
       corporate:
         title: "องค์กร"
+      colors:
+        title: "สี"
+      fonts:
+        fields:
+          font_preview:
+            label: "แสดงตัวอย่าง"
       homepage:
         fields:
           homepage_style:
             choices:
               categories_only:
                 label: "หมวดหมู่เท่านั้น"
+              categories_with_featured_topics:
+                label: "หมวดหมู่พร้อมด้วยกระทู้เด่น"
               categories_and_latest_topics:
                 label: "หมวดหมู่และกระทู้ล่าสุด"
               categories_and_top_topics:
                 label: "หมวดหมู่และกระทู้ยอดนิยม"
-      emoji:
-        title: "Emoji"
   joined: "สมัครสมาชิกเมื่อ"
   discourse_push_notifications:
     popup:
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index b6d14dadc9..ac9b4b4c42 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -39,6 +39,7 @@ tr_TR:
   title: "Discourse"
   topics: "Konular"
   posts: "gönderiler"
+  views: "görüntüleme"
   loading: "Yükleniyor"
   powered_by_html: ' <a href="https://www.discourse.org">Discourse</a>tarafından destekleniyor, en iyi şekilde JavaScript etkinleştirildiğinde görüntülenebilir'
   sign_up: "Kayıt Ol"
@@ -50,6 +51,8 @@ tr_TR:
   remove_posts_deleted_by_author: "Yazar tarafından silindi"
   redirect_warning: "Seçtiğiniz bağlantının gerçekten foruma gönderildiğini doğrulayamadık. Yine de devam etmek istiyorsanız, aşağıdaki bağlantıyı seçin."
   on_another_topic: "Başka bir konuda"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "%{username} tarafından #%{post_number}"
   themes:
     bad_color_scheme: "Tema güncellenemiyor, geçersiz renk paleti"
     other_error: "Temanın güncellenmesi sırasında bir sorun oluştu"
@@ -61,6 +64,7 @@ tr_TR:
       unpack_failed: "Dosya çözülemedi"
       file_too_big: "Sıkıştırılmamış dosya çok büyük."
       unknown_file_type: "Yüklediğiniz dosya geçerli bir Discourse teması gibi görünmüyor."
+      not_allowed_theme: "\"%{repo}\", izin verilen temalar listesinde değil (\"allow_theme_repos\" genel ayarını kontrol edin)."
     errors:
       component_no_user_selectable: "Tema bileşenleri kullanıcı tarafından seçilemez"
       component_no_default: "Tema bileşenleri varsayılan tema olamaz"
@@ -157,7 +161,6 @@ tr_TR:
         one: yanlış uzunlukta (%{count} karakter olmalı)
         other: yanlış uzunlukta (%{count} karakter olmalı)
       other_than: "%{count} dışında bir rakam olmalı"
-      sso_overrides_username: "`Sso_overrides_username` ayarı etkin olduğu için kullanıcı adı SSO sağlayıcı tarafında güncellenmelidir."
     template:
       body: ! "Şu alanlarla ilgili problem yaşandı:"
       header:
@@ -184,9 +187,14 @@ tr_TR:
   invite:
     not_found: "Davetiyeniz geçersiz. Lütfen <a href='%{base_url}/about'>yetkili ile iletişime geçin</a> ."
     not_found_json: "Davetiyeniz geçersiz. Lütfen personelle iletişime geçin."
-    error_message: "Davet kabul edilirken bir hata oluştu. Lütfen sitenin yöneticisine başvurun."
+    not_matching_email: "E-posta adresiniz ile davetle ilişkili e-posta adresi eşleşmiyor. Lütfen bir görevliyle iletişime geçin."
+    not_found_template_link: |
+      <p> <a href="%{base_url}">%{site_name}</a> daveti artık kullanılamaz. Lütfen sizi davet eden kişiden yeni bir davetiye göndermesini isteyin.</p>
     user_exists: "<b>%{email}</b> kişisinin <a href='%{base_path}/u/%{username}/summary'>zaten bir hesabı var!</a>"
+    invite_exists: "<b>%{email}</b> adresini daha önce davet ettiniz."
     confirm_email: "<p> Neredeyse bitti! E-posta adresinize bir aktivasyon postası gönderdik. Lütfen hesabınızı etkinleştirmek için postadaki talimatları izleyin. </p><p> Gelmezse, spam klasörünüzü kontrol edin. </p>"
+    disabled_errors:
+      invalid_access: "İstenilen kaynağı görüntüleyebilmeniz için izniniz yok."
   bulk_invite:
     file_should_be_csv: "Yüklenen dosya csv formatında olmalıdır."
     max_rows: "İlk olarak %{max_bulk_invites} davetiyeleri gönderildi. Dosyayı daha küçük parçalara bölmeyi deneyin."
@@ -194,6 +202,7 @@ tr_TR:
   topic_invite:
     failed_to_invite: "Kullanıcı, aşağıdaki gruplardan birinde grup üyeliği olmadan bu konuya davet edilemez: %{group_names}."
     user_exists: "Üzgünüz, bu kullanıcı zaten davet edildi. Konuya yalnızca bir kullanıcı davet edebilirsiniz."
+    muted_topic: "Üzgünüz, o kullanıcı bu konuyu sessize aldı."
   backup:
     operation_already_running: "Devam eden bir işlem var. Yeni bir işlem başlatılamaz."
     backup_file_should_be_tar_gz: "Yedekleme dosyası .tar.gz uzantılı olmalı."
@@ -208,7 +217,7 @@ tr_TR:
   not_found: "İstenilen URL ya da kaynak bulunamadı."
   invalid_access: "İstenilen kaynağı görüntüleyebilmeniz için izniniz yok."
   authenticator_not_found: "Kimlik doğrulama yöntemi mevcut değil veya devre dışı bırakıldı."
-  invalid_api_credentials: "İstenilen kaynağı görüntülemenize izin verilmiyor. API kullanıcı adı veya şifresi geçersiz."
+  invalid_api_credentials: "İstenilen kaynağı görüntülemenize izin verilmiyor. API kullanıcı adı veya parolası geçersiz."
   provider_not_enabled: "İstenilen kaynağı görüntülemenize izin verilmiyor. Kimlik doğrulama kontrolü etkin değil."
   provider_not_found: "İstenilen kaynağı görüntülemenize izin verilmiyor. Kimlik doğrulama sağlayıcısı mevcut değil."
   read_only_mode_enabled: "Bu site sadece okuma modunda. Eylemler devre dışı."
@@ -281,6 +290,7 @@ tr_TR:
   pm_reached_recipients_limit: "Maalesef bir mesajı %{recipients_limit} alıcıdan daha fazlasına gönderemezsiniz."
   removed_direct_reply_full_quotes: "Otomatik olarak önceki tüm gönderilerin alıntıları kaldırıldı."
   secure_upload_not_allowed_in_public_topic: "Maalesef, aşağıdaki güvenli yükleme (ler) herkese açık bir konuda kullanılamaz: %{upload_filenames}."
+  create_pm_on_existing_topic: "Üzgünüz, mevcut bir konuda PM oluşturamazsınız."
   just_posted_that: "yakın zamanda yaptığınız bir gönderiye çok benziyor"
   invalid_characters: "geçersiz karakterler barındırıyor"
   is_invalid: "belirsiz görünüyor, bu tamamlanmış bir cümle mi?"
@@ -291,6 +301,9 @@ 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ışı"
+  rss_num_posts:
+    one: "%{count} gönderi"
+    other: "%{count} gönderi"
   read_full_topic: "Konunun tamamını okuyun"
   private_message_abbrev: "İlt"
   rss_description:
@@ -320,6 +333,7 @@ tr_TR:
     reminders:
       at_desktop: "Bir dahaki sefere masaüstümdeyim"
       later_today: "Bugün ilerleyen saatlerde"
+      next_business_day: "Bir sonraki iş günü"
       tomorrow: "Yarın"
       next_week: "Gelecek hafta"
       next_month: "Gelecek ay"
@@ -357,26 +371,6 @@ tr_TR:
     until_posts:
       one: "%{count} gönderi"
       other: "%{count} gönderi"
-    "new-topic": |
-      %{site_name} topluluğuna hoş geldiniz &mdash; **yeni bir sohbet başlattığınız için teşekkür ederiz! **
-
-      - Yüksek sesle okuduğunuzda başlık ilgi çekici geliyor mu? İyi bir özet mi?
-
-      - Bununla kim ilgilenirdi? Neden önemli? Ne gibi cevaplar almayı diliyorsunuz?
-
-      - Diğerlerinin de kolayca *bulabilmesi * için konunuzun içerisine sıkça kullanılan kelimeler dahil edin. Konunuzun benzer konularla gruplanması için bir kategori seçin.
-
-      Daha fazlası için, [topluluk yönergelerimize bakın](%{base_path}/guidelines). Bu panel sadece ilk %{education_posts_text} için görünür.
-    "new-reply": |
-      %{site_name} topluluğuna hoş geldiniz &mdash; **katılımınız için teşekkür ederiz!**
-
-      - Cevabınız sohbeti bir şekilde geliştiriyor mu?
-
-      - Topluluğun diğer üyelerine karşı nazik olun.
-
-      - Yapıcı eleştirici her zaman kabul edilir, ama *fikirleri* eleştirin, insanları değil.
-
-      Daha fazlası için, [topluluk yönergelerimize bakın](%{base_path}/guidelines). Bu yazı sadece ilk %{education_posts_text} için görünür.
     avatar: |
       ### Hesabınız için bir resime ne dersiniz?
 
@@ -432,11 +426,11 @@ tr_TR:
               same_as_email: "e-posta adresinizle aynı. Lütfen daha güvenli bir parola seçiniz."
               same_as_current: "şimdiki parolanızla aynı."
               same_as_name: "adınızla aynı."
-              unique_characters: "çok fazla tekrarlanan karakter var. Lütfen daha güvenli bir şifre kullanın."
+              unique_characters: "çok fazla tekrarlanan karakter var. Lütfen daha güvenli bir parola kullanın."
             username:
-              same_as_password: "şifrenizle aynı."
+              same_as_password: "parolanızla aynı."
             name:
-              same_as_password: "şifrenizle aynı."
+              same_as_password: "parolanızla aynı."
             ip_address:
               signup_not_allowed: "Bu hesaptan yeni kayıt oluşturulmasına izin verilmiyor."
         user_email:
@@ -462,6 +456,9 @@ tr_TR:
           attributes:
             execute_at:
               in_the_past: "gelecekte olmalı."
+            duration_minutes:
+              cannot_be_zero: "Sıfırdan büyük olmalıdır."
+              exceeds_maximum: "20 yıldan fazla olamaz."
         translation_overrides:
           attributes:
             value:
@@ -564,20 +561,8 @@ tr_TR:
     slow_down: "Bu işlemi çok fazla yaptınız, lütfen daha sonra tekrar deneyin."
     too_many_requests: "Bu işlemi çok defa yaptınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
     by_type:
-      first_day_replies_per_day: "Yeni bir kullanıcının ilk günlerinde oluşturabileceği maksimum yanıt sayısına ulaştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      first_day_topics_per_day: "Yeni bir kullanıcının ilk gününde oluşturabileceği maksimum konu sayısına ulaştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      create_topic: "Çok hızlı bir şekilde yeni konu oluşturuyorsunuz. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      create_post: "Çok hızlı cevap veriyorsun. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      delete_post: "Gönderileri çok hızlı siliyorsunuz. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      public_group_membership: "Gruplara çok sık katılıyor/ayrılıyorsunuz. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      topics_per_day: "Maksimum yeni konu sayısına ulaştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      pms_per_day: "Maksimum mesaj sayısına ulaştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      create_like: "Maksimum beğeniye ulaştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      create_bookmark: "Maksimum yer imi sayısına ulaştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      edit_post: "Maksimum düzenleme sayısına ulaştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
       live_post_counts: "Çok hızlı bir şekilde canlı yayın sayımı istiyorsunuz. Lütfen tekrar denemeden önce %{time_left} bekleyin."
       unsubscribe_via_email: "E-postayla maksimum abonelik iptali sayısına ulaştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      topic_invitations_per_day: "Maksimum sayıda konu davetiyesine ulaştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
     hours:
       one: "%{count} saat"
       other: "%{count} saat"
@@ -659,15 +644,15 @@ tr_TR:
         other: "neredeyse %{count} yıl önce"
   password_reset:
     no_token: "Üzgünüz, bu parola değiştirme bağlantısı çok eski. Yeni bir bağlantı almak için lütfen 'Giriş Yap' tuşuna basın ve 'Parolamı unuttum'u seçin."
-    choose_new: "Yeni bir şifre seç"
-    choose: "Şifre seç"
+    choose_new: "Yeni bir parola seç"
+    choose: "Parola seç"
     update: "Parolayı Güncelle"
     save: "Parola Belirle"
     title: "Parola Sıfırla"
     success: "Parolanızı başarıyla değiştirdiniz ve giriş yaptınız."
     success_unapproved: "Parolanızı başarıyla değiştirdiniz."
   email_login:
-    invalid_token: "Maalesef, bu e-posta bağlantısı çok eski. Oturum Aç butonuna tıklayın ve yeni bir bağlantı almak için &#39;Şifremi unuttum&#39; seçeneğini kullanın."
+    invalid_token: "Maalesef, bu e-posta bağlantısı çok eski. Oturum Aç butonuna tıklayın ve yeni bir bağlantı almak için 'Parolamı unuttum' seçeneğini kullanın."
     title: "Eposta girişi"
   user_auth_tokens:
     browser:
@@ -681,7 +666,6 @@ tr_TR:
       unknown: "bilinmeyen tarayıcı"
     device:
       android: "Android Cihazı"
-      chromebook: "Chromebook"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -692,7 +676,6 @@ tr_TR:
       unknown: "tanımlanmamış cihaz"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
       ios: "iOS"
       linux: "Linux"
       macos: "MacOS"
@@ -706,6 +689,7 @@ tr_TR:
     error_staged: "E-posta adresiniz değiştirilirken bir hata oluştu. Bu adres zaten başka bir kullanıcı tarafından kullanımdadır."
     already_done: "Üzgünüz, bu doğrulama bağlantısı geçerli değil. E-posta adresiniz değiştirilmiş olabilir mi?"
     confirm: "Onayla"
+    max_secondary_emails_error: "İzin verilen maksimum ikincil e-posta sınırına ulaştınız."
     authorizing_new:
       title: "Yeni e-postanı onayla"
     authorizing_old:
@@ -852,9 +836,7 @@ tr_TR:
     mute_topic: "Bu konuya ait tüm bildirimleri sustur, %{link}"
     unwatch_category: "%{category} içerisindeki tüm konuları gözlemeyi durdur"
     mailing_list_mode: "Duyuru listesi modunu kapat"
-    all: "Bana %{sitename} tarafından gelen hiçbir mail gönderme"
     different_user_description: "E-posta gönderdiğimizden farklı bir kullanıcıyla giriş yapmışsınız. Lütfen çıkış yapın, veya anonim moduna geçip tekrar deneyin."
-    not_found_description: "Maalesef, bu aboneliği iptal etemedik. E-postanızdaki bağlantının süresi dolmuş olabilir."
     log_out: "Çıkış"
     submit: "Tercihleri kaydet"
     digest_frequency:
@@ -1233,14 +1215,11 @@ tr_TR:
       other: "E-posta taraması, son 24 saat içinde %{count} adet hata üretti. Daha fazla ayrıntı <a href='%{base_path}/logs' target='_blank'>için günlüklere</a> bakın."
     missing_mailgun_api_key: "Sunucu, Mailgun üzerinden e-posta gönderecek şekilde yapılandırılmış, ancak webhook iletilerini doğrulamak için kullanılan bir API anahtarı sağlamadınız."
     bad_favicon_url: "Minik simge yüklemesi başarısız oldu. <a href='%{base_path}/admin/site_settings'>Site Ayarları</a>ndan favicon_url alanını kontrol edin."
-    deprecated_api_usage: "Kullanımdan kaldırılmış bir kimlik doğrulama yöntemi kullanarak bir API isteği tespit ettik. Lütfen <a href='https://meta.discourse.org/t/-/22706'>başlık tabanlı kimlik doğrulamasını</a> kullanmak için güncelleyin. Güncellemeden sonra bu mesajın kaybolması 24 saat sürebilir."
-    update_mail_receiver: "Posta alıcısının eski bir sürümünü tespit ettik. Güncelleme talimatları için <a href='https://meta.discourse.org/t/-/133491'>buraya</a> tıklayın. Güncellemeden sonra bu mesajın kaybolması 24 saat sürebilir."
     poll_pop3_timeout: "POP3 sunucusuna bağlantı zaman aşımına uğradı. Gelen e-posta alınamadı. Lütfen <a href='%{base_path}/admin/site_settings/category/email'>POP3 ayarlarınızı</a> ve servis sağlayıcınızı kontrol edin."
     poll_pop3_auth_error: "POP3 sunucusuna bağlantı bir kimlik doğrulama hatası sebebiyle başarısız oluyor. Lütfen <a href='%{base_path}/admin/site_settings/category/email'>POP3 ayarlarınızı</a> kontrol edin."
     force_https_warning: "Web siteniz SSL kullanıyor. Ancak site ayarlarınızda ` <a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https`</a> henüz etkin değil."
     out_of_date_themes: "Aşağıdaki temalar için güncellemeler mevcuttur:"
     unreachable_themes: "Aşağıdaki temalar için güncellemeleri kontrol edemedik:"
-    watched_word_regexp_error: "İzlenen %{action} kelimeler için normal ifade geçersiz. Lütfen <a href='%{base_path}/admin/logs/watched_words'>İzlenen Kelime ayarlarınızı</a> kontrol edin veya 'izlenen kelimeler normal ifadeler' site ayarını devre dışı bırakın."
   site_settings:
     censored_words: "kelime yerine otomatik olarak &#9632;&#9632;&#9632;&#9632; kullanılacak kelimeler"
     delete_old_hidden_posts: "30 günden fazla süreyle gizli kalan gizlenmiş gönderileri otomatik olarak sil."
@@ -1265,10 +1244,8 @@ tr_TR:
     search_query_log_max_size: "Saklanacak maksimum arama sorgusu miktarı"
     search_query_log_max_retention_days: "Arama sorgularını tutmak için maksimum süre, gün olarak."
     search_ignore_accents: "Metin için arama yaparken aksanları yoksay."
-    category_search_priority_very_low_weight: "Çok düşük kategori öncelikli arama için sıralamada uygulanan ağırlık."
     category_search_priority_low_weight: "Düşük kategori öncelikli arama için sıralamada uygulanan ağırlık."
     category_search_priority_high_weight: "Yüksek kategori öncelikli arama için sıralamada uygulanan ağırlık."
-    category_search_priority_very_high_weight: "Çok yüksek kategori öncelikli arama için sıralamada uygulanan ağırlık."
     allow_uncategorized_topics: "Konuların kategori seçmeden oluşturulmasına izin ver. DİKKAT: Bu özelliği kapamadan önce kategorisiz tüm konuları kategorize etmeniz lazım."
     allow_duplicate_topic_titles: "Aynı başlık ile birden çok konu açılmasına izin ver."
     unique_posts_mins: "Kullanıcının aynı içerikle yeni bir gönderi oluşturmadan önce geçmesi gereken dakika"
@@ -1277,7 +1254,6 @@ tr_TR:
     site_description: "Meta açıklama etiketinde kullanılacak, bu sitenin bir cümlelik açıklaması."
     short_site_description: "Ana sayfadaki başlık etiketinde kullanılan kısa açıklama."
     contact_email: "Bu site için sorumlu kişinin e-posta adresi. <a href='%{base_path}/about' target='_blank'> /about</a> iletişim formu içerisinde, sadece acil durumlar ve kritik bildirimler için kullanılacak."
-    contact_url: "Bu site için iletişim URL'si. Acil konular için <a href='%{base_path}/about' target='_blank'>/ about</a> iletişim formunda kullanılır."
     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)"
@@ -1301,6 +1277,8 @@ tr_TR:
     show_pinned_excerpt_mobile: "Mobil görünümünde başa tutturulmuş konuların özetini göster."
     show_pinned_excerpt_desktop: "Masaüstü görünümünde başa tutturulmuş konuların özetini göster."
     post_onebox_maxlength: "Kutulanmış bir Discourse gönderisinin en fazla karakter uzunluğu"
+    blocked_onebox_domains: "Asla yayınlanmayacak alanların listesi."
+    allowed_inline_onebox_domains: "Başlıksız bağlanırsa minyatür formda yayınlanacak alanların listesi"
     force_custom_user_agent_hosts: "Tüm isteklerde özel onebox kullanıcı aracısını kullanacak ana makineler. (Özellikle kullanıcı aracısıyla erişimi sınırlayan ana bilgisayarlar için kullanışlıdır)."
     max_oneboxes_per_post: "Gönderide olabilecek en fazla kutulama sayısı"
     logo: "Sitenizin sol üst tarafındaki logo resmi. Yüksekliği 120 ve en boy oranı 3: 1 den büyük olan geniş dikdörtgen bir görüntü kullanın. Boş bırakılırsa, site başlığı metni gösterilir."
@@ -1318,7 +1296,6 @@ tr_TR:
     email_subject: "Standart e-postalar için özelleştirilebilir konu biçimi. Bkz. <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: "Kullanıcılara belirli bir konuya neden erişemedikleri hakkında daha fazla ayrıntı sağlar. Not: Bu daha az güvenlidir çünkü kullanıcılar bir URL'nin geçerli bir konuya bağlantı verip vermediğini bilecektir."
     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_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ı"
@@ -1351,16 +1328,22 @@ 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."
+    review_every_post: "Tüm gönderiler gözden geçirilmelidir. UYARI! YOĞUN SİTELER İÇİN ÖNERİLMEZ."
     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"
     enable_escaped_fragments: "Eğer bir ağ gezgini algılanmazsa Google'ın Ajax Crawling API'ına geri dönün. Bkz. <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>Https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     cors_origins: "Cross-origin isteklerin (CORS) izin verilen originler. Her origin http:// veya https:// içermeli. CORS'u etkinleştirebilmek için DISCOURSE_ENABLE_CORS env değişkeni doğru olarak ayarlanmalı."
+    use_admin_ip_allowlist: "Yöneticiler, sadece Taranmış IP listesinde tanımlanmış bir IP adresinden erişim sağlıyorlarsa giriş yapabilirler. (Yönetici > Kayıtlar > Taranmış IP'ler)"
+    blocked_ip_blocks: "Hiçbir zaman Discourse tarafından taranmaması gereken özel IP bloklarının bir listesi"
+    allowed_internal_hosts: "Discourse ve diğer amaçlarla güvenli bir şekilde tarama yapabilen dahili ana bilgisayarların bir listesi"
     allowed_iframes: "Gönderilerde güvenli bir şekilde izin verebilecek iframe src alan adı öneklerinin listesi"
+    allowed_crawler_user_agents: "Siteye erişmesine izin verilmesi gereken ağ tarayıcılarının kullanıcı aracıları. UYARI! BU AYARLAR, BURADA LİSTEN OLMAYAN TÜM TARAYICILARI ÇIKARACAKTIR!"
     slow_down_crawler_user_agents: "Tarama gecikmesi yönergesi kullanılarak robots.txt dosyasında hız sınırlaması gereken ağ tarayıcılarının kullanıcı aracıları"
     slow_down_crawler_rate: "slow_down_crawler_user_agents belirtilirse, bu oran tüm tarayıcılara uygulanır (istekler arasında saniye cinsinden gecikme sayısı)."
     content_security_policy: "İçerik-Güvenlik-Politikasını Etkinleştir"
     content_security_policy_report_only: "Yalnızca İçerik-Güvenlik-İlke-Raporunu Etkinleştir"
     content_security_policy_collect_reports: "/ Csp_reports adresinde CSP ihlali raporu toplamayı etkinleştir"
+    content_security_policy_frame_ancestors: "Bu sitenin CSP aracılığıyla iframe çerçevesine yerleştirilebilirliğini kısıtlayın. İzin verilen alan adlarını <a href='%{base_path}/admin/customize/embedding'>Gömme</a> adresinde yönetin."
     invalidate_inactive_admin_email_after_days: "Bu günlerde siteyi ziyaret etmeyen yönetici hesaplarının giriş yapmadan önce e-posta adreslerini yeniden doğrulamaları gerekir. Devre dışı bırakmak için 0 olarak ayarlayın."
     top_menu: "Anasayfa gezingesinde nelerin, hangi sırada yer alacağını belirleyin. Örneğin en sonIyeniIokunmamışIkategorilerIgözdeIokunmuşlarIgönderilenlerIimlenenler"
     post_menu: "Gönderi menüsündeki öğelerin hangi sırada yer alacağını belirleyin. Örnek: beğen|düzenle|bildir|sil|paylaş|imle|cevapla"
@@ -1386,7 +1369,9 @@ tr_TR:
     enable_badges: "Rozet sistemini etkinleştir"
     enable_whispers: "Konular dahilinde yetkililerin özel iletişimine izin ver."
     allow_index_in_robots_txt: "Robots.txt dosyasında bu sitenin web arama motorları tarafından dizine eklenmesine izin verildiğini belirtin. İstisnai durumlarda kalıcı olarak <a href='%{base_path}/admin/customize/robots'>robots.txt dosyasını geçersiz kılabilirsiniz </a>."
-    hide_email_address_taken: "Kullanıcıları, kayıt sırasında ve şifremi unuttum formunda o e-posta adresiyle bir hesap bulunduğunu bildirmeyin."
+    blocked_email_domains: "Kullanıcıların kayıt olurken kullanamayacağı e-posta alan adlarının, dikey çizgilerle ayrıştırılmış listesi. Örneğin: mailinator.com|trashmail.net"
+    allowed_email_domains: "Kullanıcıların kayıt olurken kullanmak ZORUNDA olduğu e-posta alan adlarının, dikey çizgilerle ayrıştırılmış listesi. UYARI: Bu listede yer almayan e-posta alan adları kabul edilmeyecektir!"
+    hide_email_address_taken: "Kullanıcıları, kayıt sırasında ve parolamı unuttum formunda o e-posta adresiyle bir hesap bulunduğunu bildirmeyin."
     log_out_strict: "Çıkış yapılırken, kullanıcının tüm cihazlardaki TÜM seanslarını sonlandır"
     version_checks: "Sürüm güncellemeleri için Discourse Hub'a ping atın ve <a href='%{base_path}/admin' target='_blank'>/ admin</a> kontrol panelinde yeni sürüm mesajlarını gösterin"
     new_version_emails: "Discourse'un yeni sürümü çıktığında contact_email adresine e-posta gönder."
@@ -1401,20 +1386,7 @@ tr_TR:
     min_admin_password_length: "Yönetici için parolanın en az uzunluğu."
     password_unique_characters: "Bir parolanın olması gereken minimum benzersiz karakter sayısı."
     block_common_passwords: "En çok kullanılan 10,000 parola arasında yer alan parolalara izin verme."
-    enable_sso: "Dış bir site aracılığı ile tek oturum açma sistemini etkinleştir. (UYARI: etkinleştirildiği takdirde, doğru yapılandırılmamışsa bazı kişilerin, SİZ DAHİL, oturum açmasını engelleyebilir! Ayrıca davetiye sistemini de devre dışı bırakır.)"
-    verbose_sso_logging: "SSO'larla ilgili ayrıntılı günlüğü <a href='%{base_path}/logs' target='_blank'>/logs</a> a tanılama "
-    enable_sso_provider: "Discourse SSO sağlayıcı protokolünü / session / sso_provider uç noktasında uygulayın, sso_provider_secrets ayarlanmasını gerektirir"
-    sso_url: "Bitiş noktasındaki tek oturum açma URL'si (http: // veya https: // içermelidir)"
-    sso_secret: "SSO bilgisinin kritopgrafik şekilde doğrulanması için kullanılan gizli string, 10 karakter veya daha uzun olduğundan emin olun"
-    sso_provider_secrets: "SSO sağlayıcısı olarak Discourse kullanan alan adı gizli çiftlerin listesi. SSO sırrının 10 karakter veya daha uzun olduğundan emin olun. Joker karakter * herhangi bir alan adıyla veya yalnızca bir bölümüyle eşleşmek için kullanılabilir (örn. * .Example.com)."
-    sso_overrides_bio: "Kullanıcı profilindeki kullanıcı biyografisini geçersiz kılar ve kullanıcının bunu değiştirmesini önler"
-    sso_overrides_groups: "Tüm manuel grup üyeliğini groups sso özelliğinde belirtilen gruplarla senkronize et (UYARI: grup belirtmezseniz, tüm manuel grup üyeliği kullanıcı için silinir)"
-    sso_overrides_avatar: "SSO yükünden harici site avatarıyla kullanıcı avatarını geçersiz kılar. Etkinleştirilirse, kullanıcıların Discourse üzerine avatar yüklemelerine izin verilmez."
-    sso_overrides_profile_background: "SSO yükünden harici site avatarıyla kullanıcı profili arka planını geçersiz kılar."
-    sso_overrides_card_background: "SSO yükünden harici site avatarıyla kullanıcı kartı arka planını geçersiz kılar."
-    sso_not_approved_url: "Bu bağlantıya onaylanmamış SSO hesaplarını yönlendir."
-    sso_allows_all_return_paths: "Alan adını SSO tarafından sağlanan dönüş_yolları için kısıtlamayın (varsayılan olarak dönüş yolu geçerli sitede olmalıdır)"
-    enable_local_logins: "Yerel kullanıcı adı ve şifre giriş tabanlı hesapları etkinleştirin. Davetiyelerin çalışması için bu etkinleştirilmiş olmalıdır. UYARI: devre dışı bırakılmışsa, daha önce en az bir alternatif oturum açma yöntemi yapılandırmadıysanız oturum açamayabilirsiniz."
+    discourse_connect_overrides_bio: "Kullanıcı profilindeki kullanıcı biyografisini geçersiz kılar ve kullanıcının bunu değiştirmesini önler"
     enable_local_logins_via_email: "Kullanıcıların e-posta yoluyla kendilerine tek tıklamayla giriş bağlantısı gönderilmesini istemesine izin ver."
     allow_new_registrations: "Yeni kayıtlara izin ver. Yeni hesap oluşturulmasını engellemek için burayı işaretlemeyin."
     enable_signup_cta: "Geri dönen anonim kullanıcılara hesap oluşturmaları için bir uyarı göster."
@@ -1451,7 +1423,6 @@ tr_TR:
     top_topics_formula_log_views_multiplier: "en iyi konular formülündeki günlük görüntüleme çarpanı (n) değeri: `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: "en iyi konular formülündeki ilk gönderi beğenileri değerini çarpan (n) değeri: `` 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: "en iyi konular formülündeki yayın çarpanı başına en az beğeni değeri (n): `log (views_count) * 2 + op_likes_count * 0.5 + LEAST (likes_count / posts_count, (n)) + 10 + log (posts_count)`"
-    rebake_old_posts_count: "Her 15 dakikada yeniden işlenecek olan eski konu sayısı."
     enable_safe_mode: "Eklentilerin hatalarını ayıklamak için kullanıcıların güvenli moda girmesine izin verin."
     rate_limit_create_topic: "Bir konu oluşturduktan sonra, başka bir konu oluşturmak için kullanıcılar (n) saniye beklemeli. "
     rate_limit_create_post: "Bir gönderi oluşturduktan sonra, başka bir gönderi oluşturmak için kullanıcılar (n) saniye beklemeli. "
@@ -1466,8 +1437,7 @@ tr_TR:
     max_topic_invitations_per_day: "Bir günde, bir kullanıcının yollayabileceği en fazla başlık daveti sayısı."
     max_logins_per_ip_per_hour: "Her IP adresi için saat başına izin verilen maksimum giriş sayısı"
     max_logins_per_ip_per_minute: "Her IP adresi için dakika başına izin verilen maksimum giriş sayısı"
-    max_post_deletions_per_minute: "Bir kullanıcının dakikada silebileceği maksimum gönderi sayısı."
-    max_post_deletions_per_day: "Bir kullanıcının günde silebileceği maksimum gönderi sayısı."
+    invite_link_max_redemptions_limit_users: "Normal kullanıcılar tarafından oluşturulan davet bağlantıları için izin verilen maksimum kullanım sayısı bu değerden fazla olamaz."
     alert_admins_if_errors_per_minute: "Bir yönetici uyarısını tetiklemek için dakika başına hata sayısı. 0 değeri bu özelliği devre dışı bırakır. NOT: yeniden başlatma gerektirir."
     alert_admins_if_errors_per_hour: "Bir yönetici uyarısını tetiklemek için saat başına hata sayısı. 0 değeri bu özelliği devre dışı bırakır. NOT: yeniden başlatma gerektirir."
     categories_topics: " Kategoriler sayfasında gösterilecek konu sayısı. 0 olarak ayarlanırsa, iki sütunu simetrik (kategoriler ve konular) tutmak için otomatik olarak bir değer bulmaya çalışır."
@@ -1489,6 +1459,7 @@ tr_TR:
     avatar_sizes: "Otomatik üretilen avatar ölçülerinin listesi."
     external_system_avatars_enabled: "Dışsal sistem avatarları hizmeti kullan."
     external_system_avatars_url: "Harici sistem avatarları hizmetinin URL'si. İzin verilen değiştirme {username} {first_letter} {color} {size}"
+    external_emoji_url: "Emojiler için harici servisin URL'si. Devre dışı bırakmak için boş bırakın."
     restrict_letter_avatar_colors: "Harf avatarı arka planı için kullanılacak 6 basamaklı onaltılı renk değerlerinin listesi."
     selectable_avatars_enabled: "Kullanıcıları listeden bir avatar seçmeye zorlayın."
     selectable_avatars: "Kullanıcıların seçebileceği avatarların listesi."
@@ -1498,7 +1469,6 @@ tr_TR:
     strip_image_metadata: "Şerit görüntü meta verileri."
     min_ratio_to_crop: "Uzun görüntüleri kırpmak için kullanılan oran. Genişlik / yükseklik sonucunu girin."
     simultaneous_uploads: "Besteciye sürüklenip bırakılabilecek maksimum dosya sayısı"
-    enable_flash_video_onebox: "Kutularda swf ve flv (Adobe Flash) yerleştirmelerine izin ver. UYARI: güvenlik açıkları doğurabilir"
     default_invitee_trust_level: "Davet edilen kullanıcılar için öntanımlı güven seviyesi (0-4)."
     default_trust_level: "Tüm yeni kullanıcılar için öntanımlı güven seviyesi (0-4). DİKKAT! Bu ayarı değiştirmeniz ciddi seviyede istenmeyen gönderi riski doğurabilir."
     tl1_requires_topics_entered: "Yeni bir kullanıcının güven seviyesi 1'e yükseltilmeden önce oluşturması gereken konu sayısı."
@@ -1532,8 +1502,10 @@ tr_TR:
     min_trust_to_edit_post: "Gönderilerin düzenlenebilmesi için gereken en düşük güven seviyesi."
     min_trust_to_allow_self_wiki: "Kullanıcının kendi wiki gönderisini oluşturabilmesi için gereken güven seviyesi."
     min_trust_to_send_messages: "Yeni kişisel iletiler oluşturmak için gereken minimum güven seviyesi."
+    min_trust_to_send_email_messages: "E-postayla kişisel mesaj göndermek için gereken minimum güven seviyesi."
     min_trust_to_flag_posts: "Gönderileri raporlamak için gereken minimum güven seviyesi"
     min_trust_to_post_links: "Gönderilere bağlantı eklemek için gereken minimum güven seviyesi"
+    allowed_link_domains: "Kullanıcıların bağlantı göndermek için uygun güven seviyesine sahip olmasalar bile bağlanabilecekleri alanlar"
     newuser_max_links: "Yeni bir kullanıcının bir gönderiye ekleyebileceği bağlantı sayısı."
     newuser_max_attachments: "Yeni bir kullanıcının bir gönderiye ekleyebileceği dosya sayısı."
     newuser_max_mentions_per_post: "Yeni bir kullanıcının bir gönderi içinde kullanabileceği en fazla @isim bildiri sayısı."
@@ -1556,6 +1528,7 @@ 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."
+    dark_mode_none: "Hiçbiri"
     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)"
@@ -1581,6 +1554,7 @@ tr_TR:
     privacy_policy_url: "Başka yerde barındırılan bir Gizlilik İlkeleri dökümanını kullanmak istiyorsanız, ilgili URL adresini buraya eksiksiz şekilde girin."
     log_anonymizer_details: "Anonimleştirildikten sonra kullanıcının ayrıntılarını günlükte tutup tutmayacağı. GDPR'ye uyarken bunu kapatmanız gerekir."
     newuser_spam_host_threshold: "Yeni bir kullanıcı, `newuser_spam_host_threshold` gönderileri içerisinde aynı makineye, kaç kere bağlantı paylaşınca spam olarak algılansın."
+    allowed_spam_host_domains: "Spam barındırma testinden hariç tutulan alan adı listesi. Yeni kullanıcıların, bu alan adlarına bağlantı içeren gönderi oluşturmaları hiç bir zaman engellenmeyecek."
     topic_view_duration_hours: "Her N saatte IP/Kullanıcı başına bir kez yeni konu görüntülemesi say"
     user_profile_view_duration_hours: "Her N saatte IP/Kullanıcı başına bir kez yeni profil görüntülemesi say"
     levenshtein_distance_spammer_emails: "İstenmeyen e-postaları eşleştirilirken, bulanık eşleşme için tahammül edilecek karakter sayısı farklılığı."
@@ -1594,7 +1568,7 @@ tr_TR:
     min_first_post_typing_time: "Milisaniye olarak bir kullanıcının ilk gönderisini yazarken geçmesi gereken en küçük süre, bu süre geçmezse gönderi otomatik olarak onaylanma kuyruğuna girer. Devre dışı bırakmak için 0'a ayarlayın (tavsiye edilmez)."
     auto_silence_fast_typers_on_first_post: "Min_first_post_typing_time ile tanışmayan kullanıcıları otomatik olarak susturma"
     auto_silence_fast_typers_max_trust_level: "Hızlı yazıcıları otomatik olarak susturmak için maksimum güven seviyesi"
-    auto_silence_first_post_regex: "Geçerlerse kullanıcı tarafından ilk gönderinin susturulmasına ve onay kuyruğuna gönderilmesine neden olacak büyük / küçük harfe duyarlı olmayan normal ifade. Örnek: raging | a [bc] a, öfke veya aba veya aca içeren tüm direklerin ilk önce susturulmasına neden olur. Yalnızca ilk gönderi için geçerlidir."
+    auto_silence_first_post_regex: "Geçerse kullanıcı tarafından ilk gönderinin susturulmasına ve onay kuyruğuna gönderilmesine neden olacak büyük / küçük harfe duyarlı olmayan regex ifade. Örnek: raging | a [bc] a, raging veya aba veya aca içeren tüm gönderilerin ilk önce susturulmasına neden olur. Yalnızca ilk gönderi için geçerlidir."
     reviewable_claiming: "İncelenebilir içeriğin üzerinde işlem yapılabilmesi için hak talebinde bulunulması gerekiyor mu?"
     reviewable_default_topics: "Konuya göre gruplandırılmış incelenebilir içeriği varsayılan olarak göster"
     reviewable_default_visibility: "Bu önceliği karşılamadıkça incelenebilir öğeleri gösterme"
@@ -1614,6 +1588,7 @@ tr_TR:
     max_emails_per_day_per_user: "Kullanıcılara bir günde gönderilebilecek en fazla e-posta sayısı. Limiti kaldırmak için 0"
     enable_staged_users: "Gelen e-postaları işlerken otomatik olarak aşamalı kullanıcılar oluşturun."
     maximum_staged_users_per_email: "Gelen bir e-posta işlenirken oluşturulan maksimum aşamalı kullanıcı sayısı."
+    auto_generated_allowlist: "Otomatik olarak oluşturulan içerik için denetlenmeyecek e-posta adreslerinin listesi. Örnek: foo@bar.com | discourse@bar.com"
     block_auto_generated_emails: "Otomatik olarak oluşturulduğu belirlenen e-postaları engelleyin."
     ignore_by_title: "Gelen e-postaları başlıklarına göre yok sayın."
     mailgun_api_key: "Webhook mesajlarını doğrulamak için Mailgun Secret API anahtarı."
@@ -1624,7 +1599,6 @@ tr_TR:
     forwarded_emails_behaviour: "Discourse'a yönlendirilen bir e-posta nasıl ele alınır?"
     always_show_trimmed_content: "Her zaman gelen e-postaların kırpılmış bölümünü göster. UYARI: e-posta adreslerini gösterebilir."
     private_email: "E-posta başlığına veya e-posta gövdesine gönderilerden veya konulardan içerik eklemeyin. NOT: ayrıca özet e-postaları devre dışı bırakır."
-    email_total_attachment_size_limit_kb: "Giden e-postalara eklenen maksimum dosya boyutu. Eklerin gönderilmesini devre dışı bırakmak için 0 olarak ayarlayın."
     post_excerpts_in_emails: "Bildirim e-postalarında her zaman tam yayınlar yerine alıntılar gönderin"
     raw_email_max_length: "Gelen e-posta için kaç karakter saklanması gerektiği."
     raw_rejected_email_max_length: "Reddedilmiş gelen e-posta için kaç karakter saklanması gerektiği."
@@ -1687,6 +1661,7 @@ tr_TR:
     ignored_users_message_gap_days: "Diğerleri tarafından görmezden gelinen bir kullanıcı hakkında moderatörlere tekrar bildirimde bulunmadan önce ne kadar bekleyeceği."
     clean_up_inactive_users_after_days: "Etkin olmayan bir kullanıcının (gönderiler olmadan 0 güven seviyesi) kaldırılmasından önceki gün sayısı. Temizlemeyi devre dışı bırakmak için 0 olarak ayarlayın."
     user_selected_primary_groups: "Kullanıcıların kendi birincil gruplarını ayarlamalarına izin ver"
+    allowed_user_website_domains: "Kullanıcı web sitesi bu alanlara karşı doğrulanacak. Sınırlandırılmış liste."
     allow_profile_backgrounds: "Kullanıcıların profillerine arkaplan eklemesine izin ver."
     sequential_replies_threshold: "Kullanıcının arka arkaya çok fazla cevap gönderdiğine dair uyarı alması için, kullanıcının bir konuda ve bir satırda yapması gereken gönderi sayısı."
     get_a_room_threshold: "Bir kullanıcının uyarılmadan önce aynı kişi ve aynı konuyla yapması gereken gönderi sayısı."
@@ -1723,6 +1698,7 @@ tr_TR:
     embed_topics_list: "Konu listelerinin HTML yerleştirmesini destekleyin"
     embed_truncate: "Yerleştirilmiş gönderileri kırp."
     embed_support_markdown: "Gömülü gönderiler için Markdown formatlama desteği."
+    allowed_embed_selectors: "Gömme işlemlerinde izin verilen CSS öğelerinin virgülle ayrılmış listesi."
     allowed_href_schemes: "Http ve https'ye ek olarak bağlantılarda şemalara izin verilir."
     embed_post_limit: "Yerleştirilecek en fazla gönderi sayısı."
     embed_username_required: "Konu oluşturmak için kullanıcı adı gereklidir."
@@ -1730,7 +1706,6 @@ tr_TR:
     show_create_topics_notice: "Eğer sitede herkese açık konu sayısı 5'den az ise, yöneticiden yeni konular oluşturmasını isteyen bir uyarı iletisi göster. "
     delete_drafts_older_than_n_days: "(n) günden eski taslakları sil."
     bootstrap_mode_min_users: "bootstrap modunun edilgen olması için gereken en az kullanıcı sayısı (edilgen bırakmak için 0 yapın)"
-    prevent_anons_from_downloading_files: "Anonim kullanıcıların eklenti indirebilmesini önle. DİKKAT: Bu ayar, eklenti olarak gönderilen resim-dışı site içeriklerinin de çalışmasını engelleyebilir."
     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"
@@ -1747,6 +1722,7 @@ tr_TR:
     code_formatting_style: "Bestecideki kod düğmesi bu kod ayarlama stiline göre varsayılan olacaktır."
     max_allowed_message_recipients: "Bir mesajda izin verilen maksimum alıcı."
     watched_words_regular_expressions: "İzlenen kelimeler düzenli ifadelerdir."
+    enable_diffhtml_preview: "Tam yeniden oluşturma yerine önizlemeyi senkronize etmek için diffHTML kullanan deneysel özellik"
     old_post_notice_days: "Yayın bildiriminin eski hale gelmesinden önceki günler"
     new_user_notice_tl: "Yeni kullanıcıların gönderilerinin bildirimini görmek için gereken minimum güven seviyesi."
     returning_user_notice_tl: "Geri dönen kullanıcıların gönderilerinin bildirimini görmek için gereken minimum güven seviyesi."
@@ -1757,7 +1733,6 @@ tr_TR:
     default_email_messages_level: "Birisi kullanıcıya mesaj gönderdiğinde varsayılan e-posta bildirim seviyesini ayarlayın."
     default_email_mailing_list_mode: "Öntanımlı olarak her yeni gönderi için bir e-posta gönder."
     default_email_mailing_list_mode_frequency: "Posta listesi modunu etkinleştiren kullanıcılar varsayılan olarak bu e-postaları alır."
-    disable_mailing_list_mode: "Kullanıcıların duyuru listesi modunu etkinleştirmesini engelle."
     default_email_previous_replies: "Varsayılan olarak e-postalara önceki yanıtları dahil et."
     default_email_in_reply_to: "Gönderilere gelen cevapların bir örneğini varsayılan olarak e-postaya ekle"
     default_other_new_topic_duration_minutes: "Konunun yeni olarak düşünülmesi için genel öntanımlı koşul."
@@ -1767,6 +1742,7 @@ tr_TR:
     default_other_enable_quoting: "Vurgulanmış yazılar için alıntı ile cevaplamayı, öntanımlı olarak, etkinleştir."
     default_other_enable_defer: "Varsayılan olarak erteleme konusu işlevini etkinleştir."
     default_other_dynamic_favicon: "Tarayıcı simgesinde, öntanımlı olarak, yeni/güncellenmiş konu sayısını göster."
+    default_other_skip_new_user_tips: "Yeni kullanıcı katılımı ipuçlarını ve rozetlerini atlayın."
     default_other_like_notification_frequency: "Beğenildiğinde öntanımlı olarak kullanıcılara bildir"
     default_topics_automatic_unpin: "Kullanıcı sayfa sonuna eriştiğinde tutturulmuş konuları otomatik olarak sayfadan ayır."
     default_categories_watching: "Öntanımlı olarak gözlenen kategorilerin listesi."
@@ -1785,7 +1761,6 @@ tr_TR:
     revoke_api_keys_days: "Kullanılmayan bir API anahtarının otomatik olarak iptal edilmesinden önceki gün sayısı (hiçbir zaman için 0 giriniz)"
     allow_user_api_keys: "Kullanıcı API anahtarlarının oluşturulmasına izin ver"
     allow_user_api_key_scopes: "Kullanıcı API anahtarları için izin verilen kapsamların listesi"
-    max_api_keys_per_user: "Kullanıcı başına kullanılabilecek kullanıcı API anahtarı sayısı"
     min_trust_level_for_user_api_key: "Kullanıcı API'si oluşturmak için gereken güven seviyesi"
     allowed_user_api_auth_redirects: "Kullanıcı API anahtarlarına kimlik doğrulama yönlendirmesi için izin verilen URL. Joker karakter *, herhangi bir bölümüyle eşleşmek için kullanılabilir (örn. www.example.com/*)."
     allowed_user_api_push_urls: "Sunucu API'na kullanıcı API'ı için izin verilen URL'ler"
@@ -1795,7 +1770,6 @@ tr_TR:
     max_tags_per_topic: "Bir konuya eklenebilecek en fazla etiket."
     max_tag_length: "Bir etiket isminde kullanılabilecek en fazla karakter sayısı."
     max_tag_search_results: "Etiketler için arama yapılırken gösterilecek en fazla sonuç."
-    show_filter_by_tag: "Bir konu listesini etikete göre filtrelemek için bir açılır menü gösterin."
     max_tags_in_filter_list: "Filtre açılır menüsünde gösterilecek maksimum etiket sayısı. En çok kullanılan etiketler gösterilir."
     tags_sort_alphabetically: "Etiketleri harf sırasına göre sırala. Öntanımlı olarak gözdelik seviyesine göre gösterilir."
     tags_listed_by_group: "Etiketleri <a href='%{base_path}/tags' target='_blank'> Etiketler sayfasında </a>etiket grubuna göre listeleyin."
@@ -1826,6 +1800,7 @@ tr_TR:
       invalid_string_min_max: "%{min} ile %{max} karakter arasında olmalı."
       invalid_string_min: "En az %{min} karakter olmalı."
       invalid_string_max: "En fazla %{max} karakter olabilir."
+      invalid_json: "Geçersiz JSON."
       invalid_reply_by_email_address: "Değer '%{reply_key}' içermeli ve bildiri e-postasından farklı olmalı."
       invalid_alternative_reply_by_email_addresses: "Tüm değerler '%{reply_key}' içermeli ve bildirim e-postasından farklı olmalıdır."
       pop3_polling_host_is_empty: "POP3 sorgulamasını etkinleştirmeden önce bir 'pop3 polling host' ayarlamanız gerekir."
@@ -1839,25 +1814,20 @@ tr_TR:
       email_editable_enabled: "Bu ayarı etkinleştirmeden önce 'düzenlenebilir e-posta' yı devre dışı bırakmanız gerekir."
       staged_users_disabled: "Bu ayarı etkinleştirmeden önce 'staged users' etkinleştirmelisiniz."
       reply_by_email_disabled: "Bu ayarı etkinleştirmeden önce 'e-posta ile yanıtla' yı etkinleştirmelisiniz."
-      sso_url_is_empty: "Bu ayarı etkinleştirmeden önce bir 'sso url' ayarlamanız gerekir."
-      sso_invite_only: "Aynı anda hem Sso'yu hemde 'sadece davet et' i etkinleştiremezsiniz."
       enable_local_logins_disabled: "Bu ayarı etkinleştirmeden önce 'yerel girişleri etkinleştir' seçeneğini etkinleştirmelisiniz."
       min_username_length_exists: "Minimum kullanıcı adı uzunluğunu en kısa kullanıcı adının (%{username}) üzerine ayarlayamazsınız."
       min_username_length_range: "En büyük değerin üstünde en küçük değer ayarlayamazsınız."
       max_username_length_exists: "Maksimum kullanıcı adı uzunluğunu en uzun kullanıcı adının (%{username}) altına ayarlayamazsınız."
       max_username_length_range: "En küçük değer altında en büyük değer ayarlayamazsınız."
       invalid_hex_value: "Renk değerleri 6 haneli onaltılık kodlar olmalıdır."
-      category_search_priority:
-        very_low_weight_invalid: "Ağırlığı 'category_search_priority_low_weight' değerinden daha büyük olacak şekilde ayarlayamazsınız."
-        low_weight_invalid: "Ağırlığı 1 den büyük veya eşit ya da 'category_search_priority_low_weight' değerinden daha küçük olacak şekilde ayarlayamazsınız."
-        high_weight_invalid: "Ağırlığı, 'category_search_priority_very_high_weight' değerinden daha küçük veya 1 veya daha büyük olacak şekilde ayarlayamazsınız."
-        very_high_weight_invalid: "Ağırlığı 'category_search_priority_high_weight' den daha küçük olacak şekilde ayarlayamazsınız."
+      allowed_unicode_usernames:
+        regex_invalid: "Normal ifade geçersiz: %{error}"
+        leading_trailing_slash: "Normal ifade eğik çizgi ile başlamamalı ve bitmemelidir."
       unicode_usernames_avatars: "Dahili sistem avatarları Unicode kullanıcı adlarını desteklemez."
       list_value_count: "Liste tam olarak %{count} değerleri içermelidir."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.örnek.com"
-        value: "SSO gizliliği"
   search:
     extreme_load_error: "Site aşırı yük altında, arama devre dışı, daha sonra tekrar deneyin"
     within_post: "%{username} tarafından #%{post_number}"
@@ -1868,7 +1838,7 @@ tr_TR:
     results_page: "'%{term}' için arama sonuçları"
     audio: "[ses]"
     video: "[video]"
-  sso:
+  discourse_connect:
     login_error: "Oturum açma Hatası"
     not_found: "Hesabınız bulunamadı. Lütfen site yöneticisi ile iletişime geçin."
     account_not_approved: "Hesabınız onaylanma bekliyor. Onaylandığınızda e-posta ile bilgilendirileceksiniz."
@@ -1877,7 +1847,7 @@ tr_TR:
     no_email: "Hiçbir e-posta adresi verilmedi. Lütfen sitenin yöneticisine başvurun."
     blank_id_error: "`External_id` gerekli ancak boştu"
     email_error: "<b>%{email}</b> e-posta adresiyle bir hesap kaydedilemedi. Lütfen sitenin yöneticisine başvurun."
-    missing_secret: "Gizlililik eksikliği nedeniyle SSO kimlik doğrulaması başarısız oldu. Bu sorunu çözmek için site yöneticilerine başvurun."
+    invite_redeem_failed: "Davet kullanımı başarısız oldu. Lütfen site yöneticisi ile iletişime geçin."
   original_poster: "Özgün Gönderici"
   most_posts: "En Çok Gönderi"
   most_recent_poster: "En Son Gönderen"
@@ -1994,6 +1964,7 @@ tr_TR:
     missing_user_field: "Kullanıcı alanlarının tamamını doldurmadınız"
     auth_complete: "Kimlik doğrulama işlemi tamamlandı."
     click_to_continue: "Devam etmek için buraya tıklayın."
+    second_factor_title: "İki Faktörlü Kimlik Doğrulama"
     second_factor_description: "Lütfen uygulamanıza gerekli kimlik doğrulama kodunu girin:"
     second_factor_backup_description: "Lütfen yedek kodlarından birini gir:"
     invalid_second_factor_code: "Geçersiz kimlik doğrulama kodu. Her kod yalnızca bir kez kullanılabilir."
@@ -2109,7 +2080,7 @@ tr_TR:
 
       %{invite_link}
   invite_password_instructions:
-    title: "Şifre Talimatlarını davet et"
+    title: "Parola Talimatlarını davet et"
     subject_template: "%{site_name} hesabınız için parola oluşturun"
     text_body_template: |
       %{site_name} topluluğuna olan davetiyeni kabul ettiğin için teşekkür ederiz -- hoş geldin!
@@ -2217,6 +2188,19 @@ tr_TR:
         Gönderiniz topluluk tarafından raporlandı ve şuanda gizli.**Bu gönderi birden fazla kez gizlendiği için, gönderiniz bir yetkili tarafından ilgilenilmediği sürece gizli kalacaktır.**
 
         Daha fazla bilgi için, lütfen [topluluk yönergelerine bakın](%{base_url}/guidelines).
+    queued_by_staff:
+      title: "Gönderi Onay Gerektirir"
+      subject_template: "Gönderi görevliler tarafından gizlenmiş, onay bekliyor"
+      text_body_template: |
+        Merhaba,
+
+        Bu, gönderinizin gizlendiğini bildirmek için %{site_name} tarafından gönderilmiş otomatik bir mesajdır.
+
+        <%{base_url}%{url}>
+
+        Gönderiniz, bir personel tarafından gözden geçirilene kadar gizlenmiş halde kalacaktır.
+
+        Ek bilgi için lütfen [topluluk yönergelerimize] (%{base_url}/ yönergelerimiz) bakın.
     flags_disagreed:
       title: "Raporlanmış gönderi personel tarafından geri yüklendi"
       subject_template: "Raporlanmış gönderi personel tarafından geri yüklendi"
@@ -2235,22 +2219,6 @@ tr_TR:
     flags_agreed_and_post_deleted:
       title: "Raporlanmış gönderi personel tarafından kaldırıldı"
       subject_template: "Raporlanmış gönderi personel tarafından kaldırıldı"
-      text_body_template: |
-        Merhaba,
-
-        Bu, [gönderinizin](%{base_url}%{url}) kaldırıldığını haber vermek için %{site_name}tarafından gönderilmiş otomatik bir mesajdır.
-
-        Bu gönderi topluluk tarafından raporlanmıştı ve personel tarafından kaldırlması seçildi.
-
-        %{flag_reason}
-
-        [details="Click to expand restored post"]
-        ``` markdown
-        %{flagged_post_raw_content}
-        ```
-        [/details]
-
-        Detaylar için [topluluk yönergelerine](%{base_url}/guidelines) başvurun.
     usage_tips:
       text_body_template: |
         Yeni bir kullanıcı olarak başlamak için birkaç küçük ipucu,[bu blog gönderisini inceleyin](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2300,6 +2268,8 @@ tr_TR:
         Ziyaretinizin keyfini çıkarın!
 
         [tercihler]:%{user_preferences_url}
+    tl2_promotion_message:
+      subject_template: "Güven seviyesi terfiniz için tebrikler!"
     backup_succeeded:
       title: "Yedekleme Başarılı"
       subject_template: "Yedekleme başarıyla tamamlandı"
@@ -2885,28 +2855,16 @@ tr_TR:
     account_suspended:
       title: "Hesap Askıya Alındı"
       subject_template: "[%{email_prefix}] Hesabınız askıya alındı"
-      text_body_template: |
-        Forumdan %{suspended_till} tarihine kadar askıya alındınız.
-
-         %{reason}
-
-         %{message}
     account_silenced:
       title: "Hesap Susturuldu"
       subject_template: "[%{email_prefix}] Hesabınız susturuldu"
-      text_body_template: |
-        Forumda %{silenced_till}tarihine kadar susturuldunuz.
-
-         %{reason}
-
-         %{message}
     account_exists:
       title: "Bu Hesap Zaten Mevcut"
       subject_template: "[%{email_prefix}] Hesap zaten mevcut"
       text_body_template: |
         %{site_name}'da bir hesap oluşturmaya çalıştınız veya bir hesabın e-posta adresini %{email} şeklinde değiştirmeye çalıştınız. Ancak, %{email} için bir hesap mevcut.
 
-        Eğer şifrenizi unuttuysanız, [şimdi parolanızı sıfırlayın](%{base_url}/password-reset).
+        Eğer parolanızı unuttuysanız, [şimdi parolanızı sıfırlayın](%{base_url}/password-reset).
 
         Eğer %{email} için bir hesap oluşturmaya çalışmadıysanız veya e-posta adresini değiştirmeye çalışmadıysanız endişe etmeyin. Güvenli bir şekilde bu mesajı görmezden gelebilirsiniz.
 
@@ -2931,7 +2889,7 @@ tr_TR:
       preheader: "%{last_seen_at} tarihindeki ziyaretinizden bu yana olanların kısa bir özeti"
     forgot_password:
       title: "Parolamı Unuttum"
-      subject_template: "[%{email_prefix}] Şifre sıfırlama"
+      subject_template: "[%{email_prefix}] Parola sıfırlama"
       text_body_template: |
         [%{site_name}](%{base_url}) için birisi parolanızı sıfırlamanızı istedi.
 
@@ -2950,9 +2908,9 @@ tr_TR:
         Giriş yapmak için aşağıdaki bağlantıya tıklayın:
         %{base_url}/session/email-login/%{email_token}
     set_password:
-      title: "Şifre Belirle"
-      subject_template: "[%{email_prefix}] Şifre Belirle"
-      text_body_template: "Birisi [%{site_name}] (%{base_url}) hesabınıza bir şifre eklemenizi istedi. Alternatif olarak, bu onaylanmış e-posta adresiyle ilişkili desteklenen herhangi bir çevrimiçi hizmeti (Google, Facebook vb.) Kullanarak giriş yapabilirsiniz. \nBu isteği siz yapmadıysanız, bu e-postayı güvenle yok sayabilirsiniz. \nBir şifre seçmek için aşağıdaki bağlantıyı tıklayın: %{base_url}/u/password-reset/%{email_token}\n"
+      title: "Parola Belirle"
+      subject_template: "[%{email_prefix}] Parola Belirle"
+      text_body_template: "Birisi [%{site_name}] (%{base_url}) hesabınıza bir parola eklemenizi istedi. Alternatif olarak, bu onaylanmış e-posta adresiyle ilişkili desteklenen herhangi bir çevrimiçi hizmeti (Google, Facebook vb.) Kullanarak giriş yapabilirsiniz. \nBu isteği siz yapmadıysanız, bu e-postayı güvenle yok sayabilirsiniz. \nBir parola seçmek için aşağıdaki bağlantıyı tıklayın: %{base_url}/u/password-reset/%{email_token}\n"
     admin_login:
       title: "Yönetici Girişi"
       subject_template: "[%{email_prefix}] Giriş"
@@ -2962,11 +2920,14 @@ tr_TR:
       text_body_template: |
         %{site_name} 'de sizin için yeni bir hesap oluşturuldu.
 
-        Yeni hesabınıza şifre belirlemek için aşağıdaki bağlantıya tıklayın:
+        Yeni hesabınıza parola belirlemek için aşağıdaki bağlantıya tıklayın:
         %{base_url}/u/password-reset/%{email_token}
     confirm_new_email:
       title: "Yeni E-postayı Onayla"
       subject_template: "[%{email_prefix}] Yeni e-posta adresinizi onaylayın"
+    confirm_new_email_via_admin:
+      title: "Yeni E-postayı Onayla"
+      subject_template: "[%{email_prefix}] Yeni e-posta adresinizi onaylayın"
     confirm_old_email:
       title: "Eski E-postayı Onayla"
       subject_template: "[%{email_prefix}] Mevcut e-posta adresinizi onaylayın"
@@ -2988,6 +2949,12 @@ tr_TR:
       title: "Onay Sonrası Kayıt"
       subject_template: "%{site_name} sitesinde hesabınız onaylandı!"
       text_body_template: "%{site_name}&#39;a hoş geldiniz! \nBir moderatör hesabınızı %{site_name} \n\nadresinde onayladı. Artık yeni hesabınıza şu adresten giriş yaparak erişebilirsiniz: %{base_url} \n\nYukarıdaki bağlantı tıklanabilir değilse, kopyalayıp web tarayıcınızın adres çubuğuna yapıştırmayı deneyin. \n\n%{new_user_tips} \n\nHer zaman [medeni topluluk davranışına] (%{base_url} / yönergeleri) kontrolünü sağlıyoruz. \n\nKeyfini çıkarın!\n"
+    signup_after_reject:
+      subject_template: "%{site_name} hesabınız reddedildi"
+      text_body_template: |
+        Bir ekip üyesi, %{site_name} hesabınızı reddetti.
+
+        %{reject_reason}
     signup:
       title: "Kaydol"
       subject_template: "[%{email_prefix}] Yeni hesabınızı onaylayın"
@@ -2999,7 +2966,15 @@ tr_TR:
     suspicious_login:
       title: "Yeni Giriş Uyarısı"
       subject_template: "[%{site_name}] %{location}'dan Yeni Giriş"
-      text_body_template: "Merhaba, \n\nGenellikle kullanmadığınız bir cihazdan veya konumdan bir giriş fark ettik. Bu sen miydin? \n\n- Konum: %{location} (%{client_ip}) \n- Tarayıcı: %{browser} \n- Cihaz: %{device} - %{os} \n\nBu olsaydınız, harika! Yapmanız gereken başka bir şey yok.\n\n Bu siz değilseniz, lütfen [mevcut oturumlarınızı gözden geçirin] (%{base_url}/profilim/tercihlerim/hesap) ve şifrenizi değiştirin.\n"
+      text_body_template: "Merhaba, \n\nGenellikle kullanmadığınız bir cihazdan veya konumdan bir giriş fark ettik. Bu sen miydin? \n\n- Konum: %{location} (%{client_ip}) \n- Tarayıcı: %{browser} \n- Cihaz: %{device} - %{os} \n\nBu olsaydınız, harika! Yapmanız gereken başka bir şey yok.\n\n Bu siz değilseniz, lütfen [mevcut oturumlarınızı gözden geçirin] (%{base_url}/profilim/tercihlerim/hesap) ve parolanızı değiştirin.\n"
+    post_approved:
+      title: "Gönderiniz onaylandı"
+      subject_template: "[%{site_name}] Gönderiniz onaylandı"
+      text_body_template: |
+        Merhaba,
+
+        Bu, %{site_name} ortamındaki [yayınınızın] (%{base_url}%{post_url}) onaylandığını bilgisini vermek için gönderilmiş otomatik bir mesajdır.
+  site_setting_missing: "`%{name}' ayarının belirtilmesi gerek."
   page_not_found:
     title: "Hay aksi! Bu sayfa yok ya da gizli."
     popular_topics: "Gözde"
@@ -3072,6 +3047,7 @@ tr_TR:
     latte: "Latte"
     summer: "Yaz"
     dark_rose: "Kara Gül"
+    default_theme_name: "Varsayılan "
     light_theme_name: "Aydınlık"
     dark_theme_name: "Karanlık"
     neutral_theme_name: "Nötr"
@@ -3100,6 +3076,7 @@ tr_TR:
     mass_award:
       errors:
         invalid_csv: '%{line_number} satırında bir hatayla karşılaştık. Lütfen CSV''nin her satırında bir e-posta olduğunu doğrulayın.'
+        badge_disabled: Lütfen önce %{badge_name} rozetini etkinleştirin.
     editor:
       name: Düzenleyici
       description: İlk gönderini düzenledin
@@ -3282,6 +3259,7 @@ 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 defa günlük %{max_likes_per_day} beğeni kullanıldı
       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:
@@ -3337,7 +3315,8 @@ tr_TR:
     devotee:
       name: Hayran
       description: Arka arkaya 365 gün ziyaret etti
-      long_description: "Bu rozet, art arda 365 gün ziyaret edenler için verilir. Vay, bütün bir yıldır bizimlesin! Bu rozet, art arda 365 gün ziyaret edenlere verilir. \n"
+      long_description: |
+        Bu rozet, 365 gün boyunca siteyi art arda ziyaret edenlere verilir. Vay, tam bir yıldır her gün bizimlesin!
     badge_title_metadata: "%{display_name} rozeti %{site_title}"
   admin_login:
     success: "E-posta Gönderildi"
@@ -3365,9 +3344,6 @@ tr_TR:
         other: '"%{tag_name}" aşağıdaki kategorilerle sınırlıdır: %{category_names}'
       synonym: 'Eş anlamlılara izin verilmiyor. Bunun yerine "%{tag_name}" kullanın.'
       has_synonyms: '"%{tag_name}" kullanılamıyor çünkü eş anlamlıları var.'
-    required_tags_from_group:
-      one: "En az %{count} %{tag_group_name} etiketi eklemelisiniz."
-      other: "En az %{count} %{tag_group_name} etiketi eklemelisiniz."
     invalid_target_tag: "eşanlamlı eşanlamlı olamaz"
     synonyms_exist: "eş anlamlılar varken izin verilmiyor"
   rss_by_tag: "%{tag} etiketli konular"
@@ -3469,6 +3445,12 @@ tr_TR:
           city_for_disputes:
             label: "Anlaşmazlıklar Şehri"
             placeholder: "San Francisco, Kaliforniya"
+      colors:
+        title: "Renkler"
+      fonts:
+        fields:
+          font_preview:
+            label: "Önizleme"
       logos:
         title: "Görseller"
         fields:
@@ -3507,9 +3489,6 @@ tr_TR:
                 label: "Kategori kutuları"
               categories_boxes_with_topics:
                 label: "Başlıkları olan kategori kutuları"
-      emoji:
-        title: "Emoji"
-        description: "Topluluğunuz için hangi Emoji stilini tercih ediyorsunuz? Daha sonra Yönetici, Özelleştir, Emoji aracılığıyla daha fazla özel Emoji ekleyebilirsiniz."
       invites:
         title: "Görevli Davet Et"
         description: "Neredeyse bitti! Bazı insanları, topluluğunuzu başlatmak için ilginç konular ve yanıtlarla <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>tartışmalarınıza</a> yardımcı olmaya davet edelim."
@@ -3545,6 +3524,7 @@ tr_TR:
       revoked: İptal edilmiş
       restored: Restore edildi
   reviewables:
+    already_handled_and_user_not_exist: "Teşekkürler, ancak birisi daha önce gözden geçirdi ve bu kullanıcı artık mevcut değil."
     priorities:
       low: "Düşük"
       medium: "Orta"
@@ -3563,14 +3543,14 @@ tr_TR:
       trust_level: "Düşük güven seviyesindeki kullanıcıların yanıtları personel tarafından onaylanmış olmalıdır. Bkz. `approve_unless_trust_level`."
       new_topics_unless_trust_level: "Güven seviyesi düşük olan kullanıcılar, görevli tarafından onaylanmış konulara sahip olmalıdır. Bkz. “approve_new_topics_unless_trust_level`."
       fast_typer: "Yeni kullanıcı ilk gönderilerini şüpheli biçimde hızlı yazdı, şüpheli bot veya spam gönderici davranışları. Bkz. “min_first_post_typing_time”."
-      auto_silence_regexp: "İlk gönderisi `auto_silence_first_post_regex` ayarıyla eşleşen yeni kullanıcı."
-      watched_word: "Bu gönderide İzlenen Bir Kelime vardı. <a href='%{base_url}/admin/logs/watched_words'>İzlenen kelimeler listenize</a> bakın."
+      auto_silence_regexp: "İlk gönderisi \"auto_silence_first_post_regex\" ayarıyla eşleşen yeni kullanıcı."
       staged: "Aşama kaydetmiş kullanıcılar için yeni konular ve gönderiler moderatör tarafından onaylanmalıdır. Bkz: `approve_unless_staged`."
       category: "Bu kategorideki gönderiler, moderatör tarafından manuel onay gerektirir. Kategori ayarlarına bakın."
       must_approve_users: "Tüm yeni kullanıcılar yetkili tarafından onaylanmalıdır. Bkz. “must_approve_users`."
       invite_only: "Tüm yeni kullanıcılar davet edilmelidir. Bkz.`invite_only`"
       email_auth_res_enqueue: "Bu e-posta DMARC kontrolünde başarısız oldu, büyük olasılıkla kimden geldiği belli değil. Daha fazla bilgi için satır e-posta başlıklarına bakın."
       email_spam: "Bu e-posta, 'email_in_spam_header' içinde tanımlanan başlık tarafından spam olarak işaretlendi."
+      queued_by_staff: "Bir görevli bu gönderinin incelenmesi gerektiğini düşünüyor. Bu yapılana kadar gizlenmiş halde kalacak."
     actions:
       agree:
         title: "Kabul..."
@@ -3640,6 +3620,17 @@ tr_TR:
           description: "Kullanıcı silinecek, kullanıcının IP ve e-posta adresini engelleyeceğiz."
       reject:
         title: "Reddet"
+        bundle_title: "Reddet..."
+      reject_and_suspend:
+        title: "Reddet ve Kullanıcıyı Askıya Al"
+      reject_and_silence:
+        title: "Reddet ve Kullanıcıyı Sustur"
+      reject_and_delete:
+        title: "Reddet ve Gönderiyi Sil"
+      reject_and_keep_deleted:
+        title: "Gönderiyi silinmiş olarak tut"
+      approve_and_restore:
+        title: "Gönderiyi Onayla ve Geri Yükle"
       delete_user:
         title: "Kullanıcıyı Sil"
         confirm: "Bu kullanıcıyı silmek istediğinize emin misiniz? Bu, tüm gönderilerini kaldıracak, kullanıcının e-postala ve IP adresini engelleyecektir."
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index b7a903f050..916afcd705 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -39,6 +39,7 @@ uk:
   title: "Discourse"
   topics: "Теми"
   posts: "дописи"
+  views: "переглядів"
   loading: "Завантаження"
   powered_by_html: 'При підтримці <a href="http://www.discourse.org">Discourse</a>, краще за все використовувати з увімкненим JavaScript'
   sign_up: "Зареєструватись"
@@ -50,12 +51,17 @@ uk:
   remove_posts_deleted_by_author: "Видалено автором"
   redirect_warning: "Нам не вдалося переконатися, що обране вами посилання дійсно було розміщено на форумі. Якщо ви хочете продовжити, виберіть посилання нижче."
   on_another_topic: "На іншу тему"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} від %{username}"
   themes:
     bad_color_scheme: "Неможливо оновити тему, недійсна палітра кольорів"
     other_error: "Щось пішло не так з оновленням теми"
+    ember_selector_error: "На жаль, використання селекторів CSS #ember або .ember-view заборонено, оскільки ці імена генеруються динамічно під час виконання та змінюватимуться з часом, що в кінцевому підсумку призведе до пошкодження CSS. Спробуйте інший селектор."
     compile_error:
       unrecognized_extension: "Нерозпізнане розширення файлу: %{extension}"
     import_error:
+      generic: Під час імпорту цієї теми сталася помилка
       about_json: "Помилка імпорту: about.json не існує або недійсна. Ви впевнені, що це тема дискурсу?"
       about_json_values: "about.json має неприпустимі значення: %{errors}"
       modifier_values: "about.json має неприпустимі значення: %{errors}"
@@ -139,6 +145,9 @@ uk:
       inclusion: не включено до списку
       invalid: недійсний
       is_invalid: "не зовсім зрозуміло, це речення закінчене?"
+      is_invalid_meaningful: "здається незрозумілим, більшість слів містять одні й ті ж літери?"
+      is_invalid_unpretentious: "здається незрозумілим, одне або більше слів дуже довге?"
+      is_invalid_quiet: "здається незрозумілим, ви дійсно хотіли ввести весь текст ВЕЛИКИМИ ЛІТЕРАМИ?"
       invalid_timezone: "'%{tz}' не є дійсним часовим поясом"
       contains_censored_words: "містить такі нецензурні слова: %{censored_words}"
       less_than: має бути менше %{count}
@@ -169,7 +178,7 @@ uk:
         many: неправильна довжина (має містити символи %{count})
         other: неправильна довжина (має містити %{count} символи)
       other_than: "не має бути рівним %{count}"
-      sso_overrides_username: "Ім’я користувача потрібно оновити на стороні постачальника послуг SSO, оскільки налаштування `sso_overrides_username` увімкнено."
+      auth_overrides_username: "Ім'я користувача потрібно оновити на стороні постачальника аутентифікації, оскільки параметр `auth_overrides_username` увімкнено."
     template:
       body: ! "Проблеми на цих полях:"
       header:
@@ -190,36 +199,61 @@ uk:
       default_tags_already_selected: "Ви не можете вибрати тег, який використовується в іншому списку."
       s3_upload_bucket_is_required: "Ви не можете ввімкнути завантаження на S3, якщо ви не надали 's3_upload_bucket'."
       enable_s3_uploads_is_required: "Ви не можете включити інвентар до S3, якщо ви не включили завантаження S3."
+      page_publishing_requirements: "Публікація сторінки не може бути ввімкнена якщо обмежено доступ до медіа контенту."
       s3_backup_requires_s3_settings: "Ви не можете використовувати S3 як резервне розташування, якщо ви не вказали '%{setting_name}'."
       s3_bucket_reused: "Не можна використовувати одне й те саме bucket для 's3_upload_bucket' та 's3_backup_bucket'. Виберіть інше bucket або використовуйте інший шлях для кожного bucket."
       secure_media_requirements: "Спочатку потрібно увімкнути захист файлів для завантаження S3."
       share_quote_facebook_requirements: "Ви повинні встановити ідентифікатор додатка Facebook, щоб увімкнути обмін цитатами для Facebook."
       second_factor_cannot_enforce_with_socials: "Ви не можете примусово активувати двофакторну автентифікацію через вхід у соціальні мережі. Спочатку потрібно вимкнути вхід через: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Ви не можете застосувати 2FA, якщо локальні входи відключені."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "Ви не можете застосувати 2FA, якщо ввімкнено DiscourseConnect."
       local_login_cannot_be_disabled_if_second_factor_enforced: "Ви не можете відключити локальний вхід, якщо застосовується 2FA. Вимкніть примусовий 2FA перед відключенням локальних входів."
       cannot_enable_s3_uploads_when_s3_enabled_globally: "Ви не можете ввімкнути завантаження S3, оскільки завантаження S3 вже увімкнено, і включення цього рівня на сайті може спричинити критичні проблеми з завантаженнями"
+      cors_origins_should_not_have_trailing_slash: "Не слід додавати слеш (/) до кросс-доменних запитів (CORS)."
     conflicting_google_user_id: 'Ідентифікатор облікового запису Google для цього облікового запису змінився; втручання персоналу потрібно з міркувань безпеки. Будь ласка, зв''яжіться з персоналом і вкажіть <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+    onebox:
+      invalid_address: "На жаль, нам не вдалося створити попередній перегляд для цієї веб-сторінки, оскільки сервер \"%{hostname}\" не вдалося знайти. Замість попереднього перегляду у вашому дописі з’явиться лише посилання. :cry:"
+      error_response: "На жаль, нам не вдалося створити попередній перегляд для цієї веб-сторінки, оскільки веб-сервер повернув код помилки %{status_code}. Замість попереднього перегляду у вашому дописі з’явиться лише посилання. :cry:"
+      missing_data:
+        one: "На жаль, нам не вдалося створити попередній перегляд цієї веб-сторінки, оскільки не вдалося знайти такий тег oEmbed / OpenGraph: %{missing_attributes}"
+        few: "На жаль, нам не вдалося створити попередній перегляд цієї веб-сторінки, оскільки не вдалося знайти такий тег oEmbed / OpenGraph: %{missing_attributes}"
+        many: "На жаль, нам не вдалося створити попередній перегляд цієї веб-сторінки, оскільки не вдалося знайти такий тег oEmbed / OpenGraph: %{missing_attributes}"
+        other: "На жаль, нам не вдалося створити попередній перегляд для цієї веб-сторінки, оскільки не вдалося знайти такі теги oEmbed / OpenGraph: %{missing_attributes}"
+  word_connector:
+    comma: ", "
   invite:
     expired: "Термін дії вашого коду запрошення минув. Будь ласка, <a href='%{base_url}/about'>зв'яжіться з персоналом</a>."
     not_found: "Невірний код запрошення. Будь ласка, <a href='%{base_url}/about'>зв'яжіться з персоналом</a>."
     not_found_json: "Ваш маркер запрошення недійсний. Зверніться до персоналу."
-    error_message: "Під час прийняття запрошення сталася помилка. Зверніться до адміністратора сайту."
+    not_matching_email: "Адреса вашої електронної пошти та адреса електронної пошти, пов'язана з токеном запрошення, не збігаються. Будь ласка, зв’яжіться з персоналом."
+    not_found_template: |
+      <p>Ваше запрошення на <a href="%{base_url}">%{site_name}</a> вже використано.</p>
+
+      <p>Якщо ви пам'ятаєте ваш пароль, ви можете <a href="%{base_url}/login">Увійти в акаунт</a>.</p>
+
+      <p>В іншому випадку <a href="%{base_url}/password-reset">Відновіть пароль</a>.</p>
+    not_found_template_link: |
+      <p>Запрошення на <a href="%{base_url}">%{site_name}</a> більше не дійсне. Будь ласка, попросіть того, хто запросив вас, надіслати вам нове запрошення.</p>
     user_exists: "Немає необхідності надсилати запрошення <b>%{email}</b>, такий <a href='%{base_path}/u/%{username}/summary'>акаунт вже існує!</a>"
     confirm_email: "<p>Ви майже закінчили! Ми відправили лист активації на Вашу електронну адресу e-mail пошти. Будь ласка, дотримуйтесь інструкцій в листі, щоб активувати свій акаунт. </p><p> Якщо лист не приходить, перевірте папку зі спамом. </p>"
     cant_invite_to_group: "Ви не можете запрошувати користувачів до зазначеної групи. Переконайтеся, що ви власник групи, в яку ви намагаєтеся запросити."
     disabled_errors:
-      sso_enabled: "Запрошення вимкнено, оскільки SSO увімкнено."
-      local_logins_disabled: "Запрошення вимкнено, оскільки параметр \"увімкнути локальні входи\" вимкнено."
+      discourse_connect_enabled: "Запрошення вимкнено, оскільки ввімкнено функцію DiscourseConnect."
       invalid_access: "Вам не дозволено переглядати запитаний ресурс."
   bulk_invite:
     file_should_be_csv: "Завантажений файл повинен мати формат CSV."
     max_rows: "Спочатку буде надіслано тільки %{max_bulk_invites} запрошення. Спробуйте розділити файл на менші частини."
     error: "Під час завантаження цього файлу сталася помилка. Будь-ласка спробуйте пізніше."
   invite_link:
+    email_taken: "Ця електронна пошта вже використовується. Якщо ви вже зареєстровані тоді авторизуйтесь, або скиньте пароль."
     max_redemptions_limit: "має бути від 2 до %{max_limit}."
   topic_invite:
     failed_to_invite: "Користувача не можна запросити в цю тему без членства в одній із наступних груп: %{group_names}."
     user_exists: "На жаль, цього користувача вже запрошено. Ви можете запросити користувача до теми лише один раз."
+    muted_invitee: "На жаль, цей користувач вас ігнорує."
+    muted_topic: "На жаль, цей користувач ігнорує цю тему."
+    receiver_does_not_allow_pm: "На жаль, цей користувач не дозволяє вам надсилати йому приватні повідомлення."
+    sender_does_not_allow_pm: "На жаль, ви не дозволяєте цьому користувачеві надсилати вам приватні повідомлення."
   backup:
     operation_already_running: "Наразі виконується операція. Неможливо почати нову роботу зараз."
     backup_file_should_be_tar_gz: "Файл резервної копії повинен бути архівом .tar.gz."
@@ -242,6 +276,7 @@ uk:
   email_template_cant_be_modified: "Цей шаблон електронної пошти неможливо змінити"
   invalid_whisper_access: "Або шепіт не включений, або у вас немає доступу до створення допису шепоту"
   not_in_group:
+    title_topic: "Щоб переглянути цю тему, потрібно надіслати запит на членство в групі «%{group}»."
     title_category: "Ви повинні бути в групі, щоб побачити цю категорію."
     request_membership: "Попросити членство"
     join_group: "Приєднатись до групи"
@@ -331,8 +366,10 @@ uk:
   max_pm_recipients: "Вибачте, ви можете надіслати повідомлення максимум %{recipients_limit} одержувачу."
   pm_reached_recipients_limit: "Вибачте, ви не можете мати більше, ніж %{recipients_limit} одержувачів у повідомленні."
   removed_direct_reply_full_quotes: "Автоматично видаляти цитату з усього попереднього допису."
+  watched_words_auto_tag: "Тема з автоматичними тегами"
   secure_upload_not_allowed_in_public_topic: "На жаль, такі захищені завантаження не можна використовувати в загальнодоступній темі: %{upload_filenames}."
   create_pm_on_existing_topic: "На жаль, Ви не можете створити ПП в існуючій темі."
+  slow_mode_enabled: "Ця тема знаходиться у повільному режимі."
   just_posted_that: "це дуже схоже на те, що ви нещодавно дописували"
   invalid_characters: "містить неприпустимі символи"
   is_invalid: "не зовсім зрозуміло, це закінчене речення?"
@@ -411,7 +448,14 @@ uk:
       email_already_used_in_category: "'%{email}' вже використовується категорією'%{category_name}'."
       cant_allow_membership_requests: "Ви не можете дозволяти користувацькі заявки для групи без будь-яких власників."
       already_requested_membership: "Ви вже запросили членство в цій групі."
-      adding_too_many_users: "Одночасно можна додати щонайбільше %{limit} користувачів"
+      adding_too_many_users:
+        one: "Одночасно можна додати не більше %{count} користувача"
+        few: "Одночасно можна додати не більше %{count} користувачів"
+        many: "Одночасно можна додати не більше %{count} користувачів"
+        other: "Одночасно можна додати не більше %{count} користувачів"
+      usernames_or_emails_required: "Потрібно вказати ім'я користувачів або адреси електронної пошти."
+      no_invites_with_discourse_connect: "Ви можете запрошувати тільки зареєстрованих користувачів, якщо DiscourseConnect увімкнено"
+      no_invites_without_local_logins: "Ви можете запрошувати тільки зареєстрованих користувачів, коли локальні логіни вимкнено"
     default_names:
       everyone: "усі"
       admins: "адміністратори"
@@ -435,19 +479,19 @@ uk:
       many: "%{count} дописів"
       other: "%{count} дописів"
     "new-topic": |
-      Ласкаво просимо на сайт %{site_name} &mdash; **Дякую за відкриття нової теми!**
+      Ласкаво просимо на сайт %{site_name} &mdash; **Дякуємо за відкриття нової теми!**
 
       Коли ви створюєте нову тему, подумайте:
 
       - Чи цікавий придуманий заголовок? Чи достатньо точно він описує те, що ви хочете обговорити у вашій темі?
 
-      - Про що ваша тема? Кому вона буде цікава? Чому вона важлива для обговорення? Який, на вашу думку, буде реакція спільноти на тему?
+      - Про що ваша тема? Кому вона буде цікава? Чому вона важлива для обговорення? Якою, на вашу думку, буде реакція спільноти на тему?
 
-      - Постарайтеся включити в текст повідомлення відповідні теги, за якими інші зможуть * знайти * тему. Виберіть розділ, до якого ваша тема підходить за змістом.
+      - Постарайтеся включити в текст повідомлення відповідні теги, за якими інші зможуть *знайти* тему. Виберіть розділ, до якого ваша тема підходить за змістом (або тег).
 
       Більше інформації ви знайдете в нашому [керівництві користувача](%{base_path}/guidelines). Дане вікно буде показуватися, поки ви створюєте свої перші %{education_posts_text}.
     "new-reply": |
-      Ласкаво просимо на сайт %{site_name} &mdash; **Спасибі за участь в обговоренні!**
+      Ласкаво просимо на сайт %{site_name} &mdash; **Дякуємо за участь в обговоренні!**
 
       - Як ви думаєте, чи поліпшить вашу відповідь обговорення в цілому, хоча б трохи?
 
@@ -513,6 +557,7 @@ uk:
               cant_send_pm: "На жаль, ви не можете надіслати особисте повідомлення цьому користувачеві."
               no_user_selected: "Ви повинні вибрати дійсного користувача."
               reply_by_email_disabled: "Відповідь електронною поштою вимкнено."
+              send_to_email_disabled: "На жаль, ви не можете надсилати особисті повідомлення на електронну пошту."
               target_user_not_found: "Одного з користувачів, яким ви надсилаєте це повідомлення, не вдалося знайти."
               unable_to_update: "При оновленні цієї теми сталася помилка."
               unable_to_tag: "Сталася помилка під час додавання тегів до теми."
@@ -561,6 +606,9 @@ uk:
           attributes:
             execute_at:
               in_the_past: "повинні бути в майбутньому."
+            duration_minutes:
+              cannot_be_zero: "має бути більше 0."
+              exceeds_maximum: "не може бути більше 20 років."
         translation_overrides:
           attributes:
             value:
@@ -667,20 +715,8 @@ uk:
     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: "Ви досягли максимальної кількості відписок через email на сьогодні. Будь ласка зачекайте %{time_left} перед наступною спробою."
-      topic_invitations_per_day: "Ви досягли максимальної кількості запрошень в теми. Будь ласка зачекайте %{time_left} перед наступною спробою."
     hours:
       one: "%{count} година"
       few: "%{count} години"
@@ -832,7 +868,7 @@ uk:
       unknown: "невідомий броузер"
     device:
       android: "Android Пристрій"
-      chromebook: "Chromebook"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -843,7 +879,7 @@ uk:
       unknown: "невідомий пристрій"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -858,6 +894,7 @@ uk:
     error_staged: "Під час зміни вашої електронної адреси сталася помилка. Адреса вже використовується іншим користувачем."
     already_done: "На жаль, це підтвердження більше не дійсне. Можливо, вашу електронну пошту вже змінено?"
     confirm: "Підтвердіть"
+    max_secondary_emails_error: "Ви досягли максимальної кількості додаткових адрес електронної пошти ."
     authorizing_new:
       title: "Підтвердьте свій новий електронний лист"
       description: "Підтвердьте, що хочете, щоб ваша електронна адреса була змінена на:"
@@ -939,6 +976,7 @@ uk:
       others: "Немає активностей."
     no_bookmarks:
       self: "У вас немає публікацій у закладках. Закладки дозволяють швидко переходити до обраних дискусій."
+      search: "Немає закладок за таким пошуковим запитом."
       others: "Закладок немає."
     no_likes_given:
       self: "Вам не сподобалися ніякі повідомлення."
@@ -1009,7 +1047,7 @@ uk:
     mailing_list_mode: "Відключити режим постійної розсилки"
     all: "Не надсилати мені жодних листів від %{sitename}"
     different_user_description: "На даний момент ви ввійшли як інший користувач, ніж той, кому ми надіслали електронну пошту. Вийдіть із системи або перейдіть в анонімний режим та спробуйте ще раз."
-    not_found_description: "На жаль, ми не змогли знайти інформацію про вашу розсилку. Можливо посилання, отримане у листі вами, більше не є дійсним?"
+    not_found_description: "На жаль, ми не змогли знайти цю підписку. Можливо, посилання у вашій електронній пошті застаріле та закінчилось?"
     log_out: "Вийти"
     submit: "Зберегти налаштування"
     digest_frequency:
@@ -1045,6 +1083,7 @@ uk:
       read: "Прочитати все"
       write: "Написати все"
       one_time_password: "Створити токен для одноразового входу"
+      bookmarks_calendar: "Читання нагадувань про закладки"
     invalid_public_key: "Вибачте, відкритий ключ недійсний."
     invalid_auth_redirect: "Вибачте, цей auth_redirect хост не дозволено."
     invalid_token: "Токен відсутній, недійсний або прострочений."
@@ -1380,8 +1419,13 @@ uk:
     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."
+    google_oauth2_config_warning: 'Сервер налаштований так, щоб дозволити реєстрацію та вхід у систему за допомогою Google OAuth2 (enable_google_oauth2_logins), але значення ідентифікатора клієнта та секретні значення клієнта не встановлені. Перейдіть до <a href="%{base_path}/admin/site_settings">Налаштування сайту</a> та оновіть налаштування. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Дивіться цей посібник, щоб дізнатися більше</a>.'
+    facebook_config_warning: 'Сервер налаштований на дозвіл реєстрації та входу в систему за допомогою Facebook (enable_facebook_logins), але ідентифікатор додатка та секретні значення додатка не встановлено. Зайдіть в <a href="%{base_path}/admin/site_settings">Налаштування сайту</a> та змініть налаштування. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Дивіться цей посібник, щоб дізнатися більше</a>.'
+    twitter_config_warning: 'Сервер налаштований так, щоб дозволяти реєстрацію та вхід у систему за допомогою Twitter (enable_twitter_logins), але ключові та секретні значення не встановлені. Перейдіть до <a href="%{base_path}/admin/site_settings">Налаштування сайту</a> та змініть налаштування. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Дивіться цей посібник, щоб дізнатися більше</a>.'
+    github_config_warning: 'Сервер налаштований так, щоб дозволяти реєстрацію та вхід у систему за допомогою GitHub (enable_github_logins), але значення клієнта та секретні значення не встановлені. Перейдіть до <a href="%{base_path}/admin/site_settings">Налаштування сайту</a> та оновіть налаштування. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Дивіться цей посібник, щоб дізнатися більше</a>.'
     s3_config_warning: 'Сервер налаштований для завантаження файлів у S3, але принаймні одне з наступних налаштувань не встановлено: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile або s3_upload_bucket. Перейдіть до <a href="%{base_path}/admin/site_settings">Налаштування сайту</a> та змініть налаштування. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Див. "Як налаштувати завантаження зображень на S3?" щоб дізнатися більше</a>.'
     s3_backup_config_warning: 'Сервер налаштований на завантаження резервних копій на S3, але хоча б один параметр не встановлено: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, або s3_backup_bucket. Перейдіть на <a href="%{base_path}/admin/site_settings">налаштування сайту</a> та оновіть налаштування. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Дивіться "Як налаштувати завантаження зображень на S3?", щоб дізнатися більше</a>.'
+    s3_cdn_warning: 'Сервер налаштований на завантаження файлів на S3, але немає S3 CDN настроєно. Це може призвести до дорогих витрат S3 та зниження продуктивності сайту. <a href="https://meta.discourse.org/t/-/148916" target="_blank">Див. «Using Object Storage for Uploads», щоб дізнатися більше</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 закінчується косою рискою."
@@ -1392,14 +1436,11 @@ uk:
       other: "Опитування електронної пошти спричинило %{count} помилок за останні 24 години. Подивіться на <a href='%{base_path}/logs' target='_blank'>журнали</a> для більш детальної інформації."
     missing_mailgun_api_key: "Сервер налаштований для надсилання електронної пошти через Mailgun, але ви не надали ключ API, який використовується для перевірки повідомлень webhook."
     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> ."
     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> або вимкніть налаштування веб-сайту \"Регулярні вирази контрольованих слів\"."
   site_settings:
     display_local_time_in_user_card: "Відображення локального часу на основі часового поясу користувача під час відкриття картки користувача."
     censored_words: "Слова, які будуть автоматично замінені на &#9632;&#9632;&#9632;&#9632;"
@@ -1414,6 +1455,7 @@ uk:
     max_post_length: "Максимально допустима кількість символів в одному повідомленні."
     topic_featured_link_enabled: "Дозволити публікувати посилання з темами."
     show_topic_featured_link_in_digest: "Показати посилання на тему в e-mail дайджесті."
+    min_topic_views_for_delete_confirm: "Мінімальна кількість переглядів, яку повинна мати тема, щоб при її видаленні з’явилося спливаюче вікно підтвердження"
     min_topic_title_length: "Мінімально допустима кількість символів в назві теми."
     max_topic_title_length: "Максимально допустима кількість символів в назві теми."
     min_personal_message_title_length: "Мінімально допустима кількість символів в заголовку повідомлення в бесіді."
@@ -1426,10 +1468,8 @@ uk:
     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: "Дозволити теми з однаковими, дублюючими назвами."
     allow_duplicate_topic_titles_category: "Дозволити теми з однаковими, дубльованими заголовками, якщо категорія інша. allow_duplicate_topic_titles має бути вимкнено."
@@ -1439,7 +1479,7 @@ uk:
     site_description: "Опишіть сайт одним реченням, для використання опису в мета-тег description."
     short_site_description: "Короткий опис, що використовується в тезі заголовка на головній сторінці"
     contact_email: "E-mail адреса ключової контактної особи, відповідальної за цей сайт. Використовується для критичних повідомлень, або термінові звернення через контактну форму на сторінці <a href='%{base_path}/about' target='_blank'>/about</a>."
-    contact_url: "Контактний URL цього сайту. Використовується на сторінці <a href='%{base_path}/about' target='_blank'>/about</a> для термінових питань."
+    contact_url: "Контактний URL цього сайту. Вказано на сторінці <a href='%{base_path}/about' target='_blank'>/about</a> для термінових питань."
     crawl_images: "Отримувати зображення з віддалених адрес, щоб встановити правильні розміри ширини та висоти."
     download_remote_images_to_local: "Завантажувати картинки, вставлені в повідомлення посиланнями на інші сайти, і зберігати їх локально, щоб запобігти їх зміни або втрату."
     download_remote_images_threshold: "Мінімальне доступне місце на диску (у відсотках), при якому дозволено автоматичне скачування картинок для локального зберігання."
@@ -1469,6 +1509,7 @@ uk:
     enable_inline_onebox_on_all_domains: "Ігнорувати налаштування сайту inline_onebox_domain_allowlist і дозволити вбудований контент для всіх доменів."
     force_custom_user_agent_hosts: "Хости, для яких використовується агент користувача розумних вставок для всіх запитів. (Особливо корисно для хостів, які обмежують доступ користувальницького агента)."
     max_oneboxes_per_post: "Максимальна кількість oneboxes в повідомленні."
+    facebook_app_access_token: "Токен, згенерований з ідентифікатора додатка Facebook і секрету. Використовується для генерації розумних вставок Instagram."
     logo: "Зображення логотипу в лівому верхньому кутку вашого сайту. Використовуйте широке прямокутне зображення висотою 120 і співвідношенням сторін більше 3:1. Якщо залишити поле порожнім, буде показаний текст заголовка сайту."
     logo_small: "Невелике зображення логотипу в лівому верхньому кутку вашого сайту, видно при прокручуванні вниз. Використовуйте квадратне зображення 120×120. Якщо залишити порожнім, буде показаний домашній гліф."
     digest_logo: "Альтернативне зображення логотипу, що використовується у верхній частині e-mail пошти вашого сайту. Використовуйте зображення широкого прямокутника. Не використовуйте SVG-образ. Якщо залишити порожнім, буде використовуватися зображення з налаштування `логотип`."
@@ -1478,6 +1519,7 @@ uk:
     mobile_logo_dark: "Темна альтернатива \"мобільного логотипу\" сайту."
     large_icon: "Зображення використовується в якості основи для інших значків метаданих. В ідеалі має бути більше 512 х 512. Якщо залишити поле порожнім, буде використовуватися logo_small."
     manifest_icon: "Зображення використовується в якості логотипу / заставки на Android. Буде автоматично змінено до 512 × 512. Якщо залишити порожнім, буде використовуватися large_icon."
+    manifest_screenshots: "Знімки екрана, що демонструють особливості та функціональні можливості вашого застосунку на сторінці вимоги його встановлення. Усі зображення мають завантажуватися локально та бути однакового розміру."
     favicon: "Фавікон для вашого сайта, див. <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Для правильної роботи із CDN він повинен бути png. Буде змінений до 32x32. Якщо залишити порожнім, буде використовуватися large_icon."
     apple_touch_icon: "Значок, який використовується для сенсорних пристроїв Apple. Буде автоматично змінено на розмір до 180x180. Якщо залишити порожнім, буде використовуватися large_icon."
     opengraph_image: "Зображення opengraph за замовчуванням, використовується, коли на сторінці немає іншого відповідного зображення. Якщо залишити порожнім, буде використовуватися large_icon"
@@ -1486,8 +1528,8 @@ uk:
     email_custom_headers: "Список додаткових заголовків у листах електронної пошти, розділених вертикальною рискою"
     email_subject: "Налаштовуваний формат теми для стандартних листів. Дивитися: <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
     detailed_404: "Надає користувачам більше інформації про те, чому він не може отримати доступ до певної теми. Примітка: Це не дуже безпечно, оскільки користувачі дізнаються, чи URL-адреса посилається на дійсну тему."
+    enforce_second_factor: "Примусова активація двофакторної аутентифікації. Виберіть \"Всі\" для примусового увімкнення всім користувачам. Виберіть \"Персонал\" для використання тільки для співробітників користувачів."
     force_https: "Примусово використовувати лише HTTPS для вашого сайту. УВАГА: можуть зникнути зображення до моменту, коли HTTPS повністю налаштовано і працюватиме всюди! Ви перевірили всі свої CDN, соціальні логіни і будь-які зовнішні логотипи і залежності, щоб переконатися, що вони всі сумісні з HTTPS, також?"
-    same_site_cookies: "Використовувати файли cookie, зі знешкодженням при перехресному запиті CSRF для підтримуючих це браузерів (Lax або Strict). Попередження: Strict будуть працювати тільки на сайтах, які використовують SSO."
     summary_score_threshold: "Мінімальна оцінка повідомлення, необхідна для його включення в зведення по темі"
     summary_posts_required: "Мінімальна кількість дописів у темі перед увімкненням \"Підсумок теми\". Зміни цього налаштування застосовуватимуться до тем минулого тижня."
     summary_likes_required: "Мінімальна кількість вподобань у темі перед увімкненням \"Підсумок теми\". Зміни цього налаштування застосовуватимуться до тем минулого тижня."
@@ -1496,6 +1538,7 @@ uk:
     enable_personal_messages: "Дозволити користувачам рівня довіри 1 (який можна налаштувати через мінімальний рівень довіри для надсилання повідомлень) створювати повідомлення та відповідати на повідомлення. Зверніть увагу, що співробітники завжди можуть надсилати повідомлення, незважаючи ні на що."
     enable_system_message_replies: "Дозволяє користувачам відповідати на системні повідомлення, навіть якщо приватні повідомлення відключені"
     enable_long_polling: "Використовувати механізм long polling для повідомлень про події"
+    enable_chunked_encoding: "Увімкнути дозвіл на фрагментацію повідомлень (chunked encoding) на сервері. Ця функція працює на більшості випадків, однак деякі проксі-сервери можуть буферизувати контент, що спричиняє затримку відповідей"
     long_polling_base_url: "Базовий URL, використовуваний для long polling (при використанні CDN для роздачі динамічного контенту встановіть в цьому параметрі адресу origin pull), наприклад: http://origin.site.com"
     long_polling_interval: "Час, який очікує сервер до відповіді клієнтам, коли немає даних для відправки (тільки для користувачів, які увійшли на сайт)"
     polling_interval: "Якщо не використовується long polling, як часто слід авторизованим клієнтам опитувати сервер, в мілісекундах"
@@ -1527,6 +1570,10 @@ uk:
     pending_users_reminder_delay: "Повідомляти модераторів, якщо нові користувачі чекають схвалення довше ніж стільки годин. Встановіть -1 для відключення цих повідомлень."
     persistent_sessions: "Користувачі залишатимуться авторизовані при закритті веб-браузера"
     maximum_session_age: "Користувач залишиться в системі протягом n годин з моменту останнього відвідування"
+    ga_version: "Версія Google Universal Analytics для використання: v3 (analytics.js), v4 (gtag)"
+    ga_universal_tracking_code: "Ідентифікатор коду відстеження Google Universal Analytics, наприклад: UA-12345678-9; див. <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_domain_name: "Доменне ім’я Google Universal Analytics, наприклад: mysite.com; див. <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "Увімкніть міждоменне відстеження Google Universal Analytics. До вихідних посилань на ці домени буде додано ідентифікатор клієнта. Див. <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Посібник міждоменного відстеження Google.</a>"
     gtm_container_id: "Контейнер Google Tag Manager. Наприклад: GTM-ABCDEF. <br/>Примітка: Сторонні сценарії, завантажені GTM повинні бути дозволені в 'content security policy script src'."
     enable_escaped_fragments: "Поверніться до API Ajax-Crawling від Google, якщо веб-сканер не виявлено. Див. <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     moderators_manage_categories_and_groups: "Дозволити модераторам керувати категоріями та групами"
@@ -1590,27 +1637,8 @@ uk:
     min_admin_password_length: "Мінімальна довжина пароля для адміністратора."
     password_unique_characters: "Мінімальна довжина пароля для адміністратора."
     block_common_passwords: "Не дозволяти використовувати паролі зі списку 10 000 самих часто використовуваних паролів."
-    external_auth_skip_create_confirm: Під час реєстрації через зовнішню автентифікацію пропустіть спливаюче вікно створення облікового запису. Найкраще використовувати поряд із sso_overrides_email, sso_overrides_username та sso_overrides_name.
-    external_auth_immediately: "Автоматично перенаправляти на зовнішню систему входу без взаємодії з користувачем. Це набуває чинності лише тоді, коли login_required має значення true, і існує лише один зовнішній метод автентифікації"
-    enable_sso: "Увімкніть єдиний вхід через зовнішній сайт (УВАГА: ПОШТОВІ АДРЕСИ КОРИСТУВАЧІВ *ПОВИННІ* бути перевірені ЗОВНІШНІМ САЙТОМ!)"
-    verbose_sso_logging: "Записувати докладні дані діагностики, пов'язані з SSO у файл <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    enable_sso_provider: "Впровадити протокол постачальника єдиного входу Discourse SSO provider protocol. Вимагає встановлення параметра sso_provider_secrets"
-    sso_url: "URL-адреса входу (повинна містити http: // або https: //)"
-    sso_secret: "Секретний набір символів, який використовується для перевірки автентичності зашифрованого входу за допомогою SSO, переконайтеся, що це 10 або більше символів"
-    sso_provider_secrets: "Перелік доменно-секретних пар, які використовують дискурс як постачальник 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. Якщо цю опцію ввімкнено, користувачам не буде дозволено завантажувати аватари в Дискурсі."
-    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 (за замовчуванням шлях повернення повинен бути на поточному сайті)"
-    enable_local_logins: "Увімкнути локальні акаунти для входу в систему для імені користувача та пароля. Це потрібно ввімкнути для запрошень на роботу. ПОПЕРЕДЖЕННЯ: коли його відключено, ви, можливо, не зможете увійти в систему, якщо раніше не створили хоча б один метод альтернативного входу."
+    auth_immediately: "Автоматично перенаправляти на зовнішню систему входу без взаємодії з користувачем. Це набуває чинності лише тоді, коли login_required має значення true, і існує лише один зовнішній метод автентифікації"
+    discourse_connect_overrides_bio: "Перезаписує інформацію в профіль користувача і не дозволяє користувачеві його змінювати"
     enable_local_logins_via_email: "Дозволити користувачам запитувати посилання для входу в один клік та надсилати їм електронною поштою цього посилання."
     allow_new_registrations: "Дозволити реєстрацію нових користувачів. Вимкніть, щоб заборонити відвідувачам створювати нові облікові записи."
     enable_signup_cta: "Покажіть повідомлення анонімним користувачам, які повернулися, з пропозицією зареєструвати обліковий запис."
@@ -1618,9 +1646,19 @@ uk:
     google_oauth2_client_id: "Client ID для вашого Google додатка."
     google_oauth2_client_secret: "Client secret для вашого Google додатка"
     google_oauth2_prompt: "Необов’язковий розділений пробілом список значень, який вказує, чи запитує сервер авторизацію користувача для повторної автентифікації та згоди. Див. <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> щодо можливих значень."
+    google_oauth2_hd: "Необов’язковий домен, розміщений у Google Apps Hosted, до якого вхід буде обмежений. Див <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> для більш докладної інформації."
+    enable_twitter_logins: "Увімкніть автентифікацію Twitter, потрібні twitter_consumer_key та twitter_consumer_secret. Див. <a href='https://meta.discourse.org/t/13395' target='_blank'>Configuring Twitter login (and rich embeds) for Discourse</a>."
     twitter_consumer_key: "Ключ користувача для аутентифікації в Twitter, зареєстрований за адресою <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Секретний номер для перевірки справжності Twitter, зареєстрований в <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
+    enable_facebook_logins: "Увімкніть автентифікацію Facebook, потрібні facebook_app_id та facebook_app_secret. Див. <a href='https://meta.discourse.org/t/13394' target='_blank'>Configuring Facebook login for Discourse</a>."
+    facebook_app_id: "Ідентифікатор застосунку для автентифікації та спільного використання Facebook, зареєстрований за адресою <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    facebook_app_secret: "Секрет застосунку для автентифікації та спільного використання Facebook, зареєстрований за адресою <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    enable_github_logins: "Увімкнути автентифікацію GitHub, потрібні github_client_id та github_client_secret. Див. <a href='https://meta.discourse.org/t/13745' target='_blank'>Configuring GitHub login for Discourse</a>."
+    github_client_id: "Ідентифікатор клієнта для автентифікації GitHub, зареєстрований за адресою <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    github_client_secret: "Секрет клієнта для автентифікації GitHub, зареєстрований за адресою <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     enable_discord_logins: "Дозволити користувачам вхід за допомогою Discord?"
+    discord_client_id: 'Discord ID клієнта (потрібен такий? відвідайте <a href="https://discordapp.com/developers/applications/me">the Discord developer portal</a>)'
+    discord_secret: "Discord секретний ключ"
     enable_backups: "Дозволити адміністраторам створювати резервні копії форуму"
     allow_restore: "Дозволити імпорт, який може замінити ВСІ дані сайту. Залиште вимкненим, якщо не плануєте відновлювати резервну копію"
     maximum_backups: "Максимальна кількість резервних копій для зберігання на диску. Старіші резервні копії автоматично видаляються"
@@ -1635,7 +1673,6 @@ uk:
     active_user_rate_limit_secs: "Як часто ми оновлюємо 'last_seen_at' поле, в секундах"
     verbose_localization: "Показувати ключі використовуваних рядків в інтерфейсі для перекладу на іншу мову"
     previous_visit_timeout_hours: "Скільки часу триває візит, перш ніж ми вважатимемо це 'попереднім' візитом, в годинах"
-    rebake_old_posts_count: "Кількість старих дописів, які потрібно перевіряти кожні 15 хвилин."
     enable_safe_mode: "Дозволити користувачам входити в безпечний режим для налагодження плагінів."
     rate_limit_create_topic: "Користувачі не можуть створювати більше однієї нової теми за вказаний час, в секундах."
     rate_limit_create_post: "Користувачі не можуть писати більше одного нового допису за вказаний час, в секундах."
@@ -1650,8 +1687,6 @@ uk:
     max_topic_invitations_per_day: "Максимальна кількість запрошень в тему, яке може відправити користувач протягом дня."
     max_logins_per_ip_per_hour: "Максимальна кількість входів в систему на IP-адресу за годину"
     max_logins_per_ip_per_minute: "Максимальна кількість входів в систему на IP-адресу за годину"
-    max_post_deletions_per_minute: "Максимальна кількість записів, які користувач може видалити за хвилину."
-    max_post_deletions_per_day: "Максимальна кількість записів, які користувач може видалити за день."
     alert_admins_if_errors_per_minute: "Кількість помилок на хвилину для попередження адміністратора. Значення 0 відключає цю опцію. УВАГА: потрібне перезавантаження."
     alert_admins_if_errors_per_hour: "Кількість помилок на годину для попередження адміністратора. Значення 0 відключає цю опцію. УВАГА: потрібне перезавантаження."
     suggested_topics: "Кількість рекомендованих тем, що відображаються внизу поточної тем."
@@ -1664,9 +1699,14 @@ uk:
     purge_unactivated_users_grace_period_days: "Пільговий період (у днях) користувачу, який не активував свій акаунт, до того як його запис буде видалено. Встановіть 0, щоб ніколи не очищати неактивованих користувачів."
     enable_s3_uploads: "Розміщувати завантаження на Amazon S3. ВАЖЛИВО: потрібно правильні настройки S3 (access key id и secret access key)."
     s3_upload_bucket: "Ім'я Amazon S3 bucket куди будуть завантажуватися файли. УВАГА: має бути в нижньому регістрі, без пробілів, без підкреслень.\nhttp://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html"
+    s3_access_key_id: "Ідентифікатор ключа доступу Amazon S3, який буде використовуватися для завантаження зображень, вкладень та резервних копій."
+    s3_secret_access_key: "Секретний ключ доступу до Amazon S3, який буде використовуватися для завантаження зображень, вкладень та резервних копій."
+    s3_region: "Назва регіону Amazon S3, яка буде використовуватися для завантаження зображень та резервних копій."
+    s3_cdn_url: "URL-адреса CDN для використання для всіх ресурсів s3 (наприклад: https://cdn.somewhere.com). ПОПЕРЕДЖЕННЯ: після зміни цього налаштування ви повинні перезаписати всі старі повідомлення."
     avatar_sizes: "Список автоматически сгенерированных размеров аватар."
     external_system_avatars_enabled: "Використовуйте зовнішню систему аватарів."
     external_system_avatars_url: "URL-адреса служби системи зовнішніх аватарів. Дозволені заміни {username} {first_letter} {color} {size}"
+    use_site_small_logo_as_system_avatar: "Використовуйте невеликий логотип сайту замість аватара користувача системи. Потрібна наявність логотипу."
     restrict_letter_avatar_colors: "Список шестизначних hex значень кольорів, які будуть використані для фону аватара з літерою."
     selectable_avatars_enabled: "Змусити користувачів вибирати аватар зі списку."
     selectable_avatars: "Список аватарів, які користувачі можуть вибирати."
@@ -1676,7 +1716,6 @@ uk:
     strip_image_metadata: "Очищувати метадані зображення"
     min_ratio_to_crop: "Коефіцієнт, що використовується для обрізання високих зображень. Введіть відношення ширини / висоти."
     simultaneous_uploads: "Максимальна кількість файлів, які можна перетягнути та впустити у композитор"
-    enable_flash_video_onebox: "Дозволити розумну вставку посилань sqf і flv (Adobe Flash). УВАГА: підвищує ризики безпеки сайту."
     default_invitee_trust_level: "Рівень довіри запрошених користувачів за замовчуванням (від 0 до 4)."
     default_trust_level: "Рівень довіри за замовчуванням для всіх нових користувачів (0-4). УВАГА! Підвищуючи рівень довіри для нових користувачів, ви можете зіткнутися з великою кількістю спаму."
     tl1_requires_topics_entered: "У скількох темах новий користувач повинен побувати для просування до рівня довіри 1."
@@ -1710,9 +1749,17 @@ uk:
     min_trust_to_edit_post: "Мінімальний рівень довіри, необхідний для редагування повідомлень."
     min_trust_to_allow_self_wiki: "Мінімальний рівень довіри, необхідний для створення свого вікі-повідомлення."
     min_trust_to_send_messages: "Мінімальний рівень довіри, необхідний для створення нових особистих повідомлень."
+    min_trust_to_send_email_messages: "Мінімальний рівень довіри, необхідний для надсилання особистих повідомлень електронною поштою."
     min_trust_to_flag_posts: "Мінімальний рівень довіри, необхідний для розміщення дописів"
     min_trust_to_post_links: "Мінімальний рівень довіри, необхідний для включення посилань у допис"
+    min_trust_to_post_embedded_media: "Мінімальний рівень довіри, необхідний для вбудовування медіафайлів у допис"
+    min_trust_level_to_allow_profile_background: "Мінімальний рівень довіри, необхідний для завантаження фону профілю"
+    min_trust_level_to_allow_user_card_background: "Мінімальний рівень довіри, необхідний для завантаження фону картки користувача"
+    min_trust_level_to_allow_invite: "Мінімальний рівень довіри, необхідний для запрошення користувачів"
+    min_trust_level_to_allow_ignore: "Мінімальний рівень довіри, необхідний для ігнорування користувачів"
+    allowed_link_domains: "Домени, на які користувачі можуть посилатися навіть якщо у них немає відповідного рівня довіри, щоб розміщувати посилання"
     newuser_max_links: "Скільки посилань новий користувач може вставляти в повідомлення."
+    newuser_max_embedded_media: "Скільки медіафайлів новий користувач може додати до публікації."
     newuser_max_attachments: "Скільки вкладень новий користувач може додати до допису."
     newuser_max_mentions_per_post: "Максимальне число згадок інших користувачів (@name), яке новий користувач може зробити в одному повідомленні."
     newuser_max_replies_per_topic: "Максимальна кількість відповідей нового користувача в одній темі до того, як хто-небудь напише відповідь."
@@ -1729,6 +1776,8 @@ uk:
     body_min_entropy: "Мінімальна ентропія, необхідна для текста теми. Ентропія - кількість унікальних символів, причому деякі літери кирилиці можуть вважатися за 2 символи, а не за 1, як англійські)."
     allow_uppercase_posts: "Дозволити всі великі літери в заголовку теми або в темі допису."
     max_consecutive_replies: "Кількість дописів, які користувач повинен зробити підряд у темі, перш ніж він вже не зможе додати ще одну відповідь."
+    enable_filtered_replies_view: 'Кнопка "(n) відповідей" згортає всі інші публікації та відображає лише поточне повідомлення та відповіді на неї.'
+    title_fancy_entities: "Перетворювати символи ASCII в заголовках тем у HTML-об’єкти, такі як <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>SmartyPants</a>"
     min_title_similar_length: "Мінімальна довжина назви теми, при якій вона буде перевірена на наявність схожих."
     desktop_category_page_style: "Візуальний стиль для сторінки категорії."
     category_colors: "Список шістнадцятирічних кодів кольорів, дозволених для категорій."
@@ -1763,6 +1812,7 @@ uk:
     log_anonymizer_details: "Чи слід зберігати дані користувача в журналі після анонімізації. При дотриманні GDPR вам потрібно буде відключити це."
     newuser_spam_host_threshold: "Скільки разів новий користувач може опублікувати посилання на той самий хост у своїх публікаціях `newuser_spam_host_threshold`, перш ніж вважатись спамом."
     allowed_spam_host_domains: "Список довірених доменів виключених з перевірки на спам. У нових користувачів не буде обмежень на створення дописів з посиланнями на ці домени."
+    staff_like_weight: "Ваговий коефіцієнт симпатій, наданих співробітниками (для інших вони дорівнюють 1)"
     topic_view_duration_hours: "Кількість нових переглядів теми один раз на IP/Користувача кожні N годин"
     user_profile_view_duration_hours: "Кількість нових переглядів профілю користувача один раз на IP/Користувача кожні N годин"
     levenshtein_distance_spammer_emails: "При перевірці листа на спам, яка кількість символів має бути різною"
@@ -1806,7 +1856,6 @@ uk:
     forwarded_emails_behaviour: "Як ставитись до пересланого електронного листа до Discourse"
     always_show_trimmed_content: "Завжди показуйте обрізану частину вхідних електронних листів. ПОПЕРЕДЖЕННЯ: можуть бути показані Email адреси."
     private_email: "Не включайте вміст публікацій чи тем в тему електронної пошти чи тіло електронної пошти. ПРИМІТКА: також вимикає дайджест листів."
-    email_total_attachment_size_limit_kb: "Максимальний загальний розмір файлів, доданих до вихідних електронних листів. Установіть 0, щоб вимкнути надсилання вкладень."
     post_excerpts_in_emails: "В електронних листах з повідомленнями завжди надсилайте уривки замість повних публікацій"
     raw_email_max_length: "Скільки символів слід зберігати для вхідної електронної пошти."
     raw_rejected_email_max_length: "Скільки символів слід зберігати для відхилених вхідних електронних листів."
@@ -1864,6 +1913,7 @@ uk:
     ignored_users_message_gap_days: "Як довго чекати, перш ніж повторно повідомити модераторів про користувача, якого ігнорувало багато інших."
     clean_up_inactive_users_after_days: "Кількість днів до видалення неактивного користувача (рівень довіри 0 без жодних публікацій). Щоб вимкнути очищення, встановіть значення 0."
     user_selected_primary_groups: "Дозволити користувачам створювати власну групу"
+    allowed_user_website_domains: "Веб-сайт користувача треба підтверджувати для цих доменів. Список з розмежуванням."
     allow_profile_backgrounds: "Дозволити користувачам завантажувати фони профілю."
     sequential_replies_threshold: "Кількість публікацій, які користувач повинен робити підряд по темі, перш ніж нагадувати про занадто багато послідовних відповідей."
     get_a_room_threshold: "Кількість публікацій, які користувач повинен зробити до тієї самої особи в тій самій темі, перш ніж буде попереджений."
@@ -1893,6 +1943,7 @@ uk:
     embed_topics_list: "Підтримка HTML-вбудовування зі списку тем"
     embed_truncate: "Обрізати вбудовані повідомлення. "
     embed_support_markdown: "Підтримка Markdown форматування для вбудованих дописів."
+    allowed_embed_selectors: "Список розділених комами елементів CSS, дозволених до вбудовування."
     allowed_href_schemes: "Схеми, дозволені у посиланнях, крім http та https."
     embed_post_limit: "Максимальна кількість дописів для вставки."
     embed_username_required: "Ім’я користувача для створення теми обов’язкове."
@@ -1900,7 +1951,6 @@ uk:
     show_create_topics_notice: "Якщо на сайті менше 5 загальнодоступних тем, покажіть повідомлення про те, щоб адміністратори створили деякі теми."
     delete_drafts_older_than_n_days: "Видалити чернетки, старші ніж (n) днів."
     bootstrap_mode_min_users: "Мінімальна кількість користувачів, необхідних для відключення режиму початкового налаштування (встановлено 0 для відключення)"
-    prevent_anons_from_downloading_files: "Заборонити анонімним користувачам завантажувати вкладення. ПОПЕРЕДЖЕННЯ: це зашкодить завантаженню всіх активів сайту, що не мають зображень, розміщених як додатки."
     slug_generation_method: "Виберіть спосіб генерації slug (рядок ідентифікатор). 'закодований' буде генерувати рядок закодований з %. 'none' зовсім вимкне slug."
     enable_emoji: "Увімкнути іконки emoji"
     enable_emoji_shortcuts: "Поширений смайлик, наприклад :): p :( буде перетворений на emoji"
@@ -1914,6 +1964,7 @@ uk:
     notify_about_queued_posts_after: "Якщо є повідомлення, які очікували на перегляд більше, ніж ця кількість годин, надішліть повідомлення всім модераторам. Встановіть 0, щоб відключити ці сповіщення."
     auto_close_messages_post_count: "Максимальна кількість дописів, дозволених у повідомленні до його автоматичного закриття (0 для відключення)"
     auto_close_topics_post_count: "Максимальна кількість дозволених публікацій у темі до її автоматичного закриття (0 для відключення)"
+    auto_close_topics_create_linked_topic: "Створювати нову пов’язану тему, коли тема автоматично закривається на основі налаштування 'auto close topics post count'"
     code_formatting_style: "Кнопка коду у композиторі за замовчуванням буде мати цей стиль форматування коду"
     max_allowed_message_recipients: "Максимум одержувачів, дозволених у повідомленні."
     watched_words_regular_expressions: "Спостережені слова – це регулярні вирази."
@@ -1921,13 +1972,13 @@ uk:
     new_user_notice_tl: "Мінімальний рівень довіри, необхідний для перегляду нових повідомлень про публікації користувачів."
     returning_user_notice_tl: "Мінімальний рівень довіри, необхідний для перегляду повідомлень про публікації користувачів, які повернулись."
     returning_users_days: "Скільки днів має пройти, перш ніж користувач вважатиметься поверненим."
+    skip_auto_delete_reply_likes: "При автоматичному видаленні старих відповідей, не видаляти повідомлення з цією кількістю вподобань або більше."
     default_email_digest_frequency: "Як часто користувачі отримують підсумкові електронні листи за замовчуванням."
     default_include_tl0_in_digests: "Додайте публікації нових користувачів до зведених електронних листів за замовчуванням. Користувачі можуть змінити це у своїх налаштуваннях."
     default_email_level: "Встановіть стандартний рівень сповіщення електронною поштою для звичайних тем."
     default_email_messages_level: "Встановіть рівень сповіщення електронною поштою за замовчуванням, коли хтось повідомляє користувача."
     default_email_mailing_list_mode: "Надсилайте електронний лист для кожної нової публікації за замовчуванням."
     default_email_mailing_list_mode_frequency: "Користувачі, які включають режим списку розсилки, отримуватимуть це електронне повідомлення за замовчуванням."
-    disable_mailing_list_mode: "Заборонити користувачам вмикати режим списку розсилки."
     default_email_previous_replies: "Додайте попередні відповіді в електронні листи за замовчуванням."
     default_email_in_reply_to: "За замовчуванням включіть уривок відповідей на публікацію в електронних листах."
     default_other_new_topic_duration_minutes: "Загальна умова за замовчуванням, для якої тема вважається новою."
@@ -1937,6 +1988,7 @@ uk:
     default_other_enable_quoting: "За замовчуванням включати у відповідь цитату для виділеного тексту."
     default_other_enable_defer: "Увімкнути функцію відкладення теми за замовчуванням."
     default_other_dynamic_favicon: "Показати кількість нових / оновлених тем на іконці браузера за замовчуванням."
+    default_other_skip_new_user_tips: "Пропустити поради щодо створення користувача та значків."
     default_other_like_notification_frequency: "Повідомлення користувачів про лайки за замовчуванням"
     default_topics_automatic_unpin: "Автоматично відкріпити теми, коли користувач досягає нижньої частини."
     default_categories_watching: "Список категорій, які переглядаються за замовчуванням."
@@ -1951,9 +2003,9 @@ uk:
     default_title_count_mode: "Режим за замовчуванням для лічильника заголовків сторінки"
     retain_web_hook_events_period_days: "Кількість днів для збереження записів про події web hook."
     retry_web_hook_events: "Автоматично повторювати невдалі події web hook протягом 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: "Дозволена URL-адреса для переадресації автентифікації для ключів API користувача. Символ підстановки * може використовуватися для узгодження будь-якої його частини (наприклад, www.example.com/*)."
     allowed_user_api_push_urls: "Дозволені URL-адреси для надсилання на сервер push до API"
@@ -1963,7 +2015,6 @@ uk:
     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> ."
@@ -2003,24 +2054,20 @@ uk:
       email_editable_enabled: "Перш ніж увімкнути цей параметр, ви повинні відключити 'редагування електронної пошти'."
       staged_users_disabled: "Перш ніж активувати цей параметр, потрібно спочатку ввімкнути 'поетапних користувачів'."
       reply_by_email_disabled: "Перш ніж активувати це налаштування, потрібно спочатку увімкнути 'відповідь електронною поштою'."
-      sso_url_is_empty: "Ви повинні встановити 'sso url', перш ніж увімкнути це налаштування."
-      sso_invite_only: "Ви не можете ввімкнути sso та запрошення, лише одночасно."
       enable_local_logins_disabled: "Перш ніж активувати цей параметр, спочатку потрібно ввімкнути функцію 'enable local logins'."
       min_username_length_exists: "Ви не можете встановити мінімальну довжину імені користувача менше найкоротшого імені користувача (%{username})."
       min_username_length_range: "Ви не можете встановити мінімум вище максимального."
       max_username_length_exists: "Ви не можете встановити максимальну довжину імені користувача нижче найдовшого імені користувача (%{username})."
       max_username_length_range: "Не можна встановити максимум нижче мінімального."
       invalid_hex_value: "Значення кольорів мають бути шестизначними шістнадцятковими hex кодами."
-      category_search_priority:
-        very_low_weight_invalid: "Ви не можете встановити, що вага перевищує  'category_search_priority_low_weight'."
-        low_weight_invalid: "Ви не можете встановити, що вага буде більшою або рівна 1 або менша, ніж 'category_search_priority_very_low_weight'."
-        very_high_weight_invalid: "Ви не можете встановити вагу менше ніж  'category_search_priority_high_weight'."
+      allowed_unicode_usernames:
+        regex_invalid: "Регулярний вираз недійсний: %{error}"
+        leading_trailing_slash: "Регулярний вираз не повинен починатися і закінчуватися косою рисою."
       unicode_usernames_avatars: "Внутрішні аватари системи не підтримують імен користувачів Unicode."
       list_value_count: "Список повинен містити точно %{count} значення."
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "Секрет SSO"
   search:
     extreme_load_error: "Сайт перебуває під надзвичайним навантаженням, пошук вимкнено, повторіть спробу пізніше"
     within_post: "# %{post_number} від %{username}"
@@ -2029,7 +2076,7 @@ uk:
       topic: "Результати"
       user: "Користувачі"
     results_page: "Результати пошуку для '%{term}'"
-  sso:
+  discourse_connect:
     login_error: "Помилка входу"
     not_found: "Ваш обліковий запис не вдалося знайти. Зверніться до адміністратора сайту."
     account_not_approved: "Ваш обліковий запис очікує затвердження. Ви отримаєте сповіщення електронною поштою, коли буде отримане схвалення."
@@ -2037,7 +2084,6 @@ uk:
     timeout_expired: "Час входу в обліковий запис вийшов. Спробуйте знову увійти."
     no_email: "Не вказано електронну адресу e-mail. Зверніться до адміністратора сайту."
     email_error: "Не вдалося зареєструвати обліковий запис з електронною поштою <b>%{email}</b>. Зверніться до адміністратора сайту."
-    missing_secret: "Не вдалося встановити автентифікацію SSO через відсутність секрету. Щоб вирішити цю проблему, зверніться до адміністраторів сайту."
   original_poster: "Перший дописувач"
   most_posts: "Найбільше дописів"
   most_recent_poster: "Автор останнього допису"
@@ -2112,6 +2158,16 @@ uk:
       few: "Цю тему автоматично закрили через %{count} днів після останньої відповіді. Нові відповіді більше не дозволені."
       many: "Цю тему автоматично закрили через%{count} днів після останньої відповіді. Нові відповіді більше не дозволені."
       other: "Ця тема була автоматично закрита через %{count} днів. Нові відповіді більше не дозволені."
+    autoclosed_enabled_lastpost_hours:
+      one: "Цю тему було автоматично закрито через %{count} годину після останньої відповіді. Нові відповіді в цій темі заборонено."
+      few: "Цю тему було автоматично закрито через %{count} години після останньої відповіді. Нові відповіді в цій темі заборонено."
+      many: "Цю тему було автоматично закрито через %{count} годин після останньої відповіді. Нові відповіді в цій темі заборонено."
+      other: "Цю тему було автоматично закрито через %{count} годин після останньої відповіді. Нові відповіді в цій темі заборонено."
+    autoclosed_enabled_lastpost_minutes:
+      one: "Цю тему було автоматично закрито через %{count} хвилину після останньої відповіді. Нові відповіді в цій темі заборонено."
+      few: "Цю тему було автоматично закрито через %{count} хвилин після останньої відповіді. Нові відповіді в цій темі заборонено."
+      many: "Цю тему було автоматично закрито через %{count} хвилин після останньої відповіді. Нові відповіді в цій темі заборонено."
+      other: "Цю тему було автоматично закрито через %{count} хвилин після останньої відповіді. Нові відповіді в цій темі заборонено."
     autoclosed_disabled_days:
       one: "Цю тему було автоматично відкрито через %{count} день."
       few: "Ця тема була автоматично відкрита через %{count} днів."
@@ -2127,6 +2183,21 @@ uk:
       few: "Ця тема була автоматично відкрита через %{count} хвилин."
       many: "Ця тема була автоматично відкрита через %{count} хвилин."
       other: "Ця тема була автоматично відкрита через %{count} хвилин."
+    autoclosed_disabled_lastpost_days:
+      one: "Ця тема була автоматично відкрита %{count} день після останньої відповіді."
+      few: "Ця тема була автоматично відкрита %{count} дні після останньої відповіді."
+      many: "Ця тема була автоматично відкрита %{count} днів після останньої відповіді."
+      other: "Ця тема була автоматично відкрита %{count} днів після останньої відповіді."
+    autoclosed_disabled_lastpost_hours:
+      one: "Ця тема була автоматично відкрита %{count} годину після останньої відповіді."
+      few: "Ця тема була автоматично відкрита %{count} годин після останньої відповіді."
+      many: "Ця тема була автоматично відкрита %{count} годин після останньої відповіді."
+      other: "Ця тема була автоматично відкрита %{count} годин після останньої відповіді."
+    autoclosed_disabled_lastpost_minutes:
+      one: "Ця тема була автоматично відкрита %{count} хвилину після останньої відповіді."
+      few: "Ця тема була автоматично відкрита %{count} хвилин після останньої відповіді."
+      many: "Ця тема була автоматично відкрита %{count} хвилин після останньої відповіді."
+      other: "Ця тема була автоматично відкрита %{count} хвилин після останньої відповіді."
     autoclosed_disabled: "Тепер ця тема відкрита. Дозволено нові відповіді."
     autoclosed_disabled_lastpost: "Цю тему відкрито. Нові відповіді дозволено."
     auto_deleted_by_timer: "Автоматично видаляється за таймером."
@@ -2167,6 +2238,7 @@ uk:
     missing_user_field: "Ви не заповнили всі поля користувача"
     auth_complete: "Автентифікація завершена."
     click_to_continue: "Натисніть тут, щоб продовжити."
+    second_factor_title: "Двофакторна автентифікація"
     second_factor_description: "Введіть необхідний код автентифікації у своєму додатку:"
     second_factor_backup_description: "Введіть один із резервних кодів:"
     invalid_second_factor_code: "Недійсний код аутентифікації Кожен код може бути використаний лише один раз."
@@ -2217,6 +2289,7 @@ uk:
       fixed_primary_email: "Фіксована основна електронна пошта для інсценованого користувача"
       same_ip_address: "Ідентична IP-адреса (%{ip_address}), як в інших користувачів"
       inactive_user: "Неактивний користувач"
+      reviewable_reject_auto: "Автоматична обробка черги перегляду"
     email_in_spam_header: "Перше повідомлення користувача було позначено як спам"
   reviewables_reminder:
     submitted:
@@ -2288,6 +2361,8 @@ uk:
     post_hidden_again:
       title: "Допис знову приховано"
       subject_template: "Повідомлення приховано через скарги спільноти, персонал повідомлено"
+    queued_by_staff:
+      title: "Допис потребує схвалення"
     flags_disagreed:
       title: "Позначене повідомлення відновлено персоналом"
       subject_template: "Позначене повідомлення відновлено персоналом"
@@ -2342,6 +2417,8 @@ uk:
     csv_export_failed:
       title: "Не вдалося експортувати CSV"
       subject_template: "Експорт даних не здійснено"
+    email_reject_screened_email:
+      subject_template: "[%{email_prefix}] Проблема з електронною поштою — заблокована електронна пошта"
     email_reject_not_allowed_email:
       title: "Email відхилено. Заборонена поштова скринька"
       subject_template: "[%{email_prefix}] Проблема з електронною поштою — заблокована електронна пошта"
@@ -2350,6 +2427,7 @@ uk:
       subject_template: "[%{email_prefix}] Проблема електронної пошти - невідомий ключ відповіді"
     email_reject_auto_generated:
       title: "Відхилено автоматично створену електронну пошту"
+      subject_template: "[%{email_prefix}] Проблема з електронною поштою -- автоматично згенерована відповідь"
     email_reject_unrecognized_error:
       title: "Відхилено нерозпізнану помилку електронною поштою"
       subject_template: "[%{email_prefix}] Проблема з відправкою пошти -- невідома помилка"
@@ -2410,6 +2488,12 @@ uk:
     dashboard_problems:
       title: "Проблеми на інформаційній панелі"
       subject_template: "Нова порада на інформаційній панелі вашого сайту"
+      text_body_template: |
+        Ми маємо для вас кілька нових порад та рекомендацій на основі ваших поточних налаштувань сайту.
+
+        [Відвідайте панель адміністратора](%{base_url}/admin), щоб побачити їх.
+
+        Якщо на вашій інформаційній панелі нічого не видно, можливо, інший співробітник вже скористався цією порадою. Список дій персоналу можна знайти [журналі дій персоналу](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Ви новий користувач місяця!"
       subject_template: "Ви новий користувач місяця!"
@@ -2605,11 +2689,9 @@ uk:
     account_suspended:
       title: "Акаунт призупинено"
       subject_template: "[%{email_prefix}] Ваш обліковий запис призупинено"
-      text_body_template: "Вас призупинили на форумі до %{suspended_till}. \n\n%{reason} \n\n%{message}\n"
     account_silenced:
       title: "Обліковий запис вимкнено"
       subject_template: "[%{email_prefix}] Ваш обліковий запис вимкнено"
-      text_body_template: "Ви були відключені від форуму до%{silenced_till}. \n\n%{reason} \n\n%{message}\n"
     account_exists:
       title: "Обліковий запис вже існує"
       subject_template: "[%{email_prefix}] Обліковий запис вже існує"
@@ -2648,6 +2730,9 @@ uk:
     confirm_new_email:
       title: "Підтвердіть нову електронну пошту"
       subject_template: "[%{email_prefix}] Підтвердіть свою нову електронну пошту"
+    confirm_new_email_via_admin:
+      title: "Підтвердіть нову електронну пошту"
+      subject_template: "[%{email_prefix}] Підтвердіть свою нову електронну пошту"
     confirm_old_email:
       title: "Підтвердіть стару електронну пошту"
       subject_template: "[%{email_prefix}] Підтвердіть свою поточну адресу електроної пошти"
@@ -2668,6 +2753,9 @@ uk:
     suspicious_login:
       title: "Нове попередження про вхід"
       subject_template: "[%{site_name}] Новий вхід на сайт"
+    post_approved:
+      title: "Ваш пост був схвалений"
+  site_setting_missing: "`%{name}` налаштування сайту потрібно встановити."
   page_not_found:
     title: "Упс! Сторінки не існує або вона приватна."
     popular_topics: "Популярні"
@@ -2738,6 +2826,7 @@ uk:
     latte: "Latte"
     summer: "Літо"
     dark_rose: "Темна троянда"
+    default_theme_name: "За замовчуванням"
     light_theme_name: "Світла"
     dark_theme_name: "Темна"
     neutral_theme_name: "Нейтральна"
@@ -2972,11 +3061,6 @@ uk:
         other: '"%{tag_name}" обмежено такими категоріями: %{category_names}'
       synonym: 'Синоніми заборонені. Використовуйте замість "%{tag_name}".'
       has_synonyms: '"%{tag_name}" не можна використовувати, оскільки він має синоніми.'
-    required_tags_from_group:
-      one: "Ви повинні включити принаймні тег %{count} %{tag_group_name}."
-      few: "Ви повинні включити принаймні теги %{count} %{tag_group_name}."
-      many: "Ви повинні включити принаймні теги %{count} %{tag_group_name}."
-      other: "Ви повинні включити принаймні %{count} %{tag_group_name} теги."
     invalid_target_tag: "не може бути синонімом синоніма"
     synonyms_exist: "заборонено, поки існують синоніми"
   rss_by_tag: "Теми з тегом %{tag}"
@@ -3073,6 +3157,8 @@ uk:
           city_for_disputes:
             label: "Місто для суперечок"
             placeholder: "Сан-Франциско, Каліфорнія"
+      colors:
+        title: "Кольори"
       fonts:
         title: "Шрифти"
         fields:
@@ -3120,9 +3206,6 @@ uk:
                 label: "Категорії в коробках"
               categories_boxes_with_topics:
                 label: "Категорії в коробках з Темами"
-      emoji:
-        title: "Смайли"
-        description: "Виберіть стиль смайлів для спільноти. Надалі, ви зможете додати інші стилі смайлів в адмінці, в секції Оформлення/Смайли."
       invites:
         title: "Запросити як персонал"
         description: "Ви майже закінчили! Давайте запросимо людей, які допоможуть вам <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>почати обговорення</a> з цікавих тем і відповідей, щоб ваше співтовариство почало роботу."
@@ -3179,7 +3262,6 @@ uk:
       new_topics_unless_trust_level: "Теми користувачів з низьким рівнем довіри повинні бути затверджені персоналом. Див. розділ `approve_new_topics_unless_trust_level`."
       fast_typer: "Новий користувач набрав своє перше повідомлення підозріло швидко, є підозра про  поведінку бота чи спамера. Див. `min_first_post_typing_time`."
       auto_silence_regexp: "Зареєстрований учасник, чиє перше повідомлення відповідає `auto_silence_first_post_regex` налаштуванням."
-      watched_word: "Ця публікація включена \"Спостережним словом\". Дивіться ваш <a href='%{base_url}/admin/logs/watched_words'>список спостережень слів</a>."
       staged: "Нові теми та публікації для проміжних користувачів повинні бути затверджені персоналом. Дивіться `approve_unless_staged`."
       category: "Дописи в цій категорії вимагають ручного схвалення персоналом. Дивіться налаштування категорії."
       must_approve_users: "Всіх нових користувачів потрібно схвалити персоналом. Дивіться `must_approve_users`."
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index dee9e4a41a..b9ab332356 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -39,6 +39,7 @@ ur:
   title: "ڈسکورس"
   topics: "ٹاپک"
   posts: "پوسٹ`"
+  views: "وِیوز"
   loading: "لوڈ ہو رہا ہے"
   powered_by_html: '<a href="https://www.discourse.org">ڈِسکورس</a>کے مرہونِ مِنَّت، جاوااسکرپٹ کے ساتھ بہترین نظر آئے گا'
   sign_up: "سائن اپ"
@@ -50,6 +51,8 @@ ur:
   remove_posts_deleted_by_author: "مصنف کی طرف سے حذف کر دیا گیا"
   redirect_warning: "ہم تصدیق نہ کر سکے کہ آپ کا منتخب کردہ لِنک اصل میں فورم پر شائع کیا گیا تھا کہ نہیں۔ اگر آپ پھر بھی آگے بڑھنا چاہتے ہیں، تو نیچے دیئے گئے لِنک کو منتخب کریں۔"
   on_another_topic: "دوسرے ٹاپک پر"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "%{username} کی طرف سے #%{post_number}"
   themes:
     bad_color_scheme: "تِھیم اَپ ڈَیٹ نہیں ہو سکتی، غلط رنگ پیلیٹ"
     other_error: "تِھیم اَپ ڈَیٹ کرتے ہوے کچھ غلط ہو گیا"
@@ -153,7 +156,6 @@ ur:
         one: غلط لمبائی ہے (%{count} حرف لمبا ہونا چاہئے)
         other: غلط لمبائی ہے (%{count} حروف لمبا ہونا چاہئے)
       other_than: "%{count}کے علاوہ ہونا لازمی ہے "
-      sso_overrides_username: "صارف نام SSO فراہم کنندہ کی طرف سے اَپ ڈیٹ کیے جانے کی ضرورت ہے، کیونکہ `sso_overrides_username` سَیٹنگ فعال ہے۔"
     template:
       body: ! "درج ذیل خانوں کے ساتھ مسائل تھے:"
       header:
@@ -175,9 +177,10 @@ ur:
   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>"
+    disabled_errors:
+      invalid_access: "آپ کو درخواست کردہ ریسورس کو دیکھنے کی اجازت نہیں ہے۔"
   bulk_invite:
     file_should_be_csv: "اَپ لوڈ شدہ فائل CSV فارمیٹ میں ہونی چاہئے۔"
     max_rows: "پہلے %{max_bulk_invites} دعوت نامے بھیجے جا سکتے ہیں۔ فائل کو چھوٹے حصوں میں تقسیم کرنے کی کوشش کریں۔"
@@ -276,6 +279,9 @@ ur:
   topics_in_category: "'%{category}' زُمرہ میں ٹاپک"
   rss_posts_in_topic: "'%{topic}' کی RSS فِیڈ"
   rss_topics_in_category: "'%{category}' زُمرہ میں ٹاپکس کی RSS فِیڈ"
+  rss_num_posts:
+    one: "%{count} پوسٹ"
+    other: "%{count} پوسٹس"
   read_full_topic: "مکمل ٹاپک پڑھیں"
   private_message_abbrev: "پغم"
   rss_description:
@@ -338,26 +344,6 @@ ur:
     until_posts:
       one: "%{count} پوسٹ"
       other: "%{count} پوسٹس"
-    "new-topic": |
-      %{site_name}پر خوش آمدید &mdash؛ **نئی بات چیت شروع کرنے کیلئے شکریہ!**
-
-      - اگر آپ عنوان کو زبان سے پڑھیں تو کیا یہ دِلچسپ سنائی دیتا ہے؟ کیا یہ ایک اچھا خلاصہ ہے؟
-
-      - کون اِس میں دلچسپی رکھے گا؟ یہ کیوں ضروری ہے؟ آپ کو کس قِسم کے جوابات چاہیئیں؟
-
-      - امنے ٹاپک میں عام طور پر استعمال کردہ الفاظ شامل کریں تاکہ دوسرے اِسے *تلاش* کرسکیں۔ اپنے ٹاپک کو متعلقہ ٹاپکس کے ساتھ گروہ کرنے کیلئے، ایک زُمرہ منتخب کریں۔
-
-      مزید کے لئے، [ہماری کمیونٹی کی رہنما ہدایات دیکھیے](%{base_path}/guidelines)۔ یہ پَینل صرف آپ کے پہلے %{education_posts_text} کیلئے ظاہر ہوگا۔
-    "new-reply": |
-      %{site_name}پر خوش آمدید &mdash؛ **شراکت کیلئے شکریہ!**
-
-      - کیا آپ کا جواب کسی طرح سے اِس بات چیت کو بہتر بناتا ہے؟
-
-      - اپنے کمیونٹی کے ارکان کے ساتھ مہربان ہوں۔
-
-      - تعمیراتی تنقید قابل قبول ہے، لیکن تنقید *خیالات* پر کریں، نہ کہ لوگوں پر۔
-
-      مزید کے لئے، [ہماری کمیونٹی کی رہنما ہدایات دیکھیے](%{base_path}/guidelines)۔ یہ پَینل صرف آپ کے پہلے %{education_posts_text} کیلئے ظاہر ہوگا۔
     avatar: |
       ### آپ کے اکاؤنٹ کیلئے ایک تصویر کیسی لگے گی؟
 
@@ -552,20 +538,8 @@ ur:
     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:
       one: "%{count} گھنٹا"
       other: "%{count} گھنٹے"
@@ -669,7 +643,6 @@ ur:
       unknown: "نامعلوم براؤزر"
     device:
       android: "اینڈرائیڈ ڈیوائس"
-      chromebook: "کرَوم بُک"
       ipad: "آئی پَیڈ"
       iphone: "آئی فون"
       ipod: "آئی پَوڈ"
@@ -680,7 +653,6 @@ ur:
       unknown: "نامعلوم ڈیوائس"
     os:
       android: "اینڈرائیڈ"
-      chromeos: "کرَوم OS"
       ios: "آئی اَو اَیس"
       linux: "لینکس"
       macos: "مَیک اَو اَیس"
@@ -804,9 +776,7 @@ ur:
     mute_topic: "اِس ٹاپک کیلئے تمام اطلاعات کو خاموش کر دیں، %{link}"
     unwatch_category: "%{category} میں تمام ٹاپکس کو دیکھنا چھوڑ دیں"
     mailing_list_mode: "مَیلِنگ لِسٹ مَوڈ بند کریں"
-    all: "مجھے %{sitename} سے کوئی میل نہ بھیجیں"
     different_user_description: "جس صارف کو ہم نے اِی میل کی، آپ اُس سے مختلف صارف کے طور پر لاگ اِن ہیں۔ براہ مہربانی لاگ آوٹ کریں، یا گمنام مَوڈ میں داخل ہوں، اور دوبارہ کوشش کریں۔"
-    not_found_description: "معذرت، ہم اِس غیر سَبسکرائب کو تلاش نہ کرسکے۔ ممکن ہے کہ آپ کے ای میل میں لِنک کی میعاد ختم ہوگئی ہے؟"
     log_out: "لاگ آُوٹ"
     submit: "ترجیحات محفوظ کریں"
     digest_frequency:
@@ -973,6 +943,7 @@ ur:
       labels:
         level: لَیول
       description: "ٹرسٹ لَیول کے حساب سے گروپ کردہ صارفین کی تعداد۔"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "صارفین فی قسم"
       xaxis: "قِسم"
@@ -1183,7 +1154,6 @@ ur:
     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> کو چیک کریں، یا 'دیکھے ہوئے الفاظ رَیگولر اَیکسپرَیشَن' سائٹ ترتیب کو غیر فعال کریں۔"
   site_settings:
     censored_words: "الفاظ جو خود بخود &#9632;&#9632;&#9632;&#9632; سے تبدیل ہوجائیں گے"
     delete_old_hidden_posts: "کوئی چھپی ہوئی پوسٹ جو 30 دن سے زائد عرصہ سے چھپا رکھی ہو اُس کو خود کار طریقے سے حذف کر دیں۔"
@@ -1208,10 +1178,8 @@ ur:
     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: "ایک ہی مواد والی دوبارہ پوسٹ صارف کتنے منٹ بعد بنا سکتا ہے"
@@ -1220,7 +1188,6 @@ ur:
     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: "مقامی طور پر ریمَوٹ تصاویر کو ڈاؤن لَوڈ کرنے کیلئے ڈِسک میں کم از کم جگہ (فیصد میں)"
@@ -1243,6 +1210,8 @@ ur:
     show_pinned_excerpt_mobile: "موبائل وِیو میں پِن ہوے ٹاپکس پر اقتباس دکھائیں۔"
     show_pinned_excerpt_desktop: "ڈیسک ٹاپ وِیو میں پِن ہوے ٹاپکس پر اقتباس دکھائیں۔"
     post_onebox_maxlength: "ایک وَن باکسڈ ڈِسکورس پوسٹ کے حروف کی زیادہ سے زیادہ لمبائی۔"
+    blocked_onebox_domains: "ڈومینز کی ایک فہرست جو کبھی بھی وَن باکسڈ نہیں کیے جائیں گے۔"
+    allowed_inline_onebox_domains: "ڈومینز کی ایک فہرست جو چھوٹے فارم میں وَن باکسڈ کیے جائیں گے اگر وہ عنوان کے بغیر لنک کیے جائیں"
     max_oneboxes_per_post: "ایک پوسٹ میں وَن باکس کی زیادہ سے زیادہ تعداد۔"
     logo: "آپ کی سائٹ کے سب سے اوپر بائیں پر لوگو کی تصویر۔ 120 کی اونچائی اور 3:1 سے زائد اَیسپَیکٹ رَیشو والی وسیع مستطیل تصویر کا استعمال کریں۔ اگر خالی چھوڑ دیا گیا ہو تو سائٹ کا عنوان دکھایا جائے گا۔"
     logo_small: "آپ کی سائٹ کے سب سے اوپر بائیں پر چھوٹی سی لوگو کی تصویر، نیچے سکرول کرنے پر نظر آتی ہے۔ ایک مربع 120 × 120 تصویر کا استعمال کریں۔ اگر خالی چھوڑ دیا گیا ہو تو ایک ہَوم گلِف دکھایا جائے گا۔"
@@ -1258,7 +1227,6 @@ ur:
     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>"
     force_https: "صرف HTTPS استعمال کرنے کیلئے اپنی سائٹ کو مجبورکریں۔ انتباہ: جب تک آپ تصدیق نہ کر لیں کہ HTTPS مکمل طور پر سیٹ ہے اور ہر جگہ کام کر رہا ہے، اِس کو فعال نہ کریں! کیا آپ نے اپنا CDN، تمام سماجی لاگ ان، اور بیرونی لوگو / انحصارات کو چیک کر کے یہ یقینی بنا لیا ہے کہ وہ تمام HTTPS سے مطابقت رکھتے ہیں؟"
-    same_site_cookies: "سَیم سائٹ کے کُوکِیز کا استعمال کریں، وہ قابل براؤزرز (Lax یا Strict) پر تمام ویکٹر Cross Site Request Forgery کو ختم کر دیتے ہیں۔ انتباہ: Strict صرف اُن سائٹس پر کام کرے گا جو لاگ اِن پر مجبور کرتے ہیں اور SSO کا استعمال کرتے ہیں۔"
     summary_score_threshold: "'اِس ٹاپک کا خلاصہ کریں' میں شامل ہونے کیلئے ایک پوسٹ کا کم از کم سکور"
     summary_percent_filter: "جب صارف 'اِس ٹاپک کا خلاصہ کریں' پر کلک کرتا ہے، تو سب سے اوپر % پوسٹس دکھائیں"
     summary_max_results: "'اِس ٹاپک کا خلاصہ کریں' کی طرف سے لوٹائی جانے والی زیادہ سے زیادہ پوسٹس"
@@ -1295,7 +1263,11 @@ ur:
     maximum_session_age: "آخری وزٹ سے ن گھنٹوں بعد تک صارف کو لاگڈ اِن رکھا جائے گا"
     enable_escaped_fragments: "اگر کسی وَیب کرالر کا پتہ نہ لگے تو گُوگل اَیجَیکس-کرالِنگ API کا استعمال کریں۔ دیکھیے <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     cors_origins: "وہ اَوریجِن جن کیلئے کراس-اَوریجِن درخواستوں (CORS) کی اجازت ہے۔ ہراَوریجِن میں http:// یا https:// شامل ہونا ضروری ہے۔ CORS کو فعال کرنے کیلئے DISCOURSE_ENABLE_CORS کی وَیلِیو ٹرُو پر مقرر ہونا لاذمی ہے۔"
+    use_admin_ip_allowlist: "ایڈمن صرف اُس صورت میں لاگ ان کرسکتے ہیں اگر وہ ایسے IP ایڈریس میں ہیں جو اسکرین کردہ آئی پیز کی فہرست (ایڈمن > لاگز > اسکرین کردہ آئی پیز) میں بیان کیا گیا ہو۔"
+    blocked_ip_blocks: "نجی IP بلاکس کی فہرست جو ڈِسکَورس کی طرف سے کبھی کرال نہیں ہونی چاہئیں"
+    allowed_internal_hosts: "اندرونی ہَوسٹس کی فہرست جو ڈِسکَورس محفوظ طریقے سے وَن باکس اور دیگر مقاصد کیلئے کرال کر سکتا ہے"
     allowed_iframes: "iframe src ڈَومَین کے سابقوں کی ایک فہرست جو ڈِسکَورس محفوظ طریقے سے پوسٹس میں شامل ہونے کی اجازت دے سکتا ہے"
+    allowed_crawler_user_agents: "وَیب کرالرز کے صارف ایجنٹوں جن کو سائٹ تک رسائی کی اجازت دی جانی چاہیئے۔ انتباہ! اِس ترتیب کو فعال کرنے سے وہ تمام کرالرز جو یہاں فہرست کردہ نہیں ہیں رد کر دہے جائیں گے!"
     slow_down_crawler_user_agents: "crawl-delay ہدایت کا استعمال کرتے ہوئے، ویب کرالرز کے صارف ایجنٹ جو robots.txt میں شرح محدود ہونے چاہئیں"
     slow_down_crawler_rate: "اگر slow_down_crawler_user_agents کی وضاحت کی گئی ہے تو یہ شرح تمام کرالرز پر لاگو ہوگی (درخواستوں کے درمیان سیکنڈوں کی تاخیر)"
     content_security_policy: "کَنٹینٹ-سیکورٹی-پالیسی فعال کریں"
@@ -1326,6 +1298,8 @@ ur:
     enable_badges: "بَیج سِسٹم فعال کریں"
     enable_whispers: "ٹاپک کے اندر سٹاف کے درمیان ذاتی مواصلات کی اجازت دیں۔"
     allow_index_in_robots_txt: "robots.txt فائل میں وضاحت کریں کہ یہ سائٹ وَیب سرچ اِنجنوں کی طرف سے انڈیکس کی جاسکتی ہے۔ غیر معمولی معاملات میں آپ مستقل طور پر <a href='%{base_path}/admin/customize/robots'>robots.txt کو اَووَررائڈ</a> کرسکتے ہیں۔"
+    blocked_email_domains: "ای میل ڈومینز کی پائپ سے علیحدہ کردہ فہرست جن کے ساتھ صارفین کو اکاؤنٹس رجسٹر کرنے کی اجازت نہیں ہے۔ مثال: mailinator.com|trashmail.net"
+    allowed_email_domains: "ای میل ڈومینز کی پائپ سے علیحدہ کردہ فہرست جن کے ساتھ صارفین کو اکاؤنٹس رجسٹر کرنا لاذمی ہے۔ انتباہ: اِس فہرست کے علاوہ ای میل ڈومینز والے صارفین کو روک دیا جائے گی!"
     hide_email_address_taken: "سائن اَپ کے دوران اور بھولا پاسورڈ فارم سے صارفین کو مطلع نہ کریں کہ فراہم کیے گئے ای میل ایڈریس کے ساتھ ایک اکاؤنٹ موجود ہے۔"
     log_out_strict: "لاگ آؤٹ ہونے پر، صارف کیلئے تمام ڈِیوائیسِز پر تمام سیشنوں کو لاگ آؤٹ کریں"
     version_checks: "ورژن اپ ڈیٹ کیلئے ڈِسکورس ہَب کو پِنگ کریں اور <a href='%{base_path}/admin' target='_blank'>/admin</a> ڈیش بورڈ پر نئے ورژن کا پیغام دکھائیں"
@@ -1341,20 +1315,7 @@ ur:
     min_admin_password_length: "اَیڈمن کیلئے پاسورڈ کی کم از کم لمبائی۔"
     password_unique_characters: "منفرد حروف کی کم از کم تعداد جو پاسورڈ میں ہونا لاذمی ہے۔"
     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 کے اینڈپوائنٹ پر ڈِسکورس SSO پرووَائیڈر پروٹوکول کو نافذ کریں، sso_provider_secrets کو مقرر کیا جانا ضروری ہے"
-    sso_url: "URL واحد سائن اَن اینڈپوائنٹ کا (اhttp:// یا https:// کا شامل ہونا لاذمی ہے)"
-    sso_secret: "خفیہ سٹرنگ جو کرِیپٹَوگرافی کے زریعہ SSO معلومات کی توثیق کرنے کیلئے استعمال کیا جاتا ہے، یقینی بنائیں کہ یہ 10 یا اُس سے زیادہ حروف لمبا ہے"
-    sso_provider_secrets: "ڈَومَین-سیکرٹ جوڑوں کی فہرست جو SSO پرووَائیڈر کے طور پر ڈِسکورس کو استعمال کر رہے ہیں۔ یقینی بنائیں کہ SSO سیکرٹ 10 حروف یا اِس سے زائید ہے۔ وائلڈ کارڈ علامت * کسی بھی ڈومین یا اُس کے صرف ایک حصے کو میچ کرنے کیلئے استعمال کیا جا سکتا ہے (مثلاً *.example.com)۔"
-    sso_overrides_bio: "صارف پروفائل میں صارف کی بائیو کی جگہ لے لیتا ہے اور اِس کو تبدیل کرنے سے صارف کو روک دیتا ہے"
-    sso_overrides_groups: "تمام دستی گروپ رکنیت کو گروپس ایس ایس او صفت میں متعین کردہ گروپس کے ساتھ مطابقت پذیر کریں (انتباہ: اگر آپ گروپس کی وضاحت نہیں کرتے ہیں تو تمام دستی گروپ رکنیت صارف کیلئے صاف ہوجائے گی)"
-    sso_overrides_avatar: "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: "مقامی صارف نام اور پاسورڈ لاگ اِن کی بنیاد پر اکاؤنٹس فعال کریں۔ دعوتیں کام کرنے کیلئے اِسے فعال ہونا لاذمی ہے۔ انتباہ: اگر غیر فعال ہے، تو آپ لاگ ان کرنے کے قابل نہیں رہیں گے اگر آپ نے کم از کم ایک متبادل لاگ اِن کا طریقہ ترتیب نہ دیا ہو۔"
+    discourse_connect_overrides_bio: "صارف پروفائل میں صارف کی بائیو کی جگہ لے لیتا ہے اور اِس کو تبدیل کرنے سے صارف کو روک دیتا ہے"
     enable_local_logins_via_email: "صارفین کو بذریعہ ای میل بھیجے جانے والے ایک کلِک لاگ اِن لِنک کی درخواست کرنے کی اجازت دیں۔"
     allow_new_registrations: "نئے صارف رجسٹریشنوں کی اجازت دیں۔ کسی کو نیا اکاؤنٹ بنانے سے روکنے کیلئے اس کو غیر چیک شدہ کریں۔"
     enable_signup_cta: "واپس آنے والے گمنام صارفین کو ایک نوٹس دکھائیں جو اُنہیں اکاؤنٹ بنانے کیلۓ قائل کرے۔"
@@ -1391,7 +1352,6 @@ ur:
     top_topics_formula_log_views_multiplier: "ٹاپ ٹاپکس کے فارمولے میں لاگ وِیوز کے مَلٹیپلائر (ن) کی عدد: `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: "ٹاپ ٹاپکس کے فارمولے میں پہلی پوسٹ لائیکس کے مَلٹیپلائر (ن) کی عدد: `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 منٹ پر رِیبَیک کرنے والی پرانی پوسٹس کی تعداد۔"
     enable_safe_mode: "صارفین کو پلَگ اِنز ڈیبَگ کرنے کیلئے سَیف مَوڈ میں داخل ہونے کی اجازت دیں۔"
     rate_limit_create_topic: "ایک ٹاپک بنانے کے بعد، کوئی دوسرا ٹاپک بنانے سے پہلے صارفین کو (ن) سیکنڈوں کیلئے انتظار کرنا ہوگا۔"
     rate_limit_create_post: "ایک پوسٹ شائع کرنے کے بعد، دوسری پوسٹ بنانے سے پہلے صارفین کو (ن) سیکنڈوں کیلئے انتظار کرنا ہوگا۔"
@@ -1406,8 +1366,6 @@ ur:
     max_topic_invitations_per_day: "ایک صارف کے فی دن بھیجی گئی ٹاپک دعوتوں کی زیادہ سے زیادہ تعداد۔"
     max_logins_per_ip_per_hour: "ایک IP ایڈریس سے فی گھنٹہ لاگ اِنوں کی زیادہ سے زیادہ تعداد"
     max_logins_per_ip_per_minute: "ایک IP ایڈریس سے فی منٹ لاگ اِنوں کی زیادہ سے زیادہ تعداد"
-    max_post_deletions_per_minute: "ایک صارف فی منٹ زیادہ سے زیادہ کتنی پوسٹس حذف کر سکتا ہے۔"
-    max_post_deletions_per_day: "ایک صارف فی دن زیادہ سے زیادہ کتنی پوسٹس حذف کر سکتا ہے۔"
     alert_admins_if_errors_per_minute: "اِیڈمن الرٹ کو متحرک کرنے کیلئے فی منٹ خرابیوں کی تعداد۔ 0 کی وَیلِیو اِس خصوصیت کو غیر فعال کردیتی ہے۔ نوٹ: رِیسٹارٹ ضروری ہے۔"
     alert_admins_if_errors_per_hour: "اِیڈمن الرٹ کو متحرک کرنے کیلئے فی گھنٹہ خرابیوں کی تعداد۔ 0 کی وَیلِیو اِس خصوصیت کو غیر فعال کردیتی ہے۔ نوٹ: رِیسٹارٹ ضروری ہے۔"
     suggested_topics: "ٹاپک کے نچلے حصے پر دکھائے گئے تجویز کردہ ٹاپکس کی تعداد۔"
@@ -1437,7 +1395,6 @@ ur:
     strip_image_metadata: "تصویر مَیٹا ڈَیٹا کو ہٹائیں۔"
     min_ratio_to_crop: "لمبی تصاویر کو کاٹنے کیلئے استعمال کیے جانے والا تناسب۔ چوڑائی / اونچائی کا نتیجہ درج کریں۔"
     simultaneous_uploads: "فائلوں کی زیادہ سے زیادہ تعداد جو کمپوزر میں ڈرَیگ & ڈراپ کی جا سکتی ہے"
-    enable_flash_video_onebox: "وَن باکس میں swf اور flv (اَیڈَوبِ فلَیش) لِنکس کو اَیمبَیڈ کرنے کی اجازت دیں۔ انتباہ: یہ سیکورٹی خطروں کو متعارف کرا سکتا ہے۔"
     default_invitee_trust_level: "مدعو صارفین کیلئے ڈِیفالٹ ٹرسٹ لَیول (0-4)۔"
     default_trust_level: "تمام نئے صارفین کیلئے ڈِیفالٹ ٹرسٹ لَیول (0-4)۔ انتباہ! اِسے تبدیل کرنے سے آپ کو سپَیم کیلئے سنگین خطرہ لاہک ہو جائے گا۔"
     tl1_requires_topics_entered: "ٹرسٹ لَیول 1 پر ترقی ملنے سے قبل کتنے ٹاپکس میں ایک نئے صارف کا داخل ہونا ضروری ہے۔"
@@ -1473,6 +1430,7 @@ ur:
     min_trust_to_send_messages: "نئے ذاتی پیغامات بنانے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
     min_trust_to_flag_posts: "پوسٹس فلَیگ کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول"
     min_trust_to_post_links: "پوسٹس میں لِنکس شامل کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    allowed_link_domains: "ڈَومَین جو صارفین لنک کر سکتے ہیہں اگرچہ اُن کے پاس لنکس پوسٹ کرنے کیلئے مناسب ٹرسٹ لَیول نہ ہو۔"
     newuser_max_links: "ایک نیا صارف ایک پوسٹ میں کتنے لِنکس شامل کر سکتا ہے۔"
     newuser_max_attachments: "ایک نیا صارف ایک پوسٹ میں کتنی اٹیچمنٹس شامل کر سکتا ہے۔"
     newuser_max_mentions_per_post: "@نام اطلاعات کی زیادہ سے زیادہ تعداد جو ایک نیا صارف ایک پوسٹ میں استعمال کر سکتا ہے۔"
@@ -1495,6 +1453,7 @@ ur:
     desktop_category_page_style: " /categories صفحے کیلئے بصری سٹائل۔"
     category_colors: "زُمرہ جات کیلئے ہیکسا ڈَیسیمل رنگوں کے اقدار کی ایک فہرست۔"
     category_style: "زُمرہ بیَجوں کیلئے بصری سٹائل۔"
+    dark_mode_none: "کوئی نہیں"
     max_attachment_size_kb: "kB میں اٹیچمنٹ فائل اَپ لوڈ کا زیادہ سے زیادہ سائز۔ یہ اِنجَن٘ اَیکس (client_max_body_size) / اَپَیچی یا پراکسی میں بھی ترتیب دیا جانا لازمی ہے۔"
     authorized_extensions: "اپ لوڈ کیلئے اجازت یافتہ فائل اَیکسٹَینشَنز کی فہرست (تمام فائل اقسام کی اجازت دینے کیلئے '*' کا استعمال کریں)"
     authorized_extensions_for_staff: "سٹاف صارفین کیلئے `authorized_extensions` سائٹ ترتیب میں بیان کردہ فہرست کے علاوہ اَپ لوڈ کیلئے اجازت یافتہ فائل اَیکسٹَینشَنز کی فہرست۔ (تمام فائل اقسام کی اجازت دینے کیلئے '*' کا استعمال کریں)"
@@ -1520,6 +1479,7 @@ ur:
     privacy_policy_url: "اگر آپ کے پاس ایک نجی معلومات کی حفاظتی پالیسی کی دستاویز کسی اور جگہ پر ہَوسٹ کی ہوئی ہے جو آپ استعمال کرنا چاہتے ہیں، تو یہاں مکمل URL فراہم کریں۔"
     log_anonymizer_details: "کیا آیک صارف کو گمنام بنانے کے بعد اُس کی تفصیلات رکھی جائیں کہ نہیں۔ GDPR کے ساتھ تعمیل کرتے وقت آپ کو اِسے بند کر دینے کی ضرورت ہوگی۔"
     newuser_spam_host_threshold: "ایک نیا صارف کتنی دفعہ ایک ہی ہَوسٹ کا لِنک اپنی `newuser_spam_host_threshold` پوسٹس کے اندر شائع کر سکتا ہے، اِس سے پہلے کہ وہ سپَیم سمجھا جائے۔"
+    allowed_spam_host_domains: "ڈومَینز کی فہرست جو سپیم ہَوسٹ کی جانچ پڑتال سے خارج ہے۔ نئے صارفین کو اِن ڈومینز کے لِنکس کے ساتھ پوسٹ بنانے سے کبھی روکا نہیں جائے گا۔"
     topic_view_duration_hours: "ہر ن گھنٹوں پر فی IP/صارف ایک نیا ٹاپک وِیو شمار کریں"
     user_profile_view_duration_hours: "ہر ن گھنٹوں پر فی IP/صارف ایک نیا صارف پروفائل وِیو شمار کریں"
     levenshtein_distance_spammer_emails: "سپَیمر ای میل کو مَیچ کرتے وقت، فرق حروف کی تعداد جس پر بھی ایک فزِّی میچ ہو سکے گا۔"
@@ -1553,6 +1513,7 @@ ur:
     max_emails_per_day_per_user: "صارفین کو فی دن بھیجی گئی ای میلز کی زیادہ سے زیادہ تعداد۔ حد کو غیر فعال کرنے کیلئے 0"
     enable_staged_users: "آنے والی ای میلز سے نمٹتے وقت خود کار طریقے سے سٹَیجڈ صارفین بنائیں۔"
     maximum_staged_users_per_email: "آنے والی ایک ای میل سے نمٹتے وقت تشکیل کردہ سٹَیجڈ صارفین کی زیادہ سے زیادہ تعداد۔"
+    auto_generated_allowlist: "ای میل پتوں کی فہرست جو خود کار طریقہ سے تخلیق شدہ مواد کیلئے چیک نہیں کیے جائیں گے۔ مثال: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "آنے والی ای میلز جو خود کار طریقہ سے تخلیق شدہ کے طور پر شناخت کی گئی ہوں، اُن کو خود بخود بلاک کریں۔"
     ignore_by_title: "اُن کے عنوان کی بَیس پر آنے والی ای میلز کو نظر انداز کریں۔"
     mailgun_api_key: "وَیب ھُوک٘ پیغامات کی توثیق کیلئے استعمال ہونے والی مَیلگَن سیکرٹ API کلید۔"
@@ -1563,7 +1524,6 @@ ur:
     forwarded_emails_behaviour: "ڈِسکَورس پر فاروَرڈ کردہ ایمیل کے ساتھ کیا کریں۔"
     always_show_trimmed_content: "ہمیشہ آنے والی ای میلز کا حصے دکھائیں۔ انتباہ: ای میل پتوں کو افشاں کر سکتا ہے۔"
     private_email: "مزید رازداری کیلئے ایمیل عنوان یا ایمیل متن میں پوسٹس یا ٹاپکس سے مواد شامل نہ کریں۔ نوٹ: ڈائجسٹ ایمیلز کو بھی غیر فعال کر دیتا ہے۔"
-    email_total_attachment_size_limit_kb: "باہر جانے والی ایمیلز کے ساتھ منسلک فائلوں کا زیادہ سے زیادہ سائز۔ منسلکات بھیجنا غیر فعال کرنے کیلئے 0 پر سَیٹ کریں۔"
     post_excerpts_in_emails: "نوٹیفیکیشن ایمیلز میں، ہمیشہ پوری پوسٹس کے بجائے حوالہ جات بھیجیں"
     manual_polling_enabled: "ای میل جوابات کیلئے API کا استعمال کرتے ہوئے ای میلز پُش کریں۔"
     pop3_polling_enabled: "ای میل جوابات کیلئے پَول بذریعہ POP3 کریں۔"
@@ -1620,6 +1580,7 @@ ur:
     ignored_users_count_message_threshold: "اتنے صارفین کی طرف سے کسی خاص صارف کو نظر انداز کیے جانے پر ماڈریٹرز کو مطلع کریں۔"
     ignored_users_message_gap_days: "کئی صارفین کی طرف سے نظر انداز کیے جانے والے ایک صارف کے بارے میں ماڈریٹرز کو دوبارہ مطلع کرنے سے پہلے کتنا انتظار کریں۔"
     clean_up_inactive_users_after_days: "دنوں کی تعداد جس کے بعد غیر متحرک صارف (ٹرسٹ لَیول 0 کسی بھی اشاعت کے بغیر) ہٹا دیا جائے گا۔ ہٹا دینا غیر فعال کرنے کیلئے 0 پر سَیٹ کریں۔"
+    allowed_user_website_domains: "اِن ڈومینز کے ساتھ صارف ویب سائٹ کی تصدیق کی جائے گی۔ پائپ کے ساتھ الگ کی گئی فہرست۔"
     allow_profile_backgrounds: "صارفین کو پروفائل پسِ منظر اَپ لوڈ کرنے کی اجازت دیں۔"
     sequential_replies_threshold: "ایک ہی ٹاپک میں لگاتار کتنی پوسٹس ایک صارف شائع کرے اِس سے پہلے کہ اُسے بہت زیادہ لگاتار جوابات ہونے کی یاد دہانی کرائی جائے۔"
     get_a_room_threshold: "انتباہ کرا دینے سے پہلے صارف ایک ہی ٹاپک میں ایک ہی شخص کیلئے کتنی پوسٹس شائع کرے۔"
@@ -1654,6 +1615,7 @@ ur:
     embed_topics_list: "ٹاپکس فہرستوں میں HTML شامل کرنے کی اجازت دیں"
     embed_truncate: "اَیمبَیڈ کی گئی پوسٹس کو تراشیں۔"
     embed_support_markdown: "اَیمبَیڈ کردہ پوسٹس کیلئے مارکڈائون کی اجازت دیں۔"
+    allowed_embed_selectors: "علاماتِ وقف سے علیحدہ کردہ CSS عنصروں کی ایک فہرست جن کی اَیمبَیڈز میں اجازت ہے۔"
     allowed_href_schemes: "http اور https کے علاوہ لِنکس میں اجازت دی گئی اسکیمز۔"
     embed_post_limit: "اَیمبَیڈ کیے جانے والی پوسٹس کی زیادہ سے زیادہ تعداد۔"
     embed_username_required: "ٹاپک کی تخلیق کیلئے صارف نام ضروری ہے۔"
@@ -1661,7 +1623,6 @@ ur:
     show_create_topics_notice: "اگر سائٹ میں 5 سے کم عوامی ٹاپک موجود ہیں، تو کچھ ٹاپک تخلیق کرنے کیلئے منتظمین کو ایک نوٹس دکھائیں۔"
     delete_drafts_older_than_n_days: "(ن) دنوں سے پرانے ڈرافٹ حذف کریں۔"
     bootstrap_mode_min_users: "بُوٹسٹرَیپ مَوڈ غیر فعال کرنے کیلئے درکار صارفین کی کم از کم تعداد (غیر فعال کرنے کیلئے 0 پر سَیٹ کریں)"
-    prevent_anons_from_downloading_files: "گمنام صارفین کو اٹَیچمنٹس ڈاؤن لوڈ کرنے سے روکیں۔ انتباہ: ایسا کرنے سے کوئی بھی غیر تصویر سائٹ کے اثاثہ جات، جو اٹَیچمنٹ کے طور پرشائع کیے گئے ہوں، بھی کام کرنا چھوڑ دیں گے۔"
     slug_generation_method: "سلَگ تخلیق کا طریقہ منتخب کریں۔ 'انکوڈ کردہ' فیصد انکوڈِنگ سٹرِنگ تخلیق کرے گ۔. 'کوئی بھی نہیں' سلَگ کو غیر فعال کر دے گا۔"
     enable_emoji: "اِیمَوجی فعال کریں"
     enable_emoji_shortcuts: "عام سمائلی ٹیکسٹ جیسا کہ :) :p :( اِیمَوجیوں میں تبدیل کر دیا جائے گا"
@@ -1687,7 +1648,6 @@ ur:
     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: "عالمی ڈِیفالٹ شرط جس کیلئے کوئی ٹاپک نیا سمجھا جاتا ہے۔"
@@ -1709,7 +1669,6 @@ ur:
     retry_web_hook_events: "خود کار طریقے سے 4 مرتبہ ناکام ویب ہک اِیونٹوں کی دوبارہ کوشش کریں۔ دوبارہ کوششوں کے درمیان ٹائم فرق 1، 5، 25 اور 125 منٹ ہے۔"
     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"
@@ -1719,7 +1678,6 @@ ur:
     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> پر ٹیگ گروپ کے حساب سے ٹیگز کو فہرست کریں۔"
@@ -1763,24 +1721,20 @@ ur:
       email_editable_enabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'قابل ترمیم بذریعہ ای میل' غیر فعال کرنا ضروری ہے۔"
       staged_users_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'سٹَیجڈ صارفین' فعال کرنا ضروری ہے۔"
       reply_by_email_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'جواب بذریعہ ای میل' فعال کرنا ضروری ہے۔"
-      sso_url_is_empty: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'sso url' مقرر کرنا ضروری ہے۔"
-      sso_invite_only: "آپ بیک وقت sso اور صرف بزریعہ دعوت فعال نہیں کرسکتے۔"
       enable_local_logins_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'مقامی لاگ اِن' فعال کرنا ضروری ہے۔"
       min_username_length_exists: "آپ صارف نام کی کم از کم لمبائی، سب سے مختصر صارف نام کی لمبائی سے کم مقرر نہیں کرسکتے (%{username})۔"
       min_username_length_range: "آپ کم از کم، زیادہ سے زیادہ سے اوپر مقرر نہیں کرسکتے۔"
       max_username_length_exists: "آپ صارف نام کی زیادہ سے زیادہ لمبائی، سب سے طویل صارف نام کی لمبائی سے کم مقرر نہیں کرسکتے (%{username})۔"
       max_username_length_range: "آپ زیادہ سے زیادہ، کم از کم سے نیچے مقرر نہیں کرسکتے۔"
       invalid_hex_value: "رنگ اقدار کا 6-عددی ہیکسا ڈَیسیمل کوڈ ہونا ضروری ہے۔"
-      category_search_priority:
-        very_low_weight_invalid: "آپ وزن 'category_search_priority_low_weight' سے زیادہ مقرر نہیں کرسکتے۔"
-        low_weight_invalid: "آپ وزن زیادہ یا 1 کے برابر یا 'category_search_priority_very_low_weight' سے کم مقرر نہیں کرسکتے۔"
-        very_high_weight_invalid: "آپ وزن 'category_search_priority_high_weight' سے کم مقرر نہیں کرسکتے۔"
+      allowed_unicode_usernames:
+        regex_invalid: "رَیگولر اَیکسپرَیشَ غلط ہے: %{error}"
+        leading_trailing_slash: "رَیگولر اَیکسپرَیشَ ایک سلیش کے ساتھ شروع اور ختم نہیں ہونا چاہئیے۔"
       unicode_usernames_avatars: "اندرونی سسٹم کے اوتار یونیکَوڈ صارف ناموں کی کفالت نہیں کرتے۔"
       list_value_count: "فہرست میں بالکل %{count} قدر کا ہونا لاذمی ہے۔"
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "SSO سیکرٹ"
   search:
     extreme_load_error: "سائٹ پر انتہائی بوجھ ہے، سرچ غیر فعال ہے، بعد میں دوبارہ کوشش کریں"
     within_post: "%{username} کی طرف سے #%{post_number}"
@@ -1789,7 +1743,7 @@ ur:
       topic: "نتائج"
       user: "صارفین"
     results_page: "'%{term}' کیلئے سرچ کے نتائج"
-  sso:
+  discourse_connect:
     login_error: "لاگ اِن خرابی"
     not_found: "آپ کا اکاؤنٹ نہیں مل سکا۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
     account_not_approved: "آپ کے اکاؤنٹ کی منظوری زیر التواء ہے۔ منظوری ملنے پر آپ کو ایک ای میل اطلاع موصول ہو گی۔"
@@ -1797,7 +1751,6 @@ ur:
     timeout_expired: "اکاؤنٹ لاگ اِن کا وقت ختم ہوگیا، براہ مہربانی دوبارہ لاگ اِن کرنے کی کوشش کریں۔"
     no_email: "کوئی ای میل پتہ فراہم نہیں گیا تھا۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
     email_error: "%{email} ای میل ایڈریس کے ساتھ اکاؤنٹ رجسٹر نہیں کیا جا سکا ۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
-    missing_secret: "گمشدہ سیکرٹ کی وجہ سے SSO توثیق ناکام ہوگئی۔ اِس مسئلہ کو حل کرنے کیلئے سائٹ کے منتظمین سے رابطہ کریں۔"
   original_poster: "اصل پوسٹ کرنے والا"
   most_posts: "سب سے زیادہ پوسٹس"
   most_recent_poster: "سب سے حالیہ پوسٹ کرنے والا"
@@ -2112,6 +2065,8 @@ ur:
         کمیونٹی نے اِس پوسٹ کو فلَیگ کیا اور اب یہ چھپائی جا چکی ہے۔ **کیونکہ یہ پوسٹ ایک سے زائد مرتبہ چھپائی گئی ہے، اب آپ کی پوسٹ سٹاف کی طرف سے نمٹائے جانے تک چھپی رہے گی۔**
 
         اضافی رہنمائی کیلئے، براہ کرم ہماری [کمیونٹی کی رہنما ہدایات](%{base_url}/guidelines) دیکھیے۔
+    queued_by_staff:
+      title: "پوسٹ کو منظوری کی ضرورت ہے"
     flags_disagreed:
       title: "فلَیگ کردہ پوسٹ سٹاف کی طرف سے بحال کر دی گئی"
       subject_template: "فلَیگ کردہ پوسٹ سٹاف کی طرف سے بحال کر دی گئی"
@@ -2130,24 +2085,6 @@ ur:
     flags_agreed_and_post_deleted:
       title: "فلَیگ کردہ پوسٹ سٹاف کی طرف سے ہٹا دی گئی"
       subject_template: "فلَیگ کردہ پوسٹ سٹاف کی طرف سے ہٹا دی گئی"
-      text_body_template: |
-        ہیلو،
-
-        یہ %{site_name} کی طرف سے ایک خود کار پیغام ہے تاکہ آپ کو بتایا جاسکے کہ [آپ کی پوسٹ](%{base_url}%{url}) حذف کر دی گئی تھی۔
-
-        <>
-
-        %{flag_reason}
-
-        یہ پوسٹ کمیونٹی کی طرف سے فلَیگ کی گئی تھی اور سٹاف کے ایک رکن نے اِسے ہٹانے کا انتخاب کیا۔
-
-        [details="ہٹائی گئی پوسٹ کو کھولنے کیلئے کلک کریں"]
-        ``` مارکڈائون
-        %{flagged_post_raw_content}
-        ```
-        [/details]
-
-        اضافی رہنمائی کیلئے، براہ کرم ہماری [کمیونٹی کی رہنما ہدایات](%{base_url}/guidelines) دیکھیے۔
     usage_tips:
       text_body_template: |
         نئے صارف کے طور پر شروعات کرنے پر چند فوری تجاویز کیلئے، [اِس بلاگ پوسٹ کو دیکھیں](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)۔
@@ -2751,21 +2688,9 @@ ur:
     account_suspended:
       title: "اکاؤنٹ معطل"
       subject_template: "[%{email_prefix}] آپ کا اکاؤنٹ معطل کر دیا گیا ہے"
-      text_body_template: |
-        آپ کو %{suspended_till} تک فورَم سے معطل کر دیا گیا ہے۔
-
-        %{reason}
-
-        %{message}
     account_silenced:
       title: "اکاؤنٹ خاموش"
       subject_template: "[%{email_prefix}] آپ کا اکاؤنٹ خاموش کر دیا گیا ہے"
-      text_body_template: |
-        آپ کو %{silenced_till} تک فورَم سے خاموش کر دیا گیا ہے۔
-
-        %{reason}
-
-        %{message}
     account_exists:
       title: "اکاؤنٹ پہلے سے موجود"
       subject_template: "[%{email_prefix}] اکاؤنٹ پہلے سے ہی موجود ہے"
@@ -2838,6 +2763,9 @@ ur:
     confirm_new_email:
       title: "نئے ای میل کی تصدیق کریں"
       subject_template: "[%{email_prefix}] اپنے نئے ای میل ایڈریس کی تصدیق کریں"
+    confirm_new_email_via_admin:
+      title: "نئے ای میل کی تصدیق کریں"
+      subject_template: "[%{email_prefix}] اپنے نئے ای میل ایڈریس کی تصدیق کریں"
     confirm_old_email:
       title: "پرانی ای میل تصدیق"
       subject_template: "[%{email_prefix}] اپنا موجودہ ای میل ایڈریس تصدیق کریں"
@@ -2909,6 +2837,8 @@ ur:
         اگر یہ آپ ہی تھے، بہت خوب! آپ کو کچھ مزید کرنے کی ضرورت نہیں ہے۔
 
         اگر یہ آپ نہیں تھے، تو براہ کرم [اپنے موجودہ سیشنوں کا جائزہ لیں](%{base_url}/my/preferences/account) اور اپنا پاسورڈ تبدیل کرنے پر غور کیجیے۔
+    post_approved:
+      title: "آپ کی پوسٹ منظور ہو گئی تھی"
   page_not_found:
     title: "افوہ! وہ صفحہ موجود نہیں یا ذاتی ہے۔"
     popular_topics: "مقبول"
@@ -2980,6 +2910,7 @@ ur:
     latte: "لا ٹَیے"
     summer: "موسمِ گرما"
     dark_rose: "گہرا گلابی"
+    default_theme_name: "ڈِیفالٹ"
     light_theme_name: "لائٹ"
     dark_theme_name: "ڈارک"
     neutral_theme_name: "نیوٹرل"
@@ -3538,6 +3469,12 @@ ur:
           city_for_disputes:
             label: "تنازعات کیلئے شہر"
             placeholder: "سان فرانسِسکو، کَیلیفَورنیا"
+      colors:
+        title: "رنگ"
+      fonts:
+        fields:
+          font_preview:
+            label: "پیشگی دیکھیں"
       logos:
         title: "لَوگَو"
         fields:
@@ -3576,9 +3513,6 @@ ur:
                 label: "زُمرَہ جات بکسے"
               categories_boxes_with_topics:
                 label: "زُمرَہ جات بکسے ٹاپکس کے ساتھ"
-      emoji:
-        title: "اِیمَوجی"
-        description: "آپ اپنی کمیونٹی کیلئے کونسا اِیمَوجی سڑائل پسند کریں گے؟ آپ ایڈمن، مرضی کے مطابق بنائیں، اِیمَوجی کے ذریعہ بعد میں مزید اپنی مرضی کے اِیمَوجی شامل کرسکتے ہیں۔"
       invites:
         title: "سٹاف مدعو کریں"
         description: "آپ تقریباً کام مکمل کر چکے ہیں! چلیے لوگوں کو دعوت دیتے ہیں کہ <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>آپ کے مباحثوں میں</a> دلچسپ ٹاپک اور جوابات شامل کرنے میں آپ کی مدد کریں تاکہ آپ کی کمیونٹی کا آغاز ہو سکے۔"
@@ -3627,7 +3561,6 @@ ur:
       new_topics_unless_trust_level: "کم ٹرسٹ لَیول پر صارفین کے ٹاپکس کو سٹاف کی طرف سے منظور کیا جانا ضروری ہے۔ دیکھیے `approve_new_topics_unless_trust_level`۔"
       fast_typer: "نِے صارف نے اپنی پہلی اشاعت مشکوک حد تک جلدی لکھی، مشتبہ بَوٹ یا سپَیمر رویہ۔ دیکھیے `min_first_post_typing_time`۔"
       auto_silence_regexp: "نیا صارف جس کی پہلی اشاعت `auto_silence_first_post_regex` ترتیب سے ملتی ہے۔"
-      watched_word: "اِس پوسٹ میں ایک نظر رکھا ہوا لفظ شامل ہے۔ اپنی <a href='%{base_url}/admin/logs/watched_words'>نظر رکھے ہوئے الفاظ کی فہرست</a> دیکھیے۔"
       staged: "سٹَیجڈ صارفین کیلئے نئے ٹاپکس اور پوسٹس کو سٹاف کی طرف سے منظور کیا جانا ضروری ہے۔ دیکھیے `approve_unless_staged`۔"
       category: "اِس زُمرہ میں پوسٹس کو سٹاف کی طرف سے دستی منظوری کی ضرورت ہوتی ہے۔ زُمرہ کی ترتیبات دیکھیے۔"
       must_approve_users: "تمام نئے صارفین کو سٹاف کی طرف سے منظور کیا جانا ضروری ہے۔ دیکھیے `must_approve_users`۔"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 33d2a76c38..a1436e652d 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -39,6 +39,7 @@ vi:
   title: "Discourse"
   topics: "Chủ đề"
   posts: "bài viết"
+  views: "lượt xem"
   loading: "Đang tải"
   powered_by_html: 'Được hỗ trợ bởi <a href="https://www.discourse.org">Discourse</a>, được xem tốt nhất khi bật JavaScript'
   sign_up: "Đăng ký"
@@ -50,6 +51,9 @@ vi:
   remove_posts_deleted_by_author: "Đã bị xóa bởi tác giả"
   redirect_warning: "Chúng tôi không thể xác minh rằng liên kết bạn chọn đã thực sự được đăng lên diễn đàn. Nếu bạn vẫn muốn tiếp tục, hãy chọn liên kết bên dưới."
   on_another_topic: "Về chủ đề khác"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} bởi %{username}"
   themes:
     bad_color_scheme: "Không thể cập nhật chủ đề, bảng màu không hợp lệ"
     other_error: "Đã xảy ra lỗi khi cập nhật chủ đề"
@@ -57,8 +61,16 @@ vi:
       unrecognized_extension: "Phần mở rộng tệp không được công nhận: %{extension}"
     import_error:
       generic: Đã xảy ra lỗi khi nhập chủ đề đó
+      about_json: "Import bị lỗi: about.json không tồn tại hoặc không hợp lệ. Bạn có chắc đây là một Discource Theme?"
+      about_json_values: "about.json chứa các giá trị không hợp lệ: %{errors}"
+      modifier_values: "Các công cụ sửa đổi about.json chứa các giá trị không hợp lệ: %{errors}"
       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ữ"
+      unpack_failed: "Tệp bị giải nén thất bại"
+      file_too_big: "Tệp chưa được nén quá lớn."
+      unknown_file_type: "Tệp bạn tải lên dường như không phải là một Discourse theme hợp lệ."
     settings_errors:
+      name_too_long: "Có một cài đặt có tên quá dài. Chiều dài tối đa là 255"
+      default_value_missing: "Cài đặt `%{name}'không có giá trị mặc định"
       number_value_not_valid_min_max: "Nó phải nằm trong khoảng từ %{min} đến %{max}."
       number_value_not_valid_min: "Nó phải lớn hơn hoặc bằng %{min}."
       number_value_not_valid_max: "Nó phải nhỏ hơn hoặc bằng %{max}."
@@ -126,7 +138,6 @@ vi:
       wrong_length:
         other: độ dài không hợp lệ (nên đặt %{count} ký tự)
       other_than: "phải khác %{count}"
-      sso_overrides_username: "Tên người dùng cần được cập nhật ở phía nhà cung cấp SSO, vì cài đặt `sso_overrides_username` được bật."
     template:
       body: ! "Đã có vấn đề với những trường sau:"
       header:
@@ -136,8 +147,15 @@ vi:
     site_settings:
       default_categories_already_selected: "Bạn không thể chọn một danh mục được sử dụng trong danh sách khác."
       s3_upload_bucket_is_required: "Bạn không thể tải lên S3 mà chưa thiết lập 's3_upload_bucket'."
+    onebox:
+      invalid_address: "Xin lỗi, chúng tôi không thể tạo bản xem trước cho trang web này vì không thể tìm thấy máy chủ %{hostname}. Thay vì xem trước, chỉ một liên kết sẽ xuất hiện trong bài đăng của bạn :cry:"
+      error_response: "Xin lỗi, chúng tôi không thể tạo bản xem trước cho trang web này vì máy chủ web trả về mã lỗi là %{status_code}. Thay vì xem trước, chỉ một liên kết sẽ xuất hiện trong bài đăng của bạn. :cry:"
+      missing_data:
+        other: "Xin lỗi, chúng tôi không thể tạo bản xem trước cho trang web này vì không thể tìm thấy các thẻ oEmbed / OpenGraph sau: %{missing_attributes}"
   invite:
     user_exists: "Không cần mời <b>%{email}</b>, họ <a href='%{base_path}/u/%{username}/summary'>đã có tài khoản!</a>"
+    disabled_errors:
+      invalid_access: "Bạn không được phép xem tài nguyên đã yêu cầu."
   topic_invite:
     user_exists: "Xin lỗi, thành viên này đã được mời. Bạn chỉ có thể mời một người dùng đến một chủ đề một lần."
   backup:
@@ -163,6 +181,8 @@ vi:
     permalink: "Liên kết cố định"
     imported_from: "Đây là cuộc thảo luận đi kèm chủ đề gốc tại %{link}"
     in_reply_to: "▶ %{username}"
+    replies:
+      other: "%{count} trả lời"
     created: "Tạo bởi"
   no_mentions_allowed: "Xin lỗi, bạn không thể nhắc tới thành viên khác."
   too_many_mentions:
@@ -191,6 +211,8 @@ 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}'"
+  rss_num_posts:
+    other: "%{count} bài viết"
   read_full_topic: "Đọc toàn bộ chủ đề"
   private_message_abbrev: "Tin nhắn"
   rss_description:
@@ -208,6 +230,8 @@ 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"
+      next_business_day: "Ngày làm việc tiếp theo"
       tomorrow: "Ngày mai"
       next_week: "Tuần tới"
       next_month: "Tháng t"
@@ -221,7 +245,8 @@ vi:
       invalid_incoming_email: "'%{email}' không phải là email hợp lệ."
       email_already_used_in_group: "'%{email}' đã được sử dụng trong nhóm '%{group_name}'."
       email_already_used_in_category: "'%{email}' đã được sử dụng trong danh mục '%{category_name}'."
-      adding_too_many_users: "Có thể thêm tối đa %{limit} người dùng cùng một lúc"
+      adding_too_many_users:
+        other: "Có thể thêm tối đa %{count} người dùng cùng một lúc"
     default_names:
       everyone: "Mọi người"
       admins: "quản trị"
@@ -235,28 +260,6 @@ vi:
   education:
     until_posts:
       other: "%{count} bài đăng"
-    "new-topic": |2
-
-      Chào mừng bạn đến với %{site_name} &mdash; **cảm ơn vì đã đăng cuộc thảo luận mới!**
-
-      - Bạn có cảm thấy tiêu đề có thú vị không khi bạn đọc to nó? Đó có phải là một đoạn tóm tắt tốt không?
-
-      - Những ai sẽ hứng thú với cuộc thảo luận này? Tại sao đó lại trở thành vấn đề? Bạn muốn những loại phản hồi thế nào?
-
-      - Sử dụng những từ khóa phổ biến để người khác có thể tìm thấy chủ đề của bạn dễ hơn. Để nhóm chủ đề của bạn với các chủ đề liên quan khác, hãy chọn chuyên mục cho chủ đề của mình.
-
-      Xem thêm, [hướng dẫn cộng đồng của chúng tôi](%{base_path}/guidelines). Bảng điều khiển này sẽ chỉ xuất hiện vào lần đầu %{education_posts_text}.
-    "new-reply": |2
-
-      Chào mừng bạn đến với %{site_name} &mdash; **cám ơn vì đã đóng góp!**
-
-      - Câu trả lời của bạn có làm cuộc thảo luận tốt hơn về mặt nào đó?
-
-      - Hãy đối xử tốt với các thành viên khác trong cộng đồng của bạn.
-
-      - Lời phê bình mang tính đóng góp cũng được chào đón, nhưng bạn nên phê bình *ý tưởng* chứ không phải con người.
-
-      [Đọc hướng dẫn cộng đồng](%{base_path}/guidelines) để có thêm thông tin. Bảng này chỉ xuất hiện cho bài viết đầu tiên của bạn %{education_posts_text}.
   activerecord:
     attributes:
       category:
@@ -273,42 +276,126 @@ vi:
         topic:
           attributes:
             base:
+              warning_requires_pm: "Bạn chỉ có thể đính kèm cảnh báo vào tin nhắn cá nhân."
               too_many_users: "Bạn chỉ có thể gửi một cảnh báo tới một người dùng mỗi lần."
               no_user_selected: "Bạn phải chọn một thành viên phù hợp."
+              reply_by_email_disabled: "Trả lời bằng email đã bị vô hiệu hóa."
+              target_user_not_found: "Không thể tìm thấy một trong những người dùng bạn đang gửi tin nhắn này."
               unable_to_update: "Đã xảy ra lỗi khi cập nhật chủ đề đó."
+            featured_link:
+              invalid: "là không hợp lệ. URL nên bao gồm http://hoặc https://."
+              invalid_category: "không thể chỉnh sửa trong thể loại này."
         user:
           attributes:
             password:
               common: "là một trong 10000 mật khẩu được sử dụng nhiều nhất. Vui lòng sử dụng một mật khẩu an toàn hơn."
               same_as_username: "giống với tên đăng nhập của bạn. Vui lòng sử dụng mật khẩu bảo mật hơn."
               same_as_email: "giống với email của bạn. Vui lòng sử dụng mật khẩu bảo mật hơn"
+              same_as_current: "là giống như mật khẩu hiện tại của bạn."
+              same_as_name: "là giống với tên của bạn."
+              unique_characters: "có quá nhiều ký tự lặp lại. Vui lòng sử dụng mật khẩu an toàn hơn."
+            username:
+              same_as_password: "là giống như mật khẩu hiện tại của bạn."
+            name:
+              same_as_password: "là giống như mật khẩu hiện tại của bạn."
             ip_address:
               signup_not_allowed: "Đăng ký không cho phép tài khoản này"
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Chủ đề này không thể được giới thiệu trên hồ sơ của bạn."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Không được phép gán lại email chính cho người dùng khác."
         color_scheme_color:
           attributes:
             hex:
               invalid: "không phải là một màu không hợp lệ"
+        post_reply:
+          base:
+            different_topic: "Bài viết và bài trả lời phải thuộc cùng một chủ đề."
+        web_hook:
+          attributes:
+            payload_url:
+              invalid: "URL không hợp lệ. URL phải bao gồm http: // hoặc https: //. Và không được phép để trống."
+        custom_emoji:
+          attributes:
+            name:
+              taken: đã được sử dụng bởi một biểu tượng cảm xúc khác
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "phải ở trong tương lai."
       <<: *errors
+  uncategorized_category_name: "Chưa phân loại"
   vip_category_name: "Phòng khách"
   vip_category_description: "Một chuyên mục chỉ dành cho thành viên có mức tin tưởng 3 hoặc cao hơn"
   meta_category_name: "Phản hồi"
   meta_category_description: "Thảo luận về site này, tổ chức của nó, làm sao nó hoạt động, và làm sao chúng tôi có thể cải tiến nó tốt hơn."
   staff_category_name: "Nhân viên"
   staff_category_description: "Chuyên mục riêng dành cho nhân viên. Các chủ đề chỉ hiển thị với quản trị viên và điều hành viên."
+  discourse_welcome_topic:
+    title: "Chào mừng đến với Discourse"
+    body: |2
+
+      Đoạn đầu tiên của chủ đề được ghim này sẽ hiển thị như một thông điệp chào mừng cho tất cả những khách truy cập mới trên trang chủ của bạn. Nó quan trọng!
+
+      ** Chỉnh sửa ** này thành mô tả ngắn gọn về cộng đồng của bạn:
+
+      - Nó dành cho ai?
+      - Họ có thể tìm thấy gì ở đây?
+      - Tại sao họ phải đến đây?
+      - Họ có thể đọc thêm ở đâu (liên kết, tài nguyên, v.v.)?
+
+      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+
+      Bạn có thể muốn đóng chủ đề này thông qua quản trị viên :wrench: (ở phía trên bên phải và phía dưới), để các câu trả lời không bị dồn vào một thông báo.
   lounge_welcome:
     title: "Chào mừng bạn đến với Phòng khách"
+    body: |2
+
+      Xin chúc mừng! :confetti_ball:
+
+      Nếu bạn có thể thấy chủ đề này, gần đây bạn đã được thăng cấp lên ** thông thường ** (mức độ tin cậy 3).
+
+      Bây giờ bạn có thể &hellip;
+
+      * Chỉnh sửa tiêu đề của bất kỳ chủ đề nào
+      * Thay đổi danh mục của bất kỳ chủ đề nào
+      * Đã xóa tất cả các liên kết của bạn ([tự động nofollow] (https://en.wikipedia.org/wiki/Nofollow)) )
+      * Truy cập danh mục Phòng chờ riêng tư chỉ hiển thị cho người dùng ở cấp độ tin cậy 3 trở lên
+      * Ẩn thư rác bằng một lá cờ duy nhất
+
+      Đây là [danh sách hiện tại của các cơ quan chính quy] (%{base_path}/ huy hiệu / 3 / thông thường). Hãy chắc chắn để nói lời chào.
+
+      Cảm ơn bạn đã trở thành một phần quan trọng của cộng đồng này!
+
+      (Để biết thêm thông tin về mức độ tin cậy, [xem chủ đề này][trust]Xin lưu ý rằng chỉ những thành viên tiếp tục đáp ứng các yêu cầu theo thời gian mới được giữ nguyên.)
+
+      [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
+  admin_quick_start_title: "ĐỌC TÔI ĐẦU TIÊN: Hướng dẫn Bắt đầu Nhanh dành cho Quản trị viên"
   category:
     topic_prefix: "Giới thiệu chuyên mục %{category}"
+    replace_paragraph: "(Thay thế đoạn đầu tiên này bằng một mô tả ngắn gọn về danh mục mới của bạn. Hướng dẫn này sẽ xuất hiện trong vùng chọn danh mục, vì vậy hãy cố gắng giữ cho nó dưới 200 ký tự.)"
     post_template: "%{replace_paragraph}\n\nSử dụng những đoạn sau để viết mô tả dài, hướng dẫn sử dụng hoặc điều luật sử dụng:\n\n- Mục đích sử dụng của category này là gì?\n\n- Category này khác với những cái khác như thế nào?\n\n- Những topic trong category này thường có nội dung gì?\n\n- Chúng ta có thể ghép với category khác không?\n"
     errors:
+      not_found: "Không tìm thấy danh mục!"
       uncategorized_parent: "Mục \"Chưa được phân loại\" không thể có một chuyên mục chính"
       self_parent: "Cha của chủ đề phụ không thể nào là chính nó"
       depth: "Bạn không thể để một chuyên mục con trong một chuyên mục con khác."
       invalid_email_in: "'%{email}' không phải là email hợp lệ."
       email_already_used_in_group: "'%{email}' đã được sử dụng trong nhóm '%{group_name}'."
       email_already_used_in_category: "'%{email}' đã được sử dụng trong danh mục '%{category_name}'."
+      description_incomplete: "Phần mô tả danh mục phải có ít nhất một đoạn văn."
+      permission_conflict: "Bất kỳ nhóm nào được phép truy cập vào một thể loại con cũng phải được phép truy cập thể loại cha. Các nhóm sau đây có quyền truy cập vào một trong các thể loại con, nhưng không có quyền truy cập vào thể loại mẹ: %{group_names}."
+      disallowed_topic_tags: "Chủ đề này có các thẻ không được danh mục này cho phép: '%{tags}'"
+      disallowed_tags_generic: "Chủ đề này có thẻ không được phép."
     cannot_delete:
+      uncategorized: "Danh mục này là đặc biệt. Nó được thiết kế như một khu vực lưu trữ cho các chủ đề không có danh mục; nó không thể bị xóa."
       has_subcategories: "Không thể xoá chuyên mục này được vì nó có chuyên mục con."
+      topic_exists:
+        other: "Không thể xóa danh mục này vì nó có %{count} chủ đề. Chủ đề cũ nhất là %{topic_link}."
       topic_exists_no_oldest: "Không thể xoá chuyên mục này vì nó có %{count} chủ để."
     uncategorized_description: "Chủ đề không cần chuyên mục, hoặc không phù hợp với bất kỳ chuyên mục nào hiện có."
   trust_levels:
@@ -323,15 +410,22 @@ vi:
     leader:
       title: "người khởi xướng"
     change_failed_explanation: "Bạn đã cố gắng để giảm hạng %{user_name} xuống '%{new_trust_level}'. Tuy nhiên cấp độ tin cậy hiện tại của họ đã là '%{current_trust_level}'. %{user_name} sẽ được giữ lại ở cấp độ '%{current_trust_level}' - nếu bạn muốn giảm hạng thành viên, trước tiên hãy khóa cấp độ tin cậy"
+  post:
+    image_placeholder:
+      broken: "Hình ảnh này bị hỏng"
   rate_limiter:
+    slow_down: "Bạn đã thực hiện hành động này quá nhiều lần, vui lòng thử lại sau."
+    too_many_requests: "Bạn đã thực hiện hành động này quá nhiều lần. Vui lòng đợi %{time_left} trước khi thử lại."
     by_type:
-      edit_post: "Bạn đã đạt đến số lần chỉnh sửa tối đa. Vui lòng đợi %{time_left} trước khi thử lại."
+      live_post_counts: "Bạn đang yêu cầu số lượng bài đăng trực tiếp quá nhanh. Vui lòng đợi %{time_left} trước khi thử lại."
+      unsubscribe_via_email: "Bạn đã đạt đến số lượng người hủy đăng ký tối đa qua email. Vui lòng đợi %{time_left} trước khi thử lại."
     hours:
       other: "%{count} giờ"
     minutes:
       other: "%{count} phút"
     seconds:
       other: "%{count} giây"
+    short_time: "một vài giây"
   datetime:
     distance_in_words:
       half_a_minute: "< 1 phút"
@@ -389,6 +483,8 @@ vi:
     title: "Thiết lập lại mật khẩu"
     success: "Bạn đã thay đổi mật khẩu thành công và đã được đăng nhập."
     success_unapproved: "Bạn đã thay đổi mật khẩu thành công."
+  email_login:
+    invalid_token: "Xin lỗi, liên kết đăng nhập email đó quá cũ. Chọn nút Đăng nhập và sử dụng 'Tôi quên mật khẩu của mình' để nhận liên kết mới."
   change_email:
     confirmed: "Email của bạn đã được cập nhật."
     please_continue: "Tiếp tục đến %{site_name}"
@@ -434,6 +530,9 @@ vi:
       title: "Thích"
       description: "Thích bài viết này"
       short_description: "Thích bài viết này"
+  user_activity:
+    no_bookmarks:
+      self: "Bạn không có bài viết nào được đánh dấu; dấu trang cho phép bạn nhanh chóng tham khảo các bài viết cụ thể."
   topic_flag_types:
     spam:
       title: "Rác"
@@ -472,6 +571,7 @@ vi:
       every_month: "mỗi tháng"
       every_six_months: "mỗi sáu tháng"
   user_api_key:
+    read: "đã đọc"
     otp_confirmation:
       confirm_title: Tiếp tục tới %{site_name}
       logging_in_as: Đăng nhập bằng %{username}
@@ -573,6 +673,7 @@ vi:
       title: "Lượt thích"
       xaxis: "Ngày"
       yaxis: "Số lượt thích mới"
+      description: "Số lượt thích mới."
     flags:
       title: "Dấu cờ - Flags"
       xaxis: "Ngày"
@@ -586,6 +687,7 @@ vi:
       xaxis: "Bậc tin tưởng"
       yaxis: "Số thành viên"
       description: "Số lượng thành viên được nhóm theo mức độ tin cậy."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Người dùng mỗi loại"
       xaxis: "Loại"
@@ -596,6 +698,7 @@ vi:
         admin: Quản trị
         moderator: Điều hành
         suspended: Đã tạm khóa
+        silenced: Im lặng
       description: "Số thành viên được nhóm bởi quản trị viên, điều hành viên, đã tạm ngưng và im lặng."
     trending_search:
       title: Xu hướng tìm kiếm
@@ -730,6 +833,7 @@ vi:
     top_uploads:
       labels:
         filename: Tên tập tin
+        author: Tác giả
   dashboard:
     rails_env_warning: "Máy chủ của bạn đang chạy trong chế độ %{env}."
     host_names_warning: "Cài đặt của bạn config/database.yml đang sử dụng hostname mặc định. Cập nhật lại để sử dụng hostname của bạn"
@@ -738,11 +842,10 @@ vi:
     memory_warning: "Máy chủ của bạn có bộ nhớ ít hơn 1 GB. Khuyến cáo sử dụng bộ nhớ tối thiểu 1 GB ."
     google_oauth2_config_warning: 'Máy chủ được định cấu hình để cho phép đăng ký và đăng nhập bằng Google OAuth2 (enable_google_oauth2_logins), nhưng id máy khách và giá trị bí mật của máy khách không được đặt. Chuyển đến <a href="%{base_path}/admin/site_settings">Cài đặt trang</a> và cập nhật cài đặt. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Xem hướng dẫn này để tìm hiểu thêm</a>.'
     s3_backup_config_warning: 'Máy chủ được định cấu hình để tải các bản sao lưu lên S3, nhưng ít nhất một cài đặt sau chưa được đặt: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile hoặc s3_backup_bucket. Chuyển đến <a href="%{base_path}/admin/site_settings">Cài đặt trang</a> và cập nhật cài đặt. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Xem "Cách thiết lập tải hình ảnh lên S3?" để tìm hiểu thêm</a>.'
+    s3_cdn_warning: 'Máy chủ được cấu hình để tải lên các tập tin lên S3, nhưng không có S3 CDN cấu hình. Điều này có thể dẫn đến chi phí S3 đắt tiền và hiệu suất trang web chậm hơn. <a href="https://meta.discourse.org/t/-/148916" target="_blank">Xem “Sử dụng lưu trữ đối tượng để tải lên” để tìm hiểu thêm</a>.'
     subfolder_ends_in_slash: "Thư mục con của bạn được thiết lập không đúng, DISCOURSE_RELATIVE_URL_ROOT phải được kết thúc bằng dấu gạch chéo."
     email_polling_errored_recently:
       other: "Email đã tạo %{count} lỗi trong 24 giờ qua, xem <a href='%{base_path}/logs' target='_blank'>nhật ký</a> để biết thêm chi tiết."
-    deprecated_api_usage: "Chúng tôi đã phát hiện thấy một yêu cầu API sử dụng phương pháp xác thực không được dùng nữa. Vui lòng cập nhật nó để sử dụng <a href='https://meta.discourse.org/t/-/22706'>xác thực dựa trên tiêu đề</a>. Sau khi cập nhật thông báo này có thể mất 24 giờ để biến mất."
-    update_mail_receiver: "Chúng tôi đã phát hiện thấy phiên bản nhận thư đã lỗi thời. Nhấp vào <a href='https://meta.discourse.org/t/-/133491'>đây</a> để xem hướng dẫn cập nhật. Sau khi cập nhật thông báo này có thể mất 24 giờ để biến mất."
     poll_pop3_timeout: "Không thể kết nối với POP3 server, sẽ không nhận được email gửi đến. Bạn hãy kiểm tra <a href='%{base_path}/admin/site_settings/category/email'>thiết lập POP3</a> và nhà cung cấp dịch vụ."
     poll_pop3_auth_error: "Không thể kết nối với POP3 server do lỗi chứng thực. Bạn hãy kiểm tra <a href='%{base_path}/admin/site_settings/category/email'>thiết lập POP3</a>."
     out_of_date_themes: "Các bản cập nhật có sẵn cho các chủ đề sau:"
@@ -804,6 +907,7 @@ vi:
     post_undo_action_window_mins: "Số phút thành viên được phép làm lại các hành động gần đây với bài viết (like, đánh dấu...)."
     pending_users_reminder_delay: "Thông báo cho quản trị viên nếu thành viên mới đã chờ duyệt lâu hơn số giờ được thiết lập ở đây, đặt là -1 để tắt thông báo."
     cors_origins: "Cho phép CORS (Cross-Origin Requests). Mỗi nguyên gốc phải kèm theo http:// hoặc https://. Biến env DISCOURSE_ENABLE_CORS phải được đặt là 'true' để bật CORS."
+    use_admin_ip_allowlist: "Admin chỉ có thể đăng nhập nếu có địa chỉ IP được định nghĩa trước trong danh sách Screened IPs (Admin > Logs > Screened Ips)."
     invalidate_inactive_admin_email_after_days: "Các tài khoản quản trị viên chưa truy cập trang web trong số ngày này sẽ cần xác thực lại địa chỉ email của họ trước khi đăng nhập. Đặt thành 0 để tắt."
     top_menu: "Xác định các mục nào hiển thị trong thanh điều hướng trang chủ, và theo thứ tự nào. Ví dụ latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Xác định các mục nào hiển thị trên menu bài viết, và theo thứ tự nào. Ví dụ like|edit|flag|delete|share|bookmark|reply"
@@ -822,6 +926,8 @@ vi:
     prioritize_username_in_ux: "Hiển thị tên người dùng đầu tiên trên trang người dùng, thẻ người dùng và bài đăng (khi tên bị vô hiệu được hiển thị trước)"
     email_token_valid_hours: "Token quyên mật khẩu / kích hoạt tài khoản có giá trị trong (n) giờ."
     enable_badges: "Kích hoạt hệ thống huy hiệu"
+    blocked_email_domains: "Một danh sách đuôi email mà người dùng không được phép dùng để đăng ký tài khoản. Ví dụ: maillinator.com|trashmail.net. Lưu ý mỗi tên miền cách nhau bởi dấu \"|\"."
+    allowed_email_domains: "Danh sách tên miền người dùng ĐƯỢC PHÉP đăng ký tài khoản. CẢNH BÁO: người dùng với tên miền email khác trong danh sách sẽ không được phép đăng ký!"
     log_out_strict: "Khi đăng xuất, đăng xuất TẤT CẢ session cho tất cả thiế bị"
     new_version_emails: "Gửi email đến địa chỉ contact_email khi có phiên bản Discourse mới."
     invite_expiry_days: "Key mời người dùng có giới hạn bao lâu? tính theo ngày"
@@ -830,10 +936,6 @@ vi:
     min_password_length: "Chiều dài mật khẩu tối thiểu."
     min_admin_password_length: "Chiều dài mật khẩu tối thiểu đối với Admin."
     block_common_passwords: "Không cho phép mật khẩu trong danh sách 10.000 mật khẩu phổ biến."
-    enable_sso: "Cho phép dùng single sign on bằng trang ngoài (CẢNH BÁO: ĐỊA CHỈ EMAIL CỦA NGƯỜI DÙNG PHẢI ĐƯỢC CHỨNG THỰC BỞI TRANG NGOÀI!)"
-    sso_url: "URL đầu cuối của Single Sign On (phải kèm theo http:// hoặc https://)"
-    sso_secret: "Chuỗi bảo mật đã được sử dụng để chứng thực thông tin SSO, chắc chắn nó có ít nhất 10 ký tự."
-    sso_not_approved_url: "Chuyển những tài khoản SSO chưa duyệt tới URL này"
     allow_new_registrations: "Cho phép đăng ký người dùng mới. Bỏ chọn để bất cứ ai cũng có thể tạo tài khoản mới."
     enable_signup_cta: "Hiện thông báo với thành viên ẩn danh khi họ quay lại để yêu cầu họ đăng ký tài khoản."
     google_oauth2_client_id: "Client ID ứng dụng Google của bạn."
@@ -874,8 +976,8 @@ vi:
     s3_cdn_url: "CDN URL được sử dụng cho tất cả các tài nguyên S3 (vd: https://cdn.somewhere.com). CHÚ Ý: sau khi thay đổi thiết lập này bạn phải tạo lại các bài viết cũ."
     avatar_sizes: "Danh sách những kích thước hình đại diện tự động khởi tạo."
     external_system_avatars_enabled: "Sử dụng dịch vụ ảnh đại diện bên ngoài."
+    selectable_avatars: "Danh sách ảnh đại diện mà người dùng có thể chọn."
     allow_all_attachments_for_group_messages: "Cho phép các email có đính kèm trong tin nhắn nhóm."
-    enable_flash_video_onebox: "Cho phép nhúng liên kết swf và flv (Adobe Flash). CHÚ Ý: có thể chứa đựng các rủi ro bảo mật."
     default_invitee_trust_level: "Bậc tin tưởng mặc định (0-4) cho thành viên được mời."
     default_trust_level: "Cấp độ tin cậy mặc định (0-4) cho tất cả các thành viên mới. CHÚ Ý! Thay đổi thiết lập này sẽ đặt bạn vào nguy cơ spam cao."
     tl1_requires_topics_entered: "Số chủ đề một thành viên mới phải truy cập trước khi được lên bậc tin tưởng 1"
@@ -921,6 +1023,7 @@ 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."
+    dark_mode_none: "Không có gì"
     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."
@@ -940,6 +1043,7 @@ vi:
     faq_url: "Nếu bạn có một địa chỉ FAQ muốn sử dụng, điền URL đầy đủ ở đây."
     tos_url: "Nếu bạn có một địa chỉ Quy Định Sử Dụng muốn sử dụng, điền URL đầy đủ ở đây."
     privacy_policy_url: "Nếu bạn có một địa chỉ Quyền Riêng Tư muốn sử dụng, điền URL đầy đủ ở đây."
+    allowed_spam_host_domains: "Danh sách tên miền sẽ được miễn trừ khỏi kiểm tra spam. Thành viên mới sẽ không bị giới hạn khi tạo bài viết có chứa liên kết từ các tên miền này."
     topic_view_duration_hours: "Đếm lượt xem chủ đề mới một lần cho mỗi IP/User trong N giờ"
     user_profile_view_duration_hours: "Đếm lượt xem hồ sơ mới một lần cho mỗi IP/User trong N giờ"
     levenshtein_distance_spammer_emails: "Khi phù hợp với thư rác, số ký tự khác biệt vẫn sẽ cho phép khả năng chính xác mờ."
@@ -1015,7 +1119,6 @@ vi:
     show_create_topics_notice: "Nếu trang có ít hơn 5 chủ đề công khai, hiển thị một thông báo yêu cầu quản trị tạo thêm các chủ đề mới"
     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"
     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?"
@@ -1025,7 +1128,6 @@ vi:
     returning_users_days: "Bao nhiêu ngày sẽ trôi qua trước khi người dùng được coi là trở lại."
     review_media_unless_trust_level: "Nhân viên sẽ xem xét các bài đăng của người dùng có mức độ tin cậy thấp hơn nếu chúng chứa phương tiện được nhúng."
     default_email_mailing_list_mode: "Mặc định gửi email cho mỗi bài viết mới."
-    disable_mailing_list_mode: "Không cho phép thành viên bật chế độ danh sách thư."
     default_email_previous_replies: "Kèm theo các trả lời trước trong email theo mặc định."
     default_email_in_reply_to: "Kèm theo trích đoạn trả lời bài viết trong email theo mặc định."
     default_other_new_topic_duration_minutes: "Điều kiện mặc định chung với chủ đề được coi là mới."
@@ -1033,6 +1135,7 @@ vi:
     default_other_external_links_in_new_tab: "Mặc định mở các liên kết ngoài trong thẻ mới "
     default_other_enable_quoting: "Bật trích dẫn trả lời để nổi bật nội dung theo mặc định."
     default_other_dynamic_favicon: "Hiện bộ đếm chủ đề mới/cập nhật trên icon trình duyệt theo mặc định."
+    default_other_skip_new_user_tips: "Bỏ qua các mẹo và huy hiệu giới thiệu người dùng mới."
     default_other_like_notification_frequency: "Thông báo thành viên khi like theo mặc định"
     default_topics_automatic_unpin: "Tự động bỏ ghim chủ đề khi thành viên xuống cuối trang theo mặc định."
     default_categories_watching: "Hiển thị danh sách chuyên mục đang xem theo mặc định."
@@ -1071,7 +1174,7 @@ vi:
       topic: "Kết quả"
       user: "Thành viên"
     results_page: "Search results for '%{term}'"
-  sso:
+  discourse_connect:
     not_found: "Không tìm thấy tài khoản của bạn, xin hãy liên hệ với BQT."
     account_not_approved: "Tài khoản của bạn chưa được BQT chấp thuận, bạn sẽ nhận được email thông báo khi được chấp nhận."
     unknown_error: "Đã có vấn đề xảy ra với tài khoản của bạn, xin hãy liên hệ với BQT."
@@ -1120,6 +1223,12 @@ vi:
     autoclosed_disabled_lastpost: "Chủ đề này đã được mở. Bạn có thể bình luận"
     auto_deleted_by_timer: "Tự động xóa theo bộ hẹn giờ."
   login:
+    security_key_description: "Khi bạn đã chuẩn bị khóa bảo mật vật lý, hãy nhấn nút Xác thực bằng Khóa bảo mật bên dưới."
+    security_key_alternative: "Thử lại cách khác"
+    security_key_authenticate: "Xác thực bằng Khóa bảo mật"
+    security_key_not_allowed_error: "Quá trình xác thực khóa bảo mật đã hết thời gian chờ hoặc đã bị hủy."
+    security_key_no_matching_credential_error: "Không thể tìm thấy thông tin xác thực phù hợp trong khóa bảo mật được cung cấp."
+    security_key_support_missing_error: "Thiết bị hoặc trình duyệt hiện tại của bạn không hỗ trợ việc sử dụng khóa bảo mật. Vui lòng sử dụng một phương pháp khác."
     not_approved: "Tài khoản của bạn chưa được kiểm duyệt. Bạn sẽ nhận được email thông báo khi bạn được phép đăng nhập."
     incorrect_username_email_or_password: "Không đúng tài khoản, email hoặc mật khẩu"
     wait_approval: "Cảm ơn bạn đã đăng ký. Chúng tôi sẽ thông báo sau khi tài khoản của bạn được kiểm duyệt."
@@ -1305,6 +1414,8 @@ vi:
     ignored: "Cảm ơn đã cho chúng tôi biết thông tin. Chúng tôi đang xem xét nó."
     ignored_and_deleted: "Cảm ơn bạn đã cho chúng tôi biết, chúng tôi đã gỡ bỏ bài viết."
   system_messages:
+    queued_by_staff:
+      title: "Bài viết cần phê duyệt"
     flags_disagreed:
       title: "Nhân viên đã khôi phục bài đăng bị gắn cờ"
       subject_template: "Nhân viên đã khôi phục bài đăng bị gắn cờ"
@@ -1625,6 +1736,8 @@ vi:
       subject_template: "Bạn đã được kiểm duyệt ở %{site_name}!"
     suspicious_login:
       subject_template: "[%{site_name}] Đăng nhập mới từ %{location}"
+    post_approved:
+      title: "Bài đăng của bạn đã được phê duyệt"
   page_not_found:
     title: "Rất tiếc! Địa chỉ này không tồn tại hoặc riêng tư."
     popular_topics: "Phổ biến"
@@ -1632,6 +1745,10 @@ vi:
     see_more: "Thêm"
     search_title: "Tìm trang này"
     search_button: "Tìm kiếm"
+  login_required:
+    welcome_message: |
+      ## [Chào mừng tới %{title}] (#welcome)
+      Một tài khoản là bắt buộc. Vui lòng tạo một tài khoản hoặc đăng nhập để tiếp tục.
   deleted: "đã bị xóa "
   image: "hình ảnh"
   upload:
@@ -1665,6 +1782,7 @@ vi:
     sender_body_blank: "nội dung rỗng"
   color_schemes:
     base_theme_name: "Cơ bản"
+    default_theme_name: "Mặc định"
   edit_this_page: "Sửa trang này"
   csv_export:
     boolean_yes: "Đồng ý"
@@ -1838,6 +1956,8 @@ vi:
   tags:
     title: "Thẻ"
   finish_installation:
+    register:
+      button: "Đăng ký"
     resend_email:
       title: "Gửi lại email kích hoạt"
   wizard:
@@ -1858,9 +1978,17 @@ vi:
           contact_email:
             placeholder: "name@example.com"
             description: "Địa chỉ email của người hoặc nhóm chịu trách nhiệm về cộng đồng này. Được sử dụng cho các thông báo quan trọng như cờ chưa được xử lý, cập nhật bảo mật và trên <a href='%{base_path}/about' target='_blank'>trang giới thiệu</a> của bạn để liên hệ khẩn cấp với cộng đồng."
+          contact_url:
+            placeholder: "https://www.example.com/contact-us"
       corporate:
         title: "Công ty"
         description: "Thông tin này sẽ được nhập vào <a href='%{base_path}/tos' target='blank'>Điều khoản dịch vụ</a> của bạn, đây là một chủ đề bạn có thể chỉnh sửa trong danh mục Nhân viên. Nếu bạn không có một công ty, hãy bỏ qua bước này ngay bây giờ."
+      colors:
+        title: "Màu sắc"
+      fonts:
+        fields:
+          font_preview:
+            label: "Xem trước"
       homepage:
         fields:
           homepage_style:
@@ -1873,8 +2001,6 @@ vi:
                 label: "Các chuyên mục và chủ đề mới"
               categories_and_top_topics:
                 label: "Chuyên mục và Chủ đề nổi bật"
-      emoji:
-        title: "Emoji"
   joined: "Đã tham gia"
   discourse_push_notifications:
     popup:
@@ -1884,15 +2010,23 @@ vi:
       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}'
+      watching_first_post: '%{username} đã tạo một chủ đề mới "%{topic}" - %{site_title}'
+      confirm_title: "Đã bật thông báo - %{site_title}"
+      confirm_body: "Sự thành công! Thông báo đã được kích hoạt."
       custom: "Thông báo từ %{username} trên %{site_title}"
   staff_action_logs:
     user_merged: "%{username} đã được hợp nhất vào tài khoản này"
     webhook_deactivation_reason: "Webhook của bạn đã tự động bị vô hiệu hóa. Chúng tôi đã nhận được nhiều phản hồi lỗi trạng thái HTTP '%{status}'."
+    api_key:
+      revoked: Đã thu hồi
   reviewables:
     priorities:
+      low: "Thấp"
       medium: "Trung bình"
       high: "Cao"
     sensitivity:
+      disabled: "Khóa"
+      low: "Thấp"
       medium: "Trung bình"
       high: "Cao"
     conflict: "Đã có xung đột cập nhật ngăn bạn làm điều đó."
@@ -1901,6 +2035,8 @@ vi:
     actions:
       agree_and_suspend:
         title: "Tạm khóa Thành viên"
+      agree_and_silence:
+        title: "Người dùng im lặng"
       delete_spammer:
         title: "Xóa người Spam"
       delete_single:
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 17e5786ecc..acc9cbbaae 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -37,7 +37,7 @@ zh_CN:
     pm: "下午"
     <<: *datetime_formats
   title: "Discourse"
-  topics: "主题列表"
+  topics: "话题列表"
   posts: "帖子"
   views: "浏览"
   loading: "载入中"
@@ -50,10 +50,14 @@ zh_CN:
   anonymous: "匿名"
   remove_posts_deleted_by_author: "被作者删除"
   redirect_warning: "我们无法验证你选择的链接是否已实际发布到论坛。如果你仍想继续，请选择以下链接。"
-  on_another_topic: "在另外的主题中"
+  on_another_topic: "在另外的话题中"
+  inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
+    topic_page_title_post_number_by_user: "#%{post_number} 由 %{username}"
   themes:
     bad_color_scheme: "无法更新主题，无效的调色板"
     other_error: "更新主题时出错"
+    ember_selector_error: "抱歉 - 不允许使用 #ember 或 .ember-view CSS 选择器，因为这些名称是在运行时动态生成的，并且会随着时间变化，最终会导致 CSS 损坏。尝试其他选择器。"
     compile_error:
       unrecognized_extension: "无法识别的文件扩展名：%{extension}"
     import_error:
@@ -62,9 +66,11 @@ zh_CN:
       about_json_values: "about.json 包含无效值：%{errors}"
       modifier_values: "about.json 的修改包含无效值：%{errors}"
       git: "克隆git仓库时出错，访问被拒绝或找不到仓库"
+      git_ref_not_found: "无法切换到git引用：%{ref}"
       unpack_failed: "无法解压缩文件"
       file_too_big: "未压缩的文件太大。"
       unknown_file_type: "你上传的文件似乎不是一个有效的 Discourse 主题。"
+      not_allowed_theme: "`%{repo}` 不在允许的主题列表中(请检查全局设置中的 `allowed_theme_repos`)。"
     errors:
       component_no_user_selectable: "主题组件不能由用户选择"
       component_no_default: "主题组件不能是默认主题"
@@ -92,7 +98,7 @@ zh_CN:
       invalid_yaml: "本地化翻译 YAML 文件无效"
   emails:
     incoming:
-      default_subject: "此主题需要一个标题"
+      default_subject: "此话题需要一个标题"
       show_trimmed_content: "显示被截短的内容"
       maximum_staged_user_per_email_reached: "已达到每个电子邮件可以创建暂存用户的上限。"
       no_subject: "（无标题）"
@@ -108,17 +114,17 @@ zh_CN:
         inactive_user_error: "发件人未激活。"
         silenced_user_error: "发件人被禁言。"
         bad_destination_address: "“收件人/抄送”字段中的电子邮件地址无法与已配置的传入电子邮件地址匹配。"
-        strangers_not_allowed_error: "用户尝试在一个其未加入的分类中创建主题。"
-        insufficient_trust_level_error: "用户尝试在一个其不满足信任等级要求的分类下发表主题。"
+        strangers_not_allowed_error: "用户尝试在一个其未加入的分类中创建话题。"
+        insufficient_trust_level_error: "用户尝试在一个其不满足信任等级要求的分类下发表话题。"
         reply_user_not_matching_error: "回复的邮箱地址与接受通知的邮件地址不同。"
-        topic_not_found_error: "回复到一个已被删除的主题。"
-        topic_closed_error: "回复到一个已经关闭的主题。"
+        topic_not_found_error: "回复到一个已被删除的话题。"
+        topic_closed_error: "回复到一个已经关闭的话题。"
         bounced_email_error: "邮件是一份投递失败的错误报告。"
         screened_email_error: "发件人邮箱已经被屏蔽。"
         unsubscribe_not_allowed: "用户无法通过邮件进行退订。"
         email_not_allowed: "当邮件地址不在允许列表或屏蔽列表中的时候发生。"
       unrecognized_error: "无法识别的错误"
-    secure_media_placeholder: "已编辑：此站点已启用安全媒体，请访问主题或单击“查看媒体”以查看附件。"
+    secure_media_placeholder: "已编辑：此站点已启用安全媒体，请访问话题或单击“查看媒体”以查看附件。"
     view_redacted_media: "查看媒体"
   errors: &errors
     format: ! "%{attribute}%{message}"
@@ -165,7 +171,7 @@ zh_CN:
       wrong_length:
         other: 长度错误（应为 %{count} 个字）
       other_than: "必须不为 %{count}"
-      sso_overrides_username: "当`sso_overrides_username`设置是启用的，用户名需要在SSO提供商处更新。"
+      auth_overrides_username: "由于启用了 `auth_overrides_username` 设置，因此需要在身份验证提供商处更新用户名。"
     template:
       body: ! "以下字段有问题："
       header:
@@ -187,7 +193,7 @@ zh_CN:
       share_quote_facebook_requirements: "你必须设置一个Facebook app id 才能启用Facebook的引用分享功能。"
       second_factor_cannot_enforce_with_socials: "你不能在启用社交登录时强制启用双重认证。你必须先禁用以下登录方式：%{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "如果禁用本地登录则无法强制启用2FA。"
-      second_factor_cannot_be_enforced_with_sso_enabled: "如果启用了 SSO，则无法强制启用 2FA。"
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "如果启用了 DiscourseConnect，则无法强制执行 2FA。"
       local_login_cannot_be_disabled_if_second_factor_enforced: "如果强制启用2FA则不能禁用本地登录。在禁用本地登录之前，请禁用强制启用2FA。"
       cannot_enable_s3_uploads_when_s3_enabled_globally: "你无法启用S3上传，因为S3上传已经全局启用了，另外这样站点级的启用可能会导致上传的文件出现严重问题"
       cors_origins_should_not_have_trailing_slash: "你不应该将尾随斜线 (/) 添加到 Cross Origins。"
@@ -203,19 +209,21 @@ zh_CN:
     expired: "你的邀请码不正确。请<a href='%{base_url}/about'>联系工作人员</a>。"
     not_found: "你的邀请码不正确。请<a href='%{base_url}/about'>联系工作人员</a>。"
     not_found_json: "你的邀请码不正确。请联系工作人员。"
+    not_matching_email: "你的电子邮件地址和与邀请关联的电子邮件地址不符。请联系管理员。"
     not_found_template: |
       <p>邀请你加入<a href="%{base_url}">%{site_name}</a>的邀请函已被激活。</p>
 
       <p>如果你记得密码，你可以选择<a href="%{base_url}/login">登录</a>。</p>
 
       <p>否则，请<a href="%{base_url}/password-reset">重置密码</a>。</p>
-    error_message: "接受邀请时出错。 请联系该网站的管理员。"
+    not_found_template_link: |
+      <p> <a href="%{base_url}">%{site_name}</a> 的邀请已失效。请让邀请人重新发送新邀请。</p>
     user_exists: "不需要邀请<b>%{email}</b>，他们<a href='%{base_path}/u/%{username}/summary'>已经拥有账户了！</a>"
+    invalid_email: "'%{email}' 不是一个有效邮箱地址。"
     confirm_email: "<p>快完成了！我们发送了一封激活邮件到你的邮件地址。请按照邮件中的步骤来激活你的账户。</p><p>如果你没有收到邮件，请检查你的垃圾邮件收件箱。</p>"
     cant_invite_to_group: "你未被允许邀请用户到指定的群组。请确保你是群组的所有者。"
     disabled_errors:
-      sso_enabled: "由于已启用 SSO，邀请功能已被禁用。"
-      local_logins_disabled: "由于“启用本地登录”设置为禁用，邀请功能也被禁用。"
+      discourse_connect_enabled: "邀请已禁用，因为已启用 DiscourseConnect。"
       invalid_access: "您没有权限查看所请求的资源。"
   bulk_invite:
     file_should_be_csv: "上传的文件应为 csv 格式。"
@@ -225,16 +233,16 @@ zh_CN:
     email_taken: "这个电子邮件地址已被使用。如果你已经拥有一个账户，请登录或重置密码。"
     max_redemptions_limit: "应该在 2 和 %{max_limit} 之间。"
   topic_invite:
-    failed_to_invite: "如果用户不是以下任一群组的成员，则无法被邀请加入到此主题：%{group_names}。"
-    user_exists: "抱歉，用户已经被邀请过了。你只可以邀请一个用户到一个主题中一次。"
+    failed_to_invite: "如果用户不是以下任一群组的成员，则无法被邀请加入到此话题：%{group_names}。"
+    user_exists: "抱歉，用户已经被邀请过了。你只可以邀请一个用户到一个话题中一次。"
     muted_invitee: "抱歉，该用户忽略了你。"
-    muted_topic: "抱歉，该用户忽略了该主题。"
+    muted_topic: "抱歉，该用户忽略了该话题。"
     receiver_does_not_allow_pm: "抱歉，该用户不允许你向他们发送私人消息。"
     sender_does_not_allow_pm: "对不起，你不允许该用户给你发送私人信息。"
-    receiver_does_not_allow_other_user_pm: "抱歉，该用户不允许现有的参与者向他们发送私人消息。"
+    user_cannot_see_topic: "%{username} 无法看到该话题。"
   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: "你尝试上传的文件已存在。"
@@ -254,15 +262,16 @@ zh_CN:
   email_template_cant_be_modified: "该邮件模板不能被修改"
   invalid_whisper_access: "没有启用密语或者是你无权创建密语帖子"
   not_in_group:
+    title_topic: "你需要请求加入 `%{group}` 群组才能查看此话题。"
     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}次。请编辑你之前的回复，或等待某个人回复你。"
   embed:
@@ -278,7 +287,7 @@ zh_CN:
       other: "更多 %{count} 个回复"
     loading: "讨论载入中…"
     permalink: "永久链接"
-    imported_from: "这是一个从原来  %{link} 中分离出来的主题"
+    imported_from: "这是一个从原来  %{link} 中分离出来的话题"
     in_reply_to: "▶ %{username}"
     replies:
       other: "%{count}个回复"
@@ -286,7 +295,7 @@ zh_CN:
       other: "%{count}赞"
     last_reply: "最新回复"
     created: "创建时间"
-    new_topic: "创建新主题"
+    new_topic: "创建新话题"
   no_mentions_allowed: "抱歉，你无法提到其他用户。"
   too_many_mentions:
     other: "抱歉，你一次仅能提到 %{count} 个用户。"
@@ -308,14 +317,15 @@ zh_CN:
   contains_blocked_words: "你的帖子中含有多个被禁止的词：%{words}"
   spamming_host: "抱歉，你不能发表该主机的链接。"
   user_is_suspended: "被封禁的用户不允许发贴。"
-  topic_not_found: "出现问题。或许这个主题在你看的时候已经被关闭或删除了。"
+  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。"
-  slow_mode_enabled: "本主题处于慢速模式。"
+  watched_words_auto_tag: "自动标记话题"
+  secure_upload_not_allowed_in_public_topic: "抱歉，无法在公开的话题中使用以下安全上传：%{upload_filenames}。"
+  create_pm_on_existing_topic: "抱歉，你无法在现有话题上创建PM。"
+  slow_mode_enabled: "本话题处于慢速模式。"
   just_posted_that: "太类似于你最近发表的内容"
   invalid_characters: "包含无效字符"
   is_invalid: "似乎不清楚，这是一个完整的句子？ "
@@ -323,41 +333,42 @@ zh_CN:
   prev_page: "← 上一页"
   page_num: "第%{num}页"
   home_title: "首页"
-  topics_in_category: "“%{category}”分类中的主题"
+  topics_in_category: "“%{category}”分类中的话题"
   rss_posts_in_topic: " '%{topic}'的RSS源"
-  rss_topics_in_category: "'%{category}'分类中主题的RSS源"
+  rss_topics_in_category: "'%{category}'分类中话题的RSS源"
   rss_num_posts:
     other: "%{count} 个帖"
   rss_num_participants:
     other: "%{count} 位参与者"
-  read_full_topic: "阅读整个主题"
+  read_full_topic: "阅读整个话题"
   private_message_abbrev: "私信"
   rss_description:
-    latest: "最新主题"
-    top: "热门主题"
-    top_all: "所有时间热门主题"
-    top_yearly: "年度热门主题"
-    top_quarterly: "季度热门主题"
-    top_monthly: "月度热门主题"
-    top_weekly: "每周热门主题"
-    top_daily: "每日热门主题"
+    latest: "最新话题"
+    top: "热门话题"
+    top_all: "所有时间热门话题"
+    top_yearly: "年度热门话题"
+    top_quarterly: "季度热门话题"
+    top_monthly: "月度热门话题"
+    top_weekly: "每周热门话题"
+    top_daily: "每日热门话题"
     posts: "最新帖子"
     private_posts: "最近个人消息"
     group_posts: "%{group_name}组最近的帖子"
     group_mentions: "%{group_name}组最近的提及"
     user_posts: "最新贴子由 @%{username}发表"
-    user_topics: "最新主题由 @%{username}发表"
-    tag: "加标签的主题"
+    user_topics: "最新话题由 @%{username}发表"
+    tag: "加标签的话题"
     badge: "%{site_title}的%{display_name}徽章"
-  too_late_to_edit: "这个主题在很早之前创建。不能被编辑或者被删除。"
+  too_late_to_edit: "这个话题在很早之前创建。不能被编辑或者被删除。"
   edit_conflict: "该帖子由其他用户编辑，你的更改无法再保存。"
   revert_version_same: "目前的版本和你想要回退至的版本一样。"
-  cannot_edit_on_slow_mode: "这个主题正处于满速模式中。为了鼓励优质的讨论，当前不允许编辑旧的发帖。"
+  cannot_edit_on_slow_mode: "本话题处于慢速模式。为了鼓励优质的讨论，目前不允许编辑本话题的旧帖。"
   excerpt_image: "图片"
   bookmarks:
     errors:
       already_bookmarked_post: "你不能将同一帖子收藏两次。"
-      cannot_set_past_reminder: "你不能在此主题设置收藏提醒。"
+      too_many: "抱歉，你不能添加超过 %{limit} 个收藏内容，请访问 <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> 删除一些收藏。"
+      cannot_set_past_reminder: "你不能在此话题设置收藏提醒。"
       cannot_set_reminder_in_distant_future: "你不能够设置一个大于十年的收藏提醒。"
       time_must_be_provided: "必须为所有提醒设置时间"
     reminders:
@@ -383,7 +394,11 @@ zh_CN:
       email_already_used_in_category: "“%{email}”已经被分类“%{category_name}”使用了。"
       cant_allow_membership_requests: "对没有拥有者的群组，你无法批准成员请求。"
       already_requested_membership: "你已请求成为该群组的成员。"
-      adding_too_many_users: "最多可以同时添加 %{limit} 个用户"
+      adding_too_many_users:
+        other: "单次最多可添加%{count}个用户"
+      usernames_or_emails_required: "用户名和电子邮件是必须的"
+      no_invites_with_discourse_connect: "启用 DiscourseConnect 时，您只能邀请注册用户"
+      no_invites_without_local_logins: "本地登录禁用时，你只能邀请已经注册的用户"
     default_names:
       everyone: "任何人"
       admins: "管理员"
@@ -404,29 +419,29 @@ zh_CN:
     until_posts:
       other: "%{count} 个帖子"
     "new-topic": |
-      欢迎来到 %{site_name} &mdash; **衷心感谢你参与讨论！**
+      欢迎使用 %{site_name} &mdash; **感谢你开始新的对话！**
 
-      - 标题是否清晰明了地描述了主题？看起来有意思么？
+      - 如果你大声朗读出标题，听起来有趣吗？能否很好地概括内容？
 
-      - 谁会感兴趣？它为什么重要？你期望从社区中获得什么样的回应？
+      - 谁会对此感兴趣？为什么会感兴趣？你想得到怎样的回应？
 
-      - 选择常用的词句以便别人能找到你的主题。若想要给主题和类似主题分组，选择一个分类。
+      - 在你的话题中包含常用词，以便其他人能够“找到”它。要将你的话题与相关的话题关联，请选择一个分类（或标签）。
 
-      更多的帮助信息，[请查看我们的社区准则](%{base_path}/guidelines)。此信息面板只在你发布前 %{education_posts_text}时显示。
+      更多内容，请[请参阅我们的社区准则](%{base_path}/guidelines)。该面板仅在你的前 %{education_posts_text}出现。
     "new-reply": |
       欢迎来到%{site_name} &mdash; **感谢你的贡献！**
 
-      - 你的回复是否以某种方式改善了讨论？
+      - 请对其他社区成员保持友善。
 
-      - 请给予其他社区成员同等的尊重。
+      - 你的回复是否有益于交流？
 
-      - 欢迎有建设性的批评，但是请批判观点，而不是人身攻击。
+      - 欢迎有建设性的批评，但是请对事不对人。
 
-      欲查看更多，[请查看我们的社区准则](%{base_path}/guidelines)。此信息面板只会在你发表前 %{education_posts_text}时显示。
+      更多内容，[请查看我们的社区准则](%{base_path}/guidelines)。此信息面板只会在你发表前 %{education_posts_text} 时显示。
     avatar: |
       ### 想更改你的头像吗?
 
-      你已经发表和回复了几个主题，但你的头像并不像你自己一样独一无二——它仅仅是一个字母。
+      你已经发表和回复了几个话题，但你的头像并不像你自己一样独一无二——它仅仅是一个字母。
 
       你想过更改你的头像 **[查看你的个人资料](%{profile_path})** 并上传一张代表你自己的照片吗?
 
@@ -434,7 +449,7 @@ zh_CN:
     sequential_replies: |
       ### 考虑只回复帖子一次
 
-      与其回复主题多次，不如只回复一次，包括引用前面的帖子或者@用户名。
+      与其回复话题多次，不如只回复一次，包括引用前面的帖子或者@用户名。
 
       你可以在你的回复中添加引用。只要选择你想引用的文字，然后点击随后出现的<b>引用回复</b>按钮。
 
@@ -442,13 +457,13 @@ zh_CN:
     dominating_topic: |
       ### 让其他人也加入到讨论中
 
-      显然这个主题对你很重要 &ndash；但所有回复中你的发言占比超过%{percent}%
+      显然这个话题对你很重要 &ndash；但所有回复中你的发言占比超过%{percent}%
 
       留一点空间给其他人分享他们自己的见解会更好。你能邀请他们吗？
     get_a_room: |
       ### 鼓励每一个人都参与到讨论当中
 
-      你已经在这个主题中给@%{reply_username}回复了%{count}次了！
+      你已经在这个话题中给@%{reply_username}回复了%{count}次了！
 
       良好讨论应该包含许多不同的声音和观点。你能让其他人也参与进来吗？
 
@@ -456,13 +471,13 @@ zh_CN:
     too_many_replies: |
       ### 你发表的回复数量已经达到了上限。
 
-      非常抱歉，但新用户被限制只能在同一主题中回复 %{newuser_max_replies_per_topic} 次。
+      非常抱歉，但新用户被限制只能在同一话题中回复 %{newuser_max_replies_per_topic} 次。
 
-      与其添加另一个回复不如考虑编辑你以前的回复，或访问其他主题。
+      与其添加另一个回复不如考虑编辑你以前的回复，或访问其他话题。
     reviving_old_topic: |
-      ### 重新激活这个主题？
+      ### 重新激活这个话题？
 
-      该主题最后的回复是**%{time_ago}**。你的回复将让主题重新出现在列表的顶端并通知所有原先参与过讨论的人。
+      该话题最后的回复是**%{time_ago}**。你的回复将让话题重新出现在列表的顶端并通知所有原先参与过讨论的人。
 
       你确定要延续这个久远的话题吗？
   activerecord:
@@ -487,9 +502,10 @@ zh_CN:
               cant_send_pm: "抱歉，你不能向该用户发送消息。"
               no_user_selected: "你必须选择一个有效的用户。"
               reply_by_email_disabled: "用邮件回复已被禁止"
+              send_to_email_disabled: "抱歉，你不能向该邮件发送消息。"
               target_user_not_found: "未找到你要向其发送此消息的其中一个用户"
-              unable_to_update: "更新该主题时发生错误。"
-              unable_to_tag: "给主题设置标签时发生错误。"
+              unable_to_update: "更新该话题时发生错误。"
+              unable_to_tag: "给话题设置标签时发生错误。"
             featured_link:
               invalid: "不合法。URL 应包括 http:// 或 https://。"
               invalid_category: "无法编辑该分类。"
@@ -511,7 +527,7 @@ zh_CN:
         user_profile:
           attributes:
             featured_topic_id:
-              invalid: "该主题不能显示在你的个人资料中。"
+              invalid: "该话题不能显示在你的个人资料中。"
         user_email:
           attributes:
             user_id:
@@ -522,7 +538,7 @@ zh_CN:
               invalid: "不是有效颜色值"
         post_reply:
           base:
-            different_topic: "帖子和回复必须属于同一主题。"
+            different_topic: "帖子和回复必须属于同一话题。"
         web_hook:
           attributes:
             payload_url:
@@ -535,6 +551,9 @@ zh_CN:
           attributes:
             execute_at:
               in_the_past: "必须是未来。"
+            duration_minutes:
+              cannot_be_zero: "必须大于 0。"
+              exceeds_maximum: "不能超过 20 年。"
         translation_overrides:
           attributes:
             value:
@@ -550,12 +569,12 @@ zh_CN:
   meta_category_name: "站点反馈"
   meta_category_description: "讨论该站点的站务、组织、如何运作和如何改善它。"
   staff_category_name: "管理人员"
-  staff_category_description: "管理人员可见的分类。只有管理员和版主才能阅览主题。"
+  staff_category_description: "管理人员可见的分类。只有管理员和版主才能阅览话题。"
   discourse_welcome_topic:
     title: "欢迎来到 Discourse"
     body: |2
 
-      置顶主题的第一段是访客在主页看到的欢迎私信。这很重要！
+      置顶话题的第一段是访客在主页看到的欢迎私信。这很重要！
 
       **编辑**它作为社区的简要介绍：
 
@@ -566,19 +585,19 @@ zh_CN:
 
       <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      你可能想要在管理 :wrench: （右上角）中关闭这个主题，这样回复就不会积压在这个通告下。
+      你可能想要在管理 :wrench: （右上角）中关闭这个话题，这样回复就不会积压在这个通告下。
   lounge_welcome:
     title: "欢迎来到贵宾室"
     body: |2
 
       恭喜！:confetti_ball:
 
-      如果你看到了这个主题，说明你已经被提升至**常规**（信任等级3）了。
+      如果你看到了这个话题，说明你已经被提升至**常规**（信任等级3）了。
 
       你现在可以&hellip;
 
-      * 编辑任何主题的标题
-      * 改变任何主题的分类
+      * 编辑任何话题的标题
+      * 改变任何话题的分类
       * 让你的链接设置为 follow 属性（[自动不跟踪](https://en.wikipedia.org/wiki/Nofollow)限制已经移除）
       * 访问一个只有信任等级3及更高才能见到的贵宾室分类
       * 一次标记即可隐藏垃圾信息
@@ -587,14 +606,14 @@ zh_CN:
 
       感谢成为社区的重要一员！
 
-      （想了解关于信任等级的更多信息，[参见这个主题][trust]。请注意成员需要在将来也维持一定的选择条件的成员才能保持在常规。）
+      （想了解关于信任等级的更多信息，[参见这个话题][trust]。请注意成员需要在将来也维持一定的选择条件的成员才能保持在常规。）
 
       [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
   admin_quick_start_title: "首先阅读：管理员快速入门指南"
   category:
     topic_prefix: "关于“%{category}”分类"
     replace_paragraph: "（将第一段替换为新类别的简要说明。此指南将显示在类别选择区域中，因此请尽量将其保留在200个字符以内。）"
-    post_template: "%{replace_paragraph}\n\n在接下来的这段话中多写一些分类的用途，或者设定一个该分类的规则：\n\n- 为什么我们要用这个分类？它用来做什么？\n\n- 这个分类和我们已经有的分类究竟有什么不同？\n\n- 这个分类中一般会包含哪些主题？\n\n- 我们需要这个分类么？我们可以把它和别的分类、或者子分类合并吗？\n"
+    post_template: "%{replace_paragraph}\n\n在接下来的这段话中多写一些分类的用途，或者设定一个该分类的规则：\n\n- 为什么我们要用这个分类？它用来做什么？\n\n- 这个分类和我们已经有的分类究竟有什么不同？\n\n- 这个分类中一般会包含哪些话题？\n\n- 我们需要这个分类么？我们可以把它和别的分类、或者子分类合并吗？\n"
     errors:
       not_found: "未找到分类！"
       uncategorized_parent: "未分类不能有一个父分类"
@@ -605,15 +624,15 @@ zh_CN:
       email_already_used_in_category: "'%{email}' 已经被分类'%{category_name}'使用了。"
       description_incomplete: "分类描述帖至少要有一段。"
       permission_conflict: "所有被允许访问一个子分类的群组也必须能够访问其上级分类。下列群组能够访问某个子分类，但不能访问上级分类： %{group_names}。"
-      disallowed_topic_tags: "此主题含有不允许在该分类中使用的标签：%{tags}"
-      disallowed_tags_generic: "此主题有反对标签。"
+      disallowed_topic_tags: "此话题含有不允许在该分类中使用的标签：%{tags}"
+      disallowed_tags_generic: "此话题有反对标签。"
     cannot_delete:
-      uncategorized: "这个分类是特殊的。它用于存放没有分类的主题；不能被删除。"
+      uncategorized: "这个分类是特殊的。它用于存放没有分类的话题；不能被删除。"
       has_subcategories: "不能删除该分类，因为它有子分类"
       topic_exists:
-        other: "不能删除该分类，因为它有%{count}个主题。最久远的主题是%{topic_link}。"
-      topic_exists_no_oldest: "不能删除该分类，因为主题数量为 %{count}。"
-    uncategorized_description: "不需要分类或者不适合放在现有的任何分类中的主题。"
+        other: "不能删除该分类，因为它有%{count}个话题。最久远的话题是%{topic_link}。"
+      topic_exists_no_oldest: "不能删除该分类，因为话题数量为 %{count}。"
+    uncategorized_description: "不需要分类或者不适合放在现有的任何分类中的话题。"
   trust_levels:
     newuser:
       title: "新用户"
@@ -635,20 +654,20 @@ zh_CN:
     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}后再试。"
+      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}后再试。"
+      topic_invitations_per_day: "你已经达到了话题邀请的最大数量。你可以在 %{time_left} 后发送更多邀请。"
     hours:
       other: "%{count}小时"
     minutes:
@@ -728,7 +747,7 @@ zh_CN:
       unknown: "未知浏览器"
     device:
       android: "安卓设备"
-      chromebook: "Chromebook"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -739,7 +758,7 @@ zh_CN:
       unknown: "未知设备"
     os:
       android: "安卓"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -754,6 +773,7 @@ zh_CN:
     error_staged: "在修改你的电子邮箱地址时出现了错误。这个邮箱已经被一个暂存用户占用了。"
     already_done: "抱歉，此激活链接已经失效。可能你已经修改了邮箱？"
     confirm: "确认"
+    max_secondary_emails_error: "你已达到所允许的辅助电子邮件数量最大限制。"
     authorizing_new:
       title: "确认您的新邮箱"
       description: "请确认你想要修改的电子邮件地址："
@@ -789,12 +809,12 @@ zh_CN:
       title: "需要审核"
   post_action_types:
     off_topic:
-      title: "偏离主题"
-      description: "该帖子与当前主题的标题和首帖内容所无关，可能需要被移动到其它地方。"
+      title: "偏离话题"
+      description: "该帖子与当前话题的标题和首帖内容所无关，可能需要被移动到其它地方。"
       short_description: "和讨论不相关"
     spam:
       title: "垃圾内容"
-      description: "该帖子是广告或破坏。帖子没有价值或者与当前主题无关。"
+      description: "该帖子是广告或破坏。帖子没有价值或者与当前话题无关。"
       short_description: "这是广告或者破坏行为"
       email_title: '“%{title}”被标记为垃圾'
       email_body: "%{link}\n\n%{message}"
@@ -812,7 +832,7 @@ zh_CN:
       title: "其他事项"
       description: "这个帖子需要版主的注意，但是原因没有包括在上述选项中。"
       short_description: "需要管理人员注意的其他原因"
-      email_title: '"%{title}" 主题需要版主的注意'
+      email_title: '"%{title}" 话题需要版主的注意'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: "收藏"
@@ -827,24 +847,34 @@ zh_CN:
       title: "草稿错误"
       description: "草稿正在其它窗口中被编辑。请重新加载此页面。"
   draft_backup:
-    pm_title: "将正在的编辑中的主题备份为草稿"
-    pm_body: "主题包含备份的草稿"
+    pm_title: "将正在的编辑中的话题备份为草稿"
+    pm_body: "话题包含备份的草稿"
   user_activity:
     no_default:
       self: "你还没有活动。"
       others: "无活动。"
     no_bookmarks:
       self: "你没有收藏帖子；收藏可让你快速查阅特定帖子。"
-      search: "在所提供的搜索查询中没有找到书签。"
+      search: "在所提供的搜索查询中没有找到收藏内容。"
       others: "没有收藏。"
     no_likes_given:
       self: "你还没有点赞任何帖子。"
       others: "没有被赞的帖子。"
     no_replies:
-      self: "你还未回复任何主题"
+      self: "你还未回复任何话题"
       others: "无回复"
     no_drafts:
-      self: "你没有草稿；任何主题中撰写回复，它将自动保存为新草稿。"
+      self: "你没有草稿；任何话题中撰写回复，它将自动保存为新草稿。"
+  email_settings:
+    pop3_authentication_error: "提供的 POP3 凭据存在问题，请检查用户名和密码后重试。"
+    imap_authentication_error: "提供的 IMAP 凭据存在问题，请检查用户名和密码后重试。"
+    imap_no_response_error: "与 IMAP 服务器通信时发生错误，%{message}"
+    smtp_authentication_error: "提供的 SMTP 凭据存在问题，请检查用户名和密码后重试。"
+    smtp_server_busy_error: "SMTP 服务器当前正忙，请稍后再试。"
+    smtp_unhandled_error: "与 SMTP 服务器通信时出现未处理的错误，%{message}"
+    connection_error: "连接服务器时出现问题，请检查服务器名称和端口后重试。"
+    timeout_error: "连接服务器时超时，请检查服务器名称和端口后重试。"
+    unhandled_error: "测试电子邮件设置时出现未处理的错误，%{message}"
   webauthn:
     validation:
       invalid_type_error: "提供的webauthn类型无效。有效类型为webauthn.get和webauthn.create。"
@@ -863,7 +893,7 @@ zh_CN:
   topic_flag_types:
     spam:
       title: "垃圾"
-      description: "该主题是一个广告。它对本网站没有用处或相关性，仅仅是推销内容。"
+      description: "该话题是一个广告。它对本网站没有用处或相关性，仅仅是推销内容。"
       long_form: "标记为垃圾"
       short_description: "这是广告"
     inappropriate:
@@ -873,10 +903,10 @@ zh_CN:
       short_description: '违反了<a href="%{base_path}/guidelines">我们的社区指引</a>'
     notify_moderators:
       title: "其他内容"
-      description: '该主题需要版主依据<a href="%{base_path}/guidelines">社区准则</a>、<a href="%{tos_url}">服务条款（TOS）</a>或其它未列出的原因给予关注。'
+      description: '该话题需要版主依据<a href="%{base_path}/guidelines">社区准则</a>、<a href="%{tos_url}">服务条款（TOS）</a>或其它未列出的原因给予关注。'
       long_form: "标记以让版主注意"
       short_description: "因其他原因需要管理人员注意"
-      email_title: '主题“%{title}”需要版主注意'
+      email_title: '话题“%{title}”需要版主注意'
       email_body: "%{link}\n\n%{message}"
   flagging:
     you_must_edit: '<p>你的帖子被社区标记了。请<a href="%{path}">查看你的消息</a>。</p>'
@@ -885,28 +915,28 @@ zh_CN:
     hidden_content: "<p>忽视的内容</p>"
   archetypes:
     regular:
-      title: "常规主题"
+      title: "常规话题"
     banner:
-      title: "横幅主题"
+      title: "横幅话题"
       message:
-        make: "本主题现在是横幅主题。它将出现在每页的顶部，除非用户将其隐藏。"
-        remove: "本主题已经不再是横幅主题。它将不在每个页面的顶部显示。"
+        make: "本话题现在是横幅话题。它将出现在每页的顶部，除非用户将其隐藏。"
+        remove: "本话题已经不再是横幅话题。它将不在每个页面的顶部显示。"
   unsubscribed:
     title: "已更新电子邮件偏好设置！"
     description: "<b>%{email}</b>的电子邮件设置已更新。要更改你的电子邮件设置，访问<a href='%{url}'>你的用户设置页面</a>。"
-    topic_description: "点击链接 %{link} 重新订阅，或是使用主题底部或右侧的通知控制。"
-    private_topic_description: "使用主题底部或右侧的通知控制重新订阅。"
+    topic_description: "点击链接 %{link} 重新订阅，或是使用话题底部或右侧的通知控制。"
+    private_topic_description: "使用话题底部或右侧的通知控制重新订阅。"
   uploads:
     marked_insecure_from_theme_component_reason: "在主题组件中使用的上传"
   unsubscribe:
     title: "退订"
-    stop_watching_topic: "不再关注该主题，%{link}"
-    mute_topic: "关闭此主题的所有通知，%{link}"
-    unwatch_category: "不再关注%{category}分类中的所有主题"
+    stop_watching_topic: "不再关注该话题，%{link}"
+    mute_topic: "关闭此话题的所有通知，%{link}"
+    unwatch_category: "不再关注%{category}分类中的所有话题"
     mailing_list_mode: "停用邮件列表模式"
     all: "不要从%{sitename}给我发送任何邮件"
     different_user_description: "你当前登录的账户与我们所发送邮件的用户不符。请登出，或进入隐私模式，然后重试。"
-    not_found_description: "对不起，我们找不到这个退订链接。有可能你的邮件中的链接已经过期？"
+    not_found_description: "抱歉，我们未能找到此退订。或许是因为你的邮件中的链接是很久以前的并且过期了？"
     log_out: "退出登录"
     submit: "保存设置"
     digest_frequency:
@@ -933,7 +963,7 @@ zh_CN:
       logging_in_as: 用%{username}登录
       confirm_button: 登录完成
     no_trust_level: "抱歉，你没有使用用户 API 所需要的信任等级"
-    generic_error: "抱歉，我们不能分发用户 API 密钥，该特性已经被站点管理"
+    generic_error: "抱歉，我们不能分发用户 API 密钥，该特性已经被站点管理员禁用"
     scopes:
       message_bus: "实时更新"
       notifications: "读取并清除通知"
@@ -979,11 +1009,11 @@ zh_CN:
         moderator: 版主
         flag_count: 收到的标记
         time_read: 阅读时长
-        topic_count: 创建的主题
+        topic_count: 创建的话题
         post_count: 创建的帖子
         pm_count: 创建的私信
         revision_count: 版本
-      description: 版主活动列表，包括已审核的标记，阅读时间，创建的主题，创建的帖子，创建的个人消息以及修订。
+      description: 版主活动列表，包括已审核的标记，阅读时间，创建的话题，创建的帖子，创建的个人消息以及修订。
     flags_status:
       title: "标记状态"
       values:
@@ -1046,15 +1076,15 @@ zh_CN:
       yaxis: "活跃的用户"
       description: "在过去一天中赞过或发表过的用户数量。"
     profile_views:
-      title: "查看用户资料"
+      title: "浏览用户资料"
       xaxis: "天"
       yaxis: "用户资料访问量"
       description: "用户个人信息页的新访问数。"
     topics:
-      title: "新发表主题"
+      title: "新发表话题"
       xaxis: "天"
-      yaxis: "新主题的数量"
-      description: "在此期间创建的新主题。"
+      yaxis: "新话题的数量"
+      description: "在此期间创建的新话题。"
     posts:
       title: "新发表帖子"
       xaxis: "天"
@@ -1074,7 +1104,7 @@ zh_CN:
       title: "收藏"
       xaxis: "天"
       yaxis: "新收藏数"
-      description: "新主题和帖子的收藏数量。"
+      description: "新话题和帖子的收藏数量。"
     users_by_trust_level:
       title: "各信任等级的用户数"
       xaxis: "信任等级"
@@ -1141,29 +1171,29 @@ zh_CN:
       title: "最高引用"
       xaxis: "用户"
       num_clicks: "点击数"
-      num_topics: "主题数"
+      num_topics: "话题数"
       labels:
         user: "用户"
         num_clicks: "点击数"
-        num_topics: "主题"
+        num_topics: "话题"
       description: "按用户共享的链接的点击次数列出的用户。"
     top_traffic_sources:
       title: "最高流量来源"
       xaxis: "域名"
       num_clicks: "点击数"
-      num_topics: "主题数"
+      num_topics: "话题数"
       num_users: "用户数"
       labels:
         domain: 域名
         num_clicks: 点击数
-        num_topics: 主题
+        num_topics: 话题
       description: "与此网站链接最多的外部资源。"
     top_referred_topics:
-      title: "被引用最多的主题"
+      title: "被引用最多的话题"
       labels:
         num_clicks: "点击数"
-        topic: "主题"
-      description: "从外部来源获得最多点击的主题。"
+        topic: "话题"
+      description: "从外部来源获得最多点击的话题。"
     page_view_anon_reqs:
       title: "匿名"
       xaxis: "天"
@@ -1222,12 +1252,12 @@ zh_CN:
       title: "得到第一个响应的时间"
       xaxis: "天"
       yaxis: "平均时间（小时）"
-      description: "新主题首次得到响应的平均时间（每小时）"
+      description: "新话题首次得到响应的平均时间（每小时）"
     topics_with_no_response:
       title: "没有回复的帖子"
       xaxis: "天"
       yaxis: "总量"
-      description: "没有得到响应的新主题数量"
+      description: "没有得到响应的新话题数量"
     mobile_visits:
       title: "用户访问（移动端）"
       xaxis: "天"
@@ -1284,6 +1314,7 @@ zh_CN:
     github_config_warning: '设置允许使用GitHub（enable_github_logins）登录，但没有设置 client id 和 secret。前往<a href="%{base_path}/admin/site_settings">站点设置</a>更新设置。<a href="https://github.com/discourse/discourse/wiki/The-Discourse-Admin-Quick-Start-Guide" 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="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">看看“参考如何设置图片上传至 S3？”以了解更多</a>。'
     s3_backup_config_warning: '服务器被配置为上传备份到S3，但是以下的值中有未被设定的项目：s3_access_key_id、s3_secret_access_key、s3_use_iam_profile 或 s3_backup_bucket。到<a href="%{base_path}/admin/site_settings">站点设置</a>中更新设置。<a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">看看“参考如何设置图片上传至 S3？”以了解更多</a>。'
+    s3_cdn_warning: '服务器配置为将文件上传到 S3，但没有配置 S3 CDN。这可能会导致昂贵的 S3 成本和站点性能降低。 <a href="https://meta.discourse.org/t/-/148916" target="_blank">请参阅 “使用对象存储进行上传” 了解更多信息</a>.'
     image_magick_warning: '服务器被设置为给大图片创建缩略图，但是ImageMagick没有被安装。用你最喜爱的包管理器安装ImageMagick或<a href="https://www.imagemagick.org/script/download.php" target="_blank">下载最新版</a>。'
     failing_emails_warning: '有%{num_failed_jobs}个邮件任务失败。请检查app.yml文件是否正确配置了邮件服务器。<a href="%{base_path}/sidekiq/retries" target="_blank">查看Sidekiq中失败的任务</a>。'
     subfolder_ends_in_slash: "你的子目录设置不正确；DISCOURSE_RELATIVE_URL_ROOT以斜杠结尾。"
@@ -1291,55 +1322,51 @@ zh_CN:
       other: "邮件轮询在过去的 24 小时内出现了 %{count} 个错误。看一看<a href='%{base_path}/logs' target='_blank'>日志</a>寻找详情。"
     missing_mailgun_api_key: "服务器设置使用Mailgun发送邮件，但并未设置验证webhook私信的API密钥。"
     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>。"
     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>，或禁用“敏感词正则表达式”网站设置。"
+    watched_word_regexp_error: "捕获敏感词 %{action} 的正则表达式无效。请检查你的 <a href='%{base_path}/admin/customize/watched_words'>敏感词设置</a>，或禁用 “敏感词正则表达式” 设置。"
   site_settings:
     display_local_time_in_user_card: "打开用户卡片时，根据用户的时区显示本地时间。"
     censored_words: "将被自动替换为 &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "自动删除被隐藏超过 30 天的帖子。"
-    default_locale: "此Discourse实例的默认语言。你可以在<a href='%{base_path}/admin/customize/site_texts' target='_blank'>自定义/文本内容</a>替换系统生成的分类或主题的文本。"
+    default_locale: "此Discourse实例的默认语言。你可以在<a href='%{base_path}/admin/customize/site_texts' target='_blank'>自定义/文本内容</a>替换系统生成的分类或话题的文本。"
     allow_user_locale: "允许用户选择他们自己的语言界面"
     set_locale_from_accept_language_header: "使用浏览器的语言标头为匿名用户设置界面语言"
     support_mixed_text_direction: "支持混合的从左到右和从右到左的文本方向。"
     min_post_length: "帖子允许的最少字符数"
-    min_first_post_length: "第一帖（主题内容）允许的最少字符数"
+    min_first_post_length: "第一帖（话题内容）允许的最少字符数"
     min_personal_message_post_length: "私信允许的最小字符数"
     max_post_length: "帖子允许的最大字符数"
     topic_featured_link_enabled: "允许发链接帖。"
-    show_topic_featured_link_in_digest: "在摘要邮件中显示主题特色链接。"
-    min_topic_views_for_delete_confirm: "当主题被删除时，它必须低于最低浏览量才会弹出确认对话框"
+    show_topic_featured_link_in_digest: "在摘要邮件中显示话题特色链接。"
+    min_topic_views_for_delete_confirm: "当话题被删除时，它必须高于最低浏览量才会弹出确认对话框"
     min_topic_title_length: "标题允许的最少字符数"
     max_topic_title_length: "标题允许的最大字符数"
     min_personal_message_title_length: "私信标题允许的最小字符数"
-    max_emojis_in_title: "主题标题中允许的最大表情数量"
+    max_emojis_in_title: "话题标题中允许的最大表情数量"
     min_search_term_length: "搜索条件允许的最少字符数"
     search_tokenize_chinese_japanese_korean: "即使在非CJK站点上也强制切割中文、日文、韩文的搜索分词。"
     search_prefer_recent_posts: "如果搜索大型论坛较慢，此选项将尝试优先索引新的帖子"
-    search_recent_posts_size: "索引多少最新的主题"
+    search_recent_posts_size: "索引多少最新的话题"
     log_search_queries: "记录用户执行的搜索查询。"
     search_query_log_max_size: "要保留的最大搜索查询量。"
     search_query_log_max_retention_days: "保留搜索查询的最长时间（以天为单位）。"
     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: "允许有相同或重复标题的主题。"
-    allow_duplicate_topic_titles_category: "在不同的分类中允许帖子主题可以重复。\nallow_duplicate_topic_titles 必须设置为否（false）。"
+    allow_duplicate_topic_titles: "允许有相同或重复标题的话题。"
+    allow_duplicate_topic_titles_category: "在不同的分类中允许帖子话题可以重复。\nallow_duplicate_topic_titles 必须设置为否（false）。"
     unique_posts_mins: "多少分钟之后才允许一个用户再次发表包含相同内容的帖子"
     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>页面的紧急联系人。"
+    contact_url: "这个站点的联系链接。作为紧急联系方式显示在<a href='%{base_path}/about' target='_blank'>/about</a>页面。"
     crawl_images: "允许从第三方 URL 获取图片来插入宽、高数值"
     download_remote_images_to_local: "通过下载将远程图像转换为本地图像；此选项可避免图像损坏。"
     download_remote_images_threshold: "下载远程图像到本地所需的最小硬盘空间（百分比）"
@@ -1356,13 +1383,13 @@ zh_CN:
     max_image_height: "帖子中图片允许的最大缩略图宽度"
     responsive_post_image_sizes: "调整预览图像的大小以允许以下像素比率的高DPI屏幕。 删除所有值以禁用响应图像。"
     fixed_category_positions: "如果选中，你将能够固定分类的排序。反之，分类将按照活跃顺序显示。"
-    fixed_category_positions_on_create: "如果选中，主题创建对话框中会维持分类的排序（需要 fixed_category_positions)。"
+    fixed_category_positions_on_create: "如果选中，话题创建对话框中会维持分类的排序（需要 fixed_category_positions)。"
     add_rel_nofollow_to_user_content: '添加 rel nofollow 属性到所有的用户内容，除了内部链接（包括父域名）。如果你更改了这个，你必须使用“rake posts:rebake"重制所有帖子。'
     exclude_rel_nofollow_domains: "不应添加nofollow的域名列表。example.com 会自动包含 sub.example.com。至少你应该填写本站域名来帮助爬虫获得所有内容。如果你网站的其余部分在另外的域名，也请添加那些域名。"
     post_excerpt_maxlength: "帖子摘要的最大字符长度"
-    topic_excerpt_maxlength: "根据主题的第一帖所生成，主题的节选或摘要的最大长度。"
-    show_pinned_excerpt_mobile: "在移动版中显示置顶主题的摘要。"
-    show_pinned_excerpt_desktop: "在桌面版中显示置顶主题的摘要。"
+    topic_excerpt_maxlength: "根据话题的第一帖所生成，话题的节选或摘要的最大长度。"
+    show_pinned_excerpt_mobile: "在移动版中显示置顶话题的摘要。"
+    show_pinned_excerpt_desktop: "在桌面版中显示置顶话题的摘要。"
     post_onebox_maxlength: "Onebox 处理后的 Discourse 帖子的最大字符长度"
     blocked_onebox_domains: "不会被Onebox的域名列表"
     allowed_inline_onebox_domains: "当链接没有标题时会被简单Onebox的域名列表"
@@ -1379,6 +1406,7 @@ zh_CN:
     mobile_logo_dark: "用于深色模式的“mobile logo\"站点设置。"
     large_icon: "用作其他元数据图标的基础的图像。 理想情况下应大于512 x 512。如果留空，将使用logo_small。"
     manifest_icon: "用作Android图标的图像。会被自动调整为512×512。如果留空，将使用large_icon。"
+    manifest_screenshots: "用于在安装提示页面上展示社区的特色和功能的屏幕截图。所有图像均应为本地上传且尺寸相同。"
     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。"
@@ -1386,15 +1414,15 @@ zh_CN:
     notification_email: "这个表格：被用于发送所有重要系统邮件的邮箱地址。指定的域名必须正确设置 SPF、DKIM 和反向 PTR 记录以发送邮件。"
     email_custom_headers: "以竖线分割的自定义邮件标头列表。"
     email_subject: "自定义邮件标题的格式。参见<a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
-    detailed_404: "为用户提供关于他们为什么不能访问特定主题的更多细节。注意：这是不安全的，因为用户将知道一个 URL 是否链接到一个有效的主题。"
+    detailed_404: "为用户提供关于他们为什么不能访问特定话题的更多细节。注意：这是不安全的，因为用户将知道一个 URL 是否链接到一个有效的话题。"
     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: "主题启用“主题摘要”前至少需要收到多少个赞。修改此设置会影响过去一个星期。"
+    same_site_cookies: "使用 Same-site cookies 以消除所有跨站请求伪造的攻击面 (Lax 或 Strict)。警告：Strict 仅在强制登录并使用外部身份验证方法的网站上有效。"
+    summary_score_threshold: "一个帖子被加入到“话题摘要”中所需的最小分值"
+    summary_posts_required: "一个话题启用“话题摘要”前最少需要有多少个回帖。修改此设置会影响过去一个星期。"
+    summary_likes_required: "话题启用“话题摘要”前至少需要收到多少个赞。修改此设置会影响过去一个星期。"
     summary_percent_filter: "当用户点击摘要，显示前百分之几的帖子"
-    summary_max_results: "“主题摘要”所返回的最大帖子数量"
+    summary_max_results: "“话题摘要”所返回的最大帖子数量"
     enable_personal_messages: "允许信任等级1（可以另外选择发送私信的信任等级）的用户创建私信和回复私信。注意：管理人员不受限制。"
     enable_system_message_replies: "即使禁用了个人消息，也允许用户回复系统消息"
     enable_long_polling: "启用 Message bus 使通知功能可以使用长轮询（long polling）"
@@ -1406,9 +1434,9 @@ zh_CN:
     background_polling_interval: "客户端轮询的间隔，以毫秒计（当窗口在后台时）"
     hide_post_sensitivity: "一个被标记的帖子会被隐藏的可能性"
     silence_new_user_sensitivity: "一个新用户基于垃圾标记被禁言的可能性"
-    auto_close_topic_sensitivity: "一个被标记的主题被自动关闭的可能性"
+    auto_close_topic_sensitivity: "一个被标记的话题被自动关闭的可能性"
     cooldown_minutes_after_hiding_posts: "当一个帖子因为标记而隐藏之后，用户需要等待多少分钟才能编辑帖子"
-    max_topics_in_first_day: "新用户在24小时内在发表第一帖后允许创建的主题数"
+    max_topics_in_first_day: "新用户在24小时内在发表第一帖后允许创建的话题数"
     max_replies_in_first_day: "新用户在24小时内在发表第一帖后允许创建的回复数"
     tl2_additional_likes_per_day_multiplier: "提升信任等级2每日可点赞的次数，会将原始值与本设置的值相乘"
     tl3_additional_likes_per_day_multiplier: "提升信任等级3每日可点赞的次数，会将原始值与本设置的值相乘"
@@ -1417,7 +1445,7 @@ zh_CN:
     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: "如果用户被自动禁言了，发私信给所有版主。"
-    flag_sockpuppets: "如果一个新用户回复了其它用户以同一个IP创建的主题，他们所有的帖子都将被自动标记为有潜在的垃圾。"
+    flag_sockpuppets: "如果一个新用户回复了其它用户以同一个IP创建的话题，他们所有的帖子都将被自动标记为有潜在的垃圾。"
     traditional_markdown_linebreaks: "在 Markdown 中使用传统换行符，即用两个尾随空格来换行"
     enable_markdown_typographer: "使用排版规则来提高文本的可读性：用引号替换直引号'，用符号代替（c）（tm），用emdash等等"
     enable_markdown_linkify: "自动将看起来像链接的文本视为链接：www.example.com和https://example.com将自动链接"
@@ -1427,6 +1455,7 @@ zh_CN:
     must_approve_users: "新注册用户必须获得职员批准方能访问"
     invite_code: "用户必须输入此代码才能够进行账户注册，留空则无需输入（大小写敏感）"
     approve_suspect_users: "添加可疑用户到审核队列。可疑用户填写了简介或网站但是没有浏览行为。"
+    review_every_post: "所有帖子都必须经过审查。警告！不建议用于繁忙的站点。"
     pending_users_reminder_delay: "如果新用户等待批准时间超过此小时设置则通知版主。设置 -1 关闭通知。"
     persistent_sessions: "用户将在浏览器被关闭后保持登录状态"
     maximum_session_age: "用户自访问后可维持登录 n 小时"
@@ -1442,7 +1471,7 @@ zh_CN:
     blocked_ip_blocks: "不应被Discourse爬取的私有IP屏蔽列表"
     allowed_internal_hosts: "可以安全地进行onebox或其它用途的爬取的内网主机列表"
     allowed_onebox_iframes: "允许通过Onebox嵌入的iframe源域名。`*`会允许所有默认的Onebox引擎。"
-    allowed_iframes: "可以令 Discourse 在主题中安全地发布的 iframe src 域名前缀列表"
+    allowed_iframes: "可以令 Discourse 在话题中安全地发布的 iframe src 域名前缀列表"
     allowed_crawler_user_agents: "允许访问本站点的Web爬虫用户代理。警告！设置后将屏蔽所有不在此列表中的爬虫！"
     blocked_crawler_user_agents: "用于识别不被允许访问本站点的用户代理的字符（不区分大小且独特的）。如果定义了允许列表，则无效。"
     slow_down_crawler_user_agents: "Web爬虫的用户代理，应使用Crawl-delay指令在robots.txt中进行速率限制"
@@ -1450,6 +1479,7 @@ zh_CN:
     content_security_policy: "启用内容安全策略"
     content_security_policy_report_only: "只启用内容安全策略报告"
     content_security_policy_collect_reports: "在/csp_reports上启用内容安全策略违规报告集"
+    content_security_policy_frame_ancestors: "使用CSP限制在iframe中嵌入本站点。在<a href='%{base_path}/admin/customize/embedding'>嵌入</a>管理允许的主机列表。"
     content_security_policy_script_src: "附加的脚本源允许列表。默认已包含当前主机和CDN。请参阅<a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Mitigate XSS Attacks with Content Security Policy</a>"
     invalidate_inactive_admin_email_after_days: "在此天数内未访问过网站的管理员账户需要在登录前重新验证邮件地址。设置为0禁用。"
     top_menu: "确定在主页导航条包含哪些条目，以及排列顺序。例如：latest|new|unread|categories|top|read|posted|bookmarks"
@@ -1466,8 +1496,8 @@ zh_CN:
     remove_full_quote: "自动删除直接回复的完整引用。"
     suppress_reply_when_quoting: "当帖子引用回复时，不显示可展开的回复到某贴的标记。"
     max_reply_history: "扩展回复至时显示的最大回复数量"
-    topics_per_period_in_top_summary: "在一个主题底部显示的默认推荐主题的数量。"
-    topics_per_period_in_top_page: "在展开“显示更多”推荐主题列表显示的主题数量。"
+    topics_per_period_in_top_summary: "在一个话题底部显示的默认推荐话题的数量。"
+    topics_per_period_in_top_page: "在展开“显示更多”推荐话题列表显示的话题数量。"
     redirect_users_to_top_page: "将新用户和长时间未登录的用户自动重定向至热门页面。"
     top_page_default_timeframe: "顶部查看页面的默认时间表"
     moderators_view_emails: "允许版主查看用户电子邮件"
@@ -1476,7 +1506,7 @@ zh_CN:
     send_old_credential_reminder_days: "几天后提醒有关旧凭证"
     email_token_valid_hours: "“忘记密码”/“激活账户”令牌有效的小时数。"
     enable_badges: "启用徽章系统"
-    enable_whispers: "允许管理人员在主题中私密交流。"
+    enable_whispers: "允许管理人员在话题中私密交流。"
     allow_index_in_robots_txt: "在robots.txt中指定允许网络搜索引擎建立该网站的索引。在特殊情况下，你可以永久<a href='%{base_path}/admin/customize/robots'>覆盖robots.txt</a> 。"
     blocked_email_domains: "不允许注册账户的邮件域名列表（以管道符号分割）。例如：mailinator.com|trashmail.net"
     allowed_email_domains: "用户必须使用列表中的域名邮箱注册（使用管道符号分割）。警告：用户将无法使用列表之外的域名邮箱注册！"
@@ -1497,27 +1527,27 @@ zh_CN:
     min_admin_password_length: "管理员最短密码长度"
     password_unique_characters: "密码中必须包含几个不同的字符。"
     block_common_passwords: "不允许使用 10,000 个最常用的密码。"
-    external_auth_skip_create_confirm: 当通过外部授权注册时，跳过创建账户的弹出式窗口，最好与 sso_overrides_email, sso_overrides_username 和 sso_overrides_name 一起使用。
-    external_auth_immediately: "自动重定向到外部登录系统而无需用户交互。仅在启用login_required并且只有一个外部认证方法时有效"
-    enable_sso: "启用通过外部站点单点登录（警告：用户的邮件地址必须被外部站点验证！）"
-    verbose_sso_logging: "将详细的SSO相关诊断记录到<a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    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_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: "启用基于本地用户名和密码登录的账户。必须启用此选项才能使邀请生效。警告：如果禁用，且之前未配置至少一种备用登录方法，则可能无法登录。"
+    auth_skip_create_confirm: 当通过外部授权注册时，跳过创建账户的弹出式窗口，最好与 auth_overrides_email, auth_overrides_username 和 auth_overrides_name 一起使用。
+    auth_immediately: "自动重定向到外部登录系统而无需用户交互。仅在启用 login_required 并且只有一个外部认证方法时有效"
+    enable_discourse_connect: "通过 DiscourseConnect (以前称为“ Discourse SSO”)启用登录(警告：用户的电子邮件地址*必须*由外部站点进行验证！)"
+    verbose_discourse_connect_logging: "将详细的 DiscourseConnect 相关日志记录为 <a href='%{base_path}/logs' target='_blank'>/ 日志</a>"
+    enable_discourse_connect_provider: "在 /session/sso_provider 端点上实现 DiscourseConnect (以前称为“ Discourse SSO”) 协议，需要设置 discourse_connect_provider_secrets"
+    discourse_connect_url: "DiscourseConnect 终端节点的 URL (必须包含 http://或 https://)"
+    discourse_connect_secret: "用于加密验证 DiscourseConnect 信息的密钥字符串，请确保是 10 个字符或者更长"
+    discourse_connect_provider_secrets: "使用 DiscourseConnect 的域名与密钥对列表。确保 SSO 密钥为 10 个字符或更长。通配符 * 可用于匹配任何域名或仅匹配其中的一部分(例如* .example.com)。"
+    discourse_connect_overrides_bio: "覆盖用户个人资料中的用户个人资料，并阻止用户对其进行更改"
+    discourse_connect_overrides_groups: "同步制定群组中手动创建的群组成员的群组属性。\n(警告：如果你不指定群组，所有的手动群组成员资格将被用户清除)"
+    auth_overrides_email: "在每次登录时用外部网站的电子邮件覆盖本地电子邮件，并防止本地更改。适用于所有身份验证提供程序。(警告：由于本地电子邮件的规范化，可能会出现差异)"
+    auth_overrides_username: "在每次登录时，用外部网站的用户名覆盖本地用户名，并防止本地更改。 适用于所有身份验证提供程序。(警告: 由于用户名长度/要求的不同，可能会出现差异)"
+    auth_overrides_name: "每次登录都使用外部站点的全名覆盖本地全名，并且禁止本地修改。应用于所有的身份认证提供商。"
+    discourse_connect_overrides_avatar: "使用外部站点的头像覆盖用户头像。如果启用，则不允许用户在Discourse上传头像。"
+    discourse_connect_overrides_location: "使用DiscourseConnect数据中的位置覆盖用户位置，并且禁止本地修改。"
+    discourse_connect_overrides_website: "使用DiscourseConnect数据中的网站覆盖用户网站，并且禁止本地修改。"
+    discourse_connect_overrides_profile_background: "使用DiscourseConnect数据中的外部站点头像覆盖用户资料背景。"
+    discourse_connect_overrides_card_background: "使用DiscourseConnect数据中的外部站点头像覆盖用户卡片背景。"
+    discourse_connect_not_approved_url: "将未批准的DiscourseConnect账户重定向到这个 URL"
+    discourse_connect_allows_all_return_paths: "不限制DiscourseConnect所提供的 return_paths 中的域名（默认情况下retuen path必须位于当前站点）"
+    enable_local_logins: "启用基于本地用户名和密码登录的账户。警告：如果禁用，且之前未配置任何代替的登录方式，则可能无法登录。"
     enable_local_logins_via_email: "允许用户请求通过电子邮件将一键登录链接发送给他们。"
     allow_new_registrations: "允许新用户注册。取消选择将阻止任何人创建一个新账户。"
     enable_signup_cta: "显示推荐创建账户的提示给那些回访的未注册用户。"
@@ -1557,35 +1587,35 @@ zh_CN:
     active_user_rate_limit_secs: "更新“上次访问”数据的间隔，单位为秒"
     verbose_localization: "在界面上显示详细的本地化提示"
     previous_visit_timeout_hours: "系统判断一次访问之后多少小时后为“上一次”访问"
-    top_topics_formula_log_views_multiplier: "热门主题公式中访问次数因子的值（n）：`log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
-    top_topics_formula_first_post_likes_multiplier: "热门主题的计算公式中，首帖被赞的数量的乘数（n）：`log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
-    top_topics_formula_least_likes_per_post_multiplier: "热门主题的计算公式中，赞和帖子数量之间的比例的最小值（n）：`log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "每 15 分钟重制老帖子的数量。"
+    top_topics_formula_log_views_multiplier: "热门话题公式中访问次数因子的值（n）：`log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_first_post_likes_multiplier: "热门话题的计算公式中，首帖被赞的数量的乘数（n）：`log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_least_likes_per_post_multiplier: "热门话题的计算公式中，赞和帖子数量之间的比例的最小值（n）：`log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
     enable_safe_mode: "允许用户进入安全模式以调试插件。"
-    rate_limit_create_topic: "在创建一个主题之后，用户必须间隔多少秒（n）才能创建另一个主题"
+    rate_limit_create_topic: "在创建一个话题之后，用户必须间隔多少秒（n）才能创建另一个话题"
     rate_limit_create_post: "在创建一个帖子之后，用户必须间隔多少秒（n）才能创建另一个帖子"
-    rate_limit_new_user_create_topic: "在创建一个主题后，新用户必须等待(n)秒才能创建另一个主题。"
+    rate_limit_new_user_create_topic: "在创建一个话题后，新用户必须等待(n)秒才能创建另一个话题。"
     rate_limit_new_user_create_post: "在发表帖子后，新用户必须等待(n)秒才能创建另一个帖子。"
     max_likes_per_day: "每个用户每天最多能点赞多少次。"
     max_flags_per_day: "每个用户每天能标记的数量的最大值。"
     max_bookmarks_per_day: "每用户每天能收藏的最大值。"
     max_edits_per_day: "每个用户每天能编辑的次数的最大值。"
-    max_topics_per_day: "每个用户每天能创建的主题数量的最大值。"
-    max_personal_messages_per_day: "用户每天可以创建的新个人消息主题的最大数量。"
+    max_topics_per_day: "每个用户每天能创建的话题数量的最大值。"
+    max_personal_messages_per_day: "用户每天可以创建的新个人消息话题的最大数量。"
     max_invites_per_day: "每个用户每天能创建的邀请数量的最大值。"
-    max_topic_invitations_per_day: "每个用户每天能创建的邀请至主题数量的最大值。"
+    max_topic_invitations_per_day: "每个用户每天能创建的邀请至话题数量的最大值。"
     max_logins_per_ip_per_hour: "一小时内同一个IP（网络）地址能允许最大的登录次数。"
     max_logins_per_ip_per_minute: "一分钟内同一个IP（网络）地址能允许最大的登录次数。"
-    max_post_deletions_per_minute: "用户每分钟可以删除的最大帖子数。"
-    max_post_deletions_per_day: "用户每天可以删除的最大帖子数。"
+    max_post_deletions_per_minute: "用户每分钟可以删除的最大帖子数。设置为 0 可禁用帖子删除。"
+    max_post_deletions_per_day: "用户每天可以删除的最大帖子数。设置为 0 可禁用帖子删除。"
     invite_link_max_redemptions_limit: "邀请链接所允许的最大兑换量不能超过这个数值。"
+    invite_link_max_redemptions_limit_users: "普通用户生成的邀请链接数量最大不能超过这个数值。"
     alert_admins_if_errors_per_minute: "激活管理员警告的每分钟错误的数量。0 会禁用这个特性。注意：需要重启。"
     alert_admins_if_errors_per_hour: "激活管理员警告的每小时错误的数量。0 会禁用这个特性。注意：需要重启。"
-    categories_topics: "要在 /categories 页面中显示的主题数量。如果设置为0，它将自动尝试寻找一个值来保持两列对称（分类和主题）。"
-    suggested_topics: "在一个主题底部显示的推荐主题的数量。"
+    categories_topics: "要在 /categories 页面中显示的话题数量。如果设置为0，它将自动尝试寻找一个值来保持两列对称（分类和话题）。"
+    suggested_topics: "在一个话题底部显示的推荐话题的数量。"
     limit_suggested_to_category: "只在当前分类的推荐帖子列表中显示帖子。"
-    suggested_topics_max_days_old: "推荐主题的创建时间不能超过 n 天。"
-    suggested_topics_unread_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: "彻底删除孤立的上传内容的宽限期（单位：天）"
@@ -1600,6 +1630,8 @@ zh_CN:
     avatar_sizes: "自动生成的头像大小列表。"
     external_system_avatars_enabled: "使用外部系统头像服务。"
     external_system_avatars_url: "外部系统头像服务的 URL 地址。可选参数是 {username} {first_letter} {color} {size}"
+    external_emoji_url: "用于表情图像的外部服务 URL。留空以禁用。"
+    use_site_small_logo_as_system_avatar: "使用网站的小徽标代替系统用户的头像。要求必须有 logo。"
     restrict_letter_avatar_colors: "用于字符型头像背景的十六进制色彩值列表"
     selectable_avatars_enabled: "强制用户从列表中选择头像。"
     selectable_avatars: "用户可以选择的头像列表。"
@@ -1611,27 +1643,26 @@ zh_CN:
     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）。警告！改变此项将使你面临广告泛滥的风险。"
-    tl1_requires_topics_entered: "新用户升级到信任等级1所需要进入的主题数量。"
+    tl1_requires_topics_entered: "新用户升级到信任等级1所需要进入的话题数量。"
     tl1_requires_read_posts: "新用户升级到信任等级1所需要阅读的帖子数量。"
     tl1_requires_time_spent_mins: "新用户升级到信任等级1需要看帖多少分钟。"
-    tl2_requires_topics_entered: "新用户升级到信任等级2所需要进入的主题数量。"
+    tl2_requires_topics_entered: "新用户升级到信任等级2所需要进入的话题数量。"
     tl2_requires_read_posts: "新用户升级到信任等级2所需要阅读的帖子数量。"
     tl2_requires_time_spent_mins: "新用户升级到信任等级2需要看帖多少分钟。"
     tl2_requires_days_visited: "一个初级用户升级到信任等级2所需要访问站点的累计天数。"
     tl2_requires_likes_received: "一个用户升级到信任等级2所需要获得赞的数量。"
     tl2_requires_likes_given: "一个用户升级到信任等级2所需要给出赞的数量。"
-    tl2_requires_topic_reply_count: "一个初级用户升级到信任等级2所需要回复的主题数量。"
+    tl2_requires_topic_reply_count: "一个初级用户升级到信任等级2所需要回复的话题数量。"
     tl3_time_period: "信任等级3考察期限（天数）"
     tl3_requires_days_visited: "要升到信任等级3所需要的，在最近考察时间段内访问的最低天数。将其设置为高于信任等级3的考察时间可禁用信任等级 3。（设置为 0 或比考察期更长）"
-    tl3_requires_topics_replied_to: "要升到信任等级3所需要的，在最近考察时间段内回复的主题数量。（设置为 0 或更高）"
-    tl3_requires_topics_viewed: "要升到信任等级3所需要的，在最近考察时间段内所查看的新主题的百分比。将其设置为高于信任等级3的考察时间可禁用信任等级 3。（设置为 0 到 100）"
-    tl3_requires_topics_viewed_cap: "要升到信任等级3所需要的，在最近考察时间段内所需查看的主题数上限，与百分比计算后取最小。"
-    tl3_requires_posts_read: "要升到信任等级3所需要的，在最近考察时间段内所查看的新主题的百分比。将其设置为高于信任等级3的考察时间可禁用信任等级 3。（设置为 0 或比考察期更长）"
+    tl3_requires_topics_replied_to: "要升到信任等级3所需要的，在最近考察时间段内回复的话题数量。（设置为 0 或更高）"
+    tl3_requires_topics_viewed: "要升到信任等级3所需要的，在最近考察时间段内所查看的新话题的百分比。将其设置为高于信任等级3的考察时间可禁用信任等级 3。（设置为 0 到 100）"
+    tl3_requires_topics_viewed_cap: "要升到信任等级3所需要的，在最近考察时间段内所需查看的话题数上限，与百分比计算后取最小。"
+    tl3_requires_posts_read: "要升到信任等级3所需要的，在最近考察时间段内所查看的新话题的百分比。将其设置为高于信任等级3的考察时间可禁用信任等级 3。（设置为 0 或比考察期更长）"
     tl3_requires_posts_read_cap: "要升到信任等级3所需要的，在最近考察时间段内所需查看的帖子数上限，与百分比计算后取最小。"
-    tl3_requires_topics_viewed_all_time: "用户升至信任等级3所需查看的最小主题数量。"
+    tl3_requires_topics_viewed_all_time: "用户升至信任等级3所需查看的最小话题数量。"
     tl3_requires_posts_read_all_time: "用户升至信任等级3所需查看的最小帖子数量。"
     tl3_requires_max_flagged: "要提升到信任等级3，用户在考察时间段内不得被x个不同用户标记超过x个帖子，x为此设置的值。（设置为0或更高）"
     tl3_promotion_min_duration: "信任等级3的用户可被降级至信任等级2前最小持续天数。"
@@ -1639,12 +1670,13 @@ zh_CN:
     tl3_requires_likes_received: "升级到信任等级3，需要在最近的考察期内收到赞的数量。"
     tl3_links_no_follow: "不移除信任等级3用户帖子中的链接中的 rel=nofollow 属性。"
     trusted_users_can_edit_others: "允许具有高信任级别的用户编辑其他用户的内容"
-    min_trust_to_create_topic: "创建主题所需的最低信任等级。"
+    min_trust_to_create_topic: "创建话题所需的最低信任等级。"
     allow_flagging_staff: "如果启用，用户可以标记管理人员的帖子。"
     min_trust_to_edit_wiki_post: "能编辑维基模式帖子的最小信任等级"
     min_trust_to_edit_post: "能编辑帖子的最小信任等级。"
     min_trust_to_allow_self_wiki: "用户将自己的帖子设置为维基模式的最低信任等级。"
     min_trust_to_send_messages: "创建新个人消息所需的最低信任级别。"
+    min_trust_to_send_email_messages: "通过电子邮件发送私信的最低信任等级。"
     min_trust_to_flag_posts: "标记帖子所需的最低信任级别"
     min_trust_to_post_links: "在帖子中包含链接所需的最低信任级别"
     min_trust_to_post_embedded_media: "在帖子中嵌入媒体项目所需的最低信任等级"
@@ -1666,13 +1698,14 @@ zh_CN:
     personal_email_time_window_seconds: "在发送任何个人消息通知电子邮件之前等待（n）秒，以便用户有机会编辑和完成他们的消息。"
     email_posts_context: "在通知邮件中包含的作为上下文的回复数量。"
     flush_timings_secs: "向服务器刷新时间数据的频率，以秒为单位。"
-    title_max_word_length: "在主题的标题中，允许的词语长度的最大字符数。"
-    title_min_entropy: "在主题的标题中，允许的最低熵值（不同字符，非英语字符算作多个）。"
+    title_max_word_length: "在话题的标题中，允许的词语长度的最大字符数。"
+    title_min_entropy: "在话题的标题中，允许的最低熵值（不同字符，非英语字符算作多个）。"
     body_min_entropy: "在一个帖子内文中，允许的最低熵值（不同字符数，非英语字符算作多个）。"
     allow_uppercase_posts: "允许标题和内容全大写"
-    max_consecutive_replies: "在阻止添加其他回复之前，用户必须在主题中连续发布的帖子数。"
-    title_fancy_entities: "将常见的ASCII字符转换为主题标题中的花哨HTML实体，ala SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</A>"
-    min_title_similar_length: "开始检查相似主题的帖子标题的最小长度。"
+    max_consecutive_replies: "在阻止添加其他回复之前，用户必须在话题中连续发布的帖子数。"
+    enable_filtered_replies_view: '"(n) 回复"按钮会折叠所有其他帖子，只显示当前帖子及其回复。'
+    title_fancy_entities: "将常见的ASCII字符转换为话题标题中的花哨HTML实体，ala SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</A>"
+    min_title_similar_length: "开始检查相似话题的帖子标题的最小长度。"
     desktop_category_page_style: "/categories 页面的视觉样式。"
     category_colors: "设置分类颜色的十六进制色彩值列表。"
     category_style: "分类图标的视觉样式。"
@@ -1683,7 +1716,7 @@ zh_CN:
     authorized_extensions: "允许上传文件的扩展名列表（'*' 表示允许所有文件类型）"
     authorized_extensions_for_staff: "除了在“authorized_extensions”站点设置中定义的列表之外，还运行管理人员上传的文件扩展名列表。（使用'*'启用所有文件类型）"
     theme_authorized_extensions: "主题上传可用的文件扩展名列表（“*” 可允许所有文件）"
-    max_similar_results: "当用户撰写新主题时，显示多少类似主题给用户。比较是根据标题和内容进行的。"
+    max_similar_results: "当用户撰写新话题时，显示多少类似话题给用户。比较是根据标题和内容进行的。"
     max_image_megapixels: "以百万像素为单位单个图像允许的最大值。高于最大值百万像素的图像将被拒绝。"
     title_prettify: "防止常见标题里的错别字和错误，包括全部大写，第一个字符小写，多个'！'和'？'，结尾多余的'.'等等。"
     title_remove_extraneous_space: "删除结尾标点前的空格。"
@@ -1707,23 +1740,24 @@ zh_CN:
     newuser_spam_host_threshold: "被判定为垃圾前，新用户能发表指向同一主机的链接的次数。"
     allowed_spam_host_domains: "不需要进行垃圾内容测试的域名列表。新用户永远不会因发表带有这些域名链接的内容而被限制。"
     staff_like_weight: "管理人员的赞的权重（非管理人员的赞的权重为1）。"
-    topic_view_duration_hours: "按照每 IP/用户每 N 小时来记录一次新的主题访问"
+    topic_view_duration_hours: "按照每 IP/用户每 N 小时来记录一次新的话题访问"
     user_profile_view_duration_hours: "按照每 IP/用户每 N 小时来记录用户资料访问数"
     levenshtein_distance_spammer_emails: "匹配到垃圾邮件发送者时，仍将允许字符数差异的模糊匹配。"
     max_new_accounts_per_registration_ip: "如果已经有了从这个 IP 创建的(n)个信任等级0的账户（并且没有一个是管理人员或者是信任等级2以上的用户），不再允许来自该 IP 地址的注册请求。"
     min_ban_entries_for_roll_up: "当点击折叠按钮时，且至少 (N) 条记录时，将会创建一个子网封禁记录"
     max_age_unmatched_emails: "在 (N) 天后删除不匹配的已屏蔽的邮件地址。"
     max_age_unmatched_ips: "在 (N) 天后删除不匹配的已屏蔽的 IP 记录。"
-    num_flaggers_to_close_topic: "要自动终止一个主题的讨论并介入时所需的最小数量的独立标记者"
-    num_hours_to_close_topic: "暂停主题以介入处理的小时数"
+    num_flaggers_to_close_topic: "要自动终止一个话题的讨论并介入时所需的最小数量的独立标记者"
+    num_hours_to_close_topic: "暂停话题以介入处理的小时数"
     auto_respond_to_flag_actions: "当处理标记时启用自动回复。"
     min_first_post_typing_time: "用户发表第一帖时打字所需的最短时间（以毫秒计），如果没有达到该阈值，帖子将自动进入等待批准队列。设置为 0 禁用（不推荐）"
     auto_silence_fast_typers_on_first_post: "自动禁言未达到 min_first_post_typing_time 的用户"
     auto_silence_fast_typers_max_trust_level: "自动禁言输入快速的用户的适用信任等级"
     auto_silence_first_post_regex: "检查用户首贴的大小写不相关的正则表达式。如匹配，用户将被禁言并送至审核队列。例子：raging|a[bc]a 将匹配 raging、aba 或者 aca，因此禁言该用户。只对首贴有效。"
     reviewable_claiming: "是否需要审核可审核的内容才能对其进行操作？"
-    reviewable_default_topics: "默认以主题为分组显示可审核内容"
+    reviewable_default_topics: "默认以话题为分组显示可审核内容"
     reviewable_default_visibility: "满足此优先级前不要显示可审核条目"
+    reviewable_low_priority_threshold: "除非使用 '(任何)' 过滤器，否则优先级过滤器会隐藏不符合该分数的评论。"
     high_trust_flaggers_auto_hide_posts: "新用户的发帖被信任等级3+的用户标记为垃圾后将被自动隐藏。"
     cooldown_hours_until_reflag: "用户需要等待多长时间才能重新标记一个帖子。"
     reply_by_email_enabled: "启用通过邮件回复。"
@@ -1754,8 +1788,9 @@ zh_CN:
     blocked_attachment_filenames: "基于文件名的关键句屏蔽列表。"
     forwarded_emails_behaviour: "如何处理转发给Discourse的电子邮件"
     always_show_trimmed_content: "总是显示进站邮件中被截断的部分。警告：可能显示某些邮件地址。"
-    private_email: "不要在邮件标题和主体中包含帖子或主题的内容。注意：会一并关闭摘要邮件。"
-    email_total_attachment_size_limit_kb: "出站邮件所有附件合计的最大尺寸。设置为0禁止发送附件。"
+    trim_incoming_emails: "修剪入站邮件的无关部分"
+    private_email: "不要在邮件标题和主体中包含帖子或话题的内容。注意：会一并关闭摘要邮件。"
+    email_total_attachment_size_limit_kb: "发出的电子邮件附件的最大总大小，单位是 kB。设置为 0 以禁止发送附件。"
     post_excerpts_in_emails: "在通知邮件中总是发送摘要代替帖子全文。"
     raw_email_max_length: "应该被保存的入站邮件字符数量。"
     raw_rejected_email_max_length: "应该被保存的被拒收的入站邮件字符数量。"
@@ -1771,8 +1806,8 @@ zh_CN:
     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: '允许用户通过邮件发表新话题（需要手动或 pop3 轮询）。在每一个分类的“设置”标签页配置地址。'
+    email_in_min_trust: "能通过邮件发表新话题的最低用户信任等级。"
     email_in_authserv_id: "对收到的电子邮件进行身份验证检查服务的标识符。参见 <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> 了解如何配置它。"
     email_in_spam_header: "用于检测垃圾邮件的标头。"
     enable_imap: "启用 IMAP 来同步群组信息。"
@@ -1786,7 +1821,7 @@ zh_CN:
     email_prefix: "邮件标题中使用的 [标签]。留空将默认使用 'title'。"
     email_site_title: "邮件发送人站点标题。如果没有设置，默认为“title”。如果标题包含了任何不允许的字符，使用这个设置。"
     find_related_post_with_key: "只能使用 'reply key' 来查找已回复的帖子。警告：禁用此功能将允许用户基于电子邮件地址进行模拟。"
-    minimum_topics_similar: "在编写新主题时，需要有多少相似主题存在？"
+    minimum_topics_similar: "在编写新话题时，需要有多少相似话题存在？"
     relative_date_duration: "发表多少天内将显示相对时间（7天）而非绝对时间（2月20日）。"
     delete_user_max_post_age: "不允许删除第一个帖子发表于(x)天前的用户。"
     delete_all_posts_max: "通过删除所有帖子按钮可以删除的最大帖子数量。如果用户有比这更多的帖子，这些帖子不能一次性删除并且这个用户不能被删除。"
@@ -1797,9 +1832,9 @@ zh_CN:
     allow_uploaded_avatars: "允许用户上传自定义个人头像。"
     default_avatars: "在用户更改头像前的默认头像 URL"
     automatically_download_gravatars: "为注册或更改邮箱的用户下载 Gravatar 头像。"
-    digest_topics: "邮件摘要中显示热门主题的最大数量。"
+    digest_topics: "邮件摘要中显示热门话题的最大数量。"
     digest_posts: "邮件摘要中所显示的热门帖子的数量。"
-    digest_other_topics: "邮件摘要中“你所关注的主题和分类中的新内容”这一部分的最大主题数量。"
+    digest_other_topics: "邮件摘要中“你所关注的话题和分类中的新内容”这一部分的最大话题数量。"
     digest_min_excerpt_length: "邮件摘要中显示的帖子摘要字符数下限。"
     suppress_digest_email_after_days: "停止给(n)天未登录网站的用户发送摘要邮件。"
     digest_suppress_categories: "从摘要邮件中排除这些分类的内容。"
@@ -1821,10 +1856,10 @@ zh_CN:
     anonymous_account_duration_minutes: "为了确保匿名性，每N分钟为各个用户创建一个新的匿名账户。例如：如果设置为600，只要自最后发帖起过去了600分钟，并且用户切换至匿名模式，就会创建一个新的匿名账户。"
     hide_user_profiles_from_public: "为匿名用户禁用用户信息卡、用户资料和用户目录。"
     allow_users_to_hide_profile: "允许用户隐藏其个人资料和状态"
-    allow_featured_topic_on_user_profiles: "允许用户在其用户卡片和个人资料上显示一个指向主题的链接。"
+    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: "当一个用户被n个用户忽视时通知版主。"
     ignored_users_message_gap_days: "当一个用户被多个用户忽视时，再次通知版主前需要等待多少天。"
     clean_up_inactive_users_after_days: "非活跃用户（信任等级0且没有任何帖子）被删除前等待的天数。设为0则关闭清理。"
@@ -1833,21 +1868,21 @@ zh_CN:
     max_notifications_per_user: "每个用户最大的通知数量，如超出，旧的通知将被删除。每周都会执行。设为0以关闭。"
     allowed_user_website_domains: "用户的网站需在这些域名之中。使用管道符号分割的列表。"
     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 等字符串来访问捕获内容"
+    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: "当用户到达底部时自动解除主题置顶。"
+    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>包含分类名称。"
+    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。"
@@ -1859,28 +1894,28 @@ zh_CN:
     full_name_required: "全名是用户个人信息的必填项。"
     enable_names: "在用户的个人信息、用户卡片和邮件中显示全名。禁用以在所有地方隐藏全名。"
     display_name_on_posts: "在用户的帖子中显示他们的全名以及他们的 @username。"
-    show_time_gap_days: "两个帖子的发表时间相隔多少天内时，在主题中以时间间隔显示。"
-    short_progress_text_threshold: "在主题中的帖子数超过这个数量后，进度条将只显示当前的帖子数量。如果你更改了进度条的宽度，你需要修改这个值。"
+    show_time_gap_days: "两个帖子的发表时间相隔多少天内时，在话题中以时间间隔显示。"
+    short_progress_text_threshold: "在话题中的帖子数超过这个数量后，进度条将只显示当前的帖子数量。如果你更改了进度条的宽度，你需要修改这个值。"
     default_code_lang: "使用Github code block(auto, nohighlight, ruby, python etc)作为默认的编程语言语法高亮。"
-    warn_reviving_old_topic_age: "当有人开始回复一个最后回复于设定天数之前的主题时，将显示一个警告。将其设置为 0 以禁用。"
+    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。"
+    embed_topics_list: "话题列表支持HTML嵌入"
+    embed_set_canonical_url: "为嵌入到话题的内容设置规范 URL。"
     embed_truncate: "截断嵌入的帖子。"
-    embed_unlisted: "直到一个用户回复前，导入的主题不会被列出。"
+    embed_unlisted: "直到一个用户回复前，导入的话题不会被列出。"
     embed_support_markdown: "为嵌入式帖子支持Markdown格式。"
     allowed_embed_selectors: "允许嵌入的CSS元素列表，使用逗号分割。"
     allowed_href_schemes: "除了 http 和 https 外允许的链接协议。"
     embed_post_limit: "嵌入帖子的最大数量。"
-    embed_username_required: "创建主题需要用户名。"
+    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: "禁止匿名用户下载附件。警告：这将禁止他们访问任何发表在帖子中的非图片资源。"
+    prevent_anons_from_downloading_files: "阻止匿名用户下载附件。"
     secure_media: '限制所有上传文件（图像、视频、音频、文本、可移植文档格式（pdf）、压缩文件等）的访问。如启用“login required”，那么只有已登录的用户才可以访问上传的文件。否则只对私信和私有分类中的媒体上传进行限制。注意：此设置很复杂且需要深入的管理认识。更详细的内容参阅<a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">官方论坛中的媒体安全话题</a>。'
     secure_media_allow_embed_images_in_emails: "如果图像小于‘secure media max email embed image size kb’的设置，则允许通过邮件编辑嵌入安全的图像。"
     secure_media_max_email_embed_image_size_kb: "如果启用了‘secure media allow embed in emails’设置，限制大小之内的安全图像将被嵌入到邮件；如无启用，则本设置无效。"
@@ -1893,51 +1928,53 @@ zh_CN:
     approve_post_count: "新用户或基础用户需要被审核的帖子数量"
     approve_unless_trust_level: "该信任等级之下的用户的帖子必须被审核"
     approve_new_topics_unless_trust_level: "低于该信任等级的用户的新帖子需要被审核"
-    approve_unless_staged: "必须批准暂存用户的新主题和帖子"
+    approve_unless_staged: "必须批准暂存用户的新话题和帖子"
     notify_about_queued_posts_after: "如果有帖子等待了这些小时后仍未处理，给所有版主发送通知。设置为0禁用这些通知。"
     auto_close_messages_post_count: "私信中贴子数上限，达到后自动关闭私信（0 为禁用）"
-    auto_close_topics_post_count: "主题中贴子数上限，达到后自动关闭主题 ( 0 为禁用 )"
-    auto_close_topics_create_linked_topic: "根据 “主题中贴子数上限” 设置自动关闭主题后，创建一个新的链接主题"
+    auto_close_topics_post_count: "话题中贴子数上限，达到后自动关闭话题 ( 0 为禁用 )"
+    auto_close_topics_create_linked_topic: "根据 “话题中贴子数上限” 设置自动关闭话题后，创建一个新的链接话题"
     code_formatting_style: "编辑器中的代码格式化按钮设置的默认格式"
     max_allowed_message_recipients: "私信允许的最大收件人数。"
     watched_words_regular_expressions: "监视词是正则表达式。"
+    enable_diffhtml_preview: "实验性功能，使用diffHTML实现同步预览（sync preview）代替完全重新渲染（full re-render）"
     old_post_notice_days: "提醒帖子成为存档前的天数"
     new_user_notice_tl: "查看新用户发帖通知所需的最低信任级别。"
     returning_user_notice_tl: "查看回归用户发帖通知所需的最低信任级别。"
     returning_users_days: "在用户被认为回归之前应该经过多少天。"
     review_media_unless_trust_level: "工作人员将会审核信任等级较低的用户所发布含有嵌入多媒体的内容。"
     blur_tl0_flagged_posts_media: "模糊标记帖子图像以隐藏潜在的 NSFW 内容。"
-    enable_page_publishing: "允许工作人员使用自定义样式主题将主题发布到新的链接。"
+    enable_page_publishing: "允许工作人员使用自定义样式话题将话题发布到新的链接。"
     show_published_pages_login_required: "即使要求登录，匿名用户也可以查看公开的页面。"
+    skip_auto_delete_reply_likes: "当自动删除旧回复时，不删除多于或等于此赞数的帖子。"
     default_email_digest_frequency: "用户收到摘要邮件的默认频率。"
     default_include_tl0_in_digests: "在摘要邮件中默认包含新用户帖子。用户可以自行在参数设置中更改这个设置。"
-    default_email_level: "设置常规主题的默认电子邮件通知级别。"
+    default_email_level: "设置常规话题的默认电子邮件通知级别。"
     default_email_messages_level: "设置当有人发消息给用户时的默认邮件提醒等级"
     default_email_mailing_list_mode: "默认为每一个新帖子发送一封邮件通知。"
     default_email_mailing_list_mode_frequency: "邮件列表模式下，用户收到邮件的默认频率。"
-    disable_mailing_list_mode: "禁止用户使用邮件列表模式。"
+    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_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_enable_defer: "默认启用延迟话题功能"
+    default_other_dynamic_favicon: "默认在浏览器图标上显示新/更新的话题数量"
     default_other_skip_new_user_tips: "跳过新用户的流程提示和徽章。"
     default_other_like_notification_frequency: "默认通知被赞的用户"
-    default_topics_automatic_unpin: "默认时当用户到达底部时自动解除主题置顶。"
-    default_categories_watching: "默认监看的分类列表。"
+    default_topics_automatic_unpin: "默认时当用户到达底部时自动解除话题置顶。"
+    default_categories_watching: "默认关注的分类列表。"
     default_categories_tracking: "默认跟踪的分类列表。"
     default_categories_muted: "默认静音的分类列表"
-    default_categories_watching_first_post: "默认关注该分类中每个新主题的第一个帖子"
+    default_categories_watching_first_post: "默认关注该分类中每个新话题的第一个帖子"
     default_categories_regular: "默认为非静音状态的分类列表。作用于站点设置`mute_all_categories_by_default`被启用的时候。"
     mute_all_categories_by_default: "将所有分类的默认通知级别设置为静音。要求用户选择在“最新”和“分类”页面中出现的分类。如果您希望修改匿名用户的默认设置，请设置 'default_categories_'。"
-    default_tags_watching: "默认监看的标签列表。"
+    default_tags_watching: "默认关注的标签列表。"
     default_tags_tracking: "默认追踪的标签列表。"
     default_tags_muted: "默认静音的标签列表。"
-    default_tags_watching_first_post: "监看主题首个回复的标签列表。"
+    default_tags_watching_first_post: "关注话题首个回复的标签列表。"
     default_text_size: "默认选择的文本大小"
     default_title_count_mode: "页面标题计算器的默认模式"
     retain_web_hook_events_period_days: "保存 web hook 事件记录的天数。"
@@ -1945,30 +1982,29 @@ zh_CN:
     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: "启用标签功能，允许为主题设置标签？"
+    tagging_enabled: "启用标签功能，允许为话题设置标签？"
     min_trust_to_create_tag: "创建标签所需的最小信任等级。"
-    max_tags_per_topic: "主题最多允许有多少个标签。"
+    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>上的标签组列出标签。"
     tag_style: "标签的视觉样式。"
-    allow_staff_to_tag_pms: "允许管理人员对个人信息打标签"
-    min_trust_level_to_tag_topics: "给主题加标签的最小信任等级"
-    suppress_overlapping_tags_in_list: "如果标签匹配了主题标题中的词，不显示该标签"
-    remove_muted_tags_from_latest: "在最新主题列表中，不显示仅有静音标签的主题。"
+    allow_staff_to_tag_pms: "允许管理人员对私信打标签"
+    min_trust_level_to_tag_topics: "给话题加标签的最小信任等级"
+    suppress_overlapping_tags_in_list: "如果标签匹配了话题标题中的词，不显示该标签"
+    remove_muted_tags_from_latest: "在最新话题列表中，不显示仅有静音标签的话题。"
     force_lowercase_tags: "强制所有新标签完全小写。"
     company_name: "公司名"
     governing_law: "适用法律"
     city_for_disputes: "争议之城"
-    shared_drafts_category: "为主题草稿指定分类以启用共享草稿功能。此分类中的主题将从管理人员的主题列表中删除。"
+    shared_drafts_category: "为话题草稿指定分类以启用共享草稿功能。此分类中的话题将从管理人员的话题列表中删除。"
+    shared_drafts_min_trust_level: "允许用户查看和编辑共享草稿。"
     push_notifications_prompt: "显示用户同意提示。"
     push_notifications_icon: "在通知中所使用的图标。推荐使用一个96×96的单色且为透明背景的PNG图像。"
     base_font: "网站标题使用的字体。主题可以通过 `--heading-font-family` CSS 自定义属性来覆盖。"
@@ -1982,7 +2018,7 @@ zh_CN:
     gravatar_login_url: "供用户登录到 Gravatar 服务，基于 gravatar_base_url 的相对链接"
     share_quote_buttons: "确定分享对话框中出现的按钮及其显示顺序。"
     share_quote_visibility: "确定何时显示引用分享按钮：从不，仅匿名用户或所有用户。 "
-    create_revision_on_bulk_topic_moves: "当主题批量移动到新类别时，为第一篇帖子创建修订版本。"
+    create_revision_on_bulk_topic_moves: "当话题批量移动到新类别时，为第一篇帖子创建修订版本。"
     errors:
       invalid_email: "电子邮箱地址无效。"
       invalid_username: "没有这个用户名的用户。"
@@ -1997,6 +2033,7 @@ zh_CN:
       invalid_string_min_max: "必须在 %{min} 和 %{max} 字内。"
       invalid_string_min: "必须超过 %{min} 个字符。"
       invalid_string_max: "必须不超过 %{max} 个字符。"
+      invalid_json: "无效的 JSON"
       invalid_reply_by_email_address: "值必须包含 '%{reply_key' 并且要与通知邮件不同。"
       invalid_alternative_reply_by_email_addresses: "必须包括 “%{reply_key}” 并与通知邮件地址不同。"
       pop3_polling_host_is_empty: "在启用 POP3 轮询前，你必须设置 'pop3 polling host'。"
@@ -2010,8 +2047,8 @@ zh_CN:
       email_editable_enabled: "你必须先禁用 'email editable' 再启用该设置。"
       staged_users_disabled: "你必须先启用“暂存用户”再启用该设置。"
       reply_by_email_disabled: "你必须先启用 '用 email 回复' 再启用该设置。"
-      sso_url_is_empty: "必须设置“sso url”才能启用此设置。"
-      sso_invite_only: "你不能够同时启用SSO和仅邀请模式。"
+      discourse_connect_url_is_empty: "在启用该设置前必须设置“discourse connect url”。"
+      discourse_connect_invite_only: "你不能够同时启用DiscourseConnect和仅邀请模式。"
       enable_local_logins_disabled: "必须先启用“启用本地登录”，才能启用此设置。"
       min_username_length_exists: "不能设置最小用户名长度大于最短用户名（%{username}）。"
       min_username_length_range: "不能将最小值设置为高于最大值。"
@@ -2020,19 +2057,17 @@ zh_CN:
       invalid_hex_value: "颜色值需为6位16进制代码。"
       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'"
-        high_weight_invalid: "您不能将权重设置为小于或等于1或大于 'category_search_priority_very_high_weight'。"
-        very_high_weight_invalid: "你不能将权重设置为小于'category_search_priority_high_weight'。"
+        low_weight_invalid: "你不能将权重设置为大于或等于1。"
+        high_weight_invalid: "你不能将权重设置为小于或等于1。"
       allowed_unicode_usernames:
         regex_invalid: "正在表达式无效：%{error}"
         leading_trailing_slash: "正则表达式不能以斜杠作为开头或结尾。"
       unicode_usernames_avatars: "内置的头像系统不支持Unicode用户名。"
       list_value_count: "该列表必须包含%{count}个值。"
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.example.com"
-        value: "SSO密钥"
+        value: "DiscourseConnect 密钥"
   search:
     extreme_load_error: "站点处于高负荷状态，搜索已关闭，稍后再试。"
     within_post: "#%{post_number} 由 %{username}"
@@ -2043,36 +2078,39 @@ zh_CN:
     results_page: "关于“%{term}”的搜索结果"
     audio: "[音频]"
     video: "[视频]"
-  sso:
+  discourse_connect:
     login_error: "登录错误"
     not_found: "无法找到你的账户。请联系站点管理人员。"
-    account_not_approved: "你的账户尚未被审核通过。一旦你的账户获得批准，你就会收到一封电子邮件提醒。"
-    unknown_error: "你的账户发生了问题。请联系站点管理人员。"
-    timeout_expired: "账户登录超时，请重新尝试登录。"
+    account_not_approved: "你的帐户正在等待批准。获得批准时你会收到一封通知邮件。"
+    unknown_error: "你的账户出了一点问题。请联系站点管理人员。"
+    timeout_expired: "帐户登录超时，请尝试重新登录。"
     no_email: "没有找到邮件地址。请联系站点管理员。"
-    blank_id_error: "`external_id`是必需的，但现在空缺"
-    email_error: "不能注册邮箱为<b>%{email}</b>的账户。请联系站点管理员。"
-    missing_secret: "由于缺少密钥，SSO 身份验证失败。请与站点管理员联系以修复此问题。"
+    blank_id_error: "当前空缺的`external_id`是必需的"
+    email_error: "不能使用邮箱<b>%{email}</b>注册账户。请联系站点管理员。"
+    missing_secret: "身份认证由于缺少密钥而导致失败。请与站点管理员联系以修复此问题。"
+    invite_redeem_failed: "邀请失败。请联系管理员。"
   original_poster: "原始作者"
   most_posts: "大部分帖子"
   most_recent_poster: "最新发帖者"
   frequent_poster: "频繁发帖者"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
-    new_user: "欢迎来到我们的社区！这些都是最近热门主题。"
-    not_seen_in_a_month: "欢迎回来！我们已经好久没见到你了。这些是你不在时的最热门主题。"
+    new_user: "欢迎来到我们的社区！这些都是最近热门话题。"
+    not_seen_in_a_month: "欢迎回来！我们已经好久没见到你了。这些是你不在时的最热门话题。"
   merge_posts:
     edit_reason:
       other: "%{username}合并了 %{count} 个帖子"
     errors:
-      different_topics: "无法合并不同主题的帖子。"
+      different_topics: "无法合并不同话题的帖子。"
       different_users: "无法合并不同用户的帖子。"
+      max_post_length: "帖子无法合并，因为合并后的帖子长度超出了允许的长度。"
   move_posts:
     new_topic_moderator_post:
-      other: "%{count} 个帖子被拆分到新主题：%{topic_link}"
+      other: "%{count} 个帖子被拆分到新话题：%{topic_link}"
     new_message_moderator_post:
       other: "%{count} 个帖子被拆分到一个新的私信中：%{topic_link}"
     existing_topic_moderator_post:
-      other: "%{count} 个帖子已被合并到了现有主题：%{topic_link}"
+      other: "%{count} 个帖子已被合并到了现有话题：%{topic_link}"
     existing_message_moderator_post:
       other: "%{count}个帖子已被合并到一个现存的私信中：%{topic_link}"
   change_owner:
@@ -2086,33 +2124,33 @@ zh_CN:
     autoclosed_message_max_posts:
       other: "私信中回复已经达到上限 %{count}，自动锁定。"
     autoclosed_topic_max_posts:
-      other: "主题中回复已经达到上限 %{count}，自动关闭。"
+      other: "话题中回复已经达到上限 %{count}，自动关闭。"
     autoclosed_enabled_days:
-      other: "该主题在创建%{count}天后自动关闭。不再允许添加新回复。"
+      other: "该话题在创建%{count}天后自动关闭。不再允许添加新回复。"
     autoclosed_enabled_hours:
-      other: "该主题在创建%{count}小时后自动关闭。不再允许新的回复。"
+      other: "该话题在创建%{count}小时后自动关闭。不再允许新的回复。"
     autoclosed_enabled_minutes:
-      other: "该主题在创建%{count}分钟后自动关闭。不再允许新的回复。"
+      other: "该话题在创建%{count}分钟后自动关闭。不再允许新的回复。"
     autoclosed_enabled_lastpost_days:
-      other: "该主题在最后一个回复创建后%{count}天后自动关闭。不再允许新的回复。"
+      other: "该话题在最后一个回复创建后%{count}天后自动关闭。不再允许新的回复。"
     autoclosed_enabled_lastpost_hours:
-      other: "该主题在最后一个回复创建后%{count}小时后自动关闭。不再允许添加新回复。"
+      other: "该话题在最后一个回复创建后%{count}小时后自动关闭。不再允许添加新回复。"
     autoclosed_enabled_lastpost_minutes:
-      other: "本主题在最后一个回复创建后%{count}分钟后自动锁定。不再允许添加新回复。"
+      other: "本话题在最后一个回复创建后%{count}分钟后自动锁定。不再允许添加新回复。"
     autoclosed_disabled_days:
-      other: "该主题开启 %{count} 天后将自动关闭。"
+      other: "该话题开启 %{count} 天后将自动关闭。"
     autoclosed_disabled_hours:
-      other: "该主题开启 %{count} 小时后将自动关闭。"
+      other: "该话题开启 %{count} 小时后将自动关闭。"
     autoclosed_disabled_minutes:
-      other: "该主题开启 %{count} 分钟后将自动关闭。"
+      other: "该话题开启 %{count} 分钟后将自动关闭。"
     autoclosed_disabled_lastpost_days:
-      other: "该主题将在最后一个回复 %{count} 天后自动关闭。"
+      other: "该话题将在最后一个回复 %{count} 天后自动关闭。"
     autoclosed_disabled_lastpost_hours:
-      other: "该主题将在最后一个回复 %{count} 小时后自动关闭。"
+      other: "该话题将在最后一个回复 %{count} 小时后自动关闭。"
     autoclosed_disabled_lastpost_minutes:
-      other: "该主题将在最后一个回复 %{count} 分钟后自动关闭。"
-    autoclosed_disabled: "本主题是开放的，可以添加新的回复。"
-    autoclosed_disabled_lastpost: "本主题现在开放了。可以添加新的回复。"
+      other: "该话题将在最后一个回复 %{count} 分钟后自动关闭。"
+    autoclosed_disabled: "本话题是开放的，可以添加新的回复。"
+    autoclosed_disabled_lastpost: "本话题现在开放了。可以添加新的回复。"
     auto_deleted_by_timer: "由计时器自动删除。"
   login:
     invalid_second_factor_method: "所选的双重认证方法无效。"
@@ -2171,6 +2209,18 @@ zh_CN:
   admin:
     email:
       sent_test: "已发送！"
+    user:
+      merge_user:
+        updating_username: "正在更新用户名..."
+        changing_post_ownership: "更改帖子所有权..."
+        merging_given_daily_likes: "正在合并每日喜欢..."
+        merging_post_timings: "正在合并帖子发布时间..."
+        merging_user_visits: "正在合并用户访问..."
+        updating_site_settings: "正在更新站点设置..."
+        updating_user_stats: "正在更新用户统计信息..."
+        merging_user_attributes: "正在合并用户属性..."
+        updating_user_ids: "正在更新用户ID ..."
+        deleting_source_user: "正在删除源用户..."
   user:
     deactivated: "因发送至“%{email}”的邮件被多次退信，取消激活"
     deactivated_by_staff: "被管理人员禁用"
@@ -2207,6 +2257,8 @@ zh_CN:
       fixed_primary_email: "为暂存用户固定主要邮箱"
       same_ip_address: "同一IP地址(%{ip_address})如其他用户"
       inactive_user: "非活跃用户"
+      reviewable_reject_auto: "自动处理排队的可审核内容"
+      reviewable_reject: "审核用户被拒绝"
     email_in_spam_header: "用户的第一封电子邮件已被标记为垃圾邮件"
     already_silenced: "用户已被 %{staff} 在 %{time_ago} 静音。"
     already_suspended: "用户已被 %{staff} 在 %{time_ago} 封禁。"
@@ -2356,9 +2408,9 @@ zh_CN:
 
       %{notes}
   flag_reasons:
-    off_topic: "你的帖子被标记为 **偏离主题**：鉴于当前的主题标题和第一个帖子，社区成员们感觉它不适合处于这个主题中。"
+    off_topic: "你的帖子被标记为 **偏离话题**：鉴于当前的话题标题和第一个帖子，社区成员们感觉它不适合处于这个话题中。"
     inappropriate: "你的帖子被标记为 **不恰当**：社区成员感觉它有冒犯或者侮辱的意味，亦或是它违反了[社区准则](%{base_path}/guidelines)。"
-    spam: "你的帖子被标记为 **广告**：社区成员觉得它是广告，像是在过度地推广着什么，而不是预期中与主题有关的内容。"
+    spam: "你的帖子被标记为 **广告**：社区成员觉得它是广告，像是在过度地推广着什么，而不是预期中与话题有关的内容。"
     notify_moderators: "你的帖子被标记为 **需要版主关注**：社区成员认为帖子需要管理人员介入。"
   flags_dispositions:
     agreed: "谢谢你的私信。我们认为这是个问题。我们正在进行处理。"
@@ -2367,9 +2419,9 @@ zh_CN:
     ignored: "感谢通知我们。我们正在调查情况。"
     ignored_and_deleted: "感谢通知我们。我们已经删除了帖子。"
   temporarily_closed_due_to_flags:
-    other: "因为大量社区成员的标记，这个主题被临时关闭 %{count} 小时。"
+    other: "因为大量社区成员的标记，这个话题被临时关闭 %{count} 小时。"
   system_messages:
-    private_topic_title: "主题 #%{id}"
+    private_topic_title: "话题 #%{id}"
     contents_hidden: "请访问帖子以查看内容。"
     post_hidden:
       title: "帖子隐藏"
@@ -2403,6 +2455,19 @@ zh_CN:
         社区成员标记了该帖子，现已被隐藏。**由于此帖子已被隐藏超过一次，你的帖子现在将持续隐藏，直到由工作人员作出处理。**
 
         有关其他指导，请参阅我们的[社区指引](%{base_url}/guidelines)。
+    queued_by_staff:
+      title: "等待审核中"
+      subject_template: "帖子被管理员隐藏，等待批准"
+      text_body_template: |
+        Hello，
+
+        这是一条从 %{site_name} 发来的自动消息，，你的帖子已隐藏。
+
+        <%{base_url}%{url}>
+
+        你的帖子将一直隐藏，直到管理员对其进行审核。
+
+        有关其他指导，请参阅我们的[社区准则](%{base_url}/guidelines)。
     flags_disagreed:
       title: "管理人员恢复了被标记的帖子"
       subject_template: "管理人员恢复了被标记的帖子"
@@ -2424,18 +2489,17 @@ zh_CN:
       text_body_template: |
         你好，
 
-        这是%{site_name}通知你[你的帖子](%{base_url}%{url})已被删除的自动消息。
+        这是一则由%{site_name}自动发送的消息，告知[你的帖子](%{base_url}%{url})被移除了。
 
         %{flag_reason}
 
-        该帖子被社区标记，管理人员选择将其删除。
+        这个帖子被社区所标记后，工作人员选择将其移除。
 
-        [details="点击以展开被删除的帖子"]
         ``` markdown
         %{flagged_post_raw_content}
         ```
 
-        有关详细信息，请查看我们的[社区指引](%{base_url}/guidelines)。
+        要了解详情，请阅读我们的[社区守则](%{base_url}/guidelines)。
     usage_tips:
       text_body_template: |
         要查看给新用户的简要技巧，[（英文）看看这篇博客文章](http://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
@@ -2458,7 +2522,7 @@ zh_CN:
       text_body_template: |
         嘿。我们看到你一直在忙着阅读，这太棒了，所以我们已经提升你了[信任等级！](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
 
-        我们很高兴你和我们共度时光，我们很想知道更多关于你的事情。花一点时间[填写你的个人资料](%{base_url}/my/preferences/profile)，或随时[开始一个新主题](%{base_url}/categories)。
+        我们很高兴你和我们共度时光，我们很想知道更多关于你的事情。花一点时间[填写你的个人资料](%{base_url}/my/preferences/profile)，或随时[开始一个新话题](%{base_url}/categories)。
     welcome_staff:
       title: "欢迎管理人员"
       subject_template: "恭喜，你已获得%{role}身份！"
@@ -2488,9 +2552,11 @@ zh_CN:
     tl2_promotion_message:
       subject_template: "恭喜！你的信任等级提升了！"
       text_body_template: |
-        我们提升了你的[信任等级](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)！
+        我们已经为你提升到另一个[信任等级](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)！
 
-        诚邀你继续参与到社区当中，很荣幸能与你同行。
+        作为经验丰富的用户，您可能会喜欢[这个方便实用的技巧清单](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
+
+        希望你能够继续活跃 —— 感谢你的参与。
     backup_succeeded:
       title: "备份成功"
       subject_template: "备份成功完成"
@@ -2583,7 +2649,7 @@ zh_CN:
       text_body_template: |
         我们很抱歉，但是你发送至%{destination}（名为 %{former_title}）的邮件出问题了。
 
-        你的账户没有足够的信任等级以该邮件地址发布新主题。如果你有异议，[联系管理人员](%{base_url}/about)。
+        你的账户没有足够的信任等级以该邮件地址发布新话题。如果你有异议，[联系管理人员](%{base_url}/about)。
     email_reject_user_not_found:
       title: "Email被拒绝：用户未找到"
       subject_template: "[%{email_prefix}] 邮件问题 -- 未找到用户"
@@ -2648,7 +2714,7 @@ zh_CN:
       text_body_template: |
         我们很抱歉，但是你发送至%{destination}（名为 %{former_title}）的邮件出问题了。
 
-        你的账户没有达到足够的信任等级在该分类发布新主题。如果你有异议，[联系管理人员](%{base_url}/about)。
+        你的账户没有达到足够的信任等级在该分类发布新话题。如果你有异议，[联系管理人员](%{base_url}/about)。
     email_reject_strangers_not_allowed:
       title: "Email被拒绝：不允许陌生人"
       subject_template: "[%{email_prefix}] 邮件问题 -- 无效访问"
@@ -2657,7 +2723,7 @@ zh_CN:
 
         邮件所发送的分类只接受来自拥有邮箱地址的有效账户的回复。如果你认为这是一个错误，[联系管理人员](%{base_url}/about)。
     email_reject_invalid_post:
-      title: "邮件拒绝无效主题"
+      title: "邮件拒绝无效话题"
       subject_template: "[%{email_prefix}] 邮件问题 -- 发表错误"
       text_body_template: |
         我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。
@@ -2700,30 +2766,38 @@ zh_CN:
       title: "Email被拒绝：收件人地址不正确"
       subject_template: "[%{email_prefix}] 邮件问题 -- 未知的发至：地址"
       text_body_template: |
-        很抱歉，你通过邮件发往%{destination}（标题%{former_title}）的私信/消息没有成功。
+        很抱歉，但是您发送给 %{destination}  (标题 %{former_title}) 的电子邮件不起作用。
 
-        你是否使用一个以上的电子邮件地址？你是否使用了不同的电子邮件地址回复？电子邮件回复要求你在回复时使用相同的电子邮件地址。或者，邮件中的私信/消息-ID 头可能被修改。
+        以下是一些需要检查的事项：
+
+          - 你使用多个电子邮件地址吗？你回复的电子邮件地址不同于原来使用的电子邮件地址吗？电子邮件回复要求您在回复时使用相同的电子邮件地址。
+
+          - 回复时，你的电子邮件软件是否正确使用 Reply-To: email address？不幸的是，某些电子邮件软件错误地使用 From: address，这不起作用。
+
+          - 电子邮件中的 Message-ID 标题是否已修改？Message-ID 必须保持一致且不变。
+
+        需要更多帮助？联系我们： %{base_url}/about
     email_reject_old_destination:
       title: "邮件拒绝老地址"
       subject_template: "[%{email_prefix}] 邮件问题 - 你正尝试回复旧通知"
       text_body_template: |
         很抱歉，你发送到%{destination}的邮件（标题%{former_title}）无效。
 
-        我们只接受%{number_of_days}天的原始通知回复。请[访问主题](%{short_url})继续对话。
+        我们只接受%{number_of_days}天的原始通知回复。请[访问话题](%{short_url})继续对话。
     email_reject_topic_not_found:
-      title: "Email被拒绝：主题不存"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 主题未找到"
+      title: "Email被拒绝：话题不存"
+      subject_template: "[%{email_prefix}] 邮件问题 -- 话题未找到"
       text_body_template: |
         我们很抱歉，但是你发送至%{destination}（名为 %{former_title}）的邮件出问题了。
 
-        你回复的主题不存在——可能已经被删除了？如果你有异议，[联系管理人员](%{base_url}/about)。
+        你回复的话题不存在——可能已经被删除了？如果你有异议，[联系管理人员](%{base_url}/about)。
     email_reject_topic_closed:
-      title: "Email被拒绝：主题已关闭"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 主题已关闭"
+      title: "Email被拒绝：话题已关闭"
+      subject_template: "[%{email_prefix}] 邮件问题 -- 话题已关闭"
       text_body_template: |
         我们很抱歉，但是你发送至 %{destination} ( 名为 %{former_title} )的邮件出问题了。
 
-        你回复的主题已经被关闭，不允许回复。如果你有异议，[联系管理人员](%{base_url}/about)。
+        你回复的话题已经被关闭，不允许回复。如果你有异议，[联系管理人员](%{base_url}/about)。
     email_reject_auto_generated:
       title: "邮件拒绝自动生成"
       subject_template: "[%{email_prefix}] 邮件问题 -- 自动生成的回复"
@@ -2754,7 +2828,7 @@ zh_CN:
       text_body_template: |
         我们很抱歉，但是你发送至%{destination}（标题 %{former_title}）的邮件出问题了。
 
-        你的账户没有权限回复这个主题。如果你认为这是一个错误，[联系管理人员](%{base_url}/about)。
+        你的账户没有权限回复这个话题。如果你认为这是一个错误，[联系管理人员](%{base_url}/about)。
     email_reject_reply_to_digest:
       title: "回复摘要邮件被拒"
       subject_template: "[%{email_prefix}] 邮件问题 -- 回复摘要邮件"
@@ -2807,7 +2881,7 @@ zh_CN:
 
         这是%{site_name}通知你的帖子因被社区成员标记已被暂时隐藏的自动消息
 
-        作为预防措施，你的新账户已被停用，并且在管理人员审核你的账户前你无法创建回复或主题。我们对此深表抱歉。
+        作为预防措施，你的新账户已被停用，并且在管理人员审核你的账户前你无法创建回复或话题。我们对此深表抱歉。
 
         有关其他指导，请参阅我们的[社区指引](%{base_url}/guidelines)。
     too_many_tl3_flags:
@@ -2818,7 +2892,7 @@ zh_CN:
 
         这是%{site_name}通知你的帖子因社区标记而被临时禁用的自动消息。
 
-        出于谨慎的考虑，在管理人员审核通过前，你的新账户不能再发表新的回复或者主题。我们对此带来的不便表示歉意。
+        出于谨慎的考虑，在管理人员审核通过前，你的新账户不能再发表新的回复或者话题。我们对此带来的不便表示歉意。
 
         要查看更多指引，请参考我们的[社区指引](%{base_url}/guidelines)。
     silenced_by_staff:
@@ -2829,7 +2903,7 @@ zh_CN:
 
         %{site_name}提醒你，出于谨慎起见你的账户已被暂时停用。
 
-        你可以继续浏览，但在[管理人员](%{base_url}/about)审核你最近的发帖前，你的账户将无法发表新的回复或者主题。我们对此带来的不便表示歉意。
+        你可以继续浏览，但在[管理人员](%{base_url}/about)审核你最近的发帖前，你的账户将无法发表新的回复或者话题。我们对此带来的不便表示歉意。
 
         要查看更多指引，请参阅我们的[社区指引](%{base_url}/guidelines)。
     user_automatically_silenced:
@@ -2862,7 +2936,7 @@ zh_CN:
 
         这是%{site_name}通知你的账户在管理人员审核后不再受到限制的自动消息。
 
-        你现在又可以创建回复和主题了。感谢你的耐心等待。
+        你现在又可以创建回复和话题了。感谢你的耐心等待。
     pending_users_reminder:
       title: "待审核用户提醒"
       subject_template:
@@ -2922,11 +2996,11 @@ zh_CN:
     unsubscribe:
       title: "取消订阅"
       description: "不再对这些邮件感兴趣？没问题！点击下面按钮来立即取消订阅："
-    reply_by_email: "[访问主题](%{base_url}%{url})或者发邮件回复。"
+    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: "[访问话题](%{base_url}%{url})以回复."
     visit_link_to_respond_pm: "[访问消息](%{base_url}%{url})回复%{participants}。"
     posted_by: "%{username}发表于%{post_date}"
     pm_participants: "参与者：%{participants}"
@@ -3000,7 +3074,7 @@ zh_CN:
 
         %{respond_instructions}
     user_invited_to_topic:
-      title: "邀请用户至主题"
+      title: "邀请用户至话题"
       subject_template: "[%{email_prefix}] %{username}邀请你至“%{topic_title}”"
       text_body_template: |
         %{header_instructions}
@@ -3097,7 +3171,7 @@ zh_CN:
 
         %{respond_instructions}
     user_watching_first_post:
-      title: "用户监控新主题"
+      title: "用户关注新话题"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3128,20 +3202,16 @@ zh_CN:
       title: "账户已封禁"
       subject_template: "[%{email_prefix}] 你的账户已经被禁用"
       text_body_template: |
-        你的账户已经被禁用至%{suspended_till}。
+        你的账号已被论坛禁用，直到 %{suspended_till} 为止。
 
-        %{reason}
-
-        %{message}
+        原因 - %{reason}
     account_silenced:
       title: "账户已禁言"
       subject_template: "[%{email_prefix}] 你的账户已被禁言"
       text_body_template: |
-        你的账号已经被禁言至%{silenced_till}。
+        你的账号已经被禁言至 %{silenced_till}。
 
-        %{reason}
-
-        %{message}
+        原因 - %{reason}
     account_exists:
       title: "账户已经存在"
       subject_template: "[%{email_prefix}] 账户已经存在"
@@ -3165,13 +3235,13 @@ zh_CN:
     digest:
       why: "在你上次于%{last_seen_at}访问后，%{site_link}的新内容摘要。"
       since_last_visit: "自从你上次访问"
-      new_topics: "新主题"
+      new_topics: "新话题"
       unread_notifications: "未读通知"
       unread_high_priority: "未读的高优先级通知"
       liked_received: "收到的赞"
       new_users: "新用户"
-      popular_topics: "热门主题"
-      follow_topic: "关注主题"
+      popular_topics: "热门话题"
+      follow_topic: "关注话题"
       join_the_discussion: "阅读更多"
       popular_posts: "流行帖子"
       more_new: "你关注的新帖"
@@ -3303,6 +3373,13 @@ zh_CN:
         我们始终相信[文明社区行为](%{base_url}/guidelines)。
 
         入住愉快！
+    signup_after_reject:
+      title: "拒绝后的注册"
+      subject_template: "你在 %{site_name}上被拒绝"
+      text_body_template: |
+        一名工作人员拒绝了你在 %{site_name} 上的帐户。
+
+        %{reject_reason}
     signup:
       title: "注册"
       subject_template: "[%{email_prefix}] 确认你的新账户"
@@ -3340,8 +3417,16 @@ zh_CN:
         如果这是你，太棒了！你不需要做任何其他事情。
 
         如果不是你，请[查看你现有的会话](%{base_url}/my/preferences/account)并考虑更改密码。
+    post_approved:
+      title: "你的帖子已通过审核"
+      subject_template: "[%{site_name}] 你的帖子已通过审核"
+      text_body_template: |
+        你好：
+
+        这是来自 %{site_name} 的自动消息，[你的帖子] (%{base_url}%{post_url}) 已通过审核。
   page_forbidden:
     title: "啊噢！该页面是私密的。"
+  site_setting_missing: "站点设定 `%{name}` 必须被设置。"
   page_not_found:
     title: "抱歉！这个页面不存在或者是私密的。"
     popular_topics: "热门"
@@ -3354,10 +3439,10 @@ zh_CN:
     offline_page_message: "你似乎正处于离线状态！请检查网络连接并重试。"
   login_required:
     welcome_message: |
-      ##[欢迎来到 %{title}](#welcome)
+      ## [欢迎来到 %{title}](#welcome)
       你需要一个账户。请创建一个账户或者登录以继续。
     welcome_message_invite_only: |
-      ##[欢迎来到%{title}](#welcome)
+      ## [欢迎来到%{title}](#welcome)
       你需要一个账号。请从现有用户处获取一个邀请或者登录。
   deleted: "已删除"
   image: "图片"
@@ -3381,7 +3466,7 @@ zh_CN:
   avatar:
     missing: "抱歉，我们没法找到与你邮件地址关联的头像。你能再上传一次试试吗？"
   flag_reason:
-    sockpuppet: "新用户创建了主题，而另一个新用户以同一个 IP 在该主题回复。查看站点设置的 <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>。"
+    sockpuppet: "新用户创建了话题，而另一个新用户以同一个 IP 在该话题回复。查看站点设置的 <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>。"
     spam_hosts: "新用户尝试创建多个链接到相同域名的帖子。此用户所有包含链接的帖子需要审核。详见站点设置<a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>。"
   skipped_email_log:
     exceeded_emails_limit: "超过max_emails_per_day_per_user"
@@ -3395,7 +3480,7 @@ zh_CN:
     user_email_notification_already_read: "此邮件的通知已被阅读"
     user_email_notification_topic_nil: "post.topic为空"
     user_email_post_user_deleted: "该帖子的用户已被删除。"
-    user_email_post_deleted: "主题被作者删除"
+    user_email_post_deleted: "话题被作者删除"
     user_email_user_suspended: "用户被封禁"
     user_email_already_read: "用户已阅读此帖"
     user_email_access_denied: "用户不被允许查看此帖子"
@@ -3406,7 +3491,7 @@ zh_CN:
     sender_body_blank: "内容为空"
     sender_post_deleted: "帖子已被删除"
     sender_message_to_invalid: "收件人电子邮箱地址无效"
-    sender_topic_deleted: "主题已被删除"
+    sender_topic_deleted: "话题已被删除"
   color_schemes:
     base_theme_name: "基础"
     light: "浅色"
@@ -3436,7 +3521,7 @@ zh_CN:
     boolean_no: "否"
     rate_limit_error: "帖子只能每天下载一次，请明天再重试。"
   static_topic_first_reply: |
-    编辑本主题的第一帖以改变 %{page_name} 页面的内容。
+    编辑本话题的第一帖以改变 %{page_name} 页面的内容。
   guidelines_topic:
     title: "FAQ/指引"
     body: |
@@ -3454,9 +3539,9 @@ zh_CN:
 
       帮助我们让这个地方变成一个讨论的好地方。你可以总是一致的做一些帮助改善讨论的事，即使是小事也行。如果你不确定你的帖子有益于讨论，认真想一想你要说什么再发布。
 
-      这里讨论的主题对我们很重要，并且我们希望你也觉得这些内容对你很重要。尊重这些讨论的主题，以及讨论他们的人们，特别是当你不同意他们所说的时候。
+      这里讨论的话题对我们很重要，并且我们希望你也觉得这些内容对你很重要。尊重这些讨论的话题，以及讨论他们的人们，特别是当你不同意他们所说的时候。
 
-      改善讨论的一种方法是找一找已经发生过的事。请在发帖或创建你自己的主题前，花一些时间浏览这些主题，这样你更有机会遇见和你有共同爱好的人。
+      改善讨论的一种方法是找一找已经发生过的事。请在发帖或创建你自己的话题前，花一些时间浏览这些话题，这样你更有机会遇见和你有共同爱好的人。
 
       <a name="agreeable"></a>
 
@@ -3511,13 +3596,13 @@ zh_CN:
 
       花一点时间让东西出现在正确的位置，这样我们能花更多的时间在讨论上而非清理格式。所以：
 
-      * 不要在错误的分类发表新主题。
-      * 不要在多个主题中回复同样的内容。
+      * 不要在错误的分类发表新话题。
+      * 不要在多个话题中回复同样的内容。
       * 不要发布没有内容的回复。
-      * 不要在中途改变主题。
+      * 不要在中途改变话题。
       * 不要在你的帖子中签名 &mdash; 每一贴都附有你的个人信息。
 
-      比起发表“+1”或者“同意”，使用赞按钮。比起将帖子带向一个决然不同的方向，使用“回复为关联主题”。
+      比起发表“+1”或者“同意”，使用赞按钮。比起将帖子带向一个决然不同的方向，使用“回复为关联话题”。
 
       <a name="stealing"></a>
 
@@ -3529,7 +3614,7 @@ zh_CN:
 
       ## [有你参与](#power)
 
-      这个站点由[一群友善的管理人员](%{base_path}/about)、你和社区一起运营。如果你对这里的事情仍有疑问，在[站点反馈](%{base_path}/c/site-feedback)分类新建一个主题并且开始讨论！如果遇到了重要或紧急的事情，并且不能用站务分类的主题或标记解决，通过[管理人员页面](%{base_path}/about)联系我们。
+      这个站点由[一群友善的管理人员](%{base_path}/about)、你和社区一起运营。如果你对这里的事情仍有疑问，在[站点反馈](%{base_path}/c/site-feedback)分类新建一个话题并且开始讨论！如果遇到了重要或紧急的事情，并且不能用站务分类的话题或标记解决，通过[管理人员页面](%{base_path}/about)联系我们。
 
       <a name="tos"></a>
 
@@ -3575,37 +3660,37 @@ zh_CN:
 
       你使用论坛的许可受以下条件限制：
 
-      你必须至少十三岁。
+      1.你必须至少十三岁。
 
-      2.如果公司直接与你联系，表示你可能不会，你可能不再使用该论坛。
+      2.如果公司直接与你表示不能，你不能继续使用该论坛。
 
       3.你必须按照[可接受使用](#heading--accepted-use)和[内容标准](#heading--content-standards)使用论坛。
 
       <h2 id =“heading--acceptable-use”><a href="#heading--acceptable-use">可接受的使用</a></h2>
 
-      你可能不会使用论坛违法。
+      1.你不能使用论坛违法。
 
-      2.未经他们的特别许可，你不得在论坛上使用或尝试使用他人的账户。
+      2.未经特别许可，你不得在论坛上使用或尝试使用他人的账户。
 
       3.你不得在论坛上购买，出售或以其他方式交易用户名或其他唯一标识符。
 
       4.你不得通过论坛发送广告，连锁信或其他请求，或使用论坛收集商业邮件列表或数据库的地址或其他个人数据。
 
-      5.你可能无法自动访问论坛或监控论坛，例如使用网络爬虫，浏览器插件或插件，或其他非Web浏览器的计算机程序。如果你运行一个搜索引擎，你可以抓取论坛为其公开搜索引擎编制索引。
+      5.你不能使用程序自动访问论坛或监控论坛，例如使用网络爬虫，浏览器插件或插件，或其他非Web浏览器的计算机程序。如果你运行一个搜索引擎，你可以抓取论坛为其公开搜索引擎编制索引。
 
       6.你不能使用论坛将邮件发送到通讯组列表，新闻组或组邮件别名。
 
-      7.你不得虚假暗示你与公司有关联或认可。
+      7.你不得虚假暗示你与本公司有关联或得到许可。
 
-      8.你不得在其他网页的论坛上超链接到图像或其他非超文本内容。
+      8.你不得在其他论坛上超链接到本论坛的图片或其他非超文本内容。
 
       9.你不得从论坛下载的资料中删除任何显示所有权的标记。
 
-      10.你可能无法使用“<iframe>”在其他网站上显示论坛的任何部分。
+      10.你可能无法使用`<iframe>`在其他网站上显示论坛的任何部分。
 
       11.你不得禁用，避免或绕过论坛的任何安全或访问限制。
 
-      12.你可能不会对论坛的基础设施施加不合理的请求量，或者旨在对论坛底层信息系统施加不合理负担的请求。
+      12.你不能对论坛的基础设施施加不合理的请求量，或者旨在对论坛底层信息系统施加不合理负担的请求。
 
       13.你不得通过论坛冒充他人。
 
@@ -3681,11 +3766,11 @@ zh_CN:
 
       <h2 id =“heading--dispute”><a href="#heading--disputes"> Disputes </a></h2>
 
-      %{governing_law} 将管辖与这些条款或你对论坛的使用相关的任何争议。
+      %{governing_law}将管辖与这些条款或你对论坛的使用相关的任何争议。
 
       你和公司同意仅在%{city_for_disputes}的州或联邦法院寻求与这些条款相关的禁令。你和公司都不会反对这些法院的管辖权，论坛或地点。
 
-      ***除了寻求禁令或根据“计算机欺诈和滥用法案”提出的索赔外，你和公司将通过约束美国仲裁协会的仲裁来解决任何争议。仲裁将遵循AAA的商业仲裁规则和消费者相关争议的补充程序。仲裁将在加利福尼亚州旧金山举行。你将作为个人解决任何争议，而不是作为集体诉讼或其他代表诉讼的一部分，无论是作为原告还是集体成员。未经公司许可，任何仲裁员均不得将任何争议与任何其他仲裁合并。***
+      ***除了寻求禁令或根据“计算机欺诈和滥用法案”提出的索赔外，你和公司将通过约束美国仲裁协会的仲裁来解决任何争议。仲裁将遵循AAA的商业仲裁规则和消费者相关争议的补充程序。仲裁将在 %{city_for_disputes}举行。你将作为个人解决任何争议，而不是作为集体诉讼或其他代表诉讼的一部分，无论是作为原告还是集体成员。未经公司许可，任何仲裁员均不得将任何争议与任何其他仲裁合并。***
 
       任何仲裁裁决将包括仲裁费用，合理的律师费和证人的合理费用。你和公司可以在任何有管辖权的法院进行仲裁裁决。
 
@@ -3709,7 +3794,7 @@ zh_CN:
 
       该公司最后更新了这些条款于2018年7月12日，并可能再次更新这些条款。该公司将发布所有更新到论坛。对于包含重大更改的更新，如果你已创建账户并提供有效的邮件地址，则公司同意通过邮件通知你。该公司还可以在论坛上通过特殊消息或警报宣布更新。
 
-      一旦你收到这些条款的更新通知，你必须同%{governing_law}意新条款才能继续使用论坛。
+      一旦你收到这些条款的更新通知，你必须同意新条款才能继续使用论坛。
   privacy_topic:
     title: "隐私政策"
     body: |
@@ -3798,6 +3883,7 @@ zh_CN:
     mass_award:
       errors:
         invalid_csv: 我们在第%{line_number}行遇到一个错误。请确认CSV中每一行有一个电子邮件地址。
+        badge_disabled: 请先启用 %{badge_name} 徽章。
     editor:
       name: 编辑
       description: 首次编辑帖子
@@ -3817,17 +3903,17 @@ zh_CN:
       name: 社区成员
       description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">授予</a>邀请、群组消息和更多的赞
       long_description: |
-        该徽章授予给达到信用等级2的你。感谢你在社区待了几周，真正融入到了社区中。现在你可以在你的用户页或单个主题中邀请他人加入，或者创建群组私信，同时也可以在每一天给出更多的赞。
+        该徽章授予给达到信用等级2的你。感谢你在社区待了几周，真正融入到了社区中。现在你可以在你的用户页或单个话题中邀请他人加入，或者创建群组私信，同时也可以在每一天给出更多的赞。
     regular:
       name: 活跃用户
       description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">授予</a>重分类、重命名、重命名、跟随链接、维基还有更多的赞
       long_description: |
-        该徽章授予给达到信用等级3的你。感谢你在这几个月持续地参与社区。你现在是我们之中最活跃的读者之一了，你持续的贡献极大地帮助了我们的社区。你现在可以重新分类或者重命名主题、使用能力强大的垃圾标记功能以及访问隐藏的贵宾分类了，并且你还可以每一天送出更多的赞。
+        该徽章授予给达到信用等级3的你。感谢你在这几个月持续地参与社区。你现在是我们之中最活跃的读者之一了，你持续的贡献极大地帮助了我们的社区。你现在可以重新分类或者重命名话题、使用能力强大的垃圾标记功能以及访问隐藏的贵宾分类了，并且你还可以每一天送出更多的赞。
     leader:
       name: 资深
-      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">授予</a>全局编辑、置顶、关闭、存档、分割、合并帖子的权限，还有更多的赞
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">授予</a>全局编辑、置顶、关闭、归档、分割、合并帖子的权限，还有更多的赞
       long_description: |
-        当你达到信任等级 4 时，将被授予此徽章。你是管理人员选作的社区中的领导者，你的行为和言辞，为社区中的其他人树立了积极的榜样。 你现在可以编辑所有的帖子，使用常见的主题管理操作，例如置顶，关闭，不在列表中显示，存档，分割和合并。
+        当你达到信任等级 4 时，将被授予此徽章。你是管理人员选作的社区中的领导者，你的行为和言辞，为社区中的其他人树立了积极的榜样。 你现在可以编辑所有的帖子，使用常见的话题管理操作，例如置顶，关闭，不在列表中显示，归档，分割和合并。
     welcome:
       name: 欢迎
       description: 收到了一个赞
@@ -3859,20 +3945,20 @@ zh_CN:
       long_description: |
         该徽章授予给回复收到50个赞的你。哇！你的回复很有启发、引经据典、令人冷俊不禁或者十分有内涵，整个社区都赞它！
     nice_topic:
-      name: 不错的主题
-      description: 单个主题收获10个赞
+      name: 不错的话题
+      description: 单个话题收获10个赞
       long_description: |
-        该徽章授予给主题收到10个赞的你。你创建了一个社区成员觉得有意思的讨论！
+        该徽章授予给话题收到10个赞的你。你创建了一个社区成员觉得有意思的讨论！
     good_topic:
-      name: 很好的主题
-      description: 单个主题收获25个赞
+      name: 很好的话题
+      description: 单个话题收获25个赞
       long_description: |
-        该徽章授予给主题收到25个赞的你。你创建了一个有意义的主题，整个社区都在积极响应。
+        该徽章授予给话题收到25个赞的你。你创建了一个有意义的话题，整个社区都在积极响应。
     great_topic:
-      name: 精彩的主题
-      description: 单个主题收获50个赞
+      name: 精彩的话题
+      description: 单个话题收获50个赞
       long_description: |
-        该徽章授予给主题获得50个赞的你。你创建了一个引人入胜的主题，整个社区都沉浸于讨论之中。
+        该徽章授予给话题获得50个赞的你。你创建了一个引人入胜的话题，整个社区都沉浸于讨论之中。
     nice_share:
       name: 不错的分享
       description: 分享了一个有 25 个独立访问者的帖子
@@ -3902,7 +3988,7 @@ zh_CN:
       name: 推广者
       description: 已邀请了 1 个用户
       long_description: |
-        该徽章授予给邀请他人加入社区的你。你曾使用了用户页面的邀请按钮或主题底部的邀请按钮。邀请对某个讨论感兴趣的朋友是引介新人的好办法，非常感谢！
+        该徽章授予给邀请他人加入社区的你。你曾使用了用户页面的邀请按钮或话题底部的邀请按钮。邀请对某个讨论感兴趣的朋友是引介新人的好办法，非常感谢！
     campaigner:
       name: 活动家
       description: 已邀请了 3 个初级用户
@@ -3917,17 +4003,17 @@ zh_CN:
       name: 首次分享
       description: 已分享了一个帖子
       long_description: |
-        该徽章授予给第一次用分享按钮分享了回复或者主题的链接的成员。分享链接是一个极好的方式向外部世界展示有趣的讨论的方法，并且能推动社区增长。
+        该徽章授予给第一次用分享按钮分享了回复或者话题的链接的成员。分享链接是一个极好的方式向外部世界展示有趣的讨论的方法，并且能推动社区增长。
     first_link:
       name: 首个链接
-      description: 已链接了另一个主题
+      description: 已链接了另一个话题
       long_description: |
-        该徽章授予给第一次链接到另一个主题的你。联结主题会在各个主题的右侧显示链接和标题，这可以帮助阅读者迅速地找到相关讨论。多链接一些主题吧！
+        该徽章授予给第一次链接到另一个话题的你。联结话题会在各个话题的右侧显示链接和标题，这可以帮助阅读者迅速地找到相关讨论。多链接一些话题吧！
     first_quote:
       name: 首次引用
       description: 已引用过一个帖子
       long_description: |
-        该徽章授予给第一次在回复中引用帖子的你。在你的回复中引用之前帖子中的相关的部分将把主题关联在一起并切题。只要选中别的帖子中的任何文字，然后点击回复按钮将可以引用啦。多引用一些吧！
+        该徽章授予给第一次在回复中引用帖子的你。在你的回复中引用之前帖子中的相关的部分将把话题关联在一起并切题。只要选中别的帖子中的任何文字，然后点击回复按钮将可以引用啦。多引用一些吧！
     read_guidelines:
       name: 阅读指引
       description: 阅读<a href="%{base_uri}/guidelines">社区指引</a>
@@ -3935,9 +4021,9 @@ zh_CN:
         该徽章授予给<a href="%{base_uri}/guidelines">阅读了社区指引</a>的你。遵守和分享简单的指引能让我们打造一个稳定、有趣和可持续的社区。永远记住别人，一个和你有很多共同点的人，就在屏幕的那一侧。友好一些！
     reader:
       name: 读者
-      description: 阅读了有至少 100 个回复的主题中的所有回复
+      description: 阅读了有至少 100 个回复的话题中的所有回复
       long_description: |
-        该徽章授予给第一次阅读了超过 100 个回复的长主题的你。仔细地阅读对话内容能让你关注到讨论的中心，理解不同的观点，而且能帮助我们打造更有趣的对话情景。你读得越多，对话的效果就会越好。就如我们常说的那般，阅读是最重要的！ :slight_smile:
+        该徽章授予给第一次阅读了超过 100 个回复的长话题的你。仔细地阅读对话内容能让你关注到讨论的中心，理解不同的观点，而且能帮助我们打造更有趣的对话情景。你读得越多，对话的效果就会越好。就如我们常说的那般，阅读是最重要的！ :slight_smile:
     popular_link:
       name: 流行链接
       description: 分享的链接被点击了 50 次
@@ -4047,7 +4133,7 @@ zh_CN:
     email_input: "管理员邮件"
     submit_button: "发送邮件"
   performance_report:
-    initial_post_raw: 这个主题将用来展示网站每日性能报告。
+    initial_post_raw: 这个话题将用来展示网站每日性能报告。
     initial_topic_title: 网站性能报告
   tags:
     title: "标签"
@@ -4065,10 +4151,10 @@ zh_CN:
       synonym: '不允许使用同义词。使用“ %{tag_name}”代替。'
       has_synonyms: '无法使用“ %{tag_name}”，因为有同义词。'
     required_tags_from_group:
-      other: "你必须选择至少%{count}个%{tag_group_name}标签。"
+      other: "你必须至少包括 %{count} %{tag_group_name} 标签。该组中的标签为：%{tags}。"
     invalid_target_tag: "不能是同义词的同义词"
     synonyms_exist: "存在同义词时不允许"
-  rss_by_tag: "主题标签 %{tag}"
+  rss_by_tag: "话题标签 %{tag}"
   finish_installation:
     congratulations: "祝贺，你已经安装好了 Discourse！"
     register:
@@ -4087,7 +4173,7 @@ zh_CN:
     description: "安全模式让你的站点不载入插件或站点自定义设置。"
     no_customizations: "禁用当前主题"
     only_official: "禁用非官方插件"
-    no_plugins: "禁用所以插件"
+    no_plugins: "禁用所有插件"
     enter: "进入安全模式"
     must_select: "你必须选择至少一个选项以进入安全模式。"
   wizard:
@@ -4113,13 +4199,13 @@ zh_CN:
             placeholder: "有史以来最好的社区"
       introduction:
         title: "介绍"
-        disabled: "<p>我们找不到任何标题为“%{topic_title}”的主题。</p> <ul> <li>如果你更改了标题，请修改该主题以修改你网站的介绍。</li> <li>如果你已删除此主题，请创建另一个主题为“%{topic_title}”作为标题。 第一篇文章的内容是你网站的介绍。</li> </ul>"
+        disabled: "<p>我们找不到任何标题为“%{topic_title}”的话题。</p> <ul> <li>如果你更改了标题，请修改该话题以修改你网站的介绍。</li> <li>如果你已删除此话题，请创建另一个话题为“%{topic_title}”作为标题。 第一篇文章的内容是你网站的介绍。</li> </ul>"
         fields:
           welcome:
-            label: "欢迎主题"
-            description: "<p>你如何向一个在电梯里的陌生人用一分钟时间介绍你的社区？</p> <ul> <li>谁会参与讨论？</li> <li>我在这里能找到些什么？</li> <li>为什么我要来这里？</li> </ul> <p>你的欢迎主题是初来者首先所需要阅读的。 把它当成你的 <b>一句话</b> '电梯游说' 或 ' 使命陈述'。 </p>"
+            label: "欢迎话题"
+            description: "<p>你如何向一个在电梯里的陌生人用一分钟时间介绍你的社区？</p> <ul> <li>谁会参与讨论？</li> <li>我在这里能找到些什么？</li> <li>为什么我要来这里？</li> </ul> <p>你的欢迎话题是初来者首先所需要阅读的。 把它当成你的 <b>一句话</b> '电梯游说' 或 ' 使命陈述'。 </p>"
             one_paragraph: "请限制你的欢迎私信至一段话。"
-            extra_description: "如果你不确定，可以跳过此步骤，稍后编辑你的欢迎主题。"
+            extra_description: "如果你不确定，可以跳过此步骤，稍后编辑你的欢迎话题。"
       privacy:
         title: "访问"
         description: "<p>你的社区对所有人开放，还在是限制会员、邀请或审批？你可以随意设置为私有的然后切换到公开的。</p>"
@@ -4157,7 +4243,7 @@ zh_CN:
             description: "所有Discourse自动发送的消息将以该用户的名义发送，比如标志警告和备份完成通知。"
       corporate:
         title: "组织"
-        description: "此信息将输入你的<a href='%{base_path}/tos' target='blank'>服务条款</a>，这是你可以在员工类别中编辑的主题。如果你没有公司，现在可跳过此步骤。"
+        description: "此信息将输入你的<a href='%{base_path}/tos' target='blank'>服务条款</a>，这是你可以在员工类别中编辑的话题。如果你没有公司，现在可跳过此步骤。"
         fields:
           company_name:
             label: "公司名"
@@ -4198,37 +4284,34 @@ zh_CN:
             label: "大图标"
             description: "用于在现代设备上代表您的网站的图标图像，在较大尺寸的情况下表现出色。推荐尺寸大于512 × 512。我们默认会使用正方形的标志。"
       homepage:
-        description: "我们建议你在主页显示最新主题，但你喜欢的话也可以选择将分类（主题的分组）显示在主页。"
+        description: "我们建议你在主页显示最新话题，但你喜欢的话也可以选择将分类（话题的分组）显示在主页。"
         title: "主页"
         fields:
           homepage_style:
             choices:
               latest:
-                label: "最新主题"
+                label: "最新话题"
               categories_only:
                 label: "仅分类"
               categories_with_featured_topics:
-                label: "有推荐主题的分类"
+                label: "有推荐话题的分类"
               categories_and_latest_topics:
-                label: "分类和最新主题"
+                label: "分类和最新话题"
               categories_and_top_topics:
-                label: "分类和最热主题"
+                label: "分类和最热话题"
               categories_boxes:
                 label: "分类框"
               categories_boxes_with_topics:
-                label: "分类框和主题"
-      emoji:
-        title: "Emoji"
-        description: "你想使用哪种样式的表情符号？你可以以后在\"管理员/定制/表情符号（Emoji）\"界面增加更多定制的表情符号。"
+                label: "分类框和话题"
       invites:
         title: "邀请管理人员"
-        description: "你快做完啦！让我们邀请一些工作人员来帮助你创建一些有趣的主题和回复来<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>启动你的讨论</a>以开始社区之旅。"
+        description: "你快做完啦！让我们邀请一些工作人员来帮助你创建一些有趣的话题和回复来<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>启动你的讨论</a>以开始社区之旅。"
         disabled: "由于禁用了本地登录，因此无法向任何人发送邀请。请继续下一步。"
       finished:
         title: "你的 Discourse 已经准备就绪！"
         description: |
           <p>如果你想，可以<b>随时重新运行这个向导</b>，或访问 <a href='%{base_path}/admin' target='_blank'>你的管理部分</a>；在站点菜单中的扳手图标旁边找到它。</p>
-          <p>使用我们强大的主题系统，可以更轻松地自定义你的 Discourse。例如，在 <a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a>上查看 <a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">顶级主题和组件</a> 。</p>
+          <p>使用我们强大的话题系统，可以更轻松地自定义你的 Discourse。例如，在 <a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a>上查看 <a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">顶级话题和组件</a> 。</p>
           <p>祝你愉快，祝你好运 <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>建立新社区！</a></p>
   search_logs:
     graph_title: "搜索计数"
@@ -4242,7 +4325,7 @@ zh_CN:
       posted: '%{username}在“%{topic}”中发布了帖子 - %{site_title}'
       private_message: '%{username}在“%{topic}”中给你发送了一个私信 - %{site_title}'
       linked: '%{username}在“%{topic}”中链接了你的帖子 - %{site_title}'
-      watching_first_post: '%{username}创建一个新的主题“%{topic}”-%{site_title}'
+      watching_first_post: '%{username}创建一个新的话题“%{topic}”-%{site_title}'
       confirm_title: "通知已启用 - %{site_title}"
       confirm_body: "成功！通知已启用。"
       custom: "来自%{username} on %{site_title}的通知"
@@ -4259,6 +4342,7 @@ zh_CN:
       restored: 已恢复
   reviewables:
     already_handled: "谢谢，但我们已经审查了那篇文章，并确定它不需要再次标记。"
+    already_handled_and_user_not_exist: "谢谢，但是已经有人审核过，该用户不再存在。"
     priorities:
       low: "低"
       medium: "中"
@@ -4275,18 +4359,19 @@ zh_CN:
     reasons:
       post_count: "所有用户的头几个帖子必须由管理员批准。参阅`approve_post_count`。"
       trust_level: "低信任等级用户必须有回复被管理员批准。参阅`approve_unless_trust_level`。"
-      new_topics_unless_trust_level: "低信任等级用户必须有主题被管理员批准。参阅`approve_new_topics_unless_trust_level`。"
+      new_topics_unless_trust_level: "低信任等级用户必须有话题被管理员批准。参阅`approve_new_topics_unless_trust_level`。"
       fast_typer: "新用户输入第一个帖子的速度快得可疑，怀疑是机器人或垃圾制造者所为。参阅`min_firse_post_typing_time`。"
-      auto_silence_regexp: "新用户的首个帖子符合`auto_silence_first_post_regex`设置。"
-      watched_word: "此帖子包含一个敏感词。参阅<a href='%{base_url}/admin/logs/watched_words'>敏感词列表</a>"
-      staged: "暂存用户的新主题和帖子必须由管理员批准。参阅`approve_unless_staged`。"
+      auto_silence_regexp: "新用户的首个帖子符合 `auto_silence_first_post_regex` 设置。"
+      watched_word: "此帖子包含敏感词，参阅<a href='%{base_url}/admin/customize/watched_words'>敏感词列表</a>。"
+      staged: "暂存用户的新话题和帖子必须由管理员批准。参阅`approve_unless_staged`。"
       category: "此分类的帖子需要管理员批准。查看分类设置。"
       must_approve_users: "所有新用户需由管理员批准。参阅`must_approve_users`。"
       invite_only: "所有新用户应该是被邀请的。参阅`invite_only`。"
       email_auth_res_enqueue: "此电子邮件未通过DMARC检查，很可能不是来自其所声称的来源。检查原始电子邮件的标头以获取更多信息。"
       email_spam: "该电子邮件被`email_in_spam_header`中定义的标头标记为垃圾邮件。"
-      suspect_user: "这位新用户输入的个人资料信息但没有阅读任何主题或帖子，意味着他可能是垃圾发送者。参见`approve_suspect_users`。"
+      suspect_user: "这位新用户输入的个人资料信息但没有阅读任何话题或帖子，意味着他可能是垃圾发送者。参见`approve_suspect_users`。"
       contains_media: "该帖包括嵌入式媒体。参见`review_media_unless_trust_level`。"
+      queued_by_staff: "一名管理员认为该帖子需要审查。在此之前，它将一直保持隐藏状态。"
     actions:
       agree:
         title: "同意......"
@@ -4310,25 +4395,25 @@ zh_CN:
         description: "隐藏帖子并自动发送私信给作者使其修改"
       delete_spammer:
         title: "删除垃圾发布者"
-        description: "清除这个用户与其所有主题帖子。"
-        confirm: "你确定要删除这个用户的所有帖子和主题并且屏蔽其IP和电子邮件地址吗？"
+        description: "清除这个用户与其所有话题帖子。"
+        confirm: "你确定要删除这个用户的所有帖子和话题并且屏蔽其IP和电子邮件地址吗？"
       delete_single:
         title: "删除"
       delete:
         title: "删除......"
       delete_and_ignore:
         title: "删除帖子并忽视"
-        description: "删除此帖；如果这是这个主题内的第一篇帖子则删除主题"
+        description: "删除此帖；如果这是这个话题内的第一篇帖子则删除话题"
       delete_and_ignore_replies:
         title: "删除帖子和回复并忽视"
-        description: "删除帖子和其所有的回复；如果是第一个帖子则删除整个主题。"
+        description: "删除帖子和其所有的回复；如果是第一个帖子则删除整个话题。"
         confirm: "你确定要删除帖子的这个回复吗"
       delete_and_agree:
         title: "删除帖子并同意"
-        description: "删除此帖；如果这是这个主题内的第一篇帖子则删除主题"
+        description: "删除此帖；如果这是这个话题内的第一篇帖子则删除话题"
       delete_and_agree_replies:
         title: "删除帖子+回复并同意"
-        description: "删除帖子和其所有的回复；如果是第一个帖子则删除整个主题。"
+        description: "删除帖子和其所有的回复；如果是第一个帖子则删除整个话题。"
         confirm: "你确定要删除帖子的这个回复吗"
       disagree_and_restore:
         title: "不同意并恢复帖子"
@@ -4341,7 +4426,7 @@ zh_CN:
         title: "批准"
       approve_post:
         title: "批准帖子"
-        confirm_closed: "此主题已关闭。你真的要创建帖子吗？"
+        confirm_closed: "此话题已关闭。你真的要创建帖子吗？"
       reject_post:
         title: "否决帖子"
       approve_user:
@@ -4356,6 +4441,17 @@ zh_CN:
           description: "这名用户将会被删除，我们会屏蔽其IP和电子邮件地址。"
       reject:
         title: "否决"
+        bundle_title: "拒绝..."
+      reject_and_suspend:
+        title: "拒绝并暂停用户"
+      reject_and_silence:
+        title: "拒绝并禁言用户"
+      reject_and_delete:
+        title: "拒绝并删除帖子"
+      reject_and_keep_deleted:
+        title: "保持帖子删除"
+      approve_and_restore:
+        title: "批准并恢复帖子"
       delete_user:
         title: "删除用户"
         confirm: "你确定要删除这个用户吗？这将删除用户的所有帖子并封禁这个邮箱和 IP 地址。"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index c7af0e91ef..ca643bde6d 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -39,6 +39,7 @@ zh_TW:
   title: "論壇"
   topics: "討論話題"
   posts: "貼文"
+  views: "瀏覽"
   loading: "載入中"
   powered_by_html: 'Powered by <a href="https://www.discourse.org">Discourse</a>, 建議開啟 JavaScript 瀏覽'
   sign_up: "註冊"
@@ -50,6 +51,8 @@ zh_TW:
   remove_posts_deleted_by_author: "已由作者刪除"
   redirect_warning: "我們無法確認您選擇的連結是否已被發送到論壇上，若您想繼續此動作，選擇以下的連結。"
   on_another_topic: "在另一個話題中"
+  inline_oneboxer:
+    topic_page_title_post_number_by_user: "#%{post_number} %{username}"
   themes:
     bad_color_scheme: "無法更新佈景主題，無效的調色盤"
     other_error: "更新佈景主題時發生了錯誤"
@@ -164,9 +167,10 @@ zh_TW:
       s3_bucket_reused: "不能把同一個 Amazon bucket 同時使用 ‘s3_upload_bucket’ 及 ‘s3_backup_bucket’。請選擇不同的 bucket 或指定將每個 bucket 設定不同的路徑。"
     conflicting_google_user_id: '此 Google 帳戶 ID 出於安全原因已更改，請聯絡管理人員並將其<br><a href="https://meta.discourse.org/t/76575">指向 https://meta.discourse.org/t/76575 </a>'
   invite:
-    error_message: "接受邀請時發生問題，請聯絡網站管理員。"
     user_exists: "無需邀請 <b>%{email}</b>，他 <a href='%{base_path}/u/%{username}/summary'>已經有帳號了</a>！"
     confirm_email: "<p>快完成了！我們發送了一封啟用帳號郵件到你的信箱。請按照信件中的步驟來啟用你的帳號。</p><p>如果你沒有收到郵件，請檢查你的垃圾郵件\\b匣。"
+    disabled_errors:
+      invalid_access: "你不允許查看所請求的資源。"
   bulk_invite:
     file_should_be_csv: "上傳的檔案必須是 CSV 格式。"
     error: "上傳檔案有錯誤，請再試一次。"
@@ -218,6 +222,8 @@ zh_TW:
     in_reply_to: "▶ %{username}"
     replies:
       other: "%{count}個回覆"
+    likes:
+      other: "%{count}個讚"
     created: "已建立"
   no_mentions_allowed: "抱歉，您無法提及其他使用者。"
   too_many_mentions:
@@ -250,6 +256,8 @@ zh_TW:
   topics_in_category: "分類 '%{category}' 中的討論話題"
   rss_posts_in_topic: "'%{topic}' 的 RSS feed"
   rss_topics_in_category: "分類 '%{category}' 中討論話題的 RSS feed"
+  rss_num_posts:
+    other: "%{count} 則貼文"
   read_full_topic: "閱讀整個話題"
   private_message_abbrev: "消息"
   rss_description:
@@ -279,6 +287,7 @@ zh_TW:
       tomorrow: "明天"
       next_week: "下週"
       next_month: "下個月"
+      custom: "自定義日期和時間"
   groups:
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' 不是有效的信任層級。"
@@ -306,26 +315,6 @@ zh_TW:
   education:
     until_posts:
       other: "%{count} 篇貼文"
-    "new-topic": |
-      歡迎來到%{site_name} &mdash; **衷心感謝你參與討論！**
-
-      - 標題是否清晰明了地描述了主題？看起來有意思麼？
-
-      - 誰會感興趣？它為什麼重要？你期望從社區中獲得什麼樣的回應？
-
-      - 選擇恰當的詞句以便別人能找到你的主題。若想要給主題分組，選擇一個分類。
-
-      更多的幫助信息，[請查看我們的社群準則](%{base_path}/guidelines)。此信息面板只在你發佈前 %{education_posts_text}時顯示。
-    "new-reply": |
-      歡迎來到 %{site_name} — **感謝你的參與！**
-
-      - 你的回應是否以某些方式改善了討論？
-
-      - 務必尊重所有社群成員。
-
-      - 歡迎有建設性的評論，但論述時請針對觀點，而別針對個人。
-
-      [請查看我們的社群守則](%{base_path}/guidelines)以進一步了解。（此訊息只會在你發表 %{education_posts_text} 時顯示）
     avatar: |
       ### 來個大頭貼吧！
 
@@ -518,20 +507,8 @@ zh_TW:
     slow_down: "您已重複此動作太多次，請稍後再重試。"
     too_many_requests: "您已重複此動作太多次，請稍後再重試。"
     by_type:
-      first_day_replies_per_day: "您已到達新使用者在第一天建立帳號時的回覆數量上限，請等待%{time_left}後重試。"
-      first_day_topics_per_day: "您已到達新使用者在第一天建立帳號時的話題數量，請等待%{time_left}後重試。"
-      create_topic: "\\b您建立話題的速度過快，請等%{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:
@@ -743,9 +720,7 @@ zh_TW:
     mute_topic: "關閉此主題的所有通知，%{link}"
     unwatch_category: "停止監看%{category}分類中的所有主題"
     mailing_list_mode: "停用郵件列表模式"
-    all: "不要從%{sitename}給我發送任何郵件"
     different_user_description: "你登錄的帳戶與郵件不符。請登出，或進入隱私模式，然後再重試。"
-    not_found_description: "對不起，我們找不到這個退訂連結。有可能你的郵件中的連結已經過期？"
     log_out: "退出"
     submit: "儲存偏好設定"
     digest_frequency:
@@ -909,6 +884,7 @@ zh_TW:
       labels:
         level: 等級
       description: "按信任層級分類的使用者數"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "每個類型的使用者"
       xaxis: "類型"
@@ -1139,10 +1115,8 @@ zh_TW:
     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: "使用者再次發表包含相同內容貼文的間隔時間"
@@ -1151,7 +1125,6 @@ zh_TW:
     site_description: "用一句話描述這個網站，用於 meta description 標籤。"
     short_site_description: "簡短描述，用於網頁標題。"
     contact_email: "站長的聯絡方式，只適用於緊急事項通知，如未處理的標記，以及作為 <a href='%{base_path}/about' target='_blank'>/about </a>頁面中的緊急聯絡人。"
-    contact_url: "此網站的聯絡網址。用於緊急事項的<a href='%{base_path}/about' target='_blank'>/about</a>聯絡人表單。"
     crawl_images: "允許從第三方 URL 取得圖片，來加入寬和高的數值"
     download_remote_images_to_local: "下載外部鏈接的圖片到本機；以防圖片損壞。"
     download_remote_images_threshold: "可用來下載外部圖片到本機最少的空間（百分比）"
@@ -1173,6 +1146,8 @@ zh_TW:
     show_pinned_excerpt_mobile: "在行動版置頂主題顯示摘要。"
     show_pinned_excerpt_desktop: "在桌面版置頂主題顯示摘要。"
     post_onebox_maxlength: "展開連結預覽後的 Discourse 貼文最大字數限制。"
+    blocked_onebox_domains: "不會展開成連結預覽的網域列表。"
+    allowed_inline_onebox_domains: "如果連結未包含 title，會被展開成連結預覽的網域白名單。"
     max_oneboxes_per_post: "貼文中允許的連結預覽數量上限。"
     logo: "網站左上角的Logo圖片，圖片高為120、寬高比大於3：1的寬矩形比例。 如果沒有設定 Logo，將顯示網站標題。"
     logo_small: "當你滾動頁面往下滑時，可看見在網站左上角的 Logo圖片，Logo 應為正方形 120x120尺寸。若無設定Logo，將顯示主頁圖片。"
@@ -1188,7 +1163,6 @@ zh_TW:
     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>"
     force_https: "強制使用 https。警告：開啟前必須確認 HTTPS 已經配置並能夠正常使用！你檢查了 CDN、第三方登錄和站外的 logo / 依賴是否支持 HTTPS 了嗎？"
-    same_site_cookies: "使用同一網站的Cookie，它們消除所有載體上支持的瀏覽器（LAX或嚴格模式）跨站請求偽造。警告：嚴格只會在強制登錄和使用SSO的網站執行。"
     summary_score_threshold: "將一個貼文包含在“概括主題”中所需的最少分數"
     summary_percent_filter: "當使用者點擊 \"此話題的摘要\"，顯示前面多少 % 的貼文"
     summary_max_results: "“概括主題”將顯示最大貼文數量"
@@ -1221,7 +1195,11 @@ zh_TW:
     maximum_session_age: "使用者自訪問後可維持登錄 n 小時"
     enable_escaped_fragments: "如未偵測到爬蟲，將會使用 Google Ajax-Crawling API。參閱<a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     cors_origins: "允許跨來源資源共享（CORS）。每個來源必須包括 http:// 或 https://。DISCOURSE_ENABLE_CORS 環境選項必須設置為 true 才能啟用 CORS 。"
+    use_admin_ip_allowlist: "當目前的IP剛好處于IP段禁止名單(Admin > Logs > Screened Ips)中的時候，只有管理員才可登入。"
+    blocked_ip_blocks: "Discourse 將不會使用爬蟲爬私人IP黑名單清單。"
+    allowed_internal_hosts: "Discourse 可以安全抓取以用於 Onebox 與其他用途的內部主機列表"
     allowed_iframes: "允許 Discourse 可以在貼文中安全發布含有 iframe 及 src 網域前綴列表"
+    allowed_crawler_user_agents: "使用者代理（User Agents）的網路爬蟲（Web Crawlers）將允許存取網站。警告！設置此將取消未列出的所有網路爬蟲者（Web Crawlers）"
     slow_down_crawler_user_agents: "網路爬蟲的使用者代理，應使用 Crawl-delay 指令在 robots.txt 中進行速率限制"
     slow_down_crawler_rate: "如果指定了slow_down_crawler_user_agents，則此速率將適用於所有抓取工具（請求之間的延遲秒數）"
     content_security_policy: "啟用內容安全性政策"
@@ -1251,6 +1229,8 @@ zh_TW:
     email_token_valid_hours: "\"忘記密碼\" / \"重啟帳號\" token 有效的小時數 (n)"
     enable_badges: "啟用勳章系統"
     enable_whispers: "允許工作人員在主題中私密交流。"
+    blocked_email_domains: "用管道符“|”分隔的郵箱域名黑名單列表，其中的域名將不能用來註冊賬戶，例如：mailinator.com|trashmail.net"
+    allowed_email_domains: "用管道符“|”分隔的電子郵箱域名的列表，使用者必須使用這些郵箱域名註冊。警告：使用者使用不包含在這個列表裡的郵箱域名，將無法成功註冊。"
     hide_email_address_taken: "註冊或忘記密碼時，不提示使用者帳號、Email 已存在"
     log_out_strict: "登出時，登出使用者所有設備上的所有時段"
     version_checks: "當 Discourse 有推新的版本需要更新時，顯示在 <a href='%{base_path}/admin' target='_blank'>/admin/</a>Dashboard 上以提示管理員"
@@ -1266,19 +1246,7 @@ zh_TW:
     min_admin_password_length: "管理員最短密碼長度"
     password_unique_characters: "密碼必須包含英文字"
     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 endpoint 必須設定 sso_secret 以實現 Discourse SSO 提供方協定"
-    sso_url: "SSO URL endpoint (必須包含 http:// 或 https://)"
-    sso_secret: "秘密字符串，用於驗證秘密的 SSO 訊息，請確保由 10 個字或以上組成"
-    sso_overrides_bio: "在使用者頁面中覆蓋使用者的個人信息並禁止使用者修改"
-    sso_overrides_groups: "將所有手動群組成員與 SSO 内容中指定的群組同步（警告：如果不指定群組，所有手動群組成員資格將被使用者清除）"
-    sso_overrides_avatar: "用 SSO payload 中的外部網站的大頭貼覆蓋使用者大頭貼。如果啟用，使用者將被禁用在 Discourse 上傳大頭貼。"
-    sso_overrides_profile_background: "從 SSO payload 覆蓋使用者個人資料的背景及外部網站大頭貼。"
-    sso_overrides_card_background: "從 SSO payload 覆蓋使用者卡片的背景及外部網站大頭貼。"
-    sso_not_approved_url: "重定向未受許可的單點登錄賬號至這個 URL"
-    sso_allows_all_return_paths: "不限制 SSO 提供的 return_paths 中的域名（預設情況下返回地址必須位於當前站點）"
-    enable_local_logins: "開啟 本地端（Local）使用者名稱和密碼以登入。 必須啟用此選項才能使邀請生效。 警告：如果禁用，如果之前未配置至少一種備用登入方法，則可能無法登入"
+    discourse_connect_overrides_bio: "在使用者頁面中覆蓋使用者的個人信息並禁止使用者修改"
     enable_local_logins_via_email: "允許使用者用電子郵件來快速登入，Email內會包含一鍵登入連結。"
     allow_new_registrations: "允許新使用者註冊，如果取消選取，則沒有人能夠註冊"
     enable_signup_cta: "顯示推薦創建賬戶的提示給那些回訪的未註冊使用者。"
@@ -1312,7 +1280,6 @@ zh_TW:
     top_topics_formula_log_views_multiplier: "熱門主題公式中訪問次數因子的值（n）：`log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_first_post_likes_multiplier: "熱門主題公式中首貼讚的數量的因子的值（n）：`log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "熱門主題公式中贊和貼文數量的比例的最小值（n）：`log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "每 15 分鐘重制老貼文的數量。"
     enable_safe_mode: "允許使用者進入安全模式以偵錯插件（plugins）。"
     rate_limit_create_topic: "建立新討論話題之後，使用者必須間隔多少秒 (n) 才能再建立新討論話題"
     rate_limit_create_post: "建立新貼文之後，使用者必須間隔多少秒 (n) 才能再建立新貼文"
@@ -1327,8 +1294,6 @@ zh_TW:
     max_topic_invitations_per_day: "每個使用者每天能創建的邀請至主題數量的最大值。"
     max_logins_per_ip_per_hour: "每小時每個 IP 可登入的次數上限"
     max_logins_per_ip_per_minute: "每分鐘每個 IP 可登入的次數上限"
-    max_post_deletions_per_minute: "每分鐘每個使用者可刪除的貼文數上限"
-    max_post_deletions_per_day: "每日每個使用者可刪除的貼文數上限"
     alert_admins_if_errors_per_minute: "觸發管理員警示的每分鐘錯誤數量。設為 0 會停用這個功能。注意：需要重啟。"
     alert_admins_if_errors_per_hour: "觸發管理員警示的每小時錯誤數量。設為 0 會停用這個功能。注意：需要重新啟動。"
     suggested_topics: "討論話題下的推薦話題數量"
@@ -1358,7 +1323,6 @@ zh_TW:
     strip_image_metadata: "去除圖片EXIF資訊（Image Metadata）"
     min_ratio_to_crop: "用於裁剪高圖片的比例，輸入寬度/高度將輸出結果。"
     simultaneous_uploads: "可以在編輯器中拖曳的最大檔案數量"
-    enable_flash_video_onebox: "在連結預覽中啟用 swf 和 flv (Adobe Flash) 嵌入。警告：可能增加安全風險。"
     default_invitee_trust_level: "預設的受邀使用者等級 (0-4)"
     default_trust_level: "所有新使用者的預設信任等級（0-4）。警告！改變此項將提高廣告氾濫的風險。"
     tl1_requires_topics_entered: "新使用者升級到信任等級1所需要進入的主題數量。"
@@ -1394,6 +1358,7 @@ zh_TW:
     min_trust_to_send_messages: "建立新個人訊息所需的最低信任等級"
     min_trust_to_flag_posts: "投訴話題所需的最低信任等級"
     min_trust_to_post_links: "在貼文中加入連結的最低信任等級需求"
+    allowed_link_domains: "使用者可能會連結到的網域（Domains），即使他們沒有適當的信任等級來發布貼文連結"
     newuser_max_links: "新使用者可添加多少連結於一篇貼文中"
     newuser_max_attachments: "新使用者可添加多少附件於一篇貼文中"
     newuser_max_mentions_per_post: "新使用者可以在一個貼文裡使用@name提及的最大數量。"
@@ -1416,6 +1381,7 @@ zh_TW:
     desktop_category_page_style: "/categories 頁面的視覺樣式。"
     category_colors: "設定分類顏色的十六進制色彩值列表。"
     category_style: "分類圖標的視覺樣式。"
+    dark_mode_none: "無"
     max_attachment_size_kb: "允許使用者上傳的最大文件大小（以kB為單位）。確保也在nginx（client_max_body_size），apache 或代理中進行限制文件大小的設定。"
     authorized_extensions: "允許上傳文件的副檔名列表（'*' 表示允許所有文件類型）"
     authorized_extensions_for_staff: "除了在“authorized_extensions” 可以設定網站可允許上傳副檔名的清單之外，也允許管理員（有權限的員工）為使用者上載檔案副檔名清單。（使用 星字號 * 以啟用所有檔案類型）"
@@ -1439,6 +1405,7 @@ zh_TW:
     privacy_policy_url: "如果你想要使用一個部署在某個地方的隱私政策文檔，那麼請在此填寫其完整URL地址。"
     log_anonymizer_details: "是否在匿名後將使用者的詳細資訊保留在系統日誌（log）中。 若網站遵守一般資料保護規範（GDPR）時，您需要關閉它。"
     newuser_spam_host_threshold: "新使用者能添加至指向同一主機的連結的 newuser_spam_host_threshold 次數。超過閾值後將使用者視為垃圾投遞者。"
+    allowed_spam_host_domains: "域名的白名單列表，新使用者可以任意連結到這些主機，而不會因防止廣告的測試過濾被檔下"
     topic_view_duration_hours: "按照每 IP/使用者每 N 小時來記錄一次新的主題訪問"
     user_profile_view_duration_hours: "按照每 IP/使用者每 N 小時來記錄使用者資料訪問數"
     levenshtein_distance_spammer_emails: "當比對廣告Email時，數字與文字將仍使用模糊比對"
@@ -1472,6 +1439,7 @@ zh_TW:
     max_emails_per_day_per_user: "每日發送給使用者的最大貼文數量。設置為 0 禁止限制"
     enable_staged_users: "處理進站郵件時自動創建暫存使用者。"
     maximum_staged_users_per_email: "處理進站郵件時可創建的最大暫存使用者量。"
+    auto_generated_allowlist: "不會被檢查是否是自動生成內容的郵件地址列表。例如：foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "阻止被檢測為自動生成的進站郵件。"
     ignore_by_title: "使用正則表達式根據標題忽略進站郵件。"
     mailgun_api_key: "用來驗證 webhook 訊息 Mailgun API 密鑰。"
@@ -1535,6 +1503,7 @@ zh_TW:
     ignored_users_count_message_threshold: "如果特定使用者被這麽多的其他使用者忽略，則通知版主。"
     ignored_users_message_gap_days: "被許多使用者忽略的使用者，再次通知版主此事件需要等待的時間。"
     clean_up_inactive_users_after_days: "刪除尚未認證電子郵件的使用者（沒有發表任何討論主題、信任級別為0）之前的天數。要禁用自動刪除，請設定為0。"
+    allowed_user_website_domains: "使用者網站要屬於這些域名中。用 | 分割。"
     allow_profile_backgrounds: "允許使用者上傳個人檔案背景圖片"
     sequential_replies_threshold: "在被提醒回覆了太多連續的回覆前，使用者在主題中可以連續回覆的貼文的數量。"
     get_a_room_threshold: "在收到警告之前，使用者必須向同一主題中的同一個人發佈的討論話題數。"
@@ -1564,6 +1533,7 @@ zh_TW:
     highlighted_languages: "已包含語法突顯（Syntax Highlighting）規則。（警告：包含太多語言可能會影響論壇效能）請參閱：<a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a>看更多範例。"
     embed_truncate: "截斷 embed 過的貼文"
     embed_support_markdown: "支持嵌入式討論話題的Markdown格式"
+    allowed_embed_selectors: "在 embeds 頁面允許 CSS 元素以逗號分隔清單"
     allowed_href_schemes: "除了 http 和 https 外允許的連結協議。"
     embed_post_limit: "貼文內 embed 的最大數量"
     embed_username_required: "創建主題需要使用者名。"
@@ -1571,7 +1541,6 @@ zh_TW:
     show_create_topics_notice: "如果網站的公開討論話題少於 5 個，顯示通知要求管理員建立一些討論話題。"
     delete_drafts_older_than_n_days: "刪除超過 n 天得草稿。"
     bootstrap_mode_min_users: "禁用摘要模式的使用者數下限（0 為禁用）。"
-    prevent_anons_from_downloading_files: "禁止匿名使用者下載附件。警告：這將禁止他們訪問任何發表在貼文中的非圖片資源。"
     slug_generation_method: "選擇一個連結生成方式。“encoded”將生成以百分號編碼的連結。“none”將禁用自定義連結，只生成預設連結。"
     enable_emoji: "啟用表情符號"
     enable_emoji_shortcuts: "常見的顏文字，例如：「 :)、:p、:( 」，將轉換為表情符號"
@@ -1597,7 +1566,6 @@ zh_TW:
     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: "近期主題條件的全局預設設置"
@@ -1618,7 +1586,6 @@ zh_TW:
     retry_web_hook_events: "自動重試失敗的Web hook事件，最大重試為4次。 重試之間的時間間隔為1、5、25及125分鐘"
     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: "允許身份驗證URL用於導向使用者API 密鑰（Keys），使用星號「*」將代入所有字詞，並找到最適合的配對（例如：www.example.com/*）。"
     allowed_user_api_push_urls: "允許使用伺服器推送至使用者 API 的 URL"
@@ -1627,7 +1594,6 @@ zh_TW:
     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>上的標籤群組列出標籤（Tags）。"
@@ -1670,23 +1636,19 @@ zh_TW:
       email_editable_enabled: "在啟用此設定之前，您必須禁用「電子郵件可編輯」選項"
       staged_users_disabled: "您必須先啟用「暫存使用者（staged users）」，才能啟用此設定"
       reply_by_email_disabled: "在啟用此設定之前，您必須先啟用「通過電子郵件回覆」設定"
-      sso_url_is_empty: "在啟用此設定之前，您必須設定「sso url」"
-      sso_invite_only: "您無法同時啟用sso和邀請"
       enable_local_logins_disabled: "在啟用此設定之前，必須先啟用「啟用本地登入（local logins）」設定。"
       min_username_length_exists: "你不能設比現有使用者名稱短的「最小使用者名稱長度」。"
       min_username_length_range: "您不能將下限設定的高於上限。"
       max_username_length_exists: "您不能設置比現有使用者名稱短的「最大使用者名稱長度」。"
       max_username_length_range: "您不能將上限設定的低於下限。"
       invalid_hex_value: "顏色值必須是6位十六進制代碼（hex codes），例如：紅色，FF0000。"
-      category_search_priority:
-        very_low_weight_invalid: "您不能將權限設定為大於「category_search_priority_low_weight」"
-        low_weight_invalid: "您不能將權限設定為大於、等於1或小於「category_search_priority_very_low_weight」"
-        very_high_weight_invalid: "您不能將權限設定為小於「category_search_priority_high_weight」"
+      allowed_unicode_usernames:
+        regex_invalid: "正則表達式無效：%{error}"
+        leading_trailing_slash: "正則表達式不能以斜杠（/）開頭和結尾"
       unicode_usernames_avatars: "內部系統頭像不支援Unicode使用者名稱"
     placeholder:
-      sso_provider_secrets:
+      discourse_connect_provider_secrets:
         key: "www.範例.com"
-        value: "單一登入服務訊息密鑰"
   search:
     within_post: "#%{post_number} 由 %{username}"
     types:
@@ -1694,7 +1656,7 @@ zh_TW:
       topic: "結果"
       user: "使用者"
     results_page: "「%{term}」的搜尋結果"
-  sso:
+  discourse_connect:
     login_error: "登入錯誤"
     not_found: "無法找到你的賬戶。請聯繫站點管理人員。"
     account_not_approved: "你的帳號尚未被審核通過。一旦你的帳號獲得批准，你就會收到一封電子郵件提醒。"
@@ -1959,25 +1921,11 @@ zh_TW:
     post_hidden_again:
       title: "貼文再次被隱藏"
       subject_template: "因社群成員投訴的關係，貼文已隱藏，已通知管理員。"
+    queued_by_staff:
+      title: "貼文需等待審核"
     flags_agreed_and_post_deleted:
       title: "被投訴貼文已被版主移除"
       subject_template: "被投訴貼文已被版主移除"
-      text_body_template: |
-        您好，
-
-        這是一封由 %{site_name} 系統自動發送的訊息，讓您知道[您的貼文](%{base_url}%{url}) 已被移除。
-
-        %{flag_reason}
-
-        由於該貼文被其他人檢舉，一名工作人員選擇將其刪除。
-
-        [details="點擊展開已移除的貼文"]
-        ``` markdown
-        %{flagged_post_raw_content}
-        ```
-        [/details]
-
-        想知道更多訊息，請查看更多指南 [指南說明](%{base_url}/guidelines)。
     usage_tips:
       text_body_template: |
         提供給新手使用者的操作技巧查看，[部落格文章（英文）](http://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
@@ -2550,16 +2498,9 @@ zh_TW:
     account_suspended:
       title: "帳號被停權"
       subject_template: "[%{email_prefix}] 你的帳號已被停權"
-      text_body_template: "你在論壇已被停權，直到%{suspended_till}。\n\n原因：%{reason}\n \n%{message}\n"
     account_silenced:
       title: "帳號被禁言"
       subject_template: "[%{email_prefix}] 你的帳號已被禁言"
-      text_body_template: |
-        直到%{silenced_till}，你才會被解除禁言狀態。
-
-        原因：%{reason}
-
-        訊息：%{message}
     account_exists:
       title: "帳號已存在"
       subject_template: "[%{email_prefix}] 帳號已存在"
@@ -2632,6 +2573,9 @@ zh_TW:
     confirm_new_email:
       title: "確認新郵件地址"
       subject_template: "[%{email_prefix}] 確認你的新郵件地址"
+    confirm_new_email_via_admin:
+      title: "確認新郵件地址"
+      subject_template: "[%{email_prefix}] 確認你的新郵件地址"
     confirm_old_email:
       title: "確認原郵件地址"
       subject_template: "[%{email_prefix}] 確認你的現行郵件地址"
@@ -2674,6 +2618,8 @@ zh_TW:
       title: "新登入提醒"
       subject_template: "[%{site_name}] 新登入來自%{location}"
       text_body_template: "您好，\n\n我們注意到您從未知的第三方設備登入。\n\n這是你嗎？ \n- 位置：%{location}（%{client_ip}） \n- 瀏覽器：%{browser} \n- 設備：%{device} - %{os}\n\n如果這是你，太棒了！你不需要做任何其他事情。如果這不是您，請[查看帳號個人檔案](%{base_url}/my /preferences/account)，並考慮更改您的密碼。\n"
+    post_approved:
+      title: "你的貼文已通過"
   page_not_found:
     title: "抱歉！這個頁面不存在或者是私密的。"
     popular_topics: "熱門"
@@ -2744,6 +2690,7 @@ zh_TW:
     latte: "棕色"
     summer: "夏季"
     dark_rose: "暗紅"
+    default_theme_name: "預設"
     light_theme_name: "輕亮"
     dark_theme_name: "黑暗"
     neutral_theme_name: "中性"
@@ -3297,6 +3244,12 @@ zh_TW:
           city_for_disputes:
             label: "爭議"
             placeholder: "舊金山，加洲（California）"
+      colors:
+        title: "顏色"
+      fonts:
+        fields:
+          font_preview:
+            label: "預覽"
       logos:
         title: "標誌"
         fields:
@@ -3335,9 +3288,6 @@ zh_TW:
                 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>，好讓您的社群朋友產生興趣並開始回覆。"
diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index 6fd053d5d9..3993ff8cc9 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -29,7 +29,7 @@ map $http_x_forwarded_proto $thescheme {
   https https;
 }
 
-log_format log_discourse '[$time_local] "$http_host" $remote_addr "$request" "$http_user_agent" "$sent_http_x_discourse_route" $status $bytes_sent "$http_referer" $upstream_response_time $request_time "$sent_http_x_discourse_username"';
+log_format log_discourse '[$time_local] "$http_host" $remote_addr "$request" "$http_user_agent" "$sent_http_x_discourse_route" $status $bytes_sent "$http_referer" $upstream_response_time $request_time "$upstream_http_x_discourse_username" "$upstream_http_x_discourse_trackview" "$upstream_http_x_queue_time" "$upstream_http_x_redis_calls" "$upstream_http_x_redis_time" "$upstream_http_x_sql_calls" "$upstream_http_x_sql_time"';
 
 server {
 
@@ -135,6 +135,7 @@ server {
     location ~ ^/javascripts/ {
       expires 1d;
       add_header Cache-Control public,immutable;
+      add_header Access-Control-Allow-Origin *;
     }
 
     location ~ ^/assets/(?<asset_path>.+)$ {
@@ -151,12 +152,14 @@ server {
     location ~ ^/plugins/ {
       expires 1y;
       add_header Cache-Control public,immutable;
+      add_header Access-Control-Allow-Origin *;
     }
 
     # cache emojis
     location ~ /images/emoji/ {
       expires 1y;
       add_header Cache-Control public,immutable;
+      add_header Access-Control-Allow-Origin *;
     }
 
     location ~ ^/uploads/ {
@@ -182,10 +185,12 @@ server {
 
       # custom CSS
       location ~ /stylesheet-cache/ {
+          add_header Access-Control-Allow-Origin *;
           try_files $uri =404;
       }
       # this allows us to bypass rails
       location ~* \.(gif|png|jpg|jpeg|bmp|tif|tiff|ico|webp)$ {
+          add_header Access-Control-Allow-Origin *;
           try_files $uri =404;
       }
       # SVG needs an extra header attached
@@ -193,6 +198,7 @@ server {
       }
       # thumbnails & optimized images
       location ~ /_?optimized/ {
+          add_header Access-Control-Allow-Origin *;
           try_files $uri =404;
       }
 
diff --git a/config/puma.rb b/config/puma.rb
index e237b06d20..12c9886df0 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -15,7 +15,6 @@ if ENV['RAILS_ENV'] == 'production'
   stdout_redirect "#{APP_ROOT}/log/puma.log", "#{APP_ROOT}/log/puma.err.log"
   pidfile "#{APP_ROOT}/tmp/pids/puma.pid"
   state_path "#{APP_ROOT}/tmp/pids/puma.state"
-  daemonize true
   preload_app!
 
 end
diff --git a/config/routes.rb b/config/routes.rb
index 1cd24d1f0e..159c6e794d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -25,7 +25,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"
@@ -95,13 +94,11 @@ Discourse::Application.routes.draw do
         member do
           put "owners" => "groups#add_owners"
           delete "owners" => "groups#remove_owner"
+          put "primary" => "groups#set_primary"
         end
       end
       resources :groups, except: [:create], 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
       end
@@ -185,20 +182,16 @@ Discourse::Application.routes.draw do
           end
         end
         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
 
       get "/logs" => "staff_action_logs#index"
 
+      # alias
+      get '/logs/watched_words', to: redirect(relative_url_root + 'admin/customize/watched_words')
+      get '/logs/watched_words/*path', to: redirect(relative_url_root + 'admin/customize/watched_words/%{path}')
+
       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
@@ -250,9 +243,19 @@ Discourse::Application.routes.draw do
 
       resources :embeddable_hosts, constraints: AdminConstraint.new
       resources :color_schemes, constraints: AdminConstraint.new
-
       resources :permalinks, constraints: AdminConstraint.new
 
+      scope "/customize" do
+        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"
+      end
+
       get "version_check" => "versions#show"
 
       get "dashboard" => "dashboard#index"
@@ -260,6 +263,8 @@ Discourse::Application.routes.draw do
       get "dashboard/moderation" => "dashboard#moderation"
       get "dashboard/security" => "dashboard#security"
       get "dashboard/reports" => "dashboard#reports"
+      get "dashboard/new-features" => "dashboard#new_features"
+      put "dashboard/mark-new-features-as-seen" => "dashboard#mark_new_features_as_seen"
 
       resources :dashboard, only: [:index] do
         collection do
@@ -389,6 +394,7 @@ Discourse::Application.routes.draw do
       resources :users, except: [:index, :new, :show, :update, :destroy], path: root_path do
         collection do
           get "check_username"
+          get "check_email"
           get "is_local_username"
         end
       end
@@ -446,9 +452,11 @@ Discourse::Application.routes.draw do
       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/sso-email" => "users#check_sso_email", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/sso-payload" => "users#check_sso_payload", constraints: { username: RouteFormat.username }
       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/security" => "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 }
@@ -476,9 +484,7 @@ Discourse::Application.routes.draw do
       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 }
-      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 }
@@ -522,6 +528,7 @@ Discourse::Application.routes.draw do
     get "stylesheets/:name.css" => "stylesheets#show", constraints: { name: /[-a-z0-9_]+/ }
     get "color-scheme-stylesheet/:id(/:theme_id)" => "stylesheets#color_scheme", constraints: { format: :json }
     get "theme-javascripts/:digest.js" => "theme_javascripts#show", constraints: { digest: /\h{40}/ }
+    get "theme-javascripts/tests/:theme_id-:digest.js" => "theme_javascripts#show_tests"
 
     post "uploads/lookup-metadata" => "uploads#metadata"
     post "uploads" => "uploads#create"
@@ -529,7 +536,7 @@ Discourse::Application.routes.draw do
 
     # 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
+    get "uploads/short-url/:base62(.:extension)" => "uploads#show_short", constraints: { site: /\w+/, base62: /[a-zA-Z0-9]+/, extension: /[a-zA-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?
@@ -624,7 +631,9 @@ Discourse::Application.routes.draw do
       end
     end
 
-    resources :bookmarks, only: %i[create destroy update]
+    resources :bookmarks, only: %i[create destroy update] do
+      put "toggle_pin"
+    end
 
     resources :notifications, except: :show do
       collection do
@@ -681,10 +690,8 @@ Discourse::Application.routes.draw do
 
     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/edit(/:tab)" => "categories#find_by_slug", constraints: { format: 'html' }
-    get "c/:parent_category_slug/:category_slug/edit(/:tab)" => "categories#find_by_slug", constraints: { format: 'html' }
+    get "c/*category_slug/find_by_slug" => "categories#find_by_slug"
+    get "c/*category_slug/edit(/:tab)" => "categories#find_by_slug", constraints: { format: 'html' }
     get "/new-category" => "categories#show", constraints: { format: 'html' }
 
     get "c/*category_slug_path_with_id.rss" => "list#category_feed", format: :rss
@@ -801,6 +808,7 @@ Discourse::Application.routes.draw do
     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/invite-notify" => "topics#invite_notify", 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+/ }
@@ -822,14 +830,15 @@ Discourse::Application.routes.draw do
 
     resources :invites, except: [:show]
     get "/invites/:id" => "invites#show", constraints: { format: :html }
+    put "/invites/:id" => "invites#update"
 
     post "invites/upload_csv" => "invites#upload_csv"
-    post "invites/rescind-all" => "invites#rescind_all_invites"
+    post "invites/destroy-all-expired" => "invites#destroy_all_expired"
     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'
+    get "invites/retrieve" => "invites#retrieve"
 
     resources :export_csv do
       collection do
@@ -926,11 +935,8 @@ Discourse::Application.routes.draw do
       get '*tag_id', to: redirect(relative_url_root + 'tag/%{tag_id}')
     end
 
-    resources :tag_groups, constraints: StaffConstraint.new, except: [:edit] do
-      collection do
-        get '/filter/search' => 'tag_groups#search'
-      end
-    end
+    resources :tag_groups, constraints: StaffConstraint.new, except: [:edit]
+    get '/tag_groups/filter/search' => 'tag_groups#search', format: :json
 
     Discourse.filters.each do |filter|
       root to: "list##{filter}", constraints: HomePageConstraint.new("#{filter}"), as: "list_#{filter}"
@@ -954,6 +960,7 @@ Discourse::Application.routes.draw do
       get "/qunit" => "qunit#index"
       get "/wizard/qunit" => "wizard#qunit"
     end
+    get "/theme-qunit" => "qunit#theme"
 
     post "/push_notifications/subscribe" => "push_notification#subscribe"
     post "/push_notifications/unsubscribe" => "push_notification#unsubscribe"
@@ -962,6 +969,13 @@ Discourse::Application.routes.draw do
 
     get "/permalink-check", to: 'permalinks#check'
 
+    post "/do-not-disturb" => "do_not_disturb#create"
+    delete "/do-not-disturb" => "do_not_disturb#destroy"
+
+    if Rails.env.development?
+      mount DiscourseDev::Engine => "/dev/"
+    end
+
     get "*url", to: 'permalinks#show', constraints: PermalinkConstraint.new
   end
 end
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 192200d10f..8da736a7ef 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -19,6 +19,7 @@
 # type: username - Must match the username of an existing user.
 # type: list     - A list of values, chosen from a set of valid values defined in the choices option.
 # type: enum     - A single value, chosen from a set of valid values in the choices option.
+# type: html     - A single value. It could contain HTML.
 #
 # A type:list setting with the word 'colors' in its name will make color values have a bold line of the corresponding color
 #
@@ -94,6 +95,10 @@ branding:
   manifest_icon:
     default: ""
     type: upload
+  manifest_screenshots:
+    type: list
+    list_type: simple
+    default: ""
   favicon:
     default: ""
     client: true
@@ -118,6 +123,7 @@ basic:
     default: false
   set_locale_from_accept_language_header:
     default: false
+    client: true
     validator: "AllowUserLocaleEnabledValidator"
   support_mixed_text_direction:
     client: true
@@ -332,11 +338,11 @@ basic:
     default: ""
     hidden: true
   base_font:
-    default: "helvetica"
+    default: "arial"
     enum: "BaseFontSetting"
     refresh: true
   heading_font:
-    default: "helvetica"
+    default: "arial"
     enum: "BaseFontSetting"
     refresh: true
 
@@ -422,31 +428,31 @@ login:
     default: ""
     type: list
     list_type: simple
-  external_auth_skip_create_confirm:
+  auth_skip_create_confirm:
     default: false
     client: true
-  external_auth_immediately:
+  auth_immediately:
     default: true
-  enable_sso:
+  enable_discourse_connect:
     client: true
     default: false
     validator: "EnableSsoValidator"
-  sso_allows_all_return_paths: false
-  enable_sso_provider: false
-  verbose_sso_logging: false
+  discourse_connect_allows_all_return_paths: false
+  enable_discourse_connect_provider: false
+  verbose_discourse_connect_logging: false
   verbose_auth_token_logging:
     hidden: true
     default: true
   max_suspicious_distance_km:
     hidden: true
     default: 500
-  sso_url:
+  discourse_connect_url:
     default: ""
     regex: '^https?:\/\/.+[^\/]$'
-  sso_secret:
+  discourse_connect_secret:
     default: ""
     secret: true
-  sso_provider_secrets:
+  discourse_connect_provider_secrets:
     default: ""
     type: list
     list_type: secret
@@ -454,22 +460,25 @@ login:
     placeholder:
       key: "sso_provider.key_placeholder"
       value: "sso_provider.value_placeholder"
-  sso_overrides_groups: false
-  sso_overrides_bio: false
-  sso_overrides_email:
+  discourse_connect_overrides_groups: false
+  discourse_connect_overrides_bio: false
+  auth_overrides_email:
     default: false
     validator: "SsoOverridesEmailValidator"
     client: true
-  sso_overrides_username: false
-  sso_overrides_name: false
-  sso_overrides_avatar:
+  auth_overrides_username: false
+  auth_overrides_name: false
+  discourse_connect_overrides_avatar:
     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: ""
+  discourse_connect_overrides_profile_background: false
+  discourse_connect_overrides_location: false
+  discourse_connect_overrides_website: false
+  discourse_connect_overrides_card_background: false
+  discourse_connect_not_approved_url: ""
+  discourse_connect_csrf_protection:
+    default: true
+    hidden: true
   blocked_email_domains:
     default: "mailinator.com"
     type: list
@@ -540,7 +549,9 @@ users:
     max: 10
   block_common_passwords: true
   username_change_period: 3
-  email_editable: true
+  email_editable:
+    client: true
+    default: true
   logout_redirect:
     client: true
     default: ""
@@ -648,6 +659,9 @@ users:
   gravatar_login_url:
     default: /emails
     client: true
+  max_bookmarks_per_user:
+    default: 2000
+    hidden: true
 
 groups:
   enable_group_directory:
@@ -725,6 +739,9 @@ posting:
       ja: true
   max_consecutive_replies:
     default: 3
+  enable_filtered_replies_view:
+    default: false
+    client: true
   title_prettify:
     default: true
     locale_default:
@@ -735,7 +752,7 @@ posting:
     default: false
     locale_default:
       en: true
-      en_US: true
+      en_GB: true
   title_fancy_entities: true
   min_personal_message_title_length:
     client: true
@@ -760,11 +777,6 @@ posting:
     client: true
   enable_system_message_replies:
     default: true
-  enable_personal_email_messages:
-    hidden: true
-    default: false
-    client: true
-    validator: "EnablePrivateEmailMessagesValidator"
   editing_grace_period: 300
   editing_grace_period_max_diff: 100
   editing_grace_period_max_diff_high_trust: 400
@@ -772,6 +784,9 @@ posting:
   shared_drafts_category:
     type: category
     default: ""
+  shared_drafts_min_trust_level:
+    default: "staff"
+    enum: "TrustLevelAndStaffSetting"
   post_edit_time_limit:
     default: 1440
     max: 10080
@@ -967,6 +982,9 @@ posting:
     hidden: true
     default: false
     client: true
+  enable_diffhtml_preview:
+    default: false
+    client: true
   old_post_notice_days:
     default: 14
     max: 36500
@@ -990,6 +1008,10 @@ posting:
     default: false
   show_published_pages_login_required:
     default: false
+  skip_auto_delete_reply_likes: 5
+  review_every_post:
+    default: false
+
 
 email:
   email_time_window_mins:
@@ -1168,6 +1190,7 @@ email:
       - quote
       - create_replies
   always_show_trimmed_content: false
+  trim_incoming_emails: true
   private_email: false
   email_custom_template:
     default: ""
@@ -1210,12 +1233,12 @@ files:
     default: 50000
     max: 1024000
   theme_authorized_extensions:
-    default: "jpg|jpeg|png|woff|woff2|svg|eot|ttf|otf|gif|js"
+    default: "jpg|jpeg|png|woff|woff2|svg|eot|ttf|otf|gif|webp|js"
     type: list
     list_type: compact
   authorized_extensions:
     client: true
-    default: "jpg|jpeg|png|gif|heic|heif"
+    default: "jpg|jpeg|png|gif|heic|heif|webp"
     refresh: true
     type: list
     list_type: compact
@@ -1326,6 +1349,9 @@ files:
     default: "/letter_avatar_proxy/v4/letter/{first_letter}/{color}/{size}.png"
     client: true
     regex: '^((https?:)?\/)?\/.+[^\/]'
+  external_emoji_url:
+    default: ""
+    client: true
   restrict_letter_avatar_colors:
     default: ""
     type: list
@@ -1396,9 +1422,8 @@ trust:
     default: 1
     enum: "TrustLevelSetting"
   min_trust_to_send_email_messages:
-    hidden: true
-    default: 4
-    enum: "TrustLevelSetting"
+    default: "4"
+    enum: "TrustLevelAndStaffSetting"
   min_trust_to_flag_posts:
     default: 1
     enum: "TrustLevelSetting"
@@ -1422,6 +1447,7 @@ trust:
   min_trust_level_to_allow_ignore:
     default: 2
     enum: "TrustLevelSetting"
+    client: true
   allow_flagging_staff: true
   send_tl1_welcome_message: true
   send_tl2_promotion_message: true
@@ -1515,6 +1541,11 @@ security:
     default: "rss|bot|spider|crawler|facebook|archive|wayback|ping|monitor|lighthouse"
     type: list
     list_type: compact
+  browser_update_user_agents:
+    hidden: true
+    default: "MSIE 6|MSIE 7|MSIE 8|MSIE 9"
+    type: list
+    list_type: compact
   crawler_check_bypass_agents:
     hidden: true
     default: "cubot"
@@ -1564,6 +1595,8 @@ security:
     default: false
   content_security_policy_collect_reports:
     default: false
+  content_security_policy_frame_ancestors:
+    default: false
   content_security_policy_script_src:
     type: simple_list
     default: ""
@@ -1577,9 +1610,11 @@ security:
   send_old_credential_reminder_days:
     default: 0
     hidden: true
+  disable_onebox_media_download_controls:
+    default: false
+    hidden: true
 
 onebox:
-  enable_flash_video_onebox: false
   post_onebox_maxlength:
     default: 500
     locale_default:
@@ -1598,13 +1633,27 @@ onebox:
     type: list
     list_type: compact
   enable_inline_onebox_on_all_domains:
-    default: false
+    default: true
   force_custom_user_agent_hosts:
     default: "http://codepen.io"
     type: list
+  force_get_hosts:
+    default: "us.battle.net|news.yahoo.com|*.medium.com"
+    type: list
+    hidden: true
   facebook_app_access_token:
     default: ""
     secret: true
+  cache_onebox_response_body:
+    default: false
+    hidden: true
+  cache_onebox_response_body_domains:
+    default: ""
+    type: list
+    hidden: true
+  cache_onebox_user_agent:
+    default: ""
+    hidden: true
 spam:
   add_rel_nofollow_to_user_content: true
   hide_post_sensitivity:
@@ -1666,6 +1715,10 @@ spam:
     type: enum
     default: low
     enum: "ReviewablePrioritySetting"
+  reviewable_low_priority_threshold:
+    default: 1
+    min: 1
+
 
 rate_limits:
   unique_posts_mins: 5
@@ -1711,16 +1764,24 @@ rate_limits:
     min: 1
     default: 6
   max_post_deletions_per_minute:
-    min: 1
+    min: 0
     default: 2
   max_post_deletions_per_day:
-    min: 1
+    min: 0
     default: 10
   invite_link_max_redemptions_limit:
     min: 2
     max: 1000000
     default: 5000
     client: true
+  invite_link_max_redemptions_limit_users:
+    min: 2
+    max: 1000000
+    default: 10
+    client: true
+  max_allowed_secondary_emails:
+    default: 10
+    hidden: true
 
 developer:
   force_hostname:
@@ -1767,6 +1828,7 @@ developer:
   top_topics_formula_least_likes_per_post_multiplier:
     default: 3
   rebake_old_posts_count:
+    hidden: true
     default: 80
     min: 1
   migrate_to_new_scheme:
@@ -1881,10 +1943,10 @@ search:
     client: true
     default: 3
     locale_default:
-      zh_CN: 2
-      zh_TW: 2
-      ko: 2
-      ja: 2
+      zh_CN: 1
+      zh_TW: 1
+      ko: 1
+      ja: 1
   search_tokenize_chinese_japanese_korean: false
   search_prefer_recent_posts: false
   search_recent_posts_size:
@@ -1921,10 +1983,6 @@ search:
       ro: true
       sk: true
       tr_TR: true
-  category_search_priority_very_low_weight:
-    default: 0.6
-    hidden: true
-    validator: "CategorySearchPriorityWeightsValidator"
   category_search_priority_low_weight:
     default: 0.8
     hidden: true
@@ -1933,10 +1991,6 @@ search:
     default: 1.2
     hidden: true
     validator: "CategorySearchPriorityWeightsValidator"
-  category_search_priority_very_high_weight:
-    default: 1.4
-    hidden: true
-    validator: "CategorySearchPriorityWeightsValidator"
 
 uncategorized:
   version_checks:
@@ -2075,6 +2129,9 @@ uncategorized:
     hidden: true
     default: true
 
+  use_site_small_logo_as_system_avatar:
+    default: true
+
   disable_system_edit_notifications: true
 
   notification_consolidation_threshold:
@@ -2122,6 +2179,10 @@ uncategorized:
     client: true
     hidden: true
 
+  check_for_new_features:
+    default: false
+    hidden: true
+
   automatically_unpin_topics:
     default: true
     client: true
@@ -2192,6 +2253,11 @@ uncategorized:
   create_revision_on_bulk_topic_moves:
     default: true
 
+  disable_image_size_calculations:
+    default: false
+    hidden: true
+    client: true
+
 user_preferences:
   default_email_digest_frequency:
     enum: "DigestEmailSiteSetting"
@@ -2208,7 +2274,7 @@ user_preferences:
     enum: "MailingListModeSiteSetting"
     default: 1
   disable_mailing_list_mode:
-    default: false
+    default: true
     client: true
   default_email_previous_replies:
     enum: "PreviousRepliesSiteSetting"
@@ -2304,8 +2370,6 @@ user_api:
   allow_user_api_key_scopes:
     default: "read|write|message_bus|push|notifications|session_info|one_time_password"
     type: list
-  max_api_keys_per_user:
-    default: 10
   push_api_secret_key:
     default: ""
     hidden: true
@@ -2353,10 +2417,6 @@ tags:
     client: true
     default: 5
     min: 1
-  show_filter_by_tag:
-    client: true
-    default: false
-    refresh: true
   max_tags_in_filter_list:
     client: true
     default: 30
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index 373e235b3f..ffcafcb618 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -25,7 +25,7 @@ end
 # feel free to point this anywhere accessible on the filesystem
 pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
 
-if ENV["RAILS_ENV"] == "development" || !ENV["RAILS_ENV"]
+if ENV["RAILS_ENV"] != "production"
   logger Logger.new($stdout)
   # we want a longer timeout in dev cause first request can be really slow
   timeout (ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60)
@@ -82,7 +82,7 @@ before_fork do |server, worker|
 
     sidekiqs = ENV['UNICORN_SIDEKIQS'].to_i
     if sidekiqs > 0
-      puts "Starting up #{sidekiqs} supervised sidekiqs"
+      server.logger.info "starting #{sidekiqs} supervised sidekiqs"
 
       require 'demon/sidekiq'
       Demon::Sidekiq.after_fork do
@@ -105,7 +105,7 @@ before_fork do |server, worker|
     end
 
     if ENV['DISCOURSE_ENABLE_EMAIL_SYNC_DEMON'] == 'true'
-      puts "Starting up EmailSync demon"
+      server.logger.info "starting up EmailSync demon"
       Demon::EmailSync.start
       Signal.trap("SIGTSTP") do
         STDERR.puts "#{Time.now}: Issuing stop to EmailSync"
@@ -113,6 +113,11 @@ before_fork do |server, worker|
       end
     end
 
+    DiscoursePluginRegistry.demon_processes.each do |demon_class|
+      server.logger.info "starting #{demon_class.prefix} demon"
+      demon_class.start
+    end
+
     class ::Unicorn::HttpServer
       alias :master_sleep_orig :master_sleep
 
@@ -230,6 +235,10 @@ before_fork do |server, worker|
           check_email_sync_heartbeat
         end
 
+        DiscoursePluginRegistry.demon_processes.each do |demon_class|
+          demon_class.ensure_running
+        end
+
         master_sleep_orig(sec)
       end
     end
@@ -242,18 +251,19 @@ before_fork do |server, worker|
   # to the implementation of standard Unix signal handlers, this
   # helps (but does not completely) prevent identical, repeated signals
   # from being lost when the receiving process is busy.
-  sleep 1
+  sleep 1 if !Rails.env.development?
 end
 
 after_fork do |server, worker|
   DiscourseEvent.trigger(:web_fork_started)
+  Discourse.after_fork
 
   # warm up v8 after fork, that way we do not fork a v8 context
   # it may cause issues if bg threads in a v8 isolate randomly stop
   # working due to fork
-  Discourse.after_fork
   begin
-    PrettyText.cook("warm up **pretty text**")
+    # Skip warmup in development mode - it makes boot take ~2s longer
+    PrettyText.cook("warm up **pretty text**") if !Rails.env.development?
   rescue => e
     Rails.logger.error("Failed to warm up pretty text: #{e}")
   end
diff --git a/db/fixtures/007_web_hook_event_types.rb b/db/fixtures/007_web_hook_event_types.rb
index ec666ec5ad..42ed0e861b 100644
--- a/db/fixtures/007_web_hook_event_types.rb
+++ b/db/fixtures/007_web_hook_event_types.rb
@@ -54,3 +54,13 @@ WebHookEventType.seed do |b|
   b.id = WebHookEventType::USER_BADGE
   b.name = "user_badge"
 end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::GROUP_USER
+  b.name = "group_user"
+end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::LIKE
+  b.name = "like"
+end
diff --git a/db/migrate/20120806030641_add_new_password_new_salt_email_token_to_users.rb b/db/migrate/20120806030641_add_new_password_new_salt_email_token_to_users.rb
index 5f5fc673aa..60bc43f135 100644
--- a/db/migrate/20120806030641_add_new_password_new_salt_email_token_to_users.rb
+++ b/db/migrate/20120806030641_add_new_password_new_salt_email_token_to_users.rb
@@ -4,7 +4,7 @@ class AddNewPasswordNewSaltEmailTokenToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :new_salt, :string, limit: 32
     add_column :users, :new_password_hash, :string, limit: 64
-    # email token is more flexible, can be used for both intial activation AND password change confirmation
+    # email token is more flexible, can be used for both initial activation AND password change confirmation
     add_column :users, :email_token, :string, limit: 32
     remove_column :users, :activation_key
   end
diff --git a/db/migrate/20120807223020_create_actions.rb b/db/migrate/20120807223020_create_actions.rb
index 9819e5d31e..0fe02dd09a 100644
--- a/db/migrate/20120807223020_create_actions.rb
+++ b/db/migrate/20120807223020_create_actions.rb
@@ -7,7 +7,7 @@ class CreateActions < ActiveRecord::Migration[4.2]
       # I elected for multiple ids as opposed to using :as cause it makes the table
       # thinner, and the joining semantics much simpler (a simple multiple left join will do)
       #
-      # There is a notificiation table as well that covers much of this,
+      # There is a notification table as well that covers much of this,
       # but this table is wider and is intended for non-notifying actions as well
 
       t.integer :action_type, null: false
diff --git a/db/migrate/20130615073305_remove_topic_id_from_uploads.rb b/db/migrate/20130615073305_remove_topic_id_from_uploads.rb
index 5f5c3b75d7..742e403e3b 100644
--- a/db/migrate/20130615073305_remove_topic_id_from_uploads.rb
+++ b/db/migrate/20130615073305_remove_topic_id_from_uploads.rb
@@ -6,6 +6,6 @@ class RemoveTopicIdFromUploads < ActiveRecord::Migration[4.2]
   end
 
   def down
-    add_column :uploads, :topic_id, :interger, null: false, default: -1
+    add_column :uploads, :topic_id, :integer, null: false, default: -1
   end
 end
diff --git a/db/migrate/20151117165756_add_automatically_unpin_topics_to_users.rb b/db/migrate/20151117165756_add_automatically_unpin_topics_to_users.rb
index c73709896b..3fffe985ec 100644
--- a/db/migrate/20151117165756_add_automatically_unpin_topics_to_users.rb
+++ b/db/migrate/20151117165756_add_automatically_unpin_topics_to_users.rb
@@ -2,6 +2,6 @@
 
 class AddAutomaticallyUnpinTopicsToUsers < ActiveRecord::Migration[4.2]
   def change
-    add_column :users, :automatically_unpin_topics, :boolean, nullabe: false, default: true
+    add_column :users, :automatically_unpin_topics, :boolean, null: false, default: true
   end
 end
diff --git a/db/migrate/20160108051129_fix_incorrect_user_history.rb b/db/migrate/20160108051129_fix_incorrect_user_history.rb
index ed31e821e2..84282877fd 100644
--- a/db/migrate/20160108051129_fix_incorrect_user_history.rb
+++ b/db/migrate/20160108051129_fix_incorrect_user_history.rb
@@ -9,7 +9,7 @@ class FixIncorrectUserHistory < ActiveRecord::Migration[4.2]
     #
     # This migration hunts for date stuff started going wrong and date it started being good and corrects the data
 
-    # this is a :auto_trust_level_change mislabled as :check_email
+    # this is a :auto_trust_level_change mislabeled as :check_email
     # impersonate that was actually delete topic
     condition = <<CLAUSE
 (action = 16 AND previous_value in ('0','1','2','3','4')) OR
diff --git a/db/migrate/20160112025852_remove_users_from_topic_allowed_users.rb b/db/migrate/20160112025852_remove_users_from_topic_allowed_users.rb
index e2d12d052b..1dde0a2edd 100644
--- a/db/migrate/20160112025852_remove_users_from_topic_allowed_users.rb
+++ b/db/migrate/20160112025852_remove_users_from_topic_allowed_users.rb
@@ -3,7 +3,7 @@
 class RemoveUsersFromTopicAllowedUsers < ActiveRecord::Migration[4.2]
 
   # historically we added admins automatically to a message if they
-  # responded, despite them being in the group the message is targetted at
+  # responded, despite them being in the group the message is targeted at
   # this causes inbox bloat for pretty much no reason
   def up
     sql = <<SQL
diff --git a/db/migrate/20170313192741_add_themes.rb b/db/migrate/20170313192741_add_themes.rb
index dad21fafbc..54c735e718 100644
--- a/db/migrate/20170313192741_add_themes.rb
+++ b/db/migrate/20170313192741_add_themes.rb
@@ -73,6 +73,6 @@ SQL
   end
 
   def down
-    raise IrriversibleMigration
+    raise IrreversibleMigration
   end
 end
diff --git a/db/migrate/20181005084357_add_sso_provider_secrets_to_site_settings.rb b/db/migrate/20181005084357_add_sso_provider_secrets_to_site_settings.rb
index 777e665a6d..877dc72f1f 100644
--- a/db/migrate/20181005084357_add_sso_provider_secrets_to_site_settings.rb
+++ b/db/migrate/20181005084357_add_sso_provider_secrets_to_site_settings.rb
@@ -2,12 +2,14 @@
 
 class AddSsoProviderSecretsToSiteSettings < ActiveRecord::Migration[5.2]
   def up
-    return unless SiteSetting.enable_sso_provider && SiteSetting.sso_secret.present?
-    sso_secret = SiteSetting.sso_secret
-    sso_secret_insert = ActiveRecord::Base.connection.quote("*|#{sso_secret}")
-
-    execute "INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
-             VALUES ('sso_provider_secrets', 8, #{sso_secret_insert}, now(), now())"
+    execute <<~SQL
+      INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
+      SELECT 'sso_provider_secrets', 8, '*|' || value, now(), now()
+      FROM site_settings WHERE name = 'sso_secret'
+      AND EXISTS (
+        SELECT 1 FROM site_settings WHERE name = 'enable_sso_provider' AND value = 't'
+      )
+    SQL
   end
 
   def down
diff --git a/db/migrate/20200429095034_add_topic_thumbnail_information.rb b/db/migrate/20200429095034_add_topic_thumbnail_information.rb
index 6275f29fef..3efb4c3a02 100644
--- a/db/migrate/20200429095034_add_topic_thumbnail_information.rb
+++ b/db/migrate/20200429095034_add_topic_thumbnail_information.rb
@@ -41,6 +41,6 @@ class AddTopicThumbnailInformation < ActiveRecord::Migration[6.0]
   end
 
   def down
-    raise IrriversibleMigration
+    raise IrreversibleMigration
   end
 end
diff --git a/db/migrate/20201117212328_set_category_slug_to_lower.rb b/db/migrate/20201117212328_set_category_slug_to_lower.rb
new file mode 100644
index 0000000000..8d7d275645
--- /dev/null
+++ b/db/migrate/20201117212328_set_category_slug_to_lower.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+class SetCategorySlugToLower < ActiveRecord::Migration[6.0]
+  def up
+    remove_index(:categories, name: 'unique_index_categories_on_slug')
+
+    categories = DB.query("SELECT id, name, slug, parent_category_id FROM categories")
+    old_slugs = categories.map { |c| [c.id, c.slug] }.to_h
+    updates = {}
+
+    # Resolve duplicate tags by replacing mixed case slugs with new ones
+    # extracted from category names
+    slugs = categories
+      .filter { |category| category.slug.present? }
+      .group_by { |category| [category.parent_category_id, category.slug.downcase] }
+      .map { |slug, cats| [slug, cats.size] }
+      .to_h
+
+    categories.each do |category|
+      old_parent_and_slug = [category.parent_category_id, category.slug.downcase]
+      next if category.slug.blank? ||
+              category.slug == category.slug.downcase ||
+              slugs[old_parent_and_slug] <= 1
+
+      new_slug = category.name.parameterize.tr("_", "-").squeeze('-').gsub(/\A-+|-+\z/, '')[0..255]
+      new_slug = '' if (new_slug =~ /[^\d]/).blank?
+      new_parent_and_slug = [category.parent_category_id, new_slug]
+      next if new_slug.blank? ||
+              (slugs[new_parent_and_slug].present? && slugs[new_parent_and_slug] > 0)
+
+      updates[category.id] = category.slug = new_slug
+      slugs[old_parent_and_slug] -= 1
+      slugs[new_parent_and_slug] = 1
+    end
+
+    # Reset left conflicting slugs
+    slugs = categories
+      .filter { |category| category.slug.present? }
+      .group_by { |category| [category.parent_category_id, category.slug.downcase] }
+      .map { |slug, cats| [slug, cats.size] }
+      .to_h
+
+    categories.each do |category|
+      old_parent_and_slug = [category.parent_category_id, category.slug.downcase]
+      next if category.slug.blank? ||
+              category.slug == category.slug.downcase ||
+              slugs[old_parent_and_slug] <= 1
+
+      updates[category.id] = category.slug = ''
+      slugs[old_parent_and_slug] -= 1
+    end
+
+    # Update all category slugs
+    updates.each do |id, slug|
+      execute <<~SQL
+        UPDATE categories
+        SET slug = '#{PG::Connection.escape_string(slug)}'
+        WHERE id = #{id} -- #{PG::Connection.escape_string(old_slugs[id])}
+      SQL
+    end
+
+    # Ensure all slugs are lowercase
+    execute "UPDATE categories SET slug = LOWER(slug)"
+
+    add_index(
+      :categories,
+      'COALESCE(parent_category_id, -1), LOWER(slug)',
+      name: 'unique_index_categories_on_slug',
+      where: "slug != ''",
+      unique: true
+    )
+  end
+
+  def down
+    remove_index(:categories, name: 'unique_index_categories_on_slug')
+
+    add_index(
+      :categories,
+      'COALESCE(parent_category_id, -1), slug',
+      name: 'unique_index_categories_on_slug',
+      where: "slug != ''",
+      unique: true
+    )
+  end
+end
diff --git a/db/migrate/20201210151635_create_do_not_disturb_timings.rb b/db/migrate/20201210151635_create_do_not_disturb_timings.rb
new file mode 100644
index 0000000000..af308bc050
--- /dev/null
+++ b/db/migrate/20201210151635_create_do_not_disturb_timings.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateDoNotDisturbTimings < ActiveRecord::Migration[6.0]
+  def change
+    create_table :do_not_disturb_timings do |t|
+      t.integer :user_id, null: false
+      t.datetime :starts_at, null: false
+      t.datetime :ends_at, null: false
+    end
+    add_index :do_not_disturb_timings, [:user_id], unique: false
+    add_index :do_not_disturb_timings, [:starts_at], unique: false
+    add_index :do_not_disturb_timings, [:ends_at], unique: false
+  end
+end
diff --git a/db/migrate/20200514075356_remove_flag_web_hooks.rb b/db/migrate/20201218000000_remove_flag_web_hooks.rb
similarity index 91%
rename from db/migrate/20200514075356_remove_flag_web_hooks.rb
rename to db/migrate/20201218000000_remove_flag_web_hooks.rb
index 448b7fb771..82cfe095ad 100644
--- a/db/migrate/20200514075356_remove_flag_web_hooks.rb
+++ b/db/migrate/20201218000000_remove_flag_web_hooks.rb
@@ -4,12 +4,12 @@ class RemoveFlagWebHooks < ActiveRecord::Migration[6.0]
   def up
     flag_event_type_id = 7
 
-    DB.exec <<~SQL
+    execute <<~SQL
     DELETE FROM web_hook_event_types_hooks
     WHERE web_hook_event_type_id = #{flag_event_type_id}
     SQL
 
-    DB.exec <<~SQL
+    execute <<~SQL
     DELETE FROM web_hook_event_types
     WHERE id = #{flag_event_type_id}
     SQL
diff --git a/db/migrate/20200514075407_remove_queued_post_web_hooks.rb b/db/migrate/20201218000001_remove_queued_post_web_hooks.rb
similarity index 91%
rename from db/migrate/20200514075407_remove_queued_post_web_hooks.rb
rename to db/migrate/20201218000001_remove_queued_post_web_hooks.rb
index 632e5013dc..835054ef81 100644
--- a/db/migrate/20200514075407_remove_queued_post_web_hooks.rb
+++ b/db/migrate/20201218000001_remove_queued_post_web_hooks.rb
@@ -4,12 +4,12 @@ class RemoveQueuedPostWebHooks < ActiveRecord::Migration[6.0]
   def up
     queued_post_event_type_id = 8
 
-    DB.exec <<~SQL
+    execute <<~SQL
     DELETE FROM web_hook_event_types_hooks
     WHERE web_hook_event_type_id = #{queued_post_event_type_id}
     SQL
 
-    DB.exec <<~SQL
+    execute <<~SQL
     DELETE FROM web_hook_event_types
     WHERE id = #{queued_post_event_type_id}
     SQL
diff --git a/db/migrate/20201223071241_delete_stale_category_search_priorities_from_site_settings.rb b/db/migrate/20201223071241_delete_stale_category_search_priorities_from_site_settings.rb
new file mode 100644
index 0000000000..a6998b8f2f
--- /dev/null
+++ b/db/migrate/20201223071241_delete_stale_category_search_priorities_from_site_settings.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class DeleteStaleCategorySearchPrioritiesFromSiteSettings < ActiveRecord::Migration[6.0]
+  def up
+    execute <<~SQL
+    DELETE FROM site_settings WHERE name IN ('category_search_priority_very_low_weight', 'category_search_priority_very_high_weight')
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20201229031635_add_user_profile_indexes.rb b/db/migrate/20201229031635_add_user_profile_indexes.rb
new file mode 100644
index 0000000000..200c5c4e99
--- /dev/null
+++ b/db/migrate/20201229031635_add_user_profile_indexes.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class AddUserProfileIndexes < ActiveRecord::Migration[6.0]
+  disable_ddl_transaction!
+
+  def up
+    execute <<~SQL
+      CREATE INDEX CONCURRENTLY IF NOT EXISTS index_topic_links_on_user_and_clicks
+      ON topic_links(user_id, clicks DESC, created_at DESC)
+      WHERE (NOT reflection and NOT quote and NOT internal)
+    SQL
+
+    execute <<~SQL
+      CREATE INDEX CONCURRENTLY IF NOT EXISTS index_posts_user_and_likes
+      ON posts(user_id, like_count desc, created_at desc)
+      WHERE post_number > 1
+    SQL
+  end
+
+  def down
+    execute <<~SQL
+      DROP INDEX IF EXISTS index_posts_user_and_likes
+    SQL
+
+    execute <<~SQL
+      DROP INDEX IF EXISTS index_topic_links_on_user_and_clicks
+    SQL
+  end
+end
diff --git a/db/migrate/20210105165605_add_processed_to_notifications.rb b/db/migrate/20210105165605_add_processed_to_notifications.rb
new file mode 100644
index 0000000000..769d127546
--- /dev/null
+++ b/db/migrate/20210105165605_add_processed_to_notifications.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class AddProcessedToNotifications < ActiveRecord::Migration[6.0]
+  def change
+  end
+end
diff --git a/db/migrate/20210106181418_create_user_notification_schedules.rb b/db/migrate/20210106181418_create_user_notification_schedules.rb
new file mode 100644
index 0000000000..4e561841fd
--- /dev/null
+++ b/db/migrate/20210106181418_create_user_notification_schedules.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class CreateUserNotificationSchedules < ActiveRecord::Migration[6.0]
+  def change
+    create_table :user_notification_schedules do |t|
+      t.integer :user_id, null: false
+      t.boolean :enabled, null: false, default: false
+      t.integer :day_0_start_time, null: false
+      t.integer :day_0_end_time, null: false
+      t.integer :day_1_start_time, null: false
+      t.integer :day_1_end_time, null: false
+      t.integer :day_2_start_time, null: false
+      t.integer :day_2_end_time, null: false
+      t.integer :day_3_start_time, null: false
+      t.integer :day_3_end_time, null: false
+      t.integer :day_4_start_time, null: false
+      t.integer :day_4_end_time, null: false
+      t.integer :day_5_start_time, null: false
+      t.integer :day_5_end_time, null: false
+      t.integer :day_6_start_time, null: false
+      t.integer :day_6_end_time, null: false
+    end
+
+    add_index :user_notification_schedules, [:user_id]
+    add_index :user_notification_schedules, [:enabled]
+
+    add_column :do_not_disturb_timings, :scheduled, :boolean, default: false
+    add_index :do_not_disturb_timings, [:scheduled]
+  end
+end
diff --git a/db/migrate/20210107005832_add_imap_missing_column_to_incoming_email.rb b/db/migrate/20210107005832_add_imap_missing_column_to_incoming_email.rb
new file mode 100644
index 0000000000..b338dcb390
--- /dev/null
+++ b/db/migrate/20210107005832_add_imap_missing_column_to_incoming_email.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddImapMissingColumnToIncomingEmail < ActiveRecord::Migration[6.0]
+  def change
+    add_column :incoming_emails, :imap_missing, :boolean, default: false, null: false
+  end
+end
diff --git a/db/migrate/20210111025920_add_reject_reason_to_reviewables.rb b/db/migrate/20210111025920_add_reject_reason_to_reviewables.rb
new file mode 100644
index 0000000000..43c2fdabb2
--- /dev/null
+++ b/db/migrate/20210111025920_add_reject_reason_to_reviewables.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRejectReasonToReviewables < ActiveRecord::Migration[6.0]
+  def change
+    add_column :reviewables, :reject_reason, :text
+  end
+end
diff --git a/db/migrate/20210119005647_add_created_via_to_incoming_email.rb b/db/migrate/20210119005647_add_created_via_to_incoming_email.rb
new file mode 100644
index 0000000000..34ff21dae9
--- /dev/null
+++ b/db/migrate/20210119005647_add_created_via_to_incoming_email.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCreatedViaToIncomingEmail < ActiveRecord::Migration[6.0]
+  def change
+    add_column :incoming_emails, :created_via, :integer, null: true
+  end
+end
diff --git a/db/migrate/20210120125607_rename_english_locale.rb b/db/migrate/20210120125607_rename_english_locale.rb
new file mode 100644
index 0000000000..2da72485f1
--- /dev/null
+++ b/db/migrate/20210120125607_rename_english_locale.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+class RenameEnglishLocale < ActiveRecord::Migration[6.0]
+  def up
+    rename_locale(old: "en", new: "en_GB")
+    rename_locale(old: "en_US", new: "en")
+  end
+
+  def down
+    rename_locale(old: "en", new: "en_US")
+    rename_locale(old: "en_GB", new: "en")
+  end
+
+  private
+
+  def rename_locale(old:, new:)
+    execute <<~SQL
+      UPDATE users
+      SET locale = '#{new}'
+      WHERE locale = '#{old}'
+    SQL
+
+    execute <<~SQL
+      UPDATE site_settings
+      SET value = '#{new}'
+      WHERE name = 'default_locale' AND value = '#{old}'
+    SQL
+
+    execute <<~SQL
+      UPDATE translation_overrides
+      SET locale = '#{new}'
+      WHERE locale = '#{old}'
+    SQL
+
+    execute <<~SQL
+      UPDATE theme_translation_overrides
+      SET locale = '#{new}'
+      WHERE locale = '#{old}'
+    SQL
+  end
+end
diff --git a/db/migrate/20210121001720_change_incoming_email_created_at_null.rb b/db/migrate/20210121001720_change_incoming_email_created_at_null.rb
new file mode 100644
index 0000000000..b751a92776
--- /dev/null
+++ b/db/migrate/20210121001720_change_incoming_email_created_at_null.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class ChangeIncomingEmailCreatedAtNull < ActiveRecord::Migration[6.0]
+  def up
+    # 0 signifies unknown
+    DB.exec("UPDATE incoming_emails SET created_via = 0 WHERE created_via IS NULL")
+    change_column_default :incoming_emails, :created_via, 0
+    change_column_null :incoming_emails, :created_via, false
+  end
+
+  def down
+    change_column_null :incoming_emails, :created_via, true
+  end
+end
diff --git a/db/migrate/20210126222142_create_shelved_notifications.rb b/db/migrate/20210126222142_create_shelved_notifications.rb
new file mode 100644
index 0000000000..2af5b2e86c
--- /dev/null
+++ b/db/migrate/20210126222142_create_shelved_notifications.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+class CreateShelvedNotifications < ActiveRecord::Migration[6.0]
+  def change
+    create_table :shelved_notifications do |t|
+      t.integer :notification_id, null: false
+    end
+    add_index :shelved_notifications, [:notification_id]
+  end
+end
diff --git a/db/migrate/20210127013637_add_upload_security_log_columns.rb b/db/migrate/20210127013637_add_upload_security_log_columns.rb
new file mode 100644
index 0000000000..10818c8b2a
--- /dev/null
+++ b/db/migrate/20210127013637_add_upload_security_log_columns.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddUploadSecurityLogColumns < ActiveRecord::Migration[6.0]
+  def change
+    add_column :uploads, :security_last_changed_at, :datetime, null: true
+    add_column :uploads, :security_last_changed_reason, :string, null: true
+  end
+end
diff --git a/db/migrate/20210128021147_add_allow_unknown_sender_topic_replies_to_group.rb b/db/migrate/20210128021147_add_allow_unknown_sender_topic_replies_to_group.rb
new file mode 100644
index 0000000000..d1b27d321d
--- /dev/null
+++ b/db/migrate/20210128021147_add_allow_unknown_sender_topic_replies_to_group.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddAllowUnknownSenderTopicRepliesToGroup < ActiveRecord::Migration[6.0]
+  def up
+    add_column :groups, :allow_unknown_sender_topic_replies, :boolean, default: false, null: false
+  end
+
+  def down
+    remove_column :groups, :allow_unknown_sender_topic_replies
+  end
+end
diff --git a/db/migrate/20210131221311_create_dismissed_topic_users_table.rb b/db/migrate/20210131221311_create_dismissed_topic_users_table.rb
new file mode 100644
index 0000000000..699e05deed
--- /dev/null
+++ b/db/migrate/20210131221311_create_dismissed_topic_users_table.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateDismissedTopicUsersTable < ActiveRecord::Migration[6.0]
+  def change
+    create_table :dismissed_topic_users do |t|
+      t.integer :user_id
+      t.integer :topic_id
+      t.datetime :created_at
+    end
+    add_index :dismissed_topic_users, %i(user_id topic_id), unique: true
+  end
+end
diff --git a/db/migrate/20210201034048_move_category_last_seen_at_to_new_table.rb b/db/migrate/20210201034048_move_category_last_seen_at_to_new_table.rb
new file mode 100644
index 0000000000..2e61a42aa7
--- /dev/null
+++ b/db/migrate/20210201034048_move_category_last_seen_at_to_new_table.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class MoveCategoryLastSeenAtToNewTable < ActiveRecord::Migration[6.0]
+  def up
+    sql = <<~SQL
+      INSERT INTO dismissed_topic_users (user_id, topic_id, created_at)
+      SELECT users.id, topics.id, category_users.last_seen_at
+      FROM category_users
+      JOIN users ON users.id = category_users.user_id
+      JOIN categories ON categories.id = category_users.category_id
+      JOIN user_stats ON user_stats.user_id = users.id
+      JOIN user_options ON user_options.user_id = users.id
+      JOIN topics ON topics.category_id = category_users.category_id
+      WHERE category_users.last_seen_at IS NOT NULL
+      AND topics.created_at >= GREATEST(CASE
+                  WHEN COALESCE(user_options.new_topic_duration_minutes, :default_duration) = :always THEN users.created_at
+                  WHEN COALESCE(user_options.new_topic_duration_minutes, :default_duration) = :last_visit THEN COALESCE(users.previous_visit_at,users.created_at)
+                  ELSE (:now::timestamp - INTERVAL '1 MINUTE' * COALESCE(user_options.new_topic_duration_minutes, :default_duration))
+               END, user_stats.new_since, :min_date)
+      AND topics.created_at <= category_users.last_seen_at
+      ORDER BY topics.created_at DESC
+      LIMIT :max_new_topics
+    SQL
+    sql = DB.sql_fragment(sql,
+                          now: DateTime.now,
+                          last_visit: User::NewTopicDuration::LAST_VISIT,
+                          always: User::NewTopicDuration::ALWAYS,
+                          default_duration: SiteSetting.default_other_new_topic_duration_minutes,
+                          min_date: Time.at(SiteSetting.min_new_topics_time).to_datetime,
+                          max_new_topics: SiteSetting.max_new_topics)
+    DB.exec(sql)
+  end
+
+  def down
+    raise IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20210203031628_add_duration_minutes_to_topic_timer.rb b/db/migrate/20210203031628_add_duration_minutes_to_topic_timer.rb
new file mode 100644
index 0000000000..3df0d3ad08
--- /dev/null
+++ b/db/migrate/20210203031628_add_duration_minutes_to_topic_timer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddDurationMinutesToTopicTimer < ActiveRecord::Migration[6.0]
+  def up
+    add_column :topic_timers, :duration_minutes, :integer
+
+    # 7 is delete_replies type, this duration is measured in days, the other
+    # duration is measured in hours
+    DB.exec("UPDATE topic_timers SET duration_minutes = (duration * 60 * 24) WHERE duration_minutes != duration AND status_type = 7 AND duration IS NOT NULL")
+    DB.exec("UPDATE topic_timers SET duration_minutes = (duration * 60) WHERE duration_minutes != duration AND status_type != 7 AND duration IS NOT NULL")
+  end
+
+  def down
+    remove_column :topic_timers, :duration_minutes
+  end
+end
diff --git a/db/migrate/20210204135429_rename_sso_site_settings.rb b/db/migrate/20210204135429_rename_sso_site_settings.rb
new file mode 100644
index 0000000000..a793e9fb80
--- /dev/null
+++ b/db/migrate/20210204135429_rename_sso_site_settings.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class RenameSsoSiteSettings < ActiveRecord::Migration[6.0]
+  RENAME_SETTINGS = [
+    ['enable_sso', 'enable_discourse_connect'],
+    ['sso_allows_all_return_paths', 'discourse_connect_allows_all_return_paths'],
+    ['enable_sso_provider', 'enable_discourse_connect_provider'],
+    ['verbose_sso_logging', 'verbose_discourse_connect_logging'],
+    ['sso_url', 'discourse_connect_url'],
+    ['sso_secret', 'discourse_connect_secret'],
+    ['sso_provider_secrets', 'discourse_connect_provider_secrets'],
+    ['sso_overrides_groups', 'discourse_connect_overrides_groups'],
+    ['sso_overrides_bio', 'discourse_connect_overrides_bio'],
+    ['sso_overrides_email', 'auth_overrides_email'],
+    ['sso_overrides_username', 'auth_overrides_username'],
+    ['sso_overrides_name', 'auth_overrides_name'],
+    ['sso_overrides_avatar', 'discourse_connect_overrides_avatar'],
+    ['sso_overrides_profile_background', 'discourse_connect_overrides_profile_background'],
+    ['sso_overrides_location', 'discourse_connect_overrides_location'],
+    ['sso_overrides_website', 'discourse_connect_overrides_website'],
+    ['sso_overrides_card_background', 'discourse_connect_overrides_card_background'],
+    ['external_auth_skip_create_confirm', 'auth_skip_create_confirm'],
+    ['external_auth_immediately', 'auth_immediately']
+  ]
+
+  def up
+    # Copying the rows so that things keep working during deploy
+    # They will be dropped in post_migrate/20210219171329_drop_old_sso_site_settings
+
+    RENAME_SETTINGS.each do |old_name, new_name|
+      execute <<~SQL
+        INSERT INTO site_settings (name, data_type, value, created_at, updated_at)
+        SELECT '#{new_name}', data_type, value, created_at, updated_at
+        FROM site_settings
+        WHERE name = '#{old_name}'
+      SQL
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20210204195932_add_replacement_to_watched_words.rb b/db/migrate/20210204195932_add_replacement_to_watched_words.rb
new file mode 100644
index 0000000000..8496793806
--- /dev/null
+++ b/db/migrate/20210204195932_add_replacement_to_watched_words.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddReplacementToWatchedWords < ActiveRecord::Migration[6.0]
+  def change
+    add_column :watched_words, :replacement, :string, null: true
+  end
+end
diff --git a/db/migrate/20210224162050_remove_emoji_one_from_emoji_set_site_setting.rb b/db/migrate/20210224162050_remove_emoji_one_from_emoji_set_site_setting.rb
new file mode 100644
index 0000000000..1ffbaac72d
--- /dev/null
+++ b/db/migrate/20210224162050_remove_emoji_one_from_emoji_set_site_setting.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class RemoveEmojiOneFromEmojiSetSiteSetting < ActiveRecord::Migration[6.0]
+  def up
+    result = execute("SELECT value FROM site_settings WHERE name='emoji_set' and value='emoji_one'")
+    return unless result.count > 0
+
+    execute "DELETE FROM site_settings where name='emoji_set' and value='emoji_one'"
+    execute "UPDATE posts SET baked_version = 0 WHERE cooked LIKE '%/images/emoji/emoji_one%'"
+  end
+
+  def down
+    # Cannot undo
+  end
+end
diff --git a/db/migrate/20210308010745_delete_orphan_post_actions.rb b/db/migrate/20210308010745_delete_orphan_post_actions.rb
new file mode 100644
index 0000000000..4abea24789
--- /dev/null
+++ b/db/migrate/20210308010745_delete_orphan_post_actions.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class DeleteOrphanPostActions < ActiveRecord::Migration[6.0]
+  def up
+    sql = <<~SQL
+      DELETE FROM post_actions
+      USING post_actions pa
+      LEFT JOIN posts ON posts.id = pa.post_id
+      WHERE posts.id IS NULL
+      AND post_actions.id = pa.id
+    SQL
+
+    execute(sql)
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20210308195916_add_unique_index_to_invited_groups.rb b/db/migrate/20210308195916_add_unique_index_to_invited_groups.rb
new file mode 100644
index 0000000000..c3f8b60769
--- /dev/null
+++ b/db/migrate/20210308195916_add_unique_index_to_invited_groups.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddUniqueIndexToInvitedGroups < ActiveRecord::Migration[6.0]
+  def change
+    execute <<~SQL
+      DELETE FROM invited_groups a
+      USING invited_groups b
+      WHERE a.id < b.id
+        AND a.invite_id = b.invite_id
+        AND a.group_id = b.group_id
+    SQL
+
+    add_index :invited_groups, [:group_id, :invite_id], unique: true
+  end
+end
diff --git a/db/migrate/20210311022303_drop_show_filter_by_tag_site_setting.rb b/db/migrate/20210311022303_drop_show_filter_by_tag_site_setting.rb
new file mode 100644
index 0000000000..f3faf3308c
--- /dev/null
+++ b/db/migrate/20210311022303_drop_show_filter_by_tag_site_setting.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class DropShowFilterByTagSiteSetting < ActiveRecord::Migration[6.0]
+  def up
+    execute <<~SQL
+      DELETE FROM site_settings
+      WHERE name = 'show_filter_by_tag'
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20210311070755_add_image_upload_id_to_badges.rb b/db/migrate/20210311070755_add_image_upload_id_to_badges.rb
new file mode 100644
index 0000000000..c9d15ee030
--- /dev/null
+++ b/db/migrate/20210311070755_add_image_upload_id_to_badges.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddImageUploadIdToBadges < ActiveRecord::Migration[6.0]
+  def change
+    add_column :badges, :image_upload_id, :integer
+    reversible do |dir|
+      dir.up do
+        DB.exec <<~SQL
+          UPDATE badges b1
+          SET image_upload_id = u.id
+          FROM (
+            SELECT id, (regexp_matches(b.image, '[a-f0-9]{40}'))[1] as sha1
+            FROM badges b
+            WHERE
+              b.image IS NOT NULL AND
+              b.image ~ '[a-f0-9]{40}'
+          ) b2
+          JOIN uploads u ON u.sha1 = b2.sha1
+          WHERE
+            b1.id = b2.id
+        SQL
+      end
+    end
+  end
+end
diff --git a/db/migrate/20210315173137_set_disable_mailing_list_mode.rb b/db/migrate/20210315173137_set_disable_mailing_list_mode.rb
new file mode 100644
index 0000000000..83abd1d93d
--- /dev/null
+++ b/db/migrate/20210315173137_set_disable_mailing_list_mode.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class SetDisableMailingListMode < ActiveRecord::Migration[6.0]
+  def up
+    result = execute "SELECT COUNT(*) FROM user_options WHERE mailing_list_mode"
+    if result.first['count'] > 0
+      execute <<~SQL
+        INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
+        VALUES('disable_mailing_list_mode', 5, 'f', NOW(), NOW())
+        ON CONFLICT (name) DO NOTHING
+      SQL
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20210318020143_add_pinned_column_to_bookmarks.rb b/db/migrate/20210318020143_add_pinned_column_to_bookmarks.rb
new file mode 100644
index 0000000000..6a121169f7
--- /dev/null
+++ b/db/migrate/20210318020143_add_pinned_column_to_bookmarks.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPinnedColumnToBookmarks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :bookmarks, :pinned, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20210323142518_update_invites_redemption_count.rb b/db/migrate/20210323142518_update_invites_redemption_count.rb
new file mode 100644
index 0000000000..2646799b6d
--- /dev/null
+++ b/db/migrate/20210323142518_update_invites_redemption_count.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class UpdateInvitesRedemptionCount < ActiveRecord::Migration[6.0]
+  def change
+    execute <<~SQL
+      WITH invite_counts AS (
+        SELECT invite_id, COUNT(*) count
+        FROM invited_users
+        GROUP BY invite_id
+      )
+      UPDATE invites
+      SET redemption_count = GREATEST(redemption_count, count)
+      FROM invite_counts
+      WHERE invites.id = invite_counts.invite_id
+    SQL
+  end
+end
diff --git a/db/migrate/20210406060434_fix_topic_user_bookmarked_sync_issues_again.rb b/db/migrate/20210406060434_fix_topic_user_bookmarked_sync_issues_again.rb
new file mode 100644
index 0000000000..41aedc5554
--- /dev/null
+++ b/db/migrate/20210406060434_fix_topic_user_bookmarked_sync_issues_again.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class FixTopicUserBookmarkedSyncIssuesAgain < ActiveRecord::Migration[6.0]
+  disable_ddl_transaction!
+
+  def up
+    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/db/migrate/20210409142455_add_token_to_invites.rb b/db/migrate/20210409142455_add_token_to_invites.rb
new file mode 100644
index 0000000000..43d1632a66
--- /dev/null
+++ b/db/migrate/20210409142455_add_token_to_invites.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTokenToInvites < ActiveRecord::Migration[6.0]
+  def change
+    add_column :invites, :email_token, :string
+  end
+end
diff --git a/db/migrate/20210414013318_add_category_setting_allow_unlimited_owner_edits_op.rb b/db/migrate/20210414013318_add_category_setting_allow_unlimited_owner_edits_op.rb
new file mode 100644
index 0000000000..85fd823813
--- /dev/null
+++ b/db/migrate/20210414013318_add_category_setting_allow_unlimited_owner_edits_op.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCategorySettingAllowUnlimitedOwnerEditsOp < ActiveRecord::Migration[6.0]
+  def change
+    add_column :categories, :allow_unlimited_owner_edits_on_first_post, :boolean, default: false, null: false
+  end
+end
diff --git a/db/migrate/20210420015635_add_searchable_to_user_fields.rb b/db/migrate/20210420015635_add_searchable_to_user_fields.rb
new file mode 100644
index 0000000000..7634f987e3
--- /dev/null
+++ b/db/migrate/20210420015635_add_searchable_to_user_fields.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSearchableToUserFields < ActiveRecord::Migration[6.0]
+  def change
+    add_column :user_fields, :searchable, :boolean, default: :false, null: false
+  end
+end
diff --git a/db/post_migrate/20210125100452_migrate_search_data_after_default_locale_rename.rb b/db/post_migrate/20210125100452_migrate_search_data_after_default_locale_rename.rb
new file mode 100644
index 0000000000..5d3f6e6d01
--- /dev/null
+++ b/db/post_migrate/20210125100452_migrate_search_data_after_default_locale_rename.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class MigrateSearchDataAfterDefaultLocaleRename < ActiveRecord::Migration[6.0]
+  disable_ddl_transaction!
+
+  def up
+    %w{category tag topic user}.each { |model| fix_search_data(model) }
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+  private
+
+  def fix_search_data(model)
+    key = "#{model}_id"
+    table = "#{model}_search_data"
+
+    puts "Migrating #{table} to new locale."
+
+    sql = <<~SQL
+      UPDATE #{table}
+         SET locale = 'en'
+       WHERE #{key} IN (
+              SELECT #{key}
+                FROM #{table}
+               WHERE locale = 'en_US'
+               LIMIT 100000
+           )
+    SQL
+
+    loop do
+      count = execute(sql).cmd_tuples
+      break if count == 0
+      puts "Migrated #{count} rows of #{table} to new locale."
+    end
+  end
+end
diff --git a/db/post_migrate/20210127140730_undo_add_processed_to_notifications.rb b/db/post_migrate/20210127140730_undo_add_processed_to_notifications.rb
new file mode 100644
index 0000000000..2904760628
--- /dev/null
+++ b/db/post_migrate/20210127140730_undo_add_processed_to_notifications.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class UndoAddProcessedToNotifications < ActiveRecord::Migration[6.0]
+  def up
+    execute "ALTER TABLE notifications DROP COLUMN IF EXISTS processed"
+  end
+end
diff --git a/db/post_migrate/20210207232853_fix_topic_timer_duration_minutes.rb b/db/post_migrate/20210207232853_fix_topic_timer_duration_minutes.rb
new file mode 100644
index 0000000000..22ecc3094f
--- /dev/null
+++ b/db/post_migrate/20210207232853_fix_topic_timer_duration_minutes.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+class FixTopicTimerDurationMinutes < ActiveRecord::Migration[6.0]
+  def up
+    DB.exec("DELETE FROM topic_timers WHERE status_type = 7 AND duration > 20 * 365")
+    DB.exec("DELETE FROM topic_timers WHERE status_type != 7 AND duration > 20 * 365 * 24")
+
+    DB.exec("UPDATE topic_timers SET duration_minutes = (duration * 60 * 24) WHERE duration_minutes IS NULL AND status_type = 7 AND duration IS NOT NULL")
+    DB.exec("UPDATE topic_timers SET duration_minutes = (duration * 60) WHERE duration_minutes IS NULL AND status_type != 7 AND duration IS NOT NULL")
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/post_migrate/20210215231312_fix_group_flair_avatar_upload_security_and_acls.rb b/db/post_migrate/20210215231312_fix_group_flair_avatar_upload_security_and_acls.rb
new file mode 100644
index 0000000000..3232bacb6f
--- /dev/null
+++ b/db/post_migrate/20210215231312_fix_group_flair_avatar_upload_security_and_acls.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class FixGroupFlairAvatarUploadSecurityAndAcls < ActiveRecord::Migration[6.0]
+  disable_ddl_transaction!
+
+  def up
+    upload_ids = DB.query_single(<<~SQL
+      SELECT flair_upload_id
+      FROM groups
+      WHERE flair_upload_id IS NOT NULL
+     SQL
+    )
+
+    if upload_ids.any?
+      reason = "group_flair fixup migration"
+      DB.exec(<<~SQL, upload_ids: upload_ids, reason: reason, now: Time.zone.now)
+        UPDATE uploads SET secure = false, security_last_changed_at = :now, updated_at = :now, security_last_changed_reason = :reason
+        WHERE id IN (:upload_ids) AND uploads.secure
+      SQL
+
+      if Discourse.store.external?
+        uploads = Upload.where(id: upload_ids, secure: false).where("updated_at = security_last_changed_at")
+        uploads.each do |upload|
+          Discourse.store.update_upload_ACL(upload)
+          upload.touch
+        end
+      end
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/post_migrate/20210218022739_move_new_since_to_new_table_again.rb b/db/post_migrate/20210218022739_move_new_since_to_new_table_again.rb
new file mode 100644
index 0000000000..f468d09ff7
--- /dev/null
+++ b/db/post_migrate/20210218022739_move_new_since_to_new_table_again.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+class MoveNewSinceToNewTableAgain < ActiveRecord::Migration[6.0]
+  disable_ddl_transaction!
+  BATCH_SIZE = 30_000
+
+  def up
+    offset = 0
+    loop do
+      min_id, max_id = DB.query_single(<<~SQL, offset: offset, batch_size: BATCH_SIZE)
+        SELECT min(user_id), max(user_id)
+        FROM (
+          SELECT user_id
+          FROM user_stats
+          ORDER BY user_id
+          LIMIT :batch_size
+          OFFSET :offset
+        ) X
+      SQL
+
+      # will return nil
+      break if !min_id
+
+      sql = <<~SQL
+        INSERT INTO dismissed_topic_users (user_id, topic_id, created_at)
+        SELECT users.id, topics.id, user_stats.new_since
+        FROM user_stats
+        JOIN users ON users.id = user_stats.user_id
+        JOIN user_options ON user_options.user_id = users.id
+        LEFT JOIN topics ON topics.created_at <= user_stats.new_since
+          AND topics.archetype <> :private_message
+          AND topics.created_at >= GREATEST(CASE
+                      WHEN COALESCE(user_options.new_topic_duration_minutes, :default_duration) = :always THEN users.created_at
+                      WHEN COALESCE(user_options.new_topic_duration_minutes, :default_duration) = :last_visit THEN COALESCE(users.previous_visit_at,users.created_at)
+                      ELSE (:now::timestamp - INTERVAL '1 MINUTE' * COALESCE(user_options.new_topic_duration_minutes, :default_duration))
+                   END, :min_date)
+          AND topics.id IN(SELECT id FROM topics ORDER BY created_at DESC LIMIT :max_new_topics)
+        LEFT JOIN topic_users ON topics.id = topic_users.topic_id AND users.id = topic_users.user_id
+        LEFT JOIN dismissed_topic_users ON dismissed_topic_users.topic_id = topics.id AND users.id = dismissed_topic_users.user_id
+        WHERE user_stats.new_since IS NOT NULL
+        AND user_stats.user_id >= :min_id
+        AND user_stats.user_id <= :max_id
+        AND topic_users.last_read_post_number IS NULL
+        AND topics.id IS NOT NULL
+        AND dismissed_topic_users.id IS NULL
+        ORDER BY topics.created_at DESC
+        ON CONFLICT DO NOTHING
+      SQL
+
+      DB.exec(sql,
+               now: DateTime.now,
+               last_visit: User::NewTopicDuration::LAST_VISIT,
+               always: User::NewTopicDuration::ALWAYS,
+               default_duration: SiteSetting.default_other_new_topic_duration_minutes,
+               min_date: Time.at(SiteSetting.min_new_topics_time).to_datetime,
+               private_message: Archetype.private_message,
+               min_id: min_id,
+               max_id: max_id,
+               max_new_topics: SiteSetting.max_new_topics)
+
+      offset += BATCH_SIZE
+
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/post_migrate/20210219171329_drop_old_sso_site_settings.rb b/db/post_migrate/20210219171329_drop_old_sso_site_settings.rb
new file mode 100644
index 0000000000..a201cfcd2e
--- /dev/null
+++ b/db/post_migrate/20210219171329_drop_old_sso_site_settings.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class DropOldSsoSiteSettings < ActiveRecord::Migration[6.0]
+  def up
+    # These were copied to their new names in migrate/20210204135429_rename_sso_site_settings
+    execute <<~SQL
+      DELETE FROM site_settings
+      WHERE name IN (
+        'enable_sso',
+        'sso_allows_all_return_paths',
+        'enable_sso_provider',
+        'verbose_sso_logging',
+        'sso_url',
+        'sso_secret',
+        'sso_provider_secrets',
+        'sso_overrides_groups',
+        'sso_overrides_bio',
+        'sso_overrides_email',
+        'sso_overrides_username',
+        'sso_overrides_name',
+        'sso_overrides_avatar',
+        'sso_overrides_profile_background',
+        'sso_overrides_location',
+        'sso_overrides_website',
+        'sso_overrides_card_background',
+        'external_auth_skip_create_confirm',
+        'external_auth_immediately'
+      )
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/post_migrate/20210302164429_drop_flash_onebox_site_setting.rb b/db/post_migrate/20210302164429_drop_flash_onebox_site_setting.rb
new file mode 100644
index 0000000000..374afe0fb1
--- /dev/null
+++ b/db/post_migrate/20210302164429_drop_flash_onebox_site_setting.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class DropFlashOneboxSiteSetting < ActiveRecord::Migration[6.0]
+  def up
+    execute <<~SQL
+      DELETE FROM site_settings
+      WHERE name = 'enable_flash_video_onebox'
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/post_migrate/20210324043327_delete_orphan_post_revisions.rb b/db/post_migrate/20210324043327_delete_orphan_post_revisions.rb
new file mode 100644
index 0000000000..668c4cec5d
--- /dev/null
+++ b/db/post_migrate/20210324043327_delete_orphan_post_revisions.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class DeleteOrphanPostRevisions < ActiveRecord::Migration[6.0]
+  def up
+    sql = <<~SQL
+        DELETE FROM post_revisions
+        USING post_revisions pr
+        LEFT JOIN posts ON posts.id = pr.post_id
+        WHERE posts.id IS NULL
+        AND post_revisions.id = pr.id
+    SQL
+
+    execute(sql)
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/post_migrate/20210328233843_fix_bookmarks_with_incorrect_topic_id.rb b/db/post_migrate/20210328233843_fix_bookmarks_with_incorrect_topic_id.rb
new file mode 100644
index 0000000000..0c735dce62
--- /dev/null
+++ b/db/post_migrate/20210328233843_fix_bookmarks_with_incorrect_topic_id.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class FixBookmarksWithIncorrectTopicId < ActiveRecord::Migration[6.0]
+  def up
+    result = DB.exec(<<~SQL)
+      UPDATE bookmarks bm
+      SET topic_id = subquery.correct_topic_id, updated_at = NOW()
+      FROM (
+        SELECT bookmarks.id AS bookmark_id, bookmarks.post_id, bookmarks.topic_id,
+               posts.topic_id AS correct_topic_id
+        FROM bookmarks
+        INNER JOIN posts ON posts.id = bookmarks.post_id
+        WHERE posts.topic_id != bookmarks.topic_id
+      ) AS subquery
+      WHERE bm.id = subquery.bookmark_id;
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md
index f34cbcc922..1c56df4524 100644
--- a/docs/DEVELOPMENT-OSX-NATIVE.md
+++ b/docs/DEVELOPMENT-OSX-NATIVE.md
@@ -183,15 +183,17 @@ ImageMagick is used for generating avatars (including for test fixtures).
     brew install imagemagick
 
 ImageMagick is going to want to use the Helvetica font to generate the
-letter-avatars:
+letter-avatars. To make it available we need to extract it from the system
+fonts:
 
 ```sh
-brew install fondu
+brew install fontforge
 cd ~/Library/Fonts
-fondu /System/Library/Fonts/Helvetica.dfont
+export HELVETICA_FONT=/System/Library/Fonts/Helvetica.ttc # The extension might be dfont instead
+fontforge -c "[open(u'%s(%s)' % ('$HELVETICA_FONT', font)).generate('%s.ttf' % font) for font in fontsInFile('$HELVETICA_FONT')]"
 mkdir ~/.magick
 cd ~/.magick
-curl https://www.imagemagick.org/Usage/scripts/imagick_type_gen > type_gen
+curl https://legacy.imagemagick.org/Usage/scripts/imagick_type_gen > type_gen
 find /System/Library/Fonts /Library/Fonts ~/Library/Fonts -name "*.[to]tf" | perl type_gen -f - > type.xml
 cd /usr/local/Cellar/imagemagick/<version>/etc/ImageMagick-6
 ```
diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md
index d27c98796d..1abecc2db6 100644
--- a/docs/INSTALL-cloud.md
+++ b/docs/INSTALL-cloud.md
@@ -14,7 +14,7 @@ Create your new cloud server, for example [on DigitalOcean][do]:
 
 - Enter your domain `discourse.example.com` as the Droplet name.
 
-Create your new Droplet. You will receive an email with the root password. (However, if you know [how to use SSH keys](https://www.google.com/search?q=digitalocean+ssh+keys), you may not need a password to log in.)
+Create your new Droplet. You may receive an email with the root password, however, [you should set up SSH keys](https://www.google.com/search?q=digitalocean+ssh+keys), as they are more secure.
 
 ### Access Your Cloud Server
 
@@ -22,9 +22,7 @@ Connect to your server via its IP address using SSH, or [Putty][put] on Windows:
 
     ssh root@192.168.1.1
 
-Enter the root password from the email DigitalOcean sent you when the server was set up. You will be prompted to change the root password.
-
-<img src="https://www.discourse.org/images/install/15/ssh-login-terminal.png" width="600px">
+Either use the root password from the email DigitalOcean sent you when the server was set up, or have a valid SSH key configured on your local machine.
 
 ### Install Docker / Git (Optional)
 
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 49f29af55f..cc386d25c6 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -21,9 +21,9 @@ Hosting Rails applications is complicated. Even if you already have Postgres, Re
 
 ### Software Requirements
 
-- [Postgres 10+](https://www.postgresql.org/download/)
-- [Redis 2.6+](https://redis.io/download)
-- [Ruby 2.5+](https://www.ruby-lang.org/en/downloads/) (we recommend 2.5.2 or higher)
+- [Postgres 13+](https://www.postgresql.org/download/)
+- [Redis 6+](https://redis.io/download)
+- [Ruby 2.7](https://www.ruby-lang.org/en/downloads/) (we recommend 2.7.2)
 
 ## Security
 
diff --git a/docs/SECURITY.md b/docs/SECURITY.md
index ee485b5f05..cd44bf92b4 100644
--- a/docs/SECURITY.md
+++ b/docs/SECURITY.md
@@ -25,7 +25,7 @@ There are 3 main scenarios we protect against:
 
 1. **Markdown preview invokes an XSS.** This is possibly severe in one specific case: when a forum staff member edits a user's post, seeing the raw markup, where a malicious user may have inserted code to run JavaScript. This code would only show up in the preview, but it would run in the context of a forum staff member, which is *very* bad.
 
-2. **Markdown displayed on the page invokes an XSS.** To protect against client side preview XSS, Discourse uses [Google Caja](https://developers.google.com/caja/) in the preview window.
+2. **Markdown displayed on the page invokes an XSS.** To protect against client side preview XSS, Discourse uses [xss.js](https://jsxss.com/en/index.html) in the preview window.
 
 3. **CSP is on by default** for [all Discourse installations](https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243) as of Discourse 2.2. It can be switched off in the site settings, but it is default on.
 
diff --git a/docs/code-of-conduct.md b/docs/code-of-conduct.md
index 51d18f5e3f..34318440f4 100644
--- a/docs/code-of-conduct.md
+++ b/docs/code-of-conduct.md
@@ -2,73 +2,121 @@
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at team@discourse.org. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+reported to the community leaders responsible for enforcement at
+team@discourse.org.
+All complaints will be reviewed and investigated promptly and fairly.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [https://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
 
-[homepage]: https://contributor-covenant.org
-[version]: https://contributor-covenant.org/version/1/4/
+[homepage]: https://www.contributor-covenant.org
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
diff --git a/lefthook.yml b/lefthook.yml
index 2e622162ee..50e4342d19 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -7,7 +7,7 @@ pre-commit:
     prettier:
       glob: "*.{js,es6}"
       include: "app/assets/javascripts|test/javascripts"
-      run: yarn prettier --list-different {staged_files}
+      run: yarn pprettier --list-different {staged_files}
     eslint-es6:
       glob: "*.es6"
       include: "app/assets/javascripts|test/javascripts"
@@ -54,7 +54,7 @@ lints:
     prettier:
       glob: "*.{js,es6}"
       include: "app/assets/javascripts|test/javascripts"
-      run: yarn prettier --list-different {all_files}
+      run: yarn pprettier --list-different {all_files}
     eslint-assets-es6:
       run: yarn eslint --ext .es6 app/assets/javascripts
     eslint-assets-js:
diff --git a/lib/auth/auth_provider.rb b/lib/auth/auth_provider.rb
index d72748fc6a..50bb76c7e8 100644
--- a/lib/auth/auth_provider.rb
+++ b/lib/auth/auth_provider.rb
@@ -8,7 +8,7 @@ class Auth::AuthProvider
   end
 
   def self.auth_attributes
-    [:pretty_name, :title, :message, :frame_width, :frame_height, :authenticator,
+    [:authenticator, :pretty_name, :title, :message, :frame_width, :frame_height,
      :pretty_name_setting, :title_setting, :enabled_setting, :full_screen_login, :full_screen_login_setting,
      :custom_url, :background_color, :icon]
   end
@@ -32,6 +32,10 @@ class Auth::AuthProvider
     Discourse.deprecate("(#{authenticator.name}) full_screen_login is now forced. The full_screen_login_setting parameter can be removed from the auth_provider.")
   end
 
+  def message=(val)
+    Discourse.deprecate("(#{authenticator.name}) message is no longer used because all logins are full screen. It should be removed from the auth_provider")
+  end
+
   def name
     authenticator.name
   end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 884b000d4c..2fe829c6cd 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -49,7 +49,7 @@ class Auth::DefaultCurrentUserProvider
       methods: :post,
       actions: "admin/email#handle_mail",
       formats: nil
-    )
+    ),
   ]
 
   # do all current user initialization here
diff --git a/lib/auth/google_oauth2_authenticator.rb b/lib/auth/google_oauth2_authenticator.rb
index fd401a87b6..59b0caa2c7 100644
--- a/lib/auth/google_oauth2_authenticator.rb
+++ b/lib/auth/google_oauth2_authenticator.rb
@@ -29,6 +29,12 @@ class Auth::GoogleOAuth2Authenticator < Auth::ManagedAuthenticator
         if (google_oauth2_prompt = SiteSetting.google_oauth2_prompt).present?
           strategy.options[:prompt] = google_oauth2_prompt.gsub("|", " ")
         end
+
+        # All the data we need for the `info` and `credentials` auth hash
+        # are obtained via the user info API, not the JWT. Using and verifying
+        # the JWT can fail due to clock skew, so let's skip it completely.
+        # https://github.com/zquestz/omniauth-google-oauth2/pull/392
+        strategy.options[:skip_jwt] = true
       }
     }
     omniauth.provider :google_oauth2, options
diff --git a/lib/auth/managed_authenticator.rb b/lib/auth/managed_authenticator.rb
index b0477c5f08..7b07e063d9 100644
--- a/lib/auth/managed_authenticator.rb
+++ b/lib/auth/managed_authenticator.rb
@@ -103,7 +103,7 @@ class Auth::ManagedAuthenticator < Auth::Authenticator
       result.name = nil
     end
     result.username = info[:nickname]
-    result.email_valid = primary_email_verified?(auth_token) if result.email
+    result.email_valid = primary_email_verified?(auth_token) if result.email.present?
     result.extra_data = {
       provider: auth_token[:provider],
       uid: auth_token[:uid]
diff --git a/lib/auth/result.rb b/lib/auth/result.rb
index 18dff598aa..35ce4cab09 100644
--- a/lib/auth/result.rb
+++ b/lib/auth/result.rb
@@ -52,6 +52,13 @@ class Auth::Result
     @email&.downcase
   end
 
+  def email_valid=(val)
+    if !val.in? [true, false, nil]
+      raise ArgumentError, "email_valid should be boolean or nil"
+    end
+    @email_valid = !!val
+  end
+
   def failed?
     !!@failed
   end
@@ -70,17 +77,17 @@ class Auth::Result
 
   def apply_user_attributes!
     change_made = false
-    if SiteSetting.sso_overrides_username? && username.present? && username != user.username
-      user.username = UserNameSuggester.suggest(username || name || email, user.username)
+    if SiteSetting.auth_overrides_username? && username.present? && username != user.username
+      user.username = UserNameSuggester.suggest(username_suggester_attributes, user.username)
       change_made = true
     end
 
-    if SiteSetting.sso_overrides_email && email_valid && email.present? && user.email != Email.downcase(email)
+    if SiteSetting.auth_overrides_email && email_valid && email.present? && user.email != Email.downcase(email)
       user.email = email
       change_made = true
     end
 
-    if SiteSetting.sso_overrides_name && name.present? && user.name != name
+    if SiteSetting.auth_overrides_name && name.present? && user.name != name
       user.name = name
       change_made = true
     end
@@ -89,11 +96,11 @@ class Auth::Result
   end
 
   def can_edit_name
-    !SiteSetting.sso_overrides_name
+    !SiteSetting.auth_overrides_name
   end
 
   def can_edit_username
-    !(SiteSetting.sso_overrides_username || omit_username)
+    !(SiteSetting.auth_overrides_username || omit_username)
   end
 
   def to_client_hash
@@ -132,7 +139,7 @@ class Auth::Result
 
     result = {
       email: email,
-      username: UserNameSuggester.suggest(username || name || email),
+      username: UserNameSuggester.suggest(username_suggester_attributes),
       auth_provider: authenticator_name,
       email_valid: !!email_valid,
       can_edit_username: can_edit_username,
@@ -148,4 +155,10 @@ class Auth::Result
 
     result
   end
+
+  private
+
+  def username_suggester_attributes
+    username || name || email
+  end
 end
diff --git a/lib/autospec/simple_runner.rb b/lib/autospec/simple_runner.rb
index f3496dadb1..43b112ccde 100644
--- a/lib/autospec/simple_runner.rb
+++ b/lib/autospec/simple_runner.rb
@@ -23,7 +23,7 @@ module Autospec
 
       command = begin
         line_specified = specs.split.any? { |s| s =~ /\:/ } # Parallel spec can't run specific line
-        multiple_files = specs.split.count > 1 # Only paralellize multiple files
+        multiple_files = specs.split.count > 1 || specs == "spec" # Only paralellize multiple files
         if ENV["PARALLEL_SPEC"] == '1' && multiple_files && !line_specified
           "bin/turbo_rspec #{args.join(" ")} #{specs.split.join(" ")}"
         else
diff --git a/lib/backup_restore.rb b/lib/backup_restore.rb
index b8a19efe4a..60b5d25b27 100644
--- a/lib/backup_restore.rb
+++ b/lib/backup_restore.rb
@@ -110,7 +110,7 @@ module BackupRestore
   DatabaseConfiguration = Struct.new(:host, :port, :username, :password, :database)
 
   def self.database_configuration
-    config = ActiveRecord::Base.connection_pool.spec.config
+    config = ActiveRecord::Base.connection_pool.db_config.configuration_hash
     config = config.with_indifferent_access
 
     # credentials for PostgreSQL in CI environment
diff --git a/lib/backup_restore/backup_file_handler.rb b/lib/backup_restore/backup_file_handler.rb
index 86103663e2..d9369789fb 100644
--- a/lib/backup_restore/backup_file_handler.rb
+++ b/lib/backup_restore/backup_file_handler.rb
@@ -6,12 +6,13 @@ module BackupRestore
 
     delegate :log, to: :@logger, private: true
 
-    def initialize(logger, filename, current_db, root_tmp_directory = Rails.root)
+    def initialize(logger, filename, current_db, root_tmp_directory: Rails.root, location: nil)
       @logger = logger
       @filename = filename
       @current_db = current_db
       @root_tmp_directory = root_tmp_directory
       @is_archive = !(@filename =~ /\.sql\.gz$/)
+      @store_location = location
     end
 
     def decompress
@@ -48,7 +49,7 @@ module BackupRestore
     end
 
     def copy_archive_to_tmp_directory
-      store = BackupRestore::BackupStore.create
+      store = BackupRestore::BackupStore.create(location: @store_location)
 
       if store.remote?
         log "Downloading archive to tmp directory..."
diff --git a/lib/backup_restore/backup_store.rb b/lib/backup_restore/backup_store.rb
index 2f95551dd5..2243837fd0 100644
--- a/lib/backup_restore/backup_store.rb
+++ b/lib/backup_restore/backup_store.rb
@@ -8,7 +8,7 @@ module BackupRestore
 
     # @return [BackupStore]
     def self.create(opts = {})
-      case SiteSetting.backup_location
+      case opts[:location] || SiteSetting.backup_location
       when BackupLocationSiteSetting::LOCAL
         require_dependency "backup_restore/local_backup_store"
         BackupRestore::LocalBackupStore.new(opts)
diff --git a/lib/backup_restore/database_restorer.rb b/lib/backup_restore/database_restorer.rb
index 2ffe09e97e..100a366cd9 100644
--- a/lib/backup_restore/database_restorer.rb
+++ b/lib/backup_restore/database_restorer.rb
@@ -136,7 +136,7 @@ module BackupRestore
           "SKIP_OPTIMIZE_ICONS" => "1",
           "DISABLE_TRANSLATION_OVERRIDES" => "1"
         },
-        "rake db:migrate",
+        "rake", "db:migrate",
         failure_message: "Failed to migrate database.",
         chdir: Rails.root
       )
diff --git a/lib/backup_restore/factory.rb b/lib/backup_restore/factory.rb
index 5bc044b924..869b05a09a 100644
--- a/lib/backup_restore/factory.rb
+++ b/lib/backup_restore/factory.rb
@@ -27,8 +27,8 @@ module BackupRestore
       MetaDataHandler.new(logger, filename, tmp_directory)
     end
 
-    def create_backup_file_handler(filename, current_db)
-      BackupFileHandler.new(logger, filename, current_db)
+    def create_backup_file_handler(filename, current_db, location)
+      BackupFileHandler.new(logger, filename, current_db, location: location)
     end
   end
 end
diff --git a/lib/backup_restore/logger.rb b/lib/backup_restore/logger.rb
index f33acbfd46..fe777d389b 100644
--- a/lib/backup_restore/logger.rb
+++ b/lib/backup_restore/logger.rb
@@ -19,7 +19,12 @@ module BackupRestore
       puts(message)
       publish_log(message, timestamp)
       save_log(message, timestamp)
-      Rails.logger.error("#{ex}\n" + ex.backtrace.join("\n")) if ex
+
+      if ex
+        formatted_ex = "#{ex}\n" + ex.backtrace.join("\n")
+        puts formatted_ex
+        Rails.logger.error(formatted_ex)
+      end
     end
 
     protected
diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index ce2248862c..589b15a45e 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -9,7 +9,7 @@ module BackupRestore
 
     attr_reader :success
 
-    def initialize(user_id:, filename:, factory:, disable_emails: true)
+    def initialize(user_id:, filename:, factory:, disable_emails: true, location: nil)
       @user_id = user_id
       @filename = filename
       @factory = factory
@@ -24,7 +24,7 @@ module BackupRestore
       @current_db = RailsMultisite::ConnectionManagement.current_db
 
       @system = factory.create_system_interface
-      @backup_file_handler = factory.create_backup_file_handler(@filename, @current_db)
+      @backup_file_handler = factory.create_backup_file_handler(@filename, @current_db, location)
       @database_restorer = factory.create_database_restorer(@current_db)
       @uploads_restorer = factory.create_uploads_restorer
     end
@@ -56,13 +56,14 @@ module BackupRestore
       @system.disable_readonly_mode
 
       clear_category_cache
-      clear_emoji_cache
-      clear_theme_cache
       clear_stats
       reload_translations
 
       @uploads_restorer.restore(@tmp_directory)
 
+      clear_emoji_cache
+      clear_theme_cache
+
       after_restore_hook
     rescue Compression::Strategy::ExtractFailed
       log 'ERROR: The uncompressed file is too big. Consider increasing the hidden ' \
@@ -134,6 +135,8 @@ module BackupRestore
     def clear_emoji_cache
       log "Clearing emoji cache..."
       Emoji.clear_cache
+    rescue => ex
+      log "Something went wrong while clearing emoji cache.", ex
     end
 
     def reload_translations
@@ -172,6 +175,8 @@ module BackupRestore
       ThemeField.force_recompilation!
       Theme.expire_site_cache!
       Stylesheet::Manager.cache.clear
+    rescue => ex
+      log "Something went wrong while clearing theme cache.", ex
     end
 
     def clear_stats
diff --git a/lib/backup_restore/s3_backup_store.rb b/lib/backup_restore/s3_backup_store.rb
index 359167b97c..f991c05829 100644
--- a/lib/backup_restore/s3_backup_store.rb
+++ b/lib/backup_restore/s3_backup_store.rb
@@ -48,7 +48,7 @@ module BackupRestore
       presigned_url(obj, :put, UPLOAD_URL_EXPIRES_AFTER_SECONDS)
     rescue Aws::Errors::ServiceError => e
       Rails.logger.warn("Failed to generate upload URL for S3: #{e.message.presence || e.class.name}")
-      raise StorageError
+      raise StorageError.new(e.message.presence || e.class.name)
     end
 
     def vacate_legacy_prefix
@@ -81,7 +81,7 @@ module BackupRestore
       objects
     rescue Aws::Errors::ServiceError => e
       Rails.logger.warn("Failed to list backups from S3: #{e.message.presence || e.class.name}")
-      raise StorageError
+      raise StorageError.new(e.message.presence || e.class.name)
     end
 
     def create_file_from_object(obj, include_download_source = false)
diff --git a/lib/backup_restore/uploads_restorer.rb b/lib/backup_restore/uploads_restorer.rb
index ae986bc164..0cf18a0558 100644
--- a/lib/backup_restore/uploads_restorer.rb
+++ b/lib/backup_restore/uploads_restorer.rb
@@ -6,6 +6,20 @@ module BackupRestore
   class UploadsRestorer
     delegate :log, to: :@logger, private: true
 
+    S3_ENDPOINT_REGEX = /\.s3(?:\.dualstack\.[a-z0-9\-]+?|[.\-][a-z0-9\-]+?)?\.amazonaws\.com/
+
+    def self.s3_regex_string(s3_base_url)
+      clean_url = s3_base_url.sub(S3_ENDPOINT_REGEX, ".s3.amazonaws.com")
+
+      regex_string = clean_url
+        .split(".s3.amazonaws.com")
+        .map { |s| Regexp.escape(s) }
+        .insert(1, S3_ENDPOINT_REGEX.source)
+        .join("")
+
+      [regex_string, clean_url]
+    end
+
     def initialize(logger)
       @logger = logger
     end
@@ -77,7 +91,7 @@ module BackupRestore
 
       current_s3_base_url = SiteSetting::Upload.enable_s3_uploads ? SiteSetting::Upload.s3_base_url : nil
       if (old_s3_base_url = BackupMetadata.value_for("s3_base_url")) && old_s3_base_url != current_s3_base_url
-        remap("#{old_s3_base_url}/", uploads_folder)
+        remap_s3("#{old_s3_base_url}/", uploads_folder)
       end
 
       current_s3_cdn_url = SiteSetting::Upload.enable_s3_uploads ? SiteSetting::Upload.s3_cdn_url : nil
@@ -112,6 +126,16 @@ module BackupRestore
       DbHelper.remap(from, to, verbose: true, excluded_tables: ["backup_metadata"])
     end
 
+    def remap_s3(old_s3_base_url, uploads_folder)
+      if old_s3_base_url.include?("amazonaws.com")
+        from_regex, from_clean_url = self.class.s3_regex_string(old_s3_base_url)
+        log "Remapping with regex from '#{from_clean_url}' to '#{uploads_folder}'"
+        DbHelper.regexp_replace(from_regex, uploads_folder, verbose: true, excluded_tables: ["backup_metadata"])
+      else
+        remap(old_s3_base_url, uploads_folder)
+      end
+    end
+
     def generate_optimized_images
       log "Optimizing site icons..."
       DB.exec("TRUNCATE TABLE optimized_images")
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index ba5c42a040..6bd8f58316 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -40,10 +40,7 @@ class BookmarkManager
   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 = find_bookmark_and_check_access(bookmark_id)
 
     bookmark.destroy
 
@@ -72,10 +69,7 @@ class BookmarkManager
   end
 
   def update(bookmark_id:, name:, reminder_type:, reminder_at:, options: {})
-    bookmark = Bookmark.find_by(id: bookmark_id)
-
-    raise Discourse::NotFound if bookmark.blank?
-    raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_edit?(bookmark)
+    bookmark = find_bookmark_and_check_access(bookmark_id)
 
     reminder_type = parse_reminder_type(reminder_type)
 
@@ -95,8 +89,27 @@ class BookmarkManager
     success
   end
 
+  def toggle_pin(bookmark_id:)
+    bookmark = find_bookmark_and_check_access(bookmark_id)
+    bookmark.pinned = !bookmark.pinned
+    success = bookmark.save
+
+    if bookmark.errors.any?
+      return add_errors_from(bookmark)
+    end
+
+    success
+  end
+
   private
 
+  def find_bookmark_and_check_access(bookmark_id)
+    bookmark = Bookmark.find_by(id: bookmark_id)
+    raise Discourse::NotFound if !bookmark
+    raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_edit?(bookmark)
+    bookmark
+  end
+
   def update_topic_user_bookmarked(topic, opts = {})
     # PostCreator can specify whether auto_track is enabled or not, don't want to
     # create a TopicUser in that case
diff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rb
index f2122f7c6c..fabf6f15bc 100644
--- a/lib/bookmark_query.rb
+++ b/lib/bookmark_query.rb
@@ -27,7 +27,9 @@ class BookmarkQuery
   end
 
   def list_all
-    results = user_bookmarks.order('bookmarks.updated_at DESC')
+    results = user_bookmarks.order(
+      '(CASE WHEN bookmarks.pinned THEN 0 ELSE 1 END), bookmarks.updated_at DESC'
+    )
 
     topics = Topic.listable_topics.secured(@guardian)
     pms = Topic.private_messages_for_user(@user)
diff --git a/lib/bookmark_reminder_notification_handler.rb b/lib/bookmark_reminder_notification_handler.rb
index e0c105c575..55c8247811 100644
--- a/lib/bookmark_reminder_notification_handler.rb
+++ b/lib/bookmark_reminder_notification_handler.rb
@@ -5,17 +5,16 @@ class BookmarkReminderNotificationHandler
     return if bookmark.blank?
     Bookmark.transaction do
       if bookmark.post.blank? || bookmark.post.deleted_at.present?
-        return clear_reminder(bookmark)
+        clear_reminder(bookmark)
+      elsif bookmark.topic
+        create_notification(bookmark)
+
+        if bookmark.auto_delete_when_reminder_sent?
+          BookmarkManager.new(bookmark.user).destroy(bookmark.id)
+        end
+
+        clear_reminder(bookmark)
       end
-      return unless bookmark.topic
-
-      create_notification(bookmark)
-
-      if bookmark.auto_delete_when_reminder_sent?
-        BookmarkManager.new(bookmark.user).destroy(bookmark.id)
-      end
-
-      clear_reminder(bookmark)
     end
   end
 
diff --git a/lib/cache.rb b/lib/cache.rb
index faae643f4c..7d69361915 100644
--- a/lib/cache.rb
+++ b/lib/cache.rb
@@ -22,6 +22,8 @@ class Cache
   # pointless data
   MAX_CACHE_AGE = 1.day unless defined? MAX_CACHE_AGE
 
+  attr_reader :namespace
+
   # we don't need this feature, 1 day expiry is enough
   # it makes lookups a tad cheaper
   def self.supports_cache_versioning?
@@ -66,7 +68,7 @@ class Cache
   end
 
   def write(name, value, expires_in: nil)
-    write_entry(normalize_key(name), value, expires_in: nil)
+    write_entry(normalize_key(name), value, expires_in: expires_in)
   end
 
   def delete(name)
diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb
index f1f9aa33d8..27bddef4e1 100644
--- a/lib/composer_messages_finder.rb
+++ b/lib/composer_messages_finder.rb
@@ -78,7 +78,7 @@ class ComposerMessagesFinder
     # - "disable avatar education message" is enabled
     # - "sso overrides avatar" is enabled
     # - "allow uploaded avatars" is disabled
-    return if SiteSetting.disable_avatar_education_message || SiteSetting.sso_overrides_avatar || !SiteSetting.allow_uploaded_avatars
+    return if SiteSetting.disable_avatar_education_message || SiteSetting.discourse_connect_overrides_avatar || !SiteSetting.allow_uploaded_avatars
 
     # If we got this far, log that we've nagged them about the avatar
     UserHistory.create!(action: UserHistory.actions[:notified_about_avatar], target_user_id: @user.id)
@@ -151,6 +151,7 @@ class ComposerMessagesFinder
   def check_get_a_room(min_users_posted: 5)
     return unless educate_reply?(:notified_about_get_a_room)
     return unless @details[:post_id].present?
+    return if @topic.category&.read_restricted
 
     reply_to_user_id = Post.where(id: @details[:post_id]).pluck(:user_id)[0]
 
diff --git a/lib/content_security_policy/default.rb b/lib/content_security_policy/default.rb
index 1d5315709e..3acafad97d 100644
--- a/lib/content_security_policy/default.rb
+++ b/lib/content_security_policy/default.rb
@@ -13,6 +13,7 @@ class ContentSecurityPolicy
         directives[:script_src] = script_src
         directives[:worker_src] = worker_src
         directives[:report_uri] = report_uri if SiteSetting.content_security_policy_collect_reports
+        directives[:frame_ancestors] = frame_ancestors if restrict_embed?
       end
     end
 
@@ -56,10 +57,20 @@ class ContentSecurityPolicy
       ].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
+
+        # Support Ember CLI Live reload
+        if Rails.env.development?
+          sources << "#{base_url}/ember-cli-live-reload.js"
+          sources << "#{base_url}/_lr/"
+        end
+
         # we need analytics.js still as gtag/js is a script wrapper for it
         sources << 'https://www.google-analytics.com/analytics.js' if SiteSetting.ga_universal_tracking_code.present?
         sources << 'https://www.googletagmanager.com/gtag/js' if SiteSetting.ga_universal_tracking_code.present? && SiteSetting.ga_version == "v4_gtag"
-        sources << 'https://www.googletagmanager.com/gtm.js' if SiteSetting.gtm_container_id.present?
+        if SiteSetting.gtm_container_id.present?
+          sources << 'https://www.googletagmanager.com/gtm.js'
+          sources << "'nonce-#{ApplicationHelper.google_tag_manager_nonce}'"
+        end
       end
     end
 
@@ -73,5 +84,17 @@ class ContentSecurityPolicy
     def report_uri
       "#{base_url}/csp_reports"
     end
+
+    def frame_ancestors
+      [
+        "'self'",
+        *EmbeddableHost.pluck(:host).map { |host| "https://#{host}" }
+      ]
+    end
+
+    def restrict_embed?
+      SiteSetting.content_security_policy_frame_ancestors &&
+      !SiteSetting.embed_any_origin
+    end
   end
 end
diff --git a/lib/content_security_policy/extension.rb b/lib/content_security_policy/extension.rb
index 93eab088e4..751e907fc5 100644
--- a/lib/content_security_policy/extension.rb
+++ b/lib/content_security_policy/extension.rb
@@ -10,6 +10,7 @@ class ContentSecurityPolicy
     def path_specific_extension(path_info)
       {}.tap do |obj|
         for_qunit_route = !Rails.env.production? && ["/qunit", "/wizard/qunit"].include?(path_info)
+        for_qunit_route ||= "/theme-qunit" == path_info
         obj[:script_src] = :unsafe_eval if for_qunit_route
       end
     end
@@ -70,6 +71,8 @@ class ContentSecurityPolicy
         next if uri.host.nil? # Ignore same-domain scripts (theme-javascripts)
         next if uri.path.nil? # Ignore raw hosts
 
+        uri.query = nil # CSP should not include query part of url
+
         uri_string = uri.to_s.sub(/^\/\//, '') # Protocol-less CSP should not have // at beginning of URL
 
         auto_script_src_extension[:script_src] << uri_string
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index fb61f24b1a..ed57f8b067 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -22,7 +22,7 @@ class CookedPostProcessor
     @cooking_options = @cooking_options.symbolize_keys
 
     cooked = post.cook(post.raw, @cooking_options)
-    @doc = Nokogiri::HTML5::fragment(cooked)
+    @doc = Loofah.fragment(cooked)
     @has_oneboxes = post.post_analyzer.found_oneboxes?
     @size_cache = {}
 
@@ -209,8 +209,9 @@ class CookedPostProcessor
     @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")
+    @doc.css("img.onebox-avatar-inline") -
+    # minus github onebox profile images
+    @doc.css(".onebox.githubfolder img")
   end
 
   def oneboxed_images
@@ -317,6 +318,12 @@ class CookedPostProcessor
       return
     end
 
+    upload = Upload.get_from_url(src)
+
+    if upload.present? && upload.animated?
+      img.add_class("animated")
+    end
+
     return if original_width <= SiteSetting.max_image_width && original_height <= SiteSetting.max_image_height
 
     user_width, user_height = [original_width, original_height] if user_width.to_i <= 0 && user_height.to_i <= 0
@@ -331,7 +338,6 @@ class CookedPostProcessor
       width, height = ImageSizer.resize(width, height)
     end
 
-    upload = Upload.get_from_url(src)
     if upload.present?
       upload.create_thumbnail!(width, height, crop: crop)
 
@@ -483,14 +489,20 @@ class CookedPostProcessor
 
   def update_post_image
     upload = nil
-    eligible_image_fragments = extract_images_for_post
+    images = 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|
+    @post.each_upload_url(fragments: images.css("[data-thumbnail]")) do |src, path, sha1|
       upload = Upload.find_by(sha1: sha1)
       break if upload
     end
 
+    if upload.nil? # No specified thumbnail. Use any image:
+      @post.each_upload_url(fragments: images.css(":not([data-thumbnail])")) do |src, path, sha1|
+        upload = Upload.find_by(sha1: sha1)
+        break if upload
+      end
+    end
+
     if upload.present?
       @post.update_column(:image_upload_id, upload.id) # post
       if @post.is_first_post? # topic
diff --git a/lib/crawler_detection.rb b/lib/crawler_detection.rb
index 36fb61b63e..0b90dc0acb 100644
--- a/lib/crawler_detection.rb
+++ b/lib/crawler_detection.rb
@@ -37,6 +37,14 @@ module CrawlerDetection
 
   end
 
+  def self.show_browser_update?(user_agent)
+    return false if SiteSetting.browser_update_user_agents.blank?
+
+    @browser_update_matchers ||= {}
+    matcher = @browser_update_matchers[SiteSetting.browser_update_user_agents] ||= to_matcher(SiteSetting.browser_update_user_agents)
+    user_agent.match?(matcher)
+  end
+
   # Given a user_agent that returns true from crawler?, should its request be allowed?
   def self.allow_crawler?(user_agent)
     return true if SiteSetting.allowed_crawler_user_agents.blank? &&
diff --git a/lib/db_helper.rb b/lib/db_helper.rb
index 4abe66f353..6510d49d97 100644
--- a/lib/db_helper.rb
+++ b/lib/db_helper.rb
@@ -5,7 +5,7 @@ require_dependency "migration/base_dropper"
 class DbHelper
 
   REMAP_SQL ||= <<~SQL
-    SELECT table_name, column_name, character_maximum_length
+    SELECT table_name::text, column_name::text, character_maximum_length
       FROM information_schema.columns
      WHERE table_schema = 'public'
        AND is_updatable = 'YES'
@@ -14,7 +14,7 @@ class DbHelper
   SQL
 
   TRIGGERS_SQL ||= <<~SQL
-    SELECT trigger_name
+    SELECT trigger_name::text
       FROM information_schema.triggers
      WHERE trigger_name LIKE '%_readonly'
   SQL
diff --git a/lib/demon/base.rb b/lib/demon/base.rb
index fc752a4464..2d6d46e295 100644
--- a/lib/demon/base.rb
+++ b/lib/demon/base.rb
@@ -141,14 +141,13 @@ class Demon::Base
   end
 
   def run
-    if @pid = fork
-      write_pid_file
-      return
+    @pid = fork do
+      Process.setproctitle("discourse #{self.class.prefix}")
+      monitor_parent
+      establish_app
+      after_fork
     end
-
-    monitor_parent
-    establish_app
-    after_fork
+    write_pid_file
   end
 
   def already_running?
diff --git a/lib/demon/email_sync.rb b/lib/demon/email_sync.rb
index 8777b3e5e1..12fedc5724 100644
--- a/lib/demon/email_sync.rb
+++ b/lib/demon/email_sync.rb
@@ -23,7 +23,7 @@ class Demon::EmailSync < ::Demon::Base
   def start_thread(db, group)
     Thread.new do
       RailsMultisite::ConnectionManagement.with_connection(db) do
-        ImapSyncLog.debug("Thread started for group #{group.name} in db #{db}", group)
+        ImapSyncLog.debug("Thread started for group #{group.name} in db #{db}", group, db: false)
         begin
           syncer = Imap::Sync.new(group)
         rescue Net::IMAP::NoResponseError => e
@@ -44,7 +44,7 @@ class Demon::EmailSync < ::Demon::Base
           )
 
           if !syncer.can_idle? && status[:remaining] == 0
-            ImapSyncLog.debug("Going to sleep for group #{group.name} in db #{db} to wait for new emails", group)
+            ImapSyncLog.debug("Going to sleep for group #{group.name} in db #{db} to wait for new emails", group, db: false)
 
             # Thread goes into sleep for a bit so it is better to return any
             # connection back to the pool.
@@ -133,7 +133,7 @@ class Demon::EmailSync < ::Demon::Base
           # Spawn new threads for groups that are now synchronized.
           groups.each do |group_id, group|
             if !@sync_data[db][group_id]
-              ImapSyncLog.debug("Starting thread for group #{group.name} mailbox #{group.imap_mailbox_name}", group)
+              ImapSyncLog.debug("Starting thread for group #{group.name} mailbox #{group.imap_mailbox_name}", group, db: false)
 
               @sync_data[db][group_id] = {
                 thread: start_thread(db, group),
diff --git a/lib/discourse.rb b/lib/discourse.rb
index ac5ae71ba4..ea2a3cbafd 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -17,6 +17,7 @@ end
 
 module Discourse
   DB_POST_MIGRATE_PATH ||= "db/post_migrate"
+  REQUESTED_HOSTNAME ||= "REQUESTED_HOSTNAME"
 
   require 'sidekiq/exception_handler'
   class SidekiqExceptionHandler
@@ -94,14 +95,25 @@ module Discourse
 
       private
 
-      def execute_command(*command, timeout: nil, failure_message: "", success_status_codes: [0], chdir: ".")
+      def execute_command(*command, timeout: nil, failure_message: "", success_status_codes: [0], chdir: ".", unsafe_shell: false)
+        env = nil
+        env = command.shift if command[0].is_a?(Hash)
+
+        if !unsafe_shell && (command.length == 1) && command[0].include?(" ")
+          # Sending a single string to Process.spawn will launch a shell
+          # This means various things (e.g. subshells) are possible, and could present injection risk
+          raise "Arguments should be provided as separate strings"
+        end
+
         if timeout
           # will send a TERM after timeout
           # will send a KILL after timeout * 2
           command = ["timeout", "-k", "#{timeout.to_f * 2}", timeout.to_s] + command
         end
 
-        stdout, stderr, status = Open3.capture3(*command, chdir: chdir)
+        args = command
+        args = [env] + command if env
+        stdout, stderr, status = Open3.capture3(*args, chdir: chdir)
 
         if !status.exited? || !success_status_codes.include?(status.exitstatus)
           failure_message = "#{failure_message}\n" if !failure_message.blank?
@@ -278,12 +290,30 @@ module Discourse
     end
   end
 
-  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]) }
+  def self.apply_asset_filters(plugins, type, request)
+    filter_opts = asset_filter_options(type, request)
+    plugins.select do |plugin|
+      plugin.asset_filters.all? { |b| b.call(type, request, filter_opts) }
     end
+  end
+
+  def self.asset_filter_options(type, request)
+    result = {}
+    return result if request.blank?
+
+    path = request.fullpath
+    result[:path] = path if path.present?
+
+    # When we bootstrap using the JSON method, we want to be able to filter assets on
+    # the path we're bootstrapping for.
+    asset_path = request.headers["HTTP_X_DISCOURSE_ASSET_PATH"]
+    result[:path] = asset_path if asset_path.present?
+
+    result
+  end
+
+  def self.find_plugin_css_assets(args)
+    plugins = apply_asset_filters(self.find_plugins(args), :css, args[:request])
 
     assets = []
 
@@ -307,9 +337,7 @@ module Discourse
       plugin.js_asset_exists?
     end
 
-    plugins = plugins.select do |plugin|
-      plugin.asset_filters.all? { |b| b.call(:js, args[:request]) }
-    end
+    plugins = apply_asset_filters(plugins, :js, args[:request])
 
     plugins.map { |plugin| "plugins/#{plugin.directory_name}" }
   end
@@ -875,14 +903,19 @@ module Discourse
   def self.preload_rails!
     return if @preloaded_rails
 
-    # load up all models and schema
-    (ActiveRecord::Base.connection.tables - %w[schema_migrations versions]).each do |table|
-      table.classify.constantize.first rescue nil
-    end
+    if !Rails.env.development?
+      # Skipped in development because the schema cache gets reset on every code change anyway
+      # Better to rely on the filesystem-based db:schema:cache:dump
 
-    # ensure we have a full schema cache in case we missed something above
-    ActiveRecord::Base.connection.data_sources.each do |table|
-      ActiveRecord::Base.connection.schema_cache.add(table)
+      # load up all models and schema
+      (ActiveRecord::Base.connection.tables - %w[schema_migrations versions]).each do |table|
+        table.classify.constantize.first rescue nil
+      end
+
+      # ensure we have a full schema cache in case we missed something above
+      ActiveRecord::Base.connection.data_sources.each do |table|
+        ActiveRecord::Base.connection.schema_cache.add(table)
+      end
     end
 
     schema_cache = ActiveRecord::Base.connection.schema_cache
@@ -900,18 +933,29 @@ module Discourse
       # this will force Cppjieba to preload if any site has it
       # enabled allowing it to be reused between all child processes
       Search.prepare_data("test")
+
+      JsLocaleHelper.load_translations(SiteSetting.default_locale)
     end
 
-    # router warm up
-    Rails.application.routes.recognize_path('abc') rescue nil
-
-    # preload discourse version
-    Discourse.git_version
-    Discourse.git_branch
-    Discourse.full_version
-
-    require 'actionview_precompiler'
-    ActionviewPrecompiler.precompile
+    [
+      Thread.new {
+        # router warm up
+        Rails.application.routes.recognize_path('abc') rescue nil
+      },
+      Thread.new {
+        # preload discourse version
+        Discourse.git_version
+        Discourse.git_branch
+        Discourse.full_version
+      },
+      Thread.new {
+        require 'actionview_precompiler'
+        ActionviewPrecompiler.precompile
+      },
+      Thread.new {
+        LetterAvatar.image_magick_version
+      }
+    ].each(&:join)
   ensure
     @preloaded_rails = true
   end
@@ -923,6 +967,24 @@ module Discourse
   def self.is_parallel_test?
     ENV['RAILS_ENV'] == "test" && ENV['TEST_ENV_NUMBER']
   end
+
+  CDN_REQUEST_METHODS ||= ["GET", "HEAD", "OPTIONS"]
+
+  def self.is_cdn_request?(env, request_method)
+    return unless CDN_REQUEST_METHODS.include?(request_method)
+
+    cdn_hostnames = GlobalSetting.cdn_hostnames
+    return if cdn_hostnames.blank?
+
+    requested_hostname = env[REQUESTED_HOSTNAME] || env[Rack::HTTP_HOST]
+    cdn_hostnames.include?(requested_hostname)
+  end
+
+  def self.apply_cdn_headers(headers)
+    headers['Access-Control-Allow-Origin'] = '*'
+    headers['Access-Control-Allow-Methods'] = CDN_REQUEST_METHODS.join(", ")
+    headers
+  end
 end
 
 # rubocop:enable Style/GlobalVars
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index f2f601a5e9..da53eaaf30 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -96,7 +96,7 @@ class DiscourseJsProcessor
 JS
       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: ['transform-arrow-functions', 'transform-block-scoped-functions', 'transform-block-scoping', 'transform-computed-properties', 'transform-destructuring', 'transform-duplicate-keys', 'transform-for-of', 'transform-function-name', 'transform-literals', 'transform-object-super', 'transform-parameters', 'transform-shorthand-properties', 'transform-spread', 'transform-sticky-regex', 'transform-template-literals', 'transform-typeof-symbol', 'transform-unicode-regex'] }).code")
+      js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['transform-arrow-functions', 'transform-block-scoped-functions', 'transform-block-scoping', 'transform-computed-properties', 'transform-destructuring', 'transform-duplicate-keys', 'transform-for-of', 'transform-function-name', 'transform-literals', 'transform-object-super', 'transform-parameters', 'transform-shorthand-properties', 'transform-spread', 'transform-sticky-regex', 'transform-template-literals', 'transform-typeof-symbol', 'transform-unicode-regex', 'proposal-object-rest-spread'] }).code")
       ctx.eval(js)
 
       ctx
@@ -143,7 +143,7 @@ JS
 
       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-modules-amd', {noInterop: true}], ['proposal-decorators', {legacy: true} ], exports.WidgetHbsCompiler] }).code"
+        "Babel.transform(#{js_source}, { moduleId: '#{opts[:module_name]}', filename: '#{filename}', ast: false, presets: ['es2015'], plugins: [['transform-modules-amd', {noInterop: true}], 'proposal-object-rest-spread', ['proposal-decorators', {legacy: true} ], exports.WidgetHbsCompiler] }).code"
       else
         "Babel.transform(#{js_source}, { ast: false, plugins: ['proposal-json-strings', 'proposal-nullish-coalescing-operator', 'proposal-logical-assignment-operators', 'proposal-numeric-separator', 'proposal-optional-catch-binding', 'transform-dotall-regex', 'proposal-unicode-property-regex', 'transform-named-capturing-groups-regex', 'proposal-object-rest-spread', 'proposal-optional-chaining', 'transform-arrow-functions', 'transform-block-scoped-functions', 'transform-block-scoping', 'transform-computed-properties', 'transform-destructuring', 'transform-duplicate-keys', 'transform-for-of', 'transform-function-name', 'transform-literals', 'transform-object-super', 'transform-parameters', 'transform-shorthand-properties', 'transform-spread', 'transform-sticky-regex', 'transform-template-literals', 'transform-typeof-symbol', 'transform-unicode-regex', ['proposal-decorators', {legacy: true}], exports.WidgetHbsCompiler] }).code"
       end
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index 39e00ca3a6..840b038977 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -55,7 +55,6 @@ class DiscoursePluginRegistry
   define_register :mobile_stylesheets, Hash
   define_register :desktop_stylesheets, Hash
   define_register :color_definition_stylesheets, Hash
-  define_register :sass_variables, Set
   define_register :handlebars, Set
   define_register :serialized_current_user_fields, Set
   define_register :seed_data, HashWithIndifferentAccess
@@ -68,6 +67,7 @@ class DiscoursePluginRegistry
   define_register :vendored_pretty_text, Set
   define_register :vendored_core_pretty_text, Set
   define_register :seedfu_filter, Set
+  define_register :demon_processes, Set
 
   define_filtered_register :staff_user_custom_fields
   define_filtered_register :public_user_custom_fields
@@ -84,6 +84,7 @@ class DiscoursePluginRegistry
   define_filtered_register :user_api_key_scope_mappings
 
   define_filtered_register :permitted_bulk_action_parameters
+  define_filtered_register :reviewable_params
 
   def self.register_auth_provider(auth_provider)
     self.auth_providers << auth_provider
@@ -131,8 +132,8 @@ class DiscoursePluginRegistry
         next if each_options[:admin]
       end
 
-      Dir.glob("#{root}/**/*") do |f|
-        yield f, ext
+      Dir.glob("#{root}/**/*.#{ext}") do |f|
+        yield f
       end
     end
   end
@@ -160,8 +161,6 @@ class DiscoursePluginRegistry
         self.desktop_stylesheets[plugin_directory_name] << asset
       elsif opts == :color_definitions
         self.color_definition_stylesheets[plugin_directory_name] = asset
-      elsif opts == :variables
-        self.sass_variables << asset
       else
         self.stylesheets[plugin_directory_name] ||= Set.new
         self.stylesheets[plugin_directory_name] << asset
diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index f8e2213f4f..4c9aa5c06c 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -127,36 +127,43 @@ module DiscourseTagging
         topic.tags = []
       end
       topic.tags_changed = true
+
+      DiscourseEvent.trigger(
+        :topic_tags_changed,
+        topic, old_tag_names: old_tag_names, new_tag_names: topic.tags.map(&:name)
+      )
+
       return true
     end
     false
   end
 
-  def self.validate_min_required_tags_for_category(guardian, topic, category, tags = [])
+  def self.validate_min_required_tags_for_category(guardian, model, category, tags = [])
     if !guardian.is_staff? &&
         category &&
         category.minimum_required_tags > 0 &&
         tags.length < category.minimum_required_tags
 
-      topic.errors.add(:base, I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags))
+      model.errors.add(:base, I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags))
       false
     else
       true
     end
   end
 
-  def self.validate_required_tags_from_group(guardian, topic, category, tags = [])
+  def self.validate_required_tags_from_group(guardian, model, category, tags = [])
     if !guardian.is_staff? &&
         category &&
         category.required_tag_group &&
         (tags.length < category.min_tags_from_required_group ||
           category.required_tag_group.tags.where("tags.id in (?)", tags.map(&:id)).count < category.min_tags_from_required_group)
 
-      topic.errors.add(:base,
+      model.errors.add(:base,
         I18n.t(
           "tags.required_tags_from_group",
           count: category.min_tags_from_required_group,
-          tag_group_name: category.required_tag_group.name
+          tag_group_name: category.required_tag_group.name,
+          tags: category.required_tag_group.tags.pluck(:name).join(", ")
         )
       )
       false
@@ -444,7 +451,8 @@ module DiscourseTagging
     tag = tag.dup
     tag.downcase! if SiteSetting.force_lowercase_tags
     tag.strip!
-    tag.gsub!(/\s+/, '-')
+    tag.gsub!(/[[:space:]]+/, '-')
+    tag.gsub!(/[^[:word:][:punct:]]+/, '')
     tag.squeeze!('-')
     tag.gsub!(TAGS_FILTER_REGEXP, '')
     tag[0...SiteSetting.max_tag_length]
diff --git a/lib/discourse_updates.rb b/lib/discourse_updates.rb
index 6a7dc2a54b..fbc81aac9f 100644
--- a/lib/discourse_updates.rb
+++ b/lib/discourse_updates.rb
@@ -115,6 +115,57 @@ module DiscourseUpdates
       keys.present? ? keys.map { |k| Discourse.redis.hgetall(k) } : []
     end
 
+    def current_version
+      last_installed_version || Discourse::VERSION::STRING
+    end
+
+    def new_features_payload
+      response = Excon.new(new_features_endpoint).request(expects: [200], method: :Get)
+      response.body
+    end
+
+    def update_new_features(payload = nil)
+      payload ||= new_features_payload
+      Discourse.redis.set(new_features_key, payload)
+    end
+
+    def new_features
+      entries = JSON.parse(Discourse.redis.get(new_features_key)) rescue nil
+      return nil if entries.nil?
+
+      entries.select! do |item|
+        item["discourse_version"].nil? || Discourse.has_needed_version?(current_version, item["discourse_version"]) rescue nil
+      end
+
+      entries.sort_by { |item| Time.zone.parse(item["created_at"]).to_i }.reverse
+    end
+
+    def has_unseen_features?(user_id)
+      entries = new_features
+      return false if entries.nil?
+
+      last_seen = new_features_last_seen(user_id)
+
+      if last_seen.present?
+        entries.select! { |item| Time.zone.parse(item["created_at"]) > last_seen }
+      end
+
+      entries.size > 0
+    end
+
+    def new_features_last_seen(user_id)
+      last_seen = Discourse.redis.get new_features_last_seen_key(user_id)
+      return nil if last_seen.blank?
+      Time.zone.parse(last_seen)
+    end
+
+    def mark_new_features_as_seen(user_id)
+      entries = JSON.parse(Discourse.redis.get(new_features_key)) rescue nil
+      return nil if entries.nil?
+      last_seen = entries.max_by { |x| x["created_at"] }
+      Discourse.redis.set(new_features_last_seen_key(user_id), last_seen["created_at"])
+    end
+
     private
 
     def last_installed_version_key
@@ -144,5 +195,17 @@ module DiscourseUpdates
     def missing_versions_key_prefix
       'missing_version'
     end
+
+    def new_features_endpoint
+      'https://meta.discourse.org/new-features.json'
+    end
+
+    def new_features_key
+      'new_features'
+    end
+
+    def new_features_last_seen_key(user_id)
+      "new_features_last_seen_user_#{user_id}"
+    end
   end
 end
diff --git a/lib/email.rb b/lib/email.rb
index 00095549d1..f1b8329a7b 100644
--- a/lib/email.rb
+++ b/lib/email.rb
@@ -13,6 +13,20 @@ module Email
     email.downcase
   end
 
+  def self.obfuscate(email)
+    return email if !Email.is_valid?(email)
+
+    first, _, last = email.rpartition('@')
+
+    # Obfuscate each last part, except tld
+    last = last.split('.')
+    tld = last.pop
+    last.map! { |part| obfuscate_part(part) }
+    last << tld
+
+    "#{obfuscate_part(first)}@#{last.join('.')}"
+  end
+
   def self.cleanup_alias(name)
     name ? name.gsub(/[:<>,"]/, '') : name
   end
@@ -52,4 +66,14 @@ module Email
   def self.is_message_id_rfc?(message_id)
     message_id.start_with?('<') && message_id.include?('@') && message_id.end_with?('>')
   end
+
+  def self.obfuscate_part(part)
+    if part.size < 3
+      "*" * part.size
+    elsif part.size < 5
+      part[0] + "*" * (part.size - 1)
+    else
+      part[0] + "*" * (part.size - 2) + part[-1]
+    end
+  end
 end
diff --git a/lib/email/processor.rb b/lib/email/processor.rb
index 6fd8602a89..d0a266eaaf 100644
--- a/lib/email/processor.rb
+++ b/lib/email/processor.rb
@@ -19,7 +19,7 @@ module Email
         @receiver = Email::Receiver.new(@mail, @opts)
         @receiver.process!
       rescue RateLimiter::LimitExceeded
-        @opts[:retry_on_rate_limit] ? Jobs.enqueue(:process_email, mail: @mail) : raise
+        @opts[:retry_on_rate_limit] ? Jobs.enqueue(:process_email, mail: @mail, source: @opts[:source]) : raise
       rescue => e
         return handle_bounce(e) if @receiver.is_bounce?
 
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index cb065abd8f..b580e7ea40 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -63,24 +63,27 @@ module Email
 
     def process!
       return if is_blocked?
+
       id_hash = Digest::SHA1.hexdigest(@message_id)
+
       DistributedMutex.synchronize("process_email_#{id_hash}") do
         begin
-
-          # If we find an existing incoming email record with the exact same
-          # message_id do not create a new IncomingEmail record to avoid double
-          # ups.
-          @incoming_email = find_existing_and_update_imap
-          return if @incoming_email
+          # If we find an existing incoming email record with the exact same `message_id`
+          # do not create a new `IncomingEmail` record to avoid double ups.
+          return if @incoming_email = find_existing_and_update_imap
 
           ensure_valid_address_lists
           ensure_valid_date
+
           @from_email, @from_display_name = parse_from_field
           @from_user = User.find_by_email(@from_email)
           @incoming_email = create_incoming_email
+
           post = process_internal
+
           raise BouncedEmailError if is_bounce?
-          return post
+
+          post
         rescue Exception => e
           error = e.to_s
           error = e.class.name if error.blank?
@@ -92,13 +95,10 @@ module Email
     end
 
     def find_existing_and_update_imap
-      incoming_email = IncomingEmail.find_by(message_id: @message_id)
-      return if !incoming_email
+      return unless incoming_email = IncomingEmail.find_by(message_id: @message_id)
 
       # If we are not doing this for IMAP purposes just return the record.
-      if @opts[:imap_uid].blank?
-        return incoming_email
-      end
+      return incoming_email if @opts[:imap_uid].blank?
 
       # If the message_id matches the post id regexp then we
       # generated the message_id not the imap server, e.g. in GroupSmtpEmail,
@@ -117,6 +117,7 @@ module Email
         imap_group_id: @opts[:imap_group_id],
         imap_sync: false
       )
+
       incoming_email
     end
 
@@ -147,12 +148,13 @@ module Email
         raw: Email::Cleaner.new(@raw_email).execute,
         subject: subject,
         from_address: @from_email,
-        to_addresses: @mail.to&.map(&:downcase)&.join(";"),
-        cc_addresses: @mail.cc&.map(&:downcase)&.join(";"),
+        to_addresses: @mail.to,
+        cc_addresses: @mail.cc,
         imap_uid_validity: @opts[:imap_uid_validity],
         imap_uid: @opts[:imap_uid],
         imap_group_id: @opts[:imap_group_id],
-        imap_sync: false
+        imap_sync: false,
+        created_via: IncomingEmail.created_via_types[@opts[:source] || :unknown]
       )
     end
 
@@ -439,6 +441,7 @@ module Email
       [:protonmail, /class="protonmail_/],
       [:zimbra, /data-marker="__/],
       [:newton, /(id|class)="cm_/],
+      [:front, /class="front-/],
     ]
 
     def extract_from_gmail(doc)
@@ -500,8 +503,14 @@ module Email
       to_markdown(doc.to_html, elided.to_html)
     end
 
+    def extract_from_front(doc)
+      # Removes anything that has a class starting with 'front-'
+      elided = doc.css("*[class^='front-']").remove
+      to_markdown(doc.to_html, elided.to_html)
+    end
+
     def trim_reply_and_extract_elided(text)
-      return [text, ""] if @opts[:skip_trimming]
+      return [text, ""] if @opts[:skip_trimming] || !SiteSetting.trim_incoming_emails
       EmailReplyTrimmer.trim(text, true)
     end
 
@@ -516,8 +525,7 @@ module Email
       encodings = COMMON_ENCODINGS.dup
       encodings.unshift(mail_part.charset) if mail_part.charset.present?
 
-      # mail (>=2.5) decodes mails with 8bit transfer encoding to utf-8, so
-      # always try UTF-8 first
+      # mail (>=2.5) decodes mails with 8bit transfer encoding to utf-8, so always try UTF-8 first
       if mail_part.content_transfer_encoding == "8bit"
         encodings.delete("UTF-8")
         encodings.unshift("UTF-8")
@@ -563,8 +571,7 @@ module Email
       return unless mail[:from]
 
       if mail[:from].errors.blank?
-        mail[:from].address_list.addresses.each do |address_field|
-          address_field.decoded
+        mail[:from].each do |address_field|
           from_address = address_field.address
           from_display_name = address_field.display_name.try(:to_s)
           return [from_address&.downcase, from_display_name&.strip] if from_address["@"]
@@ -740,18 +747,31 @@ module Email
       message_ids = Email::Receiver.extract_reply_message_ids(@mail, max_message_id_count: 5)
       post_ids = []
 
-      incoming_emails = IncomingEmail
-        .where(message_id: message_ids)
-        .addressed_to_user(user)
-        .pluck(:post_id, :from_address, :to_addresses, :cc_addresses)
+      incoming_emails = IncomingEmail.where(message_id: message_ids)
+      if !group.allow_unknown_sender_topic_replies
+        incoming_emails = incoming_emails.addressed_to_user(user)
+      end
+
+      incoming_emails = incoming_emails.pluck(:post_id, :from_address, :to_addresses, :cc_addresses)
 
       incoming_emails.each do |post_id, from_address, to_addresses, cc_addresses|
-        post_ids << post_id if contains_email_address_of_user?(from_address, user) ||
-                               contains_email_address_of_user?(to_addresses, user) ||
-                               contains_email_address_of_user?(cc_addresses, user)
+        if group.allow_unknown_sender_topic_replies
+          post_ids << post_id
+        else
+          post_ids << post_id if contains_email_address_of_user?(from_address, user) ||
+            contains_email_address_of_user?(to_addresses, user) ||
+            contains_email_address_of_user?(cc_addresses, user)
+        end
       end
 
       if post_ids.any? && post = Post.where(id: post_ids).order(:created_at).last
+
+        # this must be done for the unknown user (who is staged) to
+        # be allowed to post a reply in the topic
+        if group.allow_unknown_sender_topic_replies
+          post.topic.topic_allowed_users.find_or_create_by!(user_id: user.id)
+        end
+
         create_reply(user: user,
                      raw: body,
                      elided: elided,
@@ -1184,6 +1204,10 @@ module Email
         options[:post_type] = Post.types[:whisper]
       end
 
+      # To avoid race conditions with the post alerter and Group SMTP
+      # emails, we skip the jobs here and enqueue them only _after_
+      # the incoming email has been updated with the post and topic.
+      options[:skip_jobs] = true
       result = NewPostManager.new(user, options).perform
 
       errors = result.errors.full_messages
@@ -1203,6 +1227,13 @@ module Email
         if result.post.topic&.private_message? && !is_bounce?
           add_other_addresses(result.post, user)
         end
+
+        # Alert the people involved in the topic now that the incoming email
+        # has been linked to the post.
+        PostJobsEnqueuer.new(result.post, result.post.topic, options[:topic_id].blank?,
+                             import_mode: options[:import_mode],
+                             post_alert_options: options[:post_alert_options]
+                            ).enqueue_jobs
       end
 
       result.post
@@ -1218,29 +1249,29 @@ module Email
 
     def add_other_addresses(post, sender)
       %i(to cc bcc).each do |d|
-        if @mail[d] && @mail[d].address_list && @mail[d].address_list.addresses
-          @mail[d].address_list.addresses.each do |address_field|
-            begin
-              address_field.decoded
-              email = address_field.address.downcase
-              display_name = address_field.display_name.try(:to_s)
-              next unless email["@"]
-              if should_invite?(email)
-                user = find_or_create_user(email, display_name)
-                if user && can_invite?(post.topic, user)
-                  post.topic.topic_allowed_users.create!(user_id: user.id)
-                  TopicUser.auto_notification_for_staging(user.id, post.topic_id, TopicUser.notification_reasons[:auto_watch])
-                  post.topic.add_small_action(sender, "invited_user", user.username, import_mode: @opts[:import_mode])
-                end
-                # cap number of staged users created per email
-                if @staged_users.count > SiteSetting.maximum_staged_users_per_email
-                  post.topic.add_moderator_post(sender, I18n.t("emails.incoming.maximum_staged_user_per_email_reached"), import_mode: @opts[:import_mode])
-                  return
-                end
+        next if @mail[d].blank?
+
+        @mail[d].each do |address_field|
+          begin
+            address_field.decoded
+            email = address_field.address.downcase
+            display_name = address_field.display_name.try(:to_s)
+            next unless email["@"]
+            if should_invite?(email)
+              user = find_or_create_user(email, display_name)
+              if user && can_invite?(post.topic, user)
+                post.topic.topic_allowed_users.create!(user_id: user.id)
+                TopicUser.auto_notification_for_staging(user.id, post.topic_id, TopicUser.notification_reasons[:auto_watch])
+                post.topic.add_small_action(sender, "invited_user", user.username, import_mode: @opts[:import_mode])
+              end
+              # cap number of staged users created per email
+              if @staged_users.count > SiteSetting.maximum_staged_users_per_email
+                post.topic.add_moderator_post(sender, I18n.t("emails.incoming.maximum_staged_user_per_email_reached"), import_mode: @opts[:import_mode])
+                return
               end
-            rescue ActiveRecord::RecordInvalid, EmailNotAllowed
-              # don't care if user already allowed or the user's email address is not allowed
             end
+          rescue ActiveRecord::RecordInvalid, EmailNotAllowed
+            # don't care if user already allowed or the user's email address is not allowed
           end
         end
       end
diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index b656302a69..ffd9707d32 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -173,7 +173,7 @@ module Email
         end
       end
 
-      if reply_key.present? && @message.header['Reply-To'] =~ /\<([^\>]+)\>/
+      if reply_key.present? && @message.header['Reply-To'].to_s =~ /\<([^\>]+)\>/
         email = Regexp.last_match[1]
         @message.header['List-Post'] = "<mailto:#{email}>"
       end
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 9e014eef88..2c2c207ca0 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -119,12 +119,13 @@ module Email
       style('aside.quote', 'padding: 12px 25px 2px 12px; margin-bottom: 10px;')
       style('aside.quote div.info-line', 'color: #666; margin: 10px 0')
       style('aside.quote .avatar', 'margin-right: 5px; width:20px; height:20px; vertical-align:middle;')
+      style('aside.quote', 'border-left: 5px solid #e9e9e9; background-color: #f8f8f8; margin: 0;')
 
       style('blockquote', 'border-left: 5px solid #e9e9e9; background-color: #f8f8f8; margin: 0;')
       style('blockquote > p', 'padding: 1em;')
 
       # Oneboxes
-      style('aside.onebox', "border: 5px solid #e9e9e9; padding: 12px 25px 12px 12px;")
+      style('aside.onebox', "border: 5px solid #e9e9e9; padding: 12px 25px 12px 12px; margin-bottom: 10px;")
       style('aside.onebox header img.site-icon', "width: 16px; height: 16px; margin-right: 3px;")
       style('aside.onebox header a[href]', "color: #222222; text-decoration: none;")
       style('aside.onebox .onebox-body', "clear: both")
@@ -133,7 +134,11 @@ module Email
       style('aside.onebox .onebox-body h3, aside.onebox .onebox-body h4', "font-size: 1.17em; margin: 10px 0;")
       style('.onebox-metadata', "color: #919191")
       style('.github-info', "margin-top: 10px;")
+      style('.github-info .added', "color: #090;")
+      style('.github-info .removed', "color: #e45735;")
       style('.github-info div', "display: inline; margin-right: 10px;")
+      style('.github-icon-container', 'float: left;')
+      style('.github-icon-container *', 'fill: #646464; width: 40px; height: 40px;')
       style('.onebox-avatar-inline', ONEBOX_INLINE_AVATAR_STYLE)
 
       @fragment.css('aside.quote blockquote > p').each do |p|
@@ -182,7 +187,7 @@ module Email
 
       html_lang = SiteSetting.default_locale.sub("_", "-")
       style('html', nil, lang: html_lang, 'xml:lang' => html_lang)
-      style('body', "text-align:#{ Rtl.new(nil).enabled? ? 'right' : 'left' };")
+      style('body', "line-height: 1.4; text-align:#{ Rtl.new(nil).enabled? ? 'right' : 'left' };")
       style('body', nil, dir: Rtl.new(nil).enabled? ? 'rtl' : 'ltr')
 
       style('.with-dir',
@@ -200,10 +205,10 @@ 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('pre code', 'display: block; background-color: #f1f1ff; padding: 5px;')
+      style('code', 'background-color: #f9f9f9; padding: 2px 5px;')
+      style('pre code', 'display: block; background-color: #f9f9f9; overflow: auto; padding: 5px;')
       style('.featured-topic a', "text-decoration: none; font-weight: bold; color: #{SiteSetting.email_link_color}; line-height:1.5em;")
-      style('.summary-email', "-moz-box-sizing:border-box;-ms-text-size-adjust:100%;-webkit-box-sizing:border-box;-webkit-text-size-adjust:100%;box-sizing:border-box;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:400;line-height:1.3;margin:0;min-width:100%;padding:0;width:100%")
+      style('.summary-email', "-moz-box-sizing:border-box;-ms-text-size-adjust:100%;-webkit-box-sizing:border-box;-webkit-text-size-adjust:100%;box-sizing:border-box;color:#0a0a0a;font-family:Arial,sans-serif;font-size:14px;font-weight:400;line-height:1.3;margin:0;min-width:100%;padding:0;width:100%")
 
       style('.previous-discussion', 'font-size: 17px; color: #444; margin-bottom:10px;')
       style('.notification-date', "text-align:right;color:#999999;padding-right:5px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;font-size:11px")
diff --git a/lib/email_cook.rb b/lib/email_cook.rb
index 9bc96fef76..89b59891f1 100644
--- a/lib/email_cook.rb
+++ b/lib/email_cook.rb
@@ -3,10 +3,6 @@
 # A very simple formatter for imported emails
 class EmailCook
 
-  def self.url_regexp
-    @url_regexp ||= /((?:https?:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.])(?:[^\s()<>]+|\([^\s()<>]+\))+(?:\([^\s()<>]+\)|[^`!()\[\]{};:'".,<>?«»“”‘’\s]))/
-  end
-
   def self.raw_regexp
     @raw_regexp ||= /^\[plaintext\]$\n(.*)\n^\[\/plaintext\]$(?:\s^\[attachments\]$\n(.*)\n^\[\/attachments\]$)?(?:\s^\[elided\]$\n(.*)\n^\[\/elided\]$)?/m
   end
@@ -25,17 +21,21 @@ class EmailCook
 
   def link_string!(line, unescaped_line)
     unescaped_line = unescaped_line.strip
-    unescaped_line.scan(EmailCook.url_regexp).each do |m|
-      url = m[0]
-
-      if unescaped_line == url
-        # this could be oneboxed
-        val = %|<a href="#{url}" class="onebox" target="_blank">#{url}</a>|
-      else
-        val = %|<a href="#{url}">#{url}</a>|
+    line.gsub!(/\S+/) do |str|
+      if str.match?(/^(https?:\/\/)[\S]+$/i)
+        begin
+          url = URI.parse(str).to_s
+          if unescaped_line == url
+            # this could be oneboxed
+            str = %|<a href="#{url}" class="onebox" target="_blank">#{url}</a>|
+          else
+            str = %|<a href="#{url}">#{url}</a>|
+          end
+        rescue URI::Error
+          # don't fail if uri does not parse
+        end
       end
-
-      line.gsub!(url, val)
+      str
     end
   end
 
diff --git a/lib/email_updater.rb b/lib/email_updater.rb
index 5b7b0aec95..5c99219b54 100644
--- a/lib/email_updater.rb
+++ b/lib/email_updater.rb
@@ -31,9 +31,16 @@ class EmailUpdater
       end
     end
 
-    return if errors.present? || existing_user.present?
+    if add
+      secondary_emails_count = @user.secondary_emails.count
+      if secondary_emails_count >= SiteSetting.max_allowed_secondary_emails
+        errors.add(:base, I18n.t("change_email.max_secondary_emails_error"))
+      end
+    else
+      old_email = @user.email
+    end
 
-    old_email = @user.email if !add
+    return if errors.present? || existing_user.present?
 
     if @guardian.is_staff? && @guardian.user != @user
       StaffActionLogger.new(@guardian.user).log_add_email(@user)
@@ -41,10 +48,10 @@ class EmailUpdater
       UserHistory.create!(action: UserHistory.actions[:add_email], acting_user_id: @user.id)
     end
 
-    change_req = EmailChangeRequest.find_or_initialize_by(
-      user_id: @user.id, new_email: email, requested_by: @guardian.user
-    )
+    change_req = EmailChangeRequest.find_or_initialize_by(user_id: @user.id, new_email: email)
+
     if change_req.new_record?
+      change_req.requested_by = @guardian.user
       change_req.old_email = old_email
       change_req.new_email = email
     end
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index 5f7c778fd2..3e3ee9235d 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -60,6 +60,10 @@
       "code": "263a",
       "name": "relaxed"
     },
+    {
+      "code": "263b",
+      "name": "slight_smile"
+    },
     {
       "code": "1f60b",
       "name": "yum"
@@ -185,12 +189,12 @@
       "name": "confused"
     },
     {
-      "code": "2639-fe0f",
-      "name": "slightly_frowning_face"
+      "code": "2639",
+      "name": "frowning"
     },
     {
       "code": "1f641",
-      "name": "frowning_face"
+      "name": "slightly_frowning_face"
     },
     {
       "code": "1f623",
@@ -232,10 +236,6 @@
       "code": "1f62f",
       "name": "hushed"
     },
-    {
-      "code": "1f641",
-      "name": "frowning"
-    },
     {
       "code": "1f626",
       "name": "frowning_face_with_open_mouth"
@@ -3664,6 +3664,10 @@
       "code": "2764",
       "name": "heart"
     },
+    {
+      "code": "2661",
+      "name": "white_heart_suit"
+    },
     {
       "code": "1f49b",
       "name": "yellow_heart"
diff --git a/lib/emoji/groups.json b/lib/emoji/groups.json
index 0c18098dda..c8604627f4 100644
--- a/lib/emoji/groups.json
+++ b/lib/emoji/groups.json
@@ -263,10 +263,6 @@
         "name": "slightly_frowning_face",
         "diversity": false
       },
-      {
-        "name": "frowning_face",
-        "diversity": false
-      },
       {
         "name": "open_mouth",
         "diversity": false
diff --git a/lib/excerpt_parser.rb b/lib/excerpt_parser.rb
index 054a123401..27c78bc530 100644
--- a/lib/excerpt_parser.rb
+++ b/lib/excerpt_parser.rb
@@ -207,7 +207,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     encode = encode ? lambda { |s| ERB::Util.html_escape(s) } : lambda { |s| s }
     if count_it && @current_length + string.length > @length
       length = [0, @length - @current_length - 1].max
-      @excerpt << encode.call(string[0..length]) if truncate
+      @excerpt << encode.call(string[0..length]) if truncate && !emoji?(string)
       @excerpt << (@text_entities ? "..." : "&hellip;")
       @excerpt << "</a>" if @in_a
       @excerpt << after_string if after_string
@@ -218,4 +218,8 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     @excerpt << after_string if after_string
     @current_length += string.length if count_it
   end
+
+  def emoji?(string)
+    string.match?(/\A:\w+:\Z/)
+  end
 end
diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index 162de9a40b..d87da5a85e 100644
--- a/lib/file_helper.rb
+++ b/lib/file_helper.rb
@@ -14,15 +14,15 @@ class FileHelper
   end
 
   def self.is_supported_image?(filename)
-    (filename =~ supported_images_regexp).present?
+    filename.match?(supported_images_regexp)
   end
 
   def self.is_inline_image?(filename)
-    (filename =~ inline_images_regexp).present?
+    filename.match?(inline_images_regexp)
   end
 
   def self.is_supported_media?(filename)
-    (filename =~ supported_media_regexp).present?
+    filename.match?(supported_media_regexp)
   end
 
   class FakeIO
@@ -49,7 +49,8 @@ class FileHelper
       max_redirects: follow_redirect ? 5 : 0,
       skip_rate_limit: skip_rate_limit,
       verbose: verbose,
-      validate_uri: validate_uri
+      validate_uri: validate_uri,
+      timeout: read_timeout
     )
 
     fd.get do |response, chunk, uri|
@@ -124,6 +125,9 @@ class FileHelper
         jpegoptim: { strip: strip_image_metadata ? "all" : "none" },
         jpegtran: false,
         jpegrecompress: false,
+        # Skip looking for gifsicle, svgo binaries
+        gifsicle: false,
+        svgo: false
       )
     end
   end
@@ -162,7 +166,10 @@ class FileHelper
   end
 
   def self.supported_media_regexp
-    media = supported_images | supported_audio | supported_video
-    @@supported_media_regexp ||= /\.(#{media.to_a.join("|")})$/i
+    @@supported_media_regexp ||=
+      begin
+        media = supported_images | supported_audio | supported_video
+        /\.(#{media.to_a.join("|")})$/i
+      end
   end
 end
diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index fcc289123c..968c673af4 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -11,10 +11,12 @@ module FileStore
   class S3Store < BaseStore
     TOMBSTONE_PREFIX ||= "tombstone/"
 
-    attr_reader :s3_helper
-
     def initialize(s3_helper = nil)
-      @s3_helper = s3_helper || S3Helper.new(s3_bucket,
+      @s3_helper = s3_helper
+    end
+
+    def s3_helper
+      @s3_helper ||= S3Helper.new(s3_bucket,
         Rails.configuration.multisite ? multisite_tombstone_prefix : TOMBSTONE_PREFIX
       )
     end
@@ -68,7 +70,7 @@ module FileStore
       path.prepend(File.join(upload_path, "/")) if Rails.configuration.multisite
 
       # if this fails, it will throw an exception
-      path, etag = @s3_helper.upload(file, path, options)
+      path, etag = s3_helper.upload(file, path, options)
 
       # return the upload url and etag
       [File.join(absolute_base_url, path), etag]
@@ -77,12 +79,12 @@ module FileStore
     def remove_file(url, path)
       return unless has_been_uploaded?(url)
       # copy the removed file to tombstone
-      @s3_helper.remove(path, true)
+      s3_helper.remove(path, true)
     end
 
     def copy_file(url, source, destination)
       return unless has_been_uploaded?(url)
-      @s3_helper.copy(source, destination)
+      s3_helper.copy(source, destination)
     end
 
     def has_been_uploaded?(url)
@@ -119,11 +121,11 @@ module FileStore
     end
 
     def s3_bucket_folder_path
-      @s3_helper.s3_bucket_folder_path
+      S3Helper.get_bucket_and_folder_path(s3_bucket)[1]
     end
 
     def s3_bucket_name
-      @s3_helper.s3_bucket_name
+      S3Helper.get_bucket_and_folder_path(s3_bucket)[0]
     end
 
     def absolute_base_url
@@ -139,7 +141,7 @@ module FileStore
     end
 
     def purge_tombstone(grace_period)
-      @s3_helper.update_tombstone_lifecycle(grace_period)
+      s3_helper.update_tombstone_lifecycle(grace_period)
     end
 
     def multisite_tombstone_prefix
@@ -165,7 +167,7 @@ module FileStore
     def cdn_url(url)
       return url if SiteSetting.Upload.s3_cdn_url.blank?
       schema = url[/^(https?:)?\/\//, 1]
-      folder = @s3_helper.s3_bucket_folder_path.nil? ? "" : "#{@s3_helper.s3_bucket_folder_path}/"
+      folder = s3_bucket_folder_path.nil? ? "" : "#{s3_bucket_folder_path}/"
       url.sub(File.join("#{schema}#{absolute_base_url}", folder), File.join(SiteSetting.Upload.s3_cdn_url, "/"))
     end
 
@@ -177,7 +179,7 @@ module FileStore
     def cache_avatar(avatar, user_id)
       source = avatar.url.sub(absolute_base_url + "/", "")
       destination = avatar_template(avatar, user_id).sub(absolute_base_url + "/", "")
-      @s3_helper.copy(source, destination)
+      s3_helper.copy(source, destination)
     end
 
     def avatar_template(avatar, user_id)
@@ -213,7 +215,7 @@ module FileStore
     end
 
     def download_file(upload, destination_path)
-      @s3_helper.download_file(get_upload_key(upload), destination_path)
+      s3_helper.download_file(get_upload_key(upload), destination_path)
     end
 
     def copy_from(source_path)
@@ -258,7 +260,7 @@ module FileStore
         )
       end
 
-      obj = @s3_helper.object(url)
+      obj = s3_helper.object(url)
       obj.presigned_url(:get, opts)
     end
 
@@ -272,7 +274,7 @@ module FileStore
 
     def update_ACL(key, secure)
       begin
-        @s3_helper.object(key).acl.put(acl: secure ? "private" : "public-read")
+        s3_helper.object(key).acl.put(acl: secure ? "private" : "public-read")
       rescue Aws::S3::Errors::NoSuchKey
         Rails.logger.warn("Could not update ACL on upload with key: '#{key}'. Upload is missing.")
       end
@@ -282,7 +284,7 @@ module FileStore
       connection = ActiveRecord::Base.connection.raw_connection
       connection.exec('CREATE TEMP TABLE verified_ids(val integer PRIMARY KEY)')
       marker = nil
-      files = @s3_helper.list(prefix, marker)
+      files = s3_helper.list(prefix, marker)
 
       while files.count > 0 do
         verified_ids = []
@@ -295,7 +297,7 @@ module FileStore
 
         verified_id_clause = verified_ids.map { |id| "('#{PG::Connection.escape_string(id.to_s)}')" }.join(",")
         connection.exec("INSERT INTO verified_ids VALUES #{verified_id_clause}")
-        files = @s3_helper.list(prefix, marker)
+        files = s3_helper.list(prefix, marker)
       end
 
       missing_uploads = model.joins('LEFT JOIN verified_ids ON verified_ids.val = id').where("verified_ids.val IS NULL")
diff --git a/lib/file_store/to_s3_migration.rb b/lib/file_store/to_s3_migration.rb
index 85af5a5808..9af8aa3994 100644
--- a/lib/file_store/to_s3_migration.rb
+++ b/lib/file_store/to_s3_migration.rb
@@ -135,8 +135,8 @@ module FileStore
     end
 
     def uploads_migrated_to_new_scheme?
-      seeded_image_url = "#{GlobalSetting.relative_url_root}/uploads/#{@current_db}/original/_X/"
-      !Upload.by_users.where("url NOT LIKE '//%' AND url NOT LIKE '#{seeded_image_url}%'").exists?
+      seeded_image_url = "uploads/#{@current_db}/original/_X/"
+      !Upload.by_users.where("url NOT LIKE '//%' AND url NOT LIKE '/%#{seeded_image_url}%'").exists?
     end
 
     def migrate_to_s3
diff --git a/lib/final_destination.rb b/lib/final_destination.rb
index 8bf06ee6e0..348a44f429 100644
--- a/lib/final_destination.rb
+++ b/lib/final_destination.rb
@@ -16,7 +16,7 @@ class FinalDestination
 
   def self.cache_https_domain(domain)
     key = redis_https_key(domain)
-    Discourse.redis.without_namespace.setex(key, "1", 1.day.to_i).present?
+    Discourse.redis.without_namespace.setex(key, 1.day.to_i, "1")
   end
 
   def self.is_https_domain?(domain)
@@ -28,6 +28,8 @@ class FinalDestination
     "HTTPS_DOMAIN_#{domain}"
   end
 
+  DEFAULT_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0 Safari/605.1.15"
+
   attr_reader :status, :cookie, :status_code, :ignored
 
   def initialize(url, opts = nil)
@@ -38,6 +40,7 @@ class FinalDestination
     @force_get_hosts = @opts[:force_get_hosts] || []
     @preserve_fragment_url_hosts = @opts[:preserve_fragment_url_hosts] || []
     @force_custom_user_agent_hosts = @opts[:force_custom_user_agent_hosts] || []
+    @default_user_agent = @opts[:default_user_agent] || DEFAULT_USER_AGENT
     @opts[:max_redirects] ||= 5
     @opts[:lookup_ip] ||= lambda { |host| FinalDestination.lookup_ip(host) }
 
@@ -67,7 +70,7 @@ class FinalDestination
     @timeout = @opts[:timeout] || nil
     @preserve_fragment_url = @preserve_fragment_url_hosts.any? { |host| hostname_matches?(host) }
     @validate_uri = @opts.fetch(:validate_uri) { true }
-    @user_agent = @force_custom_user_agent_hosts.any? { |host| hostname_matches?(host) } ? Onebox.options.user_agent : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0 Safari/605.1.15"
+    @user_agent = @force_custom_user_agent_hosts.any? { |host| hostname_matches?(host) } ? Onebox.options.user_agent : @default_user_agent
   end
 
   def self.connection_timeout
@@ -98,8 +101,7 @@ class FinalDestination
     status_code, response_headers = nil
 
     catch(:done) do
-      Net::HTTP.start(@uri.host, @uri.port, use_ssl: @uri.is_a?(URI::HTTPS)) do |http|
-        http.open_timeout = timeout
+      Net::HTTP.start(@uri.host, @uri.port, use_ssl: @uri.is_a?(URI::HTTPS), open_timeout: timeout) do |http|
         http.read_timeout = timeout
         http.request_get(@uri.request_uri, request_headers) do |resp|
           status_code = resp.code.to_i
@@ -182,23 +184,38 @@ class FinalDestination
       end
     end
 
+    if Oneboxer.cached_response_body_exists?(@uri.to_s)
+      @status = :resolved
+      return @uri
+    end
+
     headers = request_headers
+    middlewares = Excon.defaults[:middlewares]
+    middlewares << Excon::Middleware::Decompress if @http_verb == :get
+
     response = Excon.public_send(@http_verb,
       @uri.to_s,
       read_timeout: timeout,
-      headers: headers
+      headers: headers,
+      middlewares: middlewares
     )
 
     location = nil
     response_headers = nil
-
     response_status = response.status.to_i
 
     case response.status
     when 200
+      # Cache body of successful `get` requests
+      if @http_verb == :get
+        if Oneboxer.cache_response_body?(@uri)
+          Oneboxer.cache_response_body(@uri.to_s, response.body)
+        end
+      end
+
       @status = :resolved
       return @uri
-    when 400, 405, 406, 409, 501
+    when 400, 405, 406, 409, 500, 501
       response_status, small_headers = small_get(request_headers)
 
       if response_status == 200
@@ -283,7 +300,17 @@ class FinalDestination
 
   def hostname_matches?(url)
     url = uri(url)
-    @uri && url.present? && @uri.hostname == url&.hostname
+
+    if @uri&.hostname.present? && url&.hostname.present?
+      hostname_parts = url.hostname.split('.')
+      has_wildcard = hostname_parts.first == '*'
+
+      if has_wildcard
+        @uri.hostname.end_with?(hostname_parts[1..-1].join('.'))
+      else
+        @uri.hostname == url.hostname
+      end
+    end
   end
 
   def is_dest_valid?
@@ -413,9 +440,8 @@ class FinalDestination
   end
 
   def safe_session(uri)
-    Net::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == "https")) do |http|
+    Net::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == "https"), open_timeout: timeout) do |http|
       http.read_timeout = timeout
-      http.open_timeout = timeout
       yield http
     end
   end
diff --git a/lib/freedom_patches/fast_pluck.rb b/lib/freedom_patches/fast_pluck.rb
index bc79177e73..a9faa87b32 100644
--- a/lib/freedom_patches/fast_pluck.rb
+++ b/lib/freedom_patches/fast_pluck.rb
@@ -54,9 +54,7 @@ class ActiveRecord::Relation
       enforce_raw_sql_whitelist(column_names)
       relation = spawn
 
-      relation.select_values = column_names.map { |cn|
-        @klass.has_attribute?(cn) || @klass.attribute_alias?(cn) ? arel_attribute(cn) : cn
-      }
+      relation.select_values = column_names
 
       klass.connection.select_raw(relation.arel) do |result, _|
         result.type_map = DB.type_map
diff --git a/lib/freedom_patches/match.rb b/lib/freedom_patches/match.rb
deleted file mode 100644
index 4190aec352..0000000000
--- a/lib/freedom_patches/match.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-class String
-  # new to Ruby 2.4, fastest way of matching a string to a regex
-  unless method_defined? :match?
-    def match?(regex)
-      !!(self =~ regex)
-    end
-  end
-end
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index feaee4d069..7340e4aa5d 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -41,11 +41,11 @@ module Discourse
   module Ember
     module Handlebars
       module Helper
-        def precompile_handlebars(string)
+        def precompile_handlebars(string, input = nil)
           "requirejs('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(string)});"
         end
 
-        def compile_handlebars(string)
+        def compile_handlebars(string, input = nil)
           "requirejs('discourse-common/lib/raw-handlebars').compile(#{indent(string).inspect});"
         end
       end
@@ -54,22 +54,74 @@ module Discourse
 end
 
 class Ember::Handlebars::Template
-  include Discourse::Ember::Handlebars::Helper
+  prepend Discourse::Ember::Handlebars::Helper
 
-  def precompile_handlebars(string, input = nil)
-    "requirejs('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(string)});"
-  end
-
-  def compile_handlebars(string, input = nil)
-    "requirejs('discourse-common/lib/raw-handlebars').compile(#{indent(string).inspect});"
+  def path_for(module_name, config)
+    # We need this for backward-compatibility reasons.
+    # Plugins may not have an app subdirectory.
+    template_path(module_name, config).inspect.gsub('discourse/templates/', '')
   end
 
   def global_template_target(namespace, module_name, config)
-    # 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_for(module_name, config)}]"
+  end
 
-    "#{namespace}[#{path}]"
+  def call(input)
+    data = input[:data]
+    filename = input[:filename]
+
+    raw = handlebars?(filename)
+
+    if raw
+      template = data
+    else
+      template = mustache_to_handlebars(filename, data)
+    end
+
+    template_name = input[:name]
+
+    module_name =
+      case config.output_type
+      when :amd
+        amd_template_target(config.amd_namespace, template_name)
+      when :global
+        template_path(template_name, config)
+      else
+        raise "Unsupported `output_type`: #{config.output_type}"
+      end
+
+    meta = meta_supported? ? { moduleName: module_name } : false
+
+    if config.precompile
+      if raw
+        template = precompile_handlebars(template, input)
+      else
+        template = precompile_ember_handlebars(template, config.ember_template, input, meta)
+      end
+    else
+      if raw
+        template = compile_handlebars(data)
+      else
+        template = compile_ember_handlebars(template, config.ember_template, meta)
+      end
+    end
+
+    case config.output_type
+    when :amd
+      "define('#{module_name}', ['exports'], function(__exports__){ __exports__['default'] = #{template} });"
+    when :global
+      if raw
+        return <<~RAW_TEMPLATE
+          var __t = #{template};
+          requirejs('discourse-common/lib/raw-templates').addRawTemplate(#{path_for(template_name, config)}, __t);
+        RAW_TEMPLATE
+      end
+
+      target = global_template_target('Ember.TEMPLATES', template_name, config)
+      "#{target} = #{template}\n"
+    else
+      raise "Unsupported `output_type`: #{config.output_type}"
+    end
   end
 
   # FIXME: Previously, ember-handlebars-templates uses the logical path which incorrectly
diff --git a/lib/freedom_patches/regexp.rb b/lib/freedom_patches/regexp.rb
deleted file mode 100644
index 4dd6f7a55d..0000000000
--- a/lib/freedom_patches/regexp.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-unless ::Regexp.instance_methods.include?(:match?)
-  class ::Regexp
-    # this is the fast way of checking a regex (zero string allocs) added in Ruby 2.4
-    # backfill it for now
-    def match?(string)
-      !!(string =~ self)
-    end
-  end
-end
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index 5a82623f8f..2bc4cac1e8 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -33,6 +33,7 @@ module I18n
     LOAD_MUTEX = Mutex.new
 
     def load_locale(locale)
+      locale = locale.to_sym
       LOAD_MUTEX.synchronize do
         return if @loaded_locales.include?(locale)
 
@@ -54,6 +55,11 @@ module I18n
         # load it
         I18n.backend.load_translations(I18n.load_path.grep(/\.#{Regexp.escape locale}\.yml$/))
 
+        if Rails.env.development?
+          I18n.backend.load_translations(I18n.load_path.grep(/.*faker.*\/#{Regexp.escape locale}\.yml$/))
+          I18n.backend.load_translations(I18n.load_path.grep(/.*faker.*\/#{Regexp.escape locale}\/.*\.yml$/))
+        end
+
         @loaded_locales << locale
       end
     end
@@ -65,13 +71,13 @@ module I18n
     def search(query, opts = {})
       execute_reload if @requires_reload
 
-      locale = opts[:locale] || config.locale
+      locale = (opts[:locale] || config.locale).to_sym
 
       load_locale(locale) unless @loaded_locales.include?(locale)
       opts ||= {}
 
       target = opts[:backend] || backend
-      results = opts[:overridden] ? {} : target.search(config.locale, query)
+      results = opts[:overridden] ? {} : target.search(locale, query)
 
       regexp = I18n::Backend::DiscourseI18n.create_search_regexp(query)
       (overrides_by_locale(locale) || {}).each do |k, v|
@@ -82,6 +88,7 @@ module I18n
     end
 
     def ensure_loaded!(locale)
+      locale = locale.to_sym
       @loaded_locales ||= []
       load_locale(locale) unless @loaded_locales.include?(locale)
     end
@@ -114,6 +121,7 @@ module I18n
       end
 
       locale ||= config.locale
+      locale = locale.to_sym
 
       @cache ||= LruRedux::ThreadSafeCache.new(LRU_CACHE_SIZE)
       k = "#{key}#{locale}#{config.backend.object_id}"
@@ -138,6 +146,7 @@ module I18n
     def overrides_by_locale(locale)
       return unless @overrides_enabled
       return {} if GlobalSetting.skip_db?
+      locale = locale.to_sym
 
       execute_reload if @requires_reload
 
@@ -176,7 +185,7 @@ module I18n
 
       options  = args.last.is_a?(Hash) ? args.pop.dup : {}
       key      = args.shift
-      locale   = options[:locale] || config.locale
+      locale   = (options[:locale] || config.locale).to_sym
 
       load_locale(locale) unless @loaded_locales.include?(locale)
 
@@ -219,11 +228,13 @@ module I18n
       execute_reload if @requires_reload
 
       locale ||= config.locale
+      locale = locale.to_sym
       load_locale(locale) unless @loaded_locales.include?(locale)
       exists_no_cache?(key, locale)
     end
 
     def locale=(value)
+      value = value.to_sym
       execute_reload if @requires_reload
       self.locale_no_cache = value
     end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 7f6935d2cb..8bb2566c10 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -351,22 +351,29 @@ class Guardian
   end
 
   def can_invite_to_forum?(groups = nil)
-    authenticated? &&
-    (SiteSetting.max_invites_per_day.to_i > 0 || is_staff?) &&
-    !SiteSetting.enable_sso &&
-    SiteSetting.enable_local_logins &&
-    (
-      (!SiteSetting.must_approve_users? && @user.has_trust_level?(SiteSetting.min_trust_level_to_allow_invite.to_i)) ||
-      is_staff?
-    ) &&
-    (groups.blank? || is_admin? || groups.all? { |g| can_edit_group?(g) })
+    return false if !authenticated?
+
+    invites_available = SiteSetting.max_invites_per_day.to_i.positive?
+    trust_level_requirement_met = !SiteSetting.must_approve_users? && @user.has_trust_level?(SiteSetting.min_trust_level_to_allow_invite.to_i)
+
+    if !is_staff?
+      return false if !invites_available
+      return false if !trust_level_requirement_met
+    end
+
+    if groups.present?
+      return is_admin? || groups.all? { |g| can_edit_group?(g) }
+    end
+
+    true
   end
 
   def can_invite_to?(object, groups = nil)
     return false unless authenticated?
     is_topic = object.is_a?(Topic)
     return true if is_admin? && !is_topic
-    return false if (SiteSetting.max_invites_per_day.to_i == 0 && !is_staff?)
+    return false if SiteSetting.max_invites_per_day.to_i == 0 && !is_staff?
+    return false if SiteSetting.must_approve_users? && !is_staff?
     return false unless can_see?(object)
     return false if groups.present?
 
@@ -391,26 +398,19 @@ class Guardian
 
   def can_invite_via_email?(object)
     return false unless can_invite_to?(object)
-    !SiteSetting.enable_sso && SiteSetting.enable_local_logins && (!SiteSetting.must_approve_users? || is_staff?)
+    (SiteSetting.enable_local_logins || SiteSetting.enable_discourse_connect) &&
+      (!SiteSetting.must_approve_users? || is_staff?)
   end
 
   def can_bulk_invite_to_forum?(user)
-    user.admin?
-  end
-
-  def can_send_invite_links?(user)
-    user.staff?
-  end
-
-  def can_send_multiple_invites?(user)
-    user.staff?
+    user.admin? && !SiteSetting.enable_discourse_connect
   end
 
   def can_resend_all_invites?(user)
     user.staff?
   end
 
-  def can_rescind_all_invites?(user)
+  def can_destroy_all_invites?(user)
     user.staff?
   end
 
@@ -446,18 +446,13 @@ class Guardian
 
   def can_send_private_messages_to_email?
     # Staged users must be enabled to create a temporary user.
-    SiteSetting.enable_staged_users &&
+    return false if !SiteSetting.enable_staged_users
     # User is authenticated
-    authenticated? &&
+    return false if !authenticated?
     # User is trusted enough
-    (is_staff? ||
-      (
-        # TODO: 2019 evaluate if we need this flexibility
-        # perhaps we enable this unconditionally to TL4?
-        @user.has_trust_level?(SiteSetting.min_trust_to_send_email_messages) &&
-        SiteSetting.enable_personal_email_messages
-      )
-    )
+    return is_admin? if SiteSetting.min_trust_to_send_email_messages.to_s == 'admin'
+    return is_staff? if SiteSetting.min_trust_to_send_email_messages.to_s == 'staff'
+    SiteSetting.enable_personal_messages && @user.has_trust_level?(SiteSetting.min_trust_to_send_email_messages.to_i)
   end
 
   def can_export_entity?(entity)
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index e6e9041013..156e19f7e7 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#mixin for all guardian methods dealing with post permissions
+# mixin for all guardian methods dealing with post permissions
 module PostGuardian
 
   def unrestricted_link_posting?
@@ -104,7 +104,6 @@ module PostGuardian
     user.post_count <= SiteSetting.delete_all_posts_max.to_i
   end
 
-  # Creating Method
   def can_create_post?(parent)
     return false if !SiteSetting.enable_system_message_replies? && parent.try(:subtype) == "system_message"
 
@@ -115,7 +114,6 @@ module PostGuardian
     )
   end
 
-  # Editing Method
   def can_edit_post?(post)
     if Discourse.static_doc_topic_ids.include?(post.topic_id) && !is_admin?
       return false
@@ -132,13 +130,22 @@ module PostGuardian
         SiteSetting.trusted_users_can_edit_others? &&
         @user.has_trust_level?(TrustLevel[4])
       ) ||
-      is_category_group_moderator?(post.topic.category)
+      is_category_group_moderator?(post.topic&.category)
     )
 
     if post.topic&.archived? || post.user_deleted || post.deleted_at
       return false
     end
 
+    # Editing a shared draft.
+    return true if (
+      can_see_post?(post) &&
+      can_create_post?(post.topic) &&
+      post.topic.category_id == SiteSetting.shared_drafts_category.to_i &&
+      can_see_category?(post.topic.category) &&
+      can_see_shared_draft?
+    )
+
     if post.wiki && (@user.trust_level >= SiteSetting.min_trust_to_edit_wiki_post.to_i)
       return can_create_post?(post.topic)
     end
@@ -159,6 +166,10 @@ module PostGuardian
         return true
       end
 
+      if post.is_first_post? && post.topic.category_allows_unlimited_owner_edits_on_first_post?
+        return true
+      end
+
       return !post.edit_time_limit_expired?(@user)
     end
 
@@ -173,34 +184,39 @@ module PostGuardian
     post.is_first_post? ? post.topic && can_delete_topic?(post.topic) : can_delete_post?(post)
   end
 
-  # Deleting Methods
   def can_delete_post?(post)
     return false if !can_see_post?(post)
 
     # Can't delete the first post
     return false if post.is_first_post?
 
+    return true if can_moderate_topic?(post.topic)
+
     # Can't delete posts in archived topics unless you are staff
-    can_moderate = can_moderate_topic?(post.topic)
-    return false if !can_moderate && post.topic&.archived?
+    return false if post.topic&.archived?
 
     # You can delete your own posts
-    return !post.user_deleted? if is_my_own?(post)
+    if is_my_own?(post)
+      return false if (SiteSetting.max_post_deletions_per_minute < 1 || SiteSetting.max_post_deletions_per_day < 1)
+      return true if !post.user_deleted?
+    end
 
-    can_moderate
+    false
   end
 
-  # Recovery Method
   def can_recover_post?(post)
     return false unless post
 
-    topic = Topic.with_deleted.find(post.topic_id) if post.topic_id
+    # PERF, vast majority of the time topic will not be deleted
+    topic = (post.topic || Topic.with_deleted.find(post.topic_id)) if post.topic_id
+    return true if can_moderate_topic?(topic) && !!post.deleted_at
 
-    if can_moderate_topic?(topic)
-      !!post.deleted_at
-    else
-      is_my_own?(post) && post.user_deleted && !post.deleted_at
+    if is_my_own?(post)
+      return false if (SiteSetting.max_post_deletions_per_minute < 1 || SiteSetting.max_post_deletions_per_day < 1)
+      return true if post.user_deleted && !post.deleted_at
     end
+
+    false
   end
 
   def can_delete_post_action?(post_action)
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index fdd13e703f..81d36c02c2 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -17,12 +17,19 @@ module TopicGuardian
     return false if anonymous? || topic.nil?
     return true if is_staff?
 
-    is_category_group_moderator?(topic.category)
+    can_perform_action_available_to_group_moderators?(topic)
   end
   alias :can_moderate_topic? :can_review_topic?
 
   def can_create_shared_draft?
-    is_staff? && SiteSetting.shared_drafts_enabled?
+    SiteSetting.shared_drafts_enabled? && can_see_shared_draft?
+  end
+
+  def can_see_shared_draft?
+    return is_admin? if SiteSetting.shared_drafts_min_trust_level.to_s == 'admin'
+    return is_staff? if SiteSetting.shared_drafts_min_trust_level.to_s == 'staff'
+
+    @user.has_trust_level?(SiteSetting.shared_drafts_min_trust_level.to_i)
   end
 
   def can_create_whisper?
@@ -34,7 +41,7 @@ module TopicGuardian
   end
 
   def can_publish_topic?(topic, category)
-    is_staff? && can_see?(topic) && can_create_topic?(category)
+    can_see_shared_draft? && can_see?(topic) && can_create_topic_on_category?(category)
   end
 
   # Creating Methods
@@ -79,6 +86,7 @@ module TopicGuardian
 
     return true if is_admin?
     return true if is_moderator? && can_create_post?(topic)
+    return true if is_category_group_moderator?(topic.category)
 
     # can't edit topics in secured categories where you don't have permission to create topics
     # except for a tiny edge case where the topic is uncategorized and you are trying
@@ -90,6 +98,16 @@ module TopicGuardian
       return false if !can_create_topic_on_category?(topic.category)
     end
 
+    # Editing a shared draft.
+    return true if (
+      !topic.archived &&
+      !topic.private_message? &&
+      topic.category_id == SiteSetting.shared_drafts_category.to_i &&
+      can_see_category?(topic.category) &&
+      can_see_shared_draft? &&
+      can_create_post?(topic)
+    )
+
     # TL4 users can edit archived topics, but can not edit private messages
     return true if (
       SiteSetting.trusted_users_can_edit_others? &&
@@ -114,7 +132,6 @@ module TopicGuardian
       !Post.where(topic_id: topic.id, post_number: 1).where.not(locked_by_id: nil).exists?
   end
 
-  # Recovery Method
   def can_recover_topic?(topic)
     if is_staff? || (topic&.category && is_category_group_moderator?(topic.category))
       !!(topic && topic.deleted_at)
@@ -130,6 +147,10 @@ module TopicGuardian
     !Discourse.static_doc_topic_ids.include?(topic.id)
   end
 
+  def can_toggle_topic_visibility?(topic)
+    can_moderate?(topic) || can_perform_action_available_to_group_moderators?(topic)
+  end
+
   def can_convert_topic?(topic)
     return false unless SiteSetting.enable_personal_messages?
     return false if topic.blank?
@@ -156,6 +177,8 @@ module TopicGuardian
       return authenticated? && topic.all_allowed_users.where(id: @user.id).exists?
     end
 
+    return false if topic.shared_draft && !can_see_shared_draft?
+
     category = topic.category
     can_see_category?(category) &&
       (!category.read_restricted || !is_staged? || secure_category_ids.include?(category.id) || topic.user == user)
@@ -167,12 +190,9 @@ module TopicGuardian
 
   def filter_allowed_categories(records)
     unless is_admin?
-      allowed_ids = allowed_category_ids
-      if allowed_ids.length > 0
-        records = records.where('topics.category_id IS NULL or topics.category_id IN (?)', allowed_ids)
-      else
-        records = records.where('topics.category_id IS NULL')
-      end
+      records = allowed_category_ids.size == 0 ?
+        records.where('topics.category_id IS NULL') :
+        records.where('topics.category_id IS NULL or topics.category_id IN (?)', allowed_category_ids)
       records = records.references(:categories)
     end
     records
@@ -212,8 +232,10 @@ module TopicGuardian
   end
   alias :can_archive_topic? :can_perform_action_available_to_group_moderators?
   alias :can_close_topic? :can_perform_action_available_to_group_moderators?
+  alias :can_open_topic? :can_perform_action_available_to_group_moderators?
   alias :can_split_merge_topic? :can_perform_action_available_to_group_moderators?
   alias :can_edit_staff_notes? :can_perform_action_available_to_group_moderators?
+  alias :can_pin_unpin_topic? :can_perform_action_available_to_group_moderators?
 
   def can_move_posts?(topic)
     return false if is_silenced?
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index c26ec89aa8..250adfe179 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -23,7 +23,7 @@ module UserGuardian
   end
 
   def can_edit_username?(user)
-    return false if SiteSetting.sso_overrides_username?
+    return false if SiteSetting.auth_overrides_username?
     return true if is_staff?
     return false if SiteSetting.username_change_period <= 0
     return false if is_anonymous?
@@ -31,7 +31,7 @@ module UserGuardian
   end
 
   def can_edit_email?(user)
-    return false if SiteSetting.sso_overrides_email?
+    return false if SiteSetting.auth_overrides_email?
     return false unless SiteSetting.email_editable?
     return true if is_staff?
     return false if is_anonymous?
@@ -40,7 +40,7 @@ module UserGuardian
 
   def can_edit_name?(user)
     return false unless SiteSetting.enable_names?
-    return false if SiteSetting.sso_overrides_name?
+    return false if SiteSetting.auth_overrides_name?
     return true if is_staff?
     return false if is_anonymous?
     can_edit?(user)
@@ -61,7 +61,7 @@ module UserGuardian
   def can_delete_user?(user)
     return false if user.nil? || user.admin?
     if is_me?(user)
-      !SiteSetting.enable_sso &&
+      !SiteSetting.enable_discourse_connect &&
       !user.has_more_posts_than?(SiteSetting.delete_user_self_max_post_count)
     else
       is_staff? && (
@@ -92,7 +92,7 @@ module UserGuardian
     is_admin? || (is_staff? && SiteSetting.moderators_view_emails)
   end
 
-  def can_check_sso_email?(user)
+  def can_check_sso_details?(user)
     user && is_admin?
   end
 
@@ -173,6 +173,6 @@ module UserGuardian
   end
 
   def can_delete_sso_record?(user)
-    SiteSetting.enable_sso && user && is_admin?
+    SiteSetting.enable_discourse_connect && user && is_admin?
   end
 end
diff --git a/lib/html_to_markdown.rb b/lib/html_to_markdown.rb
index d2fb51f34c..dbb7f22598 100644
--- a/lib/html_to_markdown.rb
+++ b/lib/html_to_markdown.rb
@@ -37,11 +37,8 @@ class HtmlToMarkdown
     @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
@@ -180,7 +177,7 @@ class HtmlToMarkdown
     end
   end
 
-  ALLOWED ||= %w{kbd del ins small big sub sup dl dd dt}
+  ALLOWED ||= %w{kbd del ins small big sub sup dl dd dt mark}
   ALLOWED.each do |tag|
     define_method("visit_#{tag}") do |node|
       "<#{tag}>#{traverse(node)}</#{tag}>"
diff --git a/lib/i18n/backend/discourse_i18n.rb b/lib/i18n/backend/discourse_i18n.rb
index fa6533165d..2fd498f668 100644
--- a/lib/i18n/backend/discourse_i18n.rb
+++ b/lib/i18n/backend/discourse_i18n.rb
@@ -14,6 +14,8 @@ module I18n
 
       def reload!
         @pluralizers = {}
+        # this calls `reload!` in our patch lib/freedom_patches/translate_accelerator.rb
+        I18n.reload!
         super
       end
 
@@ -89,6 +91,7 @@ module I18n
         return existing_translations if scope.is_a?(Array) && scope.include?(:models)
 
         overrides = options.dig(:overrides, locale)
+        key = key.to_s
 
         if overrides
           if options[:count]
@@ -110,7 +113,7 @@ module I18n
               result = {}
 
               remapped_translations.merge(overrides).each do |k, v|
-                result[k.split('.').last.to_sym] = v if k != key && k.start_with?(key.to_s)
+                result[k.split('.').last.to_sym] = v if k != key && k.start_with?(key)
               end
               return result if result.size > 0
             end
diff --git a/lib/imap/providers/generic.rb b/lib/imap/providers/generic.rb
index 4b82e405ac..e331c32f6c 100644
--- a/lib/imap/providers/generic.rb
+++ b/lib/imap/providers/generic.rb
@@ -10,6 +10,10 @@ module Imap
       attr_accessor :trashed_emails, :trash_uid_validity
     end
 
+    class SpamMailResponse
+      attr_accessor :spam_emails, :spam_uid_validity
+    end
+
     class BasicMail
       attr_accessor :uid, :message_id
 
@@ -172,14 +176,19 @@ module Imap
       end
 
       # Look for the special Trash XLIST attribute.
-      # TODO: It might be more efficient to just store this against the group.
-      # Another table is looking more and more attractive....
       def trash_mailbox
         Discourse.cache.fetch("imap_trash_mailbox_#{account_digest}", expires_in: 30.minutes) do
           list_mailboxes(:Trash).first
         end
       end
 
+      # Look for the special Junk XLIST attribute.
+      def spam_mailbox
+        Discourse.cache.fetch("imap_spam_mailbox_#{account_digest}", expires_in: 30.minutes) do
+          list_mailboxes(:Junk).first
+        end
+      end
+
       # open the trash mailbox for inspection or writing. after the yield we
       # close the trash and reopen the original mailbox to continue operations.
       # the normal open_mailbox call can be made if more extensive trash ops
@@ -196,19 +205,26 @@ module Imap
         trash_uid_validity
       end
 
+      # open the spam mailbox for inspection or writing. after the yield we
+      # close the spam and reopen the original mailbox to continue operations.
+      # the normal open_mailbox call can be made if more extensive spam ops
+      # need to be done.
+      def open_spam_mailbox(write: false)
+        open_mailbox_before_spam = @open_mailbox_name
+        open_mailbox_before_spam_write = @open_mailbox_write
+
+        spam_uid_validity = open_mailbox(spam_mailbox, write: write)[:uid_validity]
+
+        yield(spam_uid_validity) if block_given?
+
+        open_mailbox(open_mailbox_before_spam, write: open_mailbox_before_spam_write)
+        spam_uid_validity
+      end
+
       def find_trashed_by_message_ids(message_ids)
         trashed_emails = []
         trash_uid_validity = open_trash_mailbox do
-          header_message_id_terms = message_ids.map do |msgid|
-            "HEADER Message-ID '#{Email.message_id_rfc_format(msgid)}'"
-          end
-
-          # OR clauses are written in Polish notation...so the query looks like this:
-          # OR OR HEADER Message-ID XXXX HEADER Message-ID XXXX HEADER Message-ID XXXX
-          or_clauses = 'OR ' * (header_message_id_terms.length - 1)
-          query = "#{or_clauses}#{header_message_id_terms.join(" ")}"
-
-          trashed_email_uids = imap.uid_search(query)
+          trashed_email_uids = find_uids_by_message_ids(message_ids)
           if trashed_email_uids.any?
             trashed_emails = emails(trashed_email_uids, ["UID", "ENVELOPE"]).map do |e|
               BasicMail.new(message_id: Email.message_id_clean(e['ENVELOPE'].message_id), uid: e['UID'])
@@ -222,6 +238,36 @@ module Imap
         end
       end
 
+      def find_spam_by_message_ids(message_ids)
+        spam_emails = []
+        spam_uid_validity = open_spam_mailbox do
+          spam_email_uids = find_uids_by_message_ids(message_ids)
+          if spam_email_uids.any?
+            spam_emails = emails(spam_email_uids, ["UID", "ENVELOPE"]).map do |e|
+              BasicMail.new(message_id: Email.message_id_clean(e['ENVELOPE'].message_id), uid: e['UID'])
+            end
+          end
+        end
+
+        SpamMailResponse.new.tap do |resp|
+          resp.spam_emails = spam_emails
+          resp.spam_uid_validity = spam_uid_validity
+        end
+      end
+
+      def find_uids_by_message_ids(message_ids)
+        header_message_id_terms = message_ids.map do |msgid|
+          "HEADER Message-ID '#{Email.message_id_rfc_format(msgid)}'"
+        end
+
+        # OR clauses are written in Polish notation...so the query looks like this:
+        # OR OR HEADER Message-ID XXXX HEADER Message-ID XXXX HEADER Message-ID XXXX
+        or_clauses = 'OR ' * (header_message_id_terms.length - 1)
+        query = "#{or_clauses}#{header_message_id_terms.join(" ")}"
+
+        imap.uid_search(query)
+      end
+
       def trash(uid)
         # MOVE is way easier than doing the COPY \Deleted EXPUNGE dance ourselves.
         # It is supported by Gmail and Outlook.
diff --git a/lib/imap/sync.rb b/lib/imap/sync.rb
index 99ae2b995c..96e85ba746 100644
--- a/lib/imap/sync.rb
+++ b/lib/imap/sync.rb
@@ -60,7 +60,7 @@ module Imap
         ActiveRecord::Base.connection_handler.clear_active_connections!
 
         idle_polling_mins = SiteSetting.imap_polling_period_mins.minutes.to_i
-        ImapSyncLog.debug("Going IDLE for #{idle_polling_mins} seconds to wait for more work", @group)
+        ImapSyncLog.debug("Going IDLE for #{idle_polling_mins} seconds to wait for more work", @group, db: false)
 
         @provider.imap.idle(idle_polling_mins) do |resp|
           if resp.kind_of?(Net::IMAP::UntaggedResponse) && resp.name == 'EXISTS'
@@ -180,15 +180,15 @@ module Imap
       # This can be done because Message-ID is unique on a mail server between mailboxes,
       # where the UID will have changed when moving into the Trash mailbox. We need to get
       # the new UID from the trash.
+      potential_spam = []
       response = @provider.find_trashed_by_message_ids(missing_message_ids)
       existing_incoming.each do |incoming|
         matching_trashed = response.trashed_emails.find { |email| email.message_id == incoming.message_id }
 
-        # if the email is not in the trash then we don't know where it is... could
-        # be in any mailbox on the server or could be permanently deleted. TODO
-        # here would be some sort of more complex detection of "where in the world
-        # has this UID gone?"
-        next if !matching_trashed
+        if !matching_trashed
+          potential_spam << incoming
+          next
+        end
 
         # if we deleted the topic/post ourselves in discourse then the post will
         # not exist, and this sync is just updating the old UIDs to the new ones
@@ -202,6 +202,34 @@ module Imap
         ImapSyncLog.debug("Updating incoming ID #{incoming.id} uid data FROM [UID #{incoming.imap_uid} | UIDVALIDITY #{incoming.imap_uid_validity}] TO [UID #{matching_trashed.uid} | UIDVALIDITY #{response.trash_uid_validity}] (TRASHED)", @group)
         incoming.update(imap_uid_validity: response.trash_uid_validity, imap_uid: matching_trashed.uid)
       end
+
+      # This can be done because Message-ID is unique on a mail server between mailboxes,
+      # where the UID will have changed when moving into the Trash mailbox. We need to get
+      # the new UID from the spam.
+      response = @provider.find_spam_by_message_ids(missing_message_ids)
+      potential_spam.each do |incoming|
+        matching_spam = response.spam_emails.find { |email| email.message_id == incoming.message_id }
+
+        # if the email is not in the trash or spam then we don't know where it is... could
+        # be in any mailbox on the server or could be permanently deleted.
+        if !matching_spam
+          ImapSyncLog.debug("Email for incoming ID #{incoming.id} (#{incoming.message_id}) could not be found in the group mailbox, trash, or spam. It could be in another mailbox or permanently deleted.", @group)
+          incoming.update(imap_missing: true)
+          next
+        end
+
+        # if we deleted the topic/post ourselves in discourse then the post will
+        # not exist, and this sync is just updating the old UIDs to the new ones
+        # in the spam, and we don't need to re-destroy the post
+        if incoming.post
+          ImapSyncLog.debug("Deleting post ID #{incoming.post_id}, topic id #{incoming.topic_id}; email has been moved to spam on the IMAP server.", @group)
+          PostDestroyer.new(Discourse.system_user, incoming.post).destroy
+        end
+
+        # the email has moved mailboxes, we don't want to try marking as spam again next time
+        ImapSyncLog.debug("Updating incoming ID #{incoming.id} uid data FROM [UID #{incoming.imap_uid} | UIDVALIDITY #{incoming.imap_uid_validity}] TO [UID #{matching_spam.uid} | UIDVALIDITY #{response.spam_uid_validity}] (SPAM)", @group)
+        incoming.update(imap_uid_validity: response.spam_uid_validity, imap_uid: matching_spam.uid)
+      end
     end
 
     def process_new_uids(new_uids, import_mode, all_old_uids_size, all_new_uids_size)
@@ -226,7 +254,8 @@ module Imap
             destinations: [@group],
             imap_uid_validity: @status[:uid_validity],
             imap_uid: email['UID'],
-            imap_group_id: @group.id
+            imap_group_id: @group.id,
+            source: :imap
           )
           receiver.process!
 
@@ -281,8 +310,8 @@ module Imap
       tags = Set.new
 
       # "Plus" part from the destination email address
-      to_addresses = incoming_email.to_addresses&.split(";") || []
-      cc_addresses = incoming_email.cc_addresses&.split(";") || []
+      to_addresses = incoming_email.to_addresses_split
+      cc_addresses = incoming_email.cc_addresses_split
       (to_addresses + cc_addresses).each do |address|
         if plus_part = address&.scan(group_email_regex)&.first&.first
           tags.add("plus:#{plus_part[1..-1]}") if plus_part.length > 0
diff --git a/lib/inline_oneboxer.rb b/lib/inline_oneboxer.rb
index 48c0171519..019da0826d 100644
--- a/lib/inline_oneboxer.rb
+++ b/lib/inline_oneboxer.rb
@@ -36,15 +36,24 @@ class InlineOneboxer
       if route[:controller] == "topics"
         if topic = Oneboxer.local_topic(url, route, opts)
           opts[:skip_cache] = true
+          post_number = [route[:post_number].to_i, topic.highest_post_number].min
+          if post_number > 1
+            opts[:post_number] = post_number
+            opts[:post_author] = post_author_for_title(topic, post_number)
+          end
           return onebox_for(url, topic.title, opts)
+        else
+          # not permitted to see topic
+          return nil
         end
       end
     end
 
     always_allow = SiteSetting.enable_inline_onebox_on_all_domains
-    domains = SiteSetting.allowed_inline_onebox_domains&.split('|') unless always_allow
+    allowed_domains = SiteSetting.allowed_inline_onebox_domains&.split('|') unless always_allow
+    blocked_domains = SiteSetting.blocked_onebox_domains&.split('|')
 
-    if always_allow || domains
+    if always_allow || allowed_domains
       uri = begin
         URI(url)
       rescue URI::Error
@@ -52,7 +61,8 @@ class InlineOneboxer
 
       if uri.present? &&
         uri.hostname.present? &&
-        (always_allow || domains.include?(uri.hostname))
+        (always_allow || allowed_domains.include?(uri.hostname)) &&
+        !blocked_domains.include?(uri.hostname)
         title = RetrieveTitle.crawl(url)
         title = nil if title && title.length < MIN_TITLE_LENGTH
         return onebox_for(url, title, opts)
@@ -65,6 +75,22 @@ class InlineOneboxer
   private
 
   def self.onebox_for(url, title, opts)
+    title = title && Emoji.gsub_emoji_to_unicode(title)
+    if title && opts[:post_number]
+      title += " - "
+      if opts[:post_author]
+        title += I18n.t(
+          "inline_oneboxer.topic_page_title_post_number_by_user",
+          post_number: opts[:post_number],
+          username: opts[:post_author]
+        )
+      else
+        title += I18n.t(
+          "inline_oneboxer.topic_page_title_post_number",
+          post_number: opts[:post_number]
+        )
+      end
+    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
@@ -74,4 +100,12 @@ class InlineOneboxer
     "inline_onebox:#{url}"
   end
 
+  def self.post_author_for_title(topic, post_number)
+    guardian = Guardian.new
+    post = topic.posts.find_by(post_number: post_number)
+    author = post&.user
+    if author && guardian.can_see_post?(post) && post.post_type == Post.types[:regular]
+      author.username
+    end
+  end
 end
diff --git a/lib/javascripts/widget-hbs-compiler.js b/lib/javascripts/widget-hbs-compiler.js
index 6573efbe4e..58c911a197 100644
--- a/lib/javascripts/widget-hbs-compiler.js
+++ b/lib/javascripts/widget-hbs-compiler.js
@@ -90,11 +90,13 @@ function mustacheValue(node, state) {
         node.hash.pairs.find((p) => p.key === "widget")
       );
 
-      let attrs = node.hash.pairs.find((p) => p.key === "attrs");
-      if (attrs) {
-        return `this.attach(${widgetName}, ${argValue(attrs)})`;
-      }
-      return `this.attach(${widgetName}, attrs)`;
+      const attrs = node.hash.pairs.find((p) => p.key === "attrs");
+      const opts = node.hash.pairs.find((p) => p.key === "opts");
+      const otherOpts = node.hash.pairs.find((p) => p.key === "otherOpts");
+
+      return `this.attach(${widgetName}, ${attrs ? argValue(attrs) : attrs}, ${
+        opts ? argValue(opts) : opts
+      }, ${otherOpts ? argValue(otherOpts) : otherOpts})`;
 
       break;
     case "yield":
@@ -279,9 +281,13 @@ class Compiler {
   }
 }
 
-function compile(template) {
-  const preprocessor = Ember.__loader.require("@glimmer/syntax");
-  const compiled = preprocessor.preprocess(template);
+const loader = typeof Ember !== "undefined" ? Ember.__loader.require : require;
+
+function compile(template, glimmer) {
+  if (!glimmer) {
+    glimmer = loader("@glimmer/syntax");
+  }
+  const compiled = glimmer.preprocess(template);
   const compiler = new Compiler(compiled);
 
   let code = compiler.compile();
@@ -305,7 +311,7 @@ function error(path, state, msg) {
   );
 }
 
-exports.WidgetHbsCompiler = function (babel) {
+const WidgetHbsCompiler = function (babel) {
   let t = babel.types;
   return {
     visitor: {
@@ -353,11 +359,16 @@ exports.WidgetHbsCompiler = function (babel) {
           .join("");
 
         try {
-          path.replaceWithSourceString(compile(template));
+          path.replaceWithSourceString(
+            compile(template, WidgetHbsCompiler.glimmer)
+          );
         } catch (e) {
+          console.error("widget hbs error", e.toString());
           return error(path, state, e.toString());
         }
       },
     },
   };
 };
+
+exports.WidgetHbsCompiler = WidgetHbsCompiler;
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index d15ad161e1..fbf1fc1bdb 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -3,9 +3,9 @@
 module JsLocaleHelper
 
   def self.plugin_client_files(locale_str)
-    I18n::Backend::DiscourseI18n.sort_locale_files(
-      Dir["#{Rails.root}/plugins/*/config/locales/client*.#{locale_str}.yml"]
-    )
+    files = Dir["#{Rails.root}/plugins/*/config/locales/client*.#{locale_str}.yml"]
+    files += DiscourseDev.client_locale_files(locale_str) if Rails.env.development?
+    I18n::Backend::DiscourseI18n.sort_locale_files(files)
   end
 
   def self.reloadable_plugins(locale_sym, ctx)
@@ -195,8 +195,7 @@ module JsLocaleHelper
   end
 
   MOMENT_LOCALE_MAPPING ||= {
-    "hy" => "hy-am",
-    "en" => "en-gb"
+    "hy" => "hy-am"
   }
 
   def self.find_moment_locale(locale_chain, timezone_names: false)
@@ -213,7 +212,6 @@ module JsLocaleHelper
       # moment.js uses a different naming scheme for locale files
       locale.tr('_', '-').downcase
     end
-
   end
 
   def self.find_message_format_locale(locale_chain, fallback_to_english:)
diff --git a/lib/method_profiler.rb b/lib/method_profiler.rb
index 3e4c841419..fd6588c6bc 100644
--- a/lib/method_profiler.rb
+++ b/lib/method_profiler.rb
@@ -38,6 +38,50 @@ class MethodProfiler
     klass.class_eval patches
   end
 
+  def self.patch_with_debug_sql(klass, methods, name, no_recurse: false)
+    patches = methods.map do |method_name|
+
+      recurse_protection = ""
+      if no_recurse
+        recurse_protection = <<~RUBY
+          return #{method_name}__mp_unpatched_debug_sql(*args, &blk) if @mp_recurse_protect_#{method_name}
+          @mp_recurse_protect_#{method_name} = true
+        RUBY
+      end
+
+      <<~RUBY
+      unless defined?(#{method_name}__mp_unpatched_debug_sql)
+        alias_method :#{method_name}__mp_unpatched_debug_sql, :#{method_name}
+        def #{method_name}(*args, &blk)
+          #{recurse_protection}
+
+          query = args[0]
+          should_filter = #{@@instrumentation_debug_sql_filter_transactions} &&
+                            (query == "COMMIT" || query == "BEGIN" || query == "ROLLBACK")
+          if !should_filter
+            STDERR.puts "debugsql (sql): " + query
+          end
+
+          begin
+            start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            #{method_name}__mp_unpatched_debug_sql(*args, &blk)
+          ensure
+            duration = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+
+            if !should_filter
+              STDERR.puts "debugsql (sec): " + duration.round(3).to_s
+            end
+
+            #{"@mp_recurse_protect_#{method_name} = false" if no_recurse}
+          end
+        end
+      end
+      RUBY
+    end.join("\n")
+
+    klass.class_eval patches
+  end
+
   def self.transfer
     result = Thread.current[:_method_profiler]
     Thread.current[:_method_profiler] = nil
@@ -64,6 +108,24 @@ class MethodProfiler
     data
   end
 
+  ##
+  # This is almost the same as ensure_discourse_instrumentation! but should not
+  # be used in production. This logs all SQL queries run and their durations
+  # between start and stop.
+  #
+  # filter_transactions - When true, we do not record timings of transaction
+  # related commits (BEGIN, COMMIT, ROLLBACK)
+  def self.output_sql_to_stderr!(filter_transactions: false)
+    Rails.logger.warn("Stop! This instrumentation is not intended for use in production outside of debugging scenarios. Please be sure you know what you are doing when enabling this instrumentation.")
+    @@instrumentation_debug_sql_filter_transactions = filter_transactions
+    @@instrumentation_setup_debug_sql ||= begin
+      MethodProfiler.patch_with_debug_sql(PG::Connection, [
+        :exec, :async_exec, :exec_prepared, :send_query_prepared, :query, :exec_params
+      ], :sql)
+      true
+    end
+  end
+
   def self.ensure_discourse_instrumentation!
     @@instrumentation_setup ||= begin
       MethodProfiler.patch(PG::Connection, [
diff --git a/lib/middleware/anonymous_cache.rb b/lib/middleware/anonymous_cache.rb
index 6fc70fb720..ca869abb97 100644
--- a/lib/middleware/anonymous_cache.rb
+++ b/lib/middleware/anonymous_cache.rb
@@ -163,6 +163,7 @@ module Middleware
       def no_cache_bypass
         request = Rack::Request.new(@env)
         request.cookies['_bypass_cache'].nil? &&
+          (request.path != '/srv/status') &&
           request[Auth::DefaultCurrentUserProvider::API_KEY].nil? &&
           @env[Auth::DefaultCurrentUserProvider::USER_API_KEY].nil?
       end
diff --git a/lib/middleware/enforce_hostname.rb b/lib/middleware/enforce_hostname.rb
index 00e8870d57..c462e5b7bc 100644
--- a/lib/middleware/enforce_hostname.rb
+++ b/lib/middleware/enforce_hostname.rb
@@ -17,6 +17,7 @@ module Middleware
       allowed_hostnames = RailsMultisite::ConnectionManagement.current_db_hostnames
       requested_hostname = env[Rack::HTTP_HOST]
 
+      env[Discourse::REQUESTED_HOSTNAME] = requested_hostname
       env[Rack::HTTP_HOST] = allowed_hostnames.find { |h| h == requested_hostname } || Discourse.current_hostname
 
       @app.call(env)
diff --git a/lib/middleware/omniauth_bypass_middleware.rb b/lib/middleware/omniauth_bypass_middleware.rb
index 4a3273071f..c794b11aab 100644
--- a/lib/middleware/omniauth_bypass_middleware.rb
+++ b/lib/middleware/omniauth_bypass_middleware.rb
@@ -34,6 +34,9 @@ class Middleware::OmniauthBypassMiddleware
 
       # If the user is trying to reconnect to an existing account, store in session
       request.session[:auth_reconnect] = !!request.params["reconnect"]
+
+      # If the client provided an origin, store in session to redirect back
+      request.session[:destination_url] = request.params["origin"]
     end
   end
 
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 84d8da120b..061234561d 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -20,8 +20,7 @@ class Middleware::RequestTracker
   end
 
   def self.unregister_detailed_request_logger(callback)
-    @@detailed_request_loggers.delete callback
-
+    @@detailed_request_loggers.delete(callback)
     if @@detailed_request_loggers.length == 0
       @detailed_request_loggers = nil
     end
@@ -62,7 +61,7 @@ class Middleware::RequestTracker
       elsif data[:has_auth_cookie]
         ApplicationRequest.increment!(:page_view_logged_in)
         ApplicationRequest.increment!(:page_view_logged_in_mobile) if data[:is_mobile]
-      else
+      elsif !SiteSetting.login_required
         ApplicationRequest.increment!(:page_view_anon)
         ApplicationRequest.increment!(:page_view_anon_mobile) if data[:is_mobile]
       end
@@ -78,10 +77,9 @@ class Middleware::RequestTracker
       ApplicationRequest.increment!(:http_4xx)
     elsif status >= 300
       ApplicationRequest.increment!(:http_3xx)
-    elsif status >= 200 && status < 300
+    elsif status >= 200
       ApplicationRequest.increment!(:http_2xx)
     end
-
   end
 
   def self.get_data(env, result, timing)
@@ -120,11 +118,11 @@ class Middleware::RequestTracker
     if cache = headers["X-Discourse-Cached"]
       h[:cache] = cache
     end
+
     h
   end
 
   def log_request_info(env, result, info)
-
     # we got to skip this on error ... its just logging
     data = self.class.get_data(env, result, info) rescue nil
 
@@ -139,7 +137,6 @@ class Middleware::RequestTracker
 
       log_later(data)
     end
-
   end
 
   def self.populate_request_queue_seconds!(env)
@@ -166,15 +163,20 @@ class Middleware::RequestTracker
 
     request = Rack::Request.new(env)
 
-    if rate_limit(request)
-      result = [429, {}, ["Slow down, too many requests from this IP address"]]
-      return result
+    if available_in = rate_limit(request)
+      return [
+        429,
+        { "Retry-After" => available_in.to_s },
+        ["Slow down, too many requests from this IP address"]
+      ]
     end
 
     env["discourse.request_tracker"] = self
+
     MethodProfiler.start
     result = @app.call(env)
     info = MethodProfiler.stop
+
     # possibly transferred?
     if info && (headers = result[1])
       headers["X-Runtime"] = "%0.6f" % info[:total_duration]
@@ -219,7 +221,6 @@ class Middleware::RequestTracker
   end
 
   def rate_limit(request)
-
     if (
       GlobalSetting.max_reqs_per_ip_mode == "block" ||
       GlobalSetting.max_reqs_per_ip_mode == "warn" ||
@@ -263,29 +264,38 @@ class Middleware::RequestTracker
       request.env['DISCOURSE_RATE_LIMITERS'] = [limiter10, limiter60]
       request.env['DISCOURSE_ASSET_RATE_LIMITERS'] = [limiter_assets10]
 
-      warn = GlobalSetting.max_reqs_per_ip_mode == "warn" ||
-        GlobalSetting.max_reqs_per_ip_mode == "warn+block"
+      warn = GlobalSetting.max_reqs_per_ip_mode == "warn" || GlobalSetting.max_reqs_per_ip_mode == "warn+block"
 
       if !limiter_assets10.can_perform?
         if warn
           Discourse.warn("Global asset IP rate limit exceeded for #{ip}: 10 second rate limit", uri: request.env["REQUEST_URI"])
         end
 
-        return !(GlobalSetting.max_reqs_per_ip_mode == "warn")
+        if GlobalSetting.max_reqs_per_ip_mode != "warn"
+          return limiter_assets10.seconds_to_wait(Time.now.to_i)
+        else
+          return false
+        end
       end
 
-      type = 10
       begin
+        type = 10
         limiter10.performed!
+
         type = 60
         limiter60.performed!
+
         false
-      rescue RateLimiter::LimitExceeded
+      rescue RateLimiter::LimitExceeded => e
         if warn
           Discourse.warn("Global IP rate limit exceeded for #{ip}: #{type} second rate limit", uri: request.env["REQUEST_URI"])
-          !(GlobalSetting.max_reqs_per_ip_mode == "warn")
+          if GlobalSetting.max_reqs_per_ip_mode != "warn"
+            e.available_in
+          else
+            false
+          end
         else
-          true
+          e.available_in
         end
       end
     end
diff --git a/lib/migration/base_dropper.rb b/lib/migration/base_dropper.rb
index b88a5ba357..9aaf77e138 100644
--- a/lib/migration/base_dropper.rb
+++ b/lib/migration/base_dropper.rb
@@ -61,7 +61,7 @@ module Migration
 
     def self.existing_discourse_function_names
       DB.query_single(<<~SQL)
-        SELECT routine_name
+        SELECT routine_name::text
         FROM information_schema.routines
         WHERE routine_type = 'FUNCTION' AND specific_schema = '#{FUNCTION_SCHEMA_NAME}'
       SQL
diff --git a/lib/mini_sql_multisite_connection.rb b/lib/mini_sql_multisite_connection.rb
index 202cf87b4e..a4feb1a870 100644
--- a/lib/mini_sql_multisite_connection.rb
+++ b/lib/mini_sql_multisite_connection.rb
@@ -32,7 +32,12 @@ class MiniSqlMultisiteConnection < MiniSql::Postgres::Connection
     end
 
     def committed!(*)
-      @callback.call
+      if DB.transaction_open?
+        # Nested transaction. Pass the callback to the parent
+        ActiveRecord::Base.connection.add_transaction_record(self)
+      else
+        @callback.call
+      end
     end
 
     def before_committed!(*); end
@@ -42,16 +47,25 @@ class MiniSqlMultisiteConnection < MiniSql::Postgres::Connection
     end
   end
 
+  def transaction_open?
+    ActiveRecord::Base.connection.transaction_open?
+  end
+
+  if Rails.env.test?
+    def test_transaction=(transaction)
+      @test_transaction = transaction
+    end
+
+    def transaction_open?
+      ActiveRecord::Base.connection.current_transaction != @test_transaction
+    end
+  end
+
   # Allows running arbitrary code after the current transaction has been committed.
   # 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?
+    return blk.call if !transaction_open?
 
     ActiveRecord::Base.connection.add_transaction_record(
       AfterCommitWrapper.new(&blk)
@@ -68,6 +82,20 @@ class MiniSqlMultisiteConnection < MiniSql::Postgres::Connection
     ActiveRecord::Base.connection.raw_connection
   end
 
+  # make for a multisite friendly prepared statement cache
+  def prepared(condition = true)
+    if condition
+      conn = raw_connection.instance_variable_get(:@mini_sql_prepared_connection)
+      if !conn
+        conn = MiniSql::Postgres::PreparedConnection.new(self)
+        raw_connection.instance_variable_set(:@mini_sql_prepared_connection, conn)
+      end
+      conn
+    else
+      self
+    end
+  end
+
   def build(sql)
     CustomBuilder.new(self, sql)
   end
diff --git a/lib/onebox/discourse_onebox_sanitize_config.rb b/lib/onebox/discourse_onebox_sanitize_config.rb
index 93902fa347..b9ab7ae64c 100644
--- a/lib/onebox/discourse_onebox_sanitize_config.rb
+++ b/lib/onebox/discourse_onebox_sanitize_config.rb
@@ -5,9 +5,14 @@ module Onebox
     module Config
       DISCOURSE_ONEBOX ||=
         Sanitize::Config.freeze_config(
-          Sanitize::Config.merge(Sanitize::Config::ONEBOX,
-                                 attributes: Sanitize::Config.merge(Sanitize::Config::ONEBOX[:attributes],
-                                                                    'aside' => [:data])))
+          Sanitize::Config.merge(
+            Sanitize::Config::ONEBOX,
+            attributes: Sanitize::Config.merge(
+              Sanitize::Config::ONEBOX[:attributes],
+              'aside' => [:data]
+            )
+          )
+        )
     end
   end
 end
diff --git a/lib/onebox/engine/flash_video_onebox.rb b/lib/onebox/engine/flash_video_onebox.rb
deleted file mode 100644
index f3de5eda36..0000000000
--- a/lib/onebox/engine/flash_video_onebox.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Onebox
-  module Engine
-    class FlashVideoOnebox
-      include Engine
-
-      matches_regexp /^https?:\/\/.*\.(swf|flv)$/
-
-      def to_html
-        if SiteSetting.enable_flash_video_onebox
-          "<object width='100%' height='100%'><param name='#{@url}' value='#{@url}'><embed src='#{@url}' width='100%' height='100%'></embed></object>"
-        else
-          "<a href='#{@url}'>#{@url}</a>"
-        end
-      end
-    end
-  end
-end
diff --git a/lib/onebox/templates/discourse_category_onebox.mustache b/lib/onebox/templates/discourse_category_onebox.mustache
index 68f41074ad..fb8ddd3300 100644
--- a/lib/onebox/templates/discourse_category_onebox.mustache
+++ b/lib/onebox/templates/discourse_category_onebox.mustache
@@ -1,10 +1,13 @@
-<aside class="onebox" style="border-left: 5px solid #{{color}}">
-  <article class="onebox-body category-onebox">
+<aside class="onebox category-onebox" style="box-shadow: -5px 0px #{{color}};">
+  <article class="onebox-body category-onebox-body">
     {{#logo_url}}
       <img src="{{logo_url}}" class="thumbnail" />
     {{/logo_url}}
     <h3>
       <a class="badge-wrapper bullet" href="{{url}}">
+        {{#color}}
+          <span class="badge-category-bg" style="background-color: #{{{color}}}"></span>
+        {{/color}}
         <span class="clear-badge"><span>{{{name}}}</span></span>
       </a>
     </h3>
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index a9bdabdddf..239f6b2c7f 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -23,11 +23,21 @@ module Oneboxer
   end
 
   def self.ignore_redirects
-    @ignore_redirects ||= ['http://www.dropbox.com', 'http://store.steampowered.com', 'http://vimeo.com', Discourse.base_url]
+    @ignore_redirects ||= ['http://www.dropbox.com', 'http://store.steampowered.com', 'http://vimeo.com', 'https://www.youtube.com', Discourse.base_url]
+  end
+
+  def self.amazon_domains
+    amazon_suffixes = %w(com com.br ca cn fr de in it co.jp com.mx nl pl sa sg es se com.tr ae co.uk)
+    amazon_suffixes.collect { |suffix| "https://www.amazon.#{suffix}" }
   end
 
   def self.force_get_hosts
-    @force_get_hosts ||= ['http://us.battle.net', 'https://news.yahoo.com/']
+    hosts = []
+    hosts += SiteSetting.force_get_hosts.split('|').collect { |domain| "https://#{domain}" }
+    hosts += SiteSetting.cache_onebox_response_body_domains.split('|').collect { |domain| "https://www.#{domain}" }
+    hosts += amazon_domains
+
+    hosts.uniq
   end
 
   def self.force_custom_user_agent_hosts
@@ -75,11 +85,35 @@ module Oneboxer
     Discourse.cache.delete(onebox_failed_cache_key(url))
   end
 
-  # 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::HTML5::fragment(doc) if doc.is_a?(String)
+  def self.cache_response_body?(uri)
+    uri = URI.parse(uri) if uri.is_a?(String)
 
+    if SiteSetting.cache_onebox_response_body?
+      SiteSetting.cache_onebox_response_body_domains.split("|").any? { |domain| uri.hostname.ends_with?(domain) }
+    end
+  end
+
+  def self.cache_response_body(uri, response)
+    key = redis_cached_response_body_key(uri)
+    Discourse.redis.without_namespace.setex(key, 1.minutes.to_i, response)
+  end
+
+  def self.cached_response_body_exists?(uri)
+    key = redis_cached_response_body_key(uri)
+    Discourse.redis.without_namespace.exists(key).to_i > 0
+  end
+
+  def self.fetch_cached_response_body(uri)
+    key = redis_cached_response_body_key(uri)
+    Discourse.redis.without_namespace.get(key)
+  end
+
+  def self.redis_cached_response_body_key(uri)
+    "CACHED_RESPONSE_#{uri}"
+  end
+
+  # Parse URLs out of HTML, returning the document when finished.
+  def self.each_onebox_link(doc, extra_paths: [])
     onebox_links = doc.css("a.#{ONEBOX_CSS_CLASS}", *extra_paths)
     if onebox_links.present?
       onebox_links.each do |link|
@@ -94,37 +128,62 @@ module Oneboxer
 
   def self.apply(string_or_doc, extra_paths: nil)
     doc = string_or_doc
-    doc = Nokogiri::HTML5::fragment(doc) if doc.is_a?(String)
+    doc = Loofah.fragment(doc) if doc.is_a?(String)
     changed = false
 
     each_onebox_link(doc, extra_paths: extra_paths) do |url, element|
       onebox, _ = yield(url, element)
+      next if onebox.blank?
 
-      if onebox
-        parsed_onebox = Nokogiri::HTML5::fragment(onebox)
-        next unless parsed_onebox.children.count > 0
+      parsed_onebox = Loofah.fragment(onebox)
+      next if parsed_onebox.children.blank?
 
-        if element&.parent&.node_name&.downcase == "p" &&
-           element.parent.children.count == 1 &&
-           HTML5_BLOCK_ELEMENTS.include?(parsed_onebox.children[0].node_name.downcase)
-          element = element.parent
+      changed = true
+
+      parent = element.parent
+      if parent&.node_name&.downcase == "p" &&
+        parsed_onebox.children.any? { |child| HTML5_BLOCK_ELEMENTS.include?(child.node_name.downcase) }
+
+        siblings = parent.children
+        element_idx = siblings.find_index(element)
+        before_idx = first_significant_element_index(siblings, element_idx - 1, -1)
+        after_idx = first_significant_element_index(siblings, element_idx + 1, +1)
+
+        if before_idx < 0 && after_idx >= siblings.size
+          parent.replace parsed_onebox
+        elsif before_idx < 0
+          parent.children = siblings[after_idx..siblings.size]
+          parent.add_previous_sibling(parsed_onebox)
+        elsif after_idx >= siblings.size
+          parent.children = siblings[0..before_idx]
+          parent.add_next_sibling(parsed_onebox)
+        else
+          parent_rest = parent.dup
+
+          parent.children = siblings[0..before_idx]
+          parent_rest.children = siblings[after_idx..siblings.size]
+
+          parent.add_next_sibling(parent_rest)
+          parent.add_next_sibling(parsed_onebox)
         end
-
-        changed = true
-        element.swap parsed_onebox.to_html
-      end
-    end
-
-    # strip empty <p> elements
-    doc.css("p").each do |p|
-      if p.children.empty? && doc.children.count > 1
-        p.remove
+      else
+        element.replace parsed_onebox
       end
     end
 
     Result.new(doc, changed)
   end
 
+  def self.first_significant_element_index(elements, index, step)
+    while index >= 0 && index < elements.size &&
+      (elements[index].node_name.downcase == "br" ||
+        (elements[index].node_name.downcase == "text" && elements[index].to_html.strip.blank?))
+      index = index + step
+    end
+
+    index
+  end
+
   def self.is_previewing?(user_id)
     Discourse.redis.get(preview_key(user_id)) == "1"
   end
@@ -170,7 +229,7 @@ module Oneboxer
   end
 
   def self.onebox_raw(url, opts = {})
-    url = URI(url).to_s
+    url = UrlHelper.escape_uri(url).to_s
     local_onebox(url, opts) || external_onebox(url)
   rescue => e
     # no point warning here, just cause we have an issue oneboxing a url
@@ -191,23 +250,30 @@ module Oneboxer
       when "list"    then local_category_html(url, route)
       end
 
-    html = html.presence || "<a href='#{url}'>#{url}</a>"
+    html = html.presence || "<a href='#{URI(url).to_s}'>#{URI(url).to_s}</a>"
     { onebox: html, preview: html }
   end
 
   def self.local_upload_html(url)
+    additional_controls = \
+      if SiteSetting.disable_onebox_media_download_controls
+        "controlslist='nodownload'"
+      else
+        ""
+      end
+
     case File.extname(URI(url).path || "")
     when VIDEO_REGEX
       <<~HTML
         <div class="onebox video-onebox">
-          <video width="100%" height="100%" controls="">
+          <video #{additional_controls} width="100%" height="100%" controls="">
             <source src='#{url}'>
             <a href='#{url}'>#{url}</a>
           </video>
         </div>
       HTML
     when AUDIO_REGEX
-      "<audio controls><source src='#{url}'><a href='#{url}'>#{url}</a></audio>"
+      "<audio #{additional_controls} controls><source src='#{url}'><a href='#{url}'>#{url}</a></audio>"
     end
   end
 
@@ -329,20 +395,41 @@ module Oneboxer
     allowed += SiteSetting.allowed_iframes.split("|")
   end
 
-  def self.external_onebox(url)
+  def self.external_onebox(url, available_strategies = nil)
     Discourse.cache.fetch(onebox_cache_key(url), expires_in: 1.day) do
-      fd = FinalDestination.new(url,
-                                ignore_redirects: ignore_redirects,
-                                ignore_hostnames: blocked_domains,
-                                force_get_hosts: force_get_hosts,
-                                force_custom_user_agent_hosts: force_custom_user_agent_hosts,
-                                preserve_fragment_url_hosts: preserve_fragment_url_hosts)
+
+      uri = URI(url)
+      available_strategies ||= Oneboxer.ordered_strategies(uri.hostname)
+      strategy = available_strategies.shift
+
+      fd_options = {
+        ignore_redirects: ignore_redirects,
+        ignore_hostnames: blocked_domains,
+        force_get_hosts: force_get_hosts,
+        force_custom_user_agent_hosts: force_custom_user_agent_hosts,
+        preserve_fragment_url_hosts: preserve_fragment_url_hosts
+      }
+
+      if strategy && Oneboxer.strategies[strategy][:force_get_host]
+        fd_options[:force_get_hosts] = ["https://#{uri.hostname}"]
+      end
+      if strategy && Oneboxer.strategies[strategy][:force_custom_user_agent_host]
+        fd_options[:force_custom_user_agent_hosts] = ["https://#{uri.hostname}"]
+      end
+
+      user_agent_override = SiteSetting.cache_onebox_user_agent if Oneboxer.cache_response_body?(url) && SiteSetting.cache_onebox_user_agent.present?
+      fd_options[:default_user_agent] = user_agent_override if user_agent_override
+
+      fd = FinalDestination.new(url, fd_options)
       uri = fd.resolve
 
       if fd.status != :resolved
         args = { link: url }
         if fd.status == :invalid_address
           args[:error_message] = I18n.t("errors.onebox.invalid_address", hostname: fd.hostname)
+        elsif (fd.status_code || uri.nil?) && available_strategies.present?
+          # Try a different oneboxing strategy, if we have any options left:
+          return external_onebox(url, available_strategies)
         elsif fd.status_code
           args[:error_message] = I18n.t("errors.onebox.error_response", status_code: fd.status_code)
         end
@@ -352,42 +439,51 @@ module Oneboxer
         return error_box
       end
 
-      return blank_onebox if uri.blank? || blocked_domains.map { |hostname| uri.hostname.match?(hostname) }.any?
+      return blank_onebox if uri.blank? || blocked_domains.any? { |hostname| uri.hostname.match?(hostname) }
 
-      options = {
+      onebox_options = {
         max_width: 695,
         sanitize_config: Onebox::DiscourseOneboxSanitizeConfig::Config::DISCOURSE_ONEBOX,
         allowed_iframe_origins: allowed_iframe_origins,
         hostname: GlobalSetting.hostname,
         facebook_app_access_token: SiteSetting.facebook_app_access_token,
+        disable_media_download_controls: SiteSetting.disable_onebox_media_download_controls,
+        body_cacher: self
       }
 
-      options[:cookie] = fd.cookie if fd.cookie
+      onebox_options[:cookie] = fd.cookie if fd.cookie
+      onebox_options[:user_agent] = user_agent_override if user_agent_override
 
-      r = Onebox.preview(uri.to_s, options)
+      r = Onebox.preview(uri.to_s, onebox_options)
       result = { onebox: r.to_s, preview: r&.placeholder_html.to_s }
 
       # NOTE: Call r.errors after calling placeholder_html
       if r.errors.any?
-        missing_attributes = r.errors.keys.map(&:to_s).sort.join(I18n.t("word_connector.comma"))
-        error_message = I18n.t("errors.onebox.missing_data", missing_attributes: missing_attributes, count: r.errors.keys.size)
-        args = r.data.merge(error_message: error_message)
+        error_keys = r.errors.keys
+        skip_if_only_error = [:image]
+        unless error_keys.length == 1 && skip_if_only_error.include?(error_keys.first)
+          missing_attributes = error_keys.map(&:to_s).sort.join(I18n.t("word_connector.comma"))
+          error_message = I18n.t("errors.onebox.missing_data", missing_attributes: missing_attributes, count: error_keys.size)
+          args = r.data.merge(error_message: error_message)
 
-        if result[:preview].blank?
-          result[:preview] = preview_error_onebox(args)
-        else
-          doc = Nokogiri::HTML5::fragment(result[:preview])
-          aside = doc.at('aside')
+          if result[:preview].blank?
+            result[:preview] = preview_error_onebox(args)
+          else
+            doc = Nokogiri::HTML5::fragment(result[:preview])
+            aside = doc.at('aside')
 
-          if aside
-            # Add an error message to the preview that was returned
-            error_fragment = preview_error_onebox_fragment(args)
-            aside.add_child(error_fragment)
-            result[:preview] = doc.to_html
+            if aside
+              # Add an error message to the preview that was returned
+              error_fragment = preview_error_onebox_fragment(args)
+              aside.add_child(error_fragment)
+              result[:preview] = doc.to_html
+            end
           end
         end
       end
 
+      Oneboxer.cache_preferred_strategy(uri.hostname, strategy)
+
       result
     end
   end
@@ -412,4 +508,44 @@ module Oneboxer
     end
   end
 
+  def self.ordered_strategies(hostname)
+    all = strategies.keys
+    preferred = Oneboxer.preferred_strategy(hostname)
+
+    all.insert(0, all.delete(preferred)) if all.include?(preferred)
+
+    all
+  end
+
+  def self.strategies
+    {
+      default: {}, # don't override anything by default
+      force_get_and_ua: {
+        force_get_host: true,
+        force_custom_user_agent_host: true,
+      },
+    }
+  end
+
+  def self.cache_preferred_strategy(hostname, strategy)
+    return if strategy == :default
+
+    key = redis_oneboxer_strategy_key(hostname)
+    Discourse.redis.without_namespace.setex(key, 2.weeks.to_i, strategy.to_s)
+  end
+
+  def self.clear_preferred_strategy!(hostname)
+    key = redis_oneboxer_strategy_key(hostname)
+    Discourse.redis.without_namespace.del(key)
+  end
+
+  def self.preferred_strategy(hostname)
+    key = redis_oneboxer_strategy_key(hostname)
+    Discourse.redis.without_namespace.get(key)&.to_sym
+  end
+
+  def self.redis_oneboxer_strategy_key(hostname)
+    "ONEBOXER_STRATEGY_#{hostname}"
+  end
+
 end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 3471c38505..380a63e987 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -94,6 +94,8 @@ class Plugin::Instance
         metadata = Plugin::Metadata.parse(source)
         plugins << self.new(metadata, path)
       end
+
+      plugins << DiscourseDev.auth_plugin if Rails.env.development? && DiscourseDev.auth_plugin_enabled?
     }
   end
 
@@ -206,6 +208,14 @@ class Plugin::Instance
     Search.advanced_filter(trigger, &block)
   end
 
+  # Allows to define TopicView posts filters. Example usage:
+  #   TopicView.advanced_filter do |posts, opts|
+  #     posts.where(wiki: true)
+  #   end
+  def register_topic_view_posts_filter(trigger, &block)
+    TopicView.add_custom_filter(trigger, &block)
+  end
+
   # Allow to eager load additional tables in Search. Useful to avoid N+1 performance problems.
   # Example usage:
   #   register_search_topic_eager_load do |opts|
@@ -337,6 +347,13 @@ class Plugin::Instance
     end
   end
 
+  # Add a permitted_update_param to Post, respecting if the plugin is enabled
+  def add_permitted_post_update_param(attribute, &block)
+    reloadable_patch do |plugin|
+      ::Post.plugin_permitted_update_params[attribute] = { plugin: plugin, handler: block }
+    end
+  end
+
   # Add validation method but check that the plugin is enabled
   def validate(klass, name, &block)
     klass = klass.to_s.classify.constantize
@@ -588,11 +605,13 @@ class Plugin::Instance
 
       # Automatically include all ES6 JS and hbs files
       root_path = "#{root_dir_name}/assets/javascripts"
+      DiscoursePluginRegistry.register_glob(root_path, 'js') if transpile_js
       DiscoursePluginRegistry.register_glob(root_path, 'js.es6')
       DiscoursePluginRegistry.register_glob(root_path, 'hbs')
       DiscoursePluginRegistry.register_glob(root_path, 'hbr')
 
       admin_path = "#{root_dir_name}/admin/assets/javascripts"
+      DiscoursePluginRegistry.register_glob(admin_path, 'js', admin: true) if transpile_js
       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)
@@ -746,9 +765,9 @@ class Plugin::Instance
         f_str = f.to_s
         if File.directory?(f)
           yield [f, true]
-        elsif f_str.ends_with?(".js.es6") || f_str.ends_with?(".hbs") || f_str.ends_with?(".hbr")
+        elsif f_str.end_with?(".js.es6") || f_str.end_with?(".hbs") || f_str.end_with?(".hbr")
           yield [f, false]
-        elsif transpile_js && f_str.ends_with?(".js")
+        elsif transpile_js && f_str.end_with?(".js")
           yield [f, false]
         end
       end
@@ -789,6 +808,13 @@ class Plugin::Instance
     end
   end
 
+  # Register a new API key scope.
+  #
+  # Example:
+  # add_api_key_scope(:groups, { delete: { actions: %w[groups#add_members], params: %i[id] } })
+  #
+  # This scope lets you add members to a group. Additionally, you can specify which group ids are allowed.
+  # The delete action is added to the groups resource.
   def add_api_key_scope(resource, action)
     DiscoursePluginRegistry.register_api_key_scope_mapping({ resource => action }, self)
   end
@@ -859,6 +885,22 @@ class Plugin::Instance
       ), self)
   end
 
+  # Register a new demon process to be forked by the Unicorn master.
+  # The demon_class should inherit from Demon::Base.
+  # With great power comes great responsibility - this method should
+  # be used with extreme caution. See `config/unicorn.conf.rb`.
+  def register_demon_process(demon_class)
+    raise "Not a demon class" if !demon_class.ancestors.include?(Demon::Base)
+    DiscoursePluginRegistry.demon_processes << demon_class
+  end
+
+  def add_permitted_reviewable_param(type, param)
+    DiscoursePluginRegistry.register_reviewable_param({
+      type: type,
+      param: param
+      }, self)
+  end
+
   protected
 
   def self.js_path
diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index 6f0cb97b53..d55d65edbf 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -29,13 +29,13 @@ class Plugin::Metadata
     "discourse-crowd",
     "discourse-data-explorer",
     "discourse-details",
+    "discourse-docs",
     "discourse-encrypt",
     "discourse-footnote",
     "discourse-github",
     "discourse-gradle-issue",
     "discourse-graphviz",
     "discourse-invite-tokens",
-    "discourse-knowledge-explorer",
     "discourse-local-dates",
     "discourse-logster-rate-limit-checker",
     "discourse-logster-transporter",
@@ -82,7 +82,7 @@ class Plugin::Metadata
     "discourse-staff-alias",
   ])
 
-  FIELDS ||= [:name, :about, :version, :authors, :url, :required_version, :transpile_js]
+  FIELDS ||= [:name, :about, :version, :authors, :contact_emails, :url, :required_version, :transpile_js]
   attr_accessor(*FIELDS)
 
   def self.parse(text)
diff --git a/lib/plugin_gem.rb b/lib/plugin_gem.rb
index 1ca1fd9176..855d1aca2c 100644
--- a/lib/plugin_gem.rb
+++ b/lib/plugin_gem.rb
@@ -5,21 +5,24 @@ module PluginGem
     opts ||= {}
 
     gems_path = File.dirname(path) + "/gems/#{RUBY_VERSION}"
+
     spec_path = gems_path + "/specifications"
-    spec_file = spec_path + "/#{name}-#{version}"
+
+    spec_file  = spec_path + "/#{name}-#{version}"
     spec_file += "-#{opts[:platform]}" if opts[:platform]
     spec_file += ".gemspec"
+
     unless File.exists? spec_file
-      command = "gem install #{name} -v #{version} -i #{gems_path} --no-document --ignore-dependencies --no-user-install"
-      if opts[:source]
-        command << " --source #{opts[:source]}"
-      end
+      command  = "gem install #{name} -v #{version} -i #{gems_path} --no-document --ignore-dependencies --no-user-install"
+      command += " --source #{opts[:source]}" if opts[:source]
       puts command
       puts `#{command}`
     end
+
     if File.exists? spec_file
-      spec = Gem::Specification.load spec_file
-      spec.activate
+      Gem.path << gems_path
+      Gem::Specification.load(spec_file).activate
+
       unless opts[:require] == false
         require opts[:require_name] ? opts[:require_name] : name
       end
diff --git a/lib/post_action_creator.rb b/lib/post_action_creator.rb
index f64f860f8c..a07c0e7b7d 100644
--- a/lib/post_action_creator.rb
+++ b/lib/post_action_creator.rb
@@ -39,6 +39,7 @@ class PostActionCreator
     take_action: false,
     flag_topic: false,
     created_at: nil,
+    queue_for_review: false,
     reason: nil
   )
     @created_by = created_by
@@ -54,7 +55,13 @@ class PostActionCreator
     @message = message
     @flag_topic = flag_topic
     @meta_post = nil
+
     @reason = reason
+    @queue_for_review = queue_for_review
+
+    if reason.nil? && @queue_for_review
+      @reason = 'queued_by_staff'
+    end
   end
 
   def post_can_act?
@@ -71,7 +78,7 @@ class PostActionCreator
   def perform
     result = CreateResult.new
 
-    unless post_can_act?
+    if !post_can_act? || (@queue_for_review && !guardian.is_staff?)
       result.forbidden = true
       result.add_error(I18n.t("invalid_access"))
       return result
@@ -186,7 +193,20 @@ private
   def auto_hide_if_needed
     return if @post.hidden?
     return if !@created_by.staff? && @post.user&.staff?
-    return unless PostActionType.auto_action_flag_types.include?(@post_action_name)
+
+    not_auto_action_flag_type = !PostActionType.auto_action_flag_types.include?(@post_action_name)
+    return if not_auto_action_flag_type && !@queue_for_review
+
+    if @queue_for_review
+      @post.topic.update_status('visible', false, @created_by) if @post.is_first_post?
+
+      @post.hide!(
+        @post_action_type_id,
+        Post.hidden_reasons[:flag_threshold_reached],
+        custom_message: :queued_by_staff
+      )
+      return
+    end
 
     if trusted_spam_flagger?
       @post.hide!(@post_action_type_id, Post.hidden_reasons[:flagged_by_tl3_user])
@@ -245,8 +265,13 @@ private
       end
     end
 
-    if post_action && PostActionType.notify_flag_type_ids.include?(@post_action_type_id)
-      DiscourseEvent.trigger(:flag_created, post_action)
+    if post_action
+      case @post_action_type_id
+      when *PostActionType.notify_flag_type_ids
+        DiscourseEvent.trigger(:flag_created, post_action)
+      when PostActionType.types[:like]
+        DiscourseEvent.trigger(:like_created, post_action)
+      end
     end
 
     GivenDailyLike.increment_for(@created_by.id) if @post_action_type_id == PostActionType.types[:like]
@@ -312,6 +337,7 @@ private
         targets_topic: @targets_topic
       }
     )
+
     result.reviewable_score = result.reviewable.add_score(
       @created_by,
       @post_action_type_id,
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index b0f066ac2b..bb28f3cdd2 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -36,6 +36,7 @@ class PostCreator
   #   hidden_reason_id        - Reason for hiding the post (optional)
   #   skip_validations        - Do not validate any of the content in the post
   #   draft_key               - the key of the draft we are creating (will be deleted on success)
+  #   silent                  - Do not update topic stats and fields like last_post_user_id
   #
   #   When replying to a topic:
   #     topic_id              - topic we're replying to
@@ -238,7 +239,13 @@ class PostCreator
       auto_close
     end
 
-    handle_spam if !opts[:import_mode] && (@post || @spam)
+    if !opts[:import_mode]
+      handle_spam if (@spam || @post)
+
+      if !@spam && @post && errors.blank?
+        ReviewablePost.queue_for_review_if_possible(@post, @user)
+      end
+    end
 
     @post
   end
@@ -418,8 +425,7 @@ class PostCreator
   end
 
   def update_uploads_secure_status
-    return if !SiteSetting.secure_media?
-    @post.update_uploads_secure_status
+    @post.update_uploads_secure_status(source: "post creator") if SiteSetting.secure_media?
   end
 
   def delete_owned_bookmarks
@@ -506,13 +512,12 @@ class PostCreator
   def update_topic_stats
     attrs = { updated_at: Time.now }
 
-    if @post.post_type != Post.types[:whisper]
+    if @post.post_type != Post.types[:whisper] && !@opts[:silent]
       attrs[:last_posted_at] = @post.created_at
       attrs[:last_post_user_id] = @post.user_id
       attrs[:word_count] = (@topic.word_count || 0) + @post.word_count
       attrs[:excerpt] = @post.excerpt_for_topic if new_topic?
       attrs[:bumped_at] = @post.created_at unless @post.no_bump
-      @topic.update_columns(attrs)
     end
 
     @topic.update_columns(attrs)
@@ -528,12 +533,12 @@ class PostCreator
 
       if topic_timer &&
          topic_timer.based_on_last_post &&
-         topic_timer.duration.to_i > 0
+         topic_timer.duration_minutes.to_i > 0
 
         @topic.set_or_create_timer(TopicTimer.types[:close],
           nil,
           based_on_last_post: topic_timer.based_on_last_post,
-          duration: topic_timer.duration
+          duration_minutes: topic_timer.duration_minutes
         )
       end
     end
diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb
index c85fcbca2f..21d7973986 100644
--- a/lib/post_destroyer.rb
+++ b/lib/post_destroyer.rb
@@ -151,6 +151,7 @@ class PostDestroyer
         Topic.reset_highest(@post.topic_id)
       end
       trash_public_post_actions
+      trash_revisions
       trash_user_actions
       remove_associated_replies
       remove_associated_notifications
@@ -165,6 +166,7 @@ class PostDestroyer
 
       if @post.topic && @post.is_first_post?
         permanent? ? @post.topic.destroy! : @post.topic.trash!(@user)
+        PublishedPage.unpublish!(@user, @post.topic) if @post.topic.published_page
       end
       update_associated_category_latest_topic
       update_user_counts
@@ -186,7 +188,7 @@ class PostDestroyer
   end
 
   def permanent?
-    @opts[:permanent] && @user == @post.user && @post.topic.private_message?
+    @opts[:force_destroy] || (@opts[:permanent] && @user == @post.user && @post.topic.private_message?)
   end
 
   # When a user 'deletes' their own post. We just change the text.
@@ -247,9 +249,10 @@ class PostDestroyer
   end
 
   def make_previous_post_the_last_one
-    last_post = Post
+    last_post = Post.where("topic_id = ? and id <> ?", @post.topic_id, @post.id)
       .select(:created_at, :user_id, :post_number)
       .where("topic_id = ? and id <> ?", @post.topic_id, @post.id)
+      .where.not(user_id: nil)
       .order('created_at desc')
       .limit(1)
       .first
@@ -289,6 +292,11 @@ class PostDestroyer
     end
   end
 
+  def trash_revisions
+    return unless permanent?
+    @post.revisions.each(&:destroy!)
+  end
+
   def agree(reviewable)
     notify_deletion(reviewable)
     result = reviewable.perform(@user, :agree_and_keep, post_was_deleted: true)
diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb
index afdd3cd1c9..1fbbe0183a 100644
--- a/lib/post_jobs_enqueuer.rb
+++ b/lib/post_jobs_enqueuer.rb
@@ -57,11 +57,7 @@ class PostJobsEnqueuer
   end
 
   def after_post_create
-    if @post.post_number > 1
-      TopicTrackingState.publish_muted(@post.topic)
-      TopicTrackingState.publish_unread(@post)
-    end
-    TopicTrackingState.publish_latest(@topic, @post.whisper?)
+    Jobs.enqueue(:post_update_topic_tracking_state, post_id: @post.id)
 
     Jobs.enqueue_in(SiteSetting.email_time_window_mins.minutes,
       :notify_mailing_list_subscribers,
diff --git a/lib/post_merger.rb b/lib/post_merger.rb
index e80a2ac8c0..81356f3a50 100644
--- a/lib/post_merger.rb
+++ b/lib/post_merger.rb
@@ -9,12 +9,13 @@ class PostMerger
   end
 
   def merge
-    return unless ensure_at_least_two_posts
+    return if @posts.count < 2
+
     ensure_same_topic!
     ensure_same_user!
 
     guardian = Guardian.new(@user)
-    ensure_staff_user!(guardian)
+    ensure_can_merge!(guardian)
 
     posts = @posts.sort_by do |post|
       guardian.ensure_can_delete!(post)
@@ -24,37 +25,40 @@ class PostMerger
     post_content = posts.map(&:raw)
     post = posts.pop
 
+    merged_post_raw = post_content.join("\n\n")
     changes = {
-      raw: post_content.join("\n\n"),
+      raw: merged_post_raw,
       edit_reason: I18n.t("merge_posts.edit_reason", count: posts.length, username: @user.username)
     }
 
-    revisor = PostRevisor.new(post, post.topic)
-
-    revisor.revise!(@user, changes) do
+    ensure_max_post_length!(merged_post_raw)
+    PostRevisor.new(post, post.topic).revise!(@user, changes) do
       posts.each { |p| PostDestroyer.new(@user, p).destroy }
     end
   end
 
   private
 
-  def ensure_at_least_two_posts
-    @posts.count >= 2
-  end
-
   def ensure_same_topic!
-    unless @posts.map(&:topic_id).uniq.length == 1
+    if @posts.map(&:topic_id).uniq.size != 1
       raise CannotMergeError.new(I18n.t("merge_posts.errors.different_topics"))
     end
   end
 
   def ensure_same_user!
-    unless @posts.map(&:user_id).uniq.length == 1
+    if @posts.map(&:user_id).uniq.size != 1
       raise CannotMergeError.new(I18n.t("merge_posts.errors.different_users"))
     end
   end
 
-  def ensure_staff_user!(guardian)
-    raise Discourse::InvalidAccess unless guardian.is_staff?
+  def ensure_can_merge!(guardian)
+    raise Discourse::InvalidAccess unless guardian.can_moderate_topic?(@posts[0].topic)
+  end
+
+  def ensure_max_post_length!(raw)
+    value = StrippedLengthValidator.get_sanitized_value(raw)
+    if value.size > SiteSetting.max_post_length
+      raise CannotMergeError.new(I18n.t("merge_posts.errors.max_post_length"))
+    end
   end
 end
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index fc521f9e84..26c13b9219 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -75,11 +75,17 @@ class PostRevisor
     end
   end
 
-  track_topic_field(:category_id) do |tc, category_id|
+  track_topic_field(:category_id) do |tc, category_id, fields|
     if category_id == 0 && tc.topic.private_message?
       tc.record_change('category_id', tc.topic.category_id, nil)
       tc.topic.category_id = nil
     elsif category_id == 0 || tc.guardian.can_move_topic_to_category?(category_id)
+      tags = fields[:tags] || tc.topic.tags.map(&:name)
+      if category_id != 0 && !DiscourseTagging.validate_min_required_tags_for_category(tc.guardian, tc.topic, Category.find(category_id), tags)
+        tc.check_result(false)
+        next
+      end
+
       tc.record_change('category_id', tc.topic.category_id, category_id)
       tc.check_result(tc.topic.change_category_to_id(category_id))
     end
@@ -98,7 +104,7 @@ class PostRevisor
         DB.after_commit do
           post = tc.topic.ordered_posts.first
           notified_user_ids = [post.user_id, post.last_editor_id].uniq
-          Jobs.enqueue(:notify_tag_change, post_id: post.id, notified_user_ids: notified_user_ids)
+          Jobs.enqueue(:notify_tag_change, post_id: post.id, notified_user_ids: notified_user_ids, diff_tags: ((tags - prev_tags) | (prev_tags - tags)))
         end
       end
     end
@@ -137,6 +143,12 @@ class PostRevisor
     # previous reasons are lost
     @fields.delete(:edit_reason) if @fields[:edit_reason].blank?
 
+    Post.plugin_permitted_update_params.each do |field, val|
+      if @fields.key?(field) && val[:plugin].enabled?
+        val[:handler].call(@post, @fields[field])
+      end
+    end
+
     return false unless should_revise?
 
     @post.acting_user = @editor
@@ -223,6 +235,10 @@ class PostRevisor
 
     TopicLink.extract_from(@post)
 
+    if should_create_new_version?
+      ReviewablePost.queue_for_review_if_possible(@post, @editor)
+    end
+
     successfully_saved_post_and_topic
   end
 
@@ -454,7 +470,7 @@ class PostRevisor
     Topic.transaction do
       PostRevisor.tracked_topic_fields.each do |f, cb|
         if !@topic_changes.errored? && @fields.has_key?(f)
-          cb.call(@topic_changes, @fields[f])
+          cb.call(@topic_changes, @fields[f], @fields)
         end
       end
 
@@ -524,6 +540,10 @@ class PostRevisor
     @post.previous_changes.slice(*POST_TRACKED_FIELDS)
   end
 
+  def topic_diff
+    @topic_changes.diff
+  end
+
   def perform_edit
     return if bypass_rate_limiter?
     EditRateLimiter.new(@editor).performed!
@@ -537,6 +557,7 @@ class PostRevisor
     return if bypass_bump? || !is_last_post?
     @topic.update_column(:bumped_at, Time.now)
     TopicTrackingState.publish_muted(@topic)
+    TopicTrackingState.publish_unmuted(@topic)
     TopicTrackingState.publish_latest(@topic)
   end
 
@@ -633,6 +654,8 @@ class PostRevisor
         {}
       end
 
+    DiscourseEvent.trigger(:before_post_publish_changes, post_changes, @topic_changes, options)
+
     @post.publish_change_to_clients!(:revised, options)
   end
 
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index d9bc62ad19..71f4308fd6 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -91,6 +91,7 @@ module PrettyText
     apply_es6_file(ctx, root_path, "discourse-common/addon/lib/get-url")
     apply_es6_file(ctx, root_path, "discourse-common/addon/lib/object")
     apply_es6_file(ctx, root_path, "discourse-common/addon/lib/deprecated")
+    apply_es6_file(ctx, root_path, "discourse-common/addon/lib/escape")
     apply_es6_file(ctx, root_path, "discourse/app/lib/to-markdown")
     apply_es6_file(ctx, root_path, "discourse/app/lib/utilities")
 
@@ -172,6 +173,7 @@ module PrettyText
         __optInput.emojiUnicodeReplacer = __emojiUnicodeReplacer;
         __optInput.lookupUploadUrls = __lookupUploadUrls;
         __optInput.censoredRegexp = #{WordWatcher.word_matcher_regexp(:censor)&.source.to_json};
+        __optInput.watchedWordsReplacements = #{WordWatcher.word_matcher_regexps(:replace).to_json};
       JS
 
       if opts[:topicId]
@@ -237,6 +239,7 @@ module PrettyText
         __performEmojiUnescape(#{title.inspect}, {
           getURL: __getURL,
           emojiSet: #{set},
+          emojiCDNUrl: "#{SiteSetting.external_emoji_url.blank? ? "" : SiteSetting.external_emoji_url}",
           customEmoji: #{custom},
           enableEmojiShortcuts: #{SiteSetting.enable_emoji_shortcuts},
           inlineEmoji: #{SiteSetting.enable_inline_emoji_translation}
@@ -333,7 +336,7 @@ module PrettyText
     # extract quotes
     doc.css("aside.quote[data-topic]").each do |aside|
       if aside["data-topic"].present?
-        url = +"/t/topic/#{aside["data-topic"]}"
+        url = +"/t/#{aside["data-topic"]}"
         url << "/#{aside["data-post"]}" if aside["data-post"].present?
         links << DetectedLink.new(url, true)
       end
@@ -401,7 +404,7 @@ module PrettyText
         vimeo_id = iframe['src'].split('/').last
         vimeo_url = "https://vimeo.com/#{vimeo_id}"
       end
-      iframe.replace "<p><a href='#{vimeo_url}'>#{vimeo_url}</a></p>"
+      iframe.replace Nokogiri::HTML5.fragment("<p><a href='#{vimeo_url}'>#{vimeo_url}</a></p>")
     end
   end
 
diff --git a/lib/pretty_text/helpers.rb b/lib/pretty_text/helpers.rb
index 62f3f63e8d..b675900b4c 100644
--- a/lib/pretty_text/helpers.rb
+++ b/lib/pretty_text/helpers.rb
@@ -110,7 +110,7 @@ module PrettyText
         [category.url, text]
       elsif (!is_tag && tag = Tag.find_by(name: text)) ||
             (is_tag && tag = Tag.find_by(name: text.gsub!(TAG_HASHTAG_POSTFIX, '')))
-        ["#{Discourse.base_url}/tag/#{tag.name}", text]
+        [tag.url, text]
       else
         nil
       end
diff --git a/lib/pretty_text/shims.js b/lib/pretty_text/shims.js
index 4c9de85dfc..bc281c23bc 100644
--- a/lib/pretty_text/shims.js
+++ b/lib/pretty_text/shims.js
@@ -1,7 +1,7 @@
 __PrettyText = require("pretty-text/pretty-text").default;
 __buildOptions = require("pretty-text/pretty-text").buildOptions;
 __performEmojiUnescape = require("pretty-text/emoji").performEmojiUnescape;
-__buildReplacementsList = require("pretty-text/emoji").buildReplacementsList;
+__emojiReplacementRegex = require("pretty-text/emoji").emojiReplacementRegex;
 __performEmojiEscape = require("pretty-text/emoji").performEmojiEscape;
 __resetTranslationTree = require("pretty-text/engines/discourse-markdown/emoji")
   .resetTranslationTree;
@@ -28,18 +28,34 @@ __utils = require("discourse/lib/utilities");
 __emojiUnicodeReplacer = null;
 
 __setUnicode = function (replacements) {
-  let unicodeRegexp = new RegExp(__buildReplacementsList(replacements), "g");
+  const regexp = new RegExp(__emojiReplacementRegex, "g");
 
   __emojiUnicodeReplacer = function (text) {
-    unicodeRegexp.lastIndex = 0;
+    regexp.lastIndex = 0;
+
     let m;
-    while ((m = unicodeRegexp.exec(text)) !== null) {
-      let replacement = ":" + replacements[m[0]] + ":";
+    while ((m = regexp.exec(text)) !== null) {
+      let match = m[0];
+
+      let replacement = replacements[match];
+
+      if (!replacement) {
+        // if we can't find replacement for an emoji match
+        // attempts to look for the same without trailing variation selector
+        match = match.replace(/\ufe0f$/g, "");
+        replacement = replacements[match];
+      }
+
+      if (!replacement) {
+        continue;
+      }
+
+      replacement = ":" + replacement + ":";
       const before = text.charAt(m.index - 1);
       if (!/\B/.test(before)) {
         replacement = "\u200b" + replacement;
       }
-      text = text.replace(m[0], replacement);
+      text = text.replace(match, replacement);
     }
 
     // fixes Safari VARIATION SELECTOR-16 issue with some emojis
@@ -53,7 +69,9 @@ __setUnicode = function (replacements) {
 __paths = {};
 
 function __getURLNoCDN(url) {
-  if (!url) return url;
+  if (!url) {
+    return url;
+  }
 
   // if it's a non relative URL, return it.
   if (url !== "/" && !/^\/[^\/]/.test(url)) {
@@ -63,7 +81,9 @@ function __getURLNoCDN(url) {
   if (url.indexOf(__paths.baseUri) !== -1) {
     return url;
   }
-  if (url[0] !== "/") url = "/" + url;
+  if (url[0] !== "/") {
+    url = "/" + url;
+  }
 
   return __paths.baseUri + url;
 }
diff --git a/lib/rate_limiter.rb b/lib/rate_limiter.rb
index 2622593986..bea535b7fa 100644
--- a/lib/rate_limiter.rb
+++ b/lib/rate_limiter.rb
@@ -55,6 +55,10 @@ class RateLimiter
     rate_unlimited? || is_under_limit?
   end
 
+  def seconds_to_wait(now)
+    @secs - age_of_oldest(now)
+  end
+
   # reloader friendly
   unless defined? PERFORM_LUA
     PERFORM_LUA = <<~LUA
@@ -66,7 +70,7 @@ class RateLimiter
 
 
       if ((tonumber(redis.call("LLEN", key)) < max) or
-          (now - tonumber(redis.call("LRANGE", key, -1, -1)[1])) > secs) then
+          (now - tonumber(redis.call("LRANGE", key, -1, -1)[1])) >= secs) then
         redis.call("LPUSH", key, now)
         redis.call("LTRIM", key, 0, max - 1)
         redis.call("EXPIRE", key, secs * 2)
@@ -91,7 +95,7 @@ class RateLimiter
       local return_val = 0
 
       if ((tonumber(redis.call("LLEN", key)) < max) or
-          (now - tonumber(redis.call("LRANGE", key, -1, -1)[1])) > secs) then
+          (now - tonumber(redis.call("LRANGE", key, -1, -1)[1])) >= secs) then
         return_val = 1
       else
         return_val = 0
@@ -112,7 +116,7 @@ class RateLimiter
     now = Time.now.to_i
 
     if ((max || 0) <= 0) || rate_limiter_allowed?(now)
-      raise RateLimiter::LimitExceeded.new(seconds_to_wait, @type) if raise_error
+      raise RateLimiter::LimitExceeded.new(seconds_to_wait(now), @type) if raise_error
       false
     else
       true
@@ -173,20 +177,18 @@ class RateLimiter
     Discourse.redis.without_namespace
   end
 
-  def seconds_to_wait
-    @secs - age_of_oldest
-  end
-
-  def age_of_oldest
+  def age_of_oldest(now)
     # age of oldest event in buffer, in seconds
-    Time.now.to_i - redis.lrange(prefixed_key, -1, -1).first.to_i
+    now - redis.lrange(prefixed_key, -1, -1).first.to_i
   end
 
   def is_under_limit?
+    now = Time.now.to_i
+
     # number of events in buffer less than max allowed? OR
     (redis.llen(prefixed_key) < @max) ||
     # age bigger than silding window size?
-    (age_of_oldest > @secs)
+    (age_of_oldest(now) >= @secs)
   end
 
   def rate_unlimited?
diff --git a/lib/retrieve_title.rb b/lib/retrieve_title.rb
index 227da9f0cb..fd652b3390 100644
--- a/lib/retrieve_title.rb
+++ b/lib/retrieve_title.rb
@@ -9,9 +9,9 @@ module RetrieveTitle
     # If there was a connection error, do nothing
   end
 
-  def self.extract_title(html)
+  def self.extract_title(html, encoding = nil)
     title = nil
-    if doc = Nokogiri::HTML5(html)
+    if doc = Nokogiri::HTML5(html, nil, encoding)
 
       title = doc.at('title')&.inner_text
 
@@ -54,6 +54,7 @@ module RetrieveTitle
 
     current = nil
     title = nil
+    encoding = nil
 
     fd.get do |_response, chunk, uri|
 
@@ -62,9 +63,17 @@ module RetrieveTitle
       else
         current = chunk
       end
+      if !encoding && content_type = _response['content-type']&.strip&.downcase
+        if content_type =~ /charset="?([a-z0-9_-]+)"?/
+          encoding = Regexp.last_match(1)
+          if !Encoding.list.map(&:name).map(&:downcase).include?(encoding)
+            encoding = nil
+          end
+        end
+      end
 
       max_size = max_chunk_size(uri) * 1024
-      title = extract_title(current)
+      title = extract_title(current, encoding)
       throw :done if title || max_size < current.length
     end
     title
diff --git a/lib/reviewable/actions.rb b/lib/reviewable/actions.rb
index f433a8c8a8..ba7858d87d 100644
--- a/lib/reviewable/actions.rb
+++ b/lib/reviewable/actions.rb
@@ -33,7 +33,7 @@ class Reviewable < ActiveRecord::Base
     end
 
     class Action < Item
-      attr_accessor :icon, :button_class, :label, :description, :confirm_message, :client_action
+      attr_accessor :icon, :button_class, :label, :description, :confirm_message, :client_action, :require_reject_reason, :custom_modal
 
       def initialize(id, icon = nil, button_class = nil, label = nil)
         super(id)
diff --git a/lib/s3_inventory.rb b/lib/s3_inventory.rb
index 7114660ebe..80239130c3 100644
--- a/lib/s3_inventory.rb
+++ b/lib/s3_inventory.rb
@@ -11,6 +11,7 @@ class S3Inventory
   CSV_ETAG_INDEX ||= 2
   INVENTORY_PREFIX ||= "inventory"
   INVENTORY_VERSION ||= "1"
+  INVENTORY_LAG ||= 2.days
 
   def initialize(s3_helper, type, preloaded_inventory_file: nil, preloaded_inventory_date: nil)
     @s3_helper = s3_helper
@@ -237,7 +238,7 @@ class S3Inventory
       symlink_file = unsorted_files.sort_by { |file| -file.last_modified.to_i }.first
       return [] if symlink_file.blank?
 
-      @inventory_date = symlink_file.last_modified - 1.day
+      @inventory_date = symlink_file.last_modified - INVENTORY_LAG
       log "Downloading symlink file to tmp directory..."
       failure_message = "Failed to download symlink file to tmp directory."
       filename = File.join(tmp_directory, File.basename(symlink_file.key))
diff --git a/lib/search.rb b/lib/search.rb
index c3f083b00f..fdc064bfd3 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -7,6 +7,16 @@ class Search
   cattr_accessor :preloaded_topic_custom_fields
   self.preloaded_topic_custom_fields = Set.new
 
+  def self.on_preload(&blk)
+    (@preload ||= Set.new) << blk
+  end
+
+  def self.preload(results, object)
+    if @preload
+      @preload.each { |preload| preload.call(results, object) }
+    end
+  end
+
   def self.per_facet
     5
   end
@@ -54,6 +64,11 @@ class Search
     end
   end
 
+  def self.segment_cjk?
+    ['zh_TW', 'zh_CN', 'ja'].include?(SiteSetting.default_locale) ||
+      SiteSetting.search_tokenize_chinese_japanese_korean
+  end
+
   def self.prepare_data(search_data, purpose = :query)
     purpose ||= :query
 
@@ -63,7 +78,7 @@ class Search
       # TODO cppjieba_rb is designed for chinese, we need something else for Japanese
       # Korean appears to be safe cause words are already space seperated
       # For Japanese we should investigate using kakasi
-      if ['zh_TW', 'zh_CN', 'ja'].include?(SiteSetting.default_locale) || SiteSetting.search_tokenize_chinese_japanese_korean
+      if segment_cjk?
         require 'cppjieba_rb' unless defined? CppjiebaRb
         mode = (purpose == :query ? :query : :mix)
         data = CppjiebaRb.segment(search_data, mode: mode)
@@ -164,7 +179,7 @@ class Search
   end
 
   attr_accessor :term
-  attr_reader :clean_term
+  attr_reader :clean_term, :guardian
 
   def initialize(term, opts = nil)
     @opts = opts || {}
@@ -282,6 +297,8 @@ class Search
       Topic.preload_custom_fields(topics, preloaded_topic_custom_fields)
     end
 
+    Search.preload(@results, self)
+
     @results
   end
 
@@ -605,7 +622,14 @@ class Search
   end
 
   advanced_filter(/^\@([a-zA-Z0-9_\-.]+)$/i) do |posts, match|
-    user_id = User.where(staged: false).where(username_lower: match.downcase).pluck_first(:id)
+    username = match.downcase
+
+    user_id = User.where(staged: false).where(username_lower: username).pluck_first(:id)
+
+    if !user_id && username == "me"
+      user_id = @guardian.user&.id
+    end
+
     if user_id
       posts.where("posts.user_id = #{user_id}")
     else
@@ -816,7 +840,8 @@ class Search
   def user_search
     return if SiteSetting.hide_user_profiles_from_public && !@guardian.user
 
-    users = User.includes(:user_search_data)
+    users = User
+      .includes(:user_search_data)
       .references(:user_search_data)
       .where(active: true)
       .where(staged: false)
@@ -825,7 +850,24 @@ class Search
       .order("last_posted_at DESC")
       .limit(limit)
 
+    users_custom_data_query = DB.query(<<~SQL, user_ids: users.pluck(:id), term: "%#{@original_term.downcase}%")
+      SELECT user_custom_fields.user_id, user_fields.name, user_custom_fields.value FROM user_custom_fields
+      INNER JOIN user_fields ON user_fields.id = REPLACE(user_custom_fields.name, 'user_field_', '')::INTEGER AND user_fields.searchable IS TRUE
+      WHERE user_id IN (:user_ids)
+      AND user_custom_fields.name LIKE 'user_field_%'
+      AND user_custom_fields.value ILIKE :term
+    SQL
+    users_custom_data = users_custom_data_query.reduce({}) do |acc, row|
+      acc[row.user_id] =
+        Array.wrap(acc[row.user_id]) << {
+          name: row.name,
+          value: row.value
+        }
+      acc
+    end
+
     users.each do |user|
+      user.custom_data = users_custom_data[user.id] || []
       @results.add(user)
     end
   end
@@ -967,53 +1009,30 @@ class Search
         posts
       end
 
-    if aggregate_search
-      aggregate_relation = Post.unscoped
-        .select("subquery.topic_id id")
-        .group("subquery.topic_id")
-
-      posts = posts.select(posts.arel.projections)
-    end
-
     if @order == :latest
-      posts = posts.reorder("posts.created_at DESC")
-
       if aggregate_search
-        aggregate_relation = aggregate_relation
-          .select(
-            "MAX(subquery.post_number) post_number",
-            "MAX(subquery.created_at) created_at"
-          )
-          .order("created_at DESC")
+        posts = posts.order("MAX(posts.created_at) DESC")
+      else
+        posts = posts.reorder("posts.created_at DESC")
       end
     elsif @order == :latest_topic
-      posts = posts.order("topics.created_at DESC")
-
       if aggregate_search
-        posts = posts.select("topics.created_at topic_created_at")
-
-        aggregate_relation = aggregate_relation
-          .select(
-            "MIN(subquery.post_number) post_number",
-            "MAX(subquery.topic_created_at) topic_created_at"
-          )
-          .order("topic_created_at DESC")
+        posts = posts.order("MAX(topics.created_at) DESC")
+      else
+        posts = posts.order("topics.created_at DESC")
       end
     elsif @order == :views
-      posts = posts.order("topics.views DESC")
-
       if aggregate_search
-        posts = posts.select("topics.views topic_views")
-
-        aggregate_relation = aggregate_relation
-          .select(
-            "MIN(subquery.post_number) post_number",
-            "MAX(subquery.topic_views) topic_views"
-          )
-          .order("topic_views DESC")
+        posts = posts.order("MAX(topics.views) DESC")
+      else
+        posts = posts.order("topics.views DESC")
       end
     elsif @order == :likes
-      posts = posts.order("posts.like_count DESC")
+      if aggregate_search
+        posts = posts.order("MAX(posts.like_count) DESC")
+      else
+        posts = posts.order("posts.like_count DESC")
+      end
     else
       rank = <<~SQL
       TS_RANK_CD(
@@ -1023,17 +1042,25 @@ class Search
       )
       SQL
 
+      category_search_priority = <<~SQL
+      (
+        CASE categories.search_priority
+        WHEN #{Searchable::PRIORITIES[:very_high]}
+        THEN 3
+        WHEN #{Searchable::PRIORITIES[:very_low]}
+        THEN 1
+        ELSE 2
+        END
+      )
+      SQL
+
       category_priority_weights = <<~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
@@ -1050,31 +1077,22 @@ class Search
           "(#{rank} * #{category_priority_weights})"
         end
 
-      if aggregate_search
-        posts = posts.select("#{data_ranking} rank", "topics.bumped_at topic_bumped_at")
-          .order("rank DESC", "topic_bumped_at DESC")
+      posts =
+        if aggregate_search
+          posts.order("MAX(#{category_search_priority}) DESC", "MAX(#{data_ranking}) DESC")
+        else
+          posts.order("#{category_search_priority} DESC", "#{data_ranking} DESC")
+        end
 
-        aggregate_relation = aggregate_relation
-          .select(
-            "(ARRAY_AGG(subquery.post_number ORDER BY subquery.rank DESC, subquery.topic_bumped_at DESC))[1] post_number",
-            "MAX(subquery.rank) rank", "MAX(subquery.topic_bumped_at) topic_bumped_at"
-          )
-          .order("rank DESC", "topic_bumped_at DESC")
+      posts = posts.order("topics.bumped_at DESC")
+    end
+
+    posts =
+      if secure_category_ids.present?
+        posts.where("(categories.id IS NULL) OR (NOT categories.read_restricted) OR (categories.id IN (?))", secure_category_ids).references(:categories)
       else
-        posts = posts.order("#{data_ranking} DESC", "topics.bumped_at DESC")
+        posts.where("(categories.id IS NULL) OR (NOT categories.read_restricted)").references(:categories)
       end
-    end
-
-    if secure_category_ids.present?
-      posts = posts.where("(categories.id IS NULL) OR (NOT categories.read_restricted) OR (categories.id IN (?))", secure_category_ids).references(:categories)
-    else
-      posts = posts.where("(categories.id IS NULL) OR (NOT categories.read_restricted)").references(:categories)
-    end
-
-    if aggregate_search
-      posts = yield(posts) if block_given?
-      posts = aggregate_relation.from(posts)
-    end
 
     if @order
       advanced_order = Search.advanced_orders&.fetch(@order, nil)
@@ -1150,36 +1168,28 @@ class Search
         Search.min_post_id
       end
 
-    if @order == :likes
-      # likes are a pain to aggregate so skip
-      query = posts_query(limit, **default_opts).select('topics.id', 'posts.post_number')
+    min_or_max = @order == :latest ? "max" : "min"
 
-      if min_id > 0
-        low_set = query.dup.where("post_search_data.post_id < #{min_id}")
-        high_set = query.where("post_search_data.post_id >= #{min_id}")
-
-        { default: wrap_rows(high_set), remaining: wrap_rows(low_set) }
+    query =
+      if @order == :likes
+        # likes are a pain to aggregate so skip
+        posts_query(limit, type_filter: opts[:type_filter])
+          .select('topics.id', "posts.post_number")
       else
-        { default: wrap_rows(query) }
-      end
-    else
-      query = posts_query(limit, **default_opts, aggregate_search: true) do |posts|
-        if min_id > 0
-          posts.select("post_search_data.post_id post_search_data_post_id")
-        else
-          posts
-        end
+        posts_query(limit, aggregate_search: true, type_filter: opts[:type_filter])
+          .select('topics.id', "#{min_or_max}(posts.post_number) post_number")
+          .group('topics.id')
       end
 
-      if min_id > 0
-        low_set = query.dup.where("subquery.post_search_data_post_id < #{min_id}")
-        high_set = query.where("subquery.post_search_data_post_id >= #{min_id}")
+    if min_id > 0
+      low_set = query.dup.where("post_search_data.post_id < #{min_id}")
+      high_set = query.where("post_search_data.post_id >= #{min_id}")
 
-        { default: wrap_rows(high_set), remaining: wrap_rows(low_set) }
-      else
-        { default: wrap_rows(query) }
-      end
+      return { default: wrap_rows(high_set), remaining: wrap_rows(low_set) }
     end
+
+    # double wrapping so we get correct row numbers
+    { default: wrap_rows(query) }
   end
 
   def aggregate_posts(post_sql)
@@ -1260,7 +1270,7 @@ class Search
             #{ts_config},
             t1.fancy_title,
             PLAINTO_TSQUERY(#{ts_config}, '#{search_term}'),
-            'StartSel=''<span class=\"#{HIGHLIGHT_CSS_CLASS}\">'', StopSel=''</span>'''
+            'StartSel=''<span class=\"#{HIGHLIGHT_CSS_CLASS}\">'', StopSel=''</span>'', HighlightAll=true'
           ) AS topic_title_headline",
           "TS_HEADLINE(
             #{ts_config},
diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index 470a732e7d..8182fe90bc 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -87,7 +87,7 @@ class Search
         blurb_length: @blurb_length
       }
 
-      if post.post_search_data.version > SearchIndexer::MIN_POST_REINDEX_VERSION
+      if post.post_search_data.version > SearchIndexer::MIN_POST_REINDEX_VERSION && !Search.segment_cjk?
         if SiteSetting.use_pg_headlines_for_excerpt
           scrubbed_headline = post.headline.gsub(SCRUB_HEADLINE_REGEXP, '\1')
           prefix_omission = scrubbed_headline.start_with?(post.leading_raw_data) ? '' : OMISSION
diff --git a/lib/single_sign_on.rb b/lib/single_sign_on.rb
index 729b3df200..a4c0bab2e7 100644
--- a/lib/single_sign_on.rb
+++ b/lib/single_sign_on.rb
@@ -117,6 +117,10 @@ class SingleSignOn
     OpenSSL::HMAC.hexdigest("sha256", secret, payload)
   end
 
+  def to_json
+    self.to_h.to_json
+  end
+
   def to_url(base_url = nil)
     base = "#{base_url || sso_url}"
     "#{base}#{base.include?('?') ? '&' : '?'}#{payload}"
@@ -128,6 +132,10 @@ class SingleSignOn
   end
 
   def unsigned_payload
+    Rack::Utils.build_query(self.to_h)
+  end
+
+  def to_h
     payload = {}
 
     ACCESSORS.each do |k|
@@ -139,7 +147,6 @@ class SingleSignOn
       payload["custom.#{k}"] = v.to_s
     end
 
-    Rack::Utils.build_query(payload)
+    payload
   end
-
 end
diff --git a/lib/single_sign_on_provider.rb b/lib/single_sign_on_provider.rb
index a626ffcf26..3e744430ba 100644
--- a/lib/single_sign_on_provider.rb
+++ b/lib/single_sign_on_provider.rb
@@ -7,7 +7,7 @@ class SingleSignOnProvider < SingleSignOn
     set_return_sso_url(payload)
     if sso_secret.blank? && self.sso_secret.blank?
       host = URI.parse(@return_sso_url).host
-      Rails.logger.warn("SSO failed; website #{host} is not in the `sso_provider_secrets` site settings")
+      Rails.logger.warn("SSO failed; website #{host} is not in the `discourse_connect_provider_secrets` site settings")
       raise BlankSecret
     end
 
@@ -24,9 +24,9 @@ class SingleSignOnProvider < SingleSignOn
   end
 
   def self.sso_secret
-    return nil unless @return_sso_url && SiteSetting.enable_sso_provider
+    return nil unless @return_sso_url && SiteSetting.enable_discourse_connect_provider
 
-    provider_secrets = SiteSetting.sso_provider_secrets.split(/[|\n]/)
+    provider_secrets = SiteSetting.discourse_connect_provider_secrets.split(/[|\n]/)
     provider_secrets_hash = Hash[*provider_secrets]
     return_url_host = URI.parse(@return_sso_url).host
     # moves wildcard domains to the end of hash
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 6b02292c6d..28c7a9cd45 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -208,14 +208,20 @@ module SiteSettingExtension
   def client_settings_json_uncached
     MultiJson.dump(Hash[*@client_settings.map do |name|
       value = self.public_send(name)
-      value = value.to_s if type_supervisor.get_type(name) == :upload
-      value = value.map(&:to_s).join("|") if type_supervisor.get_type(name) == :uploaded_image_list
+      type = type_supervisor.get_type(name)
+      value = value.to_s if type == :upload
+      value = value.map(&:to_s).join("|") if type == :uploaded_image_list
+
+      if should_sanitize?(value, type)
+        value = sanitize(value)
+      end
+
       [name, value]
     end.flatten])
   end
 
   # Retrieve all settings
-  def all_settings(include_hidden = false)
+  def all_settings(include_hidden: false, sanitize_plain_text_settings: false)
 
     locale_setting_hash =
     {
@@ -244,6 +250,8 @@ module SiteSettingExtension
          default.to_i < Upload::SEEDED_ID_THRESHOLD
 
         default = default_uploads[default.to_i]
+      elsif sanitize_plain_text_settings && should_sanitize?(value, type_hash[:type].to_s)
+        value = sanitize(value)
       end
 
       opts = {
@@ -476,7 +484,7 @@ module SiteSettingExtension
     end
 
     define_singleton_method "#{clean_name}=" do |val|
-      Rails.logger.warn("An attempt was to change #{clean_name} SiteSetting to #{val} however it is shadowed so this will be ignored!")
+      Rails.logger.warn("An attempt was to change #{clean_name} SiteSetting to #{val} however it is shadowed so this will be ignored!") if value != val
       nil
     end
 
@@ -574,6 +582,14 @@ module SiteSettingExtension
     end
   end
 
+  def should_sanitize?(value, type)
+    value.is_a?(String) && type.to_s != 'html'
+  end
+
+  def sanitize(value)
+    CGI.unescapeHTML(Loofah.scrub_fragment(value, :strip).to_s)
+  end
+
   def logger
     Rails.logger
   end
diff --git a/lib/site_settings/defaults_provider.rb b/lib/site_settings/defaults_provider.rb
index 1a4ac02a83..9ebae9aa51 100644
--- a/lib/site_settings/defaults_provider.rb
+++ b/lib/site_settings/defaults_provider.rb
@@ -4,7 +4,7 @@ module SiteSettings; end
 
 # A cache for providing default value based on site locale
 class SiteSettings::DefaultsProvider
-  DEFAULT_LOCALE = 'en_US'
+  DEFAULT_LOCALE = 'en'
 
   def initialize(site_setting)
     @site_setting = site_setting
diff --git a/lib/site_settings/deprecated_settings.rb b/lib/site_settings/deprecated_settings.rb
index 60e6a909ed..85ed2f4cae 100644
--- a/lib/site_settings/deprecated_settings.rb
+++ b/lib/site_settings/deprecated_settings.rb
@@ -10,7 +10,27 @@ module SiteSettings::DeprecatedSettings
     ['enable_category_group_review', 'enable_category_group_moderation', true, '2.7'],
     ['newuser_max_images', 'newuser_max_embedded_media', true, '2.7'],
     ['min_trust_to_post_images', 'min_trust_to_post_embedded_media', true, '2.7'],
-    ['moderators_create_categories', 'moderators_manage_categories_and_groups', '2.7']
+    ['moderators_create_categories', 'moderators_manage_categories_and_groups', '2.7'],
+
+    ['enable_sso', 'enable_discourse_connect', true, '2.8'],
+    ['sso_allows_all_return_paths', 'discourse_connect_allows_all_return_paths', true, '2.8'],
+    ['enable_sso_provider', 'enable_discourse_connect_provider', true, '2.8'],
+    ['verbose_sso_logging', 'verbose_discourse_connect_logging', true, '2.8'],
+    ['sso_url', 'discourse_connect_url', true, '2.8'],
+    ['sso_secret', 'discourse_connect_secret', true, '2.8'],
+    ['sso_provider_secrets', 'discourse_connect_provider_secrets', true, '2.8'],
+    ['sso_overrides_groups', 'discourse_connect_overrides_groups', true, '2.8'],
+    ['sso_overrides_bio', 'discourse_connect_overrides_bio', true, '2.8'],
+    ['sso_overrides_email', 'auth_overrides_email', true, '2.8'],
+    ['sso_overrides_username', 'auth_overrides_username', true, '2.8'],
+    ['sso_overrides_name', 'auth_overrides_name', true, '2.8'],
+    ['sso_overrides_avatar', 'discourse_connect_overrides_avatar', true, '2.8'],
+    ['sso_overrides_profile_background', 'discourse_connect_overrides_profile_background', true, '2.8'],
+    ['sso_overrides_location', 'discourse_connect_overrides_location', true, '2.8'],
+    ['sso_overrides_website', 'discourse_connect_overrides_website', true, '2.8'],
+    ['sso_overrides_card_background', 'discourse_connect_overrides_card_background', true, '2.8'],
+    ['external_auth_skip_create_confirm', 'auth_skip_create_confirm', true, '2.8'],
+    ['external_auth_immediately', 'auth_immediately', true, '2.8'],
   ]
 
   def setup_deprecated_methods
diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb
index f30be8cfa0..b33030c713 100644
--- a/lib/site_settings/type_supervisor.rb
+++ b/lib/site_settings/type_supervisor.rb
@@ -5,8 +5,8 @@ module SiteSettings; end
 class SiteSettings::TypeSupervisor
   include SiteSettings::Validations
 
-  CONSUMED_OPTS = %i[enum choices type validator min max regex hidden regex_error allow_any list_type textarea].freeze
-  VALIDATOR_OPTS = %i[min max regex hidden regex_error].freeze
+  CONSUMED_OPTS = %i[enum choices type validator min max regex hidden regex_error allow_any list_type textarea json_schema].freeze
+  VALIDATOR_OPTS = %i[min max regex hidden regex_error json_schema].freeze
 
   # For plugins, so they can tell if a feature is supported
   SUPPORTED_TYPES = %i[email username list enum].freeze
@@ -35,7 +35,9 @@ class SiteSettings::TypeSupervisor
       group_list: 20,
       tag_list: 21,
       color: 22,
-      simple_list: 23
+      simple_list: 23,
+      emoji_list: 24,
+      html: 25
     )
   end
 
@@ -70,6 +72,7 @@ class SiteSettings::TypeSupervisor
     @allow_any = {}
     @list_type = {}
     @textareas = {}
+    @json_schemas = {}
   end
 
   def load_setting(name_arg, opts = {})
@@ -79,6 +82,10 @@ class SiteSettings::TypeSupervisor
       @textareas[name] = opts[:textarea]
     end
 
+    if opts[:json_schema]
+      @json_schemas[name] = opts[:json_schema].constantize
+    end
+
     if (enum = opts[:enum])
       @enums[name] = enum.is_a?(String) ? enum.constantize : enum
       opts[:type] ||= :enum
@@ -160,6 +167,9 @@ class SiteSettings::TypeSupervisor
     result[:choices] = @choices[name] if @choices.has_key? name
     result[:list_type] = @list_type[name] if @list_type.has_key? name
     result[:textarea] = @textareas[name] if @textareas.has_key? name
+    if @json_schemas.has_key?(name) && json_klass = json_schema_class(name)
+      result[:json_schema] = json_klass.schema
+    end
 
     result
   end
@@ -241,6 +251,10 @@ class SiteSettings::TypeSupervisor
     @enums[name]
   end
 
+  def json_schema_class(name)
+    @json_schemas[name]
+  end
+
   def validator_for(type_name)
     case type_name
     when self.class.types[:email]
diff --git a/lib/site_settings/validations.rb b/lib/site_settings/validations.rb
index 81090bfe1c..ebfcbfcfe1 100644
--- a/lib/site_settings/validations.rb
+++ b/lib/site_settings/validations.rb
@@ -177,8 +177,8 @@ module SiteSettings::Validations
   end
 
   def validate_enforce_second_factor(new_val)
-    if SiteSetting.enable_sso?
-      return validate_error :second_factor_cannot_be_enforced_with_sso_enabled
+    if SiteSetting.enable_discourse_connect?
+      return validate_error :second_factor_cannot_be_enforced_with_discourse_connect_enabled
     end
     if new_val == "all" && Discourse.enabled_auth_providers.count > 0
       auth_provider_names = Discourse.enabled_auth_providers.map(&:name).join(", ")
diff --git a/lib/slug.rb b/lib/slug.rb
index 9f846cddb7..ebb177347d 100644
--- a/lib/slug.rb
+++ b/lib/slug.rb
@@ -6,28 +6,22 @@ module Slug
   CHAR_FILTER_REGEXP = /[:\/\?#\[\]@!\$&'\(\)\*\+,;=_\.~%\\`^\s|\{\}"<>]+/ # :/?#[]@!$&'()*+,;=_.~%\`^|{}"<>
   MAX_LENGTH = 255
 
-  def self.for(string, default = 'topic', max_length = MAX_LENGTH)
+  def self.for(string, default = 'topic', max_length = MAX_LENGTH, method: nil)
     string = string.gsub(/:([\w\-+]+(?::t\d)?):/, '') if string.present? # strip emoji strings
-
-    if SiteSetting.slug_generation_method == 'encoded'
-      max_length = 9999 # do not truncate encoded slugs
-    end
+    method = (method || SiteSetting.slug_generation_method || :ascii).to_sym
+    max_length = 9999 if method == :encoded # do not truncate encoded slugs
 
     slug =
-      case (SiteSetting.slug_generation_method || :ascii).to_sym
+      case method
       when :ascii then self.ascii_generator(string)
       when :encoded then self.encoded_generator(string)
       when :none then self.none_generator(string)
       end
+
     slug = self.prettify_slug(slug, max_length: max_length)
     (slug.blank? || slug_is_only_numbers?(slug)) ? default : slug
   end
 
-  def self.sanitize(string, downcase: false, max_length: MAX_LENGTH)
-    slug = self.encoded_generator(string, downcase: downcase)
-    self.prettify_slug(slug, max_length: max_length)
-  end
-
   private
 
   def self.slug_is_only_numbers?(slug)
diff --git a/lib/stylesheet/common.rb b/lib/stylesheet/common.rb
deleted file mode 100644
index b64f9257fb..0000000000
--- a/lib/stylesheet/common.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require 'sassc'
-
-module Stylesheet
-  module Common
-    ASSET_ROOT = "#{Rails.root}/app/assets/stylesheets" unless defined? ASSET_ROOT
-  end
-end
diff --git a/lib/stylesheet/compiler.rb b/lib/stylesheet/compiler.rb
index 23433e8f20..efc4718577 100644
--- a/lib/stylesheet/compiler.rb
+++ b/lib/stylesheet/compiler.rb
@@ -1,40 +1,57 @@
 # frozen_string_literal: true
 
-require 'stylesheet/common'
 require 'stylesheet/importer'
 require 'stylesheet/functions'
 
 module Stylesheet
 
   class Compiler
+    ASSET_ROOT = "#{Rails.root}/app/assets/stylesheets" unless defined? ASSET_ROOT
 
     def self.compile_asset(asset, options = {})
+      importer = Importer.new(options)
+      file = importer.prepended_scss
 
-      if Importer.special_imports[asset.to_s]
+      if Importer::THEME_TARGETS.include?(asset.to_s)
         filename = "theme_#{options[:theme_id]}.scss"
-        file = "@import \"common/foundation/variables\"; @import \"common/foundation/mixins\";"
-        file += " @import \"theme_variables\";" if Importer::THEME_TARGETS.include?(asset.to_s)
-        file += " @import \"#{asset}\";"
+        file += options[:theme_variables].to_s
+        file += importer.theme_import(asset)
+      elsif plugin_assets = Importer.plugin_assets[asset.to_s]
+        filename = "#{asset.to_s}.scss"
+        options[:load_paths] = [] if options[:load_paths].nil?
+        plugin_assets.each do |src|
+          file += File.read src
+          options[:load_paths] << File.expand_path(File.dirname(src))
+        end
       else
         filename = "#{asset}.scss"
-        path = "#{Stylesheet::Common::ASSET_ROOT}/#{filename}"
-        file = File.read path
+        path = "#{ASSET_ROOT}/#{filename}"
+        file += File.read path
 
-        if asset.to_s == Stylesheet::Manager::COLOR_SCHEME_STYLESHEET
-          file += Stylesheet::Importer.import_color_definitions(options[:theme_id])
-          file += Stylesheet::Importer.import_wcag_overrides(options[:color_scheme_id])
+        case asset.to_s
+        when "desktop", "mobile"
+          file += importer.category_backgrounds
+          file += importer.font
+        when "embed", "publish"
+          file += importer.font
+        when "wizard"
+          file += importer.wizard_fonts
+        when Stylesheet::Manager::COLOR_SCHEME_STYLESHEET
+          file += importer.import_color_definitions
+          file += importer.import_wcag_overrides
         end
       end
 
       compile(file, filename, options)
-
     end
 
     def self.compile(stylesheet, filename, options = {})
       source_map_file = options[:source_map_file] || "#{filename.sub(".scss", "")}.css.map"
 
+      load_paths = [ASSET_ROOT]
+      load_paths += options[:load_paths] if options[:load_paths]
+
       engine = SassC::Engine.new(stylesheet,
-                                 importer: Importer,
                                  filename: filename,
                                  style: :compressed,
                                  source_map_file: source_map_file,
@@ -43,7 +60,7 @@ module Stylesheet
                                  theme: options[:theme],
                                  theme_field: options[:theme_field],
                                  color_scheme_id: options[:color_scheme_id],
-                                 load_paths: [Stylesheet::Common::ASSET_ROOT])
+                                 load_paths: load_paths)
 
       result = engine.render
 
diff --git a/lib/stylesheet/functions.rb b/lib/stylesheet/functions.rb
index fa1c3330d3..4abc98a51a 100644
--- a/lib/stylesheet/functions.rb
+++ b/lib/stylesheet/functions.rb
@@ -3,9 +3,11 @@
 module Stylesheet
   module ScssFunctions
     def asset_url(path)
+      Discourse.deprecate("The `asset-url` SCSS function is deprecated. Use `absolute-image-url` instead.")
       SassC::Script::Value::String.new("url('#{ActionController::Base.helpers.asset_url(path.value)}')")
     end
     def image_url(path)
+      Discourse.deprecate("The `image-url` SCSS function is deprecated. Use `absolute-image-url` instead.")
       SassC::Script::Value::String.new("url('#{ActionController::Base.helpers.image_url(path.value)}')")
     end
   end
diff --git a/lib/stylesheet/importer.rb b/lib/stylesheet/importer.rb
index c787ca8c2b..8b02e809c9 100644
--- a/lib/stylesheet/importer.rb
+++ b/lib/stylesheet/importer.rb
@@ -1,30 +1,18 @@
 # frozen_string_literal: true
 
-require_dependency 'stylesheet/common'
 require_dependency 'global_path'
 
 module Stylesheet
-  class Importer < SassC::Importer
+  class Importer
     include GlobalPath
 
     THEME_TARGETS ||= %w{embedded_theme mobile_theme desktop_theme}
 
-    def self.special_imports
-      @special_imports ||= {}
+    def self.plugin_assets
+      @plugin_assets ||= {}
     end
 
-    def self.register_import(name, &blk)
-      special_imports[name] = blk
-    end
-
-    # Contained in function so that it can be called repeatedly from test mode
     def self.register_imports!
-      @special_imports = {}
-
-      register_import "theme_field" do
-        Import.new("#{theme_dir(@theme_id)}/theme_field.scss", source: @theme_field)
-      end
-
       Discourse.plugins.each do |plugin|
         plugin_directory_name = plugin.directory_name
 
@@ -32,213 +20,179 @@ module Stylesheet
           asset_name = type.present? ? "#{plugin_directory_name}_#{type}" : plugin_directory_name
           stylesheets = type.present? ? DiscoursePluginRegistry.send("#{type}_stylesheets") : DiscoursePluginRegistry.stylesheets
 
-          if stylesheets[plugin_directory_name].present?
-            register_import asset_name do
-              import_files(stylesheets[plugin_directory_name])
-            end
-          end
+          plugin_assets[asset_name] = stylesheets[plugin_directory_name] if plugin_directory_name.present?
         end
       end
 
-      register_import "font" do
-        body_font = DiscourseFonts.fonts.find { |f| f[:key] == SiteSetting.base_font }
-        heading_font = DiscourseFonts.fonts.find { |f| f[:key] == SiteSetting.heading_font }
-        contents = +""
-
-        if body_font.present?
-          contents << <<~EOF
-            #{font_css(body_font)}
-
-            :root {
-              --font-family: #{body_font[:stack]};
-            }
-          EOF
-        end
-
-        if heading_font.present?
-          contents << <<~EOF
-            #{font_css(heading_font)}
-
-            :root {
-              --heading-font-family: #{heading_font[:stack]};
-            }
-          EOF
-        end
-
-        Import.new("font.scss", source: contents)
-      end
-
-      register_import "wizard_fonts" do
-        contents = +""
-
-        DiscourseFonts.fonts.each do |font|
-          if font[:key] == "system"
-            # Overwrite font definition because the preview canvases in the wizard require explicit @font-face definitions.
-            # uses same technique as https://github.com/jonathantneal/system-font-css
-            font[:variants] = [
-              { src: 'local(".SFNS-Regular"), local(".SFNSText-Regular"), local(".HelveticaNeueDeskInterface-Regular"), local(".LucidaGrandeUI"), local("Segoe UI"), local("Ubuntu"), local("Roboto-Regular"), local("DroidSans"), local("Tahoma")', weight: 400 },
-              { src: 'local(".SFNS-Bold"), local(".SFNSText-Bold"), local(".HelveticaNeueDeskInterface-Bold"), local(".LucidaGrandeUI"), local("Segoe UI Bold"), local("Ubuntu Bold"), local("Roboto-Bold"), local("DroidSans-Bold"), local("Tahoma Bold")', weight: 700 }
-            ]
-          end
-
-          contents << font_css(font)
-          contents << <<~EOF
-            .body-font-#{font[:key].tr("_", "-")} {
-              font-family: #{font[:stack]};
-            }
-            .heading-font-#{font[:key].tr("_", "-")} h2 {
-              font-family: #{font[:stack]};
-            }
-          EOF
-        end
-
-        Import.new("wizard_fonts.scss", source: contents)
-      end
-
-      register_import "plugins_variables" do
-        import_files(DiscoursePluginRegistry.sass_variables)
-      end
-
-      register_import "theme_colors" do
-        contents = +""
-        if @color_scheme_id
-          colors = begin
-            ColorScheme.find(@color_scheme_id).resolved_colors
-          rescue
-            ColorScheme.base_colors
-          end
-        else
-          colors = (@theme_id && theme.color_scheme) ? theme.color_scheme.resolved_colors : ColorScheme.base_colors
-        end
-
-        colors.each do |n, hex|
-          contents << "$#{n}: ##{hex} !default;\n"
-        end
-
-        Import.new("theme_colors.scss", source: contents)
-      end
-
-      register_import "theme_variables" do
-        contents = +""
-
-        theme&.all_theme_variables&.each do |field|
-          if field.type_id == ThemeField.types[:theme_upload_var]
-            if upload = field.upload
-              url = upload_cdn_path(upload.url)
-              contents << "$#{field.name}: unquote(\"#{url}\");\n"
-            end
-          else
-            contents << to_scss_variable(field.name, field.value)
-          end
-        end
-
-        theme&.included_settings&.each do |name, value|
-          next if name == "theme_uploads"
-          contents << to_scss_variable(name, value)
-        end
-
-        Import.new("theme_variable.scss", source: contents)
-      end
-
-      register_import "category_backgrounds" do
-        contents = +""
-        Category.where('uploaded_background_id IS NOT NULL').each do |c|
-          contents << category_css(c) if c.uploaded_background&.url.present?
-        end
-
-        Import.new("category_background.scss", source: contents)
-      end
-
-      register_import "embedded_theme" do
-        next unless @theme_id
-
-        theme_import(:common, :embedded_scss)
-      end
-
-      register_import "mobile_theme" do
-        next unless @theme_id
-
-        theme_import(:mobile, :scss)
-      end
-
-      register_import "desktop_theme" do
-        next unless @theme_id
-
-        theme_import(:desktop, :scss)
-      end
     end
 
     register_imports!
 
-    def self.import_color_definitions(theme_id)
+    def font
+      body_font = DiscourseFonts.fonts.find { |f| f[:key] == SiteSetting.base_font }
+      heading_font = DiscourseFonts.fonts.find { |f| f[:key] == SiteSetting.heading_font }
+      contents = +""
+
+      if body_font.present?
+        contents << <<~EOF
+          #{font_css(body_font)}
+
+          :root {
+            --font-family: #{body_font[:stack]};
+          }
+        EOF
+      end
+
+      if heading_font.present?
+        contents << <<~EOF
+          #{font_css(heading_font)}
+
+          :root {
+            --heading-font-family: #{heading_font[:stack]};
+          }
+        EOF
+      end
+
+      contents
+    end
+
+    def wizard_fonts
+      contents = +""
+
+      DiscourseFonts.fonts.each do |font|
+        if font[:key] == "system"
+          # Overwrite font definition because the preview canvases in the wizard require explicit @font-face definitions.
+          # uses same technique as https://github.com/jonathantneal/system-font-css
+          font[:variants] = [
+            { src: 'local(".SFNS-Regular"), local(".SFNSText-Regular"), local(".HelveticaNeueDeskInterface-Regular"), local(".LucidaGrandeUI"), local("Segoe UI"), local("Ubuntu"), local("Roboto-Regular"), local("DroidSans"), local("Tahoma")', weight: 400 },
+            { src: 'local(".SFNS-Bold"), local(".SFNSText-Bold"), local(".HelveticaNeueDeskInterface-Bold"), local(".LucidaGrandeUI"), local("Segoe UI Bold"), local("Ubuntu Bold"), local("Roboto-Bold"), local("DroidSans-Bold"), local("Tahoma Bold")', weight: 700 }
+          ]
+        end
+
+        contents << font_css(font)
+        contents << <<~EOF
+          .body-font-#{font[:key].tr("_", "-")} {
+            font-family: #{font[:stack]};
+          }
+          .heading-font-#{font[:key].tr("_", "-")} h2 {
+            font-family: #{font[:stack]};
+          }
+        EOF
+      end
+
+      contents
+    end
+
+    def category_backgrounds
+      contents = +""
+      Category.where('uploaded_background_id IS NOT NULL').each do |c|
+        contents << category_css(c) if c.uploaded_background&.url.present?
+      end
+
+      contents
+    end
+
+    def import_color_definitions
       contents = +""
       DiscoursePluginRegistry.color_definition_stylesheets.each do |name, path|
-        contents << "// Color definitions from #{name}\n\n"
+        contents << "\n\n// Color definitions from #{name}\n\n"
         contents << File.read(path.to_s)
         contents << "\n\n"
       end
 
-      theme_id ||= SiteSetting.default_theme_id
+      theme_id = @theme_id || SiteSetting.default_theme_id
       resolved_ids = Theme.transform_ids([theme_id])
 
       if resolved_ids
-        contents << " @import \"theme_variables\";"
-        Theme.list_baked_fields(resolved_ids, :common, :color_definitions).each do |row|
-          contents << "// Color definitions from #{Theme.find_by_id(theme_id)&.name}\n\n"
-          contents << row.value
+        theme = Theme.find_by_id(theme_id)
+        contents << theme&.scss_variables.to_s
+        Theme.list_baked_fields(resolved_ids, :common, :color_definitions).each do |field|
+          contents << "\n\n// Color definitions from #{field.theme.name}\n\n"
+
+          if field.theme_id == theme.id
+            contents << field.value
+          else
+            contents << field.compiled_css(prepended_scss)
+          end
+          contents << "\n\n"
         end
       end
       contents
     end
 
-    def self.import_wcag_overrides(color_scheme_id)
-      if color_scheme_id && ColorScheme.find_by_id(color_scheme_id)&.is_wcag?
+    def import_wcag_overrides
+      if @color_scheme_id && ColorScheme.find_by_id(@color_scheme_id)&.is_wcag?
         return "@import \"wcag\";"
       end
       ""
     end
 
+    def color_variables
+      contents = +""
+      if @color_scheme_id
+        colors = begin
+          ColorScheme.find(@color_scheme_id).resolved_colors
+        rescue
+          ColorScheme.base_colors
+        end
+      elsif (@theme_id && !theme.component)
+        colors = theme&.color_scheme&.resolved_colors || ColorScheme.base_colors
+      else
+        # this is a slightly ugly backwards compatibility fix,
+        # we shouldn't be using the default theme color scheme for components
+        # (most components use CSS custom properties which work fine without this)
+        colors = Theme.find_by_id(SiteSetting.default_theme_id)&.color_scheme&.resolved_colors ||
+          ColorScheme.base_colors
+      end
+
+      colors.each do |n, hex|
+        contents << "$#{n}: ##{hex} !default; "
+      end
+
+      contents
+    end
+
+    def public_image_path
+      image_path = UrlHelper.absolute("#{Discourse.base_path}/images")
+      "$public_image_path: \"#{image_path}\"; "
+    end
+
+    def prepended_scss
+      "#{color_variables} #{public_image_path} @import \"common/foundation/variables\"; @import \"common/foundation/mixins\"; "
+    end
+
     def initialize(options)
       @theme = options[:theme]
       @theme_id = options[:theme_id]
-      @theme_field = options[:theme_field]
       @color_scheme_id = options[:color_scheme_id]
 
       if @theme && !@theme_id
         # make up an id so other stuff does not bail out
         @theme_id = @theme.id || -1
       end
-      @importable_theme_fields = {}
     end
 
-    def import_files(files)
-      files.map do |file|
-        # we never want inline css imports, they are a mess
-        # this tricks libsass so it imports inline instead
-        if file =~ /\.css$/
-          file = file[0..-5]
-        end
-        Import.new(file)
-      end
-    end
+    def theme_import(target)
+      attr = target == :embedded_theme ? :embedded_scss : :scss
+      target = target.to_s.gsub("_theme", "").to_sym
+
+      contents = +""
 
-    def theme_import(target, attr)
       fields = theme.list_baked_fields(target, attr)
-
       fields.map do |field|
         value = field.value
         if value.present?
-          filename = "theme_#{field.theme.id}/#{field.target_name}-#{field.name}-#{field.theme.name.parameterize}.scss"
-          with_comment = <<~COMMENT
+          contents << <<~COMMENT
           // Theme: #{field.theme.name}
           // Target: #{field.target_name} #{field.name}
           // Last Edited: #{field.updated_at}
-
-          #{value}
           COMMENT
-          Import.new(filename, source: with_comment)
+
+          contents << value
         end
-      end.compact
+
+      end
+      contents
     end
 
     def theme
@@ -248,43 +202,6 @@ module Stylesheet
       @theme == :nil ? nil : @theme
     end
 
-    def theme_dir(import_theme_id)
-      "theme_#{import_theme_id}"
-    end
-
-    def extract_theme_id(path)
-      path[/^theme_([0-9]+)\//, 1]
-    end
-
-    def importable_theme_fields(import_theme_id)
-      return {} unless theme && import_theme = Theme.find(import_theme_id)
-      @importable_theme_fields[import_theme_id] ||= begin
-        hash = {}
-        import_theme.theme_fields.where(target_id: Theme.targets[:extra_scss]).each do |field|
-          hash[field.name] = field.value
-        end
-        hash
-      end
-    end
-
-    def match_theme_import(path, parent_path)
-      # Only allow importing theme stylesheets from within stylesheets in the same theme
-      return false unless theme && import_theme_id = extract_theme_id(parent_path) # Could be a child theme
-      parent_dir, _ = File.split(parent_path)
-
-      # Could be relative to the importing file, or relative to the root of the theme directory
-      search_paths = [parent_dir, theme_dir(import_theme_id)].uniq
-      search_paths.each do |search_path|
-        resolved = Pathname.new("#{search_path}/#{path}").cleanpath.to_s # Remove unnecessary ./ and ../
-        next unless resolved.start_with?("#{theme_dir(import_theme_id)}/")
-        resolved_within_theme = resolved.sub(/^theme_[0-9]+\//, "")
-        if importable_theme_fields(import_theme_id).keys.include?(resolved_within_theme)
-          return resolved, importable_theme_fields(import_theme_id)[resolved_within_theme]
-        end
-      end
-      false
-    end
-
     def category_css(category)
       full_slug = category.full_slug.split("-")[0..-2].join("-")
       "body.category-#{full_slug} { background-image: url(#{upload_cdn_path(category.uploaded_background.url)}) }\n"
@@ -309,26 +226,5 @@ module Stylesheet
       contents
     end
 
-    def to_scss_variable(name, value)
-      escaped = SassC::Script::Value::String.quote(value, sass: true)
-      "$#{name}: unquote(#{escaped});\n"
-    end
-
-    def imports(asset, parent_path)
-      if asset[-1] == "*"
-        Dir["#{Stylesheet::Common::ASSET_ROOT}/#{asset}.scss"].map do |path|
-          Import.new(asset[0..-2] + File.basename(path, ".*"))
-        end
-      elsif callback = Importer.special_imports[asset]
-        instance_eval(&callback)
-      else
-        path, source = match_theme_import(asset, parent_path)
-        if path && source
-          Import.new(path, source: source)
-        else
-          Import.new(asset + ".scss")
-        end
-      end
-    end
   end
 end
diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb
index 56dd706863..91f449c06e 100644
--- a/lib/stylesheet/manager.rb
+++ b/lib/stylesheet/manager.rb
@@ -58,7 +58,9 @@ class Stylesheet::Manager
 
     theme_ids = [theme_ids] unless Array === theme_ids
     theme_ids = [theme_ids.first] unless target =~ THEME_REGEX
-    theme_ids = Theme.transform_ids(theme_ids, extend: false)
+    include_components = !!(target =~ THEME_REGEX)
+
+    theme_ids = Theme.transform_ids(theme_ids, extend: include_components)
 
     current_hostname = Discourse.current_hostname
 
@@ -81,6 +83,7 @@ class Stylesheet::Manager
           if is_theme && !has_theme
             next
           else
+            next if builder.theme&.component && !builder.theme&.has_scss(target)
             data[:theme_id] = builder.theme.id if has_theme && is_theme
             builder.compile unless File.exists?(builder.stylesheet_fullpath)
             href = builder.stylesheet_path(current_hostname)
@@ -205,7 +208,7 @@ class Stylesheet::Manager
 
     Discourse.plugins.map { |plugin| File.dirname(plugin.path) }.each do |path|
       globs << "#{path}/plugin.rb"
-      globs << "#{path}/**/*.*css"
+      globs << "#{path}/assets/stylesheets/**/*.*css"
     end
 
     globs.map do |pattern|
@@ -243,13 +246,15 @@ class Stylesheet::Manager
     end
 
     rtl = @target.to_s =~ /_rtl$/
-    css, source_map = begin
+    css, source_map = with_load_paths do |load_paths|
       Stylesheet::Compiler.compile_asset(
         @target,
          rtl: rtl,
          theme_id: theme&.id,
+         theme_variables: theme&.scss_variables.to_s,
          source_map_file: source_map_filename,
-         color_scheme_id: @color_scheme&.id
+         color_scheme_id: @color_scheme&.id,
+         load_paths: load_paths
       )
     rescue SassC::SyntaxError => e
       if Stylesheet::Importer::THEME_TARGETS.include?(@target.to_s)
@@ -368,6 +373,14 @@ class Stylesheet::Manager
     @theme == :nil ? nil : @theme
   end
 
+  def with_load_paths
+    if theme
+      theme.with_scss_load_paths { |p| yield p }
+    else
+      yield nil
+    end
+  end
+
   def theme_digest
     if [:mobile_theme, :desktop_theme].include?(@target)
       scss_digest = theme.resolve_baked_field(:common, :scss)
diff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rb
index 1b83891aff..a8bbda5f00 100644
--- a/lib/stylesheet/watcher.rb
+++ b/lib/stylesheet/watcher.rb
@@ -20,74 +20,75 @@ module Stylesheet
       return @default_paths if @default_paths
 
       @default_paths = ["app/assets/stylesheets"]
-      Discourse.plugins.each do |p|
-        @default_paths << File.dirname(p.path).sub(Rails.root.to_s, '').sub(/^\//, '')
+      Discourse.plugins.each do |plugin|
+        if plugin.path.to_s.include?(Rails.root.to_s)
+          @default_paths << File.dirname(plugin.path).sub(Rails.root.to_s, '').sub(/^\//, '')
+        else
+          # if plugin doesn’t seem to be in our app, consider it as outside of the app
+          # and ignore it
+          warn("[stylesheet watcher] Ignoring outside of rails root plugin: #{plugin.path.to_s}")
+        end
       end
       @default_paths
     end
 
     def start
-
       Thread.new do
         begin
           while true
             worker_loop
           end
         rescue => e
-          STDERR.puts "CSS change notifier crashed #{e}"
+          STDERR.puts "CSS change notifier crashed \n#{e}"
           start
         end
       end
 
-      root = Rails.root.to_s
-
-      listener_opts = { ignore: /xxxx/ }
+      listener_opts = { ignore: /xxxx/, only: /\.(css|scss)$/ }
       listener_opts[:force_polling] = true if ENV['FORCE_POLLING']
 
-      @paths.each do |watch|
-        Thread.new do
-          begin
-            plugins_paths = Dir.glob("#{Rails.root}/plugins/*").map do |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, _|
-              paths = [modified, added].flatten
-              paths.compact!
-              paths.map! do |long|
-                plugin_name = nil
-                plugins_paths.each do |plugin_path|
-                  if long.include?("#{plugin_path}/")
-                    plugin_name = File.basename(plugin_path)
-                    break
-                  end
-                end
-
-                target = nil
-                target_match = long.match(/admin|desktop|mobile|publish/)
-                if target_match&.length
-                  target = target_match[0]
-                end
-
-                {
-                  basename: File.basename(long),
-                  target: target,
-                  plugin_name: plugin_name
-                }
-              end
-
-              process_change(paths)
+      Thread.new do
+        begin
+          plugins_paths = Dir.glob("#{Rails.root}/plugins/*").map do |file|
+            if File.symlink?(file)
+              File.expand_path(File.readlink(file), "#{Rails.root}/plugins")
+            else
+              file
             end
-          rescue => e
-            STDERR.puts "Failed to listen for CSS changes at: #{watch}\n#{e}"
+          end.compact
+
+          listener = Listen.to(*@paths, listener_opts) do |modified, added, _|
+            paths = [modified, added].flatten
+            paths.compact!
+            paths.map! do |long|
+              plugin_name = nil
+              plugins_paths.each do |plugin_path|
+                if long.include?("#{plugin_path}/")
+                  plugin_name = File.basename(plugin_path)
+                  break
+                end
+              end
+
+              target = nil
+              target_match = long.match(/admin|desktop|mobile|publish/)
+              if target_match&.length
+                target = target_match[0]
+              end
+
+              {
+                basename: File.basename(long),
+                target: target,
+                plugin_name: plugin_name
+              }
+            end
+
+            process_change(paths)
           end
-          listener.start
-          sleep
+        rescue => e
+          STDERR.puts "Failed to listen for CSS changes: \n#{e}"
         end
+        listener.start
+        sleep
       end
     end
 
@@ -138,9 +139,7 @@ module Stylesheet
 
     def process_change(paths)
       paths.each do |path|
-        if path[:basename] =~ /\.(css|scss)$/
-          @queue.push path
-        end
+        @queue.push path
       end
     end
 
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 35cac57290..49343298d9 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -31,7 +31,6 @@ module SvgSprite
     "book",
     "book-reader",
     "bookmark",
-    "discourse-bookmark-clock",
     "briefcase",
     "calendar-alt",
     "caret-down",
@@ -58,14 +57,17 @@ module SvgSprite
     "crosshairs",
     "cube",
     "desktop",
+    "discourse-amazon",
     "discourse-bell-exclamation",
     "discourse-bell-one",
     "discourse-bell-slash",
+    "discourse-bookmark-clock",
     "discourse-compress",
     "discourse-expand",
     "download",
     "ellipsis-h",
     "ellipsis-v",
+    "emoji-icon",
     "envelope",
     "envelope-square",
     "exchange-alt",
@@ -84,6 +86,7 @@ module SvgSprite
     "fab-linux",
     "fab-twitter",
     "fab-twitter-square",
+    "fab-wikipedia-w",
     "fab-windows",
     "far-bell",
     "far-bell-slash",
@@ -94,6 +97,7 @@ module SvgSprite
     "far-clipboard",
     "far-clock",
     "far-comment",
+    "far-comments",
     "far-copyright",
     "far-dot-circle",
     "far-edit",
@@ -147,8 +151,10 @@ module SvgSprite
     "minus",
     "minus-circle",
     "mobile-alt",
+    "moon",
     "paint-brush",
     "paper-plane",
+    "pause",
     "pencil-alt",
     "play",
     "plug",
@@ -188,6 +194,8 @@ module SvgSprite
     "thumbtack",
     "times",
     "times-circle",
+    "toggle-off",
+    "toggle-on",
     "trash-alt",
     "tv",
     "undo",
diff --git a/lib/system_message.rb b/lib/system_message.rb
index 648eede923..d7f75541e9 100644
--- a/lib/system_message.rb
+++ b/lib/system_message.rb
@@ -18,15 +18,16 @@ class SystemMessage
   end
 
   def create(type, params = {})
+    from_system = params.delete(:from_system)
+    target_group_names = params.delete(:target_group_names)
+
     params = defaults.merge(params)
-    from_system = params[:from_system] || false
 
     title = params[:message_title] || I18n.with_locale(@recipient.effective_locale) { I18n.t("system_messages.#{type}.subject_template", params) }
     raw = params[:message_raw] || I18n.with_locale(@recipient.effective_locale) { I18n.t("system_messages.#{type}.text_body_template", params) }
 
     if from_system
       user = Discourse.system_user
-      target_group_names = nil
     else
       user = Discourse.site_contact_user
       target_group_names = Group.exists?(name: SiteSetting.site_contact_group_name) ? SiteSetting.site_contact_group_name : nil
@@ -39,7 +40,8 @@ class SystemMessage
                        target_usernames: @recipient.username,
                        target_group_names: target_group_names,
                        subtype: TopicSubtype.system_message,
-                       skip_validations: true)
+                       skip_validations: true,
+                       post_alert_options: params[:post_alert_options])
 
     post = I18n.with_locale(@recipient.effective_locale) { creator.create }
 
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 33436227da..5d9f28a263 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -97,8 +97,11 @@ def compress_node(from, to)
   source_map_url = cdn_path "/assets/#{to}.map"
   base_source_map = assets_path + assets_additional_path
 
+  # TODO: Remove uglifyjs when base image only includes terser
+  js_compressor = `which terser`.empty? ? 'uglifyjs' : 'terser'
+
   cmd = <<~EOS
-    uglifyjs '#{assets_path}/#{from}' -m -c -o '#{to_path}' --source-map "base='#{base_source_map}',root='#{source_map_root}',url='#{source_map_url}'"
+    #{js_compressor} '#{assets_path}/#{from}' -m -c -o '#{to_path}' --source-map "base='#{base_source_map}',root='#{source_map_root}',url='#{source_map_url}'"
   EOS
 
   STDERR.puts cmd
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index c3284acc70..51929b85f7 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -221,6 +221,10 @@ task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
   SeedFu.quiet = true
   SeedFu.seed(SeedHelper.paths, SeedHelper.filter)
 
+  if Rails.env.development?
+    Rake::Task['db:schema:cache:dump'].invoke
+  end
+
   if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
     SiteIconManager.ensure_optimized!
   end
@@ -295,6 +299,180 @@ task 'db:stats' => 'environment' do
   print_table(DB.query_hash(sql))
 end
 
+task 'db:ensure_post_migrations' do
+  if ['1', 'true'].include?(ENV['SKIP_POST_DEPLOYMENT_MIGRATIONS'])
+    cmd = `cat /proc/#{Process.pid}/cmdline | xargs -0 echo`
+    ENV["SKIP_POST_DEPLOYMENT_MIGRATIONS"] = "0"
+    exec cmd
+  end
+end
+
+class NormalizedIndex
+  attr_accessor :name, :original, :normalized, :table
+
+  def initialize(original)
+    @original = original
+    @normalized = original.sub(/(create.*index )(\S+)(.*)/i, '\1idx\3')
+    @name = original.match(/create.*index (\S+)/i)[1]
+    @table = original.match(/create.*index \S+ on public\.(\S+)/i)[1]
+  end
+
+  def ==(other)
+    other&.normalized == normalized
+  end
+end
+
+def normalize_index_names(names)
+  names.map do |name|
+    NormalizedIndex.new(name)
+  end.reject { |i| i.name.include?("ccnew") }
+end
+
+desc 'Validate indexes'
+task 'db:validate_indexes', [:arg] => ['db:ensure_post_migrations', 'environment'] do |_, args|
+
+  db = TemporaryDb.new
+  db.start
+  db.migrate
+
+  ActiveRecord::Base.establish_connection(
+    adapter: 'postgresql',
+    database: 'discourse',
+    port: db.pg_port,
+    host: 'localhost'
+  )
+
+  expected = DB.query_single <<~SQL
+    SELECT indexdef FROM pg_indexes
+    WHERE schemaname = 'public'
+    ORDER BY indexdef
+  SQL
+
+  expected_tables = DB.query_single <<~SQL
+    SELECT tablename
+    FROM pg_tables
+    WHERE schemaname = 'public'
+  SQL
+
+  ActiveRecord::Base.establish_connection
+
+  db.stop
+
+  puts
+
+  fix_indexes = (ENV["FIX_INDEXES"] == "1" || args[:arg] == "fix")
+  inconsistency_found = false
+
+  RailsMultisite::ConnectionManagement.each_connection do |db_name|
+
+    puts "Testing indexes on the #{db_name} database", ""
+
+    current = DB.query_single <<~SQL
+      SELECT indexdef FROM pg_indexes
+      WHERE schemaname = 'public'
+      ORDER BY indexdef
+    SQL
+
+    missing = expected - current
+    extra = current - expected
+
+    extra.reject! { |x| x =~ /idx_recent_regular_post_search_data/ }
+
+    renames = []
+    normalized_missing = normalize_index_names(missing)
+    normalized_extra = normalize_index_names(extra)
+
+    normalized_extra.each do |extra_index|
+      if missing_index = normalized_missing.select { |x| x == extra_index }.first
+        renames << [extra_index, missing_index]
+        missing.delete missing_index.original
+        extra.delete extra_index.original
+      end
+    end
+
+    if db_name != "default" && renames.length == 0 && missing.length == 0 && extra.length == 0
+      next
+    end
+
+    if renames.length > 0
+      inconsistency_found = true
+
+      puts "Renamed indexes"
+      renames.each do |extra_index, missing_index|
+        puts "#{extra_index.name} should be renamed to #{missing_index.name}"
+      end
+      puts
+
+      if fix_indexes
+        puts "fixing indexes"
+
+        renames.each do |extra_index, missing_index|
+          DB.exec "ALTER INDEX #{extra_index.name} RENAME TO #{missing_index.name}"
+        end
+
+        puts
+      end
+    end
+
+    if missing.length > 0
+      inconsistency_found = true
+
+      puts "Missing Indexes", ""
+      missing.each do |m|
+        puts m
+      end
+      if fix_indexes
+        puts "Adding missing indexes..."
+        missing.each do |m|
+          begin
+            DB.exec(m)
+          rescue => e
+            $stderr.puts "Error running: #{m} - #{e}"
+          end
+        end
+      end
+    else
+      puts "No missing indexes", ""
+    end
+
+    if extra.length > 0
+      inconsistency_found = true
+
+      puts "", "Extra Indexes", ""
+      extra.each do |e|
+        puts e
+      end
+
+      if fix_indexes
+        puts "Removing extra indexes"
+        extra.each do |statement|
+          if match = /create .*index (\S+) on public\.(\S+)/i.match(statement)
+            index_name, table_name = match[1], match[2]
+            if expected_tables.include?(table_name)
+              puts "Dropping #{index_name}"
+              begin
+                DB.exec("DROP INDEX #{index_name}")
+              rescue => e
+                $stderr.puts "Error dropping index #{index_name} - #{e}"
+              end
+            else
+              $stderr.puts "Skipping #{index_name} since #{table_name} should not exist - maybe an old plugin created it"
+            end
+          else
+            $stderr.puts "ERROR - BAD REGEX - UNABLE TO PARSE INDEX - #{statement}"
+          end
+        end
+      end
+    else
+      puts "No extra indexes", ""
+    end
+  end
+
+  if inconsistency_found && !fix_indexes
+    exit 1
+  end
+end
+
 desc 'Rebuild indexes'
 task 'db:rebuild_indexes' => 'environment' do
   if Import::backup_tables_count > 0
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index a09a41e221..0e6bd41592 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -18,6 +18,7 @@
 # => PAUSE_ON_TERMINATE        set to 1 to pause prior to terminating redis and pg
 # => JS_TIMEOUT                set timeout for qunit tests in ms
 # => WARMUP_TMP_FOLDER runs a single spec to warmup the tmp folder and obtain accurate results when profiling specs.
+# => EMBER_CLI                 set to 1 to run JS tests using the Ember CLI
 #
 # Other useful environment variables (not specific to this rake task)
 # => COMMIT_HASH    used by the discourse_test docker image to load a specific commit of discourse
@@ -229,6 +230,14 @@ task 'docker:test' do
             @good &&= run_or_fail("bundle exec rake plugin:qunit['*','#{js_timeout}']")
           end
         end
+
+        if ENV["EMBER_CLI"]
+          Dir.chdir("#{Rails.root}/app/assets/javascripts/discourse") do # rubocop:disable Discourse/NoChdir
+            @good &&= run_or_fail("yarn install")
+            @good &&= run_or_fail("yarn ember test")
+          end
+        end
+
         puts "travis_fold:end:js_tests" if ENV["TRAVIS"]
       end
     end
diff --git a/lib/tasks/emails.rake b/lib/tasks/emails.rake
index 45194afbfd..1ea427a21a 100644
--- a/lib/tasks/emails.rake
+++ b/lib/tasks/emails.rake
@@ -78,7 +78,17 @@ task 'emails:test', [:email] => [:environment] do |_, args|
       STR
     end
 
-    puts "Testing sending to #{email} using #{smtp[:address]}:#{smtp[:port]}."
+    puts "Testing sending to #{email} using #{smtp[:address]}:#{smtp[:port]}, username:#{smtp[:user_name]} with #{smtp[:authentication]} auth."
+
+    # TODO (martin, post-2.7 release) Change to use EmailSettingsValidator
+    # EmailSettingsValidator.validate_smtp(
+    #   host: smtp[:address],
+    #   port: smtp[:port],
+    #   domain: smtp[:domain] || 'localhost',
+    #   username: smtp[:user_name],
+    #   password: smtp[:password],
+    #   authentication: smtp[:authentication] || 'plain'
+    # )
 
     # We would like to do this, but Net::SMTP errors out using starttls
     #Net::SMTP.start(smtp[:address], smtp[:port]) do |s|
@@ -86,7 +96,8 @@ task 'emails:test', [:email] => [:environment] do |_, args|
     #  s.auth_login(smtp[:user_name], smtp[:password])
     #end
 
-    Net::SMTP.start(smtp[:address], smtp[:port], 'localhost', smtp[:user_name], smtp[:password], smtp[:authentication])
+    Net::SMTP.start(smtp[:address], smtp[:port], smtp[:domain] || 'localhost',  smtp[:user_name], smtp[:password], smtp[:authentication])
+
   rescue Exception => e
 
     if e.to_s.match(/execution expired/)
@@ -169,8 +180,9 @@ task 'emails:test', [:email] => [:environment] do |_, args|
   begin
     puts "Sending to #{email}. . . "
     Email::Sender.new(TestMailer.send_test(email), :test_message).send
-  rescue
+  rescue => error
     puts "Sending mail failed."
+    puts error.message
   else
     puts <<~STR
       Mail accepted by SMTP server.
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index ace173d55c..4cf1372256 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -262,7 +262,6 @@ DEFAULT_SET ||= "twitter"
 # Replace the platform by another when downloading the image (accepts names or categories)
 EMOJI_IMAGES_PATCH ||= {
   "apple" => { "snowboarder" => "twitter" },
-  "emoji_one" => { "country-flag" => "twitter" },
   "windows" => { "country-flag" => "twitter" }
 }
 
@@ -272,7 +271,6 @@ EMOJI_SETS ||= {
   "google_blob" => "google_classic",
   "facebook" => "facebook_messenger",
   "twitter" => "twitter",
-  "emoji_one" => "emoji_one",
   "windows" => "win10",
 }
 
@@ -537,7 +535,7 @@ class TestEmojiUpdate < MiniTest::Test
     assert_equal File.size(original_image), File.size(alias_image)
 
     original_image = image_path("twitter", "macau")
-    alias_image = image_path("emoji_one", "macau")
+    alias_image = image_path("win10", "macau")
     assert_equal File.size(original_image), File.size(alias_image)
   end
 end
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index b241bfcd00..2ab50b57f3 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -70,12 +70,19 @@ def dependencies
       source: 'ace-builds/src-min-noconflict/ace.js',
       destination: 'ace.js',
       public: true
+    }, {
+      source: '@json-editor/json-editor/dist/jsoneditor.js',
+      package_name: '@json-editor/json-editor',
+      public: true
     }, {
       source: 'chart.js/dist/Chart.min.js',
       public: true
     }, {
       source: 'chartjs-plugin-datalabels/dist/chartjs-plugin-datalabels.min.js',
       public: true
+    }, {
+      source: 'diffhtml/dist/diffhtml.min.js',
+      public: true
     }, {
       source: 'magnific-popup/dist/jquery.magnific-popup.min.js',
       public: true
@@ -94,10 +101,8 @@ def dependencies
     }, {
       source: 'handlebars/dist/handlebars.runtime.js'
     }, {
-      source: 'highlight.js/build/.',
+      source: '@highlightjs/cdn-assets/.',
       destination: 'highlightjs'
-    }, {
-      source: 'jquery-resize/jquery.ba-resize.js'
     }, {
       source: 'jquery.autoellipsis/src/jquery.autoellipsis.js',
       destination: 'jquery.autoellipsis-1.0.10.js'
@@ -163,6 +168,11 @@ def dependencies
       destination: 'workbox',
       public: true,
       skip_versioning: true
+    }, {
+      source: 'workbox-cacheable-response/build/.',
+      destination: 'workbox',
+      skip_versioning: true,
+      public: true
     }, {
       source: '@popperjs/core/dist/umd/popper.js'
     }, {
@@ -175,12 +185,21 @@ def dependencies
       source: 'route-recognizer/dist/route-recognizer.js.map',
       public_root: true
     },
+    {
+      source: 'qunit/qunit/qunit.js'
+    },
+    {
+      source: 'pretender/pretender.js'
+    },
+    {
+      source: 'sinon/pkg/sinon.js'
+    },
 
   ]
 end
 
 def node_package_name(f)
-  f[:source].split('/').first
+  f[:package_name] || f[:source].split('/').first
 end
 
 def public_path_name(f)
@@ -255,16 +274,9 @@ task 'javascript:update' => 'clean_up' do
       filename = f[:destination]
     end
 
-    # Highlight.js needs building
-    if src.include? "highlight.js"
-      puts "Install Highlight.js dependencies"
-      system("cd node_modules/highlight.js && yarn install")
-
-      puts "Build Highlight.js"
-      system("cd node_modules/highlight.js && node tools/build.js -t cdn")
-
-      puts "Cleanup unused styles folder"
-      system("rm -rf node_modules/highlight.js/build/styles")
+    if src.include? "highlightjs"
+      puts "Cleanup highlightjs styles and install smaller test bundle"
+      system("rm -rf node_modules/@highlightjs/cdn-assets/styles")
 
       # We don't need every language for tests
       langs = ['javascript', 'sql', 'ruby']
@@ -316,6 +328,16 @@ task 'javascript:update' => 'clean_up' do
     else
       FileUtils.cp_r(src, dest)
     end
+
+    # use absolute path for popper.js's sourcemap
+    # avoids noisy console warnings in dev environment for non-homepage paths
+    if dest.end_with? "popper.js"
+      File.open(dest) do |file|
+        contents = file.read
+        contents.gsub!("sourceMappingURL=popper", "sourceMappingURL=/popper")
+        File.open(dest, "w+") { |d| d.write(contents) }
+      end
+    end
   end
 
   write_template("discourse/app/lib/public-js-versions.js", "update", <<~JS)
diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake
index 57f659a82f..be293fd183 100644
--- a/lib/tasks/plugin.rake
+++ b/lib/tasks/plugin.rake
@@ -84,8 +84,27 @@ task 'plugin:update', :plugin do |t, args|
     end
   end
 
-  update_status = system('git --git-dir "' + plugin_path + '/.git" --work-tree "' + plugin_path + '" pull')
-  abort('Unable to pull latest version of plugin') unless update_status
+  `git -C '#{plugin_path}' fetch origin --tags --force`
+
+  upstream_branch = `git -C '#{plugin_path}' for-each-ref --format='%(upstream:short)' $(git -C '#{plugin_path}' symbolic-ref -q HEAD)`.strip
+  has_origin_main = `git -C '#{plugin_path}' branch -a`.match?(/remotes\/origin\/main$/)
+  has_local_main = `git -C '#{plugin_path}' show-ref refs/heads/main`.present?
+
+  if upstream_branch == "origin/master" && has_origin_main
+    puts "Branch has changed to `origin/main`"
+
+    if has_local_main
+      update_status = system("git -C '#{plugin_path}' checkout main")
+      abort("Unable to pull latest version of plugin #{plugin_path}") unless update_status
+    else
+      `git -C '#{plugin_path}' branch -m master main`
+    end
+
+    `git -C '#{plugin_path}' branch -u origin/main main`
+  end
+
+  update_status = system("git -C '#{plugin_path}' pull")
+  abort("Unable to pull latest version of plugin #{plugin_path}") unless update_status
 end
 
 desc 'pull compatible plugin versions for all plugins'
diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake
index 235a317b68..733d275ce7 100644
--- a/lib/tasks/qunit.rake
+++ b/lib/tasks/qunit.rake
@@ -26,7 +26,7 @@ task "qunit:test", [:timeout, :qunit_path] do |_, args|
 
   report_requests = ENV['REPORT_REQUESTS'] == "1"
 
-  system("yarn install --dev")
+  system("yarn install")
 
   # ensure we have this port available
   def port_available?(port)
@@ -45,13 +45,14 @@ task "qunit:test", [:timeout, :qunit_path] do |_, args|
 
   pid = Process.spawn(
     {
-      "RAILS_ENV" => "test",
+      "RAILS_ENV" => ENV["QUNIT_RAILS_ENV"] || "test",
       "SKIP_ENFORCE_HOSTNAME" => "1",
       "UNICORN_PID_PATH" => "#{Rails.root}/tmp/pids/unicorn_test_#{port}.pid", # So this can run alongside development
       "UNICORN_PORT" => port.to_s,
       "UNICORN_SIDEKIQS" => "0"
     },
-    "#{Rails.root}/bin/unicorn -c config/unicorn.conf.rb"
+    "#{Rails.root}/bin/unicorn -c config/unicorn.conf.rb",
+    pgroup: true
   )
 
   begin
@@ -61,7 +62,7 @@ task "qunit:test", [:timeout, :qunit_path] do |_, args|
     cmd = "node #{test_path}/run-qunit.js http://localhost:#{port}#{qunit_path}"
     options = { seed: (ENV["QUNIT_SEED"] || Random.new.seed), hidepassed: 1 }
 
-    %w{module filter qunit_skip_core qunit_single_plugin}.each do |arg|
+    %w{module filter qunit_skip_core qunit_single_plugin theme_name theme_url theme_id}.each do |arg|
       options[arg] = ENV[arg.upcase] if ENV[arg.upcase].present?
     end
 
@@ -108,7 +109,8 @@ task "qunit:test", [:timeout, :qunit_path] do |_, args|
 
   ensure
     # was having issues with HUP
-    Process.kill "KILL", pid
+    Process.kill "-KILL", pid
+    FileUtils.rm("#{Rails.root}/tmp/pids/unicorn_test_#{port}.pid")
   end
 
   if success
diff --git a/lib/tasks/release_note.rake b/lib/tasks/release_note.rake
index 83220c5201..6ceb7121d8 100644
--- a/lib/tasks/release_note.rake
+++ b/lib/tasks/release_note.rake
@@ -10,6 +10,7 @@ task "release_note:generate", :from, :to do |t, args|
   ux_changes = Set.new
   sec_changes = Set.new
   perf_changes = Set.new
+  a11y_changes = Set.new
 
   `git log --pretty="tformat:%s" #{from}..#{to}`.each_line do |comment|
     next if comment =~ /^\s*Revert/
@@ -24,6 +25,8 @@ task "release_note:generate", :from, :to do |t, args|
         sec_changes << better(line)
       elsif line =~ /^PERF:/
         perf_changes << better(line)
+      elsif line =~ /^A11Y:/
+        a11y_changes << better(line)
       end
     end
   end
@@ -33,6 +36,7 @@ task "release_note:generate", :from, :to do |t, args|
   print_changes("UX CHANGES", ux_changes)
   print_changes("SECURITY CHANGES", sec_changes)
   print_changes("PERFORMANCE", perf_changes)
+  print_changes("ACCESSIBILITY", a11y_changes)
 end
 
 def print_changes(heading, changes)
@@ -46,6 +50,7 @@ end
 def better(line)
   line = remove_prefix(line)
   line = escape_brackets(line)
+  line = remove_pull_request(line)
   line[0] = '\#' if line[0] == '#'
   if line[0]
     line[0] = line[0].capitalize
@@ -56,7 +61,7 @@ def better(line)
 end
 
 def remove_prefix(line)
-  line.gsub(/^(FIX|FEATURE|UX|SECURITY|PERF):/, "").strip
+  line.gsub(/^(FIX|FEATURE|UX|SECURITY|PERF|A11Y):/, "").strip
 end
 
 def escape_brackets(line)
@@ -66,9 +71,13 @@ def escape_brackets(line)
     .gsub("]", "]`")
 end
 
+def remove_pull_request(line)
+  line.gsub(/ \(\#\d+\)$/, "")
+end
+
 def split_comments(text)
   text = normalize_terms(text)
-  terms = ["FIX:", "FEATURE:", "UX:", "SECURITY:" , "PERF:"]
+  terms = ["FIX:", "FEATURE:", "UX:", "SECURITY:" , "PERF:" , "A11Y:"]
   terms.each do |term|
     text = text.gsub(/(#{term})+/i, term)
     text = newlines_at_term(text, term)
@@ -79,9 +88,10 @@ end
 def normalize_terms(text)
   text = text.gsub(/(BUGFIX|FIX|BUG):/i, "FIX:")
   text = text.gsub(/FEATURE:/i, "FEATURE:")
-  text = text.gsub(/UX:/i, "UX:")
+  text = text.gsub(/(UX|UI):/i, "UX:")
   text = text.gsub(/(SECURITY):/i, "SECURITY:")
   text = text.gsub(/(PERF):/i, "PERF:")
+  text = text.gsub(/(A11Y):/i, "A11Y:")
 end
 
 def newlines_at_term(text, term)
diff --git a/lib/tasks/smoke_test.rake b/lib/tasks/smoke_test.rake
index fd7c70529c..d3cab6a08c 100644
--- a/lib/tasks/smoke_test.rake
+++ b/lib/tasks/smoke_test.rake
@@ -16,7 +16,7 @@ task "smoke:test" do
     abort "Chrome 59 or higher is required to run tests in headless mode."
   end
 
-  system("yarn install --dev")
+  system("yarn install")
 
   url = ENV["URL"]
   if !url
diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake
index 0d52090e99..2de8b30a5a 100644
--- a/lib/tasks/themes.rake
+++ b/lib/tasks/themes.rake
@@ -45,6 +45,7 @@ task "themes:install" => :environment do |task, args|
   puts " Installed: #{counts[:installed]}"
   puts " Updated:   #{counts[:updated]}"
   puts " Errors:    #{counts[:errors]}"
+  puts " Skipped:   #{counts[:skipped]}"
 
   if counts[:errors] > 0
     exit 1
@@ -53,16 +54,22 @@ end
 
 desc "Update themes & theme components"
 task "themes:update" => :environment do |task, args|
-  Theme.where(auto_update: true).find_each do |theme|
+  Theme.where(auto_update: true, enabled: true).find_each do |theme|
     begin
       if theme.remote_theme.present?
         puts "Updating #{theme.name}..."
         theme.remote_theme.update_from_remote
+        theme.save!
+        unless theme.remote_theme.last_error_text.nil?
+          puts "Error updating #{theme.name}: #{theme.remote_theme.last_error_text}"
+          exit 1
+        end
       end
     rescue => e
       STDERR.puts "Failed to update #{theme.name}"
       STDERR.puts e
       STDERR.puts e.backtrace
+      exit 1
     end
   end
 end
@@ -90,3 +97,61 @@ task "themes:audit" => :environment do
     puts repo
   end
 end
+
+desc "Run QUnit tests of a theme/component"
+task "themes:qunit", :type, :value do |t, args|
+  type = args[:type]
+  value = args[:value]
+  if !%w(name url id).include?(type) || value.blank?
+    raise <<~MSG
+      Wrong arguments type:#{type.inspect}, value:#{value.inspect}"
+      Usage:
+        `bundle exec rake themes:unit[url,<theme_url>]`
+        OR
+        `bundle exec rake themes:unit[name,<theme_name>]`
+        OR
+        `bundle exec rake themes:unit[id,<theme_id>]`
+    MSG
+  end
+  ENV["THEME_#{type.upcase}"] = value.to_s
+  Rake::Task["qunit:test"].reenable
+  Rake::Task["qunit:test"].invoke(1200000, "/theme-qunit")
+end
+
+desc "Install a theme/component on a temporary DB and run QUnit tests"
+task "themes:install_and_test" => :environment do |t, args|
+  db = TemporaryDb.new
+  db.start
+  db.migrate
+  ActiveRecord::Base.establish_connection(
+    adapter: 'postgresql',
+    database: 'discourse',
+    port: db.pg_port,
+    host: 'localhost'
+  )
+
+  seeded_themes = Theme.pluck(:id)
+  Rake::Task["themes:install"].invoke
+  themes = Theme.pluck(:name, :id)
+
+  ENV["PGPORT"] = db.pg_port.to_s
+  ENV["PGHOST"] = "localhost"
+  ENV["QUNIT_RAILS_ENV"] = "development"
+  ENV["DISCOURSE_DEV_DB"] = "discourse"
+
+  count = 0
+  themes.each do |(name, id)|
+    if seeded_themes.include?(id)
+      puts "Skipping seeded theme #{name} (id: #{id})"
+      next
+    end
+    puts "Running tests for theme #{name} (id: #{id})..."
+    Rake::Task["themes:qunit"].reenable
+    Rake::Task["themes:qunit"].invoke("id", id)
+    count += 1
+  end
+  raise "Error: No themes were installed" if count == 0
+ensure
+  db&.stop
+  db&.remove
+end
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 431563b0a2..8d183a58a5 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -85,136 +85,14 @@ task "uploads:backfill_shas" => :environment do
   puts "", "Done"
 end
 
-################################################################################
-#                               migrate_from_s3                                #
-################################################################################
-
-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}")
-    f = uri.open("rb", read_timeout: 5, redirect: true, allow_redirections: :all)
-    filename = if f.meta && f.meta["content-disposition"]
-      f.meta["content-disposition"][/filename="([^"]+)"/, 1].presence
-    end
-    filename ||= raw[/<a class="attachment" href="(?:https?:)?#{Regexp.escape(url)}">([^<]+)<\/a>/, 1].presence
-    filename ||= File.basename(url)
-    filename
-  rescue
-    nil
-  ensure
-    f.try(:close!) rescue nil
-  end
-end
-
-def migrate_all_from_s3(limit: nil)
-  RailsMultisite::ConnectionManagement.each_connection { migrate_from_s3(limit: limit) }
-end
-
-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."
-    exit 1
-  end
-
-  db = RailsMultisite::ConnectionManagement.current_db
-
-  puts "Migrating uploads from S3 to local storage for '#{db}'..."
-
-  max_file_size = [SiteSetting.max_image_size_kb, SiteSetting.max_attachment_size_kb].max.kilobytes
-
-  migrate_posts = Post
-    .where("user_id > 0")
-    .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
-
-      post.raw.gsub!(/(\/\/[\w.-]+amazonaws\.com\/(original|optimized)\/([a-z0-9]+\/)+\h{40}([\w.-]+)?)/i) do |url|
-        begin
-          if filename = guess_filename(url, post.raw)
-            file = FileHelper.download("http:#{url}", max_file_size: max_file_size, tmp_file_name: "from_s3", follow_redirect: true)
-            sha1 = Upload.generate_digest(file)
-            origin = nil
-
-            existing_upload = Upload.find_by(sha1: sha1)
-            if existing_upload&.url&.start_with?("//")
-              filename = existing_upload.original_filename
-              origin = existing_upload.origin
-              existing_upload.destroy
-            end
-
-            new_upload = UploadCreator.new(file, filename, origin: origin).create_for(post.user_id || -1)
-            if new_upload&.save
-              updated = true
-              url = new_upload.url
-            end
-          end
-
-          url
-        rescue
-          url
-        end
-      end
-
-      post.raw.gsub!(/(upload:\/\/[0-9a-zA-Z]+\.\w+)/) do |url|
-        begin
-          if sha1 = Upload.sha1_from_short_url(url)
-            if upload = Upload.find_by(sha1: sha1)
-              if upload.url.start_with?("//")
-                file = FileHelper.download("http:#{upload.url}", max_file_size: max_file_size, tmp_file_name: "from_s3", follow_redirect: true)
-                filename = upload.original_filename
-                origin = upload.origin
-                upload.destroy
-
-                new_upload = UploadCreator.new(file, filename, origin: origin).create_for(post.user_id || -1)
-                if new_upload&.save
-                  updated = true
-                  url = new_upload.url
-                end
-              end
-            end
-          end
-
-          url
-        rescue
-          url
-        end
-      end
-
-      if updated
-        post.save!
-        post.rebake!
-        putc "#"
-      else
-        putc "."
-      end
-
-    rescue
-      putc "X"
-    end
-  end
-
-  puts "Done!"
-end
-
 ################################################################################
 #                                migrate_to_s3                                 #
 ################################################################################
 
 task "uploads:migrate_to_s3" => :environment do
+  STDOUT.puts("Please note that migrating to S3 is currently not reversible! \n[CTRL+c] to cancel, [ENTER] to continue")
+  STDIN.gets
+
   ENV["RAILS_DB"] ? migrate_to_s3 : migrate_to_s3_all_sites
 end
 
@@ -772,7 +650,11 @@ 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)
+  uploads_to_update.update_all(
+    secure: true,
+    security_last_changed_at: Time.zone.now,
+    security_last_changed_reason: "upload security rake task all secure login required"
+  )
   puts "Finished marking upload(s) as secure."
 end
 
@@ -787,11 +669,19 @@ end
 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)
+    Upload.where(id: upload_ids_to_mark_as_secure).update_all(
+      secure: true,
+      security_last_changed_at: Time.zone.now,
+      security_last_changed_reason: "upload security rake task mark as secure"
+    )
   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)
+    Upload.where(id: upload_ids_to_mark_as_not_secure).update_all(
+      secure: false,
+      security_last_changed_at: Time.zone.now,
+      security_last_changed_reason: "upload security rake task mark as not secure"
+    )
   end
   puts "Finished updating upload security."
 end
@@ -1133,7 +1023,7 @@ def fix_missing_s3
       fix_error = nil
       Upload.transaction do
         begin
-          upload.update!(sha1: SecureRandom.hex)
+          upload.update_column(:sha1, SecureRandom.hex)
           fixed_upload = UploadCreator.new(tempfile, "temp.#{upload.extension}").create_for(Discourse.system_user.id)
         rescue => fix_error
           # invalid extension is the most common issue
diff --git a/lib/temporary_db.rb b/lib/temporary_db.rb
new file mode 100644
index 0000000000..97300a1dbb
--- /dev/null
+++ b/lib/temporary_db.rb
@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+class TemporaryDb
+  PG_TEMP_PATH = "/tmp/pg_schema_tmp"
+  PG_CONF = "#{PG_TEMP_PATH}/postgresql.conf"
+  PG_SOCK_PATH = "#{PG_TEMP_PATH}/sockets"
+
+  def port_available?(port)
+    TCPServer.open(port).close
+    true
+  rescue Errno::EADDRINUSE
+    false
+  end
+
+  def pg_bin_path
+    return @pg_bin_path if @pg_bin_path
+
+    ["13", "12", "11", "10"].each do |v|
+      bin_path = "/usr/lib/postgresql/#{v}/bin"
+      if File.exist?("#{bin_path}/pg_ctl")
+        @pg_bin_path = bin_path
+        break
+      end
+    end
+    if !@pg_bin_path
+      bin_path = "/Applications/Postgres.app/Contents/Versions/latest/bin"
+      if File.exists?("#{bin_path}/pg_ctl")
+        @pg_bin_path = bin_path
+      end
+    end
+    if !@pg_bin_path
+      puts "Can not find postgres bin path"
+      exit 1
+    end
+    @pg_bin_path
+  end
+
+  def initdb_path
+    return @initdb_path if @initdb_path
+
+    @initdb_path = `which initdb 2> /dev/null`.strip
+    if @initdb_path.length == 0
+      @initdb_path = "#{pg_bin_path}/initdb"
+    end
+
+    @initdb_path
+  end
+
+  def find_free_port(range)
+    range.each do |port|
+      return port if port_available?(port)
+    end
+  end
+
+  def pg_port
+    @pg_port ||= find_free_port(11000..11900)
+  end
+
+  def pg_ctl_path
+    return @pg_ctl_path if @pg_ctl_path
+
+    @pg_ctl_path = `which pg_ctl 2> /dev/null`.strip
+    if @pg_ctl_path.length == 0
+      @pg_ctl_path = "#{pg_bin_path}/pg_ctl"
+    end
+
+    @pg_ctl_path
+  end
+
+  def start
+    FileUtils.rm_rf PG_TEMP_PATH
+    `#{initdb_path} -D '#{PG_TEMP_PATH}' --auth-host=trust --locale=en_US.UTF-8 -E UTF8 2> /dev/null`
+
+    FileUtils.mkdir PG_SOCK_PATH
+    conf = File.read(PG_CONF)
+    File.write(PG_CONF, conf + "\nport = #{pg_port}\nunix_socket_directories = '#{PG_SOCK_PATH}'")
+
+    puts "Starting postgres on port: #{pg_port}"
+    ENV['DISCOURSE_PG_PORT'] = pg_port.to_s
+
+    Thread.new do
+      `#{pg_ctl_path} -D '#{PG_TEMP_PATH}' start`
+    end
+
+    puts "Waiting for PG server to start..."
+    while !`#{pg_ctl_path} -D '#{PG_TEMP_PATH}' status`.include?('server is running')
+      sleep 0.1
+    end
+    @started = true
+
+    `createuser -h localhost -p #{pg_port} -s -D -w discourse 2> /dev/null`
+    `createdb -h localhost -p #{pg_port} discourse`
+
+    puts "PG server is ready and DB is loaded"
+  end
+
+  def stop
+    @started = false
+    `#{pg_ctl_path} -D '#{PG_TEMP_PATH}' stop`
+  end
+
+  def remove
+    raise "Error: the database must be stopped before it can be removed" if @started
+    FileUtils.rm_rf PG_TEMP_PATH
+  end
+
+  def migrate
+    if !@started
+      raise "Error: the database must be started before it can be migrated."
+    end
+    ActiveRecord::Base.establish_connection(
+      adapter: 'postgresql',
+      database: 'discourse',
+      port: pg_port,
+      host: 'localhost'
+    )
+
+    puts "Running migrations on blank database!"
+
+    old_stdout = $stdout.clone
+    old_stderr = $stderr.clone
+    $stdout.reopen(File.new('/dev/null', 'w'))
+    $stderr.reopen(File.new('/dev/null', 'w'))
+
+    SeedFu.quiet = true
+    Rake::Task["db:migrate"].invoke
+  ensure
+    $stdout.reopen(old_stdout) if old_stdout
+    $stderr.reopen(old_stderr) if old_stderr
+  end
+end
diff --git a/lib/text_sentinel.rb b/lib/text_sentinel.rb
index 72053574fb..f720e1b503 100644
--- a/lib/text_sentinel.rb
+++ b/lib/text_sentinel.rb
@@ -68,7 +68,9 @@ class TextSentinel
   def seems_unpretentious?
     return true if skipped_locale.include?(SiteSetting.default_locale)
     # Don't allow super long words if there is a word length maximum
-    @opts[:max_word_length].blank? || @text.split(/\s|\/|-|\.|:/).map(&:size).max <= @opts[:max_word_length]
+
+    @opts[:max_word_length].blank? ||
+    (@text.split(/\s|\/|-|\.|:/).map(&:size).max || 0) <= @opts[:max_word_length]
   end
 
   def seems_quiet?
diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index 17bebf1b22..62e082c747 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -162,10 +162,8 @@ class ThemeJavascriptCompiler
   def prepend_settings(settings_hash)
     @content.prepend <<~JS
       (function() {
-        if ('Discourse' in window && Discourse.__container__) {
-          Discourse.__container__
-            .lookup("service:theme-settings")
-            .registerSettings(#{@theme_id}, #{settings_hash.to_json});
+        if ('require' in window) {
+          require("discourse/lib/theme-settings-store").registerSettings(#{@theme_id}, #{settings_hash.to_json});
         }
       })();
     JS
@@ -173,8 +171,14 @@ class ThemeJavascriptCompiler
 
   # TODO Error handling for handlebars templates
   def append_ember_template(name, hbs_template)
+    if !name.start_with?("javascripts/")
+      prefix = "javascripts"
+      prefix += "/" if !name.start_with?("/")
+      name = prefix + name
+    end
     name = name.inspect
     compiled = EmberTemplatePrecompiler.new(@theme_id).compile(hbs_template)
+    # the `'Ember' in window` check is needed for no_ember pages
     content << <<~JS
       (function() {
         if ('Ember' in window) {
@@ -204,18 +208,19 @@ class ThemeJavascriptCompiler
     raise CompileError.new e.instance_variable_get(:@error) # e.message contains the entire template, which could be very long
   end
 
-  def append_plugin_script(script, api_version)
-    @content << transpile(script, api_version)
-  end
-
   def append_raw_script(script)
     @content << script + "\n"
   end
 
   def append_module(script, name, include_variables: true)
-    script = "#{theme_variables}#{script}" if include_variables
+    name = "discourse/theme-#{@theme_id}/#{name.gsub(/^discourse\//, '')}"
+    script = "#{theme_settings}#{script}" if include_variables
     transpiler = DiscourseJsProcessor::Transpiler.new
-    @content << transpiler.perform(script, "", name)
+    @content << <<~JS
+      if ('define' in window) {
+      #{transpiler.perform(script, "", name).strip}
+      }
+    JS
   rescue MiniRacer::RuntimeError => ex
     raise CompileError.new ex.message
   end
@@ -226,36 +231,11 @@ class ThemeJavascriptCompiler
 
   private
 
-  def theme_variables
+  def theme_settings
     <<~JS
-      const __theme_name__ = "#{@theme_name.gsub('"', "\\\"")}";
-      const settings = Discourse.__container__
-        .lookup("service:theme-settings")
+      const settings = require("discourse/lib/theme-settings-store")
         .getObjectForTheme(#{@theme_id});
       const themePrefix = (key) => `theme_translations.#{@theme_id}.${key}`;
     JS
   end
-
-  def transpile(es6_source, version)
-    transpiler = DiscourseJsProcessor::Transpiler.new(skip_module: true)
-    wrapped = <<~PLUGIN_API_JS
-      (function() {
-        if ('Discourse' in window && typeof Discourse._registerPluginCode === 'function') {
-          #{theme_variables}
-          Discourse._registerPluginCode('#{version}', api => {
-            try {
-            #{es6_source}
-            } catch(err) {
-              const rescue = require("discourse/lib/utilities").rescueThemeError;
-              rescue(__theme_name__, err, api);
-            }
-          });
-        }
-      })();
-    PLUGIN_API_JS
-
-    transpiler.perform(wrapped)
-  rescue MiniRacer::RuntimeError => ex
-    raise CompileError.new ex.message
-  end
 end
diff --git a/lib/theme_settings_manager.rb b/lib/theme_settings_manager.rb
index 49ad6a6d61..7ebbcc2141 100644
--- a/lib/theme_settings_manager.rb
+++ b/lib/theme_settings_manager.rb
@@ -111,6 +111,10 @@ class ThemeSettingsManager
     def textarea
       @opts[:textarea]
     end
+
+    def json_schema
+      JSON.parse(@opts[:json_schema]) rescue false
+    end
   end
 
   class Bool < self
@@ -169,5 +173,10 @@ class ThemeSettingsManager
   end
 
   class Upload < self
+    def value
+      val = super
+      Discourse.store.cdn_url(val)
+    end
+
   end
 end
diff --git a/lib/theme_settings_parser.rb b/lib/theme_settings_parser.rb
index 56929ae537..e12f5d0339 100644
--- a/lib/theme_settings_parser.rb
+++ b/lib/theme_settings_parser.rb
@@ -41,6 +41,7 @@ class ThemeSettingsParser
     end
 
     opts[:textarea] = !!raw_opts[:textarea]
+    opts[:json_schema] = raw_opts[:json_schema]
 
     opts
   end
diff --git a/lib/theme_store/git_importer.rb b/lib/theme_store/git_importer.rb
index c3f28f5795..15b145d0ca 100644
--- a/lib/theme_store/git_importer.rb
+++ b/lib/theme_store/git_importer.rb
@@ -3,6 +3,7 @@
 module ThemeStore; end
 
 class ThemeStore::GitImporter
+  COMMAND_TIMEOUT_SECONDS = 20
 
   attr_reader :url
 
@@ -24,15 +25,16 @@ class ThemeStore::GitImporter
       import_public!
     end
     if version = Discourse.find_compatible_git_resource(@temp_folder)
-      Discourse::Utils.execute_command(chdir: @temp_folder) do |runner|
-        begin
-          runner.exec "git", "cat-file", "-e", version
-        rescue RuntimeError => e
-          tracking_ref = runner.exec "git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"
-          remote_name = tracking_ref.split("/", 2)[0]
-          runner.exec "git", "fetch", "--depth", "1", remote_name, "#{version}:#{version}"
-        end
-        runner.exec "git", "reset", "--hard", version
+      begin
+        execute "git", "cat-file", "-e", version
+      rescue RuntimeError => e
+        tracking_ref = execute "git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"
+        remote_name = tracking_ref.split("/", 2)[0]
+        execute "git", "fetch", remote_name, "#{version}:#{version}"
+      end
+
+      begin
+        execute "git", "reset", "--hard", version
       rescue RuntimeError
         raise RemoteTheme::ImportError.new(I18n.t("themes.import_error.git_ref_not_found", ref: version))
       end
@@ -42,16 +44,14 @@ class ThemeStore::GitImporter
   def commits_since(hash)
     commit_hash, commits_behind = nil
 
-    Discourse::Utils.execute_command(chdir: @temp_folder) do |runner|
-      commit_hash = runner.exec("git", "rev-parse", "HEAD").strip
-      commits_behind = runner.exec("git", "rev-list", "#{hash}..HEAD", "--count").strip rescue -1
-    end
+    commit_hash = execute("git", "rev-parse", "HEAD").strip
+    commits_behind = execute("git", "rev-list", "#{hash}..HEAD", "--count").strip rescue -1
 
     [commit_hash, commits_behind]
   end
 
   def version
-    Discourse::Utils.execute_command("git", "rev-parse", "HEAD", chdir: @temp_folder).strip
+    execute("git", "rev-parse", "HEAD").strip
   end
 
   def cleanup!
@@ -117,4 +117,7 @@ class ThemeStore::GitImporter
     FileUtils.rm_rf ssh_folder
   end
 
+  def execute(*args)
+    Discourse::Utils.execute_command(*args, chdir: @temp_folder, timeout: COMMAND_TIMEOUT_SECONDS)
+  end
 end
diff --git a/lib/theme_store/zip_exporter.rb b/lib/theme_store/zip_exporter.rb
index 6280601b48..edc8639f8a 100644
--- a/lib/theme_store/zip_exporter.rb
+++ b/lib/theme_store/zip_exporter.rb
@@ -25,11 +25,22 @@ class ThemeStore::ZipExporter
     FileUtils.rm_rf(@temp_folder)
   end
 
-  def export_to_folder
+  def with_export_dir(**kwargs)
+    export_to_folder(**kwargs)
+
+    yield File.join(@temp_folder, @export_name)
+  ensure
+    cleanup!
+  end
+
+  private
+
+  def export_to_folder(extra_scss_only: false)
     destination_folder = File.join(@temp_folder, @export_name)
     FileUtils.mkdir_p(destination_folder)
 
     @theme.theme_fields.each do |field|
+      next if extra_scss_only && !field.extra_scss_field?
       next unless path = field.file_path
 
       # Belt and braces approach here. All the user input should already be
@@ -50,13 +61,16 @@ class ThemeStore::ZipExporter
       File.write(path, content)
     end
 
-    File.write(File.join(destination_folder, "about.json"), JSON.pretty_generate(@theme.generate_metadata_hash))
+    if !extra_scss_only
+      File.write(
+        File.join(destination_folder, "about.json"),
+        JSON.pretty_generate(@theme.generate_metadata_hash)
+      )
+    end
 
     @temp_folder
   end
 
-  private
-
   def export_package
     export_to_folder
 
diff --git a/lib/timeline_lookup.rb b/lib/timeline_lookup.rb
index 2e6cf57c82..f477153f94 100644
--- a/lib/timeline_lookup.rb
+++ b/lib/timeline_lookup.rb
@@ -12,7 +12,10 @@ module TimelineLookup
     last_days_ago = -1
     tuples.each_with_index do |t, idx|
       return result unless t.is_a?(Array)
-      next unless (idx % every) === 0
+
+      if idx != tuples.size - 1
+        next unless (idx % every) === 0
+      end
 
       days_ago = t[1]
 
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index 993abba96d..7ba59e945a 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -24,6 +24,15 @@ class TopicCreator
     # this allows us to add errors
     valid = topic.valid?
 
+    category = find_category
+    if category.present? && guardian.can_tag?(topic)
+      tags = @opts[:tags].present? ? Tag.where(name: @opts[:tags]) : (@opts[:tags] || [])
+
+      # both add to topic.errors
+      DiscourseTagging.validate_min_required_tags_for_category(guardian, topic, category, tags)
+      DiscourseTagging.validate_required_tags_from_group(guardian, topic, category, tags)
+    end
+
     DiscourseEvent.trigger(:after_validate_topic, topic, self)
     valid &&= topic.errors.empty?
 
@@ -56,8 +65,10 @@ class TopicCreator
   private
 
   def create_shared_draft(topic)
-    return unless @opts[:shared_draft] && @opts[:category].present?
-    SharedDraft.create(topic_id: topic.id, category_id: @opts[:category])
+    return if @opts[:shared_draft].blank? || @opts[:shared_draft] == 'false'
+
+    category_id = @opts[:category].blank? ? SiteSetting.shared_drafts_category.to_i : @opts[:category]
+    SharedDraft.create(topic_id: topic.id, category_id: category_id)
   end
 
   def create_warning(topic)
@@ -158,22 +169,23 @@ class TopicCreator
   end
 
   def setup_tags(topic)
-    if @opts[:tags].blank?
-      unless @guardian.is_staff? || !guardian.can_tag?(topic)
-        category = find_category
-
-        if !DiscourseTagging.validate_min_required_tags_for_category(@guardian, topic, category) ||
-            !DiscourseTagging.validate_required_tags_from_group(@guardian, topic, category)
-          rollback_from_errors!(topic)
-        end
-      end
-    else
+    if @opts[:tags].present?
       valid_tags = DiscourseTagging.tag_topic_by_names(topic, @guardian, @opts[:tags])
       unless valid_tags
         topic.errors.add(:base, :unable_to_tag)
         rollback_from_errors!(topic)
       end
     end
+
+    watched_words = WordWatcher.words_for_action(:tag)
+    if watched_words.present?
+      word_watcher = WordWatcher.new("#{@opts[:title]} #{@opts[:raw]}")
+      word_watcher_tags = topic.tags.map(&:name)
+      watched_words.each do |word, tags|
+        word_watcher_tags += tags.split(",") if word_watcher.word_matches?(word)
+      end
+      DiscourseTagging.tag_topic_by_names(topic, Discourse.system_user.guardian, word_watcher_tags)
+    end
   end
 
   def setup_auto_close_time(topic)
@@ -191,7 +203,7 @@ class TopicCreator
     end
 
     if @opts[:target_emails].present? && !@guardian.can_send_private_messages_to_email? then
-      rollback_with!(topic, :reply_by_email_disabled)
+      rollback_with!(topic, :send_to_email_disabled)
     end
 
     add_users(topic, @opts[:target_usernames])
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 7070263e6f..d769c1d1d1 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -146,7 +146,7 @@ class TopicQuery
 
         # strip out users in groups you already belong to
         target_users = target_users
-          .joins("LEFT JOIN group_users gu ON gu.user_id = topic_allowed_users.user_id AND #{ActiveRecord::Base.sanitize_sql_array(['gu.group_id IN (?)', my_group_ids])}")
+          .joins("LEFT JOIN group_users gu ON gu.user_id = topic_allowed_users.user_id AND #{DB.sql_fragment('gu.group_id IN (?)', my_group_ids)}")
           .where('gu.group_id IS NULL')
       end
 
@@ -551,7 +551,7 @@ class TopicQuery
     result = remove_muted_topics(result, @user)
     result = remove_muted_categories(result, @user, exclude: options[:category])
     result = remove_muted_tags(result, @user, options)
-    result = remove_already_seen_for_category(result, @user)
+    result = remove_dismissed(result, @user)
 
     self.class.results_filter_callbacks.each do |filter_callback|
       result = filter_callback.call(:new, result, @user, options)
@@ -617,17 +617,24 @@ class TopicQuery
 
     drafts_category_id = SiteSetting.shared_drafts_category.to_i
     viewing_shared = category_id && category_id == drafts_category_id
-    can_create_shared = guardian.can_create_shared_draft?
 
-    if can_create_shared && options[:destination_category_id]
-      destination_category_id = get_category_id(options[:destination_category_id])
-      topic_ids = SharedDraft.where(category_id: destination_category_id).pluck(:topic_id)
-      result.where(id: topic_ids)
-    elsif can_create_shared && viewing_shared
-      result.includes(:shared_draft).references(:shared_draft)
-    else
-      result.where('topics.category_id != ?', drafts_category_id)
+    if guardian.can_see_shared_draft?
+      if options[:destination_category_id]
+        destination_category_id = get_category_id(options[:destination_category_id])
+        topic_ids = SharedDraft.where(category_id: destination_category_id).pluck(:topic_id)
+
+        return result.where(id: topic_ids)
+      end
+
+      if viewing_shared
+        return result.includes(:shared_draft).references(:shared_draft)
+      end
+
+    elsif viewing_shared
+      return result.joins('LEFT OUTER JOIN shared_drafts sd ON sd.topic_id = topics.id').where('sd.id IS NULL')
     end
+
+    result.where('topics.category_id != ?', drafts_category_id)
   end
 
   def apply_ordering(result, options)
@@ -893,6 +900,7 @@ class TopicQuery
       list = list
         .references("cu")
         .joins("LEFT JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{user.id}")
+        .joins("LEFT JOIN dismissed_topic_users ON dismissed_topic_users.topic_id = topics.id AND dismissed_topic_users.user_id = #{user.id}")
         .where("topics.category_id = :category_id
                 OR COALESCE(category_users.notification_level, :default) <> :muted
                 OR tu.notification_level > :regular",
@@ -961,10 +969,9 @@ class TopicQuery
     end
   end
 
-  def remove_already_seen_for_category(list, user)
+  def remove_dismissed(list, user)
     if user
-      list = list
-        .where("category_users.last_seen_at IS NULL OR topics.created_at > category_users.last_seen_at")
+      list = list.where("dismissed_topic_users.id IS NULL")
     end
 
     list
@@ -1014,7 +1021,7 @@ class TopicQuery
         messages.joins("
           LEFT JOIN topic_allowed_users ta2
           ON topics.id = ta2.topic_id
-          AND #{ActiveRecord::Base.sanitize_sql_array(['ta2.user_id IN (?)', user_ids])}
+          AND #{DB.sql_fragment('ta2.user_id IN (?)', user_ids)}
         ")
     end
 
@@ -1023,7 +1030,7 @@ class TopicQuery
         messages.joins("
           LEFT JOIN topic_allowed_groups tg2
           ON topics.id = tg2.topic_id
-          AND #{ActiveRecord::Base.sanitize_sql_array(['tg2.group_id IN (?)', group_ids])}
+          AND #{DB.sql_fragment('tg2.group_id IN (?)', group_ids)}
         ")
     end
 
@@ -1046,7 +1053,7 @@ class TopicQuery
             LEFT JOIN group_users gu
             ON gu.user_id = #{@user.id.to_i}
             AND gu.group_id = _tg.group_id
-            WHERE #{ActiveRecord::Base.sanitize_sql_array(['gu.group_id IN (?)', group_ids])}
+            WHERE #{DB.sql_fragment('gu.group_id IN (?)', group_ids)}
           ) tg ON topics.id = tg.topic_id
         ")
         .where("tg.topic_id IS NOT NULL")
diff --git a/lib/topic_query_params.rb b/lib/topic_query_params.rb
index bab30135a1..0676334bf6 100644
--- a/lib/topic_query_params.rb
+++ b/lib/topic_query_params.rb
@@ -16,9 +16,7 @@ module TopicQueryParams
 
     # hacky columns get special handling
     options[:topic_ids] = param_to_integer_list(:topic_ids)
-    if options[:no_subcategories] == 'true'
-      options[:no_subcategories] = true
-    end
+    options[:no_subcategories] = options[:no_subcategories] == 'true' if options[:no_subcategories].present?
 
     options
   end
diff --git a/lib/topic_retriever.rb b/lib/topic_retriever.rb
index 8fae22a368..88d4d7c8e7 100644
--- a/lib/topic_retriever.rb
+++ b/lib/topic_retriever.rb
@@ -15,7 +15,7 @@ class TopicRetriever
   private
 
   def invalid_url?
-    !EmbeddableHost.url_allowed?(@embed_url)
+    !EmbeddableHost.url_allowed?(@embed_url.strip)
   end
 
   def retrieved_recently?
@@ -41,7 +41,7 @@ class TopicRetriever
 
   def fetch_http
     if @author_username.nil?
-      username = SiteSetting.embed_by_username.downcase
+      username = SiteSetting.embed_by_username.presence || SiteSetting.site_contact_username.presence || Discourse.system_user.username
     else
       username = @author_username
     end
diff --git a/lib/topic_upload_security_manager.rb b/lib/topic_upload_security_manager.rb
index 124219a4cb..896b813d82 100644
--- a/lib/topic_upload_security_manager.rb
+++ b/lib/topic_upload_security_manager.rb
@@ -31,7 +31,7 @@ class TopicUploadSecurityManager
           # we have already got the post preloaded so we may as well
           # attach it here to avoid another load in UploadSecurity
           upload.access_control_post = post
-          upload.update_secure_status
+          upload.update_secure_status(source: "topic upload security")
         end
         post.rebake! if secure_status_did_change
         Rails.logger.debug("Security updated & rebake complete in topic #{@topic.id} - post #{post.id}")
@@ -62,7 +62,7 @@ class TopicUploadSecurityManager
           first_post_upload_appeared_in = upload.post_uploads.first.post
           if first_post_upload_appeared_in == post
             upload.update(access_control_post: post)
-            upload.update_secure_status
+            upload.update_secure_status(source: "topic upload security")
           else
             false
           end
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index d02d4028b1..dcdec084bc 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -51,6 +51,15 @@ class TopicView
     wpcf.flatten.uniq
   end
 
+  def self.add_custom_filter(key, &blk)
+    @custom_filters ||= {}
+    @custom_filters[key] = blk
+  end
+
+  def self.custom_filters
+    @custom_filters || {}
+  end
+
   def initialize(topic_or_topic_id, user = nil, options = {})
     @topic = find_topic(topic_or_topic_id)
     @user = user
@@ -178,6 +187,23 @@ class TopicView
 
   def page_title
     title = @topic.title
+    if @post_number > 1
+      title += " - "
+      post = @topic.posts.find_by(post_number: @post_number)
+      author = post&.user
+      if author && @guardian.can_see_post?(post)
+        title += I18n.t(
+          "inline_oneboxer.topic_page_title_post_number_by_user",
+          post_number: @post_number,
+          username: author.username
+        )
+      else
+        title += I18n.t(
+          "inline_oneboxer.topic_page_title_post_number",
+          post_number: @post_number
+        )
+      end
+    end
     if SiteSetting.topic_page_title_includes_category
       if @topic.category_id != SiteSetting.uncategorized_category_id && @topic.category_id && @topic.category
         title += " - #{@topic.category.name}"
@@ -669,8 +695,9 @@ class TopicView
   end
 
   def filter_post_types(posts)
-    visible_types = Topic.visible_post_types(@user)
+    return posts.where(post_type: Post.types[:regular]) if @only_regular
 
+    visible_types = Topic.visible_post_types(@user)
     if @user.present?
       posts.where("posts.user_id = ? OR post_type IN (?)", @user.id, visible_types)
     else
@@ -754,6 +781,10 @@ class TopicView
       @contains_gaps = true
     end
 
+    if @filter.present? && @filter.to_s != 'summary' && TopicView.custom_filters[@filter].present?
+      @filtered_posts = TopicView.custom_filters[@filter].call(@filtered_posts, self)
+    end
+
     if @best.present?
       @filtered_posts = @filtered_posts.where('posts.post_type = ?', Post.types[:regular])
       @contains_gaps = true
@@ -771,6 +802,46 @@ class TopicView
       @contains_gaps = true
     end
 
+    # Filter replies
+    if @replies_to_post_number.present?
+      post_id = filtered_post_id(@replies_to_post_number.to_i)
+      @filtered_posts = @filtered_posts.where('
+        posts.post_number = 1
+        OR posts.post_number = :post_number
+        OR posts.reply_to_post_number = :post_number
+        OR posts.id IN (SELECT pr.reply_post_id FROM post_replies pr WHERE pr.post_id = :post_id)', { post_number: @replies_to_post_number.to_i, post_id: post_id })
+
+      @contains_gaps = true
+    end
+
+    # Filtering upwards
+    if @filter_upwards_post_id.present?
+      post = Post.find(@filter_upwards_post_id)
+      post_ids = DB.query_single(<<~SQL, post_id: post.id, topic_id: post.topic_id)
+      WITH RECURSIVE breadcrumb(id, reply_to_post_number) AS (
+            SELECT p.id, p.reply_to_post_number FROM posts AS p
+              WHERE p.id = :post_id
+            UNION
+              SELECT p.id, p.reply_to_post_number FROM posts AS p, breadcrumb
+                WHERE breadcrumb.reply_to_post_number = p.post_number
+                  AND p.topic_id = :topic_id
+          )
+      SELECT id from breadcrumb
+      WHERE id <> :post_id
+      ORDER by id
+      SQL
+
+      post_ids = (post_ids[(0 - SiteSetting.max_reply_history)..-1] || post_ids)
+      post_ids.push(post.id)
+
+      @filtered_posts = @filtered_posts.where('
+        posts.post_number = 1
+        OR posts.id IN (:post_ids)
+        OR posts.id > :max_post_id', { post_ids: post_ids, max_post_id: post_ids.max })
+
+      @contains_gaps = true
+    end
+
     # Deleted
     # This should be last - don't want to tell the admin about deleted posts that clicking the button won't show
     # copy the filter for has_deleted? method
diff --git a/lib/turbo_tests/runner.rb b/lib/turbo_tests/runner.rb
index aa4d8c35e1..1bf1b6e3d9 100644
--- a/lib/turbo_tests/runner.rb
+++ b/lib/turbo_tests/runner.rb
@@ -82,7 +82,9 @@ module TurboTests
     def check_for_migrations
       config =
         ActiveRecord::Base
-          .configurations["test"]
+          .configurations
+          .find_db_config("test")
+          .configuration_hash
           .merge("database" => "discourse_test_1")
 
       ActiveRecord::Tasks::DatabaseTasks.migrations_paths = ['db/migrate', 'db/post_migrate']
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index 31d2747a9a..63364e7b4f 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -7,9 +7,9 @@ class UploadCreator
   TYPES_TO_CROP ||= %w{avatar card_background custom_emoji profile_background}.each(&:freeze)
 
   ALLOWED_SVG_ELEMENTS ||= %w{
-    circle clippath defs ellipse feGaussianBlur filter g line linearGradient
+    circle clipPath defs ellipse feGaussianBlur filter g line linearGradient
     marker path polygon polyline radialGradient rect stop style svg text
-    textpath tref tspan use
+    textPath tref tspan use
   }.each(&:freeze)
 
   include ActiveSupport::Deprecation::DeprecatedConstantAccessor
@@ -124,12 +124,33 @@ class UploadCreator
       @upload.extension         = image_type || File.extname(@filename)[1..10]
 
       if is_image
-        @upload.thumbnail_width, @upload.thumbnail_height = ImageSizer.resize(*@image_info.size)
-        @upload.width, @upload.height = @image_info.size
-        @upload.animated = animated?(@file)
+        if @image_info.type.to_s == 'svg'
+          w, h = [0, 0]
+
+          begin
+            w, h = Discourse::Utils
+              .execute_command("identify", "-format", "%w %h", @file.path, timeout: Upload::MAX_IDENTIFY_SECONDS)
+              .split(' ')
+          rescue
+            # use default 0, 0
+          end
+        else
+          w, h = @image_info.size
+        end
+
+        @upload.thumbnail_width, @upload.thumbnail_height = ImageSizer.resize(w, h)
+        @upload.width, @upload.height = w, h
+        @upload.animated = animated?
       end
 
       add_metadata!
+
+      if SiteSetting.secure_media
+        secure, reason = UploadSecurity.new(@upload, @opts.merge(creating: true)).should_be_secure_with_reason
+        attrs = @upload.secure_params(secure, reason, "upload creator")
+        @upload.assign_attributes(attrs)
+      end
+
       return @upload unless @upload.save
 
       DiscourseEvent.trigger(:before_upload_creation, @file, is_image, @opts[:for_export])
@@ -177,25 +198,6 @@ class UploadCreator
     end
   end
 
-  def animated?(file)
-    OptimizedImage.ensure_safe_paths!(file.path)
-
-    # TODO - find out why:
-    #   FastImage.animated?(@file)
-    # doesn't seem to identify all animated gifs
-    @frame_count ||= begin
-      command = [
-        "identify",
-        "-format", "%n\\n",
-        file.path
-      ]
-
-      frames = Discourse::Utils.execute_command(*command, timeout: Upload::MAX_IDENTIFY_SECONDS).to_i rescue 1
-    end
-
-    @frame_count > 1
-  end
-
   MIN_PIXELS_TO_CONVERT_TO_JPEG ||= 1280 * 720
 
   def convert_png_to_jpeg?
@@ -209,6 +211,7 @@ class UploadCreator
   MIN_CONVERT_TO_JPEG_SAVING_RATIO = 0.70
 
   def convert_to_jpeg!
+    return if @opts[:for_site_setting]
     return if filesize < MIN_CONVERT_TO_JPEG_BYTES_SAVED
 
     jpeg_tempfile = Tempfile.new(["image", ".jpg"])
@@ -291,13 +294,14 @@ class UploadCreator
   end
 
   def should_alter_quality?
-    return false if animated?(@file)
+    return false if animated?
 
-    @upload.target_image_quality(@file.path, SiteSetting.recompress_original_jpg_quality).present?
+    desired_quality = @image_info.type == :png ? SiteSetting.png_to_jpg_quality : SiteSetting.recompress_original_jpg_quality
+    @upload.target_image_quality(@file.path, desired_quality).present?
   end
 
   def should_downsize?
-    max_image_size > 0 && filesize >= max_image_size
+    max_image_size > 0 && filesize >= max_image_size && !animated?
   end
 
   def downsize!
@@ -307,14 +311,13 @@ 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,
-        scale,
+        "50%",
         scale_image: true,
         raise_on_error: true
       )
@@ -377,7 +380,7 @@ class UploadCreator
   end
 
   def should_crop?
-    return false if @opts[:type] == 'custom_emoji' && animated?(@file)
+    return false if ['profile_background', 'card_background', 'custom_emoji'].include?(@opts[:type]) && animated?
 
     TYPES_TO_CROP.include?(@opts[:type])
   end
@@ -450,7 +453,32 @@ class UploadCreator
     @upload.for_export          = true if @opts[:for_export]
     @upload.for_site_setting    = true if @opts[:for_site_setting]
     @upload.for_gravatar        = true if @opts[:for_gravatar]
-    @upload.secure = UploadSecurity.new(@upload, @opts).should_be_secure?
+  end
+
+  private
+
+  def animated?
+    return @animated if @animated != nil
+
+    @animated ||= begin
+      is_animated = FastImage.animated?(@file)
+      type = @image_info.type.to_s
+
+      if is_animated != nil
+        # FastImage will return nil if it cannot determine if animated
+        is_animated
+      elsif type == "gif" || type == "webp"
+        # Only GIFs, WEBPs and a few other unsupported image types can be animated
+        OptimizedImage.ensure_safe_paths!(@file.path)
+
+        command = ["identify", "-format", "%n\\n", @file.path]
+        frames = Discourse::Utils.execute_command(*command, timeout: Upload::MAX_IDENTIFY_SECONDS).to_i rescue 1
+
+        frames > 1
+      else
+        false
+      end
+    end
   end
 
 end
diff --git a/lib/upload_security.rb b/lib/upload_security.rb
index 4572473554..6ec2bbd5bd 100644
--- a/lib/upload_security.rb
+++ b/lib/upload_security.rb
@@ -5,14 +5,16 @@
 #
 # Some of these flags checked (e.g. all of the for_X flags and the opts[:type])
 # are only set when _initially uploading_ via UploadCreator and are not present
-# when an upload already exists.
+# when an upload already exists, these will only be checked when the @creating
+# option is present.
 #
 # If the upload already exists the best way to figure out whether it should be
 # secure alongside the site settings is the access_control_post_id, because the
 # original post the upload is linked to has far more bearing on its security context
 # post-upload. If the access_control_post_id does not exist then we just rely
 # on the current secure? status, otherwise there would be a lot of additional
-# complex queries and joins to perform.
+# complex queries and joins to perform. Over time more of these specific
+# queries will be implemented.
 class UploadSecurity
   @@custom_public_types = []
 
@@ -23,6 +25,7 @@ class UploadSecurity
     card_background
     category_logo
     category_background
+    group_flair
   ]
 
   def self.register_custom_public_type(type)
@@ -38,32 +41,52 @@ class UploadSecurity
     @upload = upload
     @opts = opts
     @upload_type = @opts[:type]
+    @creating = @opts[:creating]
   end
 
   def should_be_secure?
-    return false if !SiteSetting.secure_media?
-    return false if uploading_in_public_context?
-    uploading_in_secure_context?
+    should_be_secure_with_reason.first
   end
 
-  def uploading_in_public_context?
-    @upload.for_theme ||
-      @upload.for_site_setting ||
-      @upload.for_gravatar ||
-      public_type? ||
-      used_for_custom_emoji? ||
-      based_on_regular_emoji?
-  end
-
-  def uploading_in_secure_context?
-    return true if SiteSetting.login_required?
-    if @upload.access_control_post_id.present?
-      return access_control_post_has_secure_media?
+  def should_be_secure_with_reason
+    insecure_context_checks.each do |check, reason|
+      return [false, reason] if perform_check(check)
     end
-    uploading_in_composer? || @upload.for_private_message || @upload.for_group_message || @upload.secure?
+    secure_context_checks.each do |check, reason|
+      return [perform_check(check), reason] if priority_check?(check)
+      return [true, reason] if perform_check(check)
+    end
+
+    [false, "no checks satisfied"]
   end
 
-  private
+  def secure_media_disabled_check
+    !SiteSetting.secure_media?
+  end
+
+  def insecure_creation_for_modifiers_check
+    return false if !@creating
+    @upload.for_theme || @upload.for_site_setting || @upload.for_gravatar
+  end
+
+  def public_type_check
+    PUBLIC_TYPES.include?(@upload_type) || @@custom_public_types.include?(@upload_type)
+  end
+
+  def custom_emoji_check
+    @upload.id.present? && CustomEmoji.exists?(upload_id: @upload.id)
+  end
+
+  def regular_emoji_check
+    return false if @upload.origin.blank?
+    uri = URI.parse(@upload.origin)
+    return true if Emoji.all.map(&:url).include?("#{uri.path}?#{uri.query}")
+    uri.path.include?("images/emoji")
+  end
+
+  def login_required_check
+    SiteSetting.login_required?
+  end
 
   # whether the upload should remain secure or not after posting depends on its context,
   # which is based on the post it is linked to via access_control_post_id.
@@ -71,28 +94,59 @@ class UploadSecurity
   # this may change to false if the upload was set to secure on upload e.g. in
   # a post composer then it turned out that the post itself was not in a secure context
   #
-  # 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?
-    @upload.access_control_post.with_secure_media?
+  # a post is with secure media if it is a private message or in a read restricted
+  # category
+  def access_control_post_has_secure_media_check
+    access_control_post&.with_secure_media?
   end
 
-  def public_type?
-    PUBLIC_TYPES.include?(@upload_type) || @@custom_public_types.include?(@upload_type)
-  end
-
-  def uploading_in_composer?
+  def uploading_in_composer_check
     @upload_type == "composer"
   end
 
-  def used_for_custom_emoji?
-    @upload.id.present? && CustomEmoji.exists?(upload_id: @upload.id)
+  def secure_creation_for_modifiers_check
+    return false if !@creating
+    @upload.for_private_message || @upload.for_group_message
   end
 
-  def based_on_regular_emoji?
-    return false if @upload.origin.blank?
-    uri = URI.parse(@upload.origin)
-    return true if Emoji.all.map(&:url).include?("#{uri.path}?#{uri.query}")
-    uri.path.include?("images/emoji")
+  def already_secure_check
+    @upload.secure?
+  end
+
+  private
+
+  def access_control_post
+    @access_control_post ||= @upload.access_control_post_id.present? ? @upload.access_control_post : nil
+  end
+
+  def insecure_context_checks
+    {
+      secure_media_disabled: "secure media is disabled",
+      insecure_creation_for_modifiers: "one or more creation for_modifiers was satisfied",
+      public_type: "upload is public type",
+      custom_emoji: "upload is used for custom emoji",
+      regular_emoji: "upload is used for regular emoji"
+    }
+  end
+
+  def secure_context_checks
+    {
+      login_required: "login is required",
+      access_control_post_has_secure_media: "access control post dictates security",
+      secure_creation_for_modifiers: "one or more creation for_modifiers was satisfied",
+      uploading_in_composer: "uploading via the composer",
+      already_secure: "upload is already secure"
+    }
+  end
+
+  # the access control check is important because that is the truest indicator
+  # of whether an upload should be secure or not, and thus should be returned
+  # immediately if there is an access control post
+  def priority_check?(check)
+    check == :access_control_post_has_secure_media && access_control_post
+  end
+
+  def perform_check(check)
+    send("#{check}_check")
   end
 end
diff --git a/lib/url_helper.rb b/lib/url_helper.rb
index 4b2ad9106c..be75c5d0a2 100644
--- a/lib/url_helper.rb
+++ b/lib/url_helper.rb
@@ -60,11 +60,9 @@ class UrlHelper
     self.absolute(Upload.secure_media_url_from_upload_url(url), nil)
   end
 
-  # Prevents double URL encode
-  # https://stackoverflow.com/a/37599235
   def self.escape_uri(uri)
     return uri if s3_presigned_url?(uri)
-    UrlHelper.encode_component(CGI.unescapeHTML(UrlHelper.unencode(uri)))
+    Addressable::URI.normalized_encode(uri)
   end
 
   def self.rails_route_from_url(url)
@@ -78,14 +76,9 @@ class UrlHelper
     url[/x-amz-(algorithm|credential)/i].present?
   end
 
-  def self.cook_url(url, secure: false)
-    return url unless is_local(url)
-
-    uri = URI.parse(url)
-    filename = File.basename(uri.path)
-    is_attachment = !FileHelper.is_supported_media?(filename)
-
-    no_cdn = SiteSetting.login_required || SiteSetting.prevent_anons_from_downloading_files
+  def self.cook_url(url, secure: false, local: nil)
+    local = is_local(url) if local.nil?
+    return url if !local
 
     url = secure ? secure_proxy_without_cdn(url) : absolute_without_cdn(url)
 
@@ -94,6 +87,19 @@ class UrlHelper
     # to avoid asset_host mixups
     return schemaless(url) if secure
 
+    # PERF: avoid parsing url excpet for extreme conditions
+    # this is a hot path used on home page
+    filename = url
+    if url.include?("?")
+      uri = URI.parse(url)
+      filename = File.basename(uri.path)
+    end
+
+    # this technically requires a filename, but will work with a URL as long as it end with the
+    # extension and has no query params
+    is_attachment = !FileHelper.is_supported_media?(filename)
+
+    no_cdn = SiteSetting.login_required || SiteSetting.prevent_anons_from_downloading_files
     unless is_attachment && no_cdn
       url = Discourse.store.cdn_url(url)
       url = local_cdn_url(url) if Discourse.store.external?
diff --git a/lib/user_lookup.rb b/lib/user_lookup.rb
index faced05ee0..4f6feb7e7c 100644
--- a/lib/user_lookup.rb
+++ b/lib/user_lookup.rb
@@ -18,7 +18,7 @@ class UserLookup
   private
 
   def self.lookup_columns
-    @user_lookup_columns ||= %i{id username name uploaded_avatar_id primary_group_id}
+    @user_lookup_columns ||= %i{id username name uploaded_avatar_id primary_group_id admin moderator trust_level}
   end
 
   def self.group_lookup_columns
diff --git a/lib/user_name_suggester.rb b/lib/user_name_suggester.rb
index ecd482b490..b367ffcbc2 100644
--- a/lib/user_name_suggester.rb
+++ b/lib/user_name_suggester.rb
@@ -110,6 +110,14 @@ module UserNameSuggester
 
     if SiteSetting.unicode_usernames
       name.unicode_normalize!
+
+      # TODO: Jan 2022, review if still needed
+      # see: https://meta.discourse.org/t/unicode-username-with-as-the-final-char-leads-to-an-error-loading-profile-page/173182
+      if name.include?('Σ')
+        ctx = MiniRacer::Context.new
+        name = ctx.eval("#{name.to_s.to_json}.toLowerCase()")
+        ctx.dispose
+      end
     else
       name = ActiveSupport::Inflector.transliterate(name)
     end
diff --git a/lib/validators/category_search_priority_weights_validator.rb b/lib/validators/category_search_priority_weights_validator.rb
index 565a0b327c..ef4e337c6a 100644
--- a/lib/validators/category_search_priority_weights_validator.rb
+++ b/lib/validators/category_search_priority_weights_validator.rb
@@ -9,14 +9,10 @@ class CategorySearchPriorityWeightsValidator
     val = val.to_f
 
     case @name
-    when "category_search_priority_very_low_weight"
-      val < SiteSetting.category_search_priority_low_weight
     when "category_search_priority_low_weight"
-      val < 1 && val > SiteSetting.category_search_priority_very_low_weight
+      val < 1
     when "category_search_priority_high_weight"
-      val > 1 && val < SiteSetting.category_search_priority_very_high_weight
-    when "category_search_priority_very_high_weight"
-      val > SiteSetting.category_search_priority_high_weight
+      val > 1
     end
   end
 
diff --git a/lib/validators/email_validator.rb b/lib/validators/email_validator.rb
index 47200da2b9..eca8c28e5f 100644
--- a/lib/validators/email_validator.rb
+++ b/lib/validators/email_validator.rb
@@ -4,14 +4,20 @@ class EmailValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless value =~ EmailValidator.email_regex
-      record.errors.add(attribute, I18n.t(:'user.email.invalid'))
+      if Invite === record && attribute == :email
+        record.errors.add(:base, I18n.t(:'invite.invalid_email', email: value))
+      else
+        record.errors.add(attribute, I18n.t(:'user.email.invalid'))
+      end
+      invalid = true
     end
 
     unless EmailValidator.allowed?(value)
       record.errors.add(attribute, I18n.t(:'user.email.not_allowed'))
+      invalid = true
     end
 
-    if record.errors[attribute].blank? && value && ScreenedEmail.should_block?(value)
+    if !invalid && ScreenedEmail.should_block?(value)
       record.errors.add(attribute, I18n.t(:'user.email.blocked'))
     end
   end
diff --git a/lib/validators/enable_invite_only_validator.rb b/lib/validators/enable_invite_only_validator.rb
index 63fd259bc0..b2efcdf83f 100644
--- a/lib/validators/enable_invite_only_validator.rb
+++ b/lib/validators/enable_invite_only_validator.rb
@@ -7,10 +7,10 @@ class EnableInviteOnlyValidator
 
   def valid_value?(val)
     return true if val == 'f'
-    !SiteSetting.enable_sso?
+    !SiteSetting.enable_discourse_connect?
   end
 
   def error_message
-    I18n.t('site_settings.errors.sso_invite_only')
+    I18n.t('site_settings.errors.discourse_connect_invite_only')
   end
 end
diff --git a/lib/validators/enable_sso_validator.rb b/lib/validators/enable_sso_validator.rb
index e119cc29ba..6c71904d76 100644
--- a/lib/validators/enable_sso_validator.rb
+++ b/lib/validators/enable_sso_validator.rb
@@ -7,12 +7,12 @@ class EnableSsoValidator
 
   def valid_value?(val)
     return true if val == 'f'
-    return false if SiteSetting.sso_url.blank? || SiteSetting.invite_only?
+    return false if SiteSetting.discourse_connect_url.blank? || SiteSetting.invite_only?
     true
   end
 
   def error_message
-    return I18n.t('site_settings.errors.sso_url_is_empty') if SiteSetting.sso_url.blank?
-    return I18n.t('site_settings.errors.sso_invite_only') if SiteSetting.invite_only?
+    return I18n.t('site_settings.errors.discourse_connect_url_is_empty') if SiteSetting.discourse_connect_url.blank?
+    return I18n.t('site_settings.errors.discourse_connect_invite_only') if SiteSetting.invite_only?
   end
 end
diff --git a/lib/validators/pop3_polling_enabled_setting_validator.rb b/lib/validators/pop3_polling_enabled_setting_validator.rb
index d0bf382b11..ed53a5cc9b 100644
--- a/lib/validators/pop3_polling_enabled_setting_validator.rb
+++ b/lib/validators/pop3_polling_enabled_setting_validator.rb
@@ -33,6 +33,16 @@ class POP3PollingEnabledSettingValidator
   private
 
   def authentication_works?
+
+    # TODO (martin, post-2.7 release) Change to use EmailSettingsValidator
+    # EmailSettingsValidator.validate_pop3(
+    #   host: SiteSetting.pop3_polling_host,
+    #   port: SiteSetting.pop3_polling_port,
+    #   ssl: SiteSetting.pop3_polling_ssl,
+    #   username: SiteSetting.pop3_polling_username,
+    #   password: SiteSetting.pop3_polling_password,
+    #   openssl_verify: SiteSetting.pop3_polling_openssl_verify
+    # )
     @authentication_works ||= begin
       pop3 = Net::POP3.new(SiteSetting.pop3_polling_host, SiteSetting.pop3_polling_port)
       pop3.enable_ssl(OpenSSL::SSL::VERIFY_NONE) if SiteSetting.pop3_polling_ssl
diff --git a/lib/validators/string_setting_validator.rb b/lib/validators/string_setting_validator.rb
index d544fd2423..567ee6c6ff 100644
--- a/lib/validators/string_setting_validator.rb
+++ b/lib/validators/string_setting_validator.rb
@@ -17,9 +17,23 @@ class StringSettingValidator
       return false
     end
 
+    return valid_json?(val) if (@opts[:json_schema])
+
     regex_match?(val)
   end
 
+  def valid_json?(json)
+    # TODO: right now this is only ensuring JSON is valid
+    # but ideally we should validate against the schema
+    begin
+      JSON.parse(json)
+    rescue JSON::ParserError => e
+      @json_fail = true
+      return false
+    end
+    true
+  end
+
   def error_message
     if @regex_fail
       I18n.t(@regex_error)
@@ -31,6 +45,8 @@ class StringSettingValidator
       else
         I18n.t('site_settings.errors.invalid_string_max', max: @opts[:max])
       end
+    elsif @json_fail
+      I18n.t('site_settings.errors.invalid_json')
     else
       I18n.t('site_settings.errors.invalid_string')
     end
diff --git a/lib/validators/stripped_length_validator.rb b/lib/validators/stripped_length_validator.rb
index 628866cb9c..b2ff7f82ef 100644
--- a/lib/validators/stripped_length_validator.rb
+++ b/lib/validators/stripped_length_validator.rb
@@ -2,12 +2,10 @@
 
 class StrippedLengthValidator < ActiveModel::EachValidator
   def self.validate(record, attribute, value, range)
-    unless value.nil?
-      stripped_length = value.strip.length
-      record.errors.add attribute, (I18n.t('errors.messages.too_short', count: range.begin)) unless
-          stripped_length >= range.begin
-      record.errors.add attribute, (I18n.t('errors.messages.too_long_validation', max: range.end, length: stripped_length)) unless
-          stripped_length <= range.end
+    if !value.nil?
+      value = get_sanitized_value(value)
+      record.errors.add attribute, (I18n.t('errors.messages.too_short', count: range.begin)) if value.length < range.begin
+      record.errors.add attribute, (I18n.t('errors.messages.too_long_validation', max: range.end, length: value.length)) if value.length > range.end
     else
       record.errors.add attribute, (I18n.t('errors.messages.blank'))
     end
@@ -18,4 +16,13 @@ class StrippedLengthValidator < ActiveModel::EachValidator
     range = options[:in].lambda? ? options[:in].call : options[:in]
     self.class.validate(record, attribute, value, range)
   end
+
+  def self.get_sanitized_value(value)
+    value = value.dup
+    value.gsub!(/<!--(.*?)-->/, '') # strip HTML comments
+    value.gsub!(/:\w+(:\w+)?:/, "X") # replace emojis with a single character
+    value.gsub!(/\.{2,}/, '…') # replace multiple ... with …
+    value.gsub!(/\,{2,}/, ',') # replace multiple ,,, with ,
+    value.strip
+  end
 end
diff --git a/lib/validators/unique_among_validator.rb b/lib/validators/unique_among_validator.rb
index ed3d142014..d9c63516eb 100644
--- a/lib/validators/unique_among_validator.rb
+++ b/lib/validators/unique_among_validator.rb
@@ -2,21 +2,36 @@
 
 class UniqueAmongValidator < ActiveRecord::Validations::UniquenessValidator
   def validate_each(record, attribute, value)
-    old_errors = record.errors[attribute].size
+    old_errors = []
+    record.errors.each do |error|
+      old_errors << error if error.attribute == attribute
+    end
 
     # look for any duplicates at all
     super
 
-    new_errors = record.errors[attribute].size - old_errors
+    new_errors = []
+    record.errors.each do |error|
+      new_errors << error if error.attribute == attribute
+    end
 
     # do nothing further unless there were some duplicates.
-    unless new_errors == 0
+    if new_errors.size - old_errors.size != 0
       # now look only in the collection we care about.
       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
-      record.errors[attribute].pop(new_errors) unless dupes.exists?
+      if !dupes.exists?
+        record.errors.delete(attribute)
+        old_errors.each do |error|
+          record.errors.add(
+            error.attribute,
+            error.type,
+            **error.options
+          )
+        end
+      end
     end
   end
 
diff --git a/lib/version.rb b/lib/version.rb
index 43e6b91aab..caf866bb4e 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -8,9 +8,9 @@ module Discourse
   unless defined? ::Discourse::VERSION
     module VERSION #:nodoc:
       MAJOR = 2
-      MINOR = 6
-      TINY  = 7
-      PRE   = nil
+      MINOR = 7
+      TINY  = 0
+      PRE   = 'beta9'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index 2dd469431b..4dfee9af9c 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -265,29 +265,6 @@ class Wizard
         end
       end
 
-      @wizard.append_step('emoji') do |step|
-        sets = step.add_field(id: 'emoji_set',
-                              type: 'radio',
-                              required: true,
-                              value: SiteSetting.emoji_set)
-
-        emoji = ["smile", "+1", "tada", "poop"]
-
-        EmojiSetSiteSetting.values.each do |set|
-          imgs = emoji.map do |e|
-            "<img src='#{Discourse.base_path}/images/emoji/#{set[:value]}/#{e}.png'>"
-          end
-
-          sets.add_choice(set[:value],
-                          label: I18n.t("js.#{set[:name]}"),
-                          extra_label: "<span class='emoji-preview'>#{imgs.join}</span>")
-
-          step.on_update do |updater|
-            updater.apply_settings(:emoji_set)
-          end
-        end
-      end
-
       @wizard.append_step('invites') do |step|
         if SiteSetting.enable_local_logins
           staff_count = User.staff.human_users.where('username_lower not in (?)', reserved_usernames).count
@@ -299,10 +276,10 @@ class Wizard
             users = JSON.parse(updater.fields[:invite_list])
 
             users.each do |u|
-              args = {}
+              args = { email: u['email'] }
               args[:moderator] = true if u['role'] == 'moderator'
               begin
-                Invite.create_invite_by_email(u['email'], @wizard.user, args)
+                Invite.generate(@wizard.user, args)
               rescue => e
                 updater.errors.add(:invite_list, e.message.concat("<br>"))
               end
diff --git a/lib/freedom_patches/zeitwerk.rb b/lib/zeitwerk_config.rb
similarity index 100%
rename from lib/freedom_patches/zeitwerk.rb
rename to lib/zeitwerk_config.rb
diff --git a/package.json b/package.json
index 15b4d4b191..6dbc0f7f92 100644
--- a/package.json
+++ b/package.json
@@ -7,20 +7,21 @@
   "license": "GPL-2.0-only",
   "dependencies": {
     "@fortawesome/fontawesome-free": "5.11.2",
+    "@highlightjs/cdn-assets": "^10.6.0",
+    "@json-editor/json-editor": "^2.5.2",
     "@popperjs/core": "v2.0.6",
     "ace-builds": "1.4.12",
     "blueimp-file-upload": "10.13.0",
     "bootbox": "3.2.0",
     "bootstrap": "v3.4.1",
-    "chart.js": "2.9.3",
+    "chart.js": "2.9.4",
     "chartjs-plugin-datalabels": "^0.7.0",
-    "eslint-config-discourse": "^1.1.5",
-    "handlebars": "^4.7.0",
-    "highlight.js": "https://github.com/highlightjs/highlight.js",
+    "diffhtml": "^1.0.0-beta.18",
+    "eslint-config-discourse": "^1.1.8",
+    "handlebars": "^4.7.7",
     "intersection-observer": "^0.5.1",
     "jquery": "3.5.1",
     "jquery-color": "3.0.0-alpha.1",
-    "jquery-resize": "https://github.com/cowboy/jquery-resize/",
     "jquery-tags-input": "1.3.5",
     "jquery.autoellipsis": "https://github.com/pvdspek/jquery.autoellipsis",
     "magnific-popup": "1.1.0",
@@ -32,6 +33,7 @@
     "pikaday": "1.8.0",
     "resumablejs": "1.1.0",
     "spectrum-colorpicker": "1.8.0",
+    "workbox-cacheable-response": "^4.3.1",
     "workbox-core": "^4.3.1",
     "workbox-expiration": "^4.3.1",
     "workbox-routing": "^4.3.1",
@@ -40,6 +42,7 @@
   },
   "devDependencies": {
     "@arkweid/lefthook": "^0.7.2",
+    "@mixer/parallel-prettier": "^2.0.1",
     "chrome-launcher": "^0.12.0",
     "chrome-remote-interface": "^0.25",
     "lodash-cli": "https://github.com/lodash-archive/lodash-cli.git",
@@ -49,7 +52,11 @@
     "route-recognizer": "^0.3.3",
     "sinon": "^9.0.2"
   },
+  "resolutions": {
+    "lodash": "4.17.21"
+  },
   "scripts": {
-    "preinstall": "node -e \"if(process.env.npm_execpath.indexOf('yarn') === -1) throw new Error('NPM is not supported, please use Yarn instead. ')\""
+    "preinstall": "node -e \"if(process.env.npm_execpath.indexOf('yarn') === -1) throw new Error('NPM is not supported, please use Yarn instead. ')\"",
+    "postinstall": "yarn --cwd app/assets/javascripts/discourse"
   }
 }
diff --git a/plugins/discourse-details/config/locales/client.en_GB.yml b/plugins/discourse-details/config/locales/client.en_GB.yml
new file mode 100644
index 0000000000..1accf1fe30
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.en_GB.yml
@@ -0,0 +1,13 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
+  js:
+    details:
+      title: Hide Details
+    composer:
+      details_title: Summary
+      details_text: "This text will be hidden"
diff --git a/plugins/discourse-details/config/locales/client.gl.yml b/plugins/discourse-details/config/locales/client.gl.yml
index 32e31a30ab..9aa5ffed24 100644
--- a/plugins/discourse-details/config/locales/client.gl.yml
+++ b/plugins/discourse-details/config/locales/client.gl.yml
@@ -10,4 +10,4 @@ gl:
       title: Agochar detalles
     composer:
       details_title: Resumo
-      details_text: "Este texto será ocultado"
+      details_text: "Este texto será agochado"
diff --git a/plugins/discourse-details/config/locales/client.hu.yml b/plugins/discourse-details/config/locales/client.hu.yml
index 62b673d9e2..8f01164457 100644
--- a/plugins/discourse-details/config/locales/client.hu.yml
+++ b/plugins/discourse-details/config/locales/client.hu.yml
@@ -9,5 +9,5 @@ hu:
     details:
       title: Részletek elrejtése
     composer:
-      details_title: Összegzés
+      details_title: Összefoglaló
       details_text: "Ez a szöveg el lesz rejtve"
diff --git a/plugins/discourse-details/config/locales/client.ja.yml b/plugins/discourse-details/config/locales/client.ja.yml
index a3e1564918..c80a47ebb6 100644
--- a/plugins/discourse-details/config/locales/client.ja.yml
+++ b/plugins/discourse-details/config/locales/client.ja.yml
@@ -10,4 +10,4 @@ ja:
       title: 詳細を隠す
     composer:
       details_title: サマリー
-      details_text: "こちらの文字は表示させません。"
+      details_text: "この文字は表示されません。"
diff --git a/plugins/discourse-details/config/locales/client.ru.yml b/plugins/discourse-details/config/locales/client.ru.yml
index a06125f446..ff72b6854e 100644
--- a/plugins/discourse-details/config/locales/client.ru.yml
+++ b/plugins/discourse-details/config/locales/client.ru.yml
@@ -9,5 +9,5 @@ ru:
     details:
       title: Скрыть под спойлер
     composer:
-      details_title: Сводка
+      details_title: Спойлер
       details_text: "Этот текст будет скрыт"
diff --git a/plugins/discourse-details/config/locales/client.sr.yml b/plugins/discourse-details/config/locales/client.sr.yml
index 0bd36f0459..db25c9d719 100644
--- a/plugins/discourse-details/config/locales/client.sr.yml
+++ b/plugins/discourse-details/config/locales/client.sr.yml
@@ -6,5 +6,8 @@
 
 sr:
   js:
+    details:
+      title: Sakrij detalje
     composer:
       details_title: Rezime
+      details_text: "Ovaj tekst će biti sakriven"
diff --git a/plugins/discourse-details/config/locales/server.ar.yml b/plugins/discourse-details/config/locales/server.ar.yml
index 37b46e2026..1015e24c48 100644
--- a/plugins/discourse-details/config/locales/server.ar.yml
+++ b/plugins/discourse-details/config/locales/server.ar.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 ar:
-  site_settings:
-    details_enabled: 'فعّل ميزة التفاصيل. إن غيّرت هذا فيمكنك إعادة خبز (rebake) كلّ المشاركات بالأمر: ”rake posts:rebake“.'
   details:
     excerpt_details: "(انقر لتفاصيل أكثر)"
diff --git a/plugins/discourse-details/config/locales/server.be.yml b/plugins/discourse-details/config/locales/server.be.yml
index 2e3980a624..2ea77a0d35 100644
--- a/plugins/discourse-details/config/locales/server.be.yml
+++ b/plugins/discourse-details/config/locales/server.be.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-be: 
+be:
diff --git a/plugins/discourse-details/config/locales/server.bg.yml b/plugins/discourse-details/config/locales/server.bg.yml
index 6c61d82645..52333529d3 100644
--- a/plugins/discourse-details/config/locales/server.bg.yml
+++ b/plugins/discourse-details/config/locales/server.bg.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-bg: 
+bg:
diff --git a/plugins/discourse-details/config/locales/server.bs_BA.yml b/plugins/discourse-details/config/locales/server.bs_BA.yml
index a84ed11fbf..b11417dbae 100644
--- a/plugins/discourse-details/config/locales/server.bs_BA.yml
+++ b/plugins/discourse-details/config/locales/server.bs_BA.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 bs_BA:
-  site_settings:
-    details_enabled: 'Uključi opciju detalji. Ukoliko ovo izmijenite, morate odraditi ponovno pečenje svih postova koristeći: "rake posts:rebake".'
   details:
     excerpt_details: "(kliknite za više detalja)"
diff --git a/plugins/discourse-details/config/locales/server.ca.yml b/plugins/discourse-details/config/locales/server.ca.yml
index 4faf4d9238..c0d472845f 100644
--- a/plugins/discourse-details/config/locales/server.ca.yml
+++ b/plugins/discourse-details/config/locales/server.ca.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 ca:
-  site_settings:
-    details_enabled: 'Activa la característica de detalls. Si ho canvieu, haureu de refer totes les publicacions amb: "rake posts:rebake".'
   details:
     excerpt_details: "(feu clic per a més informació)"
diff --git a/plugins/discourse-details/config/locales/server.cs.yml b/plugins/discourse-details/config/locales/server.cs.yml
index f3265c8c88..041b2f0bd0 100644
--- a/plugins/discourse-details/config/locales/server.cs.yml
+++ b/plugins/discourse-details/config/locales/server.cs.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-cs: 
+cs:
diff --git a/plugins/discourse-details/config/locales/server.da.yml b/plugins/discourse-details/config/locales/server.da.yml
index 3f2f0c121f..cd0133132f 100644
--- a/plugins/discourse-details/config/locales/server.da.yml
+++ b/plugins/discourse-details/config/locales/server.da.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 da:
-  site_settings:
-    details_enabled: 'Aktivér ''detaljer'' funktion. Hvis du gennemfører denne ændring, skal du omdirigere alle indlæg med: "rake posts:rebake".'
   details:
     excerpt_details: "(klik for flere detaljer)"
diff --git a/plugins/discourse-details/config/locales/server.de.yml b/plugins/discourse-details/config/locales/server.de.yml
index 5f0c6023ab..7f7cbfede9 100644
--- a/plugins/discourse-details/config/locales/server.de.yml
+++ b/plugins/discourse-details/config/locales/server.de.yml
@@ -6,6 +6,6 @@
 
 de:
   site_settings:
-    details_enabled: 'Aktiviert die Details-Funktion. Wenn du dies änderst, musst du alle Beiträge mit folgendem Befehl aktualisieren: „rake posts:rebake“'
+    details_enabled: 'Schließe die Möglichkeit ein, einem Beitrag erweiterbare Details hinzuzufügen. Diese Funktion findest Du im Popup-Menü der Symbolleiste des Composers. Du musst alle Beiträge mit „rake posts:rebake“ neu backen, wenn du diese Einstellung änderst.'
   details:
     excerpt_details: "(klicke, um weitere Details zu sehen)"
diff --git a/plugins/discourse-details/config/locales/server.el.yml b/plugins/discourse-details/config/locales/server.el.yml
index 1de9551911..d8a3e38674 100644
--- a/plugins/discourse-details/config/locales/server.el.yml
+++ b/plugins/discourse-details/config/locales/server.el.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 el:
-  site_settings:
-    details_enabled: 'Ενεργοποιήστε τη λειτουργία λεπτομερειών. Εάν το αλλάξετε αυτό, πρέπει να κάνετε rebake όλες τις αναρτήσεις με: «rake posts: rebake».'
   details:
     excerpt_details: "(κλικ για περισσότερες λεπτομέρειες)"
diff --git a/plugins/discourse-details/config/locales/server.en.yml b/plugins/discourse-details/config/locales/server.en.yml
index 0e783318ea..a616075d71 100644
--- a/plugins/discourse-details/config/locales/server.en.yml
+++ b/plugins/discourse-details/config/locales/server.en.yml
@@ -1,5 +1,5 @@
 en:
   site_settings:
-    details_enabled: 'Enable the details feature. If you change this, you must rebake all posts with: "rake posts:rebake".'
+    details_enabled: 'Include the ability to add expandable details to a post. This feature can be found in the toolbar popup menu of the composer. You must rebake all posts with "rake posts:rebake" if you change this setting.'
   details:
     excerpt_details: "(click for more details)"
diff --git a/plugins/discourse-details/config/locales/server.en_GB.yml b/plugins/discourse-details/config/locales/server.en_GB.yml
new file mode 100644
index 0000000000..2d4fa180ec
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.en_GB.yml
@@ -0,0 +1,7 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
diff --git a/plugins/discourse-details/config/locales/server.es.yml b/plugins/discourse-details/config/locales/server.es.yml
index be4bb120ec..83661d92e3 100644
--- a/plugins/discourse-details/config/locales/server.es.yml
+++ b/plugins/discourse-details/config/locales/server.es.yml
@@ -6,6 +6,6 @@
 
 es:
   site_settings:
-    details_enabled: 'Habilitar la característica de detalles. Si cambias esto, debes hacer rebake de todos los mensajes con: «rake posts:rebake».'
+    details_enabled: 'Incluir la posibilidad de añadir detalles expandibles a las publicaciones. Esta funcionalidad se puede encontrar en el menú desplegable del editor. Debes hacer rebake de todas las publicaciones con «rake posts:rebake» si cambias este ajuste.'
   details:
-    excerpt_details: "(haz clic para más detalles)"
+    excerpt_details: "(haga clic para más detalles)"
diff --git a/plugins/discourse-details/config/locales/server.et.yml b/plugins/discourse-details/config/locales/server.et.yml
index 5702d705bb..0ea0b6d554 100644
--- a/plugins/discourse-details/config/locales/server.et.yml
+++ b/plugins/discourse-details/config/locales/server.et.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-et: 
+et:
diff --git a/plugins/discourse-details/config/locales/server.fa_IR.yml b/plugins/discourse-details/config/locales/server.fa_IR.yml
index 8d612d6353..0e23b0f18c 100644
--- a/plugins/discourse-details/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-details/config/locales/server.fa_IR.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 fa_IR:
-  site_settings:
-    details_enabled: 'به کار گرفتن جزییات. اگر این گزینه را تغییر دادید باید همه پستها را با "rake posts:rebake" بازسازی کنید.'
   details:
     excerpt_details: "(برای جزئیات بیشتر کلیک کنید)"
diff --git a/plugins/discourse-details/config/locales/server.fi.yml b/plugins/discourse-details/config/locales/server.fi.yml
index 7d22dbc813..fb2886e809 100644
--- a/plugins/discourse-details/config/locales/server.fi.yml
+++ b/plugins/discourse-details/config/locales/server.fi.yml
@@ -6,6 +6,6 @@
 
 fi:
   site_settings:
-    details_enabled: 'Ota käyttöön yksityiskohtaominaisuus. Jos muutat asetusta, sinun täytyy rakentaa viestit uudelleen komennolla: "rake posts:rebake". '
+    details_enabled: 'Sisällytä mahdollisuus lisätä laajennettavia yksityiskohtia viestiin. Tämä ominaisuus löytyy viestieditorin työkalurivin ponnahdusvalikosta. Sinun on ajettava "rake posts: rebake" -komento, jos muutat tätä asetusta.'
   details:
-    excerpt_details: "(klikkaa saadaksesi lisää tietoa)"
+    excerpt_details: "(lisätietoja napsauttamalla)"
diff --git a/plugins/discourse-details/config/locales/server.fr.yml b/plugins/discourse-details/config/locales/server.fr.yml
index cef4744344..5a72b15437 100644
--- a/plugins/discourse-details/config/locales/server.fr.yml
+++ b/plugins/discourse-details/config/locales/server.fr.yml
@@ -6,6 +6,6 @@
 
 fr:
   site_settings:
-    details_enabled: 'Activer la fonction details. Si vous modifiez ceci, vous devez exécuter la commande "rake posts:rebake".'
+    details_enabled: 'Inclut la possibilité d''ajouter des détails extensibles à un message. Cette fonctionnalité se trouve dans le menu contextuel de la barre d''outils du composeur. Vous devez reconstruire tous les messages avec "rake posts: rebake" si vous modifiez ce paramètre.'
   details:
     excerpt_details: "(cliquer pour plus de détails)"
diff --git a/plugins/discourse-details/config/locales/server.gl.yml b/plugins/discourse-details/config/locales/server.gl.yml
index eb9e857ca1..3d448f6dbd 100644
--- a/plugins/discourse-details/config/locales/server.gl.yml
+++ b/plugins/discourse-details/config/locales/server.gl.yml
@@ -5,5 +5,5 @@
 # https://translate.discourse.org/
 
 gl:
-  site_settings:
-    details_enabled: 'Activar a función de detalles. Se cambias isto, debes rebocar todas as publicacións con: "publicacións de rake: rebote".'
+  details:
+    excerpt_details: "(prema para máis detalles)"
diff --git a/plugins/discourse-details/config/locales/server.he.yml b/plugins/discourse-details/config/locales/server.he.yml
index d22884ca56..d64a64fe85 100644
--- a/plugins/discourse-details/config/locales/server.he.yml
+++ b/plugins/discourse-details/config/locales/server.he.yml
@@ -6,6 +6,6 @@
 
 he:
   site_settings:
-    details_enabled: 'הפעלת תכונת הפירוט. שינוי הגדרה זו תאלץ אותך להכין את כל הפוסטים מחדש בעזרת: „rake posts:rebake”'
+    details_enabled: 'לכלול את היכולת להוסיף פירוט מתרחב לפוסט הזה. ניתן למצוא את היכולת הזאת בתפריט הכלים הקופץ של אזור הכתיבה. עליך „לאפות מחדש” את כל הפוסטים עם „rake posts:rebake” אם בחרת לשנות את ההגדרה הזאת.'
   details:
     excerpt_details: "(לחיצה לפרטים נוספים)"
diff --git a/plugins/discourse-details/config/locales/server.hu.yml b/plugins/discourse-details/config/locales/server.hu.yml
index 2212b5da5c..81d5aaf39a 100644
--- a/plugins/discourse-details/config/locales/server.hu.yml
+++ b/plugins/discourse-details/config/locales/server.hu.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 hu:
-  site_settings:
-    details_enabled: 'Részletek funkció engedélyezése. Ha ezt megváltoztatja, akkor újra kell töltenie az összes bejegyzést ezzel: „rake posts:rebake”.'
   details:
     excerpt_details: "(kattintson a további részletekért)"
diff --git a/plugins/discourse-details/config/locales/server.hy.yml b/plugins/discourse-details/config/locales/server.hy.yml
index 348cebb044..cb18f64d35 100644
--- a/plugins/discourse-details/config/locales/server.hy.yml
+++ b/plugins/discourse-details/config/locales/server.hy.yml
@@ -5,5 +5,3 @@
 # https://translate.discourse.org/
 
 hy:
-  site_settings:
-    details_enabled: 'Միացնել մանրամասների հատկանիշը: Եթե Դուք փոփոխեք սա, Դուք պետք է թարմացնեք բոլոր գրառումները՝ "rake posts:rebake" :'
diff --git a/plugins/discourse-details/config/locales/server.id.yml b/plugins/discourse-details/config/locales/server.id.yml
index c8a5617331..bdc7f60fc5 100644
--- a/plugins/discourse-details/config/locales/server.id.yml
+++ b/plugins/discourse-details/config/locales/server.id.yml
@@ -5,5 +5,5 @@
 # https://translate.discourse.org/
 
 id:
-  site_settings:
-    details_enabled: 'Aktifkan fitur detail. Jika Anda mengganti ini, Anda perlu memproses ulang semua post dengan: "rake posts:rebake"'
+  details:
+    excerpt_details: "(klik untuk lebih jelasnya)"
diff --git a/plugins/discourse-details/config/locales/server.it.yml b/plugins/discourse-details/config/locales/server.it.yml
index 62573f53cd..b02f225c2c 100644
--- a/plugins/discourse-details/config/locales/server.it.yml
+++ b/plugins/discourse-details/config/locales/server.it.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 it:
-  site_settings:
-    details_enabled: 'Attiva la funzione dettagli. Se cambi questa impostazione, devi rielaborare tutti i Messaggi con "rake posts:rebake"'
   details:
     excerpt_details: "(clicca per ulteriori dettagli)"
diff --git a/plugins/discourse-details/config/locales/server.ja.yml b/plugins/discourse-details/config/locales/server.ja.yml
index 8c49ded641..614f734403 100644
--- a/plugins/discourse-details/config/locales/server.ja.yml
+++ b/plugins/discourse-details/config/locales/server.ja.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 ja:
-  site_settings:
-    details_enabled: '詳細機能を有効にします。これを変更した場合は、「rake posts：rebake」ですべての投稿を再作成する必要があります。'
   details:
     excerpt_details: "(詳細を見るためにクリック)"
diff --git a/plugins/discourse-details/config/locales/server.ko.yml b/plugins/discourse-details/config/locales/server.ko.yml
index 4aa773e2c4..6bc52cf577 100644
--- a/plugins/discourse-details/config/locales/server.ko.yml
+++ b/plugins/discourse-details/config/locales/server.ko.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 ko:
-  site_settings:
-    details_enabled: '상세 기능을 사용. 이를 변경하면 다음 명령어를 사용하여 모든 게시물을 다시 게시해야합니다: "rake posts:rebake".'
   details:
     excerpt_details: "(자세한 내용을 보려면 클릭하십시오)"
diff --git a/plugins/discourse-details/config/locales/server.lt.yml b/plugins/discourse-details/config/locales/server.lt.yml
index d5ca4b03ea..16bb19758d 100644
--- a/plugins/discourse-details/config/locales/server.lt.yml
+++ b/plugins/discourse-details/config/locales/server.lt.yml
@@ -5,5 +5,3 @@
 # https://translate.discourse.org/
 
 lt:
-  site_settings:
-    details_enabled: 'Įgalinti detalią funkciją. Jei tai pakeisite, turėsite paleisti iš naujo visus įrašus su: "rake posts:rebake".'
diff --git a/plugins/discourse-details/config/locales/server.lv.yml b/plugins/discourse-details/config/locales/server.lv.yml
index 5b0066d4cb..59e0ef6f4e 100644
--- a/plugins/discourse-details/config/locales/server.lv.yml
+++ b/plugins/discourse-details/config/locales/server.lv.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-lv: 
+lv:
diff --git a/plugins/discourse-details/config/locales/server.nb_NO.yml b/plugins/discourse-details/config/locales/server.nb_NO.yml
index 8326f65e6e..2e2224d147 100644
--- a/plugins/discourse-details/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-details/config/locales/server.nb_NO.yml
@@ -5,5 +5,3 @@
 # https://translate.discourse.org/
 
 nb_NO:
-  site_settings:
-    details_enabled: 'Aktiver funksjonen for detaljer. Hvis du endrer dette, må du rebake alle innlegg med: "rake posts:rebake".'
diff --git a/plugins/discourse-details/config/locales/server.nl.yml b/plugins/discourse-details/config/locales/server.nl.yml
index 4f4c64a534..2f82311688 100644
--- a/plugins/discourse-details/config/locales/server.nl.yml
+++ b/plugins/discourse-details/config/locales/server.nl.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 nl:
-  site_settings:
-    details_enabled: 'De details-functie inschakelen. Als u dit wijzigt, moet u alle berichten opnieuw opbouwen met: ''rake posts:rebake''.'
   details:
     excerpt_details: "(klik voor meer details)"
diff --git a/plugins/discourse-details/config/locales/server.pl_PL.yml b/plugins/discourse-details/config/locales/server.pl_PL.yml
index 763488e3cf..f9ddad8a8c 100644
--- a/plugins/discourse-details/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-details/config/locales/server.pl_PL.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 pl_PL:
-  site_settings:
-    details_enabled: 'Aktywuj funkcjonalność detali. Jeśli zmienisz tę opcję, będziesz musiał ponownie rebake’ować wszystkie posty przy użyciu "rake posts:rebake".'
   details:
     excerpt_details: "(kliknij, by wyświetlić więcej szczegółów)"
diff --git a/plugins/discourse-details/config/locales/server.pt.yml b/plugins/discourse-details/config/locales/server.pt.yml
index 04537d15dc..f13c16f31e 100644
--- a/plugins/discourse-details/config/locales/server.pt.yml
+++ b/plugins/discourse-details/config/locales/server.pt.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 pt:
-  site_settings:
-    details_enabled: 'Ative a funcionalidade de detalhes. Se alterar isto, deve refazer todas as mensagens com: "rake posts:rebake".'
   details:
     excerpt_details: "(clique para mais detalhes)"
diff --git a/plugins/discourse-details/config/locales/server.pt_BR.yml b/plugins/discourse-details/config/locales/server.pt_BR.yml
index cf5438f22a..53036e80dd 100644
--- a/plugins/discourse-details/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-details/config/locales/server.pt_BR.yml
@@ -6,6 +6,6 @@
 
 pt_BR:
   site_settings:
-    details_enabled: 'Habilitar o recurso de detalhes. Se você mudar isso, você deve recompilar todas as postagens com: "rake posts:rebake".'
+    details_enabled: 'Inclui a possibilidade de adicionar detalhes expansíveis em uma postagem. Esse recurso pode ser encontrado no menu popup de ferramentas do editor. Você deve refazer todas as postagens com "rake posts:rebake" se alterar essa configuração.'
   details:
     excerpt_details: "(clique para mais detalhes)"
diff --git a/plugins/discourse-details/config/locales/server.ro.yml b/plugins/discourse-details/config/locales/server.ro.yml
index 307f5c99c7..234f762be1 100644
--- a/plugins/discourse-details/config/locales/server.ro.yml
+++ b/plugins/discourse-details/config/locales/server.ro.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 ro:
-  site_settings:
-    details_enabled: 'Activați funcția de detalii. Dacă schimbați acest lucru, trebuie să reluați toate mesajele cu: "rake posts: rebake".'
   details:
     excerpt_details: "(click pentru mai multe detalii)"
diff --git a/plugins/discourse-details/config/locales/server.ru.yml b/plugins/discourse-details/config/locales/server.ru.yml
index 4750d960e4..334dff7f66 100644
--- a/plugins/discourse-details/config/locales/server.ru.yml
+++ b/plugins/discourse-details/config/locales/server.ru.yml
@@ -6,6 +6,6 @@
 
 ru:
   site_settings:
-    details_enabled: 'Включить дополнительные возможности. Если вы измените данный пункт, то потребуется обновить все сообщения при помощи команды: "rake posts:rebake"'
+    details_enabled: 'Включить возможность скрывать текст сообщения под спойлер. Эту функцию можно найти в выпадающем меню на панели инструментов редактора. Если вы измените эту настройку, то необходимо перезаписать все сообщения, выполнив команду ''rake posts:rebake''.'
   details:
     excerpt_details: "(нажмите для более подробной информации)"
diff --git a/plugins/discourse-details/config/locales/server.sk.yml b/plugins/discourse-details/config/locales/server.sk.yml
index 9f3f91d179..6f81562408 100644
--- a/plugins/discourse-details/config/locales/server.sk.yml
+++ b/plugins/discourse-details/config/locales/server.sk.yml
@@ -5,5 +5,3 @@
 # https://translate.discourse.org/
 
 sk:
-  site_settings:
-    details_enabled: 'Povoliť vlastnosť detailov. Ak toto zmeníte, musíte znovu sparsovať všetky príspevky: "rake posts:rebake".'
diff --git a/plugins/discourse-details/config/locales/server.sl.yml b/plugins/discourse-details/config/locales/server.sl.yml
index cb55dbf3f0..759eef414b 100644
--- a/plugins/discourse-details/config/locales/server.sl.yml
+++ b/plugins/discourse-details/config/locales/server.sl.yml
@@ -6,6 +6,6 @@
 
 sl:
   site_settings:
-    details_enabled: 'Omogočite funkcijo skrivanja podrobnosti. Če to kasneje spremenite, morate vse objave posodobiti z: "rake posts: rebake".'
+    details_enabled: 'Vključite možnost dodajanja razširljivih podrobnosti v objavo. To funkcijo najdete v pojavnem oknu orodne vrstice urejevalnika. Če spremenite to nastavitev, morate ponovno zapeči vse objave z »rake posts:rebake«.'
   details:
     excerpt_details: "(kliknite za več podrobnosti)"
diff --git a/plugins/discourse-details/config/locales/server.sq.yml b/plugins/discourse-details/config/locales/server.sq.yml
index 1413494f57..7f051b7a7c 100644
--- a/plugins/discourse-details/config/locales/server.sq.yml
+++ b/plugins/discourse-details/config/locales/server.sq.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sq: 
+sq:
diff --git a/plugins/discourse-details/config/locales/server.sr.yml b/plugins/discourse-details/config/locales/server.sr.yml
index adfafeee68..55aaa87f0f 100644
--- a/plugins/discourse-details/config/locales/server.sr.yml
+++ b/plugins/discourse-details/config/locales/server.sr.yml
@@ -4,4 +4,8 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sr: 
+sr:
+  site_settings:
+    details_enabled: 'Uključite mogućnost za dodavanje detalja koji se proširuju u poruci. Ovu funkciju možete naći u iskačućem meniju u traci sa alatkama composera. Morate osvežiti sve poruke sa "rake posts:rebake" kada promenite ovu postavku.'
+  details:
+    excerpt_details: "(klikni za više detalja)"
diff --git a/plugins/discourse-details/config/locales/server.sv.yml b/plugins/discourse-details/config/locales/server.sv.yml
index 4f20377803..8bb20f79f2 100644
--- a/plugins/discourse-details/config/locales/server.sv.yml
+++ b/plugins/discourse-details/config/locales/server.sv.yml
@@ -6,6 +6,6 @@
 
 sv:
   site_settings:
-    details_enabled: 'Aktivera detaljfunktionen. Om du ändrar det här så måste du uppdatera alla inlägg med: "rake posts:rebake".'
+    details_enabled: 'Inkludera möjligheten att lägga till expanderbara detaljer till ett inlägg. Den här funktionen finns i redigerarens popup-verktygsfält. Du måste uppdatera alla inlägg med "rake posts:rebake" om du ändrar denna inställning.'
   details:
     excerpt_details: "(klicka för mer detaljer)"
diff --git a/plugins/discourse-details/config/locales/server.sw.yml b/plugins/discourse-details/config/locales/server.sw.yml
index bf450b86e7..0d7cdd075b 100644
--- a/plugins/discourse-details/config/locales/server.sw.yml
+++ b/plugins/discourse-details/config/locales/server.sw.yml
@@ -5,5 +5,3 @@
 # https://translate.discourse.org/
 
 sw:
-  site_settings:
-    details_enabled: 'Wezesha Vipengele vya maelezo. Na kama ukibadilisha, lazima useti machapisho yote kwa kutumia: "rake posts:rebake".'
diff --git a/plugins/discourse-details/config/locales/server.te.yml b/plugins/discourse-details/config/locales/server.te.yml
index ac5d945ae8..03967bdbb0 100644
--- a/plugins/discourse-details/config/locales/server.te.yml
+++ b/plugins/discourse-details/config/locales/server.te.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-te: 
+te:
diff --git a/plugins/discourse-details/config/locales/server.th.yml b/plugins/discourse-details/config/locales/server.th.yml
index 9b38ad300e..7de85ff91c 100644
--- a/plugins/discourse-details/config/locales/server.th.yml
+++ b/plugins/discourse-details/config/locales/server.th.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-th: 
+th:
diff --git a/plugins/discourse-details/config/locales/server.tr_TR.yml b/plugins/discourse-details/config/locales/server.tr_TR.yml
index 697eecc63b..a8c313fc73 100644
--- a/plugins/discourse-details/config/locales/server.tr_TR.yml
+++ b/plugins/discourse-details/config/locales/server.tr_TR.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 tr_TR:
-  site_settings:
-    details_enabled: 'Ayrıntılar özelliğini etkinleştirin. Bunu değiştirirseniz, tüm gönderileri şu şekilde yeniden almalısınız: "rake posts: rebake"'
   details:
     excerpt_details: "(daha fazla ayrıntı için tıklayın)"
diff --git a/plugins/discourse-details/config/locales/server.uk.yml b/plugins/discourse-details/config/locales/server.uk.yml
index 4649cbca9b..97b8f4a883 100644
--- a/plugins/discourse-details/config/locales/server.uk.yml
+++ b/plugins/discourse-details/config/locales/server.uk.yml
@@ -6,6 +6,6 @@
 
 uk:
   site_settings:
-    details_enabled: 'Увімкніть функцію деталей. Якщо змінити, то потрібно відредагувати всі дописи: "rake posts:rebake".'
+    details_enabled: 'Включіть можливість приховати текст повідомлення під спойлер. Цю функцію можна знайти у спливаючому меню на панелі інструментів редактора. Якщо ви зміните це налаштування, вам доведеться перезаписати всі повідомлення, виконавши команду "rake posts: rebake".'
   details:
     excerpt_details: "(натисніть для отримання детальної інформації)"
diff --git a/plugins/discourse-details/config/locales/server.ur.yml b/plugins/discourse-details/config/locales/server.ur.yml
index 461d7ce167..ad8984b4c6 100644
--- a/plugins/discourse-details/config/locales/server.ur.yml
+++ b/plugins/discourse-details/config/locales/server.ur.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 ur:
-  site_settings:
-    details_enabled: 'تفصیلات کی خصوصیت فعال کریں۔ اگر آپ اس کو تبدیل کرتے ہیں تو، آپ کو تمام پوسٹس کو دوبارہ رِیبَیک کرنا ہوگا: "rake posts:rebake"'
   details:
     excerpt_details: "(مزید تفصیلات کیلئے کلک کریں)"
diff --git a/plugins/discourse-details/config/locales/server.vi.yml b/plugins/discourse-details/config/locales/server.vi.yml
index 0769cb9df6..d615b1d10b 100644
--- a/plugins/discourse-details/config/locales/server.vi.yml
+++ b/plugins/discourse-details/config/locales/server.vi.yml
@@ -5,7 +5,5 @@
 # https://translate.discourse.org/
 
 vi:
-  site_settings:
-    details_enabled: 'Bật tính năng chi tiết. Nếu bạn thay đổi điều này, bạn phải rebake tất cả các bài viết với: "rake posts:rebake".'
   details:
     excerpt_details: "(bấm để biết thêm chi tiết)"
diff --git a/plugins/discourse-details/config/locales/server.zh_CN.yml b/plugins/discourse-details/config/locales/server.zh_CN.yml
index e52b152fcb..4656ffc522 100644
--- a/plugins/discourse-details/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-details/config/locales/server.zh_CN.yml
@@ -6,6 +6,6 @@
 
 zh_CN:
   site_settings:
-    details_enabled: '启用细节功能。如果你改变了这个选项，必须通过此命令重新调制全部帖子："rake posts:rebake"。'
+    details_enabled: '为帖子启用“添加可展开的详细信息”功能。此功能可在编辑器的工具栏弹出菜单中找到。如果你修改了这个设置，你必须使用“rake posts:rebake”重制所有帖子。'
   details:
     excerpt_details: "（点击显示详情）"
diff --git a/plugins/discourse-details/config/locales/server.zh_TW.yml b/plugins/discourse-details/config/locales/server.zh_TW.yml
index 831b6f16fb..7e15fab001 100644
--- a/plugins/discourse-details/config/locales/server.zh_TW.yml
+++ b/plugins/discourse-details/config/locales/server.zh_TW.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-zh_TW: 
+zh_TW:
diff --git a/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6 b/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6
index 2a72387f4b..34f0437f62 100644
--- a/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6
+++ b/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
+import I18n from "I18n";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 
diff --git a/plugins/discourse-details/test/javascripts/lib/details-cooked-test.js.es6 b/plugins/discourse-details/test/javascripts/lib/details-cooked-test.js.es6
index b9587612cf..1962054ab9 100644
--- a/plugins/discourse-details/test/javascripts/lib/details-cooked-test.js.es6
+++ b/plugins/discourse-details/test/javascripts/lib/details-cooked-test.js.es6
@@ -5,7 +5,7 @@ module("lib:details-cooked-test");
 const defaultOpts = buildOptions({
   siteSettings: {
     enable_emoji: true,
-    emoji_set: "emoji_one",
+    emoji_set: "google_classic",
     highlighted_languages: "json|ruby|javascript",
     default_code_lang: "auto",
   },
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 e304337903..454bf9ea9a 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,17 +1,17 @@
-import I18n from "I18n";
-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, { observes } from "discourse-common/utils/decorators";
-import { cookAsync } from "discourse/lib/text";
-import discourseDebounce from "discourse/lib/debounce";
+import Component from "@ember/component";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
+import { Promise } from "rsvp";
+import { cookAsync } from "discourse/lib/text";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { isEmpty } from "@ember/utils";
+import loadScript from "discourse/lib/load-script";
+import { notEmpty } from "@ember/object/computed";
+import { propertyNotEqual } from "discourse/lib/computed";
+import { schedule } from "@ember/runloop";
 
 export default Component.extend({
   timeFormat: "HH:mm:ss",
@@ -56,18 +56,24 @@ export default Component.extend({
   },
 
   @observes("markup")
-  _renderPreview: discourseDebounce(function () {
-    const markup = this.markup;
+  _renderPreview() {
+    discourseDebounce(
+      this,
+      function () {
+        const markup = this.markup;
 
-    if (markup) {
-      cookAsync(markup).then((result) => {
-        this.set("currentPreview", result);
-        schedule("afterRender", () =>
-          this.$(".preview .discourse-local-date").applyLocalDates()
-        );
-      });
-    }
-  }, INPUT_DELAY),
+        if (markup) {
+          cookAsync(markup).then((result) => {
+            this.set("currentPreview", result);
+            schedule("afterRender", () =>
+              this.$(".preview .discourse-local-date").applyLocalDates()
+            );
+          });
+        }
+      },
+      INPUT_DELAY
+    );
+  },
 
   @computed("date", "toDate", "toTime")
   isRange(date, toDate, toTime) {
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 7ed2756635..c4633d1f85 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,6 +1,6 @@
-import { withPluginApi } from "discourse/lib/plugin-api";
-import showModal from "discourse/lib/show-modal";
 import LocalDateBuilder from "../lib/local-date-builder";
+import showModal from "discourse/lib/show-modal";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 const DATE_TEMPLATE = `
   <span>
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
index eacbcba47f..d82cfa4d0d 100644
--- 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
@@ -10,7 +10,7 @@ const { getProperties } = Ember;
   - 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
+  - unitRepetitionsBetweenDates(duration, date) return the number of repertitions of
   duration between two dates, eg for duration: "1.weeks", "2.months"...
 */
 export default class DateWithZoneHelper {
@@ -35,11 +35,18 @@ export default class DateWithZoneHelper {
     return this.datetime.tz(this.localTimezone).isDST();
   }
 
-  repetitionsBetweenDates(duration, date) {
+  unitRepetitionsBetweenDates(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));
+    // get the diff in the specified units with decimals
+    const diff = Math.abs(this.datetime.diff(date, unit, true));
+    // get integer count of duration in diff, eg: 4 hours diff is 2 for 2.hours duration
+    const integer = Math.trunc(diff / count);
+    // get fractional to define if we have to add one "duration"
+    const fractional = (diff / count) % 1;
+
+    return (
+      integer * parseInt(count, 10) + (fractional > 0 ? parseInt(count, 10) : 0)
+    );
   }
 
   add(count, unit) {
diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6
index 8ea3c13a4a..09eba6c253 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6
@@ -25,7 +25,7 @@ function addLocalDate(buffer, matches, state) {
   config.format = parsed.attrs.format;
   config.calendar = parsed.attrs.calendar;
   config.time = parsed.attrs.time;
-  config.timezone = parsed.attrs.timezone;
+  config.timezone = (parsed.attrs.timezone || "").trim();
   config.recurring = parsed.attrs.recurring;
   config.timezones = parsed.attrs.timezones;
   config.displayedTimezone = parsed.attrs.displayedTimezone;
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 a6771da39a..915d87ccf6 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,5 +1,5 @@
-import I18n from "I18n";
 import DateWithZoneHelper from "./date-with-zone-helper";
+import I18n from "I18n";
 
 const TIME_FORMAT = "LLL";
 const DATE_FORMAT = "LL";
@@ -47,15 +47,15 @@ export default class LocalDateBuilder {
       localTimezone: this.localTimezone,
     });
 
-    if (this.recurring) {
-      const [count, type] = this.recurring.split(".");
+    if (this.recurring && moment().isAfter(localDate.datetime)) {
+      const type = this.recurring.split(".")[1];
 
-      const repetitionsForType = localDate.repetitionsBetweenDates(
+      const repetitionsForType = localDate.unitRepetitionsBetweenDates(
         this.recurring,
         moment.tz(this.localTimezone)
       );
 
-      localDate = localDate.add(repetitionsForType + parseInt(count, 10), type);
+      localDate = localDate.add(repetitionsForType, type);
     }
 
     const previews = this._generatePreviews(localDate, displayedTimezone);
diff --git a/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss b/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
index 937b8c8b7c..08436eb090 100644
--- a/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
+++ b/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
@@ -201,7 +201,7 @@
           flex: 1;
           @include ellipsis;
           width: 100%;
-          text-align: left;
+          justify-content: flex-start;
         }
       }
 
@@ -229,15 +229,14 @@
 
         .d-icon {
           color: var(--primary-medium);
+          margin-right: 0.5em;
         }
 
         .time-picker {
-          outline: none;
           box-shadow: none;
           margin: 0;
           box-sizing: border-box;
           width: 100%;
-          border: 0;
         }
       }
     }
diff --git a/plugins/discourse-local-dates/config/locales/client.be.yml b/plugins/discourse-local-dates/config/locales/client.be.yml
index 2e3980a624..2ea77a0d35 100644
--- a/plugins/discourse-local-dates/config/locales/client.be.yml
+++ b/plugins/discourse-local-dates/config/locales/client.be.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-be: 
+be:
diff --git a/plugins/discourse-local-dates/config/locales/client.cs.yml b/plugins/discourse-local-dates/config/locales/client.cs.yml
index 15368b098a..cab5bfb3ee 100644
--- a/plugins/discourse-local-dates/config/locales/client.cs.yml
+++ b/plugins/discourse-local-dates/config/locales/client.cs.yml
@@ -9,4 +9,5 @@ cs:
     discourse_local_dates:
       create:
         form:
+          date_title: Datum
           time_title: Čas
diff --git a/plugins/discourse-local-dates/config/locales/client.da.yml b/plugins/discourse-local-dates/config/locales/client.da.yml
index 1019736ef0..126c6f28f2 100644
--- a/plugins/discourse-local-dates/config/locales/client.da.yml
+++ b/plugins/discourse-local-dates/config/locales/client.da.yml
@@ -11,15 +11,18 @@ da:
         today: I dag %{time}
         tomorrow: I morgen %{time}
         yesterday: I går %{time}
+        countdown:
+          passed: dato er passeret
       title: Indsæt dato / tid
       create:
         form:
           insert: Indsæt
           advanced_mode: Avanceret tilstand
           simple_mode: Enkel tilstand
+          format_description: "Format, der bruges til at vise datoen for brugeren. Brug Z til at vise forskydningen og zz for tidszonenavnet."
           timezones_title: Tidszoner, der skal vises
           timezones_description: Tidszoner vil blive brugt til at vise datoer i forhåndsvisning og fallback.
-          recurring_title: Tilbagevenden
+          recurring_title: Gentagelse
           recurring_description: "Definer gentagelsen af en begivenhed. Du kan også manuelt redigere den tilbagevendende mulighed genereret af formularen og bruge en af følgende nøgler: år, kvartaler, måneder, uger, dage, timer, minutter, sekunder, millisekunder."
           recurring_none: Ingen gentagelse
           invalid_date: Ugyldig dato, sørg for, at dato og klokkeslæt er korrekte
diff --git a/plugins/discourse-local-dates/config/locales/client.en_GB.yml b/plugins/discourse-local-dates/config/locales/client.en_GB.yml
new file mode 100644
index 0000000000..2d4fa180ec
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.en_GB.yml
@@ -0,0 +1,7 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
diff --git a/plugins/discourse-local-dates/config/locales/client.es.yml b/plugins/discourse-local-dates/config/locales/client.es.yml
index 22bcc5f9c3..a40482ef8e 100644
--- a/plugins/discourse-local-dates/config/locales/client.es.yml
+++ b/plugins/discourse-local-dates/config/locales/client.es.yml
@@ -19,6 +19,7 @@ es:
           insert: Insertar
           advanced_mode: Modo avanzado
           simple_mode: Modo simple
+          format_description: "Formato usado para mostrarle la fecha a los usuarios. Usa Z para mostrar la diferencia horaria y zz para el nombre de la zona horaria."
           timezones_title: Zonas horarias que se muestran
           timezones_description: Las zonas horarias se usarán para mostrar las fechas en vista previa y retrospectiva.
           recurring_title: Recurrencia
diff --git a/plugins/discourse-local-dates/config/locales/client.et.yml b/plugins/discourse-local-dates/config/locales/client.et.yml
index e2cf9c7403..b3a1f76637 100644
--- a/plugins/discourse-local-dates/config/locales/client.et.yml
+++ b/plugins/discourse-local-dates/config/locales/client.et.yml
@@ -11,3 +11,4 @@ et:
         form:
           date_title: Date
           time_title: Aeg
+          timezone: Ajavöönd
diff --git a/plugins/discourse-local-dates/config/locales/client.fi.yml b/plugins/discourse-local-dates/config/locales/client.fi.yml
index 9db44aac66..f451e4102f 100644
--- a/plugins/discourse-local-dates/config/locales/client.fi.yml
+++ b/plugins/discourse-local-dates/config/locales/client.fi.yml
@@ -19,6 +19,7 @@ fi:
           insert: Lisää
           advanced_mode: Lisäasetukset
           simple_mode: Piilota lisäasetukset
+          format_description: "Muotoilu jota käytetään päivämäärän näyttämiseen käyttäjälle. Aseta Z näyttääksesi siirtymän ja zz aikavyöhykkeen nimeksi."
           timezones_title: Näytettävät aikavyöhykkeet
           timezones_description: Aikavyöhykkeitä käytetään esikatselussa sekä varana virhetilanteissa.
           recurring_title: Toistuvuus
diff --git a/plugins/discourse-local-dates/config/locales/client.fr.yml b/plugins/discourse-local-dates/config/locales/client.fr.yml
index 5dd35eefac..3b814fb95f 100644
--- a/plugins/discourse-local-dates/config/locales/client.fr.yml
+++ b/plugins/discourse-local-dates/config/locales/client.fr.yml
@@ -13,7 +13,7 @@ fr:
         yesterday: Hier %{time}
         countdown:
           passed: la date est passée
-      title: Insérer date / heure
+      title: Insérer une date et une heure
       create:
         form:
           insert: Insérer
@@ -23,12 +23,12 @@ 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 clés 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, vérifiez que la date et l'heure sont correctes
           date_title: Date
           time_title: Heure
-          format_title: Format de date
+          format_title: Format de la date
           timezone: Fuseau horaire
           until: Jusqu'à…
           recurring:
diff --git a/plugins/discourse-local-dates/config/locales/client.gl.yml b/plugins/discourse-local-dates/config/locales/client.gl.yml
index 3a6d46194e..9deeeb76e3 100644
--- a/plugins/discourse-local-dates/config/locales/client.gl.yml
+++ b/plugins/discourse-local-dates/config/locales/client.gl.yml
@@ -19,13 +19,17 @@ gl:
           insert: Inserir
           advanced_mode: Modo avanzado
           simple_mode: Modo simple
+          format_description: "Formato usado para presentarlle a data ao usuario. Use Z para amosar o desprazamento e zz para o nome da zona horaria."
+          timezones_title: Zonas horarias que presentar
+          timezones_description: As zonas horarias utilizaranse para presentar datas na visualización previa e na alternativa.
           recurring_title: Periodicidade
+          recurring_description: "Define a recorrencia dun evento. Tamén pode editar manualmente a opción recorrente xerada polo formulario e usar unha das seguintes claves: anos, trimestres, meses, semanas, días, horas, minutos, segundos, milisegundos."
           recurring_none: Sen periodicidade
-          invalid_date: Data non válida; asegúrate de que data e hora son correctas
+          invalid_date: Data incorrecta; asegúrese de que data e hora son correctas
           date_title: Data
           time_title: Hora
           format_title: Formato da data
-          timezone: Fuso horario
+          timezone: Zona horaria
           until: Ata...
           recurring:
             every_day: "Todos os días"
diff --git a/plugins/discourse-local-dates/config/locales/client.id.yml b/plugins/discourse-local-dates/config/locales/client.id.yml
index 6ab6a39dd9..8adbc80219 100644
--- a/plugins/discourse-local-dates/config/locales/client.id.yml
+++ b/plugins/discourse-local-dates/config/locales/client.id.yml
@@ -11,11 +11,25 @@ id:
         today: Hari ini 1 %{time}
         tomorrow: Besok 1 %{time}
         yesterday: Kemarin 1 %{time}
+      title: Masukkan tanggal / waktu
       create:
         form:
           insert: Masukkan
           advanced_mode: Mode lanjutan
           simple_mode: Mode sederhana
           timezones_title: Zona waktu yang ditampilkan
+          invalid_date: Tanggal tidak valid, pastikan tanggal dan waktu sudah benar
           date_title: Tanggal
+          time_title: Waktu
+          format_title: Format tanggal
           timezone: Zona Waktu
+          until: Sampai...
+          recurring:
+            every_day: "Setiap hari"
+            every_week: "Setiap pekan"
+            every_two_weeks: "Setiap dua pekan"
+            every_month: "Setiap bulan"
+            every_two_months: "Setiap dua bulan"
+            every_three_months: "Setiap tiga bulan"
+            every_six_months: "Setiap enam bulan"
+            every_year: "Setiap tahun"
diff --git a/plugins/discourse-local-dates/config/locales/client.ja.yml b/plugins/discourse-local-dates/config/locales/client.ja.yml
index ecc9f04f15..77188244cd 100644
--- a/plugins/discourse-local-dates/config/locales/client.ja.yml
+++ b/plugins/discourse-local-dates/config/locales/client.ja.yml
@@ -19,6 +19,7 @@ ja:
           insert: 挿入
           advanced_mode: アドバンスドモード
           simple_mode: シンプルモード
+          format_description: "ユーザーに日付を表示するために使用されるフォーマット。タイムゾーン名を表示するにはzz、オフセットを表示するにはZを使用します。"
           timezones_title: 表示するタイムゾーン
           timezones_description: タイムゾーンは、プレビューとフォールバックで日付を表示するために使用されます。
           recurring_title: レジューム
diff --git a/plugins/discourse-local-dates/config/locales/client.nl.yml b/plugins/discourse-local-dates/config/locales/client.nl.yml
index 301457eab1..2262a1eddc 100644
--- a/plugins/discourse-local-dates/config/locales/client.nl.yml
+++ b/plugins/discourse-local-dates/config/locales/client.nl.yml
@@ -18,7 +18,7 @@ nl:
         form:
           insert: Invoegen
           advanced_mode: Geavanceerde modus
-          simple_mode: Eenvoudige modus
+          simple_mode: Simpele modus
           format_description: "Gebruikte notatie om de datum aan de gebruiker weer te geven. Gebruik Z om de offset te tonen en zz voor de tijdzonenaam."
           timezones_title: Tijdzones om weer te geven
           timezones_description: Tijdzones worden gebruikt voor het weergeven van datums in voorbeeld en terugval.
diff --git a/plugins/discourse-local-dates/config/locales/client.pt.yml b/plugins/discourse-local-dates/config/locales/client.pt.yml
index 200ada6087..bb2d137fcc 100644
--- a/plugins/discourse-local-dates/config/locales/client.pt.yml
+++ b/plugins/discourse-local-dates/config/locales/client.pt.yml
@@ -19,6 +19,7 @@ pt:
           insert: Inserir
           advanced_mode: Modo Avançado
           simple_mode: Modo Simples
+          format_description: "Formato usado para mostrar a data ao utilizador. Use Z para mostrar a diferença e zz para o nome do fuso horário."
           timezones_title: Fuso horário a exibir
           timezones_description: O fuso horário será utilizado para exibir as datas na pré-visualização e "fallback".
           recurring_title: Recorrência
diff --git a/plugins/discourse-local-dates/config/locales/client.sl.yml b/plugins/discourse-local-dates/config/locales/client.sl.yml
index 053afa3e3c..696f20f4c2 100644
--- a/plugins/discourse-local-dates/config/locales/client.sl.yml
+++ b/plugins/discourse-local-dates/config/locales/client.sl.yml
@@ -19,6 +19,7 @@ sl:
           insert: Dodaj
           advanced_mode: Napredni način
           simple_mode: Enostavni način
+          format_description: "Format, uporabljen za prikaz datuma uporabniku. Uporabite Z, da prikažete odmik in zz za ime časovnega pasu."
           timezones_title: Časovni pas za prikaz
           timezones_description: Časovni pas bo uporabljen za prikaz v predogledu ali kot rezerva.
           recurring_title: Ponovitev
diff --git a/plugins/discourse-local-dates/config/locales/client.tr_TR.yml b/plugins/discourse-local-dates/config/locales/client.tr_TR.yml
index cf68ea7414..558a057126 100644
--- a/plugins/discourse-local-dates/config/locales/client.tr_TR.yml
+++ b/plugins/discourse-local-dates/config/locales/client.tr_TR.yml
@@ -19,6 +19,7 @@ tr_TR:
           insert: Ekle
           advanced_mode: Gelişmiş mod
           simple_mode: Basit mod
+          format_description: "Tarihi kullanıcıya göstermek için kullanılan format. Saat dilimi adı için uzaklığı ve zz'yi göstermek için Z'yi kullanın."
           timezones_title: Görüntülenecek zaman dilimleri
           timezones_description: Saat dilimleri önizleme ve geri dönüş tarihlerini görüntülemek için kullanılacaktır.
           recurring_title: Yinelenme
diff --git a/plugins/discourse-local-dates/config/locales/client.zh_CN.yml b/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
index 5887d28aaf..95953c19b9 100644
--- a/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
@@ -8,9 +8,9 @@ zh_CN:
   js:
     discourse_local_dates:
       relative_dates:
-        today: 今天%{time}
-        tomorrow: 明天%{time}
-        yesterday: 昨天%{time}
+        today: 今天 %{time}
+        tomorrow: 明天 %{time}
+        yesterday: 昨天 %{time}
         countdown:
           passed: 日期已过
       title: 插入日期/时间
diff --git a/plugins/discourse-local-dates/config/locales/server.be.yml b/plugins/discourse-local-dates/config/locales/server.be.yml
index 2e3980a624..2ea77a0d35 100644
--- a/plugins/discourse-local-dates/config/locales/server.be.yml
+++ b/plugins/discourse-local-dates/config/locales/server.be.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-be: 
+be:
diff --git a/plugins/discourse-local-dates/config/locales/server.cs.yml b/plugins/discourse-local-dates/config/locales/server.cs.yml
index f3265c8c88..041b2f0bd0 100644
--- a/plugins/discourse-local-dates/config/locales/server.cs.yml
+++ b/plugins/discourse-local-dates/config/locales/server.cs.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-cs: 
+cs:
diff --git a/plugins/discourse-local-dates/config/locales/server.en_GB.yml b/plugins/discourse-local-dates/config/locales/server.en_GB.yml
new file mode 100644
index 0000000000..2d4fa180ec
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.en_GB.yml
@@ -0,0 +1,7 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
diff --git a/plugins/discourse-local-dates/config/locales/server.et.yml b/plugins/discourse-local-dates/config/locales/server.et.yml
index 5702d705bb..0ea0b6d554 100644
--- a/plugins/discourse-local-dates/config/locales/server.et.yml
+++ b/plugins/discourse-local-dates/config/locales/server.et.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-et: 
+et:
diff --git a/plugins/discourse-local-dates/config/locales/server.gl.yml b/plugins/discourse-local-dates/config/locales/server.gl.yml
index 0b8e230d47..10ee1d0a22 100644
--- a/plugins/discourse-local-dates/config/locales/server.gl.yml
+++ b/plugins/discourse-local-dates/config/locales/server.gl.yml
@@ -4,4 +4,9 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-gl: 
+gl:
+  site_settings:
+    discourse_local_dates_enabled: "Activar a funcionalidade discourse-local-dates. Isto permitirá avisos sobre datas na zona horaria local nas publicacións que utilicen o elemento [date]."
+    discourse_local_dates_default_formats: "Formatos de hora e data utilizados con frecuencia, vexa: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
+    discourse_local_dates_default_timezones: "A lista predeterminada de zonas horarias debe ser válida <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
+    discourse_local_dates_email_format: "Formato usado para presentar unha data nas mensaxes de correo."
diff --git a/plugins/discourse-local-dates/config/locales/server.hu.yml b/plugins/discourse-local-dates/config/locales/server.hu.yml
index 0a2b3ed09f..76b6e9d8bc 100644
--- a/plugins/discourse-local-dates/config/locales/server.hu.yml
+++ b/plugins/discourse-local-dates/config/locales/server.hu.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-hu: 
+hu:
diff --git a/plugins/discourse-local-dates/config/locales/server.id.yml b/plugins/discourse-local-dates/config/locales/server.id.yml
index a4d1527157..596e36b2e1 100644
--- a/plugins/discourse-local-dates/config/locales/server.id.yml
+++ b/plugins/discourse-local-dates/config/locales/server.id.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-id: 
+id:
diff --git a/plugins/discourse-local-dates/config/locales/server.lv.yml b/plugins/discourse-local-dates/config/locales/server.lv.yml
index 5b0066d4cb..59e0ef6f4e 100644
--- a/plugins/discourse-local-dates/config/locales/server.lv.yml
+++ b/plugins/discourse-local-dates/config/locales/server.lv.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-lv: 
+lv:
diff --git a/plugins/discourse-local-dates/config/locales/server.sq.yml b/plugins/discourse-local-dates/config/locales/server.sq.yml
index 1413494f57..7f051b7a7c 100644
--- a/plugins/discourse-local-dates/config/locales/server.sq.yml
+++ b/plugins/discourse-local-dates/config/locales/server.sq.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sq: 
+sq:
diff --git a/plugins/discourse-local-dates/config/locales/server.sr.yml b/plugins/discourse-local-dates/config/locales/server.sr.yml
index adfafeee68..88d63d6ae1 100644
--- a/plugins/discourse-local-dates/config/locales/server.sr.yml
+++ b/plugins/discourse-local-dates/config/locales/server.sr.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sr: 
+sr:
diff --git a/plugins/discourse-local-dates/config/locales/server.te.yml b/plugins/discourse-local-dates/config/locales/server.te.yml
index ac5d945ae8..03967bdbb0 100644
--- a/plugins/discourse-local-dates/config/locales/server.te.yml
+++ b/plugins/discourse-local-dates/config/locales/server.te.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-te: 
+te:
diff --git a/plugins/discourse-local-dates/config/locales/server.th.yml b/plugins/discourse-local-dates/config/locales/server.th.yml
index 9b38ad300e..7de85ff91c 100644
--- a/plugins/discourse-local-dates/config/locales/server.th.yml
+++ b/plugins/discourse-local-dates/config/locales/server.th.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-th: 
+th:
diff --git a/plugins/discourse-local-dates/config/locales/server.zh_TW.yml b/plugins/discourse-local-dates/config/locales/server.zh_TW.yml
index 831b6f16fb..7e15fab001 100644
--- a/plugins/discourse-local-dates/config/locales/server.zh_TW.yml
+++ b/plugins/discourse-local-dates/config/locales/server.zh_TW.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-zh_TW: 
+zh_TW:
diff --git a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js.es6
index 8e2e982056..bd0b79426c 100644
--- a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js.es6
+++ b/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js.es6
@@ -16,7 +16,7 @@ acceptance("Local Dates - composer", function (needs) {
 
     await fillIn(
       ".d-editor-input",
-      '[date=2017-10-23 time=01:30:00 displayedTimezone="America/Chicago" format="LLLL" calendar="off" recurring="1.weeks" timezone="Asia/Calcutta" timezones="Europe/Paris|America/Los_Angeles"]'
+      '[date=2017-10-23 time=01:30:00 displayedTimezone="America/Chicago" format="LLLL" calendar="off" recurring="1.weeks" timezone=" Asia/Calcutta" timezones="Europe/Paris|America/Los_Angeles"]'
     );
 
     assert.equal(getAttr("date"), "2017-10-23", "it has the correct date");
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
index db8ea4b1c7..af43d091f1 100644
--- 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
@@ -28,7 +28,7 @@ test("#format", function (assert) {
   assert.equal(date.format(), "2020-03-15T15:36:00.000+01:00");
 });
 
-test("#repetitionsBetweenDates", function (assert) {
+test("#unitRepetitionsBetweenDates", function (assert) {
   let date;
 
   date = buildDateHelper({
@@ -39,7 +39,7 @@ test("#repetitionsBetweenDates", function (assert) {
     timezone: PARIS,
   });
   assert.equal(
-    date.repetitionsBetweenDates(
+    date.unitRepetitionsBetweenDates(
       "1.hour",
       moment.tz("2020-02-15 15:36", SYDNEY)
     ),
@@ -55,7 +55,7 @@ test("#repetitionsBetweenDates", function (assert) {
     timezone: PARIS,
   });
   assert.equal(
-    date.repetitionsBetweenDates(
+    date.unitRepetitionsBetweenDates(
       "1.minute",
       moment.tz("2020-02-15 15:36", PARIS)
     ),
@@ -71,7 +71,7 @@ test("#repetitionsBetweenDates", function (assert) {
     timezone: PARIS,
   });
   assert.equal(
-    date.repetitionsBetweenDates(
+    date.unitRepetitionsBetweenDates(
       "1.minute",
       moment.tz("2020-02-15 15:37", PARIS)
     ),
@@ -87,11 +87,11 @@ test("#repetitionsBetweenDates", function (assert) {
     timezone: PARIS,
   });
   assert.equal(
-    date.repetitionsBetweenDates(
-      "2.minute",
+    date.unitRepetitionsBetweenDates(
+      "2.minutes",
       moment.tz("2020-02-15 15:41", PARIS)
     ),
-    2.5,
+    6,
     "it correctly finds difference with a multiplicator"
   );
 });
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 c4d62e08b4..74fb2907d6 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
@@ -1,10 +1,11 @@
-import sinon from "sinon";
 import I18n from "I18n";
 import LocalDateBuilder from "./local-date-builder";
+import sinon from "sinon";
 
 const UTC = "Etc/UTC";
 const SYDNEY = "Australia/Sydney";
 const LOS_ANGELES = "America/Los_Angeles";
+const NEW_YORK = "America/New_York";
 const PARIS = "Europe/Paris";
 const LAGOS = "Africa/Lagos";
 const LONDON = "Europe/London";
@@ -217,6 +218,36 @@ test("option[recurring]", function (assert) {
       "it works to the minute"
     );
   });
+
+  freezeTime({ date: "2020-12-28 09:16" }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2021-01-24",
+        time: "08:30",
+        recurring: "1.weeks",
+        timezone: NEW_YORK,
+      },
+      {
+        formated: "January 24, 2021 2:30 PM",
+      },
+      "it works for a future date"
+    );
+  });
+
+  freezeTime({ date: "2021-01-08 11:16" }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2021-01-05",
+        time: "14:00",
+        recurring: "2.hours",
+        timezone: NEW_YORK,
+      },
+      {
+        formated: "Today 12:00 PM",
+      },
+      "it works with hours"
+    );
+  });
 });
 
 test("option[countown]", function (assert) {
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 0a89564672..156c4dd0cd 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,5 +1,5 @@
-import { withPluginApi } from "discourse/lib/plugin-api";
 import { ajax } from "discourse/lib/ajax";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 function initialize(api) {
   const messageBus = api.container.lookup("message-bus:main");
@@ -13,26 +13,26 @@ function initialize(api) {
     },
   });
 
-  api.modifyClass("model:post", {
-    toggleBookmark() {
+  api.modifyClass("controller:topic", {
+    _togglePostBookmark(post) {
       // 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) {
+      if (post.user_id === discobotUserId && !post.bookmarked) {
         return ajax("/bookmarks", {
           type: "POST",
-          data: { post_id: this.id },
+          data: { post_id: post.id },
         }).then((response) => {
-          this.setProperties({
+          post.setProperties({
             "topic.bookmarked": true,
             bookmarked: true,
             bookmark_id: response.id,
           });
-          this.appEvents.trigger("post-stream:refresh", { id: this.id });
+          post.appEvents.trigger("post-stream:refresh", { id: this.id });
         });
       }
-      return this._super();
+      return this._super(post);
     },
   });
 
diff --git a/plugins/discourse-narrative-bot/assets/stylesheets/discourse-narrative-bot.scss b/plugins/discourse-narrative-bot/assets/stylesheets/discourse-narrative-bot.scss
new file mode 100644
index 0000000000..90dfe3032f
--- /dev/null
+++ b/plugins/discourse-narrative-bot/assets/stylesheets/discourse-narrative-bot.scss
@@ -0,0 +1,3 @@
+article[data-user-id="-2"] div.cooked iframe {
+  border: 0;
+}
diff --git a/plugins/discourse-narrative-bot/config/locales/client.cs.yml b/plugins/discourse-narrative-bot/config/locales/client.cs.yml
index 09bf96c023..9fd7e70cd8 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.cs.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.cs.yml
@@ -8,5 +8,5 @@ cs:
   js:
     discourse_narrative_bot:
       welcome_post_type:
-        new_user_track: "Zapnout návod pro všechny nové uživatele"
+        new_user_track: "Spustit návod pro všechny nové uživatele"
         welcome_message: "Poslat všem novým uživatelům uvítací zprávu s rychlým návodem jak začít"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.en_GB.yml b/plugins/discourse-narrative-bot/config/locales/client.en_GB.yml
new file mode 100644
index 0000000000..2d4fa180ec
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/client.en_GB.yml
@@ -0,0 +1,7 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
diff --git a/plugins/discourse-narrative-bot/config/locales/client.et.yml b/plugins/discourse-narrative-bot/config/locales/client.et.yml
index 5702d705bb..0ea0b6d554 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.et.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.et.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-et: 
+et:
diff --git a/plugins/discourse-narrative-bot/config/locales/client.fa_IR.yml b/plugins/discourse-narrative-bot/config/locales/client.fa_IR.yml
index 5af698ae45..dd8adffe64 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.fa_IR.yml
@@ -8,5 +8,5 @@ fa_IR:
   js:
     discourse_narrative_bot:
       welcome_post_type:
-        new_user_track: "شروع برنامه آموزشی کاربر جدید برای تمام کاربران جدید"
-        welcome_message: "برای تمام کاربران جدید پیام «خوش آمدید» به همراه راهنمای «شروع سریع» بفرست"
+        new_user_track: "شروع برنامه آموزشی کاربری برای تمام کاربران تازه وارد"
+        welcome_message: "ارسال پیام «خوش آمدید» به همراه راهنمای «شروع سریع» برای تمامی کاربران جدید"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.fr.yml b/plugins/discourse-narrative-bot/config/locales/client.fr.yml
index bce46d5fc1..f7fb6c536a 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.fr.yml
@@ -9,4 +9,4 @@ fr:
     discourse_narrative_bot:
       welcome_post_type:
         new_user_track: "Démarrer le tutoriel nouvel utilisateur pour tous les utilisateurs"
-        welcome_message: "Envoyer à tous les utilisateurs un message de bienvenue avec un guide de démarrage rapide "
+        welcome_message: "Envoyer à tous les utilisateurs un message de bienvenue avec un guide de démarrage rapide"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.gl.yml b/plugins/discourse-narrative-bot/config/locales/client.gl.yml
index c06aa17577..158955495f 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.gl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.gl.yml
@@ -9,4 +9,4 @@ gl:
     discourse_narrative_bot:
       welcome_post_type:
         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"
+        welcome_message: "Enviar unha mensaxe de benvida a todos os usuarios novos xunta unha guía de inicio"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.lv.yml b/plugins/discourse-narrative-bot/config/locales/client.lv.yml
index 5b0066d4cb..59e0ef6f4e 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.lv.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.lv.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-lv: 
+lv:
diff --git a/plugins/discourse-narrative-bot/config/locales/client.te.yml b/plugins/discourse-narrative-bot/config/locales/client.te.yml
index ac5d945ae8..03967bdbb0 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.te.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.te.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-te: 
+te:
diff --git a/plugins/discourse-narrative-bot/config/locales/client.th.yml b/plugins/discourse-narrative-bot/config/locales/client.th.yml
index 9b38ad300e..7de85ff91c 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.th.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.th.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-th: 
+th:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index 49e8089cb3..84f6a1240c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -24,7 +24,6 @@ ar:
       long_description: |
         تُمنح هذه الشارة عند الإنتهاء بنجاح من الدرس التعليمي التفاعلي المتقدم للأعضاء, انت الأن تتقن الأدوات المُتقدمة في الموقع - و انت الان تحمل رخصة مُتقدمة!
   discourse_narrative_bot:
-    bio: "مرحباً, انا لستُ شخص حقيقي, انا الروبوت الذي سيقوم بتوجيهك لكي تتعلم استخدام ادوات هذا الموقع, لكي تتفاعل معي ارسل لي رسالة او اشر الي بـ**`@%{discobot_username}`** في اي مكان."
     timeout:
       message: |-
         مرحباً @%{username}, انا فقط اتفقدك لانك غائب منذ وقت طويل.
@@ -139,6 +138,9 @@ ar:
           صورة رائعة - لقد قمت بالضغط علي زر اعجبني :heart: لجعلك تعرف كم انا احبها :heart_eyes:
         like_not_found: |-
           هل نسيت ان تعجب heart: [بمنشوري](%{url}) :crying_cat_face:
+      likes:
+        not_found: |-
+          هل نسيت ان تعجب heart: [بمنشوري](%{url}) :crying_cat_face:
       formatting:
         instructions: |-
           هل تستطيع عمل بعض الكلمات **غليطة** او _مائلة_ في ردك؟
diff --git a/plugins/discourse-narrative-bot/config/locales/server.be.yml b/plugins/discourse-narrative-bot/config/locales/server.be.yml
index 19b85cd56a..f0f9eceeed 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.be.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.be.yml
@@ -24,7 +24,6 @@ be:
       long_description: |
         Гэты знак выдаецца пасля паспяховага завяршэння інтэрактыўнага прасунутага карыстальніка падручніка. Вы асвоілі перадавыя інструменты абмеркавання - і зараз вы цалкам ліцэнзаваны!
   discourse_narrative_bot:
-    bio: "Прывітанне, я не сапраўдны чалавек. Я бот, які можа навучыць вас аб гэтым сайце. Для таго, каб ўзаемадзейнічаць са мной, адпраўце мне паведамленне або любое ** `@% {discobot_username}` ** ў любым месцы."
     timeout:
       message: |-
         Эй @% {імя карыстальніка}, проста праверыць, таму што я не чуў ад вас у нейкі час.- Для таго, каб працягнуць, адказаць мне ў любы час.- Калі вы хочаце, каб прапусціць гэты крок, скажам, `% {skip_trigger}`.- Для таго, каб пачаць усё спачатку, скажам, `% {reset_trigger}`.Калі вы не хочаце, гэта таксама нармальна. Я робат. Вы не пашкодзіце мае пачуцці. : Рыданні:
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 a6bbdaffbe..f857ea6c4b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
@@ -25,7 +25,6 @@ bs_BA:
       long_description: |
         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."
     timeout:
       message: |-
         Hej @%{username}, samo vas provjeravam jer nisam vas čuo neko vrijeme.
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ca.yml b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
index 4a0525bec5..02f612a333 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ca.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
@@ -24,7 +24,6 @@ ca:
       long_description: |
         Aquesta insígnia es concedeix després d'haver completat amb èxit el tutorial interactiu d'usuari avançat. Heu dominat les eines avançades de discussió, i ara teniu esteu completament acreditat!
   discourse_narrative_bot:
-    bio: "Hola, no sóc una persona real, sóc un robot que us pot ensenyar coses sobre aquest lloc web. Per a interactuar amb mi, envieu-me un missatge o feu una menció a **%{discobot_username}** en qualsevol lloc. "
     timeout:
       message: |-
         Bon dia @%{username},
@@ -181,11 +180,14 @@ ca:
           Excel·lent imatge. He premut el botó 'M'agrada' :heart: perquè sapigueu que m'ha agradat molt :heart_eyes:
         like_not_found: |-
           Us heu descuidat de fer clic en 'M'agrada' :heart: en la meva [publicació?](%{url}) :crying_cat_face:
+      likes:
+        not_found: |-
+          Us heu descuidat de fer clic en 'M'agrada' :heart: en la meva [publicació?](%{url}) :crying_cat_face:
       formatting:
         instructions: |-
           ¿Podeu convertir algunes paraules en **negreta** o _cursiva_ en la vostra resposta?
 
-          - escriviu `**negreta**` or `_cursiva_`
+          - escriviu `**negreta**` o `_cursiva_`
 
           - o premeu els botons <kbd><b>B</b></kbd> o <kbd><i>I</i></kbd> de l'editor.
         reply: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.cs.yml b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
index f71d0f074c..5f32aafd2b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.cs.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
@@ -6,11 +6,13 @@
 
 cs:
   site_settings:
+    discourse_narrative_bot_enabled: "Povolit Discourse Narrative Bot (discobot)"
     disable_discourse_narrative_bot_welcome_post: "Vypnout uvítací příspěvek od Discourse robota průvodce"
     discourse_narrative_bot_ignored_usernames: "Uživatelská jména, která by měl Discourse robot průvodce ignorovat"
     discourse_narrative_bot_disable_public_replies: "Vypnout veřejné odpovědi Discourse robota průvodce"
     discourse_narrative_bot_welcome_post_type: "Typ uvítacího příspěvku, který by měl Discourse robot průvodce poslat"
     discourse_narrative_bot_welcome_post_delay: "Počkat (n) vteřin, než Discourse robot průvodce odešle uvítací příspěvek."
+    discourse_narrative_bot_skip_tutorials: "Discourse Narrative Bot tutoriály pro přeskočení"
   badges:
     certified:
       name: Certifikován(a)
@@ -23,7 +25,11 @@ cs:
       long_description: |
         Tento odznak je udělen za úspěšné dokončení pokročilého interaktivního tutoriálu pro uživatele. Zvládli jste pokročilé nástroje diskuse — a nyní jste plně licencováni!
   discourse_narrative_bot:
-    bio: "Ahoj, já nejsem člověk. Jsem robot, který Vás může naučit něco o tomto webu. Pro interakci se mnou mi pošlete zprávu nebo kdekoliv zmiňte **%{discobot_username}**."
+    bio: "Ahoj, já nejsem člověk. Jsem robot, který Vás může naučit něco o tomto webu. Pro chcete-li se mnou komunikovat, pošlete mi zprávu nebo kdekoliv zmiňte ****."
+    tl2_promotion_message:
+      subject_template: "Teď, když jste byli povýšeni, je čas se dozvědět o některých pokročilých funkcích!"
+      text_body_template: |
+        Odpovězte na tuto zprávu pomocí `@%{discobot_username} %{reset_trigger}`, abyste se dozvěděli více o tom, co můžete udělat.
     timeout:
       message: |-
         Ahoj @%{username}, jen se ozývám, protože jsem od Vás nějakou dobu nic neslyšel.
@@ -39,6 +45,11 @@ cs:
       trigger: "hodit"
       invalid: |-
         Omlouvám se, ale je matematicky nemožné hodit tuto kombinaci kostek. :confounded:
+      not_enough_dice:
+        one: "Mám jen %{count} kostky. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
+        few: "Mám jen %{count} kostek. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
+        many: "Mám jen %{count} kostek. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
+        other: "Mám jen %{count} kostek. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
       out_of_range: |-
         Víš, že [maximální počet stěn](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) pro matematicky férovou kostku je 120?
       results: |-
@@ -67,14 +78,18 @@ cs:
         quote: "Je to malý krůček pro člověka, ale velký skok pro lidstvo."
         author: "Neil Armstrong"
       "8":
+        quote: "Udělejte každý den jednu věc, která vás děsí."
         author: "Eleanor Roosevelt"
       "9":
+        quote: "Chyby jsou vždy odpustitelné, pokud má člověk odvahu je přiznat."
         author: "Bruce Lee"
       "10":
+        quote: "Cokoli si mysl člověka dokáže představit a věřit, toho může dosáhnout."
         author: "Napoleon Hill"
       results: |-
         > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
+      trigger: "štěstí"
       answers:
         "1": "To je jisté"
         "2": "Naprostá pravda"
@@ -86,7 +101,7 @@ cs:
         "8": "Vypadá to dobře"
         "9": "Ano"
         "10": "Dle znamení ano"
-        "11": "Reply hazy, try again"
+        "11": "Odpověď je nejasná, zkuste to znovu"
         "12": "Zeptej se později"
         "13": "To ti teď raději neřeknu"
         "14": "To nyní nedokážu předpovědět"
@@ -105,12 +120,331 @@ cs:
       random_mention:
         reply: |-
           Ahoj! Pokud chceš zjistit, co umím, napiš `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          V současné době vím, jak dělat následující věci:
+
+          `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
+          > Zahajuje interaktivní výukový kurz právě pro vás, v osobní zprávě. `{name-of-tutorial}` může být jeden z: `%{tracks}`.
+        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: Můžete se na ni spolehnout
       do_not_understand:
         first_response: |-
           Dík za odpověď!
 
           Bohužel nejsem naprogramován nijak skvěle, takže jsem tomuhle neporozumněl. :frowning:
+        track_response: Můžete to zkusit znovu, nebo pokud chcete tento krok přeskočit, řekněte „%{skip_trigger}“. Jinak začněte znovu a řekněte „%{reset_trigger}“.
+        second_response: |-
+          Promiň. Stále to nechápu. :anguished:
+
+          Jsem jen robot, ale pokud chcete oslovit skutečnou osobu, podívejte se na [naši kontaktní stránku] (%{base_path}/ o).
+
+          Mezitím ti nebudu stát v cestě.
     new_user_narrative:
+      reset_trigger: "tutoriál"
+      title: "Nový certifikát dokončení uživatelského kurzu"
+      cert_title: "Jako uznání úspěšného dokončení nového uživatelského tutoriálu"
+      hello:
+        title: "Zdravím!"
+        message: |-
+          Děkujeme za připojení k %{title}a vítáme vás!
+
+          - Jsem jen robot, ale [náš přátelský personál] (%{base_uri}/ o) je zde také, aby vám pomohl, pokud byste potřebovali kontaktovat skutečnou osobu.
+
+          - Z bezpečnostních důvodů dočasně omezujeme, co mohou noví uživatelé dělat. Jak vás budeme lépe poznávat, získáte [nové schopnosti] (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (a [badges](%{base_uri}/ odznaky)).
+
+          - Vždy věříme v [chování civilizované komunity] (%{base_uri}/ pokyny).
+      onebox:
+        instructions: |-
+          Dále, můžete se mnou sdílet jeden z těchto odkazů? Odpovězte ** samotným odkazem na řádku ** a automaticky se rozbalí o šikovný souhrn.
+
+          Chcete-li zkopírovat libovolný odkaz, klepněte a podržte na mobilním zařízení nebo klikněte pravým tlačítkem myši na ukazovací zařízení:
+
+          <https://en.wikipedia.org/wiki/Inherently_funny_word>
+          <https://en.wikipedia.org/wiki/Death_by_coconut>
+          <https://en.wikipedia.org/wiki/Calculator_spelling>
+        reply: |-
+          Super! Toto bude fungovat pro většinu <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> odkazů. Nezapomeňte, že to musí být na řádku _všechno samo_, s ničím jiným vpředu ani vzadu.
+        not_found: |-
+          Lituji, odkaz ve vaší odpovědi jsem nenašel! :cry:
+
+          Můžete zkusit přidat následující odkaz na svůj vlastní řádek do své další odpovědi?
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        instructions: |-
+          Tady je obrázek jednorožce:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Pokud se vám líbí (a komu by ne!), Pokračujte a stisknutím tlačítka :heart: pod tímto příspěvkem mi dejte vědět.
+
+          Můžete ** odpovědět obrázkem? ** Jakýkoli obrázek bude stačit! Přetáhněte, stiskněte tlačítko nahrávání nebo ho dokonce zkopírujte a vložte.
+        reply: |-
+          Šikovný obrázek - stiskl jsem tlačítko jako :heart: , abych vás informoval, jak moc si toho vážím :heart_eyes:
+        like_not_found: |-
+          Zapomněli jste dát lajk, tedy říct líbí se mi :heart: můj [příspěvek?] (%{url}) :crying_cat_face:
+        not_found: |-
+          Vypadá to, že jste nenahráli obrázek, a tak jsem vybral obrázek, kterým jsem si jistý, že se vám bude líbit.
+
+          <%{image_url}>
+
+          Zkuste tedy nahrát tento nebo vložit odkaz sám na řádek!
+      likes:
+        instructions: |-
+          Tady je obrázek jednorožce:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Pokud se vám líbí (a komu by ne!), Pokračujte a stisknutím tlačítka :heart: pod tímto příspěvkem mi dejte vědět.
+
+          Můžete ** odpovědět obrázkem? ** Jakýkoli obrázek bude stačit! Přetáhněte, stiskněte tlačítko nahrávání nebo ho dokonce zkopírujte a vložte.
+        reply: |-
+          Děkuji, že se vám líbí můj příspěvek!
+        not_found: |-
+          Zapomněli jste dát lajk, tedy říct líbí se mi :heart: na můj [příspěvek?] (%{url}) :crying_cat_face:
+      formatting:
+        instructions: |-
+          Dokážeš udělat ve své odpovědi nějaká slova **tučná** nebo _kurzívou_ ?
+
+          - zadejte `**bold**` nebo `_italic_`
+
+          nebo stiskněte tlačítka <kbd><b>B</b></kbd> nebo <kbd><i>I</i></kbd> v editoru
+        reply: |-
+          Dobrá práce! HTML a BBCode fungují také pro formátování - abyste se dozvěděli více, [vyzkoušejte tento návod] (http://commonmark.org/help) :nerd:
+        not_found: |-
+          Ve vaší odpovědi jsem nenašel žádné formátování. :pencil2:
+
+          Můžete to zkusit znovu? Použijte <kbd><b>B</b></kbd> tučných nebo <kbd><i>I</i></kbd> kurzívy v editoru, pokud se uvíznete.
+      quoting:
+        instructions: |-
+          Můžete mě zkusit citovat, když odpovíte, abych věděl přesně, na kterou část odpovídáte?
+
+          > Pokud je to káva, přineste mi čaj, ale pokud je to čaj, přineste mi kávu, prosím.
+          >
+          > Jednou z výhod mluvit sám se sebou je, že víte, že alespoň někdo poslouchá.
+          >
+          > Někteří lidé ovládají způsob, jak zacházet se slovy, a jiní lidé… oh, uh, ne
+
+          Vyberte text kterékoli nabídky &uarr; , které chcete, a pak stiskněte tlačítko **Quote**, které se objeví nad výběrem — nebo tlačítko **Odpověď** v dolní části tohoto příspěvku.
+
+          Pod citátem zadejte slovo nebo dvě o tom, proč jste vybrali právě ten, protože jsem zvědavý :thinking:
+        reply: |-
+          Dobrá práce, vybral jste si můj oblíbený citát! :left_speech_bubble:
+        not_found: |-
+          Hmm, vypadá to, že jste mě ve své odpovědi necitoval?
+
+          Pokud vyberete libovolný text v mém příspěvku, zobrazí se tlačítko <kbd>** Citace **</kbd> . A stisknutí tlačítka** Odpovědět ** s jakýmkoli vybraným textem bude fungovat také! Můžete to zkusit znovu?
       bookmark:
         instructions: |-
           Pokud by ses chtěl dozvědět víc, klikni na <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> níže a <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **ulož si tuto soukromou zprávu do záložek**. Pokud to uděláš, je možný, že tam v budoucnu najdeš :gift:!
+        reply: |-
+          Vynikající! Nyní můžete snadno najít cestu zpět do naší soukromé konverzace kdykoli přímo z [záložky záložek ve Vašem profilu] (%{bookmark_url}). Stačí vybrat svůj profilový obrázek vpravo nahoře &#8599;
+        not_found: |-
+          Uh, nevidím v tomto tématu žádné záložky. Našli jste záložku pod každým příspěvkem? Použijte "ukaž více" <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> k odhalení dalších akcí v případě potřeby.
+      emoji:
+        instructions: |-
+          Možná jste viděli, že ve svých odpovědích používám malé obrázky. :blue_car::dash: Ty se jmenují [emoji](https://en.wikipedia.org/wiki/Emoji). Můžete ** přidat ke své odpovědi emodži **? Fungovat bude kterákoli z těchto možností:
+
+          - Zadejte `:) ;) :D :P :O` Čili dvojtečku a závorku, nebo středník a závorku atp
+
+          - Napište dvojtečku <kbd>:</kbd> poté vyplňte název :tada:`
+
+          - Stiskněte tlačítko emodži <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> v editoru nebo na klávesnici Vašeho mobilu
+        reply: |-
+          To je :sparkles: _emojitastické!_ :sparkles:
+        not_found: |-
+          Jejda, nevidím ve vaší odpovědi žádné emodži? Ach ne! :sob:
+
+          Zkuste zadat dvojtečku <kbd>:</kbd> , aby se zobrazil výběr emodži, poté zadejte několik prvních písmen požadovaného textu, například „:bird:“
+
+          Nebo stiskněte tlačítko emodži <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> v editoru.
+
+          (Pokud používáte mobilní zařízení, můžete Emodži zadávat také přímo z klávesnice.)
+      mention:
+        instructions: |-
+          Někdy možná budete chtít získat pozornost člověka, i když neodpovídáte přímo jemu. Zadejte „@“ a pak vyplňte jeho uživatelské jméno, abyste ho zmínili.
+
+          Můžete ve své odpovědi zmínit **`@%{discobot_username}`**?
+        reply: |-
+          _Řekl někdo mé jméno!? _ :raised_hand: Věřím, že jsi to řekl ty! :wave: No, tady jsem! Díky za zmínku. :ok_hand:
+        not_found: |-
+          Nikde tam nevidím své jméno :frowning: . Můžete mě zkusit znovu zmínit jako „@%{discobot_username}`?
+
+          (A ano, moje uživatelské jméno je napsáno _disco_, stejně jako v 70. letech taneční šílenství. Mám [rád noční život!] (https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          Naše diskuse se nám líbí přátelské a potřebujeme vaši pomoc, abychom [udrželi věci civilizované] (%{guidelines_url}). Pokud narazíte na problém, nahlaste to prosím vlaječkou, abyste o tom soukromě informovali autora nebo [náš ochotný personál] (%{about_url}).
+
+          > :imp: Napsal jsem sem něco ošklivého
+
+          Myslím, že víte, co dělat. Pokračujte a ** označte tento příspěvek ** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> jako nevhodný!
+        reply: "[Naši personál (%{base_uri}/ skupiny / zaměstnanci) bude soukromě informováni o vaší vlajce. Pokud příspěvek označí dostatek členů komunity, bude také preventivně automaticky skryt. (Vzhledem k tomu, že jsem ve skutečnosti nenapsal ošklivý příspěvek :angel:, šel jsem napřed \na prozatím vlaječku odstranil)"
+        not_found: |-
+          Ach ne, můj ošklivý příspěvek ještě nebyl označen jako nevhodný. :worried: Můžete jej označit jako nevhodný pomocí ** vlaječky ** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Nezapomeňte použít tlačítko Zobrazit více <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> k odhalení dalších akcí pro každý příspěvek.
+      search:
+        instructions: |-
+          _psst_ … V tomto tématu jsem ukryl překvapení. Pokud jste připraveni na tuto výzvu, **vyberte ikonu vyhledávání** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> v pravém horním rohu &#8599; abyste jej hledali.
+
+          Zkuste hledat termín "Kapy&#8203;bara" v tomto tématu
+        hidden_message: |-
+          Jak vám utekla tato kapybara? :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          Všimli jste si, že jste zpět na začátku? Nakrmte tuto chudou hladovou kapybaru ** odpovědí pomocí%{search_answer}a budete automaticky přesměrováni na konec.
+        reply: |-
+          Ano, našli jste to :tada:
+
+          - Pro podrobnější vyhledávání přejděte na [stránku úplného vyhledávání](%{search_url}).
+
+          - Chcete-li skákat kdekoli v dlouhé diskusi, vyzkoušejte ovládací prvky tématu vpravo (a dole na mobilu).
+
+          - Pokud máte fyzickou :keyboard:, stiskněte <kbd>?</kbd> pro zobrazení našich šikovných klávesových zkratek.
+        not_found: |-
+          Hmm… vypadá to, že máte potíže. Omlouváme se. Hledali jste <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> výraz **kapy&#8203;bara**?
+      end:
+        message: |-
+          Děkujeme, že jste se mnou zůstali @%{username}! Toto jsem pro vás vytvořil, myslím, že jste si to zasloužili:
+
+          %{certificate}
+
+          To je zatím vše! Podívejte se na [** naše nejnovější diskusní témata **] (%{base_uri}/ nejnovější) nebo [** diskusní kategorie **] (%{base_uri}/ kategorie). :sunglasses:
+
+          (Chcete-li se mnou znovu mluvit, abyste se dozvěděli více, stačí poslat zprávu nebo%{discobot_username}!)
+      certificate:
+        alt: "Osvědčení o úspěchu"
+    advanced_user_narrative:
+      reset_trigger: "pokročilý kurz"
+      cert_title: "Jako uznání úspěšného dokončení nového kurzu pro pokročilé."
+      title: ":arrow_up: Pokročilé uživatelské funkce"
+      start_message: |-
+        Jako _pokročilý_ uživatel jste navštívili [vaše preference page] (%{base_uri}/ moje / preference) Zatím @%{username}? Existuje mnoho způsobů, jak si přizpůsobit svůj zážitek, například výběr tmavého nebo světlého motivu.
+
+        Ale odbočím, pojďme začít!
+      edit:
+        bot_created_post_raw: "@%{discobot_username} je zdaleka nejúžasnější robot, co znám :wink:"
+        instructions: |-
+          Každý dělá chyby. Ale nebojte se, vždy můžete své příspěvky upravit, abyste je opravili!
+
+          Můžete začít ** úpravou ** příspěvku, který jsem právě vytvořil vaším jménem?
+        not_found: |-
+          Vypadá to, že jste ještě nezměnili [post](%{url}), který jsem pro vás vytvořil. Můžete to zkusit znovu?
+
+          Pomocí <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> vyvolejte editor.
+        reply: |-
+          Skvělá práce!
+
+          Všimněte si, že úpravy provedené po 5 minutách budou zobrazeny jako veřejné úpravy, a v pravém horním rohu se objeví malá ikona tužky.
+      delete:
+        instructions: |-
+          Pokud chcete zrušit příspěvek, který jste vložili, můžete jej smazat.
+
+          Pokračujte a ** smažte ** kterýkoli ze svých příspěvků výše pomocí <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> ** smazat **. Neodstraňujte však první příspěvek!
+        not_found: |-
+          Ještě nevidím žádné smazané příspěvky? Pamatujte, že <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> zobrazit více odhalí <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> smazání.
+        reply: |-
+          Whoa! :boom:
+
+          Z důvodu zachování kontinuity diskusí nejsou mazání okamžitá, takže příspěvek bude odstraněn až po nějaké době.
+      recover:
+        deleted_post_raw: "Proč @%{discobot_username} smazal můj příspěvek? :anguished:"
+        instructions: |-
+          Ach ne! Vypadá to, že jsem omylem smazal nový příspěvek, který jsem pro vás právě vytvořil.
+
+          Uděláte mi laskavost a <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> ** zrušíte smazání **?
+        not_found: |-
+          Mít potíže? Pamatujte, že <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> zobrazit více odhalí <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> možnost obnovit.
+        reply: |-
+          Uf, to bylo těsné! Díky za opravu, že :wink:
+
+          Všimněte si, že máte pouze %{deletion_after} hodiny (y) vrátit příspěvek.
+      category_hashtag:
+        instructions: |-
+          Věděli jste, že ve svém příspěvku můžete odkazovat na kategorie a značky? Viděli jste například kategorii %{category}
+
+          Uprostřed věty napište „#“ a vyberte libovolnou kategorii nebo značku.
+        not_found: |-
+          Hmm, nikde tam nevidím kategorii. Všimněte si, že `#` nemůže být první znak. Můžete to zkopírovat do své příští odpovědi?
+
+          `` `text
+          mohu vytvořit odkaz kategorie přes #
+          ` ``
+        reply: |-
+          Vynikající! Pamatujte, že toto funguje pro kategorie _i_ značky, pokud jsou tyto povoleny.
+      change_topic_notification_level:
+        instructions: |-
+          Každé téma má úroveň oznámení. Začíná to na „normální“, což znamená, že obvykle budete upozorněni pouze tehdy, když někdo mluví přímo s vámi.
+
+          Ve výchozím nastavení je úroveň oznámení pro soukromou zprávu nastavena na nejvyšší úroveň „hlídané“, což znamená, že budete upozorněni na každou novou odpověď. Úroveň oznámení pro _jakékoliv_ téma ale můžete přepsat na „hlídané“, „sledované“ nebo „ztišené“.
+
+          Zkusme změnit úroveň oznámení pro toto téma. Ve spodní části tématu najdete tlačítko, které ukazuje, že toto téma ** hlídáte **. Můžete změnit úroveň oznámení na ** sledování **?
+        not_found: |-
+          Vypadá to, že stále hlídáte :eyes: toto téma! Pokud máte potíže s jeho nalezením, tlačítko úrovně oznámení se nachází ve spodní části tématu.
+        reply: |-
+          Úžasná práce! Doufám, že jste toto téma neztlumili, protože můžu být někdy trochu ukecaný :grin:.
+
+          Všimněte si, že když odpovíte na téma nebo čtete téma déle než několik minut, automaticky se nastaví na úroveň oznámení „sledování“. Tuto možnost můžete změnit v [předvolbách uživatele] (%{base_uri}/my/preference).
+      poll:
+        instructions: |-
+          Věděli jste, že k libovolnému příspěvku můžete přidat anketu? Zkuste použít <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> v editoru pro ** sestavení ankety **.
+        not_found: |-
+          Jejda! Ve vaší odpovědi nebyl žádný průzkum.
+
+          Použijte <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> ozubeného kola v editoru nebo zkopírujte a vložte tuto anketu do vaší další odpovědi:
+
+          `` text
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          `` `
+        reply: |-
+          Hej, pěkná anketa! Jak jsem si vedl ve tvém učení?
+
+          [poll]
+          *: +1:
+          * :-1:
+          [/poll]
+      details:
+        instructions: |-
+          Někdy možná budete chtít ** skrýt detaily ** ve svých odpovědích:
+
+          - Když diskutujete o zápletkách filmu nebo televizního pořadu, které by byly považovány za spoiler.
+
+          - Když váš příspěvek potřebuje spoustu volitelných detailů, které mohou být zahlcující, když jsou čteny najednou.
+
+          [detaily = Vyberte tuto možnost, abyste zjistili, jak to funguje!]
+          1. Vyberte <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> ozubené kolečko v editoru.
+          2. Vyberte „Skrýt podrobnosti“.
+          3. Upravte souhrn podrobností a přidejte svůj obsah.
+          [/details]
+
+          Můžete použít <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> v editoru a přidat sekci detailů k další odpovědi?
+        not_found: |-
+          Máte potíže s vytvářením widgetu detailů? Zkuste ve své další odpovědi zahrnout následující:
+
+          ```text
+          [details=Vyberte mě pro podrobnosti]
+          Zde jsou podrobnosti
+          [/details]
+          ``
+        reply: |-
+          Skvělá práce — vaše pozornost k _detailům_ je obdivuhodná!
+      end:
+        message: |-
+          Proletěl jsi to jako _pokročilý uživatel_, opravdu :bow:
+
+          %{certificate}
+
+          To je vše, co pro tebe mám.
+
+          Zatím ahoj! Pokud se mnou budete chtít znovu mluvit, pošlete mi kdykoliv zprávu :sunglasses:
+      certificate:
+        alt: "Certifikát úspěchu cesty pokročilého uživatele"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.da.yml b/plugins/discourse-narrative-bot/config/locales/server.da.yml
index ba41ba3169..cb0dd971fc 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.da.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.da.yml
@@ -7,41 +7,49 @@
 da:
   site_settings:
     discourse_narrative_bot_enabled: "Aktivér Discourse Narrative Bot (discobot)"
-    disable_discourse_narrative_bot_welcome_post: "Deaktiver velkomst beskeden fra Discourse Botten"
+    disable_discourse_narrative_bot_welcome_post: "Deaktiver velkomst beskeden fra Discourse Bot'en"
     discourse_narrative_bot_ignored_usernames: "Brugernavne, som Discourse Narrative Bot skal ignorere"
     discourse_narrative_bot_disable_public_replies: "Deaktivér offentlige svar fra Discourse Narrative Bot"
     discourse_narrative_bot_welcome_post_type: "Type af velkomstindlæg, som Discourse Narrative Bot skal sende ud"
-    discourse_narrative_bot_welcome_post_delay: "Vent (n) sekunder, før du sender Discourse Narrative Bot-velkomstposten."
+    discourse_narrative_bot_welcome_post_delay: "Vent (n) sekunder, før afsendelse af Discourse Narrative Bot-velkomst emnet."
+    discourse_narrative_bot_skip_tutorials: "Discourse Narrative Bot vejledninger der kan springes over"
   badges:
     certified:
       name: Certificeret
       description: "Fuldførte vores \"ny bruger\" vejledning"
       long_description: |
-        Denne badge tildeles, når den interaktive nye brugervejledning er afsluttet. Du har taget initiativ til at lære de grundlæggende redskaber til diskussion, og nu er du certificeret!
+        Dette emblem tildeles, når den interaktive "ny bruger" vejledning fuldføres. Du har taget initiativ til at lære de grundlæggende redskaber til diskussion, og nu er du certificeret!
     licensed:
       name: Licenseret
-      description: "Gennemført vores advancerede bruger vejledning"
+      description: "Gennemførte vores \"advancerede bruger\" vejledning"
       long_description: |
-        Denne badge tildeles, når den interaktive avancerede brugervejledning er afsluttet. Du har mestret de avancerede diskussionsværktøjer - og nu er du fuldt licenseret!
+        Dette emblem tildeles, når den interaktive "avancerede bruger" vejledning gennemføres. Du har mestret de avancerede diskussionsværktøjer - og er nu fuldt licenseret!
   discourse_narrative_bot:
-    bio: "Hej, jeg er ikke en rigtigt person. Jeg er en bot der kan lære dig om dette site. For at interaggere med mig, send mig en besked, eller nævn **`@%{discobot_username}`** overalt."
+    bio: "Hej, jeg er ikke en rigtig person. Jeg er en bot, der kan lære dig om dette websted. For at interagere med mig, send mig en besked eller nævn mig ved navn."
+    tl2_promotion_message:
+      subject_template: "Nu hvor du er blevet forfremmet, er det tid til at lære om nogle avancerede funktioner!"
+      text_body_template: |
+        Svar på denne besked med `@%{discobot_username} %{reset_trigger}`for at finde ud af mere om, hvad du kan gøre.
     timeout:
       message: |-
-        Hey @%{username}, jeg skriver fordi jeg ikke har hørt fra dig i et stykke tid.
+        Hej @%{username}, jeg skriver fordi jeg ikke har hørt fra dig i et stykke tid.
 
-        - For at fortsætte, så kan du altid svare mig.
+        - For at fortsætte, kan du svare mig når som helst.
 
-        - Hvis du vil springe dette skridt over, så sig `%{skip_trigger}`.
+        - Hvis du vil springe dette trin over, så skriv `%{skip_trigger}`.
 
-        - For at starte forfra, så sig `%{reset_trigger}`.
+        - For at starte forfra, så skriv `%{reset_trigger}`.
 
         Hvis du helst vil være fri, så er det også okay. Jeg er en robot. Du sårer ikke mine følelser. :sob:
     dice:
-      trigger: "Rul"
+      trigger: "Kast"
       invalid: |-
-        Jeg beklager, det er matematisk umuligt at rulle den kombination af terninger. :confounded:
+        Jeg beklager, det er matematisk umuligt at kaste den kombination af terninger. :confounded:
+      not_enough_dice:
+        one: "Jeg har kun %{count} terning. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), jeg ved det!"
+        other: "Jeg har kun %{count} terninger. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), jeg ved det!"
       out_of_range: |-
-        Vidste du, at [det maksimale antal sider] (https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) for en matematisk retfærdig terning er 120?
+        Vidste du, at [det maksimale antal sider](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) for en matematisk retfærdig terning er 120?
       results: |-
         > :game_die: %{results}
     quote:
@@ -59,7 +67,7 @@ da:
         quote: "Hvis man vil have noget gjort rigtigt, må man gøre det selv."
         author: "Charles-Guillaume Étienne"
       "5":
-        quote: "Tro på du kan og du er allerede halvvejs."
+        quote: "Tro på at du kan og du er allerede halvvejs."
         author: "Theodore Roosevelt"
       "6":
         quote: "Livet er som en æske chokolade. Du ved aldrig, hvad du får."
@@ -79,51 +87,89 @@ da:
       results: |-
         > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
-      trigger: "formue"
+      trigger: "lykke"
       answers:
         "1": "Det er sikkert"
-        "2": "Det er bestemt"
+        "2": "Det er nu besluttet"
         "3": "Uden tvivl"
         "4": "Ja helt sikkert"
         "5": "Du kan stole på det"
         "6": "Som jeg ser det, ja"
-        "7": "Højst sandsynlig"
-        "8": "Outlook good"
+        "7": "Højst sandsynligt"
+        "8": "Fremtiden en god"
         "9": "Ja"
-        "10": "Det tyder på ja"
-        "11": "Svar uklar, prøv igen"
+        "10": "Det tyder det på ja"
+        "11": "Svar uklart, prøv igen"
         "12": "Spørg igen senere"
-        "13": "Bedre ikke at fortælle dig nu"
-        "14": "Kan ikke forudsige nu"
+        "13": "Bedre ikke at fortælle dig det nu"
+        "14": "Kan ikke forudsiges nu"
         "15": "Koncentrer dig og spørg igen"
         "16": "Stol ikke på det"
         "17": "Mit svar er nej"
         "18": "Mine kilder siger nej"
-        "19": "Outlook not so good"
-        "20": "Meget tvivlsom"
+        "19": "Fremtiden er ikke så god"
+        "20": "Meget tvivlsomt"
       result: |-
         > :crystal_ball: %{result}
     track_selector:
       reset_trigger: "Start"
-      skip_trigger: "springe over"
+      skip_trigger: "spring over"
       help_trigger: "vis hjælp"
       random_mention:
         reply: |-
-          Hej! For at finde ud af, hvad jeg kan gøre, skal du sige `@ %{discobot_username} %{help_trigger}`.
+          Hej! For at finde ud af, hvad jeg kan gøre, skal du skrive `@ %{discobot_username} %{help_trigger}`.
+        tracks: |-
+          Jeg ved i øjeblikket, hvordan man gør følgende ting:
+
+          `@%{discobot_username} %{reset_trigger} {name-of-tutorial}“
+          > Starter et interaktivt selvstudium kun for dig, i en personlig besked. `{name-of-tutorial}“ kan være en af:“%{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: Du kan stole på det
+        discobot_disabled: Du har deaktiveret mig i dine præferencer. Du skal tillade nye bruger onboarding tips til at interagere med mig.
       do_not_understand:
         first_response: |-
           Hej tak for svaret!
 
           Desværre, som en dårligt programmeret bot, kan jeg ikke helt forstå det. :frowning:
-        track_response: Du kan prøve igen, eller hvis du vil springe over dette trin, skal du sige `%{skip_trigger}`. Ellers skal du sige `%{reset_trigger}` for at starte forfra.
+        track_response: Du kan prøve igen, eller hvis du vil springe dette trin over, skal du skrive `%{skip_trigger}`. Ellers skal du skrive `%{reset_trigger}` for at starte forfra.
+        second_response: |-
+          Åh, undskyld. Jeg forstår det stadig ikke. :anguished:
+
+          Jeg er bare en bot, men hvis du gerne vil nå en rigtig person, se [vores kontaktside](%{base_path}/about).
+
+          I mellemtiden vil jeg holde mig ude af din vej.
     new_user_narrative:
-      reset_trigger: "tutorial"
-      cert_title: "Som anerkendelse af en vellykket gennemførelse af den nye bruger tutorial"
+      reset_trigger: "vejledning"
+      title: "Nyt certifikat for færdiggørelse af brugervejledning"
+      cert_title: "Som anerkendelse af en vellykket gennemførelse af \"ny bruger\" vejledningen"
       hello:
         title: "Vær hilset!"
+        message: |-
+          Tak for tilmelding %{title}, og velkommen!
+
+          - Jeg er kun en robot, men [vores venlige personale](%{base_uri}/about) er her også for at hjælpe, hvis du har brug for at nå ud til en person.
+
+          - Af sikkerhedsmæssige årsager begrænser vi midlertidigt, hvad nye brugere kan gøre. Du får [nye muligheder](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (og [badges](%{base_uri}/badges)), i takt med at vi lærer dig bedre at kende.
+
+          - Vi tror på [civiliseret samfundsmæssig adfærd](%{base_uri}/guidelines) til hver en tid.
       onebox:
+        instructions: |-
+          Næste, kan du dele en af disse links med mig? Svar med **et link på en linje af sig selv**, så udvides den automatisk til at omfatte en fiks oversigt.
+
+          Hvis du vil kopiere et link, skal du trykke og holde på mobilen eller højreklikke med dit pegeredskab:
+
+          <https://en.wikipedia.org/wiki/Inherently_funny_word>
+          <https://en.wikipedia.org/wiki/Death_by_coconut>
+          <https://en.wikipedia.org/wiki/Calculator_spelling>
         reply: |-
-          Fedt nok! Dette fungerer for de fleste <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> links. Husk, at det skal være på en linje _ alt i sig selv_, med intet andet foran eller bag.
+          Fedt nok! Dette fungerer for de fleste <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> links. Husk, at det skal være på en linje _for sig selv_, uden noget foran eller bagved.
         not_found: |-
           Beklager, jeg kunne ikke finde linket i dit svar! :cry:
 
@@ -131,36 +177,167 @@ da:
 
           <https://en.wikipedia.org/wiki/Exotic_Shorthair>
       images:
+        instructions: |-
+          Her er et billede af en enhjørning:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Hvis du kan lide det (og hvem ville det ikke!), Gå videre og tryk på Synes om :heart: knappen under dette indlæg for at lade mig vide.
+
+          Kan du ** svare med et billede?** Ethvert billede kan bruges! Træk og slip, tryk på uploadknappen, eller kopier og sæt det ind.
         reply: |-
-          Nifty billede - Jeg tryk på linket :heart: knap for at fortælle dig, hvor meget jeg satte pris på det: heart_eyes:
+          Fedt billede - Jeg trykkede på 'Synes om' :heart: knappen for at fortælle dig, hvor meget jeg satte pris på det :heart_eyes:
         like_not_found: |-
-          Har du glemt at like :heart: mit [indlæg?] (%{url}) :crying_cat_face:
-      formatting:
+          Har du glemt at 'Synes godt om' :heart: mit [indlæg?](%{url}) :crying_cat_face:
+        not_found: |-
+          Det ser ud som om du ikke uploade et billede, så jeg har valgt et billede, som jeg er _ikker_ på du vil nyde.
+
+          <%{image_url}>
+
+          Prøv at uploade dette som det næste, eller indsætte linket på en linje af sig selv!
+      likes:
+        instructions: |-
+          Her er et billede af en enhjørning:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Hvis du kan lide det (og hvem ville det ikke!), Gå videre og tryk på Synes om :heart: knappen under dette indlæg for at lade mig det vide.
+
+          Kan du **svare med et billede?** Ethvert billede kan bruges! Træk og slip, tryk på uploadknappen, eller kopier og sæt det ind.
         reply: |-
-          Godt arbejde! HTML og BBCode fungerer også til formatering - for at lære mere, [prøv denne tutorial] (http://commonmark.org/help) :nerd:
+          Tak fordi du kunne lide mit indlæg!
+        not_found: |-
+          Glemte du at **synes godt om** :heart: mit [indlæg?](%{url}) :crying_cat_face:
+      formatting:
+        instructions: |-
+          Kan du lave nogle ord **fed** eller _kursiv_ i dit svar?
+
+          - skriv '**fed**' eller '_kursiv_'
+
+          - eller tryk på <kbd><b>B</b></kbd> eller <kbd><i>I</i></kbd> i editoren
+        reply: |-
+          Godt arbejde! HTML og BBCode fungerer også til formatering - for at lære mere, [prøv denne tutorial](http://commonmark.org/help) :nerd:
+        not_found: |-
+          Åhr, jeg fandt ikke nogen formatering i dit svar. :pencil2:
+
+          Kan du prøve igen? Brug <kbd><b>B</b></kbd> fed eller <kbd><i>I</i></kbd> kursiv knapper i editoren, hvis du går i stå.
       quoting:
+        instructions: |-
+          Kan du prøve at citere mig, når du svarer, så jeg ved præcis, hvilken del du svarer på?
+
+          > Hvis dette er kaffe, så hent mig lidt te; men hvis dette er te, så hent mig lidt kaffe.
+          >
+          > En fordel ved at tale med dig selv er, at du i det mindste kender nogen, der lytter.
+          >
+          > Nogle mennesker har en måde med ord, og andre mennesker… åh, øh, ikke har måde.
+
+          Vælg teksten for det &uarr; citat, du foretrækker, og tryk derefter på knappen **Citat**, der dukker op over dit valg - eller knappen **Svar** nederst i dette indlæg.
+
+          Skriv venligst et ord eller to under citatet om, hvorfor du valgte det, fordi jeg er nysgerrig :thinking:
         reply: |-
           Godt arbejde, du valgte mit yndlings citat! :Left_speech_bubble:
         not_found: |-
           Hmm det ser ud til, at du ikke citerede mig i dit svar?
 
-          Hvis du vælger en tekst i mit indlæg, åbnes knappen <kbd>** Citat **</kbd> . Og at trykke på ** Svar ** med valgt tekst fungerer også! Kan du prøve igen?
+          Hvis du markerer noget tekst i mit indlæg, åbnes knappen <kbd>**Citat**</kbd>. Og trykker du på knappen **Svar** med noget tekst markeret, vil det også fungere! Kan du prøve igen?
+      bookmark:
+        instructions: |-
+          Hvis du vil vide mere, skal du vælge <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> nedenfor og <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bogmærke denne personlige besked**. Hvis du gør det, kan der være en :gift: i din fremtid!
+        reply: |-
+          Fremragende! Nu kan du nemt finde din vej tilbage til vores private samtale når som helst, lige fra [fanen bogmærker på din profil](%{bookmark_url}). Vælg blot dit profilbillede øverst til højre &#8599;
+        not_found: |-
+          Åh åh, jeg kan ikke se nogen bogmærker i dette emne. Har du fundet bogmærket under hvert indlæg? Brug vis mere <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> for at afsløre yderligere handlinger, hvis nødvendigt.
+      emoji:
+        instructions: |-
+          Du har måske set mig bruge små billeder i mine svar :blue_car::dash: de kaldes for [emoji](https://da.wikipedia.org/wiki/Emoji). Kan du **tilføje et humærikon** til dit svar? Enhver af disse kan bruges:
+
+          - Skriv `:);): D: P: O`
+
+          - Skriv kolon <kbd>:</kbd> og udfyld derefter humørikon-navnet`:tada:`
+
+          - Tryk på humørikon-knappen <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> i editoren eller på din mobils tastatur
+        reply: |-
+          Det er :sparkles: _emojitastic! _ :sparkles:
+        not_found: |-
+          Ups, jeg kan ikke se nogen Emoji i dit svar? Åh nej! :sob:
+
+          Prøv at skrive et kolon <kbd>:</kbd> for at frembringe emoji vælgeren, og skriv de første bogstaver i det, du ønsker, såsom `:bird:`
+
+          Eller tryk på emoji knappen <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> i editoren.
+
+          (Hvis du bruger en mobilenhed, kan du også indtaste Emoji direkte fra dit tastatur.)
+      mention:
+        instructions: |-
+          Nogle gange vil du måske germe have en persons opmærksomhed, selvom du ikke svarer dem direkte. Skriv `@` derefter udfylde deres brugernavn for at nævne dem.
+
+          Kan du nævne **`@%{discobot_username}`** i dit svar?
+        reply: |-
+          _Sagde nogen mit navn!?_ :raised_hand: Det tror jeg du gjorde! :wave: Nå, men her er jeg! Tak for at nævne mig. :ok_hand:
+        not_found: |-
+          Jeg kan ikke se mit navn nogen steder :frowning: Kan du prøve at nævne mig som `@%{discobot_username}'igen?
+
+          (Og ja, mit brugernavn er stavet _disco_, som i 1970'erne dans dille. Jeg gør [love the nightlife!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          Vi kan godt lide at holde vores diskussioner venlige, og vi har brug for din hjælp til at [holde tingene civiliserede](%{guidelines_url}). Hvis du ser et problem, bedes du markere for at lade forfatteren eller [vores hjælpsomme personale](%{about_url}) vide om det privat.
+
+          > :imp: Jeg skrev noget grimt her
+
+          Jeg tror du ved hvad du skal gøre. Gå videre og **rapporter dette indlæg** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> som upassende!
+        reply: |-
+          [Vores personale](%{base_uri}/groups/staff) vil blive underrettet privat om din markering. Hvis nok fællesskabsmedlemmer markerer et indlæg, skjules det også automatisk som en forholdsregel. (Da jeg faktisk ikke skrev et grimt indlæg :angel:, er jeg gået videre og fjernet rapporteringen for nu.)
+        not_found: |-
+          Å nej, mit grimme indlæg er endnu ikke markeret som upassende. :worried: Kan du markere det som upassende ved hjælp af **flaget** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Glem ikke at bruge knappen Vis mere <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> for at afsløre flere handlinger for hvert indlæg.
+      search:
+        instructions: |-
+          _psst_ … Jeg har skjult en overraskelse i dette emne. Hvis du er klar til udfordringen, **vælg søgeikonet** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> øverst til højre &#8599; for at søge efter det.
+
+          Prøv at søge efter udtrykket "capy&#8203;bara" i dette emne
+        hidden_message: |-
+          Hvordan kunne du overse denne capybara? :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          Har du bemærket, at du er tilbage i topped? Vil du ikke nok fodre denne stakkels sultne capybara ved **svare med `%{search_answer}` emoji** og du vil automatisk blive ført til slutningen.
+        reply: |-
+          Fedt, du fandt det :tada:
+
+          - For mere detaljerede søgninger, gå til [fuld søgningsside](%{search_url}).
+
+          - For at springe til et hvilket som helst sted i en lang diskussion, kan du prøve emne-tidslinjekontrollen til højre (og nederst på mobilen).
+
+          - Hvis du har et fysisk :keyboard:, skal du trykke på <kbd>?</kbd> for at se vores praktiske tastaturgenveje.
+        not_found: |-
+          Hmm… Det ser ud til, at du har nogle udfordringer. Det er jeg ked af. Har du søgt <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> for efter **capy&#8203;Bara**?
+      end:
+        message: |-
+          Tak for at bruge lidt tid sammen med mig @%{username}! Jeg har lavet dette til dig, jeg synes, du har fortjent det:
+
+          %{certificate}
+
+          Det var alt for nu! Tjek [**vores seneste diskussionsemner**](%{base_uri}/latest) eller [**diskussionskategorier**](%{base_uri}/categories). :sunglasses:
+
+          (Hvis du gerne vil tale med mig igen for at lære mere, skal du bare sende en besked eller nævne "@%{discobot_username}" når som helst!)
       certificate:
         alt: "Diplom"
     advanced_user_narrative:
-      reset_trigger: "avanceret tutorial"
-      cert_title: "Som anerkendelse af en vellykket gennemførelse af den avancerede bruger tutorial"
-      title: ": arrow_up: Avancerede brugerfunktioner"
+      reset_trigger: "avanceret vejledning"
+      cert_title: "Som anerkendelse af en vellykket gennemførelse af den \"avancerede bruger\" vejledning"
+      title: ":arrow_up: Avancerede brugerfunktioner"
+      start_message: |-
+        Som en _avanceret_ bruger, har du besøgt [siden med dine præferencer](%{base_uri}/my/preferences) endnu @%{username}? Der er mange måder at tilpasse din oplevelse på, såsom at vælge et mørkt eller lyst tema.
+
+        Men jeg afviger, lad os begynde!
       edit:
         bot_created_post_raw: "@ %{discobot_username} er langt den fedeste bot, jeg kender :wink:"
         instructions: |-
           Alle begår fejl. Men bare rolig, du kan altid redigere dine indlæg for at rette dem!
 
-          Kan du begynde med ** at redigere ** det indlæg, jeg lige har oprettet på dine vegne?
+          Kan du begynde med **at redigere** det indlæg, jeg lige har oprettet på dine vegne?
         not_found: |-
-          Det ser ud til, at du endnu ikke har redigeret [indlæget] (%{url}), jeg oprettede til dig. Kan du prøve igen?
+          Det ser ud til, at du endnu ikke har redigeret [post](%{url}), jeg oprettede til dig. Kan du prøve igen?
 
-          Brug <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> ikon for at få redaktøren frem.
+          Brug <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> ikonet for at få redigeringsværktøjet frem.
         reply: |-
           Flot arbejde!
 
@@ -169,16 +346,103 @@ da:
         instructions: |-
           Hvis du gerne vil trække et indlæg tilbage, du har oprettet, kan du slette det.
 
-          Gå videre og **slet** alle dine indlæg ovenfor ved hjælp af <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **Slet** handling. Slet dog ikke det første indlæg!
+          Gå videre og **slet** alle dine indlæg ovenfor ved hjælp af <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **Slet** handlingen. Slet dog ikke det første indlæg!
         not_found: |-
-          Jeg kan ikke se nogen slettede indlæg endnu? Husk <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> vis mere vil afsløre <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> slette.
+          Jeg kan ikke se nogen slettede indlæg endnu? Husk <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> vis mere vil afsløre <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> slet.
         reply: |-
-          Whoa! : boom:
+          Whoa! :boom:
 
-          For at bevare kontinuiteten i diskussionerne, er sletninger ikke øjeblikkelige, så indlægget fjernes efter et stykke tid.
+          For at bevare kontinuiteten i diskussionerne, er sletninger ikke øjeblikkelige, så indlægget fjernes først efter et stykke tid.
       recover:
-        deleted_post_raw: "Hvorfor slettede @ %{discobot_username} mit indlæg? :anguished:"
+        deleted_post_raw: "Hvorfor slettede @%{discobot_username} mit indlæg? :anguished:"
         instructions: |-
           Åh nej! Det ser ud til, at jeg ved et uheld har slettet et nyt indlæg, som jeg lige har oprettet til dig. Kan du gøre mig en tjeneste og <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **anullere sletningen**?
         not_found: |-
-          Har problemer? Husk <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> vis mere vil afsløre <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> anullér slet.
+          Har du udfordringer? Husk <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> vis mere vil afsløre <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> anullér slet.
+        reply: |-
+          Pyha, det var tæt på! Tak fordi du ordnede det :wink:
+
+          Vær opmærksom på, at du kun har %{deletion_after} time(r) til at annullere et indlæg.
+      category_hashtag:
+        instructions: |-
+          Vidste du, at du kan henvise til kategorier og mærker i dit indlæg? Har du for eksempel set %{category} kategorien?
+
+          Skriv '#' i midten af en sætning, og vælg en hvilken som helst kategori eller et mærke.
+        not_found: |-
+          Hmm, jeg kan ikke se en kategori nogen steder. Bemærk, at '#' ikke må være det første tegn. Kan du kopiere dette i dit næste svar?
+
+          ```text
+          Jeg kan oprette et kategorilink via #
+          ```
+        reply: |-
+          Fremragende! Husk, at dette fungerer for både kategorier _og_ mærker, hvis mærker er aktiveret.
+      change_topic_notification_level:
+        instructions: |-
+          Hvert emne har et meddelelsesniveau. Det starter ved 'Normal', hvilket betyder, at du normalt kun får besked, når nogen taler direkte til dig.
+
+          Som standard er notifikationsniveauet for en privat besked indstillet til det højeste niveau af 'overvågning', hvilket betyder, at du får besked om alle nye svar. Men du kan ændre meddelelsesniveauet for _ethvert_ emne til 'Overvåger', 'Følger' eller 'Stille!'.
+
+          Lad os prøve at ændre meddelelsesniveauet for dette emne. Nederst i emnet finder du en knap, der viser, **Normal** for dette emne. Kan du ændre underretningsniveauet til **Følger**?
+        not_found: |-
+          Det ser ud til, at du stadig Overvåger :eyes: dette emne! Hvis du har problemer med at finde det, er knappen til meddelelsesniveau placeret i bunden af emnet.
+        reply: |-
+          Fantastisk arbejde! Jeg håber, du ikke satte dette emne til Stille, da jeg til tider kan være lidt snakkesalig :grin:.
+
+          Bemærk, at når du svarer på et emne eller læser et emne i mere end et par minutter, indstilles det automatisk til et meddelelsesniveau for 'Følger'. Du kan ændre dette i [dine brugerindstillinger](%{base_uri}/my/preferences).
+      poll:
+        instructions: |-
+          Vidste du, at du kan føje en afstemning til hvert et indlæg? Prøv at bruge <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> gearet i editoren til at **oprette en afstemning**.
+        not_found: |-
+          Ups! Der var ingen afstemning i dit svar.
+
+          Brug <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> tandhjulsikonet i editoren, eller kopier og indsæt denne afstemning i dit næste svar:
+
+          ```text
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ```
+        reply: |-
+          Hej, skøn afstemning! Hvordan var min undervisning af dig?
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        instructions: |-
+          Nogle gange vil du måske **skjule detaljer** i dine svar:
+
+          - Når du diskuterer plotpunkter i en film eller et tv-show, der ville blive betragtet som en spoiler.
+
+          - Når dit indlæg har brug for masser af valgfrie detaljer, der kan være overvældende, når de læses på én gang.
+
+          [details=Vælg dette for at se, hvordan det fungerer!]
+          1. Vælg <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> gearet i editoren.
+          2. Vælg "Skjul detaljer".
+          3. Rediger detaljeringsoversigten, og tilføj dit indhold.
+          [/details]
+
+          Kan du bruge <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> gearet i editoren til at tilføje et detaljeret afsnit til dit næste svar?
+        not_found: |-
+          Har du udfordringer med at oprette en detaljewidget? Prøv at medtage følgende i dit næste svar:
+
+          ```text
+          [details=Vælg mig for detaljer]
+          Here are the details
+          [/details]
+          ```
+        reply: |-
+          Fantastisk arbejde - din sans for _detaljer_ er beundringsværdig!
+      end:
+        message: |-
+          Du strøg jo virkeligt igennem dette som en rigtig _avanceret bruger_ :bow:
+
+          %{certificate}
+
+          Det var alt, hvad jeg ville lære dig.
+
+          Farvel for nu! Hvis du gerne vil tale med mig igen, kan du når som helst sende mig en besked :sunglasses:
+      certificate:
+        alt: "Avanceret brugerspor certifikat for opnåelse"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.de.yml b/plugins/discourse-narrative-bot/config/locales/server.de.yml
index 36b9ad8e7f..52a02d20e7 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.de.yml
@@ -25,7 +25,7 @@ de:
       long_description: |
         Das Abzeichen wird verliehen, wenn das interaktive Tutorial für fortgeschrittene Benutzer erfolgreich abgeschlossen wurde. Du beherrscht die fortgeschrittenen Werkzeuge für Diskussionen erlernt und besitzt nun die Lizenz zum Diskutieren.
   discourse_narrative_bot:
-    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."
+    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 mich namentlich, um mit mir zu interagieren."
     tl2_promotion_message:
       subject_template: "Jetzt, da Sie befördert wurden, ist es Zeit, etwas über einige erweiterte Funktionen zu erfahren!"
       text_body_template: |
@@ -132,6 +132,7 @@ de:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: Du kannst dich darauf verlassen
+        discobot_disabled: Du hast mich in deinen Einstellungen deaktiviert. Du musst neue Benutzer-Tipps erlauben, mit mir zu interagieren.
       do_not_understand:
         first_response: |-
           Danke für die Antwort!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.el.yml b/plugins/discourse-narrative-bot/config/locales/server.el.yml
index 308f5d7ae0..875392862e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.el.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.el.yml
@@ -25,7 +25,6 @@ el:
       long_description: |
         Αυτό το σήμα χορηγείται μετά την επιτυχή ολοκλήρωση του διαδραστικού φροντιστηρίου προχωρημένου χρήστη. Κατακτήσατε τα προηγμένα εργαλεία συζήτησης - και τώρα έχετε πλήρη άδεια!
   discourse_narrative_bot:
-    bio: "Γεια σας, δεν είμαι πραγματικό πρόσωπο - είμαι ένα bot που μπορεί να σας διδάξει για αυτήν την ιστοσελίδα. Για να επικοινωνήσετε μαζί μου, στείλτε μου απλά ένα μήνυμα ή αναφέρετε το **`@%{discobot_username}`** οπουδήποτε."
     timeout:
       message: |-
         Γεια σας @%{username}, δεν είχα νέα σας εδώ και λίγο καιρό και ειπα να δω τι κάνετε.
diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index 750201811e..ef15b09483 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -21,7 +21,7 @@ en:
         This badge is granted upon successful completion of the interactive advanced user tutorial. You’ve mastered the advanced tools of discussion — and now you’re fully licensed!
 
   discourse_narrative_bot:
-    bio: "Hi, I’m not a real person. I’m a bot that can teach you about this site. To interact with me, send me a message or mention **`@%{discobot_username}`** anywhere."
+    bio: "Hi, I’m not a real person. I’m a bot that can teach you about this site. To interact with me, send me a message or mention me by name."
 
     tl2_promotion_message:
       subject_template: "Now that you’ve been promoted, it’s time to learn about some advanced features!"
@@ -135,6 +135,7 @@ en:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: You may rely on it
+        discobot_disabled: You’ve disabled me in your preferences. You need to allow new user onboarding tips to interact with me.
 
       do_not_understand:
         first_response: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.en_GB.yml b/plugins/discourse-narrative-bot/config/locales/server.en_GB.yml
new file mode 100644
index 0000000000..716fbbc72d
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/server.en_GB.yml
@@ -0,0 +1,17 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
+  badges:
+    certified:
+      long_description: |
+        This badge is granted upon successful completion of the interactive new user tutorial. You’ve taken the initiative to learn the basic tools of discussion, and now you have been certified!
+  discourse_narrative_bot:
+    advanced_user_narrative:
+      start_message: |-
+        As an _advanced_ user, have you visited [your preferences page](%{base_uri}/my/preferences) yet @%{username}? There are lots of ways to customise your experience, such as selecting a dark or light theme.
+
+        But I digress, let’s begin!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index a80cc65a49..8272b57e0d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.es.yml
@@ -11,7 +11,7 @@ es:
     discourse_narrative_bot_ignored_usernames: "Nombres de usuario que el bot de narrativa de Discourse debe ignorar."
     discourse_narrative_bot_disable_public_replies: "Deshabilitar las respuestas públicas del bot de narrativa de Discourse"
     discourse_narrative_bot_welcome_post_type: "Tipo de publicación de bienvenida que debe enviar el bot de narrativa de Discourse"
-    discourse_narrative_bot_welcome_post_delay: "Esperer (n) segundos antes de enviar la publicación de bienvenida del bot de narrativa de Discourse."
+    discourse_narrative_bot_welcome_post_delay: "Esperar (n) segundos antes de enviar la publicación de bienvenida del bot de narrativa de Discourse."
     discourse_narrative_bot_skip_tutorials: "Tutoriales de Discourse Narrative Bot que saltar"
   badges:
     certified:
@@ -25,7 +25,11 @@ es:
       long_description: |
         Esta medalla se otorga al completar con éxito el tutorial interactivo para usuarios avanzados. Has dominado las herramientas avanzadas de discusión y ¡ahora tienes licencia completa!
   discourse_narrative_bot:
-    bio: "¡Hola! No soy una persona real, soy un bot que te puede enseñar acerca este sitio. Para interactuar conmigo, envíame un mensaje o menciona **`%{discobot_username}`** en cualquier lugar."
+    bio: "Hola, no soy una persona real. Soy un robot que te puedo enseñar a usar este sitio. Para interactuar conmigo mándame un mensaje o mencióname por nombre."
+    tl2_promotion_message:
+      subject_template: "Ahora que has subido de nivel de confianza, es el momento de aprender sobre algunas funcionalidades avanzadas"
+      text_body_template: |
+        Responde a este mensaje con `@%{discobot_username} %{reset_trigger}` para ver una lista de cosas que puedes hacer
     timeout:
       message: |-
         Hey, @%{username}, te quería decir que estoy pendiente de ti porque no he tenido noticias tuyas en mucho tiempo.
@@ -128,6 +132,7 @@ es:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: Puedes contar con ello
+        discobot_disabled: Me has desactivado en tus preferencias. Tienes que permitir los consejos de bienvenida para interactuar conmigo.
       do_not_understand:
         first_response: |-
           ¡Hey, gracias por la respuesta!
@@ -184,6 +189,12 @@ es:
           Ingeniosa imagen – presioné el botón me gusta :heart: para hacerte saber cuánto lo aprecié :heart_eyes:
         like_not_found: |-
           ¿Te olvidaste de dar me gusta :heart: a mi [publicación?](%{url}) :crying_cat_face:
+        not_found: |-
+          Parece que no has subido ninguna imagen, así que he elegido yo una que _seguro_ que te encanta.
+
+          <%{image_url}>
+
+          Prueba a subir esta misma a continuación, o pega su enlace solo en una línea
       likes:
         instructions: |-
           Aquí va una foto de un unicornio:
@@ -193,6 +204,8 @@ es:
           Si te gusta (¡y a quién no le gustaría!), pulsa el botón me gusta :heart: debajo de este mensaje para que lo sepa.
         reply: |-
           ¡Gracias por darle me gusta a mi mensaje!
+        not_found: |-
+          ¿Te has olvidado de darle :heart: me gusta a mi [mensaje](%{url})? :crying_cat_face:
       formatting:
         instructions: |-
           ¿Puedes poner algunas letras en **negrita** o _cursiva_ en tu respuesta?
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 a2df697968..7a36c1daa7 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
@@ -23,7 +23,6 @@ fa_IR:
       long_description: |
         این مدال وقتی که راهنمای پیشرفته‌ کاربران با موفقیت به پایان رسیده باشد، اعطا می‌گردد. شما ابزارهای پیشرفته‌ی گفتگو را فرا گرفته اید و الان دارای مجوز کاملید!
   discourse_narrative_bot:
-    bio: "سلام. من یک فرد واقعی نیستم. من رباتی هستم که می‌توانم در رابطه با این تارنما به شما آموزش بدهم. برای اینکه با من تعامل داشته باشی، برایم پیام بفرست یا با استفاده از **`@%{discobot_username}`** به من اشاره بکن."
     timeout:
       message: |-
         سلام @%{username}، خواستم احوالت را جویا بشم چون مدتی بود از تو نشنیدم.
@@ -155,6 +154,10 @@ fa_IR:
         like_not_found: |-
           آیا یادت رفت که [نوشته](%{url}) من را بپسندی؟
           :crying_cat_face:
+      likes:
+        not_found: |-
+          آیا یادت رفت که [نوشته](%{url}) من را بپسندی؟
+          :crying_cat_face:
       formatting:
         instructions: |-
           آیا میتوانی تعدادی کلمه را در پاسخت **ضخیم** یا _ایتالیک_ بکنی؟
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index 09f332b8a7..cdd5eb3efb 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -12,6 +12,7 @@ fi:
     discourse_narrative_bot_disable_public_replies: "Estä bottia vastaamasta julkisesti ketjuihin"
     discourse_narrative_bot_welcome_post_type: "Minkätyyppisen tervetuloviestin botti lähettää"
     discourse_narrative_bot_welcome_post_delay: "Odota (n) sekuntia ennen kuin botti lähettää tervetuloviestin."
+    discourse_narrative_bot_skip_tutorials: "Discourse Narrative Bot -oppaat ohitettavaksi"
   badges:
     certified:
       name: Tutkinto plakkarissa
@@ -24,7 +25,11 @@ fi:
       long_description: |
         Tämä ansiomerkki myönnetään, kun suoritat menestyksellä vuorovaikutteisen palstan käytön jatkokurssin. Olet omaksunut edistyneemmätkin toiminnot, ja olet taitosi osoittanut.
   discourse_narrative_bot:
-    bio: "Moi! En ole ihminen. Olen botti, ja tarjoan opetusta sivuston käyttämisestä. Jos haluat jutella, lähetä yksityisviesti tai mainitse **`@%{discobot_username}`** missä vain."
+    bio: "Hei, en ole oikea ihminen. Olen botti ja tarjoan opastusta sivuston käyttämisessä. Jos haluat jutella, lähetä minulle viesti tai mainitse minut nimeltä."
+    tl2_promotion_message:
+      subject_template: "Nyt kun sinut on ylennetty, on aika oppia joitakin kehittyneitä ominaisuuksia!"
+      text_body_template: |
+        Vastaa tähän viestiin kirjoittamalla `@%{discobot_username} %{reset_trigger}` oppiaksesi mitä muuta voit tehdä.
     timeout:
       message: |-
         Hei @%{username}, kyselen kuulumisia, kun en ole kuullut sinusta hetkeen.
@@ -40,6 +45,9 @@ fi:
       trigger: "heitä"
       invalid: |-
         Pahoittelen, mutta on matemaattinen mahdottomuus heittää noppia sillä tavalla kuin pyysit. :confounded:
+      not_enough_dice:
+        one: "Minulla on vain %{count} noppa. [Häpeällistä](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), tiedän!"
+        other: "Minulla on vain %{count} noppaa. [Häpeällistä](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), tiedän!"
       out_of_range: |-
         Tiesitkö, että [suurin mahdollinen määrä sivuja](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) matemaattisesti tasapuolisessa nopassa on 120?
       results: |-
@@ -110,6 +118,11 @@ fi:
       random_mention:
         reply: |-
           Moi! Jos haluat tietää mitä osaan, sano `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          Osaan tällä hetkellä tehdä seuraavia asioita:
+
+          `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
+          > Aloittaa interaktiivisen opastuksen kahdenkeskisesti yksityisviestillä. `{name-of-tutorial}` voi olla yksi seuraavista: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
@@ -119,6 +132,7 @@ fi:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: Voit laskea sen varaan
+        discobot_disabled: Olet poistanut minut käytöstä asetuksissasi. Sinun on sallittava uuden käyttäjän aloittamisvinkit jotta pääset vuorovaikutukseen kanssani.
       do_not_understand:
         first_response: |-
           Hei, kiitos kun vastasit!
@@ -175,6 +189,23 @@ fi:
           Loistava kuva – Painoin tykkää-nappia :heart:, jotta tiedät että pidin siitä kovasti! :heart_eyes:
         like_not_found: |-
           Unohditko tykätä :heart: [viestistäni?](%{url}) :crying_cat_face:
+        not_found: |-
+          Näyttää siltä ettet laittanut kuvaa, joten valitsin kuvan josta _takuulla_ pidät.
+
+          <%{image_url}>
+
+          Kokeilepa liittää tämä kuva tai liittää linkin osoite omalle rivilleen!
+      likes:
+        instructions: |-
+          Tässä on kuva yksisarvisesta:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Jos pidät siitä (kukapa ei pitäisi!), kerro siitä minulle painamalla :heart: tykkää -painiketta tämän viestin alla.
+        reply: |-
+          Kiitos kun tykkäsit viestistäni!
+        not_found: |-
+          Unohditko tykätä :heart: [viestistäni?](%{url}) :crying_cat_face:
       formatting:
         instructions: |-
           **Lihavoi** tai **kursivoi** sanoja seuraavasta vastauksestasi.
@@ -210,6 +241,8 @@ 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! Nyt voit helposti palata takaisin yksityiseen keskusteluumme milloin tahansa [profiilisi kirjanmerkit-välilehden](%{bookmark_url}) kautta. Napsauta profiilikuvaasi yläoikealla &#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:
@@ -251,6 +284,8 @@ fi:
           Tiedät mitä tehdä. **Liputa tämä viesti** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> sopimattomaksi!
         reply: |-
           [Henkilökuntamme](%{base_uri}/groups/staff) saa ei-julkisen ilmoituksen lipusta. Jos riittävän moni yhteisön jäsen liputtaa viestin, sekin riittää viestin automaattiseen piilottamiseen varotoimena. (Koska en oikeasti kirjoittanut mitään tuhmaa :angel:, menin ja poistin liputuksesi.)
+        not_found: |-
+          Oi voi, tuhma viestini ei ole vielä liputettu sopimattomaksi. :worried: Voitko merkitä sen sopimattomaksi **flag** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> -painikkeella? Älä unohda, että saat lisää toimintoja näkyviin <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> -painikkeen takaa.
       search:
         instructions: |-
           _psst_ … I’ve hidden a surprise in this topic. If you’re up for the challenge, **select the search icon** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> at the top right &#8599; to search for it.
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index 241176dbfc..981c8ad5d6 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -12,6 +12,7 @@ fr:
     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_skip_tutorials: "Tutoriels de l'assistant Discourse à ignorer"
   badges:
     certified:
       name: Certifié
@@ -20,28 +21,24 @@ fr:
         Ce badge est décerné quand vous avez terminé avec succès le tutoriel interactif des nouveaux utilisateurs. Vous avez pris l'initiative d'apprendre les outils de base de la discussion et vous êtes maintenant certifié !
     licensed:
       name: Certifié
-      description: "A terminé le tutoriel des utilisateurs avertis"
+      description: "A terminé le tutoriel utilisateur avancé"
       long_description: |
         Ce badge est décerné quand vous avez terminé avec succès le tutoriel interactif des utilisateurs avancés. Vous avez pris l'initiative d'apprendre les outils avancés de la discussion et vous êtes maintenant certifié à 100% !
   discourse_narrative_bot:
-    bio: "Bonjour, je ne suis pas une personne réelle. Je suis un robot pour vous faire découvrir ce site. Pour interagir avec moi, envoyez-moi un message ou mentionnez **`@%{discobot_username}`** n'importe où."
+    bio: "Bonjour,\n\nJe ne suis pas une personne réelle. Je suis un robot pour vous faire découvrir ce site. Pour interagir avec moi, envoyez-moi un message ou mentionnez mon nom."
     tl2_promotion_message:
-      subject_template: "Maintenant que vous avez été promu, il est temps d’en apprendre davantage sur certaines fonctionnalités avancées !"
+      subject_template: "Maintenant que vous avez été promu, il est temps d'en apprendre davantage sur certaines fonctionnalités avancées !"
+      text_body_template: |
+        Répondez à ce message avec `@%{discobot_username} %{reset_trigger}` pour en savoir plus sur ce que vous pouvez faire.
     timeout:
-      message: |-
-        Hey @%{username}, je viens voir si tout va bien car je n'ai pas eu de vos nouvelles depuis un moment.
-
-        - Pour continuer, répondez-moi à n'importe quel moment.
-
-        - Si vous voulez passer cette étape, dites `%{skip_trigger}`.
-
-        - Pour recommencer, dites ``%{reset_trigger}`.
-
-        Si vous préférez ne rien faire, c'est aussi acceptable. Je suis un robot. Vous ne me blesserez pas. :sob:
+      message: "Salut @%{username}, \n\nJe viens voir si tout va bien car je n'ai pas eu de tes nouvelles depuis un moment.\n\n- Pour continuer, réponds-moi quand tu le souhaites.\n\n- Si tu veux passer cette étape, dit `%{skip_trigger}`.\n\n- Pour recommencer, dit ``%{reset_trigger}`.\n\nSi tu préfères ne rien faire, ça me va aussi.\nJe suis un robot. Tu ne me blesseras pas. :sob:"
     dice:
       trigger: "Jet"
       invalid: |-
         Je suis désolé, c'est mathématiquement impossible d'obtenir cette combinaison de dés. :confounded:
+      not_enough_dice:
+        one: "Je n'ai que %{count} dé(s). [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Je sais !"
+        other: "Je n'ai que %{count} dés. [Honteux](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Je sais !"
       out_of_range: |-
         Saviez-vous que [le nombre maximal de face](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) pour un dé non truqué est de 120 ?
       results: |-
@@ -76,7 +73,7 @@ fr:
         quote: "Les erreurs sont toujours pardonnables, si l'on a le courage de les admettre."
         author: "Bruce Lee"
       "10":
-        quote: "Tout ce que l'esprit de l'homme peut concevoir et croire peut être atteind."
+        quote: "Tout ce que l'esprit de l'homme peut concevoir et croire peut être atteint."
         author: "Napoleon Hill"
       results: |-
         > :left_speech_bubble: %{quote} __ &mdash; %{author}
@@ -126,6 +123,7 @@ fr:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: On peut compter dessus
+        discobot_disabled: J'ai été désactivé dans vos préférences. Pour interagir avec vous, j'ai besoin que les conseils d'intégration aux nouveaux utilisateurs soient autorisés.
       do_not_understand:
         first_response: |-
           Hey, merci pour la réponse !
@@ -181,7 +179,24 @@ fr:
         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:
+          Avez-vous oublié d'aimer :heart: mon [message](%{url}) ? :crying_cat_face:
+        not_found: |-
+          Il semblerait que vous n'ayez pas téléversé d'image, j'en ai donc choisi une qui vous fera _certainement_ plaisir.
+
+          `%{image_url}`
+
+          Essayez de téléverser cette image, ou de coller le lien sur une nouvelle ligne vide !
+      likes:
+        instructions: |-
+          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 ?) allez-y, appuyez sur le bouton _J'aime_ :heart: sous ce message pour me le faire savoir.
+        reply: |-
+          Merci d'avoir apprécié mon message !
+        not_found: |-
+          Avez-vous oublié _d'aimer_ :heart: mon [message](%{url}) ? :crying_cat_face:
       formatting:
         instructions: |-
           Pouvez-vous faire quelques mots en **gras** ou en _italique_ dans votre réponse ?
@@ -223,23 +238,23 @@ fr:
           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:
         instructions: |-
-          Vous pouvez avoir remarqué que j'utilise des petites images dans mes réponses :blue_car::dash: Elles sont appelées [emoji](https://fr.wikipedia.org/wiki/Emoji). Pouvez-vous **ajouter un emoji** à votre réponse ? N'importe lequel sera bien:
+          Vous pouvez avoir remarqué que j'utilise des petites images dans mes réponses :blue_car::dash: Elles sont appelées [émoji](https://fr.wikipedia.org/wiki/Emoji). Pouvez-vous **ajouter un émoji** à votre réponse ? N'importe lequel sera bien:
 
           - Tapez `:) ;) :D :P :O`
 
-          - Tapez <kbd>:</kbd> puis complétez le nom de l'emoji `:tada:`
+          - Tapez <kbd>:</kbd> puis complétez le nom de l'émoji `:tada:`
 
-          - 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 sur le clavier de votre mobile.
+          - Appuyez sur le bouton émoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> dans l'éditeur, ou sur le clavier de votre mobile.
         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 émoji dans votre réponse ? Oh non ! :sob:
 
-          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:`
+          Essayez de taper <kbd>:</kbd> pour faire apparaître la sélection d'émoji, 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 émoji <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 appareil mobile, vous pouvez aussi entrer l'emoji directement depuis votre clavier.)
+          (Si vous êtes sur un appareil 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 nom d'utilisateur pour le mentionner.
@@ -259,19 +274,21 @@ fr:
 
           Je devine que vous savez ce que vous avez à faire. **Signalez ce message** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> comme inapproprié !
         reply: |-
-          [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.)
+          [Notre équipe](%{base_uri}/groups/staff) sera notifiée 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 :angel: j'ai anticipé et j'ai enlevé le signalement pour le moment.)
+        not_found: |-
+          Oh non, mon _sale_ message n'a pas encore été signalé comme inapproprié. :worried: Pouvez-vous le signaler comme inapproprié à l'aide du ** 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.
       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 ? :wink:
 
           <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'émoji `%{search_answer}`** et vous serez automatiquement conduit à la fin.
         reply: |-
           Vous l'avez trouvé :tada:
 
@@ -295,7 +312,7 @@ fr:
         alt: "Certificat d'accomplissement"
     advanced_user_narrative:
       reset_trigger: "tutoriel avancé"
-      cert_title: "En reconnaissance de l'accomplissement avec succès du tutoriel utilisateur avancé "
+      cert_title: "En reconnaissance de l'accomplissement avec succès du tutoriel utilisateur avancé"
       title: ":arrow_up: Fonctionnalités utilisateur avancé"
       start_message: |-
         En tant qu'utilisateur _averti_, avez-vous déjà visité la page [mes préférences](%{base_uri}/my/preferences) @%{username} ? Il y a beaucoup de possibilité pour personnaliser votre expérience, comme en sélectionnant un thème clair ou foncé.
diff --git a/plugins/discourse-narrative-bot/config/locales/server.gl.yml b/plugins/discourse-narrative-bot/config/locales/server.gl.yml
index 7f96e95784..418ca0a46e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.gl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.gl.yml
@@ -5,26 +5,443 @@
 # https://translate.discourse.org/
 
 gl:
+  site_settings:
+    discourse_narrative_bot_enabled: "Activar o Discourse Narrative Bot (discobot)"
+    disable_discourse_narrative_bot_welcome_post: "Desactivar a publicación de benvida do Discourse Narrative Bot"
+    discourse_narrative_bot_ignored_usernames: "Nomes de usuario que o Discourse Narrative Bot debería ignorar"
+    discourse_narrative_bot_disable_public_replies: "Desactivar as respostas públicas do Discourse Narrative Bot"
+    discourse_narrative_bot_welcome_post_type: "Tipo de publicación de benvida que o Discourse Narrative Bot debería enviar"
+    discourse_narrative_bot_welcome_post_delay: "Esperar (n) segundos antes de enviar a publicación de benvida do Discourse Narrative Bot"
+    discourse_narrative_bot_skip_tutorials: "Titoriais do Discourse Narrative Bot que se poden saltar"
+  badges:
+    certified:
+      name: Certificado
+      description: "Completou o noso novo titorial de usuario"
+      long_description: |
+        Está insignia conséguese tras completar correctamente o titorial interactivo do novo usuario. Tivo a iniciativa de aprender as ferramentas básicas de discusión e agora ten a certificación!
+    licensed:
+      name: Licenciado
+      description: "Completou o noso titorial avanzado de usuario"
+      long_description: |
+        Esta insignia conséguese tras completar correctamente o titorial interactivo avanzado de novo usuario. Adquiriu as ferramentas avanzadas de discusión — e agora está totalmente licenciado!
   discourse_narrative_bot:
+    bio: "Ola, eu non son unha persoa real. Son un bot que pode instruílo sobre este sitio. Para interactuar comigo, envíeme unha mensaxe ou mencióneme polo nome."
+    tl2_promotion_message:
+      subject_template: "Agora que foi promocionado, é o momento de aprender sobre algunhas funcionalidades avanzadas!"
+      text_body_template: |
+        Responda a esta mensaxe con `@%{discobot_username} %{reset_trigger}` para atopar máis info sobre o que podo facer.
+    timeout:
+      message: |-
+        Ei @%{username}, un saúdo porque hai tempo que non se sabe nada de vostede.
+
+        - Para continuar, respóndame en calquera momento.
+
+        - Se quere saltar este paso, diga %{skip_trigger}`.
+
+        - Para volver comezar, diga `%{reset_trigger}`.
+
+        Mais se prefire que non, tamén está ben. Eu son un robot. Non se van ferir os meus sentimentos. :sob:
+    dice:
+      trigger: "pregar"
+      invalid: |-
+        Laméntoo, é matematicamente imposíbel lograr esa combinación de dados :confounded:
+      not_enough_dice:
+        one: "Só teño %{count} dado. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Seino!"
+        other: "Só teño %{count} dados. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Seino!"
+      out_of_range: |-
+        Sabía que [o número máximo de lados] (https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) para un dado matematicamente equitativo é 120?
+      results: |-
+        > :game_die: %{results}
+    quote:
+      trigger: "cita"
+      "1":
+        quote: "No medio das dificultades atópase a oportunidade"
+        author: "Albert Einstein"
+      "2":
+        quote: "A liberdade non merece ese nome se non implica a liberdade de errar."
+        author: "Mahatma Gandhi"
+      "3":
+        quote: "Non chores porque terminou, sorrí porque ocorreu."
+        author: "Dr Seuss"
+      "4":
+        quote: "Se queres que algo se faga ben, faino ti mesmo."
+        author: "Charles-Guillaume Étienne"
+      "5":
+        quote: "Se cres que podes, terás medio camiño feito."
+        author: "Theodore Roosevelt"
+      "6":
+        quote: "A vida é coma unha caixa de bombóns. Nunca sabes que che vai tocar."
+        author: "A nai de Forrest Gump"
+      "7":
+        quote: "Un pequeno paso para un home, un salto xigante para a humanidade."
+        author: "Neil Armstrong"
+      "8":
+        quote: "Cada día fai unha cousa que che arrepíe."
+        author: "Eleanor Roosevelt"
+      "9":
+        quote: "As equivocacións son sempre esquecíbeis, se un ten a coraxe para admitilas."
+        author: "Bruce Lee"
+      "10":
+        quote: "Sempre que a mente dun home poida concibilo e crer niso, pode conseguirse."
+        author: "Napoleon Hill"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
+      trigger: "fortuna"
       answers:
-        "1": "It is certain"
-        "2": "It is decidedly so"
-        "3": "Without a doubt"
-        "4": "Yes definitely"
-        "5": "You may rely on it"
-        "6": "As I see it, yes"
-        "7": "Most likely"
-        "8": "Outlook good"
+        "1": "É certo"
+        "2": "De certo que é así"
+        "3": "Sen dúbida"
+        "4": "Si, desde logo"
+        "5": "Podes confiar niso"
+        "6": "Tal como o vexo, si"
+        "7": "Máis seguro"
+        "8": "O panorama é bo"
         "9": "Si"
-        "10": "Signs point to yes"
-        "11": "Reply hazy, try again"
-        "12": "Ask again later"
-        "13": "Better not tell you now"
-        "14": "Cannot predict now"
-        "15": "Concentrate and ask again"
-        "16": "Don't count on it"
-        "17": "My reply is no"
-        "18": "My sources say no"
-        "19": "Outlook not so good"
-        "20": "Very doubtful"
+        "10": "As trazas apuntan a que si"
+        "11": "Resposta confusa, ténteo de novo"
+        "12": "Pregunte outra vez máis tarde"
+        "13": "Mellor que non llo digo agora"
+        "14": "Non o podo predicir agora"
+        "15": "Concéntrese e pregunte outra vez"
+        "16": "Non conte con iso"
+        "17": "A miña resposta é non"
+        "18": "As miñas fontes din que non"
+        "19": "O panorama non se ve ben"
+        "20": "Moi dubidoso"
+      result: |-
+        > :crystal_ball: %{result}
+    track_selector:
+      reset_trigger: "arrrancar"
+      skip_trigger: "saltar"
+      help_trigger: "presentar a axuda"
+      random_mention:
+        reply: |-
+          Ola! Para saber que podo facer, diga "@%{discobot_username} %{help_trigger}".
+        tracks: |-
+          Xa sei como facer as seguintes cousas:
+
+          `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
+          > Arranque un tutorial interactivo para vostede, nunha mensaxe persoal. O '{name-of-tutorial}' pode ser un destes: `%{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: pode contar con el
+      do_not_understand:
+        first_response: |-
+          Ola, grazas pola resposta.
+
+          Pero, como un bot pobremente programado, non entendo máis ca un chisco. :frowning:
+        track_response: Pode tentalo de novo ou, se quere saltar este paso, dígao '%{skip_trigger}'. Se non, para comezar de novo, diga '%{reset_trigger}'.
+        second_response: |-
+          Ai, perdón. Aínda non o consigo. :anguished:
+
+          Eu só son un bot pero se desexa contactar cunha persoa real, consulte [a nosa páxina de contacto] (%{base_path}/about).
+
+          Mentres tanto, quitareime do seu camiño.
+    new_user_narrative:
+      reset_trigger: "titorial"
+      title: "Novo certificado de finalización do tutorial do usuario"
+      cert_title: "En recoñecemento á finalización con éxito do titorial de novo usuario"
+      hello:
+        title: "Saúdos!"
+        message: |-
+          Grazas por participar en %{title}, dámoslle a benvida.
+
+          - Eu só son un bot pero [o noso amábel equipo] (%{base_uri}/about) tamén está aquí para axudar se necesita contactar cunha persoa.
+
+          - Por motivos de seguranza, limitamos temporalmente o que poden facer os novos usuarios. Gañará [novas capacidades] (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (e [badges](%{base_uri}/badges)) a medida que o coñezamos.
+
+          - Confiamos no [comportamento de comunidade civilizada] (%{base_uri}/guidelines) en todo momento.
+      onebox:
+        instructions: |-
+          A seguir, pode compartir algunha destas ligazóns comigo? Responda con **unha ligazón por liña** que se expandirá automaticamente para incluír un oportuno resumo.
+
+          Para copiar calquera ligazón, toque e manteña premido no móbil ou prema o botón dereito do seu dispositivo apuntador:
+
+          <https://en.wikipedia.org/wiki/Inherently_funny_word>
+          <https://en.wikipedia.org/wiki/Death_by_coconut>
+          <https://en.wikipedia.org/wiki/Calculator_spelling>
+        reply: |-
+          Estupendo! Isto funcionará coa maioría de ligazóns <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16">. Lembre, debe estar unha por liña, sen nada antes nin despois.
+        not_found: |-
+          Desculpe, non se puido atopar a ligazón na súa resposta! :cry:
+
+          Pode tentar engadir a seguinte ligazón, nunha liña propia, na súa seguinte resposta?
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        instructions: |-
+          Aquí ten unha foto dun unicornio:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Se lle gusta (e a quen non!), siga adiante e prema o botón gústame :heart: debaixo desta publicación para avisarme.
+
+          Pode **responder cunha foto?** Calquera imaxe servirá! Arrastre e solte, prema o botón de cargar ou incluso copie e pegue dentro.
+        reply: |-
+          Oportuna imaxe – Premín sobre o botón de gústame :heart: para avisalo de canto a aprecio: :heart_eyes:
+        like_not_found: |-
+          Esqueceu darlle ao gústame :heart: na miña [publicación?](%{url}) :crying_cat_face:
+        not_found: |-
+          Parece que non cargou unha imaxe, así que escollín unha imaxe que seguro que lle gustará.
+
+          <%{image_url}>
+
+          Probe a cargala a continuación ou pegue a ligazón nunha liña só para ela.
+      likes:
+        instructions: |-
+          Aquí ten unha foto dun unicornio:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Se lle gusta (e a quen non!), siga adiante e prema o botón gústame :heart: debaixo desta publicación para avisarme.
+        reply: |-
+          Grazas por ligar a miña publicación!
+        not_found: |-
+          Esqueceu darlle ao gústame :heart: da miña [publicación?](%{url}) :crying_cat_face:
+      formatting:
+        instructions: |-
+          Pode escribir algunhas palabras **en grosa** ou _cursiva_ na súa resposta?
+
+          - escriba `**grosa**` ou `_cursiva_`
+
+          - ou, prema os botóns <kbd><b>B</b></kbd> ou <kbd><i>I</i></kbd> no editor
+        reply: |-
+          Bo traballo! HTML e BBCode tamén funciona para o formatado – para aprender máis, [aprenda con este titorial](http://commonmark.org/help) :nerd:
+        not_found: |-
+          Ei, non atopo ningún formatado na súa resposta.:pencil2:
+
+          Pode tentalo outra vez? Utilice os botóns <kbd><b>B</b></kbd> grosa ou <kbd><i>I</i></kbd> cursiva se quedou atrancado.
+      quoting:
+        instructions: |-
+          Podería tentar citarme cando responda, así sei exactamente a que parte responde?
+
+          > Se se trata de café, tráiame un té; pero se isto é té, tráiame un café.
+          >
+          > Unha das vantaxes de falar consigo mesmo é saber que, polo menos, alguén está escoitando.
+          >
+          > Algunhas persoas teñen un xeito coas palabras, e outras… si, ben, non teñen xeito.
+
+          Seleccione o texto de calquera das &uarr; citas que prefira, e logo prema o botón **Cita** que aparece sobre a súa selección - ou o botón **Responder** na parte inferior desta publicación.
+
+          Por baixo da cita, escriba unha ou dúas palabras sobre por que a escolleu, porque teño curiosidade :thinking:
+        reply: |-
+          Interesante, escolleu a miña cita favorita! :left_speech_bubble:
+        not_found: |-
+          Ei, parece que non me citou na resposta?
+
+          Ao seleccionar calquera texto na miña publicación, descubrirá o botón <kbd>**Cita**</kbd>. E premendo **Responder** con calquera texto seleccionado tamén funcionará! Pode tentalo de novo?
+      bookmark:
+        instructions: |-
+          Se desexa aprender máis, seleccione <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> a seguir e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **marque esta mensaxe persoal**. Se o fai, pode que haxa un :gift: no futuro!
+        reply: |-
+          Excelente! Agora pode atopar facilmente o camiño de volta á nosa conversa privada en calquera momento desde a [pestana de marcadores do seu perfil] (%{bookmark_url}). Só ten que seleccionar a súa foto de perfil na parte superior dereita &#8599;
+        not_found: |-
+          Ei, non vexo ningún marcador neste tema. Atopou o marcador baixo cada publicación? Use a función de amosar máis <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para ofrecer accións adicionais se fose necesario.
+      emoji:
+        instructions: |-
+          Seguramente me viu empregar pequenas imaxes nas miñas respostas :blue_car::dash: chámanse [emoji](https://en.wikipedia.org/wiki/Emoji). Pode **engadir un emoji** á súa resposta? Calquera destes funcionará:
+
+          - Escriba `:);): D: P: O`
+
+          - Escriba dous puntos <kbd>:</kbd> e complete o nome do emoji`:tada:`
+
+          - Prema o botón emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> no editor ou no seu teclado móbil
+        reply: |-
+          Isto é :sparkles: _emojitastic! _ :sparkles:
+        not_found: |-
+          Oopa, non vexo ningún emoji na súa resposta? ¡Oooh, non! :sob:
+
+          Probe escribir unha coma <kbd>:</kbd> para abrir o selector de emoji, a continuación, escriba as primeiras letras do que quere, como o `:bird:'
+
+          Ou, prema o botón emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> no editor.
+
+          (Se está cun dispositivo móbil, tamén pode introducir emoji directamente desde o teclado.)
+      mention:
+        instructions: |-
+          Ás veces pode querer chamar a atención dunha persoa, aínda que non lle estea respondendo directamente. Escriba `@` e despois complete o seu nome de usuario para mencionalos.
+
+          Pode mencionar **`@%{discobot_username}` ** na súa resposta?
+        reply: |-
+          _Alguén dixo o meu nome? _ :raised_hand: Creo que o foi vostede! :wave: Ben, aquí estou! Grazas por mencionarme. :ok_hand:
+        not_found: |-
+          Non vexo o meu nome alí por ningures :frowning: Pode tentar mencionarme como `@%{discobot_username}` de novo?
+
+          (E si, o meu nome de usuario escríbese _disco_, como na moda de baile dos anos 70. Eu amo [a vida nocturna!] (https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          Gústannos as nosas discusións amábeis e necesitamos a súa axuda para [manter as cousas civilizadas] (%{guidelines_url}). Se ve algún problema, sinálello privadamente ao autor ou [ao noso persoal de axuda] (%{about_url}) para que o saiban.
+
+          > :imp: Escribín algo desagradábel aquí
+
+          Supoño que sabe qué facer. Siga adiante e **marque esta publicación** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> como improcedente!
+        reply: |-
+          [O noso equipo] (%{base_uri}/groups/staff) recibirá unha notificación privada sobre a alerta. Se bastantes membros da comunidade sinalizan unha publicación, tamén se agochará automaticamente por precaución. (Mais como realmente non escribín nada desagradábel :angel:, seguín adiante e retirei a alerta por agora).
+        not_found: |-
+          Ah vaia, a miña desagradábel publicación aínda non se sinalizou como inadecuada. :worried: Pode sinalizala como improcedente usando a **alerta** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Non esqueza usar o botón de amosar máis <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para ofrecer máis accións de cada publicación.
+      search:
+        instructions: |-
+          _psst_ … Agochei unha sorpresa neste tema. Se está listo para o reto, **seleccione a icona de busca** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> na parte superior dereita &#8599; para buscalo.
+
+          Probe a buscar o termo "capy&#8203;bara" neste tema
+        hidden_message: |-
+          Canto fixo de menos este capibara? :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          Notou que agora volveu ao principio? Alimente este pobre capibara famento **respondendo cos `%{search_answer}` emoji ** e será automaticamente levado ata o final.
+        reply: |-
+          Si, atopouno :tada:
+
+          - Para buscas máis detalladas, diríxase á [páxina de busca completa] (%{search_url}).
+
+          - Para saltar a calquera lugar nunha discusión longa, probe os controis da liña do tempo do tema á dereita (e abaixo, no móbil).
+
+          - Se ten un :keyboard: físico, prema <kbd>?</kbd> para ver os atallos de teclado manual.
+        not_found: |-
+          Umm… parece que pode ter algún problema. Síntoo. Buscou <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> o termo **capy&#8203;bara**?
+      end:
+        message: |-
+          Grazas por quedar comigo @%{username}! Fíxeno por vostede, que o merece:
+
+          %{certificate}
+
+          Isto é todo por agora. Consulte [**os nosos últimos temas de discusión**] (%{base_uri}/latest) ou [**categorías de discusión**] (%{base_uri}/categories). :sunglasses:
+
+          (Se quere falar comigo de novo para saber máis, só ten que enviar unha mensaxe ou mencionar `@%{discobot_username}` en calquera momento!)
+      certificate:
+        alt: "Certificado de competencia"
+    advanced_user_narrative:
+      reset_trigger: "titorial avanzado"
+      cert_title: "En recoñecemento á finalización con éxito do titorial de usuario avanzado"
+      title: ":arrow_up: Funcionalidades de usuario avanzado"
+      start_message: |-
+        Como usuario _avanzado_, visitou [a súa páxina de preferencias](%{base_uri}/my/preferences) @%{username}? Hai moitas formas de personalizar a súa experiencia, como seleccionar un tema de estilo escuro ou claro.
+
+        Pero estouno enredando, comecemos!
+      edit:
+        bot_created_post_raw: "@%{discobot_username} é, de lonxe, o bot máis feitiño que coñezo :wink:"
+        instructions: |-
+          Todo o mundo se equivoca. Pero non se preocupe, sempre pode editar as súas publicacións para arranxalas!
+
+          Pode comezar **editando** esta publicación que acabo de crear por vostede?
+        not_found: |-
+          Parece que aínda non editou o [post](%{url}) que creei para vostede. Pode tentalo de novo?
+
+          Use a icona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> para abrir o editor.
+        reply: |-
+          Bo traballo!
+
+          Teña en conta que as modificacións feitas pasados 5 minutos aparecerán publicamente como revisións de edición e aparecerá unha pequena icona de lapis na parte superior dereita amosando o número de revisións.
+      delete:
+        instructions: |-
+          Se quere retirar unha publicación que fixese, pode eliminala.
+
+          Continúe e **elimine** calquera das súas publicacións anteriores usando a acción <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **eliminar**. Non elimine a primeira, ollo!
+        not_found: |-
+          Aínda non vexo ningunha publicación eliminada? Lembre <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> en amosar máis ofrecerase <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> eliminar.
+        reply: |-
+          Vaia! :boom:
+
+          Para preservar a continuidade dos debates, as eliminacións non son inmediatas, polo que a publicación eliminarase despois dun tempo.
+      recover:
+        deleted_post_raw: "Por que @%{discobot_username} eliminou a miña publicación? :anguished:"
+        instructions: |-
+          Non pode ser! Parece que borrei por accidente unha nova publicación que acababa de crear para vostede.
+
+          Pode facerme un favor e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **recuperala**?
+        not_found: |-
+          Ten algún problema? Lembre que <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> amosar máis ofreceralle <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> recuperar.
+        reply: |-
+          Puf, iso andou apurado de máis! Grazas por solucionalo :wink:
+
+          Teña en conta que só ten %{deletion_after} hora(s) para recuperar unha publicación.
+      category_hashtag:
+        instructions: |-
+          Sabía que pode referenciar categorías e etiquetas na súa publicación? Por exemplo, viu a categoría %{category} ?
+
+          Escriba `#` no medio dunha frase e seleccione calquera categoría ou etiqueta.
+        not_found: |-
+          Umm, non vexo ningunha categoría alí. Teña en conta que `#` non pode ser o primeiro personaxe. Pode copiar isto na súa próxima resposta?
+
+          ```texto
+          Podo crear unha ligazón de categoría co número #
+          ```
+        reply: |-
+          Excelente! Lembre que isto funciona para ambas as categorías _e_ etiquetas, se as etiquetas están activadas.
+      change_topic_notification_level:
+        instructions: |-
+          Cada tema ten un nivel de notificación. Comeza en «normal», o que significa que normalmente só recibirá unha notificación cando alguén se dirixa directamente a vostede.
+
+          De modo predeterminado, o nivel de notificación dunha mensaxe privada estabelécese no nivel máis alto de «observación», o que significa que recibirá unha notificación por cada nova resposta. Pero pode sobrescribir o nivel de notificación de _calquera_ tema a «observar», «seguir» ou «silenciar».
+
+          Vamos cambiar o nivel de notificación deste tema. Na parte inferior do tema, atopará un botón que amosa que este tema está en **observación**. Pode cambiar o nivel de notificación a **seguimento**?
+        not_found: |-
+          Parece que aínda está en observación :eyes: este tema! Se ten problemas para atopalo, o botón de nivel de notificación está situado na parte inferior do tema.
+        reply: |-
+          Un traballo impresionante! Espero que non silenciase este tema aínda que podo ser un pouco lerchán ás veces :grin:.
+
+          Teña en conta que cando responde a un tema ou le un tema durante máis duns minutos, estabelécese automaticamente un nivel de notificación de `seguimento`. Pode cambialo en [preferencias de usuario](%{base_uri}/my/preferences).
+      poll:
+        instructions: |-
+          Sabía que pode engadir unha enquisa a calquera publicación? Probe a usar a engrenaxe <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> no editor para **crear unha enquisa**.
+        not_found: |-
+          Vaia! Non había ningunha enquisa na súa resposta.
+
+          Utilice a icona de <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> engrenaxe no editor ou copie e pegue esta enquisa na súa seguinte resposta:
+
+          ```texto
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ```
+        reply: |-
+          Ala, boa enquisa! Que tal o fago ensinando?
+
+          [poll]
+          *: +1:
+          * :-1:
+          [/poll]
+      details:
+        instructions: |-
+          Ás veces quizais desexe **agochar detalles** nas súas respostas:
+
+          - Cando está comentando aspectos argumentais dunha película ou dun programa de TV que poderían considerarse un destripamento.
+
+          - Cando a súa publicación precisa moitos detalles opcionais que poden resultar abafadores cando se le dunha vez.
+
+          [detalles = Seleccione isto para ver como funciona!]
+          1. Seleccione a <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> engrenaxe no editor.
+          2. Seleccione «Agochar detalles».
+          3. Edite o resumo dos detalles e engada o seu contido.
+          [/details]
+
+          Pode utilizar a engrenaxe <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> no editor para engadir unha sección de detalles á súa próxima resposta?
+        not_found: |-
+          Ten algún problema para crear un trebello de detalles? Probe a incluír o seguinte na súa seguinte resposta:
+
+          ```texto
+          [detalles = Seleccióneme para detalles]
+          Aquí están os detalles
+          [/details]
+          ```
+        reply: |-
+          Bo traballo — a súa atención ao _detalle_ é admirábel.
+      end:
+        message: |-
+          Pasou a través disto como un _usuario avanzado_ de feito :bow:
+
+          %{certificate}
+
+          Isto é todo o que teño para vostede.
+
+          Adeus por agora! Se quere falar comigo de novo, mándeme unha mensaxe en calquera momento :sunglasses:
+      certificate:
+        alt: "Certificado de Competencia de Usuario Avanzado"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.he.yml b/plugins/discourse-narrative-bot/config/locales/server.he.yml
index 99ed8ea099..8635a9a7aa 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.he.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.he.yml
@@ -25,7 +25,7 @@ he:
       long_description: |
         עיטור זה מוענק עם השלמת המדריך האינטראקטיבי משתמשים מתקדמים אינטראקטיבי בהצלחה. צברת מומחיות בתחום כלי הדיון המתקדמים וכעת קיבלת רישיון!
   discourse_narrative_bot:
-    bio: "היי, אני לא בן אדם אמיתי. אני בוט שיכול ללמד אותך על האתר הזה. כדי לתקשר איתי, יש לשלוח אלי הודעה או לאזכר את **‎`@%{discobot_username}`** בכל מקום שהוא."
+    bio: "היי, אני לא בן אדם אמיתי. אני בוט שיכול ללמד אותך על האתר הזה. כדי לתקשר איתי, אפשר לשלוח אלי הודעה או לאזכר אותי בשמי."
     tl2_promotion_message:
       subject_template: "עכשיו מכשקודמת, הגיע הזמן ללמוד על כמה מהתכונות המתקדמות!"
       text_body_template: |
@@ -134,6 +134,7 @@ he:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: אפשר לסמוך על זה
+        discobot_disabled: השבתת אותי בהעדפות שלך. עליך לאפשר עצות קבלת פנים למשתמשים חדשים כדי לתפעל אותי.
       do_not_understand:
         first_response: |-
           הי, תודה על התגובה!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.hu.yml b/plugins/discourse-narrative-bot/config/locales/server.hu.yml
index a7efe4a8b6..7436ae914a 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.hu.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.hu.yml
@@ -24,7 +24,6 @@ hu:
       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 hivatalos 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}`**."
     timeout:
       message: |-
         Üdv @%{username}, csak beköszönök, mert nem hallottam Önről egy ideje.
@@ -50,6 +49,7 @@ hu:
         quote: "A nehézségek közt mindig ott van a lehetőség"
         author: "Albert Einstein"
       "2":
+        quote: "A szabadságot nem érdemes megszerezni, ha nem jelenti a tévedés szabadságát."
         author: "Mahatma Gandhi"
       "3":
         quote: "Ne sírj, hogy vége, mosolyogj, hogy megtörtént."
@@ -142,14 +142,183 @@ hu:
       hello:
         title: "Üdvözlet!"
         message: |-
-          Köszönjük, hogy csatlakozott a(z) %{title} oldalhoz, és üdvözöljük!
+          Köszönjük, hogy csatlakoztál a(z) %{title} oldalhoz, és üdvözlünk!
 
-          – Csak egy robot vagyok, de [a barátságos stábunk](%{base_uri}/about) is itt van, hogy segítsen, ha egy emberrel kell beszélnie.
+          – Én ugyan csak egy robot vagyok, de itt [a barátságos stábunkat](%{base_uri}/about) is elérheted, ha élő emberrel szeretnél beszélni.
 
-          – Biztonsági okokból ideiglenesen korlátozzuk, hogy mit tehetnek az új felhasználók. A jövőben [új képességeket](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (és [jelvényeket](%{base_uri}/badges)) fog kapni, ahogy megismerjük.
+          – A frissen regisztrált felhasználók jogköreit biztonsági okokból ideiglenesen korlátozzuk. A jövőben [új képességeket](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (és [jelvényeket](%{base_uri}/badges)) fogsz kapni, és ahogy megismerünk, egyre jobban fognak bővülni a lehetőségeid is!
 
-          – Mindig hiszünk a [civilizált közösségi viselkedében](%{base_uri}/guidelines).
+          – Kérjük, mindig tartsd be a [civilizált közösségi viselkedés](%{base_uri}/guidelines) írott és íratlan szabályait!
+      onebox:
+        instructions: |-
+          Következőnek meg tudnád osztani velem az egyik linket? Válaszolj egy **linket magában beillesztve** , ami figyeld meg, hogy automatikusan ki fog bővülni, és beillesztve egy összefoglalót is tartalmazz majd.
+
+          Bármelyik hivatkozás másolásához csak érintsd meg és tartsd hosszan érintve mobilon, vagy kattints rá jobb egérgombbal:
+
+          <https://en.wikipedia.org/wiki/Inherently_funny_word>
+          <https://en.wikipedia.org/wiki/Death_by_coconut>
+          <https://en.wikipedia.org/wiki/Calculator_spelling>
+        not_found: |-
+          Sajnálom, de nem találta a linket a válaszodban! :cry:
+
+          Megpróbálnád hozzáadni a következő linket a saját külön sorában a következő válaszodhoz?
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      likes:
+        reply: |-
+          Köszönöm, hogy kedvelted a hozzászólásom!
+      formatting:
+        instructions: |-
+          Tudnál néhány szót ** félkövérre ** vagy _dőltre_ állítani a válaszodban?
+
+          - írd be: "** félkövér **" vagy "_dőlt_"
+
+          - vagy kattints a szerkesztő <kbd><b>B</b></kbd> vagy <kbd><i>I</i></kbd> gombjaira
+        not_found: |-
+          Ó, nem találtam formázást a válaszodban. :pencil2:
+
+          Megpróbálnád újra? Ha elakadsz, használja a szerkesztő <kbd><b>B</b></kbd> félkövér vagy <kbd><i>I</i></kbd> dőlt gombját.
+      quoting:
+        instructions: |-
+          Megpróbálnál idézni, amikor válaszolsz, hogy pontosan tudjam, melyik részre válaszolsz?
+
+          > Ha ez kávé, kérlek hozz nekem teát; de ha ez tea, kérlek hozz nekem kávét.
+          >
+          > A magadban beszélés egyik előnye, hogy legalább tudod, hogy valaki meghallgat.
+          >
+          > Vannak, akik egy módja a szavak, és mások… ó, uh, nincs módja.
+
+          Válaszd ki a kívánt &uarr; idézet szövegét, majd nyomd meg a**Idézet** gombot, amely felbukkan a kiválasztás felett — vagy a**Reply** gombot a bejegyzés alján.
+
+          Az idézet alatt írj be egy-két szót arról, hogy miért választotta ezt, mert kíváncsi vagyok :thinking:
+        not_found: |-
+          Hmm úgy tűnik, hogy nem idéztél be a válaszodban!
+
+          Ha a bejegyzésemben bármilyen szöveget kiválasztasz, meg fog jelenni az <kbd>** Idézet **</kbd> gomb. De az is jó, ha kijelölsz bármilyen szöveget és megnyomond a ** Válasz ** gombot. Megpróbálod újra?
+      bookmark:
+        instructions: |-
+          Ha többet szeretnél megtudni, kattints erre a gombra: <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> , és <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> ** jelöld meg könyvjelzővel ezt az üzenetet **. Ha megteszed, lehet, hogy hamarosan :gift: fogsz kapni!
+        reply: |-
+          Kitűnő! Mostantól bármikor könnyedén visszatérhetsz a privát beszélgetésünkhöz, közvetlenül a [profilodon lévő könyvjelzők lapról] (%{bookmark_url}). Csak válassza ki a profilképedet a jobb felső sarokban &#8599;
+        not_found: |-
+          Sajnos nem látok könyvjelzőket ebben a témában. Megtaláltad a könyvjelzőt minden egyes bejegyzés alatt? Használd a mutass többet gombot <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">, hogy további opciókat jeleníts meg, ha szükséges.
+      emoji:
+        instructions: |-
+          Talán észrevetted már, hogy kis képeket használok a válaszaimban :blue_car::dash:. Ezeket [emoji]nak hívják (https://en.wikipedia.org/wiki/Emoji). Megpróbálnál **hozzáadni egy hangulatjelet ** a válaszodhoz? Ezek közül bármelyikkel működni fog:
+
+          - Írd be így: `:);): D: P: O`
+
+          - Írj kettőspontot <kbd>:</kbd> , majd írd be az emoji nevét `:tada:`
+
+          - nyomd meg az emoji-gombot <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> a szerkesztőben, vagy a mobilod billentyűzetén!
+        not_found: |-
+          Upsz, nem látok hangulatjelet a válaszodban... Jaj, ne! :sob:
+
+          Próbálj beírni egy kettőspontot <kbd>:</kbd> az emoji kiválasztó előhívásához, majd írd be a kívánt emoji első néhány betűjét, például: ':bird:'
+
+          Vagy nyomd meg a szerkesztőben az emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> gombot.
+
+          (Ha mobileszközön vagy, akkor közvetlenül a billentyűzetről is beírhatod az emojit.)
+      mention:
+        instructions: |-
+          Néha fel akarhatod hívni valakinek a figyelmét a válaszodra még akkor is, ha nem kifejezetten neki válaszolsz. Ilyenkore írj be egy „@”-t, majd add meg a felhasználónevét, az említéshez.
+
+          Meg tudnád említeni **`@%{discobot_username}`** -t a válaszodban?
+        reply: |-
+          _Kimondta valaki a nevemet!? _ :raised_hand: Azt hiszem, te voltál! :wave: Nos, itt vagyok! Köszönöm, hogy megemlítettél. :ok_hand:
+      flag:
+        instructions: |-
+          Szeretnénk, ha a fórumon zajló beszélgetések kulturáltak tudnának maradni, és ehhez a te segítségedre is szükségünk van. Kérjük, olvasd el [a fórum szabályzatát](%{guidelines_url}), és ha problémát észlelsz, kérjük, jelezd a zászló megnyomásával, hogy titkosan értesítsd a szerzőt vagy [segítőkész munkatársainkat](%{about_url}).
+
+          > :imp: Írtam valami csúnyát ide
+
+          Gondolom tudod mit kell tenned!. Gyerünk, **jelöld meg ezt a bejegyzést** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> kifogásolhatóként!
+        reply: |-
+          [Munkatársainkat](%{base_uri}/groups/staff) privát módon értesítjük a bejelentésedről. Ha elegendő közösségi tag megjelöl egy bejegyzést, az elővigyázatosságból automatikusan el is lesz rejtve. (Mivel valójában nem írtam egy csúnya bejegyzést :angel:, ezért egyelőre eltávolítottam a zászlót.)
+      search:
+        hidden_message: |-
+          Hogyan is hagyhattad ki ezt a vízidisznót? :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          Észrevetted, hogy most újra az elején vagy? Etesd meg ezt a szegény éhes vízidisznót azzal, hogy ** válaszolsz a `%{search_answer}` emoji elküldésével ** és máris automatikusan a végére ugorharsz!
+      end:
+        message: |-
+          Köszönöm, hogy velem tartottál @%{username}! Ezt neked készítettem, azt hiszem, kiérdemelted:
+
+          %{certificate}
+
+          Egyelőre ennyi! Nézze meg a [** legfrissebb témáinkat **] (%{base_uri}/latest) vagy böngssz a [**kategóriáink **](%{base_uri}/categories) között! :sunglasses:
+
+          (Ha bármikor szeretnél újra beszélni velem, hogy többet tanulj, csak írj rám vagy említsd meg `@%{discobot_username}` bármikor!)
       certificate:
         alt: "Igazoló oklevél"
     advanced_user_narrative:
       reset_trigger: "haladó oktatás"
+      start_message: |-
+        _advanced_ felhasználóként meglátogattad már a [beállítások oldaladat] (%{base_uri}/my/preferences) @%{username}? Számos módja van a felhasználói élmény testreszabásának, például kiválaszthatsz sötét vagy világos témát is.
+
+        De elkalandozom, kezdjük!
+      edit:
+        bot_created_post_raw: "@%{discobot_username} messze a legmenőbb robot, amit ismerek :wink:"
+        instructions: |-
+          Mindenki követ el hibákat. De ne aggódj, bármikor szerkesztheted a bejegyzéseket a javítás érdekében!
+
+          Elkezdenéd azzal, hogy ** megpróbálod szerkeszteni ** a bejegyzést, amit éppen most hoztam létre neked?
+        reply: |-
+          Nagyszerű munka!
+
+          Ne feledd, hogy az 5 perc elteltével végrehajtott szerkesztések nyilvános szerkesztési verzióként jelennek meg, és a jobb felső sarokban egy kis ceruza ikon jelenik meg a javítások számával.
+      recover:
+        instructions: |-
+          Óh ne! Úgy tűnik, véletlenül töröltem egy új bejegyzést, amelyet most készítettem neked.
+
+          Megtennél nekem egy szívességet, és <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **visszavonnád a törlést**?
+        reply: |-
+          Phew, ez szoros volt! Köszönjük, hogy kijavítottad :wink:
+
+          Ne feledd, hogy csak %{deletion_after} órád van a bejegyzés visszavonására.
+      category_hashtag:
+        not_found: |-
+          Hmm, sehol nem látok kategóriát. Vedd figyelembe, hogy a "#" nem lehet az első karakter. Be tudod másolni ezt a következő válaszodba?
+
+          ```szöveg
+          Kategórialinket tudok létrehozni a # használatával
+          ```
+      change_topic_notification_level:
+        reply: "Nagyszerű munka! Remélem, hogy nem némítottad le ezt a témát, sajnos néha kicsit fecsegős vagyok. :grin: \n\nNe feledd, hogy amikor egy témára válaszolsz, vagy egy témát néhány percnél tovább olvasol, azt automatikusan elkezded követni is. Ezt megváltoztathatos a [felhasználói beállításokban](%{base_uri}/my/preferences)."
+      poll:
+        not_found: |-
+          Hoppá! A válaszodban nem volt szavazás.
+
+          Használd az <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> fogaskerék ikont a szerkesztőben, vagy másold és illeszd be ezt a szavazást a következő válaszodba:
+
+          ```text
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ```
+      details:
+        instructions: |-
+          Előfordulhat, hogy **el akarnád rejteni a részleteket** a válaszaiban:
+
+          - Amikor egy film vagy tévéműsor cselekménypontjairól beszélünk, és spoiler lehet, amit írnál.
+
+          - Ha a bejegyzés megválaszolásához rengeteg aprórészletre van szükség, amelyek nehezen feldolgozhatóak lehetnek, ha egyszerre kell valakinek elolvasnia.
+
+          [részletek = Válaszd ki ezt, hogy lásd, hogyan működik!]
+          1. Válaszd ki a <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> gombot a szerkesztőben.
+          2. Válaszd a "Részletek elrejtése" lehetőséget.
+          3. Szerkeszd a részletek összefoglalóját, és adj hozzá tartalmat.
+          [/details]
+
+          Megtennéd, hogy kipróbálod a szerkesztőben található <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> gombot, hogy egy ilyen "részletek" szekciót adj a következő válaszodhoz?
+        not_found: |-
+          Gondjaid vannak a részletek widget létrehozásával? Próbáljd beilleszteni az alábbiakat a következő választ:
+
+          ```szöveg
+          [details = Válassz engem a részletekért]
+          Itt vannak a részletek
+          [/details]
+          ```
diff --git a/plugins/discourse-narrative-bot/config/locales/server.hy.yml b/plugins/discourse-narrative-bot/config/locales/server.hy.yml
index 416e47cf33..611f4e5bca 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.hy.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.hy.yml
@@ -24,7 +24,6 @@ hy:
       long_description: |
         Այս կրծքանշանը շնորհվում է օգտատիրոջ ընդլայնված փոխգործուն ձեռնարկի հաջող ավարտի կապակցությամբ: Դուք տիրապետում եք քննարկման ընդլայնված գործիքներին — և այժմ ամբողջովին լիցենզավորված եք!
   discourse_narrative_bot:
-    bio: "Բարև, ես իրական մարդ չեմ: Ես ռոբոտ եմ, որ կարող է սովորեցնել Ձեզ այս կայքի մասին: Ինձ հետ շփվելու համար ուղարկեք ինձ հաղորդագրություն կամ հիշատակեք **`@%{discobot_username}`** ցանկացած տեղ:"
     timeout:
       message: |-
         Հեյ @%{username}, ուղղակի ստուգում եմ, քանի որ արդեն որոշ ժամանակ է՝ քեզնից լուր չկա:
@@ -156,6 +155,9 @@ hy:
           Հոյակապ նկար է – ես սեղմել եմ հավանման :heart: կոճակը՝ Ձեզ տեղեկացնելու համար, թե որքան է այն ինձ դուր եկել :heart_eyes:
         like_not_found: |-
           Դուք մոռացե՞լ եք հավանել :heart: իմ [գրառումը](%{url}) :crying_cat_face:
+      likes:
+        not_found: |-
+          Դուք մոռացե՞լ եք հավանել :heart: իմ [գրառումը](%{url}) :crying_cat_face:
       formatting:
         instructions: |-
           Կարո՞ղ եք Ձեր պատասխանում որոշ բառեր դարձնել **հաստ** կամ _շեղագիր_ :
diff --git a/plugins/discourse-narrative-bot/config/locales/server.id.yml b/plugins/discourse-narrative-bot/config/locales/server.id.yml
index 7cfc9df992..016708522a 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.id.yml
@@ -24,7 +24,10 @@ id:
       long_description: |
         Lencana ini diberikan atas keberhasilan menyelesaikan panduan interaktif pengguna anggota forum lanjutan. Anda telah ahli menggunakan fasilitas lanjutan dalam diskusi — sekarang Anda telah bersertifikat penuh menjadi anggota forum.
   discourse_narrative_bot:
-    bio: "Salam, saya bukan manusia asli. Saya adalah robot yang akan memandu Anda menggunakan forum ini. Untuk berkomunikasi dengan saya, kirimi saya pesan atau panggil **`@%{discobot_username}`** dimana saja."
+    bio: "Hai, aku bukan orang sungguhan. Aku adalah bot yang dapat mengajari kami tentang situs ini. Untuk berinteraksi denganku, kirimkan aku sebuah pesan atau sebutkan namaku."
+    tl2_promotion_message:
+      text_body_template: |
+        Balas pesan ini dengan `@%{discobot_username} %{reset_trigger}` untuk mengetahui lebih lanjut apa yang Anda bisa lakukan.
     timeout:
       message: |-
         Salam @%{username}, hanya ingin menyapa karena saya tidak melihat Anda beberapa waktu.
@@ -40,6 +43,8 @@ id:
       trigger: "lempar"
       invalid: |-
         Maafkan saya, secara matematis tidak mungkin untuk memutar kombinasi dadu. :confounded:
+      not_enough_dice:
+        other: "Saya hanya punya %{count} dadu. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Saya tahu!"
       out_of_range: |-
         Apakah Anda tahu [the maximum number of sides](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) untuk sebuah dadu seimbang matematis adalah 120?
       results: |-
@@ -133,6 +138,11 @@ id:
           Gambar yang menarik – Saya telah menekan tombol :heart: supaya Anda tahu kalau saya menghargainya :heart_eyes:
         like_not_found: |-
           Apakah Anda lupa menyukai :heart: kiriman saya [post?](%{url}) :crying_cat_face:
+      likes:
+        reply: |-
+          Terima kasih untuk menyukai postinganku!
+        not_found: |-
+          Apakah Anda lupa untuk menyukai :heart: [postingan](%{url}) saya? :crying_cat_face:
       formatting:
         instructions: |-
           Bisakah Anda menjadikan beberapa kata menjadi **bold** atau _italic_ dalam balasan Anda?
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index 1e06ed0001..d350241738 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -25,7 +25,6 @@ it:
       long_description: |
         Questo distintivo è assegnato al completamento del tutorial interattivo per utenti avanzati. Hai imparato gli strumenti avanzati di discussione — e ora sei un diplomato!
   discourse_narrative_bot:
-    bio: "Ciao, 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: "Ora che sei stato promosso, è il momento di conoscere alcune funzionalità avanzate!"
       text_body_template: |
@@ -256,11 +255,11 @@ it:
         reply: |-
           Questo è :sparkles: _emojitastico!_ :sparkles:
         not_found: |-
-          Oh oh, non vedo nessuna emoji nella tua risposta! Oh no! :sob:
+          Ops, non vedo nessuna emoji nella tua risposta! Oh no! :sob:
 
           Prova a digitare due punti <kbd>:</kbd> per far apparire il selettore delle emoji, poi digita qualche lettere della emoji che vuoi, ad esempio `:bird:`
 
-          Oppure, premi il pulsante emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> nell'editor.
+          Oppure premi il pulsante emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> nell'editor.
 
           (Se sei su un dispositvo mobile, puoi anche inviare emoji direttamente dalla tastiera.)
       mention:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ja.yml b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
index 56f8e8f347..63680ebe53 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ja.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
@@ -23,7 +23,6 @@ ja:
       long_description: |
         このバッジは上級ユーザーチュートリアルの優れた結果において授与されました。あなたは上級ディスカッションツールをマスターし、完全に許可されました。
   discourse_narrative_bot:
-    bio: "初めまして。私は実在する人ではなく、このサイトについて教えることができるコンピュータプログラムです。私と情報交換するためにはメッセージを送信するか%{discobot_username}のどこかでちょっと話を出しておいて下さい。"
     timeout:
       message: |-
         こんにちは%{username}、しばらく便りがなかったのでチェックをしているところです。
@@ -76,6 +75,8 @@ ja:
         "18": "My sources say no"
         "19": "Outlook not so good"
         "20": "Very doubtful"
+      result: |-
+        > :crystal_ball: %{result}
     new_user_narrative:
       hello:
         message: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index 99075f1d28..79465e0dea 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -25,7 +25,7 @@ ko:
       long_description: |
         이 배지는 고급 유저 튜토리얼을 성공적으로 완료한 사용자에게 부여됩니다. 당신은 고급 토론 도구를 숙지하여 면허를 취득하였습니다!
   discourse_narrative_bot:
-    bio: "안녕, 사실 나는 사람이 아니야. 이 사이트에 대해서 알려주는 로봇이지. 나한테 물어보고 싶은 게 있다면 메세지를 보내거나 **`@%{discobot_username}`** 를 멘션하면 돼."
+    bio: "안녕하세요, 저는 진짜 사람이 아닙니다. 나는 이 사이트에 대해 알려주는 봇입니다. 저와 소통하려면 저에게 메시지를 보내거나 이름으로 저를 멘션하세요."
     tl2_promotion_message:
       subject_template: "이제 승격 했으므로 몇 가지 고급 기능에 대해 알아볼 차례입니다!"
       text_body_template: |
@@ -152,11 +152,11 @@ ko:
         message: |-
           %{title}에 가입해 주셔서 감사합니다.
 
-          - 나는 단지 로봇 일뿐입니다. 그러나 [사이트 관리자] (%{base_uri}/about)는 사용자들에게 도움을주기 위해 여기에 있습니다.
+          - 나는 단지 로봇 일뿐입니다. 그러나 [사이트 관리자](%{base_uri}/about)는 사용자들에게 도움을주기 위해 여기에 있습니다.
 
           - 신규 사용자가 할 수 있는 일은 일시적으로 제한됩니다. 곧 [새로운 기능]들을 알게 될 것입니다. 또한 이곳에서 [badges](%{base_uri}/배지)) 를 얻을 수 있습니다.
 
-          - 항상 [올바른 커뮤니티 활동] (%{base_uri}/지침) 을 해 줄것을 당부 드립니다.
+          - 항상 [올바른 커뮤니티 활동](%{base_uri}/지침) 을 해 줄것을 당부 드립니다.
       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>
diff --git a/plugins/discourse-narrative-bot/config/locales/server.lt.yml b/plugins/discourse-narrative-bot/config/locales/server.lt.yml
index 2033709d76..51afcdb44e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.lt.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.lt.yml
@@ -8,6 +8,8 @@ lt:
   site_settings:
     discourse_narrative_bot_enabled: "Įgalinti Discourse Botą (discodot)"
   discourse_narrative_bot:
+    quote:
+      trigger: "citata"
     magic_8_ball:
       answers:
         "1": "It is certain"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.lv.yml b/plugins/discourse-narrative-bot/config/locales/server.lv.yml
index 016f562339..8d8c66f88d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.lv.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.lv.yml
@@ -6,6 +6,8 @@
 
 lv:
   discourse_narrative_bot:
+    quote:
+      trigger: "citāts"
     magic_8_ball:
       answers:
         "1": "It is certain"
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 209caa37e4..78bb14fc26 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
@@ -23,7 +23,6 @@ nb_NO:
       long_description: |
         Dette merket er tildelt ved fullførelse av den interaktive opplæringen for avanserte brukere. Du har mestret de avanserte verktøyene for diskusjoner — og er nå fullstendig lisensiert!
   discourse_narrative_bot:
-    bio: "Hei, jeg er ikke en virkelig person. Jeg er en robot som kan lære deg om dette nettstedet. For å kommunisere med meg send meg en melding eller nevn **`@%{discobot_username}`** hvor som helst."
     timeout:
       message: |-
         Hei @%{username}, jeg bare sjekker opp på deg fordi jeg har ikke hørt fra deg på en stund.
@@ -145,6 +144,9 @@ nb_NO:
           Et flott bilde - jeg trykket på :heart: knappen så du også skal få vite at jeg satte stor pris på det :heart_eyes:
         like_not_found: |-
           Glemte du å trykke :heart:? Liker du ikke [innlegget mitt?](%{url}) :crying_cat_face:
+      likes:
+        not_found: |-
+          Glemte du å trykke :heart:? Liker du ikke [innlegget mitt?](%{url}) :crying_cat_face:
       formatting:
         instructions: |-
           Klarer du å gjøre noen ord **uthevet** eller _kursiv_ i svaret ditt?
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nl.yml b/plugins/discourse-narrative-bot/config/locales/server.nl.yml
index 6b7c14e1dc..0a29bcd84b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nl.yml
@@ -25,7 +25,6 @@ nl:
       long_description: |
         Deze badge wordt toegekend wanneer de interactieve handleiding voor gevorderde gebruikers met succes is doorlopen. U hebt de geavanceerde hulpmiddelen voor discussie onder de knie – en u bent nu volledig gecertificeerd!
   discourse_narrative_bot:
-    bio: "Hallo, ik ben geen echt persoon. Ik ben een bot die u uitleg over deze website kan geven. Stuur mij een bericht of noem ergens **`@%{discobot_username}`** om met mij te communiceren."
     dice:
       trigger: "gooien"
       invalid: |-
@@ -90,6 +89,15 @@ nl:
       random_mention:
         reply: |-
           Hallo! Zeg `@%{discobot_username} %{help_trigger}` om te ontdekken wat ik kan.
+        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: U kunt erop vertrouwen
       do_not_understand:
         first_response: |-
           Hallo, bedankt voor het antwoord!
@@ -109,18 +117,18 @@ nl:
         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:
+          Oh, ik vond geen opmaak in uw 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.
+          Kan u het opnieuw proberen? Gebruik de <kbd><b>B</b></kbd> vet of <kbd><i>I</i></kbd> cursief knoppen in de editor als u vast komt te zitten.
       search:
         reply: |-
-          Joepie! Je hebt het gevonden :tada:
+          Joepie! U 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).
+          - Om ergens in een lange discussie te springen, probeer de tijdslijnbediening aan de rechterzijde (en onderaan, op mobiele apparaten).
 
-          - Indien je een fysiek toetsenbord hebt :keyboard:, druk <kbd>?</kbd> om onze handige snelkoppelingen te bekijken.
+          - Indien u een fysiek toetsenbord hebt :keyboard:, druk op <kbd>?</kbd> om onze handige snelkoppelingen te bekijken.
     advanced_user_narrative:
       reset_trigger: "geavanceerde handleiding"
       cert_title: "Als erkenning voor de succesvolle voltooiing van de geavanceerde gebruikershandleiding"
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 4ff91c66e7..ce9b66bcd1 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -18,16 +18,16 @@ pl_PL:
       name: Certyfikowany
       description: "Ukończono tutorial dla nowych użytkowników"
       long_description: |
-        Odznaka została nadana za ukończenie interaktywnego tutorialu dla nowych użytkowników. Poznałeś podstawowe narzędzia dyskusji i jesteś teraz certyfikowany!
+        Odznaka została nadana za ukończenie interaktywnego tutorialu dla nowych użytkowników. Poznałeś/łaś podstawowe narzędzia dyskusji i jesteś teraz certyfikowany!
     licensed:
       name: Licencjonowany
       description: "Ukończono tutorial dla zaawansowanych użytkowników"
       long_description: |
-        Odznaka została nadana za ukończenie interaktywnego tutorialu dla zaawansowanych użytkowników. Poznałeś zaawansowane narzędzia dyskusji i jesteś teraz w pełni licencjonowany!
+        Odznaka została nadana za ukończenie interaktywnego tutorialu dla zaawansowanych użytkowników. Poznałeś/łaś zaawansowane narzędzia dyskusji i jesteś teraz w pełni licencjonowany!
   discourse_narrative_bot:
-    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."
+    bio: "Witaj, nie jestem prawdziwą osobą. Jestem botem, który może nauczyć Cię korzystania z tej witryny. Aby wejść ze mną w interakcję, wyślij do mnie wiadomość lub wspomnij w dowolnym miejscu."
     tl2_promotion_message:
-      subject_template: "Teraz, gdy zostałeś awansowany, czas poznać kilka zaawansowanych funkcji!"
+      subject_template: "Teraz, gdy zostałeś/łaś awansowany, czas poznać kilka zaawansowanych funkcji!"
       text_body_template: |
         Odpowiedz na tę wiadomość z `@%{discobot_username} %{reset_trigger}`, aby dowiedzieć się więcej o tym, co możesz zrobić.
     timeout:
@@ -134,6 +134,7 @@ pl_PL:
 
           `@%{discobot_username} %{magic_8_ball_trigger}
           >:crystal_ball: Możesz na tym polegać
+        discobot_disabled: Wyłączyłeś mnie w swoich preferencjach. Musisz pozwolić nowym użytkownikom na interakcję ze mną.
       do_not_understand:
         first_response: |-
           Hej! Dzięki za odpowiedź!
@@ -149,7 +150,7 @@ pl_PL:
     new_user_narrative:
       reset_trigger: "samouczek"
       title: "Certyfikat ukończenia samouczka nowego użytkownika"
-      cert_title: "W podziękowaniu za skończony samouczek"
+      cert_title: "W uznaniu pomyślnego ukończenia samouczka nowego użytkownika"
       hello:
         title: "Witaj!"
         message: |-
@@ -190,9 +191,9 @@ pl_PL:
         reply: |-
           Ładne zdjęcie - nacisnąłem przycisk lajka :heart:, żeby Ci podziękować :heart_eyes:
         like_not_found: |-
-          Zapomniałeś polajkować :heart: mój [wpis]?(%{url}) :crying_cat_face:
+          Zapomniałeś/łaś polajkować :heart: mój [wpis?](%{url}) :crying_cat_face:
         not_found: |-
-          Wygląda na to, że nie przesłałeś obrazu, więc wybrałem zdjęcie, które _jestem pewien_ Ci się podoba.
+          Wygląda na to, że nie przesłałeś/łaś obrazu, więc wybrałem zdjęcie, które _jestem pewien_ Ci się podoba.
 
           <%{image_url}>
 
@@ -207,19 +208,20 @@ pl_PL:
         reply: |-
           Dzięki za polubienie mojego posta!
         not_found: |-
-          Czy zapomniałeś polubić :heart: mój [post?] (%{url}) :crying_cat_face:
+          Czy zapomniałeś/łaś polubić :heart: mój [post?] (%{url}) :crying_cat_face:
       formatting:
         instructions: |-
           Czy możesz **pogrubić** lub zastosować _kursywę_ dla części słów w swojej odpowiedzi?
 
           - napisz '**pogrub**' lub '_kursywa_'
 
-          - lub, naciśnij przycisk<kbd><b>B</b></kbd> lub<kbd><i>I</i></kbd> w edytorze.
+          - lub, naciśnij przycisk <kbd><b>B</b></kbd> lub <kbd><i>I</i></kbd> w edytorze
         reply: |-
           Dobra robota! BBCode i HTML również pracują nad formatowaniem - aby dowiedzieć się więcej [rozpocznij ten tutorial](http://commonmark.org/help) :nerd:
         not_found: |-
-          Aww, nie znalazłem żadnego formatowania tekstu w odpowiedzi.:pencil2:
-          Czy możesz spróbować ponownie? Użyj przycisków<kbd> <b>B</b></kbd>pogrubienia lub<kbd><i> I</i></kbd>kursywy w edytorze, jeśli utknąłeś.
+          Uuu, nie znalazłem żadnego formatowania tekstu w odpowiedzi. :pencil2:
+
+          Czy możesz spróbować ponownie? Użyj przycisków <kbd><b>B</b></kbd> pogrubienia lub <kbd><i>I</i></kbd> kursywy w edytorze, jeśli utknąłeś.
       quoting:
         instructions: |-
           Czy możesz spróbować zacytować mnie w odpowiedzi, tak żebym wiedział do której części się odnosisz?
@@ -232,11 +234,11 @@ pl_PL:
 
           Wybierz tekst, któregokolwiek &uarr; cytatu i naciśnij przycisk**Cytat**, który pojawi się ponad twoim wyborem - lub przycisk **Odpowiedz* na dole tego posta.
 
-          Poniżej cytatu, napisz słowo lub dwa o tym dlaczego wybrałeś właśnie tą część, ponieważ jestem ciekawy :thinking:
+          Poniżej cytatu, napisz słowo lub dwa o tym dlaczego wybrałeś/łaś właśnie tą część, ponieważ jestem ciekawy :thinking:
         reply: |-
-          Dobra robota, wybrałeś mój ulubiony cytat!:left_speech_bubble:
+          Dobra robota, wybrałeś/łaś mój ulubiony cytat!:left_speech_bubble:
         not_found: |-
-          Hmm, wygląda na to, że nie zacytowałeś mnie w swojej odpowiedzi?
+          Hmm, wygląda na to, że nie zacytowałeś/łaś mnie w swojej odpowiedzi?
 
           Wybór jakiegokolwiek tekstu z mojej wiadomości spowoduję pojawienie się przycisku <kbd>**Zacytuj**</kbd>. Naciśnięcie **Odpowiedz** z wybranym tekstem również zadziała! Czy możesz spróbować ponownie?
       bookmark:
@@ -248,7 +250,7 @@ pl_PL:
           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:
         instructions: |-
-          Być może zauważyłeś te małe obrazki w moich wpisach :blue_car::dash:. Nazywane są [emoji](https://en.wikipedia.org/wiki/Emoji). Czy możesz **dodać emoji** do swojej odpowiedzi? Wszystkie z nich się sprawdzą:
+          Być może zauważyłeś te małe obrazki w moich wpisach :blue_car::dash:. Nazywają się one [emoji](https://en.wikipedia.org/wiki/Emoji). Czy możesz **dodać emoji** do swojej odpowiedzi? Dowolny z nich będzie wystarczający:
 
           - Wpisz `:) ;) :D :P :O`
 
@@ -271,7 +273,7 @@ pl_PL:
 
           Czy możesz wspomnieć** @%{discobot_username}** w twojej odpowiedzi?
         reply: |-
-          _Czy ktoś wypowiedział moje imię!?_ _ :raised_hand: Wydaję mi się, że to byłeś ty! :wave:  No to jestem! Dzięki, że wspomniałeś o mnie. :ok_hand:
+          _Czy ktoś wypowiedział moje imię!?_ _ :raised_hand: Wydaję mi się, że to byłeś/łaś ty! :wave:  No to jestem! Dzięki, że wspomniałeś/łaś o mnie. :ok_hand:
         not_found: |-
           Nigdzie nie widzę swojego imienia :frowning: Czy możesz spróbować jeszcze raz wspomnieć o mnie jako `@ %{discobot_username}?
 
@@ -294,11 +296,11 @@ pl_PL:
 
           Spróbuj wyszukać frazę „kapibara” w tym wątku.
         hidden_message: |-
-          Jak tęskniłeś za tą kapibarą? :Puść oczko:
+          Jak tęskniłeś/łaś za tą kapibarą? :wink:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          Zauważyłeś, że wróciłeś na początek? Nakarm tę biedną głodną kapibarę **, odpowiadając emoji `%{search_answer}` **, a zostaniesz automatycznie zabrany do końca.
+          Zauważyłeś, że wróciłeś/łaś na początek? Nakarm tę biedną głodną kapibarę, **odpowiadając emoji `%{search_answer}`**, a zostaniesz automatycznie zabrany do końca.
         reply: |-
           Yay, udało Ci się to odnaleźć :tada:
 
@@ -308,16 +310,16 @@ pl_PL:
 
           - Jeśli posiadasz klawiaturę :keyboard:, naciśnij <kbd>?</kbd> , aby wyświetlić nasze wygodne skróty klawiszowe.
         not_found: |-
-          Hmm… wygląda na to, że wystąpiły jakieś problemy. Przepraszamy za to. Czy wyszukiwałeś frazę <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> „kapibara”?
+          Hmm… wygląda na to, że wystąpiły jakieś problemy. Przepraszamy za to. Czy wyszukiwałeś/łaś frazę <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> „kapibara”?
       end:
         message: |-
-          Dzięki, że ze mną wytrzymałeś @%{username}! Zrobiłem to dla Ciebie, myślę, że Ci się należy:
+          Dzięki, że ze mną wytrzymałeś/łaś @%{username}! Zrobiłem to dla Ciebie, myślę, że Ci się należy:
 
           %{certificate}
 
-          To na razie wszystko! Sprawdź [**najnowsze wątki dyskusji**](%{base_uri}/latest) lub [**kategorie**](%{base_uri}/categories). :sunglassses:
+          To na razie wszystko! Sprawdź [**najnowsze tematy dyskusji**](%{base_uri}/latest) lub [**kategorie**](%{base_uri}/categories). :sunglasses:
 
-          (Jeśli będziesz chciał ponownie porozmawiać, wyślij mi wiadomość lub wzmianki `@%{discobot_username}` w dowolnym momencie!)
+          (Jeśli będziesz chciał ponownie porozmawiać, wyślij mi wiadomość lub wspomnij `@%{discobot_username}` w dowolnym momencie!)
       certificate:
         alt: "Certyfikat Osiągnięcia"
     advanced_user_narrative:
@@ -325,7 +327,7 @@ pl_PL:
       cert_title: "W uznaniu za pomyślne ukończenie samouczka zaawansowanego użytkownika."
       title: ":arrow_up: Zaawansowane opcje użytkownika"
       start_message: |-
-        Jako _zaawansowany_ użytkownik, czy odwiedziłeś już [stronę swoich ustawień](%{base_uri}/my/preferences), @%{username}? Istnieje wiele możliwości dostosowania ustawień, takich jak wybranie ciemnego lub jasnego motywu.
+        Jako _zaawansowany_ użytkownik, czy odwiedziłeś/łaś już [stronę swoich ustawień](%{base_uri}/my/preferences), @%{username}? Istnieje wiele możliwości dostosowania ustawień, takich jak wybranie ciemnego lub jasnego motywu.
 
         Ale nie zbaczajmy z tematu, czas zacząć!
       edit:
@@ -335,7 +337,7 @@ pl_PL:
 
           Czy możesz zacząć poprzez **edytowanie** postu, który właśnie stworzyłem w tym celu?
         not_found: |-
-          Wygląda na to, że nie dokonałeś jeszcze edycji [wpisu](%{url}), który stworzyłem dla Ciebie. Czy możesz spróbować ponownie?
+          Wygląda na to, że nie dokonałeś/łaś jeszcze edycji [wpisu](%{url}), który stworzyłem dla Ciebie. Czy możesz spróbować ponownie?
 
           Użyj ikony <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16">, aby wyświetlić edytor.
         reply: |-
@@ -367,7 +369,7 @@ pl_PL:
           Pamiętaj, że masz tylko %{deletion_after}godzin, by przywrócić post.
       category_hashtag:
         instructions: |-
-          Czy wiesz, że możesz się odwoływać do kategorii i tagów w swoim poście? Na przykład, czy widziałeś kategorię %{category}?
+          Czy wiesz, że możesz się odwoływać do kategorii i tagów w swoim poście? Na przykład, czy widziałeś/łaś kategorię %{category}?
 
           Wpisz '#' w środku zdania i wybierz kategorię lub tag.
         not_found: |-
@@ -431,15 +433,15 @@ pl_PL:
           Czy masz problem przy tworzeniu widgetu szczegółów? Spróbuj dołączyć następujący tekst w twojej odpowiedzi.
 
           ```tekst
-          [szczegóły=Wybierz mnie, aby zobaczyć szczegóły]
+          [details=Pokaż szczegóły]
           Tutaj są szczegóły
-          [/szczegóły]
+          [/details]
           ```
         reply: |-
           Dobra robota - twoja dbałość o _szczegóły_ jest wspaniała!
       end:
         message: |-
-          Przemknąłeś przez to jak prawdziwie _zaawansowany użytkownik_ :bow:
+          Przemknąłeś/łaś przez to jak prawdziwie _zaawansowany użytkownik_ :bow:
 
           %{certificate}
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt.yml b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
index 61e6a4ea74..24c1ca3e68 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
@@ -22,11 +22,11 @@ pt:
       name: Licenciado
       description: "Completou o nosso tutorial de utilizador avançado"
   discourse_narrative_bot:
-    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:
       results: |-
         > :game_die: %{results}
     quote:
+      trigger: "citar"
       "1":
         quote: "Entre cada dificuldade há espaço para oportunidade."
         author: "Albert Einstein"
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 1aece4bbe6..a4f804db7e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -24,7 +24,10 @@ pt_BR:
       long_description: |
         Este emblema é concedido após a conclusão bem-sucedida do tutorial interativo de usuário avançado. Você dominou as ferramentas avançadas de discussão — e agora está totalmente licenciado!
   discourse_narrative_bot:
-    bio: "Oi, eu não sou uma pessoa real. Eu sou um robô que pode te ensinar sobre este site. Para interagir comigo, me envie uma mensagem ou mencione **`@%{discobot_username}`** em qualquer lugar."
+    tl2_promotion_message:
+      subject_template: "Agora que você foi promovido, é hora de aprender sobre alguns recursos avançados!"
+      text_body_template: |
+        Responda a esta mensagem com `@%{discobot_username} %{reset_trigger}` para saber mais sobre o que você pode fazer.
     timeout:
       message: |-
         Oi @%{username}, só estou checando para ver se está tudo bem porque não tenho notícias de você já tem um tempo.
@@ -40,6 +43,9 @@ pt_BR:
       trigger: "rolar"
       invalid: |-
         Sinto muito, é matematicamente impossível rolar essa combinação de dados. :confounded:
+      not_enough_dice:
+        one: "Eu só tenho %{count} dado. [Vergonhoso](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), eu sei!"
+        other: "Eu só tenho %{count} dados. [Vergonhoso](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), eu sei!"
       out_of_range: |-
         Você sabia que [o número máximo de lados](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) para um dado matematicamente justo é 120?
       results: |-
@@ -110,6 +116,11 @@ pt_BR:
       random_mention:
         reply: |-
           Oi! Para descobrir o que eu posso fazer diga `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          Eu atualmente sei como fazer as seguintes coisas:
+
+          `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
+          > Inicia um tutorial interativo só para você, em uma mensagem pessoal. `{name-of-tutorial}` pode ser um entre: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
@@ -175,6 +186,23 @@ pt_BR:
           Imagem bacana – eu pressionei o botão :heart: de curtir para que você saiba o quanto eu gostei dela :heart_eyes:
         like_not_found: |-
           Você esqueceu de curtir :heart: minha [postagem?](%{url}) :crying_cat_face:
+        not_found: |-
+          Parece que você não fez o upload de uma imagem, então eu escolhi uma foto que eu tenho _certeza_ que você vai gostar.
+
+          <%{image_url}>
+
+          Tente fazer o upload desta foto a seguir ou colar o link em uma linha por si só!
+      likes:
+        instructions: |-
+          Aqui está a foto de um unicórnio:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Se você gostou (e quem não gostaria), vá em frente e aperte o botão :heart: de curtir abaixo da postagem para que eu fique sabendo.
+        reply: |-
+          Obrigado por curtir minha postagem!
+        not_found: |-
+          Você esqueceu de curtir :heart: minha [postagem?](%{url}) :crying_cat_face:
       formatting:
         instructions: |-
           Você pode colocar algumas palavras em **negrito** ou _itálico_ na sua resposta?
@@ -210,6 +238,8 @@ 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 facilmente encontrar o caminho de volta para nossa conversa privada a qualquer momento, direto da [aba favoritos em seu perfil] (%{bookmark_url}). Basta selecionar sua foto de perfil no canto superior direito &#8599;
         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:
@@ -251,6 +281,8 @@ pt_BR:
           Eu acho que você sabe o que fazer. Vá em frente e **sinalize esta postagem** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> como inapropriada!
         reply: |-
           [Nossa staff](%{base_uri}/groups/staff) será notificada secretamente sobre a sua sinalização. Se membros suficientes da comunidade notificarem uma postagem, ela também será automaticamente oculta como uma precaução. (Já que eu na verdade não escrevi uma postagem inapropriada :angel:, tomei a liberdade de remover a sinalização por enquanto.)
+        not_found: |-
+          Ah não, minha postagem inapropriada ainda não foi sinalizada. :worried: Você pode sinalizá-la como inapropriada usando a **bandeira** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Não se esqueça de usar o botão mostrar mais <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para revelar mais ações para cada postagem.
       search:
         instructions: |-
           _xiiu_ … eu escondi uma surpresa neste tópico. Se você está pronto para o desafio, **selecione o ícone de pesquisa** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> no canto superior direito &#8599; para pesquisar por ela.
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ro.yml b/plugins/discourse-narrative-bot/config/locales/server.ro.yml
index b4e9a39fb2..3670306c8f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ro.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ro.yml
@@ -6,6 +6,8 @@
 
 ro:
   discourse_narrative_bot:
+    quote:
+      trigger: "citează"
     magic_8_ball:
       answers:
         "1": "It is certain"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 8ffe45fe69..55da164e2d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -25,7 +25,7 @@ ru:
       long_description: |
         Эта награда выдается при успешном завершении дополнительного обучения пользователя. Вы освоили все инструменты форума, теперь вы полностью готовы к общению!
   discourse_narrative_bot:
-    bio: "Здравствуйте! Я не реальный человек. Я бот, который может научить вас работать с этим сайтом. Чтобы работать со мной, отправьте мне сообщение или упоминание **`@%{discobot_username}`** в любом сообщении."
+    bio: "Привет, я не человек. Я бот, который может рассказать вам много интересного об этом сайте. Чтобы пообщаться со мной, отправьте мне личное сообщение или упомяните меня по имени в любом другом сообщении."
     tl2_promotion_message:
       subject_template: "Теперь, когда вы были повышены, пришло время узнать о дополнительном функционале форума!"
       text_body_template: |
@@ -42,7 +42,7 @@ ru:
 
         Если вы не хотите мне отвечать, это тоже нормально. Я робот. Вы не заденете моих чувств (по крайней мере на данном этапе моего развития). :sob:
     dice:
-      trigger: "бросить"
+      trigger: "кости"
       invalid: |-
         Извините, даже математически невозможно выдать эту комбинацию костей. :confounded:
       not_enough_dice:
@@ -121,10 +121,10 @@ ru:
         reply: |-
           Привет! Чтобы узнать, что я могу сделать, наберите: `@%{discobot_username} %{help_trigger}`.
         tracks: |-
-          В настоящее время я знаю, как делать следующие вещи:
+          В настоящее время я могу выполнить следующие команды:
 
           `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
-          > В личном сообщении запускает интерактивное учебное пособие. `{name-of-tutorial}` может быть одним из: `%{tracks}`.
+          > Команда запускает интерактивное учебное пособие. Вместо `{name-of-tutorial}` укажите один из следующих параметров: `%{tracks}`. Общение продолжится через личные сообщения.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
@@ -134,6 +134,7 @@ ru:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: Вы можете положиться на него
+        discobot_disabled: Вы отключили меня в настройках. Вы должны включить меня, если хотите, чтобы я смог вовремя помочь новичкам дельным советом.
       do_not_understand:
         first_response: |-
           Спасибо за ответ!
@@ -250,11 +251,11 @@ ru:
           Ой, я не вижу никаких закладок в этой теме. Вы нашли закладку под каждым сообщением? Воспользуйтесь кнопкой 'Показать еще' <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> для просмотра всего доступного функционала.
       emoji:
         instructions: |-
-          Наверное вы заметили, что в своих ответах я использую маленькие картинки :blue_car::dash: Они называются [эмодзи](https://ru.wikipedia.org/wiki/Эмодзи) или смайлы. Попробуйте **добавить смайл** к своему ответу. Вы можете сделать это одним из этих способов:
+          Наверное вы заметили, что в своих ответах я использую маленькие картинки :blue_car::dash: Они называются [эмодзи](https://ru.wikipedia.org/wiki/Эмодзи). Попробуйте **добавить эмодзи** к своему ответу. Вы можете сделать это одним из этих способов:
 
           - Напишите `:) ;) :D :P :O`
 
-          - Напишите двоеточие <kbd>:</kbd> затем - название смайла `:tada:`
+          - Напишите двоеточие <kbd>:</kbd> затем - название эмодзи`:tada:`
 
           - Нажмите на значок со смайликом <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> в панели редактора или на клавиатуре мобильного телефона.
         reply: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sk.yml b/plugins/discourse-narrative-bot/config/locales/server.sk.yml
index 3679f372f4..cd5bc06d4e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sk.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sk.yml
@@ -23,7 +23,6 @@ sk:
       long_description: |
         Tento odznak sa udeľuje po úspešnom ukončení interaktívneho manuálu pokročilého používateľa. Zvládli ste pokročilé nástroje diskusie — a teraz ste plne certifikovaný!
   discourse_narrative_bot:
-    bio: "Ahoji, ja nie som skutočná osoba. Som robot, ktorý Ťa môže naučiť o tejto stránke. Komunikovať so mnou môžeš poslaním správy, alebo zmienkou **`@%{discobot_username}`** kdekoľvek."
     timeout:
       message: |-
         Hej @%{username}, iba kontrolujem, pretože nejaký čas som od Ťeba nič nepočul .
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sl.yml b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
index 8e6020781e..d13ad9ca8d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
@@ -25,7 +25,11 @@ sl:
       long_description: |
         Ta značka vam je podeljena po uspešno opravljenem vodiču za napredne uporabnike. Sedaj obvladate napredna orodja za razpravo - in tako ste licencirani!
   discourse_narrative_bot:
-    bio: "Pozdravljeni, jaz nisem prava oseba. Sem robot, ki te lahko naučim o tej strani. Za pogovor z menoj mi pošlji sporočilo ali me omeni z **`@%{discobot_username}`**."
+    bio: "Pozdravljeni, jaz nisem prava oseba. Sem robot, ki te lahko naučim o tej strani. Za pogovor z menoj mi pošlji sporočilo ali omeni moje ime."
+    tl2_promotion_message:
+      subject_template: "Zdaj, ko ste napredovali, je čas, da se seznanite z nekaterimi naprednimi funkcijami!"
+      text_body_template: |
+        Odgovorite na to sporočilo z `@%{discobot_username} %{reset_trigger}`, če želite izvedeti več o tem, kaj lahko storite.
     timeout:
       message: |-
         Pozdravljeni @%{username}, samo preverjam, ker vas že nekaj časa nisem slišal.
@@ -41,6 +45,11 @@ sl:
       trigger: "kocke"
       invalid: |-
         Oprostite, matematično ni mogoče vreči to kombinacijo kock. :confounded:
+      not_enough_dice:
+        one: "Imam samo %{count} kocko. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), vem!"
+        two: "Imam samo %{count} kocki. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), vem!"
+        few: "Imam samo %{count} kocke. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), vem!"
+        other: "Imam samo %{count} kock. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), vem!"
       out_of_range: |-
         Ali ste vedeli da je [največje število stranic](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) za matematično pravično kocko 120?
       results: |-
@@ -125,6 +134,7 @@ sl:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: Lahko se zanesete nanjo
+        discobot_disabled: Onemogočili ste me v svojih nastavitvah. Za interakcijo z mano morate dovoliti namige novim uporabnikom.
       do_not_understand:
         first_response: |-
           Hvala za odgovor!
@@ -181,6 +191,12 @@ sl:
           Lepa slika – pritisnil sem :heart: gumb, da vam povem kako zelo mi je všeč. :heart_eyes:
         like_not_found: |-
           Ali ste pozabili všečkati :heart: moj [prispevek?](%{url}) :crying_cat_face:
+        not_found: |-
+          Kaže da niste uspeli naložiti slike, zato sem jaz izbral takšno, ki vam bo _zagotovo_ všeč.
+
+          <%{image_url}>
+
+          Poskusite naložiti to sliko ali pa prilepite povezavo do slike v svojo vrstico!
       likes:
         instructions: |-
           Tu je slika samoroga:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sv.yml b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
index 18ff47cade..92b2c5dd68 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sv.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
@@ -25,7 +25,7 @@ sv:
       long_description: |
         Denna utmärkelse tilldelas efter att den interaktiva vägledningen för avancerade användare har genomförts. Du har lärt dig om de avancerade diskussionsverktygen och är nu certifierad!
   discourse_narrative_bot:
-    bio: "Hej, Jag är inte en riktig person. Jag är en bot som kan lära dig använda denna site. För att interagera med mig skickar du mig ett meddelande eller nämner **`@%{discobot_username}`** någonstans."
+    bio: "Hej, jag är ingen riktig person. Jag är en bot som kan lära dig mer om den här webbplatsen. För att interagera med mig, skicka ett meddelande till mig eller nämna mig med namn."
     tl2_promotion_message:
       subject_template: "Nu när du har blivit befordrad är det dags att lära dig mer om några avancerade funktioner!"
       text_body_template: |
@@ -132,6 +132,7 @@ sv:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: Det kan du lita på
+        discobot_disabled: Du har inaktiverat mig i dina inställningar. Du måste tillåta nybörjartips för att kunna interagera med mig.
       do_not_understand:
         first_response: |-
           Halloj, tack för svaret!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sw.yml b/plugins/discourse-narrative-bot/config/locales/server.sw.yml
index 6a09f89bd9..13a7805615 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sw.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sw.yml
@@ -24,7 +24,6 @@ sw:
       long_description: |
         Hii beji inapewa kwa mtu aliyemaliza kupitia mafunzo yetu ya juu. Umepata mafunzo hayo ya juu kuhusu majadiliano - na sasa umethibitishwa!
   discourse_narrative_bot:
-    bio: "Habari, mimi sio mtu bali ni roboti. Ningependa nikufundishe kuhusu hii tovuti. Kuwasiliana na mimi, nitumie ujumbe au nitaje **@%{discobot_username}** popote."
     timeout:
       message: |-
         Habari @%{username}, nakujulia hali kwa sababu sijakuona nina mda
@@ -144,6 +143,9 @@ sw:
           Picha nzuri -- Nimebonyeza kitufe cha :moyo: kuonyesha shukrani yangu kwako :heart_eyes_:
         like_not_found: |-
           Je ulisahau kuipenda :heart: [taarifa] yangu?(%{url}) :crying_cate_face:
+      likes:
+        not_found: |-
+          Je ulisahau kuipenda :heart: [taarifa] yangu?(%{url}) :crying_cate_face:
       formatting:
         instructions: |-
           Unaweza **kukoza** au _italiki_kwenye jibu lako?
diff --git a/plugins/discourse-narrative-bot/config/locales/server.th.yml b/plugins/discourse-narrative-bot/config/locales/server.th.yml
index 9fb1cb3899..053d65ca90 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.th.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.th.yml
@@ -6,6 +6,8 @@
 
 th:
   discourse_narrative_bot:
+    quote:
+      trigger: "อ้างอิง"
     magic_8_ball:
       answers:
         "1": "It is certain"
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 13c55ac985..b723deb21b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
@@ -24,7 +24,6 @@ tr_TR:
       long_description: |
         Bu rozet, interaktif ileri kullanıcı eğitiminin başarılı tamamlanmasının ardından verilir. Gelişmiş tartışma araçlarına hakim oldunuz - ve şimdi tamamen lisanslısınız!
   discourse_narrative_bot:
-    bio: "Merhaba, ben gerçek bir insan değilim. Bu site hakkındaki şeyleri size öğretebilecek bir robotum. Benimle etkileşime geçmek için bana bir mesaj gönderin veya ** `@%{discobot_username}` ** şekliyle herhangi bir yerde beni etiketleyin."
     timeout:
       message: |-
         Merhaba @ %{username}, uzun süredir sizden haber alamadık.
@@ -167,6 +166,9 @@ tr_TR:
           Şık resim -  :heart: :heart_eyes:
         like_not_found: |-
           Beğenmeyi unuttun mu? :heart: [post?] (%{url}) :crying_cat_face:
+      likes:
+        not_found: |-
+          Beğenmeyi unuttun mu? :heart: [post?] (%{url}) :crying_cat_face:
       formatting:
         instructions: |-
           Yanıtınızda bazı kelimeleri **kalın** veya _italic_ yapabilir misiniz?
diff --git a/plugins/discourse-narrative-bot/config/locales/server.uk.yml b/plugins/discourse-narrative-bot/config/locales/server.uk.yml
index 4be90a71e7..e78e097ad7 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.uk.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.uk.yml
@@ -25,7 +25,7 @@ uk:
       long_description: |
         Цей знак надається після успішного завершення інтерактивного навчального посібника для просунутих користувачів. Ви освоїли передові інструменти обговорення – і тепер ви повністю ліцензовані!
   discourse_narrative_bot:
-    bio: "Привіт, я не справжня людина. Я бот, який може навчити вас роботі з цим сайтом. Щоб спілкуватися зі мною, надішліть мені повідомлення або згадайте ** `@ %{discobot_username}` ** де завгодно."
+    bio: "Привіт, я не справжня людина. Я бот, який може навчити вас роботі з цим сайтом. Щоб взаємодіяти зі мною, надішліть мені повідомлення або згадайте мене по імені."
     tl2_promotion_message:
       subject_template: "Тепер, коли ви були підвищені, настав час дізнатися про деякі додаткові функції!"
       text_body_template: |
@@ -45,14 +45,22 @@ uk:
       trigger: "крутити"
       invalid: |-
         Вибачте, комбінація кубиків математично неможлива. :confounded:
+      results: |-
+        > :game_die: %{results}
     quote:
       trigger: "цитата"
       "1":
+        quote: "В середині кожної складності криється можливість"
         author: "Альберт Ейнштейн"
+      "2":
+        quote: "Свобода не варто мати, якщо вона не дає свободу помилитися."
+        author: "Махатма Ганді"
       "3":
+        quote: "Не плач, що це скінчилося, посміхайтеся що це було."
         author: "Д-р Сеус"
       "4":
         quote: "Якщо ви хочете, щоб щось було зроблено правильно, зробіть це самостійно."
+        author: "Шарль-Гійом Етьєн"
       "5":
         author: "Теодор Рузвельт"
       "6":
@@ -164,6 +172,11 @@ uk:
           Вишуканий малюнок - я натиснув на кнопку :heart:, щоб повідомити, наскільки я ціную це :heart_eyes:
         like_not_found: |-
           Ви забули вподобати :heart: мій [допис?](%{url}) :crying_cat_face:
+      likes:
+        reply: |-
+          Дякую, що вподобали мій допис!
+        not_found: |-
+          Ви забули вподобати :heart: мій [допис?](%{url}) :crying_cat_face:
       quoting:
         reply: |-
           Чудова робота, ти вибрав мою улюблену цитату! : left_speech_bubble:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ur.yml b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
index c31dc6fba4..c37ac7e84b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ur.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
@@ -24,7 +24,6 @@ ur:
       long_description: |
         یہ بَیج انٹرایکٹِو اَیڈوانسڈ ٹیوٹوریل کی کامیاب تکمیل پر دیا جاتا ہے۔ آپ نے بحث کے اعلیٰ اصولوں پر مہارت حاصل کر لی ہے — اور اب آپ مکمل طور پر لائسنس یافتہ ہیں!
   discourse_narrative_bot:
-    bio: "ہیلو، میں ایک حقیقی شخص نہیں ہوں۔ میں ایک بَوٹ ہوں جو آپ کو اس سائٹ کے بارے میں سکھا سکتا ہے۔ میرے ساتھ بات چیت کرنے کے لئے، مجھے ایک پیغام بھیجیں یا کہیں بھی **`@%{discobot_username}`** زکر کریں۔"
     timeout:
       message: |-
         ارے @%{username}، بس چیک کر رہا ہوں کیونکہ میں نے کچھ دیر سے آپ سے نہیں سنا۔
@@ -166,6 +165,9 @@ ur:
           اچھی تصویر - آپ کو بتانے کیلئے کہ یہ مجھے کتنی پسند ائی ہے میں نے لائیک :heart: کا بٹن دبایا :heart_eyes:
         like_not_found: |-
           کیا آپ میری [پوسٹ](%{url}) کو لائیک :heart: کرنا بھول گئے؟ :crying_cat_face:
+      likes:
+        not_found: |-
+          کیا آپ میری [پوسٹ](%{url}) کو لائیک :heart: کرنا بھول گئے؟ :crying_cat_face:
       formatting:
         instructions: |-
           کیا آپ اپنے جواب میں کچھ الفاظ کو **بولڈ** یا _آئیٹیلک_ بنا سکتے ہیں؟
diff --git a/plugins/discourse-narrative-bot/config/locales/server.vi.yml b/plugins/discourse-narrative-bot/config/locales/server.vi.yml
index 7fd7646588..b85f147434 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.vi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.vi.yml
@@ -19,8 +19,8 @@ vi:
       name: Đã cấp phép
       description: "Đã hoàn thành hướng dẫn nâng cao cho thành viên mới của chúng tôi"
   discourse_narrative_bot:
-    bio: "Xin chào, tôi không phải là người thật. Tôi là một bot có thể dạy bạn về trang web này. Để tương tác với tôi, hãy gửi cho tôi một tin nhắn hoặc đề cập đến ** `@%{discobot_username}'** ở bất kỳ đâu."
     quote:
+      trigger: "trích dẫn"
       "3":
         quote: "Đừng khóc vì nó đã qua, hãy cười vì điều đó đã xảy ra."
       "4":
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 578b6f5e1e..2342ec2d75 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -25,7 +25,7 @@ zh_CN:
       long_description: |
         该徽章授予给完成交互式高级用户教程的你。你已经掌握了讨论的高级工具——本徽章就是你的证明！
   discourse_narrative_bot:
-    bio: "你好，我不是真人，而是一个教你如何使用站点的机器人。你可以给我发消息或在任意地方提及 **`@%{discobot_username}`** 与我交互。"
+    bio: "你好，我不是一个真实存在的人类。我是一个可以带你了解这个站点的机器人。你可以通过给我发消息或提及我来与我交互。"
     tl2_promotion_message:
       subject_template: "现在你已经晋升了，是时候学习高级功能了！"
       text_body_template: |
@@ -131,6 +131,7 @@ zh_CN:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: 你可能需要它
+        discobot_disabled: 你已在设置中关闭了我。你需要启用新用户入门技巧才能与我交互。
       do_not_understand:
         first_response: |-
           你好，感谢回复！
@@ -242,7 +243,7 @@ zh_CN:
         reply: |-
           太棒了！现在你可以在任何时候轻松地找到我们的私信，[你的个人页面收藏栏](%{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 **吗？这些都可以用：
@@ -286,21 +287,21 @@ zh_CN:
           不好，我讨厌的发帖还未被标记为不当内容。:worried:你能使用**标记**<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">将其标记为不当内容吗？不要忘记使用显示更多的按钮<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">为每个帖子显示更多的操作选项。
       search:
         instructions: |-
-          呼…我已经在这个主题中隐藏了一个惊喜。如果你想挑战的话，点击右上角&#8599;的**搜索按钮** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">来找到它。
+          呼…我已经在这个话题中隐藏了一个惊喜。如果你想挑战的话，点击右上角&#8599;的**搜索按钮** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">来找到它。
 
-          试试在这个主题中搜索关键词“capy&#8203;bara”
+          试试在这个话题中搜索关键词“capy&#8203;bara”
         hidden_message: |-
           你怎么错过了这只水豚？ :wink:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          注意到你回到主题开头了么？**使用颜文字`%{search_answer}`回复**来给这只可怜又饥饿水豚投食吧，之后你就会自动回到底部。
+          注意到你回到话题开头了么？**使用颜文字`%{search_answer}`回复**来给这只可怜又饥饿水豚投食吧，之后你就会自动回到底部。
         reply: |-
           你找到啦 :tada:
 
           - 想用更复杂的条件搜索，前往[全文搜索页](%{search_url})。
 
-          - 想在长讨论中任意跳转的话，试试右侧（移动端在下方）的主题时间线控制器。
+          - 想在长讨论中任意跳转的话，试试右侧（移动端在下方）的话题时间线控制器。
 
           - 如果你有 :keyboard:，按下<kbd>?</kbd>查看有用的键盘快捷键列表。
         not_found: |-
@@ -311,7 +312,7 @@ zh_CN:
 
           %{certificate}
 
-          目前为止就这样了！查看[**我们最新的讨论主题**](%{base_uri}/latest)或[**在分类讨论**](%{base_uri}/categories)。:sunglasses:
+          目前为止就这样了！查看[**我们最新的讨论话题**](%{base_uri}/latest)或[**在分类讨论**](%{base_uri}/categories)。:sunglasses:
 
           （如果你想再次与我交谈以了解更多信息，请随时留言或提及`@%{discobot_username}`！）
       certificate:
@@ -321,7 +322,7 @@ zh_CN:
       cert_title: "你已经成功完成高级用户教程了"
       title: ":arrow_up: 高级用户特性"
       start_message: |-
-        作为_advanced_用户，你是否访问过[你的偏好设置页面](%{base_uri}/my/preferences) @%{username}？ 有很多方法可以自定义你的体验，例如选择深色或浅色主题
+        作为_advanced_用户，你是否访问过[你的偏好设置页面](%{base_uri}/my/preferences) @%{username}？ 有很多方法可以自定义你的体验，例如选择深色或浅色话题
 
         但我离题了，让我们开始吧！
       edit:
@@ -376,17 +377,17 @@ zh_CN:
           漂亮！记住这对分类和标签（如果站点启用了它的话）都有用。
       change_topic_notification_level:
         instructions: |-
-          每个主题都有通知等级。默认为“普通”，只有别人直接回复你的时候才会提醒你。
+          每个话题都有通知等级。默认为“普通”，只有别人直接回复你的时候才会提醒你。
 
-          默认情况下，私信中的通知等级被设为最高级“监看”，即你将收到每个新回复的提醒。但是你可以改变任意一个主题的通知等级至“监看”、“追踪”或“静音”。
+          默认情况下，私信中的通知等级被设为最高级“监看”，即你将收到每个新回复的提醒。但是你可以改变任意一个话题的通知等级至“监看”、“追踪”或“静音”。
 
-          让我们试试改变这个主题的通知等级。在主题最下方，你可以看到一个**监看**的按钮。你可以把通知等级改成**追踪**吗？
+          让我们试试改变这个话题的通知等级。在话题最下方，你可以看到一个**监看**的按钮。你可以把通知等级改成**追踪**吗？
         not_found: |-
-          看起来你仍在关注 :eyes: 这个主题！不知道如何关注？通知等级按钮就在主题的下方。
+          看起来你仍在关注 :eyes: 这个话题！不知道如何关注？通知等级按钮就在话题的下方。
         reply: |-
           太棒了！我希望你没有把这个话题静音，因为我有时会说话有点健谈:grin:。
 
-          请注意，当你回复主题或阅读主题超过几分钟时，它会自动设置为“跟踪”的通知级别。 你可以在[你的用户首选项](%{base_uri}/my/preferences)中更改此设置。
+          请注意，当你回复话题或阅读话题超过几分钟时，它会自动设置为“跟踪”的通知级别。 你可以在[你的用户首选项](%{base_uri}/my/preferences)中更改此设置。
       poll:
         instructions: |-
           你知道你可以在任何帖子中添加投票吗？试试用编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标来**发起投票**。
diff --git a/plugins/discourse-narrative-bot/config/locales/server.zh_TW.yml b/plugins/discourse-narrative-bot/config/locales/server.zh_TW.yml
index c2ab4a588e..8ee79cec4a 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_TW.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_TW.yml
@@ -8,6 +8,8 @@ zh_TW:
   site_settings:
     discourse_narrative_bot_enabled: "啟用 Discourse 機器人"
   discourse_narrative_bot:
+    quote:
+      trigger: "引用"
     magic_8_ball:
       answers:
         "1": "It is certain"
diff --git a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
index 527dfbe3c9..9586bc483f 100644
--- a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
+++ b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
@@ -49,7 +49,7 @@ bot.create_user_profile! if !bot.user_profile
 
 if !bot.user_profile.bio_raw
   bot.user_profile.update!(
-    bio_raw: I18n.t('discourse_narrative_bot.bio', site_title: SiteSetting.title, discobot_username: bot.username)
+    bio_raw: I18n.t('discourse_narrative_bot.bio')
   )
 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 066a0bdeac..8efa03956e 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
@@ -137,7 +137,7 @@ module DiscourseNarrativeBot
       src = Discourse.base_url + DiscourseNarrativeBot::Engine.routes.url_helpers.certificate_path(options)
       alt = CGI.escapeHTML(I18n.t("#{self.class::I18N_KEY}.certificate.alt"))
 
-      "<img class='discobot-certificate' src='#{src}' width='650' height='464' alt='#{alt}'>"
+      "<iframe class='discobot-certificate' src='#{src}' width='650' height='464' alt='#{alt}'></iframe>"
     end
 
     protected
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
index a158521149..9d99b3b30b 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
@@ -2,9 +2,9 @@
 
 module DiscourseNarrativeBot
   class CertificateGenerator
-    def initialize(user, date, avatar_data)
+    def initialize(user, date, avatar_url)
       @user = user
-      @avatar_data = avatar_data
+      @avatar_url = avatar_url
 
       date =
         begin
@@ -23,14 +23,14 @@ module DiscourseNarrativeBot
 
     def new_user_track
       svg_default_width = 538.583
-      logo_container = logo_group(55, svg_default_width, 350)
+      logo_container = logo_group(55, svg_default_width, 280)
 
       ApplicationController.render(inline: read_template('new_user'), assigns: assign_options(svg_default_width, logo_container))
     end
 
     def advanced_user_track
       svg_default_width = 722.8
-      logo_container = logo_group(40, svg_default_width, 280)
+      logo_container = logo_group(40, svg_default_width, 350)
 
       ApplicationController.render(inline: read_template('advanced_user'), assigns: assign_options(svg_default_width, logo_container))
     end
@@ -46,7 +46,7 @@ module DiscourseNarrativeBot
         width: width,
         discobot_user: @discobot_user,
         date: @date,
-        avatar_url: base64_image_data(@avatar_data),
+        avatar_url: @avatar_url,
         logo_group: logo_group,
         name: name
       }
@@ -59,48 +59,16 @@ module DiscourseNarrativeBot
     def logo_group(size, width, height)
       return unless SiteSetting.site_logo_small_url.present?
 
-      begin
-        uri = URI(SiteSetting.site_logo_small_url)
+      uri = URI(SiteSetting.site_logo_small_url)
 
-        logo_uri =
-          if uri.host.blank? || uri.scheme.blank?
-            URI("#{Discourse.base_url}/#{uri.path}")
-          else
-            uri
-          end
+      logo_uri =
+        if uri.host.blank? || uri.scheme.blank?
+          URI("#{Discourse.base_url}/#{uri.path}")
+        else
+          uri
+        end
 
-        <<~URL
-          <g transform="translate(#{width / 2 - (size / 2)} #{height})">
-            <image height="#{size}px" width="#{size}px" #{base64_image_link(logo_uri)}/>
-          </g>
-          URL
-      rescue URI::InvalidURIError
-        ''
-      end
-    end
-
-    def base64_image_data(data)
-      return "" if data.blank?
-      "xlink:href=\"data:image/png;base64,#{Base64.strict_encode64(data)}\""
-    end
-
-    def base64_image_link(url)
-      if image = fetch_image(url)
-        base64_image_data(image)
-      else
-        ""
-      end
-    end
-
-    def fetch_image(url)
-      FileHelper.download(
-        url.to_s,
-        max_file_size: SiteSetting.max_image_size_kb.kilobytes,
-        tmp_file_name: 'narrative-bot-logo',
-        follow_redirect: true
-      )&.read
-    rescue OpenURI::HTTPError
-      # Ignore if fetching image returns a non 200 response
+      { size: size, width: width, height: height, logo_uri: logo_uri }
     end
   end
 end
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/templates/advanced_user.svg.erb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/templates/advanced_user.svg.erb
index e5bccc0823..000fba0d09 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/templates/advanced_user.svg.erb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/templates/advanced_user.svg.erb
@@ -38,7 +38,7 @@
     <clipPath id="clipCircle">
       <circle r="19" cx="19" cy="19"/>
     </clipPath>
-    <image clip-path="url(#clipCircle)" height="38px" width="38px" <%= sanitize(@avatar_url) %>/>
+    <image clip-path="url(#clipCircle)" height="38px" width="38px" href="<%= @avatar_url %>"/>
   </g>
   <text transform="matrix(1.0705 0 0 1 544.2073 388.3629)" fill="#020403" font-family="'Tangerine'" font-size="24.9219px">
     <%= @discobot_user.username %>
@@ -46,8 +46,11 @@
   <text x="<%= @width / 2 %>" y="270" text-anchor="middle" fill="#020403" font-family="'Tangerine'" font-size="34.8841px">
     <%= @name %>
   </text>
-  <%= @logo_group %>
-
+  <% if @logo_group.present? %>
+    <g transform="translate(<%= @logo_group[:width] / 2 - (@logo_group[:size] / 2) %> <%= @logo_group[:height] %>)">
+      <image height="<%= @logo_group[:size] %>px" width="<%= @logo_group[:size] %>px" href="<%= @logo_group[:logo_uri] %>"/>
+    </g>
+  <% end %>
   <g>
     <g fill="#8CC63F">
       <path d="M309.08 149.42v-.7l1.84.01c.05 0 .07-.01.08-.04.01-.03.01-.06-.01-.1l-1.83-5.24c-.03-.08-.05-.14-.08-.17l.01-2.66.02-.03c.05-.11.09-.18.13-.22.04-.04.07-.06.11-.05.04 0 .07.01.11.05.04.03.08.1.13.2s.11.25.19.45c.04.1.11.29.23.59.12.3.26.68.43 1.13.17.46.37.96.58 1.52.21.56.44 1.15.68 1.77.23.62.47 1.25.71 1.88.24.63.47 1.24.7 1.83.23.59.44 1.14.64 1.65s.37.95.52 1.32c.17.43.34.78.49 1.05.16.27.31.48.44.63.14.15.27.26.39.33s.23.12.33.14c.15.05.29.08.42.09.14.02.25.02.35.02.06 0 .11.01.14.02.03.02.05.05.05.09 0 .06-.04.1-.11.12-.07.03-.16.04-.27.04h-.41c-.2 0-.44 0-.72-.01-.28 0-.59 0-.92-.01-.33-.01-.66-.01-1-.03-.18-.01-.33-.02-.43-.03-.1-.01-.15-.05-.15-.1 0-.04.01-.07.04-.09.03-.02.06-.04.1-.05.06-.02.11-.07.15-.16.04-.09.03-.21-.03-.37l-1.79-4.78c-.02-.04-.04-.07-.06-.09-.03-.02-.06-.03-.11-.03l-2.09.03zm15.9 5.99c.37 0 .75-.01 1.13-.03.38-.02.75-.06 1.09-.11.34-.05.63-.12.86-.21.1-.04.17-.07.22-.11.05-.04.09-.08.12-.14.03-.06.06-.14.09-.24.04-.12.07-.25.11-.42.04-.17.08-.35.11-.53.04-.18.07-.36.1-.53.03-.17.05-.31.07-.42.02-.11.03-.18.03-.21 0-.06-.02-.11-.05-.16-.03-.05-.06-.07-.11-.07s-.09.02-.12.05c-.02.04-.04.09-.06.18-.02.11-.06.25-.11.41-.06.17-.13.34-.22.51-.1.17-.2.33-.32.45-.22.22-.47.39-.75.5-.27.11-.58.18-.92.22-.34.03-.72.05-1.15.04-.73-.01-1.41-.11-2.04-.32-.63-.21-1.19-.5-1.7-.88-.5-.38-.93-.81-1.29-1.32-.36-.5-.63-1.05-.82-1.63-.19-.59-.28-1.2-.28-1.84 0-.56.04-1.09.12-1.6.09-.51.24-.99.46-1.44.22-.46.54-.87.96-1.26.2-.19.46-.37.78-.54.32-.17.73-.31 1.23-.42.5-.11 1.11-.16 1.84-.17.51 0 .98.05 1.41.13.43.08.81.19 1.14.33.33.14.6.29.8.46.15.12.28.27.38.44.11.18.19.37.24.58.06.21.09.42.08.63 0 .12.01.2.02.26.02.06.05.09.11.09.05 0 .09-.03.13-.08.04-.05.06-.15.07-.27.01-.06.01-.16.01-.28 0-.13 0-.28.01-.44 0-.16.01-.33.01-.5 0-.17.01-.32.01-.46.01-.2.03-.36.04-.48.01-.12.02-.22.03-.28.01-.07.01-.13.01-.17 0-.05-.01-.09-.04-.12-.03-.04-.09-.05-.17-.05-.28-.01-.56-.04-.84-.09-.28-.05-.59-.1-.9-.16-.28-.05-.57-.08-.86-.11-.29-.03-.58-.05-.86-.07-.28-.01-.53-.02-.76-.02-.87 0-1.63.08-2.28.23-.65.15-1.22.36-1.7.63-.48.26-.88.56-1.22.89-.38.37-.69.76-.94 1.17-.25.41-.45.81-.59 1.22-.15.4-.25.78-.31 1.15-.06.36-.09.68-.09.96-.01.53.05 1.08.16 1.65.11.57.32 1.13.62 1.69.3.55.73 1.08 1.27 1.56.44.39.93.72 1.48.98.55.26 1.16.46 1.84.59.7.11 1.46.18 2.31.18zm18.41-7.85v-1.3c0-.36 0-.66.01-.9 0-.24 0-.45.01-.61 0-.16.01-.3.01-.41.01-.11.01-.22.02-.32.01-.19.04-.35.07-.47.04-.12.09-.22.18-.29.08-.07.19-.12.34-.15.1-.02.19-.03.25-.03h.18c.04 0 .08-.02.11-.04.03-.03.05-.06.05-.09 0-.05-.02-.08-.07-.1-.05-.02-.12-.03-.22-.03h-.46c-.18 0-.36.01-.53.01-.18.01-.33.01-.46.01s-.21.01-.24.01c-.02 0-.1 0-.23-.01-.13 0-.29-.01-.49-.01-.19-.01-.4-.01-.61-.02-.21 0-.42-.01-.61-.01-.1 0-.17.01-.21.03-.05.02-.06.05-.07.1 0 .03.01.06.04.09s.06.04.1.05c.06 0 .12 0 .19.01.07 0 .15.01.21.01.07.01.13.01.18.02.18.03.32.08.42.15.09.07.16.17.19.3.04.13.06.28.07.47 0 .1.01.21.01.33 0 .12.01.26.01.42 0 .17.01.37.01.62V147.97c0 .05-.01.07-.03.08-.02.01-.04.02-.07.01l-7.12-.02c-.03 0-.05 0-.07-.01-.02-.01-.03-.04-.03-.08v-.35-1.31-.91c0-.25.01-.45.01-.62 0-.17 0-.3.01-.42 0-.12.01-.23.01-.33.01-.19.04-.35.07-.47.04-.12.1-.22.18-.29.08-.07.2-.12.36-.15.1-.02.18-.03.24-.03h.18c.03 0 .06-.02.09-.04.03-.03.04-.06.05-.09 0-.05-.02-.08-.06-.1-.05-.02-.11-.03-.21-.03h-.47c-.18 0-.36.01-.54.01-.18.01-.33.01-.45.01-.13 0-.2.01-.22.01-.03 0-.11 0-.24-.01-.13 0-.29-.01-.48-.01-.19-.01-.4-.01-.61-.02-.22 0-.42-.01-.62-.01-.1 0-.16.01-.21.03-.05.02-.06.05-.06.1 0 .03.02.06.05.09.03.03.06.04.09.05.05 0 .12 0 .19.01.07 0 .15.01.21.01.07.01.13.01.18.02.18.03.33.08.42.15.1.07.16.17.2.3.04.13.06.28.07.47.01.1.01.21.02.32 0 .12.01.25.01.41 0 .16.01.36.01.61v2.2l-.01 2.91c0 .53 0 1.02-.01 1.48 0 .46-.02.86-.03 1.21-.01.35-.04.64-.07.87-.02.16-.05.3-.08.42s-.07.22-.12.3c-.06.07-.14.13-.25.15-.08.02-.17.04-.26.05-.09.01-.18.02-.26.02-.05 0-.08.02-.1.04-.02.03-.03.06-.03.09 0 .05.02.08.07.1.05.02.11.03.2.03.14 0 .29 0 .48-.01.18-.01.36-.01.54-.02.18-.01.33-.01.46-.02s.2-.01.23-.01c.02 0 .1 0 .23.01s.3.01.5.02.42.01.66.02c.24.01.48.01.72.01.1 0 .16-.01.21-.04.04-.03.06-.06.06-.1 0-.03-.01-.06-.03-.09-.02-.03-.06-.04-.1-.05-.05 0-.13 0-.21-.01l-.28-.03c-.1-.01-.19-.03-.28-.04-.16-.03-.29-.08-.37-.15-.08-.08-.14-.18-.17-.3s-.06-.26-.07-.42c-.04-.35-.06-.82-.06-1.42-.01-.6-.01-1.31 0-2.11l.01-1.65c0-.04.01-.06.03-.08.02-.01.04-.02.07-.02l7.12.02c.03 0 .05.01.07.02.02.01.03.04.03.08l-.01 1.65c0 .8 0 1.5-.02 2.1-.01.6-.03 1.07-.07 1.41-.02.16-.04.31-.07.43-.03.12-.08.23-.13.3-.06.08-.15.13-.27.16-.08.02-.16.04-.25.05-.09.01-.17.02-.25.02-.05 0-.08.02-.1.04-.02.03-.03.06-.03.09 0 .05.02.08.06.1.04.02.11.03.21.03.13 0 .29 0 .47-.01s.36-.01.54-.02c.18-.01.33-.01.46-.02s.2-.01.23-.01.11 0 .24.01.3.01.5.02.42.01.66.02c.24.01.47.01.71.01.1 0 .17-.01.22-.04.05-.03.07-.06.07-.1 0-.03-.01-.06-.03-.09-.03-.03-.06-.04-.12-.05-.05 0-.12 0-.2-.01l-.28-.03c-.1-.01-.19-.03-.27-.04-.17-.03-.3-.08-.38-.15-.08-.08-.14-.18-.17-.3s-.05-.26-.07-.42c-.03-.23-.04-.52-.06-.87-.01-.36-.02-.76-.03-1.21 0-.46-.01-.95 0-1.48l-.08-2.87zm-64.73 7.7c.79-.01 1.52-.12 2.2-.34.7-.23 1.34-.54 1.9-.96.56-.41 1.04-.89 1.44-1.46.4-.56.7-1.17.91-1.84.21-.67.32-1.37.32-2.11 0-.96-.17-1.83-.51-2.59-.34-.76-.81-1.42-1.41-1.95-.61-.54-1.32-.95-2.14-1.23-.82-.28-1.71-.43-2.67-.44v.62c.51.01 1 .09 1.47.25.5.17.97.41 1.39.74.43.33.8.73 1.12 1.22.32.49.57 1.05.74 1.69.18.64.26 1.36.26 2.15-.01.79-.09 1.48-.24 2.07-.15.59-.36 1.09-.63 1.5-.26.41-.56.75-.88 1.01-.32.26-.66.47-1.01.61s-.68.25-1.01.3c-.32.05-.61.08-.87.08-.13 0-.26-.01-.39-.02l.01.7zm30.45-14.74l-.01 2.66c-.07-.1-.14-.04-.21.17l-1.72 5.23c-.02.05-.02.08-.01.1.01.02.04.03.06.03l1.86.01v.7l-2.07-.01c-.05 0-.09.01-.12.04s-.06.06-.07.11l-1.17 3.43c-.09.25-.16.48-.2.7-.05.22-.07.42-.07.6 0 .13.04.24.12.32.07.08.17.15.28.19.11.04.22.06.34.06h.19c.07 0 .12.01.15.03.03.02.05.05.05.09 0 .06-.03.1-.08.12-.05.03-.12.04-.21.04-.12 0-.25 0-.4-.01-.15-.01-.3-.01-.45-.02-.15-.01-.28-.01-.4-.02s-.21-.01-.26-.01c-.05 0-.16 0-.3.01-.15.01-.32.01-.53.02-.21.01-.43.01-.66.02-.24.01-.47.01-.7.01-.13 0-.22-.01-.28-.04-.06-.02-.09-.06-.09-.12 0-.04.02-.07.05-.09.03-.02.07-.03.12-.03.07 0 .17 0 .27-.01.11-.01.2-.02.29-.02.29-.04.54-.14.74-.31.2-.16.37-.37.51-.63s.27-.55.38-.88l4.44-12.03c.06-.2.11-.35.16-.46zm-20.12 9.77c0 .53 0 1.02-.01 1.48 0 .46-.02.86-.03 1.21-.01.35-.04.64-.07.87-.02.16-.05.3-.08.43-.03.12-.07.22-.12.3-.06.08-.14.13-.25.14-.08.01-.17.03-.26.04-.09.02-.18.03-.26.03-.05 0-.08.02-.1.04-.02.03-.03.06-.03.09 0 .05.02.08.07.1.05.02.11.03.2.03.14 0 .29 0 .47-.01s.36-.01.53-.02c.17-.01.33-.01.45-.02.13-.01.2-.01.23-.01.02 0 .1 0 .23.01s.3.01.51.02c.2.01.43.01.67.02.24.01.48.01.72.01.1 0 .16-.01.21-.04.04-.03.06-.06.06-.1 0-.03-.01-.06-.03-.09-.02-.03-.05-.04-.1-.05-.05 0-.13 0-.21-.01l-.28-.03c-.1-.01-.19-.03-.28-.04-.15-.03-.27-.08-.36-.15-.08-.08-.14-.18-.18-.3-.04-.12-.07-.26-.08-.42-.03-.22-.04-.5-.05-.85-.01-.35-.01-.76-.02-1.22v-2.83c0-.06.01-.1.02-.12.02-.02.05-.03.09-.03h.97c.23 0 .47 0 .7.01.24 0 .45.01.64.01.19.01.33.01.42.03.26.04.46.11.6.21.14.09.23.2.27.32.04.1.06.2.08.31.02.11.03.2.03.29 0 .04.01.07.02.11.02.03.04.05.09.05.06 0 .1-.04.12-.11.02-.07.03-.14.03-.22v-.17c0-.09.01-.19.01-.3 0-.11.01-.23.02-.34.01-.11.02-.21.03-.29.02-.27.06-.48.1-.62.04-.15.06-.24.06-.29 0-.04-.01-.07-.02-.1s-.04-.04-.08-.04c-.03 0-.06.02-.1.05-.04.03-.07.07-.11.12-.07.09-.18.16-.3.2-.13.04-.29.07-.49.09-.12.01-.24.02-.36.01h-.41l-2.33.01c-.05 0-.09-.01-.1-.04-.01-.03-.02-.06-.01-.11l.01-4.5c0-.07.01-.11.03-.14.02-.03.06-.04.1-.04l2.79.05c.22 0 .41.03.57.08.16.05.29.11.39.19.1.07.16.15.2.22.05.11.09.22.11.34.03.12.04.21.04.28 0 .06.01.11.04.14.03.04.06.06.1.06.04 0 .07-.02.1-.06.03-.04.05-.07.06-.12.01-.05.02-.13.03-.23.01-.1.01-.21.02-.33.01-.12.01-.22.02-.32s.01-.16.02-.21c.03-.23.06-.4.09-.52s.04-.2.05-.26c0-.04-.01-.08-.03-.11-.02-.03-.05-.05-.09-.05-.03 0-.06.02-.1.04-.04.02-.08.04-.13.05-.08.03-.19.04-.32.05-.14.01-.28.02-.45.02-.07 0-.22.01-.44 0h-.81c-.32 0-.64-.01-.99-.01-.34 0-.67 0-.98-.01-.31 0-.57 0-.79-.01h-.41c-.03 0-.11 0-.24-.01-.13 0-.29-.01-.48-.01-.19-.01-.39-.01-.61-.02-.21 0-.42-.01-.62-.01-.1 0-.16.01-.21.03-.05.02-.07.05-.07.1 0 .03.02.06.05.09.03.03.06.04.09.05.05 0 .12 0 .19.01.07 0 .15.01.21.01.07.01.13.01.18.02.18.03.33.08.42.15.1.07.16.17.2.3.04.13.06.28.07.47.01.1.01.21.02.32 0 .12.01.25.01.41 0 .16.01.36 0 .61v2.2l.02 3.01zm-17.08-1.53c0 .5.05 1 .17 1.51.11.51.28 1.01.52 1.49.23.48.53.94.89 1.35.36.42.79.79 1.28 1.11.49.32 1.05.57 1.69.75.63.18 1.34.28 2.12.28h.1v-.69c-.63-.04-1.21-.19-1.75-.43-.65-.29-1.22-.71-1.71-1.25-.48-.55-.86-1.2-1.12-1.97-.27-.77-.4-1.63-.4-2.6.01-.9.13-1.68.37-2.35.24-.67.59-1.23 1.02-1.67.44-.45.96-.78 1.56-1 .6-.22 1.26-.33 1.97-.33h.1v-.62c-.78 0-1.5.1-2.14.28-.64.19-1.21.45-1.72.78-.5.33-.94.71-1.31 1.14-.37.43-.67.88-.91 1.36-.24.48-.42.96-.54 1.45-.13.5-.19.96-.19 1.41zM350.56 147.58v-1.3-.9-.61c0-.16 0-.3.01-.41 0-.11.01-.22.01-.32.01-.19.04-.35.07-.47.03-.12.09-.22.18-.29.08-.07.2-.12.36-.15.09-.02.17-.03.24-.03h.18c.03 0 .06-.02.09-.04.03-.03.04-.06.05-.09 0-.05-.02-.08-.06-.1-.04-.02-.11-.03-.21-.03h-.47c-.18 0-.37.01-.55.01-.18.01-.33.01-.46.01s-.2.01-.23.01-.1 0-.23-.01c-.13 0-.28-.01-.46-.01-.18-.01-.36-.01-.54-.01-.18 0-.35-.01-.49-.01-.1 0-.16.01-.21.03-.05.02-.06.05-.06.1 0 .03.01.06.04.09s.06.04.1.05c.06 0 .14 0 .23.01s.19.03.29.05c.18.04.31.12.39.27.08.14.13.35.15.63.01.1.01.21.02.32 0 .12.01.25.01.41 0 .16.01.36.01.61v2.2l-.01 2.91c0 .53-.01 1.02-.01 1.48-.01.46-.02.86-.03 1.21-.02.35-.04.64-.06.87-.02.16-.04.3-.07.42-.03.12-.07.22-.13.3-.06.07-.14.13-.25.15-.08.02-.17.04-.26.05-.09.01-.18.02-.26.02-.05 0-.08.02-.1.04-.02.03-.03.06-.03.09 0 .05.02.08.07.1.05.02.11.03.2.03.14 0 .29 0 .47-.01s.36-.01.53-.02c.17-.01.33-.01.45-.02.13-.01.2-.01.23-.01.02 0 .1 0 .23.01s.3.01.51.02c.2.01.43.01.67.02.24.01.49.01.72.01.1 0 .16-.01.21-.04.05-.03.06-.06.06-.1 0-.03-.01-.06-.03-.09-.02-.03-.05-.04-.1-.05-.05 0-.13 0-.21-.01l-.28-.03c-.1-.01-.19-.03-.28-.04-.17-.03-.29-.08-.37-.15-.08-.08-.14-.18-.17-.3s-.06-.26-.07-.42c-.03-.23-.04-.52-.05-.87-.01-.36-.01-.76-.02-1.21v-1.48l-.02-2.9zm5.6 2.93c0 .53 0 1.02-.01 1.48 0 .46-.02.86-.03 1.21-.01.35-.04.64-.07.87-.02.16-.05.3-.08.43-.03.12-.07.22-.12.3-.06.08-.14.13-.25.14-.08.01-.17.03-.26.04-.09.02-.18.03-.26.03-.05 0-.08.02-.1.04-.02.03-.03.06-.03.09 0 .05.02.08.07.1.05.02.11.03.2.03.14 0 .3 0 .47-.01.18-.01.35-.01.52-.02.19-.01.35-.01.49-.01h.25c.13 0 .3 0 .53.01.23.01.52.02.88.04.35.01.77.02 1.27.04.49.01 1.06.03 1.7.03.22 0 .39 0 .51-.01.13-.01.22-.05.29-.11.06-.06.12-.16.15-.3.03-.09.05-.22.08-.38s.05-.33.08-.5c.03-.17.04-.33.06-.46.02-.13.02-.22.02-.25 0-.06-.01-.12-.02-.17-.02-.05-.05-.08-.09-.08-.05 0-.08.02-.11.05-.03.04-.04.1-.06.2-.03.22-.08.4-.15.55-.06.15-.15.27-.25.36-.1.09-.23.17-.38.23s-.33.1-.54.12c-.21.03-.42.04-.62.04-.21.01-.39.01-.54.01-.42 0-.76-.02-1.02-.06-.26-.04-.47-.1-.61-.2-.15-.09-.25-.23-.3-.4-.06-.17-.09-.4-.09-.67 0-.07-.01-.19-.01-.36v-.6-.7c0-.24 0-.46.01-.66 0-.2.01-.36.01-.47v-1.38c0-.03.01-.06.02-.08.02-.02.04-.04.09-.04h.34c.16 0 .35 0 .56.01.22 0 .43.01.66.02.22.01.42.01.6.02s.32.02.42.03c.22.03.39.07.51.11.12.05.21.11.26.18.05.06.09.14.11.22.04.11.06.2.07.29.01.09.01.17.01.25 0 .05.01.09.03.11.02.03.05.04.09.04.06 0 .1-.04.12-.1.02-.06.03-.14.03-.21 0-.05 0-.13.01-.26l.03-.41c.01-.15.03-.28.04-.4.02-.27.05-.48.09-.62.03-.15.05-.24.05-.29 0-.05-.01-.08-.03-.1-.02-.02-.04-.03-.07-.03-.03 0-.06.02-.1.06l-.15.15c-.08.08-.19.14-.33.17-.13.03-.3.05-.5.06-.08.01-.22.01-.42.02-.2 0-.43.01-.69.01h-1.74c-.04 0-.07-.02-.08-.05-.01-.03-.02-.07-.01-.13l.01-4.48c0-.06.01-.1.02-.13s.04-.04.08-.04h.3c.16 0 .35 0 .56.01.22 0 .44.01.66.01.22.01.42.01.59.02.17.01.29.01.35.02.31.04.54.08.7.12.17.04.28.09.36.16.07.06.12.14.16.23.04.1.06.21.08.32.01.11.02.2.02.26 0 .07.01.12.03.16.02.04.06.06.1.06.04 0 .07-.02.1-.06.03-.04.05-.07.06-.12.01-.05.02-.13.03-.23l.03-.33c.01-.12.02-.22.02-.32.01-.1.02-.16.02-.21.02-.23.05-.4.09-.52.03-.12.05-.2.05-.25 0-.04-.01-.08-.01-.11-.01-.03-.03-.05-.06-.05-.04 0-.08.01-.12.03-.04.02-.08.03-.12.04-.07.01-.17.03-.31.05-.14.02-.29.03-.46.05-.07 0-.21.01-.43 0h-.78c-.3 0-.61-.01-.93-.01-.33 0-.63 0-.91-.01-.28 0-.52 0-.7-.01h-.32c-.03 0-.11 0-.24-.01-.14 0-.3-.01-.49-.01-.2-.01-.4-.01-.62-.02-.22 0-.43-.01-.62-.01-.1 0-.16.01-.21.03-.05.02-.06.05-.06.1 0 .03.02.06.05.09.03.03.06.04.09.05.05 0 .12 0 .19.01.07 0 .15.01.21.01.07.01.13.01.18.02.18.03.33.08.42.15.1.07.16.17.2.3.04.13.06.28.07.47.01.1.01.21.02.32 0 .12.01.25.01.41 0 .16.01.36.01.61v2.2l-.09 2.95zm11.67-5.63c-.13-.33-.24-.62-.32-.86-.09-.24-.13-.41-.14-.52 0-.06.01-.11.03-.16.02-.05.08-.09.16-.13.08-.03.18-.05.3-.06.11-.01.22-.02.32-.02.06 0 .1-.02.13-.05.03-.03.04-.07.04-.11 0-.08-.16-.12-.47-.12-.22 0-.45 0-.67.01-.22.01-.41.01-.58.02-.17.01-.28.01-.34.01-.05 0-.15 0-.29-.01-.14 0-.3-.01-.49-.01-.19-.01-.39-.01-.6-.02-.21 0-.42-.01-.63-.01-.13 0-.25.01-.32.02-.08.02-.12.04-.12.09 0 .03.01.06.03.1.02.03.05.05.1.06.05 0 .14 0 .27.01.12.01.25.02.39.05.18.04.34.1.47.18.13.08.25.2.36.36.11.16.22.4.35.71l4.16 10.12c.11.26.2.47.27.62.07.15.14.25.19.31.06.06.12.09.18.09s.11-.03.17-.1c.05-.07.13-.2.21-.38.09-.18.21-.43.36-.76.13-.27.3-.65.51-1.12.21-.47.46-1.04.74-1.69.28-.65.6-1.38.95-2.18.22-.51.44-1 .64-1.48.21-.48.4-.92.57-1.33.17-.41.32-.75.44-1.04.12-.28.21-.49.26-.61.15-.37.28-.66.4-.86.11-.2.22-.35.31-.44.09-.09.17-.16.25-.21.11-.07.21-.11.32-.14.11-.03.21-.04.3-.05.09-.01.15-.01.19-.01.07 0 .12-.02.15-.05.03-.03.04-.07.04-.11 0-.04-.02-.07-.07-.09-.04-.02-.11-.03-.2-.03h-.41c-.15 0-.28.01-.41.01-.13.01-.25.01-.34.01-.09 0-.16.01-.18.01-.08 0-.2 0-.38-.01s-.38-.01-.6-.02c-.23-.01-.46-.01-.69-.01-.13 0-.23.01-.29.03-.07.02-.09.05-.09.1 0 .04.02.07.06.1.04.03.08.04.13.04.1 0 .19 0 .29.01.1.01.19.02.29.05.09.03.15.08.18.15.04.06.05.13.05.2s-.02.16-.05.27c-.03.11-.07.23-.11.35-.05.17-.14.42-.26.76-.12.33-.27.72-.44 1.16-.17.45-.36.92-.56 1.43-.2.51-.41 1.03-.63 1.56-.22.53-.43 1.05-.64 1.56-.21.5-.41.97-.59 1.41-.18.44-.35.81-.49 1.13l-3.16-8.3zm12.12 5.71c0 .53 0 1.02-.01 1.48-.01.46-.02.86-.03 1.21-.01.35-.04.64-.07.87-.02.16-.05.3-.08.43-.03.12-.07.22-.12.3-.05.08-.14.13-.25.14-.08.01-.17.03-.26.04-.09.02-.18.03-.26.03-.05 0-.08.02-.1.04-.02.03-.03.06-.03.09 0 .05.02.08.07.1.05.02.11.03.2.03.14 0 .3 0 .47-.01.18-.01.35-.01.52-.02.19-.01.35-.01.49-.01h.25c.13 0 .3 0 .53.01.23.01.52.02.88.04.35.01.77.02 1.27.04.49.01 1.06.03 1.7.03.22 0 .39 0 .51-.01.13-.01.22-.05.29-.11.06-.06.12-.16.15-.3.03-.09.05-.22.08-.38s.05-.33.08-.5c.03-.17.04-.33.06-.46.02-.13.02-.22.02-.25 0-.06-.01-.12-.02-.17-.02-.05-.05-.08-.09-.08-.05 0-.08.02-.11.05-.03.04-.04.1-.06.2-.03.22-.08.4-.15.55-.06.15-.15.27-.25.36-.1.09-.23.17-.38.23s-.33.1-.54.12c-.21.03-.42.04-.62.04-.21.01-.39.01-.54.01-.42 0-.76-.02-1.02-.06-.26-.04-.47-.1-.61-.2-.15-.09-.25-.23-.3-.4-.06-.17-.09-.4-.09-.67 0-.07-.01-.19-.01-.36v-.6c0-.23 0-.47.01-.7v-.66c0-.2.01-.36.01-.47v-1.38c0-.03.01-.06.02-.08.02-.02.04-.04.09-.04h.34c.16 0 .35 0 .56.01.22 0 .43.01.66.02.22.01.42.01.6.02s.32.02.42.03c.22.03.39.07.51.11.12.05.21.11.26.18.05.06.09.14.11.22.04.11.06.2.07.29.01.09.01.17.01.25 0 .05.01.09.03.11.02.03.05.04.09.04.06 0 .1-.04.12-.1.02-.06.03-.14.03-.21 0-.05 0-.13.01-.26l.03-.41c.01-.15.03-.28.04-.4.02-.27.05-.48.09-.62.03-.15.05-.24.05-.29 0-.05-.01-.08-.03-.1-.02-.02-.04-.03-.07-.03-.03 0-.06.02-.1.06l-.15.15c-.08.08-.2.14-.33.17s-.3.05-.5.06c-.08.01-.22.01-.42.02-.2 0-.43.01-.69.01h-1.74c-.04 0-.07-.02-.08-.05-.01-.03-.02-.07-.01-.13l.01-4.48c0-.06.01-.1.02-.13s.04-.04.08-.04h.3c.16 0 .35 0 .56.01.22 0 .44.01.66.01.22.01.42.01.59.02.17.01.29.01.35.02.31.04.54.08.7.12.17.04.28.09.36.16.07.06.12.14.16.23.04.1.06.21.08.32.01.11.02.2.02.26 0 .07.01.12.03.16.02.04.05.05.1.06.04 0 .07-.02.1-.06.03-.04.05-.07.06-.12.01-.05.02-.13.03-.23l.03-.33c.01-.12.02-.22.02-.32.01-.1.02-.16.02-.21.02-.23.05-.4.09-.52.03-.12.05-.2.05-.25 0-.04-.01-.08-.02-.11s-.03-.05-.06-.05c-.04 0-.08.01-.12.03-.04.02-.08.03-.12.04-.07.01-.17.03-.31.05-.14.02-.29.03-.46.05-.07 0-.21.01-.43 0h-.78c-.3 0-.61-.01-.93-.01-.33 0-.63 0-.91-.01-.28 0-.52 0-.7-.01h-.32c-.03 0-.11 0-.24-.01-.14 0-.3-.01-.49-.01-.2-.01-.4-.01-.62-.02-.22 0-.43-.01-.62-.01-.1 0-.16.01-.21.03-.05.02-.07.05-.07.1 0 .03.02.06.05.09.03.03.06.04.09.05.05 0 .12 0 .19.01.07 0 .14.01.21.01.07.01.13.01.18.02.18.03.33.08.42.15.1.07.16.17.2.3.04.13.06.28.07.47.01.1.01.21.02.32 0 .12.01.25.01.41 0 .16.01.36.01.61v2.2l-.07 2.95zm22.32-7.4c-.02-.16-.05-.27-.1-.34-.04-.07-.1-.11-.15-.11s-.11.03-.15.08c-.05.05-.09.11-.12.19l-5 10.2-5.13-10.25c-.05-.1-.11-.16-.17-.2-.06-.04-.12-.06-.18-.05-.05 0-.09.03-.13.08-.04.05-.06.12-.07.21l-1.28 10.76c-.02.21-.05.41-.08.59-.03.19-.09.35-.18.48s-.22.21-.41.24c-.12.02-.22.03-.29.04-.08.01-.15.01-.21.01-.05 0-.09.01-.12.04-.03.02-.05.05-.05.08 0 .06.03.1.08.12.05.03.12.04.21.04.12 0 .25 0 .4-.01.15-.01.29-.01.44-.02.14-.01.27-.01.38-.02.11-.01.18-.01.22-.01.05 0 .16.01.33.02s.37.02.59.03c.23.01.45.02.67.02.1 0 .17-.01.23-.04.05-.02.08-.06.08-.12 0-.03-.02-.06-.05-.08-.03-.02-.06-.04-.09-.04-.06 0-.15-.01-.26-.02-.12-.01-.25-.04-.39-.08-.13-.03-.22-.08-.3-.16-.07-.08-.11-.18-.11-.31 0-.14 0-.28.01-.42 0-.15.01-.28.02-.41l.68-7.44h.08c.06.14.16.35.29.63.13.28.28.6.45.95.17.36.34.72.52 1.09.18.37.35.71.5 1.04.16.32.29.59.39.81l.33.66c.13.26.27.54.43.84.15.3.31.59.46.89.15.29.3.56.43.82.14.25.25.46.34.62.11.2.2.35.26.46.07.11.12.19.17.23.05.04.1.06.15.06.05 0 .1-.02.15-.07.05-.04.11-.13.18-.26.07-.13.16-.31.28-.54l4.14-8.4h.04l.79 8.34c.02.16.02.29.01.4-.01.11-.04.17-.09.18-.04.01-.07.03-.09.05-.02.02-.03.05-.03.08-.01.04.03.07.09.1s.2.05.39.07c.13.01.3.02.5.03l.67.03c.25.01.48.02.72.02.23 0 .44.01.62.02h.39c.1 0 .18-.01.25-.04s.1-.06.1-.11c0-.04-.01-.07-.04-.09-.02-.02-.06-.03-.1-.03-.09 0-.23 0-.44-.02-.2-.02-.42-.06-.67-.14-.17-.06-.31-.16-.42-.29-.11-.13-.19-.27-.25-.44-.06-.17-.11-.34-.13-.51-.03-.17-.05-.33-.06-.48l-1.12-10.1zM408.55 150.68c0 .53 0 1.02-.01 1.48 0 .46-.02.86-.03 1.21-.02.35-.04.64-.07.87-.02.16-.05.3-.08.43-.03.12-.07.22-.12.3-.06.08-.14.13-.25.14-.08.01-.17.03-.26.04-.09.02-.18.03-.26.03-.05 0-.08.02-.1.04-.02.03-.03.06-.03.09 0 .05.02.08.07.1.05.02.11.03.2.03.14 0 .3 0 .47-.01.18-.01.35-.01.52-.02.19-.01.35-.01.49-.01h.24c.13 0 .3 0 .53.01.23.01.52.02.88.04.35.01.77.02 1.27.04.5.01 1.06.03 1.7.03.22 0 .39 0 .51-.01.13-.01.22-.05.29-.11.06-.06.12-.16.15-.3.03-.09.05-.22.08-.38s.05-.33.08-.5c.03-.17.04-.33.06-.46.02-.13.02-.22.02-.25 0-.06-.01-.12-.02-.17-.02-.05-.04-.08-.09-.08-.05 0-.08.02-.11.05-.03.04-.05.1-.07.2-.03.22-.08.4-.15.55-.07.15-.15.27-.25.36-.1.09-.23.17-.38.23s-.33.1-.54.12c-.21.03-.42.04-.62.04-.21.01-.39.01-.54.01-.42 0-.76-.02-1.02-.06-.27-.04-.47-.1-.61-.2-.14-.09-.24-.23-.3-.4s-.09-.4-.1-.67c0-.07-.01-.19-.01-.36v-.6c0-.23 0-.47.01-.7 0-.24.01-.46.01-.66V149.32c0-.03.01-.06.02-.08.02-.02.05-.04.09-.04h.34c.16 0 .35 0 .56.01.22 0 .43.01.66.02.22.01.42.01.6.02s.32.02.42.03c.22.03.39.07.51.11.12.05.21.11.26.18.06.06.09.14.11.22.04.11.06.2.07.29.01.09.01.17.01.25 0 .05.01.09.03.11.02.03.05.04.09.04.06 0 .1-.04.12-.1.02-.06.03-.14.03-.21 0-.05 0-.13.01-.26l.03-.41c.01-.15.03-.28.04-.4.02-.27.05-.48.09-.62.03-.15.05-.24.05-.29 0-.05-.01-.08-.02-.1-.02-.02-.04-.03-.07-.03-.03 0-.07.02-.1.06l-.15.15c-.08.08-.19.14-.33.17-.13.03-.3.05-.5.06-.08.01-.22.01-.42.02-.2 0-.43.01-.68.01h-1.74c-.05 0-.07-.02-.08-.05-.01-.03-.02-.07-.01-.13l.01-4.48c0-.06.01-.1.02-.13s.04-.04.08-.04h.3c.16 0 .35 0 .56.01.22 0 .44.01.66.01.22.01.42.01.59.02.17.01.29.01.35.02.31.04.54.08.7.12.16.04.28.09.35.16.07.06.13.14.16.23.04.1.06.21.08.32.01.11.02.2.02.26 0 .07.01.12.03.16.02.04.05.05.1.06.04 0 .07-.02.1-.06.03-.04.04-.07.05-.12.01-.05.02-.13.03-.23l.03-.33c.01-.12.02-.22.02-.32.01-.1.02-.16.02-.21.02-.23.05-.4.09-.52.03-.12.05-.2.05-.25 0-.04-.01-.08-.02-.11s-.03-.05-.06-.05c-.04 0-.08.01-.12.03-.04.02-.08.03-.12.04-.07.01-.18.03-.31.05-.14.02-.29.03-.46.05-.07 0-.21.01-.43 0h-.78c-.3 0-.61-.01-.93-.01-.33 0-.63 0-.91-.01-.29 0-.52 0-.7-.01h-.32c-.03 0-.11 0-.24-.01-.13 0-.3-.01-.49-.01-.2-.01-.4-.01-.62-.02-.22 0-.43-.01-.62-.01-.1 0-.17.01-.21.03-.05.02-.06.05-.06.1 0 .03.02.06.04.09.03.03.06.04.09.05.06 0 .12 0 .19.01.07 0 .15.01.21.01.07.01.13.01.18.02.18.03.33.08.42.15.1.07.16.17.2.3.04.13.06.28.07.47.01.1.01.21.02.32 0 .12.01.25.01.41v2.81l-.03 2.95zm11.23-5.2c.14.15.35.38.63.68.29.31.63.67 1.03 1.1.4.42.83.88 1.3 1.37.47.5.95 1 1.45 1.53.36.38.74.77 1.13 1.17.39.4.78.79 1.15 1.17l1.03 1.03.76.76c.2.19.32.31.35.34.31.29.55.51.72.65.17.15.29.24.37.29.08.05.15.07.2.07.03 0 .05-.01.07-.03.02-.02.03-.07.04-.15.01-.08.02-.2.02-.36v-.64l.07-9.66c0-.33.01-.59.03-.78.02-.2.08-.35.17-.45.08-.1.22-.17.4-.2.1-.02.18-.03.25-.03h.16c.06 0 .11-.02.14-.05.03-.04.05-.07.05-.1 0-.05-.03-.08-.09-.09-.06-.02-.13-.02-.22-.02-.35 0-.66 0-.91.02-.26.01-.44.02-.54.02-.07 0-.19 0-.37-.01s-.4-.01-.64-.02c-.25-.01-.5-.01-.76-.01-.1 0-.18.01-.24.02-.06.02-.09.04-.09.09 0 .03.01.06.03.1.02.03.06.05.11.06.05 0 .12 0 .21.01s.19.01.3.03c.11.01.22.03.32.05.17.03.3.1.39.21.09.1.15.27.19.48.04.21.05.5.06.85l.15 8.26c-.13-.14-.34-.36-.61-.65-.27-.29-.59-.64-.96-1.03s-.76-.81-1.18-1.25l-1.27-1.33c-.53-.55-1.04-1.08-1.54-1.61-.5-.52-.97-1.01-1.4-1.47-.44-.46-.83-.88-1.18-1.24-.34-.36-.62-.66-.84-.89-.22-.23-.35-.37-.41-.43l-.21-.21c-.08-.08-.15-.15-.23-.21-.08-.06-.16-.09-.22-.09-.05 0-.08.02-.12.07-.04.05-.06.14-.09.25-.02.12-.03.29-.03.51l-.03 9.44c0 .49-.01.88-.03 1.17-.02.29-.07.5-.14.63s-.18.22-.32.25c-.13.04-.26.06-.39.08-.13.01-.23.02-.31.02-.04 0-.07.01-.1.04s-.04.06-.04.1c0 .06.02.09.07.11.05.02.11.03.2.03.26 0 .51-.01.74-.01.23-.01.43-.01.59-.02.16-.01.27-.02.32-.01.08 0 .28.01.6.03.31.02.72.03 1.21.03.1 0 .17-.01.23-.03.05-.02.08-.05.08-.1 0-.04-.01-.07-.04-.1s-.06-.04-.1-.04c-.05 0-.13 0-.22-.01s-.2-.02-.31-.03c-.11-.02-.22-.04-.32-.06-.16-.04-.28-.11-.37-.24-.09-.13-.16-.32-.21-.58-.04-.26-.07-.62-.08-1.07l-.16-7.81zm19.35-1.62l2.13.05c.4.01.74.04 1 .09s.47.11.61.2c.15.08.26.18.32.28.06.11.1.22.12.35l.02.18c.01.11.02.19.04.23.02.04.05.06.09.06.04 0 .08-.02.11-.06.03-.04.05-.09.05-.16 0-.05 0-.16.01-.3.01-.15.01-.32.02-.52s.01-.39.02-.58c.01-.19.01-.35.01-.48 0-.05 0-.09-.01-.13-.01-.04-.03-.06-.07-.06-.04 0-.1.01-.18.02-.08.02-.18.03-.31.05-.13.02-.3.04-.5.05-.2.02-.44.02-.72.02l-6.44-.02c-.07 0-.18 0-.33-.01-.14-.01-.31-.01-.49-.03-.18-.01-.36-.03-.52-.05-.23-.03-.4-.08-.51-.12-.11-.05-.19-.07-.25-.08-.02 0-.04.02-.06.06-.02.04-.04.08-.07.13-.02.05-.04.09-.05.12 0 .03-.02.1-.05.22-.03.12-.06.25-.1.42-.04.16-.07.32-.1.48-.04.16-.07.3-.09.43-.02.12-.04.2-.04.24 0 .05.02.08.05.1.02.02.05.03.07.03.04 0 .07-.01.1-.03.03-.02.05-.06.07-.13.03-.06.05-.12.08-.2.03-.08.09-.18.19-.33.08-.13.19-.23.32-.3.13-.07.31-.13.54-.16.23-.03.51-.05.87-.06l2.46-.03-.02 6.92c0 .53 0 1.02-.01 1.48 0 .46-.01.86-.02 1.21s-.03.64-.06.87c-.03.25-.07.44-.14.6-.07.15-.19.25-.36.29-.08.02-.16.04-.25.05-.09.01-.17.02-.25.02-.05 0-.08.01-.1.04-.02.02-.03.05-.03.08 0 .05.02.08.07.1.04.02.11.03.21.03.13 0 .29 0 .48-.01s.38-.01.57-.02c.19-.01.35-.01.49-.02.13-.01.21-.01.24-.01s.11 0 .24.01.3.01.5.02.42.01.66.02c.24.01.47.01.71.01.1 0 .16-.01.21-.04.04-.03.06-.06.06-.1 0-.03-.01-.06-.02-.09-.02-.03-.06-.04-.11-.05-.05 0-.13 0-.22-.01l-.28-.03c-.1-.01-.19-.03-.27-.04-.17-.03-.3-.08-.39-.15-.09-.08-.15-.18-.19-.3-.04-.12-.06-.26-.08-.42-.02-.23-.04-.52-.05-.87-.01-.36-.01-.76-.02-1.21v-1.48l.02-6.87z"/>
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/templates/new_user.svg.erb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/templates/new_user.svg.erb
index 298f6119c7..de84656e92 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/templates/new_user.svg.erb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/templates/new_user.svg.erb
@@ -452,12 +452,16 @@
       <clipPath id="clipCircle">
         <circle r="15" cx="15" cy="15"/>
       </clipPath>
-      <image clip-path="url(#clipCircle)" height="30px" width="30px" <%= sanitize(@avatar_url) %>/>
+      <image clip-path="url(#clipCircle)" height="30px" width="30px" href="<%= @avatar_url %>"/>
     </g>
     <text x="<%= @width / 2 %>" y="240.94" text-anchor="middle" font-size="24" fill="#020403" font-family="Tangerine, Tangerine">
       <%= @name %>
     </text>
-    <%= @logo_group %>
+    <% if @logo_group.present? %>
+      <g transform="translate(<%= @logo_group[:width] / 2 - (@logo_group[:size] / 2) %> <%= @logo_group[:height] %>)">
+        <image height="<%= @logo_group[:size] %>px" width="<%= @logo_group[:size] %>px" href="<%= @logo_group[:logo_uri] %>"/>
+      </g>
+    <% end %>
   </g>
   <g id="Layer_1-2" data-name="Layer 1">
     <path d="M339.328 47.187c-.034 1.193 3.25 2.2 6.51 3.383 5.5 1.994 13.1 3.73 17.68 3.112 5.05-.55 4.982-2.217 4.054-4.8-.1-4.647.258-9.493.156-14.142l-27.128-.458c.5 4.698-1.778 8.207-1.272 12.905z" transform="translate(-.108)" fill-rule="evenodd" fill="url(#GradientFill_24)"/>
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb
index 67d852317f..2ac5f73364 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb
@@ -61,7 +61,7 @@ module DiscourseNarrativeBot
             klass.new.input(@input, @user, post: @post, skip: skip_track?)
           end
         elsif is_reply && (@is_pm_to_bot || public_reply?)
-          like_user_post
+          like_user_post if @is_pm_to_bot
           bot_commands
         end
       elsif data && data.dig(:state)&.to_sym != :end && is_topic_action?
@@ -126,7 +126,9 @@ module DiscourseNarrativeBot
 
     def bot_commands(hint = true)
       raw =
-        if match_data = match_trigger?("#{self.class.dice_trigger} (\\d+)d(\\d+)")
+        if @user.manually_disabled_discobot?
+          I18n.t(self.class.i18n_key('random_mention.discobot_disabled'))
+        elsif match_data = match_trigger?("#{self.class.dice_trigger} (\\d+)d(\\d+)")
           DiscourseNarrativeBot::Dice.roll(match_data[1].to_i, match_data[2].to_i)
         elsif match_trigger?(self.class.quote_trigger)
           DiscourseNarrativeBot::QuoteGenerator.generate(@user)
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 2a97edf640..f66219c301 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -22,6 +22,7 @@ if Rails.env == "development"
 end
 
 require_relative 'lib/discourse_narrative_bot/welcome_post_type_site_setting.rb'
+register_asset 'stylesheets/discourse-narrative-bot.scss'
 
 after_initialize do
   SeedFu.fixture_paths << Rails.root.join("plugins", "discourse-narrative-bot", "db", "fixtures").to_s
@@ -47,8 +48,17 @@ after_initialize do
     '../lib/discourse_narrative_bot/welcome_post_type_site_setting.rb'
   ].each { |path| load File.expand_path(path, __FILE__) }
 
-  # Disable welcome message because that is what the bot is supposed to replace.
-  SiteSetting.send_welcome_message = false if SiteSetting.send_welcome_message
+  RailsMultisite::ConnectionManagement.safe_each_connection do
+    if SiteSetting.discourse_narrative_bot_enabled
+      # Disable welcome message because that is what the bot is supposed to replace.
+      SiteSetting.send_welcome_message = false
+
+      certificate_path = "#{Discourse.base_url}/discobot/certificate.svg"
+      if !SiteSetting.allowed_iframes.include?(certificate_path)
+        SiteSetting.allowed_iframes = SiteSetting.allowed_iframes.split('|').append(certificate_path).join('|')
+      end
+    end
+  end
 
   require_dependency 'plugin_store'
 
@@ -94,8 +104,7 @@ after_initialize do
         raise Discourse::NotFound if user.blank?
 
         hijack do
-          avatar_data = fetch_avatar(user)
-          generator = CertificateGenerator.new(user, params[:date], avatar_data)
+          generator = CertificateGenerator.new(user, params[:date], avatar_url(user))
 
           svg = params[:type] == 'advanced' ? generator.advanced_user_track : generator.new_user_track
 
@@ -107,16 +116,8 @@ after_initialize do
 
       private
 
-      def fetch_avatar(user)
-        avatar_url = UrlHelper.absolute(Discourse.base_path + user.avatar_template.gsub('{size}', '250'))
-        FileHelper.download(
-          avatar_url.to_s,
-          max_file_size: SiteSetting.max_image_size_kb.kilobytes,
-          tmp_file_name: 'narrative-bot-avatar',
-          follow_redirect: true
-        )&.read
-      rescue OpenURI::HTTPError
-        # Ignore if fetching image returns a non 200 response
+      def avatar_url(user)
+        UrlHelper.absolute(Discourse.base_path + user.avatar_template.gsub('{size}', '250'))
       end
     end
   end
@@ -162,7 +163,7 @@ after_initialize do
 
     case SiteSetting.discourse_narrative_bot_welcome_post_type
     when 'new_user_track'
-      if enqueue_narrative_bot_job?
+      if enqueue_narrative_bot_job? && !manually_disabled_discobot?
         Jobs.enqueue_in(delay, :narrative_init,
           user_id: self.id,
           klass: DiscourseNarrativeBot::NewUserNarrative.to_s
@@ -173,12 +174,15 @@ after_initialize do
     end
   end
 
+  self.add_to_class(:user, :manually_disabled_discobot?) do
+    user_option&.skip_new_user_tips
+  end
+
   self.add_to_class(:user, :enqueue_narrative_bot_job?) do
     SiteSetting.discourse_narrative_bot_enabled &&
       self.human? &&
       !self.anonymous? &&
       !self.staged &&
-      !user_option&.skip_new_user_tips &&
       !SiteSetting.discourse_narrative_bot_ignored_usernames.split('|'.freeze).include?(self.username)
   end
 
@@ -302,7 +306,9 @@ after_initialize do
                   discobot_username: ::DiscourseNarrativeBot::Base.new.discobot_username,
                   reset_trigger: "#{::DiscourseNarrativeBot::TrackSelector.reset_trigger} #{::DiscourseNarrativeBot::AdvancedUserNarrative.reset_trigger}")
 
-      recipient = args[:post].topic.topic_users.where.not(user_id: args[:post].user_id).last.user
+      recipient = args[:post].topic.topic_users.where.not(user_id: args[:post].user_id).last&.user
+      recipient ||= Discourse.site_contact_user if args[:post].user == Discourse.site_contact_user
+      return if recipient.nil?
 
       PostCreator.create!(
         ::DiscourseNarrativeBot::Base.new.discobot_user,
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 31b94e83ea..70ee377e76 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
@@ -715,7 +715,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      it 'should create the right reply' do
+      it 'should create the right reply and issue the discobot certificate' do
         post.update!(raw: "[details=\"This is a test\"]\nwooohoo\n[/details]")
         narrative.input(:reply, user, post: post)
 
@@ -729,6 +729,12 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
 
         expect(user.badges.where(name: DiscourseNarrativeBot::AdvancedUserNarrative.badge_name).exists?)
           .to eq(true)
+
+        expect(topic.ordered_posts.last.cooked).to include("<iframe")
+        expect(Nokogiri::HTML5(topic.ordered_posts.last.cooked).at("iframe").text).not_to include(
+          "Bye for now"
+        )
+        expect(topic.ordered_posts.last.cooked).to include("</iframe>")
       end
     end
   end
@@ -741,4 +747,14 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
     expect(Topic.last.title).to eq(I18n.t("discourse_narrative_bot.tl2_promotion_message.subject_template"))
     expect(Topic.last.topic_users.map(&:user_id).sort).to eq([DiscourseNarrativeBot::Base.new.discobot_user.id, recipient.id])
   end
+
+  it 'invites the site_contact_username to advanced training fine as well' do
+    recipient = Post.last.user
+    SiteSetting.site_contact_username = recipient.username
+    expect {
+      DiscourseEvent.trigger(:system_message_sent, post: Post.last, message_type: 'tl2_promotion_message')
+    }.to change { Topic.count }
+    expect(Topic.last.title).to eq(I18n.t("discourse_narrative_bot.tl2_promotion_message.subject_template"))
+    expect(Topic.last.topic_users.map(&:user_id).sort).to eq([DiscourseNarrativeBot::Base.new.discobot_user.id, recipient.id])
+  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 cc788673dc..e2e5729071 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
@@ -19,6 +19,8 @@ describe DiscourseNarrativeBot::TrackSelector do
   before do
     stub_request(:get, "http://api.forismatic.com/api/1.0/?format=json&lang=en&method=getQuote").
       to_return(status: 200, body: "{\"quoteText\":\"Be Like Water\",\"quoteAuthor\":\"Bruce Lee\"}")
+
+      SiteSetting.discourse_narrative_bot_enabled = true
   end
 
   let(:help_message) do
@@ -466,6 +468,16 @@ describe DiscourseNarrativeBot::TrackSelector do
           expect(new_post.raw).to eq(random_mention_reply)
         end
 
+        it 'tells the user to enable the onboarding tips first' do
+          user.user_option.update!(skip_new_user_tips: true)
+          post.update!(raw: 'Show me what you can do @discobot')
+
+          described_class.new(:reply, user, post_id: post.id).select
+
+          new_post = Post.last
+          expect(new_post.raw).to eq(I18n.t('discourse_narrative_bot.track_selector.random_mention.discobot_disabled'))
+        end
+
         it "should be case insensitive towards discobot's username" do
           discobot_user.update!(username: 'DisCoBot')
 
@@ -475,6 +487,16 @@ describe DiscourseNarrativeBot::TrackSelector do
           expect(new_post.raw).to eq(random_mention_reply)
         end
 
+        it 'should not like the public post' do
+          post.update!(raw: 'thanks @discobot!')
+
+          expect { described_class.new(:reply, user, post_id: post.id).select }
+            .to change { PostAction.count }.by(0)
+
+          new_post = Post.last
+          expect(new_post.raw).to eq(random_mention_reply)
+        end
+
         describe 'rate limiting random reply message in public topic' do
           let(:topic) { Fabricate(:topic) }
           let(:other_post) { Fabricate(:post, raw: '@discobot show me something', topic: topic) }
diff --git a/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb b/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb
index d30c76cf6a..6a42615a20 100644
--- a/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb
@@ -36,6 +36,9 @@ describe "Discobot Certificate" do
         get '/discobot/certificate.svg', params: params
 
         expect(response.status).to eq(200)
+        expect(response.body).to include('<svg')
+        expect(response.body).to include(user.avatar_template.gsub('{size}', '250'))
+        expect(response.body).to include(SiteSetting.site_logo_small_url)
       end
 
       describe 'when params are missing' do
diff --git a/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb b/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb
index 334d16c271..015879c52b 100644
--- a/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb
@@ -29,16 +29,15 @@ describe "Discobot welcome post" do
     end
 
     context 'when user redeems an invite' do
-      let(:invite) { Fabricate(:invite, invited_by: Fabricate(:admin), email: 'testing@gmail.com') }
+      let!(:invite) { Fabricate(:invite, invited_by: Fabricate(:admin), email: 'testing@gmail.com') }
 
       it 'should delay the welcome post until the user logs in' do
-        invite
-
         expect do
           put "/invites/show/#{invite.invite_key}.json", params: {
             username: 'somename',
             name: 'testing',
-            password: 'asodaasdaosdhq'
+            password: 'verystrongpassword',
+            email_token: invite.email_token
           }
         end.to change { User.count }.by(1)
 
diff --git a/plugins/discourse-narrative-bot/spec/user_spec.rb b/plugins/discourse-narrative-bot/spec/user_spec.rb
index f775dd7111..d2eb77384b 100644
--- a/plugins/discourse-narrative-bot/spec/user_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/user_spec.rb
@@ -167,4 +167,12 @@ describe User do
       expect(DiscourseNarrativeBot::Store.get(user.id)).to eq(nil)
     end
   end
+
+  describe '#manually_disabled_discobot?' do
+    it 'returns true if the user manually disabled new user tips' do
+      user.user_option.skip_new_user_tips = true
+
+      expect(user.manually_disabled_discobot?).to eq(true)
+    end
+  end
 end
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 9c2703de1c..19a82d0309 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,18 +1,18 @@
-import Component from "@ember/component";
+import {
+  CLOSED,
+  COMPOSER_TYPE,
+  EDITING,
+  KEEP_ALIVE_DURATION_SECONDS,
+  REPLYING,
+} from "discourse/plugins/discourse-presence/discourse/lib/presence";
 import { cancel, throttle } from "@ember/runloop";
-import { gt, readOnly } 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,
-  KEEP_ALIVE_DURATION_SECONDS,
-} from "discourse/plugins/discourse-presence/discourse/lib/presence";
+import { gt, readOnly } from "@ember/object/computed";
+import Component from "@ember/component";
+import { inject as service } from "@ember/service";
 
 export default Component.extend({
   // Passed in variables
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 4600eef460..f38ac5c582 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,11 +1,12 @@
+import discourseComputed, { on } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import { TOPIC_TYPE } from "discourse/plugins/discourse-presence/discourse/lib/presence";
 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 "discourse/plugins/discourse-presence/discourse/lib/presence";
 
 export default Component.extend({
   topic: null,
+  topicId: null,
   presenceManager: service(),
 
   @discourseComputed("topic.id")
@@ -15,8 +16,17 @@ export default Component.extend({
 
   shouldDisplay: gt("users.length", 0),
 
+  didReceiveAttrs() {
+    this._super(...arguments);
+    if (this.topicId) {
+      this.presenceManager.unsubscribe(this.topicId, TOPIC_TYPE);
+    }
+    this.set("topicId", this.get("topic.id"));
+  },
+
   @on("didInsertElement")
   subscribe() {
+    this.set("topicId", this.get("topic.id"));
     this.presenceManager.subscribe(this.get("topic.id"), TOPIC_TYPE);
   },
 
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 aa070d68ab..2146ce582a 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 } from "@ember/runloop";
+import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 
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 fa8cc51c23..ae24b63073 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,7 +1,7 @@
-import Service from "@ember/service";
 import Presence, {
   CLOSED,
 } from "discourse/plugins/discourse-presence/discourse/lib/presence";
+import Service from "@ember/service";
 
 const PresenceManager = Service.extend({
   presences: null,
diff --git a/plugins/discourse-presence/assets/stylesheets/presence.scss b/plugins/discourse-presence/assets/stylesheets/presence.scss
index 188a41ec8a..fd4b1993b2 100644
--- a/plugins/discourse-presence/assets/stylesheets/presence.scss
+++ b/plugins/discourse-presence/assets/stylesheets/presence.scss
@@ -1,6 +1,11 @@
+.topic-above-footer-buttons-outlet.presence {
+  min-height: 1.8em; // height of the avatars, prevents layout shift
+  margin: var(--below-topic-margin) 0;
+}
+
 .presence-users {
-  background-color: var(--secondary, $secondary);
-  color: var(--primary-medium, $primary-medium);
+  background-color: var(--secondary);
+  color: var(--primary-medium);
   display: flex;
 
   span.presence-text {
diff --git a/plugins/discourse-presence/config/locales/client.be.yml b/plugins/discourse-presence/config/locales/client.be.yml
index 2e3980a624..2ea77a0d35 100644
--- a/plugins/discourse-presence/config/locales/client.be.yml
+++ b/plugins/discourse-presence/config/locales/client.be.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-be: 
+be:
diff --git a/plugins/discourse-presence/config/locales/client.bg.yml b/plugins/discourse-presence/config/locales/client.bg.yml
index 6c61d82645..52333529d3 100644
--- a/plugins/discourse-presence/config/locales/client.bg.yml
+++ b/plugins/discourse-presence/config/locales/client.bg.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-bg: 
+bg:
diff --git a/plugins/discourse-presence/config/locales/client.bs_BA.yml b/plugins/discourse-presence/config/locales/client.bs_BA.yml
index a433d4207d..e21d9053aa 100644
--- a/plugins/discourse-presence/config/locales/client.bs_BA.yml
+++ b/plugins/discourse-presence/config/locales/client.bs_BA.yml
@@ -7,6 +7,14 @@
 bs_BA:
   js:
     presence:
+      replying:
+        one: "odgovara"
+        few: "odgovara"
+        other: "odgovara"
+      editing:
+        one: "ispravlja"
+        few: "ispravlja"
+        other: "ispravlja"
       replying_to_topic:
         one: "piše"
         few: "piše"
diff --git a/plugins/discourse-presence/config/locales/client.ca.yml b/plugins/discourse-presence/config/locales/client.ca.yml
index d7c05f2d2f..bf6533b84f 100644
--- a/plugins/discourse-presence/config/locales/client.ca.yml
+++ b/plugins/discourse-presence/config/locales/client.ca.yml
@@ -7,6 +7,12 @@
 ca:
   js:
     presence:
+      replying:
+        one: "responent"
+        other: "responent"
+      editing:
+        one: "editant"
+        other: "editant"
       replying_to_topic:
         one: "responent"
         other: "responent"
diff --git a/plugins/discourse-presence/config/locales/client.cs.yml b/plugins/discourse-presence/config/locales/client.cs.yml
index f3265c8c88..34f66ba0cd 100644
--- a/plugins/discourse-presence/config/locales/client.cs.yml
+++ b/plugins/discourse-presence/config/locales/client.cs.yml
@@ -4,4 +4,21 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-cs: 
+cs:
+  js:
+    presence:
+      replying:
+        one: "odpovídá"
+        few: "odpovídá"
+        many: "odpovídá"
+        other: "odpovídá"
+      editing:
+        one: "upravuje"
+        few: "upravuje"
+        many: "upravuje"
+        other: "upravuje"
+      replying_to_topic:
+        one: "odpovídá"
+        few: "odpovídá"
+        many: "odpovídá"
+        other: "odpovídá"
diff --git a/plugins/discourse-presence/config/locales/client.da.yml b/plugins/discourse-presence/config/locales/client.da.yml
index 2411798ff0..e1d9dda95b 100644
--- a/plugins/discourse-presence/config/locales/client.da.yml
+++ b/plugins/discourse-presence/config/locales/client.da.yml
@@ -7,6 +7,12 @@
 da:
   js:
     presence:
+      replying:
+        one: "besvarer"
+        other: "besvarer"
+      editing:
+        one: "redigerer"
+        other: "redigerer"
       replying_to_topic:
-        one: "svar"
-        other: "svarer"
+        one: "besvarer"
+        other: "besvarer"
diff --git a/plugins/discourse-presence/config/locales/client.el.yml b/plugins/discourse-presence/config/locales/client.el.yml
index 54f960d3e5..c578ef273e 100644
--- a/plugins/discourse-presence/config/locales/client.el.yml
+++ b/plugins/discourse-presence/config/locales/client.el.yml
@@ -7,6 +7,12 @@
 el:
   js:
     presence:
+      replying:
+        one: "απαντά"
+        other: "απαντά"
+      editing:
+        one: "επεξεργάζεται"
+        other: "επεξεργάζεται"
       replying_to_topic:
         one: "απαντά"
         other: "απαντούν"
diff --git a/plugins/discourse-presence/config/locales/client.en_GB.yml b/plugins/discourse-presence/config/locales/client.en_GB.yml
new file mode 100644
index 0000000000..2d4fa180ec
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.en_GB.yml
@@ -0,0 +1,7 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
diff --git a/plugins/discourse-presence/config/locales/client.et.yml b/plugins/discourse-presence/config/locales/client.et.yml
index 5702d705bb..989b50f72a 100644
--- a/plugins/discourse-presence/config/locales/client.et.yml
+++ b/plugins/discourse-presence/config/locales/client.et.yml
@@ -4,4 +4,15 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-et: 
+et:
+  js:
+    presence:
+      replying:
+        one: "vastamine"
+        other: "vastamine"
+      editing:
+        one: "muutmine"
+        other: "muutmine"
+      replying_to_topic:
+        one: "vastamine"
+        other: "vastamine"
diff --git a/plugins/discourse-presence/config/locales/client.fa_IR.yml b/plugins/discourse-presence/config/locales/client.fa_IR.yml
index ff398c26db..43e36c60a0 100644
--- a/plugins/discourse-presence/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-presence/config/locales/client.fa_IR.yml
@@ -7,6 +7,12 @@
 fa_IR:
   js:
     presence:
+      replying:
+        one: "در حال نوشتن پاسخ"
+        other: "در حال نوشتن پاسخ"
+      editing:
+        one: "در حال ویرایش"
+        other: "در حال ویرایش"
       replying_to_topic:
-        one: "پاسخ دادن"
+        one: "در حال نوشتن پاسخ"
         other: "پاسخ دادن"
diff --git a/plugins/discourse-presence/config/locales/client.fi.yml b/plugins/discourse-presence/config/locales/client.fi.yml
index 423ca283cf..ae641fa2f9 100644
--- a/plugins/discourse-presence/config/locales/client.fi.yml
+++ b/plugins/discourse-presence/config/locales/client.fi.yml
@@ -7,6 +7,12 @@
 fi:
   js:
     presence:
+      replying:
+        one: "kirjoittaa vastausta"
+        other: "kirjoittavat vastausta"
+      editing:
+        one: "muokkaa vastausta"
+        other: "muokkaavat vastausta"
       replying_to_topic:
         one: "kirjoittaa vastausta"
         other: "kirjoittavat vastausta"
diff --git a/plugins/discourse-presence/config/locales/client.fr.yml b/plugins/discourse-presence/config/locales/client.fr.yml
index 3e4b43fa1d..f26216cfd1 100644
--- a/plugins/discourse-presence/config/locales/client.fr.yml
+++ b/plugins/discourse-presence/config/locales/client.fr.yml
@@ -7,6 +7,12 @@
 fr:
   js:
     presence:
+      replying:
+        one: "en train de répondre"
+        other: "en train de répondre"
+      editing:
+        one: "en train de modifier"
+        other: "en train de modifier le message"
       replying_to_topic:
         one: "en train de répondre"
         other: "en train de répondre"
diff --git a/plugins/discourse-presence/config/locales/client.he.yml b/plugins/discourse-presence/config/locales/client.he.yml
index 4cb45f8c2a..12e89ebdfe 100644
--- a/plugins/discourse-presence/config/locales/client.he.yml
+++ b/plugins/discourse-presence/config/locales/client.he.yml
@@ -18,7 +18,7 @@ he:
         many: "מתבצעות עריכות"
         other: "מתבצעות עריכות"
       replying_to_topic:
-        one: "תגובה"
-        two: "תגובה"
-        many: "תגובה"
-        other: "תגובה"
+        one: "תגובה מוקלדת"
+        two: "תגובות מוקלדות"
+        many: "תגובה מוקלדת"
+        other: "תגובות מוקלדות"
diff --git a/plugins/discourse-presence/config/locales/client.hu.yml b/plugins/discourse-presence/config/locales/client.hu.yml
index d57a4b99da..676d10b79a 100644
--- a/plugins/discourse-presence/config/locales/client.hu.yml
+++ b/plugins/discourse-presence/config/locales/client.hu.yml
@@ -7,6 +7,12 @@
 hu:
   js:
     presence:
+      replying:
+        one: "válaszol"
+        other: "válaszol"
+      editing:
+        one: "szerkeszt"
+        other: "szerkeszt"
       replying_to_topic:
         one: "válaszol"
         other: "válaszol"
diff --git a/plugins/discourse-presence/config/locales/client.hy.yml b/plugins/discourse-presence/config/locales/client.hy.yml
index 39e699f060..a36ce7ed63 100644
--- a/plugins/discourse-presence/config/locales/client.hy.yml
+++ b/plugins/discourse-presence/config/locales/client.hy.yml
@@ -7,6 +7,12 @@
 hy:
   js:
     presence:
+      replying:
+        one: "պատասխանում է"
+        other: "պատասխանում է"
+      editing:
+        one: "խմբագրում է"
+        other: "խմբագրում է"
       replying_to_topic:
         one: "պատասխանում է"
         other: "պատասխանում են"
diff --git a/plugins/discourse-presence/config/locales/client.id.yml b/plugins/discourse-presence/config/locales/client.id.yml
index ba7cd22569..a53afddae5 100644
--- a/plugins/discourse-presence/config/locales/client.id.yml
+++ b/plugins/discourse-presence/config/locales/client.id.yml
@@ -7,5 +7,9 @@
 id:
   js:
     presence:
+      replying:
+        other: "membalas"
+      editing:
+        other: "menyunting"
       replying_to_topic:
         other: "membalas"
diff --git a/plugins/discourse-presence/config/locales/client.ja.yml b/plugins/discourse-presence/config/locales/client.ja.yml
index e6b3d39738..c929e1acfe 100644
--- a/plugins/discourse-presence/config/locales/client.ja.yml
+++ b/plugins/discourse-presence/config/locales/client.ja.yml
@@ -7,5 +7,9 @@
 ja:
   js:
     presence:
+      replying:
+        other: "返信中"
+      editing:
+        other: "編集中"
       replying_to_topic:
         other: "返信中"
diff --git a/plugins/discourse-presence/config/locales/client.lt.yml b/plugins/discourse-presence/config/locales/client.lt.yml
index 1a57c12695..4fbe07e934 100644
--- a/plugins/discourse-presence/config/locales/client.lt.yml
+++ b/plugins/discourse-presence/config/locales/client.lt.yml
@@ -4,4 +4,21 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-lt: 
+lt:
+  js:
+    presence:
+      replying:
+        one: "atsakoma"
+        few: "atsakoma"
+        many: "atsakoma"
+        other: "atsakoma"
+      editing:
+        one: "redaguojama"
+        few: "redaguojama"
+        many: "redaguojama"
+        other: "redaguojama"
+      replying_to_topic:
+        one: "atsakoma"
+        few: "atsakoma"
+        many: "atsakoma"
+        other: "atsakoma"
diff --git a/plugins/discourse-presence/config/locales/client.lv.yml b/plugins/discourse-presence/config/locales/client.lv.yml
index 5b0066d4cb..59e0ef6f4e 100644
--- a/plugins/discourse-presence/config/locales/client.lv.yml
+++ b/plugins/discourse-presence/config/locales/client.lv.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-lv: 
+lv:
diff --git a/plugins/discourse-presence/config/locales/client.nb_NO.yml b/plugins/discourse-presence/config/locales/client.nb_NO.yml
index 10f0fa26a6..11440eed7e 100644
--- a/plugins/discourse-presence/config/locales/client.nb_NO.yml
+++ b/plugins/discourse-presence/config/locales/client.nb_NO.yml
@@ -7,6 +7,12 @@
 nb_NO:
   js:
     presence:
+      replying:
+        one: "svarer"
+        other: "svarer"
+      editing:
+        one: "redigerer"
+        other: "redigerer"
       replying_to_topic:
         one: "svarer"
         other: "svarer"
diff --git a/plugins/discourse-presence/config/locales/client.pl_PL.yml b/plugins/discourse-presence/config/locales/client.pl_PL.yml
index b1a19577ec..a329d001fa 100644
--- a/plugins/discourse-presence/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-presence/config/locales/client.pl_PL.yml
@@ -9,14 +9,14 @@ pl_PL:
     presence:
       replying:
         one: "odpowiada"
-        few: "odpowiadają"
-        many: "odpowiadają"
-        other: "odpowiadają"
+        few: "odpowiada"
+        many: "odpowiada"
+        other: "odpowiada"
       editing:
         one: "edytuje"
-        few: "edytują"
-        many: "edytują"
-        other: "edytują"
+        few: "edytuje"
+        many: "edytuje"
+        other: "edytuje"
       replying_to_topic:
         one: "odpowiada"
         few: "odpowiada"
diff --git a/plugins/discourse-presence/config/locales/client.pt.yml b/plugins/discourse-presence/config/locales/client.pt.yml
index 2c175a812d..9218d2f8ef 100644
--- a/plugins/discourse-presence/config/locales/client.pt.yml
+++ b/plugins/discourse-presence/config/locales/client.pt.yml
@@ -7,6 +7,12 @@
 pt:
   js:
     presence:
+      replying:
+        one: "a responder"
+        other: "a responder"
+      editing:
+        one: "a editar"
+        other: "a editar"
       replying_to_topic:
         one: "a responder"
         other: "a responder"
diff --git a/plugins/discourse-presence/config/locales/client.pt_BR.yml b/plugins/discourse-presence/config/locales/client.pt_BR.yml
index e43625ed9b..186170cd09 100644
--- a/plugins/discourse-presence/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-presence/config/locales/client.pt_BR.yml
@@ -7,6 +7,12 @@
 pt_BR:
   js:
     presence:
+      replying:
+        one: "respondendo"
+        other: "respondendo"
+      editing:
+        one: "editando"
+        other: "editando"
       replying_to_topic:
         one: "respondendo"
         other: "respondendo"
diff --git a/plugins/discourse-presence/config/locales/client.ro.yml b/plugins/discourse-presence/config/locales/client.ro.yml
index b138344bd4..81a2900930 100644
--- a/plugins/discourse-presence/config/locales/client.ro.yml
+++ b/plugins/discourse-presence/config/locales/client.ro.yml
@@ -7,6 +7,14 @@
 ro:
   js:
     presence:
+      replying:
+        one: "răspunde"
+        few: "răspunde"
+        other: "răspunde"
+      editing:
+        one: "editează"
+        few: "editează"
+        other: "editează"
       replying_to_topic:
         one: "răspunde"
         few: "răspund"
diff --git a/plugins/discourse-presence/config/locales/client.sk.yml b/plugins/discourse-presence/config/locales/client.sk.yml
index dfe627bc8d..e543f3a4fb 100644
--- a/plugins/discourse-presence/config/locales/client.sk.yml
+++ b/plugins/discourse-presence/config/locales/client.sk.yml
@@ -7,6 +7,16 @@
 sk:
   js:
     presence:
+      replying:
+        one: "odpovedanie"
+        few: "odpovedanie"
+        many: "odpovedanie"
+        other: "odpovedanie"
+      editing:
+        one: "upravovanie"
+        few: "upravovanie"
+        many: "upravovanie"
+        other: "upravovanie"
       replying_to_topic:
         one: "odpovedanie"
         few: "odpovedanie"
diff --git a/plugins/discourse-presence/config/locales/client.sl.yml b/plugins/discourse-presence/config/locales/client.sl.yml
index c4327e8743..d61a8495b0 100644
--- a/plugins/discourse-presence/config/locales/client.sl.yml
+++ b/plugins/discourse-presence/config/locales/client.sl.yml
@@ -7,6 +7,16 @@
 sl:
   js:
     presence:
+      replying:
+        one: "odgovarja"
+        two: "odgovarja"
+        few: "odgovarja"
+        other: "odgovarja"
+      editing:
+        one: "ureja"
+        two: "ureja"
+        few: "ureja"
+        other: "ureja"
       replying_to_topic:
         one: "odgovarja"
         two: "odgovarja"
diff --git a/plugins/discourse-presence/config/locales/client.sq.yml b/plugins/discourse-presence/config/locales/client.sq.yml
index 1413494f57..7f051b7a7c 100644
--- a/plugins/discourse-presence/config/locales/client.sq.yml
+++ b/plugins/discourse-presence/config/locales/client.sq.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sq: 
+sq:
diff --git a/plugins/discourse-presence/config/locales/client.sr.yml b/plugins/discourse-presence/config/locales/client.sr.yml
index adfafeee68..df4e1c05f1 100644
--- a/plugins/discourse-presence/config/locales/client.sr.yml
+++ b/plugins/discourse-presence/config/locales/client.sr.yml
@@ -4,4 +4,18 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sr: 
+sr:
+  js:
+    presence:
+      replying:
+        one: "odgovara"
+        few: "odgovara"
+        other: "odgovara"
+      editing:
+        one: "menja"
+        few: "menja"
+        other: "menja"
+      replying_to_topic:
+        one: "odgovara"
+        few: "odgovara"
+        other: "odgovara"
diff --git a/plugins/discourse-presence/config/locales/client.sw.yml b/plugins/discourse-presence/config/locales/client.sw.yml
index 7e07c4560a..2e686fad15 100644
--- a/plugins/discourse-presence/config/locales/client.sw.yml
+++ b/plugins/discourse-presence/config/locales/client.sw.yml
@@ -4,4 +4,15 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sw: 
+sw:
+  js:
+    presence:
+      replying:
+        one: "anajibu"
+        other: "anajibu"
+      editing:
+        one: "inarekebishwa/hariri"
+        other: "inarekebishwa/hariri"
+      replying_to_topic:
+        one: "anajibu"
+        other: "anajibu"
diff --git a/plugins/discourse-presence/config/locales/client.te.yml b/plugins/discourse-presence/config/locales/client.te.yml
index ac5d945ae8..03967bdbb0 100644
--- a/plugins/discourse-presence/config/locales/client.te.yml
+++ b/plugins/discourse-presence/config/locales/client.te.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-te: 
+te:
diff --git a/plugins/discourse-presence/config/locales/client.th.yml b/plugins/discourse-presence/config/locales/client.th.yml
index 9b38ad300e..7de85ff91c 100644
--- a/plugins/discourse-presence/config/locales/client.th.yml
+++ b/plugins/discourse-presence/config/locales/client.th.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-th: 
+th:
diff --git a/plugins/discourse-presence/config/locales/client.tr_TR.yml b/plugins/discourse-presence/config/locales/client.tr_TR.yml
index 375b3f1925..85bd3d88c2 100644
--- a/plugins/discourse-presence/config/locales/client.tr_TR.yml
+++ b/plugins/discourse-presence/config/locales/client.tr_TR.yml
@@ -7,6 +7,12 @@
 tr_TR:
   js:
     presence:
+      replying:
+        one: "yanıtlıyor"
+        other: "yanıtlıyor"
+      editing:
+        one: "düzenliyor"
+        other: "düzenliyor"
       replying_to_topic:
-        one: "yanıtlama"
-        other: "yanıtlama"
+        one: "yanıtlıyor"
+        other: "yanıtlıyor"
diff --git a/plugins/discourse-presence/config/locales/client.uk.yml b/plugins/discourse-presence/config/locales/client.uk.yml
index 31e7b879f9..194c0f9587 100644
--- a/plugins/discourse-presence/config/locales/client.uk.yml
+++ b/plugins/discourse-presence/config/locales/client.uk.yml
@@ -7,6 +7,16 @@
 uk:
   js:
     presence:
+      replying:
+        one: "відповідає"
+        few: "відповідають"
+        many: "відповідають"
+        other: "відповідають"
+      editing:
+        one: "редагує"
+        few: "редагують"
+        many: "редагують"
+        other: "редагують"
       replying_to_topic:
         one: "відповідаючи"
         few: "відповідаючи"
diff --git a/plugins/discourse-presence/config/locales/client.ur.yml b/plugins/discourse-presence/config/locales/client.ur.yml
index 7a261097cc..f6232b098c 100644
--- a/plugins/discourse-presence/config/locales/client.ur.yml
+++ b/plugins/discourse-presence/config/locales/client.ur.yml
@@ -7,6 +7,12 @@
 ur:
   js:
     presence:
+      replying:
+        one: "جواب دے رہے ہیں"
+        other: "جواب دے رہے ہیں"
+      editing:
+        one: "ترمیم کر رہے ہیں"
+        other: "ترمیم کر رہے ہیں"
       replying_to_topic:
         one: "جواب دیا جا رہا ہے"
         other: "جواب دیا جا رہا ہے"
diff --git a/plugins/discourse-presence/config/locales/client.vi.yml b/plugins/discourse-presence/config/locales/client.vi.yml
index f0bfae0243..b207b4508b 100644
--- a/plugins/discourse-presence/config/locales/client.vi.yml
+++ b/plugins/discourse-presence/config/locales/client.vi.yml
@@ -8,6 +8,8 @@ vi:
   js:
     presence:
       replying:
-        other: "đang trả lời"
+        other: "Đang trả lời"
+      editing:
+        other: "Đang chỉnh sửa"
       replying_to_topic:
         other: "đang trả lời"
diff --git a/plugins/discourse-presence/config/locales/server.be.yml b/plugins/discourse-presence/config/locales/server.be.yml
index 2e3980a624..2ea77a0d35 100644
--- a/plugins/discourse-presence/config/locales/server.be.yml
+++ b/plugins/discourse-presence/config/locales/server.be.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-be: 
+be:
diff --git a/plugins/discourse-presence/config/locales/server.bg.yml b/plugins/discourse-presence/config/locales/server.bg.yml
index 6c61d82645..52333529d3 100644
--- a/plugins/discourse-presence/config/locales/server.bg.yml
+++ b/plugins/discourse-presence/config/locales/server.bg.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-bg: 
+bg:
diff --git a/plugins/discourse-presence/config/locales/server.en_GB.yml b/plugins/discourse-presence/config/locales/server.en_GB.yml
new file mode 100644
index 0000000000..2d4fa180ec
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.en_GB.yml
@@ -0,0 +1,7 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
diff --git a/plugins/discourse-presence/config/locales/server.es.yml b/plugins/discourse-presence/config/locales/server.es.yml
index cc15d2c8c2..d3134c6280 100644
--- a/plugins/discourse-presence/config/locales/server.es.yml
+++ b/plugins/discourse-presence/config/locales/server.es.yml
@@ -6,5 +6,5 @@
 
 es:
   site_settings:
-    presence_enabled: "¿Mostrar los usuarios que están respondiendo al tema actual o editando la publicación actual?"
+    presence_enabled: "¿Mostrar los usuarios que estén respondiendo o editando la publicación actual?"
     presence_max_users_shown: "Número máximo de usuarios mostrados."
diff --git a/plugins/discourse-presence/config/locales/server.et.yml b/plugins/discourse-presence/config/locales/server.et.yml
index 5702d705bb..0ea0b6d554 100644
--- a/plugins/discourse-presence/config/locales/server.et.yml
+++ b/plugins/discourse-presence/config/locales/server.et.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-et: 
+et:
diff --git a/plugins/discourse-presence/config/locales/server.fa_IR.yml b/plugins/discourse-presence/config/locales/server.fa_IR.yml
index 6d9b7dae72..48808ad030 100644
--- a/plugins/discourse-presence/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-presence/config/locales/server.fa_IR.yml
@@ -7,4 +7,4 @@
 fa_IR:
   site_settings:
     presence_enabled: "کاربرانی که در حال حاضر به موضوع فعلی پاسخ می‌دهند و یا در حال ویرایش پست فعلی هستند، نمایش داده شوند؟"
-    presence_max_users_shown: "حداکثر تعداد کاربران نشان داده شده است."
+    presence_max_users_shown: "حداکثر تعداد کاربران نمایش داده شده."
diff --git a/plugins/discourse-presence/config/locales/server.id.yml b/plugins/discourse-presence/config/locales/server.id.yml
index a4d1527157..596e36b2e1 100644
--- a/plugins/discourse-presence/config/locales/server.id.yml
+++ b/plugins/discourse-presence/config/locales/server.id.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-id: 
+id:
diff --git a/plugins/discourse-presence/config/locales/server.ja.yml b/plugins/discourse-presence/config/locales/server.ja.yml
index 1d8afc616b..f3c1212809 100644
--- a/plugins/discourse-presence/config/locales/server.ja.yml
+++ b/plugins/discourse-presence/config/locales/server.ja.yml
@@ -4,4 +4,7 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-ja: 
+ja:
+  site_settings:
+    presence_enabled: "現在のトピックに現在返信している、または現在編集しているユーザーを表示しますか？"
+    presence_max_users_shown: "表示されるユーザーの最大数。"
diff --git a/plugins/discourse-presence/config/locales/server.lt.yml b/plugins/discourse-presence/config/locales/server.lt.yml
index 1a57c12695..16bb19758d 100644
--- a/plugins/discourse-presence/config/locales/server.lt.yml
+++ b/plugins/discourse-presence/config/locales/server.lt.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-lt: 
+lt:
diff --git a/plugins/discourse-presence/config/locales/server.lv.yml b/plugins/discourse-presence/config/locales/server.lv.yml
index 5b0066d4cb..59e0ef6f4e 100644
--- a/plugins/discourse-presence/config/locales/server.lv.yml
+++ b/plugins/discourse-presence/config/locales/server.lv.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-lv: 
+lv:
diff --git a/plugins/discourse-presence/config/locales/server.sq.yml b/plugins/discourse-presence/config/locales/server.sq.yml
index 1413494f57..7f051b7a7c 100644
--- a/plugins/discourse-presence/config/locales/server.sq.yml
+++ b/plugins/discourse-presence/config/locales/server.sq.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sq: 
+sq:
diff --git a/plugins/discourse-presence/config/locales/server.te.yml b/plugins/discourse-presence/config/locales/server.te.yml
index ac5d945ae8..03967bdbb0 100644
--- a/plugins/discourse-presence/config/locales/server.te.yml
+++ b/plugins/discourse-presence/config/locales/server.te.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-te: 
+te:
diff --git a/plugins/discourse-presence/config/locales/server.th.yml b/plugins/discourse-presence/config/locales/server.th.yml
index 9b38ad300e..7de85ff91c 100644
--- a/plugins/discourse-presence/config/locales/server.th.yml
+++ b/plugins/discourse-presence/config/locales/server.th.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-th: 
+th:
diff --git a/plugins/discourse-presence/config/locales/server.zh_CN.yml b/plugins/discourse-presence/config/locales/server.zh_CN.yml
index 7c18870b5a..287524bd1a 100644
--- a/plugins/discourse-presence/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-presence/config/locales/server.zh_CN.yml
@@ -6,5 +6,5 @@
 
 zh_CN:
   site_settings:
-    presence_enabled: "展示当前正在回复当前主题或编辑当前帖子的用户？"
+    presence_enabled: "展示当前正在回复当前话题或编辑当前帖子的用户？"
     presence_max_users_shown: "展示用户的最大数量。"
diff --git a/plugins/discourse-presence/config/locales/server.zh_TW.yml b/plugins/discourse-presence/config/locales/server.zh_TW.yml
index 831b6f16fb..7e15fab001 100644
--- a/plugins/discourse-presence/config/locales/server.zh_TW.yml
+++ b/plugins/discourse-presence/config/locales/server.zh_TW.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-zh_TW: 
+zh_TW:
diff --git a/plugins/lazy-yt/assets/javascripts/lazyYT.js b/plugins/lazy-yt/assets/javascripts/lazyYT.js
index d131a7924a..8078671868 100644
--- a/plugins/lazy-yt/assets/javascripts/lazyYT.js
+++ b/plugins/lazy-yt/assets/javascripts/lazyYT.js
@@ -15,7 +15,7 @@
   "use strict";
 
   function setUp($el, settings) {
-    var width = $el.data("width"),
+    let width = $el.data("width"),
       height = $el.data("height"),
       ratio = $el.data("ratio") ? $el.data("ratio") : settings.default_ratio,
       id = $el.data("youtube-id"),
@@ -88,7 +88,7 @@
     innerHtml.push("</div>"); // .html5-title-text-wrapper
     innerHtml.push("</div>"); // end of Video title .html5-info-bar
 
-    var prefetchedThumbnail = $el[0].querySelector(".ytp-thumbnail-image");
+    let prefetchedThumbnail = $el[0].querySelector(".ytp-thumbnail-image");
 
     $el
       .css({
@@ -158,15 +158,15 @@
   }
 
   $.fn.lazyYT = function (newSettings) {
-    var defaultSettings = {
+    let defaultSettings = {
       default_ratio: "16:9",
       callback: null, // ToDO execute callback if given
       container_class: "lazyYT-container",
     };
-    var settings = $.extend(defaultSettings, newSettings);
+    let settings = $.extend(defaultSettings, newSettings);
 
     return this.each(function () {
-      var $el = $(this).addClass(settings.container_class);
+      let $el = $(this).addClass(settings.container_class);
       setUp($el, settings);
     });
   };
diff --git a/plugins/lazy-yt/assets/stylesheets/lazyYT.css b/plugins/lazy-yt/assets/stylesheets/lazyYT.css
index 233c342c74..9a8e14e029 100644
--- a/plugins/lazy-yt/assets/stylesheets/lazyYT.css
+++ b/plugins/lazy-yt/assets/stylesheets/lazyYT.css
@@ -38,7 +38,7 @@
   width: 100%;
   height: 30px;
   overflow: hidden;
-  font-family: Arial, Helvetica, sans-serif;
+  font-family: Arial, sans-serif;
   font-size: 12px;
   color: #fff;
   background-color: rgba(0, 0, 0, 0.8);
diff --git a/plugins/lazy-yt/plugin.rb b/plugins/lazy-yt/plugin.rb
index b0ed271e36..c2756080b2 100644
--- a/plugins/lazy-yt/plugin.rb
+++ b/plugins/lazy-yt/plugin.rb
@@ -28,8 +28,10 @@ class Onebox::Engine::YoutubeOnebox
       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"
+      result = parse_embed_response
+      result ||= get_opengraph.data
+
+      thumbnail_url = result[: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)
diff --git a/plugins/poll/app/models/poll.rb b/plugins/poll/app/models/poll.rb
index cbb3016f46..b923caff99 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, -> { unscope(:where) }
+  belongs_to :post, -> { with_deleted }
 
   has_many :poll_options, -> { order(:id) }, dependent: :destroy
   has_many :poll_votes
diff --git a/plugins/poll/assets/javascripts/components/poll-breakdown-chart.js.es6 b/plugins/poll/assets/javascripts/components/poll-breakdown-chart.js.es6
index 96e93c3a87..be7826602d 100644
--- a/plugins/poll/assets/javascripts/components/poll-breakdown-chart.js.es6
+++ b/plugins/poll/assets/javascripts/components/poll-breakdown-chart.js.es6
@@ -1,10 +1,10 @@
-import I18n from "I18n";
 import Component from "@ember/component";
-import { mapBy } from "@ember/object/computed";
-import { htmlSafe } from "@ember/template";
+import I18n from "I18n";
 import { PIE_CHART_TYPE } from "discourse/plugins/poll/controllers/poll-ui-builder";
-import { getColors } from "discourse/plugins/poll/lib/chart-colors";
 import discourseComputed from "discourse-common/utils/decorators";
+import { getColors } from "discourse/plugins/poll/lib/chart-colors";
+import { htmlSafe } from "@ember/template";
+import { mapBy } from "@ember/object/computed";
 
 export default Component.extend({
   // Arguments:
diff --git a/plugins/poll/assets/javascripts/components/poll-breakdown-option.js.es6 b/plugins/poll/assets/javascripts/components/poll-breakdown-option.js.es6
index 0a02c79c6e..c63d9f45c1 100644
--- a/plugins/poll/assets/javascripts/components/poll-breakdown-option.js.es6
+++ b/plugins/poll/assets/javascripts/components/poll-breakdown-option.js.es6
@@ -1,11 +1,11 @@
-import I18n from "I18n";
 import Component from "@ember/component";
+import I18n from "I18n";
 import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
+import { getColors } from "discourse/plugins/poll/lib/chart-colors";
 import { htmlSafe } from "@ember/template";
 import { propertyEqual } from "discourse/lib/computed";
-import discourseComputed from "discourse-common/utils/decorators";
-import { getColors } from "discourse/plugins/poll/lib/chart-colors";
 
 export default Component.extend({
   // Arguments:
diff --git a/plugins/poll/assets/javascripts/controllers/poll-breakdown.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-breakdown.js.es6
index 89effd9272..66c160f2f2 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-breakdown.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-breakdown.js.es6
@@ -1,13 +1,13 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
-import { action } from "@ember/object";
-import { classify } from "@ember/string";
-import { htmlSafe } from "@ember/template";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import loadScript from "discourse/lib/load-script";
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { action } from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
+import { classify } from "@ember/string";
 import discourseComputed from "discourse-common/utils/decorators";
+import { htmlSafe } from "@ember/template";
+import loadScript from "discourse/lib/load-script";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(ModalFunctionality, {
   model: null,
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 9090e92f65..a067838bb3 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -1,234 +1,156 @@
-import I18n from "I18n";
 import Controller from "@ember/controller";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
+import { gt, or } from "@ember/object/computed";
+import { next } from "@ember/runloop";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import I18n from "I18n";
 
 export const BAR_CHART_TYPE = "bar";
 export const PIE_CHART_TYPE = "pie";
 
-export default Controller.extend({
-  regularPollType: "regular",
-  numberPollType: "number",
-  multiplePollType: "multiple",
+export const REGULAR_POLL_TYPE = "regular";
+export const NUMBER_POLL_TYPE = "number";
+export const MULTIPLE_POLL_TYPE = "multiple";
 
-  alwaysPollResult: "always",
-  votePollResult: "on_vote",
-  closedPollResult: "on_close",
-  staffPollResult: "staff_only",
-  pollChartTypes: [
-    {
-      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,
-    },
-  ],
+const ALWAYS_POLL_RESULT = "always";
+const VOTE_POLL_RESULT = "on_vote";
+const CLOSED_POLL_RESULT = "on_close";
+const STAFF_POLL_RESULT = "staff_only";
 
-  pollType: null,
-  pollResult: null,
-  pollTitle: null,
+export default Controller.extend(ModalFunctionality, {
+  showAdvanced: false,
 
-  init() {
-    this._super(...arguments);
-    this._setupPoll();
+  pollType: REGULAR_POLL_TYPE,
+  pollTitle: "",
+  pollOptions: null,
+  pollOptionsText: null,
+  pollMin: 1,
+  pollMax: 2,
+  pollStep: 1,
+  pollGroups: null,
+  pollAutoClose: null,
+  pollResult: ALWAYS_POLL_RESULT,
+  chartType: BAR_CHART_TYPE,
+  publicPoll: null,
+
+  onShow() {
+    this.setProperties({
+      showAdvanced: false,
+      pollType: REGULAR_POLL_TYPE,
+      pollTitle: null,
+      pollOptions: [EmberObject.create({ value: "" })],
+      pollOptionsText: "",
+      pollMin: 1,
+      pollMax: 2,
+      pollStep: 1,
+      pollGroups: null,
+      pollAutoClose: null,
+      pollResult: ALWAYS_POLL_RESULT,
+      chartType: BAR_CHART_TYPE,
+      publicPoll: false,
+    });
   },
 
-  @discourseComputed("regularPollType", "numberPollType", "multiplePollType")
-  pollTypes(regularPollType, numberPollType, multiplePollType) {
-    return [
-      {
-        name: I18n.t("poll.ui_builder.poll_type.regular"),
-        value: regularPollType,
-      },
-      {
-        name: I18n.t("poll.ui_builder.poll_type.number"),
-        value: numberPollType,
-      },
-      {
-        name: I18n.t("poll.ui_builder.poll_type.multiple"),
-        value: multiplePollType,
-      },
-    ];
-  },
-
-  @discourseComputed("chartType", "pollType", "numberPollType")
-  isPie(chartType, pollType, numberPollType) {
-    return pollType !== numberPollType && chartType === PIE_CHART_TYPE;
-  },
-
-  @discourseComputed(
-    "alwaysPollResult",
-    "votePollResult",
-    "closedPollResult",
-    "staffPollResult"
-  )
-  pollResults(
-    alwaysPollResult,
-    votePollResult,
-    closedPollResult,
-    staffPollResult
-  ) {
-    let options = [
+  @discourseComputed
+  pollResults() {
+    const options = [
       {
         name: I18n.t("poll.ui_builder.poll_result.always"),
-        value: alwaysPollResult,
+        value: ALWAYS_POLL_RESULT,
       },
       {
         name: I18n.t("poll.ui_builder.poll_result.vote"),
-        value: votePollResult,
+        value: VOTE_POLL_RESULT,
       },
       {
         name: I18n.t("poll.ui_builder.poll_result.closed"),
-        value: closedPollResult,
+        value: CLOSED_POLL_RESULT,
       },
     ];
+
     if (this.get("currentUser.staff")) {
       options.push({
         name: I18n.t("poll.ui_builder.poll_result.staff"),
-        value: staffPollResult,
+        value: STAFF_POLL_RESULT,
       });
     }
+
     return options;
   },
 
+  @discourseComputed("pollType")
+  isRegular(pollType) {
+    return pollType === REGULAR_POLL_TYPE;
+  },
+
+  @discourseComputed("pollType")
+  isNumber(pollType) {
+    return pollType === NUMBER_POLL_TYPE;
+  },
+
+  @discourseComputed("pollType")
+  isMultiple(pollType) {
+    return pollType === MULTIPLE_POLL_TYPE;
+  },
+
+  showNumber: or("showAdvanced", "isNumber"),
+
+  @discourseComputed("pollOptions.@each.value")
+  pollOptionsCount(pollOptions) {
+    return pollOptions.filter((option) => option.value.length > 0).length;
+  },
+
   @discourseComputed("site.groups")
   siteGroups(groups) {
-    return groups
-      .map((g) => {
-        // prevents group "everyone" to be listed
-        if (g.id !== 0) {
-          return { name: g.name };
-        }
-      })
-      .filter(Boolean);
+    // prevents group "everyone" to be listed
+    return groups.filter((g) => g.id !== 0);
   },
 
-  @discourseComputed("pollType", "regularPollType")
-  isRegular(pollType, regularPollType) {
-    return pollType === regularPollType;
+  @discourseComputed("chartType", "pollType")
+  isPie(chartType, pollType) {
+    return pollType !== NUMBER_POLL_TYPE && chartType === PIE_CHART_TYPE;
   },
 
-  @discourseComputed("pollType", "pollOptionsCount", "multiplePollType")
-  isMultiple(pollType, count, multiplePollType) {
-    return pollType === multiplePollType && count > 0;
-  },
-
-  @discourseComputed("pollType", "numberPollType")
-  isNumber(pollType, numberPollType) {
-    return pollType === numberPollType;
-  },
-
-  @discourseComputed("isRegular")
-  showMinMax(isRegular) {
-    return !isRegular;
-  },
-
-  @discourseComputed("pollOptions")
-  pollOptionsCount(pollOptions) {
-    if (pollOptions.length === 0) {
-      return 0;
-    }
-
-    let length = 0;
-
-    pollOptions.split("\n").forEach((option) => {
-      if (option.length !== 0) {
-        length += 1;
-      }
-    });
-
-    return length;
-  },
+  canRemoveOption: gt("pollOptions.length", 1),
 
   @observes("pollType", "pollOptionsCount")
-  _setPollMax() {
-    const isMultiple = this.isMultiple;
-    const isNumber = this.isNumber;
-    if (!isMultiple && !isNumber) {
-      return;
-    }
+  _setPollMinMax() {
+    if (this.isMultiple) {
+      if (
+        this.pollMin <= 0 ||
+        this.pollMin >= this.pollMax ||
+        this.pollMin >= this.pollOptionsCount
+      ) {
+        this.set("pollMin", this.pollOptionsCount > 0 ? 1 : 0);
+      }
 
-    if (isMultiple) {
-      this.set("pollMax", this.pollOptionsCount);
-    } else if (isNumber) {
+      if (
+        this.pollMax <= 0 ||
+        this.pollMin >= this.pollMax ||
+        this.pollMax > this.pollOptionsCount
+      ) {
+        this.set("pollMax", this.pollOptionsCount);
+      }
+    } else if (this.isNumber) {
       this.set("pollMax", this.siteSettings.poll_maximum_options);
     }
   },
 
-  @discourseComputed("isRegular", "isMultiple", "isNumber", "pollOptionsCount")
-  pollMinOptions(isRegular, isMultiple, isNumber, count) {
-    if (isRegular) {
-      return;
-    }
-
-    if (isMultiple) {
-      return this._comboboxOptions(1, count + 1);
-    } else if (isNumber) {
-      return this._comboboxOptions(
-        1,
-        this.siteSettings.poll_maximum_options + 1
-      );
-    }
-  },
-
   @discourseComputed(
-    "isRegular",
-    "isMultiple",
-    "isNumber",
-    "pollOptionsCount",
-    "pollMin",
-    "pollStep"
-  )
-  pollMaxOptions(isRegular, isMultiple, isNumber, count, pollMin, pollStep) {
-    if (isRegular) {
-      return;
-    }
-    const pollMinInt = parseInt(pollMin, 10) || 1;
-
-    if (isMultiple) {
-      return this._comboboxOptions(pollMinInt + 1, count + 1);
-    } else if (isNumber) {
-      let pollStepInt = parseInt(pollStep, 10);
-      if (pollStepInt < 1) {
-        pollStepInt = 1;
-      }
-      return this._comboboxOptions(
-        pollMinInt + 1,
-        pollMinInt + this.siteSettings.poll_maximum_options * pollStepInt
-      );
-    }
-  },
-
-  @discourseComputed("isNumber", "pollMax")
-  pollStepOptions(isNumber, pollMax) {
-    if (!isNumber) {
-      return;
-    }
-    return this._comboboxOptions(1, (parseInt(pollMax, 10) || 1) + 1);
-  },
-
-  @discourseComputed(
-    "isNumber",
-    "showMinMax",
     "pollType",
     "pollResult",
     "publicPoll",
     "pollTitle",
-    "pollOptions",
+    "pollOptions.@each.value",
     "pollMin",
     "pollMax",
     "pollStep",
     "pollGroups",
-    "autoClose",
-    "chartType",
-    "date",
-    "time"
+    "pollAutoClose",
+    "chartType"
   )
   pollOutput(
-    isNumber,
-    showMinMax,
     pollType,
     pollResult,
     publicPoll,
@@ -238,10 +160,8 @@ export default Controller.extend({
     pollMax,
     pollStep,
     pollGroups,
-    autoClose,
-    chartType,
-    date,
-    time
+    pollAutoClose,
+    chartType
   ) {
     let pollHeader = "[poll";
     let output = "";
@@ -265,32 +185,26 @@ export default Controller.extend({
     if (pollResult) {
       pollHeader += ` results=${pollResult}`;
     }
-    if (pollMin && showMinMax) {
+    if (pollMin && pollType !== REGULAR_POLL_TYPE) {
       pollHeader += ` min=${pollMin}`;
     }
-    if (pollMax) {
+    if (pollMax && pollType !== REGULAR_POLL_TYPE) {
       pollHeader += ` max=${pollMax}`;
     }
-    if (isNumber) {
+    if (pollType === NUMBER_POLL_TYPE) {
       pollHeader += ` step=${step}`;
     }
     if (publicPoll) {
       pollHeader += ` public=true`;
     }
-    if (chartType && pollType !== "number") {
+    if (chartType && pollType !== NUMBER_POLL_TYPE) {
       pollHeader += ` chartType=${chartType}`;
     }
     if (pollGroups && pollGroups.length > 0) {
       pollHeader += ` groups=${pollGroups}`;
     }
-    if (autoClose) {
-      let closeDate = moment(
-        date + " " + time,
-        "YYYY-MM-DD HH:mm"
-      ).toISOString();
-      if (closeDate) {
-        pollHeader += ` close=${closeDate}`;
-      }
+    if (pollAutoClose) {
+      pollHeader += ` close=${pollAutoClose.toISOString()}`;
     }
 
     pollHeader += "]";
@@ -300,10 +214,10 @@ export default Controller.extend({
       output += `# ${pollTitle.trim()}\n`;
     }
 
-    if (pollOptions.length > 0 && !isNumber) {
-      pollOptions.split("\n").forEach((option) => {
-        if (option.length !== 0) {
-          output += `* ${option}\n`;
+    if (pollOptions.length > 0 && pollType !== NUMBER_POLL_TYPE) {
+      pollOptions.forEach((option) => {
+        if (option.value.length > 0) {
+          output += `* ${option.value.trim()}\n`;
         }
       });
     }
@@ -312,62 +226,110 @@ export default Controller.extend({
     return output;
   },
 
+  @discourseComputed("isNumber", "pollOptionsCount")
+  minNumOfOptionsValidation(isNumber, pollOptionsCount) {
+    let options = { ok: true };
+
+    if (!isNumber) {
+      if (pollOptionsCount < 1) {
+        return EmberObject.create({
+          failed: true,
+          reason: I18n.t("poll.ui_builder.help.options_min_count"),
+        });
+      }
+
+      if (pollOptionsCount > this.siteSettings.poll_maximum_options) {
+        return EmberObject.create({
+          failed: true,
+          reason: I18n.t("poll.ui_builder.help.options_max_count", {
+            count: this.siteSettings.poll_maximum_options,
+          }),
+        });
+      }
+    }
+
+    return EmberObject.create(options);
+  },
+
+  @discourseComputed("pollOptions.@each.value")
+  showMinNumOfOptionsValidation(pollOptions) {
+    return pollOptions.length !== 1 || pollOptions[0].value !== "";
+  },
+
   @discourseComputed(
-    "pollOptionsCount",
-    "isRegular",
     "isMultiple",
+    "pollOptionsCount",
     "isNumber",
     "pollMin",
-    "pollMax"
+    "pollMax",
+    "pollStep"
   )
-  disableInsert(count, isRegular, isMultiple, isNumber, pollMin, pollMax) {
-    return (
-      (isRegular && count < 1) ||
-      (isMultiple && count < pollMin && pollMin >= pollMax) ||
-      (isNumber ? false : count < 1)
-    );
-  },
+  minMaxValueValidation(
+    isMultiple,
+    pollOptionsCount,
+    isNumber,
+    pollMin,
+    pollMax,
+    pollStep
+  ) {
+    pollMin = parseInt(pollMin, 10) || 0;
+    pollMax = parseInt(pollMax, 10) || 0;
+    pollStep = parseInt(pollStep, 10) || 0;
 
-  @discourseComputed("pollMin", "pollMax")
-  minMaxValueValidation(pollMin, pollMax) {
-    let options = { ok: true };
+    if (pollMin < 0) {
+      return EmberObject.create({
+        failed: true,
+        reason: I18n.t("poll.ui_builder.help.invalid_min_value"),
+      });
+    }
 
-    if (pollMin >= pollMax) {
-      options = {
+    if (pollMax < 0 || (isMultiple && pollMax > pollOptionsCount)) {
+      return EmberObject.create({
+        failed: true,
+        reason: I18n.t("poll.ui_builder.help.invalid_max_value"),
+      });
+    }
+
+    if (pollMin > pollMax) {
+      return EmberObject.create({
         failed: true,
         reason: I18n.t("poll.ui_builder.help.invalid_values"),
-      };
+      });
     }
 
-    return EmberObject.create(options);
+    if (isNumber) {
+      if (pollStep < 1) {
+        return EmberObject.create({
+          failed: true,
+          reason: I18n.t("poll.ui_builder.help.min_step_value"),
+        });
+      }
+
+      const optionsCount = (pollMax - pollMin + 1) / pollStep;
+
+      if (optionsCount < 1) {
+        return EmberObject.create({
+          failed: true,
+          reason: I18n.t("poll.ui_builder.help.options_min_count"),
+        });
+      }
+
+      if (optionsCount > this.siteSettings.poll_maximum_options) {
+        return EmberObject.create({
+          failed: true,
+          reason: I18n.t("poll.ui_builder.help.options_max_count", {
+            count: this.siteSettings.poll_maximum_options,
+          }),
+        });
+      }
+    }
+
+    return EmberObject.create({ ok: true });
   },
 
-  @discourseComputed("pollStep")
-  minStepValueValidation(pollStep) {
-    let options = { ok: true };
-
-    if (pollStep < 1) {
-      options = {
-        failed: true,
-        reason: I18n.t("poll.ui_builder.help.min_step_value"),
-      };
-    }
-
-    return EmberObject.create(options);
-  },
-
-  @discourseComputed("disableInsert")
-  minNumOfOptionsValidation(disableInsert) {
-    let options = { ok: true };
-
-    if (disableInsert) {
-      options = {
-        failed: true,
-        reason: I18n.t("poll.ui_builder.help.options_count"),
-      };
-    }
-
-    return EmberObject.create(options);
+  @discourseComputed("minMaxValueValidation", "minNumOfOptionsValidation")
+  disableInsert(minMaxValueValidation, minNumOfOptionsValidation) {
+    return !minMaxValueValidation.ok || !minNumOfOptionsValidation.ok;
   },
 
   _comboboxOptions(startIndex, endIndex) {
@@ -377,29 +339,62 @@ export default Controller.extend({
     }));
   },
 
-  _setupPoll() {
-    this.setProperties({
-      pollType: this.get("pollTypes.firstObject.value"),
-      publicPoll: false,
-      pollOptions: "",
-      pollMin: 1,
-      pollMax: null,
-      pollStep: 1,
-      autoClose: false,
-      chartType: BAR_CHART_TYPE,
-      pollResult: this.alwaysPollResult,
-      pollGroups: null,
-      pollTitle: null,
-      date: moment().add(1, "day").format("YYYY-MM-DD"),
-      time: moment().add(1, "hour").format("HH:mm"),
-    });
+  @action
+  onOptionsTextChange(e) {
+    let idx = 0;
+    this.set(
+      "pollOptions",
+      e.target.value
+        .split("\n")
+        .map((value) => EmberObject.create({ idx: idx++, value }))
+    );
   },
 
-  actions: {
-    insertPoll() {
-      this.toolbarEvent.addText(this.pollOutput);
-      this.send("closeModal");
-      this._setupPoll();
-    },
+  @action
+  insertPoll() {
+    this.toolbarEvent.addText(this.pollOutput);
+    this.send("closeModal");
+  },
+
+  @action
+  toggleAdvanced() {
+    this.toggleProperty("showAdvanced");
+    if (this.showAdvanced) {
+      this.set(
+        "pollOptionsText",
+        this.pollOptions.map((x) => x.value).join("\n")
+      );
+    }
+  },
+
+  @action
+  addOption(beforeOption, value, e) {
+    if (value !== "") {
+      const idx = this.pollOptions.indexOf(beforeOption) + 1;
+      const option = EmberObject.create({ value: "" });
+      this.pollOptions.insertAt(idx, option);
+
+      let lastOptionIdx = 0;
+      this.pollOptions.forEach((o) => o.set("idx", lastOptionIdx++));
+
+      next(() => {
+        const pollOptions = document.getElementsByClassName("poll-options");
+        if (pollOptions) {
+          const inputs = pollOptions[0].getElementsByTagName("input");
+          if (option.idx < inputs.length) {
+            inputs[option.idx].focus();
+          }
+        }
+      });
+    }
+
+    if (e) {
+      e.preventDefault();
+    }
+  },
+
+  @action
+  removeOption(option) {
+    this.pollOptions.removeObject(option);
   },
 });
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 3679c83037..45ac872401 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -1,129 +1,171 @@
 {{#d-modal-body title="poll.ui_builder.title" class="poll-ui-builder"}}
-  <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>
-        {{combo-box
-          content=pollTypes
-          value=pollType
-          valueProperty="value"
-          class="poll-type"
-          onChange=(action (mut pollType))
-        }}
-      </div>
+  <div class="input-group poll-type">
+    <a href {{action (mut pollType) "regular"}} class="poll-type-value {{if isRegular "active"}}">
+      {{i18n "poll.ui_builder.poll_type.regular"}}
+    </a>
 
-      <div class="input-group poll-select">
-        <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>
+    <a href {{action (mut pollType) "multiple"}} class="poll-type-value {{if isMultiple "active"}}">
+      {{i18n "poll.ui_builder.poll_type.multiple"}}
+    </a>
 
-      <div class="input-group poll-select">
-        <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>
+    {{#if showNumber}}
+      <a href {{action (mut pollType) "number"}} class="poll-type-value {{if isNumber "active"}}">
+        {{i18n "poll.ui_builder.poll_type.number"}}
+      </a>
+    {{/if}}
+  </div>
 
-      {{#unless isNumber}}
-        <div class="input-group poll-select">
-          <label class="input-group-label">{{i18n "poll.ui_builder.poll_chart_type.label"}}</label>
-          {{combo-box
-            class="poll-chart-type"
-            content=pollChartTypes
-            value=chartType
-            valueProperty="value"
-            onChange=(action (mut chartType))
-          }}
-        </div>
-      {{/unless}}
+  {{#if showAdvanced}}
+    <div class="input-group poll-title">
+      <label class="input-group-label">{{i18n "poll.ui_builder.poll_title.label"}}</label>
+      {{input value=pollTitle}}
+    </div>
+  {{/if}}
 
-      {{#if showMinMax}}
-        <div class="input-group poll-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"}}
-        </div>
-        {{input-tip validation=minMaxValueValidation}}
+  {{#unless isNumber}}
+    <div class="poll-options">
+      {{#if showAdvanced}}
+        <label class="input-group-label">{{i18n "poll.ui_builder.poll_options.label"}}</label>
+        {{textarea value=pollOptionsText input=(action "onOptionsTextChange")}}
 
-        <div class="input-group poll-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"}}
-        </div>
-
-        {{#if isNumber}}
-          <div class="input-group poll-number">
-            <label class="input-group-label">{{i18n "poll.ui_builder.poll_config.step"}}</label>
-            {{input type="number"
-                    value=pollStep
-                    valueProperty="value"
-                    min="1"
-                    class="poll-options-step"}}
-          </div>
-          {{input-tip validation=minStepValueValidation}}
+        {{#if showMinNumOfOptionsValidation}}
+          {{#unless minNumOfOptionsValidation.ok}}
+            {{input-tip validation=minNumOfOptionsValidation}}
+          {{/unless}}
         {{/if}}
-      {{/if}}
+      {{else}}
+        {{#each pollOptions as |option|}}
+          <div class="input-group poll-option-value">
+            {{input value=option.value enter=(action "addOption" option)}}
+            {{#if canRemoveOption}}
+              {{d-button icon="trash-alt" action=(action "removeOption" option)}}
+            {{/if}}
+          </div>
+        {{/each}}
 
-      <div class="input-group poll-title">
-        <label>{{i18n "poll.ui_builder.poll_title.label"}}</label>
-        {{input value=pollTitle}}
+        <div class="poll-option-controls">
+          {{d-button class="btn-default" icon="plus" label="poll.ui_builder.poll_options.add" action=(action "addOption" pollOptions.lastObject)}}
+          {{#if (and showMinNumOfOptionsValidation (not minNumOfOptionsValidation.ok))}}
+            {{input-tip validation=minNumOfOptionsValidation}}
+          {{/if}}
+        </div>
+      {{/if}}
+    </div>
+  {{/unless}}
+
+  {{#unless isRegular}}
+    <div class="options">
+      <div class="input-group poll-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"
+                min=1}}
       </div>
 
-      {{#unless isNumber}}
-        <div class="input-group poll-textarea">
-          <label>{{i18n "poll.ui_builder.poll_options.label"}}</label>
-          {{textarea value=pollOptions autocomplete="discourse"}}
-        </div>
-        {{input-tip validation=minNumOfOptionsValidation}}
-      {{/unless}}
+      <div class="input-group poll-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"
+                min=1}}
+      </div>
 
-      {{#unless isPie}}
-        <div class="input-group poll-checkbox">
-          <label>
-            {{input type="checkbox" checked=publicPoll}}
-            {{i18n "poll.ui_builder.poll_public.label"}}
-          </label>
+      {{#if isNumber}}
+        <div class="input-group poll-number">
+          <label class="input-group-label">{{i18n "poll.ui_builder.poll_config.step"}}</label>
+          {{input type="number"
+                  value=pollStep
+                  valueProperty="value"
+                  min="1"
+                  class="poll-options-step"}}
         </div>
-      {{/unless}}
+      {{/if}}
+    </div>
 
-      <div class="input-group poll-checkbox">
+    {{#unless minMaxValueValidation.ok}}
+      {{input-tip validation=minMaxValueValidation}}
+    {{/unless}}
+  {{/unless}}
+
+  {{#if showAdvanced}}
+    <div class="input-group poll-allowed-groups">
+      <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>
+
+    <div class="input-group poll-date">
+      <label class="input-group-label">{{i18n "poll.ui_builder.automatic_close.label"}}</label>
+      {{date-time-input
+        date=pollAutoClose
+        onChange=(action (mut pollAutoClose))
+        clearable=true
+        useGlobalPickerContainer=true
+      }}
+    </div>
+
+    <div class="input-group poll-select">
+      <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>
+
+    {{#unless isNumber}}
+      <div class="input-group poll-select column">
+        <label class="input-group-label">{{i18n "poll.ui_builder.poll_chart_type.label"}}</label>
+
+        <div class="radio-group">
+          {{radio-button id="poll-chart-type-bar" name="poll-chart-type" value="bar" selection=chartType}}
+          <label for="poll-chart-type-bar">{{d-icon "chart-bar"}} {{i18n "poll.ui_builder.poll_chart_type.bar"}}</label>
+        </div>
+
+        <div class="radio-group">
+          {{radio-button id="poll-chart-type-pie" name="poll-chart-type" value="pie" selection=chartType}}
+          <label for="poll-chart-type-pie">{{d-icon "chart-pie"}} {{i18n "poll.ui_builder.poll_chart_type.pie"}}</label>
+        </div>
+      </div>
+    {{/unless}}
+
+    {{#unless isPie}}
+      <div class="input-group poll-checkbox column">
         <label>
-          {{input type="checkbox" checked=autoClose}}
-          {{i18n "poll.ui_builder.automatic_close.label"}}
+          {{input type="checkbox" checked=publicPoll}}
+          {{i18n "poll.ui_builder.poll_public.label"}}
         </label>
       </div>
-
-      {{#if autoClose}}
-        <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}}
-    </div>
-
-    <div class="d-editor-preview">
-      {{cook-text this.pollOutput}}
-    </div>
-  </form>
+    {{/unless}}
+  {{/if}}
 {{/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}}
+
+  {{d-button
+    label="cancel"
+    class="btn-flat"
+    action=(route-action "closeModal")
+  }}
+
+  {{d-button
+    action=(action "toggleAdvanced")
+    class="btn-default show-advanced"
+    icon="cog"
+    title=(if showAdvanced "poll.ui_builder.hide_advanced" "poll.ui_builder.show_advanced")}}
 </div>
diff --git a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
index d920848db9..abeb3056c6 100644
--- a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
@@ -1,6 +1,6 @@
-import { withPluginApi } from "discourse/lib/plugin-api";
-import showModal from "discourse/lib/show-modal";
 import discourseComputed from "discourse-common/utils/decorators";
+import showModal from "discourse/lib/show-modal";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 function initializePollUIBuilder(api) {
   api.modifyClass("controller:composer", {
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 46ec6e86c4..6d9505704e 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
@@ -1,8 +1,8 @@
 import EmberObject from "@ember/object";
-import { withPluginApi } from "discourse/lib/plugin-api";
 import WidgetGlue from "discourse/widgets/glue";
 import { getRegister } from "discourse-common/lib/get-owner";
 import { observes } from "discourse-common/utils/decorators";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 function initializePolls(api) {
   const register = getRegister(api);
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 9f0d033b79..e004aefa75 100644
--- a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
+++ b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
@@ -302,7 +302,7 @@ export function setup(helper) {
  * http://www.opensource.org/licenses/bsd-license
  */
 function md5cycle(x, k) {
-  var a = x[0],
+  let a = x[0],
     b = x[1],
     c = x[2],
     d = x[3];
@@ -406,14 +406,14 @@ function md51(s) {
   // Converts the string to UTF-8 "bytes"
   s = unescape(encodeURI(s));
 
-  var n = s.length,
+  let n = s.length,
     state = [1732584193, -271733879, -1732584194, 271733878],
     i;
   for (i = 64; i <= s.length; i += 64) {
     md5cycle(state, md5blk(s.substring(i - 64, i)));
   }
   s = s.substring(i - 64);
-  var tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+  let tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
   for (i = 0; i < s.length; i++) {
     tail[i >> 2] |= s.charCodeAt(i) << (i % 4 << 3);
   }
@@ -431,7 +431,7 @@ function md51(s) {
 
 function md5blk(s) {
   /* I figured global was faster.   */
-  var md5blks = [],
+  let md5blks = [],
     i; /* Andy King said do it this way. */
   for (i = 0; i < 64; i += 4) {
     md5blks[i >> 2] =
@@ -443,10 +443,10 @@ function md5blk(s) {
   return md5blks;
 }
 
-var hex_chr = "0123456789abcdef".split("");
+let hex_chr = "0123456789abcdef".split("");
 
 function rhex(n) {
-  var s = "",
+  let s = "",
     j = 0;
   for (; j < 4; j++) {
     s += hex_chr[(n >> (j * 8 + 4)) & 0x0f] + hex_chr[(n >> (j * 8)) & 0x0f];
@@ -455,7 +455,7 @@ function rhex(n) {
 }
 
 function hex(x) {
-  for (var i = 0; i < x.length; i++) {
+  for (let i = 0; i < x.length; i++) {
     x[i] = rhex(x[i]);
   }
   return x.join("");
diff --git a/plugins/poll/assets/javascripts/lib/even-round.js.es6 b/plugins/poll/assets/javascripts/lib/even-round.js.es6
index 93c1226b7a..cd8bf34593 100644
--- a/plugins/poll/assets/javascripts/lib/even-round.js.es6
+++ b/plugins/poll/assets/javascripts/lib/even-round.js.es6
@@ -4,7 +4,7 @@ function sumsUpTo100(percentages) {
 }
 
 export default function (percentages) {
-  var decimals = percentages.map((a) => a % 1);
+  let decimals = percentages.map((a) => a % 1);
   const sumOfDecimals = Math.ceil(decimals.reduce((a, b) => a + b));
   // compensate error by adding 1 to n items with the greatest decimal part
   for (let i = 0, max = decimals.length; i < sumOfDecimals && i < max; i++) {
diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index 45f48d6922..08a0235248 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -1,18 +1,18 @@
 import I18n from "I18n";
-import { h } from "virtual-dom";
+import { PIE_CHART_TYPE } from "discourse/plugins/poll/controllers/poll-ui-builder";
+import RawHtml from "discourse/widgets/raw-html";
 import { ajax } from "discourse/lib/ajax";
+import { avatarFor } from "discourse/widgets/post";
+import { createWidget } from "discourse/widgets/widget";
+import evenRound from "discourse/plugins/poll/lib/even-round";
+import { getColors } from "discourse/plugins/poll/lib/chart-colors";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
+import loadScript from "discourse/lib/load-script";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { relativeAge } from "discourse/lib/formatter";
-import loadScript from "discourse/lib/load-script";
 import round from "discourse/lib/round";
 import showModal from "discourse/lib/show-modal";
-import { avatarFor } from "discourse/widgets/post";
-import RawHtml from "discourse/widgets/raw-html";
-import { createWidget } from "discourse/widgets/widget";
-import { iconNode } from "discourse-common/lib/icon-library";
-import { PIE_CHART_TYPE } from "discourse/plugins/poll/controllers/poll-ui-builder";
-import { getColors } from "discourse/plugins/poll/lib/chart-colors";
-import evenRound from "discourse/plugins/poll/lib/even-round";
 
 function optionHtml(option) {
   const $node = $(`<span>${option.html}</span>`);
@@ -553,7 +553,7 @@ function pieChartConfig(data, labels, opts = {}) {
 }
 
 function stripHtml(html) {
-  var doc = new DOMParser().parseFromString(html, "text/html");
+  let doc = new DOMParser().parseFromString(html, "text/html");
   return doc.body.textContent || "";
 }
 
@@ -962,6 +962,8 @@ export default createWidget("discourse-poll", {
     })
       .then(({ poll }) => {
         attrs.poll.setProperties(poll);
+        this.appEvents.trigger("poll:voted", poll, attrs.post, attrs.vote);
+
         if (attrs.poll.get("results") !== "on_close") {
           state.showResults = true;
         }
diff --git a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
index a4955b8eec..bcf55dd527 100644
--- a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
+++ b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
@@ -1,86 +1,122 @@
-$poll-margin: 10px;
-
-.poll-ui-builder-form {
-  display: flex;
-  margin: 0;
-
-  .options {
-    flex-shrink: 0;
-    width: 280px;
-  }
-  .combo-box,
-  .multi-select {
-    min-width: 180px;
-    width: 180px;
-  }
-
-  .d-editor-preview {
-    margin-left: $poll-margin * 2;
-    width: 360px;
+.poll-ui-builder-modal {
+  .show-advanced {
+    margin-left: auto;
+    margin-right: 0;
   }
+}
 
+.poll-ui-builder {
   label {
     font-weight: bold;
-    display: inline;
+  }
+
+  .input-group {
+    margin-bottom: 15px;
+
+    input[type="number"],
+    input[type="text"],
+    input[type="time"],
+    .combo-box,
+    .multi-select,
+    .select-kit-header,
+    .date-picker-wrapper {
+      height: 34px;
+      margin: 0;
+      width: 100%;
+    }
+
+    button {
+      height: 34px;
+      margin-left: 5px;
+    }
+
+    .date-picker-wrapper {
+      margin-right: 5px;
+    }
+  }
+
+  .poll-checkbox {
+    label {
+      width: unset;
+    }
+  }
+
+  .radio-group {
+    display: inline-block;
+    margin-right: 30px;
+
+    input {
+      vertical-align: top;
+    }
+
+    label {
+      display: inline-block;
+    }
+  }
+
+  .poll-type {
+    display: block;
+
+    .poll-type-value {
+      border: none;
+      color: var(--primary);
+      display: inline-block;
+      padding: 6px 12px 3px;
+
+      &.active {
+        background-color: var(--quaternary);
+        color: var(--secondary);
+      }
+    }
+  }
+
+  .poll-options {
+    margin-bottom: 15px;
+
+    .poll-option-value {
+      align-items: center;
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 3px;
+
+      button {
+        margin-left: 3px;
+      }
+    }
+
+    .poll-option-controls {
+      margin-top: 10px;
+    }
+
+    .tip {
+      display: inline-block;
+      vertical-align: bottom;
+    }
+  }
+
+  .d-date-time-input {
+    border: 1px solid var(--primary-medium);
+    justify-content: space-between;
+    width: 100%;
+
+    .d-date-input {
+      flex: auto;
+    }
+
+    .d-time-input {
+      .select-kit-header {
+        min-width: 120px;
+      }
+    }
   }
 
   .tip {
     display: block;
-    margin-bottom: $poll-margin * 1.5;
-    margin-top: $poll-margin / 2;
     font-size: $font-down-1;
+    margin: -0.5em 0 0.5em;
   }
 
-  .poll-select {
-    margin-bottom: $poll-margin;
-    display: flex;
-    align-items: center;
-  }
-
-  .input-group-label {
-    min-width: 85px;
-  }
-
-  .input-group {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .poll-number {
-    margin: $poll-margin 0;
-    display: flex;
-    align-items: center;
-
-    input {
-      width: 70px;
-    }
-  }
-
-  .poll-textarea,
-  .poll-title {
-    flex-direction: column;
-  }
-
-  .poll-title input {
+  .d-editor-preview {
     width: 100%;
   }
-
-  .poll-textarea textarea {
-    width: 100%;
-    height: 90px;
-    box-sizing: border-box;
-  }
-
-  .poll-select + .poll-title {
-    margin-top: $poll-margin;
-  }
-
-  .poll-textarea {
-    margin-top: $poll-margin;
-  }
-
-  .poll-checkbox,
-  .poll-date {
-    margin-top: $poll-margin / 2;
-  }
 }
diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index 17bf53ecda..e0126524f2 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -161,9 +161,6 @@ div.poll {
 div.poll.pie {
   .poll-container {
     display: inline-block;
-    height: 340px;
-    max-height: 340px;
-    overflow-y: auto;
   }
   .poll-info {
     display: inline-block;
diff --git a/plugins/poll/assets/stylesheets/desktop/poll-ui-builder.scss b/plugins/poll/assets/stylesheets/desktop/poll-ui-builder.scss
new file mode 100644
index 0000000000..caff3a9eec
--- /dev/null
+++ b/plugins/poll/assets/stylesheets/desktop/poll-ui-builder.scss
@@ -0,0 +1,32 @@
+.poll-ui-builder-modal {
+  .modal-inner-container {
+    width: 600px;
+  }
+
+  .modal-body {
+    max-height: unset;
+  }
+
+  .poll-number {
+    margin-right: 10px;
+
+    &:last-of-type {
+      margin-right: 0;
+    }
+  }
+
+  .options {
+    display: flex;
+    justify-content: space-between;
+  }
+  .column {
+    display: inline-block;
+    width: calc(50% - 10px);
+  }
+
+  .d-editor-preview {
+    margin-top: 5px;
+    padding-top: 5px;
+    border-top: 1px solid var(--primary-low);
+  }
+}
diff --git a/plugins/poll/assets/stylesheets/mobile/poll-ui-builder.scss b/plugins/poll/assets/stylesheets/mobile/poll-ui-builder.scss
deleted file mode 100644
index 964cb6b827..0000000000
--- a/plugins/poll/assets/stylesheets/mobile/poll-ui-builder.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.poll-ui-builder-form {
-  .d-editor-preview {
-    display: none;
-  }
-}
diff --git a/plugins/poll/config/locales/client.ar.yml b/plugins/poll/config/locales/client.ar.yml
index 9bf34f77c2..007b1b3742 100644
--- a/plugins/poll/config/locales/client.ar.yml
+++ b/plugins/poll/config/locales/client.ar.yml
@@ -58,6 +58,7 @@ ar:
         age: "أُغلق الاستطلاع <strong>%{age}</strong>."
       breakdown:
         title: "نتائج الاستطلاع"
+        count: "العد"
       error_while_toggling_status: "معذرةً، حدث عُطل أثناء تبديل حالة هذا الاستطلاع."
       error_while_casting_votes: "عذرا، حدث خطأ عند الإدلاء بأصواتكم."
       error_while_fetching_voters: "عذرا، حدث خطأ في عرض الناخبين."
@@ -66,7 +67,6 @@ ar:
         title: افتح استطلاعًا
         insert: أدرِج استطلاعًا
         help:
-          options_count: أدخِل خيارًا واحدًا على الأقلّ
           invalid_values: يجب أن تكون القيمة الدّنيا أصغر من القيمة العليا.
           min_step_value: قيمة الخطوة الدنيا هي 1
         poll_type:
@@ -74,13 +74,7 @@ ar:
           regular: اختيار من متعدّد
           multiple: اختيارات من متعدّد
           number: تقييم عددي
-        poll_result:
-          label: النتائج
         poll_config:
-          max: الحد الأقصى
-          min: الحد الأدنى
           step: الخطوة
         poll_public:
           label: اعرض أسماء المصوّتين
-        poll_options:
-          label: أدخِل خيارًا واحدًا في كلّ سطر
diff --git a/plugins/poll/config/locales/client.be.yml b/plugins/poll/config/locales/client.be.yml
index a7b9525f3d..f3b3af8a92 100644
--- a/plugins/poll/config/locales/client.be.yml
+++ b/plugins/poll/config/locales/client.be.yml
@@ -22,8 +22,8 @@ be:
         label: "экспарт"
       close:
         label: "зачыніць"
+      breakdown:
+        count: "падлічваць"
       ui_builder:
         poll_type:
           label: тып
-        poll_result:
-          label: вынікі
diff --git a/plugins/poll/config/locales/client.bg.yml b/plugins/poll/config/locales/client.bg.yml
index 370d012780..57ba913b8e 100644
--- a/plugins/poll/config/locales/client.bg.yml
+++ b/plugins/poll/config/locales/client.bg.yml
@@ -37,15 +37,13 @@ bg:
         title: "Затвори гласуването"
         label: "Затвори"
         confirm: "Сигурни ли сте, че искате да затворите гласуването?"
+      breakdown:
+        count: "Брой"
       error_while_toggling_status: "Съжаляваме, получи се грешка при превключване статуса на тази анкета."
       error_while_casting_votes: "Получи се грешка при подаването на гласа ви."
       error_while_fetching_voters: "Получи се грешка при показването на гласовете."
       ui_builder:
         poll_type:
           label: Тип
-        poll_result:
-          label: Резултати
         poll_config:
-          max: Максимално
-          min: Минимално
           step: Стъпка
diff --git a/plugins/poll/config/locales/client.bs_BA.yml b/plugins/poll/config/locales/client.bs_BA.yml
index 459f9beca2..498c74bf7a 100644
--- a/plugins/poll/config/locales/client.bs_BA.yml
+++ b/plugins/poll/config/locales/client.bs_BA.yml
@@ -82,7 +82,7 @@ bs_BA:
         title: Izgradi anketu
         insert: Umetni anketu
         help:
-          options_count: Unesite barem jednu opciju
+          options_min_count: Unesite barem jednu opciju.
           invalid_values: Minimalna vrijednost mora biti manja od maksimalne.
           min_step_value: Minimalna vrijednost razmaka je 1
         poll_type:
@@ -91,24 +91,14 @@ bs_BA:
           multiple: Višestruki izbor
           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
           bar: Bar dijagram
           pie: Okrugli dijagram
         poll_config:
-          max: Maksimalno
-          min: Minimalno
           step: Korak
         poll_public:
           label: Pokaži ko je glasao
-        poll_options:
-          label: Upišite jednu opciju ankete po liniji
         automatic_close:
           label: Automatski zatvori anketu
diff --git a/plugins/poll/config/locales/client.ca.yml b/plugins/poll/config/locales/client.ca.yml
index e3556fbb13..f65bea35ae 100644
--- a/plugins/poll/config/locales/client.ca.yml
+++ b/plugins/poll/config/locales/client.ca.yml
@@ -60,6 +60,8 @@ ca:
       automatic_close:
         closes_in: "Es tanca en <strong>%{timeLeft}</strong> ."
         age: "Tancat <strong>%{age}</strong>"
+      breakdown:
+        count: "Recompte"
       error_while_toggling_status: "Ho sentim. S'ha produït un error en canviar l'estat d'aquesta enquesta."
       error_while_casting_votes: "Ho sentim. S'ha produït un error en l'emissió dels vostres vots."
       error_while_fetching_voters: "Hi ha hagut un error en mostrar els votants."
@@ -68,7 +70,7 @@ ca:
         title: Crea una enquesta
         insert: Insereix una enquesta
         help:
-          options_count: Introduïu almenys una opció
+          options_min_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:
@@ -77,20 +79,11 @@ ca:
           multiple: Elecció múltiple
           number: Valoració numèrica
         poll_result:
-          label: Resultats
           always: Sempre visible
-          vote: En votació
-          closed: Quan estigui tancada
           staff: Només l'equip responsable
-        poll_chart_type:
-          label: Tipus de gràfic
         poll_config:
-          max: Màxim
-          min: Mínim
           step: Pas
         poll_public:
           label: Mostra qui ha votat
-        poll_options:
-          label: Introduïu una opció d'enquesta per línia
         automatic_close:
           label: Tanca automàticament l'enquesta
diff --git a/plugins/poll/config/locales/client.cs.yml b/plugins/poll/config/locales/client.cs.yml
index fe5ca9d9d9..34df66df07 100644
--- a/plugins/poll/config/locales/client.cs.yml
+++ b/plugins/poll/config/locales/client.cs.yml
@@ -51,10 +51,6 @@ cs:
           multiple: Více možností
           number: Číselné hodnocení
         poll_config:
-          max: Max
-          min: Min
           step: Krok
         poll_public:
           label: Zobrazit kdo hlasoval
-        poll_options:
-          label: Na každý řádek zadejte jednu možnost hlasování
diff --git a/plugins/poll/config/locales/client.da.yml b/plugins/poll/config/locales/client.da.yml
index f94832b8e4..9763c079a6 100644
--- a/plugins/poll/config/locales/client.da.yml
+++ b/plugins/poll/config/locales/client.da.yml
@@ -13,7 +13,30 @@ da:
       total_votes:
         one: "afgiven stemme"
         other: "afgivne stemmer"
-      average_rating: "Gennemsnitlig rating: <strong>%{average}</strong>."
+      average_rating: "Gennemsnitlig bedømmelse: <strong>%{average}</strong>."
+      public:
+        title: "Stemmerne er <strong>offentlige</strong>."
+      results:
+        groups:
+          title: "Du skal være medlem af %{groups} for at stemme i denne afstemning."
+        vote:
+          title: "Resultaterne vil blive vist ved <strong>afstemning</strong>."
+        closed:
+          title: "Resultaterne vil blive vist når <strong>lukket</strong>."
+        staff:
+          title: "Resultaterne vises kun for <strong>personale</strong> medlemmer."
+      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 mellem <strong>%{min}</strong> og <strong>%{max}</strong> muligheder."
       cast-votes:
         title: "Afgiv dine stemmer"
         label: "Stem nu!"
@@ -22,7 +45,12 @@ da:
         label: "Vis resultat"
       hide-results:
         title: "Tilbage til dine stemmer"
+        label: "Vis afstemning"
+      group-results:
+        title: "Gruppér stemmer efter brugerfelt"
+        label: "Vis fordeling"
       export-results:
+        title: "Eksporter afstemningsresultaterne"
         label: "Eksporter"
       open:
         title: "Åbn afstemningen"
@@ -32,26 +60,47 @@ da:
         title: "Luk afstemningen"
         label: "Luk"
         confirm: "Er du sikker på, at du vil lukke denne afstemning?"
-      error_while_toggling_status: "Undskyld, der var en fejl i skifte status på denne afstemning."
-      error_while_casting_votes: "Undskyld, der var en fejl i din stemmeafgivning."
+      automatic_close:
+        closes_in: "Lukker om <strong>%{timeLeft}</strong>."
+        age: "Lukket <strong>%{age}</strong>"
+      breakdown:
+        title: "Afstemningsresultater"
+        votes: "%{count} stemmer"
+        breakdown: "Fordeling"
+        percentage: "Procentdel"
+        count: "Antal"
+      error_while_toggling_status: "Beklager, der opstod en fejl under statusskifte for denne afstemning."
+      error_while_casting_votes: "Beklager, der opstod en fejl under afgivelse af dine stemmer."
       error_while_fetching_voters: "Beklager, der opstod en fejl med at vise deltagerne."
+      error_while_exporting_results: "Beklager, der opstod en fejl under eksport af afstemningsresultater."
       ui_builder:
         title: Opret afstemning
         insert: Indsæt afstemning
         help:
-          invalid_values: Minimumsværdien skal være mindre end maksimumværdien.
+          options_min_count: Indtast mindst 1 valgmulighed.
+          options_max_count: Indtast højst %{count} muligheder.
+          invalid_min_value: Minimumsværdien skal være mindst 1.
+          invalid_max_value: Maksimumsværdien skal være mindst 1, men mindre end eller lig med antallet af valgmuligheder.
+          invalid_values: Minimumsværdien skal være mindre end maksimumsværdien.
+          min_step_value: Den mindste trinværdi er 1
         poll_type:
           label: Type
           regular: Enkelt valg
           multiple: Flere valg
           number: Nummerbedømmelse
         poll_result:
-          label: Resultater
+          always: Altid synlig
+          staff: Kun personale
+        poll_chart_type:
+          bar: Bar
+          pie: Tærte
         poll_config:
-          max: Maks
-          min: Min
           step: Trin
         poll_public:
           label: Vis hvem der stemte
-        poll_options:
-          label: Indtast en valgmulighed per linje
+        poll_title:
+          label: Titel (valgfrit)
+        automatic_close:
+          label: Luk afstemning automatisk
+        show_advanced: "Vis Avancerede Indstillinger"
+        hide_advanced: "Skjul Avancerede Indstillinger"
diff --git a/plugins/poll/config/locales/client.de.yml b/plugins/poll/config/locales/client.de.yml
index a0253f0f38..33f4666539 100644
--- a/plugins/poll/config/locales/client.de.yml
+++ b/plugins/poll/config/locales/client.de.yml
@@ -77,7 +77,10 @@ de:
         title: Umfrage erstellen
         insert: Umfrage einfügen
         help:
-          options_count: Geben Sie mindestens 1 Option ein
+          options_min_count: Geben Sie mindestens 1 Option ein.
+          options_max_count: Geben Sie höchstens %{count} Optionen ein.
+          invalid_min_value: Der Mindestwert muss mindestens 1 betragen.
+          invalid_max_value: Der Maximalwert muss mindestens 1 betragen, aber kleiner oder gleich der Anzahl der Optionen sein.
           invalid_values: Der Mindestwert muss kleiner als der Höchstwert sein.
           min_step_value: Die minimale Schrittweite beträgt 1.
         poll_type:
@@ -86,26 +89,29 @@ de:
           multiple: Mehrfachauswahl
           number: Bewertung
         poll_result:
-          label: Ergebnisse
+          label: Ergebnisse anzeigen...
           always: Immer sichtbar
-          vote: Nach Stimmabgabe
-          closed: Nach Ende der Abstimmung
+          vote: Nur nach Stimmabgabe
+          closed: Wenn die Umfrage geschlossen ist
           staff: Nur Teammitglieder
         poll_groups:
-          label: Zulässige Gruppen
+          label: Abstimmung auf diese Gruppen beschränken
         poll_chart_type:
-          label: Diagrammtyp
+          label: Ergebnisübersicht
           bar: Balken
           pie: Torte
         poll_config:
-          max: Höchstwert
-          min: Minimalwert
+          max: Max. Auswahl
+          min: Min. Auswahl
           step: Schrittweite
         poll_public:
           label: Anzeigen, wer abgestimmt hat
         poll_title:
           label: Titel (optional)
         poll_options:
-          label: Bitte gib eine Umfrageoption pro Zeile ein
+          label: Optionen (eine pro Zeile)
+          add: Option hinzufügen
         automatic_close:
           label: Umfrage automatisch beenden
+        show_advanced: "Erweiterte Optionen anzeigen"
+        hide_advanced: "Erweiterte Optionen ausblenden"
diff --git a/plugins/poll/config/locales/client.el.yml b/plugins/poll/config/locales/client.el.yml
index 2182e65805..c03334c44f 100644
--- a/plugins/poll/config/locales/client.el.yml
+++ b/plugins/poll/config/locales/client.el.yml
@@ -77,7 +77,7 @@ el:
         title: Δημιουργία ψηφοφορίας
         insert: Εισαγωγή ψηφοφορίας
         help:
-          options_count: Επιλέξτε τουλάχιστον 1 επιλογή
+          options_min_count: Επιλέξτε τουλάχιστον 1 επιλογή.
           invalid_values: Η ελάχιστη τιμή θα πρέπει να είναι μικρότερη από τη μέγιστη τιμή.
           min_step_value: Η ελάχιστη τιμή για το βήμα είναι 1
         poll_type:
@@ -86,24 +86,14 @@ el:
           multiple: Πολλαπλές επιλογές
           number: Αξιολόγηση αριθμoύ
         poll_result:
-          label: Αποτελέσματα
           always: Πάντα ορατό
-          vote: Μετά την ψηφοφορία
-          closed: Όταν είναι κλειστό
           staff: Μόνο το προσωπικό
-        poll_groups:
-          label: Επιτρεπόμενες ομάδες
         poll_chart_type:
-          label: Τύπος γραφήματος
           bar: Μπάρες
           pie: Πίτα
         poll_config:
-          max: Μέγιστο
-          min: Ελάχιστο
           step: Βήμα
         poll_public:
           label: Προβολή ψηφοφόρων.
-        poll_options:
-          label: Εισαγάγετε μία επιλογή ψηφοφορίας ανά γραμμή
         automatic_close:
           label: Αυτόματο κλείσιμο ψηφοφορίας
diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml
index 9b47e0f400..b1a0246fc2 100644
--- a/plugins/poll/config/locales/client.en.yml
+++ b/plugins/poll/config/locales/client.en.yml
@@ -86,7 +86,10 @@ en:
         title: Build Poll
         insert: Insert Poll
         help:
-          options_count: Enter at least 1 option
+          options_min_count: Enter at least 1 option.
+          options_max_count: Enter at most %{count} options.
+          invalid_min_value: Minimum value must be at least 1.
+          invalid_max_value: Maximum value must be at least 1, but less than or equal with the number of options.
           invalid_values: Minimum value must be smaller than the maximum value.
           min_step_value: The minimum step value is 1
         poll_type:
@@ -95,26 +98,29 @@ en:
           multiple: Multiple Choice
           number: Number Rating
         poll_result:
-          label: Results
+          label: Show Results...
           always: Always visible
-          vote: On vote
-          closed: When closed
+          vote: Only after voting
+          closed: When the poll is closed
           staff: Staff only
         poll_groups:
-          label: Allowed groups
+          label: Limit voting to these groups
         poll_chart_type:
-          label: Chart type
+          label: Result chart
           bar: Bar
           pie: Pie
         poll_config:
-          max: Max
-          min: Min
+          max: Max Choices
+          min: Min Choices
           step: Step
         poll_public:
           label: Show who voted
         poll_title:
           label: Title (optional)
         poll_options:
-          label: Enter one poll option per line
+          label: Options (one per line)
+          add: Add option
         automatic_close:
           label: Automatically close poll
+        show_advanced: "Show Advanced Options"
+        hide_advanced: "Hide Advanced Options"
diff --git a/plugins/poll/config/locales/client.en_GB.yml b/plugins/poll/config/locales/client.en_GB.yml
new file mode 100644
index 0000000000..2d4fa180ec
--- /dev/null
+++ b/plugins/poll/config/locales/client.en_GB.yml
@@ -0,0 +1,7 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
diff --git a/plugins/poll/config/locales/client.es.yml b/plugins/poll/config/locales/client.es.yml
index 35d414a721..fe9e24b0f1 100644
--- a/plugins/poll/config/locales/client.es.yml
+++ b/plugins/poll/config/locales/client.es.yml
@@ -39,7 +39,7 @@ es:
           between_min_and_max_options: "Selecciona de <strong>%{min}</strong> a <strong>%{max}</strong> opciones."
       cast-votes:
         title: "Emite tus votos"
-        label: "¡Vota ahora!"
+        label: "Votar"
       show-results:
         title: "Mostrar los resultados de la encuesta"
         label: "Mostrar resultados"
@@ -55,11 +55,11 @@ es:
       open:
         title: "Abrir la encuesta"
         label: "Abrir"
-        confirm: "¿Estás seguro de que quieres abrir esta encuesta?"
+        confirm: "¿Quieres abrir esta encuesta?"
       close:
         title: "Cerrar la encuesta"
         label: "Cerrar"
-        confirm: "¿Estás seguro de que quieres cerrar esta encuesta?"
+        confirm: "¿Quieres cerrar esta encuesta?"
       automatic_close:
         closes_in: "Cierra en <strong>%{timeLeft}</strong>."
         age: "Cerrado <strong>%{age}</strong>"
@@ -69,15 +69,18 @@ es:
         breakdown: "Desglose"
         percentage: "Porcentaje"
         count: "Contar"
-      error_while_toggling_status: "Lo sentimos, se produjo un error al cambiar el estado de esta encuesta."
-      error_while_casting_votes: "Lo sentimos, se produjo un error al emitir tus votos."
+      error_while_toggling_status: "Lo sentimos, se ha producido un error al cambiar el estado de esta encuesta."
+      error_while_casting_votes: "Lo sentimos, se ha producido un error al emitir tus votos."
       error_while_fetching_voters: "Lo sentimos, se produjo un error al mostrar los votantes."
       error_while_exporting_results: "Lo sentimos, ha habido un error al exportar los resultados de la encuesta."
       ui_builder:
         title: Crear encuesta
         insert: Insertar encuesta
         help:
-          options_count: Ingresa al menos 1 opción
+          options_min_count: Introduce al menos 1 opción.
+          options_max_count: Introduce al menos %{count} opciones.
+          invalid_min_value: El valor mínimo debe ser al menos 1.
+          invalid_max_value: El valor mínimo debe ser al menos 1, pero menor o igual que el número de opciones.
           invalid_values: El valor mínimo debe ser menor que el valor máximo.
           min_step_value: El valor mínimo es 1
         poll_type:
@@ -86,26 +89,29 @@ es:
           multiple: Múltiples opciones
           number: Valoración numérica
         poll_result:
-          label: Resultados
+          label: Ver resultados...
           always: Siempre visible
-          vote: En votación
-          closed: Cuando esté cerrada
+          vote: Solo después de votar
+          closed: Cuando se cierre la encuesta
           staff: Solo staff
         poll_groups:
-          label: Grupos permitidos
+          label: Solo permitir votar a estos grupos
         poll_chart_type:
-          label: Tipo de gráfico
+          label: Gráfico de resultados
           bar: Barras
           pie: Tarta
         poll_config:
-          max: Máximo
-          min: Mínimo
+          max: Máximo de opciones
+          min: Mínimo de opciones
           step: Intervalo
         poll_public:
           label: Mostrar quién votó
         poll_title:
           label: Título (opcional)
         poll_options:
-          label: Ingresa una opción de la encuesta por línea
+          label: Opciones (una por línea)
+          add: Añadir opción
         automatic_close:
           label: Cerrar encuesta automáticamente
+        show_advanced: "Ver opciones avanzadas"
+        hide_advanced: "Ocultar opciones avanzadas"
diff --git a/plugins/poll/config/locales/client.et.yml b/plugins/poll/config/locales/client.et.yml
index 8dc80a0af3..35a4d33ad5 100644
--- a/plugins/poll/config/locales/client.et.yml
+++ b/plugins/poll/config/locales/client.et.yml
@@ -32,6 +32,8 @@ et:
         title: "Sulge hääletus"
         label: "Sulge"
         confirm: "Kas sa oled kindel, et sa tahad antud hääletuse sulgeda?"
+      breakdown:
+        count: "Arv"
       error_while_toggling_status: "Kahjuks tekkis postituse staatuse ümberlülitamisel tõrge."
       error_while_casting_votes: "Kahjuks tekkis hääletamise käigus tõrge."
       error_while_fetching_voters: "Kahjuks tekkis hääletajate näitamise käigus tõrge."
@@ -46,10 +48,6 @@ et:
           multiple: Mitu valikut
           number: Numbriline vastus
         poll_config:
-          max: Maksimum
-          min: Miinumum
           step: Samm
         poll_public:
           label: Näita vastajaid
-        poll_options:
-          label: Sisesta üks küsitluse valik rea kohta
diff --git a/plugins/poll/config/locales/client.fa_IR.yml b/plugins/poll/config/locales/client.fa_IR.yml
index d39367f8f7..744c65e00a 100644
--- a/plugins/poll/config/locales/client.fa_IR.yml
+++ b/plugins/poll/config/locales/client.fa_IR.yml
@@ -16,37 +16,66 @@ fa_IR:
       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:
+            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: "رای بدهید!"
+        label: "ثبت رای!"
       show-results:
-        title: "نتایج نظرسنجی را نمایش بده"
-        label: "نتایج را نشان بده"
+        title: "نمایش نتایج"
+        label: "نمایش نتایج"
       hide-results:
         title: "برگشتن به رای گیری "
         label: "نمایش رأی"
+      group-results:
+        title: "آراء گروه با توجه به نام کاربر"
       export-results:
+        title: "اک‍‍‍سپورت کردن نتایج نظرسنجی"
         label: "خروجی گرفتن"
       open:
-        title: "نظرسنجی را باز کن "
+        title: "باز کردن نظرسنجی"
         label: "باز"
-        confirm: "آیا از باز کردن این نظرسنجی اطمینان دارید ؟ "
+        confirm: "آیا از باز کردن این نظرسنجی اطمینان دارید؟"
       close:
-        title: "نظرسنجی را ببند"
+        title: "بستن نظرسنجی"
         label: "بستن"
-        confirm: "آیا از بستن این نظرسنجی اطمینان دارید ؟ "
+        confirm: "آیا از بستن این نظرسنجی اطمینان دارید؟"
+      automatic_close:
+        closes_in: "در <strong>%{timeLeft}</strong> بسته خواهد شد."
+        age: "در <strong>%{age}</strong> تمام شد."
       breakdown:
         title: "نتایج نظرسنجی"
         votes: "%{count} رای"
         percentage: "درصد"
+        count: "تعداد"
       error_while_toggling_status: "متاسفانه در تغییر وضعیت این نظرسنجی، خطایی رخ داده است."
       error_while_casting_votes: "متاسفانه در ثبت رای شما خطایی رخ داده است."
       error_while_fetching_voters: "متاسفانه در نمایش رای دهندگان خطایی رخ داده است."
+      error_while_exporting_results: "متأسفانه در پروسه اکسپورت خطایی رخ داده."
       ui_builder:
         title: ساخت نظرسنجی
         insert: درج نظر سنجی
         help:
-          options_count: حداقل 1 گزینه را وارد کنید
+          options_min_count: حداقل 1 گزینه را وارد کنید.
           invalid_values: مقدار حداقل می بایست کمتر از مقدار حداکثر باشد.
           min_step_value: حداقل مقدار مرحله 1 است
         poll_type:
@@ -55,14 +84,26 @@ fa_IR:
           multiple: چند انتخابی
           number: امتیاز عددی
         poll_result:
-          label: نتایج
+          label: نمایش نتایج
+          always: به طور مداوم
+          vote: بعد از شرکت در نظرسنجی
+          closed: بعد از بسته شدن نظرسنجی
+          staff: فقط به تیم مدیریت
+        poll_groups:
+          label: محدودسازی قابلیت رأی دهی به گروه
+        poll_chart_type:
+          label: نمودار نتایج
+          bar: بار
+          pie: پای
         poll_config:
-          max: بیشترین
-          min: کمترین
           step: مرحله
         poll_public:
           label: نمایش رای دهندگان
         poll_title:
           label: عنوان (اختیاری)
         poll_options:
-          label: در هر خط یک گزینه نظرسنجی را وارد کنید
+          add: افزودن گزینه
+        automatic_close:
+          label: بسته شدن خودکار نظرسنجی
+        show_advanced: "نمایش گزینه‌های پیشرفته"
+        hide_advanced: "پنهان کردن گزینه‌های پیشرفته"
diff --git a/plugins/poll/config/locales/client.fi.yml b/plugins/poll/config/locales/client.fi.yml
index 189b3848f8..49a0d69931 100644
--- a/plugins/poll/config/locales/client.fi.yml
+++ b/plugins/poll/config/locales/client.fi.yml
@@ -20,11 +20,11 @@ fi:
         groups:
           title: "Täytyy olla ryhmien %{groups} jäsen, jotta voi äänestää tässä äänestyksessä."
         vote:
-          title: "Näet äänet, kun <strong>olet äänestänyt</strong>."
+          title: "Tulokset näytetään <strong>äänestyksen jälkeen</strong>."
         closed:
           title: "Tulokset näytetään äänestyksen <strong>sulkeuduttua</strong>."
         staff:
-          title: "Tulokset näytetään vain <strong>henkilökunnan</strong> jäsenille. "
+          title: "Tulokset näytetään vain <strong>henkilökunnan</strong> jäsenille."
       multiple:
         help:
           at_least_min_options:
@@ -42,7 +42,7 @@ fi:
         label: "Äänestä nyt!"
       show-results:
         title: "Näytä äänestystulos"
-        label: "Näytä tulos"
+        label: "Näytä tulokset"
       hide-results:
         title: "Palaa äänestysvalintaasi"
         label: "Näytä äänestys"
@@ -77,35 +77,41 @@ fi:
         title: Luo äänestys
         insert: Lisää äänestys
         help:
-          options_count: Syötä ainakin 1 vaihtoehto
+          options_min_count: Syötä vähintään 1 vaihtoehto.
+          options_max_count: Syötä enintään %{count} vaihtoehtoa.
+          invalid_min_value: Vähimmäisarvon on oltava vähintään 1.
+          invalid_max_value: Enimmäisarvon on oltava vähintään 1, mutta pienempi tai yhtä suuri kuin vaihtoehtojen määrä.
           invalid_values: Vähimmäisarvon täytyy olla enimmäisarvoa pienempi.
           min_step_value: Askelvälin on oltava vähintään 1
         poll_type:
           label: Tyyppi
-          regular: Valitaan yksi
-          multiple: Valitaan useita
+          regular: Yksi valinta
+          multiple: Monivalinta
           number: Numeroarviointi
         poll_result:
-          label: Tulokset
-          always: Näkyvät aina
-          vote: Kun on äänestänyt
-          closed: Kun äänestys suljettu
-          staff: Vain henkilökunta
+          label: Näytä tulokset...
+          always: Aina näkyvissä
+          vote: Vasta äänestämisen jälkeen
+          closed: Kun äänestys on suljettu
+          staff: Vain henkilökunnalle
         poll_groups:
-          label: Sallitut ryhmät
+          label: Rajoita äänestys näihin ryhmiin
         poll_chart_type:
-          label: Kuvaajan tyyppi
+          label: Tuloskaavio
           bar: Pylväs
           pie: Ympyrä
         poll_config:
-          max: Enint.
-          min: Väh.
+          max: Valintoja enintään
+          min: Valintoja vähintään
           step: Askelväli
         poll_public:
           label: Näytä äänestäneet
         poll_title:
-          label: Otsikko (ei-pakollinen)
+          label: Otsikko (valinnainen)
         poll_options:
-          label: Syötä yksi äänestysvaihtoehto riviä kohden
+          label: Valittavat vaihtoehdot (yksi per rivi)
+          add: Lisää vaihtoehto
         automatic_close:
           label: Sulje äänestys ajastetusti
+        show_advanced: "Näytä lisäasetukset"
+        hide_advanced: "Piilota lisäasetukset"
diff --git a/plugins/poll/config/locales/client.fr.yml b/plugins/poll/config/locales/client.fr.yml
index 22fa743c62..ba0a240cd8 100644
--- a/plugins/poll/config/locales/client.fr.yml
+++ b/plugins/poll/config/locales/client.fr.yml
@@ -63,6 +63,12 @@ fr:
       automatic_close:
         closes_in: "Se termine dans <strong>%{timeLeft}</strong>."
         age: "Fermé <strong>%{age}</strong>"
+      breakdown:
+        title: "Résultats du sondage"
+        votes: "%{count} votes"
+        breakdown: "Détails"
+        percentage: "Pourcentage"
+        count: "Nombre"
       error_while_toggling_status: "Désolé, il y a eu une erreur lors du changement de statut de ce sondage."
       error_while_casting_votes: "Désolé, il y a eu une erreur lors de l'envoi de vos votes."
       error_while_fetching_voters: "Désolé, il y a eu une erreur lors de l'affichage des votants."
@@ -71,7 +77,10 @@ fr:
         title: Créer un sondage
         insert: Insérer le sondage
         help:
-          options_count: Entrez au moins 1 option
+          options_min_count: Saisissez au moins 1 réponse possible.
+          options_max_count: Saisissez au plus %{count} réponses possibles.
+          invalid_min_value: Cette valeur doit être supérieure à 1.
+          invalid_max_value: Cette valeur doit être supérieure à 1, mais inférieure ou égale au nombre de réponses possibles.
           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:
@@ -80,26 +89,29 @@ fr:
           multiple: Choix multiple
           number: Nombre
         poll_result:
-          label: Résultats
+          label: Afficher les résultats…
           always: Toujours visible
-          vote: Lors du vote
-          closed: À la fermeture
+          vote: Seulement après le vote
+          closed: Lorsque le sondage est fermé
           staff: Responsables seulement
         poll_groups:
-          label: Groupes autorisés
+          label: Limiter le vote à ces groupes
         poll_chart_type:
-          label: Type de graphique
+          label: Graphique des résultats
           bar: Barre
           pie: Circulaire
         poll_config:
-          max: Max
-          min: Min
+          max: Nb. Max. de Réponses
+          min: Nb. Min. de Réponses
           step: Pas
         poll_public:
           label: Afficher les votants
         poll_title:
           label: Titre (facultatif)
         poll_options:
-          label: Entrez une option de sondage par ligne
+          label: Réponses possibles (une réponse par ligne)
+          add: Ajouter une option
         automatic_close:
           label: Fermer le sondage automatiquement
+        show_advanced: "Afficher les options avancées"
+        hide_advanced: "Masquer les options avancées"
diff --git a/plugins/poll/config/locales/client.gl.yml b/plugins/poll/config/locales/client.gl.yml
index ecfa0e9f9f..9166bf0af8 100644
--- a/plugins/poll/config/locales/client.gl.yml
+++ b/plugins/poll/config/locales/client.gl.yml
@@ -14,26 +14,90 @@ gl:
         one: "votos totais"
         other: "votos totais"
       average_rating: "Valoración media: <strong>%{average}</strong>."
+      public:
+        title: "Os votos son <strong>públicos</strong>."
+      results:
+        groups:
+          title: "Debe ser membro de %{groups} para votar nesta enquisa."
+        vote:
+          title: "Os resultados amosaranse en <strong>voto</strong>."
+        closed:
+          title: "Os resultados amosaranse logo de <strong>pechada</strong>."
+        staff:
+          title: "Os resultados só se amosan a membros do <strong>equipo</strong>."
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Escolla polo menos a opción <strong>%{count}</strong>."
+            other: "Escolla polo menos as opcións <strong>%{count}</strong>."
+          up_to_max_options:
+            one: "Escolla ata <strong>%{count}</strong> opción."
+            other: "Escolla ata <strong>%{count}</strong> opcións."
+          x_options:
+            one: "Escolla <strong>%{count}</strong> opción."
+            other: "Escolla <strong>%{count}</strong> opcións."
+          between_min_and_max_options: "Escolla entre as opcións <strong>%{min}</strong> e <strong>%{max}</strong>."
       cast-votes:
-        title: "Vota"
-        label: "Vota agora!"
+        title: "Vote"
+        label: "Vote agora!"
       show-results:
-        title: "Mostrar os resultados da votación"
-        label: "Mostrar os resultados"
+        title: "Amosar os resultados da enquisa"
+        label: "Amosar os resultados"
       hide-results:
-        title: "Volver aos teus votos"
+        title: "Volver aos seus votos"
+        label: "Amosar o voto"
+      group-results:
+        title: "Agrupar votos por campo de usuario"
+        label: "Amosar en detalle"
       export-results:
+        title: "Exportar os resultados da enquisa"
         label: "Exportar"
       open:
         title: "Abrir a enquisa"
         label: "Abrir"
-        confirm: "Confirmas a apertura da enquisa?"
+        confirm: "Confirma a apertura da enquisa?"
       close:
         title: "Pechar a enquisa"
         label: "Pechar"
-        confirm: "Confirmas o peche desta enquisa?"
+        confirm: "Confirma o peche desta enquisa?"
+      automatic_close:
+        closes_in: "Pechará en <strong>%{timeLeft}</strong>."
+        age: "Pechado desde <strong>%{age}</strong>"
+      breakdown:
+        title: "Resultados da enquisa"
+        votes: "%{count} votos"
+        breakdown: "Detalle"
+        percentage: "Porcentaxe"
+        count: "Conta"
+      error_while_toggling_status: "Desculpe, produciuse un erro ao trocar o status desta enquisa."
+      error_while_casting_votes: "Desculpe, produciuse un erro na emisión dos seus votos."
+      error_while_fetching_voters: "Desculpe, produciuse un erro ao presentar os votantes."
+      error_while_exporting_results: "Desculpe, produciuse un erro ao exportar os resultados da enquisa."
       ui_builder:
+        title: Construír a enquisa
+        insert: Inserir enquisa
+        help:
+          options_min_count: Introducir cando menos 1 opción.
+          invalid_values: O valor mínimo ten de ser menor có valor máximo.
+          min_step_value: O valor mínimo do paso é 1
         poll_type:
           label: Tipo
+          regular: Escolla única
+          multiple: Escolla múltipla
+          number: Valoración numérica
         poll_result:
-          label: Resultados
+          always: Sempre visíbel
+          staff: Soamente ao equipo
+        poll_chart_type:
+          bar: Barra
+          pie: Torta
+        poll_config:
+          step: Paso
+        poll_public:
+          label: Amosar quen votou
+        poll_title:
+          label: Título (opcional)
+        automatic_close:
+          label: Pechar automaticamente a enquisa
+        show_advanced: "Amosar opcións avanzadas"
+        hide_advanced: "Agochar opcións avanzadas"
diff --git a/plugins/poll/config/locales/client.he.yml b/plugins/poll/config/locales/client.he.yml
index 9b863fc5a2..39d785e050 100644
--- a/plugins/poll/config/locales/client.he.yml
+++ b/plugins/poll/config/locales/client.he.yml
@@ -87,7 +87,10 @@ he:
         title: בניית סקר
         insert: הכנסת סקר
         help:
-          options_count: יש למלא אפשרות אחת לפחות
+          options_min_count: יש למלא אפשרות אחת לפחות.
+          options_max_count: יש למלא עד %{count} אפשרויות.
+          invalid_min_value: הערך המזערי חייב להיות 1 לפחות.
+          invalid_max_value: הערך המרבי חייב להיות 1 לפחות אך פחות מאשר או שווה למספר האפשרויות.
           invalid_values: הערך המזערי חייב להיות קטן מהערך המרבי.
           min_step_value: ערך הצעד המזערי הוא 1
         poll_type:
@@ -96,26 +99,29 @@ he:
           multiple: בחירה מרובה
           number: ציון מספרי
         poll_result:
-          label: תוצאות
+          label: להציג תוצאות...
           always: גלוי תמיד
-          vote: בהליכי הצבעה
-          closed: כאשר סגור
+          vote: רק לאחר הצבעה
+          closed: כשהסקר סגור
           staff: סגל בלבד
         poll_groups:
-          label: קבוצות מורשות
+          label: להגביל את ההצבעה לקבוצות אלה
         poll_chart_type:
-          label: סוג תרשים
+          label: תרשים תוצאות
           bar: עמודות
           pie: עוגה
         poll_config:
-          max: מרבי
-          min: מזערי
+          max: כמות האפשרויות המרבית
+          min: כמות האפשרויות המזערית
           step: צעד
         poll_public:
           label: להציג מי המצביעים
         poll_title:
           label: כותרת (רשות)
         poll_options:
-          label: נא למלא אפשרות בחירה אחת בכל שורה
+          label: אפשרויות (אחת בכל שורה)
+          add: הוספת אפשרות
         automatic_close:
           label: לסגור את הסקר אוטומטית
+        show_advanced: "הצגת אפשרויות מתקדמות"
+        hide_advanced: "הסתרת אפשרויות מתקדמות"
diff --git a/plugins/poll/config/locales/client.hu.yml b/plugins/poll/config/locales/client.hu.yml
index c1122709d5..ac3d491419 100644
--- a/plugins/poll/config/locales/client.hu.yml
+++ b/plugins/poll/config/locales/client.hu.yml
@@ -22,6 +22,7 @@ hu:
         label: "Eredmények mutatása"
       hide-results:
         title: "Vissza a szavazataidhoz"
+        label: "Szavazás megjelenítése"
       export-results:
         label: "Exportálás"
       open:
@@ -32,6 +33,8 @@ hu:
         title: "A szavazás lezárása"
         label: "Bezárás"
         confirm: "Biztosan lezárod ezt a szavazást?"
+      breakdown:
+        count: "Számláló"
       error_while_toggling_status: "Elnézést, a szavazat állapotának vizsgálatakor hiba lépett fel."
       error_while_casting_votes: "Sajnáljuk, hiba történt a szavazatod elküldésekor."
       error_while_fetching_voters: "Elnézést, a szavazatok kiírásakor hiba lépett fel."
@@ -46,15 +49,9 @@ hu:
           regular: Egyszerű választás
           multiple: Többszörös Választás
           number: Értékelés Számokkal
-        poll_result:
-          label: Eredmények
         poll_config:
-          max: Max
-          min: Min
           step: Lépés
         poll_public:
           label: Mutasd, ki szavazott
-        poll_options:
-          label: Soronként egy választási lehetőséget adj meg
         automatic_close:
           label: Szavazás automatikus lezárása
diff --git a/plugins/poll/config/locales/client.hy.yml b/plugins/poll/config/locales/client.hy.yml
index 92f17d0540..5ed8e58a57 100644
--- a/plugins/poll/config/locales/client.hy.yml
+++ b/plugins/poll/config/locales/client.hy.yml
@@ -42,6 +42,8 @@ hy:
       automatic_close:
         closes_in: "Փակվում է <strong>%{timeLeft}</strong> անց:"
         age: "Փակված է՝ <strong>%{age}</strong>"
+      breakdown:
+        count: "Քանակ"
       error_while_toggling_status: "Ներողություն, այս հարցման կարգավիճակը փոխելիս տեղի է ունեցել սխալ:"
       error_while_casting_votes: "Ներողություն, Ձեր քվեարկելիս տեղի է ունեցել սխալ:"
       error_while_fetching_voters: "Ներողություն, քվեարկողներին ցուցադրելիս տեղի է ունեցել սխալ:"
@@ -57,17 +59,10 @@ hy:
           multiple: Բազմակի Ընտրությամբ
           number: Թվային Գնահատում
         poll_result:
-          label: Արդյունքները
           always: Միշտ տեսանելի
-          vote: Ըստ քվեի
-          closed: Փակվելուց հետո
         poll_config:
-          max: Առավելագույնը
-          min: Նվազագույնը
           step: Քայլը
         poll_public:
           label: Ցուցադրել քվեարկողներին
-        poll_options:
-          label: Մուտքագրեք հարցման մեկ տարբերակ յուրաքանչյուր տողում
         automatic_close:
           label: Ավտոմատ կերպով փակել հարցումը
diff --git a/plugins/poll/config/locales/client.id.yml b/plugins/poll/config/locales/client.id.yml
index d240208a53..433b9cd6db 100644
--- a/plugins/poll/config/locales/client.id.yml
+++ b/plugins/poll/config/locales/client.id.yml
@@ -12,6 +12,17 @@ id:
       total_votes:
         other: "jumlah suara"
       average_rating: "Rata-rata rating: <strong>%{average}</strong>."
+      results:
+        groups:
+          title: "Anda harus menjadi anggota %{groups} untuk memberikan suara dalam poll ini."
+        closed:
+          title: "Hasil akan ditampilkan setelah <strong>ditutup</strong>."
+        staff:
+          title: "Hasil hanya ditampilkan kepada anggota <strong>staf</strong>."
+      multiple:
+        help:
+          at_least_min_options:
+            other: "Pilih setidaknya <strong>%{count}</strong> opsi."
       cast-votes:
         title: "Gunakan suaramu"
         label: "Pilih sekarang!"
@@ -20,6 +31,10 @@ id:
         label: "Lihat hasil"
       hide-results:
         title: "Kembali ke suaramu"
+      group-results:
+        label: "Tampilkan rincian"
+      export-results:
+        label: "Ekspor"
       open:
         title: "Buka Polling"
         label: "Buka"
@@ -28,7 +43,27 @@ id:
         title: "Tutup polling"
         label: "Tutup"
         confirm: "Apakah Anda yakin ingin menutup akun ini?"
+      automatic_close:
+        closes_in: "Ditutup dalam <strong>%{timeLeft}</strong>"
+        age: "Ditutup <strong>%{age}</strong>"
+      breakdown:
+        title: "Hasil poll"
+        votes: "%{count} suara"
+        percentage: "Persentase"
+        count: "Jumlah"
       error_while_toggling_status: "Maaf, telah terjadi kesalahan pengalihan status dari pemilihan ini."
       ui_builder:
+        insert: Masukkan Poll
+        help:
+          options_min_count: Masukkan setidaknya 1 pilihan.
         poll_type:
           label: Tipe
+        poll_result:
+          always: Selalu terlihat
+          staff: Hanya staf
+        poll_public:
+          label: Tunjukkan siapa yang memilih
+        poll_title:
+          label: Judul (opsional)
+        automatic_close:
+          label: Tutup poll secara otomatis
diff --git a/plugins/poll/config/locales/client.it.yml b/plugins/poll/config/locales/client.it.yml
index d458216eab..46e9f93e83 100644
--- a/plugins/poll/config/locales/client.it.yml
+++ b/plugins/poll/config/locales/client.it.yml
@@ -77,7 +77,10 @@ it:
         title: Crea Sondaggio
         insert: Inserisci Sondaggio
         help:
-          options_count: Inserisci almeno 1 opzione
+          options_min_count: Inserisci almeno una opzione.
+          options_max_count: Inserisci al massimo %{count} opzioni.
+          invalid_min_value: Il valore minimo deve essere almeno 1.
+          invalid_max_value: Il valore massimo deve essere almeno 1, ma inferiore o uguale al numero di opzioni.
           invalid_values: Il valore minimo deve essere minore del valore massimo.
           min_step_value: Il valore minimo di un passo è 1
         poll_type:
@@ -86,26 +89,20 @@ it:
           multiple: Scelta Multipla
           number: Votazione Numerica
         poll_result:
-          label: Risultati
           always: Sempre visibile
-          vote: Al momento del voto
-          closed: Quando chiuso
           staff: Solo staff
-        poll_groups:
-          label: Gruppi ammessi
         poll_chart_type:
-          label: Tipo di grafico
           bar: Barra
           pie: Torta
         poll_config:
-          max: Massimo
-          min: Minimo
           step: Passo
         poll_public:
           label: Mostra i votanti
         poll_title:
           label: Titolo (facoltativo)
         poll_options:
-          label: Inserisci un'opzione di sondaggio per riga
+          add: Aggiungi opzione
         automatic_close:
           label: Chiudi sondaggio automaticamente
+        show_advanced: "Mostra Opzioni Avanzate"
+        hide_advanced: "Nascondi Opzioni Avanzate"
diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml
index 68f3bef126..177ad1a4a1 100644
--- a/plugins/poll/config/locales/client.ja.yml
+++ b/plugins/poll/config/locales/client.ja.yml
@@ -15,10 +15,23 @@ ja:
       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:
+            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: "投票する"
@@ -27,7 +40,12 @@ ja:
         label: "結果を表示"
       hide-results:
         title: "投票に戻る"
+        label: "投票を表示"
+      group-results:
+        title: "ユーザーフィールドごとに投票をグループ化"
+        label: "内訳を表示"
       export-results:
+        title: "投票結果をエクスポートする"
         label: "エクスポート"
       open:
         title: "投票をオープンする"
@@ -40,13 +58,20 @@ ja:
       automatic_close:
         closes_in: "<strong>%{timeLeft}</strong>でクローズ"
         age: "クローズ<strong>%{age}</strong>"
+      breakdown:
+        title: "投票結果"
+        breakdown: "内訳"
+        percentage: "割合"
+        count: "カウント"
       error_while_toggling_status: "申し訳ありませんが、この投票のステータスを切り替える際にエラーが発生しました。"
       error_while_casting_votes: "申し訳ありませんが、投票の際にエラーが発生しました。"
       error_while_fetching_voters: "申し訳ありませんが、有権者を表示する際にエラーが発生しました。"
+      error_while_exporting_results: "申し訳ありませんが、投票結果のエクスポート中にエラーが発生しました。"
       ui_builder:
         title: 投票を作成
         insert: 投票の挿入
         help:
+          options_min_count: 少なくとも1つのオプションを入力してください.
           invalid_values: 最小値は最大値より小さくなければなりません。
           min_step_value: 最小ステップ単位は 1 です
         poll_type:
@@ -55,17 +80,16 @@ ja:
           multiple: 複数選択
           number: 数字で評価
         poll_result:
-          label: 結果
           always: 常に表示する
-          vote: 投票したとき
-          closed: 投票をクローズしたとき
+          staff: スタッフのみ
+        poll_chart_type:
+          bar: バー
+          pie: パイ
         poll_config:
-          max: 最大
-          min: 最小
           step: 間隔
         poll_public:
           label: 誰が投票したか表示する
-        poll_options:
-          label: 1行ごとに1つの選択肢を入力します
+        poll_title:
+          label: タイトル (オプション)
         automatic_close:
           label: 投票を自動的に終了する
diff --git a/plugins/poll/config/locales/client.ko.yml b/plugins/poll/config/locales/client.ko.yml
index 4c164d8ed5..74b7e7827a 100644
--- a/plugins/poll/config/locales/client.ko.yml
+++ b/plugins/poll/config/locales/client.ko.yml
@@ -72,7 +72,10 @@ ko:
         title: 투표 만들기
         insert: 투표 삽입하기
         help:
-          options_count: 최소 1 개의 옵션을 입력하십시오
+          options_min_count: 옵션을 하나 이상 입력하세요.
+          options_max_count: '%{count}개의 옵션을 입력하십시오.'
+          invalid_min_value: 최소값은 1 이상이어야 합니다.
+          invalid_max_value: 최대값은 1 이상이어야 하지만 옵션 수보다 작거나 같아야 합니다.
           invalid_values: 최소값은 최대값보다는 작아야 합니다.
           min_step_value: 최소 단계 값은 1입니다.
         poll_type:
@@ -81,26 +84,29 @@ ko:
           multiple: 복수 선택
           number: 점수 매기기
         poll_result:
-          label: 검색 결과
+          label: 결과 표시...
           always: 항상 보이는
-          vote: 투표에
-          closed: 닫을 때
+          vote: 투표 후에 만
+          closed: 투표가 종료되었을 때
           staff: 직원 만
         poll_groups:
-          label: 허용 된 그룹
+          label: 이 그룹으로 투표 제한
         poll_chart_type:
-          label: 차트 종류
+          label: 결과 차트
           bar: 바
           pie: 그래프
         poll_config:
-          max: 최대
-          min: 최소
+          max: 최대 선택
+          min: 최소 선택
           step: 단계
         poll_public:
           label: 투표한 사람 보기
         poll_title:
           label: 제목 (선택 사항)
         poll_options:
-          label: 투표 선택지는 한줄에 하나씩 입력하세요
+          label: 옵션 (한 줄에 하나씩)
+          add: 옵션 추가
         automatic_close:
           label: 설문 조사 자동 종료
+        show_advanced: "고급 옵션 표시"
+        hide_advanced: "고급 옵션 숨기기"
diff --git a/plugins/poll/config/locales/client.lt.yml b/plugins/poll/config/locales/client.lt.yml
index 050fac2b23..7388517f2e 100644
--- a/plugins/poll/config/locales/client.lt.yml
+++ b/plugins/poll/config/locales/client.lt.yml
@@ -36,8 +36,8 @@ lt:
         title: "Uždaryti balsavimą"
         label: "Uždaryti"
         confirm: "Ar tikrai norite uždaryti šį balsavimą?"
+      breakdown:
+        count: "Skaičiuoti"
       ui_builder:
         poll_type:
           label: Tipas
-        poll_result:
-          label: Rezultatai
diff --git a/plugins/poll/config/locales/client.lv.yml b/plugins/poll/config/locales/client.lv.yml
index 67617f3bf4..7440a3fe39 100644
--- a/plugins/poll/config/locales/client.lv.yml
+++ b/plugins/poll/config/locales/client.lv.yml
@@ -22,3 +22,5 @@ lv:
       close:
         title: "Aizvērt aptauju"
         label: "Aizvērt"
+      breakdown:
+        count: "Skaits"
diff --git a/plugins/poll/config/locales/client.nb_NO.yml b/plugins/poll/config/locales/client.nb_NO.yml
index 5a99940f56..ffe4e94793 100644
--- a/plugins/poll/config/locales/client.nb_NO.yml
+++ b/plugins/poll/config/locales/client.nb_NO.yml
@@ -32,6 +32,8 @@ nb_NO:
         title: "Lukk avstemning"
         label: "Lukk"
         confirm: "Er du sikker på at du vil lukke avstemningen?"
+      breakdown:
+        count: "Antall"
       error_while_toggling_status: "Beklager, det oppstod en feil ved endring av status på denne avstemningen."
       error_while_casting_votes: "Beklager, det oppstod en feil da du ga din stemme."
       error_while_fetching_voters: "Beklager, det oppstod en feil når stemmegivere skulle vises."
@@ -46,15 +48,9 @@ nb_NO:
           regular: Et valg
           multiple: Flere valg
           number: Nummervurdering
-        poll_result:
-          label: Resultater
         poll_config:
-          max: Maksimum
-          min: Minimum
           step: Steg
         poll_public:
           label: Vis hvem som har stemt
-        poll_options:
-          label: Oppgi et valgalternativ for avstemning per linje
         automatic_close:
           label: Steng avstemningen automatisk
diff --git a/plugins/poll/config/locales/client.nl.yml b/plugins/poll/config/locales/client.nl.yml
index 202b0a0e9c..66199fa096 100644
--- a/plugins/poll/config/locales/client.nl.yml
+++ b/plugins/poll/config/locales/client.nl.yml
@@ -77,35 +77,41 @@ nl:
         title: Poll aanmaken
         insert: Poll invoegen
         help:
-          options_count: Voer minstens 1 optie in
+          options_min_count: Voer minimaal 1 optie in.
+          options_max_count: Voer maximaal %{count} opties in.
+          invalid_min_value: De minimumwaarde moet minimaal 1 zijn.
+          invalid_max_value: De maximale waarde moet minimaal 1 zijn, maar kleiner dan of gelijk aan het aantal opties.
           invalid_values: Minimale waarde moet kleiner zijn dan de maximale waarde.
-          min_step_value: De minimale waarde voor stap is 1
+          min_step_value: De minimale waarde voor een stap is 1
         poll_type:
           label: Type
           regular: Eén keuze
           multiple: Meerkeuze
           number: Numerieke beoordeling
         poll_result:
-          label: Resultaten
+          label: Resultaten tonen...
           always: Altijd zichtbaar
-          vote: Bij stemmen
-          closed: Wanneer gesloten
+          vote: Pas na stemming
+          closed: Wanneer de poll is gesloten
           staff: Alleen stafleden
         poll_groups:
-          label: Toegestane groepen
+          label: Beperk het stemmen tot deze groepen
         poll_chart_type:
-          label: Diagramtype
+          label: Resultaatgrafiek
           bar: Staaf
           pie: Cirkel
         poll_config:
-          max: Max
-          min: Min
+          max: Max. keuzes
+          min: Min. keuzes
           step: Stap
         poll_public:
           label: Tonen wie er heeft gestemd
         poll_title:
           label: Titel (optioneel)
         poll_options:
-          label: Voer één polloptie per regel in
+          label: Opties (één per regel)
+          add: Optie toevoegen
         automatic_close:
           label: Poll automatisch sluiten
+        show_advanced: "Geavanceerde opties tonen"
+        hide_advanced: "Geavanceerde opties verbergen"
diff --git a/plugins/poll/config/locales/client.pl_PL.yml b/plugins/poll/config/locales/client.pl_PL.yml
index 6fab6a8eb8..69b0eafb42 100644
--- a/plugins/poll/config/locales/client.pl_PL.yml
+++ b/plugins/poll/config/locales/client.pl_PL.yml
@@ -87,7 +87,9 @@ pl_PL:
         title: Zbuduj ankietę
         insert: Wstaw ankietę
         help:
-          options_count: Wpisz co najmniej 1 opcję
+          options_min_count: Wprowadź co najmniej 1 opcję.
+          options_max_count: Wprowadź co najwyżej %{count} opcji.
+          invalid_min_value: Minimalna wartość musi wynosić co najmniej 1.
           invalid_values: Wartość minimalna musi być mniejsza niż maksymalna.
           min_step_value: Minimalna wartość kroku to 1
         poll_type:
@@ -96,26 +98,27 @@ pl_PL:
           multiple: Wielokrotny wybór
           number: Liczba ocen
         poll_result:
-          label: Wyniki
+          label: Pokaż wyniki...
           always: Zawsze widoczna
-          vote: Po zagłosowaniu
-          closed: Po zamknięciu
+          vote: Dopiero po głosowaniu
+          closed: Kiedy ankieta jest zamknięta
           staff: Wyłącznie dla zespołu
         poll_groups:
-          label: Dozwolone grupy
+          label: Ogranicz głosowanie do tych grup
         poll_chart_type:
-          label: Typ wykresu
+          label: Wykres wyników
           bar: Pasek
           pie: Ciasto
         poll_config:
-          max: Max
-          min: Min
           step: Krok
         poll_public:
           label: Pokaż kto głosował
         poll_title:
           label: Tytuł (opcjonalnie)
         poll_options:
-          label: Wprowadź jedną opcję ankiety w jednej linii
+          label: Opcje (jedna na wiersz)
+          add: Dodaj opcję
         automatic_close:
           label: Automatycznie zamknij ankietę
+        show_advanced: "Pokaż opcje zaawansowane"
+        hide_advanced: "Ukryj opcje zaawansowane"
diff --git a/plugins/poll/config/locales/client.pt.yml b/plugins/poll/config/locales/client.pt.yml
index 0cf7641f18..4a69be2881 100644
--- a/plugins/poll/config/locales/client.pt.yml
+++ b/plugins/poll/config/locales/client.pt.yml
@@ -16,6 +16,15 @@ pt:
       average_rating: "Classificação média: <strong>%{average}</strong>."
       public:
         title: "Os votos são <strong>públicos</strong>."
+      results:
+        groups:
+          title: "Precisa de ser um membro de %{groups} para votar nesta sondagem."
+        vote:
+          title: "Os resultados serão mostrados após o <strong>voto</strong>."
+        closed:
+          title: "Os resultados serão mostrados após o <strong>fecho</strong>."
+        staff:
+          title: "Os resultados serão apenas mostrados aos membros do <strong>pessoal</strong>."
       multiple:
         help:
           at_least_min_options:
@@ -39,7 +48,9 @@ pt:
         label: "Mostrar voto"
       group-results:
         title: "Agrupar votos por campo de utilizador"
+        label: "Mostrar detalhes"
       export-results:
+        title: "Exportar os resultados da sondagem"
         label: "Exportar"
       open:
         title: "Abrir a sondagem"
@@ -49,14 +60,24 @@ pt:
         title: "Fechar a sondagem"
         label: "Fechar"
         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: "Desculpe, ocorreu um erro ao exibir os votantes."
+      automatic_close:
+        closes_in: "Fecha em <strong>%{timeLeft}</strong>."
+        age: "Fechou <strong>%{age}</strong>"
+      breakdown:
+        title: "Resultados da sondagem"
+        votes: "%{count} votos"
+        breakdown: "Detalhe"
+        percentage: "Percentagem"
+        count: "Soma"
+      error_while_toggling_status: "Lamentamos, mas ocorreu um erro ao alternar o estado desta sondagem."
+      error_while_casting_votes: "Lamentamos, mas ocorreu um erro ao submeter os seus votos."
+      error_while_fetching_voters: "Lamentamos, mas ocorreu um erro ao exibir os votantes."
+      error_while_exporting_results: "Lamentamos, mas ocorreu um erro ao exportar os resultados da sondagem."
       ui_builder:
         title: Criar Sondagem
         insert: Inserir Sondagem
         help:
-          options_count: Insira pelo menos uma opção
+          options_min_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:
@@ -65,12 +86,18 @@ pt:
           multiple: Escolha Múltipla
           number: Classificação Numérica
         poll_result:
-          label: Resultados
+          always: Sempre visível
+          staff: Apenas Pessoal
+        poll_chart_type:
+          bar: Barras
+          pie: Circular
         poll_config:
-          max: Máximo
-          min: Mínimo
           step: Passo
         poll_public:
           label: Mostrar quem votou
-        poll_options:
-          label: Insira uma opção de sondagem por linha
+        poll_title:
+          label: Título (opcional)
+        automatic_close:
+          label: Fechar sondagem automaticamente
+        show_advanced: "Mostrar Opções Avançadas"
+        hide_advanced: "Ocultar Opções Avançadas"
diff --git a/plugins/poll/config/locales/client.pt_BR.yml b/plugins/poll/config/locales/client.pt_BR.yml
index f901acdf52..cfb8032e0d 100644
--- a/plugins/poll/config/locales/client.pt_BR.yml
+++ b/plugins/poll/config/locales/client.pt_BR.yml
@@ -51,6 +51,8 @@ pt_BR:
       automatic_close:
         closes_in: "Fecha em <strong>%{timeLeft}</strong>."
         age: "Fechou <strong>%{age}</strong>"
+      breakdown:
+        count: "Contagem"
       error_while_toggling_status: "Desculpe, houve um erro ao mudar a situação desta votação."
       error_while_casting_votes: "Desculpe, houve um erro ao registrar os seus votos."
       error_while_fetching_voters: "Desculpe, houve um erro ao mostrar os votantes."
@@ -59,7 +61,10 @@ pt_BR:
         title: Criar Votação
         insert: Inserir Votação
         help:
-          options_count: Insira pelo menos 1 opção
+          options_min_count: Insira pelo menos 1 opção.
+          options_max_count: Insira no máximo %{count} opções.
+          invalid_min_value: Valor mínimo deve ser pelo menos 1.
+          invalid_max_value: Valor máximo deve ser pelo menos 1, mas menor ou igual ao número de opções.
           invalid_values: O valor mínimo precisa ser menor que o valor máximo.
           min_step_value: O valor mínimo de intervalo é 1
         poll_type:
@@ -68,24 +73,14 @@ pt_BR:
           multiple: Múltipla Escolha
           number: Classificação Numérica
         poll_result:
-          label: Resultados
           always: Sempre visível
-          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
           step: Intervalo
         poll_public:
           label: Exibir quem votou
-        poll_options:
-          label: Insira uma opção para voto por linha
         automatic_close:
           label: Fechar automaticamente a votação
diff --git a/plugins/poll/config/locales/client.ro.yml b/plugins/poll/config/locales/client.ro.yml
index 516470ba2a..3988603e73 100644
--- a/plugins/poll/config/locales/client.ro.yml
+++ b/plugins/poll/config/locales/client.ro.yml
@@ -27,6 +27,9 @@ ro:
           title: "Rezultatele vor fi afișate odată cu închiderea <strong>votului</strong>."
         staff:
           title: "Rezultatele sunt afișate numai pentru <strong>membrii personalului</strong>."
+      multiple:
+        help:
+          between_min_and_max_options: "Alege între <strong>%{min}</strong> și <strong>%{max}</strong> opțiuni."
       cast-votes:
         title: "Exprimă-ți votul"
         label: "Votează acum!"
@@ -35,7 +38,9 @@ ro:
         label: "Afișează rezultate"
       hide-results:
         title: "Înapoi la voturile tale"
+        label: "Arată votul"
       export-results:
+        title: "Exportează rezultatele sondajului"
         label: "Exportă"
       open:
         title: "Deschide sondajul"
@@ -45,13 +50,23 @@ ro:
         title: "Închide sondajul"
         label: "Închide sondajul"
         confirm: "Ești sigur că vrei să închizi acest sondaj?"
+      automatic_close:
+        closes_in: "Se închide în <strong>%{timeLeft}</strong>."
+        age: "Închis <strong>%{age}</strong>"
+      breakdown:
+        title: "Rezultatele sondajului"
+        votes: "%{count} voturi"
+        percentage: "Procent"
+        count: "Număr"
       error_while_toggling_status: "Ne pare rău, a apărut o eroare la schimbarea stării acestui sondaj."
       error_while_casting_votes: "Ne pare rău, a apărut o eroare la exercitarea voturilor tale."
       error_while_fetching_voters: "Ne pare rău, a apărut o eroare la afișarea votanților."
+      error_while_exporting_results: "Ne pare rău, a apărut o eroare la exportarea rezultatelor sondajului."
       ui_builder:
         title: Creează sondaj
         insert: Introdu sondaj
         help:
+          options_min_count: Introduceți cel puțin o opțiune.
           invalid_values: Valoarea minimă trebuie să fie mai mică decât valoarea maximă.
           min_step_value: Valoarea minimă a pasului este 1
         poll_type:
@@ -60,16 +75,12 @@ ro:
           multiple: Opțiune multiplă
           number: Ordonare numerică
         poll_result:
-          label: Rezultate
+          always: Întotdeauna vizibil
         poll_config:
-          max: Maxim
-          min: Minim
           step: Pas
         poll_public:
           label: Arată cine a votat
         poll_title:
           label: Titlu (opţional)
-        poll_options:
-          label: Arată o singură opțiune de sondaj pe linie
         automatic_close:
           label: Închide sondaj automat
diff --git a/plugins/poll/config/locales/client.ru.yml b/plugins/poll/config/locales/client.ru.yml
index 45650ce67d..2abda8b8ef 100644
--- a/plugins/poll/config/locales/client.ru.yml
+++ b/plugins/poll/config/locales/client.ru.yml
@@ -52,7 +52,7 @@ ru:
         label: "Проголосовать!"
       show-results:
         title: "Показать результаты опроса"
-        label: "Показать результаты"
+        label: "Показывать результаты"
       hide-results:
         title: "Вернуться к опросу"
         label: "Показать голосование"
@@ -87,7 +87,10 @@ ru:
         title: Создать опрос
         insert: Вставить опрос в сообщение
         help:
-          options_count: Введите хотя бы 1 вариант
+          options_min_count: Введите хотя бы 1 вариант.
+          options_max_count: Введите не более %{count} вариантов.
+          invalid_min_value: Минимальное значение должно быть не менее 1.
+          invalid_max_value: Максимальное значение должно быть не менее 1, но меньше или равно количеству вариантов.
           invalid_values: Минимальное значение должно быть меньше максимального значения.
           min_step_value: Минимальное значение шага = 1
         poll_type:
@@ -96,26 +99,29 @@ ru:
           multiple: Выбор нескольких вариантов из списка
           number: Шкала из чисел
         poll_result:
-          label: Результаты
-          always: Показывать всегда
-          vote: При голосовании
-          closed: При закрытии
+          label: Показывать результаты...
+          always: Всегда
+          vote: После голосования
+          closed: После закрытия опроса
           staff: Только для персонала
         poll_groups:
-          label: Разрешённые группы
+          label: Ограничить голосование этими группами
         poll_chart_type:
-          label: Тип диаграммы
+          label: Таблица результатов
           bar: Гистограмма
           pie: Круговая
         poll_config:
-          max: Макс.
-          min: Мин.
+          max: Минимальный выбор
+          min: Максимальный выбор
           step: Шаг
         poll_public:
-          label: Показывать проголосовавших (не отмечайте, чтобы голосование было анонимным)
+          label: Показывать проголосовавших (не отмечайте, если голосование анонимное)
         poll_title:
           label: Заголовок (необязательно)
         poll_options:
-          label: Введите варианты ответа, по одному в строке
+          label: Варианты (по одному на строку)
+          add: Добавить вариант
         automatic_close:
           label: Автоматически закрыть опрос
+        show_advanced: "Показать дополнительные параметры"
+        hide_advanced: "Скрыть дополнительные параметры"
diff --git a/plugins/poll/config/locales/client.sk.yml b/plugins/poll/config/locales/client.sk.yml
index 8d094d04e0..70ea07f913 100644
--- a/plugins/poll/config/locales/client.sk.yml
+++ b/plugins/poll/config/locales/client.sk.yml
@@ -50,15 +50,9 @@ sk:
           regular: Jedna možnosť
           multiple: Viacero možností
           number: Číselné hodnotenie
-        poll_result:
-          label: Výsledky
         poll_config:
-          max: Max
-          min: Min
           step: Krok
         poll_public:
           label: Ukázať kto hlasoval
-        poll_options:
-          label: Zadajte každú možnosť voľby do nového riadka
         automatic_close:
           label: Automaticky zatvoriť hlasovanie
diff --git a/plugins/poll/config/locales/client.sl.yml b/plugins/poll/config/locales/client.sl.yml
index d17cc53c1a..98ebc99a4b 100644
--- a/plugins/poll/config/locales/client.sl.yml
+++ b/plugins/poll/config/locales/client.sl.yml
@@ -87,7 +87,7 @@ sl:
         title: Ustvari anketo
         insert: Vstavi anketo
         help:
-          options_count: Vnesite vsaj eno možnost
+          options_min_count: Vnesite vsaj eno možnost.
           invalid_values: Najmanjša vrednost mora biti manjša od največje vrednosti.
           min_step_value: Najmanjša vrednost koraka je 1.
         poll_type:
@@ -96,24 +96,15 @@ sl:
           multiple: Več odgovorov
           number: Številčna ocena
         poll_result:
-          label: Rezultati
           always: Vedno vidni
-          vote: Po glasovanju
-          closed: Ko se zapre
           staff: Samo osebje
-        poll_groups:
-          label: Dovoljene skupine
         poll_chart_type:
-          label: Vrsta grafikona
           bar: Stolpični
           pie: Tortni
         poll_config:
-          max: Največ
-          min: Najmanj
           step: Korak
         poll_public:
           label: Pokaži glasovalce
-        poll_options:
-          label: Vnesi en glasovalno opcijo na vrstico
         automatic_close:
           label: Samodejno zapri anketo
+        show_advanced: "Pokaži dodatne možnosti"
diff --git a/plugins/poll/config/locales/client.sq.yml b/plugins/poll/config/locales/client.sq.yml
index 6365625ac5..f19f236f12 100644
--- a/plugins/poll/config/locales/client.sq.yml
+++ b/plugins/poll/config/locales/client.sq.yml
@@ -43,13 +43,7 @@ sq:
           regular: Pa Alternativa
           multiple: Me Alternativa
           number: Vlerësim Numrash
-        poll_result:
-          label: Results
         poll_config:
-          max: Maksimumi
-          min: Minimumi
           step: Hapi
         poll_public:
           label: Shfaq votuesit
-        poll_options:
-          label: Shto një alternativë për çdo rresht
diff --git a/plugins/poll/config/locales/client.sr.yml b/plugins/poll/config/locales/client.sr.yml
index 2e185053fc..00e0420d2a 100644
--- a/plugins/poll/config/locales/client.sr.yml
+++ b/plugins/poll/config/locales/client.sr.yml
@@ -7,8 +7,100 @@
 sr:
   js:
     poll:
+      voters:
+        one: "glasač"
+        few: "glasača"
+        other: "glasača"
+      total_votes:
+        one: "ukupno glasova"
+        few: "ukupno glasova"
+        other: "ukupno glasova"
       average_rating: "Prosečan rejting: <strong>%{average}</strong>."
+      public:
+        title: "Glasovi su <strong>javni</strong>."
+      results:
+        groups:
+          title: "Morate biti član grupe %{groups} da biste glasali u ovoj anketi."
+        vote:
+          title: "Rezultati će biti prikazani nakon <strong>glasanja</strong>."
+        closed:
+          title: "Rezultati će biti prikazani nakon <strong>zatvaranja</strong>."
+        staff:
+          title: "Rezultati će biti prikazani samo članovima <strong>osoblja</strong> ."
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Odaberite najmanje <strong>%{count}</strong> opciju."
+            few: "Odaberite najmanje <strong>%{count}</strong> opcije."
+            other: "Odaberite najmanje <strong>%{count}</strong> opcija."
+          up_to_max_options:
+            one: "Odaberite najviše <strong>%{count}</strong> opciju."
+            few: "Odaberite najviše <strong>%{count}</strong> opcije."
+            other: "Odaberite najviše <strong>%{count}</strong> opcija."
+          x_options:
+            one: "Odaberite <strong>%{count}</strong> opciju."
+            few: "Odaberite <strong>%{count}</strong> opcije."
+            other: "Odaberite <strong>%{count}</strong> opcija."
+          between_min_and_max_options: "Odaberite između <strong>%{min}</strong> i <strong>%{max}</strong> opcije."
+      cast-votes:
+        title: "Daj svoj glas"
+        label: "Glasaj sada!"
+      show-results:
+        title: "Prikaži rezultate ankete"
+        label: "Prikaži rezultate"
+      hide-results:
+        title: "Nazad ka vašim glasovima"
+        label: "Prikaži glas"
+      group-results:
+        title: "Grupiraj glasove prema korisničkom polju"
+        label: "Prikaži raspodelu"
       export-results:
+        title: "Izvezi rezultate ankete"
         label: "Izvoz"
+      open:
+        title: "Otvori anketu"
+        label: "Otvori"
+        confirm: "Da li ste sigurni da želite da otvorite ovu anketu?"
       close:
+        title: "Zatvori anketu"
         label: "Zatvori"
+        confirm: "Da li ste sigurni da želite da zatvorite ovu anketu?"
+      automatic_close:
+        closes_in: "Zatvara se za <strong>%{timeLeft}</strong>."
+        age: "Zatvoreno <strong>%{age}</strong>"
+      breakdown:
+        title: "Rezultati ankete"
+        votes: "%{count} glasova"
+        breakdown: "Detalji"
+        percentage: "Procenat"
+        count: "Broj"
+      error_while_toggling_status: "Žao nam je, došlo je do greške pri prikazivanju statusa ove ankete."
+      error_while_casting_votes: "Žao nam je, došlo je do greške prilikom glasanja."
+      error_while_fetching_voters: "Žao nam je, došlo je do greške prilikom prikazivanja glasača."
+      error_while_exporting_results: "Žao nam je, došlo je do greške prilikom izvoza rezultata ankete."
+      ui_builder:
+        title: Napravi anketu
+        insert: Unesi anketu
+        help:
+          options_min_count: Unesite najmanje 1 opciju.
+          invalid_values: Minimalna vrednost mora biti manja od maksimalne.
+          min_step_value: Minimalna vrednost koraka je 1
+        poll_type:
+          label: Tip
+          regular: Jedan odabir
+          multiple: Višestruki odabir
+          number: Broj rejtinga
+        poll_result:
+          always: Uvek vidljivi
+          staff: Samo članovi osoblja
+        poll_chart_type:
+          bar: Dijagram
+          pie: Strukturni krug
+        poll_config:
+          step: Korak
+        poll_public:
+          label: Prikaži ko je glasao
+        poll_title:
+          label: Naslov (opcionalno)
+        automatic_close:
+          label: Automatski zatvorite anketu
diff --git a/plugins/poll/config/locales/client.sv.yml b/plugins/poll/config/locales/client.sv.yml
index 57763ed504..d7b1b6e0fd 100644
--- a/plugins/poll/config/locales/client.sv.yml
+++ b/plugins/poll/config/locales/client.sv.yml
@@ -77,7 +77,10 @@ sv:
         title: Skapa omröstning
         insert: Lägg till omröstning
         help:
-          options_count: Ange minst 1 alternativ
+          options_min_count: Ange minst ett alternativ.
+          options_max_count: Ange högst %{count} alternativ.
+          invalid_min_value: Minsta värde måste vara minst 1.
+          invalid_max_value: Maximalt värde måste vara minst 1, men mindre än eller lika med antalet alternativ.
           invalid_values: Minimivärde måste vara mindre än det maximala värdet.
           min_step_value: Minsta stegintervall är 1
         poll_type:
@@ -86,26 +89,29 @@ sv:
           multiple: Flera val
           number: Sifferbetyg
         poll_result:
-          label: Resultat
+          label: Visa resultat...
           always: Alltid synlig
-          vote: Vid röstning
-          closed: När stängd
+          vote: Endast efter omröstning
+          closed: När omröstningen är stängd
           staff: Endast personal
         poll_groups:
-          label: Tillåtna grupper
+          label: Begränsa röstning till dessa grupper
         poll_chart_type:
-          label: Diagramtyp
+          label: Resultatdiagram
           bar: Stapel
           pie: Cirkel
         poll_config:
-          max: Max
-          min: Min
+          max: Max antal val
+          min: Minsta antal val
           step: Steg
         poll_public:
           label: Visa vem som röstat
         poll_title:
           label: Titel (valfritt)
         poll_options:
-          label: Ange ett omröstningsalternativ per rad
+          label: Alternativ (ett per rad)
+          add: Lägg till alternativ
         automatic_close:
           label: Stäng omröstning automatiskt
+        show_advanced: "Visa avancerade alternativ"
+        hide_advanced: "Dölj avancerade alternativ"
diff --git a/plugins/poll/config/locales/client.sw.yml b/plugins/poll/config/locales/client.sw.yml
index 94e18620a8..fb58f18219 100644
--- a/plugins/poll/config/locales/client.sw.yml
+++ b/plugins/poll/config/locales/client.sw.yml
@@ -48,15 +48,9 @@ sw:
           regular: Chaguo Moja
           multiple: Machaguo Mengi
           number: Thaminisha kwa kutumia namba
-        poll_result:
-          label: Majibu
         poll_config:
-          max: Kiwango cha juu
-          min: Kiwango cha chini
           step: Hatua
         poll_public:
           label: Onyesha waliopiga kura
-        poll_options:
-          label: Weka chaguo moja kwa kila mstari
         automatic_close:
           label: funga maoni moja kwa moja
diff --git a/plugins/poll/config/locales/client.te.yml b/plugins/poll/config/locales/client.te.yml
index b21b84f6e8..e2ab9eafb5 100644
--- a/plugins/poll/config/locales/client.te.yml
+++ b/plugins/poll/config/locales/client.te.yml
@@ -14,5 +14,3 @@ te:
       ui_builder:
         poll_type:
           label: రకం
-        poll_result:
-          label: ఫలితాలు
diff --git a/plugins/poll/config/locales/client.th.yml b/plugins/poll/config/locales/client.th.yml
index 255390728e..7366f254db 100644
--- a/plugins/poll/config/locales/client.th.yml
+++ b/plugins/poll/config/locales/client.th.yml
@@ -42,5 +42,3 @@ th:
           label: ชนิด
         poll_public:
           label: แสดงรายชื่อผู้โหวต
-        poll_options:
-          label: ใส่ตัวเลือกบรรทัดละ 1 ตัวเลือก
diff --git a/plugins/poll/config/locales/client.tr_TR.yml b/plugins/poll/config/locales/client.tr_TR.yml
index 73980db671..0b36aa7243 100644
--- a/plugins/poll/config/locales/client.tr_TR.yml
+++ b/plugins/poll/config/locales/client.tr_TR.yml
@@ -51,6 +51,11 @@ tr_TR:
       automatic_close:
         closes_in: "Kapatılmasına zaman <strong>%{timeLeft}</strong>"
         age: "<strong>%{age}</strong> kapanmış."
+      breakdown:
+        title: "Anket sonuçları"
+        votes: "%{count} oy"
+        percentage: "Yüzde"
+        count: "say"
       error_while_toggling_status: "Üzgünüz, anket durumunu değiştirme sırasında hata meydana geldi."
       error_while_casting_votes: "Üzgünüz, oylarınızı dönüştürme sırasında hata meydana geldi."
       error_while_fetching_voters: "Üzgünüz, oy verenleri görüntüleme sırasında hata meydana geldi"
@@ -59,7 +64,10 @@ tr_TR:
         title: Anket Oluştur
         insert: Anket Ekle
         help:
-          options_count: En az 1 seçenek girin
+          options_min_count: En az 1 seçenek girin.
+          options_max_count: En fazla %{count} seçenek girin.
+          invalid_min_value: Minimum değer en az 1 olmalıdır.
+          invalid_max_value: Maksimum değer en az 1 olmalı, ancak seçeneklerin sayısından küçük veya ona eşit olmalıdır.
           invalid_values: Minimum değer maksimum değerden küçük olmalıdır.
           min_step_value: Minimum adım değeri 1
         poll_type:
@@ -68,22 +76,17 @@ tr_TR:
           multiple: Çoklu Seçim
           number: Sayısal Değerlendirme
         poll_result:
-          label: Sonuçlar
           always: Her zaman görünür
-          vote: Oylamada
-          closed: Kapatıldığında
           staff: Yalnızca moderatörler
-        poll_groups:
-          label: İzin verilen gruplar
-        poll_chart_type:
-          label: Grafik tipi
         poll_config:
-          max: En fazla
-          min: En az
           step: Aralık
         poll_public:
           label: Kimlerin oy verdiğini göster
+        poll_title:
+          label: Başlık (isteğe bağlı)
         poll_options:
-          label: Her satıra bir anket seçeneği girin
+          add: Seçenek ekle
         automatic_close:
           label: Seçimi otomatik olarak kapat
+        show_advanced: "Gelişmiş Seçenekleri Göster"
+        hide_advanced: "Gelişmiş Seçenekleri Gizle"
diff --git a/plugins/poll/config/locales/client.uk.yml b/plugins/poll/config/locales/client.uk.yml
index dedc52ba7d..bd6b9ae895 100644
--- a/plugins/poll/config/locales/client.uk.yml
+++ b/plugins/poll/config/locales/client.uk.yml
@@ -87,7 +87,7 @@ uk:
         title: Створити опитування
         insert: Вставити опитування
         help:
-          options_count: Введіть принаймні 1 варіант
+          options_min_count: Введіть принаймні 1 варіант.
           invalid_values: Мінімальне значення має бути меншим, ніж максимальне.
           min_step_value: Мінімальне значення кроку 1
         poll_type:
@@ -96,26 +96,18 @@ uk:
           multiple: Широкий вибір
           number: Рейтинг в цифрах
         poll_result:
-          label: Результати
           always: Завжди видно
-          vote: На голосування
-          closed: Коли закрито
           staff: Для персоналу тільки
-        poll_groups:
-          label: Дозволені групи
         poll_chart_type:
-          label: Тип діаграми
           bar: Гістограма
           pie: Кругова
         poll_config:
-          max: Макс
-          min: Мін
           step: Крок
         poll_public:
           label: Покажіть, хто проголосував
         poll_title:
           label: Заголовок (необов'язково)
-        poll_options:
-          label: Введіть один варіант опитування на рядок
         automatic_close:
           label: Автоматично закрити опитування
+        show_advanced: "Показати додаткові параметри"
+        hide_advanced: "Сховати додаткові параметри"
diff --git a/plugins/poll/config/locales/client.ur.yml b/plugins/poll/config/locales/client.ur.yml
index 937c277e23..926f164291 100644
--- a/plugins/poll/config/locales/client.ur.yml
+++ b/plugins/poll/config/locales/client.ur.yml
@@ -44,6 +44,8 @@ ur:
       automatic_close:
         closes_in: "بند ہو جائیگا <strong>%{timeLeft}</strong> میں۔"
         age: "بند <strong>%{age}</strong>"
+      breakdown:
+        count: "شمار"
       error_while_toggling_status: "معذرت، اِس پول کا سٹیٹس تبدیل کرتے وقت ایک تکنیکی خرابی کا سامنا کرنا پڑا۔"
       error_while_casting_votes: "معذرت، آپ کا ووٹ ڈالتے وقت ایک تکنیکی خرابی کا سامنا کرنا پڑا"
       error_while_fetching_voters: "معذرت، ووٹرز کو دکھاتے وقت ایک تکنیکی خرابی کا سامنا کرنا پڑا"
@@ -59,18 +61,11 @@ ur:
           multiple: ایک سے زیادہ انتخاب
           number: نمبر کی درجہ بندی
         poll_result:
-          label: نتائج
           always: ہمیشہ نظر آتا ہے
-          vote: ووٹ پر
-          closed: بند کر دیا جب
           staff: صرف سٹاف کیلئے
         poll_config:
-          max: زیادہ سے زیادہ
-          min: کم از کم
           step: قدم
         poll_public:
           label: دکھایں جنہوں نے ووٹ دیا
-        poll_options:
-          label: فی سطر پول کی ہر ایک آپشن درج کریں
         automatic_close:
           label: خود کار طریقے سے پَول بند کریں
diff --git a/plugins/poll/config/locales/client.vi.yml b/plugins/poll/config/locales/client.vi.yml
index e5e3744525..0ee3ae8408 100644
--- a/plugins/poll/config/locales/client.vi.yml
+++ b/plugins/poll/config/locales/client.vi.yml
@@ -40,6 +40,8 @@ vi:
         title: "Đóng thăm dò"
         label: "Đóng"
         confirm: "Bạn có muốn đóng thăm dò này ?"
+      breakdown:
+        count: "Đếm"
       error_while_toggling_status: "Đã có lỗi xảy ra khi chuyển trạng thái của thăm dò."
       error_while_casting_votes: "Đã có lỗi xảy ra làm ảnh hưởng đến bình chọn của bạn."
       error_while_fetching_voters: "Đã có lỗi xảy ra khi hiển thị những người tham gia bình chọn."
@@ -54,13 +56,7 @@ vi:
           regular: Một lựa chọn
           multiple: Nhiều lựa chọn
           number: Xếp hạng
-        poll_result:
-          label: Kết quả
         poll_config:
-          max: Tối đa
-          min: Tối thiểu
           step: Bước
         poll_public:
           label: Hiển thị người đã bình chọn
-        poll_options:
-          label: Nhập mỗi lựa chọn trong thăm dò vào một dòng
diff --git a/plugins/poll/config/locales/client.zh_CN.yml b/plugins/poll/config/locales/client.zh_CN.yml
index 4b57735507..33848eeb00 100644
--- a/plugins/poll/config/locales/client.zh_CN.yml
+++ b/plugins/poll/config/locales/client.zh_CN.yml
@@ -72,7 +72,10 @@ zh_CN:
         title: 创建投票
         insert: 插入投票
         help:
-          options_count: 至少输入1个选项
+          options_min_count: 输入至少 1 个选项。
+          options_max_count: 最多输入 %{count} 个选项。
+          invalid_min_value: 最小值必须至少为1。
+          invalid_max_value: 最大值必须至少是1，但小于或等于选项的数量。
           invalid_values: 最小值必须小于最大值。
           min_step_value: 最小步长为1
         poll_type:
@@ -81,26 +84,29 @@ zh_CN:
           multiple: 多选
           number: 评分
         poll_result:
-          label: 结果
+          label: 显示结果...
           always: 总是可见
-          vote: 投票
-          closed: 关闭时
+          vote: 只在投票后
+          closed: 当投票被关闭
           staff: 仅管理人员
         poll_groups:
-          label: 允许的群组
+          label: 限制这些群组的投票
         poll_chart_type:
-          label: 图表类型
+          label: 结果图表
           bar: 条形
           pie: 饼状
         poll_config:
-          max: 最大
-          min: 最小
+          max: 最大选择
+          min: 最小选择
           step: 梯级
         poll_public:
           label: 显示投票人
         poll_title:
           label: 标题(可选)
         poll_options:
-          label: 每行输入一个调查选项
+          label: 选项(每行一个)
+          add: 添加选项
         automatic_close:
           label: 自动关闭投票
+        show_advanced: "显示高级选项"
+        hide_advanced: "隐藏高级选项"
diff --git a/plugins/poll/config/locales/client.zh_TW.yml b/plugins/poll/config/locales/client.zh_TW.yml
index 3237817317..fad08d802f 100644
--- a/plugins/poll/config/locales/client.zh_TW.yml
+++ b/plugins/poll/config/locales/client.zh_TW.yml
@@ -30,6 +30,8 @@ zh_TW:
         title: "關閉投票"
         label: "關閉"
         confirm: "你確定要關閉這個投票？"
+      breakdown:
+        count: "次數"
       error_while_toggling_status: "對不起，改變投票狀態時出錯了。"
       error_while_casting_votes: "對不起，投票時出錯了。"
       error_while_fetching_voters: "對不起，顯示投票者時出錯了。"
@@ -44,13 +46,7 @@ zh_TW:
           regular: 單選
           multiple: 多選
           number: 評分
-        poll_result:
-          label: 結果
         poll_config:
-          max: 最大
-          min: 最小
           step: 梯級
         poll_public:
           label: 顯示投票人
-        poll_options:
-          label: 每行輸入一個調查選項
diff --git a/plugins/poll/config/locales/server.da.yml b/plugins/poll/config/locales/server.da.yml
index db50de656c..2a55fbe85a 100644
--- a/plugins/poll/config/locales/server.da.yml
+++ b/plugins/poll/config/locales/server.da.yml
@@ -10,11 +10,15 @@ da:
     poll_maximum_options: "Maksimalt antal valgmuligheder i en afstemning."
     poll_edit_window_mins: "Antal af minutter efter oprettelse af et indlæg hvor en afstemning kan redigeres."
     poll_minimum_trust_level_to_create: "Definer det minimale tillidsniveau, der er nødvendigt for at oprette afstemninger."
+    poll_groupable_user_fields: "Et sæt brugerfeltnavne, der kan bruges til at gruppere og filtrere afstemningsresultater."
+    poll_export_data_explorer_query_id: "ID for Data Explorer-forespørgsel, der skal bruges til at eksportere afstemningsresultater (0 for at deaktivere)."
   poll:
     poll: "afstemning"
     invalid_argument: "Ugyldig værdi '%{value}' for argument '%{argument}'."
     multiple_polls_without_name: "Der er flere afstemninger uden navn. Brug attributten '<code>name</code>' for at identificere dine afstemninger."
     multiple_polls_with_same_name: "Der er flere afstemninger med samme navn <strong>%{name}</strong>. Brug attributten '<code>name</code>' for at identificere dine afstemninger."
+    default_poll_must_have_at_least_1_option: "Afstemningen skal have mindst 1 mulighed."
+    named_poll_must_have_at_least_1_option: "Afstemningen navngivet <strong>%{name}</strong> skal have mindst 1 valgmulighed."
     default_poll_must_have_less_options:
       one: "Afstemningen må ikke have nogen muligheder."
       other: "Afstemningen skal have mindre end %{max} muligheder."
@@ -23,6 +27,8 @@ da:
       other: "Afstemningen <strong>%{name}</strong> skal have mindre end %{max} valgmuligheder."
     default_poll_must_have_different_options: "Afstemningen skal have forskellige muligheder."
     named_poll_must_have_different_options: "Afstemningen <strong>%{name}</strong> skal have forskellige valgmuligheder."
+    default_poll_must_not_have_any_empty_options: "Afstemningen må ikke have nogen tomme valgmuligheder."
+    named_poll_must_not_have_any_empty_options: "Afstemningen med navnet <strong>%{name}</strong> må ikke have nogen tomme valgmuligheder."
     default_poll_with_multiple_choices_has_invalid_parameters: "Afstemning med flere valgmuligheder har ugyldige parametre."
     named_poll_with_multiple_choices_has_invalid_parameters: "Afstemningen <strong>%{name}</strong> med flere valgmuligheder har ugyldige parametre."
     requires_at_least_1_valid_option: "Du skal vælge mindst 1 gyldig mulighed."
@@ -39,3 +45,5 @@ da:
     insufficient_rights_to_create: "Du kan ikke oprette afstemninger."
     email:
       link_to_poll: "Klik for at se afstemningen."
+    user_field:
+      no_data: "Ingen data"
diff --git a/plugins/poll/config/locales/server.de.yml b/plugins/poll/config/locales/server.de.yml
index 641cf11323..d89392eacc 100644
--- a/plugins/poll/config/locales/server.de.yml
+++ b/plugins/poll/config/locales/server.de.yml
@@ -9,7 +9,7 @@ de:
     poll_enabled: "Umfragen erlauben?"
     poll_maximum_options: "Maximale Anzahl der in einer Umfrage erlaubten Optionen."
     poll_edit_window_mins: "Anzahl Minuten nach der Erstellung eines Beitrags, in denen Umfragen bearbeitet werden können."
-    poll_minimum_trust_level_to_create: "Erforderliche Vertrauensstufe, um Umfragen zu erstellen. "
+    poll_minimum_trust_level_to_create: "Erforderliche Vertrauensstufe, um Umfragen zu erstellen."
     poll_groupable_user_fields: "Eine Reihe von Benutzerfeldern, die verwendet werden können, um Ergebnisse zu gruppieren und zu filtern."
     poll_export_data_explorer_query_id: "ID der Datenexplorer-Abfrage, die zum Exportieren von Umfrageergebnissen verwendet werden soll (0 zum Deaktivieren)."
   poll:
diff --git a/plugins/poll/config/locales/server.en_GB.yml b/plugins/poll/config/locales/server.en_GB.yml
new file mode 100644
index 0000000000..4cfc5eeecd
--- /dev/null
+++ b/plugins/poll/config/locales/server.en_GB.yml
@@ -0,0 +1,9 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
+  site_settings:
+    poll_enabled: "Allow polls?"
diff --git a/plugins/poll/config/locales/server.es.yml b/plugins/poll/config/locales/server.es.yml
index 32defabe5b..d65275823d 100644
--- a/plugins/poll/config/locales/server.es.yml
+++ b/plugins/poll/config/locales/server.es.yml
@@ -15,18 +15,18 @@ es:
   poll:
     poll: "encuesta"
     invalid_argument: "Valor inválido «%{value}» para el argumento «%{argument}»."
-    multiple_polls_without_name: "Hay múltiples encuestas sin nombre. Utiliza el atributo «<code>nombre</code>» para identificar de forma única tus encuestas."
-    multiple_polls_with_same_name: "Hay múltiples encuestas con el mismo nombre: <strong>%{name}</strong>. Utiliza el atributo «<code>nombre</code>» para identificar de forma única tus encuestas."
+    multiple_polls_without_name: "Hay varias encuestas sin nombre. Usa el atributo «<code>nombre</code>» para identificar de forma única tus encuestas."
+    multiple_polls_with_same_name: "Hay varias encuestas con el mismo nombre: <strong>%{name}</strong>. Usa el atributo «<code>nombre</code>» para identificar de forma única tus encuestas."
     default_poll_must_have_at_least_1_option: "La encuesta debe tener al menos 1 opción."
     named_poll_must_have_at_least_1_option: "La encuesta llamada <strong>%{name}</strong> debe tener al menos 1 opción."
     default_poll_must_have_less_options:
-      one: "Las encuestas deben tener menos de %{count} opción."
+      one: "La encuesta deben tener menos de %{count} opción."
       other: "La encuesta debe tener menos de %{count} opciones."
     named_poll_must_have_less_options:
       one: "La encuesta llamada <strong>%{name}</strong> debe tener menos de %{count} opción."
       other: "La encuesta llamada <strong>%{name}</strong> debe tener menos de %{count} opciones."
-    default_poll_must_have_different_options: "La encuesta debe tener diferentes opciones."
-    named_poll_must_have_different_options: "La encuesta nombrada <strong>%{name}</strong> debe tener diferentes opciones."
+    default_poll_must_have_different_options: "La encuesta debe tener opciones diferentes."
+    named_poll_must_have_different_options: "La encuesta nombrada <strong>%{name}</strong> debe tener opciones diferentes."
     default_poll_must_not_have_any_empty_options: "La encuesta no puede tener ninguna opción vacía"
     named_poll_must_not_have_any_empty_options: "La encuesta llamada <strong>%{name}</strong> no puede tener ninguna opción vacía"
     default_poll_with_multiple_choices_has_invalid_parameters: "La encuesta con opciones múltiples tiene parámetros inválidos."
@@ -35,7 +35,7 @@ es:
     edit_window_expired:
       cannot_edit_default_poll_with_votes: "No puedes cambiar la encuesta después de los primeros %{minutes} minutos."
       cannot_edit_named_poll_with_votes: "No puedes cambiar el nombre de la encuesta <strong>${name}</strong> después de los primeros %{minutes} minutos."
-    no_poll_with_this_name: "No hay encuesta nombrada <strong>%{name}</strong> asociada con esta publicación."
+    no_poll_with_this_name: "No existe ninguna encuesta llamada <strong>%{name}</strong> asociada con esta publicación."
     post_is_deleted: "No se puede actuar sobre una publicación eliminada."
     user_cant_post_in_topic: "No puedes votar porque no puedes publicar en este tema."
     topic_must_be_open_to_vote: "El tema debe estar abierto para votar."
diff --git a/plugins/poll/config/locales/server.gl.yml b/plugins/poll/config/locales/server.gl.yml
index 78f5b62df9..27e05843ab 100644
--- a/plugins/poll/config/locales/server.gl.yml
+++ b/plugins/poll/config/locales/server.gl.yml
@@ -11,17 +11,17 @@ gl:
     poll_edit_window_mins: "Número de minutos en que se permite editar a enquisa desde o momento en que se crea unha publicación"
     poll_minimum_trust_level_to_create: "Defina o nivel de confianza mínimo para crear enquisas"
     poll_groupable_user_fields: "Un conxunto de nomes de campo de usuario que se poden empregar para agrupar e filtrar os resultados da votación."
-    poll_export_data_explorer_query_id: "ID da Consulta do Explorador de Datos que se usa para exportar os resultados da enquisa (0 para deshabilitar)."
+    poll_export_data_explorer_query_id: "ID da Consulta do Explorador de datos que se usa para exportar os resultados da enquisa (0 para desactivar)."
   poll:
     poll: "enquisa"
-    invalid_argument: "O valor '%{value}' non é válido para o argumento '%{argument}'."
-    multiple_polls_without_name: "Hai múltiples enquisas sen nome. Utiliza o atributo '<code>nome</code>' para singularizar as túas enquisas."
-    multiple_polls_with_same_name: "Hai múltiples enquisas co mesmo nome: <strong>%{name}</strong>. Utiliza o atributo '<code>nome</code>' para singularizar as túas enquisas."
+    invalid_argument: "O valor «%{value}» non é válido para o argumento «%{argument}»."
+    multiple_polls_without_name: "Hai múltiplas enquisas sen nome. Utilice o atributo «<code>nome</code>» para singularizar as súas enquisas."
+    multiple_polls_with_same_name: "Hai múltiplas enquisas co mesmo nome: <strong>%{name}</strong>. Utiliza o atributo «<code>nome</code>» para singularizar as súas enquisas."
     default_poll_must_have_at_least_1_option: "A enquisa debe ter polo menos unha opción"
     named_poll_must_have_at_least_1_option: "A enquisa chamada <strong>%{name}</strong> debe ter polo menos 1 opción."
     default_poll_must_have_less_options:
       one: "A enquisa debe ter cando menos %{count} opción."
-      other: "A enquisa debe ter alomenos %{count} opcións."
+      other: "A enquisa debe ter cando menos %{count} opcións."
     named_poll_must_have_less_options:
       one: "A enquisa chamada <strong>%{name}</strong> debe ter menos de %{count} opción."
       other: "A enquisa chamada <strong>%{name}</strong> debe ter menos de %{count} opcións."
@@ -31,7 +31,7 @@ gl:
     named_poll_must_not_have_any_empty_options: "A enquisa chamada <strong>%{name}</strong> non debe ter ningunha opción baleira."
     default_poll_with_multiple_choices_has_invalid_parameters: "A enquisa con varios apartados ten parámetros incorrectos."
     named_poll_with_multiple_choices_has_invalid_parameters: "A enquisa chamada <strong>%{name}</strong> con varios apartados ten parámetros incorrectos."
-    requires_at_least_1_valid_option: "Debes seleccionar alomenos 1 opción válida."
+    requires_at_least_1_valid_option: "Debe seleccionar cando menos 1 opción válida."
     edit_window_expired:
       cannot_edit_default_poll_with_votes: "Non pode cambiar unha enquisa despois dos primeiros %{minutes} minutos."
       cannot_edit_named_poll_with_votes: "Non pode cambiar o nome da enquisa <strong>${name}</strong> despois dos primeiros %{minutes} minutos."
@@ -40,10 +40,10 @@ gl:
     user_cant_post_in_topic: "Non pode votar porque non pode publicar neste tema."
     topic_must_be_open_to_vote: "O tema debe estar aberto para votalo."
     poll_must_be_open_to_vote: "A enquisa debe estar aberta para votala."
-    topic_must_be_open_to_toggle_status: "O tema debe estar aberto para cambiarlle o estado."
-    only_staff_or_op_can_toggle_status: "Soamente un membro do equipo ou o publicador orixinal poden trocar o estado dunha enquisa."
+    topic_must_be_open_to_toggle_status: "O tema debe estar aberto para trocalo de estado."
+    only_staff_or_op_can_toggle_status: "Soamente un membro do equipo ou quen publicou orixinalmente poden trocar o estado dunha enquisa."
     insufficient_rights_to_create: "Non ten permiso para crear enquisas"
     email:
-      link_to_poll: "Preme para ver a enquisa."
+      link_to_poll: "Prema para ver a enquisa."
     user_field:
       no_data: "Non hai datos"
diff --git a/plugins/poll/config/locales/server.ja.yml b/plugins/poll/config/locales/server.ja.yml
index d28251d870..b3b4949335 100644
--- a/plugins/poll/config/locales/server.ja.yml
+++ b/plugins/poll/config/locales/server.ja.yml
@@ -6,20 +6,33 @@
 
 ja:
   site_settings:
+    poll_enabled: "投票を許可しますか？"
     poll_maximum_options: "投票で許可されるオプションの最大数。"
     poll_edit_window_mins: "ポスト作成後に投票を編集できる時間(分)"
+    poll_minimum_trust_level_to_create: "投票の作成に必要な最小トラストレベルを定義します。"
+    poll_groupable_user_fields: "投票結果をグループ化およびフィルタするために使用できるユーザーフィールド名のセット。"
+    poll_export_data_explorer_query_id: "投票結果のエクスポートに使用するデータエクスプローラのクエリの ID (無効にする場合は 0)。"
   poll:
+    poll: "投票"
+    invalid_argument: "引数 '%{argument}' の値 '%{value}' が無効です。"
     multiple_polls_without_name: "名前のない複数の投票があります。一意に投票結果を識別するために、属性'<code>name</code>'を使用します。"
     multiple_polls_with_same_name: "同じ名前: <strong>%{name}</strong> の複数の投票があります。一意に投票結果を識別するために、属性'<code>name</code>'を使用します。"
+    default_poll_must_have_at_least_1_option: "投票には少なくとも1つのオプションが必要です。"
+    named_poll_must_have_at_least_1_option: "<strong>%{name}</strong> という名前の投票には、少なくとも1つのオプションが必要です。"
     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> という名前の投票には、空のオプションがあってはなりません。"
     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: "このトピックに投稿できないため投票できません。"
@@ -27,5 +40,8 @@ ja:
     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: "データなし"
diff --git a/plugins/poll/config/locales/server.pl_PL.yml b/plugins/poll/config/locales/server.pl_PL.yml
index 35391f058e..555de3b547 100644
--- a/plugins/poll/config/locales/server.pl_PL.yml
+++ b/plugins/poll/config/locales/server.pl_PL.yml
@@ -15,15 +15,15 @@ pl_PL:
   poll:
     poll: "ankieta"
     invalid_argument: "Nieprawidłowa wartość '%{value}' dla argumentu '%{argument}'."
-    multiple_polls_without_name: "Istnieje kilka nienazwanych ankiet. Uzyj atrybutu '<code>name</code>', aby umożliwić ich jednoznaczną identyfikację."
+    multiple_polls_without_name: "Istnieje kilka nienazwanych ankiet. Użyj atrybutu '<code>name</code>', aby umożliwić ich jednoznaczną identyfikację."
     multiple_polls_with_same_name: "Istnieje kilka ankiet o tej samej nazwie: <strong>%{name}</strong>. Użyj atrybutu '<code>name</code>', aby umożliwić ich jednoznaczną identyfikację."
     default_poll_must_have_at_least_1_option: "Ankieta musi mieć co najmniej jedną opcję."
     named_poll_must_have_at_least_1_option: "Ankieta o nazwie <strong>%{name}</strong> musi mieć co najmniej jedną opcję."
     default_poll_must_have_less_options:
       one: "Ankieta musi posiadać mniej niż %{count} opcję do wyboru."
-      few: "Ankieta musi posiadać co najmniej %{count} pozycje."
-      many: "Ankieta musi posiadać co najmniej %{count} pozycji."
-      other: "Ankieta musi posiadać co najmniej %{count} pozycji."
+      few: "Ankieta musi posiadać mniej niż %{count} opcje do wyboru."
+      many: "Ankieta musi posiadać mniej niż %{count} opcji do wyboru."
+      other: "Ankieta musi posiadać mniej niż %{count} opcji do wyboru."
     named_poll_must_have_less_options:
       one: "Ankieta <strong>%{name}</strong> musi posiadać mniej niż %{count} opcję."
       few: "Ankieta <strong>%{name}</strong> musi posiadać mniej niż %{count} opcje."
@@ -37,8 +37,8 @@ pl_PL:
     named_poll_with_multiple_choices_has_invalid_parameters: "Ankieta wielokrotnego wyboru o nazwie <strong>%{name}</strong> posiada nieprawidłowe parametry."
     requires_at_least_1_valid_option: "Musisz wybrać co najmniej 1 poprawną opcje."
     edit_window_expired:
-      cannot_edit_default_poll_with_votes: "Nie możesz edytować ankiety po upłynięciu%{minutes}minut od jej publikacji."
-      cannot_edit_named_poll_with_votes: "Nie możesz zmienić nazwy ankiety <strong>${name</strong>po upłynięciu %{minutes}minut od jej publikacji."
+      cannot_edit_default_poll_with_votes: "Nie możesz edytować ankiety po upłynięciu %{minutes} minut od jej publikacji."
+      cannot_edit_named_poll_with_votes: "Nie możesz zmienić nazwy ankiety <strong>${name}</strong> po upłynięciu %{minutes} minut od jej publikacji."
     no_poll_with_this_name: "Ankieta <strong>%{name}</strong> nie jest przypisana do tego wpisu."
     post_is_deleted: "Nie można wykonywać akcji na usuniętym wpisie."
     user_cant_post_in_topic: "Nie możesz głosować, bo nie możesz odpowiadać w tym temacie."
diff --git a/plugins/poll/config/locales/server.pt.yml b/plugins/poll/config/locales/server.pt.yml
index a15bda972a..b2e44e4187 100644
--- a/plugins/poll/config/locales/server.pt.yml
+++ b/plugins/poll/config/locales/server.pt.yml
@@ -10,9 +10,15 @@ pt:
     poll_maximum_options: "Número máximo de opções permitidas numa sondagem."
     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_groupable_user_fields: "Um conjunto de nomes de campos de utilizador que podem ser usados para agrupar e filtrar os resultados da sondagem."
+    poll_export_data_explorer_query_id: "ID do Data Explorer Query a ser usado para exportar resultados da sondagem (0 para desativar)."
   poll:
+    poll: "sondagem"
+    invalid_argument: "Valor inválido '%{value}' para o argumento '%{argument}'."
     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_at_least_1_option: "A sondagem deve ter pelo menos 1 opção."
+    named_poll_must_have_at_least_1_option: "A sondagem com o nome <strong>%{name}</strong> deve ter pelo menos 1 opção."
     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."
@@ -21,9 +27,14 @@ pt:
       other: "A sondagem com o nome <strong>%{name}</strong> deve ter menos que %{count} opções."
     default_poll_must_have_different_options: "A sondagem deve ter opções diferentes."
     named_poll_must_have_different_options: "A sondagem com o nome <strong>%{name}</strong> deve ter opções diferentes."
+    default_poll_must_not_have_any_empty_options: "A sondagem não pode ter opções vazias."
+    named_poll_must_not_have_any_empty_options: "A sondagem com o nome <strong>%{name}</strong> não pode ter opções vazias."
     default_poll_with_multiple_choices_has_invalid_parameters: "A sondagem com escolhas múltiplas tem parâmetros inválidos."
     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."
+    edit_window_expired:
+      cannot_edit_default_poll_with_votes: "Não é possível alterar uma sondagem após os primeiros %{minutes} minutos."
+      cannot_edit_named_poll_with_votes: "Não é possível alterar a sondagem com o nome <strong>${name}</strong> após os primeiros %{minutes} minutos."
     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 na publicação eliminada."
     user_cant_post_in_topic: "Não pode votar porque não pode publicar neste tópico."
@@ -34,3 +45,5 @@ pt:
     insufficient_rights_to_create: "Não está autorizado para criar sondagens."
     email:
       link_to_poll: "Clique para ver a sondagem."
+    user_field:
+      no_data: "Sem dados"
diff --git a/plugins/poll/config/locales/server.ro.yml b/plugins/poll/config/locales/server.ro.yml
index 0977701666..318cdbbc7e 100644
--- a/plugins/poll/config/locales/server.ro.yml
+++ b/plugins/poll/config/locales/server.ro.yml
@@ -11,8 +11,11 @@ ro:
     poll_edit_window_mins: "Număr de minute după crearea postării pe parcursul cărora sondajele pot fi editate."
     poll_minimum_trust_level_to_create: "Definește nivelul minim de încredere pentru a crea sondaje."
   poll:
+    invalid_argument: "Valoare nevalidă „%{value}” pentru argumentul „%{argument}”."
     multiple_polls_without_name: "Există mai multe sondaje fără nume. Folosește atributul '<code>name</code>' pentru a identifica sondajele proprii"
     multiple_polls_with_same_name: "Există mai multe sondaje cu același nume: <strong>%{name}</strong>. Folosește atributul '<code>name</code>' pentru a identifica sondajele."
+    default_poll_must_have_at_least_1_option: "Sondajul trebuie să aibă cel puţin o opţiune."
+    named_poll_must_have_at_least_1_option: "Sondajul <strong>%{name}</strong> trebuie să aibă cel puțin o opțiune."
     default_poll_must_have_less_options:
       one: "Sondajul trebuie să aibă mai puțin de o opțiune."
       few: "Sondajul trebuie să conțină cel mult %{count} opțiuni."
@@ -23,11 +26,17 @@ ro:
       other: "Sondajul <strong>%{name}</strong> trebuie să aibă cel mult %{count} de opțiuni."
     default_poll_must_have_different_options: "Sondajul trebuie să aibă opțiuni diferite."
     named_poll_must_have_different_options: "Sondajul numit <strong>%{name}</strong> trebuie să aibă opțiuni diferite."
+    default_poll_must_not_have_any_empty_options: "Sondajul nu trebuie să aibă nicio opţiune goală."
+    named_poll_must_not_have_any_empty_options: "Sondajul numit <strong>%{name}</strong> nu trebuie să aibă opțiuni goale."
     default_poll_with_multiple_choices_has_invalid_parameters: "Sondajul cu opțiuni multiple are parametri invalizi."
     named_poll_with_multiple_choices_has_invalid_parameters: "Sondajul numit <strong>%{name}</strong> cu opțiuni multiple are parametri invalizi."
     requires_at_least_1_valid_option: "Trebuie să selectezi cel puțin o opțiune validă."
+    edit_window_expired:
+      cannot_edit_default_poll_with_votes: "Nu poți schimba un sondaj după primele %{minutes} minute."
+      cannot_edit_named_poll_with_votes: "Nu poți schimba numele sondajului <strong>${name}</strong> după primele %{minutes} minute."
     no_poll_with_this_name: "Nu există nici un sondaj cu numele <strong>%{name}</strong> asociat acestei postări."
     post_is_deleted: "Postările șterse nu se pot modifica."
+    user_cant_post_in_topic: "Nu poți vota deoarece nu poți posta în acest subiect."
     topic_must_be_open_to_vote: "Subiectul trebuie să fie deschis pentru votare."
     poll_must_be_open_to_vote: "Sondajul trebuie să fie deschis pentru votare."
     topic_must_be_open_to_toggle_status: "Subiectul trebuie să fie activ pentru a se schimba statutul."
@@ -35,3 +44,5 @@ ro:
     insufficient_rights_to_create: "Nu ai permisiunea de a crea sondaje."
     email:
       link_to_poll: "Click pentru afișarea sondajului."
+    user_field:
+      no_data: "Fără date"
diff --git a/plugins/poll/config/locales/server.te.yml b/plugins/poll/config/locales/server.te.yml
index ac5d945ae8..03967bdbb0 100644
--- a/plugins/poll/config/locales/server.te.yml
+++ b/plugins/poll/config/locales/server.te.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-te: 
+te:
diff --git a/plugins/poll/config/locales/server.zh_CN.yml b/plugins/poll/config/locales/server.zh_CN.yml
index cd06a42520..83f24780a8 100644
--- a/plugins/poll/config/locales/server.zh_CN.yml
+++ b/plugins/poll/config/locales/server.zh_CN.yml
@@ -35,10 +35,10 @@ zh_CN:
       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: "主题必须未被锁定才能投票。"
+    user_cant_post_in_topic: "你无法投票，因为你无法在这个话题里发帖"
+    topic_must_be_open_to_vote: "话题必须未被锁定才能投票。"
     poll_must_be_open_to_vote: "投票必须开启。"
-    topic_must_be_open_to_toggle_status: "主题必须未被锁定才能改变状态。"
+    topic_must_be_open_to_toggle_status: "话题必须未被锁定才能改变状态。"
     only_staff_or_op_can_toggle_status: "只有管理人员或者发布投票的人才能改变投票状态。"
     insufficient_rights_to_create: "你不能创建投票。"
     email:
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 513a2e494d..b5f657f865 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -10,8 +10,8 @@ register_asset "stylesheets/common/poll.scss"
 register_asset "stylesheets/common/poll-ui-builder.scss"
 register_asset "stylesheets/common/poll-breakdown.scss"
 register_asset "stylesheets/desktop/poll.scss", :desktop
+register_asset "stylesheets/desktop/poll-ui-builder.scss", :desktop
 register_asset "stylesheets/mobile/poll.scss", :mobile
-register_asset "stylesheets/mobile/poll-ui-builder.scss", :mobile
 
 register_svg_icon "far fa-check-square"
 
diff --git a/plugins/poll/spec/lib/pretty_text_spec.rb b/plugins/poll/spec/lib/pretty_text_spec.rb
index d887b10e75..52fed2284e 100644
--- a/plugins/poll/spec/lib/pretty_text_spec.rb
+++ b/plugins/poll/spec/lib/pretty_text_spec.rb
@@ -189,8 +189,8 @@ describe PrettyText do
       </div>
     HTML
 
-    expect(cooked).to include("<h1>Pre-heading</h1>")
-    expect(cooked).to include("<h1>Post-heading</h1>")
+    expect(cooked).to include("<h1>\n<a name=\"pre-heading-1\" class=\"anchor\" href=\"#pre-heading-1\"></a>Pre-heading</h1>")
+    expect(cooked).to include("<h1>\n<a name=\"post-heading-2\" class=\"anchor\" href=\"#post-heading-2\"></a>Post-heading</h1>")
   end
 
   it "does not break when there are headings before/after a poll without a title" do
@@ -211,7 +211,7 @@ describe PrettyText do
       <div class="poll" data-poll-status="open" data-poll-name="poll">
     HTML
 
-    expect(cooked).to include("<h1>Pre-heading</h1>")
-    expect(cooked).to include("<h1>Post-heading</h1>")
+    expect(cooked).to include("<h1>\n<a name=\"pre-heading-1\" class=\"anchor\" href=\"#pre-heading-1\"></a>Pre-heading</h1>")
+    expect(cooked).to include("<h1>\n<a name=\"post-heading-2\" class=\"anchor\" href=\"#post-heading-2\"></a>Post-heading</h1>")
   end
 end
diff --git a/plugins/poll/test/javascripts/acceptance/poll-breakdown-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-breakdown-test.js.es6
index 1754952f22..28bfd6d450 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-breakdown-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/poll-breakdown-test.js.es6
@@ -66,7 +66,7 @@ acceptance("Poll breakdown", function (needs) {
       "shows the breakdown button when poll_groupable_user_fields is non-empty"
     );
 
-    await click(".poll-show-breakdown:first");
+    await click(".poll-show-breakdown");
 
     assert.equal(
       queryAll(".poll-breakdown-total-votes")[0].textContent.trim(),
@@ -88,10 +88,10 @@ acceptance("Poll breakdown", function (needs) {
 
   test("Changing the display mode from percentage to count", async function (assert) {
     await visit("/t/-/topic_with_pie_chart_poll");
-    await click(".poll-show-breakdown:first");
+    await click(".poll-show-breakdown");
 
     assert.equal(
-      queryAll(".poll-breakdown-option-count:first")[0].textContent.trim(),
+      queryAll(".poll-breakdown-option-count")[0].textContent.trim(),
       "40.0%",
       "displays the correct vote percentage"
     );
@@ -99,7 +99,7 @@ acceptance("Poll breakdown", function (needs) {
     await click(".modal-tabs .count");
 
     assert.equal(
-      queryAll(".poll-breakdown-option-count:first")[0].textContent.trim(),
+      queryAll(".poll-breakdown-option-count")[0].textContent.trim(),
       "2",
       "displays the correct vote count"
     );
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 e79b2f7b5c..8969cea164 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
@@ -1,10 +1,10 @@
 import {
   acceptance,
-  updateCurrentUser,
   exists,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { displayPollBuilderButton } from "discourse/plugins/poll/helpers/display-poll-builder-button";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
+import { displayPollBuilderButton } from "discourse/plugins/poll/helpers/display-poll-builder-button";
 
 acceptance("Poll Builder - polls are disabled", function (needs) {
   needs.user();
diff --git a/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
index f0e517ceae..f04178b953 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
@@ -1,12 +1,10 @@
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import {
   acceptance,
-  updateCurrentUser,
   exists,
-  queryAll,
+  updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { displayPollBuilderButton } from "discourse/plugins/poll/helpers/display-poll-builder-button";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
+import { displayPollBuilderButton } from "discourse/plugins/poll/helpers/display-poll-builder-button";
 
 acceptance("Poll Builder - polls are enabled", function (needs) {
   needs.user();
@@ -48,22 +46,4 @@ acceptance("Poll Builder - polls are enabled", function (needs) {
       "it shows the builder button"
     );
   });
-
-  test("poll preview", async function (assert) {
-    await displayPollBuilderButton();
-
-    const popupMenu = selectKit(".toolbar-popup-menu-options");
-    await popupMenu.selectRowByValue("showPollBuilder");
-
-    await fillIn(".poll-textarea textarea", "First option\nSecond option");
-
-    assert.equal(
-      queryAll(".d-editor-preview li:first-child").text(),
-      "First option"
-    );
-    assert.equal(
-      queryAll(".d-editor-preview li:last-child").text(),
-      "Second option"
-    );
-  });
 });
diff --git a/plugins/poll/test/javascripts/acceptance/poll-in-reply-history-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-in-reply-history-test.js.es6
new file mode 100644
index 0000000000..1959caab88
--- /dev/null
+++ b/plugins/poll/test/javascripts/acceptance/poll-in-reply-history-test.js.es6
@@ -0,0 +1,444 @@
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
+
+acceptance("Poll in a post reply history", function (needs) {
+  needs.user();
+  needs.settings({ poll_enabled: true });
+  needs.hooks.beforeEach(() => {
+    clearPopupMenuOptionsCallback();
+  });
+
+  needs.pretender((server, helper) => {
+    server.get("/t/topic_with_poll_in_post_reply_history.json", () => {
+      return helper.response({
+        post_stream: {
+          posts: [
+            {
+              id: 82,
+              name: null,
+              username: "admin1",
+              avatar_template:
+                "/letter_avatar_proxy/v4/letter/a/bbce88/{size}.png",
+              created_at: "2021-01-25T13:08:27.385Z",
+              cooked: "<p>A reply to the poll.</p>",
+              post_number: 4,
+              post_type: 1,
+              updated_at: "2021-01-25T13:08:27.385Z",
+              reply_count: 0,
+              reply_to_post_number: 2,
+              quote_count: 0,
+              incoming_link_count: 0,
+              reads: 1,
+              readers_count: 0,
+              score: 0.2,
+              yours: true,
+              topic_id: 25,
+              topic_slug: "topic-with-a-poll-in-a-post-reply-history",
+              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: true,
+              can_recover: false,
+              can_wiki: true,
+              read: true,
+              user_title: null,
+              reply_to_user: {
+                username: "admin1",
+                avatar_template:
+                  "/letter_avatar_proxy/v4/letter/a/bbce88/{size}.png",
+              },
+              bookmarked: false,
+              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: 3,
+              hidden: false,
+              trust_level: 1,
+              deleted_at: null,
+              user_deleted: false,
+              edit_reason: null,
+              can_view_edit_history: true,
+              wiki: false,
+              reviewable_id: 0,
+              reviewable_score_count: 0,
+              reviewable_score_pending_count: 0,
+            },
+          ],
+          stream: [82],
+        },
+        timeline_lookup: [[1, 0]],
+        suggested_topics: [
+          {
+            id: 7,
+            title: "Welcome to Discourse",
+            fancy_title: "Welcome to Discourse",
+            slug: "welcome-to-discourse",
+            posts_count: 1,
+            reply_count: 0,
+            highest_post_number: 1,
+            image_url: null,
+            created_at: "2021-01-07T15:36:44.707Z",
+            last_posted_at: "2021-01-07T15:36:44.750Z",
+            bumped: true,
+            bumped_at: "2021-01-07T15:36:44.750Z",
+            archetype: "regular",
+            unseen: false,
+            pinned: true,
+            unpinned: null,
+            excerpt:
+              "The first paragraph of this pinned topic will be visible as a welcome message to all new visitors on your homepage. It’s important! Edit this into a brief description of your community: Who is it for? What can they fi&hellip;",
+            visible: true,
+            closed: false,
+            archived: false,
+            bookmarked: null,
+            liked: null,
+            like_count: 0,
+            views: 1,
+            category_id: 1,
+            featured_link: null,
+            posters: [
+              {
+                extras: "latest single",
+                description: "Original Poster, Most Recent Poster",
+                user: {
+                  id: -1,
+                  username: "system",
+                  name: "system",
+                  avatar_template:
+                    "http://localhost:3000/images/discourse-logo-sketch-small.png",
+                },
+              },
+            ],
+          },
+          {
+            id: 20,
+            title: "Polls testing. Just one poll in the comment",
+            fancy_title: "Polls testing. Just one poll in the comment",
+            slug: "polls-testing-just-one-poll-in-the-comment",
+            posts_count: 3,
+            reply_count: 1,
+            highest_post_number: 3,
+            image_url: null,
+            created_at: "2021-01-21T09:21:35.102Z",
+            last_posted_at: "2021-01-22T09:35:33.543Z",
+            bumped: true,
+            bumped_at: "2021-01-22T09:35:33.543Z",
+            archetype: "regular",
+            unseen: false,
+            last_read_post_number: 3,
+            unread: 0,
+            new_posts: 0,
+            pinned: false,
+            unpinned: null,
+            visible: true,
+            closed: false,
+            archived: false,
+            notification_level: 2,
+            bookmarked: false,
+            liked: false,
+            like_count: 0,
+            views: 3,
+            category_id: 1,
+            featured_link: null,
+            posters: [
+              {
+                extras: null,
+                description: "Original Poster",
+                user: {
+                  id: 2,
+                  username: "andrey1",
+                  name: "andrey1",
+                  avatar_template:
+                    "/letter_avatar_proxy/v4/letter/a/c0e974/{size}.png",
+                },
+              },
+              {
+                extras: "latest",
+                description: "Most Recent Poster",
+                user: {
+                  id: 3,
+                  username: "admin1",
+                  name: null,
+                  avatar_template:
+                    "/letter_avatar_proxy/v4/letter/a/bbce88/{size}.png",
+                },
+              },
+            ],
+          },
+          {
+            id: 22,
+            title: "Polls testing. The whole test",
+            fancy_title: "Polls testing. The whole test",
+            slug: "polls-testing-the-whole-test",
+            posts_count: 12,
+            reply_count: 8,
+            highest_post_number: 12,
+            image_url: null,
+            created_at: "2021-01-21T09:55:20.135Z",
+            last_posted_at: "2021-01-22T11:59:31.561Z",
+            bumped: true,
+            bumped_at: "2021-01-22T11:59:31.561Z",
+            archetype: "regular",
+            unseen: false,
+            last_read_post_number: 12,
+            unread: 0,
+            new_posts: 0,
+            pinned: false,
+            unpinned: null,
+            visible: true,
+            closed: false,
+            archived: false,
+            notification_level: 2,
+            bookmarked: false,
+            liked: false,
+            like_count: 0,
+            views: 4,
+            category_id: 1,
+            featured_link: null,
+            posters: [
+              {
+                extras: null,
+                description: "Original Poster",
+                user: {
+                  id: 2,
+                  username: "andrey1",
+                  name: "andrey1",
+                  avatar_template:
+                    "/letter_avatar_proxy/v4/letter/a/c0e974/{size}.png",
+                },
+              },
+              {
+                extras: "latest",
+                description: "Most Recent Poster",
+                user: {
+                  id: 3,
+                  username: "admin1",
+                  name: null,
+                  avatar_template:
+                    "/letter_avatar_proxy/v4/letter/a/bbce88/{size}.png",
+                },
+              },
+            ],
+          },
+        ],
+        id: 25,
+        title: "Topic with a poll in a post reply history",
+        fancy_title: "Topic with a poll in a post reply history",
+        posts_count: 4,
+        created_at: "2021-01-25T13:07:31.670Z",
+        views: 2,
+        reply_count: 2,
+        like_count: 0,
+        last_posted_at: "2021-01-25T13:08:27.385Z",
+        visible: true,
+        closed: false,
+        archived: false,
+        has_summary: false,
+        archetype: "regular",
+        slug: "topic-with-a-poll-in-a-post-reply-history",
+        category_id: 1,
+        word_count: 25,
+        deleted_at: null,
+        user_id: 3,
+        featured_link: null,
+        pinned_globally: false,
+        pinned_at: null,
+        pinned_until: null,
+        image_url: null,
+        slow_mode_seconds: 0,
+        draft: null,
+        draft_key: "topic_25",
+        draft_sequence: 4,
+        posted: true,
+        unpinned: null,
+        pinned: false,
+        current_post_number: 4,
+        highest_post_number: 4,
+        last_read_post_number: 4,
+        last_read_post_id: 82,
+        deleted_by: null,
+        has_deleted: false,
+        actions_summary: [
+          {
+            id: 4,
+            count: 0,
+            hidden: false,
+            can_act: true,
+          },
+          {
+            id: 8,
+            count: 0,
+            hidden: false,
+            can_act: true,
+          },
+          {
+            id: 7,
+            count: 0,
+            hidden: false,
+            can_act: true,
+          },
+        ],
+        chunk_size: 20,
+        bookmarked: false,
+        topic_timer: null,
+        message_bus_last_id: 4,
+        participant_count: 1,
+        show_read_indicator: false,
+        thumbnails: null,
+        details: {
+          can_edit: true,
+          notification_level: 3,
+          notifications_reason_id: 1,
+          can_move_posts: true,
+          can_delete: true,
+          can_remove_allowed_users: true,
+          can_invite_to: true,
+          can_invite_via_email: true,
+          can_create_post: true,
+          can_reply_as_new_topic: true,
+          can_flag_topic: true,
+          can_convert_topic: true,
+          can_review_topic: true,
+          can_close_topic: true,
+          can_archive_topic: true,
+          can_split_merge_topic: true,
+          can_edit_staff_notes: true,
+          can_toggle_topic_visibility: true,
+          can_moderate_category: true,
+          can_remove_self_id: 3,
+          participants: [
+            {
+              id: 3,
+              username: "admin1",
+              name: null,
+              avatar_template:
+                "/letter_avatar_proxy/v4/letter/a/bbce88/{size}.png",
+              post_count: 4,
+              primary_group_name: null,
+              primary_group_flair_url: null,
+              primary_group_flair_color: null,
+              primary_group_flair_bg_color: null,
+            },
+          ],
+          created_by: {
+            id: 3,
+            username: "admin1",
+            name: null,
+            avatar_template:
+              "/letter_avatar_proxy/v4/letter/a/bbce88/{size}.png",
+          },
+          last_poster: {
+            id: 3,
+            username: "admin1",
+            name: null,
+            avatar_template:
+              "/letter_avatar_proxy/v4/letter/a/bbce88/{size}.png",
+          },
+        },
+      });
+    });
+
+    server.get("/posts/82/reply-history", () => {
+      return helper.response([
+        {
+          id: 80,
+          name: null,
+          username: "admin1",
+          avatar_template: "/letter_avatar_proxy/v4/letter/a/bbce88/{size}.png",
+          created_at: "2021-01-25T13:07:58.995Z",
+          cooked:
+            '<p>The poll:</p>\n<div class="poll" data-poll-status="open" data-poll-name="poll">\n<div>\n<div class="poll-container">\n<ul>\n<li data-poll-option-id="5b8ee5ba2a43e258f93dbef9264bf1ad">Option A</li>\n<li data-poll-option-id="6872645f5d8ef2311883617a3a7d381b">Option B</li>\n</ul>\n</div>\n<div class="poll-info">\n<p>\n<span class="info-number">0</span>\n<span class="info-label">voters</span>\n</p>\n</div>\n</div>\n</div>',
+          post_number: 2,
+          post_type: 1,
+          updated_at: "2021-01-25T13:07:58.995Z",
+          reply_count: 2,
+          reply_to_post_number: null,
+          quote_count: 0,
+          incoming_link_count: 0,
+          reads: 1,
+          readers_count: 0,
+          score: 10.2,
+          yours: false,
+          topic_id: 25,
+          topic_slug: "topic-with-a-poll-in-a-post-reply-history",
+          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: false,
+          can_delete: false,
+          can_recover: false,
+          can_wiki: false,
+          user_title: null,
+          bookmarked: false,
+          actions_summary: [],
+          moderator: false,
+          admin: true,
+          staff: true,
+          user_id: 3,
+          hidden: false,
+          trust_level: 1,
+          deleted_at: null,
+          user_deleted: false,
+          edit_reason: null,
+          can_view_edit_history: true,
+          wiki: false,
+          polls: [
+            {
+              name: "poll",
+              type: "regular",
+              status: "open",
+              results: "always",
+              options: [
+                {
+                  id: "5b8ee5ba2a43e258f93dbef9264bf1ad",
+                  html: "Option A",
+                  votes: 0,
+                },
+                {
+                  id: "6872645f5d8ef2311883617a3a7d381b",
+                  html: "Option B",
+                  votes: 0,
+                },
+              ],
+              voters: 0,
+              chart_type: "bar",
+              title: null,
+            },
+          ],
+        },
+      ]);
+    });
+  });
+
+  test("renders and extends", async function (assert) {
+    await visit("/t/-/topic_with_poll_in_post_reply_history");
+    await click(".reply-to-tab");
+    assert.ok(exists(".poll"), "poll is rendered");
+    assert.ok(exists(".poll-buttons"), "poll is extended");
+  });
+});
diff --git a/plugins/poll/test/javascripts/acceptance/poll-pie-chart-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-pie-chart-test.js.es6
index 78f6d0bb9d..721f764a1d 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-pie-chart-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/poll-pie-chart-test.js.es6
@@ -1,4 +1,4 @@
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Rendering polls with pie charts", function (needs) {
   needs.user();
diff --git a/plugins/poll/test/javascripts/acceptance/poll-quote-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-quote-test.js.es6
index 113bbf9b26..846f97c4a1 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-quote-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/poll-quote-test.js.es6
@@ -1,5 +1,5 @@
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Poll quote", function (needs) {
   needs.user();
@@ -9,257 +9,6 @@ acceptance("Poll quote", function (needs) {
   });
 
   needs.pretender((server, helper) => {
-    server.get("/t/topic_with_two_polls.json", () => {
-      return helper.response({
-        post_stream: {
-          posts: [
-            {
-              id: 133,
-              name: null,
-              username: "bianca",
-              avatar_template:
-                "/letter_avatar_proxy/v4/letter/b/3be4f8/{size}.png",
-              created_at: "2020-08-17T12:05:24.577Z",
-              cooked:
-                '<div class="poll" data-poll-status="open" data-poll-name="poll1" data-poll-results="always" data-poll-charttype="bar" data-poll-type="regular">\n<div>\n<div class="poll-container">\n<ul>\n<li data-poll-option-id="bf48cd4958a17180e2a298e246988f94">Alpha</li>\n<li data-poll-option-id="c19aa835729ab0413a84a2c9850c4005">Beta</li>\n</ul>\n</div>\n<div class="poll-info">\n<p>\n<span class="info-number">0</span>\n<span class="info-label">voters</span>\n</p>\n</div>\n</div>\n</div>\n<div class="poll" data-poll-status="open" data-poll-name="poll2" data-poll-results="always" data-poll-charttype="bar" data-poll-type="regular">\n<div>\n<div class="poll-container">\n<ul>\n<li data-poll-option-id="def034c6770c6fd3754c054ef9ec4721">First</li>\n<li data-poll-option-id="e0f55d1a981683789bec2a0b05eb70ef">Second</li>\n</ul>\n</div>\n<div class="poll-info">\n<p>\n<span class="info-number">0</span>\n<span class="info-label">voters</span>\n</p>\n</div>\n</div>\n</div>',
-              post_number: 1,
-              post_type: 1,
-              updated_at: "2020-08-17T12:05:24.577Z",
-              reply_count: 0,
-              reply_to_post_number: null,
-              quote_count: 0,
-              incoming_link_count: 0,
-              reads: 1,
-              readers_count: 0,
-              score: 0,
-              yours: true,
-              topic_id: 130,
-              topic_slug: "topic-with-two-polls",
-              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: false,
-              can_wiki: true,
-              link_counts: [
-                {
-                  url:
-                    "http://forum.example.com/t/topic-with-two-quoted-polls/129",
-                  internal: true,
-                  reflection: true,
-                  title: "Topic with two quoted polls",
-                  clicks: 0,
-                },
-              ],
-              read: true,
-              user_title: "Tester",
-              title_is_group: false,
-              bookmarked: false,
-              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: 0,
-              deleted_at: null,
-              user_deleted: false,
-              edit_reason: null,
-              can_view_edit_history: true,
-              wiki: false,
-              reviewable_id: 0,
-              reviewable_score_count: 0,
-              reviewable_score_pending_count: 0,
-              calendar_details: [],
-              polls: [
-                {
-                  name: "poll1",
-                  type: "regular",
-                  status: "open",
-                  results: "always",
-                  options: [
-                    {
-                      id: "bf48cd4958a17180e2a298e246988f94",
-                      html: "Alpha",
-                      votes: 0,
-                    },
-                    {
-                      id: "c19aa835729ab0413a84a2c9850c4005",
-                      html: "Beta",
-                      votes: 0,
-                    },
-                  ],
-                  voters: 0,
-                  chart_type: "bar",
-                },
-                {
-                  name: "poll2",
-                  type: "regular",
-                  status: "open",
-                  results: "always",
-                  options: [
-                    {
-                      id: "def034c6770c6fd3754c054ef9ec4721",
-                      html: "First",
-                      votes: 0,
-                    },
-                    {
-                      id: "e0f55d1a981683789bec2a0b05eb70ef",
-                      html: "Second",
-                      votes: 0,
-                    },
-                  ],
-                  voters: 0,
-                  chart_type: "bar",
-                },
-              ],
-            },
-          ],
-          stream: [133],
-        },
-        timeline_lookup: [[1, 0]],
-        suggested_topics: [],
-        tags: [],
-        id: 130,
-        title: "Topic with two polls",
-        fancy_title: "Topic with two polls",
-        posts_count: 1,
-        created_at: "2020-08-17T12:05:24.500Z",
-        views: 1,
-        reply_count: 0,
-        like_count: 0,
-        last_posted_at: "2020-08-17T12:05:24.577Z",
-        visible: true,
-        closed: false,
-        archived: false,
-        has_summary: false,
-        archetype: "regular",
-        slug: "topic-with-two-polls",
-        category_id: 1,
-        word_count: 24,
-        deleted_at: null,
-        user_id: 1,
-        featured_link: null,
-        pinned_globally: false,
-        pinned_at: null,
-        pinned_until: null,
-        image_url: null,
-        draft: null,
-        draft_key: "topic_130",
-        draft_sequence: 0,
-        posted: true,
-        unpinned: null,
-        pinned: false,
-        current_post_number: 1,
-        highest_post_number: 1,
-        last_read_post_number: 1,
-        last_read_post_id: 133,
-        deleted_by: null,
-        has_deleted: false,
-        actions_summary: [
-          {
-            id: 4,
-            count: 0,
-            hidden: false,
-            can_act: true,
-          },
-          {
-            id: 8,
-            count: 0,
-            hidden: false,
-            can_act: true,
-          },
-          {
-            id: 7,
-            count: 0,
-            hidden: false,
-            can_act: true,
-          },
-        ],
-        chunk_size: 20,
-        bookmarked: false,
-        topic_timer: null,
-        message_bus_last_id: 1,
-        participant_count: 1,
-        queued_posts_count: 0,
-        show_read_indicator: false,
-        thumbnails: null,
-        can_vote: false,
-        vote_count: null,
-        user_voted: false,
-        details: {
-          notification_level: 3,
-          notifications_reason_id: 1,
-          can_move_posts: true,
-          can_edit: true,
-          can_delete: true,
-          can_remove_allowed_users: true,
-          can_invite_to: true,
-          can_invite_via_email: true,
-          can_create_post: true,
-          can_reply_as_new_topic: true,
-          can_flag_topic: true,
-          can_convert_topic: true,
-          can_review_topic: true,
-          can_close_topic: true,
-          can_archive_topic: true,
-          can_split_merge_topic: true,
-          can_edit_staff_notes: true,
-          can_remove_self_id: 1,
-          participants: [
-            {
-              id: 1,
-              username: "bianca",
-              name: null,
-              avatar_template:
-                "/letter_avatar_proxy/v4/letter/b/3be4f8/{size}.png",
-              post_count: 1,
-              primary_group_name: null,
-              primary_group_flair_url: null,
-              primary_group_flair_color: null,
-              primary_group_flair_bg_color: null,
-            },
-          ],
-          created_by: {
-            id: 1,
-            username: "bianca",
-            name: null,
-            avatar_template:
-              "/letter_avatar_proxy/v4/letter/b/3be4f8/{size}.png",
-          },
-          last_poster: {
-            id: 1,
-            username: "bianca",
-            name: null,
-            avatar_template:
-              "/letter_avatar_proxy/v4/letter/b/3be4f8/{size}.png",
-          },
-        },
-        pending_posts: [],
-      });
-    });
-
     server.get("/posts/by_number/130/1", () => {
       return helper.response({
         id: 133,
@@ -675,9 +424,10 @@ acceptance("Poll quote", function (needs) {
     });
   });
 
-  test("Quoted polls", async function (assert) {
+  test("renders and extends", async function (assert) {
     await visit("/t/-/topic_with_two_quoted_polls");
     await click(".quote-controls");
-    assert.equal(queryAll(".poll").length, 2);
+    assert.equal(queryAll(".poll").length, 2, "polls are rendered");
+    assert.equal(queryAll(".poll-buttons").length, 2, "polls are extended");
   });
 });
diff --git a/plugins/poll/test/javascripts/acceptance/polls-bar-chart-test-desktop.js.es6 b/plugins/poll/test/javascripts/acceptance/polls-bar-chart-test-desktop.js.es6
index 625ca4fda6..e22df294bd 100644
--- a/plugins/poll/test/javascripts/acceptance/polls-bar-chart-test-desktop.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/polls-bar-chart-test-desktop.js.es6
@@ -1,5 +1,5 @@
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Rendering polls with bar charts - desktop", function (needs) {
   needs.user();
@@ -68,15 +68,15 @@ acceptance("Rendering polls with bar charts - desktop", function (needs) {
     await click("button.toggle-results");
 
     assert.equal(
-      queryAll(".poll-voters:first li").length,
+      queryAll(".poll-voters:nth-of-type(1) li").length,
       25,
       "it should display the right number of voters"
     );
 
-    await click(".poll-voters-toggle-expand:first a");
+    await click(".poll-voters-toggle-expand:nth-of-type(1) a");
 
     assert.equal(
-      queryAll(".poll-voters:first li").length,
+      queryAll(".poll-voters:nth-of-type(1) li").length,
       26,
       "it should display the right number of voters"
     );
@@ -91,20 +91,20 @@ acceptance("Rendering polls with bar charts - desktop", function (needs) {
     await click("button.toggle-results");
 
     assert.equal(
-      queryAll(".poll-voters:first li").length,
+      queryAll(".poll-voters:nth-of-type(1) li").length,
       25,
       "it should display the right number of voters"
     );
 
     assert.notOk(
-      queryAll(".poll-voters:first li:first a").attr("href"),
+      queryAll(".poll-voters:nth-of-type(1) li:nth-of-type(1) a").attr("href"),
       "user URL does not exist"
     );
 
-    await click(".poll-voters-toggle-expand:first a");
+    await click(".poll-voters-toggle-expand:nth-of-type(1) a");
 
     assert.equal(
-      queryAll(".poll-voters:first li").length,
+      queryAll(".poll-voters:nth-of-type(1) li").length,
       30,
       "it should display the right number of voters"
     );
diff --git a/plugins/poll/test/javascripts/acceptance/polls-bar-chart-test-mobile.js.es6 b/plugins/poll/test/javascripts/acceptance/polls-bar-chart-test-mobile.js.es6
index 2acce037d8..1920011950 100644
--- a/plugins/poll/test/javascripts/acceptance/polls-bar-chart-test-mobile.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/polls-bar-chart-test-mobile.js.es6
@@ -1,5 +1,5 @@
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
-import { queryAll, acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Rendering polls with bar charts - mobile", function (needs) {
   needs.user();
@@ -30,20 +30,20 @@ acceptance("Rendering polls with bar charts - mobile", function (needs) {
     await click("button.toggle-results");
 
     assert.equal(
-      queryAll(".poll-voters:first li").length,
+      queryAll(".poll-voters:nth-of-type(1) li").length,
       25,
       "it should display the right number of voters"
     );
 
     assert.notOk(
-      queryAll(".poll-voters:first li:first a").attr("href"),
+      queryAll(".poll-voters:nth-of-type(1) li:nth-of-type(1) a").attr("href"),
       "user URL does not exist"
     );
 
-    await click(".poll-voters-toggle-expand:first a");
+    await click(".poll-voters-toggle-expand:nth-of-type(1) a");
 
     assert.equal(
-      queryAll(".poll-voters:first li").length,
+      queryAll(".poll-voters:nth-of-type(1) li").length,
       35,
       "it should display the right number of voters"
     );
diff --git a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
index 00906a1b1a..8dc002a9f1 100644
--- a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
+++ b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
@@ -1,10 +1,14 @@
 import { controllerModule } from "discourse/tests/helpers/qunit-helpers";
+import {
+  MULTIPLE_POLL_TYPE,
+  NUMBER_POLL_TYPE,
+  REGULAR_POLL_TYPE,
+} from "discourse/plugins/poll/controllers/poll-ui-builder";
 
 controllerModule("controller:poll-ui-builder", {
   setupController(controller) {
-    controller.set("toolbarEvent", {
-      getText: () => "",
-    });
+    controller.set("toolbarEvent", { getText: () => "" });
+    controller.onShow();
   },
   needs: ["controller:modal"],
 });
@@ -13,17 +17,16 @@ test("isMultiple", function (assert) {
   const controller = this.subject();
 
   controller.setProperties({
-    pollType: controller.multiplePollType,
-    pollOptions: "a",
+    pollType: MULTIPLE_POLL_TYPE,
+    pollOptions: [{ value: "a" }],
   });
 
   assert.equal(controller.isMultiple, true, "it should be true");
 
-  controller.set("pollOptions", "");
-
-  assert.equal(controller.isMultiple, false, "it should be false");
-
-  controller.setProperties({ pollType: "random", pollOptions: "b" });
+  controller.setProperties({
+    pollType: "random",
+    pollOptions: [{ value: "b" }],
+  });
 
   assert.equal(controller.isMultiple, false, "it should be false");
 });
@@ -31,170 +34,58 @@ test("isMultiple", function (assert) {
 test("isNumber", function (assert) {
   const controller = this.subject();
 
-  controller.set("pollType", controller.regularPollType);
+  controller.set("pollType", REGULAR_POLL_TYPE);
 
   assert.equal(controller.isNumber, false, "it should be false");
 
-  controller.set("pollType", controller.numberPollType);
+  controller.set("pollType", NUMBER_POLL_TYPE);
 
   assert.equal(controller.isNumber, true, "it should be true");
 });
 
-test("showMinMax", function (assert) {
-  const controller = this.subject();
-
-  controller.set("pollType", controller.numberPollType);
-  assert.equal(controller.showMinMax, true, "it should be true");
-
-  controller.set("pollType", controller.multiplePollType);
-  assert.equal(controller.showMinMax, true, "it should be true");
-
-  controller.set("pollType", controller.regularPollType);
-  assert.equal(controller.showMinMax, false, "it should be false");
-});
-
 test("pollOptionsCount", function (assert) {
   const controller = this.subject();
 
-  controller.set("pollOptions", "1\n2\n");
+  controller.set("pollOptions", [{ value: "1" }, { value: "2" }]);
 
   assert.equal(controller.pollOptionsCount, 2, "it should equal 2");
 
-  controller.set("pollOptions", "");
+  controller.set("pollOptions", []);
 
   assert.equal(controller.pollOptionsCount, 0, "it should equal 0");
 });
 
-test("pollMinOptions", function (assert) {
-  const controller = this.subject();
-
-  controller.setProperties({
-    pollType: controller.multiplePollType,
-    pollOptions: "z",
-  });
-
-  assert.deepEqual(
-    controller.pollMinOptions,
-    [{ name: 1, value: 1 }],
-    "it should return the right options"
-  );
-
-  controller.set("pollOptions", "z\nx");
-
-  assert.deepEqual(
-    controller.pollMinOptions,
-    [
-      { name: 1, value: 1 },
-      { name: 2, value: 2 },
-    ],
-    "it should return the right options"
-  );
-
-  controller.set("pollType", controller.numberPollType);
-  controller.siteSettings.poll_maximum_options = 2;
-
-  assert.deepEqual(
-    controller.pollMinOptions,
-    [
-      { name: 1, value: 1 },
-      { name: 2, value: 2 },
-    ],
-    "it should return the right options"
-  );
-});
-
-test("pollMaxOptions", function (assert) {
-  const controller = this.subject();
-
-  controller.setProperties({
-    pollType: controller.multiplePollType,
-    pollOptions: "y",
-    pollMin: 1,
-  });
-
-  assert.deepEqual(
-    controller.pollMaxOptions,
-    [],
-    "it should return the right options"
-  );
-
-  controller.set("pollOptions", "x\ny");
-
-  assert.deepEqual(
-    controller.pollMaxOptions,
-    [{ name: 2, value: 2 }],
-    "it should return the right options"
-  );
-
-  controller.siteSettings.poll_maximum_options = 3;
-  controller.setProperties({
-    pollType: controller.get("numberPollType"),
-    pollStep: 2,
-    pollMin: 1,
-  });
-
-  assert.deepEqual(
-    controller.pollMaxOptions,
-    [
-      { name: 2, value: 2 },
-      { name: 3, value: 3 },
-      { name: 4, value: 4 },
-      { name: 5, value: 5 },
-      { name: 6, value: 6 },
-    ],
-    "it should return the right options"
-  );
-});
-
-test("pollStepOptions", function (assert) {
-  const controller = this.subject();
-  controller.siteSettings.poll_maximum_options = 3;
-
-  assert.equal(controller.pollStepOptions, null, "is should return null");
-
-  controller.set("pollType", controller.numberPollType);
-
-  assert.deepEqual(
-    controller.pollStepOptions,
-    [
-      { name: 1, value: 1 },
-      { name: 2, value: 2 },
-      { name: 3, value: 3 },
-    ],
-    "it should return the right options"
-  );
-});
-
 test("disableInsert", function (assert) {
   const controller = this.subject();
+  controller.siteSettings.poll_maximum_options = 20;
 
   assert.equal(controller.disableInsert, true, "it should be true");
 
-  controller.set("pollOptions", "a\nb");
+  controller.set("pollOptions", [{ value: "a" }, { value: "b" }]);
 
   assert.equal(controller.disableInsert, false, "it should be false");
 
-  controller.set("pollType", controller.numberPollType);
+  controller.set("pollType", NUMBER_POLL_TYPE);
 
   assert.equal(controller.disableInsert, false, "it should be false");
 
   controller.setProperties({
-    pollType: controller.regularPollType,
-    pollOptions: "a\nb\nc",
+    pollType: REGULAR_POLL_TYPE,
+    pollOptions: [{ value: "a" }, { value: "b" }, { value: "c" }],
   });
 
   assert.equal(controller.disableInsert, false, "it should be false");
 
   controller.setProperties({
-    pollType: controller.regularPollType,
-    pollOptions: "",
+    pollType: REGULAR_POLL_TYPE,
+    pollOptions: [],
   });
 
   assert.equal(controller.disableInsert, true, "it should be true");
 
   controller.setProperties({
-    pollType: controller.regularPollType,
-    pollOptions: "w",
+    pollType: REGULAR_POLL_TYPE,
+    pollOptions: [{ value: "w" }],
   });
 
   assert.equal(controller.disableInsert, false, "it should be false");
@@ -205,7 +96,7 @@ test("number pollOutput", function (assert) {
   controller.siteSettings.poll_maximum_options = 20;
 
   controller.setProperties({
-    pollType: controller.numberPollType,
+    pollType: NUMBER_POLL_TYPE,
     pollMin: 1,
   });
 
@@ -244,10 +135,9 @@ test("regular pollOutput", function (assert) {
   const controller = this.subject();
   controller.siteSettings.poll_maximum_options = 20;
 
-  controller.set("pollOptions", "1\n2");
   controller.setProperties({
-    pollOptions: "1\n2",
-    pollType: controller.regularPollType,
+    pollOptions: [{ value: "1" }, { value: "2" }],
+    pollType: REGULAR_POLL_TYPE,
   });
 
   assert.equal(
@@ -278,9 +168,9 @@ test("multiple pollOutput", function (assert) {
   controller.siteSettings.poll_maximum_options = 20;
 
   controller.setProperties({
-    pollType: controller.multiplePollType,
+    pollType: MULTIPLE_POLL_TYPE,
     pollMin: 1,
-    pollOptions: "\n\n1\n\n2",
+    pollOptions: [{ value: "1" }, { value: "2" }],
   });
 
   assert.equal(
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 8c8cb8dae7..3edd1c3e59 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,8 +1,8 @@
-import EmberObject from "@ember/object";
 import {
   moduleForWidget,
   widgetTest,
 } from "discourse/tests/helpers/widget-test";
+import EmberObject from "@ember/object";
 import { queryAll } from "discourse/tests/helpers/qunit-helpers";
 
 moduleForWidget("discourse-poll-standard-results");
diff --git a/plugins/poll/test/javascripts/widgets/discourse-poll-test.js.es6 b/plugins/poll/test/javascripts/widgets/discourse-poll-test.js.es6
index 3ecf17cc6a..6be48becf7 100644
--- a/plugins/poll/test/javascripts/widgets/discourse-poll-test.js.es6
+++ b/plugins/poll/test/javascripts/widgets/discourse-poll-test.js.es6
@@ -1,9 +1,9 @@
-import I18n from "I18n";
-import EmberObject from "@ember/object";
 import {
   moduleForWidget,
   widgetTest,
 } from "discourse/tests/helpers/widget-test";
+import EmberObject from "@ember/object";
+import I18n from "I18n";
 import { queryAll } from "discourse/tests/helpers/qunit-helpers";
 
 let requests = 0;
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.js.es6 b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.js.es6
index b5fa4460ea..3c71339b78 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.js.es6
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.js.es6
@@ -1,4 +1,10 @@
 export default Ember.Component.extend({
   tagName: "section",
   classNames: ["styleguide-example"],
+  value: null,
+
+  init() {
+    this._super(...arguments);
+    this.value = this.initialValue;
+  },
 });
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.js.es6 b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.js.es6
index a11836c7a3..ab2be7eb7d 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.js.es6
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.js.es6
@@ -1,21 +1,20 @@
-import { later } from "@ember/runloop";
+import { afterRender } from "discourse-common/utils/decorators";
 
 export default Ember.Component.extend({
   tagName: "section",
   classNames: ["styleguide-icons"],
-  iconIDs: [],
+  iconIds: [],
 
-  didInsertElement() {
+  init() {
     this._super(...arguments);
+    this.setIconIds();
+  },
 
-    later(() => {
-      let IDs = $("#svg-sprites symbol")
-        .map(function () {
-          return this.id;
-        })
-        .get();
+  @afterRender
+  setIconIds() {
+    let symbols = document.querySelectorAll("#svg-sprites symbol");
+    let ids = Array.from(symbols).mapBy("id");
 
-      this.set("iconIDs", IDs);
-    }, 2000);
+    this.set("iconIds", ids);
   },
 });
diff --git a/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js.es6 b/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js.es6
index 1ace401581..c036e4c366 100644
--- a/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js.es6
+++ b/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js.es6
@@ -47,7 +47,7 @@ export function createData(store) {
       website_name: "My Website is Discourse",
       location: "Toronto",
       suspend_reason: "Some reason",
-      displayGroups: [{ name: "Group 1" }, { name: "Group 2" }],
+      groups: [{ name: "Group 1" }, { name: "Group 2" }],
       created_at: moment().subtract(10, "days"),
       last_posted_at: moment().subtract(3, "days"),
       last_seen_at: moment().subtract(1, "days"),
@@ -55,7 +55,7 @@ export function createData(store) {
       invited_by: {
         username: "user_2",
       },
-      trustLevel: { name: "Dummy" },
+      trust_level: 1,
       publicUserFields: [
         {
           field: {
@@ -93,13 +93,13 @@ export function createData(store) {
         {
           id: topicId,
           title: `Example Topic Title ${topicId}`,
-          fancyTitle: `Example Topic Title ${topicId}`,
+          fancy_title: `Example Topic Title ${topicId}`,
           slug: `example-topic-title-${topicId}`,
           posts_count: ((topicId * 1234) % 100) + 1,
           views: ((topicId * 123) % 1000) + 1,
           like_count: topicId % 3,
           created_at: `2017-03-${topicId}`,
-          invisible: false,
+          visible: true,
           posters: [
             { extras: "latest", user },
             { user: createUser() },
@@ -113,21 +113,26 @@ export function createData(store) {
     );
   };
 
-  let topic = createTopic();
-  topic.set("category", categories[0]);
-  topic.get("details").setProperties({
+  let topic = createTopic({ tags: ["example", "apple"] });
+  topic.details.updateFromJson({
     can_create_post: true,
+    can_invite_to: false,
+    can_delete: false,
+    can_close_topic: false,
+  });
+  topic.setProperties({
+    category_id: categories[0].id,
     suggested_topics: [topic, topic, topic],
   });
 
-  let invisibleTopic = createTopic({ invisible: true });
+  let invisibleTopic = createTopic({ visible: false });
   let closedTopic = createTopic({ closed: true });
-  closedTopic.set("category", categories[1]);
+  closedTopic.set("category_id", categories[1].id);
   let archivedTopic = createTopic({ archived: true });
   let pinnedTopic = createTopic({ pinned: true });
   pinnedTopic.set("clearPin", () => pinnedTopic.set("pinned", "unpinned"));
   pinnedTopic.set("rePin", () => pinnedTopic.set("pinned", "pinned"));
-  pinnedTopic.set("category", categories[2]);
+  pinnedTopic.set("category_id", categories[2].id);
   let unpinnedTopic = createTopic({ unpinned: true });
   let warningTopic = createTopic({ is_warning: true });
 
@@ -214,7 +219,7 @@ export function createData(store) {
     navItems: ["latest", "categories", "top"].map((name) => {
       let item = NavItem.fromText(name);
 
-      item.set("href", "#");
+      // item.set("href", "#");
 
       if (name === "categories") {
         item.set("styleGuideActive", true);
@@ -250,8 +255,6 @@ export function createData(store) {
 
     topicTimerUpdateDate: "2017-10-18 18:00",
 
-    categoryNames: categories.map((c) => c.name),
-
     groups: [
       { name: "staff", id: 1, automatic: false },
       { name: "lounge", id: 2, automatic: true },
diff --git a/plugins/styleguide/assets/javascripts/discourse/routes/styleguide-show.js.es6 b/plugins/styleguide/assets/javascripts/discourse/routes/styleguide-show.js.es6
index 71ca411ddc..21e7dd6552 100644
--- a/plugins/styleguide/assets/javascripts/discourse/routes/styleguide-show.js.es6
+++ b/plugins/styleguide/assets/javascripts/discourse/routes/styleguide-show.js.es6
@@ -1,6 +1,6 @@
 import {
-  sectionById,
   findNote,
+  sectionById,
 } from "discourse/plugins/styleguide/discourse/lib/styleguide";
 import { createData } from "discourse/plugins/styleguide/discourse/lib/dummy-data";
 
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/color-example.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/components/color-example.hbs
index 6c52205dc3..9756fd0211 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/components/color-example.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/components/color-example.hbs
@@ -1,2 +1,2 @@
 <div class="color-bg {{color}}"></div>
-<div class="color-name">${{color}}</div>
+<div class="color-name">var(--{{color}})</div>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-example.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-example.hbs
index 9a98389ca3..193911014c 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-example.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-example.hbs
@@ -1,3 +1,3 @@
 <div class="example-title">{{title}}</div>
-<section class="rendered">{{yield}}</section>
+<section class="rendered">{{yield this.value}}</section>
 <div class="clearfix"></div>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-icons.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-icons.hbs
index 996790bb48..4b0bf42fab 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-icons.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-icons.hbs
@@ -1,6 +1,6 @@
-{{#each iconIDs as |id|}}
+{{#each iconIds as |id|}}
   <div class="styleguide-icon">
-    {{ d-icon id }}
+    {{d-icon id}}
     <span>{{id}}</span>
   </div>
 {{/each}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/01-font-scale.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/01-font-scale.hbs
index f2a9d6595c..8df374a686 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/01-font-scale.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/01-font-scale.hbs
@@ -34,66 +34,66 @@
     </p>
     <pre>
       .parent {
-        <span class="hljs-attribute">font-size</span>: $font-up-3;
+        <span class="hljs-attribute">font-size</span>: var(--font-up-3);
         <span>// Increases the relative font-size of this element and its children by 3 steps in the scale</span>
         .child {
-          <span>// If this is set to $font-down-3 in Discourse's default CSS,
-             the parent font-size increase above would make this equivilant to $font-0
-             ($font-down-3 + $font-up-3 = $font-0)</span>
+          <span>// If this is set to var(--font-down-3) in Discourse's default CSS,
+             the parent font-size increase above would make this equivalent to var(--font-0)
+             (var(--font-down-3) + var(--font-up-3) = var(--font-0))</span>
         }
       }
     </pre>
   </p>
 </div>
 
-{{#styleguide-example title="$font-up-6, 2.296em"}}
+{{#styleguide-example title="var(--font-up-6), 2.296em"}}
   <p class="font-up-6">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$font-up-5, 2em"}}
+{{#styleguide-example title="var(--font-up-5), 2em"}}
   <p class="font-up-5">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$font-up-4, 1.7511em"}}
+{{#styleguide-example title="var(--font-up-4), 1.7511em"}}
   <p class="font-up-4">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$font-up-3, 1.5157em"}}
+{{#styleguide-example title="var(--font-up-3), 1.5157em"}}
   <p class="font-up-3">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$font-up-2, 1.3195em"}}
+{{#styleguide-example title="var(--font-up-2), 1.3195em"}}
   <p class="font-up-2">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$font-up-1, 1.1487em"}}
+{{#styleguide-example title="var(--font-up-1), 1.1487em"}}
   <p class="font-up-1">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$font-0, 1em — base font"}}
+{{#styleguide-example title="var(--font-0), 1em — base font"}}
   <p class="font-0">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$font-down-1, 0.8706em"}}
+{{#styleguide-example title="var(--font-down-1), 0.8706em"}}
   <p class="font-down-1">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$font-down-2, 0.7579em"}}
+{{#styleguide-example title="var(--font-down-2), 0.7579em"}}
   <p class="font-down-2">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$font-down-3, 0.6599em"}}
+{{#styleguide-example title="var(--font-down-3), 0.6599em"}}
   <p class="font-down-3">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$font-down-4, 0.5745em"}}
+{{#styleguide-example title="var(--font-down-4), 0.5745em"}}
   <p class="font-down-4">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$font-down-5, 0.5em"}}
+{{#styleguide-example title="var(--font-down-5), 0.5em"}}
   <p class="font-down-5">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$font-down-6, 0.4355em"}}
+{{#styleguide-example title="var(--font-down-6), 0.4355em"}}
   <p class="font-down-6">{{i18n "styleguide.sections.typography.example"}}</p>
 {{/styleguide-example}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/03-colors.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/03-colors.hbs
index a153fccf82..8f35784a94 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/03-colors.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/03-colors.hbs
@@ -1,4 +1,4 @@
-{{#styleguide-example title="$primary"}}
+{{#styleguide-example title="primary"}}
   <section class="color-row">
     {{color-example color="primary-very-low"}}
     {{color-example color="primary-low"}}
@@ -11,7 +11,7 @@
   </section>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$secondary"}}
+{{#styleguide-example title="secondary"}}
   <section class="color-row">
     {{color-example color="secondary-low"}}
     {{color-example color="secondary-medium"}}
@@ -20,7 +20,7 @@
   </section>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$tertiary"}}
+{{#styleguide-example title="tertiary"}}
   <section class="color-row">
     {{color-example color="tertiary-low"}}
     {{color-example color="tertiary-medium"}}
@@ -29,14 +29,14 @@
   </section>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$quaternary"}}
+{{#styleguide-example title="quaternary"}}
   <section class="color-row">
     {{color-example color="quaternary-low"}}
     {{color-example color="quaternary"}}
   </section>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$highlight"}}
+{{#styleguide-example title="highlight"}}
   <section class="color-row">
     {{color-example color="highlight-low"}}
     {{color-example color="highlight-medium"}}
@@ -45,7 +45,7 @@
   </section>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$danger"}}
+{{#styleguide-example title="danger"}}
   <section class="color-row">
     {{color-example color="danger-low"}}
     {{color-example color="danger-low-mid"}}
@@ -54,7 +54,7 @@
   </section>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$success"}}
+{{#styleguide-example title="success"}}
   <section class="color-row">
     {{color-example color="success-low"}}
     {{color-example color="success-medium"}}
@@ -62,9 +62,25 @@
   </section>
 {{/styleguide-example}}
 
-{{#styleguide-example title="$love"}}
+{{#styleguide-example title="love"}}
   <section class="color-row">
     {{color-example color="love-low"}}
     {{color-example color="love"}}
   </section>
 {{/styleguide-example}}
+
+{{#styleguide-example title="header"}}
+  <section class="color-row">
+    {{color-example color="header_background"}}
+  </section>
+  <section class="color-row">
+    {{color-example color="header_primary"}}
+    {{color-example color="header_primary-very-high"}}
+    {{color-example color="header_primary-high"}}
+  </section>
+  <section class="color-row">
+    {{color-example color="header_primary-medium"}}
+    {{color-example color="header_primary-low-mid"}}
+    {{color-example color="header_primary-low"}}
+  </section>
+{{/styleguide-example}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs
index 15508cddf6..0089e62841 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs
@@ -1,35 +1,29 @@
-{{#styleguide-example title="combo-box"}}
-  {{combo-box content=dummy.options}}
+{{#styleguide-example title="combo-box" initialValue=dummy.options.[0].name as |value|}}
+  {{combo-box content=dummy.options value=value onChange=(fn (mut value))}}
 {{/styleguide-example}}
 
-{{#styleguide-example title="filterable combo-box"}}
-  {{combo-box content=dummy.categoryNames filterable=true}}
+{{#styleguide-example title="filterable combo-box" initialValue=dummy.categories.[0].name as |value|}}
+  {{combo-box content=dummy.categories value=value options=(hash filterable=true) onChange=(fn (mut value))}}
 {{/styleguide-example}}
 
-{{#styleguide-example title="combo-box with a default state"}}
-  {{combo-box content=dummy.options none="category.none"}}
+{{#styleguide-example title="combo-box with a default state" initialValue=dummy.options.[0].name as |value|}}
+  {{combo-box content=dummy.options value=value options=(hash none="category.none") onChange=(fn (mut value))}}
 {{/styleguide-example}}
 
-{{#styleguide-example title="combo-box clearable"}}
-  {{combo-box content=dummy.options none="category.none" clearable=true}}
+{{#styleguide-example title="combo-box clearable" initialValue=dummy.options.[0].name as |value|}}
+  {{combo-box content=dummy.options clearable=true value=value options=(hash none="category.none") onChange=(fn (mut value))}}
 {{/styleguide-example}}
 
-{{#styleguide-example title="topic-notifications-options"}}
-  {{topic-notifications-options topic=dummy.topic}}
-{{/styleguide-example}}
-
-{{#styleguide-example title="topic-notifications-button"}}
-  <div id="#topic-footer-buttons">
-    {{topic-notifications-button topic=dummy.topic}}
-  </div>
+{{#styleguide-example title="topic-notifications-options" initialValue=1 as |value|}}
+  {{topic-notifications-options topic=dummy.topic value=value onChange=(fn (mut value))}}
 {{/styleguide-example}}
 
 {{#styleguide-example title="topic-footer-mobile-dropdown"}}
   {{topic-footer-mobile-dropdown topic=dummy.topic}}
 {{/styleguide-example}}
 
-{{#styleguide-example title="category-chooser"}}
-  {{category-chooser}}
+{{#styleguide-example title="category-chooser" initialValue=categories.[0].name as |value|}}
+  {{category-chooser value=value onChange=(fn (mut value))}}
 {{/styleguide-example}}
 
 {{#styleguide-example title="pinned-button"}}
@@ -41,19 +35,19 @@
 {{/styleguide-example}}
 
 {{#styleguide-example title="categories-admin-dropdown"}}
-  {{categories-admin-dropdown}}
+  {{categories-admin-dropdown onChange=(action "dummy")}}
 {{/styleguide-example}}
 
 {{#styleguide-example title="category-notifications-button"}}
-  {{category-notifications-button category=dummy.categories.[0]}}
+  {{category-notifications-button category=dummy.categories.[0] value=1 onChange=(action "dummy")}}
 {{/styleguide-example}}
 
 {{#styleguide-example title="notifications-button"}}
-  {{notifications-button i18nPrefix="groups.notifications" value=1}}
+  {{notifications-button options=(hash i18nPrefix="groups.notifications") value=2 onChange=(action "dummy")}}
 {{/styleguide-example}}
 
 {{#styleguide-example title="dropdown-select-box"}}
-  {{dropdown-select-box content=dummy.options}}
+  {{dropdown-select-box content=dummy.options onChange=(action "dummy")}}
 {{/styleguide-example}}
 
 {{#styleguide-example title="future-date-input-selector"}}
@@ -63,22 +57,22 @@
     input=dummy.topicTimerUpdateDate
     includeWeekend=true
     includeForever=true
-    none="topic.auto_update_input.none"
+    options=(hash none="topic.auto_update_input.none")
   }}
 {{/styleguide-example}}
 
 {{#styleguide-example title="multi-select"}}
-  {{multi-select none="test.none" content=dummy.options}}
+  {{multi-select content=dummy.options options=(hash none="test.none") onChange=(action "dummy")}}
 {{/styleguide-example}}
 
-{{#styleguide-example title="admin-group-selector"}}
-  {{admin-group-selector selected=dummy.selectedGroups content=dummy.groups}}
+{{#styleguide-example title="admin group-chooser"}}
+  {{group-chooser selected=dummy.selectedGroups content=dummy.groups onChange=(action "dummy")}}
 {{/styleguide-example}}
 
 {{#styleguide-example title="list-setting"}}
-  {{list-setting settingValue=dummy.settings}}
+  {{list-setting settingValue=dummy.settings onChange=(action "dummy")}}
 {{/styleguide-example}}
 
 {{#styleguide-example title="list-setting with colors"}}
-  {{list-setting settingValue=dummy.colors nameProperty="color"}}
+  {{list-setting settingValue=dummy.colors nameProperty="color" onChange=(action "dummy")}}
 {{/styleguide-example}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs
index 4d37a461f9..53a46ed927 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs
@@ -3,7 +3,7 @@
 {{/styleguide-example}}
 
 {{#styleguide-example title=".user-main .nav-pills"}}
-  {{#mobile-nav class="main-nav" desktopClass="nav nav-pills user-nav" currentPath=currentPath}}
+  {{#mobile-nav class="main-nav" desktopClass="nav nav-pills user-nav"}}
     {{#each dummy.navItems as |ni|}}
       <li><a href={{ni.href}} class={{if ni.styleGuideActive "active"}}>{{ni.displayName}}</a></li>
     {{/each}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-stacked.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-stacked.hbs
index 59c78e7f06..c9aeca42cb 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-stacked.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-stacked.hbs
@@ -1,5 +1,5 @@
 {{#styleguide-example title=".nav-stacked" class="half-size"}}
-  {{#mobile-nav class="preferences-nav" desktopClass="preferences-list action-list nav-stacked" currentPath=application.currentPath}}
+  {{#mobile-nav class="preferences-nav" desktopClass="preferences-list action-list nav-stacked"}}
     {{#each dummy.navItems as |ni|}}
       <li><a href={{ni.href}} class={{if ni.styleGuideActive "active"}}>{{ni.displayName}}</a></li>
     {{/each}}
@@ -8,7 +8,7 @@
 
 {{#styleguide-example title=".user-navigation .nav-stacked" class="half-size"}}
   {{#d-section class="user-navigation"}}
-    {{#mobile-nav class="preferences-nav" desktopClass="preferences-list action-list nav-stacked" currentPath=application.currentPath}}
+    {{#mobile-nav class="preferences-nav" desktopClass="preferences-list action-list nav-stacked"}}
       {{#each dummy.navItems as |ni|}}
         <li><a href={{ni.href}} class={{if ni.styleGuideActive "active"}}>{{ni.displayName}}</a></li>
       {{/each}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs
index 0e415beac8..e7edad4509 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs
@@ -1,7 +1,5 @@
 {{#styleguide-example title="topic-footer-buttons - logged in"}}
-  {{topic-footer-buttons
-    canInviteTo=true
-    topic=dummy.topic}}
+  {{topic-footer-buttons topic=dummy.topic}}
 {{/styleguide-example}}
 
 {{#styleguide-example title="topic-footer-buttons - anonymous"}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs
new file mode 100644
index 0000000000..76c85a0b50
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs
@@ -0,0 +1,3 @@
+{{#styleguide-example title="basic-topic-list" class="half-size"}}
+  {{basic-topic-list topics=dummy.topics}}
+{{/styleguide-example}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/latest-topic-list.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/latest-topic-list.hbs
deleted file mode 100644
index 6a3d7e77c7..0000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/latest-topic-list.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#styleguide-example title="latest-topic-list" class="half-size"}}
-  {{latest-topic-list topics=dummy.topics}}
-{{/styleguide-example}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/site-header.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/site-header.hbs
new file mode 100644
index 0000000000..7a119db322
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/site-header.hbs
@@ -0,0 +1,16 @@
+{{#styleguide-example title="site header - in topic - scrolled"}}
+  <div class="d-header-wrap">
+    <header class="d-header">
+      <div class="wrap">
+        <div class="contents">
+          {{mount-widget widget="home-logo" args=(hash minimized=true)}}
+          {{mount-widget widget="header-topic-info" args=dummy}}
+          <div class="panel clearfix">
+            {{mount-widget widget="header-icons" args=(hash user=dummy.user)}}
+          </div>
+        </div>
+      </div>
+    </header>
+  </div>
+{{/styleguide-example}}
+
diff --git a/plugins/styleguide/assets/stylesheets/colors.scss b/plugins/styleguide/assets/stylesheets/colors.scss
index a59afb0904..6ca3330715 100644
--- a/plugins/styleguide/assets/stylesheets/colors.scss
+++ b/plugins/styleguide/assets/stylesheets/colors.scss
@@ -1,89 +1,117 @@
 .color-row {
   .primary-very-low {
-    background-color: var(--primary-very-low, $primary-very-low);
+    background-color: var(--primary-very-low);
   }
   .primary-low {
-    background-color: var(--primary-low, $primary-low);
+    background-color: var(--primary-low);
   }
   .primary-low-mid {
-    background-color: var(--primary-low-mid, $primary-low-mid);
+    background-color: var(--primary-low-mid);
   }
   .primary-medium {
-    background-color: var(--primary-medium, $primary-medium);
+    background-color: var(--primary-medium);
   }
   .primary-high {
-    background-color: var(--primary-high, $primary-high);
+    background-color: var(--primary-high);
   }
   .primary {
-    background-color: var(--primary, $primary);
+    background-color: var(--primary);
   }
   .secondary-low {
-    background-color: var(--secondary-low, $secondary-low);
+    background-color: var(--secondary-low);
   }
   .secondary-medium {
-    background-color: var(--secondary-medium, $secondary-medium);
+    background-color: var(--secondary-medium);
   }
   .secondary-high {
-    background-color: var(--secondary-high, $secondary-high);
+    background-color: var(--secondary-high);
   }
   .secondary {
-    background-color: var(--secondary, $secondary);
+    background-color: var(--secondary);
   }
   .tertiary-low {
-    background-color: var(--tertiary-low, $tertiary-low);
+    background-color: var(--tertiary-low);
   }
   .tertiary-medium {
-    background-color: var(--tertiary-medium, $tertiary-medium);
+    background-color: var(--tertiary-medium);
   }
   .tertiary-high {
-    background-color: var(--tertiary-high, $tertiary-high);
+    background-color: var(--tertiary-high);
   }
   .tertiary {
-    background-color: var(--tertiary, $tertiary);
+    background-color: var(--tertiary);
   }
   .quaternary-low {
-    background-color: var(--quaternary-low, $quaternary-low);
+    background-color: var(--quaternary-low);
   }
   .quaternary {
-    background-color: var(--quaternary, $quaternary);
+    background-color: var(--quaternary);
   }
   .highlight-low {
-    background-color: var(--highlight-low, $highlight-low);
+    background-color: var(--highlight-low);
   }
   .highlight-medium {
-    background-color: var(--highlight-medium, $highlight-medium);
+    background-color: var(--highlight-medium);
   }
   .highlight-high {
-    background-color: var(--highlight-high, $highlight-high);
+    background-color: var(--highlight-high);
   }
   .highlight {
-    background-color: var(--highlight, $highlight);
+    background-color: var(--highlight);
   }
   .danger-low {
-    background-color: var(--danger-low, $danger-low);
+    background-color: var(--danger-low);
   }
   .danger-low-mid {
-    background-color: var(--danger-low-mid, $danger-low-mid);
+    background-color: var(--danger-low-mid);
   }
   .danger-medium {
-    background-color: var(--danger-medium, $danger-medium);
+    background-color: var(--danger-medium);
   }
   .danger {
-    background-color: var(--danger, $danger);
+    background-color: var(--danger);
   }
   .success-low {
-    background-color: var(--success-low, $success-low);
+    background-color: var(--success-low);
   }
   .success-medium {
-    background-color: var(--success-medium, $success-medium);
+    background-color: var(--success-medium);
   }
   .success {
-    background-color: var(--success, $success);
+    background-color: var(--success);
   }
   .love-low {
-    background-color: var(--love-low, $love-low);
+    background-color: var(--love-low);
   }
   .love {
-    background-color: var(--love, $love);
+    background-color: var(--love);
+  }
+
+  .header_primary {
+    background-color: var(--header_primary);
+  }
+
+  .header_background {
+    background-color: var(--header_background);
+  }
+
+  .header_primary-low {
+    background-color: var(--header_primary-low);
+  }
+
+  .header_primary-low-mid {
+    background-color: var(--header_primary-low-mid);
+  }
+
+  .header_primary-medium {
+    background-color: var(--header_primary-medium);
+  }
+
+  .header_primary-high {
+    background-color: var(--header_primary-high);
+  }
+
+  .header_primary-very-high {
+    background-color: var(--header_primary-very-high);
   }
 }
diff --git a/plugins/styleguide/assets/stylesheets/styleguide.scss b/plugins/styleguide/assets/stylesheets/styleguide.scss
index 942a1d9496..5f2b6425b4 100644
--- a/plugins/styleguide/assets/stylesheets/styleguide.scss
+++ b/plugins/styleguide/assets/stylesheets/styleguide.scss
@@ -6,19 +6,21 @@
 
   .styleguide-note {
     padding: 1em;
-    background-color: var(--tertiary, $tertiary);
+    background-color: var(--tertiary);
     margin-bottom: 1em;
   }
 
   .styleguide-menu {
+    margin-top: 1em;
     flex: 1 0 0;
 
     ul {
       list-style: none;
-      margin-bottom: 2em;
+      margin-bottom: 1.5em;
+      margin-left: 0;
 
       li.styleguide-heading {
-        color: var(--primary-medium, $primary-medium);
+        color: var(--primary-medium);
         text-transform: uppercase;
         font-size: 14px;
       }
@@ -27,7 +29,7 @@
         margin-bottom: 0.25em;
 
         a {
-          color: var(--primary, $primary);
+          color: var(--primary);
           font-size: 14px;
         }
 
@@ -45,9 +47,9 @@
 
   .styleguide-section {
     .section-title {
-      font-size: $font-up-6;
+      font-size: var(--font-up-5);
       font-weight: normal;
-      margin-bottom: 1em;
+      margin-bottom: 0.5em;
     }
 
     .section-description {
@@ -64,15 +66,16 @@
 
     .styleguide-example {
       .example-title {
-        color: var(--primary-medium, $primary-medium);
-        font-size: 0.8em;
-        border-bottom: 1px solid var(--primary-low, $primary-low);
-        margin-bottom: 0.8em;
+        color: var(--primary-medium);
+        font-size: var(--font-0);
+        border-bottom: 1px solid var(--primary-low);
+        margin-bottom: 1em;
       }
 
       .rendered {
         width: 100%;
       }
+
       margin-bottom: 2em;
     }
   }
@@ -102,7 +105,7 @@
   }
 
   pre {
-    background: var(--primary-very-low, $primary-very-low);
+    background: var(--primary-very-low);
     white-space: pre-wrap;
     &.pre-inline {
       display: inline-block;
@@ -110,7 +113,7 @@
       vertical-align: bottom;
     }
     span {
-      color: var(--primary-medium, $primary-medium);
+      color: var(--primary-medium);
       &.hljs-attribute {
         color: teal;
       }
@@ -119,7 +122,7 @@
 
   p.reason {
     display: inline;
-    color: var(--primary-medium, $primary-medium);
+    color: var(--primary-medium);
     margin: 0 0 0 10px;
   }
 }
@@ -149,7 +152,7 @@
   grid-gap: 10px;
 
   .styleguide-icon {
-    background-color: var(--primary-low, $primary-low);
+    background-color: var(--primary-low);
     margin: 3px;
     text-align: center;
     padding: 10px;
@@ -160,7 +163,7 @@
       margin: 5px auto;
     }
     span {
-      font-size: $font-down-1;
+      font-size: var(--font-down-1);
     }
   }
 }
diff --git a/plugins/styleguide/assets/stylesheets/typography.scss b/plugins/styleguide/assets/stylesheets/typography.scss
index 29cd8db9c8..9550481c15 100644
--- a/plugins/styleguide/assets/stylesheets/typography.scss
+++ b/plugins/styleguide/assets/stylesheets/typography.scss
@@ -3,41 +3,41 @@ p[class*="font-"] {
 }
 
 .font-up-6 {
-  font-size: $font-up-6;
+  font-size: var(--font-up-6);
 }
 .font-up-5 {
-  font-size: $font-up-5;
+  font-size: var(--font-up-5);
 }
 .font-up-4 {
-  font-size: $font-up-4;
+  font-size: var(--font-up-4);
 }
 .font-up-3 {
-  font-size: $font-up-3;
+  font-size: var(--font-up-3);
 }
 .font-up-2 {
-  font-size: $font-up-2;
+  font-size: var(--font-up-2);
 }
 .font-up-1 {
-  font-size: $font-up-1;
+  font-size: var(--font-up-1);
 }
 .font-0 {
-  font-size: $font-0;
+  font-size: var(--font-0);
 }
 .font-down-1 {
-  font-size: $font-down-1;
+  font-size: var(--font-down-1);
 }
 .font-down-2 {
-  font-size: $font-down-2;
+  font-size: var(--font-down-2);
 }
 .font-down-3 {
-  font-size: $font-down-3;
+  font-size: var(--font-down-3);
 }
 .font-down-4 {
-  font-size: $font-down-4;
+  font-size: var(--font-down-4);
 }
 .font-down-5 {
-  font-size: $font-down-5;
+  font-size: var(--font-down-5);
 }
 .font-down-6 {
-  font-size: $font-down-6;
+  font-size: var(--font-down-6);
 }
diff --git a/plugins/styleguide/config/locales/client.ar.yml b/plugins/styleguide/config/locales/client.ar.yml
index c7df6c0338..df76dc07b8 100644
--- a/plugins/styleguide/config/locales/client.ar.yml
+++ b/plugins/styleguide/config/locales/client.ar.yml
@@ -17,6 +17,7 @@ ar:
         typography:
           title: "أسلوب الطباعة"
           example: "مرحبًا بك في دِسكورس"
+          paragraph: "لوريم إيبسوم(Lorem Ipsum) هو ببساطة نص شكلي (بمعنى أن الغاية هي الشكل وليس المحتوى) ويُستخدم في صناعات المطابع ودور النشر. كان لوريم إيبسوم ولايزال المعيار للنص الشكلي منذ القرن الخامس عشر عندما قامت مطبعة مجهولة برص مجموعة من الأحرف بشكل عشوائي أخذتها من نص، لتكوّن كتيّب بمثابة دليل أو مرجع شكلي لهذه الأحرف. خمسة قرون من الزمن لم تقضي على هذا النص، بل انه حتى صار مستخدماً وبشكله الأصلي في الطباعة والتنضيد الإلكتروني. انتشر بشكل كبير في ستينيّات هذا القرن مع إصدار رقائق \"ليتراسيت\" (Letraset) البلاستيكية تحوي مقاطع من هذا النص، وعاد لينتشر مرة أخرى مؤخراَ مع ظهور برامج النشر الإلكتروني مثل \"ألدوس بايج مايكر\" (Aldus PageMaker) والتي حوت أيضاً على نسخ من نص لوريم إيبسوم."
         date_time_inputs:
           title: "حقول إدخال التاريخ/الوقت"
         font_scale:
@@ -52,8 +53,8 @@ ar:
           title: "حالات المواضيع"
         topic_list:
           title: "قائمة المواضيع"
-        latest_topic_list:
-          title: "قائمة المواضيع الحديثة"
+        basic_topic_list:
+          title: "عد إلى قائمة الموضوعات"
         footer_message:
           title: "رسالة التذييل"
         signup_cta:
@@ -68,10 +69,16 @@ ar:
           title: "المشاركة"
         topic_map:
           title: "خريطة الموضوع"
+        site_header:
+          title: "رأس الموقع"
         suggested_topics:
           title: "المواضيع المقترحة"
         post_menu:
           title: "قائمة المشاركة"
+        modal:
+          title: "نموذج"
+          header: "عنوان دالة"
+          footer: "تذييل مشروط"
         user_about:
           title: "مربّع ”عن المستخدم“"
         header_icons:
diff --git a/plugins/styleguide/config/locales/client.be.yml b/plugins/styleguide/config/locales/client.be.yml
index 2e3980a624..6dc0110caa 100644
--- a/plugins/styleguide/config/locales/client.be.yml
+++ b/plugins/styleguide/config/locales/client.be.yml
@@ -4,4 +4,23 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-be: 
+be:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "Сардэчна запрашаем у дыскурсе"
+        colors:
+          title: "<......"
+        icons:
+          title: "абразкі"
+        categories:
+          title: "Катэгорыі"
+        navigation:
+          title: "рух"
+        categories_list:
+          title: "Спіс катэгорый"
+        post:
+          title: "Паведамленне"
+        suggested_topics:
+          title: "Прапанаваныя тэмы"
diff --git a/plugins/styleguide/config/locales/client.bg.yml b/plugins/styleguide/config/locales/client.bg.yml
index 6c61d82645..62d9d785f9 100644
--- a/plugins/styleguide/config/locales/client.bg.yml
+++ b/plugins/styleguide/config/locales/client.bg.yml
@@ -4,4 +4,21 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-bg: 
+bg:
+  js:
+    styleguide:
+      sections:
+        colors:
+          title: "Цветове"
+        icons:
+          title: "Икони"
+        categories:
+          title: "Категории"
+        navigation:
+          title: "Навигация"
+        categories_list:
+          title: "Списък с категории"
+        post:
+          title: "Публикация"
+        suggested_topics:
+          title: "Подобни теми"
diff --git a/plugins/styleguide/config/locales/client.bs_BA.yml b/plugins/styleguide/config/locales/client.bs_BA.yml
index 509ba581f8..cdc6dbbee3 100644
--- a/plugins/styleguide/config/locales/client.bs_BA.yml
+++ b/plugins/styleguide/config/locales/client.bs_BA.yml
@@ -4,4 +4,21 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-bs_BA: 
+bs_BA:
+  js:
+    styleguide:
+      sections:
+        colors:
+          title: "Colors"
+        categories:
+          title: "Kategorije"
+        navigation:
+          title: "Navigacija"
+        categories_list:
+          title: "Lista Kategorija"
+        topic_timer_info:
+          title: "Trajanje tema"
+        post:
+          title: "Objava"
+        suggested_topics:
+          title: "Preporučene teme"
diff --git a/plugins/styleguide/config/locales/client.ca.yml b/plugins/styleguide/config/locales/client.ca.yml
index 3eba30e02a..2d57adee81 100644
--- a/plugins/styleguide/config/locales/client.ca.yml
+++ b/plugins/styleguide/config/locales/client.ca.yml
@@ -4,4 +4,25 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-ca: 
+ca:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "Benvingut a Discourse"
+        colors:
+          title: "Colors"
+        icons:
+          title: "Icones"
+        categories:
+          title: "Categories"
+        navigation:
+          title: "Navegació"
+        categories_list:
+          title: "Llista de categories"
+        topic_timer_info:
+          title: "Temporitzadors de temes"
+        post:
+          title: "Publicació"
+        suggested_topics:
+          title: "Temes recomanats"
diff --git a/plugins/styleguide/config/locales/client.cs.yml b/plugins/styleguide/config/locales/client.cs.yml
index f3265c8c88..ec570e4f84 100644
--- a/plugins/styleguide/config/locales/client.cs.yml
+++ b/plugins/styleguide/config/locales/client.cs.yml
@@ -4,4 +4,25 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-cs: 
+cs:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "Vítejte v Discourse"
+        colors:
+          title: "Barvy"
+        icons:
+          title: "Ikony"
+        categories:
+          title: "Kategorie"
+        navigation:
+          title: "Navigace"
+        categories_list:
+          title: "Seznam kategorií"
+        topic_timer_info:
+          title: "Časovače tématu "
+        post:
+          title: "Příspěvek"
+        suggested_topics:
+          title: "Doporučená témata"
diff --git a/plugins/styleguide/config/locales/client.da.yml b/plugins/styleguide/config/locales/client.da.yml
index 1aa92f22af..38d361ab80 100644
--- a/plugins/styleguide/config/locales/client.da.yml
+++ b/plugins/styleguide/config/locales/client.da.yml
@@ -4,4 +4,84 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-da: 
+da:
+  js:
+    styleguide:
+      title: "Styleguide"
+      welcome: "For at komme i gang, vælg en sektion fra menuen til venstre."
+      categories:
+        atoms: Atomer
+        molecules: Molekyler
+        organisms: Organismer
+      sections:
+        typography:
+          title: "Typografi"
+          example: "Velkommen til Discourse"
+          paragraph: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+        date_time_inputs:
+          title: "Dato/klokkeslæt input"
+        font_scale:
+          title: "Skrifttype"
+        colors:
+          title: "Farver"
+        icons:
+          title: "Ikoner"
+          full_list: "Se den fulde liste over Font Awesome Ikoner"
+        input_fields:
+          title: "Indtastningsfelter"
+        buttons:
+          title: "Knapper"
+        dropdowns:
+          title: "Rullebokse"
+        categories:
+          title: "Kategorier"
+        bread_crumbs:
+          title: "Brødkrummer"
+        navigation:
+          title: "Navigation"
+        navigation_bar:
+          title: "Navigationsbjælke"
+        navigation_stacked:
+          title: "Navigation overlappet"
+        categories_list:
+          title: "Kategorioversigt"
+        topic_link:
+          title: "Emne Link"
+        topic_list_item:
+          title: "Emnelisteelement"
+        topic_statuses:
+          title: "Emne Statusser"
+        topic_list:
+          title: "Emneliste"
+        basic_topic_list:
+          title: "Grundlæggende Emneliste"
+        footer_message:
+          title: "Sidefod Besked"
+        signup_cta:
+          title: "Tilmeld CTA"
+        topic_timer_info:
+          title: "Emne-timere"
+        topic_footer_buttons:
+          title: "Knapper til emnesidefod"
+        topic_notifications:
+          title: "Emnemeddelelser"
+        post:
+          title: "Indlæg"
+        topic_map:
+          title: "Emnekort"
+        site_header:
+          title: "Sidehoved"
+        suggested_topics:
+          title: "Foreslåede emner"
+        post_menu:
+          title: "Send menu"
+        modal:
+          title: "Modal"
+          header: "Modal titel"
+          footer: "Modal sidefod"
+        user_about:
+          title: "Om bruger boks"
+        header_icons:
+          title: "Sidehoved ikoner"
+        spinners:
+          title: "Spinnere"
diff --git a/plugins/styleguide/config/locales/client.de.yml b/plugins/styleguide/config/locales/client.de.yml
index 6745cfb8f9..23eb8684f3 100644
--- a/plugins/styleguide/config/locales/client.de.yml
+++ b/plugins/styleguide/config/locales/client.de.yml
@@ -53,8 +53,8 @@ de:
           title: "Themenstatus"
         topic_list:
           title: "Themenliste"
-        latest_topic_list:
-          title: "Aktuelle Themen"
+        basic_topic_list:
+          title: "Grundlegende Themenliste"
         footer_message:
           title: "Fußzeile"
         signup_cta:
@@ -69,6 +69,8 @@ de:
           title: "Beitrag"
         topic_map:
           title: "Thema-Zusammenfassung"
+        site_header:
+          title: "Seitenkopf"
         suggested_topics:
           title: "Vorgeschlagene Themen"
         post_menu:
diff --git a/plugins/styleguide/config/locales/client.el.yml b/plugins/styleguide/config/locales/client.el.yml
index 1ef87229b3..0240efbbfd 100644
--- a/plugins/styleguide/config/locales/client.el.yml
+++ b/plugins/styleguide/config/locales/client.el.yml
@@ -4,4 +4,25 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-el: 
+el:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "Καλώς ήρθατε στο Discourse"
+        colors:
+          title: "Χρώματα"
+        icons:
+          title: "Εικονίδια"
+        categories:
+          title: "Κατηγορίες"
+        navigation:
+          title: "Πλοήγηση"
+        categories_list:
+          title: "Λίστα Κατηγοριών"
+        topic_timer_info:
+          title: "Χρονοδιακόπτες Νημάτων"
+        post:
+          title: "Ανάρτηση"
+        suggested_topics:
+          title: "Προτεινόμενα θέματα"
diff --git a/plugins/styleguide/config/locales/client.en.yml b/plugins/styleguide/config/locales/client.en.yml
index b9e2bf77ee..c806d5669d 100644
--- a/plugins/styleguide/config/locales/client.en.yml
+++ b/plugins/styleguide/config/locales/client.en.yml
@@ -49,8 +49,8 @@ en:
           title: "Topic Statuses"
         topic_list:
           title: "Topic List"
-        latest_topic_list:
-          title: "Latest Topic List"
+        basic_topic_list:
+          title: "Basic Topic List"
         footer_message:
           title: "Footer Message"
         signup_cta:
@@ -65,6 +65,8 @@ en:
           title: "Post"
         topic_map:
           title: "Topic Map"
+        site_header:
+          title: "Site Header"
         suggested_topics:
           title: "Suggested Topics"
         post_menu:
diff --git a/plugins/styleguide/config/locales/client.en_GB.yml b/plugins/styleguide/config/locales/client.en_GB.yml
new file mode 100644
index 0000000000..63a70bdb43
--- /dev/null
+++ b/plugins/styleguide/config/locales/client.en_GB.yml
@@ -0,0 +1,12 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
+  js:
+    styleguide:
+      sections:
+        colors:
+          title: "Colours"
diff --git a/plugins/styleguide/config/locales/client.es.yml b/plugins/styleguide/config/locales/client.es.yml
index 3f1ae94dd2..151501ba44 100644
--- a/plugins/styleguide/config/locales/client.es.yml
+++ b/plugins/styleguide/config/locales/client.es.yml
@@ -53,8 +53,8 @@ es:
           title: "Estados de los temas"
         topic_list:
           title: "Lista de temas"
-        latest_topic_list:
-          title: "Lista de temas recientes"
+        basic_topic_list:
+          title: "Lista básica de temas"
         footer_message:
           title: "Mensaje de pie de página"
         signup_cta:
@@ -69,6 +69,8 @@ es:
           title: "Publicación"
         topic_map:
           title: "Mapa del tema"
+        site_header:
+          title: "Encabezado del sitio"
         suggested_topics:
           title: "Temas sugeridos"
         post_menu:
diff --git a/plugins/styleguide/config/locales/client.et.yml b/plugins/styleguide/config/locales/client.et.yml
index 5702d705bb..2f153c736a 100644
--- a/plugins/styleguide/config/locales/client.et.yml
+++ b/plugins/styleguide/config/locales/client.et.yml
@@ -4,4 +4,25 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-et: 
+et:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "Tere tulemast Discourse'i"
+        colors:
+          title: "Värvid"
+        icons:
+          title: "Ikoonid"
+        categories:
+          title: "Kategooriad"
+        navigation:
+          title: "Navigatsioon"
+        categories_list:
+          title: "Foorumite loend"
+        topic_timer_info:
+          title: "Teemade taimerid"
+        post:
+          title: "Postitus"
+        suggested_topics:
+          title: "Soovitatud teemad"
diff --git a/plugins/styleguide/config/locales/client.fa_IR.yml b/plugins/styleguide/config/locales/client.fa_IR.yml
index 2b80a74fec..beaa8c7182 100644
--- a/plugins/styleguide/config/locales/client.fa_IR.yml
+++ b/plugins/styleguide/config/locales/client.fa_IR.yml
@@ -7,29 +7,81 @@
 fa_IR:
   js:
     styleguide:
+      title: "راهنمای سبک"
       welcome: "برای شروع، از فهرست سمت چپ یک گزینه را انتخاب کنید."
+      categories:
+        atoms: اتم‌ها
+        molecules: مولکول ها
+        organisms: موجودات زنده
       sections:
         typography:
-          example: "به سامانه گفتمان Discourse خوش آمدید!"
+          title: "تایپوگرافی"
+          example: "به دیسکورس خوش آمدید"
+          paragraph: "لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ، و با استفاده از طراحان گرافیک است، چاپگرها و متون بلکه روزنامه و مجله در ستون و سطرآنچنان که لازم است، و برای شرایط فعلی تکنولوژی مورد نیاز، و کاربردهای متنوع با هدف بهبود ابزارهای کاربردی می باشد، کتابهای زیادی در شصت و سه درصد گذشته حال و آینده، شناخت فراوان جامعه و متخصصان را می طلبد، تا با نرم افزارها شناخت بیشتری را برای طراحان رایانه ای علی الخصوص طراحان خلاقی، و فرهنگ پیشرو در زبان فارسی ایجاد کرد، در این صورت می توان امید داشت که تمام و دشواری موجود در ارائه راهکارها، و شرایط سخت تایپ به پایان رسد و زمان مورد نیاز شامل حروفچینی دستاوردهای اصلی، و جوابگوی سوالات پیوسته اهل دنیای موجود طراحی اساسا مورد استفاده قرار گیرد."
+        date_time_inputs:
+          title: "ورودی های تاریخ / زمان"
+        font_scale:
+          title: "سیستم فونت"
         colors:
           title: "رنگ‌ها"
         icons:
-          title: "نشانه‌ها"
-          full_list: "نمایش لیست تمامی نشانه‌های Font Awesome"
+          title: "آیکن‌ها"
+          full_list: "نمایش لیست تمامی آیکن‌ها Font Awesome"
+        input_fields:
+          title: "فیلدهای ورودی"
         buttons:
           title: "دکمه ها"
+        dropdowns:
+          title: "کرکره‌ای"
         categories:
           title: "دسته‌بندی‌ها"
+        bread_crumbs:
+          title: "مسیر راهنما"
         navigation:
           title: "ناوبری"
+        navigation_bar:
+          title: "نوار ناوبری"
+        navigation_stacked:
+          title: "پنل انتخاب تنظیمات"
+        categories_list:
+          title: "لیست دسته ها"
         topic_link:
           title: "پیوند/لینک موضوع"
+        topic_list_item:
+          title: "مورد لیست سرفصل"
+        topic_statuses:
+          title: "وضعیت‌های موضوع"
         topic_list:
           title: "فهرست موضوعات"
-        latest_topic_list:
-          title: "آخرین فهرست موضوعات"
+        basic_topic_list:
+          title: "فهرست موضوعات اصلی"
+        footer_message:
+          title: "پیام پاورقی"
+        signup_cta:
+          title: "فراخوانی اقدام ثبت نام"
+        topic_timer_info:
+          title: "زمانسنج‌های سرفصل"
+        topic_footer_buttons:
+          title: "دکمه‌های پاورقی موضوع"
+        topic_notifications:
+          title: "اعلانات سرفصل"
+        post:
+          title: "نوشته"
+        topic_map:
+          title: "نقشه سرفصل"
+        site_header:
+          title: "سربرگ سایت"
+        suggested_topics:
+          title: "سرفصل‌های پیشنهادی"
+        post_menu:
+          title: "منوی نوشته"
         modal:
+          title: "مودال"
           header: "عنوان پنجره (مودال)"
           footer: "پایین پنجره (مودال)"
         user_about:
           title: "جعبه درباره کاربر"
+        header_icons:
+          title: "نمادهای سربرگ"
+        spinners:
+          title: "چرخنده"
diff --git a/plugins/styleguide/config/locales/client.fi.yml b/plugins/styleguide/config/locales/client.fi.yml
index b10a8718e0..fb7b04543d 100644
--- a/plugins/styleguide/config/locales/client.fi.yml
+++ b/plugins/styleguide/config/locales/client.fi.yml
@@ -4,4 +4,84 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-fi: 
+fi:
+  js:
+    styleguide:
+      title: "Tyyliopas"
+      welcome: "Aloita valitsemalla osio vasemmalla olevasta valikosta."
+      categories:
+        atoms: Atomit
+        molecules: Molekyylit
+        organisms: Organismit
+      sections:
+        typography:
+          title: "Typografia"
+          example: "Tervetuloa käyttämään Discoursea"
+          paragraph: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+        date_time_inputs:
+          title: "Päivämäärä-/kellonaikakentät"
+        font_scale:
+          title: "Fonttijärjestelmä"
+        colors:
+          title: "Värit"
+        icons:
+          title: "Kuvakkeet"
+          full_list: "Katso koko lista Font Awesome -kuvakkeista"
+        input_fields:
+          title: "Tekstikentät"
+        buttons:
+          title: "Painikkeet"
+        dropdowns:
+          title: "Alasvetovalikot"
+        categories:
+          title: "Keskustelualueet"
+        bread_crumbs:
+          title: "Navigointipolku"
+        navigation:
+          title: "Navigointi"
+        navigation_bar:
+          title: "Navigointipalkki"
+        navigation_stacked:
+          title: "Pystynavigointi"
+        categories_list:
+          title: "Aluelistaus"
+        topic_link:
+          title: "Ketjun linkki"
+        topic_list_item:
+          title: "Ketjulistauksen osa"
+        topic_statuses:
+          title: "Ketjun tilat"
+        topic_list:
+          title: "Ketjulistaus"
+        basic_topic_list:
+          title: "Tavallinen ketjulistaus"
+        footer_message:
+          title: "Alatunnisteen viesti"
+        signup_cta:
+          title: "Rekisteröitymisen CTA"
+        topic_timer_info:
+          title: "Ketjuajastimet"
+        topic_footer_buttons:
+          title: "Ketjun alatunnisteen painikkeet"
+        topic_notifications:
+          title: "Ketjun ilmoitukset"
+        post:
+          title: "Viesti"
+        topic_map:
+          title: "Ketjun kartta"
+        site_header:
+          title: "Sivuston yläpalkki"
+        suggested_topics:
+          title: "Ehdotettuja ketjuja"
+        post_menu:
+          title: "Viestin valikko"
+        modal:
+          title: "Modaali-ikkuna"
+          header: "Modaalin otsikko"
+          footer: "Modaalin alatunniste"
+        user_about:
+          title: "Käyttäjätietolaatikko"
+        header_icons:
+          title: "Yläpalkin kuvakkeet"
+        spinners:
+          title: "Latausnäkymät"
diff --git a/plugins/styleguide/config/locales/client.fr.yml b/plugins/styleguide/config/locales/client.fr.yml
index c2f24c3fcb..3f0fb98cad 100644
--- a/plugins/styleguide/config/locales/client.fr.yml
+++ b/plugins/styleguide/config/locales/client.fr.yml
@@ -35,20 +35,26 @@ fr:
           title: "Listes déroulantes"
         categories:
           title: "Catégories"
+        bread_crumbs:
+          title: "Fils d'Ariane"
         navigation:
           title: "Navigation"
         navigation_bar:
           title: "Barre de navigation"
+        navigation_stacked:
+          title: "Navigation empilée"
         categories_list:
           title: "Liste des catégories"
         topic_link:
           title: "Lien vers le sujet"
+        topic_list_item:
+          title: "Élément de liste de sujets"
         topic_statuses:
           title: "Statuts des sujets"
         topic_list:
           title: "Liste des sujets"
-        latest_topic_list:
-          title: "Sujets récents"
+        basic_topic_list:
+          title: "Liste des sujets de base"
         footer_message:
           title: "Message de pied de page"
         signup_cta:
@@ -63,6 +69,8 @@ fr:
           title: "Message"
         topic_map:
           title: "Carte des sujets"
+        site_header:
+          title: "En-tête du site"
         suggested_topics:
           title: "Sujets suggérés"
         post_menu:
@@ -71,7 +79,9 @@ fr:
           title: "Modale"
           header: "Titre de la modale"
           footer: "Pied de la modale"
+        user_about:
+          title: "Boîte à propos de l'utilisateur"
         header_icons:
           title: "Icônes d'en-tête"
         spinners:
-          title: "Icónes de chargement"
+          title: "Icônes de chargement"
diff --git a/plugins/styleguide/config/locales/client.gl.yml b/plugins/styleguide/config/locales/client.gl.yml
index 0b8e230d47..f75142bfd8 100644
--- a/plugins/styleguide/config/locales/client.gl.yml
+++ b/plugins/styleguide/config/locales/client.gl.yml
@@ -4,4 +4,84 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-gl: 
+gl:
+  js:
+    styleguide:
+      title: "Guía de estilo"
+      welcome: "Para comezar, escolla unha sección do menú da esquerda."
+      categories:
+        atoms: Átomos
+        molecules: Moléculas
+        organisms: Organismos
+      sections:
+        typography:
+          title: "Tipografía"
+          example: "A nosa benvida a Discourse"
+          paragraph: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, are in culpa qui officia deserunt mollit anim id is laborum."
+        date_time_inputs:
+          title: "Entradas de data/hora"
+        font_scale:
+          title: "Sistema de tipos de letra"
+        colors:
+          title: "Cores"
+        icons:
+          title: "Iconas"
+          full_list: "Vexa a listaxe completa das iconas dos tipos de letra"
+        input_fields:
+          title: "Campos de entrada"
+        buttons:
+          title: "Botóns"
+        dropdowns:
+          title: "Despregabeis"
+        categories:
+          title: "Categorías"
+        bread_crumbs:
+          title: "Rastro de migas"
+        navigation:
+          title: "Navegación"
+        navigation_bar:
+          title: "Barra de navegación"
+        navigation_stacked:
+          title: "Navegación vertical"
+        categories_list:
+          title: "Lista de categorías"
+        topic_link:
+          title: "Ligazón do tema"
+        topic_list_item:
+          title: "Elemento da lista de temas"
+        topic_statuses:
+          title: "Status do tema"
+        topic_list:
+          title: "Listaxe de temas"
+        basic_topic_list:
+          title: "Listaxe de temas básicos"
+        footer_message:
+          title: "Mensaxe rodapé"
+        signup_cta:
+          title: "Subscrición CTA"
+        topic_timer_info:
+          title: "Temporizadores do tema"
+        topic_footer_buttons:
+          title: "Botóns de rodapé do tema"
+        topic_notifications:
+          title: "Notificacións de temas"
+        post:
+          title: "Publicación"
+        topic_map:
+          title: "Mapa de temas"
+        site_header:
+          title: "Cabeceira do sitio"
+        suggested_topics:
+          title: "Temas suxeridos"
+        post_menu:
+          title: "Menú de publicación"
+        modal:
+          title: "Modal"
+          header: "Título da modal"
+          footer: "Rodapé da modal"
+        user_about:
+          title: "Caixa Verbo do usuario"
+        header_icons:
+          title: "Iconas de cabeceira"
+        spinners:
+          title: "Indicador de carga"
diff --git a/plugins/styleguide/config/locales/client.he.yml b/plugins/styleguide/config/locales/client.he.yml
index c1fac7031d..b0b104c3a4 100644
--- a/plugins/styleguide/config/locales/client.he.yml
+++ b/plugins/styleguide/config/locales/client.he.yml
@@ -53,8 +53,8 @@ he:
           title: "מצבי נושא"
         topic_list:
           title: "רשימת נושאים"
-        latest_topic_list:
-          title: "רשימת נושאים אחרונים"
+        basic_topic_list:
+          title: "רשימת נושאים בסיסית"
         footer_message:
           title: "הודעת כותרת תחתונה"
         signup_cta:
@@ -69,6 +69,8 @@ he:
           title: "פוסט"
         topic_map:
           title: "מפת נושאים"
+        site_header:
+          title: "כותרת האתר"
         suggested_topics:
           title: "נושאים מוצעים"
         post_menu:
diff --git a/plugins/styleguide/config/locales/client.hu.yml b/plugins/styleguide/config/locales/client.hu.yml
index ffa7a40423..9ca0c76aee 100644
--- a/plugins/styleguide/config/locales/client.hu.yml
+++ b/plugins/styleguide/config/locales/client.hu.yml
@@ -35,6 +35,8 @@ hu:
           title: "Legördülők"
         categories:
           title: "Kategóriák"
+        bread_crumbs:
+          title: "Kenyérmorzsák"
         navigation:
           title: "Navigáció"
         navigation_bar:
@@ -51,17 +53,35 @@ hu:
           title: "Témaállapotok"
         topic_list:
           title: "Témalista"
-        latest_topic_list:
-          title: "Legutóbbi témák listája"
+        basic_topic_list:
+          title: "Alapvető témakörlista"
         footer_message:
           title: "Lábléc üzenet"
+        signup_cta:
+          title: "Regisztrációs felhívás"
+        topic_timer_info:
+          title: "Témaidőzítők"
+        topic_footer_buttons:
+          title: "Téma láblécgombjai"
+        topic_notifications:
+          title: "Témaértesítések"
         post:
           title: "Bejegyzés"
         topic_map:
           title: "Téma térkép"
+        site_header:
+          title: "Webhelyfejléc"
         suggested_topics:
           title: "Ajánlott témák"
         post_menu:
           title: "Bejegyzés menü"
+        modal:
+          title: "Párbeszédablak"
+          header: "Párbeszédablak címe"
+          footer: "Párbeszédablak lábléce"
+        user_about:
+          title: "Felhasználói névjegydoboz"
         header_icons:
           title: "Fejléc ikonok"
+        spinners:
+          title: "Forgók"
diff --git a/plugins/styleguide/config/locales/client.hy.yml b/plugins/styleguide/config/locales/client.hy.yml
index ba5e8380d2..c2a028767a 100644
--- a/plugins/styleguide/config/locales/client.hy.yml
+++ b/plugins/styleguide/config/locales/client.hy.yml
@@ -4,4 +4,25 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-hy: 
+hy:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "Բարի գալուստ Discourse"
+        colors:
+          title: "Գույներ"
+        icons:
+          title: "Պատկերակներ"
+        categories:
+          title: "Կատեգորիաներ"
+        navigation:
+          title: "Նավիգացիա"
+        categories_list:
+          title: "Կատեգորիաների Ցանկ"
+        topic_timer_info:
+          title: "Թեմաների Ժամաչափիչներ"
+        post:
+          title: "Գրառում"
+        suggested_topics:
+          title: "Առաջարկվող Թեմաներ"
diff --git a/plugins/styleguide/config/locales/client.id.yml b/plugins/styleguide/config/locales/client.id.yml
index a4d1527157..78b90bb913 100644
--- a/plugins/styleguide/config/locales/client.id.yml
+++ b/plugins/styleguide/config/locales/client.id.yml
@@ -4,4 +4,13 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-id: 
+id:
+  js:
+    styleguide:
+      sections:
+        categories:
+          title: "Kategori"
+        navigation:
+          title: "Navigasi"
+        suggested_topics:
+          title: "Topik Yang Disarankan"
diff --git a/plugins/styleguide/config/locales/client.it.yml b/plugins/styleguide/config/locales/client.it.yml
index 8e80b02daf..1fc1199c25 100644
--- a/plugins/styleguide/config/locales/client.it.yml
+++ b/plugins/styleguide/config/locales/client.it.yml
@@ -53,8 +53,8 @@ it:
           title: "Stati degli Argomenti"
         topic_list:
           title: "Elenco Argomenti"
-        latest_topic_list:
-          title: "Elenco Argomenti Recenti"
+        basic_topic_list:
+          title: "Elenco argomenti di base"
         footer_message:
           title: "Messaggio Piè Pagina"
         signup_cta:
@@ -69,6 +69,8 @@ it:
           title: "Messaggio"
         topic_map:
           title: "Mappa Argomento"
+        site_header:
+          title: "Intestazione del Sito"
         suggested_topics:
           title: "Argomenti suggeriti"
         post_menu:
diff --git a/plugins/styleguide/config/locales/client.ja.yml b/plugins/styleguide/config/locales/client.ja.yml
index 1d8afc616b..10fca58346 100644
--- a/plugins/styleguide/config/locales/client.ja.yml
+++ b/plugins/styleguide/config/locales/client.ja.yml
@@ -4,4 +4,84 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-ja: 
+ja:
+  js:
+    styleguide:
+      title: "スタイルガイド"
+      welcome: "開始するには、左側のメニューからセクションを選択します。"
+      categories:
+        atoms: Atoms
+        molecules: Molecules
+        organisms: Organisms
+      sections:
+        typography:
+          title: "Typography"
+          example: "Discourseへようこそ"
+          paragraph: "山路を登りながら、こう考えた。知に働けば角が立つ。情に棹させば流される。意地を通せば窮屈だ。とかくに人の世は住みにくい。住みにくさが高じると、安いところへ引き越したくなる。どこへ越しても住みにくいと悟った時、詩が生まれて、画ができる。"
+        date_time_inputs:
+          title: "日付/時刻の入力"
+        font_scale:
+          title: "フォントシステム"
+        colors:
+          title: "色"
+        icons:
+          title: "アイコン"
+          full_list: "Font Awesome Icons の全リストを見る"
+        input_fields:
+          title: "入力フィールド"
+        buttons:
+          title: "ボタン"
+        dropdowns:
+          title: "ドロップダウン"
+        categories:
+          title: "カテゴリ"
+        bread_crumbs:
+          title: "パンくずリスト"
+        navigation:
+          title: "ナビゲーション"
+        navigation_bar:
+          title: "ナビゲーションバー"
+        navigation_stacked:
+          title: "スタックされたナビゲーション"
+        categories_list:
+          title: "カテゴリ一覧"
+        topic_link:
+          title: "トピックリンク"
+        topic_list_item:
+          title: "トピックリスト項目"
+        topic_statuses:
+          title: "トピックのステータス"
+        topic_list:
+          title: "トピックリスト"
+        basic_topic_list:
+          title: "基本トピックリスト"
+        footer_message:
+          title: "フッターメッセージ"
+        signup_cta:
+          title: "サインアップCTA"
+        topic_timer_info:
+          title: "トピックタイマー"
+        topic_footer_buttons:
+          title: "トピックフッターボタン"
+        topic_notifications:
+          title: "トピック通知"
+        post:
+          title: "投稿"
+        topic_map:
+          title: "トピックマップ"
+        site_header:
+          title: "サイトヘッダー"
+        suggested_topics:
+          title: "関連トピック"
+        post_menu:
+          title: "投稿メニュー"
+        modal:
+          title: "モーダル"
+          header: "モーダルタイトル"
+          footer: "モーダルフッター"
+        user_about:
+          title: "ユーザーについてのボックス"
+        header_icons:
+          title: "ヘッダーアイコン"
+        spinners:
+          title: "スピナー"
diff --git a/plugins/styleguide/config/locales/client.ko.yml b/plugins/styleguide/config/locales/client.ko.yml
index 3525478f56..70cbcfb106 100644
--- a/plugins/styleguide/config/locales/client.ko.yml
+++ b/plugins/styleguide/config/locales/client.ko.yml
@@ -53,8 +53,8 @@ ko:
           title: "글 상태"
         topic_list:
           title: "글 목록"
-        latest_topic_list:
-          title: "최신 글 목록"
+        basic_topic_list:
+          title: "기본 글 목록"
         footer_message:
           title: "하단 메시지"
         signup_cta:
@@ -69,6 +69,8 @@ ko:
           title: "글"
         topic_map:
           title: "글 맵"
+        site_header:
+          title: "사이트 헤더"
         suggested_topics:
           title: "주요 글"
         post_menu:
diff --git a/plugins/styleguide/config/locales/client.lt.yml b/plugins/styleguide/config/locales/client.lt.yml
index 1a57c12695..7fb13fa29a 100644
--- a/plugins/styleguide/config/locales/client.lt.yml
+++ b/plugins/styleguide/config/locales/client.lt.yml
@@ -4,4 +4,23 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-lt: 
+lt:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "Sveiki atvykę į Discourse"
+        colors:
+          title: "Spalvos"
+        categories:
+          title: "Kategorijos"
+        navigation:
+          title: "Navigacija"
+        categories_list:
+          title: "Kategorijų sąrašas"
+        topic_timer_info:
+          title: "Temos laikmačiai"
+        post:
+          title: "Įrašai"
+        suggested_topics:
+          title: "Siūlomos Temos"
diff --git a/plugins/styleguide/config/locales/client.lv.yml b/plugins/styleguide/config/locales/client.lv.yml
index 5b0066d4cb..e3e228c10a 100644
--- a/plugins/styleguide/config/locales/client.lv.yml
+++ b/plugins/styleguide/config/locales/client.lv.yml
@@ -4,4 +4,17 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-lv: 
+lv:
+  js:
+    styleguide:
+      sections:
+        categories:
+          title: "Sadaļas"
+        navigation:
+          title: "Pārvietošanās"
+        categories_list:
+          title: "Sadaļu saraksts"
+        post:
+          title: "Ieraksts"
+        suggested_topics:
+          title: "Ieteiktās tēmas"
diff --git a/plugins/styleguide/config/locales/client.nb_NO.yml b/plugins/styleguide/config/locales/client.nb_NO.yml
index e01d66c96b..72b3cc18d1 100644
--- a/plugins/styleguide/config/locales/client.nb_NO.yml
+++ b/plugins/styleguide/config/locales/client.nb_NO.yml
@@ -4,4 +4,25 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-nb_NO: 
+nb_NO:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "Velkommen til Discourse"
+        colors:
+          title: "Farger"
+        icons:
+          title: "Ikoner"
+        categories:
+          title: "Kategorier"
+        navigation:
+          title: "Navigasjon"
+        categories_list:
+          title: "Kategoriliste"
+        topic_timer_info:
+          title: "Tidsbestemte handlinger for emne"
+        post:
+          title: "Innlegg"
+        suggested_topics:
+          title: "Anbefalte emner"
diff --git a/plugins/styleguide/config/locales/client.nl.yml b/plugins/styleguide/config/locales/client.nl.yml
index c042a6b956..2ebe57ed40 100644
--- a/plugins/styleguide/config/locales/client.nl.yml
+++ b/plugins/styleguide/config/locales/client.nl.yml
@@ -53,8 +53,6 @@ nl:
           title: "Topicstatussen"
         topic_list:
           title: "Topiclijst"
-        latest_topic_list:
-          title: "Lijst met nieuwste topics"
         footer_message:
           title: "Voettekstbericht"
         signup_cta:
@@ -69,6 +67,8 @@ nl:
           title: "Bericht"
         topic_map:
           title: "Topickaart"
+        site_header:
+          title: "Header van de site"
         suggested_topics:
           title: "Voorgestelde topics"
         post_menu:
diff --git a/plugins/styleguide/config/locales/client.pl_PL.yml b/plugins/styleguide/config/locales/client.pl_PL.yml
index 183670f32d..c02380b92d 100644
--- a/plugins/styleguide/config/locales/client.pl_PL.yml
+++ b/plugins/styleguide/config/locales/client.pl_PL.yml
@@ -53,8 +53,8 @@ pl_PL:
           title: "Statusy tematów"
         topic_list:
           title: "Lista tematów"
-        latest_topic_list:
-          title: "Lista Ostatnich Tematów"
+        basic_topic_list:
+          title: "Podstawowa lista tematów"
         footer_message:
           title: "Wiadomość w stopce"
         signup_cta:
@@ -69,6 +69,8 @@ pl_PL:
           title: "Wpis"
         topic_map:
           title: "Mapa tematu"
+        site_header:
+          title: "Nagłówek witryny"
         suggested_topics:
           title: "Sugerowane tematy"
         post_menu:
diff --git a/plugins/styleguide/config/locales/client.pt.yml b/plugins/styleguide/config/locales/client.pt.yml
index d064f4d964..e2f2db112f 100644
--- a/plugins/styleguide/config/locales/client.pt.yml
+++ b/plugins/styleguide/config/locales/client.pt.yml
@@ -4,4 +4,25 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-pt: 
+pt:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "Bem-vindo ao Discourse"
+        colors:
+          title: "Cores"
+        icons:
+          title: "Ícones"
+        categories:
+          title: "Categorias"
+        navigation:
+          title: "Navegação"
+        categories_list:
+          title: "Lista de Categorias"
+        topic_timer_info:
+          title: "Temporizadores de Tópico"
+        post:
+          title: "Mensagem"
+        suggested_topics:
+          title: "Tópicos Sugeridos"
diff --git a/plugins/styleguide/config/locales/client.pt_BR.yml b/plugins/styleguide/config/locales/client.pt_BR.yml
index 61e4d44129..5032b7676e 100644
--- a/plugins/styleguide/config/locales/client.pt_BR.yml
+++ b/plugins/styleguide/config/locales/client.pt_BR.yml
@@ -4,4 +4,33 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-pt_BR: 
+pt_BR:
+  js:
+    styleguide:
+      title: "Styleguide"
+      welcome: "Para começar, escolha uma seção no menu à esquerda."
+      categories:
+        atoms: Átomos
+        molecules: Moléculas
+        organisms: Organismos
+      sections:
+        typography:
+          title: "Tipografia"
+          example: "Bem-vindo ao Discourse"
+          paragraph: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+        colors:
+          title: "Cores"
+        icons:
+          title: "Ícones"
+        categories:
+          title: "Categorias"
+        navigation:
+          title: "Navegação"
+        categories_list:
+          title: "Lista de categorias"
+        topic_timer_info:
+          title: "Temporizadores de Tópico"
+        post:
+          title: "Mensagem"
+        suggested_topics:
+          title: "Tópicos Sugeridos"
diff --git a/plugins/styleguide/config/locales/client.ro.yml b/plugins/styleguide/config/locales/client.ro.yml
index d855599844..1c0b8e0fc5 100644
--- a/plugins/styleguide/config/locales/client.ro.yml
+++ b/plugins/styleguide/config/locales/client.ro.yml
@@ -53,8 +53,6 @@ ro:
           title: "Statusuri pentru subiecte"
         topic_list:
           title: "Listă de subiecte"
-        latest_topic_list:
-          title: "Lista cu subiecte recente"
         footer_message:
           title: "Mesaj subsol"
         signup_cta:
diff --git a/plugins/styleguide/config/locales/client.ru.yml b/plugins/styleguide/config/locales/client.ru.yml
index 6544bc68bd..da034ada10 100644
--- a/plugins/styleguide/config/locales/client.ru.yml
+++ b/plugins/styleguide/config/locales/client.ru.yml
@@ -53,8 +53,8 @@ ru:
           title: "Статусы темы"
         topic_list:
           title: "Список тем"
-        latest_topic_list:
-          title: "Темы в секции 'Последние'"
+        basic_topic_list:
+          title: "Список тем"
         footer_message:
           title: "Содержимое нижнего колонтитула"
         signup_cta:
@@ -69,6 +69,8 @@ ru:
           title: "Сообщение"
         topic_map:
           title: "Карта темы"
+        site_header:
+          title: "Заголовок сайта"
         suggested_topics:
           title: "Похожие темы"
         post_menu:
diff --git a/plugins/styleguide/config/locales/client.sk.yml b/plugins/styleguide/config/locales/client.sk.yml
index 143b5bf2d6..870b4393a5 100644
--- a/plugins/styleguide/config/locales/client.sk.yml
+++ b/plugins/styleguide/config/locales/client.sk.yml
@@ -4,4 +4,21 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sk: 
+sk:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "Vitajte v Discourse"
+        colors:
+          title: "Farby"
+        categories:
+          title: "Kategórie"
+        navigation:
+          title: "Navigácia"
+        categories_list:
+          title: "Zoznam kategórií"
+        post:
+          title: "Príspevok"
+        suggested_topics:
+          title: "Odporúčané témy"
diff --git a/plugins/styleguide/config/locales/client.sl.yml b/plugins/styleguide/config/locales/client.sl.yml
index 8e51613b8f..6cdc2c7596 100644
--- a/plugins/styleguide/config/locales/client.sl.yml
+++ b/plugins/styleguide/config/locales/client.sl.yml
@@ -4,4 +4,21 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sl: 
+sl:
+  js:
+    styleguide:
+      sections:
+        colors:
+          title: "Barve"
+        categories:
+          title: "Kategorije"
+        navigation:
+          title: "Navigacija"
+        categories_list:
+          title: "Seznam kategorij"
+        topic_timer_info:
+          title: "Opomniki teme"
+        post:
+          title: "Prispevek"
+        suggested_topics:
+          title: "Predlagane teme"
diff --git a/plugins/styleguide/config/locales/client.sq.yml b/plugins/styleguide/config/locales/client.sq.yml
index 1413494f57..be6919030c 100644
--- a/plugins/styleguide/config/locales/client.sq.yml
+++ b/plugins/styleguide/config/locales/client.sq.yml
@@ -4,4 +4,19 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sq: 
+sq:
+  js:
+    styleguide:
+      sections:
+        colors:
+          title: "Ngjyrat"
+        categories:
+          title: "Kategoritë"
+        navigation:
+          title: "Shfletimi"
+        categories_list:
+          title: "Lista Kategorive"
+        post:
+          title: "Postim"
+        suggested_topics:
+          title: "Temat e sugjeruara"
diff --git a/plugins/styleguide/config/locales/client.sr.yml b/plugins/styleguide/config/locales/client.sr.yml
index adfafeee68..8475d1a380 100644
--- a/plugins/styleguide/config/locales/client.sr.yml
+++ b/plugins/styleguide/config/locales/client.sr.yml
@@ -4,4 +4,17 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sr: 
+sr:
+  js:
+    styleguide:
+      sections:
+        colors:
+          title: "Boje"
+        categories:
+          title: "Kategorije"
+        navigation:
+          title: "Navigacija"
+        categories_list:
+          title: "Lista Kategorija"
+        suggested_topics:
+          title: "Predložene Teme"
diff --git a/plugins/styleguide/config/locales/client.sv.yml b/plugins/styleguide/config/locales/client.sv.yml
index ac8b78e2e3..26cfc827ad 100644
--- a/plugins/styleguide/config/locales/client.sv.yml
+++ b/plugins/styleguide/config/locales/client.sv.yml
@@ -53,8 +53,8 @@ sv:
           title: "Ämnesstatus"
         topic_list:
           title: "Ämneslista"
-        latest_topic_list:
-          title: "Senaste ämneslista"
+        basic_topic_list:
+          title: "Grundläggande ämneslista"
         footer_message:
           title: "Sidfotsmeddelande"
         signup_cta:
@@ -69,6 +69,8 @@ sv:
           title: "Inlägg"
         topic_map:
           title: "Ämneskarta"
+        site_header:
+          title: "Sajtens sidhuvud"
         suggested_topics:
           title: "Föreslagna ämnen"
         post_menu:
diff --git a/plugins/styleguide/config/locales/client.sw.yml b/plugins/styleguide/config/locales/client.sw.yml
index 7e07c4560a..3de7449218 100644
--- a/plugins/styleguide/config/locales/client.sw.yml
+++ b/plugins/styleguide/config/locales/client.sw.yml
@@ -4,4 +4,25 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sw: 
+sw:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "Karibu kwenye Discourse"
+        colors:
+          title: "Rangi"
+        icons:
+          title: "Ikoni"
+        categories:
+          title: "Vikundi"
+        navigation:
+          title: "Abiri"
+        categories_list:
+          title: "Orodha ya Kategoria"
+        topic_timer_info:
+          title: "Vipima Mda vya Mada"
+        post:
+          title: "Ujumbe"
+        suggested_topics:
+          title: "Mada Zilizopendekezwa"
diff --git a/plugins/styleguide/config/locales/client.te.yml b/plugins/styleguide/config/locales/client.te.yml
index ac5d945ae8..2bcb534082 100644
--- a/plugins/styleguide/config/locales/client.te.yml
+++ b/plugins/styleguide/config/locales/client.te.yml
@@ -4,4 +4,17 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-te: 
+te:
+  js:
+    styleguide:
+      sections:
+        colors:
+          title: "రంగులు"
+        categories:
+          title: "వర్గాలు"
+        navigation:
+          title: "నావిగేషను"
+        categories_list:
+          title: "వర్గాల జాబితా"
+        suggested_topics:
+          title: "సూచించే విషయాలు"
diff --git a/plugins/styleguide/config/locales/client.th.yml b/plugins/styleguide/config/locales/client.th.yml
index 9b38ad300e..7d428c8b2a 100644
--- a/plugins/styleguide/config/locales/client.th.yml
+++ b/plugins/styleguide/config/locales/client.th.yml
@@ -4,4 +4,19 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-th: 
+th:
+  js:
+    styleguide:
+      sections:
+        colors:
+          title: "สี"
+        categories:
+          title: "หมวดหมู่"
+        navigation:
+          title: "การนำทาง"
+        categories_list:
+          title: "รายชื่อหมวดหมู่"
+        post:
+          title: "โพสต์"
+        suggested_topics:
+          title: "กระทู้แนะนำ"
diff --git a/plugins/styleguide/config/locales/client.tr_TR.yml b/plugins/styleguide/config/locales/client.tr_TR.yml
index c32afd624c..223de26106 100644
--- a/plugins/styleguide/config/locales/client.tr_TR.yml
+++ b/plugins/styleguide/config/locales/client.tr_TR.yml
@@ -4,4 +4,82 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-tr_TR: 
+tr_TR:
+  js:
+    styleguide:
+      title: "Stil rehberi"
+      welcome: "Başlamak için soldaki menüden bir bölüm seçin."
+      categories:
+        atoms: Atomlar
+        molecules: Moleküller
+        organisms: Organizmalar
+      sections:
+        typography:
+          title: "Tipografi"
+          example: "Forumumuza Hoş Geldiniz"
+          paragraph: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut the labore et dolore magna aliqua. Enim ad minim veniam, quis nostrud egzersiz ullamco emek, ex ea commodo sonuçlarının bir kısmını kullanın. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, culpa qui officia deserunt mollit anim id est laborum."
+        date_time_inputs:
+          title: "Tarih / Saat girişleri"
+        font_scale:
+          title: "Yazı Tipi Sistemi"
+        colors:
+          title: "Renkler"
+        icons:
+          title: "Simgeler"
+          full_list: "Font Awesome Simgelerinin tam listesine bakın"
+        input_fields:
+          title: "Giriş Alanları"
+        buttons:
+          title: "Düğmeler"
+        dropdowns:
+          title: "Açılır Menüler"
+        categories:
+          title: "Kategoriler"
+        navigation:
+          title: "Navigasyon"
+        navigation_bar:
+          title: "Gezinti çubuğu"
+        navigation_stacked:
+          title: "Yapışkan Navigasyon"
+        categories_list:
+          title: "Kategori Listesi"
+        topic_link:
+          title: "Konu Bağlantısı"
+        topic_list_item:
+          title: "Konu Listesi Öğesi"
+        topic_statuses:
+          title: "Konu Durumları"
+        topic_list:
+          title: "Konu Listesi"
+        basic_topic_list:
+          title: "Temel Konu Listesi"
+        footer_message:
+          title: "Altbilgi Mesajı"
+        signup_cta:
+          title: "CTA'ya kaydolun"
+        topic_timer_info:
+          title: "Konu Zamanlayıcısı"
+        topic_footer_buttons:
+          title: "Konu Altbilgi Düğmeleri"
+        topic_notifications:
+          title: "Konu Bildirimleri"
+        post:
+          title: "İleti"
+        topic_map:
+          title: "Konu Haritası"
+        site_header:
+          title: "Site Başlığı"
+        suggested_topics:
+          title: "Önerilen Konular"
+        post_menu:
+          title: "Gönderi Menüsü"
+        modal:
+          title: "Açılır"
+          header: "Açılır Başlık"
+          footer: "Açılır Altbilgi"
+        user_about:
+          title: "Kullanıcı Hakkında Kutusu"
+        header_icons:
+          title: "Başlık Simgeleri"
+        spinners:
+          title: "Spinners"
diff --git a/plugins/styleguide/config/locales/client.uk.yml b/plugins/styleguide/config/locales/client.uk.yml
index 602f40aeed..30f4c470bd 100644
--- a/plugins/styleguide/config/locales/client.uk.yml
+++ b/plugins/styleguide/config/locales/client.uk.yml
@@ -4,4 +4,84 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-uk: 
+uk:
+  js:
+    styleguide:
+      title: "Styleguide"
+      welcome: "Для початку оберіть розділ у меню ліворуч."
+      categories:
+        atoms: Атоми
+        molecules: Молекули
+        organisms: Організми
+      sections:
+        typography:
+          title: "Типографіка"
+          example: "Ласкаво просимо в Discourse"
+          paragraph: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+        date_time_inputs:
+          title: "Введення дати / часу"
+        font_scale:
+          title: "Шрифти"
+        colors:
+          title: "Кольори"
+        icons:
+          title: "Іконки"
+          full_list: "Перегляньте повний список значків Font Awesome"
+        input_fields:
+          title: "Поля введення"
+        buttons:
+          title: "Кнопки"
+        dropdowns:
+          title: "Випадаючі списки"
+        categories:
+          title: "Категорії"
+        bread_crumbs:
+          title: "Хлібні крихти"
+        navigation:
+          title: "Навігація"
+        navigation_bar:
+          title: "Панель навігації"
+        navigation_stacked:
+          title: "Панель вибору налаштувань"
+        categories_list:
+          title: "Список категорій"
+        topic_link:
+          title: "Посилання на тему"
+        topic_list_item:
+          title: "Тема у списку тем"
+        topic_statuses:
+          title: "Статуси тем"
+        topic_list:
+          title: "Список тем"
+        basic_topic_list:
+          title: "Основний список тем"
+        footer_message:
+          title: "Повідомлення нижнього колонтитула"
+        signup_cta:
+          title: "Реєстрація CTA"
+        topic_timer_info:
+          title: "Таймери теми"
+        topic_footer_buttons:
+          title: "Кнопки нижнього колонтитула"
+        topic_notifications:
+          title: "Сповіщення теми"
+        post:
+          title: "Допис"
+        topic_map:
+          title: "Карта теми"
+        site_header:
+          title: "Заголовок сайту"
+        suggested_topics:
+          title: "Схожі теми"
+        post_menu:
+          title: "Меню повідомлення"
+        modal:
+          title: "Модальний"
+          header: "Модальний заголовок"
+          footer: "Модальний нижній колонтитул"
+        user_about:
+          title: "Вікно «Про користувача»"
+        header_icons:
+          title: "Значки заголовків"
+        spinners:
+          title: "Спінери"
diff --git a/plugins/styleguide/config/locales/client.ur.yml b/plugins/styleguide/config/locales/client.ur.yml
index 1e9587a363..209bdf2cb6 100644
--- a/plugins/styleguide/config/locales/client.ur.yml
+++ b/plugins/styleguide/config/locales/client.ur.yml
@@ -4,4 +4,25 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-ur: 
+ur:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "ڈسکورس میں خوش آمدید"
+        colors:
+          title: "رنگ"
+        icons:
+          title: "آئیکن"
+        categories:
+          title: "زُمرَہ جات"
+        navigation:
+          title: "نیویگیشن"
+        categories_list:
+          title: "زمرہ جات فہرست"
+        topic_timer_info:
+          title: "ٹاپک ٹائمر"
+        post:
+          title: "پوسٹ"
+        suggested_topics:
+          title: "تجویز کیے گئے ٹاپک"
diff --git a/plugins/styleguide/config/locales/client.vi.yml b/plugins/styleguide/config/locales/client.vi.yml
index 219dee99bb..a7e30b392a 100644
--- a/plugins/styleguide/config/locales/client.vi.yml
+++ b/plugins/styleguide/config/locales/client.vi.yml
@@ -8,15 +8,25 @@ vi:
   js:
     styleguide:
       sections:
+        typography:
+          example: "Chào mừng đến với Discourse"
         date_time_inputs:
           title: "Ngày/giờ nhập"
+        colors:
+          title: "Màu sắc"
+        categories:
+          title: "Chuyên mục"
+        navigation:
+          title: "Điều hướng"
         navigation_stacked:
           title: "Điều hướng xếp chồng lên nhau"
+        categories_list:
+          title: "Danh sách Danh mục"
         topic_statuses:
           title: "Trạng thái chủ đề"
-        latest_topic_list:
-          title: "Danh sách chủ đề mới nhất"
         post:
           title: "Bài đăng"
+        suggested_topics:
+          title: "Chủ đề tương tự"
         modal:
           title: "Phương thức"
diff --git a/plugins/styleguide/config/locales/client.zh_CN.yml b/plugins/styleguide/config/locales/client.zh_CN.yml
index c954226960..3bf9cbaa15 100644
--- a/plugins/styleguide/config/locales/client.zh_CN.yml
+++ b/plugins/styleguide/config/locales/client.zh_CN.yml
@@ -7,26 +7,26 @@
 zh_CN:
   js:
     styleguide:
-      title: "风格指南"
-      welcome: "要开始使用，请从左侧菜单中选择一个部分。"
+      title: "样式指引"
+      welcome: "从左侧菜单中选择一部分以开始使用"
       categories:
         atoms: 原子
         molecules: 分子
-        organisms: 生物体
+        organisms: 生物
       sections:
         typography:
-          title: "版式"
+          title: "排版"
           example: "欢迎来到 Discourse"
           paragraph: "占位符占位符占位符，那只敏捷的棕毛狐狸跳过了那条懒狗，那只敏捷的棕毛狐狸跳过了那条懒狗，占位符占位符占位符"
         date_time_inputs:
-          title: "日期/时间 输入"
+          title: "日期/时间输入框"
         font_scale:
           title: "字体系统"
         colors:
-          title: "颜色"
+          title: "配色"
         icons:
           title: "图标"
-          full_list: "查看 Font Awesome Icons 的完整列表"
+          full_list: "查看全部 Font Awesome 图标"
         input_fields:
           title: "输入字段"
         buttons:
@@ -42,44 +42,46 @@ zh_CN:
         navigation_bar:
           title: "导航栏"
         navigation_stacked:
-          title: "导航已折叠"
+          title: "堆叠式导航"
         categories_list:
           title: "分类列表"
         topic_link:
-          title: "主题链接"
+          title: "话题链接"
         topic_list_item:
-          title: "主题列表项"
+          title: "话题列表项"
         topic_statuses:
-          title: "主题状态"
+          title: "话题状态"
         topic_list:
-          title: "主题列表"
-        latest_topic_list:
-          title: "最新主题列表"
+          title: "话题列表"
+        basic_topic_list:
+          title: "基础话题列表"
         footer_message:
-          title: "页脚消息"
+          title: "底栏信息"
         signup_cta:
-          title: "注册 CTA"
+          title: "注册的 CTA"
         topic_timer_info:
-          title: "主题计时器"
+          title: "话题计时器"
         topic_footer_buttons:
-          title: "主题页脚按钮"
+          title: "话题底栏按钮"
         topic_notifications:
-          title: "主题通知"
+          title: "话题通知"
         post:
           title: "帖子"
         topic_map:
-          title: "主题地图"
+          title: "话题数据"
+        site_header:
+          title: "站点顶栏"
         suggested_topics:
-          title: "推荐主题"
+          title: "推荐话题"
         post_menu:
           title: "帖子菜单"
         modal:
-          title: "模式"
-          header: "模式标题"
-          footer: "模式页脚"
+          title: "模态框"
+          header: "模态框标题"
+          footer: "模态框底栏"
         user_about:
-          title: "用户关于框"
+          title: "用户信息框"
         header_icons:
-          title: "标头图标"
+          title: "顶栏图标"
         spinners:
-          title: "下拉列表"
+          title: "进度圈"
diff --git a/plugins/styleguide/config/locales/client.zh_TW.yml b/plugins/styleguide/config/locales/client.zh_TW.yml
index 831b6f16fb..55bace1237 100644
--- a/plugins/styleguide/config/locales/client.zh_TW.yml
+++ b/plugins/styleguide/config/locales/client.zh_TW.yml
@@ -4,4 +4,25 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-zh_TW: 
+zh_TW:
+  js:
+    styleguide:
+      sections:
+        typography:
+          example: "歡迎來到 Discourse"
+        colors:
+          title: "顏色"
+        icons:
+          title: "表徵圖"
+        categories:
+          title: "分類"
+        navigation:
+          title: "導航"
+        categories_list:
+          title: "分類清單"
+        topic_timer_info:
+          title: "話題計時器"
+        post:
+          title: "貼文"
+        suggested_topics:
+          title: "推薦的話題"
diff --git a/plugins/styleguide/config/locales/server.be.yml b/plugins/styleguide/config/locales/server.be.yml
index 2e3980a624..2ea77a0d35 100644
--- a/plugins/styleguide/config/locales/server.be.yml
+++ b/plugins/styleguide/config/locales/server.be.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-be: 
+be:
diff --git a/plugins/styleguide/config/locales/server.bg.yml b/plugins/styleguide/config/locales/server.bg.yml
index 6c61d82645..52333529d3 100644
--- a/plugins/styleguide/config/locales/server.bg.yml
+++ b/plugins/styleguide/config/locales/server.bg.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-bg: 
+bg:
diff --git a/plugins/styleguide/config/locales/server.bs_BA.yml b/plugins/styleguide/config/locales/server.bs_BA.yml
index 509ba581f8..828a7e65af 100644
--- a/plugins/styleguide/config/locales/server.bs_BA.yml
+++ b/plugins/styleguide/config/locales/server.bs_BA.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-bs_BA: 
+bs_BA:
diff --git a/plugins/styleguide/config/locales/server.ca.yml b/plugins/styleguide/config/locales/server.ca.yml
index 3eba30e02a..ec737bc1a5 100644
--- a/plugins/styleguide/config/locales/server.ca.yml
+++ b/plugins/styleguide/config/locales/server.ca.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-ca: 
+ca:
diff --git a/plugins/styleguide/config/locales/server.cs.yml b/plugins/styleguide/config/locales/server.cs.yml
index f3265c8c88..041b2f0bd0 100644
--- a/plugins/styleguide/config/locales/server.cs.yml
+++ b/plugins/styleguide/config/locales/server.cs.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-cs: 
+cs:
diff --git a/plugins/styleguide/config/locales/server.da.yml b/plugins/styleguide/config/locales/server.da.yml
index 1aa92f22af..3e3146fc0f 100644
--- a/plugins/styleguide/config/locales/server.da.yml
+++ b/plugins/styleguide/config/locales/server.da.yml
@@ -4,4 +4,7 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-da: 
+da:
+  site_settings:
+    styleguide_enabled: "Aktivér en `/styleguide` sti for at hjælpe med styling af Discourse"
+    styleguide_admin_only: "Begrænser synligheden af styleguiden til admins"
diff --git a/plugins/styleguide/config/locales/server.el.yml b/plugins/styleguide/config/locales/server.el.yml
index 1ef87229b3..d872d0ecc4 100644
--- a/plugins/styleguide/config/locales/server.el.yml
+++ b/plugins/styleguide/config/locales/server.el.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-el: 
+el:
diff --git a/plugins/styleguide/config/locales/server.en_GB.yml b/plugins/styleguide/config/locales/server.en_GB.yml
new file mode 100644
index 0000000000..2d4fa180ec
--- /dev/null
+++ b/plugins/styleguide/config/locales/server.en_GB.yml
@@ -0,0 +1,7 @@
+# WARNING: Never edit this file.
+# It will be overwritten when translations are pulled from Crowdin.
+#
+# To work with us on translations, join this project:
+# https://translate.discourse.org/
+
+en_GB:
diff --git a/plugins/styleguide/config/locales/server.et.yml b/plugins/styleguide/config/locales/server.et.yml
index 5702d705bb..0ea0b6d554 100644
--- a/plugins/styleguide/config/locales/server.et.yml
+++ b/plugins/styleguide/config/locales/server.et.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-et: 
+et:
diff --git a/plugins/styleguide/config/locales/server.fa_IR.yml b/plugins/styleguide/config/locales/server.fa_IR.yml
index edcb1f27e2..56512089fb 100644
--- a/plugins/styleguide/config/locales/server.fa_IR.yml
+++ b/plugins/styleguide/config/locales/server.fa_IR.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-fa_IR: 
+fa_IR:
diff --git a/plugins/styleguide/config/locales/server.fi.yml b/plugins/styleguide/config/locales/server.fi.yml
index b10a8718e0..ca22a08e27 100644
--- a/plugins/styleguide/config/locales/server.fi.yml
+++ b/plugins/styleguide/config/locales/server.fi.yml
@@ -4,4 +4,7 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-fi: 
+fi:
+  site_settings:
+    styleguide_enabled: "Ota käyttöön `/ styleguide` -polku, joka auttaa Discoursen tyylimuotoilussa"
+    styleguide_admin_only: "Rajoittaa tyylioppaan näkyvyyden ylläpitäjille"
diff --git a/plugins/styleguide/config/locales/server.fr.yml b/plugins/styleguide/config/locales/server.fr.yml
index 82a752c15d..b29ba6b4c3 100644
--- a/plugins/styleguide/config/locales/server.fr.yml
+++ b/plugins/styleguide/config/locales/server.fr.yml
@@ -6,4 +6,5 @@
 
 fr:
   site_settings:
-    styleguide_admin_only: "Limiter la visibilité du guide de style aux administrateurs"
+    styleguide_enabled: "Activer un chemin `/styleguide` pour faciliter le personnalisation de Discourse"
+    styleguide_admin_only: "Restreint la visibilité du guide de style aux seuls administrateurs"
diff --git a/plugins/styleguide/config/locales/server.gl.yml b/plugins/styleguide/config/locales/server.gl.yml
index 0b8e230d47..8d56febda5 100644
--- a/plugins/styleguide/config/locales/server.gl.yml
+++ b/plugins/styleguide/config/locales/server.gl.yml
@@ -4,4 +4,7 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-gl: 
+gl:
+  site_settings:
+    styleguide_enabled: "Activar un camiño `/styleguide` para personalizar o estilo do Discourse"
+    styleguide_admin_only: "Restrinxe a visibilidade da guía de estilo aos administradores"
diff --git a/plugins/styleguide/config/locales/server.hu.yml b/plugins/styleguide/config/locales/server.hu.yml
index 0a2b3ed09f..c24ee08667 100644
--- a/plugins/styleguide/config/locales/server.hu.yml
+++ b/plugins/styleguide/config/locales/server.hu.yml
@@ -4,4 +4,7 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-hu: 
+hu:
+  site_settings:
+    styleguide_enabled: "A „/styleguide” elérési út engedélyezése a Discourse stílusmódosításainak megkönnyítéséhez"
+    styleguide_admin_only: "Az adminisztrátorokra korlátozza a stílusútmutató láthatóságát"
diff --git a/plugins/styleguide/config/locales/server.hy.yml b/plugins/styleguide/config/locales/server.hy.yml
index ba5e8380d2..cb18f64d35 100644
--- a/plugins/styleguide/config/locales/server.hy.yml
+++ b/plugins/styleguide/config/locales/server.hy.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-hy: 
+hy:
diff --git a/plugins/styleguide/config/locales/server.id.yml b/plugins/styleguide/config/locales/server.id.yml
index a4d1527157..596e36b2e1 100644
--- a/plugins/styleguide/config/locales/server.id.yml
+++ b/plugins/styleguide/config/locales/server.id.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-id: 
+id:
diff --git a/plugins/styleguide/config/locales/server.ja.yml b/plugins/styleguide/config/locales/server.ja.yml
index 1d8afc616b..b739161385 100644
--- a/plugins/styleguide/config/locales/server.ja.yml
+++ b/plugins/styleguide/config/locales/server.ja.yml
@@ -4,4 +4,7 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-ja: 
+ja:
+  site_settings:
+    styleguide_enabled: "`/styleguide` のパスを有効にして、Discourseのスタイリングに役立てる"
+    styleguide_admin_only: "styleguide の表示を管理者に制限する"
diff --git a/plugins/styleguide/config/locales/server.lt.yml b/plugins/styleguide/config/locales/server.lt.yml
index 1a57c12695..16bb19758d 100644
--- a/plugins/styleguide/config/locales/server.lt.yml
+++ b/plugins/styleguide/config/locales/server.lt.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-lt: 
+lt:
diff --git a/plugins/styleguide/config/locales/server.lv.yml b/plugins/styleguide/config/locales/server.lv.yml
index 5b0066d4cb..59e0ef6f4e 100644
--- a/plugins/styleguide/config/locales/server.lv.yml
+++ b/plugins/styleguide/config/locales/server.lv.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-lv: 
+lv:
diff --git a/plugins/styleguide/config/locales/server.nb_NO.yml b/plugins/styleguide/config/locales/server.nb_NO.yml
index e01d66c96b..2e2224d147 100644
--- a/plugins/styleguide/config/locales/server.nb_NO.yml
+++ b/plugins/styleguide/config/locales/server.nb_NO.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-nb_NO: 
+nb_NO:
diff --git a/plugins/styleguide/config/locales/server.pt.yml b/plugins/styleguide/config/locales/server.pt.yml
index d064f4d964..298ba523c1 100644
--- a/plugins/styleguide/config/locales/server.pt.yml
+++ b/plugins/styleguide/config/locales/server.pt.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-pt: 
+pt:
diff --git a/plugins/styleguide/config/locales/server.pt_BR.yml b/plugins/styleguide/config/locales/server.pt_BR.yml
index 61e4d44129..5e7b84ce1b 100644
--- a/plugins/styleguide/config/locales/server.pt_BR.yml
+++ b/plugins/styleguide/config/locales/server.pt_BR.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-pt_BR: 
+pt_BR:
diff --git a/plugins/styleguide/config/locales/server.ro.yml b/plugins/styleguide/config/locales/server.ro.yml
index 4837bb27c6..7387efc934 100644
--- a/plugins/styleguide/config/locales/server.ro.yml
+++ b/plugins/styleguide/config/locales/server.ro.yml
@@ -6,5 +6,5 @@
 
 ro:
   site_settings:
-    styleguide_enabled: "Activează o cale `/styleguide pentru a ajuta la personalizarea Discourse"
+    styleguide_enabled: "Activează o cale `/styleguide` pentru a ajuta la personalizarea Discourse"
     styleguide_admin_only: "Limitează vizibilitatea ghidului de stil la administratori"
diff --git a/plugins/styleguide/config/locales/server.sk.yml b/plugins/styleguide/config/locales/server.sk.yml
index 143b5bf2d6..6f81562408 100644
--- a/plugins/styleguide/config/locales/server.sk.yml
+++ b/plugins/styleguide/config/locales/server.sk.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sk: 
+sk:
diff --git a/plugins/styleguide/config/locales/server.sl.yml b/plugins/styleguide/config/locales/server.sl.yml
index 8e51613b8f..23489a48b1 100644
--- a/plugins/styleguide/config/locales/server.sl.yml
+++ b/plugins/styleguide/config/locales/server.sl.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sl: 
+sl:
diff --git a/plugins/styleguide/config/locales/server.sq.yml b/plugins/styleguide/config/locales/server.sq.yml
index 1413494f57..7f051b7a7c 100644
--- a/plugins/styleguide/config/locales/server.sq.yml
+++ b/plugins/styleguide/config/locales/server.sq.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sq: 
+sq:
diff --git a/plugins/styleguide/config/locales/server.sr.yml b/plugins/styleguide/config/locales/server.sr.yml
index adfafeee68..88d63d6ae1 100644
--- a/plugins/styleguide/config/locales/server.sr.yml
+++ b/plugins/styleguide/config/locales/server.sr.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sr: 
+sr:
diff --git a/plugins/styleguide/config/locales/server.sw.yml b/plugins/styleguide/config/locales/server.sw.yml
index 7e07c4560a..0d7cdd075b 100644
--- a/plugins/styleguide/config/locales/server.sw.yml
+++ b/plugins/styleguide/config/locales/server.sw.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-sw: 
+sw:
diff --git a/plugins/styleguide/config/locales/server.te.yml b/plugins/styleguide/config/locales/server.te.yml
index ac5d945ae8..03967bdbb0 100644
--- a/plugins/styleguide/config/locales/server.te.yml
+++ b/plugins/styleguide/config/locales/server.te.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-te: 
+te:
diff --git a/plugins/styleguide/config/locales/server.th.yml b/plugins/styleguide/config/locales/server.th.yml
index 9b38ad300e..7de85ff91c 100644
--- a/plugins/styleguide/config/locales/server.th.yml
+++ b/plugins/styleguide/config/locales/server.th.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-th: 
+th:
diff --git a/plugins/styleguide/config/locales/server.tr_TR.yml b/plugins/styleguide/config/locales/server.tr_TR.yml
index c32afd624c..fefe048212 100644
--- a/plugins/styleguide/config/locales/server.tr_TR.yml
+++ b/plugins/styleguide/config/locales/server.tr_TR.yml
@@ -4,4 +4,7 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-tr_TR: 
+tr_TR:
+  site_settings:
+    styleguide_enabled: "Söylemin stiline yardımcı olması için bir \"/ stil kılavuzu\" yolunu etkinleştir"
+    styleguide_admin_only: "Stil kılavuzunun görünürlüğünü yöneticilerle sınırla"
diff --git a/plugins/styleguide/config/locales/server.uk.yml b/plugins/styleguide/config/locales/server.uk.yml
index 602f40aeed..c3e1381a57 100644
--- a/plugins/styleguide/config/locales/server.uk.yml
+++ b/plugins/styleguide/config/locales/server.uk.yml
@@ -4,4 +4,7 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-uk: 
+uk:
+  site_settings:
+    styleguide_enabled: "Увімкнути шлях `/styleguide`, щоб спростити стилізацію Discourse"
+    styleguide_admin_only: "Обмежує видимість керування стилем лише адміністраторами"
diff --git a/plugins/styleguide/config/locales/server.ur.yml b/plugins/styleguide/config/locales/server.ur.yml
index 1e9587a363..b4a9c21ee2 100644
--- a/plugins/styleguide/config/locales/server.ur.yml
+++ b/plugins/styleguide/config/locales/server.ur.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-ur: 
+ur:
diff --git a/plugins/styleguide/config/locales/server.zh_CN.yml b/plugins/styleguide/config/locales/server.zh_CN.yml
index 2af6852037..17c49611ed 100644
--- a/plugins/styleguide/config/locales/server.zh_CN.yml
+++ b/plugins/styleguide/config/locales/server.zh_CN.yml
@@ -6,5 +6,5 @@
 
 zh_CN:
   site_settings:
-    styleguide_enabled: "启用 `/styleguide` 路径来帮助 Discourse 风格化"
-    styleguide_admin_only: "样式指南仅对管理员可见"
+    styleguide_enabled: "启用 `/styleguide` 路径用于帮助理解 Discourse 样式"
+    styleguide_admin_only: "样式导引仅对管理员可见"
diff --git a/plugins/styleguide/config/locales/server.zh_TW.yml b/plugins/styleguide/config/locales/server.zh_TW.yml
index 831b6f16fb..7e15fab001 100644
--- a/plugins/styleguide/config/locales/server.zh_TW.yml
+++ b/plugins/styleguide/config/locales/server.zh_TW.yml
@@ -4,4 +4,4 @@
 # To work with us on translations, join this project:
 # https://translate.discourse.org/
 
-zh_TW: 
+zh_TW:
diff --git a/plugins/styleguide/plugin.rb b/plugins/styleguide/plugin.rb
index 2e0703359c..4c3244b1f6 100644
--- a/plugins/styleguide/plugin.rb
+++ b/plugins/styleguide/plugin.rb
@@ -15,7 +15,7 @@ Discourse::Application.routes.append do
 end
 
 after_initialize do
-  register_asset_filter do |type, request|
-    request&.fullpath&.start_with?('/styleguide')
+  register_asset_filter do |type, request, opts|
+    (opts[:path] || '').start_with?("#{Discourse.base_path}/styleguide")
   end
 end
diff --git a/public/403.en_GB.html b/public/403.en_GB.html
new file mode 100644
index 0000000000..e894dc1885
--- /dev/null
+++ b/public/403.en_GB.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>You can't do that (403)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 400%; color: #f00; line-height: 1em; }
+  </style>
+</head>
+
+<body>
+  <div class="dialog">
+    <h1>403</h1>
+    <p>You can't view that resource!</p>
+
+    <p>This will be replaced by a customised Discourse 403 page.</p>
+  </div>
+</body>
+</html>
diff --git a/public/403.gl.html b/public/403.gl.html
index 8f4647e79a..969ba5115b 100644
--- a/public/403.gl.html
+++ b/public/403.gl.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Non podes facer iso (403)</title>
+  <title>Non pode facer iso (403)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
@@ -20,7 +20,7 @@
 <body>
   <div class="dialog">
     <h1>403</h1>
-    <p>Non podes ver este recurso!</p>
+    <p>Non pode ver este recurso!</p>
 
     <p>Substituirase pola páxina 403 personalizada de Discourse.</p>
   </div>
diff --git a/public/422.en_GB.html b/public/422.en_GB.html
new file mode 100644
index 0000000000..e1dd1706bb
--- /dev/null
+++ b/public/422.en_GB.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>The change you wanted has been rejected.</h1>
+    <p>Maybe you tried to change something you didn't have access to.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.fa_IR.html b/public/422.fa_IR.html
index ccc54f3bae..12e59e85e0 100644
--- a/public/422.fa_IR.html
+++ b/public/422.fa_IR.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>تغییری که خواستید، رد شد (422)</title>
+  <title>تغییر مورد نظر شما رد شد (422)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
@@ -20,8 +20,8 @@
 <body>
   <!-- This file lives in public/422.html -->
   <div class="dialog">
-    <h1>تغییری که خواستید، رد شد.</h1>
-    <p>شاید شما تلاش کردید چیزی را تغییر دهید که دسترسی به آن را نداشتید.</p>
+    <h1>تغییر مورد نظر شما رد شد.</h1>
+    <p>شاید شما سعی کرده باشید چیزی را که به آن دسترسی ندارید، تغییر دهید.</p>
   </div>
 </body>
 </html>
diff --git a/public/422.gl.html b/public/422.gl.html
index 6ac61579e2..4e78d0b929 100644
--- a/public/422.gl.html
+++ b/public/422.gl.html
@@ -21,7 +21,7 @@
   <!-- This file lives in public/422.html -->
   <div class="dialog">
     <h1>Rexeitouse o cambio pretendido.</h1>
-    <p>Se cadra tentaches cambiar algo ao que non tes acceso.</p>
+    <p>Se cadra tentou vostede cambiar algo ao que non ten acceso.</p>
   </div>
 </body>
 </html>
diff --git a/public/500.cs.html b/public/500.cs.html
index c22502737c..0b4ae4a0e3 100644
--- a/public/500.cs.html
+++ b/public/500.cs.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Oops - Error 500</title>
+  <title>Jejda - chyba 500</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Oops</h1>
-    <p>The software powering this discussion forum encountered an unexpected problem. We apologize for the inconvenience.</p>
-    <p>Detailed information about the error was logged, and an automatic notification generated. We'll take a look at it.</p>
-    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+    <h1>Jejda</h1>
+    <p>Software napájející toto diskusní fórum narazil na neočekávaný problém. Omlouváme se za nepříjemnosti.</p>
+    <p>Podrobné informace o chybě byly zaznamenány a bylo vytvořeno automatické oznámení. Podíváme se na to.</p>
+    <p>Žádná další opatření nejsou nutná. Pokud však chybový stav přetrvává, můžete poskytnout další podrobnosti, včetně kroků k reprodukci chyby, zveřejněním diskusního tématu v kategorii zpětné vazby na webu.</p>
 </body>
 </html>
diff --git a/public/500.da.html b/public/500.da.html
index c22502737c..7e78883b27 100644
--- a/public/500.da.html
+++ b/public/500.da.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Oops - Error 500</title>
+  <title>Ups - Fejl 500</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Oops</h1>
-    <p>The software powering this discussion forum encountered an unexpected problem. We apologize for the inconvenience.</p>
-    <p>Detailed information about the error was logged, and an automatic notification generated. We'll take a look at it.</p>
-    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+    <h1>Ups</h1>
+    <p>Den software, der driver dette diskussionsforum, stødte på et uventet problem. Vi beklager ulejligheden.</p>
+    <p>Detaljerede oplysninger om fejlen blev logget, og der blev genereret en automatisk underretning til administratoren. Vi kigger på det.</p>
+    <p>Ingen yderligere handling er nødvendig. Hvis fejlbetingelsen fortsætter, kan du angive yderligere detaljer, herunder trin til gengivelse af fejlen, ved at sende et diskussionsemne i webstedets feedbackkategori.</p>
 </body>
 </html>
diff --git a/public/500.en_GB.html b/public/500.en_GB.html
new file mode 100644
index 0000000000..c22502737c
--- /dev/null
+++ b/public/500.en_GB.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Oops - Error 500</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Oops</h1>
+    <p>The software powering this discussion forum encountered an unexpected problem. We apologize for the inconvenience.</p>
+    <p>Detailed information about the error was logged, and an automatic notification generated. We'll take a look at it.</p>
+    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+</body>
+</html>
diff --git a/public/500.es.html b/public/500.es.html
index 5b8f6cb049..b56b43d408 100644
--- a/public/500.es.html
+++ b/public/500.es.html
@@ -7,7 +7,7 @@
 <body>
     <h1>¡Vaya!</h1>
     <p>Ha ocurrido un error en el sistema con el que funciona este foro. Sentimos las molestias.</p>
-    <p>Los detalles acerca del error han sido registrados, y se ha generado una notificación automática. Lo revisaremos.</p>
-    <p>No hace falta hacer nada más. Sin embargo, si el error continuara ocurriendo, podrías darnos más información, incluyendo los pasos para reproducirlo, publicando un tema en la sección de la categoría de sugerencias del sitio.</p>
+    <p>Los detalles del error han sido registrados, y se ha generado una notificación automática. Lo revisaremos.</p>
+    <p>No hace falta hacer nada más. Sin embargo, si el error sigue pasando, podrías darnos más información, incluyendo los pasos para reproducirlo, publicando un tema en la sección de la categoría de sugerencias del sitio.</p>
 </body>
 </html>
diff --git a/public/500.fa_IR.html b/public/500.fa_IR.html
index c22502737c..7b83362ef4 100644
--- a/public/500.fa_IR.html
+++ b/public/500.fa_IR.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Oops - Error 500</title>
+  <title>وای - خطای 500</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Oops</h1>
-    <p>The software powering this discussion forum encountered an unexpected problem. We apologize for the inconvenience.</p>
-    <p>Detailed information about the error was logged, and an automatic notification generated. We'll take a look at it.</p>
-    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+    <h1>وای</h1>
+    <p>نرم افزاری که قدرت این انجمن گفتگو را تأمین می کند، با یک مشکل غیرمنتظره روبرو شد. بخاطر این مشکل معذرت میخواهیم.</p>
+    <p>اطلاعات دقیق در مورد خطا ثبت شده و یک اعلان خودکار ایجاد شد. بعدا آن را برسی می کنیم.</p>
+    <p>دیگر اقدامی لازم نیست. با این حال ، اگر خطا ادامه پیدا کرد ، می توانید جزئیات بیشتری از جمله مراحل تولید مجدد خطا را با ارسال یک موضوع در گروه بازخورد سایت ارائه دهید.</p>
 </body>
 </html>
diff --git a/public/500.fi.html b/public/500.fi.html
index c22502737c..7ff0ecc505 100644
--- a/public/500.fi.html
+++ b/public/500.fi.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Oops - Error 500</title>
+  <title>Hups - Virhe 500</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Oops</h1>
-    <p>The software powering this discussion forum encountered an unexpected problem. We apologize for the inconvenience.</p>
-    <p>Detailed information about the error was logged, and an automatic notification generated. We'll take a look at it.</p>
-    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+    <h1>Hups</h1>
+    <p>Tätä keskustelufoorumia käyttävä ohjelmisto kohtasi odottamattoman ongelman. Pahoittelemme aiheutunutta häiriötä.</p>
+    <p>Virheilmoituksesta on kirjattu yksityiskohdat ja luotu automaattinen ilmoitus. Tarkastamme sen mahdollisimman pian.</p>
+    <p>Mitään lisätoimia ei tarvita. Jos virhetilanne jatkuu, voit antaa lisätietoja, mukaan lukien vaiheet jäljentää virhe, lähettämällä viestin sivuston palaute-alueelle.</p>
 </body>
 </html>
diff --git a/public/500.gl.html b/public/500.gl.html
index c22502737c..d2c1fedec1 100644
--- a/public/500.gl.html
+++ b/public/500.gl.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Oops - Error 500</title>
+  <title>Oopa - Erro 500</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Oops</h1>
-    <p>The software powering this discussion forum encountered an unexpected problem. We apologize for the inconvenience.</p>
-    <p>Detailed information about the error was logged, and an automatic notification generated. We'll take a look at it.</p>
-    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+    <h1>Oopa</h1>
+    <p>O software que lle permite funcionar a este foro de discusión atopou un problema inesperado. Pedimos desculpas pola molestia</p>
+    <p>Quedou rexistrada información detallada do erro e xerouse unha notificación automática. Revisarase en detalle.</p>
+    <p>Non cómpre realizar ningunha acción. No entanto, se persiste a situación de erro, pode fornecer detalles adicionais, como a inclusión de pasos para reproducir o erro e publicar un tema de discusión na categoría de comentarios do sitio.</p>
 </body>
 </html>
diff --git a/public/500.id.html b/public/500.id.html
index c22502737c..7992704e6f 100644
--- a/public/500.id.html
+++ b/public/500.id.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Oops - Error 500</title>
+  <title>Ups - Kesalahan 500</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
     <h1>Oops</h1>
-    <p>The software powering this discussion forum encountered an unexpected problem. We apologize for the inconvenience.</p>
-    <p>Detailed information about the error was logged, and an automatic notification generated. We'll take a look at it.</p>
-    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+    <p>Perangkat lunak yang mendukung forum diskusi ini mengalami masalah yang tidak terduga. Kami minta maaf atas ketidaknyamanan ini.</p>
+    <p>Informasi tentang kesalahan ini sudah dicatat dengan rinci, dan notifikasi otomatis telah dihasilkan. Kami akan memeriksanya.</p>
+    <p>Tidak ada tindakan lebih lanjut yang dibutuhkan. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
 </body>
 </html>
diff --git a/public/500.ja.html b/public/500.ja.html
index c22502737c..834c60f32a 100644
--- a/public/500.ja.html
+++ b/public/500.ja.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Oops - Error 500</title>
+  <title>おっと-エラー500</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Oops</h1>
-    <p>The software powering this discussion forum encountered an unexpected problem. We apologize for the inconvenience.</p>
-    <p>Detailed information about the error was logged, and an automatic notification generated. We'll take a look at it.</p>
-    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+    <h1>おっと</h1>
+    <p>ディスカッションフォーラムを提供するソフトウェアで、予期しない問題が発生しました。 ご不便をおかけして申し訳ございません。</p>
+    <p>エラーに関する詳細情報がログに記録され、自動で通知が送信されました。 それを見てみましょう。</p>
+    <p>これ以上のアクションは必要ありません。 しかし、エラー状態が続く場合は、 サイトのフィードバックカテゴリにディスカッショントピックを投稿することでエラーを再現するための手順などの追加の詳細を提供することができます。</p>
 </body>
 </html>
diff --git a/public/500.sr.html b/public/500.sr.html
index c22502737c..d627020f53 100644
--- a/public/500.sr.html
+++ b/public/500.sr.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Oops - Error 500</title>
+  <title>Ups - Greška 500</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Oops</h1>
-    <p>The software powering this discussion forum encountered an unexpected problem. We apologize for the inconvenience.</p>
-    <p>Detailed information about the error was logged, and an automatic notification generated. We'll take a look at it.</p>
-    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+    <h1>Ups</h1>
+    <p>Softver koji pokreće ovaj forum je naišao na problem. Izvinjavamo se zbog neprijatnosti.</p>
+    <p>Detaljne informacije o grešci su zabeležene i generisano je automatsko obaveštenje. Proverićemo šta se desilo.</p>
+    <p>Dalje akcije nisu potrebne. Međutim, ako ste stanje greške nastavi, možete pružiti dodatne detalje, uključujući korake za reprodukciju greške objavljivanjem nove teme na forumu u kategoriji za povratne informacije.</p>
 </body>
 </html>
diff --git a/public/500.zh_TW.html b/public/500.zh_TW.html
index c22502737c..9e3e801953 100644
--- a/public/500.zh_TW.html
+++ b/public/500.zh_TW.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Oops - Error 500</title>
+  <title>糟糕-錯誤500</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Oops</h1>
-    <p>The software powering this discussion forum encountered an unexpected problem. We apologize for the inconvenience.</p>
-    <p>Detailed information about the error was logged, and an automatic notification generated. We'll take a look at it.</p>
-    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+    <h1>哎呀</h1>
+    <p>支援此討論區的軟體發生意外的問題。 造成您的不便，我們深表歉意。</p>
+    <p>已記錄錯誤的詳細資訊，並產生自動通知。 我們來看一下。</p>
+    <p>無需採取進一步措施。 然而，如果錯誤狀況持續存在，您可以透過在網站的意見反應類別張貼主題來提供額外的詳情，包括怎麼重現錯誤狀況的步驟。</p>
 </body>
 </html>
diff --git a/public/503.cs.html b/public/503.cs.html
index 7239616237..a1d16f327a 100644
--- a/public/503.cs.html
+++ b/public/503.cs.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>Web prochází údržbou</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Fórum je dočasně odstavené kvůli plánované údržbě</h1>
+    <h1>V současné době jsme vypnuti kvůli plánované údržbě webu</h1>
     <p>Zkuste to prosím <span id="when-to-check-back">za pár minut</span>.</p>
     <p id="apology">Omlouváme se za nepříjemnosti!</p>
 </body>
diff --git a/public/503.da.html b/public/503.da.html
index e682fec041..cee28a054b 100644
--- a/public/503.da.html
+++ b/public/503.da.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>Webstedet undergår vedligeholdelse</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Vi er i øjeblikket lukket ned pga. planlagt vedligeholdelse</h1>
-    <p>Venligst tjek igen om <span id="when-to-check-back">et par minutter</span>.</p>
-    <p id="apology">Undskyld besværet!</p>
+    <h1>Vi er i øjeblikket nede for planlagt vedligeholdelse af webstedet</h1>
+    <p>Tjek venligst tilbage <span id="when-to-check-back">om et par minutter</span>.</p>
+    <p id="apology">Undskyld ulejligheden!</p>
 </body>
 </html>
diff --git a/public/503.en_GB.html b/public/503.en_GB.html
new file mode 100644
index 0000000000..69c45ae934
--- /dev/null
+++ b/public/503.en_GB.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Site Is Undergoing Maintenance</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>We are currently down for planned site maintenance</h1>
+    <p>Please check back <span id="when-to-check-back">in a few minutes</span>.</p>
+    <p id="apology">Sorry for the inconvenience!</p>
+</body>
+</html>
diff --git a/public/503.es.html b/public/503.es.html
index d6811e561b..fe8275e0b1 100644
--- a/public/503.es.html
+++ b/public/503.es.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>El sitio está en mantenimiento</title>
+  <title>En mantenimiento</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Actualmente estamos fuera de servicio por el mantenimiento planificado del sitio</h1>
-    <p>Por favor, revisa nuevamente <span id="when-to-check-back">en unos minutos</span>.</p>
-    <p id="apology">¡Lo sentimos por los inconvenientes ocasionados!</p>
+    <h1>En estos momentos estamos realizando tareas de mantenimiento programadas</h1>
+    <p>Vuelve <span id="when-to-check-back">en unos minutos</span>.</p>
+    <p id="apology">Sentimos las molestias</p>
 </body>
 </html>
diff --git a/public/503.fa_IR.html b/public/503.fa_IR.html
index fff54e37e1..513d0d13da 100644
--- a/public/503.fa_IR.html
+++ b/public/503.fa_IR.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>سایت در حال تعمیر است</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>طبق برنامه‌ ریزی، هم‌اکنون سایت برای تعمیر و نگهداری در دسترس نیست.</h1>
-    <p>لطفاً <span id="when-to-check-back">چند دقیقهٔ دیگر</span> دوباره برسی کنید. </p>
-    <p id="apology">پوزش برای این آزردگی!</p>
+    <h1>در حال حاضر سایت برای تعمیر و نگهداری در دسترس نیست.</h1>
+    <p>لطفاً <span id="when-to-check-back">چند دقیقهٔ دیگر</span> دوباره برسی کنید.</p>
+    <p id="apology">بخاطر این مشکل معذرت میخواهیم!</p>
 </body>
 </html>
diff --git a/public/503.fi.html b/public/503.fi.html
index 48d4f2528c..de81fe1b56 100644
--- a/public/503.fi.html
+++ b/public/503.fi.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>Sivustossa suoritetaan ylläpitotoimenpiteitä</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
     <h1>Suoritamme parhaillaan ylläpitotoimia</h1>
-    <p>Kokeile uudelleen <span id="when-to-check-back">parin minuutin kuluttua</span>.</p>
+    <p>Yritä uudelleen <span id="when-to-check-back">parin minuutin kuluttua</span>.</p>
     <p id="apology">Pahoittelemme aiheutunutta vaivaa.</p>
 </body>
 </html>
diff --git a/public/503.gl.html b/public/503.gl.html
index 29b287a397..0e43db792a 100644
--- a/public/503.gl.html
+++ b/public/503.gl.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>O sitio está en tarefas de mantemento</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Estamos realizando tarefas planificadas de mantemento</h1>
-    <p>Por favor, téntao <span id="when-to-check-back">dentro duns minutos</span>.</p>
-    <p id="apology">Sentimos as molestias.</p>
+    <h1>Non estamos activos neste momento debido a tarefas programadas de mantemento</h1>
+    <p>Por favor, ténteo de novo <span id="when-to-check-back">nuns minutos</span>.</p>
+    <p id="apology">Sentimos as molestias!</p>
 </body>
 </html>
diff --git a/public/503.hu.html b/public/503.hu.html
index 21abc38a76..6984e4eaf0 100644
--- a/public/503.hu.html
+++ b/public/503.hu.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>A webhely karbantartás alatt áll</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
diff --git a/public/503.pt_BR.html b/public/503.pt_BR.html
index 5fa1129880..ba778aa73e 100644
--- a/public/503.pt_BR.html
+++ b/public/503.pt_BR.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>O site está passando por uma manutenção</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Atualmente, estamos fora do ar para manutenção programada do site</h1>
+    <h1>Estamos fora do ar para uma manutenção programada</h1>
     <p>Por favor verifique novamente <span id="when-to-check-back">em alguns minutos</span>.</p>
     <p id="apology">Desculpe pelo inconveniente!</p>
 </body>
diff --git a/public/503.ro.html b/public/503.ro.html
index 0b05f1b265..9437b0e3d6 100644
--- a/public/503.ro.html
+++ b/public/503.ro.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>Site-ul este în curs de mentenanță</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
diff --git a/public/503.sl.html b/public/503.sl.html
index d4efd2128b..39105bf5b9 100644
--- a/public/503.sl.html
+++ b/public/503.sl.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>Spletna stran je v postopku vzdrževanja</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
diff --git a/public/503.sr.html b/public/503.sr.html
index c4bc188bc1..02eae6cc72 100644
--- a/public/503.sr.html
+++ b/public/503.sr.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>Forum je u fazi održavanja</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Trenutno smo ugasili forum za planirane popravke</h1>
+    <h1>Forum trenutno nije aktivan zbog planiranog održavanja</h1>
     <p>Molim proverite opet <span id="when-to-check-back">za nekoliko minuta</span>.</p>
     <p id="apology">Izvinite zbog neprijatnosti.</p>
 </body>
diff --git a/public/503.uk.html b/public/503.uk.html
index c7eb715bed..135fbdaa08 100644
--- a/public/503.uk.html
+++ b/public/503.uk.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>Сайт проходить технічне обслуговування</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Наразі на сайті проходять заплановані технічні роботи</h1>
+    <h1>Наразі на сайті проходять плановані технічні роботи</h1>
     <p>Будь ласка, спробуйте ще раз <span id="when-to-check-back">за декілька хвилин</span>.</p>
     <p id="apology">Вибачте за незручності!</p>
 </body>
diff --git a/public/503.zh_CN.html b/public/503.zh_CN.html
index ebe9bea6fe..69d68045ab 100644
--- a/public/503.zh_CN.html
+++ b/public/503.zh_CN.html
@@ -7,6 +7,6 @@
 <body>
     <h1>我们当前正在进行计划中维护操作。</h1>
     <p>请<span id="when-to-check-back">过几分钟</span>后再回来</p>
-    <p id="apology">很抱歉给您带来不便！</p>
+    <p id="apology">很抱歉给你带来不便！</p>
 </body>
 </html>
diff --git a/public/503.zh_TW.html b/public/503.zh_TW.html
index 570ba3ca0d..0e24a331cd 100644
--- a/public/503.zh_TW.html
+++ b/public/503.zh_TW.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>網站正在維護</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
diff --git a/app/assets/images/favicons/discourse.png b/public/images/favicons/discourse.png
similarity index 100%
rename from app/assets/images/favicons/discourse.png
rename to public/images/favicons/discourse.png
diff --git a/app/assets/images/favicons/google_branding/logo_calendar_128px.png b/public/images/favicons/google_branding/logo_calendar_128px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_calendar_128px.png
rename to public/images/favicons/google_branding/logo_calendar_128px.png
diff --git a/app/assets/images/favicons/google_branding/logo_calendar_48px.png b/public/images/favicons/google_branding/logo_calendar_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_calendar_48px.png
rename to public/images/favicons/google_branding/logo_calendar_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_docs_48px.png b/public/images/favicons/google_branding/logo_docs_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_docs_48px.png
rename to public/images/favicons/google_branding/logo_docs_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_drive_48px.png b/public/images/favicons/google_branding/logo_drive_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_drive_48px.png
rename to public/images/favicons/google_branding/logo_drive_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_forms_48px.png b/public/images/favicons/google_branding/logo_forms_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_forms_48px.png
rename to public/images/favicons/google_branding/logo_forms_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_sheets_48px.png b/public/images/favicons/google_branding/logo_sheets_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_sheets_48px.png
rename to public/images/favicons/google_branding/logo_sheets_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_slides_48px.png b/public/images/favicons/google_branding/logo_slides_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_slides_48px.png
rename to public/images/favicons/google_branding/logo_slides_48px.png
diff --git a/app/assets/images/favicons/google_play.png b/public/images/favicons/google_play.png
similarity index 100%
rename from app/assets/images/favicons/google_play.png
rename to public/images/favicons/google_play.png
diff --git a/app/assets/images/favicons/instagram.png b/public/images/favicons/instagram.png
similarity index 100%
rename from app/assets/images/favicons/instagram.png
rename to public/images/favicons/instagram.png
diff --git a/app/assets/images/favicons/pdf_48px.png b/public/images/favicons/pdf_48px.png
similarity index 100%
rename from app/assets/images/favicons/pdf_48px.png
rename to public/images/favicons/pdf_48px.png
diff --git a/app/assets/images/favicons/pdf_64px.png b/public/images/favicons/pdf_64px.png
similarity index 100%
rename from app/assets/images/favicons/pdf_64px.png
rename to public/images/favicons/pdf_64px.png
diff --git a/app/assets/images/favicons/stackexchange.png b/public/images/favicons/stackexchange.png
similarity index 100%
rename from app/assets/images/favicons/stackexchange.png
rename to public/images/favicons/stackexchange.png
diff --git a/public/javascripts/@json-editor/json-editor/2.5.2/jsoneditor.js b/public/javascripts/@json-editor/json-editor/2.5.2/jsoneditor.js
new file mode 100644
index 0000000000..64fd8bdc2b
--- /dev/null
+++ b/public/javascripts/@json-editor/json-editor/2.5.2/jsoneditor.js
@@ -0,0 +1,14 @@
+/*!
+ * /**
+ * * @name JSON Editor
+ * * @description JSON Schema Based Editor
+ * * This library is the continuation of jdorn's great work (see also https://github.com/jdorn/json-editor/issues/800)
+ * * @version "2.5.2"
+ * * @author Jeremy Dorn
+ * * @see https://github.com/jdorn/json-editor/
+ * * @see https://github.com/json-editor/json-editor
+ * * @license MIT
+ * * @example see README.md and docs/ for requirements, examples and usage info
+ * * /
+ */
+!function(t,e){if("object"==typeof exports&&"object"==typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var n=e();for(var r in n)("object"==typeof exports?exports:t)[r]=n[r]}}(window,(function(){return function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}return n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var i in t)n.d(r,i,function(e){return t[e]}.bind(null,i));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="/dist/",n(n.s=165)}([function(t,e,n){var r=n(34),i=n(94),o=n(70),a=n(63),s=n(120),l=a.set,c=a.getterFor("Array Iterator");t.exports=s(Array,"Array",(function(t,e){l(this,{type:"Array Iterator",target:r(t),index:0,kind:e})}),(function(){var t=c(this),e=t.target,n=t.kind,r=t.index++;return!e||r>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==n?{value:r,done:!1}:"values"==n?{value:e[r],done:!1}:{value:[r,e[r]],done:!1}}),"values"),o.Arguments=o.Array,i("keys"),i("values"),i("entries")},function(t,e,n){var r=n(14),i=n(22),o=n(52),a=n(64),s=n(23),l=n(90),c=n(111),u=n(17),h=n(27),d=n(66),p=n(26),f=n(28),y=n(32),m=n(34),v=n(62),b=n(60),g=n(53),_=n(67),w=n(65),k=n(141),x=n(88),j=n(47),O=n(30),C=n(73),E=n(39),S=n(45),R=n(83),P=n(74),L=n(75),T=n(84),A=n(19),I=n(113),D=n(114),B=n(91),N=n(63),F=n(54).forEach,V=P("hidden"),H=A("toPrimitive"),z=N.set,M=N.getterFor("Symbol"),q=Object.prototype,U=i.Symbol,G=o("JSON","stringify"),$=j.f,J=O.f,W=k.f,Z=C.f,Q=R("symbols"),Y=R("op-symbols"),X=R("string-to-symbol-registry"),K=R("symbol-to-string-registry"),tt=R("wks"),et=i.QObject,nt=!et||!et.prototype||!et.prototype.findChild,rt=s&&u((function(){return 7!=g(J({},"a",{get:function(){return J(this,"a",{value:7}).a}})).a}))?function(t,e,n){var r=$(q,e);r&&delete q[e],J(t,e,n),r&&t!==q&&J(q,e,r)}:J,it=function(t,e){var n=Q[t]=g(U.prototype);return z(n,{type:"Symbol",tag:t,description:e}),s||(n.description=e),n},ot=c?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof U},at=function(t,e,n){t===q&&at(Y,e,n),f(t);var r=v(e,!0);return f(n),h(Q,r)?(n.enumerable?(h(t,V)&&t[V][r]&&(t[V][r]=!1),n=g(n,{enumerable:b(0,!1)})):(h(t,V)||J(t,V,b(1,{})),t[V][r]=!0),rt(t,r,n)):J(t,r,n)},st=function(t,e){f(t);var n=m(e),r=_(n).concat(ht(n));return F(r,(function(e){s&&!lt.call(n,e)||at(t,e,n[e])})),t},lt=function(t){var e=v(t,!0),n=Z.call(this,e);return!(this===q&&h(Q,e)&&!h(Y,e))&&(!(n||!h(this,e)||!h(Q,e)||h(this,V)&&this[V][e])||n)},ct=function(t,e){var n=m(t),r=v(e,!0);if(n!==q||!h(Q,r)||h(Y,r)){var i=$(n,r);return!i||!h(Q,r)||h(n,V)&&n[V][r]||(i.enumerable=!0),i}},ut=function(t){var e=W(m(t)),n=[];return F(e,(function(t){h(Q,t)||h(L,t)||n.push(t)})),n},ht=function(t){var e=t===q,n=W(e?Y:m(t)),r=[];return F(n,(function(t){!h(Q,t)||e&&!h(q,t)||r.push(Q[t])})),r};(l||(S((U=function(){if(this instanceof U)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=T(t),n=function(t){this===q&&n.call(Y,t),h(this,V)&&h(this[V],e)&&(this[V][e]=!1),rt(this,e,b(1,t))};return s&&nt&&rt(q,e,{configurable:!0,set:n}),it(e,t)}).prototype,"toString",(function(){return M(this).tag})),S(U,"withoutSetter",(function(t){return it(T(t),t)})),C.f=lt,O.f=at,j.f=ct,w.f=k.f=ut,x.f=ht,I.f=function(t){return it(A(t),t)},s&&(J(U.prototype,"description",{configurable:!0,get:function(){return M(this).description}}),a||S(q,"propertyIsEnumerable",lt,{unsafe:!0}))),r({global:!0,wrap:!0,forced:!l,sham:!l},{Symbol:U}),F(_(tt),(function(t){D(t)})),r({target:"Symbol",stat:!0,forced:!l},{for:function(t){var e=String(t);if(h(X,e))return X[e];var n=U(e);return X[e]=n,K[n]=e,n},keyFor:function(t){if(!ot(t))throw TypeError(t+" is not a symbol");if(h(K,t))return K[t]},useSetter:function(){nt=!0},useSimple:function(){nt=!1}}),r({target:"Object",stat:!0,forced:!l,sham:!s},{create:function(t,e){return void 0===e?g(t):st(g(t),e)},defineProperty:at,defineProperties:st,getOwnPropertyDescriptor:ct}),r({target:"Object",stat:!0,forced:!l},{getOwnPropertyNames:ut,getOwnPropertySymbols:ht}),r({target:"Object",stat:!0,forced:u((function(){x.f(1)}))},{getOwnPropertySymbols:function(t){return x.f(y(t))}}),G)&&r({target:"JSON",stat:!0,forced:!l||u((function(){var t=U();return"[null]"!=G([t])||"{}"!=G({a:t})||"{}"!=G(Object(t))}))},{stringify:function(t,e,n){for(var r,i=[t],o=1;arguments.length>o;)i.push(arguments[o++]);if(r=e,(p(e)||void 0!==t)&&!ot(t))return d(e)||(e=function(t,e){if("function"==typeof r&&(e=r.call(this,t,e)),!ot(e))return e}),i[1]=e,G.apply(null,i)}});U.prototype[H]||E(U.prototype,H,U.prototype.valueOf),B(U,"Symbol"),L[V]=!0},function(t,e,n){var r=n(14),i=n(23),o=n(22),a=n(27),s=n(26),l=n(30).f,c=n(107),u=o.Symbol;if(i&&"function"==typeof u&&(!("description"in u.prototype)||void 0!==u().description)){var h={},d=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof d?new u(t):void 0===t?u():u(t);return""===t&&(h[e]=!0),e};c(d,u);var p=d.prototype=u.prototype;p.constructor=d;var f=p.toString,y="Symbol(test)"==String(u("test")),m=/^Symbol\((.*)\)[^)]+$/;l(p,"description",{configurable:!0,get:function(){var t=s(this)?this.valueOf():this,e=f.call(t);if(a(h,t))return"";var n=y?e.slice(7,-1):e.replace(m,"$1");return""===n?void 0:n}}),r({global:!0,forced:!0},{Symbol:d})}},function(t,e,n){n(114)("iterator")},function(t,e,n){var r=n(45),i=Date.prototype,o=i.toString,a=i.getTime;new Date(NaN)+""!="Invalid Date"&&r(i,"toString",(function(){var t=a.call(this);return t==t?o.call(this):"Invalid Date"}))},function(t,e,n){var r=n(95),i=n(45),o=n(152);r||i(Object.prototype,"toString",o,{unsafe:!0})},function(t,e,n){var r=n(45),i=n(28),o=n(17),a=n(97),s=RegExp.prototype,l=s.toString,c=o((function(){return"/a/b"!=l.call({source:"a",flags:"b"})})),u="toString"!=l.name;(c||u)&&r(RegExp.prototype,"toString",(function(){var t=i(this),e=String(t.source),n=t.flags;return"/"+e+"/"+String(void 0===n&&t instanceof RegExp&&!("flags"in s)?a.call(t):n)}),{unsafe:!0})},function(t,e,n){var r=n(124).charAt,i=n(63),o=n(120),a=i.set,s=i.getterFor("String Iterator");o(String,"String",(function(t){a(this,{type:"String Iterator",string:String(t),index:0})}),(function(){var t,e=s(this),n=e.string,i=e.index;return i>=n.length?{value:void 0,done:!0}:(t=r(n,i),e.index+=t.length,{value:t,done:!1})}))},function(t,e,n){var r=n(22),i=n(125),o=n(0),a=n(39),s=n(19),l=s("iterator"),c=s("toStringTag"),u=o.values;for(var h in i){var d=r[h],p=d&&d.prototype;if(p){if(p[l]!==u)try{a(p,l,u)}catch(t){p[l]=u}if(p[c]||a(p,c,h),i[h])for(var f in o)if(p[f]!==o[f])try{a(p,f,o[f])}catch(t){p[f]=o[f]}}}},function(t,e,n){var r=n(14),i=n(23);r({target:"Object",stat:!0,forced:!i,sham:!i},{defineProperty:n(30).f})},function(t,e,n){n(14)({target:"Object",stat:!0,sham:!n(23)},{create:n(53)})},function(t,e,n){var r=n(14),i=n(17),o=n(32),a=n(76),s=n(122);r({target:"Object",stat:!0,forced:i((function(){a(1)})),sham:!s},{getPrototypeOf:function(t){return a(o(t))}})},function(t,e,n){n(14)({target:"Object",stat:!0},{setPrototypeOf:n(96)})},function(t,e,n){var r=n(14),i=n(52),o=n(55),a=n(28),s=n(26),l=n(53),c=n(131),u=n(17),h=i("Reflect","construct"),d=u((function(){function t(){}return!(h((function(){}),[],t)instanceof t)})),p=!u((function(){h((function(){}))})),f=d||p;r({target:"Reflect",stat:!0,forced:f,sham:f},{construct:function(t,e){o(t),a(e);var n=arguments.length<3?t:o(arguments[2]);if(p&&!d)return h(t,e,n);if(t==n){switch(e.length){case 0:return new t;case 1:return new t(e[0]);case 2:return new t(e[0],e[1]);case 3:return new t(e[0],e[1],e[2]);case 4:return new t(e[0],e[1],e[2],e[3])}var r=[null];return r.push.apply(r,e),new(c.apply(t,r))}var i=n.prototype,u=l(s(i)?i:Object.prototype),f=Function.apply.call(t,u,e);return s(f)?f:u}})},function(t,e,n){var r=n(22),i=n(47).f,o=n(39),a=n(45),s=n(82),l=n(107),c=n(89);t.exports=function(t,e){var n,u,h,d,p,f=t.target,y=t.global,m=t.stat;if(n=y?r:m?r[f]||s(f,{}):(r[f]||{}).prototype)for(u in e){if(d=e[u],h=t.noTargetGet?(p=i(n,u))&&p.value:n[u],!c(y?u:f+(m?".":"#")+u,t.forced)&&void 0!==h){if(typeof d==typeof h)continue;l(d,h)}(t.sham||h&&h.sham)&&o(d,"sham",!0),a(n,u,d,t)}}},function(t,e,n){var r=n(14),i=n(17),o=n(34),a=n(47).f,s=n(23),l=i((function(){a(1)}));r({target:"Object",stat:!0,forced:!s||l,sham:!s},{getOwnPropertyDescriptor:function(t,e){return a(o(t),e)}})},function(t,e,n){var r=n(14),i=n(26),o=n(28),a=n(27),s=n(47),l=n(76);r({target:"Reflect",stat:!0},{get:function t(e,n){var r,c,u=arguments.length<3?e:arguments[2];return o(e)===u?e[n]:(r=s.f(e,n))?a(r,"value")?r.value:void 0===r.get?void 0:r.get.call(u):i(c=l(e))?t(c,n,u):void 0}})},function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,e,n){var r=n(14),i=n(17),o=n(66),a=n(26),s=n(32),l=n(35),c=n(68),u=n(92),h=n(69),d=n(19),p=n(116),f=d("isConcatSpreadable"),y=p>=51||!i((function(){var t=[];return t[f]=!1,t.concat()[0]!==t})),m=h("concat"),v=function(t){if(!a(t))return!1;var e=t[f];return void 0!==e?!!e:o(t)};r({target:"Array",proto:!0,forced:!y||!m},{concat:function(t){var e,n,r,i,o,a=s(this),h=u(a,0),d=0;for(e=-1,r=arguments.length;e<r;e++)if(o=-1===e?a:arguments[e],v(o)){if(d+(i=l(o.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(n=0;n<i;n++,d++)n in o&&c(h,d,o[n])}else{if(d>=9007199254740991)throw TypeError("Maximum allowed index exceeded");c(h,d++,o)}return h.length=d,h}})},function(t,e,n){var r=n(22),i=n(83),o=n(27),a=n(84),s=n(90),l=n(111),c=i("wks"),u=r.Symbol,h=l?u:u&&u.withoutSetter||a;t.exports=function(t){return o(c,t)||(s&&o(u,t)?c[t]=u[t]:c[t]=h("Symbol."+t)),c[t]}},function(t,e,n){var r=n(14),i=n(118);r({target:"Array",proto:!0,forced:[].forEach!=i},{forEach:i})},function(t,e,n){var r=n(22),i=n(125),o=n(118),a=n(39);for(var s in i){var l=r[s],c=l&&l.prototype;if(c&&c.forEach!==o)try{a(c,"forEach",o)}catch(t){c.forEach=o}}},function(t,e,n){(function(e){var n=function(t){return t&&t.Math==Math&&t};t.exports=n("object"==typeof globalThis&&globalThis)||n("object"==typeof window&&window)||n("object"==typeof self&&self)||n("object"==typeof e&&e)||Function("return this")()}).call(this,n(138))},function(t,e,n){var r=n(17);t.exports=!r((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]}))},function(t,e,n){var r=n(14),i=n(77);r({target:"RegExp",proto:!0,forced:/./.exec!==i},{exec:i})},function(t,e,n){n(14)({target:"Array",stat:!0},{isArray:n(66)})},function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},function(t,e,n){var r=n(26);t.exports=function(t){if(!r(t))throw TypeError(String(t)+" is not an object");return t}},function(t,e,n){var r=n(14),i=n(85).includes,o=n(94);r({target:"Array",proto:!0,forced:!n(40)("indexOf",{ACCESSORS:!0,1:0})},{includes:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}}),o("includes")},function(t,e,n){var r=n(23),i=n(103),o=n(28),a=n(62),s=Object.defineProperty;e.f=r?s:function(t,e,n){if(o(t),e=a(e,!0),o(n),i)try{return s(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},function(t,e,n){var r=n(14),i=n(26),o=n(66),a=n(86),s=n(35),l=n(34),c=n(68),u=n(19),h=n(69),d=n(40),p=h("slice"),f=d("slice",{ACCESSORS:!0,0:0,1:2}),y=u("species"),m=[].slice,v=Math.max;r({target:"Array",proto:!0,forced:!p||!f},{slice:function(t,e){var n,r,u,h=l(this),d=s(h.length),p=a(t,d),f=a(void 0===e?d:e,d);if(o(h)&&("function"!=typeof(n=h.constructor)||n!==Array&&!o(n.prototype)?i(n)&&null===(n=n[y])&&(n=void 0):n=void 0,n===Array||void 0===n))return m.call(h,p,f);for(r=new(void 0===n?Array:n)(v(f-p,0)),u=0;p<f;p++,u++)p in h&&c(r,u,h[p]);return r.length=u,r}})},function(t,e,n){var r=n(38);t.exports=function(t){return Object(r(t))}},function(t,e,n){var r=n(23),i=n(30).f,o=Function.prototype,a=o.toString,s=/^\s*function ([^ (]*)/;r&&!("name"in o)&&i(o,"name",{configurable:!0,get:function(){try{return a.call(this).match(s)[1]}catch(t){return""}}})},function(t,e,n){var r=n(61),i=n(38);t.exports=function(t){return r(i(t))}},function(t,e,n){var r=n(50),i=Math.min;t.exports=function(t){return t>0?i(r(t),9007199254740991):0}},function(t,e,n){var r=n(14),i=n(142);r({target:"Array",stat:!0,forced:!n(146)((function(t){Array.from(t)}))},{from:i})},function(t,e,n){var r=n(14),i=n(128),o=n(38);r({target:"String",proto:!0,forced:!n(129)("includes")},{includes:function(t){return!!~String(o(this)).indexOf(i(t),arguments.length>1?arguments[1]:void 0)}})},function(t,e){t.exports=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t}},function(t,e,n){var r=n(23),i=n(30),o=n(60);t.exports=r?function(t,e,n){return i.f(t,e,o(1,n))}:function(t,e,n){return t[e]=n,t}},function(t,e,n){var r=n(23),i=n(17),o=n(27),a=Object.defineProperty,s={},l=function(t){throw t};t.exports=function(t,e){if(o(s,t))return s[t];e||(e={});var n=[][t],c=!!o(e,"ACCESSORS")&&e.ACCESSORS,u=o(e,0)?e[0]:l,h=o(e,1)?e[1]:void 0;return s[t]=!!n&&!i((function(){if(c&&!r)return!0;var t={length:-1};c?a(t,1,{enumerable:!0,get:l}):t[1]=1,n.call(t,u,h)}))}},function(t,e,n){var r=n(14),i=n(149).left,o=n(56),a=n(40),s=o("reduce"),l=a("reduce",{1:0});r({target:"Array",proto:!0,forced:!s||!l},{reduce:function(t){return i(this,t,arguments.length,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){var r=n(14),i=n(32),o=n(67);r({target:"Object",stat:!0,forced:n(17)((function(){o(1)}))},{keys:function(t){return o(i(t))}})},function(t,e,n){var r=n(99),i=n(28),o=n(32),a=n(35),s=n(50),l=n(38),c=n(100),u=n(101),h=Math.max,d=Math.min,p=Math.floor,f=/\$([$&'`]|\d\d?|<[^>]*>)/g,y=/\$([$&'`]|\d\d?)/g;r("replace",2,(function(t,e,n,r){var m=r.REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE,v=r.REPLACE_KEEPS_$0,b=m?"$":"$0";return[function(n,r){var i=l(this),o=null==n?void 0:n[t];return void 0!==o?o.call(n,i,r):e.call(String(i),n,r)},function(t,r){if(!m&&v||"string"==typeof r&&-1===r.indexOf(b)){var o=n(e,t,this,r);if(o.done)return o.value}var l=i(t),p=String(this),f="function"==typeof r;f||(r=String(r));var y=l.global;if(y){var _=l.unicode;l.lastIndex=0}for(var w=[];;){var k=u(l,p);if(null===k)break;if(w.push(k),!y)break;""===String(k[0])&&(l.lastIndex=c(p,a(l.lastIndex),_))}for(var x,j="",O=0,C=0;C<w.length;C++){k=w[C];for(var E=String(k[0]),S=h(d(s(k.index),p.length),0),R=[],P=1;P<k.length;P++)R.push(void 0===(x=k[P])?x:String(x));var L=k.groups;if(f){var T=[E].concat(R,S,p);void 0!==L&&T.push(L);var A=String(r.apply(void 0,T))}else A=g(E,p,S,R,L,r);S>=O&&(j+=p.slice(O,S)+A,O=S+E.length)}return j+p.slice(O)}];function g(t,n,r,i,a,s){var l=r+t.length,c=i.length,u=y;return void 0!==a&&(a=o(a),u=f),e.call(s,u,(function(e,o){var s;switch(o.charAt(0)){case"$":return"$";case"&":return t;case"`":return n.slice(0,r);case"'":return n.slice(l);case"<":s=a[o.slice(1,-1)];break;default:var u=+o;if(0===u)return e;if(u>c){var h=p(u/10);return 0===h?e:h<=c?void 0===i[h-1]?o.charAt(1):i[h-1]+o.charAt(1):e}s=i[u-1]}return void 0===s?"":s}))}}))},function(t,e,n){var r=n(14),i=n(54).map,o=n(69),a=n(40),s=o("map"),l=a("map");r({target:"Array",proto:!0,forced:!s||!l},{map:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){var r=n(22),i=n(39),o=n(27),a=n(82),s=n(105),l=n(63),c=l.get,u=l.enforce,h=String(String).split("String");(t.exports=function(t,e,n,s){var l=!!s&&!!s.unsafe,c=!!s&&!!s.enumerable,d=!!s&&!!s.noTargetGet;"function"==typeof n&&("string"!=typeof e||o(n,"name")||i(n,"name",e),u(n).source=h.join("string"==typeof e?e:"")),t!==r?(l?!d&&t[e]&&(c=!0):delete t[e],c?t[e]=n:i(t,e,n)):c?t[e]=n:a(e,n)})(Function.prototype,"toString",(function(){return"function"==typeof this&&c(this).source||s(this)}))},function(t,e,n){var r=n(99),i=n(28),o=n(35),a=n(38),s=n(100),l=n(101);r("match",1,(function(t,e,n){return[function(e){var n=a(this),r=null==e?void 0:e[t];return void 0!==r?r.call(e,n):new RegExp(e)[t](String(n))},function(t){var r=n(e,t,this);if(r.done)return r.value;var a=i(t),c=String(this);if(!a.global)return l(a,c);var u=a.unicode;a.lastIndex=0;for(var h,d=[],p=0;null!==(h=l(a,c));){var f=String(h[0]);d[p]=f,""===f&&(a.lastIndex=s(c,o(a.lastIndex),u)),p++}return 0===p?null:d}]}))},function(t,e,n){var r=n(23),i=n(73),o=n(60),a=n(34),s=n(62),l=n(27),c=n(103),u=Object.getOwnPropertyDescriptor;e.f=r?u:function(t,e){if(t=a(t),e=s(e,!0),c)try{return u(t,e)}catch(t){}if(l(t,e))return o(!i.f.call(t,e),t[e])}},function(t,e,n){var r=n(14),i=n(61),o=n(34),a=n(56),s=[].join,l=i!=Object,c=a("join",",");r({target:"Array",proto:!0,forced:l||!c},{join:function(t){return s.call(o(this),void 0===t?",":t)}})},function(t,e){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},function(t,e){var n=Math.ceil,r=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?r:n)(t)}},function(t,e,n){var r=n(99),i=n(98),o=n(28),a=n(38),s=n(155),l=n(100),c=n(35),u=n(101),h=n(77),d=n(17),p=[].push,f=Math.min,y=!d((function(){return!RegExp(4294967295,"y")}));r("split",2,(function(t,e,n){var r;return r="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,n){var r=String(a(this)),o=void 0===n?4294967295:n>>>0;if(0===o)return[];if(void 0===t)return[r];if(!i(t))return e.call(r,t,o);for(var s,l,c,u=[],d=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),f=0,y=new RegExp(t.source,d+"g");(s=h.call(y,r))&&!((l=y.lastIndex)>f&&(u.push(r.slice(f,s.index)),s.length>1&&s.index<r.length&&p.apply(u,s.slice(1)),c=s[0].length,f=l,u.length>=o));)y.lastIndex===s.index&&y.lastIndex++;return f===r.length?!c&&y.test("")||u.push(""):u.push(r.slice(f)),u.length>o?u.slice(0,o):u}:"0".split(void 0,0).length?function(t,n){return void 0===t&&0===n?[]:e.call(this,t,n)}:e,[function(e,n){var i=a(this),o=null==e?void 0:e[t];return void 0!==o?o.call(e,i,n):r.call(String(i),e,n)},function(t,i){var a=n(r,t,this,i,r!==e);if(a.done)return a.value;var h=o(t),d=String(this),p=s(h,RegExp),m=h.unicode,v=(h.ignoreCase?"i":"")+(h.multiline?"m":"")+(h.unicode?"u":"")+(y?"y":"g"),b=new p(y?h:"^(?:"+h.source+")",v),g=void 0===i?4294967295:i>>>0;if(0===g)return[];if(0===d.length)return null===u(b,d)?[d]:[];for(var _=0,w=0,k=[];w<d.length;){b.lastIndex=y?w:0;var x,j=u(b,y?d:d.slice(w));if(null===j||(x=f(c(b.lastIndex+(y?0:w)),d.length))===_)w=l(d,w,m);else{if(k.push(d.slice(_,w)),k.length===g)return k;for(var O=1;O<=j.length-1;O++)if(k.push(j[O]),k.length===g)return k;w=_=x}}return k.push(d.slice(_)),k}]}),!y)},function(t,e,n){var r=n(109),i=n(22),o=function(t){return"function"==typeof t?t:void 0};t.exports=function(t,e){return arguments.length<2?o(r[t])||o(i[t]):r[t]&&r[t][e]||i[t]&&i[t][e]}},function(t,e,n){var r,i=n(28),o=n(112),a=n(87),s=n(75),l=n(140),c=n(104),u=n(74),h=u("IE_PROTO"),d=function(){},p=function(t){return"<script>"+t+"<\/script>"},f=function(){try{r=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;f=r?function(t){t.write(p("")),t.close();var e=t.parentWindow.Object;return t=null,e}(r):((e=c("iframe")).style.display="none",l.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(p("document.F=Object")),t.close(),t.F);for(var n=a.length;n--;)delete f.prototype[a[n]];return f()};s[h]=!0,t.exports=Object.create||function(t,e){var n;return null!==t?(d.prototype=i(t),n=new d,d.prototype=null,n[h]=t):n=f(),void 0===e?n:o(n,e)}},function(t,e,n){var r=n(115),i=n(61),o=n(32),a=n(35),s=n(92),l=[].push,c=function(t){var e=1==t,n=2==t,c=3==t,u=4==t,h=6==t,d=5==t||h;return function(p,f,y,m){for(var v,b,g=o(p),_=i(g),w=r(f,y,3),k=a(_.length),x=0,j=m||s,O=e?j(p,k):n?j(p,0):void 0;k>x;x++)if((d||x in _)&&(b=w(v=_[x],x,g),t))if(e)O[x]=b;else if(b)switch(t){case 3:return!0;case 5:return v;case 6:return x;case 2:l.call(O,v)}else if(u)return!1;return h?-1:c||u?u:O}};t.exports={forEach:c(0),map:c(1),filter:c(2),some:c(3),every:c(4),find:c(5),findIndex:c(6)}},function(t,e){t.exports=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t}},function(t,e,n){var r=n(17);t.exports=function(t,e){var n=[][t];return!!n&&r((function(){n.call(null,e||function(){throw 1},1)}))}},function(t,e,n){var r=n(14),i=n(123).values;r({target:"Object",stat:!0},{values:function(t){return i(t)}})},function(t,e,n){var r=n(14),i=n(123).entries;r({target:"Object",stat:!0},{entries:function(t){return i(t)}})},function(t,e,n){var r=n(23),i=n(22),o=n(89),a=n(126),s=n(30).f,l=n(65).f,c=n(98),u=n(97),h=n(127),d=n(45),p=n(17),f=n(63).set,y=n(153),m=n(19)("match"),v=i.RegExp,b=v.prototype,g=/a/g,_=/a/g,w=new v(g)!==g,k=h.UNSUPPORTED_Y;if(r&&o("RegExp",!w||k||p((function(){return _[m]=!1,v(g)!=g||v(_)==_||"/a/i"!=v(g,"i")})))){for(var x=function(t,e){var n,r=this instanceof x,i=c(t),o=void 0===e;if(!r&&i&&t.constructor===x&&o)return t;w?i&&!o&&(t=t.source):t instanceof x&&(o&&(e=u.call(t)),t=t.source),k&&(n=!!e&&e.indexOf("y")>-1)&&(e=e.replace(/y/g,""));var s=a(w?new v(t,e):v(t,e),r?this:b,x);return k&&n&&f(s,{sticky:n}),s},j=function(t){t in x||s(x,t,{configurable:!0,get:function(){return v[t]},set:function(e){v[t]=e}})},O=l(v),C=0;O.length>C;)j(O[C++]);b.constructor=x,x.prototype=b,d(i,"RegExp",x)}y("RegExp")},function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t,e,n){var r=n(17),i=n(49),o="".split;t.exports=r((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==i(t)?o.call(t,""):Object(t)}:Object},function(t,e,n){var r=n(26);t.exports=function(t,e){if(!r(t))return t;var n,i;if(e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;if("function"==typeof(n=t.valueOf)&&!r(i=n.call(t)))return i;if(!e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;throw TypeError("Can't convert object to primitive value")}},function(t,e,n){var r,i,o,a=n(139),s=n(22),l=n(26),c=n(39),u=n(27),h=n(74),d=n(75),p=s.WeakMap;if(a){var f=new p,y=f.get,m=f.has,v=f.set;r=function(t,e){return v.call(f,t,e),e},i=function(t){return y.call(f,t)||{}},o=function(t){return m.call(f,t)}}else{var b=h("state");d[b]=!0,r=function(t,e){return c(t,b,e),e},i=function(t){return u(t,b)?t[b]:{}},o=function(t){return u(t,b)}}t.exports={set:r,get:i,has:o,enforce:function(t){return o(t)?i(t):r(t,{})},getterFor:function(t){return function(e){var n;if(!l(e)||(n=i(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}}},function(t,e){t.exports=!1},function(t,e,n){var r=n(110),i=n(87).concat("length","prototype");e.f=Object.getOwnPropertyNames||function(t){return r(t,i)}},function(t,e,n){var r=n(49);t.exports=Array.isArray||function(t){return"Array"==r(t)}},function(t,e,n){var r=n(110),i=n(87);t.exports=Object.keys||function(t){return r(t,i)}},function(t,e,n){var r=n(62),i=n(30),o=n(60);t.exports=function(t,e,n){var a=r(e);a in t?i.f(t,a,o(0,n)):t[a]=n}},function(t,e,n){var r=n(17),i=n(19),o=n(116),a=i("species");t.exports=function(t){return o>=51||!r((function(){var e=[];return(e.constructor={})[a]=function(){return{foo:1}},1!==e[t](Boolean).foo}))}},function(t,e){t.exports={}},function(t,e,n){var r=n(14),i=n(154);r({global:!0,forced:parseInt!=i},{parseInt:i})},function(t,e,n){var r=n(14),i=n(54).filter,o=n(69),a=n(40),s=o("filter"),l=a("filter");r({target:"Array",proto:!0,forced:!s||!l},{filter:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){var r={}.propertyIsEnumerable,i=Object.getOwnPropertyDescriptor,o=i&&!r.call({1:2},1);e.f=o?function(t){var e=i(this,t);return!!e&&e.enumerable}:r},function(t,e,n){var r=n(83),i=n(84),o=r("keys");t.exports=function(t){return o[t]||(o[t]=i(t))}},function(t,e){t.exports={}},function(t,e,n){var r=n(27),i=n(32),o=n(74),a=n(122),s=o("IE_PROTO"),l=Object.prototype;t.exports=a?Object.getPrototypeOf:function(t){return t=i(t),r(t,s)?t[s]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?l:null}},function(t,e,n){var r,i,o=n(97),a=n(127),s=RegExp.prototype.exec,l=String.prototype.replace,c=s,u=(r=/a/,i=/b*/g,s.call(r,"a"),s.call(i,"a"),0!==r.lastIndex||0!==i.lastIndex),h=a.UNSUPPORTED_Y||a.BROKEN_CARET,d=void 0!==/()??/.exec("")[1];(u||d||h)&&(c=function(t){var e,n,r,i,a=this,c=h&&a.sticky,p=o.call(a),f=a.source,y=0,m=t;return c&&(-1===(p=p.replace("y","")).indexOf("g")&&(p+="g"),m=String(t).slice(a.lastIndex),a.lastIndex>0&&(!a.multiline||a.multiline&&"\n"!==t[a.lastIndex-1])&&(f="(?: "+f+")",m=" "+m,y++),n=new RegExp("^(?:"+f+")",p)),d&&(n=new RegExp("^"+f+"$(?!\\s)",p)),u&&(e=a.lastIndex),r=s.call(c?n:a,m),c?r?(r.input=r.input.slice(y),r[0]=r[0].slice(y),r.index=a.lastIndex,a.lastIndex+=r[0].length):a.lastIndex=0:u&&r&&(a.lastIndex=a.global?r.index+r[0].length:e),d&&r&&r.length>1&&l.call(r[0],n,(function(){for(i=1;i<arguments.length-2;i++)void 0===arguments[i]&&(r[i]=void 0)})),r}),t.exports=c},function(t,e,n){var r=n(14),i=n(54).some,o=n(56),a=n(40),s=o("some"),l=a("some");r({target:"Array",proto:!0,forced:!s||!l},{some:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){var r=n(38),i="["+n(80)+"]",o=RegExp("^"+i+i+"*"),a=RegExp(i+i+"*$"),s=function(t){return function(e){var n=String(r(e));return 1&t&&(n=n.replace(o,"")),2&t&&(n=n.replace(a,"")),n}};t.exports={start:s(1),end:s(2),trim:s(3)}},function(t,e){t.exports="\t\n\v\f\r                　\u2028\u2029\ufeff"},function(t,e,n){var r=n(14),i=n(85).indexOf,o=n(56),a=n(40),s=[].indexOf,l=!!s&&1/[1].indexOf(1,-0)<0,c=o("indexOf"),u=a("indexOf",{ACCESSORS:!0,1:0});r({target:"Array",proto:!0,forced:l||!c||!u},{indexOf:function(t){return l?s.apply(this,arguments)||0:i(this,t,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){var r=n(22),i=n(39);t.exports=function(t,e){try{i(r,t,e)}catch(n){r[t]=e}return e}},function(t,e,n){var r=n(64),i=n(106);(t.exports=function(t,e){return i[t]||(i[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.5",mode:r?"pure":"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})},function(t,e){var n=0,r=Math.random();t.exports=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++n+r).toString(36)}},function(t,e,n){var r=n(34),i=n(35),o=n(86),a=function(t){return function(e,n,a){var s,l=r(e),c=i(l.length),u=o(a,c);if(t&&n!=n){for(;c>u;)if((s=l[u++])!=s)return!0}else for(;c>u;u++)if((t||u in l)&&l[u]===n)return t||u||0;return!t&&-1}};t.exports={includes:a(!0),indexOf:a(!1)}},function(t,e,n){var r=n(50),i=Math.max,o=Math.min;t.exports=function(t,e){var n=r(t);return n<0?i(n+e,0):o(n,e)}},function(t,e){t.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},function(t,e){e.f=Object.getOwnPropertySymbols},function(t,e,n){var r=n(17),i=/#|\.prototype\./,o=function(t,e){var n=s[a(t)];return n==c||n!=l&&("function"==typeof e?r(e):!!e)},a=o.normalize=function(t){return String(t).replace(i,".").toLowerCase()},s=o.data={},l=o.NATIVE="N",c=o.POLYFILL="P";t.exports=o},function(t,e,n){var r=n(17);t.exports=!!Object.getOwnPropertySymbols&&!r((function(){return!String(Symbol())}))},function(t,e,n){var r=n(30).f,i=n(27),o=n(19)("toStringTag");t.exports=function(t,e,n){t&&!i(t=n?t:t.prototype,o)&&r(t,o,{configurable:!0,value:e})}},function(t,e,n){var r=n(26),i=n(66),o=n(19)("species");t.exports=function(t,e){var n;return i(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!i(n.prototype)?r(n)&&null===(n=n[o])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===e?0:e)}},function(t,e,n){var r=n(14),i=n(54).find,o=n(94),a=n(40),s=!0,l=a("find");"find"in[]&&Array(1).find((function(){s=!1})),r({target:"Array",proto:!0,forced:s||!l},{find:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}}),o("find")},function(t,e,n){var r=n(19),i=n(53),o=n(30),a=r("unscopables"),s=Array.prototype;null==s[a]&&o.f(s,a,{configurable:!0,value:i(null)}),t.exports=function(t){s[a][t]=!0}},function(t,e,n){var r={};r[n(19)("toStringTag")]="z",t.exports="[object z]"===String(r)},function(t,e,n){var r=n(28),i=n(148);t.exports=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,n={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(n,[]),e=n instanceof Array}catch(t){}return function(n,o){return r(n),i(o),e?t.call(n,o):n.__proto__=o,n}}():void 0)},function(t,e,n){var r=n(28);t.exports=function(){var t=r(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e}},function(t,e,n){var r=n(26),i=n(49),o=n(19)("match");t.exports=function(t){var e;return r(t)&&(void 0!==(e=t[o])?!!e:"RegExp"==i(t))}},function(t,e,n){n(24);var r=n(45),i=n(17),o=n(19),a=n(77),s=n(39),l=o("species"),c=!i((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),u="$0"==="a".replace(/./,"$0"),h=o("replace"),d=!!/./[h]&&""===/./[h]("a","$0"),p=!i((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var n="ab".split(t);return 2!==n.length||"a"!==n[0]||"b"!==n[1]}));t.exports=function(t,e,n,h){var f=o(t),y=!i((function(){var e={};return e[f]=function(){return 7},7!=""[t](e)})),m=y&&!i((function(){var e=!1,n=/a/;return"split"===t&&((n={}).constructor={},n.constructor[l]=function(){return n},n.flags="",n[f]=/./[f]),n.exec=function(){return e=!0,null},n[f](""),!e}));if(!y||!m||"replace"===t&&(!c||!u||d)||"split"===t&&!p){var v=/./[f],b=n(f,""[t],(function(t,e,n,r,i){return e.exec===a?y&&!i?{done:!0,value:v.call(e,n,r)}:{done:!0,value:t.call(n,e,r)}:{done:!1}}),{REPLACE_KEEPS_$0:u,REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE:d}),g=b[0],_=b[1];r(String.prototype,t,g),r(RegExp.prototype,f,2==e?function(t,e){return _.call(t,this,e)}:function(t){return _.call(t,this)})}h&&s(RegExp.prototype[f],"sham",!0)}},function(t,e,n){var r=n(124).charAt;t.exports=function(t,e,n){return e+(n?r(t,e).length:1)}},function(t,e,n){var r=n(49),i=n(77);t.exports=function(t,e){var n=t.exec;if("function"==typeof n){var o=n.call(t,e);if("object"!=typeof o)throw TypeError("RegExp exec method returned something other than an Object or null");return o}if("RegExp"!==r(t))throw TypeError("RegExp#exec called on incompatible receiver");return i.call(t,e)}},function(t,e,n){var r=n(14),i=n(156);r({global:!0,forced:parseFloat!=i},{parseFloat:i})},function(t,e,n){var r=n(23),i=n(17),o=n(104);t.exports=!r&&!i((function(){return 7!=Object.defineProperty(o("div"),"a",{get:function(){return 7}}).a}))},function(t,e,n){var r=n(22),i=n(26),o=r.document,a=i(o)&&i(o.createElement);t.exports=function(t){return a?o.createElement(t):{}}},function(t,e,n){var r=n(106),i=Function.toString;"function"!=typeof r.inspectSource&&(r.inspectSource=function(t){return i.call(t)}),t.exports=r.inspectSource},function(t,e,n){var r=n(22),i=n(82),o=r["__core-js_shared__"]||i("__core-js_shared__",{});t.exports=o},function(t,e,n){var r=n(27),i=n(108),o=n(47),a=n(30);t.exports=function(t,e){for(var n=i(e),s=a.f,l=o.f,c=0;c<n.length;c++){var u=n[c];r(t,u)||s(t,u,l(e,u))}}},function(t,e,n){var r=n(52),i=n(65),o=n(88),a=n(28);t.exports=r("Reflect","ownKeys")||function(t){var e=i.f(a(t)),n=o.f;return n?e.concat(n(t)):e}},function(t,e,n){var r=n(22);t.exports=r},function(t,e,n){var r=n(27),i=n(34),o=n(85).indexOf,a=n(75);t.exports=function(t,e){var n,s=i(t),l=0,c=[];for(n in s)!r(a,n)&&r(s,n)&&c.push(n);for(;e.length>l;)r(s,n=e[l++])&&(~o(c,n)||c.push(n));return c}},function(t,e,n){var r=n(90);t.exports=r&&!Symbol.sham&&"symbol"==typeof Symbol.iterator},function(t,e,n){var r=n(23),i=n(30),o=n(28),a=n(67);t.exports=r?Object.defineProperties:function(t,e){o(t);for(var n,r=a(e),s=r.length,l=0;s>l;)i.f(t,n=r[l++],e[n]);return t}},function(t,e,n){var r=n(19);e.f=r},function(t,e,n){var r=n(109),i=n(27),o=n(113),a=n(30).f;t.exports=function(t){var e=r.Symbol||(r.Symbol={});i(e,t)||a(e,t,{value:o.f(t)})}},function(t,e,n){var r=n(55);t.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 0:return function(){return t.call(e)};case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,i){return t.call(e,n,r,i)}}return function(){return t.apply(e,arguments)}}},function(t,e,n){var r,i,o=n(22),a=n(117),s=o.process,l=s&&s.versions,c=l&&l.v8;c?i=(r=c.split("."))[0]+r[1]:a&&(!(r=a.match(/Edge\/(\d+)/))||r[1]>=74)&&(r=a.match(/Chrome\/(\d+)/))&&(i=r[1]),t.exports=i&&+i},function(t,e,n){var r=n(52);t.exports=r("navigator","userAgent")||""},function(t,e,n){var r=n(54).forEach,i=n(56),o=n(40),a=i("forEach"),s=o("forEach");t.exports=a&&s?[].forEach:function(t){return r(this,t,arguments.length>1?arguments[1]:void 0)}},function(t,e,n){var r=n(95),i=n(49),o=n(19)("toStringTag"),a="Arguments"==i(function(){return arguments}());t.exports=r?i:function(t){var e,n,r;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),o))?n:a?i(e):"Object"==(r=i(e))&&"function"==typeof e.callee?"Arguments":r}},function(t,e,n){var r=n(14),i=n(147),o=n(76),a=n(96),s=n(91),l=n(39),c=n(45),u=n(19),h=n(64),d=n(70),p=n(121),f=p.IteratorPrototype,y=p.BUGGY_SAFARI_ITERATORS,m=u("iterator"),v=function(){return this};t.exports=function(t,e,n,u,p,b,g){i(n,e,u);var _,w,k,x=function(t){if(t===p&&S)return S;if(!y&&t in C)return C[t];switch(t){case"keys":case"values":case"entries":return function(){return new n(this,t)}}return function(){return new n(this)}},j=e+" Iterator",O=!1,C=t.prototype,E=C[m]||C["@@iterator"]||p&&C[p],S=!y&&E||x(p),R="Array"==e&&C.entries||E;if(R&&(_=o(R.call(new t)),f!==Object.prototype&&_.next&&(h||o(_)===f||(a?a(_,f):"function"!=typeof _[m]&&l(_,m,v)),s(_,j,!0,!0),h&&(d[j]=v))),"values"==p&&E&&"values"!==E.name&&(O=!0,S=function(){return E.call(this)}),h&&!g||C[m]===S||l(C,m,S),d[e]=S,p)if(w={values:x("values"),keys:b?S:x("keys"),entries:x("entries")},g)for(k in w)(y||O||!(k in C))&&c(C,k,w[k]);else r({target:e,proto:!0,forced:y||O},w);return w}},function(t,e,n){var r,i,o,a=n(76),s=n(39),l=n(27),c=n(19),u=n(64),h=c("iterator"),d=!1;[].keys&&("next"in(o=[].keys())?(i=a(a(o)))!==Object.prototype&&(r=i):d=!0),null==r&&(r={}),u||l(r,h)||s(r,h,(function(){return this})),t.exports={IteratorPrototype:r,BUGGY_SAFARI_ITERATORS:d}},function(t,e,n){var r=n(17);t.exports=!r((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype}))},function(t,e,n){var r=n(23),i=n(67),o=n(34),a=n(73).f,s=function(t){return function(e){for(var n,s=o(e),l=i(s),c=l.length,u=0,h=[];c>u;)n=l[u++],r&&!a.call(s,n)||h.push(t?[n,s[n]]:s[n]);return h}};t.exports={entries:s(!0),values:s(!1)}},function(t,e,n){var r=n(50),i=n(38),o=function(t){return function(e,n){var o,a,s=String(i(e)),l=r(n),c=s.length;return l<0||l>=c?t?"":void 0:(o=s.charCodeAt(l))<55296||o>56319||l+1===c||(a=s.charCodeAt(l+1))<56320||a>57343?t?s.charAt(l):o:t?s.slice(l,l+2):a-56320+(o-55296<<10)+65536}};t.exports={codeAt:o(!1),charAt:o(!0)}},function(t,e){t.exports={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0}},function(t,e,n){var r=n(26),i=n(96);t.exports=function(t,e,n){var o,a;return i&&"function"==typeof(o=e.constructor)&&o!==n&&r(a=o.prototype)&&a!==n.prototype&&i(t,a),t}},function(t,e,n){var r=n(17);function i(t,e){return RegExp(t,e)}e.UNSUPPORTED_Y=r((function(){var t=i("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),e.BROKEN_CARET=r((function(){var t=i("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},function(t,e,n){var r=n(98);t.exports=function(t){if(r(t))throw TypeError("The method doesn't accept regular expressions");return t}},function(t,e,n){var r=n(19)("match");t.exports=function(t){var e=/./;try{"/./"[t](e)}catch(n){try{return e[r]=!1,"/./"[t](e)}catch(t){}}return!1}},function(t,e,n){var r,i=n(14),o=n(47).f,a=n(35),s=n(128),l=n(38),c=n(129),u=n(64),h="".startsWith,d=Math.min,p=c("startsWith");i({target:"String",proto:!0,forced:!!(u||p||(r=o(String.prototype,"startsWith"),!r||r.writable))&&!p},{startsWith:function(t){var e=String(l(this));s(t);var n=a(d(arguments.length>1?arguments[1]:void 0,e.length)),r=String(t);return h?h.call(e,r,n):e.slice(n,n+r.length)===r}})},function(t,e,n){var r=n(55),i=n(26),o=[].slice,a={},s=function(t,e,n){if(!(e in a)){for(var r=[],i=0;i<e;i++)r[i]="a["+i+"]";a[e]=Function("C,a","return new C("+r.join(",")+")")}return a[e](t,n)};t.exports=Function.bind||function(t){var e=r(this),n=o.call(arguments,1),a=function(){var r=n.concat(o.call(arguments));return this instanceof a?s(e,r.length,r):e.apply(t,r)};return i(e.prototype)&&(a.prototype=e.prototype),a}},function(t,e,n){n(14)({target:"Function",proto:!0},{bind:n(131)})},function(t,e,n){var r=n(14),i=n(86),o=n(50),a=n(35),s=n(32),l=n(92),c=n(68),u=n(69),h=n(40),d=u("splice"),p=h("splice",{ACCESSORS:!0,0:0,1:2}),f=Math.max,y=Math.min;r({target:"Array",proto:!0,forced:!d||!p},{splice:function(t,e){var n,r,u,h,d,p,m=s(this),v=a(m.length),b=i(t,v),g=arguments.length;if(0===g?n=r=0:1===g?(n=0,r=v-b):(n=g-2,r=y(f(o(e),0),v-b)),v+n-r>9007199254740991)throw TypeError("Maximum allowed length exceeded");for(u=l(m,r),h=0;h<r;h++)(d=b+h)in m&&c(u,h,m[d]);if(u.length=r,n<r){for(h=b;h<v-r;h++)p=h+n,(d=h+r)in m?m[p]=m[d]:delete m[p];for(h=v;h>v-r+n;h--)delete m[h-1]}else if(n>r)for(h=v-r;h>b;h--)p=h+n-1,(d=h+r-1)in m?m[p]=m[d]:delete m[p];for(h=0;h<n;h++)m[h+b]=arguments[h+2];return m.length=v-r+n,u}})},function(t,e,n){var r=n(14),i=n(55),o=n(32),a=n(17),s=n(56),l=[],c=l.sort,u=a((function(){l.sort(void 0)})),h=a((function(){l.sort(null)})),d=s("sort");r({target:"Array",proto:!0,forced:u||!h||!d},{sort:function(t){return void 0===t?c.call(o(this)):c.call(o(this),i(t))}})},function(t,e,n){var r=n(14),i=n(50),o=n(160),a=n(161),s=n(17),l=1..toFixed,c=Math.floor,u=function(t,e,n){return 0===e?n:e%2==1?u(t,e-1,n*t):u(t*t,e/2,n)};r({target:"Number",proto:!0,forced:l&&("0.000"!==8e-5.toFixed(3)||"1"!==.9.toFixed(0)||"1.25"!==1.255.toFixed(2)||"1000000000000000128"!==(0xde0b6b3a7640080).toFixed(0))||!s((function(){l.call({})}))},{toFixed:function(t){var e,n,r,s,l=o(this),h=i(t),d=[0,0,0,0,0,0],p="",f="0",y=function(t,e){for(var n=-1,r=e;++n<6;)r+=t*d[n],d[n]=r%1e7,r=c(r/1e7)},m=function(t){for(var e=6,n=0;--e>=0;)n+=d[e],d[e]=c(n/t),n=n%t*1e7},v=function(){for(var t=6,e="";--t>=0;)if(""!==e||0===t||0!==d[t]){var n=String(d[t]);e=""===e?n:e+a.call("0",7-n.length)+n}return e};if(h<0||h>20)throw RangeError("Incorrect fraction digits");if(l!=l)return"NaN";if(l<=-1e21||l>=1e21)return String(l);if(l<0&&(p="-",l=-l),l>1e-21)if(n=(e=function(t){for(var e=0,n=t;n>=4096;)e+=12,n/=4096;for(;n>=2;)e+=1,n/=2;return e}(l*u(2,69,1))-69)<0?l*u(2,-e,1):l/u(2,e,1),n*=4503599627370496,(e=52-e)>0){for(y(0,n),r=h;r>=7;)y(1e7,0),r-=7;for(y(u(10,r,1),0),r=e-1;r>=23;)m(1<<23),r-=23;m(1<<r),y(1,1),m(2),f=v()}else y(0,n),y(1<<-e,0),f=v()+a.call("0",h);return f=h>0?p+((s=f.length)<=h?"0."+a.call("0",h-s)+f:f.slice(0,s-h)+"."+f.slice(s-h)):p+f}})},function(t,e,n){var r=n(23),i=n(22),o=n(89),a=n(45),s=n(27),l=n(49),c=n(126),u=n(62),h=n(17),d=n(53),p=n(65).f,f=n(47).f,y=n(30).f,m=n(79).trim,v=i.Number,b=v.prototype,g="Number"==l(d(b)),_=function(t){var e,n,r,i,o,a,s,l,c=u(t,!1);if("string"==typeof c&&c.length>2)if(43===(e=(c=m(c)).charCodeAt(0))||45===e){if(88===(n=c.charCodeAt(2))||120===n)return NaN}else if(48===e){switch(c.charCodeAt(1)){case 66:case 98:r=2,i=49;break;case 79:case 111:r=8,i=55;break;default:return+c}for(a=(o=c.slice(2)).length,s=0;s<a;s++)if((l=o.charCodeAt(s))<48||l>i)return NaN;return parseInt(o,r)}return+c};if(o("Number",!v(" 0o1")||!v("0b1")||v("+0x1"))){for(var w,k=function(t){var e=arguments.length<1?0:t,n=this;return n instanceof k&&(g?h((function(){b.valueOf.call(n)})):"Number"!=l(n))?c(new v(_(e)),n,k):_(e)},x=r?p(v):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger".split(","),j=0;x.length>j;j++)s(v,w=x[j])&&!s(k,w)&&y(k,w,f(v,w));k.prototype=b,b.constructor=k,a(i,"Number",k)}},function(t,e){},function(t,e){var n;n=function(){return this}();try{n=n||new Function("return this")()}catch(t){"object"==typeof window&&(n=window)}t.exports=n},function(t,e,n){var r=n(22),i=n(105),o=r.WeakMap;t.exports="function"==typeof o&&/native code/.test(i(o))},function(t,e,n){var r=n(52);t.exports=r("document","documentElement")},function(t,e,n){var r=n(34),i=n(65).f,o={}.toString,a="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[];t.exports.f=function(t){return a&&"[object Window]"==o.call(t)?function(t){try{return i(t)}catch(t){return a.slice()}}(t):i(r(t))}},function(t,e,n){var r=n(115),i=n(32),o=n(143),a=n(144),s=n(35),l=n(68),c=n(145);t.exports=function(t){var e,n,u,h,d,p,f=i(t),y="function"==typeof this?this:Array,m=arguments.length,v=m>1?arguments[1]:void 0,b=void 0!==v,g=c(f),_=0;if(b&&(v=r(v,m>2?arguments[2]:void 0,2)),null==g||y==Array&&a(g))for(n=new y(e=s(f.length));e>_;_++)p=b?v(f[_],_):f[_],l(n,_,p);else for(d=(h=g.call(f)).next,n=new y;!(u=d.call(h)).done;_++)p=b?o(h,v,[u.value,_],!0):u.value,l(n,_,p);return n.length=_,n}},function(t,e,n){var r=n(28);t.exports=function(t,e,n,i){try{return i?e(r(n)[0],n[1]):e(n)}catch(e){var o=t.return;throw void 0!==o&&r(o.call(t)),e}}},function(t,e,n){var r=n(19),i=n(70),o=r("iterator"),a=Array.prototype;t.exports=function(t){return void 0!==t&&(i.Array===t||a[o]===t)}},function(t,e,n){var r=n(119),i=n(70),o=n(19)("iterator");t.exports=function(t){if(null!=t)return t[o]||t["@@iterator"]||i[r(t)]}},function(t,e,n){var r=n(19)("iterator"),i=!1;try{var o=0,a={next:function(){return{done:!!o++}},return:function(){i=!0}};a[r]=function(){return this},Array.from(a,(function(){throw 2}))}catch(t){}t.exports=function(t,e){if(!e&&!i)return!1;var n=!1;try{var o={};o[r]=function(){return{next:function(){return{done:n=!0}}}},t(o)}catch(t){}return n}},function(t,e,n){var r=n(121).IteratorPrototype,i=n(53),o=n(60),a=n(91),s=n(70),l=function(){return this};t.exports=function(t,e,n){var c=e+" Iterator";return t.prototype=i(r,{next:o(1,n)}),a(t,c,!1,!0),s[c]=l,t}},function(t,e,n){var r=n(26);t.exports=function(t){if(!r(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype");return t}},function(t,e,n){var r=n(55),i=n(32),o=n(61),a=n(35),s=function(t){return function(e,n,s,l){r(n);var c=i(e),u=o(c),h=a(c.length),d=t?h-1:0,p=t?-1:1;if(s<2)for(;;){if(d in u){l=u[d],d+=p;break}if(d+=p,t?d<0:h<=d)throw TypeError("Reduce of empty array with no initial value")}for(;t?d>=0:h>d;d+=p)d in u&&(l=n(l,u[d],d,c));return l}};t.exports={left:s(!1),right:s(!0)}},function(t,e,n){var r=n(14),i=n(151);r({target:"Object",stat:!0,forced:Object.assign!==i},{assign:i})},function(t,e,n){var r=n(23),i=n(17),o=n(67),a=n(88),s=n(73),l=n(32),c=n(61),u=Object.assign,h=Object.defineProperty;t.exports=!u||i((function(){if(r&&1!==u({b:1},u(h({},"a",{enumerable:!0,get:function(){h(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},n=Symbol();return t[n]=7,"abcdefghijklmnopqrst".split("").forEach((function(t){e[t]=t})),7!=u({},t)[n]||"abcdefghijklmnopqrst"!=o(u({},e)).join("")}))?function(t,e){for(var n=l(t),i=arguments.length,u=1,h=a.f,d=s.f;i>u;)for(var p,f=c(arguments[u++]),y=h?o(f).concat(h(f)):o(f),m=y.length,v=0;m>v;)p=y[v++],r&&!d.call(f,p)||(n[p]=f[p]);return n}:u},function(t,e,n){var r=n(95),i=n(119);t.exports=r?{}.toString:function(){return"[object "+i(this)+"]"}},function(t,e,n){var r=n(52),i=n(30),o=n(19),a=n(23),s=o("species");t.exports=function(t){var e=r(t),n=i.f;a&&e&&!e[s]&&n(e,s,{configurable:!0,get:function(){return this}})}},function(t,e,n){var r=n(22),i=n(79).trim,o=n(80),a=r.parseInt,s=/^[+-]?0[Xx]/,l=8!==a(o+"08")||22!==a(o+"0x16");t.exports=l?function(t,e){var n=i(String(t));return a(n,e>>>0||(s.test(n)?16:10))}:a},function(t,e,n){var r=n(28),i=n(55),o=n(19)("species");t.exports=function(t,e){var n,a=r(t).constructor;return void 0===a||null==(n=r(a)[o])?e:i(n)}},function(t,e,n){var r=n(22),i=n(79).trim,o=n(80),a=r.parseFloat,s=1/a(o+"-0")!=-1/0;t.exports=s?function(t){var e=i(String(t)),n=a(e);return 0===n&&"-"==e.charAt(0)?-0:n}:a},function(t,e,n){var r=n(14),i=n(23);r({target:"Object",stat:!0,forced:!i,sham:!i},{defineProperties:n(112)})},function(t,e,n){var r=n(14),i=n(23),o=n(108),a=n(34),s=n(47),l=n(68);r({target:"Object",stat:!0,sham:!i},{getOwnPropertyDescriptors:function(t){for(var e,n,r=a(t),i=s.f,c=o(r),u={},h=0;c.length>h;)void 0!==(n=i(r,e=c[h++]))&&l(u,e,n);return u}})},function(t,e,n){var r=n(14),i=n(22),o=n(117),a=[].slice,s=function(t){return function(e,n){var r=arguments.length>2,i=r?a.call(arguments,2):void 0;return t(r?function(){("function"==typeof e?e:Function(e)).apply(this,i)}:e,n)}};r({global:!0,bind:!0,forced:/MSIE .\./.test(o)},{setTimeout:s(i.setTimeout),setInterval:s(i.setInterval)})},function(t,e,n){var r=n(49);t.exports=function(t){if("number"!=typeof t&&"Number"!=r(t))throw TypeError("Incorrect invocation");return+t}},function(t,e,n){var r=n(50),i=n(38);t.exports="".repeat||function(t){var e=String(i(this)),n="",o=r(t);if(o<0||o==1/0)throw RangeError("Wrong number of repetitions");for(;o>0;(o>>>=1)&&(e+=e))1&o&&(n+=e);return n}},function(t,e,n){var r=n(14),i=n(79).trim;r({target:"String",proto:!0,forced:n(163)("trim")},{trim:function(){return i(this)}})},function(t,e,n){var r=n(17),i=n(80);t.exports=function(t){return r((function(){return!!i[t]()||"​…᠎"!="​…᠎"[t]()||i[t].name!==t}))}},function(t,e,n){n(14)({target:"Date",stat:!0},{now:function(){return(new Date).getTime()}})},function(t,e,n){n.r(e),n.d(e,"JSONEditor",(function(){return rl}));n(1),n(2),n(3),n(18),n(93),n(20),n(36),n(25),n(0),n(41),n(31),n(4),n(33),n(150),n(9),n(42),n(5),n(57),n(6),n(7),n(21),n(8),n(58),n(59),n(24),n(43),n(29);var r=["actionscript","batchfile","c","c++","cpp","coffee","csharp","css","dart","django","ejs","erlang","golang","groovy","handlebars","haskell","haxe","html","ini","jade","java","javascript","json","less","lisp","lua","makefile","matlab","mysql","objectivec","pascal","perl","pgsql","php","python","r","ruby","sass","scala","scss","smarty","sql","sqlserver","stylus","svg","twig","vbscript","xml","yaml"],i=[function(t){return"string"===t.type&&"color"===t.format&&"colorpicker"},function(t){return"string"===t.type&&["ip","ipv4","ipv6","hostname"].includes(t.format)&&"ip"},function(t){return"string"===t.type&&r.includes(t.format)&&"ace"},function(t){return"string"===t.type&&["xhtml","bbcode"].includes(t.format)&&"sceditor"},function(t){return"string"===t.type&&"markdown"===t.format&&"simplemde"},function(t){return"string"===t.type&&"jodit"===t.format&&"jodit"},function(t){return"string"===t.type&&"autocomplete"===t.format&&"autocomplete"},function(t){return"string"===t.type&&"uuid"===t.format&&"uuid"},function(t){return"info"===t.format&&"info"},function(t){return"button"===t.format&&"button"},function(t){if(("integer"===t.type||"number"===t.type)&&"stepper"===t.format)return"stepper"},function(t){if(t.links)for(var e=0;e<t.links.length;e++)if(t.links[e].rel&&"describedby"===t.links[e].rel.toLowerCase())return"describedBy"},function(t){return["string","integer"].includes(t.type)&&["starrating","rating"].includes(t.format)&&"starrating"},function(t){return["string","integer"].includes(t.type)&&["date","time","datetime-local"].includes(t.format)&&"datetime"},function(t){return(t.oneOf||t.anyOf)&&"multiple"},function(t){if("array"===t.type&&t.items&&!Array.isArray(t.items)&&["string","number","integer"].includes(t.items.type)){if("choices"===t.format)return"arrayChoices";if(t.uniqueItems){if("selectize"===t.format)return"arraySelectize";if("select2"===t.format)return"arraySelect2";if(t.items.enum)return"multiselect"}}},function(t){if(t.enum){if("array"===t.type||"object"===t.type)return"enum";if("number"===t.type||"integer"===t.type||"string"===t.type)return"radio"===t.format?"radio":"select2"===t.format?"select2":"selectize"===t.format?"selectize":"choices"===t.format?"choices":"select"}},function(t){if(t.enumSource)return"radio"===t.format?"radio":"select2"===t.format?"select2":"selectize"===t.format?"selectize":"choices"===t.format?"choices":"select"},function(t){return"array"===t.type&&"table"===t.format&&"table"},function(t){return"string"===t.type&&"url"===t.format&&window.FileReader&&t.options&&t.options.upload===Object(t.options.upload)&&"upload"},function(t){return"string"===t.type&&t.media&&"base64"===t.media.binaryEncoding&&"base64"},function(t){return"any"===t.type&&"multiple"},function(t){if("boolean"===t.type)return"checkbox"===t.format||t.options&&t.options.checkbox?"checkbox":"select2"===t.format?"select2":"selectize"===t.format?"selectize":"choices"===t.format?"choices":"select"},function(t){return"string"===t.type&&"signature"===t.format&&"signature"},function(t){return"string"==typeof t.type&&t.type},function(t){return!t.type&&t.properties&&"object"},function(t){return"string"!=typeof t.type&&"multiple"}];function o(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(t)))return;var n=[],r=!0,i=!1,o=void 0;try{for(var a,s=t[Symbol.iterator]();!(r=(a=s.next()).done)&&(n.push(a.value),!e||n.length!==e);r=!0);}catch(t){i=!0,o=t}finally{try{r||null==s.return||s.return()}finally{if(i)throw o}}return n}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return a(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return a(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function a(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}var s={},l={};l.en={error_notset:"Property must be set",error_notempty:"Value required",error_enum:"Value must be one of the enumerated values",error_anyOf:"Value must validate against at least one of the provided schemas",error_oneOf:"Value must validate against exactly one of the provided schemas. It currently validates against {{0}} of the schemas.",error_not:"Value must not validate against the provided schema",error_type_union:"Value must be one of the provided types",error_type:"Value must be of type {{0}}",error_disallow_union:"Value must not be one of the provided disallowed types",error_disallow:"Value must not be of type {{0}}",error_multipleOf:"Value must be a multiple of {{0}}",error_maximum_excl:"Value must be less than {{0}}",error_maximum_incl:"Value must be at most {{0}}",error_minimum_excl:"Value must be greater than {{0}}",error_minimum_incl:"Value must be at least {{0}}",error_maxLength:"Value must be at most {{0}} characters long",error_minLength:"Value must be at least {{0}} characters long",error_pattern:"Value must match the pattern {{0}}",error_additionalItems:"No additional items allowed in this array",error_maxItems:"Value must have at most {{0}} items",error_minItems:"Value must have at least {{0}} items",error_uniqueItems:"Array must have unique items",error_maxProperties:"Object must have at most {{0}} properties",error_minProperties:"Object must have at least {{0}} properties",error_required:"Object is missing the required property '{{0}}'",error_additional_properties:"No additional properties allowed, but property {{0}} is set",error_dependency:"Must have property {{0}}",error_date:"Date must be in the format {{0}}",error_time:"Time must be in the format {{0}}",error_datetime_local:"Datetime must be in the format {{0}}",error_invalid_epoch:"Date must be greater than 1 January 1970",error_ipv4:"Value must be a valid IPv4 address in the form of 4 numbers between 0 and 255, separated by dots",error_ipv6:"Value must be a valid IPv6 address",error_hostname:"The hostname has the wrong format",button_delete_all:"All",button_delete_all_title:"Delete All",button_delete_last:"Last {{0}}",button_delete_last_title:"Delete Last {{0}}",button_add_row_title:"Add {{0}}",button_move_down_title:"Move down",button_move_up_title:"Move up",button_object_properties:"Object Properties",button_delete_row_title:"Delete {{0}}",button_delete_row_title_short:"Delete",button_copy_row_title_short:"Copy",button_collapse:"Collapse",button_expand:"Expand",flatpickr_toggle_button:"Toggle",flatpickr_clear_button:"Clear",choices_placeholder_text:"Start typing to add value",default_array_item_title:"item",button_delete_node_warning:"Are you sure you want to remove this node?"},Object.entries(s).forEach((function(t){var e=o(t,2),n=e[0],r=e[1];s[n].options=r.options||{}}));var c={options:{upload:function(t,e,n){console.log("Upload handler required for upload editor")},prompt_before_delete:!0,use_default_values:!0,max_depth:0},theme:"html",template:"default",themes:{},callbacks:{},templates:{},iconlibs:{},editors:s,languages:l,resolvers:i,custom_validators:[],default_language:"en",language:"en",translate:function(t,e){var n=c.languages[c.language];if(!n)throw new Error("Unknown language ".concat(c.language));var r=n[t]||c.languages.en[t];if(void 0===r)throw new Error("Unknown translate string ".concat(t));if(e)for(var i=0;i<e.length;i++)r=r.replace(new RegExp("\\{\\{".concat(i,"}}"),"g"),e[i]);return r}};n(48),n(44),n(78),n(71),n(46),n(51);function u(t,e,n,r){try{switch(t.format){case"ipv4":!function(t){var e=t.split(".");if(4!==e.length)throw new Error("error_ipv4");e.forEach((function(t){if(isNaN(+t)||+t<0||+t>255)throw new Error("error_ipv4")}))}(e);break;case"ipv6":!function(t){if(!t.match("^(?:(?:(?:[a-fA-F0-9]{1,4}:){6}|(?=(?:[a-fA-F0-9]{0,4}:){2,6}(?:[0-9]{1,3}.){3}[0-9]{1,3}$)(([0-9a-fA-F]{1,4}:){1,5}|:)((:[0-9a-fA-F]{1,4}){1,5}:|:)|::(?:[a-fA-F0-9]{1,4}:){5})(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])|(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}|(?=(?:[a-fA-F0-9]{0,4}:){0,7}[a-fA-F0-9]{0,4}$)(([0-9a-fA-F]{1,4}:){1,7}|:)((:[0-9a-fA-F]{1,4}){1,7}|:)|(?:[a-fA-F0-9]{1,4}:){7}:|:(:[a-fA-F0-9]{1,4}){7})$"))throw new Error("error_ipv6")}(e);break;case"hostname":!function(t){if(!t.match("(?=^.{4,253}$)(^((?!-)[a-zA-Z0-9-]{0,62}[a-zA-Z0-9].)+[a-zA-Z]{2,63}$)"))throw new Error("error_hostname")}(e)}return[]}catch(t){return[{path:n,property:"format",message:r(t.message)}]}}n(102);function h(t){return(h="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function d(t){return null!==t&&("object"===h(t)&&!t.nodeType&&t!==t.window&&!(t.constructor&&!v(t.constructor.prototype,"isPrototypeOf")))}function p(t){return d(t)?f({},t):Array.isArray(t)?t.map(p):t}function f(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r];return n.forEach((function(e){e&&Object.keys(e).forEach((function(n){e[n]&&d(e[n])?(v(t,n)||(t[n]={}),f(t[n],e[n])):Array.isArray(e[n])?t[n]=p(e[n]):t[n]=e[n]}))})),t}function y(t,e){var n=document.createEvent("HTMLEvents");n.initEvent(e,!0,!0),t.dispatchEvent(n)}function m(t){return t&&("[object ShadowRoot]"===t.toString()?t:m(t.parentNode))}function v(t,e){return t&&Object.prototype.hasOwnProperty.call(t,e)}var b=/^\s*(-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;var g=/^\s*(-|\+)?(\d+)\s*$/;function _(t){return(_="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function w(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(t)))return;var n=[],r=!0,i=!1,o=void 0;try{for(var a,s=t[Symbol.iterator]();!(r=(a=s.next()).done)&&(n.push(a.value),!e||n.length!==e);r=!0);}catch(t){i=!0,o=t}finally{try{r||null==s.return||s.return()}finally{if(i)throw o}}return n}(t,e)||x(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function k(t){return function(t){if(Array.isArray(t))return j(t)}(t)||function(t){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(t))return Array.from(t)}(t)||x(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function x(t,e){if(t){if("string"==typeof t)return j(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);return"Object"===n&&t.constructor&&(n=t.constructor.name),"Map"===n||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?j(t,e):void 0}}function j(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function O(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}var C=function(){function t(e,n,r,i){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.jsoneditor=e,this.schema=n||this.jsoneditor.schema,this.options=r||{},this.translate=this.jsoneditor.translate||i.translate,this.defaults=i,this._validateSubSchema={enum:function(t,e,n){var r=JSON.stringify(e);return t.enum.some((function(t){return r===JSON.stringify(t)}))?[]:[{path:n,property:"enum",message:this.translate("error_enum")}]},extends:function(t,e,n){var r=this;return t.extends.reduce((function(t,i){return t.push.apply(t,k(r._validateSchema(i,e,n))),t}),[])},allOf:function(t,e,n){var r=this;return t.allOf.reduce((function(t,i){return t.push.apply(t,k(r._validateSchema(i,e,n))),t}),[])},anyOf:function(t,e,n){var r=this;return t.anyOf.some((function(t){return!r._validateSchema(t,e,n).length}))?[]:[{path:n,property:"anyOf",message:this.translate("error_anyOf")}]},oneOf:function(t,e,n){var r=this,i=0,o=[];t.oneOf.forEach((function(t,a){var s=r._validateSchema(t,e,n);s.length||i++,s.forEach((function(t){t.path="".concat(n,".oneOf[").concat(a,"]").concat(t.path.substr(n.length))})),o.push.apply(o,k(s))}));var a=[];return 1!==i&&(a.push({path:n,property:"oneOf",message:this.translate("error_oneOf",[i])}),a.push.apply(a,o)),a},not:function(t,e,n){return this._validateSchema(t.not,e,n).length?[]:[{path:n,property:"not",message:this.translate("error_not")}]},type:function(t,e,n){var r=this;if(Array.isArray(t.type)){if(!t.type.some((function(t){return r._checkType(t,e)})))return[{path:n,property:"type",message:this.translate("error_type_union")}]}else if(["date","time","datetime-local"].includes(t.format)&&"integer"===t.type){if(!this._checkType("string","".concat(e)))return[{path:n,property:"type",message:this.translate("error_type",[t.format])}]}else if(!this._checkType(t.type,e))return[{path:n,property:"type",message:this.translate("error_type",[t.type])}];return[]},disallow:function(t,e,n){var r=this;if(Array.isArray(t.disallow)){if(t.disallow.some((function(t){return r._checkType(t,e)})))return[{path:n,property:"disallow",message:this.translate("error_disallow_union")}]}else if(this._checkType(t.disallow,e))return[{path:n,property:"disallow",message:this.translate("error_disallow",[t.disallow])}];return[]}},this._validateNumberSubSchema={multipleOf:function(t,e,n){return this._validateNumberSubSchemaMultipleDivisible(t,e,n)},divisibleBy:function(t,e,n){return this._validateNumberSubSchemaMultipleDivisible(t,e,n)},maximum:function(t,e,n){var r=t.exclusiveMaximum?e<t.maximum:e<=t.maximum;return window.math?r=window.math[t.exclusiveMaximum?"smaller":"smallerEq"](window.math.bignumber(e),window.math.bignumber(t.maximum)):window.Decimal&&(r=new window.Decimal(e)[t.exclusiveMaximum?"lt":"lte"](new window.Decimal(t.maximum))),r?[]:[{path:n,property:"maximum",message:this.translate(t.exclusiveMaximum?"error_maximum_excl":"error_maximum_incl",[t.maximum])}]},minimum:function(t,e,n){var r=t.exclusiveMinimum?e>t.minimum:e>=t.minimum;return window.math?r=window.math[t.exclusiveMinimum?"larger":"largerEq"](window.math.bignumber(e),window.math.bignumber(t.minimum)):window.Decimal&&(r=new window.Decimal(e)[t.exclusiveMinimum?"gt":"gte"](new window.Decimal(t.minimum))),r?[]:[{path:n,property:"minimum",message:this.translate(t.exclusiveMinimum?"error_minimum_excl":"error_minimum_incl",[t.minimum])}]}},this._validateStringSubSchema={maxLength:function(t,e,n){var r=[];return"".concat(e).length>t.maxLength&&r.push({path:n,property:"maxLength",message:this.translate("error_maxLength",[t.maxLength])}),r},minLength:function(t,e,n){return"".concat(e).length<t.minLength?[{path:n,property:"minLength",message:this.translate(1===t.minLength?"error_notempty":"error_minLength",[t.minLength])}]:[]},pattern:function(t,e,n){return new RegExp(t.pattern).test(e)?[]:[{path:n,property:"pattern",message:t.options&&t.options.patternmessage?t.options.patternmessage:this.translate("error_pattern",[t.pattern])}]}},this._validateArraySubSchema={items:function(t,e,n){var r=this,i=[];if(Array.isArray(t.items))for(var o=0;o<e.length;o++)if(t.items[o])console.log("--\x3e"),i.push.apply(i,k(this._validateSchema(t.items[o],e[o],"".concat(n,".").concat(o))));else{if(!0===t.additionalItems)break;if(!t.additionalItems){if(!1===t.additionalItems){i.push({path:n,property:"additionalItems",message:this.translate("error_additionalItems")});break}break}i.push.apply(i,k(this._validateSchema(t.additionalItems,e[o],"".concat(n,".").concat(o))))}else e.forEach((function(e,o){i.push.apply(i,k(r._validateSchema(t.items,e,"".concat(n,".").concat(o))))}));return i},maxItems:function(t,e,n){return e.length>t.maxItems?[{path:n,property:"maxItems",message:this.translate("error_maxItems",[t.maxItems])}]:[]},minItems:function(t,e,n){return e.length<t.minItems?[{path:n,property:"minItems",message:this.translate("error_minItems",[t.minItems])}]:[]},uniqueItems:function(t,e,n){for(var r={},i=0;i<e.length;i++){var o=JSON.stringify(e[i]);if(r[o])return[{path:n,property:"uniqueItems",message:this.translate("error_uniqueItems")}];r[o]=!0}return[]}},this._validateObjectSubSchema={maxProperties:function(t,e,n){return Object.keys(e).length>t.maxProperties?[{path:n,property:"maxProperties",message:this.translate("error_maxProperties",[t.maxProperties])}]:[]},minProperties:function(t,e,n){return Object.keys(e).length<t.minProperties?[{path:n,property:"minProperties",message:this.translate("error_minProperties",[t.minProperties])}]:[]},required:function(t,e,n){var r=this,i=[];return Array.isArray(t.required)&&t.required.forEach((function(t){if(void 0===e[t]){var o=r.jsoneditor.getEditor("".concat(n,".").concat(t));o&&["button","info"].includes(o.schema.format||o.schema.type)||i.push({path:n,property:"required",message:r.translate("error_required",[t])})}})),i},properties:function(t,e,n,r){var i=this,o=[];return Object.entries(t.properties).forEach((function(t){var a=w(t,2),s=a[0],l=a[1];r[s]=!0,o.push.apply(o,k(i._validateSchema(l,e[s],"".concat(n,".").concat(s))))})),o},patternProperties:function(t,e,n,r){var i=this,o=[];return Object.entries(t.patternProperties).forEach((function(t){var a=w(t,2),s=a[0],l=a[1],c=new RegExp(s);Object.entries(e).forEach((function(t){var e=w(t,2),a=e[0],s=e[1];c.test(a)&&(r[a]=!0,o.push.apply(o,k(i._validateSchema(l,s,"".concat(n,".").concat(a)))))}))})),o}},this._validateObjectSubSchema2={additionalProperties:function(t,e,n,r){for(var i=[],o=Object.keys(e),a=0;a<o.length;a++){var s=o[a];if(!r[s]){if(!t.additionalProperties){i.push({path:n,property:"additionalProperties",message:this.translate("error_additional_properties",[s])});break}if(!0===t.additionalProperties)break;i.push.apply(i,k(this._validateSchema(t.additionalProperties,e[s],"".concat(n,".").concat(s))))}}return i},dependencies:function(t,e,n){var r=this,i=[];return Object.entries(t.dependencies).forEach((function(t){var o=w(t,2),a=o[0],s=o[1];void 0!==e[a]&&(Array.isArray(s)?s.forEach((function(t){void 0===e[t]&&i.push({path:n,property:"dependencies",message:r.translate("error_dependency",[t])})})):i.push.apply(i,k(r._validateSchema(s,e,n))))})),i}}}var e,n,r;return e=t,(n=[{key:"fitTest",value:function(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1e7,r={match:0,extra:0};if("object"===_(t)&&null!==t){var i=this._getSchema(e).properties;for(var o in i)if(v(i,o)){if("object"===_(t[o])&&"object"===_(i[o])&&"object"===_(i[o].properties)){var a=this.fitTest(t[o],i[o],n/100);r.match+=a.match,r.extra+=a.extra}void 0!==t[o]&&(r.match+=n)}else r.extra+=n}return r}},{key:"_getSchema",value:function(t){return void 0===t?f({},this.jsoneditor.expandRefs(this.schema)):t}},{key:"validate",value:function(t){return this._validateSchema(this.schema,t)}},{key:"_validateSchema",value:function(t,e,n){var r=this,i=[];return n=n||this.jsoneditor.root.formname,t=f({},this.jsoneditor.expandRefs(t)),void 0===e?this._validateV3Required(t,e,n):(Object.keys(t).forEach((function(o){r._validateSubSchema[o]&&i.push.apply(i,k(r._validateSubSchema[o].call(r,t,e,n)))})),i.push.apply(i,k(this._validateByValueType(t,e,n))),t.links&&t.links.forEach((function(o,a){o.rel&&"describedby"===o.rel.toLowerCase()&&(t=r._expandSchemaLink(t,a),i.push.apply(i,k(r._validateSchema(t,e,n,r.translate))))})),["date","time","datetime-local"].includes(t.format)&&i.push.apply(i,k(this._validateDateTimeSubSchema(t,e,n))),["uuid"].includes(t.format)&&i.push.apply(i,k(this._validateUUIDSchema(t,e,n))),i.push.apply(i,k(this._validateCustomValidator(t,e,n))),this._removeDuplicateErrors(i))}},{key:"_expandSchemaLink",value:function(t,e){var n=t.links[e].href,r=this.jsoneditor.root.getValue(),i=this.jsoneditor.compileTemplate(n,this.jsoneditor.template),o=document.location.origin+document.location.pathname+i(r);return t.links=t.links.slice(0,e).concat(t.links.slice(e+1)),f({},t,this.jsoneditor.refs[o])}},{key:"_validateV3Required",value:function(t,e,n){return void 0!==t.required&&!0===t.required||void 0===t.required&&!0===this.jsoneditor.options.required_by_default?[{path:n,property:"required",message:this.translate("error_notset")}]:[]}},{key:"_validateByValueType",value:function(t,e,n){var r=this,i=[];if(null===e)return i;if("number"==typeof e)Object.keys(t).forEach((function(o){r._validateNumberSubSchema[o]&&i.push.apply(i,k(r._validateNumberSubSchema[o].call(r,t,e,n)))}));else if("string"==typeof e)Object.keys(t).forEach((function(o){r._validateStringSubSchema[o]&&i.push.apply(i,k(r._validateStringSubSchema[o].call(r,t,e,n)))}));else if(Array.isArray(e))Object.keys(t).forEach((function(o){r._validateArraySubSchema[o]&&i.push.apply(i,k(r._validateArraySubSchema[o].call(r,t,e,n)))}));else if("object"===_(e)){var o={};Object.keys(t).forEach((function(a){r._validateObjectSubSchema[a]&&i.push.apply(i,k(r._validateObjectSubSchema[a].call(r,t,e,n,o)))})),void 0!==t.additionalProperties||!this.jsoneditor.options.no_additional_properties||t.oneOf||t.anyOf||t.allOf||(t.additionalProperties=!1),Object.keys(t).forEach((function(a){void 0!==r._validateObjectSubSchema2[a]&&i.push.apply(i,k(r._validateObjectSubSchema2[a].call(r,t,e,n,o)))}))}return i}},{key:"_validateUUIDSchema",value:function(t,e,n){return/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(e)?[]:[{path:n,property:"format",message:this.translate("error_pattern",["^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"])}]}},{key:"_validateNumberSubSchemaMultipleDivisible",value:function(t,e,n){var r=t.multipleOf||t.divisibleBy,i=e/r===Math.floor(e/r);return window.math?i=window.math.mod(window.math.bignumber(e),window.math.bignumber(r)).equals(0):window.Decimal&&(i=new window.Decimal(e).mod(new window.Decimal(r)).equals(0)),i?[]:[{path:n,property:t.multipleOf?"multipleOf":"divisibleBy",message:this.translate("error_multipleOf",[r])}]}},{key:"_validateDateTimeSubSchema",value:function(t,e,n){var r=this,i=this.jsoneditor.getEditor(n),o=i&&i.flatpickr?i.flatpickr.config.dateFormat:{date:'"YYYY-MM-DD"',time:'"HH:MM"',"datetime-local":'"YYYY-MM-DD HH:MM"'}[t.format];if("integer"===t.type)return function(t,e,n){return 1*e<1?[{path:n,property:"format",message:r.translate("error_invalid_epoch")}]:e!==Math.abs(parseInt(e))?[{path:n,property:"format",message:r.translate("error_".concat(t.format.replace(/-/g,"_")),[o])}]:[]}(t,e,n);if(i&&i.flatpickr){if(i)return function(t,e,n,i){if(""!==e){var o;if("single"!==i.flatpickr.config.mode){var a="range"===i.flatpickr.config.mode?i.flatpickr.l10n.rangeSeparator:", ";o=i.flatpickr.selectedDates.map((function(t){return i.flatpickr.formatDate(t,i.flatpickr.config.dateFormat)})).join(a)}try{if(o){if(o!==e)throw new Error("".concat(i.flatpickr.config.mode," mismatch"))}else if(i.flatpickr.formatDate(i.flatpickr.parseDate(e,i.flatpickr.config.dateFormat),i.flatpickr.config.dateFormat)!==e)throw new Error("mismatch")}catch(t){var s=void 0!==i.flatpickr.config.errorDateFormat?i.flatpickr.config.errorDateFormat:i.flatpickr.config.dateFormat;return[{path:n,property:"format",message:r.translate("error_".concat(i.format.replace(/-/g,"_")),[s])}]}}return[]}(0,e,n,i)}else if(!{date:/^(\d{4}\D\d{2}\D\d{2})?$/,time:/^(\d{2}:\d{2}(?::\d{2})?)?$/,"datetime-local":/^(\d{4}\D\d{2}\D\d{2}[ T]\d{2}:\d{2}(?::\d{2})?)?$/}[t.format].test(e))return[{path:n,property:"format",message:this.translate("error_".concat(t.format.replace(/-/g,"_")),[o])}];return[]}},{key:"_validateCustomValidator",value:function(t,e,n){var r=this,i=[];i.push.apply(i,k(u.call(this,t,e,n,this.translate)));var o=function(o){i.push.apply(i,k(o.call(r,t,e,n)))};return this.defaults.custom_validators.forEach(o),this.options.custom_validators&&this.options.custom_validators.forEach(o),i}},{key:"_removeDuplicateErrors",value:function(t){return t.reduce((function(t,e){var n=!0;return t||(t=[]),t.forEach((function(t){t.message===e.message&&t.path===e.path&&t.property===e.property&&(t.errorcount++,n=!1)})),n&&(e.errorcount=1,t.push(e)),t}),[])}},{key:"_checkType",value:function(t,e){var n={string:function(t){return"string"==typeof t},number:function(t){return"number"==typeof t},integer:function(t){return"number"==typeof t&&t===Math.floor(t)},boolean:function(t){return"boolean"==typeof t},array:function(t){return Array.isArray(t)},object:function(t){return null!==t&&!Array.isArray(t)&&"object"===_(t)},null:function(t){return null===t}};return"string"==typeof t?!n[t]||n[t](e):!this._validateSchema(t,e).length}}])&&O(e.prototype,n),r&&O(e,r),t}();n(72),n(37),n(130);function E(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(t)))return;var n=[],r=!0,i=!1,o=void 0;try{for(var a,s=t[Symbol.iterator]();!(r=(a=s.next()).done)&&(n.push(a.value),!e||n.length!==e);r=!0);}catch(t){i=!0,o=t}finally{try{r||null==s.return||s.return()}finally{if(i)throw o}}return n}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return S(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return S(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function S(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function R(t){return(R="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function P(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}var L=function(){function t(e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.options=e||{},this.refs=this.options.refs||{},this.refs_with_info={},this.refs_prefix="#/counter/",this.refs_counter=1,this._subSchema1={type:function(t){"object"===R(t.type)&&(t.type=this._expandSubSchema(t.type))},disallow:function(t){"object"===R(t.disallow)&&(t.disallow=this._expandSubSchema(t.disallow))},anyOf:function(t){var e=this;Object.entries(t.anyOf).forEach((function(n){var r=E(n,2),i=r[0],o=r[1];t.anyOf[i]=e.expandSchema(o)}))},dependencies:function(t){var e=this;Object.entries(t.dependencies).forEach((function(n){var r=E(n,2),i=r[0],o=r[1];"object"!==R(o)||Array.isArray(o)||(t.dependencies[i]=e.expandSchema(o))}))},not:function(t){t.not=this.expandSchema(t.not)}},this._subSchema2={allOf:function(t,e){var n=this,r=f({},e);return Object.entries(t.allOf).forEach((function(e){var i=E(e,2),o=i[0],a=i[1];t.allOf[o]=n.expandRefs(a,!0),r=n.extendSchemas(r,n.expandSchema(a))})),delete r.allOf,r},extends:function(t,e){var n,r=this;return delete(n=Array.isArray(t.extends)?t.extends.reduce((function(t,e,n){return r.extendSchemas(t,r.expandSchema(e))}),e):this.extendSchemas(e,this.expandSchema(t.extends))).extends,n},oneOf:function(t,e){var n=this,r=f({},e);return delete r.oneOf,t.oneOf.reduce((function(t,e,i){return t.oneOf[i]=n.extendSchemas(n.expandSchema(e),r),t}),e),e}}}var e,n,r;return e=t,(n=[{key:"load",value:function(t,e,n,r){var i=this;this._loadExternalRefs(t,(function(){i._getDefinitions(t,"".concat(n,"#/definitions/")),e(i.expandRefs(t))}),n,this._getFileBase(r))}},{key:"expandRefs",value:function(t,e){var n=this,r=f({},t);if(!r.$ref)return r;var i=this.refs_with_info[r.$ref];delete r.$ref;var o=i.$ref.startsWith("#")?i.fetchUrl:"",a=this._getRef(o,i);if(this.refs[a]){if(e&&v(this.refs[a],"allOf")){var s=this.refs[a].allOf;Object.keys(s).forEach((function(t){s[t]=n.expandRefs(s[t],!0)}))}}else console.warn("reference:'".concat(a,"' not found!"));return this.extendSchemas(r,this.expandSchema(this.refs[a]))}},{key:"expandSchema",value:function(t,e){var n=this;Object.entries(this._subSchema1).forEach((function(e){var r=E(e,2),i=r[0],o=r[1];t[i]&&o.call(n,t)}));var r=f({},t);return Object.entries(this._subSchema2).forEach((function(e){var i=E(e,2),o=i[0],a=i[1];t[o]&&(r=a.call(n,t,r))})),this.expandRefs(r)}},{key:"_getRef",value:function(t,e){var n=t+e;return this.refs[n]?n:t+decodeURIComponent(e.$ref)}},{key:"_expandSubSchema",value:function(t){var e=this;return Array.isArray(t)?t.map((function(t){return"object"===("undefined"==typeof value?"undefined":R(value))?e.expandSchema(t):t})):this.expandSchema(t)}},{key:"_getDefinitions",value:function(t,e){var n=this;t.definitions&&Object.keys(t.definitions).forEach((function(r){n.refs[e+r]=t.definitions[r],t.definitions[r].definitions&&n._getDefinitions(t.definitions[r],"".concat(e+r,"/definitions/"))}))}},{key:"_getExternalRefs",value:function(t,e){var n=this,r={},i=function(t){return Object.keys(t).forEach((function(t){r[t]=!0}))};if(t.$ref&&"object"!==R(t.$ref)){var o=this.refs_prefix+this.refs_counter++;"#"===t.$ref.substr(0,1)||this.refs[t.$ref]||(r[t.$ref]=!0),this.refs_with_info[o]={fetchUrl:e,$ref:t.$ref},t.$ref=o}return Object.values(t).forEach((function(t){t&&"object"===R(t)&&(Array.isArray(t)?Object.values(t).forEach((function(t){t&&"object"===R(t)&&i(n._getExternalRefs(t,e))})):i(n._getExternalRefs(t,e)))})),r}},{key:"_getFileBase",value:function(t){var e=this.options.ajaxBase;return void 0===e?this._getFileBaseFromFileLocation(t):e}},{key:"_getFileBaseFromFileLocation",value:function(t){var e=t.split("/");return e.pop(),"".concat(e.join("/"),"/")}},{key:"_isLocalUrl",value:function(t,e){return e!==t.substr(0,e.length)&&"http"!==t.substr(0,4)&&"blob:"!==t.substr(0,5)&&"data:"!==t.substr(0,5)&&"/"!==t.substr(0,1)}},{key:"_loadExternalRefs",value:function(t,e,n,r){var i=this,o=this._getExternalRefs(t,n),a=0,s=0,l=!1;Object.keys(o).forEach((function(t){if(!i.refs[t]){if(!i.options.ajax)throw new Error("Must set ajax option to true to load external ref ".concat(t));i.refs[t]="loading",s++;var n=i._isLocalUrl(t,r)?r+t:t,o=new XMLHttpRequest;o.overrideMimeType("application/json"),o.open("GET",n,!0),i.options.ajaxCredentials&&(o.withCredentials=i.options.ajaxCredentials),o.onreadystatechange=function(){if(4===o.readyState){if(200!==o.status)throw window.console.log(o),new Error("Failed to fetch ref via ajax- ".concat(t));var r;try{r=JSON.parse(o.responseText)}catch(t){throw window.console.log(t),new Error("Failed to parse external ref ".concat(n))}if("boolean"!=typeof r&&"object"!==R(r)||null===r||Array.isArray(r))throw new Error("External ref does not contain a valid schema - ".concat(n));i.refs[t]=r;var c=i._getFileBaseFromFileLocation(n);i._getDefinitions(r,"".concat(n,"#/definitions/")),i._loadExternalRefs(r,(function(){++a>=s&&!l&&(l=!0,e())}),n,c)}},o.send()}})),s||e()}},{key:"extendSchemas",value:function(t,e){var n=this;t=f({},t),e=f({},e);var r={},i=function(t,i){!function(t,e){return("required"===t||"defaultProperties"===t)&&"object"===R(e)&&Array.isArray(e)}(t,i)?"type"!==t||"string"!=typeof i&&!Array.isArray(i)?"object"!==R(i)||Array.isArray(i)||null===i?r[t]=i:r[t]=n.extendSchemas(i,e[t]):o(i):r[t]=i.concat(e[t]).reduce((function(t,e){return t.includes(e)||t.push(e),t}),[])},o=function(t){"string"==typeof t&&(t=[t]),"string"==typeof e.type&&(e.type=[e.type]),e.type&&e.type.length?r.type=t.filter((function(t){return e.type.includes(t)})):r.type=t,1===r.type.length&&"string"==typeof r.type[0]?r.type=r.type[0]:0===r.type.length&&delete r.type};return Object.entries(t).forEach((function(t){var n=E(t,2),o=n[0],a=n[1];void 0!==e[o]?i(o,a):r[o]=a})),Object.entries(e).forEach((function(e){var n=E(e,2),i=n[0],o=n[1];void 0===t[i]&&(r[i]=o)})),r}}])&&P(e.prototype,n),r&&P(e,r),t}();n(10),n(15),n(11),n(12),n(13),n(16),n(132);function T(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(t)))return;var n=[],r=!0,i=!1,o=void 0;try{for(var a,s=t[Symbol.iterator]();!(r=(a=s.next()).done)&&(n.push(a.value),!e||n.length!==e);r=!0);}catch(t){i=!0,o=t}finally{try{r||null==s.return||s.return()}finally{if(i)throw o}}return n}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return A(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return A(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function A(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function I(t){return(I="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function D(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}var B=function(){function t(e,n){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.defaults=n,this.jsoneditor=e.jsoneditor,this.theme=this.jsoneditor.theme,this.template_engine=this.jsoneditor.template,this.iconlib=this.jsoneditor.iconlib,this.translate=this.jsoneditor.translate||this.defaults.translate,this.original_schema=e.schema,this.schema=this.jsoneditor.expandSchema(this.original_schema),this.active=!0,this.options=f({},this.options||{},this.schema.options||{},e.schema.options||{},e),this.formname=this.jsoneditor.options.form_name_root||"root",e.path||this.schema.id||(this.schema.id=this.formname),this.path=e.path||this.formname,this.formname=e.formname||this.path.replace(/\.([^.]+)/g,"[$1]"),this.parent=e.parent,this.key=void 0!==this.parent?this.path.split(".").slice(this.parent.path.split(".").length).join("."):this.path,this.link_watchers=[],this.watchLoop=!1,e.container&&this.setContainer(e.container),this.registerDependencies()}var e,n,r;return e=t,(n=[{key:"onChildEditorChange",value:function(t){this.onChange(!0)}},{key:"notify",value:function(){this.path&&this.jsoneditor.notifyWatchers(this.path)}},{key:"change",value:function(){this.parent?this.parent.onChildEditorChange(this):this.jsoneditor&&this.jsoneditor.onChange()}},{key:"onChange",value:function(t){this.notify(),this.watch_listener&&this.watch_listener(),t&&this.change()}},{key:"register",value:function(){this.jsoneditor.registerEditor(this),this.onChange()}},{key:"unregister",value:function(){this.jsoneditor&&this.jsoneditor.unregisterEditor(this)}},{key:"getNumColumns",value:function(){return 12}},{key:"isActive",value:function(){return this.active}},{key:"activate",value:function(){this.active=!0,this.optInCheckbox.checked=!0,this.enable(),this.change()}},{key:"deactivate",value:function(){this.isRequired()||(this.active=!1,this.optInCheckbox.checked=!1,this.disable(),this.change())}},{key:"registerDependencies",value:function(){var t=this;this.dependenciesFulfilled=!0;var e=this.options.dependencies;e&&Object.keys(e).forEach((function(e){var n=t.path.split(".");n[n.length-1]=e,n=n.join("."),t.jsoneditor.watch(n,(function(){t.evaluateDependencies()}))}))}},{key:"evaluateDependencies",value:function(){var t=this,e=this.container||this.control;if(e&&null!==this.jsoneditor){var n=this.options.dependencies;if(n){var r=this.dependenciesFulfilled;this.dependenciesFulfilled=!0,Object.keys(n).forEach((function(e){var r=t.path.split(".");r[r.length-1]=e,r=r.join(".");var i=n[e];t.checkDependency(r,i)})),this.dependenciesFulfilled!==r&&this.notify();var i=this.dependenciesFulfilled?"block":"none";"TD"===e.tagName?Object.keys(e.childNodes).forEach((function(t){return e.childNodes[t].style.display=i})):e.style.display=i}}}},{key:"checkDependency",value:function(t,e){var n=this;if(this.path!==t&&null!==this.jsoneditor){var r=this.jsoneditor.getEditor(t),i=r?r.getValue():void 0;r&&r.dependenciesFulfilled?Array.isArray(e)?e.some((function(t){if(i===t)return n.dependenciesFulfilled=!0,!0})):"object"===I(e)?"object"!==I(i)?this.dependenciesFulfilled=e===i:Object.keys(e).some((function(t){return!!v(e,t)&&(v(i,t)&&e[t]===i[t]?void 0:(n.dependenciesFulfilled=!1,!0))})):"string"==typeof e||"number"==typeof e?this.dependenciesFulfilled=this.dependenciesFulfilled&&i===e:"boolean"==typeof e&&(this.dependenciesFulfilled=e?this.dependenciesFulfilled&&(i||i.length>0):this.dependenciesFulfilled&&(!i||0===i.length)):this.dependenciesFulfilled=!1}}},{key:"setContainer",value:function(t){this.container=t,this.schema.id&&this.container.setAttribute("data-schemaid",this.schema.id),this.schema.type&&"string"==typeof this.schema.type&&this.container.setAttribute("data-schematype",this.schema.type),this.container.setAttribute("data-schemapath",this.path)}},{key:"setOptInCheckbox",value:function(t){var e=this;this.optInCheckbox=document.createElement("input"),this.optInCheckbox.setAttribute("type","checkbox"),this.optInCheckbox.setAttribute("style","margin: 0 10px 0 0;"),this.optInCheckbox.classList.add("json-editor-opt-in"),this.optInCheckbox.addEventListener("click",(function(){e.isActive()?e.deactivate():e.activate()})),(this.jsoneditor.options.show_opt_in||this.options.show_opt_in)&&this.parent&&"object"===this.parent.schema.type&&!this.isRequired()&&this.header&&(this.header.appendChild(this.optInCheckbox),this.header.insertBefore(this.optInCheckbox,this.header.firstChild))}},{key:"preBuild",value:function(){}},{key:"build",value:function(){}},{key:"postBuild",value:function(){this.setupWatchListeners(),this.addLinks(),this.setValue(this.getDefault(),!0),this.updateHeaderText(),this.register(),this.onWatchedFieldChange()}},{key:"setupWatchListeners",value:function(){var t=this;if(this.watched={},this.schema.vars&&(this.schema.watch=this.schema.vars),this.watched_values={},this.watch_listener=function(){t.refreshWatchedFieldValues()&&t.onWatchedFieldChange()},v(this.schema,"watch")){var e,n,r,i,o,a=this.container.getAttribute("data-schemapath");Object.keys(this.schema.watch).forEach((function(s){if(e=t.schema.watch[s],Array.isArray(e)){if(e.length<2)return;n=[e[0]].concat(e[1].split("."))}else n=e.split("."),t.theme.closest(t.container,'[data-schemaid="'.concat(n[0],'"]'))||n.unshift("#");if("#"===(r=n.shift())&&(r=t.jsoneditor.schema.id||t.jsoneditor.root.formname),!(i=t.theme.closest(t.container,'[data-schemaid="'.concat(r,'"]'))))throw new Error("Could not find ancestor node with id ".concat(r));o="".concat(i.getAttribute("data-schemapath"),".").concat(n.join(".")),a.startsWith(o)&&(t.watchLoop=!0),t.jsoneditor.watch(o,t.watch_listener),t.watched[s]=o}))}this.schema.headerTemplate&&(this.header_template=this.jsoneditor.compileTemplate(this.schema.headerTemplate,this.template_engine))}},{key:"addLinks",value:function(){if(!this.no_link_holder&&(this.link_holder=this.theme.getLinksHolder(),void 0!==this.description?this.description.parentNode.insertBefore(this.link_holder,this.description):this.container.appendChild(this.link_holder),this.schema.links))for(var t=0;t<this.schema.links.length;t++)this.addLink(this.getLink(this.schema.links[t]))}},{key:"onMove",value:function(){}},{key:"getButton",value:function(t,e,n){var r="json-editor-btn-".concat(e);!(e=this.iconlib?this.iconlib.getIcon(e):null)&&n&&(t=n,n=null);var i=this.theme.getButton(t,e,n);return i.classList.add(r),i}},{key:"setButtonText",value:function(t,e,n,r){return!(n=this.iconlib?this.iconlib.getIcon(n):null)&&r&&(e=r,r=null),this.theme.setButtonText(t,e,n,r)}},{key:"addLink",value:function(t){this.link_holder&&this.link_holder.appendChild(t)}},{key:"getLink",value:function(t){var e,n,r=(t.mediaType||"application/javascript").split("/")[0],i=this.jsoneditor.compileTemplate(t.href,this.template_engine),o=this.jsoneditor.compileTemplate(t.rel?t.rel:t.href,this.template_engine),a=null;if(t.download&&(a=t.download),a&&!0!==a&&(a=this.jsoneditor.compileTemplate(a,this.template_engine)),"image"===r){e=this.theme.getBlockLinkHolder(),(n=document.createElement("a")).setAttribute("target","_blank");var s=document.createElement("img");this.theme.createImageLink(e,n,s),this.link_watchers.push((function(t){var e=i(t),r=o(t);n.setAttribute("href",e),n.setAttribute("title",r||e),s.setAttribute("src",e)}))}else if(["audio","video"].includes(r)){e=this.theme.getBlockLinkHolder(),(n=this.theme.getBlockLink()).setAttribute("target","_blank");var l=document.createElement(r);l.setAttribute("controls","controls"),this.theme.createMediaLink(e,n,l),this.link_watchers.push((function(t){var e=i(t),r=o(t);n.setAttribute("href",e),n.textContent=r||e,l.setAttribute("src",e)}))}else n=e=this.theme.getBlockLink(),e.setAttribute("target","_blank"),e.textContent=t.rel,e.style.display="none",this.link_watchers.push((function(t){var n=i(t),r=o(t);n&&(e.style.display=""),e.setAttribute("href",n),e.textContent=r||n}));return a&&n&&(!0===a?n.setAttribute("download",""):this.link_watchers.push((function(t){n.setAttribute("download",a(t))}))),t.class&&n.classList.add(t.class),e}},{key:"refreshWatchedFieldValues",value:function(){var t=this;if(this.watched_values){var e={},n=!1;return this.watched&&Object.keys(this.watched).forEach((function(r){var i=t.jsoneditor.getEditor(t.watched[r]),o=i?i.getValue():null;t.watched_values[r]!==o&&(n=!0),e[r]=o})),e.self=this.getValue(),this.watched_values.self!==e.self&&(n=!0),this.watched_values=e,n}}},{key:"getWatchedFieldValues",value:function(){return this.watched_values}},{key:"updateHeaderText",value:function(){if(this.header){var t=this.getHeaderText();if(this.header.children.length){for(var e=0;e<this.header.childNodes.length;e++)if(3===this.header.childNodes[e].nodeType){this.header.childNodes[e].nodeValue=this.cleanText(t);break}}else window.DOMPurify?this.header.innerHTML=window.DOMPurify.sanitize(t):this.header.textContent=this.cleanText(t)}}},{key:"getHeaderText",value:function(t){return this.header_text?this.header_text:t?this.schema.title:this.getTitle()}},{key:"cleanText",value:function(t){var e=document.createElement("div");return e.innerHTML=t,e.textContent||e.innerText}},{key:"onWatchedFieldChange",value:function(){var t;if(this.header_template){t=f(this.getWatchedFieldValues(),{key:this.key,i:this.key,i0:1*this.key,i1:1*this.key+1,title:this.getTitle()});var e=this.header_template(t);e!==this.header_text&&(this.header_text=e,this.updateHeaderText(),this.notify())}if(this.link_watchers.length){t=this.getWatchedFieldValues();for(var n=0;n<this.link_watchers.length;n++)this.link_watchers[n](t)}}},{key:"setValue",value:function(t){this.value=t}},{key:"getValue",value:function(){if(this.dependenciesFulfilled)return this.value}},{key:"refreshValue",value:function(){}},{key:"getChildEditors",value:function(){return!1}},{key:"destroy",value:function(){var t=this;this.unregister(this),this.watched&&Object.values(this.watched).forEach((function(e){return t.jsoneditor.unwatch(e,t.watch_listener)})),this.watched=null,this.watched_values=null,this.watch_listener=null,this.header_text=null,this.header_template=null,this.value=null,this.container&&this.container.parentNode&&this.container.parentNode.removeChild(this.container),this.container=null,this.jsoneditor=null,this.schema=null,this.path=null,this.key=null,this.parent=null}},{key:"isDefaultRequired",value:function(){return this.isRequired()||!!this.jsoneditor.options.use_default_values}},{key:"getDefault",value:function(){if(void 0!==this.schema.default)return this.schema.default;if(void 0!==this.schema.enum)return this.schema.enum[0];var t=this.schema.type||this.schema.oneOf;if(t&&Array.isArray(t)&&(t=t[0]),t&&"object"===I(t)&&(t=t.type),t&&Array.isArray(t)&&(t=t[0]),"string"==typeof t){if("number"===t)return this.isDefaultRequired()?0:void 0;if("boolean"===t)return!this.isDefaultRequired()&&void 0;if("integer"===t)return this.isDefaultRequired()?0:void 0;if("string"===t)return"";if("object"===t)return{};if("array"===t)return[]}return null}},{key:"getTitle",value:function(){return this.schema.title||this.key}},{key:"enable",value:function(){this.disabled=!1}},{key:"disable",value:function(){this.disabled=!0}},{key:"isEnabled",value:function(){return!this.disabled}},{key:"isRequired",value:function(){return"boolean"==typeof this.schema.required?this.schema.required:this.parent&&this.parent.schema&&Array.isArray(this.parent.schema.required)?this.parent.schema.required.includes(this.key):!!this.jsoneditor.options.required_by_default}},{key:"getDisplayText",value:function(t){var e=[],n={};t.forEach((function(t){t.title&&(n[t.title]=n[t.title]||0,n[t.title]++),t.description&&(n[t.description]=n[t.description]||0,n[t.description]++),t.format&&(n[t.format]=n[t.format]||0,n[t.format]++),t.type&&(n[t.type]=n[t.type]||0,n[t.type]++)})),t.forEach((function(t){var r;r="string"==typeof t?t:t.title&&n[t.title]<=1?t.title:t.format&&n[t.format]<=1?t.format:t.type&&n[t.type]<=1?t.type:t.description&&n[t.description]<=1?t.descripton:t.title?t.title:t.format?t.format:t.type?t.type:t.description?t.description:JSON.stringify(t).length<500?JSON.stringify(t):"type",e.push(r)}));var r={};return e.forEach((function(t,i){r[t]=r[t]||0,r[t]++,n[t]>1&&(e[i]="".concat(t," ").concat(r[t]))})),e}},{key:"getValidId",value:function(t){return(t=void 0===t?"":t.toString()).replace(/\s+/g,"-")}},{key:"setInputAttributes",value:function(t){var e=this;if(this.schema.options&&this.schema.options.inputAttributes){var n=this.schema.options.inputAttributes,r=["name","type"].concat(t);Object.keys(n).forEach((function(t){r.includes(t.toLowerCase())||e.input.setAttribute(t,n[t])}))}}},{key:"expandCallbacks",value:function(t,e){var n=this,r=this.defaults.callbacks[t];return Object.entries(e).forEach((function(i){var o=T(i,2),a=o[0],s=o[1];s===Object(s)?e[a]=n.expandCallbacks(t,s):"string"==typeof s&&"object"===I(r)&&"function"==typeof r[s]&&(e[a]=r[s].bind(null,n))})),e}},{key:"showValidationErrors",value:function(t){}}])&&D(e.prototype,n),r&&D(e,r),t}();function N(t){return(N="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function F(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function V(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function H(t,e,n){return(H="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=U(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function z(t,e){return(z=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function M(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=U(t);if(e){var i=U(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return q(this,n)}}function q(t,e){return!e||"object"!==N(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function U(t){return(U=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var G=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&z(t,e)}(o,t);var e,n,r,i=M(o);function o(){return F(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"register",value:function(){H(U(o.prototype),"register",this).call(this),this.input&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){H(U(o.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"setValue",value:function(t,e,n){if((!this.template||n)&&(this.shouldBeUnset()||null!=t?"object"===N(t)?t=JSON.stringify(t):this.shouldBeUnset()||"string"==typeof t||(t="".concat(t)):t="",t!==this.serialized)){var r=this.sanitize(t);if(this.input.value!==r){if(this.setValueToInputField(r),"range"===this.format){var i=this.control.querySelector("output");i&&(i.value=r)}var o=n||this.getValue()!==t;return this.refreshValue(),e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.adjust_height&&this.adjust_height(this.input),this.onChange(o),{changed:o,value:r}}}}},{key:"setValueToInputField",value:function(t){this.input.value=void 0===t?"":t}},{key:"getNumColumns",value:function(){var t,e=Math.ceil(Math.max(this.getTitle().length,this.schema.maxLength||0,this.schema.minLength||0)/5);return t="textarea"===this.input_type?6:["text","email"].includes(this.input_type)?4:2,Math.min(12,Math.max(e,t))}},{key:"build",value:function(){var t=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.options.infoText)),this.format=this.schema.format,!this.format&&this.schema.media&&this.schema.media.type&&(this.format=this.schema.media.type.replace(/(^(application|text)\/(x-)?(script\.)?)|(-source$)/g,"")),!this.format&&this.options.default_format&&(this.format=this.options.default_format),this.options.format&&(this.format=this.options.format),this.format)if("textarea"===this.format)this.input_type="textarea",this.input=this.theme.getTextareaInput();else if("range"===this.format){this.input_type="range";var e=this.schema.minimum||0,n=this.schema.maximum||Math.max(100,e+1),r=1;this.schema.multipleOf&&(e%this.schema.multipleOf&&(e=Math.ceil(e/this.schema.multipleOf)*this.schema.multipleOf),n%this.schema.multipleOf&&(n=Math.floor(n/this.schema.multipleOf)*this.schema.multipleOf),r=this.schema.multipleOf),this.input=this.theme.getRangeInput(e,n,r)}else this.input_type="text",["button","checkbox","color","date","datetime-local","email","file","hidden","image","month","number","password","radio","reset","search","submit","tel","text","time","url","week"].includes(this.format)&&(this.input_type=this.format),this.input=this.theme.getFormInputField(this.input_type);else this.input_type="text",this.input=this.theme.getFormInputField(this.input_type);void 0!==this.schema.maxLength&&this.input.setAttribute("maxlength",this.schema.maxLength),void 0!==this.schema.pattern?this.input.setAttribute("pattern",this.schema.pattern):void 0!==this.schema.minLength&&this.input.setAttribute("pattern",".{".concat(this.schema.minLength,",}")),this.options.compact?this.container.classList.add("compact"):this.options.input_width&&(this.input.style.width=this.options.input_width),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&(this.always_disabled=!0,this.input.setAttribute("readonly","true")),this.setInputAttributes(["maxlength","pattern","readonly","min","max","step"]),this.input.addEventListener("change",(function(e){if(e.preventDefault(),e.stopPropagation(),t.schema.template)e.currentTarget.value=t.value;else{var n=e.currentTarget.value,r=t.sanitize(n);n!==r&&(e.currentTarget.value=r),t.is_dirty=!0,t.refreshValue(),t.onChange(!0)}})),this.options.input_height&&(this.input.style.height=this.options.input_height),this.options.expand_height&&(this.adjust_height=function(t){if(t){var e,n=t.offsetHeight;if(t.offsetHeight<t.scrollHeight)for(e=0;t.offsetHeight<t.scrollHeight+3&&!(e>100);)e++,n++,t.style.height="".concat(n,"px");else{for(e=0;t.offsetHeight>=t.scrollHeight+3&&!(e>100);)e++,n--,t.style.height="".concat(n,"px");t.style.height="".concat(n+1,"px")}}},this.input.addEventListener("keyup",(function(e){t.adjust_height(e.currentTarget)})),this.input.addEventListener("change",(function(e){t.adjust_height(e.currentTarget)})),this.adjust_height()),this.format&&this.input.setAttribute("data-schemaformat",this.format);var i=this.input;if("range"===this.format&&(i=this.theme.getRangeControl(this.input,this.theme.getRangeOutput(this.input,this.schema.default||Math.max(this.schema.minimum||0,0)))),this.control=this.theme.getFormControl(this.label,i,this.description,this.infoButton),this.container.appendChild(this.control),window.requestAnimationFrame((function(){t.input.parentNode&&t.afterInputReady(),t.adjust_height&&t.adjust_height(t.input)})),this.schema.template){var o=this.expandCallbacks("template",{template:this.schema.template});"function"==typeof o.template?this.template=o.template:this.template=this.jsoneditor.compileTemplate(this.schema.template,this.template_engine),this.refreshValue()}else this.refreshValue()}},{key:"setupCleave",value:function(t){var e=this.expandCallbacks("cleave",f({},this.defaults.options.cleave||{},this.options.cleave||{}));"object"===N(e)&&Object.keys(e).length>0&&(this.cleave_instance=new window.Cleave(t,e))}},{key:"setupImask",value:function(t){var e=this.expandCallbacks("imask",f({},this.defaults.options.imask||{},this.options.imask||{}));"object"===N(e)&&Object.keys(e).length>0&&(this.imask_instance=window.IMask(t,this.ajustIMaskOptions(e)))}},{key:"ajustIMaskOptions",value:function(t){var e=this;return Object.keys(t).forEach((function(n){if(t[n]===Object(t[n]))t[n]=e.ajustIMaskOptions(t[n]);else if("mask"===n)if("regex:"===t[n].substr(0,6)){var r=t[n].match(/^regex:\/(.*)\/([gimsuy]*)$/);if(null!==r)try{t[n]=new RegExp(r[1],r[2])}catch(t){}}else t[n]=e.getGlobalPropertyFromString(t[n])})),t}},{key:"getGlobalPropertyFromString",value:function(t){if(t.includes(".")){var e=t.split("."),n=e[0],r=e[1];if(void 0!==window[n]&&void 0!==window[n][r])return window[n][r]}else if(void 0!==window[t])return window[t];return t}},{key:"shouldBeUnset",value:function(){return!this.jsoneditor.options.use_default_values&&!this.is_dirty}},{key:"getValue",value:function(){var t=!(!this.input||!this.input.value);if(!this.shouldBeUnset()||t)return this.imask_instance&&this.dependenciesFulfilled&&this.options.imask.returnUnmasked?this.imask_instance.unmaskedValue:H(U(o.prototype),"getValue",this).call(this)}},{key:"enable",value:function(){this.always_disabled||(this.input.disabled=!1,H(U(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.input.disabled=!0,H(U(o.prototype),"disable",this).call(this)}},{key:"afterInputReady",value:function(){this.theme.afterInputReady(this.input),window.Cleave&&!this.cleave_instance?this.setupCleave(this.input):window.IMask&&!this.imask_instance&&this.setupImask(this.input)}},{key:"refreshValue",value:function(){this.value=this.input.value,"string"==typeof this.value||this.shouldBeUnset()||(this.value=""),this.serialized=this.value}},{key:"destroy",value:function(){this.cleave_instance&&this.cleave_instance.destroy(),this.imask_instance&&this.imask_instance.destroy(),this.template=null,this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),H(U(o.prototype),"destroy",this).call(this)}},{key:"sanitize",value:function(t){return t}},{key:"onWatchedFieldChange",value:function(){var t;this.template&&(t=this.getWatchedFieldValues(),this.setValue(this.template(t),!1,!0)),H(U(o.prototype),"onWatchedFieldChange",this).call(this)}},{key:"showValidationErrors",value:function(t){var e=this;if("always"===this.jsoneditor.options.show_errors);else if(!this.is_dirty&&this.previous_error_setting===this.jsoneditor.options.show_errors)return;this.previous_error_setting=this.jsoneditor.options.show_errors;var n=t.reduce((function(t,n){return n.path===e.path&&t.push(n.message),t}),[]);n.length?this.theme.addInputError(this.input,"".concat(n.join(". "),".")):this.theme.removeInputError(this.input)}}])&&V(e.prototype,n),r&&V(e,r),o}(B);function $(t){return($="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function J(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function W(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Z(t,e,n){return(Z="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=K(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Q(t,e){return(Q=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Y(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=K(t);if(e){var i=K(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return X(this,n)}}function X(t,e){return!e||"object"!==$(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function K(t){return(K=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var tt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Q(t,e)}(o,t);var e,n,r,i=Y(o);function o(){return J(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e,n){var r=Z(K(o.prototype),"setValue",this).call(this,t,e,n);void 0!==r&&r.changed&&this.ace_editor_instance&&(this.ace_editor_instance.setValue(r.value),this.ace_editor_instance.session.getSelection().clearSelection(),this.ace_editor_instance.resize())}},{key:"build",value:function(){this.options.format="textarea",Z(K(o.prototype),"build",this).call(this),this.input_type=this.schema.format,this.input.setAttribute("data-schemaformat",this.input_type)}},{key:"afterInputReady",value:function(){var t,e=this;if(window.ace){var n=this.input_type;"cpp"!==n&&"c++"!==n&&"c"!==n||(n="c_cpp"),t=this.expandCallbacks("ace",f({},{selectionStyle:"text",minLines:30,maxLines:30},this.defaults.options.ace||{},this.options.ace||{},{mode:"ace/mode/".concat(n)})),this.ace_container=document.createElement("div"),this.ace_container.style.width="100%",this.ace_container.style.position="relative",this.input.parentNode.insertBefore(this.ace_container,this.input),this.input.style.display="none",this.ace_editor_instance=window.ace.edit(this.ace_container,t),this.ace_editor_instance.setValue(this.getValue()),this.ace_editor_instance.session.getSelection().clearSelection(),this.ace_editor_instance.resize(),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&this.ace_editor_instance.setReadOnly(!0),this.ace_editor_instance.on("change",(function(){e.input.value=e.ace_editor_instance.getValue(),e.refreshValue(),e.is_dirty=!0,e.onChange(!0)})),this.theme.afterInputReady(this.input)}else Z(K(o.prototype),"afterInputReady",this).call(this)}},{key:"getNumColumns",value:function(){return 6}},{key:"enable",value:function(){!this.always_disabled&&this.ace_editor_instance&&this.ace_editor_instance.setReadOnly(!1),Z(K(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.ace_editor_instance&&this.ace_editor_instance.setReadOnly(!0),Z(K(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.ace_editor_instance&&(this.ace_editor_instance.destroy(),this.ace_editor_instance=null),Z(K(o.prototype),"destroy",this).call(this)}}])&&W(e.prototype,n),r&&W(e,r),o}(G);function et(t){return(et="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function nt(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function rt(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function it(t,e,n){return(it="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=lt(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function ot(t,e){return(ot=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function at(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=lt(t);if(e){var i=lt(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return st(this,n)}}function st(t,e){return!e||"object"!==et(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function lt(t){return(lt=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var ct=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ot(t,e)}(o,t);var e,n,r,i=at(o);function o(){return nt(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"askConfirmation",value:function(){return!0!==this.jsoneditor.options.prompt_before_delete||!1!==window.confirm(this.translate("button_delete_node_warning"))}},{key:"getDefault",value:function(){return this.schema.default||[]}},{key:"register",value:function(){it(lt(o.prototype),"register",this).call(this),this.rows&&this.rows.forEach((function(t){return t.register()}))}},{key:"unregister",value:function(){it(lt(o.prototype),"unregister",this).call(this),this.rows&&this.rows.forEach((function(t){return t.unregister()}))}},{key:"getNumColumns",value:function(){var t=this.getItemInfo(0);return this.tabs_holder&&"tabs-top"!==this.schema.format?Math.max(Math.min(12,t.width+2),4):t.width}},{key:"enable",value:function(){var t=this;this.always_disabled||(this.setAvailability(this,!1),this.rows&&this.rows.forEach((function(e){e.enable(),t.setAvailability(e,!1)})),it(lt(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){var e=this;t&&(this.always_disabled=!0),this.setAvailability(this,!0),this.rows&&this.rows.forEach((function(n){n.disable(t),e.setAvailability(n,!0)})),it(lt(o.prototype),"disable",this).call(this)}},{key:"setAvailability",value:function(t,e){t.add_row_button&&(t.add_row_button.disabled=e),t.remove_all_rows_button&&(t.remove_all_rows_button.disabled=e),t.delete_last_row_button&&(t.delete_last_row_button.disabled=e),t.copy_button&&(t.copy_button.disabled=e),t.delete_button&&(t.delete_button.disabled=e),t.moveup_button&&(t.moveup_button.disabled=e),t.movedown_button&&(t.movedown_button.disabled=e)}},{key:"preBuild",value:function(){it(lt(o.prototype),"preBuild",this).call(this),this.rows=[],this.row_cache=[],this.hide_delete_buttons=this.options.disable_array_delete||this.jsoneditor.options.disable_array_delete,this.hide_delete_all_rows_buttons=this.hide_delete_buttons||this.options.disable_array_delete_all_rows||this.jsoneditor.options.disable_array_delete_all_rows,this.hide_delete_last_row_buttons=this.hide_delete_buttons||this.options.disable_array_delete_last_row||this.jsoneditor.options.disable_array_delete_last_row,this.hide_move_buttons=this.options.disable_array_reorder||this.jsoneditor.options.disable_array_reorder,this.hide_add_button=this.options.disable_array_add||this.jsoneditor.options.disable_array_add,this.show_copy_button=this.options.enable_array_copy||this.jsoneditor.options.enable_array_copy,this.array_controls_top=this.options.array_controls_top||this.jsoneditor.options.array_controls_top}},{key:"build",value:function(){this.options.compact?(this.title=this.theme.getHeader(""),this.container.appendChild(this.title),this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.controls),this.row_holder=document.createElement("div"),this.panel.appendChild(this.row_holder)):(this.header=document.createElement("label"),this.header.textContent=this.getTitle(),this.title=this.theme.getHeader(this.header),this.container.appendChild(this.title),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.schema.description&&(this.description=this.theme.getDescription(this.schema.description),this.container.appendChild(this.description)),this.error_holder=document.createElement("div"),this.container.appendChild(this.error_holder),"tabs-top"===this.schema.format?(this.controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.controls),this.tabs_holder=this.theme.getTopTabHolder(this.getValidId(this.getItemTitle())),this.container.appendChild(this.tabs_holder),this.row_holder=this.theme.getTopTabContentHolder(this.tabs_holder),this.active_tab=null):"tabs"===this.schema.format?(this.controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.controls),this.tabs_holder=this.theme.getTabHolder(this.getValidId(this.getItemTitle())),this.container.appendChild(this.tabs_holder),this.row_holder=this.theme.getTabContentHolder(this.tabs_holder),this.active_tab=null):(this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.row_holder=document.createElement("div"),this.panel.appendChild(this.row_holder),this.controls=this.theme.getButtonHolder(),this.array_controls_top?this.title.appendChild(this.controls):this.panel.appendChild(this.controls))),this.addControls()}},{key:"onChildEditorChange",value:function(t){this.refreshValue(),this.refreshTabs(!0),it(lt(o.prototype),"onChildEditorChange",this).call(this,t)}},{key:"getItemTitle",value:function(){if(!this.item_title)if(this.schema.items&&!Array.isArray(this.schema.items)){var t=this.jsoneditor.expandRefs(this.schema.items);this.item_title=t.title||this.translate("default_array_item_title")}else this.item_title=this.translate("default_array_item_title");return this.cleanText(this.item_title)}},{key:"getItemSchema",value:function(t){return Array.isArray(this.schema.items)?t>=this.schema.items.length?!0===this.schema.additionalItems?{}:this.schema.additionalItems?f({},this.schema.additionalItems):void 0:f({},this.schema.items[t]):this.schema.items?f({},this.schema.items):{}}},{key:"getItemInfo",value:function(t){var e=this.getItemSchema(t);this.item_info=this.item_info||{};var n=JSON.stringify(e);return void 0!==this.item_info[n]||(e=this.jsoneditor.expandRefs(e),this.item_info[n]={title:e.title||this.translate("default_array_item_title"),default:e.default,width:12,child_editors:e.properties||e.items}),this.item_info[n]}},{key:"getElementEditor",value:function(t){var e=this.getItemInfo(t),n=this.getItemSchema(t);(n=this.jsoneditor.expandRefs(n)).title="".concat(e.title," ").concat(t+1);var r,i=this.jsoneditor.getEditorClass(n);this.tabs_holder?(r="tabs-top"===this.schema.format?this.theme.getTopTabContent():this.theme.getTabContent()).id="".concat(this.path,".").concat(t):r=e.child_editors?this.theme.getChildEditorHolder():this.theme.getIndentedPanel(),this.row_holder.appendChild(r);var o=this.jsoneditor.createEditor(i,{jsoneditor:this.jsoneditor,schema:n,container:r,path:"".concat(this.path,".").concat(t),parent:this,required:!0});return o.preBuild(),o.build(),o.postBuild(),o.title_controls||(o.array_controls=this.theme.getButtonHolder(),r.appendChild(o.array_controls)),o}},{key:"checkParent",value:function(t){return t&&t.parentNode}},{key:"destroy",value:function(){this.empty(!0),this.checkParent(this.title)&&this.title.parentNode.removeChild(this.title),this.checkParent(this.description)&&this.description.parentNode.removeChild(this.description),this.checkParent(this.row_holder)&&this.row_holder.parentNode.removeChild(this.row_holder),this.checkParent(this.controls)&&this.controls.parentNode.removeChild(this.controls),this.checkParent(this.panel)&&this.panel.parentNode.removeChild(this.panel),this.rows=this.row_cache=this.title=this.description=this.row_holder=this.panel=this.controls=null,it(lt(o.prototype),"destroy",this).call(this)}},{key:"empty",value:function(t){var e=this;this.rows&&(this.rows.forEach((function(n,r){t&&(e.checkParent(n.tab)&&n.tab.parentNode.removeChild(n.tab),e.destroyRow(n,!0),e.row_cache[r]=null),e.rows[r]=null})),this.rows=[],t&&(this.row_cache=[]))}},{key:"destroyRow",value:function(t,e){var n=t.container;e?(t.destroy(),n.parentNode&&n.parentNode.removeChild(n),this.checkParent(t.tab)&&t.tab.parentNode.removeChild(t.tab)):(t.tab&&(t.tab.style.display="none"),n.style.display="none",t.unregister())}},{key:"getMax",value:function(){return Array.isArray(this.schema.items)&&!1===this.schema.additionalItems?Math.min(this.schema.items.length,this.schema.maxItems||1/0):this.schema.maxItems||1/0}},{key:"refreshTabs",value:function(t){var e=this;this.rows.forEach((function(n){n.tab&&(t?n.tab_text.textContent=n.getHeaderText():n.tab===e.active_tab?e.theme.markTabActive(n):e.theme.markTabInactive(n))}))}},{key:"ensureArraySize",value:function(t){if(Array.isArray(t)||(t=[t]),this.schema.minItems)for(;t.length<this.schema.minItems;)t.push(this.getItemInfo(t.length).default);return this.getMax()&&t.length>this.getMax()&&(t=t.slice(0,this.getMax())),t}},{key:"setValue",value:function(){var t=this,e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],n=arguments.length>1?arguments[1]:void 0;e=this.ensureArraySize(e);var r=JSON.stringify(e);if(r!==this.serialized){e.forEach((function(e,r){if(t.rows[r])t.rows[r].setValue(e,n);else if(t.row_cache[r])t.rows[r]=t.row_cache[r],t.rows[r].setValue(e,n),t.rows[r].container.style.display="",t.rows[r].tab&&(t.rows[r].tab.style.display=""),t.rows[r].register(),t.jsoneditor.trigger("addRow",t.rows[r]);else{var i=t.addRow(e,n);t.jsoneditor.trigger("addRow",i)}}));for(var i=e.length;i<this.rows.length;i++)this.destroyRow(this.rows[i]),this.rows[i]=null;this.rows=this.rows.slice(0,e.length);var o=this.rows.find((function(e){return e.tab===t.active_tab})),a=void 0!==o?o.tab:null;!a&&this.rows.length&&(a=this.rows[0].tab),this.active_tab=a,this.refreshValue(n),this.refreshTabs(!0),this.refreshTabs(),this.onChange()}}},{key:"setVisibility",value:function(t,e){t.style.display=e?"":"none"}},{key:"setupButtons",value:function(t){var e=[];if(this.value.length)if(1===this.value.length){this.remove_all_rows_button.style.display="none";var n=!(t||this.hide_delete_last_row_buttons);this.setVisibility(this.delete_last_row_button,n),e.push(n)}else{var r=!(t||this.hide_delete_last_row_buttons);this.setVisibility(this.delete_last_row_button,r),e.push(r);var i=!(t||this.hide_delete_all_rows_buttons);this.setVisibility(this.remove_all_rows_button,i),e.push(i)}else this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none";var o=!(this.getMax()&&this.getMax()<=this.rows.length||this.hide_add_button);return this.setVisibility(this.add_row_button,o),e.push(o),e.some((function(t){return t}))}},{key:"refreshValue",value:function(t){var e=this,n=this.value?this.value.length:0;if(this.value=this.rows.map((function(t){return t.getValue()})),n!==this.value.length||t){var r=this.schema.minItems&&this.schema.minItems>=this.rows.length;this.rows.forEach((function(t,n){if(t.movedown_button){var i=n!==e.rows.length-1;e.setVisibility(t.movedown_button,i)}t.delete_button&&e.setVisibility(t.delete_button,!r),e.value[n]=t.getValue()})),!this.collapsed&&this.setupButtons(r)?this.controls.style.display="inline-block":this.controls.style.display="none"}this.serialized=JSON.stringify(this.value)}},{key:"addRow",value:function(t,e){var n=this,r=this.rows.length;this.rows[r]=this.getElementEditor(r),this.row_cache[r]=this.rows[r],this.tabs_holder&&(this.rows[r].tab_text=document.createElement("span"),this.rows[r].tab_text.textContent=this.rows[r].getHeaderText(),"tabs-top"===this.schema.format?(this.rows[r].tab=this.theme.getTopTab(this.rows[r].tab_text,this.getValidId(this.rows[r].path)),this.theme.addTopTab(this.tabs_holder,this.rows[r].tab)):(this.rows[r].tab=this.theme.getTab(this.rows[r].tab_text,this.getValidId(this.rows[r].path)),this.theme.addTab(this.tabs_holder,this.rows[r].tab)),this.rows[r].tab.addEventListener("click",(function(t){n.active_tab=n.rows[r].tab,n.refreshTabs(),t.preventDefault(),t.stopPropagation()})));var i=this.rows[r].title_controls||this.rows[r].array_controls;return this.hide_delete_buttons||(this.rows[r].delete_button=this._createDeleteButton(r,i)),this.show_copy_button&&(this.rows[r].copy_button=this._createCopyButton(r,i)),r&&!this.hide_move_buttons&&(this.rows[r].moveup_button=this._createMoveUpButton(r,i)),this.hide_move_buttons||(this.rows[r].movedown_button=this._createMoveDownButton(r,i)),t&&this.rows[r].setValue(t,e),this.refreshTabs(),this.rows[r]}},{key:"_createDeleteButton",value:function(t,e){var n=this,r=this.getButton(this.getItemTitle(),"delete",this.translate("button_delete_row_title",[this.getItemTitle()]));return r.classList.add("delete","json-editor-btntype-delete"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){if(t.preventDefault(),t.stopPropagation(),!n.askConfirmation())return!1;var e=1*t.currentTarget.getAttribute("data-i"),r=n.getValue().filter((function(t,n){return n!==e})),i=null,o=n.rows[e];n.setValue(r),n.rows[e]?i=n.rows[e].tab:n.rows[e-1]&&(i=n.rows[e-1].tab),i&&(n.active_tab=i,n.refreshTabs()),n.onChange(!0),n.jsoneditor.trigger("deleteRow",o)})),e&&e.appendChild(r),r}},{key:"_createCopyButton",value:function(t,e){var n=this,r=this.getButton(this.getItemTitle(),"copy","Copy ".concat(this.getItemTitle()));return r.classList.add("copy","json-editor-btntype-copy"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){var e=n.getValue();t.preventDefault(),t.stopPropagation();var r=1*t.currentTarget.getAttribute("data-i");e.forEach((function(t,n){n===r&&e.push(t)})),n.setValue(e),n.refreshValue(!0),n.onChange(!0)})),e.appendChild(r),r}},{key:"_createMoveUpButton",value:function(t,e){var n=this,r=this.getButton("","tabs-top"===this.schema.format?"moveleft":"moveup",this.translate("button_move_up_title"));return r.classList.add("moveup","json-editor-btntype-move"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i");if(!(e<=0)){var r=n.getValue(),i=r[e-1];r[e-1]=r[e],r[e]=i,n.setValue(r),n.active_tab=n.rows[e-1].tab,n.refreshTabs(),n.onChange(!0),n.jsoneditor.trigger("moveRow",n.rows[e-1])}})),e&&e.appendChild(r),r}},{key:"_createMoveDownButton",value:function(t,e){var n=this,r=this.getButton("","tabs-top"===this.schema.format?"moveright":"movedown",this.translate("button_move_down_title"));return r.classList.add("movedown","json-editor-btntype-move"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i"),r=n.getValue();if(!(e>=r.length-1)){var i=r[e+1];r[e+1]=r[e],r[e]=i,n.setValue(r),n.active_tab=n.rows[e+1].tab,n.refreshTabs(),n.onChange(!0),n.jsoneditor.trigger("moveRow",n.rows[e+1])}})),e&&e.appendChild(r),r}},{key:"addControls",value:function(){this.collapsed=!1,this.toggle_button=this._createToggleButton(),this.options.collapsed&&y(this.toggle_button,"click"),this.schema.options&&void 0!==this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none"),this.add_row_button=this._createAddRowButton(),this.delete_last_row_button=this._createDeleteLastRowButton(),this.remove_all_rows_button=this._createRemoveAllRowsButton(),this.tabs&&(this.add_row_button.classList.add("je-array-control-btn"),this.delete_last_row_button.classList.add("je-array-control-btn"),this.remove_all_rows_button.classList.add("je-array-control-btn"))}},{key:"_createToggleButton",value:function(){var t=this,e=this.getButton("","collapse",this.translate("button_collapse"));e.classList.add("json-editor-btntype-toggle"),this.title.insertBefore(e,this.title.childNodes[0]);var n=this.row_holder.style.display,r=this.controls.style.display;return e.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.panel&&t.setVisibility(t.panel,t.collapsed),t.tabs_holder&&t.setVisibility(t.tabs_holder,t.collapsed),t.collapsed?(t.collapsed=!1,t.row_holder.style.display=n,t.controls.style.display=r,t.setButtonText(e.currentTarget,"","collapse",t.translate("button_collapse"))):(t.collapsed=!0,t.row_holder.style.display="none",t.controls.style.display="none",t.setButtonText(e.currentTarget,"","expand",t.translate("button_expand")))})),e}},{key:"_createAddRowButton",value:function(){var t=this,e=this.getButton(this.getItemTitle(),"add",this.translate("button_add_row_title",[this.getItemTitle()]));return e.classList.add("json-editor-btntype-add"),e.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation();var n,r=t.rows.length;t.row_cache[r]?(n=t.rows[r]=t.row_cache[r],t.rows[r].setValue(t.rows[r].getDefault(),!0),t.rows[r].container.style.display="",t.rows[r].tab&&(t.rows[r].tab.style.display=""),t.rows[r].register()):n=t.addRow(),t.active_tab=t.rows[r].tab,t.refreshTabs(),t.refreshValue(),t.onChange(!0),t.jsoneditor.trigger("addRow",n)})),this.controls.appendChild(e),e}},{key:"_createDeleteLastRowButton",value:function(){var t=this,e=this.getButton(this.translate("button_delete_last",[this.getItemTitle()]),"subtract",this.translate("button_delete_last_title",[this.getItemTitle()]));return e.classList.add("json-editor-btntype-deletelast"),e.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),!t.askConfirmation())return!1;var n=t.getValue(),r=null,i=n.pop();t.setValue(n),t.rows[t.rows.length-1]&&(r=t.rows[t.rows.length-1].tab),r&&(t.active_tab=r,t.refreshTabs()),t.onChange(!0),t.jsoneditor.trigger("deleteRow",i)})),this.controls.appendChild(e),e}},{key:"_createRemoveAllRowsButton",value:function(){var t=this,e=this.getButton(this.translate("button_delete_all"),"delete",this.translate("button_delete_all_title"));return e.classList.add("json-editor-btntype-deleteall"),e.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),!t.askConfirmation())return!1;t.empty(!0),t.setValue([]),t.onChange(!0),t.jsoneditor.trigger("deleteAllRows")})),this.controls.appendChild(e),e}},{key:"showValidationErrors",value:function(t){var e=this,n=[],r=[];t.forEach((function(t){t.path===e.path?n.push(t):r.push(t)})),this.error_holder&&(n.length?(this.error_holder.innerHTML="",this.error_holder.style.display="",n.forEach((function(t){e.error_holder.appendChild(e.theme.getErrorMessage(t.message))}))):this.error_holder.style.display="none"),this.rows.forEach((function(t){return t.showValidationErrors(r)}))}}])&&rt(e.prototype,n),r&&rt(e,r),o}(B);function ut(t){return(ut="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ht(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function dt(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function pt(t,e,n){return(pt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=vt(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function ft(t,e){return(ft=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function yt(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=vt(t);if(e){var i=vt(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return mt(this,n)}}function mt(t,e){return!e||"object"!==ut(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function vt(t){return(vt=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}ct.rules={".json-editor-btntype-toggle":"margin:0%2010px%200%200",".je-array-control-btn":"width:100%25;text-align:left;margin-bottom:3px"};var bt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ft(t,e)}(o,t);var e,n,r,i=yt(o);function o(){return ht(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"onInputChange",value:function(){this.value=this.input.value,this.onChange(!0)}},{key:"register",value:function(){pt(vt(o.prototype),"register",this).call(this),this.input&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){pt(vt(o.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"getNumColumns",value:function(){var t=this,e=this.getTitle().length;return Object.keys(this.select_values).forEach((function(n){return e=Math.max(e,"".concat(t.select_values[n]).length+4)})),Math.min(12,Math.max(e/7,2))}},{key:"preBuild",value:function(){var t;pt(vt(o.prototype),"preBuild",this).call(this),this.select_options={},this.select_values={},this.option_keys=[],this.option_titles=[];var e=this.jsoneditor.expandRefs(this.schema.items||{}),n=e.enum||[],r=e.options&&e.options.enum_titles||[];for(t=0;t<n.length;t++)this.sanitize(n[t])===n[t]&&(this.option_keys.push("".concat(n[t])),this.option_titles.push("".concat(r[t]||n[t])),this.select_values["".concat(n[t])]=n[t])}},{key:"build",value:function(){var t,e=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.options.infoText)),this.options.compact&&this.container.classList.add("compact"),!this.schema.format&&this.option_keys.length<8||"checkbox"===this.schema.format){for(this.input_type="checkboxes",this.inputs={},this.controls={},t=0;t<this.option_keys.length;t++){var n=this.formname+t.toString();this.inputs[this.option_keys[t]]=this.theme.getCheckbox(),this.inputs[this.option_keys[t]].id=n,this.select_options[this.option_keys[t]]=this.inputs[this.option_keys[t]];var r=this.theme.getCheckboxLabel(this.option_titles[t]);r.htmlFor=n,this.controls[this.option_keys[t]]=this.theme.getFormControl(r,this.inputs[this.option_keys[t]])}this.control=this.theme.getMultiCheckboxHolder(this.controls,this.label,this.description,this.infoButton),this.inputs.controlgroup=this.inputs.controls=this.control}else{for(this.input_type="select",this.input=this.theme.getSelectInput(this.option_keys,!0),this.theme.setSelectOptions(this.input,this.option_keys,this.option_titles),this.input.setAttribute("multiple","multiple"),this.input.size=Math.min(10,this.option_keys.length),t=0;t<this.option_keys.length;t++)this.select_options[this.option_keys[t]]=this.input.children[t];this.control=this.theme.getFormControl(this.label,this.input,this.description,this.infoButton)}(this.schema.readOnly||this.schema.readonly)&&this.disable(!0),this.container.appendChild(this.control),this.multiselectChangeHandler=function(n){var r=[];for(t=0;t<e.option_keys.length;t++)e.select_options[e.option_keys[t]]&&(e.select_options[e.option_keys[t]].selected||e.select_options[e.option_keys[t]].checked)&&r.push(e.select_values[e.option_keys[t]]);e.updateValue(r),e.onChange(!0)},this.control.addEventListener("change",this.multiselectChangeHandler,!1),window.requestAnimationFrame((function(){e.afterInputReady()}))}},{key:"postBuild",value:function(){pt(vt(o.prototype),"postBuild",this).call(this)}},{key:"afterInputReady",value:function(){this.theme.afterInputReady(this.input||this.inputs)}},{key:"setValue",value:function(t,e){var n=this;t=t||[],Array.isArray(t)||(t=[t]),t=t.map((function(t){return"".concat(t)})),Object.keys(this.select_options).forEach((function(e){n.select_options[e]["select"===n.input_type?"selected":"checked"]=t.includes(e)})),this.updateValue(t),this.onChange(!0)}},{key:"removeValue",value:function(t){t=[].concat(t),this.setValue(this.getValue().filter((function(e){return!t.includes(e)})))}},{key:"addValue",value:function(t){this.setValue(this.getValue().concat(t))}},{key:"updateValue",value:function(t){for(var e=!1,n=[],r=0;r<t.length;r++)if(this.select_options["".concat(t[r])]){var i=this.sanitize(this.select_values[t[r]]);n.push(i),i!==t[r]&&(e=!0)}else e=!0;return this.value=n,e}},{key:"sanitize",value:function(t){return"boolean"===this.schema.items.type?!!t:"number"===this.schema.items.type?1*t||0:"integer"===this.schema.items.type?Math.floor(1*t||0):"".concat(t)}},{key:"enable",value:function(){var t=this;this.always_disabled||(this.input?this.input.disabled=!1:this.inputs&&Object.keys(this.inputs).forEach((function(e){return t.inputs[e].disabled=!1})),pt(vt(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){var e=this;t&&(this.always_disabled=!0),this.input?this.input.disabled=!0:this.inputs&&Object.keys(this.inputs).forEach((function(t){return e.inputs[t].disabled=!0})),pt(vt(o.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){pt(vt(o.prototype),"destroy",this).call(this)}},{key:"escapeRegExp",value:function(t){return t.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}},{key:"showValidationErrors",value:function(t){var e=new RegExp("^".concat(this.escapeRegExp(this.path),"(\\.\\d+)?$")),n=t.reduce((function(t,n){return n.path.match(e)&&t.push(n.message),t}),[]);n.length?this.theme.addInputError(this.input||this.inputs,"".concat(n.join(". "),".")):this.theme.removeInputError(this.input||this.inputs)}}])&&dt(e.prototype,n),r&&dt(e,r),o}(B);function gt(t){return(gt="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function _t(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function wt(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function kt(t,e,n){return(kt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Ct(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function xt(t,e){return(xt=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function jt(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ct(t);if(e){var i=Ct(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Ot(this,n)}}function Ot(t,e){return!e||"object"!==gt(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ct(t){return(Ct=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Et=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&xt(t,e)}(o,t);var e,n,r,i=jt(o);function o(){return _t(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){this.choices_instance?(t=[].concat(t).map((function(t){return"".concat(t)})),this.updateValue(t),this.choices_instance.removeActiveItems(),this.choices_instance.setChoiceByValue(this.value),this.onChange(!0)):kt(Ct(o.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t=this;if(window.Choices&&!this.choices_instance){var e=this.expandCallbacks("choices",f({},{removeItems:!0,removeItemButton:!0},this.defaults.options.choices||{},this.options.choices||{},{addItems:!0,editItems:!1,duplicateItemsAllowed:!1}));this.newEnumAllowed=!1,this.choices_instance=new window.Choices(this.input,e),this.control.removeEventListener("change",this.multiselectChangeHandler),this.multiselectChangeHandler=function(e){var n=t.choices_instance.getValue(!0);t.updateValue(n),t.onChange(!0)},this.control.addEventListener("change",this.multiselectChangeHandler,!1)}kt(Ct(o.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){t=[].concat(t);for(var e=!1,n=[],r=0;r<t.length;r++){if(!this.select_values["".concat(t[r])]){if(e=!0,!this.newEnumAllowed)continue;if(!this.addNewOption(t[r]))continue}var i=this.sanitize(this.select_values[t[r]]);n.push(i),i!==t[r]&&(e=!0)}return this.value=n,e}},{key:"addNewOption",value:function(t){return this.option_keys.push("".concat(t)),this.option_titles.push("".concat(t)),this.select_values["".concat(t)]=t,this.schema.items.enum.push(t),this.choices_instance.setChoices([{value:"".concat(t),label:"".concat(t)}],"value","label",!1),!0}},{key:"enable",value:function(){!this.always_disabled&&this.choices_instance&&this.choices_instance.enable(),kt(Ct(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.choices_instance&&this.choices_instance.disable(),kt(Ct(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.choices_instance&&(this.choices_instance.destroy(),this.choices_instance=null),kt(Ct(o.prototype),"destroy",this).call(this)}}])&&wt(e.prototype,n),r&&wt(e,r),o}(bt);function St(t){return(St="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Rt(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Pt(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Lt(t,e,n){return(Lt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Dt(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Tt(t,e){return(Tt=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function At(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Dt(t);if(e){var i=Dt(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return It(this,n)}}function It(t,e){return!e||"object"!==St(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Dt(t){return(Dt=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Bt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Tt(t,e)}(o,t);var e,n,r,i=At(o);function o(){return Rt(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){this.select2_instance?(t=[].concat(t).map((function(t){return"".concat(t)})),this.updateValue(t),this.select2v4?this.select2_instance.val(this.value).change():this.select2_instance.select2("val",this.value),this.onChange(!0)):Lt(Dt(o.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t,e=this;window.jQuery&&window.jQuery.fn&&window.jQuery.fn.select2&&!this.select2_instance&&(t=this.expandCallbacks("select2",f({},{tags:!0,width:"100%"},this.defaults.options.select2||{},this.options.select2||{})),this.newEnumAllowed=t.tags=!!t.tags&&this.schema.items&&"string"===this.schema.items.type,this.select2_instance=window.jQuery(this.input).select2(t),this.select2v4=v(this.select2_instance.select2,"amd"),this.selectChangeHandler=function(){var t=e.select2v4?e.select2_instance.val():e.select2_instance.select2("val");e.updateValue(t),e.onChange(!0)},this.select2_instance.on("select2-blur",this.selectChangeHandler),this.select2_instance.on("change",this.selectChangeHandler)),Lt(Dt(o.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){t=[].concat(t);for(var e=!1,n=[],r=0;r<t.length;r++){if(!this.select_values["".concat(t[r])]){if(e=!0,!this.newEnumAllowed)continue;if(!this.addNewOption(t[r]))continue}var i=this.sanitize(this.select_values[t[r]]);n.push(i),i!==t[r]&&(e=!0)}return this.value=n,e}},{key:"addNewOption",value:function(t){this.option_keys.push("".concat(t)),this.option_titles.push("".concat(t)),this.select_values["".concat(t)]=t,this.schema.items.enum.push(t);var e=this.input.querySelector('option[value="'.concat(t,'"]'));return e?e.removeAttribute("data-select2-tag"):this.input.appendChild(new Option(t,t,!1,!1)).trigger("change"),!0}},{key:"enable",value:function(){!this.always_disabled&&this.select2_instance&&(this.select2v4?this.select2_instance.prop("disabled",!1):this.select2_instance.select2("enable",!0)),Lt(Dt(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.select2_instance&&(this.select2v4?this.select2_instance.prop("disabled",!0):this.select2_instance.select2("enable",!1)),Lt(Dt(o.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){this.select2_instance&&(this.select2_instance.select2("destroy"),this.select2_instance=null),Lt(Dt(o.prototype),"destroy",this).call(this)}}])&&Pt(e.prototype,n),r&&Pt(e,r),o}(bt);function Nt(t){return(Nt="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ft(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Vt(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Ht(t,e,n){return(Ht="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Ut(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function zt(t,e){return(zt=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Mt(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ut(t);if(e){var i=Ut(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return qt(this,n)}}function qt(t,e){return!e||"object"!==Nt(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ut(t){return(Ut=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Gt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&zt(t,e)}(o,t);var e,n,r,i=Mt(o);function o(){return Ft(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){this.selectize_instance?(t=[].concat(t).map((function(t){return"".concat(t)})),this.updateValue(t),this.selectize_instance.setValue(this.value),this.onChange(!0)):Ht(Ut(o.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t,e=this;window.jQuery&&window.jQuery.fn&&window.jQuery.fn.selectize&&!this.selectize_instance&&(t=this.expandCallbacks("selectize",f({},{plugins:["remove_button"],delimiter:!1,createOnBlur:!0,create:!0},this.defaults.options.selectize||{},this.options.selectize||{})),this.newEnumAllowed=t.create=!!t.create&&this.schema.items&&"string"===this.schema.items.type,this.selectize_instance=window.jQuery(this.input).selectize(t)[0].selectize,this.control.removeEventListener("change",this.multiselectChangeHandler),this.multiselectChangeHandler=function(t){var n=e.selectize_instance.getValue();e.updateValue(n),e.onChange(!0)},this.selectize_instance.on("change",this.multiselectChangeHandler)),Ht(Ut(o.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){t=[].concat(t);for(var e=!1,n=[],r=0;r<t.length;r++){if(!this.select_values["".concat(t[r])]){if(e=!0,!this.newEnumAllowed)continue;if(!this.addNewOption(t[r]))continue}var i=this.sanitize(this.select_values[t[r]]);n.push(i),i!==t[r]&&(e=!0)}return this.value=n,e}},{key:"addNewOption",value:function(t){return this.option_keys.push("".concat(t)),this.option_titles.push("".concat(t)),this.select_values["".concat(t)]=t,this.schema.items.enum.push(t),this.selectize_instance.addOption({text:t,value:t}),!0}},{key:"enable",value:function(){!this.always_disabled&&this.selectize_instance&&this.selectize_instance.unlock(),Ht(Ut(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.selectize_instance&&this.selectize_instance.lock(),Ht(Ut(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.selectize_instance&&(this.selectize_instance.destroy(),this.selectize_instance=null),Ht(Ut(o.prototype),"destroy",this).call(this)}}])&&Vt(e.prototype,n),r&&Vt(e,r),o}(bt);function $t(t){return($t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Jt(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Wt(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Zt(t,e,n){return(Zt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Kt(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Qt(t,e){return(Qt=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Yt(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Kt(t);if(e){var i=Kt(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Xt(this,n)}}function Xt(t,e){return!e||"object"!==$t(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Kt(t){return(Kt=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var te=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Qt(t,e)}(o,t);var e,n,r,i=Yt(o);function o(){return Jt(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"postBuild",value:function(){window.Autocomplete&&(this.autocomplete_wrapper=document.createElement("div"),this.input.parentNode.insertBefore(this.autocomplete_wrapper,this.input.nextSibling),this.autocomplete_wrapper.appendChild(this.input),this.autocomplete_dropdown=document.createElement("ul"),this.input.parentNode.insertBefore(this.autocomplete_dropdown,this.input.nextSibling)),Zt(Kt(o.prototype),"postBuild",this).call(this)}},{key:"afterInputReady",value:function(){var t;window.Autocomplete&&!this.autocomplete_instance&&(t=this.expandCallbacks("autocomplete",f({},{search:function(t,e){return console.log('No "search" callback defined for autocomplete in property "'.concat(t.key,'"')),[]},baseClass:"autocomplete"},this.defaults.options.autocomplete||{},this.options.autocomplete||{})),this.autocomplete_wrapper.classList.add(t.baseClass),this.autocomplete_dropdown.classList.add("".concat(t.baseClass,"-result-list")),this.autocomplete_instance=new window.Autocomplete(this.autocomplete_wrapper,t)),Zt(Kt(o.prototype),"afterInputReady",this).call(this)}},{key:"destroy",value:function(){this.autocomplete_instance&&(this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.autocomplete_dropdown&&this.autocomplete_dropdown.parentNode&&this.autocomplete_dropdown.parentNode.removeChild(this.autocomplete_dropdown),this.autocomplete_wrapper&&this.autocomplete_wrapper.parentNode&&this.autocomplete_wrapper.parentNode.removeChild(this.autocomplete_wrapper),this.autocomplete_instance=null),Zt(Kt(o.prototype),"destroy",this).call(this)}}])&&Wt(e.prototype,n),r&&Wt(e,r),o}(G);n(133);function ee(t){return(ee="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ne(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function re(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function ie(t,e,n){return(ie="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=le(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function oe(t,e){return(oe=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ae(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=le(t);if(e){var i=le(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return se(this,n)}}function se(t,e){return!e||"object"!==ee(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function le(t){return(le=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var ce=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&oe(t,e)}(o,t);var e,n,r,i=ae(o);function o(){return ne(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getNumColumns",value:function(){return 4}},{key:"setFileReaderListener",value:function(t){var e=this;t.addEventListener("load",(function(t){if(e.count===e.current_item_index)e.value[e.count][e.key]=t.target.result;else{var n={};for(var r in e.parent.schema.properties)n[r]="";n[e.key]=t.target.result,e.value.splice(e.count,0,n)}e.count+=1,e.count===e.total+e.current_item_index&&e.arrayEditor.setValue(e.value)}))}},{key:"build",value:function(){var t=this;if(this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.options.infoText)),this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input),!this.schema.readOnly&&!this.schema.readonly){if(!window.FileReader)throw new Error("FileReader required for base64 editor");this.uploader=this.theme.getFormInputField("file"),this.schema.options&&this.schema.options.multiple&&!0===this.schema.options.multiple&&this.parent&&"object"===this.parent.schema.type&&this.parent.parent&&"array"===this.parent.parent.schema.type&&this.uploader.setAttribute("multiple",""),this.uploader.addEventListener("change",(function(e){if(e.preventDefault(),e.stopPropagation(),e.currentTarget.files&&e.currentTarget.files.length)if(e.currentTarget.files.length>1&&t.schema.options&&t.schema.options.multiple&&!0===t.schema.options.multiple&&t.parent&&"object"===t.parent.schema.type&&t.parent.parent&&"array"===t.parent.parent.schema.type){t.arrayEditor=t.jsoneditor.getEditor(t.parent.parent.path),t.value=t.arrayEditor.getValue(),t.total=e.currentTarget.files.length,t.current_item_index=parseInt(t.parent.key),t.count=t.current_item_index;for(var n=0;n<t.total;n++){var r=new FileReader;t.setFileReaderListener(r),r.readAsDataURL(e.currentTarget.files[n])}}else{var i=new FileReader;i.onload=function(e){t.value=e.target.result,t.refreshPreview(),t.onChange(!0),i=null},i.readAsDataURL(e.currentTarget.files[0])}}))}this.preview=this.theme.getFormInputDescription(this.schema.description),this.container.appendChild(this.preview),this.control=this.theme.getFormControl(this.label,this.uploader||this.input,this.preview,this.infoButton),this.container.appendChild(this.control)}},{key:"refreshPreview",value:function(){if(this.last_preview!==this.value&&(this.last_preview=this.value,this.preview.innerHTML="",this.value)){var t=this.value.match(/^data:([^;,]+)[;,]/);if(t&&(t=t[1]),t){if(this.preview.innerHTML="<strong>Type:</strong> ".concat(t,", <strong>Size:</strong> ").concat(Math.floor((this.value.length-this.value.split(",")[0].length-1)/1.33333)," bytes"),"image"===t.substr(0,5)){this.preview.innerHTML+="<br>";var e=document.createElement("img");e.style.maxWidth="100%",e.style.maxHeight="100px",e.src=this.value,this.preview.appendChild(e)}}else this.preview.innerHTML="<em>Invalid data URI</em>"}}},{key:"enable",value:function(){this.always_disabled||(this.uploader&&(this.uploader.disabled=!1),ie(le(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.uploader&&(this.uploader.disabled=!0),ie(le(o.prototype),"disable",this).call(this)}},{key:"setValue",value:function(t){this.value!==t&&(this.value=t,this.input.value=this.value,this.refreshPreview(),this.onChange())}},{key:"destroy",value:function(){this.preview&&this.preview.parentNode&&this.preview.parentNode.removeChild(this.preview),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.uploader&&this.uploader.parentNode&&this.uploader.parentNode.removeChild(this.uploader),ie(le(o.prototype),"destroy",this).call(this)}}])&&re(e.prototype,n),r&&re(e,r),o}(B);function ue(t){return(ue="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function he(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function de(t,e,n){return(de="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=me(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function pe(t,e){return(pe=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function fe(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=me(t);if(e){var i=me(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ye(this,n)}}function ye(t,e){return!e||"object"!==ue(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function me(t){return(me=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var ve=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&pe(t,e)}(o,t);var e,n,r,i=fe(o);function o(t,e){var n;return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),(n=i.call(this,t,e)).active=!1,n.parent&&n.parent.schema&&(Array.isArray(n.parent.schema.required)?n.parent.schema.required.includes(n.key)||n.parent.schema.required.push(n.key):n.parent.schema.required=[n.key]),n}return e=o,(n=[{key:"build",value:function(){var t=this;this.options.compact=!0;var e=this.schema.title||this.key,n=this.expandCallbacks("button",f({},{icon:"",validated:!1,align:"left",action:function(t,e){window.alert('No button action defined for "'.concat(t.path,'"'))}},this.defaults.options.button||{},this.options.button||{}));this.input=this.theme.getFormButton(e,n.icon,e),this.input.addEventListener("click",n.action,!1),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&(this.always_disabled=!0,this.input.setAttribute("readonly","true")),this.setInputAttributes(["readonly"]),this.control=this.theme.getFormButtonHolder(n.align),this.control.appendChild(this.input),this.container.appendChild(this.control),this.changeHandler=function(){t.jsoneditor.validate(t.jsoneditor.getValue()).length>0?t.disable():t.enable()},n.validated&&this.jsoneditor.on("change",this.changeHandler)}},{key:"enable",value:function(){this.always_disabled||(this.input.disabled=!1,de(me(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.input.disabled=!0,de(me(o.prototype),"disable",this).call(this)}},{key:"getNumColumns",value:function(){return 2}},{key:"activate",value:function(){this.active=!1,this.enable()}},{key:"deactivate",value:function(){this.isRequired()||(this.active=!1,this.disable())}},{key:"destroy",value:function(){this.jsoneditor.off("change",this.changeHandler),this.changeHandler=null,de(me(o.prototype),"destroy",this).call(this)}}])&&he(e.prototype,n),r&&he(e,r),o}(B);function be(t){return(be="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ge(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function _e(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function we(t,e,n){return(we="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Oe(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function ke(t,e){return(ke=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function xe(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Oe(t);if(e){var i=Oe(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return je(this,n)}}function je(t,e){return!e||"object"!==be(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Oe(t){return(Oe=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Ce=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ke(t,e)}(o,t);var e,n,r,i=xe(o);function o(){return ge(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){t=!!t;var n=this.getValue()!==t;this.value=t,this.input.checked=this.value,this.onChange(n)}},{key:"register",value:function(){we(Oe(o.prototype),"register",this).call(this),this.input&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){we(Oe(o.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"getNumColumns",value:function(){return Math.min(12,Math.max(this.getTitle().length/7,2))}},{key:"build",value:function(){var t=this;this.parent.options.table_row||(this.label=this.header=this.theme.getCheckboxLabel(this.getTitle(),this.isRequired()),this.label.htmlFor=this.formname),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.infoText&&!this.options.compact&&(this.infoButton=this.theme.getInfoButton(this.options.infoText)),this.options.compact&&this.container.classList.add("compact"),this.input=this.theme.getCheckbox(),this.input.id=this.formname,this.control=this.theme.getFormControl(this.label,this.input,this.description,this.infoButton),(this.schema.readOnly||this.schema.readonly)&&(this.always_disabled=!0,this.input.disabled=!0),this.input.addEventListener("change",(function(e){e.preventDefault(),e.stopPropagation(),t.value=e.currentTarget.checked,t.onChange(!0)})),this.container.appendChild(this.control)}},{key:"enable",value:function(){this.always_disabled||(this.input.disabled=!1,we(Oe(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.input.disabled=!0,we(Oe(o.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),we(Oe(o.prototype),"destroy",this).call(this)}},{key:"showValidationErrors",value:function(t){var e=this;this.previous_error_setting=this.jsoneditor.options.show_errors;var n=t.reduce((function(t,n){return n.path===e.path&&t.push(n.message),t}),[]);this.input.controlgroup=this.control,n.length?this.theme.addInputError(this.input,"".concat(n.join(". "),".")):this.theme.removeInputError(this.input)}}])&&_e(e.prototype,n),r&&_e(e,r),o}(B);n(81),n(134);function Ee(t){return(Ee="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Se(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Re(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Pe(t,e,n){return(Pe="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Ie(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Le(t,e){return(Le=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Te(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ie(t);if(e){var i=Ie(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Ae(this,n)}}function Ae(t,e){return!e||"object"!==Ee(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ie(t){return(Ie=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var De=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Le(t,e)}(o,t);var e,n,r,i=Te(o);function o(){return Se(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){var n=this.typecast(t),r=!!this.jsoneditor.options.use_default_values||void 0!==this.schema.default;this.enum_values.includes(n)&&(!e||this.isRequired()||r)||(n=this.enum_values[0]),this.value!==n&&(e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.input.value=this.enum_options[this.enum_values.indexOf(n)],this.value=n,this.onChange(),this.change())}},{key:"register",value:function(){Pe(Ie(o.prototype),"register",this).call(this),this.input&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){Pe(Ie(o.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"getNumColumns",value:function(){if(!this.enum_options)return 3;for(var t=this.getTitle().length,e=0;e<this.enum_options.length;e++)t=Math.max(t,this.enum_options[e].length+4);return Math.min(12,Math.max(t/7,2))}},{key:"typecast",value:function(t){return"boolean"===this.schema.type?"undefined"===t||void 0===t?void 0:!!t:"number"===this.schema.type?1*t||0:"integer"===this.schema.type?Math.floor(1*t||0):this.schema.enum&&void 0===t?void 0:"".concat(t)}},{key:"getValue",value:function(){if(this.dependenciesFulfilled)return this.typecast(this.value)}},{key:"preBuild",value:function(){var t,e,n=this;if(this.input_type="select",this.enum_options=[],this.enum_values=[],this.enum_display=[],this.schema.enum){var r=this.schema.options&&this.schema.options.enum_titles||[];this.schema.enum.forEach((function(t,e){n.enum_options[e]="".concat(t),n.enum_display[e]="".concat(r[e]||t),n.enum_values[e]=n.typecast(t)})),this.isRequired()||(this.enum_display.unshift(" "),this.enum_options.unshift("undefined"),this.enum_values.unshift(void 0))}else if("boolean"===this.schema.type)this.enum_display=this.schema.options&&this.schema.options.enum_titles||["true","false"],this.enum_options=["1",""],this.enum_values=[!0,!1],this.isRequired()||(this.enum_display.unshift(" "),this.enum_options.unshift("undefined"),this.enum_values.unshift(void 0));else{if(!this.schema.enumSource)throw new Error("'select' editor requires the enum property to be set.");if(this.enumSource=[],this.enum_display=[],this.enum_options=[],this.enum_values=[],Array.isArray(this.schema.enumSource))for(t=0;t<this.schema.enumSource.length;t++)"string"==typeof this.schema.enumSource[t]?this.enumSource[t]={source:this.schema.enumSource[t]}:Array.isArray(this.schema.enumSource[t])?this.enumSource[t]=this.schema.enumSource[t]:this.enumSource[t]=f({},this.schema.enumSource[t]);else this.schema.enumValue?this.enumSource=[{source:this.schema.enumSource,value:this.schema.enumValue}]:this.enumSource=[{source:this.schema.enumSource}];for(t=0;t<this.enumSource.length;t++)this.enumSource[t].value&&("function"==typeof(e=this.expandCallbacks("template",{template:this.enumSource[t].value})).template?this.enumSource[t].value=e.template:this.enumSource[t].value=this.jsoneditor.compileTemplate(this.enumSource[t].value,this.template_engine)),this.enumSource[t].title&&("function"==typeof(e=this.expandCallbacks("template",{template:this.enumSource[t].title})).template?this.enumSource[t].title=e.template:this.enumSource[t].title=this.jsoneditor.compileTemplate(this.enumSource[t].title,this.template_engine)),this.enumSource[t].filter&&this.enumSource[t].value&&("function"==typeof(e=this.expandCallbacks("template",{template:this.enumSource[t].filter})).template?this.enumSource[t].filter=e.template:this.enumSource[t].filter=this.jsoneditor.compileTemplate(this.enumSource[t].filter,this.template_engine))}}},{key:"build",value:function(){var t=this;this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.options.infoText)),this.options.compact&&this.container.classList.add("compact"),this.input=this.theme.getSelectInput(this.enum_options,!1),this.theme.setSelectOptions(this.input,this.enum_options,this.enum_display),(this.schema.readOnly||this.schema.readonly)&&(this.always_disabled=!0,this.input.disabled=!0),this.setInputAttributes([]),this.input.addEventListener("change",(function(e){e.preventDefault(),e.stopPropagation(),t.onInputChange()})),this.control=this.theme.getFormControl(this.label,this.input,this.description,this.infoButton),this.container.appendChild(this.control),this.value=this.enum_values[0],window.requestAnimationFrame((function(){t.input.parentNode&&t.afterInputReady()}))}},{key:"afterInputReady",value:function(){this.theme.afterInputReady(this.input)}},{key:"onInputChange",value:function(){var t,e=this.typecast(this.input.value);(t=this.enum_values.includes(e)?this.enum_values[this.enum_values.indexOf(e)]:this.enum_values[0])!==this.value&&(this.is_dirty=!0,this.value=t,this.onChange(!0))}},{key:"onWatchedFieldChange",value:function(){var t,e,n=[],r=[];if(this.enumSource){t=this.getWatchedFieldValues();for(var i=0;i<this.enumSource.length;i++)if(Array.isArray(this.enumSource[i]))n=n.concat(this.enumSource[i]),r=r.concat(this.enumSource[i]);else{var a=[];if(a=Array.isArray(this.enumSource[i].source)?this.enumSource[i].source:t[this.enumSource[i].source]){if(this.enumSource[i].slice&&(a=Array.prototype.slice.apply(a,this.enumSource[i].slice)),this.enumSource[i].filter){var s=[];for(e=0;e<a.length;e++)this.enumSource[i].filter({i:e,item:a[e],watched:t})&&s.push(a[e]);a=s}var l=[],c=[];for(e=0;e<a.length;e++){var u=a[e];this.enumSource[i].value?c[e]=this.typecast(this.enumSource[i].value({i:e,item:u})):c[e]=a[e],this.enumSource[i].title?l[e]=this.enumSource[i].title({i:e,item:u}):l[e]=c[e]}this.enumSource[i].sort&&function(t,e,n){t.map((function(t,n){return{v:t,t:e[n]}})).sort((function(t,e){return t.v<e.v?-n:t.v===e.v?0:n})).forEach((function(n,r){t[r]=n.v,e[r]=n.t}))}.bind(null,c,l,"desc"===this.enumSource[i].sort?1:-1)(),n=n.concat(c),r=r.concat(l)}}var h=this.value;this.theme.setSelectOptions(this.input,n,r),this.enum_options=n,this.enum_display=r,this.enum_values=n,n.includes(h)||!1!==this.jsoneditor.options.enum_source_value_auto_select?(this.input.value=h,this.value=h):(this.input.value=n[0],this.value=this.typecast(n[0]||""),this.parent&&!this.watchLoop?this.parent.onChildEditorChange(this):this.jsoneditor.onChange(),this.jsoneditor.notifyWatchers(this.path))}Pe(Ie(o.prototype),"onWatchedFieldChange",this).call(this)}},{key:"enable",value:function(){this.always_disabled||(this.input.disabled=!1),Pe(Ie(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.input.disabled=!0,Pe(Ie(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),Pe(Ie(o.prototype),"destroy",this).call(this)}},{key:"showValidationErrors",value:function(t){var e=this;this.previous_error_setting=this.jsoneditor.options.show_errors;var n=t.reduce((function(t,n){return n.path===e.path&&t.push(n.message),t}),[]);n.length?this.theme.addInputError(this.input,"".concat(n.join(". "),".")):this.theme.removeInputError(this.input)}}])&&Re(e.prototype,n),r&&Re(e,r),o}(B);function Be(t){return(Be="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ne(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Fe(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Ve(t,e,n){return(Ve="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=qe(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function He(t,e){return(He=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ze(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=qe(t);if(e){var i=qe(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Me(this,n)}}function Me(t,e){return!e||"object"!==Be(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function qe(t){return(qe=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Ue=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&He(t,e)}(o,t);var e,n,r,i=ze(o);function o(){return Ne(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){if(this.choices_instance){var n=this.typecast(t||"");if(this.enum_values.includes(n)||(n=this.enum_values[0]),this.value===n)return;e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.input.value=this.enum_options[this.enum_values.indexOf(n)],this.choices_instance.setChoiceByValue(this.input.value),this.value=n,this.onChange()}else Ve(qe(o.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){if(window.Choices&&!this.choices_instance){var t=this.expandCallbacks("choices",f({},this.defaults.options.choices||{},this.options.choices||{}));this.choices_instance=new window.Choices(this.input,t)}Ve(qe(o.prototype),"afterInputReady",this).call(this)}},{key:"onWatchedFieldChange",value:function(){var t=this;if(Ve(qe(o.prototype),"onWatchedFieldChange",this).call(this),this.choices_instance){var e=this.enum_options.map((function(e,n){return{value:e,label:t.enum_display[n]}}));this.choices_instance.setChoices(e,"value","label",!0),this.choices_instance.setChoiceByValue("".concat(this.value))}}},{key:"enable",value:function(){!this.always_disabled&&this.choices_instance&&this.choices_instance.enable(),Ve(qe(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.choices_instance&&this.choices_instance.disable(),Ve(qe(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.choices_instance&&(this.choices_instance.destroy(),this.choices_instance=null),Ve(qe(o.prototype),"destroy",this).call(this)}}])&&Fe(e.prototype,n),r&&Fe(e,r),o}(De);function Ge(t){return(Ge="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function $e(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Je(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function We(t,e,n){return(We="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Xe(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Ze(t,e){return(Ze=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Qe(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Xe(t);if(e){var i=Xe(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Ye(this,n)}}function Ye(t,e){return!e||"object"!==Ge(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Xe(t){return(Xe=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}Ue.rules={".choices > *":"box-sizing:border-box"};var Ke=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ze(t,e)}(o,t);var e,n,r,i=Qe(o);function o(){return $e(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"build",value:function(){if(We(Xe(o.prototype),"build",this).call(this),this.input&&(this.schema.max&&"string"==typeof this.schema.max&&this.input.setAttribute("max",this.schema.max),this.schema.min&&"string"==typeof this.schema.max&&this.input.setAttribute("min",this.schema.min),window.flatpickr&&"object"===Ge(this.options.flatpickr))){this.options.flatpickr.enableTime="date"!==this.schema.format,this.options.flatpickr.noCalendar="time"===this.schema.format,"integer"===this.schema.type&&(this.options.flatpickr.mode="single"),this.input.setAttribute("data-input","");var t=this.input;if(!0===this.options.flatpickr.wrap){var e=[];if(!1!==this.options.flatpickr.showToggleButton){var n=this.getButton("","time"===this.schema.format?"time":"calendar",this.translate("flatpickr_toggle_button"));n.setAttribute("data-toggle",""),e.push(n)}if(!1!==this.options.flatpickr.showClearButton){var r=this.getButton("","clear",this.translate("flatpickr_clear_button"));r.setAttribute("data-clear",""),e.push(r)}var i=this.input.parentNode,a=this.input.nextSibling,s=this.theme.getInputGroup(this.input,e);void 0!==s?(this.options.flatpickr.inline=!1,i.insertBefore(s,a),t=s):this.options.flatpickr.wrap=!1}this.flatpickr=window.flatpickr(t,this.options.flatpickr),!0===this.options.flatpickr.inline&&!0===this.options.flatpickr.inlineHideInput&&this.input.setAttribute("type","hidden")}}},{key:"getValue",value:function(){if(this.dependenciesFulfilled){if("string"===this.schema.type)return this.value;if(""!==this.value&&void 0!==this.value){var t="time"===this.schema.format?"1970-01-01 ".concat(this.value):this.value;return parseInt(new Date(t).getTime()/1e3)}}}},{key:"setValue",value:function(t,e,n){if("string"===this.schema.type)We(Xe(o.prototype),"setValue",this).call(this,t,e,n),this.flatpickr&&this.flatpickr.setDate(t);else if(t>0){var r=new Date(1e3*t),i=r.getFullYear(),a=this.zeroPad(r.getMonth()+1),s=this.zeroPad(r.getDate()),l=this.zeroPad(r.getHours()),c=this.zeroPad(r.getMinutes()),u=this.zeroPad(r.getSeconds()),h=[i,a,s].join("-"),d=[l,c,u].join(":"),p="".concat(h,"T").concat(d);"date"===this.schema.format?p=h:"time"===this.schema.format&&(p=d),this.input.value=p,this.refreshValue(),this.flatpickr&&this.flatpickr.setDate(p)}}},{key:"destroy",value:function(){this.flatpickr&&this.flatpickr.destroy(),this.flatpickr=null,We(Xe(o.prototype),"destroy",this).call(this)}},{key:"zeroPad",value:function(t){return"0".concat(t).slice(-2)}}])&&Je(e.prototype,n),r&&Je(e,r),o}(G);function tn(t){return(tn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function en(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function nn(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function rn(t,e,n){return(rn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=ln(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function on(t,e){return(on=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function an(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=ln(t);if(e){var i=ln(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return sn(this,n)}}function sn(t,e){return!e||"object"!==tn(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function ln(t){return(ln=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var cn=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&on(t,e)}(o,t);var e,n,r,i=an(o);function o(){return en(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"register",value:function(){if(this.editors){for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister();this.editors[this.currentEditor]&&this.editors[this.currentEditor].register()}rn(ln(o.prototype),"register",this).call(this)}},{key:"unregister",value:function(){if(rn(ln(o.prototype),"unregister",this).call(this),this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister()}},{key:"getNumColumns",value:function(){return this.editors[this.currentEditor]?Math.max(this.editors[this.currentEditor].getNumColumns(),4):4}},{key:"enable",value:function(){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].enable();rn(ln(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].disable();rn(ln(o.prototype),"disable",this).call(this)}},{key:"switchEditor",value:function(){var t=this,e=this.getWatchedFieldValues();if(e){var n=document.location.origin+document.location.pathname+this.template(e);this.editors[this.refs[n]]||this.buildChildEditor(n),this.currentEditor=this.refs[n],this.register(),this.editors.forEach((function(e,n){e&&(t.currentEditor===n?e.container.style.display="":e.container.style.display="none")})),this.refreshValue(),this.onChange(!0)}}},{key:"buildChildEditor",value:function(t){this.refs[t]=this.editors.length;var e=this.theme.getChildEditorHolder();this.editor_holder.appendChild(e);var n=f({},this.schema,this.jsoneditor.refs[t]),r=this.jsoneditor.getEditorClass(n,this.jsoneditor),i=this.jsoneditor.createEditor(r,{jsoneditor:this.jsoneditor,schema:n,container:e,path:this.path,parent:this,required:!0});this.editors.push(i),i.preBuild(),i.build(),i.postBuild()}},{key:"preBuild",value:function(){var t;for(this.refs={},this.editors=[],this.currentEditor="",t=0;t<this.schema.links.length;t++)if("describedby"===this.schema.links[t].rel.toLowerCase()){this.template=this.jsoneditor.compileTemplate(this.schema.links[t].href,this.template_engine);break}this.schema.links=this.schema.links.slice(0,t).concat(this.schema.links.slice(t+1)),0===this.schema.links.length&&delete this.schema.links,this.baseSchema=f({},this.schema)}},{key:"build",value:function(){this.editor_holder=document.createElement("div"),this.container.appendChild(this.editor_holder),this.switchEditor()}},{key:"onWatchedFieldChange",value:function(){this.switchEditor()}},{key:"onChildEditorChange",value:function(t){this.editors[this.currentEditor]&&this.refreshValue(),rn(ln(o.prototype),"onChildEditorChange",this).call(this,t)}},{key:"refreshValue",value:function(){this.editors[this.currentEditor]&&(this.value=this.editors[this.currentEditor].getValue())}},{key:"setValue",value:function(t,e){this.editors[this.currentEditor]&&(this.editors[this.currentEditor].setValue(t,e),this.refreshValue(),this.onChange())}},{key:"destroy",value:function(){this.editors.forEach((function(t){t&&t.destroy()})),this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),rn(ln(o.prototype),"destroy",this).call(this)}},{key:"showValidationErrors",value:function(t){this.editors.forEach((function(e){e&&e.showValidationErrors(t)}))}}])&&nn(e.prototype,n),r&&nn(e,r),o}(B);function un(t){return(un="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function hn(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(t)))return;var n=[],r=!0,i=!1,o=void 0;try{for(var a,s=t[Symbol.iterator]();!(r=(a=s.next()).done)&&(n.push(a.value),!e||n.length!==e);r=!0);}catch(t){i=!0,o=t}finally{try{r||null==s.return||s.return()}finally{if(i)throw o}}return n}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return dn(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return dn(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function dn(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function pn(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function fn(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function yn(t,e,n){return(yn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=gn(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function mn(t,e){return(mn=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function vn(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=gn(t);if(e){var i=gn(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return bn(this,n)}}function bn(t,e){return!e||"object"!==un(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function gn(t){return(gn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var _n=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&mn(t,e)}(o,t);var e,n,r,i=vn(o);function o(){return pn(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getNumColumns",value:function(){return 4}},{key:"build",value:function(){var t=this;this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.container.appendChild(this.title),this.options.enum_titles=this.options.enum_titles||[],this.enum=this.schema.enum,this.selected=0,this.select_options=[],this.html_values=[];for(var e=0;e<this.enum.length;e++)this.select_options[e]=this.options.enum_titles[e]||"Value ".concat(e+1),this.html_values[e]=this.getHTML(this.enum[e]);this.switcher=this.theme.getSwitcher(this.select_options),this.container.appendChild(this.switcher),this.display_area=this.theme.getIndentedPanel(),this.container.appendChild(this.display_area),this.options.hide_display&&(this.display_area.style.display="none"),this.switcher.addEventListener("change",(function(e){t.selected=t.select_options.indexOf(e.currentTarget.value),t.value=t.enum[t.selected],t.refreshValue(),t.onChange(!0)})),this.value=this.enum[0],this.refreshValue(),1===this.enum.length&&(this.switcher.style.display="none")}},{key:"refreshValue",value:function(){var t=this;this.selected=-1;var e=JSON.stringify(this.value);this.enum.forEach((function(n,r){if(e===JSON.stringify(n))return t.selected=r,!1})),this.selected<0?this.setValue(this.enum[0]):(this.switcher.value=this.select_options[this.selected],this.display_area.innerHTML=this.html_values[this.selected])}},{key:"enable",value:function(){this.always_disabled||(this.switcher.disabled=!1,yn(gn(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.switcher.disabled=!0,yn(gn(o.prototype),"disable",this).call(this)}},{key:"getHTML",value:function(t){var e=this;if(null===t)return"<em>null</em>";if("object"===un(t)){var n="";return function(t,e){Array.isArray(t)||"number"==typeof t.length&&t.length>0&&t.length-1 in t?Array.from(t).forEach((function(t,n){return e(n,t)})):Object.entries(t).forEach((function(t){var n=hn(t,2),r=n[0],i=n[1];return e(r,i)}))}(t,(function(r,i){var o=e.getHTML(i);Array.isArray(t)||(o="<div><em>".concat(r,"</em>: ").concat(o,"</div>")),n+="<li>".concat(o,"</li>")})),n=Array.isArray(t)?"<ol>".concat(n,"</ol>"):"<ul style='margin-top:0;margin-bottom:0;padding-top:0;padding-bottom:0;'>".concat(n,"</ul>")}return"boolean"==typeof t?t?"true":"false":"string"==typeof t?t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;"):t}},{key:"setValue",value:function(t){this.value!==t&&(this.value=t,this.refreshValue(),this.onChange())}},{key:"destroy",value:function(){this.display_area&&this.display_area.parentNode&&this.display_area.parentNode.removeChild(this.display_area),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.switcher&&this.switcher.parentNode&&this.switcher.parentNode.removeChild(this.switcher),yn(gn(o.prototype),"destroy",this).call(this)}}])&&fn(e.prototype,n),r&&fn(e,r),o}(B);function wn(t){return(wn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function kn(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function xn(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function jn(t,e,n){return(jn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Sn(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function On(t,e){return(On=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Cn(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Sn(t);if(e){var i=Sn(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return En(this,n)}}function En(t,e){return!e||"object"!==wn(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Sn(t){return(Sn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Rn=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&On(t,e)}(o,t);var e,n,r,i=Cn(o);function o(){return kn(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"register",value:function(){jn(Sn(o.prototype),"register",this).call(this),this.input&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){jn(Sn(o.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"setValue",value:function(t,e,n){if((!this.template||n)&&(null==t?t="":"object"===wn(t)?t=JSON.stringify(t):"string"!=typeof t&&(t="".concat(t)),t!==this.serialized)){var r=this.sanitize(t);if(this.input.value!==r){this.input.value=r;var i=n||this.getValue()!==t;this.refreshValue(),e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.adjust_height&&this.adjust_height(this.input),this.onChange(i)}}}},{key:"getNumColumns",value:function(){return 2}},{key:"enable",value:function(){jn(Sn(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(){jn(Sn(o.prototype),"disable",this).call(this)}},{key:"refreshValue",value:function(){this.value=this.input.value,"string"!=typeof this.value&&(this.value=""),this.serialized=this.value}},{key:"destroy",value:function(){this.template=null,this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),jn(Sn(o.prototype),"destroy",this).call(this)}},{key:"sanitize",value:function(t){return t}},{key:"onWatchedFieldChange",value:function(){var t;this.template&&(t=this.getWatchedFieldValues(),this.setValue(this.template(t),!1,!0)),jn(Sn(o.prototype),"onWatchedFieldChange",this).call(this)}},{key:"build",value:function(){if(this.format=this.schema.format,!this.format&&this.options.default_format&&(this.format=this.options.default_format),this.options.format&&(this.format=this.options.format),this.input_type="hidden",this.input=this.theme.getFormInputField(this.input_type),this.format&&this.input.setAttribute("data-schemaformat",this.format),this.container.appendChild(this.input),this.schema.template){var t=this.expandCallbacks("template",{template:this.schema.template});"function"==typeof t.template?this.template=t.template:this.template=this.jsoneditor.compileTemplate(this.schema.template,this.template_engine),this.refreshValue()}else this.refreshValue()}}])&&xn(e.prototype,n),r&&xn(e,r),o}(B);function Pn(t){return(Pn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ln(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Tn(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function An(t,e){return(An=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function In(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Bn(t);if(e){var i=Bn(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Dn(this,n)}}function Dn(t,e){return!e||"object"!==Pn(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Bn(t){return(Bn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Nn=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&An(t,e)}(o,t);var e,n,r,i=In(o);function o(){return Ln(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"build",value:function(){this.options.compact=!1,this.header=this.label=this.theme.getFormInputLabel(this.getTitle()),this.description=this.theme.getDescription(this.schema.description||""),this.control=this.theme.getFormControl(this.label,this.description,null),this.container.appendChild(this.control)}},{key:"getTitle",value:function(){return this.schema.title}},{key:"getNumColumns",value:function(){return 12}}])&&Tn(e.prototype,n),r&&Tn(e,r),o}(ve);function Fn(t){return(Fn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Vn(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Hn(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function zn(t,e,n){return(zn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Gn(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Mn(t,e){return(Mn=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function qn(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Gn(t);if(e){var i=Gn(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Un(this,n)}}function Un(t,e){return!e||"object"!==Fn(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Gn(t){return(Gn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var $n=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Mn(t,e)}(o,t);var e,n,r,i=qn(o);function o(){return Vn(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"build",value:function(){if(zn(Gn(o.prototype),"build",this).call(this),void 0!==this.schema.minimum){var t=this.schema.minimum;void 0!==this.schema.exclusiveMinimum&&(t+=1),this.input.setAttribute("min",t)}if(void 0!==this.schema.maximum){var e=this.schema.maximum;void 0!==this.schema.exclusiveMaximum&&(e-=1),this.input.setAttribute("max",e)}if(void 0!==this.schema.step){var n=this.schema.step||1;this.input.setAttribute("step",n)}this.setInputAttributes(["maxlength","pattern","readonly","min","max","step"])}},{key:"getNumColumns",value:function(){return 2}},{key:"getValue",value:function(){if(this.dependenciesFulfilled){var t=function(t){if(null==t)return!1;var e=t.match(b),n=parseFloat(t);return null!==e&&!isNaN(n)&&isFinite(n)}(this.value)?parseFloat(this.value):this.value;if(this.jsoneditor.options.use_default_values||""!==t)return t}}}])&&Hn(e.prototype,n),r&&Hn(e,r),o}(G);function Jn(t){return(Jn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Wn(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Zn(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Qn(t,e){return(Qn=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Yn(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Kn(t);if(e){var i=Kn(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Xn(this,n)}}function Xn(t,e){return!e||"object"!==Jn(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Kn(t){return(Kn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var tr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Qn(t,e)}(o,t);var e,n,r,i=Yn(o);function o(){return Wn(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getNumColumns",value:function(){return 2}},{key:"getValue",value:function(){if(this.dependenciesFulfilled){var t=function(t){if(null==t)return!1;var e=t.match(g),n=parseInt(t);return null!==e&&!isNaN(n)&&isFinite(n)}(this.value)?parseInt(this.value):this.value;if(this.jsoneditor.options.use_default_values||""!==t)return t}}}])&&Zn(e.prototype,n),r&&Zn(e,r),o}($n);function er(t){return(er="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function nr(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function rr(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function ir(t,e,n){return(ir="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=lr(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function or(t,e){return(or=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ar(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=lr(t);if(e){var i=lr(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return sr(this,n)}}function sr(t,e){return!e||"object"!==er(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function lr(t){return(lr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var cr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&or(t,e)}(o,t);var e,n,r,i=ar(o);function o(){return nr(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"preBuild",value:function(){if(ir(lr(o.prototype),"preBuild",this).call(this),this.schema.options||(this.schema.options={}),!this.schema.options.cleave)switch(this.format){case"ipv6":this.schema.options.cleave={delimiters:[":"],blocks:[4,4,4,4,4,4,4,4],uppercase:!0};break;case"ipv4":this.schema.options.cleave={delimiters:["."],blocks:[3,3,3,3],numericOnly:!0}}this.options=f(this.options,this.schema.options||{})}}])&&rr(e.prototype,n),r&&rr(e,r),o}(G);function ur(t){return(ur="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function hr(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function dr(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function pr(t,e,n){return(pr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=vr(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function fr(t,e){return(fr=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function yr(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=vr(t);if(e){var i=vr(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return mr(this,n)}}function mr(t,e){return!e||"object"!==ur(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function vr(t){return(vr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var br=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&fr(t,e)}(o,t);var e,n,r,i=yr(o);function o(){return hr(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e,n){var r=pr(vr(o.prototype),"setValue",this).call(this,t,e,n);void 0!==r&&r.changed&&this.jodit_instance&&this.jodit_instance.setEditorValue(r.value)}},{key:"build",value:function(){this.options.format="textarea",pr(vr(o.prototype),"build",this).call(this),this.input_type=this.schema.format,this.input.setAttribute("data-schemaformat",this.input_type)}},{key:"afterInputReady",value:function(){var t,e=this;window.Jodit?(t=this.expandCallbacks("jodit",f({},{height:300},this.defaults.options.jodit||{},this.options.jodit||{})),this.jodit_instance=new window.Jodit(this.input,t),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&this.jodit_instance.setReadOnly(!0),this.jodit_instance.events.on("change",(function(){e.value=e.jodit_instance.getEditorValue(),e.is_dirty=!0,e.onChange(!0)})),this.theme.afterInputReady(this.input)):pr(vr(o.prototype),"afterInputReady",this).call(this)}},{key:"getNumColumns",value:function(){return 6}},{key:"enable",value:function(){!this.always_disabled&&this.jodit_instance&&this.jodit_instance.setReadOnly(!1),pr(vr(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.jodit_instance&&this.jodit_instance.setReadOnly(!0),pr(vr(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.jodit_instance&&(this.jodit_instance.destruct(),this.jodit_instance=null),pr(vr(o.prototype),"destroy",this).call(this)}}])&&dr(e.prototype,n),r&&dr(e,r),o}(G);function gr(t){return(gr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function _r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function wr(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function kr(t,e,n){return(kr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Cr(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function xr(t,e){return(xr=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function jr(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Cr(t);if(e){var i=Cr(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Or(this,n)}}function Or(t,e){return!e||"object"!==gr(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Cr(t){return(Cr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Er=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&xr(t,e)}(o,t);var e,n,r,i=jr(o);function o(){return _r(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"register",value:function(){if(this.editors){for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister();this.editors[this.type]&&this.editors[this.type].register()}kr(Cr(o.prototype),"register",this).call(this)}},{key:"unregister",value:function(){if(kr(Cr(o.prototype),"unregister",this).call(this),this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister()}},{key:"getNumColumns",value:function(){return this.editors[this.type]?Math.max(this.editors[this.type].getNumColumns(),4):4}},{key:"enable",value:function(){if(!this.always_disabled){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].enable();this.switcher.disabled=!1,kr(Cr(o.prototype),"enable",this).call(this)}}},{key:"disable",value:function(t){if(t&&(this.always_disabled=!0),this.editors)for(var e=0;e<this.editors.length;e++)this.editors[e]&&this.editors[e].disable(t);this.switcher.disabled=!0,kr(Cr(o.prototype),"disable",this).call(this)}},{key:"switchEditor",value:function(t){var e=this;this.editors[t]||this.buildChildEditor(t);var n=this.getValue();this.type=t,this.register(),this.editors.forEach((function(t,r){t&&(e.type===r?(e.keep_values&&t.setValue(n,!0),t.container.style.display=""):t.container.style.display="none")})),this.refreshValue(),this.refreshHeaderText()}},{key:"buildChildEditor",value:function(t){var e,n=this,r=this.types[t],i=this.theme.getChildEditorHolder();this.editor_holder.appendChild(i),"string"==typeof r?(e=f({},this.schema)).type=r:(e=f({},this.schema,r),e=this.jsoneditor.expandRefs(e),r&&r.required&&Array.isArray(r.required)&&this.schema.required&&Array.isArray(this.schema.required)&&(e.required=this.schema.required.concat(r.required)));var o=this.jsoneditor.getEditorClass(e);this.editors[t]=this.jsoneditor.createEditor(o,{jsoneditor:this.jsoneditor,schema:e,container:i,path:this.path,parent:this,required:!0}),this.editors[t].preBuild(),this.editors[t].build(),this.editors[t].postBuild(),this.editors[t].header&&(this.editors[t].header.style.display="none"),this.editors[t].option=this.switcher_options[t],i.addEventListener("change_header_text",(function(){n.refreshHeaderText()})),t!==this.type&&(i.style.display="none")}},{key:"preBuild",value:function(){if(this.types=[],this.type=0,this.editors=[],this.validators=[],this.keep_values=!0,void 0!==this.jsoneditor.options.keep_oneof_values&&(this.keep_values=this.jsoneditor.options.keep_oneof_values),void 0!==this.options.keep_oneof_values&&(this.keep_values=this.options.keep_oneof_values),this.schema.oneOf)this.oneOf=!0,this.types=this.schema.oneOf,delete this.schema.oneOf;else if(this.schema.anyOf)this.anyOf=!0,this.types=this.schema.anyOf,delete this.schema.anyOf;else{if(this.schema.type&&"any"!==this.schema.type)Array.isArray(this.schema.type)?this.types=this.schema.type:this.types=[this.schema.type];else if(this.types=["string","number","integer","boolean","object","array","null"],this.schema.disallow){var t=this.schema.disallow;"object"===gr(t)&&Array.isArray(t)||(t=[t]);var e=[];this.types.forEach((function(n){t.includes(n)||e.push(n)})),this.types=e}delete this.schema.type}this.display_text=this.getDisplayText(this.types)}},{key:"build",value:function(){var t=this,e=this.container;this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.container.appendChild(this.header),this.switcher=this.theme.getSwitcher(this.display_text),e.appendChild(this.switcher),this.switcher.addEventListener("change",(function(e){e.preventDefault(),e.stopPropagation(),t.switchEditor(t.display_text.indexOf(e.currentTarget.value)),t.onChange(!0)})),this.editor_holder=document.createElement("div"),e.appendChild(this.editor_holder);var n={};this.jsoneditor.options.custom_validators&&(n.custom_validators=this.jsoneditor.options.custom_validators),this.switcher_options=this.theme.getSwitcherOptions(this.switcher),this.types.forEach((function(e,r){var i;t.editors[r]=!1,"string"==typeof e?(i=f({},t.schema)).type=e:(i=f({},t.schema,e),e.required&&Array.isArray(e.required)&&t.schema.required&&Array.isArray(t.schema.required)&&(i.required=t.schema.required.concat(e.required))),t.validators[r]=new C(t.jsoneditor,i,n,t.defaults)})),this.switchEditor(0)}},{key:"onChildEditorChange",value:function(t){this.editors[this.type]&&(this.refreshValue(),this.refreshHeaderText()),kr(Cr(o.prototype),"onChildEditorChange",this).call(this)}},{key:"refreshHeaderText",value:function(){var t=this.getDisplayText(this.types);Array.from(this.switcher_options).forEach((function(e,n){e.textContent=t[n]}))}},{key:"refreshValue",value:function(){this.value=this.editors[this.type].getValue()}},{key:"setValue",value:function(t,e){var n=this,r=this.type,i={match:0,extra:0,i:this.type},o={match:0,i:null};this.validators.forEach((function(e,r){var a=null;void 0!==n.anyOf&&n.anyOf&&(a=e.fitTest(t),(i.match<a.match||i.match===a.match&&i.extra>a.extra)&&((i=a).i=r)),e.validate(t).length||null!==o.i||(o.i=r,null!==a&&(o.match=a.match))}));var a=o.i;void 0!==this.anyOf&&this.anyOf&&o.match<i.match&&(a=i.i),null===a&&(a=this.type),this.type=a,this.switcher.value=this.display_text[a];var s=this.type!==r;s&&this.switchEditor(this.type),this.editors[this.type].setValue(t,e),this.refreshValue(),this.onChange(s)}},{key:"destroy",value:function(){this.editors.forEach((function(t){t&&t.destroy()})),this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),this.switcher&&this.switcher.parentNode&&this.switcher.parentNode.removeChild(this.switcher),kr(Cr(o.prototype),"destroy",this).call(this)}},{key:"showValidationErrors",value:function(t){var e=this;if(this.oneOf||this.anyOf){var n=this.oneOf?"oneOf":"anyOf";this.editors.forEach((function(r,i){if(r){var o="".concat(e.path,".").concat(n,"[").concat(i,"]");r.showValidationErrors(t.reduce((function(t,n){if(n.path===o.substr(0,n.path.length)){var r=f({},n);r.path=e.path+r.path.substr(o.length),t.push(r)}return t}),[]))}}))}else this.editors.forEach((function(e){e&&e.showValidationErrors(t)}))}},{key:"addLinks",value:function(){}}])&&wr(e.prototype,n),r&&wr(e,r),o}(B);function Sr(t){return(Sr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Rr(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Pr(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Lr(t,e){return(Lr=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Tr(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ir(t);if(e){var i=Ir(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Ar(this,n)}}function Ar(t,e){return!e||"object"!==Sr(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ir(t){return(Ir=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Dr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Lr(t,e)}(o,t);var e,n,r,i=Tr(o);function o(){return Rr(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getValue",value:function(){if(this.dependenciesFulfilled)return null}},{key:"setValue",value:function(){this.onChange()}},{key:"getNumColumns",value:function(){return 2}}])&&Pr(e.prototype,n),r&&Pr(e,r),o}(B);n(157),n(158);function Br(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,r)}return n}function Nr(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?Br(Object(n),!0).forEach((function(e){Fr(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):Br(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}function Fr(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function Vr(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(t)))return;var n=[],r=!0,i=!1,o=void 0;try{for(var a,s=t[Symbol.iterator]();!(r=(a=s.next()).done)&&(n.push(a.value),!e||n.length!==e);r=!0);}catch(t){i=!0,o=t}finally{try{r||null==s.return||s.return()}finally{if(i)throw o}}return n}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return Hr(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Hr(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Hr(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function zr(t){return(zr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Mr(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function qr(t,e,n){return(qr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Jr(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Ur(t,e){return(Ur=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Gr(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Jr(t);if(e){var i=Jr(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return $r(this,n)}}function $r(t,e){return!e||"object"!==zr(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Jr(t){return(Jr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Wr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ur(t,e)}(o,t);var e,n,r,i=Gr(o);function o(t,e,n){var r;return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),(r=i.call(this,t,e)).currentDepth=n,r}return e=o,(n=[{key:"getDefault",value:function(){return f({},this.schema.default||{})}},{key:"getChildEditors",value:function(){return this.editors}},{key:"register",value:function(){qr(Jr(o.prototype),"register",this).call(this),this.editors&&Object.values(this.editors).forEach((function(t){return t.register()}))}},{key:"unregister",value:function(){qr(Jr(o.prototype),"unregister",this).call(this),this.editors&&Object.values(this.editors).forEach((function(t){return t.unregister()}))}},{key:"getNumColumns",value:function(){return Math.max(Math.min(12,this.maxwidth),3)}},{key:"enable",value:function(){this.always_disabled||(this.editjson_control&&(this.editjson_control.disabled=!1),this.addproperty_button&&(this.addproperty_button.disabled=!1),qr(Jr(o.prototype),"enable",this).call(this),this.editors&&Object.values(this.editors).forEach((function(t){t.isActive()&&t.enable(),t.optInCheckbox.disabled=!1})))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.editjson_control&&(this.editjson_control.disabled=!0),this.addproperty_button&&(this.addproperty_button.disabled=!0),this.hideEditJSON(),qr(Jr(o.prototype),"disable",this).call(this),this.editors&&Object.values(this.editors).forEach((function(e){e.isActive()&&e.disable(t),e.optInCheckbox.disabled=!0}))}},{key:"layoutEditors",value:function(){var t,e,n=this;if(this.row_container){var r;this.property_order=Object.keys(this.editors),this.property_order=this.property_order.sort((function(t,e){var r=n.editors[t].schema.propertyOrder,i=n.editors[e].schema.propertyOrder;return"number"!=typeof r&&(r=1e3),"number"!=typeof i&&(i=1e3),r-i}));var i,o="categories"===this.format,a=[],s=null,l=null;if("grid-strict"===this.format){var c=0;if(i=[],this.property_order.forEach((function(t){var e=n.editors[t];if(!e.property_removed){var r=e.options.hidden?0:e.options.grid_columns||e.getNumColumns(),o=e.options.hidden?0:e.options.grid_offset||0,s=!e.options.hidden&&(e.options.grid_break||!1),l={key:t,width:r,offset:o,height:e.options.hidden?0:e.container.offsetHeight};i.push(l),a[c]=i,s&&(c++,i=[])}})),this.layout===JSON.stringify(a))return!1;for(this.layout=JSON.stringify(a),r=document.createElement("div"),t=0;t<a.length;t++)for(i=this.theme.getGridRow(),r.appendChild(i),e=0;e<a[t].length;e++)s=a[t][e].key,(l=this.editors[s]).options.hidden?l.container.style.display="none":this.theme.setGridColumnSize(l.container,a[t][e].width,a[t][e].offset),i.appendChild(l.container)}else if("grid"===this.format){for(this.property_order.forEach((function(t){var e=n.editors[t];if(!e.property_removed){for(var r=!1,i=e.options.hidden?0:e.options.grid_columns||e.getNumColumns(),o=e.options.hidden?0:e.container.offsetHeight,s=0;s<a.length;s++)a[s].width+i<=12&&(!o||.5*a[s].minh<o&&2*a[s].maxh>o)&&(r=s);!1===r&&(a.push({width:0,minh:999999,maxh:0,editors:[]}),r=a.length-1),a[r].editors.push({key:t,width:i,height:o}),a[r].width+=i,a[r].minh=Math.min(a[r].minh,o),a[r].maxh=Math.max(a[r].maxh,o)}})),t=0;t<a.length;t++)if(a[t].width<12){var u=!1,h=0;for(e=0;e<a[t].editors.length;e++)(!1===u||a[t].editors[e].width>a[t].editors[u].width)&&(u=e),a[t].editors[e].width*=12/a[t].width,a[t].editors[e].width=Math.floor(a[t].editors[e].width),h+=a[t].editors[e].width;h<12&&(a[t].editors[u].width+=12-h),a[t].width=12}if(this.layout===JSON.stringify(a))return!1;for(this.layout=JSON.stringify(a),r=document.createElement("div"),t=0;t<a.length;t++)for(i=this.theme.getGridRow(),r.appendChild(i),e=0;e<a[t].editors.length;e++)s=a[t].editors[e].key,(l=this.editors[s]).options.hidden?l.container.style.display="none":this.theme.setGridColumnSize(l.container,a[t].editors[e].width),i.appendChild(l.container)}else{if(r=document.createElement("div"),o){var d=document.createElement("div"),p=this.theme.getTopTabHolder(this.schema.title),f=this.theme.getTopTabContentHolder(p);for(this.property_order.forEach((function(t){var e=n.editors[t];if(!e.property_removed){var r=n.theme.getTabContent(),i=e.schema&&("object"===e.schema.type||"array"===e.schema.type);r.isObjOrArray=i;var o=n.theme.getGridRow();e.tab||(void 0===n.basicPane?n.addRow(e,p,r):n.addRow(e,p,n.basicPane)),r.id=n.getValidId(e.tab_text.textContent),i?(r.appendChild(o),f.appendChild(r),n.theme.addTopTab(p,e.tab)):(d.appendChild(o),f.childElementCount>0?f.firstChild.isObjOrArray&&(r.appendChild(d),f.insertBefore(r,f.firstChild),n.theme.insertBasicTopTab(e.tab,p),e.basicPane=r):(r.appendChild(d),f.appendChild(r),n.theme.addTopTab(p,e.tab),e.basicPane=r)),e.options.hidden?e.container.style.display="none":n.theme.setGridColumnSize(e.container,12),o.appendChild(e.container),e.rowPane=r}}));this.tabPanesContainer.firstChild;)this.tabPanesContainer.removeChild(this.tabPanesContainer.firstChild);var m=this.tabs_holder.parentNode;m.removeChild(m.firstChild),m.appendChild(p),this.tabPanesContainer=f,this.tabs_holder=p;var v=this.theme.getFirstTab(this.tabs_holder);return void(v&&y(v,"click"))}this.property_order.forEach((function(t){var e=n.editors[t];e.property_removed||(i=n.theme.getGridRow(),r.appendChild(i),e.options.hidden?e.container.style.display="none":n.theme.setGridColumnSize(e.container,12),i.appendChild(e.container))}))}for(;this.row_container.firstChild;)this.row_container.removeChild(this.row_container.firstChild);this.row_container.appendChild(r)}}},{key:"getPropertySchema",value:function(t){var e=this,n=this.schema.properties[t]||{};n=f({},n);var r=!!this.schema.properties[t];return this.schema.patternProperties&&Object.keys(this.schema.patternProperties).forEach((function(i){new RegExp(i).test(t)&&(n.allOf=n.allOf||[],n.allOf.push(e.schema.patternProperties[i]),r=!0)})),!r&&this.schema.additionalProperties&&"object"===zr(this.schema.additionalProperties)&&(n=f({},this.schema.additionalProperties)),n}},{key:"preBuild",value:function(){var t=this;if(qr(Jr(o.prototype),"preBuild",this).call(this),this.editors={},this.cached_editors={},this.format=this.options.layout||this.options.object_layout||this.schema.format||this.jsoneditor.options.object_layout||"normal",this.schema.properties=this.schema.properties||{},this.minwidth=0,this.maxwidth=0,this.options.table_row)Object.entries(this.schema.properties).forEach((function(e){var n=Vr(e,2),r=n[0],i=n[1],o=t.jsoneditor.getEditorClass(i);t.editors[r]=t.jsoneditor.createEditor(o,{jsoneditor:t.jsoneditor,schema:i,path:"".concat(t.path,".").concat(r),parent:t,compact:!0,required:!0},t.currentDepth+1),t.editors[r].preBuild();var a=t.editors[r].options.hidden?0:t.editors[r].options.grid_columns||t.editors[r].getNumColumns();t.minwidth+=a,t.maxwidth+=a})),this.no_link_holder=!0;else{if(this.options.table)throw new Error("Not supported yet");this.schema.defaultProperties||(this.jsoneditor.options.display_required_only||this.options.display_required_only?this.schema.defaultProperties=Object.keys(this.schema.properties).filter((function(e){return t.isRequiredObject({key:e,schema:t.schema.properties[e]})})):this.schema.defaultProperties=Object.keys(this.schema.properties)),this.maxwidth+=1,Array.isArray(this.schema.defaultProperties)&&this.schema.defaultProperties.forEach((function(e){t.addObjectProperty(e,!0),t.editors[e]&&(t.minwidth=Math.max(t.minwidth,t.editors[e].options.grid_columns||t.editors[e].getNumColumns()),t.maxwidth+=t.editors[e].options.grid_columns||t.editors[e].getNumColumns())}))}this.property_order=Object.keys(this.editors),this.property_order=this.property_order.sort((function(e,n){var r=t.editors[e].schema.propertyOrder,i=t.editors[n].schema.propertyOrder;return"number"!=typeof r&&(r=1e3),"number"!=typeof i&&(i=1e3),r-i}))}},{key:"addTab",value:function(t){var e=this,n=this.rows[t].schema&&("object"===this.rows[t].schema.type||"array"===this.rows[t].schema.type);this.tabs_holder&&(this.rows[t].tab_text=document.createElement("span"),this.rows[t].tab_text.textContent=n?this.rows[t].getHeaderText():void 0===this.schema.basicCategoryTitle?"Basic":this.schema.basicCategoryTitle,this.rows[t].tab=this.theme.getTopTab(this.rows[t].tab_text,this.getValidId(this.rows[t].tab_text.textContent)),this.rows[t].tab.addEventListener("click",(function(n){e.active_tab=e.rows[t].tab,e.refreshTabs(),n.preventDefault(),n.stopPropagation()})))}},{key:"addRow",value:function(t,e,n){var r=this.rows.length,i="object"===t.schema.type||"array"===t.schema.type;this.rows[r]=t,this.rows[r].rowPane=n,i?(this.addTab(r),this.theme.addTopTab(e,this.rows[r].tab)):void 0===this.basicTab?(this.addTab(r),this.basicTab=r,this.basicPane=n,this.theme.addTopTab(e,this.rows[r].tab)):(this.rows[r].tab=this.rows[this.basicTab].tab,this.rows[r].tab_text=this.rows[this.basicTab].tab_text,this.rows[r].rowPane=this.rows[this.basicTab].rowPane)}},{key:"refreshTabs",value:function(t){var e=this,n=void 0!==this.basicTab,r=!1;this.rows.forEach((function(i){i.tab&&i.rowPane&&i.rowPane.parentNode&&(n&&i.tab===e.rows[e.basicTab].tab&&r||(t?i.tab_text.textContent=i.getHeaderText():(n&&i.tab===e.rows[e.basicTab].tab&&(r=!0),i.tab===e.active_tab?e.theme.markTabActive(i):e.theme.markTabInactive(i))))}))}},{key:"build",value:function(){var t=this,e="categories"===this.format;if(this.rows=[],this.active_tab=null,this.options.table_row)this.editor_holder=this.container,Object.entries(this.editors).forEach((function(e){var n=Vr(e,2),r=n[0],i=n[1],o=t.theme.getTableCell();t.editor_holder.appendChild(o),i.setContainer(o),i.build(),i.postBuild(),i.setOptInCheckbox(i.header),t.editors[r].options.hidden&&(o.style.display="none"),t.editors[r].options.input_width&&(o.style.width=t.editors[r].options.input_width)}));else{if(this.options.table)throw new Error("Not supported yet");this.header="",this.options.compact||(this.header=document.createElement("label"),this.header.textContent=this.getTitle()),this.title=this.theme.getHeader(this.header),this.title.classList.add("je-object__title"),this.controls=this.theme.getButtonHolder(),this.controls.classList.add("je-object__controls"),this.container.appendChild(this.title),this.container.appendChild(this.controls),this.container.classList.add("je-object__container"),this.editjson_holder=this.theme.getModal(),this.editjson_textarea=this.theme.getTextareaInput(),this.editjson_textarea.classList.add("je-edit-json--textarea"),this.editjson_save=this.getButton("Save","save","Save"),this.editjson_save.classList.add("json-editor-btntype-save"),this.editjson_save.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.saveJSON()})),this.editjson_copy=this.getButton("Copy","copy","Copy"),this.editjson_copy.classList.add("json-editor-btntype-copy"),this.editjson_copy.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.copyJSON()})),this.editjson_cancel=this.getButton("Cancel","cancel","Cancel"),this.editjson_cancel.classList.add("json-editor-btntype-cancel"),this.editjson_cancel.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.hideEditJSON()})),this.editjson_holder.appendChild(this.editjson_textarea),this.editjson_holder.appendChild(this.editjson_save),this.editjson_holder.appendChild(this.editjson_copy),this.editjson_holder.appendChild(this.editjson_cancel),this.addproperty_holder=this.theme.getModal(),this.addproperty_list=document.createElement("div"),this.addproperty_list.classList.add("property-selector"),this.addproperty_add=this.getButton("add","add","add"),this.addproperty_add.classList.add("json-editor-btntype-add"),this.addproperty_input=this.theme.getFormInputField("text"),this.addproperty_input.setAttribute("placeholder","Property name..."),this.addproperty_input.classList.add("property-selector-input"),this.addproperty_add.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),t.addproperty_input.value){if(t.editors[t.addproperty_input.value])return void window.alert("there is already a property with that name");t.addObjectProperty(t.addproperty_input.value),t.editors[t.addproperty_input.value]&&t.editors[t.addproperty_input.value].disable(),t.onChange(!0)}})),this.addproperty_input.addEventListener("input",(function(t){t.target.previousSibling.childNodes.forEach((function(e){e.innerText.includes(t.target.value)?e.style.display="":e.style.display="none"}))})),this.addproperty_holder.appendChild(this.addproperty_list),this.addproperty_holder.appendChild(this.addproperty_input),this.addproperty_holder.appendChild(this.addproperty_add);var n=document.createElement("div");n.style.clear="both",this.addproperty_holder.appendChild(n),document.addEventListener("click",this.onOutsideModalClick),this.schema.description&&(this.description=this.theme.getDescription(this.schema.description),this.container.appendChild(this.description)),this.error_holder=document.createElement("div"),this.container.appendChild(this.error_holder),this.editor_holder=this.theme.getIndentedPanel(),this.container.appendChild(this.editor_holder),this.row_container=this.theme.getGridContainer(),e?(this.tabs_holder=this.theme.getTopTabHolder(this.getValidId(this.schema.title)),this.tabPanesContainer=this.theme.getTopTabContentHolder(this.tabs_holder),this.editor_holder.appendChild(this.tabs_holder)):(this.tabs_holder=this.theme.getTabHolder(this.getValidId(this.schema.title)),this.tabPanesContainer=this.theme.getTabContentHolder(this.tabs_holder),this.editor_holder.appendChild(this.row_container)),Object.values(this.editors).forEach((function(n){var r=t.theme.getTabContent(),i=t.theme.getGridColumn(),o=!(!n.schema||"object"!==n.schema.type&&"array"!==n.schema.type);if(r.isObjOrArray=o,e){if(o){var a=t.theme.getGridContainer();a.appendChild(i),r.appendChild(a),t.tabPanesContainer.appendChild(r),t.row_container=a}else void 0===t.row_container_basic&&(t.row_container_basic=t.theme.getGridContainer(),r.appendChild(t.row_container_basic),0===t.tabPanesContainer.childElementCount?t.tabPanesContainer.appendChild(r):t.tabPanesContainer.insertBefore(r,t.tabPanesContainer.childNodes[1])),t.row_container_basic.appendChild(i);t.addRow(n,t.tabs_holder,r),r.id=t.getValidId(n.schema.title)}else t.row_container.appendChild(i);n.setContainer(i),n.build(),n.postBuild(),n.setOptInCheckbox(n.header)})),this.rows[0]&&y(this.rows[0].tab,"click"),this.collapsed=!1,this.collapse_control=this.getButton("","collapse",this.translate("button_collapse")),this.collapse_control.classList.add("json-editor-btntype-toggle"),this.title.insertBefore(this.collapse_control,this.title.childNodes[0]),this.collapse_control.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.collapsed?(t.editor_holder.style.display="",t.collapsed=!1,t.setButtonText(t.collapse_control,"","collapse",t.translate("button_collapse"))):(t.editor_holder.style.display="none",t.collapsed=!0,t.setButtonText(t.collapse_control,"","expand",t.translate("button_expand")))})),this.options.collapsed&&y(this.collapse_control,"click"),this.schema.options&&void 0!==this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.collapse_control.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.collapse_control.style.display="none"),this.editjson_control=this.getButton("JSON","edit","Edit JSON"),this.editjson_control.classList.add("json-editor-btntype-editjson"),this.editjson_control.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.toggleEditJSON()})),this.controls.appendChild(this.editjson_control),this.controls.insertBefore(this.editjson_holder,this.controls.childNodes[0]),this.schema.options&&void 0!==this.schema.options.disable_edit_json?this.schema.options.disable_edit_json&&(this.editjson_control.style.display="none"):this.jsoneditor.options.disable_edit_json&&(this.editjson_control.style.display="none"),this.addproperty_button=this.getButton("Properties","edit_properties",this.translate("button_object_properties")),this.addproperty_button.classList.add("json-editor-btntype-properties"),this.addproperty_button.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.toggleAddProperty()})),this.controls.appendChild(this.addproperty_button),this.controls.insertBefore(this.addproperty_holder,this.controls.childNodes[1]),this.refreshAddProperties(),this.deactivateNonRequiredProperties()}this.options.table_row?(this.editor_holder=this.container,this.property_order.forEach((function(e){t.editor_holder.appendChild(t.editors[e].container)}))):(this.layoutEditors(),this.layoutEditors())}},{key:"deactivateNonRequiredProperties",value:function(){var t=this;(this.jsoneditor.options.show_opt_in||this.options.show_opt_in)&&Object.entries(this.editors).forEach((function(e){var n=Vr(e,2),r=n[0],i=n[1];t.isRequiredObject(i)||t.editors[r].deactivate()}))}},{key:"showEditJSON",value:function(){this.editjson_holder&&(this.hideAddProperty(),this.editjson_holder.style.left="".concat(this.editjson_control.offsetLeft,"px"),this.editjson_holder.style.top="".concat(this.editjson_control.offsetTop+this.editjson_control.offsetHeight,"px"),this.editjson_textarea.value=JSON.stringify(this.getValue(),null,2),this.disable(),this.editjson_holder.style.display="",this.editjson_control.disabled=!1,this.editing_json=!0)}},{key:"hideEditJSON",value:function(){this.editjson_holder&&this.editing_json&&(this.editjson_holder.style.display="none",this.enable(),this.editing_json=!1)}},{key:"copyJSON",value:function(){if(this.editjson_holder){var t=document.createElement("textarea");t.value=this.editjson_textarea.value,t.setAttribute("readonly",""),t.style.position="absolute",t.style.left="-9999px",document.body.appendChild(t),t.select(),document.execCommand("copy"),document.body.removeChild(t)}}},{key:"saveJSON",value:function(){if(this.editjson_holder)try{var t=JSON.parse(this.editjson_textarea.value);this.setValue(t),this.hideEditJSON(),this.onChange(!0)}catch(t){throw window.alert("invalid JSON"),t}}},{key:"toggleEditJSON",value:function(){this.editing_json?this.hideEditJSON():this.showEditJSON()}},{key:"insertPropertyControlUsingPropertyOrder",value:function(t,e,n){var r;this.schema.properties[t]&&(r=this.schema.properties[t].propertyOrder),"number"!=typeof r&&(r=1e3),e.propertyOrder=r;for(var i=0;i<n.childNodes.length;i++){var o=n.childNodes[i];if(e.propertyOrder<o.propertyOrder){this.addproperty_list.insertBefore(e,o),e=null;break}}e&&this.addproperty_list.appendChild(e)}},{key:"addPropertyCheckbox",value:function(t){var e,n=this,r=this.theme.getCheckbox();r.style.width="auto",e=this.schema.properties[t]&&this.schema.properties[t].title?this.schema.properties[t].title:t;var i=this.theme.getCheckboxLabel(e),o=this.theme.getFormControl(i,r);return o.style.paddingBottom=o.style.marginBottom=o.style.paddingTop=o.style.marginTop=0,o.style.height="auto",this.insertPropertyControlUsingPropertyOrder(t,o,this.addproperty_list),r.checked=t in this.editors,r.addEventListener("change",(function(){r.checked?n.addObjectProperty(t):n.removeObjectProperty(t),n.onChange(!0)})),this.addproperty_checkboxes[t]=r,r}},{key:"showAddProperty",value:function(){this.addproperty_holder&&(this.hideEditJSON(),this.addproperty_holder.style.left="".concat(this.addproperty_button.offsetLeft,"px"),this.addproperty_holder.style.top="".concat(this.addproperty_button.offsetTop+this.addproperty_button.offsetHeight,"px"),this.disable(),this.adding_property=!0,this.addproperty_button.disabled=!1,this.addproperty_holder.style.display="",this.refreshAddProperties())}},{key:"hideAddProperty",value:function(){this.addproperty_holder&&this.adding_property&&(this.addproperty_holder.style.display="none",this.enable(),this.adding_property=!1)}},{key:"toggleAddProperty",value:function(){this.adding_property?this.hideAddProperty():this.showAddProperty()}},{key:"removeObjectProperty",value:function(t){this.editors[t]&&(this.editors[t].unregister(),delete this.editors[t],this.refreshValue(),this.layoutEditors())}},{key:"getSchemaOnMaxDepth",value:function(t){return Object.keys(t).reduce((function(e,n){switch(n){case"$ref":return e;case"properties":case"items":return Nr(Nr({},e),{},Fr({},n,{}));case"additionalProperties":return Nr(Nr({},e),{},Fr({},n,!0));default:return Nr(Nr({},e),{},Fr({},n,t[n]))}}),{})}},{key:"addObjectProperty",value:function(t,e){if(!this.editors[t]){if(this.cached_editors[t]){if(this.editors[t]=this.cached_editors[t],e)return;this.editors[t].register()}else{if(!(this.canHaveAdditionalProperties()||this.schema.properties&&this.schema.properties[t]))return;var n=this.getPropertySchema(t);"number"!=typeof n.propertyOrder&&(n.propertyOrder=Object.keys(this.editors).length+1e3);var r=this.jsoneditor.getEditorClass(n),i=this.jsoneditor.options.max_depth;if(this.editors[t]=this.jsoneditor.createEditor(r,{jsoneditor:this.jsoneditor,schema:i&&this.currentDepth>=i?this.getSchemaOnMaxDepth(n):n,path:"".concat(this.path,".").concat(t),parent:this},this.currentDepth+1),this.editors[t].preBuild(),!e){var o=this.theme.getChildEditorHolder();this.editor_holder.appendChild(o),this.editors[t].setContainer(o),this.editors[t].build(),this.editors[t].postBuild(),this.editors[t].setOptInCheckbox(r.header),this.editors[t].activate()}this.cached_editors[t]=this.editors[t]}e||(this.refreshValue(),this.layoutEditors())}}},{key:"onOutsideModalClick",value:function(t){this.addproperty_holder&&!this.addproperty_holder.contains(t.path[0]||t.composedPath()[0])&&this.adding_property&&(t.preventDefault(),t.stopPropagation(),this.toggleAddProperty())}},{key:"onChildEditorChange",value:function(t){this.refreshValue(),qr(Jr(o.prototype),"onChildEditorChange",this).call(this,t)}},{key:"canHaveAdditionalProperties",value:function(){return"boolean"==typeof this.schema.additionalProperties?this.schema.additionalProperties:!this.jsoneditor.options.no_additional_properties}},{key:"destroy",value:function(){Object.values(this.cached_editors).forEach((function(t){return t.destroy()})),this.editor_holder&&(this.editor_holder.innerHTML=""),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.error_holder&&this.error_holder.parentNode&&this.error_holder.parentNode.removeChild(this.error_holder),this.editors=null,this.cached_editors=null,this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),this.editor_holder=null,document.removeEventListener("click",this.onOutsideModalClick),qr(Jr(o.prototype),"destroy",this).call(this)}},{key:"getValue",value:function(){if(this.dependenciesFulfilled){var t=qr(Jr(o.prototype),"getValue",this).call(this);return t&&(this.jsoneditor.options.remove_empty_properties||this.options.remove_empty_properties)&&Object.keys(t).forEach((function(e){var n;(void 0===(n=t[e])||""===n||n===Object(n)&&0===Object.keys(n).length&&n.constructor===Object)&&delete t[e]})),t}}},{key:"refreshValue",value:function(){var t=this;this.value={},Object.keys(this.editors).forEach((function(e){t.editors[e].isActive()&&(t.value[e]=t.editors[e].getValue())})),this.adding_property&&this.refreshAddProperties()}},{key:"refreshAddProperties",value:function(){var t=this;if(this.options.disable_properties||!1!==this.options.disable_properties&&this.jsoneditor.options.disable_properties)this.addproperty_button.style.display="none";else{var e,n=0,r=!1;Object.keys(this.editors).forEach((function(t){return n++})),e=this.canHaveAdditionalProperties()&&!(void 0!==this.schema.maxProperties&&n>=this.schema.maxProperties),this.addproperty_checkboxes&&(this.addproperty_list.innerHTML=""),this.addproperty_checkboxes={},Object.keys(this.cached_editors).forEach((function(i){t.addPropertyCheckbox(i),t.isRequiredObject(t.cached_editors[i])&&i in t.editors&&(t.addproperty_checkboxes[i].disabled=!0),void 0!==t.schema.minProperties&&n<=t.schema.minProperties?(t.addproperty_checkboxes[i].disabled=t.addproperty_checkboxes[i].checked,t.addproperty_checkboxes[i].checked||(r=!0)):i in t.editors?r=!0:e||v(t.schema.properties,i)?(t.addproperty_checkboxes[i].disabled=!1,r=!0):t.addproperty_checkboxes[i].disabled=!0})),this.canHaveAdditionalProperties()&&(r=!0),Object.keys(this.schema.properties).forEach((function(e){t.cached_editors[e]||(r=!0,t.addPropertyCheckbox(e))})),r?this.canHaveAdditionalProperties()?this.addproperty_add.disabled=!e:(this.addproperty_add.style.display="none",this.addproperty_input.style.display="none"):(this.hideAddProperty(),this.addproperty_button.style.display="none")}}},{key:"isRequiredObject",value:function(t){if(t)return"boolean"==typeof t.schema.required?t.schema.required:Array.isArray(this.schema.required)?this.schema.required.includes(t.key):!!this.jsoneditor.options.required_by_default}},{key:"setValue",value:function(t,e){var n=this;("object"!==zr(t=t||{})||Array.isArray(t))&&(t={}),Object.entries(this.cached_editors).forEach((function(r){var i=Vr(r,2),o=i[0],a=i[1];void 0!==t[o]?(n.addObjectProperty(o),a.setValue(t[o],e)):e||n.isRequiredObject(a)?a.setValue(a.getDefault(),e):n.removeObjectProperty(o)})),Object.entries(t).forEach((function(t){var r=Vr(t,2),i=r[0],o=r[1];n.cached_editors[i]||(n.addObjectProperty(i),n.editors[i]&&n.editors[i].setValue(o,e,!!n.editors[i].template))})),this.refreshValue(),this.layoutEditors(),this.onChange()}},{key:"showValidationErrors",value:function(t){var e=this,n=[],r=[];t.forEach((function(t){t.path===e.path?n.push(t):r.push(t)})),this.error_holder&&(n.length?(this.error_holder.innerHTML="",this.error_holder.style.display="",n.forEach((function(t){t.errorcount&&t.errorcount>1&&(t.message+=" (".concat(t.errorcount," errors)")),e.error_holder.appendChild(e.theme.getErrorMessage(t.message))}))):this.error_holder.style.display="none"),this.options.table_row&&(n.length?this.theme.addTableRowError(this.container):this.theme.removeTableRowError(this.container)),Object.values(this.editors).forEach((function(t){t.showValidationErrors(r)}))}}])&&Mr(e.prototype,n),r&&Mr(e,r),o}(B);function Zr(t){return(Zr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Qr(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Yr(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Xr(t,e,n){return(Xr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=ni(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Kr(t,e){return(Kr=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ti(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=ni(t);if(e){var i=ni(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ei(this,n)}}function ei(t,e){return!e||"object"!==Zr(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function ni(t){return(ni=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}Wr.rules={".je-object__title":"display:inline-block",".je-object__controls":"margin:0%200%200%2010px",".je-object__container":"position:relative",".je-object__property-checkbox":"margin:0;height:auto",".property-selector":"width:295px;max-height:160px;padding:5px%200;overflow-y:auto;overflow-x:hidden;padding-left:5px",".property-selector-input":"width:220px;margin-bottom:0;display:inline-block",".json-editor-btntype-toggle":"margin:0%2010px%200%200",".je-edit-json--textarea":"height:170px%20!important;width:300px%20!important;display:block"};var ri=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Kr(t,e)}(o,t);var e,n,r,i=ti(o);function o(){return Qr(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"preBuild",value:function(){this.schema.required=!0,Xr(ni(o.prototype),"preBuild",this).call(this)}},{key:"build",value:function(){var t=this;this.label="",this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.options.infoText)),this.options.compact&&this.container.classList.add("compact"),this.radioContainer=document.createElement("div"),this.radioGroup=[];for(var e=function(e){t.setValue(e.currentTarget.value),t.onChange(!0)},n=0;n<this.enum_values.length;n++){this.input=this.theme.getFormRadio({name:this.formname,id:"".concat(this.formname,"[").concat(n,"]"),value:this.enum_values[n]}),this.setInputAttributes(["id","value","name"]),this.input.addEventListener("change",e,!1),this.radioGroup.push(this.input);var r=this.theme.getFormRadioLabel(this.enum_display[n]);r.htmlFor=this.input.id;var i=this.theme.getFormRadioControl(r,this.input,!("horizontal"!==this.options.layout&&!this.options.compact));this.radioContainer.appendChild(i)}if(this.schema.readOnly||this.schema.readonly){this.always_disabled=!0;for(var o=0;o<this.radioGroup.length;o++)this.radioGroup[o].disabled=!0;this.radioContainer.classList.add("readonly")}var a=this.theme.getContainer();a.appendChild(this.radioContainer),a.dataset.containerFor="radio",this.input=a,this.control=this.theme.getFormControl(this.label,a,this.description,this.infoButton),this.container.appendChild(this.control),window.requestAnimationFrame((function(){t.input.parentNode&&t.afterInputReady()}))}},{key:"enable",value:function(){if(!this.always_disabled){for(var t=0;t<this.radioGroup.length;t++)this.radioGroup[t].disabled=!1;this.radioContainer.classList.remove("readonly"),Xr(ni(o.prototype),"enable",this).call(this)}}},{key:"disable",value:function(t){t&&(this.always_disabled=!0);for(var e=0;e<this.radioGroup.length;e++)this.radioGroup[e].disabled=!0;this.radioContainer.classList.add("readonly"),Xr(ni(o.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){this.radioContainer.parentNode&&this.radioContainer.parentNode.parentNode&&this.radioContainer.parentNode.parentNode.removeChild(this.radioContainer.parentNode),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),Xr(ni(o.prototype),"destroy",this).call(this)}},{key:"getNumColumns",value:function(){return 2}},{key:"setValue",value:function(t){for(var e=0;e<this.radioGroup.length;e++)if(this.radioGroup[e].value===t){this.radioGroup[e].checked=!0,this.value=t,this.onChange();break}}}])&&Yr(e.prototype,n),r&&Yr(e,r),o}(De);function ii(t){return(ii="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function oi(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function ai(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function si(t,e,n){return(si="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=hi(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function li(t,e){return(li=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ci(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=hi(t);if(e){var i=hi(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ui(this,n)}}function ui(t,e){return!e||"object"!==ii(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function hi(t){return(hi=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var di=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&li(t,e)}(o,t);var e,n,r,i=ci(o);function o(){return oi(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e,n){var r=si(hi(o.prototype),"setValue",this).call(this,t,e,n);void 0!==r&&r.changed&&this.sceditor_instance&&this.sceditor_instance.val(r.value)}},{key:"build",value:function(){this.options.format="textarea",si(hi(o.prototype),"build",this).call(this),this.input_type=this.schema.format,this.input.setAttribute("data-schemaformat",this.input_type)}},{key:"afterInputReady",value:function(){var t=this;if(window.sceditor){var e=this.expandCallbacks("sceditor",f({},{format:this.input_type,emoticonsEnabled:!1,width:"100%",height:300,readOnly:this.schema.readOnly||this.schema.readonly||this.schema.template},this.defaults.options.sceditor||{},this.options.sceditor||{},{element:this.input})),n=window.sceditor.instance(this.input);void 0===n&&window.sceditor.create(this.input,e),this.sceditor_instance=n||window.sceditor.instance(this.input),this.sceditor_instance.blur((function(){t.value=t.sceditor_instance.val(),t.sceditor_instance.updateOriginal(),t.is_dirty=!0,t.onChange(!0)})),this.theme.afterInputReady(this.input)}else si(hi(o.prototype),"afterInputReady",this).call(this)}},{key:"getNumColumns",value:function(){return 6}},{key:"enable",value:function(){!this.always_disabled&&this.sceditor_instance&&this.sceditor_instance.readOnly(!1),si(hi(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.sceditor_instance&&this.sceditor_instance.readOnly(!0),si(hi(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.sceditor_instance&&(this.sceditor_instance.destroy(),this.sceditor_instance=null),si(hi(o.prototype),"destroy",this).call(this)}}])&&ai(e.prototype,n),r&&ai(e,r),o}(G);function pi(t){return(pi="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function fi(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function yi(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function mi(t,e,n){return(mi="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=_i(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function vi(t,e){return(vi=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function bi(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=_i(t);if(e){var i=_i(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return gi(this,n)}}function gi(t,e){return!e||"object"!==pi(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function _i(t){return(_i=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var wi=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&vi(t,e)}(o,t);var e,n,r,i=bi(o);function o(){return fi(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){if(this.select2_instance){e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0);var n=this.updateValue(t);this.input.value=n,this.select2v4?this.select2_instance.val(n).trigger("change"):this.select2_instance.select2("val",n),this.onChange(!0)}else mi(_i(o.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t=this;if(window.jQuery&&window.jQuery.fn&&window.jQuery.fn.select2&&!this.select2_instance){var e=this.expandCallbacks("select2",f({},this.defaults.options.select2||{},this.options.select2||{}));this.newEnumAllowed=e.tags=!!e.tags&&"string"===this.schema.type,this.select2_instance=window.jQuery(this.input).select2(e),this.select2v4=v(this.select2_instance.select2,"amd"),this.selectChangeHandler=function(){var e=t.select2v4?t.select2_instance.val():t.select2_instance.select2("val");t.updateValue(e),t.onChange(!0)},this.select2_instance.on("change",this.selectChangeHandler),this.select2_instance.on("select2-blur",this.selectChangeHandler)}mi(_i(o.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){var e=this.enum_values[0];return t=this.typecast(t||""),this.enum_values.includes(t)?e=t:this.newEnumAllowed&&(e=this.addNewOption(t)?t:e),this.value=e,e}},{key:"addNewOption",value:function(t){var e,n=this.typecast(t),r=!1;return this.enum_values.includes(n)||""===n||(this.enum_options.push("".concat(n)),this.enum_display.push("".concat(n)),this.enum_values.push(n),this.schema.enum.push(n),(e=this.input.querySelector('option[value="'.concat(n,'"]')))?e.removeAttribute("data-select2-tag"):this.input.appendChild(new Option(n,n,!1,!1)).trigger("change"),r=!0),r}},{key:"enable",value:function(){this.always_disabled||this.select2_instance&&(this.select2v4?this.select2_instance.prop("disabled",!1):this.select2_instance.select2("enable",!0)),mi(_i(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.select2_instance&&(this.select2v4?this.select2_instance.prop("disabled",!0):this.select2_instance.select2("enable",!1)),mi(_i(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.select2_instance&&(this.select2_instance.select2("destroy"),this.select2_instance=null),mi(_i(o.prototype),"destroy",this).call(this)}}])&&yi(e.prototype,n),r&&yi(e,r),o}(De);function ki(t){return(ki="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function xi(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function ji(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Oi(t,e,n){return(Oi="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Ri(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Ci(t,e){return(Ci=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ei(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ri(t);if(e){var i=Ri(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Si(this,n)}}function Si(t,e){return!e||"object"!==ki(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ri(t){return(Ri=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Pi=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ci(t,e)}(o,t);var e,n,r,i=Ei(o);function o(){return xi(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){if(this.selectize_instance){e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0);var n=this.updateValue(t);this.input.value=n,this.selectize_instance.clear(!0),this.selectize_instance.setValue(n),this.onChange(!0)}else Oi(Ri(o.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t=this;if(window.jQuery&&window.jQuery.fn&&window.jQuery.fn.selectize&&!this.selectize_instance){var e=this.expandCallbacks("selectize",f({},this.defaults.options.selectize||{},this.options.selectize||{}));this.newEnumAllowed=e.create=!!e.create&&"string"===this.schema.type,this.selectize_instance=window.jQuery(this.input).selectize(e)[0].selectize,this.control.removeEventListener("change",this.multiselectChangeHandler),this.multiselectChangeHandler=function(e){t.updateValue(e),t.onChange(!0)},this.selectize_instance.on("change",this.multiselectChangeHandler)}Oi(Ri(o.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){var e=this.enum_values[0];return t=this.typecast(t||""),this.enum_values.includes(t)?e=t:this.newEnumAllowed&&(e=this.addNewOption(t)?t:e),this.value=e,e}},{key:"addNewOption",value:function(t){var e=this.typecast(t),n=!1;return this.enum_values.includes(e)||""===e||(this.enum_options.push("".concat(e)),this.enum_display.push("".concat(e)),this.enum_values.push(e),this.schema.enum.push(e),this.selectize_instance.addItem(e),this.selectize_instance.refreshOptions(!1),n=!0),n}},{key:"onWatchedFieldChange",value:function(){var t=this;Oi(Ri(o.prototype),"onWatchedFieldChange",this).call(this),this.selectize_instance&&(this.selectize_instance.clear(!0),this.selectize_instance.clearOptions(!0),this.enum_options.forEach((function(e,n){t.selectize_instance.addOption({value:e,text:t.enum_display[n]})})),this.selectize_instance.addItem("".concat(this.value),!0))}},{key:"enable",value:function(){!this.always_disabled&&this.selectize_instance&&this.selectize_instance.unlock(),Oi(Ri(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.selectize_instance&&this.selectize_instance.lock(),Oi(Ri(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.selectize_instance&&(this.selectize_instance.destroy(),this.selectize_instance=null),Oi(Ri(o.prototype),"destroy",this).call(this)}}])&&ji(e.prototype,n),r&&ji(e,r),o}(De);function Li(t){return(Li="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ti(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Ai(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Ii(t,e){return(Ii=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Di(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ni(t);if(e){var i=Ni(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Bi(this,n)}}function Bi(t,e){return!e||"object"!==Li(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ni(t){return(Ni=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Fi=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ii(t,e)}(o,t);var e,n,r,i=Di(o);function o(){return Ti(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"build",value:function(){var t=this;this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description));var e=this.formname.replace(/\W/g,"");if("function"==typeof SignaturePad){this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input);var n=document.createElement("div");n.classList.add("signature-container");var r=document.createElement("canvas");r.setAttribute("name",e),r.classList.add("signature"),n.appendChild(r),this.signaturePad=new window.SignaturePad(r,{onEnd:function(){this.signaturePad.isEmpty()?this.input.value="":this.input.value=this.signaturePad.toDataURL(),this.is_dirty=!0,this.refreshValue(),this.watch_listener(),this.jsoneditor.notifyWatchers(this.path),this.parent?this.parent.onChildEditorChange(this):this.jsoneditor.onChange()}});var i=document.createElement("div"),o=document.createElement("button");o.classList.add("tiny","button"),o.innerHTML="Clear signature",i.appendChild(o),n.appendChild(i),this.options.compact&&this.container.setAttribute("class","".concat(this.container.getAttribute("class")," compact")),(this.schema.readOnly||this.schema.readonly)&&(this.always_disabled=!0,Array.from(this.inputs).forEach((function(t){r.setAttribute("readOnly","readOnly"),t.disabled=!0}))),o.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.signaturePad.clear(),t.signaturePad.strokeEnd()})),this.control=this.theme.getFormControl(this.label,n,this.description),this.container.appendChild(this.control),this.refreshValue(),r.width=n.offsetWidth,this.options&&this.options.canvas_height?r.height=this.options.canvas_height:r.height="300"}else{var a=document.createElement("p");a.innerHTML="Signature pad is not available, please include SignaturePad from https://github.com/szimek/signature_pad",this.container.appendChild(a)}}},{key:"setValue",value:function(t){if("function"==typeof SignaturePad){var e=this.sanitize(t);if(this.value===e)return;return this.value=e,this.input.value=this.value,this.signaturePad.clear(),t&&""!==t&&this.signaturePad.fromDataURL(t),this.watch_listener(),this.jsoneditor.notifyWatchers(this.path),!1}}},{key:"destroy",value:function(){this.signaturePad.off(),delete this.signaturePad}}])&&Ai(e.prototype,n),r&&Ai(e,r),o}(G);n(159);function Vi(t){return(Vi="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Hi(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function zi(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Mi(t,e,n){return(Mi="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=$i(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function qi(t,e){return(qi=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ui(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=$i(t);if(e){var i=$i(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Gi(this,n)}}function Gi(t,e){return!e||"object"!==Vi(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function $i(t){return($i=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Ji=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&qi(t,e)}(o,t);var e,n,r,i=Ui(o);function o(){return Hi(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e,n){var r=Mi($i(o.prototype),"setValue",this).call(this,t,e,n);void 0!==r&&r.changed&&this.simplemde_instance&&this.simplemde_instance.value(r.value)}},{key:"build",value:function(){this.options.format="textarea",Mi($i(o.prototype),"build",this).call(this),this.input_type=this.schema.format,this.input.setAttribute("data-schemaformat",this.input_type)}},{key:"afterInputReady",value:function(){var t,e=this;window.SimpleMDE?(t=this.expandCallbacks("simplemde",f({},{height:300},this.defaults.options.simplemde||{},this.options.simplemde||{},{element:this.input})),this.simplemde_instance=new window.SimpleMDE(t),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&(this.simplemde_instance.codemirror.options.readOnly=!0),this.simplemde_instance.codemirror.on("change",(function(){e.value=e.simplemde_instance.value(),e.is_dirty=!0,e.onChange(!0)})),t.autorefresh&&this.startListening(this.simplemde_instance.codemirror,this.simplemde_instance.codemirror.state.autoRefresh={delay:250}),this.theme.afterInputReady(this.input)):Mi($i(o.prototype),"afterInputReady",this).call(this)}},{key:"getNumColumns",value:function(){return 6}},{key:"enable",value:function(){!this.always_disabled&&this.simplemde_instance&&(this.simplemde_instance.codemirror.options.readOnly=!1),Mi($i(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.simplemde_instance&&(this.simplemde_instance.codemirror.options.readOnly=!0),Mi($i(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.simplemde_instance&&(this.simplemde_instance.toTextArea(),this.simplemde_instance=null),Mi($i(o.prototype),"destroy",this).call(this)}},{key:"startListening",value:function(t,e){function n(){t.display.wrapper.offsetHeight?(this.stopListening(t,e),t.display.lastWrapHeight!==t.display.wrapper.clientHeight&&t.refresh()):e.timeout=window.setTimeout(n,e.delay)}e.timeout=window.setTimeout(n,e.delay),e.hurry=function(){window.clearTimeout(e.timeout),e.timeout=window.setTimeout(n,50)},t.on(window,"mouseup",e.hurry),t.on(window,"keyup",e.hurry)}},{key:"stopListening",value:function(t,e){window.clearTimeout(e.timeout),t.off(window,"mouseup",e.hurry),t.off(window,"keyup",e.hurry)}}])&&zi(e.prototype,n),r&&zi(e,r),o}(G);function Wi(t){return(Wi="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Zi(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Qi(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Yi(t,e,n){return(Yi="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=eo(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Xi(t,e){return(Xi=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ki(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=eo(t);if(e){var i=eo(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return to(this,n)}}function to(t,e){return!e||"object"!==Wi(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function eo(t){return(eo=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var no=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Xi(t,e)}(o,t);var e,n,r,i=Ki(o);function o(){return Zi(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"build",value:function(){var t=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.options.infoText)),this.options.compact&&this.container.classList.add("compact"),this.ratingContainer=document.createElement("div"),this.ratingContainer.classList.add("starrating"),void 0===this.schema.enum){var e=this.schema.maximum?this.schema.maximum:5;this.schema.exclusiveMaximum&&e--,this.enum_values=[];for(var n=0;n<e;n++)this.enum_values.push(n+1)}else this.enum_values=this.schema.enum;this.radioGroup=[];for(var r=function(e){e.preventDefault(),e.stopPropagation(),t.setValue(e.currentTarget.value),t.onChange(!0)},i=this.enum_values.length-1;i>-1;i--){var o=this.formname+(i+1),a=this.theme.getFormInputField("radio");a.name="".concat(this.formname,"[starrating]"),a.value=this.enum_values[i],a.id=o,a.addEventListener("change",r,!1),this.radioGroup.push(a);var s=document.createElement("label");s.htmlFor=o,s.title=this.enum_values[i],this.options.displayValue&&s.classList.add("starrating-display-enabled"),this.ratingContainer.appendChild(a),this.ratingContainer.appendChild(s)}if(this.options.displayValue&&(this.displayRating=document.createElement("div"),this.displayRating.classList.add("starrating-display"),this.displayRating.innerText=this.enum_values[0],this.ratingContainer.appendChild(this.displayRating)),this.schema.readOnly||this.schema.readonly){this.always_disabled=!0;for(var l=0;l<this.radioGroup.length;l++)this.radioGroup[l].disabled=!0;this.ratingContainer.classList.add("readonly")}var c=this.theme.getContainer();c.appendChild(this.ratingContainer),this.input=c,this.control=this.theme.getFormControl(this.label,c,this.description,this.infoButton),this.container.appendChild(this.control),this.refreshValue()}},{key:"enable",value:function(){if(!this.always_disabled){for(var t=0;t<this.radioGroup.length;t++)this.radioGroup[t].disabled=!1;this.ratingContainer.classList.remove("readonly"),Yi(eo(o.prototype),"enable",this).call(this)}}},{key:"disable",value:function(t){t&&(this.always_disabled=!0);for(var e=0;e<this.radioGroup.length;e++)this.radioGroup[e].disabled=!0;this.ratingContainer.classList.add("readonly"),Yi(eo(o.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){this.ratingContainer.parentNode&&this.ratingContainer.parentNode.parentNode&&this.ratingContainer.parentNode.parentNode.removeChild(this.ratingContainer.parentNode),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),Yi(eo(o.prototype),"destroy",this).call(this)}},{key:"getNumColumns",value:function(){return 2}},{key:"getValue",value:function(){if(this.dependenciesFulfilled)return"integer"===this.schema.type?""===this.value?void 0:1*this.value:this.value}},{key:"setValue",value:function(t){for(var e=0;e<this.radioGroup.length;e++)if(this.radioGroup[e].value==="".concat(t)){this.radioGroup[e].checked=!0,this.value=t,this.options.displayValue&&(this.displayRating.innerHTML=this.value),this.onChange(!0);break}}}])&&Qi(e.prototype,n),r&&Qi(e,r),o}(G);function ro(t){return(ro="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function io(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function oo(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function ao(t,e,n){return(ao="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=uo(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function so(t,e){return(so=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function lo(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=uo(t);if(e){var i=uo(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return co(this,n)}}function co(t,e){return!e||"object"!==ro(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function uo(t){return(uo=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}no.rules={".starrating":"direction:rtl;display:inline-block;white-space:nowrap",".starrating > input":"display:none",".starrating > label:before":"content:'%5C2606';margin:1px;font-size:18px;font-style:normal;font-weight:400;line-height:1;font-family:'Arial';display:inline-block",".starrating > label":"color:%23888;cursor:pointer;margin:8px%200%202px%200",".starrating > label.starrating-display-enabled":"margin:1px%200%200%200",".starrating > input:checked ~ label":"color:%23ffca08",".starrating:not(.readonly) > input:hover ~ label":"color:%23ffca08",".starrating > input:checked ~ label:before":"content:'%5C2605';text-shadow:0%200%201px%20rgba(0%2C20%2C20%2C1)",".starrating:not(.readonly) > input:hover ~ label:before":"content:'%5C2605';text-shadow:0%200%201px%20rgba(0%2C20%2C20%2C1)",".starrating .starrating-display":"position:relative;direction:rtl;text-align:center;font-size:10px;line-height:0px"};var ho=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&so(t,e)}(o,t);var e,n,r,i=lo(o);function o(){return io(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"build",value:function(){ao(uo(o.prototype),"build",this).call(this),this.input.setAttribute("type","number"),this.input.getAttribute("step")||this.input.setAttribute("step","1");var t=this.theme.getStepperButtons(this.input);this.control.appendChild(t),this.stepperDown=this.control.querySelector(".stepper-down"),this.stepperUp=this.control.querySelector(".stepper-up")}},{key:"enable",value:function(){ao(uo(o.prototype),"enable",this).call(this),this.stepperDown.removeAttribute("disabled"),this.stepperUp.removeAttribute("disabled")}},{key:"disable",value:function(){ao(uo(o.prototype),"disable",this).call(this),this.stepperDown.setAttribute("disabled",!0),this.stepperUp.setAttribute("disabled",!0)}}])&&oo(e.prototype,n),r&&oo(e,r),o}(tr);function po(t){return(po="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function fo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function yo(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function mo(t,e,n){return(mo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=_o(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function vo(t,e){return(vo=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function bo(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=_o(t);if(e){var i=_o(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return go(this,n)}}function go(t,e){return!e||"object"!==po(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function _o(t){return(_o=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var wo=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&vo(t,e)}(o,t);var e,n,r,i=bo(o);function o(){return fo(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"register",value:function(){if(mo(_o(o.prototype),"register",this).call(this),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].register()}},{key:"unregister",value:function(){if(mo(_o(o.prototype),"unregister",this).call(this),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].unregister()}},{key:"getNumColumns",value:function(){return Math.max(Math.min(12,this.width),3)}},{key:"preBuild",value:function(){var t=this.jsoneditor.expandRefs(this.schema.items||{});this.item_title=t.title||"row",this.item_default=t.default||null,this.item_has_child_editors=t.properties||t.items,this.width=12,mo(_o(o.prototype),"preBuild",this).call(this)}},{key:"build",value:function(){this.table=this.theme.getTable(),this.container.appendChild(this.table),this.thead=this.theme.getTableHead(),this.table.appendChild(this.thead),this.header_row=this.theme.getTableRow(),this.thead.appendChild(this.header_row),this.row_holder=this.theme.getTableBody(),this.table.appendChild(this.row_holder);var t=this.getElementEditor(0,!0);if(this.item_default=t.getDefault(),this.width=t.getNumColumns()+2,this.options.compact?(this.panel=document.createElement("div"),this.container.appendChild(this.panel)):(this.header=document.createElement("label"),this.header.textContent=this.getTitle(),this.title=this.theme.getHeader(this.header),this.container.appendChild(this.title),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.schema.description&&(this.description=this.theme.getDescription(this.schema.description),this.container.appendChild(this.description)),this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.error_holder=document.createElement("div"),this.panel.appendChild(this.error_holder)),this.panel.appendChild(this.table),this.controls=this.theme.getButtonHolder(),this.panel.appendChild(this.controls),this.item_has_child_editors)for(var e=t.getChildEditors(),n=t.property_order||Object.keys(e),r=0;r<n.length;r++){var i=this.theme.getTableHeaderCell(e[n[r]].getTitle());e[n[r]].options.hidden&&(i.style.display="none"),this.header_row.appendChild(i)}else this.header_row.appendChild(this.theme.getTableHeaderCell(this.item_title));t.destroy(),this.row_holder.innerHTML="",this.controls_header_cell=this.theme.getTableHeaderCell(" "),this.header_row.appendChild(this.controls_header_cell),this.addControls()}},{key:"onChildEditorChange",value:function(t){this.refreshValue(),mo(_o(o.prototype),"onChildEditorChange",this).call(this)}},{key:"getItemDefault",value:function(){return f({},{default:this.item_default}).default}},{key:"getItemTitle",value:function(){return this.item_title}},{key:"getElementEditor",value:function(t,e){var n=f({},this.schema.items),r=this.jsoneditor.getEditorClass(n,this.jsoneditor),i=this.row_holder.appendChild(this.theme.getTableRow()),o=i;this.item_has_child_editors||(o=this.theme.getTableCell(),i.appendChild(o));var a=this.jsoneditor.createEditor(r,{jsoneditor:this.jsoneditor,schema:n,container:o,path:"".concat(this.path,".").concat(t),parent:this,compact:!0,table_row:!0});return a.preBuild(),e||(a.build(),a.postBuild(),a.controls_cell=i.appendChild(this.theme.getTableCell()),a.row=i,a.table_controls=this.theme.getButtonHolder(),a.controls_cell.appendChild(a.table_controls),a.table_controls.style.margin=0,a.table_controls.style.padding=0),a}},{key:"destroy",value:function(){this.innerHTML="",this.checkParent(this.title)&&this.title.parentNode.removeChild(this.title),this.checkParent(this.description)&&this.description.parentNode.removeChild(this.description),this.checkParent(this.row_holder)&&this.row_holder.parentNode.removeChild(this.row_holder),this.checkParent(this.table)&&this.table.parentNode.removeChild(this.table),this.checkParent(this.panel)&&this.panel.parentNode.removeChild(this.panel),this.rows=this.title=this.description=this.row_holder=this.table=this.panel=null,mo(_o(o.prototype),"destroy",this).call(this)}},{key:"ensureArraySize",value:function(t){if(Array.isArray(t)||(t=[t]),this.schema.minItems)for(;t.length<this.schema.minItems;)t.push(this.getItemDefault());return this.schema.maxItems&&t.length>this.schema.maxItems&&(t=t.slice(0,this.schema.maxItems)),t}},{key:"setValue",value:function(){var t=this,e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],n=arguments.length>1?arguments[1]:void 0;e=this.ensureArraySize(e);var r=JSON.stringify(e);if(r!==this.serialized){var i=!1;e.forEach((function(e,n){t.rows[n]?t.rows[n].setValue(e):(t.addRow(e),i=!0)}));for(var o=e.length;o<this.rows.length;o++){var a=this.rows[o].container;this.item_has_child_editors||this.rows[o].row.parentNode.removeChild(this.rows[o].row),this.rows[o].destroy(),a.parentNode&&a.parentNode.removeChild(a),this.rows[o]=null,i=!0}this.rows=this.rows.slice(0,e.length),this.refreshValue(),(i||n)&&this.refreshRowButtons(),this.onChange()}}},{key:"refreshRowButtons",value:function(){var t=this,e=this.schema.minItems&&this.schema.minItems>=this.rows.length,n=this.schema.maxItems&&this.schema.maxItems<=this.rows.length,r=[];this.rows.forEach((function(i,o){if(i.delete_button){var a=!e;t.setVisibility(i.delete_button,a),r.push(a)}if(i.copy_button){var s=!n;t.setVisibility(i.copy_button,s),r.push(s)}if(i.moveup_button){var l=0!==o;t.setVisibility(i.moveup_button,l),r.push(l)}if(i.movedown_button){var c=o!==t.rows.length-1;t.setVisibility(i.movedown_button,c),r.push(c)}}));var i=r.some((function(t){return t}));this.rows.forEach((function(e){return t.setVisibility(e.controls_cell,i)})),this.setVisibility(this.controls_header_cell,i),this.setVisibility(this.table,this.value.length);var o=!(n||this.hide_add_button);this.setVisibility(this.add_row_button,o);var a=!(!this.value.length||e||this.hide_delete_last_row_buttons);this.setVisibility(this.delete_last_row_button,a);var s=!(this.value.length<=1||e||this.hide_delete_all_rows_buttons);this.setVisibility(this.remove_all_rows_button,s);var l=o||a||s;this.setVisibility(this.controls,l)}},{key:"refreshValue",value:function(){var t=this;this.value=[],this.rows.forEach((function(e,n){t.value[n]=e.getValue()})),this.serialized=JSON.stringify(this.value)}},{key:"addRow",value:function(t){var e=this.rows.length;this.rows[e]=this.getElementEditor(e);var n=this.rows[e].table_controls;this.hide_delete_buttons||(this.rows[e].delete_button=this._createDeleteButton(e,n)),this.show_copy_button&&(this.rows[e].copy_button=this._createCopyButton(e,n)),this.hide_move_buttons||(this.rows[e].moveup_button=this._createMoveUpButton(e,n)),this.hide_move_buttons||(this.rows[e].movedown_button=this._createMoveDownButton(e,n)),t&&this.rows[e].setValue(t)}},{key:"_createDeleteButton",value:function(t,e){var n=this,r=this.getButton("","delete",this.translate("button_delete_row_title_short"));return r.classList.add("delete","json-editor-btntype-delete"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){if(t.preventDefault(),t.stopPropagation(),!n.askConfirmation())return!1;var e=1*t.currentTarget.getAttribute("data-i"),r=n.getValue();r.splice(e,1),n.setValue(r),n.onChange(!0),n.jsoneditor.trigger("deleteRow",n.rows[e])})),e.appendChild(r),r}},{key:"_createCopyButton",value:function(t,e){var n=this,r=this.getButton("","copy",this.translate("button_copy_row_title_short"));return r.classList.add("copy","json-editor-btntype-copy"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i"),r=n.getValue();r.splice(e+1,0,r[e]),n.setValue(r),n.onChange(!0),n.jsoneditor.trigger("copyRow",n.rows[e+1])})),e.appendChild(r),r}},{key:"_createMoveUpButton",value:function(t,e){var n=this,r=this.getButton("","moveup",this.translate("button_move_up_title"));return r.classList.add("moveup","json-editor-btntype-move"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i"),r=n.getValue();r.splice(e-1,0,r.splice(e,1)[0]),n.setValue(r),n.onChange(!0),n.jsoneditor.trigger("moveRow",n.rows[e-1])})),e.appendChild(r),r}},{key:"_createMoveDownButton",value:function(t,e){var n=this,r=this.getButton("","movedown",this.translate("button_move_down_title"));return r.classList.add("movedown","json-editor-btntype-move"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i"),r=n.getValue();r.splice(e+1,0,r.splice(e,1)[0]),n.setValue(r),n.onChange(!0),n.jsoneditor.trigger("moveRow",n.rows[e+1])})),e.appendChild(r),r}},{key:"addControls",value:function(){var t=this;this.collapsed=!1,this.toggle_button=this._createToggleButton(),this.title_controls&&(this.title.insertBefore(this.toggle_button,this.title.childNodes[0]),this.toggle_button.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.setVisibility(t.panel,t.collapsed),t.collapsed?(t.collapsed=!1,t.setButtonText(e.currentTarget,"","collapse",t.translate("button_collapse"))):(t.collapsed=!0,t.setButtonText(e.currentTarget,"","expand",t.translate("button_expand")))})),this.options.collapsed&&y(this.toggle_button,"click"),this.schema.options&&void 0!==this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none")),this.add_row_button=this._createAddRowButton(),this.delete_last_row_button=this._createDeleteLastRowButton(),this.remove_all_rows_button=this._createRemoveAllRowsButton()}},{key:"_createToggleButton",value:function(){var t=this.getButton("","collapse",this.translate("button_collapse"));return t.classList.add("json-editor-btntype-toggle"),t}},{key:"_createAddRowButton",value:function(){var t=this,e=this.getButton(this.getItemTitle(),"add",this.translate("button_add_row_title",[this.getItemTitle()]));return e.classList.add("json-editor-btntype-add"),e.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation();var n=t.addRow();t.refreshValue(),t.refreshRowButtons(),t.onChange(!0),t.jsoneditor.trigger("addRow",n)})),this.controls.appendChild(e),e}},{key:"_createDeleteLastRowButton",value:function(){var t=this,e=this.getButton(this.translate("button_delete_last",[this.getItemTitle()]),"subtract",this.translate("button_delete_last_title",[this.getItemTitle()]));return e.classList.add("json-editor-btntype-deletelast"),e.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),!t.askConfirmation())return!1;var n=t.getValue(),r=n.pop();t.setValue(n),t.onChange(!0),t.jsoneditor.trigger("deleteRow",r)})),this.controls.appendChild(e),e}},{key:"_createRemoveAllRowsButton",value:function(){var t=this,e=this.getButton(this.translate("button_delete_all"),"delete",this.translate("button_delete_all_title"));return e.classList.add("json-editor-btntype-deleteall"),e.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),!t.askConfirmation())return!1;t.setValue([]),t.onChange(!0),t.jsoneditor.trigger("deleteAllRows")})),this.controls.appendChild(e),e}}])&&yo(e.prototype,n),r&&yo(e,r),o}(ct);n(135);function ko(t){return(ko="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function xo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function jo(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Oo(t,e,n){return(Oo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Ro(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Co(t,e){return(Co=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Eo(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ro(t);if(e){var i=Ro(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return So(this,n)}}function So(t,e){return!e||"object"!==ko(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ro(t){return(Ro=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Po(t){return(Po="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Lo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function To(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Ao(t,e,n){return(Ao="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=No(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Io(t,e){return(Io=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Do(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=No(t);if(e){var i=No(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Bo(this,n)}}function Bo(t,e){return!e||"object"!==Po(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function No(t){return(No=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Fo(t){return(Fo="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Vo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Ho(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function zo(t,e,n){return(zo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Go(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Mo(t,e){return(Mo=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function qo(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Go(t);if(e){var i=Go(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Uo(this,n)}}function Uo(t,e){return!e||"object"!==Fo(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Go(t){return(Go=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var $o={ace:tt,array:ct,arrayChoices:Et,arraySelect2:Bt,arraySelectize:Gt,autocomplete:te,base64:ce,button:ve,checkbox:Ce,choices:Ue,datetime:Ke,describedBy:cn,enum:_n,hidden:Rn,info:Nn,integer:tr,ip:cr,jodit:br,multiple:Er,multiselect:bt,null:Dr,number:$n,object:Wr,radio:ri,sceditor:di,select:De,select2:wi,selectize:Pi,signature:Fi,simplemde:Ji,starrating:no,stepper:ho,string:G,table:wo,upload:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Co(t,e)}(o,t);var e,n,r,i=Eo(o);function o(){return xo(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getNumColumns",value:function(){return 4}},{key:"build",value:function(){var t=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.options.infoText)),this.options=this.expandCallbacks("upload",f({},{title:"Browse",icon:"",auto_upload:!1,hide_input:!1,enable_drag_drop:!1,drop_zone_text:"Drag & Drop file here",drop_zone_top:!1,alt_drop_zone:"",mime_type:"",max_upload_size:0,upload_handler:function(t,e,n,r){window.alert('No upload_handler defined for "'.concat(t.path,'". You must create your own handler to enable upload to server'))}},this.defaults.options.upload||{},this.options.upload||{})),this.options.mime_type=this.options.mime_type?[].concat(this.options.mime_type):[],this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input),!this.schema.readOnly&&!this.schema.readonly){if("function"!=typeof this.options.upload_handler)throw new Error("Upload handler required for upload editor");if(this.uploader=this.theme.getFormInputField("file"),this.uploader.style.display="none",this.options.mime_type.length&&this.uploader.setAttribute("accept",this.options.mime_type),!0===this.options.enable_drag_drop&&!0===this.options.hide_input||(this.clickHandler=function(e){t.uploader.dispatchEvent(new window.MouseEvent("click",{view:window,bubbles:!0,cancelable:!1}))},this.browseButton=this.getButton(this.options.title,this.options.icon,this.options.title),this.browseButton.addEventListener("click",this.clickHandler),this.fileDisplay=this.theme.getFormInputField("input"),this.fileDisplay.setAttribute("readonly",!0),this.fileDisplay.value="No file selected.",this.fileDisplay.addEventListener("dblclick",this.clickHandler),this.fileUploadGroup=this.theme.getInputGroup(this.fileDisplay,[this.browseButton]),this.fileUploadGroup||(this.fileUploadGroup=document.createElement("div"),this.fileUploadGroup.appendChild(this.fileDisplay),this.fileUploadGroup.appendChild(this.browseButton))),!0===this.options.enable_drag_drop){if(""!==this.options.alt_drop_zone){if(this.altDropZone=document.querySelector(this.options.alt_drop_zone),!this.altDropZone)throw new Error('Error: alt_drop_zone selector "'.concat(this.options.alt_drop_zone,'" not found!'));this.dropZone=this.altDropZone}else this.dropZone=this.theme.getDropZone(this.options.drop_zone_text);this.dropZone&&(this.dropZone.classList.add("upload-dropzone"),this.dropZone.addEventListener("dblclick",this.clickHandler))}this.uploadHandler=function(e){e.preventDefault(),e.stopPropagation();var n=e.target.files||e.dataTransfer.files;if(n&&n.length)if(0!==t.options.max_upload_size&&n[0].size>t.options.max_upload_size)t.theme.addInputError(t.uploader,"Filesize too large. Max size is ".concat(t.options.max_upload_size));else if(0===t.options.mime_type.length||t.isValidMimeType(n[0].type,t.options.mime_type)){t.fileDisplay&&(t.fileDisplay.value=n[0].name);var r=new window.FileReader;r.onload=function(e){t.preview_value=e.target.result,t.refreshPreview(n),t.onChange(!0),r=null},r.readAsDataURL(n[0])}else t.theme.addInputError(t.uploader,"Wrong file format. Allowed format(s): ".concat(t.options.mime_type.toString()))},this.uploader.addEventListener("change",this.uploadHandler),this.dragHandler=function(e){var n=e.dataTransfer.items||e.dataTransfer.files,r=n&&n.length&&(0===t.options.mime_type.length||t.isValidMimeType(n[0].type,t.options.mime_type)),i=e.currentTarget.classList&&e.currentTarget.classList.contains("upload-dropzone")&&r;switch((e.currentTarget===window?"w_":"e_")+e.type){case"w_drop":case"w_dragover":i||(e.dataTransfer.dropEffect="none");break;case"e_dragenter":i?(t.dropZone.classList.add("valid-dropzone"),e.dataTransfer.dropEffect="copy"):t.dropZone.classList.add("invalid-dropzone");break;case"e_dragover":i&&(e.dataTransfer.dropEffect="copy");break;case"e_dragleave":t.dropZone.classList.remove("valid-dropzone","invalid-dropzone");break;case"e_drop":t.dropZone.classList.remove("valid-dropzone","invalid-dropzone"),i&&t.uploadHandler(e)}i||e.preventDefault()},!0===this.options.enable_drag_drop&&(["dragover","drop"].forEach((function(e){window.addEventListener(e,t.dragHandler,!0)})),["dragenter","dragover","dragleave","drop"].forEach((function(e){t.dropZone.addEventListener(e,t.dragHandler,!0)})))}this.preview=document.createElement("div"),this.control=this.input.controlgroup=this.theme.getFormControl(this.label,this.uploader||this.input,this.description,this.infoButton),this.uploader&&(this.uploader.controlgroup=this.control);var e=this.uploader||this.input,n=document.createElement("div");this.dropZone&&!this.altDropZone&&!0===this.options.drop_zone_top&&n.appendChild(this.dropZone),this.fileUploadGroup&&n.appendChild(this.fileUploadGroup),this.dropZone&&!this.altDropZone&&!0!==this.options.drop_zone_top&&n.appendChild(this.dropZone),n.appendChild(this.preview),e.parentNode.insertBefore(n,e.nextSibling),this.container.appendChild(this.control),window.requestAnimationFrame((function(){t.afterInputReady()}))}},{key:"afterInputReady",value:function(){var t=this;if(this.value){var e=document.createElement("img");e.style.maxWidth="100%",e.style.maxHeight="100px",e.onload=function(n){t.preview.appendChild(e)},e.onerror=function(t){console.error("upload error",t,t.currentTarget)},e.src=this.container.querySelector("a").href}this.theme.afterInputReady(this.input)}},{key:"refreshPreview",value:function(t){var e=this;if(this.last_preview!==this.preview_value&&(this.last_preview=this.preview_value,this.preview.innerHTML="",this.preview_value)){var n=t[0],r=this.preview_value.match(/^data:([^;,]+)[;,]/);if(n.mimeType=r?r[1]:"unknown",n.size>0){var i=Math.floor(Math.log(n.size)/Math.log(1024));n.formattedSize="".concat(parseFloat((n.size/Math.pow(1024,i)).toFixed(2))," ").concat(["Bytes","KB","MB","GB","TB","PB","EB","ZB","YB"][i])}else n.formattedSize="0 Bytes";var o=this.getButton("Upload","upload","Upload");o.addEventListener("click",(function(t){t.preventDefault(),o.setAttribute("disabled","disabled"),e.theme.removeInputError(e.uploader),e.theme.getProgressBar&&(e.progressBar=e.theme.getProgressBar(),e.preview.appendChild(e.progressBar)),e.options.upload_handler(e.path,n,{success:function(t){e.setValue(t),e.parent?e.parent.onChildEditorChange(e):e.jsoneditor.onChange(),e.progressBar&&e.preview.removeChild(e.progressBar),o.removeAttribute("disabled")},failure:function(t){e.theme.addInputError(e.uploader,t),e.progressBar&&e.preview.removeChild(e.progressBar),o.removeAttribute("disabled")},updateProgress:function(t){e.progressBar&&(t?e.theme.updateProgressBar(e.progressBar,t):e.theme.updateProgressBarUnknown(e.progressBar))}})})),this.preview.appendChild(this.theme.getUploadPreview(n,o,this.preview_value)),this.options.auto_upload&&(o.dispatchEvent(new window.MouseEvent("click")),this.preview.removeChild(o))}}},{key:"enable",value:function(){this.always_disabled||(this.uploader&&(this.uploader.disabled=!1),Oo(Ro(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.uploader&&(this.uploader.disabled=!0),Oo(Ro(o.prototype),"disable",this).call(this)}},{key:"setValue",value:function(t){this.value!==t&&(this.value=t,this.input.value=this.value,this.onChange())}},{key:"destroy",value:function(){var t=this;!0===this.options.enable_drag_drop&&(["dragover","drop"].forEach((function(e){window.removeEventListener(e,t.dragHandler,!0)})),["dragenter","dragover","dragleave","drop"].forEach((function(e){t.dropZone.removeEventListener(e,t.dragHandler,!0)})),this.dropZone.removeEventListener("dblclick",this.clickHandler),this.dropZone&&this.dropZone.parentNode&&this.dropZone.parentNode.removeChild(this.dropZone)),this.uploader&&this.uploader.parentNode&&(this.uploader.removeEventListener("change",this.uploadHandler),this.uploader.parentNode.removeChild(this.uploader)),this.browseButton&&this.browseButton.parentNode&&(this.browseButton.removeEventListener("click",this.clickHandler),this.browseButton.parentNode.removeChild(this.browseButton)),this.fileDisplay&&this.fileDisplay.parentNode&&(this.fileDisplay.removeEventListener("dblclick",this.clickHandler),this.fileDisplay.parentNode.removeChild(this.fileDisplay)),this.fileUploadGroup&&this.fileUploadGroup.parentNode&&this.fileUploadGroup.parentNode.removeChild(this.fileUploadGroup),this.preview&&this.preview.parentNode&&this.preview.parentNode.removeChild(this.preview),this.header&&this.header.parentNode&&this.header.parentNode.removeChild(this.header),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),Oo(Ro(o.prototype),"destroy",this).call(this)}},{key:"isValidMimeType",value:function(t,e){return e.reduce((function(e,n){return e||new RegExp(n.replace(/\*/g,".*"),"gi").test(t)}),!1)}}])&&jo(e.prototype,n),r&&jo(e,r),o}(B),uuid:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Io(t,e)}(o,t);var e,n,r,i=Do(o);function o(){return Lo(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"preBuild",value:function(){Ao(No(o.prototype),"preBuild",this).call(this),this.schema.default=this.uuid=this.getUuid(),this.schema.options||(this.schema.options={}),this.schema.options.cleave||(this.schema.options.cleave={delimiters:["-"],blocks:[8,4,4,4,12]})}},{key:"build",value:function(){Ao(No(o.prototype),"build",this).call(this),this.always_disabled=!0,this.input.setAttribute("readonly","true")}},{key:"sanitize",value:function(t){return this.testUuid(t)||(t=this.uuid),t}},{key:"setValue",value:function(t,e,n){this.testUuid(t)||(t=this.uuid),this.uuid=t,Ao(No(o.prototype),"setValue",this).call(this,t,e,n)}},{key:"getUuid",value:function(){var t=(new Date).getTime();return"undefined"!=typeof performance&&"function"==typeof performance.now&&(t+=performance.now()),"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(function(e){var n=(t+16*Math.random())%16|0;return t=Math.floor(t/16),("x"===e?n:3&n|8).toString(16)}))}},{key:"testUuid",value:function(t){return/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(t)}}])&&To(e.prototype,n),r&&To(e,r),o}(G),colorpicker:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Mo(t,e)}(o,t);var e,n,r,i=qo(o);function o(){return Vo(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"postBuild",value:function(){window.Picker&&(this.input.type="text"),this.input.style.padding="3px"}},{key:"setValue",value:function(t,e,n){var r=zo(Go(o.prototype),"setValue",this).call(this,t,e,n);return this.picker_instance&&this.picker_instance.domElement&&r&&r.changed&&this.picker_instance.setColor(r.value,!0),r}},{key:"getNumColumns",value:function(){return 2}},{key:"afterInputReady",value:function(){zo(Go(o.prototype),"afterInputReady",this).call(this),this.createPicker(!0)}},{key:"disable",value:function(){if(zo(Go(o.prototype),"disable",this).call(this),this.picker_instance&&this.picker_instance.domElement){this.picker_instance.domElement.style.pointerEvents="none";for(var t=this.picker_instance.domElement.querySelectorAll("button"),e=0;e<t.length;e++)t[e].disabled=!0}}},{key:"enable",value:function(){if(zo(Go(o.prototype),"enable",this).call(this),this.picker_instance&&this.picker_instance.domElement){this.picker_instance.domElement.style.pointerEvents="auto";for(var t=this.picker_instance.domElement.querySelectorAll("button"),e=0;e<t.length;e++)t[e].disabled=!1}}},{key:"destroy",value:function(){this.createPicker(!1),zo(Go(o.prototype),"destroy",this).call(this)}},{key:"createPicker",value:function(t){var e=this;if(t){if(window.Picker&&!this.picker_instance){var n=this.expandCallbacks("colorpicker",f({},{editor:!1,alpha:!1,color:this.value,popup:"bottom"},this.defaults.options.colorpicker||{},this.options.colorpicker||{},{parent:this.container})),r=function(t){var n=e.picker_instance.settings.editorFormat,r=e.picker_instance.settings.alpha;e.setValue("hex"===n?r?t.hex:t.hex.slice(0,7):t["".concat(n+(r?"a":""),"String")])};n.popup||"function"==typeof n.onChange?n.popup&&"function"!=typeof n.onDone&&(n.onDone=r):n.onChange=r,this.picker_instance=new window.Picker(n),n.popup||(this.input.style.display="none",this.theme.afterInputReady(this.picker_instance.domElement))}}else this.picker_instance&&(this.picker_instance.destroy(),this.picker_instance=null,this.input.style.display="")}}])&&Ho(e.prototype,n),r&&Ho(e,r),o}(G)},Jo=(n(162),{default:function(){return{compile:function(t){var e=t.match(/{{\s*([a-zA-Z0-9\-_ .]+)\s*}}/g),n=e&&e.length;if(!n)return function(){return t};for(var r=[],i=function(t){var n,i,o=e[t].replace(/[{}]+/g,"").trim().split("."),a=o.length;a>1?n=function(e){for(i=e,t=0;t<a&&(i=i[o[t]]);t++);return i}:(o=o[0],n=function(t){return t[o]});r.push({s:e[t],r:n})},o=0;o<n;o++)i(o);return function(e){var i,a="".concat(t);for(o=0;o<n;o++)i=r[o],a=a.replace(i.s,i.r(e));return a}}}},ejs:function(){return!!window.EJS&&{compile:function(t){var e=new window.EJS({text:t});return function(t){return e.render(t)}}}},handlebars:function(){return window.Handlebars},hogan:function(){return!!window.Hogan&&{compile:function(t){var e=window.Hogan.compile(t);return function(t){return e.render(t)}}}},lodash:function(){return!!window._&&{compile:function(t){return function(e){return window._.template(t)(e)}}}},markup:function(){return!(!window.Mark||!window.Mark.up)&&{compile:function(t){return function(e){return window.Mark.up(t,e)}}}},mustache:function(){return!!window.Mustache&&{compile:function(t){return function(e){return window.Mustache.render(t,e)}}}},swig:function(){return window.swig},underscore:function(){return!!window._&&{compile:function(t){return function(e){return window._.template(t)(e)}}}}});function Wo(t){return function(t){if(Array.isArray(t))return Zo(t)}(t)||function(t){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(t))return Array.from(t)}(t)||function(t,e){if(!t)return;if("string"==typeof t)return Zo(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Zo(t,e)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Zo(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function Qo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Yo(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}var Xo={collapse:"",expand:"",delete:"",edit:"",add:"",cancel:"",save:"",moveup:"",movedown:""},Ko=function(){function t(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Xo;Qo(this,t),this.mapping=n,this.icon_prefix=e}var e,n,r;return e=t,(n=[{key:"getIconClass",value:function(t){return this.mapping[t]?this.icon_prefix+this.mapping[t]:null}},{key:"getIcon",value:function(t){var e,n=this.getIconClass(t);if(!n)return null;var r=document.createElement("i");return(e=r.classList).add.apply(e,Wo(n.split(" "))),r}}])&&Yo(e.prototype,n),r&&Yo(e,r),t}();function ta(t){return(ta="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ea(t,e){return(ea=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function na(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=ia(t);if(e){var i=ia(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ra(this,n)}}function ra(t,e){return!e||"object"!==ta(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function ia(t){return(ia=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var oa={collapse:"chevron-down",expand:"chevron-right",delete:"trash",edit:"pencil",add:"plus",subtract:"minus",cancel:"floppy-remove",save:"floppy-saved",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"copy",clear:"remove-circle",time:"time",calendar:"calendar",edit_properties:"list"};function aa(t){return(aa="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function sa(t,e){return(sa=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function la(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=ua(t);if(e){var i=ua(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ca(this,n)}}function ca(t,e){return!e||"object"!==aa(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function ua(t){return(ua=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var ha={collapse:"chevron-down",expand:"chevron-right",delete:"trash",edit:"pencil",add:"plus",subtract:"minus",cancel:"ban-circle",save:"save",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"copy",clear:"remove-circle",time:"time",calendar:"calendar",edit_properties:"list"};function da(t){return(da="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function pa(t,e){return(pa=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function fa(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=ma(t);if(e){var i=ma(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ya(this,n)}}function ya(t,e){return!e||"object"!==da(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function ma(t){return(ma=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var va={collapse:"caret-square-o-down",expand:"caret-square-o-right",delete:"times",edit:"pencil",add:"plus",subtract:"minus",cancel:"ban",save:"save",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"files-o",clear:"times-circle-o",time:"clock-o",calendar:"calendar",edit_properties:"list"};function ba(t){return(ba="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ga(t,e){return(ga=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function _a(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=ka(t);if(e){var i=ka(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return wa(this,n)}}function wa(t,e){return!e||"object"!==ba(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function ka(t){return(ka=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var xa={collapse:"caret-down",expand:"caret-right",delete:"trash",edit:"pen",add:"plus",subtract:"minus",cancel:"ban",save:"save",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"copy",clear:"times-circle",time:"clock",calendar:"calendar",edit_properties:"list"};function ja(t){return(ja="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Oa(t,e){return(Oa=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ca(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Sa(t);if(e){var i=Sa(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Ea(this,n)}}function Ea(t,e){return!e||"object"!==ja(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Sa(t){return(Sa=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Ra={collapse:"triangle-1-s",expand:"triangle-1-e",delete:"trash",edit:"pencil",add:"plusthick",subtract:"minusthick",cancel:"closethick",save:"disk",moveup:"arrowthick-1-n",moveright:"arrowthick-1-e",movedown:"arrowthick-1-s",moveleft:"arrowthick-1-w",copy:"copy",clear:"circle-close",time:"time",calendar:"calendar",edit_properties:"note"};function Pa(t){return(Pa="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function La(t,e){return(La=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ta(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ia(t);if(e){var i=Ia(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Aa(this,n)}}function Aa(t,e){return!e||"object"!==Pa(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ia(t){return(Ia=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Da={collapse:"arrow-down",expand:"arrow-right",delete:"delete",edit:"edit",add:"plus",subtract:"minus",cancel:"cross",save:"check",moveup:"upward",moveright:"forward",movedown:"downward",moveleft:"back",copy:"copy",clear:"close",time:"time",calendar:"bookmark",edit_properties:"menu"},Ba={bootstrap3:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ea(t,e)}(n,t);var e=na(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"glyphicon glyphicon-",oa)}return n}(Ko),fontawesome3:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&sa(t,e)}(n,t);var e=la(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"icon-",ha)}return n}(Ko),fontawesome4:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&pa(t,e)}(n,t);var e=fa(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"fa fa-",va)}return n}(Ko),fontawesome5:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ga(t,e)}(n,t);var e=_a(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"fas fa-",xa)}return n}(Ko),jqueryui:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Oa(t,e)}(n,t);var e=Ca(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"ui-icon ui-icon-",Ra)}return n}(Ko),spectre:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&La(t,e)}(n,t);var e=Ta(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"icon icon-",Da)}return n}(Ko)};n(136);function Na(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Fa(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}var Va=["matches","webkitMatchesSelector","mozMatchesSelector","msMatchesSelector","oMatchesSelector"].find((function(t){return t in document.documentElement})),Ha=function(){function t(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{disable_theme_rules:!1};Na(this,t),this.jsoneditor=e,Object.keys(n).forEach((function(t){void 0!==e.options[t]&&(n[t]=e.options[t])})),this.options=n}var e,n,r;return e=t,(n=[{key:"getContainer",value:function(){return document.createElement("div")}},{key:"getFloatRightLinkHolder",value:function(){var t=document.createElement("div");return t.classList.add("je-float-right-linkholder"),t}},{key:"getModal",value:function(){var t=document.createElement("div");return t.style.display="none",t.classList.add("je-modal"),t}},{key:"getGridContainer",value:function(){return document.createElement("div")}},{key:"getGridRow",value:function(){var t=document.createElement("div");return t.classList.add("row"),t}},{key:"getGridColumn",value:function(){return document.createElement("div")}},{key:"setGridColumnSize",value:function(t,e){}},{key:"getLink",value:function(t){var e=document.createElement("a");return e.setAttribute("href","#"),e.appendChild(document.createTextNode(t)),e}},{key:"disableHeader",value:function(t){t.style.color="#ccc"}},{key:"disableLabel",value:function(t){t.style.color="#ccc"}},{key:"enableHeader",value:function(t){t.style.color=""}},{key:"enableLabel",value:function(t){t.style.color=""}},{key:"getInfoButton",value:function(t){var e=document.createElement("span");e.innerText="ⓘ",e.classList.add("je-infobutton-icon");var n=document.createElement("span");return n.classList.add("je-infobutton-tooltip"),n.innerText=t,e.onmouseover=function(){n.style.visibility="visible"},e.onmouseleave=function(){n.style.visibility="hidden"},e.appendChild(n),e}},{key:"getFormInputLabel",value:function(t,e){var n=document.createElement("label");return n.appendChild(document.createTextNode(t)),e&&n.classList.add("required"),n}},{key:"getHeader",value:function(t){var e=document.createElement("h3");return"string"==typeof t?e.textContent=t:e.appendChild(t),e.classList.add("je-header"),e}},{key:"getCheckbox",value:function(){var t=this.getFormInputField("checkbox");return t.classList.add("je-checkbox"),t}},{key:"getCheckboxLabel",value:function(t,e){var n=document.createElement("label");return n.appendChild(document.createTextNode(" ".concat(t))),e&&n.classList.add("required"),n}},{key:"getMultiCheckboxHolder",value:function(t,e,n,r){var i=document.createElement("div");return i.classList.add("control-group"),e&&(e.style.display="block",i.appendChild(e),r&&e.appendChild(r)),Object.values(t).forEach((function(t){t.style.display="inline-block",t.style.marginRight="20px",i.appendChild(t)})),n&&i.appendChild(n),i}},{key:"getFormCheckboxControl",value:function(t,e,n){var r=document.createElement("div");return r.appendChild(t),e.style.width="auto",t.insertBefore(e,t.firstChild),n&&r.classList.add("je-checkbox-control--compact"),r}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");return Object.keys(t).forEach((function(n){return e.setAttribute(n,t[n])})),e.classList.add("je-radio"),e}},{key:"getFormRadioLabel",value:function(t,e){var n=document.createElement("label");return n.appendChild(document.createTextNode(" ".concat(t))),e&&n.classList.add("required"),n}},{key:"getFormRadioControl",value:function(t,e,n){var r=document.createElement("div");return r.appendChild(t),e.style.width="auto",t.insertBefore(e,t.firstChild),n&&r.classList.add("je-radio-control--compact"),r}},{key:"getSelectInput",value:function(t,e){var n=document.createElement("select");return t&&this.setSelectOptions(n,t),n}},{key:"getSwitcher",value:function(t){var e=this.getSelectInput(t,!1);return e.classList.add("je-switcher"),e}},{key:"getSwitcherOptions",value:function(t){return t.getElementsByTagName("option")}},{key:"setSwitcherOptions",value:function(t,e,n){this.setSelectOptions(t,e,n)}},{key:"setSelectOptions",value:function(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];t.innerHTML="";for(var r=0;r<e.length;r++){var i=document.createElement("option");i.setAttribute("value",e[r]),i.textContent=n[r]||e[r],t.appendChild(i)}}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("je-textarea"),t}},{key:"getRangeInput",value:function(t,e,n){var r=this.getFormInputField("range");return r.setAttribute("min",t),r.setAttribute("max",e),r.setAttribute("step",n),r}},{key:"getStepperButtons",value:function(t){var e=document.createElement("div"),n=document.createElement("button");n.setAttribute("type","button"),n.classList.add("stepper-down");var r=document.createElement("button");r.setAttribute("type","button"),r.classList.add("stepper-up"),t.getAttribute("readonly")&&(n.setAttribute("disabled",!0),r.setAttribute("disabled",!0)),n.textContent="-",r.textContent="+";var i=function(t,e){t.value=Number(e||t.value),t.setAttribute("initialized","1")},o=t.getAttribute("min"),a=t.getAttribute("max");return n.addEventListener("click",(function(){t.getAttribute("initialized")?o?Number(t.value)>Number(o)&&t.stepDown():t.stepDown():i(t,o),y(t,"change")})),r.addEventListener("click",(function(){t.getAttribute("initialized")?a?Number(t.value)<Number(a)&&t.stepUp():t.stepUp():i(t,o),y(t,"change")})),e.appendChild(n),e.appendChild(r),e}},{key:"getRangeOutput",value:function(t,e){var n=document.createElement("output");n.value=e||0;var r=function(t){n.value=t.currentTarget.value};return t.addEventListener("change",r,!1),t.addEventListener("input",r,!1),n}},{key:"getRangeControl",value:function(t,e){var n=document.createElement("div");return n.classList.add("je-range-control"),e&&n.appendChild(e),n.appendChild(t),n}},{key:"getFormInputField",value:function(t){var e=document.createElement("input");return e.setAttribute("type",t),e}},{key:"afterInputReady",value:function(t){}},{key:"getFormControl",value:function(t,e,n,r){var i=document.createElement("div");return i.classList.add("form-control"),t&&i.appendChild(t),"checkbox"!==e.type&&"radio"!==e.type||!t?(r&&t&&t.appendChild(r),i.appendChild(e)):(e.style.width="auto",t.insertBefore(e,t.firstChild),r&&t.appendChild(r)),n&&i.appendChild(n),i}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("je-indented-panel"),t}},{key:"getTopIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("je-indented-panel--top"),t}},{key:"getChildEditorHolder",value:function(){return document.createElement("div")}},{key:"getDescription",value:function(t){var e=document.createElement("p");return window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getCheckboxDescription",value:function(t){return this.getDescription(t)}},{key:"getFormInputDescription",value:function(t){return this.getDescription(t)}},{key:"getButtonHolder",value:function(){return document.createElement("span")}},{key:"getHeaderButtonHolder",value:function(){return this.getButtonHolder()}},{key:"getFormButtonHolder",value:function(t){return this.getButtonHolder()}},{key:"getButton",value:function(t,e,n){var r=document.createElement("button");return r.type="button",this.setButtonText(r,t,e,n),r}},{key:"getFormButton",value:function(t,e,n){return this.getButton(t,e,n)}},{key:"setButtonText",value:function(t,e,n,r){for(;t.firstChild;)t.removeChild(t.firstChild);if(n&&(t.appendChild(n),e=" ".concat(e)),!this.jsoneditor.options.iconlib||!this.jsoneditor.options.remove_button_labels||!n){var i=document.createElement("span");i.appendChild(document.createTextNode(e)),t.appendChild(i)}r&&t.setAttribute("title",r)}},{key:"getTable",value:function(){return document.createElement("table")}},{key:"getTableRow",value:function(){return document.createElement("tr")}},{key:"getTableHead",value:function(){return document.createElement("thead")}},{key:"getTableBody",value:function(){return document.createElement("tbody")}},{key:"getTableHeaderCell",value:function(t){var e=document.createElement("th");return e.textContent=t,e}},{key:"getTableCell",value:function(){return document.createElement("td")}},{key:"getErrorMessage",value:function(t){var e=document.createElement("p");return e.style=e.style||{},e.style.color="red",e.appendChild(document.createTextNode(t)),e}},{key:"addInputError",value:function(t,e){}},{key:"removeInputError",value:function(t){}},{key:"addTableRowError",value:function(t){}},{key:"removeTableRowError",value:function(t){}},{key:"getTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.innerHTML="<div class='je-tabholder tabs'></div><div class='content' id='".concat(e,"'></div><div class='je-tabholder--clear'></div>"),n}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.innerHTML="<div class='tabs je-tabholder--top'></div><div class='je-tabholder--clear'></div><div class='content' id='".concat(e,"'></div>"),n}},{key:"applyStyles",value:function(t,e){Object.keys(e).forEach((function(n){return t.style[n]=e[n]}))}},{key:"closest",value:function(t,e){for(;t&&t!==document;){if(!t[Va])return!1;if(t[Va](e))return t;t=t.parentNode}return!1}},{key:"insertBasicTopTab",value:function(t,e){e.firstChild.insertBefore(t,e.firstChild.firstChild)}},{key:"getTab",value:function(t,e){var n=document.createElement("div");return n.appendChild(t),n.id=e,n.classList.add("je-tab"),n}},{key:"getTopTab",value:function(t,e){var n=document.createElement("div");return n.appendChild(t),n.id=e,n.classList.add("je-tab--top"),n}},{key:"getTabContentHolder",value:function(t){return t.children[1]}},{key:"getTopTabContentHolder",value:function(t){return t.children[1]}},{key:"getTabContent",value:function(){return this.getIndentedPanel()}},{key:"getTopTabContent",value:function(){return this.getTopIndentedPanel()}},{key:"markTabActive",value:function(t){this.applyStyles(t.tab,{opacity:1,background:"white"}),void 0!==t.rowPane?t.rowPane.style.display="":t.container.style.display=""}},{key:"markTabInactive",value:function(t){this.applyStyles(t.tab,{opacity:.5,background:""}),void 0!==t.rowPane?t.rowPane.style.display="none":t.container.style.display="none"}},{key:"addTab",value:function(t,e){t.children[0].appendChild(e)}},{key:"addTopTab",value:function(t,e){t.children[0].appendChild(e)}},{key:"getBlockLink",value:function(){var t=document.createElement("a");return t.classList.add("je-block-link"),t}},{key:"getBlockLinkHolder",value:function(){return document.createElement("div")}},{key:"getLinksHolder",value:function(){return document.createElement("div")}},{key:"createMediaLink",value:function(t,e,n){t.appendChild(e),n.classList.add("je-media"),t.appendChild(n)}},{key:"createImageLink",value:function(t,e,n){t.appendChild(e),e.appendChild(n)}},{key:"getFirstTab",value:function(t){return t.firstChild.firstChild}},{key:"getInputGroup",value:function(t,e){}},{key:"cleanText",value:function(t){var e=document.createElement("div");return e.innerHTML=t,e.textContent||e.innerText}},{key:"getDropZone",value:function(t){var e=document.createElement("div");return e.setAttribute("data-text",t),e.classList.add("je-dropzone"),e}},{key:"getUploadPreview",value:function(t,e,n){var r=document.createElement("div");if(r.classList.add("je-upload-preview"),"image"===t.mimeType.substr(0,5)){var i=document.createElement("img");i.src=n,r.appendChild(i)}var o=document.createElement("div");o.innerHTML+="<strong>Name:</strong> ".concat(t.name,"<br><strong>Type:</strong> ").concat(t.type,"<br><strong>Size:</strong> ").concat(t.formattedSize),r.appendChild(o),r.appendChild(e);var a=document.createElement("div");return a.style.clear="left",r.appendChild(a),r}},{key:"getProgressBar",value:function(){var t=document.createElement("progress");return t.setAttribute("max",100),t.setAttribute("value",0),t}},{key:"updateProgressBar",value:function(t,e){t&&t.setAttribute("value",e)}},{key:"updateProgressBarUnknown",value:function(t){t&&t.removeAttribute("value")}}])&&Fa(e.prototype,n),r&&Fa(e,r),t}();function za(t){return(za="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ma(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function qa(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Ua(t,e,n){return(Ua="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Wa(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Ga(t,e){return(Ga=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function $a(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Wa(t);if(e){var i=Wa(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Ja(this,n)}}function Ja(t,e){return!e||"object"!==za(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Wa(t){return(Wa=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Za=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ga(t,e)}(o,t);var e,n,r,i=$a(o);function o(){return Ma(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getFormInputLabel",value:function(t,e){var n=Ua(Wa(o.prototype),"getFormInputLabel",this).call(this,t,e);return n.classList.add("je-form-input-label"),n}},{key:"getFormInputDescription",value:function(t){var e=Ua(Wa(o.prototype),"getFormInputDescription",this).call(this,t);return e.classList.add("je-form-input-label"),e}},{key:"getIndentedPanel",value:function(){var t=Ua(Wa(o.prototype),"getIndentedPanel",this).call(this);return t.classList.add("je-indented-panel"),t}},{key:"getTopIndentedPanel",value:function(){return this.getIndentedPanel()}},{key:"getChildEditorHolder",value:function(){var t=Ua(Wa(o.prototype),"getChildEditorHolder",this).call(this);return t.classList.add("je-child-editor-holder"),t}},{key:"getHeaderButtonHolder",value:function(){var t=this.getButtonHolder();return t.classList.add("je-header-button-holder"),t}},{key:"getTable",value:function(){var t=Ua(Wa(o.prototype),"getTable",this).call(this);return t.classList.add("je-table"),t}},{key:"addInputError",value:function(t,e){if(t.style.borderColor="red",t.errmsg)t.errmsg.style.display="block";else{var n=this.closest(t,".form-control");t.errmsg=document.createElement("div"),t.errmsg.setAttribute("class","errmsg"),t.errmsg.style=t.errmsg.style||{},t.errmsg.style.color="red",n.appendChild(t.errmsg)}t.errmsg.innerHTML="",t.errmsg.appendChild(document.createTextNode(e))}},{key:"removeInputError",value:function(t){t.style&&(t.style.borderColor=""),t.errmsg&&(t.errmsg.style.display="none")}}])&&qa(e.prototype,n),r&&qa(e,r),o}(Ha);Za.rules={".je-form-input-label":"display:block;margin-bottom:3px;font-weight:bold",".je-form-input-description":"display:inline-block;margin:0;font-size:0.8em;font-style:italic",".je-indented-panel":"padding:5px;margin:10px;border-radius:3px;border:1px%20solid%20%23ddd",".je-child-editor-holder":"margin-bottom:8px",".je-header-button-holder":"display:inline-block;margin-left:10px;font-size:0.8em;vertical-align:middle",".je-table":"margin-bottom:5px;border-bottom:1px%20solid%20%23ccc",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};var Qa=n(137),Ya=n.n(Qa);function Xa(t){return(Xa="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ka(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function ts(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function es(t,e,n){return(es="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=os(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function ns(t,e){return(ns=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function rs(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=os(t);if(e){var i=os(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return is(this,n)}}function is(t,e){return!e||"object"!==Xa(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function os(t){return(os=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var as=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ns(t,e)}(o,t);var e,n,r,i=rs(o);function o(){return Ka(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getSelectInput",value:function(t,e){var n=es(os(o.prototype),"getSelectInput",this).call(this,t);return n.classList.add("form-control"),n}},{key:"setGridColumnSize",value:function(t,e,n){t.classList.add("col-md-".concat(e)),n&&t.classList.add("col-md-offset-".concat(n))}},{key:"afterInputReady",value:function(t){if(!t.controlgroup&&(t.controlgroup=this.closest(t,".form-group"),this.closest(t,".compact")&&(t.controlgroup.style.marginBottom=0),this.queuedInputErrorText)){var e=this.queuedInputErrorText;delete this.queuedInputErrorText,this.addInputError(t,e)}}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("form-control"),t}},{key:"getRangeInput",value:function(t,e,n){return es(os(o.prototype),"getRangeInput",this).call(this,t,e,n)}},{key:"getFormInputField",value:function(t){var e=es(os(o.prototype),"getFormInputField",this).call(this,t);return"checkbox"!==t&&"radio"!==t&&e.classList.add("form-control"),e}},{key:"getFormControl",value:function(t,e,n){var r=document.createElement("div");return!t||"checkbox"!==e.type&&"radio"!==e.type?(r.classList.add("form-group"),t&&(t.classList.add("control-label"),r.appendChild(t)),r.appendChild(e)):(r.classList.add(e.type),t.insertBefore(e,t.firstChild),r.appendChild(t)),n&&r.appendChild(n),r}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("well","well-sm"),t.style.paddingBottom=0,t}},{key:"getInfoButton",value:function(t){var e=document.createElement("span");e.classList.add("glyphicon","glyphicon-info-sign","pull-right"),e.style.padding=".25rem",e.style.position="relative",e.style.display="inline-block";var n=document.createElement("span");return n.style["font-family"]="sans-serif",n.style.visibility="hidden",n.style["background-color"]="rgba(50, 50, 50, .75)",n.style.margin="0 .25rem",n.style.color="#FAFAFA",n.style.padding=".5rem 1rem",n.style["border-radius"]=".25rem",n.style.width="25rem",n.style.transform="translateX(-27rem) translateY(-.5rem)",n.style.position="absolute",n.innerText=t,e.onmouseover=function(){n.style.visibility="visible"},e.onmouseleave=function(){n.style.visibility="hidden"},e.appendChild(n),e}},{key:"getFormInputDescription",value:function(t){var e=document.createElement("p");return e.classList.add("help-block"),window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getHeaderButtonHolder",value:function(){var t=this.getButtonHolder();return t.style.marginLeft="10px",t}},{key:"getButtonHolder",value:function(){var t=document.createElement("span");return t.classList.add("btn-group"),t}},{key:"getButton",value:function(t,e,n){var r=es(os(o.prototype),"getButton",this).call(this,t,e,n);return r.classList.add("btn","btn-default"),r}},{key:"getTable",value:function(){var t=document.createElement("table");return t.classList.add("table","table-bordered"),t.style.width="auto",t.style.maxWidth="none",t}},{key:"addInputError",value:function(t,e){t.controlgroup?(t.controlgroup.classList.add("has-error"),t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("p"),t.errmsg.classList.add("help-block","errormsg"),t.controlgroup.appendChild(t.errmsg)),t.errmsg.textContent=e):this.queuedInputErrorText=e}},{key:"removeInputError",value:function(t){t.controlgroup||delete this.queuedInputErrorText,t.errmsg&&(t.errmsg.style.display="none",t.controlgroup.classList.remove("has-error"))}},{key:"getTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.innerHTML="<ul class='col-md-2 nav nav-pills nav-stacked' id='".concat(e,"' role='tablist'></ul><div class='col-md-10 tab-content well well-small'  id='").concat(e,"'></div>"),n}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.innerHTML="<ul class='nav nav-tabs' id='".concat(e,"' role='tablist'></ul><div class='tab-content well well-small'  id='").concat(e,"'></div>"),n}},{key:"getTab",value:function(t,e){var n=document.createElement("li");n.setAttribute("role","presentation");var r=document.createElement("a");return r.setAttribute("href","#".concat(e)),r.appendChild(t),r.setAttribute("aria-controls",e),r.setAttribute("role","tab"),r.setAttribute("data-toggle","tab"),n.appendChild(r),n}},{key:"getTopTab",value:function(t,e){var n=document.createElement("li");n.setAttribute("role","presentation");var r=document.createElement("a");return r.setAttribute("href","#".concat(e)),r.appendChild(t),r.setAttribute("aria-controls",e),r.setAttribute("role","tab"),r.setAttribute("data-toggle","tab"),n.appendChild(r),n}},{key:"getTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"getTopTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"markTabActive",value:function(t){t.tab.classList.add("active"),void 0!==t.rowPane?t.rowPane.classList.add("active"):t.container.classList.add("active")}},{key:"markTabInactive",value:function(t){t.tab.classList.remove("active"),void 0!==t.rowPane?t.rowPane.classList.remove("active"):t.container.classList.remove("active")}},{key:"getProgressBar",value:function(){var t=document.createElement("div");t.classList.add("progress");var e=document.createElement("div");return e.classList.add("progress-bar"),e.setAttribute("role","progressbar"),e.setAttribute("aria-valuenow",0),e.setAttribute("aria-valuemin",0),e.setAttribute("aria-valuenax",100),e.innerHTML="".concat(0,"%"),t.appendChild(e),t}},{key:"updateProgressBar",value:function(t,e){if(t){var n=t.firstChild,r="".concat(e,"%");n.setAttribute("aria-valuenow",e),n.style.width=r,n.innerHTML=r}}},{key:"updateProgressBarUnknown",value:function(t){if(t){var e=t.firstChild;t.classList.add("progress","progress-striped","active"),e.removeAttribute("aria-valuenow"),e.style.width="100%",e.innerHTML=""}}},{key:"getInputGroup",value:function(t,e){if(t){var n=document.createElement("div");n.classList.add("input-group"),n.appendChild(t);var r=document.createElement("div");r.classList.add("input-group-btn"),n.appendChild(r);for(var i=0;i<e.length;i++)r.appendChild(e[i]);return n}}}])&&ts(e.prototype,n),r&&ts(e,r),o}(Ha);as.rules=Ya.a;n(164);function ss(t){return(ss="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ls(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function cs(t,e,n){return(cs="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=ps(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function us(t,e){return(us=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function hs(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=ps(t);if(e){var i=ps(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ds(this,n)}}function ds(t,e){return!e||"object"!==ss(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function ps(t){return(ps=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var fs={disable_theme_rules:!1,input_size:"normal",custom_forms:!1,object_indent:!0,object_background:"bg-light",object_text:"",table_border:!1,table_zebrastyle:!1,tooltip:"bootstrap"},ys=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&us(t,e)}(o,t);var e,n,r,i=hs(o);function o(t){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,t,fs)}return e=o,(n=[{key:"getSelectInput",value:function(t,e){var n=cs(ps(o.prototype),"getSelectInput",this).call(this,t);return n.classList.add("form-control"),!1===this.options.custom_forms?("small"===this.options.input_size&&n.classList.add("form-control-sm"),"large"===this.options.input_size&&n.classList.add("form-control-lg")):(n.classList.remove("form-control"),n.classList.add("custom-select"),"small"===this.options.input_size&&n.classList.add("custom-select-sm"),"large"===this.options.input_size&&n.classList.add("custom-select-lg")),n}},{key:"getContainer",value:function(){var t=document.createElement("div");return this.options.object_indent||t.classList.add("je-noindent"),t}},{key:"setGridColumnSize",value:function(t,e,n){t.classList.add("col-md-".concat(e)),n&&t.classList.add("offset-md-".concat(n))}},{key:"afterInputReady",value:function(t){if(!t.controlgroup){var e=t.name;t.id=e;var n=t.parentNode.parentNode.getElementsByTagName("label")[0];n&&(n.htmlFor=e),t.controlgroup=this.closest(t,".form-group")}}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("form-control"),"small"===this.options.input_size&&t.classList.add("form-control-sm"),"large"===this.options.input_size&&t.classList.add("form-control-lg"),t}},{key:"getRangeInput",value:function(t,e,n){var r=cs(ps(o.prototype),"getRangeInput",this).call(this,t,e,n);return!0===this.options.custom_forms&&(r.classList.remove("form-control"),r.classList.add("custom-range")),r}},{key:"getStepperButtons",value:function(t){var e=document.createElement("div"),n=document.createElement("div"),r=document.createElement("div"),i=document.createElement("button");i.setAttribute("type","button");var o=document.createElement("button");o.setAttribute("type","button"),e.appendChild(n),e.appendChild(t),e.appendChild(r),n.appendChild(i),r.appendChild(o),e.classList.add("input-group"),n.classList.add("input-group-prepend"),r.classList.add("input-group-append"),i.classList.add("btn"),i.classList.add("btn-secondary"),i.classList.add("stepper-down"),o.classList.add("btn"),o.classList.add("btn-secondary"),o.classList.add("stepper-up"),t.getAttribute("readonly")&&(i.setAttribute("disabled",!0),o.setAttribute("disabled",!0)),i.textContent="-",o.textContent="+";var a=function(t,e){t.value=Number(e||t.value),t.setAttribute("initialized","1")},s=t.getAttribute("min"),l=t.getAttribute("max");return i.addEventListener("click",(function(){t.getAttribute("initialized")?s?Number(t.value)>Number(s)&&t.stepDown():t.stepDown():a(t,s),y(t,"change")})),o.addEventListener("click",(function(){t.getAttribute("initialized")?l?Number(t.value)<Number(l)&&t.stepUp():t.stepUp():a(t,s),y(t,"change")})),e}},{key:"getFormInputField",value:function(t){var e=cs(ps(o.prototype),"getFormInputField",this).call(this,t);return"checkbox"!==t&&"radio"!==t&&"file"!==t&&(e.classList.add("form-control"),"small"===this.options.input_size&&e.classList.add("form-control-sm"),"large"===this.options.input_size&&e.classList.add("form-control-lg")),"file"===t&&e.classList.add("form-control-file"),e}},{key:"getFormControl",value:function(t,e,n,r){var i=document.createElement("div");if(i.classList.add("form-group"),!t||"checkbox"!==e.type&&"radio"!==e.type)t&&(i.appendChild(t),r&&i.appendChild(r)),i.appendChild(e);else{var o=document.createElement("div");!1===this.options.custom_forms?(o.classList.add("form-check"),e.classList.add("form-check-input"),t.classList.add("form-check-label")):(o.classList.add("custom-control"),e.classList.add("custom-control-input"),t.classList.add("custom-control-label"),"checkbox"===e.type?o.classList.add("custom-checkbox"):o.classList.add("custom-radio"));var a=(Date.now()*Math.random()).toFixed(0);e.setAttribute("id",a),t.setAttribute("for",a),o.appendChild(e),o.appendChild(t),r&&o.appendChild(r),i.appendChild(o)}return n&&i.appendChild(n),i}},{key:"getInfoButton",value:function(t){var e=document.createElement("button");e.type="button",e.classList.add("ml-3","jsoneditor-twbs4-text-button"),e.setAttribute("data-toggle","tooltip"),e.setAttribute("data-placement","auto"),e.title=t;var n=document.createTextNode("ⓘ");return e.appendChild(n),"bootstrap"===this.options.tooltip?window.jQuery&&window.jQuery().tooltip?window.jQuery(e).tooltip():console.warn("Could not find popper jQuery plugin of Bootstrap."):"css"===this.options.tooltip&&e.classList.add("je-tooltip"),e}},{key:"getCheckbox",value:function(){return this.getFormInputField("checkbox")}},{key:"getMultiCheckboxHolder",value:function(t,e,n,r){var i=document.createElement("div");i.classList.add("form-group"),e&&(i.appendChild(e),r&&e.appendChild(r));var o=document.createElement("div");return Object.values(t).forEach((function(t){var e=t.firstChild;o.appendChild(e)})),i.appendChild(o),n&&i.appendChild(n),i}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");for(var n in t)e.setAttribute(n,t[n]);return!1===this.options.custom_forms?e.classList.add("form-check-input"):e.classList.add("custom-control-input"),e}},{key:"getFormRadioLabel",value:function(t,e){var n=document.createElement("label");return!1===this.options.custom_forms?n.classList.add("form-check-label"):n.classList.add("custom-control-label"),n.appendChild(document.createTextNode(t)),n}},{key:"getFormRadioControl",value:function(t,e,n){var r=document.createElement("div");return!1===this.options.custom_forms?r.classList.add("form-check"):r.classList.add("custom-control","custom-radio"),r.appendChild(e),r.appendChild(t),n&&(!1===this.options.custom_forms?r.classList.add("form-check-inline"):r.classList.add("custom-control-inline")),r}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("card","card-body","mb-3"),this.options.object_background&&t.classList.add(this.options.object_background),this.options.object_text&&t.classList.add(this.options.object_text),t}},{key:"getFormInputDescription",value:function(t){var e=document.createElement("small");return e.classList.add("form-text"),window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getHeader",value:function(t){var e=document.createElement("h3");return e.classList.add("card-title"),"string"==typeof t?e.textContent=t:e.appendChild(t),e.style.display="inline-block",e}},{key:"getHeaderButtonHolder",value:function(){return this.getButtonHolder()}},{key:"getButtonHolder",value:function(){var t=document.createElement("span");return t.classList.add("btn-group"),t}},{key:"getFormButtonHolder",value:function(t){var e=this.getButtonHolder();return e.classList.add("d-block"),"center"===t?e.classList.add("text-center"):"right"===t&&e.classList.add("text-right"),e}},{key:"getButton",value:function(t,e,n){var r=cs(ps(o.prototype),"getButton",this).call(this,t,e,n);return r.classList.add("btn","btn-secondary","btn-sm"),r}},{key:"getTable",value:function(){var t=document.createElement("table");return t.classList.add("table","table-sm"),this.options.table_border&&t.classList.add("table-bordered"),this.options.table_zebrastyle&&t.classList.add("table-striped"),t}},{key:"getErrorMessage",value:function(t){var e=document.createElement("div");return e.classList.add("alert","alert-danger"),e.setAttribute("role","alert"),e.appendChild(document.createTextNode(t)),e}},{key:"addInputError",value:function(t,e){t.controlgroup&&(t.classList.add("is-invalid"),t.errmsg||(t.errmsg=document.createElement("p"),t.errmsg.classList.add("invalid-feedback"),t.controlgroup.appendChild(t.errmsg),t.errmsg.style.display="block"),t.errmsg.style.display="block",t.errmsg.textContent=e)}},{key:"removeInputError",value:function(t){t.errmsg&&(t.errmsg.style.display="none",t.classList.remove("is-invalid"))}},{key:"getTabHolder",value:function(t){var e=document.createElement("div"),n=void 0===t?"":t;return e.innerHTML="<div class='col-md-2' id='".concat(n,"'><ul class='nav flex-column nav-pills'></ul></div><div class='col-md-10'><div class='tab-content' id='").concat(n,"'></div></div>"),e.classList.add("row"),e}},{key:"addTab",value:function(t,e){t.children[0].children[0].appendChild(e)}},{key:"getTabContentHolder",value:function(t){return t.children[1].children[0]}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.classList.add("card"),n.innerHTML="<div class='card-header'><ul class='nav nav-tabs card-header-tabs' id='".concat(e,"'></ul></div><div class='card-body'><div class='tab-content' id='").concat(e,"'></div></div>"),n}},{key:"getTab",value:function(t,e){var n=document.createElement("li");n.classList.add("nav-item");var r=document.createElement("a");return r.classList.add("nav-link"),r.setAttribute("href","#".concat(e)),r.setAttribute("data-toggle","tab"),r.appendChild(t),n.appendChild(r),n}},{key:"getTopTab",value:function(t,e){var n=document.createElement("li");n.classList.add("nav-item");var r=document.createElement("a");return r.classList.add("nav-link"),r.setAttribute("href","#".concat(e)),r.setAttribute("data-toggle","tab"),r.appendChild(t),n.appendChild(r),n}},{key:"getTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"getTopTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"markTabActive",value:function(t){t.tab.firstChild.classList.add("active"),void 0!==t.rowPane?t.rowPane.classList.add("active"):t.container.classList.add("active")}},{key:"markTabInactive",value:function(t){t.tab.firstChild.classList.remove("active"),void 0!==t.rowPane?t.rowPane.classList.remove("active"):t.container.classList.remove("active")}},{key:"insertBasicTopTab",value:function(t,e){e.children[0].children[0].insertBefore(t,e.children[0].children[0].firstChild)}},{key:"addTopTab",value:function(t,e){t.children[0].children[0].appendChild(e)}},{key:"getTopTabContentHolder",value:function(t){return t.children[1].children[0]}},{key:"getFirstTab",value:function(t){return t.firstChild.firstChild.firstChild}},{key:"getProgressBar",value:function(){var t=document.createElement("div");t.classList.add("progress");var e=document.createElement("div");return e.classList.add("progress-bar"),e.setAttribute("role","progressbar"),e.setAttribute("aria-valuenow",0),e.setAttribute("aria-valuemin",0),e.setAttribute("aria-valuenax",100),e.innerHTML="".concat(0,"%"),t.appendChild(e),t}},{key:"updateProgressBar",value:function(t,e){if(t){var n=t.firstChild,r="".concat(e,"%");n.setAttribute("aria-valuenow",e),n.style.width=r,n.innerHTML=r}}},{key:"updateProgressBarUnknown",value:function(t){if(t){var e=t.firstChild;t.classList.add("progress","progress-striped","active"),e.removeAttribute("aria-valuenow"),e.style.width="100%",e.innerHTML=""}}},{key:"getBlockLink",value:function(){var t=document.createElement("a");return t.classList.add("mb-3","d-inline-block"),t}},{key:"getLinksHolder",value:function(){return document.createElement("div")}},{key:"getInputGroup",value:function(t,e){if(t){var n=document.createElement("div");n.classList.add("input-group"),n.appendChild(t);var r=document.createElement("div");r.classList.add("input-group-append"),n.appendChild(r);for(var i=0;i<e.length;i++)e[i].classList.remove("mr-2","btn-secondary"),e[i].classList.add("btn-outline-secondary"),r.appendChild(e[i]);return n}}}])&&ls(e.prototype,n),r&&ls(e,r),o}(Ha);function ms(t){return(ms="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function vs(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function bs(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function gs(t,e,n){return(gs="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=xs(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function _s(t,e){return(_s=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ws(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=xs(t);if(e){var i=xs(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ks(this,n)}}function ks(t,e){return!e||"object"!==ms(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function xs(t){return(xs=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}ys.rules={".jsoneditor-twbs4-text-button":"background:none;padding:0;border:0;color:currentColor","td > .form-group":"margin-bottom:0",".json-editor-btn-upload":"margin-top:1rem",".je-noindent .card":"padding:0;border:0",".je-tooltip:hover::before":"display:block;position:absolute;font-size:0.8em;color:%23fff;border-radius:0.2em;content:attr(title);background-color:%23000;margin-top:-2.5em;padding:0.3em",".je-tooltip:hover::after":"display:block;position:absolute;font-size:0.8em;color:%23fff",".select2-container--default .select2-selection--single":"height:calc(1.5em%20%2B%200.75rem%20%2B%202px)",".select2-container--default   .select2-selection--single   .select2-selection__arrow":"height:calc(1.5em%20%2B%200.75rem%20%2B%202px)",".select2-container--default   .select2-selection--single   .select2-selection__rendered":"line-height:calc(1.5em%20%2B%200.75rem%20%2B%202px)",".selectize-control.form-control":"padding:0",".selectize-dropdown.form-control":"padding:0;height:auto",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};var js=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&_s(t,e)}(o,t);var e,n,r,i=ws(o);function o(){return vs(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getTable",value:function(){var t=gs(xs(o.prototype),"getTable",this).call(this);return t.setAttribute("cellpadding",5),t.setAttribute("cellspacing",0),t}},{key:"getTableHeaderCell",value:function(t){var e=gs(xs(o.prototype),"getTableHeaderCell",this).call(this,t);return e.classList.add("ui-state-active"),e.style.fontWeight="bold",e}},{key:"getTableCell",value:function(){var t=gs(xs(o.prototype),"getTableCell",this).call(this);return t.classList.add("ui-widget-content"),t}},{key:"getHeaderButtonHolder",value:function(){var t=this.getButtonHolder();return t.style.marginLeft="10px",t.style.fontSize=".6em",t.style.display="inline-block",t}},{key:"getFormInputDescription",value:function(t){var e=this.getDescription(t);return e.style.marginLeft="10px",e.style.display="inline-block",e}},{key:"getFormControl",value:function(t,e,n,r){var i=gs(xs(o.prototype),"getFormControl",this).call(this,t,e,n,r);return"checkbox"===e.type?(i.style.lineHeight="25px",i.style.padding="3px 0"):i.style.padding="4px 0 8px 0",i}},{key:"getDescription",value:function(t){var e=document.createElement("span");return e.style.fontSize=".8em",e.style.fontStyle="italic",window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getButtonHolder",value:function(){var t=document.createElement("div");return t.classList.add("ui-buttonset"),t.style.fontSize=".7em",t}},{key:"getFormInputLabel",value:function(t,e){var n=document.createElement("label");return n.style.fontWeight="bold",n.style.display="block",n.textContent=t,e&&n.classList.add("required"),n}},{key:"getButton",value:function(t,e,n){var r=document.createElement("button");r.classList.add("ui-button","ui-widget","ui-state-default","ui-corner-all"),e&&!t?(r.classList.add("ui-button-icon-only"),e.classList.add("ui-button-icon-primary","ui-icon-primary"),r.appendChild(e)):e?(r.classList.add("ui-button-text-icon-primary"),e.classList.add("ui-button-icon-primary","ui-icon-primary"),r.appendChild(e)):r.classList.add("ui-button-text-only");var i=document.createElement("span");return i.classList.add("ui-button-text"),i.textContent=t||n||".",r.appendChild(i),r.setAttribute("title",n),r}},{key:"setButtonText",value:function(t,e,n,r){t.innerHTML="",t.classList.add("ui-button","ui-widget","ui-state-default","ui-corner-all"),n&&!e?(t.classList.add("ui-button-icon-only"),n.classList.add("ui-button-icon-primary","ui-icon-primary"),t.appendChild(n)):n?(t.classList.add("ui-button-text-icon-primary"),n.classList.add("ui-button-icon-primary","ui-icon-primary"),t.appendChild(n)):t.classList.add("ui-button-text-only");var i=document.createElement("span");i.classList.add("ui-button-text"),i.textContent=e||r||".",t.appendChild(i),t.setAttribute("title",r)}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("ui-widget-content","ui-corner-all"),t.style.padding="1em 1.4em",t.style.marginBottom="20px",t}},{key:"afterInputReady",value:function(t){if(!t.controls&&(t.controls=this.closest(t,".form-control"),this.queuedInputErrorText)){var e=this.queuedInputErrorText;delete this.queuedInputErrorText,this.addInputError(t,e)}}},{key:"addInputError",value:function(t,e){t.controls?(t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("div"),t.errmsg.classList.add("ui-state-error"),t.controls.appendChild(t.errmsg)),t.errmsg.textContent=e):this.queuedInputErrorText=e}},{key:"removeInputError",value:function(t){t.controls||delete this.queuedInputErrorText,t.errmsg&&(t.errmsg.style.display="none")}},{key:"markTabActive",value:function(t){t.tab.classList.remove("ui-widget-header"),t.tab.classList.add("ui-state-active"),void 0!==t.rowPane?t.rowPane.style.display="":t.container.style.display=""}},{key:"markTabInactive",value:function(t){t.tab.classList.add("ui-widget-header"),t.tab.classList.remove("ui-state-active"),void 0!==t.rowPane?t.rowPane.style.display="none":t.container.style.display="none"}}])&&bs(e.prototype,n),r&&bs(e,r),o}(Ha);js.rules={'div[data-schemaid="root"]:after':'position:relative;color:red;margin:10px 0;font-weight:600;display:block;width:100%;text-align:center;content:"This is an old JSON-Editor 1.x Theme and might not display elements correctly when used with the 2.x version"'};function Os(t){return(Os="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Cs(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Es(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Ss(t,e){return(Ss=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Rs(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ls(t);if(e){var i=Ls(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Ps(this,n)}}function Ps(t,e){return!e||"object"!==Os(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ls(t){return(Ls=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Ts=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ss(t,e)}(o,t);var e,n,r,i=Rs(o);function o(){return Cs(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"addInputError",value:function(t,e){if(t.errmsg)t.errmsg.style.display="block";else{var n=this.closest(t,".form-control");t.errmsg=document.createElement("div"),t.errmsg.setAttribute("class","errmsg"),n.appendChild(t.errmsg)}t.errmsg.innerHTML="",t.errmsg.appendChild(document.createTextNode(e))}},{key:"removeInputError",value:function(t){t.style&&(t.style.borderColor=""),t.errmsg&&(t.errmsg.style.display="none")}}])&&Es(e.prototype,n),r&&Es(e,r),o}(Ha);Ts.rules={".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};function As(t){return(As="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Is(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Ds(t,e,n){return(Ds="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Vs(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Bs(t,e){return(Bs=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ns(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Vs(t);if(e){var i=Vs(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Fs(this,n)}}function Fs(t,e){return!e||"object"!==As(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Vs(t){return(Vs=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Hs={disable_theme_rules:!1,label_bold:!0,align_bottom:!1,object_indent:!1,object_border:!1,table_border:!1,table_zebrastyle:!1,input_size:"normal"},zs=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Bs(t,e)}(o,t);var e,n,r,i=Ns(o);function o(t){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,t,Hs)}return e=o,(n=[{key:"setGridColumnSize",value:function(t,e,n){t.classList.add("col-".concat(e)),n&&t.classList.add("col-mx-auto")}},{key:"getGridContainer",value:function(){var t=document.createElement("div");return t.classList.add("container"),this.options.object_indent||t.classList.add("je-noindent"),t}},{key:"getGridRow",value:function(){var t=document.createElement("div");return t.classList.add("columns"),t}},{key:"getGridColumn",value:function(){var t=document.createElement("div");return t.classList.add("column"),this.options.align_bottom&&t.classList.add("je-align-bottom"),t}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("je-panel"),this.options.object_border&&t.classList.add("je-border"),t}},{key:"getTopIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("je-panel-top"),this.options.object_border&&t.classList.add("je-border"),t}},{key:"getHeaderButtonHolder",value:function(){return this.getButtonHolder()}},{key:"getButtonHolder",value:function(){var t=Ds(Vs(o.prototype),"getButtonHolder",this).call(this);return t.classList.add("btn-group"),t}},{key:"getFormButtonHolder",value:function(t){var e=Ds(Vs(o.prototype),"getFormButtonHolder",this).call(this);return e.classList.remove("btn-group"),e.classList.add("d-block"),"center"===t?e.classList.add("text-center"):"right"===t?e.classList.add("text-right"):e.classList.add("text-left"),e}},{key:"getFormButton",value:function(t,e,n){var r=Ds(Vs(o.prototype),"getFormButton",this).call(this,t,e,n);return r.classList.add("btn","btn-primary","mx-2","my-1"),"small"!==this.options.input_size&&r.classList.remove("btn-sm"),"large"===this.options.input_size&&r.classList.add("btn-lg"),r}},{key:"getButton",value:function(t,e,n){var r=Ds(Vs(o.prototype),"getButton",this).call(this,t,e,n);return r.classList.add("btn","btn-sm","btn-primary","mr-2","my-1"),r}},{key:"getHeader",value:function(t){var e=document.createElement("h4");return"string"==typeof t?e.textContent=t:e.appendChild(t),e.style.display="inline-block",e}},{key:"getFormInputDescription",value:function(t){var e=Ds(Vs(o.prototype),"getFormInputDescription",this).call(this,t);return e.classList.add("je-desc","hide-sm"),e}},{key:"getFormInputLabel",value:function(t,e){var n=Ds(Vs(o.prototype),"getFormInputLabel",this).call(this,t,e);return this.options.label_bold&&n.classList.add("je-label"),n}},{key:"getCheckbox",value:function(){return this.getFormInputField("checkbox")}},{key:"getCheckboxLabel",value:function(t,e){var n=Ds(Vs(o.prototype),"getCheckboxLabel",this).call(this,t,e),r=document.createElement("i");return r.classList.add("form-icon"),n.classList.add("form-checkbox","mr-5"),n.insertBefore(r,n.firstChild),n}},{key:"getFormCheckboxControl",value:function(t,e,n){return t.insertBefore(e,t.firstChild),n&&t.classList.add("form-inline"),t}},{key:"getMultiCheckboxHolder",value:function(t,e,n,r){return console.log("mul"),Ds(Vs(o.prototype),"getMultiCheckboxHolder",this).call(this,t,e,n,r)}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");for(var n in t)e.setAttribute(n,t[n]);return e}},{key:"getFormRadioLabel",value:function(t,e){var n=Ds(Vs(o.prototype),"getFormRadioLabel",this).call(this,t,e),r=document.createElement("i");return r.classList.add("form-icon"),n.classList.add("form-radio"),n.insertBefore(r,n.firstChild),n}},{key:"getFormRadioControl",value:function(t,e,n){return t.insertBefore(e,t.firstChild),n&&t.classList.add("form-inline"),t}},{key:"getFormInputField",value:function(t){var e=Ds(Vs(o.prototype),"getFormInputField",this).call(this,t);return["checkbox","radio"].includes(t)||e.classList.add("form-input"),e}},{key:"getRangeInput",value:function(t,e,n){var r=this.getFormInputField("range");return r.classList.add("slider"),r.classList.remove("form-input"),r.setAttribute("oninput",'this.setAttribute("value", this.value)'),r.setAttribute("min",t),r.setAttribute("max",e),r.setAttribute("step",n),r}},{key:"getRangeControl",value:function(t,e){var n=Ds(Vs(o.prototype),"getRangeControl",this).call(this,t,e);return n.classList.add("text-center"),n}},{key:"getSelectInput",value:function(t,e){var n=Ds(Vs(o.prototype),"getSelectInput",this).call(this,t);return n.classList.add("form-select"),n}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("form-input"),t}},{key:"getFormControl",value:function(t,e,n,r){var i=document.createElement("div");return i.classList.add("form-group"),t&&("checkbox"===e.type&&(t=this.getFormCheckboxControl(t,e,!1)),t.classList.add("form-label"),i.appendChild(t),r&&i.insertBefore(r,i.firstChild)),"small"===this.options.input_size?e.classList.add("input-sm","select-sm"):"large"===this.options.input_size&&e.classList.add("input-lg","select-lg"),"checkbox"!==e.type&&i.appendChild(e),n&&i.appendChild(n),i}},{key:"getInputGroup",value:function(t,e){if(t){var n=document.createElement("div");n.classList.add("input-group"),n.appendChild(t);for(var r=0;r<e.length;r++)e[r].classList.add("input-group-btn"),e[r].classList.remove("btn-sm","mr-2","my-1"),n.appendChild(e[r]);return n}}},{key:"getInfoButton",value:function(t){var e=document.createElement("div");e.classList.add("popover","popover-left","float-right");var n=document.createElement("button");n.classList.add("btn","btn-secondary","btn-info","btn-action","s-circle"),n.setAttribute("tabindex","-1"),e.appendChild(n);var r=document.createTextNode("I");n.appendChild(r);var i=document.createElement("div");i.classList.add("popover-container"),e.appendChild(i);var o=document.createElement("div");o.classList.add("card"),i.appendChild(o);var a=document.createElement("div");return a.classList.add("card-body"),a.innerHTML=t,o.appendChild(a),e}},{key:"getTable",value:function(){var t=Ds(Vs(o.prototype),"getTable",this).call(this);return t.classList.add("table","table-scroll"),this.options.table_border&&t.classList.add("je-table-border"),this.options.table_zebrastyle&&t.classList.add("table-striped"),t}},{key:"getProgressBar",value:function(){var t=Ds(Vs(o.prototype),"getProgressBar",this).call(this);return t.classList.add("progress"),t}},{key:"getTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.classList.add("columns"),n.innerHTML='<div class="column col-2"></div><div class="column col-10 content" id="'.concat(e,'"></div>'),n}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.innerHTML='<ul class="tab"></ul><div class="content" id="'.concat(e,'"></div>'),n}},{key:"getTab",value:function(t,e){var n=document.createElement("a");return n.classList.add("btn","btn-secondary","btn-block"),n.setAttribute("href","#".concat(e)),n.appendChild(t),n}},{key:"getTopTab",value:function(t,e){var n=document.createElement("li");n.id=e,n.classList.add("tab-item");var r=document.createElement("a");return r.setAttribute("href","#".concat(e)),r.appendChild(t),n.appendChild(r),n}},{key:"markTabActive",value:function(t){t.tab.classList.add("active"),void 0!==t.rowPane?t.rowPane.style.display="":t.container.style.display=""}},{key:"markTabInactive",value:function(t){t.tab.classList.remove("active"),void 0!==t.rowPane?t.rowPane.style.display="none":t.container.style.display="none"}},{key:"afterInputReady",value:function(t){if("select"===t.localName)if(t.classList.contains("selectized")){var e=t.nextSibling;e&&(e.classList.remove("form-select"),Array.from(e.querySelectorAll(".form-select")).forEach((function(t){t.classList.remove("form-select")})))}else if(t.classList.contains("select2-hidden-accessible")){var n=t.nextSibling;n&&n.querySelector(".select2-selection--single")&&n.classList.add("form-select")}t.controlgroup||(t.controlgroup=this.closest(t,".form-group"),this.closest(t,".compact")&&(t.controlgroup.style.marginBottom=0))}},{key:"addInputError",value:function(t,e){t.controlgroup&&(t.controlgroup.classList.add("has-error"),t.errmsg||(t.errmsg=document.createElement("p"),t.errmsg.classList.add("form-input-hint"),t.controlgroup.appendChild(t.errmsg)),t.errmsg.classList.remove("d-hide"),t.errmsg.textContent=e)}},{key:"removeInputError",value:function(t){t.errmsg&&(t.errmsg.classList.add("d-hide"),t.controlgroup.classList.remove("has-error"))}}])&&Is(e.prototype,n),r&&Is(e,r),o}(Ha);zs.rules={"*":"--primary-color:%235755d9;--gray-color:%23bcc3ce;--light-color:%23fff",".slider:focus":"box-shadow:none","h4 > label + .btn-group":"margin-left:1rem",".text-right > button":"margin-right:0%20!important",".text-left > button":"margin-left:0%20!important",".property-selector":"font-size:0.7rem;font-weight:normal;max-height:260px%20!important;width:395px%20!important",".property-selector .form-checkbox":"margin:0",textarea:"width:100%25;min-height:2rem;resize:vertical",table:"border-collapse:collapse",".table td":"padding:0.4rem%200.4rem",".mr-5":"margin-right:1rem%20!important","div[data-schematype]:not([data-schematype='object'])":"transition:0.5s","div[data-schematype]:not([data-schematype='object']):hover":"background-color:%23eee",".je-table-border td":"border:0.05rem%20solid%20%23dadee4%20!important",".btn-info":"font-size:0.5rem;font-weight:bold;height:0.8rem;padding:0.15rem%200;line-height:0.8;margin:0.3rem%200%200.3rem%200.1rem",".je-label + select":"min-width:5rem",".je-label":"font-weight:600",".btn-action.btn-info":"width:0.8rem",".je-border":"border:0.05rem%20solid%20%23dadee4",".je-panel":"padding:0.2rem;margin:0.2rem;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".je-panel-top":"padding:0.2rem;margin:0.2rem;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".required:after":"content:%22%20*%22;color:red;font:inherit",".je-align-bottom":"margin-top:auto",".je-desc":"font-size:smaller;margin:0.2rem%200",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem;border:3px%20solid%20white;box-shadow:0px%200px%208px%20rgba(0%2C%200%2C%200%2C%200.3);box-sizing:border-box",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red",".columns .container.je-noindent":"padding-left:0;padding-right:0",".selectize-control.multi .item":"background:var(--primary-color)%20!important",".select2-container--default   .select2-selection--single   .select2-selection__arrow":"display:none",".select2-container--default .select2-selection--single":"border:none",".select2-container .select2-selection--single .select2-selection__rendered":"padding:0",".select2-container .select2-search--inline .select2-search__field":"margin-top:0",".select2-container--default.select2-container--focus   .select2-selection--multiple":"border:0.05rem%20solid%20var(--gray-color)",".select2-container--default   .select2-selection--multiple   .select2-selection__choice":"margin:0.4rem%200.2rem%200.2rem%200;padding:2px%205px;background-color:var(--primary-color);color:var(--light-color)",".select2-container--default .select2-search--inline .select2-search__field":"line-height:normal",".choices":"margin-bottom:auto",".choices__list--multiple .choices__item":"border:none;background-color:var(--primary-color);color:var(--light-color)",".choices[data-type*='select-multiple'] .choices__button":"border-left:0.05rem%20solid%20%232826a6",".choices__inner":"font-size:inherit;min-height:20px;padding:4px%207.5px%204px%203.75px",".choices[data-type*='select-one'] .choices__inner":"padding-bottom:4px",".choices__list--dropdown .choices__item":"font-size:inherit"};function Ms(t){return(Ms="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function qs(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Us(t,e,n){return(Us="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Ws(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Gs(t,e){return(Gs=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function $s(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ws(t);if(e){var i=Ws(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Js(this,n)}}function Js(t,e){return!e||"object"!==Ms(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ws(t){return(Ws=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Zs={disable_theme_rules:!1,label_bold:!1,object_panel_default:!0,object_indent:!0,object_border:!1,table_border:!1,table_hdiv:!1,table_zebrastyle:!1,input_size:"small",enable_compact:!1},Qs=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Gs(t,e)}(o,t);var e,n,r,i=$s(o);function o(t){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,t,Zs)}return e=o,(n=[{key:"getGridContainer",value:function(){var t=document.createElement("div");return t.classList.add("flex","flex-col","w-full"),this.options.object_indent||t.classList.add("je-noindent"),t}},{key:"getGridRow",value:function(){var t=document.createElement("div");return t.classList.add("flex","flex-wrap","w-full"),t}},{key:"getGridColumn",value:function(){var t=document.createElement("div");return t.classList.add("flex","flex-col"),t}},{key:"setGridColumnSize",value:function(t,e,n){e>0&&e<12?t.classList.add("w-".concat(e,"/12"),"px-1"):t.classList.add("w-full","px-1"),n&&(t.style.marginLeft="".concat(100/12*n,"%"))}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return this.options.object_panel_default?t.classList.add("w-full","p-1"):t.classList.add("relative","flex","flex-col","rounded","break-words","border","bg-white","border-0","border-blue-400","p-1","shadow-md"),this.options.object_border&&t.classList.add("je-border"),t}},{key:"getTopIndentedPanel",value:function(){var t=document.createElement("div");return this.options.object_panel_default?t.classList.add("w-full","m-2"):t.classList.add("relative","flex","flex-col","rounded","break-words","border","bg-white","border-0","border-blue-400","p-1","shadow-md"),this.options.object_border&&t.classList.add("je-border"),t}},{key:"getTitle",value:function(){return this.schema.title}},{key:"getSelectInput",value:function(t,e){var n=Us(Ws(o.prototype),"getSelectInput",this).call(this,t);return e?n.classList.add("form-multiselect","block","py-0","h-auto","w-full","px-1","text-sm","text-black","leading-normal","bg-white","border","border-grey","rounded"):n.classList.add("form-select","block","py-0","h-6","w-full","px-1","text-sm","text-black","leading-normal","bg-white","border","border-grey","rounded"),this.options.enable_compact&&n.classList.add("compact"),n}},{key:"afterInputReady",value:function(t){t.controlgroup||(t.controlgroup=this.closest(t,".form-group"),this.closest(t,".compact")&&(t.controlgroup.style.marginBottom=0))}},{key:"getTextareaInput",value:function(){var t=Us(Ws(o.prototype),"getTextareaInput",this).call(this);return t.classList.add("block","w-full","px-1","text-sm","leading-normal","bg-white","text-black","border","border-grey","rounded"),this.options.enable_compact&&t.classList.add("compact"),t.style.height=0,t}},{key:"getRangeInput",value:function(t,e,n){var r=this.getFormInputField("range");return r.classList.add("slider"),this.options.enable_compact&&r.classList.add("compact"),r.setAttribute("oninput",'this.setAttribute("value", this.value)'),r.setAttribute("min",t),r.setAttribute("max",e),r.setAttribute("step",n),r}},{key:"getRangeControl",value:function(t,e){var n=Us(Ws(o.prototype),"getRangeControl",this).call(this,t,e);return n.classList.add("text-center","text-black"),n}},{key:"getCheckbox",value:function(){var t=this.getFormInputField("checkbox");return t.classList.add("form-checkbox","text-red-600"),t}},{key:"getCheckboxLabel",value:function(t,e){var n=Us(Ws(o.prototype),"getCheckboxLabel",this).call(this,t,e);return n.classList.add("inline-flex","items-center"),n}},{key:"getFormCheckboxControl",value:function(t,e,n){return t.insertBefore(e,t.firstChild),n&&t.classList.add("inline-flex flex-row"),t}},{key:"getMultiCheckboxHolder",value:function(t,e,n,r){var i=Us(Ws(o.prototype),"getMultiCheckboxHolder",this).call(this,t,e,n,r);return i.classList.add("inline-flex","flex-col"),i}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");for(var n in e.classList.add("form-radio","text-red-600"),t)e.setAttribute(n,t[n]);return e}},{key:"getFormRadioLabel",value:function(t,e){var n=Us(Ws(o.prototype),"getFormRadioLabel",this).call(this,t,e);return n.classList.add("inline-flex","items-center","mr-2"),n}},{key:"getFormRadioControl",value:function(t,e,n){return t.insertBefore(e,t.firstChild),n&&t.classList.add("form-radio"),t}},{key:"getRadioHolder",value:function(t,e,n,r,i){var a=Us(Ws(o.prototype),"getRadioHolder",this).call(this,e,n,r,i);return"h"===t.options.layout?a.classList.add("inline-flex","flex-row"):a.classList.add("inline-flex","flex-col"),a}},{key:"getFormInputLabel",value:function(t,e){var n=Us(Ws(o.prototype),"getFormInputLabel",this).call(this,t,e);return this.options.label_bold?n.classList.add("font-bold"):n.classList.add("required"),n}},{key:"getFormInputField",value:function(t){var e=Us(Ws(o.prototype),"getFormInputField",this).call(this,t);return["checkbox","radio"].includes(t)||e.classList.add("block","w-full","px-1","text-black","text-sm","leading-normal","bg-white","border","border-grey","rounded"),this.options.enable_compact&&e.classList.add("compact"),e}},{key:"getFormInputDescription",value:function(t){var e=document.createElement("p");return e.classList.add("block","mt-1","text-xs"),window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getFormControl",value:function(t,e,n,r){var i=document.createElement("div");return i.classList.add("form-group","mb-1","w-full"),t&&(t.classList.add("text-xs"),"checkbox"===e.type&&(e.classList.add("form-checkbox","text-xs","text-red-600","mr-1"),t.classList.add("items-center","flex"),t=this.getFormCheckboxControl(t,e,!1,r)),"radio"===e.type&&(e.classList.add("form-radio","text-red-600","mr-1"),t.classList.add("items-center","flex"),t=this.getFormRadioControl(t,e,!1,r)),i.appendChild(t),!["checkbox","radio"].includes(e.type)&&r&&i.appendChild(r)),["checkbox","radio"].includes(e.type)||("small"===this.options.input_size?e.classList.add("text-xs"):"normal"===this.options.input_size?e.classList.add("text-base"):"large"===this.options.input_size&&e.classList.add("text-xl"),i.appendChild(e)),n&&i.appendChild(n),i}},{key:"getHeaderButtonHolder",value:function(){var t=this.getButtonHolder();return t.classList.add("text-sm"),t}},{key:"getButtonHolder",value:function(){var t=document.createElement("div");return t.classList.add("flex","relative","inline-flex","align-middle"),t}},{key:"getButton",value:function(t,e,n){var r=Us(Ws(o.prototype),"getButton",this).call(this,t,e,n);return r.classList.add("inline-block","align-middle","text-center","text-sm","bg-blue-700","text-white","py-1","pr-1","m-2","shadow","select-none","whitespace-no-wrap","rounded"),r}},{key:"getInfoButton",value:function(t){var e=document.createElement("a");e.classList.add("tooltips","float-right"),e.innerHTML="ⓘ";var n=document.createElement("span");return n.innerHTML=t,e.appendChild(n),e}},{key:"getTable",value:function(){var t=Us(Ws(o.prototype),"getTable",this).call(this);return this.options.table_border?t.classList.add("je-table-border"):t.classList.add("table","border","p-0"),t}},{key:"getTableRow",value:function(){var t=Us(Ws(o.prototype),"getTableRow",this).call(this);return this.options.table_border&&t.classList.add("je-table-border"),this.options.table_zebrastyle&&t.classList.add("je-table-zebra"),t}},{key:"getTableHeaderCell",value:function(t){var e=Us(Ws(o.prototype),"getTableHeaderCell",this).call(this,t);return this.options.table_border?e.classList.add("je-table-border"):this.options.table_hdiv?e.classList.add("je-table-hdiv"):e.classList.add("text-xs","border","p-0","m-0"),e}},{key:"getTableCell",value:function(){var t=Us(Ws(o.prototype),"getTableCell",this).call(this);return this.options.table_border?t.classList.add("je-table-border"):this.options.table_hdiv?t.classList.add("je-table-hdiv"):t.classList.add("border-0","p-0","m-0"),t}},{key:"addInputError",value:function(t,e){t.controlgroup&&(t.controlgroup.classList.add("has-error"),t.classList.add("bg-red-600"),t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("p"),t.errmsg.classList.add("block","mt-1","text-xs","text-red"),t.controlgroup.appendChild(t.errmsg)),t.errmsg.textContent=e)}},{key:"removeInputError",value:function(t){t.errmsg&&(t.errmsg.style.display="none",t.classList.remove("bg-red-600"),t.controlgroup.classList.remove("has-error"))}},{key:"getTabHolder",value:function(t){var e=document.createElement("div"),n=void 0===t?"":t;return e.innerHTML="<div class='w-2/12' id='".concat(n,"'><ul class='list-reset pl-0 mb-0'></ul></div><div class='w-10/12' id='").concat(n,"'></div>"),e.classList.add("flex"),e}},{key:"addTab",value:function(t,e){t.children[0].children[0].appendChild(e)}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.innerHTML="<ul class='nav-tabs flex list-reset pl-0 mb-0 border-b border-grey-light' id='".concat(e,"'></ul><div class='p-6 block' id='").concat(e,"'></div>"),n}},{key:"getTab",value:function(t,e){var n=document.createElement("li");n.classList.add("nav-item","flex-col","text-center","text-white","bg-blue-500","shadow-md","border","p-2","mb-2","mr-2","hover:bg-blue-400","rounded");var r=document.createElement("a");return r.classList.add("nav-link","text-center"),r.setAttribute("href","#".concat(e)),r.setAttribute("data-toggle","tab"),r.appendChild(t),n.appendChild(r),n}},{key:"getTopTab",value:function(t,e){var n=document.createElement("li");n.classList.add("nav-item","flex","border-l","border-t","border-r");var r=document.createElement("a");return r.classList.add("nav-link","-mb-px","flex-row","text-center","bg-white","p-2","hover:bg-blue-400","rounded-t"),r.setAttribute("href","#".concat(e)),r.setAttribute("data-toggle","tab"),r.appendChild(t),n.appendChild(r),n}},{key:"getTabContent",value:function(){var t=document.createElement("div");return t.setAttribute("role","tabpanel"),t}},{key:"getTopTabContent",value:function(){var t=document.createElement("div");return t.setAttribute("role","tabpanel"),t}},{key:"markTabActive",value:function(t){t.tab.firstChild.classList.add("block"),!0===t.tab.firstChild.classList.contains("border-b")?(t.tab.firstChild.classList.add("border-b-0"),t.tab.firstChild.classList.remove("border-b")):t.tab.firstChild.classList.add("border-b-0"),!0===t.container.classList.contains("hidden")?(t.container.classList.remove("hidden"),t.container.classList.add("block")):t.container.classList.add("block")}},{key:"markTabInactive",value:function(t){!0===t.tab.firstChild.classList.contains("border-b-0")?(t.tab.firstChild.classList.add("border-b"),t.tab.firstChild.classList.remove("border-b-0")):t.tab.firstChild.classList.add("border-b"),!0===t.container.classList.contains("block")&&(t.container.classList.remove("block"),t.container.classList.add("hidden"))}},{key:"getProgressBar",value:function(){var t=document.createElement("div");t.classList.add("progress");var e=document.createElement("div");return e.classList.add("bg-blue","leading-none","py-1","text-xs","text-center","text-white"),e.setAttribute("role","progressbar"),e.setAttribute("aria-valuenow",0),e.setAttribute("aria-valuemin",0),e.setAttribute("aria-valuenax",100),e.innerHTML="".concat(0,"%"),t.appendChild(e),t}},{key:"updateProgressBar",value:function(t,e){if(t){var n=t.firstChild,r="".concat(e,"%");n.setAttribute("aria-valuenow",e),n.style.width=r,n.innerHTML=r}}},{key:"updateProgressBarUnknown",value:function(t){if(t){var e=t.firstChild;t.classList.add("progress","bg-blue","leading-none","py-1","text-xs","text-center","text-white","block"),e.removeAttribute("aria-valuenow"),e.classList.add("w-full"),e.innerHTML=""}}},{key:"getInputGroup",value:function(t,e){if(t){var n=document.createElement("div");n.classList.add("relative","items-stretch","w-full"),n.appendChild(t);var r=document.createElement("div");r.classList.add("-mr-1"),n.appendChild(r);for(var i=0;i<e.length;i++)r.appendChild(e[i]);return n}}}])&&qs(e.prototype,n),r&&qs(e,r),o}(Ha);Qs.rules={".slider":"-webkit-appearance:none;-moz-appearance:none;appearance:none;background:transparent;display:block;border:none;height:1.2rem;width:100%25",".slider:focus":"box-shadow:0%200%200%200%20rgba(87%2C%2085%2C%20217%2C%200.2);outline:none",".slider.tooltip:not([data-tooltip])::after":"content:attr(value)",".slider::-webkit-slider-thumb":"-webkit-appearance:none;background:%23f17405;border-radius:100%25;height:0.6rem;margin-top:-0.25rem;transition:transform%200.2s;width:0.6rem",".slider:active::-webkit-slider-thumb":"transform:scale(1.25);outline:none",".slider::-webkit-slider-runnable-track":"background:%23b2b4b6;border-radius:0.1rem;height:0.1rem;width:100%25","a.tooltips":"position:relative;display:inline","a.tooltips span":"position:absolute;white-space:nowrap;width:auto;padding-left:1rem;padding-right:1rem;color:%23ffffff;background:rgba(56%2C%2056%2C%2056%2C%200.85);height:1.5rem;line-height:1.5rem;text-align:center;visibility:hidden;border-radius:3px","a.tooltips span:after":"content:%22%22;position:absolute;top:50%25;left:100%25;margin-top:-5px;width:0;height:0;border-left:5px%20solid%20rgba(56%2C%2056%2C%2056%2C%200.85);border-top:5px%20solid%20transparent;border-bottom:5px%20solid%20transparent","a:hover.tooltips span":"visibility:visible;opacity:0.9;font-size:0.8rem;right:100%25;top:50%25;margin-top:-12px;margin-right:10px;z-index:999",".json-editor-btntype-properties + div":"font-size:0.8rem;font-weight:normal",textarea:"width:100%25;min-height:2rem;resize:vertical",table:"width:100%25;border-collapse:collapse",".table td":"padding:0rem%200rem","div[data-schematype]:not([data-schematype='object'])":"transition:0.5s","div[data-schematype]:not([data-schematype='object']):hover":"background-color:%23e6f4fe","div[data-schemaid='root']":"position:relative;width:inherit;display:inherit;overflow-x:hidden;z-index:10","select[multiple]":"height:auto","select[multiple].from-select":"height:auto",".je-table-zebra:nth-child(even)":"background-color:%23f2f2f2",".je-table-border":"border:0.5px%20solid%20black",".je-table-hdiv":"border-bottom:1px%20solid%20black",".je-border":"border:0.05rem%20solid%20%233182ce",".je-panel":"width:inherit;padding:0.2rem;margin:0.2rem;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".je-panel-top":"width:100%25;padding:0.2rem;margin:0.2rem;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".required:after":"content:%22%20*%22;color:red;font:inherit;font-weight:bold",".je-desc":"font-size:smaller;margin:0.2rem%200",".container-xl.je-noindent":"padding-left:0;padding-right:0",".json-editor-btntype-add":"color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%234299e1;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btntype-deletelast":"color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%23e53e3e;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btntype-deleteall":"color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%23000000;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btn-save":"float:right;color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%232b6cb0;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btn-back":"color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%232b6cb0;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btntype-delete":"color:%23e53e3e;background-color:rgba(218%2C%20222%2C%20228%2C%200.1);margin:0.03rem;padding:0.1rem",".json-editor-btntype-move":"color:%23000000;background-color:rgba(218%2C%20222%2C%20228%2C%200.1);margin:0.03rem;padding:0.1rem",".json-editor-btn-collapse":"padding:0em%200.8rem;font-size:1.3rem;color:%23e53e3e;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};var Ys={html:Za,bootstrap3:as,bootstrap4:ys,jqueryui:js,barebones:Ts,spectre:zs,tailwind:Qs},Xs={".je-float-right-linkholder":"float:right;margin-left:10px",".je-modal":"background-color:white;border:1px%20solid%20black;box-shadow:3px%203px%20black;position:absolute;z-index:10",".je-infobutton-icon":"font-size:16px;font-weight:bold;padding:0.25rem;position:relative;display:inline-block",".je-infobutton-tooltip":"font-size:12px;font-weight:normal;font-family:sans-serif;visibility:hidden;background-color:rgba(50%2C%2050%2C%2050%2C%200.75);margin:0%200.25rem;color:%23fafafa;padding:0.5rem%201rem;border-radius:0.25rem;width:20rem;position:absolute",".je-header":"display:inline-block",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-checkbox":"display:inline-block;width:auto",".je-checkbox-control--compact":"display:inline-block;margin-right:1rem",".je-radio":"display:inline-block;width:auto",".je-radio-control--compact":"display:inline-block;margin-right:1rem",".je-switcher":"background-color:transparent;display:inline-block;font-style:italic;font-weight:normal;height:auto;width:auto;margin-bottom:0;margin-left:5px;padding:0%200%200%203px",".je-textarea":"width:100%25;height:300px;box-sizing:border-box",".je-range-control":"text-align:center",".je-indented-panel":"padding-left:10px;margin-left:10px;border-left:1px%20solid%20%23ccc",".je-indented-panel--top":"padding-left:10px;margin-left:10px",".je-tabholder":"float:left;width:130px",".je-tabholder .content":"margin-left:120px",".je-tabholder--top":"margin-left:10px",".je-tabholder--clear":"clear:both",".je-tab":"border:1px%20solid%20%23ccc;border-width:1px%200%201px%201px;text-align:center;line-height:30px;border-radius:5px;border-bottom-right-radius:0;border-top-right-radius:0;font-weight:bold;cursor:pointer",".je-tab--top":"float:left;border:1px%20solid%20%23ccc;border-width:1px%201px%200px%201px;text-align:center;line-height:30px;border-radius:5px;padding-left:5px;padding-right:5px;border-bottom-right-radius:0;border-bottom-left-radius:0;font-weight:bold;cursor:pointer",".je-block-link":"display:block",".je-media":"width:100%25"};function Ks(t){return function(t){if(Array.isArray(t))return tl(t)}(t)||function(t){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(t))return Array.from(t)}(t)||function(t,e){if(!t)return;if("string"==typeof t)return tl(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return tl(t,e)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function tl(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function el(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function nl(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}var rl=function(){function t(e){var n=this,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(el(this,t),!(e instanceof Element))throw new Error("element should be an instance of Element");this.element=e,this.options=f({},t.defaults.options,r),this.ready=!1,this.copyClipboard=null,this.schema=this.options.schema,this.template=this.options.template,this.translate=this.options.translate||t.defaults.translate,this.uuid=0,this.__data={};var i=this.options.theme||t.defaults.theme,o=t.defaults.themes[i];if(!o)throw new Error("Unknown theme ".concat(i));this.element.setAttribute("data-theme",i),this.theme=new o(this);var a=f(Xs,this.getEditorsRules()),s=function(t,e,r){return r?n.addNewStyleRulesToShadowRoot(t,e,r):n.addNewStyleRules(t,e)};if(!this.theme.options.disable_theme_rules){var l=m(this.element);s("default",a,l),void 0!==o.rules&&s(i,o.rules,l)}var c=t.defaults.iconlibs[this.options.iconlib||t.defaults.iconlib];c&&(this.iconlib=new c),this.root_container=this.theme.getContainer(),this.element.appendChild(this.root_container);var u=document.location.origin+document.location.pathname.toString(),h=new L(this.options),d=document.location.toString();this.expandSchema=function(t,e){return h.expandSchema(t,e)},this.expandRefs=function(t,e){return h.expandRefs(t,e)},this.refs=h.refs,h.load(this.schema,(function(e){var r=n.options.custom_validators?{custom_validators:n.options.custom_validators}:{};n.validator=new C(n,null,r,t.defaults);var i=n.getEditorClass(e);n.root=n.createEditor(i,{jsoneditor:n,schema:e,required:!0,container:n.root_container}),n.root.preBuild(),n.root.build(),n.root.postBuild(),v(n.options,"startval")&&n.root.setValue(n.options.startval),n.validation_results=n.validator.validate(n.root.getValue()),n.root.showValidationErrors(n.validation_results),n.ready=!0,window.requestAnimationFrame((function(){n.ready&&(n.validation_results=n.validator.validate(n.root.getValue()),n.root.showValidationErrors(n.validation_results),n.trigger("ready"),n.trigger("change"))}))}),u,d)}var e,n,r;return e=t,(n=[{key:"getValue",value:function(){if(!this.ready)throw new Error("JSON Editor not ready yet.  Listen for 'ready' event before getting the value");return this.root.getValue()}},{key:"setValue",value:function(t){if(!this.ready)throw new Error("JSON Editor not ready yet.  Listen for 'ready' event before setting the value");return this.root.setValue(t),this}},{key:"validate",value:function(t){if(!this.ready)throw new Error("JSON Editor not ready yet.  Listen for 'ready' event before validating");return 1===arguments.length?this.validator.validate(t):this.validation_results}},{key:"destroy",value:function(){this.destroyed||this.ready&&(this.schema=null,this.options=null,this.root.destroy(),this.root=null,this.root_container=null,this.validator=null,this.validation_results=null,this.theme=null,this.iconlib=null,this.template=null,this.__data=null,this.ready=!1,this.element.innerHTML="",this.element.removeAttribute("data-theme"),this.destroyed=!0)}},{key:"on",value:function(t,e){return this.callbacks=this.callbacks||{},this.callbacks[t]=this.callbacks[t]||[],this.callbacks[t].push(e),this}},{key:"off",value:function(t,e){if(t&&e){this.callbacks=this.callbacks||{},this.callbacks[t]=this.callbacks[t]||[];for(var n=[],r=0;r<this.callbacks[t].length;r++)this.callbacks[t][r]!==e&&n.push(this.callbacks[t][r]);this.callbacks[t]=n}else t?(this.callbacks=this.callbacks||{},this.callbacks[t]=[]):this.callbacks={};return this}},{key:"trigger",value:function(t,e){if(this.callbacks&&this.callbacks[t]&&this.callbacks[t].length)for(var n=0;n<this.callbacks[t].length;n++)this.callbacks[t][n].apply(this,[e]);return this}},{key:"setOption",value:function(t,e){if("show_errors"!==t)throw new Error("Option ".concat(t," must be set during instantiation and cannot be changed later"));return this.options.show_errors=e,this.onChange(),this}},{key:"getEditorsRules",value:function(){return Object.values(t.defaults.editors).reduce((function(t,e){return e.rules?f(t,e.rules):t}),{})}},{key:"getEditorClass",value:function(e){var n;if(e=this.expandSchema(e),t.defaults.resolvers.find((function(r){return(n=r(e))&&t.defaults.editors[n]})),!n)throw new Error("Unknown editor for schema ".concat(JSON.stringify(e)));if(!t.defaults.editors[n])throw new Error("Unknown editor ".concat(n));return t.defaults.editors[n]}},{key:"createEditor",value:function(e,n){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1;return new e(n=f({},e.options||{},n),t.defaults,r)}},{key:"onChange",value:function(){var t=this;if(this.ready&&!this.firing_change)return this.firing_change=!0,window.requestAnimationFrame((function(){t.firing_change=!1,t.ready&&(t.validation_results=t.validator.validate(t.root.getValue()),"never"!==t.options.show_errors?t.root.showValidationErrors(t.validation_results):t.root.showValidationErrors([]),t.trigger("change"))})),this}},{key:"compileTemplate",value:function(e){var n,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t.defaults.template;if("string"==typeof r){if(!t.defaults.templates[r])throw new Error("Unknown template engine ".concat(r));if(!(n=t.defaults.templates[r]()))throw new Error("Template engine ".concat(r," missing required library."))}else n=r;if(!n)throw new Error("No template engine set");if(!n.compile)throw new Error("Invalid template engine set");return n.compile(e)}},{key:"_data",value:function(t,e,n){if(3!==arguments.length)return t.hasAttribute("data-jsoneditor-".concat(e))?this.__data[t.getAttribute("data-jsoneditor-".concat(e))]:null;var r;t.hasAttribute("data-jsoneditor-".concat(e))?r=t.getAttribute("data-jsoneditor-".concat(e)):(r=this.uuid++,t.setAttribute("data-jsoneditor-".concat(e),r)),this.__data[r]=n}},{key:"registerEditor",value:function(t){return this.editors=this.editors||{},this.editors[t.path]=t,this}},{key:"unregisterEditor",value:function(t){return this.editors=this.editors||{},this.editors[t.path]=null,this}},{key:"getEditor",value:function(t){if(this.editors)return this.editors[t]}},{key:"watch",value:function(t,e){return this.watchlist=this.watchlist||{},this.watchlist[t]=this.watchlist[t]||[],this.watchlist[t].push(e),this}},{key:"unwatch",value:function(t,e){if(!this.watchlist||!this.watchlist[t])return this;if(!e)return this.watchlist[t]=null,this;for(var n=[],r=0;r<this.watchlist[t].length;r++)this.watchlist[t][r]!==e&&n.push(this.watchlist[t][r]);return this.watchlist[t]=n.length?n:null,this}},{key:"notifyWatchers",value:function(t){if(!this.watchlist||!this.watchlist[t])return this;for(var e=0;e<this.watchlist[t].length;e++)this.watchlist[t][e]()}},{key:"isEnabled",value:function(){return!this.root||this.root.isEnabled()}},{key:"enable",value:function(){this.root.enable()}},{key:"disable",value:function(){this.root.disable()}},{key:"setCopyClipboardContents",value:function(t){this.copyClipboard=t}},{key:"getCopyClipboardContents",value:function(){return this.copyClipboard}},{key:"addNewStyleRules",value:function(t,e){var n=document.querySelector("#theme-".concat(t));n||((n=document.createElement("style")).setAttribute("id","theme-".concat(t)),n.appendChild(document.createTextNode("")),document.head.appendChild(n));for(var r=n.sheet?n.sheet:n.styleSheet,i=this.element.nodeName.toLowerCase();r.cssRules.length>0;)r.deleteRule(0);Object.keys(e).forEach((function(n){var o="default"===t?n:"".concat(i,'[data-theme="').concat(t,'"] ').concat(n);r.insertRule?r.insertRule(o+" {"+decodeURIComponent(e[n])+"}",0):r.addRule&&r.addRule(o,decodeURIComponent(e[n]),0)}))}},{key:"addNewStyleRulesToShadowRoot",value:function(t,e,n){var r=this.element.nodeName.toLowerCase(),i="";Object.keys(e).forEach((function(n){var o="default"===t?n:"".concat(r,'[data-theme="').concat(t,'"] ').concat(n);i+=o+" {"+decodeURIComponent(e[n])+"}\n"}));var o=new CSSStyleSheet;o.replaceSync(i),n.adoptedStyleSheets=[].concat(Ks(n.adoptedStyleSheets),[o])}}])&&nl(e.prototype,n),r&&nl(e,r),t}();rl.defaults=c,rl.AbstractEditor=B,rl.AbstractTheme=Ha,rl.AbstractIconLib=Ko,Object.assign(rl.defaults.themes,Ys),Object.assign(rl.defaults.editors,$o),Object.assign(rl.defaults.templates,Jo),Object.assign(rl.defaults.iconlibs,Ba)}])}));
\ No newline at end of file
diff --git a/public/javascripts/Chart.min.js b/public/javascripts/Chart.min.js
index 7c16b0d128..a87f61443e 100644
--- a/public/javascripts/Chart.min.js
+++ b/public/javascripts/Chart.min.js
@@ -1,7 +1,7 @@
 /*!
- * Chart.js v2.9.3
+ * Chart.js v2.9.4
  * https://www.chartjs.org
- * (c) 2019 Chart.js Contributors
+ * (c) 2020 Chart.js Contributors
  * Released under the MIT License
  */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(function(){try{return require("moment")}catch(t){}}()):"function"==typeof define&&define.amd?define(["require"],(function(t){return e(function(){try{return t("moment")}catch(t){}}())})):(t=t||self).Chart=e(t.moment)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},n=function(t,e){return t(e={exports:{}},e.exports),e.exports}((function(t){var n={};for(var i in e)e.hasOwnProperty(i)&&(n[e[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=n[t];if(i)return i;var a,r,o,s=1/0;for(var l in e)if(e.hasOwnProperty(l)){var u=e[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return e[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));n.rgb,n.hsl,n.hsv,n.hwb,n.cmyk,n.xyz,n.lab,n.lch,n.hex,n.keyword,n.ansi16,n.ansi256,n.hcg,n.apple,n.gray;function i(t){var e=function(){for(var t={},e=Object.keys(n),i=e.length,a=0;a<i;a++)t[e[a]]={distance:-1,parent:null};return t}(),i=[t];for(e[t].distance=0;i.length;)for(var a=i.pop(),r=Object.keys(n[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,i.unshift(l))}return e}function a(t,e){return function(n){return e(t(n))}}function r(t,e){for(var i=[e[t].parent,t],r=n[e[t].parent][t],o=e[t].parent;e[o].parent;)i.unshift(e[o].parent),r=a(n[e[o].parent][o],r),o=e[o].parent;return r.conversion=i,r}var o={};Object.keys(n).forEach((function(t){o[t]={},Object.defineProperty(o[t],"channels",{value:n[t].channels}),Object.defineProperty(o[t],"labels",{value:n[t].labels});var e=function(t){for(var e=i(t),n={},a=Object.keys(e),o=a.length,s=0;s<o;s++){var l=a[s];null!==e[l].parent&&(n[l]=r(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];o[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),o[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var s=o,l={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},u={getRgba:d,getHsla:h,getRgb:function(t){var e=d(t);return e&&e.slice(0,3)},getHsl:function(t){var e=h(t);return e&&e.slice(0,3)},getHwb:c,getAlpha:function(t){var e=d(t);if(e)return e[3];if(e=h(t))return e[3];if(e=c(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+v(t[0])+v(t[1])+v(t[2])+(e>=0&&e<1?v(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return f(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:f,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:g,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return b[t.slice(0,3)]}};function d(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=l[i[1]]))return}for(r=0;r<e.length;r++)e[r]=m(e[r],0,255);return n=n||0==n?m(n,0,1):1,e[3]=n,e}}function h(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function c(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function f(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function g(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function m(t,e,n){return Math.min(Math.max(e,t),n)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var b={};for(var x in l)b[l[x]]=x;var y=function(t){return t instanceof y?t:this instanceof y?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=u.getRgba(t))?this.setValues("rgb",e):(e=u.getHsla(t))?this.setValues("hsl",e):(e=u.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new y(t);var e};y.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return u.hexString(this.values.rgb)},rgbString:function(){return u.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return u.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return u.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return u.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return u.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return u.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return u.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new y,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},y.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},y.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},y.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},y.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)a[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];l=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];l=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===l?a.alpha:l)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=s[t][d](a[t]));return!0},y.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},y.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=y);var _,k=y,w={noop:function(){},uid:(_=0,function(){return _++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return w.valueOrDefault(w.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(w.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(w.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!w.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(w.isArray(t))return t.map(w.clone);if(w.isObject(t)){for(var e={},n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=w.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){var a=e[t],r=n[t];w.isObject(a)&&w.isObject(r)?w.merge(a,r,i):e[t]=w.clone(r)},_mergerIf:function(t,e,n){var i=e[t],a=n[t];w.isObject(i)&&w.isObject(a)?w.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=w.clone(a))},merge:function(t,e,n){var i,a,r,o,s,l=w.isArray(e)?e:[e],u=l.length;if(!w.isObject(t))return t;for(i=(n=n||{}).merger||w._merger,a=0;a<u;++a)if(e=l[a],w.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return w.merge(t,e,{merger:w._mergerIf})},extend:Object.assign||function(t){return w.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=w.inherits,t&&w.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},M=w;w.callCallback=w.callback,w.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},w.getValueOrDefault=w.valueOrDefault,w.getValueAtIndexOrDefault=w.valueAtIndexOrDefault;var S={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-S.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*S.easeInBounce(2*t):.5*S.easeOutBounce(2*t-1)+.5}},C={effects:S};M.easingEffects=S;var P=Math.PI,A=P/180,D=2*P,T=P/2,I=P/4,F=2*P/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-P,-T),t.arc(u,l,o,-T,0),t.arc(u,d,o,0,T),t.arc(s,d,o,T,P)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-T,T),t.arc(s,l,o,T,P+T)):l<d?(t.arc(s,l,o,-P,0),t.arc(s,d,o,0,P)):t.arc(s,l,o,-P,P),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*A;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,D),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=F,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=F,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+I)*u,l=Math.sin(h+I)*u,t.arc(i-s,a-l,d,h-P,h-T),t.arc(i+l,a-s,d,h-T,h),t.arc(i+s,a+l,d,h,h+T),t.arc(i-l,a+s,d,h+T,h+P),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=I;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=I;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=I,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},O=L;M.clear=L.clear,M.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var R={_set:function(t,e){return M.merge(this[t]||(this[t]={}),e)}};R._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var z=R,N=M.valueOrDefault;var B={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return M.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=z.global,n=N(t.fontSize,e.defaultFontSize),i={family:N(t.fontFamily,e.defaultFontFamily),lineHeight:M.options.toLineHeight(N(t.lineHeight,e.defaultLineHeight),n),size:n,style:N(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||M.isNullOrUndef(t.size)||M.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&M.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},E={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},W=E;M.log10=E.log10;var V=M,H=C,j=O,q=B,U=W,Y={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};V.easing=H,V.canvas=j,V.options=q,V.math=U,V.rtl=Y;var G=function(t){V.extend(this,t),this.initialize.apply(this,arguments)};V.extend(G.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=V.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=k(l)).valid&&(c=k(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(V.isFinite(l)&&V.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=V.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return V.isNumber(this._model.x)&&V.isNumber(this._model.y)}}),G.extend=V.inherits;var X=G,K=X.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),Z=K;Object.defineProperty(K.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(K.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),z._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:V.noop,onComplete:V.noop}});var $={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=V.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=V.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),V.callback(t.render,[e,t],e),V.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(V.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},J=V.options.resolve,Q=["push","pop","shift","splice","unshift"];function tt(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(Q.forEach((function(e){delete t[e]})),delete t._chartjs)}}var et=function(t,e){this.initialize(t,e)};V.extend(et.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&tt(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&tt(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),Q.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return V.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=V.merge({},[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&V._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:V.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=J([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},p={cacheable:!i};if(i=i||{},V.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=J([i[l],d[l],h[l]],g,e,p);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=J([i[l],d[c[l]],d[l],h[l]],g,e,p);return p.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){V.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=V.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=J([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=J([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=J([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),et.extend=V.inherits;var nt=et,it=2*Math.PI;function at(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function rt(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+it,at(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=it,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+it,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+it),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&at(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}z._set("global",{elements:{arc:{backgroundColor:z.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var ot=X.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=V.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=it;for(;a>s;)a-=it;for(;a<o;)a+=it;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/it)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+it,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%it}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&rt(e,n,a),e.restore()}}),st=V.valueOrDefault,lt=z.global.defaultColor;z._set("global",{elements:{line:{tension:.4,backgroundColor:lt,borderWidth:3,borderColor:lt,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var ut=X.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=z.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=V.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=st(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=st(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?V.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):V.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),dt=V.valueOrDefault,ht=z.global.defaultColor;function ct(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}z._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ht,borderColor:ht,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var ft=X.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ct,inXRange:ct,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=z.global,u=l.defaultColor;e.skip||(void 0===t||V.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=dt(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,V.canvas.drawPoint(n,i,r,o,s,a))}}),gt=z.global.defaultColor;function pt(t){return t&&void 0!==t.width}function mt(t){var e,n,i,a,r;return pt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function vt(t,e,n){return t===e?n:t===n?e:t}function bt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=vt(e,"left","right")):t.base<t.y&&(e=vt(e,"bottom","top")),n[e]=!0,n):n}(t);return V.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function xt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&mt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}z._set("global",{elements:{rectangle:{backgroundColor:gt,borderColor:gt,borderSkipped:"bottom",borderWidth:0}}});var yt=X.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=mt(t),n=e.right-e.left,i=e.bottom-e.top,a=bt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return xt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return pt(n)?xt(n,t,null):xt(n,null,e)},inXRange:function(t){return xt(this._view,t,null)},inYRange:function(t){return xt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return pt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return pt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),_t={},kt=ot,wt=ut,Mt=ft,St=yt;_t.Arc=kt,_t.Line=wt,_t.Point=Mt,_t.Rectangle=St;var Ct=V._deprecated,Pt=V.valueOrDefault;function At(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=V.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return V.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}z._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),z._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Dt=nt.extend({dataElementType:_t.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;nt.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Ct("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Ct("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Ct("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Ct("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Ct("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},V.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),p=h._parseValue(f[t].data[e]),m=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,x=void 0===p.start?0:p.max>=0&&p.min>=0?p.min:p.max,y=void 0===p.start?p.end:p.max>=0&&p.min>=0?p.max-p.min:p.min-p.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(p.min<0&&r<0||p.max>=0&&r>0)&&(x+=r));return o=h.getPixelForValue(x),l=(s=h.getPixelForValue(x+y))-o,void 0!==m&&Math.abs(l)<m&&(l=m,s=y>=0&&!c||y<0&&c?o-m:o+m),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):At(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(Pt(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(V.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}V.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=V.extend({},nt.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=Pt(n.barPercentage,e.barPercentage),e.barThickness=Pt(n.barThickness,e.barThickness),e.categoryPercentage=Pt(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=Pt(n.maxBarThickness,e.maxBarThickness),e.minBarLength=Pt(i.minBarLength,e.minBarLength),e}}),Tt=V.valueOrDefault,It=V.options.resolve;z._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Ft=nt.extend({dataElementType:_t.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;V.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Tt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Tt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Tt(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=nt.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=V.extend({},s)),s.radius=It([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=V.valueOrDefault,Ot=Math.PI,Rt=2*Ot,zt=Ot/2;z._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-zt,circumference:Rt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return V.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Nt=nt.extend({dataElementType:_t.Arc,linkScales:V.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,p=l.cutoutPercentage/100||0,m=l.circumference,v=r._getRingWeight(r.index);if(m<Rt){var b=l.rotation%Rt,x=(b+=b>=Ot?-Rt:b<-Ot?Rt:0)+m,y=Math.cos(b),_=Math.sin(b),k=Math.cos(x),w=Math.sin(x),M=b<=0&&x>=0||x>=Rt,S=b<=zt&&x>=zt||x>=Rt+zt,C=b<=-zt&&x>=-zt||x>=Ot+zt,P=b===-Ot||x>=Ot?-1:Math.min(y,y*p,k,k*p),A=C?-1:Math.min(_,_*p,w,w*p),D=M?1:Math.max(y,y*p,k,k*p),T=S?1:Math.max(_,_*p,w,w*p);u=(D-P)/2,d=(T-A)/2,h=-(D+P)/2,c=-(T+A)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*p,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/Rt),g=n&&s.animateScale?0:i.innerRadius,p=n&&s.animateScale?0:i.outerRadius,m=t._options||{};V.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:m.backgroundColor,borderColor:m.borderColor,borderWidth:m.borderWidth,borderAlign:m.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:p,innerRadius:g,label:V.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return V.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?Rt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});z._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),z._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Bt=Dt.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Et=V.valueOrDefault,Wt=V.options.resolve,Vt=V.canvas._isPointInArea;function Ht(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function jt(t,e,n){var i=n/2,a=Ht(t,i),r=Ht(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function qt(t){var e,n,i,a;return V.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}z._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Ut=nt.extend({datasetElementType:_t.Line,dataElementType:_t.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Et(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Et(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=nt.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Et(n.spanGaps,a.spanGaps),o.tension=Et(n.lineTension,r.tension),o.steppedLine=Wt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=qt(Et(n.clip,jt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)V.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=V.splineCurve(V.previousItem(l,t)._model,n,V.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Vt(n,s)&&(t>0&&Vt(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Vt(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,V.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),V.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Et(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Et(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Et(n.hoverBorderWidth,n.borderWidth),e.radius=Et(n.hoverRadius,n.radius)}}),Yt=V.options.resolve;z._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Gt=nt.extend({dataElementType:_t.Arc,linkScales:V.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],p=g+(t.hidden?0:i._angles[e]),m=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};V.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?m:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:p,label:V.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return V.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor,a=V.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Yt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});z._set("pie",V.clone(z.doughnut)),z._set("pie",{cutoutPercentage:0});var Xt=Nt,Kt=V.valueOrDefault;z._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var Zt=nt.extend({datasetElementType:_t.Line,dataElementType:_t.Point,linkScales:V.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Kt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=nt.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Kt(e.spanGaps,n.spanGaps),i.tension=Kt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=V.splineCurve(V.previousItem(o,t,!0)._model,n,V.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Kt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Kt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Kt(n.hoverBorderWidth,n.borderWidth),e.radius=Kt(n.hoverRadius,n.radius)}});z._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),z._set("global",{datasets:{scatter:{showLine:!1}}});var $t={bar:Dt,bubble:Ft,doughnut:Nt,horizontalBar:Bt,line:Ut,polarArea:Gt,pie:Xt,radar:Zt,scatter:Ut};function Jt(t,e){return t.native?{x:t.x,y:t.y}:V.getRelativePosition(t,e)}function Qt(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function te(t,e){var n=[];return Qt(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ee(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return Qt(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ne(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ie(t,e,n){var i=Jt(e,t);n.axis=n.axis||"x";var a=ne(n.axis),r=n.intersect?te(t,i):ee(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var ae={modes:{single:function(t,e){var n=Jt(e,t),i=[];return Qt(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ie,index:ie,dataset:function(t,e,n){var i=Jt(e,t);n.axis=n.axis||"xy";var a=ne(n.axis),r=n.intersect?te(t,i):ee(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ie(t,e,{intersect:!1})},point:function(t,e){return te(t,Jt(e,t))},nearest:function(t,e,n){var i=Jt(e,t);n.axis=n.axis||"xy";var a=ne(n.axis);return ee(t,i,n.intersect,a)},x:function(t,e,n){var i=Jt(e,t),a=[],r=!1;return Qt(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Jt(e,t),a=[],r=!1;return Qt(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},re=V.extend;function oe(t,e){return V.where(t,(function(t){return t.pos===e}))}function se(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function le(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function ue(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-le(o,t,"left","right"),a=e.outerHeight-le(o,t,"top","bottom"),i!==t.w||a!==t.h)return t.w=i,t.h=a,n.horizontal?i!==t.w:a!==t.h}function de(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function he(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,de(r.horizontal,e)),ue(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&he(u,e,n)||l}function ce(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}z._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var fe,ge={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=V.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=se(oe(e,"left"),!0),i=se(oe(e,"right")),a=se(oe(e,"top"),!0),r=se(oe(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:oe(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=re({maxPadding:re({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),he(l,h,d),he(u,h,d)&&he(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),ce(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,ce(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},V.each(s.chartArea,(function(e){var n=e.box;re(n,t.chartArea),n.update(h.w,h.h)}))}}},pe=(fe=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&fe.default||fe,me="$chartjs",ve="chartjs-size-monitor",be="chartjs-render-monitor",xe="chartjs-render-animation",ye=["animationstart","webkitAnimationStart"],_e={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function ke(t,e){var n=V.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var we=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Me(t,e,n){t.addEventListener(e,n,we)}function Se(t,e,n){t.removeEventListener(e,n,we)}function Ce(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Pe(t){var e=document.createElement("div");return e.className=t||"",e}function Ae(t,e,n){var i,a,r,o,s=t[me]||(t[me]={}),l=s.resizer=function(t){var e=Pe(ve),n=Pe(ve+"-expand"),i=Pe(ve+"-shrink");n.appendChild(Pe()),i.appendChild(Pe()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Me(n,"scroll",a.bind(n,"expand")),Me(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Ce("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Ce("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,V.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[me]||(t[me]={}),i=n.renderProxy=function(t){t.animationName===xe&&e()};V.each(ye,(function(e){Me(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(be)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function De(t){var e=t[me]||{},n=e.resizer;delete e.resizer,function(t){var e=t[me]||{},n=e.renderProxy;n&&(V.each(ye,(function(e){Se(t,e,n)})),delete e.renderProxy),t.classList.remove(be)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Te={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[me]||(t[me]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,pe)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[me]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=ke(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=ke(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[me]){var n=e[me].initial;["height","width"].forEach((function(t){var i=n[t];V.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),V.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[me]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[me]||(n[me]={});Me(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=_e[t.type]||t.type,i=V.getRelativePosition(t,e);return Ce(n,e,i.x,i.y,t)}(e,t))})}else Ae(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[me]||{}).proxies||{})[t.id+"_"+e];a&&Se(i,e,a)}else De(i)}};V.addEvent=Me,V.removeEvent=Se;var Ie=Te._enabled?Te:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Fe=V.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Ie);z._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=V.clone(z.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Oe={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=V.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?V.merge({},[z.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=V.extend(this.defaults[t],e))},addScalesToLayout:function(t){V.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,ge.addBox(t,e)}))}},Re=V.valueOrDefault,ze=V.rtl.getRtlAdapter;z._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:V.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:V.noop,beforeBody:V.noop,beforeLabel:V.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),V.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:V.noop,afterBody:V.noop,beforeFooter:V.noop,footer:V.noop,afterFooter:V.noop}}});var Ne={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=V.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Be(t,e){return e&&(V.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function Ee(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function We(t){var e=z.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:Re(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:Re(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:Re(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:Re(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:Re(t.titleFontStyle,e.defaultFontStyle),titleFontSize:Re(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:Re(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:Re(t.footerFontStyle,e.defaultFontStyle),footerFontSize:Re(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function Ve(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function He(t){return Be([],Ee(t))}var je=X.extend({initialize:function(){this._model=We(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Be(o,Ee(i)),o=Be(o,Ee(a)),o=Be(o,Ee(r))},getBeforeBody:function(){return He(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return V.each(t,(function(t){var r={before:[],lines:[],after:[]};Be(r.before,Ee(i.beforeLabel.call(n,t,e))),Be(r.lines,i.label.call(n,t,e)),Be(r.after,Ee(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return He(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Be(r,Ee(n)),r=Be(r,Ee(i)),r=Be(r,Ee(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=We(c),p=h._active,m=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},x={width:f.width,height:f.height},y={x:f.caretX,y:f.caretY};if(p.length){g.opacity=1;var _=[],k=[];y=Ne[c.position].call(h,p,h._eventPosition);var w=[];for(e=0,n=p.length;e<n;++e)w.push((i=p[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(w=w.filter((function(t){return c.filter(t,m)}))),c.itemSort&&(w=w.sort((function(t,e){return c.itemSort(t,e,m)}))),V.each(w,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),k.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(w,m),g.beforeBody=h.getBeforeBody(w,m),g.body=h.getBody(w,m),g.afterBody=h.getAfterBody(w,m),g.footer=h.getFooter(w,m),g.x=y.x,g.y=y.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=k,g.dataPoints=w,x=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=V.fontString(u,e._titleFontStyle,e._titleFontFamily),V.each(e.title,f),n.font=V.fontString(d,e._bodyFontStyle,e._bodyFontFamily),V.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,V.each(r,(function(t){V.each(t.before,f),V.each(t.lines,f),V.each(t.after,f)})),c=0,n.font=V.fontString(h,e._footerFontStyle,e._footerFontFamily),V.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,x,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,x),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=x.width,g.height=x.height,g.caretX=y.x,g.caretY=y.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,p=e.width,m=e.height;if("center"===c)s=g+m/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+p)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+p-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+m)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=ze(e.rtl,e.x,e.width);for(t.x=Ve(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=V.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,p=e.displayColors,m=0,v=p?Ve(e,"left"):0,b=ze(e.rtl,e.x,e.width),x=function(e){n.fillText(e,b.x(t.x+m),t.y+h/2),t.y+=h+c},y=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=V.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=Ve(e,y),n.fillStyle=e.bodyFontColor,V.each(e.beforeBody,x),m=p&&"right"!==y?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,V.each(i.before,x),l=0,d=(o=i.lines).length;l<d;++l){if(p){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}x(o[l])}V.each(i.after,x)}m=0,V.each(e.afterBody,x),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=ze(e.rtl,e.x,e.width);for(t.x=Ve(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=V.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,V.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),V.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!V.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),qe=Ne,Ue=je;Ue.positioners=qe;var Ye=V.valueOrDefault;function Ge(){return V.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ye(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?V.merge(e[t][a],[Oe.getScaleDefaults(r),o]):V.merge(e[t][a],o)}else V._merger(t,e,n,i)}})}function Xe(){return V.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||{},r=n[t];"scales"===t?e[t]=Ge(a,r):"scale"===t?e[t]=V.merge(a,[Oe.getScaleDefaults(r.type),r]):V._merger(t,e,n,i)}})}function Ke(t){var e=t.options;V.each(t.scales,(function(e){ge.removeBox(t,e)})),e=Xe(z.global,z[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function Ze(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(V.findIndex(t,a)>=0);return i}function $e(t){return"top"===t||"bottom"===t}function Je(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}z._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var Qe=function(t,e){return this.construct(t,e),this};V.extend(Qe.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||{}).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Xe(z.global,z[t.type],t.options||{}),t}(e);var i=Fe.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=V.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,Qe.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),V.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return V.canvas.clear(this),this},stop:function(){return $.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(V.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:V.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",V.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;V.each(e.xAxes,(function(t,n){t.id||(t.id=Ze(e.xAxes,"x-axis-",n))})),V.each(e.yAxes,(function(t,n){t.id||(t.id=Ze(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),V.each(i,(function(e){var i=e.options,r=i.id,o=Ye(i.type,e.dtype);$e(i.position)!==$e(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Oe.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),V.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Oe.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=$t[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;V.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ke(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&V.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Je("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(ge.update(this,this.width,this.height),t._layers=[],V.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ye(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),V.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new Z({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=V.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});$.addAnimation(e,o,i,a)}else e.draw(),r(new Z({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),V.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Je("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return ae.modes.single(this,t)},getElementsAtEvent:function(t){return ae.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return ae.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=ae.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return ae.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),V.canvas.clear(n),Fe.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete Qe.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ue({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};V.each(t.options.events,(function(i){Fe.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Fe.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,V.each(e,(function(e,n){Fe.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),V.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!V.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),Qe.instances={};var tn=Qe;Qe.Controller=Qe,Qe.types={},V.configMerge=Xe,V.scaleMerge=Ge;function en(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function nn(t){this.options=t||{}}V.extend(nn.prototype,{formats:en,parse:en,format:en,add:en,diff:en,startOf:en,endOf:en,_create:function(t){return t}}),nn.override=function(t){V.extend(nn.prototype,t)};var an={_date:nn},rn={formatters:{values:function(t){return V.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=V.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=V.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(V.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},on=V.isArray,sn=V.isNullOrUndef,ln=V.valueOrDefault,un=V.valueAtIndexOrDefault;function dn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function hn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,p,m,v=n.length,b=[],x=[],y=[];for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,sn(s)||on(s)){if(on(s))for(r=0,o=s.length;r<o;++r)g=s[r],sn(g)||on(g)||(c=V.measureText(t,d.data,d.gc,c,g),f+=h)}else c=V.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),x.push(f),y.push(h/2)}function _(t){return{width:b[t]||0,height:x[t]||0,offset:y[t]||0}}return function(t,e){V.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),p=b.indexOf(Math.max.apply(null,b)),m=x.indexOf(Math.max.apply(null,x)),{first:_(0),last:_(v-1),widest:_(p),highest:_(m)}}function cn(t){return t.drawTicks?t.tickMarkLength:0}function fn(t){var e,n;return t.display?(e=V.options._parseFont(t),n=V.options.toPadding(t.padding),e.lineHeight+n.height):0}function gn(t,e){return V.extend(V.options._parseFont({fontFamily:ln(e.fontFamily,t.fontFamily),fontSize:ln(e.fontSize,t.fontSize),fontStyle:ln(e.fontStyle,t.fontStyle),lineHeight:ln(e.lineHeight,t.lineHeight)}),{color:V.options.resolve([e.fontColor,t.fontColor,z.global.defaultFontColor])})}function pn(t){var e=gn(t,t.minor);return{minor:e,major:t.major.enabled?gn(t,t.major):e}}function mn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function vn(t,e,n,i){var a,r,o,s,l=ln(n,0),u=Math.min(ln(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}z._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:rn.formatters.values,minor:{},major:{}}});var bn=X.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){V.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=V.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){V.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){V.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){V.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){V.callback(this.options.beforeDataLimits,[this])},determineDataLimits:V.noop,afterDataLimits:function(){V.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){V.callback(this.options.beforeBuildTicks,[this])},buildTicks:V.noop,afterBuildTicks:function(t){var e=this;return on(t)&&t.length?V.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=V.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){V.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){V.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){V.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-cn(l.gridLines)-u.padding-fn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=V.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){V.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){V.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=cn(o)+fn(r)),u?s&&(e.height=cn(o)+fn(r)):e.height=t.maxHeight,a.display&&s){var d=pn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,p=h.highest,m=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,x=V.toRadians(t.labelRotation),y=Math.cos(x),_=Math.sin(x),k=_*g.width+y*(p.height-(b?p.offset:0))+(b?0:m);e.height=Math.min(t.maxHeight,e.height+k+v);var w,M,S=t.getPixelForTick(0)-t.left,C=t.right-t.getPixelForTick(t.getTicks().length-1);b?(w=l?y*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):y*f.width+_*f.offset):(w=c.width/2,M=f.width/2),t.paddingLeft=Math.max((w-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-C)*t.width/(t.width-C),0)+3}else{var P=a.mirror?0:g.width+v+m;e.width=Math.min(t.maxWidth,e.width+P),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){V.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(sn(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=hn(t.ctx,pn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return on(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:V.noop,getPixelForValue:V.noop,getValueForPixel:V.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),mn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=V.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)vn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,vn(t,i,V.isNullOrUndef(a)?0:d-a,d),vn(t,i,h,V.isNullOrUndef(a)?t.length:h+a),mn(t)}return vn(t,i),mn(t)},_tickSize:function(){var t=this.options.ticks,e=V.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,p,m,v,b=this,x=b.chart,y=b.options,_=y.gridLines,k=y.position,w=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,C=S.length+(w?1:0),P=cn(_),A=[],D=_.drawBorder?un(_.lineWidth,0,0):0,T=D/2,I=V._alignPixel,F=function(t){return I(x,t,D)};for("top"===k?(e=F(b.bottom),s=b.bottom-P,u=e-T,h=F(t.top)+T,f=t.bottom):"bottom"===k?(e=F(b.top),h=t.top,f=F(t.bottom)-T,s=e+T,u=b.top+P):"left"===k?(e=F(b.right),o=b.right-P,l=e-T,d=F(t.left)+T,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-T,o=e+T,l=b.left+P),n=0;n<C;++n)i=S[n]||{},sn(i.label)&&n<S.length||(n===b.zeroLineIndex&&y.offset===w?(g=_.zeroLineWidth,p=_.zeroLineColor,m=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=un(_.lineWidth,n,1),p=un(_.color,n,"rgba(0,0,0,0.1)"),m=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=dn(b,i._index||n,w))&&(r=I(x,a,g),M?o=l=d=c=r:s=u=h=f=r,A.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:p,borderDash:m,borderDashOffset:v})));return A.ticksLength=C,A.borderValue=e,A},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,p=f.position,m=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,x=pn(g),y=g.padding,_=cn(f.gridLines),k=-V.toRadians(c.labelRotation),w=[];for("top"===p?(r=c.bottom-_-y,o=k?"left":"center"):"bottom"===p?(r=c.top+_+y,o=k?"right":"center"):"left"===p?(a=c.right-(m?0:_)-y,o=m?"left":"right"):(a=c.left+(m?0:_)+y,o=m?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,sn(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?x.major:x.minor).lineHeight,d=on(i)?i.length:1,v?(a=s,h="top"===p?((k?1:.5)-d)*u:(k?0:.5)*u):(r=s,h=(1-d)*u/2),w.push({x:a,y:r,rotation:k,label:i,font:l,textOffset:h,textAlign:o}));return w},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=V._alignPixel,h=n.drawBorder?un(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,p,m,v=h,b=un(n.lineWidth,c.ticksLength-1,1),x=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,p=m=x):(p=d(u,e.top,v)-v/2,m=d(u,e.bottom,b)+b/2,f=g=x),l.lineWidth=h,l.strokeStyle=un(n.color,0),l.beginPath(),l.moveTo(f,p),l.lineTo(g,m),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,on(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=ln(i.fontColor,z.global.defaultFontColor),s=V.options._parseFont(i),l=V.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});bn.prototype._draw=bn.prototype.draw;var xn=bn,yn=V.isNullOrUndef,_n=xn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;xn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return yn(e)||yn(n)||(t=o.chart.data.datasets[n].data[e]),yn(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=V.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),kn={position:"bottom"};_n._defaults=kn;var wn=V.noop,Mn=V.isNullOrUndef;var Sn=xn.extend({getRightValue:function(t){return"string"==typeof t?+t:xn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=V.sign(t.min),i=V.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:wn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:V.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,p=V.niceNum((g-f)/u/l)*l;if(p<1e-14&&Mn(d)&&Mn(h))return[f,g];(r=Math.ceil(g/p)-Math.floor(f/p))>u&&(p=V.niceNum(r*p/u/l)*l),s||Mn(c)?n=Math.pow(10,V._decimalPlaces(p)):(n=Math.pow(10,c),p=Math.ceil(p*n)/n),i=Math.floor(f/p)*p,a=Math.ceil(g/p)*p,s&&(!Mn(d)&&V.almostWhole(d/p,p/1e3)&&(i=d),!Mn(h)&&V.almostWhole(h/p,p/1e3)&&(a=h)),r=(a-i)/p,r=V.almostEquals(r,Math.round(r),p/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Mn(d)?i:d);for(var m=1;m<r;++m)o.push(Math.round((i+m*p)*n)/n);return o.push(Mn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=V.max(a),t.min=V.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),xn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;xn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Cn={position:"left",ticks:{callback:rn.formatters.linear}};function Pn(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function An(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var Dn=Sn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?Pn(a,u,e,n):An(a,e,n);V.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,V.min(i)),a.max=Math.max(a.max,V.max(i))})),a.min=V.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=V.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=V.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),Tn=Cn;Dn._defaults=Tn;var In=V.valueOrDefault,Fn=V.math.log10;var Ln={position:"left",ticks:{callback:rn.formatters.logarithmic}};function On(t,e){return V.isFinite(t)&&t>=0?t:e}var Rn=xn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var p=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(p[a]=p[a]||0,p[a]+=n.max)}}V.each(f,(function(t){if(t.length>0){var e=V.min(t),n=V.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=V.isFinite(o.min)?o.min:null,o.max=V.isFinite(o.max)?o.max:null,o.minNotZero=V.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=On(e.min,t.min),t.max=On(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(Fn(t.min))-1),t.max=Math.pow(10,Math.floor(Fn(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(Fn(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(Fn(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(Fn(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:On(e.min),max:On(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=In(t.min,Math.pow(10,Math.floor(Fn(e.min)))),o=Math.floor(Fn(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(Fn(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(Fn(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=In(t.max,r);return a.push(u),a}(i,t);t.max=V.max(a),t.min=V.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),xn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(Fn(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;xn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=In(t.options.ticks.fontSize,z.global.defaultFontSize)/t._length),t._startValue=Fn(e),t._valueOffset=n,t._valueRange=(Fn(t.max)-Fn(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(Fn(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),zn=Ln;Rn._defaults=zn;var Nn=V.valueOrDefault,Bn=V.valueAtIndexOrDefault,En=V.options.resolve,Wn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:rn.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Vn(t){var e=t.ticks;return e.display&&t.display?Nn(e.fontSize,z.global.defaultFontSize)+2*e.backdropPaddingY:0}function Hn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function jn(t){return 0===t||180===t?"center":t<180?"left":"right"}function qn(t,e,n,i){var a,r,o=n.y+i/2;if(V.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Un(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Yn(t){return V.isNumber(t)?t:0}var Gn=Sn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Vn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;V.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);V.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Vn(this.options))},convertTicksToLabels:function(){var t=this;Sn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=V.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=V.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=V.isArray(u)?{w:V.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=V.toDegrees(h)%360,f=Hn(c,i.x,n.w,0,180),g=Hn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Yn(a),r=Yn(r),o=Yn(o),s=Yn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(V.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Nn(s.lineWidth,o.lineWidth),u=Nn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Vn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=V.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=Bn(i.fontColor,s,z.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=V.toDegrees(h);e.textAlign=jn(c),Un(c,t._pointLabelSizes[s],u),qn(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&V.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=Bn(e.color,i-1),u=Bn(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(En([s.borderDash,o.borderDash,[]])),a.lineDashOffset=En([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=V.options._parseFont(n),s=Nn(n.fontColor,z.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",V.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:V.noop}),Xn=Wn;Gn._defaults=Xn;var Kn=V._deprecated,Zn=V.options.resolve,$n=V.valueOrDefault,Jn=Number.MIN_SAFE_INTEGER||-9007199254740991,Qn=Number.MAX_SAFE_INTEGER||9007199254740991,ti={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ei=Object.keys(ti);function ni(t,e){return t-e}function ii(t){return V.valueOrDefault(t.time.min,t.ticks.min)}function ai(t){return V.valueOrDefault(t.time.max,t.ticks.max)}function ri(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function oi(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),V.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),V.isFinite(o)||(o=n.parse(o))),o)}function si(t,e){if(V.isNullOrUndef(e))return null;var n=t.options.time,i=oi(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function li(t,e,n,i){var a,r,o,s=ei.length;for(a=ei.indexOf(t);a<s-1;++a)if(o=(r=ti[ei[a]]).steps?r.steps:Qn,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ei[a];return ei[s-1]}function ui(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var di=xn.extend({initialize:function(){this.mergeTicksOptions(),xn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new an._date(e.adapters.date);return Kn("time scale",n.format,"time.format","time.parser"),Kn("time scale",n.min,"time.min","ticks.min"),Kn("time scale",n.max,"time.max","ticks.max"),V.mergeIf(n.displayFormats,i.formats()),xn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),xn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=Qn,f=Jn,g=[],p=[],m=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)m.push(si(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,V.isObject(a[0]))for(p[t]=[],e=0,i=a.length;e<i;++e)r=si(s,a[e]),g.push(r),p[t][e]=r;else p[t]=m.slice(0),o||(g=g.concat(m),o=!0);else p[t]=[];m.length&&(c=Math.min(c,m[0]),f=Math.max(f,m[m.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ni):g.sort(ni),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=si(s,ii(d))||c,f=si(s,ai(d))||f,c=c===Qn?+u.startOf(Date.now(),h):c,f=f===Jn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:p,labels:m}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||li(s.minUnit,e,n,i),u=Zn([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=si(i,ii(o))||a,r=si(i,ai(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?li(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ei.length-1;r>=ei.indexOf(n);r--)if(o=ei[r],ti[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ei[n?ei.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ei.indexOf(t)+1,n=ei.length;e<n;++e)if(ti[ei[e]].common)return ei[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=ri(t,"time",e[0],"pos"),s=1===e.length?1-r:(ri(t,"time",e[1],"pos")-r)/2,o=ri(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-ri(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),ui(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return V.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(oi(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(oi(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,p=Zn([g.callback,g.userCallback,h.callback,h.userCallback]);return p?p(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=ri(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=si(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=ri(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=V.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=$n(e.fontSize,z.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,ui(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),hi={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};di._defaults=hi;var ci={category:_n,linear:Dn,logarithmic:Rn,radialLinear:Gn,time:di},fi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};an._date.override("function"==typeof t?{_id:"moment",formats:function(){return fi},parse:function(e,n){return"string"==typeof e&&"string"==typeof n?e=t(e,n):e instanceof t||(e=t(e)),e.isValid()?e.valueOf():null},format:function(e,n){return t(e).format(n)},add:function(e,n,i){return t(e).add(n,i).valueOf()},diff:function(e,n,i){return t(e).diff(t(n),i)},startOf:function(e,n,i){return e=t(e),"isoWeek"===n?e.isoWeekday(i).valueOf():e.startOf(n).valueOf()},endOf:function(e,n){return t(e).endOf(n).valueOf()},_create:function(e){return t(e)}}:{}),z._set("global",{plugins:{filler:{propagate:!0}}});var gi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return V.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function pi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function mi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(V.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function vi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function bi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),gi[n](t))}function xi(t){return t&&!t.skip}function yi(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)V.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)V.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function _i(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,p=i.spanGaps,m=[],v=[],b=0,x=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=xi(u),c=xi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=m.push(u),x=v.push(d)):b&&x&&(p?(h&&m.push(u),c&&v.push(d)):(yi(t,m,v,b,x),b=x=0,m=[],v=[]));yi(t,m,v,b,x),t.closePath(),t.fillStyle=a,t.fill()}var ki={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof _t.Line&&(r={visible:t.isDatasetVisible(i),fill:pi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=vi(l,i,s),r.boundary=mi(r),r.mapper=bi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||z.global.defaultColor,o&&s&&r.length&&(V.canvas.clipArea(u,t.chartArea),_i(u,r,o,a,s,i._loop),V.canvas.unclipArea(u)))}},wi=V.rtl.getRtlAdapter,Mi=V.noop,Si=V.valueOrDefault;function Ci(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}z._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Pi=X.extend({initialize:function(t){V.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Mi,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Mi,beforeSetDimensions:Mi,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Mi,beforeBuildLabels:Mi,buildLabels:function(){var t=this,e=t.options.labels||{},n=V.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Mi,beforeFit:Mi,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=V.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",V.each(t.legendItems,(function(t,e){var i=Ci(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],p=n.padding,m=0,v=0;V.each(t.legendItems,(function(t,e){var i=Ci(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(p+=m+n.padding,f.push(m),g.push(v),m=0,v=0),m=Math.max(m,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),p+=m,f.push(m),g.push(v),l.width+=p}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Mi,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=z.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=wi(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Si(n.fontColor,i.defaultFontColor),g=V.options._parseFont(n),p=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var m=Ci(n,p),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},x=t.isHorizontal();d=x?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},V.rtl.overrideTextDirection(t.ctx,e.textDirection);var y=p+n.padding;V.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=m+p/2+f,_=d.x,k=d.y;h.setWidth(t.minSize.width),x?i>0&&_+g+n.padding>t.left+t.minSize.width&&(k=d.y+=y,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&k+y>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,k=d.y=t.top+b(o,s[d.line]));var w=h.x(_);!function(t,e,i){if(!(isNaN(m)||m<=0)){c.save();var o=Si(i.lineWidth,r.borderWidth);if(c.fillStyle=Si(i.fillStyle,a),c.lineCap=Si(i.lineCap,r.borderCapStyle),c.lineDashOffset=Si(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Si(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Si(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Si(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=m*Math.SQRT2/2,l=h.xPlus(t,m/2),u=e+p/2;V.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,m),e,m,p),0!==o&&c.strokeRect(h.leftForLtr(t,m),e,m,p);c.restore()}}(w,k,e),v[i].left=h.leftForLtr(w,v[i].width),v[i].top=k,function(t,e,n,i){var a=p/2,r=h.xPlus(t,m+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(w,k,e,f),x?d.x+=g+n.padding:d.y+=y})),V.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Ai(t,e){var n=new Pi({ctx:t.ctx,options:e,chart:t});ge.configure(t,n,e),ge.addBox(t,n),t.legend=n}var Di={id:"legend",_element:Pi,beforeInit:function(t){var e=t.options.legend;e&&Ai(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(V.mergeIf(e,z.global.legend),n?(ge.configure(t,n,e),n.options=e):Ai(t,e)):n&&(ge.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ti=V.noop;z._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Ii=X.extend({initialize:function(t){V.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ti,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ti,beforeSetDimensions:Ti,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ti,beforeBuildLabels:Ti,buildLabels:Ti,afterBuildLabels:Ti,beforeFit:Ti,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(V.isArray(n.text)?n.text.length:1)*V.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ti,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=V.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=V.valueOrDefault(n.fontColor,z.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(V.isArray(g))for(var p=0,m=0;m<g.length;++m)e.fillText(g[m],0,p,i),p+=s;else e.fillText(g,0,0,i);e.restore()}}});function Fi(t,e){var n=new Ii({ctx:t.ctx,options:e,chart:t});ge.configure(t,n,e),ge.addBox(t,n),t.titleBlock=n}var Li={},Oi=ki,Ri=Di,zi={id:"title",_element:Ii,beforeInit:function(t){var e=t.options.title;e&&Fi(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(V.mergeIf(e,z.global.title),n?(ge.configure(t,n,e),n.options=e):Fi(t,e)):n&&(ge.removeBox(t,n),delete t.titleBlock)}};for(var Ni in Li.filler=Oi,Li.legend=Ri,Li.title=zi,tn.helpers=V,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=V._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}V.where=function(t,e){if(V.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return V.each(t,(function(t){e(t)&&n.push(t)})),n},V.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},V.findNextWhere=function(t,e,n){V.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},V.findPreviousWhere=function(t,e,n){V.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},V.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},V.almostEquals=function(t,e,n){return Math.abs(t-e)<n},V.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},V.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},V.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},V.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},V.toRadians=function(t){return t*(Math.PI/180)},V.toDegrees=function(t){return t*(180/Math.PI)},V._decimalPlaces=function(t){if(V.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},V.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},V.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},V.aliasPixel=function(t){return t%2==0?0:.5},V._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},V.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},V.EPSILON=Number.EPSILON||1e-14,V.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(V.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},V.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},V.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},V.niceNum=function(t,e){var n=Math.floor(V.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},V.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},V.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(V.getStyle(r,"padding-left")),u=parseFloat(V.getStyle(r,"padding-top")),d=parseFloat(V.getStyle(r,"padding-right")),h=parseFloat(V.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},V.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},V.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},V._calculatePadding=function(t,e,n){return(e=V.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},V._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},V.getMaximumWidth=function(t){var e=V._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-V._calculatePadding(e,"padding-left",n)-V._calculatePadding(e,"padding-right",n),a=V.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},V.getMaximumHeight=function(t){var e=V._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-V._calculatePadding(e,"padding-top",n)-V._calculatePadding(e,"padding-bottom",n),a=V.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},V.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},V.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},V.fontString=function(t,e,n){return e+" "+t+"px "+n},V.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==V.isArray(u))h=V.measureText(t,a,r,h,u);else if(V.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||V.isArray(d)||(h=V.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},V.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},V.numberOfLabelLines=function(t){var e=1;return V.each(t,(function(t){V.isArray(t)&&t.length>e&&(e=t.length)})),e},V.color=k?function(t){return t instanceof CanvasGradient&&(t=z.global.defaultColor),k(t)}:function(t){return console.error("Color.js not found!"),t},V.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:V.color(t).saturate(.5).darken(.1).rgbString()}}(),tn._adapters=an,tn.Animation=Z,tn.animationService=$,tn.controllers=$t,tn.DatasetController=nt,tn.defaults=z,tn.Element=X,tn.elements=_t,tn.Interaction=ae,tn.layouts=ge,tn.platform=Fe,tn.plugins=Le,tn.Scale=xn,tn.scaleService=Oe,tn.Ticks=rn,tn.Tooltip=Ue,tn.helpers.each(ci,(function(t,e){tn.scaleService.registerScaleType(e,t,t._defaults)})),Li)Li.hasOwnProperty(Ni)&&tn.plugins.register(Li[Ni]);tn.platform.initialize();var Bi=tn;return"undefined"!=typeof window&&(window.Chart=tn),tn.Chart=tn,tn.Legend=Li.legend._element,tn.Title=Li.title._element,tn.pluginService=tn.plugins,tn.PluginBase=tn.Element.extend({}),tn.canvasHelpers=tn.helpers.canvas,tn.layoutService=tn.layouts,tn.LinearScaleBase=Sn,tn.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){tn[t]=function(e,n){return new tn(e,tn.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Bi}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(function(){try{return require("moment")}catch(t){}}()):"function"==typeof define&&define.amd?define(["require"],(function(t){return e(function(){try{return t("moment")}catch(t){}}())})):(t=t||self).Chart=e(t.moment)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},n=function(t,e){return t(e={exports:{}},e.exports),e.exports}((function(t){var n={};for(var i in e)e.hasOwnProperty(i)&&(n[e[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=n[t];if(i)return i;var a,r,o,s=1/0;for(var l in e)if(e.hasOwnProperty(l)){var u=e[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return e[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));n.rgb,n.hsl,n.hsv,n.hwb,n.cmyk,n.xyz,n.lab,n.lch,n.hex,n.keyword,n.ansi16,n.ansi256,n.hcg,n.apple,n.gray;function i(t){var e=function(){for(var t={},e=Object.keys(n),i=e.length,a=0;a<i;a++)t[e[a]]={distance:-1,parent:null};return t}(),i=[t];for(e[t].distance=0;i.length;)for(var a=i.pop(),r=Object.keys(n[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,i.unshift(l))}return e}function a(t,e){return function(n){return e(t(n))}}function r(t,e){for(var i=[e[t].parent,t],r=n[e[t].parent][t],o=e[t].parent;e[o].parent;)i.unshift(e[o].parent),r=a(n[e[o].parent][o],r),o=e[o].parent;return r.conversion=i,r}var o={};Object.keys(n).forEach((function(t){o[t]={},Object.defineProperty(o[t],"channels",{value:n[t].channels}),Object.defineProperty(o[t],"labels",{value:n[t].labels});var e=function(t){for(var e=i(t),n={},a=Object.keys(e),o=a.length,s=0;s<o;s++){var l=a[s];null!==e[l].parent&&(n[l]=r(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];o[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),o[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var s=o,l={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},u={getRgba:d,getHsla:h,getRgb:function(t){var e=d(t);return e&&e.slice(0,3)},getHsl:function(t){var e=h(t);return e&&e.slice(0,3)},getHwb:c,getAlpha:function(t){var e=d(t);if(e)return e[3];if(e=h(t))return e[3];if(e=c(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+v(t[0])+v(t[1])+v(t[2])+(e>=0&&e<1?v(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return f(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:f,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:g,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return b[t.slice(0,3)]}};function d(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=l[i[1]]))return}for(r=0;r<e.length;r++)e[r]=m(e[r],0,255);return n=n||0==n?m(n,0,1):1,e[3]=n,e}}function h(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function c(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function f(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function g(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function m(t,e,n){return Math.min(Math.max(e,t),n)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var b={};for(var x in l)b[l[x]]=x;var y=function(t){return t instanceof y?t:this instanceof y?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=u.getRgba(t))?this.setValues("rgb",e):(e=u.getHsla(t))?this.setValues("hsl",e):(e=u.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new y(t);var e};y.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return u.hexString(this.values.rgb)},rgbString:function(){return u.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return u.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return u.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return u.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return u.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return u.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return u.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new y,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},y.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},y.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},y.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},y.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)a[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];l=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];l=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===l?a.alpha:l)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=s[t][d](a[t]));return!0},y.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},y.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=y);var _=y;function k(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}var w,M={noop:function(){},uid:(w=0,function(){return w++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return M.valueOrDefault(M.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(M.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(M.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!M.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(M.isArray(t))return t.map(M.clone);if(M.isObject(t)){for(var e=Object.create(t),n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=M.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){if(k(t)){var a=e[t],r=n[t];M.isObject(a)&&M.isObject(r)?M.merge(a,r,i):e[t]=M.clone(r)}},_mergerIf:function(t,e,n){if(k(t)){var i=e[t],a=n[t];M.isObject(i)&&M.isObject(a)?M.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=M.clone(a))}},merge:function(t,e,n){var i,a,r,o,s,l=M.isArray(e)?e:[e],u=l.length;if(!M.isObject(t))return t;for(i=(n=n||{}).merger||M._merger,a=0;a<u;++a)if(e=l[a],M.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return M.merge(t,e,{merger:M._mergerIf})},extend:Object.assign||function(t){return M.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=M.inherits,t&&M.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},S=M;M.callCallback=M.callback,M.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},M.getValueOrDefault=M.valueOrDefault,M.getValueAtIndexOrDefault=M.valueAtIndexOrDefault;var C={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-C.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*C.easeInBounce(2*t):.5*C.easeOutBounce(2*t-1)+.5}},P={effects:C};S.easingEffects=C;var A=Math.PI,D=A/180,T=2*A,I=A/2,F=A/4,O=2*A/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-A,-I),t.arc(u,l,o,-I,0),t.arc(u,d,o,0,I),t.arc(s,d,o,I,A)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-I,I),t.arc(s,l,o,I,A+I)):l<d?(t.arc(s,l,o,-A,0),t.arc(s,d,o,0,A)):t.arc(s,l,o,-A,A),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*D;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,T),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=O,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=O,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+F)*u,l=Math.sin(h+F)*u,t.arc(i-s,a-l,d,h-A,h-I),t.arc(i+l,a-s,d,h-I,h),t.arc(i+s,a+l,d,h,h+I),t.arc(i-l,a+s,d,h+I,h+A),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=F;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=F;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=F,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},R=L;S.clear=L.clear,S.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var z={_set:function(t,e){return S.merge(this[t]||(this[t]={}),e)}};z._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var N=z,B=S.valueOrDefault;var E={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return S.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=N.global,n=B(t.fontSize,e.defaultFontSize),i={family:B(t.fontFamily,e.defaultFontFamily),lineHeight:S.options.toLineHeight(B(t.lineHeight,e.defaultLineHeight),n),size:n,style:B(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||S.isNullOrUndef(t.size)||S.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&S.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},W={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},V=W;S.log10=W.log10;var H=S,j=P,q=R,U=E,Y=V,G={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};H.easing=j,H.canvas=q,H.options=U,H.math=Y,H.rtl=G;var X=function(t){H.extend(this,t),this.initialize.apply(this,arguments)};H.extend(X.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=H.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=_(l)).valid&&(c=_(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(H.isFinite(l)&&H.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=H.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return H.isNumber(this._model.x)&&H.isNumber(this._model.y)}}),X.extend=H.inherits;var K=X,Z=K.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),$=Z;Object.defineProperty(Z.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(Z.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),N._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:H.noop,onComplete:H.noop}});var J={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=H.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=H.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),H.callback(t.render,[e,t],e),H.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(H.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},Q=H.options.resolve,tt=["push","pop","shift","splice","unshift"];function et(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(tt.forEach((function(e){delete t[e]})),delete t._chartjs)}}var nt=function(t,e){this.initialize(t,e)};H.extend(nt.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&et(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&et(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),tt.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return H.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=H.merge(Object.create(null),[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&H._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:H.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=Q([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},p={cacheable:!i};if(i=i||{},H.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=Q([i[l],d[l],h[l]],g,e,p);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=Q([i[l],d[c[l]],d[l],h[l]],g,e,p);return p.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){H.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=H.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=Q([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=Q([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=Q([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),nt.extend=H.inherits;var it=nt,at=2*Math.PI;function rt(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function ot(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+at,rt(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=at,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+at,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+at),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&rt(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}N._set("global",{elements:{arc:{backgroundColor:N.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var st=K.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=H.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=at;for(;a>s;)a-=at;for(;a<o;)a+=at;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/at)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+at,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%at}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&ot(e,n,a),e.restore()}}),lt=H.valueOrDefault,ut=N.global.defaultColor;N._set("global",{elements:{line:{tension:.4,backgroundColor:ut,borderWidth:3,borderColor:ut,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var dt=K.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=N.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=H.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=lt(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=lt(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?H.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):H.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),ht=H.valueOrDefault,ct=N.global.defaultColor;function ft(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}N._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ct,borderColor:ct,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var gt=K.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ft,inXRange:ft,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=N.global,u=l.defaultColor;e.skip||(void 0===t||H.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=ht(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,H.canvas.drawPoint(n,i,r,o,s,a))}}),pt=N.global.defaultColor;function mt(t){return t&&void 0!==t.width}function vt(t){var e,n,i,a,r;return mt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function bt(t,e,n){return t===e?n:t===n?e:t}function xt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=bt(e,"left","right")):t.base<t.y&&(e=bt(e,"bottom","top")),n[e]=!0,n):n}(t);return H.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function yt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&vt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}N._set("global",{elements:{rectangle:{backgroundColor:pt,borderColor:pt,borderSkipped:"bottom",borderWidth:0}}});var _t=K.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=vt(t),n=e.right-e.left,i=e.bottom-e.top,a=xt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return yt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return mt(n)?yt(n,t,null):yt(n,null,e)},inXRange:function(t){return yt(this._view,t,null)},inYRange:function(t){return yt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return mt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return mt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),kt={},wt=st,Mt=dt,St=gt,Ct=_t;kt.Arc=wt,kt.Line=Mt,kt.Point=St,kt.Rectangle=Ct;var Pt=H._deprecated,At=H.valueOrDefault;function Dt(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=H.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return H.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}N._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),N._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Tt=it.extend({dataElementType:kt.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;it.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Pt("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Pt("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Pt("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Pt("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Pt("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},H.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),p=h._parseValue(f[t].data[e]),m=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,x=void 0===p.start?0:p.max>=0&&p.min>=0?p.min:p.max,y=void 0===p.start?p.end:p.max>=0&&p.min>=0?p.max-p.min:p.min-p.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(p.min<0&&r<0||p.max>=0&&r>0)&&(x+=r));return o=h.getPixelForValue(x),l=(s=h.getPixelForValue(x+y))-o,void 0!==m&&Math.abs(l)<m&&(l=m,s=y>=0&&!c||y<0&&c?o-m:o+m),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):Dt(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(At(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(H.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}H.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=H.extend({},it.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=At(n.barPercentage,e.barPercentage),e.barThickness=At(n.barThickness,e.barThickness),e.categoryPercentage=At(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=At(n.maxBarThickness,e.maxBarThickness),e.minBarLength=At(i.minBarLength,e.minBarLength),e}}),It=H.valueOrDefault,Ft=H.options.resolve;N._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Ot=it.extend({dataElementType:kt.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;H.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=It(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=It(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=It(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=it.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=H.extend({},s)),s.radius=Ft([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=H.valueOrDefault,Rt=Math.PI,zt=2*Rt,Nt=Rt/2;N._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-Nt,circumference:zt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return H.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Bt=it.extend({dataElementType:kt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,p=l.cutoutPercentage/100||0,m=l.circumference,v=r._getRingWeight(r.index);if(m<zt){var b=l.rotation%zt,x=(b+=b>=Rt?-zt:b<-Rt?zt:0)+m,y=Math.cos(b),_=Math.sin(b),k=Math.cos(x),w=Math.sin(x),M=b<=0&&x>=0||x>=zt,S=b<=Nt&&x>=Nt||x>=zt+Nt,C=b<=-Nt&&x>=-Nt||x>=Rt+Nt,P=b===-Rt||x>=Rt?-1:Math.min(y,y*p,k,k*p),A=C?-1:Math.min(_,_*p,w,w*p),D=M?1:Math.max(y,y*p,k,k*p),T=S?1:Math.max(_,_*p,w,w*p);u=(D-P)/2,d=(T-A)/2,h=-(D+P)/2,c=-(T+A)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*p,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/zt),g=n&&s.animateScale?0:i.innerRadius,p=n&&s.animateScale?0:i.outerRadius,m=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:m.backgroundColor,borderColor:m.borderColor,borderWidth:m.borderWidth,borderAlign:m.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:p,innerRadius:g,label:H.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return H.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?zt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});N._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),N._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Et=Tt.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Wt=H.valueOrDefault,Vt=H.options.resolve,Ht=H.canvas._isPointInArea;function jt(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function qt(t,e,n){var i=n/2,a=jt(t,i),r=jt(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function Ut(t){var e,n,i,a;return H.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}N._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Yt=it.extend({datasetElementType:kt.Line,dataElementType:kt.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Wt(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Wt(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=it.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Wt(n.spanGaps,a.spanGaps),o.tension=Wt(n.lineTension,r.tension),o.steppedLine=Vt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=Ut(Wt(n.clip,qt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)H.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=H.splineCurve(H.previousItem(l,t)._model,n,H.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Ht(n,s)&&(t>0&&Ht(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Ht(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,H.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),H.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Wt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Wt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Wt(n.hoverBorderWidth,n.borderWidth),e.radius=Wt(n.hoverRadius,n.radius)}}),Gt=H.options.resolve;N._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Xt=it.extend({dataElementType:kt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],p=g+(t.hidden?0:i._angles[e]),m=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?m:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:p,label:H.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return H.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor,a=H.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Gt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});N._set("pie",H.clone(N.doughnut)),N._set("pie",{cutoutPercentage:0});var Kt=Bt,Zt=H.valueOrDefault;N._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var $t=it.extend({datasetElementType:kt.Line,dataElementType:kt.Point,linkScales:H.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Zt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=it.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Zt(e.spanGaps,n.spanGaps),i.tension=Zt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=H.splineCurve(H.previousItem(o,t,!0)._model,n,H.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Zt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Zt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Zt(n.hoverBorderWidth,n.borderWidth),e.radius=Zt(n.hoverRadius,n.radius)}});N._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),N._set("global",{datasets:{scatter:{showLine:!1}}});var Jt={bar:Tt,bubble:Ot,doughnut:Bt,horizontalBar:Et,line:Yt,polarArea:Xt,pie:Kt,radar:$t,scatter:Yt};function Qt(t,e){return t.native?{x:t.x,y:t.y}:H.getRelativePosition(t,e)}function te(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function ee(t,e){var n=[];return te(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ne(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return te(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ie(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ae(t,e,n){var i=Qt(e,t);n.axis=n.axis||"x";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var re={modes:{single:function(t,e){var n=Qt(e,t),i=[];return te(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ae,index:ae,dataset:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ae(t,e,{intersect:!1})},point:function(t,e){return ee(t,Qt(e,t))},nearest:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis);return ne(t,i,n.intersect,a)},x:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},oe=H.extend;function se(t,e){return H.where(t,(function(t){return t.pos===e}))}function le(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function ue(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function de(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-ue(o,t,"left","right"),a=e.outerHeight-ue(o,t,"top","bottom"),i!==t.w||a!==t.h){t.w=i,t.h=a;var l=n.horizontal?[i,t.w]:[a,t.h];return!(l[0]===l[1]||isNaN(l[0])&&isNaN(l[1]))}}function he(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function ce(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,he(r.horizontal,e)),de(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&ce(u,e,n)||l}function fe(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}N._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var ge,pe={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=H.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=le(se(e,"left"),!0),i=le(se(e,"right")),a=le(se(e,"top"),!0),r=le(se(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:se(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=oe({maxPadding:oe({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),ce(l,h,d),ce(u,h,d)&&ce(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),fe(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,fe(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},H.each(s.chartArea,(function(e){var n=e.box;oe(n,t.chartArea),n.update(h.w,h.h)}))}}},me=(ge=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&ge.default||ge,ve="$chartjs",be="chartjs-size-monitor",xe="chartjs-render-monitor",ye="chartjs-render-animation",_e=["animationstart","webkitAnimationStart"],ke={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function we(t,e){var n=H.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var Me=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Se(t,e,n){t.addEventListener(e,n,Me)}function Ce(t,e,n){t.removeEventListener(e,n,Me)}function Pe(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Ae(t){var e=document.createElement("div");return e.className=t||"",e}function De(t,e,n){var i,a,r,o,s=t[ve]||(t[ve]={}),l=s.resizer=function(t){var e=Ae(be),n=Ae(be+"-expand"),i=Ae(be+"-shrink");n.appendChild(Ae()),i.appendChild(Ae()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Se(n,"scroll",a.bind(n,"expand")),Se(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Pe("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Pe("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,H.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[ve]||(t[ve]={}),i=n.renderProxy=function(t){t.animationName===ye&&e()};H.each(_e,(function(e){Se(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(xe)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function Te(t){var e=t[ve]||{},n=e.resizer;delete e.resizer,function(t){var e=t[ve]||{},n=e.renderProxy;n&&(H.each(_e,(function(e){Ce(t,e,n)})),delete e.renderProxy),t.classList.remove(xe)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Ie={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[ve]||(t[ve]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,me)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[ve]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=we(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=we(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[ve]){var n=e[ve].initial;["height","width"].forEach((function(t){var i=n[t];H.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),H.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[ve]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[ve]||(n[ve]={});Se(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=ke[t.type]||t.type,i=H.getRelativePosition(t,e);return Pe(n,e,i.x,i.y,t)}(e,t))})}else De(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[ve]||{}).proxies||{})[t.id+"_"+e];a&&Ce(i,e,a)}else Te(i)}};H.addEvent=Se,H.removeEvent=Ce;var Fe=Ie._enabled?Ie:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Oe=H.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Fe);N._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=H.clone(N.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Re={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=H.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?H.merge(Object.create(null),[N.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=H.extend(this.defaults[t],e))},addScalesToLayout:function(t){H.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,pe.addBox(t,e)}))}},ze=H.valueOrDefault,Ne=H.rtl.getRtlAdapter;N._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:H.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:H.noop,beforeBody:H.noop,beforeLabel:H.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),H.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:H.noop,afterBody:H.noop,beforeFooter:H.noop,footer:H.noop,afterFooter:H.noop}}});var Be={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=H.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Ee(t,e){return e&&(H.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function We(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function Ve(t){var e=N.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:ze(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:ze(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:ze(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:ze(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:ze(t.titleFontStyle,e.defaultFontStyle),titleFontSize:ze(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:ze(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:ze(t.footerFontStyle,e.defaultFontStyle),footerFontSize:ze(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function He(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function je(t){return Ee([],We(t))}var qe=K.extend({initialize:function(){this._model=Ve(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Ee(o,We(i)),o=Ee(o,We(a)),o=Ee(o,We(r))},getBeforeBody:function(){return je(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return H.each(t,(function(t){var r={before:[],lines:[],after:[]};Ee(r.before,We(i.beforeLabel.call(n,t,e))),Ee(r.lines,i.label.call(n,t,e)),Ee(r.after,We(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return je(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Ee(r,We(n)),r=Ee(r,We(i)),r=Ee(r,We(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=Ve(c),p=h._active,m=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},x={width:f.width,height:f.height},y={x:f.caretX,y:f.caretY};if(p.length){g.opacity=1;var _=[],k=[];y=Be[c.position].call(h,p,h._eventPosition);var w=[];for(e=0,n=p.length;e<n;++e)w.push((i=p[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(w=w.filter((function(t){return c.filter(t,m)}))),c.itemSort&&(w=w.sort((function(t,e){return c.itemSort(t,e,m)}))),H.each(w,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),k.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(w,m),g.beforeBody=h.getBeforeBody(w,m),g.body=h.getBody(w,m),g.afterBody=h.getAfterBody(w,m),g.footer=h.getFooter(w,m),g.x=y.x,g.y=y.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=k,g.dataPoints=w,x=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=H.fontString(u,e._titleFontStyle,e._titleFontFamily),H.each(e.title,f),n.font=H.fontString(d,e._bodyFontStyle,e._bodyFontFamily),H.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,H.each(r,(function(t){H.each(t.before,f),H.each(t.lines,f),H.each(t.after,f)})),c=0,n.font=H.fontString(h,e._footerFontStyle,e._footerFontFamily),H.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,x,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,x),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=x.width,g.height=x.height,g.caretX=y.x,g.caretY=y.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,p=e.width,m=e.height;if("center"===c)s=g+m/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+p)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+p-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+m)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=Ne(e.rtl,e.x,e.width);for(t.x=He(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=H.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,p=e.displayColors,m=0,v=p?He(e,"left"):0,b=Ne(e.rtl,e.x,e.width),x=function(e){n.fillText(e,b.x(t.x+m),t.y+h/2),t.y+=h+c},y=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=H.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=He(e,y),n.fillStyle=e.bodyFontColor,H.each(e.beforeBody,x),m=p&&"right"!==y?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,H.each(i.before,x),l=0,d=(o=i.lines).length;l<d;++l){if(p){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}x(o[l])}H.each(i.after,x)}m=0,H.each(e.afterBody,x),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=Ne(e.rtl,e.x,e.width);for(t.x=He(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=H.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,H.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),H.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!H.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),Ue=Be,Ye=qe;Ye.positioners=Ue;var Ge=H.valueOrDefault;function Xe(){return H.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ge(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?H.merge(e[t][a],[Re.getScaleDefaults(r),o]):H.merge(e[t][a],o)}else H._merger(t,e,n,i)}})}function Ke(){return H.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||Object.create(null),r=n[t];"scales"===t?e[t]=Xe(a,r):"scale"===t?e[t]=H.merge(a,[Re.getScaleDefaults(r.type),r]):H._merger(t,e,n,i)}})}function Ze(t){var e=t.options;H.each(t.scales,(function(e){pe.removeBox(t,e)})),e=Ke(N.global,N[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function $e(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(H.findIndex(t,a)>=0);return i}function Je(t){return"top"===t||"bottom"===t}function Qe(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}N._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var tn=function(t,e){return this.construct(t,e),this};H.extend(tn.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||Object.create(null)).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Ke(N.global,N[t.type],t.options||{}),t}(e);var i=Oe.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=H.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,tn.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),H.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return H.canvas.clear(this),this},stop:function(){return J.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(H.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:H.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",H.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;H.each(e.xAxes,(function(t,n){t.id||(t.id=$e(e.xAxes,"x-axis-",n))})),H.each(e.yAxes,(function(t,n){t.id||(t.id=$e(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),H.each(i,(function(e){var i=e.options,r=i.id,o=Ge(i.type,e.dtype);Je(i.position)!==Je(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Re.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),H.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Re.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=Jt[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;H.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ze(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&H.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Qe("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(pe.update(this,this.width,this.height),t._layers=[],H.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ge(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),H.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new $({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=H.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});J.addAnimation(e,o,i,a)}else e.draw(),r(new $({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),H.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Qe("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return re.modes.single(this,t)},getElementsAtEvent:function(t){return re.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return re.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=re.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return re.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),H.canvas.clear(n),Oe.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete tn.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ye({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};H.each(t.options.events,(function(i){Oe.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Oe.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,H.each(e,(function(e,n){Oe.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),H.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!H.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),tn.instances={};var en=tn;tn.Controller=tn,tn.types={},H.configMerge=Ke,H.scaleMerge=Xe;function nn(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function an(t){this.options=t||{}}H.extend(an.prototype,{formats:nn,parse:nn,format:nn,add:nn,diff:nn,startOf:nn,endOf:nn,_create:function(t){return t}}),an.override=function(t){H.extend(an.prototype,t)};var rn={_date:an},on={formatters:{values:function(t){return H.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=H.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=H.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(H.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},sn=H.isArray,ln=H.isNullOrUndef,un=H.valueOrDefault,dn=H.valueAtIndexOrDefault;function hn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function cn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,p,m,v=n.length,b=[],x=[],y=[],_=0,k=0;for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,ln(s)||sn(s)){if(sn(s))for(r=0,o=s.length;r<o;++r)g=s[r],ln(g)||sn(g)||(c=H.measureText(t,d.data,d.gc,c,g),f+=h)}else c=H.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),x.push(f),y.push(h/2),_=Math.max(c,_),k=Math.max(f,k)}function w(t){return{width:b[t]||0,height:x[t]||0,offset:y[t]||0}}return function(t,e){H.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),p=b.indexOf(_),m=x.indexOf(k),{first:w(0),last:w(v-1),widest:w(p),highest:w(m)}}function fn(t){return t.drawTicks?t.tickMarkLength:0}function gn(t){var e,n;return t.display?(e=H.options._parseFont(t),n=H.options.toPadding(t.padding),e.lineHeight+n.height):0}function pn(t,e){return H.extend(H.options._parseFont({fontFamily:un(e.fontFamily,t.fontFamily),fontSize:un(e.fontSize,t.fontSize),fontStyle:un(e.fontStyle,t.fontStyle),lineHeight:un(e.lineHeight,t.lineHeight)}),{color:H.options.resolve([e.fontColor,t.fontColor,N.global.defaultFontColor])})}function mn(t){var e=pn(t,t.minor);return{minor:e,major:t.major.enabled?pn(t,t.major):e}}function vn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function bn(t,e,n,i){var a,r,o,s,l=un(n,0),u=Math.min(un(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}N._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:on.formatters.values,minor:{},major:{}}});var xn=K.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){H.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=H.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){H.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){H.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){H.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){H.callback(this.options.beforeDataLimits,[this])},determineDataLimits:H.noop,afterDataLimits:function(){H.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){H.callback(this.options.beforeBuildTicks,[this])},buildTicks:H.noop,afterBuildTicks:function(t){var e=this;return sn(t)&&t.length?H.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=H.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){H.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){H.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){H.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-fn(l.gridLines)-u.padding-gn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=H.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){H.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){H.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=fn(o)+gn(r)),u?s&&(e.height=fn(o)+gn(r)):e.height=t.maxHeight,a.display&&s){var d=mn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,p=h.highest,m=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,x=H.toRadians(t.labelRotation),y=Math.cos(x),_=Math.sin(x),k=_*g.width+y*(p.height-(b?p.offset:0))+(b?0:m);e.height=Math.min(t.maxHeight,e.height+k+v);var w,M,S=t.getPixelForTick(0)-t.left,C=t.right-t.getPixelForTick(t.getTicks().length-1);b?(w=l?y*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):y*f.width+_*f.offset):(w=c.width/2,M=f.width/2),t.paddingLeft=Math.max((w-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-C)*t.width/(t.width-C),0)+3}else{var P=a.mirror?0:g.width+v+m;e.width=Math.min(t.maxWidth,e.width+P),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){H.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(ln(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=cn(t.ctx,mn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return sn(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:H.noop,getPixelForValue:H.noop,getValueForPixel:H.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),vn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=H.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)bn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,bn(t,i,H.isNullOrUndef(a)?0:d-a,d),bn(t,i,h,H.isNullOrUndef(a)?t.length:h+a),vn(t)}return bn(t,i),vn(t)},_tickSize:function(){var t=this.options.ticks,e=H.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,p,m,v,b=this,x=b.chart,y=b.options,_=y.gridLines,k=y.position,w=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,C=S.length+(w?1:0),P=fn(_),A=[],D=_.drawBorder?dn(_.lineWidth,0,0):0,T=D/2,I=H._alignPixel,F=function(t){return I(x,t,D)};for("top"===k?(e=F(b.bottom),s=b.bottom-P,u=e-T,h=F(t.top)+T,f=t.bottom):"bottom"===k?(e=F(b.top),h=t.top,f=F(t.bottom)-T,s=e+T,u=b.top+P):"left"===k?(e=F(b.right),o=b.right-P,l=e-T,d=F(t.left)+T,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-T,o=e+T,l=b.left+P),n=0;n<C;++n)i=S[n]||{},ln(i.label)&&n<S.length||(n===b.zeroLineIndex&&y.offset===w?(g=_.zeroLineWidth,p=_.zeroLineColor,m=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=dn(_.lineWidth,n,1),p=dn(_.color,n,"rgba(0,0,0,0.1)"),m=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=hn(b,i._index||n,w))&&(r=I(x,a,g),M?o=l=d=c=r:s=u=h=f=r,A.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:p,borderDash:m,borderDashOffset:v})));return A.ticksLength=C,A.borderValue=e,A},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,p=f.position,m=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,x=mn(g),y=g.padding,_=fn(f.gridLines),k=-H.toRadians(c.labelRotation),w=[];for("top"===p?(r=c.bottom-_-y,o=k?"left":"center"):"bottom"===p?(r=c.top+_+y,o=k?"right":"center"):"left"===p?(a=c.right-(m?0:_)-y,o=m?"left":"right"):(a=c.left+(m?0:_)+y,o=m?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,ln(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?x.major:x.minor).lineHeight,d=sn(i)?i.length:1,v?(a=s,h="top"===p?((k?1:.5)-d)*u:(k?0:.5)*u):(r=s,h=(1-d)*u/2),w.push({x:a,y:r,rotation:k,label:i,font:l,textOffset:h,textAlign:o}));return w},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=H._alignPixel,h=n.drawBorder?dn(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,p,m,v=h,b=dn(n.lineWidth,c.ticksLength-1,1),x=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,p=m=x):(p=d(u,e.top,v)-v/2,m=d(u,e.bottom,b)+b/2,f=g=x),l.lineWidth=h,l.strokeStyle=dn(n.color,0),l.beginPath(),l.moveTo(f,p),l.lineTo(g,m),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,sn(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=un(i.fontColor,N.global.defaultFontColor),s=H.options._parseFont(i),l=H.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});xn.prototype._draw=xn.prototype.draw;var yn=xn,_n=H.isNullOrUndef,kn=yn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;yn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return _n(e)||_n(n)||(t=o.chart.data.datasets[n].data[e]),_n(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=H.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),wn={position:"bottom"};kn._defaults=wn;var Mn=H.noop,Sn=H.isNullOrUndef;var Cn=yn.extend({getRightValue:function(t){return"string"==typeof t?+t:yn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=H.sign(t.min),i=H.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:Mn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:H.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,p=H.niceNum((g-f)/u/l)*l;if(p<1e-14&&Sn(d)&&Sn(h))return[f,g];(r=Math.ceil(g/p)-Math.floor(f/p))>u&&(p=H.niceNum(r*p/u/l)*l),s||Sn(c)?n=Math.pow(10,H._decimalPlaces(p)):(n=Math.pow(10,c),p=Math.ceil(p*n)/n),i=Math.floor(f/p)*p,a=Math.ceil(g/p)*p,s&&(!Sn(d)&&H.almostWhole(d/p,p/1e3)&&(i=d),!Sn(h)&&H.almostWhole(h/p,p/1e3)&&(a=h)),r=(a-i)/p,r=H.almostEquals(r,Math.round(r),p/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Sn(d)?i:d);for(var m=1;m<r;++m)o.push(Math.round((i+m*p)*n)/n);return o.push(Sn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=H.max(a),t.min=H.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),yn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;yn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Pn={position:"left",ticks:{callback:on.formatters.linear}};function An(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function Dn(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var Tn=Cn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?An(a,u,e,n):Dn(a,e,n);H.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,H.min(i)),a.max=Math.max(a.max,H.max(i))})),a.min=H.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=H.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=H.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),In=Pn;Tn._defaults=In;var Fn=H.valueOrDefault,On=H.math.log10;var Ln={position:"left",ticks:{callback:on.formatters.logarithmic}};function Rn(t,e){return H.isFinite(t)&&t>=0?t:e}var zn=yn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var p=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(p[a]=p[a]||0,p[a]+=n.max)}}H.each(f,(function(t){if(t.length>0){var e=H.min(t),n=H.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=H.isFinite(o.min)?o.min:null,o.max=H.isFinite(o.max)?o.max:null,o.minNotZero=H.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=Rn(e.min,t.min),t.max=Rn(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(On(t.min))-1),t.max=Math.pow(10,Math.floor(On(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(On(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(On(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(On(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:Rn(e.min),max:Rn(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=Fn(t.min,Math.pow(10,Math.floor(On(e.min)))),o=Math.floor(On(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(On(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(On(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=Fn(t.max,r);return a.push(u),a}(i,t);t.max=H.max(a),t.min=H.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),yn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(On(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;yn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=Fn(t.options.ticks.fontSize,N.global.defaultFontSize)/t._length),t._startValue=On(e),t._valueOffset=n,t._valueRange=(On(t.max)-On(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(On(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),Nn=Ln;zn._defaults=Nn;var Bn=H.valueOrDefault,En=H.valueAtIndexOrDefault,Wn=H.options.resolve,Vn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:on.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Hn(t){var e=t.ticks;return e.display&&t.display?Bn(e.fontSize,N.global.defaultFontSize)+2*e.backdropPaddingY:0}function jn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function qn(t){return 0===t||180===t?"center":t<180?"left":"right"}function Un(t,e,n,i){var a,r,o=n.y+i/2;if(H.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Yn(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Gn(t){return H.isNumber(t)?t:0}var Xn=Cn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Hn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;H.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);H.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Hn(this.options))},convertTicksToLabels:function(){var t=this;Cn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=H.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=H.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=H.isArray(u)?{w:H.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=H.toDegrees(h)%360,f=jn(c,i.x,n.w,0,180),g=jn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Gn(a),r=Gn(r),o=Gn(o),s=Gn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(H.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Bn(s.lineWidth,o.lineWidth),u=Bn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Hn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=H.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=En(i.fontColor,s,N.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=H.toDegrees(h);e.textAlign=qn(c),Yn(c,t._pointLabelSizes[s],u),Un(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&H.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=En(e.color,i-1),u=En(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(Wn([s.borderDash,o.borderDash,[]])),a.lineDashOffset=Wn([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=H.options._parseFont(n),s=Bn(n.fontColor,N.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",H.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:H.noop}),Kn=Vn;Xn._defaults=Kn;var Zn=H._deprecated,$n=H.options.resolve,Jn=H.valueOrDefault,Qn=Number.MIN_SAFE_INTEGER||-9007199254740991,ti=Number.MAX_SAFE_INTEGER||9007199254740991,ei={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ni=Object.keys(ei);function ii(t,e){return t-e}function ai(t){return H.valueOrDefault(t.time.min,t.ticks.min)}function ri(t){return H.valueOrDefault(t.time.max,t.ticks.max)}function oi(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function si(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),H.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),H.isFinite(o)||(o=n.parse(o))),o)}function li(t,e){if(H.isNullOrUndef(e))return null;var n=t.options.time,i=si(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function ui(t,e,n,i){var a,r,o,s=ni.length;for(a=ni.indexOf(t);a<s-1;++a)if(o=(r=ei[ni[a]]).steps?r.steps:ti,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ni[a];return ni[s-1]}function di(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var hi=yn.extend({initialize:function(){this.mergeTicksOptions(),yn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new rn._date(e.adapters.date);return Zn("time scale",n.format,"time.format","time.parser"),Zn("time scale",n.min,"time.min","ticks.min"),Zn("time scale",n.max,"time.max","ticks.max"),H.mergeIf(n.displayFormats,i.formats()),yn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),yn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=ti,f=Qn,g=[],p=[],m=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)m.push(li(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,H.isObject(a[0]))for(p[t]=[],e=0,i=a.length;e<i;++e)r=li(s,a[e]),g.push(r),p[t][e]=r;else p[t]=m.slice(0),o||(g=g.concat(m),o=!0);else p[t]=[];m.length&&(c=Math.min(c,m[0]),f=Math.max(f,m[m.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ii):g.sort(ii),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=li(s,ai(d))||c,f=li(s,ri(d))||f,c=c===ti?+u.startOf(Date.now(),h):c,f=f===Qn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:p,labels:m}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||ui(s.minUnit,e,n,i),u=$n([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=li(i,ai(o))||a,r=li(i,ri(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?ui(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ni.length-1;r>=ni.indexOf(n);r--)if(o=ni[r],ei[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ni[n?ni.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ni.indexOf(t)+1,n=ni.length;e<n;++e)if(ei[ni[e]].common)return ni[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=oi(t,"time",e[0],"pos"),s=1===e.length?1-r:(oi(t,"time",e[1],"pos")-r)/2,o=oi(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-oi(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),di(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return H.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(si(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(si(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,p=$n([g.callback,g.userCallback,h.callback,h.userCallback]);return p?p(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=oi(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=li(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=oi(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=H.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=Jn(e.fontSize,N.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,di(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),ci={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};hi._defaults=ci;var fi={category:kn,linear:Tn,logarithmic:zn,radialLinear:Xn,time:hi},gi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};rn._date.override("function"==typeof t?{_id:"moment",formats:function(){return gi},parse:function(e,n){return"string"==typeof e&&"string"==typeof n?e=t(e,n):e instanceof t||(e=t(e)),e.isValid()?e.valueOf():null},format:function(e,n){return t(e).format(n)},add:function(e,n,i){return t(e).add(n,i).valueOf()},diff:function(e,n,i){return t(e).diff(t(n),i)},startOf:function(e,n,i){return e=t(e),"isoWeek"===n?e.isoWeekday(i).valueOf():e.startOf(n).valueOf()},endOf:function(e,n){return t(e).endOf(n).valueOf()},_create:function(e){return t(e)}}:{}),N._set("global",{plugins:{filler:{propagate:!0}}});var pi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return H.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function mi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function vi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(H.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function bi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function xi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),pi[n](t))}function yi(t){return t&&!t.skip}function _i(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)H.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)H.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function ki(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,p=i.spanGaps,m=[],v=[],b=0,x=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=yi(u),c=yi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=m.push(u),x=v.push(d)):b&&x&&(p?(h&&m.push(u),c&&v.push(d)):(_i(t,m,v,b,x),b=x=0,m=[],v=[]));_i(t,m,v,b,x),t.closePath(),t.fillStyle=a,t.fill()}var wi={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof kt.Line&&(r={visible:t.isDatasetVisible(i),fill:mi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=bi(l,i,s),r.boundary=vi(r),r.mapper=xi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||N.global.defaultColor,o&&s&&r.length&&(H.canvas.clipArea(u,t.chartArea),ki(u,r,o,a,s,i._loop),H.canvas.unclipArea(u)))}},Mi=H.rtl.getRtlAdapter,Si=H.noop,Ci=H.valueOrDefault;function Pi(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}N._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Ai=K.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Si,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Si,beforeSetDimensions:Si,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Si,beforeBuildLabels:Si,buildLabels:function(){var t=this,e=t.options.labels||{},n=H.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Si,beforeFit:Si,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=H.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],p=n.padding,m=0,v=0;H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(p+=m+n.padding,f.push(m),g.push(v),m=0,v=0),m=Math.max(m,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),p+=m,f.push(m),g.push(v),l.width+=p}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Si,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=N.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=Mi(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Ci(n.fontColor,i.defaultFontColor),g=H.options._parseFont(n),p=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var m=Pi(n,p),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},x=t.isHorizontal();d=x?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},H.rtl.overrideTextDirection(t.ctx,e.textDirection);var y=p+n.padding;H.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=m+p/2+f,_=d.x,k=d.y;h.setWidth(t.minSize.width),x?i>0&&_+g+n.padding>t.left+t.minSize.width&&(k=d.y+=y,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&k+y>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,k=d.y=t.top+b(o,s[d.line]));var w=h.x(_);!function(t,e,i){if(!(isNaN(m)||m<=0)){c.save();var o=Ci(i.lineWidth,r.borderWidth);if(c.fillStyle=Ci(i.fillStyle,a),c.lineCap=Ci(i.lineCap,r.borderCapStyle),c.lineDashOffset=Ci(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Ci(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Ci(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Ci(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=m*Math.SQRT2/2,l=h.xPlus(t,m/2),u=e+p/2;H.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,m),e,m,p),0!==o&&c.strokeRect(h.leftForLtr(t,m),e,m,p);c.restore()}}(w,k,e),v[i].left=h.leftForLtr(w,v[i].width),v[i].top=k,function(t,e,n,i){var a=p/2,r=h.xPlus(t,m+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(w,k,e,f),x?d.x+=g+n.padding:d.y+=y})),H.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Di(t,e){var n=new Ai({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.legend=n}var Ti={id:"legend",_element:Ai,beforeInit:function(t){var e=t.options.legend;e&&Di(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(H.mergeIf(e,N.global.legend),n?(pe.configure(t,n,e),n.options=e):Di(t,e)):n&&(pe.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ii=H.noop;N._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Fi=K.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ii,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ii,beforeSetDimensions:Ii,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ii,beforeBuildLabels:Ii,buildLabels:Ii,afterBuildLabels:Ii,beforeFit:Ii,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(H.isArray(n.text)?n.text.length:1)*H.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ii,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=H.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=H.valueOrDefault(n.fontColor,N.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(H.isArray(g))for(var p=0,m=0;m<g.length;++m)e.fillText(g[m],0,p,i),p+=s;else e.fillText(g,0,0,i);e.restore()}}});function Oi(t,e){var n=new Fi({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.titleBlock=n}var Li={},Ri=wi,zi=Ti,Ni={id:"title",_element:Fi,beforeInit:function(t){var e=t.options.title;e&&Oi(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(H.mergeIf(e,N.global.title),n?(pe.configure(t,n,e),n.options=e):Oi(t,e)):n&&(pe.removeBox(t,n),delete t.titleBlock)}};for(var Bi in Li.filler=Ri,Li.legend=zi,Li.title=Ni,en.helpers=H,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=H._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}H.where=function(t,e){if(H.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return H.each(t,(function(t){e(t)&&n.push(t)})),n},H.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},H.findNextWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},H.findPreviousWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},H.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},H.almostEquals=function(t,e,n){return Math.abs(t-e)<n},H.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},H.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},H.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},H.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},H.toRadians=function(t){return t*(Math.PI/180)},H.toDegrees=function(t){return t*(180/Math.PI)},H._decimalPlaces=function(t){if(H.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},H.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},H.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},H.aliasPixel=function(t){return t%2==0?0:.5},H._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},H.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},H.EPSILON=Number.EPSILON||1e-14,H.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(H.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},H.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},H.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},H.niceNum=function(t,e){var n=Math.floor(H.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},H.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},H.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(H.getStyle(r,"padding-left")),u=parseFloat(H.getStyle(r,"padding-top")),d=parseFloat(H.getStyle(r,"padding-right")),h=parseFloat(H.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},H.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},H.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},H._calculatePadding=function(t,e,n){return(e=H.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},H._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},H.getMaximumWidth=function(t){var e=H._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-H._calculatePadding(e,"padding-left",n)-H._calculatePadding(e,"padding-right",n),a=H.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},H.getMaximumHeight=function(t){var e=H._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-H._calculatePadding(e,"padding-top",n)-H._calculatePadding(e,"padding-bottom",n),a=H.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},H.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},H.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},H.fontString=function(t,e,n){return e+" "+t+"px "+n},H.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==H.isArray(u))h=H.measureText(t,a,r,h,u);else if(H.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||H.isArray(d)||(h=H.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},H.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},H.numberOfLabelLines=function(t){var e=1;return H.each(t,(function(t){H.isArray(t)&&t.length>e&&(e=t.length)})),e},H.color=_?function(t){return t instanceof CanvasGradient&&(t=N.global.defaultColor),_(t)}:function(t){return console.error("Color.js not found!"),t},H.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:H.color(t).saturate(.5).darken(.1).rgbString()}}(),en._adapters=rn,en.Animation=$,en.animationService=J,en.controllers=Jt,en.DatasetController=it,en.defaults=N,en.Element=K,en.elements=kt,en.Interaction=re,en.layouts=pe,en.platform=Oe,en.plugins=Le,en.Scale=yn,en.scaleService=Re,en.Ticks=on,en.Tooltip=Ye,en.helpers.each(fi,(function(t,e){en.scaleService.registerScaleType(e,t,t._defaults)})),Li)Li.hasOwnProperty(Bi)&&en.plugins.register(Li[Bi]);en.platform.initialize();var Ei=en;return"undefined"!=typeof window&&(window.Chart=en),en.Chart=en,en.Legend=Li.legend._element,en.Title=Li.title._element,en.pluginService=en.plugins,en.PluginBase=en.Element.extend({}),en.canvasHelpers=en.helpers.canvas,en.layoutService=en.layouts,en.LinearScaleBase=Cn,en.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){en[t]=function(e,n){return new en(e,en.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Ei}));
diff --git a/public/javascripts/chart.js/2.9.4/Chart.min.js b/public/javascripts/chart.js/2.9.4/Chart.min.js
new file mode 100755
index 0000000000..a87f61443e
--- /dev/null
+++ b/public/javascripts/chart.js/2.9.4/Chart.min.js
@@ -0,0 +1,7 @@
+/*!
+ * Chart.js v2.9.4
+ * https://www.chartjs.org
+ * (c) 2020 Chart.js Contributors
+ * Released under the MIT License
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(function(){try{return require("moment")}catch(t){}}()):"function"==typeof define&&define.amd?define(["require"],(function(t){return e(function(){try{return t("moment")}catch(t){}}())})):(t=t||self).Chart=e(t.moment)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},n=function(t,e){return t(e={exports:{}},e.exports),e.exports}((function(t){var n={};for(var i in e)e.hasOwnProperty(i)&&(n[e[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=n[t];if(i)return i;var a,r,o,s=1/0;for(var l in e)if(e.hasOwnProperty(l)){var u=e[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return e[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));n.rgb,n.hsl,n.hsv,n.hwb,n.cmyk,n.xyz,n.lab,n.lch,n.hex,n.keyword,n.ansi16,n.ansi256,n.hcg,n.apple,n.gray;function i(t){var e=function(){for(var t={},e=Object.keys(n),i=e.length,a=0;a<i;a++)t[e[a]]={distance:-1,parent:null};return t}(),i=[t];for(e[t].distance=0;i.length;)for(var a=i.pop(),r=Object.keys(n[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,i.unshift(l))}return e}function a(t,e){return function(n){return e(t(n))}}function r(t,e){for(var i=[e[t].parent,t],r=n[e[t].parent][t],o=e[t].parent;e[o].parent;)i.unshift(e[o].parent),r=a(n[e[o].parent][o],r),o=e[o].parent;return r.conversion=i,r}var o={};Object.keys(n).forEach((function(t){o[t]={},Object.defineProperty(o[t],"channels",{value:n[t].channels}),Object.defineProperty(o[t],"labels",{value:n[t].labels});var e=function(t){for(var e=i(t),n={},a=Object.keys(e),o=a.length,s=0;s<o;s++){var l=a[s];null!==e[l].parent&&(n[l]=r(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];o[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),o[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var s=o,l={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},u={getRgba:d,getHsla:h,getRgb:function(t){var e=d(t);return e&&e.slice(0,3)},getHsl:function(t){var e=h(t);return e&&e.slice(0,3)},getHwb:c,getAlpha:function(t){var e=d(t);if(e)return e[3];if(e=h(t))return e[3];if(e=c(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+v(t[0])+v(t[1])+v(t[2])+(e>=0&&e<1?v(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return f(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:f,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:g,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return b[t.slice(0,3)]}};function d(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=l[i[1]]))return}for(r=0;r<e.length;r++)e[r]=m(e[r],0,255);return n=n||0==n?m(n,0,1):1,e[3]=n,e}}function h(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function c(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function f(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function g(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function m(t,e,n){return Math.min(Math.max(e,t),n)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var b={};for(var x in l)b[l[x]]=x;var y=function(t){return t instanceof y?t:this instanceof y?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=u.getRgba(t))?this.setValues("rgb",e):(e=u.getHsla(t))?this.setValues("hsl",e):(e=u.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new y(t);var e};y.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return u.hexString(this.values.rgb)},rgbString:function(){return u.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return u.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return u.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return u.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return u.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return u.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return u.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new y,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},y.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},y.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},y.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},y.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)a[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];l=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];l=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===l?a.alpha:l)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=s[t][d](a[t]));return!0},y.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},y.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=y);var _=y;function k(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}var w,M={noop:function(){},uid:(w=0,function(){return w++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return M.valueOrDefault(M.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(M.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(M.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!M.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(M.isArray(t))return t.map(M.clone);if(M.isObject(t)){for(var e=Object.create(t),n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=M.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){if(k(t)){var a=e[t],r=n[t];M.isObject(a)&&M.isObject(r)?M.merge(a,r,i):e[t]=M.clone(r)}},_mergerIf:function(t,e,n){if(k(t)){var i=e[t],a=n[t];M.isObject(i)&&M.isObject(a)?M.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=M.clone(a))}},merge:function(t,e,n){var i,a,r,o,s,l=M.isArray(e)?e:[e],u=l.length;if(!M.isObject(t))return t;for(i=(n=n||{}).merger||M._merger,a=0;a<u;++a)if(e=l[a],M.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return M.merge(t,e,{merger:M._mergerIf})},extend:Object.assign||function(t){return M.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=M.inherits,t&&M.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},S=M;M.callCallback=M.callback,M.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},M.getValueOrDefault=M.valueOrDefault,M.getValueAtIndexOrDefault=M.valueAtIndexOrDefault;var C={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-C.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*C.easeInBounce(2*t):.5*C.easeOutBounce(2*t-1)+.5}},P={effects:C};S.easingEffects=C;var A=Math.PI,D=A/180,T=2*A,I=A/2,F=A/4,O=2*A/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-A,-I),t.arc(u,l,o,-I,0),t.arc(u,d,o,0,I),t.arc(s,d,o,I,A)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-I,I),t.arc(s,l,o,I,A+I)):l<d?(t.arc(s,l,o,-A,0),t.arc(s,d,o,0,A)):t.arc(s,l,o,-A,A),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*D;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,T),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=O,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=O,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+F)*u,l=Math.sin(h+F)*u,t.arc(i-s,a-l,d,h-A,h-I),t.arc(i+l,a-s,d,h-I,h),t.arc(i+s,a+l,d,h,h+I),t.arc(i-l,a+s,d,h+I,h+A),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=F;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=F;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=F,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},R=L;S.clear=L.clear,S.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var z={_set:function(t,e){return S.merge(this[t]||(this[t]={}),e)}};z._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var N=z,B=S.valueOrDefault;var E={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return S.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=N.global,n=B(t.fontSize,e.defaultFontSize),i={family:B(t.fontFamily,e.defaultFontFamily),lineHeight:S.options.toLineHeight(B(t.lineHeight,e.defaultLineHeight),n),size:n,style:B(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||S.isNullOrUndef(t.size)||S.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&S.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},W={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},V=W;S.log10=W.log10;var H=S,j=P,q=R,U=E,Y=V,G={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};H.easing=j,H.canvas=q,H.options=U,H.math=Y,H.rtl=G;var X=function(t){H.extend(this,t),this.initialize.apply(this,arguments)};H.extend(X.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=H.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=_(l)).valid&&(c=_(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(H.isFinite(l)&&H.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=H.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return H.isNumber(this._model.x)&&H.isNumber(this._model.y)}}),X.extend=H.inherits;var K=X,Z=K.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),$=Z;Object.defineProperty(Z.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(Z.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),N._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:H.noop,onComplete:H.noop}});var J={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=H.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=H.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),H.callback(t.render,[e,t],e),H.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(H.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},Q=H.options.resolve,tt=["push","pop","shift","splice","unshift"];function et(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(tt.forEach((function(e){delete t[e]})),delete t._chartjs)}}var nt=function(t,e){this.initialize(t,e)};H.extend(nt.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&et(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&et(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),tt.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return H.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=H.merge(Object.create(null),[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&H._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:H.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=Q([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},p={cacheable:!i};if(i=i||{},H.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=Q([i[l],d[l],h[l]],g,e,p);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=Q([i[l],d[c[l]],d[l],h[l]],g,e,p);return p.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){H.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=H.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=Q([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=Q([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=Q([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),nt.extend=H.inherits;var it=nt,at=2*Math.PI;function rt(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function ot(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+at,rt(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=at,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+at,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+at),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&rt(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}N._set("global",{elements:{arc:{backgroundColor:N.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var st=K.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=H.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=at;for(;a>s;)a-=at;for(;a<o;)a+=at;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/at)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+at,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%at}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&ot(e,n,a),e.restore()}}),lt=H.valueOrDefault,ut=N.global.defaultColor;N._set("global",{elements:{line:{tension:.4,backgroundColor:ut,borderWidth:3,borderColor:ut,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var dt=K.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=N.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=H.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=lt(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=lt(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?H.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):H.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),ht=H.valueOrDefault,ct=N.global.defaultColor;function ft(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}N._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ct,borderColor:ct,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var gt=K.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ft,inXRange:ft,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=N.global,u=l.defaultColor;e.skip||(void 0===t||H.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=ht(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,H.canvas.drawPoint(n,i,r,o,s,a))}}),pt=N.global.defaultColor;function mt(t){return t&&void 0!==t.width}function vt(t){var e,n,i,a,r;return mt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function bt(t,e,n){return t===e?n:t===n?e:t}function xt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=bt(e,"left","right")):t.base<t.y&&(e=bt(e,"bottom","top")),n[e]=!0,n):n}(t);return H.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function yt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&vt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}N._set("global",{elements:{rectangle:{backgroundColor:pt,borderColor:pt,borderSkipped:"bottom",borderWidth:0}}});var _t=K.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=vt(t),n=e.right-e.left,i=e.bottom-e.top,a=xt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return yt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return mt(n)?yt(n,t,null):yt(n,null,e)},inXRange:function(t){return yt(this._view,t,null)},inYRange:function(t){return yt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return mt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return mt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),kt={},wt=st,Mt=dt,St=gt,Ct=_t;kt.Arc=wt,kt.Line=Mt,kt.Point=St,kt.Rectangle=Ct;var Pt=H._deprecated,At=H.valueOrDefault;function Dt(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=H.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return H.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}N._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),N._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Tt=it.extend({dataElementType:kt.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;it.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Pt("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Pt("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Pt("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Pt("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Pt("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},H.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),p=h._parseValue(f[t].data[e]),m=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,x=void 0===p.start?0:p.max>=0&&p.min>=0?p.min:p.max,y=void 0===p.start?p.end:p.max>=0&&p.min>=0?p.max-p.min:p.min-p.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(p.min<0&&r<0||p.max>=0&&r>0)&&(x+=r));return o=h.getPixelForValue(x),l=(s=h.getPixelForValue(x+y))-o,void 0!==m&&Math.abs(l)<m&&(l=m,s=y>=0&&!c||y<0&&c?o-m:o+m),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):Dt(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(At(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(H.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}H.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=H.extend({},it.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=At(n.barPercentage,e.barPercentage),e.barThickness=At(n.barThickness,e.barThickness),e.categoryPercentage=At(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=At(n.maxBarThickness,e.maxBarThickness),e.minBarLength=At(i.minBarLength,e.minBarLength),e}}),It=H.valueOrDefault,Ft=H.options.resolve;N._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Ot=it.extend({dataElementType:kt.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;H.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=It(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=It(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=It(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=it.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=H.extend({},s)),s.radius=Ft([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=H.valueOrDefault,Rt=Math.PI,zt=2*Rt,Nt=Rt/2;N._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-Nt,circumference:zt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return H.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Bt=it.extend({dataElementType:kt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,p=l.cutoutPercentage/100||0,m=l.circumference,v=r._getRingWeight(r.index);if(m<zt){var b=l.rotation%zt,x=(b+=b>=Rt?-zt:b<-Rt?zt:0)+m,y=Math.cos(b),_=Math.sin(b),k=Math.cos(x),w=Math.sin(x),M=b<=0&&x>=0||x>=zt,S=b<=Nt&&x>=Nt||x>=zt+Nt,C=b<=-Nt&&x>=-Nt||x>=Rt+Nt,P=b===-Rt||x>=Rt?-1:Math.min(y,y*p,k,k*p),A=C?-1:Math.min(_,_*p,w,w*p),D=M?1:Math.max(y,y*p,k,k*p),T=S?1:Math.max(_,_*p,w,w*p);u=(D-P)/2,d=(T-A)/2,h=-(D+P)/2,c=-(T+A)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*p,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/zt),g=n&&s.animateScale?0:i.innerRadius,p=n&&s.animateScale?0:i.outerRadius,m=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:m.backgroundColor,borderColor:m.borderColor,borderWidth:m.borderWidth,borderAlign:m.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:p,innerRadius:g,label:H.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return H.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?zt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});N._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),N._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Et=Tt.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Wt=H.valueOrDefault,Vt=H.options.resolve,Ht=H.canvas._isPointInArea;function jt(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function qt(t,e,n){var i=n/2,a=jt(t,i),r=jt(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function Ut(t){var e,n,i,a;return H.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}N._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Yt=it.extend({datasetElementType:kt.Line,dataElementType:kt.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Wt(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Wt(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=it.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Wt(n.spanGaps,a.spanGaps),o.tension=Wt(n.lineTension,r.tension),o.steppedLine=Vt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=Ut(Wt(n.clip,qt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)H.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=H.splineCurve(H.previousItem(l,t)._model,n,H.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Ht(n,s)&&(t>0&&Ht(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Ht(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,H.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),H.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Wt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Wt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Wt(n.hoverBorderWidth,n.borderWidth),e.radius=Wt(n.hoverRadius,n.radius)}}),Gt=H.options.resolve;N._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Xt=it.extend({dataElementType:kt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],p=g+(t.hidden?0:i._angles[e]),m=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?m:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:p,label:H.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return H.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor,a=H.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Gt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});N._set("pie",H.clone(N.doughnut)),N._set("pie",{cutoutPercentage:0});var Kt=Bt,Zt=H.valueOrDefault;N._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var $t=it.extend({datasetElementType:kt.Line,dataElementType:kt.Point,linkScales:H.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Zt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=it.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Zt(e.spanGaps,n.spanGaps),i.tension=Zt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=H.splineCurve(H.previousItem(o,t,!0)._model,n,H.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Zt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Zt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Zt(n.hoverBorderWidth,n.borderWidth),e.radius=Zt(n.hoverRadius,n.radius)}});N._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),N._set("global",{datasets:{scatter:{showLine:!1}}});var Jt={bar:Tt,bubble:Ot,doughnut:Bt,horizontalBar:Et,line:Yt,polarArea:Xt,pie:Kt,radar:$t,scatter:Yt};function Qt(t,e){return t.native?{x:t.x,y:t.y}:H.getRelativePosition(t,e)}function te(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function ee(t,e){var n=[];return te(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ne(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return te(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ie(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ae(t,e,n){var i=Qt(e,t);n.axis=n.axis||"x";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var re={modes:{single:function(t,e){var n=Qt(e,t),i=[];return te(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ae,index:ae,dataset:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ae(t,e,{intersect:!1})},point:function(t,e){return ee(t,Qt(e,t))},nearest:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis);return ne(t,i,n.intersect,a)},x:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},oe=H.extend;function se(t,e){return H.where(t,(function(t){return t.pos===e}))}function le(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function ue(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function de(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-ue(o,t,"left","right"),a=e.outerHeight-ue(o,t,"top","bottom"),i!==t.w||a!==t.h){t.w=i,t.h=a;var l=n.horizontal?[i,t.w]:[a,t.h];return!(l[0]===l[1]||isNaN(l[0])&&isNaN(l[1]))}}function he(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function ce(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,he(r.horizontal,e)),de(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&ce(u,e,n)||l}function fe(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}N._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var ge,pe={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=H.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=le(se(e,"left"),!0),i=le(se(e,"right")),a=le(se(e,"top"),!0),r=le(se(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:se(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=oe({maxPadding:oe({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),ce(l,h,d),ce(u,h,d)&&ce(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),fe(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,fe(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},H.each(s.chartArea,(function(e){var n=e.box;oe(n,t.chartArea),n.update(h.w,h.h)}))}}},me=(ge=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&ge.default||ge,ve="$chartjs",be="chartjs-size-monitor",xe="chartjs-render-monitor",ye="chartjs-render-animation",_e=["animationstart","webkitAnimationStart"],ke={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function we(t,e){var n=H.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var Me=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Se(t,e,n){t.addEventListener(e,n,Me)}function Ce(t,e,n){t.removeEventListener(e,n,Me)}function Pe(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Ae(t){var e=document.createElement("div");return e.className=t||"",e}function De(t,e,n){var i,a,r,o,s=t[ve]||(t[ve]={}),l=s.resizer=function(t){var e=Ae(be),n=Ae(be+"-expand"),i=Ae(be+"-shrink");n.appendChild(Ae()),i.appendChild(Ae()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Se(n,"scroll",a.bind(n,"expand")),Se(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Pe("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Pe("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,H.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[ve]||(t[ve]={}),i=n.renderProxy=function(t){t.animationName===ye&&e()};H.each(_e,(function(e){Se(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(xe)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function Te(t){var e=t[ve]||{},n=e.resizer;delete e.resizer,function(t){var e=t[ve]||{},n=e.renderProxy;n&&(H.each(_e,(function(e){Ce(t,e,n)})),delete e.renderProxy),t.classList.remove(xe)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Ie={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[ve]||(t[ve]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,me)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[ve]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=we(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=we(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[ve]){var n=e[ve].initial;["height","width"].forEach((function(t){var i=n[t];H.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),H.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[ve]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[ve]||(n[ve]={});Se(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=ke[t.type]||t.type,i=H.getRelativePosition(t,e);return Pe(n,e,i.x,i.y,t)}(e,t))})}else De(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[ve]||{}).proxies||{})[t.id+"_"+e];a&&Ce(i,e,a)}else Te(i)}};H.addEvent=Se,H.removeEvent=Ce;var Fe=Ie._enabled?Ie:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Oe=H.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Fe);N._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=H.clone(N.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Re={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=H.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?H.merge(Object.create(null),[N.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=H.extend(this.defaults[t],e))},addScalesToLayout:function(t){H.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,pe.addBox(t,e)}))}},ze=H.valueOrDefault,Ne=H.rtl.getRtlAdapter;N._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:H.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:H.noop,beforeBody:H.noop,beforeLabel:H.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),H.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:H.noop,afterBody:H.noop,beforeFooter:H.noop,footer:H.noop,afterFooter:H.noop}}});var Be={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=H.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Ee(t,e){return e&&(H.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function We(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function Ve(t){var e=N.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:ze(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:ze(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:ze(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:ze(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:ze(t.titleFontStyle,e.defaultFontStyle),titleFontSize:ze(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:ze(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:ze(t.footerFontStyle,e.defaultFontStyle),footerFontSize:ze(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function He(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function je(t){return Ee([],We(t))}var qe=K.extend({initialize:function(){this._model=Ve(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Ee(o,We(i)),o=Ee(o,We(a)),o=Ee(o,We(r))},getBeforeBody:function(){return je(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return H.each(t,(function(t){var r={before:[],lines:[],after:[]};Ee(r.before,We(i.beforeLabel.call(n,t,e))),Ee(r.lines,i.label.call(n,t,e)),Ee(r.after,We(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return je(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Ee(r,We(n)),r=Ee(r,We(i)),r=Ee(r,We(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=Ve(c),p=h._active,m=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},x={width:f.width,height:f.height},y={x:f.caretX,y:f.caretY};if(p.length){g.opacity=1;var _=[],k=[];y=Be[c.position].call(h,p,h._eventPosition);var w=[];for(e=0,n=p.length;e<n;++e)w.push((i=p[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(w=w.filter((function(t){return c.filter(t,m)}))),c.itemSort&&(w=w.sort((function(t,e){return c.itemSort(t,e,m)}))),H.each(w,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),k.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(w,m),g.beforeBody=h.getBeforeBody(w,m),g.body=h.getBody(w,m),g.afterBody=h.getAfterBody(w,m),g.footer=h.getFooter(w,m),g.x=y.x,g.y=y.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=k,g.dataPoints=w,x=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=H.fontString(u,e._titleFontStyle,e._titleFontFamily),H.each(e.title,f),n.font=H.fontString(d,e._bodyFontStyle,e._bodyFontFamily),H.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,H.each(r,(function(t){H.each(t.before,f),H.each(t.lines,f),H.each(t.after,f)})),c=0,n.font=H.fontString(h,e._footerFontStyle,e._footerFontFamily),H.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,x,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,x),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=x.width,g.height=x.height,g.caretX=y.x,g.caretY=y.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,p=e.width,m=e.height;if("center"===c)s=g+m/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+p)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+p-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+m)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=Ne(e.rtl,e.x,e.width);for(t.x=He(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=H.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,p=e.displayColors,m=0,v=p?He(e,"left"):0,b=Ne(e.rtl,e.x,e.width),x=function(e){n.fillText(e,b.x(t.x+m),t.y+h/2),t.y+=h+c},y=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=H.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=He(e,y),n.fillStyle=e.bodyFontColor,H.each(e.beforeBody,x),m=p&&"right"!==y?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,H.each(i.before,x),l=0,d=(o=i.lines).length;l<d;++l){if(p){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}x(o[l])}H.each(i.after,x)}m=0,H.each(e.afterBody,x),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=Ne(e.rtl,e.x,e.width);for(t.x=He(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=H.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,H.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),H.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!H.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),Ue=Be,Ye=qe;Ye.positioners=Ue;var Ge=H.valueOrDefault;function Xe(){return H.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ge(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?H.merge(e[t][a],[Re.getScaleDefaults(r),o]):H.merge(e[t][a],o)}else H._merger(t,e,n,i)}})}function Ke(){return H.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||Object.create(null),r=n[t];"scales"===t?e[t]=Xe(a,r):"scale"===t?e[t]=H.merge(a,[Re.getScaleDefaults(r.type),r]):H._merger(t,e,n,i)}})}function Ze(t){var e=t.options;H.each(t.scales,(function(e){pe.removeBox(t,e)})),e=Ke(N.global,N[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function $e(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(H.findIndex(t,a)>=0);return i}function Je(t){return"top"===t||"bottom"===t}function Qe(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}N._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var tn=function(t,e){return this.construct(t,e),this};H.extend(tn.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||Object.create(null)).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Ke(N.global,N[t.type],t.options||{}),t}(e);var i=Oe.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=H.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,tn.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),H.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return H.canvas.clear(this),this},stop:function(){return J.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(H.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:H.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",H.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;H.each(e.xAxes,(function(t,n){t.id||(t.id=$e(e.xAxes,"x-axis-",n))})),H.each(e.yAxes,(function(t,n){t.id||(t.id=$e(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),H.each(i,(function(e){var i=e.options,r=i.id,o=Ge(i.type,e.dtype);Je(i.position)!==Je(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Re.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),H.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Re.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=Jt[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;H.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ze(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&H.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Qe("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(pe.update(this,this.width,this.height),t._layers=[],H.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ge(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),H.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new $({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=H.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});J.addAnimation(e,o,i,a)}else e.draw(),r(new $({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),H.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Qe("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return re.modes.single(this,t)},getElementsAtEvent:function(t){return re.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return re.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=re.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return re.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),H.canvas.clear(n),Oe.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete tn.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ye({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};H.each(t.options.events,(function(i){Oe.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Oe.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,H.each(e,(function(e,n){Oe.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),H.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!H.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),tn.instances={};var en=tn;tn.Controller=tn,tn.types={},H.configMerge=Ke,H.scaleMerge=Xe;function nn(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function an(t){this.options=t||{}}H.extend(an.prototype,{formats:nn,parse:nn,format:nn,add:nn,diff:nn,startOf:nn,endOf:nn,_create:function(t){return t}}),an.override=function(t){H.extend(an.prototype,t)};var rn={_date:an},on={formatters:{values:function(t){return H.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=H.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=H.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(H.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},sn=H.isArray,ln=H.isNullOrUndef,un=H.valueOrDefault,dn=H.valueAtIndexOrDefault;function hn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function cn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,p,m,v=n.length,b=[],x=[],y=[],_=0,k=0;for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,ln(s)||sn(s)){if(sn(s))for(r=0,o=s.length;r<o;++r)g=s[r],ln(g)||sn(g)||(c=H.measureText(t,d.data,d.gc,c,g),f+=h)}else c=H.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),x.push(f),y.push(h/2),_=Math.max(c,_),k=Math.max(f,k)}function w(t){return{width:b[t]||0,height:x[t]||0,offset:y[t]||0}}return function(t,e){H.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),p=b.indexOf(_),m=x.indexOf(k),{first:w(0),last:w(v-1),widest:w(p),highest:w(m)}}function fn(t){return t.drawTicks?t.tickMarkLength:0}function gn(t){var e,n;return t.display?(e=H.options._parseFont(t),n=H.options.toPadding(t.padding),e.lineHeight+n.height):0}function pn(t,e){return H.extend(H.options._parseFont({fontFamily:un(e.fontFamily,t.fontFamily),fontSize:un(e.fontSize,t.fontSize),fontStyle:un(e.fontStyle,t.fontStyle),lineHeight:un(e.lineHeight,t.lineHeight)}),{color:H.options.resolve([e.fontColor,t.fontColor,N.global.defaultFontColor])})}function mn(t){var e=pn(t,t.minor);return{minor:e,major:t.major.enabled?pn(t,t.major):e}}function vn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function bn(t,e,n,i){var a,r,o,s,l=un(n,0),u=Math.min(un(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}N._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:on.formatters.values,minor:{},major:{}}});var xn=K.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){H.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=H.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){H.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){H.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){H.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){H.callback(this.options.beforeDataLimits,[this])},determineDataLimits:H.noop,afterDataLimits:function(){H.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){H.callback(this.options.beforeBuildTicks,[this])},buildTicks:H.noop,afterBuildTicks:function(t){var e=this;return sn(t)&&t.length?H.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=H.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){H.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){H.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){H.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-fn(l.gridLines)-u.padding-gn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=H.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){H.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){H.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=fn(o)+gn(r)),u?s&&(e.height=fn(o)+gn(r)):e.height=t.maxHeight,a.display&&s){var d=mn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,p=h.highest,m=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,x=H.toRadians(t.labelRotation),y=Math.cos(x),_=Math.sin(x),k=_*g.width+y*(p.height-(b?p.offset:0))+(b?0:m);e.height=Math.min(t.maxHeight,e.height+k+v);var w,M,S=t.getPixelForTick(0)-t.left,C=t.right-t.getPixelForTick(t.getTicks().length-1);b?(w=l?y*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):y*f.width+_*f.offset):(w=c.width/2,M=f.width/2),t.paddingLeft=Math.max((w-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-C)*t.width/(t.width-C),0)+3}else{var P=a.mirror?0:g.width+v+m;e.width=Math.min(t.maxWidth,e.width+P),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){H.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(ln(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=cn(t.ctx,mn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return sn(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:H.noop,getPixelForValue:H.noop,getValueForPixel:H.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),vn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=H.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)bn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,bn(t,i,H.isNullOrUndef(a)?0:d-a,d),bn(t,i,h,H.isNullOrUndef(a)?t.length:h+a),vn(t)}return bn(t,i),vn(t)},_tickSize:function(){var t=this.options.ticks,e=H.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,p,m,v,b=this,x=b.chart,y=b.options,_=y.gridLines,k=y.position,w=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,C=S.length+(w?1:0),P=fn(_),A=[],D=_.drawBorder?dn(_.lineWidth,0,0):0,T=D/2,I=H._alignPixel,F=function(t){return I(x,t,D)};for("top"===k?(e=F(b.bottom),s=b.bottom-P,u=e-T,h=F(t.top)+T,f=t.bottom):"bottom"===k?(e=F(b.top),h=t.top,f=F(t.bottom)-T,s=e+T,u=b.top+P):"left"===k?(e=F(b.right),o=b.right-P,l=e-T,d=F(t.left)+T,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-T,o=e+T,l=b.left+P),n=0;n<C;++n)i=S[n]||{},ln(i.label)&&n<S.length||(n===b.zeroLineIndex&&y.offset===w?(g=_.zeroLineWidth,p=_.zeroLineColor,m=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=dn(_.lineWidth,n,1),p=dn(_.color,n,"rgba(0,0,0,0.1)"),m=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=hn(b,i._index||n,w))&&(r=I(x,a,g),M?o=l=d=c=r:s=u=h=f=r,A.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:p,borderDash:m,borderDashOffset:v})));return A.ticksLength=C,A.borderValue=e,A},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,p=f.position,m=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,x=mn(g),y=g.padding,_=fn(f.gridLines),k=-H.toRadians(c.labelRotation),w=[];for("top"===p?(r=c.bottom-_-y,o=k?"left":"center"):"bottom"===p?(r=c.top+_+y,o=k?"right":"center"):"left"===p?(a=c.right-(m?0:_)-y,o=m?"left":"right"):(a=c.left+(m?0:_)+y,o=m?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,ln(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?x.major:x.minor).lineHeight,d=sn(i)?i.length:1,v?(a=s,h="top"===p?((k?1:.5)-d)*u:(k?0:.5)*u):(r=s,h=(1-d)*u/2),w.push({x:a,y:r,rotation:k,label:i,font:l,textOffset:h,textAlign:o}));return w},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=H._alignPixel,h=n.drawBorder?dn(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,p,m,v=h,b=dn(n.lineWidth,c.ticksLength-1,1),x=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,p=m=x):(p=d(u,e.top,v)-v/2,m=d(u,e.bottom,b)+b/2,f=g=x),l.lineWidth=h,l.strokeStyle=dn(n.color,0),l.beginPath(),l.moveTo(f,p),l.lineTo(g,m),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,sn(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=un(i.fontColor,N.global.defaultFontColor),s=H.options._parseFont(i),l=H.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});xn.prototype._draw=xn.prototype.draw;var yn=xn,_n=H.isNullOrUndef,kn=yn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;yn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return _n(e)||_n(n)||(t=o.chart.data.datasets[n].data[e]),_n(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=H.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),wn={position:"bottom"};kn._defaults=wn;var Mn=H.noop,Sn=H.isNullOrUndef;var Cn=yn.extend({getRightValue:function(t){return"string"==typeof t?+t:yn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=H.sign(t.min),i=H.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:Mn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:H.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,p=H.niceNum((g-f)/u/l)*l;if(p<1e-14&&Sn(d)&&Sn(h))return[f,g];(r=Math.ceil(g/p)-Math.floor(f/p))>u&&(p=H.niceNum(r*p/u/l)*l),s||Sn(c)?n=Math.pow(10,H._decimalPlaces(p)):(n=Math.pow(10,c),p=Math.ceil(p*n)/n),i=Math.floor(f/p)*p,a=Math.ceil(g/p)*p,s&&(!Sn(d)&&H.almostWhole(d/p,p/1e3)&&(i=d),!Sn(h)&&H.almostWhole(h/p,p/1e3)&&(a=h)),r=(a-i)/p,r=H.almostEquals(r,Math.round(r),p/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Sn(d)?i:d);for(var m=1;m<r;++m)o.push(Math.round((i+m*p)*n)/n);return o.push(Sn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=H.max(a),t.min=H.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),yn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;yn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Pn={position:"left",ticks:{callback:on.formatters.linear}};function An(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function Dn(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var Tn=Cn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?An(a,u,e,n):Dn(a,e,n);H.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,H.min(i)),a.max=Math.max(a.max,H.max(i))})),a.min=H.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=H.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=H.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),In=Pn;Tn._defaults=In;var Fn=H.valueOrDefault,On=H.math.log10;var Ln={position:"left",ticks:{callback:on.formatters.logarithmic}};function Rn(t,e){return H.isFinite(t)&&t>=0?t:e}var zn=yn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var p=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(p[a]=p[a]||0,p[a]+=n.max)}}H.each(f,(function(t){if(t.length>0){var e=H.min(t),n=H.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=H.isFinite(o.min)?o.min:null,o.max=H.isFinite(o.max)?o.max:null,o.minNotZero=H.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=Rn(e.min,t.min),t.max=Rn(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(On(t.min))-1),t.max=Math.pow(10,Math.floor(On(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(On(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(On(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(On(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:Rn(e.min),max:Rn(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=Fn(t.min,Math.pow(10,Math.floor(On(e.min)))),o=Math.floor(On(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(On(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(On(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=Fn(t.max,r);return a.push(u),a}(i,t);t.max=H.max(a),t.min=H.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),yn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(On(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;yn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=Fn(t.options.ticks.fontSize,N.global.defaultFontSize)/t._length),t._startValue=On(e),t._valueOffset=n,t._valueRange=(On(t.max)-On(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(On(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),Nn=Ln;zn._defaults=Nn;var Bn=H.valueOrDefault,En=H.valueAtIndexOrDefault,Wn=H.options.resolve,Vn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:on.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Hn(t){var e=t.ticks;return e.display&&t.display?Bn(e.fontSize,N.global.defaultFontSize)+2*e.backdropPaddingY:0}function jn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function qn(t){return 0===t||180===t?"center":t<180?"left":"right"}function Un(t,e,n,i){var a,r,o=n.y+i/2;if(H.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Yn(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Gn(t){return H.isNumber(t)?t:0}var Xn=Cn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Hn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;H.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);H.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Hn(this.options))},convertTicksToLabels:function(){var t=this;Cn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=H.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=H.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=H.isArray(u)?{w:H.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=H.toDegrees(h)%360,f=jn(c,i.x,n.w,0,180),g=jn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Gn(a),r=Gn(r),o=Gn(o),s=Gn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(H.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Bn(s.lineWidth,o.lineWidth),u=Bn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Hn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=H.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=En(i.fontColor,s,N.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=H.toDegrees(h);e.textAlign=qn(c),Yn(c,t._pointLabelSizes[s],u),Un(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&H.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=En(e.color,i-1),u=En(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(Wn([s.borderDash,o.borderDash,[]])),a.lineDashOffset=Wn([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=H.options._parseFont(n),s=Bn(n.fontColor,N.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",H.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:H.noop}),Kn=Vn;Xn._defaults=Kn;var Zn=H._deprecated,$n=H.options.resolve,Jn=H.valueOrDefault,Qn=Number.MIN_SAFE_INTEGER||-9007199254740991,ti=Number.MAX_SAFE_INTEGER||9007199254740991,ei={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ni=Object.keys(ei);function ii(t,e){return t-e}function ai(t){return H.valueOrDefault(t.time.min,t.ticks.min)}function ri(t){return H.valueOrDefault(t.time.max,t.ticks.max)}function oi(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function si(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),H.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),H.isFinite(o)||(o=n.parse(o))),o)}function li(t,e){if(H.isNullOrUndef(e))return null;var n=t.options.time,i=si(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function ui(t,e,n,i){var a,r,o,s=ni.length;for(a=ni.indexOf(t);a<s-1;++a)if(o=(r=ei[ni[a]]).steps?r.steps:ti,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ni[a];return ni[s-1]}function di(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var hi=yn.extend({initialize:function(){this.mergeTicksOptions(),yn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new rn._date(e.adapters.date);return Zn("time scale",n.format,"time.format","time.parser"),Zn("time scale",n.min,"time.min","ticks.min"),Zn("time scale",n.max,"time.max","ticks.max"),H.mergeIf(n.displayFormats,i.formats()),yn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),yn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=ti,f=Qn,g=[],p=[],m=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)m.push(li(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,H.isObject(a[0]))for(p[t]=[],e=0,i=a.length;e<i;++e)r=li(s,a[e]),g.push(r),p[t][e]=r;else p[t]=m.slice(0),o||(g=g.concat(m),o=!0);else p[t]=[];m.length&&(c=Math.min(c,m[0]),f=Math.max(f,m[m.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ii):g.sort(ii),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=li(s,ai(d))||c,f=li(s,ri(d))||f,c=c===ti?+u.startOf(Date.now(),h):c,f=f===Qn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:p,labels:m}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||ui(s.minUnit,e,n,i),u=$n([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=li(i,ai(o))||a,r=li(i,ri(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?ui(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ni.length-1;r>=ni.indexOf(n);r--)if(o=ni[r],ei[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ni[n?ni.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ni.indexOf(t)+1,n=ni.length;e<n;++e)if(ei[ni[e]].common)return ni[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=oi(t,"time",e[0],"pos"),s=1===e.length?1-r:(oi(t,"time",e[1],"pos")-r)/2,o=oi(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-oi(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),di(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return H.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(si(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(si(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,p=$n([g.callback,g.userCallback,h.callback,h.userCallback]);return p?p(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=oi(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=li(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=oi(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=H.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=Jn(e.fontSize,N.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,di(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),ci={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};hi._defaults=ci;var fi={category:kn,linear:Tn,logarithmic:zn,radialLinear:Xn,time:hi},gi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};rn._date.override("function"==typeof t?{_id:"moment",formats:function(){return gi},parse:function(e,n){return"string"==typeof e&&"string"==typeof n?e=t(e,n):e instanceof t||(e=t(e)),e.isValid()?e.valueOf():null},format:function(e,n){return t(e).format(n)},add:function(e,n,i){return t(e).add(n,i).valueOf()},diff:function(e,n,i){return t(e).diff(t(n),i)},startOf:function(e,n,i){return e=t(e),"isoWeek"===n?e.isoWeekday(i).valueOf():e.startOf(n).valueOf()},endOf:function(e,n){return t(e).endOf(n).valueOf()},_create:function(e){return t(e)}}:{}),N._set("global",{plugins:{filler:{propagate:!0}}});var pi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return H.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function mi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function vi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(H.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function bi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function xi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),pi[n](t))}function yi(t){return t&&!t.skip}function _i(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)H.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)H.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function ki(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,p=i.spanGaps,m=[],v=[],b=0,x=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=yi(u),c=yi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=m.push(u),x=v.push(d)):b&&x&&(p?(h&&m.push(u),c&&v.push(d)):(_i(t,m,v,b,x),b=x=0,m=[],v=[]));_i(t,m,v,b,x),t.closePath(),t.fillStyle=a,t.fill()}var wi={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof kt.Line&&(r={visible:t.isDatasetVisible(i),fill:mi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=bi(l,i,s),r.boundary=vi(r),r.mapper=xi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||N.global.defaultColor,o&&s&&r.length&&(H.canvas.clipArea(u,t.chartArea),ki(u,r,o,a,s,i._loop),H.canvas.unclipArea(u)))}},Mi=H.rtl.getRtlAdapter,Si=H.noop,Ci=H.valueOrDefault;function Pi(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}N._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Ai=K.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Si,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Si,beforeSetDimensions:Si,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Si,beforeBuildLabels:Si,buildLabels:function(){var t=this,e=t.options.labels||{},n=H.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Si,beforeFit:Si,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=H.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],p=n.padding,m=0,v=0;H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(p+=m+n.padding,f.push(m),g.push(v),m=0,v=0),m=Math.max(m,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),p+=m,f.push(m),g.push(v),l.width+=p}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Si,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=N.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=Mi(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Ci(n.fontColor,i.defaultFontColor),g=H.options._parseFont(n),p=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var m=Pi(n,p),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},x=t.isHorizontal();d=x?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},H.rtl.overrideTextDirection(t.ctx,e.textDirection);var y=p+n.padding;H.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=m+p/2+f,_=d.x,k=d.y;h.setWidth(t.minSize.width),x?i>0&&_+g+n.padding>t.left+t.minSize.width&&(k=d.y+=y,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&k+y>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,k=d.y=t.top+b(o,s[d.line]));var w=h.x(_);!function(t,e,i){if(!(isNaN(m)||m<=0)){c.save();var o=Ci(i.lineWidth,r.borderWidth);if(c.fillStyle=Ci(i.fillStyle,a),c.lineCap=Ci(i.lineCap,r.borderCapStyle),c.lineDashOffset=Ci(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Ci(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Ci(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Ci(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=m*Math.SQRT2/2,l=h.xPlus(t,m/2),u=e+p/2;H.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,m),e,m,p),0!==o&&c.strokeRect(h.leftForLtr(t,m),e,m,p);c.restore()}}(w,k,e),v[i].left=h.leftForLtr(w,v[i].width),v[i].top=k,function(t,e,n,i){var a=p/2,r=h.xPlus(t,m+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(w,k,e,f),x?d.x+=g+n.padding:d.y+=y})),H.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Di(t,e){var n=new Ai({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.legend=n}var Ti={id:"legend",_element:Ai,beforeInit:function(t){var e=t.options.legend;e&&Di(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(H.mergeIf(e,N.global.legend),n?(pe.configure(t,n,e),n.options=e):Di(t,e)):n&&(pe.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ii=H.noop;N._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Fi=K.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ii,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ii,beforeSetDimensions:Ii,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ii,beforeBuildLabels:Ii,buildLabels:Ii,afterBuildLabels:Ii,beforeFit:Ii,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(H.isArray(n.text)?n.text.length:1)*H.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ii,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=H.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=H.valueOrDefault(n.fontColor,N.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(H.isArray(g))for(var p=0,m=0;m<g.length;++m)e.fillText(g[m],0,p,i),p+=s;else e.fillText(g,0,0,i);e.restore()}}});function Oi(t,e){var n=new Fi({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.titleBlock=n}var Li={},Ri=wi,zi=Ti,Ni={id:"title",_element:Fi,beforeInit:function(t){var e=t.options.title;e&&Oi(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(H.mergeIf(e,N.global.title),n?(pe.configure(t,n,e),n.options=e):Oi(t,e)):n&&(pe.removeBox(t,n),delete t.titleBlock)}};for(var Bi in Li.filler=Ri,Li.legend=zi,Li.title=Ni,en.helpers=H,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=H._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}H.where=function(t,e){if(H.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return H.each(t,(function(t){e(t)&&n.push(t)})),n},H.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},H.findNextWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},H.findPreviousWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},H.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},H.almostEquals=function(t,e,n){return Math.abs(t-e)<n},H.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},H.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},H.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},H.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},H.toRadians=function(t){return t*(Math.PI/180)},H.toDegrees=function(t){return t*(180/Math.PI)},H._decimalPlaces=function(t){if(H.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},H.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},H.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},H.aliasPixel=function(t){return t%2==0?0:.5},H._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},H.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},H.EPSILON=Number.EPSILON||1e-14,H.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(H.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},H.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},H.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},H.niceNum=function(t,e){var n=Math.floor(H.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},H.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},H.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(H.getStyle(r,"padding-left")),u=parseFloat(H.getStyle(r,"padding-top")),d=parseFloat(H.getStyle(r,"padding-right")),h=parseFloat(H.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},H.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},H.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},H._calculatePadding=function(t,e,n){return(e=H.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},H._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},H.getMaximumWidth=function(t){var e=H._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-H._calculatePadding(e,"padding-left",n)-H._calculatePadding(e,"padding-right",n),a=H.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},H.getMaximumHeight=function(t){var e=H._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-H._calculatePadding(e,"padding-top",n)-H._calculatePadding(e,"padding-bottom",n),a=H.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},H.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},H.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},H.fontString=function(t,e,n){return e+" "+t+"px "+n},H.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==H.isArray(u))h=H.measureText(t,a,r,h,u);else if(H.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||H.isArray(d)||(h=H.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},H.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},H.numberOfLabelLines=function(t){var e=1;return H.each(t,(function(t){H.isArray(t)&&t.length>e&&(e=t.length)})),e},H.color=_?function(t){return t instanceof CanvasGradient&&(t=N.global.defaultColor),_(t)}:function(t){return console.error("Color.js not found!"),t},H.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:H.color(t).saturate(.5).darken(.1).rgbString()}}(),en._adapters=rn,en.Animation=$,en.animationService=J,en.controllers=Jt,en.DatasetController=it,en.defaults=N,en.Element=K,en.elements=kt,en.Interaction=re,en.layouts=pe,en.platform=Oe,en.plugins=Le,en.Scale=yn,en.scaleService=Re,en.Ticks=on,en.Tooltip=Ye,en.helpers.each(fi,(function(t,e){en.scaleService.registerScaleType(e,t,t._defaults)})),Li)Li.hasOwnProperty(Bi)&&en.plugins.register(Li[Bi]);en.platform.initialize();var Ei=en;return"undefined"!=typeof window&&(window.Chart=en),en.Chart=en,en.Legend=Li.legend._element,en.Title=Li.title._element,en.pluginService=en.plugins,en.PluginBase=en.Element.extend({}),en.canvasHelpers=en.helpers.canvas,en.layoutService=en.layouts,en.LinearScaleBase=Cn,en.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){en[t]=function(e,n){return new en(e,en.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Ei}));
diff --git a/public/javascripts/diffhtml.min.js b/public/javascripts/diffhtml.min.js
new file mode 100644
index 0000000000..292f2654b5
--- /dev/null
+++ b/public/javascripts/diffhtml.min.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):(e=e||self,t(e.diff={}))}(this,function(e){"use strict";function t(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function r(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function n(e,t,n){return t&&r(e.prototype,t),n&&r(e,n),e}function a(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function o(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,n)}return r}function i(e){return s(e)||d(e)||c(e)||u()}function s(e){if(Array.isArray(e))return l(e)}function d(e){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(e))return Array.from(e)}function c(e,t){if(e){if("string"==typeof e)return l(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?l(e,t):void 0}}function l(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function u(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function f(e,t,r){var n=null;if(ae.protected.has(e)||ae.allocated.has(e))n=e;else if(!e||ne(e)){var a=e?e.length:0;r=[];for(var o=0;o<a;o++)r.push(e[o]);n=f(oe,null,r)}if(n)return n;var s="object"==typeof e,d=e;if(e&&s&&"ownerDocument"in d){var c;if(3===d.nodeType){var l=f(ie,d.nodeValue);return B.set(l,e),l}t={},r=[];var u=d.attributes;if(1===d.nodeType&&u&&u.length)for(var h=0;h<u.length;h++){var p=u[h],v=p.name,m=p.value;""===m&&v in d?t[v]=e[v]:t[v]=m}if((1===d.nodeType||11===d.nodeType)&&d.childNodes.length){r=[];for(var g=0;g<d.childNodes.length;g++){var N=d.childNodes[g];r.push(f(N))}}return B.forEach(function(t,r){t===e&&(n=r)}),n=n||f(d.nodeName,t,r),n.attributes=t,n.childNodes.length=0,(c=n.childNodes).push.apply(c,i(r)),B.set(n,e),n}if(s){var y=e.rawNodeName,b=e.nodeName,T=e.nodeValue,E=e.attributes,w=e.childNodes,k=e.children,S=y||b,O=f(S,E||null,k||w);return T&&(O.nodeValue=T),O}for(var x=arguments.length,_=new Array(x>3?x-3:0),C=3;C<x;C++)_[C-3]=arguments[C];_.length&&(r=[r].concat(_)),n=re.get();var A=e===ie;"string"==typeof e?(n.rawNodeName=e,n.nodeName=n.rawNodeName.toLowerCase()):(n.rawNodeName=e,n.nodeName=oe),n.nodeValue="",n.key="",n.childNodes.length=0,n.attributes={};var R=ne(t)||"object"!=typeof t,I=R?t:r,j=ne(I)?I:[I];if(A){var M=j.join("");return n.nodeType=3,n.nodeValue=String(M||""),n}if(n.nodeName===oe?n.nodeType=11:n.nodeType="#comment"===e?8:1,I&&j.length)for(var V=0;V<j.length;V++){var L=j[V];if(ne(L)){var H;(H=n.childNodes).push.apply(H,i(L))}else{if(!L)continue;if(11===L.nodeType&&"string"==typeof L.rawNodeName){var P;(P=n.childNodes).push.apply(P,i(L.childNodes))}else L&&"object"==typeof L?n.childNodes.push(f(L)):n.childNodes.push(f(ie,null,L))}}return t&&"object"==typeof t&&!ne(t)&&(n.attributes=t),"script"===n.nodeName&&n.attributes.src&&(n.key=String(n.attributes.src)),n.attributes&&"key"in n.attributes&&(n.key=String(n.attributes.key)),Y.size&&Y.forEach(function(e,t){(t=e(n))&&(n=f(t))}),n}function h(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};r.parser||(r.parser={}),t||(t=ue);var n=new Set(r.parser.rawElements?r.parser.rawElements:pe),a=new Set(r.parser.selfClosingElements||ve),o=/<!--[^]*?(?=-->)-->|<(\/?)([a-z\-\_][a-z0-9\-\_]*)\s*([^>]*?)(\/?)>/gi,i=f("#document-fragment",null,[]),s=[i],d=i,c=-1;if(!e.includes("<")&&e)return Ne(d,e,t),i;for(var l,u,h=0;l=o.exec(e);h++){c>-1&&c+l[0].length<o.lastIndex&&(u=e.slice(c,o.lastIndex-l[0].length))&&Ne(d,u,t);var p=o.lastIndex-l[0].length;if(-1===c&&p>0){var v=e.slice(0,p);v&&!ce.exec(v)&&Ne(d,v,t)}if(c=o.lastIndex,"!"!==l[0][1]){var m=le.exec(l[2]),g=m&&t.tags[m[1]],N=g?g.name||g:l[2];if(!l[1]&&(!l[4]&&me[d.rawNodeName]&&me[d.rawNodeName][N]&&(s.pop(),d=s[s.length-1]),d=d.childNodes[d.childNodes.push(ye(l[2],l[3],t))-1],s.push(d),r.parser.strict||n.has(N))){var y="</".concat(N,">"),b=e.indexOf(y,o.lastIndex);if(n.has(N)){-1===b?c=o.lastIndex=e.length+1:(c=b+y.length,o.lastIndex=c,l[1]=" ");var T=e.slice(l.index+l[0].length,b);Ne(d,T,t)}}if(l[1]||l[4]||a.has(N))for(;d;){if("/"===l[4]&&m){s.pop(),d=s[s.length-1];break}if(g&&d.rawNodeName===N){s.pop(),d=s[s.length-1];break}if(d.rawNodeName===N){s.pop(),d=s[s.length-1];break}var E=ge[d.rawNodeName];{if(!E||!E[N])break;s.pop(),d=s[s.length-1]}}}}var w=e.slice(-1===c?0:c);if(w&&Ne(d,w,t),i.childNodes.length&&"html"===i.childNodes[0].nodeName){var k={before:[],after:[]},S={after:[]},O=i.childNodes[0],x=!0,_=!0;if(O.childNodes=O.childNodes.filter(function(e){if("body"===e.nodeName||"head"===e.nodeName)return"head"===e.nodeName&&(x=!1),"body"===e.nodeName&&(_=!1),!0;1===e.nodeType&&(x&&_?k.before.push(e):!x&&_?k.after.push(e):_||S.after.push(e))}),O.childNodes[0]&&"head"===O.childNodes[0].nodeName){var C=O.childNodes[0].childNodes;C.unshift.apply(C,k.before),C.push.apply(C,k.after)}else{var A=f("head",null,[]);if(A){var R=A.childNodes;R.unshift.apply(R,k.before),R.push.apply(R,k.after),O.childNodes.unshift(A)}}if(O.childNodes[1]&&"body"===O.childNodes[1].nodeName){var I=O.childNodes[1].childNodes;I.push.apply(I,S.after)}else{var j=f("body",null,[]);if(j){var M=j.childNodes;M.push.apply(M,S.after),O.childNodes.push(j)}}}return i}function p(e){be(e);for(var t=0;t<e.childNodes.length;t++)p(e.childNodes[t]);return e}function v(e){Te(e);for(var t=0;t<e.childNodes.length;t++)v(e.childNodes[t]);return B.delete(e),e}function m(){Ee.allocated.forEach(function(e){Ee.free.add(e),Ee.allocated.delete(e),B.delete(e)})}function g(e,t){var r=xe&&location.search.includes(Oe),n=_e&&se.argv.includes(Oe);if(!r&&!n)return Ce;var a=t;return function(t){var r=e.host;e&&r?t="".concat(r.constructor.name," ").concat(t):a&&"function"==typeof a.rawNodeName&&(t="".concat(a.rawNodeName.name," ").concat(t));var n="".concat(t,"-end");if(ke.has(t)){var o=(performance.now()-ke.get(t)).toFixed(3);ke.delete(t),performance.mark(n),performance.measure("".concat(Se," ").concat(t," (").concat(o,"ms)"),t,n)}else ke.set(t,performance.now()),performance.mark(t)}}function N(e){var t=e.state,r=t.isRendering;z.forEach(function(n){var a=n.activeTransaction&&n.activeTransaction.domNode,o=e.domNode;a&&a.contains&&o&&o.contains&&(a.contains(o)&&n.isRendering?(t=n,r=!0):o.contains(a)&&n.isRendering&&(t=n,r=!0))});var n=t,a=n.activeTransaction,o=n.nextTransaction;if(r){var i=e.tasks,s=o||a;t.nextTransaction=e,e.abort();var d=s.promise||Promise.resolve();return e.promise=d.then(function(){return e.aborted=!1,e.state.isRendering=!0,e.state.activeTransaction=e,Je.flow(e,i.slice(1))})}t.isRendering=!0,t.activeTransaction=e}function y(e){var t=e.domNode,r=e.markup,n=e.state,a=e.state.measure,o=e.options,i=o.inner?"innerHTML":"outerHTML";a("should update");var s=t;if("string"==typeof r&&s[i]===r)return e.abort(!0);"string"==typeof r&&(n.markup=r),a("should update")}function b(e){var t=z.get(e);if(t&&(z.delete(e),t.oldTree&&!B.has(t.oldTree)&&(v(t.oldTree),G.forEach(function(e){return e(t.oldTree)}))),e){var r=e;if(r.childNodes&&r.childNodes.length)for(var n=0;n<r.childNodes.length;n++)b(r.childNodes[n]);r.shadowRoot&&b(r.shadowRoot),B.forEach(function(e,t){e===r&&(v(t),G.forEach(function(e){return e(t)}))})}}function T(e){var t=e.state,r=e.domNode,n=e.markup,a=e.options,o=t.previousMarkup,i=a.inner,s=r.outerHTML;o===s&&t.oldTree&&s||(b(r),t.oldTree=f(r),p(t.oldTree),z.set(r,t)),e.newTree||(e.newTree=f(n)),e.oldTree=t.oldTree;var d=e.oldTree,c=e.newTree;if(i&&d&&c){var l=d.nodeName,u=d.attributes,h="string"!=typeof c.rawNodeName,v=11===c.nodeType,m=v&&!h?c.childNodes:c;e.newTree=f(l,u,m)}}function E(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],n=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{};e||(e=Ae),t||(t=Ae);var a=n.svgElements,o=void 0===a?new Set:a,i=(e.nodeName,11===t.nodeType||e.nodeType,e===Ae),s="svg"===t.nodeName||o.has(t),d=null;if(q.forEach(function(r){var n=r(e,t);n&&n===e?d=!0:n&&(t=n)}),d)return r;for(var c={old:new Map,new:new Map},l=0;l<Re.length;l++){var u=Re[l],f=c[u],h=arguments[l],p=h&&h.childNodes;if(p&&p.length)for(var v=0;v<p.length;v++){var m=p[v];m.key&&f.set(m.key,m)}}var g=1===t.nodeType;if(t.nodeName===Ie){if(e.nodeName===Ie&&e.nodeValue!==t.nodeValue)return r.push(D.NODE_VALUE,e,t.nodeValue,e.nodeValue),e.nodeValue=t.nodeValue,r;if(i)return r.push(D.NODE_VALUE,t,t.nodeValue,null),r}if(g){var N=i?Ae:e.attributes,y=t.attributes;for(var b in y){var T=y[b];b in N&&N[b]===y[b]||(i||(N[b]=T),(e&&"script"===e.nodeName||"script"!==t.nodeName||"type"!==b)&&r.push(D.SET_ATTRIBUTE,i?t:e,b,T))}if(!i)for(var w in N)w in y||(r.push(D.REMOVE_ATTRIBUTE,e,w),delete N[w])}var k=t.childNodes||[];if(i){for(var S=0;S<k.length;S++)s&&o.add(k[S]),E(null,k[S],r,n);return r}for(var O=e.childNodes,x=0;x<k.length;x++){var _=O&&O[x],C=k[x],A=C.key;if((s||"svg"===C.nodeName)&&o.add(C),_){var R=_.key,I=c.new.has(R),j=c.old.has(A);if(R||A){if(!I&&!j){O.splice(O.indexOf(_),1,C),E(null,C,r,n),r.push(D.REPLACE_CHILD,C,_),x-=1;continue}if(!I){r.push(D.REMOVE_CHILD,_),O.splice(O.indexOf(_),1),x-=1;continue}if(A!==R){var M=C;A&&j?(M=c.old.get(A),O.splice(O.indexOf(M),1)):M=C,E(null,M,r,n),r.push(D.INSERT_BEFORE,e,M,_),O.splice(x,0,M);continue}}if(_.nodeName===C.nodeName)E(_,C,r,n);else{O[x]=C;var V=O.lastIndexOf(C);V>x&&O.splice(V,1),E(null,C,r,n),r.push(D.REPLACE_CHILD,C,_)}}else O.push(C),E(null,C,r,n),r.push(D.INSERT_BEFORE,e,C,null)}if(O.length!==k.length){for(var L=k.length;L<O.length;L++)r.push(D.REMOVE_CHILD,O[L]);O.length=k.length}return r}function w(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Le,r=arguments.length>2?arguments[2]:void 0,n=f(e),a=B.get(n);if(a)return a;var o=n.nodeName,i=n.rawNodeName,s=void 0===i?o:i,d=n.childNodes,c=void 0===d?[]:d;r=r||"svg"===o;var l=null;$.forEach(function(e,t){(t=e(n))&&(l=t)}),null===l&&(l="#text"===o?t.createTextNode(n.nodeValue||""):"#document-fragment"===o?t.createDocumentFragment():r?t.createElementNS(Ve,s):t.createElement(s),"script"===o&&(l.type="no-execute"));var u=l;B.set(n,u);for(var h=0;h<c.length;h++){var p=w(c[h],t,r);u.appendChild(p)}return u}function k(e){var t=e.state,r=e.state.measure,n=e.oldTree,a=e.newTree,o=e.domNode;if(r("sync trees"),n&&a&&n.nodeName!==a.nodeName&&11!==a.nodeType){e.patches=[D.REPLACE_CHILD,a,n],e.oldTree=t.oldTree=a;var i=w(a);z.delete(o),z.set(i,t),e.domNode=i,"script"===a.nodeName&&t.scriptsToExecute.set(a,a.attributes.type||"")}else e.patches=E(n||null,a||null,[],t);r("sync trees")}function S(e,t){U.get(e).add(t)}function O(e,t){if(!t&&e)U.get(e).clear();else if(e&&t)U.get(e).delete(t);else for(var r=0;r<He.length;r++)U.get(He[r]).clear()}function x(e){for(var t=U.get(e),r=[],n=arguments.length,a=new Array(n>1?n-1:0),o=1;o<n;o++)a[o-1]=arguments[o];var s=a[0],d=a.slice(1);return!t.size||"textChanged"!==e&&1!==s.nodeType?r:(t.forEach(function(e){var t=e.apply(void 0,[B.get(s)].concat(i(d)));"object"==typeof t&&t.then&&r.push(t)}),"attached"!==e&&"detached"!==e||s.childNodes.forEach(function(t){r.push.apply(r,i(x.apply(void 0,[e,t].concat(i(d)))))}),r)}function _(e){return Pe&&e&&e.indexOf&&e.includes("&")?(Pe.innerHTML=e,Pe.textContent||""):e}function C(e){for(var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=[],n=t.ownerDocument,a=t.svgElements,o=void 0===a?new Set:a,s=e.length,d=0;;){var c=e[d];if(d===s)break;switch(c){case D.SET_ATTRIBUTE:if("break"===function(){var t=e[d+1],a=e[d+2],s=_(e[d+3]);d+=4;var c=o.has(t),l=w(t,n,c),u=l.getAttribute(a),f=x("attributeChanged",t,a,u,s);return p(t),f.length?(Promise.all(f).then(function(){return Fe(t,l,a,s)}),r.push.apply(r,i(f))):Fe(t,l,a,s),"break"}())break;case D.REMOVE_ATTRIBUTE:if("break"===function(){var t=e[d+1],a=e[d+2];d+=3;var s=o.has(t),c=w(t,n,s),l=c.getAttribute(a),u=x("attributeChanged",t,a,l,null);return p(t),u.length?(Promise.all(u).then(function(){return Ye(c,a)}),r.push.apply(r,i(u))):Ye(c,a),"break"}())break;case D.NODE_VALUE:if("break"===function(){var t=e[d+1],a=e[d+2],s=e[d+3],c=o.has(t);d+=4;var l=w(t,n,c);p(t);var u=x("textChanged",t,s,a);return u.length?(Promise.all(u).then(function(){return $e(l,a)}),r.push.apply(r,i(u))):$e(l,a),"break"}())break;case D.INSERT_BEFORE:var l=e[d+1],u=e[d+2],f=e[d+3];d+=4;var h=B.get(l);if(!h)break;var m=o.has(u);p(u);var g=f&&w(f,n,m),N=w(u,n,m);h.insertBefore(N,g||null),r.push.apply(r,i(x("attached",u)));break;case D.REPLACE_CHILD:if("break"===function(){var t=e[d+1],a=e[d+2];d+=3;var s=o.has(t),c=B.get(a),l=w(t,n,s);if(!c||!c.parentNode)return"break";p(t);var u=U.get("attached").size,f=U.get("detached").size,h=U.get("replaced").size;if(!u&&!f&&!h)return c.parentNode&&(v(a),c.parentNode.replaceChild(l,c)),"break";c.parentNode&&c.parentNode.insertBefore(l,c);var m=x("attached",t),g=x("detached",a),N=x("replaced",a,l),y=[].concat(i(m),i(g),i(N));return y.length?(Promise.all(y).then(function(){c.parentNode&&c.parentNode.removeChild(c),v(a)}),r.push.apply(r,i(y))):(c.parentNode&&c.parentNode.removeChild(c),v(a)),"break"}())break;case D.REMOVE_CHILD:if("break"===function(){var t=e[d+1];d+=2;var n=B.get(t);if(!n||!n.parentNode)return"break";var a=x("detached",t);return a.length?(Promise.all(a).then(function(){n.parentNode&&n.parentNode.removeChild(n),v(t)}),r.push.apply(r,i(a))):(n.parentNode&&n.parentNode.removeChild(n),v(t)),"break"}())break}}return r}function A(e){var t=e.domNode,r=e.state,n=e.state,a=n.measure,o=n.scriptsToExecute,s=e.patches,d=t.ownerDocument,c=e.promises||[];r.ownerDocument=d||document;var l=function(e){"script"===e.nodeName&&(o.set(e,e.attributes.type),e.attributes.type="no-execute")};$.add(l),a("patch node"),c.push.apply(c,i(C(s,r))),a("patch node"),$.delete(l),e.promises=c}function R(e){var t=e.promises;return t&&t.length?e.promise=Promise.all(t).then(function(){return e.end()}):e.promise=Promise.resolve(e.end())}function I(e){var t=e.state,r=e.markup,n=e.options,a=t.measure,o=n.inner;if("string"==typeof r){a("parsing markup for new tree");var i=h(r,void 0,n),s=i.childNodes,d=f(o?s:s[0]||s);d&&(e.newTree=d),a("parsing markup for new tree")}}function j(e){return e.replace(/[&<>]/g,function(e){return"&#".concat(e.charCodeAt(0),";")})}function M(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return r.inner=!0,r.executeScripts=!("executeScripts"in r)||r.executeScripts,r.tasks=r.tasks||qe,Je.create(e,t,r).start()}function V(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return r.inner=!1,r.tasks=r.tasks||qe,r.executeScripts=!("executeScripts"in r)||r.executeScripts,Je.create(e,t,r).start()}function L(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];var a=f("#text","");if(!e)return a;if("string"==typeof e&&(e=[e]),1===e.length&&!r.length){var o=L.isStrict;if(L.isStrict=!1,!e[0])return a;var i=h(e[0],void 0,{parser:{strict:o}}),s=i.childNodes;return f(1===s.length?s[0]:s)}var d="",c={attributes:{},children:{},tags:{}};e.forEach(function(e,t){if(d+=e,r.length){var n=Xe(r),a=d.trim().slice(-1),o=d.lastIndexOf(">")<d.lastIndexOf("<"),i=Boolean(a.match(We)),s="string"==typeof n,l="object"==typeof n,u="".concat(de).concat(t,"__");i&&!s?(c.tags[t]=n,d+=u):o?(c.attributes[t]=n,d+=u):Qe(n)||l?(c.children[t]=f(n),d+=u):n&&(d+=n)}});var l=L.isStrict;L.isStrict=!1;var u=h(d,c,{parser:{strict:l}}),p=u.childNodes;return f(1===p.length?p[0]:p)}function H(e){L.isStrict=!0;for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];return L.apply(void 0,[e].concat(r))}function P(e){var t="function"==typeof e,r=e.subscribe,n=e.unsubscribe,a=e.createTreeHook,o=e.createNodeHook,i=e.syncTreeHook,s=e.releaseHook;return t&&F.add(e),r&&r(Ke),a&&Y.add(a),o&&$.add(o),i&&q.add(i),s&&G.add(s),function(){t&&F.delete(e),n&&n(Ke),Y.delete(a),$.delete(o),q.delete(i),G.delete(s)}}var D={SET_ATTRIBUTE:0,REMOVE_ATTRIBUTE:1,NODE_VALUE:2,INSERT_BEFORE:3,REPLACE_CHILD:4,REMOVE_CHILD:5},z=new Map,B=new Map,U=new Map,F=new Set,Y=new Set,$=new Set,q=new Set,G=new Set,J=new Set,K=Object.freeze({__proto__:null,StateCache:z,NodeCache:B,TransitionCache:U,MiddlewareCache:F,CreateTreeHookCache:Y,CreateNodeHookCache:$,SyncTreeHookCache:q,ReleaseHookCache:G,ParserHookCache:J}),Q=new Set,W=new Set,X=new Set,Z=function(){return{rawNodeName:"",nodeName:"",nodeValue:"",nodeType:1,key:"",childNodes:[],attributes:{}}},ee={free:Q,allocated:W,protected:X},te=Q.values(),re={size:1e4,memory:ee,fill:function(){for(var e=this,t=Q.size;t<this.size;t++)Q.add(Z());this.size<Q.size&&Q.forEach(function(t){Q.size!==e.size&&Q.delete(t)})},get:function(){var e=te.next(),t=e.value,r=void 0===t?Z():t;return e.done&&(te=Q.values()),Q.delete(r),W.add(r),r},protect:function(e){W.delete(e),X.add(e)},unprotect:function(e){X.has(e)?(X.delete(e),Q.add(e)):W.has(e)&&(W.delete(e),Q.add(e))}};re.fill();var ne=Array.isArray,ae=re.memory,oe="#document-fragment",ie="#text",se="undefined"!=typeof process?process:{env:{NODE_ENV:"development"},argv:[]},de="__DIFFHTML__",ce=/<!.*>/i,le=new RegExp("".concat(de,"([^_]*)__")),ue={tags:[],attributes:{},children:{}},fe=Object.assign,he=Array.isArray,pe=["script","noscript","style","code","template"],ve=["meta","img","link","input","area","br","hr","area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"],me={li:{li:!0},p:{p:!0,div:!0},td:{td:!0,th:!0},th:{td:!0,th:!0}},ge={li:{ul:!0,ol:!0},a:{div:!0},b:{div:!0},i:{div:!0},p:{div:!0},td:{tr:!0,table:!0},th:{tr:!0,table:!0}},Ne=function(e,t,r){var n;if(!("childNodes"in e.attributes)){if(t&&!ce.test(t)&&!le.test(t))return e.childNodes.push(f("#text",t));for(var a=[],o=t.split(le),s=0;s<o.length;s++){var d=o[s];if(d)if(s%2==1){var c=r.children[d],l=d in r.children?c:f("#text","".concat(de).concat(d,"__"));if(!l)continue;var u=11===l.nodeType;"string"==typeof l.rawNodeName&&u?a.push.apply(a,i(l.childNodes)):a.push(l)}else ce.test(d)||a.push(f("#text",d))}(n=e.childNodes).push.apply(n,a)}},ye=function(e,t,r,n){var a=null,o=/\b([_a-z][_a-z0-9\-:]*)\s*(=\s*("([^"]+)"|'([^']+)'|(\S+)))?/gi;if(a=le.exec(e))return ye(r.tags[a[1]],t,r);for(var i,s={};i=o.exec(t||"");){var d="string"==typeof e,c=i[1],l=i[6]||i[5]||i[4],u=l||(d?i[1]:l||!0),h=String(u).match(le);if(h&&h.length)for(var p=String(u).split(le),v=le.exec(c),m=v?r.attributes[v[1]]:c,g=0;g<p.length;g++){var N=p[g];if(N)if(g%2==1){var y="object"==typeof m,b=r.attributes[N],T="".concat(de).concat(N,"__");s[m]?s[m]+=N in r.attributes?b:T:y?m&&!he(m)&&fe(s,m):m&&(s[m]=N in r.attributes?b:T)}else s[m]?s[m]+=N:s[m]=N}else if(h=le.exec(c)){var E=r.attributes[h[1]];"object"!=typeof E||he(E)?s[E]="":fe(s,E)}else s[c]="''"===u||'""'===u?"":u}return f(e,s,s.childNodes||[])},be=re.protect,Te=re.unprotect,Ee=re.memory,we=Object.freeze({__proto__:null,protectVTree:p,unprotectVTree:v,gc:m}),ke=new Map,Se="diffHTML",Oe="diff_perf",xe="undefined"!=typeof location,_e=se.argv,Ce=function(){},Ae={},Re=["old","new"],Ie="#text",je="object"==typeof global?global:window||{},Me=Symbol.for("diffHTML"),Ve="http://www.w3.org/2000/svg",Le=je.document||null,He=["attached","detached","replaced","attributeChanged","textChanged"];He.forEach(function(e){return U.set(e,new Set)});var Pe=je.document?document.createElement("div"):null,De=Object.keys,ze=new Set,Be=new Set,Ue=["class","checked","disabled","selected"],Fe=function(e,t,r,n){var a="object"==typeof n&&n,o="function"==typeof n,i="symbol"==typeof n,s=0===r.indexOf("on"),d=s?r.toLowerCase():r,c=e.nodeName+"-"+d,l=t;if(Be.has(c))t[d]=n;else if(!ze.has(c))try{t[d]=n,Be.add(c)}catch(e){ze.add(c)}if(a||o||i){if(a&&"style"===d)for(var u=De(n),f=0;f<u.length;f++)l.style[u[f]]=n[u[f]]}else{var h=null===n||void 0===n;d&&l.setAttribute(d,h?"":n)}},Ye=function(e,t){var r=0===t.indexOf("on");e.removeAttribute(t);var n=e.nodeName+"-"+t;if(Be.has(n)){var a=e;r?a[t]=void 0:delete a[t],Ue.includes(t)&&(e[t]=!1)}else if(!ze.has(n))try{var o=e;r?o[t]=void 0:delete o[t],Ue.includes(t)&&(e[t]=!1),Be.add(n)}catch(e){ze.add(n)}},$e=function(e,t){var r=e;t.includes("&")?r.nodeValue=_(t):r.nodeValue=t},qe=[N,y,T,k,A,R],Ge={schedule:N,shouldUpdate:y,reconcileTrees:T,syncTrees:k,patchNode:A,endAsPromise:R},Je=function(){function e(r,n,o){t(this,e),a(this,"domNode",""),a(this,"markup",""),a(this,"oldTree",void 0),a(this,"newTree",void 0),a(this,"promise",void 0),a(this,"promises",void 0),a(this,"tasks",[]),a(this,"patches",[]),this.domNode=r,this.markup=n,this.options=o,this.state=z.get(r)||{measure:g(r,n),svgElements:new Set,scriptsToExecute:new Map},o.tasks&&o.tasks.length&&(this.tasks=i(o.tasks)),this.endedCallbacks=new Set,z.set(r,this.state)}return n(e,null,[{key:"create",value:function(t,r,n){return new e(t,r,n)}},{key:"flow",value:function(e,t){for(var r=e,n=0;n<t.length;n++){if(e.aborted)return r;if(void 0!==(r=t[n](e))&&r!==e)return r}return r}},{key:"assert",value:function(e){}},{key:"invokeMiddleware",value:function(e){var t=e.tasks;F.forEach(function(r){var n=r(e);n&&t.push(n)})}}]),n(e,[{key:"start",value:function(){var t=this.state.measure,r=this.tasks,n=r.pop();return this.aborted=!1,e.invokeMiddleware(this),t("render"),n&&r.push(n),e.flow(this,r)}},{key:"abort",value:function(e){if(this.aborted=!0,e)return this.tasks[this.tasks.length-1](this)}},{key:"end",value:function(){var e=this,t=this.state,r=this.domNode,n=this.options,a=t.measure,o=t.svgElements,i=t.scriptsToExecute;return a("finalize"),this.completed=!0,o.clear(),t.isRendering=!1,i.forEach(function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1?arguments[1]:void 0,r=B.get(t);e?r.setAttribute("type",e):r.removeAttribute("type")}),t.previousMarkup="outerHTML"in r?r.outerHTML:"",n.executeScripts&&i.forEach(function(e,r){var n=B.get(r),a=n.cloneNode(!0);z.has(n)&&(b(n),z.set(a,t)),B.set(r,a),n.parentNode.replaceChild(a,n)}),i.clear(),a("finalize"),a("render"),m(),this.endedCallbacks.forEach(function(t){return t(e)}),this.endedCallbacks.clear(),this}},{key:"onceEnded",value:function(e){this.endedCallbacks.add(e)}}]),e}(),Ke=function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?o(Object(r),!0).forEach(function(t){a(e,t,r[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):o(Object(r)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))})}return e}({decodeEntities:_,escape:j,makeMeasure:g,memory:we,Pool:re,process:se,PATCH_TYPE:D,createNode:w,syncTree:E},K),Qe=Array.isArray,We=/(<|\/)/,Xe=function(e){var t=e.shift();return"string"==typeof t?j(_(t)):t};L.isStrict=!1,L.strict=H;var Ze=Object.assign;qe.splice(qe.indexOf(T),0,I),Ze(Ke,{parse:h,defaultTasks:qe,tasks:Ge,VERSION:"1.0.0-beta.18"});var et={};et.VERSION="1.0.0-beta.18",et.addTransitionState=S,et.removeTransitionState=O,et.release=b,et.createTree=f,et.use=P,et.outerHTML=V,et.innerHTML=M,et.html=L,et.Internals=Ke;var tt=je;if(Me in je){var rt=tt[Me];"1.0.0-beta.18"!==rt.VERSION&&console.log("Tried to load ".concat("1.0.0-beta.18"," after ").concat(rt.VERSION)),Ze(et,tt[Me])}else tt[Me]=et,tt.devTools&&(tt.unsubscribeDevTools=P(tt.devTools(Ke)));e.Internals=Ke,e.VERSION="1.0.0-beta.18",e.addTransitionState=S,e.createTree=f,e.default=et,e.html=L,e.innerHTML=M,e.outerHTML=V,e.release=b,e.removeTransitionState=O,e.use=P,Object.defineProperty(e,"__esModule",{value:!0})});
\ No newline at end of file
diff --git a/public/javascripts/diffhtml/1.0.0-beta.18/diffhtml.min.js b/public/javascripts/diffhtml/1.0.0-beta.18/diffhtml.min.js
new file mode 100644
index 0000000000..292f2654b5
--- /dev/null
+++ b/public/javascripts/diffhtml/1.0.0-beta.18/diffhtml.min.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):(e=e||self,t(e.diff={}))}(this,function(e){"use strict";function t(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function r(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function n(e,t,n){return t&&r(e.prototype,t),n&&r(e,n),e}function a(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function o(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,n)}return r}function i(e){return s(e)||d(e)||c(e)||u()}function s(e){if(Array.isArray(e))return l(e)}function d(e){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(e))return Array.from(e)}function c(e,t){if(e){if("string"==typeof e)return l(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?l(e,t):void 0}}function l(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function u(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function f(e,t,r){var n=null;if(ae.protected.has(e)||ae.allocated.has(e))n=e;else if(!e||ne(e)){var a=e?e.length:0;r=[];for(var o=0;o<a;o++)r.push(e[o]);n=f(oe,null,r)}if(n)return n;var s="object"==typeof e,d=e;if(e&&s&&"ownerDocument"in d){var c;if(3===d.nodeType){var l=f(ie,d.nodeValue);return B.set(l,e),l}t={},r=[];var u=d.attributes;if(1===d.nodeType&&u&&u.length)for(var h=0;h<u.length;h++){var p=u[h],v=p.name,m=p.value;""===m&&v in d?t[v]=e[v]:t[v]=m}if((1===d.nodeType||11===d.nodeType)&&d.childNodes.length){r=[];for(var g=0;g<d.childNodes.length;g++){var N=d.childNodes[g];r.push(f(N))}}return B.forEach(function(t,r){t===e&&(n=r)}),n=n||f(d.nodeName,t,r),n.attributes=t,n.childNodes.length=0,(c=n.childNodes).push.apply(c,i(r)),B.set(n,e),n}if(s){var y=e.rawNodeName,b=e.nodeName,T=e.nodeValue,E=e.attributes,w=e.childNodes,k=e.children,S=y||b,O=f(S,E||null,k||w);return T&&(O.nodeValue=T),O}for(var x=arguments.length,_=new Array(x>3?x-3:0),C=3;C<x;C++)_[C-3]=arguments[C];_.length&&(r=[r].concat(_)),n=re.get();var A=e===ie;"string"==typeof e?(n.rawNodeName=e,n.nodeName=n.rawNodeName.toLowerCase()):(n.rawNodeName=e,n.nodeName=oe),n.nodeValue="",n.key="",n.childNodes.length=0,n.attributes={};var R=ne(t)||"object"!=typeof t,I=R?t:r,j=ne(I)?I:[I];if(A){var M=j.join("");return n.nodeType=3,n.nodeValue=String(M||""),n}if(n.nodeName===oe?n.nodeType=11:n.nodeType="#comment"===e?8:1,I&&j.length)for(var V=0;V<j.length;V++){var L=j[V];if(ne(L)){var H;(H=n.childNodes).push.apply(H,i(L))}else{if(!L)continue;if(11===L.nodeType&&"string"==typeof L.rawNodeName){var P;(P=n.childNodes).push.apply(P,i(L.childNodes))}else L&&"object"==typeof L?n.childNodes.push(f(L)):n.childNodes.push(f(ie,null,L))}}return t&&"object"==typeof t&&!ne(t)&&(n.attributes=t),"script"===n.nodeName&&n.attributes.src&&(n.key=String(n.attributes.src)),n.attributes&&"key"in n.attributes&&(n.key=String(n.attributes.key)),Y.size&&Y.forEach(function(e,t){(t=e(n))&&(n=f(t))}),n}function h(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};r.parser||(r.parser={}),t||(t=ue);var n=new Set(r.parser.rawElements?r.parser.rawElements:pe),a=new Set(r.parser.selfClosingElements||ve),o=/<!--[^]*?(?=-->)-->|<(\/?)([a-z\-\_][a-z0-9\-\_]*)\s*([^>]*?)(\/?)>/gi,i=f("#document-fragment",null,[]),s=[i],d=i,c=-1;if(!e.includes("<")&&e)return Ne(d,e,t),i;for(var l,u,h=0;l=o.exec(e);h++){c>-1&&c+l[0].length<o.lastIndex&&(u=e.slice(c,o.lastIndex-l[0].length))&&Ne(d,u,t);var p=o.lastIndex-l[0].length;if(-1===c&&p>0){var v=e.slice(0,p);v&&!ce.exec(v)&&Ne(d,v,t)}if(c=o.lastIndex,"!"!==l[0][1]){var m=le.exec(l[2]),g=m&&t.tags[m[1]],N=g?g.name||g:l[2];if(!l[1]&&(!l[4]&&me[d.rawNodeName]&&me[d.rawNodeName][N]&&(s.pop(),d=s[s.length-1]),d=d.childNodes[d.childNodes.push(ye(l[2],l[3],t))-1],s.push(d),r.parser.strict||n.has(N))){var y="</".concat(N,">"),b=e.indexOf(y,o.lastIndex);if(n.has(N)){-1===b?c=o.lastIndex=e.length+1:(c=b+y.length,o.lastIndex=c,l[1]=" ");var T=e.slice(l.index+l[0].length,b);Ne(d,T,t)}}if(l[1]||l[4]||a.has(N))for(;d;){if("/"===l[4]&&m){s.pop(),d=s[s.length-1];break}if(g&&d.rawNodeName===N){s.pop(),d=s[s.length-1];break}if(d.rawNodeName===N){s.pop(),d=s[s.length-1];break}var E=ge[d.rawNodeName];{if(!E||!E[N])break;s.pop(),d=s[s.length-1]}}}}var w=e.slice(-1===c?0:c);if(w&&Ne(d,w,t),i.childNodes.length&&"html"===i.childNodes[0].nodeName){var k={before:[],after:[]},S={after:[]},O=i.childNodes[0],x=!0,_=!0;if(O.childNodes=O.childNodes.filter(function(e){if("body"===e.nodeName||"head"===e.nodeName)return"head"===e.nodeName&&(x=!1),"body"===e.nodeName&&(_=!1),!0;1===e.nodeType&&(x&&_?k.before.push(e):!x&&_?k.after.push(e):_||S.after.push(e))}),O.childNodes[0]&&"head"===O.childNodes[0].nodeName){var C=O.childNodes[0].childNodes;C.unshift.apply(C,k.before),C.push.apply(C,k.after)}else{var A=f("head",null,[]);if(A){var R=A.childNodes;R.unshift.apply(R,k.before),R.push.apply(R,k.after),O.childNodes.unshift(A)}}if(O.childNodes[1]&&"body"===O.childNodes[1].nodeName){var I=O.childNodes[1].childNodes;I.push.apply(I,S.after)}else{var j=f("body",null,[]);if(j){var M=j.childNodes;M.push.apply(M,S.after),O.childNodes.push(j)}}}return i}function p(e){be(e);for(var t=0;t<e.childNodes.length;t++)p(e.childNodes[t]);return e}function v(e){Te(e);for(var t=0;t<e.childNodes.length;t++)v(e.childNodes[t]);return B.delete(e),e}function m(){Ee.allocated.forEach(function(e){Ee.free.add(e),Ee.allocated.delete(e),B.delete(e)})}function g(e,t){var r=xe&&location.search.includes(Oe),n=_e&&se.argv.includes(Oe);if(!r&&!n)return Ce;var a=t;return function(t){var r=e.host;e&&r?t="".concat(r.constructor.name," ").concat(t):a&&"function"==typeof a.rawNodeName&&(t="".concat(a.rawNodeName.name," ").concat(t));var n="".concat(t,"-end");if(ke.has(t)){var o=(performance.now()-ke.get(t)).toFixed(3);ke.delete(t),performance.mark(n),performance.measure("".concat(Se," ").concat(t," (").concat(o,"ms)"),t,n)}else ke.set(t,performance.now()),performance.mark(t)}}function N(e){var t=e.state,r=t.isRendering;z.forEach(function(n){var a=n.activeTransaction&&n.activeTransaction.domNode,o=e.domNode;a&&a.contains&&o&&o.contains&&(a.contains(o)&&n.isRendering?(t=n,r=!0):o.contains(a)&&n.isRendering&&(t=n,r=!0))});var n=t,a=n.activeTransaction,o=n.nextTransaction;if(r){var i=e.tasks,s=o||a;t.nextTransaction=e,e.abort();var d=s.promise||Promise.resolve();return e.promise=d.then(function(){return e.aborted=!1,e.state.isRendering=!0,e.state.activeTransaction=e,Je.flow(e,i.slice(1))})}t.isRendering=!0,t.activeTransaction=e}function y(e){var t=e.domNode,r=e.markup,n=e.state,a=e.state.measure,o=e.options,i=o.inner?"innerHTML":"outerHTML";a("should update");var s=t;if("string"==typeof r&&s[i]===r)return e.abort(!0);"string"==typeof r&&(n.markup=r),a("should update")}function b(e){var t=z.get(e);if(t&&(z.delete(e),t.oldTree&&!B.has(t.oldTree)&&(v(t.oldTree),G.forEach(function(e){return e(t.oldTree)}))),e){var r=e;if(r.childNodes&&r.childNodes.length)for(var n=0;n<r.childNodes.length;n++)b(r.childNodes[n]);r.shadowRoot&&b(r.shadowRoot),B.forEach(function(e,t){e===r&&(v(t),G.forEach(function(e){return e(t)}))})}}function T(e){var t=e.state,r=e.domNode,n=e.markup,a=e.options,o=t.previousMarkup,i=a.inner,s=r.outerHTML;o===s&&t.oldTree&&s||(b(r),t.oldTree=f(r),p(t.oldTree),z.set(r,t)),e.newTree||(e.newTree=f(n)),e.oldTree=t.oldTree;var d=e.oldTree,c=e.newTree;if(i&&d&&c){var l=d.nodeName,u=d.attributes,h="string"!=typeof c.rawNodeName,v=11===c.nodeType,m=v&&!h?c.childNodes:c;e.newTree=f(l,u,m)}}function E(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],n=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{};e||(e=Ae),t||(t=Ae);var a=n.svgElements,o=void 0===a?new Set:a,i=(e.nodeName,11===t.nodeType||e.nodeType,e===Ae),s="svg"===t.nodeName||o.has(t),d=null;if(q.forEach(function(r){var n=r(e,t);n&&n===e?d=!0:n&&(t=n)}),d)return r;for(var c={old:new Map,new:new Map},l=0;l<Re.length;l++){var u=Re[l],f=c[u],h=arguments[l],p=h&&h.childNodes;if(p&&p.length)for(var v=0;v<p.length;v++){var m=p[v];m.key&&f.set(m.key,m)}}var g=1===t.nodeType;if(t.nodeName===Ie){if(e.nodeName===Ie&&e.nodeValue!==t.nodeValue)return r.push(D.NODE_VALUE,e,t.nodeValue,e.nodeValue),e.nodeValue=t.nodeValue,r;if(i)return r.push(D.NODE_VALUE,t,t.nodeValue,null),r}if(g){var N=i?Ae:e.attributes,y=t.attributes;for(var b in y){var T=y[b];b in N&&N[b]===y[b]||(i||(N[b]=T),(e&&"script"===e.nodeName||"script"!==t.nodeName||"type"!==b)&&r.push(D.SET_ATTRIBUTE,i?t:e,b,T))}if(!i)for(var w in N)w in y||(r.push(D.REMOVE_ATTRIBUTE,e,w),delete N[w])}var k=t.childNodes||[];if(i){for(var S=0;S<k.length;S++)s&&o.add(k[S]),E(null,k[S],r,n);return r}for(var O=e.childNodes,x=0;x<k.length;x++){var _=O&&O[x],C=k[x],A=C.key;if((s||"svg"===C.nodeName)&&o.add(C),_){var R=_.key,I=c.new.has(R),j=c.old.has(A);if(R||A){if(!I&&!j){O.splice(O.indexOf(_),1,C),E(null,C,r,n),r.push(D.REPLACE_CHILD,C,_),x-=1;continue}if(!I){r.push(D.REMOVE_CHILD,_),O.splice(O.indexOf(_),1),x-=1;continue}if(A!==R){var M=C;A&&j?(M=c.old.get(A),O.splice(O.indexOf(M),1)):M=C,E(null,M,r,n),r.push(D.INSERT_BEFORE,e,M,_),O.splice(x,0,M);continue}}if(_.nodeName===C.nodeName)E(_,C,r,n);else{O[x]=C;var V=O.lastIndexOf(C);V>x&&O.splice(V,1),E(null,C,r,n),r.push(D.REPLACE_CHILD,C,_)}}else O.push(C),E(null,C,r,n),r.push(D.INSERT_BEFORE,e,C,null)}if(O.length!==k.length){for(var L=k.length;L<O.length;L++)r.push(D.REMOVE_CHILD,O[L]);O.length=k.length}return r}function w(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Le,r=arguments.length>2?arguments[2]:void 0,n=f(e),a=B.get(n);if(a)return a;var o=n.nodeName,i=n.rawNodeName,s=void 0===i?o:i,d=n.childNodes,c=void 0===d?[]:d;r=r||"svg"===o;var l=null;$.forEach(function(e,t){(t=e(n))&&(l=t)}),null===l&&(l="#text"===o?t.createTextNode(n.nodeValue||""):"#document-fragment"===o?t.createDocumentFragment():r?t.createElementNS(Ve,s):t.createElement(s),"script"===o&&(l.type="no-execute"));var u=l;B.set(n,u);for(var h=0;h<c.length;h++){var p=w(c[h],t,r);u.appendChild(p)}return u}function k(e){var t=e.state,r=e.state.measure,n=e.oldTree,a=e.newTree,o=e.domNode;if(r("sync trees"),n&&a&&n.nodeName!==a.nodeName&&11!==a.nodeType){e.patches=[D.REPLACE_CHILD,a,n],e.oldTree=t.oldTree=a;var i=w(a);z.delete(o),z.set(i,t),e.domNode=i,"script"===a.nodeName&&t.scriptsToExecute.set(a,a.attributes.type||"")}else e.patches=E(n||null,a||null,[],t);r("sync trees")}function S(e,t){U.get(e).add(t)}function O(e,t){if(!t&&e)U.get(e).clear();else if(e&&t)U.get(e).delete(t);else for(var r=0;r<He.length;r++)U.get(He[r]).clear()}function x(e){for(var t=U.get(e),r=[],n=arguments.length,a=new Array(n>1?n-1:0),o=1;o<n;o++)a[o-1]=arguments[o];var s=a[0],d=a.slice(1);return!t.size||"textChanged"!==e&&1!==s.nodeType?r:(t.forEach(function(e){var t=e.apply(void 0,[B.get(s)].concat(i(d)));"object"==typeof t&&t.then&&r.push(t)}),"attached"!==e&&"detached"!==e||s.childNodes.forEach(function(t){r.push.apply(r,i(x.apply(void 0,[e,t].concat(i(d)))))}),r)}function _(e){return Pe&&e&&e.indexOf&&e.includes("&")?(Pe.innerHTML=e,Pe.textContent||""):e}function C(e){for(var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=[],n=t.ownerDocument,a=t.svgElements,o=void 0===a?new Set:a,s=e.length,d=0;;){var c=e[d];if(d===s)break;switch(c){case D.SET_ATTRIBUTE:if("break"===function(){var t=e[d+1],a=e[d+2],s=_(e[d+3]);d+=4;var c=o.has(t),l=w(t,n,c),u=l.getAttribute(a),f=x("attributeChanged",t,a,u,s);return p(t),f.length?(Promise.all(f).then(function(){return Fe(t,l,a,s)}),r.push.apply(r,i(f))):Fe(t,l,a,s),"break"}())break;case D.REMOVE_ATTRIBUTE:if("break"===function(){var t=e[d+1],a=e[d+2];d+=3;var s=o.has(t),c=w(t,n,s),l=c.getAttribute(a),u=x("attributeChanged",t,a,l,null);return p(t),u.length?(Promise.all(u).then(function(){return Ye(c,a)}),r.push.apply(r,i(u))):Ye(c,a),"break"}())break;case D.NODE_VALUE:if("break"===function(){var t=e[d+1],a=e[d+2],s=e[d+3],c=o.has(t);d+=4;var l=w(t,n,c);p(t);var u=x("textChanged",t,s,a);return u.length?(Promise.all(u).then(function(){return $e(l,a)}),r.push.apply(r,i(u))):$e(l,a),"break"}())break;case D.INSERT_BEFORE:var l=e[d+1],u=e[d+2],f=e[d+3];d+=4;var h=B.get(l);if(!h)break;var m=o.has(u);p(u);var g=f&&w(f,n,m),N=w(u,n,m);h.insertBefore(N,g||null),r.push.apply(r,i(x("attached",u)));break;case D.REPLACE_CHILD:if("break"===function(){var t=e[d+1],a=e[d+2];d+=3;var s=o.has(t),c=B.get(a),l=w(t,n,s);if(!c||!c.parentNode)return"break";p(t);var u=U.get("attached").size,f=U.get("detached").size,h=U.get("replaced").size;if(!u&&!f&&!h)return c.parentNode&&(v(a),c.parentNode.replaceChild(l,c)),"break";c.parentNode&&c.parentNode.insertBefore(l,c);var m=x("attached",t),g=x("detached",a),N=x("replaced",a,l),y=[].concat(i(m),i(g),i(N));return y.length?(Promise.all(y).then(function(){c.parentNode&&c.parentNode.removeChild(c),v(a)}),r.push.apply(r,i(y))):(c.parentNode&&c.parentNode.removeChild(c),v(a)),"break"}())break;case D.REMOVE_CHILD:if("break"===function(){var t=e[d+1];d+=2;var n=B.get(t);if(!n||!n.parentNode)return"break";var a=x("detached",t);return a.length?(Promise.all(a).then(function(){n.parentNode&&n.parentNode.removeChild(n),v(t)}),r.push.apply(r,i(a))):(n.parentNode&&n.parentNode.removeChild(n),v(t)),"break"}())break}}return r}function A(e){var t=e.domNode,r=e.state,n=e.state,a=n.measure,o=n.scriptsToExecute,s=e.patches,d=t.ownerDocument,c=e.promises||[];r.ownerDocument=d||document;var l=function(e){"script"===e.nodeName&&(o.set(e,e.attributes.type),e.attributes.type="no-execute")};$.add(l),a("patch node"),c.push.apply(c,i(C(s,r))),a("patch node"),$.delete(l),e.promises=c}function R(e){var t=e.promises;return t&&t.length?e.promise=Promise.all(t).then(function(){return e.end()}):e.promise=Promise.resolve(e.end())}function I(e){var t=e.state,r=e.markup,n=e.options,a=t.measure,o=n.inner;if("string"==typeof r){a("parsing markup for new tree");var i=h(r,void 0,n),s=i.childNodes,d=f(o?s:s[0]||s);d&&(e.newTree=d),a("parsing markup for new tree")}}function j(e){return e.replace(/[&<>]/g,function(e){return"&#".concat(e.charCodeAt(0),";")})}function M(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return r.inner=!0,r.executeScripts=!("executeScripts"in r)||r.executeScripts,r.tasks=r.tasks||qe,Je.create(e,t,r).start()}function V(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return r.inner=!1,r.tasks=r.tasks||qe,r.executeScripts=!("executeScripts"in r)||r.executeScripts,Je.create(e,t,r).start()}function L(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];var a=f("#text","");if(!e)return a;if("string"==typeof e&&(e=[e]),1===e.length&&!r.length){var o=L.isStrict;if(L.isStrict=!1,!e[0])return a;var i=h(e[0],void 0,{parser:{strict:o}}),s=i.childNodes;return f(1===s.length?s[0]:s)}var d="",c={attributes:{},children:{},tags:{}};e.forEach(function(e,t){if(d+=e,r.length){var n=Xe(r),a=d.trim().slice(-1),o=d.lastIndexOf(">")<d.lastIndexOf("<"),i=Boolean(a.match(We)),s="string"==typeof n,l="object"==typeof n,u="".concat(de).concat(t,"__");i&&!s?(c.tags[t]=n,d+=u):o?(c.attributes[t]=n,d+=u):Qe(n)||l?(c.children[t]=f(n),d+=u):n&&(d+=n)}});var l=L.isStrict;L.isStrict=!1;var u=h(d,c,{parser:{strict:l}}),p=u.childNodes;return f(1===p.length?p[0]:p)}function H(e){L.isStrict=!0;for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];return L.apply(void 0,[e].concat(r))}function P(e){var t="function"==typeof e,r=e.subscribe,n=e.unsubscribe,a=e.createTreeHook,o=e.createNodeHook,i=e.syncTreeHook,s=e.releaseHook;return t&&F.add(e),r&&r(Ke),a&&Y.add(a),o&&$.add(o),i&&q.add(i),s&&G.add(s),function(){t&&F.delete(e),n&&n(Ke),Y.delete(a),$.delete(o),q.delete(i),G.delete(s)}}var D={SET_ATTRIBUTE:0,REMOVE_ATTRIBUTE:1,NODE_VALUE:2,INSERT_BEFORE:3,REPLACE_CHILD:4,REMOVE_CHILD:5},z=new Map,B=new Map,U=new Map,F=new Set,Y=new Set,$=new Set,q=new Set,G=new Set,J=new Set,K=Object.freeze({__proto__:null,StateCache:z,NodeCache:B,TransitionCache:U,MiddlewareCache:F,CreateTreeHookCache:Y,CreateNodeHookCache:$,SyncTreeHookCache:q,ReleaseHookCache:G,ParserHookCache:J}),Q=new Set,W=new Set,X=new Set,Z=function(){return{rawNodeName:"",nodeName:"",nodeValue:"",nodeType:1,key:"",childNodes:[],attributes:{}}},ee={free:Q,allocated:W,protected:X},te=Q.values(),re={size:1e4,memory:ee,fill:function(){for(var e=this,t=Q.size;t<this.size;t++)Q.add(Z());this.size<Q.size&&Q.forEach(function(t){Q.size!==e.size&&Q.delete(t)})},get:function(){var e=te.next(),t=e.value,r=void 0===t?Z():t;return e.done&&(te=Q.values()),Q.delete(r),W.add(r),r},protect:function(e){W.delete(e),X.add(e)},unprotect:function(e){X.has(e)?(X.delete(e),Q.add(e)):W.has(e)&&(W.delete(e),Q.add(e))}};re.fill();var ne=Array.isArray,ae=re.memory,oe="#document-fragment",ie="#text",se="undefined"!=typeof process?process:{env:{NODE_ENV:"development"},argv:[]},de="__DIFFHTML__",ce=/<!.*>/i,le=new RegExp("".concat(de,"([^_]*)__")),ue={tags:[],attributes:{},children:{}},fe=Object.assign,he=Array.isArray,pe=["script","noscript","style","code","template"],ve=["meta","img","link","input","area","br","hr","area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"],me={li:{li:!0},p:{p:!0,div:!0},td:{td:!0,th:!0},th:{td:!0,th:!0}},ge={li:{ul:!0,ol:!0},a:{div:!0},b:{div:!0},i:{div:!0},p:{div:!0},td:{tr:!0,table:!0},th:{tr:!0,table:!0}},Ne=function(e,t,r){var n;if(!("childNodes"in e.attributes)){if(t&&!ce.test(t)&&!le.test(t))return e.childNodes.push(f("#text",t));for(var a=[],o=t.split(le),s=0;s<o.length;s++){var d=o[s];if(d)if(s%2==1){var c=r.children[d],l=d in r.children?c:f("#text","".concat(de).concat(d,"__"));if(!l)continue;var u=11===l.nodeType;"string"==typeof l.rawNodeName&&u?a.push.apply(a,i(l.childNodes)):a.push(l)}else ce.test(d)||a.push(f("#text",d))}(n=e.childNodes).push.apply(n,a)}},ye=function(e,t,r,n){var a=null,o=/\b([_a-z][_a-z0-9\-:]*)\s*(=\s*("([^"]+)"|'([^']+)'|(\S+)))?/gi;if(a=le.exec(e))return ye(r.tags[a[1]],t,r);for(var i,s={};i=o.exec(t||"");){var d="string"==typeof e,c=i[1],l=i[6]||i[5]||i[4],u=l||(d?i[1]:l||!0),h=String(u).match(le);if(h&&h.length)for(var p=String(u).split(le),v=le.exec(c),m=v?r.attributes[v[1]]:c,g=0;g<p.length;g++){var N=p[g];if(N)if(g%2==1){var y="object"==typeof m,b=r.attributes[N],T="".concat(de).concat(N,"__");s[m]?s[m]+=N in r.attributes?b:T:y?m&&!he(m)&&fe(s,m):m&&(s[m]=N in r.attributes?b:T)}else s[m]?s[m]+=N:s[m]=N}else if(h=le.exec(c)){var E=r.attributes[h[1]];"object"!=typeof E||he(E)?s[E]="":fe(s,E)}else s[c]="''"===u||'""'===u?"":u}return f(e,s,s.childNodes||[])},be=re.protect,Te=re.unprotect,Ee=re.memory,we=Object.freeze({__proto__:null,protectVTree:p,unprotectVTree:v,gc:m}),ke=new Map,Se="diffHTML",Oe="diff_perf",xe="undefined"!=typeof location,_e=se.argv,Ce=function(){},Ae={},Re=["old","new"],Ie="#text",je="object"==typeof global?global:window||{},Me=Symbol.for("diffHTML"),Ve="http://www.w3.org/2000/svg",Le=je.document||null,He=["attached","detached","replaced","attributeChanged","textChanged"];He.forEach(function(e){return U.set(e,new Set)});var Pe=je.document?document.createElement("div"):null,De=Object.keys,ze=new Set,Be=new Set,Ue=["class","checked","disabled","selected"],Fe=function(e,t,r,n){var a="object"==typeof n&&n,o="function"==typeof n,i="symbol"==typeof n,s=0===r.indexOf("on"),d=s?r.toLowerCase():r,c=e.nodeName+"-"+d,l=t;if(Be.has(c))t[d]=n;else if(!ze.has(c))try{t[d]=n,Be.add(c)}catch(e){ze.add(c)}if(a||o||i){if(a&&"style"===d)for(var u=De(n),f=0;f<u.length;f++)l.style[u[f]]=n[u[f]]}else{var h=null===n||void 0===n;d&&l.setAttribute(d,h?"":n)}},Ye=function(e,t){var r=0===t.indexOf("on");e.removeAttribute(t);var n=e.nodeName+"-"+t;if(Be.has(n)){var a=e;r?a[t]=void 0:delete a[t],Ue.includes(t)&&(e[t]=!1)}else if(!ze.has(n))try{var o=e;r?o[t]=void 0:delete o[t],Ue.includes(t)&&(e[t]=!1),Be.add(n)}catch(e){ze.add(n)}},$e=function(e,t){var r=e;t.includes("&")?r.nodeValue=_(t):r.nodeValue=t},qe=[N,y,T,k,A,R],Ge={schedule:N,shouldUpdate:y,reconcileTrees:T,syncTrees:k,patchNode:A,endAsPromise:R},Je=function(){function e(r,n,o){t(this,e),a(this,"domNode",""),a(this,"markup",""),a(this,"oldTree",void 0),a(this,"newTree",void 0),a(this,"promise",void 0),a(this,"promises",void 0),a(this,"tasks",[]),a(this,"patches",[]),this.domNode=r,this.markup=n,this.options=o,this.state=z.get(r)||{measure:g(r,n),svgElements:new Set,scriptsToExecute:new Map},o.tasks&&o.tasks.length&&(this.tasks=i(o.tasks)),this.endedCallbacks=new Set,z.set(r,this.state)}return n(e,null,[{key:"create",value:function(t,r,n){return new e(t,r,n)}},{key:"flow",value:function(e,t){for(var r=e,n=0;n<t.length;n++){if(e.aborted)return r;if(void 0!==(r=t[n](e))&&r!==e)return r}return r}},{key:"assert",value:function(e){}},{key:"invokeMiddleware",value:function(e){var t=e.tasks;F.forEach(function(r){var n=r(e);n&&t.push(n)})}}]),n(e,[{key:"start",value:function(){var t=this.state.measure,r=this.tasks,n=r.pop();return this.aborted=!1,e.invokeMiddleware(this),t("render"),n&&r.push(n),e.flow(this,r)}},{key:"abort",value:function(e){if(this.aborted=!0,e)return this.tasks[this.tasks.length-1](this)}},{key:"end",value:function(){var e=this,t=this.state,r=this.domNode,n=this.options,a=t.measure,o=t.svgElements,i=t.scriptsToExecute;return a("finalize"),this.completed=!0,o.clear(),t.isRendering=!1,i.forEach(function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1?arguments[1]:void 0,r=B.get(t);e?r.setAttribute("type",e):r.removeAttribute("type")}),t.previousMarkup="outerHTML"in r?r.outerHTML:"",n.executeScripts&&i.forEach(function(e,r){var n=B.get(r),a=n.cloneNode(!0);z.has(n)&&(b(n),z.set(a,t)),B.set(r,a),n.parentNode.replaceChild(a,n)}),i.clear(),a("finalize"),a("render"),m(),this.endedCallbacks.forEach(function(t){return t(e)}),this.endedCallbacks.clear(),this}},{key:"onceEnded",value:function(e){this.endedCallbacks.add(e)}}]),e}(),Ke=function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?o(Object(r),!0).forEach(function(t){a(e,t,r[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):o(Object(r)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))})}return e}({decodeEntities:_,escape:j,makeMeasure:g,memory:we,Pool:re,process:se,PATCH_TYPE:D,createNode:w,syncTree:E},K),Qe=Array.isArray,We=/(<|\/)/,Xe=function(e){var t=e.shift();return"string"==typeof t?j(_(t)):t};L.isStrict=!1,L.strict=H;var Ze=Object.assign;qe.splice(qe.indexOf(T),0,I),Ze(Ke,{parse:h,defaultTasks:qe,tasks:Ge,VERSION:"1.0.0-beta.18"});var et={};et.VERSION="1.0.0-beta.18",et.addTransitionState=S,et.removeTransitionState=O,et.release=b,et.createTree=f,et.use=P,et.outerHTML=V,et.innerHTML=M,et.html=L,et.Internals=Ke;var tt=je;if(Me in je){var rt=tt[Me];"1.0.0-beta.18"!==rt.VERSION&&console.log("Tried to load ".concat("1.0.0-beta.18"," after ").concat(rt.VERSION)),Ze(et,tt[Me])}else tt[Me]=et,tt.devTools&&(tt.unsubscribeDevTools=P(tt.devTools(Ke)));e.Internals=Ke,e.VERSION="1.0.0-beta.18",e.addTransitionState=S,e.createTree=f,e.default=et,e.html=L,e.innerHTML=M,e.outerHTML=V,e.release=b,e.removeTransitionState=O,e.use=P,Object.defineProperty(e,"__esModule",{value:!0})});
\ No newline at end of file
diff --git a/public/javascripts/workbox/workbox-cacheable-response.dev.js b/public/javascripts/workbox/workbox-cacheable-response.dev.js
new file mode 100644
index 0000000000..54a2e49997
--- /dev/null
+++ b/public/javascripts/workbox/workbox-cacheable-response.dev.js
@@ -0,0 +1,200 @@
+this.workbox = this.workbox || {};
+this.workbox.cacheableResponse = (function (exports, WorkboxError_mjs, assert_mjs, getFriendlyURL_mjs, logger_mjs) {
+  'use strict';
+
+  try {
+    self['workbox:cacheable-response:4.3.1'] && _();
+  } catch (e) {} // eslint-disable-line
+
+  /*
+    Copyright 2018 Google LLC
+
+    Use of this source code is governed by an MIT-style
+    license that can be found in the LICENSE file or at
+    https://opensource.org/licenses/MIT.
+  */
+  /**
+   * This class allows you to set up rules determining what
+   * status codes and/or headers need to be present in order for a
+   * [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response)
+   * to be considered cacheable.
+   *
+   * @memberof workbox.cacheableResponse
+   */
+
+  class CacheableResponse {
+    /**
+     * To construct a new CacheableResponse instance you must provide at least
+     * one of the `config` properties.
+     *
+     * If both `statuses` and `headers` are specified, then both conditions must
+     * be met for the `Response` to be considered cacheable.
+     *
+     * @param {Object} config
+     * @param {Array<number>} [config.statuses] One or more status codes that a
+     * `Response` can have and be considered cacheable.
+     * @param {Object<string,string>} [config.headers] A mapping of header names
+     * and expected values that a `Response` can have and be considered cacheable.
+     * If multiple headers are provided, only one needs to be present.
+     */
+    constructor(config = {}) {
+      {
+        if (!(config.statuses || config.headers)) {
+          throw new WorkboxError_mjs.WorkboxError('statuses-or-headers-required', {
+            moduleName: 'workbox-cacheable-response',
+            className: 'CacheableResponse',
+            funcName: 'constructor'
+          });
+        }
+
+        if (config.statuses) {
+          assert_mjs.assert.isArray(config.statuses, {
+            moduleName: 'workbox-cacheable-response',
+            className: 'CacheableResponse',
+            funcName: 'constructor',
+            paramName: 'config.statuses'
+          });
+        }
+
+        if (config.headers) {
+          assert_mjs.assert.isType(config.headers, 'object', {
+            moduleName: 'workbox-cacheable-response',
+            className: 'CacheableResponse',
+            funcName: 'constructor',
+            paramName: 'config.headers'
+          });
+        }
+      }
+
+      this._statuses = config.statuses;
+      this._headers = config.headers;
+    }
+    /**
+     * Checks a response to see whether it's cacheable or not, based on this
+     * object's configuration.
+     *
+     * @param {Response} response The response whose cacheability is being
+     * checked.
+     * @return {boolean} `true` if the `Response` is cacheable, and `false`
+     * otherwise.
+     */
+
+
+    isResponseCacheable(response) {
+      {
+        assert_mjs.assert.isInstance(response, Response, {
+          moduleName: 'workbox-cacheable-response',
+          className: 'CacheableResponse',
+          funcName: 'isResponseCacheable',
+          paramName: 'response'
+        });
+      }
+
+      let cacheable = true;
+
+      if (this._statuses) {
+        cacheable = this._statuses.includes(response.status);
+      }
+
+      if (this._headers && cacheable) {
+        cacheable = Object.keys(this._headers).some(headerName => {
+          return response.headers.get(headerName) === this._headers[headerName];
+        });
+      }
+
+      {
+        if (!cacheable) {
+          logger_mjs.logger.groupCollapsed(`The request for ` + `'${getFriendlyURL_mjs.getFriendlyURL(response.url)}' returned a response that does ` + `not meet the criteria for being cached.`);
+          logger_mjs.logger.groupCollapsed(`View cacheability criteria here.`);
+          logger_mjs.logger.log(`Cacheable statuses: ` + JSON.stringify(this._statuses));
+          logger_mjs.logger.log(`Cacheable headers: ` + JSON.stringify(this._headers, null, 2));
+          logger_mjs.logger.groupEnd();
+          const logFriendlyHeaders = {};
+          response.headers.forEach((value, key) => {
+            logFriendlyHeaders[key] = value;
+          });
+          logger_mjs.logger.groupCollapsed(`View response status and headers here.`);
+          logger_mjs.logger.log(`Response status: ` + response.status);
+          logger_mjs.logger.log(`Response headers: ` + JSON.stringify(logFriendlyHeaders, null, 2));
+          logger_mjs.logger.groupEnd();
+          logger_mjs.logger.groupCollapsed(`View full response details here.`);
+          logger_mjs.logger.log(response.headers);
+          logger_mjs.logger.log(response);
+          logger_mjs.logger.groupEnd();
+          logger_mjs.logger.groupEnd();
+        }
+      }
+
+      return cacheable;
+    }
+
+  }
+
+  /*
+    Copyright 2018 Google LLC
+
+    Use of this source code is governed by an MIT-style
+    license that can be found in the LICENSE file or at
+    https://opensource.org/licenses/MIT.
+  */
+  /**
+   * A class implementing the `cacheWillUpdate` lifecycle callback. This makes it
+   * easier to add in cacheability checks to requests made via Workbox's built-in
+   * strategies.
+   *
+   * @memberof workbox.cacheableResponse
+   */
+
+  class Plugin {
+    /**
+     * To construct a new cacheable response Plugin instance you must provide at
+     * least one of the `config` properties.
+     *
+     * If both `statuses` and `headers` are specified, then both conditions must
+     * be met for the `Response` to be considered cacheable.
+     *
+     * @param {Object} config
+     * @param {Array<number>} [config.statuses] One or more status codes that a
+     * `Response` can have and be considered cacheable.
+     * @param {Object<string,string>} [config.headers] A mapping of header names
+     * and expected values that a `Response` can have and be considered cacheable.
+     * If multiple headers are provided, only one needs to be present.
+     */
+    constructor(config) {
+      this._cacheableResponse = new CacheableResponse(config);
+    }
+    /**
+     * @param {Object} options
+     * @param {Response} options.response
+     * @return {boolean}
+     * @private
+     */
+
+
+    cacheWillUpdate({
+      response
+    }) {
+      if (this._cacheableResponse.isResponseCacheable(response)) {
+        return response;
+      }
+
+      return null;
+    }
+
+  }
+
+  /*
+    Copyright 2018 Google LLC
+
+    Use of this source code is governed by an MIT-style
+    license that can be found in the LICENSE file or at
+    https://opensource.org/licenses/MIT.
+  */
+
+  exports.CacheableResponse = CacheableResponse;
+  exports.Plugin = Plugin;
+
+  return exports;
+
+}({}, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core._private));
+//# sourceMappingURL=workbox-cacheable-response.dev.js.map
diff --git a/public/javascripts/workbox/workbox-cacheable-response.dev.js.map b/public/javascripts/workbox/workbox-cacheable-response.dev.js.map
new file mode 100644
index 0000000000..86bc689049
--- /dev/null
+++ b/public/javascripts/workbox/workbox-cacheable-response.dev.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"workbox-cacheable-response.dev.js","sources":["../_version.mjs","../CacheableResponse.mjs","../Plugin.mjs","../index.mjs"],"sourcesContent":["try{self['workbox:cacheable-response:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport './_version.mjs';\n\n/**\n * This class allows you to set up rules determining what\n * status codes and/or headers need to be present in order for a\n * [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response)\n * to be considered cacheable.\n *\n * @memberof workbox.cacheableResponse\n */\nclass CacheableResponse {\n  /**\n   * To construct a new CacheableResponse instance you must provide at least\n   * one of the `config` properties.\n   *\n   * If both `statuses` and `headers` are specified, then both conditions must\n   * be met for the `Response` to be considered cacheable.\n   *\n   * @param {Object} config\n   * @param {Array<number>} [config.statuses] One or more status codes that a\n   * `Response` can have and be considered cacheable.\n   * @param {Object<string,string>} [config.headers] A mapping of header names\n   * and expected values that a `Response` can have and be considered cacheable.\n   * If multiple headers are provided, only one needs to be present.\n   */\n  constructor(config = {}) {\n    if (process.env.NODE_ENV !== 'production') {\n      if (!(config.statuses || config.headers)) {\n        throw new WorkboxError('statuses-or-headers-required', {\n          moduleName: 'workbox-cacheable-response',\n          className: 'CacheableResponse',\n          funcName: 'constructor',\n        });\n      }\n\n      if (config.statuses) {\n        assert.isArray(config.statuses, {\n          moduleName: 'workbox-cacheable-response',\n          className: 'CacheableResponse',\n          funcName: 'constructor',\n          paramName: 'config.statuses',\n        });\n      }\n\n      if (config.headers) {\n        assert.isType(config.headers, 'object', {\n          moduleName: 'workbox-cacheable-response',\n          className: 'CacheableResponse',\n          funcName: 'constructor',\n          paramName: 'config.headers',\n        });\n      }\n    }\n\n    this._statuses = config.statuses;\n    this._headers = config.headers;\n  }\n\n  /**\n   * Checks a response to see whether it's cacheable or not, based on this\n   * object's configuration.\n   *\n   * @param {Response} response The response whose cacheability is being\n   * checked.\n   * @return {boolean} `true` if the `Response` is cacheable, and `false`\n   * otherwise.\n   */\n  isResponseCacheable(response) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(response, Response, {\n        moduleName: 'workbox-cacheable-response',\n        className: 'CacheableResponse',\n        funcName: 'isResponseCacheable',\n        paramName: 'response',\n      });\n    }\n\n    let cacheable = true;\n\n    if (this._statuses) {\n      cacheable = this._statuses.includes(response.status);\n    }\n\n    if (this._headers && cacheable) {\n      cacheable = Object.keys(this._headers).some((headerName) => {\n        return response.headers.get(headerName) === this._headers[headerName];\n      });\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      if (!cacheable) {\n        logger.groupCollapsed(`The request for ` +\n          `'${getFriendlyURL(response.url)}' returned a response that does ` +\n          `not meet the criteria for being cached.`);\n\n        logger.groupCollapsed(`View cacheability criteria here.`);\n        logger.log(`Cacheable statuses: ` +\n          JSON.stringify(this._statuses));\n        logger.log(`Cacheable headers: ` +\n          JSON.stringify(this._headers, null, 2));\n        logger.groupEnd();\n\n        const logFriendlyHeaders = {};\n        response.headers.forEach((value, key) => {\n          logFriendlyHeaders[key] = value;\n        });\n\n        logger.groupCollapsed(`View response status and headers here.`);\n        logger.log(`Response status: ` + response.status);\n        logger.log(`Response headers: ` +\n          JSON.stringify(logFriendlyHeaders, null, 2));\n        logger.groupEnd();\n\n        logger.groupCollapsed(`View full response details here.`);\n        logger.log(response.headers);\n        logger.log(response);\n        logger.groupEnd();\n\n        logger.groupEnd();\n      }\n    }\n\n    return cacheable;\n  }\n}\n\nexport {CacheableResponse};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {CacheableResponse} from './CacheableResponse.mjs';\nimport './_version.mjs';\n\n/**\n * A class implementing the `cacheWillUpdate` lifecycle callback. This makes it\n * easier to add in cacheability checks to requests made via Workbox's built-in\n * strategies.\n *\n * @memberof workbox.cacheableResponse\n */\nclass Plugin {\n  /**\n   * To construct a new cacheable response Plugin instance you must provide at\n   * least one of the `config` properties.\n   *\n   * If both `statuses` and `headers` are specified, then both conditions must\n   * be met for the `Response` to be considered cacheable.\n   *\n   * @param {Object} config\n   * @param {Array<number>} [config.statuses] One or more status codes that a\n   * `Response` can have and be considered cacheable.\n   * @param {Object<string,string>} [config.headers] A mapping of header names\n   * and expected values that a `Response` can have and be considered cacheable.\n   * If multiple headers are provided, only one needs to be present.\n   */\n  constructor(config) {\n    this._cacheableResponse = new CacheableResponse(config);\n  }\n\n  /**\n   * @param {Object} options\n   * @param {Response} options.response\n   * @return {boolean}\n   * @private\n   */\n  cacheWillUpdate({response}) {\n    if (this._cacheableResponse.isResponseCacheable(response)) {\n      return response;\n    }\n    return null;\n  }\n}\n\nexport {Plugin};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {CacheableResponse} from './CacheableResponse.mjs';\nimport {Plugin} from './Plugin.mjs';\nimport './_version.mjs';\n\n\n/**\n * @namespace workbox.cacheableResponse\n */\n\nexport {\n  CacheableResponse,\n  Plugin,\n};\n"],"names":["self","_","e","CacheableResponse","constructor","config","statuses","headers","WorkboxError","moduleName","className","funcName","assert","isArray","paramName","isType","_statuses","_headers","isResponseCacheable","response","isInstance","Response","cacheable","includes","status","Object","keys","some","headerName","get","logger","groupCollapsed","getFriendlyURL","url","log","JSON","stringify","groupEnd","logFriendlyHeaders","forEach","value","key","Plugin","_cacheableResponse","cacheWillUpdate"],"mappings":";;;;EAAA,IAAG;EAACA,EAAAA,IAAI,CAAC,kCAAD,CAAJ,IAA0CC,CAAC,EAA3C;EAA8C,CAAlD,CAAkD,OAAMC,CAAN,EAAQ;;ECA1D;;;;;;;AAQA,EAMA;;;;;;;;;EAQA,MAAMC,iBAAN,CAAwB;EACtB;;;;;;;;;;;;;;EAcAC,EAAAA,WAAW,CAACC,MAAM,GAAG,EAAV,EAAc;EACvB,IAA2C;EACzC,UAAI,EAAEA,MAAM,CAACC,QAAP,IAAmBD,MAAM,CAACE,OAA5B,CAAJ,EAA0C;EACxC,cAAM,IAAIC,6BAAJ,CAAiB,8BAAjB,EAAiD;EACrDC,UAAAA,UAAU,EAAE,4BADyC;EAErDC,UAAAA,SAAS,EAAE,mBAF0C;EAGrDC,UAAAA,QAAQ,EAAE;EAH2C,SAAjD,CAAN;EAKD;;EAED,UAAIN,MAAM,CAACC,QAAX,EAAqB;EACnBM,QAAAA,iBAAM,CAACC,OAAP,CAAeR,MAAM,CAACC,QAAtB,EAAgC;EAC9BG,UAAAA,UAAU,EAAE,4BADkB;EAE9BC,UAAAA,SAAS,EAAE,mBAFmB;EAG9BC,UAAAA,QAAQ,EAAE,aAHoB;EAI9BG,UAAAA,SAAS,EAAE;EAJmB,SAAhC;EAMD;;EAED,UAAIT,MAAM,CAACE,OAAX,EAAoB;EAClBK,QAAAA,iBAAM,CAACG,MAAP,CAAcV,MAAM,CAACE,OAArB,EAA8B,QAA9B,EAAwC;EACtCE,UAAAA,UAAU,EAAE,4BAD0B;EAEtCC,UAAAA,SAAS,EAAE,mBAF2B;EAGtCC,UAAAA,QAAQ,EAAE,aAH4B;EAItCG,UAAAA,SAAS,EAAE;EAJ2B,SAAxC;EAMD;EACF;;EAED,SAAKE,SAAL,GAAiBX,MAAM,CAACC,QAAxB;EACA,SAAKW,QAAL,GAAgBZ,MAAM,CAACE,OAAvB;EACD;EAED;;;;;;;;;;;EASAW,EAAAA,mBAAmB,CAACC,QAAD,EAAW;EAC5B,IAA2C;EACzCP,MAAAA,iBAAM,CAACQ,UAAP,CAAkBD,QAAlB,EAA4BE,QAA5B,EAAsC;EACpCZ,QAAAA,UAAU,EAAE,4BADwB;EAEpCC,QAAAA,SAAS,EAAE,mBAFyB;EAGpCC,QAAAA,QAAQ,EAAE,qBAH0B;EAIpCG,QAAAA,SAAS,EAAE;EAJyB,OAAtC;EAMD;;EAED,QAAIQ,SAAS,GAAG,IAAhB;;EAEA,QAAI,KAAKN,SAAT,EAAoB;EAClBM,MAAAA,SAAS,GAAG,KAAKN,SAAL,CAAeO,QAAf,CAAwBJ,QAAQ,CAACK,MAAjC,CAAZ;EACD;;EAED,QAAI,KAAKP,QAAL,IAAiBK,SAArB,EAAgC;EAC9BA,MAAAA,SAAS,GAAGG,MAAM,CAACC,IAAP,CAAY,KAAKT,QAAjB,EAA2BU,IAA3B,CAAiCC,UAAD,IAAgB;EAC1D,eAAOT,QAAQ,CAACZ,OAAT,CAAiBsB,GAAjB,CAAqBD,UAArB,MAAqC,KAAKX,QAAL,CAAcW,UAAd,CAA5C;EACD,OAFW,CAAZ;EAGD;;EAED,IAA2C;EACzC,UAAI,CAACN,SAAL,EAAgB;EACdQ,QAAAA,iBAAM,CAACC,cAAP,CAAuB,kBAAD,GACnB,IAAGC,iCAAc,CAACb,QAAQ,CAACc,GAAV,CAAe,kCADb,GAEnB,yCAFH;EAIAH,QAAAA,iBAAM,CAACC,cAAP,CAAuB,kCAAvB;EACAD,QAAAA,iBAAM,CAACI,GAAP,CAAY,sBAAD,GACTC,IAAI,CAACC,SAAL,CAAe,KAAKpB,SAApB,CADF;EAEAc,QAAAA,iBAAM,CAACI,GAAP,CAAY,qBAAD,GACTC,IAAI,CAACC,SAAL,CAAe,KAAKnB,QAApB,EAA8B,IAA9B,EAAoC,CAApC,CADF;EAEAa,QAAAA,iBAAM,CAACO,QAAP;EAEA,cAAMC,kBAAkB,GAAG,EAA3B;EACAnB,QAAAA,QAAQ,CAACZ,OAAT,CAAiBgC,OAAjB,CAAyB,CAACC,KAAD,EAAQC,GAAR,KAAgB;EACvCH,UAAAA,kBAAkB,CAACG,GAAD,CAAlB,GAA0BD,KAA1B;EACD,SAFD;EAIAV,QAAAA,iBAAM,CAACC,cAAP,CAAuB,wCAAvB;EACAD,QAAAA,iBAAM,CAACI,GAAP,CAAY,mBAAD,GAAsBf,QAAQ,CAACK,MAA1C;EACAM,QAAAA,iBAAM,CAACI,GAAP,CAAY,oBAAD,GACTC,IAAI,CAACC,SAAL,CAAeE,kBAAf,EAAmC,IAAnC,EAAyC,CAAzC,CADF;EAEAR,QAAAA,iBAAM,CAACO,QAAP;EAEAP,QAAAA,iBAAM,CAACC,cAAP,CAAuB,kCAAvB;EACAD,QAAAA,iBAAM,CAACI,GAAP,CAAWf,QAAQ,CAACZ,OAApB;EACAuB,QAAAA,iBAAM,CAACI,GAAP,CAAWf,QAAX;EACAW,QAAAA,iBAAM,CAACO,QAAP;EAEAP,QAAAA,iBAAM,CAACO,QAAP;EACD;EACF;;EAED,WAAOf,SAAP;EACD;;EAjHqB;;ECtBxB;;;;;;;AAQA,EAGA;;;;;;;;EAOA,MAAMoB,MAAN,CAAa;EACX;;;;;;;;;;;;;;EAcAtC,EAAAA,WAAW,CAACC,MAAD,EAAS;EAClB,SAAKsC,kBAAL,GAA0B,IAAIxC,iBAAJ,CAAsBE,MAAtB,CAA1B;EACD;EAED;;;;;;;;EAMAuC,EAAAA,eAAe,CAAC;EAACzB,IAAAA;EAAD,GAAD,EAAa;EAC1B,QAAI,KAAKwB,kBAAL,CAAwBzB,mBAAxB,CAA4CC,QAA5C,CAAJ,EAA2D;EACzD,aAAOA,QAAP;EACD;;EACD,WAAO,IAAP;EACD;;EA9BU;;EClBb;;;;;;;;;;;;;;;;;"}
\ No newline at end of file
diff --git a/public/javascripts/workbox/workbox-cacheable-response.prod.js b/public/javascripts/workbox/workbox-cacheable-response.prod.js
new file mode 100644
index 0000000000..a7e42f263a
--- /dev/null
+++ b/public/javascripts/workbox/workbox-cacheable-response.prod.js
@@ -0,0 +1,2 @@
+this.workbox=this.workbox||{},this.workbox.cacheableResponse=function(t){"use strict";try{self["workbox:cacheable-response:4.3.1"]&&_()}catch(t){}class s{constructor(t={}){this.t=t.statuses,this.s=t.headers}isResponseCacheable(t){let s=!0;return this.t&&(s=this.t.includes(t.status)),this.s&&s&&(s=Object.keys(this.s).some(s=>t.headers.get(s)===this.s[s])),s}}return t.CacheableResponse=s,t.Plugin=class{constructor(t){this.i=new s(t)}cacheWillUpdate({response:t}){return this.i.isResponseCacheable(t)?t:null}},t}({});
+//# sourceMappingURL=workbox-cacheable-response.prod.js.map
diff --git a/public/javascripts/workbox/workbox-cacheable-response.prod.js.map b/public/javascripts/workbox/workbox-cacheable-response.prod.js.map
new file mode 100644
index 0000000000..b1a0d1d2b7
--- /dev/null
+++ b/public/javascripts/workbox/workbox-cacheable-response.prod.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"workbox-cacheable-response.prod.js","sources":["../_version.mjs","../CacheableResponse.mjs","../Plugin.mjs"],"sourcesContent":["try{self['workbox:cacheable-response:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport './_version.mjs';\n\n/**\n * This class allows you to set up rules determining what\n * status codes and/or headers need to be present in order for a\n * [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response)\n * to be considered cacheable.\n *\n * @memberof workbox.cacheableResponse\n */\nclass CacheableResponse {\n  /**\n   * To construct a new CacheableResponse instance you must provide at least\n   * one of the `config` properties.\n   *\n   * If both `statuses` and `headers` are specified, then both conditions must\n   * be met for the `Response` to be considered cacheable.\n   *\n   * @param {Object} config\n   * @param {Array<number>} [config.statuses] One or more status codes that a\n   * `Response` can have and be considered cacheable.\n   * @param {Object<string,string>} [config.headers] A mapping of header names\n   * and expected values that a `Response` can have and be considered cacheable.\n   * If multiple headers are provided, only one needs to be present.\n   */\n  constructor(config = {}) {\n    if (process.env.NODE_ENV !== 'production') {\n      if (!(config.statuses || config.headers)) {\n        throw new WorkboxError('statuses-or-headers-required', {\n          moduleName: 'workbox-cacheable-response',\n          className: 'CacheableResponse',\n          funcName: 'constructor',\n        });\n      }\n\n      if (config.statuses) {\n        assert.isArray(config.statuses, {\n          moduleName: 'workbox-cacheable-response',\n          className: 'CacheableResponse',\n          funcName: 'constructor',\n          paramName: 'config.statuses',\n        });\n      }\n\n      if (config.headers) {\n        assert.isType(config.headers, 'object', {\n          moduleName: 'workbox-cacheable-response',\n          className: 'CacheableResponse',\n          funcName: 'constructor',\n          paramName: 'config.headers',\n        });\n      }\n    }\n\n    this._statuses = config.statuses;\n    this._headers = config.headers;\n  }\n\n  /**\n   * Checks a response to see whether it's cacheable or not, based on this\n   * object's configuration.\n   *\n   * @param {Response} response The response whose cacheability is being\n   * checked.\n   * @return {boolean} `true` if the `Response` is cacheable, and `false`\n   * otherwise.\n   */\n  isResponseCacheable(response) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(response, Response, {\n        moduleName: 'workbox-cacheable-response',\n        className: 'CacheableResponse',\n        funcName: 'isResponseCacheable',\n        paramName: 'response',\n      });\n    }\n\n    let cacheable = true;\n\n    if (this._statuses) {\n      cacheable = this._statuses.includes(response.status);\n    }\n\n    if (this._headers && cacheable) {\n      cacheable = Object.keys(this._headers).some((headerName) => {\n        return response.headers.get(headerName) === this._headers[headerName];\n      });\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      if (!cacheable) {\n        logger.groupCollapsed(`The request for ` +\n          `'${getFriendlyURL(response.url)}' returned a response that does ` +\n          `not meet the criteria for being cached.`);\n\n        logger.groupCollapsed(`View cacheability criteria here.`);\n        logger.log(`Cacheable statuses: ` +\n          JSON.stringify(this._statuses));\n        logger.log(`Cacheable headers: ` +\n          JSON.stringify(this._headers, null, 2));\n        logger.groupEnd();\n\n        const logFriendlyHeaders = {};\n        response.headers.forEach((value, key) => {\n          logFriendlyHeaders[key] = value;\n        });\n\n        logger.groupCollapsed(`View response status and headers here.`);\n        logger.log(`Response status: ` + response.status);\n        logger.log(`Response headers: ` +\n          JSON.stringify(logFriendlyHeaders, null, 2));\n        logger.groupEnd();\n\n        logger.groupCollapsed(`View full response details here.`);\n        logger.log(response.headers);\n        logger.log(response);\n        logger.groupEnd();\n\n        logger.groupEnd();\n      }\n    }\n\n    return cacheable;\n  }\n}\n\nexport {CacheableResponse};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {CacheableResponse} from './CacheableResponse.mjs';\nimport './_version.mjs';\n\n/**\n * A class implementing the `cacheWillUpdate` lifecycle callback. This makes it\n * easier to add in cacheability checks to requests made via Workbox's built-in\n * strategies.\n *\n * @memberof workbox.cacheableResponse\n */\nclass Plugin {\n  /**\n   * To construct a new cacheable response Plugin instance you must provide at\n   * least one of the `config` properties.\n   *\n   * If both `statuses` and `headers` are specified, then both conditions must\n   * be met for the `Response` to be considered cacheable.\n   *\n   * @param {Object} config\n   * @param {Array<number>} [config.statuses] One or more status codes that a\n   * `Response` can have and be considered cacheable.\n   * @param {Object<string,string>} [config.headers] A mapping of header names\n   * and expected values that a `Response` can have and be considered cacheable.\n   * If multiple headers are provided, only one needs to be present.\n   */\n  constructor(config) {\n    this._cacheableResponse = new CacheableResponse(config);\n  }\n\n  /**\n   * @param {Object} options\n   * @param {Response} options.response\n   * @return {boolean}\n   * @private\n   */\n  cacheWillUpdate({response}) {\n    if (this._cacheableResponse.isResponseCacheable(response)) {\n      return response;\n    }\n    return null;\n  }\n}\n\nexport {Plugin};\n"],"names":["self","_","e","CacheableResponse","constructor","config","_statuses","statuses","_headers","headers","isResponseCacheable","response","cacheable","this","includes","status","Object","keys","some","headerName","get","_cacheableResponse","cacheWillUpdate"],"mappings":"sFAAA,IAAIA,KAAK,qCAAqCC,IAAI,MAAMC,ICsBxD,MAAMC,EAeJC,YAAYC,EAAS,SA6BdC,EAAYD,EAAOE,cACnBC,EAAWH,EAAOI,QAYzBC,oBAAoBC,OAUdC,GAAY,SAEZC,KAAKP,IACPM,EAAYC,KAAKP,EAAUQ,SAASH,EAASI,SAG3CF,KAAKL,GAAYI,IACnBA,EAAYI,OAAOC,KAAKJ,KAAKL,GAAUU,KAAMC,GACpCR,EAASF,QAAQW,IAAID,KAAgBN,KAAKL,EAASW,KAqCvDP,yCCpHX,MAeER,YAAYC,QACLgB,EAAqB,IAAIlB,EAAkBE,GASlDiB,iBAAgBX,SAACA,WACXE,KAAKQ,EAAmBX,oBAAoBC,GACvCA,EAEF"}
\ No newline at end of file
diff --git a/script/benchmarks/site_setting/bench.rb b/script/benchmarks/site_setting/bench.rb
index 902911d44f..5790b41ffa 100644
--- a/script/benchmarks/site_setting/bench.rb
+++ b/script/benchmarks/site_setting/bench.rb
@@ -14,7 +14,7 @@ SiteSetting.refresh!
 tests = [
   ["current cache", lambda do
     SiteSetting.title
-    SiteSetting.enable_sso
+    SiteSetting.enable_discourse_connect
   end
   ],
   ["change default locale with current cache refreshed", lambda do
diff --git a/script/benchmarks/site_setting/profile.rb b/script/benchmarks/site_setting/profile.rb
index 0ad7bcde07..a849a18a36 100644
--- a/script/benchmarks/site_setting/profile.rb
+++ b/script/benchmarks/site_setting/profile.rb
@@ -13,7 +13,7 @@ require File.expand_path('../../../../config/environment', __FILE__)
 
 # warming up
 SiteSetting.title
-SiteSetting.enable_sso
+SiteSetting.enable_discourse_connect
 SiteSetting.default_locale = SiteSetting.default_locale == 'en' ? 'zh_CN' : 'en'
 SiteSetting.title = SecureRandom.hex
 
@@ -22,7 +22,7 @@ profile do
 end
 
 profile do
-  SiteSetting.enable_sso
+  SiteSetting.enable_discourse_connect
 end
 
 profile do
diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 0d7ec65d06..a04c7deee1 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -285,7 +285,7 @@ class BulkImport::Base
     user_id topics_entered time_read days_visited posts_read_count
     likes_given likes_received new_since read_faq
     first_post_created_at post_count topic_count bounce_score
-    reset_bounce_score_after
+    reset_bounce_score_after digest_attempted_at
   }
 
   USER_PROFILE_COLUMNS ||= %i{
@@ -435,7 +435,6 @@ class BulkImport::Base
     user_email[:updated_at] ||= user_email[:created_at]
     user_email[:email] ||= random_email
     user_email[:email].downcase!
-
     user_email
   end
 
@@ -451,11 +450,12 @@ class BulkImport::Base
     user_stat[:post_count] ||= 0
     user_stat[:topic_count] ||= 0
     user_stat[:bounce_score] ||= 0
+    user_stat[:digest_attempted_at] ||= NOW
     user_stat
   end
 
   def process_user_profile(user_profile)
-    user_profile[:bio_raw]    = (user_profile[:bio_raw].presence || "").scrub.strip.presence
+    user_profile[:bio_raw] = (user_profile[:bio_raw].presence || "").scrub.strip.presence
     user_profile[:bio_cooked] = pre_cook(user_profile[:bio_raw]) if user_profile[:bio_raw].present?
     user_profile[:views] ||= 0
     user_profile
@@ -494,7 +494,7 @@ class BulkImport::Base
     topic[:closed] ||= false
     topic[:views] ||= 0
     topic[:created_at] ||= NOW
-    topic[:bumped_at]  ||= topic[:created_at]
+    topic[:bumped_at] ||= topic[:created_at]
     topic[:updated_at] ||= topic[:created_at]
     topic
   end
@@ -627,6 +627,10 @@ class BulkImport::Base
     raw.gsub!(/\[TD\](.*?)\[\/TD\]/im, "\\1")
     raw.gsub!(/\[TD="?.*?"?\](.*?)\[\/TD\]/im, "\\1")
 
+    # [STRIKE]
+    raw.gsub!(/\[STRIKE\]/i, "<s>")
+    raw.gsub!(/\[\/STRIKE\]/i, "</s>")
+
     # [QUOTE]...[/QUOTE]
     raw.gsub!(/\[QUOTE="([^\]]+)"\]/i) { "[QUOTE=#{$1}]" }
 
@@ -644,7 +648,7 @@ class BulkImport::Base
 
       username = @mapped_usernames[imported_username] || imported_username
       post_number = post_number_from_imported_id(imported_postid)
-      topic_id = topic_id_from_imported_post_id(imported_post_id)
+      topic_id = topic_id_from_imported_post_id(imported_postid)
 
       if post_number && topic_id
         "\n[quote=\"#{username}, post:#{post_number}, topic:#{topic_id}\"]\n"
@@ -668,9 +672,9 @@ class BulkImport::Base
     # (basically, we're only missing list=a here...)
     # (https://meta.discourse.org/t/phpbb-3-importer-old/17397)
     raw.gsub!(/\[list\](.*?)\[\/list\]/im, '[ul]\1[/ul]')
-    raw.gsub!(/\[list=1\](.*?)\[\/list\]/im, '[ol]\1[/ol]')
+    raw.gsub!(/\[list=1\|?[^\]]*\](.*?)\[\/list\]/im, '[ol]\1[/ol]')
     raw.gsub!(/\[list\](.*?)\[\/list:u\]/im, '[ul]\1[/ul]')
-    raw.gsub!(/\[list=1\](.*?)\[\/list:o\]/im, '[ol]\1[/ol]')
+    raw.gsub!(/\[list=1\|?[^\]]*\](.*?)\[\/list:o\]/im, '[ol]\1[/ol]')
     # convert *-tags to li-tags so bbcode-to-md can do its magic on phpBB's lists:
     raw.gsub!(/\[\*\]\n/, '')
     raw.gsub!(/\[\*\](.*?)\[\/\*:m\]/, '[li]\1[/li]')
@@ -749,6 +753,7 @@ class BulkImport::Base
     name.gsub!(/[^A-Za-z0-9]+$/, "")
     name.gsub!(/([-_.]{2,})/) { $1.first }
     name.strip!
+    name.truncate(60)
     name
   end
 
@@ -757,7 +762,7 @@ class BulkImport::Base
   end
 
   def random_email
-    "#{SecureRandom.hex}@ema.il"
+    "#{SecureRandom.hex}@email.invalid"
   end
 
   def pre_cook(raw)
diff --git a/script/bulk_import/discourse_merger.rb b/script/bulk_import/discourse_merger.rb
index 6bc189a664..da2a9c6a11 100644
--- a/script/bulk_import/discourse_merger.rb
+++ b/script/bulk_import/discourse_merger.rb
@@ -9,6 +9,7 @@ class BulkImport::DiscourseMerger < BulkImport::Base
 
   # DB_NAME: name of database being merged into the current local db
   # DB_HOST: hostname of database being merged
+  # DB_PASS: password used to access the Discourse database by the postgres user
   # UPLOADS_PATH: absolute path of the directory containing "original"
   #               and "optimized" dirs. e.g. /home/discourse/other-site/public/uploads/default
   # SOURCE_BASE_URL: base url of the site being merged. e.g. https://meta.discourse.org
@@ -16,12 +17,15 @@ class BulkImport::DiscourseMerger < BulkImport::Base
   #             e.g. https://discourse-cdn-sjc1.com/business4
 
   def initialize
+    db_password = ENV["DB_PASS"] || 'import_password'
     local_db = ActiveRecord::Base.connection_config
-    @raw_connection = PG.connect(dbname: local_db[:database], host: 'localhost', port: local_db[:port])
+    @raw_connection = PG.connect(dbname: local_db[:database], host: 'localhost', port: local_db[:port], user: 'postgres', password: db_password)
 
     @source_db_config = {
       dbname: ENV["DB_NAME"] || 'dd_demo',
-      host: ENV["DB_HOST"] || 'localhost'
+      host: ENV["DB_HOST"] || 'localhost',
+      user: 'postgres',
+      password: db_password
     }
 
     raise "SOURCE_BASE_URL missing!" unless ENV['SOURCE_BASE_URL']
@@ -109,7 +113,7 @@ class BulkImport::DiscourseMerger < BulkImport::Base
         old_user_id = row['id']&.to_i
         if existing = UserEmail.where(email: row.delete('email')).first&.user
           # Merge these users
-          @users[old_user_id.to_s] = existing.id
+          @users[old_user_id] = existing.id
           @merged_user_ids << old_user_id
           next
         else
@@ -122,7 +126,7 @@ class BulkImport::DiscourseMerger < BulkImport::Base
           end
 
           row['id'] = (@last_user_id += 1)
-          @users[old_user_id.to_s] = row['id']
+          @users[old_user_id] = row['id']
 
           @raw_connection.put_copy_data row.values
         end
@@ -189,17 +193,30 @@ class BulkImport::DiscourseMerger < BulkImport::Base
                      c1.slug AS slug
                 FROM categories c1
      LEFT OUTER JOIN categories c2 ON c1.parent_category_id = c2.id
-                  ) x ON c.id = x.id"
+                  ) x ON c.id = x.id
+            ORDER BY c.id"
         ).each do |row|
 
+        # using ORDER BY id to import categories in order of creation.
+        # this assumes parent categories were created prior to child categories
+        # and have a lower category id.
+        #
+        # without this definition, categories import in different orders in subsequent imports
+        # and can potentially mess up parent/child structure
+
         source_category_path = row.delete('path')&.squeeze('/')
 
         existing = Category.where(slug: row['slug']).first
         parent_slug = existing&.parent_category&.slug
         if existing &&
             source_category_path == "/c/#{parent_slug}/#{existing.slug}".squeeze('/')
-          @categories[row['id']] = existing.id
+          @categories[row['id'].to_i] = existing.id
           next
+        elsif existing
+          # if not the exact path as the source,
+          # we still need to avoid a unique index conflict on the slug when importing
+          # if that's the case, we'll append the imported id
+          row['slug'] = "#{row['slug']}-#{row['id']}"
         end
 
         old_user_id = row['user_id'].to_i
@@ -211,10 +228,10 @@ class BulkImport::DiscourseMerger < BulkImport::Base
           row['parent_category_id'] = category_id_from_imported_id(row['parent_category_id'])
         end
 
-        old_id = row['id']
+        old_id = row['id'].to_i
         row['id'] = (last_id += 1)
         imported_ids << old_id
-        @categories[old_id.to_s] = row['id']
+        @categories[old_id] = row['id']
 
         @raw_connection.put_copy_data(row.values)
       end
@@ -234,8 +251,8 @@ class BulkImport::DiscourseMerger < BulkImport::Base
     puts 'updating category description topic ids...'
 
     @categories.each do |old_id, new_id|
-      category = Category.find(new_id)
-      if description_topic_id = topic_id_from_imported_id(category.topic_id)
+      category = Category.find(new_id) if new_id.present?
+      if description_topic_id = topic_id_from_imported_id(category&.topic_id)
         category.topic_id = description_topic_id
         category.save!
       end
@@ -321,8 +338,13 @@ class BulkImport::DiscourseMerger < BulkImport::Base
 
         next if Upload.where(sha1: row['sha1']).exists?
 
+        # make sure to get a backup with uploads then convert them to local.
+        # when the backup is restored to a site with s3 uploads, it will upload the items
+        # to the bucket
         rel_filename = row['url'].gsub(/^\/uploads\/[^\/]+\//, '')
-        rel_filename = rel_filename.gsub(/^\/\/[^\/]+\.amazonaws\.com\//, '')
+        # assumes if coming from amazonaws.com that we want to remove everything
+        # but the text after the last `/`, which should leave us the filename
+        rel_filename = rel_filename.gsub(/^\/\/[^\/]+\.amazonaws\.com\/\S+\//, '')
         absolute_filename = File.join(@uploads_path, rel_filename)
 
         old_id = row['id']
@@ -457,11 +479,11 @@ class BulkImport::DiscourseMerger < BulkImport::Base
         row['deleted_by_id'] = user_id_from_imported_id(row['deleted_by_id']) if row['deleted_by_id']
         row['badge_id'] = badge_id_from_imported_id(row['badge_id']) if row['badge_id']
 
-        old_id = row['id']
+        old_id = row['id'].to_i
         if old_id && last_id
           row['id'] = (last_id += 1)
           imported_ids << old_id if has_custom_fields
-          mapping[old_id.to_s] = row['id'] if mapping
+          mapping[old_id] = row['id'] if mapping
         end
 
         if skip_processing
@@ -724,7 +746,7 @@ class BulkImport::DiscourseMerger < BulkImport::Base
 
     User.where('id >= ?', @first_new_user_id).find_each do |u|
       arr = []
-      sql = "UPDATE users SET"
+      sql = "UPDATE users SET".dup
 
       if new_approved_by_id = user_id_from_imported_id(u.approved_by_id)
         arr << " approved_by_id = #{new_approved_by_id}"
diff --git a/script/bulk_import/vbulletin.rb b/script/bulk_import/vbulletin.rb
index b437137c38..c251ef07ab 100644
--- a/script/bulk_import/vbulletin.rb
+++ b/script/bulk_import/vbulletin.rb
@@ -359,7 +359,7 @@ class BulkImport::VBulletin < BulkImport::Base
         reply_to_post_number: reply_to_post_number,
         user_id: user_id_from_imported_id(row[3]),
         created_at: Time.zone.at(row[4]),
-        hidden: row[5] == 0,
+        hidden: row[5] != 1,
         raw: normalize_text(row[6]),
       }
 
diff --git a/script/bulk_import/vbulletin5.rb b/script/bulk_import/vbulletin5.rb
new file mode 100644
index 0000000000..507eb3d5d2
--- /dev/null
+++ b/script/bulk_import/vbulletin5.rb
@@ -0,0 +1,781 @@
+# frozen_string_literal: true
+
+require_relative "base"
+require "cgi"
+require "set"
+require "mysql2"
+require "htmlentities"
+require 'ruby-bbcode-to-md'
+require 'find'
+
+class BulkImport::VBulletin5 < BulkImport::Base
+
+  DB_PREFIX = ""
+  SUSPENDED_TILL ||= Date.new(3000, 1, 1)
+  ATTACH_DIR ||= ENV['ATTACH_DIR'] || '/shared/import/data/attachments'
+  AVATAR_DIR ||= ENV['AVATAR_DIR'] || '/shared/import/data/customavatars'
+  ROOT_NODE = 2
+
+  def initialize
+    super
+
+    host     = ENV["DB_HOST"] || "localhost"
+    username = ENV["DB_USERNAME"] || "root"
+    password = ENV["DB_PASSWORD"]
+    database = ENV["DB_NAME"] || "vbulletin"
+    charset  = ENV["DB_CHARSET"] || "utf8"
+
+    @html_entities = HTMLEntities.new
+    @encoding = CHARSET_MAP[charset]
+    @bbcode_to_md = true
+
+    @client = Mysql2::Client.new(
+      host: host,
+      username: username,
+      password: password,
+      database: database,
+      encoding: charset,
+      reconnect: true
+    )
+
+    @client.query_options.merge!(as: :array, cache_rows: false)
+
+    # TODO: Add `LIMIT 1` to the below queries
+    # ------
+    # be aware there may be other contenttypeid's in use, such as poll, link, video, etc.
+    @forum_typeid = mysql_query("SELECT contenttypeid FROM #{DB_PREFIX}contenttype WHERE class='Forum'").to_a[0][0]
+    @channel_typeid = mysql_query("SELECT contenttypeid FROM #{DB_PREFIX}contenttype WHERE class='Channel'").to_a[0][0]
+    @text_typeid = mysql_query("SELECT contenttypeid FROM #{DB_PREFIX}contenttype WHERE class='Text'").to_a[0][0]
+  end
+
+  def execute
+    # enable as per requirement:
+    #SiteSetting.automatic_backups_enabled = false
+    #SiteSetting.disable_emails = "non-staff"
+    #SiteSetting.authorized_extensions = '*'
+    #SiteSetting.max_image_size_kb = 102400
+    #SiteSetting.max_attachment_size_kb = 102400
+    #SiteSetting.clean_up_uploads = false
+    #SiteSetting.clean_orphan_uploads_grace_period_hours = 43200
+    #SiteSetting.max_category_nesting = 3
+
+    import_groups
+    import_users
+    import_group_users
+
+    import_user_emails
+    import_user_stats
+    import_user_profiles
+    import_user_account_id
+
+    import_categories
+    import_topics
+    import_topic_first_posts
+    import_replies
+
+    import_likes
+
+    import_private_topics
+    import_topic_allowed_users
+    import_private_first_posts
+    import_private_replies
+
+    create_oauth_records
+    create_permalinks
+    import_attachments
+  end
+
+  def import_groups
+    puts "Importing groups..."
+
+    groups = mysql_stream <<-SQL
+        SELECT usergroupid, title, description, usertitle
+          FROM #{DB_PREFIX}usergroup
+         WHERE usergroupid > #{@last_imported_group_id}
+      ORDER BY usergroupid
+    SQL
+
+    create_groups(groups) do |row|
+      {
+        imported_id: row[0],
+        name: normalize_text(row[1]),
+        bio_raw: normalize_text(row[2]),
+        title: normalize_text(row[3]),
+      }
+    end
+  end
+
+  def import_users
+    puts "Importing users..."
+
+    users = mysql_stream <<-SQL
+        SELECT u.userid, u.username, u.joindate, u.birthday,
+               u.ipaddress, u.usergroupid, ub.bandate, ub.liftdate, u.email
+          FROM #{DB_PREFIX}user u
+     LEFT JOIN #{DB_PREFIX}userban ub ON ub.userid = u.userid
+         WHERE u.userid > #{@last_imported_user_id}
+      ORDER BY u.userid
+    SQL
+
+    create_users(users) do |row|
+      u = {
+        imported_id: row[0],
+        username: normalize_text(row[1].truncate(60)),
+        name: normalize_text(row[1]),
+        email: row[8],
+        created_at: Time.zone.at(row[2]),
+        date_of_birth: parse_birthday(row[3]),
+        primary_group_id: group_id_from_imported_id(row[5]),
+        admin: row[5] == 6,
+        moderator: row[5] == 7
+      }
+      u[:ip_address] = row[4][/\b(?:\d{1,3}\.){3}\d{1,3}\b/] if row[4].present?
+      if row[7]
+        u[:suspended_at] = Time.zone.at(row[6])
+        u[:suspended_till] = row[7] > 0 ? Time.zone.at(row[7]) : SUSPENDED_TILL
+      end
+      u
+    end
+  end
+
+  def import_user_emails
+    puts "Importing user emails..."
+
+    users = mysql_stream <<-SQL
+        SELECT u.userid, u.email, u.joindate
+          FROM #{DB_PREFIX}user u
+         WHERE u.userid > #{@last_imported_user_id}
+      ORDER BY u.userid
+    SQL
+
+    create_user_emails(users) do |row|
+      {
+        imported_id: row[0],
+        imported_user_id: row[0],
+        email: random_email,
+        created_at: Time.zone.at(row[2])
+      }
+    end
+  end
+
+  def import_user_stats
+    puts "Importing user stats..."
+
+    users = mysql_stream <<-SQL
+      SELECT u.userid, u.joindate, u.posts,
+             SUM(
+               CASE
+                 WHEN n.contenttypeid = #{@text_typeid}
+                  AND n.parentid IN ( select nodeid from #{DB_PREFIX}node where contenttypeid=#{@channel_typeid} )
+                 THEN 1
+                 ELSE 0
+               END
+             ) AS threads
+        FROM #{DB_PREFIX}user u
+        LEFT OUTER JOIN #{DB_PREFIX}node n ON u.userid = n.userid
+       WHERE u.userid > #{@last_imported_user_id}
+       GROUP BY u.userid
+       ORDER BY u.userid
+    SQL
+
+    create_user_stats(users) do |row|
+      user = {
+        imported_id: row[0],
+        imported_user_id: row[0],
+        new_since: Time.zone.at(row[1]),
+        post_count: row[2],
+        topic_count: row[3],
+      }
+
+      user
+    end
+  end
+
+  def import_group_users
+    puts "Importing group users..."
+
+    # import primary groups
+
+    group_users = mysql_stream <<-SQL
+      SELECT usergroupid, userid
+        FROM #{DB_PREFIX}user
+       WHERE userid > #{@last_imported_user_id}
+    SQL
+
+    create_group_users(group_users) do |row|
+      {
+        group_id: group_id_from_imported_id(row[0]),
+        user_id: user_id_from_imported_id(row[1]),
+      }
+    end
+
+    # import secondary group memberships
+
+    secondary_group_users = mysql_stream <<-SQL
+      SELECT membergroupids, userid
+        FROM #{DB_PREFIX}user
+    SQL
+
+    group_mapping = []
+
+    secondary_group_users.each do |user|
+      next unless user_id = user_id_from_imported_id(user[1])
+      member_groups = user[0].split(",")
+
+      member_groups.each do |group|
+        next unless group_id = group_id_from_imported_id(group)
+        group_mapping << [group_id, user_id]
+      end
+    end
+
+    create_group_users(group_mapping) do |row|
+      {
+        group_id: row[0],
+        user_id: row[1]
+      }
+    end
+  end
+
+  def import_user_profiles
+    puts "Importing user profiles..."
+
+    user_profiles = mysql_stream <<-SQL
+        SELECT userid, homepage, profilevisits
+          FROM #{DB_PREFIX}user
+         WHERE userid > #{@last_imported_user_id}
+      ORDER BY userid
+    SQL
+
+    create_user_profiles(user_profiles) do |row|
+      {
+        user_id: user_id_from_imported_id(row[0]),
+        website: (URI.parse(row[1]).to_s rescue nil),
+        views: row[2],
+      }
+    end
+  end
+
+  def import_categories
+    puts "Importing categories..."
+
+    categories = mysql_query(<<-SQL
+      SELECT nodeid AS forumid, title, description, displayorder, parentid, urlident
+        FROM #{DB_PREFIX}node
+       WHERE parentid = #{ROOT_NODE}
+         AND nodeid > #{@last_imported_category_id}
+       UNION
+         SELECT nodeid, title, description, displayorder, parentid, urlident
+           FROM #{DB_PREFIX}node
+          WHERE contenttypeid = #{@channel_typeid}
+            AND nodeid > #{@last_imported_category_id}
+    SQL
+    ).to_a
+
+    return if categories.empty?
+
+    parent_categories   = categories.select { |c| c[4] == ROOT_NODE }
+    children_categories = categories.select { |c| c[4] != ROOT_NODE }
+
+    parent_category_ids = Set.new parent_categories.map { |c| c[0] }
+
+    puts "Importing parent categories..."
+    create_categories(parent_categories) do |row|
+      {
+        imported_id: row[0],
+        name: normalize_text(row[1]),
+        description: normalize_text(row[2]),
+        position: row[3],
+        slug: row[5]
+      }
+    end
+
+    puts "Importing children categories..."
+    create_categories(children_categories) do |row|
+      {
+        imported_id: row[0],
+        name: normalize_text(row[1]),
+        description: normalize_text(row[2]),
+        position: row[3],
+        parent_category_id: category_id_from_imported_id(row[4]),
+        slug: row[5]
+      }
+    end
+  end
+
+  def import_topics
+    puts "Importing topics..."
+
+    topics = mysql_stream <<-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
+            FROM #{DB_PREFIX}node t
+       LEFT JOIN #{DB_PREFIX}nodeview nv ON nv.nodeid = t.nodeid
+           WHERE t.parentid IN (SELECT nodeid from #{DB_PREFIX}node WHERE contenttypeid = #{@channel_typeid} )
+             AND t.contenttypeid = #{@text_typeid}
+             AND t.parentid != 7
+             AND (t.unpublishdate = 0 OR t.unpublishdate IS NULL)
+             AND t.approved = 1 AND t.showapproved = 1
+             AND t.nodeid > #{@last_imported_topic_id}
+        ORDER BY t.nodeid
+    SQL
+
+    create_topics(topics) do |row|
+      created_at = Time.zone.at(row[5])
+
+      title = normalize_text(row[1])
+
+      t = {
+        imported_id: row[0],
+        title: title,
+        category_id: category_id_from_imported_id(row[2]),
+        user_id: user_id_from_imported_id(row[4]),
+        closed: row[3] == 0,
+        created_at: created_at,
+        views: row[6],
+        visible: row[7] == 1,
+      }
+
+      t[:pinned_at] = created_at if row[8] == 1
+
+      t
+    end
+  end
+
+  def import_topic_first_posts
+    puts "Importing topic first posts..."
+
+    topics = mysql_stream <<-SQL
+      SELECT t.nodeid, t.parentid, t.userid,
+             t.publishdate, 1 AS visible, rawtext
+            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.parentid != 7
+             AND (t.unpublishdate = 0 OR t.unpublishdate IS NULL)
+             AND t.approved = 1 AND t.showapproved = 1
+             AND t.nodeid > #{@last_imported_topic_id}
+        ORDER BY t.nodeid
+    SQL
+
+    create_posts(topics) do |row|
+      next unless topic_id = topic_id_from_imported_id(row[0])
+      post = {
+        imported_id: row[0],
+        user_id: user_id_from_imported_id(row[2]) || -1,
+        topic_id: topic_id,
+        created_at: Time.zone.at(row[3]),
+        hidden: row[4] != 1,
+        raw: preprocess_raw(row[5]),
+      }
+
+      post
+    end
+  end
+
+  def import_replies
+    puts "Importing replies..."
+
+    posts = mysql_stream <<-SQL
+      SELECT p.nodeid, p.userid, p.parentid,
+             CONVERT(CAST(rawtext AS BINARY)USING utf8),
+             p.publishdate, 1 AS visible, p.parentid
+        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} AND p.nodeid > #{@last_imported_post_id}
+       ORDER BY p.nodeid
+    SQL
+
+    create_posts(posts) do |row|
+      next unless topic_id = topic_id_from_imported_id(row[2]) || topic_id_from_imported_id(row[0])
+      post = {
+        imported_id: row[0],
+        user_id: user_id_from_imported_id(row[1]) || -1,
+        topic_id: topic_id,
+        created_at: Time.zone.at(row[4]),
+        hidden: row[5] == 0,
+        raw: preprocess_raw(row[3]),
+      }
+
+      post
+    end
+  end
+
+  def import_likes
+    puts "Importing likes..."
+
+    @imported_likes = Set.new
+
+    post_likes = mysql_stream <<-SQL
+        SELECT nodeid, userid, dateline
+          FROM #{DB_PREFIX}reputation
+         WHERE nodeid > #{@last_imported_post_id}
+      ORDER BY nodeid
+    SQL
+
+    create_post_actions(post_likes) do |row|
+      post_id = post_id_from_imported_id(row[0])
+      user_id = user_id_from_imported_id(row[1])
+
+      next if post_id.nil? || user_id.nil?
+      next if @imported_likes.add?([post_id, user_id]).nil?
+
+      {
+        post_id: post_id,
+        user_id: user_id,
+        post_action_type_id: 2,
+        created_at: Time.zone.at(row[2])
+      }
+    end
+  end
+
+  def import_private_topics
+    puts "Importing private topics..."
+
+    topics = mysql_stream <<-SQL
+      SELECT t.nodeid, t.title, t.userid, t.publishdate AS dateline
+            FROM #{DB_PREFIX}node t
+       LEFT JOIN #{DB_PREFIX}privatemessage pm ON pm.nodeid = t.nodeid
+           WHERE pm.msgtype = 'message'
+             AND t.parentid = 8
+             AND t.nodeid > #{@last_imported_private_topic_id - PRIVATE_OFFSET}
+        ORDER BY t.nodeid
+    SQL
+
+    create_topics(topics) do |row|
+      title = row[1] || "No title given"
+      {
+        archetype: Archetype.private_message,
+        imported_id: row[0] + PRIVATE_OFFSET,
+        title: title,
+        user_id: user_id_from_imported_id(row[2]),
+        created_at: Time.zone.at(row[3]),
+      }
+
+    end
+  end
+
+  def import_topic_allowed_users
+    puts "Importing topic allowed users..."
+
+    allowed_users_sql = <<-SQL
+      SELECT p.nodeid, p.userid, p.parentid
+        FROM #{DB_PREFIX}node p
+        LEFT JOIN #{DB_PREFIX}privatemessage pm ON pm.nodeid = p.nodeid
+       WHERE pm.msgtype = 'message'
+       ORDER BY p.nodeid
+    SQL
+
+    added = 0
+
+    users_added = Set.new
+
+    create_topic_allowed_users(mysql_stream(allowed_users_sql)) do |row|
+      next unless topic_id = topic_id_from_imported_id(row[0] + PRIVATE_OFFSET) || topic_id_from_imported_id(row[2] + PRIVATE_OFFSET)
+      next unless user_id = user_id_from_imported_id(row[1])
+      next if users_added.add?([topic_id, user_id]).nil?
+      added += 1
+      {
+        topic_id: topic_id,
+        user_id: user_id,
+      }
+    end
+
+    puts '', "Added #{added} topic allowed users records."
+  end
+
+  def import_private_first_posts
+    puts "Importing private message first posts..."
+
+    posts = mysql_stream <<-SQL
+      SELECT p.nodeid, p.userid,
+             CONVERT(CAST(rawtext AS BINARY)USING utf8),
+             p.publishdate
+        FROM #{DB_PREFIX}node p
+        LEFT JOIN #{DB_PREFIX}text txt ON txt.nodeid = p.nodeid
+        LEFT JOIN #{DB_PREFIX}privatemessage pm ON pm.nodeid = p.nodeid
+       WHERE pm.msgtype = 'message'
+         AND p.parentid = 8
+         AND p.nodeid > #{@last_imported_private_post_id - PRIVATE_OFFSET}
+       ORDER BY p.nodeid
+    SQL
+
+    create_posts(posts) do |row|
+      {
+        imported_id: row[0] + PRIVATE_OFFSET,
+        topic_id: topic_id_from_imported_id(row[0] + PRIVATE_OFFSET),
+        user_id: user_id_from_imported_id(row[1]),
+        created_at: Time.zone.at(row[3]),
+        raw: preprocess_raw(row[2]),
+      }
+    end
+  end
+
+  def import_private_replies
+    puts "Importing private replies..."
+
+    posts = mysql_stream <<-SQL
+      SELECT p.nodeid, p.userid, p.parentid,
+             CONVERT(CAST(rawtext AS BINARY)USING utf8),
+             p.publishdate
+        FROM #{DB_PREFIX}node p
+        LEFT JOIN #{DB_PREFIX}text txt ON txt.nodeid = p.nodeid
+        LEFT JOIN #{DB_PREFIX}privatemessage pm ON pm.nodeid = p.nodeid
+       WHERE pm.msgtype = 'message'
+         AND p.parentid != 8
+         AND p.nodeid > #{@last_imported_private_post_id - PRIVATE_OFFSET}
+       ORDER BY p.nodeid
+    SQL
+
+    create_posts(posts) do |row|
+      {
+        imported_id: row[0] + PRIVATE_OFFSET,
+        topic_id: topic_id_from_imported_id(row[2] + PRIVATE_OFFSET),
+        user_id: user_id_from_imported_id(row[1]),
+        created_at: Time.zone.at(row[4]),
+        raw: preprocess_raw(row[3]),
+      }
+    end
+  end
+
+  def create_permalinks
+    puts '', 'creating permalinks...', ''
+
+    # add permalink normalizations to site settings
+    # EVERYTHING: /.*\/([\w-]+)$/\1 -- selects the last segment of the URL
+    # and matches in the permalink table
+
+    # create permalinks
+
+    Topic.listable_topics.find_each do |topic|
+      pcf = topic&.custom_fields
+      if pcf && pcf["import_id"]
+        id = pcf["import_id"]
+        url = "#{id}-#{topic.slug}"
+        Permalink.create(url: url, topic_id: topic.id) unless permalink_exists(url)
+      end
+    end
+
+    Category.find_each do |cat|
+      ccf = cat&.custom_fields
+      if ccf && ccf["import_id"]
+        url = cat.slug
+        Permalink.create(url: url, category_id: cat.id) unless permalink_exists(url)
+      end
+    end
+  end
+
+  def permalink_exists(url)
+    Permalink.find_by(url: url)
+  end
+
+  def check_database_for_attachment(row)
+    # check if attachment resides in the database & try to retrieve
+    if row[4].to_i == 0
+      puts "Attachment file #{row.inspect} doesn't exist"
+      return nil
+    end
+
+    tmpfile = 'attach_' + row[6].to_s
+    filename = File.join('/tmp/', tmpfile)
+    File.open(filename, 'wb') { |f| f.write(row[5]) }
+    filename
+  end
+
+  def find_upload(post, opts = {})
+    if opts[:node_id].present?
+      sql = "SELECT a.nodeid, n.parentid, a.filename, fd.userid, LENGTH(fd.filedata), 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
+              WHERE a.nodeid = #{opts[:node_id]}"
+    elsif opts[:attachment_id].present?
+      sql = "SELECT a.nodeid, n.parentid, a.filename, fd.userid, LENGTH(fd.filedata), filedata, fd.filedataid
+               FROM #{DB_PREFIX}attachment a
+               LEFT JOIN #{DB_PREFIX}filedata fd ON fd.filedataid = a.filedataid
+               LEFT JOIN #{DB_PREFIX}node n ON n.nodeid = a.nodeid
+              WHERE a.attachmentid = #{opts[:attachment_id]}"
+    end
+
+    results = mysql_query(sql)
+
+    unless row = results.first
+      puts "Couldn't find attachment record -- nodeid/filedataid = #{opts[:attachment_id] || opts[:filedata_id]} / post.id = #{post.id}"
+      return nil
+    end
+
+    attachment_id = row[6]
+    user_id = row[3]
+    db_filename = row[2]
+
+    filename = File.join(ATTACH_DIR, user_id.to_s.split('').join('/'), "#{attachment_id}.attach")
+    real_filename = db_filename
+    real_filename.prepend SecureRandom.hex if real_filename[0] == '.'
+
+    unless File.exists?(filename)
+      filename = check_database_for_attachment(row) if filename.blank?
+      return nil if filename.nil?
+    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
+    end
+
+    [upload, real_filename]
+  rescue Mysql2::Error => e
+    puts "SQL Error"
+    puts e.message
+    puts sql
+  end
+
+  def import_attachments
+    puts '', 'importing attachments...'
+
+    # add extensions to authorized setting
+    #ext = mysql_query("SELECT GROUP_CONCAT(DISTINCT(extension)) exts FROM #{DB_PREFIX}filedata").first[0].split(',')
+    #SiteSetting.authorized_extensions = (SiteSetting.authorized_extensions.split("|") + ext).uniq.join("|")
+
+    RateLimiter.disable
+    current_count = 0
+
+    total_count = Post.all.count
+
+    success_count = 0
+    fail_count = 0
+
+    # we need to match an older and newer style for inline attachment import
+    # new style matches the nodeid in the attach table
+    # old style matches the filedataid in attach/filedata tables
+    # if the site is very old, there may be multiple different attachment syntaxes used in posts
+    attachment_regex = /\[attach[^\]]*\].*\"data-attachmentid\":"?(\d+)"?,?.*\[\/attach\]/i
+    attachment_regex_oldstyle = /\[attach[^\]]*\](\d+)\[\/attach\]/i
+
+    Post.find_each do |post|
+      current_count += 1
+      print_status current_count, total_count
+
+      pcf = post.custom_fields
+      next if pcf && pcf["import_attachments"] && pcf["import_attachments"] == true
+
+      new_raw = post.raw.dup
+
+      # look for new style attachments
+      new_raw.gsub!(attachment_regex) do |s|
+        matches = attachment_regex.match(s)
+        node_id = matches[1]
+
+        upload, filename = find_upload(post, { node_id: node_id })
+
+        unless upload
+          fail_count += 1
+          next
+        end
+
+        html_for_upload(upload, filename)
+      end
+
+      # look for old style attachments
+      new_raw.gsub!(attachment_regex_oldstyle) do |s|
+        matches = attachment_regex_oldstyle.match(s)
+        attachment_id = matches[1]
+
+        upload, filename = find_upload(post, { attachment_id: attachment_id })
+
+        unless upload
+          fail_count += 1
+          next
+        end
+
+        html_for_upload(upload, filename)
+      end
+
+      if new_raw != post.raw
+        post.raw = new_raw
+        post.save(validate: false)
+        PostCustomField.create(post_id: post.id, name: "import_attachments", value: true)
+        success_count += 1
+      end
+    end
+
+    puts "", "imported #{success_count} attachments... failed: #{fail_count}"
+    RateLimiter.enable
+  end
+
+  def extract_pm_title(title)
+    normalize_text(title).scrub.gsub(/^Re\s*:\s*/i, "")
+  end
+
+  def parse_birthday(birthday)
+    return if birthday.blank?
+    date_of_birth = Date.strptime(birthday.gsub(/[^\d-]+/, ""), "%m-%d-%Y") rescue nil
+    return if date_of_birth.nil?
+    date_of_birth.year < 1904 ? Date.new(1904, date_of_birth.month, date_of_birth.day) : date_of_birth
+  end
+
+  def preprocess_raw(raw)
+    return "" if raw.nil?
+    raw = normalize_text(raw)
+    raw = raw.dup
+
+    # [PLAINTEXT]...[/PLAINTEXT]
+    raw.gsub!(/\[\/?PLAINTEXT\]/i, "\n\n```\n\n")
+
+    # [FONT=font]...[/FONT]
+    raw.gsub!(/\[FONT=\w*\]/im, "")
+    raw.gsub!(/\[\/FONT\]/im, "")
+
+    # @[URL=<user_profile>]<username>[/URL]
+    # [USER=id]username[/USER]
+    # [MENTION=id]username[/MENTION]
+    raw.gsub!(/@\[URL=\"\S+\"\]([\w\s]+)\[\/URL\]/i) { "@#{$1.gsub(" ", "_")}" }
+    raw.gsub!(/\[USER=\"\d+\"\]([\S]+)\[\/USER\]/i) { "@#{$1.gsub(" ", "_")}" }
+    raw.gsub!(/\[MENTION=\d+\]([\S]+)\[\/MENTION\]/i) { "@#{$1.gsub(" ", "_")}" }
+
+    # [IMG2=JSON]{..."src":"<url>"}[/IMG2]
+    raw.gsub!(/\[img2[^\]]*\].*\"src\":\"?([\w\\\/:\.\-;%]*)\"?}.*\[\/img2\]/i) { "\n#{CGI::unescape($1)}\n" }
+
+    # [TABLE]...[/TABLE]
+    raw.gsub!(/\[TABLE=\\"[\w:\-\s,]+\\"\]/i, "")
+    raw.gsub!(/\[\/TABLE\]/i, "")
+
+    # [HR]...[/HR]
+    raw.gsub(/\[HR\]\s*\[\/HR\]/im, "---")
+
+    # [VIDEO=youtube_share;<id>]...[/VIDEO]
+    # [VIDEO=vimeo;<id>]...[/VIDEO]
+    raw.gsub!(/\[VIDEO=YOUTUBE_SHARE;([^\]]+)\].*?\[\/VIDEO\]/i) { "\nhttps://www.youtube.com/watch?v=#{$1}\n" }
+    raw.gsub!(/\[VIDEO=VIMEO;([^\]]+)\].*?\[\/VIDEO\]/i) { "\nhttps://vimeo.com/#{$1}\n" }
+
+    raw
+  end
+
+  def print_status(current, max, start_time = nil)
+    if start_time.present?
+      elapsed_seconds = Time.now - start_time
+      elements_per_minute = '[%.0f items/min]  ' % [current / elapsed_seconds.to_f * 60]
+    else
+      elements_per_minute = ''
+    end
+
+    print "\r%9d / %d (%5.1f%%)  %s" % [current, max, current / max.to_f * 100, elements_per_minute]
+  end
+
+  def mysql_stream(sql)
+    @client.query(sql, stream: true)
+  end
+
+  def mysql_query(sql)
+    @client.query(sql)
+  end
+
+end
+
+BulkImport::VBulletin5.new.run
diff --git a/script/discourse b/script/discourse
index 7b4990215b..fce25d8127 100755
--- a/script/discourse
+++ b/script/discourse
@@ -43,7 +43,7 @@ class DiscourseCLI < Thor
     text = STDIN.gets
     if text.strip != "YES"
       puts "aborting."
-      exit
+      exit 1
     end
 
     if options[:global]
@@ -108,6 +108,7 @@ class DiscourseCLI < Thor
 
   desc "restore", "Restore a Discourse backup"
   option :disable_emails, type: :boolean, default: true
+  option :location, type: :string, enum: ["local", "s3"], desc: "Override the backup location"
   def restore(filename = nil)
 
     if File.exist?('/usr/local/bin/discourse')
@@ -124,7 +125,7 @@ class DiscourseCLI < Thor
     if !filename
       puts "You must provide a filename to restore. Did you mean one of the following?\n\n"
 
-      store = BackupRestore::BackupStore.create
+      store = BackupRestore::BackupStore.create(location: options[:location])
       store.files.each do |file|
         puts "#{discourse} restore #{file.filename}"
       end
@@ -138,6 +139,7 @@ class DiscourseCLI < Thor
         user_id: Discourse.system_user.id,
         filename: filename,
         disable_emails: options[:disable_emails],
+        location: options[:location],
         factory: BackupRestore::Factory.new(user_id: Discourse.system_user.id)
       )
       restorer.run
diff --git a/script/i18n_lint.rb b/script/i18n_lint.rb
old mode 100644
new mode 100755
index 298efbccaa..b00de75191
--- a/script/i18n_lint.rb
+++ b/script/i18n_lint.rb
@@ -31,7 +31,8 @@ class LocaleFileValidator
     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}:"
+    invalid_one_keys: "The following keys contain the number 1 instead of the interpolation key %{count}:",
+    invalid_message_format_one_key: "The following keys use 'one {1 foo}' instead of the generic 'one {# foo}':",
   }
 
   PLURALIZATION_KEYS = ['zero', 'one', 'two', 'few', 'many', 'other']
@@ -81,6 +82,7 @@ class LocaleFileValidator
     @errors[:invalid_relative_links] = []
     @errors[:invalid_relative_image_sources] = []
     @errors[:invalid_interpolation_key_format] = []
+    @errors[:invalid_message_format_one_key] = []
 
     each_translation(yaml) do |key, value|
       if value.match?(/href\s*=\s*["']\/[^\/]|\]\(\/[^\/]/i)
@@ -94,6 +96,10 @@ class LocaleFileValidator
       if value.match?(/{{.+?}}/) && !key.end_with?("_MF")
         @errors[:invalid_interpolation_key_format] << key
       end
+
+      if key.end_with?("_MF") && value.match?(/one {.*?1.*?}/)
+        @errors[:invalid_message_format_one_key] << key
+      end
     end
   end
 
@@ -110,7 +116,7 @@ class LocaleFileValidator
 
   def validate_pluralizations(yaml)
     @errors[:wrong_pluralization_keys] = []
-    @errors[:invald_one_keys] = []
+    @errors[:invalid_one_keys] = []
 
     each_pluralization(yaml) do |key, hash|
       # ignore errors from some ActiveRecord messages
@@ -120,7 +126,7 @@ class LocaleFileValidator
 
       one_value = hash['one']
       if one_value && one_value.include?('1') && !one_value.match?(/%{count}|{{count}}/)
-        @errors[:invald_one_keys] << key
+        @errors[:invalid_one_keys] << key
       end
     end
   end
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index bc780e6886..7bb49bcde9 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -104,7 +104,9 @@ class ImportScripts::Base
     end
 
     # Some changes that should not be rolled back after the script is done
-    SiteSetting.purge_unactivated_users_grace_period_days = 60
+    if SiteSetting.purge_unactivated_users_grace_period_days > 0
+      SiteSetting.purge_unactivated_users_grace_period_days = 60
+    end
     SiteSetting.purge_deleted_uploads_grace_period_days = 90
 
     RateLimiter.disable
@@ -606,10 +608,15 @@ class ImportScripts::Base
           skipped += 1
           puts "Skipping bookmark for user id #{params[:user_id]} and post id #{params[:post_id]}"
         else
-          result = BookmarkManager.new(user).create(post_id: post.id)
+          begin
+            manager = BookmarkManager.new(user)
+            bookmark = manager.create(post_id: post.id)
 
-          created += 1 if result.errors.none?
-          skipped += 1 if result.errors.any?
+            created += 1 if manager.errors.none?
+            skipped += 1 if manager.errors.any?
+          rescue
+            skipped += 1
+          end
         end
       end
 
@@ -737,6 +744,10 @@ class ImportScripts::Base
       WHERE u1.user_id = user_stats.user_id
         AND user_stats.topic_count <> sub.topic_count
     SQL
+
+    puts "", "Updating user digest_attempted_at..."
+
+    DB.exec("UPDATE user_stats SET digest_attempted_at = now() WHERE digest_attempted_at IS NULL")
   end
 
   # scripts that are able to import last_seen_at from the source data should override this method
diff --git a/script/import_scripts/base/lookup_container.rb b/script/import_scripts/base/lookup_container.rb
index 6c4169b916..caef17cd5a 100644
--- a/script/import_scripts/base/lookup_container.rb
+++ b/script/import_scripts/base/lookup_container.rb
@@ -57,6 +57,11 @@ module ImportScripts
       UserCustomField.where(name: 'import_id', value: import_id.to_s).first.try(:user)
     end
 
+    def find_username_by_import_id(import_id)
+      user_id = user_id_from_imported_user_id(import_id)
+      User.where(id: user_id).pluck(:username).first if user_id.present?
+    end
+
     # Get the Discourse Category id based on the id of the source category
     def category_id_from_imported_category_id(import_id)
       @categories[import_id] || @categories[import_id.to_s]
diff --git a/script/import_scripts/csv_restore_staged_users.rb b/script/import_scripts/csv_restore_staged_users.rb
new file mode 100755
index 0000000000..2145bcc351
--- /dev/null
+++ b/script/import_scripts/csv_restore_staged_users.rb
@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require "csv"
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
+
+# Edit the constants and initialize method for your import data.
+
+class ImportScripts::CsvRestoreStagedUsers < ImportScripts::Base
+
+  CSV_FILE_PATH = ENV['CSV_USER_FILE']
+  CSV_CUSTOM_FIELDS = ENV['CSV_CUSTOM_FIELDS']
+  CSV_EMAILS = ENV['CSV_EMAILS']
+
+  BATCH_SIZE ||= 1000
+
+  def initialize
+    super
+
+    @imported_users = load_csv(CSV_FILE_PATH)
+    @imported_emails = load_csv(CSV_EMAILS)
+    @imported_custom_fields = load_csv(CSV_CUSTOM_FIELDS)
+    @skip_updates = true
+  end
+
+  def execute
+    puts "", "Importing from CSV file..."
+
+    import_users
+
+    puts "", "Done"
+  end
+
+  def load_csv(path)
+    CSV.parse(File.read(path), headers: true)
+  end
+
+  def username_for(name)
+    result = name.downcase.gsub(/[^a-z0-9\-\_]/, '')
+
+    if result.blank?
+      result = Digest::SHA1.hexdigest(name)[0...10]
+    end
+
+    result
+  end
+
+  def get_email(id)
+    email = nil
+    @imported_emails.each do |e|
+      if e["user_id"] == id
+        email = e["email"]
+      end
+    end
+    email
+  end
+
+  def get_custom_fields(id)
+    custom_fields = {}
+    @imported_custom_fields.each do |cf|
+      if cf["user_id"] == id
+        custom_fields[cf["name"]] = cf["value"]
+      end
+    end
+    custom_fields
+  end
+
+  def import_users
+    puts '', "Importing users"
+
+    users = []
+    @imported_users.each do |u|
+      email = get_email(u['id'])
+      custom_fields = get_custom_fields(u['id'])
+      u['email'] = email
+      u['custom_fields'] = custom_fields
+      users << u
+    end
+    users.uniq!
+
+    create_users(users) do |u|
+      {
+        id: u['id'],
+        username: u['username'],
+        email: u['email'],
+        created_at: u['created_at'],
+        staged: u['staged'],
+        custom_fields: u['custom_fields'],
+      }
+    end
+  end
+
+end
+
+if __FILE__ == $0
+  ImportScripts::CsvRestoreStagedUsers.new.perform
+end
diff --git a/script/import_scripts/higher_logic.rb b/script/import_scripts/higher_logic.rb
new file mode 100644
index 0000000000..1f5b1d9599
--- /dev/null
+++ b/script/import_scripts/higher_logic.rb
@@ -0,0 +1,231 @@
+# frozen_string_literal: true
+
+require "mysql2"
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
+
+class ImportScripts::HigherLogic < ImportScripts::Base
+
+  HIGHERLOGIC_DB = "higherlogic"
+  BATCH_SIZE = 1000
+  ATTACHMENT_DIR = "/shared/import/data/attachments"
+
+  def initialize
+    super
+
+    @client = Mysql2::Client.new(
+      host: "localhost",
+      username: "root",
+      database: HIGHERLOGIC_DB
+    )
+  end
+
+  def execute
+    import_groups
+    import_users
+    import_group_users
+    import_categories
+    import_posts
+    import_attachments
+  end
+
+  def import_groups
+    puts '', 'importing groups'
+
+    groups = mysql_query <<-SQL
+        SELECT CommunityKey, CommunityName
+          FROM Community
+      ORDER BY CommunityName
+    SQL
+
+    create_groups(groups) do |group|
+      {
+        id: group['CommunityKey'],
+        name: group['CommunityName']
+      }
+    end
+  end
+
+  def import_users
+    puts '', 'importing users'
+    total_count = mysql_query("SELECT count(*) FROM Contact").first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      results = mysql_query <<-SQL
+        SELECT ContactKey, FirstName, LastName, EmailAddress, HLAdminFlag, UserStatus, CreatedOn, Birthday, Bio
+          FROM Contact
+         LIMIT #{BATCH_SIZE}
+        OFFSET #{offset}
+      SQL
+
+      break if results.size < 1
+
+      next if all_records_exist? :users, results.map { |u| u['ContactKey'] }
+
+      create_users(results, total: total_count, offset: offset) do |user|
+        next if user['EmailAddress'].blank?
+        {
+          id: user['ContactKey'],
+          email: user['EmailAddress'],
+          name: "#{user['FirstName']} #{user['LastName']}",
+          created_at: user['CreatedOn'] == nil ? 0 : Time.zone.at(user['CreatedOn']),
+          bio_raw: user['Bio'],
+          active: user['UserStatus'] == "Active",
+          admin: user['HLAdminFlag'] == 1
+        }
+      end
+    end
+  end
+
+  def import_group_users
+    puts '', 'importing group users'
+
+    group_users = mysql_query(<<-SQL
+      SELECT CommunityKey, ContactKey
+        FROM CommunityMember
+    SQL
+    ).to_a
+
+    group_users.each do |row|
+      next unless user_id = user_id_from_imported_user_id(row['ContactKey'])
+      next unless group_id = group_id_from_imported_group_id(row['CommunityKey'])
+      puts '', '.'
+
+      GroupUser.find_or_create_by(user_id: user_id, group_id: group_id)
+    end
+  end
+
+  def import_categories
+    puts '', 'importing categories'
+
+    categories = mysql_query <<-SQL
+      SELECT DiscussionKey, DiscussionName
+        FROM Discussion
+    SQL
+
+    create_categories(categories) do |category|
+      {
+        id: category['DiscussionKey'],
+        name: category['DiscussionName']
+      }
+    end
+  end
+
+  def import_posts
+    puts '', 'importing topics and posts'
+    total_count = mysql_query("SELECT count(*) FROM DiscussionPost").first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      results = mysql_query <<-SQL
+          SELECT MessageKey,
+                 ParentMessageKey,
+                 Subject,
+                 ContactKey,
+                 DiscussionKey,
+                 PinnedFlag,
+                 Body,
+                 CreatedOn
+            FROM DiscussionPost
+           WHERE CreatedOn > '2020-01-01 00:00:00'
+           LIMIT #{BATCH_SIZE}
+          OFFSET #{offset}
+      SQL
+
+      break if results.size < 1
+      next if all_records_exist? :posts, results.map { |p| p['MessageKey'] }
+
+      create_posts(results, total: total_count, offset: offset) do |post|
+        raw = preprocess_raw(post['Body'])
+        mapped = {
+          id: post['MessageKey'],
+          user_id: user_id_from_imported_user_id(post['ContactKey']),
+          raw: raw,
+          created_at: Time.zone.at(post['CreatedOn']),
+        }
+
+        if post['ParentMessageKey'].nil?
+          mapped[:category] = category_id_from_imported_category_id(post['DiscussionKey']).to_i
+          mapped[:title] = CGI.unescapeHTML(post['Subject'])
+          mapped[:pinned] = post['PinnedFlag'] == 1
+        else
+          topic = topic_lookup_from_imported_post_id(post['ParentMessageKey'])
+
+          if topic.present?
+            mapped[:topic_id] = topic[:topic_id]
+          else
+            puts "Parent post #{post['ParentMessageKey']} doesn't exist. Skipping."
+            next
+          end
+        end
+
+        mapped
+      end
+    end
+  end
+
+  def import_attachments
+    puts '', 'importing attachments'
+
+    count = 0
+
+    total_attachments = mysql_query(<<-SQL
+      SELECT COUNT(*) count
+        FROM LibraryEntryFile l
+        JOIN DiscussionPost p ON p.AttachmentDocumentKey = l.DocumentKey
+       WHERE p.CreatedOn > '2020-01-01 00:00:00'
+    SQL
+    ).first['count']
+
+    batches(BATCH_SIZE) do |offset|
+      attachments = mysql_query(<<-SQL
+           SELECT l.VersionName,
+                  l.FileExtension,
+                  p.MessageKey
+             FROM LibraryEntryFile l
+        LEFT JOIN DiscussionPost p ON p.AttachmentDocumentKey = l.DocumentKey
+            WHERE p.CreatedOn > '2020-01-01 00:00:00'
+            LIMIT #{BATCH_SIZE}
+           OFFSET #{offset}
+      SQL
+      ).to_a
+
+      break if attachments.empty?
+
+      attachments.each do |a|
+        print_status(count += 1, total_attachments, get_start_time("attachments"))
+        original_filename = "#{a['VersionName']}.#{a['FileExtension']}"
+        path = File.join(ATTACHMENT_DIR, original_filename)
+
+        if File.exists?(path)
+          if post = Post.find(post_id_from_imported_post_id(a['MessageKey']))
+            filename = File.basename(original_filename)
+            upload = create_upload(post.user.id, path, filename)
+
+            if upload&.persisted?
+              html = html_for_upload(upload, filename)
+
+              post.raw << "\n\n" << html
+              post.save!
+              PostUpload.create!(post: post, upload: upload) unless PostUpload.where(post: post, upload: upload).exists?
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def preprocess_raw(body)
+    raw = body.dup
+
+    # trim off any post text beyond ---- to remove email threading
+    raw = raw.slice(0..(raw.index('------'))) || raw
+
+    raw = HtmlToMarkdown.new(raw).to_markdown
+    raw
+  end
+
+  def mysql_query(sql)
+    @client.query(sql, cache_rows: false)
+  end
+end
+
+ImportScripts::HigherLogic.new.perform
diff --git a/script/import_scripts/mbox/support/indexer.rb b/script/import_scripts/mbox/support/indexer.rb
index dc6e092c29..47ce3ed133 100644
--- a/script/import_scripts/mbox/support/indexer.rb
+++ b/script/import_scripts/mbox/support/indexer.rb
@@ -160,9 +160,7 @@ module ImportScripts::Mbox
       last_line_number = 0
 
       each_line(filename) do |line|
-        line = line.scrub
-
-        if line =~ @split_regex
+        if line.scrub =~ @split_regex
           if last_line_number > 0
             yield raw_message, first_line_number, last_line_number
             raw_message = +''
diff --git a/script/import_scripts/phpbb3/database/database.rb b/script/import_scripts/phpbb3/database/database.rb
index 6b34febffc..725d932ab8 100644
--- a/script/import_scripts/phpbb3/database/database.rb
+++ b/script/import_scripts/phpbb3/database/database.rb
@@ -22,13 +22,13 @@ module ImportScripts::PhpBB3
       if version.start_with?('3.0')
         require_relative 'database_3_0'
         Database_3_0.new(@database_client, @database_settings)
-      elsif version.start_with?('3.1')
+      elsif version.start_with?('3.1') || version.start_with?('3.2')
         require_relative 'database_3_1'
         Database_3_1.new(@database_client, @database_settings)
       else
         raise UnsupportedVersionError, <<~MSG
           Unsupported version (#{version}) of phpBB detected.
-          Currently only 3.0.x and 3.1.x are supported by this importer.
+          Currently only version 3.0, 3.1 and 3.2 are supported by this importer.
         MSG
       end
     end
diff --git a/script/import_scripts/phpbb3/database/database_3_0.rb b/script/import_scripts/phpbb3/database/database_3_0.rb
index 0799b92ba7..a69a9f9fe2 100644
--- a/script/import_scripts/phpbb3/database/database_3_0.rb
+++ b/script/import_scripts/phpbb3/database/database_3_0.rb
@@ -53,6 +53,20 @@ module ImportScripts::PhpBB3
       SQL
     end
 
+    def fetch_groups
+      query(<<-SQL)
+        SELECT g.group_id, g.group_type, g.group_name, g.group_desc
+        FROM #{@table_prefix}groups g
+      SQL
+    end
+
+    def fetch_group_users
+      query(<<-SQL)
+        SELECT ug.group_id, ug.user_id, ug.group_leader
+        FROM #{@table_prefix}user_group ug
+      SQL
+    end
+
     def fetch_categories
       query(<<-SQL)
         SELECT f.forum_id, f.parent_id, f.forum_name, f.forum_desc, x.first_post_time
@@ -213,12 +227,20 @@ module ImportScripts::PhpBB3
         SELECT b.user_id, t.topic_first_post_id
         FROM #{@table_prefix}bookmarks b
           JOIN #{@table_prefix}topics t ON (b.topic_id = t.topic_id)
-        WHERE b.user_id > #{last_user_id} AND b.topic_id > #{last_topic_id}
+        WHERE b.user_id > #{last_user_id}
         ORDER BY b.user_id, b.topic_id
         LIMIT #{@batch_size}
       SQL
     end
 
+    def get_smiley(smiley_code)
+      query(<<-SQL).first
+        SELECT emotion, smiley_url
+        FROM #{@table_prefix}smilies
+        WHERE code = '#{smiley_code}'
+      SQL
+    end
+
     def get_config_values
       query(<<-SQL).first
         SELECT
diff --git a/script/import_scripts/phpbb3/importer.rb b/script/import_scripts/phpbb3/importer.rb
index ca3274002c..f9ee6e04b9 100644
--- a/script/import_scripts/phpbb3/importer.rb
+++ b/script/import_scripts/phpbb3/importer.rb
@@ -27,8 +27,13 @@ module ImportScripts::PhpBB3
     def execute
       puts '', "importing from phpBB #{@php_config[:phpbb_version]}"
 
+      SiteSetting.tagging_enabled = true if @settings.tag_mappings.present?
+
       import_users
       import_anonymous_users if @settings.import_anonymous_users
+      import_groups
+      import_user_groups
+      import_new_categories
       import_categories
       import_posts
       import_private_messages if @settings.import_private_messages
@@ -67,12 +72,12 @@ module ImportScripts::PhpBB3
 
       batches do |offset|
         rows, last_user_id = @database.fetch_users(last_user_id)
+        rows = rows.to_a.uniq { |row| row[:user_id] }
         break if rows.size < 1
 
-        next if all_records_exist?(:users, importer.map_users_to_import_ids(rows))
-
         create_users(rows, total: total_count, offset: offset) do |row|
           begin
+            next if user_id_from_imported_user_id(@settings.prefix(row[:user_id]))
             importer.map_user(row)
           rescue => e
             log_error("Failed to map user with ID #{row[:user_id]}", e)
@@ -91,10 +96,9 @@ module ImportScripts::PhpBB3
         rows, last_username = @database.fetch_anonymous_users(last_username)
         break if rows.size < 1
 
-        next if all_records_exist?(:users, importer.map_anonymous_users_to_import_ids(rows))
-
         create_users(rows, total: total_count, offset: offset) do |row|
           begin
+            next if user_id_from_imported_user_id(@settings.prefix(row[:post_username]))
             importer.map_anonymous_user(row)
           rescue => e
             log_error("Failed to map anonymous user with ID #{row[:user_id]}", e)
@@ -103,12 +107,74 @@ module ImportScripts::PhpBB3
       end
     end
 
+    def import_groups
+      puts '', 'creating groups'
+      rows = @database.fetch_groups
+
+      create_groups(rows) do |row|
+        begin
+          next if row[:group_type] == 3
+
+          group_name = if @settings.site_name.present?
+            "#{@settings.site_name}_#{row[:group_name]}"
+          else
+            row[:group_name]
+          end[0..19].gsub(/[^a-zA-Z0-9\-_. ]/, '_')
+
+          bio_raw = @importers.text_processor.process_raw_text(row[:group_desc]) rescue row[:group_desc]
+
+          {
+            id: @settings.prefix(row[:group_id]),
+            name: group_name,
+            full_name: row[:group_name],
+            bio_raw: bio_raw
+          }
+        rescue => e
+          log_error("Failed to map group with ID #{row[:group_id]}", e)
+        end
+      end
+    end
+
+    def import_user_groups
+      puts '', 'creating user groups'
+      rows = @database.fetch_group_users
+
+      rows.each do |row|
+        group_id = @lookup.group_id_from_imported_group_id(@settings.prefix(row[:group_id]))
+        next if !group_id
+
+        user_id = @lookup.user_id_from_imported_user_id(@settings.prefix(row[:user_id]))
+
+        begin
+          GroupUser.find_or_create_by(user_id: user_id, group_id: group_id, owner: row[:group_leader])
+        rescue => e
+          log_error("Failed to add user #{row[:user_id]} to group #{row[:group_id]}", e)
+        end
+      end
+    end
+
+    def import_new_categories
+      puts '', 'creating new categories'
+
+      create_categories(@settings.new_categories) do |row|
+        next if row == "SKIP"
+
+        {
+          id: @settings.prefix(row[:forum_id]),
+          name: row[:name],
+          parent_category_id: @lookup.category_id_from_imported_category_id(@settings.prefix(row[:parent_id]))
+        }
+      end
+    end
+
     def import_categories
       puts '', 'creating categories'
       rows = @database.fetch_categories
       importer = @importers.category_importer
 
       create_categories(rows) do |row|
+        next if @settings.category_mappings[row[:forum_id].to_s] == 'SKIP'
+
         importer.map_category(row)
       end
     end
@@ -123,10 +189,9 @@ module ImportScripts::PhpBB3
         rows, last_post_id = @database.fetch_posts(last_post_id)
         break if rows.size < 1
 
-        next if all_records_exist?(:posts, importer.map_to_import_ids(rows))
-
         create_posts(rows, total: total_count, offset: offset) do |row|
           begin
+            next if post_id_from_imported_post_id(@settings.prefix(row[:post_id]))
             importer.map_post(row)
           rescue => e
             log_error("Failed to map post with ID #{row[:post_id]}", e)
@@ -145,10 +210,9 @@ module ImportScripts::PhpBB3
         rows, last_msg_id = @database.fetch_messages(last_msg_id)
         break if rows.size < 1
 
-        next if all_records_exist?(:posts, importer.map_to_import_ids(rows))
-
         create_posts(rows, total: total_count, offset: offset) do |row|
           begin
+            next if post_id_from_imported_post_id(@settings.prefix("pm:#{row[:msg_id]}"))
             importer.map_message(row)
           rescue => e
             log_error("Failed to map message with ID #{row[:msg_id]}", e)
@@ -168,7 +232,11 @@ module ImportScripts::PhpBB3
         break if rows.size < 1
 
         create_bookmarks(rows, total: total_count, offset: offset) do |row|
-          importer.map_bookmark(row)
+          begin
+            importer.map_bookmark(row)
+          rescue => e
+            log_error("Failed to map bookmark (#{row[:user_id]}, #{row[:topic_first_post_id]})", e)
+          end
         end
       end
     end
diff --git a/script/import_scripts/phpbb3/importers/bookmark_importer.rb b/script/import_scripts/phpbb3/importers/bookmark_importer.rb
index 49c3799a09..784e6c7476 100644
--- a/script/import_scripts/phpbb3/importers/bookmark_importer.rb
+++ b/script/import_scripts/phpbb3/importers/bookmark_importer.rb
@@ -2,10 +2,14 @@
 
 module ImportScripts::PhpBB3
   class BookmarkImporter
+    def initialize(settings)
+      @settings = settings
+    end
+
     def map_bookmark(row)
       {
-        user_id: row[:user_id],
-        post_id: row[:topic_first_post_id]
+        user_id: @settings.prefix(row[:user_id]),
+        post_id: @settings.prefix(row[:topic_first_post_id])
       }
     end
   end
diff --git a/script/import_scripts/phpbb3/importers/category_importer.rb b/script/import_scripts/phpbb3/importers/category_importer.rb
index 1d4cbaa60c..d7ad577ff3 100644
--- a/script/import_scripts/phpbb3/importers/category_importer.rb
+++ b/script/import_scripts/phpbb3/importers/category_importer.rb
@@ -5,20 +5,28 @@ module ImportScripts::PhpBB3
     # @param lookup [ImportScripts::LookupContainer]
     # @param text_processor [ImportScripts::PhpBB3::TextProcessor]
     # @param permalink_importer [ImportScripts::PhpBB3::PermalinkImporter]
-    def initialize(lookup, text_processor, permalink_importer)
+    # @param settings [ImportScripts::PhpBB3::Settings]
+    def initialize(lookup, text_processor, permalink_importer, settings)
       @lookup = lookup
       @text_processor = text_processor
       @permalink_importer = permalink_importer
+      @settings = settings
     end
 
     def map_category(row)
+      return if @settings.category_mappings[row[:forum_id].to_s]
+
+      if row[:parent_id] && @settings.category_mappings[row[:parent_id].to_s]
+        puts "parent category (#{row[:parent_id]}) was mapped, but children was not (#{row[:forum_id]})"
+      end
+
       {
-        id: row[:forum_id],
+        id: @settings.prefix(row[:forum_id]),
         name: CGI.unescapeHTML(row[:forum_name]),
-        parent_category_id: @lookup.category_id_from_imported_category_id(row[:parent_id]),
+        parent_category_id: @lookup.category_id_from_imported_category_id(@settings.prefix(row[:parent_id])),
         post_create_action: proc do |category|
           update_category_description(category, row)
-          @permalink_importer.create_for_category(category, row[:forum_id])
+          @permalink_importer.create_for_category(category, row[:forum_id]) # skip @settings.prefix because ID is used in permalink generation
         end
       }
     end
@@ -43,7 +51,7 @@ module ImportScripts::PhpBB3
       end
 
       if row[:forum_desc].present?
-        changes = { raw: @text_processor.process_raw_text(row[:forum_desc]) }
+        changes = { raw: (@text_processor.process_raw_text(row[:forum_desc]) rescue row[:forum_desc]) }
         opts = { revised_at: post.created_at, bypass_bump: true }
         post.revise(Discourse.system_user, changes, opts)
       end
diff --git a/script/import_scripts/phpbb3/importers/importer_factory.rb b/script/import_scripts/phpbb3/importers/importer_factory.rb
index dffb4c4f7f..b02cb92ff0 100644
--- a/script/import_scripts/phpbb3/importers/importer_factory.rb
+++ b/script/import_scripts/phpbb3/importers/importer_factory.rb
@@ -32,7 +32,7 @@ module ImportScripts::PhpBB3
     end
 
     def category_importer
-      CategoryImporter.new(@lookup, text_processor, permalink_importer)
+      CategoryImporter.new(@lookup, text_processor, permalink_importer, @settings)
     end
 
     def post_importer
@@ -44,15 +44,13 @@ module ImportScripts::PhpBB3
     end
 
     def bookmark_importer
-      BookmarkImporter.new
+      BookmarkImporter.new(@settings)
     end
 
     def permalink_importer
       @permalink_importer ||= PermalinkImporter.new(@settings.permalinks)
     end
 
-    protected
-
     def attachment_importer
       AttachmentImporter.new(@database, @uploader, @settings, @phpbb_config)
     end
@@ -62,15 +60,15 @@ module ImportScripts::PhpBB3
     end
 
     def poll_importer
-      PollImporter.new(@lookup, @database, text_processor)
+      PollImporter.new(@lookup, @database, text_processor, @settings)
     end
 
     def text_processor
-      @text_processor ||= TextProcessor.new(@lookup, @database, smiley_processor, @settings)
+      @text_processor ||= TextProcessor.new(@lookup, @database, smiley_processor, @settings, @phpbb_config)
     end
 
     def smiley_processor
-      SmileyProcessor.new(@uploader, @settings, @phpbb_config)
+      SmileyProcessor.new(@uploader, @database, @settings, @phpbb_config)
     end
   end
 end
diff --git a/script/import_scripts/phpbb3/importers/message_importer.rb b/script/import_scripts/phpbb3/importers/message_importer.rb
index 8f8218d732..efdcd9d123 100644
--- a/script/import_scripts/phpbb3/importers/message_importer.rb
+++ b/script/import_scripts/phpbb3/importers/message_importer.rb
@@ -20,7 +20,7 @@ module ImportScripts::PhpBB3
     end
 
     def map_message(row)
-      user_id = @lookup.user_id_from_imported_user_id(row[:author_id]) || Discourse.system_user.id
+      user_id = @lookup.user_id_from_imported_user_id(@settings.prefix(row[:author_id])) || Discourse.system_user.id
       attachments = import_attachments(row, user_id)
 
       mapped = {
@@ -84,7 +84,7 @@ module ImportScripts::PhpBB3
       import_user_ids = get_recipient_user_ids(row[:to_address])
 
       import_user_ids.map! do |import_user_id|
-        @lookup.find_user_by_import_id(import_user_id).try(:username)
+        @lookup.find_user_by_import_id(@settings.prefix(import_user_id)).try(:username)
       end.compact
     end
 
@@ -93,7 +93,7 @@ module ImportScripts::PhpBB3
     end
 
     def get_import_id(msg_id)
-      "pm:#{msg_id}"
+      @settings.prefix("pm:#{msg_id}")
     end
 
     # Creates a sorted array consisting of the message's author and recipients.
diff --git a/script/import_scripts/phpbb3/importers/permalink_importer.rb b/script/import_scripts/phpbb3/importers/permalink_importer.rb
index 5afd18e905..051604ba87 100644
--- a/script/import_scripts/phpbb3/importers/permalink_importer.rb
+++ b/script/import_scripts/phpbb3/importers/permalink_importer.rb
@@ -39,7 +39,7 @@ module ImportScripts::PhpBB3
     end
 
     def create_for_post(post, import_id)
-      return unless @settings.create_topic_links && post
+      return unless @settings.create_post_links && post
 
       url = "viewtopic.php?p=#{import_id}"
 
diff --git a/script/import_scripts/phpbb3/importers/poll_importer.rb b/script/import_scripts/phpbb3/importers/poll_importer.rb
index 82066bf3de..fe43ffe65c 100644
--- a/script/import_scripts/phpbb3/importers/poll_importer.rb
+++ b/script/import_scripts/phpbb3/importers/poll_importer.rb
@@ -5,10 +5,12 @@ module ImportScripts::PhpBB3
     # @param lookup [ImportScripts::LookupContainer]
     # @param database [ImportScripts::PhpBB3::Database_3_0 | ImportScripts::PhpBB3::Database_3_1]
     # @param text_processor [ImportScripts::PhpBB3::TextProcessor]
-    def initialize(lookup, database, text_processor)
+    # @param settings [ImportScripts::PhpBB3::Settings]
+    def initialize(lookup, database, text_processor, settings)
       @lookup = lookup
       @database = database
       @text_processor = text_processor
+      @settings = settings
     end
 
     # @param poll_data [ImportScripts::PhpBB3::PollData]
@@ -47,7 +49,7 @@ module ImportScripts::PhpBB3
     end
 
     def get_option_text(row)
-      text = @text_processor.process_raw_text(row[:poll_option_text])
+      text = @text_processor.process_raw_text(row[:poll_option_text]) rescue row[:poll_option_text]
       text.squish!
       text.gsub!(/^(\d+)\./, '\1\.')
       text
@@ -55,7 +57,7 @@ module ImportScripts::PhpBB3
 
     # @param poll_data [ImportScripts::PhpBB3::PollData]
     def get_poll_text(poll_data)
-      title = @text_processor.process_raw_text(poll_data.title)
+      title = @text_processor.process_raw_text(poll_data.title) rescue poll_data.title
       text = +"#{title}\n\n"
 
       arguments = ["results=always"]
@@ -118,7 +120,7 @@ module ImportScripts::PhpBB3
 
       rows.each do |row|
         option_id = mapped_option_ids[row[:poll_option_id]]
-        user_id = @lookup.user_id_from_imported_user_id(row[:user_id])
+        user_id = @lookup.user_id_from_imported_user_id(@settings.prefix(row[:user_id]))
 
         if option_id.present? && user_id.present?
           PollVote.create!(poll: poll, poll_option_id: option_id, user_id: user_id)
diff --git a/script/import_scripts/phpbb3/importers/post_importer.rb b/script/import_scripts/phpbb3/importers/post_importer.rb
index c0c0ee15a7..8355835568 100644
--- a/script/import_scripts/phpbb3/importers/post_importer.rb
+++ b/script/import_scripts/phpbb3/importers/post_importer.rb
@@ -18,22 +18,24 @@ module ImportScripts::PhpBB3
     end
 
     def map_to_import_ids(rows)
-      rows.map { |row| row[:post_id] }
+      rows.map { |row| @settings.prefix(row[:post_id]) }
     end
 
     def map_post(row)
-      imported_user_id = row[:post_username].blank? ? row[:poster_id] : row[:post_username]
+      return if @settings.category_mappings[row[:forum_id].to_s] == 'SKIP'
+
+      imported_user_id = @settings.prefix(row[:post_username].blank? ? row[:poster_id] : row[:post_username])
       user_id = @lookup.user_id_from_imported_user_id(imported_user_id) || -1
       is_first_post = row[:post_id] == row[:topic_first_post_id]
 
       attachments = import_attachments(row, user_id)
 
       mapped = {
-        id: row[:post_id],
+        id: @settings.prefix(row[:post_id]),
         user_id: user_id,
         created_at: Time.zone.at(row[:post_time]),
         raw: @text_processor.process_post(row[:post_text], attachments),
-        import_topic_id: row[:topic_id]
+        import_topic_id: @settings.prefix(row[:topic_id])
       }
 
       if is_first_post
@@ -54,14 +56,18 @@ module ImportScripts::PhpBB3
     def map_first_post(row, mapped)
       poll_data = add_poll(row, mapped) if @settings.import_polls
 
-      mapped[:category] = @lookup.category_id_from_imported_category_id(row[:forum_id])
+      mapped[:category] = @lookup.category_id_from_imported_category_id(@settings.prefix(@settings.category_mappings[row[:forum_id].to_s])) ||
+                          @lookup.category_id_from_imported_category_id(@settings.prefix(row[:forum_id]))
       mapped[:title] = CGI.unescapeHTML(row[:topic_title]).strip[0...255]
       mapped[:pinned_at] = mapped[:created_at] unless row[:topic_type] == Constants::POST_NORMAL
       mapped[:pinned_globally] = row[:topic_type] == Constants::POST_GLOBAL
       mapped[:views] = row[:topic_views]
       mapped[:post_create_action] = proc do |post|
-        @permalink_importer.create_for_topic(post.topic, row[:topic_id])
-        @permalink_importer.create_for_post(post, row[:post_id])
+        if tags = @settings.tag_mappings[row[:forum_id].to_s].presence
+          DiscourseTagging.tag_topic_by_names(post.topic, staff_guardian, tags)
+        end
+        @permalink_importer.create_for_topic(post.topic, row[:topic_id]) # skip @settings.prefix because ID is used in permalink generation
+        @permalink_importer.create_for_post(post, row[:post_id]) # skip @settings.prefix because ID is used in permalink generation
         @poll_importer.update_poll(row[:topic_id], post, poll_data) if poll_data
         TopicViewItem.add(post.topic_id, row[:poster_ip], post.user_id, post.created_at, true)
       end
@@ -70,16 +76,16 @@ module ImportScripts::PhpBB3
     end
 
     def map_other_post(row, mapped)
-      parent = @lookup.topic_lookup_from_imported_post_id(row[:topic_first_post_id])
+      parent = @lookup.topic_lookup_from_imported_post_id(@settings.prefix(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]}"
+        puts "Parent post #{@settings.prefix(row[:topic_first_post_id])} doesn't exist. Skipping #{@settings.prefix(row[:post_id])}: #{row[:topic_title][0..40]}"
         return nil
       end
 
       mapped[:topic_id] = parent[:topic_id]
       mapped[:post_create_action] = proc do |post|
-        @permalink_importer.create_for_post(post, row[:post_id])
+        @permalink_importer.create_for_post(post, row[:post_id]) # skip @settings.prefix because ID is used in permalink generation
         TopicViewItem.add(post.topic_id, row[:poster_ip], post.user_id, post.created_at, true)
       end
 
@@ -91,9 +97,14 @@ module ImportScripts::PhpBB3
 
       poll_data = PollData.new(row[:poll_title], row[:poll_max_options], row[:poll_end])
       poll_raw = @poll_importer.create_raw(row[:topic_id], poll_data)
+      return if poll_data.options.size < 2
 
       mapped_post[:raw] = poll_raw << "\n\n" << mapped_post[:raw]
       poll_data
     end
+
+    def staff_guardian
+      @_staff_guardian ||= Guardian.new(Discourse.system_user)
+    end
   end
 end
diff --git a/script/import_scripts/phpbb3/importers/user_importer.rb b/script/import_scripts/phpbb3/importers/user_importer.rb
index 80655006e1..bf12bbc5d6 100644
--- a/script/import_scripts/phpbb3/importers/user_importer.rb
+++ b/script/import_scripts/phpbb3/importers/user_importer.rb
@@ -12,14 +12,18 @@ module ImportScripts::PhpBB3
     end
 
     def map_users_to_import_ids(rows)
-      rows.map { |row| row[:user_id] }
+      rows.map { |row| @settings.prefix(row[:user_id]) }
     end
 
     def map_user(row)
       is_active_user = row[:user_inactive_reason] != Constants::INACTIVE_REGISTER
 
+      trust_level = row[:user_posts] == 0 ? TrustLevel[0] : TrustLevel[1]
+      trust_level = @settings.trust_level_for_posts(row[:user_posts], trust_level: trust_level)
+      manual_locked_trust_level = trust_level > TrustLevel[1] ? trust_level : nil
+
       {
-        id: row[:user_id],
+        id: @settings.prefix(row[:user_id]),
         email: row[:user_email],
         username: row[:username],
         password: @settings.import_passwords ? row[:user_password] : nil,
@@ -28,7 +32,8 @@ module ImportScripts::PhpBB3
         last_seen_at: row[:user_lastvisit] == 0 ? Time.zone.at(row[:user_regdate]) : Time.zone.at(row[:user_lastvisit]),
         registration_ip_address: (IPAddr.new(row[:user_ip]) rescue nil),
         active: is_active_user,
-        trust_level: row[:user_posts] == 0 ? TrustLevel[0] : TrustLevel[1],
+        trust_level: trust_level,
+        manual_locked_trust_level: manual_locked_trust_level,
         approved: is_active_user,
         approved_by_id: is_active_user ? Discourse.system_user.id : nil,
         approved_at: is_active_user ? Time.now : nil,
@@ -45,14 +50,14 @@ module ImportScripts::PhpBB3
     end
 
     def map_anonymous_users_to_import_ids(rows)
-      rows.map { |row| row[:post_username] }
+      rows.map { |row| @settings.prefix(row[:post_username]) }
     end
 
     def map_anonymous_user(row)
       username = row[:post_username]
 
       {
-        id: username,
+        id: @settings.prefix(username),
         email: "anonymous_#{SecureRandom.hex}@no-email.invalid",
         username: username,
         name: @settings.username_as_name ? username : '',
diff --git a/script/import_scripts/phpbb3/settings.yml b/script/import_scripts/phpbb3/settings.yml
index e884dfc12f..0598dc3039 100644
--- a/script/import_scripts/phpbb3/settings.yml
+++ b/script/import_scripts/phpbb3/settings.yml
@@ -11,6 +11,73 @@ database:
   batch_size: 1000 # Don't change this unless you know what you're doing. The default (1000) should work just fine.
 
 import:
+  # Set this if you import multiple phpBB forums into a single Discourse forum.
+  #
+  # For example, when importing multiple sites, prefix all imported IDs
+  # with 'first' to avoid conflicts. Subsequent import runs must have a
+  # different 'site_name'.
+  #
+  # site_name: first
+  #
+  site_name:
+
+  # Create new categories
+  #
+  # For example, to create a parent category and a subcategory.
+  #
+  # new_categories:
+  # - forum_id: foo
+  #   name: Foo Category
+  # - forum_id: bar
+  #   name: Bar Category
+  #   parent_id: foo
+  #
+  new_categories:
+
+  # Category mappings
+  #
+  # For example, topics from phpBB category 1 and 2 will be imported
+  # in the new "Foo Category" category, topics from phpBB category 3
+  # will be imported in subcategory "Bar category", topics from phpBB
+  # category 4 will be merged into category 5 and category 6 will be
+  # skipped.
+  #
+  # category_mappings:
+  #   1: foo
+  #   2: foo
+  #   3: bar
+  #   4: 5
+  #   6: SKIP
+  #
+  category_mappings:
+
+  # Tag mappings
+  #
+  # For example, imported topics from phpBB category 1 will be tagged
+  # with 'first-category', etc.
+  #
+  # tag_mappings:
+  #   1:
+  #   - first-category
+  #   2:
+  #   - second-category
+  #   3:
+  #   - third-category
+  #
+  tag_mappings:
+
+  # Rank to trust level mapping
+  #
+  # Map phpBB 3.x rank levels to trust level
+  # Users with rank at least 3000 will have TL3, etc.
+  #
+  # rank_mapping:
+  #   trust_level_1: 200
+  #   trust_level_2: 1000
+  #   trust_level_3: 3000
+  #
+  rank_mapping:
+
   # WARNING: Do not activate this option unless you know what you are doing.
   # It will probably break the BBCode to Markdown conversion and slows down your import.
   use_bbcode_to_md: false
diff --git a/script/import_scripts/phpbb3/support/bbcode/markdown_node.rb b/script/import_scripts/phpbb3/support/bbcode/markdown_node.rb
new file mode 100644
index 0000000000..5a42a1bf40
--- /dev/null
+++ b/script/import_scripts/phpbb3/support/bbcode/markdown_node.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module ImportScripts; end
+module ImportScripts::PhpBB3; end
+
+module ImportScripts::PhpBB3::BBCode
+  LINEBREAK_AUTO = :auto
+  LINEBREAK_HARD = :hard
+  LINEBREAK_HTML = :html
+
+  class MarkdownNode
+    # @return [String]
+    attr_reader :xml_node_name
+
+    # @return [MarkdownNode]
+    attr_reader :parent
+
+    # @return [Array<MarkdownNode>]
+    attr_reader :children
+
+    # @return [Array<MarkdownNode>]
+    attr_accessor :previous_sibling
+
+    # @return [Array<MarkdownNode>]
+    attr_accessor :next_sibling
+
+    # @return [String]
+    attr_accessor :text
+
+    # @return [String]
+    attr_accessor :prefix
+
+    # @return [String]
+    attr_accessor :postfix
+
+    # @return [Integer]
+    attr_accessor :prefix_linebreaks
+
+    # @return [Integer]
+    attr_accessor :postfix_linebreaks
+
+    # @return [Symbol]
+    attr_accessor :prefix_linebreak_type
+
+    # @return [Symbol]
+    attr_accessor :postfix_linebreak_type
+
+    # @return [String]
+    attr_accessor :prefix_children
+
+    # @param xml_node_name [String]
+    # @param parent [MarkdownNode]
+    def initialize(xml_node_name:, parent:)
+      @xml_node_name = xml_node_name
+
+      @text = +""
+      @prefix = +""
+      @postfix = +""
+
+      @prefix_linebreaks = 0
+      @postfix_linebreaks = 0
+
+      @prefix_linebreak_type = LINEBREAK_AUTO
+      @postfix_linebreak_type = LINEBREAK_AUTO
+
+      @parent = parent
+      @children = []
+
+      if @parent
+        @previous_sibling = @parent.children.last
+        @previous_sibling.next_sibling = self if @previous_sibling
+        @parent.children << self
+      end
+    end
+
+    def enclosed_with=(text)
+      @prefix = @postfix = text
+    end
+
+    def skip_children
+      @children = nil
+    end
+
+    def to_s
+      "name: #{xml_node_name}, prefix: #{prefix}, text: #{text}, children: #{children.size}, postfix: #{postfix}"
+    end
+  end
+end
diff --git a/script/import_scripts/phpbb3/support/bbcode/xml_to_markdown.rb b/script/import_scripts/phpbb3/support/bbcode/xml_to_markdown.rb
new file mode 100644
index 0000000000..972c4a6c45
--- /dev/null
+++ b/script/import_scripts/phpbb3/support/bbcode/xml_to_markdown.rb
@@ -0,0 +1,356 @@
+# frozen_string_literal: true
+
+require 'nokogiri'
+require_relative 'markdown_node'
+
+module ImportScripts::PhpBB3::BBCode
+  class XmlToMarkdown
+    def initialize(xml, opts = {})
+      @username_from_user_id = opts[:username_from_user_id]
+      @smilie_to_emoji = opts[:smilie_to_emoji]
+      @quoted_post_from_post_id = opts[:quoted_post_from_post_id]
+      @upload_md_from_file = opts[:upload_md_from_file]
+      @url_replacement = opts[:url_replacement]
+      @allow_inline_code = opts.fetch(:allow_inline_code, false)
+      @traditional_linebreaks = opts.fetch(:traditional_linebreaks, false)
+
+      @doc = Nokogiri::XML(xml)
+      @list_stack = []
+    end
+
+    def convert
+      preprocess_xml
+
+      md_root = MarkdownNode.new(xml_node_name: "ROOT", parent: nil)
+      visit(@doc.root, md_root)
+      to_markdown(md_root).rstrip
+    end
+
+    private
+
+    IGNORED_ELEMENTS = ["s", "e", "i"]
+    ELEMENTS_WITHOUT_LEADING_WHITESPACES = ["LIST", "LI"]
+    ELEMENTS_WITH_HARD_LINEBREAKS = ["B", "I", "U"]
+    EXPLICIT_LINEBREAK_THRESHOLD = 2
+
+    def preprocess_xml
+      @doc.traverse do |node|
+        if node.is_a? Nokogiri::XML::Text
+          node.content = node.content.gsub(/\A\n+\s*/, "")
+          node.content = node.content.lstrip if remove_leading_whitespaces?(node)
+          node.remove if node.content.empty?
+        elsif IGNORED_ELEMENTS.include?(node.name)
+          node.remove
+        end
+      end
+    end
+
+    def remove_leading_whitespaces?(xml_node)
+      parent = xml_node.parent
+      return false unless parent
+
+      ELEMENTS_WITHOUT_LEADING_WHITESPACES.include?(parent.name) &&
+        parent.children.first == xml_node
+    end
+
+    def visit(xml_node, md_parent)
+      visitor = "visit_#{xml_node.name}"
+      visitor_exists = respond_to?(visitor, include_all: true)
+
+      if visitor_exists && md_parent.children
+        md_node = create_node(xml_node, md_parent)
+        send(visitor, xml_node, md_node)
+      end
+
+      xml_node.children.each { |xml_child| visit(xml_child, md_node || md_parent) }
+
+      after_hook = "after_#{xml_node.name}"
+      if respond_to?(after_hook, include_all: true)
+        send(after_hook, xml_node, md_node)
+      end
+    end
+
+    def create_node(xml_node, md_parent)
+      if xml_node.name == "br"
+        last_child = md_parent.children.last
+        return last_child if last_child&.xml_node_name == "br"
+      end
+
+      MarkdownNode.new(xml_node_name: xml_node.name, parent: md_parent)
+    end
+
+    def visit_text(xml_node, md_node)
+      md_node.text << text(xml_node)
+    end
+
+    def visit_B(xml_node, md_node)
+      if xml_node.parent&.name != 'B'
+        md_node.enclosed_with = "**"
+      end
+    end
+
+    def visit_I(xml_node, md_node)
+      if xml_node.parent&.name != 'I'
+        md_node.enclosed_with = "_"
+      end
+    end
+
+    def visit_U(xml_node, md_node)
+      if xml_node.parent&.name != 'U'
+        md_node.prefix = "[u]"
+        md_node.postfix = "[/u]"
+      end
+    end
+
+    def visit_CODE(xml_node, md_node)
+      content = xml_node.content
+
+      if !@allow_inline_code || content.include?("\n")
+        md_node.prefix = "```text\n"
+        md_node.postfix = "\n```"
+      else
+        md_node.enclosed_with = "`"
+      end
+
+      md_node.text = content.rstrip
+      md_node.skip_children
+      md_node.prefix_linebreaks = md_node.postfix_linebreaks = 2
+      md_node.prefix_linebreak_type = LINEBREAK_HTML
+    end
+
+    def visit_LIST(xml_node, md_node)
+      md_node.prefix_linebreaks = md_node.postfix_linebreaks = @list_stack.size == 0 ? 2 : 1
+      md_node.prefix_linebreak_type = LINEBREAK_HTML if @list_stack.size == 0
+
+      @list_stack << {
+        unordered: xml_node.attribute('type').nil?,
+        item_count: 0
+      }
+    end
+
+    def after_LIST(xml_node, md_node)
+      @list_stack.pop
+    end
+
+    def visit_LI(xml_node, md_node)
+      list = @list_stack.last
+      depth = @list_stack.size - 1
+
+      list[:item_count] += 1
+
+      indentation = ' ' * 2 * depth
+      symbol = list[:unordered] ? '*' : "#{list[:item_count]}."
+
+      md_node.prefix = "#{indentation}#{symbol} "
+      md_node.postfix_linebreaks = 1
+    end
+
+    def visit_IMG(xml_node, md_node)
+      md_node.text = +"![](#{xml_node.attribute('src')})"
+      md_node.prefix_linebreaks = md_node.postfix_linebreaks = 2
+      md_node.skip_children
+    end
+
+    def visit_URL(xml_node, md_node)
+      original_url = xml_node.attribute('url').to_s
+      url = CGI.unescapeHTML(original_url)
+      url = @url_replacement.call(url) if @url_replacement
+
+      if xml_node.content.strip == original_url
+        md_node.text = url
+        md_node.skip_children
+      else
+        md_node.prefix = "["
+        md_node.postfix = "](#{url})"
+      end
+    end
+
+    def visit_EMAIL(xml_node, md_node)
+      md_node.prefix = "<"
+      md_node.postfix = ">"
+    end
+
+    def visit_br(xml_node, md_node)
+      md_node.postfix_linebreaks += 1
+
+      if md_node.postfix_linebreaks > 1 && ELEMENTS_WITH_HARD_LINEBREAKS.include?(xml_node.parent&.name)
+        md_node.postfix_linebreak_type = LINEBREAK_HARD
+      end
+    end
+
+    def visit_E(xml_node, md_node)
+      if @smilie_to_emoji
+        md_node.text = @smilie_to_emoji.call(xml_node.content)
+        md_node.skip_children
+      end
+    end
+
+    def visit_QUOTE(xml_node, md_node)
+      if post = quoted_post(xml_node)
+        md_node.prefix = %Q{[quote="#{post[:username]}, post:#{post[:post_number]}, topic:#{post[:topic_id]}"]\n}
+        md_node.postfix = "\n[/quote]"
+      elsif username = quoted_username(xml_node)
+        md_node.prefix = %Q{[quote="#{username}"]\n}
+        md_node.postfix = "\n[/quote]"
+      else
+        md_node.prefix_children = "> "
+      end
+
+      md_node.prefix_linebreaks = md_node.postfix_linebreaks = 2
+      md_node.prefix_linebreak_type = LINEBREAK_HTML
+    end
+
+    def quoted_post(xml_node)
+      if @quoted_post_from_post_id
+        post_id = to_i(xml_node.attr("post_id"))
+        @quoted_post_from_post_id.call(post_id) if post_id
+      end
+    end
+
+    def quoted_username(xml_node)
+      if @username_from_user_id
+        user_id = to_i(xml_node.attr("user_id"))
+        username = @username_from_user_id.call(user_id) if user_id
+      end
+
+      username = xml_node.attr("author") unless username
+      username
+    end
+
+    def to_i(string)
+      string.to_i if string&.match(/\A\d+\z/)
+    end
+
+    def visit_ATTACHMENT(xml_node, md_node)
+      filename = xml_node.attr("filename")
+      index = to_i(xml_node.attr("index"))
+
+      md_node.text = @upload_md_from_file.call(filename, index) if @upload_md_from_file
+      md_node.prefix_linebreaks = md_node.postfix_linebreaks = 1
+      md_node.skip_children
+    end
+
+    def visit_SIZE(xml_node, md_node)
+      size = to_i(xml_node.attr("size"))
+      return if size.nil?
+
+      if size.between?(1, 99)
+        md_node.prefix = '<small>'
+        md_node.postfix = '</small>'
+      elsif size.between?(101, 200)
+        md_node.prefix = '<big>'
+        md_node.postfix = '</big>'
+      end
+    end
+
+    def text(xml_node, escape_markdown: true)
+      text = CGI.unescapeHTML(xml_node.text)
+      # text.gsub!(/[\\`*_{}\[\]()#+\-.!~]/) { |c| "\\#{c}" } if escape_markdown
+      text
+    end
+
+    # @param md_parent [MarkdownNode]
+    def to_markdown(md_parent)
+      markdown = +""
+
+      md_parent.children.each do |md_node|
+        prefix = md_node.prefix
+        text = md_node.children&.any? ? to_markdown(md_node) : md_node.text
+        postfix = md_node.postfix
+
+        parent_prefix = prefix_from_parent(md_parent)
+
+        if parent_prefix && md_node.xml_node_name != "br" && (md_parent.prefix_children || !markdown.empty?)
+          prefix = "#{parent_prefix}#{prefix}"
+        end
+
+        if md_node.xml_node_name != "CODE"
+          text, prefix, postfix = hoist_whitespaces!(markdown, text, prefix, postfix)
+        end
+
+        add_linebreaks!(markdown, md_node.prefix_linebreaks, md_node.prefix_linebreak_type, parent_prefix)
+        markdown << prefix
+        markdown << text
+        markdown << postfix
+        add_linebreaks!(markdown, md_node.postfix_linebreaks, md_node.postfix_linebreak_type, parent_prefix)
+      end
+
+      markdown
+    end
+
+    def hoist_whitespaces!(markdown, text, prefix, postfix)
+      text = text.lstrip if markdown.end_with?("\n")
+
+      unless prefix.empty?
+        if starts_with_whitespace?(text) && !ends_with_whitespace?(markdown)
+          prefix = "#{text[0]}#{prefix}"
+        end
+        text = text.lstrip
+      end
+
+      unless postfix.empty?
+        if ends_with_whitespace?(text)
+          postfix = "#{postfix}#{text[-1]}"
+        end
+        text = text.rstrip
+      end
+
+      [text, prefix, postfix]
+    end
+
+    def prefix_from_parent(md_parent)
+      while md_parent
+        return md_parent.prefix_children if md_parent.prefix_children
+        md_parent = md_parent.parent
+      end
+    end
+
+    def add_linebreaks!(markdown, required_linebreak_count, linebreak_type, prefix = nil)
+      return if required_linebreak_count == 0 || markdown.empty?
+
+      existing_linebreak_count = markdown[/(?:\\?\n|<br>\n)*\z/].count("\n")
+
+      if linebreak_type == LINEBREAK_HTML
+        max_linebreak_count = [existing_linebreak_count, required_linebreak_count - 1].max + 1
+        required_linebreak_count = max_linebreak_count if max_linebreak_count > EXPLICIT_LINEBREAK_THRESHOLD
+      end
+
+      return if existing_linebreak_count >= required_linebreak_count
+
+      rstrip!(markdown)
+      alternative_linebreak_start_index = required_linebreak_count > EXPLICIT_LINEBREAK_THRESHOLD ? 1 : 2
+
+      required_linebreak_count.times do |index|
+        linebreak = linebreak(linebreak_type, index, alternative_linebreak_start_index, required_linebreak_count)
+
+        markdown << (linebreak == "\n" ? prefix.rstrip : prefix) if prefix && index > 0
+        markdown << linebreak
+      end
+    end
+
+    def rstrip!(markdown)
+      markdown.gsub!(/\s*(?:\\?\n|<br>\n)*\z/, '')
+    end
+
+    def linebreak(linebreak_type, linebreak_index, alternative_linebreak_start_index, required_linebreak_count)
+      use_alternative_linebreak = linebreak_index >= alternative_linebreak_start_index
+      is_last_linebreak = linebreak_index + 1 == required_linebreak_count
+
+      return "<br>\n" if linebreak_type == LINEBREAK_HTML &&
+        use_alternative_linebreak && is_last_linebreak
+
+      return "\\\n" if linebreak_type == LINEBREAK_HARD ||
+        @traditional_linebreaks || use_alternative_linebreak
+
+      "\n"
+    end
+
+    def starts_with_whitespace?(text)
+      text.match?(/\A\s/)
+    end
+
+    def ends_with_whitespace?(text)
+      text.match?(/\s\z/)
+    end
+  end
+end
diff --git a/script/import_scripts/phpbb3/support/settings.rb b/script/import_scripts/phpbb3/support/settings.rb
index 8b1ebf706f..ee01a66e3a 100644
--- a/script/import_scripts/phpbb3/support/settings.rb
+++ b/script/import_scripts/phpbb3/support/settings.rb
@@ -1,14 +1,23 @@
 # frozen_string_literal: true
 
+require 'csv'
 require 'yaml'
+require_relative '../../base'
 
 module ImportScripts::PhpBB3
   class Settings
     def self.load(filename)
       yaml = YAML::load_file(filename)
-      Settings.new(yaml)
+      Settings.new(yaml.deep_stringify_keys.with_indifferent_access)
     end
 
+    attr_reader :site_name
+
+    attr_reader :new_categories
+    attr_reader :category_mappings
+    attr_reader :tag_mappings
+    attr_reader :rank_mapping
+
     attr_reader :import_anonymous_users
     attr_reader :import_attachments
     attr_reader :import_private_messages
@@ -34,6 +43,14 @@ module ImportScripts::PhpBB3
 
     def initialize(yaml)
       import_settings = yaml['import']
+
+      @site_name = import_settings['site_name']
+
+      @new_categories = import_settings['new_categories']
+      @category_mappings = import_settings['category_mappings']
+      @tag_mappings = import_settings['tag_mappings']
+      @rank_mapping = import_settings['rank_mapping']
+
       @import_anonymous_users = import_settings['anonymous_users']
       @import_attachments = import_settings['attachments']
       @import_private_messages = import_settings['private_messages']
@@ -58,6 +75,20 @@ module ImportScripts::PhpBB3
 
       @database = DatabaseSettings.new(yaml['database'])
     end
+
+    def prefix(val)
+      @site_name.present? && val.present? ? "#{@site_name}:#{val}" : val
+    end
+
+    def trust_level_for_posts(rank, trust_level: 0)
+      if @rank_mapping.present?
+        @rank_mapping.each do |key, value|
+          trust_level = [trust_level, key.gsub('trust_level_', '').to_i].max if rank >= value
+        end
+      end
+
+      trust_level
+    end
   end
 
   class DatabaseSettings
diff --git a/script/import_scripts/phpbb3/support/smiley_processor.rb b/script/import_scripts/phpbb3/support/smiley_processor.rb
index 29abc14f8a..36df4035bb 100644
--- a/script/import_scripts/phpbb3/support/smiley_processor.rb
+++ b/script/import_scripts/phpbb3/support/smiley_processor.rb
@@ -3,10 +3,12 @@
 module ImportScripts::PhpBB3
   class SmileyProcessor
     # @param uploader [ImportScripts::Uploader]
+    # @param database [ImportScripts::PhpBB3::Database_3_0 | ImportScripts::PhpBB3::Database_3_1]
     # @param settings [ImportScripts::PhpBB3::Settings]
     # @param phpbb_config [Hash]
-    def initialize(uploader, settings, phpbb_config)
+    def initialize(uploader, database, settings, phpbb_config)
       @uploader = uploader
+      @database = database
       @smilies_path = File.join(settings.base_dir, phpbb_config[:smilies_path])
 
       @smiley_map = {}
@@ -16,12 +18,16 @@ module ImportScripts::PhpBB3
 
     def replace_smilies(text)
       # :) is encoded as <!-- s:) --><img src="{SMILIES_PATH}/icon_e_smile.gif" alt=":)" title="Smile" /><!-- s:) -->
-      text.gsub!(/<!-- s(\S+) --><img src="\{SMILIES_PATH\}\/(.+?)" alt="(.*?)" title="(.*?)" \/><!-- s(?:\S+) -->/) do
-        smiley = $1
+      text.gsub!(/<!-- s(\S+) --><img src="\{SMILIES_PATH\}\/.+?" alt=".*?" title=".*?" \/><!-- s?:\S+ -->/) do
+        emoji($1)
+      end
+    end
 
-        @smiley_map.fetch(smiley) do
-          upload_smiley(smiley, $2, $3, $4) || smiley_as_text(smiley)
-        end
+    def emoji(smiley_code)
+      @smiley_map.fetch(smiley_code) do
+        smiley = @database.get_smiley(smiley_code)
+        emoji = upload_smiley(smiley_code, smiley[:smiley_url], smiley_code, smiley[:emotion]) if smiley
+        emoji || smiley_as_text(smiley_code)
       end
     end
 
@@ -36,7 +42,7 @@ module ImportScripts::PhpBB3
         [':o', ':-o', ':eek:'] => ':astonished:',
         [':shock:'] => ':open_mouth:',
         [':?', ':-?', ':???:'] => ':confused:',
-        ['8-)', ':cool:'] => ':sunglasses:',
+        ['8)', '8-)', ':cool:'] => ':sunglasses:',
         [':lol:'] => ':laughing:',
         [':x', ':-x', ':mad:'] => ':angry:',
         [':P', ':-P', ':razz:'] => ':stuck_out_tongue:',
diff --git a/script/import_scripts/phpbb3/support/text_processor.rb b/script/import_scripts/phpbb3/support/text_processor.rb
index 158864b1c9..b5b9d9a54e 100644
--- a/script/import_scripts/phpbb3/support/text_processor.rb
+++ b/script/import_scripts/phpbb3/support/text_processor.rb
@@ -1,48 +1,75 @@
 # frozen_string_literal: true
 
+require_relative 'bbcode/xml_to_markdown'
+
 module ImportScripts::PhpBB3
   class TextProcessor
     # @param lookup [ImportScripts::LookupContainer]
     # @param database [ImportScripts::PhpBB3::Database_3_0 | ImportScripts::PhpBB3::Database_3_1]
     # @param smiley_processor [ImportScripts::PhpBB3::SmileyProcessor]
     # @param settings [ImportScripts::PhpBB3::Settings]
-    def initialize(lookup, database, smiley_processor, settings)
+    # @param phpbb_config [Hash]
+    def initialize(lookup, database, smiley_processor, settings, phpbb_config)
       @lookup = lookup
       @database = database
       @smiley_processor = smiley_processor
       @he = HTMLEntities.new
+      @use_xml_to_markdown = phpbb_config[:phpbb_version].start_with?('3.2')
 
       @settings = settings
       @new_site_prefix = settings.new_site_prefix
       create_internal_link_regexps(settings.original_site_prefix)
     end
 
-    def process_raw_text(raw)
-      text = raw.dup
-      text = CGI.unescapeHTML(text)
+    def process_raw_text(raw, attachments = nil)
+      if @use_xml_to_markdown
+        unreferenced_attachments = attachments&.dup
 
-      clean_bbcodes(text)
-      if @settings.use_bbcode_to_md
-        text = bbcode_to_md(text)
+        converter = BBCode::XmlToMarkdown.new(
+          raw,
+          username_from_user_id: lambda { |user_id| @lookup.find_username_by_import_id(user_id) },
+          smilie_to_emoji: lambda { |smilie| @smiley_processor.emoji(smilie).dup },
+          quoted_post_from_post_id: lambda { |post_id| @lookup.topic_lookup_from_imported_post_id(post_id) },
+          upload_md_from_file: (lambda do |filename, index|
+            unreferenced_attachments[index] = nil
+            attachments.fetch(index, filename).dup
+          end if attachments),
+          url_replacement: nil,
+          allow_inline_code: false
+        )
+
+        text = converter.convert
+
+        text.gsub!(@short_internal_link_regexp) do |link|
+          replace_internal_link(link, $1, $2)
+        end
+
+        add_unreferenced_attachments(text, unreferenced_attachments)
+      else
+        text = raw.dup
+        text = CGI.unescapeHTML(text)
+
+        clean_bbcodes(text)
+        if @settings.use_bbcode_to_md
+          text = bbcode_to_md(text)
+        end
+        process_smilies(text)
+        process_links(text)
+        process_lists(text)
+        process_code(text)
+        fix_markdown(text)
+        process_attachments(text, attachments) if attachments.present?
+
+        text
       end
-      process_smilies(text)
-      process_links(text)
-      process_lists(text)
-      process_code(text)
-      fix_markdown(text)
-      text
     end
 
     def process_post(raw, attachments)
-      text = process_raw_text(raw)
-      text = process_attachments(text, attachments) if attachments.present?
-      text
+      process_raw_text(raw, attachments) rescue raw
     end
 
     def process_private_msg(raw, attachments)
-      text = process_raw_text(raw)
-      text = process_attachments(text, attachments) if attachments.present?
-      text
+      process_raw_text(raw, attachments) rescue raw
     end
 
     protected
@@ -139,6 +166,12 @@ module ImportScripts::PhpBB3
         attachments.fetch(index, real_filename)
       end
 
+      add_unreferenced_attachments(text, unreferenced_attachments)
+    end
+
+    def add_unreferenced_attachments(text, unreferenced_attachments)
+      return text unless unreferenced_attachments
+
       unreferenced_attachments = unreferenced_attachments.compact
       text << "\n" << unreferenced_attachments.join("\n") unless unreferenced_attachments.empty?
       text
@@ -161,6 +194,7 @@ module ImportScripts::PhpBB3
 
     def fix_markdown(text)
       text.gsub!(/(\n*\[\/?quote.*?\]\n*)/mi) { |q| "\n#{q.strip}\n" }
+      text.gsub!(/^!\[[^\]]*\]\([^\]]*\)$/i) { |img| "\n#{img.strip}\n" } # space out images single on line
       text
     end
   end
diff --git a/script/import_scripts/vanilla_body_parser.rb b/script/import_scripts/vanilla_body_parser.rb
index af9d2c4da1..ba4608e3ff 100644
--- a/script/import_scripts/vanilla_body_parser.rb
+++ b/script/import_scripts/vanilla_body_parser.rb
@@ -24,6 +24,17 @@ class VanillaBodyParser
   private
 
   def clean_up(text)
+    # <pre class="CodeBlock">...</pre>
+    text = text.gsub(/\<pre class="CodeBlock"\>(.*?)\<\/pre\>/im) { "\n```\n#{$1}\n```\n" }
+    # <pre>...</pre>
+    text = text.gsub(/\<pre\>(.*?)\<\/pre\>/im) { "\n```\n#{$1}\n```\n" }
+    # <code></code>
+    text = text.gsub("\<code\>\</code\>", "").gsub(/\<code\>(.*?)\<\/code\>/im) { "#{$1}" }
+    # <div class="Quote">...</div>
+    text = text.gsub(/\<div class="Quote"\>(.*?)\<\/div\>/im) { "\n[quote]\n#{$1}\n[/quote]\n" }
+    # [code], [quote]
+    text = text.gsub(/\[\/?code\]/i, "\n```\n").gsub(/\[quote.*?\]/i, "\n" + '\0' + "\n").gsub(/\[\/quote\]/i, "\n" + '\0' + "\n")
+
     text.gsub(/<\/?font[^>]*>/, '').gsub(/<\/?span[^>]*>/, '').gsub(/<\/?div[^>]*>/, '').gsub(/^ +/, '').gsub(/ +/, ' ')
   end
 
@@ -58,7 +69,7 @@ class VanillaBodyParser
     return parse_quote(insert) if quoting
 
     embed = embed_type.in? ['image', 'link', 'file']
-    parse_embed(insert) if embed
+    parse_embed(insert, embed_type) if embed
   end
 
   def parse_mention(mention)
@@ -87,9 +98,6 @@ class VanillaBodyParser
 
   # In the Quill format used by Vanilla Forums, a line is rendered as `code`
   # when it's followed by a fragment with attributes: {'code-block': true}.
-  # So we open our ``` block when the next fragment has a 'code-block'
-  # attribute and the previous one didn't and we close the ``` block when
-  # the second next fragment does not contain the 'code-block' attribute
   def parse_code(text, fragment, index)
     next_fragment = next_fragment(index)
 
@@ -98,18 +106,27 @@ class VanillaBodyParser
       previous_fragment = previous_fragment(index)
       previous_code = previous_fragment.dig(:attributes, :'code-block')
 
-      # if next is code and previous is not, prepend ```
-      text = "\n```#{text}" unless previous_code
+      if previous_code
+        text = text.gsub(/\\n(.*?)\\n/) { "\n```\n#{$1}\n```\n" }
+      else
+        last_pos = text.rindex(/\n/)
+
+        if last_pos
+          array = [text[0..last_pos].strip, text[last_pos + 1 .. text.length].strip]
+          text = array.join("\n```\n")
+        else
+          text = "\n```\n#{text}"
+        end
+      end
     end
 
     current_code = fragment.dig(:attributes, :'code-block')
-
     if current_code
       second_next_fragment = second_next_fragment(index)
       second_next_code = second_next_fragment.dig(:attributes, :'code-block')
 
       # if current is code and 2 after is not, prepend ```
-      text = "\n```#{text}" unless second_next_code
+      text = "\n```\n#{text}" unless second_next_code
     end
 
     text
@@ -174,7 +191,7 @@ class VanillaBodyParser
     "[quote#{quote_info}]\n#{embed[:body]}\n[/quote]\n\n"""
   end
 
-  def parse_embed(insert)
+  def parse_embed(insert, embed_type)
     embed = insert.dig(:'embed-external', :data)
 
     url = embed[:url]
@@ -193,7 +210,13 @@ class VanillaBodyParser
       end
     end
 
-    "\n[#{embed[:name]}](#{url})\n"
+    if embed_type == "link"
+      "\n[#{embed[:name]}](#{url})\n"
+    elsif embed_type == "image"
+      "\n<img src=\"#{url}\" alt=\"#{embed[:name]}\">\n"
+    else
+      "\n<a href=\"#{url}\">#{embed[:name]}</a>\n"
+    end
   end
 
   def normalize(full_text)
diff --git a/script/import_scripts/vanilla_mysql.rb b/script/import_scripts/vanilla_mysql.rb
index f2b4e6ef58..459ba65225 100644
--- a/script/import_scripts/vanilla_mysql.rb
+++ b/script/import_scripts/vanilla_mysql.rb
@@ -3,11 +3,12 @@
 require "mysql2"
 require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 require 'htmlentities'
+require 'reverse_markdown'
 require_relative 'vanilla_body_parser'
 
 class ImportScripts::VanillaSQL < ImportScripts::Base
 
-  VANILLA_DB = "vanilla_mysql"
+  VANILLA_DB = "vanilla"
   TABLE_PREFIX = "GDN_"
   ATTACHMENTS_BASE_DIR = nil # "/absolute/path/to/attachments" set the absolute path if you have attachments
   BATCH_SIZE = 1000
@@ -19,14 +20,15 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     @client = Mysql2::Client.new(
       host: "localhost",
       username: "root",
-      password: "pa$$word",
       database: VANILLA_DB
     )
 
+    # by default, don't use the body parser as it's not pertinent to all versions
+    @vb_parser = false
     VanillaBodyParser.configure(
       lookup: @lookup,
       uploader: @uploader,
-      host: 'vanilla.yourforum.com', # your Vanilla forum domain
+      host: 'forum.example.com', # your Vanilla forum domain
       uploads_path: 'uploads' # relative path to your vanilla uploads folder
     )
 
@@ -37,6 +39,8 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     rescue => e
       puts "Tags won't be imported. #{e.message}"
     end
+
+    @category_mappings = {}
   end
 
   def execute
@@ -45,16 +49,39 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
       SiteSetting.max_tags_per_topic = 10
     end
 
+    import_groups
     import_users
     import_avatars
+    import_group_users
     import_categories
     import_topics
     import_posts
+    import_likes
     import_messages
 
     update_tl0
+    mark_topics_as_solved
 
     create_permalinks
+    import_attachments
+    mark_topics_as_solved
+  end
+
+  def import_groups
+    puts "", "importing groups..."
+
+    groups = mysql_query <<-SQL
+        SELECT RoleID, Name
+          FROM #{TABLE_PREFIX}Role
+      ORDER BY RoleID
+    SQL
+
+    create_groups(groups) do |group|
+      {
+        id: group["RoleID"],
+        name: @htmlentities.decode(group["Name"]).strip
+      }
+    end
   end
 
   def import_users
@@ -147,7 +174,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
 
         photo_real_filename = nil
         parts = photo.squeeze("/").split("/")
-        if parts[0] == "cf:"
+        if parts[0] =~ /^[a-z0-9]{2}:/
           photo_path = "#{ATTACHMENTS_BASE_DIR}/#{parts[2..-2].join('/')}".squeeze("/")
         elsif parts[0] == "~cf"
           photo_path = "#{ATTACHMENTS_BASE_DIR}/#{parts[1..-2].join('/')}".squeeze("/")
@@ -200,22 +227,84 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     nil
   end
 
+  def import_group_users
+    puts "", "importing group users..."
+
+    group_users = mysql_query("
+      SELECT RoleID, UserID
+        FROM #{TABLE_PREFIX}UserRole
+    ").to_a
+
+    group_users.each do |row|
+      user_id = user_id_from_imported_user_id(row["UserID"])
+      group_id = group_id_from_imported_group_id(row["RoleID"])
+
+      if user_id && group_id
+        GroupUser.find_or_create_by(user_id: user_id, group_id: group_id)
+      end
+    end
+  end
+
   def import_categories
     puts "", "importing categories..."
 
     categories = mysql_query("
-                              SELECT CategoryID, Name, Description
-                              FROM #{TABLE_PREFIX}Category
-                              ORDER BY CategoryID ASC
-                            ").to_a
+      SELECT CategoryID, ParentCategoryID, Name, Description
+      FROM #{TABLE_PREFIX}Category
+      WHERE CategoryID > 0
+      ORDER BY CategoryID ASC
+    ").to_a
 
-    create_categories(categories) do |category|
+    top_level_categories = categories.select { |c| c['ParentCategoryID'].blank? || c['ParentCategoryID'] == -1 }
+
+    create_categories(top_level_categories) do |category|
       {
         id: category['CategoryID'],
         name: CGI.unescapeHTML(category['Name']),
         description: CGI.unescapeHTML(category['Description'])
       }
     end
+
+    top_level_category_ids = Set.new(top_level_categories.map { |c| c["CategoryID"] })
+
+    subcategories = categories.select { |c| top_level_category_ids.include?(c["ParentCategoryID"]) }
+
+    # Depth = 3
+    create_categories(subcategories) do |category|
+      {
+        id: category['CategoryID'],
+        parent_category_id: category_id_from_imported_category_id(category['ParentCategoryID']),
+        name: CGI.unescapeHTML(category['Name']),
+        description: category['Description'] ? CGI.unescapeHTML(category['Description']) : nil,
+      }
+    end
+
+    subcategory_ids = Set.new(subcategories.map { |c| c['CategoryID'] })
+
+    # Depth 4 and 5 need to be tags
+
+    categories.each do |c|
+      next if c['ParentCategoryID'] == -1
+      next if top_level_category_ids.include?(c['CategoryID'])
+      next if subcategory_ids.include?(c['CategoryID'])
+
+      # Find a depth 3 category for topics in this category
+      parent = c
+      while !parent.nil? && !subcategory_ids.include?(parent['CategoryID'])
+        parent = categories.find { |subcat| subcat['CategoryID'] == parent['ParentCategoryID'] }
+      end
+
+      if parent
+        tag_name = DiscourseTagging.clean_tag(c['Name'])
+        tag = Tag.find_by_name(tag_name) || Tag.create(name: tag_name)
+        @category_mappings[c['CategoryID']] = {
+          category_id: category_id_from_imported_category_id(parent['CategoryID']),
+          tag: tag[:name]
+        }
+      else
+        puts '', "Couldn't find a category for #{c['CategoryID']} '#{c['Name']}'!"
+      end
+    end
   end
 
   def import_topics
@@ -246,8 +335,8 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
           id: "discussion#" + discussion['DiscussionID'].to_s,
           user_id: user_id,
           title: discussion['Name'],
-          category: category_id_from_imported_category_id(discussion['CategoryID']),
-          raw: VanillaBodyParser.new(discussion, user_id).parse,
+          category: category_id_from_imported_category_id(discussion['CategoryID']) || @category_mappings[discussion['CategoryID']].try(:[], :category_id),
+          raw: @vb_parser ? VanillaBodyParser.new(discussion, user_id).parse : process_raw(discussion['Body']),
           views: discussion['CountViews'] || 0,
           closed: discussion['Closed'] == 1,
           pinned_at: discussion['Announce'] == 0 ? nil : Time.zone.at(discussion['DateLastComment'] || discussion['DateInserted']),
@@ -256,6 +345,8 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
           post_create_action: proc do |post|
             if @import_tags
               tag_names = @client.query(tag_names_sql.gsub('{discussionid}', discussion['DiscussionID'].to_s)).map { |row| row['tag_name'] }
+              category_tag = @category_mappings[discussion['CategoryID']].try(:[], :tag)
+              tag_names = category_tag ? tag_names.append(category_tag) : tag_names
               DiscourseTagging.tag_topic_by_names(post.topic, staff_guardian, tag_names)
             end
           end
@@ -272,7 +363,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     batches(BATCH_SIZE) do |offset|
       comments = mysql_query(
         "SELECT CommentID, DiscussionID, Body, Format,
-                DateInserted, InsertUserID
+                DateInserted, InsertUserID, QnA
          FROM #{TABLE_PREFIX}Comment
          WHERE CommentID > #{@last_post_id}
          ORDER BY CommentID ASC
@@ -286,17 +377,54 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
         next unless t = topic_lookup_from_imported_post_id("discussion#" + comment['DiscussionID'].to_s)
         next if comment['Body'].blank?
         user_id = user_id_from_imported_user_id(comment['InsertUserID']) || Discourse::SYSTEM_USER_ID
-        {
+        post = {
           id: "comment#" + comment['CommentID'].to_s,
           user_id: user_id,
           topic_id: t[:topic_id],
-          raw: VanillaBodyParser.new(comment, user_id).parse,
+          raw: @vb_parser ? VanillaBodyParser.new(comment, user_id).parse : process_raw(comment['Body']),
           created_at: Time.zone.at(comment['DateInserted'])
         }
+
+        if comment['QnA'] == "Accepted"
+          post[:custom_fields] = { is_accepted_answer: true }
+        end
+
+        post
       end
     end
   end
 
+  def import_likes
+    puts "", "importing likes..."
+
+    total_count = mysql_query("SELECT count(*) count FROM GDN_ThanksLog;").first['count']
+    current_count = 0
+    start_time = Time.now
+
+    likes = mysql_query("
+      SELECT CommentID, DateInserted, InsertUserID
+      FROM #{TABLE_PREFIX}ThanksLog
+      ORDER BY CommentID ASC;
+    ")
+
+    likes.each do |like|
+      post_id = post_id_from_imported_post_id("comment##{like['CommentID']}")
+      user_id = user_id_from_imported_user_id(like['InsertUserID'])
+      post = Post.find(post_id) if post_id
+      user = User.find(user_id) if user_id
+
+      if post && user
+        begin
+          PostActionCreator.like(user, post)
+        rescue => e
+          puts "error adding like to post #{e}"
+        end
+      end
+      current_count += 1
+      print_status(current_count, total_count, start_time)
+    end
+  end
+
   def import_messages
     puts "", "importing messages..."
 
@@ -321,7 +449,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
 
       create_posts(messages, total: total_count, offset: offset) do |message|
         user_id = user_id_from_imported_user_id(message['InsertUserID']) || Discourse::SYSTEM_USER_ID
-        body = VanillaBodyParser.new(message, user_id).parse
+        body = @vb_parser ? VanillaBodyParser.new(message, user_id).parse : process_raw(message['Body'])
 
         common = {
           user_id: user_id,
@@ -358,6 +486,20 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     end
   end
 
+  def process_raw(raw)
+    return if raw == nil
+    raw = @htmlentities.decode(raw)
+
+    # convert user profile links to user mentions
+    raw.gsub!(/<a.*>(@\S+?)<\/a>/) { $1 }
+
+    raw = ReverseMarkdown.convert(raw)
+
+    raw.scrub!
+
+    raw
+  end
+
   def staff_guardian
     @_staff_guardian ||= Guardian.new(Discourse.system_user)
   end
@@ -395,6 +537,103 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     end
   end
 
+  def import_attachments
+    if ATTACHMENTS_BASE_DIR && File.exists?(ATTACHMENTS_BASE_DIR)
+      puts "", "importing attachments"
+
+      start = Time.now
+      count = 0
+
+      # https://us.v-cdn.net/1234567/uploads/editor/xyz/image.jpg
+      cdn_regex = /https:\/\/us.v-cdn.net\/1234567\/uploads\/(\S+\/(\w|-)+.\w+)/i
+      # [attachment=10109:Screen Shot 2012-04-01 at 3.47.35 AM.png]
+      attachment_regex = /\[attachment=(\d+):(.*?)\]/i
+
+      Post.where("raw LIKE '%/us.v-cdn.net/%' OR raw LIKE '%[attachment%'").find_each do |post|
+        count += 1
+        print "\r%7d - %6d/sec" % [count, count.to_f / (Time.now - start)]
+        new_raw = post.raw.dup
+
+        new_raw.gsub!(attachment_regex) do |s|
+          matches = attachment_regex.match(s)
+          attachment_id = matches[1]
+          file_name = matches[2]
+          next unless attachment_id
+
+          r = mysql_query("SELECT Path, Name FROM #{TABLE_PREFIX}Media WHERE MediaID = #{attachment_id};").first
+          next if r.nil?
+          path = r["Path"]
+          name = r["Name"]
+          next unless path.present?
+
+          path.gsub!("s3://content/", "")
+          path.gsub!("s3://uploads/", "")
+          file_path = "#{ATTACHMENTS_BASE_DIR}/#{path}"
+
+          if File.exists?(file_path)
+            upload = create_upload(post.user.id, file_path, File.basename(file_path))
+            if upload && upload.errors.empty?
+              # upload.url
+              filename = name || file_name || File.basename(file_path)
+              html_for_upload(upload, normalize_text(filename))
+            else
+              puts "Error: Upload did not persist for #{post.id} #{attachment_id}!"
+            end
+          else
+            puts "Couldn't find file for #{attachment_id}. Skipping."
+            next
+          end
+        end
+
+        new_raw.gsub!(cdn_regex) do |s|
+          matches = cdn_regex.match(s)
+          attachment_id = matches[1]
+
+          file_path = "#{ATTACHMENTS_BASE_DIR}/#{attachment_id}"
+
+          if File.exists?(file_path)
+            upload = create_upload(post.user.id, file_path, File.basename(file_path))
+            if upload && upload.errors.empty?
+              upload.url
+            else
+              puts "Error: Upload did not persist for #{post.id} #{attachment_id}!"
+            end
+          else
+            puts "Couldn't find file for #{attachment_id}. Skipping."
+            next
+          end
+        end
+
+        if new_raw != post.raw
+          begin
+            PostRevisor.new(post).revise!(post.user, { raw: new_raw }, skip_revision: true, skip_validations: true, bypass_bump: true)
+          rescue
+            puts "PostRevisor error for #{post.id}"
+            post.raw = new_raw
+            post.save(validate: false)
+          end
+        end
+      end
+    end
+  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 = 't'
+         AND NOT EXISTS (
+           SELECT 1
+           FROM topic_custom_fields x
+           WHERE x.topic_id = p.topic_id AND x.name = 'accepted_answer_post_id'
+         )
+      ON CONFLICT DO NOTHING
+    SQL
+  end
 end
 
 ImportScripts::VanillaSQL.new.perform
diff --git a/script/import_scripts/vbulletin.rb b/script/import_scripts/vbulletin.rb
index d3fdc7c464..d998daa916 100644
--- a/script/import_scripts/vbulletin.rb
+++ b/script/import_scripts/vbulletin.rb
@@ -398,7 +398,7 @@ EOM
           topic_id: topic[:topic_id],
           raw: raw,
           created_at: parse_timestamp(post["dateline"]),
-          hidden: post["visible"].to_i == 0,
+          hidden: post["visible"].to_i != 1,
         }
         if parent = topic_lookup_from_imported_post_id(post["parentid"])
           p[:reply_to_post_number] = parent[:post_number]
@@ -570,6 +570,25 @@ EOM
   def import_attachments
     puts '', 'importing attachments...'
 
+    mapping = {}
+    attachments = mysql_query(<<-SQL
+      SELECT a.attachmentid, a.contentid as postid, p.threadid
+        FROM #{TABLE_PREFIX}attachment a, #{TABLE_PREFIX}post p
+       WHERE a.contentid = p.postid
+       AND contenttypeid = 1 AND state = 'visible'
+    SQL
+    )
+    attachments.each do |attachment|
+      post_id = post_id_from_imported_post_id(attachment['postid'])
+      post_id = post_id_from_imported_post_id("thread-#{attachment['threadid']}") unless post_id
+      if post_id.nil?
+        puts "Post for attachment #{attachment['attachmentid']} not found"
+        next
+      end
+      mapping[post_id] ||= []
+      mapping[post_id] << attachment['attachmentid'].to_i
+    end
+
     current_count = 0
 
     total_count = mysql_query(<<-SQL
@@ -594,6 +613,10 @@ EOM
         matches = attachment_regex.match(s)
         attachment_id = matches[1]
 
+        unless mapping[post.id].nil?
+          mapping[post.id].delete(attachment_id.to_i)
+        end
+
         upload, filename = find_upload(post, attachment_id)
         unless upload
           fail_count += 1
@@ -603,6 +626,40 @@ EOM
         html_for_upload(upload, filename)
       end
 
+      # make resumed imports faster
+      if new_raw == post.raw
+        unless mapping[post.id].nil? || mapping[post.id].empty?
+          imported_text = mysql_query(<<-SQL
+            SELECT p.pagetext
+              FROM #{TABLE_PREFIX}attachment a, #{TABLE_PREFIX}post p
+             WHERE a.contentid = p.postid
+             AND a.attachmentid = #{mapping[post.id][0]}
+          SQL
+          ).first["pagetext"]
+
+          imported_text.scan(attachment_regex) do |match|
+            attachment_id = match[0]
+            mapping[post.id].delete(attachment_id.to_i)
+          end
+        end
+      end
+
+      unless mapping[post.id].nil? || mapping[post.id].empty?
+        mapping[post.id].each do |attachment_id|
+          upload, filename = find_upload(post, attachment_id)
+          unless upload
+            fail_count += 1
+            next
+          end
+
+          # internal upload deduplication will make sure that we do not import attachments again
+          html = html_for_upload(upload, filename)
+          if !new_raw[html]
+            new_raw += "\n\n#{html}\n\n"
+          end
+        end
+      end
+
       if new_raw != post.raw
         PostRevisor.new(post).revise!(post.user, { raw: new_raw }, bypass_bump: true, edit_reason: 'Import attachments from vBulletin')
       end
diff --git a/script/import_scripts/vbulletin5.rb b/script/import_scripts/vbulletin5.rb
index 682cbcdc50..bdf80dcd3b 100644
--- a/script/import_scripts/vbulletin5.rb
+++ b/script/import_scripts/vbulletin5.rb
@@ -327,7 +327,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
           topic_id: topic[:topic_id],
           raw: raw,
           created_at: parse_timestamp(post["dateline"]),
-          hidden: post["visible"].to_i == 0,
+          hidden: post["visible"].to_i != 1,
         }
         if parent = topic_lookup_from_imported_post_id(post["parentid"])
           p[:reply_to_post_number] = parent[:post_number]
diff --git a/script/json_to_rswag.rb b/script/json_to_rswag.rb
deleted file mode 100644
index e3e25ea2dc..0000000000
--- a/script/json_to_rswag.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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/components/auth/managed_authenticator_spec.rb b/spec/components/auth/managed_authenticator_spec.rb
index b81e33ba0e..f98419ac67 100644
--- a/spec/components/auth/managed_authenticator_spec.rb
+++ b/spec/components/auth/managed_authenticator_spec.rb
@@ -53,6 +53,18 @@ describe Auth::ManagedAuthenticator do
       expect(associated.extra["raw_info"]["randominfo"]).to eq("some info")
     end
 
+    it 'only sets email valid for present strings' do
+      # (Twitter sometimes sends empty email strings)
+      result = authenticator.after_authenticate(create_hash.merge(info: { email: "email@example.com" }))
+      expect(result.email_valid).to eq(true)
+
+      result = authenticator.after_authenticate(create_hash.merge(info: { email: "" }))
+      expect(result.email_valid).to be_falsey
+
+      result = authenticator.after_authenticate(create_hash.merge(info: { email: nil }))
+      expect(result.email_valid).to be_falsey
+    end
+
     describe 'connecting to another user account' do
       fab!(:user1) { Fabricate(:user) }
       fab!(:user2) { Fabricate(:user) }
diff --git a/spec/components/cache_spec.rb b/spec/components/cache_spec.rb
index a174017ffd..32567113d0 100644
--- a/spec/components/cache_spec.rb
+++ b/spec/components/cache_spec.rb
@@ -98,4 +98,14 @@ describe Cache do
 
     expect(cache.keys("users:*").count).to eq(2)
   end
+
+  it "can fetch namespace" do
+    expect(cache.namespace).to eq("_CACHE")
+  end
+
+  it "uses the defined expires_in" do
+    cache.write "foo:bar", "baz", expires_in: 3.minutes
+
+    expect(cache.redis.ttl("#{cache.namespace}:foo:bar")).to eq(180)
+  end
 end
diff --git a/spec/components/composer_messages_finder_spec.rb b/spec/components/composer_messages_finder_spec.rb
index 00cb9ac995..b114560ed8 100644
--- a/spec/components/composer_messages_finder_spec.rb
+++ b/spec/components/composer_messages_finder_spec.rb
@@ -138,8 +138,8 @@ describe ComposerMessagesFinder do
       expect(finder.check_avatar_notification).to be_blank
     end
 
-    it "doesn't notify users if 'sso_overrides_avatar' setting is enabled" do
-      SiteSetting.sso_overrides_avatar = true
+    it "doesn't notify users if 'discourse_connect_overrides_avatar' setting is enabled" do
+      SiteSetting.discourse_connect_overrides_avatar = true
       expect(finder.check_avatar_notification).to be_blank
     end
 
@@ -343,6 +343,13 @@ describe ComposerMessagesFinder do
       expect(ComposerMessagesFinder.new(user, composer_action: 'reply').check_get_a_room(min_users_posted: 2)).to be_blank
     end
 
+    it "does not give a message if the topic's category is read_restricted" do
+      topic.category.update(read_restricted: true)
+      finder = ComposerMessagesFinder.new(user, composer_action: 'reply', topic_id: topic.id, post_id: op.id)
+      finder.check_get_a_room(min_users_posted: 2)
+      expect(UserHistory.exists_for_user?(user, :notified_about_get_a_room)).to eq(false)
+    end
+
     context "reply" do
       let(:finder) { ComposerMessagesFinder.new(user, composer_action: 'reply', topic_id: topic.id, post_id: op.id) }
 
diff --git a/spec/components/concern/category_hashtag_spec.rb b/spec/components/concern/category_hashtag_spec.rb
index 81f437efae..c89dbb575b 100644
--- a/spec/components/concern/category_hashtag_spec.rb
+++ b/spec/components/concern/category_hashtag_spec.rb
@@ -29,14 +29,6 @@ describe CategoryHashtag do
       expect(Category.query_from_hashtag_slug("non-existent#{CategoryHashtag::SEPARATOR}#{parent_category.slug}")).to eq(nil)
     end
 
-    it "should be case sensitive" do
-      parent_category.update!(slug: "ApPlE")
-      child_category.update!(slug: "OraNGE")
-
-      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
diff --git a/spec/components/concern/second_factor_manager_spec.rb b/spec/components/concern/second_factor_manager_spec.rb
index 0be7d5b9d4..865b1113bb 100644
--- a/spec/components/concern/second_factor_manager_spec.rb
+++ b/spec/components/concern/second_factor_manager_spec.rb
@@ -111,8 +111,8 @@ RSpec.describe SecondFactorManager do
 
     describe 'when SSO is enabled' do
       it 'should return false' do
-        SiteSetting.sso_url = 'http://someurl.com'
-        SiteSetting.enable_sso = true
+        SiteSetting.discourse_connect_url = 'http://someurl.com'
+        SiteSetting.enable_discourse_connect = true
 
         expect(user.totp_enabled?).to eq(false)
       end
@@ -437,8 +437,8 @@ RSpec.describe SecondFactorManager do
 
       describe 'when SSO is enabled' do
         it 'should return false' do
-          SiteSetting.sso_url = 'http://someurl.com'
-          SiteSetting.enable_sso = true
+          SiteSetting.discourse_connect_url = 'http://someurl.com'
+          SiteSetting.enable_discourse_connect = true
 
           expect(user_backup.backup_codes_enabled?).to eq(false)
         end
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index fd2cd6c782..7cffe18edf 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -413,7 +413,7 @@ describe CookedPostProcessor do
         it "generates overlay information" do
           cpp.post_process
 
-          expect(cpp.html).to match_html <<~HTML.rstrip
+          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>
           HTML
 
@@ -433,7 +433,7 @@ describe CookedPostProcessor do
 
             cpp.post_process
 
-            expect(cpp.html).to match_html <<~HTML.rstrip
+            expect(cpp.html).to match_html <<~HTML
               <p><img class="onebox" src="//test.localhost/#{upload_path}/original/1X/1234567890123456.jpg" width="690" height="788"></p>
             HTML
           end
@@ -449,7 +449,7 @@ describe CookedPostProcessor do
 
             cpp.post_process
 
-            expect(cpp.html).to match_html <<~HTML.rstrip
+            expect(cpp.html).to match_html <<~HTML
               <p><img src="//test.localhost/#{upload_path}/original/1X/1234567890123456.svg" width="690" height="788"></p>
             HTML
           end
@@ -576,7 +576,7 @@ describe CookedPostProcessor do
         it "crops the image" do
           cpp.post_process
 
-          expect(cpp.html).to match_html <<~HTML.rstrip
+          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>
           HTML
 
@@ -607,7 +607,7 @@ describe CookedPostProcessor do
         it "generates overlay information" do
           cpp.post_process
 
-          expect(cpp.html). to match_html <<~HTML.rstrip
+          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>
           HTML
 
@@ -618,7 +618,7 @@ describe CookedPostProcessor do
           upload.update!(original_filename: "><img src=x onerror=alert('haha')>.png")
           cpp.post_process
 
-          expect(cpp.html).to match_html <<~HTML.rstrip
+          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>
           HTML
         end
@@ -644,7 +644,7 @@ describe CookedPostProcessor do
         it "generates overlay information using image title and ignores alt" do
           cpp.post_process
 
-          expect(cpp.html).to match_html <<~HTML.rstrip
+          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>
           HTML
 
@@ -672,7 +672,7 @@ describe CookedPostProcessor do
         it "generates overlay information using image title" do
           cpp.post_process
 
-          expect(cpp.html).to match_html <<~HTML.rstrip
+          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>
           HTML
 
@@ -700,7 +700,7 @@ describe CookedPostProcessor do
         it "generates overlay information using image alt" do
           cpp.post_process
 
-          expect(cpp.html).to match_html <<~HTML.rstrip
+          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>
           HTML
 
@@ -772,6 +772,19 @@ describe CookedPostProcessor do
         end
       end
 
+      it "prioritizes data-thumbnail images" do
+        upload1 = Fabricate(:image_upload, width: 1750, height: 2000)
+        upload2 = Fabricate(:image_upload, width: 1750, height: 2000)
+        post = Fabricate(:post, raw: <<~MD)
+          ![alttext|1750x2000](#{upload1.url})
+          ![alttext|1750x2000|thumbnail](#{upload2.url})
+        MD
+
+        CookedPostProcessor.new(post, disable_loading_image: true).post_process
+
+        expect(post.reload.image_upload_id).to eq(upload2.id)
+      end
+
       context "post image" do
         let(:reply) { Fabricate(:post_with_uploaded_image, post_number: 2) }
         let(:cpp) { CookedPostProcessor.new(reply) }
@@ -960,7 +973,7 @@ describe CookedPostProcessor do
       expect(doc.css('img').first['srcset']).to_not eq(nil)
     end
 
-    it "does not optimize animated images" do
+    it "does not optimize animated images but adds a class so animated images can be identified" do
       upload.update!(animated: true)
       post = Fabricate(:post, raw: "![image|1024x768, 50%](#{upload.short_url})")
 
@@ -971,6 +984,7 @@ describe CookedPostProcessor do
       expect(doc.css('.lightbox-wrapper').size).to eq(1)
       expect(doc.css('img').first['src']).to include(upload.url)
       expect(doc.css('img').first['srcset']).to eq(nil)
+      expect(doc.css('img.animated').size).to eq(1)
     end
 
     it "optimizes images in quotes" do
@@ -1202,7 +1216,7 @@ describe CookedPostProcessor do
 
     it "uses schemaless url for uploads" do
       cpp.optimize_urls
-      expect(cpp.html).to match_html <<~HTML.rstrip
+      expect(cpp.html).to match_html <<~HTML
         <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="noopener nofollow ugc">Google</a><br>
@@ -1217,7 +1231,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.rstrip
+        expect(cpp.html).to match_html <<~HTML
           <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="noopener nofollow ugc">Google</a><br>
@@ -1230,7 +1244,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.rstrip
+        expect(cpp.html).to match_html <<~HTML
           <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="noopener nofollow ugc">Google</a><br>
@@ -1244,7 +1258,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.rstrip
+        expect(cpp.html).to match_html <<~HTML
           <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="noopener nofollow ugc">Google</a><br>
@@ -1258,7 +1272,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.rstrip
+        expect(cpp.html).to match_html <<~HTML
           <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="noopener nofollow ugc">Google</a><br>
@@ -1297,7 +1311,7 @@ describe CookedPostProcessor do
           cpp = CookedPostProcessor.new(the_post)
           cpp.optimize_urls
 
-          expect(cpp.html).to match_html <<~HTML.rstrip
+          expect(cpp.html).to match_html <<~HTML
             <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
@@ -1315,7 +1329,7 @@ describe CookedPostProcessor do
           cpp = CookedPostProcessor.new(the_post)
           cpp.optimize_urls
 
-          expect(cpp.html).to match_html <<~HTML.rstrip
+          expect(cpp.html).to match_html <<~HTML
             <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
@@ -1339,17 +1353,14 @@ describe CookedPostProcessor do
             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>
-                          </video>
-                        </div>
+              <p>This post has an S3 video onebox:</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
 
@@ -1365,15 +1376,13 @@ 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.rstrip
-              <p>This post has an S3 video onebox:<br>
-              <div class="onebox video-onebox">
+            expect(cpp.html).to match_html <<~HTML
+              <p>This post has an S3 video onebox:</p><div class="onebox video-onebox">
                 <video width="100%" height="100%" controls="">
                   <source src="#{secure_url}">
                   <a href="#{secure_url}">#{secure_url}</a>
                 </video>
               </div>
-              </p>
             HTML
           end
 
@@ -1415,20 +1424,18 @@ 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.rstrip
-              <p>This post has a video upload.<br>
+            expect(cpp.html).to match_html <<~HTML
+              <p>This post has a video upload.</p>
               <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>
                 </video>
               </div>
-              </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>
-
             HTML
           end
 
@@ -1803,4 +1810,12 @@ describe CookedPostProcessor do
     end
   end
 
+  context "#html" do
+    it "escapes attributes" do
+      post = Fabricate(:post, raw: '<img alt="<something>">')
+      expect(post.cook(post.raw)).to eq('<p><img alt="&lt;something&gt;"></p>')
+      expect(CookedPostProcessor.new(post).html).to eq('<p><img alt="&lt;something&gt;"></p>')
+    end
+  end
+
 end
diff --git a/spec/components/crawler_detection_spec.rb b/spec/components/crawler_detection_spec.rb
index c5f2a2056b..58d7926b13 100644
--- a/spec/components/crawler_detection_spec.rb
+++ b/spec/components/crawler_detection_spec.rb
@@ -69,6 +69,22 @@ describe CrawlerDetection do
 
   end
 
+  describe 'show_browser_update?' do
+    it 'always returns false if setting is empty' do
+      SiteSetting.browser_update_user_agents = ""
+
+      expect(CrawlerDetection.show_browser_update?('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)')).to eq(false)
+      expect(CrawlerDetection.show_browser_update?('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; WOW64; Trident/6.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; .NET4.0C; .NET4.0E)')).to eq(false)
+    end
+
+    it 'returns true if setting matches user agent' do
+      SiteSetting.browser_update_user_agents = "MSIE 6|MSIE 7|MSIE 8|MSIE 9"
+
+      expect(CrawlerDetection.show_browser_update?('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)')).to eq(false)
+      expect(CrawlerDetection.show_browser_update?('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; WOW64; Trident/6.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; .NET4.0C; .NET4.0E)')).to eq(true)
+    end
+  end
+
   describe 'allow_crawler?' do
     it 'returns true if allowlist and blocklist are blank' do
       expect(CrawlerDetection.allow_crawler?('Googlebot/2.1 (+http://www.google.com/bot.html)')).to eq(true)
diff --git a/spec/components/discourse_plugin_registry_spec.rb b/spec/components/discourse_plugin_registry_spec.rb
index 186dc69d27..0eb7547c83 100644
--- a/spec/components/discourse_plugin_registry_spec.rb
+++ b/spec/components/discourse_plugin_registry_spec.rb
@@ -233,13 +233,6 @@ describe DiscoursePluginRegistry do
       expect(registry.stylesheets[plugin_directory_name]).to eq(nil)
     end
 
-    it "registers sass variable properly" do
-      registry.register_asset("test.css", :variables)
-
-      expect(registry.sass_variables.count).to eq(1)
-      expect(registry.stylesheets.count).to eq(0)
-    end
-
     it "registers admin javascript properly" do
       registry.register_asset("my_admin.js", :admin)
 
diff --git a/spec/components/discourse_spec.rb b/spec/components/discourse_spec.rb
index 145c1b6fbc..701cc39950 100644
--- a/spec/components/discourse_spec.rb
+++ b/spec/components/discourse_spec.rb
@@ -65,6 +65,25 @@ describe Discourse do
     end
   end
 
+  context "asset_filter_options" do
+    it "obmits path if request is missing" do
+      opts = Discourse.asset_filter_options(:js, nil)
+      expect(opts[:path]).to be_blank
+    end
+
+    it "returns a hash with a path from the request" do
+      req = stub(fullpath: "/hello", headers: {})
+      opts = Discourse.asset_filter_options(:js, req)
+      expect(opts[:path]).to eq("/hello")
+    end
+
+    it "overwrites the path if the asset path is present" do
+      req = stub(fullpath: "/bootstrap.json", headers: { "HTTP_X_DISCOURSE_ASSET_PATH" => "/hello" })
+      opts = Discourse.asset_filter_options(:js, req)
+      expect(opts[:path]).to eq("/hello")
+    end
+  end
+
   context 'plugins' do
     let(:plugin_class) do
       Class.new(Plugin::Instance) do
@@ -78,8 +97,14 @@ describe Discourse do
     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
+      Discourse.plugins.append(plugin1, plugin2)
+    end
+
+    after do
+      Discourse.plugins.delete plugin1
+      Discourse.plugins.delete plugin2
+    end
 
     before do
       plugin_class.any_instance.stubs(:css_asset_exists?).returns(true)
@@ -87,13 +112,13 @@ describe Discourse do
     end
 
     it 'can find plugins correctly' do
-      expect(Discourse.plugins).to contain_exactly(plugin1, plugin2)
+      expect(Discourse.plugins).to include(plugin1, plugin2)
 
       # Exclude disabled plugins by default
-      expect(Discourse.find_plugins({})).to contain_exactly(plugin1)
+      expect(Discourse.find_plugins({})).to include(plugin1)
 
       # Include disabled plugins when requested
-      expect(Discourse.find_plugins(include_disabled: true)).to contain_exactly(plugin1, plugin2)
+      expect(Discourse.find_plugins(include_disabled: true)).to include(plugin1, plugin2)
     end
 
     it 'can find plugin assets' do
@@ -101,7 +126,7 @@ describe Discourse do
 
       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|
+      plugin1.register_asset_filter do |type, request, opts|
         false
       end
       expect(Discourse.find_plugin_css_assets({}).length).to eq(1)
@@ -396,6 +421,10 @@ describe Discourse do
       expect do
         Discourse::Utils.execute_command("sleep", "999999999999", timeout: 0.001)
       end.to raise_error(RuntimeError)
+
+      expect do
+        Discourse::Utils.execute_command({ "MYENV" => "MYVAL" }, "sleep", "999999999999", timeout: 0.001)
+      end.to raise_error(RuntimeError)
     end
 
     it "works with a block" do
@@ -428,6 +457,21 @@ describe Discourse do
       has_checked_chdir = true
       thread.join
     end
+
+    it "raises error for unsafe shell" do
+      expect(Discourse::Utils.execute_command("pwd").strip).to eq(Rails.root.to_s)
+
+      expect do
+        Discourse::Utils.execute_command("echo a b c")
+      end.to raise_error(RuntimeError)
+
+      expect do
+        Discourse::Utils.execute_command({ "ENV1" => "VAL" }, "echo a b c")
+      end.to raise_error(RuntimeError)
+
+      expect(Discourse::Utils.execute_command("echo", "a", "b", "c").strip).to eq("a b c")
+      expect(Discourse::Utils.execute_command("echo a b c", unsafe_shell: true).strip).to eq("a b c")
+    end
   end
 
 end
diff --git a/spec/components/discourse_tagging_spec.rb b/spec/components/discourse_tagging_spec.rb
index 3af0784ec2..30e51bcad0 100644
--- a/spec/components/discourse_tagging_spec.rb
+++ b/spec/components/discourse_tagging_spec.rb
@@ -265,12 +265,30 @@ describe DiscourseTagging do
         expect(topic.errors[:base]&.first).to eq(I18n.t("tags.restricted_tag_disallowed", tag: 'alpha'))
       end
 
+      it "does not send a discourse event for regular users who can't add staff-only tags" do
+        events = DiscourseEvent.track_events do
+          DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), ['alpha'])
+        end
+        expect(events.count).to eq(0)
+      end
+
       it 'staff can add staff-only tags' do
         valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(admin), ['alpha'])
         expect(valid).to eq(true)
         expect(topic.errors[:base]).to be_empty
       end
 
+      it 'sends a discourse event when the staff adds a staff-only tag' do
+        old_tag_names = topic.tags.pluck(:name)
+        tag_changed_event = DiscourseEvent.track_events do
+          DiscourseTagging.tag_topic_by_names(topic, Guardian.new(admin), ['alpha'])
+        end.last
+        expect(tag_changed_event[:event_name]).to eq(:topic_tags_changed)
+        expect(tag_changed_event[:params].first).to eq(topic)
+        expect(tag_changed_event[:params].second[:old_tag_names]).to eq(old_tag_names)
+        expect(tag_changed_event[:params].second[:new_tag_names]).to eq(['alpha'])
+      end
+
       context 'non-staff users in tag group groups' do
         fab!(:non_staff_group) { Fabricate(:group, name: 'non_staff_group') }
 
@@ -441,7 +459,7 @@ describe DiscourseTagging do
         valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [])
         expect(valid).to eq(false)
         expect(topic.errors[:base]&.first).to eq(
-          I18n.t("tags.required_tags_from_group", count: 1, tag_group_name: tag_group.name)
+          I18n.t("tags.required_tags_from_group", count: 1, tag_group_name: tag_group.name, tags: tag_group.tags.pluck(:name).join(", "))
         )
       end
 
@@ -449,7 +467,7 @@ describe DiscourseTagging do
         valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [tag3.name])
         expect(valid).to eq(false)
         expect(topic.errors[:base]&.first).to eq(
-          I18n.t("tags.required_tags_from_group", count: 1, tag_group_name: tag_group.name)
+          I18n.t("tags.required_tags_from_group", count: 1, tag_group_name: tag_group.name, tags: tag_group.tags.pluck(:name).join(", "))
         )
       end
 
@@ -546,6 +564,10 @@ describe DiscourseTagging do
         SiteSetting.force_lowercase_tags = false
         expect(DiscourseTagging.clean_tag("HeLlO")).to eq("HeLlO")
       end
+
+      it "removes zero-width spaces" do
+        expect(DiscourseTagging.clean_tag("hel\ufefflo")).to eq("hello")
+      end
     end
   end
 
diff --git a/spec/components/discourse_updates_spec.rb b/spec/components/discourse_updates_spec.rb
index 4b83510c24..6bb8fd2740 100644
--- a/spec/components/discourse_updates_spec.rb
+++ b/spec/components/discourse_updates_spec.rb
@@ -144,4 +144,80 @@ describe DiscourseUpdates do
       include_examples "when last_installed_version is old"
     end
   end
+
+  context 'new features' do
+    fab!(:admin) { Fabricate(:admin) }
+    fab!(:admin2) { Fabricate(:admin) }
+    let!(:last_item_date) { 5.minutes.ago }
+    let!(:sample_features) { [
+      { "emoji" => "🤾", "title" => "Super Fruits", "description" => "Taste explosion!", "created_at" => 40.minutes.ago },
+      { "emoji" => "🙈", "title" => "Fancy Legumes", "description" => "Magic legumes!", "created_at" => 15.minutes.ago },
+      { "emoji" => "🤾", "title" => "Quality Veggies", "description" => "Green goodness!", "created_at" => last_item_date },
+    ] }
+
+    before(:each) do
+      Discourse.redis.del "new_features_last_seen_user_#{admin.id}"
+      Discourse.redis.del "new_features_last_seen_user_#{admin2.id}"
+      Discourse.redis.set('new_features', MultiJson.dump(sample_features))
+    end
+
+    it 'returns all items on the first run' do
+      result = DiscourseUpdates.new_features
+
+      expect(result.length).to eq(3)
+      expect(result[2]["title"]).to eq("Super Fruits")
+    end
+
+    it 'correctly marks unseen items by user' do
+      DiscourseUpdates.stubs(:new_features_last_seen).with(admin.id).returns(10.minutes.ago)
+      DiscourseUpdates.stubs(:new_features_last_seen).with(admin2.id).returns(30.minutes.ago)
+
+      expect(DiscourseUpdates.has_unseen_features?(admin.id)).to eq(true)
+      expect(DiscourseUpdates.has_unseen_features?(admin2.id)).to eq(true)
+    end
+
+    it 'can mark features as seen for a given user' do
+      expect(DiscourseUpdates.has_unseen_features?(admin.id)).to be_truthy
+
+      DiscourseUpdates.mark_new_features_as_seen(admin.id)
+      expect(DiscourseUpdates.has_unseen_features?(admin.id)).to eq(false)
+
+      # doesn't affect another user
+      expect(DiscourseUpdates.has_unseen_features?(admin2.id)).to eq(true)
+    end
+
+    it 'correctly sees newly added features as unseen' do
+      DiscourseUpdates.mark_new_features_as_seen(admin.id)
+      expect(DiscourseUpdates.has_unseen_features?(admin.id)).to eq(false)
+      expect(DiscourseUpdates.new_features_last_seen(admin.id)).to be_within(1.second).of (last_item_date)
+
+      updated_features = [
+        { "emoji" => "🤾", "title" => "Brand New Item", "created_at" => 2.minutes.ago }
+      ]
+      updated_features += sample_features
+
+      Discourse.redis.set('new_features', MultiJson.dump(updated_features))
+      expect(DiscourseUpdates.has_unseen_features?(admin.id)).to eq(true)
+    end
+
+    it 'correctly shows features by Discourse version' do
+      features_with_versions = [
+        { "emoji" => "🤾", "title" => "Bells", "created_at" => 2.days.ago },
+        { "emoji" => "🙈", "title" => "Whistles", "created_at" => 120.minutes.ago, discourse_version: "2.6.0.beta1" },
+        { "emoji" => "🙈", "title" => "Confetti", "created_at" => 15.minutes.ago, discourse_version: "2.7.0.beta2" },
+        { "emoji" => "🤾", "title" => "Not shown yet", "created_at" => 10.minutes.ago, discourse_version: "2.7.0.beta5" },
+        { "emoji" => "🤾", "title" => "Not shown yet (beta < stable)", "created_at" => 10.minutes.ago, discourse_version: "2.7.0" },
+        { "emoji" => "🤾", "title" => "Ignore invalid version", "created_at" => 10.minutes.ago, discourse_version: "invalid-version" },
+      ]
+
+      Discourse.redis.set('new_features', MultiJson.dump(features_with_versions))
+      DiscourseUpdates.stubs(:last_installed_version).returns("2.7.0.beta2")
+      result = DiscourseUpdates.new_features
+
+      expect(result.length).to eq(3)
+      expect(result[0]["title"]).to eq("Confetti")
+      expect(result[1]["title"]).to eq("Whistles")
+      expect(result[2]["title"]).to eq("Bells")
+    end
+  end
 end
diff --git a/spec/components/email/email_spec.rb b/spec/components/email/email_spec.rb
index 7db7107acd..b2127041e3 100644
--- a/spec/components/email/email_spec.rb
+++ b/spec/components/email/email_spec.rb
@@ -44,6 +44,27 @@ describe Email do
 
   end
 
+  describe "obfuscate" do
+
+    it 'correctly obfuscates emails' do
+      expect(Email.obfuscate('a@b.com')).to eq('*@*.com')
+      expect(Email.obfuscate('test@test.co.uk')).to eq('t***@t***.**.uk')
+      expect(Email.obfuscate('simple@example.com')).to eq('s****e@e*****e.com')
+      expect(Email.obfuscate('very.common@example.com')).to eq('v*********n@e*****e.com')
+      expect(Email.obfuscate('disposable.style.email.with+symbol@example.com')).to eq('d********************************l@e*****e.com')
+      expect(Email.obfuscate('other.email-with-hyphen@example.com')).to eq('o*********************n@e*****e.com')
+      expect(Email.obfuscate('fully-qualified-domain@example.com')).to eq('f********************n@e*****e.com')
+      expect(Email.obfuscate('user.name+tag+sorting@example.com')).to eq('u*******************g@e*****e.com')
+      expect(Email.obfuscate('x@example.com')).to eq('*@e*****e.com')
+      expect(Email.obfuscate('example-indeed@strange-example.com')).to eq('e************d@s*************e.com')
+      expect(Email.obfuscate('example@s.example')).to eq('e*****e@*.example')
+      expect(Email.obfuscate('mailhost!username@example.org')).to eq('m***************e@e*****e.org')
+      expect(Email.obfuscate('user%example.com@example.org')).to eq('u**************m@e*****e.org')
+      expect(Email.obfuscate('user-@example.org')).to eq('u***-@e*****e.org')
+    end
+
+  end
+
   describe "message_id_rfc_format" do
 
     it "returns message ID in RFC format" do
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index 8471b4663f..fcdc094058 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -11,8 +11,8 @@ describe Email::Receiver do
     SiteSetting.alternative_reply_by_email_addresses = "alt+%{reply_key}@bar.com"
   end
 
-  def process(email_name)
-    Email::Receiver.new(email(email_name)).process!
+  def process(email_name, opts = {})
+    Email::Receiver.new(email(email_name), opts).process!
   end
 
   it "raises an EmptyEmailError when 'mail_string' is blank" do
@@ -350,6 +350,13 @@ describe Email::Receiver do
       expect(topic.posts.last.raw).to eq("This is a **HTML** reply ;)")
     end
 
+    it "stores the created_via source against the incoming email" do
+      process(:text_reply, source: :handle_mail)
+      expect(IncomingEmail.last.created_via).to eq(IncomingEmail.created_via_types[:handle_mail])
+      process(:text_and_html_reply, source: :imap)
+      expect(IncomingEmail.last.created_via).to eq(IncomingEmail.created_via_types[:imap])
+    end
+
     it "automatically elides gmail quotes" do
       SiteSetting.always_show_trimmed_content = true
       expect { process(:gmail_html_reply) }.to change { topic.posts.count }
@@ -523,16 +530,22 @@ describe Email::Receiver do
 
     it "doesn't include the 'elided' part of the original message when always_show_trimmed_content is disabled" do
       SiteSetting.always_show_trimmed_content = false
-      expect { process(:original_message) }.to change { topic.posts.count }.from(1).to(2)
+      expect { process(:original_message) }.to change { topic.posts.count }
       expect(topic.posts.last.raw).to eq("This is a reply :)")
     end
 
     it "adds the 'elided' part of the original message for public replies when always_show_trimmed_content is enabled" do
       SiteSetting.always_show_trimmed_content = true
-      expect { process(:original_message) }.to change { topic.posts.count }.from(1).to(2)
+      expect { process(:original_message) }.to change { topic.posts.count }
       expect(topic.posts.last.raw).to eq("This is a reply :)\n\n<details class='elided'>\n<summary title='Show trimmed content'>&#183;&#183;&#183;</summary>\n\n---Original Message---\nThis part should not be included\n\n</details>")
     end
 
+    it "doesn't trim the message when trim_incoming_emails is disabled" do
+      SiteSetting.trim_incoming_emails = false
+      expect { process(:original_message) }.to change { topic.posts.count }
+      expect(topic.posts.last.raw).to eq("This is a reply :)\n\n---Original Message---\nThis part should not be included")
+    end
+
     it "supports attached images in TEXT part" do
       SiteSetting.incoming_email_prefer_html = false
 
@@ -652,6 +665,14 @@ describe Email::Receiver do
       MD
     end
 
+    it "can decode attachments" do
+      SiteSetting.authorized_extensions = "pdf"
+      Fabricate(:group, incoming_email: "one@foo.com")
+
+      process(:encoded_filename)
+      expect(Upload.last.original_filename).to eq("This is a test.pdf")
+    end
+
     context "when attachment is rejected" do
       it "sends out the warning email" do
         expect { process(:attached_txt_file) }.to change { EmailLog.count }.by(1)
@@ -957,8 +978,9 @@ describe Email::Receiver do
         expect { process(:email_reply_2) }.to change { topic.posts.count }.by(1).and change { Topic.count }.by(0)
       end
 
-      it "creates a new topic when the sender is not known" do
+      it "creates a new topic when the sender is not known and the group does not allow unknown senders to reply to topics" do
         IncomingEmail.where(message_id: '34@foo.bar.mail').update(cc_addresses: 'three@foo.com')
+        group.update(allow_unknown_sender_topic_replies: false)
         expect { process(:email_reply_2) }.to change { topic.posts.count }.by(0).and change { Topic.count }.by(1)
       end
 
@@ -966,6 +988,25 @@ describe Email::Receiver do
         IncomingEmail.where(message_id: '34@foo.bar.mail').update(message_id: '99@foo.bar.mail')
         expect { process(:email_reply_2) }.to change { topic.posts.count }.by(0).and change { Topic.count }.by(1)
       end
+
+      it "includes the sender on the topic when the message id is known, the sender is not known, and the group allows unknown senders to reply to topics" do
+        IncomingEmail.where(message_id: '34@foo.bar.mail').update(cc_addresses: 'three@foo.com')
+        group.update(allow_unknown_sender_topic_replies: true)
+        expect { process(:email_reply_2) }.to change { topic.posts.count }.by(1).and change { Topic.count }.by(0)
+      end
+
+      context "when the sender is not in the topic allowed users" do
+        before do
+          user = User.find_by_email("two@foo.com")
+          topic.topic_allowed_users.find_by(user: user).destroy
+        end
+
+        it "adds them to the topic at the same time" do
+          IncomingEmail.where(message_id: '34@foo.bar.mail').update(cc_addresses: 'three@foo.com')
+          group.update(allow_unknown_sender_topic_replies: true)
+          expect { process(:email_reply_2) }.to change { topic.posts.count }.by(1).and change { Topic.count }.by(0)
+        end
+      end
     end
   end
 
diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb
index a5b4892991..3f80e23b2a 100644
--- a/spec/components/email/sender_spec.rb
+++ b/spec/components/email/sender_spec.rb
@@ -439,7 +439,7 @@ describe Email::Sender do
         @secure_image_file = file_from_fixtures("logo.png", "images")
         @secure_image = UploadCreator.new(@secure_image_file, "logo.png")
           .create_for(Discourse.system_user.id)
-        @secure_image.update_secure_status(secure_override_value: true)
+        @secure_image.update_secure_status(override: true)
         @secure_image.update(access_control_post_id: reply.id)
         reply.update(raw: reply.raw + "\n" + "#{UploadMarkdown.new(@secure_image).image_markdown}")
         reply.rebake!
diff --git a/spec/components/email/styles_spec.rb b/spec/components/email/styles_spec.rb
index 4c1db48904..1520662dc5 100644
--- a/spec/components/email/styles_spec.rb
+++ b/spec/components/email/styles_spec.rb
@@ -159,14 +159,14 @@ describe Email::Styles do
 
   context "strip_avatars_and_emojis" do
     it "works for lonesome emoji with no title" do
-      emoji = "<img src='/images/emoji/emoji_one/crying_cat_face.png'>"
+      emoji = "<img src='/images/emoji/twitter/crying_cat_face.png'>"
       style = Email::Styles.new(emoji)
       style.strip_avatars_and_emojis
       expect(style.to_html).to match_html(emoji)
     end
 
     it "works for lonesome emoji with title" do
-      emoji = "<img title='cry_cry' src='/images/emoji/emoji_one/crying_cat_face.png'>"
+      emoji = "<img title='cry_cry' src='/images/emoji/twitter/crying_cat_face.png'>"
       style = Email::Styles.new(emoji)
       style.strip_avatars_and_emojis
       expect(style.to_html).to match_html("cry_cry")
diff --git a/spec/components/email_updater_spec.rb b/spec/components/email_updater_spec.rb
index 31dbe7af9d..f70c009b50 100644
--- a/spec/components/email_updater_spec.rb
+++ b/spec/components/email_updater_spec.rb
@@ -17,6 +17,15 @@ describe EmailUpdater do
     expect(updater.errors.messages[:base].first).to be I18n.t("change_email.error_staged")
   end
 
+  it "does not create multiple email change requests" do
+    user = Fabricate(:user)
+
+    EmailUpdater.new(guardian: Fabricate(:admin).guardian, user: user).change_to(new_email)
+    EmailUpdater.new(guardian: Fabricate(:admin).guardian, user: user).change_to(new_email)
+
+    expect(user.email_change_requests.count).to eq(1)
+  end
+
   context "when an admin is changing the email of another user" do
     let(:admin) { Fabricate(:admin) }
     let(:updater) { EmailUpdater.new(guardian: admin.guardian, user: user) }
@@ -230,6 +239,23 @@ describe EmailUpdater do
         end
       end
     end
+
+    context "max_allowed_secondary_emails" do
+      let(:secondary_email_1) { "secondary_1@email.com" }
+      let(:secondary_email_2) { "secondary_2@email.com" }
+
+      before do
+        SiteSetting.max_allowed_secondary_emails = 2
+        Fabricate(:secondary_email, user: user, primary: false, email: secondary_email_1)
+        Fabricate(:secondary_email, user: user, primary: false, email: secondary_email_2)
+      end
+
+      it "max secondary_emails limit reached" do
+        updater.change_to(new_email, add: true)
+        expect(updater.errors).to be_present
+        expect(updater.errors.messages[:base].first).to be I18n.t("change_email.max_secondary_emails_error")
+      end
+    end
   end
 
   context 'as a staff user' do
diff --git a/spec/components/excerpt_parser_spec.rb b/spec/components/excerpt_parser_spec.rb
index 363dd049e0..61eda9941a 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.rstrip)
+    expect(ExcerptParser.get_excerpt(html, 50, {})).to match_html <<~HTML
       <details><summary>FOO</summary>BAR
       Lorem ipsum dolor sit amet, consectetur adi&hellip;</details>
     HTML
diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb
index e9e4f7c3dc..8b6831219b 100644
--- a/spec/components/file_store/s3_store_spec.rb
+++ b/spec/components/file_store/s3_store_spec.rb
@@ -6,7 +6,7 @@ require 'file_store/local_store'
 
 describe FileStore::S3Store do
   let(:store) { FileStore::S3Store.new }
-  let(:s3_helper) { store.instance_variable_get(:@s3_helper) }
+  let(:s3_helper) { store.s3_helper }
   let(:client) { Aws::S3::Client.new(stub_responses: true) }
   let(:resource) { Aws::S3::Resource.new(client: client) }
   let(:s3_bucket) { resource.bucket("s3-upload-bucket") }
diff --git a/spec/components/final_destination_spec.rb b/spec/components/final_destination_spec.rb
index ff61289e8a..678423e0cf 100644
--- a/spec/components/final_destination_spec.rb
+++ b/spec/components/final_destination_spec.rb
@@ -9,7 +9,7 @@ describe FinalDestination do
     {
       ignore_redirects: ['https://ignore-me.com'],
 
-      force_get_hosts: ['https://force.get.com'],
+      force_get_hosts: ['https://force.get.com', 'https://*.ihaveawildcard.com/'],
 
       preserve_fragment_url_hosts: ['https://eviltrout.com'],
 
@@ -17,6 +17,7 @@ describe FinalDestination do
       lookup_ip: lambda do |host|
         case host
         when 'eviltrout.com' then '52.84.143.152'
+        when 'particularly.eviltrout.com' then '52.84.143.152'
         when 'codinghorror.com' then '91.146.108.148'
         when 'discourse.org' then '104.25.152.10'
         when 'some_thing.example.com' then '104.25.152.10'
@@ -24,6 +25,7 @@ describe FinalDestination do
         when 'internal-ipv6.com' then '2001:abc:de:01:3:3d0:6a65:c2bf'
         when 'ignore-me.com' then '53.84.143.152'
         when 'force.get.com' then '22.102.29.40'
+        when 'any-subdomain.ihaveawildcard.com' then '104.25.152.11'
         when 'wikipedia.com' then '1.2.3.4'
         else
           as_ip = IPAddr.new(host)
@@ -170,8 +172,11 @@ describe FinalDestination do
       before do
         stub_request(:head, 'https://force.get.com/posts?page=4')
         stub_request(:get, 'https://force.get.com/posts?page=4')
+        stub_request(:get, 'https://any-subdomain.ihaveawildcard.com/some/other/content')
         stub_request(:head, 'https://eviltrout.com/posts?page=2')
         stub_request(:get, 'https://eviltrout.com/posts?page=2')
+        stub_request(:head, 'https://particularly.eviltrout.com/has/a/secret/plan')
+        stub_request(:get, 'https://particularly.eviltrout.com/has/a/secret/plan')
       end
 
       it "will do a GET when forced" do
@@ -189,6 +194,23 @@ describe FinalDestination do
         expect(WebMock).to_not have_requested(:get, 'https://eviltrout.com/posts?page=2')
         expect(WebMock).to have_requested(:head, 'https://eviltrout.com/posts?page=2')
       end
+
+      it "will do a GET when forced on a wildcard subdomain" do
+        final = FinalDestination.new('https://any-subdomain.ihaveawildcard.com/some/other/content', opts)
+        expect(final.resolve.to_s).to eq('https://any-subdomain.ihaveawildcard.com/some/other/content')
+        expect(final.status).to eq(:resolved)
+        expect(WebMock).to have_requested(:get, 'https://any-subdomain.ihaveawildcard.com/some/other/content')
+        expect(WebMock).to_not have_requested(:head, 'https://any-subdomain.ihaveawildcard.com/some/other/content')
+      end
+
+      it "will do a HEAD if on a subdomain of a forced get domain without a wildcard" do
+        final = FinalDestination.new('https://particularly.eviltrout.com/has/a/secret/plan', opts)
+        expect(final.resolve.to_s).to eq('https://particularly.eviltrout.com/has/a/secret/plan')
+        expect(final.status).to eq(:resolved)
+        expect(WebMock).to_not have_requested(:get, 'https://particularly.eviltrout.com/has/a/secret/plan')
+        expect(WebMock).to have_requested(:head, 'https://particularly.eviltrout.com/has/a/secret/plan')
+      end
+
     end
 
     context "HEAD not supported" do
@@ -463,7 +485,7 @@ describe FinalDestination do
       expect(fd(fragment_url).escape_url.to_s).to eq(fragment_url)
 
       expect(fd("https://eviltrout.com?s=180&#038;d=mm&#038;r=g").escape_url.to_s)
-        .to eq("https://eviltrout.com?s=180&d=mm&r=g")
+        .to eq("https://eviltrout.com?s=180&#038;d=mm&%23038;r=g")
 
       expect(fd("http://example.com/?a=\11\15").escape_url.to_s).to eq("http://example.com/?a=%09%0D")
 
diff --git a/spec/components/freedom_patches/translate_accelerator_spec.rb b/spec/components/freedom_patches/translate_accelerator_spec.rb
index 930e4b3370..cd52c799ed 100644
--- a/spec/components/freedom_patches/translate_accelerator_spec.rb
+++ b/spec/components/freedom_patches/translate_accelerator_spec.rb
@@ -30,7 +30,7 @@ describe "translate accelerator" do
     orig = I18n.t('i_am_an_unknown_key99')
 
     expect(I18n.t('i_am_an_unknown_key99').object_id).to eq(orig.object_id)
-    expect(I18n.t('i_am_an_unknown_key99')).to eq("translation missing: en_US.i_am_an_unknown_key99")
+    expect(I18n.t('i_am_an_unknown_key99')).to eq("translation missing: en.i_am_an_unknown_key99")
   end
 
   it "returns the correct language" do
@@ -46,6 +46,13 @@ describe "translate accelerator" do
     end
   end
 
+  it "converts language keys to symbols" do
+    expect(I18n.t('foo', locale: :en)).to eq('Foo in :en')
+    expect(I18n.t('foo', locale: "en")).to eq('Foo in :en')
+
+    expect(I18n.instance_variable_get(:@loaded_locales)).to contain_exactly(:en)
+  end
+
   it "overrides for both string and symbol keys" do
     key = 'user.email.not_allowed'
     text_overriden = 'foobar'
@@ -68,8 +75,8 @@ describe "translate accelerator" do
 
       expect(I18n.instance_variable_get(:@overrides_by_site)).to eq(
         'default' => {
-          'en' => { 'got' => 'summer' },
-          'zh_TW' => { 'got' => '冬季' }
+          en: { 'got' => 'summer' },
+          zh_TW: { 'got' => '冬季' }
         }
       )
     end
@@ -172,11 +179,17 @@ describe "translate accelerator" do
       expect(I18n.t('items', count: 1)).to eq('one fish')
     end
 
-    it "supports one and other with fallback locale" do
-      override_translation('en_US', 'items.one', 'one fish')
-      override_translation('en_US', 'items.other', '%{count} fishies')
+    it "works with strings and symbols for non-pluralized string when count is given" do
+      override_translation('en', 'fish', 'trout')
+      expect(I18n.t(:fish, count: 1)).to eq('trout')
+      expect(I18n.t('fish', count: 1)).to eq('trout')
+    end
 
-      I18n.with_locale(:en_US) do
+    it "supports one and other with fallback locale" do
+      override_translation('en_GB', 'items.one', 'one fish')
+      override_translation('en_GB', 'items.other', '%{count} fishies')
+
+      I18n.with_locale(:en_GB) do
         expect(I18n.t('items', count: 13)).to eq('13 fishies')
         expect(I18n.t('items', count: 1)).to eq('one fish')
       end
diff --git a/spec/components/guardian/topic_guardian_spec.rb b/spec/components/guardian/topic_guardian_spec.rb
new file mode 100644
index 0000000000..c42d44a079
--- /dev/null
+++ b/spec/components/guardian/topic_guardian_spec.rb
@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe TopicGuardian do
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:tl3_user) { Fabricate(:leader) }
+  fab!(:moderator) { Fabricate(:moderator) }
+  fab!(:category) { Fabricate(:category) }
+
+  describe '#can_create_shared_draft?' do
+    it 'when shared_drafts are disabled' do
+      SiteSetting.shared_drafts_min_trust_level = 'admin'
+
+      expect(Guardian.new(admin).can_create_shared_draft?).to eq(false)
+    end
+
+    it 'when user is a moderator and access is set to admin' do
+      SiteSetting.shared_drafts_category = category.id
+      SiteSetting.shared_drafts_min_trust_level = 'admin'
+
+      expect(Guardian.new(moderator).can_create_shared_draft?).to eq(false)
+    end
+
+    it 'when user is a moderator and access is set to staff' do
+      SiteSetting.shared_drafts_category = category.id
+      SiteSetting.shared_drafts_min_trust_level = 'staff'
+
+      expect(Guardian.new(moderator).can_create_shared_draft?).to eq(true)
+    end
+
+    it 'when user is TL3 and access is set to TL2' do
+      SiteSetting.shared_drafts_category = category.id
+      SiteSetting.shared_drafts_min_trust_level = '2'
+
+      expect(Guardian.new(tl3_user).can_create_shared_draft?).to eq(true)
+    end
+  end
+
+  describe '#can_see_shared_draft?' do
+    it 'when shared_drafts are disabled (existing shared drafts)' do
+      SiteSetting.shared_drafts_min_trust_level = 'admin'
+
+      expect(Guardian.new(admin).can_see_shared_draft?).to eq(true)
+    end
+
+    it 'when user is a moderator and access is set to admin' do
+      SiteSetting.shared_drafts_category = category.id
+      SiteSetting.shared_drafts_min_trust_level = 'admin'
+
+      expect(Guardian.new(moderator).can_see_shared_draft?).to eq(false)
+    end
+
+    it 'when user is a moderator and access is set to staff' do
+      SiteSetting.shared_drafts_category = category.id
+      SiteSetting.shared_drafts_min_trust_level = 'staff'
+
+      expect(Guardian.new(moderator).can_see_shared_draft?).to eq(true)
+    end
+
+    it 'when user is TL3 and access is set to TL2' do
+      SiteSetting.shared_drafts_category = category.id
+      SiteSetting.shared_drafts_min_trust_level = '2'
+
+      expect(Guardian.new(tl3_user).can_see_shared_draft?).to eq(true)
+    end
+  end
+
+  describe '#can_edit_topic?' do
+    context 'when the topic is a shared draft' do
+      let(:tl2_user) { Fabricate(:user, trust_level: TrustLevel[2])  }
+
+      before do
+        SiteSetting.shared_drafts_category = category.id
+        SiteSetting.shared_drafts_min_trust_level = '2'
+      end
+
+      it 'returns false if the topic is a PM' do
+        pm_with_draft = Fabricate(:private_message_topic, category: category)
+        Fabricate(:shared_draft, topic: pm_with_draft)
+
+        expect(Guardian.new(tl2_user).can_edit_topic?(pm_with_draft)).to eq(false)
+      end
+
+      it 'returns false if the topic is archived' do
+        archived_topic = Fabricate(:topic, archived: true, category: category)
+        Fabricate(:shared_draft, topic: archived_topic)
+
+        expect(Guardian.new(tl2_user).can_edit_topic?(archived_topic)).to eq(false)
+      end
+
+      it 'returns true if a shared draft exists' do
+        topic = Fabricate(:topic, category: category)
+        Fabricate(:shared_draft, topic: topic)
+
+        expect(Guardian.new(tl2_user).can_edit_topic?(topic)).to eq(true)
+      end
+
+      it 'returns false if the user has a lower trust level' do
+        tl1_user = Fabricate(:user, trust_level: TrustLevel[1])
+        topic = Fabricate(:topic, category: category)
+        Fabricate(:shared_draft, topic: topic)
+
+        expect(Guardian.new(tl1_user).can_edit_topic?(topic)).to eq(false)
+      end
+
+      it 'returns true if the shared_draft is from a different category' do
+        topic = Fabricate(:topic, category: Fabricate(:category))
+        Fabricate(:shared_draft, topic: topic)
+
+        expect(Guardian.new(tl2_user).can_edit_topic?(topic)).to eq(false)
+      end
+    end
+  end
+end
diff --git a/spec/components/guardian/user_guardian_spec.rb b/spec/components/guardian/user_guardian_spec.rb
index fc516cf70d..ef87af6399 100644
--- a/spec/components/guardian/user_guardian_spec.rb
+++ b/spec/components/guardian/user_guardian_spec.rb
@@ -237,8 +237,8 @@ describe UserGuardian do
       include_examples "can_delete_user examples"
 
       it "isn't allowed when SSO is enabled" do
-        SiteSetting.sso_url = "https://www.example.com/sso"
-        SiteSetting.enable_sso = true
+        SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+        SiteSetting.enable_discourse_connect = true
         expect(guardian.can_delete_user?(user)).to eq(false)
       end
 
@@ -455,5 +455,4 @@ describe UserGuardian do
       expect(guardian.can_upload_user_card_background?(trust_level_1)).to eq(false)
     end
   end
-
 end
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index e2a2a9bca0..54735be65b 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -511,12 +511,6 @@ describe Guardian do
       expect(Guardian.new(user).can_invite_to_forum?).to be_falsey
     end
 
-    it 'returns false when the local logins are disabled' do
-      SiteSetting.enable_local_logins = false
-      expect(Guardian.new(user).can_invite_to_forum?).to be_falsey
-      expect(Guardian.new(moderator).can_invite_to_forum?).to be_falsey
-    end
-
     context 'with groups' do
       let(:groups) { [group, another_group] }
 
@@ -585,6 +579,12 @@ describe Guardian do
         expect(Guardian.new(trust_level_2).can_invite_to?(topic)).to be_truthy
       end
 
+      it 'fails for normal users if must_approve_users' do
+        SiteSetting.must_approve_users = true
+        expect(Guardian.new(user).can_invite_to?(topic)).to be_falsey
+        expect(Guardian.new(admin).can_invite_to?(topic)).to be_truthy
+      end
+
       describe 'for a private category for automatic and non-automatic group' do
         let(:category) do
           Fabricate(:category, read_restricted: true).tap do |category|
@@ -689,13 +689,13 @@ describe Guardian do
       expect(Guardian.new(admin).can_invite_via_email?(topic)).to be_truthy
     end
 
-    it 'returns false for all users when sso is enabled' do
-      SiteSetting.sso_url = "https://www.example.com/sso"
-      SiteSetting.enable_sso = true
+    it 'returns true for all users when sso is enabled' do
+      SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+      SiteSetting.enable_discourse_connect = true
 
-      expect(Guardian.new(trust_level_2).can_invite_via_email?(topic)).to be_falsey
-      expect(Guardian.new(moderator).can_invite_via_email?(topic)).to be_falsey
-      expect(Guardian.new(admin).can_invite_via_email?(topic)).to be_falsey
+      expect(Guardian.new(trust_level_2).can_invite_via_email?(topic)).to be_truthy
+      expect(Guardian.new(moderator).can_invite_via_email?(topic)).to be_truthy
+      expect(Guardian.new(admin).can_invite_via_email?(topic)).to be_truthy
     end
 
     it 'returns false for all users when local logins are disabled' do
@@ -1498,6 +1498,33 @@ describe Guardian do
         expect(Guardian.new(post.user).can_edit?(post)).to be_truthy
       end
 
+      context "shared drafts" do
+        fab!(:category) { Fabricate(:category) }
+
+        let(:topic) { Fabricate(:topic, category: category) }
+        let(:post_with_draft) { Fabricate(:post, topic: topic) }
+
+        before do
+          SiteSetting.shared_drafts_category = category.id
+          SiteSetting.shared_drafts_min_trust_level = '2'
+          Fabricate(:shared_draft, topic: topic)
+        end
+
+        it 'returns true if a shared draft exists' do
+          expect(Guardian.new(trust_level_2).can_edit_post?(post_with_draft)).to eq(true)
+        end
+
+        it 'returns false if the user has a lower trust level' do
+          expect(Guardian.new(trust_level_1).can_edit_post?(post_with_draft)).to eq(false)
+        end
+
+        it 'returns false if the draft is from a different category' do
+          topic.update!(category: Fabricate(:category))
+
+          expect(Guardian.new(trust_level_2).can_edit_post?(post_with_draft)).to eq(false)
+        end
+      end
+
       context 'category group moderation is enabled' do
         fab!(:cat_mod_user) { Fabricate(:user) }
 
@@ -1517,8 +1544,10 @@ describe Guardian do
       end
 
       describe 'post edit time limits' do
+
         context 'post is older than post_edit_time_limit' do
-          let(:old_post) { build(:post, topic: topic, user: topic.user, created_at: 6.minutes.ago) }
+          let(:topic) { Fabricate(:topic) }
+          let(:old_post) { Fabricate(:post, topic: topic, user: topic.user, created_at: 6.minutes.ago) }
 
           before do
             topic.user.update_columns(trust_level:  1)
@@ -1545,6 +1574,31 @@ describe Guardian do
             old_post.wiki = true
             expect(Guardian.new(coding_horror).can_edit?(old_post)).to be_truthy
           end
+
+          context "unlimited owner edits on first post" do
+            let(:owner) { old_post.user }
+
+            it "returns true when the post topic's category allow_unlimited_owner_edits_on_first_post" do
+              old_post.topic.category.update(allow_unlimited_owner_edits_on_first_post: true)
+              expect(Guardian.new(owner).can_edit?(old_post)).to be_truthy
+            end
+
+            it "returns false when the post topic's category does not allow_unlimited_owner_edits_on_first_post" do
+              old_post.topic.category.update(allow_unlimited_owner_edits_on_first_post: false)
+              expect(Guardian.new(owner).can_edit?(old_post)).to be_falsey
+            end
+
+            it "returns false when the post topic's category allow_unlimited_owner_edits_on_first_post but the post is not the first in the topic" do
+              old_post.topic.category.update(allow_unlimited_owner_edits_on_first_post: true)
+              new_post = Fabricate(:post, user: owner, topic: old_post.topic, created_at: 6.minutes.ago)
+              expect(Guardian.new(owner).can_edit?(new_post)).to be_falsey
+            end
+
+            it "returns false when someone other than owner is editing and category allow_unlimited_owner_edits_on_first_post" do
+              old_post.topic.category.update(allow_unlimited_owner_edits_on_first_post: false)
+              expect(Guardian.new(coding_horror).can_edit?(old_post)).to be_falsey
+            end
+          end
         end
 
         context 'post is older than tl2_post_edit_time_limit' do
@@ -2081,6 +2135,11 @@ describe Guardian do
         expect(Guardian.new(user).can_delete?(post)).to be_truthy
       end
 
+      it 'returns false when self deletions are disabled' do
+        SiteSetting.max_post_deletions_per_day = 0
+        expect(Guardian.new(user).can_delete?(post)).to be_falsey
+      end
+
       it "returns false when trying to delete another user's own post" do
         expect(Guardian.new(Fabricate(:user)).can_delete?(post)).to be_falsey
       end
@@ -2119,7 +2178,6 @@ describe Guardian do
         it "doesn't allow a regular user to delete it" do
           expect(Guardian.new(post.user).can_delete?(post)).to be_falsey
         end
-
       end
 
     end
@@ -2710,9 +2768,9 @@ describe Guardian do
 
     context 'when SSO username override is active' do
       before do
-        SiteSetting.sso_url = "https://www.example.com/sso"
-        SiteSetting.enable_sso = true
-        SiteSetting.sso_overrides_username = true
+        SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+        SiteSetting.enable_discourse_connect = true
+        SiteSetting.auth_overrides_username = true
       end
 
       it "is false for admins" do
@@ -2795,9 +2853,9 @@ describe Guardian do
     context 'when SSO email override is active' do
       before do
         SiteSetting.email_editable = false
-        SiteSetting.sso_url = "https://www.example.com/sso"
-        SiteSetting.enable_sso = true
-        SiteSetting.sso_overrides_email = true
+        SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+        SiteSetting.enable_discourse_connect = true
+        SiteSetting.auth_overrides_email = true
       end
 
       it "is false for admins" do
@@ -2874,8 +2932,8 @@ describe Guardian do
 
       context 'when SSO is disabled' do
         before do
-          SiteSetting.enable_sso = false
-          SiteSetting.sso_overrides_name = false
+          SiteSetting.enable_discourse_connect = false
+          SiteSetting.auth_overrides_name = false
         end
 
         it 'is true for admins' do
@@ -2893,13 +2951,13 @@ describe Guardian do
 
       context 'when SSO is enabled' do
         before do
-          SiteSetting.sso_url = "https://www.example.com/sso"
-          SiteSetting.enable_sso = true
+          SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+          SiteSetting.enable_discourse_connect = true
         end
 
         context 'when SSO name override is active' do
           before do
-            SiteSetting.sso_overrides_name = true
+            SiteSetting.auth_overrides_name = true
           end
 
           it 'is false for admins' do
@@ -2917,7 +2975,7 @@ describe Guardian do
 
         context 'when SSO name override is not active' do
           before do
-            SiteSetting.sso_overrides_name = false
+            SiteSetting.auth_overrides_name = false
           end
 
           it 'is true for admins' do
diff --git a/spec/components/html_to_markdown_spec.rb b/spec/components/html_to_markdown_spec.rb
index 0fde6eaa12..b5db6e716c 100644
--- a/spec/components/html_to_markdown_spec.rb
+++ b/spec/components/html_to_markdown_spec.rb
@@ -83,7 +83,6 @@ describe HtmlToMarkdown do
   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
 
@@ -157,8 +156,6 @@ describe HtmlToMarkdown do
   it "skips hidden <img>" do
     expect(html_to_markdown(%Q{<img src="https://www.discourse.org/logo.svg" width=0>})).to eq("")
     expect(html_to_markdown(%Q{<img src="https://www.discourse.org/logo.svg" height="0">})).to eq("")
-    expect(html_to_markdown(%Q{<img src="https://www.discourse.org/logo.svg" style="width: 0">})).to eq("")
-    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
@@ -205,6 +202,10 @@ describe HtmlToMarkdown do
     expect(html_to_markdown("H<sub>2</sub>O")).to eq("H<sub>2</sub>O")
   end
 
+  it "supports <mark>" do
+    expect(html_to_markdown("<mark>This is highlighted!</mark>")).to eq("<mark>This is highlighted!</mark>")
+  end
+
   it "supports <sup>" do
     expect(html_to_markdown("<sup>Super Script!</sup>")).to eq("<sup>Super Script!</sup>")
   end
diff --git a/spec/components/imap/imap_helper.rb b/spec/components/imap/imap_helper.rb
index 99bcc41224..1248fa0cae 100644
--- a/spec/components/imap/imap_helper.rb
+++ b/spec/components/imap/imap_helper.rb
@@ -18,7 +18,7 @@ def EmailFabricator(options)
   email += "Cc: #{options[:cc]}\n" if options[:cc]
   email += "In-Reply-To: #{options[:in_reply_to]}\n" if options[:in_reply_to]
   email += "References: #{options[:in_reply_to]}\n" if options[:in_reply_to]
-  email += "Message-ID: #{options[:message_id]}\n" if options[:message_id]
+  email += "Message-ID: <#{options[:message_id]}>\n" if options[:message_id]
   email += "Subject: #{options[:subject] || "This is a test email subhect"}\n"
   email += "Mime-Version: 1.0\n"
   email += "Content-Type: #{options[:content_type] || "text/plain;\n charset=UTF-8"}\n"
diff --git a/spec/components/imap/sync_spec.rb b/spec/components/imap/sync_spec.rb
index f78cbd2eac..da0ed74d25 100644
--- a/spec/components/imap/sync_spec.rb
+++ b/spec/components/imap/sync_spec.rb
@@ -78,6 +78,8 @@ describe Imap::Sync do
         .and change { Post.where(post_type: Post.types[:regular]).count }.by(1)
         .and change { IncomingEmail.count }.by(1)
 
+      expect(IncomingEmail.last.created_via).to eq(IncomingEmail.created_via_types[:imap])
+
       expect(group.imap_uid_validity).to eq(1)
       expect(group.imap_last_uid).to eq(100)
 
@@ -321,6 +323,7 @@ describe Imap::Sync do
 
         provider.stubs(:uids).with(to: 100).returns([])
         provider.stubs(:uids).with(from: 101).returns([])
+        provider.stubs(:find_spam_by_message_ids).returns(stub(spam_emails: []))
         provider.stubs(:find_trashed_by_message_ids).returns(
           stub(
             trashed_emails: [
@@ -341,6 +344,49 @@ describe Imap::Sync do
         expect(Topic.with_deleted.find(incoming_100.topic_id).deleted_at).not_to eq(nil)
       end
 
+      it "detects previously synced UIDs are missing and deletes the posts if they are in the spam/junk mailbox" do
+        sync_handler.process
+        incoming_100 = IncomingEmail.find_by(imap_uid: 100)
+        provider.stubs(:uids).with.returns([])
+
+        provider.stubs(:uids).with(to: 100).returns([])
+        provider.stubs(:uids).with(from: 101).returns([])
+        provider.stubs(:find_trashed_by_message_ids).returns(stub(trashed_emails: []))
+        provider.stubs(:find_spam_by_message_ids).returns(
+          stub(
+            spam_emails: [
+              stub(
+                uid: 10,
+                message_id: incoming_100.message_id
+              )
+            ],
+            spam_uid_validity: 99
+          )
+        )
+        sync_handler.process
+
+        incoming_100.reload
+        expect(incoming_100.imap_uid_validity).to eq(99)
+        expect(incoming_100.imap_uid).to eq(10)
+        expect(Post.with_deleted.find(incoming_100.post_id).deleted_at).not_to eq(nil)
+        expect(Topic.with_deleted.find(incoming_100.topic_id).deleted_at).not_to eq(nil)
+      end
+
+      it "marks the incoming email as IMAP missing if it cannot be found in spam or trash" do
+        sync_handler.process
+        incoming_100 = IncomingEmail.find_by(imap_uid: 100)
+        provider.stubs(:uids).with.returns([])
+
+        provider.stubs(:uids).with(to: 100).returns([])
+        provider.stubs(:uids).with(from: 101).returns([])
+        provider.stubs(:find_trashed_by_message_ids).returns(stub(trashed_emails: []))
+        provider.stubs(:find_spam_by_message_ids).returns(stub(spam_emails: []))
+        sync_handler.process
+
+        incoming_100.reload
+        expect(incoming_100.imap_missing).to eq(true)
+      end
+
       it "detects the topic being deleted on the discourse site and deletes on the IMAP server and
       does not attempt to delete again on discourse site when deleted already by us on the IMAP server" do
         SiteSetting.enable_imap_write = true
@@ -385,6 +431,7 @@ describe Imap::Sync do
 
         provider.stubs(:uids).with(to: 100).returns([])
         provider.stubs(:uids).with(from: 101).returns([])
+        provider.stubs(:find_spam_by_message_ids).returns(stub(spam_emails: []))
         provider.stubs(:find_trashed_by_message_ids).returns(
           stub(
             trashed_emails: [
diff --git a/spec/components/inline_oneboxer_spec.rb b/spec/components/inline_oneboxer_spec.rb
index d00c9822cc..761e1c00d8 100644
--- a/spec/components/inline_oneboxer_spec.rb
+++ b/spec/components/inline_oneboxer_spec.rb
@@ -116,7 +116,45 @@ describe InlineOneboxer do
       expect(onebox[:title]).to eq("Hello 🍕 with an emoji")
     end
 
+    it "will append the post number post auther's username to the title" do
+      topic = Fabricate(:topic, title: "Inline oneboxer")
+      Fabricate(:post, topic: topic) # OP
+      Fabricate(:post, topic: topic)
+      lookup = -> (number) do
+        InlineOneboxer.lookup(
+          "#{topic.url}/#{number}",
+          skip_cache: true
+        )[:title]
+      end
+      posts = topic.reload.posts.order("post_number ASC")
+
+      expect(lookup.call(0)).to eq("Inline oneboxer")
+      expect(lookup.call(1)).to eq("Inline oneboxer")
+      expect(lookup.call(2)).to eq("Inline oneboxer - #2 by #{posts[1].user.username}")
+
+      Fabricate(:post, topic: topic, post_type: Post.types[:whisper])
+      posts = topic.reload.posts.order("post_number ASC")
+      # because the last post in the topic is a whisper, the onebox title
+      # will be the first regular post directly before our whisper
+      expect(lookup.call(3)).to eq("Inline oneboxer - #2 by #{posts[1].user.username}")
+      expect(lookup.call(99)).to eq("Inline oneboxer - #2 by #{posts[1].user.username}")
+
+      Fabricate(:post, topic: topic)
+      posts = topic.reload.posts.order("post_number ASC")
+      # username not appended to whisper posts
+      expect(lookup.call(3)).to eq("Inline oneboxer - #3")
+      expect(lookup.call(4)).to eq("Inline oneboxer - #4 by #{posts[3].user.username}")
+      expect(lookup.call(99)).to eq("Inline oneboxer - #4 by #{posts[3].user.username}")
+    end
+
     it "will not crawl domains that aren't allowlisted" do
+      SiteSetting.enable_inline_onebox_on_all_domains = false
+      onebox = InlineOneboxer.lookup("https://eviltrout.com", skip_cache: true)
+      expect(onebox).to be_blank
+    end
+
+    it "will not crawl domains that are blocked" do
+      SiteSetting.blocked_onebox_domains = "eviltrout.com"
       onebox = InlineOneboxer.lookup("https://eviltrout.com", skip_cache: true)
       expect(onebox).to be_blank
     end
diff --git a/spec/components/js_locale_helper_spec.rb b/spec/components/js_locale_helper_spec.rb
index 6bce0bd797..887ae8dc0d 100644
--- a/spec/components/js_locale_helper_spec.rb
+++ b/spec/components/js_locale_helper_spec.rb
@@ -118,14 +118,14 @@ describe JsLocaleHelper do
       expect(message).not_to match 'Plural Function not found'
     end
 
-    it "includes uses message formats from fallback locale" do
-      translations = JsLocaleHelper.translations_for(:en_US)
-      en_us_message_formats = JsLocaleHelper.remove_message_formats!(translations, :en_US)
-      expect(en_us_message_formats).to_not be_empty
+    it "uses message formats from fallback locale" do
+      translations = JsLocaleHelper.translations_for(:en_GB)
+      en_gb_message_formats = JsLocaleHelper.remove_message_formats!(translations, :en_GB)
+      expect(en_gb_message_formats).to_not be_empty
 
       translations = JsLocaleHelper.translations_for(:en)
       en_message_formats = JsLocaleHelper.remove_message_formats!(translations, :en)
-      expect(en_us_message_formats).to eq(en_message_formats)
+      expect(en_gb_message_formats).to eq(en_message_formats)
     end
   end
 
@@ -207,12 +207,12 @@ describe JsLocaleHelper do
   end
 
   describe ".find_message_format_locale" do
-    it "finds locale for en_US" do
-      locale, filename = JsLocaleHelper.find_message_format_locale([:en_US],  fallback_to_english: false)
+    it "finds locale for en_GB" do
+      locale, filename = JsLocaleHelper.find_message_format_locale([:en_GB],  fallback_to_english: false)
       expect(locale).to eq("en")
       expect(filename).to end_with("/en.js")
 
-      locale, filename = JsLocaleHelper.find_message_format_locale(["en_US"],  fallback_to_english: false)
+      locale, filename = JsLocaleHelper.find_message_format_locale(["en_GB"],  fallback_to_english: false)
       expect(locale).to eq("en")
       expect(filename).to end_with("/en.js")
     end
diff --git a/spec/components/middleware/anonymous_cache_spec.rb b/spec/components/middleware/anonymous_cache_spec.rb
index dd410bb86b..e2beddc40a 100644
--- a/spec/components/middleware/anonymous_cache_spec.rb
+++ b/spec/components/middleware/anonymous_cache_spec.rb
@@ -26,6 +26,10 @@ describe Middleware::AnonymousCache do
       it "is false if it has an auth cookie" do
         expect(new_helper("HTTP_COOKIE" => "jack=1; _t=#{"1" * 32}; jill=2").cacheable?).to eq(false)
       end
+
+      it "is false for srv/status routes" do
+        expect(new_helper("PATH_INFO" => "/srv/status").cacheable?).to eq(false)
+      end
     end
 
     context "per theme cache" do
diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb
index 2e6734e2da..459b9688f5 100644
--- a/spec/components/middleware/request_tracker_spec.rb
+++ b/spec/components/middleware/request_tracker_spec.rb
@@ -16,6 +16,7 @@ describe Middleware::RequestTracker do
   end
 
   before do
+    ApplicationRequest.clear_cache!
     ApplicationRequest.enable
   end
 
@@ -69,7 +70,6 @@ describe Middleware::RequestTracker do
     end
 
     it "can log requests correctly" do
-
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_USER_AGENT" => "AdsBot-Google (+http://www.google.com/adsbot.html)"
       ), ["200", { "Content-Type" => 'text/html' }], 0.1)
@@ -129,6 +129,53 @@ describe Middleware::RequestTracker do
       expect(ApplicationRequest.page_view_crawler.first.count).to eq(1)
       expect(ApplicationRequest.page_view_anon.first.count).to eq(1)
     end
+
+    context "ignore_anonymous_pageviews" do
+      let(:anon_data) do
+        Middleware::RequestTracker.get_data(env(
+          "HTTP_USER_AGENT" => "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.72 Safari/537.36"
+        ), ["200", { "Content-Type" => 'text/html' }], 0.1)
+      end
+
+      let(:logged_in_data) do
+        user = Fabricate(:user, active: true)
+        token = UserAuthToken.generate!(user_id: user.id)
+        Middleware::RequestTracker.get_data(env(
+          "HTTP_USER_AGENT" => "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.72 Safari/537.36",
+          "HTTP_COOKIE" => "_t=#{token.unhashed_auth_token};"
+        ), ["200", { "Content-Type" => 'text/html' }], 0.1)
+      end
+
+      it "does not ignore anonymous requests for public sites" do
+        SiteSetting.login_required = false
+
+        Middleware::RequestTracker.log_request(anon_data)
+        Middleware::RequestTracker.log_request(logged_in_data)
+
+        ApplicationRequest.write_cache!
+
+        expect(ApplicationRequest.http_total.first.count).to eq(2)
+        expect(ApplicationRequest.http_2xx.first.count).to eq(2)
+
+        expect(ApplicationRequest.page_view_logged_in.first.count).to eq(1)
+        expect(ApplicationRequest.page_view_anon.first.count).to eq(1)
+      end
+
+      it "ignores anonymous requests for private sites" do
+        SiteSetting.login_required = true
+
+        Middleware::RequestTracker.log_request(anon_data)
+        Middleware::RequestTracker.log_request(logged_in_data)
+
+        ApplicationRequest.write_cache!
+
+        expect(ApplicationRequest.http_total.first.count).to eq(2)
+        expect(ApplicationRequest.http_2xx.first.count).to eq(2)
+
+        expect(ApplicationRequest.page_view_logged_in.first.count).to eq(1)
+        expect(ApplicationRequest.page_view_anon.first).to eq(nil)
+      end
+    end
   end
 
   context "rate limiting" do
@@ -151,6 +198,10 @@ describe Middleware::RequestTracker do
 
       @old_logger = Rails.logger
       Rails.logger = TestLogger.new
+
+      # rate limiter tests depend on checks for retry-after
+      # they can be sensitive to clock skew during test runs
+      freeze_time DateTime.parse('2021-01-01 01:00')
     end
 
     after do
@@ -245,10 +296,11 @@ describe Middleware::RequestTracker do
       global_setting :max_reqs_per_ip_mode, 'warn+block'
 
       status, _ = middleware.call(env)
-      status, _ = middleware.call(env)
+      status, headers = middleware.call(env)
 
       expect(Rails.logger.warnings).to eq(1)
       expect(status).to eq(429)
+      expect(headers["Retry-After"]).to eq("10")
     end
 
     it "does warn if rate limiter is enabled" do
@@ -275,13 +327,15 @@ describe Middleware::RequestTracker do
       expect(status).to eq(200)
       status, _ = middleware.call(env1)
       expect(status).to eq(200)
-      status, _ = middleware.call(env1)
+      status, headers = middleware.call(env1)
       expect(status).to eq(429)
+      expect(headers["Retry-After"]).to eq("10")
 
       env2 = env("REMOTE_ADDR" => "1.1.1.1")
 
-      status, _ = middleware.call(env2)
+      status, headers = middleware.call(env2)
       expect(status).to eq(429)
+      expect(headers["Retry-After"]).to eq("10")
     end
 
     it "does block if rate limiter is enabled" do
@@ -294,8 +348,9 @@ describe Middleware::RequestTracker do
       status, _ = middleware.call(env1)
       expect(status).to eq(200)
 
-      status, _ = middleware.call(env1)
+      status, headers = middleware.call(env1)
       expect(status).to eq(429)
+      expect(headers["Retry-After"]).to eq("10")
 
       status, _ = middleware.call(env2)
       expect(status).to eq(200)
diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb
index 0540b3207d..c7aa241509 100644
--- a/spec/components/new_post_manager_spec.rb
+++ b/spec/components/new_post_manager_spec.rb
@@ -450,12 +450,13 @@ describe NewPostManager do
   end
 
   context 'when posting in the category requires approval' do
-    fab!(:user) { Fabricate(:user) }
-    fab!(:review_group) { Fabricate(:group) }
-    fab!(:category) { Fabricate(:category, reviewable_by_group_id: review_group.id) }
+    let!(:user) { Fabricate(:user) }
+    let!(:review_group) { Fabricate(:group) }
+    let!(:category) { Fabricate(:category, reviewable_by_group_id: review_group.id) }
 
     context 'when new topics require approval' do
       before do
+        SiteSetting.tagging_enabled = true
         category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
         category.save
       end
@@ -488,10 +489,89 @@ describe NewPostManager do
         expect(result.action).to eq(:create_post)
         expect(result).to be_success
       end
+
+      context "when the category has tagging rules" do
+        context "when there is a minimum number of tags required for the category" do
+          before do
+            category.update(minimum_required_tags: 1)
+          end
+
+          it "errors when there are no tags provided" do
+            manager = NewPostManager.new(
+              user,
+              raw: 'this is a new topic',
+              title: "Let's start a new topic!",
+              category: category.id
+            )
+
+            result = manager.perform
+            expect(result.action).to eq(:enqueued)
+            expect(result.errors.full_messages).to include(I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags))
+          end
+
+          it "enqueues the topic if there are tags provided" do
+            tag = Fabricate(:tag)
+            manager = NewPostManager.new(
+              user,
+              raw: 'this is a new topic',
+              title: "Let's start a new topic!",
+              category: category.id,
+              tags: tag.name
+            )
+
+            result = manager.perform
+            expect(result.action).to eq(:enqueued)
+            expect(result.reason).to eq(:category)
+          end
+        end
+
+        context "when there is a minimum number of tags required from a certain tag group for the category" do
+          let(:tag_group) { Fabricate(:tag_group) }
+          let(:tag) { Fabricate(:tag) }
+          before do
+            TagGroupMembership.create(tag: tag, tag_group: tag_group)
+            category.update(min_tags_from_required_group: 1, required_tag_group_id: tag_group.id)
+          end
+
+          it "errors when there are no tags from the group provided" do
+            manager = NewPostManager.new(
+              user,
+              raw: 'this is a new topic',
+              title: "Let's start a new topic!",
+              category: category.id
+            )
+
+            result = manager.perform
+            expect(result.action).to eq(:enqueued)
+            expect(result.errors.full_messages).to include(
+              I18n.t(
+                "tags.required_tags_from_group",
+                count: category.min_tags_from_required_group,
+                tag_group_name: category.required_tag_group.name,
+                tags: tag.name
+              )
+            )
+          end
+
+          it "enqueues the topic if there are tags provided" do
+            manager = NewPostManager.new(
+              user,
+              raw: 'this is a new topic',
+              title: "Let's start a new topic!",
+              category: category.id,
+              tags: [tag.name]
+            )
+
+            result = manager.perform
+            expect(result.action).to eq(:enqueued)
+            expect(result.reason).to eq(:category)
+          end
+        end
+      end
     end
 
     context 'when new posts require approval' do
-      fab!(:topic) { Fabricate(:topic, category: category) }
+      let!(:topic) { Fabricate(:topic, category: category) }
 
       before do
         category.custom_fields[Category::REQUIRE_REPLY_APPROVAL] = true
diff --git a/spec/components/onebox/engine/flash_video_onebox_spec.rb b/spec/components/onebox/engine/flash_video_onebox_spec.rb
deleted file mode 100644
index b6aff33e85..0000000000
--- a/spec/components/onebox/engine/flash_video_onebox_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-require 'onebox/engine/flash_video_onebox'
-
-describe Onebox::Engine::FlashVideoOnebox do
-  before do
-    @o = Onebox::Engine::FlashVideoOnebox.new('http://player.56.com/v_OTMyNTk1MzE.swf')
-  end
-
-  context "when SiteSetting.enable_flash_video_onebox is true" do
-    before do
-      SiteSetting.enable_flash_video_onebox = true
-    end
-
-    it "generates a flash video" do
-      expect(@o.to_html).to match_html(
-        "<object width='100%' height='100%'><param name='http://player.56.com/v_OTMyNTk1MzE.swf' value='http://player.56.com/v_OTMyNTk1MzE.swf'><embed src='http://player.56.com/v_OTMyNTk1MzE.swf' width='100%' height='100%'></embed></object>"
-      )
-    end
-  end
-
-  context "when SiteSetting.enable_flash_video_onebox is false" do
-    before do
-      SiteSetting.enable_flash_video_onebox = false
-    end
-
-    it "generates a link" do
-      expect(@o.to_html).to match_html(
-        "<a href='http://player.56.com/v_OTMyNTk1MzE.swf'>http://player.56.com/v_OTMyNTk1MzE.swf</a>"
-      )
-    end
-  end
-end
diff --git a/spec/components/oneboxer_spec.rb b/spec/components/oneboxer_spec.rb
index 30e6b470a7..3628e582d6 100644
--- a/spec/components/oneboxer_spec.rb
+++ b/spec/components/oneboxer_spec.rb
@@ -207,6 +207,7 @@ describe Oneboxer do
 
     before do
       stub_request(:any, "https://www.youtube.com/watch?v=dQw4w9WgXcQ").to_return(status: 200, body: html)
+      stub_request(:any, "https://www.youtube.com/embed/dQw4w9WgXcQ").to_return(status: 403, body: nil)
     end
 
     it "allows restricting engines based on the allowed_onebox_iframes setting" do
@@ -272,6 +273,12 @@ describe Oneboxer do
       expect(Oneboxer.preview(url, invalidate_oneboxes: true)).to include("could not be found: description, image")
     end
 
+    it 'handles a missing image' do
+      # Note: If the only error is a missing image, we shouldn't return an error
+      stub_request(:get, url).to_return(body: response("missing_image"))
+      expect(Oneboxer.preview(url, invalidate_oneboxes: true)).not_to include("could not be found")
+    end
+
     it 'video with missing description returns a placeholder' do
       stub_request(:get, url).to_return(body: response("video_missing_description"))
       expect(Oneboxer.preview(url, invalidate_oneboxes: true)).to include("onebox-placeholder-container")
@@ -300,4 +307,140 @@ describe Oneboxer do
     end
   end
 
+  describe '#apply' do
+    it 'generates valid HTML' do
+      raw = "Before Onebox\nhttps://example.com\nAfter Onebox"
+      cooked = Oneboxer.apply(PrettyText.cook(raw)) { '<div>onebox</div>' }
+      doc = Nokogiri::HTML5::fragment(cooked.to_html)
+      expect(doc.to_html).to match_html <<~HTML
+        <p>Before Onebox</p>
+        <div>onebox</div>
+        <p>After Onebox</p>
+      HTML
+
+      raw = "Before Onebox\nhttps://example.com\nhttps://example.com\nAfter Onebox"
+      cooked = Oneboxer.apply(PrettyText.cook(raw)) { '<div>onebox</div>' }
+      doc = Nokogiri::HTML5::fragment(cooked.to_html)
+      expect(doc.to_html).to match_html <<~HTML
+        <p>Before Onebox</p>
+        <div>onebox</div>
+        <div>onebox</div>
+        <p>After Onebox</p>
+      HTML
+    end
+
+    it 'does keeps SVGs valid' do
+      raw = "Onebox\n\nhttps://example.com"
+      cooked = PrettyText.cook(raw)
+      cooked = Oneboxer.apply(Loofah.fragment(cooked)) { '<div><svg><path></path></svg></div>' }
+      doc = Nokogiri::HTML5::fragment(cooked.to_html)
+      expect(doc.to_html).to match_html <<~HTML
+        <p>Onebox</p>
+        <div><svg><path></path></svg></div>
+      HTML
+    end
+  end
+
+  describe '#force_get_hosts' do
+    before do
+      SiteSetting.cache_onebox_response_body_domains = "example.net|example.com|example.org"
+    end
+
+    it "includes Amazon sites" do
+      expect(Oneboxer.force_get_hosts).to include('https://www.amazon.ca')
+    end
+
+    it "includes cache_onebox_response_body_domains" do
+      expect(Oneboxer.force_get_hosts).to include('https://www.example.com')
+    end
+  end
+
+  context 'strategies' do
+    it "has a 'default' strategy" do
+      expect(Oneboxer.strategies.keys.first).to eq(:default)
+    end
+
+    it "has a strategy with overrides" do
+      strategy = Oneboxer.strategies.keys[1]
+      expect(Oneboxer.strategies[strategy].keys).not_to eq([])
+    end
+
+    context "using a non-default strategy" do
+      let(:hostname) { "my.interesting.site" }
+      let(:url) { "https://#{hostname}/cool/content" }
+      let(:html) do
+        <<~HTML
+          <html>
+          <head>
+            <meta property="og:title" content="Page Title">
+            <meta property="og:description" content="Here is some cool content">
+          </head>
+          <body>
+             <p>body</p>
+          </body>
+          <html>
+        HTML
+      end
+
+      before do
+        stub_request(:head, url).to_return(status: 509)
+        stub_request(:get, url).to_return(status: 200, body: html)
+      end
+
+      after do
+        Oneboxer.clear_preferred_strategy!(hostname)
+      end
+
+      it "uses multiple strategies" do
+        default_ordered = Oneboxer.strategies.keys
+        custom_ordered = Oneboxer.ordered_strategies(hostname)
+        expect(custom_ordered).to eq(default_ordered)
+
+        expect(Oneboxer.preferred_strategy(hostname)).to eq(nil)
+        expect(Oneboxer.preview(url, invalidate_oneboxes: true)).to include("Here is some cool content")
+
+        custom_ordered = Oneboxer.ordered_strategies(hostname)
+
+        expect(custom_ordered.count).to eq(default_ordered.count)
+        expect(custom_ordered).not_to eq(default_ordered)
+
+        expect(Oneboxer.preferred_strategy(hostname)).not_to eq(:default)
+      end
+    end
+  end
+
+  describe 'cache_onebox_response_body' do
+    let(:html) do
+      <<~HTML
+        <html>
+        <body>
+           <p>cache me if you can</p>
+        </body>
+        <html>
+      HTML
+    end
+
+    let(:url) { "https://www.example.com/my/great/content" }
+    let(:url2) { "https://www.example2.com/my/great/content" }
+
+    before do
+      stub_request(:any, url).to_return(status: 200, body: html)
+      stub_request(:any, url2).to_return(status: 200, body: html)
+
+      SiteSetting.cache_onebox_response_body = true
+      SiteSetting.cache_onebox_response_body_domains = "example.net|example.com|example.org"
+    end
+
+    it "caches when domain matches" do
+      preview = Oneboxer.preview(url, invalidate_oneboxes: true)
+      expect(Oneboxer.cached_response_body_exists?(url)).to eq(true)
+      expect(Oneboxer.fetch_cached_response_body(url)).to eq(html)
+    end
+
+    it "ignores cache when domain not present" do
+      preview = Oneboxer.preview(url2, invalidate_oneboxes: true)
+      expect(Oneboxer.cached_response_body_exists?(url2)).to eq(false)
+    end
+  end
+
 end
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index 0f43099eaa..e9de28e83d 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -11,7 +11,7 @@ describe Plugin::Instance do
   context "find_all" do
     it "can find plugins correctly" do
       plugins = Plugin::Instance.find_all("#{Rails.root}/spec/fixtures/plugins")
-      expect(plugins.count).to eq(4)
+      expect(plugins.count).to eq(5)
       plugin = plugins[3]
 
       expect(plugin.name).to eq("plugin-name")
@@ -258,9 +258,6 @@ describe Plugin::Instance do
       plugin.register_asset("desktop.css", :desktop)
       plugin.register_asset("desktop2.css", :desktop)
 
-      plugin.register_asset("variables1.scss", :variables)
-      plugin.register_asset("variables2.scss", :variables)
-
       plugin.register_asset("code.js")
 
       plugin.register_asset("my_admin.js", :admin)
@@ -271,7 +268,6 @@ describe Plugin::Instance do
       expect(DiscoursePluginRegistry.javascripts.count).to eq(2)
       expect(DiscoursePluginRegistry.admin_javascripts.count).to eq(2)
       expect(DiscoursePluginRegistry.desktop_stylesheets[plugin.directory_name].count).to eq(2)
-      expect(DiscoursePluginRegistry.sass_variables.count).to eq(2)
       expect(DiscoursePluginRegistry.stylesheets[plugin.directory_name].count).to eq(2)
       expect(DiscoursePluginRegistry.mobile_stylesheets[plugin.directory_name].count).to eq(1)
     end
@@ -593,4 +589,15 @@ describe Plugin::Instance do
       expect(ReviewableScore.types.values.max).to eq(highest_flag_id + 2)
     end
   end
+
+  describe '#add_api_key_scope' do
+    after { DiscoursePluginRegistry.reset! }
+
+    it 'adds a custom api key scope' do
+      actions = %w[admin/groups#create]
+      subject.add_api_key_scope(:groups, create: { actions: actions })
+
+      expect(ApiKeyScope.scope_mappings.dig(:groups, :create, :actions)).to contain_exactly(*actions)
+    end
+  end
 end
diff --git a/spec/components/plugin/metadata_spec.rb b/spec/components/plugin/metadata_spec.rb
index fe838d8c7b..6dd0ac000e 100644
--- a/spec/components/plugin/metadata_spec.rb
+++ b/spec/components/plugin/metadata_spec.rb
@@ -10,6 +10,7 @@ describe Plugin::Metadata do
 # about: about: my plugin
 # version: 0.1
 # authors: Frank Zappa
+# contact emails: frankz@example.com
 # url: http://discourse.org
 # required version: 1.3.0beta6+48
 
@@ -20,6 +21,7 @@ TEXT
       expect(metadata.about).to eq("about: my plugin")
       expect(metadata.version).to eq("0.1")
       expect(metadata.authors).to eq("Frank Zappa")
+      expect(metadata.contact_emails).to eq("frankz@example.com")
       expect(metadata.url).to eq("http://discourse.org")
       expect(metadata.required_version).to eq("1.3.0beta6+48")
     end
diff --git a/spec/components/post_action_creator_spec.rb b/spec/components/post_action_creator_spec.rb
index a68b874c03..63e5117537 100644
--- a/spec/components/post_action_creator_spec.rb
+++ b/spec/components/post_action_creator_spec.rb
@@ -219,4 +219,43 @@ describe PostActionCreator do
       expect(reviewable.reload).to be_approved
     end
   end
+
+  context "queue_for_review" do
+    fab!(:admin) { Fabricate(:admin) }
+
+    it 'fails if the user is not a staff member' do
+      creator = PostActionCreator.new(
+        user, post,
+        PostActionType.types[:notify_moderators], queue_for_review: true
+      )
+      result = creator.perform
+
+      expect(result.success?).to eq(false)
+    end
+
+    it 'creates a new reviewable and hides the post' do
+      result = build_creator.perform
+
+      expect(result.success?).to eq(true)
+
+      score = result.reviewable.reviewable_scores.last
+      expect(score.reason).to eq('queued_by_staff')
+      expect(post.reload.hidden?).to eq(true)
+    end
+
+    it 'hides the topic even if it has replies' do
+      Fabricate(:post, topic: post.topic)
+
+      result = build_creator.perform
+
+      expect(post.topic.reload.visible?).to eq(false)
+    end
+
+    def build_creator
+      PostActionCreator.new(
+        admin, post,
+        PostActionType.types[:notify_moderators], queue_for_review: true
+      )
+    end
+  end
 end
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index bbd35d4c24..3f4262a65a 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -128,8 +128,13 @@ describe PostCreator do
         expect(channels.find { |s| s =~ /new/ }).to eq(nil)
       end
 
-      it "generates the correct messages for a secure topic" do
+      it 'enqueues job to generate messages' do
+        p = creator.create
+        expect(job_enqueued?(job: :post_update_topic_tracking_state, args: { post_id: p.id })).to eq(true)
+      end
 
+      it "generates the correct messages for a secure topic" do
+        Jobs.run_immediately!
         UserActionManager.enable
 
         admin = Fabricate(:admin)
@@ -169,7 +174,7 @@ describe PostCreator do
       end
 
       it 'generates the correct messages for a normal topic' do
-
+        Jobs.run_immediately!
         UserActionManager.enable
 
         p = nil
@@ -340,7 +345,7 @@ describe PostCreator do
               based_on_last_post: true,
               execute_at: Time.zone.now - 12.hours,
               created_at: Time.zone.now - 24.hours,
-              duration: 12
+              duration_minutes: 12 * 60
             )
           end
 
@@ -489,6 +494,39 @@ describe PostCreator do
               expect(@post.topic.tags.map(&:name)).to eq([existing_tag1.name])
             end
           end
+
+          context "automatically tags first posts" do
+            before do
+              SiteSetting.min_trust_to_create_tag = 0
+              SiteSetting.min_trust_level_to_tag_topics = 0
+            end
+
+            context "without regular expressions" do
+              it "works" do
+                Fabricate(:watched_word, action: WatchedWord.actions[:tag], word: "HELLO", replacement: "greetings , hey")
+
+                @post = creator.create
+                expect(@post.topic.tags.map(&:name)).to match_array(['greetings', 'hey'])
+              end
+
+              it "does not treat as regular expressions" do
+                Fabricate(:watched_word, action: WatchedWord.actions[:tag], word: "he(llo|y)", replacement: "greetings , hey")
+
+                @post = creator_with_tags.create
+                expect(@post.topic.tags.map(&:name)).to match_array(tag_names)
+              end
+            end
+
+            context "with regular expressions" do
+              it "works" do
+                SiteSetting.watched_words_regular_expressions = true
+                Fabricate(:watched_word, action: WatchedWord.actions[:tag], word: "he(llo|y)", replacement: "greetings , hey")
+
+                @post = creator_with_tags.create
+                expect(@post.topic.tags.map(&:name)).to match_array(tag_names + ['greetings', 'hey'])
+              end
+            end
+          end
         end
       end
     end
@@ -581,6 +619,36 @@ describe PostCreator do
     end
   end
 
+  context 'silent' do
+    fab!(:topic) { Fabricate(:topic, user: user) }
+
+    it 'silent do not mess up the public view' do
+      freeze_time DateTime.parse('2010-01-01 12:00')
+
+      first = PostCreator.new(
+        user,
+        topic_id: topic.id,
+        raw: 'this is the first post'
+      ).create
+
+      freeze_time 1.year.from_now
+
+      PostCreator.new(user,
+        topic_id: topic.id,
+        reply_to_post_number: 1,
+        silent: true,
+        post_type: Post.types[:regular],
+        raw: 'this is a whispered reply').create
+
+      topic.reload
+
+      # silent post should not muck up that number
+      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)
+    end
+  end
+
   context 'uniqueness' do
 
     fab!(:topic) { Fabricate(:topic, user: user) }
@@ -668,6 +736,13 @@ describe PostCreator do
       creator.create
     end
 
+    it 'does not create a reviewable post if the review_every_post setting is enabled' do
+      SiteSetting.review_every_post = true
+      GroupMessage.stubs(:create)
+
+      expect { creator.create }.to change(ReviewablePost, :count).by(0)
+    end
+
   end
 
   # more integration testing ... maximise our testing
@@ -1675,4 +1750,23 @@ describe PostCreator do
       )
     end
   end
+
+  context 'queue for review' do
+    before { SiteSetting.review_every_post = true }
+
+    it 'created a reviewable post after creating the post' do
+      title = "This is a valid title"
+      raw = "This is a really awesome post"
+
+      post_creator = PostCreator.new(user, title: title, raw: raw)
+
+      expect { post_creator.create }.to change(ReviewablePost, :count).by(1)
+    end
+
+    it 'does not create a reviewable post if the post is not valid' do
+      post_creator = PostCreator.new(user, title: '', raw: '')
+
+      expect { post_creator.create }.to change(ReviewablePost, :count).by(0)
+    end
+  end
 end
diff --git a/spec/components/post_destroyer_spec.rb b/spec/components/post_destroyer_spec.rb
index 6ec8622ed3..f4500c78e3 100644
--- a/spec/components/post_destroyer_spec.rb
+++ b/spec/components/post_destroyer_spec.rb
@@ -439,6 +439,17 @@ describe PostDestroyer do
       expect(user2.user_stat.post_count).to eq(0)
     end
 
+    it 'deletes the published page associated with the topic' do
+      slug = 'my-published-page'
+      publish_result = PublishedPage.publish!(admin, post.topic, slug)
+      pp = publish_result.last
+      expect(publish_result.first).to eq(true)
+
+      PostDestroyer.new(admin, post).destroy
+
+      expect(PublishedPage.find_by(id: pp.id)).to be_nil
+    end
+
     it "accepts a delete_removed_posts_after option" do
       SiteSetting.delete_removed_posts_after = 0
 
@@ -967,6 +978,10 @@ describe PostDestroyer do
     fab!(:private_post) { Fabricate(:private_message_post, topic: private_message_topic) }
     fab!(:post_action) { Fabricate(:post_action, post: private_post) }
     fab!(:reply) { Fabricate(:private_message_post, topic: private_message_topic) }
+    fab!(:post_revision) { Fabricate(:post_revision, post: private_post) }
+    fab!(:upload1) { Fabricate(:upload_s3, created_at: 5.hours.ago) }
+    fab!(:post_upload) { PostUpload.create(post: private_post, upload: upload1) }
+
     it "destroys the post and topic if deleting first post" do
       PostDestroyer.new(reply.user, reply, permanent: true).destroy
       expect { reply.reload }.to raise_error(ActiveRecord::RecordNotFound)
@@ -976,6 +991,13 @@ describe PostDestroyer do
       expect { private_post.reload }.to raise_error(ActiveRecord::RecordNotFound)
       expect { private_message_topic.reload }.to raise_error(ActiveRecord::RecordNotFound)
       expect { post_action.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { post_revision.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { post_upload.reload }.to raise_error(ActiveRecord::RecordNotFound)
+
+      Jobs::CleanUpUploads.new.reset_last_cleanup!
+      SiteSetting.clean_orphan_uploads_grace_period_hours = 1
+      Jobs::CleanUpUploads.new.execute({})
+      expect { upload1.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
     it 'soft delete if not creator of post or not private message' do
@@ -984,6 +1006,17 @@ describe PostDestroyer do
 
       PostDestroyer.new(post.user, post, permanent: true).destroy
       expect(post.user_deleted).to be true
+
+      expect(post_revision.reload.persisted?).to be true
+    end
+
+    it 'always destroy the post when the force_destroy option is passed' do
+      PostDestroyer.new(moderator, reply, force_destroy: true).destroy
+      expect { reply.reload }.to raise_error(ActiveRecord::RecordNotFound)
+
+      regular_post = Fabricate(:post)
+      PostDestroyer.new(moderator, regular_post, force_destroy: true).destroy
+      expect { regular_post.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
   end
 end
diff --git a/spec/components/post_merger_spec.rb b/spec/components/post_merger_spec.rb
index 08a7ffe1f8..e8efd4b19d 100644
--- a/spec/components/post_merger_spec.rb
+++ b/spec/components/post_merger_spec.rb
@@ -44,11 +44,27 @@ describe PostMerger do
       expect { PostMerger.new(admin, [reply2, post, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
     end
 
-    it "should only allow staff user to merge posts" do
+    it "should only allow staff or TL4 user to merge posts" do
       reply1 = create_post(topic: topic, post_number: post.post_number, user: user)
       reply2 = create_post(topic: topic, post_number: post.post_number, user: user)
 
-      expect { PostMerger.new(user, [reply2, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
+      merged_raw = reply1.raw + "\n\n" + reply2.raw
+
+      tl1 = Fabricate(:user, trust_level: 1)
+      tl2 = Fabricate(:user, trust_level: 2)
+      tl3 = Fabricate(:user, trust_level: 3)
+      tl4 = Fabricate(:user, trust_level: 4)
+
+      expect { PostMerger.new(tl1, [reply2, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
+      expect { PostMerger.new(tl2, [reply2, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
+      expect { PostMerger.new(tl3, [reply2, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
+
+      PostMerger.new(tl4, [reply2, reply1]).merge
+
+      expect(reply1.trashed?).to eq(true)
+      expect(reply2.trashed?).to eq(false)
+
+      expect(reply2.raw).to eq(merged_raw)
     end
 
     it "should not allow posts from different topics to be merged" do
@@ -66,5 +82,18 @@ describe PostMerger do
         PostMerger::CannotMergeError, I18n.t("merge_posts.errors.different_users")
       )
     end
+
+    it "should not allow posts with length greater than max_post_length" do
+      SiteSetting.max_post_length = 60
+
+      reply1 = create_post(topic: topic, raw: 'The first reply', post_number: 2, user: user)
+      reply2 = create_post(topic: topic, raw: "The second reply\nSecond line", post_number: 3, user: user)
+      reply3 = create_post(topic: topic, raw: 'The third reply', post_number: 4, user: user)
+      replies = [reply3, reply2, reply1]
+
+      expect { PostMerger.new(admin, replies).merge }.to raise_error(
+        PostMerger::CannotMergeError, I18n.t("merge_posts.errors.max_post_length")
+      )
+    end
   end
 end
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index 00f49f1342..5d1fe8bb4a 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -44,6 +44,22 @@ describe PostRevisor do
   end
 
   context 'editing category' do
+    it "triggers the :post_edited event with topic_changed?" do
+      category = Fabricate(:category)
+      category.set_permissions(everyone: :full)
+      category.save!
+      post = create_post
+      events = DiscourseEvent.track_events do
+        post.revise(post.user, category_id: category.id)
+      end
+
+      event = events.find { |e| e[:event_name] == :post_edited }
+
+      expect(event[:params].first).to eq(post)
+      expect(event[:params].second).to eq(true)
+      expect(event[:params].third).to be_kind_of(PostRevisor)
+      expect(event[:params].third.topic_diff).to eq({ "category_id" => [SiteSetting.uncategorized_category_id, category.id] })
+    end
 
     it 'does not revise category when no permission to create a topic in category' do
       category = Fabricate(:category)
@@ -84,6 +100,28 @@ describe PostRevisor do
       post.revise(post.user, category_id: new_category.id)
       expect(post.reload.topic.category_id).to eq(new_category.id)
     end
+
+    it 'does not revise category if incorrect amount of tags' do
+      SiteSetting.min_trust_to_create_tag = 0
+      SiteSetting.min_trust_level_to_tag_topics = 0
+
+      new_category = Fabricate(:category, minimum_required_tags: 1)
+
+      post = create_post
+      old_category_id = post.topic.category_id
+
+      post.revise(post.user, category_id: new_category.id)
+      expect(post.reload.topic.category_id).to eq(old_category_id)
+
+      tag = Fabricate(:tag)
+      topic_tag = Fabricate(:topic_tag, topic: post.topic, tag: tag)
+      post.revise(post.user, category_id: new_category.id)
+      expect(post.reload.topic.category_id).to eq(new_category.id)
+      topic_tag.destroy
+
+      post.revise(post.user, category_id: new_category.id, tags: ['test_tag'])
+      expect(post.reload.topic.category_id).to eq(new_category.id)
+    end
   end
 
   context 'revise wiki' do
@@ -833,6 +871,21 @@ describe PostRevisor do
             expect(post.topic.tags.map(&:name).sort).to eq(['important', 'stuff'])
           end
 
+          it "triggers the :post_edited event with topic_changed?" do
+            topic.tags = [Fabricate(:tag, name: "super"), Fabricate(:tag, name: "stuff")]
+
+            events = DiscourseEvent.track_events do
+              subject.revise!(user, raw: "lets totally update the body", tags: [])
+            end
+
+            event = events.find { |e| e[:event_name] == :post_edited }
+
+            expect(event[:params].first).to eq(post)
+            expect(event[:params].second).to eq(true)
+            expect(event[:params].third).to be_kind_of(PostRevisor)
+            expect(event[:params].third.topic_diff).to eq({ "tags" => [["super", "stuff"], []] })
+          end
+
           context "with staff-only tags" do
             before do
               create_staff_only_tags(['important'])
@@ -1016,4 +1069,31 @@ describe PostRevisor do
       end
     end
   end
+
+  context 'when the review_every_post setting is enabled' do
+    let(:post) { Fabricate(:post, post_args) }
+    let(:revisor) { PostRevisor.new(post) }
+
+    before { SiteSetting.review_every_post = true }
+
+    it 'queues the post when a regular user edits it' do
+      expect {
+        revisor.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 10.minutes)
+      }.to change(ReviewablePost, :count).by(1)
+    end
+
+    it 'does nothing when a staff member edits a post' do
+      admin = Fabricate(:admin)
+
+      expect { revisor.revise!(admin, { raw: 'updated body' }) }.to change(ReviewablePost, :count).by(0)
+    end
+
+    it 'skips ninja edits' do
+      SiteSetting.editing_grace_period = 1.minute
+
+      expect {
+        revisor.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 10.seconds)
+      }.to change(ReviewablePost, :count).by(0)
+    end
+  end
 end
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 887dcfba9c..1cc6baefaa 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -112,6 +112,7 @@ describe PrettyText do
 
         it "adds an only-emoji class when a line has only one emoji" do
           md = <<~MD
+            ☹️
             foo 😀
             foo 😀 bar
             :smile_cat:
@@ -131,7 +132,8 @@ describe PrettyText do
           MD
 
           html = <<~HTML
-            <p>foo <img src="/images/emoji/twitter/grinning.png?v=#{Emoji::EMOJI_VERSION}" title=":grinning:" class="emoji" alt=":grinning:"><br>
+            <p><img src="/images/emoji/twitter/frowning.png?v=#{Emoji::EMOJI_VERSION}" title=":frowning:" class="emoji only-emoji" alt=":frowning:"><br>
+            foo <img src="/images/emoji/twitter/grinning.png?v=#{Emoji::EMOJI_VERSION}" title=":grinning:" class="emoji" alt=":grinning:"><br>
             foo <img src="/images/emoji/twitter/grinning.png?v=#{Emoji::EMOJI_VERSION}" title=":grinning:" class="emoji" alt=":grinning:"> bar<br>
             <img src="/images/emoji/twitter/smile_cat.png?v=#{Emoji::EMOJI_VERSION}" title=":smile_cat:" class="emoji only-emoji" alt=":smile_cat:"><br>
             <img src="/images/emoji/twitter/smile_cat.png?v=#{Emoji::EMOJI_VERSION}" title=":smile_cat:" class="emoji only-emoji" alt=":smile_cat:"> <img src="/images/emoji/twitter/smile_cat.png?v=#{Emoji::EMOJI_VERSION}" title=":smile_cat:" class="emoji only-emoji" alt=":smile_cat:"><br>
@@ -151,6 +153,45 @@ describe PrettyText do
 
           expect(cook(md)).to eq(html.strip)
         end
+
+        it "does use emoji CDN when enabled" do
+          SiteSetting.external_emoji_url = "https://emoji.cdn.com"
+
+          html = <<~HTML
+            <blockquote>
+            <p>This is a quote with a regular emoji <img src="https://emoji.cdn.com/twitter/upside_down_face.png?v=9" title=":upside_down_face:" class="emoji" alt=":upside_down_face:"></p>
+            </blockquote>
+            <blockquote>
+            <p>This is a quote with an emoji shortcut <img src="https://emoji.cdn.com/twitter/slight_smile.png?v=9" title=":slight_smile:" class="emoji" alt=":slight_smile:"></p>
+            </blockquote>
+            <blockquote>
+            <p>This is a quote with a Unicode emoji <img src="https://emoji.cdn.com/twitter/sunglasses.png?v=9" title=":sunglasses:" class="emoji" alt=":sunglasses:"></p>
+            </blockquote>
+          HTML
+
+          expect(cook(md)).to eq(html.strip)
+        end
+
+        it "does use emoji CDN when others CDNs are also enabled" do
+          set_cdn_url('https://cdn.com')
+          setup_s3
+          SiteSetting.s3_cdn_url = "https://s3.cdn.com"
+          SiteSetting.external_emoji_url = "https://emoji.cdn.com"
+
+          html = <<~HTML
+            <blockquote>
+            <p>This is a quote with a regular emoji <img src="https://emoji.cdn.com/twitter/upside_down_face.png?v=9" title=":upside_down_face:" class="emoji" alt=":upside_down_face:"></p>
+            </blockquote>
+            <blockquote>
+            <p>This is a quote with an emoji shortcut <img src="https://emoji.cdn.com/twitter/slight_smile.png?v=9" title=":slight_smile:" class="emoji" alt=":slight_smile:"></p>
+            </blockquote>
+            <blockquote>
+            <p>This is a quote with a Unicode emoji <img src="https://emoji.cdn.com/twitter/sunglasses.png?v=9" title=":sunglasses:" class="emoji" alt=":sunglasses:"></p>
+            </blockquote>
+          HTML
+
+          expect(cook(md)).to eq(html.strip)
+        end
       end
 
       it "do off topic quoting of posts from secure categories" do
@@ -636,6 +677,22 @@ describe PrettyText do
       end
     end
 
+    context "emojis" do
+      it "should remove broken emoji" do
+        html = <<~EOS
+          <img src=\"//localhost:3000/images/emoji/twitter/bike.png?v=9\" title=\":bike:\" class=\"emoji\" alt=\":bike:\"> <img src=\"//localhost:3000/images/emoji/twitter/cat.png?v=9\" title=\":cat:\" class=\"emoji\" alt=\":cat:\"> <img src=\"//localhost:3000/images/emoji/twitter/discourse.png?v=9\" title=\":discourse:\" class=\"emoji\" alt=\":discourse:\">
+        EOS
+        expect(PrettyText.excerpt(html, 7)).to eq(":bike: &hellip;")
+        expect(PrettyText.excerpt(html, 8)).to eq(":bike: &hellip;")
+        expect(PrettyText.excerpt(html, 9)).to eq(":bike: &hellip;")
+        expect(PrettyText.excerpt(html, 10)).to eq(":bike: &hellip;")
+        expect(PrettyText.excerpt(html, 11)).to eq(":bike: &hellip;")
+        expect(PrettyText.excerpt(html, 12)).to eq(":bike: :cat: &hellip;")
+        expect(PrettyText.excerpt(html, 13)).to eq(":bike: :cat: &hellip;")
+        expect(PrettyText.excerpt(html, 14)).to eq(":bike: :cat: &hellip;")
+      end
+    end
+
     it "should have an option to strip links" do
       expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>", 100, strip_links: true)).to eq("cnn")
     end
@@ -690,7 +747,7 @@ describe PrettyText do
     end
 
     it "should extract links to topics" do
-      expect(extract_urls("<aside class=\"quote\" data-topic=\"321\">aside</aside>")).to eq(["/t/topic/321"])
+      expect(extract_urls("<aside class=\"quote\" data-topic=\"321\">aside</aside>")).to eq(["/t/321"])
     end
 
     it "should lazyYT videos" do
@@ -698,7 +755,7 @@ describe PrettyText do
     end
 
     it "should extract links to posts" do
-      expect(extract_urls("<aside class=\"quote\" data-topic=\"1234\" data-post=\"4567\">aside</aside>")).to eq(["/t/topic/1234/4567"])
+      expect(extract_urls("<aside class=\"quote\" data-topic=\"1234\" data-post=\"4567\">aside</aside>")).to eq(["/t/1234/4567"])
     end
 
     it "should not extract links to anchors" do
@@ -718,7 +775,7 @@ describe PrettyText do
       expect(links.map { |l| [l.url, l.is_quote] }.sort).to eq([
         ["http://body_only.com", false],
         ["http://body_and_quote.com", false],
-        ["/t/topic/1234", true],
+        ["/t/1234", true],
       ].sort)
     end
 
@@ -900,6 +957,23 @@ describe PrettyText do
       expect(PrettyText.format_for_email(html, post)).to match(Regexp.escape("https://vimeo.com/329875646/%3E%20%3Cscript%3Ealert(1)%3C/script%3E"))
     end
 
+    describe "#convert_vimeo_iframes" do
+      it "converts <iframe> to <a>" do
+        html = <<~HTML
+          <p>This is a Vimeo link:</p>
+          <iframe width="640" height="360" src="https://player.vimeo.com/video/1" data-original-href="https://vimeo.com/1" frameborder="0" allowfullscreen="" seamless="seamless" sandbox="allow-same-origin allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox allow-presentation"></iframe>
+        HTML
+
+        md = PrettyText.format_for_email(html, post)
+
+        expect(md).not_to include('<iframe')
+        expect(md).to match_html(<<~HTML)
+          <p>This is a Vimeo link:</p>
+          <p><a href="https://vimeo.com/1">https://vimeo.com/1</a></p>
+        HTML
+      end
+    end
+
     describe "#strip_secure_media" do
       before do
         setup_s3
@@ -1037,7 +1111,12 @@ describe PrettyText do
     end
 
     it "replaces some glyphs that are not in the emoji range" do
-      expect(PrettyText.cook("☺")).to match(/\:slight_smile\:/)
+      expect(PrettyText.cook("☹")).to match(/\:frowning\:/)
+      expect(PrettyText.cook("☺")).to match(/\:relaxed\:/)
+      expect(PrettyText.cook("☻")).to match(/\:slight_smile\:/)
+      expect(PrettyText.cook("♡")).to match(/\:heart\:/)
+      expect(PrettyText.cook("❤")).to match(/\:heart\:/)
+      expect(PrettyText.cook("❤️")).to match(/\:heart\:/) # in emoji range but ensure it works along others
     end
 
     it "replaces digits" do
@@ -1154,7 +1233,7 @@ describe PrettyText do
     [
       "<span class=\"hashtag\">#unknown::tag</span>",
       "<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=\"/tag/known\">#<span>known</span></a>",
       "<a class=\"hashtag\" href=\"#{category.url}\">#<span>testing</span></a>"
     ].each do |element|
 
@@ -1175,7 +1254,7 @@ describe PrettyText do
 
     cooked = PrettyText.cook("<A href='/a'>test</A> #known::tag")
     html = <<~HTML
-      <p><a href="/a">test</a> <a class="hashtag" href="http://test.localhost/tag/known">#<span>known</span></a></p>
+      <p><a href="/a">test</a> <a class="hashtag" href="/tag/known">#<span>known</span></a></p>
     HTML
 
     expect(cooked).to eq(html.strip)
@@ -1318,12 +1397,70 @@ HTML
     end
   end
 
+  describe "watched words - replace" do
+    after(:all) { Discourse.redis.flushdb }
+
+    it "replaces words with other words" do
+      Fabricate(:watched_word, action: WatchedWord.actions[:replace], word: "dolor sit*", replacement: "something else")
+
+      expect(PrettyText.cook("Lorem ipsum dolor sit amet")).to match_html(<<~HTML)
+        <p>Lorem ipsum something else amet</p>
+      HTML
+
+      expect(PrettyText.cook("Lorem ipsum dolor sits amet")).to match_html(<<~HTML)
+        <p>Lorem ipsum something else amet</p>
+      HTML
+
+      expect(PrettyText.cook("Lorem ipsum dolor sittt amet")).to match_html(<<~HTML)
+        <p>Lorem ipsum something else amet</p>
+      HTML
+    end
+
+    it "replaces words with links" do
+      Fabricate(:watched_word, action: WatchedWord.actions[:replace], word: "meta", replacement: "https://meta.discourse.org")
+
+      expect(PrettyText.cook("Meta is a Discourse forum")).to match_html(<<~HTML)
+        <p>
+          <a href=\"https://meta.discourse.org\" rel=\"noopener nofollow ugc\">Meta</a>
+          is a Discourse forum
+        </p>
+      HTML
+    end
+
+    it "works with regex" do
+      Fabricate(:watched_word, action: WatchedWord.actions[:replace], word: "f.o", replacement: "test")
+
+      expect(PrettyText.cook("foo")).to match_html("<p>foo</p>")
+      expect(PrettyText.cook("f.o")).to match_html("<p>test</p>")
+
+      SiteSetting.watched_words_regular_expressions = true
+
+      expect(PrettyText.cook("foo")).to match_html("<p>test</p>")
+      expect(PrettyText.cook("f.o")).to match_html("<p>test</p>")
+    end
+
+    it "supports overlapping words" do
+      Fabricate(:watched_word, action: WatchedWord.actions[:replace], word: "discourse", replacement: "https://discourse.org")
+      Fabricate(:watched_word, action: WatchedWord.actions[:replace], word: "is", replacement: "https://example.com")
+
+      expect(PrettyText.cook("Meta is a Discourse forum")).to match_html(<<~HTML)
+        <p>
+          Meta
+          <a href="https://example.com" rel="noopener nofollow ugc">is</a>
+          a
+          <a href="https://discourse.org" rel="noopener nofollow ugc">Discourse</a>
+          forum
+        </p>
+      HTML
+    end
+  end
+
   it 'supports typographer' do
     SiteSetting.enable_markdown_typographer = true
-    expect(PrettyText.cook('(tm)')).to eq('<p>™</p>')
+    expect(PrettyText.cook('->')).to eq('<p> → </p>')
 
     SiteSetting.enable_markdown_typographer = false
-    expect(PrettyText.cook('(tm)')).to eq('<p>(tm)</p>')
+    expect(PrettyText.cook('->')).to eq('<p>-&gt;</p>')
   end
 
   it 'uses quotation marks from site settings' do
@@ -1781,4 +1918,17 @@ HTML
       expect(cooked).to eq(html.strip)
     end
   end
+
+  it "adds anchor links to headings" do
+    cooked = PrettyText.cook('# Hello world')
+
+    html = <<~HTML
+      <h1>
+      <a name="hello-world-1" class="anchor" href="#hello-world-1"></a>
+      Hello world
+      </h1>
+    HTML
+
+    expect(cooked).to match_html(html)
+  end
 end
diff --git a/spec/components/rate_limiter_spec.rb b/spec/components/rate_limiter_spec.rb
index 506fa13c53..2b32df750d 100644
--- a/spec/components/rate_limiter_spec.rb
+++ b/spec/components/rate_limiter_spec.rb
@@ -72,10 +72,10 @@ describe RateLimiter do
           limiter.performed!
         end.to raise_error(RateLimiter::LimitExceeded)
 
-        freeze_time 31.seconds.from_now
+        freeze_time 30.seconds.from_now
 
-        limiter.performed!
-        limiter.performed!
+        expect { limiter.performed! }.not_to raise_error
+        expect { limiter.performed! }.not_to raise_error
 
       end
     end
@@ -150,6 +150,7 @@ describe RateLimiter do
 
     context "multiple calls" do
       before do
+        freeze_time
         rate_limiter.performed!
         rate_limiter.performed!
       end
@@ -160,7 +161,15 @@ describe RateLimiter do
       end
 
       it "raises an error the third time called" do
-        expect { rate_limiter.performed! }.to raise_error(RateLimiter::LimitExceeded)
+        expect { rate_limiter.performed! }.to raise_error do |error|
+          expect(error).to be_a(RateLimiter::LimitExceeded)
+          expect(error).to having_attributes(available_in: 60)
+        end
+      end
+
+      it 'raises no error when the sliding window ended' do
+        freeze_time 60.seconds.from_now
+        expect { rate_limiter.performed! }.not_to raise_error
       end
 
       context "as an admin/moderator" do
diff --git a/spec/components/retrieve_title_spec.rb b/spec/components/retrieve_title_spec.rb
index 84ca621ef0..56e80a4130 100644
--- a/spec/components/retrieve_title_spec.rb
+++ b/spec/components/retrieve_title_spec.rb
@@ -67,6 +67,27 @@ describe RetrieveTitle do
 
       expect(RetrieveTitle.crawl("https://brelksdjflaskfj.com/amazing")).to eq("very amazing")
     end
-  end
 
+    it "detects and uses encoding from Content-Type header" do
+      stub_request(:get, "https://brelksdjflaskfj.com/amazing")
+        .to_return(
+          status: 200,
+          body: "<html><title>fancy apostrophes ’’’</title>".dup.force_encoding('ASCII-8BIT'),
+          headers: { 'Content-Type' => 'text/html; charset="utf-8"' }
+        )
+
+      IPSocket.stubs(:getaddress).returns('100.2.3.4')
+      expect(RetrieveTitle.crawl("https://brelksdjflaskfj.com/amazing")).to eq("fancy apostrophes ’’’")
+
+      stub_request(:get, "https://brelksdjflaskfj.com/amazing")
+        .to_return(
+          status: 200,
+          body: "<html><title>japanese こんにちは website</title>".encode('EUC-JP').force_encoding('ASCII-8BIT'),
+          headers: { 'Content-Type' => 'text/html;charset=euc-jp' }
+        )
+
+      IPSocket.stubs(:getaddress).returns('100.2.3.4')
+      expect(RetrieveTitle.crawl("https://brelksdjflaskfj.com/amazing")).to eq("japanese こんにちは website")
+    end
+  end
 end
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index cc646d0fa4..c6a52dcdd2 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -308,7 +308,7 @@ describe Search do
     context 'personal_messages filter' do
       it 'does not allow a normal user to search for personal messages of another user' do
         expect do
-          results = Search.execute(
+          Search.execute(
             "mars personal_messages:#{post.user.username}",
             guardian: Guardian.new(Fabricate(:user))
           )
@@ -397,16 +397,21 @@ 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])
         [
           "@#{participant.username} in:personal-direct",
-          "@#{participant.username} iN:pErSoNaL-dIrEcT"
+          "@#{participant.username} iN:pErSoNaL-dIrEcT",
         ].each do |query|
           results = Search.execute(query, guardian: Guardian.new(current))
           expect(results.posts.size).to eq(2)
-          expect(results.posts.map(&:topic_id)).to eq([pm_2.id, pm.id])
+          expect(results.posts.map(&:topic_id)).to contain_exactly(pm_2.id, pm.id)
           expect(results.posts.map(&:user_id).uniq).to eq([participant.id])
         end
+
+        results = Search.execute("@me in:personal-direct", guardian: Guardian.new(current))
+        expect(results.posts.size).to eq(3)
+        expect(results.posts.map(&:topic_id)).to contain_exactly(pm_3.id, pm_2.id, pm.id)
+        expect(results.posts.map(&:user_id).uniq).to eq([current.id])
       end
 
       it "doesn't include PMs that have more than 2 participants" do
@@ -537,6 +542,19 @@ describe Search do
       expect(post.headline.include?('elephant')).to eq(false)
     end
 
+    it "does not truncate topic title when applying highlights" do
+      SiteSetting.use_pg_headlines_for_excerpt = true
+
+      topic = reply.topic
+      topic.update!(title: "#{'very ' * 7}long topic title with our search term in the middle of the title")
+
+      result = Search.execute('search term')
+
+      expect(result.posts.first.topic_title_headline).to eq(<<~TITLE.chomp)
+      Very very very very very very very long topic title with our <span class=\"#{Search::HIGHLIGHT_CSS_CLASS}\">search</span> <span class=\"#{Search::HIGHLIGHT_CSS_CLASS}\">term</span> in the middle of the title
+      TITLE
+    end
+
     it "limits the search headline to #{Search::GroupedSearchResults::BLURB_LENGTH} characters" do
       SiteSetting.use_pg_headlines_for_excerpt = true
 
@@ -583,7 +601,7 @@ describe Search do
       expect(result.posts.pluck(:id)).to eq([post2.id, post.id])
     end
 
-    it 'aggregates searches in a topic by returning the post with the highest rank' do
+    it 'aggregates searches in a topic by returning the post with the lowest post number' do
       post = Fabricate(:post, topic: topic, raw: "this is a play post")
       post2 = Fabricate(:post, topic: topic, raw: "play play playing played play")
       post3 = Fabricate(:post, raw: "this is a play post")
@@ -595,7 +613,7 @@ describe Search do
       results = Search.execute('play')
 
       expect(results.posts.map(&:id)).to eq([
-        post2.id,
+        post.id,
         post3.id
       ])
     end
@@ -943,7 +961,7 @@ describe Search do
 
       it 'can find posts with tags' do
         # we got to make this index (it is deferred)
-        Jobs::ReindexSearch.new.rebuild_problem_posts
+        Jobs::ReindexSearch.new.rebuild_posts
 
         result = Search.execute(tag.name)
         expect(result.posts.length).to eq(1)
@@ -959,7 +977,7 @@ describe Search do
 
       it 'can find posts with tag synonyms' do
         synonym = Fabricate(:tag, name: 'synonym', target_tag: tag)
-        Jobs::ReindexSearch.new.rebuild_problem_posts
+        Jobs::ReindexSearch.new.rebuild_posts
         result = Search.execute(synonym.name)
         expect(result.posts.length).to eq(1)
       end
@@ -1145,9 +1163,6 @@ describe Search do
 
       topic.update_pinned(true)
 
-      user = Fabricate(:user)
-      guardian = Guardian.new(user)
-
       expect(Search.execute('boom in:pinned').posts.length).to eq(1)
       expect(Search.execute('boom IN:PINNED').posts.length).to eq(1)
     end
@@ -1727,7 +1742,7 @@ describe Search do
   context 'in:title' do
     it 'allows for search in title' do
       topic = Fabricate(:topic, title: 'I am testing a title search')
-      post2 = Fabricate(:post, topic: topic, raw: 'this is the second post', post_number: 2)
+      _post2 = Fabricate(:post, topic: topic, raw: 'this is the second post', post_number: 2)
       post = Fabricate(:post, topic: topic, raw: 'this is the first post', post_number: 1)
 
       results = Search.execute('title in:title')
@@ -1776,6 +1791,27 @@ describe Search do
     end
   end
 
+  context 'CJK segmentation' do
+    before do
+      SiteSetting.search_tokenize_chinese_japanese_korean = true
+      SiteSetting.min_search_term_length = 1
+    end
+
+    let!(:post1) do
+      Fabricate(:post, raw: '場サアマネ織企ういかせ竹域ヱイマ穂基ホ神3予読ずねいぱ松査ス禁多サウ提懸イふ引小43改こょドめ。深とつぐ主思料農ぞかル者杯検める活分えほづぼ白犠')
+    end
+
+    it('does not include superflous spaces in blurbs') do
+
+      results = Search.execute('ういかせ竹域', type_filter: 'topic')
+      expect(results.posts.length).to eq(1)
+
+      expect(results.blurb(results.posts.first)).to include('ういかせ竹域')
+
+    end
+
+  end
+
   context 'include_diacritics' do
     before { SiteSetting.search_ignore_accents = false }
     let!(:post1) { Fabricate(:post, raw: 'สวัสดี Régis hello') }
@@ -1877,9 +1913,11 @@ describe Search do
 
     it 'allows to define custom order' do
       expect(Search.new("advanced").execute.posts).to eq([post1, post0])
+
       Search.advanced_order(:chars) do |posts|
-        posts.reorder("(SELECT LENGTH(raw) FROM posts WHERE posts.topic_id = subquery.topic_id) DESC")
+        posts.reorder("MAX(LENGTH(posts.raw)) DESC")
       end
+
       expect(Search.new("advanced order:chars").execute.posts).to eq([post0, post1])
     end
   end
diff --git a/spec/components/site_setting_extension_spec.rb b/spec/components/site_setting_extension_spec.rb
index 1b955548cd..0180122715 100644
--- a/spec/components/site_setting_extension_spec.rb
+++ b/spec/components/site_setting_extension_spec.rb
@@ -631,7 +631,7 @@ describe SiteSettingExtension do
     end
 
     it "is present in all_settings when we ask for hidden" do
-      expect(settings.all_settings(true).find { |s| s[:setting] == :superman_identity }).to be_present
+      expect(settings.all_settings(include_hidden: true).find { |s| s[:setting] == :superman_identity }).to be_present
     end
   end
 
@@ -785,7 +785,7 @@ describe SiteSettingExtension do
 
   describe '.default_locale' do
     it 'is always loaded' do
-      expect(settings.default_locale).to eq('en_US')
+      expect(settings.default_locale).to eq('en')
     end
   end
 
@@ -842,6 +842,23 @@ describe SiteSettingExtension do
         expect(setting[:default]).to eq(system_upload.url)
       end
     end
+
+    it 'should sanitize html in the site settings' do
+      settings.setting(:with_html, '<script></script>rest')
+      settings.refresh!
+
+      setting = settings.all_settings(sanitize_plain_text_settings: true).last
+
+      expect(setting[:value]).to eq('rest')
+    end
+
+    it 'settings with html type are not sanitized' do
+      settings.setting(:with_html, '<script></script>rest', type: :html)
+
+      setting = settings.all_settings(sanitize_plain_text_settings: true).last
+
+      expect(setting[:value]).to eq('<script></script>rest')
+    end
   end
 
   describe '.client_settings_json_uncached' do
@@ -855,6 +872,27 @@ describe SiteSettingExtension do
         %Q|{"default_locale":"#{SiteSetting.default_locale}","upload_type":"#{upload.url}","string_type":"haha"}|
       )
     end
+
+    it 'should sanitize html in the site settings' do
+      settings.setting(:with_html, '<script></script>rest', client: true)
+      settings.setting(:with_symbols, '<>rest', client: true)
+      settings.setting(:with_unknown_tag, '<rest>rest', client: true)
+      settings.refresh!
+
+      client_settings = JSON.parse settings.client_settings_json_uncached
+
+      expect(client_settings['with_html']).to eq('rest')
+      expect(client_settings['with_symbols']).to eq('<>rest')
+      expect(client_settings['with_unknown_tag']).to eq('rest')
+    end
+
+    it 'settings with html type are not sanitized' do
+      settings.setting(:with_html, '<script></script>rest', type: :html, client: true)
+
+      client_settings = JSON.parse settings.client_settings_json_uncached
+
+      expect(client_settings['with_html']).to eq('<script></script>rest')
+    end
   end
 
   describe '.setup_methods' do
diff --git a/spec/components/site_settings/type_supervisor_spec.rb b/spec/components/site_settings/type_supervisor_spec.rb
index cc697c01d5..f565b86eb0 100644
--- a/spec/components/site_settings/type_supervisor_spec.rb
+++ b/spec/components/site_settings/type_supervisor_spec.rb
@@ -91,6 +91,12 @@ describe SiteSettings::TypeSupervisor do
       it "'simple_list' should be at the right position" do
         expect(SiteSettings::TypeSupervisor.types[:simple_list]).to eq(23)
       end
+      it "'emoji_list' should be at the right position" do
+        expect(SiteSettings::TypeSupervisor.types[:emoji_list]).to eq(24)
+      end
+      it "'html' should be at the right position" do
+        expect(SiteSettings::TypeSupervisor.types[:html]).to eq(25)
+      end
     end
   end
 
@@ -151,6 +157,22 @@ describe SiteSettings::TypeSupervisor do
       end
     end
 
+    class TestJsonSchemaClass
+      def self.schema
+        {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              name: {
+                type: "string",
+              },
+            },
+          },
+        }
+      end
+    end
+
     before do
       settings.setting(:type_null, nil)
       settings.setting(:type_int, 1)
@@ -164,6 +186,7 @@ describe SiteSettings::TypeSupervisor do
       settings.setting(:type_mock_validate_method, 'no_value')
       settings.setting(:type_custom, 'custom', type: 'list')
       settings.setting(:type_upload, '', type: 'upload')
+      settings.setting(:type_json_schema, "[{\"name\":\"Brett\"}]", json_schema: 'TestJsonSchemaClass')
       settings.refresh!
     end
 
@@ -245,6 +268,16 @@ describe SiteSettings::TypeSupervisor do
         settings.type_supervisor.expects(:validate_type_mock_validate_method).with('no')
         settings.type_supervisor.to_db_value(:type_mock_validate_method, 'no')
       end
+
+      it 'raises when there is invalid json in a string with json schema' do
+        expect {
+          settings.type_supervisor.to_db_value(:type_json_schema, 'not-json')
+        }.to raise_error Discourse::InvalidParameters
+      end
+
+      it 'returns value for the given json schema string setting' do
+        expect(settings.type_supervisor.to_db_value(:type_json_schema, '{}')).to eq ['{}', SiteSetting.types[:string]]
+      end
     end
 
     describe '#to_rb_value' do
diff --git a/spec/components/stylesheet/compiler_spec.rb b/spec/components/stylesheet/compiler_spec.rb
index 37aefc25e8..2c7dff02da 100644
--- a/spec/components/stylesheet/compiler_spec.rb
+++ b/spec/components/stylesheet/compiler_spec.rb
@@ -6,6 +6,8 @@ require 'stylesheet/compiler'
 describe Stylesheet::Compiler do
   describe 'compilation' do
     Dir["#{Rails.root.join("app/assets/stylesheets")}/*.scss"].each do |path|
+      next if path =~ /ember_cli/
+
       path = File.basename(path, '.scss')
 
       it "can compile '#{path}' css" do
@@ -17,28 +19,41 @@ describe Stylesheet::Compiler do
 
   context "with a theme" do
     let!(:theme) { Fabricate(:theme) }
-    let!(:upload) { Fabricate(:upload) }
+    let!(:upload) { UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(Discourse.system_user.id) }
     let!(:upload_theme_field) { ThemeField.create!(theme: theme, target_id: 0, name: "primary", upload: upload, value: "", type_id: ThemeField.types[:theme_upload_var]) }
     let!(:stylesheet_theme_field) { ThemeField.create!(theme: theme, target_id: 0, name: "scss", value: "body { background: $primary }", type_id: ThemeField.types[:scss]) }
     before { stylesheet_theme_field.save! }
 
     it "theme stylesheet should be able to access theme asset variables" do
-      css, _map = Stylesheet::Compiler.compile_asset("desktop_theme", theme_id: theme.id)
+      css, _map = Stylesheet::Compiler.compile_asset("desktop_theme", theme_id: theme.id, theme_variables: theme.scss_variables)
       expect(css).to include(upload.url)
     end
 
     context "with a plugin" do
+      let :plugin1 do
+        plugin1 = Plugin::Instance.new
+        plugin1.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"
+        plugin1.register_css "body { background: $primary }"
+        plugin1
+      end
+
+      let :plugin2 do
+        plugin2 = Plugin::Instance.new
+        plugin2.path = "#{Rails.root}/spec/fixtures/plugins/scss_plugin/plugin.rb"
+        plugin2
+      end
+
       before do
-        plugin = Plugin::Instance.new
-        plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"
-        plugin.register_css "body { background: $primary }"
-        Discourse.plugins << plugin
-        plugin.activate!
+        Discourse.plugins << plugin1
+        Discourse.plugins << plugin2
+        plugin1.activate!
+        plugin2.activate!
         Stylesheet::Importer.register_imports!
       end
 
       after do
-        Discourse.plugins.pop
+        Discourse.plugins.delete plugin1
+        Discourse.plugins.delete plugin2
         Stylesheet::Importer.register_imports!
         DiscoursePluginRegistry.reset!
       end
@@ -48,6 +63,15 @@ describe Stylesheet::Compiler do
         expect(css).not_to include(upload.url)
         expect(css).to include("background:")
       end
+
+      it "supports SCSS imports" do
+        css, _map = Stylesheet::Compiler.compile_asset("scss_plugin", theme_id: theme.id)
+
+        expect(css).to include("border-color:red")
+        expect(css).to include("fill:green")
+        expect(css).to include("line-height:1.2em")
+        expect(css).to include("border-color:#c00")
+      end
     end
   end
 
@@ -65,6 +89,45 @@ describe Stylesheet::Compiler do
     expect(css).not_to include('image-url')
   end
 
+  it "supports absolute-image-url" do
+    scss = Stylesheet::Importer.new({}).prepended_scss
+    scss += ".body{background-image: absolute-image-url('/favicons/github.png');}"
+    css, _map = Stylesheet::Compiler.compile(scss, "test.scss")
+
+    expect(css).to include('url("http://test.localhost/images/favicons/github.png")')
+    expect(css).not_to include('absolute-image-url')
+  end
+
+  it "supports absolute-image-url in subfolder" do
+    set_subfolder "/subfo"
+    scss = Stylesheet::Importer.new({}).prepended_scss
+    scss += ".body{background-image: absolute-image-url('/favicons/github.png');}"
+    css, _map = Stylesheet::Compiler.compile(scss, "test2.scss")
+
+    expect(css).to include('url("http://test.localhost/subfo/images/favicons/github.png")')
+    expect(css).not_to include('absolute-image-url')
+  end
+
+  it "supports absolute-image-url with CDNs" do
+    set_cdn_url "https://awesome.com"
+    scss = Stylesheet::Importer.new({}).prepended_scss
+    scss += ".body{background-image: absolute-image-url('/favicons/github.png');}"
+    css, _map = Stylesheet::Compiler.compile(scss, "test2.scss")
+
+    expect(css).to include('url("https://awesome.com/images/favicons/github.png")')
+    expect(css).not_to include('absolute-image-url')
+  end
+
+  it "supports absolute-image-url in plugins" do
+    set_cdn_url "https://awesome.com"
+    scss = Stylesheet::Importer.new({}).prepended_scss
+    scss += ".body{background-image: absolute-image-url('/plugins/discourse-special/images/somefile.png');}"
+    css, _map = Stylesheet::Compiler.compile(scss, "discourse-special.scss")
+
+    expect(css).to include('url("https://awesome.com/plugins/discourse-special/images/somefile.png")')
+    expect(css).not_to include('absolute-image-url')
+  end
+
   context "with a color scheme" do
     it "returns the default color definitions when no color scheme is specified" do
       css, _map = Stylesheet::Compiler.compile_asset("color_definitions")
@@ -106,4 +169,27 @@ describe Stylesheet::Compiler do
     end
 
   end
+
+  describe "indexes" do
+    it "include all SCSS files in their respective folders" do
+      refs = []
+
+      Dir.glob(Rails.root.join('app/assets/stylesheets/**/*/')).each do |dir|
+        Dir.glob("#{dir}_index.scss").each do |indexfile|
+          contents = File.read indexfile
+
+          files = Dir["#{dir}*.scss"]
+          files -= Dir["#{dir}_index.scss"]
+          files.each do |path|
+            filename = File.basename(path, ".scss")
+            if !contents.match(/@import "#{filename}";/)
+              refs << "#{filename} import missing in #{indexfile}"
+            end
+          end
+        end
+      end
+
+      expect(refs).to eq([])
+    end
+  end
 end
diff --git a/spec/components/stylesheet/importer_spec.rb b/spec/components/stylesheet/importer_spec.rb
index cfe626cf5b..6ddc9ba04c 100644
--- a/spec/components/stylesheet/importer_spec.rb
+++ b/spec/components/stylesheet/importer_spec.rb
@@ -9,153 +9,75 @@ describe Stylesheet::Importer do
     Stylesheet::Compiler.compile_asset(name)[0]
   end
 
-  it "applies CDN to background category images" do
-    expect(compile_css("category_backgrounds")).to_not include("background-image")
+  context "#category_backgrounds" do
+    it "applies CDN to background category images" do
+      expect(compile_css("mobile")).to_not include("body.category-")
+      expect(compile_css("desktop")).to_not include("body.category-")
 
-    background = Fabricate(:upload)
-    parent_category = Fabricate(:category)
-    category = Fabricate(:category, parent_category_id: parent_category.id, uploaded_background: background)
+      background = Fabricate(:upload)
+      parent_category = Fabricate(:category)
+      category = Fabricate(:category, parent_category_id: parent_category.id, uploaded_background: background)
 
-    expect(compile_css("category_backgrounds")).to include("body.category-#{parent_category.slug}-#{category.slug}{background-image:url(#{background.url})}")
+      expect(compile_css("mobile")).to include("body.category-#{parent_category.slug}-#{category.slug}{background-image:url(#{background.url})}")
+      expect(compile_css("desktop")).to include("body.category-#{parent_category.slug}-#{category.slug}{background-image:url(#{background.url})}")
 
-    GlobalSetting.stubs(:cdn_url).returns("//awesome.cdn")
-    expect(compile_css("category_backgrounds")).to include("body.category-#{parent_category.slug}-#{category.slug}{background-image:url(//awesome.cdn#{background.url})}")
-  end
-
-  it "applies S3 CDN to background category images" do
-    setup_s3
-    SiteSetting.s3_use_iam_profile = true
-    SiteSetting.s3_upload_bucket = 'test'
-    SiteSetting.s3_region = 'ap-southeast-2'
-    SiteSetting.s3_cdn_url = "https://s3.cdn"
-
-    background = Fabricate(:upload_s3)
-    category = Fabricate(:category, uploaded_background: background)
-
-    expect(compile_css("category_backgrounds")).to include("body.category-#{category.slug}{background-image:url(https://s3.cdn/original")
-  end
-
-  it "includes font variable" do
-    expect(compile_css("desktop"))
-      .to include(":root{--font-family: Helvetica, Arial, sans-serif}")
-  end
-
-  it "includes separate body and heading font declarations" do
-    base_font = DiscourseFonts.fonts[2]
-    heading_font = DiscourseFonts.fonts[3]
-
-    SiteSetting.base_font = base_font[:key]
-    SiteSetting.heading_font = heading_font[:key]
-
-    expect(compile_css("desktop"))
-      .to include(":root{--font-family: #{base_font[:stack]}}")
-      .and include(":root{--heading-font-family: #{heading_font[:stack]}}")
-  end
-
-  it "includes all fonts in wizard" do
-    expect(compile_css("wizard").scan(/\.body-font-/).count)
-      .to eq(DiscourseFonts.fonts.count)
-
-    expect(compile_css("wizard").scan(/\.heading-font-/).count)
-      .to eq(DiscourseFonts.fonts.count)
-
-    expect(compile_css("wizard").scan(/@font-face/).count)
-      .to eq(DiscourseFonts.fonts.map { |f| f[:variants]&.count || 0 }.sum)
-  end
-
-  context "#theme_variables" do
-
-    let!(:theme) { Fabricate(:theme) }
-
-    let(:importer) { described_class.new(theme: theme) }
-
-    fab!(:upload) { Fabricate(:upload) }
-    fab!(:upload_s3) { Fabricate(:upload_s3) }
-
-    let!(:theme_field) { ThemeField.create!(theme: theme, target_id: 0, name: "var", upload: upload, value: "", type_id: ThemeField.types[:theme_upload_var]) }
-    let!(:theme_field_s3) { ThemeField.create!(theme: theme, target_id: 1, name: "var_s3", upload: upload_s3, value: "", type_id: ThemeField.types[:theme_upload_var]) }
-
-    it "should contain the URL" do
-      theme_field.save!
-      import = importer.imports("theme_variables", nil)
-      expect(import.source).to include(upload.url)
+      GlobalSetting.stubs(:cdn_url).returns("//awesome.cdn")
+      expect(compile_css("mobile")).to include("body.category-#{parent_category.slug}-#{category.slug}{background-image:url(//awesome.cdn#{background.url})}")
+      expect(compile_css("desktop")).to include("body.category-#{parent_category.slug}-#{category.slug}{background-image:url(//awesome.cdn#{background.url})}")
     end
 
-    it "should contain the S3 URL" do
-      theme_field_s3.save!
-      import = importer.imports("theme_variables", nil)
-      expect(import.source).to include(upload_s3.url)
+    it "applies S3 CDN to background category images" do
+      setup_s3
+      SiteSetting.s3_use_iam_profile = true
+      SiteSetting.s3_upload_bucket = 'test'
+      SiteSetting.s3_region = 'ap-southeast-2'
+      SiteSetting.s3_cdn_url = "https://s3.cdn"
+
+      background = Fabricate(:upload_s3)
+      category = Fabricate(:category, uploaded_background: background)
+
+      expect(compile_css("mobile")).to include("body.category-#{category.slug}{background-image:url(https://s3.cdn/original")
+      expect(compile_css("desktop")).to include("body.category-#{category.slug}{background-image:url(https://s3.cdn/original")
     end
 
   end
 
-  context "extra_scss" do
-    let(:scss) { "body { background: red}" }
-    let(:child_scss) { "body { background: green}" }
-
-    let(:theme) { Fabricate(:theme).tap { |t|
-      t.set_field(target: :extra_scss, name: "my_files/magic", value: scss)
-      t.save!
-    }}
-
-    let(:child_theme) { Fabricate(:theme).tap { |t|
-      t.component = true
-      t.set_field(target: :extra_scss, name: "my_files/moremagic", value: child_scss)
-      t.save!
-      theme.add_relative_theme!(:child, t)
-    }}
-
-    let(:importer) { described_class.new(theme: theme) }
-
-    it "should be able to import correctly" do
-      # Import from regular theme file
-      expect(
-        importer.imports(
-          "my_files/magic",
-          "theme_#{theme.id}/desktop-scss-mytheme.scss"
-        ).source).to eq(scss)
-
-      # Import from some deep file
-      expect(
-        importer.imports(
-          "my_files/magic",
-          "theme_#{theme.id}/some/deep/folder/structure/myfile.scss"
-        ).source).to eq(scss)
-
-      # Import from parent dir
-      expect(
-        importer.imports(
-          "../../my_files/magic",
-          "theme_#{theme.id}/my_files/folder1/myfile.scss"
-        ).source).to eq(scss)
-
-      # Import from same dir without ./
-      expect(
-        importer.imports(
-          "magic",
-          "theme_#{theme.id}/my_files/myfile.scss"
-        ).source).to eq(scss)
-
-      # Import from same dir with ./
-      expect(
-        importer.imports(
-          "./magic",
-          "theme_#{theme.id}/my_files/myfile.scss"
-        ).source).to eq(scss)
-
-      # Import within a child theme
-      expect(
-        importer.imports(
-          "my_files/moremagic",
-          "theme_#{child_theme.id}/theme_field.scss"
-        ).source).to eq(child_scss)
+  context "#font" do
+    it "includes font variable" do
+      default_font = ":root{--font-family: Arial, sans-serif}"
+      expect(compile_css("desktop")).to include(default_font)
+      expect(compile_css("mobile")).to include(default_font)
+      expect(compile_css("embed")).to include(default_font)
+      expect(compile_css("publish")).to include(default_font)
     end
 
+    it "includes separate body and heading font declarations" do
+      base_font = DiscourseFonts.fonts[2]
+      heading_font = DiscourseFonts.fonts[3]
+
+      SiteSetting.base_font = base_font[:key]
+      SiteSetting.heading_font = heading_font[:key]
+
+      expect(compile_css("desktop"))
+        .to include(":root{--font-family: #{base_font[:stack]}}")
+        .and include(":root{--heading-font-family: #{heading_font[:stack]}}")
+    end
+
+    it "includes all fonts in wizard" do
+      expect(compile_css("wizard").scan(/\.body-font-/).count)
+        .to eq(DiscourseFonts.fonts.count)
+
+      expect(compile_css("wizard").scan(/\.heading-font-/).count)
+        .to eq(DiscourseFonts.fonts.count)
+
+      expect(compile_css("wizard").scan(/@font-face/).count)
+        .to eq(DiscourseFonts.fonts.map { |f| f[:variants]&.count || 0 }.sum)
+    end
   end
 
   context "#import_color_definitions" do
-    let(:scss) { ":root { --custom-color: green}" }
-    let(:scss_child) { ":root { --custom-color: red}" }
+    let(:scss) { ":root{--custom-color: green}" }
+    let(:scss_child) { "$navy: #000080; :root{--custom-color: red; --custom-color-rgb: \#{hexToRGB($navy)}}" }
 
     let(:theme) do
       Fabricate(:theme).tap do |t|
@@ -164,13 +86,13 @@ describe Stylesheet::Importer do
       end
     end
 
-    let(:child) { Fabricate(:theme, component: true).tap { |t|
+    let(:child) { Fabricate(:theme, component: true, name: "Child Theme").tap { |t|
       t.set_field(target: :common, name: "color_definitions", value: scss_child)
       t.save!
     }}
 
     it "should include color definitions in the theme" do
-      styles = Stylesheet::Importer.import_color_definitions(theme.id)
+      styles = Stylesheet::Importer.new({ theme_id: theme.id }).import_color_definitions
       expect(styles).to include(scss)
     end
 
@@ -178,13 +100,16 @@ describe Stylesheet::Importer do
       theme.add_relative_theme!(:child, child)
       theme.save!
 
-      styles = Stylesheet::Importer.import_color_definitions(theme.id)
-      expect(styles).to include(scss_child)
+      styles = Stylesheet::Importer.new({ theme_id: theme.id }).import_color_definitions
+      expect(styles).to include("Color definitions from Child Theme")
+      expect(styles).to include("--custom-color: red")
+      expect(styles).to include("--custom-color-rgb: 0,0,128")
+
     end
 
     it "should include default theme color definitions" do
       SiteSetting.default_theme_id = theme.id
-      styles = Stylesheet::Importer.import_color_definitions(nil)
+      styles = Stylesheet::Importer.new({}).import_color_definitions
       expect(styles).to include(scss)
     end
   end
@@ -192,12 +117,12 @@ describe Stylesheet::Importer do
   context "#import_wcag_overrides" do
     it "should do nothing on a regular scheme" do
       scheme = ColorScheme.create_from_base(name: 'Regular')
-      expect(Stylesheet::Importer.import_wcag_overrides(scheme.id)).to eq("")
+      expect(Stylesheet::Importer.new({ color_scheme_id: scheme.id }).import_wcag_overrides).to eq("")
     end
 
     it "should include WCAG overrides for WCAG based scheme" do
       scheme = ColorScheme.create_from_base(name: 'WCAG New', base_scheme_id: "WCAG Dark")
-      expect(Stylesheet::Importer.import_wcag_overrides(scheme.id)).to eq("@import \"wcag\";")
+      expect(Stylesheet::Importer.new({ color_scheme_id: scheme.id }).import_wcag_overrides).to eq("@import \"wcag\";")
     end
   end
 end
diff --git a/spec/components/stylesheet/manager_spec.rb b/spec/components/stylesheet/manager_spec.rb
index f7727ce536..ef21907509 100644
--- a/spec/components/stylesheet/manager_spec.rb
+++ b/spec/components/stylesheet/manager_spec.rb
@@ -22,48 +22,121 @@ describe Stylesheet::Manager do
     expect(link).not_to eq("")
   end
 
-  it 'can correctly compile theme css' do
-    theme = Fabricate(:theme)
+  context "themes with components" do
+    let(:child_theme) { Fabricate(:theme, component: true).tap { |c|
+      c.set_field(target: :common, name: "scss", value: ".child_common{.scss{color: red;}}")
+      c.set_field(target: :desktop, name: "scss", value: ".child_desktop{.scss{color: red;}}")
+      c.set_field(target: :mobile, name: "scss", value: ".child_mobile{.scss{color: red;}}")
+      c.set_field(target: :common, name: "embedded_scss", value: ".child_embedded{.scss{color: red;}}")
+      c.save!
+    }}
 
-    theme.set_field(target: :common, name: "scss", value: ".common{.scss{color: red;}}")
-    theme.set_field(target: :desktop, name: "scss", value: ".desktop{.scss{color: red;}}")
-    theme.set_field(target: :mobile, name: "scss", value: ".mobile{.scss{color: red;}}")
-    theme.set_field(target: :common, name: "embedded_scss", value: ".embedded{.scss{color: red;}}")
+    let(:theme) { Fabricate(:theme).tap { |t|
+      t.set_field(target: :common, name: "scss", value: ".common{.scss{color: red;}}")
+      t.set_field(target: :desktop, name: "scss", value: ".desktop{.scss{color: red;}}")
+      t.set_field(target: :mobile, name: "scss", value: ".mobile{.scss{color: red;}}")
+      t.set_field(target: :common, name: "embedded_scss", value: ".embedded{.scss{color: red;}}")
+      t.save!
 
-    theme.save!
+      t.add_relative_theme!(:child, child_theme)
+    }}
 
-    child_theme = Fabricate(:theme, component: true)
+    it 'can correctly compile theme css' do
+      old_links = Stylesheet::Manager.stylesheet_link_tag(:desktop_theme, 'all', theme.id)
 
-    child_theme.set_field(target: :common, name: "scss", value: ".child_common{.scss{color: red;}}")
-    child_theme.set_field(target: :desktop, name: "scss", value: ".child_desktop{.scss{color: red;}}")
-    child_theme.set_field(target: :mobile, name: "scss", value: ".child_mobile{.scss{color: red;}}")
-    child_theme.set_field(target: :common, name: "embedded_scss", value: ".child_embedded{.scss{color: red;}}")
-    child_theme.save!
+      manager = Stylesheet::Manager.new(:desktop_theme, theme.id)
+      manager.compile(force: true)
 
-    theme.add_relative_theme!(:child, child_theme)
+      css = File.read(manager.stylesheet_fullpath)
+      _source_map = File.read(manager.source_map_fullpath)
 
-    old_link = Stylesheet::Manager.stylesheet_link_tag(:desktop_theme, 'all', theme.id)
+      expect(css).to match(/\.common/)
+      expect(css).to match(/\.desktop/)
 
-    manager = Stylesheet::Manager.new(:desktop_theme, theme.id)
-    manager.compile(force: true)
+      # child theme CSS is no longer bundled with main theme
+      expect(css).not_to match(/child_common/)
+      expect(css).not_to match(/child_desktop/)
 
-    css = File.read(manager.stylesheet_fullpath)
-    _source_map = File.read(manager.source_map_fullpath)
+      child_theme_manager = Stylesheet::Manager.new(:desktop_theme, child_theme.id)
+      child_theme_manager.compile(force: true)
 
-    expect(css).to match(/child_common/)
-    expect(css).to match(/child_desktop/)
-    expect(css).to match(/\.common/)
-    expect(css).to match(/\.desktop/)
+      child_css = File.read(child_theme_manager.stylesheet_fullpath)
+      _child_source_map = File.read(child_theme_manager.source_map_fullpath)
 
-    child_theme.set_field(target: :desktop, name: :scss, value: ".nothing{color: green;}")
-    child_theme.save!
+      expect(child_css).to match(/child_common/)
+      expect(child_css).to match(/child_desktop/)
 
-    new_link = Stylesheet::Manager.stylesheet_link_tag(:desktop_theme, 'all', theme.id)
+      child_theme.set_field(target: :desktop, name: :scss, value: ".nothing{color: green;}")
+      child_theme.save!
 
-    expect(new_link).not_to eq(old_link)
+      new_links = Stylesheet::Manager.stylesheet_link_tag(:desktop_theme, 'all', theme.id)
 
-    # our theme better have a name with the theme_id as part of it
-    expect(new_link).to include("/stylesheets/desktop_theme_#{theme.id}_")
+      expect(new_links).not_to eq(old_links)
+
+      # our theme better have a name with the theme_id as part of it
+      expect(new_links).to include("/stylesheets/desktop_theme_#{theme.id}_")
+      expect(new_links).to include("/stylesheets/desktop_theme_#{child_theme.id}_")
+    end
+
+    it 'can correctly compile embedded theme css' do
+      manager = Stylesheet::Manager.new(:embedded_theme, theme.id)
+      manager.compile(force: true)
+
+      css = File.read(manager.stylesheet_fullpath)
+      expect(css).to match(/\.embedded/)
+      expect(css).not_to match(/\.child_embedded/)
+
+      child_theme_manager = Stylesheet::Manager.new(:embedded_theme, child_theme.id)
+      child_theme_manager.compile(force: true)
+
+      css = File.read(child_theme_manager.stylesheet_fullpath)
+      expect(css).to match(/\.child_embedded/)
+    end
+
+    it 'includes both parent and child theme assets' do
+      hrefs = Stylesheet::Manager.stylesheet_details(:desktop_theme, 'all', [theme.id])
+      expect(hrefs.count).to eq(2)
+      expect(hrefs[0][:theme_id]).to eq(theme.id)
+      expect(hrefs[1][:theme_id]).to eq(child_theme.id)
+
+      hrefs = Stylesheet::Manager.stylesheet_details(:embedded_theme, 'all', [theme.id])
+      expect(hrefs.count).to eq(2)
+      expect(hrefs[0][:theme_id]).to eq(theme.id)
+      expect(hrefs[1][:theme_id]).to eq(child_theme.id)
+    end
+
+    it 'does not output tags for component targets with no styles' do
+      embedded_scss_child = Fabricate(:theme, component: true)
+      embedded_scss_child.set_field(target: :common, name: "embedded_scss", value: ".scss{color: red;}")
+      embedded_scss_child.save!
+
+      theme.add_relative_theme!(:child, embedded_scss_child)
+
+      hrefs = Stylesheet::Manager.stylesheet_details(:desktop_theme, 'all', [theme.id])
+      expect(hrefs.count).to eq(2) # theme + child_theme
+
+      hrefs = Stylesheet::Manager.stylesheet_details(:embedded_theme, 'all', [theme.id])
+      expect(hrefs.count).to eq(3) # theme + child_theme + embedded_scss_child
+    end
+
+    it '.stylesheet_details can find components mobile SCSS when target is `:mobile_theme`' do
+      child_with_mobile_scss = Fabricate(:theme, component: true)
+      child_with_mobile_scss.set_field(target: :mobile, name: :scss, value: "body { color: red; }")
+      child_with_mobile_scss.save!
+      theme.add_relative_theme!(:child, child_with_mobile_scss)
+
+      hrefs = Stylesheet::Manager.stylesheet_details(:mobile_theme, 'all', [theme.id])
+      expect(hrefs.find { |h| h[:theme_id] == child_with_mobile_scss.id }).to be_present
+      expect(hrefs.count).to eq(3)
+    end
+
+    it 'does not output multiple assets for non-theme targets' do
+      hrefs = Stylesheet::Manager.stylesheet_details(:admin, 'all', [theme.id])
+      expect(hrefs.count).to eq(1)
+
+      hrefs = Stylesheet::Manager.stylesheet_details(:mobile, 'all', [theme.id])
+      expect(hrefs.count).to eq(1)
+    end
   end
 
   describe 'digest' do
@@ -185,10 +258,30 @@ describe Stylesheet::Manager do
       theme.save!
 
       digest2 = manager.color_scheme_digest
-
       expect(digest1).to_not eq(digest2)
     end
 
+    it "updates digest when updating a theme component's color definitions" do
+      scheme = ColorScheme.base
+      manager = Stylesheet::Manager.new(:color_definitions, theme.id, scheme)
+      digest1 = manager.color_scheme_digest
+
+      child_theme = Fabricate(:theme, component: true)
+      child_theme.set_field(target: :common, name: "color_definitions", value: 'body {color: fuchsia}')
+      child_theme.save!
+      theme.add_relative_theme!(:child, child_theme)
+      theme.save!
+
+      digest2 = manager.color_scheme_digest
+      expect(digest1).to_not eq(digest2)
+
+      child_theme.set_field(target: :common, name: "color_definitions", value: 'body {color: blue}')
+      child_theme.save!
+      digest3 = manager.color_scheme_digest
+      expect(digest2).to_not eq(digest3)
+
+    end
+
     it "updates digest when setting fonts" do
       manager = Stylesheet::Manager.new(:desktop_theme, theme.id)
       digest1 = manager.color_scheme_digest
@@ -238,6 +331,7 @@ describe Stylesheet::Manager do
 
     it "uses the correct color scheme when a non-default theme is selected and it uses the base 'Light' scheme" do
       cs = Fabricate(:color_scheme, name: 'Not This')
+      ColorSchemeRevisor.revise(cs, colors: [{ name: "primary", hex: "CC0000" }])
       default_theme = Fabricate(:theme, color_scheme_id: cs.id)
       SiteSetting.default_theme_id = default_theme.id
 
@@ -245,6 +339,10 @@ describe Stylesheet::Manager do
 
       link = Stylesheet::Manager.color_scheme_stylesheet_link_tag(nil, "all", [user_theme.id])
       expect(link).to include("/stylesheets/color_definitions_base_")
+
+      stylesheet = Stylesheet::Manager.new(:color_definitions, user_theme.id, nil).compile(force: true)
+      expect(stylesheet).not_to include("--primary: #c00;")
+      expect(stylesheet).to include("--primary: #222;") # from base scheme
     end
 
     it "uses the correct scheme when a valid scheme id is used" do
@@ -281,14 +379,38 @@ describe Stylesheet::Manager do
         t.set_field(target: :common, name: "color_definitions", value: ':root {--special: rebeccapurple;}')
         t.save!
       }}
+      let(:scss_child) { ':root {--child-definition: #{dark-light-choose(#c00, #fff)};}' }
+      let(:child) { Fabricate(:theme, component: true, name: "Child Theme").tap { |t|
+        t.set_field(target: :common, name: "color_definitions", value: scss_child)
+        t.save!
+      }}
 
       let(:scheme) { ColorScheme.base }
+      let(:dark_scheme) { ColorScheme.create_from_base(name: 'Dark', base_scheme_id: 'Dark') }
 
       it "includes theme color definitions in color scheme" do
-        stylesheet = Stylesheet::Manager.new(:color_definitions, theme.id, scheme).compile
+        stylesheet = Stylesheet::Manager.new(:color_definitions, theme.id, scheme).compile(force: true)
         expect(stylesheet).to include("--special: rebeccapurple")
       end
 
+      it "includes child color definitions in color schemes" do
+        theme.add_relative_theme!(:child, child)
+        theme.save!
+        stylesheet = Stylesheet::Manager.new(:color_definitions, theme.id, scheme).compile(force: true)
+
+        expect(stylesheet).to include("--special: rebeccapurple")
+        expect(stylesheet).to include("--child-definition: #c00")
+      end
+
+      it "respects selected color scheme in child color definitions" do
+        theme.add_relative_theme!(:child, child)
+        theme.save!
+
+        stylesheet = Stylesheet::Manager.new(:color_definitions, theme.id, dark_scheme).compile(force: true)
+        expect(stylesheet).to include("--special: rebeccapurple")
+        expect(stylesheet).to include("--child-definition: #fff")
+      end
+
       it "fails gracefully for broken SCSS" do
         scss = "$test: $missing-var;"
         theme.set_field(target: :common, name: "color_definitions", value: scss)
@@ -298,6 +420,24 @@ describe Stylesheet::Manager do
 
         expect { stylesheet.compile }.not_to raise_error
       end
+
+      it "child theme SCSS includes the default theme's color scheme variables" do
+        SiteSetting.default_theme_id = theme.id
+        custom_scheme = ColorScheme.create_from_base(name: "Neutral", base_scheme_id: "Neutral")
+        ColorSchemeRevisor.revise(custom_scheme, colors: [{ name: "primary", hex: "CC0000" }])
+        theme.color_scheme_id = custom_scheme.id
+        theme.save!
+
+        scss = "body{ border: 2px solid $primary;}"
+        child.set_field(target: :common, name: "scss", value: scss)
+        child.save!
+
+        child_theme_manager = Stylesheet::Manager.new(:desktop_theme, child.id)
+        child_theme_manager.compile(force: true)
+
+        child_css = File.read(child_theme_manager.stylesheet_fullpath)
+        expect(child_css).to include("body{border:2px solid #c00}")
+      end
     end
 
     context 'encoded slugs' do
@@ -338,7 +478,7 @@ describe Stylesheet::Manager do
     it "correctly generates precompiled CSS" do
       scheme1 = ColorScheme.create!(name: "scheme1")
       scheme2 = ColorScheme.create!(name: "scheme2")
-      core_targets = [:desktop, :mobile, :desktop_rtl, :mobile_rtl, :admin]
+      core_targets = [:desktop, :mobile, :desktop_rtl, :mobile_rtl, :admin, :wizard]
       theme_targets = [:desktop_theme, :mobile_theme]
       color_scheme_targets = ["color_definitions_scheme1_#{scheme1.id}", "color_definitions_scheme2_#{scheme2.id}"]
 
@@ -352,7 +492,7 @@ describe Stylesheet::Manager do
       Stylesheet::Manager.precompile_css
       results = StylesheetCache.pluck(:target)
 
-      expect(results.size).to eq(17) # (2 themes x 7 targets) + 3 color schemes (2 themes, 1 base)
+      expect(results.size).to eq(22) # (2 themes x 8 targets) + 6 color schemes (2 custom theme schemes, 4 base schemes)
       core_targets.each do |tar|
         expect(results.count { |target| target =~ /^#{tar}_(#{scheme1.id}|#{scheme2.id})$/ }).to eq(2)
       end
@@ -367,7 +507,7 @@ describe Stylesheet::Manager do
       Stylesheet::Manager.precompile_css
       results = StylesheetCache.pluck(:target)
 
-      expect(results.size).to eq(22) # (2 themes x 7 targets) + (1 no/default/core theme x 5 core targets) + 3 color schemes (2 themes, 1 base)
+      expect(results.size).to eq(28) # (2 themes x 8 targets) + (1 no/default/core theme x 6 core targets) + 6 color schemes (2 custom theme schemes, 4 base schemes)
 
       core_targets.each do |tar|
         expect(results.count { |target| target =~ /^(#{tar}_(#{scheme1.id}|#{scheme2.id})|#{tar})$/ }).to eq(3)
diff --git a/spec/components/text_sentinel_spec.rb b/spec/components/text_sentinel_spec.rb
index d14a8bf624..2676a01013 100644
--- a/spec/components/text_sentinel_spec.rb
+++ b/spec/components/text_sentinel_spec.rb
@@ -61,6 +61,18 @@ describe TextSentinel do
       end
     end
 
+    it "uses a sensible min entropy value when min body length is less than min entropy" do
+      SiteSetting.min_post_length = 3
+      SiteSetting.body_min_entropy = 7
+      expect(TextSentinel.body_sentinel('Yup')).to be_valid
+    end
+
+    it "uses a sensible min entropy value when min pm body length is less than min entropy" do
+      SiteSetting.min_post_length = 5
+      SiteSetting.min_personal_message_post_length = 3
+      SiteSetting.body_min_entropy = 7
+      expect(TextSentinel.body_sentinel('Lol', private_message: true)).to be_valid
+    end
   end
 
   context "validity" do
@@ -144,19 +156,9 @@ describe TextSentinel do
 
   end
 
-  context 'body_sentinel' do
-
-    it "uses a sensible min entropy value when min body length is less than min entropy" do
-      SiteSetting.min_post_length = 3
-      SiteSetting.body_min_entropy = 7
-      expect(TextSentinel.body_sentinel('Yup')).to be_valid
-    end
-
-    it "uses a sensible min entropy value when min pm body length is less than min entropy" do
-      SiteSetting.min_post_length = 5
-      SiteSetting.min_personal_message_post_length = 3
-      SiteSetting.body_min_entropy = 7
-      expect(TextSentinel.body_sentinel('Lol', private_message: true)).to be_valid
+  context 'seems_unpretentious?' do
+    it 'works with nil title' do
+      expect(TextSentinel.title_sentinel(nil).seems_unpretentious?).to eq(true)
     end
   end
 
diff --git a/spec/components/theme_settings_manager_spec.rb b/spec/components/theme_settings_manager_spec.rb
index d66addeb3d..2659883fd4 100644
--- a/spec/components/theme_settings_manager_spec.rb
+++ b/spec/components/theme_settings_manager_spec.rb
@@ -132,10 +132,15 @@ describe ThemeSettingsManager do
     end
 
     it "can be a textarea" do
-      string_setting = find_by_name(:string_setting_02)
       expect(find_by_name(:string_setting_02).textarea).to eq(false)
       expect(find_by_name(:string_setting_03).textarea).to eq(true)
     end
+
+    it "supports json schema" do
+      expect(find_by_name(:string_setting_03).json_schema).to eq(false)
+      expect(find_by_name(:invalid_json_schema_setting).json_schema).to eq(false)
+      expect(find_by_name(:valid_json_schema_setting).json_schema).to be_truthy
+    end
   end
 
   context "List" do
diff --git a/spec/components/timeline_lookup_spec.rb b/spec/components/timeline_lookup_spec.rb
index 0ae24563f5..ea6a2bf8e6 100644
--- a/spec/components/timeline_lookup_spec.rb
+++ b/spec/components/timeline_lookup_spec.rb
@@ -25,16 +25,19 @@ describe TimelineLookup do
     input = (1..100).map { |i| [1000 + i, 100 - i] }
 
     result = TimelineLookup.build(input, 5)
-    expect(result.size).to eq(5)
-    expect(result).to eq([[1, 99], [21, 79], [41, 59], [61, 39], [81, 19]])
+    # even if max_value is 5 we might get 6 (5 + 1)
+    # to ensure the last tuple is captured
+    expect(result).to eq([[1, 99], [21, 79], [41, 59], [61, 39], [81, 19], [input.size, input.last[1]]])
   end
 
   it "respects an uneven `max_values` setting" do
     input = (1..100).map { |i| [1000 + i, 100 - i] }
 
     result = TimelineLookup.build(input, 3)
-    expect(result.size).to eq(3)
-    expect(result).to eq([[1, 99], [35, 65], [69, 31]])
+    # even if max_value is 3 we might get 4 (3 + 1)
+    # to ensure the last tuple is captured
+    expect(result.size).to eq(4)
+    expect(result).to eq([[1, 99], [35, 65], [69, 31], [input.size, input.last[1]]])
   end
 
 end
diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb
index 5613e9b0ef..a624e7d5ef 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -123,9 +123,9 @@ describe TopicCreator do
         fab!(:category) { Fabricate(:category, name: "beta", minimum_required_tags: 2) }
 
         it "fails for regular user if minimum_required_tags is not satisfied" do
-          expect do
-            TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(category: category.id))
-          end.to raise_error(ActiveRecord::Rollback)
+          expect(
+            TopicCreator.new(user, Guardian.new(user), valid_attrs.merge(category: category.id)).valid?
+          ).to be_falsy
         end
 
         it "lets admin create a topic regardless of minimum_required_tags" do
@@ -153,27 +153,27 @@ describe TopicCreator do
         fab!(:category) { Fabricate(:category, name: "beta", required_tag_group: tag_group, min_tags_from_required_group: 1) }
 
         it "when no tags are not present" do
-          expect do
-            TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(category: category.id))
-          end.to raise_error(ActiveRecord::Rollback)
+          expect(
+            TopicCreator.new(user, Guardian.new(user), valid_attrs.merge(category: category.id)).valid?
+          ).to be_falsy
         end
 
         it "when tags are not part of the tag group" do
-          expect do
-            TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(category: category.id, tags: ['nope']))
-          end.to raise_error(ActiveRecord::Rollback)
+          expect(
+            TopicCreator.new(user, Guardian.new(user), valid_attrs.merge(category: category.id, tags: ['nope'])).valid?
+          ).to be_falsy
         end
 
         it "when requirement is met" do
-          topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(category: category.id, tags: [tag1.name, tag2.name]))
-          expect(topic).to be_valid
-          expect(topic.tags.length).to eq(2)
+          expect(
+            TopicCreator.new(user, Guardian.new(user), valid_attrs.merge(category: category.id, tags: [tag1.name, tag2.name])).valid?
+          ).to be_truthy
         end
 
         it "lets staff ignore the restriction" do
-          topic = TopicCreator.create(user, Guardian.new(admin), valid_attrs.merge(category: category.id))
-          expect(topic).to be_valid
-          expect(topic.tags.length).to eq(0)
+          expect(
+            TopicCreator.new(user, Guardian.new(admin), valid_attrs.merge(category: category.id)).valid?
+          ).to be_truthy
         end
       end
     end
@@ -197,16 +197,6 @@ describe TopicCreator do
           expect(TopicCreator.create(user, Guardian.new(user), pm_valid_attrs)).to be_valid
         end
 
-        it "should be possible for a trusted user to send private messages via email" do
-          SiteSetting.manual_polling_enabled = true
-          SiteSetting.reply_by_email_address = "sam+%{reply_key}@sam.com"
-          SiteSetting.reply_by_email_enabled = true
-          SiteSetting.enable_personal_email_messages = true
-          SiteSetting.min_trust_to_send_email_messages = TrustLevel[1]
-
-          expect(TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs)).to be_valid
-        end
-
         it "enable_personal_messages setting should not be checked when sending private message to staff via flag" do
           SiteSetting.enable_personal_messages = false
           SiteSetting.min_trust_to_send_messages = TrustLevel[4]
@@ -219,7 +209,6 @@ describe TopicCreator do
           SiteSetting.manual_polling_enabled = true
           SiteSetting.reply_by_email_address = "sam+%{reply_key}@sam.com"
           SiteSetting.reply_by_email_enabled = true
-          SiteSetting.enable_personal_email_messages = true
           SiteSetting.min_trust_to_send_email_messages = TrustLevel[1]
           attrs = pm_to_email_valid_attrs.dup
           attrs[:target_emails] = "t" * 256
@@ -236,13 +225,29 @@ describe TopicCreator do
             TopicCreator.create(user, Guardian.new(user), pm_valid_attrs)
           end.to raise_error(ActiveRecord::Rollback)
         end
+      end
 
-        it "min_trust_to_send_email_messages should be checked when sending private messages via email" do
-          SiteSetting.min_trust_to_send_email_messages = TrustLevel[4]
+      context 'to emails' do
+        it 'works for staff' do
+          SiteSetting.min_trust_to_send_email_messages = 'staff'
+          expect(TopicCreator.create(admin, Guardian.new(admin), pm_to_email_valid_attrs)).to be_valid
+        end
 
-          expect do
-            TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs)
-          end.to raise_error(ActiveRecord::Rollback)
+        it 'work for trusted users' do
+          SiteSetting.min_trust_to_send_email_messages = 3
+          user.update!(trust_level: 3)
+          expect(TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs)).to be_valid
+        end
+
+        it 'does not work for non-staff' do
+          SiteSetting.min_trust_to_send_email_messages = 'staff'
+          expect { TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs) }.to raise_error(ActiveRecord::Rollback)
+        end
+
+        it 'does not work for untrusted users' do
+          SiteSetting.min_trust_to_send_email_messages = 3
+          user.update!(trust_level: 2)
+          expect { TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs) }.to raise_error(ActiveRecord::Rollback)
         end
       end
     end
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index f4f13b6a88..ec6a2f2691 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -393,14 +393,14 @@ describe TopicQuery do
     end
   end
 
-  context 'already seen categories' do
+  context 'already seen topics' do
     it 'is removed from new and visible on latest lists' do
       category = Fabricate(:category_with_definition)
       topic = Fabricate(:topic, category: category)
-      CategoryUser.create!(user_id: user.id,
-                           category_id: category.id,
-                           last_seen_at: topic.created_at
-                          )
+      DismissedTopicUser.create!(user_id: user.id,
+                                 topic_id: topic.id,
+                                 created_at: Time.zone.now
+                                )
       expect(topic_query.list_new.topics.map(&:id)).not_to include(topic.id)
       expect(topic_query.list_latest.topics.map(&:id)).to include(topic.id)
     end
@@ -1257,6 +1257,7 @@ describe TopicQuery do
       shared_drafts_category.set_permissions(group => :full)
       shared_drafts_category.save
       SiteSetting.shared_drafts_category = shared_drafts_category.id
+      SiteSetting.shared_drafts_min_trust_level = TrustLevel[3]
     end
 
     context "destination_category_id" do
@@ -1269,6 +1270,24 @@ describe TopicQuery do
         list = TopicQuery.new(admin, destination_category_id: category.id).list_latest
         expect(list.topics).to include(topic)
       end
+
+      it 'allow group members with enough trust level to query destination_category_id' do
+        member = Fabricate(:user, trust_level: TrustLevel[3])
+        group.add(member)
+
+        list = TopicQuery.new(member, destination_category_id: category.id).list_latest
+
+        expect(list.topics).to include(topic)
+      end
+
+      it "doesn't allow group members without enough trust level to query destination_category_id" do
+        member = Fabricate(:user, trust_level: TrustLevel[2])
+        group.add(member)
+
+        list = TopicQuery.new(member, destination_category_id: category.id).list_latest
+
+        expect(list.topics).not_to include(topic)
+      end
     end
 
     context "latest" do
@@ -1287,6 +1306,14 @@ describe TopicQuery do
         list = TopicQuery.new(user).list_latest
         expect(list.topics).not_to include(topic)
       end
+
+      it "doesn't include shared draft topics for group members with access to shared drafts" do
+        member = Fabricate(:user, trust_level: TrustLevel[3])
+        group.add(member)
+
+        list = TopicQuery.new(member).list_latest
+        expect(list.topics).not_to include(topic)
+      end
     end
 
     context "unread" do
diff --git a/spec/components/topic_retriever_spec.rb b/spec/components/topic_retriever_spec.rb
index 6fd602c67e..3bc2ec81b7 100644
--- a/spec/components/topic_retriever_spec.rb
+++ b/spec/components/topic_retriever_spec.rb
@@ -63,6 +63,11 @@ describe TopicRetriever do
         end
       end
     end
+
+    it "works with URLs with whitespaces" do
+      expect { TopicRetriever.new(" https://example.com ").retrieve }
+        .not_to raise_error
+    end
   end
 
 end
diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb
index e3a159ded3..c4a104cd23 100644
--- a/spec/components/topic_view_spec.rb
+++ b/spec/components/topic_view_spec.rb
@@ -36,6 +36,48 @@ describe TopicView do
     expect { TopicView.new(topic.id, admin) }.not_to raise_error
   end
 
+  context "filter options" do
+    fab!(:p0) { Fabricate(:post, topic: topic) }
+    fab!(:p1) { Fabricate(:post, topic: topic, post_type: Post.types[:moderator_action]) }
+    fab!(:p2) { Fabricate(:post, topic: topic, post_type: Post.types[:small_action]) }
+
+    it "omits moderator actions and small posts when only_regular is set" do
+      tv = TopicView.new(topic.id, nil)
+      expect(tv.filtered_post_ids).to eq([p0.id, p1.id, p2.id])
+
+      tv = TopicView.new(topic.id, nil, only_regular: true)
+      expect(tv.filtered_post_ids).to eq([p0.id])
+    end
+
+    it "omits the first post when exclude_first is set" do
+      tv = TopicView.new(topic.id, nil, exclude_first: true)
+      expect(tv.filtered_post_ids).to eq([p0.id, p1.id, p2.id])
+    end
+  end
+
+  context 'custom filters' do
+    fab!(:p0) { Fabricate(:post, topic: topic) }
+    fab!(:p1) { Fabricate(:post, topic: topic, wiki: true) }
+
+    it 'allows to register custom filters' do
+      tv = TopicView.new(topic.id, evil_trout, { filter: 'wiki' })
+      expect(tv.filter_posts({ filter: "wiki" })).to eq([p0, p1])
+
+      TopicView.add_custom_filter("wiki") do |posts, topic_view|
+        posts.where(wiki: true)
+      end
+
+      tv = TopicView.new(topic.id, evil_trout, { filter: 'wiki' })
+      expect(tv.filter_posts).to eq([p1])
+
+      tv = TopicView.new(topic.id, evil_trout, { filter: 'whatever' })
+      expect(tv.filter_posts).to eq([p0, p1])
+
+      ensure
+        TopicView.instance_variable_set(:@custom_filters, {})
+    end
+  end
+
   context "setup_filtered_posts" do
     describe "filters posts with ignored users" do
       fab!(:ignored_user) { Fabricate(:ignored_user, user: evil_trout, ignored_user: user) }
@@ -621,9 +663,51 @@ describe TopicView do
   context "page_title" do
     fab!(:tag1) { Fabricate(:tag) }
     fab!(:tag2) { Fabricate(:tag, topic_count: 2) }
+    fab!(:op_post) { Fabricate(:post, topic: topic) }
+    fab!(:post1) { Fabricate(:post, topic: topic) }
+    fab!(:whisper) { Fabricate(:post, topic: topic, post_type: Post.types[:whisper]) }
 
     subject { TopicView.new(topic.id, evil_trout).page_title }
 
+    context "when a post number is specified" do
+      context "admins" do
+        it "see post number and username for all posts" do
+          title = TopicView.new(topic.id, admin, post_number: 0).page_title
+          expect(title).to eq(topic.title)
+          title = TopicView.new(topic.id, admin, post_number: 1).page_title
+          expect(title).to eq(topic.title)
+
+          title = TopicView.new(topic.id, admin, post_number: 2).page_title
+          expect(title).to eq("#{topic.title} - #2 by #{post1.user.username}")
+          title = TopicView.new(topic.id, admin, post_number: 3).page_title
+          expect(title).to eq("#{topic.title} - #3 by #{whisper.user.username}")
+        end
+      end
+
+      context "regular users" do
+        it "see post number and username for regular posts" do
+          title = TopicView.new(topic.id, evil_trout, post_number: 0).page_title
+          expect(title).to eq(topic.title)
+          title = TopicView.new(topic.id, evil_trout, post_number: 1).page_title
+          expect(title).to eq(topic.title)
+
+          title = TopicView.new(topic.id, evil_trout, post_number: 2).page_title
+          expect(title).to eq("#{topic.title} - #2 by #{post1.user.username}")
+        end
+
+        it "see only post number for whisper posts" do
+          title = TopicView.new(topic.id, evil_trout, post_number: 3).page_title
+          expect(title).to eq("#{topic.title} - #3")
+          post2 = Fabricate(:post, topic: topic)
+          topic.reload
+          title = TopicView.new(topic.id, evil_trout, post_number: 3).page_title
+          expect(title).to eq("#{topic.title} - #3")
+          title = TopicView.new(topic.id, evil_trout, post_number: 4).page_title
+          expect(title).to eq("#{topic.title} - #4 by #{post2.user.username}")
+        end
+      end
+    end
+
     context "uncategorized topic" do
       context "topic_page_title_includes_category is false" do
         before { SiteSetting.topic_page_title_includes_category = false }
diff --git a/spec/components/url_helper_spec.rb b/spec/components/url_helper_spec.rb
index 8328cec9b9..0d8afc9598 100644
--- a/spec/components/url_helper_spec.rb
+++ b/spec/components/url_helper_spec.rb
@@ -114,11 +114,16 @@ describe UrlHelper do
       expect(url).to eq('http://example.com/%D9%85%D8%A7%D9%87%DB%8C')
     end
 
-    it "doesn't escape already escaped chars" do
+    it "doesn't escape already escaped chars (space)" do
       url = UrlHelper.escape_uri('http://example.com/foo%20bar/foo bar/')
       expect(url).to eq('http://example.com/foo%20bar/foo%20bar/')
     end
 
+    it "doesn't escape already escaped chars (hash)" do
+      url = UrlHelper.escape_uri('https://calendar.google.com/calendar/embed?src=en.uk%23holiday%40group.v.calendar.google.com&ctz=Europe%2FLondon')
+      expect(url).to eq('https://calendar.google.com/calendar/embed?src=en.uk%23holiday@group.v.calendar.google.com&ctz=Europe/London')
+    end
+
     it "doesn't escape S3 presigned URLs" do
       # both of these were originally real presigned URLs and have had all
       # sensitive information stripped
diff --git a/spec/components/user_name_suggester_spec.rb b/spec/components/user_name_suggester_spec.rb
index ed1673b66b..c20c507ccb 100644
--- a/spec/components/user_name_suggester_spec.rb
+++ b/spec/components/user_name_suggester_spec.rb
@@ -128,6 +128,10 @@ describe UserNameSuggester do
     context "with Unicode usernames enabled" do
       before { SiteSetting.unicode_usernames = true }
 
+      it "normalizes unicode usernames with Σ to lowercase" do
+        expect(UserNameSuggester.suggest('ΣΣ\'"ΣΣ')).to eq('σς_σς')
+      end
+
       it "does not transliterate" do
         expect(UserNameSuggester.suggest("Jørn")).to eq('Jørn')
       end
diff --git a/spec/components/validators/category_search_priority_weights_validator_spec.rb b/spec/components/validators/category_search_priority_weights_validator_spec.rb
index d002370385..9db8f0b84e 100644
--- a/spec/components/validators/category_search_priority_weights_validator_spec.rb
+++ b/spec/components/validators/category_search_priority_weights_validator_spec.rb
@@ -5,24 +5,16 @@ require 'validators/category_search_priority_weights_validator'
 
 RSpec.describe CategorySearchPriorityWeightsValidator do
   it "should validate the results correctly" do
-    expect do
-      SiteSetting.category_search_priority_very_low_weight = 0.9
-    end.to raise_error(Discourse::InvalidParameters)
-
-    [1, 0].each do |value|
+    [1, 1.1].each do |value|
       expect do
         SiteSetting.category_search_priority_low_weight = value
       end.to raise_error(Discourse::InvalidParameters)
     end
 
-    ['0.2', 10].each do |value|
+    [1, "0.9"].each do |value|
       expect do
         SiteSetting.category_search_priority_high_weight = value
       end.to raise_error(Discourse::InvalidParameters)
     end
-
-    expect do
-      SiteSetting.category_search_priority_very_high_weight = 1.1
-    end.to raise_error(Discourse::InvalidParameters)
   end
 end
diff --git a/spec/components/validators/enable_invite_only_validator_spec.rb b/spec/components/validators/enable_invite_only_validator_spec.rb
index fe3af0dccb..fab1d20068 100644
--- a/spec/components/validators/enable_invite_only_validator_spec.rb
+++ b/spec/components/validators/enable_invite_only_validator_spec.rb
@@ -7,8 +7,8 @@ RSpec.describe EnableInviteOnlyValidator do
 
   context "when sso is enabled" do
     before do
-      SiteSetting.sso_url = "https://example.com/sso"
-      SiteSetting.enable_sso = true
+      SiteSetting.discourse_connect_url = "https://example.com/sso"
+      SiteSetting.enable_discourse_connect = true
     end
 
     it "is valid when false" do
@@ -18,7 +18,7 @@ RSpec.describe EnableInviteOnlyValidator do
     it "is isn't value for true" do
       expect(subject.valid_value?('t')).to eq(false)
       expect(subject.error_message).to eq(I18n.t(
-        'site_settings.errors.sso_invite_only'
+        'site_settings.errors.discourse_connect_invite_only'
       ))
     end
   end
diff --git a/spec/components/validators/enable_sso_validator_spec.rb b/spec/components/validators/enable_sso_validator_spec.rb
index 9114792d27..3a2e549b92 100644
--- a/spec/components/validators/enable_sso_validator_spec.rb
+++ b/spec/components/validators/enable_sso_validator_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe EnableSsoValidator do
   describe '#valid_value?' do
     describe "when 'sso url' is empty" do
       before do
-        SiteSetting.sso_url = ""
+        SiteSetting.discourse_connect_url = ""
       end
 
       describe 'when val is false' do
@@ -22,7 +22,7 @@ RSpec.describe EnableSsoValidator do
           expect(subject.valid_value?('t')).to eq(false)
 
           expect(subject.error_message).to eq(I18n.t(
-            'site_settings.errors.sso_url_is_empty'
+            'site_settings.errors.discourse_connect_url_is_empty'
           ))
         end
       end
@@ -31,7 +31,7 @@ RSpec.describe EnableSsoValidator do
     describe "when invite_only is set" do
       before do
         SiteSetting.invite_only = true
-        SiteSetting.sso_url = 'https://example.com/sso'
+        SiteSetting.discourse_connect_url = 'https://example.com/sso'
       end
 
       it 'allows a false value' do
@@ -41,14 +41,14 @@ RSpec.describe EnableSsoValidator do
       it "doesn't allow true" do
         expect(subject.valid_value?('t')).to eq(false)
         expect(subject.error_message).to eq(I18n.t(
-          'site_settings.errors.sso_invite_only'
+          'site_settings.errors.discourse_connect_invite_only'
         ))
       end
     end
 
     describe "when 'sso url' is present" do
       before do
-        SiteSetting.sso_url = "https://www.example.com/sso"
+        SiteSetting.discourse_connect_url = "https://www.example.com/sso"
       end
 
       describe 'when value is false' do
diff --git a/spec/components/validators/post_validator_spec.rb b/spec/components/validators/post_validator_spec.rb
index 30c7e3a0d3..f321460bc2 100644
--- a/spec/components/validators/post_validator_spec.rb
+++ b/spec/components/validators/post_validator_spec.rb
@@ -52,11 +52,56 @@ describe PostValidator do
       expect(post.errors.count).to eq(1)
     end
 
+    it "counts emoji as a single character" do
+      post.raw = ":smiling_face_with_three_hearts:" * (SiteSetting.min_post_length - 1)
+      validator.stripped_length(post)
+      expect(post.errors.count).to eq(1)
+
+      post = build(:post, topic: topic)
+      post.raw = ":smiling_face_with_three_hearts:" * SiteSetting.min_post_length
+      validator.stripped_length(post)
+      expect(post.errors.count).to eq(0)
+    end
+
+    it "counts multiple characters as a single character" do
+      post.raw = "." * SiteSetting.min_post_length
+      validator.stripped_length(post)
+      expect(post.errors.count).to eq(1)
+
+      post = build(:post, topic: topic)
+      post.raw = "," * SiteSetting.min_post_length
+      validator.stripped_length(post)
+      expect(post.errors.count).to eq(1)
+
+      post = build(:post, topic: topic)
+      post.raw = "<!-- #{'very long comment' * SiteSetting.min_post_length} -->"
+      validator.stripped_length(post)
+      expect(post.errors.count).to eq(1)
+    end
+
     it "adds no error for long raw" do
       post.raw = "this is a long topic body testing 123"
       validator.stripped_length(post)
       expect(post.errors.count).to eq(0)
     end
+
+    it "ignores an html comment" do
+      post.raw = "<!-- an html comment -->abc"
+      validator.stripped_length(post)
+      expect(post.errors.count).to eq(1)
+    end
+
+    it "ignores multiple html comments" do
+      post.raw = "<!-- an html comment -->\n abc \n<!-- a comment -->"
+      validator.stripped_length(post)
+      expect(post.errors.count).to eq(1)
+    end
+
+    it "ignores nested html comments" do
+      post.raw = "<!-- <!-- an html comment --> -->"
+      validator.stripped_length(post)
+      expect(post.errors.count).to eq(1)
+    end
   end
 
   context "too_many_posts" do
diff --git a/spec/components/validators/sso_overrides_email_validator_spec.rb b/spec/components/validators/sso_overrides_email_validator_spec.rb
index c4b0da34e1..a7951c632b 100644
--- a/spec/components/validators/sso_overrides_email_validator_spec.rb
+++ b/spec/components/validators/sso_overrides_email_validator_spec.rb
@@ -8,8 +8,8 @@ RSpec.describe SsoOverridesEmailValidator do
   describe '#valid_value?' do
     describe "when 'email editable' is true" do
       before do
-        SiteSetting.sso_url = "https://www.example.com/sso"
-        SiteSetting.enable_sso = true
+        SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+        SiteSetting.enable_discourse_connect = true
         SiteSetting.email_editable = true
       end
 
@@ -32,8 +32,8 @@ RSpec.describe SsoOverridesEmailValidator do
 
     describe "when 'email editable' is false" do
       before do
-        SiteSetting.sso_url = "https://www.example.com/sso"
-        SiteSetting.enable_sso = true
+        SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+        SiteSetting.enable_discourse_connect = true
         SiteSetting.email_editable = false
       end
 
diff --git a/spec/components/wizard/step_updater_spec.rb b/spec/components/wizard/step_updater_spec.rb
index a4ea41cc63..1f50850779 100644
--- a/spec/components/wizard/step_updater_spec.rb
+++ b/spec/components/wizard/step_updater_spec.rb
@@ -307,17 +307,6 @@ describe Wizard::StepUpdater do
     end
   end
 
-  context "emoji step" do
-    it "updates the fields correctly" do
-      updater = wizard.create_updater('emoji', emoji_set: "twitter")
-      updater.update
-
-      expect(updater).to be_success
-      expect(wizard.completed_steps?('emoji')).to eq(true)
-      expect(SiteSetting.emoji_set).to eq('twitter')
-    end
-  end
-
   context "homepage step" do
     it "updates the fields correctly" do
       updater = wizard.create_updater('homepage', homepage_style: "categories_and_top_topics")
diff --git a/spec/fabricators/dimissed_topic_user.rb b/spec/fabricators/dimissed_topic_user.rb
new file mode 100644
index 0000000000..c5801463f1
--- /dev/null
+++ b/spec/fabricators/dimissed_topic_user.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:dismissed_topic_user) do
+  user
+  topic
+  created_at { Time.zone.now }
+end
diff --git a/spec/fabricators/do_not_disturb_fabricator.rb b/spec/fabricators/do_not_disturb_fabricator.rb
new file mode 100644
index 0000000000..3aafa6fa86
--- /dev/null
+++ b/spec/fabricators/do_not_disturb_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:do_not_disturb_timing) do
+  user
+  starts_at { Time.zone.now }
+  ends_at { 1.hour.from_now }
+end
diff --git a/spec/fabricators/incoming_email_fabricator.rb b/spec/fabricators/incoming_email_fabricator.rb
index 06a08b129d..de76343f81 100644
--- a/spec/fabricators/incoming_email_fabricator.rb
+++ b/spec/fabricators/incoming_email_fabricator.rb
@@ -6,6 +6,7 @@ Fabricator(:incoming_email) do
   from_address "foo@example.com"
   to_addresses "someone@else.com"
   imap_sync false
+  created_via 0
 
   raw <<~RAW
     Return-Path: <foo@example.com>
diff --git a/spec/fabricators/theme_field_fabricator.rb b/spec/fabricators/theme_field_fabricator.rb
new file mode 100644
index 0000000000..688cfc5830
--- /dev/null
+++ b/spec/fabricators/theme_field_fabricator.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Fabricator(:theme_field) do
+  theme
+  target_id { 0 }
+  name { sequence(:name) { |i| "scss_#{i + 1}" } }
+  value { ".test {color: blue;}" }
+  error { nil }
+end
diff --git a/spec/fabricators/web_hook_fabricator.rb b/spec/fabricators/web_hook_fabricator.rb
index 9edc591791..554e162fd1 100644
--- a/spec/fabricators/web_hook_fabricator.rb
+++ b/spec/fabricators/web_hook_fabricator.rb
@@ -94,3 +94,19 @@ Fabricator(:user_badge_web_hook, from: :web_hook) do
     web_hook.web_hook_event_types = [transients[:user_badge_hook]]
   end
 end
+
+Fabricator(:group_user_web_hook, from: :web_hook) do
+  transient group_user_hook: WebHookEventType.find_by(name: 'group_user')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:group_user_hook]]
+  end
+end
+
+Fabricator(:like_web_hook, from: :web_hook) do
+  transient like_hook: WebHookEventType.find_by(name: 'like')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:like_hook]]
+  end
+end
diff --git a/spec/fixtures/csv/discourse_headers.csv b/spec/fixtures/csv/discourse_headers.csv
new file mode 100644
index 0000000000..14215ae2ee
--- /dev/null
+++ b/spec/fixtures/csv/discourse_headers.csv
@@ -0,0 +1,3 @@
+email,groups,location
+test@example.com,discourse;ubuntu,usa
+test2@example.com,discourse;ubuntu,europe
diff --git a/spec/fixtures/csv/words_tag.csv b/spec/fixtures/csv/words_tag.csv
new file mode 100644
index 0000000000..eb95e96c6b
--- /dev/null
+++ b/spec/fixtures/csv/words_tag.csv
@@ -0,0 +1,11 @@
+hello,"tag1,tag2"
+
+,"tag1,tag3"
+
+
+world,"tag2,tag3"
+
+
+
+test,
+
diff --git a/spec/fixtures/emails/encoded_filename.eml b/spec/fixtures/emails/encoded_filename.eml
new file mode 100644
index 0000000000..8f51f6f1fb
--- /dev/null
+++ b/spec/fixtures/emails/encoded_filename.eml
@@ -0,0 +1,46 @@
+From xxxxxxxxx.xxxxxxx@gmail.com Sun May  8 19:07:09 2005
+Return-Path: <xxxxxxxxx.xxxxxxx@gmail.com>
+Message-ID: <e85734b90505081209eaaa17b@mail.gmail.com>
+Date: Sun, 8 May 2005 14:09:11 -0500
+From: xxxxxxxxx xxxxxxx <xxxxxxxxx.xxxxxxx@gmail.com>
+Reply-To: xxxxxxxxx xxxxxxx <xxxxxxxxx.xxxxxxx@gmail.com>
+To: one@foo.com
+Subject: Fwd: Signed email causes file attachments
+In-Reply-To: <F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@mac.com>
+Mime-Version: 1.0
+Content-Type: multipart/mixed; 
+	boundary="----=_Part_5028_7368284.1115579351471"
+References: <F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@mac.com>
+
+------=_Part_5028_7368284.1115579351471
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+We should not include these files or vcards as attachments.
+
+---------- Forwarded message ----------
+From: xxxxx xxxxxx <xxxxxxxx@xxx.com>
+Date: May 8, 2005 1:17 PM
+Subject: Signed email causes file attachments
+To: xxxxxxx@xxxxxxxxxx.com
+
+
+Hi,
+
+Test attachments with Base64 encoded filename.
+
+
+------=_Part_5028_7368284.1115579351471
+Content-Type: application/pdf; name==?utf-8?B?VGhpcyBpcyBhIHRlc3QucGRm?=
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename==?utf-8?B?VGhpcyBpcyBhIHRlc3QucGRm?=
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIGFDCCAs0w
+ggI2oAMCAQICAw5c+TANBgkqhkiG9w0BAQQFADBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhh
+d3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVt
+YWlsIElzc3VpbmcgQ0EwHhcNMDUwMzI5MDkzOTEwWhcNMDYwMzI5MDkzOTEwWjBCMR8wHQYDVQQD
+ExZUaGF3dGUgRnJlZW1haWwgTWVtYmVyMR8wHQYJKoZIhvcNAQkBFhBzbWhhdW5jaEBtYWMuY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn90dPsYS3LjfMY211OSYrDQLzwNYPlAL
+7+/0XA+kdy8/rRnyEHFGwhNCDmg0B6pxC7z3xxJD/8GfCd+IYUUNUQV5m9MkxfP9pTVXZVIYLaBw
+------=_Part_5028_7368284.1115579351471--
diff --git a/spec/fixtures/emails/encoding_undefined_conversion.eml b/spec/fixtures/emails/encoding_undefined_conversion.eml
new file mode 100644
index 0000000000..c5e3f6cc9f
--- /dev/null
+++ b/spec/fixtures/emails/encoding_undefined_conversion.eml
@@ -0,0 +1,12 @@
+Return-Path: <discourse@bar.com>
+From: Foo Bar <discourse@bar.com>
+To: someone@else.com
+CC: team@bar.com, wat@bar.com, reply+d400310beeae61d785c2ac6a2aacb210@bar.com
+Subject: The more, the merrier
+Date: Fri, 15 Jan 2016 00:12:43 +0100
+Message-ID: <30@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+It is more fun with more people. 𝗜 𝗮𝗺 𝗮 𝘀𝗶𝗻𝗴𝗹𝗲 person.
diff --git a/spec/fixtures/images/animated.webp b/spec/fixtures/images/animated.webp
new file mode 100644
index 0000000000..5b00711b6a
Binary files /dev/null and b/spec/fixtures/images/animated.webp differ
diff --git a/spec/fixtures/images/fake.long-FileExtension b/spec/fixtures/images/fake.long-FileExtension
new file mode 100644
index 0000000000..a6a874af9e
--- /dev/null
+++ b/spec/fixtures/images/fake.long-FileExtension
@@ -0,0 +1 @@
+https://meta.discourse.org/t/uploading-files-with-longer-file-extensions-gets-truncated/182824
diff --git a/spec/fixtures/images/large & unoptimized.png b/spec/fixtures/images/large_and_unoptimized.png
similarity index 100%
rename from spec/fixtures/images/large & unoptimized.png
rename to spec/fixtures/images/large_and_unoptimized.png
diff --git a/spec/fixtures/images/pencil.svg b/spec/fixtures/images/pencil.svg
new file mode 100644
index 0000000000..a16d2a9b29
--- /dev/null
+++ b/spec/fixtures/images/pencil.svg
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="8in"
+   height="12in"
+   viewBox="0 0 210 297"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="drawingpencil.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="446.80634"
+     inkscape:cy="475.54119"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g964"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       position="-148.16667,180.67263"
+       orientation="1,0"
+       id="guide825"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="-204.88879,167.72065"
+       orientation="1,0"
+       id="guide829"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="-331.86309,-5.2916668"
+       orientation="1,0"
+       id="guide929"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1389"
+       transform="translate(112.6369,-4.5357143)">
+      <g
+         transform="matrix(0.39765029,-0.37613964,0.40337233,0.37080392,-33.707976,96.609766)"
+         id="g964">
+        <g
+           id="g866">
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             sodipodi:nodetypes="ccccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path827"
+             d="m -171.39994,58.522452 4.56312,-0.517578 -96.41169,41.09967 92.39126,41.964876 0.0103,0.65784 1.02112,-0.18965 0.41703,0.18965 6.80757,-1.02363 213.349901,-40.08755 -218.860531,-42.072367 0.0119,-0.777213 16.14253,2.05244 z"
+             style="opacity:1;fill:#ffe680;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             sodipodi:nodetypes="cccccc"
+             inkscape:connector-curvature="0"
+             id="path909"
+             d="m -167.29418,58.090286 -1.96525,-0.130741 -94.74512,40.389265 0.46973,0.213426 203.965548,27.214284 z"
+             style="opacity:1;fill:#d4aa00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             transform="scale(0.26458333)"
+             id="path833"
+             d="m -648.57227,534.84766 v 1.95703 H 522.85742 V 219.66211 H -639.06836 l 85.92578,47.42969 -89.9707,54.27734 91.11328,50.29297 -87.39453,52.72461 90.82226,50.13281 z"
+             style="fill:#ffcc00;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994"
+             inkscape:connector-curvature="0" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             inkscape:connector-curvature="0"
+             id="path841"
+             d="m -230.72987,84.444087 -4.91908,2.137336 -28.12903,12.220958 27.87271,12.660209 3.58428,1.62781 a 25.702381,21.544643 0 0 0 7.23057,-12.98629 l 0.0264,-0.243397 a 25.702381,21.544643 0 0 0 -5.6658,-15.416626 z m -4.1367,3.635951 a 20.410631,23.056417 0 0 1 0.60771,1.484665 20.410631,23.056417 0 0 0 -0.60771,-1.484665 z"
+             style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             transform="scale(0.26458333)"
+             id="path870"
+             d="M 282.85742,219.66211 H 116.00195 -17.142578 V 536.80469 H 98.123047 282.85742 Z"
+             style="fill:#ffcc00;fill-rule:evenodd;stroke-width:0.99999994"
+             inkscape:connector-curvature="0" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             sodipodi:nodetypes="ccaccccccczcccccccaac"
+             inkscape:connector-curvature="0"
+             id="path855"
+             d="m 99.256406,58.118933 v 83.910637 c 0,0 29.238264,4.4148 42.807194,0 1.68331,-0.54768 2.91959,-2.04917 4.2938,-3.12487 1.87046,-1.50578 3.62656,-3.07284 5.26169,-4.69532 1.63503,-1.62234 3.14708,-3.29807 4.53048,-5.02089 1.3834,-1.72304 2.6364,-3.49103 3.75429,-5.29735 1.11783,-1.8061 2.09918,-3.64825 2.94039,-5.51956 0.84127,-1.87139 1.54132,-3.76959 2.09754,-5.6875 0.55623,-1.91799 0.96792,-3.85328 1.23352,-5.79862 0.18047,-1.32188 0.28267,-2.33456 0.33848,-3.97443 0.0558,-1.63987 -0.0139,-3.906494 -0.24081,-5.853906 -0.22696,-1.947507 -0.60018,-3.886244 -1.11828,-5.808948 -0.51809,-1.922508 -1.18037,-3.826579 -1.98437,-5.705078 -0.80406,-1.878704 -1.74885,-3.729481 -2.83084,-5.545397 -1.08198,-1.815817 -2.29979,-3.594502 -3.64887,-5.329391 -1.349,-1.734967 -2.82759,-3.423968 -4.43022,-5.060675 -1.60267,-1.636582 -3.32737,-3.218822 -5.16764,-4.740793 -1.84031,-1.521963 -3.83669,-3.00806 -5.85339,-4.373893 -1.25586,-0.850545 -2.42193,-1.962964 -3.88194,-2.374016 -12.22507,-3.441843 -38.101024,0 -38.101024,0 z"
+             style="fill:#e164e1;fill-opacity:1;fill-rule:evenodd;stroke-width:0.26458332" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             inkscape:connector-curvature="0"
+             id="path865"
+             d="M 74.461382,58.118935 V 142.02957 H 109.991 V 58.118935 Z"
+             style="fill:#d4aa00;fill-rule:evenodd;stroke:#000000;stroke-width:2.16499996;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             inkscape:connector-curvature="0"
+             style="fill:#d4aa00;fill-rule:evenodd;stroke:#000000;stroke-width:1.57742977;stroke-miterlimit:4;stroke-dasharray:none"
+             d="M 82.861049,57.825147 V 142.32336 H 101.59133 V 57.825147 Z"
+             id="path872" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             inkscape:connector-curvature="0"
+             id="path874"
+             d="M 91.470238,56.607143 V 141.27381"
+             style="fill:none;stroke:#000000;stroke-width:1.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             inkscape:connector-curvature="0"
+             id="path878"
+             d="M -146.65476,69.458334 H 74.083332"
+             style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             inkscape:connector-curvature="0"
+             id="path880"
+             d="M -148.16666,98.562498 H 74.839285"
+             style="fill:none;stroke:#000000;stroke-width:0.26685447px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             inkscape:connector-curvature="0"
+             id="path882"
+             d="m -146.65476,124.64285 c 221.494044,0 221.494044,-1.5119 221.494044,-1.5119"
+             style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             inkscape:connector-curvature="0"
+             id="path902"
+             d="m -262.35526,98.184334 -1.42266,0.618048 27.87272,12.660208 3.58428,1.62781 a 25.702381,21.544643 0 0 0 7.23056,-12.98629 l 0.0264,-0.243395 a 25.702381,21.544643 0 0 0 0.0698,-1.676381 z"
+             style="opacity:1;fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             transform="scale(0.26458333)"
+             inkscape:connector-curvature="0"
+             id="path915"
+             d="M -594.28571,242.48104 -630,222.57702 l 232.85714,-0.0307 c 128.07143,-0.0169 332.178574,-0.88418 453.571431,-1.92732 l 220.714289,-1.89662 v 20.47008 20.47008 h -414.05203 c -227.72863,0 -415.76434,0.61257 -417.85715,1.36126 -2.09281,0.7487 -19.87654,-7.59555 -39.51939,-18.54276 z"
+             style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.15972996;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             transform="scale(0.26458333)"
+             inkscape:connector-curvature="0"
+             id="path919"
+             d="m -328.43869,533.96722 -312.72437,-1.44753 48.43867,-29.10458 48.43868,-29.10457 330,-1.62545 c 181.499996,-0.894 366.32142,-2.39569 410.71428,-3.33708 l 80.71429,-1.71164 v 34.58452 34.58451 l -146.42857,-0.69532 c -80.535719,-0.38243 -287.15455,-1.34671 -459.15298,-2.14286 z"
+             style="opacity:1;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.15972996;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             transform="scale(0.26458333)"
+             inkscape:connector-curvature="0"
+             id="path921"
+             d="m -594.81703,447.23188 c -19.93509,-11.23457 -36.99845,-21.20413 -37.91858,-22.15458 -0.92014,-0.95046 16.89601,-12.84332 39.59145,-26.42857 l 41.26442,-24.70047 h 414.51131 414.51129 v 45.25103 45.25104 l -103.32437,1.89182 c -56.8284,1.0405 -244.864119,1.76231 -417.85715,1.60402 l -314.53277,-0.28781 z"
+             style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.15972996;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             transform="scale(0.26458333)"
+             inkscape:connector-curvature="0"
+             id="path923"
+             d="m -594.76332,346.13569 -44.76332,-24.77486 37.58925,-22.56956 c 20.67409,-12.41325 41.01606,-25.00965 45.20438,-27.99199 7.39409,-5.26506 19.60649,-5.42245 420.7455,-5.42245 h 413.13037 v 52.85714 52.85714 L -136.42857,371.00084 -550,370.91056 Z"
+             style="opacity:1;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:#ffcc00;stroke-width:2.15972996;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             transform="scale(0.26458333)"
+             inkscape:connector-curvature="0"
+             id="path927"
+             d="m -123.48163,532.3714 c -0.86726,-0.86727 -115.78988,-1.51455 -255.38358,-1.43841 -211.99773,0.11565 -252.8807,-0.48716 -248.18505,-3.6594 3.09193,-2.08882 22.97883,-14.15284 44.19312,-26.80893 l 38.57143,-23.01108 265.71428,-1.76416 c 146.14286,-0.97029 330.32143,-2.56695 409.28572,-3.54814 l 143.57142,-1.78397 v 31.79547 31.79548 H 76.190486 c -108.9524,0 -198.804826,-0.70959 -199.672116,-1.57686 z"
+             style="opacity:1;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:#ffcc00;stroke-width:2.15972996;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <path
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             sodipodi:nodetypes="ccc"
+             inkscape:connector-curvature="0"
+             id="path931"
+             d="m 141.36309,140.51785 c -18.8988,-44.601185 -3.77976,-74.839279 -3.77976,-74.839279 l -3.77976,9.071428"
+             style="fill:none;stroke:#ffffff;stroke-width:0.465;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <flowRoot
+             inkscape:export-ydpi="362.10001"
+             inkscape:export-xdpi="362.10001"
+             transform="matrix(0.55651922,0,0,0.98776644,530.40574,-587.96682)"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:'Estrangelo Edessa';-inkscape-font-specification:'Estrangelo Edessa, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.45992514;stroke-miterlimit:4;stroke-dasharray:none"
+             id="flowRoot933"
+             xml:space="preserve"><flowRegion
+               style="stroke:#ffffff;stroke-width:0.45992514;stroke-miterlimit:4;stroke-dasharray:none"
+               id="flowRegion935"><rect
+                 style="stroke:#ffffff;stroke-width:0.45992514;stroke-miterlimit:4;stroke-dasharray:none"
+                 y="665.37683"
+                 x="-985.71429"
+                 height="254.28572"
+                 width="754.28571"
+                 id="rect937" /></flowRegion><flowPara
+               id="flowPara939">Alfredit Designs</flowPara></flowRoot>        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/spec/fixtures/onebox/missing_image.response b/spec/fixtures/onebox/missing_image.response
new file mode 100644
index 0000000000..ec4a102431
--- /dev/null
+++ b/spec/fixtures/onebox/missing_image.response
@@ -0,0 +1,60 @@
+<!doctype html>
+<html lang="en">
+<head prefix="og: http://ogp.me/ns#">
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<title>Open Graph protocol examples</title>
+<meta property="og:type" content="website">
+<meta property="og:locale" content="en_US">
+<meta property="og:title" content="Open Graph protocol examples">
+<meta property="og:description" content="this is bodycontent">
+<meta property="og:site_name" content="Open Graph protocol examples">
+<meta property="og:determiner" content="the">
+<meta property="og:url" content="http://examples.opengraphprotocol.us/">
+<link rel="author" href="http://www.niallkennedy.com/">
+<link rel="icon shortcut" type="image/vnd.microsoft.icon" href="/favicon.ico" sizes="16x16">
+<link rel="icon" type="image/png" href="/media/images/icon.png" sizes="16x16">
+</head>
+<body itemscope itemtype="http://schema.org/WebPage">
+<header><h1 itemprop="name">Open Graph protocol examples</h1></header>
+<div role="main">
+<p itemprop="description">Examples of Open Graph protocol markup.</p>
+
+<section id="standard">
+<header><h2>Open Graph namespace</h2></header>
+<ul>
+<li><a href="/min.html">Missing required properties</a></li>
+<li><a href="/required.html">Required properties</a></li>
+<li><a href="/nomedia.html">Most properties, no media</a></li>
+<li><a href="/canadian.html">Canadian (en_CA)</a></li>
+<li>Images<ul>
+<li><a href="/image.html">Structured image</a></li>
+<li><a href="/image-url.html">Structured image w/ image:url</a></li>
+<li><a href="/image-array.html">Structured image array</a></li>
+<li><a href="/image-toosmall.html">One-pixel structured image</a></li></ul></li>
+<li>Audio<ul>
+<li><a href="/audio.html">Structured audio</a></li>
+<li><a href="/audio-url.html">Structured audio w/ audio:url</a></li>
+<li><a href="/audio-array.html">Structured audio array</a></li></ul></li>
+<li>Video<ul>
+<li><a href="/video.html">Structured video</a></li>
+<li><a href="/video-array.html">Structured video array</a></li></ul></li>
+</ul>
+</section>
+
+<section id="objects">
+<header><h2>Global object namespace</h2></header>
+<ul>
+<li><a href="/article.html">Article</a></li>
+<li><a href="/article-utc.html">Article w/ UTC datetime</a></li>
+<li><a href="/article-offset.html">Article w/ UTC offset</a></li>
+<li><a href="/book.html">Book</a></li>
+<li><a href="/book-isbn10.html">Book w/ ISBN-10</a></li>
+<li><a href="/profile.html">Profile</a></li>
+<li><a href="/video-movie.html">Video movie</a></li>
+</ul>
+</section>
+</div>
+<footer style="text-align:center">by <a rel="author" href="http://www.niallkennedy.com/">Niall Kennedy</a></footer>
+</body>
+</html>
diff --git a/spec/fixtures/plugins/my_plugin/plugin.rb b/spec/fixtures/plugins/my_plugin/plugin.rb
index d55f50b08a..2253f3a1b0 100644
--- a/spec/fixtures/plugins/my_plugin/plugin.rb
+++ b/spec/fixtures/plugins/my_plugin/plugin.rb
@@ -6,10 +6,7 @@
 # authors: Frank Zappa
 
 auth_provider title: 'with Ubuntu',
-              authenticator: Auth::FacebookAuthenticator.new,
-              message: 'Authenticating with Ubuntu (make sure pop up blockers are not enbaled)',
-              frame_width: 1000,   # the frame size used for the pop up window, overrides default
-              frame_height: 800
+              authenticator: Auth::FacebookAuthenticator.new
 
 register_javascript <<JS
   console.log("Hello world")
diff --git a/spec/fixtures/plugins/scss_plugin/assets/stylesheets/colors.scss b/spec/fixtures/plugins/scss_plugin/assets/stylesheets/colors.scss
new file mode 100644
index 0000000000..c4b12651aa
--- /dev/null
+++ b/spec/fixtures/plugins/scss_plugin/assets/stylesheets/colors.scss
@@ -0,0 +1,2 @@
+$color1: red;
+$color2: green;
diff --git a/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/_variables.scss b/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/_variables.scss
new file mode 100644
index 0000000000..fb8f9f69fd
--- /dev/null
+++ b/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/_variables.scss
@@ -0,0 +1 @@
+$lineheight: 1.2em;
diff --git a/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/common.scss b/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/common.scss
new file mode 100644
index 0000000000..0ff1ecfff1
--- /dev/null
+++ b/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/common.scss
@@ -0,0 +1,13 @@
+@import "_variables";
+@import "../colors";
+@import "subfolder/other";
+
+body {
+  border-color: $color1;
+  fill: $color2;
+  line-height: $lineheight;
+}
+
+footer {
+  border-color: $footer1;
+}
diff --git a/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/subfolder/other.scss b/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/subfolder/other.scss
new file mode 100644
index 0000000000..cce56d4033
--- /dev/null
+++ b/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/subfolder/other.scss
@@ -0,0 +1,6 @@
+$footer1: #cc0000;
+
+code {
+  // ensures core variables are available
+  font-size: $font-down-2;
+}
diff --git a/spec/fixtures/plugins/scss_plugin/plugin.rb b/spec/fixtures/plugins/scss_plugin/plugin.rb
new file mode 100644
index 0000000000..1a5845193b
--- /dev/null
+++ b/spec/fixtures/plugins/scss_plugin/plugin.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# name: scss_plugin
+# about: Fixture plugin for SCSS tests
+# version: 1.0
+
+register_asset "stylesheets/common/common.scss"
diff --git a/spec/fixtures/theme_settings/json_schema_settings.yaml b/spec/fixtures/theme_settings/json_schema_settings.yaml
new file mode 100644
index 0000000000..0862ec4cfb
--- /dev/null
+++ b/spec/fixtures/theme_settings/json_schema_settings.yaml
@@ -0,0 +1,4 @@
+test_setting:
+  default: ""
+  description: "A JSON schema field type"
+  json_schema: '{ "type": "array", "uniqueItems": true, "items": { "type": "object", "properties": { "color": { "type": "string" }, "icon": { "type": "string" } }, "additionalProperties": false } }'
diff --git a/spec/fixtures/theme_settings/valid_settings.yaml b/spec/fixtures/theme_settings/valid_settings.yaml
index 35a6973e66..95be277cf3 100644
--- a/spec/fixtures/theme_settings/valid_settings.yaml
+++ b/spec/fixtures/theme_settings/valid_settings.yaml
@@ -72,3 +72,11 @@ enum_setting_03:
 upload_setting:
   type: upload
   default: ""
+
+invalid_json_schema_setting:
+  default: ""
+  json_schema: '{ "type": "array", "invalid json"'
+
+valid_json_schema_setting:
+  default: ""
+  json_schema: '{ "type": "array", "uniqueItems": true, "items": { "type": "object", "properties": { "color": { "type": "string" }, "icon": { "type": "string" } }, "additionalProperties": false } }'
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index f69d73b74a..18f19b1c4c 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -514,4 +514,23 @@ describe ApplicationHelper do
       expect(helper.dark_color_scheme?).to eq(true)
     end
   end
+
+  describe 'html_lang' do
+    fab!(:user) { Fabricate(:user) }
+
+    before do
+      I18n.locale = :de
+      SiteSetting.default_locale = :fr
+    end
+
+    it 'returns default locale if no request' do
+      helper.request = nil
+      expect(helper.html_lang).to eq(SiteSetting.default_locale)
+    end
+
+    it 'returns current user locale if request' do
+      helper.request.env[Auth::DefaultCurrentUserProvider::CURRENT_USER_KEY] = user
+      expect(helper.html_lang).to eq(I18n.locale.to_s)
+    end
+  end
 end
diff --git a/spec/initializers/track_setting_changes_spec.rb b/spec/initializers/track_setting_changes_spec.rb
index 82b7963ec4..b6e86c161a 100644
--- a/spec/initializers/track_setting_changes_spec.rb
+++ b/spec/initializers/track_setting_changes_spec.rb
@@ -22,4 +22,27 @@ describe 'Setting changes' do
       expect(non_approved_user.reload.approved?).to eq(true)
     end
   end
+
+  describe '#reviewable_low_priority_threshold' do
+    let(:new_threshold) { 5 }
+
+    it 'sets the low priority value' do
+      medium_threshold = 10
+      Reviewable.set_priorities(medium: medium_threshold)
+
+      expect(Reviewable.min_score_for_priority(:low)).not_to eq(new_threshold)
+
+      SiteSetting.reviewable_low_priority_threshold = new_threshold
+
+      expect(Reviewable.min_score_for_priority(:low)).to eq(new_threshold)
+    end
+
+    it "does nothing if the other thresholds were not calculated" do
+      Reviewable.set_priorities(medium: 0.0)
+
+      SiteSetting.reviewable_low_priority_threshold = new_threshold
+
+      expect(Reviewable.min_score_for_priority(:low)).not_to eq(new_threshold)
+    end
+  end
 end
diff --git a/spec/integration/auto_reject_reviewable_users_spec.rb b/spec/integration/auto_reject_reviewable_users_spec.rb
new file mode 100644
index 0000000000..1b827c0440
--- /dev/null
+++ b/spec/integration/auto_reject_reviewable_users_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe "auto reject reviewable users" do
+  context "reviewable users" do
+    fab!(:old_user) { Fabricate(:reviewable, created_at: 80.days.ago) }
+
+    it "does not send email to rejected user" do
+      SiteSetting.must_approve_users = true
+      SiteSetting.auto_handle_queued_age = 60
+
+      Jobs::CriticalUserEmail.any_instance.expects(:execute).never
+      Jobs::AutoQueueHandler.new.execute({})
+
+      expect(old_user.reload.rejected?).to eq(true)
+      expect(UserHistory.last.context).to eq(
+        I18n.t("user.destroy_reasons.reviewable_reject_auto")
+      )
+    end
+  end
+end
diff --git a/spec/integration/rate_limiting_spec.rb b/spec/integration/rate_limiting_spec.rb
index a623d7aa22..353569ef61 100644
--- a/spec/integration/rate_limiting_spec.rb
+++ b/spec/integration/rate_limiting_spec.rb
@@ -24,7 +24,7 @@ describe 'rate limiter integration' do
     }
 
     expect(response.status).to eq(429)
-    expect(response.headers['Retry-After']).to be > 29
+    expect(response.headers['Retry-After'].to_i).to be > 29
   end
 
   it "will not rate limit when all is good" do
@@ -76,7 +76,7 @@ describe 'rate limiter integration' do
 
     data = response.parsed_body
 
-    expect(response.headers['Retry-After']).to eq(60)
+    expect(response.headers["Retry-After"]).to eq("60")
     expect(data["extras"]["wait_seconds"]).to eq(60)
   end
 end
diff --git a/spec/integration/topic_auto_close_spec.rb b/spec/integration/topic_auto_close_spec.rb
index 7b51b35170..0771e7c704 100644
--- a/spec/integration/topic_auto_close_spec.rb
+++ b/spec/integration/topic_auto_close_spec.rb
@@ -4,7 +4,7 @@
 require 'rails_helper'
 
 describe Topic do
-  let(:job_klass) { Jobs::ToggleTopicClosed }
+  let(:job_klass) { Jobs::CloseTopic }
 
   context 'creating a topic without auto-close' do
     let(:topic) { Fabricate(:topic, category: category) }
@@ -41,12 +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 eq_time(2.hours.from_now)
-
-          args = job_klass.jobs.last['args'].first
-
-          expect(args["topic_timer_id"]).to eq(topic.public_topic_timer.id)
-          expect(args["state"]).to eq(true)
+          expect(topic.public_topic_timer.execute_at).to be_within_one_second_of(2.hours.from_now)
         end
 
         context 'topic was created by staff user' do
@@ -59,13 +54,8 @@ describe Topic do
             topic_status_update = TopicTimer.last
 
             expect(topic_status_update.topic).to eq(staff_topic)
-            expect(topic_status_update.execute_at).to eq_time(2.hours.from_now)
+            expect(topic_status_update.execute_at).to be_within_one_second_of(2.hours.from_now)
             expect(topic_status_update.user).to eq(Discourse.system_user)
-
-            args = job_klass.jobs.last['args'].first
-
-            expect(args["topic_timer_id"]).to eq(topic_status_update.id)
-            expect(args["state"]).to eq(true)
           end
 
           context 'topic is closed manually' do
@@ -75,7 +65,7 @@ describe Topic do
               staff_topic.update_status('closed', true, admin)
 
               expect(TopicTimer.with_deleted.find(topic_timer_id).deleted_at)
-                .to eq_time(Time.zone.now)
+                .to be_within_one_second_of(Time.zone.now)
             end
           end
         end
@@ -90,13 +80,8 @@ 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 eq_time(2.hours.from_now)
+            expect(topic_status_update.execute_at).to be_within_one_second_of(2.hours.from_now)
             expect(topic_status_update.user).to eq(Discourse.system_user)
-
-            args = job_klass.jobs.last['args'].first
-
-            expect(args["topic_timer_id"]).to eq(topic_status_update.id)
-            expect(args["state"]).to eq(true)
           end
         end
       end
diff --git a/spec/integrity/common_mark_spec.rb b/spec/integrity/common_mark_spec.rb
index 4b69d22516..852e3ea050 100644
--- a/spec/integrity/common_mark_spec.rb
+++ b/spec/integrity/common_mark_spec.rb
@@ -33,6 +33,7 @@ describe "CommonMark" do
         cooked.strip!
         cooked.gsub!(" class=\"lang-auto\"", '')
         cooked.gsub!(/<span class="hashtag">(.*)<\/span>/, "\\1")
+        cooked.gsub!(/<a name="(.*)" class="anchor" href="#\1*"><\/a>/, "")
         # we don't care about this
         cooked.gsub!("<blockquote>\n</blockquote>", "<blockquote></blockquote>")
         html.gsub!("<blockquote>\n</blockquote>", "<blockquote></blockquote>")
diff --git a/spec/integrity/i18n_spec.rb b/spec/integrity/i18n_spec.rb
index 49cabe87eb..2c7494274e 100644
--- a/spec/integrity/i18n_spec.rb
+++ b/spec/integrity/i18n_spec.rb
@@ -24,7 +24,6 @@ def is_yaml_compatible?(english, translated)
 end
 
 describe "i18n integrity checks" do
-
   it 'has an i18n key for each Trust Levels' do
     TrustLevel.all.each do |ts|
       expect(ts.name).not_to match(/translation missing/)
@@ -98,16 +97,46 @@ describe "i18n integrity checks" do
         end
 
         unless path["transliterate"]
-
           it "is compatible with english" do
             expect(is_yaml_compatible?(english_yaml, yaml)).to eq(true)
           end
-
         end
-
       end
+    end
+  end
+end
 
+describe "fallbacks" do
+  before do
+    I18n.backend = I18n::Backend::DiscourseI18n.new
+    I18n.fallbacks = I18n::Backend::FallbackLocaleList.new
+    I18n.reload!
+    I18n.init_accelerator!
+  end
+
+  it "finds the fallback translation" do
+    I18n.backend.store_translations(:en, test: "en test")
+
+    I18n.with_locale("pl_PL") do
+      expect(I18n.t("test")).to eq("en test")
     end
   end
 
+  context "in a multi-threaded environment" do
+    it "finds the fallback translation" do
+      I18n.backend.store_translations(:en, test: "en test")
+
+      thread = Thread.new do
+        I18n.with_locale("pl_PL") do
+          expect(I18n.t("test")).to eq("en test")
+        end
+      end
+
+      begin
+        thread.join
+      ensure
+        thread.exit
+      end
+    end
+  end
 end
diff --git a/spec/jobs/bookmark_reminder_notifications_spec.rb b/spec/jobs/bookmark_reminder_notifications_spec.rb
index 852aaba13e..b7dd16454b 100644
--- a/spec/jobs/bookmark_reminder_notifications_spec.rb
+++ b/spec/jobs/bookmark_reminder_notifications_spec.rb
@@ -48,6 +48,15 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
     expect(bookmark4.reload.reminder_at).not_to eq(nil)
   end
 
+  context "when a user is over the bookmark limit" do
+    it "clearing their reminder does not error and hold up the rest" do
+      other_bookmark = Fabricate(:bookmark, user: bookmark1.user)
+      other_bookmark.update_column(:reminder_at, five_minutes_ago)
+      SiteSetting.max_bookmarks_per_user = 2
+      expect { subject.execute }.not_to raise_error
+    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
diff --git a/spec/jobs/bulk_invite_spec.rb b/spec/jobs/bulk_invite_spec.rb
index aad9f5ffe4..676d93c8fa 100644
--- a/spec/jobs/bulk_invite_spec.rb
+++ b/spec/jobs/bulk_invite_spec.rb
@@ -10,7 +10,7 @@ describe Jobs::BulkInvite do
     fab!(:group2) { Fabricate(:group, name: 'group2') }
     fab!(:topic) { Fabricate(:topic) }
     let(:staged_user) { Fabricate(:user, staged: true, active: false) }
-    let(:email) { "test@discourse.org" }
+    let(:email) { 'test@discourse.org' }
     let(:invites) { [{ email: staged_user.email }, { email: 'test2@discourse.org' }, { email: 'test@discourse.org', groups: 'GROUP1;group2', topic_id: topic.id }] }
 
     it 'raises an error when the invites array is missing' do
@@ -30,13 +30,11 @@ describe Jobs::BulkInvite do
       )
 
       expect(Invite.exists?(email: staged_user.email)).to eq(true)
-      expect(Invite.exists?(email: "test2@discourse.org")).to eq(true)
+      expect(Invite.exists?(email: 'test2@discourse.org')).to eq(true)
 
       invite = Invite.last
       expect(invite.email).to eq(email)
-      expect(invite.invited_groups.pluck(:group_id)).to contain_exactly(
-        group1.id, group2.id
-      )
+      expect(invite.invited_groups.pluck(:group_id)).to contain_exactly(group1.id, group2.id)
       expect(invite.topic_invites.pluck(:topic_id)).to contain_exactly(topic.id)
     end
 
@@ -49,12 +47,8 @@ describe Jobs::BulkInvite do
       )
 
       invite = Invite.last
-
       expect(invite.email).to eq(email)
-
-      expect(invite.invited_groups.pluck(:group_id)).to contain_exactly(
-        group1.id
-      )
+      expect(invite.invited_groups.pluck(:group_id)).to contain_exactly(group1.id)
     end
 
     it 'does not create invited groups record if the user can not manage the group' do
@@ -66,16 +60,12 @@ describe Jobs::BulkInvite do
       )
 
       invite = Invite.last
-
       expect(invite.email).to eq(email)
-
-      expect(invite.invited_groups.pluck(:group_id)).to contain_exactly(
-        group1.id
-      )
+      expect(invite.invited_groups.pluck(:group_id)).to contain_exactly(group1.id)
     end
 
     it 'adds existing users to valid groups' do
-      existing_user = Fabricate(:user, email: "test@discourse.org")
+      existing_user = Fabricate(:user, email: 'test@discourse.org')
 
       group2.update!(automatic: true)
 
@@ -87,10 +77,37 @@ describe Jobs::BulkInvite do
       end.to change { Invite.count }.by(2)
 
       expect(Invite.exists?(email: staged_user.email)).to eq(true)
-      expect(Invite.exists?(email: "test2@discourse.org")).to eq(true)
+      expect(Invite.exists?(email: 'test2@discourse.org')).to eq(true)
       expect(existing_user.reload.groups).to eq([group1])
     end
 
+    it 'can create staged users and prepulate user fields' do
+      user_field = Fabricate(:user_field, name: "Location")
+      user_field_color = Fabricate(:user_field, field_type: "dropdown", name: "Color")
+      user_field_color.user_field_options.create!(value: "Red")
+      user_field_color.user_field_options.create!(value: "Green")
+      user_field_color.user_field_options.create!(value: "Blue")
+
+      described_class.new.execute(
+        current_user_id: admin.id,
+        invites: [
+          { email: 'test@discourse.org' }, # new user without user fields
+          { email: user.email, location: 'value 1', color: 'blue' }, # existing user with user fields
+          { email: staged_user.email, location: 'value 2', color: 'redd' }, # existing staged user with user fields
+          { email: 'test2@discourse.org', location: 'value 3' } # new staged user with user fields
+        ]
+      )
+
+      expect(Invite.count).to eq(3)
+      expect(User.where(staged: true).find_by_email('test@discourse.org')).to eq(nil)
+      expect(user.user_fields[user_field.id.to_s]).to eq('value 1')
+      expect(user.user_fields[user_field_color.id.to_s]).to eq('Blue')
+      expect(staged_user.user_fields[user_field.id.to_s]).to eq('value 2')
+      expect(staged_user.user_fields[user_field_color.id.to_s]).to eq(nil)
+      new_staged_user = User.where(staged: true).find_by_email('test2@discourse.org')
+      expect(new_staged_user.user_fields[user_field.id.to_s]).to eq('value 3')
+    end
+
     context 'invites are more than 200' do
       let(:bulk_invites) { [] }
 
@@ -107,7 +124,7 @@ describe Jobs::BulkInvite do
         )
 
         invite = Invite.last
-        expect(invite.email).to eq("test_201@discourse.org")
+        expect(invite.email).to eq('test_201@discourse.org')
         expect(invite.emailed_status).to eq(Invite.emailed_status_types[:bulk_pending])
         expect(Jobs::ProcessBulkInviteEmails.jobs.size).to eq(1)
       end
diff --git a/spec/jobs/clean_dismissed_topic_users_spec.rb b/spec/jobs/clean_dismissed_topic_users_spec.rb
new file mode 100644
index 0000000000..d17041f7b9
--- /dev/null
+++ b/spec/jobs/clean_dismissed_topic_users_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Jobs::CleanDismissedTopicUsers do
+  fab!(:user) { Fabricate(:user, created_at: 1.days.ago, previous_visit_at: 1.days.ago) }
+  fab!(:topic) { Fabricate(:topic, created_at: 5.hours.ago) }
+  fab!(:dismissed_topic_user) { Fabricate(:dismissed_topic_user, user: user, topic: topic) }
+
+  context '#delete_overdue_dismissals!' do
+    it 'does not delete when new_topic_duration_minutes is set to always' do
+      user.user_option.update(new_topic_duration_minutes: User::NewTopicDuration::ALWAYS)
+      expect { described_class.new.execute({}) }.not_to change { DismissedTopicUser.count }
+    end
+
+    it 'deletes when new_topic_duration_minutes is set to since last visit' do
+      user.user_option.update(new_topic_duration_minutes: User::NewTopicDuration::LAST_VISIT)
+      expect { described_class.new.execute({}) }.not_to change { DismissedTopicUser.count }
+
+      user.update!(previous_visit_at: 1.hours.ago)
+      expect { described_class.new.execute({}) }.to change { DismissedTopicUser.count }.by(-1)
+    end
+
+    it 'deletes when new_topic_duration_minutes is set to created in the last day' do
+      user.user_option.update(new_topic_duration_minutes: 1440)
+      expect { described_class.new.execute({}) }.not_to change { DismissedTopicUser.count }
+
+      topic.update!(created_at: 2.days.ago)
+      expect { described_class.new.execute({}) }.to change { DismissedTopicUser.count }.by(-1)
+    end
+  end
+
+  context '#delete_over_the_limit_dismissals!' do
+    fab!(:user2) { Fabricate(:user, created_at: 1.days.ago, previous_visit_at: 1.days.ago) }
+    fab!(:topic2) { Fabricate(:topic, created_at: 6.hours.ago) }
+    fab!(:topic3) { Fabricate(:topic, created_at: 2.hours.ago) }
+    fab!(:dismissed_topic_user2) { Fabricate(:dismissed_topic_user, user: user, topic: topic2) }
+    fab!(:dismissed_topic_user3) { Fabricate(:dismissed_topic_user, user: user, topic: topic3) }
+    fab!(:dismissed_topic_user4) { Fabricate(:dismissed_topic_user, user: user2, topic: topic) }
+
+    before do
+      user.user_option.update(new_topic_duration_minutes: User::NewTopicDuration::ALWAYS)
+      user2.user_option.update(new_topic_duration_minutes: User::NewTopicDuration::ALWAYS)
+    end
+
+    it 'deletes over the limit dismissals' do
+      described_class.new.execute({})
+      expect(dismissed_topic_user.reload).to be_present
+      expect(dismissed_topic_user2.reload).to be_present
+      expect(dismissed_topic_user3.reload).to be_present
+      expect(dismissed_topic_user4.reload).to be_present
+
+      SiteSetting.max_new_topics = 2
+      described_class.new.execute({})
+      expect(dismissed_topic_user.reload).to be_present
+      expect { dismissed_topic_user2.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect(dismissed_topic_user3.reload).to be_present
+      expect(dismissed_topic_user4.reload).to be_present
+    end
+  end
+end
diff --git a/spec/jobs/clean_up_email_change_requests_spec.rb b/spec/jobs/clean_up_email_change_requests_spec.rb
new file mode 100644
index 0000000000..751d7751c7
--- /dev/null
+++ b/spec/jobs/clean_up_email_change_requests_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Jobs::CleanUpEmailChangeRequests do
+  it "deletes records older than 1 month" do
+    very_old = Fabricate(:email_change_request, updated_at: 32.days.ago)
+    yesterday = Fabricate(:email_change_request, updated_at: 1.day.ago)
+    today = Fabricate(:email_change_request, updated_at: Time.zone.now)
+
+    expect { described_class.new.execute({}) }.to change { EmailChangeRequest.count }.by(-1)
+    expect { very_old.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    expect(yesterday.reload).to be_present
+    expect(today.reload).to be_present
+  end
+end
diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb
index 68a73aa1f2..26275cac18 100644
--- a/spec/jobs/clean_up_uploads_spec.rb
+++ b/spec/jobs/clean_up_uploads_spec.rb
@@ -284,4 +284,25 @@ describe Jobs::CleanUpUploads do
     expect(Upload.exists?(id: expired_upload.id)).to eq(false)
     expect(Upload.exists?(id: csv_file.id)).to eq(true)
   end
+
+  it "does not delete theme setting uploads" do
+    theme = Fabricate(:theme)
+    theme_upload = fabricate_upload
+    ThemeSetting.create!(theme: theme, data_type: ThemeSetting.types[:upload], value: theme_upload.url, name: "my_setting_name")
+
+    Jobs::CleanUpUploads.new.execute(nil)
+
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
+    expect(Upload.exists?(id: theme_upload.id)).to eq(true)
+  end
+
+  it "does not delete badges uploads" do
+    badge_image = fabricate_upload
+    badge = Fabricate(:badge, image_upload_id: badge_image.id)
+
+    Jobs::CleanUpUploads.new.execute(nil)
+
+    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
+    expect(Upload.exists?(id: badge_image.id)).to eq(true)
+  end
 end
diff --git a/spec/jobs/cleanup_imap_sync_log_spec.rb b/spec/jobs/cleanup_imap_sync_log_spec.rb
index 8b52141ac2..3975c76966 100644
--- a/spec/jobs/cleanup_imap_sync_log_spec.rb
+++ b/spec/jobs/cleanup_imap_sync_log_spec.rb
@@ -17,4 +17,9 @@ describe Jobs::CleanupImapSyncLog do
 
     expect(ImapSyncLog.count).to eq(1)
   end
+
+  it "does not write the log to the db if specified" do
+    ImapSyncLog.debug("test", Fabricate(:group), db: false)
+    expect(ImapSyncLog.count).to eq(0)
+  end
 end
diff --git a/spec/jobs/close_topic_spec.rb b/spec/jobs/close_topic_spec.rb
new file mode 100644
index 0000000000..3ba07ed4ad
--- /dev/null
+++ b/spec/jobs/close_topic_spec.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Jobs::CloseTopic do
+  fab!(:admin) { Fabricate(:admin) }
+
+  fab!(:topic) do
+    Fabricate(:topic_timer, user: admin).topic
+  end
+
+  it 'should be able to close a topic' do
+    freeze_time(61.minutes.from_now) do
+      described_class.new.execute(
+        topic_timer_id: topic.public_topic_timer.id,
+        state: true
+      )
+
+      expect(topic.reload.closed).to eq(true)
+
+      expect(Post.last.raw).to eq(I18n.t(
+        'topic_statuses.autoclosed_enabled_minutes', count: 61
+      ))
+    end
+  end
+
+  it "publishes to the topic message bus so the topic status reloads" do
+    MessageBus.expects(:publish).at_least_once
+    MessageBus.expects(:publish).with("/topic/#{topic.id}", reload_topic: true).once
+    freeze_time(61.minutes.from_now) do
+      described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
+    end
+  end
+
+  describe 'when trying to close a topic that has already been closed' do
+    it 'should delete the topic timer' do
+      freeze_time(topic.public_topic_timer.execute_at + 1.minute)
+
+      topic.update!(closed: true)
+
+      expect do
+        described_class.new.execute(
+          topic_timer_id: topic.public_topic_timer.id,
+          state: true
+        )
+      end.to change { TopicTimer.exists?(topic_id: topic.id) }.from(true).to(false)
+    end
+  end
+
+  describe 'when trying to close a topic that has been deleted' do
+    it 'should delete the topic timer' do
+      freeze_time(topic.public_topic_timer.execute_at + 1.minute)
+
+      topic.trash!
+
+      expect do
+        described_class.new.execute(
+          topic_timer_id: topic.public_topic_timer.id,
+          state: true
+        )
+      end.to change { TopicTimer.exists?(topic_id: topic.id) }.from(true).to(false)
+    end
+  end
+
+  describe 'when user is no longer authorized to close topics' do
+    fab!(:user) { Fabricate(:user) }
+
+    fab!(:topic) do
+      Fabricate(:topic_timer, user: user).topic
+    end
+
+    it 'should destroy the topic timer' do
+      freeze_time(topic.public_topic_timer.execute_at + 1.minute)
+
+      expect do
+        described_class.new.execute(
+          topic_timer_id: topic.public_topic_timer.id,
+          state: true
+        )
+      end.to change { TopicTimer.exists?(topic_id: topic.id) }.from(true).to(false)
+
+      expect(topic.reload.closed).to eq(false)
+    end
+
+    it "should reconfigure topic timer if category's topics are set to autoclose" do
+      category = Fabricate(:category,
+        auto_close_based_on_last_post: true,
+        auto_close_hours: 5
+      )
+
+      topic = Fabricate(:topic, category: category)
+      topic.public_topic_timer.update!(user: user)
+
+      freeze_time(topic.public_topic_timer.execute_at + 1.minute)
+
+      expect do
+        described_class.new.execute(
+          topic_timer_id: topic.public_topic_timer.id,
+          state: true
+        )
+      end.to change { topic.reload.public_topic_timer.user }.from(user).to(Discourse.system_user)
+        .and change { topic.public_topic_timer.id }
+
+      expect(topic.reload.closed).to eq(false)
+    end
+  end
+end
diff --git a/spec/jobs/delete_replies_spec.rb b/spec/jobs/delete_replies_spec.rb
index a1968bc671..ecb8b65e4f 100644
--- a/spec/jobs/delete_replies_spec.rb
+++ b/spec/jobs/delete_replies_spec.rb
@@ -7,7 +7,7 @@ describe Jobs::DeleteReplies do
 
   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)
+    Fabricate(:topic_timer, status_type: TopicTimer.types[:delete_replies], duration_minutes: 2880, user: admin, topic: topic, execute_at: 2.days.from_now)
   end
 
   before do
@@ -15,6 +15,8 @@ describe Jobs::DeleteReplies do
   end
 
   it "can delete replies of a topic" do
+    SiteSetting.skip_auto_delete_reply_likes = 0
+
     freeze_time (2.days.from_now)
 
     expect {
@@ -24,4 +26,16 @@ describe Jobs::DeleteReplies do
     topic_timer.reload
     expect(topic_timer.execute_at).to eq_time(2.day.from_now)
   end
+
+  it "does not delete posts with likes over the threshold" do
+    SiteSetting.skip_auto_delete_reply_likes = 3
+
+    freeze_time (2.days.from_now)
+
+    topic.posts.last.update!(like_count: SiteSetting.skip_auto_delete_reply_likes + 1)
+
+    expect {
+      described_class.new.execute(topic_timer_id: topic_timer.id)
+    }.to change { topic.posts.count }.by(-1)
+  end
 end
diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index 0e649c882e..9db61d2f3c 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -234,6 +234,42 @@ describe Jobs::EmitWebHookEvent do
     end
   end
 
+  context 'with group filters' do
+    fab!(:group) { Fabricate(:group) }
+    fab!(:user) { Fabricate(:user, groups: [group]) }
+    fab!(:like_hook) { Fabricate(:like_web_hook, groups: [group]) }
+
+    it "doesn't emit when event is not included any groups" do
+      subject.execute(
+        web_hook_id: like_hook.id,
+        event_type: 'like',
+        payload: { test: "some payload" }.to_json
+      )
+    end
+
+    it "doesn't emit when event is not related with defined groups" do
+      subject.execute(
+        web_hook_id: like_hook.id,
+        event_type: 'like',
+        group_ids: [Fabricate(:group).id],
+        payload: { test: "some payload" }.to_json
+      )
+    end
+
+    it 'emit when event is related with defined groups' do
+      stub_request(:post, like_hook.payload_url)
+        .with(body: "{\"like\":{\"test\":\"some payload\"}}")
+        .to_return(body: 'OK', status: 200)
+
+      subject.execute(
+        web_hook_id: like_hook.id,
+        event_type: 'like',
+        group_ids: user.groups.pluck(:id),
+        payload: { test: "some payload" }.to_json
+      )
+    end
+  end
+
   describe '#send_webhook!' do
     it 'creates delivery event record' do
       stub_request(:post, post_hook.payload_url)
diff --git a/spec/jobs/enqueue_suspect_users_spec.rb b/spec/jobs/enqueue_suspect_users_spec.rb
index b1b30e7795..146d7837d5 100644
--- a/spec/jobs/enqueue_suspect_users_spec.rb
+++ b/spec/jobs/enqueue_suspect_users_spec.rb
@@ -12,7 +12,7 @@ describe Jobs::EnqueueSuspectUsers do
   end
 
   context 'with suspect users' do
-    fab!(:suspect_user) { Fabricate(:active_user, created_at: 1.day.ago) }
+    let!(:suspect_user) { Fabricate(:active_user, created_at: 1.day.ago) }
 
     it 'creates a reviewable when there is a suspect user' do
       subject.execute({})
@@ -80,5 +80,29 @@ describe Jobs::EnqueueSuspectUsers do
 
       expect(ReviewableUser.where(target: suspect_user).exists?).to eq(true)
     end
+
+    it 'ignores imported users even if they have multiple custom fields' do
+      suspect_user.upsert_custom_fields({ field_a: 'value', field_b: 'value', import_id: 'fake_id' })
+
+      subject.execute({})
+
+      expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
+    end
+
+    it 'enqueues a suspect user with not enough time read' do
+      suspect_user.user_stat.update!(posts_read_count: 2, topics_entered: 2, time_read: 30.seconds.to_i)
+
+      subject.execute({})
+
+      expect(ReviewableUser.count).to eq(1)
+    end
+
+    it 'ignores users if their time read is higher than one minute' do
+      suspect_user.user_stat.update!(posts_read_count: 2, topics_entered: 2, time_read: 2.minutes.to_i)
+
+      subject.execute({})
+
+      expect(ReviewableUser.count).to eq(0)
+    end
   end
 end
diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rb
index 16c1023512..f53d0536e5 100644
--- a/spec/jobs/export_csv_file_spec.rb
+++ b/spec/jobs/export_csv_file_spec.rb
@@ -210,8 +210,8 @@ describe Jobs::ExportCsvFile do
   end
 
   it 'exports sso data' do
-    SiteSetting.sso_url = "https://www.example.com/sso"
-    SiteSetting.enable_sso = true
+    SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+    SiteSetting.enable_discourse_connect = true
     user = Fabricate(:user)
     user.user_profile.update_column(:location, "La,La Land")
     user.create_single_sign_on_record(external_id: "123", last_payload: "xxx", external_email: 'test@test.com')
diff --git a/spec/jobs/export_user_archive_spec.rb b/spec/jobs/export_user_archive_spec.rb
index b837fa2dc8..3387a7144d 100644
--- a/spec/jobs/export_user_archive_spec.rb
+++ b/spec/jobs/export_user_archive_spec.rb
@@ -14,9 +14,11 @@ describe Jobs::ExportUserArchive do
   }
   let(:component) { raise 'component not set' }
 
+  let(:admin) { Fabricate(:admin) }
   let(:category) { Fabricate(:category_with_definition) }
   let(:subcategory) { Fabricate(:category_with_definition, parent_category_id: category.id) }
   let(:topic) { Fabricate(:topic, category: category) }
+  let(:post) { Fabricate(:post, user: user, topic: topic) }
 
   def make_component_csv
     data_rows = []
@@ -35,8 +37,6 @@ describe Jobs::ExportUserArchive do
   end
 
   context '#execute' do
-    let(:post) { Fabricate(:post, user: user) }
-
     before do
       _ = post
       user.user_profile.website = 'https://doe.example.com/john'
@@ -46,6 +46,9 @@ describe Jobs::ExportUserArchive do
         'HTTP_USER_AGENT' => 'MyWebBrowser',
         'REQUEST_PATH' => '/some_path/456852',
       }).log_on_user(user, {}, {})
+
+      # force a nonstandard post action
+      PostAction.new(user: user, post: post, post_action_type_id: 5).save
     end
 
     after do
@@ -89,6 +92,19 @@ describe Jobs::ExportUserArchive do
       expect(files.find { |f| f == 'user_archive.csv' }).to_not be_nil
       expect(files.find { |f| f == 'category_preferences.csv' }).to_not be_nil
     end
+
+    it 'sends a message if it fails' do
+      SiteSetting.max_export_file_size_kb = 1
+
+      expect do
+        Jobs::ExportUserArchive.new.execute(
+          user_id: user.id,
+        )
+      end.to change { Upload.count }.by(0)
+
+      system_message = user.topics_allowed.last
+      expect(system_message.title).to eq(I18n.t("system_messages.csv_export_failed.subject_template"))
+    end
   end
 
   context 'user_archive posts' do
@@ -210,7 +226,6 @@ describe Jobs::ExportUserArchive do
   context 'badges' do
     let(:component) { 'badges' }
 
-    let(:admin) { Fabricate(:admin) }
     let(:badge1) { Fabricate(:badge) }
     let(:badge2) { Fabricate(:badge, multiple_grant: true) }
     let(:badge3) { Fabricate(:badge, multiple_grant: true) }
@@ -315,7 +330,6 @@ describe Jobs::ExportUserArchive do
           .where(category_id: category_id)
           .first_or_initialize
           .update!(last_seen_at: reset_at)
-        #TopicTrackingState.publish_dismiss_new(user.id, category_id)
       end
 
       # Set Watching First Post on announcements, Tracking on subcategory, Muted on deleted, nothing on subsubcategory
@@ -351,11 +365,67 @@ describe Jobs::ExportUserArchive do
     end
   end
 
+  context 'flags' do
+    let(:component) { 'flags' }
+    let(:other_post) { Fabricate(:post, user: admin) }
+    let(:post3) { Fabricate(:post) }
+    let(:post4) { Fabricate(:post) }
+
+    it 'correctly exports flags' do
+      result0 = PostActionCreator.notify_moderators(user, other_post, "helping out the admins")
+      PostActionCreator.spam(user, post3)
+      PostActionDestroyer.destroy(user, post3, :spam)
+      PostActionCreator.inappropriate(user, post3)
+      result3 = PostActionCreator.off_topic(user, post4)
+      result3.reviewable.perform(admin, :agree_and_keep)
+
+      data, csv_out = make_component_csv
+      expect(data.length).to eq(4)
+      data.sort_by! { |row| row['post_id'].to_i }
+
+      expect(data[0]['post_id']).to eq(other_post.id.to_s)
+      expect(data[0]['flag_type']).to eq('notify_moderators')
+      expect(data[0]['related_post_id']).to eq(result0.post_action.related_post_id.to_s)
+
+      expect(data[1]['flag_type']).to eq('spam')
+      expect(data[2]['flag_type']).to eq('inappropriate')
+      expect(data[1]['deleted_at']).to_not be_empty
+      expect(data[1]['deleted_by']).to eq('self')
+      expect(data[2]['deleted_at']).to be_empty
+
+      expect(data[3]['post_id']).to eq(post4.id.to_s)
+      expect(data[3]['flag_type']).to eq('off_topic')
+      expect(data[3]['deleted_at']).to be_empty
+    end
+  end
+
+  context 'likes' do
+    let(:component) { 'likes' }
+    let(:other_post) { Fabricate(:post, user: admin) }
+    let(:post3) { Fabricate(:post) }
+
+    it 'correctly exports likes' do
+      PostActionCreator.like(user, other_post)
+      PostActionCreator.like(user, post3)
+      PostActionCreator.like(admin, post3)
+      PostActionDestroyer.destroy(user, post3, :like)
+      post3.destroy!
+
+      data, csv_out = make_component_csv
+      expect(data.length).to eq(2)
+      data.sort_by! { |row| row['post_id'].to_i }
+
+      expect(data[0]['post_id']).to eq(other_post.id.to_s)
+      expect(data[1]['post_id']).to eq(post3.id.to_s)
+      expect(data[1]['deleted_at']).to_not be_empty
+      expect(data[1]['deleted_by']).to eq('self')
+    end
+  end
+
   context 'queued posts' do
     let(:component) { 'queued_posts' }
     let(:reviewable_post) { Fabricate(:reviewable_queued_post, topic: topic, created_by: user) }
     let(:reviewable_topic) { Fabricate(:reviewable_queued_post_topic, category: category, created_by: user) }
-    let(:admin) { Fabricate(:admin) }
 
     it 'correctly exports queued posts' do
       SiteSetting.tagging_enabled = true
diff --git a/spec/jobs/invite_email_spec.rb b/spec/jobs/invite_email_spec.rb
index d998b85bae..d72de95818 100644
--- a/spec/jobs/invite_email_spec.rb
+++ b/spec/jobs/invite_email_spec.rb
@@ -17,7 +17,7 @@ describe Jobs::InviteEmail do
 
       it 'delegates to the test mailer' do
         Email::Sender.any_instance.expects(:send)
-        InviteMailer.expects(:send_invite).with(invite, nil).returns(mailer)
+        InviteMailer.expects(:send_invite).with(invite, anything).returns(mailer)
         Jobs::InviteEmail.new.execute(invite_id: invite.id)
       end
 
diff --git a/spec/jobs/jobs_spec.rb b/spec/jobs/jobs_spec.rb
index 0f3f8d48ca..5ee5ff09a7 100644
--- a/spec/jobs/jobs_spec.rb
+++ b/spec/jobs/jobs_spec.rb
@@ -29,6 +29,28 @@ describe Jobs do
         end
       end
 
+      it "enqueues the job after the current transaction has committed" do
+        jobs = Jobs::ProcessPost.jobs
+        expect(jobs.length).to eq(0)
+
+        Jobs.enqueue(:process_post, post_id: 1)
+        expect(jobs.length).to eq(1)
+
+        ActiveRecord::Base.transaction do
+          Jobs.enqueue(:process_post, post_id: 1)
+          expect(jobs.length).to eq(1)
+        end
+        expect(jobs.length).to eq(2)
+
+        # Failed transation
+        ActiveRecord::Base.transaction do
+          Jobs.enqueue(:process_post, post_id: 1)
+          raise ActiveRecord::Rollback
+        end
+
+        expect(jobs.length).to eq(2) # No change
+      end
+
       it "does not pass current_site_id when 'all_sites' is present" do
         Sidekiq::Testing.fake! do
           jobs = Jobs::ProcessPost.jobs
diff --git a/spec/jobs/migrate_badge_image_to_uploads_spec.rb b/spec/jobs/migrate_badge_image_to_uploads_spec.rb
new file mode 100644
index 0000000000..702821f3a4
--- /dev/null
+++ b/spec/jobs/migrate_badge_image_to_uploads_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Jobs::MigrateBadgeImageToUploads do
+  let(:image_url) { "https://omg.aws.somestack/test.png" }
+  let(:badge) { Fabricate(:badge) }
+
+  before do
+    @orig_logger = Rails.logger
+    Rails.logger = @fake_logger = FakeLogger.new
+  end
+
+  after do
+    Rails.logger = @orig_logger
+  end
+
+  it 'should migrate to the new badge `image_upload_id` column correctly' do
+    stub_request(:get, image_url).to_return(
+      status: 200, body: file_from_fixtures("smallest.png").read
+    )
+    DB.exec(<<~SQL, flair_url: image_url, id: badge.id)
+      UPDATE badges SET image = :flair_url WHERE id = :id
+    SQL
+
+    expect do
+      described_class.new.execute_onceoff({})
+    end.to change { Upload.count }.by(1)
+
+    badge.reload
+    upload = Upload.last
+    expect(badge.image_upload).to eq(upload)
+    expect(badge.image_url).to eq(upload.url)
+    expect(badge[:image]).to eq(nil)
+  end
+
+  it 'should skip badges with invalid flair URLs' do
+    DB.exec("UPDATE badges SET image = 'abc' WHERE id = ?", badge.id)
+    described_class.new.execute_onceoff({})
+    expect(Rails.logger.warnings.count).to eq(0)
+    expect(Rails.logger.errors.count).to eq(0)
+  end
+
+  # this case has a couple of hacks that are needed to test this behavior, so if it
+  # starts failing randomly in the future, I'd just delete it and not bother with it
+  it 'should not keep retrying forever if download fails' do
+    stub_request(:get, image_url).to_return(status: 403)
+    instance = described_class.new
+    instance.expects(:sleep).times(2)
+
+    DB.exec(<<~SQL, flair_url: image_url, id: badge.id)
+      UPDATE badges SET image = :flair_url WHERE id = :id
+    SQL
+
+    expect do
+      instance.execute_onceoff({})
+    end.not_to change { Upload.count }
+
+    badge.reload
+    expect(badge.image_upload).to eq(nil)
+    expect(badge.image_url).to eq(nil)
+    expect(Badge.where(id: badge.id).select(:image).first[:image]).to eq(image_url)
+    expect(Rails.logger.warnings.count).to eq(3)
+  end
+end
diff --git a/spec/jobs/migrate_group_flair_images_spec.rb b/spec/jobs/migrate_group_flair_images_spec.rb
index cc72d26fa2..d47a5acd30 100644
--- a/spec/jobs/migrate_group_flair_images_spec.rb
+++ b/spec/jobs/migrate_group_flair_images_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe Jobs::MigrateGroupFlairImages do
     group.reload
     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(upload.url)
     expect(group[:flair_url]).to eq(nil)
   end
 
diff --git a/spec/jobs/notify_mailing_list_subscribers_spec.rb b/spec/jobs/notify_mailing_list_subscribers_spec.rb
index 8b09123a44..d0d2f758fd 100644
--- a/spec/jobs/notify_mailing_list_subscribers_spec.rb
+++ b/spec/jobs/notify_mailing_list_subscribers_spec.rb
@@ -137,6 +137,35 @@ describe Jobs::NotifyMailingListSubscribers do
         include_examples "no emails"
       end
 
+      context "mute all categories by default setting" do
+        before { SiteSetting.mute_all_categories_by_default = true }
+        include_examples "no emails"
+      end
+
+      context "mute all categories by default setting but user is watching category" do
+        before do
+          SiteSetting.mute_all_categories_by_default = true
+          CategoryUser.create(user: mailing_list_user, category: post.topic.category, notification_level: CategoryUser.notification_levels[:watching])
+        end
+        include_examples "one email"
+      end
+
+      context "mute all categories by default setting but user is watching tag" do
+        before do
+          SiteSetting.mute_all_categories_by_default = true
+          TagUser.create(user: mailing_list_user, tag: tag, notification_level: TagUser.notification_levels[:watching])
+        end
+        include_examples "one email"
+      end
+
+      context "mute all categories by default setting but user is watching topic" do
+        before do
+          SiteSetting.mute_all_categories_by_default = true
+          TopicUser.create(user: mailing_list_user, topic: post.topic, notification_level: TopicUser.notification_levels[:watching])
+        end
+        include_examples "one email"
+      end
+
       context "from a muted tag" do
         before { TagUser.create(user: mailing_list_user, tag: tag, notification_level: TagUser.notification_levels[:muted]) }
         include_examples "no emails"
diff --git a/spec/jobs/notify_tag_change_spec.rb b/spec/jobs/notify_tag_change_spec.rb
index 5215f0fa34..b9b3ac1c51 100644
--- a/spec/jobs/notify_tag_change_spec.rb
+++ b/spec/jobs/notify_tag_change_spec.rb
@@ -35,4 +35,30 @@ describe ::Jobs::NotifyTagChange do
     )
     expect { described_class.new.execute(post_id: post.id, notified_user_ids: [regular_user.id]) }.not_to change { Notification.count }
   end
+
+  context 'hidden tag' do
+    let!(:hidden_group) { Fabricate(:group, name: 'hidden_group') }
+    let!(:hidden_tag_group) { Fabricate(:tag_group, name: 'hidden', permissions: [[hidden_group.id, :full]]) }
+    let!(:topic_user) { Fabricate(:topic_user, user: user, topic: post.topic, notification_level: TopicUser.notification_levels[:watching]) }
+
+    it 'does not create notification for watching user who does not belong to group' do
+      TagGroupMembership.create!(tag_group_id: hidden_tag_group.id, tag_id: tag.id)
+
+      expect { described_class.new.execute(post_id: post.id, notified_user_ids: [regular_user.id], diff_tags: [tag.name]) }.not_to change { Notification.count }
+
+      Fabricate(:group_user, group: hidden_group, user: user)
+
+      expect { described_class.new.execute(post_id: post.id, notified_user_ids: [regular_user.id], diff_tags: [tag.name]) }.to change { Notification.count }
+    end
+
+    it 'creates notification when at least added or removed tag is visible to everyone' do
+      visible_tag = Fabricate(:tag, name: 'visible tag')
+      visible_group = Fabricate(:tag_group, name: 'visible group')
+      TagGroupMembership.create!(tag_group_id: visible_group.id, tag_id: visible_tag.id)
+      TagGroupMembership.create!(tag_group_id: hidden_tag_group.id, tag_id: tag.id)
+
+      expect { described_class.new.execute(post_id: post.id, notified_user_ids: [regular_user.id], diff_tags: [tag.name]) }.not_to change { Notification.count }
+      expect { described_class.new.execute(post_id: post.id, notified_user_ids: [regular_user.id], diff_tags: [tag.name, visible_tag.name]) }.to change { Notification.count }
+    end
+  end
 end
diff --git a/spec/jobs/open_topic_spec.rb b/spec/jobs/open_topic_spec.rb
new file mode 100644
index 0000000000..0dce35c018
--- /dev/null
+++ b/spec/jobs/open_topic_spec.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Jobs::OpenTopic do
+  fab!(:admin) { Fabricate(:admin) }
+
+  fab!(:topic) do
+    Fabricate(:topic_timer, user: admin).topic
+  end
+
+  before do
+    topic.update!(closed: true)
+  end
+
+  it 'should work' do
+    freeze_time(61.minutes.from_now) do
+      described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
+
+      expect(topic.reload.open?).to eq(true)
+
+      expect(Post.last.raw).to eq(I18n.t(
+        'topic_statuses.autoclosed_disabled_minutes', count: 61
+      ))
+    end
+  end
+
+  it "publishes to the topic message bus so the topic status reloads" do
+    MessageBus.expects(:publish).at_least_once
+    MessageBus.expects(:publish).with("/topic/#{topic.id}", reload_topic: true).once
+    freeze_time(61.minutes.from_now) do
+      described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
+    end
+  end
+
+  describe 'when category has auto close configured' do
+    fab!(:category) do
+      Fabricate(:category,
+                auto_close_based_on_last_post: true,
+                auto_close_hours: 5
+               )
+    end
+
+    fab!(:topic) { Fabricate(:topic, category: category, closed: true) }
+
+    it "should restore the category's auto close timer" do
+      Fabricate(:topic_timer,
+                status_type: TopicTimer.types[:open],
+                topic: topic,
+                user: admin
+               )
+
+      freeze_time(61.minutes.from_now) do
+        described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
+
+        expect(topic.reload.open?).to eq(true)
+
+        topic_timer = topic.public_topic_timer
+
+        expect(topic_timer.status_type).to eq(TopicTimer.types[:close])
+        expect(topic_timer.execute_at).to eq_time(5.hours.from_now)
+      end
+    end
+  end
+
+  describe 'when user is no longer authorized to open topics' do
+    fab!(:user) { Fabricate(:user) }
+
+    fab!(:topic) do
+      Fabricate(:topic_timer, user: user).topic
+    end
+
+    it 'should destroy the topic timer' do
+      topic.update!(closed: true)
+      freeze_time(topic.public_topic_timer.execute_at + 1.minute)
+
+      expect do
+        described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
+      end.to change { TopicTimer.exists?(topic_id: topic.id) }.from(true).to(false)
+
+      expect(topic.reload.open?).to eq(false)
+    end
+
+    it "should reconfigure topic timer if category's topics are set to autoclose" do
+      category = Fabricate(:category,
+        auto_close_based_on_last_post: true,
+        auto_close_hours: 5
+      )
+
+      topic = Fabricate(:topic, category: category)
+      topic.public_topic_timer.update!(user: user)
+      topic.reload
+
+      freeze_time(topic.public_topic_timer.execute_at + 1.minute)
+
+      expect do
+        described_class.new.execute(
+          topic_timer_id: topic.public_topic_timer.id,
+          state: true
+        )
+      end.to change { topic.reload.public_topic_timer.user }.from(user).to(Discourse.system_user)
+        .and change { topic.public_topic_timer.id }
+
+      expect(topic.reload.closed).to eq(false)
+    end
+  end
+end
diff --git a/spec/jobs/poll_mailbox_spec.rb b/spec/jobs/poll_mailbox_spec.rb
index 267913034d..d3233f5ab3 100644
--- a/spec/jobs/poll_mailbox_spec.rb
+++ b/spec/jobs/poll_mailbox_spec.rb
@@ -23,6 +23,23 @@ describe Jobs::PollMailbox do
   end
 
   describe ".poll_pop3" do
+    # the date is dynamic here because there is a 1 week cutoff for
+    # the pop3 polling
+    let(:example_email) do
+      email = <<~EMAIL
+        Return-Path: <one@foo.com>
+        From: One <one@foo.com>
+        To: team@bar.com
+        Subject: Testing email
+        Date: #{1.day.ago.strftime("%a, %d %b %Y")} 03:12:43 +0100
+        Message-ID: <34@foo.bar.mail>
+        Mime-Version: 1.0
+        Content-Type: text/plain
+        Content-Transfer-Encoding: 7bit
+
+        This is an email example.
+      EMAIL
+    end
 
     context "pop errors" do
       before do
@@ -55,6 +72,34 @@ describe Jobs::PollMailbox do
         expect(AdminDashboardData.problem_message_check(i18n_key))
           .to eq(I18n.t(i18n_key, base_path: Discourse.base_path))
       end
+
+      it "logs an error when pop fails and continues with next message" do
+        mail1 = Net::POPMail.new(1, nil, nil, nil)
+        mail2 = Net::POPMail.new(2, nil, nil, nil)
+        mail3 = Net::POPMail.new(3, nil, nil, nil)
+        mail4 = Net::POPMail.new(4, nil, nil, nil)
+
+        Net::POP3.any_instance.stubs(:start).yields(Net::POP3.new(nil, nil))
+        Net::POP3.any_instance.stubs(:mails).returns([mail1, mail2, mail3, mail4])
+
+        mail1.expects(:pop).raises(Net::POPError).once
+        mail1.expects(:delete).never
+
+        mail2.expects(:pop).returns(example_email).once
+        mail2.expects(:delete).raises(Net::POPError).once
+
+        mail3.expects(:pop).returns(example_email).once
+        mail3.expects(:delete).never
+
+        mail4.expects(:pop).returns(example_email).once
+        mail4.expects(:delete).returns(example_email).once
+
+        SiteSetting.pop3_polling_delete_from_server = true
+
+        poller.expects(:mail_too_old?).returns(false).then.raises(RuntimeError).then.returns(false).times(3)
+        poller.expects(:process_popmail).times(2)
+        poller.poll_pop3
+      end
     end
 
     it "calls enable_ssl when the setting is enabled" do
@@ -72,14 +117,21 @@ describe Jobs::PollMailbox do
     end
 
     context "has emails" do
+      let(:oldmail) { file_from_fixtures("old_destination.eml", "emails").read }
+
       before do
-        mail1 = Net::POPMail.new(3, nil, nil, nil)
-        mail2 = Net::POPMail.new(3, nil, nil, nil)
+        mail1 = Net::POPMail.new(1, nil, nil, nil)
+        mail2 = Net::POPMail.new(2, nil, nil, nil)
         mail3 = Net::POPMail.new(3, nil, nil, nil)
+        mail4 = Net::POPMail.new(4, nil, nil, nil)
         Net::POP3.any_instance.stubs(:start).yields(Net::POP3.new(nil, nil))
-        Net::POP3.any_instance.stubs(:mails).returns([mail1, mail2, mail3])
+        Net::POP3.any_instance.stubs(:mails).returns([mail1, mail2, mail3, mail4])
         Net::POP3.any_instance.expects(:delete_all).never
-        poller.stubs(:process_popmail)
+        mail1.stubs(:pop).returns(example_email)
+        mail2.stubs(:pop).returns(example_email)
+        mail3.stubs(:pop).returns(example_email)
+        mail4.stubs(:pop).returns(oldmail)
+        poller.expects(:process_popmail).times(3)
       end
 
       it "deletes emails from server when when deleting emails from server is enabled" do
@@ -93,6 +145,17 @@ describe Jobs::PollMailbox do
         SiteSetting.pop3_polling_delete_from_server = false
         poller.poll_pop3
       end
+
+      it "does not process emails > 1 week old" do
+        SiteSetting.pop3_polling_delete_from_server = false
+        poller.poll_pop3
+      end
+
+      it "does not stop after an old email" do
+        SiteSetting.pop3_polling_delete_from_server = false
+        poller.expects(:mail_too_old?).returns(false, true, false, false).times(4)
+        poller.poll_pop3
+      end
     end
   end
 
@@ -100,7 +163,7 @@ describe Jobs::PollMailbox do
     def process_popmail(email_name)
       pop_mail = stub("pop mail")
       pop_mail.expects(:pop).returns(email(email_name))
-      Jobs::PollMailbox.new.process_popmail(pop_mail)
+      Jobs::PollMailbox.new.process_popmail(pop_mail.pop)
     end
 
     it "does not reply to a bounced email" do
diff --git a/spec/jobs/post_update_topic_tracking_state_spec.rb b/spec/jobs/post_update_topic_tracking_state_spec.rb
new file mode 100644
index 0000000000..f69c163152
--- /dev/null
+++ b/spec/jobs/post_update_topic_tracking_state_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Jobs::PostUpdateTopicTrackingState do
+  fab!(:post) { Fabricate(:post) }
+
+  it 'should publish messages' do
+    messages = MessageBus.track_publish { subject.execute({ post_id: post.id }) }
+    expect(messages.size).not_to eq(0)
+  end
+
+  it 'should not publish messages for deleted topics' do
+    post.topic.trash!
+    messages = MessageBus.track_publish { subject.execute({ post_id: post.id }) }
+    expect(messages.size).to eq(0)
+  end
+end
diff --git a/spec/jobs/process_email_spec.rb b/spec/jobs/process_email_spec.rb
index 54cd12ef70..0a98d1255a 100644
--- a/spec/jobs/process_email_spec.rb
+++ b/spec/jobs/process_email_spec.rb
@@ -7,7 +7,7 @@ describe Jobs::ProcessEmail do
   let(:mail) { "From: foo@bar.com\nTo: bar@foo.com\nSubject: FOO BAR\n\nFoo foo bar bar?" }
 
   it "process an email without retry" do
-    Email::Processor.expects(:process!).with(mail, retry_on_rate_limit: false)
+    Email::Processor.expects(:process!).with(mail, retry_on_rate_limit: false, source: nil)
     Jobs::ProcessEmail.new.execute(mail: mail)
   end
 
diff --git a/spec/jobs/process_post_spec.rb b/spec/jobs/process_post_spec.rb
index 35794be295..0bc38d6fde 100644
--- a/spec/jobs/process_post_spec.rb
+++ b/spec/jobs/process_post_spec.rb
@@ -77,6 +77,18 @@ describe Jobs::ProcessPost do
       post.reload
       expect(post.cooked).to eq(cooked)
     end
+
+    it "updates the topic excerpt when first post" do
+      post = Fabricate(:post, raw: "Some OP content", cooked: "")
+      post.topic.update_excerpt("Incorrect")
+
+      Jobs::ProcessPost.new.execute(post_id: post.id)
+      expect(post.topic.reload.excerpt).to eq("Some OP content")
+
+      post2 = Fabricate(:post, raw: "Some reply content", cooked: "", topic: post.topic)
+      Jobs::ProcessPost.new.execute(post_id: post2.id)
+      expect(post.topic.reload.excerpt).to eq("Some OP content")
+    end
   end
 
 end
diff --git a/spec/jobs/process_shelved_notifications_spec.rb b/spec/jobs/process_shelved_notifications_spec.rb
new file mode 100644
index 0000000000..eca634330c
--- /dev/null
+++ b/spec/jobs/process_shelved_notifications_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Jobs::ProcessShelvedNotifications do
+  fab!(:user) { Fabricate(:user) }
+  let(:post) { Fabricate(:post) }
+
+  it "removes all past do not disturb timings" do
+    future = Fabricate(:do_not_disturb_timing, ends_at: 1.day.from_now)
+    past = Fabricate(:do_not_disturb_timing, starts_at: 2.day.ago, ends_at: 1.minute.ago)
+
+    expect {
+      subject.execute({})
+    }.to change { DoNotDisturbTiming.count }.by (-1)
+    expect(DoNotDisturbTiming.find_by(id: future.id)).to eq(future)
+    expect(DoNotDisturbTiming.find_by(id: past.id)).to eq(nil)
+  end
+
+  it "does not process shelved_notifications when the user is in DND" do
+    user.do_not_disturb_timings.create(starts_at: 2.days.ago, ends_at: 2.days.from_now)
+    notification = Notification.create(read: false, user_id: user.id, topic_id: 2, post_number: 1, data: '{}', notification_type: 1)
+    expect(notification.shelved_notification).to be_present
+    subject.execute({})
+    expect(notification.shelved_notification).to be_present
+  end
+
+  it "processes and destroys shelved_notifications when the user leaves DND" do
+    user.do_not_disturb_timings.create(starts_at: 2.days.ago, ends_at: 2.days.from_now)
+    notification = Notification.create(read: false, user_id: user.id, topic_id: 2, post_number: 1, data: '{}', notification_type: 1)
+    user.do_not_disturb_timings.last.update(ends_at: 1.days.ago)
+
+    expect(notification.shelved_notification).to be_present
+    subject.execute({})
+    expect { notification.shelved_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+  end
+end
diff --git a/spec/jobs/publish_topic_to_category_spec.rb b/spec/jobs/publish_topic_to_category_spec.rb
index 7ec605e6e6..7d895de0ca 100644
--- a/spec/jobs/publish_topic_to_category_spec.rb
+++ b/spec/jobs/publish_topic_to_category_spec.rb
@@ -12,7 +12,9 @@ RSpec.describe Jobs::PublishTopicToCategory do
     Fabricate(:topic_timer,
       status_type: TopicTimer.types[:publish_to_category],
       category_id: another_category.id,
-      topic: topic
+      topic: topic,
+      execute_at: 1.minute.ago,
+      created_at: 5.minutes.ago
     )
 
     Fabricate(:post, topic: topic)
@@ -131,7 +133,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 eq_time(5.hours.from_now)
+      expect(topic_timer.execute_at).to be_within_one_second_of(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 adb7a56d7e..3faa9195b8 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -42,6 +42,15 @@ describe Jobs::PullHotlinkedImages do
       Jobs.run_immediately!
     end
 
+    it 'does nothing if topic has been deleted' do
+      post = Fabricate(:post, raw: "<img src='#{image_url}'>")
+      post.topic.destroy!
+
+      expect do
+        Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
+      end.to change { Upload.count }.by(0)
+    end
+
     it 'does nothing if there are no large images to pull' do
       post = Fabricate(:post, raw: 'bob bob')
       orig = post.updated_at
@@ -431,6 +440,23 @@ describe Jobs::PullHotlinkedImages do
       expect(subject.should_download_image?(src)).to eq(false)
     end
 
+    it "returns false for emoji when emoji CDN configured" do
+      SiteSetting.external_emoji_url = "https://emoji.cdn.com"
+
+      src = UrlHelper.cook_url(Emoji.url_for("testemoji.png"))
+      expect(subject.should_download_image?(src)).to eq(false)
+    end
+
+    it "returns false for emoji when app, S3 *and* emoji CDNs configured" do
+      setup_s3
+      SiteSetting.s3_cdn_url = "https://s3.cdn.com"
+      SiteSetting.external_emoji_url = "https://emoji.cdn.com"
+      set_cdn_url "https://mydomain.cdn/test"
+
+      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")
       expect(subject.should_download_image?(src)).to eq(false)
diff --git a/spec/jobs/regular/group_smtp_email_spec.rb b/spec/jobs/regular/group_smtp_email_spec.rb
index 606cd4e087..a3456c510b 100644
--- a/spec/jobs/regular/group_smtp_email_spec.rb
+++ b/spec/jobs/regular/group_smtp_email_spec.rb
@@ -3,13 +3,18 @@
 require 'rails_helper'
 
 RSpec.describe Jobs::GroupSmtpEmail do
-  let(:post) { Fabricate(:post) }
-  let(:group) { Fabricate(:imap_group) }
-  let!(:recipient_user) { Fabricate(:user, email: "test@test.com") }
+  fab!(:post) do
+    topic = Fabricate(:topic)
+    Fabricate(:post, topic: topic)
+    Fabricate(:post, topic: topic)
+  end
+  fab!(:group) { Fabricate(:imap_group) }
+  fab!(:recipient_user) { Fabricate(:user, email: "test@test.com") }
+  let(:post_id) { post.id }
   let(:args) do
     {
       group_id: group.id,
-      post_id: post.id,
+      post_id: post_id,
       email: "test@test.com"
     }
   end
@@ -32,7 +37,8 @@ RSpec.describe Jobs::GroupSmtpEmail do
     subject.execute(args)
     incoming = IncomingEmail.find_by(post_id: post.id, user_id: post.user_id, topic_id: post.topic_id)
     expect(incoming).not_to eq(nil)
-    expect(incoming.message_id).to eq("topic/#{post.topic_id}@test.localhost")
+    expect(incoming.message_id).to eq("topic/#{post.topic_id}/#{post.id}@test.localhost")
+    expect(incoming.created_via).to eq(IncomingEmail.created_via_types[:group_smtp])
   end
 
   it "creates a PostReplyKey and correctly uses it for the email reply_key substitution" do
@@ -42,4 +48,19 @@ RSpec.describe Jobs::GroupSmtpEmail do
     expect(post_reply_key).not_to eq(nil)
     expect(incoming.raw).to include("Reply-To: Discourse <test+#{post_reply_key.reply_key}@incoming.com>")
   end
+
+  it "has the from_address and the to_addresses and subject filled in correctly" do
+    subject.execute(args)
+    incoming = IncomingEmail.find_by(post_id: post.id, user_id: post.user_id, topic_id: post.topic_id)
+    expect(incoming.to_addresses).to eq("test@test.com")
+    expect(incoming.subject).to include("Re: This is a test topic")
+    expect(incoming.from_address).to eq("discourseteam@ponyexpress.com")
+  end
+
+  context "when the post in the argument is the OP" do
+    let(:post_id) { post.topic.posts.first.id }
+    it "aborts and does not send a group SMTP email; the OP is the one that sent the email in the first place" do
+      expect { subject.execute(args) }.not_to(change { IncomingEmail.count })
+    end
+  end
 end
diff --git a/spec/jobs/reindex_search_spec.rb b/spec/jobs/reindex_search_spec.rb
index b6132855e2..3128aeccb1 100644
--- a/spec/jobs/reindex_search_spec.rb
+++ b/spec/jobs/reindex_search_spec.rb
@@ -34,7 +34,7 @@ describe Jobs::ReindexSearch do
     end
   end
 
-  describe 'rebuild_problem_posts' do
+  describe 'rebuild_posts' do
     class FakeIndexer
       def self.index(post, force:)
         get_posts.push(post)
@@ -59,10 +59,7 @@ describe Jobs::ReindexSearch do
       FakeIndexer.reset
     end
 
-    it (
-      'should not reindex posts that belong to a deleted topic ' \
-      'or have been trashed'
-    ) do
+    it "should not reindex posts that belong to a deleted topic or have been trashed" do
       post = Fabricate(:post)
       post2 = Fabricate(:post)
       post3 = Fabricate(:post)
@@ -70,7 +67,7 @@ describe Jobs::ReindexSearch do
       post2.topic.trash!
       post3.trash!
 
-      subject.rebuild_problem_posts(indexer: FakeIndexer)
+      subject.rebuild_posts(indexer: FakeIndexer)
 
       expect(FakeIndexer.posts).to contain_exactly(post)
     end
@@ -78,7 +75,7 @@ describe Jobs::ReindexSearch do
     it 'should not reindex posts with a developmental version' do
       post = Fabricate(:post, version: SearchIndexer::MIN_POST_REINDEX_VERSION + 1)
 
-      subject.rebuild_problem_posts(indexer: FakeIndexer)
+      subject.rebuild_posts(indexer: FakeIndexer)
 
       expect(FakeIndexer.posts).to eq([])
     end
@@ -94,7 +91,7 @@ describe Jobs::ReindexSearch do
 
       post2.save!(validate: false)
 
-      subject.rebuild_problem_posts(indexer: FakeIndexer)
+      subject.rebuild_posts(indexer: FakeIndexer)
 
       expect(FakeIndexer.posts).to contain_exactly(post)
     end
@@ -107,9 +104,7 @@ describe Jobs::ReindexSearch do
 
       [topic, topic2].each { |t| SearchIndexer.index(t, force: true) }
 
-      freeze_time(described_class::CLEANUP_GRACE_PERIOD) do
-        topic.trash!
-      end
+      freeze_time(1.day.ago) { topic.trash! }
 
       expect { subject.execute({}) }.to change { TopicSearchData.count }.by(-1)
       expect(Topic.pluck(:id)).to contain_exactly(topic2.id)
@@ -119,11 +114,7 @@ describe Jobs::ReindexSearch do
       )
     end
 
-    it(
-      "should clean up post_search_data of posts with empty raw or posts from " \
-      "trashed topics"
-    ) do
-
+    it "should clean up post_search_data of posts with empty raw or posts from trashed topics" do
       post = Fabricate(:post)
       post2 = Fabricate(:post, post_type: Post.types[:small_action])
       post2.raw = ""
@@ -132,7 +123,7 @@ describe Jobs::ReindexSearch do
       post3.topic.trash!
       post4, post5, post6 = nil
 
-      freeze_time(described_class::CLEANUP_GRACE_PERIOD) do
+      freeze_time(1.day.ago) do
         post4 = Fabricate(:post)
         post4.topic.trash!
 
diff --git a/spec/jobs/reviewable_priorities_spec.rb b/spec/jobs/reviewable_priorities_spec.rb
index 22276374fd..65f232fee1 100644
--- a/spec/jobs/reviewable_priorities_spec.rb
+++ b/spec/jobs/reviewable_priorities_spec.rb
@@ -6,42 +6,78 @@ describe Jobs::ReviewablePriorities do
 
   it "needs returns 0s with no existing reviewables" do
     Jobs::ReviewablePriorities.new.execute({})
-    expect(Reviewable.min_score_for_priority(:low)).to eq(0.0)
-    expect(Reviewable.min_score_for_priority(:medium)).to eq(0.0)
-    expect(Reviewable.min_score_for_priority(:high)).to eq(0.0)
+
+    expect_min_score(:low, 0.0)
+    expect_min_score(:medium, 0.0)
+    expect_min_score(:high, 0.0)
     expect(Reviewable.score_required_to_hide_post).to eq(8.33)
   end
 
-  fab!(:u0) { Fabricate(:user) }
-  fab!(:u1) { Fabricate(:user) }
+  fab!(:user_0) { Fabricate(:user) }
+  fab!(:user_1) { Fabricate(:user) }
 
-  def create_reviewables(count)
-    (1..count).each do |i|
-      r = Fabricate(:reviewable_flagged_post)
-      r.add_score(u0, PostActionType.types[:off_topic])
-      r.add_score(u1, PostActionType.types[:off_topic])
-      r.update!(score: i)
+  def create_reviewables(count, status: :approved)
+    minimum_threshold = SiteSetting.reviewable_low_priority_threshold
+    (1..count).each { |i| create_with_score(minimum_threshold + i) }
+  end
+
+  def create_with_score(score, status: :approved)
+    Fabricate(:reviewable_flagged_post, status: Reviewable.statuses[status]).tap do |reviewable|
+      reviewable.add_score(user_0, PostActionType.types[:off_topic])
+      reviewable.add_score(user_1, PostActionType.types[:off_topic])
+      reviewable.update!(score: score)
     end
   end
 
   it "needs a minimum amount of reviewables before it calculates anything" do
     create_reviewables(5)
+
     Jobs::ReviewablePriorities.new.execute({})
-    expect(Reviewable.min_score_for_priority(:low)).to eq(0.0)
-    expect(Reviewable.min_score_for_priority(:medium)).to eq(0.0)
-    expect(Reviewable.min_score_for_priority(:high)).to eq(0.0)
+
+    expect_min_score(:low, 0.0)
+    expect_min_score(:medium, 0.0)
+    expect_min_score(:high, 0.0)
     expect(Reviewable.score_required_to_hide_post).to eq(8.33)
   end
 
   it "will set priorities based on the maximum score" do
     create_reviewables(Jobs::ReviewablePriorities.min_reviewables)
+
     Jobs::ReviewablePriorities.new.execute({})
 
-    expect(Reviewable.min_score_for_priority(:low)).to eq(0.0)
-    expect(Reviewable.min_score_for_priority(:medium)).to eq(8.0)
-    expect(Reviewable.min_score_for_priority('medium')).to eq(8.0)
-    expect(Reviewable.min_score_for_priority(:high)).to eq(13.0)
-    expect(Reviewable.score_required_to_hide_post).to eq(8.66)
+    expect_min_score(:low, SiteSetting.reviewable_low_priority_threshold)
+    expect_min_score(:medium, 9.0)
+    expect_min_score(:high, 14.0)
+    expect(Reviewable.score_required_to_hide_post).to eq(9.33)
   end
 
+  it 'ignore negative scores when calculating priorities' do
+    create_reviewables(Jobs::ReviewablePriorities.min_reviewables)
+    negative_score = -9
+    10.times { create_with_score(negative_score) }
+
+    Jobs::ReviewablePriorities.new.execute({})
+
+    expect_min_score(:low, SiteSetting.reviewable_low_priority_threshold)
+    expect_min_score(:medium, 9.0)
+    expect_min_score(:high, 14.0)
+    expect(Reviewable.score_required_to_hide_post).to eq(9.33)
+  end
+
+  it 'ignores non-approved reviewables' do
+    create_reviewables(Jobs::ReviewablePriorities.min_reviewables)
+    low_score = 2
+    10.times { create_with_score(low_score, status: :pending) }
+
+    Jobs::ReviewablePriorities.new.execute({})
+
+    expect_min_score(:low, SiteSetting.reviewable_low_priority_threshold)
+    expect_min_score(:medium, 9.0)
+    expect_min_score(:high, 14.0)
+    expect(Reviewable.score_required_to_hide_post).to eq(9.33)
+  end
+
+  def expect_min_score(priority, score)
+    expect(Reviewable.min_score_for_priority(priority)).to eq(score)
+  end
 end
diff --git a/spec/jobs/sync_topic_user_bookmarked_spec.rb b/spec/jobs/sync_topic_user_bookmarked_spec.rb
new file mode 100644
index 0000000000..25a0e14dbb
--- /dev/null
+++ b/spec/jobs/sync_topic_user_bookmarked_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Jobs::SyncTopicUserBookmarked do
+  it "corrects all topic_users.bookmarked records for the topic" do
+    topic = Fabricate(:topic)
+    Fabricate(:post, topic: topic)
+    Fabricate(:post, topic: topic)
+    Fabricate(:post, topic: topic)
+
+    tu1 = Fabricate(:topic_user, topic: topic, bookmarked: false)
+    tu2 = Fabricate(:topic_user, topic: topic, bookmarked: false)
+    tu3 = Fabricate(:topic_user, topic: topic, bookmarked: true)
+    tu4 = Fabricate(:topic_user, topic: topic, bookmarked: true)
+    tu5 = Fabricate(:topic_user, bookmarked: false)
+
+    Fabricate(:bookmark, user: tu1.user, topic: topic, post: topic.posts.sample)
+    Fabricate(:bookmark, user: tu4.user, topic: topic, post: topic.posts.sample)
+
+    subject.execute(topic_id: topic.id)
+
+    expect(tu1.reload.bookmarked).to eq(true)
+    expect(tu2.reload.bookmarked).to eq(false)
+    expect(tu3.reload.bookmarked).to eq(false)
+    expect(tu4.reload.bookmarked).to eq(true)
+    expect(tu5.reload.bookmarked).to eq(false)
+  end
+
+  it "works when no topic id is provided (runs for all topics)" do
+    topic = Fabricate(:topic)
+    Fabricate(:post, topic: topic)
+    Fabricate(:post, topic: topic)
+    Fabricate(:post, topic: topic)
+
+    tu1 = Fabricate(:topic_user, topic: topic, bookmarked: false)
+    tu2 = Fabricate(:topic_user, topic: topic, bookmarked: false)
+    tu3 = Fabricate(:topic_user, topic: topic, bookmarked: true)
+    tu4 = Fabricate(:topic_user, topic: topic, bookmarked: true)
+    tu5 = Fabricate(:topic_user, bookmarked: false)
+
+    Fabricate(:bookmark, user: tu1.user, topic: topic, post: topic.posts.sample)
+    Fabricate(:bookmark, user: tu4.user, topic: topic, post: topic.posts.sample)
+
+    subject.execute
+
+    expect(tu1.reload.bookmarked).to eq(true)
+    expect(tu2.reload.bookmarked).to eq(false)
+    expect(tu3.reload.bookmarked).to eq(false)
+    expect(tu4.reload.bookmarked).to eq(true)
+    expect(tu5.reload.bookmarked).to eq(false)
+  end
+end
diff --git a/spec/jobs/topic_timer_enqueuer_spec.rb b/spec/jobs/topic_timer_enqueuer_spec.rb
new file mode 100644
index 0000000000..b9f21ed12c
--- /dev/null
+++ b/spec/jobs/topic_timer_enqueuer_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Jobs::TopicTimerEnqueuer do
+  subject { described_class.new }
+
+  fab!(:timer1) do
+    Fabricate(:topic_timer, execute_at: 1.minute.ago, created_at: 1.hour.ago, status_type: TopicTimer.types[:close])
+  end
+  fab!(:timer2) do
+    Fabricate(:topic_timer, execute_at: 1.minute.ago, created_at: 1.hour.ago, status_type: TopicTimer.types[:open])
+  end
+  fab!(:future_timer) do
+    Fabricate(:topic_timer, execute_at: 1.hours.from_now, created_at: 1.hour.ago, status_type: TopicTimer.types[:close])
+  end
+  fab!(:deleted_timer) do
+    Fabricate(:topic_timer, execute_at: 1.minute.ago, created_at: 1.hour.ago, status_type: TopicTimer.types[:close])
+  end
+
+  before do
+    deleted_timer.trash!
+  end
+
+  it "does not enqueue deleted timers" do
+    expect_not_enqueued_with(job: :close_topic, args: { topic_timer_id: deleted_timer.id })
+    subject.execute
+    expect(deleted_timer.topic.reload.closed?).to eq(false)
+  end
+
+  it "does not enqueue future timers" do
+    expect_not_enqueued_with(job: :close_topic, args: { topic_timer_id: future_timer.id })
+    subject.execute
+    expect(future_timer.topic.reload.closed?).to eq(false)
+  end
+
+  it "enqueues the related job" do
+    expect_not_enqueued_with(job: :close_topic, args: { topic_timer_id: deleted_timer.id })
+    expect_not_enqueued_with(job: :close_topic, args: { topic_timer_id: future_timer.id })
+    subject.execute
+    expect_job_enqueued(job: :close_topic, args: { topic_timer_id: timer1.id })
+    expect_job_enqueued(job: :open_topic, args: { topic_timer_id: timer2.id })
+  end
+
+  it "does not re-enqueue a job that has already been scheduled ahead of time in sidekiq (legacy topic timers)" do
+    expect_not_enqueued_with(job: :close_topic, args: { topic_timer_id: timer1.id })
+    Jobs.enqueue_at(1.hours.from_now, :close_topic, topic_timer_id: timer1.id)
+    subject.execute
+  end
+end
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index 8caff3c5c2..c91ed8e6d0 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -321,6 +321,15 @@ describe Jobs::UserEmail do
           expect(mail.body).not_to include("This email change was requested by a site admin.")
         end
       end
+
+      context "when requested_by record is not present" do
+        let(:requested_by) { nil }
+        it "passes along false for the requested_by_admin param which changes the wording in the email" do
+          Jobs::UserEmail.new.execute(type: :confirm_new_email, user_id: user.id, email_token: email_token.token)
+          mail = ActionMailer::Base.deliveries.first
+          expect(mail.body).not_to include("This email change was requested by a site admin.")
+        end
+      end
     end
 
     context "post" do
@@ -483,6 +492,19 @@ describe Jobs::UserEmail do
         )
       end
 
+      it "sends the mail if the user enabled mailing list mode, but mailing list mode is disabled globally" do
+        user.user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 1)
+
+        Jobs::UserEmail.new.execute(
+          type: :user_mentioned,
+          user_id: user.id,
+          post_id: post.id,
+          notification_id: notification.id
+        )
+
+        expect(ActionMailer::Base.deliveries.first.to).to contain_exactly(user.email)
+      end
+
       context "recently seen" do
         it "doesn't send an email to a user that's been recently seen" do
           user.update!(last_seen_at: 9.minutes.ago)
@@ -618,6 +640,8 @@ describe Jobs::UserEmail do
       end
 
       it "doesn't send the mail if the user is using individual mailing list mode" do
+        SiteSetting.disable_mailing_list_mode = false
+
         user.user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 1)
         # sometimes, we pass the notification_id
         Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_id: notification.id, post_id: post.id)
@@ -634,6 +658,8 @@ describe Jobs::UserEmail do
       end
 
       it "doesn't send the mail if the user is using individual mailing list mode with no echo" do
+        SiteSetting.disable_mailing_list_mode = false
+
         user.user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 2)
         # sometimes, we pass the notification_id
         Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_id: notification.id, post_id: post.id)
diff --git a/spec/lib/backup_restore/backup_file_handler_spec.rb b/spec/lib/backup_restore/backup_file_handler_spec.rb
index c9a12aac2d..80a0e62b80 100644
--- a/spec/lib/backup_restore/backup_file_handler_spec.rb
+++ b/spec/lib/backup_restore/backup_file_handler_spec.rb
@@ -7,7 +7,8 @@ describe BackupRestore::BackupFileHandler do
   include_context "shared stuff"
 
   def expect_decompress_and_clean_up_to_work(backup_filename:, expected_dump_filename: "dump.sql",
-                                             require_metadata_file:, require_uploads:, expected_upload_paths: nil)
+                                             require_metadata_file:, require_uploads:, expected_upload_paths: nil,
+                                             location: nil)
 
     freeze_time(DateTime.parse('2019-12-24 14:31:48'))
 
@@ -18,7 +19,11 @@ describe BackupRestore::BackupFileHandler do
 
     Dir.mktmpdir do |root_directory|
       current_db = RailsMultisite::ConnectionManagement.current_db
-      file_handler = BackupRestore::BackupFileHandler.new(logger, backup_filename, current_db, root_directory)
+      file_handler = BackupRestore::BackupFileHandler.new(
+        logger, backup_filename, current_db,
+        root_tmp_directory: root_directory,
+        location: location
+      )
       tmp_directory, db_dump_path = file_handler.decompress
 
       expected_tmp_path = File.join(root_directory, "tmp/restores", current_db, "2019-12-24-143148")
@@ -101,4 +106,18 @@ describe BackupRestore::BackupFileHandler do
       end
     end
   end
+
+  it "allows overriding the backup store" do
+    SiteSetting.s3_backup_bucket = "s3-backup-bucket"
+    SiteSetting.s3_access_key_id = "s3-access-key-id"
+    SiteSetting.s3_secret_access_key = "s3-secret-access-key"
+    SiteSetting.backup_location = BackupLocationSiteSetting::S3
+
+    expect_decompress_and_clean_up_to_work(
+      backup_filename: "backup_since_v1.6.tar.gz",
+      require_metadata_file: false,
+      require_uploads: true,
+      location: BackupLocationSiteSetting::LOCAL
+    )
+  end
 end
diff --git a/spec/lib/backup_restore/database_restorer_spec.rb b/spec/lib/backup_restore/database_restorer_spec.rb
index a11c8cc34f..351406e1e3 100644
--- a/spec/lib/backup_restore/database_restorer_spec.rb
+++ b/spec/lib/backup_restore/database_restorer_spec.rb
@@ -35,11 +35,11 @@ describe BackupRestore::DatabaseRestorer do
   end
 
   def expect_db_migrate
-    Discourse::Utils.expects(:execute_command).with do |env, command, options|
+    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" &&
+        command == ["rake", "db:migrate"] &&
         options[:chdir] == Rails.root
     end.once
   end
diff --git a/spec/lib/backup_restore/shared_examples_for_backup_store.rb b/spec/lib/backup_restore/shared_examples_for_backup_store.rb
index 679bc9aa79..f6d3fbab3d 100644
--- a/spec/lib/backup_restore/shared_examples_for_backup_store.rb
+++ b/spec/lib/backup_restore/shared_examples_for_backup_store.rb
@@ -88,7 +88,7 @@ shared_examples "backup store" do
         report_type = "storage_stats"
         report = Report.find(report_type)
 
-        Report.cache(report, 35.minutes)
+        Report.cache(report)
         expect(Report.find_cached(report_type)).to be_present
 
         store.reset_cache
diff --git a/spec/lib/backup_restore/uploads_restorer_spec.rb b/spec/lib/backup_restore/uploads_restorer_spec.rb
index 3a3729bed2..f4fb16ec48 100644
--- a/spec/lib/backup_restore/uploads_restorer_spec.rb
+++ b/spec/lib/backup_restore/uploads_restorer_spec.rb
@@ -25,17 +25,20 @@ describe BackupRestore::UploadsRestorer do
     )
   end
 
-  def expect_remap(source_site_name: nil, target_site_name:, metadata: [], from:, to:, &block)
+  def expect_remap(source_site_name: nil, target_site_name:, metadata: [], from:, to:, regex: false, &block)
     expect_remaps(
       source_site_name: source_site_name,
       target_site_name: target_site_name,
       metadata: metadata,
-      remaps: [{ from: from, to: to }],
+      remaps: [{ from: from, to: to, regex: regex }],
       &block
     )
   end
 
   def expect_remaps(source_site_name: nil, target_site_name:, metadata: [], remaps: [], &block)
+    regex_remaps = remaps.select { |r| r[:regex] }
+    remaps.delete_if { |r| r.delete(:regex) }
+
     source_site_name ||= metadata.find { |d| d[:name] == "db_name" }&.dig(:value) || "default"
 
     if source_site_name != target_site_name
@@ -57,6 +60,15 @@ describe BackupRestore::UploadsRestorer do
         end.times(remaps.size)
       end
 
+      if regex_remaps.blank?
+        DbHelper.expects(:regexp_replace).never
+      else
+        DbHelper.expects(:regexp_replace).with do |from, to, args|
+          args[:excluded_tables]&.include?("backup_metadata")
+          regex_remaps.shift == { from: from, to: to }
+        end.times(regex_remaps.size)
+      end
+
       if target_site_name == "default"
         setup_and_restore(directory, metadata)
       else
@@ -78,6 +90,10 @@ describe BackupRestore::UploadsRestorer do
     "/#{path}/"
   end
 
+  def s3_url_regex(bucket, path)
+    Regexp.escape("//#{bucket}") + %q*\.s3(?:\.dualstack\.[a-z0-9\-]+?|[.\-][a-z0-9\-]+?)?\.amazonaws\.com* + Regexp.escape(path)
+  end
+
   context "uploads" do
     let!(:multisite) { { name: "multisite", value: true } }
     let!(:no_multisite) { { name: "multisite", value: false } }
@@ -289,8 +305,9 @@ describe BackupRestore::UploadsRestorer do
               expect_remap(
                 target_site_name: target_site_name,
                 metadata: [no_multisite, s3_base_url],
-                from: "//old-bucket.s3-us-east-1.amazonaws.com/",
-                to: uploads_path(target_site_name)
+                from: s3_url_regex("old-bucket", "/"),
+                to: uploads_path(target_site_name),
+                regex: true
               )
             end
 
@@ -311,8 +328,9 @@ describe BackupRestore::UploadsRestorer do
               expect_remap(
                 target_site_name: target_site_name,
                 metadata: [source_db_name, multisite, s3_base_url],
-                from: "//old-bucket.s3-us-east-1.amazonaws.com/",
-                to: "/"
+                from: s3_url_regex("old-bucket", "/"),
+                to: "/",
+                regex: true
               )
             end
 
@@ -430,8 +448,9 @@ describe BackupRestore::UploadsRestorer do
               expect_remap(
                 target_site_name: target_site_name,
                 metadata: [no_multisite, s3_base_url],
-                from: "//old-bucket.s3-us-east-1.amazonaws.com/",
-                to: uploads_path(target_site_name)
+                from: s3_url_regex("old-bucket", "/"),
+                to: uploads_path(target_site_name),
+                regex: true
               )
             end
 
@@ -454,8 +473,9 @@ describe BackupRestore::UploadsRestorer do
               expect_remap(
                 target_site_name: target_site_name,
                 metadata: [source_db_name, multisite, s3_base_url],
-                from: "//old-bucket.s3-us-east-1.amazonaws.com/",
-                to: "/"
+                from: s3_url_regex("old-bucket", "/"),
+                to: "/",
+                regex: true
               )
             end
 
@@ -532,6 +552,27 @@ describe BackupRestore::UploadsRestorer do
     end
   end
 
+  describe ".s3_regex_string" do
+    def regex_matches(s3_base_url)
+      regex, _ = BackupRestore::UploadsRestorer.s3_regex_string(s3_base_url)
+      expect(Regexp.new(regex)).to match(s3_base_url)
+    end
+
+    it "correctly matches different S3 base URLs" do
+      regex_matches("//some-bucket.s3.amazonaws.com/")
+      regex_matches("//some-bucket.s3.us-west-2.amazonaws.com/")
+      regex_matches("//some-bucket.s3-us-west-2.amazonaws.com/")
+      regex_matches("//some-bucket.s3.dualstack.us-west-2.amazonaws.com/")
+      regex_matches("//some-bucket.s3.cn-north-1.amazonaws.com.cn/")
+
+      regex_matches("//some-bucket.s3.amazonaws.com/foo/")
+      regex_matches("//some-bucket.s3.us-east-2.amazonaws.com/foo/")
+      regex_matches("//some-bucket.s3-us-east-2.amazonaws.com/foo/")
+      regex_matches("//some-bucket.s3.dualstack.us-east-2.amazonaws.com/foo/")
+      regex_matches("//some-bucket.s3.cn-north-1.amazonaws.com.cn/foo/")
+    end
+  end
+
   it "raises an exception when the store doesn't support the copy_from method" do
     Discourse.stubs(:store).returns(Object.new)
 
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index bd0836329c..bf9f1d2f54 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -159,7 +159,7 @@ RSpec.describe BookmarkManager do
     end
 
     context "if the bookmark no longer exists" do
-      it "raises an invalid access error" do
+      it "raises a not found error" do
         expect { subject.destroy(9999) }.to raise_error(Discourse::NotFound)
       end
     end
@@ -220,7 +220,7 @@ RSpec.describe BookmarkManager do
       before do
         bookmark.destroy!
       end
-      it "raises an invalid access error" do
+      it "raises a not found error" do
         expect { update_bookmark }.to raise_error(Discourse::NotFound)
       end
     end
@@ -293,4 +293,36 @@ RSpec.describe BookmarkManager do
       Notification.where(notification_type: Notification.types[:bookmark_reminder], user_id: bookmark.user.id)
     end
   end
+
+  describe ".toggle_pin" do
+    let!(:bookmark) { Fabricate(:bookmark, user: user) }
+
+    it "sets pinned to false if it is true" do
+      bookmark.update(pinned: true)
+      subject.toggle_pin(bookmark_id: bookmark.id)
+      expect(bookmark.reload.pinned).to eq(false)
+    end
+
+    it "sets pinned to true if it is false" do
+      bookmark.update(pinned: false)
+      subject.toggle_pin(bookmark_id: bookmark.id)
+      expect(bookmark.reload.pinned).to eq(true)
+    end
+
+    context "if the bookmark is belonging to some other user" do
+      let!(:bookmark) { Fabricate(:bookmark, user: Fabricate(:admin)) }
+      it "raises an invalid access error" do
+        expect { subject.toggle_pin(bookmark_id: bookmark.id) }.to raise_error(Discourse::InvalidAccess)
+      end
+    end
+
+    context "if the bookmark no longer exists" do
+      before do
+        bookmark.destroy!
+      end
+      it "raises a not found error" do
+        expect { subject.toggle_pin(bookmark_id: bookmark.id) }.to raise_error(Discourse::NotFound)
+      end
+    end
+  end
 end
diff --git a/spec/lib/bookmark_query_spec.rb b/spec/lib/bookmark_query_spec.rb
index 4f11254ad8..f75156ce6c 100644
--- a/spec/lib/bookmark_query_spec.rb
+++ b/spec/lib/bookmark_query_spec.rb
@@ -173,6 +173,7 @@ RSpec.describe BookmarkQuery do
     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,
@@ -182,5 +183,17 @@ RSpec.describe BookmarkQuery do
         bookmark3.id
       ])
     end
+
+    it "puts pinned bookmarks first, in updated at order, then the rest in updated at order" do
+      bookmark3.update_column(:pinned, true)
+      bookmark4.update_column(:pinned, true)
+      expect(bookmark_query.list_all.map(&:id)).to eq([
+        bookmark4.id,
+        bookmark3.id,
+        bookmark1.id,
+        bookmark2.id,
+        bookmark5.id
+      ])
+    end
   end
 end
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index 14b5c8f658..5d4e0daafa 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -94,6 +94,7 @@ describe ContentSecurityPolicy do
 
       script_srcs = parse(policy)['script-src']
       expect(script_srcs).to include('https://www.googletagmanager.com/gtm.js')
+      expect(script_srcs.to_s).to include('nonce-')
     end
 
     it 'allowlists CDN assets when integrated' do
@@ -154,6 +155,39 @@ describe ContentSecurityPolicy do
     end
   end
 
+  describe 'frame-ancestors' do
+    context 'with content_security_policy_frame_ancestors enabled' do
+      before do
+        SiteSetting.content_security_policy_frame_ancestors = true
+        Fabricate(:embeddable_host, host: 'https://a.org')
+        Fabricate(:embeddable_host, host: 'https://b.org')
+      end
+
+      it 'always has self' do
+        frame_ancestors = parse(policy)['frame-ancestors']
+        expect(frame_ancestors).to include("'self'")
+      end
+
+      it 'includes all EmbeddableHost' do
+        EmbeddableHost
+        frame_ancestors = parse(policy)['frame-ancestors']
+        expect(frame_ancestors).to include("https://a.org")
+        expect(frame_ancestors).to include("https://b.org")
+      end
+    end
+
+    context 'with content_security_policy_frame_ancestors disabled' do
+      before do
+        SiteSetting.content_security_policy_frame_ancestors = false
+      end
+
+      it 'does not set frame-ancestors' do
+        frame_ancestors = parse(policy)['frame-ancestors']
+        expect(frame_ancestors).to be_nil
+      end
+    end
+  end
+
   it 'can be extended by plugins' do
     plugin = Class.new(Plugin::Instance) do
       attr_accessor :enabled
@@ -239,6 +273,7 @@ describe ContentSecurityPolicy do
 
       theme.set_field(target: :common, name: "header", value: <<~SCRIPT)
         <script src='https://example.com/myscript.js'></script>
+        <script src='https://example.com/myscript2.js?with=query'></script>
         <script src='//example2.com/protocol-less-script.js'></script>
         <script src='domain-only.com'></script>
         <script>console.log('inline script')</script>
@@ -248,6 +283,8 @@ describe ContentSecurityPolicy do
       theme.save!
 
       expect(parse(theme_policy)['script-src']).to include('https://example.com/myscript.js')
+      expect(parse(theme_policy)['script-src']).to include('https://example.com/myscript2.js')
+      expect(parse(theme_policy)['script-src']).not_to include('?')
       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/)
diff --git a/spec/lib/i18n/fallback_locale_list_spec.rb b/spec/lib/i18n/fallback_locale_list_spec.rb
index f84a4908aa..6f4dc348c2 100644
--- a/spec/lib/i18n/fallback_locale_list_spec.rb
+++ b/spec/lib/i18n/fallback_locale_list_spec.rb
@@ -13,11 +13,11 @@ describe I18n::Backend::FallbackLocaleList do
     expect(list[:en]).to eq([:en])
   end
 
-  it "works when default_locale is English (United States)" do
-    SiteSetting.default_locale = :en_US
+  it "works when default_locale is English (UK)" do
+    SiteSetting.default_locale = :en_GB
 
     expect(list[:ru]).to eq([:ru, :en])
-    expect(list[:en_US]).to eq([:en_US, :en])
+    expect(list[:en_GB]).to eq([:en_GB, :en])
     expect(list[:en]).to eq([:en])
   end
 
@@ -27,7 +27,7 @@ describe I18n::Backend::FallbackLocaleList do
     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])
+    expect(list[:en_GB]).to eq([:en_GB, :en])
   end
 
   context "when plugin registered fallback locale" do
@@ -50,14 +50,14 @@ describe I18n::Backend::FallbackLocaleList do
       expect(list[:en]).to eq([:en])
     end
 
-    it "works when default_locale is English (United States)" do
-      SiteSetting.default_locale = :en_US
+    it "works when default_locale is English (UK)" do
+      SiteSetting.default_locale = :en_GB
 
       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])
+      expect(list[:en_GB]).to eq([:en_GB, :en])
     end
 
     it "works when default_locale is not English" do
diff --git a/spec/lib/mini_sql_multisite_connection_spec.rb b/spec/lib/mini_sql_multisite_connection_spec.rb
index 9cfa452178..3534f5e34f 100644
--- a/spec/lib/mini_sql_multisite_connection_spec.rb
+++ b/spec/lib/mini_sql_multisite_connection_spec.rb
@@ -5,27 +5,38 @@ require 'rails_helper'
 describe MiniSqlMultisiteConnection do
 
   describe "after_commit" do
-    it "runs callbacks after outermost transaction is committed" do
+    it "works for 'fake' (joinable) transactions" do
       outputString = "1"
 
-      # Main transaction
       ActiveRecord::Base.transaction do
         outputString += "2"
+        DB.exec("SELECT 1")
+        ActiveRecord::Base.transaction do
+          DB.exec("SELECT 2")
+          outputString += "3"
+          DB.after_commit { outputString += "6" }
+          outputString += "4"
+        end
+        DB.after_commit { outputString += "7" }
+        outputString += "5"
+      end
 
-          # Nested transaction
-          ActiveRecord::Base.transaction do
+      expect(outputString).to eq("1234567")
+    end
+
+    it "works for real (non-joinable) transactions" do
+      outputString = "1"
+
+      ActiveRecord::Base.transaction(requires_new: true, joinable: false) do
+        outputString += "2"
+        DB.exec("SELECT 1")
+          ActiveRecord::Base.transaction(requires_new: true) do
+            DB.exec("SELECT 2")
             outputString += "3"
-
-              DB.after_commit do
-                outputString += "6"
-              end
-              outputString += "4"
+            DB.after_commit { outputString += "6" }
+            outputString += "4"
           end
-
-          DB.after_commit do
-            outputString += "7"
-          end
-
+          DB.after_commit { outputString += "7" }
           outputString += "5"
       end
 
@@ -62,6 +73,11 @@ describe MiniSqlMultisiteConnection do
       expect(outputString).to eq("123")
     end
 
+    it "supports prepared statements" do
+      DB.prepared.query("SELECT ?", 1)
+      DB.prepared.query("SELECT ?", 2)
+    end
+
   end
 
 end
diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb
index 1aaf6edb49..5e5cec530a 100644
--- a/spec/lib/search_spec.rb
+++ b/spec/lib/search_spec.rb
@@ -22,7 +22,7 @@ describe Search do
     it "maps locales to correct Postgres dictionaries" do
       expect(Search.ts_config).to eq("english")
       expect(Search.ts_config("en")).to eq("english")
-      expect(Search.ts_config("en_US")).to eq("english")
+      expect(Search.ts_config("en_GB")).to eq("english")
       expect(Search.ts_config("pt_BR")).to eq("portuguese")
       expect(Search.ts_config("tr")).to eq("turkish")
       expect(Search.ts_config("xx")).to eq("simple")
@@ -124,4 +124,45 @@ describe Search do
       end
     end
   end
+
+  context "users" do
+    fab!(:user) { Fabricate(:user, username: "DonaldDuck") }
+    fab!(:user2) { Fabricate(:user) }
+
+    before do
+      SearchIndexer.enable
+      SearchIndexer.index(user, force: true)
+    end
+
+    it "finds users by their names or custom fields" do
+      result = Search.execute("donaldduck", guardian: Guardian.new(user2))
+      expect(result.users).to contain_exactly(user)
+
+      user_field = Fabricate(:user_field, name: "custom field")
+      UserCustomField.create!(user: user, value: "test", name: "user_field_#{user_field.id}")
+      Jobs::ReindexSearch.new.execute({})
+      result = Search.execute("test", guardian: Guardian.new(user2))
+      expect(result.users).to be_empty
+
+      user_field.update!(searchable: true)
+      Jobs::ReindexSearch.new.execute({})
+      result = Search.execute("test", guardian: Guardian.new(user2))
+      expect(result.users).to contain_exactly(user)
+
+      user_field2 = Fabricate(:user_field, name: "another custom field", searchable: true)
+      UserCustomField.create!(user: user, value: "longer test", name: "user_field_#{user_field2.id}")
+      UserCustomField.create!(user: user2, value: "second user test", name: "user_field_#{user_field2.id}")
+      SearchIndexer.index(user, force: true)
+      SearchIndexer.index(user2, force: true)
+      result = Search.execute("test", guardian: Guardian.new(user2))
+
+      expect(result.users.first.custom_data).to eq([
+        { name: "custom field", value: "test" },
+        { name: "another custom field", value: "longer test" }
+      ])
+      expect(result.users.last.custom_data).to eq([
+        { name: "another custom field", value: "second user test" }
+      ])
+    end
+  end
 end
diff --git a/spec/lib/site_settings/validations_spec.rb b/spec/lib/site_settings/validations_spec.rb
index 4f8358ff95..747099f39a 100644
--- a/spec/lib/site_settings/validations_spec.rb
+++ b/spec/lib/site_settings/validations_spec.rb
@@ -151,10 +151,10 @@ describe SiteSettings::Validations do
       end
 
       context "when SSO is enabled" do
-        let(:error_message) { I18n.t("errors.site_settings.second_factor_cannot_be_enforced_with_sso_enabled") }
+        let(:error_message) { I18n.t("errors.site_settings.second_factor_cannot_be_enforced_with_discourse_connect_enabled") }
         before do
-          SiteSetting.sso_url = "https://www.example.com/sso"
-          SiteSetting.enable_sso = true
+          SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+          SiteSetting.enable_discourse_connect = true
         end
 
         it "should raise an error" do
diff --git a/spec/lib/theme_javascript_compiler_spec.rb b/spec/lib/theme_javascript_compiler_spec.rb
index e82bb64597..e15adc5ee0 100644
--- a/spec/lib/theme_javascript_compiler_spec.rb
+++ b/spec/lib/theme_javascript_compiler_spec.rb
@@ -127,4 +127,18 @@ describe ThemeJavascriptCompiler do
       expect(compiler.content.to_s).to include("addRawTemplate(\"#{name}.hbs\"")
     end
   end
+
+  describe "#append_ember_template" do
+    let(:compiler) { ThemeJavascriptCompiler.new(1, 'marks') }
+    it 'prepends `javascripts/` to template name if it is not prepended' do
+      compiler.append_ember_template("/connectors/blah-1", "{{var}}")
+      expect(compiler.content.to_s).to include('Ember.TEMPLATES["javascripts/connectors/blah-1"]')
+
+      compiler.append_ember_template("connectors/blah-2", "{{var}}")
+      expect(compiler.content.to_s).to include('Ember.TEMPLATES["javascripts/connectors/blah-2"]')
+
+      compiler.append_ember_template("javascripts/connectors/blah-3", "{{var}}")
+      expect(compiler.content.to_s).to include('Ember.TEMPLATES["javascripts/connectors/blah-3"]')
+    end
+  end
 end
diff --git a/spec/lib/upload_creator_spec.rb b/spec/lib/upload_creator_spec.rb
index f1f0787737..69f24507ff 100644
--- a/spec/lib/upload_creator_spec.rb
+++ b/spec/lib/upload_creator_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe UploadCreator do
   describe '#create_for' do
     describe 'when upload is not an image' do
       before do
-        SiteSetting.authorized_extensions = 'txt'
+        SiteSetting.authorized_extensions = 'txt|long-FileExtension'
       end
 
       let(:filename) { "utf-8.txt" }
@@ -38,6 +38,19 @@ RSpec.describe UploadCreator do
         expect(user2.user_uploads.count).to eq(1)
         expect(upload.user_uploads.count).to eq(2)
       end
+
+      let(:longextension) { "fake.long-FileExtension" }
+      let(:file2) { file_from_fixtures(longextension) }
+
+      it 'should truncate long extension names' do
+        expect do
+          UploadCreator.new(file2, "fake.long-FileExtension").create_for(user.id)
+        end.to change { Upload.count }.by(1)
+
+        upload = Upload.last
+
+        expect(upload.extension).to eq('long-FileE')
+      end
     end
 
     describe 'when image is not authorized' do
@@ -119,7 +132,6 @@ RSpec.describe UploadCreator do
         # pngquant will lose some colors causing some extra size reduction
         expect(thumbnail_size).to be < 7500
       end
-
     end
 
     describe 'converting to jpeg' do
@@ -134,15 +146,20 @@ RSpec.describe UploadCreator do
       let(:small_filename) { "logo.png" }
       let(:small_file) { file_from_fixtures(small_filename) }
 
+      let(:large_filename) { "large_and_unoptimized.png" }
+      let(:large_file) { file_from_fixtures(large_filename) }
+
       let(:animated_filename) { "animated.gif" }
       let(:animated_file) { file_from_fixtures(animated_filename) }
 
+      let(:animated_webp_filename) { "animated.webp" }
+      let(:animated_webp_file) { file_from_fixtures(animated_webp_filename) }
+
       before do
         SiteSetting.png_to_jpg_quality = 1
       end
 
       it 'should not store file as jpeg if it does not meet absolute byte saving requirements' do
-
         # logo.png is 2297 bytes, converting to jpeg saves 30% but does not meet
         # the absolute savings required of 25_000 bytes, if you save less than that
         # skip this
@@ -159,7 +176,6 @@ RSpec.describe UploadCreator do
         expect(upload.extension).to eq('png')
         expect(File.extname(upload.url)).to eq('.png')
         expect(upload.original_filename).to eq('logo.png')
-
       end
 
       it 'should store the upload with the right extension' do
@@ -177,6 +193,14 @@ RSpec.describe UploadCreator do
         expect(upload.original_filename).to eq('should_be_jpeg.jpg')
       end
 
+      it "should not convert to jpeg when the image is uploaded from site setting" do
+        upload = UploadCreator.new(large_file, large_filename, for_site_setting: true, force_optimize: true).create_for(user.id)
+
+        expect(upload.extension).to eq('png')
+        expect(File.extname(upload.url)).to eq('.png')
+        expect(upload.original_filename).to eq('large_and_unoptimized.png')
+      end
+
       context "jpeg image quality settings" do
         before do
           SiteSetting.png_to_jpg_quality = 75
@@ -208,6 +232,36 @@ RSpec.describe UploadCreator do
           expect(File.extname(upload.url)).to eq('.gif')
           expect(upload.original_filename).to eq('animated.gif')
         end
+
+        context "png image quality settings" do
+          before do
+            SiteSetting.png_to_jpg_quality = 100
+            SiteSetting.recompress_original_jpg_quality = 90
+            SiteSetting.image_preview_jpg_quality = 10
+          end
+
+          it "should not convert to jpeg when png_to_jpg_quality is 100" do
+            upload = UploadCreator.new(large_file, large_filename, force_optimize: true).create_for(user.id)
+
+            expect(upload.extension).to eq('png')
+            expect(File.extname(upload.url)).to eq('.png')
+            expect(upload.original_filename).to eq('large_and_unoptimized.png')
+          end
+        end
+
+        it 'should not convert animated WEBP images' do
+          expect do
+            UploadCreator.new(animated_webp_file, animated_webp_filename,
+              force_optimize: true
+            ).create_for(user.id)
+          end.to change { Upload.count }.by(1)
+
+          upload = Upload.last
+
+          expect(upload.extension).to eq('webp')
+          expect(File.extname(upload.url)).to eq('.webp')
+          expect(upload.original_filename).to eq('animated.webp')
+        end
       end
     end
 
@@ -424,14 +478,6 @@ RSpec.describe UploadCreator do
           end
         end
 
-        context "if the upload is for a PM" do
-          let(:opts) { { for_private_message: true } }
-          it "sets the upload to secure and sets the original_sha1" do
-            expect(result.secure).to eq(true)
-            expect(result.original_sha1).not_to eq(nil)
-          end
-        end
-
         context "if SiteSetting.login_required" do
           before do
             SiteSetting.login_required = true
@@ -497,4 +543,34 @@ RSpec.describe UploadCreator do
       end
     end
   end
+
+  describe "svg sizing" do
+    let(:svg_filename) { "pencil.svg" }
+    let(:svg_file) { file_from_fixtures(svg_filename) }
+
+    it "should handle units in width and height" do
+      upload = UploadCreator.new(svg_file, svg_filename,
+        force_optimize: true,
+      ).create_for(user.id)
+
+      expect(upload.width).to be > 100
+      expect(upload.height).to be > 100
+    end
+  end
+
+  describe '#should_downsize?' do
+    context "GIF image" do
+      let(:gif_file) { file_from_fixtures("animated.gif") }
+
+      before do
+        SiteSetting.max_image_size_kb = 1
+      end
+
+      it "is not downsized" do
+        creator = UploadCreator.new(gif_file, "animated.gif")
+        creator.extract_image_info!
+        expect(creator.should_downsize?).to eq(false)
+      end
+    end
+  end
 end
diff --git a/spec/lib/upload_security_spec.rb b/spec/lib/upload_security_spec.rb
index 698e5b1275..07e2b54402 100644
--- a/spec/lib/upload_security_spec.rb
+++ b/spec/lib/upload_security_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe UploadSecurity do
   let(:post_in_secure_context) { Fabricate(:post, topic: Fabricate(:topic, category: private_category)) }
   fab!(:upload) { Fabricate(:upload) }
   let(:type) { nil }
-  let(:opts) { { type: type } }
+  let(:opts) { { type: type, creating: true } }
   subject { described_class.new(upload, opts) }
 
   context "when secure media is enabled" do
@@ -25,6 +25,12 @@ RSpec.describe UploadSecurity do
       end
 
       context "when uploading in public context" do
+        describe "for a public type group_flair" do
+          let(:type) { 'group_flair' }
+          it "returns false" do
+            expect(subject.should_be_secure?).to eq(false)
+          end
+        end
         describe "for a public type avatar" do
           let(:type) { 'avatar' }
           it "returns false" do
diff --git a/spec/mailers/invite_mailer_spec.rb b/spec/mailers/invite_mailer_spec.rb
index b9dcbcfebe..2e7c2041b6 100644
--- a/spec/mailers/invite_mailer_spec.rb
+++ b/spec/mailers/invite_mailer_spec.rb
@@ -90,7 +90,7 @@ describe InviteMailer do
           Invite.find_by(invited_by_id: topic.user.id)
         end
 
-        let(:invite_mail) { InviteMailer.send_invite(invite) }
+        let(:invite_mail) { InviteMailer.send_invite(invite, invite_to_topic: true) }
 
         it 'renders the invitee email' do
           expect(invite_mail.to).to eql(['name@example.com'])
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index 1b422da2c7..605511ea89 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -80,6 +80,19 @@ describe UserNotifications do
     end
   end
 
+  describe '.post_approved' do
+    fab!(:post) { Fabricate(:post) }
+
+    it 'works' do
+      subject = UserNotifications.post_approved(user, { notification_data_hash: { post_url: post.url } })
+
+      expect(subject.to).to eq([user.email])
+      expect(subject.subject).to be_present
+      expect(subject.from).to eq([SiteSetting.notification_email])
+      expect(subject.body).to be_present
+    end
+  end
+
   describe ".confirm_new_email" do
     let(:opts) do
       { requested_by_admin: requested_by_admin, email_token: token }
@@ -1013,7 +1026,7 @@ describe UserNotifications do
           let(:locale) { "fr" }
           let(:mail_type) { mail_type }
           it "sets the locale" do
-            expects_build_with(has_entry(:locale, "en_US"))
+            expects_build_with(has_entry(:locale, "en"))
           end
         end
       end
diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb
index 73cd39ef0e..f20a5b82a6 100644
--- a/spec/models/badge_spec.rb
+++ b/spec/models/badge_spec.rb
@@ -71,6 +71,16 @@ describe Badge do
     end
   end
 
+  describe '#image_url' do
+    it 'has CDN url' do
+      SiteSetting.enable_s3_uploads = true
+      SiteSetting.s3_cdn_url = "https://some-s3-cdn.amzn.com"
+      upload = Fabricate(:upload_s3)
+      badge = Fabricate(:badge, image_upload_id: upload.id)
+      expect(badge.image_url).to start_with("https://some-s3-cdn.amzn.com")
+    end
+  end
+
   describe '.i18n_name' do
     it 'transforms to lower case letters, and replaces spaces with underscores' do
       expect(Badge.i18n_name('Basic User')).to eq('basic_user')
diff --git a/spec/models/bookmark_spec.rb b/spec/models/bookmark_spec.rb
index 3d4b5a6acf..177c003732 100644
--- a/spec/models/bookmark_spec.rb
+++ b/spec/models/bookmark_spec.rb
@@ -39,5 +39,24 @@ describe Bookmark do
       expect(Bookmark.find(bookmark.id)).to eq(bookmark)
       expect(Bookmark.find_by(id: bookmark2.id)).to eq(bookmark2)
     end
+
+    describe "bookmark limits" do
+      fab!(:user) { Fabricate(:user) }
+
+      it "does not get the bookmark limit error because it is not creating a new bookmark (for users already over the limit)" do
+        Fabricate(:bookmark, user: user)
+        Fabricate(:bookmark, user: user)
+        last_bookmark = Fabricate(:bookmark, user: user)
+        SiteSetting.max_bookmarks_per_user = 2
+        expect { last_bookmark.clear_reminder! }.not_to raise_error
+      end
+
+      it "gets the bookmark limit error when creating a new bookmark over the limit" do
+        Fabricate(:bookmark, user: user)
+        Fabricate(:bookmark, user: user)
+        SiteSetting.max_bookmarks_per_user = 2
+        expect { Fabricate(:bookmark, user: user) }.to raise_error(ActiveRecord::RecordInvalid)
+      end
+    end
   end
 end
diff --git a/spec/models/category_list_spec.rb b/spec/models/category_list_spec.rb
index d18abbe177..ea5c839aa8 100644
--- a/spec/models/category_list_spec.rb
+++ b/spec/models/category_list_spec.rb
@@ -95,18 +95,22 @@ describe CategoryList do
       let!(:topic2) { Fabricate(:topic, category: topic_category, bumped_at: 5.minutes.ago) }
       let!(:topic3) { Fabricate(:topic, category: topic_category, bumped_at: 2.minutes.ago) }
       let!(:pinned) { Fabricate(:topic, category: topic_category, pinned_at: 10.minutes.ago, bumped_at: 10.minutes.ago) }
+      let!(:dismissed_topic_user) { Fabricate(:dismissed_topic_user, topic: topic2, user: user) }
 
       def displayable_topics
         category_list = CategoryList.new(Guardian.new(user), include_topics: true)
-        category_list.categories.find { |c| c.id == topic_category.id }.displayable_topics.map(&:id)
+        category_list.categories.find { |c| c.id == topic_category.id }.displayable_topics
       end
 
       it "returns pinned topic first" do
-        expect(displayable_topics).to eq([pinned.id, topic3.id])
+        expect(displayable_topics.map(&:id)).to eq([pinned.id, topic3.id])
 
         TopicUser.change(user.id, pinned.id, cleared_pinned_at: pinned.pinned_at + 10)
 
-        expect(displayable_topics).to eq([topic3.id, topic2.id])
+        expect(displayable_topics[0].dismissed).to eq(false)
+        expect(displayable_topics[1].dismissed).to eq(true)
+
+        expect(displayable_topics.map(&:id)).to eq([topic3.id, topic2.id])
       end
     end
 
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 1dc75ddfac..2454364d76 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -32,6 +32,13 @@ describe Category do
     expect(cats.errors[:name]).to be_present
   end
 
+  describe "slug" do
+    it "converts to lower" do
+      category = Category.create!(name: "Hello World", slug: "Hello-World", user: user)
+      expect(category.slug).to eq("hello-world")
+    end
+  end
+
   describe "resolve_permissions" do
     it "can determine read_restricted" do
       read_restricted, resolved = Category.resolve_permissions(everyone: :full)
@@ -1185,4 +1192,36 @@ describe Category do
     end
   end
 
+  describe "#find_by_slug_path" do
+    it 'works for categories with slugs' do
+      category = Fabricate(:category, slug: 'cat1')
+
+      expect(Category.find_by_slug_path(['cat1'])).to eq(category)
+    end
+
+    it 'works for categories without slugs' do
+      SiteSetting.slug_generation_method = 'none'
+
+      category = Fabricate(:category, slug: 'cat1')
+
+      expect(Category.find_by_slug_path(["#{category.id}-category"])).to eq(category)
+    end
+
+    it 'works for subcategories with slugs' do
+      category = Fabricate(:category, slug: 'cat1')
+      subcategory = Fabricate(:category, slug: 'cat2', parent_category: category)
+
+      expect(Category.find_by_slug_path(['cat1', 'cat2'])).to eq(subcategory)
+    end
+
+    it 'works for subcategories without slugs' do
+      SiteSetting.slug_generation_method = 'none'
+
+      category = Fabricate(:category, slug: 'cat1')
+      subcategory = Fabricate(:category, slug: 'cat2', parent_category: category)
+
+      expect(Category.find_by_slug_path(['cat1', "#{subcategory.id}-category"])).to eq(subcategory)
+      expect(Category.find_by_slug_path(["#{category.id}-category", "#{subcategory.id}-category"])).to eq(subcategory)
+    end
+  end
 end
diff --git a/spec/models/category_user_spec.rb b/spec/models/category_user_spec.rb
index f777b9e820..58be748249 100644
--- a/spec/models/category_user_spec.rb
+++ b/spec/models/category_user_spec.rb
@@ -219,6 +219,53 @@ describe CategoryUser do
 
       expect(CategoryUser.where(user_id: user.id).count).to eq(0)
     end
+  end
 
+  describe "#notification_levels_for" do
+    let!(:category1) { Fabricate(:category) }
+    let!(:category2) { Fabricate(:category) }
+    let!(:category3) { Fabricate(:category) }
+    let!(:category4) { Fabricate(:category) }
+    let!(:category5) { Fabricate(:category) }
+
+    context "for anon" do
+      let(:user) { nil }
+      before do
+        SiteSetting.default_categories_watching = category1.id.to_s
+        SiteSetting.default_categories_tracking = category2.id.to_s
+        SiteSetting.default_categories_watching_first_post = category3.id.to_s
+        SiteSetting.default_categories_regular = category4.id.to_s
+        SiteSetting.default_categories_muted = category5.id.to_s
+      end
+      it "every category from the default_categories_* site settings get overridden to regular, except for muted" do
+        levels = CategoryUser.notification_levels_for(user)
+        expect(levels[category1.id]).to eq(CategoryUser.notification_levels[:regular])
+        expect(levels[category2.id]).to eq(CategoryUser.notification_levels[:regular])
+        expect(levels[category3.id]).to eq(CategoryUser.notification_levels[:regular])
+        expect(levels[category4.id]).to eq(CategoryUser.notification_levels[:regular])
+        expect(levels[category5.id]).to eq(CategoryUser.notification_levels[:muted])
+      end
+    end
+
+    context "for a user" do
+      before do
+        CategoryUser.create(user: user, category: category1, notification_level: CategoryUser.notification_levels[:watching])
+        CategoryUser.create(user: user, category: category2, notification_level: CategoryUser.notification_levels[:tracking])
+        CategoryUser.create(user: user, category: category3, notification_level: CategoryUser.notification_levels[:watching_first_post])
+        CategoryUser.create(user: user, category: category4, notification_level: CategoryUser.notification_levels[:regular])
+        CategoryUser.create(user: user, category: category5, notification_level: CategoryUser.notification_levels[:muted])
+      end
+      it "gets the category_user notification levels for all categories the user is tracking and does not
+      include categories the user is not tracking at all" do
+        category6 = Fabricate(:category)
+        levels = CategoryUser.notification_levels_for(user)
+        expect(levels[category1.id]).to eq(CategoryUser.notification_levels[:watching])
+        expect(levels[category2.id]).to eq(CategoryUser.notification_levels[:tracking])
+        expect(levels[category3.id]).to eq(CategoryUser.notification_levels[:watching_first_post])
+        expect(levels[category4.id]).to eq(CategoryUser.notification_levels[:regular])
+        expect(levels[category5.id]).to eq(CategoryUser.notification_levels[:muted])
+        expect(levels.key?(category6.id)).to eq(false)
+      end
+    end
   end
 end
diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb
index 961ad51b07..e1d03c12e7 100644
--- a/spec/models/discourse_single_sign_on_spec.rb
+++ b/spec/models/discourse_single_sign_on_spec.rb
@@ -4,12 +4,12 @@ require "rails_helper"
 
 describe DiscourseSingleSignOn do
   before do
-    @sso_url = "http://example.com/discourse_sso"
-    @sso_secret = "shjkfdhsfkjh"
+    @discourse_connect_url = "http://example.com/discourse_sso"
+    @discourse_connect_secret = "shjkfdhsfkjh"
 
-    SiteSetting.sso_url = @sso_url
-    SiteSetting.enable_sso = true
-    SiteSetting.sso_secret = @sso_secret
+    SiteSetting.discourse_connect_url = @discourse_connect_url
+    SiteSetting.enable_discourse_connect = true
+    SiteSetting.discourse_connect_secret = @discourse_connect_secret
     Jobs.run_immediately!
   end
 
@@ -119,7 +119,7 @@ describe DiscourseSingleSignOn do
   end
 
   it "unstaged users" do
-    SiteSetting.sso_overrides_name = true
+    SiteSetting.auth_overrides_name = true
 
     email = "staged@user.com"
     Fabricate(:user, staged: true, email: email)
@@ -200,7 +200,7 @@ describe DiscourseSingleSignOn do
     sso.groups = "#{group2.name.capitalize},group4,badname,trust_level_4"
     sso.lookup_or_create_user(ip_address)
 
-    SiteSetting.sso_overrides_groups = true
+    SiteSetting.discourse_connect_overrides_groups = true
 
     group1.reload
     expect(group1.usernames).to eq("")
@@ -265,7 +265,7 @@ describe DiscourseSingleSignOn do
   end
 
   it 'can override username properly when only the case changes' do
-    SiteSetting.sso_overrides_username = true
+    SiteSetting.auth_overrides_username = true
 
     sso = new_discourse_sso
     sso.username = "testuser"
@@ -285,8 +285,8 @@ describe DiscourseSingleSignOn do
     expect(user.username).to eq "TestUser"
   end
 
-  it 'behaves properly when sso_overrides_username is set but username is missing or blank' do
-    SiteSetting.sso_overrides_username = true
+  it 'behaves properly when auth_overrides_username is set but username is missing or blank' do
+    SiteSetting.auth_overrides_username = true
 
     sso = new_discourse_sso
     sso.username = "testuser"
@@ -315,9 +315,9 @@ describe DiscourseSingleSignOn do
     admin = Fabricate(:admin)
 
     SiteSetting.email_editable = false
-    SiteSetting.sso_overrides_name = true
-    SiteSetting.sso_overrides_email = true
-    SiteSetting.sso_overrides_username = true
+    SiteSetting.auth_overrides_name = true
+    SiteSetting.auth_overrides_email = true
+    SiteSetting.auth_overrides_username = true
 
     sso = new_discourse_sso
     sso.username = "bob%the$admin"
@@ -375,15 +375,32 @@ describe DiscourseSingleSignOn do
     sso = DiscourseSingleSignOn.parse(payload, secure_session: secure_session)
     expect(sso.nonce_valid?).to eq true
 
+    other_session_sso = DiscourseSingleSignOn.parse(payload, secure_session: SecureSession.new("differentsession"))
+    expect(other_session_sso.nonce_valid?).to eq false
+
     sso.expire_nonce!
 
     expect(sso.nonce_valid?).to eq false
+  end
 
+  it "allows disabling CSRF protection" do
+    SiteSetting.discourse_connect_csrf_protection = false
+    _ , payload = DiscourseSingleSignOn.generate_url(secure_session: secure_session).split("?")
+
+    sso = DiscourseSingleSignOn.parse(payload, secure_session: secure_session)
+    expect(sso.nonce_valid?).to eq true
+
+    other_session_sso = DiscourseSingleSignOn.parse(payload, secure_session: SecureSession.new("differentsession"))
+    expect(other_session_sso.nonce_valid?).to eq true
+
+    sso.expire_nonce!
+
+    expect(sso.nonce_valid?).to eq false
   end
 
   it "generates a correct sso url" do
     url, payload = DiscourseSingleSignOn.generate_url(secure_session: secure_session).split("?")
-    expect(url).to eq @sso_url
+    expect(url).to eq @discourse_connect_url
 
     sso = DiscourseSingleSignOn.parse(payload, secure_session: secure_session)
     expect(sso.nonce).to_not be_nil
@@ -452,7 +469,7 @@ describe DiscourseSingleSignOn do
 
     it 'does not deactivate user if email provided is capitalized' do
       SiteSetting.email_editable = false
-      SiteSetting.sso_overrides_email = true
+      SiteSetting.auth_overrides_email = true
       sso.require_activation = true
 
       user = sso.lookup_or_create_user(ip_address)
@@ -470,7 +487,7 @@ describe DiscourseSingleSignOn do
     it 'deactivates accounts that have updated email address' do
 
       SiteSetting.email_editable = false
-      SiteSetting.sso_overrides_email = true
+      SiteSetting.auth_overrides_email = true
       sso.require_activation = true
 
       user = sso.lookup_or_create_user(ip_address)
@@ -572,7 +589,7 @@ describe DiscourseSingleSignOn do
 
       # yes override if site setting
       sso.bio = "new profile 2"
-      SiteSetting.sso_overrides_bio = true
+      SiteSetting.discourse_connect_overrides_bio = true
 
       user = sso.lookup_or_create_user(ip_address)
       expect(user.user_profile.bio_cooked).to match_html("<p>new profile 2</p")
@@ -580,7 +597,7 @@ describe DiscourseSingleSignOn do
 
   end
 
-  context 'when sso_overrides_avatar is not enabled' do
+  context 'when discourse_connect_overrides_avatar is not enabled' do
 
     it "correctly handles provided avatar_urls" do
       sso = new_discourse_sso
@@ -640,7 +657,7 @@ describe DiscourseSingleSignOn do
 
   end
 
-  context 'when sso_overrides_avatar is enabled' do
+  context 'when discourse_connect_overrides_avatar is enabled' do
     fab!(:sso_record) { Fabricate(:single_sign_on_record, external_avatar_url: "http://example.com/an_image.png") }
 
     let!(:sso) {
@@ -655,7 +672,7 @@ describe DiscourseSingleSignOn do
     let(:logo) { file_from_fixtures("logo.png") }
 
     before do
-      SiteSetting.sso_overrides_avatar = true
+      SiteSetting.discourse_connect_overrides_avatar = true
     end
 
     it "deal with no avatar url passed for an existing user with an avatar" do
@@ -688,7 +705,7 @@ describe DiscourseSingleSignOn do
     end
   end
 
-  context 'when sso_overrides_profile_background is not enabled' do
+  context 'when discourse_connect_overrides_profile_background is not enabled' do
 
     it "correctly handles provided profile_background_urls" do
       sso = new_discourse_sso
@@ -720,7 +737,7 @@ describe DiscourseSingleSignOn do
     end
   end
 
-  context 'when sso_overrides_profile_background is enabled' do
+  context 'when discourse_connect_overrides_profile_background is enabled' do
     fab!(:sso_record) { Fabricate(:single_sign_on_record, external_profile_background_url: "http://example.com/an_image.png") }
 
     let!(:sso) {
@@ -735,7 +752,7 @@ describe DiscourseSingleSignOn do
     let(:logo) { file_from_fixtures("logo.png") }
 
     before do
-      SiteSetting.sso_overrides_profile_background = true
+      SiteSetting.discourse_connect_overrides_profile_background = true
     end
 
     it "deal with no profile_background_url passed for an existing user with a profile_background" do
@@ -760,7 +777,7 @@ describe DiscourseSingleSignOn do
     end
   end
 
-  context 'when sso_overrides_card_background is not enabled' do
+  context 'when discourse_connect_overrides_card_background is not enabled' do
 
     it "correctly handles provided card_background_urls" do
       sso = new_discourse_sso
@@ -792,7 +809,7 @@ describe DiscourseSingleSignOn do
     end
   end
 
-  context 'when sso_overrides_card_background is enabled' do
+  context 'when discourse_connect_overrides_card_background is enabled' do
     fab!(:sso_record) { Fabricate(:single_sign_on_record, external_card_background_url: "http://example.com/an_image.png") }
 
     let!(:sso) {
@@ -807,7 +824,7 @@ describe DiscourseSingleSignOn do
     let(:logo) { file_from_fixtures("logo.png") }
 
     before do
-      SiteSetting.sso_overrides_card_background = true
+      SiteSetting.discourse_connect_overrides_card_background = true
     end
 
     it "deal with no card_background_url passed for an existing user with a card_background" do
diff --git a/spec/models/do_not_disturb_timing_spec.rb b/spec/models/do_not_disturb_timing_spec.rb
new file mode 100644
index 0000000000..306c2c82bd
--- /dev/null
+++ b/spec/models/do_not_disturb_timing_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe DoNotDisturbTiming do
+  fab!(:user) { Fabricate(:user) }
+
+  describe "validations" do
+    it 'is invalid when ends_at is before starts_at' do
+      freeze_time
+      timing = DoNotDisturbTiming.new(user: user, starts_at: Time.zone.now, ends_at: 1.hour.ago)
+      timing.valid?
+      expect(timing.errors[:ends_at]).to be_present
+    end
+  end
+end
diff --git a/spec/models/global_setting_spec.rb b/spec/models/global_setting_spec.rb
index 8802418277..349c1914b3 100644
--- a/spec/models/global_setting_spec.rb
+++ b/spec/models/global_setting_spec.rb
@@ -67,13 +67,13 @@ describe GlobalSetting do
   end
 
   describe '.redis_config' do
-    describe 'when slave config is not present' do
+    describe 'when replica config is not present' do
       it "should not set any connector" do
         expect(GlobalSetting.redis_config[:connector]).to eq(nil)
       end
     end
 
-    describe 'when slave config is present' do
+    describe 'when replica config is present' do
       before do
         GlobalSetting.reset_redis_config!
       end
@@ -83,8 +83,8 @@ describe GlobalSetting do
       end
 
       it "should set the right connector" do
-        GlobalSetting.expects(:redis_slave_port).returns(6379).at_least_once
-        GlobalSetting.expects(:redis_slave_host).returns('0.0.0.0').at_least_once
+        GlobalSetting.expects(:redis_replica_port).returns(6379).at_least_once
+        GlobalSetting.expects(:redis_replica_host).returns('0.0.0.0').at_least_once
 
         expect(GlobalSetting.redis_config[:connector]).to eq(RailsFailover::Redis::Connector)
       end
diff --git a/spec/models/group_user_spec.rb b/spec/models/group_user_spec.rb
index 22b01023b1..e6b3e55af4 100644
--- a/spec/models/group_user_spec.rb
+++ b/spec/models/group_user_spec.rb
@@ -57,7 +57,7 @@ describe GroupUser do
       group.watching_first_post_category_ids = [category5.id]
       group.save!
       expect { group.add(user) }.to change { CategoryUser.count }.by(5)
-      h = CategoryUser.notification_levels_for(Guardian.new(user))
+      h = CategoryUser.notification_levels_for(user)
       expect(h[category1.id]).to eq(levels[:muted])
       expect(h[category2.id]).to eq(levels[:regular])
       expect(h[category3.id]).to eq(levels[:tracking])
@@ -74,7 +74,7 @@ describe GroupUser do
       group.watching_first_post_category_ids = [category2.id, category3.id, category4.id]
       group.save!
       group.add(user)
-      h = CategoryUser.notification_levels_for(Guardian.new(user))
+      h = CategoryUser.notification_levels_for(user)
       expect(h[category1.id]).to eq(levels[:regular])
       expect(h[category2.id]).to eq(levels[:watching_first_post])
       expect(h[category3.id]).to eq(levels[:watching_first_post])
@@ -89,7 +89,7 @@ describe GroupUser do
       group.tracking_category_ids = [category4.id]
       group.save!
       group.add(user)
-      h = CategoryUser.notification_levels_for(Guardian.new(user))
+      h = CategoryUser.notification_levels_for(user)
       expect(h[category1.id]).to eq(levels[:tracking])
       expect(h[category2.id]).to eq(levels[:watching])
       expect(h[category3.id]).to eq(levels[:muted])
diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb
index fd3d52cf2b..aee4dcce2f 100644
--- a/spec/models/invite_redeemer_spec.rb
+++ b/spec/models/invite_redeemer_spec.rb
@@ -10,9 +10,9 @@ describe InviteRedeemer do
       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
       expect(user.email).to eq('walter.white@email.com')
       expect(user.approved).to eq(true)
+      expect(user.active).to eq(false)
     end
 
     it "can set the password and ip_address" do
@@ -52,7 +52,30 @@ describe InviteRedeemer do
       expect(user.approved).to eq(true)
     end
 
-    it "should not activate user invited via links" do
+    it "activates user invited via email with a token" do
+      invite = Fabricate(:invite, invited_by: Fabricate(:admin), email: 'walter.white@email.com', emailed_status: Invite.emailed_status_types[:sent])
+      user = InviteRedeemer.create_user_from_invite(invite: invite, email: invite.email, username: 'walter', name: 'Walter White', email_token: invite.email_token)
+
+      expect(user.username).to eq('walter')
+      expect(user.name).to eq('Walter White')
+      expect(user.email).to eq('walter.white@email.com')
+      expect(user.approved).to eq(true)
+      expect(user.active).to eq(true)
+    end
+
+    it "does not activate user invited via email with a wrong token" do
+      invite = Fabricate(:invite, invited_by: Fabricate(:user), email: 'walter.white@email.com', emailed_status: Invite.emailed_status_types[:sent])
+      user = InviteRedeemer.create_user_from_invite(invite: invite, email: invite.email, username: 'walter', name: 'Walter White', email_token: 'wrong_token')
+      expect(user.active).to eq(false)
+    end
+
+    it "does not activate user invited via email without a token" do
+      invite = Fabricate(:invite, invited_by: Fabricate(:user), email: 'walter.white@email.com', emailed_status: Invite.emailed_status_types[:sent])
+      user = InviteRedeemer.create_user_from_invite(invite: invite, email: invite.email, username: 'walter', name: 'Walter White')
+      expect(user.active).to eq(false)
+    end
+
+    it "does not activate user invited via links" do
       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')
 
@@ -189,8 +212,30 @@ describe InviteRedeemer do
       expect(invite.invited_users.first).to be_present
     end
 
+    context "ReviewableUser" do
+      it "approves pending record" do
+        reviewable = ReviewableUser.needs_review!(target: Fabricate(:user, email: invite.email), created_by: invite.invited_by)
+        reviewable.status = Reviewable.statuses[:pending]
+        reviewable.save!
+        invite_redeemer.redeem
+
+        reviewable.reload
+        expect(reviewable.status).to eq(Reviewable.statuses[:approved])
+      end
+
+      it "does not raise error if record is not pending" do
+        reviewable = ReviewableUser.needs_review!(target: Fabricate(:user, email: invite.email), created_by: invite.invited_by)
+        reviewable.status = Reviewable.statuses[:ignored]
+        reviewable.save!
+        invite_redeemer.redeem
+
+        reviewable.reload
+        expect(reviewable.status).to eq(Reviewable.statuses[:ignored])
+      end
+    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]) }
+      fab!(:invite_link) { Fabricate(:invite, email: nil, max_redemptions_allowed: 5, expires_at: 1.month.from_now, emailed_status: Invite.emailed_status_types[:not_required]) }
       let(:invite_redeemer) { InviteRedeemer.new(invite: invite_link, email: 'foo@example.com') }
 
       it 'works as expected' do
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 82225cb876..91316b4a86 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -3,644 +3,405 @@
 require 'rails_helper'
 
 describe Invite do
+  fab!(:user) { Fabricate(:user) }
 
-  it { is_expected.to validate_presence_of :invited_by_id }
+  context 'validators' do
+    it { is_expected.to validate_presence_of :invited_by_id }
+    it { is_expected.to rate_limit }
 
-  it { is_expected.to rate_limit }
-
-  let(:iceking) { 'iceking@adventuretime.ooo' }
-
-  context 'user validators' do
-    fab!(:coding_horror) { Fabricate(:coding_horror) }
-    fab!(:user) { Fabricate(:user) }
-    let(:invite) { Invite.create(email: user.email, invited_by: coding_horror) }
-
-    it "should not allow an invite with the same email as an existing user" do
-      expect(invite).not_to be_valid
-    end
-
-    it "should not allow a user to invite themselves" do
-      expect(invite.email_already_exists).to eq(true)
-    end
-  end
-
-  context 'email validators' do
-    fab!(:coding_horror) { Fabricate(:coding_horror) }
-
-    it "should not allow an invite with unformatted email address" do
-      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 blocklisted email" do
-      invite = Invite.create(email: "test@mailinator.com", invited_by: coding_horror)
-      expect(invite).not_to be_valid
-    end
-
-    it "should allow an invite with non-blocklisted email" do
-      invite = Fabricate(:invite, email: "test@mail.com", invited_by: coding_horror)
+    it 'allows invites with valid emails' do
+      invite = Fabricate.build(:invite, email: 'test@example.com', invited_by: user)
       expect(invite).to be_valid
     end
 
-    it "should not allow an invalid email address" do
+    it 'does not allow invites with invalid emails' do
+      invite = Fabricate.build(:invite, email: 'John Doe <john.doe@example.com>')
+      expect(invite.valid?).to eq(false)
+      expect(invite.errors.full_messages).to include(I18n.t('invite.invalid_email', email: invite.email))
+    end
+
+    it 'does not allow an invite with the same email as an existing user' do
+      invite = Fabricate.build(:invite, email: Fabricate(:user).email, invited_by: user)
+      expect(invite).not_to be_valid
+
+      invite = Fabricate.build(:invite, email: user.email, invited_by: user)
+      expect(invite).not_to be_valid
+    end
+
+    it 'does not allow an invite with blocked email' do
+      invite = Invite.create(email: 'test@mailinator.com', invited_by: user)
+      expect(invite).not_to be_valid
+    end
+
+    it 'does 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"))
+      expect(invite.errors.full_messages).to include(I18n.t('invite.invalid_email', email: invite.email))
     end
   end
 
-  context '#create' do
-    context 'saved' do
-      subject { Fabricate(:invite) }
+  context 'before_save' do
+    it 'regenerates the email token when email is changed' do
+      invite = Fabricate(:invite, email: 'test@example.com')
+      token = invite.email_token
 
-      it "works" do
-        expect(subject.invite_key).to be_present
-        expect(subject.email_already_exists).to eq(false)
+      invite.update!(email: 'test@example.com')
+      expect(invite.email_token).to eq(token)
+
+      invite.update!(email: 'test2@example.com')
+      expect(invite.email_token).not_to eq(token)
+
+      invite.update!(email: nil)
+      expect(invite.email_token).to eq(nil)
+    end
+  end
+
+  context '.generate' do
+    it 'saves an invites' do
+      invite = Invite.generate(user, email: 'TEST@EXAMPLE.COM')
+      expect(invite.invite_key).to be_present
+      expect(invite.email).to eq('test@example.com')
+    end
+
+    it 'can succeed for staged users emails' do
+      Fabricate(:staged, email: 'test@example.com')
+      invite = Invite.generate(user, email: 'test@example.com')
+      expect(invite.email).to eq('test@example.com')
+    end
+
+    it 'raises an error when inviting an existing user' do
+      expect { Invite.generate(user, email: user.email) }
+        .to raise_error(Invite::UserExists)
+    end
+
+    context 'via email' do
+      it 'can be created and a job is enqueued to email the invite' do
+        invite = Invite.generate(user, email: 'test@example.com')
+        expect(invite.email).to eq('test@example.com')
+        expect(invite.emailed_status).to eq(Invite.emailed_status_types[:sending])
+        expect(invite.email_token).not_to eq(nil)
+        expect(Jobs::InviteEmail.jobs.size).to eq(1)
       end
 
-      it 'should store a lower case version of the email' do
-        expect(subject.email).to eq(iceking)
+      it 'can skip the job to email the invite' do
+        invite = Invite.generate(user, email: 'test@example.com', skip_email: true)
+        expect(invite.emailed_status).to eq(Invite.emailed_status_types[:not_required])
+        expect(Jobs::InviteEmail.jobs.size).to eq(0)
+      end
+
+      it 'can invite the same user after their invite was destroyed' do
+        Invite.generate(user, email: 'test@example.com').destroy!
+        invite = Invite.generate(user, email: 'test@example.com')
+        expect(invite).to be_present
       end
     end
 
-    context 'to a topic' do
-      fab!(:topic) { Fabricate(:topic) }
-      let(:inviter) { topic.user }
-
-      context 'email' do
-        it 'enqueues a job to email the invite' do
-          expect do
-            Invite.invite_by_email(iceking, inviter, topic)
-          end.to change { Jobs::InviteEmail.jobs.size }
-        end
+    context 'via link' do
+      it 'does not enqueue a job to email the invite' do
+        invite = Invite.generate(user, skip_email: true)
+        expect(invite.emailed_status).to eq(Invite.emailed_status_types[:not_required])
+        expect(Jobs::InviteEmail.jobs.size).to eq(0)
       end
 
-      context 'links' do
-        it 'does not enqueue a job to email the invite' do
-          expect do
-            Invite.generate_single_use_invite_link(iceking, inviter, topic)
-          end.not_to change { Jobs::InviteEmail.jobs.size }
-        end
-      end
-
-      context 'destroyed' do
-        it "can invite the same user after their invite was destroyed" do
-          Invite.invite_by_email(iceking, inviter, topic).destroy!
-          invite = Invite.invite_by_email(iceking, inviter, topic)
-          expect(invite).to be_present
-        end
-      end
-
-      context 'after created' do
-        let(:invite) { Invite.invite_by_email(iceking, inviter, topic) }
-
-        it 'belongs to the topic' do
-          expect(topic.invites).to eq([invite])
-          expect(invite.topics).to eq([topic])
-        end
-
-        context 'when added by another user' do
-          fab!(:coding_horror) { Fabricate(:coding_horror) }
-
-          let(:new_invite) do
-            Invite.invite_by_email(iceking, coding_horror, topic)
-          end
-
-          it 'returns a different invite' do
-            expect(new_invite).not_to eq(invite)
-            expect(new_invite.invite_key).not_to eq(invite.invite_key)
-            expect(new_invite.topics).to eq([topic])
-          end
-        end
-
-        context 'when adding a duplicate' do
-          it 'returns the original invite' do
-            %w{
-              iceking@adventuretime.ooo
-              iceking@ADVENTURETIME.ooo
-              ICEKING@adventuretime.ooo
-            }.each do |email|
-              expect(Invite.invite_by_email(
-                email, inviter, topic
-              )).to eq(invite)
-            end
-          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 eq_time(Time.zone.now)
-          end
-
-          it 'returns a new invite if the other has expired' do
-            SiteSetting.invite_expiry_days = 1
-            invite.update!(expires_at: 2.days.ago)
-
-            new_invite = Invite.invite_by_email(
-              'iceking@adventuretime.ooo', inviter, topic
-            )
-
-            expect(new_invite).not_to eq(invite)
-            expect(new_invite).not_to be_expired
-          end
-        end
-
-        context 'when adding to another topic' do
-          fab!(:another_topic) { Fabricate(:topic, user: topic.user) }
-
-          it 'should be the same invite' do
-            new_invite = Invite.invite_by_email(iceking, inviter, another_topic)
-            expect(new_invite).to eq(invite)
-            expect(another_topic.invites).to eq([invite])
-            expect(invite.topics).to match_array([topic, another_topic])
-          end
-        end
-
-        it 'resets expiry of a resent invite' do
-          SiteSetting.invite_expiry_days = 2
-          invite.update!(invalidated_at: 10.days.ago, expires_at: 10.days.ago)
-          expect(invite).to be_expired
-
-          invite.resend_invite
-          expect(invite.invalidated_at).to be_nil
-          expect(invite).not_to be_expired
-        end
-
-        it 'correctly marks invite emailed_status for email invites' do
-          expect(invite.emailed_status).to eq(Invite.emailed_status_types[:sending])
-
-          Invite.invite_by_email(iceking, inviter, topic)
-          expect(invite.reload.emailed_status).to eq(Invite.emailed_status_types[:sending])
-        end
-
-        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_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_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)
+      it 'can be created' do
+        invite = Invite.generate(user, max_redemptions_allowed: 5)
+        expect(invite.max_redemptions_allowed).to eq(5)
+        expect(invite.expires_at.to_date).to eq(SiteSetting.invite_expiry_days.days.from_now.to_date)
+        expect(invite.emailed_status).to eq(Invite.emailed_status_types[:not_required])
+        expect(invite.is_invite_link?).to eq(true)
+        expect(invite.email_token).to eq(nil)
       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)
+        SiteSetting.invite_link_max_redemptions_limit_users = 3
+        expect { Invite.generate(user, max_redemptions_allowed: 4) }.to raise_error(ActiveRecord::RecordInvalid)
+
+        SiteSetting.invite_link_max_redemptions_limit = 3
+        expect { Invite.generate(Fabricate(:admin), max_redemptions_allowed: 4) }.to raise_error(ActiveRecord::RecordInvalid)
+      end
+    end
+
+    context 'when sending an invite to the same user' do
+      fab!(:invite) { Invite.generate(user, email: 'test@example.com') }
+
+      it 'returns the original invite' do
+        %w{test@EXAMPLE.com TEST@example.com}.each do |email|
+          expect(Invite.generate(user, email: email)).to eq(invite)
+        end
       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 }
+      it 'updates timestamp of existing invite' do
+        freeze_time
+        invite.update!(created_at: 10.days.ago)
+        resend_invite = Invite.generate(user, email: 'test@example.com')
+        expect(resend_invite).to eq(invite)
+        expect(resend_invite.created_at).to eq_time(Time.zone.now)
+      end
+
+      it 'returns a new invite if the other has expired' do
+        SiteSetting.invite_expiry_days = 1
+        invite.update!(expires_at: 2.days.ago)
+
+        new_invite = Invite.generate(user, email: 'test@example.com')
+        expect(new_invite).not_to eq(invite)
+        expect(new_invite).not_to be_expired
+      end
+
+      it 'returns a new invite when invited by a different user' do
+        invite = Invite.generate(user, email: 'test@example.com')
+        expect(invite.email).to eq('test@example.com')
+
+        another_invite = Invite.generate(Fabricate(:user), email: 'test@example.com')
+        expect(another_invite.email).to eq('test@example.com')
+
+        expect(invite.invite_key).not_to eq(another_invite.invite_key)
+      end
+    end
+
+    context 'invite to a topic' do
+      fab!(:topic) { Fabricate(:topic) }
+      let(:invite) { Invite.generate(topic.user, email: 'test@example.com', topic: topic) }
+
+      it 'belongs to the topic' do
+        expect(topic.invites).to contain_exactly(invite)
+        expect(invite.topics).to contain_exactly(topic)
+      end
+
+      context 'when adding to another topic' do
+        fab!(:another_topic) { Fabricate(:topic, user: topic.user) }
+
+        it 'should be the same invite' do
+          new_invite = Invite.generate(topic.user, email: 'test@example.com', topic: another_topic)
+          expect(invite).to eq(new_invite)
+          expect(invite.topics).to contain_exactly(topic, another_topic)
+          expect(topic.invites).to contain_exactly(invite)
+          expect(another_topic.invites).to contain_exactly(invite)
+        end
       end
     end
   end
 
-  context 'an existing user' do
-    fab!(:topic) { Fabricate(:topic, category_id: nil, archetype: 'private_message') }
-    fab!(:coding_horror) { Fabricate(:coding_horror) }
-
-    it "works" do
-      expect do
-        Invite.invite_by_email(coding_horror.email, topic.user, topic)
-      end.to raise_error(Invite::UserExists)
-    end
-  end
-
-  context 'a staged user' do
-    it 'creates an invite for a staged user' do
-      Fabricate(:staged, email: 'staged@account.com')
-      invite = Invite.invite_by_email('staged@account.com', Fabricate(:coding_horror))
-
-      expect(invite).to be_valid
-      expect(invite.email).to eq('staged@account.com')
-    end
-  end
-
-  context '.redeem' do
-
+  context '#redeem' do
     fab!(:invite) { Fabricate(:invite) }
 
+    it 'works' do
+      user = invite.redeem
+      expect(invite.invited_users.map(&:user)).to contain_exactly(user)
+      expect(user.is_a?(User)).to eq(true)
+      expect(user.trust_level).to eq(SiteSetting.default_invitee_trust_level)
+      expect(user.send_welcome_message).to eq(true)
+
+      expect(invite.reload.redemption_count).to eq(1)
+      expect(invite.redeem).to be_blank
+    end
+
+    it 'keeps custom fields' do
+      user_field = Fabricate(:user_field)
+      staged_user = Fabricate(:user, staged: true, email: invite.email)
+      staged_user.set_user_field(user_field.id, 'some value')
+      staged_user.save_custom_fields
+
+      expect(invite.redeem).to eq(staged_user)
+      expect(staged_user.reload.user_fields[user_field.id.to_s]).to eq('some value')
+    end
+
     it 'creates a notification for the invitee' do
-      expect { invite.redeem }.to change(Notification, :count)
+      expect { invite.redeem }.to change { Notification.count }
     end
 
-    it 'wont redeem an expired invite' do
-      SiteSetting.invite_expiry_days = 10
-      invite.update_column(:expires_at, 20.days.ago)
+    it 'does not work with expired invites' do
+      invite.update!(expires_at: 1.day.ago)
       expect(invite.redeem).to be_blank
     end
 
-    it 'wont redeem a deleted invite' do
-      invite.destroy
+    it 'does not work with deleted invites' do
+      invite.trash!
       expect(invite.redeem).to be_blank
     end
 
-    it "won't redeem an invalidated invite" do
-      invite.invalidated_at = 1.day.ago
+    it 'does not work with deleted invites' do
+      invite.destroy!
       expect(invite.redeem).to be_blank
     end
 
-    context "deletes duplicate invites" do
-      fab!(:another_user) { Fabricate(:user) }
-
-      it 'delete duplicate invite' do
-        another_invite = Fabricate(:invite, email: invite.email, invited_by: another_user)
-        invite.redeem
-        duplicate_invite = Invite.find_by(id: another_invite.id)
-        expect(duplicate_invite).to be_nil
-      end
-
-      it 'does not delete already redeemed invite' do
-        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
+    it 'does not work with invalidated invites' do
+      invite.update(invalidated_at: 1.day.ago)
+      expect(invite.redeem).to be_blank
     end
 
-    context "as a moderator" do
-      it "will give the user a moderator flag" do
-        invite.invited_by = Fabricate(:admin)
-        invite.moderator = true
-        invite.save
+    it 'deletes duplicate invite' do
+      another_invite = Fabricate(:invite, email: invite.email, invited_by: Fabricate(:user))
+      another_redeemed_invite = Fabricate(:invite, email: invite.email, invited_by: Fabricate(:user))
+      Fabricate(:invited_user, invite: another_redeemed_invite)
+
+      user = invite.redeem
+      expect(user).not_to eq(nil)
+      expect(Invite.find_by(id: another_invite.id)).to eq(nil)
+      expect(Invite.find_by(id: another_redeemed_invite.id)).not_to eq(nil)
+    end
+
+    context 'as a moderator' do
+      it 'will give the user a moderator flag' do
+        invite.update!(moderator: true, invited_by: Fabricate(:admin))
 
         user = invite.redeem
         expect(user).to be_moderator
       end
 
-      it "will not give the user a moderator flag if the inviter is not staff" do
-        invite.moderator = true
-        invite.save
+      it 'will not give the user a moderator flag if the inviter is not staff' do
+        invite.update!(moderator: true)
 
         user = invite.redeem
         expect(user).not_to be_moderator
       end
     end
 
-    context "when inviting to groups" do
-      it "add the user to the correct groups" 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
+        invite.invited_groups.create!(group_id: group.id)
 
         user = invite.redeem
-        expect(user.groups.count).to eq(1)
+        expect(user.groups).to contain_exactly(group)
       end
     end
 
-    context "invite trust levels" do
-      it "returns the trust level in default_invitee_trust_level" do
-        SiteSetting.default_invitee_trust_level = TrustLevel[3]
-        expect(invite.redeem.trust_level).to eq(TrustLevel[3])
-      end
+    it 'activates user when must_approve_users? is enabled' do
+      SiteSetting.must_approve_users = true
+      invite.invited_by = Fabricate(:admin)
+
+      user = invite.redeem
+      expect(user.approved?).to eq(true)
     end
 
-    context 'inviting when must_approve_users? is enabled' do
-      it 'correctly activates accounts' do
-        invite.invited_by = Fabricate(:admin)
-        SiteSetting.must_approve_users = true
-        user = invite.redeem
-        expect(user.approved?).to eq(true)
-      end
-    end
+    context 'invite to a topic' do
+      fab!(:topic) { Fabricate(:private_message_topic) }
+      fab!(:another_topic) { Fabricate(:private_message_topic) }
 
-    context 'simple invite' do
-      let!(:user) { invite.redeem }
-
-      it 'works correctly' do
-        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)
+      before do
+        invite.topic_invites.create!(topic: topic)
       end
 
-      context 'after redeeming' do
-        before do
-          invite.reload
-        end
-
-        it 'works correctly' do
-          # has set the user_id attribute
-          expect(invite.invited_users.first.user).to eq(user)
-
-          # returns true for redeemed
-          expect(invite).to be_redeemed
-        end
-
-        context 'again' do
-          it 'will not redeem twice' do
-            expect(invite.redeem).to be_blank
-          end
-        end
-      end
-    end
-
-    context 'invited to topics' do
-      fab!(:tl2_user) { Fabricate(:user, trust_level: 2) }
-      fab!(:topic) { Fabricate(:private_message_topic, user: tl2_user) }
-
-      let!(:invite) do
-        topic.invite(topic.user, 'jake@adventuretime.ooo')
-        Invite.find_by(invited_by_id: topic.user)
-      end
-
-      context 'redeem topic invite' do
-        it 'adds the user to the topic_users' do
-          user = invite.redeem
-          topic.reload
-          expect(topic.allowed_users.include?(user)).to eq(true)
-          expect(Guardian.new(user).can_see?(topic)).to eq(true)
-        end
-      end
-
-      context 'invited by another user to the same topic' do
-        fab!(:another_tl2_user) { Fabricate(:user, trust_level: 2) }
-        let!(:another_invite) { topic.invite(another_tl2_user, 'jake@adventuretime.ooo') }
-        let!(:user) { invite.redeem }
-
-        it 'adds the user to the topic_users' do
-          topic.reload
-          expect(topic.allowed_users.include?(user)).to eq(true)
-        end
-      end
-
-      context 'invited by another user to a different topic' do
-        let!(:user) { invite.redeem }
-        fab!(:another_tl2_user) { Fabricate(:user, trust_level: 2) }
-        fab!(:another_topic) { Fabricate(:topic, user: another_tl2_user) }
-
-        it 'adds the user to the topic_users of the first topic' do
-          expect(another_topic.invite(another_tl2_user, user.username)).to be_truthy # invited via username
-          expect(topic.allowed_users.include?(user)).to eq(true)
-        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)
+      it 'adds the user to topic_users' do
+        invited_user = invite.redeem
+        expect(invited_user).not_to eq(nil)
+        expect(topic.reload.allowed_users.include?(invited_user)).to eq(true)
+        expect(Guardian.new(invited_user).can_see?(topic)).to eq(true)
       end
     end
   end
 
-  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_pending_invites_from(inviter)
-
-        expect(invites).to include invite
-      end
-    end
-
-    context 'with user that has not invited' do
-      it 'does not return invites' do
-        user = Fabricate(:user)
-        Fabricate(:invite)
-
-        invites = Invite.find_all_pending_invites_from(user)
-
-        expect(invites).to be_empty
-      end
-    end
-  end
-
-  describe '.find_pending_invites_from' do
-    it 'returns pending invites only' do
-      inviter = Fabricate(:user)
-      redeemed_invite = Fabricate(
-        :invite,
-        invited_by: inviter,
-        email: 'redeemed@example.com'
-      )
-      Fabricate(:invited_user, invite: redeemed_invite, user: Fabricate(:user))
-
-      pending_invite = Fabricate(
-        :invite,
-        invited_by: inviter,
-        email: 'pending@example.com'
-      )
-
-      invites = Invite.find_pending_invites_from(inviter)
-
-      expect(invites.length).to eq(1)
-      expect(invites.first).to eq pending_invite
-
-      expect(Invite.find_pending_invites_count(inviter)).to eq(1)
-    end
-  end
-
-  describe '.find_redeemed_invites_from' do
-    it 'returns redeemed invites only' do
-      inviter = Fabricate(:user)
-      Fabricate(
-        :invite,
-        invited_by: inviter,
-        email: 'pending@example.com'
-      )
-
-      redeemed_invite = Fabricate(
-        :invite,
-        invited_by: inviter,
-        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.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
-    let(:email) { 'invite.me@example.com' }
-    subject { described_class.invalidate_for_email(email) }
-
-    it 'returns nil if there is no invite for the given email' do
-      expect(subject).to eq(nil)
-    end
-
-    it 'sets the matching invite to be invalid' do
-      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), 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)
-      expect(result).to be_valid
-    end
-  end
-
-  describe '.redeem_from_email' do
-    fab!(:inviter) { Fabricate(:user) }
-    fab!(:invite) { Fabricate(:invite, invited_by: inviter, email: 'test@example.com') }
+  describe '#redeem_from_email' do
+    fab!(:invite) { Fabricate(:invite, email: 'test@example.com') }
     fab!(:user) { Fabricate(:user, email: invite.email) }
 
     it 'redeems the invite from email' do
       Invite.redeem_from_email(user.email)
-      invite.reload
-      expect(invite).to be_redeemed
+      expect(invite.reload).to be_redeemed
     end
 
     it 'does not redeem the invite if email does not match' do
-      Invite.redeem_from_email('test24@example.com')
-      invite.reload
-      expect(invite).not_to be_redeemed
+      Invite.redeem_from_email('test2@example.com')
+      expect(invite.reload).not_to be_redeemed
     end
   end
 
-  describe '.resend_all_invites_from' do
-    it 'resends all non-redeemed invites by a user' do
-      SiteSetting.invite_expiry_days = 30
-      user = Fabricate(:user)
-      new_invite = Fabricate(:invite, invited_by: user)
-      expired_invite = Fabricate(:invite, invited_by: user)
-      expired_invite.update!(expires_at: 2.days.ago)
-      redeemed_invite = Fabricate(:invite, invited_by: user)
-      Fabricate(:invited_user, invite: redeemed_invite, user: Fabricate(:user))
-      redeemed_invite.update!(expires_at: 5.days.ago)
+  context 'scopes' do
+    fab!(:inviter) { Fabricate(:user) }
 
-      Invite.resend_all_invites_from(user.id)
-      new_invite.reload
-      expired_invite.reload
-      redeemed_invite.reload
+    fab!(:pending_invite) { Fabricate(:invite, invited_by: inviter, email: 'pending@example.com') }
+    fab!(:pending_link_invite) { Fabricate(:invite, invited_by: inviter, max_redemptions_allowed: 5) }
+    fab!(:pending_invite_from_another_user) { Fabricate(:invite) }
 
-      expect(new_invite.expires_at.to_date).to eq(30.days.from_now.to_date)
-      expect(expired_invite.expires_at.to_date).to eq(30.days.from_now.to_date)
-      expect(redeemed_invite.expires_at.to_date).to eq(5.days.ago.to_date)
+    fab!(:expired_invite) { Fabricate(:invite, invited_by: inviter, email: 'expired@example.com', expires_at: 1.day.ago) }
+
+    fab!(:redeemed_invite) { Fabricate(:invite, invited_by: inviter, email: 'redeemed@example.com') }
+    let!(:redeemed_invite_user) { redeemed_invite.redeem }
+
+    fab!(:partially_redeemed_invite) { Fabricate(:invite, invited_by: inviter, email: nil, max_redemptions_allowed: 5) }
+    let!(:partially_redeemed_invite_user) { partially_redeemed_invite.redeem(email: 'partially_redeemed_invite@example.com') }
+
+    fab!(:redeemed_and_expired_invite) { Fabricate(:invite, invited_by: inviter, email: 'redeemed_and_expired@example.com') }
+    let!(:redeemed_and_expired_invite_user) do
+      user = redeemed_and_expired_invite.redeem
+      redeemed_and_expired_invite.update!(expires_at: 1.day.ago)
+      user
+    end
+
+    fab!(:partially_redeemed_and_expired_invite) { Fabricate(:invite, invited_by: inviter, email: nil, max_redemptions_allowed: 5) }
+    let!(:partially_redeemed_and_expired_invite_user) do
+      user = partially_redeemed_and_expired_invite.redeem(email: 'partially_redeemed_and_expired_invite@example.com')
+      partially_redeemed_and_expired_invite.update!(expires_at: 1.day.ago)
+      user
+    end
+
+    describe '#pending' do
+      it 'returns pending invites only' do
+        expect(Invite.pending(inviter)).to contain_exactly(
+          pending_invite, pending_link_invite, partially_redeemed_invite
+        )
+      end
+    end
+
+    describe '#expired' do
+      it 'returns expired invites only' do
+        expect(Invite.expired(inviter)).to contain_exactly(
+          expired_invite, partially_redeemed_and_expired_invite
+        )
+      end
+    end
+
+    describe '#redeemed_users' do
+      it 'returns redeemed users' do
+        expect(Invite.redeemed_users(inviter).map(&:user)).to contain_exactly(
+          redeemed_invite_user, partially_redeemed_invite_user, redeemed_and_expired_invite_user, partially_redeemed_and_expired_invite_user
+        )
+      end
+
+      it 'returns redeemed users for trashed invites' do
+        [redeemed_invite, partially_redeemed_invite, redeemed_and_expired_invite, partially_redeemed_and_expired_invite].each(&:trash!)
+
+        expect(Invite.redeemed_users(inviter).map(&:user)).to contain_exactly(
+          redeemed_invite_user, partially_redeemed_invite_user, redeemed_and_expired_invite_user, partially_redeemed_and_expired_invite_user
+        )
+      end
     end
   end
 
-  describe '.rescind_all_expired_invites_from' do
-    it 'removes all expired invites sent by a user' do
-      SiteSetting.invite_expiry_days = 1
-      user = Fabricate(:user)
-      invite_1 = Fabricate(:invite, invited_by: user)
-      invite_2 = Fabricate(:invite, invited_by: user)
-      expired_invite = Fabricate(:invite, invited_by: user)
-      expired_invite.update!(expires_at: 2.days.ago)
-      Invite.rescind_all_expired_invites_from(user)
-      invite_1.reload
-      invite_2.reload
-      expired_invite.reload
-      expect(invite_1.deleted_at).to eq(nil)
-      expect(invite_2.deleted_at).to eq(nil)
-      expect(expired_invite.deleted_at).to be_present
+  describe '#invalidate_for_email' do
+    it 'returns nil if there is no invite for the given email' do
+      invite = Invite.invalidate_for_email('test@example.com')
+      expect(invite).to eq(nil)
+    end
+
+    it 'sets the matching invite to be invalid' do
+      invite = Fabricate(:invite, invited_by: Fabricate(:user), email: 'test@example.com')
+      result = Invite.invalidate_for_email('test@example.com')
+
+      expect(result).to eq(invite)
+      expect(result.link_valid?).to eq(false)
+    end
+
+    it 'sets the matching invite to be invalid without being case-sensitive' do
+      invite = Fabricate(:invite, invited_by: Fabricate(:user), email: 'test@Example.COM')
+      result = Invite.invalidate_for_email('test@EXAMPLE.com')
+
+      expect(result).to eq(invite)
+      expect(result.link_valid?).to eq(false)
     end
   end
 
-  describe '#emailed_status_types' do
-    context "verify enum sequence" do
-      before do
-        @emailed_status_types = Invite.emailed_status_types
-      end
+  describe '#resend_email' do
+    fab!(:invite) { Fabricate(:invite) }
 
-      it "'not_required' should be at 0 position" do
-        expect(@emailed_status_types[:not_required]).to eq(0)
-      end
+    it 'resets expiry of a resent invite' do
+      invite.update!(invalidated_at: 10.days.ago, expires_at: 10.days.ago)
+      expect(invite).to be_expired
 
-      it "'sent' should be at 4th position" do
-        expect(@emailed_status_types[:sent]).to eq(4)
-      end
+      invite.resend_invite
+      expect(invite).not_to be_expired
+      expect(invite.invalidated_at).to be_nil
     end
   end
 end
diff --git a/spec/models/locale_site_setting_spec.rb b/spec/models/locale_site_setting_spec.rb
index 75fedf7568..73b1022d68 100644
--- a/spec/models/locale_site_setting_spec.rb
+++ b/spec/models/locale_site_setting_spec.rb
@@ -90,15 +90,15 @@ describe LocaleSiteSetting do
         expect(LocaleSiteSetting.fallback_locale('foo')).to be_nil
       end
 
-      it 'returns English for English (United States)' do
-        expect(LocaleSiteSetting.fallback_locale('en_US')).to eq(:en)
+      it 'returns English for English (UK)' do
+        expect(LocaleSiteSetting.fallback_locale('en_GB')).to eq(:en)
       end
     end
   end
 
   describe '.fallback_locale' do
-    it 'returns English for English (United States)' do
-      expect(LocaleSiteSetting.fallback_locale('en_US')).to eq(:en)
+    it 'returns English for English (UK)' do
+      expect(LocaleSiteSetting.fallback_locale('en_GB')).to eq(:en)
     end
   end
 end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 1bde8f4e05..138ca3d76e 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -373,6 +373,24 @@ describe Notification do
     end
   end
 
+  describe "do not disturb" do
+    it "calls NotificationEmailer.process_notification when user is not in 'do not disturb'" do
+      user = Fabricate(:user)
+      notification = Notification.new(read: false, user_id: user.id, topic_id: 2, post_number: 1, data: '{}', notification_type: 1)
+      NotificationEmailer.expects(:process_notification).with(notification)
+      notification.save!
+    end
+
+    it "doesn't call NotificationEmailer.process_notification when user is in 'do not disturb'" do
+      freeze_time
+      user = Fabricate(:user)
+      Fabricate(:do_not_disturb_timing, user: user, starts_at: Time.zone.now, ends_at: 1.day.from_now)
+
+      notification = Notification.new(read: false, user_id: user.id, topic_id: 2, post_number: 1, data: '{}', notification_type: 1)
+      NotificationEmailer.expects(:process_notification).with(notification).never
+      notification.save!
+    end
+  end
 end
 
 # pulling this out cause I don't want an observer
@@ -488,6 +506,17 @@ describe Notification do
 
         expect(Notification.last.data_hash[:count]).to eq(5)
       end
+
+      it 'consolidates membership requests with "processed" false if user is in DND' do
+        user.do_not_disturb_timings.create(starts_at: Time.now, ends_at: 3.days.from_now)
+
+        create_membership_request_notification
+        create_membership_request_notification
+
+        notification = Notification.last
+        expect(notification.notification_type).to eq(Notification.types[:membership_request_consolidated])
+        expect(notification.shelved_notification).to be_present
+      end
     end
   end
 
@@ -512,4 +541,19 @@ describe Notification do
       expect(Notification.where(user_id: user.id).pluck(:id)).to contain_exactly(notification4.id, notification3.id)
     end
   end
+
+  describe "do not disturb" do
+    fab!(:user) { Fabricate(:user) }
+
+    it "creates a shelved_notification record when created while user is in DND" do
+      user.do_not_disturb_timings.create(starts_at: Time.now, ends_at: 3.days.from_now)
+      notification = Notification.create(read: false, user_id: user.id, topic_id: 2, post_number: 1, data: '{}', notification_type: 1)
+      expect(notification.shelved_notification).to be_present
+    end
+
+    it "doesn't create a shelved_notification record when created while user is isn't DND" do
+      notification = Notification.create(read: false, user_id: user.id, topic_id: 2, post_number: 1, data: '{}', notification_type: 1)
+      expect(notification.shelved_notification).to be_nil
+    end
+  end
 end
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 5ffc7d7db5..dc71f1e001 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -88,6 +88,7 @@ describe PostAction do
       topic.reload
       expect(topic.posts.count).to eq(2)
       expect(topic.posts.last.post_type).to eq(Post.types[:moderator_action])
+      expect(topic.message_archived?(mod)).to eq(true)
     end
 
   end
@@ -764,9 +765,7 @@ describe PostAction do
 
         freeze_time timer.execute_at
 
-        expect_enqueued_with(job: :toggle_topic_closed, args: { topic_timer_id: timer.id, state: false }, at: Time.zone.now + 1.hour) do
-          Jobs::ToggleTopicClosed.new.execute(topic_timer_id: timer.id, state: false)
-        end
+        Jobs::OpenTopic.new.execute(topic_timer_id: timer.id)
 
         expect(topic.reload.closed).to eq(true)
         expect(timer.reload.execute_at).to eq_time(1.hour.from_now)
diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb
index dccd31597c..8fad7b0cae 100644
--- a/spec/models/post_analyzer_spec.rb
+++ b/spec/models/post_analyzer_spec.rb
@@ -119,7 +119,7 @@ describe PostAnalyzer do
     let(:raw_post_one_image_md) { "![sherlock](http://bbc.co.uk/sherlock.jpg)" }
     let(:raw_post_two_images_html) { "<img src='http://discourse.org/logo.png'> <img src='http://bbc.co.uk/sherlock.jpg'>" }
     let(:raw_post_with_avatars) { '<img alt="smiley" title=":smiley:" src="/assets/emoji/smiley.png" class="avatar"> <img alt="wink" title=":wink:" src="/assets/emoji/wink.png" class="avatar">' }
-    let(:raw_post_with_favicon) { '<img src="/assets/favicons/wikipedia.png" class="favicon">' }
+    let(:raw_post_with_favicon) { '<img src="/images/favicons/discourse.png" class="favicon">' }
     let(:raw_post_with_thumbnail) { '<img src="/assets/emoji/smiley.png" class="thumbnail">' }
     let(:raw_post_with_two_classy_images) { "<img src='http://discourse.org/logo.png' class='classy'> <img src='http://bbc.co.uk/sherlock.jpg' class='classy'>" }
     let(:raw_post_with_two_embedded_media) { '<video width="950" height="700" controls><source src="https://bbc.co.uk/news.mp4" type="video/mp4"></video><audio controls><source type="audio/mpeg" src="https://example.com/audio.mp3"></audio>' }
@@ -174,6 +174,8 @@ describe PostAnalyzer do
     let(:raw_post_one_link_md) { "[sherlock](http://www.bbc.co.uk/programmes/b018ttws)" }
     let(:raw_post_two_links_html) { "<a href='http://discourse.org'>discourse</a> <a href='http://twitter.com'>twitter</a>" }
     let(:raw_post_with_mentions) { "hello @novemberkilo how are you doing?" }
+    let(:raw_post_with_anchors) { "# hello world" }
+    let(:raw_post_with_hashtags) { "a category #{Fabricate(:category).slug} and a tag #{Fabricate(:tag).name}" }
 
     it "returns 0 links for an empty post" do
       post_analyzer = PostAnalyzer.new("Hello world", nil)
@@ -185,6 +187,17 @@ describe PostAnalyzer do
       expect(post_analyzer.link_count).to eq(0)
     end
 
+    it "returns 0 links for a post with anchors" do
+      post_analyzer = PostAnalyzer.new(raw_post_with_anchors, default_topic_id)
+      expect(post_analyzer.link_count).to eq(0)
+    end
+
+    it "returns 0 links for a post with mentions" do
+      SiteSetting.tagging_enabled = true
+      post_analyzer = PostAnalyzer.new(raw_post_with_hashtags, default_topic_id)
+      expect(post_analyzer.link_count).to eq(0)
+    end
+
     it "returns links with href=''" do
       post_analyzer = PostAnalyzer.new('<a href="">Hello world</a>', nil)
       expect(post_analyzer.link_count).to eq(1)
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index aebfefe12d..2729981a39 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -75,6 +75,7 @@ describe PostMover do
           notification = p2.user.notifications.where(notification_type: Notification.types[:moved_post]).first
 
           expect(notification.topic_id).to eq(p2.topic_id)
+          expect(notification.topic_id).not_to eq(old_topic_id)
           expect(notification.post_number).to eq(1)
 
           # no message for person who made the move
@@ -84,6 +85,7 @@ describe PostMover do
           notification = p6.user.notifications.where(notification_type: Notification.types[:moved_post]).first
 
           expect(notification.topic_id).to eq(p2.topic_id)
+          expect(notification.topic_id).not_to eq(old_topic_id)
 
           # this is the 3rd post we moved
           expect(notification.post_number).to eq(3)
@@ -383,6 +385,62 @@ describe PostMover do
               .to contain_exactly([1, 500], [2, 750])
           end
 
+          it "updates bookmark topic_ids to the new topic id and does not affect bookmarks for posts not moving" do
+            some_user = Fabricate(:user)
+            new_post = Fabricate(:post, topic: p1.topic)
+            bookmark1 = Fabricate(:bookmark, topic: p1.topic, post: p1, user: some_user)
+            bookmark2 = Fabricate(:bookmark, topic: p4.topic, post: p4)
+            bookmark3 = Fabricate(:bookmark, topic: p4.topic, post: p4)
+            bookmark4 = Fabricate(:bookmark, topic: new_post.topic, post: new_post)
+            new_topic = topic.move_posts(user, [p1.id, p4.id], title: "new testing topic name")
+            expect(bookmark1.reload.topic_id).to eq(new_topic.id)
+            expect(bookmark2.reload.topic_id).to eq(new_topic.id)
+            expect(bookmark3.reload.topic_id).to eq(new_topic.id)
+            expect(bookmark4.reload.topic_id).to eq(new_post.topic_id)
+          end
+
+          it "makes sure the topic_user.bookmarked value is reflected for users in the source and destination topic" do
+            Jobs.run_immediately!
+            user1 = Fabricate(:user)
+            user2 = Fabricate(:user)
+
+            bookmark1 = Fabricate(:bookmark, topic: p1.topic, post: p1, user: user1)
+            bookmark2 = Fabricate(:bookmark, topic: p4.topic, post: p4, user: user1)
+
+            bookmark3 = Fabricate(:bookmark, topic: p3.topic, post: p3, user: user2)
+            bookmark4 = Fabricate(:bookmark, topic: p4.topic, post: p4, user: user2)
+
+            tu1 = Fabricate(
+              :topic_user,
+              user: user1,
+              topic: p1.topic,
+              bookmarked: true,
+              notification_level: TopicUser.notification_levels[:watching],
+              last_read_post_number: 4,
+              highest_seen_post_number: 4,
+              last_emailed_post_number: 3
+            )
+            tu2 = Fabricate(
+              :topic_user,
+              user: user2,
+              topic: p1.topic,
+              bookmarked: true,
+              notification_level: TopicUser.notification_levels[:watching],
+              last_read_post_number: 4,
+              highest_seen_post_number: 4,
+              last_emailed_post_number: 3
+            )
+
+            new_topic = topic.move_posts(user, [p1.id, p4.id], title: "new testing topic name")
+            new_topic_user1 = TopicUser.find_by(topic: new_topic, user: user1)
+            new_topic_user2 = TopicUser.find_by(topic: new_topic, user: user2)
+
+            expect(tu1.reload.bookmarked).to eq(false)
+            expect(tu2.reload.bookmarked).to eq(true)
+            expect(new_topic_user1.bookmarked).to eq(true)
+            expect(new_topic_user2.bookmarked).to eq(true)
+          end
+
           context "read state and other stats per user" do
             def create_topic_user(user, opts = {})
               notification_level = opts.delete(:notification_level) || :regular
@@ -541,7 +599,7 @@ describe PostMover do
             # Should notify correctly
             notification = p2.user.notifications.where(notification_type: Notification.types[:moved_post]).first
 
-            expect(notification.topic_id).to eq(p2.topic_id)
+            expect(notification.topic_id).to eq(destination_topic.id)
             expect(notification.post_number).to eq(p2.post_number)
 
             # Should update last reads
@@ -598,6 +656,20 @@ describe PostMover do
             expect(Notification.exists?(admin_notification.id)).to eq(true)
           end
 
+          it "updates bookmark topic_ids to the new topic id and does not affect bookmarks for posts not moving" do
+            some_user = Fabricate(:user)
+            new_post = Fabricate(:post, topic: p3.topic)
+            bookmark1 = Fabricate(:bookmark, topic: p3.topic, post: p3, user: some_user)
+            bookmark2 = Fabricate(:bookmark, topic: p3.topic, post: p3)
+            bookmark3 = Fabricate(:bookmark, topic: p3.topic, post: p3)
+            bookmark4 = Fabricate(:bookmark, topic: new_post.topic, post: new_post)
+            topic.move_posts(user, [p3.id], destination_topic_id: destination_topic.id)
+            expect(bookmark1.reload.topic_id).to eq(destination_topic.id)
+            expect(bookmark2.reload.topic_id).to eq(destination_topic.id)
+            expect(bookmark3.reload.topic_id).to eq(destination_topic.id)
+            expect(bookmark4.reload.topic_id).to eq(new_post.topic_id)
+          end
+
           context "post timings" do
             fab!(:some_user) { Fabricate(:user) }
 
@@ -1145,6 +1217,7 @@ describe PostMover do
           notification = p2.user.notifications.where(notification_type: Notification.types[:moved_post]).first
 
           expect(notification.topic_id).to eq(p2.topic_id)
+          expect(notification.topic_id).not_to eq(old_message_id)
           expect(notification.post_number).to eq(1)
 
           # no message for person who made the move
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index edf5859bda..4108857b48 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -241,7 +241,7 @@ describe Post do
     let(:post_one_image) { post_with_body("![sherlock](http://bbc.co.uk/sherlock.jpg)", newuser) }
     let(:post_two_images) { post_with_body("<img src='http://discourse.org/logo.png'> <img src='http://bbc.co.uk/sherlock.jpg'>", newuser) }
     let(:post_with_avatars) { post_with_body('<img alt="smiley" title=":smiley:" src="/assets/emoji/smiley.png" class="avatar"> <img alt="wink" title=":wink:" src="/assets/emoji/wink.png" class="avatar">', newuser) }
-    let(:post_with_favicon) { post_with_body('<img src="/assets/favicons/wikipedia.png" class="favicon">', newuser) }
+    let(:post_with_favicon) { post_with_body('<img src="/images/favicons/discourse.png" class="favicon">', newuser) }
     let(:post_image_within_quote) { post_with_body('[quote]<img src="coolimage.png">[/quote]', newuser) }
     let(:post_image_within_code) { post_with_body('<code><img src="coolimage.png"></code>', newuser) }
     let(:post_image_within_pre) { post_with_body('<pre><img src="coolimage.png"></pre>', newuser) }
@@ -1301,6 +1301,21 @@ describe Post do
     end
   end
 
+  describe ".hide!" do
+    after do
+      Discourse.redis.flushdb
+    end
+
+    it "should ignore the duplicate check" do
+      p1 = Fabricate(:post)
+      p2 = Fabricate(:post, user: p1.user)
+      SiteSetting.unique_posts_mins = 10
+      p1.store_unique_post_key
+      p2.reload.hide!(PostActionType.types[:off_topic])
+      expect(p2).to be_hidden
+    end
+  end
+
   describe ".unhide!" do
     before { SiteSetting.unique_posts_mins = 5 }
 
@@ -1480,7 +1495,7 @@ describe Post 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
+        post.update_uploads_secure_status(source: "test")
 
         expect(PostUpload.where(post: post).joins(:upload).pluck(:upload_id, :secure)).to contain_exactly(
           [attachment_upload.id, true],
@@ -1492,7 +1507,7 @@ describe Post do
         SiteSetting.secure_media = false
         post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:private_message_topic, user: user))
         post.link_post_uploads
-        post.update_uploads_secure_status
+        post.update_uploads_secure_status(source: "test")
 
         expect(PostUpload.where(post: post).joins(:upload).pluck(:upload_id, :secure)).to contain_exactly(
           [attachment_upload.id, false],
@@ -1505,7 +1520,7 @@ describe Post do
         private_category = Fabricate(:private_category, group: Fabricate(:group))
         post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:topic, user: user, category: private_category))
         post.link_post_uploads
-        post.update_uploads_secure_status
+        post.update_uploads_secure_status(source: "test")
 
         expect(PostUpload.where(post: post).joins(:upload).pluck(:upload_id, :secure)).to contain_exactly(
           [attachment_upload.id, true],
@@ -1516,11 +1531,11 @@ describe Post do
       it "does not mark an upload as secure if it has already been used in a public topic" do
         post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:topic, user: user))
         post.link_post_uploads
-        post.update_uploads_secure_status
+        post.update_uploads_secure_status(source: "test")
 
         pm = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:private_message_topic, user: user))
         pm.link_post_uploads
-        pm.update_uploads_secure_status
+        pm.update_uploads_secure_status(source: "test")
 
         expect(PostUpload.where(post: pm).joins(:upload).pluck(:upload_id, :secure)).to contain_exactly(
           [attachment_upload.id, false],
@@ -1699,4 +1714,30 @@ describe Post do
       expect(urls).to be_empty
     end
   end
+
+  describe "#publish_changes_to_client!" do
+    fab!(:user1) { Fabricate(:user) }
+    fab!(:user3) { Fabricate(:user) }
+    fab!(:topic) { Fabricate(:private_message_topic, user: user1) }
+    fab!(:post) { Fabricate(:post, topic: topic) }
+    fab!(:group_user) { Fabricate(:group_user, user: user3) }
+    fab!(:topic_allowed_group) { Fabricate(:topic_allowed_group, topic: topic, group: group_user.group) }
+    let(:user2) { topic.allowed_users.last }
+
+    it 'send message to all users participating in private conversation' do
+      freeze_time
+      message = {
+        id: post.id,
+        post_number: post.post_number,
+        updated_at: Time.now,
+        user_id: post.user_id,
+        last_editor_id: post.last_editor_id,
+        type: :created,
+        version: post.version
+      }
+
+      MessageBus.expects(:publish).with("/topic/#{topic.id}", message, user_ids: [user1.id, user2.id, user3.id]).once
+      post.publish_change_to_clients!(:created)
+    end
+  end
 end
diff --git a/spec/models/post_timing_spec.rb b/spec/models/post_timing_spec.rb
index 43e3f051b6..fbcb8cf3a6 100644
--- a/spec/models/post_timing_spec.rb
+++ b/spec/models/post_timing_spec.rb
@@ -148,6 +148,15 @@ describe PostTiming do
       }.to change(@post, :reads).by(1)
     end
 
+    it "doesn't update the posts read count if the topic is a PM" do
+      pm = Fabricate(:private_message_post).topic
+      @timing_attrs = @timing_attrs.merge(topic_id: pm.id)
+
+      PostTiming.record_timing(@timing_attrs)
+
+      expect(@coding_horror.user_stat.posts_read_count).to eq(0)
+    end
+
     describe 'multiple calls' do
       it 'correctly works' do
         PostTiming.record_timing(@timing_attrs)
diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb
index 9bb82c9d5c..6511842e4f 100644
--- a/spec/models/remote_theme_spec.rb
+++ b/spec/models/remote_theme_spec.rb
@@ -40,6 +40,7 @@ describe RemoteTheme do
         "stylesheets/file.scss" => ".class1{color:red}",
         "stylesheets/empty.scss" => "",
         "javascripts/discourse/controllers/test.js.es6" => "console.log('test');",
+        "test/acceptance/theme-test.js" => "assert.ok(true);",
         "common/header.html" => "I AM HEADER",
         "common/random.html" => "I AM SILLY",
         "common/embedded.scss" => "EMBED",
@@ -74,7 +75,7 @@ describe RemoteTheme do
 
       expect(@theme.theme_modifier_set.serialize_topic_excerpts).to eq(true)
 
-      expect(@theme.theme_fields.length).to eq(10)
+      expect(@theme.theme_fields.length).to eq(11)
 
       mapped = Hash[*@theme.theme_fields.map { |f| ["#{f.target_id}-#{f.name}", f.value] }.flatten]
 
@@ -88,8 +89,9 @@ describe RemoteTheme do
       expect(mapped["3-yaml"]).to eq("boolean_setting: true")
 
       expect(mapped["4-en"]).to eq("sometranslations")
+      expect(mapped["7-acceptance/theme-test.js"]).to eq("assert.ok(true);")
 
-      expect(mapped.length).to eq(10)
+      expect(mapped.length).to eq(11)
 
       expect(@theme.settings.length).to eq(1)
       expect(@theme.settings.first.value).to eq(true)
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 576c713125..0b4c330af8 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -1237,6 +1237,33 @@ describe Report do
     end
   end
 
+  describe ".cache" do
+    let(:exception_report) { Report.find("exception_test", wrap_exceptions_in_test: true) }
+    let(:valid_report) { Report.find("valid_test", wrap_exceptions_in_test: true) }
+
+    before(:each) do
+      class Report
+        def self.report_exception_test(report)
+          report.data = x
+        end
+
+        def self.report_valid_test(report)
+          report.data = "success!"
+        end
+      end
+    end
+
+    it "caches exception reports for 1 minute" do
+      Discourse.cache.expects(:write).with(Report.cache_key(exception_report), exception_report.as_json, { expires_in: 1.minute })
+      Report.cache(exception_report)
+    end
+
+    it "caches valid reports for 35 minutes" do
+      Discourse.cache.expects(:write).with(Report.cache_key(valid_report), valid_report.as_json, { expires_in: 35.minutes })
+      Report.cache(valid_report)
+    end
+  end
+
   describe "top_uploads" do
     context "with no data" do
       it "works" do
diff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rb
index 07124680d8..339a7569a3 100644
--- a/spec/models/reviewable_flagged_post_spec.rb
+++ b/spec/models/reviewable_flagged_post_spec.rb
@@ -305,6 +305,23 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
     end
   end
 
+  describe 'recalculating the reviewable score' do
+    let(:expected_score) { 8 }
+    let(:reviewable) { Fabricate(:reviewable_flagged_post, score: expected_score) }
+
+    it "doesn't recalculate the score after ignore" do
+      reviewable.perform(moderator, :ignore)
+
+      expect(reviewable.score).to eq(expected_score)
+    end
+
+    it "doesn't recalculate the score after disagree" do
+      reviewable.perform(moderator, :disagree)
+
+      expect(reviewable.score).to eq(expected_score)
+    end
+  end
+
   def assert_pm_creation_enqueued(user_id, pm_type)
     expect(Jobs::SendSystemMessage.jobs.length).to eq(1)
       job = Jobs::SendSystemMessage.jobs[0]
diff --git a/spec/models/reviewable_post_spec.rb b/spec/models/reviewable_post_spec.rb
new file mode 100644
index 0000000000..26f0459e19
--- /dev/null
+++ b/spec/models/reviewable_post_spec.rb
@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ReviewablePost do
+  fab!(:admin) { Fabricate(:admin) }
+
+  describe '#build_actions' do
+    let(:post) { Fabricate.build(:post) }
+    let(:reviewable) { ReviewablePost.new(target: post) }
+    let(:guardian) { Guardian.new }
+
+    it 'Does not return available actions when the reviewable is no longer pending' do
+      available_actions = (Reviewable.statuses.keys - [:pending]).reduce([]) do |actions, status|
+        reviewable.status = Reviewable.statuses[status]
+
+        actions.concat reviewable_actions(guardian).to_a
+      end
+
+      expect(available_actions).to be_empty
+    end
+
+    it 'only shows the approve post action if users cannot delete the post' do
+      expect(reviewable_actions(guardian).has?(:approve)).to eq(true)
+      expect(reviewable_actions(guardian).has?(:reject_and_delete)).to eq(false)
+    end
+
+    it 'includes the reject and delete action if the user is allowed' do
+      expect(reviewable_actions(Guardian.new(admin)).has?(:reject_and_delete)).to eq(true)
+    end
+
+    it 'includes the approve post and unhide action if the post is hidden' do
+      post.hidden = true
+
+      actions = reviewable_actions(guardian)
+
+      expect(actions.has?(:approve_and_unhide)).to eq(true)
+    end
+
+    it 'includes the reject post and keep deleted action is the post is deleted' do
+      post.deleted_at = 1.day.ago
+
+      actions = reviewable_actions(guardian)
+
+      expect(actions.has?(:approve_and_restore)).to eq(false)
+      expect(actions.has?(:reject_and_keep_deleted)).to eq(true)
+    end
+
+    it 'includes an option to approve and restore the post if the user is allowed' do
+
+      post.deleted_at = 1.day.ago
+
+      actions = reviewable_actions(Guardian.new(admin))
+
+      expect(actions.has?(:approve_and_restore)).to eq(false)
+    end
+
+    def reviewable_actions(guardian)
+      actions = Reviewable::Actions.new(reviewable, guardian, {})
+      reviewable.build_actions(actions, guardian, {})
+
+      actions
+    end
+  end
+
+  describe 'Performing actions' do
+    let(:post) { Fabricate(:post) }
+    let(:reviewable) { ReviewablePost.needs_review!(target: post, created_by: admin) }
+
+    before { reviewable.created_new! }
+
+    describe '#perform_approve' do
+      it 'transitions to the approved state' do
+        result = reviewable.perform admin, :approve
+
+        expect(result.transition_to).to eq :approved
+      end
+    end
+
+    describe '#perform_reject_and_suspend' do
+      it 'transitions to the rejected state' do
+        result = reviewable.perform admin, :reject_and_suspend
+
+        expect(result.transition_to).to eq :rejected
+      end
+    end
+
+    describe '#perform_reject_and_keep_deleted' do
+      it 'transitions to the rejected state and keep the post deleted' do
+        post.trash!
+
+        result = reviewable.perform admin, :reject_and_keep_deleted
+
+        expect(result.transition_to).to eq :rejected
+        expect(Post.where(id: post.id).exists?).to eq(false)
+      end
+    end
+
+    describe '#perform_approve_and_restore' do
+      it 'transitions to the approved state and restores the post' do
+        post.trash!
+
+        result = reviewable.reload.perform admin, :approve_and_restore
+
+        expect(result.transition_to).to eq :approved
+        expect(Post.where(id: post.id).exists?).to eq(true)
+      end
+    end
+
+    describe '#perform_approve_and_unhide' do
+      it 'transitions to the approved state and unhides the post' do
+        post.update!(hidden: true)
+
+        result = reviewable.reload.perform admin, :approve_and_unhide
+
+        expect(result.transition_to).to eq :approved
+        expect(post.reload.hidden).to eq(false)
+      end
+    end
+
+    describe '#perform_reject_and_delete' do
+      it 'transitions to the rejected state and deletes the post' do
+        result = reviewable.perform admin, :reject_and_delete
+
+        expect(result.transition_to).to eq :rejected
+        expect(Post.where(id: post.id).exists?).to eq(false)
+      end
+    end
+  end
+end
diff --git a/spec/models/reviewable_score_spec.rb b/spec/models/reviewable_score_spec.rb
index 13524980fb..0da0443ad2 100644
--- a/spec/models/reviewable_score_spec.rb
+++ b/spec/models/reviewable_score_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe ReviewableScore, type: :model do
       expect(rs.reload).to be_disagreed
       expect(rs.reviewed_by).to eq(moderator)
       expect(rs.reviewed_at).to be_present
-      expect(reviewable.score).to eq(0.0)
+      expect(reviewable.score).to eq(4.0)
     end
 
     it "increases the score by the post action type's score bonus" do
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index e5246ef05d..2572da5e90 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -149,6 +149,18 @@ RSpec.describe Reviewable, type: :model do
           expect(reviewables).not_to include(qp)
         end
 
+        it 'can filter by who reviewed the flag' do
+          reviewable = Fabricate(:reviewable_flagged_post)
+          admin = Fabricate(:admin)
+          reviewable.perform(admin, :ignore)
+
+          reviewables = Reviewable.list_for(
+            user, status: :all, reviewed_by: admin.username
+          )
+
+          expect(reviewables).to contain_exactly(reviewable)
+        end
+
         it 'Does not filter by status when status parameter is set to all' do
           rejected_reviewable = Fabricate(:reviewable, target: post, status: Reviewable.statuses[:rejected])
           reviewables = Reviewable.list_for(user, status: :all)
diff --git a/spec/models/reviewable_user_spec.rb b/spec/models/reviewable_user_spec.rb
index ba00b8641d..b63c4901c9 100644
--- a/spec/models/reviewable_user_spec.rb
+++ b/spec/models/reviewable_user_spec.rb
@@ -27,6 +27,34 @@ RSpec.describe ReviewableUser, type: :model do
       expect(actions.has?(:approve_user)).to eq(false)
       expect(actions.has?(:reject_user_delete)).to eq(false)
     end
+
+    it 'can delete a user without a giving a rejection reason if the user was a spammer' do
+      reviewable.reviewable_scores.build(user: admin, reason: 'suspect_user')
+
+      assert_require_reject_reason(:reject_user_delete, false)
+    end
+
+    it 'requires a rejection reason to delete a user' do
+      assert_require_reject_reason(:reject_user_delete, true)
+    end
+
+    it 'can delete and block a user without giving a rejection reason if the user was a spammer' do
+      reviewable.reviewable_scores.build(user: admin, reason: 'suspect_user')
+
+      assert_require_reject_reason(:reject_user_block, false)
+    end
+
+    it 'requires a rejection reason to delete and block a user' do
+      assert_require_reject_reason(:reject_user_block, true)
+    end
+
+    def assert_require_reject_reason(id, expected)
+      actions = reviewable.actions_for(Guardian.new(moderator))
+
+      expect(actions.to_a.
+        find { |a| a.id == id }.require_reject_reason).
+        to eq(expected)
+    end
   end
 
   context "#update_fields" do
@@ -67,7 +95,7 @@ RSpec.describe ReviewableUser, type: :model do
       end
 
       it "allows us to reject a user" do
-        result = reviewable.perform(moderator, :reject_user_delete)
+        result = reviewable.perform(moderator, :reject_user_delete, reject_reason: "reject reason")
         expect(result.success?).to eq(true)
 
         expect(reviewable.pending?).to eq(false)
@@ -76,13 +104,17 @@ RSpec.describe ReviewableUser, type: :model do
         # Rejecting deletes the user record
         reviewable.reload
         expect(reviewable.target).to be_blank
+        expect(reviewable.reject_reason).to eq("reject reason")
+        expect(UserHistory.last.context).to eq(
+          I18n.t("user.destroy_reasons.reviewable_reject")
+        )
       end
 
       it "allows us to reject and block a user" do
         email = reviewable.target.email
         ip = reviewable.target.ip_address
 
-        result = reviewable.perform(moderator, :reject_user_block)
+        result = reviewable.perform(moderator, :reject_user_block, reject_reason: "reject reason")
         expect(result.success?).to eq(true)
 
         expect(reviewable.pending?).to eq(false)
@@ -91,11 +123,24 @@ RSpec.describe ReviewableUser, type: :model do
         # Rejecting deletes the user record
         reviewable.reload
         expect(reviewable.target).to be_blank
+        expect(reviewable.reject_reason).to eq("reject reason")
 
         expect(ScreenedEmail.should_block?(email)).to eq(true)
         expect(ScreenedIpAddress.should_block?(ip)).to eq(true)
       end
 
+      it "is not sending email to the user about rejection" do
+        SiteSetting.must_approve_users = true
+        Jobs::CriticalUserEmail.any_instance.expects(:execute).never
+        reviewable.perform(moderator, :reject_user_block, reject_reason: "reject reason")
+      end
+
+      it "optionaly sends email with reject reason" do
+        SiteSetting.must_approve_users = true
+        Jobs::CriticalUserEmail.any_instance.expects(:execute).with(type: :signup_after_reject, user_id: reviewable.target_id, reject_reason: "reject reason").once
+        reviewable.perform(moderator, :reject_user_block, reject_reason: "reject reason", send_email: true)
+      end
+
       it "allows us to reject a user who has posts" do
         Fabricate(:post, user: reviewable.target)
         result = reviewable.perform(moderator, :reject_user_delete)
diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb
index 9b87678b3f..cf9b5174b4 100644
--- a/spec/models/site_setting_spec.rb
+++ b/spec/models/site_setting_spec.rb
@@ -163,7 +163,7 @@ describe SiteSetting do
 
     it 'should act as a proxy to the new methods' do
       begin
-        original_settings = SiteSettings::DeprecatedSettings::SETTINGS
+        original_settings = SiteSettings::DeprecatedSettings::SETTINGS.dup
         SiteSettings::DeprecatedSettings::SETTINGS.clear
 
         SiteSettings::DeprecatedSettings::SETTINGS.push([
diff --git a/spec/models/site_spec.rb b/spec/models/site_spec.rb
index cf8a8ba9cc..78b3faec63 100644
--- a/spec/models/site_spec.rb
+++ b/spec/models/site_spec.rb
@@ -21,6 +21,8 @@ describe Site do
     default_theme = Fabricate(:theme)
     SiteSetting.default_theme_id = default_theme.id
     user_theme = Fabricate(:theme, user_selectable: true)
+    second_user_theme = Fabricate(:theme, user_selectable: true)
+    color_scheme = Fabricate(:color_scheme)
 
     anon_guardian = Guardian.new
     user_guardian = Guardian.new(Fabricate(:user))
@@ -39,6 +41,11 @@ describe Site do
     expect_correct_themes(anon_guardian)
     expect_correct_themes(user_guardian)
 
+    second_user_theme.color_scheme_id = color_scheme.id
+    second_user_theme.save!
+
+    expect_correct_themes(anon_guardian)
+    expect_correct_themes(user_guardian)
   end
 
   it "returns correct notification level for categories" do
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index e31b15b807..ea30571a2c 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -202,6 +202,14 @@ describe Tag do
     end
   end
 
+  context "full_url" do
+    let(:tag) { Fabricate(:tag, name: "🚀") }
+
+    it "percent encodes emojis" do
+      expect(tag.full_url).to eq("http://test.localhost/tag/%F0%9F%9A%80")
+    end
+  end
+
   context "synonyms" do
     let(:synonym) { Fabricate(:tag, target_tag: tag) }
 
diff --git a/spec/models/tag_user_spec.rb b/spec/models/tag_user_spec.rb
index 33f769f639..3777d8c8f0 100644
--- a/spec/models/tag_user_spec.rb
+++ b/spec/models/tag_user_spec.rb
@@ -232,4 +232,48 @@ describe TagUser do
       end
     end
   end
+
+  describe "#notification_levels_for" do
+    let!(:tag1) { Fabricate(:tag) }
+    let!(:tag2) { Fabricate(:tag) }
+    let!(:tag3) { Fabricate(:tag) }
+    let!(:tag4) { Fabricate(:tag) }
+
+    context "for anon" do
+      let(:user) { nil }
+      before do
+        SiteSetting.default_tags_watching = tag1.name
+        SiteSetting.default_tags_tracking = tag2.name
+        SiteSetting.default_tags_watching_first_post = tag3.name
+        SiteSetting.default_tags_muted = tag4.name
+      end
+      it "every tag from the default_tags_* site settings get overridden to watching_first_post, except for muted" do
+        levels = TagUser.notification_levels_for(user)
+        expect(levels[tag1.name]).to eq(TagUser.notification_levels[:regular])
+        expect(levels[tag2.name]).to eq(TagUser.notification_levels[:regular])
+        expect(levels[tag3.name]).to eq(TagUser.notification_levels[:regular])
+        expect(levels[tag4.name]).to eq(TagUser.notification_levels[:muted])
+      end
+    end
+
+    context "for a user" do
+      let(:user) { Fabricate(:user) }
+      before do
+        TagUser.create(user: user, tag: tag1, notification_level: TagUser.notification_levels[:watching])
+        TagUser.create(user: user, tag: tag2, notification_level: TagUser.notification_levels[:tracking])
+        TagUser.create(user: user, tag: tag3, notification_level: TagUser.notification_levels[:watching_first_post])
+        TagUser.create(user: user, tag: tag4, notification_level: TagUser.notification_levels[:muted])
+      end
+      it "gets the tag_user notification levels for all tags the user is tracking and does not
+      include tags the user is not tracking at all" do
+        tag5 = Fabricate(:tag)
+        levels = TagUser.notification_levels_for(user)
+        expect(levels[tag1.name]).to eq(TagUser.notification_levels[:watching])
+        expect(levels[tag2.name]).to eq(TagUser.notification_levels[:tracking])
+        expect(levels[tag3.name]).to eq(TagUser.notification_levels[:watching_first_post])
+        expect(levels[tag4.name]).to eq(TagUser.notification_levels[:muted])
+        expect(levels.key?(tag5.name)).to eq(false)
+      end
+    end
+  end
 end
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 2d20d1473c..b57a87d98f 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -150,20 +150,26 @@ HTML
     field = ThemeField.create!(theme_id: 1, target_id: 0, name: "scss", value: css)
     field.ensure_baked!
     expect(field.error).not_to eq(nil)
+
+    field.value = "@import 'missingfile';"
+    field.save!
+    field.ensure_baked!
+    expect(field.error).to include("File to import not found or unreadable: missingfile")
+
     field.value = "body {color: blue};"
     field.save!
     field.ensure_baked!
-
     expect(field.error).to eq(nil)
   end
 
   it "allows importing scss files" do
     theme = Fabricate(:theme)
-    main_field = theme.set_field(target: :common, name: :scss, value: ".class1{color: red}\n@import 'rootfile1';")
+    main_field = theme.set_field(target: :common, name: :scss, value: ".class1{color: red}\n@import 'rootfile1';\n@import 'rootfile3';")
     theme.set_field(target: :extra_scss, name: "rootfile1", value: ".class2{color:green}\n@import 'foldername/subfile1';")
     theme.set_field(target: :extra_scss, name: "rootfile2", value: ".class3{color:green} ")
     theme.set_field(target: :extra_scss, name: "foldername/subfile1", value: ".class4{color:yellow}\n@import 'subfile2';")
     theme.set_field(target: :extra_scss, name: "foldername/subfile2", value: ".class5{color:yellow}\n@import '../rootfile2';")
+    theme.set_field(target: :extra_scss, name: "rootfile3", value: ".class6{color:green} ")
 
     theme.save!
     result = main_field.compile_scss[0]
@@ -173,6 +179,7 @@ HTML
     expect(result).to include(".class3")
     expect(result).to include(".class4")
     expect(result).to include(".class5")
+    expect(result).to include(".class6")
   end
 
   it "correctly handles extra JS fields" do
@@ -185,34 +192,22 @@ HTML
     unknown_field = theme.set_field(target: :extra_js, name: "discourse/controllers/discovery.blah", value: "this wont work")
     theme.save!
 
-    expected_js = <<~JS
-      define("discourse/controllers/discovery", ["discourse/lib/ajax"], function (_ajax) {
-        "use strict";
+    js_field.reload
+    expect(js_field.value_baked).to include("if ('define' in window) {")
+    expect(js_field.value_baked).to include("define(\"discourse/theme-#{theme.id}/controllers/discovery\"")
+    expect(js_field.value_baked).to include("console.log('hello from .js.es6');")
 
-        var __theme_name__ = "#{theme.name}";
-
-        var settings = Discourse.__container__.lookup("service:theme-settings").getObjectForTheme(#{theme.id});
-
-        var themePrefix = function themePrefix(key) {
-          return "theme_translations.#{theme.id}.".concat(key);
-        };
-
-        console.log('hello from .js.es6');
-      });
-    JS
-    expect(js_field.reload.value_baked).to eq(expected_js.strip)
-
-    expect(hbs_field.reload.value_baked).to include('Ember.TEMPLATES["discovery"]')
+    expect(hbs_field.reload.value_baked).to include('Ember.TEMPLATES["javascripts/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('Ember.TEMPLATES["javascripts/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("define(\"discourse/theme-#{theme.id}/controllers/discovery\"")
+    expect(theme.javascript_cache.content).to include("define(\"discourse/theme-#{theme.id}/controllers/discovery-2\"")
     expect(theme.javascript_cache.content).to include("var settings =")
   end
 
diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb
index 3e78b15f8a..5b681a031b 100644
--- a/spec/models/theme_spec.rb
+++ b/spec/models/theme_spec.rb
@@ -126,24 +126,6 @@ describe Theme do
     expect(Theme.lookup_field(theme.id, :desktop, "head_tag")).to eq("<b>I am bold</b>")
   end
 
-  it "changing theme name should re-transpile HTML theme fields" do
-    theme.update!(name: "old_name")
-    html = <<~HTML
-      <script type='text/discourse-plugin' version='0.1'>
-        const x = 1;
-      </script>
-    HTML
-    theme.set_field(target: :common, name: "head_tag", value: html)
-    theme.save!
-    field = theme.theme_fields.where(value: html).first
-    old_value = field.value_baked
-
-    theme.update!(name: "new_name")
-    field.reload
-    new_value = field.value_baked
-    expect(old_value).not_to eq(new_value)
-  end
-
   it 'should precompile fragments in body and head tags' do
     with_template = <<HTML
     <script type='text/x-handlebars' name='template'>
@@ -276,7 +258,7 @@ HTML
     def transpile(html)
       f = ThemeField.create!(target_id: Theme.targets[:mobile], theme_id: 1, name: "after_header", value: html)
       f.ensure_baked!
-      [f.value_baked, f.javascript_cache]
+      [f.value_baked, f.javascript_cache, f]
     end
 
     it "transpiles ES6 code" do
@@ -286,10 +268,20 @@ HTML
         </script>
 HTML
 
-      baked, javascript_cache = transpile(html)
+      baked, javascript_cache, field = transpile(html)
       expect(baked).to include(javascript_cache.url)
-      expect(javascript_cache.content).to include('var x = 1;')
-      expect(javascript_cache.content).to include("_registerPluginCode('0.1'")
+
+      expect(javascript_cache.content).to include("if ('define' in window) {")
+      expect(javascript_cache.content).to include(
+        "define(\"discourse/theme-#{field.theme_id}/initializers/theme-field-#{field.id}-mobile-html-script-1\""
+      )
+      expect(javascript_cache.content).to include(
+        "settings = require(\"discourse/lib/theme-settings-store\").getObjectForTheme(#{field.theme_id});"
+      )
+      expect(javascript_cache.content).to include("name: \"theme-field-#{field.id}-mobile-html-script-1\",")
+      expect(javascript_cache.content).to include("after: \"inject-objects\",")
+      expect(javascript_cache.content).to include("(0, _pluginApi.withPluginApi)(\"0.1\", function (api) {")
+      expect(javascript_cache.content).to include("var x = 1;")
     end
 
     it "wraps constants calls in a readOnlyError function" do
@@ -328,7 +320,7 @@ HTML
       theme.reload
       expect(theme.theme_fields.find_by(name: :scss).error).to eq(nil)
 
-      scss, _map = Stylesheet::Compiler.compile('@import "common/foundation/variables"; @import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
+      scss, _map = Stylesheet::Manager.new(:desktop_theme, theme.id).compile(force: true)
       expect(scss).to include(upload.url)
     end
   end
@@ -339,7 +331,7 @@ HTML
       theme.set_field(target: :common, name: :scss, value: 'body {background-color: $background_color; font-size: $font-size}')
       theme.save!
 
-      scss, _map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
+      scss, _map = Stylesheet::Manager.new(:desktop_theme, theme.id).compile(force: true)
       expect(scss).to include("background-color:red")
       expect(scss).to include("font-size:25px")
 
@@ -347,7 +339,7 @@ HTML
       setting.value = '30px'
       theme.save!
 
-      scss, _map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
+      scss, _map = Stylesheet::Manager.new(:desktop_theme, theme.id).compile(force: true)
       expect(scss).to include("font-size:30px")
 
       # Escapes correctly. If not, compiling this would throw an exception
@@ -359,7 +351,7 @@ HTML
       theme.set_field(target: :common, name: :scss, value: 'body {font-size: quote($font-size)}')
       theme.save!
 
-      scss, _map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
+      scss, _map = Stylesheet::Manager.new(:desktop_theme, theme.id).compile(force: true)
       expect(scss).to include('font-size:"#{$fakeinterpolatedvariable}\a andanothervalue \'withquotes\'; margin: 0;\a"')
     end
 
@@ -369,83 +361,31 @@ HTML
       theme_field = theme.set_field(target: :common, name: :after_header, value: '<script type="text/discourse-plugin" version="1.0">alert(settings.name); let a = ()=>{};</script>')
       theme.save!
 
-      transpiled = <<~HTML
-      (function() {
-        if ('Discourse' in window && Discourse.__container__) {
-          Discourse.__container__
-            .lookup("service:theme-settings")
-            .registerSettings(#{theme.id}, {"name":"bob"});
-        }
-      })();
-      (function () {
-        if ('Discourse' in window && typeof Discourse._registerPluginCode === 'function') {
-          var __theme_name__ = "awesome theme\\\"";
-
-          var settings = Discourse.__container__.lookup("service:theme-settings").getObjectForTheme(#{theme.id});
-
-          var themePrefix = function themePrefix(key) {
-            return "theme_translations.#{theme.id}.".concat(key);
-          };
-
-          Discourse._registerPluginCode('1.0', function (api) {
-            try {
-              alert(settings.name);
-
-              var a = function a() {};
-            } catch (err) {
-              var rescue = require("discourse/lib/utilities").rescueThemeError;
-
-              rescue(__theme_name__, err, api);
-            }
-          });
-        }
-      })();
-      HTML
-
       theme_field.reload
       expect(Theme.lookup_field(theme.id, :desktop, :after_header)).to include(theme_field.javascript_cache.url)
-      expect(theme_field.javascript_cache.content).to eq(transpiled.strip)
+      expect(theme_field.javascript_cache.content).to include("if ('require' in window) {")
+      expect(theme_field.javascript_cache.content).to include(
+        "require(\"discourse/lib/theme-settings-store\").registerSettings(#{theme_field.theme.id}, {\"name\":\"bob\"});"
+      )
+      expect(theme_field.javascript_cache.content).to include("if ('define' in window) {")
+      expect(theme_field.javascript_cache.content).to include(
+        "define(\"discourse/theme-#{theme_field.theme.id}/initializers/theme-field-#{theme_field.id}-common-html-script-1\","
+      )
+      expect(theme_field.javascript_cache.content).to include("name: \"theme-field-#{theme_field.id}-common-html-script-1\",")
+      expect(theme_field.javascript_cache.content).to include("after: \"inject-objects\",")
+      expect(theme_field.javascript_cache.content).to include("(0, _pluginApi.withPluginApi)(\"1.0\", function (api)")
+      expect(theme_field.javascript_cache.content).to include("alert(settings.name)")
+      expect(theme_field.javascript_cache.content).to include("var a = function a() {}")
 
       setting = theme.settings.find { |s| s.name == :name }
       setting.value = 'bill'
       theme.save!
 
-      transpiled = <<~HTML
-      (function() {
-        if ('Discourse' in window && Discourse.__container__) {
-          Discourse.__container__
-            .lookup("service:theme-settings")
-            .registerSettings(#{theme.id}, {"name":"bill"});
-        }
-      })();
-      (function () {
-        if ('Discourse' in window && typeof Discourse._registerPluginCode === 'function') {
-          var __theme_name__ = "awesome theme\\\"";
-
-          var settings = Discourse.__container__.lookup("service:theme-settings").getObjectForTheme(#{theme.id});
-
-          var themePrefix = function themePrefix(key) {
-            return "theme_translations.#{theme.id}.".concat(key);
-          };
-
-          Discourse._registerPluginCode('1.0', function (api) {
-            try {
-              alert(settings.name);
-
-              var a = function a() {};
-            } catch (err) {
-              var rescue = require("discourse/lib/utilities").rescueThemeError;
-
-              rescue(__theme_name__, err, api);
-            }
-          });
-        }
-      })();
-      HTML
-
       theme_field.reload
+      expect(theme_field.javascript_cache.content).to include(
+        "require(\"discourse/lib/theme-settings-store\").registerSettings(#{theme_field.theme.id}, {\"name\":\"bill\"});"
+      )
       expect(Theme.lookup_field(theme.id, :desktop, :after_header)).to include(theme_field.javascript_cache.url)
-      expect(theme_field.javascript_cache.content).to eq(transpiled.strip)
     end
 
     it 'is empty when the settings are invalid' do
@@ -569,7 +509,7 @@ HTML
   it 'includes theme_uploads in settings' do
     Theme.destroy_all
 
-    upload = Fabricate(:upload)
+    upload = UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(-1)
     theme.set_field(type: :theme_upload_var, target: :common, name: "bob", upload_id: upload.id)
     theme.save!
 
@@ -578,6 +518,37 @@ HTML
     expect(json["theme_uploads"]["bob"]).to eq(upload.url)
   end
 
+  it 'uses CDN url for theme_uploads in settings' do
+    set_cdn_url("http://cdn.localhost")
+    Theme.destroy_all
+
+    upload = UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(-1)
+    theme.set_field(type: :theme_upload_var, target: :common, name: "bob", upload_id: upload.id)
+    theme.save!
+
+    json = JSON.parse(cached_settings(theme.id))
+
+    expect(json["theme_uploads"]["bob"]).to eq("http://cdn.localhost#{upload.url}")
+  end
+
+  it 'uses CDN url for settings of type upload' do
+    set_cdn_url("http://cdn.localhost")
+    Theme.destroy_all
+
+    upload = UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(-1)
+    theme.set_field(target: :settings, name: "yaml", value: <<~YAML)
+      my_upload:
+        type: upload
+        default: ""
+    YAML
+
+    ThemeSetting.create!(theme: theme, data_type: ThemeSetting.types[:upload], value: upload.url, name: "my_upload")
+    theme.save!
+
+    json = JSON.parse(cached_settings(theme.id))
+    expect(json["my_upload"]).to eq("http://cdn.localhost#{upload.url}")
+  end
+
   it 'handles settings cache correctly' do
     Theme.destroy_all
 
@@ -608,6 +579,78 @@ HTML
     expect(json).to match(/\"boolean_setting\":false/)
   end
 
+  describe "convert_settings" do
+
+    it 'can migrate a list field to a string field with json schema' do
+      theme.set_field(target: :settings, name: :yaml, value: "valid_json_schema_setting:\n  default: \"green,globe\"\n  type: \"list\"")
+      theme.save!
+
+      setting = theme.settings.find { |s| s.name == :valid_json_schema_setting }
+      setting.value = "red,globe|green,cog|brown,users"
+      theme.save!
+
+      expect(setting.type).to eq(ThemeSetting.types[:list])
+
+      yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/valid_settings.yaml")
+      theme.set_field(target: :settings, name: "yaml", value: yaml)
+      theme.save!
+
+      theme.convert_settings
+      setting = theme.settings.find { |s| s.name == :valid_json_schema_setting }
+
+      expect(JSON.parse(setting.value)).to eq(JSON.parse('[{"color":"red","icon":"globe"},{"color":"green","icon":"cog"},{"color":"brown","icon":"users"}]'))
+      expect(setting.type).to eq(ThemeSetting.types[:string])
+    end
+
+    it 'does not update setting if data does not validate against json schema' do
+      theme.set_field(target: :settings, name: :yaml, value: "valid_json_schema_setting:\n  default: \"green,globe\"\n  type: \"list\"")
+      theme.save!
+
+      setting = theme.settings.find { |s| s.name == :valid_json_schema_setting }
+
+      # json_schema_settings.yaml defines only two properties per object and disallows additionalProperties
+      setting.value = "red,globe,hey|green,cog,hey|brown,users,nay"
+      theme.save!
+
+      yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/valid_settings.yaml")
+      theme.set_field(target: :settings, name: "yaml", value: yaml)
+      theme.save!
+
+      expect { theme.convert_settings }.to raise_error("Schema validation failed")
+
+      setting.value = "red,globe|green,cog|brown"
+      theme.save!
+
+      expect { theme.convert_settings }.not_to raise_error
+
+      setting = theme.settings.find { |s| s.name == :valid_json_schema_setting }
+      expect(setting.type).to eq(ThemeSetting.types[:string])
+    end
+
+    it 'warns when the theme has modified the setting type but data cannot be converted' do
+      begin
+        @orig_logger = Rails.logger
+        Rails.logger = FakeLogger.new
+
+        theme.set_field(target: :settings, name: :yaml, value: "valid_json_schema_setting:\n  default: \"\"\n  type: \"list\"")
+        theme.save!
+
+        setting = theme.settings.find { |s| s.name == :valid_json_schema_setting }
+        setting.value = "red,globe"
+        theme.save!
+
+        theme.set_field(target: :settings, name: :yaml, value: "valid_json_schema_setting:\n  default: \"\"\n  type: \"string\"")
+        theme.save!
+
+        theme.convert_settings
+        expect(setting.value).to eq("red,globe")
+        expect(Rails.logger.warnings[0]).to include("Theme setting type has changed but cannot be converted.")
+      ensure
+        Rails.logger = @orig_logger
+      end
+    end
+  end
+
   describe "theme translations" do
     it "can list working theme_translation_manager objects" do
       en_translation = ThemeField.create!(theme_id: theme.id, name: "en", type_id: ThemeField.types[:yaml], target_id: Theme.targets[:translations], value: <<~YAML)
@@ -754,4 +797,109 @@ HTML
       expect(Theme.lookup_field(theme.id, :common, :after_header)).to include("_ws=someotherhostname.com")
     end
   end
+
+  describe "extra_scss" do
+    let(:scss) { "body { background: red}" }
+    let(:second_file_scss) { "p { color: blue};" }
+    let(:child_scss) { "body { background: green}" }
+
+    let(:theme) { Fabricate(:theme).tap { |t|
+      t.set_field(target: :extra_scss, name: "my_files/magic", value: scss)
+      t.set_field(target: :extra_scss, name: "my_files/magic2", value: second_file_scss)
+      t.save!
+    }}
+
+    let(:child_theme) { Fabricate(:theme).tap { |t|
+      t.component = true
+      t.set_field(target: :extra_scss, name: "my_files/moremagic", value: child_scss)
+      t.save!
+      theme.add_relative_theme!(:child, t)
+    }}
+
+    let(:compiler) {
+      manager = Stylesheet::Manager.new(:desktop_theme, theme.id)
+      manager.compile(force: true)
+    }
+
+    it "works when importing file by path" do
+      theme.set_field(target: :common, name: :scss, value: '@import "my_files/magic";')
+      theme.save!
+
+      css, _map = compiler
+      expect(css).to include("body{background:red}")
+    end
+
+    it "works when importing multiple files" do
+      theme.set_field(target: :common, name: :scss, value: '@import "my_files/magic"; @import "my_files/magic2"')
+      theme.save!
+
+      css, _map = compiler
+      expect(css).to include("body{background:red}")
+      expect(css).to include("p{color:blue}")
+    end
+
+    it "works for child themes" do
+      child_theme.set_field(target: :common, name: :scss, value: '@import "my_files/moremagic"')
+      child_theme.save!
+
+      manager = Stylesheet::Manager.new(:desktop_theme, child_theme.id)
+      css, _map = manager.compile(force: true)
+      expect(css).to include("body{background:green}")
+    end
+  end
+
+  describe "scss_variables" do
+    it "is empty by default" do
+      expect(theme.scss_variables).to eq(nil)
+    end
+
+    it "includes settings and uploads when set" do
+      theme.set_field(target: :settings, name: :yaml, value: "background_color: red\nfont_size: 25px")
+      upload = UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(-1)
+      theme.set_field(type: :theme_upload_var, target: :common, name: "bobby", upload_id: upload.id)
+      theme.save!
+
+      expect(theme.scss_variables).to include("$background_color: unquote(\"red\")")
+      expect(theme.scss_variables).to include("$font_size: unquote(\"25px\")")
+      expect(theme.scss_variables).to include("$bobby: ")
+    end
+  end
+
+  describe "#baked_js_tests_with_digest" do
+    before do
+      ThemeField.create!(
+        theme_id: theme.id,
+        target_id: Theme.targets[:settings],
+        name: "yaml",
+        value: "some_number: 1"
+      )
+      theme.set_field(
+        target: :tests_js,
+        type: :js,
+        name: "acceptance/some-test.js",
+        value: "assert.ok(true);"
+      )
+      theme.save!
+    end
+
+    it 'returns nil for content and digest if theme does not have tests' do
+      ThemeField.destroy_all
+      expect(theme.baked_js_tests_with_digest).to eq([nil, nil])
+    end
+
+    it 'digest does not change when settings are changed' do
+      content, digest = theme.baked_js_tests_with_digest
+      expect(content).to be_present
+      expect(digest).to be_present
+      expect(content).to include("assert.ok(true);")
+
+      theme.update_setting(:some_number, 55)
+      theme.save!
+      expect(theme.build_settings_hash[:some_number]).to eq(55)
+
+      new_content, new_digest = theme.baked_js_tests_with_digest
+      expect(new_content).to eq(content)
+      expect(new_digest).to eq(digest)
+    end
+  end
 end
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index d3dc1567b1..d73135a333 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -343,15 +343,31 @@ describe TopicEmbed do
         expect(response.body).to have_tag('a', with: { href: 'mailto:bar@example.com' })
       end
     end
+
+    context "malformed href" do
+      let(:url) { 'http://example.com/foo' }
+      let(:contents) { '<p><a href="(http://foo.bar)">Baz</a></p>' }
+      let!(:file) { StringIO.new }
+
+      before do
+        file.stubs(:read).returns contents
+        TopicEmbed.stubs(:open).returns file
+      end
+
+      it "doesn’t raise an exception" do
+        stub_request(:head, url)
+        expect { TopicEmbed.find_remote(url) }.not_to raise_error
+      end
+    end
   end
 
   describe '.absolutize_urls' do
     let(:invalid_url) { 'http://source.com/#double#anchor' }
     let(:contents) { "hello world new post <a href='/hello'>hello</a>" }
 
-    it "does not attempt absolutizing on a bad URI" do
+    it "handles badly formed URIs" do
       raw = TopicEmbed.absolutize_urls(invalid_url, contents)
-      expect(raw).to eq(contents)
+      expect(raw).to eq("hello world new post <a href=\"http://source.com/hello\">hello</a>")
     end
   end
 
diff --git a/spec/models/topic_list_spec.rb b/spec/models/topic_list_spec.rb
index fbf27ac901..97555b4617 100644
--- a/spec/models/topic_list_spec.rb
+++ b/spec/models/topic_list_spec.rb
@@ -90,4 +90,29 @@ describe TopicList do
       end
     end
   end
+
+  describe "#preload_key" do
+    let(:category) { Fabricate(:category) }
+    let(:tag) { Fabricate(:tag) }
+
+    it "generates correct key for categories" do
+      topic_list = TopicList.new('latest', nil, nil, category: category, category_id: category.id)
+      expect(topic_list.preload_key).to eq("topic_list_c/#{category.slug}/#{category.id}/l/latest")
+    end
+
+    it "generates correct key for 'no subcategories' option" do
+      topic_list = TopicList.new('latest', nil, nil, category: category, category_id: category.id, no_subcategories: true)
+      expect(topic_list.preload_key).to eq("topic_list_c/#{category.slug}/#{category.id}/none/l/latest")
+    end
+
+    it "generates correct key for tag" do
+      topic_list = TopicList.new('latest', nil, nil, tags: [tag])
+      expect(topic_list.preload_key).to eq("topic_list_tag/#{tag.name}/l/latest")
+    end
+
+    it "generates correct key when both category and tags are missing" do
+      topic_list = TopicList.new('latest', nil, nil, tags: Tag.none)
+      expect(topic_list.preload_key).to eq("topic_list_latest")
+    end
+  end
 end
diff --git a/spec/models/topic_posters_summary_spec.rb b/spec/models/topic_posters_summary_spec.rb
index 057b9ed936..bfe91114cc 100644
--- a/spec/models/topic_posters_summary_spec.rb
+++ b/spec/models/topic_posters_summary_spec.rb
@@ -20,8 +20,8 @@ describe TopicPostersSummary do
 
         summary.first.tap do |topic_poster|
           expect(topic_poster.user).to eq topic_creator
-          expect(topic_poster.description).to eq(
-            "#{I18n.t(:original_poster)}, #{I18n.t(:most_recent_poster)}"
+          expect(topic_poster.description).to eq([
+            I18n.t(:original_poster), I18n.t(:most_recent_poster)].join(I18n.t(:poster_description_joiner))
           )
         end
       end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 582db5785a..07f4de9684 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -37,6 +37,10 @@ describe Topic do
         end
 
         describe 'when title contains censored words' do
+          after do
+            WordWatcher.clear_cache!
+          end
+
           it 'should not be valid' do
             ['pineapple', 'pen'].each { |w| Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor]) }
 
@@ -88,6 +92,10 @@ describe Topic do
 
       describe 'blocked words' do
         describe 'when title contains watched words' do
+          after do
+            WordWatcher.clear_cache!
+          end
+
           it 'should not be valid' do
             Fabricate(:watched_word, word: 'pineapple', action: WatchedWord.actions[:block])
 
@@ -316,6 +324,15 @@ describe Topic do
       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
+
+      it "other errors will not be cleared" do
+        SiteSetting.min_topic_title_length = 5
+        topic.update!(title: "more than 5 characters but less than 134")
+        SiteSetting.min_topic_title_length = 134
+        new_topic_different_cat.title = "more than 5 characters but less than 134"
+        expect(new_topic_different_cat).not_to be_valid
+        expect(new_topic_different_cat.errors[:title]).to include(I18n.t("errors.messages.too_short", count: 134))
+      end
     end
 
   end
@@ -720,13 +737,16 @@ describe Topic do
             Fabricate.build(:topic_allowed_user, user: user2)
           ]) }
 
+          before do
+            another_user.user_option.update!(enable_allowed_pm_users: true)
+          end
+
           it 'succeeds when inviter is in allowed list' do
             AllowedPmUser.create!(user: another_user, allowed_pm_user: user)
             expect(topic.invite(user, another_user.username)).to eq(true)
           end
 
           it 'should raise error when inviter not in allowed list' do
-            another_user.user_option.update!(enable_allowed_pm_users: true)
             AllowedPmUser.create!(user: another_user, allowed_pm_user: user2)
             expect { topic.invite(user, another_user.username) }
               .to raise_error(Topic::NotAllowed)
@@ -734,27 +754,21 @@ describe Topic do
           end
 
           it 'should succeed for staff even when not allowed' do
-            another_user.user_option.update!(enable_allowed_pm_users: true)
             AllowedPmUser.create!(user: another_user, allowed_pm_user: user2)
             expect(topic.invite(another_user, admin.username)).to eq(true)
           end
 
           it 'should raise error when target_user is not in inviters allowed list' do
             user.user_option.update!(enable_allowed_pm_users: true)
-            another_user.user_option.update!(enable_allowed_pm_users: true)
             AllowedPmUser.create!(user: another_user, allowed_pm_user: user)
             expect { topic.invite(user, another_user.username) }
               .to raise_error(Topic::NotAllowed)
               .with_message(I18n.t("topic_invite.sender_does_not_allow_pm"))
           end
 
-          it 'should raise error if target_user has not allowed any of the other participants' do
-            another_user.user_option.update!(enable_allowed_pm_users: true)
+          it 'succeeds when inviter is in allowed list even though other participants are not in allowed list' do
             AllowedPmUser.create!(user: another_user, allowed_pm_user: user)
-
-            expect { pm.invite(user, another_user.username) }
-              .to raise_error(Topic::NotAllowed)
-              .with_message(I18n.t("topic_invite.receiver_does_not_allow_other_user_pm"))
+            expect(pm.invite(user, another_user.username)).to eq(true)
           end
         end
       end
@@ -889,12 +903,14 @@ describe Topic do
           before { user.update!(trust_level: TrustLevel[2]) }
 
           it 'should create an invite' do
+            Jobs.run_immediately!
             expect(topic.invite(user, 'test@email.com')).to eq(true)
 
             invite = Invite.last
 
             expect(invite.email).to eq('test@email.com')
             expect(invite.invited_by).to eq(user)
+            expect(ActionMailer::Base.deliveries.last.body).to include(topic.title)
           end
         end
       end
@@ -904,7 +920,15 @@ describe Topic do
   context 'private message' do
     let(:coding_horror) { Fabricate(:coding_horror) }
     fab!(:evil_trout) { Fabricate(:evil_trout) }
-    let(:topic) { Fabricate(:private_message_topic, recipient: coding_horror) }
+    let(:topic) do
+      PostCreator.new(
+        Fabricate(:user),
+        title: "This is a private message",
+        raw: "This is my message to you-ou-ou",
+        archetype: Archetype.private_message,
+        target_usernames: coding_horror.username
+      ).create!.topic
+    end
 
     it "should integrate correctly" do
       expect(Guardian.new(topic.user).can_see?(topic)).to eq(true)
@@ -967,6 +991,7 @@ describe Topic do
             set_state!(group, user_muted, :muted)
 
             Notification.delete_all
+            Jobs.run_immediately!
             topic.invite_group(topic.user, group)
 
             expect(Notification.count).to eq(3)
@@ -1104,6 +1129,8 @@ describe Topic do
     end
 
     context 'visibility' do
+      let(:category) { Fabricate(:category_with_definition) }
+
       context 'disable' do
         it 'should not be visible and have correct counts' do
           topic.update_status('visible', false, @user)
@@ -1113,6 +1140,14 @@ describe Topic do
           expect(topic.bumped_at).to eq_time(@original_bumped_at)
         end
 
+        it 'decreases topic_count of topic category' do
+          topic.update!(category: category)
+          Category.update_stats
+
+          expect { topic.update_status('visible', false, @user) }
+            .to change { category.reload.topic_count }.by(-1)
+        end
+
         it 'removes itself as featured topic on user profiles' do
           user.user_profile.update(featured_topic_id: topic.id)
           expect(user.user_profile.featured_topic).to eq(topic)
@@ -1134,6 +1169,13 @@ describe Topic do
           expect(topic.moderator_posts_count).to eq(1)
           expect(topic.bumped_at).to eq_time(@original_bumped_at)
         end
+
+        it 'increases topic_count of topic category' do
+          topic.update!(category: category, visible: false)
+
+          expect { topic.update_status('visible', true, @user) }
+            .to change { category.reload.topic_count }.by(1)
+        end
       end
     end
 
@@ -1587,12 +1629,13 @@ describe Topic do
 
         describe 'when new category is set to auto close by default' do
           before do
+            freeze_time
             new_category.update!(auto_close_hours: 5)
             topic.user.update!(admin: true)
           end
 
           it 'should set a topic timer' do
-            freeze_time
+            now = Time.zone.now
 
             expect { topic.change_category_to_id(new_category.id) }
               .to change { TopicTimer.count }.by(1)
@@ -1603,7 +1646,7 @@ describe Topic do
 
             expect(topic_timer.user).to eq(Discourse.system_user)
             expect(topic_timer.topic).to eq(topic)
-            expect(topic_timer.execute_at).to eq_time(5.hours.from_now)
+            expect(topic_timer.execute_at).to be_within_one_minute_of(now + 5.hours)
           end
 
           describe 'when topic is already closed' do
@@ -1744,7 +1787,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], nil, by_user: admin, based_on_last_post: true, duration: 18)
+      topic.set_or_create_timer(TopicTimer.types[:close], nil, by_user: admin, based_on_last_post: true, duration_minutes: '1080')
       expect(topic.topic_timers.first.execute_at).to eq_time(18.hours.from_now)
     end
 
@@ -1756,10 +1799,13 @@ describe Topic do
 
     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(Time.zone.local(2013, 11, 19, 5, 0))
-      expect(topic.topic_timers.first.errors[:execute_at]).to be_present
+      expect do
+        topic.set_or_create_timer(
+          TopicTimer.types[:close],
+          '2013-11-19 5:00', by_user: admin
+        )
+      end.to raise_error(Discourse::InvalidParameters)
     end
 
     it "sets a validation error when give a timestamp of an invalid format" do
@@ -1857,7 +1903,7 @@ describe Topic do
         freeze_time
         Jobs.run_immediately!
 
-        expect(topic.topic_timers.first.execute_at).to eq_time(topic.created_at + 4.hours)
+        expect(topic.topic_timers.first.execute_at).to be_within_one_second_of(topic.created_at + 4.hours)
 
         topic.set_or_create_timer(TopicTimer.types[:close], 2, by_user: admin)
 
@@ -1865,7 +1911,7 @@ describe Topic do
 
         freeze_time 3.hours.from_now
 
-        TopicTimer.ensure_consistency!
+        Jobs::TopicTimerEnqueuer.new.execute
         expect(topic.reload.closed).to eq(true)
       end
     end
@@ -1916,6 +1962,17 @@ describe Topic do
         expect(Topic.for_digest(user, 1.year.ago)).to eq([])
       end
 
+      it "does return watched topics from muted categories" do
+        user = Fabricate(:user)
+        category = Fabricate(:category_with_definition, created_at: 2.minutes.ago)
+        topic = Fabricate(:topic, category: category, created_at: 1.minute.ago)
+
+        CategoryUser.set_notification_level_for_category(user, CategoryUser.notification_levels[:muted], category.id)
+        Fabricate(:topic_user, user: user, topic: topic, notification_level: TopicUser.notification_levels[:regular])
+
+        expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to eq([topic])
+      end
+
       it "doesn't return topics from suppressed categories" do
         user = Fabricate(:user)
         category = Fabricate(:category_with_definition, created_at: 2.minutes.ago)
@@ -2133,6 +2190,11 @@ describe Topic do
         topic = Fabricate(:topic, category: category, deleted_at: 1.day.ago)
         expect { topic.trash!(moderator) }.to_not change { category.reload.topic_count }
       end
+
+      it "doesn't subtract 1 if topic is unlisted" do
+        topic = Fabricate(:topic, category: category, visible: false)
+        expect { topic.trash!(moderator) }.to_not change { category.reload.topic_count }
+      end
     end
 
     it "trashes topic embed record" do
@@ -2158,6 +2220,11 @@ describe Topic do
         topic = Fabricate(:topic, category: category)
         expect { topic.recover! }.to_not change { category.reload.topic_count }
       end
+
+      it "doesn't add 1 if topic is not visible" do
+        topic = Fabricate(:topic, category: category, visible: false)
+        expect { topic.recover! }.to_not change { category.reload.topic_count }
+      end
     end
 
     it "recovers topic embed record" do
@@ -2733,4 +2800,57 @@ describe Topic do
       expect(topic.like_count).to eq(1)
     end
   end
+
+  describe "#incoming_email_addresses" do
+    fab!(:group) do
+      Fabricate(
+        :group,
+        smtp_server: "imap.gmail.com",
+        smtp_port: 587,
+        email_username: "discourse@example.com",
+        email_password: "discourse@example.com"
+      )
+    end
+
+    fab!(:topic) do
+      Fabricate(:private_message_topic,
+        topic_allowed_groups: [
+          Fabricate.build(:topic_allowed_group, group: group)
+        ]
+      )
+    end
+
+    let!(:incoming1) do
+      Fabricate(:incoming_email, to_addresses: "discourse@example.com", from_address: "johnsmith@user.com", topic: topic, post: topic.posts.first, created_at: 20.minutes.ago)
+    end
+    let!(:incoming2) do
+      Fabricate(:incoming_email, from_address: "discourse@example.com", to_addresses: "johnsmith@user.com", topic: topic, post: Fabricate(:post, topic: topic), created_at: 10.minutes.ago)
+    end
+    let!(:incoming3) do
+      Fabricate(:incoming_email, to_addresses: "discourse@example.com", from_address: "johnsmith@user.com", topic: topic, post: topic.posts.first, cc_addresses: "otherguy@user.com", created_at: 2.minutes.ago)
+    end
+    let!(:incoming4) do
+      Fabricate(:incoming_email, to_addresses: "unrelated@test.com", from_address: "discourse@example.com", topic: topic, post: topic.posts.first, created_at: 1.minutes.ago)
+    end
+
+    it "returns an array of all the incoming email addresses" do
+      expect(topic.incoming_email_addresses).to match_array(
+        ["discourse@example.com", "johnsmith@user.com", "otherguy@user.com", "unrelated@test.com"]
+      )
+    end
+
+    it "returns an array of all the incoming email addresses where incoming was received before X" do
+      expect(topic.incoming_email_addresses(received_before: 5.minutes.ago)).to match_array(
+        ["discourse@example.com", "johnsmith@user.com"]
+      )
+    end
+
+    context "when the group is present" do
+      it "excludes incoming emails that are not to or CCd to the group" do
+        expect(topic.incoming_email_addresses(group: group)).not_to include(
+          "unrelated@test.com"
+        )
+      end
+    end
+  end
 end
diff --git a/spec/models/topic_timer_spec.rb b/spec/models/topic_timer_spec.rb
index dbb540950a..cff5316d5c 100644
--- a/spec/models/topic_timer_spec.rb
+++ b/spec/models/topic_timer_spec.rb
@@ -10,6 +10,34 @@ RSpec.describe TopicTimer, type: :model do
   before { freeze_time }
 
   context "validations" do
+    describe "pending_timers scope" do
+      it "does not return deleted timers" do
+        topic_timer.trash!
+        expect(TopicTimer.pending_timers.pluck(:id)).not_to include(topic_timer.id)
+      end
+
+      it "does not return timers in the future of the provided before time" do
+        topic_timer.update!(execute_at: 3.days.from_now)
+        expect(TopicTimer.pending_timers.pluck(:id)).not_to include(topic_timer.id)
+        expect(TopicTimer.pending_timers(2.days.from_now).pluck(:id)).not_to include(topic_timer.id)
+        topic_timer.update!(execute_at: 1.minute.ago, created_at: 10.minutes.ago)
+        expect(TopicTimer.pending_timers.pluck(:id)).to include(topic_timer.id)
+      end
+
+      describe "duration values" do
+        it "does not allow durations <= 0" do
+          topic_timer.duration_minutes = -1
+          topic_timer.save
+          expect(topic_timer.errors.full_messages.first).to include("Duration minutes must be greater than 0.")
+        end
+
+        it "does not allow crazy big durations (20 years in minutes)" do
+          topic_timer.duration_minutes = 21.years.to_i / 60
+          topic_timer.save
+          expect(topic_timer.errors.full_messages.first).to include("Duration minutes cannot be more than 20 years.")
+        end
+      end
+    end
     describe '#status_type' do
       it 'should ensure that only one active public topic status update exists' do
         topic_timer.update!(topic: topic)
@@ -20,6 +48,44 @@ RSpec.describe TopicTimer, type: :model do
       end
     end
 
+    describe "#typed_job_scheduled?" do
+      let(:scheduled_jobs) { Sidekiq::ScheduledSet.new }
+
+      after do
+        scheduled_jobs.clear
+      end
+
+      it "returns true if the job is scheduled" do
+        Sidekiq::Testing.disable! do
+          scheduled_jobs.clear
+          Jobs.enqueue_at(3.hours.from_now, :close_topic, topic_timer_id: topic_timer.id)
+          expect(topic_timer.typed_job_scheduled?).to eq(true)
+        end
+      end
+
+      it "returns false if the job is not already scheduled" do
+        Sidekiq::Testing.disable! do
+          scheduled_jobs.clear
+          expect(topic_timer.typed_job_scheduled?).to eq(false)
+        end
+      end
+
+      it "returns true if the toggle_topic_closed job is scheduled for close,open,silent_close types" do
+        Sidekiq::Testing.disable! do
+          scheduled_jobs.clear
+          topic_timer1 = Fabricate(:topic_timer, status_type: TopicTimer.types[:close])
+          Jobs.enqueue_at(3.hours.from_now, :toggle_topic_closed, topic_timer_id: topic_timer1.id)
+          topic_timer2 = Fabricate(:topic_timer, status_type: TopicTimer.types[:open])
+          Jobs.enqueue_at(3.hours.from_now, :toggle_topic_closed, topic_timer_id: topic_timer2.id)
+          topic_timer3 = Fabricate(:topic_timer, status_type: TopicTimer.types[:silent_close])
+          Jobs.enqueue_at(3.hours.from_now, :toggle_topic_closed, topic_timer_id: topic_timer3.id)
+          expect(topic_timer1.typed_job_scheduled?).to eq(true)
+          expect(topic_timer2.typed_job_scheduled?).to eq(true)
+          expect(topic_timer3.typed_job_scheduled?).to eq(true)
+        end
+      end
+    end
+
     describe '#execute_at' do
       describe 'when #execute_at is greater than #created_at' do
         it 'should be valid' do
@@ -91,21 +157,11 @@ RSpec.describe TopicTimer, type: :model do
         Jobs.expects(:cancel_scheduled_job).with(
           :toggle_topic_closed, topic_timer_id: topic_timer.id
         )
+        Jobs.expects(:cancel_scheduled_job).with(
+          :close_topic, topic_timer_id: topic_timer.id
+        )
 
-        expect_enqueued_with(job: :toggle_topic_closed, args: { topic_timer_id: topic_timer.id, state: true }, at: 3.days.from_now) do
-          topic_timer.update!(execute_at: 3.days.from_now, created_at: Time.zone.now)
-        end
-      end
-
-      describe 'when execute_at is smaller than the current time' do
-        it 'should enqueue the job immediately' do
-          expect_enqueued_with(job: :toggle_topic_closed, args: { topic_timer_id: topic_timer.id, state: true }, at: Time.zone.now) do
-            topic_timer.update!(
-              execute_at: Time.zone.now - 1.hour,
-              created_at: Time.zone.now - 2.hour
-            )
-          end
-        end
+        topic_timer.update!(execute_at: 3.days.from_now, created_at: Time.zone.now)
       end
     end
 
@@ -114,10 +170,11 @@ RSpec.describe TopicTimer, type: :model do
         Jobs.expects(:cancel_scheduled_job).with(
           :toggle_topic_closed, topic_timer_id: topic_timer.id
         )
+        Jobs.expects(:cancel_scheduled_job).with(
+          :close_topic, topic_timer_id: topic_timer.id
+        )
 
-        expect_enqueued_with(job: :toggle_topic_closed, args: { topic_timer_id: topic_timer.id, state: true }, at: topic_timer.execute_at) do
-          topic_timer.update!(user: admin)
-        end
+        topic_timer.update!(user: admin)
       end
     end
 
@@ -135,18 +192,9 @@ RSpec.describe TopicTimer, type: :model do
       end
 
       it 'should close the topic' do
-        topic_timer
+        topic_timer.send(:schedule_auto_open_job)
         expect(topic.reload.closed).to eq(true)
       end
-
-      describe 'when topic has been deleted' do
-        it 'should not queue the job' do
-          topic.trash!
-          topic_timer
-
-          expect(Jobs::ToggleTopicClosed.jobs).to eq([])
-        end
-      end
     end
 
     describe 'when a close topic status update is created for a closed topic' do
@@ -163,18 +211,9 @@ RSpec.describe TopicTimer, type: :model do
       end
 
       it 'should open the topic' do
-        topic_timer
+        topic_timer.send(:schedule_auto_close_job)
         expect(topic.reload.closed).to eq(false)
       end
-
-      describe 'when topic has been deleted' do
-        it 'should not queue the job' do
-          topic.trash!
-          topic_timer
-
-          expect(Jobs::ToggleTopicClosed.jobs).to eq([])
-        end
-      end
     end
 
     describe '#public_type' do
@@ -199,63 +238,38 @@ RSpec.describe TopicTimer, type: :model do
     end
   end
 
-  describe '.ensure_consistency!' do
-    it 'should enqueue jobs that have been missed' do
-      close_topic_timer = Fabricate(:topic_timer,
-        execute_at: Time.zone.now - 1.hour,
-        created_at: Time.zone.now - 2.hour
-      )
+  describe "runnable?" do
+    it "returns false if execute_at > now" do
+      topic_timer = Fabricate.build(:topic_timer,
+                                    execute_at: Time.zone.now + 1.hour,
+                                    user: Fabricate(:user),
+                                    topic: Fabricate(:topic)
+                                   )
 
-      open_topic_timer = Fabricate(:topic_timer,
-        status_type: described_class.types[:open],
-        execute_at: Time.zone.now - 1.hour,
-        created_at: Time.zone.now - 2.hour,
-        topic: Fabricate(:topic, closed: true)
-      )
+      expect(topic_timer.runnable?).to eq(false)
+    end
 
-      Fabricate(:topic_timer, execute_at: Time.zone.now + 1.hour)
+    it "returns false if timer is deleted" do
+      topic_timer = Fabricate.create(:topic_timer,
+                                    execute_at: Time.zone.now - 1.hour,
+                                    created_at: Time.zone.now - 2.hour,
+                                    user: Fabricate(:user),
+                                    topic: Fabricate(:topic)
+                                   )
+      topic_timer.trash!
 
-      trashed_close_topic_timer = Fabricate(:topic_timer,
-        execute_at: Time.zone.now - 1.hour,
-        created_at: Time.zone.now - 2.hour
-      )
+      expect(topic_timer.runnable?).to eq(false)
+    end
 
-      trashed_close_topic_timer.topic.trash!
+    it "returns true if execute_at < now" do
+      topic_timer = Fabricate.build(:topic_timer,
+                                    execute_at: Time.zone.now - 1.hour,
+                                    created_at: Time.zone.now - 2.hour,
+                                    user: Fabricate(:user),
+                                    topic: Fabricate(:topic)
+                                   )
 
-      trashed_open_topic_timer = Fabricate(:topic_timer,
-        execute_at: Time.zone.now - 1.hour,
-        created_at: Time.zone.now - 2.hour,
-        status_type: described_class.types[:open]
-      )
-
-      trashed_open_topic_timer.topic.trash!
-
-      # creating topic timers already enqueues jobs
-      # let's delete them to test ensure_consistency!
-      Sidekiq::Worker.clear_all
-
-      expect { described_class.ensure_consistency! }
-        .to change { Jobs::ToggleTopicClosed.jobs.count }.by(4)
-
-      expect(job_enqueued?(job: :toggle_topic_closed, args: {
-        topic_timer_id: close_topic_timer.id,
-        state: true
-      })).to eq(true)
-
-      expect(job_enqueued?(job: :toggle_topic_closed, args: {
-        topic_timer_id: open_topic_timer.id,
-        state: false
-      })).to eq(true)
-
-      expect(job_enqueued?(job: :toggle_topic_closed, args: {
-        topic_timer_id: trashed_close_topic_timer.id,
-        state: true
-      })).to eq(true)
-
-      expect(job_enqueued?(job: :toggle_topic_closed, args: {
-        topic_timer_id: trashed_open_topic_timer.id,
-        state: false
-      })).to eq(true)
+      expect(topic_timer.runnable?).to eq(true)
     end
   end
 end
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index b73093e3a3..f87eb2cbff 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -112,6 +112,59 @@ describe TopicTrackingState do
     end
   end
 
+  describe '#publish_unmuted' do
+    let(:user) do
+      Fabricate(:user, last_seen_at: Date.today)
+    end
+    let(:second_user) do
+      Fabricate(:user, last_seen_at: Date.today)
+    end
+    let(:third_user) do
+      Fabricate(:user, last_seen_at: Date.today)
+    end
+    let(:post) do
+      create_post(user: user)
+    end
+
+    it 'can correctly publish unmuted' do
+      Fabricate(:topic_tag, topic: topic)
+      SiteSetting.mute_all_categories_by_default = true
+      TopicUser.find_by(topic: topic, user: post.user).update(notification_level: 1)
+      CategoryUser.create!(category: topic.category, user: second_user, notification_level: 1)
+      TagUser.create!(tag: topic.tags.first, user: third_user, notification_level: 1)
+      TagUser.create!(tag: topic.tags.first, user: Fabricate(:user), notification_level: 0)
+      messages = MessageBus.track_publish("/latest") do
+        TopicTrackingState.publish_unmuted(topic)
+      end
+
+      unmuted_message = messages.find { |message| message.data["message_type"] == "unmuted" }
+      expect(unmuted_message.user_ids.sort).to eq([user.id, second_user.id, third_user.id].sort)
+      expect(unmuted_message.data["topic_id"]).to eq(topic.id)
+      expect(unmuted_message.data["message_type"]).to eq(described_class::UNMUTED_MESSAGE_TYPE)
+    end
+
+    it 'should not publish any message when notification level is not muted' do
+      SiteSetting.mute_all_categories_by_default = true
+      TopicUser.find_by(topic: topic, user: post.user).update(notification_level: 0)
+      messages = MessageBus.track_publish("/latest") do
+        TopicTrackingState.publish_unmuted(topic)
+      end
+      unmuted_messages = messages.select { |message| message.data["message_type"] == "unmuted" }
+
+      expect(unmuted_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: topic, user: post.user).update(notification_level: 1)
+      post.user.update(last_seen_at: 8.days.ago)
+      messages = MessageBus.track_publish("/latest") do
+        TopicTrackingState.publish_unmuted(topic)
+      end
+      unmuted_messages = messages.select { |message| message.data["message_type"] == "unmuted" }
+      expect(unmuted_messages).to eq([])
+    end
+  end
+
   describe '#publish_private_message' do
     fab!(:admin) { Fabricate(:admin) }
 
@@ -510,7 +563,7 @@ describe TopicTrackingState do
     end
   end
 
-  it "correctly handles seen categories" do
+  it "correctly handles dismissed topics" do
     freeze_time 1.minute.ago
     user = Fabricate(:user)
     post
@@ -518,6 +571,7 @@ describe TopicTrackingState do
     report = TopicTrackingState.report(user)
     expect(report.length).to eq(1)
 
+    DismissedTopicUser.create!(user_id: user.id, topic_id: post.topic_id, created_at: Time.zone.now)
     CategoryUser.create!(user_id: user.id,
                          notification_level: CategoryUser.notification_levels[:regular],
                          category_id: post.topic.category_id,
@@ -526,12 +580,6 @@ describe TopicTrackingState do
 
     report = TopicTrackingState.report(user)
     expect(report.length).to eq(0)
-
-    unfreeze_time
-    post.topic.touch(:created_at)
-
-    report = TopicTrackingState.report(user)
-    expect(report.length).to eq(1)
   end
 
   it "correctly handles capping" do
@@ -588,14 +636,6 @@ 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/spec/models/topic_user_spec.rb b/spec/models/topic_user_spec.rb
index 6884a95ec1..cba1710533 100644
--- a/spec/models/topic_user_spec.rb
+++ b/spec/models/topic_user_spec.rb
@@ -281,6 +281,7 @@ describe TopicUser do
           another_user = Fabricate(:user)
           group.add(another_user)
 
+          Jobs.run_immediately!
           topic.invite_group(target_user, group)
 
           expect(TopicUser.get(topic, another_user).notification_level)
@@ -454,6 +455,7 @@ describe TopicUser do
       user1 = Fabricate(:user)
 
       Jobs.run_immediately!
+      SiteSetting.disable_mailing_list_mode = false
       SiteSetting.default_email_mailing_list_mode = true
       SiteSetting.default_email_mailing_list_mode_frequency = 1
 
@@ -477,4 +479,32 @@ describe TopicUser do
     end
   end
 
+  it "correctly triggers an event on first visit" do
+    begin
+      tracked_user = Fabricate(:user)
+      post = create_post
+
+      called = 0
+      visits = []
+      user_first_visit = -> (topic_id, user_id) do
+        visits << "#{topic_id}-#{user_id}"
+        called += 1
+      end
+
+      DiscourseEvent.on(:topic_first_visited_by_user, &user_first_visit)
+
+      expect(called).to eq(0)
+
+      TopicUser.change(tracked_user, post.topic.id, total_msecs_viewed: 1)
+
+      expect(visits).to eq(["#{post.topic.id}-#{tracked_user.id}"])
+      expect(called).to eq(1)
+
+      TopicUser.change(tracked_user, post.topic.id, total_msecs_viewed: 2)
+
+      expect(called).to eq(1)
+    ensure
+      DiscourseEvent.off(:topic_first_visited_by_user, &user_first_visit)
+    end
+  end
 end
diff --git a/spec/models/translation_override_spec.rb b/spec/models/translation_override_spec.rb
index 6f54eafd35..dddb037ba1 100644
--- a/spec/models/translation_override_spec.rb
+++ b/spec/models/translation_override_spec.rb
@@ -6,7 +6,11 @@ describe TranslationOverride do
   context 'validations' do
     describe '#value' do
       before do
-        I18n.backend.store_translations(I18n.locale, some_key: '%{first} %{second}')
+        I18n.backend.store_translations(
+          I18n.locale,
+          "user_notifications.user_did_something" => '%{first} %{second}'
+        )
+
         I18n.backend.store_translations(:en, something: { one: '%{key1} %{key2}', other: '%{key3} %{key4}' })
       end
 
@@ -22,17 +26,46 @@ describe TranslationOverride do
           ))
         end
 
-        context 'when custom interpolation keys are included' do
-          it 'should be valid' do
+        context "when custom interpolation keys are included" do
+          [
+            "user_notifications.user_did_something",
+            "user_notifications.only_reply_by_email",
+            "user_notifications.only_reply_by_email_pm",
+            "user_notifications.reply_by_email",
+            "user_notifications.reply_by_email_pm",
+            "user_notifications.visit_link_to_respond",
+            "user_notifications.visit_link_to_respond_pm",
+          ].each do |i18n_key|
+            it "should validate keys for #{i18n_key}" do
+              interpolation_key_names = described_class::ALLOWED_CUSTOM_INTERPOLATION_KEYS.find do |keys, _|
+                keys.include?("user_notifications.user_")
+              end
+
+              string_with_interpolation_keys = interpolation_key_names.map { |x| "%{#{x}}" }.join(" ")
+
+              translation_override = TranslationOverride.upsert!(
+                I18n.locale,
+                i18n_key,
+                "#{string_with_interpolation_keys} %{something}",
+              )
+
+              expect(translation_override.errors.full_messages).to include(I18n.t(
+                "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
+                keys: "something"
+              ))
+            end
+          end
+
+          it "should validate keys that shouldn't be used outside of user_notifications" do
+            I18n.backend.store_translations(:en, "not_a_notification" => "Test %{key1}")
             translation_override = TranslationOverride.upsert!(
               I18n.locale,
-              'some_key',
-              "#{described_class::ALLOWED_CUSTOM_INTERPOLATION_KEYS['user_notifications.user_'].join(", ")} %{something}"
+              "not_a_notification",
+              "Overriden %{key1} %{topic_title_url_encoded}",
             )
-
             expect(translation_override.errors.full_messages).to include(I18n.t(
-              'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
-              keys: 'something'
+              "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
+              keys: "topic_title_url_encoded"
             ))
           end
         end
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index bf7024c04e..6613a29cb0 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -343,14 +343,14 @@ describe Upload do
   end
 
   describe '.update_secure_status' do
-    it "respects the secure_override_value parameter if provided" do
+    it "respects the override parameter if provided" do
       upload.update!(secure: true)
 
-      upload.update_secure_status(secure_override_value: true)
+      upload.update_secure_status(override: true)
 
       expect(upload.secure).to eq(true)
 
-      upload.update_secure_status(secure_override_value: false)
+      upload.update_secure_status(override: false)
 
       expect(upload.secure).to eq(false)
     end
diff --git a/spec/models/user_bookmark_list_spec.rb b/spec/models/user_bookmark_list_spec.rb
new file mode 100644
index 0000000000..a6327c349d
--- /dev/null
+++ b/spec/models/user_bookmark_list_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UserBookmarkList do
+  let(:params) { {} }
+  fab!(:user) { Fabricate(:user) }
+  let(:list) { UserBookmarkList.new(user: user, guardian: Guardian.new(user), params: params) }
+
+  before do
+    22.times do
+      Fabricate(:bookmark, user: user)
+    end
+  end
+
+  it "defaults to 20 per page" do
+    expect(list.per_page).to eq(20)
+  end
+
+  context "when the per_page param is too high" do
+    let(:params) { { per_page: 1000 } }
+
+    it "does not allow more than X bookmarks to be requested per page" do
+      expect(list.load.count).to eq(20)
+    end
+  end
+end
diff --git a/spec/models/user_notification_schedule_spec.rb b/spec/models/user_notification_schedule_spec.rb
new file mode 100644
index 0000000000..47ee14f812
--- /dev/null
+++ b/spec/models/user_notification_schedule_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe UserNotificationSchedule do
+  fab!(:user) { Fabricate(:user) }
+
+  describe "validations" do
+    it 'is invalid when no times are specified' do
+      schedule = UserNotificationSchedule.create({
+        user: user,
+        enabled: true
+      })
+      expect(schedule.errors.attribute_names).to eq([
+        :day_0_start_time,
+        :day_0_end_time,
+        :day_1_start_time,
+        :day_1_end_time,
+        :day_2_start_time,
+        :day_2_end_time,
+        :day_3_start_time,
+        :day_3_end_time,
+        :day_4_start_time,
+        :day_4_end_time,
+        :day_5_start_time,
+        :day_5_end_time,
+        :day_6_start_time,
+        :day_6_end_time,
+      ])
+    end
+
+    it 'is invalid when a start time is below -1' do
+      schedule = UserNotificationSchedule.new({
+        user: user,
+      }.merge(UserNotificationSchedule::DEFAULT))
+      schedule.day_0_start_time = -2
+      schedule.save
+      expect(schedule.errors.count).to eq(1)
+      expect(schedule.errors[:day_0_start_time]).to be_present
+    end
+
+    it 'invalid when an end time is greater than 1440' do
+      schedule = UserNotificationSchedule.new({
+        user: user,
+      }.merge(UserNotificationSchedule::DEFAULT))
+      schedule.day_0_end_time = 1441
+      schedule.save
+      expect(schedule.errors.count).to eq(1)
+      expect(schedule.errors[:day_0_end_time]).to be_present
+    end
+
+    it 'invalid when the start time is greater than the end time' do
+      schedule = UserNotificationSchedule.new({
+        user: user,
+      }.merge(UserNotificationSchedule::DEFAULT))
+      schedule.day_0_start_time = 1000
+      schedule.day_0_end_time = 800
+      schedule.save
+      expect(schedule.errors.count).to eq(1)
+      expect(schedule.errors[:day_0_start_time]).to be_present
+    end
+  end
+end
diff --git a/spec/models/user_search_spec.rb b/spec/models/user_search_spec.rb
index 5dad83c32b..c72abc8468 100644
--- a/spec/models/user_search_spec.rb
+++ b/spec/models/user_search_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rails_helper'
+require "rails_helper"
 
 describe UserSearch do
 
@@ -11,170 +11,163 @@ describe UserSearch do
   fab!(:topic2)    { Fabricate :topic }
   fab!(:topic3)    { Fabricate :topic }
   fab!(:topic4)    { Fabricate :topic }
-  fab!(:user1)     { Fabricate :user, username: "mrb", name: "Michael Madsen", last_seen_at: 10.days.ago }
-  fab!(:user2)     { Fabricate :user, username: "mrblue",   name: "Eddie Code", last_seen_at: 9.days.ago }
-  fab!(:user3)     { Fabricate :user, username: "mrorange", name: "Tim Roth", last_seen_at: 8.days.ago }
-  fab!(:user4)     { Fabricate :user, username: "mrpink",   name: "Steve Buscemi",  last_seen_at: 7.days.ago }
-  fab!(:user5)     { Fabricate :user, username: "mrbrown",  name: "Quentin Tarantino", last_seen_at: 6.days.ago }
-  fab!(:user6)     { Fabricate :user, username: "mrwhite",  name: "Harvey Keitel",  last_seen_at: 5.days.ago }
-  fab!(:inactive) { Fabricate :user, username: "Ghost", active: false }
+  fab!(:mr_b)      { Fabricate :user, username: "mrb",      name: "Michael Madsen",    last_seen_at: 10.days.ago }
+  fab!(:mr_blue)   { Fabricate :user, username: "mrblue",   name: "Eddie Code",        last_seen_at: 9.days.ago }
+  fab!(:mr_orange) { Fabricate :user, username: "mrorange", name: "Tim Roth",          last_seen_at: 8.days.ago }
+  fab!(:mr_pink)   { Fabricate :user, username: "mrpink",   name: "Steve Buscemi",     last_seen_at: 7.days.ago }
+  fab!(:mr_brown)  { Fabricate :user, username: "mrbrown",  name: "Quentin Tarantino", last_seen_at: 6.days.ago }
+  fab!(:mr_white)  { Fabricate :user, username: "mrwhite",  name: "Harvey Keitel",     last_seen_at: 5.days.ago }
+  fab!(:inactive)  { Fabricate :user, username: "Ghost", active: false }
   fab!(:admin)     { Fabricate :admin, username: "theadmin" }
   fab!(:moderator) { Fabricate :moderator, username: "themod" }
   fab!(:staged)    { Fabricate :staged }
 
   def search_for(*args)
-    UserSearch.new(*args).search
+    # mapping "username" so it's easier to debug
+    UserSearch.new(*args).search.map(&:username)
   end
 
-  context 'with a secure category' do
-    fab!(:group) { Fabricate :group }
-    fab!(:user) { Fabricate :user }
-    fab!(:searching_user) { Fabricate :user }
+  context "with a secure category" do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:searching_user) { Fabricate(:user) }
+    fab!(:group) { Fabricate(:group) }
+    fab!(:category) { Fabricate(:category, read_restricted: true, user: user) }
+
     before_all do
+      Fabricate(:category_group, category: category, group: group)
+
       group.add(user)
       group.add(searching_user)
       group.save
     end
-    fab!(:category) { Fabricate(:category,
-                        read_restricted: true,
-                        user: user)
-    }
-    before_all { Fabricate(:category_group, category: category, group: group) }
 
-    it 'autocompletes with people in the category' do
+    it "autocompletes with people in the category" do
       results = search_for("", searching_user: searching_user, category_id: category.id)
-
-      expect(user.username).to eq(results[0].username)
-      expect(results.length).to eq(1)
+      expect(results).to eq [user.username]
     end
 
-    it 'will lookup the category from the topic id' do
+    it "will lookup the category from the topic id" do
       topic = Fabricate(:topic, category: category)
-      _post = Fabricate(:post, user: topic.user, topic: topic)
+      Fabricate(:post, user: topic.user, topic: topic)
 
       results = search_for("", searching_user: searching_user, topic_id: topic.id)
 
-      expect(results.length).to eq(2)
-
-      expect(results.map(&:username)).to contain_exactly(
-        user.username, topic.user.username
-      )
+      expect(results).to eq [topic.user, user].map(&:username)
     end
 
-    it 'will raise an error if the user cannot see the category' do
+    it "will raise an error if the user cannot see the category" do
       expect do
         search_for("", searching_user: Fabricate(:user), category_id: category.id)
       end.to raise_error(Discourse::InvalidAccess)
     end
 
-    it 'will respect the group member visibility setting' do
+    it "will respect the group member visibility setting" do
       group.update(members_visibility_level: Group.visibility_levels[:owners])
       results = search_for("", searching_user: searching_user, category_id: category.id)
-      expect(results.length).to eq(0)
+      expect(results).to be_blank
 
       group.add_owner(searching_user)
       results = search_for("", searching_user: searching_user, category_id: category.id)
-      expect(results.length).to eq(1)
+      expect(results).to eq [user.username]
     end
 
   end
 
-  it 'allows for correct underscore searching' do
-    Fabricate(:user, username: 'Under_Score')
-    Fabricate(:user, username: 'undertaker')
+  it "allows for correct underscore searching" do
+    Fabricate(:user, username: "undertaker")
+    under_score = Fabricate(:user, username: "Under_Score")
 
-    expect(search_for("under_sc").length).to eq(1)
-    expect(search_for("under_").length).to eq(1)
+    expect(search_for("under_sc")).to eq [under_score.username]
+    expect(search_for("under_")).to eq [under_score.username]
   end
 
-  it 'allows filtering by group' do
+  it "allows filtering by group" do
+    sam = Fabricate(:user, username: "sam")
+    Fabricate(:user, username: "samantha")
+
     group = Fabricate(:group)
-    sam = Fabricate(:user, username: 'sam')
-    _samantha = Fabricate(:user, username: 'samantha')
     group.add(sam)
 
     results = search_for("sam", groups: [group])
-    expect(results.count).to eq(1)
+    expect(results).to eq [sam.username]
   end
 
-  it 'allows filtering by multiple groups' do
+  it "allows filtering by multiple groups" do
+    sam = Fabricate(:user, username: "sam")
+    samantha = Fabricate(:user, username: "samantha")
+
     group_1 = Fabricate(:group)
-    sam = Fabricate(:user, username: 'sam')
-    group_2 = Fabricate(:group)
-    samantha = Fabricate(:user, username: 'samantha')
     group_1.add(sam)
+
+    group_2 = Fabricate(:group)
     group_2.add(samantha)
 
     results = search_for("sam", groups: [group_1, group_2])
-    expect(results.count).to eq(2)
+    expect(results).to eq [sam, samantha].map(&:username)
   end
 
   context "with seed data" do
-    fab!(:post1) { Fabricate :post, user: user1, topic: topic }
-    fab!(:post2) { Fabricate :post, user: user2, topic: topic2 }
-    fab!(:post3) { Fabricate :post, user: user3, topic: topic }
-    fab!(:post4) { Fabricate :post, user: user4, topic: topic }
-    fab!(:post5) { Fabricate :post, user: user5, topic: topic3 }
-    fab!(:post6) { Fabricate :post, user: user6, topic: topic }
+    fab!(:post1) { Fabricate :post, user: mr_b, topic: topic }
+    fab!(:post2) { Fabricate :post, user: mr_blue, topic: topic2 }
+    fab!(:post3) { Fabricate :post, user: mr_orange, topic: topic }
+    fab!(:post4) { Fabricate :post, user: mr_pink, topic: topic }
+    fab!(:post5) { Fabricate :post, user: mr_brown, topic: topic3 }
+    fab!(:post6) { Fabricate :post, user: mr_white, topic: topic }
     fab!(:post7) { Fabricate :post, user: staged, topic: topic4 }
 
-    before { user6.update(suspended_at: 1.day.ago, suspended_till: 1.year.from_now) }
+    before { mr_white.update(suspended_at: 1.day.ago, suspended_till: 1.year.from_now) }
 
     it "can search by name and username" do
       # normal search
-      results = search_for(user1.name.split(" ").first)
-      expect(results.size).to eq(1)
-      expect(results.first.username).to eq(user1.username)
+      results = search_for(mr_b.name.split.first)
+      expect(results).to eq [mr_b.username]
 
       # lower case
-      results = search_for(user1.name.split(" ").first.downcase)
-      expect(results.size).to eq(1)
-      expect(results.first).to eq(user1)
+      results = search_for(mr_b.name.split.first.downcase)
+      expect(results).to eq [mr_b.username]
 
       # username
-      results = search_for(user4.username)
-      expect(results.size).to eq(1)
-      expect(results.first).to eq(user4)
+      results = search_for(mr_pink.username)
+      expect(results).to eq [mr_pink.username]
 
       # case insensitive
-      results = search_for(user4.username.upcase)
-      expect(results.size).to eq(1)
-      expect(results.first).to eq(user4)
+      results = search_for(mr_pink.username.upcase)
+      expect(results).to eq [mr_pink.username]
     end
 
     it "handles substring search correctly" do
-      # substrings
-      # only staff members see suspended users in results
       results = search_for("mr")
-      expect(results.size).to eq(5)
-      expect(results).not_to include(user6)
-      expect(search_for("mr", searching_user: user1).size).to eq(5)
+      expect(results).to eq [mr_brown, mr_pink, mr_orange, mr_blue, mr_b].map(&:username)
+
+      results = search_for("mr", searching_user: mr_b)
+      expect(results).to eq [mr_brown, mr_pink, mr_orange, mr_blue, mr_b].map(&:username)
+
+      # only staff members see suspended users in results
+      results = search_for("mr", searching_user: moderator)
+      expect(results).to eq [mr_white, mr_brown, mr_pink, mr_orange, mr_blue, mr_b].map(&:username)
 
       results = search_for("mr", searching_user: admin)
-      expect(results.size).to eq(6)
-      expect(results).to include(user6)
-      expect(search_for("mr", searching_user: moderator).size).to eq(6)
+      expect(results).to eq [mr_white, mr_brown, mr_pink, mr_orange, mr_blue, mr_b].map(&:username)
 
-      results = search_for(user1.username, searching_user: admin)
-      expect(results.size).to eq(3)
+      results = search_for(mr_b.username, searching_user: admin)
+      expect(results).to eq [mr_b, mr_brown, mr_blue].map(&:username)
 
       results = search_for("MR", searching_user: admin)
-      expect(results.size).to eq(6)
+      expect(results).to eq [mr_white, mr_brown, mr_pink, mr_orange, mr_blue, mr_b].map(&:username)
 
       results = search_for("MRB", searching_user: admin, limit: 2)
-      expect(results.size).to eq(2)
+      expect(results).to eq [mr_b, mr_brown].map(&:username)
     end
 
     it "prioritises topic participants" do
-      # topic priority
-      results = search_for(user1.username, topic_id: topic.id)
-      expect(results.first).to eq(user1)
+      results = search_for(mr_b.username, topic_id: topic.id)
+      expect(results).to eq [mr_b, mr_brown, mr_blue].map(&:username)
 
-      results = search_for(user1.username, topic_id: topic2.id)
-      expect(results[1]).to eq(user2)
+      results = search_for(mr_b.username, topic_id: topic2.id)
+      expect(results).to eq [mr_b, mr_blue, mr_brown].map(&:username)
 
-      results = search_for(user1.username, topic_id: topic3.id)
-      expect(results[1]).to eq(user5)
+      results = search_for(mr_b.username, topic_id: topic3.id)
+      expect(results).to eq [mr_b, mr_brown, mr_blue].map(&:username)
     end
 
     it "only reveals topic participants to people with permission" do
@@ -187,37 +180,46 @@ describe UserSearch do
 
       # Random user, does not have access
       expect do
-        search_for("", topic_id: pm_topic.id, searching_user: user1)
+        search_for("", topic_id: pm_topic.id, searching_user: mr_b)
       end.to raise_error(Discourse::InvalidAccess)
 
-      pm_topic.invite(pm_topic.user, user1.username)
-      results = search_for("", topic_id: pm_topic.id, searching_user: user1)
-      expect(results.length).to eq(1)
-      expect(results[0]).to eq(pm_topic.user)
+      pm_topic.invite(pm_topic.user, mr_b.username)
+
+      results = search_for("", topic_id: pm_topic.id, searching_user: mr_b)
+      expect(results).to eq [pm_topic.user.username]
     end
 
     it "only searches by name when enabled" do
       # When searching by name is enabled, it returns the record
       SiteSetting.enable_names = true
       results = search_for("Tarantino")
-      expect(results.size).to eq(1)
+      expect(results).to eq [mr_brown.username]
 
       results = search_for("coding")
-      expect(results.size).to eq(0)
+      expect(results).to be_blank
 
       results = search_for("z")
-      expect(results.size).to eq(0)
+      expect(results).to be_blank
 
       # When searching by name is disabled, it will not return the record
       SiteSetting.enable_names = false
       results = search_for("Tarantino")
-      expect(results.size).to eq(0)
+      expect(results).to be_blank
     end
 
     it "prioritises exact matches" do
-      # find an exact match first
       results = search_for("mrB")
-      expect(results.first.username).to eq(user1.username)
+      expect(results).to eq [mr_b, mr_brown, mr_blue].map(&:username)
+    end
+
+    it "doesn't prioritises exact matches mentions for users who haven't been seen in over a year" do
+      abcdef = Fabricate(:user, username: "abcdef", last_seen_at: 2.days.ago)
+      abcde  = Fabricate(:user, username: "abcde", last_seen_at: 2.weeks.ago)
+      abcd   = Fabricate(:user, username: "abcd", last_seen_at: 2.months.ago)
+      abc    = Fabricate(:user, username: "abc", last_seen_at: 2.years.ago)
+
+      results = search_for("abc", topic_id: topic.id)
+      expect(results).to eq [abcdef, abcde, abcd, abc].map(&:username)
     end
 
     it "does not include self, staged or inactive" do
@@ -230,12 +232,11 @@ describe UserSearch do
       expect(results).to be_blank
 
       results = search_for(staged.username, include_staged_users: true)
-      expect(results.first.username).to eq(staged.username)
+      expect(results).to eq [staged.username]
 
-      results = search_for("", topic_id: topic.id, searching_user: user1)
-
-      # mrb is omitted, mrb is current user
-      expect(results.map(&:username)).to eq(["mrpink", "mrorange"])
+      # mrb is omitted since they're the searching user
+      results = search_for("", topic_id: topic.id, searching_user: mr_b)
+      expect(results).to eq [mr_pink, mr_orange].map(&:username)
     end
   end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 3e69f08afa..600d7f1c74 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -90,7 +90,7 @@ describe User do
           user.email = 'test@gmailcom'
 
           expect(user).to_not be_valid
-          expect(user.errors.messages).to include(:primary_email)
+          expect(user.errors.messages.keys).to contain_exactly(:primary_email)
         end
       end
 
@@ -1337,6 +1337,29 @@ describe User do
 
   end
 
+  describe '#avatar_template' do
+    it 'uses the small logo if the user is the system user' do
+      logo_small_url = Discourse.store.cdn_url(SiteSetting.logo_small.url)
+
+      expect(Discourse.system_user.avatar_template).to eq(logo_small_url)
+    end
+
+    it 'uses the system user avatar if the logo is nil' do
+      SiteSetting.logo_small = nil
+      system_user = Discourse.system_user
+      expected = User.avatar_template(system_user.username, system_user.uploaded_avatar_id)
+
+      expect(Discourse.system_user.avatar_template).to eq(expected)
+    end
+
+    it 'uses the regular avatar for other users' do
+      user = Fabricate(:user)
+      expected = User.avatar_template(user.username, user.uploaded_avatar_id)
+
+      expect(user.avatar_template).to eq(expected)
+    end
+  end
+
   describe "update_posts_read!" do
     context "with a UserVisit record" do
       let!(:user) { Fabricate(:user) }
@@ -1448,6 +1471,7 @@ describe User do
     let!(:unactivated_old) { Fabricate(:user, active: false, created_at: 1.month.ago) }
     let!(:unactivated_old_with_system_pm) { Fabricate(:user, active: false, created_at: 2.months.ago) }
     let!(:unactivated_old_with_human_pm) { Fabricate(:user, active: false, created_at: 2.months.ago) }
+    let!(:unactivated_old_with_post) { Fabricate(:user, active: false, created_at: 1.month.ago) }
 
     before do
       PostCreator.new(Discourse.system_user,
@@ -1463,17 +1487,24 @@ describe User do
                       archetype: Archetype.private_message,
                       target_usernames: [unactivated_old_with_human_pm.username],
       ).create
+
+      PostCreator.new(unactivated_old_with_post,
+                      title: "Test topic from a user",
+                      raw: "This is a sample message"
+      ).create
     end
 
     it 'should only remove old, unactivated users' do
       User.purge_unactivated
-      expect(User.real.all).to match_array([user, unactivated, unactivated_old_with_human_pm])
+      expect(User.real.all).to match_array([user, unactivated, unactivated_old_with_human_pm, unactivated_old_with_post])
     end
 
     it "does nothing if purge_unactivated_users_grace_period_days is 0" do
       SiteSetting.purge_unactivated_users_grace_period_days = 0
       User.purge_unactivated
-      expect(User.real.all).to match_array([user, unactivated, unactivated_old, unactivated_old_with_system_pm, unactivated_old_with_human_pm])
+      expect(User.real.all).to match_array([
+        user, unactivated, unactivated_old, unactivated_old_with_system_pm, unactivated_old_with_human_pm, unactivated_old_with_post
+      ])
     end
   end
 
@@ -1651,6 +1682,7 @@ describe User do
       SiteSetting.default_email_digest_frequency = 1440 # daily
       SiteSetting.default_email_level = UserOption.email_level_types[:never]
       SiteSetting.default_email_messages_level = UserOption.email_level_types[:never]
+      SiteSetting.disable_mailing_list_mode = false
       SiteSetting.default_email_mailing_list_mode = true
 
       SiteSetting.default_other_new_topic_duration_minutes = -1 # not viewed
@@ -2046,6 +2078,34 @@ describe User do
     end
   end
 
+  describe "#email=" do
+    let(:new_email) { "newprimary@example.com" }
+    it 'sets the primary email' do
+      user.update!(email: new_email)
+      expect(User.find(user.id).email).to eq(new_email)
+    end
+
+    it 'only saves when save called' do
+      old_email = user.email
+      user.email = new_email
+      expect(User.find(user.id).email).to eq(old_email)
+      user.save!
+      expect(User.find(user.id).email).to eq(new_email)
+    end
+
+    it 'will automatically remove matching secondary emails' do
+      secondary_email_record = Fabricate(:secondary_email, user: user)
+      user.reload
+      expect(user.secondary_emails.count).to eq(1)
+      user.email = secondary_email_record.email
+      user.save!
+
+      expect(User.find(user.id).email).to eq(secondary_email_record.email)
+      expect(user.secondary_emails.count).to eq(0)
+    end
+
+  end
+
   describe "set_random_avatar" do
     it "sets a random avatar when selectable avatars is enabled" do
       avatar1 = Fabricate(:upload)
@@ -2481,4 +2541,26 @@ describe User do
       end
     end
   end
+
+  describe "#do_not_disturb?" do
+    it "is true when a dnd timing is present for the current time" do
+      Fabricate(:do_not_disturb_timing, user: user, starts_at: Time.zone.now, ends_at: 1.day.from_now)
+      expect(user.do_not_disturb?).to eq(true)
+    end
+
+    it "is false when no dnd timing is present for the current time" do
+      Fabricate(:do_not_disturb_timing, user: user, starts_at: Time.zone.now - 2.day, ends_at: 1.minute.ago)
+      expect(user.do_not_disturb?).to eq(false)
+    end
+  end
+
+  describe "#invited_by" do
+    it 'returns even if invites was trashed' do
+      invite = Fabricate(:invite, invited_by: Fabricate(:user))
+      Fabricate(:invited_user, invite: invite, user: user)
+      invite.trash!
+
+      expect(user.invited_by).to eq(invite.invited_by)
+    end
+  end
 end
diff --git a/spec/models/user_summary_spec.rb b/spec/models/user_summary_spec.rb
index 791e61b6e1..8847fc2a3a 100644
--- a/spec/models/user_summary_spec.rb
+++ b/spec/models/user_summary_spec.rb
@@ -58,4 +58,24 @@ describe UserSummary do
     users = UserSummary.new(user, Guardian.new).most_liked_users
     expect(users).to eq([])
   end
+
+  it "includes ordered top categories" do
+    u = Fabricate(:user)
+
+    UserSummary::MAX_SUMMARY_RESULTS.times do
+      c = Fabricate(:category)
+      t = Fabricate(:topic, category: c, user: u)
+      Fabricate(:post, user: u, topic: t)
+    end
+
+    top_category = Fabricate(:category)
+    t = Fabricate(:topic, category: top_category, user: u)
+    Fabricate(:post, user: u, topic: t)
+    Fabricate(:post, user: u, topic: t)
+
+    summary = UserSummary.new(u, Guardian.new)
+
+    expect(summary.top_categories.length).to eq(UserSummary::MAX_SUMMARY_RESULTS)
+    expect(summary.top_categories.first[:id]).to eq(top_category.id)
+  end
 end
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index 586458a614..492cb83a7d 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -324,7 +324,6 @@ describe WebHook do
       Fabricate(:user_web_hook, active: true)
 
       user
-      user.activate
       Jobs::CreateUserReviewable.new.execute(user_id: user.id)
 
       job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
@@ -333,6 +332,14 @@ describe WebHook do
       payload = JSON.parse(job_args["payload"])
       expect(payload["id"]).to eq(user.id)
 
+      email_token = user.email_tokens.create(email: user.email)
+      EmailToken.confirm(email_token.token)
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("user_confirmed_email")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(user.id)
+
       admin
       job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
@@ -377,6 +384,14 @@ describe WebHook do
       payload = JSON.parse(job_args["payload"])
       expect(payload["id"]).to eq(user.id)
       expect(payload["email"]).to eq(email)
+
+      # Reflects runtime change to user field
+      user_field = Fabricate(:user_field, show_on_profile: true)
+      user.logged_in
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      expect(job_args["event_name"]).to eq("user_logged_in")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["user_fields"].size).to eq(1)
     end
 
     it 'should enqueue the right hooks for category events' do
@@ -479,6 +494,17 @@ describe WebHook do
       payload = JSON.parse(job_args["payload"])
       expect(payload["id"]).to eq(reviewable.id)
 
+      reviewable.add_score(
+        Discourse.system_user,
+        ReviewableScore.types[:off_topic],
+        reason: "test"
+      )
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("reviewable_score_updated")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(reviewable.id)
+
       reviewable.perform(Discourse.system_user, :reject_user_delete)
       job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
@@ -511,5 +537,60 @@ describe WebHook do
 
       # Future work: revoke badge hook
     end
+
+    it 'should enqueue the right hooks for group user addition' do
+      Fabricate(:group_user_web_hook)
+      group = Fabricate(:group)
+
+      now = Time.now
+      freeze_time now
+
+      group.add(user)
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      expect(job_args["event_name"]).to eq("user_added_to_group")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["group_id"]).to eq(group.id)
+      expect(payload["user_id"]).to eq(user.id)
+      expect(payload["notification_level"]).to eq(group.default_notification_level)
+      expect(Time.zone.parse(payload["created_at"]).to_f).to be_within(0.001).of(now.to_f)
+    end
+
+    it 'should enqueue the right hooks for group user deletion' do
+      Fabricate(:group_user_web_hook)
+      group = Fabricate(:group)
+      group_user = Fabricate(:group_user, group: group, user: user)
+
+      now = Time.now
+      freeze_time now
+
+      group.remove(user)
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      expect(job_args["event_name"]).to eq("user_removed_from_group")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["group_id"]).to eq(group.id)
+      expect(payload["user_id"]).to eq(user.id)
+    end
+
+    it 'should enqueue hooks for user likes in a group' do
+      group = Fabricate(:group)
+      Fabricate(:like_web_hook, groups: [group])
+      group_user = Fabricate(:group_user, group: group, user: user)
+      poster = Fabricate(:user)
+      post = Fabricate(:post, user: poster)
+      like = Fabricate(:post_action, post: post, user: user, post_action_type_id: PostActionType.types[:like])
+      now = Time.now
+      freeze_time now
+
+      DiscourseEvent.trigger(:like_created, like)
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      expect(job_args["event_name"]).to eq("post_liked")
+      expect(job_args["group_ids"]).to eq([group.id])
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["post"]["id"]).to eq(post.id)
+      expect(payload["user"]["id"]).to eq(user.id)
+    end
   end
 end
diff --git a/spec/multisite/jobs_spec.rb b/spec/multisite/jobs_spec.rb
index 461ede83a7..4ed2054137 100644
--- a/spec/multisite/jobs_spec.rb
+++ b/spec/multisite/jobs_spec.rb
@@ -8,4 +8,10 @@ RSpec.describe "Running Sidekiq Jobs in Multisite", type: :multisite do
       Jobs::DestroyOldDeletionStubs.new.perform({})
     end.to_not change { RailsMultisite::ConnectionManagement.current_db }
   end
+
+  it 'CheckNewFeatures should only hit the payload once' do
+    # otherwise it will get rate-limited by meta
+    DiscourseUpdates.expects(:new_features_payload).returns("{}").once
+    Jobs::CheckNewFeatures.new.perform({})
+  end
 end
diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb
index f9049a1d85..cc90a40738 100644
--- a/spec/multisite/s3_store_spec.rb
+++ b/spec/multisite/s3_store_spec.rb
@@ -169,7 +169,7 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
     let(:client) { Aws::S3::Client.new(stub_responses: true) }
     let(:resource) { Aws::S3::Resource.new(client: client) }
     let(:s3_bucket) { resource.bucket("some-really-cool-bucket") }
-    let(:s3_helper) { store.instance_variable_get(:@s3_helper) }
+    let(:s3_helper) { store.s3_helper }
     let(:s3_object) { stub }
 
     before(:each) do
diff --git a/spec/multisite/site_settings_spec.rb b/spec/multisite/site_settings_spec.rb
index ba0d971bc2..069c266352 100644
--- a/spec/multisite/site_settings_spec.rb
+++ b/spec/multisite/site_settings_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Multisite SiteSettings', type: :multisite do
   describe '#default_locale' do
     it 'should return the right locale' do
       test_multisite_connection('default') do
-        expect(SiteSetting.default_locale).to eq('en_US')
+        expect(SiteSetting.default_locale).to eq('en')
       end
 
       test_multisite_connection('second') do
@@ -25,7 +25,7 @@ RSpec.describe 'Multisite SiteSettings', type: :multisite do
       end
 
       test_multisite_connection('default') do
-        expect(SiteSetting.default_locale).to eq('en_US')
+        expect(SiteSetting.default_locale).to eq('en')
 
         SiteSetting.default_locale = 'ja'
 
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 42f7d6f69a..1c6c80d27d 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -2,7 +2,14 @@
 
 if ENV['COVERAGE']
   require 'simplecov'
-  SimpleCov.start
+  SimpleCov.command_name "#{SimpleCov.command_name} #{ENV['TEST_ENV_NUMBER']}" if ENV['TEST_ENV_NUMBER']
+  SimpleCov.start 'rails' do
+    add_group 'Libraries', /^\/lib\/(?!tasks).*$/
+    add_group 'Scripts', 'script'
+    add_group 'Serializers', 'app/serializers'
+    add_group 'Services', 'app/services'
+    add_group 'Tasks', 'lib/tasks'
+  end
 end
 
 require 'rubygems'
@@ -273,6 +280,11 @@ RSpec.configure do |config|
     expect(before_event_count).to eq(after_event_count), "DiscourseEvent registrations were not cleaned up"
   end
 
+  config.before :each do
+    # This allows DB.transaction_open? to work in tests. See lib/mini_sql_multisite_connection.rb
+    DB.test_transaction = ActiveRecord::Base.connection.current_transaction
+  end
+
   config.before(:each, type: :multisite) do
     Rails.configuration.multisite = true # rubocop:disable Discourse/NoDirectMultisiteManipulation
 
@@ -336,20 +348,6 @@ def global_setting(name, value)
   end
 end
 
-def set_env(var, value)
-  old = ENV.fetch var, :missing
-
-  ENV[var] = value
-
-  before_next_spec do
-    if old == :missing
-      ENV.delete var
-    else
-      ENV[var] = old
-    end
-  end
-end
-
 def set_cdn_url(cdn_url)
   global_setting :cdn_url, cdn_url
   Rails.configuration.action_controller.asset_host = cdn_url
diff --git a/spec/requests/admin/api_controller_spec.rb b/spec/requests/admin/api_controller_spec.rb
index 3478349f57..792136438a 100644
--- a/spec/requests/admin/api_controller_spec.rb
+++ b/spec/requests/admin/api_controller_spec.rb
@@ -137,7 +137,7 @@ describe Admin::ApiController do
           post "/admin/api/keys.json", params: {
             key: {
               description: "master key description",
-              scopes: [{ id: 'topics:write', topic_id: '55' }]
+              scopes: [{ scope_id: 'topics:write', topic_id: '55' }]
             }
           }
           expect(response.status).to eq(200)
@@ -154,7 +154,7 @@ describe Admin::ApiController do
           post "/admin/api/keys.json", params: {
             key: {
               description: "master key description",
-              scopes: [{ id: 'topics:write', topic_id: '55,33' }]
+              scopes: [{ scope_id: 'topics:write', topic_id: '55,33' }]
             }
           }
           expect(response.status).to eq(200)
@@ -170,7 +170,7 @@ describe Admin::ApiController do
         post "/admin/api/keys.json", params: {
           key: {
             description: "master key description",
-            scopes: [{ id: 'topics:write', fake_id: '55' }]
+            scopes: [{ scope_id: 'topics:write', fake_id: '55' }]
           }
         }
 
@@ -186,7 +186,7 @@ describe Admin::ApiController do
         post "/admin/api/keys.json", params: {
           key: {
             description: "master key description",
-            scopes: [{ id: 'something:else' }]
+            scopes: [{ scope_id: 'something:else' }]
           }
         }
 
diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb
index 03b9245744..e750b6dc51 100644
--- a/spec/requests/admin/backups_controller_spec.rb
+++ b/spec/requests/admin/backups_controller_spec.rb
@@ -116,6 +116,7 @@ RSpec.describe Admin::BackupsController do
 
         expect(response.status).to eq(422)
         expect(response.headers['Content-Disposition']).not_to match(/attachment; filename/)
+        expect(response.body).to include(I18n.t("download_backup_mailer.no_token"))
       end
     end
 
diff --git a/spec/requests/admin/badges_controller_spec.rb b/spec/requests/admin/badges_controller_spec.rb
index 14e7d29f7f..b6d26dc3b2 100644
--- a/spec/requests/admin/badges_controller_spec.rb
+++ b/spec/requests/admin/badges_controller_spec.rb
@@ -138,6 +138,7 @@ describe Admin::BadgesController do
       it 'updates the badge' do
         SiteSetting.enable_badge_sql = true
         sql = "select id user_id, created_at granted_at from users"
+        image = Fabricate(:upload)
 
         put "/admin/badges/#{badge.id}.json", params: {
           name: "123456",
@@ -145,13 +146,17 @@ describe Admin::BadgesController do
           badge_type_id: badge.badge_type_id,
           allow_title: false,
           multiple_grant: false,
-          enabled: true
+          enabled: true,
+          image_upload_id: image.id,
+          icon: "fa-rocket",
         }
 
         expect(response.status).to eq(200)
         badge.reload
         expect(badge.name).to eq('123456')
         expect(badge.query).to eq(sql)
+        expect(badge.image_upload.id).to eq(image.id)
+        expect(badge.icon).to eq("fa-rocket")
       end
 
       context 'when there is a user with a title granted using the badge' do
@@ -229,6 +234,16 @@ describe Admin::BadgesController do
 
         expect(UserBadge.exists?(user: @user, badge: badge)).to eq(true)
       end
+
+      it 'fails when the badge is disabled' do
+        badge.update!(enabled: false)
+
+        file = file_from_fixtures('usernames_with_nil_values.csv', 'csv')
+
+        post "/admin/badges/award/#{badge.id}.json", params: { file: fixture_file_upload(file) }
+
+        expect(response.status).to eq(422)
+      end
     end
   end
 end
diff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rb
index 46602ae91d..00ed3b3aaa 100644
--- a/spec/requests/admin/dashboard_controller_spec.rb
+++ b/spec/requests/admin/dashboard_controller_spec.rb
@@ -15,6 +15,15 @@ describe Admin::DashboardController do
   context 'while logged in as an admin' do
     fab!(:admin) { Fabricate(:admin) }
 
+    def populate_new_features
+      sample_features = [
+        { "id" => "1", "emoji" => "🤾", "title" => "Cool Beans", "description" => "Now beans are included", "created_at" => Time.zone.now - 40.minutes },
+        { "id" => "2", "emoji" => "🙈", "title" => "Fancy Legumes", "description" => "Legumes too!",  "created_at" => Time.zone.now - 20.minutes }
+      ]
+
+      Discourse.redis.set('new_features', MultiJson.dump(sample_features))
+    end
+
     before do
       sign_in(admin)
     end
@@ -77,5 +86,62 @@ describe Admin::DashboardController do
         end
       end
     end
+
+    describe '#new_features' do
+      before do
+        Discourse.redis.del "new_features_last_seen_user_#{admin.id}"
+        Discourse.redis.del "new_features"
+      end
+
+      it 'is empty by default' do
+        get "/admin/dashboard/new-features.json"
+        expect(response.status).to eq(200)
+        json = response.parsed_body
+        expect(json['new_features']).to eq(nil)
+      end
+
+      it 'fails gracefully for invalid JSON' do
+        Discourse.redis.set("new_features", "INVALID JSON")
+        get "/admin/dashboard/new-features.json"
+        expect(response.status).to eq(200)
+        json = response.parsed_body
+        expect(json['new_features']).to eq(nil)
+      end
+
+      it 'includes new features when available' do
+        populate_new_features
+
+        get "/admin/dashboard/new-features.json"
+        expect(response.status).to eq(200)
+        json = response.parsed_body
+
+        expect(json['new_features'].length).to eq(2)
+        expect(json['new_features'][0]["emoji"]).to eq("🙈")
+        expect(json['new_features'][0]["title"]).to eq("Fancy Legumes")
+        expect(json['has_unseen_features']).to eq(true)
+      end
+
+      it 'passes unseen feature state' do
+        populate_new_features
+        DiscourseUpdates.mark_new_features_as_seen(admin.id)
+
+        get "/admin/dashboard/new-features.json"
+        expect(response.status).to eq(200)
+        json = response.parsed_body
+
+        expect(json['has_unseen_features']).to eq(false)
+      end
+    end
+
+    describe '#mark_new_features_as_seen' do
+      it 'resets last seen for a given user' do
+        populate_new_features
+        put "/admin/dashboard/mark-new-features-as-seen.json"
+
+        expect(response.status).to eq(200)
+        expect(DiscourseUpdates.new_features_last_seen(admin.id)).not_to eq(nil)
+        expect(DiscourseUpdates.has_unseen_features?(admin.id)).to eq(false)
+      end
+    end
   end
 end
diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rb
index eb6d23fd06..fa146834aa 100644
--- a/spec/requests/admin/email_controller_spec.rb
+++ b/spec/requests/admin/email_controller_spec.rb
@@ -202,10 +202,38 @@ describe Admin::EmailController do
   end
 
   describe '#handle_mail' do
-    it 'should enqueue the right job' do
-      expect { post "/admin/email/handle_mail.json", params: { email: email('cc') } }
-        .to change { Jobs::ProcessEmail.jobs.count }.by(1)
+    it "returns a bad request if neither email parameter is present" do
+      post "/admin/email/handle_mail.json"
+      expect(response.status).to eq(400)
+      expect(response.body).to include("param is missing")
+    end
+
+    it 'should enqueue the right job, and show a deprecation warning (email_encoded param should be used)' do
+      expect_enqueued_with(
+        job: :process_email,
+        args: { mail: email('cc'), retry_on_rate_limit: true, source: :handle_mail }
+      ) do
+        post "/admin/email/handle_mail.json", params: { email: email('cc') }
+      end
       expect(response.status).to eq(200)
+      expect(response.body).to eq("warning: the email parameter is deprecated. all POST requests to this route should be sent with a base64 strict encoded encoded_email parameter instead. email has been received and is queued for processing")
+    end
+
+    it 'should enqueue the right job, decoding the raw email param' do
+      expect_enqueued_with(
+        job: :process_email,
+        args: { mail: email('cc'), retry_on_rate_limit: true, source: :handle_mail }
+      ) do
+        post "/admin/email/handle_mail.json", params: { email_encoded: Base64.strict_encode64(email('cc')) }
+      end
+      expect(response.status).to eq(200)
+      expect(response.body).to eq("email has been received and is queued for processing")
+    end
+
+    it "retries enqueueing with forced UTF-8 encoding when encountering Encoding::UndefinedConversionError" do
+      post "/admin/email/handle_mail.json", params: { email_encoded: Base64.strict_encode64(email('encoding_undefined_conversion')) }
+      expect(response.status).to eq(200)
+      expect(response.body).to eq("email has been received and is queued for processing")
     end
   end
 
diff --git a/spec/requests/admin/embeddable_hosts_controller_spec.rb b/spec/requests/admin/embeddable_hosts_controller_spec.rb
index ea246d78e2..2dcc5081f1 100644
--- a/spec/requests/admin/embeddable_hosts_controller_spec.rb
+++ b/spec/requests/admin/embeddable_hosts_controller_spec.rb
@@ -40,7 +40,7 @@ describe Admin::EmbeddableHostsController do
         history_exists = UserHistory.where(
             acting_user_id: admin.id,
             action: UserHistory.actions[:embeddable_host_update],
-            new_value: "host: test.com, class_name: test-class, category_id: #{category.id}").exists?
+            new_value: "category_id: #{category.id}, class_name: test-class, host: test.com").exists?
 
         expect(history_exists).to eq(true)
 
diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb
index 721a449d76..c0053113e4 100644
--- a/spec/requests/admin/groups_controller_spec.rb
+++ b/spec/requests/admin/groups_controller_spec.rb
@@ -157,6 +157,9 @@ RSpec.describe Admin::GroupsController do
   end
 
   describe '#remove_owner' do
+    let(:user2) { Fabricate(:user) }
+    let(:user3) { Fabricate(:user) }
+
     it 'should work' do
       group.add_owner(user)
 
@@ -168,6 +171,20 @@ RSpec.describe Admin::GroupsController do
       expect(group.group_users.where(owner: true)).to eq([])
     end
 
+    it 'should work with multiple users' do
+      group.add_owner(user)
+      group.add_owner(user3)
+
+      delete "/admin/groups/#{group.id}/owners.json", params: {
+        group: {
+          usernames: "#{user.username},#{user2.username},#{user3.username}"
+        }
+      }
+
+      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!
 
@@ -190,41 +207,33 @@ RSpec.describe Admin::GroupsController do
     end
   end
 
-  describe "#bulk_perform" do
-    fab!(:group) do
-      Fabricate(:group,
-        name: "test",
-        primary_group: true,
-        title: 'WAT',
-        grant_trust_level: 3
-      )
-    end
+  describe "#set_primary" do
+    let(:user2) { Fabricate(:user) }
+    let(:user3) { Fabricate(:user) }
 
-    fab!(:user) { Fabricate(:user, trust_level: 2) }
-    fab!(:user2) { Fabricate(:user, trust_level: 4) }
+    it 'sets with multiple users' do
+      user2.update!(primary_group_id: group.id)
 
-    it "can assign users to a group by email or username" do
-      Jobs.run_immediately!
-
-      put "/admin/groups/bulk.json", params: {
-        group_id: group.id, users: [user.username.upcase, user2.email, 'doesnt_exist']
+      put "/admin/groups/#{group.id}/primary.json", params: {
+        group: { usernames: "#{user.username},#{user2.username},#{user3.username}" },
+        primary: "true"
       }
 
       expect(response.status).to eq(200)
+      expect(User.where(primary_group_id: group.id).size).to eq(3)
+    end
 
-      user.reload
-      expect(user.primary_group).to eq(group)
-      expect(user.title).to eq("WAT")
-      expect(user.trust_level).to eq(3)
+    it 'unsets with multiple users' do
+      user.update!(primary_group_id: group.id)
+      user3.update!(primary_group_id: group.id)
 
-      user2.reload
-      expect(user2.primary_group).to eq(group)
-      expect(user2.title).to eq("WAT")
-      expect(user2.trust_level).to eq(4)
+      put "/admin/groups/#{group.id}/primary.json", params: {
+        group: { usernames: "#{user.username},#{user2.username},#{user3.username}" },
+        primary: "false"
+      }
 
-      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")
+      expect(response.status).to eq(200)
+      expect(User.where(primary_group_id: group.id).size).to eq(0)
     end
   end
 
@@ -235,6 +244,27 @@ RSpec.describe Admin::GroupsController do
       expect(response.status).to eq(404)
     end
 
+    it 'logs when a group is destroyed' do
+      delete "/admin/groups/#{group.id}.json"
+
+      history = UserHistory.where(acting_user: admin).last
+
+      expect(history).to be_present
+      expect(history.details).to include("name: #{group.name}")
+    end
+
+    it 'logs the grant_trust_level attribute' do
+      trust_level = TrustLevel[4]
+      group.update!(grant_trust_level: trust_level)
+      delete "/admin/groups/#{group.id}.json"
+
+      history = UserHistory.where(acting_user: admin).last
+
+      expect(history).to be_present
+      expect(history.details).to include("grant_trust_level: #{trust_level}")
+      expect(history.details).to include("name: #{group.name}")
+    end
+
     describe 'when group is automatic' do
       it "returns the right response" do
         group.update!(automatic: true)
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index 48cc8236bb..49e7ca2bb5 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -45,6 +45,14 @@ describe Admin::SiteSettingsController do
         expect(SiteSetting.test_setting).to eq('hello')
       end
 
+      it 'works for deprecated settings' do
+        put "/admin/site_settings/sso_url.json", params: {
+          sso_url: "https://example.com"
+        }
+        expect(response.status).to eq(200)
+        expect(SiteSetting.discourse_connect_url).to eq("https://example.com")
+      end
+
       it 'allows value to be a blank string' do
         put "/admin/site_settings/test_setting.json", params: {
           test_setting: ''
diff --git a/spec/requests/admin/site_texts_controller_spec.rb b/spec/requests/admin/site_texts_controller_spec.rb
index 09985c0076..63d9f5349f 100644
--- a/spec/requests/admin/site_texts_controller_spec.rb
+++ b/spec/requests/admin/site_texts_controller_spec.rb
@@ -5,6 +5,7 @@ require 'rails_helper'
 RSpec.describe Admin::SiteTextsController do
   fab!(:admin) { Fabricate(:admin) }
   fab!(:user) { Fabricate(:user) }
+  let(:default_locale) { I18n.locale }
 
   after do
     TranslationOverride.delete_all
@@ -18,7 +19,7 @@ RSpec.describe Admin::SiteTextsController do
   context "when not logged in as an admin" do
     it "raises an error if you aren't logged in" do
       put '/admin/customize/site_texts/some_key.json', params: {
-        site_text: { value: 'foo' }
+        site_text: { value: 'foo' }, locale: default_locale
       }
 
       expect(response.status).to eq(404)
@@ -28,7 +29,7 @@ RSpec.describe Admin::SiteTextsController do
       sign_in(user)
 
       put "/admin/customize/site_texts/some_key.json", params: {
-        site_text: { value: 'foo' }
+        site_text: { value: 'foo' }, locale: default_locale
       }
       expect(response.status).to eq(404)
 
@@ -46,13 +47,13 @@ RSpec.describe Admin::SiteTextsController do
 
     describe '#index' do
       it 'returns json' do
-        get "/admin/customize/site_texts.json", params: { q: 'title' }
+        get "/admin/customize/site_texts.json", params: { q: 'title', locale: default_locale }
         expect(response.status).to eq(200)
         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' }
+        get "/admin/customize/site_texts.json", params: { q: 'e', locale: default_locale }
         expect(response.status).to eq(200)
         expect(response.parsed_body['site_texts'].size).to eq(50)
         expect(response.parsed_body['extras']['has_more']).to be_truthy
@@ -61,23 +62,23 @@ RSpec.describe Admin::SiteTextsController do
       it 'works with pages' do
         texts = Set.new
 
-        get "/admin/customize/site_texts.json", params: { q: 'e' }
+        get "/admin/customize/site_texts.json", params: { q: 'e', locale: default_locale }
         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 }
+        get "/admin/customize/site_texts.json", params: { q: 'e', page: 1, locale: default_locale }
         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' }
+        get "/admin/customize/site_texts.json", params: { q: 'yes_value', locale: default_locale }
         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') })
+        expect(value).to eq(I18n.t('js.yes_value', locale: default_locale))
 
         get "/admin/customize/site_texts.json", params: { q: 'yes_value', locale: 'de' }
         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') })
+        expect(value).to eq(I18n.t('js.yes_value', locale: :de))
       end
 
       it 'returns an error on invalid locale' do
@@ -85,9 +86,14 @@ RSpec.describe Admin::SiteTextsController do
         expect(response.status).to eq(400)
       end
 
+      it 'returns an error on empty locale' do
+        get "/admin/customize/site_texts.json"
+        expect(response.status).to eq(400)
+      end
+
       it 'normalizes quotes during search' do
         value = %q|“That’s a ‘magic’ sock.”|
-        put "/admin/customize/site_texts/title.json", params: { site_text: { value: value } }
+        put "/admin/customize/site_texts/title.json", params: { site_text: { value: value, locale: default_locale } }
 
         [
           %q|That's a 'magic' sock.|,
@@ -97,7 +103,7 @@ RSpec.describe Admin::SiteTextsController do
           %q|«That's a 'magic' sock.»|,
           %q|„That’s a ‚magic‘ sock.“|
         ].each do |search_term|
-          get "/admin/customize/site_texts.json", params: { q: search_term }
+          get "/admin/customize/site_texts.json", params: { q: search_term, locale: default_locale }
           expect(response.status).to eq(200)
           expect(response.parsed_body['site_texts']).to include(include("id" => "title", "value" => value))
         end
@@ -105,14 +111,14 @@ RSpec.describe Admin::SiteTextsController do
 
       it 'normalizes ellipsis' do
         value = "Loading Discussion…"
-        put "/admin/customize/site_texts/embed.loading.json", params: { site_text: { value: value } }
+        put "/admin/customize/site_texts/embed.loading.json", params: { site_text: { value: value, locale: default_locale } }
 
         [
           "Loading Discussion",
           "Loading Discussion...",
           "Loading Discussion…"
         ].each do |search_term|
-          get "/admin/customize/site_texts.json", params: { q: search_term }
+          get "/admin/customize/site_texts.json", params: { q: search_term, locale: default_locale }
           expect(response.status).to eq(200)
           expect(response.parsed_body['site_texts']).to include(include("id" => "embed.loading", "value" => value))
         end
@@ -123,11 +129,11 @@ RSpec.describe Admin::SiteTextsController do
         TranslationOverride.create!(locale: :ru, translation_key: 'missing_plural_key.one', value: 'ONE')
         TranslationOverride.create!(locale: :ru, translation_key: 'another_missing_key', value: 'foo')
 
-        get "/admin/customize/site_texts.json", params: { q: 'missing_plural_key' }
+        get "/admin/customize/site_texts.json", params: { q: 'missing_plural_key', locale: default_locale }
         expect(response.status).to eq(200)
         expect(response.parsed_body['site_texts']).to be_empty
 
-        get "/admin/customize/site_texts.json", params: { q: 'another_missing_key' }
+        get "/admin/customize/site_texts.json", params: { q: 'another_missing_key', locale: default_locale }
         expect(response.status).to eq(200)
         expect(response.parsed_body['site_texts']).to be_empty
       end
@@ -141,7 +147,7 @@ RSpec.describe Admin::SiteTextsController do
           it 'finds the correct plural keys for the locale' do
             SiteSetting.default_locale = locale
 
-            get '/admin/customize/site_texts.json', params: { q: 'colour' }
+            get '/admin/customize/site_texts.json', params: { q: 'colour', locale: locale }
             expect(response.status).to eq(200)
 
             json = ::JSON.parse(response.body, symbolize_names: true)
@@ -202,7 +208,7 @@ RSpec.describe Admin::SiteTextsController do
 
     describe '#show' do
       it 'returns a site text for a key that exists' do
-        get "/admin/customize/site_texts/js.topic.list.json"
+        get "/admin/customize/site_texts/js.topic.list.json", params: { locale: default_locale }
         expect(response.status).to eq(200)
 
         json = response.parsed_body
@@ -214,7 +220,7 @@ RSpec.describe Admin::SiteTextsController do
       end
 
       it 'returns a site text for a key with ampersand' do
-        get "/admin/customize/site_texts/js.emoji_picker.food_&_drink.json"
+        get "/admin/customize/site_texts/js.emoji_picker.food_&_drink.json", params: { locale: default_locale }
         expect(response.status).to eq(200)
 
         json = response.parsed_body
@@ -226,30 +232,46 @@ RSpec.describe Admin::SiteTextsController do
       end
 
       it 'returns not found for missing keys' do
-        get "/admin/customize/site_texts/made_up_no_key_exists.json"
+        get "/admin/customize/site_texts/made_up_no_key_exists.json", params: { locale: default_locale }
         expect(response.status).to eq(404)
       end
 
       it 'returns overridden = true if there is a translation_overrides record for the key' do
         key = 'js.topic.list'
         put "/admin/customize/site_texts/#{key}.json", params: {
-          site_text: { value: I18n.t(key) }
+          site_text: { value: I18n.t(key, locale: default_locale), locale: default_locale }
         }
         expect(response.status).to eq(200)
 
-        get "/admin/customize/site_texts/#{key}.json"
+        get "/admin/customize/site_texts/#{key}.json", params: { locale: default_locale }
         expect(response.status).to eq(200)
         json = response.parsed_body
         expect(json['site_text']['overridden']).to eq(true)
 
         TranslationOverride.destroy_all
 
-        get "/admin/customize/site_texts/#{key}.json"
+        get "/admin/customize/site_texts/#{key}.json", params: { locale: default_locale }
         expect(response.status).to eq(200)
         json = response.parsed_body
         expect(json['site_text']['overridden']).to eq(false)
       end
 
+      it 'returns a site text in the given locale' do
+        get "/admin/customize/site_texts/js.topic.list.json", params: { locale: 'es' }
+        expect(response.status).to eq(200)
+
+        json = response.parsed_body
+        site_text = json['site_text']
+
+        expect(site_text['id']).to eq('js.topic.list')
+        expect(site_text['value']).to eq(I18n.t("js.topic.list", locale: :es))
+      end
+
+      it 'fails if locale is not given' do
+        get "/admin/customize/site_texts/js.topic.list.json"
+        expect(response.status).to eq(400)
+      end
+
       context 'plural keys' do
         before do
           I18n.backend.store_translations(:en, colour: { one: '%{count} colour', other: '%{count} colours' })
@@ -257,12 +279,10 @@ RSpec.describe Admin::SiteTextsController do
 
         shared_examples 'has correct plural keys' do
           it 'returns the correct plural keys for the locale' do
-            SiteSetting.default_locale = locale
-
             expected_translations.each do |key, value|
               id = "colour.#{key}"
 
-              get "/admin/customize/site_texts/#{id}.json"
+              get "/admin/customize/site_texts/#{id}.json", params: { locale: locale }
               expect(response.status).to eq(200)
 
               json = response.parsed_body
@@ -307,7 +327,7 @@ RSpec.describe Admin::SiteTextsController do
     describe '#update & #revert' do
       it "returns 'not found' when an unknown key is used" do
         put '/admin/customize/site_texts/some_key.json', params: {
-          site_text: { value: 'foo' }
+          site_text: { value: 'foo', locale: default_locale }
         }
 
         expect(response.status).to eq(404)
@@ -318,7 +338,7 @@ RSpec.describe Admin::SiteTextsController do
 
       it "works as expected with correct keys" do
         put '/admin/customize/site_texts/js.emoji_picker.animals_%26_nature.json', params: {
-          site_text: { value: 'foo' }
+          site_text: { value: 'foo', locale: default_locale }
         }
 
         expect(response.status).to eq(200)
@@ -332,7 +352,7 @@ RSpec.describe Admin::SiteTextsController do
 
       it "does not update restricted keys" do
         put '/admin/customize/site_texts/user_notifications.confirm_old_email.title.json', params: {
-          site_text: { value: 'foo' }
+          site_text: { value: 'foo', locale: default_locale }
         }
 
         expect(response.status).to eq(403)
@@ -347,7 +367,7 @@ RSpec.describe Admin::SiteTextsController do
         I18n.backend.store_translations(SiteSetting.default_locale, some_key: '%{first} %{second}')
 
         put "/admin/customize/site_texts/some_key.json", params: {
-          site_text: { value: 'hello %{key} %{omg}' }
+          site_text: { value: 'hello %{key} %{omg}', locale: default_locale }
         }
 
         expect(response.status).to eq(422)
@@ -364,7 +384,7 @@ RSpec.describe Admin::SiteTextsController do
         original_title = I18n.t(:title)
 
         put "/admin/customize/site_texts/title.json", params: {
-          site_text: { value: 'yay' }
+          site_text: { value: 'yay', locale: default_locale }
         }
         expect(response.status).to eq(200)
 
@@ -374,7 +394,7 @@ RSpec.describe Admin::SiteTextsController do
         expect(log.new_value).to eq('yay')
         expect(log.action).to eq(UserHistory.actions[:change_site_text])
 
-        delete "/admin/customize/site_texts/title.json"
+        delete "/admin/customize/site_texts/title.json", params: { locale: default_locale }
         expect(response.status).to eq(200)
 
         log = UserHistory.last
@@ -387,7 +407,7 @@ RSpec.describe Admin::SiteTextsController do
       it 'updates and reverts the key' do
         orig_title = I18n.t(:title)
 
-        put "/admin/customize/site_texts/title.json", params: { site_text: { value: 'hello' } }
+        put "/admin/customize/site_texts/title.json", params: { site_text: { value: 'hello', locale: default_locale } }
         expect(response.status).to eq(200)
 
         json = response.parsed_body
@@ -398,7 +418,7 @@ RSpec.describe Admin::SiteTextsController do
         expect(site_text['value']).to eq('hello')
 
         # Revert
-        delete "/admin/customize/site_texts/title.json"
+        delete "/admin/customize/site_texts/title.json", params: { locale: default_locale }
         expect(response.status).to eq(200)
 
         json = response.parsed_body
@@ -410,34 +430,34 @@ RSpec.describe Admin::SiteTextsController do
       end
 
       it 'returns site texts for the correct locale' do
-        SiteSetting.default_locale = :ru
+        locale = :ru
 
         ru_title = 'title ru'
         ru_mf_text = 'ru {NUM_RESULTS, plural, one {1 result} other {many} }'
 
-        put "/admin/customize/site_texts/title.json", params: { site_text: { value: ru_title } }
+        put "/admin/customize/site_texts/title.json", params: { site_text: { value: ru_title, locale: locale } }
         expect(response.status).to eq(200)
-        put "/admin/customize/site_texts/js.topic.read_more_MF.json", params: { site_text: { value: ru_mf_text } }
+        put "/admin/customize/site_texts/js.topic.read_more_MF.json", params: { site_text: { value: ru_mf_text, locale: locale } }
         expect(response.status).to eq(200)
 
-        get "/admin/customize/site_texts/title.json"
+        get "/admin/customize/site_texts/title.json", params: { locale: locale }
         expect(response.status).to eq(200)
         json = response.parsed_body
         expect(json['site_text']['value']).to eq(ru_title)
 
-        get "/admin/customize/site_texts/js.topic.read_more_MF.json"
+        get "/admin/customize/site_texts/js.topic.read_more_MF.json", params: { locale: locale }
         expect(response.status).to eq(200)
         json = response.parsed_body
         expect(json['site_text']['value']).to eq(ru_mf_text)
 
-        SiteSetting.default_locale = :en
+        en_locale = :en
 
-        get "/admin/customize/site_texts/title.json"
+        get "/admin/customize/site_texts/title.json", params: { locale: en_locale }
         expect(response.status).to eq(200)
         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"
+        get "/admin/customize/site_texts/js.topic.read_more_MF.json", params: { locale: en_locale }
         expect(response.status).to eq(200)
         json = response.parsed_body
         expect(json['site_text']['value']).to_not eq(ru_mf_text)
@@ -459,7 +479,7 @@ RSpec.describe Admin::SiteTextsController do
             action: Jobs::BulkUserTitleUpdate::UPDATE_ACTION
           }) do
             put '/admin/customize/site_texts/badges.regular.name.json', params: {
-              site_text: { value: 'Terminator' }
+              site_text: { value: 'Terminator', locale: default_locale }
             }
           end
 
@@ -468,14 +488,14 @@ RSpec.describe Admin::SiteTextsController do
             granted_badge_id: badge.id,
             action: Jobs::BulkUserTitleUpdate::RESET_ACTION
           }) do
-            delete "/admin/customize/site_texts/badges.regular.name.json"
+            delete "/admin/customize/site_texts/badges.regular.name.json", params: { locale: default_locale }
           end
         end
 
         it 'does not update matching user titles when overriding non-title badge text' do
           expect_not_enqueued_with(job: :bulk_user_title_update) do
             put '/admin/customize/site_texts/badges.regular.long_description.json', params: {
-              site_text: { value: 'Terminator' }
+              site_text: { value: 'Terminator', locale: default_locale }
             }
           end
         end
diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb
index 602ab41533..472bc03981 100644
--- a/spec/requests/admin/themes_controller_spec.rb
+++ b/spec/requests/admin/themes_controller_spec.rb
@@ -119,13 +119,14 @@ describe Admin::ThemesController do
         expect(response.status).to eq(201)
       end
 
-      it "bans non whtielisted imports" do
+      it "prevents adding disallowed themes" do
         RemoteTheme.stubs(:import_theme)
-        post "/admin/themes/import.json", params: {
-          remote: '    https://bad.com/discourse/discourse-brand-header       '
-        }
+        remote = '    https://bad.com/discourse/discourse-brand-header       '
+
+        post "/admin/themes/import.json", params: { remote: remote }
 
         expect(response.status).to eq(403)
+        expect(response.parsed_body['errors']).to include(I18n.t("themes.import_error.not_allowed_theme", { repo: remote.strip }))
       end
 
       it "bans json file import" do
@@ -342,7 +343,7 @@ describe Admin::ThemesController do
 
       child_theme = Fabricate(:theme, component: true)
 
-      upload = Fabricate(:upload)
+      upload = UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(Discourse.system_user.id)
 
       put "/admin/themes/#{theme.id}.json", params: {
         theme: {
@@ -370,6 +371,45 @@ describe Admin::ThemesController do
       expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
     end
 
+    it 'prevents theme update when using ember css selectors' do
+      child_theme = Fabricate(:theme, component: true)
+
+      put "/admin/themes/#{theme.id}.json", params: {
+        theme: {
+          child_theme_ids: [child_theme.id],
+          name: 'my test name',
+          theme_fields: [
+            { name: 'scss', target: 'common', value: '' },
+            { name: 'scss', target: 'desktop', value: '.ember-view{color: blue;}' },
+          ]
+        }
+      }
+
+      expect(response.status).to eq(200)
+
+      json = response.parsed_body
+
+      fields = json["theme"]["theme_fields"].sort { |a, b| a["value"] <=> b["value"] }
+      expect(fields[0]["error"]).to eq(I18n.t("themes.ember_selector_error"))
+
+      put "/admin/themes/#{theme.id}.json", params: {
+        theme: {
+          child_theme_ids: [child_theme.id],
+          name: 'my test name',
+          theme_fields: [
+            { name: 'scss', target: 'common', value: '' },
+            { name: 'scss', target: 'desktop', value: '#ember392{color: blue;}' },
+          ]
+        }
+      }
+
+      expect(response.status).to eq(200)
+      json = response.parsed_body
+
+      fields = json["theme"]["theme_fields"].sort { |a, b| a["value"] <=> b["value"] }
+      expect(fields[0]["error"]).to eq(I18n.t("themes.ember_selector_error"))
+    end
+
     it 'blocks remote theme fields from being locally edited' do
       r = RemoteTheme.create!(remote_url: "https://magic.com/repo.git")
       theme.update!(remote_theme_id: r.id)
@@ -378,7 +418,7 @@ describe Admin::ThemesController do
         theme: {
           theme_fields: [
             { name: 'scss', target: 'common', value: '' },
-            { name: 'test', target: 'common', value: 'filename.jpg', upload_id: 4 }
+            { name: 'header', target: 'common', value: 'filename.jpg', upload_id: 4 }
           ]
         }
       }
@@ -386,6 +426,22 @@ describe Admin::ThemesController do
       expect(response.status).to eq(403)
     end
 
+    it 'allows zip-imported theme fields to be locally edited' do
+      r = RemoteTheme.create!(remote_url: "")
+      theme.update!(remote_theme_id: r.id)
+
+      put "/admin/themes/#{theme.id}.json", params: {
+        theme: {
+          theme_fields: [
+            { name: 'scss', target: 'common', value: '' },
+            { name: 'header', target: 'common', value: 'filename.jpg', upload_id: 4 }
+          ]
+        }
+      }
+
+      expect(response.status).to eq(200)
+    end
+
     it 'updates a child theme' do
       child_theme = Fabricate(:theme, component: true)
       put "/admin/themes/#{child_theme.id}.json", params: {
@@ -535,6 +591,18 @@ describe Admin::ThemesController do
       expect(response.status).to eq(400)
       expect(response.parsed_body["errors"].first).to include(I18n.t("themes.errors.component_no_default"))
     end
+
+    it 'prevents converting the default theme to a component' do
+      SiteSetting.default_theme_id = theme.id
+
+      put "/admin/themes/#{theme.id}.json", params: {
+        theme: { component: true }
+      }
+
+      # should this error message be localized? InvalidParameters :component
+      expect(response.status).to eq(400)
+      expect(response.parsed_body["errors"].first).to include('component')
+    end
   end
 
   describe '#destroy' do
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index fbb0b328e7..e756c6cbd2 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -133,10 +133,13 @@ RSpec.describe Admin::UsersController do
 
     it "works properly" do
       expect(user).not_to be_suspended
-      put "/admin/users/#{user.id}/suspend.json", params: {
-        suspend_until: 5.hours.from_now,
-        reason: "because I said so"
-      }
+
+      expect do
+        put "/admin/users/#{user.id}/suspend.json", params: {
+          suspend_until: 5.hours.from_now,
+          reason: "because I said so"
+        }
+      end.to change { Jobs::CriticalUserEmail.jobs.size }.by(0)
 
       expect(response.status).to eq(200)
 
@@ -862,12 +865,12 @@ RSpec.describe Admin::UsersController do
 
     before do
       SiteSetting.email_editable = false
-      SiteSetting.sso_url = "https://www.example.com/sso"
-      SiteSetting.enable_sso = true
-      SiteSetting.sso_overrides_email = true
-      SiteSetting.sso_overrides_name = true
-      SiteSetting.sso_overrides_username = true
-      SiteSetting.sso_secret = sso_secret
+      SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+      SiteSetting.enable_discourse_connect = true
+      SiteSetting.auth_overrides_email = true
+      SiteSetting.auth_overrides_name = true
+      SiteSetting.auth_overrides_username = true
+      SiteSetting.discourse_connect_secret = sso_secret
       sso.sso_secret = sso_secret
     end
 
@@ -924,7 +927,7 @@ 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(response.parsed_body["message"]).to include(I18n.t('sso.login_error'))
+      expect(response.parsed_body["message"]).to include(I18n.t('discourse_connect.login_error'))
       expect(response.parsed_body["message"]).not_to include(correct_payload["sig"])
     end
 
@@ -935,7 +938,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(response.parsed_body["message"]).to include(I18n.t('sso.blank_id_error'))
+      expect(response.parsed_body["message"]).to include(I18n.t('discourse_connect.blank_id_error'))
     end
   end
 
@@ -1079,13 +1082,12 @@ RSpec.describe Admin::UsersController do
     fab!(:first_post) { Fabricate(:post, topic: topic, user: user) }
 
     it 'should merge source user to target user' do
+      Jobs.run_immediately!
       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
@@ -1095,8 +1097,8 @@ RSpec.describe Admin::UsersController do
     fab!(:sso_record) { SingleSignOnRecord.create!(user_id: user.id, external_id: '12345', external_email: user.email, last_payload: '') }
 
     it "deletes the record" do
-      SiteSetting.sso_url = "https://www.example.com/sso"
-      SiteSetting.enable_sso = true
+      SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+      SiteSetting.enable_discourse_connect = true
 
       delete "/admin/users/#{user.id}/sso_record.json"
       expect(response.status).to eq(200)
@@ -1104,4 +1106,21 @@ RSpec.describe Admin::UsersController do
     end
   end
 
+  describe "#anonymize" do
+    it "will make the user anonymous" do
+      put "/admin/users/#{user.id}/anonymize.json"
+      expect(response.status).to eq(200)
+      expect(response.parsed_body['username']).to be_present
+    end
+
+    it "supports `anonymize_ip`" do
+      Jobs.run_immediately!
+      sl = Fabricate(:search_log, user_id: user.id)
+      put "/admin/users/#{user.id}/anonymize.json?anonymize_ip=127.0.0.2"
+      expect(response.status).to eq(200)
+      expect(response.parsed_body['username']).to be_present
+      expect(sl.reload.ip_address).to eq('127.0.0.2')
+    end
+  end
+
 end
diff --git a/spec/requests/admin/watched_words_controller_spec.rb b/spec/requests/admin/watched_words_controller_spec.rb
index 97cac195f9..417e19a0b0 100644
--- a/spec/requests/admin/watched_words_controller_spec.rb
+++ b/spec/requests/admin/watched_words_controller_spec.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'csv'
 require 'rails_helper'
 
 RSpec.describe Admin::WatchedWordsController do
@@ -13,13 +14,13 @@ RSpec.describe Admin::WatchedWordsController do
     end
 
     it 'should return the right response when given an invalid id param' do
-      delete '/admin/logs/watched_words/9999.json'
+      delete '/admin/customize/watched_words/9999.json'
 
       expect(response.status).to eq(400)
     end
 
     it 'should be able to delete a watched word' do
-      delete "/admin/logs/watched_words/#{watched_word.id}.json"
+      delete "/admin/customize/watched_words/#{watched_word.id}.json"
 
       expect(response.status).to eq(200)
       expect(WatchedWord.find_by(id: watched_word.id)).to eq(nil)
@@ -33,7 +34,7 @@ RSpec.describe Admin::WatchedWordsController do
       end
 
       it 'creates the words from the file' do
-        post '/admin/logs/watched_words/upload.json', params: {
+        post '/admin/customize/watched_words/upload.json', params: {
           action_key: 'flag',
           file: Rack::Test::UploadedFile.new(file_from_fixtures("words.csv", "csv"))
         }
@@ -47,13 +48,30 @@ RSpec.describe Admin::WatchedWordsController do
 
         expect(WatchedWord.pluck(:action).uniq).to eq([WatchedWord.actions[:flag]])
       end
+
+      it 'creates the words from the file' do
+        post '/admin/customize/watched_words/upload.json', params: {
+          action_key: 'tag',
+          file: Rack::Test::UploadedFile.new(file_from_fixtures("words_tag.csv", "csv"))
+        }
+
+        expect(response.status).to eq(200)
+        expect(WatchedWord.count).to eq(2)
+
+        expect(WatchedWord.pluck(:word, :replacement)).to contain_exactly(
+          ['hello', 'tag1,tag2'],
+          ['world', 'tag2,tag3']
+        )
+
+        expect(WatchedWord.pluck(:action).uniq).to eq([WatchedWord.actions[:tag]])
+      end
     end
   end
 
   describe '#download' do
     context 'not logged in as admin' do
       it "doesn't allow performing #download" do
-        get "/admin/logs/watched_words/action/block/download"
+        get "/admin/customize/watched_words/action/block/download"
         expect(response.status).to eq(404)
       end
     end
@@ -67,16 +85,26 @@ RSpec.describe Admin::WatchedWordsController do
         block_word_1 = Fabricate(:watched_word, action: WatchedWord.actions[:block])
         block_word_2 = Fabricate(:watched_word, action: WatchedWord.actions[:block])
         censor_word_1 = Fabricate(:watched_word, action: WatchedWord.actions[:censor])
+        autotag_1 = Fabricate(:watched_word, action: WatchedWord.actions[:tag], replacement: "tag1,tag2")
+        autotag_2 = Fabricate(:watched_word, action: WatchedWord.actions[:tag], replacement: "tag3,tag2")
 
-        get "/admin/logs/watched_words/action/block/download"
+        get "/admin/customize/watched_words/action/block/download"
         expect(response.status).to eq(200)
         block_words = response.body.split("\n")
         expect(block_words).to contain_exactly(block_word_1.word, block_word_2.word)
 
-        get "/admin/logs/watched_words/action/censor/download"
+        get "/admin/customize/watched_words/action/censor/download"
         expect(response.status).to eq(200)
         censor_words = response.body.split("\n")
-        expect(censor_words).to eq([censor_word_1.word])
+        expect(censor_words).to contain_exactly(censor_word_1.word)
+
+        get "/admin/customize/watched_words/action/tag/download"
+        expect(response.status).to eq(200)
+        tag_words = response.body.split("\n").map(&:parse_csv)
+        expect(tag_words).to contain_exactly(
+          [autotag_1.word, autotag_1.replacement],
+          [autotag_2.word, autotag_2.replacement]
+        )
       end
     end
   end
@@ -85,7 +113,7 @@ RSpec.describe Admin::WatchedWordsController do
     context 'non admins' do
       it "doesn't allow them to perform #clear_all" do
         word = Fabricate(:watched_word, action: WatchedWord.actions[:block])
-        delete "/admin/logs/watched_words/action/block"
+        delete "/admin/customize/watched_words/action/block"
         expect(response.status).to eq(404)
         expect(WatchedWord.pluck(:word)).to include(word.word)
       end
@@ -98,7 +126,7 @@ RSpec.describe Admin::WatchedWordsController do
 
       it "allows them to perform #clear_all" do
         word = Fabricate(:watched_word, action: WatchedWord.actions[:block])
-        delete "/admin/logs/watched_words/action/block.json"
+        delete "/admin/customize/watched_words/action/block.json"
         expect(response.status).to eq(200)
         expect(WatchedWord.pluck(:word)).not_to include(word.word)
       end
@@ -107,7 +135,7 @@ RSpec.describe Admin::WatchedWordsController do
         block_word = Fabricate(:watched_word, action: WatchedWord.actions[:block])
         flag_word = Fabricate(:watched_word, action: WatchedWord.actions[:flag])
 
-        delete "/admin/logs/watched_words/action/flag.json"
+        delete "/admin/customize/watched_words/action/flag.json"
         expect(response.status).to eq(200)
         all_words = WatchedWord.pluck(:word)
         expect(all_words).to include(block_word.word)
diff --git a/spec/requests/admin/web_hooks_controller_spec.rb b/spec/requests/admin/web_hooks_controller_spec.rb
index 125032351a..61cd3db6a0 100644
--- a/spec/requests/admin/web_hooks_controller_spec.rb
+++ b/spec/requests/admin/web_hooks_controller_spec.rb
@@ -69,7 +69,7 @@ describe Admin::WebHooksController do
         expect(response.status).to eq(200)
         expect(UserHistory.where(acting_user_id: admin.id,
                                  action: UserHistory.actions[:web_hook_update],
-                                 new_value: "payload_url: https://test.com, active: false").exists?).to eq(true)
+                                 new_value: "active: false, payload_url: https://test.com").exists?).to eq(true)
       end
     end
 
diff --git a/spec/requests/api/backups_spec.rb b/spec/requests/api/backups_spec.rb
new file mode 100644
index 0000000000..9b5249274f
--- /dev/null
+++ b/spec/requests/api/backups_spec.rb
@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+require 'swagger_helper'
+
+describe 'backups' do
+
+  let(:admin) { Fabricate(:admin) }
+  let(:backup_filename) { "2021-02-10-065935.tar.gz" }
+  let(:backup_filename2) { "2021-02-11-065935.tar.gz" }
+
+  def create_backup_files(*filenames)
+    @paths = filenames.map do |filename|
+      path = backup_path(filename)
+      File.open(path, "w") { |f| f.write("test backup") }
+      path
+    end
+  end
+
+  def backup_path(filename)
+    File.join(BackupRestore::LocalBackupStore.base_directory, filename)
+  end
+
+  before do
+    Jobs.run_immediately!
+    sign_in(admin)
+    SiteSetting.backup_location = BackupLocationSiteSetting::LOCAL
+    create_backup_files(backup_filename)
+  end
+
+  after do
+    Discourse.redis.flushdb
+
+    @paths&.each { |path| File.delete(path) if File.exists?(path) }
+    @paths = nil
+  end
+
+  path '/admin/backups.json' do
+    get 'List backups' do
+      tags 'Backups'
+      consumes 'application/json'
+      expected_request_schema = nil
+
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = load_spec_schema('backups_list_response')
+        schema expected_response_schema
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+
+    post 'Create backup' do
+      tags 'Backups'
+      consumes 'application/json'
+      expected_request_schema = load_spec_schema('backups_create_request')
+      parameter name: :params, in: :body, schema: expected_request_schema
+
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = load_spec_schema('success_ok_response')
+        schema expected_response_schema
+
+        #BackupRestore.expects(:backup!).with(admin.id, publish_to_message_bus: true, with_uploads: false, client_id: "foo")
+        let(:params) { { 'with_uploads' => false } }
+
+        #it_behaves_like "a JSON endpoint", 200 do
+        #  let(:expected_response_schema) { expected_response_schema }
+        #  let(:expected_request_schema) { expected_request_schema }
+        #end
+
+        # Skipping this test for now because mocking of BackupRestore isn't working for some reason.
+        # Without mocking it spawns a background process which we don't want to happen in our tests.
+        # This still allows the API docs to be generated for this endpoint.
+        xit
+      end
+    end
+  end
+
+  path '/admin/backups/{filename}' do
+    put 'Send download backup email' do
+      tags 'Backups'
+      consumes 'application/json'
+      expected_request_schema = nil
+      parameter name: :filename, in: :path, type: :string, required: true
+
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = nil
+
+        let(:filename) { backup_filename }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+
+    get 'Download backup' do
+      tags 'Backups'
+      consumes 'application/json'
+      expected_request_schema = nil
+      parameter name: :filename, in: :path, type: :string, required: true
+      parameter name: :token, in: :query, type: :string, required: true
+
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = nil
+
+        let(:filename) { backup_filename }
+        let(:token) { EmailBackupToken.set(admin.id) }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/categories_spec.rb b/spec/requests/api/categories_spec.rb
index f14335f1ec..e1311125cb 100644
--- a/spec/requests/api/categories_spec.rb
+++ b/spec/requests/api/categories_spec.rb
@@ -16,406 +16,110 @@ describe 'categories' do
     post 'Creates a category' do
       tags 'Categories'
       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' ]
-      }
+      expected_request_schema = load_spec_schema('category_create_request')
+      parameter name: :params, in: :body, schema: expected_request_schema
 
       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 },
-                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"]
-            }
-          }, required: ["category"]
+      response '200', 'success response' do
+        expected_response_schema = load_spec_schema('category_create_response')
+        schema expected_response_schema
 
-        let(:category) { { name: 'todo', color: 'f94cb0', text_color: '412763' } }
-        run_test!
+        let(:params) { { 'name' => 'todo' } }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
       end
     end
 
-    get 'Retreives a list of categories' do
+    get 'Retrieves a list of categories' do
       tags 'Categories'
-      produces 'application/json'
+      consumes 'application/json'
+      expected_request_schema = nil
 
-      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,
-                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"]
-        run_test!
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = load_spec_schema('category_list_response')
+        schema expected_response_schema
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
       end
     end
   end
 
-  path '/categories/{category_id}.json' do
+  path '/categories/{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' ]
-      }
+      expected_request_schema = load_spec_schema('category_create_request')
+      parameter name: :id, in: :path, schema: { type: :integer }
+      parameter name: :params, in: :body, schema: expected_request_schema
 
       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 },
-              default_list_filter: { 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 },
-            }
-          },
-        }
+      response '200', 'success response' do
+        expected_response_schema = load_spec_schema('category_update_response')
+        schema expected_response_schema
 
-        let(:category_id) { category.id }
-        run_test!
+        let(:id) { category.id }
+        let(:params) { { 'name' => 'todo' } }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
       end
     end
   end
 
-  path '/c/{category_slug}/{category_id}.json' do
+  path '/c/{slug}/{id}.json' do
 
     get 'List topics' do
       tags 'Categories'
       produces 'application/json'
-      parameter name: :category_slug, in: :path, schema: { type: :string }
-      parameter name: :category_id, in: :path, schema: { type: :integer }
+      parameter name: :slug, in: :path, schema: { type: :string }
+      parameter name: :id, in: :path, schema: { type: :integer }
+      expected_request_schema = nil
 
-      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 }
-        let(:category_slug) { category.slug_path.join("/") }
-        run_test!
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = load_spec_schema('category_topics_response')
+        schema expected_response_schema
+
+        let(:id) { category.id }
+        let(:slug) { category.slug_path.join("/") }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
       end
     end
   end
 
-  path '/c/{category_id}/show.json' do
+  path '/c/{id}/show.json' do
 
     get 'Show category' do
       tags 'Categories'
-      produces 'application/json'
-      parameter name: :category_id, in: :path, schema: { type: :string }
+      consumes 'application/json'
+      parameter name: :id, in: :path, schema: { type: :integer }
+      expected_request_schema = nil
 
+      produces 'application/json'
       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 },
-              default_list_filter: { 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!
+        expected_response_schema = load_spec_schema('category_create_response')
+        schema expected_response_schema
+
+        let(:id) { category.id }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
       end
     end
   end
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index b5c28bfd7e..e959eae88a 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -75,11 +75,32 @@ describe 'groups' do
     end
   end
 
+  path '/admin/groups/{id}.json' do
+    delete 'Delete a group' do
+      tags 'Groups'
+      consumes 'application/json'
+      parameter name: :id, in: :path, type: :integer
+      expected_request_schema = nil
+
+      produces 'application/json'
+      response '200', 'response' do
+        expected_response_schema = load_spec_schema('success_ok_response')
+        schema expected_response_schema
+
+        let(:id) { Fabricate(:group).id }
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
   path '/groups/{id}.json' do
     put 'Update a group' do
       tags 'Groups'
       consumes 'application/json'
-      parameter name: :id, in: :path, schema: { type: :string }
+      parameter name: :id, in: :path, type: :integer
       parameter name: :group, in: :body, schema: {
         type: :object,
         properties: {
@@ -106,4 +127,119 @@ describe 'groups' do
     end
   end
 
+  path '/groups/{name}.json' do
+    get 'Get a group' do
+      tags 'Groups'
+      consumes 'application/json'
+      parameter name: :name, in: :path, type: :string
+      expected_request_schema = nil
+
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = load_spec_schema('group_response')
+        schema expected_response_schema
+
+        let(:name) { Fabricate(:group).name }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
+  path '/groups/{name}/members.json' do
+    get 'List group members' do
+      tags 'Groups'
+      consumes 'application/json'
+      parameter name: :name, in: :path, type: :string
+      expected_request_schema = nil
+
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = load_spec_schema('group_members_response')
+        schema expected_response_schema
+
+        let(:name) { Fabricate(:group).name }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
+  path '/groups/{id}/members.json' do
+    put 'Add group members' do
+      tags 'Groups'
+      consumes 'application/json'
+      parameter name: :id, in: :path, type: :integer
+      expected_request_schema = load_spec_schema('group_add_members_request')
+      parameter name: :params, in: :body, schema: expected_request_schema
+
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = load_spec_schema('group_add_members_response')
+        schema expected_response_schema
+
+        let(:id) { Fabricate(:group).id }
+        let(:user) { Fabricate(:user) }
+        let(:user2) { Fabricate(:user) }
+        let(:usernames) { "#{user.username},#{user2.username}" }
+        let(:params) { { 'usernames' => usernames } }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+
+    delete 'Remove group members' do
+      tags 'Groups'
+      consumes 'application/json'
+      parameter name: :id, in: :path, type: :integer
+      expected_request_schema = load_spec_schema('group_remove_members_request')
+      parameter name: :params, in: :body, schema: expected_request_schema
+
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = load_spec_schema('group_remove_members_response')
+        schema expected_response_schema
+
+        let(:id) { Fabricate(:group).id }
+        let(:user) { Fabricate(:user) }
+        let(:user2) { Fabricate(:user) }
+        let(:usernames) { "#{user.username},#{user2.username}" }
+        let(:params) { { 'usernames' => usernames } }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
+  path '/groups.json' do
+    get 'List groups' do
+      tags 'Groups'
+      consumes 'application/json'
+      expected_request_schema = nil
+
+      produces 'application/json'
+      response '200', 'response' do
+        expected_response_schema = load_spec_schema('groups_list_response')
+        schema expected_response_schema
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
 end
diff --git a/spec/requests/api/invites_spec.rb b/spec/requests/api/invites_spec.rb
index bf2b18f3c9..cace13aa16 100644
--- a/spec/requests/api/invites_spec.rb
+++ b/spec/requests/api/invites_spec.rb
@@ -7,7 +7,7 @@ describe 'invites' do
   let(:'Api-Username') { 'system' }
 
   path '/invites.json' do
-    post 'Invite to site by email' do
+    post 'Create an invite' do
       tags 'Invites'
       consumes 'application/json'
       parameter name: 'Api-Key', in: :header, type: :string, required: true
@@ -16,16 +16,31 @@ describe 'invites' do
       parameter name: :request_body, in: :body, schema: {
         type: :object,
         properties: {
-          email: { type: :string },
-          group_names: { type: :string },
-          custom_message: { type: :string },
-        }, required: ['email']
+          email: { type: :string, example: "not-a-user-yet@example.com", description: "required for email invites only" },
+          skip_email: { type: :boolean, default: false },
+          custom_message: { type: :string, description: "optional, for email invites" },
+          max_redemptions_allowed: { type: :integer, example: 5, default: 1, description: "optional, for link invites" },
+          topic_id: { type: :int },
+          group_id: { type: [:int], description: "optional, either this or `group_names`" },
+          group_names: { type: :string, description: "optional, either this or `group_id`" },
+          expires_at: { type: :string, default: "controlled by invite_expiry_days site setting" },
+        }
       }
 
       produces 'application/json'
       response '200', 'success response' do
         schema type: :object, properties: {
-          success: { type: :string, example: "OK" }
+          id: { type: :integer, example: 42 },
+          link: { type: :string, example: "http://example.com/invites/9045fd767efe201ca60c6658bcf14158" },
+          email: { type: :string, example: "not-a-user-yet@example.com" },
+          emailed: { type: :boolean, example: false },
+          custom_message: { type: :string, example: "Hello world!", nullable: true },
+          topics: { type: :array, example: [] },
+          groups: { type: :array, example: [] },
+          created_at: { type: :string, example: "2021-01-01T12:00:00.000Z" },
+          updated_at: { type: :string, example: "2021-01-01T12:00:00.000Z" },
+          expires_at: { type: :string, example: "2021-02-01T12:00:00.000Z" },
+          expired: { type: :boolean, example: false },
         }
 
         let(:request_body) { { email: 'not-a-user-yet@example.com' } }
@@ -33,31 +48,4 @@ describe 'invites' do
       end
     end
   end
-
-  path '/invites/link.json' do
-    post 'Generate an invite link, but do not send an email' do
-      tags 'Invites'
-      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: :request_body, in: :body, schema: {
-        type: :object,
-        properties: {
-          email: { type: :string },
-          group_names: { type: :string },
-          custom_message: { type: :string },
-        }, required: ['email']
-      }
-
-      produces 'application/json'
-      response '200', 'success response' do
-        schema type: :string, example: "http://discourse.example.com/invites/token_value"
-
-        let(:request_body) { { email: 'not-a-user-yet@example.com' } }
-        run_test!
-      end
-    end
-  end
-
 end
diff --git a/spec/requests/api/posts_spec.rb b/spec/requests/api/posts_spec.rb
index a1a818dc7b..fd45f7997a 100644
--- a/spec/requests/api/posts_spec.rb
+++ b/spec/requests/api/posts_spec.rb
@@ -5,6 +5,12 @@ describe 'posts' do
 
   let(:'Api-Key') { Fabricate(:api_key).key }
   let(:'Api-Username') { 'system' }
+  let(:admin) { Fabricate(:admin) }
+
+  before do
+    Jobs.run_immediately!
+    sign_in(admin)
+  end
 
   path '/posts.json' do
 
@@ -90,100 +96,22 @@ describe 'posts' do
     end
 
     post 'Creates a new topic, a new post, or a private message' do
-      tags 'Posts', 'Topics'
+      tags 'Posts', 'Topics', 'Private Messages'
       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' ]
-      }
+      expected_request_schema = load_spec_schema('topic_create_request')
+      parameter name: :params, in: :body, schema: expected_request_schema
 
       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 },
-        }
+        expected_response_schema = load_spec_schema('topic_create_response')
+        schema expected_response_schema
 
-        let(:post_body) { Fabricate(:post) }
-        run_test!
+        let(:params) { Fabricate(:post) }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
       end
     end
   end
diff --git a/spec/requests/api/schemas/json/admin_user_list_response.json b/spec/requests/api/schemas/json/admin_user_list_response.json
new file mode 100644
index 0000000000..075318ac72
--- /dev/null
+++ b/spec/requests/api/schemas/json/admin_user_list_response.json
@@ -0,0 +1,122 @@
+{
+  "type": "array",
+  "minItems": 1,
+  "uniqueItems": true,
+  "items": {
+    "type": "object",
+    "properties": {
+      "id": {
+        "type": "integer"
+      },
+      "username": {
+        "type": "string"
+      },
+      "name": {
+        "type": [
+          "string",
+          "null"
+        ]
+      },
+      "avatar_template": {
+        "type": "string"
+      },
+      "email": {
+        "type": "string"
+      },
+      "secondary_emails": {
+        "type": "array",
+        "items": [
+
+        ]
+      },
+      "active": {
+        "type": "boolean"
+      },
+      "admin": {
+        "type": "boolean"
+      },
+      "moderator": {
+        "type": "boolean"
+      },
+      "last_seen_at": {
+        "type": ["string", "null"]
+      },
+      "last_emailed_at": {
+        "type": ["string", "null"]
+      },
+      "created_at": {
+        "type": "string"
+      },
+      "last_seen_age": {
+        "type": ""
+      },
+      "last_emailed_age": {
+        "type": ""
+      },
+      "created_at_age": {
+        "type": ""
+      },
+      "trust_level": {
+        "type": "integer"
+      },
+      "manual_locked_trust_level": {
+        "type": [
+          "string",
+          "null"
+        ]
+      },
+      "flag_level": {
+        "type": "integer"
+      },
+      "title": {
+        "type": [
+          "string",
+          "null"
+        ]
+      },
+      "time_read": {
+        "type": "integer"
+      },
+      "staged": {
+        "type": "boolean"
+      },
+      "days_visited": {
+        "type": "integer"
+      },
+      "posts_read_count": {
+        "type": "integer"
+      },
+      "topics_entered": {
+        "type": "integer"
+      },
+      "post_count": {
+        "type": "integer"
+      }
+    },
+    "required": [
+      "id",
+      "username",
+      "name",
+      "avatar_template",
+      "active",
+      "admin",
+      "moderator",
+      "last_seen_at",
+      "last_emailed_at",
+      "created_at",
+      "last_seen_age",
+      "last_emailed_age",
+      "created_at_age",
+      "trust_level",
+      "manual_locked_trust_level",
+      "flag_level",
+      "title",
+      "time_read",
+      "staged",
+      "days_visited",
+      "posts_read_count",
+      "topics_entered",
+      "post_count"
+    ]
+  }
+}
diff --git a/spec/requests/api/schemas/json/admin_user_response.json b/spec/requests/api/schemas/json/admin_user_response.json
new file mode 100644
index 0000000000..a48094a3ed
--- /dev/null
+++ b/spec/requests/api/schemas/json/admin_user_response.json
@@ -0,0 +1,616 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "id": {
+      "type": "integer"
+    },
+    "username": {
+      "type": "string"
+    },
+    "name": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "avatar_template": {
+      "type": "string"
+    },
+    "email": {
+      "type": "string"
+    },
+    "secondary_emails": {
+      "type": "array",
+      "items": [
+
+      ]
+    },
+    "active": {
+      "type": "boolean"
+    },
+    "admin": {
+      "type": "boolean"
+    },
+    "moderator": {
+      "type": "boolean"
+    },
+    "last_seen_at": {
+      "type": ["string", "null"]
+    },
+    "last_emailed_at": {
+      "type": ["string", "null"]
+    },
+    "created_at": {
+      "type": "string"
+    },
+    "last_seen_age": {
+      "type": ""
+    },
+    "last_emailed_age": {
+      "type": ""
+    },
+    "created_at_age": {
+      "type": ""
+    },
+    "trust_level": {
+      "type": "integer"
+    },
+    "manual_locked_trust_level": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "flag_level": {
+      "type": "integer"
+    },
+    "title": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "time_read": {
+      "type": "integer"
+    },
+    "staged": {
+      "type": "boolean"
+    },
+    "days_visited": {
+      "type": "integer"
+    },
+    "posts_read_count": {
+      "type": "integer"
+    },
+    "topics_entered": {
+      "type": "integer"
+    },
+    "post_count": {
+      "type": "integer"
+    },
+    "associated_accounts": {
+      "type": "array",
+      "items": [
+
+      ]
+    },
+    "can_send_activation_email": {
+      "type": "boolean"
+    },
+    "can_activate": {
+      "type": "boolean"
+    },
+    "can_deactivate": {
+      "type": "boolean"
+    },
+    "ip_address": {
+      "type": "string"
+    },
+    "registration_ip_address": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "can_grant_admin": {
+      "type": "boolean"
+    },
+    "can_revoke_admin": {
+      "type": "boolean"
+    },
+    "can_grant_moderation": {
+      "type": "boolean"
+    },
+    "can_revoke_moderation": {
+      "type": "boolean"
+    },
+    "can_impersonate": {
+      "type": "boolean"
+    },
+    "like_count": {
+      "type": "integer"
+    },
+    "like_given_count": {
+      "type": "integer"
+    },
+    "topic_count": {
+      "type": "integer"
+    },
+    "flags_given_count": {
+      "type": "integer"
+    },
+    "flags_received_count": {
+      "type": "integer"
+    },
+    "private_topics_count": {
+      "type": "integer"
+    },
+    "can_delete_all_posts": {
+      "type": "boolean"
+    },
+    "can_be_deleted": {
+      "type": "boolean"
+    },
+    "can_be_anonymized": {
+      "type": "boolean"
+    },
+    "can_be_merged": {
+      "type": "boolean"
+    },
+    "full_suspend_reason": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "silence_reason": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "primary_group_id": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "badge_count": {
+      "type": "integer"
+    },
+    "warnings_received_count": {
+      "type": "integer"
+    },
+    "bounce_score": {
+      "type": ""
+    },
+    "reset_bounce_score_after": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "can_view_action_logs": {
+      "type": "boolean"
+    },
+    "can_disable_second_factor": {
+      "type": "boolean"
+    },
+    "can_delete_sso_record": {
+      "type": "boolean"
+    },
+    "api_key_count": {
+      "type": "integer"
+    },
+    "single_sign_on_record": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "approved_by": {
+      "type": ["object", "null"],
+      "additionalProperties": false,
+      "properties": {
+        "id": {
+          "type": "integer"
+        },
+        "username": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "avatar_template": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "id",
+        "username",
+        "name",
+        "avatar_template"
+      ]
+    },
+    "suspended_by": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "silenced_by": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "tl3_requirements": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "time_period": {
+          "type": "integer"
+        },
+        "requirements_met": {
+          "type": "boolean"
+        },
+        "requirements_lost": {
+          "type": "boolean"
+        },
+        "trust_level_locked": {
+          "type": "boolean"
+        },
+        "on_grace_period": {
+          "type": "boolean"
+        },
+        "days_visited": {
+          "type": "integer"
+        },
+        "min_days_visited": {
+          "type": "integer"
+        },
+        "num_topics_replied_to": {
+          "type": "integer"
+        },
+        "min_topics_replied_to": {
+          "type": "integer"
+        },
+        "topics_viewed": {
+          "type": "integer"
+        },
+        "min_topics_viewed": {
+          "type": "integer"
+        },
+        "posts_read": {
+          "type": "integer"
+        },
+        "min_posts_read": {
+          "type": "integer"
+        },
+        "topics_viewed_all_time": {
+          "type": "integer"
+        },
+        "min_topics_viewed_all_time": {
+          "type": "integer"
+        },
+        "posts_read_all_time": {
+          "type": "integer"
+        },
+        "min_posts_read_all_time": {
+          "type": "integer"
+        },
+        "num_flagged_posts": {
+          "type": "integer"
+        },
+        "max_flagged_posts": {
+          "type": "integer"
+        },
+        "num_flagged_by_users": {
+          "type": "integer"
+        },
+        "max_flagged_by_users": {
+          "type": "integer"
+        },
+        "num_likes_given": {
+          "type": "integer"
+        },
+        "min_likes_given": {
+          "type": "integer"
+        },
+        "num_likes_received": {
+          "type": "integer"
+        },
+        "min_likes_received": {
+          "type": "integer"
+        },
+        "num_likes_received_days": {
+          "type": "integer"
+        },
+        "min_likes_received_days": {
+          "type": "integer"
+        },
+        "num_likes_received_users": {
+          "type": "integer"
+        },
+        "min_likes_received_users": {
+          "type": "integer"
+        },
+        "penalty_counts": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "silenced": {
+              "type": "integer"
+            },
+            "suspended": {
+              "type": "integer"
+            },
+            "total": {
+              "type": "integer"
+            }
+          },
+          "required": [
+            "silenced",
+            "suspended",
+            "total"
+          ]
+        }
+      },
+      "required": [
+        "time_period",
+        "requirements_met",
+        "requirements_lost",
+        "trust_level_locked",
+        "on_grace_period",
+        "days_visited",
+        "min_days_visited",
+        "num_topics_replied_to",
+        "min_topics_replied_to",
+        "topics_viewed",
+        "min_topics_viewed",
+        "posts_read",
+        "min_posts_read",
+        "topics_viewed_all_time",
+        "min_topics_viewed_all_time",
+        "posts_read_all_time",
+        "min_posts_read_all_time",
+        "num_flagged_posts",
+        "max_flagged_posts",
+        "num_flagged_by_users",
+        "max_flagged_by_users",
+        "num_likes_given",
+        "min_likes_given",
+        "num_likes_received",
+        "min_likes_received",
+        "num_likes_received_days",
+        "min_likes_received_days",
+        "num_likes_received_users",
+        "min_likes_received_users",
+        "penalty_counts"
+      ]
+    },
+    "groups": {
+      "type": "array",
+      "items": [
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "type": "integer"
+            },
+            "automatic": {
+              "type": "boolean"
+            },
+            "name": {
+              "type": "string"
+            },
+            "display_name": {
+              "type": "string"
+            },
+            "user_count": {
+              "type": "integer"
+            },
+            "mentionable_level": {
+              "type": "integer"
+            },
+            "messageable_level": {
+              "type": "integer"
+            },
+            "visibility_level": {
+              "type": "integer"
+            },
+            "primary_group": {
+              "type": "boolean"
+            },
+            "title": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "grant_trust_level": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "incoming_email": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "has_messages": {
+              "type": "boolean"
+            },
+            "flair_url": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "flair_bg_color": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "flair_color": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "bio_raw": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "bio_cooked": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "bio_excerpt": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "public_admission": {
+              "type": "boolean"
+            },
+            "public_exit": {
+              "type": "boolean"
+            },
+            "allow_membership_requests": {
+              "type": "boolean"
+            },
+            "full_name": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "default_notification_level": {
+              "type": "integer"
+            },
+            "membership_request_template": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "members_visibility_level": {
+              "type": "integer"
+            },
+            "can_see_members": {
+              "type": "boolean"
+            },
+            "can_admin_group": {
+              "type": "boolean"
+            },
+            "publish_read_state": {
+              "type": "boolean"
+            }
+          },
+          "required": [
+            "id",
+            "automatic",
+            "name",
+            "display_name",
+            "user_count",
+            "mentionable_level",
+            "messageable_level",
+            "visibility_level",
+            "primary_group",
+            "title",
+            "grant_trust_level",
+            "incoming_email",
+            "has_messages",
+            "flair_url",
+            "flair_bg_color",
+            "flair_color",
+            "bio_raw",
+            "bio_cooked",
+            "bio_excerpt",
+            "public_admission",
+            "public_exit",
+            "allow_membership_requests",
+            "full_name",
+            "default_notification_level",
+            "membership_request_template",
+            "members_visibility_level",
+            "can_see_members",
+            "can_admin_group",
+            "publish_read_state"
+          ]
+        }
+      ]
+    }
+  },
+  "required": [
+    "id",
+    "username",
+    "name",
+    "avatar_template",
+    "active",
+    "admin",
+    "moderator",
+    "last_seen_at",
+    "last_emailed_at",
+    "created_at",
+    "last_seen_age",
+    "last_emailed_age",
+    "created_at_age",
+    "trust_level",
+    "manual_locked_trust_level",
+    "flag_level",
+    "title",
+    "time_read",
+    "staged",
+    "days_visited",
+    "posts_read_count",
+    "topics_entered",
+    "post_count",
+    "can_send_activation_email",
+    "can_activate",
+    "can_deactivate",
+    "ip_address",
+    "registration_ip_address",
+    "can_grant_admin",
+    "can_revoke_admin",
+    "can_grant_moderation",
+    "can_revoke_moderation",
+    "can_impersonate",
+    "like_count",
+    "like_given_count",
+    "topic_count",
+    "flags_given_count",
+    "flags_received_count",
+    "private_topics_count",
+    "can_delete_all_posts",
+    "can_be_deleted",
+    "can_be_anonymized",
+    "can_be_merged",
+    "full_suspend_reason",
+    "silence_reason",
+    "primary_group_id",
+    "badge_count",
+    "warnings_received_count",
+    "bounce_score",
+    "reset_bounce_score_after",
+    "can_view_action_logs",
+    "can_disable_second_factor",
+    "can_delete_sso_record",
+    "api_key_count",
+    "single_sign_on_record",
+    "approved_by",
+    "suspended_by",
+    "silenced_by",
+    "groups"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/backups_create_request.json b/spec/requests/api/schemas/json/backups_create_request.json
new file mode 100644
index 0000000000..a207b8fb81
--- /dev/null
+++ b/spec/requests/api/schemas/json/backups_create_request.json
@@ -0,0 +1,11 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "with_uploads": {
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "with_uploads"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/backups_list_response.json b/spec/requests/api/schemas/json/backups_list_response.json
new file mode 100644
index 0000000000..f6e54fb854
--- /dev/null
+++ b/spec/requests/api/schemas/json/backups_list_response.json
@@ -0,0 +1,24 @@
+{
+  "type": "array",
+  "minItems": 1,
+  "uniqueItems": true,
+  "items": {
+    "type": "object",
+    "properties": {
+      "filename": {
+        "type": "string"
+      },
+      "size": {
+        "type": "integer"
+      },
+      "last_modified": {
+        "type": "string"
+      }
+    },
+    "required": [
+      "filename",
+      "size",
+      "last_modified"
+    ]
+  }
+}
diff --git a/spec/requests/api/schemas/json/category_create_request.json b/spec/requests/api/schemas/json/category_create_request.json
new file mode 100644
index 0000000000..57af4b7b1a
--- /dev/null
+++ b/spec/requests/api/schemas/json/category_create_request.json
@@ -0,0 +1,19 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "name": {
+      "type": "string"
+    },
+    "color": {
+      "type": "string",
+      "example": "49d9e9"
+    },
+    "text_color": {
+      "type": "string",
+      "example": "f0fcfd"
+    }
+  },
+  "required": [
+    "name"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/category_create_response.json b/spec/requests/api/schemas/json/category_create_response.json
new file mode 100644
index 0000000000..87aca679ff
--- /dev/null
+++ b/spec/requests/api/schemas/json/category_create_response.json
@@ -0,0 +1,295 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "category": {
+      "type": "object",
+      "additionalProperties": false,
+      "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",
+            "null"
+          ]
+        },
+        "description_text": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "description_excerpt": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "topic_url": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "read_restricted": {
+          "type": "boolean"
+        },
+        "permission": {
+          "type": [
+            "integer",
+            "null"
+          ]
+        },
+        "notification_level": {
+          "type": "integer"
+        },
+        "can_edit": {
+          "type": "boolean"
+        },
+        "topic_template": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "has_children": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "sort_order": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "sort_ascending": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "show_subcategory_list": {
+          "type": "boolean"
+        },
+        "num_featured_topics": {
+          "type": "integer"
+        },
+        "default_view": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "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": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+          },
+          "required": [
+
+          ]
+        },
+        "min_tags_from_required_group": {
+          "type": "integer"
+        },
+        "allowed_tags": {
+          "type": "array"
+        },
+        "allowed_tag_groups": {
+          "type": "array"
+        },
+        "allow_global_tags": {
+          "type": "boolean"
+        },
+        "required_tag_group_name": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "read_only_banner": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "available_groups": {
+          "type": "array",
+          "items": [
+
+          ]
+        },
+        "auto_close_hours": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "auto_close_based_on_last_post": {
+          "type": "boolean"
+        },
+        "allow_unlimited_owner_edits_on_first_post": {
+          "type": "boolean"
+        },
+        "group_permissions": {
+          "type": "array",
+          "items": [
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "permission_type": {
+                  "type": "integer"
+                },
+                "group_name": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "permission_type",
+                "group_name"
+              ]
+            }
+          ]
+        },
+        "email_in": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "email_in_allow_strangers": {
+          "type": "boolean"
+        },
+        "mailinglist_mirror": {
+          "type": "boolean"
+        },
+        "all_topics_wiki": {
+          "type": "boolean"
+        },
+        "can_delete": {
+          "type": "boolean"
+        },
+        "cannot_delete_reason": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "allow_badges": {
+          "type": "boolean"
+        },
+        "topic_featured_link_allowed": {
+          "type": "boolean"
+        },
+        "search_priority": {
+          "type": "integer"
+        },
+        "uploaded_logo": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "uploaded_background": {
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "name",
+        "color",
+        "text_color",
+        "slug",
+        "topic_count",
+        "post_count",
+        "position",
+        "description",
+        "description_text",
+        "description_excerpt",
+        "topic_url",
+        "read_restricted",
+        "permission",
+        "notification_level",
+        "can_edit",
+        "topic_template",
+        "has_children",
+        "sort_order",
+        "sort_ascending",
+        "show_subcategory_list",
+        "num_featured_topics",
+        "default_view",
+        "subcategory_list_style",
+        "default_top_period",
+        "default_list_filter",
+        "minimum_required_tags",
+        "navigate_to_first_post_after_read",
+        "custom_fields",
+        "min_tags_from_required_group",
+        "required_tag_group_name",
+        "read_only_banner",
+        "available_groups",
+        "auto_close_hours",
+        "auto_close_based_on_last_post",
+        "allow_unlimited_owner_edits_on_first_post",
+        "group_permissions",
+        "email_in",
+        "email_in_allow_strangers",
+        "mailinglist_mirror",
+        "all_topics_wiki",
+        "can_delete",
+        "cannot_delete_reason",
+        "allow_badges",
+        "topic_featured_link_allowed",
+        "search_priority",
+        "uploaded_logo",
+        "uploaded_background"
+      ]
+    }
+  },
+  "required": [
+    "category"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/category_list_response.json b/spec/requests/api/schemas/json/category_list_response.json
new file mode 100644
index 0000000000..1aa3c8f064
--- /dev/null
+++ b/spec/requests/api/schemas/json/category_list_response.json
@@ -0,0 +1,210 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "category_list": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "can_create_category": {
+          "type": "boolean"
+        },
+        "can_create_topic": {
+          "type": "boolean"
+        },
+        "categories": {
+          "type": "array",
+          "items": [
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "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"
+                },
+                "description_text": {
+                  "type": "string"
+                },
+                "description_excerpt": {
+                  "type": "string"
+                },
+                "topic_url": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "read_restricted": {
+                  "type": "boolean"
+                },
+                "permission": {
+                  "type": "integer"
+                },
+                "notification_level": {
+                  "type": "integer"
+                },
+                "can_edit": {
+                  "type": "boolean"
+                },
+                "topic_template": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "has_children": {
+                  "type": "boolean"
+                },
+                "sort_order": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "sort_ascending": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "show_subcategory_list": {
+                  "type": "boolean"
+                },
+                "num_featured_topics": {
+                  "type": "integer"
+                },
+                "default_view": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "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"
+                },
+                "topics_day": {
+                  "type": "integer"
+                },
+                "topics_week": {
+                  "type": "integer"
+                },
+                "topics_month": {
+                  "type": "integer"
+                },
+                "topics_year": {
+                  "type": "integer"
+                },
+                "topics_all_time": {
+                  "type": "integer"
+                },
+                "is_uncategorized": {
+                  "type": "boolean"
+                },
+                "subcategory_ids": {
+                  "type": "array",
+                  "items": [
+
+                  ]
+                },
+                "uploaded_logo": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "uploaded_background": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
+              },
+              "required": [
+                "id",
+                "name",
+                "color",
+                "text_color",
+                "slug",
+                "topic_count",
+                "post_count",
+                "position",
+                "description",
+                "description_text",
+                "description_excerpt",
+                "topic_url",
+                "read_restricted",
+                "permission",
+                "notification_level",
+                "can_edit",
+                "topic_template",
+                "has_children",
+                "sort_order",
+                "sort_ascending",
+                "show_subcategory_list",
+                "num_featured_topics",
+                "default_view",
+                "subcategory_list_style",
+                "default_top_period",
+                "default_list_filter",
+                "minimum_required_tags",
+                "navigate_to_first_post_after_read",
+                "topics_day",
+                "topics_week",
+                "topics_month",
+                "topics_year",
+                "topics_all_time",
+                "is_uncategorized",
+                "subcategory_ids",
+                "uploaded_logo",
+                "uploaded_background"
+              ]
+            }
+          ]
+        }
+      },
+      "required": [
+        "can_create_category",
+        "can_create_topic",
+        "categories"
+      ]
+    }
+  },
+  "required": [
+    "category_list"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/category_topics_response.json b/spec/requests/api/schemas/json/category_topics_response.json
new file mode 100644
index 0000000000..77322166c9
--- /dev/null
+++ b/spec/requests/api/schemas/json/category_topics_response.json
@@ -0,0 +1,240 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "users": {
+      "type": "array",
+      "items": [
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "type": "integer"
+            },
+            "username": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "avatar_template": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "id",
+            "username",
+            "name",
+            "avatar_template"
+          ]
+        }
+      ]
+    },
+    "primary_groups": {
+      "type": "array",
+      "items": [
+
+      ]
+    },
+    "topic_list": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "can_create_topic": {
+          "type": "boolean"
+        },
+        "per_page": {
+          "type": "integer"
+        },
+        "top_tags": {
+          "type": "array"
+        },
+        "topics": {
+          "type": "array",
+          "items": [
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "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",
+                    "null"
+                  ]
+                },
+                "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": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "excerpt": {
+                  "type": "string"
+                },
+                "visible": {
+                  "type": "boolean"
+                },
+                "closed": {
+                  "type": "boolean"
+                },
+                "archived": {
+                  "type": "boolean"
+                },
+                "bookmarked": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "liked": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "views": {
+                  "type": "integer"
+                },
+                "like_count": {
+                  "type": "integer"
+                },
+                "has_summary": {
+                  "type": "boolean"
+                },
+                "last_poster_username": {
+                  "type": "string"
+                },
+                "category_id": {
+                  "type": "integer"
+                },
+                "pinned_globally": {
+                  "type": "boolean"
+                },
+                "featured_link": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "posters": {
+                  "type": "array",
+                  "items": [
+                    {
+                      "type": "object",
+                      "additionalProperties": false,
+                      "properties": {
+                        "extras": {
+                          "type": "string"
+                        },
+                        "description": {
+                          "type": "string"
+                        },
+                        "user_id": {
+                          "type": "integer"
+                        },
+                        "primary_group_id": {
+                          "type": [
+                            "string",
+                            "null"
+                          ]
+                        }
+                      },
+                      "required": [
+                        "extras",
+                        "description",
+                        "user_id",
+                        "primary_group_id"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "id",
+                "title",
+                "fancy_title",
+                "slug",
+                "posts_count",
+                "reply_count",
+                "highest_post_number",
+                "image_url",
+                "created_at",
+                "last_posted_at",
+                "bumped",
+                "bumped_at",
+                "archetype",
+                "unseen",
+                "pinned",
+                "unpinned",
+                "excerpt",
+                "visible",
+                "closed",
+                "archived",
+                "bookmarked",
+                "liked",
+                "views",
+                "like_count",
+                "has_summary",
+                "last_poster_username",
+                "category_id",
+                "pinned_globally",
+                "featured_link",
+                "posters"
+              ]
+            }
+          ]
+        }
+      },
+      "required": [
+        "can_create_topic",
+        "per_page",
+        "topics"
+      ]
+    }
+  },
+  "required": [
+    "topic_list"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/category_update_response.json b/spec/requests/api/schemas/json/category_update_response.json
new file mode 100644
index 0000000000..94a8d50708
--- /dev/null
+++ b/spec/requests/api/schemas/json/category_update_response.json
@@ -0,0 +1,299 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "success": {
+      "type": "string"
+    },
+    "category": {
+      "type": "object",
+      "additionalProperties": false,
+      "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",
+            "null"
+          ]
+        },
+        "description_text": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "description_excerpt": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "topic_url": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "read_restricted": {
+          "type": "boolean"
+        },
+        "permission": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "notification_level": {
+          "type": "integer"
+        },
+        "can_edit": {
+          "type": "boolean"
+        },
+        "topic_template": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "has_children": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "sort_order": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "sort_ascending": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "show_subcategory_list": {
+          "type": "boolean"
+        },
+        "num_featured_topics": {
+          "type": "integer"
+        },
+        "default_view": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "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": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+          },
+          "required": [
+
+          ]
+        },
+        "min_tags_from_required_group": {
+          "type": "integer"
+        },
+        "allowed_tags": {
+          "type": "array"
+        },
+        "allowed_tag_groups": {
+          "type": "array"
+        },
+        "allow_global_tags": {
+          "type": "boolean"
+        },
+        "required_tag_group_name": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "read_only_banner": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "available_groups": {
+          "type": "array",
+          "items": [
+
+          ]
+        },
+        "auto_close_hours": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "auto_close_based_on_last_post": {
+          "type": "boolean"
+        },
+        "allow_unlimited_owner_edits_on_first_post": {
+          "type": "boolean"
+        },
+        "group_permissions": {
+          "type": "array",
+          "items": [
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "permission_type": {
+                  "type": "integer"
+                },
+                "group_name": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "permission_type",
+                "group_name"
+              ]
+            }
+          ]
+        },
+        "email_in": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "email_in_allow_strangers": {
+          "type": "boolean"
+        },
+        "mailinglist_mirror": {
+          "type": "boolean"
+        },
+        "all_topics_wiki": {
+          "type": "boolean"
+        },
+        "can_delete": {
+          "type": "boolean"
+        },
+        "cannot_delete_reason": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "allow_badges": {
+          "type": "boolean"
+        },
+        "topic_featured_link_allowed": {
+          "type": "boolean"
+        },
+        "search_priority": {
+          "type": "integer"
+        },
+        "uploaded_logo": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "uploaded_background": {
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "name",
+        "color",
+        "text_color",
+        "slug",
+        "topic_count",
+        "post_count",
+        "position",
+        "description",
+        "description_text",
+        "description_excerpt",
+        "topic_url",
+        "read_restricted",
+        "permission",
+        "notification_level",
+        "can_edit",
+        "topic_template",
+        "has_children",
+        "sort_order",
+        "sort_ascending",
+        "show_subcategory_list",
+        "num_featured_topics",
+        "default_view",
+        "subcategory_list_style",
+        "default_top_period",
+        "default_list_filter",
+        "minimum_required_tags",
+        "navigate_to_first_post_after_read",
+        "custom_fields",
+        "min_tags_from_required_group",
+        "required_tag_group_name",
+        "read_only_banner",
+        "available_groups",
+        "auto_close_hours",
+        "auto_close_based_on_last_post",
+        "allow_unlimited_owner_edits_on_first_post",
+        "group_permissions",
+        "email_in",
+        "email_in_allow_strangers",
+        "mailinglist_mirror",
+        "all_topics_wiki",
+        "can_delete",
+        "cannot_delete_reason",
+        "allow_badges",
+        "topic_featured_link_allowed",
+        "search_priority",
+        "uploaded_logo",
+        "uploaded_background"
+      ]
+    }
+  },
+  "required": [
+    "success",
+    "category"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/group_add_members_request.json b/spec/requests/api/schemas/json/group_add_members_request.json
new file mode 100644
index 0000000000..1ac6f3cefb
--- /dev/null
+++ b/spec/requests/api/schemas/json/group_add_members_request.json
@@ -0,0 +1,10 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "usernames": {
+      "type": "string",
+      "description": "comma separated list",
+      "example": "username1,username2"
+    }
+  }
+}
diff --git a/spec/requests/api/schemas/json/group_add_members_response.json b/spec/requests/api/schemas/json/group_add_members_response.json
new file mode 100644
index 0000000000..40b05621aa
--- /dev/null
+++ b/spec/requests/api/schemas/json/group_add_members_response.json
@@ -0,0 +1,25 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "success": {
+      "type": "string"
+    },
+    "usernames": {
+      "type": "array",
+      "items": [
+
+      ]
+    },
+    "emails": {
+      "type": "array",
+      "items": [
+
+      ]
+    }
+  },
+  "required": [
+    "success",
+    "usernames",
+    "emails"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/group_members_response.json b/spec/requests/api/schemas/json/group_members_response.json
new file mode 100644
index 0000000000..f19aa51133
--- /dev/null
+++ b/spec/requests/api/schemas/json/group_members_response.json
@@ -0,0 +1,140 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "members": {
+      "type": "array",
+      "items": [
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "type": "integer"
+            },
+            "username": {
+              "type": "string"
+            },
+            "name": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "avatar_template": {
+              "type": "string"
+            },
+            "title": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "last_posted_at": {
+              "type": "string"
+            },
+            "last_seen_at": {
+              "type": "string"
+            },
+            "added_at": {
+              "type": "string"
+            },
+            "timezone": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "id",
+            "username",
+            "name",
+            "avatar_template",
+            "title",
+            "last_posted_at",
+            "last_seen_at",
+            "added_at",
+            "timezone"
+          ]
+        }
+      ]
+    },
+    "owners": {
+      "type": "array",
+      "items": [
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "type": "integer"
+            },
+            "username": {
+              "type": "string"
+            },
+            "name": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "avatar_template": {
+              "type": "string"
+            },
+            "title": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "last_posted_at": {
+              "type": "string"
+            },
+            "last_seen_at": {
+              "type": "string"
+            },
+            "added_at": {
+              "type": "string"
+            },
+            "timezone": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "id",
+            "username",
+            "name",
+            "avatar_template",
+            "title",
+            "last_posted_at",
+            "last_seen_at",
+            "added_at",
+            "timezone"
+          ]
+        }
+      ]
+    },
+    "meta": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "total": {
+          "type": "integer"
+        },
+        "limit": {
+          "type": "integer"
+        },
+        "offset": {
+          "type": "integer"
+        }
+      },
+      "required": [
+        "total",
+        "limit",
+        "offset"
+      ]
+    }
+  },
+  "required": [
+    "members",
+    "owners",
+    "meta"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/group_remove_members_request.json b/spec/requests/api/schemas/json/group_remove_members_request.json
new file mode 100644
index 0000000000..1ac6f3cefb
--- /dev/null
+++ b/spec/requests/api/schemas/json/group_remove_members_request.json
@@ -0,0 +1,10 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "usernames": {
+      "type": "string",
+      "description": "comma separated list",
+      "example": "username1,username2"
+    }
+  }
+}
diff --git a/spec/requests/api/schemas/json/group_remove_members_response.json b/spec/requests/api/schemas/json/group_remove_members_response.json
new file mode 100644
index 0000000000..a54f042b48
--- /dev/null
+++ b/spec/requests/api/schemas/json/group_remove_members_response.json
@@ -0,0 +1,25 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "success": {
+      "type": "string"
+    },
+    "usernames": {
+      "type": "array",
+      "items": [
+
+      ]
+    },
+    "skipped_usernames": {
+      "type": "array",
+      "items": [
+
+      ]
+    }
+  },
+  "required": [
+    "success",
+    "usernames",
+    "skipped_usernames"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/group_response.json b/spec/requests/api/schemas/json/group_response.json
new file mode 100644
index 0000000000..b4bf0f15cc
--- /dev/null
+++ b/spec/requests/api/schemas/json/group_response.json
@@ -0,0 +1,331 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "group": {
+      "type": "object",
+      "additionalProperties": false,
+      "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"
+        },
+        "primary_group": {
+          "type": "boolean"
+        },
+        "title": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "grant_trust_level": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "incoming_email": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "has_messages": {
+          "type": "boolean"
+        },
+        "flair_url": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "flair_bg_color": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "flair_color": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "bio_raw": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "bio_cooked": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "bio_excerpt": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "public_admission": {
+          "type": "boolean"
+        },
+        "public_exit": {
+          "type": "boolean"
+        },
+        "allow_membership_requests": {
+          "type": "boolean"
+        },
+        "full_name": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "default_notification_level": {
+          "type": "integer"
+        },
+        "membership_request_template": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "is_group_user": {
+          "type": "boolean"
+        },
+        "members_visibility_level": {
+          "type": "integer"
+        },
+        "can_see_members": {
+          "type": "boolean"
+        },
+        "can_admin_group": {
+          "type": "boolean"
+        },
+        "publish_read_state": {
+          "type": "boolean"
+        },
+        "is_group_owner_display": {
+          "type": "boolean"
+        },
+        "mentionable": {
+          "type": "boolean"
+        },
+        "messageable": {
+          "type": "boolean"
+        },
+        "automatic_membership_email_domains": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "smtp_server": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "smtp_port": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "smtp_ssl": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "imap_server": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "imap_port": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "imap_ssl": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "imap_mailbox_name": {
+          "type": "string"
+        },
+        "imap_mailboxes": {
+          "type": "array",
+          "items": [
+
+          ]
+        },
+        "email_username": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "email_password": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "imap_last_error": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "imap_old_emails": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "imap_new_emails": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "message_count": {
+          "type": "integer"
+        },
+        "allow_unknown_sender_topic_replies": {
+          "type": "boolean"
+        },
+        "watching_category_ids": {
+          "type": "array",
+          "items": [
+
+          ]
+        },
+        "tracking_category_ids": {
+          "type": "array",
+          "items": [
+
+          ]
+        },
+        "watching_first_post_category_ids": {
+          "type": "array",
+          "items": [
+
+          ]
+        },
+        "regular_category_ids": {
+          "type": "array",
+          "items": [
+
+          ]
+        },
+        "muted_category_ids": {
+          "type": "array",
+          "items": [
+
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "automatic",
+        "name",
+        "user_count",
+        "mentionable_level",
+        "messageable_level",
+        "visibility_level",
+        "primary_group",
+        "title",
+        "grant_trust_level",
+        "incoming_email",
+        "has_messages",
+        "flair_url",
+        "flair_bg_color",
+        "flair_color",
+        "bio_raw",
+        "bio_cooked",
+        "bio_excerpt",
+        "public_admission",
+        "public_exit",
+        "allow_membership_requests",
+        "full_name",
+        "default_notification_level",
+        "membership_request_template",
+        "is_group_user",
+        "members_visibility_level",
+        "can_see_members",
+        "can_admin_group",
+        "publish_read_state",
+        "is_group_owner_display",
+        "mentionable",
+        "messageable",
+        "automatic_membership_email_domains",
+        "smtp_server",
+        "smtp_port",
+        "smtp_ssl",
+        "imap_server",
+        "imap_port",
+        "imap_ssl",
+        "imap_mailbox_name",
+        "imap_mailboxes",
+        "email_username",
+        "email_password",
+        "imap_last_error",
+        "imap_old_emails",
+        "imap_new_emails",
+        "message_count",
+        "allow_unknown_sender_topic_replies",
+        "watching_category_ids",
+        "tracking_category_ids",
+        "watching_first_post_category_ids",
+        "regular_category_ids",
+        "muted_category_ids"
+      ]
+    },
+    "extras": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "visible_group_names": {
+          "type": "array",
+          "items": [
+
+          ]
+        }
+      },
+      "required": [
+        "visible_group_names"
+      ]
+    }
+  },
+  "required": [
+    "group",
+    "extras"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/groups_list_response.json b/spec/requests/api/schemas/json/groups_list_response.json
new file mode 100644
index 0000000000..2123948cfb
--- /dev/null
+++ b/spec/requests/api/schemas/json/groups_list_response.json
@@ -0,0 +1,200 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "groups": {
+      "type": "array",
+      "items": [
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "type": "integer"
+            },
+            "automatic": {
+              "type": "boolean"
+            },
+            "name": {
+              "type": "string"
+            },
+            "display_name": {
+              "type": "string"
+            },
+            "user_count": {
+              "type": "integer"
+            },
+            "mentionable_level": {
+              "type": "integer"
+            },
+            "messageable_level": {
+              "type": "integer"
+            },
+            "visibility_level": {
+              "type": "integer"
+            },
+            "primary_group": {
+              "type": "boolean"
+            },
+            "title": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "grant_trust_level": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "incoming_email": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "has_messages": {
+              "type": "boolean"
+            },
+            "flair_url": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "flair_bg_color": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "flair_color": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "bio_raw": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "bio_cooked": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "bio_excerpt": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "public_admission": {
+              "type": "boolean"
+            },
+            "public_exit": {
+              "type": "boolean"
+            },
+            "allow_membership_requests": {
+              "type": "boolean"
+            },
+            "full_name": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "default_notification_level": {
+              "type": "integer"
+            },
+            "membership_request_template": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "is_group_user": {
+              "type": "boolean"
+            },
+            "is_group_owner": {
+              "type": "boolean"
+            },
+            "members_visibility_level": {
+              "type": "integer"
+            },
+            "can_see_members": {
+              "type": "boolean"
+            },
+            "can_admin_group": {
+              "type": "boolean"
+            },
+            "publish_read_state": {
+              "type": "boolean"
+            }
+          },
+          "required": [
+            "id",
+            "automatic",
+            "name",
+            "display_name",
+            "user_count",
+            "mentionable_level",
+            "messageable_level",
+            "visibility_level",
+            "primary_group",
+            "title",
+            "grant_trust_level",
+            "incoming_email",
+            "has_messages",
+            "flair_url",
+            "flair_bg_color",
+            "flair_color",
+            "bio_raw",
+            "bio_cooked",
+            "bio_excerpt",
+            "public_admission",
+            "public_exit",
+            "allow_membership_requests",
+            "full_name",
+            "default_notification_level",
+            "membership_request_template",
+            "members_visibility_level",
+            "can_see_members",
+            "can_admin_group",
+            "publish_read_state"
+          ]
+        }
+      ]
+    },
+    "extras": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "type_filters": {
+          "type": "array",
+          "items": [
+
+          ]
+        }
+      },
+      "required": [
+        "type_filters"
+      ]
+    },
+    "total_rows_groups": {
+      "type": "integer"
+    },
+    "load_more_groups": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "groups",
+    "extras",
+    "total_rows_groups",
+    "load_more_groups"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/search_request.json b/spec/requests/api/schemas/json/search_request.json
new file mode 100644
index 0000000000..0344b0f929
--- /dev/null
+++ b/spec/requests/api/schemas/json/search_request.json
@@ -0,0 +1,11 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "q": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "q"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/search_response.json b/spec/requests/api/schemas/json/search_response.json
new file mode 100644
index 0000000000..999fecbc6d
--- /dev/null
+++ b/spec/requests/api/schemas/json/search_response.json
@@ -0,0 +1,115 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "posts": {
+      "type": "array",
+      "items": [
+
+      ]
+    },
+    "users": {
+      "type": "array",
+      "items": [
+
+      ]
+    },
+    "categories": {
+      "type": "array",
+      "items": [
+
+      ]
+    },
+    "groups": {
+      "type": "array",
+      "items": [
+
+      ]
+    },
+    "grouped_search_result": {
+      "type": ["object", "null"],
+      "additionalProperties": false,
+      "properties": {
+        "more_posts": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "more_users": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "more_categories": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "term": {
+          "type": "string"
+        },
+        "search_log_id": {
+          "type": "integer"
+        },
+        "more_full_page_results": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "can_create_topic": {
+          "type": "boolean"
+        },
+        "error": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "post_ids": {
+          "type": "array",
+          "items": [
+
+          ]
+        },
+        "user_ids": {
+          "type": "array",
+          "items": [
+
+          ]
+        },
+        "category_ids": {
+          "type": "array",
+          "items": [
+
+          ]
+        },
+        "group_ids": {
+          "type": "array",
+          "items": [
+
+          ]
+        }
+      },
+      "required": [
+        "more_posts",
+        "more_users",
+        "more_categories",
+        "term",
+        "search_log_id",
+        "more_full_page_results",
+        "can_create_topic",
+        "error",
+        "post_ids",
+        "user_ids",
+        "category_ids",
+        "group_ids"
+      ]
+    }
+  },
+  "required": [
+    "grouped_search_result"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/success_ok_response.json b/spec/requests/api/schemas/json/success_ok_response.json
new file mode 100644
index 0000000000..3eff7837b8
--- /dev/null
+++ b/spec/requests/api/schemas/json/success_ok_response.json
@@ -0,0 +1,12 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "success": {
+      "type": "string",
+      "example": "OK"
+    }
+  },
+  "required": [
+    "success"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/tag_group_create_request.json b/spec/requests/api/schemas/json/tag_group_create_request.json
new file mode 100644
index 0000000000..2e364e13d9
--- /dev/null
+++ b/spec/requests/api/schemas/json/tag_group_create_request.json
@@ -0,0 +1,12 @@
+{
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "name": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "name"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/tag_group_create_response.json b/spec/requests/api/schemas/json/tag_group_create_response.json
new file mode 100644
index 0000000000..222181c7f2
--- /dev/null
+++ b/spec/requests/api/schemas/json/tag_group_create_response.json
@@ -0,0 +1,46 @@
+{
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "tag_group": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "integer"
+        },
+        "name": {
+          "type": "string"
+        },
+        "tag_names": {
+          "type": "array",
+          "items": [
+
+          ]
+        },
+        "parent_tag_name": {
+          "type": "array",
+          "items": [
+
+          ]
+        },
+        "one_per_topic": {
+          "type": "boolean"
+        },
+        "permissions": {
+          "type": "object"
+        }
+      },
+      "required": [
+        "id",
+        "name",
+        "tag_names",
+        "parent_tag_name",
+        "one_per_topic",
+        "permissions"
+      ]
+    }
+  },
+  "required": [
+    "tag_group"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/topic_create_request.json b/spec/requests/api/schemas/json/topic_create_request.json
new file mode 100644
index 0000000000..c9a822e458
--- /dev/null
+++ b/spec/requests/api/schemas/json/topic_create_request.json
@@ -0,0 +1,42 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "title": {
+      "type": "string",
+      "description": "Required if creating a new topic or new private message."
+    },
+    "raw": {
+      "type": "string"
+    },
+    "topic_id": {
+      "type": "integer",
+      "description": "Required if creating a new post."
+    },
+    "category": {
+      "type": "integer",
+      "description": "Optional if creating a new topic, and ignored if creating a new post."
+    },
+    "target_recipients": {
+      "type": "string",
+      "description": "Required for private message, comma separated.",
+      "example": "blake,sam"
+    },
+    "target_usernames": {
+      "type": "string",
+      "description": "Deprecated. Use target_recipients instead.",
+      "deprecated": true
+    },
+    "archetype": {
+      "type": "string",
+      "description": "Required for new private message.",
+      "example": "private_message"
+    },
+    "created_at": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "raw"
+  ]
+}
+
diff --git a/spec/requests/api/schemas/json/topic_create_response.json b/spec/requests/api/schemas/json/topic_create_response.json
new file mode 100644
index 0000000000..d80c4c2901
--- /dev/null
+++ b/spec/requests/api/schemas/json/topic_create_response.json
@@ -0,0 +1,246 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "id": {
+      "type": "integer"
+    },
+    "name": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "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",
+        "null"
+      ]
+    },
+    "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",
+        "null"
+      ]
+    },
+    "primary_group_name": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "primary_group_flair_url": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "primary_group_flair_bg_color": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "primary_group_flair_color": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "version": {
+      "type": "integer"
+    },
+    "can_edit": {
+      "type": "boolean"
+    },
+    "can_delete": {
+      "type": "boolean"
+    },
+    "can_recover": {
+      "type": "boolean"
+    },
+    "can_wiki": {
+      "type": "boolean"
+    },
+    "user_title": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "bookmarked": {
+      "type": "boolean"
+    },
+    "actions_summary": {
+      "type": "array",
+      "items": [
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "type": "integer"
+            },
+            "can_act": {
+              "type": "boolean"
+            }
+          },
+          "required": [
+            "id",
+            "can_act"
+          ]
+        }
+      ]
+    },
+    "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",
+        "null"
+      ]
+    },
+    "user_deleted": {
+      "type": "boolean"
+    },
+    "edit_reason": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "can_view_edit_history": {
+      "type": "boolean"
+    },
+    "wiki": {
+      "type": "boolean"
+    },
+    "reviewable_id": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "reviewable_score_count": {
+      "type": "integer"
+    },
+    "reviewable_score_pending_count": {
+      "type": "integer"
+    }
+  },
+  "required": [
+    "id",
+    "name",
+    "username",
+    "avatar_template",
+    "created_at",
+    "cooked",
+    "post_number",
+    "post_type",
+    "updated_at",
+    "reply_count",
+    "reply_to_post_number",
+    "quote_count",
+    "incoming_link_count",
+    "reads",
+    "readers_count",
+    "score",
+    "yours",
+    "topic_id",
+    "topic_slug",
+    "display_username",
+    "primary_group_name",
+    "primary_group_flair_url",
+    "primary_group_flair_bg_color",
+    "primary_group_flair_color",
+    "version",
+    "can_edit",
+    "can_delete",
+    "can_recover",
+    "can_wiki",
+    "user_title",
+    "bookmarked",
+    "actions_summary",
+    "moderator",
+    "admin",
+    "staff",
+    "user_id",
+    "draft_sequence",
+    "hidden",
+    "trust_level",
+    "deleted_at",
+    "user_deleted",
+    "edit_reason",
+    "can_view_edit_history",
+    "wiki",
+    "reviewable_id",
+    "reviewable_score_count",
+    "reviewable_score_pending_count"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/upload_create_request.json b/spec/requests/api/schemas/json/upload_create_request.json
new file mode 100644
index 0000000000..e9349bcba0
--- /dev/null
+++ b/spec/requests/api/schemas/json/upload_create_request.json
@@ -0,0 +1,30 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "type": {
+      "type": "string",
+      "enum": [
+        "avatar",
+        "profile_background",
+        "card_background",
+        "custom_emoji",
+        "composer"
+      ]
+    },
+    "user_id": {
+      "type": "integer",
+      "description": "required if uploading an avatar"
+    },
+    "synchronous": {
+      "type": "boolean",
+      "description": "Use this flag to return an id and url"
+    },
+    "file": {
+      "type": "string",
+      "format": "binary"
+    }
+  },
+  "required": [
+    "type"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/upload_create_response.json b/spec/requests/api/schemas/json/upload_create_response.json
new file mode 100644
index 0000000000..05555c7b9e
--- /dev/null
+++ b/spec/requests/api/schemas/json/upload_create_response.json
@@ -0,0 +1,59 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "id": {
+      "type": "integer"
+    },
+    "url": {
+      "type": "string"
+    },
+    "original_filename": {
+      "type": "string"
+    },
+    "filesize": {
+      "type": "integer"
+    },
+    "width": {
+      "type": "integer"
+    },
+    "height": {
+      "type": "integer"
+    },
+    "thumbnail_width": {
+      "type": "integer"
+    },
+    "thumbnail_height": {
+      "type": "integer"
+    },
+    "extension": {
+      "type": "string"
+    },
+    "short_url": {
+      "type": "string"
+    },
+    "short_path": {
+      "type": "string"
+    },
+    "retain_hours": {
+      "type": ["string", "null"]
+    },
+    "human_filesize": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "id",
+    "url",
+    "original_filename",
+    "filesize",
+    "width",
+    "height",
+    "thumbnail_width",
+    "thumbnail_height",
+    "extension",
+    "short_url",
+    "short_path",
+    "retain_hours",
+    "human_filesize"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/user_actions_response.json b/spec/requests/api/schemas/json/user_actions_response.json
new file mode 100644
index 0000000000..9c0204e129
--- /dev/null
+++ b/spec/requests/api/schemas/json/user_actions_response.json
@@ -0,0 +1,146 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "user_actions": {
+      "type": "array",
+      "items": [
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "excerpt": {
+              "type": "string"
+            },
+            "action_type": {
+              "type": "integer"
+            },
+            "created_at": {
+              "type": "string"
+            },
+            "avatar_template": {
+              "type": "string"
+            },
+            "acting_avatar_template": {
+              "type": "string"
+            },
+            "slug": {
+              "type": "string"
+            },
+            "topic_id": {
+              "type": "integer"
+            },
+            "target_user_id": {
+              "type": "integer"
+            },
+            "target_name": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "target_username": {
+              "type": "string"
+            },
+            "post_number": {
+              "type": "integer"
+            },
+            "post_id": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "username": {
+              "type": "string"
+            },
+            "name": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "user_id": {
+              "type": "integer"
+            },
+            "acting_username": {
+              "type": "string"
+            },
+            "acting_name": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "acting_user_id": {
+              "type": "integer"
+            },
+            "title": {
+              "type": "string"
+            },
+            "deleted": {
+              "type": "boolean"
+            },
+            "hidden": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "post_type": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "action_code": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "category_id": {
+              "type": "integer"
+            },
+            "closed": {
+              "type": "boolean"
+            },
+            "archived": {
+              "type": "boolean"
+            }
+          },
+          "required": [
+            "excerpt",
+            "action_type",
+            "created_at",
+            "avatar_template",
+            "acting_avatar_template",
+            "slug",
+            "topic_id",
+            "target_user_id",
+            "target_name",
+            "target_username",
+            "post_number",
+            "post_id",
+            "username",
+            "name",
+            "user_id",
+            "acting_username",
+            "acting_name",
+            "acting_user_id",
+            "title",
+            "deleted",
+            "hidden",
+            "post_type",
+            "action_code",
+            "category_id",
+            "closed",
+            "archived"
+          ]
+        }
+      ]
+    }
+  },
+  "required": [
+    "user_actions"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/user_delete_request.json b/spec/requests/api/schemas/json/user_delete_request.json
new file mode 100644
index 0000000000..c7c7b83a26
--- /dev/null
+++ b/spec/requests/api/schemas/json/user_delete_request.json
@@ -0,0 +1,17 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "delete_posts": {
+      "type": "boolean"
+    },
+    "block_email": {
+      "type": "boolean"
+    },
+    "block_urls": {
+      "type": "boolean"
+    },
+    "block_ip": {
+      "type": "boolean"
+    }
+  }
+}
diff --git a/spec/requests/api/schemas/json/user_delete_response.json b/spec/requests/api/schemas/json/user_delete_response.json
new file mode 100644
index 0000000000..1265c7ff32
--- /dev/null
+++ b/spec/requests/api/schemas/json/user_delete_response.json
@@ -0,0 +1,11 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "deleted": {
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "deleted"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/user_password_change_request.json b/spec/requests/api/schemas/json/user_password_change_request.json
new file mode 100644
index 0000000000..de84d71034
--- /dev/null
+++ b/spec/requests/api/schemas/json/user_password_change_request.json
@@ -0,0 +1,15 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "username": {
+      "type": "string"
+    },
+    "password": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "username",
+    "password"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/user_password_reset_request.json b/spec/requests/api/schemas/json/user_password_reset_request.json
new file mode 100644
index 0000000000..2ddb7d6d98
--- /dev/null
+++ b/spec/requests/api/schemas/json/user_password_reset_request.json
@@ -0,0 +1,11 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "login": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "login"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/user_password_reset_response.json b/spec/requests/api/schemas/json/user_password_reset_response.json
new file mode 100644
index 0000000000..a0157c34d7
--- /dev/null
+++ b/spec/requests/api/schemas/json/user_password_reset_response.json
@@ -0,0 +1,15 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "success": {
+      "type": "string"
+    },
+    "user_found": {
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "success",
+    "user_found"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/user_refresh_gravatar_response.json b/spec/requests/api/schemas/json/user_refresh_gravatar_response.json
new file mode 100644
index 0000000000..1bbfdc02ee
--- /dev/null
+++ b/spec/requests/api/schemas/json/user_refresh_gravatar_response.json
@@ -0,0 +1,15 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "gravatar_upload_id": {
+      "type": ["integer", "null"]
+    },
+    "gravatar_avatar_template": {
+      "type": ["string", "null"]
+    }
+  },
+  "required": [
+    "gravatar_upload_id",
+    "gravatar_avatar_template"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/user_suspend_request.json b/spec/requests/api/schemas/json/user_suspend_request.json
new file mode 100644
index 0000000000..7ccb864e85
--- /dev/null
+++ b/spec/requests/api/schemas/json/user_suspend_request.json
@@ -0,0 +1,25 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "suspend_until": {
+      "type": "string",
+      "example": "2121-02-22"
+    },
+    "reason": {
+      "type": "string"
+    },
+    "message": {
+      "type": "string",
+      "description": "Will send an email with this message when present"
+    },
+    "post_action": {
+      "type": "string",
+      "example": "delete"
+    }
+  },
+  "required": [
+    "suspend_until",
+    "reason"
+  ]
+}
+
diff --git a/spec/requests/api/schemas/json/user_suspend_response.json b/spec/requests/api/schemas/json/user_suspend_response.json
new file mode 100644
index 0000000000..d6d091283b
--- /dev/null
+++ b/spec/requests/api/schemas/json/user_suspend_response.json
@@ -0,0 +1,32 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "suspension": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "suspend_reason": {
+          "type": "string"
+        },
+        "full_suspend_reason": {
+          "type": "string"
+        },
+        "suspended_till": {
+          "type": "string"
+        },
+        "suspended_at": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "suspend_reason",
+        "full_suspend_reason",
+        "suspended_till",
+        "suspended_at"
+      ]
+    }
+  },
+  "required": [
+    "suspension"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/user_update_avatar_request.json b/spec/requests/api/schemas/json/user_update_avatar_request.json
new file mode 100644
index 0000000000..db3b8919bf
--- /dev/null
+++ b/spec/requests/api/schemas/json/user_update_avatar_request.json
@@ -0,0 +1,21 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "upload_id": {
+      "type": "integer"
+    },
+    "type": {
+      "type": "string",
+      "enum": [
+        "uploaded",
+        "custom",
+        "gravatar",
+        "system"
+      ]
+    }
+  },
+  "required": [
+    "upload_id",
+    "type"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/user_update_email_request.json b/spec/requests/api/schemas/json/user_update_email_request.json
new file mode 100644
index 0000000000..3dc2a778f4
--- /dev/null
+++ b/spec/requests/api/schemas/json/user_update_email_request.json
@@ -0,0 +1,12 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "email": {
+      "type": "string",
+      "format": "email"
+    }
+  },
+  "required": [
+    "email"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/users_public_list_response.json b/spec/requests/api/schemas/json/users_public_list_response.json
new file mode 100644
index 0000000000..a99098b313
--- /dev/null
+++ b/spec/requests/api/schemas/json/users_public_list_response.json
@@ -0,0 +1,109 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "directory_items": {
+      "type": "array",
+      "items": [
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "id": {
+              "type": "integer"
+            },
+            "likes_received": {
+              "type": "integer"
+            },
+            "likes_given": {
+              "type": "integer"
+            },
+            "topics_entered": {
+              "type": "integer"
+            },
+            "topic_count": {
+              "type": "integer"
+            },
+            "post_count": {
+              "type": "integer"
+            },
+            "posts_read": {
+              "type": "integer"
+            },
+            "days_visited": {
+              "type": "integer"
+            },
+            "user": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "id": {
+                  "type": "integer"
+                },
+                "username": {
+                  "type": "string"
+                },
+                "name": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "avatar_template": {
+                  "type": "string"
+                },
+                "title": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
+              },
+              "required": [
+                "id",
+                "username",
+                "name",
+                "avatar_template",
+                "title"
+              ]
+            }
+          },
+          "required": [
+            "id",
+            "likes_received",
+            "likes_given",
+            "topics_entered",
+            "topic_count",
+            "post_count",
+            "posts_read",
+            "days_visited",
+            "user"
+          ]
+        }
+      ]
+    },
+    "meta": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "last_updated_at": {
+          "type": ["string", "null"]
+        },
+        "total_rows_directory_items": {
+          "type": "integer"
+        },
+        "load_more_directory_items": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "last_updated_at",
+        "total_rows_directory_items",
+        "load_more_directory_items"
+      ]
+    }
+  },
+  "required": [
+    "directory_items",
+    "meta"
+  ]
+}
diff --git a/spec/requests/api/schemas/schema_loader.rb b/spec/requests/api/schemas/schema_loader.rb
new file mode 100644
index 0000000000..872e47d74a
--- /dev/null
+++ b/spec/requests/api/schemas/schema_loader.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module SpecSchemas
+
+  class SpecLoader
+
+    def initialize(filename)
+      @filename = filename
+    end
+
+    def load
+      JSON.parse(File.read(File.join(__dir__, "json", "#{@filename}.json")))
+    end
+  end
+
+end
diff --git a/spec/requests/api/search_spec.rb b/spec/requests/api/search_spec.rb
new file mode 100644
index 0000000000..4fe9beaa53
--- /dev/null
+++ b/spec/requests/api/search_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+require 'swagger_helper'
+
+describe 'groups' do
+
+  let(:admin) { Fabricate(:admin) }
+
+  before do
+    Jobs.run_immediately!
+    sign_in(admin)
+  end
+
+  path '/search.json' do
+    get 'Search for a term' do
+      tags 'Search'
+      consumes 'application/json'
+      expected_request_schema = load_spec_schema('search_request')
+      parameter name: :params, in: :body, schema: expected_request_schema
+
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = load_spec_schema('search_response')
+        schema expected_response_schema
+
+        let(:params) { { 'q' => 'awesome post' } }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/shared/shared_examples.rb b/spec/requests/api/shared/shared_examples.rb
new file mode 100644
index 0000000000..eb21df58c5
--- /dev/null
+++ b/spec/requests/api/shared/shared_examples.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples "a JSON endpoint" do |expected_response_status|
+  before do |example|
+    submit_request(example.metadata)
+  end
+
+  def expect_schema_valid(schemer, params)
+    valid = schemer.valid?(params)
+    unless valid # for debugging
+      puts
+      puts "RESPONSE: #{params}"
+      validation_result = schemer.validate(params).to_a[0]
+      details = validation_result["details"]
+      if details
+        puts "VALIDATION DETAILS: #{details}"
+      else
+        puts "POSSIBLE ISSUE W/: #{validation_result['data_pointer']}"
+      end
+    end
+    expect(valid).to eq(true)
+  end
+
+  describe "response status" do
+    it "returns expected response status" do
+      expect(response.status).to eq(expected_response_status)
+    end
+  end
+
+  describe "request body" do
+    it "matches the documented request schema" do |example|
+      if expected_request_schema
+        schemer = JSONSchemer.schema(expected_request_schema)
+        expect_schema_valid(schemer, params)
+      end
+    end
+  end
+
+  describe "response body" do
+    let(:json_response) { JSON.parse(response.body) }
+
+    it "matches the documented response schema" do |example|
+      if expected_response_schema
+        schemer = JSONSchemer.schema(expected_response_schema)
+        expect_schema_valid(schemer, json_response)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/tags_spec.rb b/spec/requests/api/tags_spec.rb
index b5c53cf4fb..160100865d 100644
--- a/spec/requests/api/tags_spec.rb
+++ b/spec/requests/api/tags_spec.rb
@@ -60,46 +60,22 @@ describe 'tags' do
     post 'Creates a tag group' do
       tags 'Tags'
       consumes 'application/json'
-      parameter name: :post_body, in: :body, schema: {
-        type: :object,
-        properties: {
-          name: { type: :string }
-        },
-        required: [ 'name' ]
-      }
+      expected_request_schema = load_spec_schema('tag_group_create_request')
+
+      parameter name: :params, in: :body, schema: expected_request_schema
 
       produces 'application/json'
       response '200', 'tag group created' do
-        schema type: :object, properties: {
-          tag_group: {
-            type: :object,
-            properties: {
-              id: { type: :integer },
-              name: { type: :string },
-              tag_names: {
-                type: :array,
-                items: {
-                },
-              },
-              parent_tag_name: {
-                type: :array,
-                items: {
-                },
-              },
-              one_per_topic: { type: :boolean },
-              permissions: {
-                type: :object,
-                properties: {
-                  everyone: { type: :integer },
-                }
-              },
-            }
-          },
-        }
+        expected_response_schema = load_spec_schema('tag_group_create_response')
 
-        let(:post_body) { { name: 'todo' } }
+        let(:params) { { 'name' => 'todo' } }
 
-        run_test!
+        schema(expected_response_schema)
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
       end
     end
 
diff --git a/spec/requests/api/topics_spec.rb b/spec/requests/api/topics_spec.rb
index 22a0b64b5e..a2592cae03 100644
--- a/spec/requests/api/topics_spec.rb
+++ b/spec/requests/api/topics_spec.rb
@@ -954,7 +954,7 @@ describe 'topics' do
           category_id: { type: :string, nullable: true },
         }
 
-        let(:request_body) { { time: '2020-07-11+18:00-06:00', status_type: 'close' } }
+        let(:request_body) { { time: Time.current + 1.day, status_type: 'close' } }
         let!(:topic_post) { Fabricate(:post) }
         let(:id) { topic_post.topic.id }
 
diff --git a/spec/requests/api/uploads_spec.rb b/spec/requests/api/uploads_spec.rb
new file mode 100644
index 0000000000..af21fa91dc
--- /dev/null
+++ b/spec/requests/api/uploads_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+require 'swagger_helper'
+
+describe 'uploads' do
+
+  let(:admin) { Fabricate(:admin) }
+  let(:logo_file) { file_from_fixtures("logo.png") }
+  let(:logo) { Rack::Test::UploadedFile.new(logo_file) }
+
+  before do
+    Jobs.run_immediately!
+    sign_in(admin)
+  end
+
+  path '/uploads.json' do
+    post 'Creates an upload' do
+      tags 'Uploads'
+      consumes 'multipart/form-data'
+
+      expected_request_schema = load_spec_schema('upload_create_request')
+      parameter name: :params, in: :body, schema: expected_request_schema
+
+      let(:params) { {
+        type: 'avatar',
+        user_id: admin.id,
+        synchronous: true,
+        file: logo
+      } }
+
+      produces 'application/json'
+      response '200', 'file uploaded' do
+        expected_response_schema = load_spec_schema('upload_create_response')
+        schema(expected_response_schema)
+
+        # Skipping this test for now until https://github.com/rswag/rswag/issues/348
+        # is resolved. This still allows the docs to be generated for this endpoint though.
+        xit
+      end
+
+    end
+  end
+end
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 692c3e3c60..13a7f1842f 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -5,6 +5,13 @@ describe 'users' do
 
   let(:'Api-Key') { Fabricate(:api_key).key }
   let(:'Api-Username') { 'system' }
+  let(:admin) { Fabricate(:admin) }
+
+  before do
+    SiteSetting.tagging_enabled = true
+    Jobs.run_immediately!
+    sign_in(admin)
+  end
 
   path '/users.json' do
 
@@ -53,7 +60,7 @@ describe 'users' do
 
   end
 
-  path '/users/{username}.json' do
+  path '/u/{username}.json' do
 
     get 'Get a single user by username' do
       tags 'Users'
@@ -64,406 +71,472 @@ describe 'users' do
 
       produces 'application/json'
       response '200', 'user response' do
-        schema type: :object, properties: {
-          user_badges: {
-            type: :array,
-            items: {
-              type: :object,
-              properties: {
-                id: { type: :integer },
-                granted_at: { type: :string },
-                created_at: { type: :string },
-                count: { type: :integer },
-                badge_id: { type: :integer },
-                user_id: { type: :integer },
-                granted_by_id: { type: :integer },
-              }
-            },
-          },
-          badges: {
-            type: :array,
-            items: {
-              type: :object,
-              properties: {
-                id: { type: :integer },
-                name: { type: :string },
-                description: { type: :string },
-                grant_count: { type: :integer },
-                allow_title: { type: :boolean },
-                multiple_grant: { type: :boolean },
-                icon: { type: :string },
-                image: { type: :string, nullable: true },
-                listable: { type: :boolean },
-                enabled: { type: :boolean },
-                badge_grouping_id: { type: :integer },
-                system: { type: :boolean },
-                slug: { type: :string },
-                manually_grantable: { type: :boolean },
-                badge_type_id: { type: :integer },
-              }
-            },
-          },
-          badge_types: {
-            type: :array,
-            items: {
-              type: :object,
-              properties: {
-                id: { type: :integer },
-                name: { type: :string },
-                sort_order: { type: :integer },
-              }
-            },
-          },
-          users: {
-            type: :array,
-            items: {
-              type: :object,
-              properties: {
-                id: { type: :integer },
-                username: { type: :string },
-                name: { type: :string, nullable: true },
-                avatar_template: { type: :string },
-                moderator: { type: :boolean },
-                admin: { type: :boolean },
-              }
-            },
-          },
-          user: {
-            type: :object,
-            properties: {
-              id: { type: :integer },
-              username: { type: :string },
-              name: { type: :string, nullable: true },
-              avatar_template: { type: :string },
-              email: { type: :string },
-              secondary_emails: {
-                type: :array,
-                items: {
-                },
-              },
-              unconfirmed_emails: {
-                type: :array,
-                items: {
-                },
-              },
-              last_posted_at: { type: :string, nullable: true },
-              last_seen_at: { type: :string, nullable: true },
-              created_at: { type: :string },
-              ignored: { type: :boolean },
-              muted: { type: :boolean },
-              can_ignore_user: { type: :boolean },
-              can_mute_user: { type: :boolean },
-              can_send_private_messages: { type: :boolean },
-              can_send_private_message_to_user: { type: :boolean },
-              trust_level: { type: :integer },
-              moderator: { type: :boolean },
-              admin: { type: :boolean },
-              title: { type: :string, nullable: true },
-              badge_count: { type: :integer },
-              custom_fields: {
-                type: :object,
-                properties: {
-                }
-              },
-              time_read: { type: :integer },
-              recent_time_read: { type: :integer },
-              primary_group_id: { 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 },
-              featured_topic: { type: :string, nullable: true },
-              staged: { type: :boolean },
-              can_edit: { type: :boolean },
-              can_edit_username: { type: :boolean },
-              can_edit_email: { type: :boolean },
-              can_edit_name: { type: :boolean },
-              uploaded_avatar_id: { type: :integer, nullable: true },
-              has_title_badges: { type: :boolean },
-              pending_count: { type: :integer },
-              profile_view_count: { type: :integer },
-              second_factor_enabled: { type: :boolean },
-              second_factor_backup_enabled: { type: :boolean },
-              associated_accounts: {
-                type: :array,
-                items: {
-                },
-              },
-              can_upload_profile_header: { type: :boolean },
-              can_upload_user_card_background: { type: :boolean },
-              post_count: { type: :integer },
-              can_be_deleted: { type: :boolean },
-              can_delete_all_posts: { type: :boolean },
-              locale: { type: :string, nullable: true },
-              muted_category_ids: {
-                tpe: :array,
-                items: {
-                },
-              },
-              regular_category_ids: {
-                type: :array,
-                items: {
-                },
-              },
-              watched_tags: {
-                type: :array,
-                items: {
-                },
-              },
-              watching_first_post_tags: {
-                type: :array,
-                items: {
-                },
-              },
-              tracked_tags: {
-                type: :array,
-                items: {
-                },
-              },
-              muted_tags: {
-                type: :array,
-                items: {
-                },
-              },
-              tracked_category_ids: {
-                type: :array,
-                items: {
-                },
-              },
-              watched_category_ids: {
-                type: :array,
-                items: {
-                },
-              },
-              watched_first_post_category_ids: {
-                type: :array,
-                items: {
-                },
-              },
-              system_avatar_upload_id: { type: :string, nullable: true },
-              system_avatar_template: { type: :string },
-              gravatar_avatar_upload_id: { type: :integer },
-              gravatar_avatar_template: { type: :string },
-              muted_usernames: {
-                type: :array,
-                items: {
-                },
-              },
-              ignored_usernames: {
-                type: :array,
-                items: {
-                },
-              },
-              allowed_pm_usernames: {
-                type: :array,
-                items: {
-                },
-              },
-              mailing_list_posts_per_day: { type: :integer },
-              can_change_bio: { type: :boolean },
-              can_change_location: { type: :boolean },
-              can_change_website: { type: :boolean },
-              user_api_keys: { type: :string, nullable: true },
-              user_auth_tokens: {
-                type: :array,
-                items: {
-                  type: :object,
-                  properties: {
-                    id: { type: :integer },
-                    client_ip: { type: :string },
-                    location: { type: :string },
-                    browser: { type: :string },
-                    device: { type: :string },
-                    os: { type: :string },
-                    icon: { type: :string },
-                    created_at: { type: :string },
-                    seen_at: { type: :string },
-                    is_active: { type: :boolean },
-                  }
-                },
-              },
-              reminders_frequency: {
-                type: :array,
-                items: {
-                  type: :object,
-                  properties: {
-                    name: { type: :string },
-                    value: { type: :integer },
-                  }
-                },
-              },
-              featured_user_badge_ids: {
-                type: :array,
-                items: {
-                },
-              },
-              invited_by: { type: :string, nullable: true },
-              groups: {
-                type: :array,
-                items: {
-                  type: :object,
-                  properties: {
-                    id: { type: :integer },
-                    automatic: { type: :boolean },
-                    name: { type: :string },
-                    display_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 },
-                    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 },
-                    members_visibility_level: { type: :integer },
-                    can_see_members: { type: :boolean },
-                    can_admin_group: { type: :boolean },
-                    publish_read_state: { type: :boolean },
-                    smtp_server: { type: :string, nullable: true },
-                    smtp_port: { type: :string, nullable: true },
-                    smtp_ssl: { type: :string, nullable: true },
-                    imap_server: { type: :string, nullable: true },
-                    imap_port: { type: :string, nullable: true },
-                    imap_ssl: { type: :string, nullable: true },
-                    imap_mailbox_name: { type: :string },
-                    imap_mailboxes: {
-                      type: :array,
-                      items: {
-                      },
-                    },
-                    email_username: { type: :string, nullable: true },
-                    email_password: { type: :string, nullable: true },
-                    imap_last_error: { type: :string, nullable: true },
-                    imap_old_emails: { type: :string, nullable: true },
-                    imap_new_emails: { type: :string, nullable: true },
-                    watching_category_ids: {
-                      type: :array,
-                      items: {
-                      },
-                    },
-                    tracking_category_ids: {
-                      type: :array,
-                      items: {
-                      },
-                    },
-                    watching_first_post_category_ids: {
-                      type: :array,
-                      items: {
-                      },
-                    },
-                    regular_category_ids: {
-                      type: :array,
-                      items: {
-                      },
-                    },
-                    muted_category_ids: {
-                      type: :array,
-                      items: {
-                      },
-                    },
-                    watching_tags: {
-                      type: :array,
-                      items: {
-                      },
-                    },
-                    watching_first_post_tags: {
-                      type: :array,
-                      items: {
-                      },
-                    },
-                    tracking_tags: {
-                      type: :array,
-                      items: {
-                      },
-                    },
-                    regular_tags: {
-                      type: :array,
-                      items: {
-                      },
-                    },
-                    muted_tags: {
-                      type: :array,
-                      items: {
-                      },
-                    },
-                  }
-                },
-              },
-              group_users: {
-                type: :array,
-                items: {
-                  type: :object,
-                  properties: {
-                    group_id: { type: :integer },
-                    user_id: { type: :integer },
-                    notification_level: { type: :integer },
-                    owner: { type: :boolean },
-                  }
-                },
-              },
-              user_option: {
-                type: :object,
-                properties: {
-                  user_id: { type: :integer },
-                  mailing_list_mode: { type: :boolean },
-                  mailing_list_mode_frequency: { type: :integer },
-                  email_digests: { type: :boolean },
-                  email_level: { type: :integer },
-                  email_messages_level: { type: :integer },
-                  external_links_in_new_tab: { type: :boolean },
-                  color_scheme_id: { type: :string, nullable: true },
-                  dark_scheme_id: { type: :string, nullable: true },
-                  dynamic_favicon: { type: :boolean },
-                  enable_quoting: { type: :boolean },
-                  enable_defer: { type: :boolean },
-                  digest_after_minutes: { type: :integer },
-                  automatically_unpin_topics: { type: :boolean },
-                  auto_track_topics_after_msecs: { type: :integer },
-                  notification_level_when_replying: { type: :integer },
-                  new_topic_duration_minutes: { type: :integer },
-                  email_previous_replies: { type: :integer },
-                  email_in_reply_to: { type: :boolean },
-                  like_notification_frequency: { type: :integer },
-                  include_tl0_in_digests: { type: :boolean },
-                  theme_ids: {
-                    type: :array,
-                    items: {
-                    },
-                  },
-                  theme_key_seq: { type: :integer },
-                  allow_private_messages: { type: :boolean },
-                  enable_allowed_pm_users: { type: :boolean },
-                  homepage_id: { type: :string, nullable: true },
-                  hide_profile_and_presence: { type: :boolean },
-                  text_size: { type: :string },
-                  text_size_seq: { type: :integer },
-                  title_count_mode: { type: :string },
-                  timezone: { type: :string, nullable: true },
-                  skip_new_user_tips: { type: :boolean },
-                }
-              },
-            }
-          },
-        }
+        schema '$ref' => '#/components/schemas/user_response'
 
         let(:username) { 'system' }
         run_test!
       end
     end
+  end
+
+  path '/u/by-external/{external_id}.json' do
+
+    get 'Get a user by external_id' 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: :external_id, in: :path, type: :string, required: true
+
+      produces 'application/json'
+      response '200', 'user response' do
+        schema '$ref' => '#/components/schemas/user_response'
+
+        let(:user) { Fabricate(:user) }
+        let(:external_id) { '1' }
+
+        before do
+          SiteSetting.discourse_connect_url = 'http://someurl.com'
+          SiteSetting.enable_discourse_connect = true
+          user.create_single_sign_on_record(external_id: '1', last_payload: '')
+        end
+
+        run_test!
+      end
+    end
+  end
+
+  path '/u/by-external/{provider}/{external_id}.json' do
+
+    get 'Get a user by identity provider external ID' 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: :provider,
+                in: :path,
+                type: :string,
+                required: true,
+                description: "Authentication provider name. Can be found in the provider callback URL: `/auth/{provider}/callback`"
+      parameter name: :external_id, in: :path, type: :string, required: true
+
+      produces 'application/json'
+      response '200', 'user response' do
+        schema '$ref' => '#/components/schemas/user_response'
+
+        let(:user) { Fabricate(:user) }
+        let(:provider) { 'google_oauth2' }
+        let(:external_id) { 'myuid' }
+
+        before do
+          SiteSetting.enable_google_oauth2_logins = true
+          UserAssociatedAccount.create!(user: user, provider_uid: 'myuid', provider_name: 'google_oauth2')
+        end
+
+        run_test!
+      end
+    end
+  end
+
+  path '/u/{username}/preferences/avatar/pick.json' do
+
+    put 'Update avatar' do
+      tags 'Users'
+      consumes 'application/json'
+      expected_request_schema = load_spec_schema('user_update_avatar_request')
+
+      parameter name: :username, in: :path, type: :string, required: true
+      parameter name: :params, in: :body, schema: expected_request_schema
+
+      produces 'application/json'
+      response '200', 'avatar updated' do
+        expected_response_schema = load_spec_schema('success_ok_response')
+
+        let(:user) { Fabricate(:user) }
+        let(:username) { user.username }
+        let(:upload) { Fabricate(:upload, user: user) }
+        let(:params) { { 'upload_id' => upload.id, 'type' => 'uploaded' } }
+
+        schema(expected_response_schema)
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
 
   end
+
+  path '/u/{username}/preferences/email.json' do
+
+    put 'Update email' do
+      tags 'Users'
+      consumes 'application/json'
+      expected_request_schema = load_spec_schema('user_update_email_request')
+
+      parameter name: :username, in: :path, type: :string, required: true
+      parameter name: :params, in: :body, schema: expected_request_schema
+
+      produces 'application/json'
+      response '200', 'email updated' do
+
+        let(:user) { Fabricate(:user) }
+        let(:username) { user.username }
+        let(:params) { { 'email' => "test@example.com" } }
+
+        expected_response_schema = nil
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+
+  end
+
+  path '/directory_items.json' do
+
+    get 'Get a public list of users' do
+      tags 'Users'
+      consumes 'application/json'
+      expected_request_schema = nil
+
+      parameter name: :period,
+                in: :query,
+                schema: {
+                  type: :string,
+                  enum: ['daily', 'weekly', 'monthly', 'quarterly', 'yearly', 'all']
+                },
+                required: true
+      parameter name: :order,
+                in: :query,
+                schema: {
+                  type: :string,
+                  enum: [
+                    'likes_received',
+                    'likes_given',
+                    'topic_count',
+                    'post_count',
+                    'topics_entered',
+                    'posts_read',
+                    'days_visited'
+                  ]
+                },
+                required: true
+      parameter name: :asc,
+                in: :query,
+                schema: {
+                   type: :string,
+                   enum: ['true']
+                 }
+      parameter name: :page, in: :query, type: :integer
+
+      produces 'application/json'
+      response '200', 'directory items response' do
+
+        let(:period) { 'weekly' }
+        let(:order) { 'likes_received' }
+        let(:asc) { 'true' }
+        let(:page) { 0 }
+
+        expected_response_schema = load_spec_schema('users_public_list_response')
+        schema(expected_response_schema)
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+
+  end
+
+  path '/admin/users/{id}.json' do
+
+    get 'Get a user by id' do
+      tags 'Users', 'Admin'
+      consumes 'application/json'
+      expected_request_schema = nil
+
+      parameter name: :id, in: :path, type: :integer, required: true
+
+      produces 'application/json'
+      response '200', 'response' do
+
+        let(:id) { Fabricate(:user).id }
+
+        expected_response_schema = load_spec_schema('admin_user_response')
+        schema(expected_response_schema)
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+
+    delete 'Delete a user' do
+      tags 'Users', 'Admin'
+      consumes 'application/json'
+      expected_request_schema = load_spec_schema('user_delete_request')
+
+      parameter name: :id, in: :path, type: :integer, required: true
+      parameter name: :params, in: :body, schema: expected_request_schema
+
+      produces 'application/json'
+      response '200', 'response' do
+
+        let(:id) { Fabricate(:user).id }
+        let(:params) { {
+          'delete_posts' => true,
+          'block_email' => false,
+          'block_urls' => false,
+          'block_ip' => false
+        } }
+
+        expected_response_schema = load_spec_schema('user_delete_response')
+        schema(expected_response_schema)
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+
+  end
+
+  path '/admin/users/{id}/suspend.json' do
+    put 'Suspend a user' do
+      tags 'Users', 'Admin'
+      consumes 'application/json'
+      expected_request_schema = load_spec_schema('user_suspend_request')
+
+      parameter name: :id, in: :path, type: :integer, required: true
+      parameter name: :params, in: :body, schema: expected_request_schema
+
+      produces 'application/json'
+      response '200', 'response' do
+
+        let(:id) { Fabricate(:user).id }
+        let(:params) { {
+          'suspend_until' => '2121-02-22',
+          'reason' => 'inactivity'
+        } }
+
+        expected_response_schema = load_spec_schema('user_suspend_response')
+        schema(expected_response_schema)
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
+  path '/admin/users/{id}/log_out.json' do
+
+    post 'Log a user out' do
+      tags 'Users', 'Admin'
+      consumes 'application/json'
+      expected_request_schema = nil
+
+      parameter name: :id, in: :path, type: :integer, required: true
+
+      produces 'application/json'
+      response '200', 'response' do
+
+        let(:id) { Fabricate(:user).id }
+
+        expected_response_schema = load_spec_schema('success_ok_response')
+        schema(expected_response_schema)
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
+  path '/user_avatar/{username}/refresh_gravatar.json' do
+
+    before do
+      stub_request(:get, /https:\/\/www.gravatar.com\/avatar\/\w+.png\?d=404&reset_cache=\S+&s=360/).
+        with(
+          headers: {
+               'Accept' => '*/*',
+               'Accept-Encoding' => 'gzip',
+               'Host' => 'www.gravatar.com'
+          }).
+        to_return(status: 200, body: "", headers: {})
+    end
+
+    post 'Refresh gravatar' do
+      tags 'Users', 'Admin'
+      consumes 'application/json'
+      expected_request_schema = nil
+
+      parameter name: :username, in: :path, type: :string, required: true
+
+      produces 'application/json'
+      response '200', 'response' do
+
+        let(:user) { Fabricate(:user) }
+        let(:username) { user.username }
+
+        expected_response_schema = load_spec_schema('user_refresh_gravatar_response')
+        schema(expected_response_schema)
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
+  path '/admin/users/list/{flag}.json' do
+
+    get 'Get a list of users' do
+      tags 'Users', 'Admin'
+      consumes 'application/json'
+      expected_request_schema = nil
+
+      parameter name: :flag,
+                in: :path,
+                schema: {
+                  type: :string,
+                  enum: ['active', 'new', 'staff', 'suspended', 'blocked', 'suspect']
+                },
+                required: true
+      parameter name: :order,
+                in: :query,
+                schema: {
+                  type: :string,
+                  enum: [
+                    'created',
+                    'last_emailed',
+                    'seen',
+                    'username',
+                    'email',
+                    'trust_level',
+                    'days_visited',
+                    'posts_read',
+                    'topics_viewed',
+                    'posts',
+                    'read_time'
+                  ]
+                }
+      parameter name: :asc,
+                in: :query,
+                schema: {
+                   type: :string,
+                   enum: ['true']
+                 }
+      parameter name: :page, in: :query, type: :integer
+      parameter name: :show_emails, in: :query, type: :boolean
+
+      produces 'application/json'
+      response '200', 'response' do
+
+        let(:flag) { 'active' }
+        let(:order) { 'created' }
+        let(:asc) { 'true' }
+        let(:page) { 0 }
+        let(:show_emails) { false }
+
+        expected_response_schema = load_spec_schema('admin_user_list_response')
+        schema(expected_response_schema)
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
+  path '/user_actions.json' do
+
+    get 'Get a list of user actions' do
+      tags 'Users'
+      consumes 'application/json'
+      expected_request_schema = nil
+
+      parameter name: :offset, in: :query, type: :integer, required: true
+      parameter name: :username, in: :query, type: :string, required: true
+      parameter name: :filter, in: :query, type: :string, required: true
+
+      produces 'application/json'
+      response '200', 'response' do
+
+        let(:offset) { 0 }
+        let(:username) { Fabricate(:user).username }
+        let(:filter) { '4,5' }
+
+        expected_response_schema = load_spec_schema('user_actions_response')
+        schema(expected_response_schema)
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
+  path '/session/forgot_password.json' do
+    post 'Send password reset email' do
+      tags 'Users'
+      consumes 'application/json'
+      expected_request_schema = load_spec_schema('user_password_reset_request')
+      parameter name: :params, in: :body, schema: expected_request_schema
+
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = load_spec_schema('user_password_reset_response')
+        schema expected_response_schema
+
+        let(:user) { Fabricate(:user) }
+        let(:params) { { 'login' => user.username } }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
+  path '/users/password-reset/{token}.json' do
+    put 'Change password' do
+      tags 'Users'
+      consumes 'application/json'
+      expected_request_schema = load_spec_schema('user_password_change_request')
+      parameter name: :token, in: :path, type: :string, required: true
+      parameter name: :params, in: :body, schema: expected_request_schema
+
+      produces 'application/json'
+      response '200', 'success response' do
+        expected_response_schema = nil
+
+        let(:user) { Fabricate(:user) }
+        let(:token) { user.email_tokens.create(email: user.email).token }
+        let(:params) { {
+          'username' => user.username,
+          'password' => 'NH8QYbxYS5Zv5qEFzA4jULvM'
+        } }
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
 end
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 7808d23de2..0fde425c27 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -22,8 +22,8 @@ RSpec.describe ApplicationController do
     end
 
     it "should redirect to SSO if enabled" do
-      SiteSetting.sso_url = 'http://someurl.com'
-      SiteSetting.enable_sso = true
+      SiteSetting.discourse_connect_url = 'http://someurl.com'
+      SiteSetting.enable_discourse_connect = true
       get "/"
       expect(response).to redirect_to("/session/sso")
     end
@@ -45,17 +45,17 @@ RSpec.describe ApplicationController do
       expect(response).to redirect_to("/login")
     end
 
-    it "should not redirect to SSO when external_auth_immediately is disabled" do
-      SiteSetting.external_auth_immediately = false
-      SiteSetting.sso_url = 'http://someurl.com'
-      SiteSetting.enable_sso = true
+    it "should not redirect to SSO when auth_immediately is disabled" do
+      SiteSetting.auth_immediately = false
+      SiteSetting.discourse_connect_url = 'http://someurl.com'
+      SiteSetting.enable_discourse_connect = true
 
       get "/"
       expect(response).to redirect_to("/login")
     end
 
-    it "should not redirect to authenticator when external_auth_immediately is disabled" do
-      SiteSetting.external_auth_immediately = false
+    it "should not redirect to authenticator when auth_immediately is disabled" do
+      SiteSetting.auth_immediately = false
       SiteSetting.enable_google_oauth2_logins = true
       SiteSetting.enable_local_logins = false
 
@@ -104,11 +104,21 @@ RSpec.describe ApplicationController do
     end
 
     it 'contains authentication data when cookies exist' do
-      COOKIE_DATA = "someauthenticationdata"
-      cookies['authentication_data'] = COOKIE_DATA
+      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 }\"")
+      expect(response.body).to include("data-authentication-data=\"#{cookie_data}\"")
+      expect(response.headers["Set-Cookie"]).to include("authentication_data=;") # Delete cookie
+    end
+
+    it 'deletes authentication data cookie even if already authenticated' do
+      sign_in(Fabricate(:user))
+      cookies['authentication_data'] = "someauthenticationdata"
+      get '/'
+      expect(response.status).to eq(200)
+      expect(response.body).not_to include("data-authentication-data=")
+      expect(response.headers["Set-Cookie"]).to include("authentication_data=;") # Delete cookie
     end
   end
 
@@ -272,9 +282,7 @@ RSpec.describe ApplicationController do
       get "/search/query.json", params: { trem: "misspelled term" }
 
       expect(response.status).to eq(400)
-      expect(response.parsed_body).to eq(
-        "errors" => ["param is missing or the value is empty: term"]
-      )
+      expect(response.parsed_body["errors"].first).to include("param is missing or the value is empty: term")
     end
   end
 
@@ -373,7 +381,7 @@ RSpec.describe ApplicationController do
 
         it 'should handle 404 to a css file' do
 
-          Discourse.redis.del("page_not_found_topics")
+          Discourse.cache.delete("page_not_found_topics:#{I18n.locale}")
 
           topic1 = Fabricate(:topic)
           get '/stylesheets/mobile_1_4cd559272273fe6d3c7db620c617d596a5fdf240.css', headers: { 'HTTP_ACCEPT' => 'text/css,*/*,q=0.1' }
@@ -394,7 +402,8 @@ RSpec.describe ApplicationController do
       end
 
       it 'should cache results' do
-        Discourse.redis.del("page_not_found_topics")
+        Discourse.cache.delete("page_not_found_topics:#{I18n.locale}")
+        Discourse.cache.delete("page_not_found_topics:fr")
 
         topic1 = Fabricate(:topic)
         get '/t/nope-nope/99999999'
@@ -406,6 +415,13 @@ RSpec.describe ApplicationController do
         expect(response.status).to eq(404)
         expect(response.body).to include(topic1.title)
         expect(response.body).to_not include(topic2.title)
+
+        # Different locale should have different cache
+        SiteSetting.default_locale = :fr
+        get '/t/nope-nope/99999999'
+        expect(response.status).to eq(404)
+        expect(response.body).to include(topic1.title)
+        expect(response.body).to include(topic2.title)
       end
     end
   end
@@ -619,6 +635,19 @@ RSpec.describe ApplicationController do
       expect(response.headers).to_not include('Content-Security-Policy-Report-Only')
     end
 
+    it 'when GTM is enabled it adds the same nonce to the policy and the GTM tag' do
+      SiteSetting.content_security_policy = true
+      SiteSetting.gtm_container_id = 'GTM-ABCDEF'
+
+      get '/latest'
+      nonce = ApplicationHelper.google_tag_manager_nonce
+      expect(response.headers).to include('Content-Security-Policy')
+
+      script_src = parse(response.headers['Content-Security-Policy'])['script-src']
+      expect(script_src.to_s).to include(nonce)
+      expect(response.body).to include(nonce)
+    end
+
     def parse(csp_string)
       csp_string.split(';').map do |policy|
         directive, *sources = policy.split
diff --git a/spec/requests/bookmarks_controller_spec.rb b/spec/requests/bookmarks_controller_spec.rb
index 5ab699f9d0..1011bb517b 100644
--- a/spec/requests/bookmarks_controller_spec.rb
+++ b/spec/requests/bookmarks_controller_spec.rb
@@ -12,6 +12,48 @@ describe BookmarksController do
   end
 
   describe "#create" do
+    it "rate limits creates" do
+      SiteSetting.max_bookmarks_per_day = 1
+      RateLimiter.enable
+      RateLimiter.clear_all!
+
+      post "/bookmarks.json", params: {
+        post_id: bookmark_post.id,
+        reminder_type: "tomorrow",
+        reminder_at: (Time.zone.now + 1.day).iso8601
+      }
+
+      expect(response.status).to eq(200)
+
+      post "/bookmarks.json", params: {
+        post_id: Fabricate(:post).id
+      }
+      expect(response.status).to eq(429)
+    end
+
+    context "if the user reached the max bookmark limit" do
+      before do
+        SiteSetting.max_bookmarks_per_user = 1
+      end
+
+      it "returns failed JSON with a 400 error" do
+        post "/bookmarks.json", params: {
+          post_id: bookmark_post.id,
+          reminder_type: "tomorrow",
+          reminder_at: (Time.zone.now + 1.day).iso8601
+        }
+        post "/bookmarks.json", params: {
+          post_id: Fabricate(:post).id
+        }
+
+        expect(response.status).to eq(400)
+        user_bookmarks_url = "#{Discourse.base_url}/my/activity/bookmarks"
+        expect(response.parsed_body['errors']).to include(
+          I18n.t("bookmarks.errors.too_many", user_bookmarks_url: user_bookmarks_url, limit: SiteSetting.max_bookmarks_per_user)
+        )
+      end
+    end
+
     context "if the user already has bookmarked the post" do
       before do
         Fabricate(:bookmark, post: bookmark_post, user: bookmark_user)
diff --git a/spec/requests/bootstrap_controller_spec.rb b/spec/requests/bootstrap_controller_spec.rb
index 4cd735351d..9c240de72c 100644
--- a/spec/requests/bootstrap_controller_spec.rb
+++ b/spec/requests/bootstrap_controller_spec.rb
@@ -4,6 +4,18 @@ require 'rails_helper'
 
 describe BootstrapController do
 
+  let(:theme) { Fabricate(:theme, enabled: true) }
+
+  before do
+    DiscoursePluginRegistry.register_html_builder('server:before-head-close') { '<b>wat</b>' }
+    theme.set_field(target: :desktop, name: :header, value: '<h1>custom header</h1>').save
+    SiteSetting.default_theme_id = theme.id
+  end
+
+  after do
+    DiscoursePluginRegistry.reset!
+  end
+
   it "returns data as anonymous" do
     get "/bootstrap.json"
     expect(response.status).to eq(200)
@@ -14,14 +26,24 @@ describe BootstrapController do
     bootstrap = json['bootstrap']
     expect(bootstrap).to be_present
     expect(bootstrap['title']).to be_present
+    expect(bootstrap['theme_ids']).to eq([theme.id])
     expect(bootstrap['setup_data']['base_url']).to eq(Discourse.base_url)
     expect(bootstrap['stylesheets']).to be_present
 
+    expect(bootstrap['html']).to be_present
+    expect(bootstrap['html']['before_head_close']).to eq('<b>wat</b>')
+
+    expect(bootstrap['theme_html']).to be_present
+    expect(bootstrap['theme_html']['header']).to eq('<h1>custom header</h1>')
+
     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
+
+    expect(bootstrap['html_classes']).to eq("desktop-view not-mobile-device text-size-normal anon")
+    expect(bootstrap['html_lang']).to eq('en')
   end
 
   it "returns user data when authenticated" do
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index 6fce406e9e..fc17024692 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -57,8 +57,6 @@ describe CategoriesController do
     it 'returns the right response for a normal user' do
       sign_in(user)
 
-      Draft.set(user, Draft::NEW_TOPIC, 0, 'hello')
-
       get "/categories.json"
 
       expect(response.status).to eq(200)
@@ -68,10 +66,19 @@ describe CategoriesController do
       expect(category_list["categories"].map { |c| c["id"] }).to contain_exactly(
         SiteSetting.get(:uncategorized_category_id), category.id
       )
+    end
 
-      expect(category_list["draft_sequence"]).to eq(0)
-      expect(category_list["draft_key"]).to eq(Draft::NEW_TOPIC)
-      expect(category_list["draft"]).to eq('hello')
+    it 'does not show uncategorized unless allow_uncategorized_topics' do
+      SiteSetting.desktop_category_page_style = "categories_boxes_with_topics"
+
+      uncategorized = Category.find(SiteSetting.uncategorized_category_id)
+      Fabricate(:topic, category: uncategorized)
+      CategoryFeaturedTopic.feature_topics
+
+      SiteSetting.allow_uncategorized_topics = false
+
+      get "/categories.json"
+      expect(response.parsed_body["category_list"]["categories"].map { |x| x['id'] }).not_to include(uncategorized.id)
     end
   end
 
@@ -511,14 +518,7 @@ describe CategoriesController do
       topic_list = json['topic_list']
 
       expect(category_list['categories'].size).to eq(2) # 'Uncategorized' and category
-      expect(category_list['draft_key']).to eq(Draft::NEW_TOPIC)
-      expect(category_list['draft_sequence']).to eq(nil)
-      expect(category_list['draft']).to eq(nil)
-
       expect(topic_list['topics'].size).to eq(5)
-      expect(topic_list['draft_key']).to eq(Draft::NEW_TOPIC)
-      expect(topic_list['draft_sequence']).to eq(nil)
-      expect(topic_list['draft']).to eq(nil)
 
       Fabricate(:category, parent_category: category)
 
@@ -535,5 +535,16 @@ describe CategoriesController do
       expect(json['category_list']['categories'].size).to eq(4)
       expect(json['topic_list']['topics'].size).to eq(6)
     end
+
+    it 'does not show uncategorized unless allow_uncategorized_topics' do
+      uncategorized = Category.find(SiteSetting.uncategorized_category_id)
+      Fabricate(:topic, category: uncategorized)
+      CategoryFeaturedTopic.feature_topics
+
+      SiteSetting.allow_uncategorized_topics = false
+
+      get "/categories_and_latest.json"
+      expect(response.parsed_body["category_list"]["categories"].map { |x| x['id'] }).not_to include(uncategorized.id)
+    end
   end
 end
diff --git a/spec/requests/do_not_disturb_controller_spec.rb b/spec/requests/do_not_disturb_controller_spec.rb
new file mode 100644
index 0000000000..1f3f65b3fe
--- /dev/null
+++ b/spec/requests/do_not_disturb_controller_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe DoNotDisturbController do
+  it 'requires you to be logged in' do
+    post "/do-not-disturb.json", params: { duration: 30 }
+    expect(response.status).to eq(403)
+  end
+
+  describe 'logged in' do
+    fab!(:user) { Fabricate(:user) }
+
+    before do
+      sign_in(user)
+    end
+
+    it 'returns a 400 when a duration is not passed in' do
+      post "/do-not-disturb.json"
+      expect(response.status).to eq(400)
+    end
+
+    it 'works properly with integer minute durations' do
+      freeze_time
+      post "/do-not-disturb.json", params: { duration: 30 }
+
+      expect(response.status).to eq(200)
+      expect(user.do_not_disturb_timings.last.ends_at).to eq_time(30.minutes.from_now)
+    end
+
+    it 'works properly with integer minute durations' do
+      post "/do-not-disturb.json", params: { duration: -30 }
+      expect(response.status).to eq(422)
+      expect(response.parsed_body).to eq({ "errors" => ["Ends at is invalid"] })
+    end
+
+    include ActiveSupport::Testing::TimeHelpers
+    it "works properly with duration of 'tomorrow'" do
+      travel_to Time.new(2020, 11, 24, 01, 04, 44) do
+        post "/do-not-disturb.json", params: { duration: 'tomorrow' }
+        expect(response.status).to eq(200)
+        expect(user.do_not_disturb_timings.last.ends_at.to_i).to eq(Time.new(2020, 11, 24, 23, 59, 59).utc.to_i)
+      end
+    end
+
+    describe "#destroy" do
+      it "process shelved notifications that came in during DND" do
+        user.do_not_disturb_timings.create(starts_at: 2.days.ago, ends_at: 2.days.from_now)
+        notification = Notification.create(read: false, user_id: user.id, topic_id: 2, post_number: 1, data: '{}', notification_type: 1)
+
+        expect(notification.shelved_notification).to be_present
+        delete "/do-not-disturb.json"
+        expect { notification.shelved_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        expect(user.do_not_disturb?).to eq(false)
+      end
+    end
+  end
+end
diff --git a/spec/requests/email_controller_spec.rb b/spec/requests/email_controller_spec.rb
index bec3e9049d..3d79fb7aec 100644
--- a/spec/requests/email_controller_spec.rb
+++ b/spec/requests/email_controller_spec.rb
@@ -199,7 +199,7 @@ RSpec.describe EmailController do
         navigate_to_unsubscribe
 
         expect(body).to include("You are not receiving summary emails")
-        expect(body).to include("Don&#39;t send me any mail from Discourse")
+        expect(body).to include("Don’t send me any mail from Discourse")
       end
 
       it 'hides unsubscribe from all checkbox when user already unsubscribed' do
@@ -212,6 +212,7 @@ RSpec.describe EmailController do
       end
 
       it 'correctly handles mailing list mode' do
+        SiteSetting.disable_mailing_list_mode = false
         user.user_option.update_columns(mailing_list_mode: true)
 
         navigate_to_unsubscribe
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
index 62e42b1d81..ff89614634 100644
--- a/spec/requests/embed_controller_spec.rb
+++ b/spec/requests/embed_controller_spec.rb
@@ -94,12 +94,38 @@ describe EmbedController do
           'REFERER' => 'https://example.com/evil-trout'
         }
         expect(response.status).to eq(200)
-        expect(response.headers['X-Frame-Options']).to eq("ALLOWALL")
+        expect(response.headers['X-Frame-Options']).to be_nil
         expect(response.body).to match("data-embed-id=\"de-1234\"")
         expect(response.body).to match("data-topic-id=\"#{topic.id}\"")
         expect(response.body).to match("data-referer=\"https://example.com/evil-trout\"")
       end
 
+      it "returns a list of top topics" do
+        bad_topic = Fabricate(:topic)
+        good_topic = Fabricate(:topic, like_count: 1000, posts_count: 100)
+        TopTopic.refresh!
+
+        get '/embed/topics?discourse_embed_id=de-1234&top_period=yearly', headers: {
+          'REFERER' => 'https://example.com/evil-trout'
+        }
+        expect(response.status).to eq(200)
+        expect(response.headers['X-Frame-Options']).to be_nil
+        expect(response.body).to match("data-embed-id=\"de-1234\"")
+        expect(response.body).to match("data-topic-id=\"#{good_topic.id}\"")
+        expect(response.body).not_to match("data-topic-id=\"#{bad_topic.id}\"")
+        expect(response.body).to match("data-referer=\"https://example.com/evil-trout\"")
+      end
+
+      it "wraps the list in a custom class" do
+        topic = Fabricate(:topic)
+        get '/embed/topics?discourse_embed_id=de-1234&embed_class=my-special-class', headers: {
+          'REFERER' => 'https://example.com/evil-trout'
+        }
+        expect(response.status).to eq(200)
+        expect(response.headers['X-Frame-Options']).to be_nil
+        expect(response.body).to match("class='topics-list my-special-class'")
+      end
+
       it "returns no referer if not supplied" do
         get '/embed/topics?discourse_embed_id=de-1234'
         expect(response.status).to eq(200)
@@ -157,7 +183,7 @@ describe EmbedController do
     context "success" do
       after do
         expect(response.status).to eq(200)
-        expect(response.headers['X-Frame-Options']).to eq("ALLOWALL")
+        expect(response.headers['X-Frame-Options']).to be_nil
       end
 
       it "tells the topic retriever to work when no previous embed is found" do
@@ -249,5 +275,21 @@ describe EmbedController do
         expect(response.body).to match(I18n.t('embed.error'))
       end
     end
+
+    context "CSP frame-ancestors enabled" do
+      before do
+        SiteSetting.content_security_policy_frame_ancestors = true
+      end
+
+      it "includes all the hosts" do
+        get '/embed/comments',
+        params: { embed_url: embed_url },
+        headers: { 'REFERER' => "http://eviltrout.com/wat/1-2-3.html" }
+
+        expect(response.headers['Content-Security-Policy']).to match(/frame-ancestors.*https:\/\/discourse\.org/)
+        expect(response.headers['Content-Security-Policy']).to match(/frame-ancestors.*https:\/\/example\.com/)
+      end
+    end
+
   end
 end
diff --git a/spec/requests/extra_locales_controller_spec.rb b/spec/requests/extra_locales_controller_spec.rb
index d46f6c71ef..7d81ec890e 100644
--- a/spec/requests/extra_locales_controller_spec.rb
+++ b/spec/requests/extra_locales_controller_spec.rb
@@ -52,7 +52,7 @@ describe ExtraLocalesController do
         before do
           JsLocaleHelper.clear_cache!
           JsLocaleHelper.expects(:plugin_translations)
-            .with(any_of("en", "en_US"))
+            .with(any_of("en", "en_GB"))
             .returns("admin_js" => {
               "admin" => {
                 "site_settings" => {
diff --git a/spec/requests/forums_controller_spec.rb b/spec/requests/forums_controller_spec.rb
index 9f3ff2784c..19b1c6420b 100644
--- a/spec/requests/forums_controller_spec.rb
+++ b/spec/requests/forums_controller_spec.rb
@@ -37,4 +37,31 @@ RSpec.describe ForumsController do
     end
   end
 
+  describe "cluster parameter" do
+    it "returns a 500 response if the cluster is not configured" do
+      get "/srv/status?cluster=abc"
+      expect(response.status).to eq(500)
+      expect(response.body).to include("not configured")
+    end
+
+    it "returns a 500 response if the cluster does not match" do
+      global_setting(:cluster_name, "mycluster")
+      get "/srv/status?cluster=abc"
+      expect(response.status).to eq(500)
+      expect(response.body).to include("not match")
+    end
+
+    it "returns a 200 response if the cluster does match" do
+      global_setting(:cluster_name, "mycluster")
+      get "/srv/status?cluster=abc"
+      expect(response.status).to eq(500)
+      expect(response.body).to include("not match")
+    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
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 41c9e2861e..1f35f3dad2 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -461,6 +461,15 @@ describe GroupsController do
       expect(response.status).to eq(200)
       expect(response.parsed_body.first["id"]).to eq(post.id)
     end
+
+    it "returns moderator actions" do
+      sign_in(user)
+      post = Fabricate(:post, user: user, post_type: Post.types[:moderator_action])
+      get "/groups/#{group.name}/posts.json"
+
+      expect(response.status).to eq(200)
+      expect(response.parsed_body.first["id"]).to eq(post.id)
+    end
   end
 
   describe "#members" do
@@ -806,7 +815,9 @@ describe GroupsController do
 
         put "/groups/#{group.id}.json", params: {
           group: {
+            flair_bg_color: 'FFF',
             flair_color: 'BBB',
+            flair_icon: 'fa-adjust',
             name: 'testing',
             visibility_level: 1,
             mentionable_level: 1,
@@ -820,7 +831,9 @@ describe GroupsController do
         expect(response.status).to eq(200)
 
         group.reload
-        expect(group.flair_color).to eq(nil)
+        expect(group.flair_bg_color).to eq('FFF')
+        expect(group.flair_color).to eq('BBB')
+        expect(group.flair_icon).to eq('fa-adjust')
         expect(group.name).to eq('admins')
         expect(group.visibility_level).to eq(1)
         expect(group.mentionable_level).to eq(1)
@@ -907,6 +920,9 @@ describe GroupsController do
 
         put "/groups/#{group.id}.json", params: {
           group: {
+            flair_bg_color: 'FFF',
+            flair_color: 'BBB',
+            flair_icon: 'fa-adjust',
             mentionable_level: 1,
             messageable_level: 1,
             default_notification_level: 1
@@ -916,7 +932,9 @@ describe GroupsController do
         expect(response.status).to eq(200)
 
         group.reload
-        expect(group.flair_color).to eq(nil)
+        expect(group.flair_bg_color).to eq('FFF')
+        expect(group.flair_color).to eq('BBB')
+        expect(group.flair_icon).to eq('fa-adjust')
         expect(group.name).to eq('trust_level_4')
         expect(group.mentionable_level).to eq(1)
         expect(group.messageable_level).to eq(1)
@@ -1193,6 +1211,16 @@ describe GroupsController do
         expect(Topic.last.topic_users.map(&:user_id)).to include(Discourse::SYSTEM_USER_ID, user2.id)
       end
 
+      it 'does not add users without sufficient permission' do
+        sign_in(user)
+        SiteSetting.min_trust_level_to_allow_invite = user.trust_level + 1
+        user2 = Fabricate(:user)
+
+        put "/groups/#{group.id}/members.json", params: { usernames: user2.username }
+
+        expect(response.status).to eq(403)
+      end
+
       context "is able to add several members to a group" do
         fab!(:user1) { Fabricate(:user) }
         fab!(:user2) { Fabricate(:user, username: "UsEr2") }
@@ -1289,7 +1317,7 @@ describe GroupsController do
 
             expect(response.parsed_body["errors"]).to include(I18n.t(
               "groups.errors.adding_too_many_users",
-              limit: 1
+              count: 1
             ))
           ensure
             GroupsController.send(:remove_const, "ADD_MEMBERS_LIMIT")
@@ -1354,6 +1382,17 @@ describe GroupsController do
         end
       end
 
+      it "adds known users by email when DiscourseConnect is enabled" do
+        SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+        SiteSetting.enable_discourse_connect = true
+
+        expect do
+          put "/groups/#{group.id}/members.json", params: { emails: other_user.email }
+        end.to change { group.users.count }.by(1)
+
+        expect(response.status).to eq(200)
+      end
+
       it "will find users by email, and invite the correct user" do
         new_user = Fabricate(:user)
         expect(new_user.group_ids.include?(group.id)).to eq(false)
diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
index 0648dc17dc..aecfa505ca 100644
--- a/spec/requests/invites_controller_spec.rb
+++ b/spec/requests/invites_controller_spec.rb
@@ -4,534 +4,628 @@ require 'rails_helper'
 
 describe InvitesController do
   fab!(:admin) { Fabricate(:admin) }
-  fab!(:trust_level_4) { Fabricate(:trust_level_4) }
+  fab!(:user) { Fabricate(:user, trust_level: SiteSetting.min_trust_level_to_allow_invite) }
 
-  context 'show' do
+  context '#show' do
     fab!(:invite) { Fabricate(:invite) }
-    fab!(:user) { Fabricate(:coding_horror) }
 
-    it 'does not work for logged in users' do
-      sign_in(Fabricate(:user))
+    it 'shows the accept invite page' do
       get "/invites/#{invite.invite_key}"
-
       expect(response.status).to eq(200)
-      body = response.body
-      expect(CGI.unescapeHTML(body)).to include(I18n.t("login.already_logged_in"))
+      expect(response.body).to have_tag(:script, with: { src: '/assets/application.js' })
+      expect(response.body).to include('i*****g@a***********e.ooo')
+      expect(response.body).not_to include(invite.email)
+      expect(response.body).to_not include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
     end
 
-    it "returns error if invite not found" do
-      get "/invites/nopeNOPEnope"
-
+    it 'shows unobfuscated email if email data is present in authentication data' do
+      ActionDispatch::Request.any_instance.stubs(:session).returns(authentication: { email: invite.email })
+      get "/invites/#{invite.invite_key}"
       expect(response.status).to eq(200)
-
-      body = response.body
-      expect(body).to_not have_tag(:script, with: { src: '/assets/application.js' })
-      expect(CGI.unescapeHTML(body)).to include(I18n.t('invite.not_found', base_url: Discourse.base_url))
+      expect(response.body).to have_tag(:script, with: { src: '/assets/application.js' })
+      expect(response.body).to include(invite.email)
+      expect(response.body).not_to include('i*****g@a***********e.ooo')
     end
 
-    it "returns error if invite expired" do
+    it 'shows default user fields' do
+      user_field = Fabricate(:user_field)
+      staged_user = Fabricate(:user, staged: true, email: invite.email)
+      staged_user.set_user_field(user_field.id, 'some value')
+      staged_user.save_custom_fields
+
+      get "/invites/#{invite.invite_key}"
+      expect(response.body).to have_tag("div#data-preloaded") do |element|
+        json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
+        invite_info = JSON.parse(json['invite_info'])
+        expect(invite_info['user_fields'][user_field.id.to_s]).to eq('some value')
+      end
+    end
+
+    it 'fails for logged in users' do
+      sign_in(Fabricate(:user))
+
+      get "/invites/#{invite.invite_key}"
+      expect(response.status).to eq(200)
+      expect(response.body).to_not have_tag(:script, with: { src: '/assets/application.js' })
+      expect(response.body).to include(I18n.t('login.already_logged_in'))
+    end
+
+    it 'fails if invite does not exist' do
+      get '/invites/missing'
+      expect(response.status).to eq(200)
+      expect(response.body).to_not have_tag(:script, with: { src: '/assets/application.js' })
+      expect(response.body).to include(I18n.t('invite.not_found', base_url: Discourse.base_url))
+    end
+
+    it 'fails if invite expired' do
       invite.update(expires_at: 1.day.ago)
 
       get "/invites/#{invite.invite_key}"
-
       expect(response.status).to eq(200)
-
-      body = response.body
-      expect(body).to_not have_tag(:script, with: { src: '/assets/application.js' })
-      expect(CGI.unescapeHTML(body)).to include(I18n.t('invite.expired', base_url: Discourse.base_url))
+      expect(response.body).to_not have_tag(:script, with: { src: '/assets/application.js' })
+      expect(response.body).to include(I18n.t('invite.expired', base_url: Discourse.base_url))
     end
 
-    it "renders the accept invite page if invite exists" do
+    it 'stores the invite key in the secure session if invite exists' do
       get "/invites/#{invite.invite_key}"
-
       expect(response.status).to eq(200)
-
-      body = response.body
-      expect(body).to have_tag(:script, with: { src: '/assets/application.js' })
-      expect(CGI.unescapeHTML(body)).to_not include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
+      invite_key = read_secure_session['invite-key']
+      expect(invite_key).to eq(invite.invite_key)
     end
 
-    it "returns error if invite has already been redeemed" do
-      Fabricate(:invited_user, invite: invite, user: Fabricate(:user))
+    it 'returns error if invite has already been redeemed' do
+      expect(invite.redeem).not_to eq(nil)
+
       get "/invites/#{invite.invite_key}"
-
       expect(response.status).to eq(200)
+      expect(response.body).to_not have_tag(:script, with: { src: '/assets/application.js' })
+      expect(response.body).to include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
 
-      body = response.body
-      expect(body).to_not have_tag(:script, with: { src: '/assets/application.js' })
-      expect(CGI.unescapeHTML(body)).to include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
-    end
-  end
+      invite.update!(email: nil) # convert to email invite
 
-  context '#destroy' do
-    it 'requires you to be logged in' do
-      delete "/invites.json",
-        params: { email: 'jake@adventuretime.ooo' }
-      expect(response.status).to eq(403)
-    end
-
-    context 'while logged in' do
-      let!(:user) { sign_in(Fabricate(:user))      }
-      let!(:invite) { Fabricate(:invite, invited_by: user) }
-      fab!(:another_invite) { Fabricate(:invite, email: 'anotheremail@address.com') }
-
-      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 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: { id: another_invite.id }
-        expect(response.status).to eq(400)
-      end
-
-      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
+      get "/invites/#{invite.invite_key}"
+      expect(response.status).to eq(200)
+      expect(response.body).to_not have_tag(:script, with: { src: '/assets/application.js' })
+      expect(response.body).to include(I18n.t('invite.not_found_template_link', site_name: SiteSetting.title, base_url: Discourse.base_url))
     end
   end
 
   context '#create' do
-    it 'requires you to be logged in' do
-      post "/invites.json", params: { email: 'jake@adventuretime.ooo' }
+    it 'requires to be logged in' do
+      post '/invites.json', params: { email: 'test@example.com' }
       expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
-      let(:email) { 'jake@adventuretime.ooo' }
+      before do
+        sign_in(user)
+      end
 
-      it "fails if you can't invite to the forum" do
+      it 'fails if you cannot invite to the forum' do
         sign_in(Fabricate(:user))
-        post "/invites.json", params: { email: email }
+
+        post '/invites.json', params: { email: 'test@example.com' }
         expect(response).to be_forbidden
       end
+    end
 
-      it "fails for normal user if invite email already exists" do
-        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)
-        json = response.parsed_body
-        expect(json["failed"]).to be_present
-      end
+    context 'invite to topic' do
+      fab!(:topic) { Fabricate(:topic) }
 
-      it "allows admins to invite to groups" do
-        group = Fabricate(:group)
-        sign_in(admin)
-        post "/invites.json", params: { email: email, group_ids: [group.id] }
+      it 'works' do
+        sign_in(user)
+
+        post '/invites.json', params: { email: 'test@example.com', topic_id: topic.id }
         expect(response.status).to eq(200)
-        expect(Invite.find_by(email: email).invited_groups.count).to eq(1)
+        expect(Jobs::InviteEmail.jobs.first['args'].first['invite_to_topic']).to be_falsey
       end
 
-      it 'allows group owners to invite to groups' do
-        group = Fabricate(:group)
-        user = sign_in(Fabricate(:user))
-        user.update!(trust_level: TrustLevel[2])
+      it 'fails when topic_id is invalid' do
+        sign_in(user)
+
+        post '/invites.json', params: { email: 'test@example.com', topic_id: -9999 }
+        expect(response.status).to eq(400)
+      end
+    end
+
+    context 'invite to group' do
+      fab!(:group) { Fabricate(:group) }
+
+      it 'works for admins' do
+        sign_in(admin)
+
+        post '/invites.json', params: { email: 'test@example.com', group_ids: [group.id] }
+        expect(response.status).to eq(200)
+        expect(Invite.find_by(email: 'test@example.com').invited_groups.count).to eq(1)
+      end
+
+      it 'works for group owners' do
+        sign_in(user)
         group.add_owner(user)
 
-        post "/invites.json", params: { email: email, group_ids: [group.id] }
-
+        post '/invites.json', params: { email: 'test@example.com', group_ids: [group.id] }
         expect(response.status).to eq(200)
-        expect(Invite.find_by(email: email).invited_groups.count).to eq(1)
+        expect(Invite.find_by(email: 'test@example.com').invited_groups.count).to eq(1)
       end
 
-      it "allows admin to send multiple invites to same email" do
-        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
+      it 'works with multiple groups' do
         sign_in(admin)
-        post "/invites.json", params: { email: "test@mailinator.com" }
+        group2 = Fabricate(:group)
+
+        post '/invites.json', params: { email: 'test@example.com', group_names: "#{group.name},#{group2.name}" }
+        expect(response.status).to eq(200)
+        expect(Invite.find_by(email: 'test@example.com').invited_groups.count).to eq(2)
+      end
+
+      it 'fails for group members' do
+        sign_in(user)
+        group.add(user)
+
+        post '/invites.json', params: { email: 'test@example.com', group_ids: [group.id] }
+        expect(response.status).to eq(403)
+      end
+
+      it 'fails for other users' do
+        sign_in(user)
+
+        post '/invites.json', params: { email: 'test@example.com', group_ids: [group.id] }
+        expect(response.status).to eq(403)
+      end
+
+      it 'fails to invite new user to a group-private topic' do
+        sign_in(user)
+        private_category = Fabricate(:private_category, group: group)
+        group_private_topic = Fabricate(:topic, category: private_category)
+
+        post '/invites.json', params: { email: 'test@example.com', topic_id: group_private_topic.id  }
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context 'email invite' do
+      it 'creates invite once and updates it on successive calls' do
+        sign_in(user)
+
+        post '/invites.json', params: { email: 'test@example.com' }
+        expect(response.status).to eq(200)
+        expect(Jobs::InviteEmail.jobs.size).to eq(1)
+
+        invite = Invite.last
+
+        post '/invites.json', params: { email: 'test@example.com' }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body['id']).to eq(invite.id)
+      end
+
+      it 'accept skip_email parameter' do
+        sign_in(user)
+
+        post '/invites.json', params: { email: 'test@example.com', skip_email: true }
+        expect(response.status).to eq(200)
+        expect(Jobs::InviteEmail.jobs.size).to eq(0)
+      end
+
+      it 'fails in case of validation failure' do
+        sign_in(admin)
+
+        post '/invites.json', params: { email: 'test@mailinator.com' }
+        expect(response.status).to eq(422)
+        expect(response.parsed_body['errors']).to be_present
+      end
+    end
+
+    context 'link invite' do
+      it 'works' do
+        sign_in(admin)
+
+        post '/invites.json'
+        expect(response.status).to eq(200)
+        expect(Invite.last.email).to eq(nil)
+        expect(Invite.last.invited_by).to eq(admin)
+        expect(Invite.last.max_redemptions_allowed).to eq(1)
+      end
+
+      it 'fails if over invite_link_max_redemptions_limit' do
+        sign_in(admin)
+
+        post '/invites.json', params: { max_redemptions_allowed: SiteSetting.invite_link_max_redemptions_limit - 1 }
+        expect(response.status).to eq(200)
+
+        post '/invites.json', params: { max_redemptions_allowed: SiteSetting.invite_link_max_redemptions_limit + 1 }
+        expect(response.status).to eq(422)
+      end
+
+      it 'fails if over invite_link_max_redemptions_limit_users' do
+        sign_in(user)
+
+        post '/invites.json', params: { max_redemptions_allowed: SiteSetting.invite_link_max_redemptions_limit_users - 1 }
+        expect(response.status).to eq(200)
+
+        post '/invites.json', params: { max_redemptions_allowed: SiteSetting.invite_link_max_redemptions_limit_users + 1 }
         expect(response.status).to eq(422)
-        json = response.parsed_body
-        expect(json["errors"]).to be_present
       end
     end
   end
 
-  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.status).to eq(422)
-        end
-
-        it "fails for normal user if invite email already exists" do
-          user = sign_in(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 "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(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(trust_level_4)
-
-          post "/invites/link.json", params: {
-            email: email, topic_id: group_private_topic.id
-          }
-
-          expect(response.status).to eq(422)
-        end
-
-        it "allows admins to invite to groups" do
-          group = Fabricate(:group)
-          sign_in(admin)
-
-          post "/invites/link.json", params: {
-            email: email, group_ids: [group.id]
-          }
-
-          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
+  context '#retrieve' do
+    it 'requires to be logged in' do
+      get '/invites/retrieve.json', params: { email: 'test@example.com' }
+      expect(response.status).to eq(403)
     end
 
-    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
+    context 'while logged in' do
+      before do
+        sign_in(user)
       end
 
-      context 'while logged in' do
-        it "fails for non-staff users" do
-          sign_in(trust_level_4)
-          post "/invites/link.json", params: {
-            max_redemptions_allowed: 5
-          }
-          expect(response.status).to eq(422)
-        end
+      fab!(:invite) { Fabricate(:invite, invited_by: user, email: 'test@example.com') }
 
-        it "allows staff to invite to groups" do
-          moderator = Fabricate(:moderator)
-          sign_in(moderator)
-          group = Fabricate(:group)
-          group.add_owner(moderator)
+      it 'raises an error when the email is missing' do
+        get '/invites/retrieve.json'
+        expect(response.status).to eq(400)
+      end
 
-          post "/invites/link.json", params: {
-            max_redemptions_allowed: 5,
-            group_ids: [group.id]
-          }
+      it 'raises an error when the email cannot be found' do
+        get '/invites/retrieve.json', params: { email: 'test2@example.com' }
+        expect(response.status).to eq(400)
+      end
 
-          expect(response.status).to eq(200)
-          expect(Invite.multiple_use_invites.last.invited_groups.count).to eq(1)
-        end
+      it 'can retrieve the invite' do
+        get '/invites/retrieve.json', params: { email: 'test@example.com' }
+        expect(response.status).to eq(200)
+      end
+    end
+  end
 
-        it "allows multiple group invite" do
-          Fabricate(:group, name: "security")
-          Fabricate(:group, name: "support")
-          sign_in(admin)
+  context '#update' do
+    fab!(:invite) { Fabricate(:invite, invited_by: admin, email: 'test@example.com') }
 
-          post "/invites/link.json", params: {
-            max_redemptions_allowed: 5,
-            group_names: "security,support"
-          }
+    it 'requires to be logged in' do
+      put "/invites/#{invite.id}", params: { email: 'test2@example.com' }
+      expect(response.status).to eq(400)
+    end
 
-          expect(response.status).to eq(200)
-          expect(Invite.multiple_use_invites.last.invited_groups.count).to eq(2)
-        end
+    context 'while logged in' do
+      before do
+        sign_in(admin)
+      end
+
+      it 'resends invite email if updating email address' do
+        put "/invites/#{invite.id}", params: { email: 'test2@example.com' }
+        expect(response.status).to eq(200)
+        expect(Jobs::InviteEmail.jobs.size).to eq(1)
+      end
+
+      it 'does not resend invite email if skip_email if updating email address' do
+        put "/invites/#{invite.id}", params: { email: 'test2@example.com', skip_email: true }
+        expect(response.status).to eq(200)
+        expect(Jobs::InviteEmail.jobs.size).to eq(0)
+      end
+
+      it 'does not resend invite email when updating other fields' do
+        put "/invites/#{invite.id}", params: { custom_message: 'new message' }
+        expect(response.status).to eq(200)
+        expect(invite.reload.custom_message).to eq('new message')
+        expect(Jobs::InviteEmail.jobs.size).to eq(0)
+      end
+
+      it 'can send invite email' do
+        sign_in(user)
+        RateLimiter.enable
+        RateLimiter.clear_all!
+
+        invite = Fabricate(:invite, invited_by: user, email: 'test@example.com')
+
+        expect { put "/invites/#{invite.id}", params: { send_email: true } }
+          .to change { RateLimiter.new(user, 'resend-invite-per-hour', 10, 1.hour).remaining }.by(-1)
+        expect(response.status).to eq(200)
+        expect(Jobs::InviteEmail.jobs.size).to eq(1)
+      ensure
+        RateLimiter.disable
+      end
+
+      it 'cannot create duplicated invites' do
+        Fabricate(:invite, invited_by: admin, email: 'test2@example.com')
+
+        put "/invites/#{invite.id}.json", params: { email: 'test2@example.com' }
+        expect(response.status).to eq(409)
+      end
+    end
+  end
+
+  context '#destroy' do
+    it 'requires to be logged in' do
+      delete '/invites.json', params: { email: 'test@example.com' }
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+      fab!(:invite) { Fabricate(:invite, invited_by: user) }
+
+      before { sign_in(user) }
+
+      it 'raises an error when id is missing' do
+        delete '/invites.json'
+        expect(response.status).to eq(400)
+      end
+
+      it 'raises an error when invite does not exist' do
+        delete '/invites.json', params: { id: 848 }
+        expect(response.status).to eq(400)
+      end
+
+      it 'raises an error when invite is not created by user' do
+        another_invite = Fabricate(:invite, email: 'test2@example.com')
+
+        delete '/invites.json', params: { id: another_invite.id }
+        expect(response.status).to eq(400)
+      end
+
+      it 'destroys the invite' do
+        delete '/invites.json', params: { id: invite.id }
+        expect(response.status).to eq(200)
+        expect(invite.reload.trashed?).to be_truthy
       end
     end
   end
 
   context '#perform_accept_invitation' do
-    context 'with an invalid invite id' 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 = 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 an invalid invite record' do
-      let(:invite) { Fabricate(:invite) }
-      it "responds with error message" 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 = response.parsed_body
-        expect(json["success"]).to eq(false)
-        expect(json["message"]).to eq(I18n.t('invite.error_message'))
+    context 'with an invalid invite' do
+      it 'redirects to the root' do
+        put '/invites/show/doesntexist.json'
+        expect(response.status).to eq(404)
+        expect(response.parsed_body['message']).to eq(I18n.t('invite.not_found_json'))
         expect(session[:current_user_id]).to be_blank
       end
     end
 
     context 'with a deleted invite' do
-      fab!(:topic) { Fabricate(:topic) }
-
-      let(:invite) do
-        Invite.invite_by_email("iceking@adventuretime.ooo", topic.user, topic)
-      end
+      fab!(:invite) { Fabricate(:invite) }
 
       before do
-        invite.destroy!
+        invite.trash!
       end
 
-      it "redirects to the root" do
+      it 'redirects to the root' do
         put "/invites/show/#{invite.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(response.status).to eq(404)
+        expect(response.parsed_body['message']).to eq(I18n.t('invite.not_found_json'))
         expect(session[:current_user_id]).to be_blank
       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]) }
+      fab!(:invite) { Fabricate(:invite, expires_at: 1.day.ago) }
 
-      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'))
+      it 'response is not successful' do
+        put "/invites/show/#{invite.invite_key}.json"
+        expect(response.status).to eq(404)
+        expect(response.parsed_body['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
-        Invite.invite_by_email("iceking@adventuretime.ooo", topic.user, topic)
-      end
+    context 'with an email invite' do
+      let(:topic) { Fabricate(:topic) }
+      let(:invite) { Invite.generate(topic.user, email: 'iceking@adventuretime.ooo', topic: topic) }
 
       it 'redeems the invite' do
         put "/invites/show/#{invite.invite_key}.json"
-        invite.reload
-        expect(invite.redeemed?).to be_truthy
+        expect(invite.reload.redeemed?).to be_truthy
       end
 
-      context 'when redeem returns a user' do
-        fab!(:user) { Fabricate(:coding_horror) }
+      it 'logs in the user' do
+        events = DiscourseEvent.track_events do
+          put "/invites/show/#{invite.invite_key}.json", params: { email_token: invite.email_token }
+        end
 
-        context 'success' do
-          it 'logs in the user' do
-            events = DiscourseEvent.track_events do
-              put "/invites/show/#{invite.invite_key}.json"
-            end
+        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+        expect(response.status).to eq(200)
+        expect(session[:current_user_id]).to eq(invite.invited_users.first.user_id)
+        expect(invite.reload.redeemed?).to be_truthy
+        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
 
-            expect(events.map { |event| event[:event_name] }).to include(
-              :user_logged_in, :user_first_logged_in
-            )
-            invite.reload
-            expect(response.status).to eq(200)
-            expect(session[:current_user_id]).to eq(invite.invited_users.first.user_id)
-            expect(invite.redeemed?).to be_truthy
-            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
+      it 'redirects to the first topic the user was invited to' do
+        put "/invites/show/#{invite.invite_key}.json", params: { email_token: invite.email_token }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body['redirect_to']).to eq(topic.relative_url)
+      end
 
-          it 'redirects to the first topic the user was invited to' do
+      it 'sets the timezone of the user in user_options' do
+        put "/invites/show/#{invite.invite_key}.json", params: { timezone: 'Australia/Melbourne' }
+        expect(response.status).to eq(200)
+        invite.reload
+        user = User.find(invite.invited_users.first.user_id)
+        expect(user.user_option.timezone).to eq('Australia/Melbourne')
+      end
+
+      it 'does not log in the user if there are validation errors' do
+        put "/invites/show/#{invite.invite_key}.json", params: { password: 'password' }
+        expect(response.status).to eq(412)
+      end
+
+      it 'fails when local login is disabled and no external auth is configured' do
+        SiteSetting.enable_local_logins = false
+
+        put "/invites/show/#{invite.invite_key}.json"
+        expect(response.status).to eq(404)
+      end
+
+      context 'with OmniAuth provider' do
+        fab!(:authenticated_email) { 'test@example.com' }
+
+        before do
+          OmniAuth.config.test_mode = true
+
+          OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new(
+            provider: 'google_oauth2',
+            uid: '12345',
+            info: OmniAuth::AuthHash::InfoHash.new(
+              email: authenticated_email,
+              name: 'First Last'
+            ),
+            extra: {
+              raw_info: OmniAuth::AuthHash.new(
+                email_verified: true,
+                email: authenticated_email,
+                family_name: 'Last',
+                given_name: 'First',
+                gender: 'male',
+                name: 'First Last',
+              )
+            },
+          )
+
+          Rails.application.env_config['omniauth.auth'] = OmniAuth.config.mock_auth[:google_oauth2]
+          SiteSetting.enable_google_oauth2_logins = true
+
+          get '/auth/google_oauth2/callback.json'
+          expect(response.status).to eq(302)
+        end
+
+        after do
+          Rails.application.env_config['omniauth.auth'] = OmniAuth.config.mock_auth[:google_oauth2] = nil
+          OmniAuth.config.test_mode = false
+        end
+
+        it 'should associate the invited user with authenticator records' do
+          SiteSetting.auth_overrides_name = true
+          invite.update!(email: authenticated_email)
+
+          expect { put "/invites/show/#{invite.invite_key}.json", params: { name: 'somename' } }
+            .to change { User.with_email(authenticated_email).exists? }.to(true)
+          expect(response.status).to eq(200)
+
+          user = User.find_by_email(authenticated_email)
+          expect(user.name).to eq('First Last')
+          expect(user.user_associated_accounts.first.provider_name).to eq('google_oauth2')
+        end
+
+        it 'returns the right response even if local logins has been disabled' do
+          SiteSetting.enable_local_logins = false
+          invite.update!(email: authenticated_email)
+
+          put "/invites/show/#{invite.invite_key}.json"
+          expect(response.status).to eq(200)
+        end
+
+        it 'returns the right response if authenticated email does not match invite email' do
+          put "/invites/show/#{invite.invite_key}.json"
+          expect(response.status).to eq(412)
+        end
+      end
+
+      context '.post_process_invite' do
+        it 'sends a welcome message if set' do
+          SiteSetting.send_welcome_message = true
+          user.send_welcome_message = true
+          put "/invites/show/#{invite.invite_key}.json"
+          expect(response.status).to eq(200)
+
+          expect(Jobs::SendSystemMessage.jobs.size).to eq(1)
+        end
+
+        it 'refreshes automatic groups if staff' do
+          topic.user.grant_admin!
+          invite.update!(moderator: true)
+
+          put "/invites/show/#{invite.invite_key}.json"
+          expect(response.status).to eq(200)
+
+          expect(invite.invited_users.first.user.groups.pluck(:name)).to contain_exactly('moderators', 'staff')
+        end
+
+        context 'without password' do
+          it 'sends password reset email' do
             put "/invites/show/#{invite.invite_key}.json"
             expect(response.status).to eq(200)
-            json = response.parsed_body
-            expect(json["success"]).to eq(true)
-            expect(json["redirect_to"]).to eq(topic.relative_url)
-          end
 
-          context "if a timezone guess is provided" do
-            it "sets the timezone of the user in user_options" do
-              put "/invites/show/#{invite.invite_key}.json", params: { timezone: "Australia/Melbourne" }
-              expect(response.status).to eq(200)
-              invite.reload
-              user = User.find(invite.invited_users.first.user_id)
-              expect(user.user_option.timezone).to eq("Australia/Melbourne")
-            end
+            expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(1)
+            expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
           end
         end
 
-        context 'failure' 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 = response.parsed_body
-            expect(json["success"]).to eq(false)
-            expect(json["errors"]["password"]).to be_present
-          end
-        end
+        context 'with password' do
+          context 'user was invited via email' do
+            before { invite.update_column(:emailed_status, Invite.emailed_status_types[:pending]) }
 
-        context '.post_process_invite' do
-          it 'sends a welcome message if set' do
-            user.send_welcome_message = true
-            put "/invites/show/#{invite.invite_key}.json"
-            expect(response.status).to eq(200)
-            expect(response.parsed_body["success"]).to eq(true)
+            it 'does not send an activation email and activates the user' do
+              expect do
+                put "/invites/show/#{invite.invite_key}.json", params: { password: 'verystrongpassword', email_token: invite.email_token }
+              end.to change { UserAuthToken.count }.by(1)
 
-            expect(Jobs::SendSystemMessage.jobs.size).to eq(1)
-          end
-
-          it 'refreshes automatic groups if staff' do
-            topic.user.grant_admin!
-            invite.update!(moderator: true)
-
-            put "/invites/show/#{invite.invite_key}.json"
-            expect(response.status).to eq(200)
-
-            expect(invite.invited_users.first.user.groups.pluck(:name)).to contain_exactly("moderators", "staff")
-          end
-
-          context "without password" do
-            it "sends password reset email" do
-              put "/invites/show/#{invite.invite_key}.json"
-              expect(response.status).to eq(200)
-
-              expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(1)
-              expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
-            end
-
-            it "does not send password reset email if sso is enabled" do
-              SiteSetting.sso_url = "https://www.example.com/sso"
-              SiteSetting.enable_sso = true
-              put "/invites/show/#{invite.invite_key}.json"
               expect(response.status).to eq(200)
 
               expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(0)
               expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
+
+              invited_user = User.find_by_email(invite.email)
+              expect(invited_user.active).to eq(true)
+              expect(invited_user.email_confirmed?).to eq(true)
             end
 
-            it "does not send password reset email if local login is disabled" do
-              SiteSetting.enable_local_logins = false
-              put "/invites/show/#{invite.invite_key}.json"
+            it 'does not activate user if email token is missing' do
+              expect do
+                put "/invites/show/#{invite.invite_key}.json", params: { password: 'verystrongpassword' }
+              end.to change { UserAuthToken.count }.by(0)
+
               expect(response.status).to eq(200)
 
               expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(0)
-              expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
+              expect(Jobs::CriticalUserEmail.jobs.size).to eq(1)
+
+              invited_user = User.find_by_email(invite.email)
+              expect(invited_user.active).to eq(false)
+              expect(invited_user.email_confirmed?).to eq(false)
             end
           end
 
-          context "with password" do
-            context "user was invited via email" do
-              before { invite.update_column(:emailed_status, Invite.emailed_status_types[:pending]) }
+          context 'user was invited via link' do
+            before { invite.update_column(:emailed_status, Invite.emailed_status_types[:not_required]) }
 
-              it "doesn't send an activation email and activates the user" do
-                expect do
-                  put "/invites/show/#{invite.invite_key}.json", params: { password: "verystrongpassword" }
-                end.to change { UserAuthToken.count }.by(1)
+            it 'sends an activation email and does not activate the user' do
+              expect do
+                put "/invites/show/#{invite.invite_key}.json", params: { password: 'verystrongpassword' }
+              end.not_to change { UserAuthToken.count }
 
-                expect(response.status).to eq(200)
-                expect(response.parsed_body["success"]).to eq(true)
+              expect(response.status).to eq(200)
+              expect(response.parsed_body['message']).to eq(I18n.t('invite.confirm_email'))
 
-                expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(0)
-                expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
+              invited_user = User.find_by_email(invite.email)
+              expect(invited_user.active).to eq(false)
+              expect(invited_user.email_confirmed?).to eq(false)
 
-                invited_user = User.find_by_email(invite.email)
-                expect(invited_user.active).to eq(true)
-                expect(invited_user.email_confirmed?).to eq(true)
-              end
-            end
+              expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(0)
+              expect(Jobs::CriticalUserEmail.jobs.size).to eq(1)
 
-            context "user was invited via link" do
-              before { invite.update_column(:emailed_status, Invite.emailed_status_types[:not_required]) }
+              tokens = EmailToken.where(user_id: invited_user.id, confirmed: false, expired: false).pluck(:token)
+              expect(tokens.size).to eq(1)
 
-              it "sends an activation email and doesn't activate the user" do
-                expect do
-                  put "/invites/show/#{invite.invite_key}.json", params: { 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"))
-
-                invited_user = User.find_by_email(invite.email)
-                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
+              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
         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]) }
+    context 'with an invite link' do
+      fab!(:invite) { Fabricate(:invite, email: nil, 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 }
+      it 'sends an activation email and does not activate the user' do
+        expect { put "/invites/show/#{invite.invite_key}.json", params: { email: 'test@example.com', password: 'verystrongpassword' } }
+          .not_to change { UserAuthToken.count }
 
         expect(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"))
+        expect(response.parsed_body['message']).to eq(I18n.t('invite.confirm_email'))
+        expect(invite.reload.redemption_count).to eq(1)
 
-        invite_link.reload
-        expect(invite_link.redemption_count).to eq(1)
-
-        invited_user = User.find_by_email("foobar@example.com")
+        invited_user = User.find_by_email('test@example.com')
         expect(invited_user.active).to eq(false)
         expect(invited_user.email_confirmed?).to eq(false)
 
@@ -541,123 +635,171 @@ describe InvitesController do
         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)
+        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) }
-
-      let(:invite) do
-        Invite.invite_by_email("iceking@adventuretime.ooo", topic.user, topic)
-      end
+      fab!(:invite) { Invite.generate(topic.user, email: 'test@example.com', topic: topic) }
 
       before { SiteSetting.allow_new_registrations = false }
 
-      it "doesn't redeem the invite" do
+      it 'does not redeem the invite' do
         put "/invites/show/#{invite.invite_key}.json"
         expect(response.status).to eq(200)
-        invite.reload
-        expect(invite.invited_users).to be_blank
+        expect(invite.reload.invited_users).to be_blank
         expect(invite.redeemed?).to be_falsey
-        expect(response.body).to include(I18n.t("login.new_registrations_disabled"))
+        expect(response.body).to include(I18n.t('login.new_registrations_disabled'))
       end
     end
 
     context 'user is already logged in' do
-      fab!(:topic) { Fabricate(:topic) }
+      fab!(:invite) { Fabricate(:invite, email: 'test@example.com') }
+      fab!(:user) { sign_in(Fabricate(:user)) }
 
-      let(:invite) do
-        Invite.invite_by_email("iceking@adventuretime.ooo", topic.user, topic)
-      end
-
-      let!(:user) { sign_in(Fabricate(:user)) }
-
-      it "doesn't redeem the invite" do
+      it 'does not redeem the invite' do
         put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
         expect(response.status).to eq(200)
         invite.reload
         expect(invite.invited_users).to be_blank
         expect(invite.redeemed?).to be_falsey
-        expect(response.body).to include(I18n.t("login.already_logged_in", current_user: user.username))
+        expect(response.body).to include(I18n.t('login.already_logged_in', current_user: user.username))
       end
     end
   end
 
+  context '#destroy_all_expired' do
+    it 'removes all expired invites sent by a user' do
+      SiteSetting.invite_expiry_days = 1
+
+      user = Fabricate(:admin)
+      invite_1 = Fabricate(:invite, invited_by: user)
+      invite_2 = Fabricate(:invite, invited_by: user)
+      expired_invite = Fabricate(:invite, invited_by: user)
+      expired_invite.update!(expires_at: 2.days.ago)
+
+      sign_in(user)
+      post '/invites/destroy-all-expired'
+
+      expect(response.status).to eq(200)
+      expect(invite_1.reload.deleted_at).to eq(nil)
+      expect(invite_2.reload.deleted_at).to eq(nil)
+      expect(expired_invite.reload.deleted_at).to be_present
+    end
+  end
+
   context '#resend_invite' do
-    it 'requires you to be logged in' do
-      post "/invites/reinvite.json", params: { email: 'first_name@example.com' }
+    it 'requires to be logged in' do
+      post '/invites/reinvite.json', params: { email: 'first_name@example.com' }
       expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
-      let!(:user) { sign_in(Fabricate(:user)) }
-      let!(:invite) { Fabricate(:invite, invited_by: user) }
+      fab!(:user) { sign_in(Fabricate(:user)) }
+      fab!(:invite) { Fabricate(:invite, invited_by: user) }
       fab!(:another_invite) { Fabricate(:invite, email: 'last_name@example.com') }
 
       it 'raises an error when the email is missing' do
-        post "/invites/reinvite.json"
+        post '/invites/reinvite.json'
         expect(response.status).to eq(400)
       end
 
-      it "raises an error when the email cannot be found" do
-        post "/invites/reinvite.json", params: { email: 'first_name@example.com' }
+      it 'raises an error when the email cannot be found' do
+        post '/invites/reinvite.json', params: { email: 'first_name@example.com' }
         expect(response.status).to eq(400)
       end
 
       it 'raises an error when the invite is not yours' do
-        post "/invites/reinvite.json", params: { email: another_invite.email }
+        post '/invites/reinvite.json', params: { email: another_invite.email }
         expect(response.status).to eq(400)
       end
 
-      it "resends the invite" do
-        post "/invites/reinvite.json", params: { email: invite.email }
+      it 'resends the invite' do
+        post '/invites/reinvite.json', params: { email: invite.email }
         expect(response.status).to eq(200)
         expect(Jobs::InviteEmail.jobs.size).to eq(1)
       end
     end
   end
 
+  context '#resend_all_invites' do
+    it 'resends all non-redeemed invites by a user' do
+      SiteSetting.invite_expiry_days = 30
+
+      user = Fabricate(:admin)
+      new_invite = Fabricate(:invite, invited_by: user)
+      expired_invite = Fabricate(:invite, invited_by: user)
+      expired_invite.update!(expires_at: 2.days.ago)
+      redeemed_invite = Fabricate(:invite, invited_by: user)
+      Fabricate(:invited_user, invite: redeemed_invite, user: Fabricate(:user))
+      redeemed_invite.update!(expires_at: 5.days.ago)
+
+      sign_in(user)
+      post '/invites/reinvite-all'
+
+      expect(response.status).to eq(200)
+      expect(new_invite.reload.expires_at.to_date).to eq(30.days.from_now.to_date)
+      expect(expired_invite.reload.expires_at.to_date).to eq(30.days.from_now.to_date)
+      expect(redeemed_invite.reload.expires_at.to_date).to eq(5.days.ago.to_date)
+    end
+  end
+
   context '#upload_csv' do
-    it 'requires you to be logged in' do
-      post "/invites/upload_csv.json"
+    it 'requires to be logged in' do
+      post '/invites/upload_csv.json'
       expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
       let(:csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/discourse.csv") }
+      let(:file) { Rack::Test::UploadedFile.new(File.open(csv_file)) }
 
-      let(:file) do
-        Rack::Test::UploadedFile.new(File.open(csv_file))
-      end
+      let(:csv_file_with_headers) { File.new("#{Rails.root}/spec/fixtures/csv/discourse_headers.csv") }
+      let(:file_with_headers) { Rack::Test::UploadedFile.new(File.open(csv_file_with_headers)) }
 
-      let(:filename) { 'discourse.csv' }
-
-      it "fails if you can't bulk invite to the forum" do
+      it 'fails if you cannot bulk invite to the forum' do
         sign_in(Fabricate(:user))
-        post "/invites/upload_csv.json", params: { file: file, name: filename }
+        post '/invites/upload_csv.json', params: { file: file, name: 'discourse.csv' }
         expect(response.status).to eq(403)
       end
 
-      it "allows admin to bulk invite" do
+      it 'allows admin to bulk invite' do
         sign_in(admin)
-        post "/invites/upload_csv.json", params: { file: file, name: filename }
+        post '/invites/upload_csv.json', params: { file: file, name: 'discourse.csv' }
         expect(response.status).to eq(200)
         expect(Jobs::BulkInvite.jobs.size).to eq(1)
       end
 
-      it "sends limited invites at a time" do
+      it 'sends limited invites at a time' do
         SiteSetting.max_bulk_invites = 3
         sign_in(admin)
-        post "/invites/upload_csv.json", params: { file: file, name: filename }
+        post '/invites/upload_csv.json', params: { file: file, name: 'discourse.csv' }
 
         expect(response.status).to eq(422)
         expect(Jobs::BulkInvite.jobs.size).to eq(1)
-        json = response.parsed_body
-        expect(json["errors"][0]).to eq(I18n.t("bulk_invite.max_rows", max_bulk_invites: SiteSetting.max_bulk_invites))
+        expect(response.parsed_body['errors'][0]).to eq(I18n.t('bulk_invite.max_rows', max_bulk_invites: SiteSetting.max_bulk_invites))
+      end
+
+      it 'can import user fields' do
+        Jobs.run_immediately!
+        user_field = Fabricate(:user_field, name: "location")
+        Fabricate(:group, name: 'discourse')
+        Fabricate(:group, name: 'ubuntu')
+
+        sign_in(admin)
+
+        post '/invites/upload_csv.json', params: { file: file_with_headers, name: 'discourse_headers.csv' }
+        expect(response.status).to eq(200)
+
+        user = User.where(staged: true).find_by_email('test@example.com')
+        expect(user.user_fields[user_field.id.to_s]).to eq('usa')
+
+        user2 = User.where(staged: true).find_by_email('test2@example.com')
+        expect(user2.user_fields[user_field.id.to_s]).to eq('europe')
       end
     end
   end
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index a7db647bd8..5f69298878 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe ListController do
   fab!(:user) { Fabricate(:user) }
   fab!(:topic) { Fabricate(:topic, user: user) }
-  fab!(:group) { Fabricate(:group) }
+  fab!(:group) { Fabricate(:group, name: "AwesomeGroup") }
   fab!(:admin) { Fabricate(:admin) }
 
   before do
@@ -88,6 +88,9 @@ RSpec.describe ListController do
   end
 
   describe "categories and X" do
+    let(:category) { Fabricate(:category_with_definition) }
+    let(:sub_category) { Fabricate(:category_with_definition, parent_category: category) }
+
     it "returns top topics" do
       Fabricate(:topic, like_count: 1000, posts_count: 100)
       TopTopic.refresh!
@@ -100,6 +103,12 @@ RSpec.describe ListController do
       data = response.parsed_body
       expect(data["topic_list"]["topics"].length).to eq(2)
     end
+
+    it "returns topics from subcategories when no_subcategories=false" do
+      Fabricate(:topic, category: sub_category)
+      get "/c/#{category.slug}/#{category.id}/l/latest.json?no_subcategories=false"
+      expect(response.parsed_body["topic_list"]["topics"].length).to eq(2)
+    end
   end
 
   describe 'titles for crawler layout' do
@@ -238,7 +247,7 @@ RSpec.describe ListController do
 
       it 'should return the right response' do
         topic = Fabricate(:private_message_topic, allowed_groups: [group])
-        get "/topics/private-messages-group/#{user.username}/#{group.name}.json"
+        get "/topics/private-messages-group/#{user.username}/awesomegroup.json"
 
         expect(response.status).to eq(200)
 
@@ -750,6 +759,37 @@ RSpec.describe ListController do
       get "/c/hello/world/bye/#{subsubcategory.id}"
       expect(response.status).to eq(301)
       expect(response).to redirect_to("/c/#{category.slug}/#{subcategory.slug}/#{subsubcategory.slug}/#{subsubcategory.id}")
+
+      get "/c/#{category.slug}/#{subcategory.slug}/#{subsubcategory.slug}/#{subsubcategory.id}"
+      expect(response.status).to eq(200)
+    end
+
+    it "redirects to URL with correct case slug" do
+      category.update!(slug: "hello")
+
+      get "/c/Hello/#{category.id}"
+      expect(response).to redirect_to("/c/hello/#{category.id}")
+
+      get "/c/hello/#{category.id}"
+      expect(response.status).to eq(200)
+    end
+
+    context "does not create a redirect loop" do
+      it "with encoded slugs" do
+        category = Fabricate(:category)
+        category.update_columns(slug: CGI.escape("systèmes"))
+
+        get "/c/syst%C3%A8mes/#{category.id}"
+        expect(response.status).to eq(200)
+      end
+
+      it "with lowercase encoded slugs" do
+        category = Fabricate(:category)
+        category.update_columns(slug: CGI.escape("systèmes").downcase)
+
+        get "/c/syst%C3%A8mes/#{category.id}"
+        expect(response.status).to eq(200)
+      end
     end
 
     context "with subfolder" do
@@ -770,4 +810,37 @@ RSpec.describe ListController do
       end
     end
   end
+
+  describe "shared drafts" do
+    fab!(:category1) { Fabricate(:category) }
+    fab!(:category2) { Fabricate(:category) }
+
+    fab!(:topic1) { Fabricate(:topic, category: category1) }
+    fab!(:topic2) { Fabricate(:topic, category: category2) }
+
+    fab!(:shared_draft_topic) { Fabricate(:topic, category: category1) }
+    fab!(:shared_draft) { Fabricate(:shared_draft, topic: shared_draft_topic, category: category2) }
+
+    it "are not displayed if they are disabled" do
+      SiteSetting.shared_drafts_category = ""
+      sign_in(admin)
+
+      get "/c/#{category1.slug}/#{category1.id}.json"
+      expect(response.parsed_body['topic_list']['shared_drafts']).to eq(nil)
+      expect(response.parsed_body['topic_list']['topics'].map { |t| t['id'] }).to contain_exactly(topic1.id, shared_draft_topic.id)
+    end
+
+    it "are displayed in both shared drafts category and target category" do
+      SiteSetting.shared_drafts_category = category1.id
+      sign_in(admin)
+
+      get "/c/#{category1.slug}/#{category1.id}.json"
+      expect(response.parsed_body['topic_list']['shared_drafts']).to be_nil
+      expect(response.parsed_body['topic_list']['topics'].map { |t| t['id'] }).to contain_exactly(topic1.id, shared_draft_topic.id)
+
+      get "/c/#{category2.slug}/#{category2.id}.json"
+      expect(response.parsed_body['topic_list']['shared_drafts'].map { |t| t['id'] }).to contain_exactly(shared_draft_topic.id)
+      expect(response.parsed_body['topic_list']['topics'].map { |t| t['id'] }).to contain_exactly(topic2.id)
+    end
+  end
 end
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index 041179d838..bd7421505a 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -12,6 +12,7 @@ RSpec.describe Users::OmniauthCallbacksController do
 
   after do
     Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2] = nil
+    Rails.application.env_config["omniauth.origin"] = nil
     OmniAuth.config.test_mode = false
   end
 
@@ -221,6 +222,48 @@ RSpec.describe Users::OmniauthCallbacksController do
         data = JSON.parse(cookies[:authentication_data])
         expect(data["destination_url"]).to eq(destination_url)
       end
+
+      describe 'when site is invite_only' do
+        before do
+          SiteSetting.invite_only = true
+        end
+
+        it 'should return the right response without any origin' do
+          get "/auth/google_oauth2/callback.json"
+
+          expect(response.status).to eq(302)
+
+          data = JSON.parse(response.cookies["authentication_data"])
+
+          expect(data["requires_invite"]).to eq(true)
+        end
+
+        it 'returns the right response for an invalid origin' do
+          Rails.application.env_config["omniauth.origin"] = "/invitesinvites"
+
+          get "/auth/google_oauth2/callback.json"
+
+          expect(response.status).to eq(302)
+        end
+
+        it 'should return the right response when origin is invites page' do
+          origin = Rails.application.routes.url_helpers.invite_url(
+            Fabricate(:invite).invite_key,
+            host: Discourse.base_url
+          )
+
+          Rails.application.env_config["omniauth.origin"] = origin
+
+          get "/auth/google_oauth2/callback.json"
+
+          expect(response.status).to eq(302)
+          expect(response).to redirect_to(origin)
+
+          data = JSON.parse(response.cookies["authentication_data"])
+
+          expect(data["requires_invite"]).to eq(nil)
+        end
+      end
     end
 
     describe 'when user has been verified' do
@@ -313,7 +356,7 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.email_confirmed?).to eq(true)
       end
 
-      it "should unstage staged user" do
+      it "should treat a staged user the same as an unregistered user" do
         user.update!(staged: true, registration_ip_address: nil)
 
         user.reload
@@ -324,13 +367,32 @@ RSpec.describe Users::OmniauthCallbacksController do
           get "/auth/google_oauth2/callback.json"
         end
 
-        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+        expect(events.map { |event| event[:event_name] }).to include(:before_auth, :after_auth)
 
         expect(response.status).to eq(302)
 
+        data = JSON.parse(cookies[:authentication_data])
+        expect(data["username"]).to eq("Somenickname")
+
+        user.reload
+        expect(user.staged).to eq(true)
+        expect(user.registration_ip_address).to eq(nil)
+
+        # Now register
+        UsersController.any_instance.stubs(:honeypot_value).returns(nil)
+        UsersController.any_instance.stubs(:challenge_value).returns(nil)
+        post "/u.json", params: {
+          name: "My new name",
+          username: "mynewusername",
+          email: user.email
+        }
+
+        expect(response.status).to eq(200)
+
         user.reload
         expect(user.staged).to eq(false)
         expect(user.registration_ip_address).to be_present
+        expect(user.name).to eq("My new name")
       end
 
       it "should activate user with matching email" do
@@ -351,9 +413,9 @@ RSpec.describe Users::OmniauthCallbacksController do
 
       it "should update name/username/email when sso_overrides is enabled" do
         SiteSetting.email_editable = false
-        SiteSetting.sso_overrides_email = true
-        SiteSetting.sso_overrides_name = true
-        SiteSetting.sso_overrides_username = true
+        SiteSetting.auth_overrides_email = true
+        SiteSetting.auth_overrides_name = true
+        SiteSetting.auth_overrides_username = true
 
         UserAssociatedAccount.create!(provider_name: "google_oauth2", user_id: user.id, provider_uid: '123545')
 
@@ -371,7 +433,7 @@ RSpec.describe Users::OmniauthCallbacksController do
 
       it "will not update email if not verified" do
         SiteSetting.email_editable = false
-        SiteSetting.sso_overrides_email = true
+        SiteSetting.auth_overrides_email = true
 
         OmniAuth.config.mock_auth[:google_oauth2][:extra][:raw_info][:email_verified] = false
 
@@ -387,9 +449,9 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.email).to eq('email@example.com')
       end
 
-      it "shows error when sso_overrides_email causes a validation error" do
+      it "shows error when auth_overrides_email causes a validation error" do
         SiteSetting.email_editable = false
-        SiteSetting.sso_overrides_email = true
+        SiteSetting.auth_overrides_email = true
 
         UserAssociatedAccount.create!(provider_name: "google_oauth2", user_id: user.id, provider_uid: '123545')
 
@@ -454,12 +516,12 @@ RSpec.describe Users::OmniauthCallbacksController do
 
       context 'when sso_payload cookie exist' do
         before do
-          SiteSetting.enable_sso_provider = true
-          SiteSetting.sso_secret = "topsecret"
+          SiteSetting.enable_discourse_connect_provider = true
+          SiteSetting.discourse_connect_secret = "topsecret"
 
           @sso = SingleSignOn.new
           @sso.nonce = "mynonce"
-          @sso.sso_secret = SiteSetting.sso_secret
+          @sso.sso_secret = SiteSetting.discourse_connect_secret
           @sso.return_sso_url = "http://somewhere.over.rainbow/sso"
           cookies[:sso_payload] = @sso.payload
 
@@ -723,6 +785,16 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(UserAssociatedAccount.count).to eq(1) # Reconnect has not yet happened
       end
 
+      it 'stores and redirects to \'origin\' parameter' do
+        # Log in normally
+        post "/auth/google_oauth2?origin=http://test.localhost/atesturl"
+        expect(response.status).to eq(302)
+        expect(session[:destination_url]).to eq("http://test.localhost/atesturl")
+
+        get "/auth/google_oauth2/callback.json"
+        expect(response.status).to eq(302)
+        expect(response.redirect_url).to eq("http://test.localhost/atesturl")
+      end
     end
 
     context 'after changing email' do
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index d4b4decac4..a0dfe83661 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -203,6 +203,15 @@ describe PostsController do
         expect(response).to be_forbidden
       end
 
+      it "raises an error when the self deletions are disabled" do
+        SiteSetting.max_post_deletions_per_day = 0
+        post = Fabricate(:post, user: user, topic: topic, post_number: 3)
+        sign_in(user)
+
+        delete "/posts/#{post.id}.json"
+        expect(response).to be_forbidden
+      end
+
       it "uses a PostDestroyer" do
         post = Fabricate(:post, topic_id: topic.id, post_number: 3)
         sign_in(moderator)
@@ -306,6 +315,15 @@ describe PostsController do
         expect(response).to be_forbidden
       end
 
+      it "raises an error when self deletion/recovery is disabled" do
+        SiteSetting.max_post_deletions_per_day = 0
+        post = Fabricate(:post, user: user, topic: topic, post_number: 3)
+        sign_in(user)
+
+        put "/posts/#{post.id}/recover.json"
+        expect(response).to be_forbidden
+      end
+
       it "recovers a post correctly" do
         topic_id = create_post.topic_id
         post = create_post(topic_id: topic_id)
@@ -396,9 +414,11 @@ describe PostsController do
         expect(response).to be_forbidden
       end
 
-      it "calls revise with valid parameters" do
-        PostRevisor.any_instance.expects(:revise!).with(post.user, { raw: 'edited body' , edit_reason: 'typo' }, anything)
+      it "updates post's raw attribute" do
         put "/posts/#{post.id}.json", params: update_params
+
+        expect(response.status).to eq(200)
+        expect(post.reload.raw).to eq(update_params[:post][:raw])
       end
 
       it "extracts links from the new body" do
@@ -509,6 +529,34 @@ describe PostsController do
       expect(response.status).to eq(403)
       expect(post.topic.reload.category_id).not_to eq(category.id)
     end
+
+    describe "with Post.plugin_permitted_update_params" do
+      before do
+        plugin = Plugin::Instance.new
+        plugin.add_permitted_post_update_param(:random_number) do |post, value|
+          post.custom_fields[:random_number] = value
+          post.save
+        end
+      end
+
+      after do
+        DiscoursePluginRegistry.reset!
+      end
+
+      it "calls blocks passed into `add_permitted_post_update_param`" do
+        sign_in(post.user)
+        put "/posts/#{post.id}.json", params: {
+          post: {
+            raw: "this is a random post",
+            raw_old: post.raw,
+            random_number: 244
+          }
+        }
+
+        expect(response.status).to eq(200)
+        expect(post.reload.custom_fields[:random_number]).to eq("244")
+      end
+    end
   end
 
   describe "#destroy_bookmark" do
diff --git a/spec/requests/qunit_controller_spec.rb b/spec/requests/qunit_controller_spec.rb
new file mode 100644
index 0000000000..36d91d1f43
--- /dev/null
+++ b/spec/requests/qunit_controller_spec.rb
@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe QunitController do
+  describe "#theme" do
+    let(:theme) { Fabricate(:theme, name: 'main-theme') }
+    let(:component) { Fabricate(:theme, component: true, name: 'enabled-component') }
+    let(:disabled_component) { Fabricate(:theme, component: true, enabled: false, name: 'disabled-component') }
+    let(:theme_without_tests) { Fabricate(:theme, name: 'no-tests-guy') }
+
+    before do
+      Theme.destroy_all
+      theme.set_default!
+      component.add_relative_theme!(:parent, theme)
+      disabled_component.add_relative_theme!(:parent, theme)
+      [theme, component, disabled_component].each do |t|
+        t.set_field(
+          target: :extra_js,
+          type: :js,
+          name: "discourse/initializers/my-#{t.id}-initializer.js",
+          value: "console.log(#{t.id});"
+        )
+        t.set_field(
+          target: :tests_js,
+          type: :js,
+          name: "acceptance/some-test-#{t.id}.js",
+          value: "assert.ok(#{t.id});"
+        )
+        t.save!
+      end
+    end
+
+    context "non-admin users on production" do
+      before do
+        Rails.env.stubs(:production?).returns(true)
+      end
+
+      it "anons cannot see the page" do
+        get '/theme-qunit'
+        expect(response.status).to eq(404)
+      end
+
+      it "regular users cannot see the page" do
+        sign_in(Fabricate(:user))
+        get '/theme-qunit'
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "admin users" do
+      before do
+        sign_in(Fabricate(:admin))
+      end
+
+      context "when no theme is specified" do
+        it "renders a list of themes and components that have tests" do
+          get '/theme-qunit'
+          expect(response.status).to eq(200)
+          [theme, component, disabled_component].each do |t|
+            expect(response.body).to include(t.name)
+            expect(response.body).to include("/theme-qunit?id=#{t.id}")
+          end
+          expect(response.body).not_to include(theme_without_tests.name)
+          expect(response.body).not_to include("/theme-qunit?id=#{theme_without_tests.id}")
+        end
+      end
+
+      it "can specify theme by id" do
+        get "/theme-qunit?id=#{theme.id}"
+        expect(response.status).to eq(200)
+        expect(response.body).to include("/theme-javascripts/tests/#{theme.id}-")
+      end
+
+      it "can specify theme by name" do
+        get "/theme-qunit?name=#{theme.name}"
+        expect(response.status).to eq(200)
+        expect(response.body).to include("/theme-javascripts/tests/#{theme.id}-")
+      end
+
+      it "can specify theme by url" do
+        theme.build_remote_theme(remote_url: "git@github.com:discourse/discourse.git").save!
+        theme.save!
+        get "/theme-qunit?url=#{theme.remote_theme.remote_url}"
+        expect(response.status).to eq(200)
+        expect(response.body).to include("/theme-javascripts/tests/#{theme.id}-")
+      end
+
+      it "themes qunit page includes all the JS/CSS it needs" do
+        get "/theme-qunit?id=#{theme.id}"
+        expect(response.status).to eq(200)
+        expect(response.body).to include("/stylesheets/color_definitions_base_")
+        expect(response.body).to include("/stylesheets/desktop_")
+        expect(response.body).to include("/stylesheets/test_helper_")
+        expect(response.body).to include("/assets/locales/en.js")
+        expect(response.body).to include("/assets/discourse/tests/theme_qunit_ember_jquery.js")
+        expect(response.body).to include("/assets/vendor.js")
+        expect(response.body).to include("/assets/discourse/tests/theme_qunit_vendor.js")
+        expect(response.body).to include("/assets/pretty-text-bundle.js")
+        expect(response.body).to include("/assets/markdown-it-bundle.js")
+        expect(response.body).to include("/assets/application.js")
+        expect(response.body).to include("/assets/admin.js")
+        expect(response.body).to include("/assets/discourse/tests/theme_qunit_helper.js")
+        expect(response.body).to match(/\/theme-javascripts\/\h{40}\.js/)
+        expect(response.body).to include("/theme-javascripts/tests/#{theme.id}-")
+        expect(response.body).to include("/assets/discourse/tests/test_starter.js")
+        expect(response.body).to include("/extra-locales/admin")
+      end
+    end
+  end
+end
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index 521a5cdefc..5a2abc2352 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -174,6 +174,25 @@ describe ReviewablesController do
         expect(json_review['user_id']).to eq(user.id)
       end
 
+      it "returns correct error message if ReviewableUser not found" do
+        sign_in(admin)
+        Jobs.run_immediately!
+        SiteSetting.must_approve_users = true
+        user = Fabricate(:user)
+        user.activate
+        reviewable = ReviewableUser.find_by(target: user)
+
+        put "/review/#{reviewable.id}/perform/reject_user_delete.json?version=0"
+        expect(response.code).to eq("200")
+
+        put "/review/#{reviewable.id}/perform/reject_user_delete.json?version=0&index=2"
+        expect(response.code).to eq("404")
+        json = response.parsed_body
+
+        expect(json["error_type"]).to eq("not_found")
+        expect(json["errors"][0]).to eq(I18n.t("reviewables.already_handled_and_user_not_exist"))
+      end
+
       context "supports filtering by range" do
         let(:from) { 3.days.ago.strftime('%F') }
         let(:to) { 1.day.ago.strftime('%F') }
@@ -223,6 +242,18 @@ describe ReviewablesController do
           expect(json['users'].any? { |u| u['id'] == reviewable.target_created_by_id && u['custom_fields']['private_field'] == 'private' }).to eq(false)
         end
       end
+
+      it 'supports filtering by id' do
+        reviewable_a = Fabricate(:reviewable)
+        reviewable_b = Fabricate(:reviewable)
+
+        get "/review.json?ids[]=#{reviewable_a.id}"
+
+        expect(response.code).to eq("200")
+        json = response.parsed_body
+        expect(json['reviewables']).to be_present
+        expect(json['reviewables'].size).to eq(1)
+      end
     end
 
     context "#show" do
@@ -357,6 +388,7 @@ describe ReviewablesController do
       it "succeeds for a valid action" do
         other_reviewable = Fabricate(:reviewable)
 
+        SiteSetting.must_approve_users = true
         put "/review/#{reviewable.id}/perform/approve_user.json?version=#{reviewable.version}"
         expect(response.code).to eq("200")
         json = response.parsed_body
@@ -369,6 +401,20 @@ describe ReviewablesController do
 
         expect(reviewable.reload.version).to eq(1)
         expect(other_reviewable.reload.version).to eq(0)
+
+        job = Jobs::CriticalUserEmail.jobs.first
+        expect(job).to be_present
+        expect(job['args'][0]['type']).to eq('signup_after_approval')
+      end
+
+      it "doesn't send email when `send_email` is false" do
+        other_reviewable = Fabricate(:reviewable)
+
+        SiteSetting.must_approve_users = true
+        put "/review/#{reviewable.id}/perform/approve_user.json?version=#{reviewable.version}&send_email=false"
+
+        job = Jobs::CriticalUserEmail.jobs.first
+        expect(job).to be_blank
       end
 
       context "claims" do
@@ -405,6 +451,47 @@ describe ReviewablesController do
       end
     end
 
+    describe "with reviewable params added via plugin API" do
+      class ::ReviewablePhony < Reviewable
+        def build_actions(actions, guardian, _args)
+          return [] unless pending?
+
+          actions.add(:approve_phony) do |action|
+            action.label = "js.phony.review.approve"
+          end
+        end
+
+        def perform_approve_phony(performed_by, args)
+          MessageBus.publish("/phony-reviewable-test", { args: args }, user_ids: [1])
+          create_result(:success, :approved)
+        end
+      end
+
+      before do
+        plugin = Plugin::Instance.new
+        plugin.add_permitted_reviewable_param(:reviewable_phony, :fake_id)
+      end
+
+      after do
+        DiscoursePluginRegistry.reset!
+      end
+
+      fab!(:reviewable_phony) { Fabricate(:reviewable, type: "ReviewablePhony") }
+
+      it "passes the added param into the reviewable class' perform method" do
+        MessageBus.expects(:publish)
+          .with("/phony-reviewable-test", { args: {
+            version: reviewable_phony.version,
+            "fake_id" => "2" }
+          },
+          { user_ids: [1] })
+          .once
+
+        put "/review/#{reviewable_phony.id}/perform/approve_phony.json?version=#{reviewable_phony.version}", params: { fake_id: 2 }
+        expect(response.status).to eq(200)
+      end
+    end
+
     context "#topics" do
       fab!(:post0) { Fabricate(:post) }
       fab!(:post1) { Fabricate(:post, topic: post0.topic) }
diff --git a/spec/requests/robots_txt_controller_spec.rb b/spec/requests/robots_txt_controller_spec.rb
index ffaaa22192..b20627c0d8 100644
--- a/spec/requests/robots_txt_controller_spec.rb
+++ b/spec/requests/robots_txt_controller_spec.rb
@@ -91,6 +91,8 @@ RSpec.describe RobotsTxtController do
         i = response.body.index('User-agent: *')
         expect(i).to be_present
         expect(response.body[i..-1]).to include("Disallow: /auth/")
+        # we have to insert Googlebot for special handling
+        expect(response.body[i..-1]).to include("User-agent: Googlebot")
       end
 
       it "can allowlist user agents" do
diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb
index 990bc15d97..6af4118320 100644
--- a/spec/requests/search_controller_spec.rb
+++ b/spec/requests/search_controller_spec.rb
@@ -448,66 +448,100 @@ describe SearchController do
   end
 
   context "search priority" do
-    fab!(:low_priority_category) do
+    fab!(:very_low_priority_category) do
       Fabricate(
         :category,
         search_priority: Searchable::PRIORITIES[:very_low]
       )
     end
+
+    fab!(:low_priority_category) do
+      Fabricate(
+        :category,
+        search_priority: Searchable::PRIORITIES[: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!(:very_low_priority_topic) { Fabricate(:topic, category: very_low_priority_category) }
     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!(:very_low_priority_post) do
+      SearchIndexer.enable
+      Fabricate(:post, topic: very_low_priority_topic, raw: "This is a very Low Priority Post")
+    end
+
     fab!(:low_priority_post) do
       SearchIndexer.enable
-      Fabricate(:post, topic: low_priority_topic, raw: "This is a Low Priority Post")
+
+      Fabricate(:post,
+        topic: low_priority_topic,
+        raw: "This is a Low Priority Post",
+        created_at: 1.day.ago,
+      )
     end
-    fab!(:hight_priority_post) do
+
+    fab!(:high_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
+
+    fab!(:very_high_priority_post) do
       SearchIndexer.enable
-      Fabricate(:old_post, topic: very_high_priority_topic, raw: "This is a Old but Very High Priority Post")
+
+      Fabricate(:post,
+        topic: very_high_priority_topic,
+        raw: "This is a Old but Very High Priority Post",
+        created_at: 2.days.ago,
+      )
     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 = 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)
+      post1 = data["posts"].find { |e| e["id"] == very_high_priority_post.id }
+      post2 = data["posts"].find { |e| e["id"] == very_low_priority_post.id }
+      expect(data["posts"][0]["id"]).to eq(very_high_priority_post.id)
       expect(post1["id"]).to be > post2["id"]
     end
 
     it "sort posts with search priority when no order query" do
+      SiteSetting.category_search_priority_high_weight = 999999
+      SiteSetting.category_search_priority_low_weight = 0
+
       get "/search.json", params: { q: 'status:open Priority Post' }
       expect(response.status).to eq(200)
       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"][0]["id"]).to eq(very_high_priority_post.id)
+      expect(data["posts"][1]["id"]).to eq(high_priority_post.id)
       expect(data["posts"][2]["id"]).to eq(low_priority_post.id)
+      expect(data["posts"][3]["id"]).to eq(very_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 = 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)
+      expect(data["posts"][0]["id"]).to eq(high_priority_post.id)
+      expect(data["posts"][1]["id"]).to eq(very_low_priority_post.id)
+      expect(data["posts"][2]["id"]).to eq(low_priority_post.id)
+      expect(data["posts"][3]["id"]).to eq(very_high_priority_post.id)
     end
   end
 
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index fdd3249795..b065fd7e50 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -35,8 +35,8 @@ RSpec.describe SessionController do
 
     context "when SSO enabled" do
       before do
-        SiteSetting.sso_url = "https://www.example.com/sso"
-        SiteSetting.enable_sso = true
+        SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+        SiteSetting.enable_discourse_connect = true
       end
 
       it "only works for admins" do
@@ -503,14 +503,28 @@ RSpec.describe SessionController do
     end
   end
 
+  describe '#sso' do
+    before do
+      SiteSetting.discourse_connect_url = "http://example.com/discourse_sso"
+      SiteSetting.enable_discourse_connect = true
+      SiteSetting.discourse_connect_secret = "shjkfdhsfkjh"
+    end
+
+    it "redirects correctly" do
+      get "/session/sso"
+      expect(response.status).to eq(302)
+      expect(response.location).to start_with(SiteSetting.discourse_connect_url)
+    end
+  end
+
   describe '#sso_login' do
     before do
       @sso_url = "http://example.com/discourse_sso"
       @sso_secret = "shjkfdhsfkjh"
 
-      SiteSetting.sso_url = @sso_url
-      SiteSetting.enable_sso = true
-      SiteSetting.sso_secret = @sso_secret
+      SiteSetting.discourse_connect_url = @sso_url
+      SiteSetting.enable_discourse_connect = true
+      SiteSetting.discourse_connect_secret = @sso_secret
 
       Fabricate(:admin)
     end
@@ -577,7 +591,7 @@ RSpec.describe SessionController do
 
       expect(messages.length).to eq(0)
       expect(response.status).to eq(500)
-      expect(response.body).to include(I18n.t('sso.blank_id_error'))
+      expect(response.body).to include(I18n.t('discourse_connect.blank_id_error'))
     end
 
     it 'can handle invalid sso email validation errors' do
@@ -593,7 +607,7 @@ RSpec.describe SessionController do
 
       expect(messages.length).to eq(0)
       expect(response.status).to eq(500)
-      expect(response.body).to include(I18n.t("sso.email_error", email: ERB::Util.html_escape("test@test.com")))
+      expect(response.body).to include(I18n.t("discourse_connect.email_error", email: ERB::Util.html_escape("test@test.com")))
     end
 
     it 'can handle invalid sso external ids due to banned word' do
@@ -628,7 +642,7 @@ RSpec.describe SessionController do
       sign_out
 
       SiteSetting.email_editable = false
-      SiteSetting.sso_overrides_email = true
+      SiteSetting.auth_overrides_email = true
 
       group = Fabricate(:group, name: :bob, automatic_membership_email_domains: 'jane.com')
       sso = get_sso("/")
@@ -645,7 +659,7 @@ RSpec.describe SessionController do
 
     def sso_for_ip_specs
       sso = get_sso('/a/')
-      sso.external_id = '666' # the number of the beast
+      sso.external_id = '666'
       sso.email = 'bob@bob.com'
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
@@ -680,7 +694,7 @@ RSpec.describe SessionController do
 
     it 'respects email restrictions' do
       sso = get_sso('/a/')
-      sso.external_id = '666' # the number of the beast
+      sso.external_id = '666'
       sso.email = 'bob@bob.com'
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
@@ -694,7 +708,7 @@ RSpec.describe SessionController do
 
     it 'allows you to create an admin account' do
       sso = get_sso('/a/')
-      sso.external_id = '666' # the number of the beast
+      sso.external_id = '666'
       sso.email = 'bob@bob.com'
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
@@ -721,7 +735,7 @@ RSpec.describe SessionController do
 
     it 'redirects to a non-relative url' do
       sso = get_sso("#{Discourse.base_url}/b/")
-      sso.external_id = '666' # the number of the beast
+      sso.external_id = '666'
       sso.email = 'bob@bob.com'
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
@@ -731,10 +745,10 @@ RSpec.describe SessionController do
     end
 
     it 'redirects to random url if it is allowed' do
-      SiteSetting.sso_allows_all_return_paths = true
+      SiteSetting.discourse_connect_allows_all_return_paths = true
 
       sso = get_sso('https://gusundtrout.com')
-      sso.external_id = '666' # the number of the beast
+      sso.external_id = '666'
       sso.email = 'bob@bob.com'
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
@@ -745,7 +759,7 @@ RSpec.describe SessionController do
 
     it 'redirects to root if the host of the return_path is different' do
       sso = get_sso('//eviltrout.com')
-      sso.external_id = '666' # the number of the beast
+      sso.external_id = '666'
       sso.email = 'bob@bob.com'
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
@@ -756,7 +770,7 @@ RSpec.describe SessionController do
 
     it 'redirects to root if the host of the return_path is different' do
       sso = get_sso('http://eviltrout.com')
-      sso.external_id = '666' # the number of the beast
+      sso.external_id = '666'
       sso.email = 'bob@bob.com'
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
@@ -769,7 +783,7 @@ RSpec.describe SessionController 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.external_id = '666'
       sso.email = 'bob@bob.com'
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
@@ -806,11 +820,106 @@ RSpec.describe SessionController do
       expect(logged_on_user.custom_fields["bla"]).to eq(nil)
     end
 
+    context "when an invitation is used" do
+      let(:invite) { Fabricate(:invite, email: invite_email, invited_by: Fabricate(:admin)) }
+      let(:invite_email) { nil }
+
+      def login_with_sso_and_invite(invite_key = invite.invite_key)
+        write_secure_session("invite-key", invite_key)
+        sso = get_sso("/")
+        sso.external_id = "666"
+        sso.email = "bob@bob.com"
+        sso.name = "Sam Saffron"
+        sso.username = "sam"
+
+        get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+      end
+
+      it "errors if the invite key is invalid" do
+        login_with_sso_and_invite("wrong")
+        expect(response.status).to eq(400)
+        expect(response.body).to include(I18n.t("invite.not_found", base_url: Discourse.base_url))
+        expect(invite.reload.redeemed?).to eq(false)
+        expect(User.find_by_email("bob@bob.com")).to eq(nil)
+      end
+
+      it "errors if the invite has expired" do
+        invite.update!(expires_at: 3.days.ago)
+        login_with_sso_and_invite
+        expect(response.status).to eq(400)
+        expect(response.body).to include(I18n.t("invite.expired", base_url: Discourse.base_url))
+        expect(invite.reload.redeemed?).to eq(false)
+        expect(User.find_by_email("bob@bob.com")).to eq(nil)
+      end
+
+      it "errors if the invite has been redeemed already" do
+        invite.update!(max_redemptions_allowed: 1, redemption_count: 1)
+        login_with_sso_and_invite
+        expect(response.status).to eq(400)
+        expect(response.body).to include(I18n.t("invite.not_found_template", site_name: SiteSetting.title, base_url: Discourse.base_url))
+        expect(invite.reload.redeemed?).to eq(true)
+        expect(User.find_by_email("bob@bob.com")).to eq(nil)
+      end
+
+      it "errors if the invite is for a specific email and that email does not match the sso email" do
+        invite.update!(email: "someotheremail@dave.com")
+        login_with_sso_and_invite
+        expect(response.status).to eq(400)
+        expect(response.body).to include(I18n.t("invite.not_matching_email", base_url: Discourse.base_url))
+        expect(invite.reload.redeemed?).to eq(false)
+        expect(User.find_by_email("bob@bob.com")).to eq(nil)
+      end
+
+      it "allows you to create an account and redeems the invite successfully, clearing the invite-key session" do
+        login_with_sso_and_invite
+
+        expect(response.status).to eq(302)
+        expect(response).to redirect_to("/")
+        expect(invite.reload.redeemed?).to eq(true)
+
+        user = User.find_by_email("bob@bob.com")
+        expect(user.active).to eq(true)
+        expect(session[:current_user_id]).to eq(user.id)
+        expect(read_secure_session["invite-key"]).to eq(nil)
+      end
+
+      it "allows you to create an account and redeems the invite successfully even if must_approve_users is enabled" do
+        SiteSetting.must_approve_users = true
+
+        login_with_sso_and_invite
+
+        expect(response.status).to eq(302)
+        expect(response).to redirect_to("/")
+        expect(invite.reload.redeemed?).to eq(true)
+
+        user = User.find_by_email("bob@bob.com")
+        expect(user.active).to eq(true)
+      end
+
+      it "redirects to the topic associated to the invite" do
+        topic_invite = TopicInvite.create!(invite: invite, topic: Fabricate(:topic))
+        login_with_sso_and_invite
+
+        expect(response.status).to eq(302)
+        expect(response).to redirect_to(topic_invite.topic.relative_url)
+      end
+
+      it "adds the user to the appropriate invite groups" do
+        invited_group = InvitedGroup.create!(invite: invite, group: Fabricate(:group))
+        login_with_sso_and_invite
+
+        expect(invite.reload.redeemed?).to eq(true)
+
+        user = User.find_by_email("bob@bob.com")
+        expect(GroupUser.exists?(user: user, group: invited_group.group)).to eq(true)
+      end
+    end
+
     context 'when sso emails are not trusted' do
       context 'if you have not activated your account' do
         it 'does not log you in' do
           sso = get_sso('/a/')
-          sso.external_id = '666' # the number of the beast
+          sso.external_id = '666'
           sso.email = 'bob@bob.com'
           sso.name = 'Sam Saffron'
           sso.username = 'sam'
@@ -824,7 +933,7 @@ RSpec.describe SessionController do
 
         it 'sends an activation email' do
           sso = get_sso('/a/')
-          sso.external_id = '666' # the number of the beast
+          sso.external_id = '666'
           sso.email = 'bob@bob.com'
           sso.name = 'Sam Saffron'
           sso.username = 'sam'
@@ -894,8 +1003,8 @@ RSpec.describe SessionController do
 
     context "when sso provider is enabled" do
       before do
-        SiteSetting.enable_sso_provider = true
-        SiteSetting.sso_provider_secrets = [
+        SiteSetting.enable_discourse_connect_provider = true
+        SiteSetting.discourse_connect_provider_secrets = [
           "*|secret,forAll",
           "*.rainbow|wrongSecretForOverRainbow",
           "www.random.site|secretForRandomSite",
@@ -947,9 +1056,9 @@ RSpec.describe SessionController do
     describe 'local attribute override from SSO payload' do
       before do
         SiteSetting.email_editable = false
-        SiteSetting.sso_overrides_email = true
-        SiteSetting.sso_overrides_username = true
-        SiteSetting.sso_overrides_name = true
+        SiteSetting.auth_overrides_email = true
+        SiteSetting.auth_overrides_username = true
+        SiteSetting.auth_overrides_name = true
 
         @user = Fabricate(:user)
 
@@ -1009,10 +1118,10 @@ RSpec.describe SessionController do
           body: lambda { |request| file_from_fixtures("logo.png") }
         )
 
-        SiteSetting.enable_sso_provider = true
-        SiteSetting.enable_sso = false
+        SiteSetting.enable_discourse_connect_provider = true
+        SiteSetting.enable_discourse_connect = false
         SiteSetting.enable_local_logins = true
-        SiteSetting.sso_provider_secrets = [
+        SiteSetting.discourse_connect_provider_secrets = [
           "*|secret,forAll",
           "*.rainbow|wrongSecretForOverRainbow",
           "www.random.site|secretForRandomSite",
@@ -1077,17 +1186,17 @@ RSpec.describe SessionController do
       end
 
       it "fails with a nice error message if secret is blank" do
-        SiteSetting.sso_provider_secrets = ""
+        SiteSetting.discourse_connect_provider_secrets = ""
         sso = SingleSignOnProvider.new
         sso.nonce = "mynonce"
         sso.return_sso_url = "http://website.without.secret.com/sso"
         get "/session/sso_provider", params: Rack::Utils.parse_query(sso.payload("aasdasdasd"))
         expect(response.status).to eq(400)
-        expect(response.body).to eq(I18n.t("sso.missing_secret"))
+        expect(response.body).to eq(I18n.t("discourse_connect.missing_secret"))
       end
 
       it "returns a 422 if no return_sso_url" do
-        SiteSetting.sso_provider_secrets = "abcdefghij"
+        SiteSetting.discourse_connect_provider_secrets = "abcdefghij"
         sso = SingleSignOnProvider.new
         get "/session/sso_provider?sso=asdf&sig=abcdefghij"
         expect(response.status).to eq(422)
@@ -1221,8 +1330,8 @@ RSpec.describe SessionController do
 
     context 'SSO is enabled' do
       before do
-        SiteSetting.sso_url = "https://www.example.com/sso"
-        SiteSetting.enable_sso = true
+        SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+        SiteSetting.enable_discourse_connect = true
 
         post "/session.json", params: {
           login: user.username, password: 'myawesomepassword'
@@ -1824,13 +1933,18 @@ RSpec.describe SessionController do
       expect(response.parsed_body["redirect_url"]).to eq("/")
     end
 
-    it 'redirects to /login for SSO' do
-      SiteSetting.sso_url = "https://example.com/sso"
-      SiteSetting.enable_sso = true
+    it 'redirects to /login when SSO and login_required' do
+      SiteSetting.discourse_connect_url = "https://example.com/sso"
+      SiteSetting.enable_discourse_connect = true
 
       user = sign_in(Fabricate(:user))
       delete "/session/#{user.username}.json", xhr: true
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["redirect_url"]).to eq("/")
 
+      SiteSetting.login_required = true
+      user = sign_in(Fabricate(:user))
+      delete "/session/#{user.username}.json", xhr: true
       expect(response.status).to eq(200)
       expect(response.parsed_body["redirect_url"]).to eq("/login")
     end
@@ -1997,8 +2111,8 @@ RSpec.describe SessionController do
 
       context 'SSO is enabled' do
         before do
-          SiteSetting.sso_url = "https://www.example.com/sso"
-          SiteSetting.enable_sso = true
+          SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+          SiteSetting.enable_discourse_connect = true
 
           post "/session.json", params: {
             login: user.username, password: 'myawesomepassword'
diff --git a/spec/requests/similar_topics_controller_spec.rb b/spec/requests/similar_topics_controller_spec.rb
index cef7f5e205..8ecc048668 100644
--- a/spec/requests/similar_topics_controller_spec.rb
+++ b/spec/requests/similar_topics_controller_spec.rb
@@ -17,7 +17,7 @@ describe SimilarTopicsController do
 
     def reindex_posts
       SearchIndexer.enable
-      Jobs::ReindexSearch.new.rebuild_problem_posts
+      Jobs::ReindexSearch.new.rebuild_posts
     end
 
     it "requires a title param" do
diff --git a/spec/requests/static_controller_spec.rb b/spec/requests/static_controller_spec.rb
index 967185f567..3156b2a7ab 100644
--- a/spec/requests/static_controller_spec.rb
+++ b/spec/requests/static_controller_spec.rb
@@ -116,6 +116,25 @@ describe StaticController do
         File.delete(file_path)
       end
     end
+
+    it 'has correct cors headers for brotli assets' do
+      begin
+        assets_path = Rails.root.join("public/assets")
+
+        FileUtils.mkdir_p(assets_path)
+
+        file_path = assets_path.join("test.js.br")
+        File.write(file_path, 'fake brotli file')
+        GlobalSetting.stubs(:cdn_url).returns("https://www.example.com/")
+
+        get "/brotli_asset/test.js"
+
+        expect(response.status).to eq(200)
+        expect(response.headers["Access-Control-Allow-Origin"]).to match("*")
+      ensure
+        File.delete(file_path)
+      end
+    end
   end
 
   context '#cdn_asset' do
diff --git a/spec/requests/tag_groups_controller_spec.rb b/spec/requests/tag_groups_controller_spec.rb
index 140f295029..2524f84d23 100644
--- a/spec/requests/tag_groups_controller_spec.rb
+++ b/spec/requests/tag_groups_controller_spec.rb
@@ -4,9 +4,10 @@ require 'rails_helper'
 
 RSpec.describe TagGroupsController do
   fab!(:user) { Fabricate(:user) }
-  fab!(:tag_group) { Fabricate(:tag_group) }
 
   describe '#index' do
+    fab!(:tag_group) { Fabricate(:tag_group) }
+
     describe 'for a non staff user' do
       it 'should not be accessible' do
         get "/tag_groups.json"
@@ -41,4 +42,108 @@ RSpec.describe TagGroupsController do
       end
     end
   end
+
+  describe '#search' do
+    fab!(:tag) { Fabricate(:tag) }
+
+    let(:everyone) { Group::AUTO_GROUPS[:everyone] }
+    let(:staff) { Group::AUTO_GROUPS[:staff] }
+
+    let(:full) { TagGroupPermission.permission_types[:full] }
+    let(:readonly) { TagGroupPermission.permission_types[:readonly] }
+
+    context 'for anons' do
+      it 'returns the tag group with the associated tag names' do
+        tag_group = tag_group_with_permission(everyone, readonly)
+        tag_group2 = tag_group_with_permission(everyone, readonly)
+
+        get '/tag_groups/filter/search.json'
+        expect(response.status).to eq(200)
+
+        results = JSON.parse(response.body, symbolize_names: true).fetch(:results)
+
+        expect(results).to contain_exactly(
+          { name: tag_group.name, tag_names: [tag.name] },
+          { name: tag_group2.name, tag_names: [tag.name] }
+        )
+      end
+
+      it 'returns an empty array if the tag group is private' do
+        tag_group_with_permission(staff, full)
+
+        get '/tag_groups/filter/search.json'
+        expect(response.status).to eq(200)
+
+        results = JSON.parse(response.body, symbolize_names: true).fetch(:results)
+
+        expect(results).to be_empty
+      end
+    end
+
+    context 'for regular users' do
+      before { sign_in(user) }
+
+      it 'returns the tag group with the associated tag names' do
+        tag_group = tag_group_with_permission(everyone, readonly)
+
+        get '/tag_groups/filter/search.json'
+        expect(response.status).to eq(200)
+
+        results = JSON.parse(response.body, symbolize_names: true).fetch(:results)
+
+        expect(results.first[:name]).to eq(tag_group.name)
+        expect(results.first[:tag_names]).to contain_exactly(tag.name)
+      end
+
+      it 'returns an empty array if the tag group is private' do
+        tag_group_with_permission(staff, full)
+
+        get '/tag_groups/filter/search.json'
+        expect(response.status).to eq(200)
+
+        results = JSON.parse(response.body, symbolize_names: true).fetch(:results)
+
+        expect(results).to be_empty
+      end
+
+      it 'finds exact case-insensitive matches using the `names` param' do
+        tag_group_with_permission(everyone, readonly, name: "Whee")
+        tag_group_with_permission(everyone, readonly, name: "Whee Two")
+
+        get '/tag_groups/filter/search.json', params: { names: ["WHEE"] }
+        expect(response.status).to eq(200)
+
+        results = JSON.parse(response.body, symbolize_names: true).fetch(:results)
+
+        expect(results.count).to eq(1)
+        expect(results.first[:name]).to eq("Whee")
+      end
+
+      it 'finds partial matches using the `q` param' do
+        tag_group_with_permission(everyone, readonly, name: "Whee")
+        tag_group_with_permission(everyone, readonly, name: "Woop")
+        tag_group_with_permission(everyone, readonly, name: "Hoop")
+
+        get '/tag_groups/filter/search.json', params: { q: "oop" }
+        expect(response.status).to eq(200)
+
+        results = JSON.parse(response.body, symbolize_names: true).fetch(:results)
+
+        expect(results.count).to eq(2)
+        expect(results.first[:name]).to eq("Hoop")
+        expect(results.last[:name]).to eq("Woop")
+      end
+
+    end
+
+    def tag_group_with_permission(auto_group, permission_type, name: nil)
+      options = { tags: [tag] }
+      options.merge!({ name: name }) if name
+
+      Fabricate(:tag_group, options).tap do |tag_group|
+        tag_group.permissions = [[auto_group, permission_type]]
+        tag_group.save!
+      end
+    end
+  end
 end
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index ffcbe86a3a..0232aa3c2b 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -29,7 +29,6 @@ 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
 
@@ -106,7 +105,6 @@ describe TagsController do
     end
 
     context "when user can admin tags" do
-
       it "succesfully retrieve all tags" do
         sign_in(admin)
 
@@ -117,7 +115,88 @@ describe TagsController do
         tags = response.parsed_body["tags"]
         expect(tags.length).to eq(2)
       end
+    end
 
+    context "with hidden tags" do
+      before do
+        create_hidden_tags(["staff1"])
+      end
+
+      it "is returned to admins" do
+        sign_in(admin)
+        get "/tags.json"
+        expect(response.parsed_body["tags"].map { |t| t["text"] }).to include("staff1")
+        expect(response.parsed_body["extras"]["categories"]).to be_empty
+      end
+
+      it "is not returned to anon" do
+        get "/tags.json"
+        expect(response.parsed_body["tags"].map { |t| t["text"] }).to_not include("staff1")
+        expect(response.parsed_body["extras"]["categories"]).to be_empty
+      end
+
+      it "is not returned to regular user" do
+        sign_in(user)
+        get "/tags.json"
+        expect(response.parsed_body["tags"].map { |t| t["text"] }).to_not include("staff1")
+        expect(response.parsed_body["extras"]["categories"]).to be_empty
+      end
+
+      context "restricted to a category" do
+        before do
+          category.tags = [Tag.find_by_name("staff1")]
+        end
+
+        it "is returned to admins" do
+          sign_in(admin)
+          get "/tags.json"
+          expect(response.parsed_body["tags"].map { |t| t["text"] }).to include("staff1")
+          categories = response.parsed_body["extras"]["categories"]
+          expect(categories.length).to eq(1)
+          expect(categories.first["tags"].map { |t| t["text"] }).to include("staff1")
+        end
+
+        it "is not returned to anon" do
+          get "/tags.json"
+          expect(response.parsed_body["tags"].map { |t| t["text"] }).to_not include("staff1")
+          expect(response.parsed_body["extras"]["categories"]).to be_empty
+        end
+
+        it "is not returned to regular user" do
+          sign_in(user)
+          get "/tags.json"
+          expect(response.parsed_body["tags"].map { |t| t["text"] }).to_not include("staff1")
+          expect(response.parsed_body["extras"]["categories"]).to be_empty
+        end
+      end
+
+      context "listed by group" do
+        before do
+          SiteSetting.tags_listed_by_group = true
+        end
+
+        it "is returned to admins" do
+          sign_in(admin)
+          get "/tags.json"
+          expect(response.parsed_body["tags"].map { |t| t["text"] }).to_not include("staff1")
+          tag_groups = response.parsed_body["extras"]["tag_groups"]
+          expect(tag_groups.length).to eq(1)
+          expect(tag_groups.first["tags"].map { |t| t["text"] }).to include("staff1")
+        end
+
+        it "is not returned to anon" do
+          get "/tags.json"
+          expect(response.parsed_body["tags"].map { |t| t["text"] }).to_not include("staff1")
+          expect(response.parsed_body["extras"]["tag_groups"]).to be_empty
+        end
+
+        it "is not returned to regular user" do
+          sign_in(user)
+          get "/tags.json"
+          expect(response.parsed_body["tags"].map { |t| t["text"] }).to_not include("staff1")
+          expect(response.parsed_body["extras"]["tag_groups"]).to be_empty
+        end
+      end
     end
   end
 
@@ -136,9 +215,6 @@ describe TagsController do
       topic_list = json["topic_list"]
 
       expect(topic_list["tags"].map { |t| t["id"] }).to contain_exactly(tag.id)
-      expect(topic_list["draft"]).to eq(nil)
-      expect(topic_list["draft_sequence"]).to eq(nil)
-      expect(topic_list["draft_key"]).to eq(Draft::NEW_TOPIC)
     end
 
     it "should handle invalid tags" do
@@ -204,6 +280,13 @@ describe TagsController do
         expect(topic_ids).to_not include(topic_out_of_category.id)
         expect(topic_ids).to_not include(topic_in_category_without_tag.id)
       end
+
+      it "should produce the right next topic URL" do
+        get "/tags/c/#{category.slug_path.join("/")}/#{category.id}/#{tag.name}.json?per_page=1"
+
+        expect(response.parsed_body['topic_list']['more_topics_url'])
+          .to start_with("/tags/c/#{category.slug_path.join('/')}/#{category.id}/#{tag.name}")
+      end
     end
 
     context "with a subcategory in the path" do
@@ -468,6 +551,12 @@ describe TagsController do
         expect(response.status).to eq(200)
       end
 
+      it "can render a topic list from the latest endpoint" do
+        get "/tag/#{tag.name}/l/latest"
+        expect(response.status).to eq(200)
+        expect(response.body).to include("topic-list")
+      end
+
       it "can filter by two tags" do
         single_tag_topic; multi_tag_topic; all_tag_topic
 
diff --git a/spec/requests/theme_javascripts_controller_spec.rb b/spec/requests/theme_javascripts_controller_spec.rb
index 6c05efd4e5..d1d13a6dd9 100644
--- a/spec/requests/theme_javascripts_controller_spec.rb
+++ b/spec/requests/theme_javascripts_controller_spec.rb
@@ -2,9 +2,19 @@
 require 'rails_helper'
 
 describe ThemeJavascriptsController do
+  include ActiveSupport::Testing::TimeHelpers
+
+  def clear_disk_cache
+    if Dir.exist?(ThemeJavascriptsController::DISK_CACHE_PATH)
+      `rm -rf #{ThemeJavascriptsController::DISK_CACHE_PATH}`
+    end
+  end
+
   let!(:theme) { Fabricate(:theme) }
   let(:theme_field) { ThemeField.create!(theme: theme, target_id: 0, name: "header", value: "<a>html</a>") }
   let(:javascript_cache) { JavascriptCache.create!(content: 'console.log("hello");', theme_field: theme_field) }
+  before { clear_disk_cache }
+  after { clear_disk_cache }
 
   describe '#show' do
     def update_digest_and_get(digest)
@@ -47,11 +57,83 @@ describe ThemeJavascriptsController do
       get "/theme-javascripts/#{javascript_cache.digest}.js"
       expect(response.status).to eq(404)
     end
+  end
 
-    def clear_disk_cache
-      if Dir.exist?(ThemeJavascriptsController::DISK_CACHE_PATH)
-        `rm #{ThemeJavascriptsController::DISK_CACHE_PATH}/*`
-      end
+  describe "#show_tests" do
+    let(:component) { Fabricate(:theme, component: true, name: 'enabled-component') }
+    let!(:tests_field) do
+      field = component.set_field(
+        target: :tests_js,
+        type: :js,
+        name: "acceptance/some-test.js",
+        value: "assert.ok(true);"
+      )
+      component.save!
+      field
+    end
+
+    before do
+      ThemeField.create!(
+        theme: component,
+        target_id: Theme.targets[:settings],
+        name: "yaml",
+        value: "num_setting: 5"
+      )
+      component.save!
+    end
+
+    it "forces theme settings default values" do
+      component.update_setting(:num_setting, 643)
+      _, digest = component.baked_js_tests_with_digest
+
+      get "/theme-javascripts/tests/#{component.id}-#{digest}.js"
+      expect(response.body).to include("require(\"discourse/lib/theme-settings-store\").registerSettings(#{component.id}, {\"num_setting\":5}, { force: true });")
+      expect(response.body).to include("assert.ok(true);")
+    end
+
+    it "responds with 404 if digest is not a 40 chars hex" do
+      digest = Rack::Utils.escape('../../../../../../../../../../etc/passwd').gsub('.', '%2E')
+      get "/theme-javascripts/tests/#{component.id}-#{digest}.js"
+      expect(response.status).to eq(404)
+
+      get "/theme-javascripts/tests/#{component.id}-abc123.js"
+      expect(response.status).to eq(404)
+    end
+
+    it "responds with 404 if theme does not exist" do
+      get "/theme-javascripts/tests/#{Theme.maximum(:id) + 1}-#{SecureRandom.hex(20)}.js"
+      expect(response.status).to eq(404)
+    end
+
+    it "responds with 304 if tests digest has not changed" do
+      content, digest = component.baked_js_tests_with_digest
+      get "/theme-javascripts/tests/#{component.id}-#{digest}.js"
+      last_modified = Time.rfc2822(response.headers["Last-Modified"])
+      expect(response.status).to eq(200)
+      expect(response.headers["Content-Length"].to_i).to eq(content.size)
+
+      get "/theme-javascripts/tests/#{component.id}-#{digest}.js",
+        headers: { "If-Modified-Since" => (last_modified + 10.seconds).rfc2822 }
+      expect(response.status).to eq(304)
+    end
+
+    it "responds with 404 to requests with old digests" do
+      _, old_digest = component.baked_js_tests_with_digest
+      get "/theme-javascripts/tests/#{component.id}-#{old_digest}.js"
+      expect(response.status).to eq(200)
+      expect(response.body).to include("assert.ok(true);")
+
+      tests_field.update!(value: "assert.ok(343434);")
+      tests_field.invalidate_baked!
+      _, digest = component.baked_js_tests_with_digest
+      expect(old_digest).not_to eq(digest)
+
+      get "/theme-javascripts/tests/#{component.id}-#{old_digest}.js"
+      expect(response.status).to eq(404)
+
+      get "/theme-javascripts/tests/#{component.id}-#{digest}.js"
+      expect(response.status).to eq(200)
+      expect(response.body).to include("assert.ok(343434);")
     end
   end
 end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 214263be02..cfb0069222 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -5,16 +5,27 @@ require 'rails_helper'
 
 RSpec.describe TopicsController do
   fab!(:topic) { Fabricate(:topic) }
+
   fab!(:user) { Fabricate(:user) }
   fab!(:moderator) { Fabricate(:moderator) }
   fab!(:admin) { Fabricate(:admin) }
   fab!(:trust_level_4) { Fabricate(:trust_level_4) }
 
+  fab!(:category) { Fabricate(:category) }
+  fab!(:staff_category) {
+    Fabricate(:category).tap { |staff_category|
+      staff_category.set_permissions(staff: :full)
+      staff_category.save!
+    }
+  }
+
+  fab!(:group_user) { Fabricate(:group_user) }
+
   describe '#wordpress' do
     let!(:user) { sign_in(moderator) }
-    let(:p1) { Fabricate(:post, user: moderator) }
-    let(:topic) { p1.topic }
-    let!(:p2) { Fabricate(:post, topic: topic, user: moderator) }
+    fab!(:p1) { Fabricate(:post, user: moderator) }
+    fab!(:topic) { p1.topic }
+    fab!(:p2) { Fabricate(:post, topic: topic, user: moderator) }
 
     it "returns the JSON in the format our wordpress plugin needs" do
       SiteSetting.external_system_avatars_enabled = false
@@ -63,9 +74,9 @@ RSpec.describe TopicsController do
     end
 
     describe 'moving to a new topic' do
-      let(:p1) { Fabricate(:post, user: user, post_number: 1) }
+      fab!(:p1) { Fabricate(:post, user: user, post_number: 1) }
       let(:p2) { Fabricate(:post, user: user, post_number: 2, topic: p1.topic) }
-      let!(:topic) { p1.topic }
+      let(:topic) { p1.topic }
 
       it "raises an error without post_ids" do
         sign_in(moderator)
@@ -99,7 +110,6 @@ RSpec.describe TopicsController do
       end
 
       context 'success' do
-        fab!(:category) { Fabricate(:category) }
 
         before { sign_in(admin) }
 
@@ -191,12 +201,11 @@ RSpec.describe TopicsController do
     end
 
     describe "moving to a new topic as a group moderator" do
-      fab!(:group_user) { Fabricate(:group_user) }
       fab!(:category) { Fabricate(:category, reviewable_by_group: group_user.group) }
       fab!(:topic) { Fabricate(:topic, category: category) }
       fab!(:p1) { Fabricate(:post, user: group_user.user, post_number: 1, topic: topic) }
       fab!(:p2) { Fabricate(:post, user: group_user.user, post_number: 2, topic: topic) }
-      let(:user) { group_user.user }
+      let!(:user) { group_user.user }
 
       before do
         sign_in(user)
@@ -219,10 +228,6 @@ RSpec.describe TopicsController do
       end
 
       it "does not allow posts to be moved to a private category" do
-        staff_category = Fabricate(:category)
-        staff_category.set_permissions(staff: :full)
-        staff_category.save!
-
         post "/t/#{topic.id}/move-posts.json", params: {
           title: 'Logan is a good movie',
           post_ids: [p2.id],
@@ -245,14 +250,13 @@ RSpec.describe TopicsController do
 
     describe 'moving to an existing topic' do
       let!(:user) { sign_in(moderator) }
-      let(:p1) { Fabricate(:post, user: user) }
-      let(:topic) { p1.topic }
+      fab!(:p1) { Fabricate(:post, user: moderator) }
+      fab!(:topic) { p1.topic }
       fab!(:dest_topic) { Fabricate(:topic) }
-      let(:p2) { Fabricate(:post, user: user, topic: topic) }
+      fab!(:p2) { Fabricate(:post, user: moderator, topic: topic) }
 
       context 'success' do
         it "returns success" do
-          user
           post "/t/#{topic.id}/move-posts.json", params: {
             post_ids: [p2.id],
             destination_topic_id: dest_topic.id
@@ -290,7 +294,7 @@ RSpec.describe TopicsController do
       end
 
       context 'failure' do
-        let(:p2) { Fabricate(:post, user: user) }
+        fab!(:p2) { Fabricate(:post, user: moderator) }
         it "returns JSON with a false success" do
           post "/t/#{topic.id}/move-posts.json", params: {
             post_ids: [p2.id]
@@ -305,14 +309,13 @@ RSpec.describe TopicsController do
     end
 
     describe "moving to an existing topic as a group moderator" do
-      fab!(:group_user) { Fabricate(:group_user) }
       fab!(:category) { Fabricate(:category, reviewable_by_group: group_user.group) }
       fab!(:topic) { Fabricate(:topic, category: category) }
       fab!(:p1) { Fabricate(:post, user: group_user.user, post_number: 1, topic: topic) }
       fab!(:p2) { Fabricate(:post, user: group_user.user, post_number: 2, topic: topic) }
       fab!(:dest_topic) { Fabricate(:topic) }
 
-      let(:user) { group_user.user }
+      let!(:user) { group_user.user }
 
       before do
         sign_in(user)
@@ -332,9 +335,6 @@ RSpec.describe TopicsController do
       end
 
       it "does not allow posts to be moved to a private category" do
-        staff_category = Fabricate(:category)
-        staff_category.set_permissions(staff: :full)
-        staff_category.save!
         dest_topic.update!(category: staff_category)
 
         post "/t/#{topic.id}/move-posts.json", params: {
@@ -358,9 +358,9 @@ RSpec.describe TopicsController do
     end
 
     describe 'moving to a new message' do
-      let!(:message) { Fabricate(:private_message_topic) }
-      let!(:p1) { Fabricate(:post, user: user, post_number: 1, topic: message) }
-      let!(:p2) { Fabricate(:post, user: user, post_number: 2, topic: message) }
+      fab!(:message) { Fabricate(:private_message_topic) }
+      fab!(:p1) { Fabricate(:post, user: user, post_number: 1, topic: message) }
+      fab!(:p2) { Fabricate(:post, user: user, post_number: 2, topic: message) }
 
       it "raises an error without post_ids" do
         sign_in(moderator)
@@ -446,10 +446,10 @@ RSpec.describe TopicsController do
     describe 'moving to an existing message' do
       let!(:user) { sign_in(admin) }
       fab!(:evil_trout) { Fabricate(:evil_trout) }
-      let(:message) { Fabricate(:private_message_topic) }
-      let(:p2) { Fabricate(:post, user: evil_trout, post_number: 2, topic: message) }
+      fab!(:message) { Fabricate(:private_message_topic) }
+      fab!(:p2) { Fabricate(:post, user: evil_trout, post_number: 2, topic: message) }
 
-      let(:dest_message) do
+      fab!(:dest_message) do
         Fabricate(:private_message_topic, user: trust_level_4, topic_allowed_users: [
           Fabricate.build(:topic_allowed_user, user: evil_trout)
         ])
@@ -457,7 +457,6 @@ RSpec.describe TopicsController do
 
       context 'success' do
         it "returns success" do
-          user
           post "/t/#{message.id}/move-posts.json", params: {
             post_ids: [p2.id],
             destination_topic_id: dest_message.id,
@@ -496,8 +495,9 @@ RSpec.describe TopicsController do
     end
 
     describe 'merging into another topic' do
-      let(:p1) { Fabricate(:post, user: user) }
-      let(:topic) { p1.topic }
+      fab!(:p1) { Fabricate(:post, user: user) }
+      fab!(:topic) { p1.topic }
+      fab!(:dest_topic) { Fabricate(:topic) }
 
       it "raises an error without destination_topic_id" do
         sign_in(moderator)
@@ -511,8 +511,6 @@ RSpec.describe TopicsController do
         expect(response).to be_forbidden
       end
 
-      let(:dest_topic) { Fabricate(:topic) }
-
       context 'moves all the posts to the destination topic' do
         it "returns success" do
           sign_in(moderator)
@@ -529,13 +527,12 @@ RSpec.describe TopicsController do
     end
 
     describe "merging into another topic as a group moderator" do
-      fab!(:group_user) { Fabricate(:group_user) }
       fab!(:category) { Fabricate(:category, reviewable_by_group: group_user.group) }
       fab!(:topic) { Fabricate(:topic, category: category) }
       fab!(:p1) { Fabricate(:post, post_number: 1, topic: topic) }
       fab!(:p2) { Fabricate(:post, post_number: 2, topic: topic) }
       fab!(:dest_topic) { Fabricate(:topic) }
-      let(:user) { group_user.user }
+      let!(:user) { group_user.user }
 
       before do
         sign_in(user)
@@ -554,9 +551,6 @@ RSpec.describe TopicsController do
       end
 
       it "does not allow posts to be moved to a private category" do
-        staff_category = Fabricate(:category)
-        staff_category.set_permissions(staff: :full)
-        staff_category.save!
         dest_topic.update!(category: staff_category)
 
         post "/t/#{topic.id}/merge-topic.json", params: {
@@ -578,9 +572,15 @@ RSpec.describe TopicsController do
     end
 
     describe 'merging into another message' do
-      let(:message) { Fabricate(:private_message_topic, user: user) }
-      let!(:p1) { Fabricate(:post, topic: message, user: trust_level_4) }
-      let!(:p2) { Fabricate(:post, topic: message, reply_to_post_number: p1.post_number, user: user) }
+      fab!(:message) { Fabricate(:private_message_topic, user: user) }
+      fab!(:p1) { Fabricate(:post, topic: message, user: trust_level_4) }
+      fab!(:p2) { Fabricate(:post, topic: message, reply_to_post_number: p1.post_number, user: user) }
+
+      fab!(:dest_message) do
+        Fabricate(:private_message_topic, user: trust_level_4, topic_allowed_users: [
+          Fabricate.build(:topic_allowed_user, user: moderator)
+        ])
+      end
 
       it "raises an error without destination_topic_id" do
         sign_in(moderator)
@@ -599,12 +599,6 @@ RSpec.describe TopicsController do
         expect(response).to be_forbidden
       end
 
-      let(:dest_message) do
-        Fabricate(:private_message_topic, user: trust_level_4, topic_allowed_users: [
-          Fabricate.build(:topic_allowed_user, user: moderator)
-        ])
-      end
-
       context 'moves all the posts to the destination message' do
         it "returns success" do
           sign_in(moderator)
@@ -658,10 +652,10 @@ RSpec.describe TopicsController do
 
     describe 'changing ownership' do
       let!(:editor) { sign_in(admin) }
-      let(:topic) { Fabricate(:topic) }
+      fab!(:topic) { Fabricate(:topic) }
       fab!(:user_a) { Fabricate(:user) }
-      let(:p1) { Fabricate(:post, topic: topic) }
-      let(:p2) { Fabricate(:post, topic: topic) }
+      fab!(:p1) { Fabricate(:post, topic: topic) }
+      fab!(:p2) { Fabricate(:post, topic: topic) }
 
       it "raises an error with a parameter missing" do
         [
@@ -736,7 +730,7 @@ RSpec.describe TopicsController do
   end
 
   describe '#change_timestamps' do
-    let(:params) { { timestamp: Time.zone.now } }
+    let!(:params) { { timestamp: Time.zone.now } }
 
     it 'needs you to be logged in' do
       put "/t/1/change-timestamp.json", params: params
@@ -760,8 +754,8 @@ RSpec.describe TopicsController do
         sign_in(moderator)
       end
 
-      let(:old_timestamp) { Time.zone.now }
-      let(:new_timestamp) { old_timestamp - 1.day }
+      let!(:old_timestamp) { Time.zone.now }
+      let!(:new_timestamp) { old_timestamp - 1.day }
       let!(:topic) { Fabricate(:topic, created_at: old_timestamp) }
       let!(:p1) { Fabricate(:post, topic: topic, created_at: old_timestamp) }
       let!(:p2) { Fabricate(:post, topic: topic, created_at: old_timestamp + 1.day) }
@@ -802,8 +796,9 @@ RSpec.describe TopicsController do
     end
 
     context 'when logged in' do
-      let(:topic) { Fabricate(:topic) }
-      let(:pm) { Fabricate(:private_message_topic) }
+      fab!(:topic) { Fabricate(:topic) }
+      fab!(:pm) { Fabricate(:private_message_topic) }
+
       before do
         sign_in(user)
       end
@@ -833,7 +828,7 @@ RSpec.describe TopicsController do
     end
 
     describe 'when logged in as a moderator' do
-      let(:topic) { Fabricate(:topic) }
+      fab!(:topic) { Fabricate(:topic) }
       before do
         sign_in(moderator)
       end
@@ -882,10 +877,9 @@ RSpec.describe TopicsController do
     end
 
     describe 'when logged in as a group member with reviewable status' do
-      fab!(:group_user) { Fabricate(:group_user) }
       fab!(:category) { Fabricate(:category, reviewable_by_group: group_user.group) }
       fab!(:topic) { Fabricate(:topic, category: category) }
-      let(:user) { group_user.user }
+      let!(:user) { group_user.user }
 
       before do
         sign_in(user)
@@ -940,14 +934,45 @@ RSpec.describe TopicsController do
         expect(topic.posts.last.action_code).to eq('archived.disabled')
       end
 
-      it 'should not allow a group moderator to pin a topic' do
+      it 'should allow a group moderator to pin a topic' do
         put "/t/#{topic.id}/status.json", params: {
-          status: 'pinned', enabled: 'true'
+          status: 'pinned', enabled: 'true', until: 2.weeks.from_now
         }
 
-        expect(response.status).to eq(403)
+        expect(response.status).to eq(200)
+        expect(topic.reload.pinned_at).to_not eq(nil)
+      end
+
+      it 'should allow a group moderator to unpin a topic' do
+        put "/t/#{topic.id}/status.json", params: {
+          status: 'pinned', enabled: 'false'
+        }
+
+        expect(response.status).to eq(200)
         expect(topic.reload.pinned_at).to eq(nil)
       end
+
+      it 'should allow a group moderator to unlist a topic' do
+        put "/t/#{topic.id}/status.json", params: {
+          status: 'visible', enabled: 'false'
+        }
+
+        expect(response.status).to eq(200)
+        expect(topic.reload.visible).to eq(false)
+        expect(topic.posts.last.action_code).to eq('visible.disabled')
+      end
+
+      it 'should allow a group moderator to list an unlisted topic' do
+        topic.update!(visible: false)
+
+        put "/t/#{topic.id}/status.json", params: {
+          status: 'visible', enabled: 'true'
+        }
+
+        expect(response.status).to eq(200)
+        expect(topic.reload.visible).to eq(true)
+        expect(topic.posts.last.action_code).to eq('visible.enabled')
+      end
     end
   end
 
@@ -1066,7 +1091,7 @@ RSpec.describe TopicsController do
     end
 
     describe 'when logged in' do
-      let(:topic) { Fabricate(:topic, user: user, deleted_at: Time.now, deleted_by: moderator) }
+      let!(:topic) { Fabricate(:topic, user: user, deleted_at: Time.now, deleted_by: moderator) }
       let!(:post) { Fabricate(:post, user: user, topic: topic, post_number: 1, deleted_at: Time.now, deleted_by: moderator) }
 
       describe 'without access' do
@@ -1101,8 +1126,8 @@ RSpec.describe TopicsController do
     end
 
     describe 'when logged in' do
-      let(:topic) { Fabricate(:topic, user: user, created_at: 48.hours.ago) }
-      let!(:post) { Fabricate(:post, topic: topic, user: user, post_number: 1) }
+      fab!(:topic) { Fabricate(:topic, user: user, created_at: 48.hours.ago) }
+      fab!(:post) { Fabricate(:post, topic: topic, user: user, post_number: 1) }
 
       describe 'without access' do
         it "raises an exception when the user doesn't have permission to delete the topic" do
@@ -1128,8 +1153,8 @@ RSpec.describe TopicsController do
   end
 
   describe '#id_for_slug' do
-    let(:topic) { Fabricate(:post).topic }
-    let(:pm) { Fabricate(:private_message_topic) }
+    fab!(:topic) { Fabricate(:post).topic }
+    fab!(:pm) { Fabricate(:private_message_topic) }
 
     it "returns JSON for the slug" do
       get "/t/id_for/#{topic.slug}.json"
@@ -1153,7 +1178,7 @@ RSpec.describe TopicsController do
     end
 
     describe 'when logged in' do
-      let(:topic) { Fabricate(:topic, user: user) }
+      fab!(:topic) { Fabricate(:topic, user: user) }
 
       before do
         Fabricate(:post, topic: topic)
@@ -1162,7 +1187,6 @@ RSpec.describe TopicsController do
       end
 
       it 'can not change category to a disallowed category' do
-        category = Fabricate(:category)
         category.set_permissions(staff: :full)
         category.save!
 
@@ -1173,7 +1197,6 @@ RSpec.describe TopicsController do
       end
 
       it 'can not move to a category that requires topic approval' do
-        category = Fabricate(:category)
         category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
         category.save!
 
@@ -1183,6 +1206,19 @@ RSpec.describe TopicsController do
         expect(topic.reload.category_id).not_to eq(category.id)
       end
 
+      context 'updating shared drafts' do
+        fab!(:shared_drafts_category) { Fabricate(:category) }
+        fab!(:topic) { Fabricate(:topic, category: shared_drafts_category) }
+        fab!(:shared_draft) { Fabricate(:shared_draft, topic: topic, category: Fabricate(:category)) }
+
+        it 'changes destination category' do
+          put "/t/#{topic.id}.json", params: { category_id: category.id }
+
+          expect(response.status).to eq(403)
+          expect(topic.shared_draft.category_id).not_to eq(category.id)
+        end
+      end
+
       describe 'without permission' do
         it "raises an exception when the user doesn't have permission to update the topic" do
           topic.update!(archived: true)
@@ -1214,7 +1250,7 @@ RSpec.describe TopicsController do
         end
 
         it "can update a topic to an uncategorized topic" do
-          topic.update!(category: Fabricate(:category))
+          topic.update!(category: category)
 
           put "/t/#{topic.slug}/#{topic.id}.json", params: {
             category_id: ""
@@ -1333,7 +1369,6 @@ RSpec.describe TopicsController do
 
           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"],
@@ -1417,12 +1452,11 @@ RSpec.describe TopicsController do
         end
 
         context 'updating to a category with restricted tags' do
-          fab!(:category) { Fabricate(:category) }
           fab!(:restricted_category) { Fabricate(:category) }
           fab!(:tag1) { Fabricate(:tag) }
           fab!(:tag2) { Fabricate(:tag) }
-          let(:tag3) { Fabricate(:tag) }
-          let!(:tag_group_1) { Fabricate(:tag_group, tag_names: [tag1.name]) }
+          fab!(:tag3) { Fabricate(:tag) }
+          fab!(:tag_group_1) { Fabricate(:tag_group, tag_names: [tag1.name]) }
           fab!(:tag_group_2) { Fabricate(:tag_group) }
 
           before do
@@ -1551,8 +1585,6 @@ RSpec.describe TopicsController do
           end
 
           it "can add a category to an uncategorized topic" do
-            category = Fabricate(:category)
-
             put "/t/#{topic.slug}/#{topic.id}.json", params: {
               category_id: category.id
             }
@@ -1566,8 +1598,8 @@ RSpec.describe TopicsController do
   end
 
   describe '#show' do
-    let(:private_topic) { Fabricate(:private_message_topic) }
-    let(:topic) { Fabricate(:post).topic }
+    fab!(:private_topic) { Fabricate(:private_message_topic) }
+    let!(:topic) { Fabricate(:post).topic }
 
     let!(:p1) { Fabricate(:post, user: topic.user) }
     let!(:p2) { Fabricate(:post, user: topic.user) }
@@ -1585,14 +1617,14 @@ RSpec.describe TopicsController do
     end
 
     describe 'when topic is allowed to a group' do
-      let(:group) { Fabricate(:group, public_admission: true) }
-      let(:category) do
+      fab!(:group) { Fabricate(:group, public_admission: true) }
+      fab!(:category) do
         Fabricate(:category_with_definition).tap do |category|
           category.set_permissions(group => :full)
           category.save!
         end
       end
-      let(:topic) { Fabricate(:topic, category: category) }
+      fab!(:topic) { Fabricate(:topic, category: category) }
 
       before do
         SiteSetting.detailed_404 = true
@@ -1608,7 +1640,7 @@ RSpec.describe TopicsController do
       end
     end
 
-    it 'correctly renders canoicals' do
+    it 'correctly renders canonicals' do
       get "/t/#{topic.id}", params: { slug: topic.slug }
 
       expect(response.status).to eq(200)
@@ -1713,9 +1745,9 @@ RSpec.describe TopicsController do
 
     context 'permission errors' do
       fab!(:allowed_user) { Fabricate(:user) }
-      let(:allowed_group) { Fabricate(:group) }
-      let(:accessible_group) { Fabricate(:group, public_admission: true) }
-      let(:secure_category) do
+      fab!(:allowed_group) { Fabricate(:group) }
+      fab!(:accessible_group) { Fabricate(:group, public_admission: true) }
+      fab!(:secure_category) do
         c = Fabricate(:category)
         c.permissions = [[allowed_group, :full]]
         c.save
@@ -1723,26 +1755,26 @@ RSpec.describe TopicsController do
         allowed_user.save
         c
       end
-      let(:accessible_category) do
+      fab!(:accessible_category) do
         Fabricate(:category).tap do |c|
           c.set_permissions(accessible_group => :full)
           c.save!
         end
       end
-      let(:normal_topic) { Fabricate(:topic) }
-      let(:secure_topic) { Fabricate(:topic, category: secure_category) }
-      let(:private_topic) { Fabricate(:private_message_topic, user: allowed_user) }
+      fab!(:normal_topic) { Fabricate(:topic) }
+      fab!(:secure_topic) { Fabricate(:topic, category: secure_category) }
+      fab!(:private_topic) { Fabricate(:private_message_topic, user: allowed_user) }
       let(:deleted_topic) { Fabricate(:deleted_topic) }
       let(:deleted_secure_topic) { Fabricate(:topic, category: secure_category, deleted_at: 1.day.ago) }
       let(:deleted_private_topic) { Fabricate(:private_message_topic, user: allowed_user, deleted_at: 1.day.ago) }
-      let(:nonexist_topic_id) { Topic.last.id + 10000 }
-      let(:secure_accessible_topic) { Fabricate(:topic, category: accessible_category) }
+      let!(:nonexist_topic_id) { Topic.last.id + 10000 }
+      fab!(:secure_accessible_topic) { Fabricate(:topic, category: accessible_category) }
 
       shared_examples "various scenarios" do |expected|
         expected.each do |key, value|
           it "returns #{value} for #{key}" do
-            slug = key == :nonexist ? "garbage-slug" : eval(key.to_s).slug
-            topic_id = key == :nonexist ? nonexist_topic_id : eval(key.to_s).id
+            slug = key == :nonexist ? "garbage-slug" : send(key.to_s).slug
+            topic_id = key == :nonexist ? nonexist_topic_id : send(key.to_s).id
             get "/t/#{slug}/#{topic_id}.json"
             expect(response.status).to eq(value)
           end
@@ -2096,6 +2128,78 @@ RSpec.describe TopicsController do
       end
     end
 
+    describe '#show filters' do
+      fab!(:post) { Fabricate(:post) }
+      fab!(:topic) { post.topic }
+      fab!(:post2) { Fabricate(:post, topic: topic) }
+
+      describe 'filter by replies to a post' do
+        fab!(:post3) { Fabricate(:post, topic: topic, reply_to_post_number: post2.post_number) }
+        fab!(:post4) { Fabricate(:post, topic: topic, reply_to_post_number: post2.post_number) }
+        fab!(:post5) { Fabricate(:post, topic: topic) }
+        fab!(:quote_reply) { Fabricate(:basic_reply, user: user, topic: topic) }
+        fab!(:post_reply) { PostReply.create(post_id: post2.id, reply_post_id: quote_reply.id) }
+
+        it 'should return the right posts' do
+          get "/t/#{topic.id}.json", params: {
+            replies_to_post_number: post2.post_number
+          }
+
+          expect(response.status).to eq(200)
+
+          body = response.parsed_body
+
+          expect(body.has_key?("suggested_topics")).to eq(false)
+          expect(body.has_key?("related_messages")).to eq(false)
+
+          ids = body["post_stream"]["posts"].map { |p| p["id"] }
+          expect(ids).to eq([post.id, post2.id, post3.id, post4.id, quote_reply.id])
+        end
+      end
+
+      describe 'filter upwards by post id' do
+        fab!(:post3) { Fabricate(:post, topic: topic) }
+        fab!(:post4) { Fabricate(:post, topic: topic, reply_to_post_number: post3.post_number) }
+        fab!(:post5) { Fabricate(:post, topic: topic, reply_to_post_number: post4.post_number) }
+        fab!(:post6) { Fabricate(:post, topic: topic) }
+
+        it 'should return the right posts' do
+          get "/t/#{topic.id}.json", params: {
+            filter_upwards_post_id: post5.id
+          }
+
+          expect(response.status).to eq(200)
+
+          body = response.parsed_body
+
+          expect(body.has_key?("suggested_topics")).to eq(false)
+          expect(body.has_key?("related_messages")).to eq(false)
+
+          ids = body["post_stream"]["posts"].map { |p| p["id"] }
+          # includes topic OP, current post and subsequent posts
+          # but only one level of parents, respecting default max_reply_history = 1
+          expect(ids).to eq([post.id, post4.id, post5.id, post6.id])
+        end
+
+        it 'should respect max_reply_history site setting' do
+          SiteSetting.max_reply_history = 2
+
+          get "/t/#{topic.id}.json", params: {
+            filter_upwards_post_id: post5.id
+          }
+
+          expect(response.status).to eq(200)
+
+          body = response.parsed_body
+          ids = body["post_stream"]["posts"].map { |p| p["id"] }
+
+          # includes 2 levels of replies (post3 and post4)
+          expect(ids).to eq([post.id, post3.id, post4.id, post5.id, post6.id])
+        end
+      end
+
+    end
+
     context "when 'login required' site setting has been enabled" do
       before { SiteSetting.login_required = true }
 
@@ -2273,8 +2377,8 @@ RSpec.describe TopicsController do
   end
 
   describe '#post_ids' do
-    let(:post) { Fabricate(:post) }
-    let(:topic) { post.topic }
+    fab!(:post) { Fabricate(:post) }
+    fab!(:topic) { post.topic }
 
     before do
       TopicView.stubs(:chunk_size).returns(1)
@@ -2297,9 +2401,9 @@ RSpec.describe TopicsController do
 
     describe 'filtering by post number with filters' do
       describe 'username filters' do
-        let(:post) { Fabricate(:post, user: user) }
-        let!(:post2) { Fabricate(:post, topic: topic, user: user) }
-        let!(:post3) { Fabricate(:post, topic: topic) }
+        fab!(:post) { Fabricate(:post, user: user) }
+        fab!(:post2) { Fabricate(:post, topic: topic, user: user) }
+        fab!(:post3) { Fabricate(:post, topic: topic) }
 
         it 'should return the right posts' do
           get "/t/#{topic.id}/post_ids.json", params: {
@@ -2316,8 +2420,8 @@ RSpec.describe TopicsController do
       end
 
       describe 'summary filter' do
-        let!(:post2) { Fabricate(:post, topic: topic, percent_rank: 0.2) }
-        let!(:post3) { Fabricate(:post, topic: topic) }
+        fab!(:post2) { Fabricate(:post, topic: topic, percent_rank: 0.2) }
+        fab!(:post3) { Fabricate(:post, topic: topic) }
 
         it 'should return the right posts' do
           get "/t/#{topic.id}/post_ids.json", params: {
@@ -2332,12 +2436,35 @@ RSpec.describe TopicsController do
           expect(body["post_ids"]).to eq([post2.id])
         end
       end
+
+      describe 'custom filters' do
+        fab!(:post2) { Fabricate(:post, topic: topic, percent_rank: 0.2) }
+        fab!(:post3) { Fabricate(:post, topic: topic, percent_rank: 0.5) }
+        it 'should return the right posts' do
+          TopicView.add_custom_filter("percent") do |posts, topic_view|
+            posts.where(percent_rank: 0.5)
+          end
+
+          get "/t/#{topic.id}.json", params: {
+            post_number: post.post_number,
+            filter: 'percent'
+          }
+
+          expect(response.status).to eq(200)
+
+          body = response.parsed_body
+
+          expect(body["post_stream"]["posts"].map { |p| p["id"] }).to eq([post3.id])
+        ensure
+          TopicView.instance_variable_set(:@custom_filters, {})
+        end
+      end
     end
   end
 
   describe '#posts' do
-    let(:post) { Fabricate(:post) }
-    let(:topic) { post.topic }
+    fab!(:post) { Fabricate(:post) }
+    fab!(:topic) { post.topic }
 
     after do
       Discourse.redis.flushdb
@@ -2365,8 +2492,8 @@ RSpec.describe TopicsController do
 
     describe 'filtering by post number with filters' do
       describe 'username filters' do
-        let!(:post2) { Fabricate(:post, topic: topic, user: user) }
-        let!(:post3) { Fabricate(:post, topic: topic) }
+        fab!(:post2) { Fabricate(:post, topic: topic, user: user) }
+        fab!(:post3) { Fabricate(:post, topic: topic) }
 
         it 'should return the right posts' do
           TopicView.stubs(:chunk_size).returns(2)
@@ -2386,8 +2513,8 @@ RSpec.describe TopicsController do
       end
 
       describe 'summary filter' do
-        let!(:post2) { Fabricate(:post, topic: topic, percent_rank: 0.2) }
-        let!(:post3) { Fabricate(:post, topic: topic) }
+        fab!(:post2) { Fabricate(:post, topic: topic, percent_rank: 0.2) }
+        fab!(:post3) { Fabricate(:post, topic: topic) }
 
         it 'should return the right posts' do
           TopicView.stubs(:chunk_size).returns(2)
@@ -2409,7 +2536,7 @@ RSpec.describe TopicsController do
   end
 
   describe '#feed' do
-    let(:topic) { Fabricate(:post).topic }
+    fab!(:topic) { Fabricate(:post).topic }
 
     it 'renders rss of the topic' do
       get "/t/foo/#{topic.id}.rss"
@@ -2424,10 +2551,60 @@ RSpec.describe TopicsController do
       expect(response.body).to_not include("/forum/forum")
       expect(response.body).to include("http://test.localhost/forum/t/#{topic.slug}")
     end
+
+    it 'returns 404 when posts are deleted' do
+      topic.posts.each(&:trash!)
+      get "/t/foo/#{topic.id}.rss"
+      expect(response.status).to eq(404)
+    end
+
+    it 'returns 404 when the topic is deleted' do
+      topic.trash!
+      get "/t/foo/#{topic.id}.rss"
+      expect(response.status).to eq(404)
+    end
+  end
+
+  describe '#invite_notify' do
+    let(:user2) { Fabricate(:user) }
+
+    it 'does not notify same user multiple times' do
+      sign_in(user)
+
+      expect { post "/t/#{topic.id}/invite-notify.json", params: { usernames: [user2.username] } }
+        .to change { Notification.count }.by(1)
+      expect(response.status).to eq(200)
+
+      expect { post "/t/#{topic.id}/invite-notify.json", params: { usernames: [user2.username] } }
+        .to change { Notification.count }.by(0)
+      expect(response.status).to eq(200)
+
+      freeze_time 1.day.from_now
+
+      expect { post "/t/#{topic.id}/invite-notify.json", params: { usernames: [user2.username] } }
+        .to change { Notification.count }.by(1)
+      expect(response.status).to eq(200)
+    end
+
+    it 'does not let regular users to notify multiple users' do
+      sign_in(user)
+
+      expect { post "/t/#{topic.id}/invite-notify.json", params: { usernames: [admin.username, user2.username] } }
+        .to change { Notification.count }.by(0)
+      expect(response.status).to eq(400)
+    end
+
+    it 'lets staff to notify multiple users' do
+      sign_in(admin)
+
+      expect { post "/t/#{topic.id}/invite-notify.json", params: { usernames: [user.username, user2.username] } }
+        .to change { Notification.count }.by(2)
+      expect(response.status).to eq(200)
+    end
   end
 
   describe '#invite_group' do
-    let(:admins) { Group[:admins] }
+    let!(:admins) { Group[:admins] }
 
     before do
       sign_in(admin)
@@ -2514,9 +2691,11 @@ RSpec.describe TopicsController do
     end
 
     describe "when logged in" do
+      fab!(:tag) { Fabricate(:tag) }
+
       before { sign_in(user) }
-      let(:operation) { { type: 'change_category', category_id: '1' } }
-      let(:topic_ids) { [1, 2, 3] }
+      let!(:operation) { { type: 'change_category', category_id: '1' } }
+      let!(:topic_ids) { [1, 2, 3] }
 
       it "requires a list of topic_ids or filter" do
         put "/topics/bulk.json", params: { operation: operation }
@@ -2534,7 +2713,6 @@ RSpec.describe TopicsController do
       end
 
       it "can mark sub-categories unread" do
-        category = Fabricate(:category)
         sub = Fabricate(:category, parent_category_id: category.id)
 
         topic.update!(category_id: sub.id)
@@ -2554,7 +2732,6 @@ RSpec.describe TopicsController do
       end
 
       it "can mark tag topics unread" do
-        tag = Fabricate(:tag)
         TopicTag.create!(
           topic_id: topic.id,
           tag_id: tag.id
@@ -2594,7 +2771,6 @@ RSpec.describe TopicsController do
 
       it "respects the tracked parameter" do
         # untracked topic
-        category = Fabricate(:category)
         CategoryUser.set_notification_level_for_category(user,
                                                      NotificationLevels.all[:regular],
                                                      category.id)
@@ -2710,8 +2886,9 @@ RSpec.describe TopicsController do
 
       old_date = 2.years.ago
       user.user_stat.update_column(:new_since, old_date)
+      user.update_column(:created_at, old_date)
 
-      TopicTrackingState.expects(:publish_dismiss_new).with(user.id)
+      TopicTrackingState.expects(:publish_dismiss_new).with(user.id, topic_ids: [topic.id])
 
       put "/topics/reset-new.json"
       expect(response.status).to eq(200)
@@ -2744,35 +2921,62 @@ RSpec.describe TopicsController do
         tracked_topic.update!(category_id: tracked_category.id)
 
         create_post # This is a new post, but is not tracked so a record will not be created for it
-        expect { put "/topics/reset-new.json?tracked=true" }.to change { TopicUser.where(user_id: user.id, last_read_post_number: 0).count }.by(1)
+        expect { put "/topics/reset-new.json?tracked=true" }.to change { DismissedTopicUser.where(user_id: user.id).count }.by(1)
       end
     end
 
     context 'category' do
-      fab!(:category) { Fabricate(:category) }
       fab!(:subcategory) { Fabricate(:category, parent_category_id: category.id) }
+      fab!(:category_topic) { Fabricate(:topic, category: category) }
+      fab!(:subcategory_topic) { Fabricate(:topic, category: subcategory) }
 
-      it 'updates last_seen_at for main category' do
+      it 'dismisses topics for main category' do
         sign_in(user)
-        category_user = CategoryUser.create!(category_id: category.id, user_id: user.id)
-        subcategory_user = CategoryUser.create!(category_id: subcategory.id, user_id: user.id)
 
-        TopicTrackingState.expects(:publish_dismiss_new).with(user.id, category.id.to_s)
+        TopicTrackingState.expects(:publish_dismiss_new).with(user.id, topic_ids: [category_topic.id])
 
         put "/topics/reset-new.json?category_id=#{category.id}"
 
-        expect(category_user.reload.last_seen_at).not_to be_nil
-        expect(subcategory_user.reload.last_seen_at).to be_nil
+        expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to eq([category_topic.id])
       end
 
-      it 'updates last_seen_at for main category and subcategories' do
+      it 'dismisses topics for main category and subcategories' do
         sign_in(user)
-        category_user = CategoryUser.create!(category_id: category.id, user_id: user.id)
-        subcategory_user = CategoryUser.create!(category_id: subcategory.id, user_id: user.id)
+
+        TopicTrackingState.expects(:publish_dismiss_new).with(user.id, topic_ids: [subcategory_topic.id, category_topic.id])
+
         put "/topics/reset-new.json?category_id=#{category.id}&include_subcategories=true"
 
-        expect(category_user.reload.last_seen_at).not_to be_nil
-        expect(subcategory_user.reload.last_seen_at).not_to be_nil
+        expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id).sort).to eq([category_topic.id, subcategory_topic.id].sort)
+      end
+    end
+
+    context 'tag' do
+      fab!(:tag) { Fabricate(:tag) }
+      fab!(:tag_topic) { Fabricate(:topic) }
+      fab!(:topic_tag) { Fabricate(:topic_tag, topic: tag_topic, tag: tag) }
+      fab!(:topic) { Fabricate(:topic) }
+
+      it 'dismisses topics for tag' do
+        sign_in(user)
+        TopicTrackingState.expects(:publish_dismiss_new).with(user.id, topic_ids: [tag_topic.id])
+        put "/topics/reset-new.json?tag_id=#{tag.name}"
+        expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to eq([tag_topic.id])
+      end
+    end
+
+    context 'tag and category' do
+      fab!(:tag) { Fabricate(:tag) }
+      fab!(:tag_topic) { Fabricate(:topic) }
+      fab!(:tag_and_category_topic) { Fabricate(:topic, category: category) }
+      fab!(:topic_tag) { Fabricate(:topic_tag, topic: tag_topic, tag: tag) }
+      fab!(:topic_tag2) { Fabricate(:topic_tag, topic: tag_and_category_topic, tag: tag) }
+
+      it 'dismisses topics for tag' do
+        sign_in(user)
+        TopicTrackingState.expects(:publish_dismiss_new).with(user.id, topic_ids: [tag_and_category_topic.id])
+        put "/topics/reset-new.json?tag_id=#{tag.name}&category_id=#{category.id}"
+        expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to eq([tag_and_category_topic.id])
       end
     end
   end
@@ -2830,8 +3034,8 @@ RSpec.describe TopicsController do
     end
 
     describe 'converting public topic to private message' do
-      let(:topic) { Fabricate(:topic, user: user) }
-      let!(:post) { Fabricate(:post, topic: topic) }
+      fab!(:topic) { Fabricate(:topic, user: user) }
+      fab!(:post) { Fabricate(:post, topic: topic) }
 
       it "raises an error when the user doesn't have permission to convert topic" do
         sign_in(user)
@@ -2856,8 +3060,8 @@ RSpec.describe TopicsController do
     end
 
     describe 'converting private message to public topic' do
-      let(:topic) { Fabricate(:private_message_topic, user: user) }
-      let!(:post) { Fabricate(:post, topic: topic) }
+      fab!(:topic) { Fabricate(:private_message_topic, user: user) }
+      fab!(:post) { Fabricate(:post, topic: topic) }
 
       it "raises an error when the user doesn't have permission to convert topic" do
         sign_in(user)
@@ -2866,8 +3070,6 @@ RSpec.describe TopicsController do
       end
 
       context "success" do
-        fab!(:category) { Fabricate(:category) }
-
         it "returns success" do
           sign_in(admin)
           put "/t/#{topic.id}/convert-topic/public.json?category_id=#{category.id}"
@@ -2886,7 +3088,7 @@ RSpec.describe TopicsController do
   end
 
   describe '#timings' do
-    let(:post_1) { Fabricate(:post, topic: topic) }
+    fab!(:post_1) { Fabricate(:post, topic: topic) }
 
     it 'should record the timing' do
       sign_in(user)
@@ -2905,6 +3107,29 @@ RSpec.describe TopicsController do
       expect(post_timing.user).to eq(user)
       expect(post_timing.msecs).to eq(2)
     end
+
+    it 'caps post read time at the max integer value (2^31 - 1)' do
+      PostTiming.create!(
+        topic_id: post_1.topic.id,
+        post_number: post_1.post_number,
+        user_id: user.id,
+        msecs: 2**31 - 10
+      )
+      sign_in(user)
+
+      post "/topics/timings.json", params: {
+        topic_id: topic.id,
+        topic_time: 5,
+        timings: { post_1.post_number => 100 }
+      }
+
+      expect(response.status).to eq(200)
+      post_timing = PostTiming.first
+
+      expect(post_timing.topic).to eq(topic)
+      expect(post_timing.user).to eq(user)
+      expect(post_timing.msecs).to eq(2**31 - 1)
+    end
   end
 
   describe '#timer' do
@@ -2932,6 +3157,19 @@ RSpec.describe TopicsController do
       end
     end
 
+    context 'when time is in the past' do
+      it 'returns an error' do
+        freeze_time
+        sign_in(admin)
+
+        post "/t/#{topic.id}/timer.json", params: {
+          time: Time.current - 1.day,
+          status_type: TopicTimer.types[1]
+        }
+        expect(response.status).to eq(400)
+      end
+    end
+
     context 'when logged in as an admin' do
       before do
         freeze_time
@@ -2956,7 +3194,7 @@ RSpec.describe TopicsController do
         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)
+        expect(json['duration_minutes']).to eq(topic_status_update.duration_minutes)
         expect(json['closed']).to eq(topic.reload.closed)
       end
 
@@ -2974,13 +3212,13 @@ RSpec.describe TopicsController do
         json = response.parsed_body
 
         expect(json['execute_at']).to eq(nil)
-        expect(json['duration']).to eq(nil)
+        expect(json['duration_minutes']).to eq(nil)
         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,
+          duration_minutes: 7200,
           status_type: TopicTimer.types[7]
         }
 
@@ -2990,14 +3228,14 @@ RSpec.describe TopicsController do
 
         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)
+        expect(topic_status_update.duration_minutes).to eq(7200)
 
         json = response.parsed_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)
+        expect(json['duration_minutes']).to eq(topic_status_update.duration_minutes)
       end
 
       it 'should be able to delete a topic status update for delete_replies type' do
@@ -3121,6 +3359,54 @@ RSpec.describe TopicsController do
         expect(topic.slow_mode_seconds).to eq(3600)
       end
     end
+
+    context 'auto-disable slow mode' do
+      before { sign_in(admin) }
+
+      let!(:timestamp) { 1.week.from_now.to_formatted_s(:iso8601) }
+
+      it 'sets a topic timer to clear the slow mode automatically' do
+        put "/t/#{topic.id}/slow_mode.json", params: {
+          seconds: '3600', enabled_until: timestamp
+        }
+
+        created_timer = TopicTimer.find_by(topic: topic)
+        execute_at = created_timer.execute_at.to_formatted_s(:iso8601)
+
+        expect(execute_at).to eq(timestamp)
+      end
+
+      it 'deletes the topic timer' do
+        put "/t/#{topic.id}/slow_mode.json", params: {
+          seconds: '3600', enabled_until: timestamp
+        }
+
+        put "/t/#{topic.id}/slow_mode.json", params: {
+          seconds: '0', enabled_until: timestamp
+        }
+
+        created_timer = TopicTimer.find_by(topic: topic)
+
+        expect(created_timer).to be_nil
+      end
+
+      it 'updates the existing timer' do
+        put "/t/#{topic.id}/slow_mode.json", params: {
+          seconds: '3600', enabled_until: timestamp
+        }
+
+        updated_timestamp = 1.hour.from_now.to_formatted_s(:iso8601)
+
+        put "/t/#{topic.id}/slow_mode.json", params: {
+          seconds: '3600', enabled_until: updated_timestamp
+        }
+
+        created_timer = TopicTimer.find_by(topic: topic)
+        execute_at = created_timer.execute_at.to_formatted_s(:iso8601)
+
+        expect(execute_at).to eq(updated_timestamp)
+      end
+    end
   end
 
   describe '#invite' do
@@ -3140,7 +3426,7 @@ RSpec.describe TopicsController do
       end
 
       describe 'as a valid user' do
-        let(:topic) { Fabricate(:topic, user: user) }
+        fab!(:topic) { Fabricate(:topic, user: user) }
 
         it 'should return the right response' do
           user.update!(trust_level: TrustLevel[2])
@@ -3152,18 +3438,19 @@ RSpec.describe TopicsController do
           end.to change { Invite.where(invited_by_id: user.id).count }.by(1)
 
           expect(response.status).to eq(200)
+          expect(Jobs::InviteEmail.jobs.first['args'].first['invite_to_topic']).to be_truthy
         end
       end
 
       describe 'when user is a group manager' do
-        let(:group) { Fabricate(:group).tap { |g| g.add_owner(user) } }
-        let(:private_category)  { Fabricate(:private_category, group: group) }
+        fab!(:group) { Fabricate(:group).tap { |g| g.add_owner(user) } }
+        fab!(:private_category)  { Fabricate(:private_category, group: group) }
 
-        let(:group_private_topic) do
+        fab!(:group_private_topic) do
           Fabricate(:topic, category: private_category, user: user)
         end
 
-        let(:recipient) { 'jake@adventuretime.ooo' }
+        let!(:recipient) { 'jake@adventuretime.ooo' }
 
         it "should attach group to the invite" do
           post "/t/#{group_private_topic.id}/invite.json", params: {
@@ -3225,9 +3512,9 @@ RSpec.describe TopicsController do
 
       describe "when PM has reached maximum allowed numbers of recipients" do
         fab!(:user2) { Fabricate(:user) }
-        let(:pm) { Fabricate(:private_message_topic, user: user) }
+        fab!(:pm) { Fabricate(:private_message_topic, user: user) }
 
-        let(:moderator_pm) { Fabricate(:private_message_topic, user: moderator) }
+        fab!(:moderator_pm) { Fabricate(:private_message_topic, user: moderator) }
 
         before do
           SiteSetting.max_allowed_message_recipients = 2
@@ -3254,7 +3541,7 @@ RSpec.describe TopicsController do
       end
 
       describe 'when user does not have permission to invite to the topic' do
-        let(:topic) { Fabricate(:private_message_topic) }
+        fab!(:topic) { Fabricate(:private_message_topic) }
 
         it "should return the right response" do
           post "/t/#{topic.id}/invite.json", params: {
@@ -3267,7 +3554,7 @@ RSpec.describe TopicsController do
     end
 
     describe "when inviting a group to a topic" do
-      let(:group) { Fabricate(:group) }
+      fab!(:group) { Fabricate(:group) }
 
       before do
         sign_in(admin)
@@ -3290,8 +3577,8 @@ RSpec.describe TopicsController do
   end
 
   describe 'invite_group' do
-    let(:admins) { Group[:admins] }
-    let(:pm) { Fabricate(:private_message_topic) }
+    let!(:admins) { Group[:admins] }
+    fab!(:pm) { Fabricate(:private_message_topic) }
 
     def invite_group(topic, expected_status)
       post "/t/#{topic.id}/invite-group.json", params: { group: admins.name }
@@ -3346,10 +3633,10 @@ RSpec.describe TopicsController do
     end
 
     context "when PM has reached maximum allowed numbers of recipients" do
-      let(:group) { Fabricate(:group, messageable_level: 99) }
-      let(:pm) { Fabricate(:private_message_topic, user: user) }
+      fab!(:group) { Fabricate(:group, messageable_level: 99) }
+      fab!(:pm) { Fabricate(:private_message_topic, user: user) }
 
-      let(:moderator_pm) { Fabricate(:private_message_topic, user: moderator) }
+      fab!(:moderator_pm) { Fabricate(:private_message_topic, user: moderator) }
 
       before do
         SiteSetting.max_allowed_message_recipients = 2
@@ -3377,16 +3664,15 @@ RSpec.describe TopicsController do
   end
 
   describe 'shared drafts' do
-    let(:shared_drafts_category) { Fabricate(:category) }
+    fab!(:shared_drafts_category) { Fabricate(:category) }
 
     before do
       SiteSetting.shared_drafts_category = shared_drafts_category.id
     end
 
     describe "#update_shared_draft" do
-      let(:other_cat) { Fabricate(:category) }
-      let(:category) { Fabricate(:category) }
-      let(:topic) { Fabricate(:topic, category: shared_drafts_category, visible: false) }
+      fab!(:other_cat) { Fabricate(:category) }
+      fab!(:topic) { Fabricate(:topic, category: shared_drafts_category, visible: false) }
 
       context "anonymous" do
         it "doesn't allow staff to update the shared draft" do
@@ -3401,7 +3687,7 @@ RSpec.describe TopicsController do
         end
 
         context "with a shared draft" do
-          let!(:shared_draft) { Fabricate(:shared_draft, topic: topic, category: category) }
+          fab!(:shared_draft) { Fabricate(:shared_draft, topic: topic, category: category) }
           it "allows staff to update the category id" do
             put "/t/#{topic.id}/shared-draft.json", params: { category_id: other_cat.id }
             expect(response.status).to eq(200)
@@ -3422,9 +3708,8 @@ RSpec.describe TopicsController do
     end
 
     describe "#publish" do
-      let(:category) { Fabricate(:category) }
-      let(:topic) { Fabricate(:topic, category: shared_drafts_category, visible: false) }
-      let!(:post) { Fabricate(:post, topic: topic) }
+      fab!(:topic) { Fabricate(:topic, category: shared_drafts_category, visible: false) }
+      fab!(:post) { Fabricate(:post, topic: topic) }
 
       it "fails for anonymous users" do
         put "/t/#{topic.id}/publish.json", params: { destination_category_id: category.id }
@@ -3451,6 +3736,11 @@ RSpec.describe TopicsController do
           expect(result.category_id).to eq(category.id)
           expect(result.visible).to eq(true)
         end
+
+        it 'fails if the destination category is the shared drafts category' do
+          put "/t/#{topic.id}/publish.json", params: { destination_category_id: shared_drafts_category.id }
+          expect(response.status).to eq(400)
+        end
       end
     end
   end
@@ -3519,7 +3809,7 @@ RSpec.describe TopicsController do
 
       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)" }
+        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 }
@@ -3547,7 +3837,7 @@ RSpec.describe TopicsController do
 
   describe "#reset_bump_date" do
     context "errors" do
-      let(:topic) { Fabricate(:topic) }
+      fab!(:topic) { Fabricate(:topic) }
 
       it "needs you to be logged in" do
         put "/t/#{topic.id}/reset-bump-date.json"
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index ca4d257bfa..9b7201ad78 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -127,8 +127,8 @@ describe UploadsController do
         expect(response.status).to eq(422)
       end
 
-      it 'ensures sso_overrides_avatar is not enabled when uploading an avatar' do
-        SiteSetting.sso_overrides_avatar = true
+      it 'ensures discourse_connect_overrides_avatar is not enabled when uploading an avatar' do
+        SiteSetting.discourse_connect_overrides_avatar = true
         post "/uploads.json", params: { file: logo, type: "avatar" }
         expect(response.status).to eq(422)
       end
@@ -365,6 +365,13 @@ describe UploadsController do
         expect(response.status).to eq(200)
       end
 
+      it "returns uploads with a dash and uppercase in extension correctly" do
+        fake_upload = upload_file("fake.long-FileExtension")
+        get fake_upload.short_path
+
+        expect(response.status).to eq(200)
+      end
+
       it "returns the right response when anon tries to download a file " \
         "when prevent_anons_from_downloading_files is true" do
 
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index efa3e7904d..4bbf1fdeac 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -230,7 +230,7 @@ describe UsersController do
         end
 
         expect(events.map { |event| event[:event_name] }).to contain_exactly(
-          :user_logged_in, :user_first_logged_in
+          :user_logged_in, :user_first_logged_in, :user_confirmed_email
         )
 
         expect(response.status).to eq(200)
@@ -782,6 +782,18 @@ describe UsersController do
           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]))
+          expect(json['user_id']).not_to be_present
+
+          existing.destroy!
+          expect {
+            post_user
+          }.to change { User.count }
+          expect(response.status).to eq(200)
+          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]))
+          expect(json['user_id']).not_to be_present
         end
       end
     end
@@ -1059,8 +1071,8 @@ describe UsersController do
         end
 
         it "doesn't use provided username/name if sso_overrides is enabled" do
-          SiteSetting.sso_overrides_username = true
-          SiteSetting.sso_overrides_name = true
+          SiteSetting.auth_overrides_username = true
+          SiteSetting.auth_overrides_name = true
           post "/u.json", params: {
             username: "attemptednewname",
             name: "Attempt At New Name",
@@ -1451,17 +1463,17 @@ describe UsersController do
         expect(response.parsed_body['username']).to eq(new_username)
       end
 
-      it 'should respond with proper error message if sso_overrides_username is enabled' do
-        SiteSetting.sso_url = 'http://someurl.com'
-        SiteSetting.enable_sso = true
-        SiteSetting.sso_overrides_username = true
+      it 'should respond with proper error message if auth_overrides_username is enabled' do
+        SiteSetting.discourse_connect_url = 'http://someurl.com'
+        SiteSetting.enable_discourse_connect = true
+        SiteSetting.auth_overrides_username = true
         acting_user = Fabricate(:admin)
         sign_in(acting_user)
 
         put "/u/#{user.username}/preferences/username.json", params: { new_username: new_username }
 
         expect(response.status).to eq(422)
-        expect(response.parsed_body['errors'].first).to include(I18n.t('errors.messages.sso_overrides_username'))
+        expect(response.parsed_body['errors'].first).to include(I18n.t('errors.messages.auth_overrides_username'))
       end
     end
   end
@@ -1572,25 +1584,40 @@ describe UsersController do
     end
   end
 
-  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(422)
+  describe '#check_email' do
+    it 'returns success if hide_email_address_taken is true' do
+      SiteSetting.hide_email_address_taken = true
+
+      get "/u/check_email.json", params: { email: user.email }
+      expect(response.parsed_body["success"]).to be_present
     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)
-      Fabricate(:invited_user, invite: _invite, user: invitee)
-      get "/u/#{user.username}/invited_count.json"
-      expect(response.status).to eq(200)
+    it 'returns success if email is empty' do
+      get "/u/check_email.json"
+      expect(response.parsed_body["success"]).to be_present
+    end
 
-      json = response.parsed_body
-      expect(json).to be_present
-      expect(json['counts']).to be_present
+    it 'returns failure if email is not valid' do
+      get "/u/check_email.json", params: { email: "invalid" }
+      expect(response.parsed_body["failed"]).to be_present
+    end
+
+    it 'returns failure if email exists' do
+      get "/u/check_email.json", params: { email: user.email }
+      expect(response.parsed_body["failed"]).to be_present
+
+      get "/u/check_email.json", params: { email: user.email.upcase }
+      expect(response.parsed_body["failed"]).to be_present
+    end
+
+    it 'returns success if email does not exists' do
+      get "/u/check_email.json", params: { email: "available@example.com" }
+      expect(response.parsed_body["success"]).to be_present
+    end
+
+    it 'return success if user email is taken by staged user' do
+      get "/u/check_email.json", params: { email: Fabricate(:staged).email }
+      expect(response.parsed_body["success"]).to be_present
     end
   end
 
@@ -1604,10 +1631,14 @@ describe UsersController do
 
     it 'returns success' do
       user = Fabricate(:user, trust_level: 2)
+      Fabricate(:invite, invited_by: user)
+
       sign_in(user)
       get "/u/#{user.username}/invited.json", params: { username: user.username }
 
       expect(response.status).to eq(200)
+      expect(response.parsed_body["counts"]["pending"]).to eq(1)
+      expect(response.parsed_body["counts"]["total"]).to eq(1)
     end
 
     it 'filters by all if viewing self' do
@@ -1736,6 +1767,31 @@ describe UsersController do
             expect(response.status).to eq(422)
           end
         end
+
+        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}/invited/pending.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}/invited/pending.json"
+            expect(response.status).to eq(403)
+          end
+        end
       end
 
       context 'with redeemed invites' do
@@ -1754,48 +1810,6 @@ describe UsersController do
           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
-
-        context 'when local logins are disabled' do
-          it 'explains why invites are disabled to staff users' do
-            SiteSetting.enable_local_logins = false
-            inviter = sign_in(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(200)
-
-            expect(response.parsed_body['error']).to include(I18n.t(
-              'invite.disabled_errors.local_logins_disabled'
-            ))
-          end
-        end
-      end
     end
   end
 
@@ -1963,6 +1977,38 @@ describe UsersController do
             end
           end
 
+          context "with user_notification_schedule attributes" do
+            it "updates the user's notification schedule" do
+              params = {
+                user_notification_schedule: {
+                  enabled: true,
+                  day_0_start_time: 30,
+                  day_0_end_time: 60,
+                  day_1_start_time: 30,
+                  day_1_end_time: 60,
+                  day_2_start_time: 30,
+                  day_2_end_time: 60,
+                  day_3_start_time: 30,
+                  day_3_end_time: 60,
+                  day_4_start_time: 30,
+                  day_4_end_time: 60,
+                  day_5_start_time: 30,
+                  day_5_end_time: 60,
+                  day_6_start_time: 30,
+                  day_6_end_time: 60,
+                }
+              }
+              put "/u/#{user.username}.json", params: params
+
+              user.reload
+              expect(user.user_notification_schedule.enabled).to eq(true)
+              expect(user.user_notification_schedule.day_0_start_time).to eq(30)
+              expect(user.user_notification_schedule.day_0_end_time).to eq(60)
+              expect(user.user_notification_schedule.day_6_start_time).to eq(30)
+              expect(user.user_notification_schedule.day_6_end_time).to eq(60)
+            end
+          end
+
           context "uneditable field" do
             let!(:user_field) { Fabricate(:user_field, editable: false) }
 
@@ -2299,8 +2345,8 @@ describe UsersController do
         expect(response).to be_forbidden
       end
 
-      it "raises an error when sso_overrides_avatar is disabled" do
-        SiteSetting.sso_overrides_avatar = true
+      it "raises an error when discourse_connect_overrides_avatar is disabled" do
+        SiteSetting.discourse_connect_overrides_avatar = true
         put "/u/#{user.username}/preferences/avatar/pick.json", params: {
           upload_id: upload.id, type: "custom"
         }
@@ -2317,6 +2363,29 @@ describe UsersController do
         expect(response.status).to eq(422)
       end
 
+      it 'ignores the upload if picking a system avatar' do
+        SiteSetting.allow_uploaded_avatars = false
+        another_upload = Fabricate(:upload)
+
+        put "/u/#{user.username}/preferences/avatar/pick.json", params: {
+          upload_id: another_upload.id, type: "system"
+        }
+
+        expect(response.status).to eq(200)
+        expect(user.reload.uploaded_avatar_id).to eq(nil)
+      end
+
+      it 'raises an error if the type is invalid' do
+        SiteSetting.allow_uploaded_avatars = false
+        another_upload = Fabricate(:upload)
+
+        put "/u/#{user.username}/preferences/avatar/pick.json", params: {
+          upload_id: another_upload.id, type: "x"
+        }
+
+        expect(response.status).to eq(422)
+      end
+
       it 'can successfully pick the system avatar' do
         put "/u/#{user.username}/preferences/avatar/pick.json"
 
@@ -2324,6 +2393,20 @@ describe UsersController do
         expect(user.reload.uploaded_avatar_id).to eq(nil)
       end
 
+      it 'disables the use_site_small_logo_as_system_avatar setting when picking an avatar for the system user' do
+        system_user = Discourse.system_user
+        SiteSetting.use_site_small_logo_as_system_avatar = true
+        another_upload = Fabricate(:upload, user: system_user)
+        sign_in(system_user)
+
+        put "/u/#{system_user.username}/preferences/avatar/pick.json", params: {
+          upload_id: another_upload.id, type: "uploaded"
+        }
+
+        expect(response.status).to eq(200)
+        expect(SiteSetting.use_site_small_logo_as_system_avatar).to eq(false)
+      end
+
       it 'can successfully pick a gravatar' do
 
         user.user_avatar.update_columns(gravatar_upload_id: upload.id)
@@ -2425,6 +2508,19 @@ describe UsersController do
             expect(user.reload.uploaded_avatar_id).to eq(avatar1.id)
             expect(user.user_avatar.reload.custom_upload_id).to eq(avatar1.id)
           end
+
+          it 'disables the use_site_small_logo_as_system_avatar setting when picking an avatar for the system user' do
+            system_user = Discourse.system_user
+            SiteSetting.use_site_small_logo_as_system_avatar = true
+            sign_in(system_user)
+
+            put "/u/#{system_user.username}/preferences/avatar/select.json", params: {
+              url: UrlHelper.cook_url(avatar1.url)
+            }
+
+            expect(response.status).to eq(200)
+            expect(SiteSetting.use_site_small_logo_as_system_avatar).to eq(false)
+          end
         end
       end
     end
@@ -2715,6 +2811,34 @@ describe UsersController do
     end
   end
 
+  describe '#check_sso_payload' do
+    it 'raises an error when not logged in' do
+      get "/u/zogstrip/sso-payload.json"
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+      let(:sign_in_admin) { sign_in(Fabricate(:admin)) }
+      let(:user) { Fabricate(:user) }
+
+      it "raises an error when you aren't allowed to check sso payload" do
+        sign_in(Fabricate(:user))
+        get "/u/#{user.username}/sso-payload.json"
+        expect(response).to be_forbidden
+      end
+
+      it "returns SSO payload when you're allowed to see" do
+        user.single_sign_on_record = SingleSignOnRecord.create(user_id: user.id, external_email: "foobar@example.com", external_id: "example", last_payload: "foobar")
+        sign_in_admin
+
+        get "/u/#{user.username}/sso-payload.json"
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["payload"]).to eq("foobar")
+      end
+    end
+  end
+
   describe '#update_primary_email' do
     fab!(:user) { Fabricate(:user) }
     fab!(:user_email) { user.primary_email }
@@ -2773,6 +2897,31 @@ describe UsersController do
       expect(event[:event_name]).to eq(:user_updated)
       expect(event[:params].first).to eq(user)
     end
+
+    it "can destroy unconfirmed emails" do
+      request_1 = EmailChangeRequest.create!(
+        user: user,
+        new_email: user_email.email,
+        change_state: EmailChangeRequest.states[:authorizing_new]
+      )
+
+      EmailChangeRequest.create!(
+        user: user,
+        new_email: other_email.email,
+        change_state: EmailChangeRequest.states[:authorizing_new]
+      )
+
+      EmailChangeRequest.create!(
+        user: user,
+        new_email: other_email.email,
+        change_state: EmailChangeRequest.states[:authorizing_new]
+      )
+
+      delete "/u/#{user.username}/preferences/email.json", params: { email: other_email.email }
+
+      expect(user.user_emails.pluck(:email)).to contain_exactly(user_email.email, other_email.email)
+      expect(user.email_change_requests).to contain_exactly(request_1)
+    end
   end
 
   describe '#is_local_username' do
@@ -2935,6 +3084,54 @@ describe UsersController do
         expect(response.status).to eq(200)
       end
     end
+
+    context 'avatar flair in Most... sections' do
+      it "returns data for automatic groups flair" do
+        liker = Fabricate(:user, admin: true, moderator: true, trust_level: 1)
+        create_and_like_post(user, liker)
+
+        get "/u/#{user.username_lower}/summary.json"
+        json = response.parsed_body
+
+        expect(json["user_summary"]["most_liked_by_users"][0]["admin"]).to eq(true)
+        expect(json["user_summary"]["most_liked_by_users"][0]["moderator"]).to eq(true)
+        expect(json["user_summary"]["most_liked_by_users"][0]["trust_level"]).to eq(1)
+      end
+
+      it "returns data for primary group flair when an icon is used for flair" do
+        group = Fabricate(:group, name: "Groupie", flair_bg_color: "#111111", flair_color: "#999999", flair_icon: "icon")
+        liker = Fabricate(:user, primary_group: group)
+        create_and_like_post(user, liker)
+
+        get "/u/#{user.username_lower}/summary.json"
+        json = response.parsed_body
+
+        expect(json["user_summary"]["most_liked_by_users"][0]["primary_group_flair_url"]).to eq("icon")
+        expect(json["user_summary"]["most_liked_by_users"][0]["primary_group_name"]).to eq("Groupie")
+        expect(json["user_summary"]["most_liked_by_users"][0]["primary_group_flair_bg_color"]).to eq("#111111")
+        expect(json["user_summary"]["most_liked_by_users"][0]["primary_group_flair_color"]).to eq("#999999")
+      end
+
+      it "returns data for primary group flair when an image is used for flair" do
+        upload = Fabricate(:upload)
+        group = Fabricate(:group, name: "Groupie", flair_bg_color: "#111111", flair_upload: upload)
+        liker = Fabricate(:user, primary_group: group)
+        create_and_like_post(user, liker)
+
+        get "/u/#{user.username_lower}/summary.json"
+        json = response.parsed_body
+
+        expect(json["user_summary"]["most_liked_by_users"][0]["primary_group_flair_url"]).to eq(upload.url)
+        expect(json["user_summary"]["most_liked_by_users"][0]["primary_group_name"]).to eq("Groupie")
+        expect(json["user_summary"]["most_liked_by_users"][0]["primary_group_flair_bg_color"]).to eq("#111111")
+      end
+
+      def create_and_like_post(likee, liker)
+        UserActionManager.enable
+        post = create_post(user: likee)
+        PostActionCreator.like(liker, post)
+      end
+    end
   end
 
   describe '#confirm_admin' do
@@ -3905,8 +4102,8 @@ describe UsersController do
 
         describe 'when SSO is enabled' do
           it 'should return the right response' do
-            SiteSetting.sso_url = 'http://someurl.com'
-            SiteSetting.enable_sso = true
+            SiteSetting.discourse_connect_url = 'http://someurl.com'
+            SiteSetting.enable_discourse_connect = true
 
             post "/users/create_second_factor_totp.json"
 
@@ -4137,8 +4334,8 @@ describe UsersController do
 
         describe 'when SSO is enabled' do
           it 'should return the right response' do
-            SiteSetting.sso_url = 'http://someurl.com'
-            SiteSetting.enable_sso = true
+            SiteSetting.discourse_connect_url = 'http://someurl.com'
+            SiteSetting.enable_discourse_connect = true
 
             put "/users/second_factors_backup.json"
 
@@ -4412,8 +4609,8 @@ describe UsersController do
 
     context 'when SSO is enabled' do
       before do
-        SiteSetting.sso_url = 'https://discourse.test/sso'
-        SiteSetting.enable_sso = true
+        SiteSetting.discourse_connect_url = 'https://discourse.test/sso'
+        SiteSetting.enable_discourse_connect = true
       end
 
       it 'does not allow access' do
@@ -4436,7 +4633,7 @@ describe UsersController do
     context 'when the site settings allow second factors' do
       before do
         SiteSetting.enable_local_logins = true
-        SiteSetting.enable_sso = false
+        SiteSetting.enable_discourse_connect = false
       end
 
       context 'when the password parameter is not provided' do
diff --git a/spec/requests/users_email_controller_spec.rb b/spec/requests/users_email_controller_spec.rb
index 769287ee94..ffb7b1f00e 100644
--- a/spec/requests/users_email_controller_spec.rb
+++ b/spec/requests/users_email_controller_spec.rb
@@ -15,6 +15,13 @@ describe UsersEmailController do
       expect(response.status).to eq(200)
     end
 
+    it 'does not redirect to login for signed out accounts on login_required sites, this route works fine as anon user' do
+      SiteSetting.login_required = true
+      get "/u/confirm-new-email/asdfasdf"
+
+      expect(response.status).to eq(200)
+    end
+
     it 'errors out for invalid tokens' do
       sign_in(user)
 
diff --git a/spec/script/import_scripts/base_spec.rb b/spec/script/import_scripts/base_spec.rb
index e7594d2fa5..a3b1199bb4 100644
--- a/spec/script/import_scripts/base_spec.rb
+++ b/spec/script/import_scripts/base_spec.rb
@@ -53,5 +53,12 @@ describe ImportScripts::Base do
     expect(Bookmark.count).to eq(5)
     expect(Post.count).to eq(5)
     expect(User.where('id > 0').count).to eq(1)
+    expect(SiteSetting.purge_unactivated_users_grace_period_days).to eq(60)
+  end
+
+  it "does not change purge unactivated users setting if disabled" do
+    SiteSetting.purge_unactivated_users_grace_period_days = 0
+    MockSpecImporter.new(import_data).perform
+    expect(SiteSetting.purge_unactivated_users_grace_period_days).to eq(0)
   end
 end
diff --git a/spec/script/import_scripts/phpbb3/support/bbcode/xml_to_markdown_spec.rb b/spec/script/import_scripts/phpbb3/support/bbcode/xml_to_markdown_spec.rb
new file mode 100644
index 0000000000..dc4e813b98
--- /dev/null
+++ b/spec/script/import_scripts/phpbb3/support/bbcode/xml_to_markdown_spec.rb
@@ -0,0 +1,817 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require Rails.root.join('script/import_scripts/phpbb3/support/bbcode/xml_to_markdown')
+
+RSpec.describe ImportScripts::PhpBB3::BBCode::XmlToMarkdown do
+  def convert(xml, opts = {})
+    described_class.new(xml, opts).convert
+  end
+
+  it "converts unformatted text" do
+    xml = '<t>unformatted text</t>'
+    expect(convert(xml)).to eq('unformatted text')
+  end
+
+  it "converts nested formatting" do
+    xml = '<r><I><s>[i]</s>this is italic<B><s>[b]</s> and bold<e>[/b]</e></B> text<e>[/i]</e></I></r>'
+    expect(convert(xml)).to eq('_this is italic **and bold** text_')
+  end
+
+  context "bold text" do
+    it "converts bold text" do
+      xml = '<r><B><s>[b]</s>this is bold text<e>[/b]</e></B></r>'
+      expect(convert(xml)).to eq('**this is bold text**')
+    end
+
+    it "converts multi-line bold text" do
+      xml = <<~XML
+        <r><B><s>[b]</s>this is bold text<br/>
+        on two lines<e>[/b]</e></B><br/>
+        <br/>
+        <B><s>[b]</s>this is bold text<br/>
+        <br/>
+        <br/>
+        with two empty lines<e>[/b]</e></B></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        **this is bold text
+        on two lines**
+
+        **this is bold text\\
+        \\
+        \\
+        with two empty lines**
+      MD
+    end
+
+    it "ignores duplicate bold text" do
+      xml = '<r><B><s>[b]</s><B><s>[b]</s>this is bold text<e>[/b]</e></B><e>[/b]</e></B></r>'
+      expect(convert(xml)).to eq('**this is bold text**')
+    end
+  end
+
+  context "italic text" do
+    it "converts italic text" do
+      xml = '<r><I><s>[i]</s>this is italic text<e>[/i]</e></I></r>'
+      expect(convert(xml)).to eq('_this is italic text_')
+    end
+
+    it "converts multi-line italic text" do
+      xml = <<~XML
+        <r><I><s>[i]</s>this is italic text<br/>
+        on two lines<e>[/i]</e></I><br/>
+        <br/>
+        <I><s>[i]</s>this is italic text<br/>
+        <br/>
+        <br/>
+        with two empty lines<e>[/i]</e></I></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        _this is italic text
+        on two lines_
+
+        _this is italic text\\
+        \\
+        \\
+        with two empty lines_
+      MD
+    end
+
+    it "ignores duplicate italic text" do
+      xml = '<r><I><s>[i]</s><I><s>[i]</s>this is italic text<e>[/i]</e></I><e>[/i]</e></I></r>'
+      expect(convert(xml)).to eq('_this is italic text_')
+    end
+  end
+
+  context "underlined text" do
+    it "converts underlined text" do
+      xml = '<r><U><s>[u]</s>this is underlined text<e>[/u]</e></U></r>'
+      expect(convert(xml)).to eq('[u]this is underlined text[/u]')
+    end
+
+    it "converts multi-line underlined text" do
+      xml = <<~XML
+        <r><U><s>[u]</s>this is underlined text<br/>
+        on two lines<e>[/u]</e></U><br/>
+        <br/>
+        <U><s>[u]</s>this is underlined text<br/>
+        <br/>
+        <br/>
+        with two empty lines<e>[/u]</e></U></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        [u]this is underlined text
+        on two lines[/u]
+
+        [u]this is underlined text\\
+        \\
+        \\
+        with two empty lines[/u]
+      MD
+    end
+
+    it "ignores duplicate underlined text" do
+      xml = '<r><U><s>[u]</s><U><s>[u]</s>this is underlined text<e>[/u]</e></U><e>[/u]</e></U></r>'
+      expect(convert(xml)).to eq('[u]this is underlined text[/u]')
+    end
+  end
+
+  context "code blocks" do
+    context "inline code blocks enabled" do
+      let(:opts) { { allow_inline_code: true } }
+
+      it "converts single line code blocks" do
+        xml = '<r><CODE><s>[code]</s>one line of code<e>[/code]</e></CODE></r>'
+        expect(convert(xml, opts)).to eq('`one line of code`')
+      end
+    end
+
+    context "inline code blocks disabled" do
+      it "converts single line code blocks" do
+        xml = '<r>foo <CODE><s>[code]</s>some code<e>[/code]</e></CODE> bar</r>'
+
+        expect(convert(xml)).to eq(<<~MD.chomp)
+          foo
+
+          ```text
+          some code
+          ```
+
+          bar
+        MD
+      end
+    end
+
+    it "converts multi-line code blocks" do
+      xml = <<~XML
+        <r><CODE><s>[code]</s><i>
+        </i> /\_/\
+        ( o.o )
+         &gt; ^ &lt;
+         <e>[/code]</e></CODE></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        ```text
+         /\_/\
+        ( o.o )
+         > ^ <
+        ```
+      MD
+    end
+
+    it "adds leading and trailing linebreaks to code blocks" do
+      xml = <<~XML
+        <r>text before code block<br/>
+
+        <CODE><s>[code]</s><i>
+        </i>foo
+
+        bar
+        <e>[/code]</e></CODE>
+
+        text after code block</r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        text before code block
+
+        ```text
+        foo
+
+        bar
+        ```
+
+        text after code block
+      MD
+    end
+  end
+
+  context "lists" do
+    it "converts unordered lists" do
+      xml = <<~XML
+        <r><LIST><s>[list]</s>
+        <LI><s>[*]</s>Red</LI>
+        <LI><s>[*]</s>Blue</LI>
+        <LI><s>[*]</s>Yellow</LI>
+        <e>[/list]</e></LIST></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        * Red
+        * Blue
+        * Yellow
+      MD
+    end
+
+    it "converts ordered lists" do
+      xml = <<~XML
+        <r><LIST type="decimal"><s>[list=1]</s>
+        <LI><s>[*]</s>Go to the shops</LI>
+        <LI><s>[*]</s>Buy a new computer</LI>
+        <LI><s>[*]</s>Swear at computer when it crashes</LI>
+        <e>[/list]</e></LIST></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        1. Go to the shops
+        2. Buy a new computer
+        3. Swear at computer when it crashes
+      MD
+    end
+
+    it "converts all types of ordered lists into regular ordered lists" do
+      xml = <<~XML
+        <r><LIST type="upper-alpha"><s>[list=A]</s>
+        <LI><s>[*]</s>The first possible answer</LI>
+        <LI><s>[*]</s>The second possible answer</LI>
+        <LI><s>[*]</s>The third possible answer</LI>
+        <e>[/list]</e></LIST></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        1. The first possible answer
+        2. The second possible answer
+        3. The third possible answer
+      MD
+    end
+
+    it "adds leading and trailing linebreaks to lists if needed" do
+      xml = <<~XML
+        <r>foo
+        <LIST><s>[list]</s>
+        <LI><s>[*]</s>Red</LI>
+        <LI><s>[*]</s>Blue</LI>
+        <LI><s>[*]</s>Yellow</LI>
+        <e>[/list]</e></LIST>
+        bar</r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        foo
+
+        * Red
+        * Blue
+        * Yellow
+
+        bar
+      MD
+    end
+
+    it "converts nested lists" do
+      xml = <<~XML
+        <r><LIST><s>[list]</s>
+        <LI><s>[*]</s>Option 1
+           <LIST><s>[list]</s>
+              <LI><s>[*]</s>Option 1.1</LI>
+              <LI><s>[*]</s>Option 1.2</LI>
+           <e>[/list]</e></LIST></LI>
+        <LI><s>[*]</s>Option 2
+           <LIST><s>[list]</s>
+              <LI><s>[*]</s>Option 2.1
+                 <LIST type="decimal"><s>[list=1]</s>
+                    <LI><s>[*]</s> Red</LI>
+                    <LI><s>[*]</s> Blue</LI>
+                 <e>[/list]</e></LIST></LI>
+              <LI><s>[*]</s>Option 2.2</LI>
+           <e>[/list]</e></LIST></LI>
+        <e>[/list]</e></LIST></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        * Option 1
+          * Option 1.1
+          * Option 1.2
+        * Option 2
+          * Option 2.1
+            1. Red
+            2. Blue
+          * Option 2.2
+      MD
+    end
+
+    it "handles nested elements and linebreaks in list items" do
+      xml = <<~XML
+        <r><LIST><s>[list]</s><LI><s>[*]</s>some text <B><s>[b]</s><I><s>[i]</s>foo<e>[/i]</e></I><e>[/b]</e></B><br/>
+        or <B><s>[b]</s><I><s>[i]</s>bar<e>[/i]</e></I><e>[/b]</e></B> more text</LI><e>[/list]</e></LIST></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        * some text **_foo_**
+        or **_bar_** more text
+      MD
+    end
+  end
+
+  context "images" do
+    it "converts image" do
+      xml = <<~XML
+        <r><IMG src="https://example.com/foo.png"><s>[img]</s>
+        <URL url="https://example.com/foo.png">
+        <LINK_TEXT text="https://example.com/foo.png">https://example.com/foo.png</LINK_TEXT>
+        </URL><e>[/img]</e></IMG></r>
+      XML
+
+      expect(convert(xml)).to eq('![](https://example.com/foo.png)')
+    end
+
+    it "converts image with link" do
+      xml = <<~XML
+        <r><URL url="https://example.com/"><s>[url=https://example.com/]</s>
+        <IMG src="https://example.com/foo.png"><s>[img]</s>
+        <LINK_TEXT text="https://example.com/foo.png">https://example.com/foo.png</LINK_TEXT>
+        <e>[/img]</e></IMG><e>[/url]</e></URL></r>
+      XML
+
+      expect(convert(xml)).to eq('[![](https://example.com/foo.png)](https://example.com/)')
+    end
+  end
+
+  context "links" do
+    it "converts links created without BBCode" do
+      xml = '<r><URL url="https://en.wikipedia.org/wiki/Capybara">https://en.wikipedia.org/wiki/Capybara</URL></r>'
+      expect(convert(xml)).to eq('https://en.wikipedia.org/wiki/Capybara')
+    end
+
+    it "converts links created with BBCode" do
+      xml = '<r><URL url="https://en.wikipedia.org/wiki/Capybara"><s>[url]</s>https://en.wikipedia.org/wiki/Capybara<e>[/url]</e></URL></r>'
+      expect(convert(xml)).to eq('https://en.wikipedia.org/wiki/Capybara')
+    end
+
+    it "converts links with link text" do
+      xml = '<r><URL url="https://en.wikipedia.org/wiki/Capybara"><s>[url=https://en.wikipedia.org/wiki/Capybara]</s>Capybara<e>[/url]</e></URL></r>'
+      expect(convert(xml)).to eq('[Capybara](https://en.wikipedia.org/wiki/Capybara)')
+    end
+
+    it "converts internal links" do
+      opts = {
+        url_replacement: lambda do |url|
+          if url == 'http://forum.example.com/viewtopic.php?f=2&t=2'
+            'https://discuss.example.com/t/welcome-topic/18'
+          end
+        end
+      }
+
+      xml = '<r><URL url="http://forum.example.com/viewtopic.php?f=2&amp;t=2"><LINK_TEXT text="viewtopic.php?f=2&amp;t=2">http://forum.example.com/viewtopic.php?f=2&amp;t=2</LINK_TEXT></URL></r>'
+      expect(convert(xml, opts)).to eq('https://discuss.example.com/t/welcome-topic/18')
+    end
+
+    it "converts email links created without BBCode" do
+      xml = '<r><EMAIL email="foo.bar@example.com">foo.bar@example.com</EMAIL></r>'
+      expect(convert(xml)).to eq('<foo.bar@example.com>')
+    end
+
+    it "converts email links created with BBCode" do
+      xml = '<r><EMAIL email="foo.bar@example.com"><s>[email]</s>foo.bar@example.com<e>[/email]</e></EMAIL></r>'
+      expect(convert(xml)).to eq('<foo.bar@example.com>')
+    end
+
+    it "converts truncated, long links" do
+      xml = <<~XML
+        <r><URL url="http://answers.yahoo.com/question/index?qid=20070920134223AAkkPli">
+        <s>[url]</s><LINK_TEXT text="http://answers.yahoo.com/question/index ... 223AAkkPli">
+        http://answers.yahoo.com/question/index?qid=20070920134223AAkkPli</LINK_TEXT>
+        <e>[/url]</e></URL></r>
+      XML
+
+      expect(convert(xml)).to eq('http://answers.yahoo.com/question/index?qid=20070920134223AAkkPli')
+    end
+
+    it "converts BBCodes inside link text" do
+      xml = <<~XML
+        <r><URL url="http://example.com"><s>[url=http://example.com]</s>
+        <B><s>[b]</s>Hello <I><s>[i]</s>world<e>[/i]</e></I>!<e>[/b]</e></B>
+        <e>[/url]</e></URL></r>
+      XML
+
+      expect(convert(xml)).to eq('[**Hello _world_!**](http://example.com)')
+    end
+  end
+
+  context "quotes" do
+    it "converts simple quote" do
+      xml = <<~XML
+        <r><QUOTE><s>[quote]</s>Lorem<br/>
+        ipsum<e>[/quote]</e></QUOTE></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        > Lorem
+        > ipsum
+      MD
+    end
+
+    it "converts quote with line breaks" do
+      xml = <<~XML
+        <r><QUOTE><s>[quote]</s>First paragraph<br/>
+        <br/>
+        Second paragraph<br/>
+        <br/>
+        <br/>
+        Third paragraph<e>[/quote]</e></QUOTE></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        > First paragraph
+        >
+        > Second paragraph
+        > \\
+        > \\
+        > Third paragraph
+      MD
+    end
+
+    it "converts quote with line breaks and nested formatting" do
+      xml = <<~XML
+        <r><QUOTE><s>[quote]</s>
+        <I><s>[i]</s>this is italic<br/>
+        <B><s>[b]</s>and bold<br/>
+        text<br/>
+        <e>[/b]</e></B> on multiple<br/>
+        <br/>
+        <br/>
+        lines<e>[/i]</e></I>
+        <e>[/quote]</e></QUOTE></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        > _this is italic
+        > **and bold
+        > text**
+        > on multiple\\
+        > \\
+        > \\
+        > lines_
+      MD
+    end
+
+    it "converts quote with author attribute" do
+      xml = '<r><QUOTE author="Mr. Blobby"><s>[quote="Mr. Blobby"]</s>Lorem ipsum<e>[/quote]</e></QUOTE></r>'
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        [quote="Mr. Blobby"]
+        Lorem ipsum
+        [/quote]
+      MD
+    end
+
+    it "converts quote with author attribute and line breaks" do
+      xml = <<~XML
+        <r><QUOTE author="Mr. Blobby"><s>[quote="Mr. Blobby"]</s>First paragraph<br/>
+        <br/>
+        Second paragraph<br/>
+        <br/>
+        Third paragraph<e>[/quote]</e></QUOTE></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        [quote="Mr. Blobby"]
+        First paragraph
+
+        Second paragraph
+
+        Third paragraph
+        [/quote]
+      MD
+    end
+
+    context "with user_id attribute" do
+      let(:opts) { { username_from_user_id: lambda { |user_id| user_id == 48 ? "mr_blobby" : nil } } }
+
+      it "uses the correct username when the user exists" do
+        xml = '<r><QUOTE author="Mr. Blobby" user_id="48"><s>[quote="Mr. Blobby" user_id=48]</s>Lorem ipsum<e>[/quote]</e></QUOTE></r>'
+
+        expect(convert(xml, opts)).to eq(<<~MD.chomp)
+          [quote="mr_blobby"]
+          Lorem ipsum
+          [/quote]
+        MD
+      end
+
+      it "uses the author name when the user does not exist" do
+        xml = '<r><QUOTE author="Mr. Blobby" user_id="49"><s>[quote="Mr. Blobby" user_id=48]</s>Lorem ipsum<e>[/quote]</e></QUOTE></r>'
+
+        expect(convert(xml, opts)).to eq(<<~MD.chomp)
+          [quote="Mr. Blobby"]
+          Lorem ipsum
+          [/quote]
+        MD
+      end
+
+      it "creates a blockquote when the user does not exist and the author is missing" do
+        xml = '<r><QUOTE user_id="49"><s>[quote=user_id=48]</s>Lorem ipsum<e>[/quote]</e></QUOTE></r>'
+        expect(convert(xml, opts)).to eq("> Lorem ipsum")
+      end
+    end
+
+    context "with post_id attribute" do
+      let(:opts) do
+        { quoted_post_from_post_id: lambda { |post_id| { username: 'mr_blobby', post_number: 3, topic_id: 951 } if post_id == 43 } }
+      end
+
+      it "uses information from the quoted post if the post exists" do
+        xml = <<~XML
+          <r><QUOTE author="Mr. Blobby" post_id="43" time="1534626128" user_id="48">
+          <s>[quote="Mr. Blobby" post_id=43 time=1534626128 user_id=48]</s>Lorem ipsum<e>[/quote]</e>
+          </QUOTE></r>
+        XML
+
+        expect(convert(xml, opts)).to eq(<<~MD.chomp)
+          [quote="mr_blobby, post:3, topic:951"]
+          Lorem ipsum
+          [/quote]
+        MD
+      end
+
+      it "uses other attributes when post doesn't exist" do
+        xml = <<~XML
+          <r><QUOTE author="Mr. Blobby" post_id="44" time="1534626128" user_id="48">
+          <s>[quote="Mr. Blobby" post_id=44 time=1534626128 user_id=48]</s>Lorem ipsum<e>[/quote]</e>
+          </QUOTE></r>
+        XML
+
+        expect(convert(xml, opts)).to eq(<<~MD.chomp)
+          [quote="Mr. Blobby"]
+          Lorem ipsum
+          [/quote]
+        MD
+      end
+    end
+
+    it "converts nested quotes" do
+      xml = <<~XML
+        <r>Multiple nested quotes:<br/>
+
+          <QUOTE author="user3">
+            <s>[quote=user3]</s>
+            <QUOTE author="user2">
+              <s>[quote=user2]</s>
+              <QUOTE author="user1">
+                <s>[quote=user1]</s>
+                <B><s>[b]</s>foo <I><s>[i]</s>and<e>[/i]</e></I> bar<e>[/b]</e></B>
+                <e>[/quote]</e>
+              </QUOTE>
+
+              Lorem ipsum
+              <e>[/quote]</e>
+            </QUOTE>
+
+            nested quotes
+            <e>[/quote]</e>
+          </QUOTE>
+
+          Text after quotes.
+        </r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        Multiple nested quotes:
+
+        [quote="user3"]
+        [quote="user2"]
+        [quote="user1"]
+        **foo _and_ bar**
+        [/quote]
+
+        Lorem ipsum
+        [/quote]
+
+        nested quotes
+        [/quote]
+
+        Text after quotes.
+      MD
+    end
+  end
+
+  it "converts smilies" do
+    opts = {
+      smilie_to_emoji: lambda do |smilie|
+        case smilie
+        when ':D'
+          ':smiley:'
+        when ':eek:'
+          ':astonished:'
+        end
+      end
+    }
+
+    xml = '<r><E>:D</E> <E>:eek:</E></r>'
+    expect(convert(xml, opts)).to eq(":smiley: :astonished:")
+  end
+
+  context "attachments" do
+    it "converts attachments" do
+      opts = {
+        upload_md_from_file: lambda do |filename, index|
+          url = \
+            case index
+            when 0 then
+              "upload://hash2.png"
+            when 1 then
+              "upload://hash1.png"
+            end
+
+          "![#{filename}|231x231](#{url})"
+        end
+      }
+
+      xml = <<~XML
+        <r>Multiple attachments:
+        <ATTACHMENT filename="image1.png" index="1"><s>[attachment=1]</s>image1.png<e>[/attachment]</e></ATTACHMENT>
+        This is an inline image.<br/>
+        <br/>
+        And another one:
+        <ATTACHMENT filename="image2.png" index="0"><s>[attachment=0]</s>image2.png<e>[/attachment]</e></ATTACHMENT></r>
+      XML
+
+      expect(convert(xml, opts)).to eq(<<~MD.chomp)
+        Multiple attachments:
+        ![image1.png|231x231](upload://hash1.png)
+        This is an inline image.
+
+        And another one:
+        ![image2.png|231x231](upload://hash2.png)
+      MD
+    end
+  end
+
+  context "line breaks" do
+    it "converts line breaks" do
+      xml = <<~XML
+      <t>Lorem ipsum dolor sit amet.<br/>
+      <br/>
+      Consetetur sadipscing elitr.<br/>
+      <br/>
+      <br/>
+      Sed diam nonumy eirmod tempor.<br/>
+      <br/>
+      <br/>
+      <br/>
+      <br/>
+      Invidunt ut labore et dolore.</t>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        Lorem ipsum dolor sit amet.
+
+        Consetetur sadipscing elitr.
+        \\
+        \\
+        Sed diam nonumy eirmod tempor.
+        \\
+        \\
+        \\
+        \\
+        Invidunt ut labore et dolore.
+      MD
+    end
+
+    it "uses hard linebreaks when tradition line breaks are enabled" do
+      xml = <<~XML
+      <t>Lorem ipsum dolor sit amet.<br/>
+      Consetetur sadipscing elitr.<br/>
+      <br/>
+      Sed diam nonumy eirmod tempor.<br/>
+      <br/>
+      <br/>
+      <br/>
+      Invidunt ut labore et dolore.</t>
+      XML
+
+      expect(convert(xml, traditional_linebreaks: true)).to eq(<<~MD.chomp)
+        Lorem ipsum dolor sit amet.\\
+        Consetetur sadipscing elitr.\\
+        \\
+        Sed diam nonumy eirmod tempor.\\
+        \\
+        \\
+        \\
+        Invidunt ut labore et dolore.
+      MD
+    end
+
+    it "uses <br> in front of block elements" do
+      xml = <<~XML
+        <r>text before 4 empty lines<br/>
+        <br/>
+        <br/>
+        <br/>
+
+        <CODE><s>[code]</s>some code<e>[/code]</e></CODE>
+        text before 3 empty lines<br/>
+        <br/>
+        <br/>
+
+        <LIST><s>[list]</s>
+        <LI><s>[*]</s> item 1</LI>
+        <LI><s>[*]</s> item 2</LI>
+        <e>[/list]</e></LIST>
+        text before 2 empty lines<br/>
+        <br/>
+
+        <LIST><s>[list]</s>
+        <LI><s>[*]</s> item 1</LI>
+        <LI><s>[*]</s> item 2</LI>
+        <e>[/list]</e></LIST></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.chomp)
+        text before 4 empty lines
+        \\
+        \\
+        \\
+        <br>
+        ```text
+        some code
+        ```
+
+        text before 3 empty lines
+        \\
+        \\
+        <br>
+        * item 1
+        * item 2
+
+        text before 2 empty lines
+        \\
+        <br>
+        * item 1
+        * item 2
+      MD
+    end
+  end
+
+  context "whitespace" do
+    it "doesn't strip whitespaces from inline tags" do
+      xml = <<~XML
+        <r>Lorem<B><s>[b]</s> ipsum <e>[/b]</e></B>dolor<br/>
+        <I><s>[i]</s> sit <e>[/i]</e></I>amet,<br/>
+        consetetur<B><s>[b]</s> sadipscing <e>[/b]</e></B></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.rstrip)
+        Lorem **ipsum** dolor
+        _sit_ amet,
+        consetetur **sadipscing**
+      MD
+    end
+
+    it "preserves whitespace between tags" do
+      xml = "<r>foo <B><s>[b]</s>bold<e>[/b]</e></B> <I><s>[i]</s>italic<e>[/i]</e></I> <U><s>[u]</s>underlined<e>[/u]</e></U> bar</r>"
+      expect(convert(xml)).to eq("foo **bold** _italic_ [u]underlined[/u] bar")
+    end
+  end
+
+  context "unknown element" do
+    it "converts an unknown element right below the root element" do
+      xml = '<r><UNKNOWN><s>[unknown]</s>foo<e>[/unknown]</e></UNKNOWN></r>'
+      expect(convert(xml)).to eq('foo')
+    end
+
+    it "converts an unknown element inside a known element" do
+      xml = '<r><B><s>[b]</s><UNKNOWN><s>[unknown]</s>bar<e>[/unknown]</e></UNKNOWN><e>[/b]</e></B></r>'
+      expect(convert(xml)).to eq('**bar**')
+    end
+  end
+
+  context "font size" do
+    it "converts sizes to either <small> or <big>" do
+      xml = <<~XML
+        <r><SIZE size="50"><s>[size=50]</s>very small<e>[/size]</e></SIZE><br/>
+        <SIZE size="85"><s>[size=85]</s>small<e>[/size]</e></SIZE><br/>
+        <SIZE size="150"><s>[size=150]</s>large<e>[/size]</e></SIZE><br/>
+        <SIZE size="200"><s>[size=200]</s>very large<e>[/size]</e></SIZE></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.rstrip)
+        <small>very small</small>
+        <small>small</small>
+        <big>large</big>
+        <big>very large</big>
+      MD
+    end
+
+    it "ignores invalid sizes" do
+      xml = <<~XML
+        <r><SIZE size="-50"><s>[size=-50]</s>negative number<e>[/size]</e></SIZE><br/>
+        <SIZE size="0"><s>[size=0]</s>zero<e>[/size]</e></SIZE><br/>
+        <SIZE size="300"><s>[size=300]</s>too large<e>[/size]</e></SIZE><br/>
+        <SIZE size="abc"><s>[size=abc]</s>not a number<e>[/size]</e></SIZE><br/>
+        <SIZE><s>[size]</s>no size<e>[/size]</e></SIZE></r>
+      XML
+
+      expect(convert(xml)).to eq(<<~MD.rstrip)
+        negative number
+        zero
+        too large
+        not a number
+        no size
+      MD
+    end
+  end
+end
diff --git a/spec/script/import_scripts/vanilla_body_parser_spec.rb b/spec/script/import_scripts/vanilla_body_parser_spec.rb
index 771abab86d..d0a3dd32eb 100644
--- a/spec/script/import_scripts/vanilla_body_parser_spec.rb
+++ b/spec/script/import_scripts/vanilla_body_parser_spec.rb
@@ -37,6 +37,24 @@ describe VanillaBodyParser do
 this starts with spaces but IS NOT a quote'''
   end
 
+  it 'replaces pre tags with code backticks' do
+    complex_html = '<pre class="CodeBlock">foobar</pre>'
+    parsed = VanillaBodyParser.new({ 'Format' => 'Html', 'Body' => complex_html }, user_id).parse
+    expect(parsed).to eq "\n```\nfoobar\n```\n"
+  end
+
+  it 'strips code tags' do
+    complex_html = '<code>foobar</code>'
+    parsed = VanillaBodyParser.new({ 'Format' => 'Html', 'Body' => complex_html }, user_id).parse
+    expect(parsed).to eq "foobar"
+  end
+
+  it 'replaces div with quote class to bbcode quotes' do
+    complex_html = '<div class="Quote">foobar</div>'
+    parsed = VanillaBodyParser.new({ 'Format' => 'Html', 'Body' => complex_html }, user_id).parse
+    expect(parsed).to eq "\n\n[quote]\n\nfoobar\n\n[/quote]\n\n"
+  end
+
   describe 'rich format' do
     let(:rich_bodies) { JSON.parse(File.read('spec/fixtures/json/vanilla-rich-posts.json')).deep_symbolize_keys }
 
@@ -90,7 +108,7 @@ this starts with spaces but IS NOT a quote'''
 
     it 'keeps uploaded files as links' do
       parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => rich_bodies[:upload_file].to_json }, user_id).parse
-      expect(parsed).to eq "This is a PDF I've uploaded:\n\n[original_name_of_file.pdf](https:\/\/vanilla.sampleforum.org\/uploads\/393\/5QR3BX57K7HM.pdf)"
+      expect(parsed).to eq "This is a PDF I've uploaded:\n\n<a href=\"https://vanilla.sampleforum.org/uploads/393/5QR3BX57K7HM.pdf\">original_name_of_file.pdf</a>"
     end
 
     it 'supports complex formatting' do
@@ -100,7 +118,7 @@ this starts with spaces but IS NOT a quote'''
 
     it 'support code blocks' do
       parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => rich_bodies[:code_block].to_json }, user_id).parse
-      expect(parsed).to eq "Here's a monospaced block:\n\n```this line should be monospaced\nthis one too, with extra spaces#{' ' * 4}\n```\n\nbut not this one"
+      expect(parsed).to eq "Here's a monospaced block:\n\n```\nthis line should be monospaced\nthis one too, with extra spaces#{' ' * 4}\n```\n\nbut not this one"
     end
   end
 end
diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb
index 0ff5c54e47..52049da3f9 100644
--- a/spec/serializers/current_user_serializer_spec.rb
+++ b/spec/serializers/current_user_serializer_spec.rb
@@ -27,9 +27,9 @@ RSpec.describe CurrentUserSerializer do
     end
 
     it "should include the external_id" do
-      SiteSetting.sso_url = "http://example.com/discourse_sso"
-      SiteSetting.sso_secret = "12345678910"
-      SiteSetting.enable_sso = true
+      SiteSetting.discourse_connect_url = "http://example.com/discourse_sso"
+      SiteSetting.discourse_connect_secret = "12345678910"
+      SiteSetting.enable_discourse_connect = true
       payload = serializer.as_json
       expect(payload[:external_id]).to eq("12345")
     end
@@ -138,4 +138,52 @@ RSpec.describe CurrentUserSerializer do
       expect(payload[:groups]).to eq([{ id: public_group.id, name: public_group.name }])
     end
   end
+
+  context "#has_topic_draft" do
+    fab!(:user) { Fabricate(:user) }
+    let :serializer do
+      CurrentUserSerializer.new(user, scope: Guardian.new, root: false)
+    end
+
+    it "is not included by default" do
+      payload = serializer.as_json
+      expect(payload).not_to have_key(:has_topic_draft)
+    end
+
+    it "returns true when user has a draft" do
+      Draft.set(user, Draft::NEW_TOPIC, 0, "test1")
+
+      payload = serializer.as_json
+      expect(payload[:has_topic_draft]).to eq(true)
+    end
+
+    it "clearing a draft removes has_topic_draft from payload" do
+      sequence = Draft.set(user, Draft::NEW_TOPIC, 0, "test1")
+      Draft.clear(user, Draft::NEW_TOPIC, sequence)
+
+      payload = serializer.as_json
+      expect(payload).not_to have_key(:has_topic_draft)
+    end
+
+  end
+
+  context '#can_review' do
+    it 'return false for regular users' do
+      serializer = serializer(Fabricate(:user))
+      payload = serializer.as_json
+
+      expect(payload[:can_review]).to eq(false)
+    end
+
+    it 'returns trus for staff' do
+      serializer = serializer(Fabricate(:admin))
+      payload = serializer.as_json
+
+      expect(payload[:can_review]).to eq(true)
+    end
+
+    def serializer(user)
+      CurrentUserSerializer.new(user, scope: Guardian.new(user), root: false)
+    end
+  end
 end
diff --git a/spec/serializers/emoji_serializer_spec.rb b/spec/serializers/emoji_serializer_spec.rb
new file mode 100644
index 0000000000..23104cc1ee
--- /dev/null
+++ b/spec/serializers/emoji_serializer_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe EmojiSerializer do
+  fab!(:custom_emoji) do
+    CustomEmoji.create!(name: 'trout', upload: Fabricate(:upload))
+  end
+
+  describe '#url' do
+    fab!(:emoji) do
+      Emoji.load_custom.first
+    end
+    subject { described_class.new(emoji, root: false) }
+
+    it 'returns a valid URL' do
+      expect(subject.url).to start_with('/uploads/')
+    end
+
+    it 'works with a CDN' do
+      set_cdn_url('https://cdn.com')
+      expect(subject.url).to start_with('https://cdn.com')
+    end
+  end
+
+  context "missing uploads" do
+    before do
+      custom_emoji.upload.destroy!
+    end
+
+    it "doesn't raise an error with a missing upload and a CDN" do
+      emoji = Emoji.load_custom.first
+      set_cdn_url('https://cdn.com')
+      result = described_class.new(Emoji.load_custom.first, root: false).as_json
+      expect(result[:url]).to be_blank
+    end
+
+    it "doesn't raise an error with a missing upload and an s3 CDN" do
+      emoji = Emoji.load_custom.first
+
+      SiteSetting.enable_s3_uploads = true
+      SiteSetting.s3_upload_bucket = "s3bucket"
+      SiteSetting.s3_access_key_id = "s3_access_key_id"
+      SiteSetting.s3_secret_access_key = "s3_secret_access_key"
+      SiteSetting.s3_cdn_url = "https://example.com"
+      result = described_class.new(Emoji.load_custom.first, root: false).as_json
+
+      expect(result[:url]).to be_blank
+    end
+
+  end
+
+end
diff --git a/spec/serializers/group_show_serializer_spec.rb b/spec/serializers/group_show_serializer_spec.rb
index a6acacdfdb..00308ebb4c 100644
--- a/spec/serializers/group_show_serializer_spec.rb
+++ b/spec/serializers/group_show_serializer_spec.rb
@@ -79,6 +79,7 @@ describe GroupShowSerializer do
       it 'are visible' do
         expect(subject.as_json[:email_username]).to eq('foo@bar.com')
         expect(subject.as_json[:email_password]).to eq('pa$$w0rd')
+        expect(subject.as_json[:message_count]).to eq(0)
       end
     end
   end
diff --git a/spec/serializers/notification_serializer_spec.rb b/spec/serializers/notification_serializer_spec.rb
index afa03243a0..2032b5a384 100644
--- a/spec/serializers/notification_serializer_spec.rb
+++ b/spec/serializers/notification_serializer_spec.rb
@@ -29,9 +29,9 @@ describe NotificationSerializer do
     let(:json) { serializer.as_json }
 
     it "should include the external_id" do
-      SiteSetting.sso_url = "http://example.com/discourse_sso"
-      SiteSetting.sso_secret = "12345678910"
-      SiteSetting.enable_sso = true
+      SiteSetting.discourse_connect_url = "http://example.com/discourse_sso"
+      SiteSetting.discourse_connect_secret = "12345678910"
+      SiteSetting.enable_discourse_connect = true
       expect(json[:notification][:external_id]).to eq("12345")
     end
   end
diff --git a/spec/serializers/single_sign_on_record_serializer_spec.rb b/spec/serializers/single_sign_on_record_serializer_spec.rb
index fffb6dff6b..0d2b50e0c8 100644
--- a/spec/serializers/single_sign_on_record_serializer_spec.rb
+++ b/spec/serializers/single_sign_on_record_serializer_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe SingleSignOnRecordSerializer do
   fab!(:user) { Fabricate(:user) }
   let :sso do
-    SingleSignOnRecord.create!(user_id: user.id, external_id: '12345', external_email: user.email, last_payload: '')
+    SingleSignOnRecord.create!(user_id: user.id, external_id: '12345', external_email: user.email, last_payload: 'foobar')
   end
 
   context "admin" do
@@ -21,4 +21,18 @@ RSpec.describe SingleSignOnRecordSerializer do
       expect(payload[:external_email]).to be_nil
     end
   end
+
+  context "moderator" do
+    let(:moderator) { Fabricate(:moderator) }
+    let :serializer do
+      SingleSignOnRecordSerializer.new(sso, scope: Guardian.new(moderator), root: false)
+    end
+
+    it "should not include user sso payload" do
+      payload = serializer.as_json
+      expect(payload[:user_id]).to eq(user.id)
+      expect(payload[:external_id]).to eq('12345')
+      expect(payload[:last_payload]).to be_nil
+    end
+  end
 end
diff --git a/spec/serializers/site_serializer_spec.rb b/spec/serializers/site_serializer_spec.rb
index 6c1783587f..1a53cfd11f 100644
--- a/spec/serializers/site_serializer_spec.rb
+++ b/spec/serializers/site_serializer_spec.rb
@@ -59,4 +59,14 @@ describe SiteSerializer do
     serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
     expect(serialized[:default_dark_color_scheme]).to eq(nil)
   end
+
+  it 'does not include shared_drafts_category_id if the category is Uncategorized' do
+    admin = Fabricate(:admin)
+    admin_guardian = Guardian.new(admin)
+
+    SiteSetting.shared_drafts_category = SiteSetting.uncategorized_category_id
+
+    serialized = described_class.new(Site.new(admin_guardian), scope: admin_guardian, root: false).as_json
+    expect(serialized[:shared_drafts_category_id]).to eq(nil)
+  end
 end
diff --git a/spec/serializers/theme_serializer_spec.rb b/spec/serializers/theme_serializer_spec.rb
index 78fa138f02..69557c2c52 100644
--- a/spec/serializers/theme_serializer_spec.rb
+++ b/spec/serializers/theme_serializer_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe ThemeSerializer do
   describe "load theme settings" do
-    it 'should add error message when having invalid format' do
+    it 'should add error message when settings format is invalid' do
       theme = Fabricate(:theme)
       Theme.any_instance.stubs(:settings).raises(ThemeSettingsParser::InvalidYaml, I18n.t("themes.settings_errors.invalid_yaml"))
       serialized = ThemeSerializer.new(theme).as_json[:theme]
@@ -12,5 +12,14 @@ RSpec.describe ThemeSerializer do
       expect(serialized[:errors].count).to eq(1)
       expect(serialized[:errors][0]).to eq(I18n.t("themes.settings_errors.invalid_yaml"))
     end
+
+    it 'should add errors messages from theme fields' do
+      error = "error when compiling theme field"
+      theme = Fabricate(:theme)
+      theme_field = Fabricate(:theme_field, error: error, theme: theme)
+      serialized = ThemeSerializer.new(theme.reload).as_json[:theme]
+      expect(serialized[:errors].count).to eq(1)
+      expect(serialized[:errors][0]).to eq(error)
+    end
   end
 end
diff --git a/spec/serializers/topic_view_details_serializer_spec.rb b/spec/serializers/topic_view_details_serializer_spec.rb
new file mode 100644
index 0000000000..0705ee4e84
--- /dev/null
+++ b/spec/serializers/topic_view_details_serializer_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe TopicViewDetailsSerializer do
+  describe '#allowed_users' do
+    it "add the current user to the allowed user's list even if they are an allowed group member" do
+      participant = Fabricate(:user)
+      another_participant = Fabricate(:user)
+
+      participant_group = Fabricate(:group)
+      participant_group.add(participant)
+      participant_group.add(another_participant)
+
+      pm = Fabricate(:private_message_topic,
+        topic_allowed_users: [
+          Fabricate.build(:topic_allowed_user, user: participant),
+          Fabricate.build(:topic_allowed_user, user: another_participant)
+        ],
+        topic_allowed_groups: [Fabricate.build(:topic_allowed_group, group: participant_group)]
+      )
+
+      serializer = described_class.new(TopicView.new(pm, participant), scope: Guardian.new(participant))
+      allowed_users = serializer.as_json.dig(:topic_view_details, :allowed_users).map { |u| u[:id] }
+
+      expect(allowed_users).to contain_exactly(participant.id)
+    end
+  end
+end
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index 421b65ce37..b9a9d03e25 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -365,6 +365,27 @@ describe TopicViewSerializer do
         expect(json[:details][:can_edit_tags]).to eq(true)
       end
     end
+
+    context "can_edit" do
+      fab!(:group_user) { Fabricate(:group_user) }
+      fab!(:category) { Fabricate(:category, reviewable_by_group: group_user.group) }
+      fab!(:topic) { Fabricate(:topic, category: category) }
+      let(:user) { group_user.user }
+
+      before do
+        SiteSetting.enable_category_group_moderation = true
+      end
+
+      it 'explicitly returns can_edit' do
+        json = serialize_topic(topic, user)
+        expect(json[:details][:can_edit]).to eq(true)
+
+        topic.update!(category: nil)
+
+        json = serialize_topic(topic, user)
+        expect(json[:details][:can_edit]).to eq(false)
+      end
+    end
   end
 
   context "published_page" do
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index cad83e3ac8..7179a9985e 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -60,6 +60,7 @@ describe UserSerializer do
   end
 
   context "with a user" do
+    let(:admin_user) { Fabricate(:admin) }
     let(:scope) { Guardian.new }
     fab!(:user) { Fabricate(:user) }
     let(:serializer) { UserSerializer.new(user, scope: scope, root: false) }
@@ -67,6 +68,50 @@ describe UserSerializer do
     fab!(:upload) { Fabricate(:upload) }
     fab!(:upload2) { Fabricate(:upload) }
 
+    context "when the scope user is admin" do
+      let(:scope) { Guardian.new(admin_user) }
+
+      it "returns the user's category notification levels, not the scope user's" do
+        category1 = Fabricate(:category)
+        category2 = Fabricate(:category)
+        category3 = Fabricate(:category)
+        category4 = Fabricate(:category)
+        CategoryUser.create(category: category1, user: user, notification_level: CategoryUser.notification_levels[:muted])
+        CategoryUser.create(category: Fabricate(:category), user: admin_user, notification_level: CategoryUser.notification_levels[:muted])
+        CategoryUser.create(category: category2, user: user, notification_level: CategoryUser.notification_levels[:tracking])
+        CategoryUser.create(category: Fabricate(:category), user: admin_user, notification_level: CategoryUser.notification_levels[:tracking])
+        CategoryUser.create(category: category3, user: user, notification_level: CategoryUser.notification_levels[:watching])
+        CategoryUser.create(category: Fabricate(:category), user: admin_user, notification_level: CategoryUser.notification_levels[:watching])
+        CategoryUser.create(category: category4, user: user, notification_level: CategoryUser.notification_levels[:regular])
+        CategoryUser.create(category: Fabricate(:category), user: admin_user, notification_level: CategoryUser.notification_levels[:regular])
+
+        expect(json[:muted_category_ids]).to eq([category1.id])
+        expect(json[:tracked_category_ids]).to eq([category2.id])
+        expect(json[:watched_category_ids]).to eq([category3.id])
+        expect(json[:regular_category_ids]).to eq([category4.id])
+      end
+
+      it "returns the user's tag notification levels, not the scope user's" do
+        tag1 = Fabricate(:tag)
+        tag2 = Fabricate(:tag)
+        tag3 = Fabricate(:tag)
+        tag4 = Fabricate(:tag)
+        TagUser.create(tag: tag1, user: user, notification_level: TagUser.notification_levels[:muted])
+        TagUser.create(tag: Fabricate(:tag), user: admin_user, notification_level: TagUser.notification_levels[:muted])
+        TagUser.create(tag: tag2, user: user, notification_level: TagUser.notification_levels[:tracking])
+        TagUser.create(tag: Fabricate(:tag), user: admin_user, notification_level: TagUser.notification_levels[:tracking])
+        TagUser.create(tag: tag3, user: user, notification_level: TagUser.notification_levels[:watching])
+        TagUser.create(tag: Fabricate(:tag), user: admin_user, notification_level: TagUser.notification_levels[:watching])
+        TagUser.create(tag: tag4, user: user, notification_level: TagUser.notification_levels[:watching_first_post])
+        TagUser.create(tag: Fabricate(:tag), user: admin_user, notification_level: TagUser.notification_levels[:watching_first_post])
+
+        expect(json[:muted_tags]).to eq([tag1.name])
+        expect(json[:tracked_tags]).to eq([tag2.name])
+        expect(json[:watched_tags]).to eq([tag3.name])
+        expect(json[:watching_first_post_tags]).to eq([tag4.name])
+      end
+    end
+
     context "with `enable_names` true" do
       before do
         SiteSetting.enable_names = true
diff --git a/spec/serializers/web_hook_user_serializer_spec.rb b/spec/serializers/web_hook_user_serializer_spec.rb
index 75ca07f5b0..c26b58f7aa 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 - 50
+    difference = count - 51
 
     expect(difference).to eq(0), lambda {
       message = (difference < 0 ?
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index 310a993261..1679f06722 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -195,6 +195,16 @@ describe BadgeGranter do
       badge.query = Badge.find(1).query + "\n-- a comment"
       expect { BadgeGranter.backfill(badge) }.not_to raise_error
     end
+
+    it 'does not notify about badges "for beginners" when user skipped new user tips' do
+      user.user_option.update!(skip_new_user_tips: true)
+      post = Fabricate(:post)
+      PostActionCreator.like(user, post)
+
+      expect {
+        BadgeGranter.backfill(Badge.find(Badge::FirstLike))
+      }.to_not change { Notification.where(user_id: user.id).count }
+    end
   end
 
   describe 'grant' do
@@ -208,6 +218,12 @@ describe BadgeGranter do
       expect(Notification.where(user_id: user.id).count).to eq(0)
     end
 
+    it "handles deleted badge" do
+      freeze_time
+      user_badge = BadgeGranter.grant(nil, user, created_at: 1.year.ago)
+      expect(user_badge).to eq(nil)
+    end
+
     it "doesn't grant disabled badges" do
       freeze_time
       badge = Fabricate(:badge, badge_type_id: BadgeType::Bronze, enabled: false)
@@ -216,22 +232,25 @@ describe BadgeGranter do
       expect(user_badge).to eq(nil)
     end
 
-    it "doesn't grant 'getting started' badges when user skipped new user tips" do
+    it "doesn't notify about badges 'for beginners' when user skipped new user tips" do
       freeze_time
+      UserBadge.destroy_all
       user.user_option.update!(skip_new_user_tips: true)
       badge = Fabricate(:badge, badge_grouping_id: BadgeGrouping::GettingStarted)
 
-      user_badge = BadgeGranter.grant(badge, user, created_at: 1.year.ago)
-      expect(user_badge).to eq(nil)
+      expect {
+        BadgeGranter.grant(badge, user)
+      }.to_not change { Notification.where(user_id: user.id).count }
     end
 
-    it "grants the New User of the Month badge when user skipped new user tips" do
+    it "notifies about the New User of the Month badge when user skipped new user tips" do
       freeze_time
       user.user_option.update!(skip_new_user_tips: true)
       badge = Badge.find(Badge::NewUserOfTheMonth)
 
-      user_badge = BadgeGranter.grant(badge, user, created_at: 1.year.ago)
-      expect(user_badge).to be_present
+      expect {
+        BadgeGranter.grant(badge, user)
+      }.to change { Notification.where(user_id: user.id).count }
     end
 
     it 'grants multiple badges' do
@@ -274,6 +293,11 @@ describe BadgeGranter do
       expect(user.notifications.find_by(notification_type: Notification.types[:granted_badge]).data_hash["badge_id"]).to eq(badge.id)
     end
 
+    it 'does not fail when user is missing' do
+      BadgeGranter.grant(badge, nil)
+      expect(badge.reload.grant_count).to eq(0)
+    end
+
   end
 
   describe 'revoke' do
@@ -343,7 +367,7 @@ describe BadgeGranter do
 
     it 'removes custom badge titles' do
       custom_badge_title = 'this is a badge title'
-      TranslationOverride.create!(translation_key: badge.translation_key, value: custom_badge_title, locale: 'en_US')
+      TranslationOverride.create!(translation_key: badge.translation_key, value: custom_badge_title, locale: 'en')
       described_class.grant(badge, user)
       user.update!(title: custom_badge_title)
 
diff --git a/spec/services/dismiss_topics_spec.rb b/spec/services/dismiss_topics_spec.rb
new file mode 100644
index 0000000000..ba640ebb1e
--- /dev/null
+++ b/spec/services/dismiss_topics_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe DismissTopics do
+  fab!(:user) { Fabricate(:user, created_at: 1.days.ago) }
+  fab!(:category) { Fabricate(:category) }
+  fab!(:topic1) { Fabricate(:topic, category: category, created_at: 60.minutes.ago) }
+  fab!(:topic2) { Fabricate(:topic, category: category, created_at: 120.minutes.ago) }
+
+  describe '#perform!' do
+    it 'dismisses two topics' do
+      expect { described_class.new(user, Topic.all).perform! }.to change { DismissedTopicUser.count }.by(2)
+    end
+
+    it 'returns dismissed topic ids' do
+      expect(described_class.new(user, Topic.all).perform!.sort).to eq([topic1.id, topic2.id])
+    end
+
+    it 'respects max_new_topics limit' do
+      SiteSetting.max_new_topics = 1
+      expect { described_class.new(user, Topic.all).perform! }.to change { DismissedTopicUser.count }.by(1)
+
+      dismissed_topic_user = DismissedTopicUser.last
+
+      expect(dismissed_topic_user.user_id).to eq(user.id)
+      expect(dismissed_topic_user.topic_id).to eq(topic1.id)
+      expect(dismissed_topic_user.created_at).not_to be_nil
+    end
+
+    it 'respects seen topics' do
+      Fabricate(:topic_user, user: user, topic: topic1, last_read_post_number: 1)
+      Fabricate(:topic_user, user: user, topic: topic2, last_read_post_number: 1)
+      expect { described_class.new(user, Topic.all).perform! }.to change { DismissedTopicUser.count }.by(0)
+    end
+
+    it 'dismisses when topic user without last_read_post_number' do
+      Fabricate(:topic_user, user: user, topic: topic1, last_read_post_number: nil)
+      Fabricate(:topic_user, user: user, topic: topic2, last_read_post_number: nil)
+      expect { described_class.new(user, Topic.all).perform! }.to change { DismissedTopicUser.count }.by(2)
+    end
+
+    it 'respects new_topic_duration_minutes' do
+      user.user_option.update!(new_topic_duration_minutes: 70)
+
+      expect { described_class.new(user, Topic.all).perform! }.to change { DismissedTopicUser.count }.by(1)
+
+      dismissed_topic_user = DismissedTopicUser.last
+
+      expect(dismissed_topic_user.user_id).to eq(user.id)
+      expect(dismissed_topic_user.topic_id).to eq(topic1.id)
+      expect(dismissed_topic_user.created_at).not_to be_nil
+    end
+  end
+end
diff --git a/spec/services/email_settings_validator_spec.rb b/spec/services/email_settings_validator_spec.rb
new file mode 100644
index 0000000000..fb688b758e
--- /dev/null
+++ b/spec/services/email_settings_validator_spec.rb
@@ -0,0 +1,218 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe EmailSettingsValidator do
+  let(:username) { "kwest@gmail.com" }
+  let(:password) { "mbdtf" }
+
+  describe "#friendly_exception_message" do
+    it "formats a Net::POPAuthenticationError" do
+      exception = Net::POPAuthenticationError.new("invalid credentials")
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.pop3_authentication_error")
+      )
+    end
+
+    it "formats a Net::IMAP::NoResponseError for invalid credentials" do
+      exception = Net::IMAP::NoResponseError.new(stub(data: stub(text: "Invalid credentials")))
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.imap_authentication_error")
+      )
+    end
+
+    it "formats a general Net::IMAP::NoResponseError" do
+      exception = Net::IMAP::NoResponseError.new(stub(data: stub(text: "NO bad problem (Failure)")))
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.imap_no_response_error", message: "NO bad problem")
+      )
+    end
+
+    it "formats a Net::SMTPAuthenticationError" do
+      exception = Net::SMTPAuthenticationError.new("invalid credentials")
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.smtp_authentication_error")
+      )
+    end
+
+    it "formats a Net::SMTPServerBusy" do
+      exception = Net::SMTPServerBusy.new("call me maybe later")
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.smtp_server_busy_error")
+      )
+    end
+
+    it "formats a Net::SMTPSyntaxError, Net::SMTPFatalError, and Net::SMTPUnknownError" do
+      exception = Net::SMTPSyntaxError.new("bad syntax")
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.smtp_unhandled_error", message: exception.message)
+      )
+      exception = Net::SMTPFatalError.new("fatal")
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.smtp_unhandled_error", message: exception.message)
+      )
+      exception = Net::SMTPUnknownError.new("unknown")
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.smtp_unhandled_error", message: exception.message)
+      )
+    end
+
+    it "formats a SocketError and Errno::ECONNREFUSED" do
+      exception = SocketError.new("bad socket")
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.connection_error")
+      )
+      exception = Errno::ECONNREFUSED.new("no thanks")
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.connection_error")
+      )
+    end
+
+    it "formats a Net::OpenTimeout and Net::ReadTimeout error" do
+      exception = Net::OpenTimeout.new("timed out")
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.timeout_error")
+      )
+      exception = Net::ReadTimeout.new("timed out")
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.timeout_error")
+      )
+    end
+
+    it "formats unhandled errors" do
+      exception = StandardError.new("unknown")
+      expect(subject.class.friendly_exception_message(exception)).to eq(
+        I18n.t("email_settings.unhandled_error", message: exception.message)
+      )
+    end
+  end
+
+  describe "#validate_imap" do
+    let(:host) { "imap.gmail.com" }
+    let(:port) { 993 }
+
+    let(:net_imap_stub) do
+      obj = mock()
+      obj.stubs(:login).returns(true)
+      obj
+    end
+
+    before do
+      Net::IMAP.stubs(:new).returns(net_imap_stub)
+    end
+
+    it "is valid if no error is raised" do
+      net_imap_stub.stubs(:logout).returns(true)
+      net_imap_stub.stubs(:disconnect).returns(true)
+      expect { subject.class.validate_imap(host: host, port: port, username: username, password: password) }.not_to raise_error
+    end
+
+    it "is invalid if an error is raised" do
+      net_imap_stub.stubs(:login).raises(Net::IMAP::NoResponseError, stub(data: stub(text: "no response")))
+      expect { subject.class.validate_imap(host: host, port: port, username: username, password: password, debug: true) }.to raise_error(Net::IMAP::NoResponseError)
+    end
+
+    it "logs a warning if debug: true passed in and still raises the error" do
+      net_imap_stub.stubs(:login).raises(Net::IMAP::NoResponseError, stub(data: stub(text: "no response")))
+      Rails.logger.expects(:warn).with(regexp_matches(/\[EmailSettingsValidator\] Error encountered/)).at_least_once
+      expect { subject.class.validate_imap(host: host, port: port, username: username, password: password, debug: true) }.to raise_error(Net::IMAP::NoResponseError)
+    end
+  end
+
+  describe "#validate_pop3" do
+    let(:host) { "pop.gmail.com" }
+    let(:port) { 995 }
+
+    let(:net_pop3_stub) do
+      obj = mock()
+      obj.stubs(:auth_only).returns(true)
+      obj.stubs(:enable_ssl).returns(true)
+      obj
+    end
+
+    before do
+      Net::POP3.stubs(:new).returns(net_pop3_stub)
+    end
+
+    it "is valid if no error is raised" do
+      expect { subject.class.validate_pop3(host: host, port: port, username: username, password: password) }.not_to raise_error
+    end
+
+    it "is invalid if an error is raised" do
+      net_pop3_stub.stubs(:auth_only).raises(Net::POPAuthenticationError, "invalid credentials")
+      expect { subject.class.validate_pop3(host: host, port: port, username: username, password: password, debug: true) }.to raise_error(Net::POPAuthenticationError)
+    end
+
+    it "logs a warning if debug: true passed in and still raises the error" do
+      Rails.logger.expects(:warn).with(regexp_matches(/\[EmailSettingsValidator\] Error encountered/)).at_least_once
+      net_pop3_stub.stubs(:auth_only).raises(Net::POPAuthenticationError, "invalid credentials")
+      expect { subject.class.validate_pop3(host: host, port: port, username: username, password: password, debug: true) }.to raise_error(Net::POPAuthenticationError)
+    end
+
+    it "uses the correct ssl verify params if those settings are enabled" do
+      SiteSetting.pop3_polling_ssl = true
+      SiteSetting.pop3_polling_openssl_verify = true
+      net_pop3_stub.expects(:enable_ssl).with(max_version: OpenSSL::SSL::TLS1_2_VERSION)
+      expect { subject.class.validate_pop3(host: host, port: port, username: username, password: password) }.not_to raise_error
+    end
+
+    it "uses the correct ssl verify params if openssl_verify is not enabled" do
+      SiteSetting.pop3_polling_ssl = true
+      SiteSetting.pop3_polling_openssl_verify = false
+      net_pop3_stub.expects(:enable_ssl).with(OpenSSL::SSL::VERIFY_NONE)
+      expect { subject.class.validate_pop3(host: host, port: port, username: username, password: password) }.not_to raise_error
+    end
+  end
+
+  describe "#validate_smtp" do
+    let(:host) { "smtp.gmail.com" }
+    let(:port) { 587 }
+    let(:domain) { "gmail.com" }
+
+    let(:net_smtp_stub) do
+      obj = mock()
+      obj.stubs(:start).returns(true)
+      obj.stubs(:finish).returns(true)
+      obj.stubs(:enable_tls).returns(true)
+      obj.stubs(:enable_starttls_auto).returns(true)
+      obj
+    end
+
+    before do
+      Net::SMTP.stubs(:new).returns(net_smtp_stub)
+    end
+
+    it "is valid if no error is raised" do
+      expect { subject.class.validate_smtp(host: host, port: port, username: username, password: password, domain: domain) }.not_to raise_error
+    end
+
+    it "is invalid if an error is raised" do
+      net_smtp_stub.stubs(:start).raises(Net::SMTPAuthenticationError, "invalid credentials")
+      expect { subject.class.validate_smtp(host: host, port: port, username: username, password: password, domain: domain) }.to raise_error(Net::SMTPAuthenticationError)
+    end
+
+    it "logs a warning if debug: true passed in and still raises the error" do
+      Rails.logger.expects(:warn).with(regexp_matches(/\[EmailSettingsValidator\] Error encountered/)).at_least_once
+      net_smtp_stub.stubs(:start).raises(Net::SMTPAuthenticationError, "invalid credentials")
+      expect { subject.class.validate_smtp(host: host, port: port, username: username, password: password, debug: true, domain: domain) }.to raise_error(Net::SMTPAuthenticationError)
+    end
+
+    it "uses the correct ssl verify params for enable_tls if those settings are enabled" do
+      net_smtp_stub.expects(:enable_tls)
+      expect { subject.class.validate_smtp(host: host, port: port, username: username, password: password, domain: domain, openssl_verify_mode: "peer", enable_tls: true, enable_starttls_auto: false) }.not_to raise_error
+    end
+
+    it "uses the correct ssl verify params for enable_starttls_auto if those settings are enabled" do
+      net_smtp_stub.expects(:enable_starttls_auto)
+      expect { subject.class.validate_smtp(host: host, port: port, username: username, password: password, domain: domain, openssl_verify_mode: "peer", enable_tls: false, enable_starttls_auto: true) }.not_to raise_error
+    end
+
+    it "raises an ArgumentError if both enable_tls is true and enable_starttls_auto is true" do
+      expect { subject.class.validate_smtp(host: host, port: port, username: username, password: password, domain: domain, enable_ssl: true, enable_starttls_auto: true) }.to raise_error(ArgumentError)
+    end
+
+    it "raises an ArgumentError if a bad authentication method is used" do
+      expect { subject.class.validate_smtp(host: host, port: port, username: username, password: password, domain: domain, authentication: :rubber_stamp) }.to raise_error(ArgumentError)
+    end
+  end
+end
diff --git a/spec/services/inline_uploads_spec.rb b/spec/services/inline_uploads_spec.rb
index c6e4835b65..c46b6d7b69 100644
--- a/spec/services/inline_uploads_spec.rb
+++ b/spec/services/inline_uploads_spec.rb
@@ -54,6 +54,11 @@ RSpec.describe InlineUploads do
         MD
       end
 
+      it "should work with invalid img tags" do
+        md = '<img data-id="<>">'
+        expect(InlineUploads.process(md)).to eq(md)
+      end
+
       it "should not correct code blocks" do
         md = "`<a class=\"attachment\" href=\"#{upload2.url}\">In Code Block</a>`"
 
diff --git a/spec/services/notification_emailer_spec.rb b/spec/services/notification_emailer_spec.rb
index c986f72518..bb6c38a46c 100644
--- a/spec/services/notification_emailer_spec.rb
+++ b/spec/services/notification_emailer_spec.rb
@@ -28,9 +28,9 @@ describe NotificationEmailer do
       expect_enqueued_with(
         job: :user_email,
         args: NotificationEmailer::EmailUser.notification_params(notification, type),
-        at: Time.zone.now + delay
+        at: no_delay ? Time.zone.now : Time.zone.now + delay
       ) do
-        NotificationEmailer.process_notification(notification)
+        NotificationEmailer.process_notification(notification, no_delay: no_delay)
       end
     end
 
@@ -39,7 +39,7 @@ describe NotificationEmailer do
 
       it "doesn't enqueue a job" do
         expect_not_enqueued_with(job: :user_email, args: { type: type }) do
-          NotificationEmailer.process_notification(notification)
+          NotificationEmailer.process_notification(notification, no_delay: no_delay)
         end
       end
 
@@ -51,15 +51,15 @@ describe NotificationEmailer do
             job: :user_email,
             args: { type: type }
           ) do
-            NotificationEmailer.process_notification(notification)
+            NotificationEmailer.process_notification(notification, no_delay: no_delay)
           end
         else
           expect_enqueued_with(
             job: :user_email,
             args: NotificationEmailer::EmailUser.notification_params(notification, type),
-            at: Time.zone.now + delay
+            at: no_delay ? Time.zone.now : Time.zone.now + delay
           ) do
-            NotificationEmailer.process_notification(notification)
+            NotificationEmailer.process_notification(notification, no_delay: no_delay)
           end
         end
       end
@@ -73,15 +73,15 @@ describe NotificationEmailer do
             job: :user_email,
             args: { type: type }
           ) do
-            NotificationEmailer.process_notification(notification)
+            NotificationEmailer.process_notification(notification, no_delay: no_delay)
           end
         else
           expect_enqueued_with(
             job: :user_email,
             args: NotificationEmailer::EmailUser.notification_params(notification, type),
-            at: Time.zone.now + delay
+            at: no_delay ? Time.zone.now : Time.zone.now + delay
           ) do
-            NotificationEmailer.process_notification(notification)
+            NotificationEmailer.process_notification(notification, no_delay: no_delay)
           end
         end
       end
@@ -96,7 +96,7 @@ describe NotificationEmailer do
 
       it "doesn't enqueue a job" do
         expect_not_enqueued_with(job: :user_email, args: { type: type }) do
-          NotificationEmailer.process_notification(notification)
+          NotificationEmailer.process_notification(notification, no_delay: no_delay)
         end
       end
     end
@@ -107,7 +107,7 @@ describe NotificationEmailer do
         Post.any_instance.expects(:post_type).returns(Post.types[:small_action])
 
         expect_not_enqueued_with(job: :user_email, args: { type: type }) do
-          NotificationEmailer.process_notification(notification)
+          NotificationEmailer.process_notification(notification, no_delay: no_delay)
         end
       end
 
@@ -122,7 +122,7 @@ describe NotificationEmailer do
       notification.user.user_option.update_columns(email_level: UserOption.email_level_types[:never])
 
       expect_not_enqueued_with(job: :user_email, args: { type: type }) do
-        NotificationEmailer.process_notification(notification)
+        NotificationEmailer.process_notification(notification, no_delay: no_delay)
       end
     end
   end
@@ -140,98 +140,118 @@ describe NotificationEmailer do
 
   end
 
-  context 'user_mentioned' do
-    let(:type) { :user_mentioned }
-    let(:delay) { SiteSetting.email_time_window_mins.minutes }
-    let!(:notification) { create_notification(:mentioned) }
+  [true, false].each do |no_delay|
 
-    include_examples "enqueue_public"
+    context 'user_mentioned' do
+      let(:no_delay) { no_delay }
+      let(:type) { :user_mentioned }
+      let(:delay) { SiteSetting.email_time_window_mins.minutes }
+      let!(:notification) { create_notification(:mentioned) }
 
-    it "enqueue a delayed job for users that are online" do
-      notification.user.last_seen_at = 1.minute.ago
+      include_examples "enqueue_public"
 
-      expect_enqueued_with(
-        job: :user_email,
-        args: NotificationEmailer::EmailUser.notification_params(notification, type),
-        at: Time.zone.now + delay
-      ) do
-        NotificationEmailer.process_notification(notification)
+      it "enqueue a delayed job for users that are online" do
+        notification.user.last_seen_at = 1.minute.ago
+
+        expect_enqueued_with(
+          job: :user_email,
+          args: NotificationEmailer::EmailUser.notification_params(notification, type),
+          at: Time.zone.now + delay
+        ) do
+          NotificationEmailer.process_notification(notification)
+        end
       end
+
     end
 
-  end
+    context 'user_replied' do
+      let(:no_delay) { no_delay }
+      let(:type) { :user_replied }
+      let(:delay) { SiteSetting.email_time_window_mins.minutes }
+      let!(:notification) { create_notification(:replied) }
 
-  context 'user_replied' do
-    let(:type) { :user_replied }
-    let(:delay) { SiteSetting.email_time_window_mins.minutes }
-    let!(:notification) { create_notification(:replied) }
-
-    include_examples "enqueue_public"
-  end
-
-  context 'user_quoted' do
-    let(:type) { :user_quoted }
-    let(:delay) { SiteSetting.email_time_window_mins.minutes }
-    let!(:notification) { create_notification(:quoted) }
-
-    include_examples "enqueue_public"
-  end
-
-  context 'user_linked' do
-    let(:type) { :user_linked }
-    let(:delay) { SiteSetting.email_time_window_mins.minutes }
-    let!(:notification) { create_notification(:linked) }
-
-    include_examples "enqueue_public"
-  end
-
-  context 'user_posted' do
-    let(:type) { :user_posted }
-    let(:delay) { SiteSetting.email_time_window_mins.minutes }
-    let!(:notification) { create_notification(:posted) }
-
-    include_examples "enqueue_public"
-  end
-
-  context 'user_private_message' do
-    let(:type) { :user_private_message }
-    let(:delay) { SiteSetting.personal_email_time_window_seconds }
-    let!(:notification) { create_notification(:private_message) }
-
-    include_examples "enqueue_private"
-
-    it "doesn't enqueue a job for a small action" do
-      notification.data_hash["original_post_type"] = Post.types[:small_action]
-
-      expect_not_enqueued_with(job: :user_email, args: { type: type }) do
-        NotificationEmailer.process_notification(notification)
-      end
+      include_examples "enqueue_public"
     end
 
+    context 'user_quoted' do
+      let(:no_delay) { no_delay }
+      let(:type) { :user_quoted }
+      let(:delay) { SiteSetting.email_time_window_mins.minutes }
+      let!(:notification) { create_notification(:quoted) }
+
+      include_examples "enqueue_public"
+    end
+
+    context 'user_linked' do
+      let(:no_delay) { no_delay }
+      let(:type) { :user_linked }
+      let(:delay) { SiteSetting.email_time_window_mins.minutes }
+      let!(:notification) { create_notification(:linked) }
+
+      include_examples "enqueue_public"
+    end
+
+    context 'user_posted' do
+      let(:no_delay) { no_delay }
+      let(:type) { :user_posted }
+      let(:delay) { SiteSetting.email_time_window_mins.minutes }
+      let!(:notification) { create_notification(:posted) }
+
+      include_examples "enqueue_public"
+    end
+
+    context 'user_private_message' do
+      let(:no_delay) { no_delay }
+      let(:type) { :user_private_message }
+      let(:delay) { SiteSetting.personal_email_time_window_seconds }
+      let!(:notification) { create_notification(:private_message) }
+
+      include_examples "enqueue_private"
+
+      it "doesn't enqueue a job for a small action" do
+        notification.data_hash["original_post_type"] = Post.types[:small_action]
+
+        expect_not_enqueued_with(job: :user_email, args: { type: type }) do
+          NotificationEmailer.process_notification(notification)
+        end
+      end
+
+    end
+
+    context 'user_invited_to_private_message' do
+      let(:no_delay) { no_delay }
+      let(:type) { :user_invited_to_private_message }
+      let(:delay) { SiteSetting.personal_email_time_window_seconds }
+      let!(:notification) { create_notification(:invited_to_private_message) }
+
+      include_examples "enqueue_public"
+    end
+
+    context 'user_invited_to_topic' do
+      let(:no_delay) { no_delay }
+      let(:type) { :user_invited_to_topic }
+      let(:delay) { SiteSetting.personal_email_time_window_seconds }
+      let!(:notification) { create_notification(:invited_to_topic) }
+
+      include_examples "enqueue_public"
+    end
+
+    context 'watching the first post' do
+      let(:no_delay) { no_delay }
+      let(:type) { :user_watching_first_post }
+      let(:delay) { SiteSetting.email_time_window_mins.minutes }
+      let!(:notification) { create_notification(:watching_first_post) }
+
+      include_examples "enqueue_public"
+    end
+
+    context 'post_approved' do
+      let(:no_delay) { no_delay }
+      let(:type) { :post_approved }
+      let(:delay) { SiteSetting.email_time_window_mins.minutes }
+      let!(:notification) { create_notification(:post_approved) }
+
+      include_examples "enqueue_public"
+    end
   end
-
-  context 'user_invited_to_private_message' do
-    let(:type) { :user_invited_to_private_message }
-    let(:delay) { SiteSetting.personal_email_time_window_seconds }
-    let!(:notification) { create_notification(:invited_to_private_message) }
-
-    include_examples "enqueue_public"
-  end
-
-  context 'user_invited_to_topic' do
-    let(:type) { :user_invited_to_topic }
-    let(:delay) { SiteSetting.personal_email_time_window_seconds }
-    let!(:notification) { create_notification(:invited_to_topic) }
-
-    include_examples "enqueue_public"
-  end
-
-  context 'watching the first post' do
-    let(:type) { :user_watching_first_post }
-    let(:delay) { SiteSetting.email_time_window_mins.minutes }
-    let!(:notification) { create_notification(:watching_first_post) }
-
-    include_examples "enqueue_public"
-  end
-
 end
diff --git a/spec/services/post_action_notifier_spec.rb b/spec/services/post_action_notifier_spec.rb
index 00d326ea22..ed63971a3b 100644
--- a/spec/services/post_action_notifier_spec.rb
+++ b/spec/services/post_action_notifier_spec.rb
@@ -23,7 +23,7 @@ describe PostActionNotifier do
       SiteSetting.editing_grace_period_max_diff = 1
 
       post.update!(wiki: true)
-      user = post.user
+      owner = post.user
       user2 = Fabricate(:user)
       user3 = Fabricate(:user)
 
@@ -42,7 +42,7 @@ describe PostActionNotifier do
       edited_notification_type = Notification.types[:edited]
 
       expect(Notification.exists?(
-        user: user,
+        user: owner,
         notification_type: edited_notification_type
       )).to eq(true)
 
@@ -52,7 +52,7 @@ describe PostActionNotifier do
       )).to eq(true)
 
       expect do
-        post.revise(user, raw: "I made some changes to the wiki again!")
+        post.revise(owner, raw: "I made some changes to the wiki again!")
       end.to change {
         Notification.where(notification_type: edited_notification_type).count
       }.by(1)
@@ -69,7 +69,62 @@ describe PostActionNotifier do
       }.by(1)
 
       expect(Notification.where(
-        user: user,
+        user: owner,
+        notification_type: edited_notification_type
+      ).count).to eq(2)
+    end
+
+    it 'notifies watching users of revision when topic category allow_unlimited_owner_edits_on_first_post and first post in topic is edited' do
+      SiteSetting.editing_grace_period_max_diff = 1
+
+      post.topic.update(category: Fabricate(:category, allow_unlimited_owner_edits_on_first_post: true))
+      owner = post.user
+      user2 = Fabricate(:user)
+      user3 = Fabricate(:user)
+
+      TopicUser.change(user2.id, post.topic,
+        notification_level: TopicUser.notification_levels[:watching]
+      )
+
+      TopicUser.change(user3.id, post.topic,
+        notification_level: TopicUser.notification_levels[:tracking]
+      )
+
+      expect do
+        post.revise(Fabricate(:user), raw: "I made some changes to the first post!")
+      end.to change { Notification.count }.by(2)
+
+      edited_notification_type = Notification.types[:edited]
+
+      expect(Notification.exists?(
+        user: owner,
+        notification_type: edited_notification_type
+      )).to eq(true)
+
+      expect(Notification.exists?(
+        user: user2,
+        notification_type: edited_notification_type
+      )).to eq(true)
+
+      expect do
+        post.revise(owner, raw: "I made some changes to the first post again!")
+      end.to change {
+        Notification.where(notification_type: edited_notification_type).count
+      }.by(1)
+
+      expect(Notification.where(
+        user: user2,
+        notification_type: edited_notification_type
+      ).count).to eq(2)
+
+      expect do
+        post.revise(user2, raw: "I changed the first post totally")
+      end.to change {
+        Notification.where(notification_type: edited_notification_type).count
+      }.by(1)
+
+      expect(Notification.where(
+        user: owner,
         notification_type: edited_notification_type
       ).count).to eq(2)
     end
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 0b8ab126d9..86ca47e018 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -380,6 +380,13 @@ describe PostAlerter do
       expect(GroupMention.count).to eq(4)
     end
 
+    it 'takes private mention as precedence' do
+      expect {
+        create_post_with_alerts(raw: "Hello @group and @eviltrout, nice to meet you")
+      }.to change(evil_trout.notifications, :count).by(1)
+      expect(evil_trout.notifications.last.notification_type).to eq(Notification.types[:mentioned])
+    end
+
     it "triggers :before_create_notifications_for_users" do
       events = DiscourseEvent.track_events do
         post
@@ -731,6 +738,21 @@ describe PostAlerter do
       expect { mention_post }.to_not change { Jobs::PushNotification.jobs.count }
     end
 
+    it "pushes nothing when the user is in 'do not disturb'" do
+      SiteSetting.allowed_user_api_push_urls = "https://site.com/push|https://site2.com/push"
+      2.times do |i|
+        UserApiKey.create!(user_id: evil_trout.id,
+                           client_id: "xxx#{i}",
+                           application_name: "iPhone#{i}",
+                           scopes: ['notifications'].map { |name| UserApiKeyScope.new(name: name) },
+                           push_url: "https://site2.com/push")
+      end
+
+      Fabricate(:do_not_disturb_timing, user: evil_trout, starts_at: Time.zone.now, ends_at: 1.day.from_now)
+
+      expect { mention_post }.to_not change { Jobs::PushNotification.jobs.count }
+    end
+
     it "correctly pushes notifications if configured correctly" do
       Jobs.run_immediately!
       SiteSetting.allowed_user_api_push_urls = "https://site.com/push|https://site2.com/push"
@@ -753,6 +775,7 @@ describe PostAlerter do
           { status: 200, body: "OK" }
         end
 
+      set_subfolder "/subpath"
       payload = {
         "secret_key" => SiteSetting.push_api_secret_key,
         "url" => Discourse.base_url,
@@ -766,7 +789,7 @@ describe PostAlerter do
           'topic_id' => topic.id,
           'excerpt' => 'Hello @eviltrout ❤',
           'username' => user.username,
-          'url' => UrlHelper.absolute(mention_post.url),
+          'url' => UrlHelper.absolute(Discourse.base_path + mention_post.url),
           'client_id' => 'xxx0'
         },
         {
@@ -776,7 +799,7 @@ describe PostAlerter do
           'topic_id' => topic.id,
           'excerpt' => 'Hello @eviltrout ❤',
           'username' => user.username,
-          'url' => UrlHelper.absolute(mention_post.url),
+          'url' => UrlHelper.absolute(Discourse.base_path + mention_post.url),
           'client_id' => 'xxx1'
         }
         ]
@@ -800,7 +823,7 @@ describe PostAlerter do
         "post_number" => new_post.post_number,
         "username" => new_post.user.username,
         "excerpt" => new_post.raw,
-        "url" => UrlHelper.absolute(new_post.url)
+        "url" => UrlHelper.absolute(Discourse.base_path + new_post.url)
       }
 
       payload["notifications"][0].merge! changes
@@ -814,7 +837,7 @@ describe PostAlerter do
         "post_number" => new_post.post_number,
         "username" => new_post.user.username,
         "excerpt" => new_post.raw,
-        "url" => UrlHelper.absolute(new_post.url)
+        "url" => UrlHelper.absolute(Discourse.base_path + new_post.url)
       }
 
       payload["notifications"][0].merge! changes
@@ -1078,6 +1101,26 @@ describe PostAlerter do
         }.to add_notification(staged_member, :posted)
           .and not_add_notification(staged_non_member, :posted)
       end
+
+      it "does not update existing unread notification" do
+        category = Fabricate(:category)
+        CategoryUser.set_notification_level_for_category(user, CategoryUser.notification_levels[:watching], category.id)
+        topic = Fabricate(:topic, category: category)
+
+        post = Fabricate(:post, topic: topic)
+        PostAlerter.post_created(post)
+        notification = Notification.last
+        expect(notification.topic_id).to eq(topic.id)
+        expect(notification.post_number).to eq(1)
+
+        post = Fabricate(:post, topic: topic)
+        PostAlerter.post_created(post)
+        notification = Notification.last
+        expect(notification.topic_id).to eq(topic.id)
+        expect(notification.post_number).to eq(1)
+        notification_data = JSON.parse(notification.data)
+        expect(notification_data["display_username"]).to eq(I18n.t("embed.replies", count: 2))
+      end
     end
   end
 
@@ -1095,6 +1138,26 @@ describe PostAlerter do
         end
         expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user], post])
       end
+
+      it "does not update existing unread notification" do
+        tag = Fabricate(:tag)
+        TagUser.change(user.id, tag.id, TagUser.notification_levels[:watching])
+        topic = Fabricate(:topic, tags: [tag])
+
+        post = Fabricate(:post, topic: topic)
+        PostAlerter.post_created(post)
+        notification = Notification.last
+        expect(notification.topic_id).to eq(topic.id)
+        expect(notification.post_number).to eq(1)
+
+        post = Fabricate(:post, topic: topic)
+        PostAlerter.post_created(post)
+        notification = Notification.last
+        expect(notification.topic_id).to eq(topic.id)
+        expect(notification.post_number).to eq(1)
+        notification_data = JSON.parse(notification.data)
+        expect(notification_data["display_username"]).to eq(I18n.t("embed.replies", count: 2))
+      end
     end
 
     context "on change" do
@@ -1229,7 +1292,7 @@ describe PostAlerter do
     end
   end
 
-  context "SMTP" do
+  context "SMTP (group_smtp_email)" do
     before do
       SiteSetting.enable_smtp = true
       Jobs.run_immediately!
@@ -1246,58 +1309,77 @@ describe PostAlerter do
     end
 
     fab!(:topic) do
-      Fabricate(:private_message_topic,
+      Fabricate(
+        :private_message_topic,
         topic_allowed_groups: [
           Fabricate.build(:topic_allowed_group, group: group)
         ]
       )
     end
 
-    it "sends notifications for new posts in topic" do
-      post = Fabricate(
+    def create_post_with_incoming
+      Fabricate(
         :post,
         topic: topic,
         incoming_email:
-          Fabricate(
-            :incoming_email,
-            topic: topic,
-            from_address: "foo@discourse.org",
-            to_addresses: group.email_username,
-            cc_addresses: "bar@discourse.org"
-          )
+        Fabricate(
+          :incoming_email,
+          topic: topic,
+          from_address: "foo@discourse.org",
+          to_addresses: group.email_username,
+          cc_addresses: "bar@discourse.org"
+        )
       )
-      expect { PostAlerter.new.after_save_post(post, true) }.to change { ActionMailer::Base.deliveries.size }.by(0)
+    end
 
+    it "does not send a group smtp email when the post already has an incoming email" do
+      post = create_post_with_incoming
+
+      expect { PostAlerter.new.after_save_post(post, true) }.to change { ActionMailer::Base.deliveries.size }.by(0)
+    end
+
+    it "sends a group smtp email when the post does not have an incoming email" do
+      create_post_with_incoming
       post = Fabricate(:post, topic: topic)
       expect { PostAlerter.new.after_save_post(post, true) }.to change { ActionMailer::Base.deliveries.size }.by(1)
       email = ActionMailer::Base.deliveries.last
       expect(email.from).to include(group.email_username)
       expect(email.to).to contain_exactly("foo@discourse.org", "bar@discourse.org")
       expect(email.subject).to eq("Re: #{topic.title}")
+    end
 
-      post = Fabricate(
-        :post,
-        topic: topic,
-        incoming_email:
-          Fabricate(
-            :incoming_email,
-            topic: topic,
-            from_address: "bar@discourse.org",
-            to_addresses: group.email_username,
-            cc_addresses: "baz@discourse.org"
-          )
-      )
-      expect { PostAlerter.new.after_save_post(post, true) }.to change { ActionMailer::Base.deliveries.size }.by(0)
-
-      post = Fabricate(:post, topic: topic.reload)
-      expect { PostAlerter.new.after_save_post(post, true) }.to change { ActionMailer::Base.deliveries.size }.by(1)
-      email = ActionMailer::Base.deliveries.last
-      expect(email.from).to eq([group.email_username])
-      expect(email.to).to contain_exactly("foo@discourse.org", "bar@discourse.org", "baz@discourse.org")
-      expect(email.subject).to eq("Re: #{topic.title}")
-
+    it "does not send group smtp emails for a whisper" do
+      create_post_with_incoming
       post = Fabricate(:post, topic: topic, post_type: Post.types[:whisper])
       expect { PostAlerter.new.after_save_post(post, true) }.to change { ActionMailer::Base.deliveries.size }.by(0)
     end
+
+    it "does not send a notification email to the group when the post does not have an incoming email" do
+      PostAlerter.any_instance.expects(:create_notification).with(kind_of(User), Notification.types[:private_message], kind_of(Post), skip_send_email_to: ["discourse@example.com"]).at_least_once
+      post = create_post_with_incoming
+      staged_group_user = Fabricate(:staged, email: "discourse@example.com")
+      Fabricate(:topic_user, user: staged_group_user, topic: post.topic)
+      topic.allowed_users << staged_group_user
+      topic.save
+      expect { PostAlerter.new.after_save_post(post, true) }.to change { ActionMailer::Base.deliveries.size }.by(0)
+    end
+
+    it "skips sending a notification email to the group and all other incoming email addresses" do
+
+      create_post_with_incoming
+      PostAlerter.any_instance.expects(:create_notification).with(kind_of(User), Notification.types[:private_message], kind_of(Post), skip_send_email_to: ["foo@discourse.org", "bar@discourse.org", "discourse@example.com"]).at_least_once
+
+      post = Fabricate(:post, topic: topic.reload)
+      staged_group_user = Fabricate(:staged, email: "discourse@example.com")
+      Fabricate(:topic_user, user: staged_group_user, topic: post.topic)
+      topic.allowed_users << staged_group_user
+      topic.save
+
+      expect { PostAlerter.new.after_save_post(post, true) }.to change { ActionMailer::Base.deliveries.size }.by(1)
+      email = ActionMailer::Base.deliveries.last
+      expect(email.from).to eq([group.email_username])
+      expect(email.to).to contain_exactly("foo@discourse.org", "bar@discourse.org")
+      expect(email.subject).to eq("Re: #{topic.title}")
+    end
   end
 end
diff --git a/spec/services/push_notification_pusher_spec.rb b/spec/services/push_notification_pusher_spec.rb
index 30bb918980..de1659204f 100644
--- a/spec/services/push_notification_pusher_spec.rb
+++ b/spec/services/push_notification_pusher_spec.rb
@@ -16,4 +16,59 @@ RSpec.describe PushNotificationPusher do
       .to eq(UrlHelper.absolute(upload.url))
   end
 
+  it "sends notification in user's locale" do
+    SiteSetting.allow_user_locale = true
+    user = Fabricate(:user, locale: 'pt_BR')
+    PushSubscription.create!(user_id: user.id, data: "{\"endpoint\": \"endpoint\"}")
+
+    PushNotificationPusher.expects(:send_notification).with(user, { "endpoint" => "endpoint" }, {
+      title: "system mencionou você em \"Topic\" - Discourse",
+      body: "description",
+      badge: "/assets/push-notifications/discourse.png",
+      icon: "/assets/push-notifications/mentioned.png",
+      tag: "test.localhost-1",
+      base_url: "http://test.localhost",
+      url: "https://example.com/t/1/2",
+      hide_when_active: true
+    }).once
+
+    PushNotificationPusher.push(user, {
+      topic_title: 'Topic',
+      username: 'system',
+      excerpt: 'description',
+      topic_id: 1,
+      post_url: "https://example.com/t/1/2",
+      notification_type: 1
+    })
+  end
+
+  it "deletes invalid subscriptions during send" do
+    user = Fabricate(:walter_white)
+
+    missing_endpoint = PushSubscription.create!(user_id: user.id, data:
+      { p256dh: "public ECDH key", keys: { auth: "private ECDH key" } }.to_json)
+
+    missing_p256dh = PushSubscription.create!(user_id: user.id, data:
+      { endpoint: "endpoint 1", keys: { auth: "private ECDH key" } }.to_json)
+
+    missing_auth = PushSubscription.create!(user_id: user.id, data:
+      { endpoint: "endpoint 2", keys: { p256dh: "public ECDH key" } }.to_json)
+
+    valid_subscription = PushSubscription.create!(user_id: user.id, data:
+      { endpoint: "endpoint 3", keys: { p256dh: "public ECDH key", auth: "private ECDH key" } }.to_json)
+
+    expect(PushSubscription.where(user_id: user.id)).to contain_exactly(missing_endpoint, missing_p256dh, missing_auth, valid_subscription)
+    Webpush.expects(:payload_send).with(has_entries(endpoint: "endpoint 3", p256dh: "public ECDH key", auth: "private ECDH key")).once
+
+    PushNotificationPusher.push(user, {
+      topic_title: 'Topic',
+      username: 'system',
+      excerpt: 'description',
+      topic_id: 1,
+      post_url: "https://example.com/t/1/2",
+      notification_type: 1
+    })
+
+    expect(PushSubscription.where(user_id: user.id)).to contain_exactly(valid_subscription)
+  end
 end
diff --git a/spec/services/search_indexer_spec.rb b/spec/services/search_indexer_spec.rb
index 936dca0537..6774543c69 100644
--- a/spec/services/search_indexer_spec.rb
+++ b/spec/services/search_indexer_spec.rb
@@ -144,6 +144,19 @@ describe SearchIndexer do
         .to change { post.reload.post_search_data.search_data }
     end
 
+    it 'should work with invalid HTML' do
+      post.update!(cooked: "<FD>" * Nokogumbo::DEFAULT_MAX_TREE_DEPTH)
+
+      SearchIndexer.update_posts_index(
+        post_id: post.id,
+        topic_title: post.topic.title,
+        category_name: post.topic.category&.name,
+        topic_tags: post.topic.tags.map(&:name).join(' '),
+        cooked: post.cooked,
+        private_message: post.topic.private_message?
+      )
+    end
+
     it 'should not index posts with empty raw' do
       expect do
         post = Fabricate.build(:post, raw: "", post_type: Post.types[:small_action])
@@ -279,4 +292,23 @@ describe SearchIndexer do
       )
     end
   end
+
+  describe '.queue_users_reindex' do
+    let!(:user) { Fabricate(:user) }
+    let!(:user2) { Fabricate(:user) }
+
+    it 'should reset the version of search data for all users' do
+      SearchIndexer.index(user, force: true)
+      SearchIndexer.index(user2, force: true)
+      SearchIndexer.queue_users_reindex([user.id])
+
+      expect(user.reload.user_search_data.version).to eq(
+        SearchIndexer::REINDEX_VERSION
+      )
+
+      expect(user2.reload.user_search_data.version).to eq(
+        SearchIndexer::USER_INDEX_VERSION
+      )
+    end
+  end
 end
diff --git a/spec/services/site_settings_spec.rb b/spec/services/site_settings_spec.rb
index a9a540bc1c..5cc546bcbc 100644
--- a/spec/services/site_settings_spec.rb
+++ b/spec/services/site_settings_spec.rb
@@ -11,13 +11,13 @@ describe SiteSettingsTask do
   describe 'export' do
     it 'creates a hash of all site settings' do
       sso_url = "https://somewhere.over.com"
-      SiteSetting.sso_url = sso_url
-      SiteSetting.enable_sso = true
+      SiteSetting.discourse_connect_url = sso_url
+      SiteSetting.enable_discourse_connect = true
       hash = SiteSettingsTask.export_to_hash
 
       expect(hash).to eq(
-        "enable_sso" => "true",
-        "sso_url" => sso_url
+        "enable_discourse_connect" => "true",
+        "discourse_connect_url" => sso_url
       )
     end
   end
diff --git a/spec/services/themes_spec.rb b/spec/services/themes_spec.rb
index 4e5c01eea7..8db6db6a28 100644
--- a/spec/services/themes_spec.rb
+++ b/spec/services/themes_spec.rb
@@ -38,7 +38,7 @@ describe ThemesInstallTask do
     end
 
     let :scss_data do
-      "@font-face { font-family: magic; src: url($font)}; body {color: $color; content: $name;}"
+      "@font-face { font-family: magic; src: url($font)}; body {color: fuchsia;}"
     end
 
     let :theme_repo do
diff --git a/spec/services/topic_status_updater_spec.rb b/spec/services/topic_status_updater_spec.rb
index 593203eb51..5b8fd0c7b2 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], nil, based_on_last_post: true, duration: 10
+      TopicTimer.types[:close], nil, based_on_last_post: true, duration_minutes: 600
     )
 
     TopicStatusUpdater.new(topic, admin).update!("autoclosed", true)
@@ -70,6 +70,90 @@ describe TopicStatusUpdater do
     expect(last_post.raw).to eq(I18n.t("topic_statuses.autoclosed_enabled_lastpost_hours", count: 10))
   end
 
+  describe "opening the topic" do
+    it "opens the topic and deletes the timer" do
+      topic = create_topic
+
+      topic.set_or_create_timer(
+        TopicTimer.types[:open], 10.hours.from_now
+      )
+
+      TopicStatusUpdater.new(topic, admin).update!("closed", false)
+      timer = TopicTimer.find_by(topic: topic)
+      expect(timer).to eq(nil)
+    end
+
+    context "when the category has auto close settings" do
+      let(:topic) { create_topic }
+      let(:based_on_last_post) { false }
+
+      before do
+        # auto close after 3 days, topic was created a day ago
+        topic.update(
+          category: Fabricate(:category, auto_close_hours: 72, auto_close_based_on_last_post: based_on_last_post),
+          created_at: 1.day.ago
+        )
+      end
+
+      it "inherits auto close from the topic category, based on the created_at date of the topic" do
+
+        # close the topic manually, and set a timer to automatically open
+        TopicStatusUpdater.new(topic, admin).update!("closed", true)
+        topic.set_or_create_timer(
+          TopicTimer.types[:open], 10.hours.from_now
+        )
+
+        # manually open the topic. it has been 1 days since creation so the
+        # topic should auto-close 2 days from now, the original auto close time
+        TopicStatusUpdater.new(topic, admin).update!("closed", false)
+
+        timer = TopicTimer.find_by(topic: topic)
+        expect(timer).not_to eq(nil)
+        expect(timer.execute_at).to be_within_one_second_of(topic.created_at + 72.hours)
+      end
+
+      it "does not inherit auto close from the topic category if it has already been X hours since topic creation" do
+
+        topic.category.update(auto_close_hours: 1)
+
+        # close the topic manually, and set a timer to automatically open
+        TopicStatusUpdater.new(topic, admin).update!("closed", true)
+        topic.set_or_create_timer(
+          TopicTimer.types[:open], 10.hours.from_now
+        )
+
+        # manually open the topic. it has been over a day since creation and
+        # the auto close hours was 1 so a new timer should not be made
+        TopicStatusUpdater.new(topic, admin).update!("closed", false)
+
+        timer = TopicTimer.find_by(topic: topic)
+        expect(timer).to eq(nil)
+      end
+
+      context "when category setting is based_on_last_post" do
+        let(:based_on_last_post) { true }
+
+        it "inherits auto close from the topic category, using the duration because the close is based_on_last_post" do
+
+          # close the topic manually, and set a timer to automatically open
+          TopicStatusUpdater.new(topic, admin).update!("closed", true)
+          topic.set_or_create_timer(
+            TopicTimer.types[:open], 10.hours.from_now
+          )
+
+          # manually open the topic. it should re open 3 days from now, NOT
+          # 3 days from creation
+          TopicStatusUpdater.new(topic, admin).update!("closed", false)
+
+          timer = TopicTimer.find_by(topic: topic)
+          expect(timer).not_to eq(nil)
+          expect(timer.duration_minutes).to eq(72 * 60)
+          expect(timer.execute_at).to be_within_one_second_of(Time.zone.now + 72.hours)
+        end
+      end
+    end
+  end
+
   describe "repeat actions" do
 
     shared_examples "an action that doesn't repeat" do
diff --git a/spec/services/user_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb
index 84723680e8..d8ec0597ea 100644
--- a/spec/services/user_anonymizer_spec.rb
+++ b/spec/services/user_anonymizer_spec.rb
@@ -210,12 +210,23 @@ describe UserAnonymizer do
     end
 
     it "removes api key" do
-      ApiKey.create(user_id: user.id)
+      ApiKey.create!(user_id: user.id)
+
       expect { make_anonymous }.to change { ApiKey.count }.by(-1)
+
       user.reload
       expect(user.api_keys).to be_empty
     end
 
+    it "removes user api key" do
+      user_api_key = Fabricate(:user_api_key, user: user)
+
+      expect { make_anonymous }.to change { UserApiKey.count }.by(-1)
+
+      user.reload
+      expect(user.user_api_keys).to be_empty
+    end
+
     context "executes job" do
       before do
         Jobs.run_immediately!
diff --git a/spec/services/user_authenticator_spec.rb b/spec/services/user_authenticator_spec.rb
index 5db539d661..8f2b86b686 100644
--- a/spec/services/user_authenticator_spec.rb
+++ b/spec/services/user_authenticator_spec.rb
@@ -2,30 +2,48 @@
 
 require 'rails_helper'
 
-def github_auth(email_valid)
-  {
-    email: "user53@discourse.org",
-    username: "joedoe546",
-    email_valid: email_valid,
-    omit_username: nil,
-    name: "Joe Doe 546",
-    authenticator_name: "github",
-    extra_data: {
-      provider: "github",
-      uid: "100"
-    },
-    skip_email_validation: false
-  }
-end
-
 describe UserAuthenticator do
+  def github_auth(email_valid)
+    {
+      email: "user53@discourse.org",
+      username: "joedoe546",
+      email_valid: email_valid,
+      omit_username: nil,
+      name: "Joe Doe 546",
+      authenticator_name: "github",
+      extra_data: {
+        provider: "github",
+        uid: "100"
+      },
+      skip_email_validation: false
+    }
+  end
+
+  before do
+    SiteSetting.enable_github_logins = true
+  end
+
+  describe "#start" do
+    describe 'without authentication session' do
+      it "should apply the right user attributes" do
+        user = User.new
+        UserAuthenticator.new(user, {}).start
+
+        expect(user.password_required?).to eq(true)
+      end
+
+      it "allows password requirement to be skipped" do
+        user = User.new
+        UserAuthenticator.new(user, {}, require_password: false).start
+
+        expect(user.password_required?).to eq(false)
+      end
+    end
+  end
+
   context "#finish" do
     fab!(:group) { Fabricate(:group, automatic_membership_email_domains: "discourse.org") }
 
-    before do
-      SiteSetting.enable_github_logins = true
-    end
-
     it "confirms email and adds the user to appropraite groups based on email" do
       user = Fabricate(:user, email: "user53@discourse.org")
       expect(group.usernames).not_to include(user.username)
@@ -66,5 +84,14 @@ describe UserAuthenticator do
 
       expect(session[:authentication]).to eq(nil)
     end
+
+    it "raises an error for non-boolean values" do
+      user = Fabricate(:user, email: "user53@discourse.org")
+      session = { authentication: github_auth('string') }
+
+      expect do
+        UserAuthenticator.new(user, session).finish
+      end.to raise_error ArgumentError
+    end
   end
 end
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index f1b37f7bf1..3bcafc505c 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe UserDestroyer do
 
-  fab!(:user) { Fabricate(:user) }
+  fab!(:user) { Fabricate(:user_with_secondary_email) }
   fab!(:admin) { Fabricate(:admin) }
 
   describe 'new' do
@@ -18,21 +18,16 @@ describe UserDestroyer do
   end
 
   describe 'destroy' do
-    before do
-      @admin = Fabricate(:admin)
-      @user = Fabricate(:user_with_secondary_email)
-    end
-
     it 'raises an error when user is nil' do
-      expect { UserDestroyer.new(@admin).destroy(nil) }.to raise_error(Discourse::InvalidParameters)
+      expect { UserDestroyer.new(admin).destroy(nil) }.to raise_error(Discourse::InvalidParameters)
     end
 
     it 'raises an error when user is not a User' do
-      expect { UserDestroyer.new(@admin).destroy('nothing') }.to raise_error(Discourse::InvalidParameters)
+      expect { UserDestroyer.new(admin).destroy('nothing') }.to raise_error(Discourse::InvalidParameters)
     end
 
     it 'raises an error when regular user tries to delete another user' do
-      expect { UserDestroyer.new(@user).destroy(Fabricate(:user)) }.to raise_error(Discourse::InvalidAccess)
+      expect { UserDestroyer.new(user).destroy(Fabricate(:user)) }.to raise_error(Discourse::InvalidAccess)
     end
 
     shared_examples "successfully destroy a user" do
@@ -42,18 +37,18 @@ describe UserDestroyer do
 
       it 'should return the deleted user record' do
         return_value = destroy
-        expect(return_value).to eq(@user)
+        expect(return_value).to eq(user)
         expect(return_value).to be_destroyed
       end
 
       it 'should log the action' do
-        StaffActionLogger.any_instance.expects(:log_user_deletion).with(@user, anything).once
+        StaffActionLogger.any_instance.expects(:log_user_deletion).with(user, anything).once
         destroy
       end
 
       it "should not log the action if quiet is true" do
         expect {
-          UserDestroyer.new(@admin).destroy(@user, destroy_opts.merge(quiet: true))
+          UserDestroyer.new(admin).destroy(user, destroy_opts.merge(quiet: true))
         }.to_not change { UserHistory.where(action: UserHistory.actions[:delete_user]).count }
       end
 
@@ -61,7 +56,7 @@ describe UserDestroyer do
         event = DiscourseEvent.track_events { destroy }.last
 
         expect(event[:event_name]).to eq(:user_destroyed)
-        expect(event[:params].first).to eq(@user)
+        expect(event[:params].first).to eq(user)
       end
     end
 
@@ -73,14 +68,14 @@ describe UserDestroyer do
 
       it "adds emails to block list if block_email is true" do
         expect {
-          UserDestroyer.new(@admin).destroy(@user, destroy_opts.merge(block_email: true))
+          UserDestroyer.new(admin).destroy(user, destroy_opts.merge(block_email: true))
         }.to change { ScreenedEmail.count }.by(2)
       end
     end
 
     context 'user deletes self' do
       let(:destroy_opts) { { delete_posts: true, context: "/u/username/preferences/account" } }
-      subject(:destroy) { UserDestroyer.new(@user).destroy(@user, destroy_opts) }
+      subject(:destroy) { UserDestroyer.new(user).destroy(user, destroy_opts) }
 
       include_examples "successfully destroy a user"
 
@@ -90,6 +85,15 @@ describe UserDestroyer do
       end
     end
 
+    context 'context is missing' do
+      it "logs warning message if context is missing" do
+        messages = track_log_messages(level: Logger::WARN) do
+          UserDestroyer.new(admin).destroy(user)
+        end
+        expect(messages[0][2]).to include("User destroyed without context from:")
+      end
+    end
+
     context "with a reviewable post" do
       let!(:reviewable) { Fabricate(:reviewable, created_by: user) }
 
@@ -139,13 +143,13 @@ describe UserDestroyer do
       let!(:topic_starter) { Fabricate(:user) }
       let!(:topic) { Fabricate(:topic, user: topic_starter) }
       let!(:first_post) { Fabricate(:post, user: topic_starter, topic: topic) }
-      let!(:post) { Fabricate(:post, user: @user, topic: topic) }
+      let!(:post) { Fabricate(:post, user: user, topic: topic) }
 
       context "delete_posts is false" do
-        subject(:destroy) { UserDestroyer.new(@admin).destroy(@user) }
+        subject(:destroy) { UserDestroyer.new(admin).destroy(user) }
         before do
-          @user.stubs(:post_count).returns(1)
-          @user.stubs(:first_post_created_at).returns(Time.zone.now)
+          user.stubs(:post_count).returns(1)
+          user.stubs(:first_post_created_at).returns(Time.zone.now)
         end
 
         it 'should raise the right error' do
@@ -159,7 +163,7 @@ describe UserDestroyer do
         let(:destroy_opts) { { delete_posts: true } }
 
         context "staff deletes user" do
-          subject(:destroy) { UserDestroyer.new(@admin).destroy(@user, destroy_opts) }
+          subject(:destroy) { UserDestroyer.new(admin).destroy(user, destroy_opts) }
 
           include_examples "successfully destroy a user"
           include_examples "email block list"
@@ -177,8 +181,8 @@ describe UserDestroyer do
           end
 
           it "deletes topics started by the deleted user" do
-            spammer_topic = Fabricate(:topic, user: @user)
-            Fabricate(:post, user: @user, topic: spammer_topic)
+            spammer_topic = Fabricate(:topic, user: user)
+            Fabricate(:post, user: user, topic: spammer_topic)
             destroy
             expect(spammer_topic.reload.deleted_at).not_to eq(nil)
             expect(spammer_topic.user_id).to eq(nil)
@@ -189,8 +193,8 @@ describe UserDestroyer do
             before { destroy_opts[:delete_as_spammer] = true }
 
             it "approves reviewable flags" do
-              spammer_post = Fabricate(:post, user: @user)
-              reviewable = PostActionCreator.inappropriate(@admin, spammer_post).reviewable
+              spammer_post = Fabricate(:post, user: user)
+              reviewable = PostActionCreator.inappropriate(admin, spammer_post).reviewable
               expect(reviewable).to be_pending
 
               destroy
@@ -203,7 +207,7 @@ describe UserDestroyer do
         end
 
         context "users deletes self" do
-          subject(:destroy) { UserDestroyer.new(@user).destroy(@user, destroy_opts) }
+          subject(:destroy) { UserDestroyer.new(user).destroy(user, destroy_opts) }
 
           include_examples "successfully destroy a user"
           include_examples "email block list"
@@ -217,21 +221,54 @@ describe UserDestroyer do
       end
     end
 
+    context 'user was invited' do
+      it "should delete the invite of user" do
+        invite = Fabricate(:invite)
+        topic_invite = invite.topic_invites.create!(topic: Fabricate(:topic))
+        invited_group = invite.invited_groups.create!(group: Fabricate(:group))
+        user = Fabricate(:user)
+        user.user_emails.create!(email: invite.email)
+
+        UserDestroyer.new(admin).destroy(user)
+
+        expect(Invite.exists?(invite.id)).to eq(false)
+        expect(InvitedGroup.exists?(invited_group.id)).to eq(false)
+        expect(TopicInvite.exists?(topic_invite.id)).to eq(false)
+      end
+    end
+
+    context 'user created category' do
+      let!(:topic) { Fabricate(:topic, user: user) }
+      let!(:first_post) { Fabricate(:post, user: user, topic: topic) }
+      let!(:second_post) { Fabricate(:post, user: user, topic: topic) }
+      let!(:category) { Fabricate(:category, user: user, topic_id: topic.id) }
+
+      it 'changes author of first category post to system user and still deletes second post' do
+        UserDestroyer.new(admin).destroy(user, delete_posts: true)
+
+        expect(first_post.reload.deleted_at).to eq(nil)
+        expect(first_post.user_id).to eq(Discourse.system_user.id)
+
+        expect(second_post.reload.deleted_at).not_to eq(nil)
+        expect(second_post.user_id).to eq(nil)
+      end
+    end
+
     context 'user has no posts, but user_stats table has post_count > 0' do
       before do
         # out of sync user_stat data shouldn't break UserDestroyer
-        @user.user_stat.update_attribute(:post_count, 1)
+        user.user_stat.update_attribute(:post_count, 1)
       end
       let(:destroy_opts) { {} }
-      subject(:destroy) { UserDestroyer.new(@user).destroy(@user, delete_posts: false) }
+      subject(:destroy) { UserDestroyer.new(user).destroy(user, delete_posts: false) }
 
       include_examples "successfully destroy a user"
     end
 
     context 'user has deleted posts' do
-      let!(:deleted_post) { Fabricate(:post, user: @user, deleted_at: 1.hour.ago) }
+      let!(:deleted_post) { Fabricate(:post, user: user, deleted_at: 1.hour.ago) }
       it "should mark the user's deleted posts as belonging to a nuked user" do
-        expect { UserDestroyer.new(@admin).destroy(@user) }.to change { User.count }.by(-1)
+        expect { UserDestroyer.new(admin).destroy(user) }.to change { User.count }.by(-1)
         expect(deleted_post.reload.user_id).to eq(nil)
       end
     end
@@ -239,17 +276,17 @@ describe UserDestroyer do
     context 'user has no posts' do
       context 'and destroy succeeds' do
         let(:destroy_opts) { {} }
-        subject(:destroy) { UserDestroyer.new(@admin).destroy(@user) }
+        subject(:destroy) { UserDestroyer.new(admin).destroy(user) }
 
         include_examples "successfully destroy a user"
         include_examples "email block list"
       end
 
       context 'and destroy fails' do
-        subject(:destroy) { UserDestroyer.new(@admin).destroy(@user) }
+        subject(:destroy) { UserDestroyer.new(admin).destroy(user) }
 
         it 'should not log the action' do
-          @user.stubs(:destroy).returns(false)
+          user.stubs(:destroy).returns(false)
           StaffActionLogger.any_instance.expects(:log_user_deletion).never
           destroy
         end
@@ -259,43 +296,43 @@ describe UserDestroyer do
     context 'user has posts with links' do
       context 'external links' do
         before do
-          @post = Fabricate(:post_with_external_links, user: @user)
+          @post = Fabricate(:post_with_external_links, user: user)
           TopicLink.extract_from(@post)
         end
 
         it "doesn't add ScreenedUrl records by default" do
           ScreenedUrl.expects(:watch).never
-          UserDestroyer.new(@admin).destroy(@user, delete_posts: true)
+          UserDestroyer.new(admin).destroy(user, delete_posts: true)
         end
 
         it "adds ScreenedUrl records when :block_urls is true" do
           ScreenedUrl.expects(:watch).with(anything, anything, has_key(:ip_address)).at_least_once
-          UserDestroyer.new(@admin).destroy(@user, delete_posts: true, block_urls: true)
+          UserDestroyer.new(admin).destroy(user, delete_posts: true, block_urls: true)
         end
       end
 
       context 'internal links' do
         before do
-          @post = Fabricate(:post_with_external_links, user: @user)
+          @post = Fabricate(:post_with_external_links, user: user)
           TopicLink.extract_from(@post)
-          TopicLink.any_instance.stubs(:internal).returns(true)
+          TopicLink.where(user: user).update_all(internal: true)
         end
 
         it "doesn't add ScreenedUrl records" do
           ScreenedUrl.expects(:watch).never
-          UserDestroyer.new(@admin).destroy(@user, delete_posts: true, block_urls: true)
+          UserDestroyer.new(admin).destroy(user, delete_posts: true, block_urls: true)
         end
       end
 
       context 'with oneboxed links' do
         before do
-          @post = Fabricate(:post_with_youtube, user: @user)
+          @post = Fabricate(:post_with_youtube, user: user)
           TopicLink.extract_from(@post)
         end
 
         it "doesn't add ScreenedUrl records" do
           ScreenedUrl.expects(:watch).never
-          UserDestroyer.new(@admin).destroy(@user, delete_posts: true, block_urls: true)
+          UserDestroyer.new(admin).destroy(user, delete_posts: true, block_urls: true)
         end
       end
     end
@@ -303,29 +340,29 @@ describe UserDestroyer do
     context 'ip address screening' do
       it "doesn't create screened_ip_address records by default" do
         ScreenedIpAddress.expects(:watch).never
-        UserDestroyer.new(@admin).destroy(@user)
+        UserDestroyer.new(admin).destroy(user)
       end
 
       context "block_ip is true" do
         it "creates a new screened_ip_address record" do
-          ScreenedIpAddress.expects(:watch).with(@user.ip_address).returns(stub_everything)
-          UserDestroyer.new(@admin).destroy(@user, block_ip: true)
+          ScreenedIpAddress.expects(:watch).with(user.ip_address).returns(stub_everything)
+          UserDestroyer.new(admin).destroy(user, block_ip: true)
         end
 
         it "creates two new screened_ip_address records when registration_ip_address is different than last ip_address" do
-          @user.registration_ip_address = '12.12.12.12'
-          ScreenedIpAddress.expects(:watch).with(@user.ip_address).returns(stub_everything)
-          ScreenedIpAddress.expects(:watch).with(@user.registration_ip_address).returns(stub_everything)
-          UserDestroyer.new(@admin).destroy(@user, block_ip: true)
+          user.registration_ip_address = '12.12.12.12'
+          ScreenedIpAddress.expects(:watch).with(user.ip_address).returns(stub_everything)
+          ScreenedIpAddress.expects(:watch).with(user.registration_ip_address).returns(stub_everything)
+          UserDestroyer.new(admin).destroy(user, block_ip: true)
         end
       end
     end
 
     context 'user created a category' do
-      let!(:category) { Fabricate(:category_with_definition, user: @user) }
+      let!(:category) { Fabricate(:category_with_definition, user: user) }
 
       it "assigns the system user to the categories" do
-        UserDestroyer.new(@admin).destroy(@user, delete_posts: true)
+        UserDestroyer.new(admin).destroy(user, delete_posts: true)
         expect(category.reload.user_id).to eq(Discourse.system_user.id)
         expect(category.topic).to be_present
         expect(category.topic.user_id).to eq(Discourse.system_user.id)
@@ -352,26 +389,16 @@ describe UserDestroyer do
       end
     end
 
-    context 'user got an email' do
-      let!(:email_log) { Fabricate(:email_log, user: user) }
-
-      it "deletes the email log" do
-        expect {
-          UserDestroyer.new(@admin).destroy(user, delete_posts: true)
-        }.to change { EmailLog.count }.by(-1)
-      end
-    end
-
     context 'user liked things' do
       before do
         @topic = Fabricate(:topic, user: Fabricate(:user))
         @post = Fabricate(:post, user: @topic.user, topic: @topic)
-        PostActionCreator.like(@user, @post)
+        PostActionCreator.like(user, @post)
       end
 
       it 'should destroy the like' do
         expect {
-          UserDestroyer.new(@admin).destroy(@user, delete_posts: true)
+          UserDestroyer.new(admin).destroy(user, delete_posts: true)
         }.to change { PostAction.count }.by(-1)
         expect(@post.reload.like_count).to eq(0)
       end
@@ -434,6 +461,16 @@ describe UserDestroyer do
         expect(log.details).to include(username)
       end
     end
+
+    context 'user got an email' do
+      let!(:email_log) { Fabricate(:email_log, user: user) }
+
+      it "does not delete the email log" do
+        expect {
+          UserDestroyer.new(admin).destroy(user, delete_posts: true)
+        }.to_not change { EmailLog.count }
+      end
+    end
   end
 
 end
diff --git a/spec/services/user_notification_schedule_processor_spec.rb b/spec/services/user_notification_schedule_processor_spec.rb
new file mode 100644
index 0000000000..152667df94
--- /dev/null
+++ b/spec/services/user_notification_schedule_processor_spec.rb
@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe UserNotificationScheduleProcessor do
+  include ActiveSupport::Testing::TimeHelpers
+
+  fab!(:user) { Fabricate(:user) }
+  let(:standard_schedule) {
+    schedule = UserNotificationSchedule.create({
+      user: user
+    }.merge(UserNotificationSchedule::DEFAULT))
+    schedule.enabled = true
+    schedule.save
+    schedule
+  }
+
+  describe "#create_do_not_disturb_timings" do
+    [
+      { timezone: "UTC", offset: "+00:00" },
+      { timezone: "America/Chicago", offset: "-06:00" },
+      { timezone: "Australia/Sydney", offset: "+11:00" },
+    ].each do |timezone_info|
+      it 'creates dnd timings correctly for each timezone' do
+        user.user_option.update(timezone: timezone_info[:timezone])
+
+        travel_to Time.new(2020, 1, 4, 12, 0, 0, "+00:00") do
+          UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(standard_schedule)
+
+          # The default schedule is 8am - 5pm.
+          # Expext DND timings to fill gaps before/after those times for 3 days.
+          dnd_timings = user.do_not_disturb_timings
+          offset = timezone_info[:offset]
+          expect(dnd_timings[0].starts_at).to eq_time(Time.new(2020, 1, 4, 0, 0, 0, offset))
+          expect(dnd_timings[0].ends_at).to eq_time(Time.new(2020, 1, 4, 7, 59, 0, offset))
+
+          expect(dnd_timings[1].starts_at).to eq_time(Time.new(2020, 1, 4, 17, 0, 0, offset))
+          expect(dnd_timings[1].ends_at).to eq_time(Time.new(2020, 1, 5, 7, 59, 0, offset))
+
+          expect(dnd_timings[2].starts_at).to eq_time(Time.new(2020, 1, 5, 17, 0, 0, offset))
+          expect(dnd_timings[2].ends_at).to eq_time(Time.new(2020, 1, 6, 7, 59, 0, offset))
+
+          expect(dnd_timings[3].starts_at).to eq_time(Time.new(2020, 1, 6, 17, 0, 0, offset))
+          expect(dnd_timings[3].ends_at).to be_within(1.second).of Time.new(2020, 1, 6, 23, 59, 59, offset)
+        end
+      end
+    end
+
+    it 'does not create duplicate record, but ensures the correct records exist' do
+      user.user_option.update(timezone: "UTC")
+
+      travel_to Time.new(2020, 1, 4, 12, 0, 0, "+00:00") do
+        UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(standard_schedule)
+        expect(user.do_not_disturb_timings.count).to eq(4)
+        # All duplicates, so no new timings should be created
+        UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(standard_schedule)
+        expect(user.do_not_disturb_timings.count).to eq(4)
+      end
+
+      travel_to Time.new(2020, 1, 5, 12, 0, 0, "+00:00") do
+        UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(standard_schedule)
+        # There is 1 overlap, so expect only 3 more to be created
+        expect(user.do_not_disturb_timings.count).to eq(7)
+      end
+
+      travel_to Time.new(2020, 1, 10, 12, 0, 0, "+00:00") do
+        UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(standard_schedule)
+        # There is no overlap, so expect only 4 more to be created
+        expect(user.do_not_disturb_timings.count).to eq(11)
+      end
+    end
+
+    it 'extends previously scheduled dnd timings to remove gaps' do
+      user.user_option.update(timezone: "UTC")
+
+      travel_to Time.new(2020, 1, 4, 12, 0, 0, "+00:00") do
+        existing_timing = user.do_not_disturb_timings.create(
+          scheduled: true,
+          starts_at: 1.day.ago,
+          ends_at: Time.new(2020, 1, 03, 11, 0, 0, "+00:00").end_of_day
+        )
+        UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(standard_schedule)
+        expect(existing_timing.reload.ends_at).to eq_time(Time.new(2020, 1, 4, 7, 59, 0, "+00:00"))
+      end
+    end
+
+    it 'creates the correct timings when the whole schedule is DND (-1)' do
+      user.user_option.update(timezone: "UTC")
+      schedule = standard_schedule
+      schedule.update(
+        day_0_start_time: -1,
+        day_1_start_time: -1,
+        day_2_start_time: -1,
+        day_3_start_time: -1,
+        day_4_start_time: -1,
+        day_5_start_time: -1,
+        day_6_start_time: -1,
+      )
+
+      travel_to Time.new(2020, 1, 4, 12, 0, 0, "+00:00") do
+        UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(schedule)
+        expect(user.do_not_disturb_timings.count).to eq(1)
+        expect(user.do_not_disturb_timings.first.starts_at).to eq_time(Time.new(2020, 1, 4, 0, 0, 0, "+00:00"))
+        expect(user.do_not_disturb_timings.first.ends_at).to be_within(1.second).of Time.new(2020, 1, 6, 23, 59, 59, "+00:00")
+      end
+    end
+
+    it 'creates the correct timings at the end of a month and year' do
+      user.user_option.update(timezone: "UTC")
+      schedule = standard_schedule
+      schedule.update(
+        day_3_start_time: -1, # December 31, 2020 was a thursday. testing more cases.
+      )
+
+      travel_to Time.new(2020, 12, 31, 12, 0, 0, "+00:00") do
+        UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(schedule)
+        expect(user.do_not_disturb_timings[0].starts_at).to eq_time(Time.new(2020, 12, 31, 0, 0, 0, "+00:00"))
+        expect(user.do_not_disturb_timings[0].ends_at).to eq_time(Time.new(2021, 1, 1, 7, 59, 0, "+00:00"))
+        expect(user.do_not_disturb_timings[1].starts_at).to eq_time(Time.new(2021, 1, 1, 17, 0, 0, "+00:00"))
+        expect(user.do_not_disturb_timings[1].ends_at).to eq_time(Time.new(2021, 1, 2, 7, 59, 0, "+00:00"))
+        expect(user.do_not_disturb_timings[2].starts_at).to eq_time(Time.new(2021, 1, 2, 17, 0, 0, "+00:00"))
+        expect(user.do_not_disturb_timings[2].ends_at).to be_within(1.second).of Time.new(2021, 1, 2, 23, 59, 59, "+00:00")
+      end
+    end
+
+    it 'handles midnight to midnight for multiple days (no timings created)' do
+      user.user_option.update(timezone: "UTC")
+      schedule = standard_schedule
+      schedule.update(
+        day_0_start_time: 0,
+        day_0_end_time: 1440,
+        day_1_start_time: 0,
+        day_1_end_time: 1440,
+        day_2_start_time: 0,
+        day_2_end_time: 1440,
+      )
+      travel_to Time.new(2021, 1, 4, 12, 0, 0, "+00:00") do
+        UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(schedule)
+        expect(user.do_not_disturb_timings.count).to eq(0)
+      end
+
+    end
+
+    it 'publishes to message bus when the user should enter DND' do
+      user.user_option.update(timezone: "UTC")
+      schedule = standard_schedule
+      travel_to Time.new(2020, 12, 31, 1, 0, 0, "+00:00") do
+        MessageBus.expects(:publish).with(
+          "/do-not-disturb/#{user.id}",
+          { ends_at: Time.new(2020, 12, 31, 7, 59, 0, "+00:00").httpdate },
+          user_ids: [user.id]
+        )
+        UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(schedule)
+      end
+    end
+  end
+end
diff --git a/spec/services/user_silencer_spec.rb b/spec/services/user_silencer_spec.rb
index 6ed9062353..dfd5df1946 100644
--- a/spec/services/user_silencer_spec.rb
+++ b/spec/services/user_silencer_spec.rb
@@ -33,6 +33,13 @@ describe UserSilencer do
       expect(count).to eq(1)
     end
 
+    it "skips sending the email for the silence PM via post alert" do
+      NotificationEmailer.enable
+      Jobs.run_immediately!
+      UserSilencer.silence(user, admin)
+      expect(ActionMailer::Base.deliveries.size).to eq(0)
+    end
+
     it 'does not hide posts for tl1' do
       user.update!(trust_level: 1)
 
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index b9163a2a8c..ddc9371d66 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -91,6 +91,7 @@ describe UserUpdater do
       user = Fabricate(:user)
       updater = UserUpdater.new(acting_user, user)
       date_of_birth = Time.zone.now
+      SiteSetting.disable_mailing_list_mode = false
 
       theme = Fabricate(:theme, user_selectable: true)
 
@@ -161,6 +162,7 @@ describe UserUpdater do
     it "disables email_digests when enabling mailing_list_mode" do
       user = Fabricate(:user)
       updater = UserUpdater.new(acting_user, user)
+      SiteSetting.disable_mailing_list_mode = false
 
       val = updater.update(mailing_list_mode: true, email_digests: true)
       expect(val).to be_truthy
@@ -194,11 +196,82 @@ describe UserUpdater do
       expect(user.user_option.theme_ids).to eq([theme.id, child.id])
     end
 
+    let(:schedule_attrs) {
+      {
+        enabled: true,
+        day_0_start_time: 30,
+        day_0_end_time: 60,
+        day_1_start_time: 30,
+        day_1_end_time: 60,
+        day_2_start_time: 30,
+        day_2_end_time: 60,
+        day_3_start_time: 30,
+        day_3_end_time: 60,
+        day_4_start_time: 30,
+        day_4_end_time: 60,
+        day_5_start_time: 30,
+        day_5_end_time: 60,
+        day_6_start_time: 30,
+        day_6_end_time: 60,
+      }
+    }
+
+    context 'with user_notification_schedule' do
+      fab!(:user) { Fabricate(:user) }
+
+      it "allows users to create their notification schedule when it doesn't exist previously" do
+        expect(user.user_notification_schedule).to be_nil
+        updater = UserUpdater.new(acting_user, user)
+
+        updater.update(user_notification_schedule: schedule_attrs)
+        user.reload
+        expect(user.user_notification_schedule.enabled).to eq(true)
+        expect(user.user_notification_schedule.day_0_start_time).to eq(30)
+        expect(user.user_notification_schedule.day_0_end_time).to eq(60)
+        expect(user.user_notification_schedule.day_6_start_time).to eq(30)
+        expect(user.user_notification_schedule.day_6_end_time).to eq(60)
+      end
+
+      it "allows users to update their notification schedule" do
+        UserNotificationSchedule.create({
+          user: user,
+        }.merge(UserNotificationSchedule::DEFAULT))
+        updater = UserUpdater.new(acting_user, user)
+        updater.update(user_notification_schedule: schedule_attrs)
+        user.reload
+        expect(user.user_notification_schedule.enabled).to eq(true)
+        expect(user.user_notification_schedule.day_0_start_time).to eq(30)
+        expect(user.user_notification_schedule.day_0_end_time).to eq(60)
+        expect(user.user_notification_schedule.day_6_start_time).to eq(30)
+        expect(user.user_notification_schedule.day_6_end_time).to eq(60)
+      end
+
+      it "processes the schedule and do_not_disturb_timings are created" do
+        updater = UserUpdater.new(acting_user, user)
+
+        expect {
+          updater.update(user_notification_schedule: schedule_attrs)
+        }.to change { user.do_not_disturb_timings.count }.by(4)
+      end
+
+      it "removes do_not_disturb_timings when the schedule is disabled" do
+        updater = UserUpdater.new(acting_user, user)
+        updater.update(user_notification_schedule: schedule_attrs)
+        expect(user.user_notification_schedule.enabled).to eq(true)
+
+        schedule_attrs[:enabled] = false
+        updater.update(user_notification_schedule: schedule_attrs)
+
+        expect(user.user_notification_schedule.enabled).to eq(false)
+        expect(user.do_not_disturb_timings.count).to eq(0)
+      end
+    end
+
     context 'when sso overrides bio' do
       it 'does not change bio' do
-        SiteSetting.sso_url = "https://www.example.com/sso"
-        SiteSetting.enable_sso = true
-        SiteSetting.sso_overrides_bio = true
+        SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+        SiteSetting.enable_discourse_connect = true
+        SiteSetting.discourse_connect_overrides_bio = true
 
         user = Fabricate(:user)
         updater = UserUpdater.new(acting_user, user)
@@ -212,9 +285,9 @@ describe UserUpdater do
 
     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
+        SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+        SiteSetting.enable_discourse_connect = true
+        SiteSetting.discourse_connect_overrides_location = true
 
         user = Fabricate(:user)
         updater = UserUpdater.new(acting_user, user)
@@ -228,9 +301,9 @@ describe UserUpdater do
 
     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
+        SiteSetting.discourse_connect_url = "https://www.example.com/sso"
+        SiteSetting.enable_discourse_connect = true
+        SiteSetting.discourse_connect_overrides_website = true
 
         user = Fabricate(:user)
         updater = UserUpdater.new(acting_user, user)
diff --git a/spec/services/username_changer_spec.rb b/spec/services/username_changer_spec.rb
index a860ac7f80..b23cbcf1d4 100644
--- a/spec/services/username_changer_spec.rb
+++ b/spec/services/username_changer_spec.rb
@@ -147,7 +147,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.rstrip)
+          expect(post.cooked).to match_html <<~HTML
             <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>
@@ -169,7 +169,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.rstrip)
+          expect(post.cooked).to match_html <<~HTML
             <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>
@@ -181,7 +181,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.rstrip)
+          expect(post.cooked).to match_html <<~HTML
             <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>:
@@ -225,7 +225,7 @@ 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.rstrip)
+          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>
           HTML
         end
@@ -312,7 +312,7 @@ describe UsernameChanger do
             post = create_post_and_change_username(raw: "@թռչուն @թռչուն鳥 @թռչուն-鳥 @թռչուն_鳥 @թռչուն٩", target_username: 'птица')
 
             expect(post.raw).to eq("@птица @թռչուն鳥 @թռչուն-鳥 @թռչուն_鳥 @թռչուն٩")
-            expect(post.cooked).to match_html(<<~HTML.rstrip)
+            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>
             HTML
           end
@@ -361,7 +361,7 @@ describe UsernameChanger do
             dolor sit amet
           RAW
 
-          expect(post.cooked).to match_html(<<~HTML.rstrip)
+          expect(post.cooked).to match_html <<~HTML
             <p>Lorem ipsum</p>
             <aside class="quote no-group" data-username="bar" data-post="1" data-topic="#{quoted_post.topic.id}">
             <div class="title">
@@ -455,9 +455,8 @@ describe UsernameChanger do
           post = create_post_and_change_username(raw: raw)
 
           expect(post.raw).to eq(raw)
-
-          expect(post.cooked).to match_html(<<~HTML.rstrip)
-            <p><aside class="quote" data-post="#{quoted_post.post_number}" data-topic="#{quoted_post.topic.id}">
+          expect(post.cooked).to match_html <<~HTML
+            <aside class="quote" data-post="#{quoted_post.post_number}" 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">
@@ -467,7 +466,7 @@ describe UsernameChanger do
                 quoted post
               </blockquote>
             </aside>
-            <br>
+
             <aside class="quote" data-post="#{quoted_post.post_number}" data-topic="#{quoted_post.topic.id}">
               <div class="title">
                 <div class="quote-controls"></div>
@@ -478,7 +477,6 @@ describe UsernameChanger do
                 quoted post
               </blockquote>
             </aside>
-            </p>
           HTML
         end
 
@@ -487,9 +485,8 @@ describe UsernameChanger do
           post = create_post_and_change_username(raw: raw)
 
           expect(post.raw).to eq(raw)
-
-          expect(post.cooked).to match_html(<<~HTML.rstrip)
-            <p><aside class="quote" data-post="#{quoted_post.post_number}" data-topic="#{quoted_post.topic.id}">
+          expect(post.cooked).to match_html <<~HTML
+            <aside class="quote" data-post="#{quoted_post.post_number}" 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">
@@ -499,7 +496,7 @@ describe UsernameChanger do
                 quoted post
               </blockquote>
             </aside>
-            <br>
+
             <aside class="quote" data-post="#{another_quoted_post.post_number}" data-topic="#{another_quoted_post.topic.id}">
               <div class="title">
                 <div class="quote-controls"></div>
@@ -510,7 +507,6 @@ describe UsernameChanger do
                 evil post
               </blockquote>
             </aside>
-            </p>
           HTML
         end
       end
diff --git a/spec/support/fake_logger.rb b/spec/support/fake_logger.rb
index dcad412676..c8fe471755 100644
--- a/spec/support/fake_logger.rb
+++ b/spec/support/fake_logger.rb
@@ -2,10 +2,12 @@
 
 class FakeLogger
   attr_reader :warnings, :errors, :infos, :fatals
+  attr_accessor :level
 
   def initialize
     @warnings = []
     @errors = []
+    @debug = []
     @infos = []
     @fatals = []
   end
@@ -26,6 +28,10 @@ class FakeLogger
     @fatals << message
   end
 
+  def debug(message)
+    @debug << message
+  end
+
   def formatter
   end
 end
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index 521c745af6..aabf9f9768 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -181,9 +181,4 @@ module Helpers
     `cd #{repo_dir} && git commit -am 'first commit'`
     repo_dir
   end
-
-  class StubbedJob
-    def initialize; end
-    def perform(args); end
-  end
 end
diff --git a/spec/support/integration_helpers.rb b/spec/support/integration_helpers.rb
index 182a5514ee..45a7b3cfbc 100644
--- a/spec/support/integration_helpers.rb
+++ b/spec/support/integration_helpers.rb
@@ -46,4 +46,10 @@ module IntegrationHelpers
 
     SecureSession.new(session[:secure_session_id])
   end
+
+  def write_secure_session(key, value)
+    secure_session = read_secure_session
+    secure_session[key] = value
+    secure_session
+  end
 end
diff --git a/spec/support/match_html_matcher.rb b/spec/support/match_html_matcher.rb
index 94519530e7..868dff0eee 100644
--- a/spec/support/match_html_matcher.rb
+++ b/spec/support/match_html_matcher.rb
@@ -3,9 +3,7 @@
 require 'nokogiri/xml/parse_options'
 RSpec::Matchers.define :match_html do |expected|
   match do |actual|
-    a = make_canonical_html(expected).to_html.gsub(/\s+/, " ").strip
-    b = make_canonical_html(actual).to_html.gsub(/\s+/, " ").strip
-    a.eql? b
+    make_canonical_html(expected).eql? make_canonical_html(actual)
   end
 
   failure_message do |actual|
@@ -17,7 +15,17 @@ RSpec::Matchers.define :match_html do |expected|
   end
 
   def make_canonical_html(html)
-    Nokogiri::HTML5(html) { |config| config[:options] = Nokogiri::XML::ParseOptions::NOBLANKS | Nokogiri::XML::ParseOptions::COMPACT }
+    doc = Nokogiri::HTML5(html) do |config|
+      config[:options] = Nokogiri::XML::ParseOptions::NOBLANKS | Nokogiri::XML::ParseOptions::COMPACT
+    end
+
+    doc.traverse do |node|
+      if node.node_name&.downcase == "text"
+        node.content = node.content.gsub(/\s+/, ' ').strip
+      end
+    end
+
+    doc.to_html
   end
 
 end
diff --git a/spec/support/sidekiq_helpers.rb b/spec/support/sidekiq_helpers.rb
index 790bbaf59e..12dce59e85 100644
--- a/spec/support/sidekiq_helpers.rb
+++ b/spec/support/sidekiq_helpers.rb
@@ -47,7 +47,7 @@ module SidekiqHelpers
   # end
   def expect_not_enqueued_with(job:, args: {}, at: nil)
     expect_enqueued_with(job: job, args: args, at: at, expectation: false) do
-      yield
+      yield if block_given?
     end
   end
 
@@ -61,6 +61,20 @@ module SidekiqHelpers
     match_jobs(jobs: klass.jobs, args: args, at: at)
   end
 
+  # Same as job_enqueued? except it checks the expectation is true.
+  # Use this if you need to check if more than one job is enqueued from
+  # a single command, unlike expect_enqueued_with which needs a block
+  # to run code for the expectation to work. E.g.
+  #
+  # expect_not_enqueued_with(job: :close_topic, args: { topic_timer_id: deleted_timer.id })
+  # expect_not_enqueued_with(job: :close_topic, args: { topic_timer_id: future_timer.id })
+  # subject.execute
+  # expect_job_enqueued(job: :close_topic, args: { topic_timer_id: timer1.id })
+  # expect_job_enqueued(job: :open_topic, args: { topic_timer_id: timer2.id })
+  def expect_job_enqueued(job:, args: {}, at: nil)
+    expect(job_enqueued?(job: job, args: args, at: at)).to eq(true)
+  end
+
   private
 
   def match_jobs(jobs:, args:, at:)
@@ -77,8 +91,8 @@ module SidekiqHelpers
       matched_job ||= args.all? do |key, value|
         value = value.to_s if value.is_a?(Symbol)
 
-        if key == :at && !job_args.has_key?(:at)
-          value == job_args[:enqueued_at]
+        if key == :at
+          value.to_f == (job_args[:at] || job_args[:enqueued_at]).to_f
         else
           value == job_args[key]
         end
diff --git a/spec/support/time_matcher.rb b/spec/support/time_matcher.rb
index b578fe3833..5e2732d620 100644
--- a/spec/support/time_matcher.rb
+++ b/spec/support/time_matcher.rb
@@ -9,6 +9,15 @@ RSpec::Matchers.define :be_within_one_second_of do |expected_time|
   end
 end
 
+RSpec::Matchers.define :be_within_one_minute_of do |expected_time|
+  match do |actual_time|
+    (actual_time - expected_time).abs < 60
+  end
+  failure_message do |actual_time|
+    "#{actual_time} is not within 1 minute of #{expected_time}"
+  end
+end
+
 RSpec::Matchers.define :eq_time do |expected_time|
   match do |actual_time|
     (actual_time - expected_time).abs < 0.001
diff --git a/spec/swagger_helper.rb b/spec/swagger_helper.rb
index 5f7737384d..db3de327c6 100644
--- a/spec/swagger_helper.rb
+++ b/spec/swagger_helper.rb
@@ -1,6 +1,78 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'json_schemer'
+
+# Require schema files
+Dir["./spec/requests/api/schemas/*.rb"].each { |file| require file }
+
+# Require shared spec examples
+Dir["./spec/requests/api/shared/*.rb"].each { |file| require file }
+
+def load_spec_schema(name)
+  SpecSchemas::SpecLoader.new(name).load
+end
+
+def api_docs_description
+  <<~HEREDOC
+    This page contains the documentation on how to use Discourse through API calls.
+
+    > Note: For any endpoints not listed you can follow the
+    [reverse engineer the Discourse API](https://meta.discourse.org/t/-/20576)
+    guide to figure out how to use an API endpoint.
+
+    ### Request Content-Type
+
+    The Content-Type for POST and PUT requests can be set to `application/x-www-form-urlencoded`,
+    `multipart/form-data`, or `application/json`.
+
+    ### Endpoint Names and Response Content-Type
+
+    Most API endpoints provide the same content as their HTML counterparts. For example
+    the URL `/categories` serves a list of categories, the `/categories.json` API provides the
+    same information in JSON format.
+
+    Instead of sending API requests to `/categories.json` you may also send them to `/categories`
+    and add an `Accept: application/json` header to the request to get the JSON response.
+    Sending requests with the `Accept` header is necessary if you want to use URLs
+    for related endpoints returned by the API, such as pagination URLs.
+    These URLs are returned without the `.json` prefix so you need to add the header in
+    order to get the correct response format.
+
+    ### Authentication
+
+    Some endpoints do not require any authentication, pretty much anything else will
+    require you to be authenticated.
+
+    To become authenticated you will need to create an API Key from the admin panel.
+
+    Once you have your API Key you can pass it in along with your API Username
+    as an HTTP header like this:
+
+    ```
+    curl -X GET "http://127.0.0.1:3000/admin/users/list/active.json" \\
+    -H "Api-Key: 714552c6148e1617aeab526d0606184b94a80ec048fc09894ff1a72b740c5f19" \\
+    -H "Api-Username: system"
+    ```
+
+    and this is how POST requests will look:
+
+    ```
+    curl -X POST "http://127.0.0.1:3000/categories" \\
+    -H "Content-Type: multipart/form-data;" \\
+    -H "Api-Key: 714552c6148e1617aeab526d0606184b94a80ec048fc09894ff1a72b740c5f19" \\
+    -H "Api-Username: system" \\
+    -F "name=89853c20-4409-e91a-a8ea-f6cdff96aaaa" \\
+    -F "color=49d9e9" \\
+    -F "text_color=f0fcfd"
+    ```
+
+    ### Boolean values
+
+    If an endpoint accepts a boolean be sure to specify it as a lowercase
+    `true` or `false` value unless noted otherwise.
+  HEREDOC
+end
 
 RSpec.configure do |config|
   # Specify a root folder where Swagger JSON files are generated
@@ -19,7 +91,11 @@ RSpec.configure do |config|
       openapi: '3.0.3',
       info: {
         title: 'Discourse API Documentation',
-        version: 'latest'
+        'x-logo': {
+          url: 'https://discourse-meta.s3-us-west-1.amazonaws.com/optimized/3X/9/d/9d543e92b15b06924249654667a81441a55867eb_1_690x184.png',
+        },
+        version: 'latest',
+        description: api_docs_description
       },
       paths: {},
       servers: [
@@ -31,7 +107,258 @@ RSpec.configure do |config|
             }
           }
         }
-      ]
+      ],
+      components: {
+        schemas: {
+          user_response: {
+            type: :object,
+            properties: {
+              user_badges: {
+                type: :array,
+                items: {
+                },
+              },
+              user: {
+                type: :object,
+                properties: {
+                  id: { type: :integer },
+                  username: { type: :string },
+                  name: { type: :string },
+                  avatar_template: { type: :string },
+                  last_posted_at: { type: :string, nullable: true },
+                  last_seen_at: { type: :string, nullable: true },
+                  created_at: { type: :string },
+                  ignored: { type: :boolean },
+                  muted: { type: :boolean },
+                  can_ignore_user: { type: :boolean },
+                  can_mute_user: { type: :boolean },
+                  can_send_private_messages: { type: :boolean },
+                  can_send_private_message_to_user: { type: :boolean },
+                  trust_level: { type: :integer },
+                  moderator: { type: :boolean },
+                  admin: { type: :boolean },
+                  title: { type: :string, nullable: true },
+                  badge_count: { type: :integer },
+                  user_fields: {
+                    type: :object,
+                    properties: {
+                    }
+                  },
+                  custom_fields: {
+                    type: :object,
+                    properties: {
+                    }
+                  },
+                  time_read: { type: :integer },
+                  recent_time_read: { type: :integer },
+                  primary_group_id: { 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 },
+                  featured_topic: { type: :string, nullable: true },
+                  staged: { type: :boolean },
+                  can_edit: { type: :boolean },
+                  can_edit_username: { type: :boolean },
+                  can_edit_email: { type: :boolean },
+                  can_edit_name: { type: :boolean },
+                  uploaded_avatar_id: { type: :string, nullable: true },
+                  has_title_badges: { type: :boolean },
+                  pending_count: { type: :integer },
+                  profile_view_count: { type: :integer },
+                  second_factor_enabled: { type: :boolean },
+                  can_upload_profile_header: { type: :boolean },
+                  can_upload_user_card_background: { type: :boolean },
+                  post_count: { type: :integer },
+                  can_be_deleted: { type: :boolean },
+                  can_delete_all_posts: { type: :boolean },
+                  locale: { type: :string, nullable: true },
+                  muted_category_ids: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  regular_category_ids: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  watched_tags: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  watching_first_post_tags: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  tracked_tags: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  muted_tags: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  tracked_category_ids: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  watched_category_ids: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  watched_first_post_category_ids: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  system_avatar_upload_id: { type: :string, nullable: true },
+                  system_avatar_template: { type: :string },
+                  muted_usernames: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  ignored_usernames: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  allowed_pm_usernames: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  mailing_list_posts_per_day: { type: :integer },
+                  can_change_bio: { type: :boolean },
+                  can_change_location: { type: :boolean },
+                  can_change_website: { type: :boolean },
+                  user_api_keys: { type: :string, nullable: true },
+                  user_auth_tokens: {
+                    type: :array,
+                    items: {
+                      type: :object,
+                      properties: {
+                        id: { type: :integer },
+                        client_ip: { type: :string },
+                        location: { type: :string },
+                        browser: { type: :string },
+                        device: { type: :string },
+                        os: { type: :string },
+                        icon: { type: :string },
+                        created_at: { type: :string },
+                        seen_at: { type: :string },
+                        is_active: { type: :boolean },
+                      }
+                    },
+                  },
+                  featured_user_badge_ids: {
+                    type: :array,
+                    items: {
+                    },
+                  },
+                  invited_by: { type: :string, nullable: true },
+                  groups: {
+                    type: :array,
+                    items: {
+                      type: :object,
+                      properties: {
+                        id: { type: :integer },
+                        automatic: { type: :boolean },
+                        name: { type: :string },
+                        display_name: { type: :string },
+                        user_count: { type: :integer },
+                        mentionable_level: { type: :integer },
+                        messageable_level: { type: :integer },
+                        visibility_level: { type: :integer },
+                        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 },
+                        members_visibility_level: { type: :integer },
+                        can_see_members: { type: :boolean },
+                        can_admin_group: { type: :boolean },
+                        publish_read_state: { type: :boolean },
+                      }
+                    },
+                  },
+                  group_users: {
+                    type: :array,
+                    items: {
+                      type: :object,
+                      properties: {
+                        group_id: { type: :integer },
+                        user_id: { type: :integer },
+                        notification_level: { type: :integer },
+                      }
+                    },
+                  },
+                  user_option: {
+                    type: :object,
+                    properties: {
+                      user_id: { type: :integer },
+                      mailing_list_mode: { type: :boolean },
+                      mailing_list_mode_frequency: { type: :integer },
+                      email_digests: { type: :boolean },
+                      email_level: { type: :integer },
+                      email_messages_level: { type: :integer },
+                      external_links_in_new_tab: { type: :boolean },
+                      color_scheme_id: { type: :string, nullable: true },
+                      dark_scheme_id: { type: :string, nullable: true },
+                      dynamic_favicon: { type: :boolean },
+                      enable_quoting: { type: :boolean },
+                      enable_defer: { type: :boolean },
+                      digest_after_minutes: { type: :integer },
+                      automatically_unpin_topics: { type: :boolean },
+                      auto_track_topics_after_msecs: { type: :integer },
+                      notification_level_when_replying: { type: :integer },
+                      new_topic_duration_minutes: { type: :integer },
+                      email_previous_replies: { type: :integer },
+                      email_in_reply_to: { type: :boolean },
+                      like_notification_frequency: { type: :integer },
+                      include_tl0_in_digests: { type: :boolean },
+                      theme_ids: {
+                        type: :array,
+                        items: {
+                        },
+                      },
+                      theme_key_seq: { type: :integer },
+                      allow_private_messages: { type: :boolean },
+                      enable_allowed_pm_users: { type: :boolean },
+                      homepage_id: { type: :string, nullable: true },
+                      hide_profile_and_presence: { type: :boolean },
+                      text_size: { type: :string },
+                      text_size_seq: { type: :integer },
+                      title_count_mode: { type: :string },
+                      timezone: { type: :string, nullable: true },
+                      skip_new_user_tips: { type: :boolean },
+                    }
+                  },
+                }
+              },
+            }
+          }
+        }
+      }
     }
   }
 
diff --git a/spec/tasks/uploads_spec.rb b/spec/tasks/uploads_spec.rb
index bf81762412..1c20173c83 100644
--- a/spec/tasks/uploads_spec.rb
+++ b/spec/tasks/uploads_spec.rb
@@ -139,120 +139,6 @@ 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'
-
-      setup_s3
-      uploads.each { |upload| stub_upload(upload) }
-
-      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'
-      setup_s3
-      uploads.each { |upload| stub_upload(upload) }
-
-      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
diff --git a/test/javascripts/integration/components/invite-panel-test.js b/test/javascripts/integration/components/invite-panel-test.js
deleted file mode 100644
index bdce109aa1..0000000000
--- a/test/javascripts/integration/components/invite-panel-test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import EmberObject, { set } from "@ember/object";
-import componentTest from "helpers/component-test";
-import { moduleForComponent } from "ember-qunit";
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
-
-moduleForComponent("invite-panel", { integration: true });
-
-componentTest("can_invite_via_email", {
-  template: "{{invite-panel panel=panel}}",
-
-  beforeEach() {
-    set(this.currentUser, "details", { can_invite_via_email: true });
-    const inviteModel = JSON.parse(JSON.stringify(this.currentUser));
-    this.set("panel", {
-      id: "invite",
-      model: { inviteModel: EmberObject.create(inviteModel) },
-    });
-  },
-
-  async test(assert) {
-    await fillIn(".invite-user-input", "eviltrout@example.com");
-    assert.ok(queryAll(".send-invite:disabled").length === 0);
-  },
-});
diff --git a/test/run-qunit.js b/test/run-qunit.js
index 018b14b31b..9737efc35a 100644
--- a/test/run-qunit.js
+++ b/test/run-qunit.js
@@ -5,7 +5,7 @@
 // Requires chrome-launcher and chrome-remote-interface from npm
 // An up-to-date version of chrome is also required
 
-var args = process.argv.slice(2);
+let args = process.argv.slice(2);
 
 if (args.length < 1 || args.length > 3) {
   console.log("Usage: node run-qunit.js <URL> <timeout> <result_file>");
@@ -106,8 +106,9 @@ async function runAllTests() {
     }
   });
 
-  console.log("navigate to " + args[0]);
-  Page.navigate({ url: args[0] });
+  let url = args[0] + "&qunit_disable_auto_start=1";
+  console.log("navigate to ", url);
+  Page.navigate({ url });
 
   Page.loadEventFired(async () => {
     let qff = process.env.QUNIT_FAIL_FAST;
@@ -128,9 +129,9 @@ async function runAllTests() {
     }
 
     const timeout = parseInt(args[1] || 300000, 10);
-    var start = Date.now();
+    let start = Date.now();
 
-    var interval;
+    let interval;
 
     let runTests = async function () {
       if (Date.now() > start + timeout) {
@@ -218,7 +219,7 @@ function logQUnit() {
       return;
     }
 
-    var msg = "\n    Assertion Failed:";
+    let msg = "\n    Assertion Failed:";
     if (context.message) {
       msg += " " + context.message;
     }
@@ -256,7 +257,7 @@ function logQUnit() {
       console.log("\n");
     }
 
-    var stats = [
+    let stats = [
       "Time: " + context.runtime + "ms",
       "Total: " + context.total,
       "Passed: " + context.passed,
@@ -281,6 +282,7 @@ function logQUnit() {
 
     window.qunitDone = context;
   });
+  QUnit.start();
 }
 let qunit_script = logQUnit.toString();
 
diff --git a/vendor/assets/javascripts/bootbox.js b/vendor/assets/javascripts/bootbox.js
index e84a733cae..4cb971c43e 100644
--- a/vendor/assets/javascripts/bootbox.js
+++ b/vendor/assets/javascripts/bootbox.js
@@ -3,498 +3,551 @@
  *
  * http://bootboxjs.com/license.txt
  */
-var bootbox = window.bootbox || (function(document, $) {
+var bootbox =
+  window.bootbox ||
+  (function (document, $) {
     /*jshint scripturl:true sub:true */
 
-    var _locale        = 'en',
-        _defaultLocale = 'en',
-        _animate       = true,
-        _backdrop      = 'static',
-        _defaultHref   = 'javascript:;',
-        _classes       = '',
-        _btnClasses    = {},
-        _icons         = {},
-        /* last var should always be the public object we'll return */
-        that           = {};
-
+    var _locale = "en",
+      _defaultLocale = "en",
+      _animate = true,
+      _backdrop = "static",
+      _defaultHref = "javascript:;",
+      _classes = "",
+      _btnClasses = {},
+      _icons = {},
+      /* last var should always be the public object we'll return */
+      that = {};
 
     /**
      * public API
      */
-    that.setLocale = function(locale) {
-        for (var i in _locales) {
-            if (i == locale) {
-                _locale = locale;
-                return;
-            }
+    that.setLocale = function (locale) {
+      for (var i in _locales) {
+        if (i == locale) {
+          _locale = locale;
+          return;
         }
-        throw new Error('Invalid locale: '+locale);
+      }
+      throw new Error("Invalid locale: " + locale);
     };
 
-    that.addLocale = function(locale, translations) {
-        if (typeof _locales[locale] === 'undefined') {
-            _locales[locale] = {};
-        }
-        for (var str in translations) {
-            _locales[locale][str] = translations[str];
-        }
+    that.addLocale = function (locale, translations) {
+      if (typeof _locales[locale] === "undefined") {
+        _locales[locale] = {};
+      }
+      for (var str in translations) {
+        _locales[locale][str] = translations[str];
+      }
     };
 
-    that.setIcons = function(icons) {
-        _icons = icons;
-        if (typeof _icons !== 'object' || _icons === null) {
-            _icons = {};
-        }
+    that.setIcons = function (icons) {
+      _icons = icons;
+      if (typeof _icons !== "object" || _icons === null) {
+        _icons = {};
+      }
     };
 
-    that.setBtnClasses = function(btnClasses) {
-        _btnClasses = btnClasses;
-        if (typeof _btnClasses !== 'object' || _btnClasses === null) {
-            _btnClasses = {};
-        }
+    that.setBtnClasses = function (btnClasses) {
+      _btnClasses = btnClasses;
+      if (typeof _btnClasses !== "object" || _btnClasses === null) {
+        _btnClasses = {};
+      }
     };
 
-    that.alert = function(/*str, label, cb*/) {
-        var str   = "",
-            label = _translate('OK'),
-            cb    = null;
+    that.alert = function (/*str, label, cb*/) {
+      var str = "",
+        label = _translate("OK"),
+        cb = null;
 
-        switch (arguments.length) {
-            case 1:
-                // no callback, default button label
-                str = arguments[0];
-                break;
-            case 2:
-                // callback *or* custom button label dependent on type
-                str = arguments[0];
-                if (typeof arguments[1] == 'function') {
-                    cb = arguments[1];
-                } else {
-                    label = arguments[1];
-                }
-                break;
-            case 3:
-                // callback and custom button label
-                str   = arguments[0];
-                label = arguments[1];
-                cb    = arguments[2];
-                break;
-            default:
-                throw new Error("Incorrect number of arguments: expected 1-3");
+      switch (arguments.length) {
+        case 1:
+          // no callback, default button label
+          str = arguments[0];
+          break;
+        case 2:
+          // callback *or* custom button label dependent on type
+          str = arguments[0];
+          if (typeof arguments[1] == "function") {
+            cb = arguments[1];
+          } else {
+            label = arguments[1];
+          }
+          break;
+        case 3:
+          // callback and custom button label
+          str = arguments[0];
+          label = arguments[1];
+          cb = arguments[2];
+          break;
+        default:
+          throw new Error("Incorrect number of arguments: expected 1-3");
+      }
+
+      return that.dialog(
+        str,
+        {
+          // only button (ok)
+          label: label,
+          icon: _icons.OK,
+          class: _btnClasses.OK,
+          callback: cb,
+        },
+        {
+          // ensure that the escape key works; either invoking the user's
+          // callback or true to just close the dialog
+          onEscape: cb || true,
         }
-
-        return that.dialog(str, {
-            // only button (ok)
-            "label"   : label,
-            "icon"    : _icons.OK,
-            "class"   : _btnClasses.OK,
-            "callback": cb
-        }, {
-            // ensure that the escape key works; either invoking the user's
-            // callback or true to just close the dialog
-            "onEscape": cb || true
-        });
+      );
     };
 
-    that.confirm = function(/*str, labelCancel, labelOk, cb*/) {
-        var str         = "",
-            labelCancel = _translate('CANCEL'),
-            labelOk     = _translate('CONFIRM'),
-            cb          = null;
+    that.confirm = function (/*str, labelCancel, labelOk, cb*/) {
+      var str = "",
+        labelCancel = _translate("CANCEL"),
+        labelOk = _translate("CONFIRM"),
+        cb = null;
 
-        switch (arguments.length) {
-            case 1:
-                str = arguments[0];
-                break;
-            case 2:
-                str = arguments[0];
-                if (typeof arguments[1] == 'function') {
-                    cb = arguments[1];
-                } else {
-                    labelCancel = arguments[1];
-                }
-                break;
-            case 3:
-                str         = arguments[0];
-                labelCancel = arguments[1];
-                if (typeof arguments[2] == 'function') {
-                    cb = arguments[2];
-                } else {
-                    labelOk = arguments[2];
-                }
-                break;
-            case 4:
-                str         = arguments[0];
-                labelCancel = arguments[1];
-                labelOk     = arguments[2];
-                cb          = arguments[3];
-                break;
-            default:
-                throw new Error("Incorrect number of arguments: expected 1-4");
+      switch (arguments.length) {
+        case 1:
+          str = arguments[0];
+          break;
+        case 2:
+          str = arguments[0];
+          if (typeof arguments[1] == "function") {
+            cb = arguments[1];
+          } else {
+            labelCancel = arguments[1];
+          }
+          break;
+        case 3:
+          str = arguments[0];
+          labelCancel = arguments[1];
+          if (typeof arguments[2] == "function") {
+            cb = arguments[2];
+          } else {
+            labelOk = arguments[2];
+          }
+          break;
+        case 4:
+          str = arguments[0];
+          labelCancel = arguments[1];
+          labelOk = arguments[2];
+          cb = arguments[3];
+          break;
+        default:
+          throw new Error("Incorrect number of arguments: expected 1-4");
+      }
+
+      var cancelCallback = function () {
+        if (typeof cb === "function") {
+          return cb(false);
         }
+      };
 
-        var cancelCallback = function() {
-            if (typeof cb === 'function') {
-                return cb(false);
-            }
-        };
+      var confirmCallback = function () {
+        if (typeof cb === "function") {
+          return cb(true);
+        }
+      };
 
-        var confirmCallback = function() {
-            if (typeof cb === 'function') {
-                return cb(true);
-            }
-        };
-
-        return that.dialog(str, [{
+      return that.dialog(
+        str,
+        [
+          {
             // first button (cancel)
-            "label"   : labelCancel,
-            "icon"    : _icons.CANCEL,
-            "class"   : _btnClasses.CANCEL,
-            "callback": cancelCallback
-        }, {
+            label: labelCancel,
+            icon: _icons.CANCEL,
+            class: _btnClasses.CANCEL,
+            callback: cancelCallback,
+          },
+          {
             // second button (confirm)
-            "label"   : labelOk,
-            "icon"    : _icons.CONFIRM,
-            "class"   : _btnClasses.CONFIRM,
-            "callback": confirmCallback
-        }], {
-            // escape key bindings
-            "onEscape": cancelCallback
-        });
+            label: labelOk,
+            icon: _icons.CONFIRM,
+            class: _btnClasses.CONFIRM,
+            callback: confirmCallback,
+          },
+        ],
+        {
+          // escape key bindings
+          onEscape: cancelCallback,
+        }
+      );
     };
 
-    that.prompt = function(/*str, labelCancel, labelOk, cb, defaultVal*/) {
-        var str         = "",
-            labelCancel = _translate('CANCEL'),
-            labelOk     = _translate('CONFIRM'),
-            cb          = null,
-            defaultVal  = "";
+    that.prompt = function (/*str, labelCancel, labelOk, cb, defaultVal*/) {
+      var str = "",
+        labelCancel = _translate("CANCEL"),
+        labelOk = _translate("CONFIRM"),
+        cb = null,
+        defaultVal = "";
 
-        switch (arguments.length) {
-            case 1:
-                str = arguments[0];
-                break;
-            case 2:
-                str = arguments[0];
-                if (typeof arguments[1] == 'function') {
-                    cb = arguments[1];
-                } else {
-                    labelCancel = arguments[1];
-                }
-                break;
-            case 3:
-                str         = arguments[0];
-                labelCancel = arguments[1];
-                if (typeof arguments[2] == 'function') {
-                    cb = arguments[2];
-                } else {
-                    labelOk = arguments[2];
-                }
-                break;
-            case 4:
-                str         = arguments[0];
-                labelCancel = arguments[1];
-                labelOk     = arguments[2];
-                cb          = arguments[3];
-                break;
-            case 5:
-                str         = arguments[0];
-                labelCancel = arguments[1];
-                labelOk     = arguments[2];
-                cb          = arguments[3];
-                defaultVal  = arguments[4];
-                break;
-            default:
-                throw new Error("Incorrect number of arguments: expected 1-5");
+      switch (arguments.length) {
+        case 1:
+          str = arguments[0];
+          break;
+        case 2:
+          str = arguments[0];
+          if (typeof arguments[1] == "function") {
+            cb = arguments[1];
+          } else {
+            labelCancel = arguments[1];
+          }
+          break;
+        case 3:
+          str = arguments[0];
+          labelCancel = arguments[1];
+          if (typeof arguments[2] == "function") {
+            cb = arguments[2];
+          } else {
+            labelOk = arguments[2];
+          }
+          break;
+        case 4:
+          str = arguments[0];
+          labelCancel = arguments[1];
+          labelOk = arguments[2];
+          cb = arguments[3];
+          break;
+        case 5:
+          str = arguments[0];
+          labelCancel = arguments[1];
+          labelOk = arguments[2];
+          cb = arguments[3];
+          defaultVal = arguments[4];
+          break;
+        default:
+          throw new Error("Incorrect number of arguments: expected 1-5");
+      }
+
+      var header = str;
+
+      // let's keep a reference to the form object for later
+      var form = $("<form></form>");
+      form.append(
+        "<input class='input-block-level' autocomplete=off type=text value='" +
+          defaultVal +
+          "' />"
+      );
+
+      var cancelCallback = function () {
+        if (typeof cb === "function") {
+          // yep, native prompts dismiss with null, whereas native
+          // confirms dismiss with false...
+          return cb(null);
+        }
+      };
+
+      var confirmCallback = function () {
+        if (typeof cb === "function") {
+          return cb(form.find("input[type=text]").val());
+        }
+      };
+
+      var div = that.dialog(
+        form,
+        [
+          {
+            // first button (cancel)
+            label: labelCancel,
+            icon: _icons.CANCEL,
+            class: _btnClasses.CANCEL,
+            callback: cancelCallback,
+          },
+          {
+            // second button (confirm)
+            label: labelOk,
+            icon: _icons.CONFIRM,
+            class: _btnClasses.CONFIRM,
+            callback: confirmCallback,
+          },
+        ],
+        {
+          // prompts need a few extra options
+          header: header,
+          // explicitly tell dialog NOT to show the dialog...
+          show: false,
+          onEscape: cancelCallback,
+        }
+      );
+
+      // ... the reason the prompt needs to be hidden is because we need
+      // to bind our own "shown" handler, after creating the modal but
+      // before any show(n) events are triggered
+      // @see https://github.com/makeusabrew/bootbox/issues/69
+
+      div.on("shown", function () {
+        form.find("input[type=text]").focus();
+
+        // ensure that submitting the form (e.g. with the enter key)
+        // replicates the behaviour of a normal prompt()
+        form.on("submit", function (e) {
+          e.preventDefault();
+          div.find(".btn-primary").click();
+        });
+      });
+
+      div.modal("show");
+
+      return div;
+    };
+
+    that.dialog = function (str, handlers, options) {
+      var buttons = "",
+        callbacks = [];
+
+      if (!options) {
+        options = {};
+      }
+
+      // check for single object and convert to array if necessary
+      if (typeof handlers === "undefined") {
+        handlers = [];
+      } else if (typeof handlers.length == "undefined") {
+        handlers = [handlers];
+      }
+
+      var i = handlers.length;
+      while (i--) {
+        var label = null,
+          href = null,
+          _class = "btn-default",
+          icon = "",
+          callback = null;
+
+        if (
+          typeof handlers[i]["label"] == "undefined" &&
+          typeof handlers[i]["class"] == "undefined" &&
+          typeof handlers[i]["callback"] == "undefined"
+        ) {
+          // if we've got nothing we expect, check for condensed format
+
+          var propCount = 0, // condensed will only match if this == 1
+            property = null; // save the last property we found
+
+          // be nicer to count the properties without this, but don't think it's possible...
+          for (var j in handlers[i]) {
+            property = j;
+            if (++propCount > 1) {
+              // forget it, too many properties
+              break;
+            }
+          }
+
+          if (propCount == 1 && typeof handlers[i][j] == "function") {
+            // matches condensed format of label -> function
+            handlers[i]["label"] = property;
+            handlers[i]["callback"] = handlers[i][j];
+          }
         }
 
-        var header = str;
+        if (typeof handlers[i]["callback"] == "function") {
+          callback = handlers[i]["callback"];
+        }
 
-        // let's keep a reference to the form object for later
-        var form = $("<form></form>");
-        form.append("<input class='input-block-level' autocomplete=off type=text value='" + defaultVal + "' />");
+        if (handlers[i]["class"]) {
+          _class = handlers[i]["class"];
+        } else if (i == handlers.length - 1 && handlers.length <= 2) {
+          // always add a primary to the main option in a two-button dialog
+          _class = "btn-primary";
+        }
 
-        var cancelCallback = function() {
-            if (typeof cb === 'function') {
-                // yep, native prompts dismiss with null, whereas native
-                // confirms dismiss with false...
-                return cb(null);
-            }
-        };
+        // See: https://github.com/makeusabrew/bootbox/pull/114
+        // Upgrade to official bootbox release when it gets merged.
+        if (handlers[i]["link"] !== true) {
+          _class = "btn " + _class;
+        }
 
-        var confirmCallback = function() {
-            if (typeof cb === 'function') {
-                return cb(form.find("input[type=text]").val());
-            }
-        };
+        if (handlers[i]["label"]) {
+          label = handlers[i]["label"];
+        } else {
+          label = "Option " + (i + 1);
+        }
 
-        var div = that.dialog(form, [{
-            // first button (cancel)
-            "label"   : labelCancel,
-            "icon"    : _icons.CANCEL,
-            "class"   : _btnClasses.CANCEL,
-            "callback":  cancelCallback
-        }, {
-            // second button (confirm)
-            "label"   : labelOk,
-            "icon"    : _icons.CONFIRM,
-            "class"   : _btnClasses.CONFIRM,
-            "callback": confirmCallback
-        }], {
-            // prompts need a few extra options
-            "header"  : header,
-            // explicitly tell dialog NOT to show the dialog...
-            "show"    : false,
-            "onEscape": cancelCallback
+        if (handlers[i]["icon"]) {
+          icon = handlers[i]["icon"];
+        }
+
+        if (handlers[i]["href"]) {
+          href = handlers[i]["href"];
+        } else {
+          href = _defaultHref;
+        }
+
+        buttons =
+          buttons +
+          "<a data-handler='" +
+          i +
+          "' class='" +
+          _class +
+          "' href='" +
+          href +
+          "'>" +
+          icon +
+          "<span class='d-button-label'>" +
+          label +
+          "</span></a>";
+
+        callbacks[i] = callback;
+      }
+
+      // @see https://github.com/makeusabrew/bootbox/issues/46#issuecomment-8235302
+      // and https://github.com/twitter/bootstrap/issues/4474
+      // for an explanation of the inline overflow: hidden
+      // @see https://github.com/twitter/bootstrap/issues/4854
+      // for an explanation of tabIndex=-1
+
+      var parts = [
+        "<div class='bootbox modal' tabindex='-1' style='overflow:hidden;'>",
+      ];
+
+      if (options["header"]) {
+        var closeButton = "";
+        if (
+          typeof options["headerCloseButton"] == "undefined" ||
+          options["headerCloseButton"]
+        ) {
+          closeButton =
+            "<a href='" + _defaultHref + "' class='close'>&times;</a>";
+        }
+
+        parts.push(
+          "<div class='modal-header'>" +
+            closeButton +
+            "<h3>" +
+            options["header"] +
+            "</h3></div>"
+        );
+      }
+
+      // push an empty body into which we'll inject the proper content later
+      parts.push("<div class='modal-body'></div>");
+
+      if (buttons) {
+        parts.push("<div class='modal-footer'>" + buttons + "</div>");
+      }
+
+      parts.push("</div>");
+
+      var div = $(parts.join("\n"));
+
+      // check whether we should fade in/out
+      var shouldFade =
+        typeof options.animate === "undefined" ? _animate : options.animate;
+
+      if (shouldFade) {
+        div.addClass("fade");
+      }
+
+      var optionalClasses =
+        typeof options.classes === "undefined" ? _classes : options.classes;
+      if (optionalClasses) {
+        div.addClass(optionalClasses);
+      }
+
+      // now we've built up the div properly we can inject the content whether it was a string or a jQuery object
+      div.find(".modal-body").html(str);
+
+      function onCancel(source) {
+        // for now source is unused, but it will be in future
+        var hideModal = null;
+        if (typeof options.onEscape === "function") {
+          // @see https://github.com/makeusabrew/bootbox/issues/91
+          hideModal = options.onEscape();
+        }
+
+        if (hideModal !== false) {
+          div.modal("hide");
+        }
+      }
+
+      // hook into the modal's keyup trigger to check for the escape key
+      div.on("keyup.dismiss.modal", function (e) {
+        // any truthy value passed to onEscape will dismiss the dialog
+        // as long as the onEscape function (if defined) doesn't prevent it
+        if (e.which === 27 && options.onEscape !== false) {
+          onCancel("escape");
+        }
+      });
+
+      // handle close buttons too
+      div.on("click", "a.close", function (e) {
+        e.preventDefault();
+        onCancel("close");
+      });
+
+      // well, *if* we have a primary - give the first dom element focus
+      div.on("shown.bs.modal", function () {
+        div.find("a.btn-primary:first").focus();
+      });
+
+      div.on("hidden.bs.modal", function () {
+        div.remove();
+      });
+
+      // wire up button handlers
+      div.on("click", ".modal-footer a", function (e) {
+        var self = this;
+        Ember.run(function () {
+          var handler = $(self).data("handler"),
+            cb = callbacks[handler],
+            hideModal = null;
+
+          // sort of @see https://github.com/makeusabrew/bootbox/pull/68 - heavily adapted
+          // if we've got a custom href attribute, all bets are off
+          if (
+            typeof handler !== "undefined" &&
+            typeof handlers[handler]["href"] !== "undefined"
+          ) {
+            return;
+          }
+
+          e.preventDefault();
+
+          if (typeof cb === "function") {
+            hideModal = cb(e);
+          }
+
+          // the only way hideModal *will* be false is if a callback exists and
+          // returns it as a value. in those situations, don't hide the dialog
+          // @see https://github.com/makeusabrew/bootbox/pull/25
+          if (hideModal !== false) {
+            div.modal("hide");
+          }
         });
+      });
 
-        // ... the reason the prompt needs to be hidden is because we need
-        // to bind our own "shown" handler, after creating the modal but
-        // before any show(n) events are triggered
-        // @see https://github.com/makeusabrew/bootbox/issues/69
+      // stick the modal right at the bottom of the main body out of the way
+      (that.$body || $("body")).append(div);
 
-        div.on("shown", function() {
-            form.find("input[type=text]").focus();
+      div.modal({
+        // unless explicitly overridden take whatever our default backdrop value is
+        backdrop:
+          typeof options.backdrop === "undefined"
+            ? _backdrop
+            : options.backdrop,
+        // ignore bootstrap's keyboard options; we'll handle this ourselves (more fine-grained control)
+        keyboard: false,
+        // @ see https://github.com/makeusabrew/bootbox/issues/69
+        // we *never* want the modal to be shown before we can bind stuff to it
+        // this method can also take a 'show' option, but we'll only use that
+        // later if we need to
+        show: false,
+      });
 
-            // ensure that submitting the form (e.g. with the enter key)
-            // replicates the behaviour of a normal prompt()
-            form.on("submit", function(e) {
-                e.preventDefault();
-                div.find(".btn-primary").click();
-            });
-        });
+      // @see https://github.com/makeusabrew/bootbox/issues/64
+      // @see https://github.com/makeusabrew/bootbox/issues/60
+      // ...caused by...
+      // @see https://github.com/twitter/bootstrap/issues/4781
+      div.on("show", function (e) {
+        $(document).off("focusin.modal");
+      });
 
+      if (typeof options.show === "undefined" || options.show === true) {
         div.modal("show");
+      }
 
-        return div;
-    };
-
-    that.dialog = function(str, handlers, options) {
-        var buttons    = "",
-            callbacks  = [];
-
-        if (!options) {
-            options = {};
-        }
-
-        // check for single object and convert to array if necessary
-        if (typeof handlers === 'undefined') {
-            handlers = [];
-        } else if (typeof handlers.length == 'undefined') {
-            handlers = [handlers];
-        }
-
-        var i = handlers.length;
-        while (i--) {
-            var label    = null,
-                href     = null,
-                _class   = 'btn-default',
-                icon     = '',
-                callback = null;
-
-            if (typeof handlers[i]['label']    == 'undefined' &&
-                typeof handlers[i]['class']    == 'undefined' &&
-                typeof handlers[i]['callback'] == 'undefined') {
-                // if we've got nothing we expect, check for condensed format
-
-                var propCount = 0,      // condensed will only match if this == 1
-                    property  = null;   // save the last property we found
-
-                // be nicer to count the properties without this, but don't think it's possible...
-                for (var j in handlers[i]) {
-                    property = j;
-                    if (++propCount > 1) {
-                        // forget it, too many properties
-                        break;
-                    }
-                }
-
-                if (propCount == 1 && typeof handlers[i][j] == 'function') {
-                    // matches condensed format of label -> function
-                    handlers[i]['label']    = property;
-                    handlers[i]['callback'] = handlers[i][j];
-                }
-            }
-
-            if (typeof handlers[i]['callback']== 'function') {
-                callback = handlers[i]['callback'];
-            }
-
-            if (handlers[i]['class']) {
-                _class = handlers[i]['class'];
-            } else if (i == handlers.length -1 && handlers.length <= 2) {
-                // always add a primary to the main option in a two-button dialog
-                _class = 'btn-primary';
-            }
-
-            // See: https://github.com/makeusabrew/bootbox/pull/114
-            // Upgrade to official bootbox release when it gets merged.
-            if (handlers[i]['link'] !== true) {
-                _class = 'btn ' + _class;
-            }
-
-            if (handlers[i]['label']) {
-                label = handlers[i]['label'];
-            } else {
-                label = "Option "+(i+1);
-            }
-
-            if (handlers[i]['icon']) {
-                icon = "<i class='"+handlers[i]['icon']+"'></i> ";
-            }
-
-            if (handlers[i]['href']) {
-                href = handlers[i]['href'];
-            }
-            else {
-                href = _defaultHref;
-            }
-
-            buttons = buttons + "<a data-handler='"+i+"' class='"+_class+"' href='" + href + "'>"+icon+""+label+"</a>";
-
-            callbacks[i] = callback;
-        }
-
-        // @see https://github.com/makeusabrew/bootbox/issues/46#issuecomment-8235302
-        // and https://github.com/twitter/bootstrap/issues/4474
-        // for an explanation of the inline overflow: hidden
-        // @see https://github.com/twitter/bootstrap/issues/4854
-        // for an explanation of tabIndex=-1
-
-        var parts = ["<div class='bootbox modal' tabindex='-1' style='overflow:hidden;'>"];
-
-        if (options['header']) {
-            var closeButton = '';
-            if (typeof options['headerCloseButton'] == 'undefined' || options['headerCloseButton']) {
-                closeButton = "<a href='"+_defaultHref+"' class='close'>&times;</a>";
-            }
-
-            parts.push("<div class='modal-header'>"+closeButton+"<h3>"+options['header']+"</h3></div>");
-        }
-
-        // push an empty body into which we'll inject the proper content later
-        parts.push("<div class='modal-body'></div>");
-
-        if (buttons) {
-            parts.push("<div class='modal-footer'>"+buttons+"</div>");
-        }
-
-        parts.push("</div>");
-
-        var div = $(parts.join("\n"));
-
-        // check whether we should fade in/out
-        var shouldFade = (typeof options.animate === 'undefined') ? _animate : options.animate;
-
-        if (shouldFade) {
-            div.addClass("fade");
-        }
-
-        var optionalClasses = (typeof options.classes === 'undefined') ? _classes : options.classes;
-        if (optionalClasses) {
-            div.addClass(optionalClasses);
-        }
-
-        // now we've built up the div properly we can inject the content whether it was a string or a jQuery object
-        div.find(".modal-body").html(str);
-
-        function onCancel(source) {
-            // for now source is unused, but it will be in future
-            var hideModal = null;
-            if (typeof options.onEscape === 'function') {
-                // @see https://github.com/makeusabrew/bootbox/issues/91
-                hideModal = options.onEscape();
-            }
-
-            if (hideModal !== false) {
-                div.modal('hide');
-            }
-        }
-
-        // hook into the modal's keyup trigger to check for the escape key
-        div.on('keyup.dismiss.modal', function(e) {
-            // any truthy value passed to onEscape will dismiss the dialog
-            // as long as the onEscape function (if defined) doesn't prevent it
-            if (e.which === 27 && options.onEscape !== false) {
-                onCancel('escape');
-            }
-        });
-
-        // handle close buttons too
-        div.on('click', 'a.close', function(e) {
-            e.preventDefault();
-            onCancel('close');
-        });
-
-        // well, *if* we have a primary - give the first dom element focus
-        div.on('shown.bs.modal', function() {
-            div.find("a.btn-primary:first").focus();
-        });
-
-        div.on('hidden.bs.modal', function() {
-            div.remove();
-        });
-
-        // wire up button handlers
-        div.on('click', '.modal-footer a', function(e) {
-          var self = this;
-          Ember.run(function() {
-
-            var handler   = $(self).data("handler"),
-                cb        = callbacks[handler],
-                hideModal = null;
-
-            // sort of @see https://github.com/makeusabrew/bootbox/pull/68 - heavily adapted
-            // if we've got a custom href attribute, all bets are off
-            if (typeof handler                   !== 'undefined' &&
-                typeof handlers[handler]['href'] !== 'undefined') {
-
-                return;
-            }
-
-            e.preventDefault();
-
-            if (typeof cb === 'function') {
-                hideModal = cb(e);
-            }
-
-            // the only way hideModal *will* be false is if a callback exists and
-            // returns it as a value. in those situations, don't hide the dialog
-            // @see https://github.com/makeusabrew/bootbox/pull/25
-            if (hideModal !== false) {
-                div.modal("hide");
-            }
-          });
-        });
-
-        // stick the modal right at the bottom of the main body out of the way
-        (that.$body || $("body")).append(div);
-
-        div.modal({
-            // unless explicitly overridden take whatever our default backdrop value is
-            backdrop : (typeof options.backdrop  === 'undefined') ? _backdrop : options.backdrop,
-            // ignore bootstrap's keyboard options; we'll handle this ourselves (more fine-grained control)
-            keyboard : false,
-            // @ see https://github.com/makeusabrew/bootbox/issues/69
-            // we *never* want the modal to be shown before we can bind stuff to it
-            // this method can also take a 'show' option, but we'll only use that
-            // later if we need to
-            show     : false
-        });
-
-        // @see https://github.com/makeusabrew/bootbox/issues/64
-        // @see https://github.com/makeusabrew/bootbox/issues/60
-        // ...caused by...
-        // @see https://github.com/twitter/bootstrap/issues/4781
-        div.on("show", function(e) {
-            $(document).off("focusin.modal");
-        });
-
-        if (typeof options.show === 'undefined' || options.show === true) {
-            div.modal("show");
-        }
-
-        return div;
+      return div;
     };
 
     /**
@@ -502,64 +555,63 @@ var bootbox = window.bootbox || (function(document, $) {
      * made - have never been truly convinced of its merit but perhaps just
      * needs a tidyup and some TLC
      */
-    that.modal = function(/*str, label, options*/) {
-        var str;
-        var label;
-        var options;
+    that.modal = function (/*str, label, options*/) {
+      var str;
+      var label;
+      var options;
 
-        var defaultOptions = {
-            "onEscape": null,
-            "keyboard": true,
-            "backdrop": _backdrop
-        };
+      var defaultOptions = {
+        onEscape: null,
+        keyboard: true,
+        backdrop: _backdrop,
+      };
 
-        switch (arguments.length) {
-            case 1:
-                str = arguments[0];
-                break;
-            case 2:
-                str = arguments[0];
-                if (typeof arguments[1] == 'object') {
-                    options = arguments[1];
-                } else {
-                    label = arguments[1];
-                }
-                break;
-            case 3:
-                str     = arguments[0];
-                label   = arguments[1];
-                options = arguments[2];
-                break;
-            default:
-                throw new Error("Incorrect number of arguments: expected 1-3");
-        }
+      switch (arguments.length) {
+        case 1:
+          str = arguments[0];
+          break;
+        case 2:
+          str = arguments[0];
+          if (typeof arguments[1] == "object") {
+            options = arguments[1];
+          } else {
+            label = arguments[1];
+          }
+          break;
+        case 3:
+          str = arguments[0];
+          label = arguments[1];
+          options = arguments[2];
+          break;
+        default:
+          throw new Error("Incorrect number of arguments: expected 1-3");
+      }
 
-        defaultOptions['header'] = label;
+      defaultOptions["header"] = label;
 
-        if (typeof options == 'object') {
-            options = $.extend(defaultOptions, options);
-        } else {
-            options = defaultOptions;
-        }
+      if (typeof options == "object") {
+        options = $.extend(defaultOptions, options);
+      } else {
+        options = defaultOptions;
+      }
 
-        return that.dialog(str, [], options);
+      return that.dialog(str, [], options);
     };
 
-
-    that.hideAll = function() {
-        $(".bootbox").modal("hide");
+    that.hideAll = function () {
+      $(".bootbox").modal("hide");
     };
 
-    that.animate = function(animate) {
-        _animate = animate;
+    that.animate = function (animate) {
+      _animate = animate;
     };
 
-    that.backdrop = function(backdrop) {
-        _backdrop = backdrop;
+    that.backdrop = function (backdrop) {
+      _backdrop = backdrop;
     };
 
-    that.classes = function(classes) {
-        _classes = classes;
+    that.classes = function (classes) {
+      _classes = classes;
     };
 
     /**
@@ -571,90 +623,93 @@ var bootbox = window.bootbox || (function(document, $) {
      * unlikely to be required. If this gets too large it can be split out into separate JS files.
      */
     var _locales = {
-        'br' : {
-            OK      : 'OK',
-            CANCEL  : 'Cancelar',
-            CONFIRM : 'Sim'
-        },
-        'da' : {
-            OK      : 'OK',
-            CANCEL  : 'Annuller',
-            CONFIRM : 'Accepter'
-        },
-        'de' : {
-            OK      : 'OK',
-            CANCEL  : 'Abbrechen',
-            CONFIRM : 'Akzeptieren'
-        },
-        'en' : {
-            OK      : 'OK',
-            CANCEL  : 'Cancel',
-            CONFIRM : 'OK'
-        },
-        'es' : {
-            OK      : 'OK',
-            CANCEL  : 'Cancelar',
-            CONFIRM : 'Aceptar'
-        },
-        'fr' : {
-            OK      : 'OK',
-            CANCEL  : 'Annuler',
-            CONFIRM : 'D\'accord'
-        },
-        'it' : {
-            OK      : 'OK',
-            CANCEL  : 'Annulla',
-            CONFIRM : 'Conferma'
-        },
-        'nl' : {
-            OK      : 'OK',
-            CANCEL  : 'Annuleren',
-            CONFIRM : 'Accepteren'
-        },
-        'pl' : {
-            OK      : 'OK',
-            CANCEL  : 'Anuluj',
-            CONFIRM : 'Potwierdź'
-        },
-        'ru' : {
-            OK      : 'OK',
-            CANCEL  : 'Отмена',
-            CONFIRM : 'Применить'
-        },
-        'zh_CN' : {
-            OK      : 'OK',
-            CANCEL  : '取消',
-            CONFIRM : '确认'
-        },
-        'zh_TW' : {
-            OK      : 'OK',
-            CANCEL  : '取消',
-            CONFIRM : '確認'
-        }
+      br: {
+        OK: "OK",
+        CANCEL: "Cancelar",
+        CONFIRM: "Sim",
+      },
+      da: {
+        OK: "OK",
+        CANCEL: "Annuller",
+        CONFIRM: "Accepter",
+      },
+      de: {
+        OK: "OK",
+        CANCEL: "Abbrechen",
+        CONFIRM: "Akzeptieren",
+      },
+      en: {
+        OK: "OK",
+        CANCEL: "Cancel",
+        CONFIRM: "OK",
+      },
+      es: {
+        OK: "OK",
+        CANCEL: "Cancelar",
+        CONFIRM: "Aceptar",
+      },
+      fr: {
+        OK: "OK",
+        CANCEL: "Annuler",
+        CONFIRM: "D'accord",
+      },
+      it: {
+        OK: "OK",
+        CANCEL: "Annulla",
+        CONFIRM: "Conferma",
+      },
+      nl: {
+        OK: "OK",
+        CANCEL: "Annuleren",
+        CONFIRM: "Accepteren",
+      },
+      pl: {
+        OK: "OK",
+        CANCEL: "Anuluj",
+        CONFIRM: "Potwierdź",
+      },
+      ru: {
+        OK: "OK",
+        CANCEL: "Отмена",
+        CONFIRM: "Применить",
+      },
+      zh_CN: {
+        OK: "OK",
+        CANCEL: "取消",
+        CONFIRM: "确认",
+      },
+      zh_TW: {
+        OK: "OK",
+        CANCEL: "取消",
+        CONFIRM: "確認",
+      },
     };
 
     function _translate(str, locale) {
-        // we assume if no target locale is probided then we should take it from current setting
-        if (typeof locale === 'undefined') {
-            locale = _locale;
-        }
-        if (typeof _locales[locale][str] === 'string') {
-            return _locales[locale][str];
-        }
+      // we assume if no target locale is probided then we should take it from current setting
+      if (typeof locale === "undefined") {
+        locale = _locale;
+      }
+      if (typeof _locales[locale][str] === "string") {
+        return _locales[locale][str];
+      }
 
-        // if we couldn't find a lookup then try and fallback to a default translation
+      // if we couldn't find a lookup then try and fallback to a default translation
 
-        if (locale != _defaultLocale) {
-            return _translate(str, _defaultLocale);
-        }
+      if (locale != _defaultLocale) {
+        return _translate(str, _defaultLocale);
+      }
 
-        // if we can't do anything then bail out with whatever string was passed in - last resort
-        return str;
+      // if we can't do anything then bail out with whatever string was passed in - last resort
+      return str;
     }
 
     return that;
-
-}(document, window.jQuery));
+  })(document, window.jQuery);
 
 // @see https://github.com/makeusabrew/bootbox/issues/71
 window.bootbox = bootbox;
+
+define("bootbox", ["exports"], function (__exports__) {
+  __exports__.default = window.bootbox;
+});
diff --git a/vendor/assets/javascripts/handlebars.js b/vendor/assets/javascripts/handlebars.js
index 05d9f6141a..baad5d3d97 100644
--- a/vendor/assets/javascripts/handlebars.js
+++ b/vendor/assets/javascripts/handlebars.js
@@ -1,7 +1,7 @@
 /**!
 
  @license
- handlebars v4.7.6
+ handlebars v4.7.7
 
 Copyright (C) 2011-2019 by Yehuda Katz
 
@@ -278,7 +278,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _internalProtoAccess = __webpack_require__(33);
 
-	var VERSION = '4.7.6';
+	var VERSION = '4.7.7';
 	exports.VERSION = VERSION;
 	var COMPILER_REVISION = 8;
 	exports.COMPILER_REVISION = COMPILER_REVISION;
@@ -1525,7 +1525,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	          loc: loc
 	        });
 	      }
-	      return obj[name];
+	      return container.lookupProperty(obj, name);
 	    },
 	    lookupProperty: function lookupProperty(parent, propertyName) {
 	      var result = parent[propertyName];
@@ -3903,7 +3903,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return this.internalNameLookup(parent, name);
 	  },
 	  depthedLookup: function depthedLookup(name) {
-	    return [this.aliasable('container.lookup'), '(depths, "', name, '")'];
+	    return [this.aliasable('container.lookup'), '(depths, ', JSON.stringify(name), ')'];
 	  },
 
 	  compilerInfo: function compilerInfo() {
diff --git a/vendor/assets/javascripts/handlebars.runtime.js b/vendor/assets/javascripts/handlebars.runtime.js
index ac3976acbd..4bed375d45 100644
--- a/vendor/assets/javascripts/handlebars.runtime.js
+++ b/vendor/assets/javascripts/handlebars.runtime.js
@@ -1,7 +1,7 @@
 /**!
 
  @license
- handlebars v4.7.6
+ handlebars v4.7.7
 
 Copyright (C) 2011-2019 by Yehuda Katz
 
@@ -209,7 +209,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _internalProtoAccess = __webpack_require__(32);
 
-	var VERSION = '4.7.6';
+	var VERSION = '4.7.7';
 	exports.VERSION = VERSION;
 	var COMPILER_REVISION = 8;
 	exports.COMPILER_REVISION = COMPILER_REVISION;
@@ -1456,7 +1456,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	          loc: loc
 	        });
 	      }
-	      return obj[name];
+	      return container.lookupProperty(obj, name);
 	    },
 	    lookupProperty: function lookupProperty(parent, propertyName) {
 	      var result = parent[propertyName];
diff --git a/vendor/assets/javascripts/highlightjs/DIGESTS.md b/vendor/assets/javascripts/highlightjs/DIGESTS.md
new file mode 100644
index 0000000000..0d94562da5
--- /dev/null
+++ b/vendor/assets/javascripts/highlightjs/DIGESTS.md
@@ -0,0 +1,215 @@
+## Subresource Integrity
+
+If you are loading Highlight.js via CDN you may wish to use [Subresource Integrity](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity) to guarantee that you are using a legimitate build of the library.
+
+To do this you simply need to add the `integrity` attribute for each JavaScript file you download via CDN. These digests are used by the browser to confirm the files downloaded have not been modified.
+
+```html
+<script
+  src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.6.0/highlight.min.js"
+  integrity="sha384-GH74M1p3E251UG6dKCoADhGklxesH3L6C1xcT7c70pB05825y909Wf90G6TEmyT7"></script>
+<!-- including any other grammars you might need to load -->
+<script
+  src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.6.0/languages/go.min.js"
+  integrity="sha384-r//R3lkWktD0i/068BOYOm3KJWtJa/Jod3Bqpe6BjNfQcwjrkAQE8E1WOgG+kMLB"></script>
+```
+
+The full list of digests for every file can be found below.
+
+### Digests
+
+```
+sha384-9+1gkFpmH4aL8jOUjTeFwqo1YoAdP9cOHi2yideyPYxFPb+e2AdSPKGPJ2NSWshd highlight.js
+sha384-GH74M1p3E251UG6dKCoADhGklxesH3L6C1xcT7c70pB05825y909Wf90G6TEmyT7 highlight.min.js
+sha384-QCw8P5JGQy032rDry/zg1r3bKF4QfRKbmr+BNqbz9yJMwHAep5TKJoLvw47Ndqnd languages/angelscript.min.js
+sha384-7apqh9UrywWnvcxicn3u69b6szdsa6D2HdEsWd2/k+Y0dEDwueRNf5X41NI64vSv languages/ada.min.js
+sha384-mH6pp8lAh6C+v5gm37XIubL1fuHUWzuRuR943YrHO00ngaYMz34Gs6cp5odcV6s2 languages/apache.min.js
+sha384-ApIFd+u621bVMiDzRhLl88fBE5nfUSAS3HCxA/Ow6RmL2mTdy0FCePD/bxkFE9m7 languages/arcade.min.js
+sha384-drSCJz+Uf5VQh0+swr3WO+o+gEJ37PsQdi2+6PEIiaGoHt9sNS1/z5pUFN4y34az languages/1c.min.js
+sha384-/ypFLY/qLDzfVh946ts6uLxFnMdd1OaNj5jFMhYlyU0cXFo94i4uME++tItZQ6lb languages/armasm.min.js
+sha384-HrH//tYXHXNZwR/o04uJOdnlWauibuxyZYIQPPIQLdVxl87Zv3azuciiHKygOfRf languages/avrasm.min.js
+sha384-Fh4pQaH2FHYw5g0CeCcCroXDiXQSqtlp7SRMClWOAXz+llK5Z6GGOoGMgFRuIubD languages/autoit.min.js
+sha384-08r+3TH9onFPvLk8Cvx0wWcdbdfY6dpbljOuYLPJIjdMAXAJ8QQSGXqzQ0eBVWZT languages/awk.min.js
+sha384-SWN+Ng21kv/WuKXjywYIeToDaoRLftZ0MDDJekqN5XXEY+P0S8ilo6V3FZ6F+2YH languages/basic.min.js
+sha384-8WkRsic3IfuEOAoW3fx1K9B7LYiF6aY7qffBK0eIp8RkAdyRcaMgcvqSgemibYo+ languages/bnf.min.js
+sha384-ekfzauKoi8h4q0eMBHbGmNRDw0ldJqgTyUHSDm91+tvfLqRDpKH5qhnd0NCGOOZ9 languages/autohotkey.min.js
+sha384-nVdb9je5Cld82zXJ013LQtWBPWUMZl/gsDrsTTb/iGqca9gX56yc+PKMQfqeLBHQ languages/brainfuck.min.js
+sha384-eBc94B1IW/w2TV0ysFW6LaXAZxA4vsLRUj3Gn9PYbRSJbLdKI8ZVhteUDt2AJLQq languages/capnproto.min.js
+sha384-TMEXcEAJao81RBpWdTVaf7u/Ax+Wry9dzKJGRq7UfScUwMy6KCYf36cZmENnvvrE languages/clean.min.js
+sha384-jAa8bhYN2ob5rVFlYf6bREgpAgSvV/lXTDOJMZQuQMTdLt1YXL1MiAc8UAamb3oz languages/ceylon.min.js
+sha384-0daauRTUFPr9Kw9Lonrdp2zLUpvNvgREPulI4MLabiFI5HLLqVv/45br55+CcGtn languages/clojure.min.js
+sha384-x//ggWQQKDYM6gkxzOdTUJNX9tNhjYBuM1SkQ3kgwzlFH9cxNW2meFXccjs06ubh languages/cmake.min.js
+sha384-SQoVPrXL9Ego/tpDqYB9VPA65ZqmqLOe6p0RRI6W8VOuGq5qTYnElRCCFFDXkxDe languages/clojure-repl.min.js
+sha384-TU+haJgOsSjYVA7qDmqUoOvJzOQqarT72YT2TTKUJH+gek1WHh1+Go5OekKnM2mO languages/cal.min.js
+sha384-v5GKAd16DjIWpWmnBvlmhzU6uOJQZPUZ/qre77lXdg4kuN7kt5L2OIqrTlBvtmZo languages/cos.min.js
+sha384-NVSuN4IZtOjwawaHnxLrooJPnO97cp21MucCP9ruGpt8DfGddZDRRgGFXQxzHqi0 languages/coq.min.js
+sha384-CTzGMmHfPnxR/asrb5EO6EYC9oJ9Tzxeo2SdpzFVtKr313+XS/+vKded4oYsHsyI languages/axapta.min.js
+sha384-/UoMZhsvxKsfNvjJOBG2IA/u97k3VR9CeuEliKBVtYkrEnfTTIaVu8WFCuPYTf8P languages/csharp.min.js
+sha384-ftdjNYapTzatmwg4z1FroT33gTsfAJ/tOb6lFodfUjhZbCA5tnaqJrLxWm+2BvdD languages/crmsh.min.js
+sha384-DwTCrQgzJE5ijIPjGtjKYaQzW/rxXEvTbmNWRNyCDGtGei2ZuVh3hkotW77FoOhU languages/crystal.min.js
+sha384-CWMyrfhWZ2oKTZVv/J83HcGCfRZcCpxRO36/nOvYtWUtcDIQnEZJWJshUeIqlkEo languages/csp.min.js
+sha384-hBB/eyChamDz/BaVCLSBj/JjufFuP60B6AhZz0ch8ij5OOG/IPx29pgms47QX+1j languages/diff.min.js
+sha384-U7gCsZ9Gp3d5IQcZdxAwN0GhwIgayYh0W050kxsy1JK5eA7N5UkLfd5XpGEss6gq languages/d.min.js
+sha384-2oLyKZbObObXJh5Istz3x8ZNSZzHqJVPsnLijJAac5oRXaSk89LLRC5ct/YKLaq4 languages/django.min.js
+sha384-bQhSdaZpgE63aIt1JmwYj6QzjaMRL0AQDZceB+FIsP/jS8B2szOC/zZEoL7EdMxt languages/delphi.min.js
+sha384-p8Myu0Dj8kd6Q2ZufmPimEBEE6VvXmE/y8JhxHhWPEIaoYhgKsPuafpaaeU432H6 languages/dockerfile.min.js
+sha384-aC5uCsiBUJUksI0CzzpoxPJSGZZ9np5ElBFE2HEC4d6GXmj0MrexoqPKINAup0od languages/dos.min.js
+sha384-iZ65XFIGzojOzwxkaLxxUE3LvvAH/BijGSbc/wewvbVUbYsRFCkeZRMc4KH80StG languages/dns.min.js
+sha384-h1tymHrmjF6qHhlYUBgndg/C+JRW37k1DfQ2CK14v89SaaquAy+uraeUG6jo3maJ languages/dsconfig.min.js
+sha384-oPAncFCX5IGX38eMpdqzFtPpiiKbcTewdvdteljpiysaMYx9IVDN+m/EqIrG71LZ languages/dts.min.js
+sha384-eRpOUosqGr0qHiFQ+oDbuaSdW/FHVDQInPmFFzVQxIeENRTHi1XgXAYAAAM4gqmO languages/dust.min.js
+sha384-Q0Ts0Jv2mssitdPxryEM6VqtRnQFOlbb9Vheuq8tqae6awyZGIUfGXc3Pfg4ulua languages/ebnf.min.js
+sha384-g6d+vtBJCZ1oxjyuGW1gOHZQFPjQfMRSpNKgmnVlOVEcSVoZ54SsEDLWBot5CIA2 languages/elixir.min.js
+sha384-b3s6nY3m88+zp+fGlptXAz/LC2OBLdkHVlgtHw5z0QQANyk70Jof0z9G2RZC37X5 languages/elm.min.js
+sha384-WMNLqxwgNhF56fQeK5TIrzmujItCYtdD+vG7lLOIk4/cP+sBjr5RnobB5MsbPNXu languages/erb.min.js
+sha384-Xa/fdID1TbpSHhlc09MJQBOrFl9EYzvR1wa7XlDk+qAyERNjc1KjFvmN3W0Kmm9A languages/erlang.min.js
+sha384-mT8N74tT/sPcE8PZtnmyFIRU5fjO8zA8UAO5OZXJAfnEKnsUShBkH+EtbhAgSAyq languages/fix.min.js
+sha384-3vrFuc3lEQ4EKm10VTc9cv2eq4gq+GpcSLUZxJl+68QY04zHeA/vgcemvz3WIYhA languages/flix.min.js
+sha384-kzUsk0hEcTxEYuutI/k37SQDPq4Na3MSA1MpDKrKm5KhP0TJaMWBUQm6+ytACyim languages/dart.min.js
+sha384-WP/QHjVqLLLbe9Y8RAGKCyspBP53jGH/Ac6aeorpUoRCpgKAUT1S9bNdKkTBLO/z languages/fsharp.min.js
+sha384-bbJvjwLlzxMB1QQMrwAXbQpIMKAnZi4hLeAoi6Mt77ySARydEUtJvRibMJrbFc2P languages/excel.min.js
+sha384-VqhnLZaoi8MMPtN7ANKk1HXrePth9prmlp49Qp2SwptiKXN9tKanf9xN131VOrzN languages/gcode.min.js
+sha384-UrhPOS61XL9sxSH0QTYN5ueghirkShyVSExy9Uk2fHlz7o52c8RNaC/jSlwm1nWr languages/gherkin.min.js
+sha384-XzQKGNJ4KcJ8kEVY8fvcva98uBNQxJ2Sf4THPGRYNrDSYdq5Hvv9MWROT4QKzZkP languages/glsl.min.js
+sha384-r//R3lkWktD0i/068BOYOm3KJWtJa/Jod3Bqpe6BjNfQcwjrkAQE8E1WOgG+kMLB languages/go.min.js
+sha384-S7O4FRU0dafodwzRcOSEb9BH4YF4O/K2p1OEGnJDSqotUHDT0bG8HNgmrd7X6750 languages/gauss.min.js
+sha384-EyrWXI1nua9iBatP/D58KKOIUagNPwDBqUkD3QLWwlWBn3/SEvKqRym4PBrap0Jn languages/golo.min.js
+sha384-LQ3IaiIdaoQDHkJ3LuUU4NUn1zy0UoSQdxIqhouA+PiguPN0rslLj8ros1B/nd0m languages/gml.min.js
+sha384-pFx/9vjF0s5OZ5byIXtIeChG7sCtCdaep30ewKleakEXhIbscIaaL+VTAJkkhXWo languages/haml.min.js
+sha384-bBjF9iksqKGrNHoolJBNEiCQb+7A/POecLfB2lL/KCq0Lqgdl6KBcbxzLpbV7igV languages/haxe.min.js
+sha384-QDpFP/xZLlpLCBZ+ptdh0gajYm54Nz82Lh4TysSOQJ19B15iPux/nMu/b2C3UMHq languages/gradle.min.js
+sha384-PYi+8aIiMs0S/m1tc0v4x7PGA/D5evr2yCdM1Pd42WWx7Nwhnq33CIDBQwG4Xjgt languages/hsp.min.js
+sha384-/xr+JjpBEktxk6sVqcsJKdFNkHgJflCKigYqgapyT97qO78hu+pBIJprrSQwXIY7 languages/hy.min.js
+sha384-i/Dy05ktXQgVDzV8G9rgRhR9Ve3MAzMYUFj9d9IfX9RihNdqW/ChfJuIJrjpwn6d languages/inform7.min.js
+sha384-vI0nSCP1v7g41H5F402YxfyWx/XiNOFerzNXocLSVvU8hTnh3qsW7w7WOUvIChD9 languages/haskell.min.js
+sha384-pfEQKqCUO8ylk7Ex13uKM76eICVVoaCsicCbp3cUaADHiSdM6IoIDMITOwrlq9zB languages/jboss-cli.min.js
+sha384-OZrcb8T5rFffiSUdGVKpUl6VyUmurmdo/BH/KMJPHftEncDtj51ED7pJYy6gl793 languages/isbl.min.js
+sha384-LogXo4U+5NSOtE1yN4i9kStdwgFh2i/5/GHryiHrtNVVndo10RWRYO1B9PEl/ewp languages/json.min.js
+sha384-9j8tOfwq8VRSU1v32Tx/cunszEKVwrIhiF7P/ahBywDMDNsOK9Q2llqx7Vu848Bi languages/julia-repl.min.js
+sha384-Fae1IB/IYPKAU+8W/0HG1FmRikkstyuzZrrm4H44mZEpYhj4nRoqmbUzAIeRUarX languages/julia.min.js
+sha384-PlbPTkKSUyBjFq+ZGgPWzTQOLWFnmCRIdncm9J6t51lDqtoCOGpH4tlmW8M78QN7 languages/lasso.min.js
+sha384-lRoW8CJFiYIXjKHbqlGoF1Mfay75RYgjCp2tcLolMG43ncg8gz7Uu9zHxNiGWOBe languages/leaf.min.js
+sha384-HGCIwzrEhwAQqVPGoe8DaKA2MkR2hGIi+Tf33G5YRJAxSsuMaYJ7PHLD6AH6mBJs languages/ldif.min.js
+sha384-rOn7ZE80mgLvW2pa1lp742RyNYqwLSxssGrE8AP6wBgUQz3NYr06/vdFh/+s2n6j languages/lisp.min.js
+sha384-9kZBNYc/QPKNzj6Ku9SHyDi08cgAPfsJxQSA5MqG15TZJfjcWz6dmlB++S0vO77I languages/livecodeserver.min.js
+sha384-HmgZCYX+hU72QMMdHOuDGXhyf/2rr5PKG7PcdrGzha8Ed69tO5NJGpiHWEA4VSmE languages/lsl.min.js
+sha384-SACfbePzEJYN1viOIfsms0xZvfdXdbKfO64gDJtKg13yf70gEi1Utdl/J6FnqzUJ languages/lua.min.js
+sha384-EAL/it1j0MqvRD8plWZNZF1ZjItmj8YSap6kr7sqMRBnKgdgsqKt8gBSGMJdWgss languages/makefile.min.js
+sha384-QRD3fIQmXsE0yF4A2U60TsArKVOpaAmQjefrs9sT7KodViyWgldExqROBSoMQtZv languages/matlab.min.js
+sha384-bfWKUx4btBNitySjJcBCzFFUcjtIAWeZ+6LajvcSVT0q3z/Ae3gyKB2TD9mx7jMZ languages/maxima.min.js
+sha384-ao5HZEdfYEBgfF5EpW2SUyeQu1OXfZ9nscRMOB9rz0cfu4xCuSh3fH16/M3NFv4s languages/mel.min.js
+sha384-BPFnVLkR+rNfiJN+UckGPNwq8714h+qCUPPAD9WqyjLER9jvEzdi9T1LmeZB8TsX languages/mercury.min.js
+sha384-ydRxb07zddIsmM8w0RB2qGAOsBEEwpQpadYXQZ67GVVQVk0WgJZy2MIfjbTLhBy+ languages/mipsasm.min.js
+sha384-5l8YArFQyj6YihJ3Edflfbd/4iKOC4M6RKIEbXEo3I4j1YW6BvFcOGtuuH5tjMlH languages/mojolicious.min.js
+sha384-NPnXMjgnbHWx4voFBLZ81vbTbPBjYFWdIv/U4HHdwJzyieZWk71Wx+c8Ca3ylW6A languages/mizar.min.js
+sha384-dXmkV5N9R5RvQbK1F/sGRnCHwRaw4vWydZK9tIFgiV7t1zt/0vUWhe/pa3q2v9mI languages/moonscript.min.js
+sha384-Bbs/DrOuUjm6mm3eUFlJyQDgZ2DvyHMLIldWfVn2g76cQhSKuuOdrbCt7arSPHbP languages/n1ql.min.js
+sha384-Cz8zoXmNxTSI+DCD09p1SuQ9hlqu90jQkJp4y2PNyo6L1FV9AzKuIhB2e+tWLi9U languages/nginx.min.js
+sha384-L39ot82OCLYxcvdtdL/NLtm+H5dQ7LWjf7D2c6fGKtN7YmyKJG2sNP2YqprBs1oz languages/monkey.min.js
+sha384-NJLTfrv933lXH2AxTf48cg8qRuQKKsByTGwHTboZfJhDlo1BiGTWGlr6+xx1169H languages/nim.min.js
+sha384-YRUvVouO7tekX6Xo+3aG7wBIs5XsuGCyJVov7yGrCSoyv/Psb36L836jBoYhDEN5 languages/nix.min.js
+sha384-AY4iFmq9UsA9u1c3TwbK8gFZr1gidEukjA3WhpuNEJlnLdGC/TxGz5LtXNWUNTkJ languages/node-repl.min.js
+sha384-wOh5xoAAH/5NXxZC60BQ/zSFxokVnS1U2LPPPP3e4tsn73Csy6YFLYrL9/v1zAqm languages/objectivec.min.js
+sha384-hXlN5RjcNCZyc1k+7cJhyQoyGX+e8UVQsTdUV9c++mSTUbzebDBO8X0PRTi2h+QS languages/nsis.min.js
+sha384-jMoDjaiOyioys+8cwaG8y2/X3WBIIu/1IM7ReKA/2FyNpaJyABE4uBPTa39IaEHO languages/ocaml.min.js
+sha384-HdOG5GpBq1iSzLDvtwVgM63z8qVoKAVhueHGxEn9p94zdeEKxWBhaQE0dTF3f0NB languages/openscad.min.js
+sha384-aFvVIDZmt0iEHWm1kaafmdtHk7aiDRIDPWLdGcXUctR3Jsh65FiXkguKzifvAdey languages/oxygene.min.js
+sha384-1EkoPHKgQ14NaBML6WQwpaqU3QsSw3O3PQ7AnC5QIpTURbEMD5qAKwmg49hq3Wwp languages/parser3.min.js
+sha384-LogvK0btBQrFE0ouYeISK6ijqbqBtIM4BXdaNvT3I8pUf1h6EctnRZaWjL3qe99Q languages/pf.min.js
+sha384-R0zQs2gWbmpOQ3eruYo/yPS5kFdkSAK/s8ArK28QA6gbZjeYKFussFlhpifvGCAW languages/pgsql.min.js
+sha384-Fep1W020/nkWUCngJ90ZFLD9U8aUSXrPWZCXl+B2/l4KeROZuQ0iKM5QJxvSMZaI languages/php-template.min.js
+sha384-fsdVSK14OKIivfPOlrW9CgYOcoGbZvWqfNz00+SVi06rV1JBpi3d3PgrHYBNuXrB languages/php.min.js
+sha384-bcdnWe/gY6KRE4KDT0Wf5CAwn7jvk/k3qmRWzrmP/xz4I8ZvBzV0AH6TT6VOnu7/ languages/plaintext.min.js
+sha384-wawWKVw2LnQnvLByA9K6/KNG5wVaX1oa82bAJfKLMjpEN6dMtUsz53m6Ir0X7xfG languages/pony.min.js
+sha384-+05Cp42tk0QutdpySQ0HsmEskItQQcyh04nmNheHuy1epFAdvUC9kpiwJk9lx419 languages/powershell.min.js
+sha384-7vppZSphjTAYcJo+xGQAlSDmvu9ZqnYfRxR53KCrdq+ytGyzHsuWbJd0HQ1pzbdJ languages/processing.min.js
+sha384-gxSjZNVBfe+WrGCdFrHrTkJDFmAtx56vza/DJXsk6ECYMjLvVel68ipkU7rmHAJb languages/profile.min.js
+sha384-ehKZdAyoLECKGzWhSHnFgWOgPQxDnjPIKStoBqFyXqc6qk6AMVShU8ifOB1TdbsM languages/prolog.min.js
+sha384-/0Xkyok387IUc5QVnBK9HIuRjtBKaGEIneCpE+3Vs3hxxMRiQcgw9iIvvYc95FUp languages/properties.min.js
+sha384-fgYTbDrZ8l9+4/cXo1iB/tbMhC6d2GxY9pfeIvkKUUpGW8gENjh1JWAGezt+KS5h languages/protobuf.min.js
+sha384-B9EdM1QAzGUr4qTBiEvBUrPXD/hoMJXBpz/5sfSD7RwVfQDfj2tHax8AJpmf41MD languages/puppet.min.js
+sha384-iBlKb7y8L90GXzSSIo5JthJr+sECJJJ0+UMxgTm27S2ooAqUegzWDIi7MRGx4ufV languages/purebasic.min.js
+sha384-8r7q1IleicED+patBjtcTVgGn82qTptKmtQzpP4wistVDwA+62/iI3Gz3pjrzs8h languages/python-repl.min.js
+sha384-63eoubbwL/MravQEWQSuISRuMiRwhe1vy9KswfyCH4mLNelSyghDegOtv9G+GHEm languages/q.min.js
+sha384-XN4H46LZvk1Hjr4vDcpwPJelA2JhiBqSedUfqyDzWuYzOTOaK5VXXCkqIQWTLlO8 languages/reasonml.min.js
+sha384-BvRpA1zFC2KJWr1c1+ir4XhGxlsgEEiSmNNsh7oeRoR1wxFMxrzOWmLvySOptOKU languages/rib.min.js
+sha384-rWTFYkdCHaEf9omY+BRJyNguub90kpgODCOCpwWC8rmEdxmxBioWfWQihlX+8ZjM languages/roboconf.min.js
+sha384-OKhKiCsF7i0qyDVZBd1YFDoJnPHFk3VwxfMeKLgW2eVi1s+svHwottFHoUq7nW0P languages/routeros.min.js
+sha384-w32piHDsQTKkWe5PWg3fjEjedriU5540yLsgGQrYwZlljh0CutQ2HQCLL+Q0h1ps languages/rsl.min.js
+sha384-qNasb1HDmkx9YeEHveIn8Igfw+T3u7Pevu5qjHcCN9VAYYPVYjOFc/KkVoMGe+qW languages/ruleslanguage.min.js
+sha384-HmrWxo198cgFtd8wn/QzwKPhF+I8+m38ig0jJX0XoydCL2/1zeCQh29PJm3p8e0i languages/rust.min.js
+sha384-eSBmuLOd+qc6kUk8yKajAQxFUWKj9PI4NgBZHCVSVtqwDOgqUr1be57JB5mxH7l5 languages/sas.min.js
+sha384-3kPX/Rh0j3roPXh7p+Htm43OSol5TbMEztTWPo1ScpwauTKcq+oJUtflxKA5LNAE languages/scala.min.js
+sha384-J8S0gjtUEiPRGCVwE8rXbmId0CmPEqb+uMQOkYmVkxpFwqIsyS8szFmZLo4vJntq languages/scheme.min.js
+sha384-wQmBjjd+UBhrHNg2W1Td5iAdFtlJXmcE2fWVZKG7irLqbev2WgfDINL7aDB7wiF1 languages/scilab.min.js
+sha384-fY/vCLRbtgtZ0gNaZThltfXa24ZKufjvc+/O9I2vkJarFQfBrrYGIN5FVQMoWqtn languages/shell.min.js
+sha384-8R0LlbUQpEtb8UI2YA72ZGv4uAnVk1fru9/yU0Xe5Lak8NmE03d4e30Htp6A+znw languages/smali.min.js
+sha384-KSxYd+neFhKwZVk5Z51iCGVqwTgquV/+1A+07SPwZuCceyntLc69oE0QDWmQceeO languages/smalltalk.min.js
+sha384-ew0YHyO4cpPE+njECIRXJvQuOV6UlJMNOIUve+D39F41XlhbJ3p/rV0Ti3EEUIGu languages/sml.min.js
+sha384-pFqFGtbh4R6Td7sYtwDP8wllN2vTwfJ52wonqNYtXHtmxRy/4/PBWx2l4K8TYgQ2 languages/sql_more.min.js
+sha384-H6dea7lVuXm2PPjLqGXfkK/XL7lqk5SuYSbz4+NQpRV76rT5b0dHF5zcU/YzW5iw languages/sqf.min.js
+sha384-7wbwKtmEZ0obQHEUr0WSxzs5YU201xyoMUTfMyZ1vPnS6bhSmiYz9RFzYCgI2p9T languages/stan.min.js
+sha384-mcyrVjnaNodZ7qybeG1GowZdlKbS7Ef0iS6FndHGtZaID0zK5e2T59F1Bf0tiX6v languages/stata.min.js
+sha384-PZ0CETw732E8/Myt7SEJ9GAFtMCFBm6LPqfk9Q7e6GlvXsj0COG15CqxGxVpa6Sr languages/step21.min.js
+sha384-+HXbvTy+b3v6gn1TCWkeyFs2Z4XSR3E+YY0dNiDB3O2+30Q8cKgqiZfRuOxToUgq languages/subunit.min.js
+sha384-eBwSxH7cVV95IDDF6N4EYWp7BM3AK5XgvhQEY//JzXOBDvGbe17nGTID12kHdm62 languages/taggerscript.min.js
+sha384-9r/yEiDmY4E2GmU76nfV6BjePlLBG8L2XAscHmkqT0GHlZeRcYCmylYej6Ioz594 languages/tap.min.js
+sha384-Aby+DUJzh2esJoNRVocS0d1+oNlejE4TiEDeejlyRawut5tB+CWwpeN3sK7qoTM/ languages/thrift.min.js
+sha384-KZJDo6WIm2pB7MvVMAkx4HDVDVQ3ZipiJ8BtSMzrIqBTKsPZKQEBMxIqArTq7gPM languages/tp.min.js
+sha384-qpcjkah3zGaeyumclm/MdIGEYQNr1S9Z5kunzoAbQx86EaWX9lF/kX7IN/GS9PV1 languages/twig.min.js
+sha384-bD9CFTHJTTQJParMjUiBvStm6x1dxG5nMDNRwhsWYnlrdMnABOlcb2gDQrV6FJvt languages/vala.min.js
+sha384-T+xrXZwGuakQQNp0tTCZ27b+53/W8sP1GfIrNW1e5kDiiGQwxTbxicSBEDaE0nzS languages/vbscript-html.min.js
+sha384-9QoUTfMOY5r2ItJn3R7hXcupWN+h0noPCygzIGWwccXJjLCUMRO5a14YrXnfnAHM languages/verilog.min.js
+sha384-dWxIjcfzDTzOUYU5ILl8yNAK7/lMehmybcEwDU3HWzrXw7U+lwQbcu+IXFDPglpe languages/vim.min.js
+sha384-fyAJ3VJZiGzG81NZvP0/d6kCqoi4AcIy38WuzdUZbtwKCShAcZZSK0N5XEea+NUf languages/x86asm.min.js
+sha384-/yNHjwJ4ciBcgE8EiA9M4Ppr+ZGgslFyxS0uK8Wswb4U0GLp8Qtz0OAVPDaYlxyk languages/vhdl.min.js
+sha384-m43AzkZtpcAjh0IFM9gI4Z1zfmpW2i+8tOqn8zV4minhMOWFUTmtr5gYlegp7lqp languages/xl.min.js
+sha384-yZy1GCc4ItvX+YSzV2qZnUMD+UsRUp195NByn7NrkOC5vqHR1k8m/pvg4vro/j8i languages/xquery.min.js
+sha384-VgPOQpnV9C73U74qRO8a1xnsjuc8PyDQwEROvDtVrxrDWs5Hm9rjEolBJPEN4AeY languages/yaml.min.js
+sha384-+M/YColDaI1z5pftDUPxi/0RBiRR7Xm6sXnd1XmugHNlKP1S33xH9DSeG3KWUQLm languages/zephir.min.js
+sha384-uD8Dfc0t2PJLDNvs/aCb9wpPZLAtDQol9jy6oieP2RfqX88Wz8ZCpdWexhsH3kPp languages/accesslog.min.js
+sha384-qfv6NqJTBlaw9dHtUKo293i/EfDattaccd0MXSyaNFQeRlzIzUqAvPjcJViYoRXe languages/actionscript.min.js
+sha384-iAN15YaORxP/J1QTjdPkXARoLTNfY5md9/gHLC0yY4BPnm5IK9eBAEf3+GthiTRQ languages/abnf.min.js
+sha384-aKXBKpIVAwWh+bBxH+H+fAM35MwrRanwStZ6Ajq7QTBwzwdLIsykdd4pbtuFLMZK languages/applescript.min.js
+sha384-g9sBw/OhQRsEnrHQaYN4mEyZs35/X6q/F7lkL4MeFNRWNhQT9i76EKcmCHU47o+l languages/aspectj.min.js
+sha384-jw2gEjCRHPj2RXW1vCPGeEHE4fixRL2hHSp6xs2ak5X6hLhFPlztJnRpyANZZ0xB languages/asciidoc.min.js
+sha384-EKomLR5k/rTjz8IOatSbq+mBhIESz7lewIo8iEM4DazrZATij+Rsbeufw34K/xM0 languages/bash.min.js
+sha384-iSYz+TSpeEtJ7qfGaE+lwCjpI8+txbE4AlrsIS5czvCSSBMuh57aSIrtwBzW62wQ languages/c.min.js
+sha384-eKYZFTTQtNmx+VCawogmWvcW6uGiUdIiyULMlyH5wqij7R8l9TJvJu86xFzmClNG languages/cpp.min.js
+sha384-IEO7DxlKDaVUrZfF/RxxRs0uvXJdsn2UKsvl4nqSv41b0sD0gX+voCdLavTutk3W languages/coffeescript.min.js
+sha384-b9tvPpxEMeOyjEm336B/ss1d9UA8fsiuDiAcRPS5GpkjlObM6X1+8AvN7h2k7p11 languages/css.min.js
+sha384-d/i79mEEitmTXCjmb2Xn/m98r1+zWXnmrBNQNIQ7oP/fbF1osWDpcT6GSdeymWPM languages/erlang-repl.min.js
+sha384-YHFj84CL3rcH63ZJ1j9wff5FSICYz+2JFES9iOtIodNvF0Mnzs4i4wxhSnKzvFzg languages/gams.min.js
+sha384-LKFJfTUmR/Cew/UuBxT0kMHBUupq8oEaen8Gv7JHP6fL3+tvyGc1G0g7z1hawODi languages/groovy.min.js
+sha384-+5cy9VK5iZlCb26CMj6+/fFkPfkv/V147YpA+w3HyjmpAonqTSQ5gpC03MsFa8vg languages/handlebars.min.js
+sha384-HxvolgcZpZoiLekF8GA+30gDSu11b4RTylhILsznL5lju66moI0xzSzCglxLAhBC languages/ini.min.js
+sha384-Hj8Q7Pxe6/LujOTiM3IO7cxEa4+wpWNObpCIIGrmA6kjK1NuDvHPcrTKMWwbEs5f languages/irpf90.min.js
+sha384-OE/vvuVUdaDUJirKKRerHPsC4D8EIDGB8y7p058sJZLhjwLgFyWwDW9HCsvfsLVc languages/javascript.min.js
+sha384-vzwEVT3SaiPP0kFT6BcA5kgWS7WGdqvecyxu/CrWkwkquZYeF3ZOTYZGkn+88hkz languages/fortran.min.js
+sha384-IL+8oOwtQNBjcZO8EgqcFocPHK23XaRk40EppAL4JNCy+sPaL2cC3vBz1YqncXyf languages/latex.min.js
+sha384-+bNlpnF5KVBQi1HS90GcwEh2HlNKfYgNe7ZWTc3u9m/N03j/xTNbuqWgcIdEW7pl languages/less.min.js
+sha384-Y4+5o2xu6RVGT7F23c1OMPiQFTIqAhBZXYbSVwO7pOyBhq53OsW4L3i3fH/aT5ds languages/livescript.min.js
+sha384-i+QgEvhcuCJYJvF5HzebUkMp/u3V2faoIoHThuq2bLGH7NQYbdXOAW0W4z7k5SjN languages/llvm.min.js
+sha384-M4Qtyn+cFpVbub3Hqd+7bVpVMrsVMfajiJIvUlixvhSuNjrS//2gV2HOA7/Wh+EV languages/markdown.min.js
+sha384-2VZlOY1GGeHpmEPnJhVKDbeZsznNuBOtxH+TRYwHDEXilmYAXXs1NYXDyuAKC5mn languages/kotlin.min.js
+sha384-pLC2fjL4RX2HIDmyz/hcXykQaB2V5MRXFOK1dPPrKbGtASdWH9L2Y8fRtEDZJZ8g languages/perl.min.js
+sha384-wfQnSiM8EoDpJADCXP31VrSO2HXPPSq/E5ADWsJehwS3nH/bSKF4LZ1DQNNnfNX6 languages/java.min.js
+sha384-IjwnTQXwlyoJ/7VGU0YMOgH7YeyKamQHePxSJx45TM0E3RclqH1u5mEknM9XGbhO languages/python.min.js
+sha384-YKEyFfSCVDXIuwx1m0vPetRPRuSJ3Ip40qqdRXtVn+WjKnZm0rAAxRmMci0SuSQL languages/qml.min.js
+sha384-j1mMclIlLlf9RpzERV88BwphcRy2sHE7BcAysuKhG+mlJmfAWmhYoyeDuKNKSQYh languages/r.min.js
+sha384-u9niIISsM6RYB7IlcTI6p9cveYd/tFn41QTAxo7jxmiMyovaFW/JNSsMBuBWtQMC languages/ruby.min.js
+sha384-rmvWOA2DyLjSNO7gdxMSXOGasMo3yKnBSgyTwoWVAZga/XsGLk8jc+elCsC6ihB6 languages/scss.min.js
+sha384-y56j3lCDE6MoQTk+064+2M3RsOeK9Xpdp/c68kWcEEp+W2Ub9wwrSRhtd255EjbF languages/sql.min.js
+sha384-YGH+h+etay4IUY9/2ySIyL8ipN7ctDuUTN8b8HMp7reK5luoU7+tN1MoQ4RId0x6 languages/stylus.min.js
+sha384-zp4535bqA5P8Vr4n9H0nz1+zBCyZEM0XTDmmNZ1LE/MYo9iKocvWajJ2dh1HnkVb languages/tcl.min.js
+sha384-dlzifGEMgpkIQG/yyLYDmWbqe6fFsgDwEEksq8XBG49Ut4tz+hK2rKMuYkgcLZeb languages/vbnet.min.js
+sha384-+nZkongHcWLMVCCTTH6M2MBw5pjjr+I+gh/ZBMAXhdfjPF1CpPyPCiCKrCjOOjnQ languages/vbscript.min.js
+sha384-dSBjgFpfZ6gOlZRtZ+x2OB5UTickh0EyNRBtsVh59UfAgcAmbE5N2mDS4ISHjDVj languages/mathematica.min.js
+sha384-jOk4zI+oJszlf0iolGuNY4pdzlkePjGLKAUkRJ9Vzlz4lF2pFxw23Nypg5kF38Nt languages/xml.min.js
+sha384-xyQi0iq9A0NgL4qakH1cGml2RW3Nf4ztRbnIS82VfOrqtOWNUCK2awE1rOOf28TG languages/http.min.js
+sha384-NTPuf1g0NV2mUL7WCq+k235cu4xiSHRKg2iYeFKSJ67iXAkQ4n6HNTfTo8AXvxtV languages/swift.min.js
+sha384-cbanegf1NRwCF8lUNGDS21kCMzz4795XEs/EWfmmIPNeOepqsIBXoHetP7z2VMTW languages/arduino.min.js
+sha384-nrZRzpHYreFlMZ4qMmEivW22I9PYmMMg7DO95tygDi945aNFBbMiAHrjWEVF4ULR languages/c-like.min.js
+sha384-mS3kKP0kUdhMbBTbsTW+P2oglwizq/pN4HGkQweYav/iCcQW2BTiw1uF7U8X7R9b languages/htmlbars.min.js
+sha384-PgxTdQkErDvW+Ih8HMnkXlaGgWIQ7c6U2mIJMIhg2REDsdQM1WrBgajBy/CCVKhB languages/typescript.min.js
+```
diff --git a/vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js b/vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js
index 1a7b5a918f..0586d30be4 100644
--- a/vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js
+++ b/vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js
@@ -1,9 +1,431 @@
 /*
-  Highlight.js 10.1.1 (50827684)
+  Highlight.js 10.6.0 (7f3240ea)
   License: BSD-3-Clause
-  Copyright (c) 2006-2020, Ivan Sagalaev
+  Copyright (c) 2006-2021, Ivan Sagalaev
 */
-var hljs=function(){"use strict";function e(n){Object.freeze(n);var t="function"==typeof n;return Object.getOwnPropertyNames(n).forEach((function(r){!Object.hasOwnProperty.call(n,r)||null===n[r]||"object"!=typeof n[r]&&"function"!=typeof n[r]||t&&("caller"===r||"callee"===r||"arguments"===r)||Object.isFrozen(n[r])||e(n[r])})),n}class n{constructor(e){void 0===e.data&&(e.data={}),this.data=e.data}ignoreMatch(){this.ignore=!0}}function t(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;")}function r(e,...n){var t={};for(const n in e)t[n]=e[n];return n.forEach((function(e){for(const n in e)t[n]=e[n]})),t}function a(e){return e.nodeName.toLowerCase()}var i=Object.freeze({__proto__:null,escapeHTML:t,inherit:r,nodeStream:function(e){var n=[];return function e(t,r){for(var i=t.firstChild;i;i=i.nextSibling)3===i.nodeType?r+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:r,node:i}),r=e(i,r),a(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:r,node:i}));return r}(e,0),n},mergeStreams:function(e,n,r){var i=0,s="",o=[];function l(){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){s+="<"+a(e)+[].map.call(e.attributes,(function(e){return" "+e.nodeName+'="'+t(e.value)+'"'})).join("")+">"}function u(e){s+="</"+a(e)+">"}function g(e){("start"===e.event?c:u)(e.node)}for(;e.length||n.length;){var d=l();if(s+=t(r.substring(i,d[0].offset)),i=d[0].offset,d===e){o.reverse().forEach(u);do{g(d.splice(0,1)[0]),d=l()}while(d===e&&d.length&&d[0].offset===i);o.reverse().forEach(c)}else"start"===d[0].event?o.push(d[0].node):o.pop(),g(d.splice(0,1)[0])}return s+t(r.substr(i))}});const s=e=>!!e.kind;class o{constructor(e,n){this.buffer="",this.classPrefix=n.classPrefix,e.walk(this)}addText(e){this.buffer+=t(e)}openNode(e){if(!s(e))return;let n=e.kind;e.sublanguage||(n=`${this.classPrefix}${n}`),this.span(n)}closeNode(e){s(e)&&(this.buffer+="</span>")}value(){return this.buffer}span(e){this.buffer+=`<span class="${e}">`}}class l{constructor(){this.rootNode={children:[]},this.stack=[this.rootNode]}get top(){return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){this.top.children.push(e)}openNode(e){const n={kind:e,children:[]};this.add(n),this.stack.push(n)}closeNode(){if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,n){return"string"==typeof n?e.addText(n):n.children&&(e.openNode(n),n.children.forEach(n=>this._walk(e,n)),e.closeNode(n)),e}static _collapse(e){"string"!=typeof e&&e.children&&(e.children.every(e=>"string"==typeof e)?e.children=[e.children.join("")]:e.children.forEach(e=>{l._collapse(e)}))}}class c extends l{constructor(e){super(),this.options=e}addKeyword(e,n){""!==e&&(this.openNode(n),this.addText(e),this.closeNode())}addText(e){""!==e&&this.add(e)}addSublanguage(e,n){const t=e.root;t.kind=n,t.sublanguage=!0,this.add(t)}toHTML(){return new o(this,this.options).value()}finalize(){return!0}}function u(e){return e?"string"==typeof e?e:e.source:null}const g="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",d={begin:"\\\\[\\s\\S]",relevance:0},h={className:"string",begin:"'",end:"'",illegal:"\\n",contains:[d]},f={className:"string",begin:'"',end:'"',illegal:"\\n",contains:[d]},p={begin:/\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/},b=function(e,n,t={}){var a=r({className:"comment",begin:e,end:n,contains:[]},t);return a.contains.push(p),a.contains.push({className:"doctag",begin:"(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):",relevance:0}),a},m=b("//","$"),v=b("/\\*","\\*/"),x=b("#","$");var E=Object.freeze({__proto__:null,IDENT_RE:"[a-zA-Z]\\w*",UNDERSCORE_IDENT_RE:"[a-zA-Z_]\\w*",NUMBER_RE:"\\b\\d+(\\.\\d+)?",C_NUMBER_RE:g,BINARY_NUMBER_RE:"\\b(0b[01]+)",RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",SHEBANG:(e={})=>{const n=/^#![ ]*\//;return e.binary&&(e.begin=function(...e){return e.map(e=>u(e)).join("")}(n,/.*\b/,e.binary,/\b.*/)),r({className:"meta",begin:n,end:/$/,relevance:0,"on:begin":(e,n)=>{0!==e.index&&n.ignoreMatch()}},e)},BACKSLASH_ESCAPE:d,APOS_STRING_MODE:h,QUOTE_STRING_MODE:f,PHRASAL_WORDS_MODE:p,COMMENT:b,C_LINE_COMMENT_MODE:m,C_BLOCK_COMMENT_MODE:v,HASH_COMMENT_MODE:x,NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?",relevance:0},C_NUMBER_MODE:{className:"number",begin:g,relevance:0},BINARY_NUMBER_MODE:{className:"number",begin:"\\b(0b[01]+)",relevance:0},CSS_NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?(%|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},REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{className:"regexp",begin:/\//,end:/\/[gimuy]*/,illegal:/\n/,contains:[d,{begin:/\[/,end:/\]/,relevance:0,contains:[d]}]}]},TITLE_MODE:{className:"title",begin:"[a-zA-Z]\\w*",relevance:0},UNDERSCORE_TITLE_MODE:{className:"title",begin:"[a-zA-Z_]\\w*",relevance:0},METHOD_GUARD:{begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},END_SAME_AS_BEGIN:function(e){return Object.assign(e,{"on:begin":(e,n)=>{n.data._beginMatch=e[1]},"on:end":(e,n)=>{n.data._beginMatch!==e[1]&&n.ignoreMatch()}})}}),_="of and for in not or if then".split(" ");function N(e,n){return n?Number(n):function(e){return _.includes(e.toLowerCase())}(e)?0:1}const w={props:["language","code","autodetect"],data:function(){return{detectedLanguage:"",unknownLanguage:!1}},computed:{className(){return this.unknownLanguage?"":"hljs "+this.detectedLanguage},highlighted(){if(!this.autoDetect&&!hljs.getLanguage(this.language))return console.warn(`The language "${this.language}" you specified could not be found.`),this.unknownLanguage=!0,t(this.code);let e;return this.autoDetect?(e=hljs.highlightAuto(this.code),this.detectedLanguage=e.language):(e=hljs.highlight(this.language,this.code,this.ignoreIllegals),this.detectectLanguage=this.language),e.value},autoDetect(){return!(this.language&&(e=this.autodetect,!e&&""!==e));var e},ignoreIllegals:()=>!0},render(e){return e("pre",{},[e("code",{class:this.className,domProps:{innerHTML:this.highlighted}})])}},y={install(e){e.component("highlightjs",w)}},R=t,k=r,{nodeStream:O,mergeStreams:M}=i,L=Symbol("nomatch");return function(t){var a=[],i=Object.create(null),s=Object.create(null),o=[],l=!0,g=/(^(<[^>]+>|\t|)+|\n)/gm,d="Could not find the language '{}', did you forget to load/include a language module?";const h={disableAutodetect:!0,name:"Plain text",contains:[]};var f={noHighlightRe:/^(no-?highlight)$/i,languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:null,__emitter:c};function p(e){return f.noHighlightRe.test(e)}function b(e,n,t,r){var a={code:n,language:e};I("before:highlight",a);var i=a.result?a.result:m(a.language,a.code,t,r);return i.code=a.code,I("after:highlight",i),i}function m(e,t,a,s){var o=t;function c(e,n){var t=E.case_insensitive?n[0].toLowerCase():n[0];return Object.prototype.hasOwnProperty.call(e.keywords,t)&&e.keywords[t]}function g(){null!=y.subLanguage?function(){if(""!==M){var e=null;if("string"==typeof y.subLanguage){if(!i[y.subLanguage])return void O.addText(M);e=m(y.subLanguage,M,!0,k[y.subLanguage]),k[y.subLanguage]=e.top}else e=v(M,y.subLanguage.length?y.subLanguage:null);y.relevance>0&&(j+=e.relevance),O.addSublanguage(e.emitter,e.language)}}():function(){if(!y.keywords)return void O.addText(M);let e=0;y.keywordPatternRe.lastIndex=0;let n=y.keywordPatternRe.exec(M),t="";for(;n;){t+=M.substring(e,n.index);const r=c(y,n);if(r){const[e,a]=r;O.addText(t),t="",j+=a,O.addKeyword(n[0],e)}else t+=n[0];e=y.keywordPatternRe.lastIndex,n=y.keywordPatternRe.exec(M)}t+=M.substr(e),O.addText(t)}(),M=""}function h(e){return e.className&&O.openNode(e.className),y=Object.create(e,{parent:{value:y}})}function p(e){return 0===y.matcher.regexIndex?(M+=e[0],1):(S=!0,0)}var b={};function x(t,r){var i=r&&r[0];if(M+=t,null==i)return g(),0;if("begin"===b.type&&"end"===r.type&&b.index===r.index&&""===i){if(M+=o.slice(r.index,r.index+1),!l){const n=Error("0 width match regex");throw n.languageName=e,n.badRule=b.rule,n}return 1}if(b=r,"begin"===r.type)return function(e){var t=e[0],r=e.rule;const a=new n(r),i=[r.__beforeBegin,r["on:begin"]];for(const n of i)if(n&&(n(e,a),a.ignore))return p(t);return r&&r.endSameAsBegin&&(r.endRe=RegExp(t.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")),r.skip?M+=t:(r.excludeBegin&&(M+=t),g(),r.returnBegin||r.excludeBegin||(M=t)),h(r),r.returnBegin?0:t.length}(r);if("illegal"===r.type&&!a){const e=Error('Illegal lexeme "'+i+'" for mode "'+(y.className||"<unnamed>")+'"');throw e.mode=y,e}if("end"===r.type){var s=function(e){var t=e[0],r=o.substr(e.index),a=function e(t,r,a){let i=function(e,n){var t=e&&e.exec(n);return t&&0===t.index}(t.endRe,a);if(i){if(t["on:end"]){const e=new n(t);t["on:end"](r,e),e.ignore&&(i=!1)}if(i){for(;t.endsParent&&t.parent;)t=t.parent;return t}}if(t.endsWithParent)return e(t.parent,r,a)}(y,e,r);if(!a)return L;var i=y;i.skip?M+=t:(i.returnEnd||i.excludeEnd||(M+=t),g(),i.excludeEnd&&(M=t));do{y.className&&O.closeNode(),y.skip||y.subLanguage||(j+=y.relevance),y=y.parent}while(y!==a.parent);return a.starts&&(a.endSameAsBegin&&(a.starts.endRe=a.endRe),h(a.starts)),i.returnEnd?0:t.length}(r);if(s!==L)return s}if("illegal"===r.type&&""===i)return 1;if(I>1e5&&I>3*r.index)throw Error("potential infinite loop, way more iterations than matches");return M+=i,i.length}var E=T(e);if(!E)throw console.error(d.replace("{}",e)),Error('Unknown language: "'+e+'"');var _=function(e){function n(n,t){return RegExp(u(n),"m"+(e.case_insensitive?"i":"")+(t?"g":""))}class t{constructor(){this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}addRule(e,n){n.position=this.position++,this.matchIndexes[this.matchAt]=n,this.regexes.push([n,e]),this.matchAt+=function(e){return RegExp(e.toString()+"|").exec("").length-1}(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null);const e=this.regexes.map(e=>e[1]);this.matcherRe=n(function(e,n="|"){for(var t=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./,r=0,a="",i=0;i<e.length;i++){var s=r+=1,o=u(e[i]);for(i>0&&(a+=n),a+="(";o.length>0;){var l=t.exec(o);if(null==l){a+=o;break}a+=o.substring(0,l.index),o=o.substring(l.index+l[0].length),"\\"===l[0][0]&&l[1]?a+="\\"+(Number(l[1])+s):(a+=l[0],"("===l[0]&&r++)}a+=")"}return a}(e),!0),this.lastIndex=0}exec(e){this.matcherRe.lastIndex=this.lastIndex;const n=this.matcherRe.exec(e);if(!n)return null;const t=n.findIndex((e,n)=>n>0&&void 0!==e),r=this.matchIndexes[t];return n.splice(0,t),Object.assign(n,r)}}class a{constructor(){this.rules=[],this.multiRegexes=[],this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){if(this.multiRegexes[e])return this.multiRegexes[e];const n=new t;return this.rules.slice(e).forEach(([e,t])=>n.addRule(e,t)),n.compile(),this.multiRegexes[e]=n,n}considerAll(){this.regexIndex=0}addRule(e,n){this.rules.push([e,n]),"begin"===n.type&&this.count++}exec(e){const n=this.getMatcher(this.regexIndex);n.lastIndex=this.lastIndex;const t=n.exec(e);return t&&(this.regexIndex+=t.position+1,this.regexIndex===this.count&&(this.regexIndex=0)),t}}function i(e,n){const t=e.input[e.index-1],r=e.input[e.index+e[0].length];"."!==t&&"."!==r||n.ignoreMatch()}if(e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");return function t(s,o){const l=s;if(s.compiled)return l;s.compiled=!0,s.__beforeBegin=null,s.keywords=s.keywords||s.beginKeywords;let c=null;if("object"==typeof s.keywords&&(c=s.keywords.$pattern,delete s.keywords.$pattern),s.keywords&&(s.keywords=function(e,n){var t={};return"string"==typeof e?r("keyword",e):Object.keys(e).forEach((function(n){r(n,e[n])})),t;function r(e,r){n&&(r=r.toLowerCase()),r.split(" ").forEach((function(n){var r=n.split("|");t[r[0]]=[e,N(r[0],r[1])]}))}}(s.keywords,e.case_insensitive)),s.lexemes&&c)throw Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ");return l.keywordPatternRe=n(s.lexemes||c||/\w+/,!0),o&&(s.beginKeywords&&(s.begin="\\b("+s.beginKeywords.split(" ").join("|")+")(?=\\b|\\s)",s.__beforeBegin=i),s.begin||(s.begin=/\B|\b/),l.beginRe=n(s.begin),s.endSameAsBegin&&(s.end=s.begin),s.end||s.endsWithParent||(s.end=/\B|\b/),s.end&&(l.endRe=n(s.end)),l.terminator_end=u(s.end)||"",s.endsWithParent&&o.terminator_end&&(l.terminator_end+=(s.end?"|":"")+o.terminator_end)),s.illegal&&(l.illegalRe=n(s.illegal)),void 0===s.relevance&&(s.relevance=1),s.contains||(s.contains=[]),s.contains=[].concat(...s.contains.map((function(e){return function(e){return e.variants&&!e.cached_variants&&(e.cached_variants=e.variants.map((function(n){return r(e,{variants:null},n)}))),e.cached_variants?e.cached_variants:function e(n){return!!n&&(n.endsWithParent||e(n.starts))}(e)?r(e,{starts:e.starts?r(e.starts):null}):Object.isFrozen(e)?r(e):e}("self"===e?s:e)}))),s.contains.forEach((function(e){t(e,l)})),s.starts&&t(s.starts,o),l.matcher=function(e){const n=new a;return e.contains.forEach(e=>n.addRule(e.begin,{rule:e,type:"begin"})),e.terminator_end&&n.addRule(e.terminator_end,{type:"end"}),e.illegal&&n.addRule(e.illegal,{type:"illegal"}),n}(l),l}(e)}(E),w="",y=s||_,k={},O=new f.__emitter(f);!function(){for(var e=[],n=y;n!==E;n=n.parent)n.className&&e.unshift(n.className);e.forEach(e=>O.openNode(e))}();var M="",j=0,A=0,I=0,S=!1;try{for(y.matcher.considerAll();;){I++,S?S=!1:(y.matcher.lastIndex=A,y.matcher.considerAll());const e=y.matcher.exec(o);if(!e)break;const n=x(o.substring(A,e.index),e);A=e.index+n}return x(o.substr(A)),O.closeAllNodes(),O.finalize(),w=O.toHTML(),{relevance:j,value:w,language:e,illegal:!1,emitter:O,top:y}}catch(n){if(n.message&&n.message.includes("Illegal"))return{illegal:!0,illegalBy:{msg:n.message,context:o.slice(A-100,A+100),mode:n.mode},sofar:w,relevance:0,value:R(o),emitter:O};if(l)return{illegal:!1,relevance:0,value:R(o),emitter:O,language:e,top:y,errorRaised:n};throw n}}function v(e,n){n=n||f.languages||Object.keys(i);var t=function(e){const n={relevance:0,emitter:new f.__emitter(f),value:R(e),illegal:!1,top:h};return n.emitter.addText(e),n}(e),r=t;return n.filter(T).filter(A).forEach((function(n){var a=m(n,e,!1);a.language=n,a.relevance>r.relevance&&(r=a),a.relevance>t.relevance&&(r=t,t=a)})),r.language&&(t.second_best=r),t}function x(e){return f.tabReplace||f.useBR?e.replace(g,e=>"\n"===e?f.useBR?"<br>":e:f.tabReplace?e.replace(/\t/g,f.tabReplace):e):e}function _(e){let n=null;const t=function(e){var n=e.className+" ";n+=e.parentNode?e.parentNode.className:"";const t=f.languageDetectRe.exec(n);if(t){var r=T(t[1]);return r||(console.warn(d.replace("{}",t[1])),console.warn("Falling back to no-highlight mode for this block.",e)),r?t[1]:"no-highlight"}return n.split(/\s+/).find(e=>p(e)||T(e))}(e);if(p(t))return;I("before:highlightBlock",{block:e,language:t}),f.useBR?(n=document.createElement("div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ /]*>/g,"\n")):n=e;const r=n.textContent,a=t?b(t,r,!0):v(r),i=O(n);if(i.length){const e=document.createElement("div");e.innerHTML=a.value,a.value=M(i,O(e),r)}a.value=x(a.value),I("after:highlightBlock",{block:e,result:a}),e.innerHTML=a.value,e.className=function(e,n,t){var r=n?s[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),e.includes(r)||a.push(r),a.join(" ").trim()}(e.className,t,a.language),e.result={language:a.language,re:a.relevance,relavance:a.relevance},a.second_best&&(e.second_best={language:a.second_best.language,re:a.second_best.relevance,relavance:a.second_best.relevance})}const w=()=>{if(!w.called){w.called=!0;var e=document.querySelectorAll("pre code");a.forEach.call(e,_)}};function T(e){return e=(e||"").toLowerCase(),i[e]||i[s[e]]}function j(e,{languageName:n}){"string"==typeof e&&(e=[e]),e.forEach(e=>{s[e]=n})}function A(e){var n=T(e);return n&&!n.disableAutodetect}function I(e,n){var t=e;o.forEach((function(e){e[t]&&e[t](n)}))}Object.assign(t,{highlight:b,highlightAuto:v,fixMarkup:x,highlightBlock:_,configure:function(e){f=k(f,e)},initHighlighting:w,initHighlightingOnLoad:function(){window.addEventListener("DOMContentLoaded",w,!1)},registerLanguage:function(e,n){var r=null;try{r=n(t)}catch(n){if(console.error("Language definition for '{}' could not be registered.".replace("{}",e)),!l)throw n;console.error(n),r=h}r.name||(r.name=e),i[e]=r,r.rawDefinition=n.bind(null,t),r.aliases&&j(r.aliases,{languageName:e})},listLanguages:function(){return Object.keys(i)},getLanguage:T,registerAliases:j,requireLanguage:function(e){var n=T(e);if(n)return n;throw Error("The '{}' language is required, but not loaded.".replace("{}",e))},autoDetection:A,inherit:k,addPlugin:function(e){o.push(e)},vuePlugin:y}),t.debugMode=function(){l=!1},t.safeMode=function(){l=!0},t.versionString="10.1.1";for(const n in E)"object"==typeof E[n]&&e(E[n]);return Object.assign(t,E),t}({})}();"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);
-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:/#(?!!)/}}}());
-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]}}}());
-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
+var hljs=function(){"use strict";function e(t){
+return t instanceof Map?t.clear=t.delete=t.set=()=>{
+throw Error("map is read-only")}:t instanceof Set&&(t.add=t.clear=t.delete=()=>{
+throw Error("set is read-only")
+}),Object.freeze(t),Object.getOwnPropertyNames(t).forEach((n=>{var i=t[n]
+;"object"!=typeof i||Object.isFrozen(i)||e(i)})),t}var t=e,n=e;t.default=n
+;class i{constructor(e){void 0===e.data&&(e.data={}),this.data=e.data}
+ignoreMatch(){this.ignore=!0}}function r(e){
+return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;")
+}function s(e,...t){const n=Object.create(null);for(const t in e)n[t]=e[t]
+;return t.forEach((e=>{for(const t in e)n[t]=e[t]})),n}const a=e=>!!e.kind
+;class l{constructor(e,t){
+this.buffer="",this.classPrefix=t.classPrefix,e.walk(this)}addText(e){
+this.buffer+=r(e)}openNode(e){if(!a(e))return;let t=e.kind
+;e.sublanguage||(t=`${this.classPrefix}${t}`),this.span(t)}closeNode(e){
+a(e)&&(this.buffer+="</span>")}value(){return this.buffer}span(e){
+this.buffer+=`<span class="${e}">`}}class o{constructor(){this.rootNode={
+children:[]},this.stack=[this.rootNode]}get top(){
+return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){
+this.top.children.push(e)}openNode(e){const t={kind:e,children:[]}
+;this.add(t),this.stack.push(t)}closeNode(){
+if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){
+for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}
+walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,t){
+return"string"==typeof t?e.addText(t):t.children&&(e.openNode(t),
+t.children.forEach((t=>this._walk(e,t))),e.closeNode(t)),e}static _collapse(e){
+"string"!=typeof e&&e.children&&(e.children.every((e=>"string"==typeof e))?e.children=[e.children.join("")]:e.children.forEach((e=>{
+o._collapse(e)})))}}class c extends o{constructor(e){super(),this.options=e}
+addKeyword(e,t){""!==e&&(this.openNode(t),this.addText(e),this.closeNode())}
+addText(e){""!==e&&this.add(e)}addSublanguage(e,t){const n=e.root
+;n.kind=t,n.sublanguage=!0,this.add(n)}toHTML(){
+return new l(this,this.options).value()}finalize(){return!0}}function g(e){
+return e?"string"==typeof e?e:e.source:null}
+const u=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./,d="[a-zA-Z]\\w*",h="[a-zA-Z_]\\w*",f="\\b\\d+(\\.\\d+)?",p="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",m="\\b(0b[01]+)",b={
+begin:"\\\\[\\s\\S]",relevance:0},E={className:"string",begin:"'",end:"'",
+illegal:"\\n",contains:[b]},x={className:"string",begin:'"',end:'"',
+illegal:"\\n",contains:[b]},v={
+begin:/\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/
+},w=(e,t,n={})=>{const i=s({className:"comment",begin:e,end:t,contains:[]},n)
+;return i.contains.push(v),i.contains.push({className:"doctag",
+begin:"(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):",relevance:0}),i
+},y=w("//","$"),N=w("/\\*","\\*/"),R=w("#","$");var _=Object.freeze({
+__proto__:null,MATCH_NOTHING_RE:/\b\B/,IDENT_RE:d,UNDERSCORE_IDENT_RE:h,
+NUMBER_RE:f,C_NUMBER_RE:p,BINARY_NUMBER_RE:m,
+RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",
+SHEBANG:(e={})=>{const t=/^#![ ]*\//
+;return e.binary&&(e.begin=((...e)=>e.map((e=>g(e))).join(""))(t,/.*\b/,e.binary,/\b.*/)),
+s({className:"meta",begin:t,end:/$/,relevance:0,"on:begin":(e,t)=>{
+0!==e.index&&t.ignoreMatch()}},e)},BACKSLASH_ESCAPE:b,APOS_STRING_MODE:E,
+QUOTE_STRING_MODE:x,PHRASAL_WORDS_MODE:v,COMMENT:w,C_LINE_COMMENT_MODE:y,
+C_BLOCK_COMMENT_MODE:N,HASH_COMMENT_MODE:R,NUMBER_MODE:{className:"number",
+begin:f,relevance:0},C_NUMBER_MODE:{className:"number",begin:p,relevance:0},
+BINARY_NUMBER_MODE:{className:"number",begin:m,relevance:0},CSS_NUMBER_MODE:{
+className:"number",
+begin:f+"(%|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},REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{className:"regexp",
+begin:/\//,end:/\/[gimuy]*/,illegal:/\n/,contains:[b,{begin:/\[/,end:/\]/,
+relevance:0,contains:[b]}]}]},TITLE_MODE:{className:"title",begin:d,relevance:0
+},UNDERSCORE_TITLE_MODE:{className:"title",begin:h,relevance:0},METHOD_GUARD:{
+begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},END_SAME_AS_BEGIN:e=>Object.assign(e,{
+"on:begin":(e,t)=>{t.data._beginMatch=e[1]},"on:end":(e,t)=>{
+t.data._beginMatch!==e[1]&&t.ignoreMatch()}})});function k(e,t){
+"."===e.input[e.index-1]&&t.ignoreMatch()}function O(e,t){
+t&&e.beginKeywords&&(e.begin="\\b("+e.beginKeywords.split(" ").join("|")+")(?!\\.)(?=\\b|\\s)",
+e.__beforeBegin=k,e.keywords=e.keywords||e.beginKeywords,delete e.beginKeywords,
+void 0===e.relevance&&(e.relevance=0))}function M(e,t){
+Array.isArray(e.illegal)&&(e.illegal=((...e)=>"("+e.map((e=>g(e))).join("|")+")")(...e.illegal))
+}function A(e,t){if(e.match){
+if(e.begin||e.end)throw Error("begin & end are not supported with match")
+;e.begin=e.match,delete e.match}}function L(e,t){
+void 0===e.relevance&&(e.relevance=1)}
+const j=["of","and","for","in","not","or","if","then","parent","list","value"]
+;function B(e,t,n="keyword"){const i={}
+;return"string"==typeof e?r(n,e.split(" ")):Array.isArray(e)?r(n,e):Object.keys(e).forEach((n=>{
+Object.assign(i,B(e[n],t,n))})),i;function r(e,n){
+t&&(n=n.map((e=>e.toLowerCase()))),n.forEach((t=>{const n=t.split("|")
+;i[n[0]]=[e,I(n[0],n[1])]}))}}function I(e,t){
+return t?Number(t):(e=>j.includes(e.toLowerCase()))(e)?0:1}
+function T(e,{plugins:t}){function n(t,n){
+return RegExp(g(t),"m"+(e.case_insensitive?"i":"")+(n?"g":""))}class i{
+constructor(){
+this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}
+addRule(e,t){
+t.position=this.position++,this.matchIndexes[this.matchAt]=t,this.regexes.push([t,e]),
+this.matchAt+=(e=>RegExp(e.toString()+"|").exec("").length-1)(e)+1}compile(){
+0===this.regexes.length&&(this.exec=()=>null)
+;const e=this.regexes.map((e=>e[1]));this.matcherRe=n(((e,t="|")=>{let n=0
+;return e.map((e=>{n+=1;const t=n;let i=g(e),r="";for(;i.length>0;){
+const e=u.exec(i);if(!e){r+=i;break}
+r+=i.substring(0,e.index),i=i.substring(e.index+e[0].length),
+"\\"===e[0][0]&&e[1]?r+="\\"+(Number(e[1])+t):(r+=e[0],"("===e[0]&&n++)}return r
+})).map((e=>`(${e})`)).join(t)})(e),!0),this.lastIndex=0}exec(e){
+this.matcherRe.lastIndex=this.lastIndex;const t=this.matcherRe.exec(e)
+;if(!t)return null
+;const n=t.findIndex(((e,t)=>t>0&&void 0!==e)),i=this.matchIndexes[n]
+;return t.splice(0,n),Object.assign(t,i)}}class r{constructor(){
+this.rules=[],this.multiRegexes=[],
+this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){
+if(this.multiRegexes[e])return this.multiRegexes[e];const t=new i
+;return this.rules.slice(e).forEach((([e,n])=>t.addRule(e,n))),
+t.compile(),this.multiRegexes[e]=t,t}resumingScanAtSamePosition(){
+return 0!==this.regexIndex}considerAll(){this.regexIndex=0}addRule(e,t){
+this.rules.push([e,t]),"begin"===t.type&&this.count++}exec(e){
+const t=this.getMatcher(this.regexIndex);t.lastIndex=this.lastIndex
+;let n=t.exec(e)
+;if(this.resumingScanAtSamePosition())if(n&&n.index===this.lastIndex);else{
+const t=this.getMatcher(0);t.lastIndex=this.lastIndex+1,n=t.exec(e)}
+return n&&(this.regexIndex+=n.position+1,
+this.regexIndex===this.count&&this.considerAll()),n}}
+if(e.compilerExtensions||(e.compilerExtensions=[]),
+e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.")
+;return e.classNameAliases=s(e.classNameAliases||{}),function t(i,a){const l=i
+;if(i.compiled)return l
+;[A].forEach((e=>e(i,a))),e.compilerExtensions.forEach((e=>e(i,a))),
+i.__beforeBegin=null,[O,M,L].forEach((e=>e(i,a))),i.compiled=!0;let o=null
+;if("object"==typeof i.keywords&&(o=i.keywords.$pattern,
+delete i.keywords.$pattern),
+i.keywords&&(i.keywords=B(i.keywords,e.case_insensitive)),
+i.lexemes&&o)throw Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ")
+;return o=o||i.lexemes||/\w+/,
+l.keywordPatternRe=n(o,!0),a&&(i.begin||(i.begin=/\B|\b/),
+l.beginRe=n(i.begin),i.endSameAsBegin&&(i.end=i.begin),
+i.end||i.endsWithParent||(i.end=/\B|\b/),
+i.end&&(l.endRe=n(i.end)),l.terminatorEnd=g(i.end)||"",
+i.endsWithParent&&a.terminatorEnd&&(l.terminatorEnd+=(i.end?"|":"")+a.terminatorEnd)),
+i.illegal&&(l.illegalRe=n(i.illegal)),
+i.contains||(i.contains=[]),i.contains=[].concat(...i.contains.map((e=>(e=>(e.variants&&!e.cachedVariants&&(e.cachedVariants=e.variants.map((t=>s(e,{
+variants:null},t)))),e.cachedVariants?e.cachedVariants:S(e)?s(e,{
+starts:e.starts?s(e.starts):null
+}):Object.isFrozen(e)?s(e):e))("self"===e?i:e)))),i.contains.forEach((e=>{t(e,l)
+})),i.starts&&t(i.starts,a),l.matcher=(e=>{const t=new r
+;return e.contains.forEach((e=>t.addRule(e.begin,{rule:e,type:"begin"
+}))),e.terminatorEnd&&t.addRule(e.terminatorEnd,{type:"end"
+}),e.illegal&&t.addRule(e.illegal,{type:"illegal"}),t})(l),l}(e)}function S(e){
+return!!e&&(e.endsWithParent||S(e.starts))}function P(e){const t={
+props:["language","code","autodetect"],data:()=>({detectedLanguage:"",
+unknownLanguage:!1}),computed:{className(){
+return this.unknownLanguage?"":"hljs "+this.detectedLanguage},highlighted(){
+if(!this.autoDetect&&!e.getLanguage(this.language))return console.warn(`The language "${this.language}" you specified could not be found.`),
+this.unknownLanguage=!0,r(this.code);let t={}
+;return this.autoDetect?(t=e.highlightAuto(this.code),
+this.detectedLanguage=t.language):(t=e.highlight(this.language,this.code,this.ignoreIllegals),
+this.detectedLanguage=this.language),t.value},autoDetect(){
+return!(this.language&&(e=this.autodetect,!e&&""!==e));var e},
+ignoreIllegals:()=>!0},render(e){return e("pre",{},[e("code",{
+class:this.className,domProps:{innerHTML:this.highlighted}})])}};return{
+Component:t,VuePlugin:{install(e){e.component("highlightjs",t)}}}}const D={
+"after:highlightElement":({el:e,result:t,text:n})=>{const i=H(e)
+;if(!i.length)return;const s=document.createElement("div")
+;s.innerHTML=t.value,t.value=((e,t,n)=>{let i=0,s="";const a=[];function l(){
+return e.length&&t.length?e[0].offset!==t[0].offset?e[0].offset<t[0].offset?e:t:"start"===t[0].event?e:t:e.length?e:t
+}function o(e){s+="<"+C(e)+[].map.call(e.attributes,(function(e){
+return" "+e.nodeName+'="'+r(e.value)+'"'})).join("")+">"}function c(e){
+s+="</"+C(e)+">"}function g(e){("start"===e.event?o:c)(e.node)}
+for(;e.length||t.length;){let t=l()
+;if(s+=r(n.substring(i,t[0].offset)),i=t[0].offset,t===e){a.reverse().forEach(c)
+;do{g(t.splice(0,1)[0]),t=l()}while(t===e&&t.length&&t[0].offset===i)
+;a.reverse().forEach(o)
+}else"start"===t[0].event?a.push(t[0].node):a.pop(),g(t.splice(0,1)[0])}
+return s+r(n.substr(i))})(i,H(s),n)}};function C(e){
+return e.nodeName.toLowerCase()}function H(e){const t=[];return function e(n,i){
+for(let r=n.firstChild;r;r=r.nextSibling)3===r.nodeType?i+=r.nodeValue.length:1===r.nodeType&&(t.push({
+event:"start",offset:i,node:r}),i=e(r,i),C(r).match(/br|hr|img|input/)||t.push({
+event:"stop",offset:i,node:r}));return i}(e,0),t}const $=e=>{console.error(e)
+},U=(e,...t)=>{console.log("WARN: "+e,...t)},z=(e,t)=>{
+console.log(`Deprecated as of ${e}. ${t}`)},K=r,G=s,V=Symbol("nomatch")
+;return(e=>{const n=Object.create(null),r=Object.create(null),s=[];let a=!0
+;const l=/(^(<[^>]+>|\t|)+|\n)/gm,o="Could not find the language '{}', did you forget to load/include a language module?",g={
+disableAutodetect:!0,name:"Plain text",contains:[]};let u={
+noHighlightRe:/^(no-?highlight)$/i,
+languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",
+tabReplace:null,useBR:!1,languages:null,__emitter:c};function d(e){
+return u.noHighlightRe.test(e)}function h(e,t,n,i){const r={code:t,language:e}
+;O("before:highlight",r);const s=r.result?r.result:f(r.language,r.code,n,i)
+;return s.code=r.code,O("after:highlight",s),s}function f(e,t,r,l){const c=t
+;function g(e,t){const n=w.case_insensitive?t[0].toLowerCase():t[0]
+;return Object.prototype.hasOwnProperty.call(e.keywords,n)&&e.keywords[n]}
+function d(){null!=_.subLanguage?(()=>{if(""===M)return;let e=null
+;if("string"==typeof _.subLanguage){
+if(!n[_.subLanguage])return void O.addText(M)
+;e=f(_.subLanguage,M,!0,k[_.subLanguage]),k[_.subLanguage]=e.top
+}else e=p(M,_.subLanguage.length?_.subLanguage:null)
+;_.relevance>0&&(A+=e.relevance),O.addSublanguage(e.emitter,e.language)
+})():(()=>{if(!_.keywords)return void O.addText(M);let e=0
+;_.keywordPatternRe.lastIndex=0;let t=_.keywordPatternRe.exec(M),n="";for(;t;){
+n+=M.substring(e,t.index);const i=g(_,t);if(i){const[e,r]=i
+;O.addText(n),n="",A+=r;const s=w.classNameAliases[e]||e;O.addKeyword(t[0],s)
+}else n+=t[0];e=_.keywordPatternRe.lastIndex,t=_.keywordPatternRe.exec(M)}
+n+=M.substr(e),O.addText(n)})(),M=""}function h(e){
+return e.className&&O.openNode(w.classNameAliases[e.className]||e.className),
+_=Object.create(e,{parent:{value:_}}),_}function m(e,t,n){let r=((e,t)=>{
+const n=e&&e.exec(t);return n&&0===n.index})(e.endRe,n);if(r){if(e["on:end"]){
+const n=new i(e);e["on:end"](t,n),n.ignore&&(r=!1)}if(r){
+for(;e.endsParent&&e.parent;)e=e.parent;return e}}
+if(e.endsWithParent)return m(e.parent,t,n)}function b(e){
+return 0===_.matcher.regexIndex?(M+=e[0],1):(B=!0,0)}function E(e){
+const t=e[0],n=c.substr(e.index),i=m(_,e,n);if(!i)return V;const r=_
+;r.skip?M+=t:(r.returnEnd||r.excludeEnd||(M+=t),d(),r.excludeEnd&&(M=t));do{
+_.className&&O.closeNode(),_.skip||_.subLanguage||(A+=_.relevance),_=_.parent
+}while(_!==i.parent)
+;return i.starts&&(i.endSameAsBegin&&(i.starts.endRe=i.endRe),
+h(i.starts)),r.returnEnd?0:t.length}let x={};function v(t,n){const s=n&&n[0]
+;if(M+=t,null==s)return d(),0
+;if("begin"===x.type&&"end"===n.type&&x.index===n.index&&""===s){
+if(M+=c.slice(n.index,n.index+1),!a){const t=Error("0 width match regex")
+;throw t.languageName=e,t.badRule=x.rule,t}return 1}
+if(x=n,"begin"===n.type)return function(e){
+const t=e[0],n=e.rule,r=new i(n),s=[n.__beforeBegin,n["on:begin"]]
+;for(const n of s)if(n&&(n(e,r),r.ignore))return b(t)
+;return n&&n.endSameAsBegin&&(n.endRe=RegExp(t.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")),
+n.skip?M+=t:(n.excludeBegin&&(M+=t),
+d(),n.returnBegin||n.excludeBegin||(M=t)),h(n),n.returnBegin?0:t.length}(n)
+;if("illegal"===n.type&&!r){
+const e=Error('Illegal lexeme "'+s+'" for mode "'+(_.className||"<unnamed>")+'"')
+;throw e.mode=_,e}if("end"===n.type){const e=E(n);if(e!==V)return e}
+if("illegal"===n.type&&""===s)return 1
+;if(j>1e5&&j>3*n.index)throw Error("potential infinite loop, way more iterations than matches")
+;return M+=s,s.length}const w=N(e)
+;if(!w)throw $(o.replace("{}",e)),Error('Unknown language: "'+e+'"')
+;const y=T(w,{plugins:s});let R="",_=l||y;const k={},O=new u.__emitter(u);(()=>{
+const e=[];for(let t=_;t!==w;t=t.parent)t.className&&e.unshift(t.className)
+;e.forEach((e=>O.openNode(e)))})();let M="",A=0,L=0,j=0,B=!1;try{
+for(_.matcher.considerAll();;){
+j++,B?B=!1:_.matcher.considerAll(),_.matcher.lastIndex=L
+;const e=_.matcher.exec(c);if(!e)break;const t=v(c.substring(L,e.index),e)
+;L=e.index+t}return v(c.substr(L)),O.closeAllNodes(),O.finalize(),R=O.toHTML(),{
+relevance:Math.floor(A),value:R,language:e,illegal:!1,emitter:O,top:_}}catch(t){
+if(t.message&&t.message.includes("Illegal"))return{illegal:!0,illegalBy:{
+msg:t.message,context:c.slice(L-100,L+100),mode:t.mode},sofar:R,relevance:0,
+value:K(c),emitter:O};if(a)return{illegal:!1,relevance:0,value:K(c),emitter:O,
+language:e,top:_,errorRaised:t};throw t}}function p(e,t){
+t=t||u.languages||Object.keys(n);const i=(e=>{const t={relevance:0,
+emitter:new u.__emitter(u),value:K(e),illegal:!1,top:g}
+;return t.emitter.addText(e),t})(e),r=t.filter(N).filter(k).map((t=>f(t,e,!1)))
+;r.unshift(i);const s=r.sort(((e,t)=>{
+if(e.relevance!==t.relevance)return t.relevance-e.relevance
+;if(e.language&&t.language){if(N(e.language).supersetOf===t.language)return 1
+;if(N(t.language).supersetOf===e.language)return-1}return 0})),[a,l]=s,o=a
+;return o.second_best=l,o}const m={"before:highlightElement":({el:e})=>{
+u.useBR&&(e.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ /]*>/g,"\n"))
+},"after:highlightElement":({result:e})=>{
+u.useBR&&(e.value=e.value.replace(/\n/g,"<br>"))}},b=/^(<[^>]+>|\t)+/gm,E={
+"after:highlightElement":({result:e})=>{
+u.tabReplace&&(e.value=e.value.replace(b,(e=>e.replace(/\t/g,u.tabReplace))))}}
+;function x(e){let t=null;const n=(e=>{let t=e.className+" "
+;t+=e.parentNode?e.parentNode.className:"";const n=u.languageDetectRe.exec(t)
+;if(n){const t=N(n[1])
+;return t||(U(o.replace("{}",n[1])),U("Falling back to no-highlight mode for this block.",e)),
+t?n[1]:"no-highlight"}return t.split(/\s+/).find((e=>d(e)||N(e)))})(e)
+;if(d(n))return;O("before:highlightElement",{el:e,language:n}),t=e
+;const i=t.textContent,s=n?h(n,i,!0):p(i);O("after:highlightElement",{el:e,
+result:s,text:i}),e.innerHTML=s.value,((e,t,n)=>{const i=t?r[t]:n
+;e.classList.add("hljs"),i&&e.classList.add(i)})(e,n,s.language),e.result={
+language:s.language,re:s.relevance,relavance:s.relevance
+},s.second_best&&(e.second_best={language:s.second_best.language,
+re:s.second_best.relevance,relavance:s.second_best.relevance})}const v=()=>{
+v.called||(v.called=!0,
+z("10.6.0","initHighlighting() is deprecated.  Use highlightAll() instead."),
+document.querySelectorAll("pre code").forEach(x))};let w=!1;function y(){
+"loading"!==document.readyState?document.querySelectorAll("pre code").forEach(x):w=!0
+}function N(e){return e=(e||"").toLowerCase(),n[e]||n[r[e]]}
+function R(e,{languageName:t}){"string"==typeof e&&(e=[e]),e.forEach((e=>{
+r[e.toLowerCase()]=t}))}function k(e){const t=N(e)
+;return t&&!t.disableAutodetect}function O(e,t){const n=e;s.forEach((e=>{
+e[n]&&e[n](t)}))}
+"undefined"!=typeof window&&window.addEventListener&&window.addEventListener("DOMContentLoaded",(()=>{
+w&&y()}),!1),Object.assign(e,{highlight:h,highlightAuto:p,highlightAll:y,
+fixMarkup:e=>{
+return z("10.2.0","fixMarkup will be removed entirely in v11.0"),z("10.2.0","Please see https://github.com/highlightjs/highlight.js/issues/2534"),
+t=e,
+u.tabReplace||u.useBR?t.replace(l,(e=>"\n"===e?u.useBR?"<br>":e:u.tabReplace?e.replace(/\t/g,u.tabReplace):e)):t
+;var t},highlightElement:x,
+highlightBlock:e=>(z("10.7.0","highlightBlock will be removed entirely in v12.0"),
+z("10.7.0","Please use highlightElement now."),x(e)),configure:e=>{
+e.useBR&&(z("10.3.0","'useBR' will be removed entirely in v11.0"),
+z("10.3.0","Please see https://github.com/highlightjs/highlight.js/issues/2559")),
+u=G(u,e)},initHighlighting:v,initHighlightingOnLoad:()=>{
+z("10.6.0","initHighlightingOnLoad() is deprecated.  Use highlightAll() instead."),
+w=!0},registerLanguage:(t,i)=>{let r=null;try{r=i(e)}catch(e){
+if($("Language definition for '{}' could not be registered.".replace("{}",t)),
+!a)throw e;$(e),r=g}
+r.name||(r.name=t),n[t]=r,r.rawDefinition=i.bind(null,e),r.aliases&&R(r.aliases,{
+languageName:t})},unregisterLanguage:e=>{delete n[e]
+;for(const t of Object.keys(r))r[t]===e&&delete r[t]},
+listLanguages:()=>Object.keys(n),getLanguage:N,registerAliases:R,
+requireLanguage:e=>{
+z("10.4.0","requireLanguage will be removed entirely in v11."),
+z("10.4.0","Please see https://github.com/highlightjs/highlight.js/pull/2844")
+;const t=N(e);if(t)return t
+;throw Error("The '{}' language is required, but not loaded.".replace("{}",e))},
+autoDetection:k,inherit:G,addPlugin:e=>{(e=>{
+e["before:highlightBlock"]&&!e["before:highlightElement"]&&(e["before:highlightElement"]=t=>{
+e["before:highlightBlock"](Object.assign({block:t.el},t))
+}),e["after:highlightBlock"]&&!e["after:highlightElement"]&&(e["after:highlightElement"]=t=>{
+e["after:highlightBlock"](Object.assign({block:t.el},t))})})(e),s.push(e)},
+vuePlugin:P(e).VuePlugin}),e.debugMode=()=>{a=!1},e.safeMode=()=>{a=!0
+},e.versionString="10.6.0";for(const e in _)"object"==typeof _[e]&&t(_[e])
+;return Object.assign(e,_),e.addPlugin(m),e.addPlugin(D),e.addPlugin(E),e})({})
+}();"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);
+hljs.registerLanguage("javascript",(()=>{"use strict"
+;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["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"],a=["true","false","null","undefined","NaN","Infinity"],s=[].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","BigInt64Array","BigUint64Array","BigInt"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"])
+;function r(e){return t("(?=",e,")")}function t(...e){return e.map((e=>{
+return(n=e)?"string"==typeof n?n:n.source:null;var n})).join("")}return i=>{
+const c=e,o={begin:/<[A-Za-z0-9\\._:-]+/,end:/\/[A-Za-z0-9\\._:-]+>|\/>/,
+isTrulyOpeningTag:(e,n)=>{const a=e[0].length+e.index,s=e.input[a]
+;"<"!==s?">"===s&&(((e,{after:n})=>{const a="</"+e[0].slice(1)
+;return-1!==e.input.indexOf(a,n)})(e,{after:a
+})||n.ignoreMatch()):n.ignoreMatch()}},l={$pattern:e,keyword:n,literal:a,
+built_in:s},g="\\.([0-9](_?[0-9])*)",b="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",d={
+className:"number",variants:[{
+begin:`(\\b(${b})((${g})|\\.)?|(${g}))[eE][+-]?([0-9](_?[0-9])*)\\b`},{
+begin:`\\b(${b})\\b((${g})\\b|\\.)?|(${g})\\b`},{
+begin:"\\b(0|[1-9](_?[0-9])*)n\\b"},{
+begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b"},{
+begin:"\\b0[bB][0-1](_?[0-1])*n?\\b"},{begin:"\\b0[oO][0-7](_?[0-7])*n?\\b"},{
+begin:"\\b0[0-7]+n?\\b"}],relevance:0},E={className:"subst",begin:"\\$\\{",
+end:"\\}",keywords:l,contains:[]},u={begin:"html`",end:"",starts:{end:"`",
+returnEnd:!1,contains:[i.BACKSLASH_ESCAPE,E],subLanguage:"xml"}},_={
+begin:"css`",end:"",starts:{end:"`",returnEnd:!1,
+contains:[i.BACKSLASH_ESCAPE,E],subLanguage:"css"}},m={className:"string",
+begin:"`",end:"`",contains:[i.BACKSLASH_ESCAPE,E]},y={className:"comment",
+variants:[i.COMMENT(/\/\*\*(?!\/)/,"\\*/",{relevance:0,contains:[{
+className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type",begin:"\\{",
+end:"\\}",relevance:0},{className:"variable",begin:c+"(?=\\s*(-)|$)",
+endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]
+}),i.C_BLOCK_COMMENT_MODE,i.C_LINE_COMMENT_MODE]
+},N=[i.APOS_STRING_MODE,i.QUOTE_STRING_MODE,u,_,m,d,i.REGEXP_MODE]
+;E.contains=N.concat({begin:/\{/,end:/\}/,keywords:l,contains:["self"].concat(N)
+});const A=[].concat(y,E.contains),f=A.concat([{begin:/\(/,end:/\)/,keywords:l,
+contains:["self"].concat(A)}]),p={className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:l,contains:f};return{name:"Javascript",
+aliases:["js","jsx","mjs","cjs"],keywords:l,exports:{PARAMS_CONTAINS:f},
+illegal:/#(?![$_A-z])/,contains:[i.SHEBANG({label:"shebang",binary:"node",
+relevance:5}),{label:"use_strict",className:"meta",relevance:10,
+begin:/^\s*['"]use (strict|asm)['"]/
+},i.APOS_STRING_MODE,i.QUOTE_STRING_MODE,u,_,m,y,d,{
+begin:t(/[{,\n]\s*/,r(t(/(((\/\/.*$)|(\/\*(\*[^/]|[^*])*\*\/))\s*)*/,c+"\\s*:"))),
+relevance:0,contains:[{className:"attr",begin:c+r("\\s*:"),relevance:0}]},{
+begin:"("+i.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
+keywords:"return throw case",contains:[y,i.REGEXP_MODE,{className:"function",
+begin:"(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+i.UNDERSCORE_IDENT_RE+")\\s*=>",
+returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{
+begin:i.UNDERSCORE_IDENT_RE,relevance:0},{className:null,begin:/\(\s*\)/,skip:!0
+},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:l,contains:f}]}]
+},{begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{
+variants:[{begin:"<>",end:"</>"},{begin:o.begin,"on:begin":o.isTrulyOpeningTag,
+end:o.end}],subLanguage:"xml",contains:[{begin:o.begin,end:o.end,skip:!0,
+contains:["self"]}]}],relevance:0},{className:"function",
+beginKeywords:"function",end:/[{;]/,excludeEnd:!0,keywords:l,
+contains:["self",i.inherit(i.TITLE_MODE,{begin:c}),p],illegal:/%/},{
+beginKeywords:"while if switch catch for"},{className:"function",
+begin:i.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{",
+returnBegin:!0,contains:[p,i.inherit(i.TITLE_MODE,{begin:c})]},{variants:[{
+begin:"\\."+c},{begin:"\\$"+c}],relevance:0},{className:"class",
+beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"[\]]/,contains:[{
+beginKeywords:"extends"},i.UNDERSCORE_TITLE_MODE]},{begin:/\b(?=constructor)/,
+end:/[{;]/,excludeEnd:!0,contains:[i.inherit(i.TITLE_MODE,{begin:c}),"self",p]
+},{begin:"(get|set)\\s+(?="+c+"\\()",end:/\{/,keywords:"get set",
+contains:[i.inherit(i.TITLE_MODE,{begin:c}),{begin:/\(\)/},p]},{begin:/\$[(.]/}]
+}}})());
+hljs.registerLanguage("sql",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function r(...r){
+return r.map((r=>e(r))).join("")}function t(...r){
+return"("+r.map((r=>e(r))).join("|")+")"}return e=>{
+const n=e.COMMENT("--","$"),a=["true","false","unknown"],i=["bigint","binary","blob","boolean","char","character","clob","date","dec","decfloat","decimal","float","int","integer","interval","nchar","nclob","national","numeric","real","row","smallint","time","timestamp","varchar","varying","varbinary"],s=["abs","acos","array_agg","asin","atan","avg","cast","ceil","ceiling","coalesce","corr","cos","cosh","count","covar_pop","covar_samp","cume_dist","dense_rank","deref","element","exp","extract","first_value","floor","json_array","json_arrayagg","json_exists","json_object","json_objectagg","json_query","json_table","json_table_primitive","json_value","lag","last_value","lead","listagg","ln","log","log10","lower","max","min","mod","nth_value","ntile","nullif","percent_rank","percentile_cont","percentile_disc","position","position_regex","power","rank","regr_avgx","regr_avgy","regr_count","regr_intercept","regr_r2","regr_slope","regr_sxx","regr_sxy","regr_syy","row_number","sin","sinh","sqrt","stddev_pop","stddev_samp","substring","substring_regex","sum","tan","tanh","translate","translate_regex","treat","trim","trim_array","unnest","upper","value_of","var_pop","var_samp","width_bucket"],o=["create table","insert into","primary key","foreign key","not null","alter table","add constraint","grouping sets","on overflow","character set","respect nulls","ignore nulls","nulls first","nulls last","depth first","breadth first"],c=s,l=["abs","acos","all","allocate","alter","and","any","are","array","array_agg","array_max_cardinality","as","asensitive","asin","asymmetric","at","atan","atomic","authorization","avg","begin","begin_frame","begin_partition","between","bigint","binary","blob","boolean","both","by","call","called","cardinality","cascaded","case","cast","ceil","ceiling","char","char_length","character","character_length","check","classifier","clob","close","coalesce","collate","collect","column","commit","condition","connect","constraint","contains","convert","copy","corr","corresponding","cos","cosh","count","covar_pop","covar_samp","create","cross","cube","cume_dist","current","current_catalog","current_date","current_default_transform_group","current_path","current_role","current_row","current_schema","current_time","current_timestamp","current_path","current_role","current_transform_group_for_type","current_user","cursor","cycle","date","day","deallocate","dec","decimal","decfloat","declare","default","define","delete","dense_rank","deref","describe","deterministic","disconnect","distinct","double","drop","dynamic","each","element","else","empty","end","end_frame","end_partition","end-exec","equals","escape","every","except","exec","execute","exists","exp","external","extract","false","fetch","filter","first_value","float","floor","for","foreign","frame_row","free","from","full","function","fusion","get","global","grant","group","grouping","groups","having","hold","hour","identity","in","indicator","initial","inner","inout","insensitive","insert","int","integer","intersect","intersection","interval","into","is","join","json_array","json_arrayagg","json_exists","json_object","json_objectagg","json_query","json_table","json_table_primitive","json_value","lag","language","large","last_value","lateral","lead","leading","left","like","like_regex","listagg","ln","local","localtime","localtimestamp","log","log10","lower","match","match_number","match_recognize","matches","max","member","merge","method","min","minute","mod","modifies","module","month","multiset","national","natural","nchar","nclob","new","no","none","normalize","not","nth_value","ntile","null","nullif","numeric","octet_length","occurrences_regex","of","offset","old","omit","on","one","only","open","or","order","out","outer","over","overlaps","overlay","parameter","partition","pattern","per","percent","percent_rank","percentile_cont","percentile_disc","period","portion","position","position_regex","power","precedes","precision","prepare","primary","procedure","ptf","range","rank","reads","real","recursive","ref","references","referencing","regr_avgx","regr_avgy","regr_count","regr_intercept","regr_r2","regr_slope","regr_sxx","regr_sxy","regr_syy","release","result","return","returns","revoke","right","rollback","rollup","row","row_number","rows","running","savepoint","scope","scroll","search","second","seek","select","sensitive","session_user","set","show","similar","sin","sinh","skip","smallint","some","specific","specifictype","sql","sqlexception","sqlstate","sqlwarning","sqrt","start","static","stddev_pop","stddev_samp","submultiset","subset","substring","substring_regex","succeeds","sum","symmetric","system","system_time","system_user","table","tablesample","tan","tanh","then","time","timestamp","timezone_hour","timezone_minute","to","trailing","translate","translate_regex","translation","treat","trigger","trim","trim_array","true","truncate","uescape","union","unique","unknown","unnest","update   ","upper","user","using","value","values","value_of","var_pop","var_samp","varbinary","varchar","varying","versioning","when","whenever","where","width_bucket","window","with","within","without","year","add","asc","collation","desc","final","first","last","view"].filter((e=>!s.includes(e))),u={
+begin:r(/\b/,t(...c),/\s*\(/),keywords:{built_in:c}};return{name:"SQL",
+case_insensitive:!0,illegal:/[{}]|<\//,keywords:{$pattern:/\b[\w\.]+/,
+keyword:((e,{exceptions:r,when:t}={})=>{const n=t
+;return r=r||[],e.map((e=>e.match(/\|\d+$/)||r.includes(e)?e:n(e)?e+"|0":e))
+})(l,{when:e=>e.length<3}),literal:a,type:i,
+built_in:["current_catalog","current_date","current_default_transform_group","current_path","current_role","current_schema","current_transform_group_for_type","current_user","session_user","system_time","system_user","current_time","localtime","current_timestamp","localtimestamp"]
+},contains:[{begin:t(...o),keywords:{$pattern:/[\w\.]+/,keyword:l.concat(o),
+literal:a,type:i}},{className:"type",
+begin:t("double precision","large object","with timezone","without timezone")
+},u,{className:"variable",begin:/@[a-z0-9]+/},{className:"string",variants:[{
+begin:/'/,end:/'/,contains:[{begin:/''/}]}]},{begin:/"/,end:/"/,contains:[{
+begin:/""/}]},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,n,{className:"operator",
+begin:/[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,relevance:0}]}}})());
+hljs.registerLanguage("ruby",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>{
+const a="([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)",i={
+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 __FILE__",
+built_in:"proc lambda",literal:"true false nil"},s={className:"doctag",
+begin:"@[A-Za-z]+"},r={begin:"#<",end:">"},b=[n.COMMENT("#","$",{contains:[s]
+}),n.COMMENT("^=begin","^=end",{contains:[s],relevance:10
+}),n.COMMENT("^__END__","\\n$")],c={className:"subst",begin:/#\{/,end:/\}/,
+keywords:i},t={className:"string",contains:[n.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})/},{begin:/\B\?(\\x[A-Fa-f0-9]{1,2})/},{
+begin:/\B\?(\\u\{?[A-Fa-f0-9]{1,6}\}?)/},{
+begin:/\B\?(\\M-\\C-|\\M-\\c|\\c\\M-|\\M-|\\C-\\M-)[\x20-\x7e]/},{
+begin:/\B\?\\(c|C-)[\x20-\x7e]/},{begin:/\B\?\\?\S/},{
+begin:/<<[-~]?'?(\w+)\n(?:[^\n]*\n)*?\s*\1\b/,returnBegin:!0,contains:[{
+begin:/<<[-~]?'?/},n.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,
+contains:[n.BACKSLASH_ESCAPE,c]})]}]},g="[0-9](_?[0-9])*",d={className:"number",
+relevance:0,variants:[{
+begin:`\\b([1-9](_?[0-9])*|0)(\\.(${g}))?([eE][+-]?(${g})|r)?i?\\b`},{
+begin:"\\b0[dD][0-9](_?[0-9])*r?i?\\b"},{begin:"\\b0[bB][0-1](_?[0-1])*r?i?\\b"
+},{begin:"\\b0[oO][0-7](_?[0-7])*r?i?\\b"},{
+begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*r?i?\\b"},{
+begin:"\\b0(_?[0-7])+r?i?\\b"}]},l={className:"params",begin:"\\(",end:"\\)",
+endsParent:!0,keywords:i},o=[t,{className:"class",beginKeywords:"class module",
+end:"$|;",illegal:/=/,contains:[n.inherit(n.TITLE_MODE,{
+begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|!)?"}),{begin:"<\\s*",contains:[{
+begin:"("+n.IDENT_RE+"::)?"+n.IDENT_RE,relevance:0}]}].concat(b)},{
+className:"function",begin:e(/def\s*/,(_=a+"\\s*(\\(|;|$)",e("(?=",_,")"))),
+relevance:0,keywords:"def",end:"$|;",contains:[n.inherit(n.TITLE_MODE,{begin:a
+}),l].concat(b)},{begin:n.IDENT_RE+"::"},{className:"symbol",
+begin:n.UNDERSCORE_IDENT_RE+"(!|\\?)?:",relevance:0},{className:"symbol",
+begin:":(?!\\s)",contains:[t,{begin:a}],relevance:0},d,{className:"variable",
+begin:"(\\$\\W)|((\\$|@@?)(\\w+))(?=[^@$?])(?![A-Za-z])(?![@$?'])"},{
+className:"params",begin:/\|/,end:/\|/,relevance:0,keywords:i},{
+begin:"("+n.RE_STARTERS_RE+"|unless)\\s*",keywords:"unless",contains:[{
+className:"regexp",contains:[n.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,b),relevance:0}].concat(r,b);var _;c.contains=o,l.contains=o
+;const E=[{begin:/^\s*=>/,starts:{end:"$",contains:o}},{className:"meta",
+begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d+(p\\d+)?[^\\d][^>]+>)(?=[ ])",
+starts:{end:"$",contains:o}}];return b.unshift(r),{name:"Ruby",
+aliases:["rb","gemspec","podspec","thor","irb"],keywords:i,illegal:/\/\*/,
+contains:[n.SHEBANG({binary:"ruby"})].concat(E).concat(b).concat(o)}}})());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/highlight.js b/vendor/assets/javascripts/highlightjs/highlight.js
index 41c6e59ad1..420545ceae 100644
--- a/vendor/assets/javascripts/highlightjs/highlight.js
+++ b/vendor/assets/javascripts/highlightjs/highlight.js
@@ -1,491 +1,8056 @@
 /*
-  Highlight.js 10.2.1 (fc4910b5)
+  Highlight.js 10.6.0 (eb122d3b)
   License: BSD-3-Clause
   Copyright (c) 2006-2020, Ivan Sagalaev
 */
 var hljs = (function () {
-  'use strict';
+    'use strict';
 
-  // https://github.com/substack/deep-freeze/blob/master/index.js
-  
-  function deepFreeze(obj) {
-    Object.freeze(obj);
+    function deepFreeze(obj) {
+        if (obj instanceof Map) {
+            obj.clear = obj.delete = obj.set = function () {
+                throw new Error('map is read-only');
+            };
+        } else if (obj instanceof Set) {
+            obj.add = obj.clear = obj.delete = function () {
+                throw new Error('set is read-only');
+            };
+        }
 
-    var objIsFunction = typeof obj === 'function';
+        // Freeze self
+        Object.freeze(obj);
 
-    Object.getOwnPropertyNames(obj).forEach(function(prop) {
-      if (Object.hasOwnProperty.call(obj, prop)
-      && obj[prop] !== null
-      && (typeof obj[prop] === "object" || typeof obj[prop] === "function")
-      // IE11 fix: https://github.com/highlightjs/highlight.js/issues/2318
-      // TODO: remove in the future
-      && (objIsFunction ? prop !== 'caller' && prop !== 'callee' && prop !== 'arguments' : true)
-      && !Object.isFrozen(obj[prop])) {
-        deepFreeze(obj[prop]);
+        Object.getOwnPropertyNames(obj).forEach(function (name) {
+            var prop = obj[name];
+
+            // Freeze prop if it is an object
+            if (typeof prop == 'object' && !Object.isFrozen(prop)) {
+                deepFreeze(prop);
+            }
+        });
+
+        return obj;
+    }
+
+    var deepFreezeEs6 = deepFreeze;
+    var _default = deepFreeze;
+    deepFreezeEs6.default = _default;
+
+    class Response {
+      
+      constructor(mode) {
+        // eslint-disable-next-line no-undefined
+        if (mode.data === undefined) mode.data = {};
+
+        this.data = mode.data;
       }
-    });
 
-    return obj;
-  }
+      ignoreMatch() {
+        this.ignore = true;
+      }
+    }
 
-  class Response {
     /**
-     * @param {CompiledMode} mode
+     * @param {string} value
+     * @returns {string}
      */
-    constructor(mode) {
-      // eslint-disable-next-line no-undefined
-      if (mode.data === undefined) mode.data = {};
-
-      this.data = mode.data;
+    function escapeHTML(value) {
+      return value
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#x27;');
     }
 
-    ignoreMatch() {
-      this.ignore = true;
-    }
-  }
+    /**
+     * performs a shallow merge of multiple objects into one
+     *
+     * @template T
+     * @param {T} original
+     * @param {Record<string,any>[]} objects
+     * @returns {T} a single new object
+     */
+    function inherit(original, ...objects) {
+      /** @type Record<string,any> */
+      const result = Object.create(null);
 
-  /**
-   * @param {string} value
-   * @returns {string}
-   */
-  function escapeHTML(value) {
-    return value
-      .replace(/&/g, '&amp;')
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;')
-      .replace(/"/g, '&quot;')
-      .replace(/'/g, '&#x27;');
-  }
-
-  /**
-   * performs a shallow merge of multiple objects into one
-   *
-   * @template T
-   * @param {T} original
-   * @param {Record<string,any>[]} objects
-   * @returns {T} a single new object
-   */
-  function inherit(original, ...objects) {
-    /** @type Record<string,any> */
-    var result = {};
-
-    for (const key in original) {
-      result[key] = original[key];
-    }
-    objects.forEach(function(obj) {
-      for (const key in obj) {
-        result[key] = obj[key];
+      for (const key in original) {
+        result[key] = original[key];
       }
-    });
-    return /** @type {T} */ (result);
-  }
+      objects.forEach(function(obj) {
+        for (const key in obj) {
+          result[key] = obj[key];
+        }
+      });
+      return /** @type {T} */ (result);
+    }
 
-  /* Stream merging */
+    /**
+     * @typedef {object} Renderer
+     * @property {(text: string) => void} addText
+     * @property {(node: Node) => void} openNode
+     * @property {(node: Node) => void} closeNode
+     * @property {() => string} value
+     */
 
-  /**
-   * @typedef Event
-   * @property {'start'|'stop'} event
-   * @property {number} offset
-   * @property {Node} node
-   */
+    /** @typedef {{kind?: string, sublanguage?: boolean}} Node */
+    /** @typedef {{walk: (r: Renderer) => void}} Tree */
+    /** */
 
-  /**
-   * @param {Node} node
-   */
-  function tag(node) {
-    return node.nodeName.toLowerCase();
-  }
+    const SPAN_CLOSE = '</span>';
 
-  /**
-   * @param {Node} node
-   */
-  function nodeStream(node) {
-    /** @type Event[] */
-    var result = [];
-    (function _nodeStream(node, offset) {
-      for (var child = node.firstChild; child; child = child.nextSibling) {
-        if (child.nodeType === 3) {
-          offset += child.nodeValue.length;
-        } else if (child.nodeType === 1) {
-          result.push({
-            event: 'start',
-            offset: offset,
-            node: child
+    /**
+     * Determines if a node needs to be wrapped in <span>
+     *
+     * @param {Node} node */
+    const emitsWrappingTags = (node) => {
+      return !!node.kind;
+    };
+
+    /** @type {Renderer} */
+    class HTMLRenderer {
+      /**
+       * Creates a new HTMLRenderer
+       *
+       * @param {Tree} parseTree - the parse tree (must support `walk` API)
+       * @param {{classPrefix: string}} options
+       */
+      constructor(parseTree, options) {
+        this.buffer = "";
+        this.classPrefix = options.classPrefix;
+        parseTree.walk(this);
+      }
+
+      /**
+       * Adds texts to the output stream
+       *
+       * @param {string} text */
+      addText(text) {
+        this.buffer += escapeHTML(text);
+      }
+
+      /**
+       * Adds a node open to the output stream (if needed)
+       *
+       * @param {Node} node */
+      openNode(node) {
+        if (!emitsWrappingTags(node)) return;
+
+        let className = node.kind;
+        if (!node.sublanguage) {
+          className = `${this.classPrefix}${className}`;
+        }
+        this.span(className);
+      }
+
+      /**
+       * Adds a node close to the output stream (if needed)
+       *
+       * @param {Node} node */
+      closeNode(node) {
+        if (!emitsWrappingTags(node)) return;
+
+        this.buffer += SPAN_CLOSE;
+      }
+
+      /**
+       * returns the accumulated buffer
+      */
+      value() {
+        return this.buffer;
+      }
+
+      // helpers
+
+      /**
+       * Builds a span element
+       *
+       * @param {string} className */
+      span(className) {
+        this.buffer += `<span class="${className}">`;
+      }
+    }
+
+    /** @typedef {{kind?: string, sublanguage?: boolean, children: Node[]} | string} Node */
+    /** @typedef {{kind?: string, sublanguage?: boolean, children: Node[]} } DataNode */
+    /**  */
+
+    class TokenTree {
+      constructor() {
+        /** @type DataNode */
+        this.rootNode = { children: [] };
+        this.stack = [this.rootNode];
+      }
+
+      get top() {
+        return this.stack[this.stack.length - 1];
+      }
+
+      get root() { return this.rootNode; }
+
+      /** @param {Node} node */
+      add(node) {
+        this.top.children.push(node);
+      }
+
+      /** @param {string} kind */
+      openNode(kind) {
+        /** @type Node */
+        const node = { kind, children: [] };
+        this.add(node);
+        this.stack.push(node);
+      }
+
+      closeNode() {
+        if (this.stack.length > 1) {
+          return this.stack.pop();
+        }
+        // eslint-disable-next-line no-undefined
+        return undefined;
+      }
+
+      closeAllNodes() {
+        while (this.closeNode());
+      }
+
+      toJSON() {
+        return JSON.stringify(this.rootNode, null, 4);
+      }
+
+      /**
+       * @typedef { import("./html_renderer").Renderer } Renderer
+       * @param {Renderer} builder
+       */
+      walk(builder) {
+        // this does not
+        return this.constructor._walk(builder, this.rootNode);
+        // this works
+        // return TokenTree._walk(builder, this.rootNode);
+      }
+
+      /**
+       * @param {Renderer} builder
+       * @param {Node} node
+       */
+      static _walk(builder, node) {
+        if (typeof node === "string") {
+          builder.addText(node);
+        } else if (node.children) {
+          builder.openNode(node);
+          node.children.forEach((child) => this._walk(builder, child));
+          builder.closeNode(node);
+        }
+        return builder;
+      }
+
+      /**
+       * @param {Node} node
+       */
+      static _collapse(node) {
+        if (typeof node === "string") return;
+        if (!node.children) return;
+
+        if (node.children.every(el => typeof el === "string")) {
+          // node.text = node.children.join("");
+          // delete node.children;
+          node.children = [node.children.join("")];
+        } else {
+          node.children.forEach((child) => {
+            TokenTree._collapse(child);
           });
-          offset = _nodeStream(child, offset);
-          // Prevent void elements from having an end tag that would actually
-          // double them in the output. There are more void elements in HTML
-          // but we list only those realistically expected in code display.
-          if (!tag(child).match(/br|hr|img|input/)) {
-            result.push({
-              event: 'stop',
-              offset: offset,
-              node: child
-            });
+        }
+      }
+    }
+
+    /**
+      Currently this is all private API, but this is the minimal API necessary
+      that an Emitter must implement to fully support the parser.
+
+      Minimal interface:
+
+      - addKeyword(text, kind)
+      - addText(text)
+      - addSublanguage(emitter, subLanguageName)
+      - finalize()
+      - openNode(kind)
+      - closeNode()
+      - closeAllNodes()
+      - toHTML()
+
+    */
+
+    /**
+     * @implements {Emitter}
+     */
+    class TokenTreeEmitter extends TokenTree {
+      /**
+       * @param {*} options
+       */
+      constructor(options) {
+        super();
+        this.options = options;
+      }
+
+      /**
+       * @param {string} text
+       * @param {string} kind
+       */
+      addKeyword(text, kind) {
+        if (text === "") { return; }
+
+        this.openNode(kind);
+        this.addText(text);
+        this.closeNode();
+      }
+
+      /**
+       * @param {string} text
+       */
+      addText(text) {
+        if (text === "") { return; }
+
+        this.add(text);
+      }
+
+      /**
+       * @param {Emitter & {root: DataNode}} emitter
+       * @param {string} name
+       */
+      addSublanguage(emitter, name) {
+        /** @type DataNode */
+        const node = emitter.root;
+        node.kind = name;
+        node.sublanguage = true;
+        this.add(node);
+      }
+
+      toHTML() {
+        const renderer = new HTMLRenderer(this, this.options);
+        return renderer.value();
+      }
+
+      finalize() {
+        return true;
+      }
+    }
+
+    /**
+     * @param {string} value
+     * @returns {RegExp}
+     * */
+    function escape(value) {
+      return new RegExp(value.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&'), 'm');
+    }
+
+    /**
+     * @param {RegExp | string } re
+     * @returns {string}
+     */
+    function source(re) {
+      if (!re) return null;
+      if (typeof re === "string") return re;
+
+      return re.source;
+    }
+
+    /**
+     * @param {...(RegExp | string) } args
+     * @returns {string}
+     */
+    function concat(...args) {
+      const joined = args.map((x) => source(x)).join("");
+      return joined;
+    }
+
+    /**
+     * Any of the passed expresssions may match
+     *
+     * Creates a huge this | this | that | that match
+     * @param {(RegExp | string)[] } args
+     * @returns {string}
+     */
+    function either(...args) {
+      const joined = '(' + args.map((x) => source(x)).join("|") + ")";
+      return joined;
+    }
+
+    /**
+     * @param {RegExp} re
+     * @returns {number}
+     */
+    function countMatchGroups(re) {
+      return (new RegExp(re.toString() + '|')).exec('').length - 1;
+    }
+
+    /**
+     * Does lexeme start with a regular expression match at the beginning
+     * @param {RegExp} re
+     * @param {string} lexeme
+     */
+    function startsWith(re, lexeme) {
+      const match = re && re.exec(lexeme);
+      return match && match.index === 0;
+    }
+
+    // join logically computes regexps.join(separator), but fixes the
+    // backreferences so they continue to match.
+    // it also places each individual regular expression into it's own
+    // match group, keeping track of the sequencing of those match groups
+    // is currently an exercise for the caller. :-)
+    /**
+     * @param {(string | RegExp)[]} regexps
+     * @param {string} separator
+     * @returns {string}
+     */
+    function join(regexps, separator = "|") {
+      // backreferenceRe matches an open parenthesis or backreference. To avoid
+      // an incorrect parse, it additionally matches the following:
+      // - [...] elements, where the meaning of parentheses and escapes change
+      // - other escape sequences, so we do not misparse escape sequences as
+      //   interesting elements
+      // - non-matching or lookahead parentheses, which do not capture. These
+      //   follow the '(' with a '?'.
+      const backreferenceRe = /\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./;
+      let numCaptures = 0;
+      let ret = '';
+      for (let i = 0; i < regexps.length; i++) {
+        numCaptures += 1;
+        const offset = numCaptures;
+        let re = source(regexps[i]);
+        if (i > 0) {
+          ret += separator;
+        }
+        ret += "(";
+        while (re.length > 0) {
+          const match = backreferenceRe.exec(re);
+          if (match == null) {
+            ret += re;
+            break;
+          }
+          ret += re.substring(0, match.index);
+          re = re.substring(match.index + match[0].length);
+          if (match[0][0] === '\\' && match[1]) {
+            // Adjust the backreference.
+            ret += '\\' + String(Number(match[1]) + offset);
+          } else {
+            ret += match[0];
+            if (match[0] === '(') {
+              numCaptures++;
+            }
           }
         }
+        ret += ")";
       }
-      return offset;
-    })(node, 0);
-    return result;
-  }
-
-  /**
-   * @param {any} original - the original stream
-   * @param {any} highlighted - stream of the highlighted source
-   * @param {string} value - the original source itself
-   */
-  function mergeStreams(original, highlighted, value) {
-    var processed = 0;
-    var result = '';
-    var nodeStack = [];
-
-    function selectStream() {
-      if (!original.length || !highlighted.length) {
-        return original.length ? original : highlighted;
-      }
-      if (original[0].offset !== highlighted[0].offset) {
-        return (original[0].offset < highlighted[0].offset) ? original : highlighted;
-      }
-
-      /*
-      To avoid starting the stream just before it should stop the order is
-      ensured that original always starts first and closes last:
-
-      if (event1 == 'start' && event2 == 'start')
-        return original;
-      if (event1 == 'start' && event2 == 'stop')
-        return highlighted;
-      if (event1 == 'stop' && event2 == 'start')
-        return original;
-      if (event1 == 'stop' && event2 == 'stop')
-        return highlighted;
-
-      ... which is collapsed to:
-      */
-      return highlighted[0].event === 'start' ? original : highlighted;
+      return ret;
     }
 
+    // Common regexps
+    const MATCH_NOTHING_RE = /\b\B/;
+    const IDENT_RE = '[a-zA-Z]\\w*';
+    const UNDERSCORE_IDENT_RE = '[a-zA-Z_]\\w*';
+    const NUMBER_RE = '\\b\\d+(\\.\\d+)?';
+    const C_NUMBER_RE = '(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)'; // 0x..., 0..., decimal, float
+    const BINARY_NUMBER_RE = '\\b(0b[01]+)'; // 0b...
+    const RE_STARTERS_RE = '!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~';
+
     /**
-     * @param {Node} node
-     */
-    function open(node) {
-      /** @param {Attr} attr */
-      function attr_str(attr) {
-        return ' ' + attr.nodeName + '="' + escapeHTML(attr.value) + '"';
-      }
-      // @ts-ignore
-      result += '<' + tag(node) + [].map.call(node.attributes, attr_str).join('') + '>';
-    }
-
-    /**
-     * @param {Node} node
-     */
-    function close(node) {
-      result += '</' + tag(node) + '>';
-    }
-
-    /**
-     * @param {Event} event
-     */
-    function render(event) {
-      (event.event === 'start' ? open : close)(event.node);
-    }
-
-    while (original.length || highlighted.length) {
-      var stream = selectStream();
-      result += escapeHTML(value.substring(processed, stream[0].offset));
-      processed = stream[0].offset;
-      if (stream === original) {
-        /*
-        On any opening or closing tag of the original markup we first close
-        the entire highlighted node stack, then render the original tag along
-        with all the following original tags at the same offset and then
-        reopen all the tags on the highlighted stack.
-        */
-        nodeStack.reverse().forEach(close);
-        do {
-          render(stream.splice(0, 1)[0]);
-          stream = selectStream();
-        } while (stream === original && stream.length && stream[0].offset === processed);
-        nodeStack.reverse().forEach(open);
-      } else {
-        if (stream[0].event === 'start') {
-          nodeStack.push(stream[0].node);
-        } else {
-          nodeStack.pop();
-        }
-        render(stream.splice(0, 1)[0]);
-      }
-    }
-    return result + escapeHTML(value.substr(processed));
-  }
-
-  var utils = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    escapeHTML: escapeHTML,
-    inherit: inherit,
-    nodeStream: nodeStream,
-    mergeStreams: mergeStreams
-  });
-
-  /**
-   * @typedef {object} Renderer
-   * @property {(text: string) => void} addText
-   * @property {(node: Node) => void} openNode
-   * @property {(node: Node) => void} closeNode
-   * @property {() => string} value
-   */
-
-  /** @typedef {{kind?: string, sublanguage?: boolean}} Node */
-  /** @typedef {{walk: (r: Renderer) => void}} Tree */
-  /** */
-
-  const SPAN_CLOSE = '</span>';
-
-  /**
-   * Determines if a node needs to be wrapped in <span>
-   *
-   * @param {Node} node */
-  const emitsWrappingTags = (node) => {
-    return !!node.kind;
-  };
-
-  /** @type {Renderer} */
-  class HTMLRenderer {
-    /**
-     * Creates a new HTMLRenderer
-     *
-     * @param {Tree} parseTree - the parse tree (must support `walk` API)
-     * @param {{classPrefix: string}} options
-     */
-    constructor(parseTree, options) {
-      this.buffer = "";
-      this.classPrefix = options.classPrefix;
-      parseTree.walk(this);
-    }
-
-    /**
-     * Adds texts to the output stream
-     *
-     * @param {string} text */
-    addText(text) {
-      this.buffer += escapeHTML(text);
-    }
-
-    /**
-     * Adds a node open to the output stream (if needed)
-     *
-     * @param {Node} node */
-    openNode(node) {
-      if (!emitsWrappingTags(node)) return;
-
-      let className = node.kind;
-      if (!node.sublanguage) {
-        className = `${this.classPrefix}${className}`;
-      }
-      this.span(className);
-    }
-
-    /**
-     * Adds a node close to the output stream (if needed)
-     *
-     * @param {Node} node */
-    closeNode(node) {
-      if (!emitsWrappingTags(node)) return;
-
-      this.buffer += SPAN_CLOSE;
-    }
-
-    /**
-     * returns the accumulated buffer
+    * @param { Partial<Mode> & {binary?: string | RegExp} } opts
     */
-    value() {
-      return this.buffer;
-    }
-
-    // helpers
+    const SHEBANG = (opts = {}) => {
+      const beginShebang = /^#![ ]*\//;
+      if (opts.binary) {
+        opts.begin = concat(
+          beginShebang,
+          /.*\b/,
+          opts.binary,
+          /\b.*/);
+      }
+      return inherit({
+        className: 'meta',
+        begin: beginShebang,
+        end: /$/,
+        relevance: 0,
+        /** @type {ModeCallback} */
+        "on:begin": (m, resp) => {
+          if (m.index !== 0) resp.ignoreMatch();
+        }
+      }, opts);
+    };
 
+    // Common modes
+    const BACKSLASH_ESCAPE = {
+      begin: '\\\\[\\s\\S]', relevance: 0
+    };
+    const APOS_STRING_MODE = {
+      className: 'string',
+      begin: '\'',
+      end: '\'',
+      illegal: '\\n',
+      contains: [BACKSLASH_ESCAPE]
+    };
+    const QUOTE_STRING_MODE = {
+      className: 'string',
+      begin: '"',
+      end: '"',
+      illegal: '\\n',
+      contains: [BACKSLASH_ESCAPE]
+    };
+    const PHRASAL_WORDS_MODE = {
+      begin: /\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/
+    };
     /**
-     * Builds a span element
+     * Creates a comment mode
      *
-     * @param {string} className */
-    span(className) {
-      this.buffer += `<span class="${className}">`;
-    }
-  }
+     * @param {string | RegExp} begin
+     * @param {string | RegExp} end
+     * @param {Mode | {}} [modeOptions]
+     * @returns {Partial<Mode>}
+     */
+    const COMMENT = function(begin, end, modeOptions = {}) {
+      const mode = inherit(
+        {
+          className: 'comment',
+          begin,
+          end,
+          contains: []
+        },
+        modeOptions
+      );
+      mode.contains.push(PHRASAL_WORDS_MODE);
+      mode.contains.push({
+        className: 'doctag',
+        begin: '(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):',
+        relevance: 0
+      });
+      return mode;
+    };
+    const C_LINE_COMMENT_MODE = COMMENT('//', '$');
+    const C_BLOCK_COMMENT_MODE = COMMENT('/\\*', '\\*/');
+    const HASH_COMMENT_MODE = COMMENT('#', '$');
+    const NUMBER_MODE = {
+      className: 'number',
+      begin: NUMBER_RE,
+      relevance: 0
+    };
+    const C_NUMBER_MODE = {
+      className: 'number',
+      begin: C_NUMBER_RE,
+      relevance: 0
+    };
+    const BINARY_NUMBER_MODE = {
+      className: 'number',
+      begin: BINARY_NUMBER_RE,
+      relevance: 0
+    };
+    const CSS_NUMBER_MODE = {
+      className: 'number',
+      begin: NUMBER_RE + '(' +
+        '%|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
+    };
+    const REGEXP_MODE = {
+      // this outer rule makes sure we actually have a WHOLE regex and not simply
+      // an expression such as:
+      //
+      //     3 / something
+      //
+      // (which will then blow up when regex's `illegal` sees the newline)
+      begin: /(?=\/[^/\n]*\/)/,
+      contains: [{
+        className: 'regexp',
+        begin: /\//,
+        end: /\/[gimuy]*/,
+        illegal: /\n/,
+        contains: [
+          BACKSLASH_ESCAPE,
+          {
+            begin: /\[/,
+            end: /\]/,
+            relevance: 0,
+            contains: [BACKSLASH_ESCAPE]
+          }
+        ]
+      }]
+    };
+    const TITLE_MODE = {
+      className: 'title',
+      begin: IDENT_RE,
+      relevance: 0
+    };
+    const UNDERSCORE_TITLE_MODE = {
+      className: 'title',
+      begin: UNDERSCORE_IDENT_RE,
+      relevance: 0
+    };
+    const METHOD_GUARD = {
+      // excludes method names from keyword processing
+      begin: '\\.\\s*' + UNDERSCORE_IDENT_RE,
+      relevance: 0
+    };
 
-  /** @typedef {{kind?: string, sublanguage?: boolean, children: Node[]} | string} Node */
-  /** @typedef {{kind?: string, sublanguage?: boolean, children: Node[]} } DataNode */
-  /**  */
+    /**
+     * Adds end same as begin mechanics to a mode
+     *
+     * Your mode must include at least a single () match group as that first match
+     * group is what is used for comparison
+     * @param {Partial<Mode>} mode
+     */
+    const END_SAME_AS_BEGIN = function(mode) {
+      return Object.assign(mode,
+        {
+          /** @type {ModeCallback} */
+          'on:begin': (m, resp) => { resp.data._beginMatch = m[1]; },
+          /** @type {ModeCallback} */
+          'on:end': (m, resp) => { if (resp.data._beginMatch !== m[1]) resp.ignoreMatch(); }
+        });
+    };
 
-  class TokenTree {
-    constructor() {
-      /** @type DataNode */
-      this.rootNode = { children: [] };
-      this.stack = [this.rootNode];
-    }
+    var MODES = /*#__PURE__*/Object.freeze({
+        __proto__: null,
+        MATCH_NOTHING_RE: MATCH_NOTHING_RE,
+        IDENT_RE: IDENT_RE,
+        UNDERSCORE_IDENT_RE: UNDERSCORE_IDENT_RE,
+        NUMBER_RE: NUMBER_RE,
+        C_NUMBER_RE: C_NUMBER_RE,
+        BINARY_NUMBER_RE: BINARY_NUMBER_RE,
+        RE_STARTERS_RE: RE_STARTERS_RE,
+        SHEBANG: SHEBANG,
+        BACKSLASH_ESCAPE: BACKSLASH_ESCAPE,
+        APOS_STRING_MODE: APOS_STRING_MODE,
+        QUOTE_STRING_MODE: QUOTE_STRING_MODE,
+        PHRASAL_WORDS_MODE: PHRASAL_WORDS_MODE,
+        COMMENT: COMMENT,
+        C_LINE_COMMENT_MODE: C_LINE_COMMENT_MODE,
+        C_BLOCK_COMMENT_MODE: C_BLOCK_COMMENT_MODE,
+        HASH_COMMENT_MODE: HASH_COMMENT_MODE,
+        NUMBER_MODE: NUMBER_MODE,
+        C_NUMBER_MODE: C_NUMBER_MODE,
+        BINARY_NUMBER_MODE: BINARY_NUMBER_MODE,
+        CSS_NUMBER_MODE: CSS_NUMBER_MODE,
+        REGEXP_MODE: REGEXP_MODE,
+        TITLE_MODE: TITLE_MODE,
+        UNDERSCORE_TITLE_MODE: UNDERSCORE_TITLE_MODE,
+        METHOD_GUARD: METHOD_GUARD,
+        END_SAME_AS_BEGIN: END_SAME_AS_BEGIN
+    });
 
-    get top() {
-      return this.stack[this.stack.length - 1];
-    }
+    // Grammar extensions / plugins
+    // See: https://github.com/highlightjs/highlight.js/issues/2833
 
-    get root() { return this.rootNode; }
+    // Grammar extensions allow "syntactic sugar" to be added to the grammar modes
+    // without requiring any underlying changes to the compiler internals.
 
-    /** @param {Node} node */
-    add(node) {
-      this.top.children.push(node);
-    }
+    // `compileMatch` being the perfect small example of now allowing a grammar
+    // author to write `match` when they desire to match a single expression rather
+    // than being forced to use `begin`.  The extension then just moves `match` into
+    // `begin` when it runs.  Ie, no features have been added, but we've just made
+    // the experience of writing (and reading grammars) a little bit nicer.
 
-    /** @param {string} kind */
-    openNode(kind) {
-      /** @type Node */
-      const node = { kind, children: [] };
-      this.add(node);
-      this.stack.push(node);
-    }
+    // ------
 
-    closeNode() {
-      if (this.stack.length > 1) {
-        return this.stack.pop();
+    // TODO: We need negative look-behind support to do this properly
+    /**
+     * Skip a match if it has a preceding dot
+     *
+     * This is used for `beginKeywords` to prevent matching expressions such as
+     * `bob.keyword.do()`. The mode compiler automatically wires this up as a
+     * special _internal_ 'on:begin' callback for modes with `beginKeywords`
+     * @param {RegExpMatchArray} match
+     * @param {CallbackResponse} response
+     */
+    function skipIfhasPrecedingDot(match, response) {
+      const before = match.input[match.index - 1];
+      if (before === ".") {
+        response.ignoreMatch();
       }
+    }
+
+
+    /**
+     * `beginKeywords` syntactic sugar
+     * @type {CompilerExt}
+     */
+    function beginKeywords(mode, parent) {
+      if (!parent) return;
+      if (!mode.beginKeywords) return;
+
+      // for languages with keywords that include non-word characters checking for
+      // a word boundary is not sufficient, so instead we check for a word boundary
+      // or whitespace - this does no harm in any case since our keyword engine
+      // doesn't allow spaces in keywords anyways and we still check for the boundary
+      // first
+      mode.begin = '\\b(' + mode.beginKeywords.split(' ').join('|') + ')(?!\\.)(?=\\b|\\s)';
+      mode.__beforeBegin = skipIfhasPrecedingDot;
+      mode.keywords = mode.keywords || mode.beginKeywords;
+      delete mode.beginKeywords;
+
+      // prevents double relevance, the keywords themselves provide
+      // relevance, the mode doesn't need to double it
       // eslint-disable-next-line no-undefined
-      return undefined;
-    }
-
-    closeAllNodes() {
-      while (this.closeNode());
-    }
-
-    toJSON() {
-      return JSON.stringify(this.rootNode, null, 4);
+      if (mode.relevance === undefined) mode.relevance = 0;
     }
 
     /**
-     * @typedef { import("./html_renderer").Renderer } Renderer
-     * @param {Renderer} builder
+     * Allow `illegal` to contain an array of illegal values
+     * @type {CompilerExt}
      */
-    walk(builder) {
-      // this does not
-      return this.constructor._walk(builder, this.rootNode);
-      // this works
-      // return TokenTree._walk(builder, this.rootNode);
+    function compileIllegal(mode, _parent) {
+      if (!Array.isArray(mode.illegal)) return;
+
+      mode.illegal = either(...mode.illegal);
     }
 
     /**
-     * @param {Renderer} builder
-     * @param {Node} node
+     * `match` to match a single expression for readability
+     * @type {CompilerExt}
      */
-    static _walk(builder, node) {
-      if (typeof node === "string") {
-        builder.addText(node);
-      } else if (node.children) {
-        builder.openNode(node);
-        node.children.forEach((child) => this._walk(builder, child));
-        builder.closeNode(node);
-      }
-      return builder;
+    function compileMatch(mode, _parent) {
+      if (!mode.match) return;
+      if (mode.begin || mode.end) throw new Error("begin & end are not supported with match");
+
+      mode.begin = mode.match;
+      delete mode.match;
     }
 
     /**
-     * @param {Node} node
+     * provides the default 1 relevance to all modes
+     * @type {CompilerExt}
      */
-    static _collapse(node) {
-      if (typeof node === "string") return;
-      if (!node.children) return;
+    function compileRelevance(mode, _parent) {
+      // eslint-disable-next-line no-undefined
+      if (mode.relevance === undefined) mode.relevance = 1;
+    }
 
-      if (node.children.every(el => typeof el === "string")) {
-        // node.text = node.children.join("");
-        // delete node.children;
-        node.children = [node.children.join("")];
+    // keywords that should have no default relevance value
+    const COMMON_KEYWORDS = [
+      'of',
+      'and',
+      'for',
+      'in',
+      'not',
+      'or',
+      'if',
+      'then',
+      'parent', // common variable name
+      'list', // common variable name
+      'value' // common variable name
+    ];
+
+    const DEFAULT_KEYWORD_CLASSNAME = "keyword";
+
+    /**
+     * Given raw keywords from a language definition, compile them.
+     *
+     * @param {string | Record<string,string|string[]> | Array<string>} rawKeywords
+     * @param {boolean} caseInsensitive
+     */
+    function compileKeywords(rawKeywords, caseInsensitive, className = DEFAULT_KEYWORD_CLASSNAME) {
+      /** @type KeywordDict */
+      const compiledKeywords = {};
+
+      // input can be a string of keywords, an array of keywords, or a object with
+      // named keys representing className (which can then point to a string or array)
+      if (typeof rawKeywords === 'string') {
+        compileList(className, rawKeywords.split(" "));
+      } else if (Array.isArray(rawKeywords)) {
+        compileList(className, rawKeywords);
       } else {
-        node.children.forEach((child) => {
-          TokenTree._collapse(child);
+        Object.keys(rawKeywords).forEach(function(className) {
+          // collapse all our objects back into the parent object
+          Object.assign(
+            compiledKeywords,
+            compileKeywords(rawKeywords[className], caseInsensitive, className)
+          );
+        });
+      }
+      return compiledKeywords;
+
+      // ---
+
+      /**
+       * Compiles an individual list of keywords
+       *
+       * Ex: "for if when while|5"
+       *
+       * @param {string} className
+       * @param {Array<string>} keywordList
+       */
+      function compileList(className, keywordList) {
+        if (caseInsensitive) {
+          keywordList = keywordList.map(x => x.toLowerCase());
+        }
+        keywordList.forEach(function(keyword) {
+          const pair = keyword.split('|');
+          compiledKeywords[pair[0]] = [className, scoreForKeyword(pair[0], pair[1])];
         });
       }
     }
-  }
 
-  /**
-    Currently this is all private API, but this is the minimal API necessary
-    that an Emitter must implement to fully support the parser.
+    /**
+     * Returns the proper score for a given keyword
+     *
+     * Also takes into account comment keywords, which will be scored 0 UNLESS
+     * another score has been manually assigned.
+     * @param {string} keyword
+     * @param {string} [providedScore]
+     */
+    function scoreForKeyword(keyword, providedScore) {
+      // manual scores always win over common keywords
+      // so you can force a score of 1 if you really insist
+      if (providedScore) {
+        return Number(providedScore);
+      }
 
-    Minimal interface:
+      return commonKeyword(keyword) ? 0 : 1;
+    }
 
-    - addKeyword(text, kind)
-    - addText(text)
-    - addSublanguage(emitter, subLanguageName)
-    - finalize()
-    - openNode(kind)
-    - closeNode()
-    - closeAllNodes()
-    - toHTML()
+    /**
+     * Determines if a given keyword is common or not
+     *
+     * @param {string} keyword */
+    function commonKeyword(keyword) {
+      return COMMON_KEYWORDS.includes(keyword.toLowerCase());
+    }
 
+    // compilation
+
+    /**
+     * Compiles a language definition result
+     *
+     * Given the raw result of a language definition (Language), compiles this so
+     * that it is ready for highlighting code.
+     * @param {Language} language
+     * @param {{plugins: HLJSPlugin[]}} opts
+     * @returns {CompiledLanguage}
+     */
+    function compileLanguage(language, { plugins }) {
+      /**
+       * Builds a regex with the case sensativility of the current language
+       *
+       * @param {RegExp | string} value
+       * @param {boolean} [global]
+       */
+      function langRe(value, global) {
+        return new RegExp(
+          source(value),
+          'm' + (language.case_insensitive ? 'i' : '') + (global ? 'g' : '')
+        );
+      }
+
+      /**
+        Stores multiple regular expressions and allows you to quickly search for
+        them all in a string simultaneously - returning the first match.  It does
+        this by creating a huge (a|b|c) regex - each individual item wrapped with ()
+        and joined by `|` - using match groups to track position.  When a match is
+        found checking which position in the array has content allows us to figure
+        out which of the original regexes / match groups triggered the match.
+
+        The match object itself (the result of `Regex.exec`) is returned but also
+        enhanced by merging in any meta-data that was registered with the regex.
+        This is how we keep track of which mode matched, and what type of rule
+        (`illegal`, `begin`, end, etc).
+      */
+      class MultiRegex {
+        constructor() {
+          this.matchIndexes = {};
+          // @ts-ignore
+          this.regexes = [];
+          this.matchAt = 1;
+          this.position = 0;
+        }
+
+        // @ts-ignore
+        addRule(re, opts) {
+          opts.position = this.position++;
+          // @ts-ignore
+          this.matchIndexes[this.matchAt] = opts;
+          this.regexes.push([opts, re]);
+          this.matchAt += countMatchGroups(re) + 1;
+        }
+
+        compile() {
+          if (this.regexes.length === 0) {
+            // avoids the need to check length every time exec is called
+            // @ts-ignore
+            this.exec = () => null;
+          }
+          const terminators = this.regexes.map(el => el[1]);
+          this.matcherRe = langRe(join(terminators), true);
+          this.lastIndex = 0;
+        }
+
+        /** @param {string} s */
+        exec(s) {
+          this.matcherRe.lastIndex = this.lastIndex;
+          const match = this.matcherRe.exec(s);
+          if (!match) { return null; }
+
+          // eslint-disable-next-line no-undefined
+          const i = match.findIndex((el, i) => i > 0 && el !== undefined);
+          // @ts-ignore
+          const matchData = this.matchIndexes[i];
+          // trim off any earlier non-relevant match groups (ie, the other regex
+          // match groups that make up the multi-matcher)
+          match.splice(0, i);
+
+          return Object.assign(match, matchData);
+        }
+      }
+
+      /*
+        Created to solve the key deficiently with MultiRegex - there is no way to
+        test for multiple matches at a single location.  Why would we need to do
+        that?  In the future a more dynamic engine will allow certain matches to be
+        ignored.  An example: if we matched say the 3rd regex in a large group but
+        decided to ignore it - we'd need to started testing again at the 4th
+        regex... but MultiRegex itself gives us no real way to do that.
+
+        So what this class creates MultiRegexs on the fly for whatever search
+        position they are needed.
+
+        NOTE: These additional MultiRegex objects are created dynamically.  For most
+        grammars most of the time we will never actually need anything more than the
+        first MultiRegex - so this shouldn't have too much overhead.
+
+        Say this is our search group, and we match regex3, but wish to ignore it.
+
+          regex1 | regex2 | regex3 | regex4 | regex5    ' ie, startAt = 0
+
+        What we need is a new MultiRegex that only includes the remaining
+        possibilities:
+
+          regex4 | regex5                               ' ie, startAt = 3
+
+        This class wraps all that complexity up in a simple API... `startAt` decides
+        where in the array of expressions to start doing the matching. It
+        auto-increments, so if a match is found at position 2, then startAt will be
+        set to 3.  If the end is reached startAt will return to 0.
+
+        MOST of the time the parser will be setting startAt manually to 0.
+      */
+      class ResumableMultiRegex {
+        constructor() {
+          // @ts-ignore
+          this.rules = [];
+          // @ts-ignore
+          this.multiRegexes = [];
+          this.count = 0;
+
+          this.lastIndex = 0;
+          this.regexIndex = 0;
+        }
+
+        // @ts-ignore
+        getMatcher(index) {
+          if (this.multiRegexes[index]) return this.multiRegexes[index];
+
+          const matcher = new MultiRegex();
+          this.rules.slice(index).forEach(([re, opts]) => matcher.addRule(re, opts));
+          matcher.compile();
+          this.multiRegexes[index] = matcher;
+          return matcher;
+        }
+
+        resumingScanAtSamePosition() {
+          return this.regexIndex !== 0;
+        }
+
+        considerAll() {
+          this.regexIndex = 0;
+        }
+
+        // @ts-ignore
+        addRule(re, opts) {
+          this.rules.push([re, opts]);
+          if (opts.type === "begin") this.count++;
+        }
+
+        /** @param {string} s */
+        exec(s) {
+          const m = this.getMatcher(this.regexIndex);
+          m.lastIndex = this.lastIndex;
+          let result = m.exec(s);
+
+          // The following is because we have no easy way to say "resume scanning at the
+          // existing position but also skip the current rule ONLY". What happens is
+          // all prior rules are also skipped which can result in matching the wrong
+          // thing. Example of matching "booger":
+
+          // our matcher is [string, "booger", number]
+          //
+          // ....booger....
+
+          // if "booger" is ignored then we'd really need a regex to scan from the
+          // SAME position for only: [string, number] but ignoring "booger" (if it
+          // was the first match), a simple resume would scan ahead who knows how
+          // far looking only for "number", ignoring potential string matches (or
+          // future "booger" matches that might be valid.)
+
+          // So what we do: We execute two matchers, one resuming at the same
+          // position, but the second full matcher starting at the position after:
+
+          //     /--- resume first regex match here (for [number])
+          //     |/---- full match here for [string, "booger", number]
+          //     vv
+          // ....booger....
+
+          // Which ever results in a match first is then used. So this 3-4 step
+          // process essentially allows us to say "match at this position, excluding
+          // a prior rule that was ignored".
+          //
+          // 1. Match "booger" first, ignore. Also proves that [string] does non match.
+          // 2. Resume matching for [number]
+          // 3. Match at index + 1 for [string, "booger", number]
+          // 4. If #2 and #3 result in matches, which came first?
+          if (this.resumingScanAtSamePosition()) {
+            if (result && result.index === this.lastIndex) ; else { // use the second matcher result
+              const m2 = this.getMatcher(0);
+              m2.lastIndex = this.lastIndex + 1;
+              result = m2.exec(s);
+            }
+          }
+
+          if (result) {
+            this.regexIndex += result.position + 1;
+            if (this.regexIndex === this.count) {
+              // wrap-around to considering all matches again
+              this.considerAll();
+            }
+          }
+
+          return result;
+        }
+      }
+
+      /**
+       * Given a mode, builds a huge ResumableMultiRegex that can be used to walk
+       * the content and find matches.
+       *
+       * @param {CompiledMode} mode
+       * @returns {ResumableMultiRegex}
+       */
+      function buildModeRegex(mode) {
+        const mm = new ResumableMultiRegex();
+
+        mode.contains.forEach(term => mm.addRule(term.begin, { rule: term, type: "begin" }));
+
+        if (mode.terminatorEnd) {
+          mm.addRule(mode.terminatorEnd, { type: "end" });
+        }
+        if (mode.illegal) {
+          mm.addRule(mode.illegal, { type: "illegal" });
+        }
+
+        return mm;
+      }
+
+      /** skip vs abort vs ignore
+       *
+       * @skip   - The mode is still entered and exited normally (and contains rules apply),
+       *           but all content is held and added to the parent buffer rather than being
+       *           output when the mode ends.  Mostly used with `sublanguage` to build up
+       *           a single large buffer than can be parsed by sublanguage.
+       *
+       *             - The mode begin ands ends normally.
+       *             - Content matched is added to the parent mode buffer.
+       *             - The parser cursor is moved forward normally.
+       *
+       * @abort  - A hack placeholder until we have ignore.  Aborts the mode (as if it
+       *           never matched) but DOES NOT continue to match subsequent `contains`
+       *           modes.  Abort is bad/suboptimal because it can result in modes
+       *           farther down not getting applied because an earlier rule eats the
+       *           content but then aborts.
+       *
+       *             - The mode does not begin.
+       *             - Content matched by `begin` is added to the mode buffer.
+       *             - The parser cursor is moved forward accordingly.
+       *
+       * @ignore - Ignores the mode (as if it never matched) and continues to match any
+       *           subsequent `contains` modes.  Ignore isn't technically possible with
+       *           the current parser implementation.
+       *
+       *             - The mode does not begin.
+       *             - Content matched by `begin` is ignored.
+       *             - The parser cursor is not moved forward.
+       */
+
+      /**
+       * Compiles an individual mode
+       *
+       * This can raise an error if the mode contains certain detectable known logic
+       * issues.
+       * @param {Mode} mode
+       * @param {CompiledMode | null} [parent]
+       * @returns {CompiledMode | never}
+       */
+      function compileMode(mode, parent) {
+        const cmode = /** @type CompiledMode */ (mode);
+        if (mode.compiled) return cmode;
+
+        [
+          // do this early so compiler extensions generally don't have to worry about
+          // the distinction between match/begin
+          compileMatch
+        ].forEach(ext => ext(mode, parent));
+
+        language.compilerExtensions.forEach(ext => ext(mode, parent));
+
+        // __beforeBegin is considered private API, internal use only
+        mode.__beforeBegin = null;
+
+        [
+          beginKeywords,
+          // do this later so compiler extensions that come earlier have access to the
+          // raw array if they wanted to perhaps manipulate it, etc.
+          compileIllegal,
+          // default to 1 relevance if not specified
+          compileRelevance
+        ].forEach(ext => ext(mode, parent));
+
+        mode.compiled = true;
+
+        let keywordPattern = null;
+        if (typeof mode.keywords === "object") {
+          keywordPattern = mode.keywords.$pattern;
+          delete mode.keywords.$pattern;
+        }
+
+        if (mode.keywords) {
+          mode.keywords = compileKeywords(mode.keywords, language.case_insensitive);
+        }
+
+        // both are not allowed
+        if (mode.lexemes && keywordPattern) {
+          throw new Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ");
+        }
+
+        // `mode.lexemes` was the old standard before we added and now recommend
+        // using `keywords.$pattern` to pass the keyword pattern
+        keywordPattern = keywordPattern || mode.lexemes || /\w+/;
+        cmode.keywordPatternRe = langRe(keywordPattern, true);
+
+        if (parent) {
+          if (!mode.begin) mode.begin = /\B|\b/;
+          cmode.beginRe = langRe(mode.begin);
+          if (mode.endSameAsBegin) mode.end = mode.begin;
+          if (!mode.end && !mode.endsWithParent) mode.end = /\B|\b/;
+          if (mode.end) cmode.endRe = langRe(mode.end);
+          cmode.terminatorEnd = source(mode.end) || '';
+          if (mode.endsWithParent && parent.terminatorEnd) {
+            cmode.terminatorEnd += (mode.end ? '|' : '') + parent.terminatorEnd;
+          }
+        }
+        if (mode.illegal) cmode.illegalRe = langRe(/** @type {RegExp | string} */ (mode.illegal));
+        if (!mode.contains) mode.contains = [];
+
+        mode.contains = [].concat(...mode.contains.map(function(c) {
+          return expandOrCloneMode(c === 'self' ? mode : c);
+        }));
+        mode.contains.forEach(function(c) { compileMode(/** @type Mode */ (c), cmode); });
+
+        if (mode.starts) {
+          compileMode(mode.starts, parent);
+        }
+
+        cmode.matcher = buildModeRegex(cmode);
+        return cmode;
+      }
+
+      if (!language.compilerExtensions) language.compilerExtensions = [];
+
+      // self is not valid at the top-level
+      if (language.contains && language.contains.includes('self')) {
+        throw new Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");
+      }
+
+      // we need a null object, which inherit will guarantee
+      language.classNameAliases = inherit(language.classNameAliases || {});
+
+      return compileMode(/** @type Mode */ (language));
+    }
+
+    /**
+     * Determines if a mode has a dependency on it's parent or not
+     *
+     * If a mode does have a parent dependency then often we need to clone it if
+     * it's used in multiple places so that each copy points to the correct parent,
+     * where-as modes without a parent can often safely be re-used at the bottom of
+     * a mode chain.
+     *
+     * @param {Mode | null} mode
+     * @returns {boolean} - is there a dependency on the parent?
+     * */
+    function dependencyOnParent(mode) {
+      if (!mode) return false;
+
+      return mode.endsWithParent || dependencyOnParent(mode.starts);
+    }
+
+    /**
+     * Expands a mode or clones it if necessary
+     *
+     * This is necessary for modes with parental dependenceis (see notes on
+     * `dependencyOnParent`) and for nodes that have `variants` - which must then be
+     * exploded into their own individual modes at compile time.
+     *
+     * @param {Mode} mode
+     * @returns {Mode | Mode[]}
+     * */
+    function expandOrCloneMode(mode) {
+      if (mode.variants && !mode.cachedVariants) {
+        mode.cachedVariants = mode.variants.map(function(variant) {
+          return inherit(mode, { variants: null }, variant);
+        });
+      }
+
+      // EXPAND
+      // if we have variants then essentially "replace" the mode with the variants
+      // this happens in compileMode, where this function is called from
+      if (mode.cachedVariants) {
+        return mode.cachedVariants;
+      }
+
+      // CLONE
+      // if we have dependencies on parents then we need a unique
+      // instance of ourselves, so we can be reused with many
+      // different parents without issue
+      if (dependencyOnParent(mode)) {
+        return inherit(mode, { starts: mode.starts ? inherit(mode.starts) : null });
+      }
+
+      if (Object.isFrozen(mode)) {
+        return inherit(mode);
+      }
+
+      // no special dependency issues, just return ourselves
+      return mode;
+    }
+
+    var version = "10.6.0";
+
+    // @ts-nocheck
+
+    function hasValueOrEmptyAttribute(value) {
+      return Boolean(value || value === "");
+    }
+
+    function BuildVuePlugin(hljs) {
+      const Component = {
+        props: ["language", "code", "autodetect"],
+        data: function() {
+          return {
+            detectedLanguage: "",
+            unknownLanguage: false
+          };
+        },
+        computed: {
+          className() {
+            if (this.unknownLanguage) return "";
+
+            return "hljs " + this.detectedLanguage;
+          },
+          highlighted() {
+            // no idea what language to use, return raw code
+            if (!this.autoDetect && !hljs.getLanguage(this.language)) {
+              console.warn(`The language "${this.language}" you specified could not be found.`);
+              this.unknownLanguage = true;
+              return escapeHTML(this.code);
+            }
+
+            let result = {};
+            if (this.autoDetect) {
+              result = hljs.highlightAuto(this.code);
+              this.detectedLanguage = result.language;
+            } else {
+              result = hljs.highlight(this.language, this.code, this.ignoreIllegals);
+              this.detectedLanguage = this.language;
+            }
+            return result.value;
+          },
+          autoDetect() {
+            return !this.language || hasValueOrEmptyAttribute(this.autodetect);
+          },
+          ignoreIllegals() {
+            return true;
+          }
+        },
+        // this avoids needing to use a whole Vue compilation pipeline just
+        // to build Highlight.js
+        render(createElement) {
+          return createElement("pre", {}, [
+            createElement("code", {
+              class: this.className,
+              domProps: { innerHTML: this.highlighted }
+            })
+          ]);
+        }
+        // template: `<pre><code :class="className" v-html="highlighted"></code></pre>`
+      };
+
+      const VuePlugin = {
+        install(Vue) {
+          Vue.component('highlightjs', Component);
+        }
+      };
+
+      return { Component, VuePlugin };
+    }
+
+    /* plugin itself */
+
+    /** @type {HLJSPlugin} */
+    const mergeHTMLPlugin = {
+      "after:highlightBlock": ({ block, result, text }) => {
+        const originalStream = nodeStream(block);
+        if (!originalStream.length) return;
+
+        const resultNode = document.createElement('div');
+        resultNode.innerHTML = result.value;
+        result.value = mergeStreams(originalStream, nodeStream(resultNode), text);
+      }
+    };
+
+    /* Stream merging support functions */
+
+    /**
+     * @typedef Event
+     * @property {'start'|'stop'} event
+     * @property {number} offset
+     * @property {Node} node
+     */
+
+    /**
+     * @param {Node} node
+     */
+    function tag(node) {
+      return node.nodeName.toLowerCase();
+    }
+
+    /**
+     * @param {Node} node
+     */
+    function nodeStream(node) {
+      /** @type Event[] */
+      const result = [];
+      (function _nodeStream(node, offset) {
+        for (let child = node.firstChild; child; child = child.nextSibling) {
+          if (child.nodeType === 3) {
+            offset += child.nodeValue.length;
+          } else if (child.nodeType === 1) {
+            result.push({
+              event: 'start',
+              offset: offset,
+              node: child
+            });
+            offset = _nodeStream(child, offset);
+            // Prevent void elements from having an end tag that would actually
+            // double them in the output. There are more void elements in HTML
+            // but we list only those realistically expected in code display.
+            if (!tag(child).match(/br|hr|img|input/)) {
+              result.push({
+                event: 'stop',
+                offset: offset,
+                node: child
+              });
+            }
+          }
+        }
+        return offset;
+      })(node, 0);
+      return result;
+    }
+
+    /**
+     * @param {any} original - the original stream
+     * @param {any} highlighted - stream of the highlighted source
+     * @param {string} value - the original source itself
+     */
+    function mergeStreams(original, highlighted, value) {
+      let processed = 0;
+      let result = '';
+      const nodeStack = [];
+
+      function selectStream() {
+        if (!original.length || !highlighted.length) {
+          return original.length ? original : highlighted;
+        }
+        if (original[0].offset !== highlighted[0].offset) {
+          return (original[0].offset < highlighted[0].offset) ? original : highlighted;
+        }
+
+        /*
+        To avoid starting the stream just before it should stop the order is
+        ensured that original always starts first and closes last:
+
+        if (event1 == 'start' && event2 == 'start')
+          return original;
+        if (event1 == 'start' && event2 == 'stop')
+          return highlighted;
+        if (event1 == 'stop' && event2 == 'start')
+          return original;
+        if (event1 == 'stop' && event2 == 'stop')
+          return highlighted;
+
+        ... which is collapsed to:
+        */
+        return highlighted[0].event === 'start' ? original : highlighted;
+      }
+
+      /**
+       * @param {Node} node
+       */
+      function open(node) {
+        /** @param {Attr} attr */
+        function attributeString(attr) {
+          return ' ' + attr.nodeName + '="' + escapeHTML(attr.value) + '"';
+        }
+        // @ts-ignore
+        result += '<' + tag(node) + [].map.call(node.attributes, attributeString).join('') + '>';
+      }
+
+      /**
+       * @param {Node} node
+       */
+      function close(node) {
+        result += '</' + tag(node) + '>';
+      }
+
+      /**
+       * @param {Event} event
+       */
+      function render(event) {
+        (event.event === 'start' ? open : close)(event.node);
+      }
+
+      while (original.length || highlighted.length) {
+        let stream = selectStream();
+        result += escapeHTML(value.substring(processed, stream[0].offset));
+        processed = stream[0].offset;
+        if (stream === original) {
+          /*
+          On any opening or closing tag of the original markup we first close
+          the entire highlighted node stack, then render the original tag along
+          with all the following original tags at the same offset and then
+          reopen all the tags on the highlighted stack.
+          */
+          nodeStack.reverse().forEach(close);
+          do {
+            render(stream.splice(0, 1)[0]);
+            stream = selectStream();
+          } while (stream === original && stream.length && stream[0].offset === processed);
+          nodeStack.reverse().forEach(open);
+        } else {
+          if (stream[0].event === 'start') {
+            nodeStack.push(stream[0].node);
+          } else {
+            nodeStack.pop();
+          }
+          render(stream.splice(0, 1)[0]);
+        }
+      }
+      return result + escapeHTML(value.substr(processed));
+    }
+
+    /*
+
+    For the reasoning behind this please see:
+    https://github.com/highlightjs/highlight.js/issues/2880#issuecomment-747275419
+
+    */
+
+    /**
+     * @param {string} message
+     */
+    const error = (message) => {
+      console.error(message);
+    };
+
+    /**
+     * @param {string} message
+     * @param {any} args
+     */
+    const warn = (message, ...args) => {
+      console.log(`WARN: ${message}`, ...args);
+    };
+
+    /**
+     * @param {string} version
+     * @param {string} message
+     */
+    const deprecated = (version, message) => {
+      console.log(`Deprecated as of ${version}. ${message}`);
+    };
+
+    /*
+    Syntax highlighting with language autodetection.
+    https://highlightjs.org/
+    */
+
+    const escape$1 = escapeHTML;
+    const inherit$1 = inherit;
+    const NO_MATCH = Symbol("nomatch");
+
+    /**
+     * @param {any} hljs - object that is extended (legacy)
+     * @returns {HLJSApi}
+     */
+    const HLJS = function(hljs) {
+      // Global internal variables used within the highlight.js library.
+      /** @type {Record<string, Language>} */
+      const languages = Object.create(null);
+      /** @type {Record<string, string>} */
+      const aliases = Object.create(null);
+      /** @type {HLJSPlugin[]} */
+      const plugins = [];
+
+      // safe/production mode - swallows more errors, tries to keep running
+      // even if a single syntax or parse hits a fatal error
+      let SAFE_MODE = true;
+      const fixMarkupRe = /(^(<[^>]+>|\t|)+|\n)/gm;
+      const LANGUAGE_NOT_FOUND = "Could not find the language '{}', did you forget to load/include a language module?";
+      /** @type {Language} */
+      const PLAINTEXT_LANGUAGE = { disableAutodetect: true, name: 'Plain text', contains: [] };
+
+      // Global options used when within external APIs. This is modified when
+      // calling the `hljs.configure` function.
+      /** @type HLJSOptions */
+      let options = {
+        noHighlightRe: /^(no-?highlight)$/i,
+        languageDetectRe: /\blang(?:uage)?-([\w-]+)\b/i,
+        classPrefix: 'hljs-',
+        tabReplace: null,
+        useBR: false,
+        languages: null,
+        // beta configuration options, subject to change, welcome to discuss
+        // https://github.com/highlightjs/highlight.js/issues/1086
+        __emitter: TokenTreeEmitter
+      };
+
+      /* Utility functions */
+
+      /**
+       * Tests a language name to see if highlighting should be skipped
+       * @param {string} languageName
+       */
+      function shouldNotHighlight(languageName) {
+        return options.noHighlightRe.test(languageName);
+      }
+
+      /**
+       * @param {HighlightedHTMLElement} block - the HTML element to determine language for
+       */
+      function blockLanguage(block) {
+        let classes = block.className + ' ';
+
+        classes += block.parentNode ? block.parentNode.className : '';
+
+        // language-* takes precedence over non-prefixed class names.
+        const match = options.languageDetectRe.exec(classes);
+        if (match) {
+          const language = getLanguage(match[1]);
+          if (!language) {
+            warn(LANGUAGE_NOT_FOUND.replace("{}", match[1]));
+            warn("Falling back to no-highlight mode for this block.", block);
+          }
+          return language ? match[1] : 'no-highlight';
+        }
+
+        return classes
+          .split(/\s+/)
+          .find((_class) => shouldNotHighlight(_class) || getLanguage(_class));
+      }
+
+      /**
+       * Core highlighting function.
+       *
+       * @param {string} languageName - the language to use for highlighting
+       * @param {string} code - the code to highlight
+       * @param {boolean} [ignoreIllegals] - whether to ignore illegal matches, default is to bail
+       * @param {CompiledMode} [continuation] - current continuation mode, if any
+       *
+       * @returns {HighlightResult} Result - an object that represents the result
+       * @property {string} language - the language name
+       * @property {number} relevance - the relevance score
+       * @property {string} value - the highlighted HTML code
+       * @property {string} code - the original raw code
+       * @property {CompiledMode} top - top of the current mode stack
+       * @property {boolean} illegal - indicates whether any illegal matches were found
+      */
+      function highlight(languageName, code, ignoreIllegals, continuation) {
+        /** @type {BeforeHighlightContext} */
+        const context = {
+          code,
+          language: languageName
+        };
+        // the plugin can change the desired language or the code to be highlighted
+        // just be changing the object it was passed
+        fire("before:highlight", context);
+
+        // a before plugin can usurp the result completely by providing it's own
+        // in which case we don't even need to call highlight
+        const result = context.result
+          ? context.result
+          : _highlight(context.language, context.code, ignoreIllegals, continuation);
+
+        result.code = context.code;
+        // the plugin can change anything in result to suite it
+        fire("after:highlight", result);
+
+        return result;
+      }
+
+      /**
+       * private highlight that's used internally and does not fire callbacks
+       *
+       * @param {string} languageName - the language to use for highlighting
+       * @param {string} code - the code to highlight
+       * @param {boolean} [ignoreIllegals] - whether to ignore illegal matches, default is to bail
+       * @param {CompiledMode} [continuation] - current continuation mode, if any
+       * @returns {HighlightResult} - result of the highlight operation
+      */
+      function _highlight(languageName, code, ignoreIllegals, continuation) {
+        const codeToHighlight = code;
+
+        /**
+         * Return keyword data if a match is a keyword
+         * @param {CompiledMode} mode - current mode
+         * @param {RegExpMatchArray} match - regexp match data
+         * @returns {KeywordData | false}
+         */
+        function keywordData(mode, match) {
+          const matchText = language.case_insensitive ? match[0].toLowerCase() : match[0];
+          return Object.prototype.hasOwnProperty.call(mode.keywords, matchText) && mode.keywords[matchText];
+        }
+
+        function processKeywords() {
+          if (!top.keywords) {
+            emitter.addText(modeBuffer);
+            return;
+          }
+
+          let lastIndex = 0;
+          top.keywordPatternRe.lastIndex = 0;
+          let match = top.keywordPatternRe.exec(modeBuffer);
+          let buf = "";
+
+          while (match) {
+            buf += modeBuffer.substring(lastIndex, match.index);
+            const data = keywordData(top, match);
+            if (data) {
+              const [kind, keywordRelevance] = data;
+              emitter.addText(buf);
+              buf = "";
+
+              relevance += keywordRelevance;
+              const cssClass = language.classNameAliases[kind] || kind;
+              emitter.addKeyword(match[0], cssClass);
+            } else {
+              buf += match[0];
+            }
+            lastIndex = top.keywordPatternRe.lastIndex;
+            match = top.keywordPatternRe.exec(modeBuffer);
+          }
+          buf += modeBuffer.substr(lastIndex);
+          emitter.addText(buf);
+        }
+
+        function processSubLanguage() {
+          if (modeBuffer === "") return;
+          /** @type HighlightResult */
+          let result = null;
+
+          if (typeof top.subLanguage === 'string') {
+            if (!languages[top.subLanguage]) {
+              emitter.addText(modeBuffer);
+              return;
+            }
+            result = _highlight(top.subLanguage, modeBuffer, true, continuations[top.subLanguage]);
+            continuations[top.subLanguage] = /** @type {CompiledMode} */ (result.top);
+          } else {
+            result = highlightAuto(modeBuffer, top.subLanguage.length ? top.subLanguage : null);
+          }
+
+          // Counting embedded language score towards the host language may be disabled
+          // with zeroing the containing mode relevance. Use case in point is Markdown that
+          // allows XML everywhere and makes every XML snippet to have a much larger Markdown
+          // score.
+          if (top.relevance > 0) {
+            relevance += result.relevance;
+          }
+          emitter.addSublanguage(result.emitter, result.language);
+        }
+
+        function processBuffer() {
+          if (top.subLanguage != null) {
+            processSubLanguage();
+          } else {
+            processKeywords();
+          }
+          modeBuffer = '';
+        }
+
+        /**
+         * @param {Mode} mode - new mode to start
+         */
+        function startNewMode(mode) {
+          if (mode.className) {
+            emitter.openNode(language.classNameAliases[mode.className] || mode.className);
+          }
+          top = Object.create(mode, { parent: { value: top } });
+          return top;
+        }
+
+        /**
+         * @param {CompiledMode } mode - the mode to potentially end
+         * @param {RegExpMatchArray} match - the latest match
+         * @param {string} matchPlusRemainder - match plus remainder of content
+         * @returns {CompiledMode | void} - the next mode, or if void continue on in current mode
+         */
+        function endOfMode(mode, match, matchPlusRemainder) {
+          let matched = startsWith(mode.endRe, matchPlusRemainder);
+
+          if (matched) {
+            if (mode["on:end"]) {
+              const resp = new Response(mode);
+              mode["on:end"](match, resp);
+              if (resp.ignore) matched = false;
+            }
+
+            if (matched) {
+              while (mode.endsParent && mode.parent) {
+                mode = mode.parent;
+              }
+              return mode;
+            }
+          }
+          // even if on:end fires an `ignore` it's still possible
+          // that we might trigger the end node because of a parent mode
+          if (mode.endsWithParent) {
+            return endOfMode(mode.parent, match, matchPlusRemainder);
+          }
+        }
+
+        /**
+         * Handle matching but then ignoring a sequence of text
+         *
+         * @param {string} lexeme - string containing full match text
+         */
+        function doIgnore(lexeme) {
+          if (top.matcher.regexIndex === 0) {
+            // no more regexs to potentially match here, so we move the cursor forward one
+            // space
+            modeBuffer += lexeme[0];
+            return 1;
+          } else {
+            // no need to move the cursor, we still have additional regexes to try and
+            // match at this very spot
+            resumeScanAtSamePosition = true;
+            return 0;
+          }
+        }
+
+        /**
+         * Handle the start of a new potential mode match
+         *
+         * @param {EnhancedMatch} match - the current match
+         * @returns {number} how far to advance the parse cursor
+         */
+        function doBeginMatch(match) {
+          const lexeme = match[0];
+          const newMode = match.rule;
+
+          const resp = new Response(newMode);
+          // first internal before callbacks, then the public ones
+          const beforeCallbacks = [newMode.__beforeBegin, newMode["on:begin"]];
+          for (const cb of beforeCallbacks) {
+            if (!cb) continue;
+            cb(match, resp);
+            if (resp.ignore) return doIgnore(lexeme);
+          }
+
+          if (newMode && newMode.endSameAsBegin) {
+            newMode.endRe = escape(lexeme);
+          }
+
+          if (newMode.skip) {
+            modeBuffer += lexeme;
+          } else {
+            if (newMode.excludeBegin) {
+              modeBuffer += lexeme;
+            }
+            processBuffer();
+            if (!newMode.returnBegin && !newMode.excludeBegin) {
+              modeBuffer = lexeme;
+            }
+          }
+          startNewMode(newMode);
+          // if (mode["after:begin"]) {
+          //   let resp = new Response(mode);
+          //   mode["after:begin"](match, resp);
+          // }
+          return newMode.returnBegin ? 0 : lexeme.length;
+        }
+
+        /**
+         * Handle the potential end of mode
+         *
+         * @param {RegExpMatchArray} match - the current match
+         */
+        function doEndMatch(match) {
+          const lexeme = match[0];
+          const matchPlusRemainder = codeToHighlight.substr(match.index);
+
+          const endMode = endOfMode(top, match, matchPlusRemainder);
+          if (!endMode) { return NO_MATCH; }
+
+          const origin = top;
+          if (origin.skip) {
+            modeBuffer += lexeme;
+          } else {
+            if (!(origin.returnEnd || origin.excludeEnd)) {
+              modeBuffer += lexeme;
+            }
+            processBuffer();
+            if (origin.excludeEnd) {
+              modeBuffer = lexeme;
+            }
+          }
+          do {
+            if (top.className) {
+              emitter.closeNode();
+            }
+            if (!top.skip && !top.subLanguage) {
+              relevance += top.relevance;
+            }
+            top = top.parent;
+          } while (top !== endMode.parent);
+          if (endMode.starts) {
+            if (endMode.endSameAsBegin) {
+              endMode.starts.endRe = endMode.endRe;
+            }
+            startNewMode(endMode.starts);
+          }
+          return origin.returnEnd ? 0 : lexeme.length;
+        }
+
+        function processContinuations() {
+          const list = [];
+          for (let current = top; current !== language; current = current.parent) {
+            if (current.className) {
+              list.unshift(current.className);
+            }
+          }
+          list.forEach(item => emitter.openNode(item));
+        }
+
+        /** @type {{type?: MatchType, index?: number, rule?: Mode}}} */
+        let lastMatch = {};
+
+        /**
+         *  Process an individual match
+         *
+         * @param {string} textBeforeMatch - text preceeding the match (since the last match)
+         * @param {EnhancedMatch} [match] - the match itself
+         */
+        function processLexeme(textBeforeMatch, match) {
+          const lexeme = match && match[0];
+
+          // add non-matched text to the current mode buffer
+          modeBuffer += textBeforeMatch;
+
+          if (lexeme == null) {
+            processBuffer();
+            return 0;
+          }
+
+          // we've found a 0 width match and we're stuck, so we need to advance
+          // this happens when we have badly behaved rules that have optional matchers to the degree that
+          // sometimes they can end up matching nothing at all
+          // Ref: https://github.com/highlightjs/highlight.js/issues/2140
+          if (lastMatch.type === "begin" && match.type === "end" && lastMatch.index === match.index && lexeme === "") {
+            // spit the "skipped" character that our regex choked on back into the output sequence
+            modeBuffer += codeToHighlight.slice(match.index, match.index + 1);
+            if (!SAFE_MODE) {
+              /** @type {AnnotatedError} */
+              const err = new Error('0 width match regex');
+              err.languageName = languageName;
+              err.badRule = lastMatch.rule;
+              throw err;
+            }
+            return 1;
+          }
+          lastMatch = match;
+
+          if (match.type === "begin") {
+            return doBeginMatch(match);
+          } else if (match.type === "illegal" && !ignoreIllegals) {
+            // illegal match, we do not continue processing
+            /** @type {AnnotatedError} */
+            const err = new Error('Illegal lexeme "' + lexeme + '" for mode "' + (top.className || '<unnamed>') + '"');
+            err.mode = top;
+            throw err;
+          } else if (match.type === "end") {
+            const processed = doEndMatch(match);
+            if (processed !== NO_MATCH) {
+              return processed;
+            }
+          }
+
+          // edge case for when illegal matches $ (end of line) which is technically
+          // a 0 width match but not a begin/end match so it's not caught by the
+          // first handler (when ignoreIllegals is true)
+          if (match.type === "illegal" && lexeme === "") {
+            // advance so we aren't stuck in an infinite loop
+            return 1;
+          }
+
+          // infinite loops are BAD, this is a last ditch catch all. if we have a
+          // decent number of iterations yet our index (cursor position in our
+          // parsing) still 3x behind our index then something is very wrong
+          // so we bail
+          if (iterations > 100000 && iterations > match.index * 3) {
+            const err = new Error('potential infinite loop, way more iterations than matches');
+            throw err;
+          }
+
+          /*
+          Why might be find ourselves here?  Only one occasion now.  An end match that was
+          triggered but could not be completed.  When might this happen?  When an `endSameasBegin`
+          rule sets the end rule to a specific match.  Since the overall mode termination rule that's
+          being used to scan the text isn't recompiled that means that any match that LOOKS like
+          the end (but is not, because it is not an exact match to the beginning) will
+          end up here.  A definite end match, but when `doEndMatch` tries to "reapply"
+          the end rule and fails to match, we wind up here, and just silently ignore the end.
+
+          This causes no real harm other than stopping a few times too many.
+          */
+
+          modeBuffer += lexeme;
+          return lexeme.length;
+        }
+
+        const language = getLanguage(languageName);
+        if (!language) {
+          error(LANGUAGE_NOT_FOUND.replace("{}", languageName));
+          throw new Error('Unknown language: "' + languageName + '"');
+        }
+
+        const md = compileLanguage(language, { plugins });
+        let result = '';
+        /** @type {CompiledMode} */
+        let top = continuation || md;
+        /** @type Record<string,CompiledMode> */
+        const continuations = {}; // keep continuations for sub-languages
+        const emitter = new options.__emitter(options);
+        processContinuations();
+        let modeBuffer = '';
+        let relevance = 0;
+        let index = 0;
+        let iterations = 0;
+        let resumeScanAtSamePosition = false;
+
+        try {
+          top.matcher.considerAll();
+
+          for (;;) {
+            iterations++;
+            if (resumeScanAtSamePosition) {
+              // only regexes not matched previously will now be
+              // considered for a potential match
+              resumeScanAtSamePosition = false;
+            } else {
+              top.matcher.considerAll();
+            }
+            top.matcher.lastIndex = index;
+
+            const match = top.matcher.exec(codeToHighlight);
+            // console.log("match", match[0], match.rule && match.rule.begin)
+
+            if (!match) break;
+
+            const beforeMatch = codeToHighlight.substring(index, match.index);
+            const processedCount = processLexeme(beforeMatch, match);
+            index = match.index + processedCount;
+          }
+          processLexeme(codeToHighlight.substr(index));
+          emitter.closeAllNodes();
+          emitter.finalize();
+          result = emitter.toHTML();
+
+          return {
+            // avoid possible breakage with v10 clients expecting
+            // this to always be an integer
+            relevance: Math.floor(relevance),
+            value: result,
+            language: languageName,
+            illegal: false,
+            emitter: emitter,
+            top: top
+          };
+        } catch (err) {
+          if (err.message && err.message.includes('Illegal')) {
+            return {
+              illegal: true,
+              illegalBy: {
+                msg: err.message,
+                context: codeToHighlight.slice(index - 100, index + 100),
+                mode: err.mode
+              },
+              sofar: result,
+              relevance: 0,
+              value: escape$1(codeToHighlight),
+              emitter: emitter
+            };
+          } else if (SAFE_MODE) {
+            return {
+              illegal: false,
+              relevance: 0,
+              value: escape$1(codeToHighlight),
+              emitter: emitter,
+              language: languageName,
+              top: top,
+              errorRaised: err
+            };
+          } else {
+            throw err;
+          }
+        }
+      }
+
+      /**
+       * returns a valid highlight result, without actually doing any actual work,
+       * auto highlight starts with this and it's possible for small snippets that
+       * auto-detection may not find a better match
+       * @param {string} code
+       * @returns {HighlightResult}
+       */
+      function justTextHighlightResult(code) {
+        const result = {
+          relevance: 0,
+          emitter: new options.__emitter(options),
+          value: escape$1(code),
+          illegal: false,
+          top: PLAINTEXT_LANGUAGE
+        };
+        result.emitter.addText(code);
+        return result;
+      }
+
+      /**
+      Highlighting with language detection. Accepts a string with the code to
+      highlight. Returns an object with the following properties:
+
+      - language (detected language)
+      - relevance (int)
+      - value (an HTML string with highlighting markup)
+      - second_best (object with the same structure for second-best heuristically
+        detected language, may be absent)
+
+        @param {string} code
+        @param {Array<string>} [languageSubset]
+        @returns {AutoHighlightResult}
+      */
+      function highlightAuto(code, languageSubset) {
+        languageSubset = languageSubset || options.languages || Object.keys(languages);
+        const plaintext = justTextHighlightResult(code);
+
+        const results = languageSubset.filter(getLanguage).filter(autoDetection).map(name =>
+          _highlight(name, code, false)
+        );
+        results.unshift(plaintext); // plaintext is always an option
+
+        const sorted = results.sort((a, b) => {
+          // sort base on relevance
+          if (a.relevance !== b.relevance) return b.relevance - a.relevance;
+
+          // always award the tie to the base language
+          // ie if C++ and Arduino are tied, it's more likely to be C++
+          if (a.language && b.language) {
+            if (getLanguage(a.language).supersetOf === b.language) {
+              return 1;
+            } else if (getLanguage(b.language).supersetOf === a.language) {
+              return -1;
+            }
+          }
+
+          // otherwise say they are equal, which has the effect of sorting on
+          // relevance while preserving the original ordering - which is how ties
+          // have historically been settled, ie the language that comes first always
+          // wins in the case of a tie
+          return 0;
+        });
+
+        const [best, secondBest] = sorted;
+
+        /** @type {AutoHighlightResult} */
+        const result = best;
+        result.second_best = secondBest;
+
+        return result;
+      }
+
+      /**
+      Post-processing of the highlighted markup:
+
+      - replace TABs with something more useful
+      - replace real line-breaks with '<br>' for non-pre containers
+
+        @param {string} html
+        @returns {string}
+      */
+      function fixMarkup(html) {
+        if (!(options.tabReplace || options.useBR)) {
+          return html;
+        }
+
+        return html.replace(fixMarkupRe, match => {
+          if (match === '\n') {
+            return options.useBR ? '<br>' : match;
+          } else if (options.tabReplace) {
+            return match.replace(/\t/g, options.tabReplace);
+          }
+          return match;
+        });
+      }
+
+      /**
+       * Builds new class name for block given the language name
+       *
+       * @param {HTMLElement} element
+       * @param {string} [currentLang]
+       * @param {string} [resultLang]
+       */
+      function updateClassName(element, currentLang, resultLang) {
+        const language = currentLang ? aliases[currentLang] : resultLang;
+
+        element.classList.add("hljs");
+        if (language) element.classList.add(language);
+      }
+
+      /** @type {HLJSPlugin} */
+      const brPlugin = {
+        "before:highlightBlock": ({ block }) => {
+          if (options.useBR) {
+            block.innerHTML = block.innerHTML.replace(/\n/g, '').replace(/<br[ /]*>/g, '\n');
+          }
+        },
+        "after:highlightBlock": ({ result }) => {
+          if (options.useBR) {
+            result.value = result.value.replace(/\n/g, "<br>");
+          }
+        }
+      };
+
+      const TAB_REPLACE_RE = /^(<[^>]+>|\t)+/gm;
+      /** @type {HLJSPlugin} */
+      const tabReplacePlugin = {
+        "after:highlightBlock": ({ result }) => {
+          if (options.tabReplace) {
+            result.value = result.value.replace(TAB_REPLACE_RE, (m) =>
+              m.replace(/\t/g, options.tabReplace)
+            );
+          }
+        }
+      };
+
+      /**
+       * Applies highlighting to a DOM node containing code. Accepts a DOM node and
+       * two optional parameters for fixMarkup.
+       *
+       * @param {HighlightedHTMLElement} element - the HTML element to highlight
+      */
+      function highlightBlock(element) {
+        /** @type HTMLElement */
+        let node = null;
+        const language = blockLanguage(element);
+
+        if (shouldNotHighlight(language)) return;
+
+        fire("before:highlightBlock",
+          { block: element, language: language });
+
+        node = element;
+        const text = node.textContent;
+        const result = language ? highlight(language, text, true) : highlightAuto(text);
+
+        fire("after:highlightBlock", { block: element, result, text });
+
+        element.innerHTML = result.value;
+        updateClassName(element, language, result.language);
+        element.result = {
+          language: result.language,
+          // TODO: remove with version 11.0
+          re: result.relevance,
+          relavance: result.relevance
+        };
+        if (result.second_best) {
+          element.second_best = {
+            language: result.second_best.language,
+            // TODO: remove with version 11.0
+            re: result.second_best.relevance,
+            relavance: result.second_best.relevance
+          };
+        }
+      }
+
+      /**
+       * Updates highlight.js global options with the passed options
+       *
+       * @param {Partial<HLJSOptions>} userOptions
+       */
+      function configure(userOptions) {
+        if (userOptions.useBR) {
+          deprecated("10.3.0", "'useBR' will be removed entirely in v11.0");
+          deprecated("10.3.0", "Please see https://github.com/highlightjs/highlight.js/issues/2559");
+        }
+        options = inherit$1(options, userOptions);
+      }
+
+      /**
+       * Highlights to all <pre><code> blocks on a page
+       *
+       * @type {Function & {called?: boolean}}
+       */
+      // TODO: remove v12, deprecated
+      const initHighlighting = () => {
+        if (initHighlighting.called) return;
+        initHighlighting.called = true;
+
+        deprecated("10.6.0", "initHighlighting() is deprecated.  Use highlightAll() instead.");
+
+        const blocks = document.querySelectorAll('pre code');
+        blocks.forEach(highlightBlock);
+      };
+
+      // Higlights all when DOMContentLoaded fires
+      // TODO: remove v12, deprecated
+      function initHighlightingOnLoad() {
+        deprecated("10.6.0", "initHighlightingOnLoad() is deprecated.  Use highlightAll() instead.");
+        wantsHighlight = true;
+      }
+
+      let wantsHighlight = false;
+      let domLoaded = false;
+
+      /**
+       * auto-highlights all pre>code elements on the page
+       */
+      function highlightAll() {
+        // if we are called too early in the loading process
+        if (!domLoaded) { wantsHighlight = true; return; }
+
+        const blocks = document.querySelectorAll('pre code');
+        blocks.forEach(highlightBlock);
+      }
+
+      function boot() {
+        domLoaded = true;
+        // if a highlight was requested before DOM was loaded, do now
+        if (wantsHighlight) highlightAll();
+      }
+
+      // make sure we are in the browser environment
+      if (typeof window !== 'undefined' && window.addEventListener) {
+        window.addEventListener('DOMContentLoaded', boot, false);
+      }
+
+      /**
+       * Register a language grammar module
+       *
+       * @param {string} languageName
+       * @param {LanguageFn} languageDefinition
+       */
+      function registerLanguage(languageName, languageDefinition) {
+        let lang = null;
+        try {
+          lang = languageDefinition(hljs);
+        } catch (error$1) {
+          error("Language definition for '{}' could not be registered.".replace("{}", languageName));
+          // hard or soft error
+          if (!SAFE_MODE) { throw error$1; } else { error(error$1); }
+          // languages that have serious errors are replaced with essentially a
+          // "plaintext" stand-in so that the code blocks will still get normal
+          // css classes applied to them - and one bad language won't break the
+          // entire highlighter
+          lang = PLAINTEXT_LANGUAGE;
+        }
+        // give it a temporary name if it doesn't have one in the meta-data
+        if (!lang.name) lang.name = languageName;
+        languages[languageName] = lang;
+        lang.rawDefinition = languageDefinition.bind(null, hljs);
+
+        if (lang.aliases) {
+          registerAliases(lang.aliases, { languageName });
+        }
+      }
+
+      /**
+       * @returns {string[]} List of language internal names
+       */
+      function listLanguages() {
+        return Object.keys(languages);
+      }
+
+      /**
+        intended usage: When one language truly requires another
+
+        Unlike `getLanguage`, this will throw when the requested language
+        is not available.
+
+        @param {string} name - name of the language to fetch/require
+        @returns {Language | never}
+      */
+      function requireLanguage(name) {
+        deprecated("10.4.0", "requireLanguage will be removed entirely in v11.");
+        deprecated("10.4.0", "Please see https://github.com/highlightjs/highlight.js/pull/2844");
+
+        const lang = getLanguage(name);
+        if (lang) { return lang; }
+
+        const err = new Error('The \'{}\' language is required, but not loaded.'.replace('{}', name));
+        throw err;
+      }
+
+      /**
+       * @param {string} name - name of the language to retrieve
+       * @returns {Language | undefined}
+       */
+      function getLanguage(name) {
+        name = (name || '').toLowerCase();
+        return languages[name] || languages[aliases[name]];
+      }
+
+      /**
+       *
+       * @param {string|string[]} aliasList - single alias or list of aliases
+       * @param {{languageName: string}} opts
+       */
+      function registerAliases(aliasList, { languageName }) {
+        if (typeof aliasList === 'string') {
+          aliasList = [aliasList];
+        }
+        aliasList.forEach(alias => { aliases[alias] = languageName; });
+      }
+
+      /**
+       * Determines if a given language has auto-detection enabled
+       * @param {string} name - name of the language
+       */
+      function autoDetection(name) {
+        const lang = getLanguage(name);
+        return lang && !lang.disableAutodetect;
+      }
+
+      /**
+       * @param {HLJSPlugin} plugin
+       */
+      function addPlugin(plugin) {
+        plugins.push(plugin);
+      }
+
+      /**
+       *
+       * @param {PluginEvent} event
+       * @param {any} args
+       */
+      function fire(event, args) {
+        const cb = event;
+        plugins.forEach(function(plugin) {
+          if (plugin[cb]) {
+            plugin[cb](args);
+          }
+        });
+      }
+
+      /**
+      Note: fixMarkup is deprecated and will be removed entirely in v11
+
+      @param {string} arg
+      @returns {string}
+      */
+      function deprecateFixMarkup(arg) {
+        deprecated("10.2.0", "fixMarkup will be removed entirely in v11.0");
+        deprecated("10.2.0", "Please see https://github.com/highlightjs/highlight.js/issues/2534");
+
+        return fixMarkup(arg);
+      }
+
+      /* Interface definition */
+      Object.assign(hljs, {
+        highlight,
+        highlightAuto,
+        highlightAll,
+        fixMarkup: deprecateFixMarkup,
+        highlightBlock,
+        configure,
+        initHighlighting,
+        initHighlightingOnLoad,
+        registerLanguage,
+        listLanguages,
+        getLanguage,
+        registerAliases,
+        requireLanguage,
+        autoDetection,
+        inherit: inherit$1,
+        addPlugin,
+        // plugins for frameworks
+        vuePlugin: BuildVuePlugin(hljs).VuePlugin
+      });
+
+      hljs.debugMode = function() { SAFE_MODE = false; };
+      hljs.safeMode = function() { SAFE_MODE = true; };
+      hljs.versionString = version;
+
+      for (const key in MODES) {
+        // @ts-ignore
+        if (typeof MODES[key] === "object") {
+          // @ts-ignore
+          deepFreezeEs6(MODES[key]);
+        }
+      }
+
+      // merge all the modes/regexs into our main object
+      Object.assign(hljs, MODES);
+
+      // built-in plugins, likely to be moved out of core in the future
+      hljs.addPlugin(brPlugin); // slated to be removed in v11
+      hljs.addPlugin(mergeHTMLPlugin);
+      hljs.addPlugin(tabReplacePlugin);
+      return hljs;
+    };
+
+    // export an "instance" of the highlighter
+    var highlight = HLJS({});
+
+    return highlight;
+
+}());
+if (typeof exports === 'object' && typeof module !== 'undefined') { module.exports = hljs; }
+
+hljs.registerLanguage('apache', function () {
+  'use strict';
+
+  /*
+  Language: Apache config
+  Author: Ruslan Keba <rukeba@gmail.com>
+  Contributors: Ivan Sagalaev <maniac@softwaremaniacs.org>
+  Website: https://httpd.apache.org
+  Description: language definition for Apache configuration files (httpd.conf & .htaccess)
+  Category: common, config
+  Audit: 2020
   */
 
-  /**
-   * @implements {Emitter}
-   */
-  class TokenTreeEmitter extends TokenTree {
-    /**
-     * @param {*} options
-     */
-    constructor(options) {
-      super();
-      this.options = options;
-    }
-
-    /**
-     * @param {string} text
-     * @param {string} kind
-     */
-    addKeyword(text, kind) {
-      if (text === "") { return; }
-
-      this.openNode(kind);
-      this.addText(text);
-      this.closeNode();
-    }
-
-    /**
-     * @param {string} text
-     */
-    addText(text) {
-      if (text === "") { return; }
-
-      this.add(text);
-    }
-
-    /**
-     * @param {Emitter & {root: DataNode}} emitter
-     * @param {string} name
-     */
-    addSublanguage(emitter, name) {
-      /** @type DataNode */
-      const node = emitter.root;
-      node.kind = name;
-      node.sublanguage = true;
-      this.add(node);
-    }
-
-    toHTML() {
-      const renderer = new HTMLRenderer(this, this.options);
-      return renderer.value();
-    }
-
-    finalize() {
-      return true;
-    }
+  /** @type LanguageFn */
+  function apache(hljs) {
+    const NUMBER_REF = {
+      className: 'number',
+      begin: /[$%]\d+/
+    };
+    const NUMBER = {
+      className: 'number',
+      begin: /\d+/
+    };
+    const IP_ADDRESS = {
+      className: "number",
+      begin: /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(:\d{1,5})?/
+    };
+    const PORT_NUMBER = {
+      className: "number",
+      begin: /:\d{1,5}/
+    };
+    return {
+      name: 'Apache config',
+      aliases: [ 'apacheconf' ],
+      case_insensitive: true,
+      contains: [
+        hljs.HASH_COMMENT_MODE,
+        {
+          className: 'section',
+          begin: /<\/?/,
+          end: />/,
+          contains: [
+            IP_ADDRESS,
+            PORT_NUMBER,
+            // low relevance prevents us from claming XML/HTML where this rule would
+            // match strings inside of XML tags
+            hljs.inherit(hljs.QUOTE_STRING_MODE, { relevance: 0 })
+          ]
+        },
+        {
+          className: 'attribute',
+          begin: /\w+/,
+          relevance: 0,
+          // keywords aren’t needed for highlighting per se, they only boost relevance
+          // for a very generally defined mode (starts with a word, ends with line-end
+          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',
+                  NUMBER_REF
+                ]
+              },
+              IP_ADDRESS,
+              NUMBER,
+              hljs.QUOTE_STRING_MODE
+            ]
+          }
+        }
+      ],
+      illegal: /\S/
+    };
   }
 
+  return apache;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('bash', function () {
+  'use strict';
+
   /**
    * @param {string} value
    * @returns {RegExp}
    * */
-  function escape(value) {
-    return new RegExp(value.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&'), 'm');
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
   }
 
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /*
+  Language: Bash
+  Author: vah <vahtenberg@gmail.com>
+  Contributrors: Benjamin Pannell <contact@sierrasoftworks.com>
+  Website: https://www.gnu.org/software/bash/
+  Category: common
+  */
+
+  /** @type LanguageFn */
+  function bash(hljs) {
+    const VAR = {};
+    const BRACED_VAR = {
+      begin: /\$\{/,
+      end:/\}/,
+      contains: [
+        "self",
+        {
+          begin: /:-/,
+          contains: [ VAR ]
+        } // default values
+      ]
+    };
+    Object.assign(VAR,{
+      className: 'variable',
+      variants: [
+        {begin: concat(/\$[\w\d#@][\w\d_]*/,
+          // negative look-ahead tries to avoid matching patterns that are not
+          // Perl at all like $ident$, @ident@, etc.
+          `(?![\\w\\d])(?![$])`) },
+        BRACED_VAR
+      ]
+    });
+
+    const SUBST = {
+      className: 'subst',
+      begin: /\$\(/, end: /\)/,
+      contains: [hljs.BACKSLASH_ESCAPE]
+    };
+    const HERE_DOC = {
+      begin: /<<-?\s*(?=\w+)/,
+      starts: {
+        contains: [
+          hljs.END_SAME_AS_BEGIN({
+            begin: /(\w+)/,
+            end: /(\w+)/,
+            className: 'string'
+          })
+        ]
+      }
+    };
+    const QUOTE_STRING = {
+      className: 'string',
+      begin: /"/, end: /"/,
+      contains: [
+        hljs.BACKSLASH_ESCAPE,
+        VAR,
+        SUBST
+      ]
+    };
+    SUBST.contains.push(QUOTE_STRING);
+    const ESCAPED_QUOTE = {
+      className: '',
+      begin: /\\"/
+
+    };
+    const APOS_STRING = {
+      className: 'string',
+      begin: /'/, end: /'/
+    };
+    const ARITHMETIC = {
+      begin: /\$\(\(/,
+      end: /\)\)/,
+      contains: [
+        { begin: /\d+#[0-9a-f]+/, className: "number" },
+        hljs.NUMBER_MODE,
+        VAR
+      ]
+    };
+    const SH_LIKE_SHELLS = [
+      "fish",
+      "bash",
+      "zsh",
+      "sh",
+      "csh",
+      "ksh",
+      "tcsh",
+      "dash",
+      "scsh",
+    ];
+    const KNOWN_SHEBANG = hljs.SHEBANG({
+      binary: `(${SH_LIKE_SHELLS.join("|")})`,
+      relevance: 10
+    });
+    const FUNCTION = {
+      className: 'function',
+      begin: /\w[\w\d_]*\s*\(\s*\)\s*\{/,
+      returnBegin: true,
+      contains: [hljs.inherit(hljs.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:
+          // Shell built-ins
+          // http://www.gnu.org/software/bash/manual/html_node/Shell-Builtin-Commands.html
+          'break cd continue eval exec exit export getopts hash pwd readonly return shift test times ' +
+          'trap umask unset ' +
+          // Bash built-ins
+          'alias bind builtin caller command declare echo enable help let local logout mapfile printf ' +
+          'read readarray source type typeset ulimit unalias ' +
+          // Shell modifiers
+          'set shopt ' +
+          // Zsh built-ins
+          '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'
+      },
+      contains: [
+        KNOWN_SHEBANG, // to catch known shells and boost relevancy
+        hljs.SHEBANG(), // to catch unknown shells but still highlight the shebang
+        FUNCTION,
+        ARITHMETIC,
+        hljs.HASH_COMMENT_MODE,
+        HERE_DOC,
+        QUOTE_STRING,
+        ESCAPED_QUOTE,
+        APOS_STRING,
+        VAR
+      ]
+    };
+  }
+
+  return bash;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('c', function () {
+  'use strict';
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function optional(re) {
+    return concat('(', re, ')?');
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /*
+  Language: C
+  Category: common, system
+  Website: https://en.wikipedia.org/wiki/C_(programming_language)
+  */
+
+  /** @type LanguageFn */
+  function c(hljs) {
+    // added for historic reasons because `hljs.C_LINE_COMMENT_MODE` does
+    // not include such support nor can we be sure all the grammars depending
+    // on it would desire this behavior
+    const C_LINE_COMMENT_MODE = hljs.COMMENT('//', '$', {
+      contains: [
+        {
+          begin: /\\\n/
+        }
+      ]
+    });
+    const DECLTYPE_AUTO_RE = 'decltype\\(auto\\)';
+    const NAMESPACE_RE = '[a-zA-Z_]\\w*::';
+    const TEMPLATE_ARGUMENT_RE = '<[^<>]+>';
+    const FUNCTION_TYPE_RE = '(' +
+      DECLTYPE_AUTO_RE + '|' +
+      optional(NAMESPACE_RE) +
+      '[a-zA-Z_]\\w*' + optional(TEMPLATE_ARGUMENT_RE) +
+    ')';
+    const CPP_PRIMITIVE_TYPES = {
+      className: 'keyword',
+      begin: '\\b[a-z\\d_]*_t\\b'
+    };
+
+    // https://en.cppreference.com/w/cpp/language/escape
+    // \\ \x \xFF \u2837 \u00323747 \374
+    const CHARACTER_ESCAPES = '\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)';
+    const STRINGS = {
+      className: 'string',
+      variants: [
+        {
+          begin: '(u8?|U|L)?"',
+          end: '"',
+          illegal: '\\n',
+          contains: [ hljs.BACKSLASH_ESCAPE ]
+        },
+        {
+          begin: '(u8?|U|L)?\'(' + CHARACTER_ESCAPES + "|.)",
+          end: '\'',
+          illegal: '.'
+        },
+        hljs.END_SAME_AS_BEGIN({
+          begin: /(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,
+          end: /\)([^()\\ ]{0,16})"/
+        })
+      ]
+    };
+
+    const NUMBERS = {
+      className: 'number',
+      variants: [
+        {
+          begin: '\\b(0b[01\']+)'
+        },
+        {
+          begin: '(-?)\\b([\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)'
+        },
+        {
+          begin: '(-?)(\\b0[xX][a-fA-F0-9\']+|(\\b[\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)([eE][-+]?[\\d\']+)?)'
+        }
+      ],
+      relevance: 0
+    };
+
+    const PREPROCESSOR = {
+      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
+        },
+        hljs.inherit(STRINGS, {
+          className: 'meta-string'
+        }),
+        {
+          className: 'meta-string',
+          begin: /<.*?>/,
+          end: /$/,
+          illegal: '\\n'
+        },
+        C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE
+      ]
+    };
+
+    const TITLE_MODE = {
+      className: 'title',
+      begin: optional(NAMESPACE_RE) + hljs.IDENT_RE,
+      relevance: 0
+    };
+
+    const FUNCTION_TITLE = optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(';
+
+    const CPP_KEYWORDS = {
+      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'
+    };
+
+    const EXPRESSION_CONTAINS = [
+      PREPROCESSOR,
+      CPP_PRIMITIVE_TYPES,
+      C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      NUMBERS,
+      STRINGS
+    ];
+
+    const EXPRESSION_CONTEXT = {
+      // This mode covers expression context where we can't expect a function
+      // definition and shouldn't highlight anything that looks like one:
+      // `return some()`, `else if()`, `(x*sum(1, 2))`
+      variants: [
+        {
+          begin: /=/,
+          end: /;/
+        },
+        {
+          begin: /\(/,
+          end: /\)/
+        },
+        {
+          beginKeywords: 'new throw return else',
+          end: /;/
+        }
+      ],
+      keywords: CPP_KEYWORDS,
+      contains: EXPRESSION_CONTAINS.concat([
+        {
+          begin: /\(/,
+          end: /\)/,
+          keywords: CPP_KEYWORDS,
+          contains: EXPRESSION_CONTAINS.concat([ 'self' ]),
+          relevance: 0
+        }
+      ]),
+      relevance: 0
+    };
+
+    const FUNCTION_DECLARATION = {
+      className: 'function',
+      begin: '(' + FUNCTION_TYPE_RE + '[\\*&\\s]+)+' + FUNCTION_TITLE,
+      returnBegin: true,
+      end: /[{;=]/,
+      excludeEnd: true,
+      keywords: CPP_KEYWORDS,
+      illegal: /[^\w\s\*&:<>.]/,
+      contains: [
+        { // to prevent it from being confused as the function title
+          begin: DECLTYPE_AUTO_RE,
+          keywords: CPP_KEYWORDS,
+          relevance: 0
+        },
+        {
+          begin: FUNCTION_TITLE,
+          returnBegin: true,
+          contains: [ TITLE_MODE ],
+          relevance: 0
+        },
+        {
+          className: 'params',
+          begin: /\(/,
+          end: /\)/,
+          keywords: CPP_KEYWORDS,
+          relevance: 0,
+          contains: [
+            C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE,
+            STRINGS,
+            NUMBERS,
+            CPP_PRIMITIVE_TYPES,
+            // Count matching parentheses.
+            {
+              begin: /\(/,
+              end: /\)/,
+              keywords: CPP_KEYWORDS,
+              relevance: 0,
+              contains: [
+                'self',
+                C_LINE_COMMENT_MODE,
+                hljs.C_BLOCK_COMMENT_MODE,
+                STRINGS,
+                NUMBERS,
+                CPP_PRIMITIVE_TYPES
+              ]
+            }
+          ]
+        },
+        CPP_PRIMITIVE_TYPES,
+        C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        PREPROCESSOR
+      ]
+    };
+
+    return {
+      name: "C",
+      aliases: [
+        'c',
+        'h'
+      ],
+      keywords: CPP_KEYWORDS,
+      // Until differentiations are added between `c` and `cpp`, `c` will
+      // not be auto-detected to avoid auto-detect conflicts between C and C++
+      disableAutodetect: true,
+      illegal: '</',
+      contains: [].concat(
+        EXPRESSION_CONTEXT,
+        FUNCTION_DECLARATION,
+        EXPRESSION_CONTAINS,
+        [
+          PREPROCESSOR,
+          { // containers: ie, `vector <int> rooms (9);`
+            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: CPP_KEYWORDS,
+            contains: [
+              'self',
+              CPP_PRIMITIVE_TYPES
+            ]
+          },
+          {
+            begin: hljs.IDENT_RE + '::',
+            keywords: CPP_KEYWORDS
+          },
+          {
+            className: 'class',
+            beginKeywords: 'enum class struct union',
+            end: /[{;:<>=]/,
+            contains: [
+              {
+                beginKeywords: "final class struct"
+              },
+              hljs.TITLE_MODE
+            ]
+          }
+        ]),
+      exports: {
+        preprocessor: PREPROCESSOR,
+        strings: STRINGS,
+        keywords: CPP_KEYWORDS
+      }
+    };
+  }
+
+  return c;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('coffeescript', function () {
+  'use strict';
+
+  const KEYWORDS = [
+    "as", // for exports
+    "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",
+    // JS handles these with a special rule
+    // "get",
+    // "set",
+    "debugger",
+    "async",
+    "await",
+    "static",
+    "import",
+    "from",
+    "export",
+    "extends"
+  ];
+  const LITERALS = [
+    "true",
+    "false",
+    "null",
+    "undefined",
+    "NaN",
+    "Infinity"
+  ];
+
+  const TYPES = [
+    "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"
+  ];
+
+  const ERROR_TYPES = [
+    "EvalError",
+    "InternalError",
+    "RangeError",
+    "ReferenceError",
+    "SyntaxError",
+    "TypeError",
+    "URIError"
+  ];
+
+  const BUILT_IN_GLOBALS = [
+    "setInterval",
+    "setTimeout",
+    "clearInterval",
+    "clearTimeout",
+
+    "require",
+    "exports",
+
+    "eval",
+    "isFinite",
+    "isNaN",
+    "parseFloat",
+    "parseInt",
+    "decodeURI",
+    "decodeURIComponent",
+    "encodeURI",
+    "encodeURIComponent",
+    "escape",
+    "unescape"
+  ];
+
+  const BUILT_IN_VARIABLES = [
+    "arguments",
+    "this",
+    "super",
+    "console",
+    "window",
+    "document",
+    "localStorage",
+    "module",
+    "global" // Node.js
+  ];
+
+  const BUILT_INS = [].concat(
+    BUILT_IN_GLOBALS,
+    BUILT_IN_VARIABLES,
+    TYPES,
+    ERROR_TYPES
+  );
+
+  /*
+  Language: CoffeeScript
+  Author: Dmytrii Nagirniak <dnagir@gmail.com>
+  Contributors: Oleg Efimov <efimovov@gmail.com>, Cédric Néhémie <cedric.nehemie@gmail.com>
+  Description: CoffeeScript is a programming language that transcompiles to JavaScript. For info about language see http://coffeescript.org/
+  Category: common, scripting
+  Website: https://coffeescript.org
+  */
+
+  /** @type LanguageFn */
+  function coffeescript(hljs) {
+    const COFFEE_BUILT_INS = [
+      'npm',
+      'print'
+    ];
+    const COFFEE_LITERALS = [
+      'yes',
+      'no',
+      'on',
+      'off'
+    ];
+    const COFFEE_KEYWORDS = [
+      'then',
+      'unless',
+      'until',
+      'loop',
+      'by',
+      'when',
+      'and',
+      'or',
+      'is',
+      'isnt',
+      'not'
+    ];
+    const NOT_VALID_KEYWORDS = [
+      "var",
+      "const",
+      "let",
+      "function",
+      "static"
+    ];
+    const excluding = (list) =>
+      (kw) => !list.includes(kw);
+    const KEYWORDS$1 = {
+      keyword: KEYWORDS.concat(COFFEE_KEYWORDS).filter(excluding(NOT_VALID_KEYWORDS)),
+      literal: LITERALS.concat(COFFEE_LITERALS),
+      built_in: BUILT_INS.concat(COFFEE_BUILT_INS)
+    };
+    const JS_IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
+    const SUBST = {
+      className: 'subst',
+      begin: /#\{/,
+      end: /\}/,
+      keywords: KEYWORDS$1
+    };
+    const EXPRESSIONS = [
+      hljs.BINARY_NUMBER_MODE,
+      hljs.inherit(hljs.C_NUMBER_MODE, {
+        starts: {
+          end: '(\\s*/)?',
+          relevance: 0
+        }
+      }), // a number tries to eat the following slash to prevent treating it as a regexp
+      {
+        className: 'string',
+        variants: [
+          {
+            begin: /'''/,
+            end: /'''/,
+            contains: [hljs.BACKSLASH_ESCAPE]
+          },
+          {
+            begin: /'/,
+            end: /'/,
+            contains: [hljs.BACKSLASH_ESCAPE]
+          },
+          {
+            begin: /"""/,
+            end: /"""/,
+            contains: [
+              hljs.BACKSLASH_ESCAPE,
+              SUBST
+            ]
+          },
+          {
+            begin: /"/,
+            end: /"/,
+            contains: [
+              hljs.BACKSLASH_ESCAPE,
+              SUBST
+            ]
+          }
+        ]
+      },
+      {
+        className: 'regexp',
+        variants: [
+          {
+            begin: '///',
+            end: '///',
+            contains: [
+              SUBST,
+              hljs.HASH_COMMENT_MODE
+            ]
+          },
+          {
+            begin: '//[gim]{0,3}(?=\\W)',
+            relevance: 0
+          },
+          {
+            // regex can't start with space to parse x / 2 / 3 as two divisions
+            // regex can't start with *, and it supports an "illegal" in the main mode
+            begin: /\/(?![ *]).*?(?![\\]).\/[gim]{0,3}(?=\W)/
+          }
+        ]
+      },
+      {
+        begin: '@' + JS_IDENT_RE // relevance booster
+      },
+      {
+        subLanguage: 'javascript',
+        excludeBegin: true,
+        excludeEnd: true,
+        variants: [
+          {
+            begin: '```',
+            end: '```'
+          },
+          {
+            begin: '`',
+            end: '`'
+          }
+        ]
+      }
+    ];
+    SUBST.contains = EXPRESSIONS;
+
+    const TITLE = hljs.inherit(hljs.TITLE_MODE, {
+      begin: JS_IDENT_RE
+    });
+    const POSSIBLE_PARAMS_RE = '(\\(.*\\)\\s*)?\\B[-=]>';
+    const PARAMS = {
+      className: 'params',
+      begin: '\\([^\\(]',
+      returnBegin: true,
+      /* We need another contained nameless mode to not have every nested
+      pair of parens to be called "params" */
+      contains: [{
+        begin: /\(/,
+        end: /\)/,
+        keywords: KEYWORDS$1,
+        contains: ['self'].concat(EXPRESSIONS)
+      }]
+    };
+
+    return {
+      name: 'CoffeeScript',
+      aliases: [
+        'coffee',
+        'cson',
+        'iced'
+      ],
+      keywords: KEYWORDS$1,
+      illegal: /\/\*/,
+      contains: EXPRESSIONS.concat([
+        hljs.COMMENT('###', '###'),
+        hljs.HASH_COMMENT_MODE,
+        {
+          className: 'function',
+          begin: '^\\s*' + JS_IDENT_RE + '\\s*=\\s*' + POSSIBLE_PARAMS_RE,
+          end: '[-=]>',
+          returnBegin: true,
+          contains: [
+            TITLE,
+            PARAMS
+          ]
+        },
+        {
+          // anonymous function start
+          begin: /[:\(,=]\s*/,
+          relevance: 0,
+          contains: [{
+            className: 'function',
+            begin: POSSIBLE_PARAMS_RE,
+            end: '[-=]>',
+            returnBegin: true,
+            contains: [PARAMS]
+          }]
+        },
+        {
+          className: 'class',
+          beginKeywords: 'class',
+          end: '$',
+          illegal: /[:="\[\]]/,
+          contains: [
+            {
+              beginKeywords: 'extends',
+              endsWithParent: true,
+              illegal: /[:="\[\]]/,
+              contains: [TITLE]
+            },
+            TITLE
+          ]
+        },
+        {
+          begin: JS_IDENT_RE + ':',
+          end: ':',
+          returnBegin: true,
+          returnEnd: true,
+          relevance: 0
+        }
+      ])
+    };
+  }
+
+  return coffeescript;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('cpp', function () {
+  'use strict';
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function optional(re) {
+    return concat('(', re, ')?');
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /*
+  Language: C++
+  Category: common, system
+  Website: https://isocpp.org
+  */
+
+  /** @type LanguageFn */
+  function cpp(hljs) {
+    // added for historic reasons because `hljs.C_LINE_COMMENT_MODE` does
+    // not include such support nor can we be sure all the grammars depending
+    // on it would desire this behavior
+    const C_LINE_COMMENT_MODE = hljs.COMMENT('//', '$', {
+      contains: [
+        {
+          begin: /\\\n/
+        }
+      ]
+    });
+    const DECLTYPE_AUTO_RE = 'decltype\\(auto\\)';
+    const NAMESPACE_RE = '[a-zA-Z_]\\w*::';
+    const TEMPLATE_ARGUMENT_RE = '<[^<>]+>';
+    const FUNCTION_TYPE_RE = '(' +
+      DECLTYPE_AUTO_RE + '|' +
+      optional(NAMESPACE_RE) +
+      '[a-zA-Z_]\\w*' + optional(TEMPLATE_ARGUMENT_RE) +
+    ')';
+    const CPP_PRIMITIVE_TYPES = {
+      className: 'keyword',
+      begin: '\\b[a-z\\d_]*_t\\b'
+    };
+
+    // https://en.cppreference.com/w/cpp/language/escape
+    // \\ \x \xFF \u2837 \u00323747 \374
+    const CHARACTER_ESCAPES = '\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)';
+    const STRINGS = {
+      className: 'string',
+      variants: [
+        {
+          begin: '(u8?|U|L)?"',
+          end: '"',
+          illegal: '\\n',
+          contains: [ hljs.BACKSLASH_ESCAPE ]
+        },
+        {
+          begin: '(u8?|U|L)?\'(' + CHARACTER_ESCAPES + "|.)",
+          end: '\'',
+          illegal: '.'
+        },
+        hljs.END_SAME_AS_BEGIN({
+          begin: /(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,
+          end: /\)([^()\\ ]{0,16})"/
+        })
+      ]
+    };
+
+    const NUMBERS = {
+      className: 'number',
+      variants: [
+        {
+          begin: '\\b(0b[01\']+)'
+        },
+        {
+          begin: '(-?)\\b([\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)'
+        },
+        {
+          begin: '(-?)(\\b0[xX][a-fA-F0-9\']+|(\\b[\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)([eE][-+]?[\\d\']+)?)'
+        }
+      ],
+      relevance: 0
+    };
+
+    const PREPROCESSOR = {
+      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
+        },
+        hljs.inherit(STRINGS, {
+          className: 'meta-string'
+        }),
+        {
+          className: 'meta-string',
+          begin: /<.*?>/,
+          end: /$/,
+          illegal: '\\n'
+        },
+        C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE
+      ]
+    };
+
+    const TITLE_MODE = {
+      className: 'title',
+      begin: optional(NAMESPACE_RE) + hljs.IDENT_RE,
+      relevance: 0
+    };
+
+    const FUNCTION_TITLE = optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(';
+
+    const CPP_KEYWORDS = {
+      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'
+    };
+
+    const EXPRESSION_CONTAINS = [
+      PREPROCESSOR,
+      CPP_PRIMITIVE_TYPES,
+      C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      NUMBERS,
+      STRINGS
+    ];
+
+    const EXPRESSION_CONTEXT = {
+      // This mode covers expression context where we can't expect a function
+      // definition and shouldn't highlight anything that looks like one:
+      // `return some()`, `else if()`, `(x*sum(1, 2))`
+      variants: [
+        {
+          begin: /=/,
+          end: /;/
+        },
+        {
+          begin: /\(/,
+          end: /\)/
+        },
+        {
+          beginKeywords: 'new throw return else',
+          end: /;/
+        }
+      ],
+      keywords: CPP_KEYWORDS,
+      contains: EXPRESSION_CONTAINS.concat([
+        {
+          begin: /\(/,
+          end: /\)/,
+          keywords: CPP_KEYWORDS,
+          contains: EXPRESSION_CONTAINS.concat([ 'self' ]),
+          relevance: 0
+        }
+      ]),
+      relevance: 0
+    };
+
+    const FUNCTION_DECLARATION = {
+      className: 'function',
+      begin: '(' + FUNCTION_TYPE_RE + '[\\*&\\s]+)+' + FUNCTION_TITLE,
+      returnBegin: true,
+      end: /[{;=]/,
+      excludeEnd: true,
+      keywords: CPP_KEYWORDS,
+      illegal: /[^\w\s\*&:<>.]/,
+      contains: [
+        { // to prevent it from being confused as the function title
+          begin: DECLTYPE_AUTO_RE,
+          keywords: CPP_KEYWORDS,
+          relevance: 0
+        },
+        {
+          begin: FUNCTION_TITLE,
+          returnBegin: true,
+          contains: [ TITLE_MODE ],
+          relevance: 0
+        },
+        {
+          className: 'params',
+          begin: /\(/,
+          end: /\)/,
+          keywords: CPP_KEYWORDS,
+          relevance: 0,
+          contains: [
+            C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE,
+            STRINGS,
+            NUMBERS,
+            CPP_PRIMITIVE_TYPES,
+            // Count matching parentheses.
+            {
+              begin: /\(/,
+              end: /\)/,
+              keywords: CPP_KEYWORDS,
+              relevance: 0,
+              contains: [
+                'self',
+                C_LINE_COMMENT_MODE,
+                hljs.C_BLOCK_COMMENT_MODE,
+                STRINGS,
+                NUMBERS,
+                CPP_PRIMITIVE_TYPES
+              ]
+            }
+          ]
+        },
+        CPP_PRIMITIVE_TYPES,
+        C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        PREPROCESSOR
+      ]
+    };
+
+    return {
+      name: 'C++',
+      aliases: [
+        'cc',
+        'c++',
+        'h++',
+        'hpp',
+        'hh',
+        'hxx',
+        'cxx'
+      ],
+      keywords: CPP_KEYWORDS,
+      illegal: '</',
+      contains: [].concat(
+        EXPRESSION_CONTEXT,
+        FUNCTION_DECLARATION,
+        EXPRESSION_CONTAINS,
+        [
+          PREPROCESSOR,
+          { // containers: ie, `vector <int> rooms (9);`
+            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: CPP_KEYWORDS,
+            contains: [
+              'self',
+              CPP_PRIMITIVE_TYPES
+            ]
+          },
+          {
+            begin: hljs.IDENT_RE + '::',
+            keywords: CPP_KEYWORDS
+          },
+          {
+            className: 'class',
+            beginKeywords: 'enum class struct union',
+            end: /[{;:<>=]/,
+            contains: [
+              {
+                beginKeywords: "final class struct"
+              },
+              hljs.TITLE_MODE
+            ]
+          }
+        ]),
+      exports: {
+        preprocessor: PREPROCESSOR,
+        strings: STRINGS,
+        keywords: CPP_KEYWORDS
+      }
+    };
+  }
+
+  return cpp;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('csharp', function () {
+  'use strict';
+
+  /*
+  Language: C#
+  Author: Jason Diamond <jason@diamond.name>
+  Contributor: Nicolas LLOBERA <nllobera@gmail.com>, Pieter Vantorre <pietervantorre@gmail.com>, David Pine <david.pine@microsoft.com>
+  Website: https://docs.microsoft.com/en-us/dotnet/csharp/
+  Category: common
+  */
+
+  /** @type LanguageFn */
+  function csharp(hljs) {
+    var BUILT_IN_KEYWORDS = [
+        'bool',
+        'byte',
+        'char',
+        'decimal',
+        'delegate',
+        'double',
+        'dynamic',
+        'enum',
+        'float',
+        'int',
+        'long',
+        'nint',
+        'nuint',
+        'object',
+        'sbyte',
+        'short',
+        'string',
+        'ulong',
+        'unit',
+        'ushort'
+    ];
+    var FUNCTION_MODIFIERS = [
+      'public',
+      'private',
+      'protected',
+      'static',
+      'internal',
+      'protected',
+      'abstract',
+      'async',
+      'extern',
+      'override',
+      'unsafe',
+      'virtual',
+      'new',
+      'sealed',
+      'partial'
+    ];
+    var LITERAL_KEYWORDS = [
+        'default',
+        'false',
+        'null',
+        'true'
+    ];
+    var NORMAL_KEYWORDS = [
+      'abstract',
+      'as',
+      'base',
+      'break',
+      'case',
+      'class',
+      'const',
+      'continue',
+      'do',
+      'else',
+      'event',
+      'explicit',
+      'extern',
+      'finally',
+      'fixed',
+      'for',
+      'foreach',
+      'goto',
+      'if',
+      'implicit',
+      'in',
+      'interface',
+      'internal',
+      'is',
+      'lock',
+      'namespace',
+      'new',
+      'operator',
+      'out',
+      'override',
+      'params',
+      'private',
+      'protected',
+      'public',
+      'readonly',
+      'record',
+      'ref',
+      'return',
+      'sealed',
+      'sizeof',
+      'stackalloc',
+      'static',
+      'struct',
+      'switch',
+      'this',
+      'throw',
+      'try',
+      'typeof',
+      'unchecked',
+      'unsafe',
+      'using',
+      'virtual',
+      'void',
+      'volatile',
+      'while'
+    ];
+    var CONTEXTUAL_KEYWORDS = [
+      'add',
+      'alias',
+      'and',
+      'ascending',
+      'async',
+      'await',
+      'by',
+      'descending',
+      'equals',
+      'from',
+      'get',
+      'global',
+      'group',
+      'init',
+      'into',
+      'join',
+      'let',
+      'nameof',
+      'not',
+      'notnull',
+      'on',
+      'or',
+      'orderby',
+      'partial',
+      'remove',
+      'select',
+      'set',
+      'unmanaged',
+      'value|0',
+      'var',
+      'when',
+      'where',
+      'with',
+      'yield'
+    ];
+
+    var KEYWORDS = {
+      keyword: NORMAL_KEYWORDS.concat(CONTEXTUAL_KEYWORDS),
+      built_in: BUILT_IN_KEYWORDS,
+      literal: LITERAL_KEYWORDS
+    };
+    var TITLE_MODE = hljs.inherit(hljs.TITLE_MODE, {begin: '[a-zA-Z](\\.?\\w)*'});
+    var NUMBERS = {
+      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
+    };
+    var VERBATIM_STRING = {
+      className: 'string',
+      begin: '@"', end: '"',
+      contains: [{begin: '""'}]
+    };
+    var VERBATIM_STRING_NO_LF = hljs.inherit(VERBATIM_STRING, {illegal: /\n/});
+    var SUBST = {
+      className: 'subst',
+      begin: /\{/, end: /\}/,
+      keywords: KEYWORDS
+    };
+    var SUBST_NO_LF = hljs.inherit(SUBST, {illegal: /\n/});
+    var INTERPOLATED_STRING = {
+      className: 'string',
+      begin: /\$"/, end: '"',
+      illegal: /\n/,
+      contains: [{begin: /\{\{/}, {begin: /\}\}/}, hljs.BACKSLASH_ESCAPE, SUBST_NO_LF]
+    };
+    var INTERPOLATED_VERBATIM_STRING = {
+      className: 'string',
+      begin: /\$@"/, end: '"',
+      contains: [{begin: /\{\{/}, {begin: /\}\}/}, {begin: '""'}, SUBST]
+    };
+    var INTERPOLATED_VERBATIM_STRING_NO_LF = hljs.inherit(INTERPOLATED_VERBATIM_STRING, {
+      illegal: /\n/,
+      contains: [{begin: /\{\{/}, {begin: /\}\}/}, {begin: '""'}, SUBST_NO_LF]
+    });
+    SUBST.contains = [
+      INTERPOLATED_VERBATIM_STRING,
+      INTERPOLATED_STRING,
+      VERBATIM_STRING,
+      hljs.APOS_STRING_MODE,
+      hljs.QUOTE_STRING_MODE,
+      NUMBERS,
+      hljs.C_BLOCK_COMMENT_MODE
+    ];
+    SUBST_NO_LF.contains = [
+      INTERPOLATED_VERBATIM_STRING_NO_LF,
+      INTERPOLATED_STRING,
+      VERBATIM_STRING_NO_LF,
+      hljs.APOS_STRING_MODE,
+      hljs.QUOTE_STRING_MODE,
+      NUMBERS,
+      hljs.inherit(hljs.C_BLOCK_COMMENT_MODE, {illegal: /\n/})
+    ];
+    var STRING = {
+      variants: [
+        INTERPOLATED_VERBATIM_STRING,
+        INTERPOLATED_STRING,
+        VERBATIM_STRING,
+        hljs.APOS_STRING_MODE,
+        hljs.QUOTE_STRING_MODE
+      ]
+    };
+
+    var GENERIC_MODIFIER = {
+      begin: "<",
+      end: ">",
+      contains: [
+        { beginKeywords: "in out"},
+        TITLE_MODE
+      ]
+    };
+    var TYPE_IDENT_RE = hljs.IDENT_RE + '(<' + hljs.IDENT_RE + '(\\s*,\\s*' + hljs.IDENT_RE + ')*>)?(\\[\\])?';
+    var AT_IDENTIFIER = {
+      // prevents expressions like `@class` from incorrect flagging
+      // `class` as a keyword
+      begin: "@" + hljs.IDENT_RE,
+      relevance: 0
+    };
+
+    return {
+      name: 'C#',
+      aliases: ['cs', 'c#'],
+      keywords: KEYWORDS,
+      illegal: /::/,
+      contains: [
+        hljs.COMMENT(
+          '///',
+          '$',
+          {
+            returnBegin: true,
+            contains: [
+              {
+                className: 'doctag',
+                variants: [
+                  {
+                    begin: '///', relevance: 0
+                  },
+                  {
+                    begin: '<!--|-->'
+                  },
+                  {
+                    begin: '</?', end: '>'
+                  }
+                ]
+              }
+            ]
+          }
+        ),
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        {
+          className: 'meta',
+          begin: '#', end: '$',
+          keywords: {
+            'meta-keyword': 'if else elif endif define undef warning error line region endregion pragma checksum'
+          }
+        },
+        STRING,
+        NUMBERS,
+        {
+          beginKeywords: 'class interface',
+          relevance: 0,
+          end: /[{;=]/,
+          illegal: /[^\s:,]/,
+          contains: [
+            { beginKeywords: "where class" },
+            TITLE_MODE,
+            GENERIC_MODIFIER,
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        {
+          beginKeywords: 'namespace',
+          relevance: 0,
+          end: /[{;=]/,
+          illegal: /[^\s:]/,
+          contains: [
+            TITLE_MODE,
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        {
+          beginKeywords: 'record',
+          relevance: 0,
+          end: /[{;=]/,
+          illegal: /[^\s:]/,
+          contains: [
+            TITLE_MODE,
+            GENERIC_MODIFIER,
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        {
+          // [Attributes("")]
+          className: 'meta',
+          begin: '^\\s*\\[', excludeBegin: true, end: '\\]', excludeEnd: true,
+          contains: [
+            {className: 'meta-string', begin: /"/, end: /"/}
+          ]
+        },
+        {
+          // Expression keywords prevent 'keyword Name(...)' from being
+          // recognized as a function definition
+          beginKeywords: 'new return throw await else',
+          relevance: 0
+        },
+        {
+          className: 'function',
+          begin: '(' + TYPE_IDENT_RE + '\\s+)+' + hljs.IDENT_RE + '\\s*(<.+>\\s*)?\\(', returnBegin: true,
+          end: /\s*[{;=]/, excludeEnd: true,
+          keywords: KEYWORDS,
+          contains: [
+            // prevents these from being highlighted `title`
+            {
+              beginKeywords: FUNCTION_MODIFIERS.join(" "),
+              relevance: 0
+            },
+            {
+              begin: hljs.IDENT_RE + '\\s*(<.+>\\s*)?\\(', returnBegin: true,
+              contains: [
+                hljs.TITLE_MODE,
+                GENERIC_MODIFIER
+              ],
+              relevance: 0
+            },
+            {
+              className: 'params',
+              begin: /\(/, end: /\)/,
+              excludeBegin: true,
+              excludeEnd: true,
+              keywords: KEYWORDS,
+              relevance: 0,
+              contains: [
+                STRING,
+                NUMBERS,
+                hljs.C_BLOCK_COMMENT_MODE
+              ]
+            },
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        AT_IDENTIFIER
+      ]
+    };
+  }
+
+  return csharp;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('css', function () {
+  'use strict';
+
+  const MODES = (hljs) => {
+    return {
+      IMPORTANT: {
+        className: 'meta',
+        begin: '!important'
+      },
+      HEXCOLOR: {
+        className: 'number',
+        begin: '#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})'
+      },
+      ATTRIBUTE_SELECTOR_MODE: {
+        className: 'selector-attr',
+        begin: /\[/,
+        end: /\]/,
+        illegal: '$',
+        contains: [
+          hljs.APOS_STRING_MODE,
+          hljs.QUOTE_STRING_MODE
+        ]
+      }
+    };
+  };
+
+  const TAGS = [
+    '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',
+    'main',
+    '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'
+  ];
+
+  const MEDIA_FEATURES = [
+    'any-hover',
+    'any-pointer',
+    'aspect-ratio',
+    'color',
+    'color-gamut',
+    'color-index',
+    'device-aspect-ratio',
+    'device-height',
+    'device-width',
+    'display-mode',
+    'forced-colors',
+    'grid',
+    'height',
+    'hover',
+    'inverted-colors',
+    'monochrome',
+    'orientation',
+    'overflow-block',
+    'overflow-inline',
+    'pointer',
+    'prefers-color-scheme',
+    'prefers-contrast',
+    'prefers-reduced-motion',
+    'prefers-reduced-transparency',
+    'resolution',
+    'scan',
+    'scripting',
+    'update',
+    'width',
+    // TODO: find a better solution?
+    'min-width',
+    'max-width',
+    'min-height',
+    'max-height'
+  ];
+
+  // https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes
+  const PSEUDO_CLASSES = [
+    'active',
+    'any-link',
+    'blank',
+    'checked',
+    'current',
+    'default',
+    'defined',
+    'dir', // dir()
+    'disabled',
+    'drop',
+    'empty',
+    'enabled',
+    'first',
+    'first-child',
+    'first-of-type',
+    'fullscreen',
+    'future',
+    'focus',
+    'focus-visible',
+    'focus-within',
+    'has', // has()
+    'host', // host or host()
+    'host-context', // host-context()
+    'hover',
+    'indeterminate',
+    'in-range',
+    'invalid',
+    'is', // is()
+    'lang', // lang()
+    'last-child',
+    'last-of-type',
+    'left',
+    'link',
+    'local-link',
+    'not', // not()
+    'nth-child', // nth-child()
+    'nth-col', // nth-col()
+    'nth-last-child', // nth-last-child()
+    'nth-last-col', // nth-last-col()
+    'nth-last-of-type', //nth-last-of-type()
+    'nth-of-type', //nth-of-type()
+    'only-child',
+    'only-of-type',
+    'optional',
+    'out-of-range',
+    'past',
+    'placeholder-shown',
+    'read-only',
+    'read-write',
+    'required',
+    'right',
+    'root',
+    'scope',
+    'target',
+    'target-within',
+    'user-invalid',
+    'valid',
+    'visited',
+    'where' // where()
+  ];
+
+  // https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-elements
+  const PSEUDO_ELEMENTS = [
+    'after',
+    'backdrop',
+    'before',
+    'cue',
+    'cue-region',
+    'first-letter',
+    'first-line',
+    'grammar-error',
+    'marker',
+    'part',
+    'placeholder',
+    'selection',
+    'slotted',
+    'spelling-error'
+  ];
+
+  const ATTRIBUTES = [
+    '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-display',
+    '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-variation-settings',
+    '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',
+    'src', // @font-face
+    '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 makes sure longer attributes `font-weight` are matched fully
+    // instead of getting false positives on say `font`
+  ].reverse();
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function lookahead(re) {
+    return concat('(?=', re, ')');
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /*
+  Language: CSS
+  Category: common, css
+  Website: https://developer.mozilla.org/en-US/docs/Web/CSS
+  */
+
+  /** @type LanguageFn */
+  function css(hljs) {
+    const modes = MODES(hljs);
+    const FUNCTION_DISPATCH = {
+      className: "built_in",
+      begin: /[\w-]+(?=\()/
+    };
+    const VENDOR_PREFIX = {
+      begin: /-(webkit|moz|ms|o)-(?=[a-z])/
+    };
+    const AT_MODIFIERS = "and or not only";
+    const AT_PROPERTY_RE = /@-?\w[\w]*(-\w+)*/; // @-webkit-keyframes
+    const IDENT_RE = '[a-zA-Z-][a-zA-Z0-9_-]*';
+    const STRINGS = [
+      hljs.APOS_STRING_MODE,
+      hljs.QUOTE_STRING_MODE
+    ];
+
+    return {
+      name: 'CSS',
+      case_insensitive: true,
+      illegal: /[=|'\$]/,
+      keywords: {
+        keyframePosition: "from to"
+      },
+      classNameAliases: {
+        // for visual continuity with `tag {}` and because we
+        // don't have a great class for this?
+        keyframePosition: "selector-tag"
+      },
+      contains: [
+        hljs.C_BLOCK_COMMENT_MODE,
+        VENDOR_PREFIX,
+        // to recognize keyframe 40% etc which are outside the scope of our
+        // attribute value mode
+        hljs.CSS_NUMBER_MODE,
+        {
+          className: 'selector-id',
+          begin: /#[A-Za-z0-9_-]+/,
+          relevance: 0
+        },
+        {
+          className: 'selector-class',
+          begin: '\\.' + IDENT_RE,
+          relevance: 0
+        },
+        modes.ATTRIBUTE_SELECTOR_MODE,
+        {
+          className: 'selector-pseudo',
+          variants: [
+            {
+              begin: ':(' + PSEUDO_CLASSES.join('|') + ')'
+            },
+            {
+              begin: '::(' + PSEUDO_ELEMENTS.join('|') + ')'
+            }
+          ]
+        },
+        // we may actually need this (12/2020)
+        // { // pseudo-selector params
+        //   begin: /\(/,
+        //   end: /\)/,
+        //   contains: [ hljs.CSS_NUMBER_MODE ]
+        // },
+        {
+          className: 'attribute',
+          begin: '\\b(' + ATTRIBUTES.join('|') + ')\\b'
+        },
+        // attribute values
+        {
+          begin: ':',
+          end: '[;}]',
+          contains: [
+            modes.HEXCOLOR,
+            modes.IMPORTANT,
+            hljs.CSS_NUMBER_MODE,
+            ...STRINGS,
+            // needed to highlight these as strings and to avoid issues with
+            // illegal characters that might be inside urls that would tigger the
+            // languages illegal stack
+            {
+              begin: /(url|data-uri)\(/,
+              end: /\)/,
+              relevance: 0, // from keywords
+              keywords: {
+                built_in: "url data-uri"
+              },
+              contains: [
+                {
+                  className: "string",
+                  // any character other than `)` as in `url()` will be the start
+                  // of a string, which ends with `)` (from the parent mode)
+                  begin: /[^)]/,
+                  endsWithParent: true,
+                  excludeEnd: true
+                }
+              ]
+            },
+            FUNCTION_DISPATCH
+          ]
+        },
+        {
+          begin: lookahead(/@/),
+          end: '[{;]',
+          relevance: 0,
+          illegal: /:/, // break on Less variables @var: ...
+          contains: [
+            {
+              className: 'keyword',
+              begin: AT_PROPERTY_RE
+            },
+            {
+              begin: /\s/,
+              endsWithParent: true,
+              excludeEnd: true,
+              relevance: 0,
+              keywords: {
+                $pattern: /[a-z-]+/,
+                keyword: AT_MODIFIERS,
+                attribute: MEDIA_FEATURES.join(" ")
+              },
+              contains: [
+                {
+                  begin: /[a-z-]+(?=:)/,
+                  className: "attribute"
+                },
+                ...STRINGS,
+                hljs.CSS_NUMBER_MODE
+              ]
+            }
+          ]
+        },
+        {
+          className: 'selector-tag',
+          begin: '\\b(' + TAGS.join('|') + ')\\b'
+        }
+      ]
+    };
+  }
+
+  return css;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('diff', function () {
+  'use strict';
+
+  /*
+  Language: Diff
+  Description: Unified and context diff
+  Author: Vasily Polovnyov <vast@whiteants.net>
+  Website: https://www.gnu.org/software/diffutils/
+  Category: common
+  */
+
+  /** @type LanguageFn */
+  function diff(hljs) {
+    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: /^index/,
+              end: /$/
+            },
+            {
+              begin: /={3,}/,
+              end: /$/
+            },
+            {
+              begin: /^-{3}/,
+              end: /$/
+            },
+            {
+              begin: /^\*{3} /,
+              end: /$/
+            },
+            {
+              begin: /^\+{3}/,
+              end: /$/
+            },
+            {
+              begin: /^\*{15}$/
+            },
+            {
+              begin: /^diff --git/,
+              end: /$/
+            }
+          ]
+        },
+        {
+          className: 'addition',
+          begin: /^\+/,
+          end: /$/
+        },
+        {
+          className: 'deletion',
+          begin: /^-/,
+          end: /$/
+        },
+        {
+          className: 'addition',
+          begin: /^!/,
+          end: /$/
+        }
+      ]
+    };
+  }
+
+  return diff;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('go', function () {
+  'use strict';
+
+  /*
+  Language: Go
+  Author: Stephan Kountso aka StepLg <steplg@gmail.com>
+  Contributors: Evgeny Stepanischev <imbolk@gmail.com>
+  Description: Google go language (golang). For info about language
+  Website: http://golang.org/
+  Category: common, system
+  */
+
+  function go(hljs) {
+    const GO_KEYWORDS = {
+      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: GO_KEYWORDS,
+      illegal: '</',
+      contains: [
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        {
+          className: 'string',
+          variants: [
+            hljs.QUOTE_STRING_MODE,
+            hljs.APOS_STRING_MODE,
+            {
+              begin: '`',
+              end: '`'
+            }
+          ]
+        },
+        {
+          className: 'number',
+          variants: [
+            {
+              begin: hljs.C_NUMBER_RE + '[i]',
+              relevance: 1
+            },
+            hljs.C_NUMBER_MODE
+          ]
+        },
+        {
+          begin: /:=/ // relevance booster
+        },
+        {
+          className: 'function',
+          beginKeywords: 'func',
+          end: '\\s*(\\{|$)',
+          excludeEnd: true,
+          contains: [
+            hljs.TITLE_MODE,
+            {
+              className: 'params',
+              begin: /\(/,
+              end: /\)/,
+              keywords: GO_KEYWORDS,
+              illegal: /["']/
+            }
+          ]
+        }
+      ]
+    };
+  }
+
+  return go;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('http', function () {
+  'use strict';
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /*
+  Language: HTTP
+  Description: HTTP request and response headers with automatic body highlighting
+  Author: Ivan Sagalaev <maniac@softwaremaniacs.org>
+  Category: common, protocols
+  Website: https://developer.mozilla.org/en-US/docs/Web/HTTP/Overview
+  */
+
+  function http(hljs) {
+    const VERSION = 'HTTP/(2|1\\.[01])';
+    const HEADER_NAME = /[A-Za-z][A-Za-z0-9-]*/;
+    const HEADERS_AND_BODY = [
+      {
+        className: 'attribute',
+        begin: concat('^', HEADER_NAME, '(?=\\:\\s)'),
+        starts: {
+          contains: [
+            {
+              className: "punctuation",
+              begin: /: /,
+              relevance: 0,
+              starts: {
+                end: '$',
+                relevance: 0
+              }
+            }
+          ]
+        }
+      },
+      {
+        begin: '\\n\\n',
+        starts: { subLanguage: [], endsWithParent: true }
+      }
+    ];
+
+    return {
+      name: 'HTTP',
+      aliases: ['https'],
+      illegal: /\S/,
+      contains: [
+        // response
+        {
+          begin: '^(?=' + VERSION + " \\d{3})",
+          end: /$/,
+          contains: [
+            {
+              className: "meta",
+              begin: VERSION
+            },
+            {
+              className: 'number', begin: '\\b\\d{3}\\b'
+            }
+          ],
+          starts: {
+            end: /\b\B/,
+            illegal: /\S/,
+            contains: HEADERS_AND_BODY
+          }
+        },
+        // request
+        {
+          begin: '(?=^[A-Z]+ (.*?) ' + VERSION + '$)',
+          end: /$/,
+          contains: [
+            {
+              className: 'string',
+              begin: ' ',
+              end: ' ',
+              excludeBegin: true,
+              excludeEnd: true
+            },
+            {
+              className: "meta",
+              begin: VERSION
+            },
+            {
+              className: 'keyword',
+              begin: '[A-Z]+'
+            }
+          ],
+          starts: {
+            end: /\b\B/,
+            illegal: /\S/,
+            contains: HEADERS_AND_BODY
+          }
+        }
+      ]
+    };
+  }
+
+  return http;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('ini', function () {
+  'use strict';
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function lookahead(re) {
+    return concat('(?=', re, ')');
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /**
+   * Any of the passed expresssions may match
+   *
+   * Creates a huge this | this | that | that match
+   * @param {(RegExp | string)[] } args
+   * @returns {string}
+   */
+  function either(...args) {
+    const joined = '(' + args.map((x) => source(x)).join("|") + ")";
+    return joined;
+  }
+
+  /*
+  Language: TOML, also INI
+  Description: TOML aims to be a minimal configuration file format that's easy to read due to obvious semantics.
+  Contributors: Guillaume Gomez <guillaume1.gomez@gmail.com>
+  Category: common, config
+  Website: https://github.com/toml-lang/toml
+  */
+
+  function ini(hljs) {
+    const NUMBERS = {
+      className: 'number',
+      relevance: 0,
+      variants: [
+        {
+          begin: /([+-]+)?[\d]+_[\d_]+/
+        },
+        {
+          begin: hljs.NUMBER_RE
+        }
+      ]
+    };
+    const COMMENTS = hljs.COMMENT();
+    COMMENTS.variants = [
+      {
+        begin: /;/,
+        end: /$/
+      },
+      {
+        begin: /#/,
+        end: /$/
+      }
+    ];
+    const VARIABLES = {
+      className: 'variable',
+      variants: [
+        {
+          begin: /\$[\w\d"][\w\d_]*/
+        },
+        {
+          begin: /\$\{(.*?)\}/
+        }
+      ]
+    };
+    const LITERALS = {
+      className: 'literal',
+      begin: /\bon|off|true|false|yes|no\b/
+    };
+    const STRINGS = {
+      className: "string",
+      contains: [hljs.BACKSLASH_ESCAPE],
+      variants: [
+        {
+          begin: "'''",
+          end: "'''",
+          relevance: 10
+        },
+        {
+          begin: '"""',
+          end: '"""',
+          relevance: 10
+        },
+        {
+          begin: '"',
+          end: '"'
+        },
+        {
+          begin: "'",
+          end: "'"
+        }
+      ]
+    };
+    const ARRAY = {
+      begin: /\[/,
+      end: /\]/,
+      contains: [
+        COMMENTS,
+        LITERALS,
+        VARIABLES,
+        STRINGS,
+        NUMBERS,
+        'self'
+      ],
+      relevance: 0
+    };
+
+    const BARE_KEY = /[A-Za-z0-9_-]+/;
+    const QUOTED_KEY_DOUBLE_QUOTE = /"(\\"|[^"])*"/;
+    const QUOTED_KEY_SINGLE_QUOTE = /'[^']*'/;
+    const ANY_KEY = either(
+      BARE_KEY, QUOTED_KEY_DOUBLE_QUOTE, QUOTED_KEY_SINGLE_QUOTE
+    );
+    const DOTTED_KEY = concat(
+      ANY_KEY, '(\\s*\\.\\s*', ANY_KEY, ')*',
+      lookahead(/\s*=\s*[^#\s]/)
+    );
+
+    return {
+      name: 'TOML, also INI',
+      aliases: ['toml'],
+      case_insensitive: true,
+      illegal: /\S/,
+      contains: [
+        COMMENTS,
+        {
+          className: 'section',
+          begin: /\[+/,
+          end: /\]+/
+        },
+        {
+          begin: DOTTED_KEY,
+          className: 'attr',
+          starts: {
+            end: /$/,
+            contains: [
+              COMMENTS,
+              ARRAY,
+              LITERALS,
+              VARIABLES,
+              STRINGS,
+              NUMBERS
+            ]
+          }
+        }
+      ]
+    };
+  }
+
+  return ini;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('java', function () {
+  'use strict';
+
+  // https://docs.oracle.com/javase/specs/jls/se15/html/jls-3.html#jls-3.10
+  var decimalDigits = '[0-9](_*[0-9])*';
+  var frac = `\\.(${decimalDigits})`;
+  var hexDigits = '[0-9a-fA-F](_*[0-9a-fA-F])*';
+  var NUMERIC = {
+    className: 'number',
+    variants: [
+      // DecimalFloatingPointLiteral
+      // including ExponentPart
+      { begin: `(\\b(${decimalDigits})((${frac})|\\.)?|(${frac}))` +
+        `[eE][+-]?(${decimalDigits})[fFdD]?\\b` },
+      // excluding ExponentPart
+      { begin: `\\b(${decimalDigits})((${frac})[fFdD]?\\b|\\.([fFdD]\\b)?)` },
+      { begin: `(${frac})[fFdD]?\\b` },
+      { begin: `\\b(${decimalDigits})[fFdD]\\b` },
+
+      // HexadecimalFloatingPointLiteral
+      { begin: `\\b0[xX]((${hexDigits})\\.?|(${hexDigits})?\\.(${hexDigits}))` +
+        `[pP][+-]?(${decimalDigits})[fFdD]?\\b` },
+
+      // DecimalIntegerLiteral
+      { begin: '\\b(0|[1-9](_*[0-9])*)[lL]?\\b' },
+
+      // HexIntegerLiteral
+      { begin: `\\b0[xX](${hexDigits})[lL]?\\b` },
+
+      // OctalIntegerLiteral
+      { begin: '\\b0(_*[0-7])*[lL]?\\b' },
+
+      // BinaryIntegerLiteral
+      { begin: '\\b0[bB][01](_*[01])*[lL]?\\b' },
+    ],
+    relevance: 0
+  };
+
+  /*
+  Language: Java
+  Author: Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
+  Category: common, enterprise
+  Website: https://www.java.com/
+  */
+
+  function java(hljs) {
+    var JAVA_IDENT_RE = '[\u00C0-\u02B8a-zA-Z_$][\u00C0-\u02B8a-zA-Z_$0-9]*';
+    var GENERIC_IDENT_RE = JAVA_IDENT_RE + '(<' + JAVA_IDENT_RE + '(\\s*,\\s*' + JAVA_IDENT_RE + ')*>)?';
+    var KEYWORDS = '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';
+
+    var ANNOTATION = {
+      className: 'meta',
+      begin: '@' + JAVA_IDENT_RE,
+      contains: [
+        {
+          begin: /\(/,
+          end: /\)/,
+          contains: ["self"] // allow nested () inside our annotation
+        },
+      ]
+    };
+    const NUMBER = NUMERIC;
+
+    return {
+      name: 'Java',
+      aliases: ['jsp'],
+      keywords: KEYWORDS,
+      illegal: /<\/|#/,
+      contains: [
+        hljs.COMMENT(
+          '/\\*\\*',
+          '\\*/',
+          {
+            relevance: 0,
+            contains: [
+              {
+                // eat up @'s in emails to prevent them to be recognized as doctags
+                begin: /\w+@/, relevance: 0
+              },
+              {
+                className: 'doctag',
+                begin: '@[A-Za-z]+'
+              }
+            ]
+          }
+        ),
+        // relevance boost
+        {
+          begin: /import java\.[a-z]+\./,
+          keywords: "import",
+          relevance: 2
+        },
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        hljs.APOS_STRING_MODE,
+        hljs.QUOTE_STRING_MODE,
+        {
+          className: 'class',
+          beginKeywords: 'class interface enum', end: /[{;=]/, excludeEnd: true,
+          // TODO: can this be removed somehow?
+          // an extra boost because Java is more popular than other languages with
+          // this same syntax feature (this is just to preserve our tests passing
+          // for now)
+          relevance: 1,
+          keywords: 'class interface enum',
+          illegal: /[:"\[\]]/,
+          contains: [
+            { beginKeywords: 'extends implements' },
+            hljs.UNDERSCORE_TITLE_MODE
+          ]
+        },
+        {
+          // Expression keywords prevent 'keyword Name(...)' from being
+          // recognized as a function definition
+          beginKeywords: 'new throw return else',
+          relevance: 0
+        },
+        {
+          className: 'class',
+          begin: 'record\\s+' + hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
+          returnBegin: true,
+          excludeEnd: true,
+          end: /[{;=]/,
+          keywords: KEYWORDS,
+          contains: [
+            { beginKeywords: "record" },
+            {
+              begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
+              returnBegin: true,
+              relevance: 0,
+              contains: [hljs.UNDERSCORE_TITLE_MODE]
+            },
+            {
+              className: 'params',
+              begin: /\(/, end: /\)/,
+              keywords: KEYWORDS,
+              relevance: 0,
+              contains: [
+                hljs.C_BLOCK_COMMENT_MODE
+              ]
+            },
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        {
+          className: 'function',
+          begin: '(' + GENERIC_IDENT_RE + '\\s+)+' + hljs.UNDERSCORE_IDENT_RE + '\\s*\\(', returnBegin: true, end: /[{;=]/,
+          excludeEnd: true,
+          keywords: KEYWORDS,
+          contains: [
+            {
+              begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(', returnBegin: true,
+              relevance: 0,
+              contains: [hljs.UNDERSCORE_TITLE_MODE]
+            },
+            {
+              className: 'params',
+              begin: /\(/, end: /\)/,
+              keywords: KEYWORDS,
+              relevance: 0,
+              contains: [
+                ANNOTATION,
+                hljs.APOS_STRING_MODE,
+                hljs.QUOTE_STRING_MODE,
+                NUMBER,
+                hljs.C_BLOCK_COMMENT_MODE
+              ]
+            },
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        NUMBER,
+        ANNOTATION
+      ]
+    };
+  }
+
+  return java;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('javascript', function () {
+  'use strict';
+
+  const IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
+  const KEYWORDS = [
+    "as", // for exports
+    "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",
+    // JS handles these with a special rule
+    // "get",
+    // "set",
+    "debugger",
+    "async",
+    "await",
+    "static",
+    "import",
+    "from",
+    "export",
+    "extends"
+  ];
+  const LITERALS = [
+    "true",
+    "false",
+    "null",
+    "undefined",
+    "NaN",
+    "Infinity"
+  ];
+
+  const TYPES = [
+    "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"
+  ];
+
+  const ERROR_TYPES = [
+    "EvalError",
+    "InternalError",
+    "RangeError",
+    "ReferenceError",
+    "SyntaxError",
+    "TypeError",
+    "URIError"
+  ];
+
+  const BUILT_IN_GLOBALS = [
+    "setInterval",
+    "setTimeout",
+    "clearInterval",
+    "clearTimeout",
+
+    "require",
+    "exports",
+
+    "eval",
+    "isFinite",
+    "isNaN",
+    "parseFloat",
+    "parseInt",
+    "decodeURI",
+    "decodeURIComponent",
+    "encodeURI",
+    "encodeURIComponent",
+    "escape",
+    "unescape"
+  ];
+
+  const BUILT_IN_VARIABLES = [
+    "arguments",
+    "this",
+    "super",
+    "console",
+    "window",
+    "document",
+    "localStorage",
+    "module",
+    "global" // Node.js
+  ];
+
+  const BUILT_INS = [].concat(
+    BUILT_IN_GLOBALS,
+    BUILT_IN_VARIABLES,
+    TYPES,
+    ERROR_TYPES
+  );
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function lookahead(re) {
+    return concat('(?=', re, ')');
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /*
+  Language: JavaScript
+  Description: JavaScript (JS) is a lightweight, interpreted, or just-in-time compiled programming language with first-class functions.
+  Category: common, scripting
+  Website: https://developer.mozilla.org/en-US/docs/Web/JavaScript
+  */
+
+  /** @type LanguageFn */
+  function javascript(hljs) {
+    /**
+     * Takes a string like "<Booger" and checks to see
+     * if we can find a matching "</Booger" later in the
+     * content.
+     * @param {RegExpMatchArray} match
+     * @param {{after:number}} param1
+     */
+    const hasClosingTag = (match, { after }) => {
+      const tag = "</" + match[0].slice(1);
+      const pos = match.input.indexOf(tag, after);
+      return pos !== -1;
+    };
+
+    const IDENT_RE$1 = IDENT_RE;
+    const FRAGMENT = {
+      begin: '<>',
+      end: '</>'
+    };
+    const XML_TAG = {
+      begin: /<[A-Za-z0-9\\._:-]+/,
+      end: /\/[A-Za-z0-9\\._:-]+>|\/>/,
+      /**
+       * @param {RegExpMatchArray} match
+       * @param {CallbackResponse} response
+       */
+      isTrulyOpeningTag: (match, response) => {
+        const afterMatchIndex = match[0].length + match.index;
+        const nextChar = match.input[afterMatchIndex];
+        // nested type?
+        // HTML should not include another raw `<` inside a tag
+        // But a type might: `<Array<Array<number>>`, etc.
+        if (nextChar === "<") {
+          response.ignoreMatch();
+          return;
+        }
+        // <something>
+        // This is now either a tag or a type.
+        if (nextChar === ">") {
+          // if we cannot find a matching closing tag, then we
+          // will ignore it
+          if (!hasClosingTag(match, { after: afterMatchIndex })) {
+            response.ignoreMatch();
+          }
+        }
+      }
+    };
+    const KEYWORDS$1 = {
+      $pattern: IDENT_RE,
+      keyword: KEYWORDS,
+      literal: LITERALS,
+      built_in: BUILT_INS
+    };
+
+    // https://tc39.es/ecma262/#sec-literals-numeric-literals
+    const decimalDigits = '[0-9](_?[0-9])*';
+    const frac = `\\.(${decimalDigits})`;
+    // DecimalIntegerLiteral, including Annex B NonOctalDecimalIntegerLiteral
+    // https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals
+    const decimalInteger = `0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*`;
+    const NUMBER = {
+      className: 'number',
+      variants: [
+        // DecimalLiteral
+        { begin: `(\\b(${decimalInteger})((${frac})|\\.)?|(${frac}))` +
+          `[eE][+-]?(${decimalDigits})\\b` },
+        { begin: `\\b(${decimalInteger})\\b((${frac})\\b|\\.)?|(${frac})\\b` },
+
+        // DecimalBigIntegerLiteral
+        { begin: `\\b(0|[1-9](_?[0-9])*)n\\b` },
+
+        // NonDecimalIntegerLiteral
+        { begin: "\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b" },
+        { begin: "\\b0[bB][0-1](_?[0-1])*n?\\b" },
+        { begin: "\\b0[oO][0-7](_?[0-7])*n?\\b" },
+
+        // LegacyOctalIntegerLiteral (does not include underscore separators)
+        // https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals
+        { begin: "\\b0[0-7]+n?\\b" },
+      ],
+      relevance: 0
+    };
+
+    const SUBST = {
+      className: 'subst',
+      begin: '\\$\\{',
+      end: '\\}',
+      keywords: KEYWORDS$1,
+      contains: [] // defined later
+    };
+    const HTML_TEMPLATE = {
+      begin: 'html`',
+      end: '',
+      starts: {
+        end: '`',
+        returnEnd: false,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ],
+        subLanguage: 'xml'
+      }
+    };
+    const CSS_TEMPLATE = {
+      begin: 'css`',
+      end: '',
+      starts: {
+        end: '`',
+        returnEnd: false,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ],
+        subLanguage: 'css'
+      }
+    };
+    const TEMPLATE_STRING = {
+      className: 'string',
+      begin: '`',
+      end: '`',
+      contains: [
+        hljs.BACKSLASH_ESCAPE,
+        SUBST
+      ]
+    };
+    const JSDOC_COMMENT = hljs.COMMENT(
+      /\/\*\*(?!\/)/,
+      '\\*/',
+      {
+        relevance: 0,
+        contains: [
+          {
+            className: 'doctag',
+            begin: '@[A-Za-z]+',
+            contains: [
+              {
+                className: 'type',
+                begin: '\\{',
+                end: '\\}',
+                relevance: 0
+              },
+              {
+                className: 'variable',
+                begin: IDENT_RE$1 + '(?=\\s*(-)|$)',
+                endsParent: true,
+                relevance: 0
+              },
+              // eat spaces (not newlines) so we can find
+              // types or variables
+              {
+                begin: /(?=[^\n])\s/,
+                relevance: 0
+              }
+            ]
+          }
+        ]
+      }
+    );
+    const COMMENT = {
+      className: "comment",
+      variants: [
+        JSDOC_COMMENT,
+        hljs.C_BLOCK_COMMENT_MODE,
+        hljs.C_LINE_COMMENT_MODE
+      ]
+    };
+    const SUBST_INTERNALS = [
+      hljs.APOS_STRING_MODE,
+      hljs.QUOTE_STRING_MODE,
+      HTML_TEMPLATE,
+      CSS_TEMPLATE,
+      TEMPLATE_STRING,
+      NUMBER,
+      hljs.REGEXP_MODE
+    ];
+    SUBST.contains = SUBST_INTERNALS
+      .concat({
+        // we need to pair up {} inside our subst to prevent
+        // it from ending too early by matching another }
+        begin: /\{/,
+        end: /\}/,
+        keywords: KEYWORDS$1,
+        contains: [
+          "self"
+        ].concat(SUBST_INTERNALS)
+      });
+    const SUBST_AND_COMMENTS = [].concat(COMMENT, SUBST.contains);
+    const PARAMS_CONTAINS = SUBST_AND_COMMENTS.concat([
+      // eat recursive parens in sub expressions
+      {
+        begin: /\(/,
+        end: /\)/,
+        keywords: KEYWORDS$1,
+        contains: ["self"].concat(SUBST_AND_COMMENTS)
+      }
+    ]);
+    const PARAMS = {
+      className: 'params',
+      begin: /\(/,
+      end: /\)/,
+      excludeBegin: true,
+      excludeEnd: true,
+      keywords: KEYWORDS$1,
+      contains: PARAMS_CONTAINS
+    };
+
+    return {
+      name: 'Javascript',
+      aliases: ['js', 'jsx', 'mjs', 'cjs'],
+      keywords: KEYWORDS$1,
+      // this will be extended by TypeScript
+      exports: { PARAMS_CONTAINS },
+      illegal: /#(?![$_A-z])/,
+      contains: [
+        hljs.SHEBANG({
+          label: "shebang",
+          binary: "node",
+          relevance: 5
+        }),
+        {
+          label: "use_strict",
+          className: 'meta',
+          relevance: 10,
+          begin: /^\s*['"]use (strict|asm)['"]/
+        },
+        hljs.APOS_STRING_MODE,
+        hljs.QUOTE_STRING_MODE,
+        HTML_TEMPLATE,
+        CSS_TEMPLATE,
+        TEMPLATE_STRING,
+        COMMENT,
+        NUMBER,
+        { // object attr container
+          begin: concat(/[{,\n]\s*/,
+            // we need to look ahead to make sure that we actually have an
+            // attribute coming up so we don't steal a comma from a potential
+            // "value" container
+            //
+            // NOTE: this might not work how you think.  We don't actually always
+            // enter this mode and stay.  Instead it might merely match `,
+            // <comments up next>` and then immediately end after the , because it
+            // fails to find any actual attrs. But this still does the job because
+            // it prevents the value contain rule from grabbing this instead and
+            // prevening this rule from firing when we actually DO have keys.
+            lookahead(concat(
+              // we also need to allow for multiple possible comments inbetween
+              // the first key:value pairing
+              /(((\/\/.*$)|(\/\*(\*[^/]|[^*])*\*\/))\s*)*/,
+              IDENT_RE$1 + '\\s*:'))),
+          relevance: 0,
+          contains: [
+            {
+              className: 'attr',
+              begin: IDENT_RE$1 + lookahead('\\s*:'),
+              relevance: 0
+            }
+          ]
+        },
+        { // "value" container
+          begin: '(' + hljs.RE_STARTERS_RE + '|\\b(case|return|throw)\\b)\\s*',
+          keywords: 'return throw case',
+          contains: [
+            COMMENT,
+            hljs.REGEXP_MODE,
+            {
+              className: 'function',
+              // we have to count the parens to make sure we actually have the
+              // correct bounding ( ) before the =>.  There could be any number of
+              // sub-expressions inside also surrounded by parens.
+              begin: '(\\(' +
+              '[^()]*(\\(' +
+              '[^()]*(\\(' +
+              '[^()]*' +
+              '\\)[^()]*)*' +
+              '\\)[^()]*)*' +
+              '\\)|' + hljs.UNDERSCORE_IDENT_RE + ')\\s*=>',
+              returnBegin: true,
+              end: '\\s*=>',
+              contains: [
+                {
+                  className: 'params',
+                  variants: [
+                    {
+                      begin: hljs.UNDERSCORE_IDENT_RE,
+                      relevance: 0
+                    },
+                    {
+                      className: null,
+                      begin: /\(\s*\)/,
+                      skip: true
+                    },
+                    {
+                      begin: /\(/,
+                      end: /\)/,
+                      excludeBegin: true,
+                      excludeEnd: true,
+                      keywords: KEYWORDS$1,
+                      contains: PARAMS_CONTAINS
+                    }
+                  ]
+                }
+              ]
+            },
+            { // could be a comma delimited list of params to a function call
+              begin: /,/, relevance: 0
+            },
+            {
+              className: '',
+              begin: /\s/,
+              end: /\s*/,
+              skip: true
+            },
+            { // JSX
+              variants: [
+                { begin: FRAGMENT.begin, end: FRAGMENT.end },
+                {
+                  begin: XML_TAG.begin,
+                  // we carefully check the opening tag to see if it truly
+                  // is a tag and not a false positive
+                  'on:begin': XML_TAG.isTrulyOpeningTag,
+                  end: XML_TAG.end
+                }
+              ],
+              subLanguage: 'xml',
+              contains: [
+                {
+                  begin: XML_TAG.begin,
+                  end: XML_TAG.end,
+                  skip: true,
+                  contains: ['self']
+                }
+              ]
+            }
+          ],
+          relevance: 0
+        },
+        {
+          className: 'function',
+          beginKeywords: 'function',
+          end: /[{;]/,
+          excludeEnd: true,
+          keywords: KEYWORDS$1,
+          contains: [
+            'self',
+            hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE$1 }),
+            PARAMS
+          ],
+          illegal: /%/
+        },
+        {
+          // prevent this from getting swallowed up by function
+          // since they appear "function like"
+          beginKeywords: "while if switch catch for"
+        },
+        {
+          className: 'function',
+          // we have to count the parens to make sure we actually have the correct
+          // bounding ( ).  There could be any number of sub-expressions inside
+          // also surrounded by parens.
+          begin: hljs.UNDERSCORE_IDENT_RE +
+            '\\(' + // first parens
+            '[^()]*(\\(' +
+              '[^()]*(\\(' +
+                '[^()]*' +
+              '\\)[^()]*)*' +
+            '\\)[^()]*)*' +
+            '\\)\\s*\\{', // end parens
+          returnBegin:true,
+          contains: [
+            PARAMS,
+            hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE$1 }),
+          ]
+        },
+        // hack: prevents detection of keywords in some circumstances
+        // .keyword()
+        // $keyword = x
+        {
+          variants: [
+            { begin: '\\.' + IDENT_RE$1 },
+            { begin: '\\$' + IDENT_RE$1 }
+          ],
+          relevance: 0
+        },
+        { // ES6 class
+          className: 'class',
+          beginKeywords: 'class',
+          end: /[{;=]/,
+          excludeEnd: true,
+          illegal: /[:"[\]]/,
+          contains: [
+            { beginKeywords: 'extends' },
+            hljs.UNDERSCORE_TITLE_MODE
+          ]
+        },
+        {
+          begin: /\b(?=constructor)/,
+          end: /[{;]/,
+          excludeEnd: true,
+          contains: [
+            hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE$1 }),
+            'self',
+            PARAMS
+          ]
+        },
+        {
+          begin: '(get|set)\\s+(?=' + IDENT_RE$1 + '\\()',
+          end: /\{/,
+          keywords: "get set",
+          contains: [
+            hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE$1 }),
+            { begin: /\(\)/ }, // eat to avoid empty params
+            PARAMS
+          ]
+        },
+        {
+          begin: /\$[(.]/ // relevance booster for a pattern common to JS libs: `$(something)` and `$.something`
+        }
+      ]
+    };
+  }
+
+  return javascript;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('json', function () {
+  'use strict';
+
+  /*
+  Language: JSON
+  Description: JSON (JavaScript Object Notation) is a lightweight data-interchange format.
+  Author: Ivan Sagalaev <maniac@softwaremaniacs.org>
+  Website: http://www.json.org
+  Category: common, protocols
+  */
+
+  function json(hljs) {
+    const LITERALS = {
+      literal: 'true false null'
+    };
+    const ALLOWED_COMMENTS = [
+      hljs.C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE
+    ];
+    const TYPES = [
+      hljs.QUOTE_STRING_MODE,
+      hljs.C_NUMBER_MODE
+    ];
+    const VALUE_CONTAINER = {
+      end: ',',
+      endsWithParent: true,
+      excludeEnd: true,
+      contains: TYPES,
+      keywords: LITERALS
+    };
+    const OBJECT = {
+      begin: /\{/,
+      end: /\}/,
+      contains: [
+        {
+          className: 'attr',
+          begin: /"/,
+          end: /"/,
+          contains: [hljs.BACKSLASH_ESCAPE],
+          illegal: '\\n'
+        },
+        hljs.inherit(VALUE_CONTAINER, {
+          begin: /:/
+        })
+      ].concat(ALLOWED_COMMENTS),
+      illegal: '\\S'
+    };
+    const ARRAY = {
+      begin: '\\[',
+      end: '\\]',
+      contains: [hljs.inherit(VALUE_CONTAINER)], // inherit is a workaround for a bug that makes shared modes with endsWithParent compile only the ending of one of the parents
+      illegal: '\\S'
+    };
+    TYPES.push(OBJECT, ARRAY);
+    ALLOWED_COMMENTS.forEach(function(rule) {
+      TYPES.push(rule);
+    });
+    return {
+      name: 'JSON',
+      contains: TYPES,
+      keywords: LITERALS,
+      illegal: '\\S'
+    };
+  }
+
+  return json;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('kotlin', function () {
+  'use strict';
+
+  // https://docs.oracle.com/javase/specs/jls/se15/html/jls-3.html#jls-3.10
+  var decimalDigits = '[0-9](_*[0-9])*';
+  var frac = `\\.(${decimalDigits})`;
+  var hexDigits = '[0-9a-fA-F](_*[0-9a-fA-F])*';
+  var NUMERIC = {
+    className: 'number',
+    variants: [
+      // DecimalFloatingPointLiteral
+      // including ExponentPart
+      { begin: `(\\b(${decimalDigits})((${frac})|\\.)?|(${frac}))` +
+        `[eE][+-]?(${decimalDigits})[fFdD]?\\b` },
+      // excluding ExponentPart
+      { begin: `\\b(${decimalDigits})((${frac})[fFdD]?\\b|\\.([fFdD]\\b)?)` },
+      { begin: `(${frac})[fFdD]?\\b` },
+      { begin: `\\b(${decimalDigits})[fFdD]\\b` },
+
+      // HexadecimalFloatingPointLiteral
+      { begin: `\\b0[xX]((${hexDigits})\\.?|(${hexDigits})?\\.(${hexDigits}))` +
+        `[pP][+-]?(${decimalDigits})[fFdD]?\\b` },
+
+      // DecimalIntegerLiteral
+      { begin: '\\b(0|[1-9](_*[0-9])*)[lL]?\\b' },
+
+      // HexIntegerLiteral
+      { begin: `\\b0[xX](${hexDigits})[lL]?\\b` },
+
+      // OctalIntegerLiteral
+      { begin: '\\b0(_*[0-7])*[lL]?\\b' },
+
+      // BinaryIntegerLiteral
+      { begin: '\\b0[bB][01](_*[01])*[lL]?\\b' },
+    ],
+    relevance: 0
+  };
+
+  /*
+   Language: Kotlin
+   Description: Kotlin is an OSS statically typed programming language that targets the JVM, Android, JavaScript and Native.
+   Author: Sergey Mashkov <cy6erGn0m@gmail.com>
+   Website: https://kotlinlang.org
+   Category: common
+   */
+
+  function kotlin(hljs) {
+    const KEYWORDS = {
+      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',
+      built_in:
+        'Byte Short Char Int Long Boolean Float Double Void Unit Nothing',
+      literal:
+        'true false null'
+    };
+    const KEYWORDS_WITH_LABEL = {
+      className: 'keyword',
+      begin: /\b(break|continue|return|this)\b/,
+      starts: {
+        contains: [
+          {
+            className: 'symbol',
+            begin: /@\w+/
+          }
+        ]
+      }
+    };
+    const LABEL = {
+      className: 'symbol',
+      begin: hljs.UNDERSCORE_IDENT_RE + '@'
+    };
+
+    // for string templates
+    const SUBST = {
+      className: 'subst',
+      begin: /\$\{/,
+      end: /\}/,
+      contains: [ hljs.C_NUMBER_MODE ]
+    };
+    const VARIABLE = {
+      className: 'variable',
+      begin: '\\$' + hljs.UNDERSCORE_IDENT_RE
+    };
+    const STRING = {
+      className: 'string',
+      variants: [
+        {
+          begin: '"""',
+          end: '"""(?=[^"])',
+          contains: [
+            VARIABLE,
+            SUBST
+          ]
+        },
+        // Can't use built-in modes easily, as we want to use STRING in the meta
+        // context as 'meta-string' and there's no syntax to remove explicitly set
+        // classNames in built-in modes.
+        {
+          begin: '\'',
+          end: '\'',
+          illegal: /\n/,
+          contains: [ hljs.BACKSLASH_ESCAPE ]
+        },
+        {
+          begin: '"',
+          end: '"',
+          illegal: /\n/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            VARIABLE,
+            SUBST
+          ]
+        }
+      ]
+    };
+    SUBST.contains.push(STRING);
+
+    const ANNOTATION_USE_SITE = {
+      className: 'meta',
+      begin: '@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*' + hljs.UNDERSCORE_IDENT_RE + ')?'
+    };
+    const ANNOTATION = {
+      className: 'meta',
+      begin: '@' + hljs.UNDERSCORE_IDENT_RE,
+      contains: [
+        {
+          begin: /\(/,
+          end: /\)/,
+          contains: [
+            hljs.inherit(STRING, {
+              className: 'meta-string'
+            })
+          ]
+        }
+      ]
+    };
+
+    // https://kotlinlang.org/docs/reference/whatsnew11.html#underscores-in-numeric-literals
+    // According to the doc above, the number mode of kotlin is the same as java 8,
+    // so the code below is copied from java.js
+    const KOTLIN_NUMBER_MODE = NUMERIC;
+    const KOTLIN_NESTED_COMMENT = hljs.COMMENT(
+      '/\\*', '\\*/',
+      {
+        contains: [ hljs.C_BLOCK_COMMENT_MODE ]
+      }
+    );
+    const KOTLIN_PAREN_TYPE = {
+      variants: [
+        {
+          className: 'type',
+          begin: hljs.UNDERSCORE_IDENT_RE
+        },
+        {
+          begin: /\(/,
+          end: /\)/,
+          contains: [] // defined later
+        }
+      ]
+    };
+    const KOTLIN_PAREN_TYPE2 = KOTLIN_PAREN_TYPE;
+    KOTLIN_PAREN_TYPE2.variants[1].contains = [ KOTLIN_PAREN_TYPE ];
+    KOTLIN_PAREN_TYPE.variants[1].contains = [ KOTLIN_PAREN_TYPE2 ];
+
+    return {
+      name: 'Kotlin',
+      aliases: [ 'kt' ],
+      keywords: KEYWORDS,
+      contains: [
+        hljs.COMMENT(
+          '/\\*\\*',
+          '\\*/',
+          {
+            relevance: 0,
+            contains: [
+              {
+                className: 'doctag',
+                begin: '@[A-Za-z]+'
+              }
+            ]
+          }
+        ),
+        hljs.C_LINE_COMMENT_MODE,
+        KOTLIN_NESTED_COMMENT,
+        KEYWORDS_WITH_LABEL,
+        LABEL,
+        ANNOTATION_USE_SITE,
+        ANNOTATION,
+        {
+          className: 'function',
+          beginKeywords: 'fun',
+          end: '[(]|$',
+          returnBegin: true,
+          excludeEnd: true,
+          keywords: KEYWORDS,
+          relevance: 5,
+          contains: [
+            {
+              begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
+              returnBegin: true,
+              relevance: 0,
+              contains: [ hljs.UNDERSCORE_TITLE_MODE ]
+            },
+            {
+              className: 'type',
+              begin: /</,
+              end: />/,
+              keywords: 'reified',
+              relevance: 0
+            },
+            {
+              className: 'params',
+              begin: /\(/,
+              end: /\)/,
+              endsParent: true,
+              keywords: KEYWORDS,
+              relevance: 0,
+              contains: [
+                {
+                  begin: /:/,
+                  end: /[=,\/]/,
+                  endsWithParent: true,
+                  contains: [
+                    KOTLIN_PAREN_TYPE,
+                    hljs.C_LINE_COMMENT_MODE,
+                    KOTLIN_NESTED_COMMENT
+                  ],
+                  relevance: 0
+                },
+                hljs.C_LINE_COMMENT_MODE,
+                KOTLIN_NESTED_COMMENT,
+                ANNOTATION_USE_SITE,
+                ANNOTATION,
+                STRING,
+                hljs.C_NUMBER_MODE
+              ]
+            },
+            KOTLIN_NESTED_COMMENT
+          ]
+        },
+        {
+          className: 'class',
+          beginKeywords: 'class interface trait', // remove 'trait' when removed from KEYWORDS
+          end: /[:\{(]|$/,
+          excludeEnd: true,
+          illegal: 'extends implements',
+          contains: [
+            {
+              beginKeywords: 'public protected internal private constructor'
+            },
+            hljs.UNDERSCORE_TITLE_MODE,
+            {
+              className: 'type',
+              begin: /</,
+              end: />/,
+              excludeBegin: true,
+              excludeEnd: true,
+              relevance: 0
+            },
+            {
+              className: 'type',
+              begin: /[,:]\s*/,
+              end: /[<\(,]|$/,
+              excludeBegin: true,
+              returnEnd: true
+            },
+            ANNOTATION_USE_SITE,
+            ANNOTATION
+          ]
+        },
+        STRING,
+        {
+          className: 'meta',
+          begin: "^#!/usr/bin/env",
+          end: '$',
+          illegal: '\n'
+        },
+        KOTLIN_NUMBER_MODE
+      ]
+    };
+  }
+
+  return kotlin;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('less', function () {
+  'use strict';
+
+  const MODES = (hljs) => {
+    return {
+      IMPORTANT: {
+        className: 'meta',
+        begin: '!important'
+      },
+      HEXCOLOR: {
+        className: 'number',
+        begin: '#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})'
+      },
+      ATTRIBUTE_SELECTOR_MODE: {
+        className: 'selector-attr',
+        begin: /\[/,
+        end: /\]/,
+        illegal: '$',
+        contains: [
+          hljs.APOS_STRING_MODE,
+          hljs.QUOTE_STRING_MODE
+        ]
+      }
+    };
+  };
+
+  const TAGS = [
+    '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',
+    'main',
+    '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'
+  ];
+
+  const MEDIA_FEATURES = [
+    'any-hover',
+    'any-pointer',
+    'aspect-ratio',
+    'color',
+    'color-gamut',
+    'color-index',
+    'device-aspect-ratio',
+    'device-height',
+    'device-width',
+    'display-mode',
+    'forced-colors',
+    'grid',
+    'height',
+    'hover',
+    'inverted-colors',
+    'monochrome',
+    'orientation',
+    'overflow-block',
+    'overflow-inline',
+    'pointer',
+    'prefers-color-scheme',
+    'prefers-contrast',
+    'prefers-reduced-motion',
+    'prefers-reduced-transparency',
+    'resolution',
+    'scan',
+    'scripting',
+    'update',
+    'width',
+    // TODO: find a better solution?
+    'min-width',
+    'max-width',
+    'min-height',
+    'max-height'
+  ];
+
+  // https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes
+  const PSEUDO_CLASSES = [
+    'active',
+    'any-link',
+    'blank',
+    'checked',
+    'current',
+    'default',
+    'defined',
+    'dir', // dir()
+    'disabled',
+    'drop',
+    'empty',
+    'enabled',
+    'first',
+    'first-child',
+    'first-of-type',
+    'fullscreen',
+    'future',
+    'focus',
+    'focus-visible',
+    'focus-within',
+    'has', // has()
+    'host', // host or host()
+    'host-context', // host-context()
+    'hover',
+    'indeterminate',
+    'in-range',
+    'invalid',
+    'is', // is()
+    'lang', // lang()
+    'last-child',
+    'last-of-type',
+    'left',
+    'link',
+    'local-link',
+    'not', // not()
+    'nth-child', // nth-child()
+    'nth-col', // nth-col()
+    'nth-last-child', // nth-last-child()
+    'nth-last-col', // nth-last-col()
+    'nth-last-of-type', //nth-last-of-type()
+    'nth-of-type', //nth-of-type()
+    'only-child',
+    'only-of-type',
+    'optional',
+    'out-of-range',
+    'past',
+    'placeholder-shown',
+    'read-only',
+    'read-write',
+    'required',
+    'right',
+    'root',
+    'scope',
+    'target',
+    'target-within',
+    'user-invalid',
+    'valid',
+    'visited',
+    'where' // where()
+  ];
+
+  // https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-elements
+  const PSEUDO_ELEMENTS = [
+    'after',
+    'backdrop',
+    'before',
+    'cue',
+    'cue-region',
+    'first-letter',
+    'first-line',
+    'grammar-error',
+    'marker',
+    'part',
+    'placeholder',
+    'selection',
+    'slotted',
+    'spelling-error'
+  ];
+
+  const ATTRIBUTES = [
+    '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-display',
+    '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-variation-settings',
+    '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',
+    'src', // @font-face
+    '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 makes sure longer attributes `font-weight` are matched fully
+    // instead of getting false positives on say `font`
+  ].reverse();
+
+  // some grammars use them all as a single group
+  const PSEUDO_SELECTORS = PSEUDO_CLASSES.concat(PSEUDO_ELEMENTS);
+
+  /*
+  Language: Less
+  Description: It's CSS, with just a little more.
+  Author:   Max Mikhailov <seven.phases.max@gmail.com>
+  Website: http://lesscss.org
+  Category: common, css
+  */
+
+  /** @type LanguageFn */
+  function less(hljs) {
+    const modes = MODES(hljs);
+    const PSEUDO_SELECTORS$1 = PSEUDO_SELECTORS;
+
+    const AT_MODIFIERS = "and or not only";
+    const IDENT_RE = '[\\w-]+'; // yes, Less identifiers may begin with a digit
+    const INTERP_IDENT_RE = '(' + IDENT_RE + '|@\\{' + IDENT_RE + '\\})';
+
+    /* Generic Modes */
+
+    const RULES = []; const VALUE_MODES = []; // forward def. for recursive modes
+
+    const STRING_MODE = function(c) {
+      return {
+      // Less strings are not multiline (also include '~' for more consistent coloring of "escaped" strings)
+        className: 'string',
+        begin: '~?' + c + '.*?' + c
+      };
+    };
+
+    const IDENT_MODE = function(name, begin, relevance) {
+      return {
+        className: name,
+        begin: begin,
+        relevance: relevance
+      };
+    };
+
+    const AT_KEYWORDS = {
+      $pattern: /[a-z-]+/,
+      keyword: AT_MODIFIERS,
+      attribute: MEDIA_FEATURES.join(" ")
+    };
+
+    const PARENS_MODE = {
+      // used only to properly balance nested parens inside mixin call, def. arg list
+      begin: '\\(',
+      end: '\\)',
+      contains: VALUE_MODES,
+      keywords: AT_KEYWORDS,
+      relevance: 0
+    };
+
+    // generic Less highlighter (used almost everywhere except selectors):
+    VALUE_MODES.push(
+      hljs.C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      STRING_MODE("'"),
+      STRING_MODE('"'),
+      hljs.CSS_NUMBER_MODE, // fixme: it does not include dot for numbers like .5em :(
+      {
+        begin: '(url|data-uri)\\(',
+        starts: {
+          className: 'string',
+          end: '[\\)\\n]',
+          excludeEnd: true
+        }
+      },
+      modes.HEXCOLOR,
+      PARENS_MODE,
+      IDENT_MODE('variable', '@@?' + IDENT_RE, 10),
+      IDENT_MODE('variable', '@\\{' + IDENT_RE + '\\}'),
+      IDENT_MODE('built_in', '~?`[^`]*?`'), // inline javascript (or whatever host language) *multiline* string
+      { // @media features (it’s here to not duplicate things in AT_RULE_MODE with extra PARENS_MODE overriding):
+        className: 'attribute',
+        begin: IDENT_RE + '\\s*:',
+        end: ':',
+        returnBegin: true,
+        excludeEnd: true
+      },
+      modes.IMPORTANT
+    );
+
+    const VALUE_WITH_RULESETS = VALUE_MODES.concat({
+      begin: /\{/,
+      end: /\}/,
+      contains: RULES
+    });
+
+    const MIXIN_GUARD_MODE = {
+      beginKeywords: 'when',
+      endsWithParent: true,
+      contains: [
+        {
+          beginKeywords: 'and not'
+        }
+      ].concat(VALUE_MODES) // using this form to override VALUE’s 'function' match
+    };
+
+    /* Rule-Level Modes */
+
+    const RULE_MODE = {
+      begin: INTERP_IDENT_RE + '\\s*:',
+      returnBegin: true,
+      end: /[;}]/,
+      relevance: 0,
+      contains: [
+        {
+          begin: /-(webkit|moz|ms|o)-/
+        },
+        {
+          className: 'attribute',
+          begin: '\\b(' + ATTRIBUTES.join('|') + ')\\b',
+          end: /(?=:)/,
+          starts: {
+            endsWithParent: true,
+            illegal: '[<=$]',
+            relevance: 0,
+            contains: VALUE_MODES
+          }
+        }
+      ]
+    };
+
+    const AT_RULE_MODE = {
+      className: 'keyword',
+      begin: '@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b',
+      starts: {
+        end: '[;{}]',
+        keywords: AT_KEYWORDS,
+        returnEnd: true,
+        contains: VALUE_MODES,
+        relevance: 0
+      }
+    };
+
+    // variable definitions and calls
+    const VAR_RULE_MODE = {
+      className: 'variable',
+      variants: [
+        // using more strict pattern for higher relevance to increase chances of Less detection.
+        // this is *the only* Less specific statement used in most of the sources, so...
+        // (we’ll still often loose to the css-parser unless there's '//' comment,
+        // simply because 1 variable just can't beat 99 properties :)
+        {
+          begin: '@' + IDENT_RE + '\\s*:',
+          relevance: 15
+        },
+        {
+          begin: '@' + IDENT_RE
+        }
+      ],
+      starts: {
+        end: '[;}]',
+        returnEnd: true,
+        contains: VALUE_WITH_RULESETS
+      }
+    };
+
+    const SELECTOR_MODE = {
+      // first parse unambiguous selectors (i.e. those not starting with tag)
+      // then fall into the scary lookahead-discriminator variant.
+      // this mode also handles mixin definitions and calls
+      variants: [
+        {
+          begin: '[\\.#:&\\[>]',
+          end: '[;{}]' // mixin calls end with ';'
+        },
+        {
+          begin: INTERP_IDENT_RE,
+          end: /\{/
+        }
+      ],
+      returnBegin: true,
+      returnEnd: true,
+      illegal: '[<=\'$"]',
+      relevance: 0,
+      contains: [
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        MIXIN_GUARD_MODE,
+        IDENT_MODE('keyword', 'all\\b'),
+        IDENT_MODE('variable', '@\\{' + IDENT_RE + '\\}'), // otherwise it’s identified as tag
+        {
+          begin: '\\b(' + TAGS.join('|') + ')\\b',
+          className: 'selector-tag'
+        },
+        IDENT_MODE('selector-tag', INTERP_IDENT_RE + '%?', 0), // '%' for more consistent coloring of @keyframes "tags"
+        IDENT_MODE('selector-id', '#' + INTERP_IDENT_RE),
+        IDENT_MODE('selector-class', '\\.' + INTERP_IDENT_RE, 0),
+        IDENT_MODE('selector-tag', '&', 0),
+        modes.ATTRIBUTE_SELECTOR_MODE,
+        {
+          className: 'selector-pseudo',
+          begin: ':(' + PSEUDO_CLASSES.join('|') + ')'
+        },
+        {
+          className: 'selector-pseudo',
+          begin: '::(' + PSEUDO_ELEMENTS.join('|') + ')'
+        },
+        {
+          begin: '\\(',
+          end: '\\)',
+          contains: VALUE_WITH_RULESETS
+        }, // argument list of parametric mixins
+        {
+          begin: '!important'
+        } // eat !important after mixin call or it will be colored as tag
+      ]
+    };
+
+    const PSEUDO_SELECTOR_MODE = {
+      begin: IDENT_RE + ':(:)?' + `(${PSEUDO_SELECTORS$1.join('|')})`,
+      returnBegin: true,
+      contains: [ SELECTOR_MODE ]
+    };
+
+    RULES.push(
+      hljs.C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      AT_RULE_MODE,
+      VAR_RULE_MODE,
+      PSEUDO_SELECTOR_MODE,
+      RULE_MODE,
+      SELECTOR_MODE
+    );
+
+    return {
+      name: 'Less',
+      case_insensitive: true,
+      illegal: '[=>\'/<($"]',
+      contains: RULES
+    };
+  }
+
+  return less;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('lua', function () {
+  'use strict';
+
+  /*
+  Language: Lua
+  Description: Lua is a powerful, efficient, lightweight, embeddable scripting language.
+  Author: Andrew Fedorov <dmmdrs@mail.ru>
+  Category: common, scripting
+  Website: https://www.lua.org
+  */
+
+  function lua(hljs) {
+    const OPENING_LONG_BRACKET = '\\[=*\\[';
+    const CLOSING_LONG_BRACKET = '\\]=*\\]';
+    const LONG_BRACKETS = {
+      begin: OPENING_LONG_BRACKET,
+      end: CLOSING_LONG_BRACKET,
+      contains: ['self']
+    };
+    const COMMENTS = [
+      hljs.COMMENT('--(?!' + OPENING_LONG_BRACKET + ')', '$'),
+      hljs.COMMENT(
+        '--' + OPENING_LONG_BRACKET,
+        CLOSING_LONG_BRACKET,
+        {
+          contains: [LONG_BRACKETS],
+          relevance: 10
+        }
+      )
+    ];
+    return {
+      name: 'Lua',
+      keywords: {
+        $pattern: hljs.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:
+          // Metatags and globals:
+          '_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len ' +
+          '__gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert ' +
+          // Standard methods and properties:
+          '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 ' +
+          // Library methods and properties (one line per library):
+          '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: COMMENTS.concat([
+        {
+          className: 'function',
+          beginKeywords: 'function',
+          end: '\\)',
+          contains: [
+            hljs.inherit(hljs.TITLE_MODE, {
+              begin: '([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*'
+            }),
+            {
+              className: 'params',
+              begin: '\\(',
+              endsWithParent: true,
+              contains: COMMENTS
+            }
+          ].concat(COMMENTS)
+        },
+        hljs.C_NUMBER_MODE,
+        hljs.APOS_STRING_MODE,
+        hljs.QUOTE_STRING_MODE,
+        {
+          className: 'string',
+          begin: OPENING_LONG_BRACKET,
+          end: CLOSING_LONG_BRACKET,
+          contains: [LONG_BRACKETS],
+          relevance: 5
+        }
+      ])
+    };
+  }
+
+  return lua;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('makefile', function () {
+  'use strict';
+
+  /*
+  Language: Makefile
+  Author: Ivan Sagalaev <maniac@softwaremaniacs.org>
+  Contributors: Joël Porquet <joel@porquet.org>
+  Website: https://www.gnu.org/software/make/manual/html_node/Introduction.html
+  Category: common
+  */
+
+  function makefile(hljs) {
+    /* Variables: simple (eg $(var)) and special (eg $@) */
+    const VARIABLE = {
+      className: 'variable',
+      variants: [
+        {
+          begin: '\\$\\(' + hljs.UNDERSCORE_IDENT_RE + '\\)',
+          contains: [ hljs.BACKSLASH_ESCAPE ]
+        },
+        {
+          begin: /\$[@%<?\^\+\*]/
+        }
+      ]
+    };
+    /* Quoted string with variables inside */
+    const QUOTE_STRING = {
+      className: 'string',
+      begin: /"/,
+      end: /"/,
+      contains: [
+        hljs.BACKSLASH_ESCAPE,
+        VARIABLE
+      ]
+    };
+    /* Function: $(func arg,...) */
+    const FUNC = {
+      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: [ VARIABLE ]
+    };
+    /* Variable assignment */
+    const ASSIGNMENT = {
+      begin: '^' + hljs.UNDERSCORE_IDENT_RE + '\\s*(?=[:+?]?=)'
+    };
+    /* Meta targets (.PHONY) */
+    const META = {
+      className: 'meta',
+      begin: /^\.PHONY:/,
+      end: /$/,
+      keywords: {
+        $pattern: /[\.\w]+/,
+        'meta-keyword': '.PHONY'
+      }
+    };
+    /* Targets */
+    const TARGET = {
+      className: 'section',
+      begin: /^[^\s]+:/,
+      end: /$/,
+      contains: [ VARIABLE ]
+    };
+    return {
+      name: 'Makefile',
+      aliases: [
+        'mk',
+        'mak',
+        'make',
+      ],
+      keywords: {
+        $pattern: /[\w-]+/,
+        keyword: 'define endef undefine ifdef ifndef ifeq ifneq else endif ' +
+        'include -include sinclude override export unexport private vpath'
+      },
+      contains: [
+        hljs.HASH_COMMENT_MODE,
+        VARIABLE,
+        QUOTE_STRING,
+        FUNC,
+        ASSIGNMENT,
+        META,
+        TARGET
+      ]
+    };
+  }
+
+  return makefile;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('xml', function () {
+  'use strict';
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function lookahead(re) {
+    return concat('(?=', re, ')');
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function optional(re) {
+    return concat('(', re, ')?');
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /**
+   * Any of the passed expresssions may match
+   *
+   * Creates a huge this | this | that | that match
+   * @param {(RegExp | string)[] } args
+   * @returns {string}
+   */
+  function either(...args) {
+    const joined = '(' + args.map((x) => source(x)).join("|") + ")";
+    return joined;
+  }
+
+  /*
+  Language: HTML, XML
+  Website: https://www.w3.org/XML/
+  Category: common
+  Audit: 2020
+  */
+
+  /** @type LanguageFn */
+  function xml(hljs) {
+    // Element names can contain letters, digits, hyphens, underscores, and periods
+    const TAG_NAME_RE = concat(/[A-Z_]/, optional(/[A-Z0-9_.-]*:/), /[A-Z0-9_.-]*/);
+    const XML_IDENT_RE = /[A-Za-z0-9._:-]+/;
+    const XML_ENTITIES = {
+      className: 'symbol',
+      begin: /&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;/
+    };
+    const XML_META_KEYWORDS = {
+      begin: /\s/,
+      contains: [
+        {
+          className: 'meta-keyword',
+          begin: /#?[a-z_][a-z1-9_-]+/,
+          illegal: /\n/
+        }
+      ]
+    };
+    const XML_META_PAR_KEYWORDS = hljs.inherit(XML_META_KEYWORDS, {
+      begin: /\(/,
+      end: /\)/
+    });
+    const APOS_META_STRING_MODE = hljs.inherit(hljs.APOS_STRING_MODE, {
+      className: 'meta-string'
+    });
+    const QUOTE_META_STRING_MODE = hljs.inherit(hljs.QUOTE_STRING_MODE, {
+      className: 'meta-string'
+    });
+    const TAG_INTERNALS = {
+      endsWithParent: true,
+      illegal: /</,
+      relevance: 0,
+      contains: [
+        {
+          className: 'attr',
+          begin: XML_IDENT_RE,
+          relevance: 0
+        },
+        {
+          begin: /=\s*/,
+          relevance: 0,
+          contains: [
+            {
+              className: 'string',
+              endsParent: true,
+              variants: [
+                {
+                  begin: /"/,
+                  end: /"/,
+                  contains: [ XML_ENTITIES ]
+                },
+                {
+                  begin: /'/,
+                  end: /'/,
+                  contains: [ XML_ENTITIES ]
+                },
+                {
+                  begin: /[^\s"'=<>`]+/
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    };
+    return {
+      name: 'HTML, XML',
+      aliases: [
+        'html',
+        'xhtml',
+        'rss',
+        'atom',
+        'xjb',
+        'xsd',
+        'xsl',
+        'plist',
+        'wsf',
+        'svg'
+      ],
+      case_insensitive: true,
+      contains: [
+        {
+          className: 'meta',
+          begin: /<![a-z]/,
+          end: />/,
+          relevance: 10,
+          contains: [
+            XML_META_KEYWORDS,
+            QUOTE_META_STRING_MODE,
+            APOS_META_STRING_MODE,
+            XML_META_PAR_KEYWORDS,
+            {
+              begin: /\[/,
+              end: /\]/,
+              contains: [
+                {
+                  className: 'meta',
+                  begin: /<![a-z]/,
+                  end: />/,
+                  contains: [
+                    XML_META_KEYWORDS,
+                    XML_META_PAR_KEYWORDS,
+                    QUOTE_META_STRING_MODE,
+                    APOS_META_STRING_MODE
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        hljs.COMMENT(
+          /<!--/,
+          /-->/,
+          {
+            relevance: 10
+          }
+        ),
+        {
+          begin: /<!\[CDATA\[/,
+          end: /\]\]>/,
+          relevance: 10
+        },
+        XML_ENTITIES,
+        {
+          className: 'meta',
+          begin: /<\?xml/,
+          end: /\?>/,
+          relevance: 10
+        },
+        {
+          className: 'tag',
+          /*
+          The lookahead pattern (?=...) ensures that 'begin' only matches
+          '<style' as a single word, followed by a whitespace or an
+          ending braket. The '$' is needed for the lexeme to be recognized
+          by hljs.subMode() that tests lexemes outside the stream.
+          */
+          begin: /<style(?=\s|>)/,
+          end: />/,
+          keywords: {
+            name: 'style'
+          },
+          contains: [ TAG_INTERNALS ],
+          starts: {
+            end: /<\/style>/,
+            returnEnd: true,
+            subLanguage: [
+              'css',
+              'xml'
+            ]
+          }
+        },
+        {
+          className: 'tag',
+          // See the comment in the <style tag about the lookahead pattern
+          begin: /<script(?=\s|>)/,
+          end: />/,
+          keywords: {
+            name: 'script'
+          },
+          contains: [ TAG_INTERNALS ],
+          starts: {
+            end: /<\/script>/,
+            returnEnd: true,
+            subLanguage: [
+              'javascript',
+              'handlebars',
+              'xml'
+            ]
+          }
+        },
+        // we need this for now for jSX
+        {
+          className: 'tag',
+          begin: /<>|<\/>/
+        },
+        // open tag
+        {
+          className: 'tag',
+          begin: concat(
+            /</,
+            lookahead(concat(
+              TAG_NAME_RE,
+              // <tag/>
+              // <tag>
+              // <tag ...
+              either(/\/>/, />/, /\s/)
+            ))
+          ),
+          end: /\/?>/,
+          contains: [
+            {
+              className: 'name',
+              begin: TAG_NAME_RE,
+              relevance: 0,
+              starts: TAG_INTERNALS
+            }
+          ]
+        },
+        // close tag
+        {
+          className: 'tag',
+          begin: concat(
+            /<\//,
+            lookahead(concat(
+              TAG_NAME_RE, />/
+            ))
+          ),
+          contains: [
+            {
+              className: 'name',
+              begin: TAG_NAME_RE,
+              relevance: 0
+            },
+            {
+              begin: />/,
+              relevance: 0
+            }
+          ]
+        }
+      ]
+    };
+  }
+
+  return xml;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('markdown', function () {
+  'use strict';
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /*
+  Language: Markdown
+  Requires: xml.js
+  Author: John Crepezzi <john.crepezzi@gmail.com>
+  Website: https://daringfireball.net/projects/markdown/
+  Category: common, markup
+  */
+
+  function markdown(hljs) {
+    const INLINE_HTML = {
+      begin: /<\/?[A-Za-z_]/,
+      end: '>',
+      subLanguage: 'xml',
+      relevance: 0
+    };
+    const HORIZONTAL_RULE = {
+      begin: '^[-\\*]{3,}',
+      end: '$'
+    };
+    const CODE = {
+      className: 'code',
+      variants: [
+        // TODO: fix to allow these to work with sublanguage also
+        {
+          begin: '(`{3,})[^`](.|\\n)*?\\1`*[ ]*'
+        },
+        {
+          begin: '(~{3,})[^~](.|\\n)*?\\1~*[ ]*'
+        },
+        // needed to allow markdown as a sublanguage to work
+        {
+          begin: '```',
+          end: '```+[ ]*$'
+        },
+        {
+          begin: '~~~',
+          end: '~~~+[ ]*$'
+        },
+        {
+          begin: '`.+?`'
+        },
+        {
+          begin: '(?=^( {4}|\\t))',
+          // use contains to gobble up multiple lines to allow the block to be whatever size
+          // but only have a single open/close tag vs one per line
+          contains: [
+            {
+              begin: '^( {4}|\\t)',
+              end: '(\\n)$'
+            }
+          ],
+          relevance: 0
+        }
+      ]
+    };
+    const LIST = {
+      className: 'bullet',
+      begin: '^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)',
+      end: '\\s+',
+      excludeEnd: true
+    };
+    const LINK_REFERENCE = {
+      begin: /^\[[^\n]+\]:/,
+      returnBegin: true,
+      contains: [
+        {
+          className: 'symbol',
+          begin: /\[/,
+          end: /\]/,
+          excludeBegin: true,
+          excludeEnd: true
+        },
+        {
+          className: 'link',
+          begin: /:\s*/,
+          end: /$/,
+          excludeBegin: true
+        }
+      ]
+    };
+    const URL_SCHEME = /[A-Za-z][A-Za-z0-9+.-]*/;
+    const LINK = {
+      variants: [
+        // too much like nested array access in so many languages
+        // to have any real relevance
+        {
+          begin: /\[.+?\]\[.*?\]/,
+          relevance: 0
+        },
+        // popular internet URLs
+        {
+          begin: /\[.+?\]\(((data|javascript|mailto):|(?:http|ftp)s?:\/\/).*?\)/,
+          relevance: 2
+        },
+        {
+          begin: concat(/\[.+?\]\(/, URL_SCHEME, /:\/\/.*?\)/),
+          relevance: 2
+        },
+        // relative urls
+        {
+          begin: /\[.+?\]\([./?&#].*?\)/,
+          relevance: 1
+        },
+        // whatever else, lower relevance (might not be a link at all)
+        {
+          begin: /\[.+?\]\(.*?\)/,
+          relevance: 0
+        }
+      ],
+      returnBegin: true,
+      contains: [
+        {
+          className: 'string',
+          relevance: 0,
+          begin: '\\[',
+          end: '\\]',
+          excludeBegin: true,
+          returnEnd: true
+        },
+        {
+          className: 'link',
+          relevance: 0,
+          begin: '\\]\\(',
+          end: '\\)',
+          excludeBegin: true,
+          excludeEnd: true
+        },
+        {
+          className: 'symbol',
+          relevance: 0,
+          begin: '\\]\\[',
+          end: '\\]',
+          excludeBegin: true,
+          excludeEnd: true
+        }
+      ]
+    };
+    const BOLD = {
+      className: 'strong',
+      contains: [], // defined later
+      variants: [
+        {
+          begin: /_{2}/,
+          end: /_{2}/
+        },
+        {
+          begin: /\*{2}/,
+          end: /\*{2}/
+        }
+      ]
+    };
+    const ITALIC = {
+      className: 'emphasis',
+      contains: [], // defined later
+      variants: [
+        {
+          begin: /\*(?!\*)/,
+          end: /\*/
+        },
+        {
+          begin: /_(?!_)/,
+          end: /_/,
+          relevance: 0
+        }
+      ]
+    };
+    BOLD.contains.push(ITALIC);
+    ITALIC.contains.push(BOLD);
+
+    let CONTAINABLE = [
+      INLINE_HTML,
+      LINK
+    ];
+
+    BOLD.contains = BOLD.contains.concat(CONTAINABLE);
+    ITALIC.contains = ITALIC.contains.concat(CONTAINABLE);
+
+    CONTAINABLE = CONTAINABLE.concat(BOLD, ITALIC);
+
+    const HEADER = {
+      className: 'section',
+      variants: [
+        {
+          begin: '^#{1,6}',
+          end: '$',
+          contains: CONTAINABLE
+        },
+        {
+          begin: '(?=^.+?\\n[=-]{2,}$)',
+          contains: [
+            {
+              begin: '^[=-]*$'
+            },
+            {
+              begin: '^',
+              end: "\\n",
+              contains: CONTAINABLE
+            }
+          ]
+        }
+      ]
+    };
+
+    const BLOCKQUOTE = {
+      className: 'quote',
+      begin: '^>\\s+',
+      contains: CONTAINABLE,
+      end: '$'
+    };
+
+    return {
+      name: 'Markdown',
+      aliases: [
+        'md',
+        'mkdown',
+        'mkd'
+      ],
+      contains: [
+        HEADER,
+        INLINE_HTML,
+        LIST,
+        BOLD,
+        ITALIC,
+        BLOCKQUOTE,
+        CODE,
+        HORIZONTAL_RULE,
+        LINK,
+        LINK_REFERENCE
+      ]
+    };
+  }
+
+  return markdown;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('nginx', function () {
+  'use strict';
+
+  /*
+  Language: Nginx config
+  Author: Peter Leonov <gojpeg@yandex.ru>
+  Contributors: Ivan Sagalaev <maniac@softwaremaniacs.org>
+  Category: common, config
+  Website: https://www.nginx.com
+  */
+
+  function nginx(hljs) {
+    const VAR = {
+      className: 'variable',
+      variants: [
+        {
+          begin: /\$\d+/
+        },
+        {
+          begin: /\$\{/,
+          end: /\}/
+        },
+        {
+          begin: /[$@]/ + hljs.UNDERSCORE_IDENT_RE
+        }
+      ]
+    };
+    const DEFAULT = {
+      endsWithParent: true,
+      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: [
+        hljs.HASH_COMMENT_MODE,
+        {
+          className: 'string',
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            VAR
+          ],
+          variants: [
+            {
+              begin: /"/,
+              end: /"/
+            },
+            {
+              begin: /'/,
+              end: /'/
+            }
+          ]
+        },
+        // this swallows entire URLs to avoid detecting numbers within
+        {
+          begin: '([a-z]+):/',
+          end: '\\s',
+          endsWithParent: true,
+          excludeEnd: true,
+          contains: [ VAR ]
+        },
+        {
+          className: 'regexp',
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            VAR
+          ],
+          variants: [
+            {
+              begin: "\\s\\^",
+              end: "\\s|\\{|;",
+              returnEnd: true
+            },
+            // regexp locations (~, ~*)
+            {
+              begin: "~\\*?\\s+",
+              end: "\\s|\\{|;",
+              returnEnd: true
+            },
+            // *.example.com
+            {
+              begin: "\\*(\\.[a-z\\-]+)+"
+            },
+            // sub.example.*
+            {
+              begin: "([a-z\\-]+\\.)+\\*"
+            }
+          ]
+        },
+        // IP
+        {
+          className: 'number',
+          begin: '\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b'
+        },
+        // units
+        {
+          className: 'number',
+          begin: '\\b\\d+[kKmMgGdshdwy]*\\b',
+          relevance: 0
+        },
+        VAR
+      ]
+    };
+
+    return {
+      name: 'Nginx config',
+      aliases: [ 'nginxconf' ],
+      contains: [
+        hljs.HASH_COMMENT_MODE,
+        {
+          begin: hljs.UNDERSCORE_IDENT_RE + '\\s+\\{',
+          returnBegin: true,
+          end: /\{/,
+          contains: [
+            {
+              className: 'section',
+              begin: hljs.UNDERSCORE_IDENT_RE
+            }
+          ],
+          relevance: 0
+        },
+        {
+          begin: hljs.UNDERSCORE_IDENT_RE + '\\s',
+          end: ';|\\{',
+          returnBegin: true,
+          contains: [
+            {
+              className: 'attribute',
+              begin: hljs.UNDERSCORE_IDENT_RE,
+              starts: DEFAULT
+            }
+          ],
+          relevance: 0
+        }
+      ],
+      illegal: '[^\\s\\}]'
+    };
+  }
+
+  return nginx;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('objectivec', function () {
+  'use strict';
+
+  /*
+  Language: Objective-C
+  Author: Valerii Hiora <valerii.hiora@gmail.com>
+  Contributors: Angel G. Olloqui <angelgarcia.mail@gmail.com>, Matt Diephouse <matt@diephouse.com>, Andrew Farmer <ahfarmer@gmail.com>, Minh Nguyễn <mxn@1ec5.org>
+  Website: https://developer.apple.com/documentation/objectivec
+  Category: common
+  */
+
+  function objectivec(hljs) {
+    const API_CLASS = {
+      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+'
+    };
+    const IDENTIFIER_RE = /[a-zA-Z@][a-zA-Z0-9_]*/;
+    const OBJC_KEYWORDS = {
+      $pattern: IDENTIFIER_RE,
+      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'
+    };
+    const CLASS_KEYWORDS = {
+      $pattern: IDENTIFIER_RE,
+      keyword: '@interface @class @protocol @implementation'
+    };
+    return {
+      name: 'Objective-C',
+      aliases: [
+        'mm',
+        'objc',
+        'obj-c',
+        'obj-c++',
+        'objective-c++'
+      ],
+      keywords: OBJC_KEYWORDS,
+      illegal: '</',
+      contains: [
+        API_CLASS,
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        hljs.C_NUMBER_MODE,
+        hljs.QUOTE_STRING_MODE,
+        hljs.APOS_STRING_MODE,
+        {
+          className: 'string',
+          variants: [
+            {
+              begin: '@"',
+              end: '"',
+              illegal: '\\n',
+              contains: [ hljs.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
+            },
+            hljs.inherit(hljs.QUOTE_STRING_MODE, {
+              className: 'meta-string'
+            }),
+            {
+              className: 'meta-string',
+              begin: /<.*?>/,
+              end: /$/,
+              illegal: '\\n'
+            },
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        {
+          className: 'class',
+          begin: '(' + CLASS_KEYWORDS.keyword.split(' ').join('|') + ')\\b',
+          end: /(\{|$)/,
+          excludeEnd: true,
+          keywords: CLASS_KEYWORDS,
+          contains: [ hljs.UNDERSCORE_TITLE_MODE ]
+        },
+        {
+          begin: '\\.' + hljs.UNDERSCORE_IDENT_RE,
+          relevance: 0
+        }
+      ]
+    };
+  }
+
+  return objectivec;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('perl', function () {
+  'use strict';
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
   /**
    * @param {RegExp | string } re
    * @returns {string}
@@ -507,1703 +8072,5287 @@ var hljs = (function () {
   }
 
   /**
-   * @param {RegExp} re
-   * @returns {number}
-   */
-  function countMatchGroups(re) {
-    return (new RegExp(re.toString() + '|')).exec('').length - 1;
-  }
-
-  /**
-   * Does lexeme start with a regular expression match at the beginning
-   * @param {RegExp} re
-   * @param {string} lexeme
-   */
-  function startsWith(re, lexeme) {
-    var match = re && re.exec(lexeme);
-    return match && match.index === 0;
-  }
-
-  // join logically computes regexps.join(separator), but fixes the
-  // backreferences so they continue to match.
-  // it also places each individual regular expression into it's own
-  // match group, keeping track of the sequencing of those match groups
-  // is currently an exercise for the caller. :-)
-  /**
-   * @param {(string | RegExp)[]} regexps
-   * @param {string} separator
+   * Any of the passed expresssions may match
+   *
+   * Creates a huge this | this | that | that match
+   * @param {(RegExp | string)[] } args
    * @returns {string}
    */
-  function join(regexps, separator = "|") {
-    // backreferenceRe matches an open parenthesis or backreference. To avoid
-    // an incorrect parse, it additionally matches the following:
-    // - [...] elements, where the meaning of parentheses and escapes change
-    // - other escape sequences, so we do not misparse escape sequences as
-    //   interesting elements
-    // - non-matching or lookahead parentheses, which do not capture. These
-    //   follow the '(' with a '?'.
-    var backreferenceRe = /\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./;
-    var numCaptures = 0;
-    var ret = '';
-    for (var i = 0; i < regexps.length; i++) {
-      numCaptures += 1;
-      var offset = numCaptures;
-      var re = source(regexps[i]);
-      if (i > 0) {
-        ret += separator;
-      }
-      ret += "(";
-      while (re.length > 0) {
-        var match = backreferenceRe.exec(re);
-        if (match == null) {
-          ret += re;
-          break;
-        }
-        ret += re.substring(0, match.index);
-        re = re.substring(match.index + match[0].length);
-        if (match[0][0] === '\\' && match[1]) {
-          // Adjust the backreference.
-          ret += '\\' + String(Number(match[1]) + offset);
-        } else {
-          ret += match[0];
-          if (match[0] === '(') {
-            numCaptures++;
-          }
-        }
-      }
-      ret += ")";
-    }
-    return ret;
+  function either(...args) {
+    const joined = '(' + args.map((x) => source(x)).join("|") + ")";
+    return joined;
   }
 
-  // Common regexps
-  const IDENT_RE = '[a-zA-Z]\\w*';
-  const UNDERSCORE_IDENT_RE = '[a-zA-Z_]\\w*';
-  const NUMBER_RE = '\\b\\d+(\\.\\d+)?';
-  const C_NUMBER_RE = '(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)'; // 0x..., 0..., decimal, float
-  const BINARY_NUMBER_RE = '\\b(0b[01]+)'; // 0b...
-  const RE_STARTERS_RE = '!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~';
-
-  /**
-  * @param { Partial<Mode> & {binary?: string | RegExp} } opts
-  */
-  const SHEBANG = (opts = {}) => {
-    const beginShebang = /^#![ ]*\//;
-    if (opts.binary) {
-      opts.begin = concat(
-        beginShebang,
-        /.*\b/,
-        opts.binary,
-        /\b.*/);
-    }
-    return inherit({
-      className: 'meta',
-      begin: beginShebang,
-      end: /$/,
-      relevance: 0,
-      /** @type {ModeCallback} */
-      "on:begin": (m, resp) => {
-        if (m.index !== 0) resp.ignoreMatch();
-      }
-    }, opts);
-  };
-
-  // Common modes
-  const BACKSLASH_ESCAPE = {
-    begin: '\\\\[\\s\\S]', relevance: 0
-  };
-  const APOS_STRING_MODE = {
-    className: 'string',
-    begin: '\'',
-    end: '\'',
-    illegal: '\\n',
-    contains: [BACKSLASH_ESCAPE]
-  };
-  const QUOTE_STRING_MODE = {
-    className: 'string',
-    begin: '"',
-    end: '"',
-    illegal: '\\n',
-    contains: [BACKSLASH_ESCAPE]
-  };
-  const PHRASAL_WORDS_MODE = {
-    begin: /\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/
-  };
-  /**
-   * Creates a comment mode
-   *
-   * @param {string | RegExp} begin
-   * @param {string | RegExp} end
-   * @param {Mode | {}} [modeOptions]
-   * @returns {Partial<Mode>}
-   */
-  const COMMENT = function(begin, end, modeOptions = {}) {
-    var mode = inherit(
-      {
-        className: 'comment',
-        begin,
-        end,
-        contains: []
-      },
-      modeOptions
-    );
-    mode.contains.push(PHRASAL_WORDS_MODE);
-    mode.contains.push({
-      className: 'doctag',
-      begin: '(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):',
-      relevance: 0
-    });
-    return mode;
-  };
-  const C_LINE_COMMENT_MODE = COMMENT('//', '$');
-  const C_BLOCK_COMMENT_MODE = COMMENT('/\\*', '\\*/');
-  const HASH_COMMENT_MODE = COMMENT('#', '$');
-  const NUMBER_MODE = {
-    className: 'number',
-    begin: NUMBER_RE,
-    relevance: 0
-  };
-  const C_NUMBER_MODE = {
-    className: 'number',
-    begin: C_NUMBER_RE,
-    relevance: 0
-  };
-  const BINARY_NUMBER_MODE = {
-    className: 'number',
-    begin: BINARY_NUMBER_RE,
-    relevance: 0
-  };
-  const CSS_NUMBER_MODE = {
-    className: 'number',
-    begin: NUMBER_RE + '(' +
-      '%|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
-  };
-  const REGEXP_MODE = {
-    // this outer rule makes sure we actually have a WHOLE regex and not simply
-    // an expression such as:
-    //
-    //     3 / something
-    //
-    // (which will then blow up when regex's `illegal` sees the newline)
-    begin: /(?=\/[^/\n]*\/)/,
-    contains: [{
-      className: 'regexp',
-      begin: /\//,
-      end: /\/[gimuy]*/,
-      illegal: /\n/,
-      contains: [
-        BACKSLASH_ESCAPE,
-        {
-          begin: /\[/,
-          end: /\]/,
-          relevance: 0,
-          contains: [BACKSLASH_ESCAPE]
-        }
-      ]
-    }]
-  };
-  const TITLE_MODE = {
-    className: 'title',
-    begin: IDENT_RE,
-    relevance: 0
-  };
-  const UNDERSCORE_TITLE_MODE = {
-    className: 'title',
-    begin: UNDERSCORE_IDENT_RE,
-    relevance: 0
-  };
-  const METHOD_GUARD = {
-    // excludes method names from keyword processing
-    begin: '\\.\\s*' + UNDERSCORE_IDENT_RE,
-    relevance: 0
-  };
-
-  /**
-   * Adds end same as begin mechanics to a mode
-   *
-   * Your mode must include at least a single () match group as that first match
-   * group is what is used for comparison
-   * @param {Partial<Mode>} mode
-   */
-  const END_SAME_AS_BEGIN = function(mode) {
-    return Object.assign(mode,
-      {
-        /** @type {ModeCallback} */
-        'on:begin': (m, resp) => { resp.data._beginMatch = m[1]; },
-        /** @type {ModeCallback} */
-        'on:end': (m, resp) => { if (resp.data._beginMatch !== m[1]) resp.ignoreMatch(); }
-      });
-  };
-
-  var MODES = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    IDENT_RE: IDENT_RE,
-    UNDERSCORE_IDENT_RE: UNDERSCORE_IDENT_RE,
-    NUMBER_RE: NUMBER_RE,
-    C_NUMBER_RE: C_NUMBER_RE,
-    BINARY_NUMBER_RE: BINARY_NUMBER_RE,
-    RE_STARTERS_RE: RE_STARTERS_RE,
-    SHEBANG: SHEBANG,
-    BACKSLASH_ESCAPE: BACKSLASH_ESCAPE,
-    APOS_STRING_MODE: APOS_STRING_MODE,
-    QUOTE_STRING_MODE: QUOTE_STRING_MODE,
-    PHRASAL_WORDS_MODE: PHRASAL_WORDS_MODE,
-    COMMENT: COMMENT,
-    C_LINE_COMMENT_MODE: C_LINE_COMMENT_MODE,
-    C_BLOCK_COMMENT_MODE: C_BLOCK_COMMENT_MODE,
-    HASH_COMMENT_MODE: HASH_COMMENT_MODE,
-    NUMBER_MODE: NUMBER_MODE,
-    C_NUMBER_MODE: C_NUMBER_MODE,
-    BINARY_NUMBER_MODE: BINARY_NUMBER_MODE,
-    CSS_NUMBER_MODE: CSS_NUMBER_MODE,
-    REGEXP_MODE: REGEXP_MODE,
-    TITLE_MODE: TITLE_MODE,
-    UNDERSCORE_TITLE_MODE: UNDERSCORE_TITLE_MODE,
-    METHOD_GUARD: METHOD_GUARD,
-    END_SAME_AS_BEGIN: END_SAME_AS_BEGIN
-  });
-
-  // keywords that should have no default relevance value
-  var COMMON_KEYWORDS = 'of and for in not or if then'.split(' ');
-
-  // compilation
-
-  /**
-   * Compiles a language definition result
-   *
-   * Given the raw result of a language definition (Language), compiles this so
-   * that it is ready for highlighting code.
-   * @param {Language} language
-   * @returns {CompiledLanguage}
-   */
-  function compileLanguage(language) {
-    /**
-     * Builds a regex with the case sensativility of the current language
-     *
-     * @param {RegExp | string} value
-     * @param {boolean} [global]
-     */
-    function langRe(value, global) {
-      return new RegExp(
-        source(value),
-        'm' + (language.case_insensitive ? 'i' : '') + (global ? 'g' : '')
-      );
-    }
-
-    /**
-      Stores multiple regular expressions and allows you to quickly search for
-      them all in a string simultaneously - returning the first match.  It does
-      this by creating a huge (a|b|c) regex - each individual item wrapped with ()
-      and joined by `|` - using match groups to track position.  When a match is
-      found checking which position in the array has content allows us to figure
-      out which of the original regexes / match groups triggered the match.
-
-      The match object itself (the result of `Regex.exec`) is returned but also
-      enhanced by merging in any meta-data that was registered with the regex.
-      This is how we keep track of which mode matched, and what type of rule
-      (`illegal`, `begin`, end, etc).
-    */
-    class MultiRegex {
-      constructor() {
-        this.matchIndexes = {};
-        // @ts-ignore
-        this.regexes = [];
-        this.matchAt = 1;
-        this.position = 0;
-      }
-
-      // @ts-ignore
-      addRule(re, opts) {
-        opts.position = this.position++;
-        // @ts-ignore
-        this.matchIndexes[this.matchAt] = opts;
-        this.regexes.push([opts, re]);
-        this.matchAt += countMatchGroups(re) + 1;
-      }
-
-      compile() {
-        if (this.regexes.length === 0) {
-          // avoids the need to check length every time exec is called
-          // @ts-ignore
-          this.exec = () => null;
-        }
-        const terminators = this.regexes.map(el => el[1]);
-        this.matcherRe = langRe(join(terminators), true);
-        this.lastIndex = 0;
-      }
-
-      /** @param {string} s */
-      exec(s) {
-        this.matcherRe.lastIndex = this.lastIndex;
-        const match = this.matcherRe.exec(s);
-        if (!match) { return null; }
-
-        // eslint-disable-next-line no-undefined
-        const i = match.findIndex((el, i) => i > 0 && el !== undefined);
-        // @ts-ignore
-        const matchData = this.matchIndexes[i];
-        // trim off any earlier non-relevant match groups (ie, the other regex
-        // match groups that make up the multi-matcher)
-        match.splice(0, i);
-
-        return Object.assign(match, matchData);
-      }
-    }
-
-    /*
-      Created to solve the key deficiently with MultiRegex - there is no way to
-      test for multiple matches at a single location.  Why would we need to do
-      that?  In the future a more dynamic engine will allow certain matches to be
-      ignored.  An example: if we matched say the 3rd regex in a large group but
-      decided to ignore it - we'd need to started testing again at the 4th
-      regex... but MultiRegex itself gives us no real way to do that.
-
-      So what this class creates MultiRegexs on the fly for whatever search
-      position they are needed.
-
-      NOTE: These additional MultiRegex objects are created dynamically.  For most
-      grammars most of the time we will never actually need anything more than the
-      first MultiRegex - so this shouldn't have too much overhead.
-
-      Say this is our search group, and we match regex3, but wish to ignore it.
-
-        regex1 | regex2 | regex3 | regex4 | regex5    ' ie, startAt = 0
-
-      What we need is a new MultiRegex that only includes the remaining
-      possibilities:
-
-        regex4 | regex5                               ' ie, startAt = 3
-
-      This class wraps all that complexity up in a simple API... `startAt` decides
-      where in the array of expressions to start doing the matching. It
-      auto-increments, so if a match is found at position 2, then startAt will be
-      set to 3.  If the end is reached startAt will return to 0.
-
-      MOST of the time the parser will be setting startAt manually to 0.
-    */
-    class ResumableMultiRegex {
-      constructor() {
-        // @ts-ignore
-        this.rules = [];
-        // @ts-ignore
-        this.multiRegexes = [];
-        this.count = 0;
-
-        this.lastIndex = 0;
-        this.regexIndex = 0;
-      }
-
-      // @ts-ignore
-      getMatcher(index) {
-        if (this.multiRegexes[index]) return this.multiRegexes[index];
-
-        const matcher = new MultiRegex();
-        this.rules.slice(index).forEach(([re, opts]) => matcher.addRule(re, opts));
-        matcher.compile();
-        this.multiRegexes[index] = matcher;
-        return matcher;
-      }
-
-      resumingScanAtSamePosition() {
-        return this.regexIndex !== 0;
-      }
-
-      considerAll() {
-        this.regexIndex = 0;
-      }
-
-      // @ts-ignore
-      addRule(re, opts) {
-        this.rules.push([re, opts]);
-        if (opts.type === "begin") this.count++;
-      }
-
-      /** @param {string} s */
-      exec(s) {
-        const m = this.getMatcher(this.regexIndex);
-        m.lastIndex = this.lastIndex;
-        let result = m.exec(s);
-
-        // The following is because we have no easy way to say "resume scanning at the
-        // existing position but also skip the current rule ONLY". What happens is
-        // all prior rules are also skipped which can result in matching the wrong
-        // thing. Example of matching "booger":
-
-        // our matcher is [string, "booger", number]
-        //
-        // ....booger....
-
-        // if "booger" is ignored then we'd really need a regex to scan from the
-        // SAME position for only: [string, number] but ignoring "booger" (if it
-        // was the first match), a simple resume would scan ahead who knows how
-        // far looking only for "number", ignoring potential string matches (or
-        // future "booger" matches that might be valid.)
-
-        // So what we do: We execute two matchers, one resuming at the same
-        // position, but the second full matcher starting at the position after:
-
-        //     /--- resume first regex match here (for [number])
-        //     |/---- full match here for [string, "booger", number]
-        //     vv
-        // ....booger....
-
-        // Which ever results in a match first is then used. So this 3-4 step
-        // process essentially allows us to say "match at this position, excluding
-        // a prior rule that was ignored".
-        //
-        // 1. Match "booger" first, ignore. Also proves that [string] does non match.
-        // 2. Resume matching for [number]
-        // 3. Match at index + 1 for [string, "booger", number]
-        // 4. If #2 and #3 result in matches, which came first?
-        if (this.resumingScanAtSamePosition()) {
-          if (result && result.index === this.lastIndex) ; else { // use the second matcher result
-            const m2 = this.getMatcher(0);
-            m2.lastIndex = this.lastIndex + 1;
-            result = m2.exec(s);
-          }
-        }
-
-        if (result) {
-          this.regexIndex += result.position + 1;
-          if (this.regexIndex === this.count) {
-            // wrap-around to considering all matches again
-            this.considerAll();
-          }
-        }
-
-        return result;
-      }
-    }
-
-    /**
-     * Given a mode, builds a huge ResumableMultiRegex that can be used to walk
-     * the content and find matches.
-     *
-     * @param {CompiledMode} mode
-     * @returns {ResumableMultiRegex}
-     */
-    function buildModeRegex(mode) {
-      const mm = new ResumableMultiRegex();
-
-      mode.contains.forEach(term => mm.addRule(term.begin, { rule: term, type: "begin" }));
-
-      if (mode.terminator_end) {
-        mm.addRule(mode.terminator_end, { type: "end" });
-      }
-      if (mode.illegal) {
-        mm.addRule(mode.illegal, { type: "illegal" });
-      }
-
-      return mm;
-    }
-
-    // TODO: We need negative look-behind support to do this properly
-    /**
-     * Skip a match if it has a preceding or trailing dot
-     *
-     * This is used for `beginKeywords` to prevent matching expressions such as
-     * `bob.keyword.do()`. The mode compiler automatically wires this up as a
-     * special _internal_ 'on:begin' callback for modes with `beginKeywords`
-     * @param {RegExpMatchArray} match
-     * @param {CallbackResponse} response
-     */
-    function skipIfhasPrecedingOrTrailingDot(match, response) {
-      const before = match.input[match.index - 1];
-      const after = match.input[match.index + match[0].length];
-      if (before === "." || after === ".") {
-        response.ignoreMatch();
-      }
-    }
-
-    /** skip vs abort vs ignore
-     *
-     * @skip   - The mode is still entered and exited normally (and contains rules apply),
-     *           but all content is held and added to the parent buffer rather than being
-     *           output when the mode ends.  Mostly used with `sublanguage` to build up
-     *           a single large buffer than can be parsed by sublanguage.
-     *
-     *             - The mode begin ands ends normally.
-     *             - Content matched is added to the parent mode buffer.
-     *             - The parser cursor is moved forward normally.
-     *
-     * @abort  - A hack placeholder until we have ignore.  Aborts the mode (as if it
-     *           never matched) but DOES NOT continue to match subsequent `contains`
-     *           modes.  Abort is bad/suboptimal because it can result in modes
-     *           farther down not getting applied because an earlier rule eats the
-     *           content but then aborts.
-     *
-     *             - The mode does not begin.
-     *             - Content matched by `begin` is added to the mode buffer.
-     *             - The parser cursor is moved forward accordingly.
-     *
-     * @ignore - Ignores the mode (as if it never matched) and continues to match any
-     *           subsequent `contains` modes.  Ignore isn't technically possible with
-     *           the current parser implementation.
-     *
-     *             - The mode does not begin.
-     *             - Content matched by `begin` is ignored.
-     *             - The parser cursor is not moved forward.
-     */
-
-    /**
-     * Compiles an individual mode
-     *
-     * This can raise an error if the mode contains certain detectable known logic
-     * issues.
-     * @param {Mode} mode
-     * @param {CompiledMode | null} [parent]
-     * @returns {CompiledMode | never}
-     */
-    function compileMode(mode, parent) {
-      const cmode = /** @type CompiledMode */ (mode);
-      if (mode.compiled) return cmode;
-      mode.compiled = true;
-
-      // __beforeBegin is considered private API, internal use only
-      mode.__beforeBegin = null;
-
-      mode.keywords = mode.keywords || mode.beginKeywords;
-
-      let kw_pattern = null;
-      if (typeof mode.keywords === "object") {
-        kw_pattern = mode.keywords.$pattern;
-        delete mode.keywords.$pattern;
-      }
-
-      if (mode.keywords) {
-        mode.keywords = compileKeywords(mode.keywords, language.case_insensitive);
-      }
-
-      // both are not allowed
-      if (mode.lexemes && kw_pattern) {
-        throw new Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ");
-      }
-
-      // `mode.lexemes` was the old standard before we added and now recommend
-      // using `keywords.$pattern` to pass the keyword pattern
-      cmode.keywordPatternRe = langRe(mode.lexemes || kw_pattern || /\w+/, true);
-
-      if (parent) {
-        if (mode.beginKeywords) {
-          // for languages with keywords that include non-word characters checking for
-          // a word boundary is not sufficient, so instead we check for a word boundary
-          // or whitespace - this does no harm in any case since our keyword engine
-          // doesn't allow spaces in keywords anyways and we still check for the boundary
-          // first
-          mode.begin = '\\b(' + mode.beginKeywords.split(' ').join('|') + ')(?=\\b|\\s)';
-          mode.__beforeBegin = skipIfhasPrecedingOrTrailingDot;
-        }
-        if (!mode.begin) mode.begin = /\B|\b/;
-        cmode.beginRe = langRe(mode.begin);
-        if (mode.endSameAsBegin) mode.end = mode.begin;
-        if (!mode.end && !mode.endsWithParent) mode.end = /\B|\b/;
-        if (mode.end) cmode.endRe = langRe(mode.end);
-        cmode.terminator_end = source(mode.end) || '';
-        if (mode.endsWithParent && parent.terminator_end) {
-          cmode.terminator_end += (mode.end ? '|' : '') + parent.terminator_end;
-        }
-      }
-      if (mode.illegal) cmode.illegalRe = langRe(mode.illegal);
-      // eslint-disable-next-line no-undefined
-      if (mode.relevance === undefined) mode.relevance = 1;
-      if (!mode.contains) mode.contains = [];
-
-      mode.contains = [].concat(...mode.contains.map(function(c) {
-        return expand_or_clone_mode(c === 'self' ? mode : c);
-      }));
-      mode.contains.forEach(function(c) { compileMode(/** @type Mode */ (c), cmode); });
-
-      if (mode.starts) {
-        compileMode(mode.starts, parent);
-      }
-
-      cmode.matcher = buildModeRegex(cmode);
-      return cmode;
-    }
-
-    // self is not valid at the top-level
-    if (language.contains && language.contains.includes('self')) {
-      throw new Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");
-    }
-    return compileMode(/** @type Mode */ (language));
-  }
-
-  /**
-   * Determines if a mode has a dependency on it's parent or not
-   *
-   * If a mode does have a parent dependency then often we need to clone it if
-   * it's used in multiple places so that each copy points to the correct parent,
-   * where-as modes without a parent can often safely be re-used at the bottom of
-   * a mode chain.
-   *
-   * @param {Mode | null} mode
-   * @returns {boolean} - is there a dependency on the parent?
-   * */
-  function dependencyOnParent(mode) {
-    if (!mode) return false;
-
-    return mode.endsWithParent || dependencyOnParent(mode.starts);
-  }
-
-  /**
-   * Expands a mode or clones it if necessary
-   *
-   * This is necessary for modes with parental dependenceis (see notes on
-   * `dependencyOnParent`) and for nodes that have `variants` - which must then be
-   * exploded into their own individual modes at compile time.
-   *
-   * @param {Mode} mode
-   * @returns {Mode | Mode[]}
-   * */
-  function expand_or_clone_mode(mode) {
-    if (mode.variants && !mode.cached_variants) {
-      mode.cached_variants = mode.variants.map(function(variant) {
-        return inherit(mode, { variants: null }, variant);
-      });
-    }
-
-    // EXPAND
-    // if we have variants then essentially "replace" the mode with the variants
-    // this happens in compileMode, where this function is called from
-    if (mode.cached_variants) {
-      return mode.cached_variants;
-    }
-
-    // CLONE
-    // if we have dependencies on parents then we need a unique
-    // instance of ourselves, so we can be reused with many
-    // different parents without issue
-    if (dependencyOnParent(mode)) {
-      return inherit(mode, { starts: mode.starts ? inherit(mode.starts) : null });
-    }
-
-    if (Object.isFrozen(mode)) {
-      return inherit(mode);
-    }
-
-    // no special dependency issues, just return ourselves
-    return mode;
-  }
-
-  /***********************************************
-    Keywords
-  ***********************************************/
-
-  /**
-   * Given raw keywords from a language definition, compile them.
-   *
-   * @param {string | Record<string,string>} rawKeywords
-   * @param {boolean} case_insensitive
-   */
-  function compileKeywords(rawKeywords, case_insensitive) {
-    /** @type KeywordDict */
-    var compiled_keywords = {};
-
-    if (typeof rawKeywords === 'string') { // string
-      splitAndCompile('keyword', rawKeywords);
-    } else {
-      Object.keys(rawKeywords).forEach(function(className) {
-        splitAndCompile(className, rawKeywords[className]);
-      });
-    }
-    return compiled_keywords;
-
-    // ---
-
-    /**
-     * Compiles an individual list of keywords
-     *
-     * Ex: "for if when while|5"
-     *
-     * @param {string} className
-     * @param {string} keywordList
-     */
-    function splitAndCompile(className, keywordList) {
-      if (case_insensitive) {
-        keywordList = keywordList.toLowerCase();
-      }
-      keywordList.split(' ').forEach(function(keyword) {
-        var pair = keyword.split('|');
-        compiled_keywords[pair[0]] = [className, scoreForKeyword(pair[0], pair[1])];
-      });
-    }
-  }
-
-  /**
-   * Returns the proper score for a given keyword
-   *
-   * Also takes into account comment keywords, which will be scored 0 UNLESS
-   * another score has been manually assigned.
-   * @param {string} keyword
-   * @param {string} [providedScore]
-   */
-  function scoreForKeyword(keyword, providedScore) {
-    // manual scores always win over common keywords
-    // so you can force a score of 1 if you really insist
-    if (providedScore) {
-      return Number(providedScore);
-    }
-
-    return commonKeyword(keyword) ? 0 : 1;
-  }
-
-  /**
-   * Determines if a given keyword is common or not
-   *
-   * @param {string} keyword */
-  function commonKeyword(keyword) {
-    return COMMON_KEYWORDS.includes(keyword.toLowerCase());
-  }
-
-  var version = "10.2.1";
-
-  // @ts-nocheck
-
-  function hasValueOrEmptyAttribute(value) {
-    return Boolean(value || value === "");
-  }
-
-  const Component = {
-    props: ["language", "code", "autodetect"],
-    data: function() {
-      return {
-        detectedLanguage: "",
-        unknownLanguage: false
-      };
-    },
-    computed: {
-      className() {
-        if (this.unknownLanguage) return "";
-
-        return "hljs " + this.detectedLanguage;
-      },
-      highlighted() {
-        // no idea what language to use, return raw code
-        if (!this.autoDetect && !hljs.getLanguage(this.language)) {
-          console.warn(`The language "${this.language}" you specified could not be found.`);
-          this.unknownLanguage = true;
-          return escapeHTML(this.code);
-        }
-
-        let result;
-        if (this.autoDetect) {
-          result = hljs.highlightAuto(this.code);
-          this.detectedLanguage = result.language;
-        } else {
-          result = hljs.highlight(this.language, this.code, this.ignoreIllegals);
-          this.detectectLanguage = this.language;
-        }
-        return result.value;
-      },
-      autoDetect() {
-        return !this.language || hasValueOrEmptyAttribute(this.autodetect);
-      },
-      ignoreIllegals() {
-        return true;
-      }
-    },
-    // this avoids needing to use a whole Vue compilation pipeline just
-    // to build Highlight.js
-    render(createElement) {
-      return createElement("pre", {}, [
-        createElement("code", {
-          class: this.className,
-          domProps: { innerHTML: this.highlighted }})
-      ]);
-    }
-    // template: `<pre><code :class="className" v-html="highlighted"></code></pre>`
-  };
-
-  const VuePlugin = {
-    install(Vue) {
-      Vue.component('highlightjs', Component);
-    }
-  };
-
   /*
-  Syntax highlighting with language autodetection.
-  https://highlightjs.org/
+  Language: Perl
+  Author: Peter Leonov <gojpeg@yandex.ru>
+  Website: https://www.perl.org
+  Category: common
   */
 
-  const escape$1 = escapeHTML;
-  const inherit$1 = inherit;
+  /** @type LanguageFn */
+  function perl(hljs) {
+    const KEYWORDS = [
+      'abs',
+      'accept',
+      'alarm',
+      'and',
+      'atan2',
+      'bind',
+      'binmode',
+      'bless',
+      'break',
+      'caller',
+      'chdir',
+      'chmod',
+      'chomp',
+      'chop',
+      'chown',
+      'chr',
+      'chroot',
+      'close',
+      'closedir',
+      'connect',
+      'continue',
+      'cos',
+      'crypt',
+      'dbmclose',
+      'dbmopen',
+      'defined',
+      'delete',
+      'die',
+      'do',
+      'dump',
+      'each',
+      'else',
+      'elsif',
+      'endgrent',
+      'endhostent',
+      'endnetent',
+      'endprotoent',
+      'endpwent',
+      'endservent',
+      'eof',
+      'eval',
+      'exec',
+      'exists',
+      'exit',
+      'exp',
+      'fcntl',
+      'fileno',
+      'flock',
+      'for',
+      'foreach',
+      'fork',
+      'format',
+      'formline',
+      'getc',
+      'getgrent',
+      'getgrgid',
+      'getgrnam',
+      'gethostbyaddr',
+      'gethostbyname',
+      'gethostent',
+      'getlogin',
+      'getnetbyaddr',
+      'getnetbyname',
+      'getnetent',
+      'getpeername',
+      'getpgrp',
+      'getpriority',
+      'getprotobyname',
+      'getprotobynumber',
+      'getprotoent',
+      'getpwent',
+      'getpwnam',
+      'getpwuid',
+      'getservbyname',
+      'getservbyport',
+      'getservent',
+      'getsockname',
+      'getsockopt',
+      'given',
+      'glob',
+      'gmtime',
+      'goto',
+      'grep',
+      'gt',
+      'hex',
+      'if',
+      'index',
+      'int',
+      'ioctl',
+      'join',
+      'keys',
+      'kill',
+      'last',
+      'lc',
+      'lcfirst',
+      'length',
+      'link',
+      'listen',
+      'local',
+      'localtime',
+      'log',
+      'lstat',
+      'lt',
+      'ma',
+      'map',
+      'mkdir',
+      'msgctl',
+      'msgget',
+      'msgrcv',
+      'msgsnd',
+      'my',
+      'ne',
+      'next',
+      'no',
+      'not',
+      'oct',
+      'open',
+      'opendir',
+      'or',
+      'ord',
+      'our',
+      'pack',
+      'package',
+      'pipe',
+      'pop',
+      'pos',
+      'print',
+      'printf',
+      'prototype',
+      'push',
+      'q|0',
+      'qq',
+      'quotemeta',
+      'qw',
+      'qx',
+      'rand',
+      'read',
+      'readdir',
+      'readline',
+      'readlink',
+      'readpipe',
+      'recv',
+      'redo',
+      'ref',
+      'rename',
+      'require',
+      'reset',
+      'return',
+      'reverse',
+      'rewinddir',
+      'rindex',
+      'rmdir',
+      'say',
+      'scalar',
+      'seek',
+      'seekdir',
+      'select',
+      'semctl',
+      'semget',
+      'semop',
+      'send',
+      'setgrent',
+      'sethostent',
+      'setnetent',
+      'setpgrp',
+      'setpriority',
+      'setprotoent',
+      'setpwent',
+      'setservent',
+      'setsockopt',
+      'shift',
+      'shmctl',
+      'shmget',
+      'shmread',
+      'shmwrite',
+      'shutdown',
+      'sin',
+      'sleep',
+      'socket',
+      'socketpair',
+      'sort',
+      'splice',
+      'split',
+      'sprintf',
+      'sqrt',
+      'srand',
+      'stat',
+      'state',
+      'study',
+      'sub',
+      'substr',
+      'symlink',
+      'syscall',
+      'sysopen',
+      'sysread',
+      'sysseek',
+      'system',
+      'syswrite',
+      'tell',
+      'telldir',
+      'tie',
+      'tied',
+      'time',
+      'times',
+      'tr',
+      'truncate',
+      'uc',
+      'ucfirst',
+      'umask',
+      'undef',
+      'unless',
+      'unlink',
+      'unpack',
+      'unshift',
+      'untie',
+      'until',
+      'use',
+      'utime',
+      'values',
+      'vec',
+      'wait',
+      'waitpid',
+      'wantarray',
+      'warn',
+      'when',
+      'while',
+      'write',
+      'x|0',
+      'xor',
+      'y|0'
+    ];
 
-  const { nodeStream: nodeStream$1, mergeStreams: mergeStreams$1 } = utils;
-  const NO_MATCH = Symbol("nomatch");
-
-  /**
-   * @param {any} hljs - object that is extended (legacy)
-   * @returns {HLJSApi}
-   */
-  const HLJS = function(hljs) {
-    // Convenience variables for build-in objects
-    /** @type {unknown[]} */
-    var ArrayProto = [];
-
-    // Global internal variables used within the highlight.js library.
-    /** @type {Record<string, Language>} */
-    var languages = Object.create(null);
-    /** @type {Record<string, string>} */
-    var aliases = Object.create(null);
-    /** @type {HLJSPlugin[]} */
-    var plugins = [];
-
-    // safe/production mode - swallows more errors, tries to keep running
-    // even if a single syntax or parse hits a fatal error
-    var SAFE_MODE = true;
-    var fixMarkupRe = /(^(<[^>]+>|\t|)+|\n)/gm;
-    var LANGUAGE_NOT_FOUND = "Could not find the language '{}', did you forget to load/include a language module?";
-    /** @type {Language} */
-    const PLAINTEXT_LANGUAGE = { disableAutodetect: true, name: 'Plain text', contains: [] };
-
-    // Global options used when within external APIs. This is modified when
-    // calling the `hljs.configure` function.
-    /** @type HLJSOptions */
-    var options = {
-      noHighlightRe: /^(no-?highlight)$/i,
-      languageDetectRe: /\blang(?:uage)?-([\w-]+)\b/i,
-      classPrefix: 'hljs-',
-      tabReplace: null,
-      useBR: false,
-      languages: null,
-      // beta configuration options, subject to change, welcome to discuss
-      // https://github.com/highlightjs/highlight.js/issues/1086
-      __emitter: TokenTreeEmitter
+    // https://perldoc.perl.org/perlre#Modifiers
+    const REGEX_MODIFIERS = /[dualxmsipngr]{0,12}/; // aa and xx are valid, making max length 12
+    const PERL_KEYWORDS = {
+      $pattern: /[\w.]+/,
+      keyword: KEYWORDS.join(" ")
     };
-
-    /* Utility functions */
-
+    const SUBST = {
+      className: 'subst',
+      begin: '[$@]\\{',
+      end: '\\}',
+      keywords: PERL_KEYWORDS
+    };
+    const METHOD = {
+      begin: /->\{/,
+      end: /\}/
+      // contains defined later
+    };
+    const VAR = {
+      variants: [
+        {
+          begin: /\$\d/
+        },
+        {
+          begin: concat(
+            /[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/,
+            // negative look-ahead tries to avoid matching patterns that are not
+            // Perl at all like $ident$, @ident@, etc.
+            `(?![A-Za-z])(?![@$%])`
+          )
+        },
+        {
+          begin: /[$%@][^\s\w{]/,
+          relevance: 0
+        }
+      ]
+    };
+    const STRING_CONTAINS = [
+      hljs.BACKSLASH_ESCAPE,
+      SUBST,
+      VAR
+    ];
+    const REGEX_DELIMS = [
+      /!/,
+      /\//,
+      /\|/,
+      /\?/,
+      /'/,
+      /"/, // valid but infrequent and weird
+      /#/ // valid but infrequent and weird
+    ];
     /**
-     * Tests a language name to see if highlighting should be skipped
-     * @param {string} languageName
+     * @param {string|RegExp} prefix
+     * @param {string|RegExp} open
+     * @param {string|RegExp} close
      */
-    function shouldNotHighlight(languageName) {
-      return options.noHighlightRe.test(languageName);
-    }
-
+    const PAIRED_DOUBLE_RE = (prefix, open, close = '\\1') => {
+      const middle = (close === '\\1')
+        ? close
+        : concat(close, open);
+      return concat(
+        concat("(?:", prefix, ")"),
+        open,
+        /(?:\\.|[^\\\/])*?/,
+        middle,
+        /(?:\\.|[^\\\/])*?/,
+        close,
+        REGEX_MODIFIERS
+      );
+    };
     /**
-     * @param {HighlightedHTMLElement} block - the HTML element to determine language for
+     * @param {string|RegExp} prefix
+     * @param {string|RegExp} open
+     * @param {string|RegExp} close
      */
-    function blockLanguage(block) {
-      var classes = block.className + ' ';
-
-      classes += block.parentNode ? block.parentNode.className : '';
-
-      // language-* takes precedence over non-prefixed class names.
-      const match = options.languageDetectRe.exec(classes);
-      if (match) {
-        var language = getLanguage(match[1]);
-        if (!language) {
-          console.warn(LANGUAGE_NOT_FOUND.replace("{}", match[1]));
-          console.warn("Falling back to no-highlight mode for this block.", block);
+    const PAIRED_RE = (prefix, open, close) => {
+      return concat(
+        concat("(?:", prefix, ")"),
+        open,
+        /(?:\\.|[^\\\/])*?/,
+        close,
+        REGEX_MODIFIERS
+      );
+    };
+    const PERL_DEFAULT_CONTAINS = [
+      VAR,
+      hljs.HASH_COMMENT_MODE,
+      hljs.COMMENT(
+        /^=\w/,
+        /=cut/,
+        {
+          endsWithParent: true
         }
-        return language ? match[1] : 'no-highlight';
-      }
-
-      return classes
-        .split(/\s+/)
-        .find((_class) => shouldNotHighlight(_class) || getLanguage(_class));
-    }
-
-    /**
-     * Core highlighting function.
-     *
-     * @param {string} languageName - the language to use for highlighting
-     * @param {string} code - the code to highlight
-     * @param {boolean} [ignoreIllegals] - whether to ignore illegal matches, default is to bail
-     * @param {Mode} [continuation] - current continuation mode, if any
-     *
-     * @returns {HighlightResult} Result - an object that represents the result
-     * @property {string} language - the language name
-     * @property {number} relevance - the relevance score
-     * @property {string} value - the highlighted HTML code
-     * @property {string} code - the original raw code
-     * @property {Mode} top - top of the current mode stack
-     * @property {boolean} illegal - indicates whether any illegal matches were found
-    */
-    function highlight(languageName, code, ignoreIllegals, continuation) {
-      /** @type {{ code: string, language: string, result?: any }} */
-      var context = {
-        code,
-        language: languageName
-      };
-      // the plugin can change the desired language or the code to be highlighted
-      // just be changing the object it was passed
-      fire("before:highlight", context);
-
-      // a before plugin can usurp the result completely by providing it's own
-      // in which case we don't even need to call highlight
-      var result = context.result ?
-        context.result :
-        _highlight(context.language, context.code, ignoreIllegals, continuation);
-
-      result.code = context.code;
-      // the plugin can change anything in result to suite it
-      fire("after:highlight", result);
-
-      return result;
-    }
-
-    /**
-     * private highlight that's used internally and does not fire callbacks
-     *
-     * @param {string} languageName - the language to use for highlighting
-     * @param {string} code - the code to highlight
-     * @param {boolean} [ignoreIllegals] - whether to ignore illegal matches, default is to bail
-     * @param {Mode} [continuation] - current continuation mode, if any
-    */
-    function _highlight(languageName, code, ignoreIllegals, continuation) {
-      var codeToHighlight = code;
-
-      /**
-       * Return keyword data if a match is a keyword
-       * @param {CompiledMode} mode - current mode
-       * @param {RegExpMatchArray} match - regexp match data
-       * @returns {KeywordData | false}
-       */
-      function keywordData(mode, match) {
-        var matchText = language.case_insensitive ? match[0].toLowerCase() : match[0];
-        return Object.prototype.hasOwnProperty.call(mode.keywords, matchText) && mode.keywords[matchText];
-      }
-
-      function processKeywords() {
-        if (!top.keywords) {
-          emitter.addText(mode_buffer);
-          return;
-        }
-
-        let last_index = 0;
-        top.keywordPatternRe.lastIndex = 0;
-        let match = top.keywordPatternRe.exec(mode_buffer);
-        let buf = "";
-
-        while (match) {
-          buf += mode_buffer.substring(last_index, match.index);
-          const data = keywordData(top, match);
-          if (data) {
-            const [kind, keywordRelevance] = data;
-            emitter.addText(buf);
-            buf = "";
-
-            relevance += keywordRelevance;
-            emitter.addKeyword(match[0], kind);
-          } else {
-            buf += match[0];
+      ),
+      METHOD,
+      {
+        className: 'string',
+        contains: STRING_CONTAINS,
+        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: [ hljs.BACKSLASH_ESCAPE ]
+          },
+          {
+            begin: '"',
+            end: '"'
+          },
+          {
+            begin: '`',
+            end: '`',
+            contains: [ hljs.BACKSLASH_ESCAPE ]
+          },
+          {
+            begin: /\{\w+\}/,
+            relevance: 0
+          },
+          {
+            begin: '-?\\w+\\s*=>',
+            relevance: 0
           }
-          last_index = top.keywordPatternRe.lastIndex;
-          match = top.keywordPatternRe.exec(mode_buffer);
-        }
-        buf += mode_buffer.substr(last_index);
-        emitter.addText(buf);
-      }
-
-      function processSubLanguage() {
-        if (mode_buffer === "") return;
-        /** @type HighlightResult */
-        var result = null;
-
-        if (typeof top.subLanguage === 'string') {
-          if (!languages[top.subLanguage]) {
-            emitter.addText(mode_buffer);
-            return;
-          }
-          result = _highlight(top.subLanguage, mode_buffer, true, continuations[top.subLanguage]);
-          continuations[top.subLanguage] = result.top;
-        } else {
-          result = highlightAuto(mode_buffer, top.subLanguage.length ? top.subLanguage : null);
-        }
-
-        // Counting embedded language score towards the host language may be disabled
-        // with zeroing the containing mode relevance. Use case in point is Markdown that
-        // allows XML everywhere and makes every XML snippet to have a much larger Markdown
-        // score.
-        if (top.relevance > 0) {
-          relevance += result.relevance;
-        }
-        emitter.addSublanguage(result.emitter, result.language);
-      }
-
-      function processBuffer() {
-        if (top.subLanguage != null) {
-          processSubLanguage();
-        } else {
-          processKeywords();
-        }
-        mode_buffer = '';
-      }
-
-      /**
-       * @param {Mode} mode - new mode to start
-       */
-      function startNewMode(mode) {
-        if (mode.className) {
-          emitter.openNode(mode.className);
-        }
-        top = Object.create(mode, { parent: { value: top } });
-        return top;
-      }
-
-      /**
-       * @param {CompiledMode } mode - the mode to potentially end
-       * @param {RegExpMatchArray} match - the latest match
-       * @param {string} matchPlusRemainder - match plus remainder of content
-       * @returns {CompiledMode | void} - the next mode, or if void continue on in current mode
-       */
-      function endOfMode(mode, match, matchPlusRemainder) {
-        let matched = startsWith(mode.endRe, matchPlusRemainder);
-
-        if (matched) {
-          if (mode["on:end"]) {
-            const resp = new Response(mode);
-            mode["on:end"](match, resp);
-            if (resp.ignore) matched = false;
-          }
-
-          if (matched) {
-            while (mode.endsParent && mode.parent) {
-              mode = mode.parent;
-            }
-            return mode;
-          }
-        }
-        // even if on:end fires an `ignore` it's still possible
-        // that we might trigger the end node because of a parent mode
-        if (mode.endsWithParent) {
-          return endOfMode(mode.parent, match, matchPlusRemainder);
-        }
-      }
-
-      /**
-       * Handle matching but then ignoring a sequence of text
-       *
-       * @param {string} lexeme - string containing full match text
-       */
-      function doIgnore(lexeme) {
-        if (top.matcher.regexIndex === 0) {
-          // no more regexs to potentially match here, so we move the cursor forward one
-          // space
-          mode_buffer += lexeme[0];
-          return 1;
-        } else {
-          // no need to move the cursor, we still have additional regexes to try and
-          // match at this very spot
-          resumeScanAtSamePosition = true;
-          return 0;
-        }
-      }
-
-      /**
-       * Handle the start of a new potential mode match
-       *
-       * @param {EnhancedMatch} match - the current match
-       * @returns {number} how far to advance the parse cursor
-       */
-      function doBeginMatch(match) {
-        var lexeme = match[0];
-        var new_mode = match.rule;
-
-        const resp = new Response(new_mode);
-        // first internal before callbacks, then the public ones
-        const beforeCallbacks = [new_mode.__beforeBegin, new_mode["on:begin"]];
-        for (const cb of beforeCallbacks) {
-          if (!cb) continue;
-          cb(match, resp);
-          if (resp.ignore) return doIgnore(lexeme);
-        }
-
-        if (new_mode && new_mode.endSameAsBegin) {
-          new_mode.endRe = escape(lexeme);
-        }
-
-        if (new_mode.skip) {
-          mode_buffer += lexeme;
-        } else {
-          if (new_mode.excludeBegin) {
-            mode_buffer += lexeme;
-          }
-          processBuffer();
-          if (!new_mode.returnBegin && !new_mode.excludeBegin) {
-            mode_buffer = lexeme;
-          }
-        }
-        startNewMode(new_mode);
-        // if (mode["after:begin"]) {
-        //   let resp = new Response(mode);
-        //   mode["after:begin"](match, resp);
-        // }
-        return new_mode.returnBegin ? 0 : lexeme.length;
-      }
-
-      /**
-       * Handle the potential end of mode
-       *
-       * @param {RegExpMatchArray} match - the current match
-       */
-      function doEndMatch(match) {
-        var lexeme = match[0];
-        var matchPlusRemainder = codeToHighlight.substr(match.index);
-
-        var end_mode = endOfMode(top, match, matchPlusRemainder);
-        if (!end_mode) { return NO_MATCH; }
-
-        var origin = top;
-        if (origin.skip) {
-          mode_buffer += lexeme;
-        } else {
-          if (!(origin.returnEnd || origin.excludeEnd)) {
-            mode_buffer += lexeme;
-          }
-          processBuffer();
-          if (origin.excludeEnd) {
-            mode_buffer = lexeme;
-          }
-        }
-        do {
-          if (top.className) {
-            emitter.closeNode();
-          }
-          if (!top.skip && !top.subLanguage) {
-            relevance += top.relevance;
-          }
-          top = top.parent;
-        } while (top !== end_mode.parent);
-        if (end_mode.starts) {
-          if (end_mode.endSameAsBegin) {
-            end_mode.starts.endRe = end_mode.endRe;
-          }
-          startNewMode(end_mode.starts);
-        }
-        return origin.returnEnd ? 0 : lexeme.length;
-      }
-
-      function processContinuations() {
-        var list = [];
-        for (var current = top; current !== language; current = current.parent) {
-          if (current.className) {
-            list.unshift(current.className);
-          }
-        }
-        list.forEach(item => emitter.openNode(item));
-      }
-
-      /** @type {{type?: MatchType, index?: number, rule?: Mode}}} */
-      var lastMatch = {};
-
-      /**
-       *  Process an individual match
-       *
-       * @param {string} textBeforeMatch - text preceeding the match (since the last match)
-       * @param {EnhancedMatch} [match] - the match itself
-       */
-      function processLexeme(textBeforeMatch, match) {
-        var lexeme = match && match[0];
-
-        // add non-matched text to the current mode buffer
-        mode_buffer += textBeforeMatch;
-
-        if (lexeme == null) {
-          processBuffer();
-          return 0;
-        }
-
-        // we've found a 0 width match and we're stuck, so we need to advance
-        // this happens when we have badly behaved rules that have optional matchers to the degree that
-        // sometimes they can end up matching nothing at all
-        // Ref: https://github.com/highlightjs/highlight.js/issues/2140
-        if (lastMatch.type === "begin" && match.type === "end" && lastMatch.index === match.index && lexeme === "") {
-          // spit the "skipped" character that our regex choked on back into the output sequence
-          mode_buffer += codeToHighlight.slice(match.index, match.index + 1);
-          if (!SAFE_MODE) {
-            /** @type {AnnotatedError} */
-            const err = new Error('0 width match regex');
-            err.languageName = languageName;
-            err.badRule = lastMatch.rule;
-            throw err;
-          }
-          return 1;
-        }
-        lastMatch = match;
-
-        if (match.type === "begin") {
-          return doBeginMatch(match);
-        } else if (match.type === "illegal" && !ignoreIllegals) {
-          // illegal match, we do not continue processing
-          /** @type {AnnotatedError} */
-          const err = new Error('Illegal lexeme "' + lexeme + '" for mode "' + (top.className || '<unnamed>') + '"');
-          err.mode = top;
-          throw err;
-        } else if (match.type === "end") {
-          var processed = doEndMatch(match);
-          if (processed !== NO_MATCH) {
-            return processed;
-          }
-        }
-
-        // edge case for when illegal matches $ (end of line) which is technically
-        // a 0 width match but not a begin/end match so it's not caught by the
-        // first handler (when ignoreIllegals is true)
-        if (match.type === "illegal" && lexeme === "") {
-          // advance so we aren't stuck in an infinite loop
-          return 1;
-        }
-
-        // infinite loops are BAD, this is a last ditch catch all. if we have a
-        // decent number of iterations yet our index (cursor position in our
-        // parsing) still 3x behind our index then something is very wrong
-        // so we bail
-        if (iterations > 100000 && iterations > match.index * 3) {
-          const err = new Error('potential infinite loop, way more iterations than matches');
-          throw err;
-        }
-
-        /*
-        Why might be find ourselves here?  Only one occasion now.  An end match that was
-        triggered but could not be completed.  When might this happen?  When an `endSameasBegin`
-        rule sets the end rule to a specific match.  Since the overall mode termination rule that's
-        being used to scan the text isn't recompiled that means that any match that LOOKS like
-        the end (but is not, because it is not an exact match to the beginning) will
-        end up here.  A definite end match, but when `doEndMatch` tries to "reapply"
-        the end rule and fails to match, we wind up here, and just silently ignore the end.
-
-        This causes no real harm other than stopping a few times too many.
-        */
-
-        mode_buffer += lexeme;
-        return lexeme.length;
-      }
-
-      var language = getLanguage(languageName);
-      if (!language) {
-        console.error(LANGUAGE_NOT_FOUND.replace("{}", languageName));
-        throw new Error('Unknown language: "' + languageName + '"');
-      }
-
-      var md = compileLanguage(language);
-      var result = '';
-      /** @type {CompiledMode} */
-      var top = continuation || md;
-      /** @type Record<string,Mode> */
-      var continuations = {}; // keep continuations for sub-languages
-      var emitter = new options.__emitter(options);
-      processContinuations();
-      var mode_buffer = '';
-      var relevance = 0;
-      var index = 0;
-      var iterations = 0;
-      var resumeScanAtSamePosition = false;
-
-      try {
-        top.matcher.considerAll();
-
-        for (;;) {
-          iterations++;
-          if (resumeScanAtSamePosition) {
-            // only regexes not matched previously will now be
-            // considered for a potential match
-            resumeScanAtSamePosition = false;
-          } else {
-            top.matcher.considerAll();
-          }
-          top.matcher.lastIndex = index;
-
-          const match = top.matcher.exec(codeToHighlight);
-          // console.log("match", match[0], match.rule && match.rule.begin)
-
-          if (!match) break;
-
-          const beforeMatch = codeToHighlight.substring(index, match.index);
-          const processedCount = processLexeme(beforeMatch, match);
-          index = match.index + processedCount;
-        }
-        processLexeme(codeToHighlight.substr(index));
-        emitter.closeAllNodes();
-        emitter.finalize();
-        result = emitter.toHTML();
-
-        return {
-          relevance: relevance,
-          value: result,
-          language: languageName,
-          illegal: false,
-          emitter: emitter,
-          top: top
-        };
-      } catch (err) {
-        if (err.message && err.message.includes('Illegal')) {
-          return {
-            illegal: true,
-            illegalBy: {
-              msg: err.message,
-              context: codeToHighlight.slice(index - 100, index + 100),
-              mode: err.mode
-            },
-            sofar: result,
-            relevance: 0,
-            value: escape$1(codeToHighlight),
-            emitter: emitter
-          };
-        } else if (SAFE_MODE) {
-          return {
-            illegal: false,
-            relevance: 0,
-            value: escape$1(codeToHighlight),
-            emitter: emitter,
-            language: languageName,
-            top: top,
-            errorRaised: err
-          };
-        } else {
-          throw err;
-        }
-      }
-    }
-
-    /**
-     * returns a valid highlight result, without actually doing any actual work,
-     * auto highlight starts with this and it's possible for small snippets that
-     * auto-detection may not find a better match
-     * @param {string} code
-     * @returns {HighlightResult}
-     */
-    function justTextHighlightResult(code) {
-      const result = {
+        ]
+      },
+      {
+        className: 'number',
+        begin: '(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b',
+        relevance: 0
+      },
+      { // regexp container
+        begin: '(\\/\\/|' + hljs.RE_STARTERS_RE + '|\\b(split|return|print|reverse|grep)\\b)\\s*',
+        keywords: 'split return print reverse grep',
         relevance: 0,
-        emitter: new options.__emitter(options),
-        value: escape$1(code),
-        illegal: false,
-        top: PLAINTEXT_LANGUAGE
-      };
-      result.emitter.addText(code);
-      return result;
-    }
-
-    /**
-    Highlighting with language detection. Accepts a string with the code to
-    highlight. Returns an object with the following properties:
-
-    - language (detected language)
-    - relevance (int)
-    - value (an HTML string with highlighting markup)
-    - second_best (object with the same structure for second-best heuristically
-      detected language, may be absent)
-
-      @param {string} code
-      @param {Array<string>} [languageSubset]
-      @returns {AutoHighlightResult}
-    */
-    function highlightAuto(code, languageSubset) {
-      languageSubset = languageSubset || options.languages || Object.keys(languages);
-      var result = justTextHighlightResult(code);
-      var secondBest = result;
-      languageSubset.filter(getLanguage).filter(autoDetection).forEach(function(name) {
-        var current = _highlight(name, code, false);
-        current.language = name;
-        if (current.relevance > secondBest.relevance) {
-          secondBest = current;
-        }
-        if (current.relevance > result.relevance) {
-          secondBest = result;
-          result = current;
-        }
-      });
-      if (secondBest.language) {
-        // second_best (with underscore) is the expected API
-        result.second_best = secondBest;
+        contains: [
+          hljs.HASH_COMMENT_MODE,
+          {
+            className: 'regexp',
+            variants: [
+              // allow matching common delimiters
+              { begin: PAIRED_DOUBLE_RE("s|tr|y", either(...REGEX_DELIMS)) },
+              // and then paired delmis
+              { begin: PAIRED_DOUBLE_RE("s|tr|y", "\\(", "\\)") },
+              { begin: PAIRED_DOUBLE_RE("s|tr|y", "\\[", "\\]") },
+              { begin: PAIRED_DOUBLE_RE("s|tr|y", "\\{", "\\}") }
+            ],
+            relevance: 2
+          },
+          {
+            className: 'regexp',
+            variants: [
+              {
+                // could be a comment in many languages so do not count
+                // as relevant
+                begin: /(m|qr)\/\//,
+                relevance: 0
+              },
+              // prefix is optional with /regex/
+              { begin: PAIRED_RE("(?:m|qr)?", /\//, /\//)},
+              // allow matching common delimiters
+              { begin: PAIRED_RE("m|qr", either(...REGEX_DELIMS), /\1/)},
+              // allow common paired delmins
+              { begin: PAIRED_RE("m|qr", /\(/, /\)/)},
+              { begin: PAIRED_RE("m|qr", /\[/, /\]/)},
+              { begin: PAIRED_RE("m|qr", /\{/, /\}/)}
+            ]
+          }
+        ]
+      },
+      {
+        className: 'function',
+        beginKeywords: 'sub',
+        end: '(\\s*\\(.*?\\))?[;{]',
+        excludeEnd: true,
+        relevance: 5,
+        contains: [ hljs.TITLE_MODE ]
+      },
+      {
+        begin: '-\\w\\b',
+        relevance: 0
+      },
+      {
+        begin: "^__DATA__$",
+        end: "^__END__$",
+        subLanguage: 'mojolicious',
+        contains: [
+          {
+            begin: "^@@.*",
+            end: "$",
+            className: "comment"
+          }
+        ]
       }
-      return result;
-    }
+    ];
+    SUBST.contains = PERL_DEFAULT_CONTAINS;
+    METHOD.contains = PERL_DEFAULT_CONTAINS;
 
-    /**
-    Post-processing of the highlighted markup:
-
-    - replace TABs with something more useful
-    - replace real line-breaks with '<br>' for non-pre containers
-
-      @param {string} html
-      @returns {string}
-    */
-    function fixMarkup(html) {
-      if (!(options.tabReplace || options.useBR)) {
-        return html;
-      }
-
-      return html.replace(fixMarkupRe, match => {
-        if (match === '\n') {
-          return options.useBR ? '<br>' : match;
-        } else if (options.tabReplace) {
-          return match.replace(/\t/g, options.tabReplace);
-        }
-        return match;
-      });
-    }
-
-    /**
-     * Builds new class name for block given the language name
-     *
-     * @param {string} prevClassName
-     * @param {string} [currentLang]
-     * @param {string} [resultLang]
-     */
-    function buildClassName(prevClassName, currentLang, resultLang) {
-      var language = currentLang ? aliases[currentLang] : resultLang;
-      var result = [prevClassName.trim()];
-
-      if (!prevClassName.match(/\bhljs\b/)) {
-        result.push('hljs');
-      }
-
-      if (!prevClassName.includes(language)) {
-        result.push(language);
-      }
-
-      return result.join(' ').trim();
-    }
-
-    /**
-     * Applies highlighting to a DOM node containing code. Accepts a DOM node and
-     * two optional parameters for fixMarkup.
-     *
-     * @param {HighlightedHTMLElement} element - the HTML element to highlight
-    */
-    function highlightBlock(element) {
-      /** @type HTMLElement */
-      let node = null;
-      const language = blockLanguage(element);
-
-      if (shouldNotHighlight(language)) return;
-
-      fire("before:highlightBlock",
-        { block: element, language: language });
-
-      if (options.useBR) {
-        node = document.createElement('div');
-        node.innerHTML = element.innerHTML.replace(/\n/g, '').replace(/<br[ /]*>/g, '\n');
-      } else {
-        node = element;
-      }
-      const text = node.textContent;
-      const result = language ? highlight(language, text, true) : highlightAuto(text);
-
-      const originalStream = nodeStream$1(node);
-      if (originalStream.length) {
-        const resultNode = document.createElement('div');
-        resultNode.innerHTML = result.value;
-        result.value = mergeStreams$1(originalStream, nodeStream$1(resultNode), text);
-      }
-      result.value = fixMarkup(result.value);
-
-      fire("after:highlightBlock", { block: element, result: result });
-
-      element.innerHTML = result.value;
-      element.className = buildClassName(element.className, language, result.language);
-      element.result = {
-        language: result.language,
-        // TODO: remove with version 11.0
-        re: result.relevance,
-        relavance: result.relevance
-      };
-      if (result.second_best) {
-        element.second_best = {
-          language: result.second_best.language,
-          // TODO: remove with version 11.0
-          re: result.second_best.relevance,
-          relavance: result.second_best.relevance
-        };
-      }
-    }
-
-    /**
-     * Updates highlight.js global options with the passed options
-     *
-     * @param {{}} userOptions
-     */
-    function configure(userOptions) {
-      options = inherit$1(options, userOptions);
-    }
-
-    /**
-     * Highlights to all <pre><code> blocks on a page
-     *
-     * @type {Function & {called?: boolean}}
-     */
-    const initHighlighting = () => {
-      if (initHighlighting.called) return;
-      initHighlighting.called = true;
-
-      var blocks = document.querySelectorAll('pre code');
-      ArrayProto.forEach.call(blocks, highlightBlock);
+    return {
+      name: 'Perl',
+      aliases: [
+        'pl',
+        'pm'
+      ],
+      keywords: PERL_KEYWORDS,
+      contains: PERL_DEFAULT_CONTAINS
     };
+  }
 
-    // Higlights all when DOMContentLoaded fires
-    function initHighlightingOnLoad() {
-      // @ts-ignore
-      window.addEventListener('DOMContentLoaded', initHighlighting, false);
-    }
+  return perl;
 
-    /**
-     * Register a language grammar module
-     *
-     * @param {string} languageName
-     * @param {LanguageFn} languageDefinition
-     */
-    function registerLanguage(languageName, languageDefinition) {
-      var lang = null;
-      try {
-        lang = languageDefinition(hljs);
-      } catch (error) {
-        console.error("Language definition for '{}' could not be registered.".replace("{}", languageName));
-        // hard or soft error
-        if (!SAFE_MODE) { throw error; } else { console.error(error); }
-        // languages that have serious errors are replaced with essentially a
-        // "plaintext" stand-in so that the code blocks will still get normal
-        // css classes applied to them - and one bad language won't break the
-        // entire highlighter
-        lang = PLAINTEXT_LANGUAGE;
-      }
-      // give it a temporary name if it doesn't have one in the meta-data
-      if (!lang.name) lang.name = languageName;
-      languages[languageName] = lang;
-      lang.rawDefinition = languageDefinition.bind(null, hljs);
-
-      if (lang.aliases) {
-        registerAliases(lang.aliases, { languageName });
-      }
-    }
-
-    /**
-     * @returns {string[]} List of language internal names
-     */
-    function listLanguages() {
-      return Object.keys(languages);
-    }
-
-    /**
-      intended usage: When one language truly requires another
-
-      Unlike `getLanguage`, this will throw when the requested language
-      is not available.
-
-      @param {string} name - name of the language to fetch/require
-      @returns {Language | never}
-    */
-    function requireLanguage(name) {
-      var lang = getLanguage(name);
-      if (lang) { return lang; }
-
-      var err = new Error('The \'{}\' language is required, but not loaded.'.replace('{}', name));
-      throw err;
-    }
-
-    /**
-     * @param {string} name - name of the language to retrieve
-     * @returns {Language | undefined}
-     */
-    function getLanguage(name) {
-      name = (name || '').toLowerCase();
-      return languages[name] || languages[aliases[name]];
-    }
-
-    /**
-     *
-     * @param {string|string[]} aliasList - single alias or list of aliases
-     * @param {{languageName: string}} opts
-     */
-    function registerAliases(aliasList, { languageName }) {
-      if (typeof aliasList === 'string') {
-        aliasList = [aliasList];
-      }
-      aliasList.forEach(alias => { aliases[alias] = languageName; });
-    }
-
-    /**
-     * Determines if a given language has auto-detection enabled
-     * @param {string} name - name of the language
-     */
-    function autoDetection(name) {
-      var lang = getLanguage(name);
-      return lang && !lang.disableAutodetect;
-    }
-
-    /**
-     * @param {HLJSPlugin} plugin
-     */
-    function addPlugin(plugin) {
-      plugins.push(plugin);
-    }
-
-    /**
-     *
-     * @param {PluginEvent} event
-     * @param {any} args
-     */
-    function fire(event, args) {
-      var cb = event;
-      plugins.forEach(function(plugin) {
-        if (plugin[cb]) {
-          plugin[cb](args);
-        }
-      });
-    }
-
-    /* fixMarkup is deprecated and will be removed entirely in v11 */
-    function deprecate_fixMarkup(arg) {
-      console.warn("fixMarkup is deprecated and will be removed entirely in v11.0");
-      console.warn("Please see https://github.com/highlightjs/highlight.js/issues/2534");
-
-      return fixMarkup(arg)
-    }
-
-    /* Interface definition */
-    Object.assign(hljs, {
-      highlight,
-      highlightAuto,
-      fixMarkup: deprecate_fixMarkup,
-      highlightBlock,
-      configure,
-      initHighlighting,
-      initHighlightingOnLoad,
-      registerLanguage,
-      listLanguages,
-      getLanguage,
-      registerAliases,
-      requireLanguage,
-      autoDetection,
-      inherit: inherit$1,
-      addPlugin,
-      // plugins for frameworks
-      vuePlugin: VuePlugin
-    });
-
-    hljs.debugMode = function() { SAFE_MODE = false; };
-    hljs.safeMode = function() { SAFE_MODE = true; };
-    hljs.versionString = version;
-
-    for (const key in MODES) {
-      // @ts-ignore
-      if (typeof MODES[key] === "object") {
-        // @ts-ignore
-        deepFreeze(MODES[key]);
-      }
-    }
-
-    // merge all the modes/regexs into our main object
-    Object.assign(hljs, MODES);
-
-    return hljs;
-  };
-
-  // export an "instance" of the highlighter
-  var highlight = HLJS({});
-
-  return highlight;
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('php', function () {
+  'use strict';
+
+  /*
+  Language: PHP
+  Author: Victor Karamzin <Victor.Karamzin@enterra-inc.com>
+  Contributors: Evgeny Stepanischev <imbolk@gmail.com>, Ivan Sagalaev <maniac@softwaremaniacs.org>
+  Website: https://www.php.net
+  Category: common
+  */
+
+  /**
+   * @param {HLJSApi} hljs
+   * @returns {LanguageDetail}
+   * */
+  function php(hljs) {
+    const VARIABLE = {
+      className: 'variable',
+      begin: '\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*' +
+        // negative look-ahead tries to avoid matching patterns that are not
+        // Perl at all like $ident$, @ident@, etc.
+        `(?![A-Za-z0-9])(?![$])`
+    };
+    const PREPROCESSOR = {
+      className: 'meta',
+      variants: [
+        { begin: /<\?php/, relevance: 10 }, // boost for obvious PHP
+        { begin: /<\?[=]?/ },
+        { begin: /\?>/ } // end php tag
+      ]
+    };
+    const SUBST = {
+      className: 'subst',
+      variants: [
+        { begin: /\$\w+/ },
+        { begin: /\{\$/, end: /\}/ }
+      ]
+    };
+    const SINGLE_QUOTED = hljs.inherit(hljs.APOS_STRING_MODE, {
+      illegal: null,
+    });
+    const DOUBLE_QUOTED = hljs.inherit(hljs.QUOTE_STRING_MODE, {
+      illegal: null,
+      contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
+    });
+    const HEREDOC = hljs.END_SAME_AS_BEGIN({
+      begin: /<<<[ \t]*(\w+)\n/,
+      end: /[ \t]*(\w+)\b/,
+      contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
+    });
+    const STRING = {
+      className: 'string',
+      contains: [hljs.BACKSLASH_ESCAPE, PREPROCESSOR],
+      variants: [
+        hljs.inherit(SINGLE_QUOTED, {
+          begin: "b'", end: "'",
+        }),
+        hljs.inherit(DOUBLE_QUOTED, {
+          begin: 'b"', end: '"',
+        }),
+        DOUBLE_QUOTED,
+        SINGLE_QUOTED,
+        HEREDOC
+      ]
+    };
+    const NUMBER = {variants: [hljs.BINARY_NUMBER_MODE, hljs.C_NUMBER_MODE]};
+    const KEYWORDS = {
+      keyword:
+      // Magic constants:
+      // <https://www.php.net/manual/en/language.constants.predefined.php>
+      '__CLASS__ __DIR__ __FILE__ __FUNCTION__ __LINE__ __METHOD__ __NAMESPACE__ __TRAIT__ ' +
+      // Function that look like language construct or language construct that look like function:
+      // List of keywords that may not require parenthesis
+      'die echo exit include include_once print require require_once ' +
+      // These are not language construct (function) but operate on the currently-executing function and can access the current symbol table
+      // 'compact extract func_get_arg func_get_args func_num_args get_called_class get_parent_class ' +
+      // Other keywords:
+      // <https://www.php.net/manual/en/reserved.php>
+      // <https://www.php.net/manual/en/language.types.type-juggling.php>
+      '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 match|0 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:
+      // Standard PHP library:
+      // <https://www.php.net/manual/en/book.spl.php>
+      'Error|0 ' + // error is too common a name esp since PHP is case in-sensitive
+      '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 ' +
+      // Reserved interfaces:
+      // <https://www.php.net/manual/en/reserved.interfaces.php>
+      'ArrayAccess Closure Generator Iterator IteratorAggregate Serializable Throwable Traversable WeakReference ' +
+      // Reserved classes:
+      // <https://www.php.net/manual/en/reserved.classes.php>
+      'Directory __PHP_Incomplete_Class parent php_user_filter self static stdClass'
+    };
+    return {
+      aliases: ['php', 'php3', 'php4', 'php5', 'php6', 'php7', 'php8'],
+      case_insensitive: true,
+      keywords: KEYWORDS,
+      contains: [
+        hljs.HASH_COMMENT_MODE,
+        hljs.COMMENT('//', '$', {contains: [PREPROCESSOR]}),
+        hljs.COMMENT(
+          '/\\*',
+          '\\*/',
+          {
+            contains: [
+              {
+                className: 'doctag',
+                begin: '@[A-Za-z]+'
+              }
+            ]
+          }
+        ),
+        hljs.COMMENT(
+          '__halt_compiler.+?;',
+          false,
+          {
+            endsWithParent: true,
+            keywords: '__halt_compiler'
+          }
+        ),
+        PREPROCESSOR,
+        {
+          className: 'keyword', begin: /\$this\b/
+        },
+        VARIABLE,
+        {
+          // swallow composed identifiers to avoid parsing them as keywords
+          begin: /(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/
+        },
+        {
+          className: 'function',
+          relevance: 0,
+          beginKeywords: 'fn function', end: /[;{]/, excludeEnd: true,
+          illegal: '[$%\\[]',
+          contains: [
+            hljs.UNDERSCORE_TITLE_MODE,
+            {
+              begin: '=>' // No markup, just a relevance booster
+            },
+            {
+              className: 'params',
+              begin: '\\(', end: '\\)',
+              excludeBegin: true,
+              excludeEnd: true,
+              keywords: KEYWORDS,
+              contains: [
+                'self',
+                VARIABLE,
+                hljs.C_BLOCK_COMMENT_MODE,
+                STRING,
+                NUMBER
+              ]
+            }
+          ]
+        },
+        {
+          className: 'class',
+          beginKeywords: 'class interface',
+          relevance: 0,
+          end: /\{/,
+          excludeEnd: true,
+          illegal: /[:($"]/,
+          contains: [
+            {beginKeywords: 'extends implements'},
+            hljs.UNDERSCORE_TITLE_MODE
+          ]
+        },
+        {
+          beginKeywords: 'namespace',
+          relevance: 0,
+          end: ';',
+          illegal: /[.']/,
+          contains: [hljs.UNDERSCORE_TITLE_MODE]
+        },
+        {
+          beginKeywords: 'use',
+          relevance: 0,
+          end: ';',
+          contains: [hljs.UNDERSCORE_TITLE_MODE]
+        },
+        STRING,
+        NUMBER
+      ]
+    };
+  }
+
+  return php;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('php-template', function () {
+  'use strict';
+
+  /*
+  Language: PHP Template
+  Requires: xml.js, php.js
+  Author: Josh Goebel <hello@joshgoebel.com>
+  Website: https://www.php.net
+  Category: common
+  */
+
+  function phpTemplate(hljs) {
+    return {
+      name: "PHP template",
+      subLanguage: 'xml',
+      contains: [
+        {
+          begin: /<\?(php|=)?/,
+          end: /\?>/,
+          subLanguage: 'php',
+          contains: [
+            // We don't want the php closing tag ?> to close the PHP block when
+            // inside any of the following blocks:
+            {
+              begin: '/\\*',
+              end: '\\*/',
+              skip: true
+            },
+            {
+              begin: 'b"',
+              end: '"',
+              skip: true
+            },
+            {
+              begin: 'b\'',
+              end: '\'',
+              skip: true
+            },
+            hljs.inherit(hljs.APOS_STRING_MODE, {
+              illegal: null,
+              className: null,
+              contains: null,
+              skip: true
+            }),
+            hljs.inherit(hljs.QUOTE_STRING_MODE, {
+              illegal: null,
+              className: null,
+              contains: null,
+              skip: true
+            })
+          ]
+        }
+      ]
+    };
+  }
+
+  return phpTemplate;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('plaintext', function () {
+  'use strict';
+
+  /*
+  Language: Plain text
+  Author: Egor Rogov (e.rogov@postgrespro.ru)
+  Description: Plain text without any highlighting.
+  Category: common
+  */
+
+  function plaintext(hljs) {
+    return {
+      name: 'Plain text',
+      aliases: [
+        'text',
+        'txt'
+      ],
+      disableAutodetect: true
+    };
+  }
+
+  return plaintext;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('properties', function () {
+  'use strict';
+
+  /*
+  Language: .properties
+  Contributors: Valentin Aitken <valentin@nalisbg.com>, Egor Rogov <e.rogov@postgrespro.ru>
+  Website: https://en.wikipedia.org/wiki/.properties
+  Category: common, config
+  */
+
+  function properties(hljs) {
+
+    // whitespaces: space, tab, formfeed
+    var WS0 = '[ \\t\\f]*';
+    var WS1 = '[ \\t\\f]+';
+    // delimiter
+    var EQUAL_DELIM = WS0+'[:=]'+WS0;
+    var WS_DELIM = WS1;
+    var DELIM = '(' + EQUAL_DELIM + '|' + WS_DELIM + ')';
+    var KEY_ALPHANUM = '([^\\\\\\W:= \\t\\f\\n]|\\\\.)+';
+    var KEY_OTHER = '([^\\\\:= \\t\\f\\n]|\\\\.)+';
+
+    var DELIM_AND_VALUE = {
+            // skip DELIM
+            end: DELIM,
+            relevance: 0,
+            starts: {
+              // value: everything until end of line (again, taking into account backslashes)
+              className: 'string',
+              end: /$/,
+              relevance: 0,
+              contains: [
+                { begin: '\\\\\\\\'},
+                { begin: '\\\\\\n' }
+              ]
+            }
+          };
+
+    return {
+      name: '.properties',
+      case_insensitive: true,
+      illegal: /\S/,
+      contains: [
+        hljs.COMMENT('^\\s*[!#]', '$'),
+        // key: everything until whitespace or = or : (taking into account backslashes)
+        // case of a "normal" key
+        {
+          returnBegin: true,
+          variants: [
+            { begin: KEY_ALPHANUM + EQUAL_DELIM, relevance: 1 },
+            { begin: KEY_ALPHANUM + WS_DELIM, relevance: 0 }
+          ],
+          contains: [
+            {
+              className: 'attr',
+              begin: KEY_ALPHANUM,
+              endsParent: true,
+              relevance: 0
+            }
+          ],
+          starts: DELIM_AND_VALUE
+        },
+        // case of key containing non-alphanumeric chars => relevance = 0
+        {
+          begin: KEY_OTHER + DELIM,
+          returnBegin: true,
+          relevance: 0,
+          contains: [
+            {
+              className: 'meta',
+              begin: KEY_OTHER,
+              endsParent: true,
+              relevance: 0
+            }
+          ],
+          starts: DELIM_AND_VALUE
+        },
+        // case of an empty key
+        {
+          className: 'attr',
+          relevance: 0,
+          begin: KEY_OTHER + WS0 + '$'
+        }
+      ]
+    };
+  }
+
+  return properties;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('python', function () {
+  'use strict';
+
+  /*
+  Language: Python
+  Description: Python is an interpreted, object-oriented, high-level programming language with dynamic semantics.
+  Website: https://www.python.org
+  Category: common
+  */
+
+  function python(hljs) {
+    const RESERVED_WORDS = [
+      'and',
+      'as',
+      'assert',
+      'async',
+      'await',
+      'break',
+      'class',
+      'continue',
+      'def',
+      'del',
+      'elif',
+      'else',
+      'except',
+      'finally',
+      'for',
+      '',
+      'from',
+      'global',
+      'if',
+      'import',
+      'in',
+      'is',
+      'lambda',
+      'nonlocal|10',
+      'not',
+      'or',
+      'pass',
+      'raise',
+      'return',
+      'try',
+      'while',
+      'with',
+      'yield',
+    ];
+
+    const BUILT_INS = [
+      '__import__',
+      'abs',
+      'all',
+      'any',
+      'ascii',
+      'bin',
+      'bool',
+      'breakpoint',
+      'bytearray',
+      'bytes',
+      'callable',
+      'chr',
+      'classmethod',
+      'compile',
+      'complex',
+      'delattr',
+      'dict',
+      'dir',
+      'divmod',
+      'enumerate',
+      'eval',
+      'exec',
+      'filter',
+      'float',
+      'format',
+      'frozenset',
+      'getattr',
+      'globals',
+      'hasattr',
+      'hash',
+      'help',
+      'hex',
+      'id',
+      'input',
+      'int',
+      'isinstance',
+      'issubclass',
+      'iter',
+      'len',
+      'list',
+      'locals',
+      'map',
+      'max',
+      'memoryview',
+      'min',
+      'next',
+      'object',
+      'oct',
+      'open',
+      'ord',
+      'pow',
+      'print',
+      'property',
+      'range',
+      'repr',
+      'reversed',
+      'round',
+      'set',
+      'setattr',
+      'slice',
+      'sorted',
+      'staticmethod',
+      'str',
+      'sum',
+      'super',
+      'tuple',
+      'type',
+      'vars',
+      'zip',
+    ];
+
+    const LITERALS = [
+      '__debug__',
+      'Ellipsis',
+      'False',
+      'None',
+      'NotImplemented',
+      'True',
+    ];
+
+    const KEYWORDS = {
+      keyword: RESERVED_WORDS,
+      built_in: BUILT_INS,
+      literal: LITERALS
+    };
+
+    const PROMPT = {
+      className: 'meta',  begin: /^(>>>|\.\.\.) /
+    };
+
+    const SUBST = {
+      className: 'subst',
+      begin: /\{/, end: /\}/,
+      keywords: KEYWORDS,
+      illegal: /#/
+    };
+
+    const LITERAL_BRACKET = {
+      begin: /\{\{/,
+      relevance: 0
+    };
+
+    const STRING = {
+      className: 'string',
+      contains: [hljs.BACKSLASH_ESCAPE],
+      variants: [
+        {
+          begin: /([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?'''/, end: /'''/,
+          contains: [hljs.BACKSLASH_ESCAPE, PROMPT],
+          relevance: 10
+        },
+        {
+          begin: /([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?"""/, end: /"""/,
+          contains: [hljs.BACKSLASH_ESCAPE, PROMPT],
+          relevance: 10
+        },
+        {
+          begin: /([fF][rR]|[rR][fF]|[fF])'''/, end: /'''/,
+          contains: [hljs.BACKSLASH_ESCAPE, PROMPT, LITERAL_BRACKET, SUBST]
+        },
+        {
+          begin: /([fF][rR]|[rR][fF]|[fF])"""/, end: /"""/,
+          contains: [hljs.BACKSLASH_ESCAPE, PROMPT, LITERAL_BRACKET, SUBST]
+        },
+        {
+          begin: /([uU]|[rR])'/, end: /'/,
+          relevance: 10
+        },
+        {
+          begin: /([uU]|[rR])"/, end: /"/,
+          relevance: 10
+        },
+        {
+          begin: /([bB]|[bB][rR]|[rR][bB])'/, end: /'/
+        },
+        {
+          begin: /([bB]|[bB][rR]|[rR][bB])"/, end: /"/
+        },
+        {
+          begin: /([fF][rR]|[rR][fF]|[fF])'/, end: /'/,
+          contains: [hljs.BACKSLASH_ESCAPE, LITERAL_BRACKET, SUBST]
+        },
+        {
+          begin: /([fF][rR]|[rR][fF]|[fF])"/, end: /"/,
+          contains: [hljs.BACKSLASH_ESCAPE, LITERAL_BRACKET, SUBST]
+        },
+        hljs.APOS_STRING_MODE,
+        hljs.QUOTE_STRING_MODE
+      ]
+    };
+
+    // https://docs.python.org/3.9/reference/lexical_analysis.html#numeric-literals
+    const digitpart = '[0-9](_?[0-9])*';
+    const pointfloat = `(\\b(${digitpart}))?\\.(${digitpart})|\\b(${digitpart})\\.`;
+    const NUMBER = {
+      className: 'number', relevance: 0,
+      variants: [
+        // exponentfloat, pointfloat
+        // https://docs.python.org/3.9/reference/lexical_analysis.html#floating-point-literals
+        // optionally imaginary
+        // https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
+        // Note: no leading \b because floats can start with a decimal point
+        // and we don't want to mishandle e.g. `fn(.5)`,
+        // no trailing \b for pointfloat because it can end with a decimal point
+        // and we don't want to mishandle e.g. `0..hex()`; this should be safe
+        // because both MUST contain a decimal point and so cannot be confused with
+        // the interior part of an identifier
+        { begin: `(\\b(${digitpart})|(${pointfloat}))[eE][+-]?(${digitpart})[jJ]?\\b` },
+        { begin: `(${pointfloat})[jJ]?` },
+
+        // decinteger, bininteger, octinteger, hexinteger
+        // https://docs.python.org/3.9/reference/lexical_analysis.html#integer-literals
+        // optionally "long" in Python 2
+        // https://docs.python.org/2.7/reference/lexical_analysis.html#integer-and-long-integer-literals
+        // decinteger is optionally imaginary
+        // https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
+        { begin: '\\b([1-9](_?[0-9])*|0+(_?0)*)[lLjJ]?\\b' },
+        { begin: '\\b0[bB](_?[01])+[lL]?\\b' },
+        { begin: '\\b0[oO](_?[0-7])+[lL]?\\b' },
+        { begin: '\\b0[xX](_?[0-9a-fA-F])+[lL]?\\b' },
+
+        // imagnumber (digitpart-based)
+        // https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
+        { begin: `\\b(${digitpart})[jJ]\\b` },
+      ]
+    };
+
+    const PARAMS = {
+      className: 'params',
+      variants: [
+        // Exclude params at functions without params
+        {begin: /\(\s*\)/, skip: true, className: null },
+        {
+          begin: /\(/, end: /\)/, excludeBegin: true, excludeEnd: true,
+          keywords: KEYWORDS,
+          contains: ['self', PROMPT, NUMBER, STRING, hljs.HASH_COMMENT_MODE],
+        },
+      ],
+    };
+    SUBST.contains = [STRING, NUMBER, PROMPT];
+
+    return {
+      name: 'Python',
+      aliases: ['py', 'gyp', 'ipython'],
+      keywords: KEYWORDS,
+      illegal: /(<\/|->|\?)|=>/,
+      contains: [
+        PROMPT,
+        NUMBER,
+        // eat "if" prior to string so that it won't accidentally be
+        // labeled as an f-string as in:
+        { begin: /\bself\b/, }, // very common convention
+        { beginKeywords: "if", relevance: 0 },
+        STRING,
+        hljs.HASH_COMMENT_MODE,
+        {
+          variants: [
+            {className: 'function', beginKeywords: 'def'},
+            {className: 'class', beginKeywords: 'class'}
+          ],
+          end: /:/,
+          illegal: /[${=;\n,]/,
+          contains: [
+            hljs.UNDERSCORE_TITLE_MODE,
+            PARAMS,
+            {
+              begin: /->/, endsWithParent: true,
+              keywords: 'None'
+            }
+          ]
+        },
+        {
+          className: 'meta',
+          begin: /^[\t ]*@/, end: /(?=#)|$/,
+          contains: [NUMBER, PARAMS, STRING]
+        },
+        {
+          begin: /\b(print|exec)\(/ // don’t highlight keywords-turned-functions in Python 3
+        }
+      ]
+    };
+  }
+
+  return python;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('python-repl', function () {
+  'use strict';
+
+  /*
+  Language: Python REPL
+  Requires: python.js
+  Author: Josh Goebel <hello@joshgoebel.com>
+  Category: common
+  */
+
+  function pythonRepl(hljs) {
+    return {
+      aliases: [ 'pycon' ],
+      contains: [
+        {
+          className: 'meta',
+          starts: {
+            // a space separates the REPL prefix from the actual code
+            // this is purely for cleaner HTML output
+            end: / |$/,
+            starts: {
+              end: '$',
+              subLanguage: 'python'
+            }
+          },
+          variants: [
+            {
+              begin: /^>>>(?=[ ]|$)/
+            },
+            {
+              begin: /^\.\.\.(?=[ ]|$)/
+            }
+          ]
+        }
+      ]
+    };
+  }
+
+  return pythonRepl;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('r', function () {
+  'use strict';
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function lookahead(re) {
+    return concat('(?=', re, ')');
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /*
+  Language: R
+  Description: R is a free software environment for statistical computing and graphics.
+  Author: Joe Cheng <joe@rstudio.org>
+  Contributors: Konrad Rudolph <konrad.rudolph@gmail.com>
+  Website: https://www.r-project.org
+  Category: common,scientific
+  */
+
+  /** @type LanguageFn */
+  function r(hljs) {
+    // Identifiers in R cannot start with `_`, but they can start with `.` if it
+    // is not immediately followed by a digit.
+    // R also supports quoted identifiers, which are near-arbitrary sequences
+    // delimited by backticks (`…`), which may contain escape sequences. These are
+    // handled in a separate mode. See `test/markup/r/names.txt` for examples.
+    // FIXME: Support Unicode identifiers.
+    const IDENT_RE = /(?:(?:[a-zA-Z]|\.[._a-zA-Z])[._a-zA-Z0-9]*)|\.(?!\d)/;
+    const SIMPLE_IDENT = /[a-zA-Z][a-zA-Z_0-9]*/;
+
+    return {
+      name: 'R',
+
+      // only in Haskell, not R
+      illegal: /->/,
+      keywords: {
+        $pattern: IDENT_RE,
+        keyword:
+          'function if in break next repeat else for while',
+        literal:
+          'NULL NA TRUE FALSE Inf NaN NA_integer_|10 NA_real_|10 ' +
+          'NA_character_|10 NA_complex_|10',
+        built_in:
+          // Builtin constants
+          'LETTERS letters month.abb month.name pi T F ' +
+          // Primitive functions
+          // These are all the functions in `base` that are implemented as a
+          // `.Primitive`, minus those functions that are also keywords.
+          'abs acos acosh all any anyNA Arg as.call as.character ' +
+          'as.complex as.double as.environment as.integer as.logical ' +
+          'as.null.default as.numeric as.raw asin asinh atan atanh attr ' +
+          'attributes baseenv browser c call ceiling class Conj cos cosh ' +
+          'cospi cummax cummin cumprod cumsum digamma dim dimnames ' +
+          'emptyenv exp expression floor forceAndCall gamma gc.time ' +
+          'globalenv Im interactive invisible is.array is.atomic is.call ' +
+          'is.character is.complex is.double is.environment is.expression ' +
+          'is.finite is.function is.infinite is.integer is.language ' +
+          'is.list is.logical is.matrix is.na is.name is.nan is.null ' +
+          'is.numeric is.object is.pairlist is.raw is.recursive is.single ' +
+          'is.symbol lazyLoadDBfetch length lgamma list log max min ' +
+          'missing Mod names nargs nzchar oldClass on.exit pos.to.env ' +
+          'proc.time prod quote range Re rep retracemem return round ' +
+          'seq_along seq_len seq.int sign signif sin sinh sinpi sqrt ' +
+          'standardGeneric substitute sum switch tan tanh tanpi tracemem ' +
+          'trigamma trunc unclass untracemem UseMethod xtfrm',
+      },
+      compilerExtensions: [
+        // allow beforeMatch to act as a "qualifier" for the match
+        // the full match begin must be [beforeMatch][begin]
+        (mode, parent) => {
+          if (!mode.beforeMatch) return;
+          // starts conflicts with endsParent which we need to make sure the child
+          // rule is not matched multiple times
+          if (mode.starts) throw new Error("beforeMatch cannot be used with starts");
+
+          const originalMode = Object.assign({}, mode);
+          Object.keys(mode).forEach((key) => { delete mode[key]; });
+
+          mode.begin = concat(originalMode.beforeMatch, lookahead(originalMode.begin));
+          mode.starts = {
+            relevance: 0,
+            contains: [
+              Object.assign(originalMode, { endsParent: true })
+            ]
+          };
+          mode.relevance = 0;
+
+          delete originalMode.beforeMatch;
+        }
+      ],
+      contains: [
+        // Roxygen comments
+        hljs.COMMENT(
+          /#'/,
+          /$/,
+          {
+            contains: [
+              {
+                // Handle `@examples` separately to cause all subsequent code
+                // until the next `@`-tag on its own line to be kept as-is,
+                // preventing highlighting. This code is example R code, so nested
+                // doctags shouldn’t be treated as such. See
+                // `test/markup/r/roxygen.txt` for an example.
+                className: 'doctag',
+                begin: '@examples',
+                starts: {
+                  contains: [
+                    { begin: /\n/ },
+                    {
+                      begin: /#'\s*(?=@[a-zA-Z]+)/,
+                      endsParent: true,
+                    },
+                    {
+                      begin: /#'/,
+                      end: /$/,
+                      excludeBegin: true,
+                    }
+                  ]
+                }
+              },
+              {
+                // Handle `@param` to highlight the parameter name following
+                // after.
+                className: 'doctag',
+                begin: '@param',
+                end: /$/,
+                contains: [
+                  {
+                    className: 'variable',
+                    variants: [
+                      { begin: IDENT_RE },
+                      { begin: /`(?:\\.|[^`\\])+`/ }
+                    ],
+                    endsParent: true
+                  }
+                ]
+              },
+              {
+                className: 'doctag',
+                begin: /@[a-zA-Z]+/
+              },
+              {
+                className: 'meta-keyword',
+                begin: /\\[a-zA-Z]+/,
+              }
+            ]
+          }
+        ),
+
+        hljs.HASH_COMMENT_MODE,
+
+        {
+          className: 'string',
+          contains: [hljs.BACKSLASH_ESCAPE],
+          variants: [
+            hljs.END_SAME_AS_BEGIN({ begin: /[rR]"(-*)\(/, end: /\)(-*)"/ }),
+            hljs.END_SAME_AS_BEGIN({ begin: /[rR]"(-*)\{/, end: /\}(-*)"/ }),
+            hljs.END_SAME_AS_BEGIN({ begin: /[rR]"(-*)\[/, end: /\](-*)"/ }),
+            hljs.END_SAME_AS_BEGIN({ begin: /[rR]'(-*)\(/, end: /\)(-*)'/ }),
+            hljs.END_SAME_AS_BEGIN({ begin: /[rR]'(-*)\{/, end: /\}(-*)'/ }),
+            hljs.END_SAME_AS_BEGIN({ begin: /[rR]'(-*)\[/, end: /\](-*)'/ }),
+            {begin: '"', end: '"', relevance: 0},
+            {begin: "'", end: "'", relevance: 0}
+          ],
+        },
+        {
+          className: 'number',
+          relevance: 0,
+          beforeMatch: /([^a-zA-Z0-9._])/, // not part of an identifier
+          variants: [
+            // TODO: replace with negative look-behind when available
+            // { begin: /(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/ },
+            // { begin: /(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+([pP][+-]?\d+)?[Li]?/ },
+            // { begin: /(?<![a-zA-Z0-9._])(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?[Li]?/ }
+            {
+              // Special case: only hexadecimal binary powers can contain fractions.
+              match: /0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/,
+            },
+            {
+              match: /0[xX][0-9a-fA-F]+([pP][+-]?\d+)?[Li]?/
+            },
+            {
+              match: /(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?[Li]?/,
+            }
+          ],
+        },
+        {
+          // infix operator
+          begin: '%',
+          end: '%'
+        },
+        // relevance boost for assignment
+        {
+          begin: concat(SIMPLE_IDENT, "\\s+<-\\s+")
+        },
+        {
+          // escaped identifier
+          begin: '`',
+          end: '`',
+          contains: [
+            { begin: /\\./ }
+          ]
+        }
+      ]
+    };
+  }
+
+  return r;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('ruby', function () {
+  'use strict';
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function lookahead(re) {
+    return concat('(?=', re, ')');
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /*
+  Language: Ruby
+  Description: Ruby is a dynamic, open source programming language with a focus on simplicity and productivity.
+  Website: https://www.ruby-lang.org/
+  Author: Anton Kovalyov <anton@kovalyov.net>
+  Contributors: Peter Leonov <gojpeg@yandex.ru>, Vasily Polovnyov <vast@whiteants.net>, Loren Segal <lsegal@soen.ca>, Pascal Hurni <phi@ruby-reactive.org>, Cedric Sohrauer <sohrauer@googlemail.com>
+  Category: common
+  */
+
+  function ruby(hljs) {
+    const RUBY_METHOD_RE = '([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)';
+    const RUBY_KEYWORDS = {
+      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 ' +
+        '__FILE__',
+      built_in: 'proc lambda',
+      literal:
+        'true false nil'
+    };
+    const YARDOCTAG = {
+      className: 'doctag',
+      begin: '@[A-Za-z]+'
+    };
+    const IRB_OBJECT = {
+      begin: '#<',
+      end: '>'
+    };
+    const COMMENT_MODES = [
+      hljs.COMMENT(
+        '#',
+        '$',
+        {
+          contains: [ YARDOCTAG ]
+        }
+      ),
+      hljs.COMMENT(
+        '^=begin',
+        '^=end',
+        {
+          contains: [ YARDOCTAG ],
+          relevance: 10
+        }
+      ),
+      hljs.COMMENT('^__END__', '\\n$')
+    ];
+    const SUBST = {
+      className: 'subst',
+      begin: /#\{/,
+      end: /\}/,
+      keywords: RUBY_KEYWORDS
+    };
+    const STRING = {
+      className: 'string',
+      contains: [
+        hljs.BACKSLASH_ESCAPE,
+        SUBST
+      ],
+      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: /\|/
+        },
+        // in the following expressions, \B in the beginning suppresses recognition of ?-sequences
+        // where ? is the last character of a preceding identifier, as in: `func?4`
+        {
+          begin: /\B\?(\\\d{1,3})/
+        },
+        {
+          begin: /\B\?(\\x[A-Fa-f0-9]{1,2})/
+        },
+        {
+          begin: /\B\?(\\u\{?[A-Fa-f0-9]{1,6}\}?)/
+        },
+        {
+          begin: /\B\?(\\M-\\C-|\\M-\\c|\\c\\M-|\\M-|\\C-\\M-)[\x20-\x7e]/
+        },
+        {
+          begin: /\B\?\\(c|C-)[\x20-\x7e]/
+        },
+        {
+          begin: /\B\?\\?\S/
+        },
+        { // heredocs
+          begin: /<<[-~]?'?(\w+)\n(?:[^\n]*\n)*?\s*\1\b/,
+          returnBegin: true,
+          contains: [
+            {
+              begin: /<<[-~]?'?/
+            },
+            hljs.END_SAME_AS_BEGIN({
+              begin: /(\w+)/,
+              end: /(\w+)/,
+              contains: [
+                hljs.BACKSLASH_ESCAPE,
+                SUBST
+              ]
+            })
+          ]
+        }
+      ]
+    };
+
+    // Ruby syntax is underdocumented, but this grammar seems to be accurate
+    // as of version 2.7.2 (confirmed with (irb and `Ripper.sexp(...)`)
+    // https://docs.ruby-lang.org/en/2.7.0/doc/syntax/literals_rdoc.html#label-Numbers
+    const decimal = '[1-9](_?[0-9])*|0';
+    const digits = '[0-9](_?[0-9])*';
+    const NUMBER = {
+      className: 'number',
+      relevance: 0,
+      variants: [
+        // decimal integer/float, optionally exponential or rational, optionally imaginary
+        {
+          begin: `\\b(${decimal})(\\.(${digits}))?([eE][+-]?(${digits})|r)?i?\\b`
+        },
+
+        // explicit decimal/binary/octal/hexadecimal integer,
+        // optionally rational and/or imaginary
+        {
+          begin: "\\b0[dD][0-9](_?[0-9])*r?i?\\b"
+        },
+        {
+          begin: "\\b0[bB][0-1](_?[0-1])*r?i?\\b"
+        },
+        {
+          begin: "\\b0[oO][0-7](_?[0-7])*r?i?\\b"
+        },
+        {
+          begin: "\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*r?i?\\b"
+        },
+
+        // 0-prefixed implicit octal integer, optionally rational and/or imaginary
+        {
+          begin: "\\b0(_?[0-7])+r?i?\\b"
+        }
+      ]
+    };
+
+    const PARAMS = {
+      className: 'params',
+      begin: '\\(',
+      end: '\\)',
+      endsParent: true,
+      keywords: RUBY_KEYWORDS
+    };
+
+    const RUBY_DEFAULT_CONTAINS = [
+      STRING,
+      {
+        className: 'class',
+        beginKeywords: 'class module',
+        end: '$|;',
+        illegal: /=/,
+        contains: [
+          hljs.inherit(hljs.TITLE_MODE, {
+            begin: '[A-Za-z_]\\w*(::\\w+)*(\\?|!)?'
+          }),
+          {
+            begin: '<\\s*',
+            contains: [
+              {
+                begin: '(' + hljs.IDENT_RE + '::)?' + hljs.IDENT_RE,
+                // we already get points for <, we don't need poitns
+                // for the name also
+                relevance: 0
+              }
+            ]
+          }
+        ].concat(COMMENT_MODES)
+      },
+      {
+        className: 'function',
+        // def method_name(
+        // def method_name;
+        // def method_name (end of line)
+        begin: concat(/def\s*/, lookahead(RUBY_METHOD_RE + "\\s*(\\(|;|$)")),
+        relevance: 0, // relevance comes from kewords
+        keywords: "def",
+        end: '$|;',
+        contains: [
+          hljs.inherit(hljs.TITLE_MODE, {
+            begin: RUBY_METHOD_RE
+          }),
+          PARAMS
+        ].concat(COMMENT_MODES)
+      },
+      {
+        // swallow namespace qualifiers before symbols
+        begin: hljs.IDENT_RE + '::'
+      },
+      {
+        className: 'symbol',
+        begin: hljs.UNDERSCORE_IDENT_RE + '(!|\\?)?:',
+        relevance: 0
+      },
+      {
+        className: 'symbol',
+        begin: ':(?!\\s)',
+        contains: [
+          STRING,
+          {
+            begin: RUBY_METHOD_RE
+          }
+        ],
+        relevance: 0
+      },
+      NUMBER,
+      {
+        // negative-look forward attemps to prevent false matches like:
+        // @ident@ or $ident$ that might indicate this is not ruby at all
+        className: "variable",
+        begin: '(\\$\\W)|((\\$|@@?)(\\w+))(?=[^@$?])' + `(?![A-Za-z])(?![@$?'])`
+      },
+      {
+        className: 'params',
+        begin: /\|/,
+        end: /\|/,
+        relevance: 0, // this could be a lot of things (in other languages) other than params
+        keywords: RUBY_KEYWORDS
+      },
+      { // regexp container
+        begin: '(' + hljs.RE_STARTERS_RE + '|unless)\\s*',
+        keywords: 'unless',
+        contains: [
+          {
+            className: 'regexp',
+            contains: [
+              hljs.BACKSLASH_ESCAPE,
+              SUBST
+            ],
+            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(IRB_OBJECT, COMMENT_MODES),
+        relevance: 0
+      }
+    ].concat(IRB_OBJECT, COMMENT_MODES);
+
+    SUBST.contains = RUBY_DEFAULT_CONTAINS;
+    PARAMS.contains = RUBY_DEFAULT_CONTAINS;
+
+    // >>
+    // ?>
+    const SIMPLE_PROMPT = "[>?]>";
+    // irb(main):001:0>
+    const DEFAULT_PROMPT = "[\\w#]+\\(\\w+\\):\\d+:\\d+>";
+    const RVM_PROMPT = "(\\w+-)?\\d+\\.\\d+\\.\\d+(p\\d+)?[^\\d][^>]+>";
+
+    const IRB_DEFAULT = [
+      {
+        begin: /^\s*=>/,
+        starts: {
+          end: '$',
+          contains: RUBY_DEFAULT_CONTAINS
+        }
+      },
+      {
+        className: 'meta',
+        begin: '^(' + SIMPLE_PROMPT + "|" + DEFAULT_PROMPT + '|' + RVM_PROMPT + ')(?=[ ])',
+        starts: {
+          end: '$',
+          contains: RUBY_DEFAULT_CONTAINS
+        }
+      }
+    ];
+
+    COMMENT_MODES.unshift(IRB_OBJECT);
+
+    return {
+      name: 'Ruby',
+      aliases: [
+        'rb',
+        'gemspec',
+        'podspec',
+        'thor',
+        'irb'
+      ],
+      keywords: RUBY_KEYWORDS,
+      illegal: /\/\*/,
+      contains: [
+        hljs.SHEBANG({
+          binary: "ruby"
+        })
+      ]
+        .concat(IRB_DEFAULT)
+        .concat(COMMENT_MODES)
+        .concat(RUBY_DEFAULT_CONTAINS)
+    };
+  }
+
+  return ruby;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('rust', function () {
+  'use strict';
+
+  /*
+  Language: Rust
+  Author: Andrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
+  Contributors: Roman Shmatov <romanshmatov@gmail.com>, Kasper Andersen <kma_untrusted@protonmail.com>
+  Website: https://www.rust-lang.org
+  Category: common, system
+  */
+
+  function rust(hljs) {
+    const NUM_SUFFIX = '([ui](8|16|32|64|128|size)|f(32|64))\?';
+    const KEYWORDS =
+      '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';
+    const BUILTINS =
+      // functions
+      'drop ' +
+      // types
+      'i8 i16 i32 i64 i128 isize ' +
+      'u8 u16 u32 u64 u128 usize ' +
+      'f32 f64 ' +
+      'str char bool ' +
+      'Box Option Result String Vec ' +
+      // traits
+      '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 ' +
+      // macros
+      '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: hljs.IDENT_RE + '!?',
+        keyword:
+          KEYWORDS,
+        literal:
+          'true false Some None Ok Err',
+        built_in:
+          BUILTINS
+      },
+      illegal: '</',
+      contains: [
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.COMMENT('/\\*', '\\*/', {
+          contains: [ 'self' ]
+        }),
+        hljs.inherit(hljs.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_]+)' + NUM_SUFFIX
+            },
+            {
+              begin: '\\b0o([0-7_]+)' + NUM_SUFFIX
+            },
+            {
+              begin: '\\b0x([A-Fa-f0-9_]+)' + NUM_SUFFIX
+            },
+            {
+              begin: '\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)' +
+                     NUM_SUFFIX
+            }
+          ],
+          relevance: 0
+        },
+        {
+          className: 'function',
+          beginKeywords: 'fn',
+          end: '(\\(|<)',
+          excludeEnd: true,
+          contains: [ hljs.UNDERSCORE_TITLE_MODE ]
+        },
+        {
+          className: 'meta',
+          begin: '#!?\\[',
+          end: '\\]',
+          contains: [
+            {
+              className: 'meta-string',
+              begin: /"/,
+              end: /"/
+            }
+          ]
+        },
+        {
+          className: 'class',
+          beginKeywords: 'type',
+          end: ';',
+          contains: [
+            hljs.inherit(hljs.UNDERSCORE_TITLE_MODE, {
+              endsParent: true
+            })
+          ],
+          illegal: '\\S'
+        },
+        {
+          className: 'class',
+          beginKeywords: 'trait enum struct union',
+          end: /\{/,
+          contains: [
+            hljs.inherit(hljs.UNDERSCORE_TITLE_MODE, {
+              endsParent: true
+            })
+          ],
+          illegal: '[\\w\\d]'
+        },
+        {
+          begin: hljs.IDENT_RE + '::',
+          keywords: {
+            built_in: BUILTINS
+          }
+        },
+        {
+          begin: '->'
+        }
+      ]
+    };
+  }
+
+  return rust;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('scss', function () {
+  'use strict';
+
+  const MODES = (hljs) => {
+    return {
+      IMPORTANT: {
+        className: 'meta',
+        begin: '!important'
+      },
+      HEXCOLOR: {
+        className: 'number',
+        begin: '#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})'
+      },
+      ATTRIBUTE_SELECTOR_MODE: {
+        className: 'selector-attr',
+        begin: /\[/,
+        end: /\]/,
+        illegal: '$',
+        contains: [
+          hljs.APOS_STRING_MODE,
+          hljs.QUOTE_STRING_MODE
+        ]
+      }
+    };
+  };
+
+  const TAGS = [
+    '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',
+    'main',
+    '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'
+  ];
+
+  const MEDIA_FEATURES = [
+    'any-hover',
+    'any-pointer',
+    'aspect-ratio',
+    'color',
+    'color-gamut',
+    'color-index',
+    'device-aspect-ratio',
+    'device-height',
+    'device-width',
+    'display-mode',
+    'forced-colors',
+    'grid',
+    'height',
+    'hover',
+    'inverted-colors',
+    'monochrome',
+    'orientation',
+    'overflow-block',
+    'overflow-inline',
+    'pointer',
+    'prefers-color-scheme',
+    'prefers-contrast',
+    'prefers-reduced-motion',
+    'prefers-reduced-transparency',
+    'resolution',
+    'scan',
+    'scripting',
+    'update',
+    'width',
+    // TODO: find a better solution?
+    'min-width',
+    'max-width',
+    'min-height',
+    'max-height'
+  ];
+
+  // https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes
+  const PSEUDO_CLASSES = [
+    'active',
+    'any-link',
+    'blank',
+    'checked',
+    'current',
+    'default',
+    'defined',
+    'dir', // dir()
+    'disabled',
+    'drop',
+    'empty',
+    'enabled',
+    'first',
+    'first-child',
+    'first-of-type',
+    'fullscreen',
+    'future',
+    'focus',
+    'focus-visible',
+    'focus-within',
+    'has', // has()
+    'host', // host or host()
+    'host-context', // host-context()
+    'hover',
+    'indeterminate',
+    'in-range',
+    'invalid',
+    'is', // is()
+    'lang', // lang()
+    'last-child',
+    'last-of-type',
+    'left',
+    'link',
+    'local-link',
+    'not', // not()
+    'nth-child', // nth-child()
+    'nth-col', // nth-col()
+    'nth-last-child', // nth-last-child()
+    'nth-last-col', // nth-last-col()
+    'nth-last-of-type', //nth-last-of-type()
+    'nth-of-type', //nth-of-type()
+    'only-child',
+    'only-of-type',
+    'optional',
+    'out-of-range',
+    'past',
+    'placeholder-shown',
+    'read-only',
+    'read-write',
+    'required',
+    'right',
+    'root',
+    'scope',
+    'target',
+    'target-within',
+    'user-invalid',
+    'valid',
+    'visited',
+    'where' // where()
+  ];
+
+  // https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-elements
+  const PSEUDO_ELEMENTS = [
+    'after',
+    'backdrop',
+    'before',
+    'cue',
+    'cue-region',
+    'first-letter',
+    'first-line',
+    'grammar-error',
+    'marker',
+    'part',
+    'placeholder',
+    'selection',
+    'slotted',
+    'spelling-error'
+  ];
+
+  const ATTRIBUTES = [
+    '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-display',
+    '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-variation-settings',
+    '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',
+    'src', // @font-face
+    '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 makes sure longer attributes `font-weight` are matched fully
+    // instead of getting false positives on say `font`
+  ].reverse();
+
+  /*
+  Language: SCSS
+  Description: Scss is an extension of the syntax of CSS.
+  Author: Kurt Emch <kurt@kurtemch.com>
+  Website: https://sass-lang.com
+  Category: common, css
+  */
+
+  /** @type LanguageFn */
+  function scss(hljs) {
+    const modes = MODES(hljs);
+    const PSEUDO_ELEMENTS$1 = PSEUDO_ELEMENTS;
+    const PSEUDO_CLASSES$1 = PSEUDO_CLASSES;
+
+    const AT_IDENTIFIER = '@[a-z-]+'; // @font-face
+    const AT_MODIFIERS = "and or not only";
+    const IDENT_RE = '[a-zA-Z-][a-zA-Z0-9_-]*';
+    const VARIABLE = {
+      className: 'variable',
+      begin: '(\\$' + IDENT_RE + ')\\b'
+    };
+
+    return {
+      name: 'SCSS',
+      case_insensitive: true,
+      illegal: '[=/|\']',
+      contains: [
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        {
+          className: 'selector-id',
+          begin: '#[A-Za-z0-9_-]+',
+          relevance: 0
+        },
+        {
+          className: 'selector-class',
+          begin: '\\.[A-Za-z0-9_-]+',
+          relevance: 0
+        },
+        modes.ATTRIBUTE_SELECTOR_MODE,
+        {
+          className: 'selector-tag',
+          begin: '\\b(' + TAGS.join('|') + ')\\b',
+          // was there, before, but why?
+          relevance: 0
+        },
+        {
+          className: 'selector-pseudo',
+          begin: ':(' + PSEUDO_CLASSES$1.join('|') + ')'
+        },
+        {
+          className: 'selector-pseudo',
+          begin: '::(' + PSEUDO_ELEMENTS$1.join('|') + ')'
+        },
+        VARIABLE,
+        { // pseudo-selector params
+          begin: /\(/,
+          end: /\)/,
+          contains: [ hljs.CSS_NUMBER_MODE ]
+        },
+        {
+          className: 'attribute',
+          begin: '\\b(' + ATTRIBUTES.join('|') + ')\\b'
+        },
+        {
+          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: [
+            VARIABLE,
+            modes.HEXCOLOR,
+            hljs.CSS_NUMBER_MODE,
+            hljs.QUOTE_STRING_MODE,
+            hljs.APOS_STRING_MODE,
+            modes.IMPORTANT
+          ]
+        },
+        // matching these here allows us to treat them more like regular CSS
+        // rules so everything between the {} gets regular rule highlighting,
+        // which is what we want for page and font-face
+        {
+          begin: '@(page|font-face)',
+          lexemes: AT_IDENTIFIER,
+          keywords: '@page @font-face'
+        },
+        {
+          begin: '@',
+          end: '[{;]',
+          returnBegin: true,
+          keywords: {
+            $pattern: /[a-z-]+/,
+            keyword: AT_MODIFIERS,
+            attribute: MEDIA_FEATURES.join(" ")
+          },
+          contains: [
+            {
+              begin: AT_IDENTIFIER,
+              className: "keyword"
+            },
+            {
+              begin: /[a-z-]+(?=:)/,
+              className: "attribute"
+            },
+            VARIABLE,
+            hljs.QUOTE_STRING_MODE,
+            hljs.APOS_STRING_MODE,
+            modes.HEXCOLOR,
+            hljs.CSS_NUMBER_MODE
+          ]
+        }
+      ]
+    };
+  }
+
+  return scss;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('shell', function () {
+  'use strict';
+
+  /*
+  Language: Shell Session
+  Requires: bash.js
+  Author: TSUYUSATO Kitsune <make.just.on@gmail.com>
+  Category: common
+  Audit: 2020
+  */
+
+  /** @type LanguageFn */
+  function shell(hljs) {
+    return {
+      name: 'Shell Session',
+      aliases: [ 'console' ],
+      contains: [
+        {
+          className: 'meta',
+          // We cannot add \s (spaces) in the regular expression otherwise it will be too broad and produce unexpected result.
+          // For instance, in the following example, it would match "echo /path/to/home >" as a prompt:
+          // echo /path/to/home > t.exe
+          begin: /^\s{0,3}[/~\w\d[\]()@-]*[>%$#]/,
+          starts: {
+            end: /[^\\](?=\s*$)/,
+            subLanguage: 'bash'
+          }
+        }
+      ]
+    };
+  }
+
+  return shell;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('sql', function () {
+  'use strict';
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /**
+   * Any of the passed expresssions may match
+   *
+   * Creates a huge this | this | that | that match
+   * @param {(RegExp | string)[] } args
+   * @returns {string}
+   */
+  function either(...args) {
+    const joined = '(' + args.map((x) => source(x)).join("|") + ")";
+    return joined;
+  }
+
+  /*
+   Language: SQL
+   Website: https://en.wikipedia.org/wiki/SQL
+   Category: common, database
+   */
+
+  function sql(hljs) {
+    const COMMENT_MODE = hljs.COMMENT('--', '$');
+    const STRING = {
+      className: 'string',
+      variants: [
+        {
+          begin: /'/,
+          end: /'/,
+          contains: [
+            {begin: /''/ }
+          ]
+        }
+      ]
+    };
+    const QUOTED_IDENTIFIER = {
+      begin: /"/,
+      end: /"/,
+      contains: [ { begin: /""/ } ]
+    };
+
+    const LITERALS = [
+      "true",
+      "false",
+      // Not sure it's correct to call NULL literal, and clauses like IS [NOT] NULL look strange that way.
+      // "null",
+      "unknown"
+    ];
+
+    const MULTI_WORD_TYPES = [
+      "double precision",
+      "large object",
+      "with timezone",
+      "without timezone"
+    ];
+
+    const TYPES = [
+      'bigint',
+      'binary',
+      'blob',
+      'boolean',
+      'char',
+      'character',
+      'clob',
+      'date',
+      'dec',
+      'decfloat',
+      'decimal',
+      'float',
+      'int',
+      'integer',
+      'interval',
+      'nchar',
+      'nclob',
+      'national',
+      'numeric',
+      'real',
+      'row',
+      'smallint',
+      'time',
+      'timestamp',
+      'varchar',
+      'varying', // modifier (character varying)
+      'varbinary'
+    ];
+
+    const NON_RESERVED_WORDS = [
+      "add",
+      "asc",
+      "collation",
+      "desc",
+      "final",
+      "first",
+      "last",
+      "view"
+    ];
+
+    // https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#reserved-word
+    const RESERVED_WORDS = [
+      "abs",
+      "acos",
+      "all",
+      "allocate",
+      "alter",
+      "and",
+      "any",
+      "are",
+      "array",
+      "array_agg",
+      "array_max_cardinality",
+      "as",
+      "asensitive",
+      "asin",
+      "asymmetric",
+      "at",
+      "atan",
+      "atomic",
+      "authorization",
+      "avg",
+      "begin",
+      "begin_frame",
+      "begin_partition",
+      "between",
+      "bigint",
+      "binary",
+      "blob",
+      "boolean",
+      "both",
+      "by",
+      "call",
+      "called",
+      "cardinality",
+      "cascaded",
+      "case",
+      "cast",
+      "ceil",
+      "ceiling",
+      "char",
+      "char_length",
+      "character",
+      "character_length",
+      "check",
+      "classifier",
+      "clob",
+      "close",
+      "coalesce",
+      "collate",
+      "collect",
+      "column",
+      "commit",
+      "condition",
+      "connect",
+      "constraint",
+      "contains",
+      "convert",
+      "copy",
+      "corr",
+      "corresponding",
+      "cos",
+      "cosh",
+      "count",
+      "covar_pop",
+      "covar_samp",
+      "create",
+      "cross",
+      "cube",
+      "cume_dist",
+      "current",
+      "current_catalog",
+      "current_date",
+      "current_default_transform_group",
+      "current_path",
+      "current_role",
+      "current_row",
+      "current_schema",
+      "current_time",
+      "current_timestamp",
+      "current_path",
+      "current_role",
+      "current_transform_group_for_type",
+      "current_user",
+      "cursor",
+      "cycle",
+      "date",
+      "day",
+      "deallocate",
+      "dec",
+      "decimal",
+      "decfloat",
+      "declare",
+      "default",
+      "define",
+      "delete",
+      "dense_rank",
+      "deref",
+      "describe",
+      "deterministic",
+      "disconnect",
+      "distinct",
+      "double",
+      "drop",
+      "dynamic",
+      "each",
+      "element",
+      "else",
+      "empty",
+      "end",
+      "end_frame",
+      "end_partition",
+      "end-exec",
+      "equals",
+      "escape",
+      "every",
+      "except",
+      "exec",
+      "execute",
+      "exists",
+      "exp",
+      "external",
+      "extract",
+      "false",
+      "fetch",
+      "filter",
+      "first_value",
+      "float",
+      "floor",
+      "for",
+      "foreign",
+      "frame_row",
+      "free",
+      "from",
+      "full",
+      "function",
+      "fusion",
+      "get",
+      "global",
+      "grant",
+      "group",
+      "grouping",
+      "groups",
+      "having",
+      "hold",
+      "hour",
+      "identity",
+      "in",
+      "indicator",
+      "initial",
+      "inner",
+      "inout",
+      "insensitive",
+      "insert",
+      "int",
+      "integer",
+      "intersect",
+      "intersection",
+      "interval",
+      "into",
+      "is",
+      "join",
+      "json_array",
+      "json_arrayagg",
+      "json_exists",
+      "json_object",
+      "json_objectagg",
+      "json_query",
+      "json_table",
+      "json_table_primitive",
+      "json_value",
+      "lag",
+      "language",
+      "large",
+      "last_value",
+      "lateral",
+      "lead",
+      "leading",
+      "left",
+      "like",
+      "like_regex",
+      "listagg",
+      "ln",
+      "local",
+      "localtime",
+      "localtimestamp",
+      "log",
+      "log10",
+      "lower",
+      "match",
+      "match_number",
+      "match_recognize",
+      "matches",
+      "max",
+      "member",
+      "merge",
+      "method",
+      "min",
+      "minute",
+      "mod",
+      "modifies",
+      "module",
+      "month",
+      "multiset",
+      "national",
+      "natural",
+      "nchar",
+      "nclob",
+      "new",
+      "no",
+      "none",
+      "normalize",
+      "not",
+      "nth_value",
+      "ntile",
+      "null",
+      "nullif",
+      "numeric",
+      "octet_length",
+      "occurrences_regex",
+      "of",
+      "offset",
+      "old",
+      "omit",
+      "on",
+      "one",
+      "only",
+      "open",
+      "or",
+      "order",
+      "out",
+      "outer",
+      "over",
+      "overlaps",
+      "overlay",
+      "parameter",
+      "partition",
+      "pattern",
+      "per",
+      "percent",
+      "percent_rank",
+      "percentile_cont",
+      "percentile_disc",
+      "period",
+      "portion",
+      "position",
+      "position_regex",
+      "power",
+      "precedes",
+      "precision",
+      "prepare",
+      "primary",
+      "procedure",
+      "ptf",
+      "range",
+      "rank",
+      "reads",
+      "real",
+      "recursive",
+      "ref",
+      "references",
+      "referencing",
+      "regr_avgx",
+      "regr_avgy",
+      "regr_count",
+      "regr_intercept",
+      "regr_r2",
+      "regr_slope",
+      "regr_sxx",
+      "regr_sxy",
+      "regr_syy",
+      "release",
+      "result",
+      "return",
+      "returns",
+      "revoke",
+      "right",
+      "rollback",
+      "rollup",
+      "row",
+      "row_number",
+      "rows",
+      "running",
+      "savepoint",
+      "scope",
+      "scroll",
+      "search",
+      "second",
+      "seek",
+      "select",
+      "sensitive",
+      "session_user",
+      "set",
+      "show",
+      "similar",
+      "sin",
+      "sinh",
+      "skip",
+      "smallint",
+      "some",
+      "specific",
+      "specifictype",
+      "sql",
+      "sqlexception",
+      "sqlstate",
+      "sqlwarning",
+      "sqrt",
+      "start",
+      "static",
+      "stddev_pop",
+      "stddev_samp",
+      "submultiset",
+      "subset",
+      "substring",
+      "substring_regex",
+      "succeeds",
+      "sum",
+      "symmetric",
+      "system",
+      "system_time",
+      "system_user",
+      "table",
+      "tablesample",
+      "tan",
+      "tanh",
+      "then",
+      "time",
+      "timestamp",
+      "timezone_hour",
+      "timezone_minute",
+      "to",
+      "trailing",
+      "translate",
+      "translate_regex",
+      "translation",
+      "treat",
+      "trigger",
+      "trim",
+      "trim_array",
+      "true",
+      "truncate",
+      "uescape",
+      "union",
+      "unique",
+      "unknown",
+      "unnest",
+      "update   ",
+      "upper",
+      "user",
+      "using",
+      "value",
+      "values",
+      "value_of",
+      "var_pop",
+      "var_samp",
+      "varbinary",
+      "varchar",
+      "varying",
+      "versioning",
+      "when",
+      "whenever",
+      "where",
+      "width_bucket",
+      "window",
+      "with",
+      "within",
+      "without",
+      "year",
+    ];
+
+    // these are reserved words we have identified to be functions
+    // and should only be highlighted in a dispatch-like context
+    // ie, array_agg(...), etc.
+    const RESERVED_FUNCTIONS = [
+      "abs",
+      "acos",
+      "array_agg",
+      "asin",
+      "atan",
+      "avg",
+      "cast",
+      "ceil",
+      "ceiling",
+      "coalesce",
+      "corr",
+      "cos",
+      "cosh",
+      "count",
+      "covar_pop",
+      "covar_samp",
+      "cume_dist",
+      "dense_rank",
+      "deref",
+      "element",
+      "exp",
+      "extract",
+      "first_value",
+      "floor",
+      "json_array",
+      "json_arrayagg",
+      "json_exists",
+      "json_object",
+      "json_objectagg",
+      "json_query",
+      "json_table",
+      "json_table_primitive",
+      "json_value",
+      "lag",
+      "last_value",
+      "lead",
+      "listagg",
+      "ln",
+      "log",
+      "log10",
+      "lower",
+      "max",
+      "min",
+      "mod",
+      "nth_value",
+      "ntile",
+      "nullif",
+      "percent_rank",
+      "percentile_cont",
+      "percentile_disc",
+      "position",
+      "position_regex",
+      "power",
+      "rank",
+      "regr_avgx",
+      "regr_avgy",
+      "regr_count",
+      "regr_intercept",
+      "regr_r2",
+      "regr_slope",
+      "regr_sxx",
+      "regr_sxy",
+      "regr_syy",
+      "row_number",
+      "sin",
+      "sinh",
+      "sqrt",
+      "stddev_pop",
+      "stddev_samp",
+      "substring",
+      "substring_regex",
+      "sum",
+      "tan",
+      "tanh",
+      "translate",
+      "translate_regex",
+      "treat",
+      "trim",
+      "trim_array",
+      "unnest",
+      "upper",
+      "value_of",
+      "var_pop",
+      "var_samp",
+      "width_bucket",
+    ];
+
+    // these functions can
+    const POSSIBLE_WITHOUT_PARENS = [
+      "current_catalog",
+      "current_date",
+      "current_default_transform_group",
+      "current_path",
+      "current_role",
+      "current_schema",
+      "current_transform_group_for_type",
+      "current_user",
+      "session_user",
+      "system_time",
+      "system_user",
+      "current_time",
+      "localtime",
+      "current_timestamp",
+      "localtimestamp"
+    ];
+
+    // those exist to boost relevance making these very
+    // "SQL like" keyword combos worth +1 extra relevance
+    const COMBOS = [
+      "create table",
+      "insert into",
+      "primary key",
+      "foreign key",
+      "not null",
+      "alter table",
+      "add constraint",
+      "grouping sets",
+      "on overflow",
+      "character set",
+      "respect nulls",
+      "ignore nulls",
+      "nulls first",
+      "nulls last",
+      "depth first",
+      "breadth first"
+    ];
+
+    const FUNCTIONS = RESERVED_FUNCTIONS;
+
+    const KEYWORDS = [...RESERVED_WORDS, ...NON_RESERVED_WORDS].filter((keyword) => {
+      return !RESERVED_FUNCTIONS.includes(keyword);
+    });
+
+    const VARIABLE = {
+      className: "variable",
+      begin: /@[a-z0-9]+/,
+    };
+
+    const OPERATOR = {
+      className: "operator",
+      begin: /[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,
+      relevance: 0,
+    };
+
+    const FUNCTION_CALL = {
+      begin: concat(/\b/, either(...FUNCTIONS), /\s*\(/),
+      keywords: {
+        built_in: FUNCTIONS
+      }
+    };
+
+    // keywords with less than 3 letters are reduced in relevancy
+    function reduceRelevancy(list, {exceptions, when} = {}) {
+      const qualifyFn = when;
+      exceptions = exceptions || [];
+      return list.map((item) => {
+        if (item.match(/\|\d+$/) || exceptions.includes(item)) {
+          return item;
+        } else if (qualifyFn(item)) {
+          return `${item}|0`;
+        } else {
+          return item;
+        }
+      });
+    }
+
+    return {
+      name: 'SQL',
+      case_insensitive: true,
+      // does not include {} or HTML tags `</`
+      illegal: /[{}]|<\//,
+      keywords: {
+        $pattern: /\b[\w\.]+/,
+        keyword:
+          reduceRelevancy(KEYWORDS, { when: (x) => x.length < 3 }),
+        literal: LITERALS,
+        type: TYPES,
+        built_in: POSSIBLE_WITHOUT_PARENS
+      },
+      contains: [
+        {
+          begin: either(...COMBOS),
+          keywords: {
+            $pattern: /[\w\.]+/,
+            keyword: KEYWORDS.concat(COMBOS),
+            literal: LITERALS,
+            type: TYPES
+          },
+        },
+        {
+          className: "type",
+          begin: either(...MULTI_WORD_TYPES)
+        },
+        FUNCTION_CALL,
+        VARIABLE,
+        STRING,
+        QUOTED_IDENTIFIER,
+        hljs.C_NUMBER_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        COMMENT_MODE,
+        OPERATOR
+      ]
+    };
+  }
+
+  return sql;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('swift', function () {
+  'use strict';
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function lookahead(re) {
+    return concat('(?=', re, ')');
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /**
+   * Any of the passed expresssions may match
+   *
+   * Creates a huge this | this | that | that match
+   * @param {(RegExp | string)[] } args
+   * @returns {string}
+   */
+  function either(...args) {
+    const joined = '(' + args.map((x) => source(x)).join("|") + ")";
+    return joined;
+  }
+
+  const keywordWrapper = keyword => concat(
+    /\b/,
+    keyword,
+    /\w$/.test(keyword) ? /\b/ : /\B/
+  );
+
+  // Keywords that require a leading dot.
+  const dotKeywords = [
+    'Protocol', // contextual
+    'Type' // contextual
+  ].map(keywordWrapper);
+
+  // Keywords that may have a leading dot.
+  const optionalDotKeywords = [
+    'init',
+    'self'
+  ].map(keywordWrapper);
+
+  // should register as keyword, not type
+  const keywordTypes = [
+    'Any',
+    'Self'
+  ];
+
+  // Regular keywords and literals.
+  const keywords = [
+    // strings below will be fed into the regular `keywords` engine while regex
+    // will result in additional modes being created to scan for those keywords to
+    // avoid conflicts with other rules
+    'associatedtype',
+    /as\?/, // operator
+    /as!/, // operator
+    'as', // operator
+    'break',
+    'case',
+    'catch',
+    'class',
+    'continue',
+    'convenience', // contextual
+    'default',
+    'defer',
+    'deinit',
+    'didSet', // contextual
+    'do',
+    'dynamic', // contextual
+    'else',
+    'enum',
+    'extension',
+    'fallthrough',
+    /fileprivate\(set\)/,
+    'fileprivate',
+    'final', // contextual
+    'for',
+    'func',
+    'get', // contextual
+    'guard',
+    'if',
+    'import',
+    'indirect', // contextual
+    'infix', // contextual
+    /init\?/,
+    /init!/,
+    'inout',
+    /internal\(set\)/,
+    'internal',
+    'in',
+    'is', // operator
+    'lazy', // contextual
+    'let',
+    'mutating', // contextual
+    'nonmutating', // contextual
+    /open\(set\)/, // contextual
+    'open', // contextual
+    'operator',
+    'optional', // contextual
+    'override', // contextual
+    'postfix', // contextual
+    'precedencegroup',
+    'prefix', // contextual
+    /private\(set\)/,
+    'private',
+    'protocol',
+    /public\(set\)/,
+    'public',
+    'repeat',
+    'required', // contextual
+    'rethrows',
+    'return',
+    'set', // contextual
+    'some', // contextual
+    'static',
+    'struct',
+    'subscript',
+    'super',
+    'switch',
+    'throws',
+    'throw',
+    /try\?/, // operator
+    /try!/, // operator
+    'try', // operator
+    'typealias',
+    /unowned\(safe\)/, // contextual
+    /unowned\(unsafe\)/, // contextual
+    'unowned', // contextual
+    'var',
+    'weak', // contextual
+    'where',
+    'while',
+    'willSet' // contextual
+  ];
+
+  // NOTE: Contextual keywords are reserved only in specific contexts.
+  // Ideally, these should be matched using modes to avoid false positives.
+
+  // Literals.
+  const literals = [
+    'false',
+    'nil',
+    'true'
+  ];
+
+  // Keywords used in precedence groups.
+  const precedencegroupKeywords = [
+    'assignment',
+    'associativity',
+    'higherThan',
+    'left',
+    'lowerThan',
+    'none',
+    'right'
+  ];
+
+  // Keywords that start with a number sign (#).
+  // #available is handled separately.
+  const numberSignKeywords = [
+    '#colorLiteral',
+    '#column',
+    '#dsohandle',
+    '#else',
+    '#elseif',
+    '#endif',
+    '#error',
+    '#file',
+    '#fileID',
+    '#fileLiteral',
+    '#filePath',
+    '#function',
+    '#if',
+    '#imageLiteral',
+    '#keyPath',
+    '#line',
+    '#selector',
+    '#sourceLocation',
+    '#warn_unqualified_access',
+    '#warning'
+  ];
+
+  // Global functions in the Standard Library.
+  const builtIns = [
+    'abs',
+    'all',
+    'any',
+    'assert',
+    'assertionFailure',
+    'debugPrint',
+    'dump',
+    'fatalError',
+    'getVaList',
+    'isKnownUniquelyReferenced',
+    'max',
+    'min',
+    'numericCast',
+    'pointwiseMax',
+    'pointwiseMin',
+    'precondition',
+    'preconditionFailure',
+    'print',
+    'readLine',
+    'repeatElement',
+    'sequence',
+    'stride',
+    'swap',
+    'swift_unboxFromSwiftValueWithType',
+    'transcode',
+    'type',
+    'unsafeBitCast',
+    'unsafeDowncast',
+    'withExtendedLifetime',
+    'withUnsafeMutablePointer',
+    'withUnsafePointer',
+    'withVaList',
+    'withoutActuallyEscaping',
+    'zip'
+  ];
+
+  // Valid first characters for operators.
+  const operatorHead = either(
+    /[/=\-+!*%<>&|^~?]/,
+    /[\u00A1-\u00A7]/,
+    /[\u00A9\u00AB]/,
+    /[\u00AC\u00AE]/,
+    /[\u00B0\u00B1]/,
+    /[\u00B6\u00BB\u00BF\u00D7\u00F7]/,
+    /[\u2016-\u2017]/,
+    /[\u2020-\u2027]/,
+    /[\u2030-\u203E]/,
+    /[\u2041-\u2053]/,
+    /[\u2055-\u205E]/,
+    /[\u2190-\u23FF]/,
+    /[\u2500-\u2775]/,
+    /[\u2794-\u2BFF]/,
+    /[\u2E00-\u2E7F]/,
+    /[\u3001-\u3003]/,
+    /[\u3008-\u3020]/,
+    /[\u3030]/
+  );
+
+  // Valid characters for operators.
+  const operatorCharacter = either(
+    operatorHead,
+    /[\u0300-\u036F]/,
+    /[\u1DC0-\u1DFF]/,
+    /[\u20D0-\u20FF]/,
+    /[\uFE00-\uFE0F]/,
+    /[\uFE20-\uFE2F]/
+    // TODO: The following characters are also allowed, but the regex isn't supported yet.
+    // /[\u{E0100}-\u{E01EF}]/u
+  );
+
+  // Valid operator.
+  const operator = concat(operatorHead, operatorCharacter, '*');
+
+  // Valid first characters for identifiers.
+  const identifierHead = either(
+    /[a-zA-Z_]/,
+    /[\u00A8\u00AA\u00AD\u00AF\u00B2-\u00B5\u00B7-\u00BA]/,
+    /[\u00BC-\u00BE\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF]/,
+    /[\u0100-\u02FF\u0370-\u167F\u1681-\u180D\u180F-\u1DBF]/,
+    /[\u1E00-\u1FFF]/,
+    /[\u200B-\u200D\u202A-\u202E\u203F-\u2040\u2054\u2060-\u206F]/,
+    /[\u2070-\u20CF\u2100-\u218F\u2460-\u24FF\u2776-\u2793]/,
+    /[\u2C00-\u2DFF\u2E80-\u2FFF]/,
+    /[\u3004-\u3007\u3021-\u302F\u3031-\u303F\u3040-\uD7FF]/,
+    /[\uF900-\uFD3D\uFD40-\uFDCF\uFDF0-\uFE1F\uFE30-\uFE44]/,
+    /[\uFE47-\uFEFE\uFF00-\uFFFD]/ // Should be /[\uFE47-\uFFFD]/, but we have to exclude FEFF.
+    // The following characters are also allowed, but the regexes aren't supported yet.
+    // /[\u{10000}-\u{1FFFD}\u{20000-\u{2FFFD}\u{30000}-\u{3FFFD}\u{40000}-\u{4FFFD}]/u,
+    // /[\u{50000}-\u{5FFFD}\u{60000-\u{6FFFD}\u{70000}-\u{7FFFD}\u{80000}-\u{8FFFD}]/u,
+    // /[\u{90000}-\u{9FFFD}\u{A0000-\u{AFFFD}\u{B0000}-\u{BFFFD}\u{C0000}-\u{CFFFD}]/u,
+    // /[\u{D0000}-\u{DFFFD}\u{E0000-\u{EFFFD}]/u
+  );
+
+  // Valid characters for identifiers.
+  const identifierCharacter = either(
+    identifierHead,
+    /\d/,
+    /[\u0300-\u036F\u1DC0-\u1DFF\u20D0-\u20FF\uFE20-\uFE2F]/
+  );
+
+  // Valid identifier.
+  const identifier = concat(identifierHead, identifierCharacter, '*');
+
+  // Valid type identifier.
+  const typeIdentifier = concat(/[A-Z]/, identifierCharacter, '*');
+
+  // Built-in attributes, which are highlighted as keywords.
+  // @available is handled separately.
+  const keywordAttributes = [
+    'autoclosure',
+    concat(/convention\(/, either('swift', 'block', 'c'), /\)/),
+    'discardableResult',
+    'dynamicCallable',
+    'dynamicMemberLookup',
+    'escaping',
+    'frozen',
+    'GKInspectable',
+    'IBAction',
+    'IBDesignable',
+    'IBInspectable',
+    'IBOutlet',
+    'IBSegueAction',
+    'inlinable',
+    'main',
+    'nonobjc',
+    'NSApplicationMain',
+    'NSCopying',
+    'NSManaged',
+    concat(/objc\(/, identifier, /\)/),
+    'objc',
+    'objcMembers',
+    'propertyWrapper',
+    'requires_stored_property_inits',
+    'testable',
+    'UIApplicationMain',
+    'unknown',
+    'usableFromInline'
+  ];
+
+  // Contextual keywords used in @available and #available.
+  const availabilityKeywords = [
+    'iOS',
+    'iOSApplicationExtension',
+    'macOS',
+    'macOSApplicationExtension',
+    'macCatalyst',
+    'macCatalystApplicationExtension',
+    'watchOS',
+    'watchOSApplicationExtension',
+    'tvOS',
+    'tvOSApplicationExtension',
+    'swift'
+  ];
+
+  /*
+  Language: Swift
+  Description: Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns.
+  Author: Steven Van Impe <steven.vanimpe@icloud.com>
+  Contributors: Chris Eidhof <chris@eidhof.nl>, Nate Cook <natecook@gmail.com>, Alexander Lichter <manniL@gmx.net>, Richard Gibson <gibson042@github>
+  Website: https://swift.org
+  Category: common, system
+  */
+
+  /** @type LanguageFn */
+  function swift(hljs) {
+    const WHITESPACE = {
+      match: /\s+/,
+      relevance: 0
+    };
+    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID411
+    const BLOCK_COMMENT = hljs.COMMENT(
+      '/\\*',
+      '\\*/',
+      {
+        contains: [ 'self' ]
+      }
+    );
+    const COMMENTS = [
+      hljs.C_LINE_COMMENT_MODE,
+      BLOCK_COMMENT
+    ];
+
+    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID413
+    // https://docs.swift.org/swift-book/ReferenceManual/zzSummaryOfTheGrammar.html
+    const DOT_KEYWORD = {
+      className: 'keyword',
+      begin: concat(/\./, lookahead(either(...dotKeywords, ...optionalDotKeywords))),
+      end: either(...dotKeywords, ...optionalDotKeywords),
+      excludeBegin: true
+    };
+    const KEYWORD_GUARD = {
+      // Consume .keyword to prevent highlighting properties and methods as keywords.
+      match: concat(/\./, either(...keywords)),
+      relevance: 0
+    };
+    const PLAIN_KEYWORDS = keywords
+      .filter(kw => typeof kw === 'string')
+      .concat([ "_|0" ]); // seems common, so 0 relevance
+    const REGEX_KEYWORDS = keywords
+      .filter(kw => typeof kw !== 'string') // find regex
+      .concat(keywordTypes)
+      .map(keywordWrapper);
+    const KEYWORD = {
+      variants: [
+        {
+          className: 'keyword',
+          match: either(...REGEX_KEYWORDS, ...optionalDotKeywords)
+        }
+      ]
+    };
+    // find all the regular keywords
+    const KEYWORDS = {
+      $pattern: either(
+        /\b\w+/, // regular keywords
+        /#\w+/ // number keywords
+      ),
+      keyword: PLAIN_KEYWORDS
+        .concat(numberSignKeywords),
+      literal: literals
+    };
+    const KEYWORD_MODES = [
+      DOT_KEYWORD,
+      KEYWORD_GUARD,
+      KEYWORD
+    ];
+
+    // https://github.com/apple/swift/tree/main/stdlib/public/core
+    const BUILT_IN_GUARD = {
+      // Consume .built_in to prevent highlighting properties and methods.
+      match: concat(/\./, either(...builtIns)),
+      relevance: 0
+    };
+    const BUILT_IN = {
+      className: 'built_in',
+      match: concat(/\b/, either(...builtIns), /(?=\()/)
+    };
+    const BUILT_INS = [
+      BUILT_IN_GUARD,
+      BUILT_IN
+    ];
+
+    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID418
+    const OPERATOR_GUARD = {
+      // Prevent -> from being highlighting as an operator.
+      match: /->/,
+      relevance: 0
+    };
+    const OPERATOR = {
+      className: 'operator',
+      relevance: 0,
+      variants: [
+        {
+          match: operator
+        },
+        {
+          // dot-operator: only operators that start with a dot are allowed to use dots as
+          // characters (..., ...<, .*, etc). So there rule here is: a dot followed by one or more
+          // characters that may also include dots.
+          match: `\\.(\\.|${operatorCharacter})+`
+        }
+      ]
+    };
+    const OPERATORS = [
+      OPERATOR_GUARD,
+      OPERATOR
+    ];
+
+    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#grammar_numeric-literal
+    // TODO: Update for leading `-` after lookbehind is supported everywhere
+    const decimalDigits = '([0-9]_*)+';
+    const hexDigits = '([0-9a-fA-F]_*)+';
+    const NUMBER = {
+      className: 'number',
+      relevance: 0,
+      variants: [
+        // decimal floating-point-literal (subsumes decimal-literal)
+        {
+          match: `\\b(${decimalDigits})(\\.(${decimalDigits}))?` + `([eE][+-]?(${decimalDigits}))?\\b`
+        },
+        // hexadecimal floating-point-literal (subsumes hexadecimal-literal)
+        {
+          match: `\\b0x(${hexDigits})(\\.(${hexDigits}))?` + `([pP][+-]?(${decimalDigits}))?\\b`
+        },
+        // octal-literal
+        {
+          match: /\b0o([0-7]_*)+\b/
+        },
+        // binary-literal
+        {
+          match: /\b0b([01]_*)+\b/
+        }
+      ]
+    };
+
+    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#grammar_string-literal
+    const ESCAPED_CHARACTER = (rawDelimiter = "") => ({
+      className: 'subst',
+      variants: [
+        {
+          match: concat(/\\/, rawDelimiter, /[0\\tnr"']/)
+        },
+        {
+          match: concat(/\\/, rawDelimiter, /u\{[0-9a-fA-F]{1,8}\}/)
+        }
+      ]
+    });
+    const ESCAPED_NEWLINE = (rawDelimiter = "") => ({
+      className: 'subst',
+      match: concat(/\\/, rawDelimiter, /[\t ]*(?:[\r\n]|\r\n)/)
+    });
+    const INTERPOLATION = (rawDelimiter = "") => ({
+      className: 'subst',
+      label: "interpol",
+      begin: concat(/\\/, rawDelimiter, /\(/),
+      end: /\)/
+    });
+    const MULTILINE_STRING = (rawDelimiter = "") => ({
+      begin: concat(rawDelimiter, /"""/),
+      end: concat(/"""/, rawDelimiter),
+      contains: [
+        ESCAPED_CHARACTER(rawDelimiter),
+        ESCAPED_NEWLINE(rawDelimiter),
+        INTERPOLATION(rawDelimiter)
+      ]
+    });
+    const SINGLE_LINE_STRING = (rawDelimiter = "") => ({
+      begin: concat(rawDelimiter, /"/),
+      end: concat(/"/, rawDelimiter),
+      contains: [
+        ESCAPED_CHARACTER(rawDelimiter),
+        INTERPOLATION(rawDelimiter)
+      ]
+    });
+    const STRING = {
+      className: 'string',
+      variants: [
+        MULTILINE_STRING(),
+        MULTILINE_STRING("#"),
+        MULTILINE_STRING("##"),
+        MULTILINE_STRING("###"),
+        SINGLE_LINE_STRING(),
+        SINGLE_LINE_STRING("#"),
+        SINGLE_LINE_STRING("##"),
+        SINGLE_LINE_STRING("###")
+      ]
+    };
+
+    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID412
+    const QUOTED_IDENTIFIER = {
+      match: concat(/`/, identifier, /`/)
+    };
+    const IMPLICIT_PARAMETER = {
+      className: 'variable',
+      match: /\$\d+/
+    };
+    const PROPERTY_WRAPPER_PROJECTION = {
+      className: 'variable',
+      match: `\\$${identifierCharacter}+`
+    };
+    const IDENTIFIERS = [
+      QUOTED_IDENTIFIER,
+      IMPLICIT_PARAMETER,
+      PROPERTY_WRAPPER_PROJECTION
+    ];
+
+    // https://docs.swift.org/swift-book/ReferenceManual/Attributes.html
+    const AVAILABLE_ATTRIBUTE = {
+      match: /(@|#)available/,
+      className: "keyword",
+      starts: {
+        contains: [
+          {
+            begin: /\(/,
+            end: /\)/,
+            keywords: availabilityKeywords,
+            contains: [
+              ...OPERATORS,
+              NUMBER,
+              STRING
+            ]
+          }
+        ]
+      }
+    };
+    const KEYWORD_ATTRIBUTE = {
+      className: 'keyword',
+      match: concat(/@/, either(...keywordAttributes))
+    };
+    const USER_DEFINED_ATTRIBUTE = {
+      className: 'meta',
+      match: concat(/@/, identifier)
+    };
+    const ATTRIBUTES = [
+      AVAILABLE_ATTRIBUTE,
+      KEYWORD_ATTRIBUTE,
+      USER_DEFINED_ATTRIBUTE
+    ];
+
+    // https://docs.swift.org/swift-book/ReferenceManual/Types.html
+    const TYPE = {
+      match: lookahead(/\b[A-Z]/),
+      relevance: 0,
+      contains: [
+        { // Common Apple frameworks, for relevance boost
+          className: 'type',
+          match: concat(/(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)/, identifierCharacter, '+')
+        },
+        { // Type identifier
+          className: 'type',
+          match: typeIdentifier,
+          relevance: 0
+        },
+        { // Optional type
+          match: /[?!]+/,
+          relevance: 0
+        },
+        { // Variadic parameter
+          match: /\.\.\./,
+          relevance: 0
+        },
+        { // Protocol composition
+          match: concat(/\s+&\s+/, lookahead(typeIdentifier)),
+          relevance: 0
+        }
+      ]
+    };
+    const GENERIC_ARGUMENTS = {
+      begin: /</,
+      end: />/,
+      keywords: KEYWORDS,
+      contains: [
+        ...COMMENTS,
+        ...KEYWORD_MODES,
+        ...ATTRIBUTES,
+        OPERATOR_GUARD,
+        TYPE
+      ]
+    };
+    TYPE.contains.push(GENERIC_ARGUMENTS);
+
+    // https://docs.swift.org/swift-book/ReferenceManual/Expressions.html#ID552
+    // Prevents element names from being highlighted as keywords.
+    const TUPLE_ELEMENT_NAME = {
+      match: concat(identifier, /\s*:/),
+      keywords: "_|0",
+      relevance: 0
+    };
+    // Matches tuples as well as the parameter list of a function type.
+    const TUPLE = {
+      begin: /\(/,
+      end: /\)/,
+      relevance: 0,
+      keywords: KEYWORDS,
+      contains: [
+        'self',
+        TUPLE_ELEMENT_NAME,
+        ...COMMENTS,
+        ...KEYWORD_MODES,
+        ...BUILT_INS,
+        ...OPERATORS,
+        NUMBER,
+        STRING,
+        ...IDENTIFIERS,
+        ...ATTRIBUTES,
+        TYPE
+      ]
+    };
+
+    // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID362
+    // Matches both the keyword func and the function title.
+    // Grouping these lets us differentiate between the operator function <
+    // and the start of the generic parameter clause (also <).
+    const FUNC_PLUS_TITLE = {
+      beginKeywords: 'func',
+      contains: [
+        {
+          className: 'title',
+          match: either(QUOTED_IDENTIFIER.match, identifier, operator),
+          // Required to make sure the opening < of the generic parameter clause
+          // isn't parsed as a second title.
+          endsParent: true,
+          relevance: 0
+        },
+        WHITESPACE
+      ]
+    };
+    const GENERIC_PARAMETERS = {
+      begin: /</,
+      end: />/,
+      contains: [
+        ...COMMENTS,
+        TYPE
+      ]
+    };
+    const FUNCTION_PARAMETER_NAME = {
+      begin: either(
+        lookahead(concat(identifier, /\s*:/)),
+        lookahead(concat(identifier, /\s+/, identifier, /\s*:/))
+      ),
+      end: /:/,
+      relevance: 0,
+      contains: [
+        {
+          className: 'keyword',
+          match: /\b_\b/
+        },
+        {
+          className: 'params',
+          match: identifier
+        }
+      ]
+    };
+    const FUNCTION_PARAMETERS = {
+      begin: /\(/,
+      end: /\)/,
+      keywords: KEYWORDS,
+      contains: [
+        FUNCTION_PARAMETER_NAME,
+        ...COMMENTS,
+        ...KEYWORD_MODES,
+        ...OPERATORS,
+        NUMBER,
+        STRING,
+        ...ATTRIBUTES,
+        TYPE,
+        TUPLE
+      ],
+      endsParent: true,
+      illegal: /["']/
+    };
+    const FUNCTION = {
+      className: 'function',
+      match: lookahead(/\bfunc\b/),
+      contains: [
+        FUNC_PLUS_TITLE,
+        GENERIC_PARAMETERS,
+        FUNCTION_PARAMETERS,
+        WHITESPACE
+      ],
+      illegal: [
+        /\[/,
+        /%/
+      ]
+    };
+
+    // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID375
+    // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID379
+    const INIT_SUBSCRIPT = {
+      className: 'function',
+      match: /\b(subscript|init[?!]?)\s*(?=[<(])/,
+      keywords: {
+        keyword: "subscript init init? init!",
+        $pattern: /\w+[?!]?/
+      },
+      contains: [
+        GENERIC_PARAMETERS,
+        FUNCTION_PARAMETERS,
+        WHITESPACE
+      ],
+      illegal: /\[|%/
+    };
+    // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID380
+    const OPERATOR_DECLARATION = {
+      beginKeywords: 'operator',
+      end: hljs.MATCH_NOTHING_RE,
+      contains: [
+        {
+          className: 'title',
+          match: operator,
+          endsParent: true,
+          relevance: 0
+        }
+      ]
+    };
+
+    // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID550
+    const PRECEDENCEGROUP = {
+      beginKeywords: 'precedencegroup',
+      end: hljs.MATCH_NOTHING_RE,
+      contains: [
+        {
+          className: 'title',
+          match: typeIdentifier,
+          relevance: 0
+        },
+        {
+          begin: /{/,
+          end: /}/,
+          relevance: 0,
+          endsParent: true,
+          keywords: [
+            ...precedencegroupKeywords,
+            ...literals
+          ],
+          contains: [ TYPE ]
+        }
+      ]
+    };
+
+    // Add supported submodes to string interpolation.
+    for (const variant of STRING.variants) {
+      const interpolation = variant.contains.find(mode => mode.label === "interpol");
+      // TODO: Interpolation can contain any expression, so there's room for improvement here.
+      interpolation.keywords = KEYWORDS;
+      const submodes = [
+        ...KEYWORD_MODES,
+        ...BUILT_INS,
+        ...OPERATORS,
+        NUMBER,
+        STRING,
+        ...IDENTIFIERS
+      ];
+      interpolation.contains = [
+        ...submodes,
+        {
+          begin: /\(/,
+          end: /\)/,
+          contains: [
+            'self',
+            ...submodes
+          ]
+        }
+      ];
+    }
+
+    return {
+      name: 'Swift',
+      keywords: KEYWORDS,
+      contains: [
+        ...COMMENTS,
+        FUNCTION,
+        INIT_SUBSCRIPT,
+        {
+          className: 'class',
+          beginKeywords: 'struct protocol class extension enum',
+          end: '\\{',
+          excludeEnd: true,
+          keywords: KEYWORDS,
+          contains: [
+            hljs.inherit(hljs.TITLE_MODE, {
+              begin: /[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/
+            }),
+            ...KEYWORD_MODES
+          ]
+        },
+        OPERATOR_DECLARATION,
+        PRECEDENCEGROUP,
+        {
+          beginKeywords: 'import',
+          end: /$/,
+          contains: [ ...COMMENTS ],
+          relevance: 0
+        },
+        ...KEYWORD_MODES,
+        ...BUILT_INS,
+        ...OPERATORS,
+        NUMBER,
+        STRING,
+        ...IDENTIFIERS,
+        ...ATTRIBUTES,
+        TYPE,
+        TUPLE
+      ]
+    };
+  }
+
+  return swift;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('typescript', function () {
+  'use strict';
+
+  const IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
+  const KEYWORDS = [
+    "as", // for exports
+    "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",
+    // JS handles these with a special rule
+    // "get",
+    // "set",
+    "debugger",
+    "async",
+    "await",
+    "static",
+    "import",
+    "from",
+    "export",
+    "extends"
+  ];
+  const LITERALS = [
+    "true",
+    "false",
+    "null",
+    "undefined",
+    "NaN",
+    "Infinity"
+  ];
+
+  const TYPES = [
+    "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"
+  ];
+
+  const ERROR_TYPES = [
+    "EvalError",
+    "InternalError",
+    "RangeError",
+    "ReferenceError",
+    "SyntaxError",
+    "TypeError",
+    "URIError"
+  ];
+
+  const BUILT_IN_GLOBALS = [
+    "setInterval",
+    "setTimeout",
+    "clearInterval",
+    "clearTimeout",
+
+    "require",
+    "exports",
+
+    "eval",
+    "isFinite",
+    "isNaN",
+    "parseFloat",
+    "parseInt",
+    "decodeURI",
+    "decodeURIComponent",
+    "encodeURI",
+    "encodeURIComponent",
+    "escape",
+    "unescape"
+  ];
+
+  const BUILT_IN_VARIABLES = [
+    "arguments",
+    "this",
+    "super",
+    "console",
+    "window",
+    "document",
+    "localStorage",
+    "module",
+    "global" // Node.js
+  ];
+
+  const BUILT_INS = [].concat(
+    BUILT_IN_GLOBALS,
+    BUILT_IN_VARIABLES,
+    TYPES,
+    ERROR_TYPES
+  );
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function lookahead(re) {
+    return concat('(?=', re, ')');
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /*
+  Language: JavaScript
+  Description: JavaScript (JS) is a lightweight, interpreted, or just-in-time compiled programming language with first-class functions.
+  Category: common, scripting
+  Website: https://developer.mozilla.org/en-US/docs/Web/JavaScript
+  */
+
+  /** @type LanguageFn */
+  function javascript(hljs) {
+    /**
+     * Takes a string like "<Booger" and checks to see
+     * if we can find a matching "</Booger" later in the
+     * content.
+     * @param {RegExpMatchArray} match
+     * @param {{after:number}} param1
+     */
+    const hasClosingTag = (match, { after }) => {
+      const tag = "</" + match[0].slice(1);
+      const pos = match.input.indexOf(tag, after);
+      return pos !== -1;
+    };
+
+    const IDENT_RE$1 = IDENT_RE;
+    const FRAGMENT = {
+      begin: '<>',
+      end: '</>'
+    };
+    const XML_TAG = {
+      begin: /<[A-Za-z0-9\\._:-]+/,
+      end: /\/[A-Za-z0-9\\._:-]+>|\/>/,
+      /**
+       * @param {RegExpMatchArray} match
+       * @param {CallbackResponse} response
+       */
+      isTrulyOpeningTag: (match, response) => {
+        const afterMatchIndex = match[0].length + match.index;
+        const nextChar = match.input[afterMatchIndex];
+        // nested type?
+        // HTML should not include another raw `<` inside a tag
+        // But a type might: `<Array<Array<number>>`, etc.
+        if (nextChar === "<") {
+          response.ignoreMatch();
+          return;
+        }
+        // <something>
+        // This is now either a tag or a type.
+        if (nextChar === ">") {
+          // if we cannot find a matching closing tag, then we
+          // will ignore it
+          if (!hasClosingTag(match, { after: afterMatchIndex })) {
+            response.ignoreMatch();
+          }
+        }
+      }
+    };
+    const KEYWORDS$1 = {
+      $pattern: IDENT_RE,
+      keyword: KEYWORDS,
+      literal: LITERALS,
+      built_in: BUILT_INS
+    };
+
+    // https://tc39.es/ecma262/#sec-literals-numeric-literals
+    const decimalDigits = '[0-9](_?[0-9])*';
+    const frac = `\\.(${decimalDigits})`;
+    // DecimalIntegerLiteral, including Annex B NonOctalDecimalIntegerLiteral
+    // https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals
+    const decimalInteger = `0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*`;
+    const NUMBER = {
+      className: 'number',
+      variants: [
+        // DecimalLiteral
+        { begin: `(\\b(${decimalInteger})((${frac})|\\.)?|(${frac}))` +
+          `[eE][+-]?(${decimalDigits})\\b` },
+        { begin: `\\b(${decimalInteger})\\b((${frac})\\b|\\.)?|(${frac})\\b` },
+
+        // DecimalBigIntegerLiteral
+        { begin: `\\b(0|[1-9](_?[0-9])*)n\\b` },
+
+        // NonDecimalIntegerLiteral
+        { begin: "\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b" },
+        { begin: "\\b0[bB][0-1](_?[0-1])*n?\\b" },
+        { begin: "\\b0[oO][0-7](_?[0-7])*n?\\b" },
+
+        // LegacyOctalIntegerLiteral (does not include underscore separators)
+        // https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals
+        { begin: "\\b0[0-7]+n?\\b" },
+      ],
+      relevance: 0
+    };
+
+    const SUBST = {
+      className: 'subst',
+      begin: '\\$\\{',
+      end: '\\}',
+      keywords: KEYWORDS$1,
+      contains: [] // defined later
+    };
+    const HTML_TEMPLATE = {
+      begin: 'html`',
+      end: '',
+      starts: {
+        end: '`',
+        returnEnd: false,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ],
+        subLanguage: 'xml'
+      }
+    };
+    const CSS_TEMPLATE = {
+      begin: 'css`',
+      end: '',
+      starts: {
+        end: '`',
+        returnEnd: false,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ],
+        subLanguage: 'css'
+      }
+    };
+    const TEMPLATE_STRING = {
+      className: 'string',
+      begin: '`',
+      end: '`',
+      contains: [
+        hljs.BACKSLASH_ESCAPE,
+        SUBST
+      ]
+    };
+    const JSDOC_COMMENT = hljs.COMMENT(
+      /\/\*\*(?!\/)/,
+      '\\*/',
+      {
+        relevance: 0,
+        contains: [
+          {
+            className: 'doctag',
+            begin: '@[A-Za-z]+',
+            contains: [
+              {
+                className: 'type',
+                begin: '\\{',
+                end: '\\}',
+                relevance: 0
+              },
+              {
+                className: 'variable',
+                begin: IDENT_RE$1 + '(?=\\s*(-)|$)',
+                endsParent: true,
+                relevance: 0
+              },
+              // eat spaces (not newlines) so we can find
+              // types or variables
+              {
+                begin: /(?=[^\n])\s/,
+                relevance: 0
+              }
+            ]
+          }
+        ]
+      }
+    );
+    const COMMENT = {
+      className: "comment",
+      variants: [
+        JSDOC_COMMENT,
+        hljs.C_BLOCK_COMMENT_MODE,
+        hljs.C_LINE_COMMENT_MODE
+      ]
+    };
+    const SUBST_INTERNALS = [
+      hljs.APOS_STRING_MODE,
+      hljs.QUOTE_STRING_MODE,
+      HTML_TEMPLATE,
+      CSS_TEMPLATE,
+      TEMPLATE_STRING,
+      NUMBER,
+      hljs.REGEXP_MODE
+    ];
+    SUBST.contains = SUBST_INTERNALS
+      .concat({
+        // we need to pair up {} inside our subst to prevent
+        // it from ending too early by matching another }
+        begin: /\{/,
+        end: /\}/,
+        keywords: KEYWORDS$1,
+        contains: [
+          "self"
+        ].concat(SUBST_INTERNALS)
+      });
+    const SUBST_AND_COMMENTS = [].concat(COMMENT, SUBST.contains);
+    const PARAMS_CONTAINS = SUBST_AND_COMMENTS.concat([
+      // eat recursive parens in sub expressions
+      {
+        begin: /\(/,
+        end: /\)/,
+        keywords: KEYWORDS$1,
+        contains: ["self"].concat(SUBST_AND_COMMENTS)
+      }
+    ]);
+    const PARAMS = {
+      className: 'params',
+      begin: /\(/,
+      end: /\)/,
+      excludeBegin: true,
+      excludeEnd: true,
+      keywords: KEYWORDS$1,
+      contains: PARAMS_CONTAINS
+    };
+
+    return {
+      name: 'Javascript',
+      aliases: ['js', 'jsx', 'mjs', 'cjs'],
+      keywords: KEYWORDS$1,
+      // this will be extended by TypeScript
+      exports: { PARAMS_CONTAINS },
+      illegal: /#(?![$_A-z])/,
+      contains: [
+        hljs.SHEBANG({
+          label: "shebang",
+          binary: "node",
+          relevance: 5
+        }),
+        {
+          label: "use_strict",
+          className: 'meta',
+          relevance: 10,
+          begin: /^\s*['"]use (strict|asm)['"]/
+        },
+        hljs.APOS_STRING_MODE,
+        hljs.QUOTE_STRING_MODE,
+        HTML_TEMPLATE,
+        CSS_TEMPLATE,
+        TEMPLATE_STRING,
+        COMMENT,
+        NUMBER,
+        { // object attr container
+          begin: concat(/[{,\n]\s*/,
+            // we need to look ahead to make sure that we actually have an
+            // attribute coming up so we don't steal a comma from a potential
+            // "value" container
+            //
+            // NOTE: this might not work how you think.  We don't actually always
+            // enter this mode and stay.  Instead it might merely match `,
+            // <comments up next>` and then immediately end after the , because it
+            // fails to find any actual attrs. But this still does the job because
+            // it prevents the value contain rule from grabbing this instead and
+            // prevening this rule from firing when we actually DO have keys.
+            lookahead(concat(
+              // we also need to allow for multiple possible comments inbetween
+              // the first key:value pairing
+              /(((\/\/.*$)|(\/\*(\*[^/]|[^*])*\*\/))\s*)*/,
+              IDENT_RE$1 + '\\s*:'))),
+          relevance: 0,
+          contains: [
+            {
+              className: 'attr',
+              begin: IDENT_RE$1 + lookahead('\\s*:'),
+              relevance: 0
+            }
+          ]
+        },
+        { // "value" container
+          begin: '(' + hljs.RE_STARTERS_RE + '|\\b(case|return|throw)\\b)\\s*',
+          keywords: 'return throw case',
+          contains: [
+            COMMENT,
+            hljs.REGEXP_MODE,
+            {
+              className: 'function',
+              // we have to count the parens to make sure we actually have the
+              // correct bounding ( ) before the =>.  There could be any number of
+              // sub-expressions inside also surrounded by parens.
+              begin: '(\\(' +
+              '[^()]*(\\(' +
+              '[^()]*(\\(' +
+              '[^()]*' +
+              '\\)[^()]*)*' +
+              '\\)[^()]*)*' +
+              '\\)|' + hljs.UNDERSCORE_IDENT_RE + ')\\s*=>',
+              returnBegin: true,
+              end: '\\s*=>',
+              contains: [
+                {
+                  className: 'params',
+                  variants: [
+                    {
+                      begin: hljs.UNDERSCORE_IDENT_RE,
+                      relevance: 0
+                    },
+                    {
+                      className: null,
+                      begin: /\(\s*\)/,
+                      skip: true
+                    },
+                    {
+                      begin: /\(/,
+                      end: /\)/,
+                      excludeBegin: true,
+                      excludeEnd: true,
+                      keywords: KEYWORDS$1,
+                      contains: PARAMS_CONTAINS
+                    }
+                  ]
+                }
+              ]
+            },
+            { // could be a comma delimited list of params to a function call
+              begin: /,/, relevance: 0
+            },
+            {
+              className: '',
+              begin: /\s/,
+              end: /\s*/,
+              skip: true
+            },
+            { // JSX
+              variants: [
+                { begin: FRAGMENT.begin, end: FRAGMENT.end },
+                {
+                  begin: XML_TAG.begin,
+                  // we carefully check the opening tag to see if it truly
+                  // is a tag and not a false positive
+                  'on:begin': XML_TAG.isTrulyOpeningTag,
+                  end: XML_TAG.end
+                }
+              ],
+              subLanguage: 'xml',
+              contains: [
+                {
+                  begin: XML_TAG.begin,
+                  end: XML_TAG.end,
+                  skip: true,
+                  contains: ['self']
+                }
+              ]
+            }
+          ],
+          relevance: 0
+        },
+        {
+          className: 'function',
+          beginKeywords: 'function',
+          end: /[{;]/,
+          excludeEnd: true,
+          keywords: KEYWORDS$1,
+          contains: [
+            'self',
+            hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE$1 }),
+            PARAMS
+          ],
+          illegal: /%/
+        },
+        {
+          // prevent this from getting swallowed up by function
+          // since they appear "function like"
+          beginKeywords: "while if switch catch for"
+        },
+        {
+          className: 'function',
+          // we have to count the parens to make sure we actually have the correct
+          // bounding ( ).  There could be any number of sub-expressions inside
+          // also surrounded by parens.
+          begin: hljs.UNDERSCORE_IDENT_RE +
+            '\\(' + // first parens
+            '[^()]*(\\(' +
+              '[^()]*(\\(' +
+                '[^()]*' +
+              '\\)[^()]*)*' +
+            '\\)[^()]*)*' +
+            '\\)\\s*\\{', // end parens
+          returnBegin:true,
+          contains: [
+            PARAMS,
+            hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE$1 }),
+          ]
+        },
+        // hack: prevents detection of keywords in some circumstances
+        // .keyword()
+        // $keyword = x
+        {
+          variants: [
+            { begin: '\\.' + IDENT_RE$1 },
+            { begin: '\\$' + IDENT_RE$1 }
+          ],
+          relevance: 0
+        },
+        { // ES6 class
+          className: 'class',
+          beginKeywords: 'class',
+          end: /[{;=]/,
+          excludeEnd: true,
+          illegal: /[:"[\]]/,
+          contains: [
+            { beginKeywords: 'extends' },
+            hljs.UNDERSCORE_TITLE_MODE
+          ]
+        },
+        {
+          begin: /\b(?=constructor)/,
+          end: /[{;]/,
+          excludeEnd: true,
+          contains: [
+            hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE$1 }),
+            'self',
+            PARAMS
+          ]
+        },
+        {
+          begin: '(get|set)\\s+(?=' + IDENT_RE$1 + '\\()',
+          end: /\{/,
+          keywords: "get set",
+          contains: [
+            hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE$1 }),
+            { begin: /\(\)/ }, // eat to avoid empty params
+            PARAMS
+          ]
+        },
+        {
+          begin: /\$[(.]/ // relevance booster for a pattern common to JS libs: `$(something)` and `$.something`
+        }
+      ]
+    };
+  }
+
+  /*
+  Language: TypeScript
+  Author: Panu Horsmalahti <panu.horsmalahti@iki.fi>
+  Contributors: Ike Ku <dempfi@yahoo.com>
+  Description: TypeScript is a strict superset of JavaScript
+  Website: https://www.typescriptlang.org
+  Category: common, scripting
+  */
+
+  /** @type LanguageFn */
+  function typescript(hljs) {
+    const IDENT_RE$1 = IDENT_RE;
+    const NAMESPACE = {
+      beginKeywords: 'namespace', end: /\{/, excludeEnd: true
+    };
+    const INTERFACE = {
+      beginKeywords: 'interface', end: /\{/, excludeEnd: true,
+      keywords: 'interface extends'
+    };
+    const USE_STRICT = {
+      className: 'meta',
+      relevance: 10,
+      begin: /^\s*['"]use strict['"]/
+    };
+    const TYPES = [
+      "any",
+      "void",
+      "number",
+      "boolean",
+      "string",
+      "object",
+      "never",
+      "enum"
+    ];
+    const TS_SPECIFIC_KEYWORDS = [
+      "type",
+      "namespace",
+      "typedef",
+      "interface",
+      "public",
+      "private",
+      "protected",
+      "implements",
+      "declare",
+      "abstract",
+      "readonly"
+    ];
+    const KEYWORDS$1 = {
+      $pattern: IDENT_RE,
+      keyword: KEYWORDS.concat(TS_SPECIFIC_KEYWORDS),
+      literal: LITERALS,
+      built_in: BUILT_INS.concat(TYPES)
+    };
+    const DECORATOR = {
+      className: 'meta',
+      begin: '@' + IDENT_RE$1,
+    };
+
+    const swapMode = (mode, label, replacement) => {
+      const indx = mode.contains.findIndex(m => m.label === label);
+      if (indx === -1) { throw new Error("can not find mode to replace"); }
+      mode.contains.splice(indx, 1, replacement);
+    };
+
+    const tsLanguage = javascript(hljs);
+
+    // this should update anywhere keywords is used since
+    // it will be the same actual JS object
+    Object.assign(tsLanguage.keywords, KEYWORDS$1);
+
+    tsLanguage.exports.PARAMS_CONTAINS.push(DECORATOR);
+    tsLanguage.contains = tsLanguage.contains.concat([
+      DECORATOR,
+      NAMESPACE,
+      INTERFACE,
+    ]);
+
+    // TS gets a simpler shebang rule than JS
+    swapMode(tsLanguage, "shebang", hljs.SHEBANG());
+    // JS use strict rule purposely excludes `asm` which makes no sense
+    swapMode(tsLanguage, "use_strict", USE_STRICT);
+
+    const functionDeclaration = tsLanguage.contains.find(m => m.className === "function");
+    functionDeclaration.relevance = 0; // () => {} is more typical in TypeScript
+
+    Object.assign(tsLanguage, {
+      name: 'TypeScript',
+      aliases: ['ts']
+    });
+
+    return tsLanguage;
+  }
+
+  return typescript;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('vbnet', function () {
+  'use strict';
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /**
+   * Any of the passed expresssions may match
+   *
+   * Creates a huge this | this | that | that match
+   * @param {(RegExp | string)[] } args
+   * @returns {string}
+   */
+  function either(...args) {
+    const joined = '(' + args.map((x) => source(x)).join("|") + ")";
+    return joined;
+  }
+
+  /*
+  Language: Visual Basic .NET
+  Description: Visual Basic .NET (VB.NET) is a multi-paradigm, object-oriented programming language, implemented on the .NET Framework.
+  Authors: Poren Chiang <ren.chiang@gmail.com>, Jan Pilzer
+  Website: https://docs.microsoft.com/dotnet/visual-basic/getting-started
+  Category: common
+  */
+
+  /** @type LanguageFn */
+  function vbnet(hljs) {
+    /**
+     * Character Literal
+     * Either a single character ("a"C) or an escaped double quote (""""C).
+     */
+    const CHARACTER = {
+      className: 'string',
+      begin: /"(""|[^/n])"C\b/
+    };
+
+    const STRING = {
+      className: 'string',
+      begin: /"/,
+      end: /"/,
+      illegal: /\n/,
+      contains: [
+        {
+          // double quote escape
+          begin: /""/
+        }
+      ]
+    };
+
+    /** Date Literals consist of a date, a time, or both separated by whitespace, surrounded by # */
+    const MM_DD_YYYY = /\d{1,2}\/\d{1,2}\/\d{4}/;
+    const YYYY_MM_DD = /\d{4}-\d{1,2}-\d{1,2}/;
+    const TIME_12H = /(\d|1[012])(:\d+){0,2} *(AM|PM)/;
+    const TIME_24H = /\d{1,2}(:\d{1,2}){1,2}/;
+    const DATE = {
+      className: 'literal',
+      variants: [
+        {
+          // #YYYY-MM-DD# (ISO-Date) or #M/D/YYYY# (US-Date)
+          begin: concat(/# */, either(YYYY_MM_DD, MM_DD_YYYY), / *#/)
+        },
+        {
+          // #H:mm[:ss]# (24h Time)
+          begin: concat(/# */, TIME_24H, / *#/)
+        },
+        {
+          // #h[:mm[:ss]] A# (12h Time)
+          begin: concat(/# */, TIME_12H, / *#/)
+        },
+        {
+          // date plus time
+          begin: concat(
+            /# */,
+            either(YYYY_MM_DD, MM_DD_YYYY),
+            / +/,
+            either(TIME_12H, TIME_24H),
+            / *#/
+          )
+        }
+      ]
+    };
+
+    const NUMBER = {
+      className: 'number',
+      relevance: 0,
+      variants: [
+        {
+          // Float
+          begin: /\b\d[\d_]*((\.[\d_]+(E[+-]?[\d_]+)?)|(E[+-]?[\d_]+))[RFD@!#]?/
+        },
+        {
+          // Integer (base 10)
+          begin: /\b\d[\d_]*((U?[SIL])|[%&])?/
+        },
+        {
+          // Integer (base 16)
+          begin: /&H[\dA-F_]+((U?[SIL])|[%&])?/
+        },
+        {
+          // Integer (base 8)
+          begin: /&O[0-7_]+((U?[SIL])|[%&])?/
+        },
+        {
+          // Integer (base 2)
+          begin: /&B[01_]+((U?[SIL])|[%&])?/
+        }
+      ]
+    };
+
+    const LABEL = {
+      className: 'label',
+      begin: /^\w+:/
+    };
+
+    const DOC_COMMENT = hljs.COMMENT(/'''/, /$/, {
+      contains: [
+        {
+          className: 'doctag',
+          begin: /<\/?/,
+          end: />/
+        }
+      ]
+    });
+
+    const COMMENT = hljs.COMMENT(null, /$/, {
+      variants: [
+        {
+          begin: /'/
+        },
+        {
+          // TODO: Use `beforeMatch:` for leading spaces
+          begin: /([\t ]|^)REM(?=\s)/
+        }
+      ]
+    });
+
+    const DIRECTIVES = {
+      className: 'meta',
+      // TODO: Use `beforeMatch:` for indentation once available
+      begin: /[\t ]*#(const|disable|else|elseif|enable|end|externalsource|if|region)\b/,
+      end: /$/,
+      keywords: {
+        'meta-keyword':
+          'const disable else elseif enable end externalsource if region then'
+      },
+      contains: [ COMMENT ]
+    };
+
+    return {
+      name: 'Visual Basic .NET',
+      aliases: [ 'vb' ],
+      case_insensitive: true,
+      classNameAliases: {
+        label: 'symbol'
+      },
+      keywords: {
+        keyword:
+          'addhandler alias aggregate ansi as async assembly auto binary by byref byval ' + /* a-b */
+          'call case catch class compare const continue custom declare default delegate dim distinct do ' + /* c-d */
+          'each equals else elseif end enum erase error event exit explicit finally for friend from function ' + /* e-f */
+          'get global goto group handles if implements imports in inherits interface into iterator ' + /* g-i */
+          'join key let lib loop me mid module mustinherit mustoverride mybase myclass ' + /* j-m */
+          'namespace narrowing new next notinheritable notoverridable ' + /* n */
+          'of off on operator option optional order overloads overridable overrides ' + /* o */
+          'paramarray partial preserve private property protected public ' + /* p */
+          'raiseevent readonly redim removehandler resume return ' + /* r */
+          'select set shadows shared skip static step stop structure strict sub synclock ' + /* s */
+          'take text then throw to try unicode until using when where while widening with withevents writeonly yield' /* t-y */,
+        built_in:
+          // Operators https://docs.microsoft.com/dotnet/visual-basic/language-reference/operators
+          'addressof and andalso await directcast gettype getxmlnamespace is isfalse isnot istrue like mod nameof new not or orelse trycast typeof xor ' +
+          // Type Conversion Functions https://docs.microsoft.com/dotnet/visual-basic/language-reference/functions/type-conversion-functions
+          'cbool cbyte cchar cdate cdbl cdec cint clng cobj csbyte cshort csng cstr cuint culng cushort',
+        type:
+          // Data types https://docs.microsoft.com/dotnet/visual-basic/language-reference/data-types
+          'boolean byte char date decimal double integer long object sbyte short single string uinteger ulong ushort',
+        literal: 'true false nothing'
+      },
+      illegal:
+        '//|\\{|\\}|endif|gosub|variant|wend|^\\$ ' /* reserved deprecated keywords */,
+      contains: [
+        CHARACTER,
+        STRING,
+        DATE,
+        NUMBER,
+        LABEL,
+        DOC_COMMENT,
+        COMMENT,
+        DIRECTIVES
+      ]
+    };
+  }
+
+  return vbnet;
+
+  return module.exports.definer || module.exports;
+
+}());
+
+hljs.registerLanguage('yaml', function () {
+  'use strict';
+
+  /*
+  Language: YAML
+  Description: Yet Another Markdown Language
+  Author: Stefan Wienert <stwienert@gmail.com>
+  Contributors: Carl Baxter <carl@cbax.tech>
+  Requires: ruby.js
+  Website: https://yaml.org
+  Category: common, config
+  */
+  function yaml(hljs) {
+    var LITERALS = 'true false yes no null';
+
+    // YAML spec allows non-reserved URI characters in tags.
+    var URI_CHARACTERS = '[\\w#;/?:@&=+$,.~*\'()[\\]]+';
+
+    // Define keys as starting with a word character
+    // ...containing word chars, spaces, colons, forward-slashes, hyphens and periods
+    // ...and ending with a colon followed immediately by a space, tab or newline.
+    // The YAML spec allows for much more than this, but this covers most use-cases.
+    var KEY = {
+      className: 'attr',
+      variants: [
+        { begin: '\\w[\\w :\\/.-]*:(?=[ \t]|$)' },
+        { begin: '"\\w[\\w :\\/.-]*":(?=[ \t]|$)' }, // double quoted keys
+        { begin: '\'\\w[\\w :\\/.-]*\':(?=[ \t]|$)' } // single quoted keys
+      ]
+    };
+
+    var TEMPLATE_VARIABLES = {
+      className: 'template-variable',
+      variants: [
+        { begin: /\{\{/, end: /\}\}/ }, // jinja templates Ansible
+        { begin: /%\{/, end: /\}/ } // Ruby i18n
+      ]
+    };
+    var STRING = {
+      className: 'string',
+      relevance: 0,
+      variants: [
+        { begin: /'/, end: /'/ },
+        { begin: /"/, end: /"/ },
+        { begin: /\S+/ }
+      ],
+      contains: [
+        hljs.BACKSLASH_ESCAPE,
+        TEMPLATE_VARIABLES
+      ]
+    };
+
+    // Strings inside of value containers (objects) can't contain braces,
+    // brackets, or commas
+    var CONTAINER_STRING = hljs.inherit(STRING, {
+      variants: [
+        { begin: /'/, end: /'/ },
+        { begin: /"/, end: /"/ },
+        { begin: /[^\s,{}[\]]+/ }
+      ]
+    });
+
+    var DATE_RE = '[0-9]{4}(-[0-9][0-9]){0,2}';
+    var TIME_RE = '([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?';
+    var FRACTION_RE = '(\\.[0-9]*)?';
+    var ZONE_RE = '([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?';
+    var TIMESTAMP = {
+      className: 'number',
+      begin: '\\b' + DATE_RE + TIME_RE + FRACTION_RE + ZONE_RE + '\\b'
+    };
+
+    var VALUE_CONTAINER = {
+      end: ',',
+      endsWithParent: true,
+      excludeEnd: true,
+      keywords: LITERALS,
+      relevance: 0
+    };
+    var OBJECT = {
+      begin: /\{/,
+      end: /\}/,
+      contains: [VALUE_CONTAINER],
+      illegal: '\\n',
+      relevance: 0
+    };
+    var ARRAY = {
+      begin: '\\[',
+      end: '\\]',
+      contains: [VALUE_CONTAINER],
+      illegal: '\\n',
+      relevance: 0
+    };
+
+    var MODES = [
+      KEY,
+      {
+        className: 'meta',
+        begin: '^---\\s*$',
+        relevance: 10
+      },
+      { // multi line string
+        // Blocks start with a | or > followed by a newline
+        //
+        // Indentation of subsequent lines must be the same to
+        // be considered part of the block
+        className: 'string',
+        begin: '[\\|>]([1-9]?[+-])?[ ]*\\n( +)[^ ][^\\n]*\\n(\\2[^\\n]+\\n?)*'
+      },
+      { // Ruby/Rails erb
+        begin: '<%[%=-]?',
+        end: '[%-]?%>',
+        subLanguage: 'ruby',
+        excludeBegin: true,
+        excludeEnd: true,
+        relevance: 0
+      },
+      { // named tags
+        className: 'type',
+        begin: '!\\w+!' + URI_CHARACTERS
+      },
+      // https://yaml.org/spec/1.2/spec.html#id2784064
+      { // verbatim tags
+        className: 'type',
+        begin: '!<' + URI_CHARACTERS + ">"
+      },
+      { // primary tags
+        className: 'type',
+        begin: '!' + URI_CHARACTERS
+      },
+      { // secondary tags
+        className: 'type',
+        begin: '!!' + URI_CHARACTERS
+      },
+      { // fragment id &ref
+        className: 'meta',
+        begin: '&' + hljs.UNDERSCORE_IDENT_RE + '$'
+      },
+      { // fragment reference *ref
+        className: 'meta',
+        begin: '\\*' + hljs.UNDERSCORE_IDENT_RE + '$'
+      },
+      { // array listing
+        className: 'bullet',
+        // TODO: remove |$ hack when we have proper look-ahead support
+        begin: '-(?=[ ]|$)',
+        relevance: 0
+      },
+      hljs.HASH_COMMENT_MODE,
+      {
+        beginKeywords: LITERALS,
+        keywords: { literal: LITERALS }
+      },
+      TIMESTAMP,
+      // numbers are any valid C-style number that
+      // sit isolated from other words
+      {
+        className: 'number',
+        begin: hljs.C_NUMBER_RE + '\\b',
+        relevance: 0
+      },
+      OBJECT,
+      ARRAY,
+      STRING
+    ];
+
+    var VALUE_MODES = [...MODES];
+    VALUE_MODES.pop();
+    VALUE_MODES.push(CONTAINER_STRING);
+    VALUE_CONTAINER.contains = VALUE_MODES;
+
+    return {
+      name: 'YAML',
+      case_insensitive: true,
+      aliases: ['yml', 'YAML'],
+      contains: MODES
+    };
+  }
+
+  return yaml;
+
+  return module.exports.definer || module.exports;
 
 }());
-if (typeof exports === 'object' && typeof module !== 'undefined') { module.exports = hljs; }
diff --git a/vendor/assets/javascripts/highlightjs/highlight.min.js b/vendor/assets/javascripts/highlightjs/highlight.min.js
index 261ae84b3e..4370be467d 100644
--- a/vendor/assets/javascripts/highlightjs/highlight.min.js
+++ b/vendor/assets/javascripts/highlightjs/highlight.min.js
@@ -1,6 +1,1326 @@
 /*
-  Highlight.js 10.2.1 (fc4910b5)
+  Highlight.js 10.6.0 (eb122d3b)
   License: BSD-3-Clause
   Copyright (c) 2006-2020, Ivan Sagalaev
 */
-var hljs=function(){"use strict";function e(n){Object.freeze(n);var t="function"==typeof n;return Object.getOwnPropertyNames(n).forEach((function(r){!Object.hasOwnProperty.call(n,r)||null===n[r]||"object"!=typeof n[r]&&"function"!=typeof n[r]||t&&("caller"===r||"callee"===r||"arguments"===r)||Object.isFrozen(n[r])||e(n[r])})),n}class n{constructor(e){void 0===e.data&&(e.data={}),this.data=e.data}ignoreMatch(){this.ignore=!0}}function t(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;")}function r(e,...n){var t={};for(const n in e)t[n]=e[n];return n.forEach((function(e){for(const n in e)t[n]=e[n]})),t}function a(e){return e.nodeName.toLowerCase()}var i=Object.freeze({__proto__:null,escapeHTML:t,inherit:r,nodeStream:function(e){var n=[];return function e(t,r){for(var i=t.firstChild;i;i=i.nextSibling)3===i.nodeType?r+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:r,node:i}),r=e(i,r),a(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:r,node:i}));return r}(e,0),n},mergeStreams:function(e,n,r){var i=0,s="",o=[];function l(){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){s+="<"+a(e)+[].map.call(e.attributes,(function(e){return" "+e.nodeName+'="'+t(e.value)+'"'})).join("")+">"}function u(e){s+="</"+a(e)+">"}function g(e){("start"===e.event?c:u)(e.node)}for(;e.length||n.length;){var d=l();if(s+=t(r.substring(i,d[0].offset)),i=d[0].offset,d===e){o.reverse().forEach(u);do{g(d.splice(0,1)[0]),d=l()}while(d===e&&d.length&&d[0].offset===i);o.reverse().forEach(c)}else"start"===d[0].event?o.push(d[0].node):o.pop(),g(d.splice(0,1)[0])}return s+t(r.substr(i))}});const s=e=>!!e.kind;class o{constructor(e,n){this.buffer="",this.classPrefix=n.classPrefix,e.walk(this)}addText(e){this.buffer+=t(e)}openNode(e){if(!s(e))return;let n=e.kind;e.sublanguage||(n=`${this.classPrefix}${n}`),this.span(n)}closeNode(e){s(e)&&(this.buffer+="</span>")}value(){return this.buffer}span(e){this.buffer+=`<span class="${e}">`}}class l{constructor(){this.rootNode={children:[]},this.stack=[this.rootNode]}get top(){return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){this.top.children.push(e)}openNode(e){const n={kind:e,children:[]};this.add(n),this.stack.push(n)}closeNode(){if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,n){return"string"==typeof n?e.addText(n):n.children&&(e.openNode(n),n.children.forEach(n=>this._walk(e,n)),e.closeNode(n)),e}static _collapse(e){"string"!=typeof e&&e.children&&(e.children.every(e=>"string"==typeof e)?e.children=[e.children.join("")]:e.children.forEach(e=>{l._collapse(e)}))}}class c extends l{constructor(e){super(),this.options=e}addKeyword(e,n){""!==e&&(this.openNode(n),this.addText(e),this.closeNode())}addText(e){""!==e&&this.add(e)}addSublanguage(e,n){const t=e.root;t.kind=n,t.sublanguage=!0,this.add(t)}toHTML(){return new o(this,this.options).value()}finalize(){return!0}}function u(e){return e?"string"==typeof e?e:e.source:null}const g="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",d={begin:"\\\\[\\s\\S]",relevance:0},h={className:"string",begin:"'",end:"'",illegal:"\\n",contains:[d]},f={className:"string",begin:'"',end:'"',illegal:"\\n",contains:[d]},p={begin:/\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/},m=function(e,n,t={}){var a=r({className:"comment",begin:e,end:n,contains:[]},t);return a.contains.push(p),a.contains.push({className:"doctag",begin:"(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):",relevance:0}),a},b=m("//","$"),v=m("/\\*","\\*/"),x=m("#","$");var E=Object.freeze({__proto__:null,IDENT_RE:"[a-zA-Z]\\w*",UNDERSCORE_IDENT_RE:"[a-zA-Z_]\\w*",NUMBER_RE:"\\b\\d+(\\.\\d+)?",C_NUMBER_RE:g,BINARY_NUMBER_RE:"\\b(0b[01]+)",RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",SHEBANG:(e={})=>{const n=/^#![ ]*\//;return e.binary&&(e.begin=function(...e){return e.map(e=>u(e)).join("")}(n,/.*\b/,e.binary,/\b.*/)),r({className:"meta",begin:n,end:/$/,relevance:0,"on:begin":(e,n)=>{0!==e.index&&n.ignoreMatch()}},e)},BACKSLASH_ESCAPE:d,APOS_STRING_MODE:h,QUOTE_STRING_MODE:f,PHRASAL_WORDS_MODE:p,COMMENT:m,C_LINE_COMMENT_MODE:b,C_BLOCK_COMMENT_MODE:v,HASH_COMMENT_MODE:x,NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?",relevance:0},C_NUMBER_MODE:{className:"number",begin:g,relevance:0},BINARY_NUMBER_MODE:{className:"number",begin:"\\b(0b[01]+)",relevance:0},CSS_NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?(%|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},REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{className:"regexp",begin:/\//,end:/\/[gimuy]*/,illegal:/\n/,contains:[d,{begin:/\[/,end:/\]/,relevance:0,contains:[d]}]}]},TITLE_MODE:{className:"title",begin:"[a-zA-Z]\\w*",relevance:0},UNDERSCORE_TITLE_MODE:{className:"title",begin:"[a-zA-Z_]\\w*",relevance:0},METHOD_GUARD:{begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},END_SAME_AS_BEGIN:function(e){return Object.assign(e,{"on:begin":(e,n)=>{n.data._beginMatch=e[1]},"on:end":(e,n)=>{n.data._beginMatch!==e[1]&&n.ignoreMatch()}})}}),_="of and for in not or if then".split(" ");function w(e,n){return n?Number(n):function(e){return _.includes(e.toLowerCase())}(e)?0:1}const N={props:["language","code","autodetect"],data:function(){return{detectedLanguage:"",unknownLanguage:!1}},computed:{className(){return this.unknownLanguage?"":"hljs "+this.detectedLanguage},highlighted(){if(!this.autoDetect&&!hljs.getLanguage(this.language))return console.warn(`The language "${this.language}" you specified could not be found.`),this.unknownLanguage=!0,t(this.code);let e;return this.autoDetect?(e=hljs.highlightAuto(this.code),this.detectedLanguage=e.language):(e=hljs.highlight(this.language,this.code,this.ignoreIllegals),this.detectectLanguage=this.language),e.value},autoDetect(){return!(this.language&&(e=this.autodetect,!e&&""!==e));var e},ignoreIllegals:()=>!0},render(e){return e("pre",{},[e("code",{class:this.className,domProps:{innerHTML:this.highlighted}})])}},y={install(e){e.component("highlightjs",N)}},R=t,k=r,{nodeStream:M,mergeStreams:O}=i,L=Symbol("nomatch");return function(t){var a=[],i=Object.create(null),s=Object.create(null),o=[],l=!0,g=/(^(<[^>]+>|\t|)+|\n)/gm,d="Could not find the language '{}', did you forget to load/include a language module?";const h={disableAutodetect:!0,name:"Plain text",contains:[]};var f={noHighlightRe:/^(no-?highlight)$/i,languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:null,__emitter:c};function p(e){return f.noHighlightRe.test(e)}function m(e,n,t,r){var a={code:n,language:e};j("before:highlight",a);var i=a.result?a.result:b(a.language,a.code,t,r);return i.code=a.code,j("after:highlight",i),i}function b(e,t,a,s){var o=t;function c(e,n){var t=E.case_insensitive?n[0].toLowerCase():n[0];return Object.prototype.hasOwnProperty.call(e.keywords,t)&&e.keywords[t]}function g(){null!=y.subLanguage?function(){if(""!==O){var e=null;if("string"==typeof y.subLanguage){if(!i[y.subLanguage])return void M.addText(O);e=b(y.subLanguage,O,!0,k[y.subLanguage]),k[y.subLanguage]=e.top}else e=v(O,y.subLanguage.length?y.subLanguage:null);y.relevance>0&&(I+=e.relevance),M.addSublanguage(e.emitter,e.language)}}():function(){if(!y.keywords)return void M.addText(O);let e=0;y.keywordPatternRe.lastIndex=0;let n=y.keywordPatternRe.exec(O),t="";for(;n;){t+=O.substring(e,n.index);const r=c(y,n);if(r){const[e,a]=r;M.addText(t),t="",I+=a,M.addKeyword(n[0],e)}else t+=n[0];e=y.keywordPatternRe.lastIndex,n=y.keywordPatternRe.exec(O)}t+=O.substr(e),M.addText(t)}(),O=""}function h(e){return e.className&&M.openNode(e.className),y=Object.create(e,{parent:{value:y}})}function p(e){return 0===y.matcher.regexIndex?(O+=e[0],1):(S=!0,0)}var m={};function x(t,r){var i=r&&r[0];if(O+=t,null==i)return g(),0;if("begin"===m.type&&"end"===r.type&&m.index===r.index&&""===i){if(O+=o.slice(r.index,r.index+1),!l){const n=Error("0 width match regex");throw n.languageName=e,n.badRule=m.rule,n}return 1}if(m=r,"begin"===r.type)return function(e){var t=e[0],r=e.rule;const a=new n(r),i=[r.__beforeBegin,r["on:begin"]];for(const n of i)if(n&&(n(e,a),a.ignore))return p(t);return r&&r.endSameAsBegin&&(r.endRe=RegExp(t.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")),r.skip?O+=t:(r.excludeBegin&&(O+=t),g(),r.returnBegin||r.excludeBegin||(O=t)),h(r),r.returnBegin?0:t.length}(r);if("illegal"===r.type&&!a){const e=Error('Illegal lexeme "'+i+'" for mode "'+(y.className||"<unnamed>")+'"');throw e.mode=y,e}if("end"===r.type){var s=function(e){var t=e[0],r=o.substr(e.index),a=function e(t,r,a){let i=function(e,n){var t=e&&e.exec(n);return t&&0===t.index}(t.endRe,a);if(i){if(t["on:end"]){const e=new n(t);t["on:end"](r,e),e.ignore&&(i=!1)}if(i){for(;t.endsParent&&t.parent;)t=t.parent;return t}}if(t.endsWithParent)return e(t.parent,r,a)}(y,e,r);if(!a)return L;var i=y;i.skip?O+=t:(i.returnEnd||i.excludeEnd||(O+=t),g(),i.excludeEnd&&(O=t));do{y.className&&M.closeNode(),y.skip||y.subLanguage||(I+=y.relevance),y=y.parent}while(y!==a.parent);return a.starts&&(a.endSameAsBegin&&(a.starts.endRe=a.endRe),h(a.starts)),i.returnEnd?0:t.length}(r);if(s!==L)return s}if("illegal"===r.type&&""===i)return 1;if(j>1e5&&j>3*r.index)throw Error("potential infinite loop, way more iterations than matches");return O+=i,i.length}var E=A(e);if(!E)throw console.error(d.replace("{}",e)),Error('Unknown language: "'+e+'"');var _=function(e){function n(n,t){return RegExp(u(n),"m"+(e.case_insensitive?"i":"")+(t?"g":""))}class t{constructor(){this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}addRule(e,n){n.position=this.position++,this.matchIndexes[this.matchAt]=n,this.regexes.push([n,e]),this.matchAt+=function(e){return RegExp(e.toString()+"|").exec("").length-1}(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null);const e=this.regexes.map(e=>e[1]);this.matcherRe=n(function(e,n="|"){for(var t=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./,r=0,a="",i=0;i<e.length;i++){var s=r+=1,o=u(e[i]);for(i>0&&(a+=n),a+="(";o.length>0;){var l=t.exec(o);if(null==l){a+=o;break}a+=o.substring(0,l.index),o=o.substring(l.index+l[0].length),"\\"===l[0][0]&&l[1]?a+="\\"+(Number(l[1])+s):(a+=l[0],"("===l[0]&&r++)}a+=")"}return a}(e),!0),this.lastIndex=0}exec(e){this.matcherRe.lastIndex=this.lastIndex;const n=this.matcherRe.exec(e);if(!n)return null;const t=n.findIndex((e,n)=>n>0&&void 0!==e),r=this.matchIndexes[t];return n.splice(0,t),Object.assign(n,r)}}class a{constructor(){this.rules=[],this.multiRegexes=[],this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){if(this.multiRegexes[e])return this.multiRegexes[e];const n=new t;return this.rules.slice(e).forEach(([e,t])=>n.addRule(e,t)),n.compile(),this.multiRegexes[e]=n,n}resumingScanAtSamePosition(){return 0!==this.regexIndex}considerAll(){this.regexIndex=0}addRule(e,n){this.rules.push([e,n]),"begin"===n.type&&this.count++}exec(e){const n=this.getMatcher(this.regexIndex);n.lastIndex=this.lastIndex;let t=n.exec(e);if(this.resumingScanAtSamePosition())if(t&&t.index===this.lastIndex);else{const n=this.getMatcher(0);n.lastIndex=this.lastIndex+1,t=n.exec(e)}return t&&(this.regexIndex+=t.position+1,this.regexIndex===this.count&&this.considerAll()),t}}function i(e,n){const t=e.input[e.index-1],r=e.input[e.index+e[0].length];"."!==t&&"."!==r||n.ignoreMatch()}if(e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");return function t(s,o){const l=s;if(s.compiled)return l;s.compiled=!0,s.__beforeBegin=null,s.keywords=s.keywords||s.beginKeywords;let c=null;if("object"==typeof s.keywords&&(c=s.keywords.$pattern,delete s.keywords.$pattern),s.keywords&&(s.keywords=function(e,n){var t={};return"string"==typeof e?r("keyword",e):Object.keys(e).forEach((function(n){r(n,e[n])})),t;function r(e,r){n&&(r=r.toLowerCase()),r.split(" ").forEach((function(n){var r=n.split("|");t[r[0]]=[e,w(r[0],r[1])]}))}}(s.keywords,e.case_insensitive)),s.lexemes&&c)throw Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ");return l.keywordPatternRe=n(s.lexemes||c||/\w+/,!0),o&&(s.beginKeywords&&(s.begin="\\b("+s.beginKeywords.split(" ").join("|")+")(?=\\b|\\s)",s.__beforeBegin=i),s.begin||(s.begin=/\B|\b/),l.beginRe=n(s.begin),s.endSameAsBegin&&(s.end=s.begin),s.end||s.endsWithParent||(s.end=/\B|\b/),s.end&&(l.endRe=n(s.end)),l.terminator_end=u(s.end)||"",s.endsWithParent&&o.terminator_end&&(l.terminator_end+=(s.end?"|":"")+o.terminator_end)),s.illegal&&(l.illegalRe=n(s.illegal)),void 0===s.relevance&&(s.relevance=1),s.contains||(s.contains=[]),s.contains=[].concat(...s.contains.map((function(e){return function(e){return e.variants&&!e.cached_variants&&(e.cached_variants=e.variants.map((function(n){return r(e,{variants:null},n)}))),e.cached_variants?e.cached_variants:function e(n){return!!n&&(n.endsWithParent||e(n.starts))}(e)?r(e,{starts:e.starts?r(e.starts):null}):Object.isFrozen(e)?r(e):e}("self"===e?s:e)}))),s.contains.forEach((function(e){t(e,l)})),s.starts&&t(s.starts,o),l.matcher=function(e){const n=new a;return e.contains.forEach(e=>n.addRule(e.begin,{rule:e,type:"begin"})),e.terminator_end&&n.addRule(e.terminator_end,{type:"end"}),e.illegal&&n.addRule(e.illegal,{type:"illegal"}),n}(l),l}(e)}(E),N="",y=s||_,k={},M=new f.__emitter(f);!function(){for(var e=[],n=y;n!==E;n=n.parent)n.className&&e.unshift(n.className);e.forEach(e=>M.openNode(e))}();var O="",I=0,T=0,j=0,S=!1;try{for(y.matcher.considerAll();;){j++,S?S=!1:y.matcher.considerAll(),y.matcher.lastIndex=T;const e=y.matcher.exec(o);if(!e)break;const n=x(o.substring(T,e.index),e);T=e.index+n}return x(o.substr(T)),M.closeAllNodes(),M.finalize(),N=M.toHTML(),{relevance:I,value:N,language:e,illegal:!1,emitter:M,top:y}}catch(n){if(n.message&&n.message.includes("Illegal"))return{illegal:!0,illegalBy:{msg:n.message,context:o.slice(T-100,T+100),mode:n.mode},sofar:N,relevance:0,value:R(o),emitter:M};if(l)return{illegal:!1,relevance:0,value:R(o),emitter:M,language:e,top:y,errorRaised:n};throw n}}function v(e,n){n=n||f.languages||Object.keys(i);var t=function(e){const n={relevance:0,emitter:new f.__emitter(f),value:R(e),illegal:!1,top:h};return n.emitter.addText(e),n}(e),r=t;return n.filter(A).filter(T).forEach((function(n){var a=b(n,e,!1);a.language=n,a.relevance>r.relevance&&(r=a),a.relevance>t.relevance&&(r=t,t=a)})),r.language&&(t.second_best=r),t}function x(e){return f.tabReplace||f.useBR?e.replace(g,e=>"\n"===e?f.useBR?"<br>":e:f.tabReplace?e.replace(/\t/g,f.tabReplace):e):e}function _(e){let n=null;const t=function(e){var n=e.className+" ";n+=e.parentNode?e.parentNode.className:"";const t=f.languageDetectRe.exec(n);if(t){var r=A(t[1]);return r||(console.warn(d.replace("{}",t[1])),console.warn("Falling back to no-highlight mode for this block.",e)),r?t[1]:"no-highlight"}return n.split(/\s+/).find(e=>p(e)||A(e))}(e);if(p(t))return;j("before:highlightBlock",{block:e,language:t}),f.useBR?(n=document.createElement("div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ /]*>/g,"\n")):n=e;const r=n.textContent,a=t?m(t,r,!0):v(r),i=M(n);if(i.length){const e=document.createElement("div");e.innerHTML=a.value,a.value=O(i,M(e),r)}a.value=x(a.value),j("after:highlightBlock",{block:e,result:a}),e.innerHTML=a.value,e.className=function(e,n,t){var r=n?s[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),e.includes(r)||a.push(r),a.join(" ").trim()}(e.className,t,a.language),e.result={language:a.language,re:a.relevance,relavance:a.relevance},a.second_best&&(e.second_best={language:a.second_best.language,re:a.second_best.relevance,relavance:a.second_best.relevance})}const N=()=>{if(!N.called){N.called=!0;var e=document.querySelectorAll("pre code");a.forEach.call(e,_)}};function A(e){return e=(e||"").toLowerCase(),i[e]||i[s[e]]}function I(e,{languageName:n}){"string"==typeof e&&(e=[e]),e.forEach(e=>{s[e]=n})}function T(e){var n=A(e);return n&&!n.disableAutodetect}function j(e,n){var t=e;o.forEach((function(e){e[t]&&e[t](n)}))}Object.assign(t,{highlight:m,highlightAuto:v,fixMarkup:function(e){return console.warn("fixMarkup is deprecated and will be removed entirely in v11.0"),console.warn("Please see https://github.com/highlightjs/highlight.js/issues/2534"),x(e)},highlightBlock:_,configure:function(e){f=k(f,e)},initHighlighting:N,initHighlightingOnLoad:function(){window.addEventListener("DOMContentLoaded",N,!1)},registerLanguage:function(e,n){var r=null;try{r=n(t)}catch(n){if(console.error("Language definition for '{}' could not be registered.".replace("{}",e)),!l)throw n;console.error(n),r=h}r.name||(r.name=e),i[e]=r,r.rawDefinition=n.bind(null,t),r.aliases&&I(r.aliases,{languageName:e})},listLanguages:function(){return Object.keys(i)},getLanguage:A,registerAliases:I,requireLanguage:function(e){var n=A(e);if(n)return n;throw Error("The '{}' language is required, but not loaded.".replace("{}",e))},autoDetection:T,inherit:k,addPlugin:function(e){o.push(e)},vuePlugin:y}),t.debugMode=function(){l=!1},t.safeMode=function(){l=!0},t.versionString="10.2.1";for(const n in E)"object"==typeof E[n]&&e(E[n]);return Object.assign(t,E),t}({})}();"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);
\ No newline at end of file
+var hljs=function(){"use strict";function e(t){
+return t instanceof Map?t.clear=t.delete=t.set=()=>{
+throw Error("map is read-only")}:t instanceof Set&&(t.add=t.clear=t.delete=()=>{
+throw Error("set is read-only")
+}),Object.freeze(t),Object.getOwnPropertyNames(t).forEach((n=>{var s=t[n]
+;"object"!=typeof s||Object.isFrozen(s)||e(s)})),t}var t=e,n=e;t.default=n
+;class s{constructor(e){void 0===e.data&&(e.data={}),this.data=e.data}
+ignoreMatch(){this.ignore=!0}}function r(e){
+return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;")
+}function a(e,...t){const n=Object.create(null);for(const t in e)n[t]=e[t]
+;return t.forEach((e=>{for(const t in e)n[t]=e[t]})),n}const i=e=>!!e.kind
+;class o{constructor(e,t){
+this.buffer="",this.classPrefix=t.classPrefix,e.walk(this)}addText(e){
+this.buffer+=r(e)}openNode(e){if(!i(e))return;let t=e.kind
+;e.sublanguage||(t=`${this.classPrefix}${t}`),this.span(t)}closeNode(e){
+i(e)&&(this.buffer+="</span>")}value(){return this.buffer}span(e){
+this.buffer+=`<span class="${e}">`}}class l{constructor(){this.rootNode={
+children:[]},this.stack=[this.rootNode]}get top(){
+return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){
+this.top.children.push(e)}openNode(e){const t={kind:e,children:[]}
+;this.add(t),this.stack.push(t)}closeNode(){
+if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){
+for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}
+walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,t){
+return"string"==typeof t?e.addText(t):t.children&&(e.openNode(t),
+t.children.forEach((t=>this._walk(e,t))),e.closeNode(t)),e}static _collapse(e){
+"string"!=typeof e&&e.children&&(e.children.every((e=>"string"==typeof e))?e.children=[e.children.join("")]:e.children.forEach((e=>{
+l._collapse(e)})))}}class c extends l{constructor(e){super(),this.options=e}
+addKeyword(e,t){""!==e&&(this.openNode(t),this.addText(e),this.closeNode())}
+addText(e){""!==e&&this.add(e)}addSublanguage(e,t){const n=e.root
+;n.kind=t,n.sublanguage=!0,this.add(n)}toHTML(){
+return new o(this,this.options).value()}finalize(){return!0}}function u(e){
+return e?"string"==typeof e?e:e.source:null}
+const g="[a-zA-Z]\\w*",d="[a-zA-Z_]\\w*",h="\\b\\d+(\\.\\d+)?",f="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",p="\\b(0b[01]+)",m={
+begin:"\\\\[\\s\\S]",relevance:0},b={className:"string",begin:"'",end:"'",
+illegal:"\\n",contains:[m]},x={className:"string",begin:'"',end:'"',
+illegal:"\\n",contains:[m]},E={
+begin:/\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/
+},v=(e,t,n={})=>{const s=a({className:"comment",begin:e,end:t,contains:[]},n)
+;return s.contains.push(E),s.contains.push({className:"doctag",
+begin:"(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):",relevance:0}),s
+},w=v("//","$"),N=v("/\\*","\\*/"),y=v("#","$");var R=Object.freeze({
+__proto__:null,MATCH_NOTHING_RE:/\b\B/,IDENT_RE:g,UNDERSCORE_IDENT_RE:d,
+NUMBER_RE:h,C_NUMBER_RE:f,BINARY_NUMBER_RE:p,
+RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",
+SHEBANG:(e={})=>{const t=/^#![ ]*\//
+;return e.binary&&(e.begin=((...e)=>e.map((e=>u(e))).join(""))(t,/.*\b/,e.binary,/\b.*/)),
+a({className:"meta",begin:t,end:/$/,relevance:0,"on:begin":(e,t)=>{
+0!==e.index&&t.ignoreMatch()}},e)},BACKSLASH_ESCAPE:m,APOS_STRING_MODE:b,
+QUOTE_STRING_MODE:x,PHRASAL_WORDS_MODE:E,COMMENT:v,C_LINE_COMMENT_MODE:w,
+C_BLOCK_COMMENT_MODE:N,HASH_COMMENT_MODE:y,NUMBER_MODE:{className:"number",
+begin:h,relevance:0},C_NUMBER_MODE:{className:"number",begin:f,relevance:0},
+BINARY_NUMBER_MODE:{className:"number",begin:p,relevance:0},CSS_NUMBER_MODE:{
+className:"number",
+begin:h+"(%|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},REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{className:"regexp",
+begin:/\//,end:/\/[gimuy]*/,illegal:/\n/,contains:[m,{begin:/\[/,end:/\]/,
+relevance:0,contains:[m]}]}]},TITLE_MODE:{className:"title",begin:g,relevance:0
+},UNDERSCORE_TITLE_MODE:{className:"title",begin:d,relevance:0},METHOD_GUARD:{
+begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},END_SAME_AS_BEGIN:e=>Object.assign(e,{
+"on:begin":(e,t)=>{t.data._beginMatch=e[1]},"on:end":(e,t)=>{
+t.data._beginMatch!==e[1]&&t.ignoreMatch()}})});function _(e,t){
+"."===e.input[e.index-1]&&t.ignoreMatch()}function k(e,t){
+t&&e.beginKeywords&&(e.begin="\\b("+e.beginKeywords.split(" ").join("|")+")(?!\\.)(?=\\b|\\s)",
+e.__beforeBegin=_,e.keywords=e.keywords||e.beginKeywords,delete e.beginKeywords,
+void 0===e.relevance&&(e.relevance=0))}function O(e,t){
+Array.isArray(e.illegal)&&(e.illegal=((...e)=>"("+e.map((e=>u(e))).join("|")+")")(...e.illegal))
+}function M(e,t){if(e.match){
+if(e.begin||e.end)throw Error("begin & end are not supported with match")
+;e.begin=e.match,delete e.match}}function A(e,t){
+void 0===e.relevance&&(e.relevance=1)}
+const L=["of","and","for","in","not","or","if","then","parent","list","value"]
+;function B(e,t,n="keyword"){const s={}
+;return"string"==typeof e?r(n,e.split(" ")):Array.isArray(e)?r(n,e):Object.keys(e).forEach((n=>{
+Object.assign(s,B(e[n],t,n))})),s;function r(e,n){
+t&&(n=n.map((e=>e.toLowerCase()))),n.forEach((t=>{const n=t.split("|")
+;s[n[0]]=[e,I(n[0],n[1])]}))}}function I(e,t){
+return t?Number(t):(e=>L.includes(e.toLowerCase()))(e)?0:1}
+function T(e,{plugins:t}){function n(t,n){
+return RegExp(u(t),"m"+(e.case_insensitive?"i":"")+(n?"g":""))}class s{
+constructor(){
+this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}
+addRule(e,t){
+t.position=this.position++,this.matchIndexes[this.matchAt]=t,this.regexes.push([t,e]),
+this.matchAt+=(e=>RegExp(e.toString()+"|").exec("").length-1)(e)+1}compile(){
+0===this.regexes.length&&(this.exec=()=>null)
+;const e=this.regexes.map((e=>e[1]));this.matcherRe=n(((e,t="|")=>{
+const n=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./;let s=0,r=""
+;for(let a=0;a<e.length;a++){s+=1;const i=s;let o=u(e[a])
+;for(a>0&&(r+=t),r+="(";o.length>0;){const e=n.exec(o);if(null==e){r+=o;break}
+r+=o.substring(0,e.index),
+o=o.substring(e.index+e[0].length),"\\"===e[0][0]&&e[1]?r+="\\"+(Number(e[1])+i):(r+=e[0],
+"("===e[0]&&s++)}r+=")"}return r})(e),!0),this.lastIndex=0}exec(e){
+this.matcherRe.lastIndex=this.lastIndex;const t=this.matcherRe.exec(e)
+;if(!t)return null
+;const n=t.findIndex(((e,t)=>t>0&&void 0!==e)),s=this.matchIndexes[n]
+;return t.splice(0,n),Object.assign(t,s)}}class r{constructor(){
+this.rules=[],this.multiRegexes=[],
+this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){
+if(this.multiRegexes[e])return this.multiRegexes[e];const t=new s
+;return this.rules.slice(e).forEach((([e,n])=>t.addRule(e,n))),
+t.compile(),this.multiRegexes[e]=t,t}resumingScanAtSamePosition(){
+return 0!==this.regexIndex}considerAll(){this.regexIndex=0}addRule(e,t){
+this.rules.push([e,t]),"begin"===t.type&&this.count++}exec(e){
+const t=this.getMatcher(this.regexIndex);t.lastIndex=this.lastIndex
+;let n=t.exec(e)
+;if(this.resumingScanAtSamePosition())if(n&&n.index===this.lastIndex);else{
+const t=this.getMatcher(0);t.lastIndex=this.lastIndex+1,n=t.exec(e)}
+return n&&(this.regexIndex+=n.position+1,
+this.regexIndex===this.count&&this.considerAll()),n}}
+if(e.compilerExtensions||(e.compilerExtensions=[]),
+e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.")
+;return e.classNameAliases=a(e.classNameAliases||{}),function t(s,i){const o=s
+;if(s.compiled)return o
+;[M].forEach((e=>e(s,i))),e.compilerExtensions.forEach((e=>e(s,i))),
+s.__beforeBegin=null,[k,O,A].forEach((e=>e(s,i))),s.compiled=!0;let l=null
+;if("object"==typeof s.keywords&&(l=s.keywords.$pattern,
+delete s.keywords.$pattern),
+s.keywords&&(s.keywords=B(s.keywords,e.case_insensitive)),
+s.lexemes&&l)throw Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ")
+;return l=l||s.lexemes||/\w+/,
+o.keywordPatternRe=n(l,!0),i&&(s.begin||(s.begin=/\B|\b/),
+o.beginRe=n(s.begin),s.endSameAsBegin&&(s.end=s.begin),
+s.end||s.endsWithParent||(s.end=/\B|\b/),
+s.end&&(o.endRe=n(s.end)),o.terminatorEnd=u(s.end)||"",
+s.endsWithParent&&i.terminatorEnd&&(o.terminatorEnd+=(s.end?"|":"")+i.terminatorEnd)),
+s.illegal&&(o.illegalRe=n(s.illegal)),
+s.contains||(s.contains=[]),s.contains=[].concat(...s.contains.map((e=>(e=>(e.variants&&!e.cachedVariants&&(e.cachedVariants=e.variants.map((t=>a(e,{
+variants:null},t)))),e.cachedVariants?e.cachedVariants:j(e)?a(e,{
+starts:e.starts?a(e.starts):null
+}):Object.isFrozen(e)?a(e):e))("self"===e?s:e)))),s.contains.forEach((e=>{t(e,o)
+})),s.starts&&t(s.starts,i),o.matcher=(e=>{const t=new r
+;return e.contains.forEach((e=>t.addRule(e.begin,{rule:e,type:"begin"
+}))),e.terminatorEnd&&t.addRule(e.terminatorEnd,{type:"end"
+}),e.illegal&&t.addRule(e.illegal,{type:"illegal"}),t})(o),o}(e)}function j(e){
+return!!e&&(e.endsWithParent||j(e.starts))}function S(e){const t={
+props:["language","code","autodetect"],data:()=>({detectedLanguage:"",
+unknownLanguage:!1}),computed:{className(){
+return this.unknownLanguage?"":"hljs "+this.detectedLanguage},highlighted(){
+if(!this.autoDetect&&!e.getLanguage(this.language))return console.warn(`The language "${this.language}" you specified could not be found.`),
+this.unknownLanguage=!0,r(this.code);let t={}
+;return this.autoDetect?(t=e.highlightAuto(this.code),
+this.detectedLanguage=t.language):(t=e.highlight(this.language,this.code,this.ignoreIllegals),
+this.detectedLanguage=this.language),t.value},autoDetect(){
+return!(this.language&&(e=this.autodetect,!e&&""!==e));var e},
+ignoreIllegals:()=>!0},render(e){return e("pre",{},[e("code",{
+class:this.className,domProps:{innerHTML:this.highlighted}})])}};return{
+Component:t,VuePlugin:{install(e){e.component("highlightjs",t)}}}}const P={
+"after:highlightBlock":({block:e,result:t,text:n})=>{const s=C(e)
+;if(!s.length)return;const a=document.createElement("div")
+;a.innerHTML=t.value,t.value=((e,t,n)=>{let s=0,a="";const i=[];function o(){
+return e.length&&t.length?e[0].offset!==t[0].offset?e[0].offset<t[0].offset?e:t:"start"===t[0].event?e:t:e.length?e:t
+}function l(e){a+="<"+D(e)+[].map.call(e.attributes,(function(e){
+return" "+e.nodeName+'="'+r(e.value)+'"'})).join("")+">"}function c(e){
+a+="</"+D(e)+">"}function u(e){("start"===e.event?l:c)(e.node)}
+for(;e.length||t.length;){let t=o()
+;if(a+=r(n.substring(s,t[0].offset)),s=t[0].offset,t===e){i.reverse().forEach(c)
+;do{u(t.splice(0,1)[0]),t=o()}while(t===e&&t.length&&t[0].offset===s)
+;i.reverse().forEach(l)
+}else"start"===t[0].event?i.push(t[0].node):i.pop(),u(t.splice(0,1)[0])}
+return a+r(n.substr(s))})(s,C(a),n)}};function D(e){
+return e.nodeName.toLowerCase()}function C(e){const t=[];return function e(n,s){
+for(let r=n.firstChild;r;r=r.nextSibling)3===r.nodeType?s+=r.nodeValue.length:1===r.nodeType&&(t.push({
+event:"start",offset:s,node:r}),s=e(r,s),D(r).match(/br|hr|img|input/)||t.push({
+event:"stop",offset:s,node:r}));return s}(e,0),t}const H=e=>{console.error(e)
+},U=(e,...t)=>{console.log("WARN: "+e,...t)},$=(e,t)=>{
+console.log(`Deprecated as of ${e}. ${t}`)},z=r,K=a,G=Symbol("nomatch")
+;return(e=>{const n=Object.create(null),r=Object.create(null),a=[];let i=!0
+;const o=/(^(<[^>]+>|\t|)+|\n)/gm,l="Could not find the language '{}', did you forget to load/include a language module?",u={
+disableAutodetect:!0,name:"Plain text",contains:[]};let g={
+noHighlightRe:/^(no-?highlight)$/i,
+languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",
+tabReplace:null,useBR:!1,languages:null,__emitter:c};function d(e){
+return g.noHighlightRe.test(e)}function h(e,t,n,s){const r={code:t,language:e}
+;M("before:highlight",r);const a=r.result?r.result:f(r.language,r.code,n,s)
+;return a.code=r.code,M("after:highlight",a),a}function f(e,t,r,o){const c=t
+;function u(e,t){const n=w.case_insensitive?t[0].toLowerCase():t[0]
+;return Object.prototype.hasOwnProperty.call(e.keywords,n)&&e.keywords[n]}
+function d(){null!=R.subLanguage?(()=>{if(""===M)return;let e=null
+;if("string"==typeof R.subLanguage){
+if(!n[R.subLanguage])return void O.addText(M)
+;e=f(R.subLanguage,M,!0,k[R.subLanguage]),k[R.subLanguage]=e.top
+}else e=p(M,R.subLanguage.length?R.subLanguage:null)
+;R.relevance>0&&(A+=e.relevance),O.addSublanguage(e.emitter,e.language)
+})():(()=>{if(!R.keywords)return void O.addText(M);let e=0
+;R.keywordPatternRe.lastIndex=0;let t=R.keywordPatternRe.exec(M),n="";for(;t;){
+n+=M.substring(e,t.index);const s=u(R,t);if(s){const[e,r]=s
+;O.addText(n),n="",A+=r;const a=w.classNameAliases[e]||e;O.addKeyword(t[0],a)
+}else n+=t[0];e=R.keywordPatternRe.lastIndex,t=R.keywordPatternRe.exec(M)}
+n+=M.substr(e),O.addText(n)})(),M=""}function h(e){
+return e.className&&O.openNode(w.classNameAliases[e.className]||e.className),
+R=Object.create(e,{parent:{value:R}}),R}function m(e,t,n){let r=((e,t)=>{
+const n=e&&e.exec(t);return n&&0===n.index})(e.endRe,n);if(r){if(e["on:end"]){
+const n=new s(e);e["on:end"](t,n),n.ignore&&(r=!1)}if(r){
+for(;e.endsParent&&e.parent;)e=e.parent;return e}}
+if(e.endsWithParent)return m(e.parent,t,n)}function b(e){
+return 0===R.matcher.regexIndex?(M+=e[0],1):(I=!0,0)}function x(e){
+const t=e[0],n=c.substr(e.index),s=m(R,e,n);if(!s)return G;const r=R
+;r.skip?M+=t:(r.returnEnd||r.excludeEnd||(M+=t),d(),r.excludeEnd&&(M=t));do{
+R.className&&O.closeNode(),R.skip||R.subLanguage||(A+=R.relevance),R=R.parent
+}while(R!==s.parent)
+;return s.starts&&(s.endSameAsBegin&&(s.starts.endRe=s.endRe),
+h(s.starts)),r.returnEnd?0:t.length}let E={};function v(t,n){const a=n&&n[0]
+;if(M+=t,null==a)return d(),0
+;if("begin"===E.type&&"end"===n.type&&E.index===n.index&&""===a){
+if(M+=c.slice(n.index,n.index+1),!i){const t=Error("0 width match regex")
+;throw t.languageName=e,t.badRule=E.rule,t}return 1}
+if(E=n,"begin"===n.type)return function(e){
+const t=e[0],n=e.rule,r=new s(n),a=[n.__beforeBegin,n["on:begin"]]
+;for(const n of a)if(n&&(n(e,r),r.ignore))return b(t)
+;return n&&n.endSameAsBegin&&(n.endRe=RegExp(t.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")),
+n.skip?M+=t:(n.excludeBegin&&(M+=t),
+d(),n.returnBegin||n.excludeBegin||(M=t)),h(n),n.returnBegin?0:t.length}(n)
+;if("illegal"===n.type&&!r){
+const e=Error('Illegal lexeme "'+a+'" for mode "'+(R.className||"<unnamed>")+'"')
+;throw e.mode=R,e}if("end"===n.type){const e=x(n);if(e!==G)return e}
+if("illegal"===n.type&&""===a)return 1
+;if(B>1e5&&B>3*n.index)throw Error("potential infinite loop, way more iterations than matches")
+;return M+=a,a.length}const w=_(e)
+;if(!w)throw H(l.replace("{}",e)),Error('Unknown language: "'+e+'"')
+;const N=T(w,{plugins:a});let y="",R=o||N;const k={},O=new g.__emitter(g);(()=>{
+const e=[];for(let t=R;t!==w;t=t.parent)t.className&&e.unshift(t.className)
+;e.forEach((e=>O.openNode(e)))})();let M="",A=0,L=0,B=0,I=!1;try{
+for(R.matcher.considerAll();;){
+B++,I?I=!1:R.matcher.considerAll(),R.matcher.lastIndex=L
+;const e=R.matcher.exec(c);if(!e)break;const t=v(c.substring(L,e.index),e)
+;L=e.index+t}return v(c.substr(L)),O.closeAllNodes(),O.finalize(),y=O.toHTML(),{
+relevance:Math.floor(A),value:y,language:e,illegal:!1,emitter:O,top:R}}catch(t){
+if(t.message&&t.message.includes("Illegal"))return{illegal:!0,illegalBy:{
+msg:t.message,context:c.slice(L-100,L+100),mode:t.mode},sofar:y,relevance:0,
+value:z(c),emitter:O};if(i)return{illegal:!1,relevance:0,value:z(c),emitter:O,
+language:e,top:R,errorRaised:t};throw t}}function p(e,t){
+t=t||g.languages||Object.keys(n);const s=(e=>{const t={relevance:0,
+emitter:new g.__emitter(g),value:z(e),illegal:!1,top:u}
+;return t.emitter.addText(e),t})(e),r=t.filter(_).filter(O).map((t=>f(t,e,!1)))
+;r.unshift(s);const a=r.sort(((e,t)=>{
+if(e.relevance!==t.relevance)return t.relevance-e.relevance
+;if(e.language&&t.language){if(_(e.language).supersetOf===t.language)return 1
+;if(_(t.language).supersetOf===e.language)return-1}return 0})),[i,o]=a,l=i
+;return l.second_best=o,l}const m={"before:highlightBlock":({block:e})=>{
+g.useBR&&(e.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ /]*>/g,"\n"))
+},"after:highlightBlock":({result:e})=>{
+g.useBR&&(e.value=e.value.replace(/\n/g,"<br>"))}},b=/^(<[^>]+>|\t)+/gm,x={
+"after:highlightBlock":({result:e})=>{
+g.tabReplace&&(e.value=e.value.replace(b,(e=>e.replace(/\t/g,g.tabReplace))))}}
+;function E(e){let t=null;const n=(e=>{let t=e.className+" "
+;t+=e.parentNode?e.parentNode.className:"";const n=g.languageDetectRe.exec(t)
+;if(n){const t=_(n[1])
+;return t||(U(l.replace("{}",n[1])),U("Falling back to no-highlight mode for this block.",e)),
+t?n[1]:"no-highlight"}return t.split(/\s+/).find((e=>d(e)||_(e)))})(e)
+;if(d(n))return;M("before:highlightBlock",{block:e,language:n}),t=e
+;const s=t.textContent,a=n?h(n,s,!0):p(s);M("after:highlightBlock",{block:e,
+result:a,text:s}),e.innerHTML=a.value,((e,t,n)=>{const s=t?r[t]:n
+;e.classList.add("hljs"),s&&e.classList.add(s)})(e,n,a.language),e.result={
+language:a.language,re:a.relevance,relavance:a.relevance
+},a.second_best&&(e.second_best={language:a.second_best.language,
+re:a.second_best.relevance,relavance:a.second_best.relevance})}const v=()=>{
+v.called||(v.called=!0,
+$("10.6.0","initHighlighting() is deprecated.  Use highlightAll() instead."),
+document.querySelectorAll("pre code").forEach(E))};let w=!1,N=!1;function y(){
+N?document.querySelectorAll("pre code").forEach(E):w=!0}function _(e){
+return e=(e||"").toLowerCase(),n[e]||n[r[e]]}function k(e,{languageName:t}){
+"string"==typeof e&&(e=[e]),e.forEach((e=>{r[e]=t}))}function O(e){const t=_(e)
+;return t&&!t.disableAutodetect}function M(e,t){const n=e;a.forEach((e=>{
+e[n]&&e[n](t)}))}
+"undefined"!=typeof window&&window.addEventListener&&window.addEventListener("DOMContentLoaded",(()=>{
+N=!0,w&&y()}),!1),Object.assign(e,{highlight:h,highlightAuto:p,highlightAll:y,
+fixMarkup:e=>{
+return $("10.2.0","fixMarkup will be removed entirely in v11.0"),$("10.2.0","Please see https://github.com/highlightjs/highlight.js/issues/2534"),
+t=e,
+g.tabReplace||g.useBR?t.replace(o,(e=>"\n"===e?g.useBR?"<br>":e:g.tabReplace?e.replace(/\t/g,g.tabReplace):e)):t
+;var t},highlightBlock:E,configure:e=>{
+e.useBR&&($("10.3.0","'useBR' will be removed entirely in v11.0"),
+$("10.3.0","Please see https://github.com/highlightjs/highlight.js/issues/2559")),
+g=K(g,e)},initHighlighting:v,initHighlightingOnLoad:()=>{
+$("10.6.0","initHighlightingOnLoad() is deprecated.  Use highlightAll() instead."),
+w=!0},registerLanguage:(t,s)=>{let r=null;try{r=s(e)}catch(e){
+if(H("Language definition for '{}' could not be registered.".replace("{}",t)),
+!i)throw e;H(e),r=u}
+r.name||(r.name=t),n[t]=r,r.rawDefinition=s.bind(null,e),r.aliases&&k(r.aliases,{
+languageName:t})},listLanguages:()=>Object.keys(n),getLanguage:_,
+registerAliases:k,requireLanguage:e=>{
+$("10.4.0","requireLanguage will be removed entirely in v11."),
+$("10.4.0","Please see https://github.com/highlightjs/highlight.js/pull/2844")
+;const t=_(e);if(t)return t
+;throw Error("The '{}' language is required, but not loaded.".replace("{}",e))},
+autoDetection:O,inherit:K,addPlugin:e=>{a.push(e)},vuePlugin:S(e).VuePlugin
+}),e.debugMode=()=>{i=!1},e.safeMode=()=>{i=!0},e.versionString="10.6.0"
+;for(const e in R)"object"==typeof R[e]&&t(R[e])
+;return Object.assign(e,R),e.addPlugin(m),e.addPlugin(P),e.addPlugin(x),e})({})
+}();"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);
+hljs.registerLanguage("apache",(()=>{"use strict";return e=>{const 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/}}
+})());
+hljs.registerLanguage("bash",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(s=e)?"string"==typeof s?s:s.source:null;var s
+})).join("")}return s=>{const n={},t={begin:/\$\{/,end:/\}/,contains:["self",{
+begin:/:-/,contains:[n]}]};Object.assign(n,{className:"variable",variants:[{
+begin:e(/\$[\w\d#@][\w\d_]*/,"(?![\\w\\d])(?![$])")},t]});const a={
+className:"subst",begin:/\$\(/,end:/\)/,contains:[s.BACKSLASH_ESCAPE]},i={
+begin:/<<-?\s*(?=\w+)/,starts:{contains:[s.END_SAME_AS_BEGIN({begin:/(\w+)/,
+end:/(\w+)/,className:"string"})]}},c={className:"string",begin:/"/,end:/"/,
+contains:[s.BACKSLASH_ESCAPE,n,a]};a.contains.push(c);const o={begin:/\$\(\(/,
+end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},s.NUMBER_MODE,n]
+},r=s.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10
+}),l={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,
+contains:[s.inherit(s.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"
+},contains:[r,s.SHEBANG(),l,o,s.HASH_COMMENT_MODE,i,c,{className:"",begin:/\\"/
+},{className:"string",begin:/'/,end:/'/},n]}}})());
+hljs.registerLanguage("c",(()=>{"use strict";function e(e){
+return((...e)=>e.map((e=>(e=>e?"string"==typeof e?e:e.source:null)(e))).join(""))("(",e,")?")
+}return t=>{const n=t.COMMENT("//","$",{contains:[{begin:/\\\n/}]
+}),r="[a-zA-Z_]\\w*::",a="(decltype\\(auto\\)|"+e(r)+"[a-zA-Z_]\\w*"+e("<[^<>]+>")+")",i={
+className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},s={className:"string",
+variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",
+contains:[t.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:"."},t.END_SAME_AS_BEGIN({
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
+className:"number",variants:[{begin:"\\b(0b[01']+)"},{
+begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
+},{
+begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
+}],relevance:0},c={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},t.inherit(s,{className:"meta-string"}),{
+className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"
+},n,t.C_BLOCK_COMMENT_MODE]},l={className:"title",begin:e(r)+t.IDENT_RE,
+relevance:0},d=e(r)+t.IDENT_RE+"\\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_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"},m=[c,i,n,t.C_BLOCK_COMMENT_MODE,o,s],p={
+variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{
+beginKeywords:"new throw return else",end:/;/}],keywords:u,contains:m.concat([{
+begin:/\(/,end:/\)/,keywords:u,contains:m.concat(["self"]),relevance:0}]),
+relevance:0},_={className:"function",begin:"("+a+"[\\*&\\s]+)+"+d,
+returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:u,illegal:/[^\w\s\*&:<>.]/,
+contains:[{begin:"decltype\\(auto\\)",keywords:u,relevance:0},{begin:d,
+returnBegin:!0,contains:[l],relevance:0},{className:"params",begin:/\(/,
+end:/\)/,keywords:u,relevance:0,contains:[n,t.C_BLOCK_COMMENT_MODE,s,o,i,{
+begin:/\(/,end:/\)/,keywords:u,relevance:0,
+contains:["self",n,t.C_BLOCK_COMMENT_MODE,s,o,i]}]
+},i,n,t.C_BLOCK_COMMENT_MODE,c]};return{name:"C",aliases:["c","h"],keywords:u,
+disableAutodetect:!0,illegal:"</",contains:[].concat(p,_,m,[c,{
+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:u,contains:["self",i]},{begin:t.IDENT_RE+"::",keywords:u},{
+className:"class",beginKeywords:"enum class struct union",end:/[{;:<>=]/,
+contains:[{beginKeywords:"final class struct"},t.TITLE_MODE]}]),exports:{
+preprocessor:c,strings:s,keywords:u}}}})());
+hljs.registerLanguage("coffeescript",(()=>{"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 r=>{const t={
+keyword:e.concat(["then","unless","until","loop","by","when","and","or","is","isnt","not"]).filter((i=["var","const","let","function","static"],
+e=>!i.includes(e))),literal:n.concat(["yes","no","on","off"]),
+built_in:a.concat(["npm","print"])};var i;const s="[A-Za-z$_][0-9A-Za-z$_]*",o={
+className:"subst",begin:/#\{/,end:/\}/,keywords:t
+},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
+;const l=r.inherit(r.TITLE_MODE,{begin:s}),d="(\\(.*\\)\\s*)?\\B[-=]>",g={
+className:"params",begin:"\\([^\\(]",returnBegin:!0,contains:[{begin:/\(/,
+end:/\)/,keywords:t,contains:["self"].concat(c)}]};return{name:"CoffeeScript",
+aliases:["coffee","cson","iced"],keywords:t,illegal:/\/\*/,
+contains:c.concat([r.COMMENT("###","###"),r.HASH_COMMENT_MODE,{
+className:"function",begin:"^\\s*"+s+"\\s*=\\s*"+d,end:"[-=]>",returnBegin:!0,
+contains:[l,g]},{begin:/[:\(,=]\s*/,relevance:0,contains:[{className:"function",
+begin:d,end:"[-=]>",returnBegin:!0,contains:[g]}]},{className:"class",
+beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{
+beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[l]},l]
+},{begin:s+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}})());
+hljs.registerLanguage("cpp",(()=>{"use strict";function e(e){
+return((...e)=>e.map((e=>(e=>e?"string"==typeof e?e:e.source:null)(e))).join(""))("(",e,")?")
+}return t=>{const n=t.COMMENT("//","$",{contains:[{begin:/\\\n/}]
+}),r="[a-zA-Z_]\\w*::",a="(decltype\\(auto\\)|"+e(r)+"[a-zA-Z_]\\w*"+e("<[^<>]+>")+")",i={
+className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},s={className:"string",
+variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",
+contains:[t.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:"."},t.END_SAME_AS_BEGIN({
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
+className:"number",variants:[{begin:"\\b(0b[01']+)"},{
+begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
+},{
+begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
+}],relevance:0},c={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},t.inherit(s,{className:"meta-string"}),{
+className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"
+},n,t.C_BLOCK_COMMENT_MODE]},l={className:"title",begin:e(r)+t.IDENT_RE,
+relevance:0},d=e(r)+t.IDENT_RE+"\\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_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"},m=[c,i,n,t.C_BLOCK_COMMENT_MODE,o,s],p={
+variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{
+beginKeywords:"new throw return else",end:/;/}],keywords:u,contains:m.concat([{
+begin:/\(/,end:/\)/,keywords:u,contains:m.concat(["self"]),relevance:0}]),
+relevance:0},_={className:"function",begin:"("+a+"[\\*&\\s]+)+"+d,
+returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:u,illegal:/[^\w\s\*&:<>.]/,
+contains:[{begin:"decltype\\(auto\\)",keywords:u,relevance:0},{begin:d,
+returnBegin:!0,contains:[l],relevance:0},{className:"params",begin:/\(/,
+end:/\)/,keywords:u,relevance:0,contains:[n,t.C_BLOCK_COMMENT_MODE,s,o,i,{
+begin:/\(/,end:/\)/,keywords:u,relevance:0,
+contains:["self",n,t.C_BLOCK_COMMENT_MODE,s,o,i]}]
+},i,n,t.C_BLOCK_COMMENT_MODE,c]};return{name:"C++",
+aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:u,illegal:"</",
+contains:[].concat(p,_,m,[c,{
+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:u,contains:["self",i]},{begin:t.IDENT_RE+"::",keywords:u},{
+className:"class",beginKeywords:"enum class struct union",end:/[{;:<>=]/,
+contains:[{beginKeywords:"final class struct"},t.TITLE_MODE]}]),exports:{
+preprocessor:c,strings:s,keywords:u}}}})());
+hljs.registerLanguage("csharp",(()=>{"use strict";return e=>{var n={
+keyword:["abstract","as","base","break","case","class","const","continue","do","else","event","explicit","extern","finally","fixed","for","foreach","goto","if","implicit","in","interface","internal","is","lock","namespace","new","operator","out","override","params","private","protected","public","readonly","record","ref","return","sealed","sizeof","stackalloc","static","struct","switch","this","throw","try","typeof","unchecked","unsafe","using","virtual","void","volatile","while"].concat(["add","alias","and","ascending","async","await","by","descending","equals","from","get","global","group","init","into","join","let","nameof","not","notnull","on","or","orderby","partial","remove","select","set","unmanaged","value|0","var","when","where","with","yield"]),
+built_in:["bool","byte","char","decimal","delegate","double","dynamic","enum","float","int","long","nint","nuint","object","sbyte","short","string","ulong","unit","ushort"],
+literal:["default","false","null","true"]},a=e.inherit(e.TITLE_MODE,{
+begin:"[a-zA-Z](\\.?\\w)*"}),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:"string",begin:'@"',end:'"',contains:[{begin:'""'}]
+},t=e.inherit(s,{illegal:/\n/}),r={className:"subst",begin:/\{/,end:/\}/,
+keywords:n},l=e.inherit(r,{illegal:/\n/}),c={className:"string",begin:/\$"/,
+end:'"',illegal:/\n/,contains:[{begin:/\{\{/},{begin:/\}\}/
+},e.BACKSLASH_ESCAPE,l]},o={className:"string",begin:/\$@"/,end:'"',contains:[{
+begin:/\{\{/},{begin:/\}\}/},{begin:'""'},r]},d=e.inherit(o,{illegal:/\n/,
+contains:[{begin:/\{\{/},{begin:/\}\}/},{begin:'""'},l]})
+;r.contains=[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,i,e.C_BLOCK_COMMENT_MODE],
+l.contains=[d,c,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,i,e.inherit(e.C_BLOCK_COMMENT_MODE,{
+illegal:/\n/})];var g={variants:[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]
+},E={begin:"<",end:">",contains:[{beginKeywords:"in out"},a]
+},_=e.IDENT_RE+"(<"+e.IDENT_RE+"(\\s*,\\s*"+e.IDENT_RE+")*>)?(\\[\\])?",b={
+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"
+}},g,i,{beginKeywords:"class interface",relevance:0,end:/[{;=]/,
+illegal:/[^\s:,]/,contains:[{beginKeywords:"where class"
+},a,E,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{beginKeywords:"namespace",
+relevance:0,end:/[{;=]/,illegal:/[^\s:]/,
+contains:[a,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{
+beginKeywords:"record",relevance:0,end:/[{;=]/,illegal:/[^\s:]/,
+contains:[a,E,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:"("+_+"\\s+)+"+e.IDENT_RE+"\\s*(<.+>\\s*)?\\(",returnBegin:!0,
+end:/\s*[{;=]/,excludeEnd:!0,keywords:n,contains:[{
+beginKeywords:"public private protected static internal protected abstract async extern override unsafe virtual new sealed partial",
+relevance:0},{begin:e.IDENT_RE+"\\s*(<.+>\\s*)?\\(",returnBegin:!0,
+contains:[e.TITLE_MODE,E],relevance:0},{className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0,
+contains:[g,i,e.C_BLOCK_COMMENT_MODE]
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},b]}}})());
+hljs.registerLanguage("css",(()=>{"use strict"
+;const e=["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","main","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"],t=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],i=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],o=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],r=["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-display","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-variation-settings","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","src","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()
+;return n=>{const a=(e=>({IMPORTANT:{className:"meta",begin:"!important"},
+HEXCOLOR:{className:"number",begin:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"},
+ATTRIBUTE_SELECTOR_MODE:{className:"selector-attr",begin:/\[/,end:/\]/,
+illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]}
+}))(n),l=[n.APOS_STRING_MODE,n.QUOTE_STRING_MODE];return{name:"CSS",
+case_insensitive:!0,illegal:/[=|'\$]/,keywords:{keyframePosition:"from to"},
+classNameAliases:{keyframePosition:"selector-tag"},
+contains:[n.C_BLOCK_COMMENT_MODE,{begin:/-(webkit|moz|ms|o)-(?=[a-z])/
+},n.CSS_NUMBER_MODE,{className:"selector-id",begin:/#[A-Za-z0-9_-]+/,relevance:0
+},{className:"selector-class",begin:"\\.[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0
+},a.ATTRIBUTE_SELECTOR_MODE,{className:"selector-pseudo",variants:[{
+begin:":("+i.join("|")+")"},{begin:"::("+o.join("|")+")"}]},{
+className:"attribute",begin:"\\b("+r.join("|")+")\\b"},{begin:":",end:"[;}]",
+contains:[a.HEXCOLOR,a.IMPORTANT,n.CSS_NUMBER_MODE,...l,{
+begin:/(url|data-uri)\(/,end:/\)/,relevance:0,keywords:{built_in:"url data-uri"
+},contains:[{className:"string",begin:/[^)]/,endsWithParent:!0,excludeEnd:!0}]
+},{className:"built_in",begin:/[\w-]+(?=\()/}]},{
+begin:(s=/@/,((...e)=>e.map((e=>(e=>e?"string"==typeof e?e:e.source:null)(e))).join(""))("(?=",s,")")),
+end:"[{;]",relevance:0,illegal:/:/,contains:[{className:"keyword",
+begin:/@-?\w[\w]*(-\w+)*/},{begin:/\s/,endsWithParent:!0,excludeEnd:!0,
+relevance:0,keywords:{$pattern:/[a-z-]+/,keyword:"and or not only",
+attribute:t.join(" ")},contains:[{begin:/[a-z-]+(?=:)/,className:"attribute"
+},...l,n.CSS_NUMBER_MODE]}]},{className:"selector-tag",
+begin:"\\b("+e.join("|")+")\\b"}]};var s}})());
+hljs.registerLanguage("diff",(()=>{"use strict";return e=>({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:/^index/,end:/$/},{begin:/={3,}/,end:/$/},{begin:/^-{3}/,end:/$/
+},{begin:/^\*{3} /,end:/$/},{begin:/^\+{3}/,end:/$/},{begin:/^\*{15}$/},{
+begin:/^diff --git/,end:/$/}]},{className:"addition",begin:/^\+/,end:/$/},{
+className:"deletion",begin:/^-/,end:/$/},{className:"addition",begin:/^!/,
+end:/$/}]})})());
+hljs.registerLanguage("go",(()=>{"use strict";return e=>{const 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:/["']/}]}]}}})());
+hljs.registerLanguage("http",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>{const a="HTTP/(2|1\\.[01])",s=[{className:"attribute",
+begin:e("^",/[A-Za-z][A-Za-z0-9-]*/,"(?=\\:\\s)"),starts:{contains:[{
+className:"punctuation",begin:/: /,relevance:0,starts:{end:"$",relevance:0}}]}
+},{begin:"\\n\\n",starts:{subLanguage:[],endsWithParent:!0}}];return{
+name:"HTTP",aliases:["https"],illegal:/\S/,contains:[{begin:"^(?="+a+" \\d{3})",
+end:/$/,contains:[{className:"meta",begin:a},{className:"number",
+begin:"\\b\\d{3}\\b"}],starts:{end:/\b\B/,illegal:/\S/,contains:s}},{
+begin:"(?=^[A-Z]+ (.*?) "+a+"$)",end:/$/,contains:[{className:"string",
+begin:" ",end:" ",excludeBegin:!0,excludeEnd:!0},{className:"meta",begin:a},{
+className:"keyword",begin:"[A-Z]+"}],starts:{end:/\b\B/,illegal:/\S/,contains:s}
+}]}}})());
+hljs.registerLanguage("ini",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(...n){
+return n.map((n=>e(n))).join("")}return s=>{const a={className:"number",
+relevance:0,variants:[{begin:/([+-]+)?[\d]+_[\d_]+/},{begin:s.NUMBER_RE}]
+},i=s.COMMENT();i.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];const t={
+className:"variable",variants:[{begin:/\$[\w\d"][\w\d_]*/},{begin:/\$\{(.*?)\}/
+}]},r={className:"literal",begin:/\bon|off|true|false|yes|no\b/},l={
+className:"string",contains:[s.BACKSLASH_ESCAPE],variants:[{begin:"'''",
+end:"'''",relevance:10},{begin:'"""',end:'"""',relevance:10},{begin:'"',end:'"'
+},{begin:"'",end:"'"}]},c={begin:/\[/,end:/\]/,contains:[i,r,t,l,a,"self"],
+relevance:0
+},g="("+[/[A-Za-z0-9_-]+/,/"(\\"|[^"])*"/,/'[^']*'/].map((n=>e(n))).join("|")+")"
+;return{name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,
+contains:[i,{className:"section",begin:/\[+/,end:/\]+/},{
+begin:n(g,"(\\s*\\.\\s*",g,")*",n("(?=",/\s*=\s*[^#\s]/,")")),className:"attr",
+starts:{end:/$/,contains:[i,c,r,t,l,a]}}]}}})());
+hljs.registerLanguage("java",(()=>{"use strict"
+;var e="\\.([0-9](_*[0-9])*)",n="[0-9a-fA-F](_*[0-9a-fA-F])*",a={
+className:"number",variants:[{
+begin:`(\\b([0-9](_*[0-9])*)((${e})|\\.)?|(${e}))[eE][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
+},{begin:`\\b([0-9](_*[0-9])*)((${e})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{
+begin:`(${e})[fFdD]?\\b`},{begin:"\\b([0-9](_*[0-9])*)[fFdD]\\b"},{
+begin:`\\b0[xX]((${n})\\.?|(${n})?\\.(${n}))[pP][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
+},{begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${n})[lL]?\\b`},{
+begin:"\\b0(_*[0-7])*[lL]?\\b"},{begin:"\\b0[bB][01](_*[01])*[lL]?\\b"}],
+relevance:0};return e=>{
+var n="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={
+className:"meta",begin:"@[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*",
+contains:[{begin:/\(/,end:/\)/,contains:["self"]}]};const r=a;return{
+name:"Java",aliases:["jsp"],keywords:n,illegal:/<\/|#/,
+contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,
+relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]}),{
+begin:/import java\.[a-z]+\./,keywords:"import",relevance:2
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{
+className:"class",beginKeywords:"class interface enum",end:/[{;=]/,
+excludeEnd:!0,relevance:1,keywords:"class interface enum",illegal:/[:"\[\]]/,
+contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{
+beginKeywords:"new throw return else",relevance:0},{className:"class",
+begin:"record\\s+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,excludeEnd:!0,
+end:/[{;=]/,keywords:n,contains:[{beginKeywords:"record"},{
+begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,
+contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,
+keywords:n,relevance:0,contains:[e.C_BLOCK_COMMENT_MODE]
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"function",
+begin:"([\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*(<[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*(\\s*,\\s*[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*)*>)?\\s+)+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(",
+returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:n,contains:[{
+begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,
+contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,
+keywords:n,relevance:0,
+contains:[s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,r,e.C_BLOCK_COMMENT_MODE]
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},r,s]}}})());
+hljs.registerLanguage("javascript",(()=>{"use strict"
+;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["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"],a=["true","false","null","undefined","NaN","Infinity"],s=[].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 r(e){return t("(?=",e,")")}function t(...e){return e.map((e=>{
+return(n=e)?"string"==typeof n?n:n.source:null;var n})).join("")}return i=>{
+const c=e,o={begin:/<[A-Za-z0-9\\._:-]+/,end:/\/[A-Za-z0-9\\._:-]+>|\/>/,
+isTrulyOpeningTag:(e,n)=>{const a=e[0].length+e.index,s=e.input[a]
+;"<"!==s?">"===s&&(((e,{after:n})=>{const a="</"+e[0].slice(1)
+;return-1!==e.input.indexOf(a,n)})(e,{after:a
+})||n.ignoreMatch()):n.ignoreMatch()}},l={$pattern:e,keyword:n,literal:a,
+built_in:s},b="\\.([0-9](_?[0-9])*)",g="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",d={
+className:"number",variants:[{
+begin:`(\\b(${g})((${b})|\\.)?|(${b}))[eE][+-]?([0-9](_?[0-9])*)\\b`},{
+begin:`\\b(${g})\\b((${b})\\b|\\.)?|(${b})\\b`},{
+begin:"\\b(0|[1-9](_?[0-9])*)n\\b"},{
+begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b"},{
+begin:"\\b0[bB][0-1](_?[0-1])*n?\\b"},{begin:"\\b0[oO][0-7](_?[0-7])*n?\\b"},{
+begin:"\\b0[0-7]+n?\\b"}],relevance:0},E={className:"subst",begin:"\\$\\{",
+end:"\\}",keywords:l,contains:[]},u={begin:"html`",end:"",starts:{end:"`",
+returnEnd:!1,contains:[i.BACKSLASH_ESCAPE,E],subLanguage:"xml"}},_={
+begin:"css`",end:"",starts:{end:"`",returnEnd:!1,
+contains:[i.BACKSLASH_ESCAPE,E],subLanguage:"css"}},m={className:"string",
+begin:"`",end:"`",contains:[i.BACKSLASH_ESCAPE,E]},N={className:"comment",
+variants:[i.COMMENT(/\/\*\*(?!\/)/,"\\*/",{relevance:0,contains:[{
+className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type",begin:"\\{",
+end:"\\}",relevance:0},{className:"variable",begin:c+"(?=\\s*(-)|$)",
+endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]
+}),i.C_BLOCK_COMMENT_MODE,i.C_LINE_COMMENT_MODE]
+},y=[i.APOS_STRING_MODE,i.QUOTE_STRING_MODE,u,_,m,d,i.REGEXP_MODE]
+;E.contains=y.concat({begin:/\{/,end:/\}/,keywords:l,contains:["self"].concat(y)
+});const f=[].concat(N,E.contains),A=f.concat([{begin:/\(/,end:/\)/,keywords:l,
+contains:["self"].concat(f)}]),p={className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:l,contains:A};return{name:"Javascript",
+aliases:["js","jsx","mjs","cjs"],keywords:l,exports:{PARAMS_CONTAINS:A},
+illegal:/#(?![$_A-z])/,contains:[i.SHEBANG({label:"shebang",binary:"node",
+relevance:5}),{label:"use_strict",className:"meta",relevance:10,
+begin:/^\s*['"]use (strict|asm)['"]/
+},i.APOS_STRING_MODE,i.QUOTE_STRING_MODE,u,_,m,N,d,{
+begin:t(/[{,\n]\s*/,r(t(/(((\/\/.*$)|(\/\*(\*[^/]|[^*])*\*\/))\s*)*/,c+"\\s*:"))),
+relevance:0,contains:[{className:"attr",begin:c+r("\\s*:"),relevance:0}]},{
+begin:"("+i.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
+keywords:"return throw case",contains:[N,i.REGEXP_MODE,{className:"function",
+begin:"(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+i.UNDERSCORE_IDENT_RE+")\\s*=>",
+returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{
+begin:i.UNDERSCORE_IDENT_RE,relevance:0},{className:null,begin:/\(\s*\)/,skip:!0
+},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:l,contains:A}]}]
+},{begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{
+variants:[{begin:"<>",end:"</>"},{begin:o.begin,"on:begin":o.isTrulyOpeningTag,
+end:o.end}],subLanguage:"xml",contains:[{begin:o.begin,end:o.end,skip:!0,
+contains:["self"]}]}],relevance:0},{className:"function",
+beginKeywords:"function",end:/[{;]/,excludeEnd:!0,keywords:l,
+contains:["self",i.inherit(i.TITLE_MODE,{begin:c}),p],illegal:/%/},{
+beginKeywords:"while if switch catch for"},{className:"function",
+begin:i.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{",
+returnBegin:!0,contains:[p,i.inherit(i.TITLE_MODE,{begin:c})]},{variants:[{
+begin:"\\."+c},{begin:"\\$"+c}],relevance:0},{className:"class",
+beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"[\]]/,contains:[{
+beginKeywords:"extends"},i.UNDERSCORE_TITLE_MODE]},{begin:/\b(?=constructor)/,
+end:/[{;]/,excludeEnd:!0,contains:[i.inherit(i.TITLE_MODE,{begin:c}),"self",p]
+},{begin:"(get|set)\\s+(?="+c+"\\()",end:/\{/,keywords:"get set",
+contains:[i.inherit(i.TITLE_MODE,{begin:c}),{begin:/\(\)/},p]},{begin:/\$[(.]/}]
+}}})());
+hljs.registerLanguage("json",(()=>{"use strict";return n=>{const e={
+literal:"true false null"
+},i=[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE],a=[n.QUOTE_STRING_MODE,n.C_NUMBER_MODE],l={
+end:",",endsWithParent:!0,excludeEnd:!0,contains:a,keywords:e},t={begin:/\{/,
+end:/\}/,contains:[{className:"attr",begin:/"/,end:/"/,
+contains:[n.BACKSLASH_ESCAPE],illegal:"\\n"},n.inherit(l,{begin:/:/
+})].concat(i),illegal:"\\S"},s={begin:"\\[",end:"\\]",contains:[n.inherit(l)],
+illegal:"\\S"};return a.push(t,s),i.forEach((n=>{a.push(n)})),{name:"JSON",
+contains:a,keywords:e,illegal:"\\S"}}})());
+hljs.registerLanguage("kotlin",(()=>{"use strict"
+;var e="\\.([0-9](_*[0-9])*)",n="[0-9a-fA-F](_*[0-9a-fA-F])*",a={
+className:"number",variants:[{
+begin:`(\\b([0-9](_*[0-9])*)((${e})|\\.)?|(${e}))[eE][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
+},{begin:`\\b([0-9](_*[0-9])*)((${e})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{
+begin:`(${e})[fFdD]?\\b`},{begin:"\\b([0-9](_*[0-9])*)[fFdD]\\b"},{
+begin:`\\b0[xX]((${n})\\.?|(${n})?\\.(${n}))[pP][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
+},{begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${n})[lL]?\\b`},{
+begin:"\\b0(_*[0-7])*[lL]?\\b"},{begin:"\\b0[bB][01](_*[01])*[lL]?\\b"}],
+relevance:0};return e=>{const 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",
+built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",
+literal:"true false null"},i={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"
+},s={className:"subst",begin:/\$\{/,end:/\}/,contains:[e.C_NUMBER_MODE]},t={
+className:"variable",begin:"\\$"+e.UNDERSCORE_IDENT_RE},r={className:"string",
+variants:[{begin:'"""',end:'"""(?=[^"])',contains:[t,s]},{begin:"'",end:"'",
+illegal:/\n/,contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"',illegal:/\n/,
+contains:[e.BACKSLASH_ESCAPE,t,s]}]};s.contains.push(r);const l={
+className:"meta",
+begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"
+},c={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/,
+end:/\)/,contains:[e.inherit(r,{className:"meta-string"})]}]
+},o=a,b=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),E={
+variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,
+contains:[]}]},d=E;return d.variants[1].contains=[E],E.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,b,{className:"keyword",
+begin:/\b(break|continue|return|this)\b/,starts:{contains:[{className:"symbol",
+begin:/@\w+/}]}},i,l,c,{className:"function",beginKeywords:"fun",end:"[(]|$",
+returnBegin:!0,excludeEnd:!0,keywords:n,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:[E,e.C_LINE_COMMENT_MODE,b],relevance:0
+},e.C_LINE_COMMENT_MODE,b,l,c,r,e.C_NUMBER_MODE]},b]},{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},l,c]},r,{className:"meta",begin:"^#!/usr/bin/env",
+end:"$",illegal:"\n"},o]}}})());
+hljs.registerLanguage("less",(()=>{"use strict"
+;const e=["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","main","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"],t=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],i=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],o=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],n=["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-display","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-variation-settings","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","src","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(),r=i.concat(o)
+;return a=>{const s=(e=>({IMPORTANT:{className:"meta",begin:"!important"},
+HEXCOLOR:{className:"number",begin:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"},
+ATTRIBUTE_SELECTOR_MODE:{className:"selector-attr",begin:/\[/,end:/\]/,
+illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]}
+}))(a),l=r,d="([\\w-]+|@\\{[\\w-]+\\})",c=[],g=[],b=e=>({className:"string",
+begin:"~?"+e+".*?"+e}),m=(e,t,i)=>({className:e,begin:t,relevance:i}),u={
+$pattern:/[a-z-]+/,keyword:"and or not only",attribute:t.join(" ")},p={
+begin:"\\(",end:"\\)",contains:g,keywords:u,relevance:0}
+;g.push(a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,b("'"),b('"'),a.CSS_NUMBER_MODE,{
+begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]",
+excludeEnd:!0}
+},s.HEXCOLOR,p,m("variable","@@?[\\w-]+",10),m("variable","@\\{[\\w-]+\\}"),m("built_in","~?`[^`]*?`"),{
+className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0
+},s.IMPORTANT);const f=g.concat({begin:/\{/,end:/\}/,contains:c}),h={
+beginKeywords:"when",endsWithParent:!0,contains:[{beginKeywords:"and not"
+}].concat(g)},w={begin:d+"\\s*:",returnBegin:!0,end:/[;}]/,relevance:0,
+contains:[{begin:/-(webkit|moz|ms|o)-/},{className:"attribute",
+begin:"\\b("+n.join("|")+")\\b",end:/(?=:)/,starts:{endsWithParent:!0,
+illegal:"[<=$]",relevance:0,contains:g}}]},v={className:"keyword",
+begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",
+starts:{end:"[;{}]",keywords:u,returnEnd:!0,contains:g,relevance:0}},y={
+className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{
+begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:f}},k={variants:[{
+begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:d,end:/\{/}],returnBegin:!0,
+returnEnd:!0,illegal:"[<='$\"]",relevance:0,
+contains:[a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,h,m("keyword","all\\b"),m("variable","@\\{[\\w-]+\\}"),{
+begin:"\\b("+e.join("|")+")\\b",className:"selector-tag"
+},m("selector-tag",d+"%?",0),m("selector-id","#"+d),m("selector-class","\\."+d,0),m("selector-tag","&",0),s.ATTRIBUTE_SELECTOR_MODE,{
+className:"selector-pseudo",begin:":("+i.join("|")+")"},{
+className:"selector-pseudo",begin:"::("+o.join("|")+")"},{begin:"\\(",end:"\\)",
+contains:f},{begin:"!important"}]},E={begin:`[\\w-]+:(:)?(${l.join("|")})`,
+returnBegin:!0,contains:[k]}
+;return c.push(a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,v,y,E,w,k),{
+name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:c}}})());
+hljs.registerLanguage("lua",(()=>{"use strict";return e=>{
+const t="\\[=*\\[",a="\\]=*\\]",n={begin:t,end:a,contains:["self"]
+},o=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[",a,{contains:[n],
+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:o.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:o}].concat(o)
+},e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",
+begin:t,end:a,contains:[n],relevance:5}])}}})());
+hljs.registerLanguage("makefile",(()=>{"use strict";return e=>{const i={
+className:"variable",variants:[{begin:"\\$\\("+e.UNDERSCORE_IDENT_RE+"\\)",
+contains:[e.BACKSLASH_ESCAPE]},{begin:/\$[@%<?\^\+\*]/}]},a={className:"string",
+begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i]},n={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]},s={begin:"^"+e.UNDERSCORE_IDENT_RE+"\\s*(?=[:+?]?=)"},r={
+className:"section",begin:/^[^\s]+:/,end:/$/,contains:[i]};return{
+name:"Makefile",aliases:["mk","mak","make"],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,a,n,s,{className:"meta",begin:/^\.PHONY:/,
+end:/$/,keywords:{$pattern:/[\.\w]+/,"meta-keyword":".PHONY"}},r]}}})());
+hljs.registerLanguage("xml",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(e){return a("(?=",e,")")}
+function a(...n){return n.map((n=>e(n))).join("")}function s(...n){
+return"("+n.map((n=>e(n))).join("|")+")"}return e=>{
+const t=a(/[A-Z_]/,a("(",/[A-Z0-9_.-]*:/,")?"),/[A-Z0-9_.-]*/),i={
+className:"symbol",begin:/&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;/},r={begin:/\s/,
+contains:[{className:"meta-keyword",begin:/#?[a-z_][a-z1-9_-]+/,illegal:/\n/}]
+},c=e.inherit(r,{begin:/\(/,end:/\)/}),l=e.inherit(e.APOS_STRING_MODE,{
+className:"meta-string"}),g=e.inherit(e.QUOTE_STRING_MODE,{
+className:"meta-string"}),m={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:[i]},{begin:/'/,end:/'/,contains:[i]},{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:[r,g,l,c,{begin:/\[/,end:/\]/,contains:[{className:"meta",
+begin:/<![a-z]/,end:/>/,contains:[r,c,g,l]}]}]},e.COMMENT(/<!--/,/-->/,{
+relevance:10}),{begin:/<!\[CDATA\[/,end:/\]\]>/,relevance:10},i,{
+className:"meta",begin:/<\?xml/,end:/\?>/,relevance:10},{className:"tag",
+begin:/<style(?=\s|>)/,end:/>/,keywords:{name:"style"},contains:[m],starts:{
+end:/<\/style>/,returnEnd:!0,subLanguage:["css","xml"]}},{className:"tag",
+begin:/<script(?=\s|>)/,end:/>/,keywords:{name:"script"},contains:[m],starts:{
+end:/<\/script>/,returnEnd:!0,subLanguage:["javascript","handlebars","xml"]}},{
+className:"tag",begin:/<>|<\/>/},{className:"tag",
+begin:a(/</,n(a(t,s(/\/>/,/>/,/\s/)))),end:/\/?>/,contains:[{className:"name",
+begin:t,relevance:0,starts:m}]},{className:"tag",begin:a(/<\//,n(a(t,/>/))),
+contains:[{className:"name",begin:t,relevance:0},{begin:/>/,relevance:0}]}]}}
+})());
+hljs.registerLanguage("markdown",(()=>{"use strict";function n(...n){
+return n.map((n=>{return(e=n)?"string"==typeof e?e:e.source:null;var e
+})).join("")}return e=>{const a={begin:/<\/?[A-Za-z_]/,end:">",
+subLanguage:"xml",relevance:0},i={variants:[{begin:/\[.+?\]\[.*?\]/,relevance:0
+},{begin:/\[.+?\]\(((data|javascript|mailto):|(?:http|ftp)s?:\/\/).*?\)/,
+relevance:2},{begin:n(/\[.+?\]\(/,/[A-Za-z][A-Za-z0-9+.-]*/,/:\/\/.*?\)/),
+relevance:2},{begin:/\[.+?\]\([./?&#].*?\)/,relevance:1},{
+begin:/\[.+?\]\(.*?\)/,relevance:0}],returnBegin:!0,contains:[{
+className:"string",relevance:0,begin:"\\[",end:"\\]",excludeBegin:!0,
+returnEnd:!0},{className:"link",relevance:0,begin:"\\]\\(",end:"\\)",
+excludeBegin:!0,excludeEnd:!0},{className:"symbol",relevance:0,begin:"\\]\\[",
+end:"\\]",excludeBegin:!0,excludeEnd:!0}]},s={className:"strong",contains:[],
+variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},c={
+className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{
+begin:/_(?!_)/,end:/_/,relevance:0}]};s.contains.push(c),c.contains.push(s)
+;let t=[a,i]
+;return s.contains=s.contains.concat(t),c.contains=c.contains.concat(t),
+t=t.concat(s,c),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{
+className:"section",variants:[{begin:"^#{1,6}",end:"$",contains:t},{
+begin:"(?=^.+?\\n[=-]{2,}$)",contains:[{begin:"^[=-]*$"},{begin:"^",end:"\\n",
+contains:t}]}]},a,{className:"bullet",begin:"^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)",
+end:"\\s+",excludeEnd:!0},s,c,{className:"quote",begin:"^>\\s+",contains:t,
+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:"$"},i,{begin:/^\[[^\n]+\]:/,returnBegin:!0,contains:[{
+className:"symbol",begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0},{
+className:"link",begin:/:\s*/,end:/$/,excludeBegin:!0}]}]}}})());
+hljs.registerLanguage("nginx",(()=>{"use strict";return e=>{const 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\\}]"}}})());
+hljs.registerLanguage("objectivec",(()=>{"use strict";return e=>{
+const n=/[a-zA-Z@][a-zA-Z0-9_]*/,_={$pattern:n,
+keyword:"@interface @class @protocol @implementation"};return{
+name:"Objective-C",aliases:["mm","objc","obj-c","obj-c++","objective-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}]}}})());
+hljs.registerLanguage("perl",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(...n){
+return n.map((n=>e(n))).join("")}function t(...n){
+return"("+n.map((n=>e(n))).join("|")+")"}return e=>{
+const r=/[dualxmsipngr]{0,12}/,s={$pattern:/[\w.]+/,
+keyword:"abs accept alarm and atan2 bind binmode bless break caller chdir chmod chomp chop chown chr chroot close closedir connect continue cos crypt dbmclose dbmopen defined delete die do dump each else elsif endgrent endhostent endnetent endprotoent endpwent endservent eof eval exec exists exit exp fcntl fileno flock for foreach fork format formline getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername getpgrp getpriority getprotobyname getprotobynumber getprotoent getpwent getpwnam getpwuid getservbyname getservbyport getservent getsockname getsockopt given glob gmtime goto grep gt hex if index int ioctl join keys kill last lc lcfirst length link listen local localtime log lstat lt ma map mkdir msgctl msgget msgrcv msgsnd my ne next no not oct open opendir or ord our pack package pipe pop pos print printf prototype push q|0 qq quotemeta qw qx rand read readdir readline readlink readpipe recv redo ref rename require reset return reverse rewinddir rindex rmdir say scalar seek seekdir select semctl semget semop send setgrent sethostent setnetent setpgrp setpriority setprotoent setpwent setservent setsockopt shift shmctl shmget shmread shmwrite shutdown sin sleep socket socketpair sort splice split sprintf sqrt srand stat state study sub substr symlink syscall sysopen sysread sysseek system syswrite tell telldir tie tied time times tr truncate uc ucfirst umask undef unless unlink unpack unshift untie until use utime values vec wait waitpid wantarray warn when while write x|0 xor y|0"
+},i={className:"subst",begin:"[$@]\\{",end:"\\}",keywords:s},a={begin:/->\{/,
+end:/\}/},o={variants:[{begin:/\$\d/},{
+begin:n(/[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/,"(?![A-Za-z])(?![@$%])")
+},{begin:/[$%@][^\s\w{]/,relevance:0}]
+},c=[e.BACKSLASH_ESCAPE,i,o],g=[/!/,/\//,/\|/,/\?/,/'/,/"/,/#/],l=(e,t,s="\\1")=>{
+const i="\\1"===s?s:n(s,t)
+;return n(n("(?:",e,")"),t,/(?:\\.|[^\\\/])*?/,i,/(?:\\.|[^\\\/])*?/,s,r)
+},d=(e,t,s)=>n(n("(?:",e,")"),t,/(?:\\.|[^\\\/])*?/,s,r),p=[o,e.HASH_COMMENT_MODE,e.COMMENT(/^=\w/,/=cut/,{
+endsWithParent:!0}),a,{className:"string",contains:c,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+\}/,relevance:0},{
+begin:"-?\\w+\\s*=>",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",variants:[{
+begin:l("s|tr|y",t(...g))},{begin:l("s|tr|y","\\(","\\)")},{
+begin:l("s|tr|y","\\[","\\]")},{begin:l("s|tr|y","\\{","\\}")}],relevance:2},{
+className:"regexp",variants:[{begin:/(m|qr)\/\//,relevance:0},{
+begin:d("(?:m|qr)?",/\//,/\//)},{begin:d("m|qr",t(...g),/\1/)},{
+begin:d("m|qr",/\(/,/\)/)},{begin:d("m|qr",/\[/,/\]/)},{
+begin:d("m|qr",/\{/,/\}/)}]}]},{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 i.contains=p,a.contains=p,{name:"Perl",aliases:["pl","pm"],keywords:s,
+contains:p}}})());
+hljs.registerLanguage("php",(()=>{"use strict";return e=>{const r={
+className:"variable",
+begin:"\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(?![A-Za-z0-9])(?![$])"},t={
+className:"meta",variants:[{begin:/<\?php/,relevance:10},{begin:/<\?[=]?/},{
+begin:/\?>/}]},a={className:"subst",variants:[{begin:/\$\w+/},{begin:/\{\$/,
+end:/\}/}]},n=e.inherit(e.APOS_STRING_MODE,{illegal:null
+}),i=e.inherit(e.QUOTE_STRING_MODE,{illegal:null,
+contains:e.QUOTE_STRING_MODE.contains.concat(a)}),o=e.END_SAME_AS_BEGIN({
+begin:/<<<[ \t]*(\w+)\n/,end:/[ \t]*(\w+)\b/,
+contains:e.QUOTE_STRING_MODE.contains.concat(a)}),l={className:"string",
+contains:[e.BACKSLASH_ESCAPE,t],variants:[e.inherit(n,{begin:"b'",end:"'"
+}),e.inherit(i,{begin:'b"',end:'"'}),i,n,o]},c={
+variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},s={
+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 match|0 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","php8"],
+case_insensitive:!0,keywords:s,
+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"}),t,{className:"keyword",begin:/\$this\b/},r,{
+begin:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{className:"function",
+relevance:0,beginKeywords:"fn function",end:/[;{]/,excludeEnd:!0,
+illegal:"[$%\\[]",contains:[e.UNDERSCORE_TITLE_MODE,{begin:"=>"},{
+className:"params",begin:"\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0,
+keywords:s,contains:["self",r,e.C_BLOCK_COMMENT_MODE,l,c]}]},{className:"class",
+beginKeywords:"class interface",relevance:0,end:/\{/,excludeEnd:!0,
+illegal:/[:($"]/,contains:[{beginKeywords:"extends implements"
+},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"namespace",relevance:0,end:";",
+illegal:/[.']/,contains:[e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"use",
+relevance:0,end:";",contains:[e.UNDERSCORE_TITLE_MODE]},l,c]}}})());
+hljs.registerLanguage("php-template",(()=>{"use strict";return n=>({
+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("plaintext",(()=>{"use strict";return t=>({
+name:"Plain text",aliases:["text","txt"],disableAutodetect:!0})})());
+hljs.registerLanguage("properties",(()=>{"use strict";return e=>{
+var n="[ \\t\\f]*",a=n+"[:=]"+n,t="("+a+"|[ \\t\\f]+)",r="([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",s="([^\\\\:= \\t\\f\\n]|\\\\.)+",i={
+end:t,relevance:0,starts:{className:"string",end:/$/,relevance:0,contains:[{
+begin:"\\\\\\\\"},{begin:"\\\\\\n"}]}};return{name:".properties",
+case_insensitive:!0,illegal:/\S/,contains:[e.COMMENT("^\\s*[!#]","$"),{
+returnBegin:!0,variants:[{begin:r+a,relevance:1},{begin:r+"[ \\t\\f]+",
+relevance:0}],contains:[{className:"attr",begin:r,endsParent:!0,relevance:0}],
+starts:i},{begin:s+t,returnBegin:!0,relevance:0,contains:[{className:"meta",
+begin:s,endsParent:!0,relevance:0}],starts:i},{className:"attr",relevance:0,
+begin:s+n+"$"}]}}})());
+hljs.registerLanguage("python",(()=>{"use strict";return e=>{const n={
+keyword:["and","as","assert","async","await","break","class","continue","def","del","elif","else","except","finally","for","","from","global","if","import","in","is","lambda","nonlocal|10","not","or","pass","raise","return","try","while","with","yield"],
+built_in:["__import__","abs","all","any","ascii","bin","bool","breakpoint","bytearray","bytes","callable","chr","classmethod","compile","complex","delattr","dict","dir","divmod","enumerate","eval","exec","filter","float","format","frozenset","getattr","globals","hasattr","hash","help","hex","id","input","int","isinstance","issubclass","iter","len","list","locals","map","max","memoryview","min","next","object","oct","open","ord","pow","print","property","range","repr","reversed","round","set","setattr","slice","sorted","staticmethod","str","sum","super","tuple","type","vars","zip"],
+literal:["__debug__","Ellipsis","False","None","NotImplemented","True"]},a={
+className:"meta",begin:/^(>>>|\.\.\.) /},s={className:"subst",begin:/\{/,
+end:/\}/,keywords:n,illegal:/#/},i={begin:/\{\{/,relevance:0},r={
+className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{
+begin:/([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?'''/,end:/'''/,
+contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{
+begin:/([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?"""/,end:/"""/,
+contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{
+begin:/([fF][rR]|[rR][fF]|[fF])'''/,end:/'''/,
+contains:[e.BACKSLASH_ESCAPE,a,i,s]},{begin:/([fF][rR]|[rR][fF]|[fF])"""/,
+end:/"""/,contains:[e.BACKSLASH_ESCAPE,a,i,s]},{begin:/([uU]|[rR])'/,end:/'/,
+relevance:10},{begin:/([uU]|[rR])"/,end:/"/,relevance:10},{
+begin:/([bB]|[bB][rR]|[rR][bB])'/,end:/'/},{begin:/([bB]|[bB][rR]|[rR][bB])"/,
+end:/"/},{begin:/([fF][rR]|[rR][fF]|[fF])'/,end:/'/,
+contains:[e.BACKSLASH_ESCAPE,i,s]},{begin:/([fF][rR]|[rR][fF]|[fF])"/,end:/"/,
+contains:[e.BACKSLASH_ESCAPE,i,s]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]
+},t="[0-9](_?[0-9])*",l=`(\\b(${t}))?\\.(${t})|\\b(${t})\\.`,b={
+className:"number",relevance:0,variants:[{
+begin:`(\\b(${t})|(${l}))[eE][+-]?(${t})[jJ]?\\b`},{begin:`(${l})[jJ]?`},{
+begin:"\\b([1-9](_?[0-9])*|0+(_?0)*)[lLjJ]?\\b"},{
+begin:"\\b0[bB](_?[01])+[lL]?\\b"},{begin:"\\b0[oO](_?[0-7])+[lL]?\\b"},{
+begin:"\\b0[xX](_?[0-9a-fA-F])+[lL]?\\b"},{begin:`\\b(${t})[jJ]\\b`}]},o={
+className:"params",variants:[{begin:/\(\s*\)/,skip:!0,className:null},{
+begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:n,
+contains:["self",a,b,r,e.HASH_COMMENT_MODE]}]};return s.contains=[r,b,a],{
+name:"Python",aliases:["py","gyp","ipython"],keywords:n,
+illegal:/(<\/|->|\?)|=>/,contains:[a,b,{begin:/\bself\b/},{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,o,{begin:/->/,
+endsWithParent:!0,keywords:"None"}]},{className:"meta",begin:/^[\t ]*@/,
+end:/(?=#)|$/,contains:[b,o,r]},{begin:/\b(print|exec)\(/}]}}})());
+hljs.registerLanguage("python-repl",(()=>{"use strict";return s=>({
+aliases:["pycon"],contains:[{className:"meta",starts:{end:/ |$/,starts:{end:"$",
+subLanguage:"python"}},variants:[{begin:/^>>>(?=[ ]|$)/},{
+begin:/^\.\.\.(?=[ ]|$)/}]}]})})());
+hljs.registerLanguage("r",(()=>{"use strict";function e(...e){return e.map((e=>{
+return(a=e)?"string"==typeof a?a:a.source:null;var a})).join("")}return a=>{
+const n=/(?:(?:[a-zA-Z]|\.[._a-zA-Z])[._a-zA-Z0-9]*)|\.(?!\d)/;return{name:"R",
+illegal:/->/,keywords:{$pattern:n,
+keyword:"function if in break next repeat else for while",
+literal:"NULL NA TRUE FALSE Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10",
+built_in:"LETTERS letters month.abb month.name pi T F abs acos acosh all any anyNA Arg as.call as.character as.complex as.double as.environment as.integer as.logical as.null.default as.numeric as.raw asin asinh atan atanh attr attributes baseenv browser c call ceiling class Conj cos cosh cospi cummax cummin cumprod cumsum digamma dim dimnames emptyenv exp expression floor forceAndCall gamma gc.time globalenv Im interactive invisible is.array is.atomic is.call is.character is.complex is.double is.environment is.expression is.finite is.function is.infinite is.integer is.language is.list is.logical is.matrix is.na is.name is.nan is.null is.numeric is.object is.pairlist is.raw is.recursive is.single is.symbol lazyLoadDBfetch length lgamma list log max min missing Mod names nargs nzchar oldClass on.exit pos.to.env proc.time prod quote range Re rep retracemem return round seq_along seq_len seq.int sign signif sin sinh sinpi sqrt standardGeneric substitute sum switch tan tanh tanpi tracemem trigamma trunc unclass untracemem UseMethod xtfrm"
+},compilerExtensions:[(a,n)=>{if(!a.beforeMatch)return
+;if(a.starts)throw Error("beforeMatch cannot be used with starts")
+;const i=Object.assign({},a);Object.keys(a).forEach((e=>{delete a[e]
+})),a.begin=e(i.beforeMatch,e("(?=",i.begin,")")),a.starts={relevance:0,
+contains:[Object.assign(i,{endsParent:!0})]},a.relevance=0,delete i.beforeMatch
+}],contains:[a.COMMENT(/#'/,/$/,{contains:[{className:"doctag",
+begin:"@examples",starts:{contains:[{begin:/\n/},{begin:/#'\s*(?=@[a-zA-Z]+)/,
+endsParent:!0},{begin:/#'/,end:/$/,excludeBegin:!0}]}},{className:"doctag",
+begin:"@param",end:/$/,contains:[{className:"variable",variants:[{begin:n},{
+begin:/`(?:\\.|[^`\\])+`/}],endsParent:!0}]},{className:"doctag",
+begin:/@[a-zA-Z]+/},{className:"meta-keyword",begin:/\\[a-zA-Z]+/}]
+}),a.HASH_COMMENT_MODE,{className:"string",contains:[a.BACKSLASH_ESCAPE],
+variants:[a.END_SAME_AS_BEGIN({begin:/[rR]"(-*)\(/,end:/\)(-*)"/
+}),a.END_SAME_AS_BEGIN({begin:/[rR]"(-*)\{/,end:/\}(-*)"/
+}),a.END_SAME_AS_BEGIN({begin:/[rR]"(-*)\[/,end:/\](-*)"/
+}),a.END_SAME_AS_BEGIN({begin:/[rR]'(-*)\(/,end:/\)(-*)'/
+}),a.END_SAME_AS_BEGIN({begin:/[rR]'(-*)\{/,end:/\}(-*)'/
+}),a.END_SAME_AS_BEGIN({begin:/[rR]'(-*)\[/,end:/\](-*)'/}),{begin:'"',end:'"',
+relevance:0},{begin:"'",end:"'",relevance:0}]},{className:"number",relevance:0,
+beforeMatch:/([^a-zA-Z0-9._])/,variants:[{
+match:/0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/},{
+match:/0[xX][0-9a-fA-F]+([pP][+-]?\d+)?[Li]?/},{
+match:/(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?[Li]?/}]},{begin:"%",end:"%"},{
+begin:e(/[a-zA-Z][a-zA-Z_0-9]*/,"\\s+<-\\s+")},{begin:"`",end:"`",contains:[{
+begin:/\\./}]}]}}})());
+hljs.registerLanguage("ruby",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>{
+const a="([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)",i={
+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 __FILE__",
+built_in:"proc lambda",literal:"true false nil"},s={className:"doctag",
+begin:"@[A-Za-z]+"},r={begin:"#<",end:">"},b=[n.COMMENT("#","$",{contains:[s]
+}),n.COMMENT("^=begin","^=end",{contains:[s],relevance:10
+}),n.COMMENT("^__END__","\\n$")],c={className:"subst",begin:/#\{/,end:/\}/,
+keywords:i},t={className:"string",contains:[n.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})/},{begin:/\B\?(\\x[A-Fa-f0-9]{1,2})/},{
+begin:/\B\?(\\u\{?[A-Fa-f0-9]{1,6}\}?)/},{
+begin:/\B\?(\\M-\\C-|\\M-\\c|\\c\\M-|\\M-|\\C-\\M-)[\x20-\x7e]/},{
+begin:/\B\?\\(c|C-)[\x20-\x7e]/},{begin:/\B\?\\?\S/},{
+begin:/<<[-~]?'?(\w+)\n(?:[^\n]*\n)*?\s*\1\b/,returnBegin:!0,contains:[{
+begin:/<<[-~]?'?/},n.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,
+contains:[n.BACKSLASH_ESCAPE,c]})]}]},g="[0-9](_?[0-9])*",d={className:"number",
+relevance:0,variants:[{
+begin:`\\b([1-9](_?[0-9])*|0)(\\.(${g}))?([eE][+-]?(${g})|r)?i?\\b`},{
+begin:"\\b0[dD][0-9](_?[0-9])*r?i?\\b"},{begin:"\\b0[bB][0-1](_?[0-1])*r?i?\\b"
+},{begin:"\\b0[oO][0-7](_?[0-7])*r?i?\\b"},{
+begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*r?i?\\b"},{
+begin:"\\b0(_?[0-7])+r?i?\\b"}]},l={className:"params",begin:"\\(",end:"\\)",
+endsParent:!0,keywords:i},o=[t,{className:"class",beginKeywords:"class module",
+end:"$|;",illegal:/=/,contains:[n.inherit(n.TITLE_MODE,{
+begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|!)?"}),{begin:"<\\s*",contains:[{
+begin:"("+n.IDENT_RE+"::)?"+n.IDENT_RE,relevance:0}]}].concat(b)},{
+className:"function",begin:e(/def\s*/,(_=a+"\\s*(\\(|;|$)",e("(?=",_,")"))),
+relevance:0,keywords:"def",end:"$|;",contains:[n.inherit(n.TITLE_MODE,{begin:a
+}),l].concat(b)},{begin:n.IDENT_RE+"::"},{className:"symbol",
+begin:n.UNDERSCORE_IDENT_RE+"(!|\\?)?:",relevance:0},{className:"symbol",
+begin:":(?!\\s)",contains:[t,{begin:a}],relevance:0},d,{className:"variable",
+begin:"(\\$\\W)|((\\$|@@?)(\\w+))(?=[^@$?])(?![A-Za-z])(?![@$?'])"},{
+className:"params",begin:/\|/,end:/\|/,relevance:0,keywords:i},{
+begin:"("+n.RE_STARTERS_RE+"|unless)\\s*",keywords:"unless",contains:[{
+className:"regexp",contains:[n.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,b),relevance:0}].concat(r,b);var _;c.contains=o,l.contains=o
+;const E=[{begin:/^\s*=>/,starts:{end:"$",contains:o}},{className:"meta",
+begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d+(p\\d+)?[^\\d][^>]+>)(?=[ ])",
+starts:{end:"$",contains:o}}];return b.unshift(r),{name:"Ruby",
+aliases:["rb","gemspec","podspec","thor","irb"],keywords:i,illegal:/\/\*/,
+contains:[n.SHEBANG({binary:"ruby"})].concat(E).concat(b).concat(o)}}})());
+hljs.registerLanguage("rust",(()=>{"use strict";return e=>{
+const 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:"->"}]}}})());
+hljs.registerLanguage("scss",(()=>{"use strict"
+;const e=["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","main","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"],t=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],i=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],r=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],o=["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-display","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-variation-settings","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","src","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()
+;return a=>{const n=(e=>({IMPORTANT:{className:"meta",begin:"!important"},
+HEXCOLOR:{className:"number",begin:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"},
+ATTRIBUTE_SELECTOR_MODE:{className:"selector-attr",begin:/\[/,end:/\]/,
+illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]}
+}))(a),l=r,s=i,d="@[a-z-]+",c={className:"variable",
+begin:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b"};return{name:"SCSS",case_insensitive:!0,
+illegal:"[=/|']",contains:[a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,{
+className:"selector-id",begin:"#[A-Za-z0-9_-]+",relevance:0},{
+className:"selector-class",begin:"\\.[A-Za-z0-9_-]+",relevance:0
+},n.ATTRIBUTE_SELECTOR_MODE,{className:"selector-tag",
+begin:"\\b("+e.join("|")+")\\b",relevance:0},{className:"selector-pseudo",
+begin:":("+s.join("|")+")"},{className:"selector-pseudo",
+begin:"::("+l.join("|")+")"},c,{begin:/\(/,end:/\)/,contains:[a.CSS_NUMBER_MODE]
+},{className:"attribute",begin:"\\b("+o.join("|")+")\\b"},{
+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:[c,n.HEXCOLOR,a.CSS_NUMBER_MODE,a.QUOTE_STRING_MODE,a.APOS_STRING_MODE,n.IMPORTANT]
+},{begin:"@(page|font-face)",lexemes:d,keywords:"@page @font-face"},{begin:"@",
+end:"[{;]",returnBegin:!0,keywords:{$pattern:/[a-z-]+/,
+keyword:"and or not only",attribute:t.join(" ")},contains:[{begin:d,
+className:"keyword"},{begin:/[a-z-]+(?=:)/,className:"attribute"
+},c,a.QUOTE_STRING_MODE,a.APOS_STRING_MODE,n.HEXCOLOR,a.CSS_NUMBER_MODE]}]}}
+})());
+hljs.registerLanguage("shell",(()=>{"use strict";return s=>({
+name:"Shell Session",aliases:["console"],contains:[{className:"meta",
+begin:/^\s{0,3}[/~\w\d[\]()@-]*[>%$#]/,starts:{end:/[^\\](?=\s*$)/,
+subLanguage:"bash"}}]})})());
+hljs.registerLanguage("sql",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function r(...r){
+return r.map((r=>e(r))).join("")}function t(...r){
+return"("+r.map((r=>e(r))).join("|")+")"}return e=>{
+const n=e.COMMENT("--","$"),a=["true","false","unknown"],i=["bigint","binary","blob","boolean","char","character","clob","date","dec","decfloat","decimal","float","int","integer","interval","nchar","nclob","national","numeric","real","row","smallint","time","timestamp","varchar","varying","varbinary"],s=["abs","acos","array_agg","asin","atan","avg","cast","ceil","ceiling","coalesce","corr","cos","cosh","count","covar_pop","covar_samp","cume_dist","dense_rank","deref","element","exp","extract","first_value","floor","json_array","json_arrayagg","json_exists","json_object","json_objectagg","json_query","json_table","json_table_primitive","json_value","lag","last_value","lead","listagg","ln","log","log10","lower","max","min","mod","nth_value","ntile","nullif","percent_rank","percentile_cont","percentile_disc","position","position_regex","power","rank","regr_avgx","regr_avgy","regr_count","regr_intercept","regr_r2","regr_slope","regr_sxx","regr_sxy","regr_syy","row_number","sin","sinh","sqrt","stddev_pop","stddev_samp","substring","substring_regex","sum","tan","tanh","translate","translate_regex","treat","trim","trim_array","unnest","upper","value_of","var_pop","var_samp","width_bucket"],o=["create table","insert into","primary key","foreign key","not null","alter table","add constraint","grouping sets","on overflow","character set","respect nulls","ignore nulls","nulls first","nulls last","depth first","breadth first"],c=s,l=["abs","acos","all","allocate","alter","and","any","are","array","array_agg","array_max_cardinality","as","asensitive","asin","asymmetric","at","atan","atomic","authorization","avg","begin","begin_frame","begin_partition","between","bigint","binary","blob","boolean","both","by","call","called","cardinality","cascaded","case","cast","ceil","ceiling","char","char_length","character","character_length","check","classifier","clob","close","coalesce","collate","collect","column","commit","condition","connect","constraint","contains","convert","copy","corr","corresponding","cos","cosh","count","covar_pop","covar_samp","create","cross","cube","cume_dist","current","current_catalog","current_date","current_default_transform_group","current_path","current_role","current_row","current_schema","current_time","current_timestamp","current_path","current_role","current_transform_group_for_type","current_user","cursor","cycle","date","day","deallocate","dec","decimal","decfloat","declare","default","define","delete","dense_rank","deref","describe","deterministic","disconnect","distinct","double","drop","dynamic","each","element","else","empty","end","end_frame","end_partition","end-exec","equals","escape","every","except","exec","execute","exists","exp","external","extract","false","fetch","filter","first_value","float","floor","for","foreign","frame_row","free","from","full","function","fusion","get","global","grant","group","grouping","groups","having","hold","hour","identity","in","indicator","initial","inner","inout","insensitive","insert","int","integer","intersect","intersection","interval","into","is","join","json_array","json_arrayagg","json_exists","json_object","json_objectagg","json_query","json_table","json_table_primitive","json_value","lag","language","large","last_value","lateral","lead","leading","left","like","like_regex","listagg","ln","local","localtime","localtimestamp","log","log10","lower","match","match_number","match_recognize","matches","max","member","merge","method","min","minute","mod","modifies","module","month","multiset","national","natural","nchar","nclob","new","no","none","normalize","not","nth_value","ntile","null","nullif","numeric","octet_length","occurrences_regex","of","offset","old","omit","on","one","only","open","or","order","out","outer","over","overlaps","overlay","parameter","partition","pattern","per","percent","percent_rank","percentile_cont","percentile_disc","period","portion","position","position_regex","power","precedes","precision","prepare","primary","procedure","ptf","range","rank","reads","real","recursive","ref","references","referencing","regr_avgx","regr_avgy","regr_count","regr_intercept","regr_r2","regr_slope","regr_sxx","regr_sxy","regr_syy","release","result","return","returns","revoke","right","rollback","rollup","row","row_number","rows","running","savepoint","scope","scroll","search","second","seek","select","sensitive","session_user","set","show","similar","sin","sinh","skip","smallint","some","specific","specifictype","sql","sqlexception","sqlstate","sqlwarning","sqrt","start","static","stddev_pop","stddev_samp","submultiset","subset","substring","substring_regex","succeeds","sum","symmetric","system","system_time","system_user","table","tablesample","tan","tanh","then","time","timestamp","timezone_hour","timezone_minute","to","trailing","translate","translate_regex","translation","treat","trigger","trim","trim_array","true","truncate","uescape","union","unique","unknown","unnest","update   ","upper","user","using","value","values","value_of","var_pop","var_samp","varbinary","varchar","varying","versioning","when","whenever","where","width_bucket","window","with","within","without","year","add","asc","collation","desc","final","first","last","view"].filter((e=>!s.includes(e))),u={
+begin:r(/\b/,t(...c),/\s*\(/),keywords:{built_in:c}};return{name:"SQL",
+case_insensitive:!0,illegal:/[{}]|<\//,keywords:{$pattern:/\b[\w\.]+/,
+keyword:((e,{exceptions:r,when:t}={})=>{const n=t
+;return r=r||[],e.map((e=>e.match(/\|\d+$/)||r.includes(e)?e:n(e)?e+"|0":e))
+})(l,{when:e=>e.length<3}),literal:a,type:i,
+built_in:["current_catalog","current_date","current_default_transform_group","current_path","current_role","current_schema","current_transform_group_for_type","current_user","session_user","system_time","system_user","current_time","localtime","current_timestamp","localtimestamp"]
+},contains:[{begin:t(...o),keywords:{$pattern:/[\w\.]+/,keyword:l.concat(o),
+literal:a,type:i}},{className:"type",
+begin:t("double precision","large object","with timezone","without timezone")
+},u,{className:"variable",begin:/@[a-z0-9]+/},{className:"string",variants:[{
+begin:/'/,end:/'/,contains:[{begin:/''/}]}]},{begin:/"/,end:/"/,contains:[{
+begin:/""/}]},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,n,{className:"operator",
+begin:/[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,relevance:0}]}}})());
+hljs.registerLanguage("swift",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(e){return a("(?=",e,")")}
+function a(...n){return n.map((n=>e(n))).join("")}function t(...n){
+return"("+n.map((n=>e(n))).join("|")+")"}
+const i=e=>a(/\b/,e,/\w$/.test(e)?/\b/:/\B/),s=["Protocol","Type"].map(i),u=["init","self"].map(i),c=["Any","Self"],r=["associatedtype",/as\?/,/as!/,"as","break","case","catch","class","continue","convenience","default","defer","deinit","didSet","do","dynamic","else","enum","extension","fallthrough",/fileprivate\(set\)/,"fileprivate","final","for","func","get","guard","if","import","indirect","infix",/init\?/,/init!/,"inout",/internal\(set\)/,"internal","in","is","lazy","let","mutating","nonmutating",/open\(set\)/,"open","operator","optional","override","postfix","precedencegroup","prefix",/private\(set\)/,"private","protocol",/public\(set\)/,"public","repeat","required","rethrows","return","set","some","static","struct","subscript","super","switch","throws","throw",/try\?/,/try!/,"try","typealias",/unowned\(safe\)/,/unowned\(unsafe\)/,"unowned","var","weak","where","while","willSet"],o=["false","nil","true"],l=["assignment","associativity","higherThan","left","lowerThan","none","right"],m=["#colorLiteral","#column","#dsohandle","#else","#elseif","#endif","#error","#file","#fileID","#fileLiteral","#filePath","#function","#if","#imageLiteral","#keyPath","#line","#selector","#sourceLocation","#warn_unqualified_access","#warning"],d=["abs","all","any","assert","assertionFailure","debugPrint","dump","fatalError","getVaList","isKnownUniquelyReferenced","max","min","numericCast","pointwiseMax","pointwiseMin","precondition","preconditionFailure","print","readLine","repeatElement","sequence","stride","swap","swift_unboxFromSwiftValueWithType","transcode","type","unsafeBitCast","unsafeDowncast","withExtendedLifetime","withUnsafeMutablePointer","withUnsafePointer","withVaList","withoutActuallyEscaping","zip"],p=t(/[/=\-+!*%<>&|^~?]/,/[\u00A1-\u00A7]/,/[\u00A9\u00AB]/,/[\u00AC\u00AE]/,/[\u00B0\u00B1]/,/[\u00B6\u00BB\u00BF\u00D7\u00F7]/,/[\u2016-\u2017]/,/[\u2020-\u2027]/,/[\u2030-\u203E]/,/[\u2041-\u2053]/,/[\u2055-\u205E]/,/[\u2190-\u23FF]/,/[\u2500-\u2775]/,/[\u2794-\u2BFF]/,/[\u2E00-\u2E7F]/,/[\u3001-\u3003]/,/[\u3008-\u3020]/,/[\u3030]/),F=t(p,/[\u0300-\u036F]/,/[\u1DC0-\u1DFF]/,/[\u20D0-\u20FF]/,/[\uFE00-\uFE0F]/,/[\uFE20-\uFE2F]/),b=a(p,F,"*"),h=t(/[a-zA-Z_]/,/[\u00A8\u00AA\u00AD\u00AF\u00B2-\u00B5\u00B7-\u00BA]/,/[\u00BC-\u00BE\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF]/,/[\u0100-\u02FF\u0370-\u167F\u1681-\u180D\u180F-\u1DBF]/,/[\u1E00-\u1FFF]/,/[\u200B-\u200D\u202A-\u202E\u203F-\u2040\u2054\u2060-\u206F]/,/[\u2070-\u20CF\u2100-\u218F\u2460-\u24FF\u2776-\u2793]/,/[\u2C00-\u2DFF\u2E80-\u2FFF]/,/[\u3004-\u3007\u3021-\u302F\u3031-\u303F\u3040-\uD7FF]/,/[\uF900-\uFD3D\uFD40-\uFDCF\uFDF0-\uFE1F\uFE30-\uFE44]/,/[\uFE47-\uFEFE\uFF00-\uFFFD]/),f=t(h,/\d/,/[\u0300-\u036F\u1DC0-\u1DFF\u20D0-\u20FF\uFE20-\uFE2F]/),w=a(h,f,"*"),y=a(/[A-Z]/,f,"*"),g=["autoclosure",a(/convention\(/,t("swift","block","c"),/\)/),"discardableResult","dynamicCallable","dynamicMemberLookup","escaping","frozen","GKInspectable","IBAction","IBDesignable","IBInspectable","IBOutlet","IBSegueAction","inlinable","main","nonobjc","NSApplicationMain","NSCopying","NSManaged",a(/objc\(/,w,/\)/),"objc","objcMembers","propertyWrapper","requires_stored_property_inits","testable","UIApplicationMain","unknown","usableFromInline"],E=["iOS","iOSApplicationExtension","macOS","macOSApplicationExtension","macCatalyst","macCatalystApplicationExtension","watchOS","watchOSApplicationExtension","tvOS","tvOSApplicationExtension","swift"]
+;return e=>{const p={match:/\s+/,relevance:0},h=e.COMMENT("/\\*","\\*/",{
+contains:["self"]}),v=[e.C_LINE_COMMENT_MODE,h],N={className:"keyword",
+begin:a(/\./,n(t(...s,...u))),end:t(...s,...u),excludeBegin:!0},A={
+match:a(/\./,t(...r)),relevance:0
+},C=r.filter((e=>"string"==typeof e)).concat(["_|0"]),_={variants:[{
+className:"keyword",
+match:t(...r.filter((e=>"string"!=typeof e)).concat(c).map(i),...u)}]},D={
+$pattern:t(/\b\w+/,/#\w+/),keyword:C.concat(m),literal:o},B=[N,A,_],k=[{
+match:a(/\./,t(...d)),relevance:0},{className:"built_in",
+match:a(/\b/,t(...d),/(?=\()/)}],M={match:/->/,relevance:0},S=[M,{
+className:"operator",relevance:0,variants:[{match:b},{match:`\\.(\\.|${F})+`}]
+}],x="([0-9a-fA-F]_*)+",I={className:"number",relevance:0,variants:[{
+match:"\\b(([0-9]_*)+)(\\.(([0-9]_*)+))?([eE][+-]?(([0-9]_*)+))?\\b"},{
+match:`\\b0x(${x})(\\.(${x}))?([pP][+-]?(([0-9]_*)+))?\\b`},{
+match:/\b0o([0-7]_*)+\b/},{match:/\b0b([01]_*)+\b/}]},O=(e="")=>({
+className:"subst",variants:[{match:a(/\\/,e,/[0\\tnr"']/)},{
+match:a(/\\/,e,/u\{[0-9a-fA-F]{1,8}\}/)}]}),T=(e="")=>({className:"subst",
+match:a(/\\/,e,/[\t ]*(?:[\r\n]|\r\n)/)}),L=(e="")=>({className:"subst",
+label:"interpol",begin:a(/\\/,e,/\(/),end:/\)/}),P=(e="")=>({begin:a(e,/"""/),
+end:a(/"""/,e),contains:[O(e),T(e),L(e)]}),$=(e="")=>({begin:a(e,/"/),
+end:a(/"/,e),contains:[O(e),L(e)]}),K={className:"string",
+variants:[P(),P("#"),P("##"),P("###"),$(),$("#"),$("##"),$("###")]},j={
+match:a(/`/,w,/`/)},z=[j,{className:"variable",match:/\$\d+/},{
+className:"variable",match:`\\$${f}+`}],q=[{match:/(@|#)available/,
+className:"keyword",starts:{contains:[{begin:/\(/,end:/\)/,keywords:E,
+contains:[...S,I,K]}]}},{className:"keyword",match:a(/@/,t(...g))},{
+className:"meta",match:a(/@/,w)}],U={match:n(/\b[A-Z]/),relevance:0,contains:[{
+className:"type",
+match:a(/(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)/,f,"+")
+},{className:"type",match:y,relevance:0},{match:/[?!]+/,relevance:0},{
+match:/\.\.\./,relevance:0},{match:a(/\s+&\s+/,n(y)),relevance:0}]},Z={
+begin:/</,end:/>/,keywords:D,contains:[...v,...B,...q,M,U]};U.contains.push(Z)
+;const G={begin:/\(/,end:/\)/,relevance:0,keywords:D,contains:["self",{
+match:a(w,/\s*:/),keywords:"_|0",relevance:0
+},...v,...B,...k,...S,I,K,...z,...q,U]},H={beginKeywords:"func",contains:[{
+className:"title",match:t(j.match,w,b),endsParent:!0,relevance:0},p]},R={
+begin:/</,end:/>/,contains:[...v,U]},V={begin:/\(/,end:/\)/,keywords:D,
+contains:[{begin:t(n(a(w,/\s*:/)),n(a(w,/\s+/,w,/\s*:/))),end:/:/,relevance:0,
+contains:[{className:"keyword",match:/\b_\b/},{className:"params",match:w}]
+},...v,...B,...S,I,K,...q,U,G],endsParent:!0,illegal:/["']/},W={
+className:"function",match:n(/\bfunc\b/),contains:[H,R,V,p],illegal:[/\[/,/%/]
+},X={className:"function",match:/\b(subscript|init[?!]?)\s*(?=[<(])/,keywords:{
+keyword:"subscript init init? init!",$pattern:/\w+[?!]?/},contains:[R,V,p],
+illegal:/\[|%/},J={beginKeywords:"operator",end:e.MATCH_NOTHING_RE,contains:[{
+className:"title",match:b,endsParent:!0,relevance:0}]},Q={
+beginKeywords:"precedencegroup",end:e.MATCH_NOTHING_RE,contains:[{
+className:"title",match:y,relevance:0},{begin:/{/,end:/}/,relevance:0,
+endsParent:!0,keywords:[...l,...o],contains:[U]}]};for(const e of K.variants){
+const n=e.contains.find((e=>"interpol"===e.label));n.keywords=D
+;const a=[...B,...k,...S,I,K,...z];n.contains=[...a,{begin:/\(/,end:/\)/,
+contains:["self",...a]}]}return{name:"Swift",keywords:D,contains:[...v,W,X,{
+className:"class",beginKeywords:"struct protocol class extension enum",
+end:"\\{",excludeEnd:!0,keywords:D,contains:[e.inherit(e.TITLE_MODE,{
+begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/}),...B]},J,Q,{
+beginKeywords:"import",end:/$/,contains:[...v],relevance:0
+},...B,...k,...S,I,K,...z,...q,U,G]}}})());
+hljs.registerLanguage("typescript",(()=>{"use strict"
+;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["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"],a=["true","false","null","undefined","NaN","Infinity"],s=[].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 t(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 i=>{
+const c={$pattern:e,
+keyword:n.concat(["type","namespace","typedef","interface","public","private","protected","implements","declare","abstract","readonly"]),
+literal:a,
+built_in:s.concat(["any","void","number","boolean","string","object","never","enum"])
+},o={className:"meta",begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},l=(e,n,a)=>{
+const s=e.contains.findIndex((e=>e.label===n))
+;if(-1===s)throw Error("can not find mode to replace");e.contains.splice(s,1,a)
+},b=(i=>{const c=e,o={begin:/<[A-Za-z0-9\\._:-]+/,
+end:/\/[A-Za-z0-9\\._:-]+>|\/>/,isTrulyOpeningTag:(e,n)=>{
+const a=e[0].length+e.index,s=e.input[a];"<"!==s?">"===s&&(((e,{after:n})=>{
+const a="</"+e[0].slice(1);return-1!==e.input.indexOf(a,n)})(e,{after:a
+})||n.ignoreMatch()):n.ignoreMatch()}},l={$pattern:e,keyword:n,literal:a,
+built_in:s},b="\\.([0-9](_?[0-9])*)",d="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",g={
+className:"number",variants:[{
+begin:`(\\b(${d})((${b})|\\.)?|(${b}))[eE][+-]?([0-9](_?[0-9])*)\\b`},{
+begin:`\\b(${d})\\b((${b})\\b|\\.)?|(${b})\\b`},{
+begin:"\\b(0|[1-9](_?[0-9])*)n\\b"},{
+begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b"},{
+begin:"\\b0[bB][0-1](_?[0-1])*n?\\b"},{begin:"\\b0[oO][0-7](_?[0-7])*n?\\b"},{
+begin:"\\b0[0-7]+n?\\b"}],relevance:0},u={className:"subst",begin:"\\$\\{",
+end:"\\}",keywords:l,contains:[]},E={begin:"html`",end:"",starts:{end:"`",
+returnEnd:!1,contains:[i.BACKSLASH_ESCAPE,u],subLanguage:"xml"}},m={
+begin:"css`",end:"",starts:{end:"`",returnEnd:!1,
+contains:[i.BACKSLASH_ESCAPE,u],subLanguage:"css"}},_={className:"string",
+begin:"`",end:"`",contains:[i.BACKSLASH_ESCAPE,u]},y={className:"comment",
+variants:[i.COMMENT(/\/\*\*(?!\/)/,"\\*/",{relevance:0,contains:[{
+className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type",begin:"\\{",
+end:"\\}",relevance:0},{className:"variable",begin:c+"(?=\\s*(-)|$)",
+endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]
+}),i.C_BLOCK_COMMENT_MODE,i.C_LINE_COMMENT_MODE]
+},p=[i.APOS_STRING_MODE,i.QUOTE_STRING_MODE,E,m,_,g,i.REGEXP_MODE]
+;u.contains=p.concat({begin:/\{/,end:/\}/,keywords:l,contains:["self"].concat(p)
+});const N=[].concat(y,u.contains),f=N.concat([{begin:/\(/,end:/\)/,keywords:l,
+contains:["self"].concat(N)}]),A={className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:l,contains:f};return{name:"Javascript",
+aliases:["js","jsx","mjs","cjs"],keywords:l,exports:{PARAMS_CONTAINS:f},
+illegal:/#(?![$_A-z])/,contains:[i.SHEBANG({label:"shebang",binary:"node",
+relevance:5}),{label:"use_strict",className:"meta",relevance:10,
+begin:/^\s*['"]use (strict|asm)['"]/
+},i.APOS_STRING_MODE,i.QUOTE_STRING_MODE,E,m,_,y,g,{
+begin:r(/[{,\n]\s*/,t(r(/(((\/\/.*$)|(\/\*(\*[^/]|[^*])*\*\/))\s*)*/,c+"\\s*:"))),
+relevance:0,contains:[{className:"attr",begin:c+t("\\s*:"),relevance:0}]},{
+begin:"("+i.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
+keywords:"return throw case",contains:[y,i.REGEXP_MODE,{className:"function",
+begin:"(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+i.UNDERSCORE_IDENT_RE+")\\s*=>",
+returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{
+begin:i.UNDERSCORE_IDENT_RE,relevance:0},{className:null,begin:/\(\s*\)/,skip:!0
+},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:l,contains:f}]}]
+},{begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{
+variants:[{begin:"<>",end:"</>"},{begin:o.begin,"on:begin":o.isTrulyOpeningTag,
+end:o.end}],subLanguage:"xml",contains:[{begin:o.begin,end:o.end,skip:!0,
+contains:["self"]}]}],relevance:0},{className:"function",
+beginKeywords:"function",end:/[{;]/,excludeEnd:!0,keywords:l,
+contains:["self",i.inherit(i.TITLE_MODE,{begin:c}),A],illegal:/%/},{
+beginKeywords:"while if switch catch for"},{className:"function",
+begin:i.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{",
+returnBegin:!0,contains:[A,i.inherit(i.TITLE_MODE,{begin:c})]},{variants:[{
+begin:"\\."+c},{begin:"\\$"+c}],relevance:0},{className:"class",
+beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"[\]]/,contains:[{
+beginKeywords:"extends"},i.UNDERSCORE_TITLE_MODE]},{begin:/\b(?=constructor)/,
+end:/[{;]/,excludeEnd:!0,contains:[i.inherit(i.TITLE_MODE,{begin:c}),"self",A]
+},{begin:"(get|set)\\s+(?="+c+"\\()",end:/\{/,keywords:"get set",
+contains:[i.inherit(i.TITLE_MODE,{begin:c}),{begin:/\(\)/},A]},{begin:/\$[(.]/}]
+}})(i)
+;return Object.assign(b.keywords,c),b.exports.PARAMS_CONTAINS.push(o),b.contains=b.contains.concat([o,{
+beginKeywords:"namespace",end:/\{/,excludeEnd:!0},{beginKeywords:"interface",
+end:/\{/,excludeEnd:!0,keywords:"interface extends"
+}]),l(b,"shebang",i.SHEBANG()),l(b,"use_strict",{className:"meta",relevance:10,
+begin:/^\s*['"]use strict['"]/
+}),b.contains.find((e=>"function"===e.className)).relevance=0,Object.assign(b,{
+name:"TypeScript",aliases:["ts"]}),b}})());
+hljs.registerLanguage("vbnet",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(...n){
+return n.map((n=>e(n))).join("")}function t(...n){
+return"("+n.map((n=>e(n))).join("|")+")"}return e=>{
+const a=/\d{1,2}\/\d{1,2}\/\d{4}/,i=/\d{4}-\d{1,2}-\d{1,2}/,s=/(\d|1[012])(:\d+){0,2} *(AM|PM)/,r=/\d{1,2}(:\d{1,2}){1,2}/,o={
+className:"literal",variants:[{begin:n(/# */,t(i,a),/ *#/)},{
+begin:n(/# */,r,/ *#/)},{begin:n(/# */,s,/ *#/)},{
+begin:n(/# */,t(i,a),/ +/,t(s,r),/ *#/)}]},l=e.COMMENT(/'''/,/$/,{contains:[{
+className:"doctag",begin:/<\/?/,end:/>/}]}),c=e.COMMENT(null,/$/,{variants:[{
+begin:/'/},{begin:/([\t ]|^)REM(?=\s)/}]});return{name:"Visual Basic .NET",
+aliases:["vb"],case_insensitive:!0,classNameAliases:{label:"symbol"},keywords:{
+keyword:"addhandler alias aggregate ansi as async 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 iterator join key let lib loop me mid module mustinherit mustoverride mybase myclass namespace narrowing new next notinheritable notoverridable of off on operator option optional order overloads overridable overrides paramarray partial preserve private property protected public raiseevent readonly redim 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 yield",
+built_in:"addressof and andalso await directcast gettype getxmlnamespace is isfalse isnot istrue like mod nameof new not or orelse trycast typeof xor cbool cbyte cchar cdate cdbl cdec cint clng cobj csbyte cshort csng cstr cuint culng cushort",
+type:"boolean byte char date decimal double integer long object sbyte short single string uinteger ulong ushort",
+literal:"true false nothing"},
+illegal:"//|\\{|\\}|endif|gosub|variant|wend|^\\$ ",contains:[{
+className:"string",begin:/"(""|[^/n])"C\b/},{className:"string",begin:/"/,
+end:/"/,illegal:/\n/,contains:[{begin:/""/}]},o,{className:"number",relevance:0,
+variants:[{begin:/\b\d[\d_]*((\.[\d_]+(E[+-]?[\d_]+)?)|(E[+-]?[\d_]+))[RFD@!#]?/
+},{begin:/\b\d[\d_]*((U?[SIL])|[%&])?/},{begin:/&H[\dA-F_]+((U?[SIL])|[%&])?/},{
+begin:/&O[0-7_]+((U?[SIL])|[%&])?/},{begin:/&B[01_]+((U?[SIL])|[%&])?/}]},{
+className:"label",begin:/^\w+:/},l,c,{className:"meta",
+begin:/[\t ]*#(const|disable|else|elseif|enable|end|externalsource|if|region)\b/,
+end:/$/,keywords:{
+"meta-keyword":"const disable else elseif enable end externalsource if region then"
+},contains:[c]}]}}})());
+hljs.registerLanguage("yaml",(()=>{"use strict";return 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,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:"[\\|>]([1-9]?[+-])?[ ]*\\n( +)[^ ][^\\n]*\\n(\\2[^\\n]+\\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",relevance:0},t,g,s],r=[...b]
+;return r.pop(),r.push(i),l.contains=r,{name:"YAML",case_insensitive:!0,
+aliases:["yml","YAML"],contains:b}}})());
\ 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..55707c2af5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/1c.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/1c.min.js
@@ -1 +1,23 @@
-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",(()=>{"use strict";return s=>{
+var x="[A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_][A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_0-9]+",n="\u0434\u0430\u043b\u0435\u0435 \u0432\u043e\u0437\u0432\u0440\u0430\u0442 \u0432\u044b\u0437\u0432\u0430\u0442\u044c\u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0434\u043b\u044f \u0435\u0441\u043b\u0438 \u0438 \u0438\u0437 \u0438\u043b\u0438 \u0438\u043d\u0430\u0447\u0435 \u0438\u043d\u0430\u0447\u0435\u0435\u0441\u043b\u0438 \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u043a\u043e\u043d\u0435\u0446\u0435\u0441\u043b\u0438 \u043a\u043e\u043d\u0435\u0446\u043f\u043e\u043f\u044b\u0442\u043a\u0438 \u043a\u043e\u043d\u0435\u0446\u0446\u0438\u043a\u043b\u0430 \u043d\u0435 \u043d\u043e\u0432\u044b\u0439 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u043f\u0435\u0440\u0435\u043c \u043f\u043e \u043f\u043e\u043a\u0430 \u043f\u043e\u043f\u044b\u0442\u043a\u0430 \u043f\u0440\u0435\u0440\u0432\u0430\u0442\u044c \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u0442\u043e\u0433\u0434\u0430 \u0446\u0438\u043a\u043b \u044d\u043a\u0441\u043f\u043e\u0440\u0442 ",e="null \u0438\u0441\u0442\u0438\u043d\u0430 \u043b\u043e\u0436\u044c \u043d\u0435\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e",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}"}]},m=s.inherit(s.C_LINE_COMMENT_MODE)
+;return{name:"1C:Enterprise",case_insensitive:!0,keywords:{$pattern:x,keyword:n,
+built_in:"\u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435\u043b\u044c\u0441\u0442\u0440\u0430\u043d\u0438\u0446 \u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435\u043b\u044c\u0441\u0442\u0440\u043e\u043a \u0441\u0438\u043c\u0432\u043e\u043b\u0442\u0430\u0431\u0443\u043b\u044f\u0446\u0438\u0438 ansitooem oemtoansi \u0432\u0432\u0435\u0441\u0442\u0438\u0432\u0438\u0434\u0441\u0443\u0431\u043a\u043e\u043d\u0442\u043e \u0432\u0432\u0435\u0441\u0442\u0438\u043f\u0435\u0440\u0435\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u0435 \u0432\u0432\u0435\u0441\u0442\u0438\u043f\u0435\u0440\u0438\u043e\u0434 \u0432\u0432\u0435\u0441\u0442\u0438\u043f\u043b\u0430\u043d\u0441\u0447\u0435\u0442\u043e\u0432 \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0439\u043f\u043b\u0430\u043d\u0441\u0447\u0435\u0442\u043e\u0432 \u0434\u0430\u0442\u0430\u0433\u043e\u0434 \u0434\u0430\u0442\u0430\u043c\u0435\u0441\u044f\u0446 \u0434\u0430\u0442\u0430\u0447\u0438\u0441\u043b\u043e \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a\u0441\u0438\u0441\u0442\u0435\u043c\u044b \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0432\u0441\u0442\u0440\u043e\u043a\u0443 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0438\u0437\u0441\u0442\u0440\u043e\u043a\u0438 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0438\u0431 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043a\u043e\u0434\u0441\u0438\u043c\u0432 \u043a\u043e\u043d\u0433\u043e\u0434\u0430 \u043a\u043e\u043d\u0435\u0446\u043f\u0435\u0440\u0438\u043e\u0434\u0430\u0431\u0438 \u043a\u043e\u043d\u0435\u0446\u0440\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u043d\u043d\u043e\u0433\u043e\u043f\u0435\u0440\u0438\u043e\u0434\u0430\u0431\u0438 \u043a\u043e\u043d\u0435\u0446\u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0433\u043e\u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b\u0430 \u043a\u043e\u043d\u043a\u0432\u0430\u0440\u0442\u0430\u043b\u0430 \u043a\u043e\u043d\u043c\u0435\u0441\u044f\u0446\u0430 \u043a\u043e\u043d\u043d\u0435\u0434\u0435\u043b\u0438 \u043b\u043e\u0433 \u043b\u043e\u043310 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435\u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e\u0441\u0443\u0431\u043a\u043e\u043d\u0442\u043e \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435\u043d\u0430\u0431\u043e\u0440\u0430\u043f\u0440\u0430\u0432 \u043d\u0430\u0437\u043d\u0430\u0447\u0438\u0442\u044c\u0432\u0438\u0434 \u043d\u0430\u0437\u043d\u0430\u0447\u0438\u0442\u044c\u0441\u0447\u0435\u0442 \u043d\u0430\u0439\u0442\u0438\u0441\u0441\u044b\u043b\u043a\u0438 \u043d\u0430\u0447\u0430\u043b\u043e\u043f\u0435\u0440\u0438\u043e\u0434\u0430\u0431\u0438 \u043d\u0430\u0447\u0430\u043b\u043e\u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0433\u043e\u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b\u0430 \u043d\u0430\u0447\u0433\u043e\u0434\u0430 \u043d\u0430\u0447\u043a\u0432\u0430\u0440\u0442\u0430\u043b\u0430 \u043d\u0430\u0447\u043c\u0435\u0441\u044f\u0446\u0430 \u043d\u0430\u0447\u043d\u0435\u0434\u0435\u043b\u0438 \u043d\u043e\u043c\u0435\u0440\u0434\u043d\u044f\u0433\u043e\u0434\u0430 \u043d\u043e\u043c\u0435\u0440\u0434\u043d\u044f\u043d\u0435\u0434\u0435\u043b\u0438 \u043d\u043e\u043c\u0435\u0440\u043d\u0435\u0434\u0435\u043b\u0438\u0433\u043e\u0434\u0430 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0430\u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439\u0436\u0443\u0440\u043d\u0430\u043b\u0440\u0430\u0441\u0447\u0435\u0442\u043e\u0432 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439\u043f\u043b\u0430\u043d\u0441\u0447\u0435\u0442\u043e\u0432 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439\u044f\u0437\u044b\u043a \u043e\u0447\u0438\u0441\u0442\u0438\u0442\u044c\u043e\u043a\u043d\u043e\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 \u043f\u0435\u0440\u0438\u043e\u0434\u0441\u0442\u0440 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0432\u0440\u0435\u043c\u044f\u0442\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0434\u0430\u0442\u0443\u0442\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0442\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\u043e\u0442\u0431\u043e\u0440\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043f\u043e\u0437\u0438\u0446\u0438\u044e\u0442\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043f\u0443\u0441\u0442\u043e\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0442\u0430 \u043f\u0440\u0435\u0444\u0438\u043a\u0441\u0430\u0432\u0442\u043e\u043d\u0443\u043c\u0435\u0440\u0430\u0446\u0438\u0438 \u043f\u0440\u043e\u043f\u0438\u0441\u044c \u043f\u0443\u0441\u0442\u043e\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0440\u0430\u0437\u043c \u0440\u0430\u0437\u043e\u0431\u0440\u0430\u0442\u044c\u043f\u043e\u0437\u0438\u0446\u0438\u044e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0440\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u0442\u044c\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u044b\u043d\u0430 \u0440\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u0442\u044c\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u044b\u043f\u043e \u0441\u0438\u043c\u0432 \u0441\u043e\u0437\u0434\u0430\u0442\u044c\u043e\u0431\u044a\u0435\u043a\u0442 \u0441\u0442\u0430\u0442\u0443\u0441\u0432\u043e\u0437\u0432\u0440\u0430\u0442\u0430 \u0441\u0442\u0440\u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e\u0441\u0442\u0440\u043e\u043a \u0441\u0444\u043e\u0440\u043c\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u043f\u043e\u0437\u0438\u0446\u0438\u044e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0441\u0447\u0435\u0442\u043f\u043e\u043a\u043e\u0434\u0443 \u0442\u0435\u043a\u0443\u0449\u0435\u0435\u0432\u0440\u0435\u043c\u044f \u0442\u0438\u043f\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0442\u0438\u043f\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\u0441\u0442\u0440 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0442\u0430\u043d\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0442\u0430\u043f\u043e \u0444\u0438\u043a\u0441\u0448\u0430\u0431\u043b\u043e\u043d \u0448\u0430\u0431\u043b\u043e\u043d acos asin atan base64\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 base64\u0441\u0442\u0440\u043e\u043a\u0430 cos exp log log10 pow sin sqrt tan xml\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 xml\u0441\u0442\u0440\u043e\u043a\u0430 xml\u0442\u0438\u043f xml\u0442\u0438\u043f\u0437\u043d\u0447 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0435\u043e\u043a\u043d\u043e \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u044b\u0439\u0440\u0435\u0436\u0438\u043c \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u044b\u0439\u0440\u0435\u0436\u0438\u043c\u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0438\u044f\u0434\u0430\u043d\u043d\u044b\u0445 \u0431\u0443\u043b\u0435\u0432\u043e \u0432\u0432\u0435\u0441\u0442\u0438\u0434\u0430\u0442\u0443 \u0432\u0432\u0435\u0441\u0442\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0432\u0432\u0435\u0441\u0442\u0438\u0441\u0442\u0440\u043e\u043a\u0443 \u0432\u0432\u0435\u0441\u0442\u0438\u0447\u0438\u0441\u043b\u043e \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c\u0447\u0442\u0435\u043d\u0438\u044fxml \u0432\u043e\u043f\u0440\u043e\u0441 \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0432\u0440\u0435\u0433 \u0432\u044b\u0433\u0440\u0443\u0437\u0438\u0442\u044c\u0436\u0443\u0440\u043d\u0430\u043b\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0443\u043e\u043f\u043e\u0432\u0435\u0449\u0435\u043d\u0438\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c\u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0443\u043f\u0440\u0430\u0432\u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u0432\u044b\u0447\u0438\u0441\u043b\u0438\u0442\u044c \u0433\u043e\u0434 \u0434\u0430\u043d\u043d\u044b\u0435\u0444\u043e\u0440\u043c\u044b\u0432\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0434\u0430\u0442\u0430 \u0434\u0435\u043d\u044c \u0434\u0435\u043d\u044c\u0433\u043e\u0434\u0430 \u0434\u0435\u043d\u044c\u043d\u0435\u0434\u0435\u043b\u0438 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c\u043c\u0435\u0441\u044f\u0446 \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0434\u0430\u043d\u043d\u044b\u0435\u0434\u043b\u044f\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0440\u0430\u0431\u043e\u0442\u0443\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c\u0440\u0430\u0431\u043e\u0442\u0443\u0441\u0438\u0441\u0442\u0435\u043c\u044b \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c\u0432\u043d\u0435\u0448\u043d\u044e\u044e\u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0443 \u0437\u0430\u043a\u0440\u044b\u0442\u044c\u0441\u043f\u0440\u0430\u0432\u043a\u0443 \u0437\u0430\u043f\u0438\u0441\u0430\u0442\u044cjson \u0437\u0430\u043f\u0438\u0441\u0430\u0442\u044cxml \u0437\u0430\u043f\u0438\u0441\u0430\u0442\u044c\u0434\u0430\u0442\u0443json \u0437\u0430\u043f\u0438\u0441\u044c\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0437\u0430\u043f\u043e\u043b\u043d\u0438\u0442\u044c\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\u0441\u0432\u043e\u0439\u0441\u0442\u0432 \u0437\u0430\u043f\u0440\u043e\u0441\u0438\u0442\u044c\u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0435\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c\u0441\u0438\u0441\u0442\u0435\u043c\u0443 \u0437\u0430\u0444\u0438\u043a\u0441\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0432\u0434\u0430\u043d\u043d\u044b\u0435\u0444\u043e\u0440\u043c\u044b \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0432\u0441\u0442\u0440\u043e\u043a\u0443\u0432\u043d\u0443\u0442\u0440 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0432\u0444\u0430\u0439\u043b \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0437\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0438\u0437\u0441\u0442\u0440\u043e\u043a\u0438\u0432\u043d\u0443\u0442\u0440 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0438\u0437\u0444\u0430\u0439\u043b\u0430 \u0438\u0437xml\u0442\u0438\u043f\u0430 \u0438\u043c\u043f\u043e\u0440\u0442\u043c\u043e\u0434\u0435\u043b\u0438xdto \u0438\u043c\u044f\u043a\u043e\u043c\u043f\u044c\u044e\u0442\u0435\u0440\u0430 \u0438\u043c\u044f\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u043f\u0440\u0435\u0434\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0435\u0434\u0430\u043d\u043d\u044b\u0435 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f\u043e\u0431\u043e\u0448\u0438\u0431\u043a\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0438\u043c\u043e\u0431\u0438\u043b\u044c\u043d\u043e\u0433\u043e\u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u044b\u0445\u0444\u0430\u0439\u043b\u043e\u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b \u043a\u043e\u0434\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u0442\u0440\u043e\u043a\u0443 \u043a\u043e\u0434\u043b\u043e\u043a\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u043a\u043e\u0434\u0441\u0438\u043c\u0432\u043e\u043b\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0430\u0441\u0438\u0441\u0442\u0435\u043c\u044b \u043a\u043e\u043d\u0435\u0446\u0433\u043e\u0434\u0430 \u043a\u043e\u043d\u0435\u0446\u0434\u043d\u044f \u043a\u043e\u043d\u0435\u0446\u043a\u0432\u0430\u0440\u0442\u0430\u043b\u0430 \u043a\u043e\u043d\u0435\u0446\u043c\u0435\u0441\u044f\u0446\u0430 \u043a\u043e\u043d\u0435\u0446\u043c\u0438\u043d\u0443\u0442\u044b \u043a\u043e\u043d\u0435\u0446\u043d\u0435\u0434\u0435\u043b\u0438 \u043a\u043e\u043d\u0435\u0446\u0447\u0430\u0441\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f\u0431\u0430\u0437\u044b\u0434\u0430\u043d\u043d\u044b\u0445\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0430\u0434\u0438\u043d\u0430\u043c\u0438\u0447\u0435\u0441\u043a\u0438 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0430 \u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0434\u0430\u043d\u043d\u044b\u0435\u0444\u043e\u0440\u043c\u044b \u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0444\u0430\u0439\u043b \u043a\u0440\u0430\u0442\u043a\u043e\u0435\u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043e\u0448\u0438\u0431\u043a\u0438 \u043b\u0435\u0432 \u043c\u0430\u043a\u0441 \u043c\u0435\u0441\u0442\u043d\u043e\u0435\u0432\u0440\u0435\u043c\u044f \u043c\u0435\u0441\u044f\u0446 \u043c\u0438\u043d \u043c\u0438\u043d\u0443\u0442\u0430 \u043c\u043e\u043d\u043e\u043f\u043e\u043b\u044c\u043d\u044b\u0439\u0440\u0435\u0436\u0438\u043c \u043d\u0430\u0439\u0442\u0438 \u043d\u0430\u0439\u0442\u0438\u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0435\u0441\u0438\u043c\u0432\u043e\u043b\u044bxml \u043d\u0430\u0439\u0442\u0438\u043e\u043a\u043d\u043e\u043f\u043e\u043d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0441\u0441\u044b\u043b\u043a\u0435 \u043d\u0430\u0439\u0442\u0438\u043f\u043e\u043c\u0435\u0447\u0435\u043d\u043d\u044b\u0435\u043d\u0430\u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u043d\u0430\u0439\u0442\u0438\u043f\u043e\u0441\u0441\u044b\u043b\u043a\u0430\u043c \u043d\u0430\u0439\u0442\u0438\u0444\u0430\u0439\u043b\u044b \u043d\u0430\u0447\u0430\u043b\u043e\u0433\u043e\u0434\u0430 \u043d\u0430\u0447\u0430\u043b\u043e\u0434\u043d\u044f \u043d\u0430\u0447\u0430\u043b\u043e\u043a\u0432\u0430\u0440\u0442\u0430\u043b\u0430 \u043d\u0430\u0447\u0430\u043b\u043e\u043c\u0435\u0441\u044f\u0446\u0430 \u043d\u0430\u0447\u0430\u043b\u043e\u043c\u0438\u043d\u0443\u0442\u044b \u043d\u0430\u0447\u0430\u043b\u043e\u043d\u0435\u0434\u0435\u043b\u0438 \u043d\u0430\u0447\u0430\u043b\u043e\u0447\u0430\u0441\u0430 \u043d\u0430\u0447\u0430\u0442\u044c\u0437\u0430\u043f\u0440\u043e\u0441\u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043d\u0430\u0447\u0430\u0442\u044c\u0437\u0430\u043f\u0443\u0441\u043a\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043d\u0430\u0447\u0430\u0442\u044c\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435\u0444\u0430\u0439\u043b\u0430 \u043d\u0430\u0447\u0430\u0442\u044c\u043f\u0435\u0440\u0435\u043c\u0435\u0449\u0435\u043d\u0438\u0435\u0444\u0430\u0439\u043b\u0430 \u043d\u0430\u0447\u0430\u0442\u044c\u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435\u0432\u043d\u0435\u0448\u043d\u0435\u0439\u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u044b \u043d\u0430\u0447\u0430\u0442\u044c\u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f\u0440\u0430\u0431\u043e\u0442\u044b\u0441\u043a\u0440\u0438\u043f\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0435\u0439 \u043d\u0430\u0447\u0430\u0442\u044c\u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f\u0440\u0430\u0431\u043e\u0442\u044b\u0441\u0444\u0430\u0439\u043b\u0430\u043c\u0438 \u043d\u0430\u0447\u0430\u0442\u044c\u043f\u043e\u0438\u0441\u043a\u0444\u0430\u0439\u043b\u043e\u0432 \u043d\u0430\u0447\u0430\u0442\u044c\u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0435\u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u044b\u0445\u0444\u0430\u0439\u043b\u043e\u0432 \u043d\u0430\u0447\u0430\u0442\u044c\u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0435\u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u043d\u0430\u0447\u0430\u0442\u044c\u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0435\u0440\u0430\u0431\u043e\u0447\u0435\u0433\u043e\u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430\u0434\u0430\u043d\u043d\u044b\u0445\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043d\u0430\u0447\u0430\u0442\u044c\u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0435\u0444\u0430\u0439\u043b\u043e\u0432 \u043d\u0430\u0447\u0430\u0442\u044c\u043f\u043e\u043c\u0435\u0449\u0435\u043d\u0438\u0435\u0444\u0430\u0439\u043b\u0430 \u043d\u0430\u0447\u0430\u0442\u044c\u043f\u043e\u043c\u0435\u0449\u0435\u043d\u0438\u0435\u0444\u0430\u0439\u043b\u043e\u0432 \u043d\u0430\u0447\u0430\u0442\u044c\u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435\u0434\u0432\u043e\u0438\u0447\u043d\u044b\u0445\u0434\u0430\u043d\u043d\u044b\u0445\u0438\u0437\u0444\u0430\u0439\u043b\u0430 \u043d\u0430\u0447\u0430\u0442\u044c\u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435\u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \u043d\u0430\u0447\u0430\u0442\u044c\u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044e \u043d\u0430\u0447\u0430\u0442\u044c\u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435\u0444\u0430\u0439\u043b\u043e\u0432 \u043d\u0430\u0447\u0430\u0442\u044c\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0443\u0432\u043d\u0435\u0448\u043d\u0435\u0439\u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u044b \u043d\u0430\u0447\u0430\u0442\u044c\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0443\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f\u0440\u0430\u0431\u043e\u0442\u044b\u0441\u043a\u0440\u0438\u043f\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0435\u0439 \u043d\u0430\u0447\u0430\u0442\u044c\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0443\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f\u0440\u0430\u0431\u043e\u0442\u044b\u0441\u0444\u0430\u0439\u043b\u0430\u043c\u0438 \u043d\u0435\u0434\u0435\u043b\u044f\u0433\u043e\u0434\u0430 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e\u0441\u0442\u044c\u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u044f\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f \u043d\u043e\u043c\u0435\u0440\u0441\u0435\u0430\u043d\u0441\u0430\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u043d\u043e\u043c\u0435\u0440\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u043d\u0440\u0435\u0433 \u043d\u0441\u0442\u0440 \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441 \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c\u043d\u0443\u043c\u0435\u0440\u0430\u0446\u0438\u044e\u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432 \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c\u043f\u043e\u0432\u0442\u043e\u0440\u043d\u043e\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0430\u043f\u0440\u0435\u0440\u044b\u0432\u0430\u043d\u0438\u044f\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c\u0444\u0430\u0439\u043b\u044b \u043e\u043a\u0440 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435\u043e\u0448\u0438\u0431\u043a\u0438 \u043e\u043f\u043e\u0432\u0435\u0441\u0442\u0438\u0442\u044c \u043e\u043f\u043e\u0432\u0435\u0441\u0442\u0438\u0442\u044c\u043e\u0431\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0438 \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0437\u0430\u043f\u0440\u043e\u0441\u0430\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a\u043a\u043b\u0438\u0435\u043d\u0442\u0430\u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u043f\u043e\u0432\u0435\u0449\u0435\u043d\u0438\u044f \u043e\u0442\u043a\u0440\u044b\u0442\u044c\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u043e\u0442\u043a\u0440\u044b\u0442\u044c\u0438\u043d\u0434\u0435\u043a\u0441\u0441\u043f\u0440\u0430\u0432\u043a\u0438 \u043e\u0442\u043a\u0440\u044b\u0442\u044c\u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435\u0441\u043f\u0440\u0430\u0432\u043a\u0438 \u043e\u0442\u043a\u0440\u044b\u0442\u044c\u0441\u043f\u0440\u0430\u0432\u043a\u0443 \u043e\u0442\u043a\u0440\u044b\u0442\u044c\u0444\u043e\u0440\u043c\u0443 \u043e\u0442\u043a\u0440\u044b\u0442\u044c\u0444\u043e\u0440\u043c\u0443\u043c\u043e\u0434\u0430\u043b\u044c\u043d\u043e \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c\u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044e \u043e\u0447\u0438\u0441\u0442\u0438\u0442\u044c\u0436\u0443\u0440\u043d\u0430\u043b\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u043e\u0447\u0438\u0441\u0442\u0438\u0442\u044c\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043e\u0447\u0438\u0441\u0442\u0438\u0442\u044c\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b\u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043f\u0435\u0440\u0435\u0439\u0442\u0438\u043f\u043e\u043d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0441\u0441\u044b\u043b\u043a\u0435 \u043f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u044c\u0444\u0430\u0439\u043b \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0432\u043d\u0435\u0448\u043d\u044e\u044e\u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0443 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0437\u0430\u043f\u0440\u043e\u0441\u0430\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a\u043a\u043b\u0438\u0435\u043d\u0442\u0430\u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u043f\u043e\u0432\u0435\u0449\u0435\u043d\u0438\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435\u0440\u0430\u0431\u043e\u0442\u044b\u0441\u043a\u0440\u0438\u043f\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0435\u0439 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435\u0440\u0430\u0431\u043e\u0442\u044b\u0441\u0444\u0430\u0439\u043b\u0430\u043c\u0438 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0435\u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043e\u0448\u0438\u0431\u043a\u0438 \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c\u0432\u0432\u043e\u0434\u0434\u0430\u0442\u044b \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c\u0432\u0432\u043e\u0434\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c\u0432\u0432\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0438 \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c\u0432\u0432\u043e\u0434\u0447\u0438\u0441\u043b\u0430 \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c\u0432\u043e\u043f\u0440\u043e\u0441 \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e\u043e\u0431\u043e\u0448\u0438\u0431\u043a\u0435 \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c\u043d\u0430\u043a\u0430\u0440\u0442\u0435 \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c\u043e\u043f\u043e\u0432\u0435\u0449\u0435\u043d\u0438\u0435\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c\u043f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u043d\u043e\u0435\u0438\u043c\u044f\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044ccom\u043e\u0431\u044a\u0435\u043a\u0442 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044cxml\u0442\u0438\u043f \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0430\u0434\u0440\u0435\u0441\u043f\u043e\u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u043a\u0443\u0441\u0435\u0430\u043d\u0441\u043e\u0432 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0432\u0440\u0435\u043c\u044f\u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u044f\u0441\u043f\u044f\u0449\u0435\u0433\u043e\u0441\u0435\u0430\u043d\u0441\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0432\u0440\u0435\u043c\u044f\u0437\u0430\u0441\u044b\u043f\u0430\u043d\u0438\u044f\u043f\u0430\u0441\u0441\u0438\u0432\u043d\u043e\u0433\u043e\u0441\u0435\u0430\u043d\u0441\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0432\u0440\u0435\u043c\u044f\u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0434\u0430\u043d\u043d\u044b\u0435\u0432\u044b\u0431\u043e\u0440\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043a\u043b\u0438\u0435\u043d\u0442\u0430\u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0435\u043a\u043e\u0434\u044b\u043b\u043e\u043a\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0435\u0447\u0430\u0441\u043e\u0432\u044b\u0435\u043f\u043e\u044f\u0441\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a\u043a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u043e\u0433\u043e\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a\u0441\u0438\u0441\u0442\u0435\u043c\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\u043e\u0442\u0431\u043e\u0440\u0430\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0438\u0437\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0433\u043e\u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0438\u043c\u044f\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0433\u043e\u0444\u0430\u0439\u043b\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0438\u043c\u044f\u043a\u043b\u0438\u0435\u043d\u0442\u0430\u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e\u044d\u043a\u0440\u0430\u043d\u043e\u0432\u043a\u043b\u0438\u0435\u043d\u0442\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0441\u043e\u0431\u044b\u0442\u0438\u044f\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043a\u0440\u0430\u0442\u043a\u0438\u0439\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043c\u0430\u043a\u0435\u0442\u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u044f \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043c\u0430\u0441\u043a\u0443\u0432\u0441\u0435\u0444\u0430\u0439\u043b\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043c\u0430\u0441\u043a\u0443\u0432\u0441\u0435\u0444\u0430\u0439\u043b\u044b\u043a\u043b\u0438\u0435\u043d\u0442\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043c\u0430\u0441\u043a\u0443\u0432\u0441\u0435\u0444\u0430\u0439\u043b\u044b\u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u043f\u043e\u0430\u0434\u0440\u0435\u0441\u0443 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043c\u0438\u043d\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e\u0434\u043b\u0438\u043d\u0443\u043f\u0430\u0440\u043e\u043b\u0435\u0439\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u043e\u043d\u043d\u0443\u044e\u0441\u0441\u044b\u043b\u043a\u0443 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u043e\u043d\u043d\u0443\u044e\u0441\u0441\u044b\u043b\u043a\u0443\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438\u0431\u0430\u0437\u044b\u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u0440\u0435\u0434\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0445\u0434\u0430\u043d\u043d\u044b\u0445\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043e\u0431\u0449\u0438\u0439\u043c\u0430\u043a\u0435\u0442 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043e\u0431\u0449\u0443\u044e\u0444\u043e\u0440\u043c\u0443 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043e\u043a\u043d\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043e\u043f\u0435\u0440\u0430\u0442\u0438\u0432\u043d\u0443\u044e\u043e\u0442\u043c\u0435\u0442\u043a\u0443\u0432\u0440\u0435\u043c\u0435\u043d\u0438 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435\u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0433\u043e\u0440\u0435\u0436\u0438\u043c\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b\u0444\u0443\u043d\u043a\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0445\u043e\u043f\u0446\u0438\u0439\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043f\u043e\u043b\u043d\u043e\u0435\u0438\u043c\u044f\u043f\u0440\u0435\u0434\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u043e\u0433\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u043d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0445\u0441\u0441\u044b\u043b\u043e\u043a \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0443\u0441\u043b\u043e\u0436\u043d\u043e\u0441\u0442\u0438\u043f\u0430\u0440\u043e\u043b\u0435\u0439\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435\u043b\u044c\u043f\u0443\u0442\u0438 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435\u043b\u044c\u043f\u0443\u0442\u0438\u043a\u043b\u0438\u0435\u043d\u0442\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435\u043b\u044c\u043f\u0443\u0442\u0438\u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0441\u0435\u0430\u043d\u0441\u044b\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c\u043a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u043e\u0433\u043e\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435\u043e\u0431\u044a\u0435\u043a\u0442\u0430\u0438\u0444\u043e\u0440\u043c\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0441\u043e\u0441\u0442\u0430\u0432\u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0433\u043e\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430odata \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0443\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f\u0431\u0430\u0437\u044b\u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0442\u0435\u043a\u0443\u0449\u0438\u0439\u0441\u0435\u0430\u043d\u0441\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0444\u0430\u0439\u043b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0444\u0430\u0439\u043b\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0444\u043e\u0440\u043c\u0443 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0444\u0443\u043d\u043a\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u0443\u044e\u043e\u043f\u0446\u0438\u044e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0444\u0443\u043d\u043a\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u0443\u044e\u043e\u043f\u0446\u0438\u044e\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0447\u0430\u0441\u043e\u0432\u043e\u0439\u043f\u043e\u044f\u0441\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438\u043e\u0441 \u043f\u043e\u043c\u0435\u0441\u0442\u0438\u0442\u044c\u0432\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0435\u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u043f\u043e\u043c\u0435\u0441\u0442\u0438\u0442\u044c\u0444\u0430\u0439\u043b \u043f\u043e\u043c\u0435\u0441\u0442\u0438\u0442\u044c\u0444\u0430\u0439\u043b\u044b \u043f\u0440\u0430\u0432 \u043f\u0440\u0430\u0432\u043e\u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043f\u0440\u0435\u0434\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u043e\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043a\u043e\u0434\u0430\u043b\u043e\u043a\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u0435\u0440\u0438\u043e\u0434\u0430 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u0440\u0430\u0432\u0430 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u0441\u043e\u0431\u044b\u0442\u0438\u044f\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u0447\u0430\u0441\u043e\u0432\u043e\u0433\u043e\u043f\u043e\u044f\u0441\u0430 \u043f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435 \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0438\u0442\u044c\u0440\u0430\u0431\u043e\u0442\u0443\u0441\u0438\u0441\u0442\u0435\u043c\u044b \u043f\u0440\u0438\u0432\u0438\u043b\u0435\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439\u0440\u0435\u0436\u0438\u043c \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c\u0432\u044b\u0437\u043e\u0432 \u043f\u0440\u043e\u0447\u0438\u0442\u0430\u0442\u044cjson \u043f\u0440\u043e\u0447\u0438\u0442\u0430\u0442\u044cxml \u043f\u0440\u043e\u0447\u0438\u0442\u0430\u0442\u044c\u0434\u0430\u0442\u0443json \u043f\u0443\u0441\u0442\u0430\u044f\u0441\u0442\u0440\u043e\u043a\u0430 \u0440\u0430\u0431\u043e\u0447\u0438\u0439\u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0434\u0430\u043d\u043d\u044b\u0445\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0440\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0434\u0430\u043d\u043d\u044b\u0435\u0434\u043b\u044f\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c\u0444\u0430\u0439\u043b \u0440\u0430\u0437\u043e\u0440\u0432\u0430\u0442\u044c\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435\u0441\u0432\u043d\u0435\u0448\u043d\u0438\u043c\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u043e\u043c\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0441\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u0442\u0440\u043e\u043a\u0443 \u0440\u043e\u043b\u044c\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430 \u0441\u0435\u043a\u0443\u043d\u0434\u0430 \u0441\u0438\u0433\u043d\u0430\u043b \u0441\u0438\u043c\u0432\u043e\u043b \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0436\u0443\u0440\u043d\u0430\u043b\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0441\u043c\u0435\u0449\u0435\u043d\u0438\u0435\u043b\u0435\u0442\u043d\u0435\u0433\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u0438 \u0441\u043c\u0435\u0449\u0435\u043d\u0438\u0435\u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0433\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u0438 \u0441\u043e\u0435\u0434\u0438\u043d\u0438\u0442\u044c\u0431\u0443\u0444\u0435\u0440\u044b\u0434\u0432\u043e\u0438\u0447\u043d\u044b\u0445\u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u043e\u0437\u0434\u0430\u0442\u044c\u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u0441\u043e\u0437\u0434\u0430\u0442\u044c\u0444\u0430\u0431\u0440\u0438\u043a\u0443xdto \u0441\u043e\u043a\u0440\u043b \u0441\u043e\u043a\u0440\u043b\u043f \u0441\u043e\u043a\u0440\u043f \u0441\u043e\u043e\u0431\u0449\u0438\u0442\u044c \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0441\u0440\u0435\u0434 \u0441\u0442\u0440\u0434\u043b\u0438\u043d\u0430 \u0441\u0442\u0440\u0437\u0430\u043a\u0430\u043d\u0447\u0438\u0432\u0430\u0435\u0442\u0441\u044f\u043d\u0430 \u0441\u0442\u0440\u0437\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0442\u0440\u043d\u0430\u0439\u0442\u0438 \u0441\u0442\u0440\u043d\u0430\u0447\u0438\u043d\u0430\u0435\u0442\u0441\u044f\u0441 \u0441\u0442\u0440\u043e\u043a\u0430 \u0441\u0442\u0440\u043e\u043a\u0430\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u0441\u0442\u0440\u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u0442\u0440\u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c \u0441\u0442\u0440\u0441\u043e\u0435\u0434\u0438\u043d\u0438\u0442\u044c \u0441\u0442\u0440\u0441\u0440\u0430\u0432\u043d\u0438\u0442\u044c \u0441\u0442\u0440\u0447\u0438\u0441\u043b\u043e\u0432\u0445\u043e\u0436\u0434\u0435\u043d\u0438\u0439 \u0441\u0442\u0440\u0447\u0438\u0441\u043b\u043e\u0441\u0442\u0440\u043e\u043a \u0441\u0442\u0440\u0448\u0430\u0431\u043b\u043e\u043d \u0442\u0435\u043a\u0443\u0449\u0430\u044f\u0434\u0430\u0442\u0430 \u0442\u0435\u043a\u0443\u0449\u0430\u044f\u0434\u0430\u0442\u0430\u0441\u0435\u0430\u043d\u0441\u0430 \u0442\u0435\u043a\u0443\u0449\u0430\u044f\u0443\u043d\u0438\u0432\u0435\u0440\u0441\u0430\u043b\u044c\u043d\u0430\u044f\u0434\u0430\u0442\u0430 \u0442\u0435\u043a\u0443\u0449\u0430\u044f\u0443\u043d\u0438\u0432\u0435\u0440\u0441\u0430\u043b\u044c\u043d\u0430\u044f\u0434\u0430\u0442\u0430\u0432\u043c\u0438\u043b\u043b\u0438\u0441\u0435\u043a\u0443\u043d\u0434\u0430\u0445 \u0442\u0435\u043a\u0443\u0449\u0438\u0439\u0432\u0430\u0440\u0438\u0430\u043d\u0442\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430\u043a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u043e\u0433\u043e\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0442\u0435\u043a\u0443\u0449\u0438\u0439\u0432\u0430\u0440\u0438\u0430\u043d\u0442\u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e\u0448\u0440\u0438\u0444\u0442\u0430\u043a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u043e\u0433\u043e\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0442\u0435\u043a\u0443\u0449\u0438\u0439\u043a\u043e\u0434\u043b\u043e\u043a\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 \u0442\u0435\u043a\u0443\u0449\u0438\u0439\u0440\u0435\u0436\u0438\u043c\u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u0442\u0435\u043a\u0443\u0449\u0438\u0439\u044f\u0437\u044b\u043a \u0442\u0435\u043a\u0443\u0449\u0438\u0439\u044f\u0437\u044b\u043a\u0441\u0438\u0441\u0442\u0435\u043c\u044b \u0442\u0438\u043f \u0442\u0438\u043f\u0437\u043d\u0447 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f\u0430\u043a\u0442\u0438\u0432\u043d\u0430 \u0442\u0440\u0435\u0433 \u0443\u0434\u0430\u043b\u0438\u0442\u044c\u0434\u0430\u043d\u043d\u044b\u0435\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u0443\u0434\u0430\u043b\u0438\u0442\u044c\u0438\u0437\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0433\u043e\u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 \u0443\u0434\u0430\u043b\u0438\u0442\u044c\u043e\u0431\u044a\u0435\u043a\u0442\u044b \u0443\u0434\u0430\u043b\u0438\u0442\u044c\u0444\u0430\u0439\u043b\u044b \u0443\u043d\u0438\u0432\u0435\u0440\u0441\u0430\u043b\u044c\u043d\u043e\u0435\u0432\u0440\u0435\u043c\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u044b\u0439\u0440\u0435\u0436\u0438\u043c \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u044b\u0439\u0440\u0435\u0436\u0438\u043c\u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0438\u044f\u0434\u0430\u043d\u043d\u044b\u0445 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u043a\u0443\u0441\u0435\u0430\u043d\u0441\u043e\u0432 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0432\u043d\u0435\u0448\u043d\u044e\u044e\u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0443 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0432\u0440\u0435\u043c\u044f\u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u044f\u0441\u043f\u044f\u0449\u0435\u0433\u043e\u0441\u0435\u0430\u043d\u0441\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0432\u0440\u0435\u043c\u044f\u0437\u0430\u0441\u044b\u043f\u0430\u043d\u0438\u044f\u043f\u0430\u0441\u0441\u0438\u0432\u043d\u043e\u0433\u043e\u0441\u0435\u0430\u043d\u0441\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0432\u0440\u0435\u043c\u044f\u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a\u043a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u043e\u0433\u043e\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a\u0441\u0438\u0441\u0442\u0435\u043c\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0441\u043e\u0431\u044b\u0442\u0438\u044f\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u043a\u0440\u0430\u0442\u043a\u0438\u0439\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u043c\u0438\u043d\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e\u0434\u043b\u0438\u043d\u0443\u043f\u0430\u0440\u043e\u043b\u0435\u0439\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u043c\u043e\u043d\u043e\u043f\u043e\u043b\u044c\u043d\u044b\u0439\u0440\u0435\u0436\u0438\u043c \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u043a\u043b\u0438\u0435\u043d\u0442\u0430\u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u0440\u0435\u0434\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0445\u0434\u0430\u043d\u043d\u044b\u0445\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435\u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0433\u043e\u0440\u0435\u0436\u0438\u043c\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b\u0444\u0443\u043d\u043a\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0445\u043e\u043f\u0446\u0438\u0439\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u043f\u0440\u0438\u0432\u0438\u043b\u0435\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439\u0440\u0435\u0436\u0438\u043c \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0443\u0441\u043b\u043e\u0436\u043d\u043e\u0441\u0442\u0438\u043f\u0430\u0440\u043e\u043b\u0435\u0439\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435\u0440\u0430\u0431\u043e\u0442\u044b\u0441\u043a\u0440\u0438\u043f\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0435\u0439 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435\u0440\u0430\u0431\u043e\u0442\u044b\u0441\u0444\u0430\u0439\u043b\u0430\u043c\u0438 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435\u0441\u0432\u043d\u0435\u0448\u043d\u0438\u043c\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u043e\u043c\u0434\u0430\u043d\u043d\u044b\u0445 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435\u043e\u0431\u044a\u0435\u043a\u0442\u0430\u0438\u0444\u043e\u0440\u043c\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0441\u043e\u0441\u0442\u0430\u0432\u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0433\u043e\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430odata \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0447\u0430\u0441\u043e\u0432\u043e\u0439\u043f\u043e\u044f\u0441\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0447\u0430\u0441\u043e\u0432\u043e\u0439\u043f\u043e\u044f\u0441\u0441\u0435\u0430\u043d\u0441\u0430 \u0444\u043e\u0440\u043c\u0430\u0442 \u0446\u0435\u043b \u0447\u0430\u0441 \u0447\u0430\u0441\u043e\u0432\u043e\u0439\u043f\u043e\u044f\u0441 \u0447\u0430\u0441\u043e\u0432\u043e\u0439\u043f\u043e\u044f\u0441\u0441\u0435\u0430\u043d\u0441\u0430 \u0447\u0438\u0441\u043b\u043e \u0447\u0438\u0441\u043b\u043e\u043f\u0440\u043e\u043f\u0438\u0441\u044c\u044e \u044d\u0442\u043e\u0430\u0434\u0440\u0435\u0441\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0433\u043e\u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 ws\u0441\u0441\u044b\u043b\u043a\u0438 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430\u043a\u0430\u0440\u0442\u0438\u043d\u043e\u043a \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430\u043c\u0430\u043a\u0435\u0442\u043e\u0432\u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u044f\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430\u0441\u0442\u0438\u043b\u0435\u0439 \u0431\u0438\u0437\u043d\u0435\u0441\u043f\u0440\u043e\u0446\u0435\u0441\u0441\u044b \u0432\u043d\u0435\u0448\u043d\u0438\u0435\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0432\u043d\u0435\u0448\u043d\u0438\u0435\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438 \u0432\u043d\u0435\u0448\u043d\u0438\u0435\u043e\u0442\u0447\u0435\u0442\u044b \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u044b\u0435\u043f\u043e\u043a\u0443\u043f\u043a\u0438 \u0433\u043b\u0430\u0432\u043d\u044b\u0439\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441 \u0433\u043b\u0430\u0432\u043d\u044b\u0439\u0441\u0442\u0438\u043b\u044c \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u044b \u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u043c\u044b\u0435\u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u0436\u0443\u0440\u043d\u0430\u043b\u044b\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u0437\u0430\u0434\u0430\u0447\u0438 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f\u043e\u0431\u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0440\u0430\u0431\u043e\u0447\u0435\u0439\u0434\u0430\u0442\u044b \u0438\u0441\u0442\u043e\u0440\u0438\u044f\u0440\u0430\u0431\u043e\u0442\u044b\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043a\u043e\u043d\u0441\u0442\u0430\u043d\u0442\u044b \u043a\u0440\u0438\u0442\u0435\u0440\u0438\u0438\u043e\u0442\u0431\u043e\u0440\u0430 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0440\u0435\u043a\u043b\u0430\u043c\u044b \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0430\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u043c\u044b\u0445\u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439 \u043e\u0442\u0447\u0435\u0442\u044b \u043f\u0430\u043d\u0435\u043b\u044c\u0437\u0430\u0434\u0430\u0447\u043e\u0441 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b\u0441\u0435\u0430\u043d\u0441\u0430 \u043f\u0435\u0440\u0435\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u044f \u043f\u043b\u0430\u043d\u044b\u0432\u0438\u0434\u043e\u0432\u0440\u0430\u0441\u0447\u0435\u0442\u0430 \u043f\u043b\u0430\u043d\u044b\u0432\u0438\u0434\u043e\u0432\u0445\u0430\u0440\u0430\u043a\u0442\u0435\u0440\u0438\u0441\u0442\u0438\u043a \u043f\u043b\u0430\u043d\u044b\u043e\u0431\u043c\u0435\u043d\u0430 \u043f\u043b\u0430\u043d\u044b\u0441\u0447\u0435\u0442\u043e\u0432 \u043f\u043e\u043b\u043d\u043e\u0442\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0439\u043f\u043e\u0438\u0441\u043a \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439\u0431\u0430\u0437\u044b \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0430\u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u044b\u0445\u043f\u043e\u043a\u0443\u043f\u043e\u043a \u0440\u0430\u0431\u043e\u0447\u0430\u044f\u0434\u0430\u0442\u0430 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u044b\u0431\u0443\u0445\u0433\u0430\u043b\u0442\u0435\u0440\u0438\u0438 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u044b\u043d\u0430\u043a\u043e\u043f\u043b\u0435\u043d\u0438\u044f \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u044b\u0440\u0430\u0441\u0447\u0435\u0442\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u044b\u0441\u0432\u0435\u0434\u0435\u043d\u0438\u0439 \u0440\u0435\u0433\u043b\u0430\u043c\u0435\u043d\u0442\u043d\u044b\u0435\u0437\u0430\u0434\u0430\u043d\u0438\u044f \u0441\u0435\u0440\u0438\u0430\u043b\u0438\u0437\u0430\u0442\u043e\u0440xdto \u0441\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a\u0438 \u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0430\u0433\u0435\u043e\u043f\u043e\u0437\u0438\u0446\u0438\u043e\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0430\u043a\u0440\u0438\u043f\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0438 \u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0430\u043c\u0443\u043b\u044c\u0442\u0438\u043c\u0435\u0434\u0438\u0430 \u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0430\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u0440\u0435\u043a\u043b\u0430\u043c\u044b \u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0430\u043f\u043e\u0447\u0442\u044b \u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0430\u0442\u0435\u043b\u0435\u0444\u043e\u043d\u0438\u0438 \u0444\u0430\u0431\u0440\u0438\u043a\u0430xdto \u0444\u0430\u0439\u043b\u043e\u0432\u044b\u0435\u043f\u043e\u0442\u043e\u043a\u0438 \u0444\u043e\u043d\u043e\u0432\u044b\u0435\u0437\u0430\u0434\u0430\u043d\u0438\u044f \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435\u0432\u0430\u0440\u0438\u0430\u043d\u0442\u043e\u0432\u043e\u0442\u0447\u0435\u0442\u043e\u0432 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a\u0434\u0430\u043d\u043d\u044b\u0445\u0444\u043e\u0440\u043c \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435\u043e\u0431\u0449\u0438\u0445\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0445\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a\u0434\u0438\u043d\u0430\u043c\u0438\u0447\u0435\u0441\u043a\u0438\u0445\u0441\u043f\u0438\u0441\u043a\u043e\u0432 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0445\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a\u043e\u0442\u0447\u0435\u0442\u043e\u0432 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435\u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0445\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a ",
+class:"web\u0446\u0432\u0435\u0442\u0430 windows\u0446\u0432\u0435\u0442\u0430 windows\u0448\u0440\u0438\u0444\u0442\u044b \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430\u043a\u0430\u0440\u0442\u0438\u043d\u043e\u043a \u0440\u0430\u043c\u043a\u0438\u0441\u0442\u0438\u043b\u044f \u0441\u0438\u043c\u0432\u043e\u043b\u044b \u0446\u0432\u0435\u0442\u0430\u0441\u0442\u0438\u043b\u044f \u0448\u0440\u0438\u0444\u0442\u044b\u0441\u0442\u0438\u043b\u044f \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435\u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435\u0434\u0430\u043d\u043d\u044b\u0445\u0444\u043e\u0440\u043c\u044b\u0432\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430\u0445 \u0430\u0432\u0442\u043e\u043d\u0443\u043c\u0435\u0440\u0430\u0446\u0438\u044f\u0432\u0444\u043e\u0440\u043c\u0435 \u0430\u0432\u0442\u043e\u0440\u0430\u0437\u0434\u0432\u0438\u0436\u0435\u043d\u0438\u0435\u0441\u0435\u0440\u0438\u0439 \u0430\u043d\u0438\u043c\u0430\u0446\u0438\u044f\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u0432\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u044f\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432\u0438\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u043e\u0432 \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u0432\u044b\u0441\u043e\u0442\u043e\u0439\u0442\u0430\u0431\u043b\u0438\u0446\u044b \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0430\u044f\u043f\u0440\u043e\u043a\u0440\u0443\u0442\u043a\u0430\u0444\u043e\u0440\u043c\u044b \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u043e\u0435\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u043e\u0435\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430 \u0432\u0438\u0434\u0433\u0440\u0443\u043f\u043f\u044b\u0444\u043e\u0440\u043c\u044b \u0432\u0438\u0434\u0434\u0435\u043a\u043e\u0440\u0430\u0446\u0438\u0438\u0444\u043e\u0440\u043c\u044b \u0432\u0438\u0434\u0434\u043e\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u0444\u043e\u0440\u043c\u044b \u0432\u0438\u0434\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f\u0434\u0430\u043d\u043d\u044b\u0445 \u0432\u0438\u0434\u043a\u043d\u043e\u043f\u043a\u0438\u0444\u043e\u0440\u043c\u044b \u0432\u0438\u0434\u043f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0430\u0442\u0435\u043b\u044f \u0432\u0438\u0434\u043f\u043e\u0434\u043f\u0438\u0441\u0435\u0439\u043a\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u0435 \u0432\u0438\u0434\u043f\u043e\u043b\u044f\u0444\u043e\u0440\u043c\u044b \u0432\u0438\u0434\u0444\u043b\u0430\u0436\u043a\u0430 \u0432\u043b\u0438\u044f\u043d\u0438\u0435\u0440\u0430\u0437\u043c\u0435\u0440\u0430\u043d\u0430\u043f\u0443\u0437\u044b\u0440\u0435\u043a\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e\u0435\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e\u0435\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430 \u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u043a\u0430\u043a\u043e\u043b\u043e\u043d\u043e\u043a \u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u043a\u0430\u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u0445\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432\u0444\u043e\u0440\u043c\u044b \u0433\u0440\u0443\u043f\u043f\u044b\u0438\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435\u043f\u0435\u0440\u0435\u0442\u0430\u0441\u043a\u0438\u0432\u0430\u043d\u0438\u044f \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439\u0440\u0435\u0436\u0438\u043c\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044f\u043f\u0435\u0440\u0435\u0442\u0430\u0441\u043a\u0438\u0432\u0430\u043d\u0438\u044f \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b\u043c\u0435\u0436\u0434\u0443\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u043c\u0438\u0444\u043e\u0440\u043c\u044b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0432\u044b\u0432\u043e\u0434\u0430 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043f\u043e\u043b\u043e\u0441\u044b\u043f\u0440\u043e\u043a\u0440\u0443\u0442\u043a\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u043e\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0442\u043e\u0447\u043a\u0438\u0431\u0438\u0440\u0436\u0435\u0432\u043e\u0439\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0438\u0441\u0442\u043e\u0440\u0438\u044f\u0432\u044b\u0431\u043e\u0440\u0430\u043f\u0440\u0438\u0432\u0432\u043e\u0434\u0435 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439\u043e\u0441\u0438\u0442\u043e\u0447\u0435\u043a\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\u0440\u0430\u0437\u043c\u0435\u0440\u0430\u043f\u0443\u0437\u044b\u0440\u044c\u043a\u0430\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f\u0433\u0440\u0443\u043f\u043f\u044b\u043a\u043e\u043c\u0430\u043d\u0434 \u043c\u0430\u043a\u0441\u0438\u043c\u0443\u043c\u0441\u0435\u0440\u0438\u0439 \u043d\u0430\u0447\u0430\u043b\u044c\u043d\u043e\u0435\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0434\u0435\u0440\u0435\u0432\u0430 \u043d\u0430\u0447\u0430\u043b\u044c\u043d\u043e\u0435\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0441\u043f\u0438\u0441\u043a\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435\u0442\u0435\u043a\u0441\u0442\u0430\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f\u0434\u0435\u043d\u0434\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b \u043e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u043e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f\u043c\u0435\u0442\u043e\u043a\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u043e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f\u043c\u0435\u0442\u043e\u043a\u0441\u0432\u043e\u0434\u043d\u043e\u0439\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u043e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u0444\u043e\u0440\u043c\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0432\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u0435 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0432\u043b\u0435\u0433\u0435\u043d\u0434\u0435\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0433\u0440\u0443\u043f\u043f\u044b\u043a\u043d\u043e\u043f\u043e\u043a \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430\u0448\u043a\u0430\u043b\u044b\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439\u0441\u0432\u043e\u0434\u043d\u043e\u0439\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\u0438\u0437\u043c\u0435\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b\u0430\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b\u0433\u0430\u043d\u0442\u0430 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u043a\u043d\u043e\u043f\u043a\u0438 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u043a\u043d\u043e\u043f\u043a\u0438\u0432\u044b\u0431\u043e\u0440\u0430 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u043e\u0431\u0441\u0443\u0436\u0434\u0435\u043d\u0438\u0439\u0444\u043e\u0440\u043c\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u043e\u0431\u044b\u0447\u043d\u043e\u0439\u0433\u0440\u0443\u043f\u043f\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u043e\u0442\u0440\u0438\u0446\u0430\u0442\u0435\u043b\u044c\u043d\u044b\u0445\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439\u043f\u0443\u0437\u044b\u0440\u044c\u043a\u043e\u0432\u043e\u0439\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u043f\u0430\u043d\u0435\u043b\u0438\u043f\u043e\u0438\u0441\u043a\u0430 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u043f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0438 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u043f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u044f\u043f\u0440\u0438\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0438 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0440\u0430\u0437\u043c\u0435\u0442\u043a\u0438\u043f\u043e\u043b\u043e\u0441\u044b\u0440\u0435\u0433\u0443\u043b\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0444\u043e\u0440\u043c\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u0430\u0431\u043b\u0438\u0446\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u0435\u043a\u0441\u0442\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b\u0433\u0430\u043d\u0442\u0430 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u043e\u0431\u044b\u0447\u043d\u043e\u0439\u0433\u0440\u0443\u043f\u043f\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0444\u0438\u0433\u0443\u0440\u044b\u043a\u043d\u043e\u043f\u043a\u0438 \u043f\u0430\u043b\u0438\u0442\u0440\u0430\u0446\u0432\u0435\u0442\u043e\u0432\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u043f\u043e\u0432\u0435\u0434\u0435\u043d\u0438\u0435\u043e\u0431\u044b\u0447\u043d\u043e\u0439\u0433\u0440\u0443\u043f\u043f\u044b \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430\u043c\u0430\u0441\u0448\u0442\u0430\u0431\u0430\u0434\u0435\u043d\u0434\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430\u043c\u0430\u0441\u0448\u0442\u0430\u0431\u0430\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b\u0433\u0430\u043d\u0442\u0430 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430\u043c\u0430\u0441\u0448\u0442\u0430\u0431\u0430\u0441\u0432\u043e\u0434\u043d\u043e\u0439\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u043f\u043e\u0438\u0441\u043a\u0432\u0442\u0430\u0431\u043b\u0438\u0446\u0435\u043f\u0440\u0438\u0432\u0432\u043e\u0434\u0435 \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u0444\u043e\u0440\u043c\u044b \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438\u043a\u043d\u043e\u043f\u043a\u0438\u0444\u043e\u0440\u043c\u044b \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u043a\u043e\u043c\u0430\u043d\u0434\u043d\u043e\u0439\u043f\u0430\u043d\u0435\u043b\u0438\u0444\u043e\u0440\u043c\u044b \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u043a\u043e\u043c\u0430\u043d\u0434\u043d\u043e\u0439\u043f\u0430\u043d\u0435\u043b\u0438\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u0444\u043e\u0440\u043c\u044b \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u043e\u043f\u043e\u0440\u043d\u043e\u0439\u0442\u043e\u0447\u043a\u0438\u043e\u0442\u0440\u0438\u0441\u043e\u0432\u043a\u0438 \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u043f\u043e\u0434\u043f\u0438\u0441\u0435\u0439\u043a\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u0435 \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u043f\u043e\u0434\u043f\u0438\u0441\u0435\u0439\u0448\u043a\u0430\u043b\u044b\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439\u0438\u0437\u043c\u0435\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u044f\u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430 \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0441\u0442\u0440\u043e\u043a\u0438\u043f\u043e\u0438\u0441\u043a\u0430 \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0442\u0435\u043a\u0441\u0442\u0430\u0441\u043e\u0435\u0434\u0438\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439\u043b\u0438\u043d\u0438\u0438 \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u043f\u043e\u0438\u0441\u043a\u043e\u043c \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0448\u043a\u0430\u043b\u044b\u0432\u0440\u0435\u043c\u0435\u043d\u0438 \u043f\u043e\u0440\u044f\u0434\u043e\u043a\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u0442\u043e\u0447\u0435\u043a\u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e\u0439\u0433\u0438\u0441\u0442\u043e\u0433\u0440\u0430\u043c\u043c\u044b \u043f\u043e\u0440\u044f\u0434\u043e\u043a\u0441\u0435\u0440\u0438\u0439\u0432\u043b\u0435\u0433\u0435\u043d\u0434\u0435\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0440\u0430\u0437\u043c\u0435\u0440\u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430\u0448\u043a\u0430\u043b\u044b\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0440\u0430\u0441\u0442\u044f\u0433\u0438\u0432\u0430\u043d\u0438\u0435\u043f\u043e\u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0438\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b\u0433\u0430\u043d\u0442\u0430 \u0440\u0435\u0436\u0438\u043c\u0430\u0432\u0442\u043e\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u044f \u0440\u0435\u0436\u0438\u043c\u0432\u0432\u043e\u0434\u0430\u0441\u0442\u0440\u043e\u043a\u0442\u0430\u0431\u043b\u0438\u0446\u044b \u0440\u0435\u0436\u0438\u043c\u0432\u044b\u0431\u043e\u0440\u0430\u043d\u0435\u0437\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u043d\u043e\u0433\u043e \u0440\u0435\u0436\u0438\u043c\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u044f\u0434\u0430\u0442\u044b \u0440\u0435\u0436\u0438\u043c\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u044f\u0441\u0442\u0440\u043e\u043a\u0438\u0442\u0430\u0431\u043b\u0438\u0446\u044b \u0440\u0435\u0436\u0438\u043c\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u044f\u0442\u0430\u0431\u043b\u0438\u0446\u044b \u0440\u0435\u0436\u0438\u043c\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f\u0440\u0430\u0437\u043c\u0435\u0440\u0430 \u0440\u0435\u0436\u0438\u043c\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f\u0441\u0432\u044f\u0437\u0430\u043d\u043d\u043e\u0433\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0440\u0435\u0436\u0438\u043c\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u0434\u0438\u0430\u043b\u043e\u0433\u0430\u043f\u0435\u0447\u0430\u0442\u0438 \u0440\u0435\u0436\u0438\u043c\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\u043a\u043e\u043c\u0430\u043d\u0434\u044b \u0440\u0435\u0436\u0438\u043c\u043c\u0430\u0441\u0448\u0442\u0430\u0431\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f\u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430 \u0440\u0435\u0436\u0438\u043c\u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e\u043e\u043a\u043d\u0430\u043a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u043e\u0433\u043e\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0440\u0435\u0436\u0438\u043c\u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f\u043e\u043a\u043d\u0430\u0444\u043e\u0440\u043c\u044b \u0440\u0435\u0436\u0438\u043c\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u044f \u0440\u0435\u0436\u0438\u043c\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0440\u0435\u0436\u0438\u043c\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439\u0441\u0435\u0440\u0438\u0438 \u0440\u0435\u0436\u0438\u043c\u043e\u0442\u0440\u0438\u0441\u043e\u0432\u043a\u0438\u0441\u0435\u0442\u043a\u0438\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0440\u0435\u0436\u0438\u043c\u043f\u043e\u043b\u0443\u043f\u0440\u043e\u0437\u0440\u0430\u0447\u043d\u043e\u0441\u0442\u0438\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0440\u0435\u0436\u0438\u043c\u043f\u0440\u043e\u0431\u0435\u043b\u043e\u0432\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0440\u0435\u0436\u0438\u043c\u0440\u0430\u0437\u043c\u0435\u0449\u0435\u043d\u0438\u044f\u043d\u0430\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435 \u0440\u0435\u0436\u0438\u043c\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f\u043a\u043e\u043b\u043e\u043d\u043a\u0438 \u0440\u0435\u0436\u0438\u043c\u0441\u0433\u043b\u0430\u0436\u0438\u0432\u0430\u043d\u0438\u044f\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0440\u0435\u0436\u0438\u043c\u0441\u0433\u043b\u0430\u0436\u0438\u0432\u0430\u043d\u0438\u044f\u0438\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440\u0430 \u0440\u0435\u0436\u0438\u043c\u0441\u043f\u0438\u0441\u043a\u0430\u0437\u0430\u0434\u0430\u0447 \u0441\u043a\u0432\u043e\u0437\u043d\u043e\u0435\u0432\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435\u0434\u0430\u043d\u043d\u044b\u0445\u0444\u043e\u0440\u043c\u044b\u0432\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430\u0445 \u0441\u043f\u043e\u0441\u043e\u0431\u0437\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f\u0442\u0435\u043a\u0441\u0442\u0430\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430\u0448\u043a\u0430\u043b\u044b\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0441\u043f\u043e\u0441\u043e\u0431\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u044f\u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0438\u0432\u0430\u044e\u0449\u0435\u0433\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u0430\u044f\u0433\u0440\u0443\u043f\u043f\u0430\u043a\u043e\u043c\u0430\u043d\u0434 \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0435\u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u0435 \u0441\u0442\u0430\u0442\u0443\u0441\u043e\u043f\u043e\u0432\u0435\u0449\u0435\u043d\u0438\u044f\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0441\u0442\u0438\u043b\u044c\u0441\u0442\u0440\u0435\u043b\u043a\u0438 \u0442\u0438\u043f\u0430\u043f\u043f\u0440\u043e\u043a\u0441\u0438\u043c\u0430\u0446\u0438\u0438\u043b\u0438\u043d\u0438\u0438\u0442\u0440\u0435\u043d\u0434\u0430\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0442\u0438\u043f\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0442\u0438\u043f\u0435\u0434\u0438\u043d\u0438\u0446\u044b\u0448\u043a\u0430\u043b\u044b\u0432\u0440\u0435\u043c\u0435\u043d\u0438 \u0442\u0438\u043f\u0438\u043c\u043f\u043e\u0440\u0442\u0430\u0441\u0435\u0440\u0438\u0439\u0441\u043b\u043e\u044f\u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0442\u0438\u043f\u043b\u0438\u043d\u0438\u0438\u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0442\u0438\u043f\u043b\u0438\u043d\u0438\u0438\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0442\u0438\u043f\u043c\u0430\u0440\u043a\u0435\u0440\u0430\u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0442\u0438\u043f\u043c\u0430\u0440\u043a\u0435\u0440\u0430\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0442\u0438\u043f\u043e\u0431\u043b\u0430\u0441\u0442\u0438\u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u044f \u0442\u0438\u043f\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u0438\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430\u0434\u0430\u043d\u043d\u044b\u0445\u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0442\u0438\u043f\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u0441\u0435\u0440\u0438\u0438\u0441\u043b\u043e\u044f\u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0442\u0438\u043f\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u0442\u043e\u0447\u0435\u0447\u043d\u043e\u0433\u043e\u043e\u0431\u044a\u0435\u043a\u0442\u0430\u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0442\u0438\u043f\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u0448\u043a\u0430\u043b\u044b\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u043b\u0435\u0433\u0435\u043d\u0434\u044b\u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0442\u0438\u043f\u043f\u043e\u0438\u0441\u043a\u0430\u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432\u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0442\u0438\u043f\u043f\u0440\u043e\u0435\u043a\u0446\u0438\u0438\u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0442\u0438\u043f\u0440\u0430\u0437\u043c\u0435\u0449\u0435\u043d\u0438\u044f\u0438\u0437\u043c\u0435\u0440\u0435\u043d\u0438\u0439 \u0442\u0438\u043f\u0440\u0430\u0437\u043c\u0435\u0449\u0435\u043d\u0438\u044f\u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0442\u043e\u0432\u0438\u0437\u043c\u0435\u0440\u0435\u043d\u0438\u0439 \u0442\u0438\u043f\u0440\u0430\u043c\u043a\u0438\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0442\u0438\u043f\u0441\u0432\u043e\u0434\u043d\u043e\u0439\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0442\u0438\u043f\u0441\u0432\u044f\u0437\u0438\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b\u0433\u0430\u043d\u0442\u0430 \u0442\u0438\u043f\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439\u043f\u043e\u0441\u0435\u0440\u0438\u044f\u043c\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0442\u0438\u043f\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f\u0442\u043e\u0447\u0435\u043a\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0442\u0438\u043f\u0441\u043e\u0435\u0434\u0438\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439\u043b\u0438\u043d\u0438\u0438 \u0442\u0438\u043f\u0441\u0442\u043e\u0440\u043e\u043d\u044b\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0442\u0438\u043f\u0444\u043e\u0440\u043c\u044b\u043e\u0442\u0447\u0435\u0442\u0430 \u0442\u0438\u043f\u0448\u043a\u0430\u043b\u044b\u0440\u0430\u0434\u0430\u0440\u043d\u043e\u0439\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0444\u0430\u043a\u0442\u043e\u0440\u043b\u0438\u043d\u0438\u0438\u0442\u0440\u0435\u043d\u0434\u0430\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b \u0444\u0438\u0433\u0443\u0440\u0430\u043a\u043d\u043e\u043f\u043a\u0438 \u0444\u0438\u0433\u0443\u0440\u044b\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0439\u0441\u0445\u0435\u043c\u044b \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044f\u0432\u0442\u0430\u0431\u043b\u0438\u0446\u0435 \u0444\u043e\u0440\u043c\u0430\u0442\u0434\u043d\u044f\u0448\u043a\u0430\u043b\u044b\u0432\u0440\u0435\u043c\u0435\u043d\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438 \u0448\u0438\u0440\u0438\u043d\u0430\u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u0445\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432\u0444\u043e\u0440\u043c\u044b \u0432\u0438\u0434\u0434\u0432\u0438\u0436\u0435\u043d\u0438\u044f\u0431\u0443\u0445\u0433\u0430\u043b\u0442\u0435\u0440\u0438\u0438 \u0432\u0438\u0434\u0434\u0432\u0438\u0436\u0435\u043d\u0438\u044f\u043d\u0430\u043a\u043e\u043f\u043b\u0435\u043d\u0438\u044f \u0432\u0438\u0434\u043f\u0435\u0440\u0438\u043e\u0434\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0440\u0430\u0441\u0447\u0435\u0442\u0430 \u0432\u0438\u0434\u0441\u0447\u0435\u0442\u0430 \u0432\u0438\u0434\u0442\u043e\u0447\u043a\u0438\u043c\u0430\u0440\u0448\u0440\u0443\u0442\u0430\u0431\u0438\u0437\u043d\u0435\u0441\u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0430 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0430\u0433\u0440\u0435\u0433\u0430\u0442\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u043d\u0430\u043a\u043e\u043f\u043b\u0435\u043d\u0438\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0433\u0440\u0443\u043f\u043f\u0438\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0440\u0435\u0436\u0438\u043c\u0430\u043f\u0440\u043e\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0441\u0440\u0435\u0437\u0430 \u043f\u0435\u0440\u0438\u043e\u0434\u0438\u0447\u043d\u043e\u0441\u0442\u044c\u0430\u0433\u0440\u0435\u0433\u0430\u0442\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u043d\u0430\u043a\u043e\u043f\u043b\u0435\u043d\u0438\u044f \u0440\u0435\u0436\u0438\u043c\u0430\u0432\u0442\u043e\u0432\u0440\u0435\u043c\u044f \u0440\u0435\u0436\u0438\u043c\u0437\u0430\u043f\u0438\u0441\u0438\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0440\u0435\u0436\u0438\u043c\u043f\u0440\u043e\u0432\u0435\u0434\u0435\u043d\u0438\u044f\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0430\u0432\u0442\u043e\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0439 \u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439\u043d\u043e\u043c\u0435\u0440\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0430\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0435\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0440\u0430\u0441\u0448\u0438\u0444\u0440\u043e\u0432\u043a\u0438\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u043e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0438\u0442\u043e\u0433\u043e\u0432\u043a\u043e\u043b\u043e\u043d\u043e\u043a\u0441\u0432\u043e\u0434\u043d\u043e\u0439\u0442\u0430\u0431\u043b\u0438\u0446\u044b \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0438\u0442\u043e\u0433\u043e\u0432\u0441\u0442\u0440\u043e\u043a\u0441\u0432\u043e\u0434\u043d\u043e\u0439\u0442\u0430\u0431\u043b\u0438\u0446\u044b \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0442\u0435\u043a\u0441\u0442\u0430\u043e\u0442\u043d\u043e\u0441\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u043a\u0438\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0441\u043f\u043e\u0441\u043e\u0431\u0447\u0442\u0435\u043d\u0438\u044f\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0438\u043f\u0434\u0432\u0443\u0441\u0442\u043e\u0440\u043e\u043d\u043d\u0435\u0439\u043f\u0435\u0447\u0430\u0442\u0438 \u0442\u0438\u043f\u0437\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f\u043e\u0431\u043b\u0430\u0441\u0442\u0438\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0438\u043f\u043a\u0443\u0440\u0441\u043e\u0440\u043e\u0432\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0438\u043f\u043b\u0438\u043d\u0438\u0438\u0440\u0438\u0441\u0443\u043d\u043a\u0430\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0438\u043f\u043b\u0438\u043d\u0438\u0438\u044f\u0447\u0435\u0439\u043a\u0438\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0438\u043f\u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u043f\u0435\u0440\u0435\u0445\u043e\u0434\u0430\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0438\u043f\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u044f\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0438\u043f\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u043b\u0438\u043d\u0438\u0439\u0441\u0432\u043e\u0434\u043d\u043e\u0439\u0442\u0430\u0431\u043b\u0438\u0446\u044b \u0442\u0438\u043f\u0440\u0430\u0437\u043c\u0435\u0449\u0435\u043d\u0438\u044f\u0442\u0435\u043a\u0441\u0442\u0430\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0438\u043f\u0440\u0438\u0441\u0443\u043d\u043a\u0430\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0438\u043f\u0441\u043c\u0435\u0449\u0435\u043d\u0438\u044f\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0438\u043f\u0443\u0437\u043e\u0440\u0430\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0438\u043f\u0444\u0430\u0439\u043b\u0430\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u043e\u0447\u043d\u043e\u0441\u0442\u044c\u043f\u0435\u0447\u0430\u0442\u0438 \u0447\u0435\u0440\u0435\u0434\u043e\u0432\u0430\u043d\u0438\u0435\u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f\u0441\u0442\u0440\u0430\u043d\u0438\u0446 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0432\u0440\u0435\u043c\u0435\u043d\u0438\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432\u043f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0449\u0438\u043a\u0430 \u0442\u0438\u043f\u0444\u0430\u0439\u043b\u0430\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u0433\u043e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u043e\u0431\u0445\u043e\u0434\u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430\u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u0442\u0438\u043f\u0437\u0430\u043f\u0438\u0441\u0438\u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u0432\u0438\u0434\u0437\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f\u0440\u0430\u0441\u0448\u0438\u0444\u0440\u043e\u0432\u043a\u0438\u043f\u043e\u0441\u0442\u0440\u043e\u0438\u0442\u0435\u043b\u044f\u043e\u0442\u0447\u0435\u0442\u0430 \u0442\u0438\u043f\u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0439 \u0442\u0438\u043f\u0438\u0437\u043c\u0435\u0440\u0435\u043d\u0438\u044f\u043f\u043e\u0441\u0442\u0440\u043e\u0438\u0442\u0435\u043b\u044f\u043e\u0442\u0447\u0435\u0442\u0430 \u0442\u0438\u043f\u0440\u0430\u0437\u043c\u0435\u0449\u0435\u043d\u0438\u044f\u0438\u0442\u043e\u0433\u043e\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u043a\u0444\u0430\u0439\u043b\u0443 \u0440\u0435\u0436\u0438\u043c\u0434\u0438\u0430\u043b\u043e\u0433\u0430\u0432\u044b\u0431\u043e\u0440\u0430\u0444\u0430\u0439\u043b\u0430 \u0440\u0435\u0436\u0438\u043c\u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f\u0444\u0430\u0439\u043b\u0430 \u0442\u0438\u043f\u0438\u0437\u043c\u0435\u0440\u0435\u043d\u0438\u044f\u043f\u043e\u0441\u0442\u0440\u043e\u0438\u0442\u0435\u043b\u044f\u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u0432\u0438\u0434\u0434\u0430\u043d\u043d\u044b\u0445\u0430\u043d\u0430\u043b\u0438\u0437\u0430 \u043c\u0435\u0442\u043e\u0434\u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0438\u0437\u0430\u0446\u0438\u0438 \u0442\u0438\u043f\u0435\u0434\u0438\u043d\u0438\u0446\u044b\u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b\u0430\u0432\u0440\u0435\u043c\u0435\u043d\u0438\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0437\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f\u0442\u0430\u0431\u043b\u0438\u0446\u044b\u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u0447\u0438\u0441\u043b\u043e\u0432\u044b\u0445\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430\u0434\u0430\u043d\u043d\u044b\u0445\u043f\u043e\u0438\u0441\u043a\u0430\u0430\u0441\u0441\u043e\u0446\u0438\u0430\u0446\u0438\u0439 \u0442\u0438\u043f\u043a\u043e\u043b\u043e\u043d\u043a\u0438\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445\u0434\u0435\u0440\u0435\u0432\u043e\u0440\u0435\u0448\u0435\u043d\u0438\u0439 \u0442\u0438\u043f\u043a\u043e\u043b\u043e\u043d\u043a\u0438\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445\u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0438\u0437\u0430\u0446\u0438\u044f \u0442\u0438\u043f\u043a\u043e\u043b\u043e\u043d\u043a\u0438\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445\u043e\u0431\u0449\u0430\u044f\u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 \u0442\u0438\u043f\u043a\u043e\u043b\u043e\u043d\u043a\u0438\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445\u043f\u043e\u0438\u0441\u043a\u0430\u0441\u0441\u043e\u0446\u0438\u0430\u0446\u0438\u0439 \u0442\u0438\u043f\u043a\u043e\u043b\u043e\u043d\u043a\u0438\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445\u043f\u043e\u0438\u0441\u043a\u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0435\u0439 \u0442\u0438\u043f\u043a\u043e\u043b\u043e\u043d\u043a\u0438\u043c\u043e\u0434\u0435\u043b\u0438\u043f\u0440\u043e\u0433\u043d\u043e\u0437\u0430 \u0442\u0438\u043f\u043c\u0435\u0440\u044b\u0440\u0430\u0441\u0441\u0442\u043e\u044f\u043d\u0438\u044f\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u043e\u0442\u0441\u0435\u0447\u0435\u043d\u0438\u044f\u043f\u0440\u0430\u0432\u0438\u043b\u0430\u0441\u0441\u043e\u0446\u0438\u0430\u0446\u0438\u0438 \u0442\u0438\u043f\u043f\u043e\u043b\u044f\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u0438\u0437\u0430\u0446\u0438\u0438\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0443\u043f\u043e\u0440\u044f\u0434\u043e\u0447\u0438\u0432\u0430\u043d\u0438\u044f\u043f\u0440\u0430\u0432\u0438\u043b\u0430\u0441\u0441\u043e\u0446\u0438\u0430\u0446\u0438\u0438\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0443\u043f\u043e\u0440\u044f\u0434\u043e\u0447\u0438\u0432\u0430\u043d\u0438\u044f\u0448\u0430\u0431\u043b\u043e\u043d\u043e\u0432\u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0435\u0439\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0443\u043f\u0440\u043e\u0449\u0435\u043d\u0438\u044f\u0434\u0435\u0440\u0435\u0432\u0430\u0440\u0435\u0448\u0435\u043d\u0438\u0439 ws\u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430 \u0432\u0430\u0440\u0438\u0430\u043d\u0442xpathxs \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u0437\u0430\u043f\u0438\u0441\u0438\u0434\u0430\u0442\u044bjson \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u043f\u0440\u043e\u0441\u0442\u043e\u0433\u043e\u0442\u0438\u043f\u0430xs \u0432\u0438\u0434\u0433\u0440\u0443\u043f\u043f\u044b\u043c\u043e\u0434\u0435\u043b\u0438xs \u0432\u0438\u0434\u0444\u0430\u0441\u0435\u0442\u0430xdto \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435\u043f\u043e\u0441\u0442\u0440\u043e\u0438\u0442\u0435\u043b\u044fdom \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043d\u043e\u0441\u0442\u044c\u043f\u0440\u043e\u0441\u0442\u043e\u0433\u043e\u0442\u0438\u043f\u0430xs \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043d\u043e\u0441\u0442\u044c\u0441\u043e\u0441\u0442\u0430\u0432\u043d\u043e\u0433\u043e\u0442\u0438\u043f\u0430xs \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043d\u043e\u0441\u0442\u044c\u0441\u0445\u0435\u043c\u044bxs \u0437\u0430\u043f\u0440\u0435\u0449\u0435\u043d\u043d\u044b\u0435\u043f\u043e\u0434\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438xs \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f\u0433\u0440\u0443\u043f\u043f\u043f\u043e\u0434\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438xs \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0430xs \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f\u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f\u0438\u0434\u0435\u043d\u0442\u0438\u0447\u043d\u043e\u0441\u0442\u0438xs \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f\u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f\u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u0438\u043c\u0435\u043dxs \u043c\u0435\u0442\u043e\u0434\u043d\u0430\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u043d\u0438\u044fxs \u043c\u043e\u0434\u0435\u043b\u044c\u0441\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0433\u043exs \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0442\u0438\u043f\u0430xml \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0435\u043f\u043e\u0434\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438xs \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0430\u043f\u0440\u043e\u0431\u0435\u043b\u044c\u043d\u044b\u0445\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432xs \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0430\u0441\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0433\u043exs \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044fxs \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b\u043e\u0442\u0431\u043e\u0440\u0430\u0443\u0437\u043b\u043e\u0432dom \u043f\u0435\u0440\u0435\u043d\u043e\u0441\u0441\u0442\u0440\u043e\u043ajson \u043f\u043e\u0437\u0438\u0446\u0438\u044f\u0432\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0435dom \u043f\u0440\u043e\u0431\u0435\u043b\u044c\u043d\u044b\u0435\u0441\u0438\u043c\u0432\u043e\u043b\u044bxml \u0442\u0438\u043f\u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0430xml \u0442\u0438\u043f\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044fjson \u0442\u0438\u043f\u043a\u0430\u043d\u043e\u043d\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043exml \u0442\u0438\u043f\u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u044bxs \u0442\u0438\u043f\u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438xml \u0442\u0438\u043f\u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430domxpath \u0442\u0438\u043f\u0443\u0437\u043b\u0430dom \u0442\u0438\u043f\u0443\u0437\u043b\u0430xml \u0444\u043e\u0440\u043c\u0430xml \u0444\u043e\u0440\u043c\u0430\u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044fxs \u0444\u043e\u0440\u043c\u0430\u0442\u0434\u0430\u0442\u044bjson \u044d\u043a\u0440\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432json \u0432\u0438\u0434\u0441\u0440\u0430\u0432\u043d\u0435\u043d\u0438\u044f\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438\u0440\u0430\u0441\u0448\u0438\u0444\u0440\u043e\u0432\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u0441\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0432\u043b\u043e\u0436\u0435\u043d\u043d\u044b\u0445\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432\u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0438\u0442\u043e\u0433\u043e\u0432\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u043f\u043e\u043b\u0435\u0439\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u043f\u043e\u043b\u044f\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0442\u043e\u0432\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0431\u0443\u0445\u0433\u0430\u043b\u0442\u0435\u0440\u0441\u043a\u043e\u0433\u043e\u043e\u0441\u0442\u0430\u0442\u043a\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0432\u044b\u0432\u043e\u0434\u0430\u0442\u0435\u043a\u0441\u0442\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0433\u0440\u0443\u043f\u043f\u044b\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432\u043e\u0442\u0431\u043e\u0440\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0434\u043e\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f\u043f\u0435\u0440\u0438\u043e\u0434\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430\u043f\u043e\u043b\u0435\u0439\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u043c\u0430\u043a\u0435\u0442\u0430\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u043c\u0430\u043a\u0435\u0442\u0430\u043e\u0431\u043b\u0430\u0441\u0442\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u043e\u0441\u0442\u0430\u0442\u043a\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u043f\u0435\u0440\u0438\u043e\u0434\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0440\u0430\u0437\u043c\u0435\u0449\u0435\u043d\u0438\u044f\u0442\u0435\u043a\u0441\u0442\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0441\u0432\u044f\u0437\u0438\u043d\u0430\u0431\u043e\u0440\u043e\u0432\u0434\u0430\u043d\u043d\u044b\u0445\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u043b\u0435\u0433\u0435\u043d\u0434\u044b\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u044b\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u043f\u0440\u0438\u043c\u0435\u043d\u0435\u043d\u0438\u044f\u043e\u0442\u0431\u043e\u0440\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0435\u0436\u0438\u043c\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0435\u0436\u0438\u043c\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u043f\u043e\u0441\u043e\u0431\u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0435\u0436\u0438\u043c\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0430\u0432\u0442\u043e\u043f\u043e\u0437\u0438\u0446\u0438\u044f\u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432\u0432\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u0435\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044f\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0443\u0441\u043b\u043e\u0432\u043d\u043e\u0433\u043e\u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u044f\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0432\u0430\u0436\u043d\u043e\u0441\u0442\u044c\u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0430\u0442\u0435\u043a\u0441\u0442\u0430\u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u0441\u043f\u043e\u0441\u043e\u0431\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f\u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e\u0432\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0441\u043f\u043e\u0441\u043e\u0431\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f\u043d\u0435ascii\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432\u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u0442\u0438\u043f\u0442\u0435\u043a\u0441\u0442\u0430\u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u043f\u043e\u0447\u0442\u044b \u0441\u0442\u0430\u0442\u0443\u0441\u0440\u0430\u0437\u0431\u043e\u0440\u0430\u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u0440\u0435\u0436\u0438\u043c\u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438\u0437\u0430\u043f\u0438\u0441\u0438\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0441\u0442\u0430\u0442\u0443\u0441\u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438\u0437\u0430\u043f\u0438\u0441\u0438\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0443\u0440\u043e\u0432\u0435\u043d\u044c\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0432\u043a\u0440\u0438\u043f\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0438 \u0440\u0435\u0436\u0438\u043c\u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0432\u043a\u0440\u0438\u043f\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0438 \u0440\u0435\u0436\u0438\u043c\u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430\u043a\u0440\u0438\u043f\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0438 \u0442\u0438\u043f\u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0432\u043a\u0440\u0438\u043f\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0438 \u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0430\u0438\u043c\u0435\u043d\u0444\u0430\u0439\u043b\u043e\u0432\u0432zip\u0444\u0430\u0439\u043b\u0435 \u043c\u0435\u0442\u043e\u0434\u0441\u0436\u0430\u0442\u0438\u044fzip \u043c\u0435\u0442\u043e\u0434\u0448\u0438\u0444\u0440\u043e\u0432\u0430\u043d\u0438\u044fzip \u0440\u0435\u0436\u0438\u043c\u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f\u043f\u0443\u0442\u0435\u0439\u0444\u0430\u0439\u043b\u043e\u0432zip \u0440\u0435\u0436\u0438\u043c\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438\u043f\u043e\u0434\u043a\u0430\u0442\u0430\u043b\u043e\u0433\u043e\u0432zip \u0440\u0435\u0436\u0438\u043c\u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f\u043f\u0443\u0442\u0435\u0439zip \u0443\u0440\u043e\u0432\u0435\u043d\u044c\u0441\u0436\u0430\u0442\u0438\u044fzip \u0437\u0432\u0443\u043a\u043e\u0432\u043e\u0435\u043e\u043f\u043e\u0432\u0435\u0449\u0435\u043d\u0438\u0435 \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u0435\u0440\u0435\u0445\u043e\u0434\u0430\u043a\u0441\u0442\u0440\u043e\u043a\u0435 \u043f\u043e\u0437\u0438\u0446\u0438\u044f\u0432\u043f\u043e\u0442\u043e\u043a\u0435 \u043f\u043e\u0440\u044f\u0434\u043e\u043a\u0431\u0430\u0439\u0442\u043e\u0432 \u0440\u0435\u0436\u0438\u043c\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0435\u0436\u0438\u043c\u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u043a\u043e\u0439\u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u0435\u0440\u0432\u0438\u0441\u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u044b\u0445\u043f\u043e\u043a\u0443\u043f\u043e\u043a \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435\u0444\u043e\u043d\u043e\u0432\u043e\u0433\u043e\u0437\u0430\u0434\u0430\u043d\u0438\u044f \u0442\u0438\u043f\u043f\u043e\u0434\u043f\u0438\u0441\u0447\u0438\u043a\u0430\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u043c\u044b\u0445\u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439 \u0443\u0440\u043e\u0432\u0435\u043d\u044c\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u0437\u0430\u0449\u0438\u0449\u0435\u043d\u043d\u043e\u0433\u043e\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044fftp \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u043e\u0440\u044f\u0434\u043a\u0430\u0441\u0445\u0435\u043c\u044b\u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u0442\u0438\u043f\u0434\u043e\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f\u043f\u0435\u0440\u0438\u043e\u0434\u0430\u043c\u0438\u0441\u0445\u0435\u043c\u044b\u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u0442\u0438\u043f\u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u043e\u0439\u0442\u043e\u0447\u043a\u0438\u0441\u0445\u0435\u043c\u044b\u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u0442\u0438\u043f\u043e\u0431\u044a\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f\u0441\u0445\u0435\u043c\u044b\u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u0442\u0438\u043f\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e\u0439\u0442\u0430\u0431\u043b\u0438\u0446\u044b\u0441\u0445\u0435\u043c\u044b\u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u0442\u0438\u043f\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f\u0441\u0445\u0435\u043c\u044b\u0437\u0430\u043f\u0440\u043e\u0441\u0430 http\u043c\u0435\u0442\u043e\u0434 \u0430\u0432\u0442\u043e\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043e\u0431\u0449\u0435\u0433\u043e\u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0442\u0430 \u0430\u0432\u0442\u043e\u043f\u0440\u0435\u0444\u0438\u043a\u0441\u043d\u043e\u043c\u0435\u0440\u0430\u0437\u0430\u0434\u0430\u0447\u0438 \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u043e\u0433\u043e\u044f\u0437\u044b\u043a\u0430 \u0432\u0438\u0434\u0438\u0435\u0440\u0430\u0440\u0445\u0438\u0438 \u0432\u0438\u0434\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u043d\u0430\u043a\u043e\u043f\u043b\u0435\u043d\u0438\u044f \u0432\u0438\u0434\u0442\u0430\u0431\u043b\u0438\u0446\u044b\u0432\u043d\u0435\u0448\u043d\u0435\u0433\u043e\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0437\u0430\u043f\u0438\u0441\u044c\u0434\u0432\u0438\u0436\u0435\u043d\u0438\u0439\u043f\u0440\u0438\u043f\u0440\u043e\u0432\u0435\u0434\u0435\u043d\u0438\u0438 \u0437\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435\u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0435\u0439 \u0438\u043d\u0434\u0435\u043a\u0441\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0431\u0430\u0437\u044b\u043f\u043b\u0430\u043d\u0430\u0432\u0438\u0434\u043e\u0432\u0440\u0430\u0441\u0447\u0435\u0442\u0430 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0431\u044b\u0441\u0442\u0440\u043e\u0433\u043e\u0432\u044b\u0431\u043e\u0440\u0430 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043e\u0431\u0449\u0435\u0433\u043e\u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0442\u0430 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043f\u043e\u043b\u043d\u043e\u0442\u0435\u043a\u0441\u0442\u043e\u0432\u043e\u0433\u043e\u043f\u043e\u0438\u0441\u043a\u0430 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0440\u0430\u0437\u0434\u0435\u043b\u044f\u0435\u043c\u044b\u0445\u0434\u0430\u043d\u043d\u044b\u0445\u043e\u0431\u0449\u0435\u0433\u043e\u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0442\u0430 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0442\u0430 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u0440\u0435\u0434\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0445\u0434\u0430\u043d\u043d\u044b\u0445 \u043e\u043f\u0435\u0440\u0430\u0442\u0438\u0432\u043d\u043e\u0435\u043f\u0440\u043e\u0432\u0435\u0434\u0435\u043d\u0438\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435\u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u0432\u0438\u0434\u0430\u0440\u0430\u0441\u0447\u0435\u0442\u0430 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435\u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u0432\u0438\u0434\u0430\u0445\u0430\u0440\u0430\u043a\u0442\u0435\u0440\u0438\u0441\u0442\u0438\u043a\u0438 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435\u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u0437\u0430\u0434\u0430\u0447\u0438 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435\u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u043b\u0430\u043d\u0430\u043e\u0431\u043c\u0435\u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435\u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u0441\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a\u0430 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435\u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u0441\u0447\u0435\u0442\u0430 \u043f\u0435\u0440\u0435\u043c\u0435\u0449\u0435\u043d\u0438\u0435\u0433\u0440\u0430\u043d\u0438\u0446\u044b\u043f\u0440\u0438\u043f\u0440\u043e\u0432\u0435\u0434\u0435\u043d\u0438\u0438 \u043f\u0435\u0440\u0438\u043e\u0434\u0438\u0447\u043d\u043e\u0441\u0442\u044c\u043d\u043e\u043c\u0435\u0440\u0430\u0431\u0438\u0437\u043d\u0435\u0441\u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0430 \u043f\u0435\u0440\u0438\u043e\u0434\u0438\u0447\u043d\u043e\u0441\u0442\u044c\u043d\u043e\u043c\u0435\u0440\u0430\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u043f\u0435\u0440\u0438\u043e\u0434\u0438\u0447\u043d\u043e\u0441\u0442\u044c\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0440\u0430\u0441\u0447\u0435\u0442\u0430 \u043f\u0435\u0440\u0438\u043e\u0434\u0438\u0447\u043d\u043e\u0441\u0442\u044c\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0441\u0432\u0435\u0434\u0435\u043d\u0438\u0439 \u043f\u043e\u0432\u0442\u043e\u0440\u043d\u043e\u0435\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0432\u043e\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u043c\u044b\u0445\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u043f\u043e\u043b\u043d\u043e\u0442\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0439\u043f\u043e\u0438\u0441\u043a\u043f\u0440\u0438\u0432\u0432\u043e\u0434\u0435\u043f\u043e\u0441\u0442\u0440\u043e\u043a\u0435 \u043f\u0440\u0438\u043d\u0430\u0434\u043b\u0435\u0436\u043d\u043e\u0441\u0442\u044c\u043e\u0431\u044a\u0435\u043a\u0442\u0430 \u043f\u0440\u043e\u0432\u0435\u0434\u0435\u043d\u0438\u0435 \u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0438\u0435\u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438\u043e\u0431\u0449\u0435\u0433\u043e\u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0442\u0430 \u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0438\u0435\u0434\u0430\u043d\u043d\u044b\u0445\u043e\u0431\u0449\u0435\u0433\u043e\u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0442\u0430 \u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0438\u0435\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0439\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438\u043e\u0431\u0449\u0435\u0433\u043e\u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0442\u0430 \u0440\u0435\u0436\u0438\u043c\u0430\u0432\u0442\u043e\u043d\u0443\u043c\u0435\u0440\u0430\u0446\u0438\u0438\u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432 \u0440\u0435\u0436\u0438\u043c\u0437\u0430\u043f\u0438\u0441\u0438\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430 \u0440\u0435\u0436\u0438\u043c\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u043c\u043e\u0434\u0430\u043b\u044c\u043d\u043e\u0441\u0442\u0438 \u0440\u0435\u0436\u0438\u043c\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u0441\u0438\u043d\u0445\u0440\u043e\u043d\u043d\u044b\u0445\u0432\u044b\u0437\u043e\u0432\u043e\u0432\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0439\u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u044b\u0438\u0432\u043d\u0435\u0448\u043d\u0438\u0445\u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u0440\u0435\u0436\u0438\u043c\u043f\u043e\u0432\u0442\u043e\u0440\u043d\u043e\u0433\u043e\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u0441\u0435\u0430\u043d\u0441\u043e\u0432 \u0440\u0435\u0436\u0438\u043c\u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f\u0434\u0430\u043d\u043d\u044b\u0445\u0432\u044b\u0431\u043e\u0440\u0430\u043f\u0440\u0438\u0432\u0432\u043e\u0434\u0435\u043f\u043e\u0441\u0442\u0440\u043e\u043a\u0435 \u0440\u0435\u0436\u0438\u043c\u0441\u043e\u0432\u043c\u0435\u0441\u0442\u0438\u043c\u043e\u0441\u0442\u0438 \u0440\u0435\u0436\u0438\u043c\u0441\u043e\u0432\u043c\u0435\u0441\u0442\u0438\u043c\u043e\u0441\u0442\u0438\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430 \u0440\u0435\u0436\u0438\u043c\u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u043a\u043e\u0439\u0434\u0430\u043d\u043d\u044b\u0445\u043f\u043e\u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e \u0441\u0435\u0440\u0438\u0438\u043a\u043e\u0434\u043e\u0432\u043f\u043b\u0430\u043d\u0430\u0432\u0438\u0434\u043e\u0432\u0445\u0430\u0440\u0430\u043a\u0442\u0435\u0440\u0438\u0441\u0442\u0438\u043a \u0441\u0435\u0440\u0438\u0438\u043a\u043e\u0434\u043e\u0432\u043f\u043b\u0430\u043d\u0430\u0441\u0447\u0435\u0442\u043e\u0432 \u0441\u0435\u0440\u0438\u0438\u043a\u043e\u0434\u043e\u0432\u0441\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a\u0430 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435\u043f\u0440\u0438\u0432\u0432\u043e\u0434\u0435 \u0441\u043f\u043e\u0441\u043e\u0431\u0432\u044b\u0431\u043e\u0440\u0430 \u0441\u043f\u043e\u0441\u043e\u0431\u043f\u043e\u0438\u0441\u043a\u0430\u0441\u0442\u0440\u043e\u043a\u0438\u043f\u0440\u0438\u0432\u0432\u043e\u0434\u0435\u043f\u043e\u0441\u0442\u0440\u043e\u043a\u0435 \u0441\u043f\u043e\u0441\u043e\u0431\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0442\u0438\u043f\u0434\u0430\u043d\u043d\u044b\u0445\u0442\u0430\u0431\u043b\u0438\u0446\u044b\u0432\u043d\u0435\u0448\u043d\u0435\u0433\u043e\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u043a\u043e\u0434\u0430\u043f\u043b\u0430\u043d\u0430\u0432\u0438\u0434\u043e\u0432\u0440\u0430\u0441\u0447\u0435\u0442\u0430 \u0442\u0438\u043f\u043a\u043e\u0434\u0430\u0441\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a\u0430 \u0442\u0438\u043f\u043c\u0430\u043a\u0435\u0442\u0430 \u0442\u0438\u043f\u043d\u043e\u043c\u0435\u0440\u0430\u0431\u0438\u0437\u043d\u0435\u0441\u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0430 \u0442\u0438\u043f\u043d\u043e\u043c\u0435\u0440\u0430\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0438\u043f\u043d\u043e\u043c\u0435\u0440\u0430\u0437\u0430\u0434\u0430\u0447\u0438 \u0442\u0438\u043f\u0444\u043e\u0440\u043c\u044b \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435\u0434\u0432\u0438\u0436\u0435\u043d\u0438\u0439 \u0432\u0430\u0436\u043d\u043e\u0441\u0442\u044c\u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b\u043f\u0440\u0438\u043c\u0435\u043d\u0435\u043d\u0438\u044f\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430\u043a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u043e\u0433\u043e\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u043c\u0430\u0441\u0448\u0442\u0430\u0431\u0430\u0444\u043e\u0440\u043c\u043a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u043e\u0433\u043e\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e\u0448\u0440\u0438\u0444\u0442\u0430\u043a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u043e\u0433\u043e\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0433\u043e\u043f\u0435\u0440\u0438\u043e\u0434\u0430 \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0439\u0434\u0430\u0442\u044b\u043d\u0430\u0447\u0430\u043b\u0430 \u0432\u0438\u0434\u0433\u0440\u0430\u043d\u0438\u0446\u044b \u0432\u0438\u0434\u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438 \u0432\u0438\u0434\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u043f\u043e\u043b\u043d\u043e\u0442\u0435\u043a\u0441\u0442\u043e\u0432\u043e\u0433\u043e\u043f\u043e\u0438\u0441\u043a\u0430 \u0432\u0438\u0434\u0440\u0430\u043c\u043a\u0438 \u0432\u0438\u0434\u0441\u0440\u0430\u0432\u043d\u0435\u043d\u0438\u044f \u0432\u0438\u0434\u0446\u0432\u0435\u0442\u0430 \u0432\u0438\u0434\u0447\u0438\u0441\u043b\u043e\u0432\u043e\u0433\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0432\u0438\u0434\u0448\u0440\u0438\u0444\u0442\u0430 \u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u0430\u044f\u0434\u043b\u0438\u043d\u0430 \u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439\u0437\u043d\u0430\u043a \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435byteordermark \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445\u043f\u043e\u043b\u043d\u043e\u0442\u0435\u043a\u0441\u0442\u043e\u0432\u043e\u0433\u043e\u043f\u043e\u0438\u0441\u043a\u0430 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0439\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u043a\u043b\u0430\u0432\u0438\u0448\u0430 \u043a\u043e\u0434\u0432\u043e\u0437\u0432\u0440\u0430\u0442\u0430\u0434\u0438\u0430\u043b\u043e\u0433\u0430 \u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0430xbase \u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0430\u0442\u0435\u043a\u0441\u0442\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u043e\u0438\u0441\u043a\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u0441\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u043a\u0438 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u0440\u0435\u0434\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0445\u0434\u0430\u043d\u043d\u044b\u0445 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435\u043f\u0440\u0438\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u043f\u0430\u043d\u0435\u043b\u0438\u0440\u0430\u0437\u0434\u0435\u043b\u043e\u0432 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0430\u0437\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0440\u0435\u0436\u0438\u043c\u0434\u0438\u0430\u043b\u043e\u0433\u0430\u0432\u043e\u043f\u0440\u043e\u0441 \u0440\u0435\u0436\u0438\u043c\u0437\u0430\u043f\u0443\u0441\u043a\u0430\u043a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u043e\u0433\u043e\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0440\u0435\u0436\u0438\u043c\u043e\u043a\u0440\u0443\u0433\u043b\u0435\u043d\u0438\u044f \u0440\u0435\u0436\u0438\u043c\u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f\u0444\u043e\u0440\u043c\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0440\u0435\u0436\u0438\u043c\u043f\u043e\u043b\u043d\u043e\u0442\u0435\u043a\u0441\u0442\u043e\u0432\u043e\u0433\u043e\u043f\u043e\u0438\u0441\u043a\u0430 \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c\u043a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u043e\u0433\u043e\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435\u0432\u043d\u0435\u0448\u043d\u0435\u0433\u043e\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438\u0431\u0430\u0437\u044b\u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u043f\u043e\u0441\u043e\u0431\u0432\u044b\u0431\u043e\u0440\u0430\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430windows \u0441\u043f\u043e\u0441\u043e\u0431\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f\u0441\u0442\u0440\u043e\u043a\u0438 \u0441\u0442\u0430\u0442\u0443\u0441\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u0442\u0438\u043f\u0432\u043d\u0435\u0448\u043d\u0435\u0439\u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u044b \u0442\u0438\u043f\u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u044b \u0442\u0438\u043f\u043f\u043e\u0432\u0435\u0434\u0435\u043d\u0438\u044f\u043a\u043b\u0430\u0432\u0438\u0448\u0438enter \u0442\u0438\u043f\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438\u043e\u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0438\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438\u0431\u0430\u0437\u044b\u0434\u0430\u043d\u043d\u044b\u0445 \u0443\u0440\u043e\u0432\u0435\u043d\u044c\u0438\u0437\u043e\u043b\u044f\u0446\u0438\u0438\u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0439 \u0445\u0435\u0448\u0444\u0443\u043d\u043a\u0446\u0438\u044f \u0447\u0430\u0441\u0442\u0438\u0434\u0430\u0442\u044b",
+type:"com\u043e\u0431\u044a\u0435\u043a\u0442 ftp\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 http\u0437\u0430\u043f\u0440\u043e\u0441 http\u0441\u0435\u0440\u0432\u0438\u0441\u043e\u0442\u0432\u0435\u0442 http\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 ws\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u044f ws\u043f\u0440\u043e\u043a\u0441\u0438 xbase \u0430\u043d\u0430\u043b\u0438\u0437\u0434\u0430\u043d\u043d\u044b\u0445 \u0430\u043d\u043d\u043e\u0442\u0430\u0446\u0438\u044fxs \u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u043a\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0431\u0443\u0444\u0435\u0440\u0434\u0432\u043e\u0438\u0447\u043d\u044b\u0445\u0434\u0430\u043d\u043d\u044b\u0445 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435xs \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0433\u0435\u043d\u0435\u0440\u0430\u0442\u043e\u0440\u0441\u043b\u0443\u0447\u0430\u0439\u043d\u044b\u0445\u0447\u0438\u0441\u0435\u043b \u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0430\u044f\u0441\u0445\u0435\u043c\u0430 \u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438\u0435\u043a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u044b \u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0430\u044f\u0441\u0445\u0435\u043c\u0430 \u0433\u0440\u0443\u043f\u043f\u0430\u043c\u043e\u0434\u0435\u043b\u0438xs \u0434\u0430\u043d\u043d\u044b\u0435\u0440\u0430\u0441\u0448\u0438\u0444\u0440\u043e\u0432\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0434\u0432\u043e\u0438\u0447\u043d\u044b\u0435\u0434\u0430\u043d\u043d\u044b\u0435 \u0434\u0435\u043d\u0434\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430 \u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u0430 \u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u0430\u0433\u0430\u043d\u0442\u0430 \u0434\u0438\u0430\u043b\u043e\u0433\u0432\u044b\u0431\u043e\u0440\u0430\u0444\u0430\u0439\u043b\u0430 \u0434\u0438\u0430\u043b\u043e\u0433\u0432\u044b\u0431\u043e\u0440\u0430\u0446\u0432\u0435\u0442\u0430 \u0434\u0438\u0430\u043b\u043e\u0433\u0432\u044b\u0431\u043e\u0440\u0430\u0448\u0440\u0438\u0444\u0442\u0430 \u0434\u0438\u0430\u043b\u043e\u0433\u0440\u0430\u0441\u043f\u0438\u0441\u0430\u043d\u0438\u044f\u0440\u0435\u0433\u043b\u0430\u043c\u0435\u043d\u0442\u043d\u043e\u0433\u043e\u0437\u0430\u0434\u0430\u043d\u0438\u044f \u0434\u0438\u0430\u043b\u043e\u0433\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f\u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0433\u043e\u043f\u0435\u0440\u0438\u043e\u0434\u0430 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442dom \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442html \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044fxs \u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u043c\u043e\u0435\u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u0437\u0430\u043f\u0438\u0441\u044cdom \u0437\u0430\u043f\u0438\u0441\u044cfastinfoset \u0437\u0430\u043f\u0438\u0441\u044chtml \u0437\u0430\u043f\u0438\u0441\u044cjson \u0437\u0430\u043f\u0438\u0441\u044cxml \u0437\u0430\u043f\u0438\u0441\u044czip\u0444\u0430\u0439\u043b\u0430 \u0437\u0430\u043f\u0438\u0441\u044c\u0434\u0430\u043d\u043d\u044b\u0445 \u0437\u0430\u043f\u0438\u0441\u044c\u0442\u0435\u043a\u0441\u0442\u0430 \u0437\u0430\u043f\u0438\u0441\u044c\u0443\u0437\u043b\u043e\u0432dom \u0437\u0430\u043f\u0440\u043e\u0441 \u0437\u0430\u0449\u0438\u0449\u0435\u043d\u043d\u043e\u0435\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435openssl \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\u043f\u043e\u043b\u0435\u0439\u0440\u0430\u0441\u0448\u0438\u0444\u0440\u043e\u0432\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0438\u0437\u0432\u043b\u0435\u0447\u0435\u043d\u0438\u0435\u0442\u0435\u043a\u0441\u0442\u0430 \u0438\u043c\u043f\u043e\u0440\u0442xs \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u043f\u043e\u0447\u0442\u0430 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0435\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u043f\u043e\u0447\u0442\u043e\u0432\u044b\u0439\u043f\u0440\u043e\u0444\u0438\u043b\u044c \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u043f\u0440\u043e\u043a\u0441\u0438 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f\u0434\u043b\u044f\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044fxs \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0430xs \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u0441\u043e\u0431\u044b\u0442\u0438\u044f\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0438\u0442\u0435\u0440\u0430\u0442\u043e\u0440\u0443\u0437\u043b\u043e\u0432dom \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430 \u043a\u0432\u0430\u043b\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b\u0434\u0430\u0442\u044b \u043a\u0432\u0430\u043b\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b\u0434\u0432\u043e\u0438\u0447\u043d\u044b\u0445\u0434\u0430\u043d\u043d\u044b\u0445 \u043a\u0432\u0430\u043b\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b\u0441\u0442\u0440\u043e\u043a\u0438 \u043a\u0432\u0430\u043b\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b\u0447\u0438\u0441\u043b\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u0449\u0438\u043a\u043c\u0430\u043a\u0435\u0442\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u0449\u0438\u043a\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043a\u043e\u043d\u0441\u0442\u0440\u0443\u043a\u0442\u043e\u0440\u043c\u0430\u043a\u0435\u0442\u0430\u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u044f\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043a\u043e\u043d\u0441\u0442\u0440\u0443\u043a\u0442\u043e\u0440\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043a\u043e\u043d\u0441\u0442\u0440\u0443\u043a\u0442\u043e\u0440\u0444\u043e\u0440\u043c\u0430\u0442\u043d\u043e\u0439\u0441\u0442\u0440\u043e\u043a\u0438 \u043b\u0438\u043d\u0438\u044f \u043c\u0430\u043a\u0435\u0442\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043c\u0430\u043a\u0435\u0442\u043e\u0431\u043b\u0430\u0441\u0442\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043c\u0430\u043a\u0435\u0442\u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u044f\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043c\u0430\u0441\u043a\u0430xs \u043c\u0435\u043d\u0435\u0434\u0436\u0435\u0440\u043a\u0440\u0438\u043f\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0438 \u043d\u0430\u0431\u043e\u0440\u0441\u0445\u0435\u043cxml \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u0441\u0435\u0440\u0438\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438json \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0430\u043a\u0430\u0440\u0442\u0438\u043d\u043e\u043a \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0430\u0440\u0430\u0441\u0448\u0438\u0444\u0440\u043e\u0432\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043e\u0431\u0445\u043e\u0434\u0434\u0435\u0440\u0435\u0432\u0430dom \u043e\u0431\u044a\u044f\u0432\u043b\u0435\u043d\u0438\u0435\u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0430xs \u043e\u0431\u044a\u044f\u0432\u043b\u0435\u043d\u0438\u0435\u043d\u043e\u0442\u0430\u0446\u0438\u0438xs \u043e\u0431\u044a\u044f\u0432\u043b\u0435\u043d\u0438\u0435\u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430xs \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u0441\u043e\u0431\u044b\u0442\u0438\u044f\u0434\u043e\u0441\u0442\u0443\u043f\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u0441\u043e\u0431\u044b\u0442\u0438\u044f\u043e\u0442\u043a\u0430\u0437\u0432\u0434\u043e\u0441\u0442\u0443\u043f\u0435\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438\u0440\u0430\u0441\u0448\u0438\u0444\u0440\u043e\u0432\u043a\u0438\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435\u043f\u0435\u0440\u0435\u0434\u0430\u0432\u0430\u0435\u043c\u043e\u0433\u043e\u0444\u0430\u0439\u043b\u0430 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435\u0442\u0438\u043f\u043e\u0432 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0435\u0433\u0440\u0443\u043f\u043f\u044b\u0430\u0442\u0440\u0438\u0431\u0443\u0442\u043e\u0432xs \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0435\u0433\u0440\u0443\u043f\u043f\u044b\u043c\u043e\u0434\u0435\u043b\u0438xs \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0435\u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f\u0438\u0434\u0435\u043d\u0442\u0438\u0447\u043d\u043e\u0441\u0442\u0438xs \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0435\u043f\u0440\u043e\u0441\u0442\u043e\u0433\u043e\u0442\u0438\u043f\u0430xs \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0435\u0441\u043e\u0441\u0442\u0430\u0432\u043d\u043e\u0433\u043e\u0442\u0438\u043f\u0430xs \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0435\u0442\u0438\u043f\u0430\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430dom \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u044fxpathxs \u043e\u0442\u0431\u043e\u0440\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u0430\u043a\u0435\u0442\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u044b\u0445\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0432\u044b\u0431\u043e\u0440\u0430 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b\u0437\u0430\u043f\u0438\u0441\u0438json \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b\u0437\u0430\u043f\u0438\u0441\u0438xml \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b\u0447\u0442\u0435\u043d\u0438\u044fxml \u043f\u0435\u0440\u0435\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0435xs \u043f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0449\u0438\u043a \u043f\u043e\u043b\u0435\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u043e\u043b\u0435\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u043e\u0441\u0442\u0440\u043e\u0438\u0442\u0435\u043b\u044cdom \u043f\u043e\u0441\u0442\u0440\u043e\u0438\u0442\u0435\u043b\u044c\u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u043f\u043e\u0441\u0442\u0440\u043e\u0438\u0442\u0435\u043b\u044c\u043e\u0442\u0447\u0435\u0442\u0430 \u043f\u043e\u0441\u0442\u0440\u043e\u0438\u0442\u0435\u043b\u044c\u043e\u0442\u0447\u0435\u0442\u0430\u0430\u043d\u0430\u043b\u0438\u0437\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u043e\u0441\u0442\u0440\u043e\u0438\u0442\u0435\u043b\u044c\u0441\u0445\u0435\u043cxml \u043f\u043e\u0442\u043e\u043a \u043f\u043e\u0442\u043e\u043a\u0432\u043f\u0430\u043c\u044f\u0442\u0438 \u043f\u043e\u0447\u0442\u0430 \u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0435\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u0435xsl \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043a\u043a\u0430\u043d\u043e\u043d\u0438\u0447\u0435\u0441\u043a\u043e\u043c\u0443xml \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u043e\u0440\u0432\u044b\u0432\u043e\u0434\u0430\u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445\u0432\u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u044e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u043e\u0440\u0432\u044b\u0432\u043e\u0434\u0430\u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445\u0432\u0442\u0430\u0431\u043b\u0438\u0447\u043d\u044b\u0439\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442 \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u043e\u0440\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0437\u044b\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u0438\u043c\u0435\u043ddom \u0440\u0430\u043c\u043a\u0430 \u0440\u0430\u0441\u043f\u0438\u0441\u0430\u043d\u0438\u0435\u0440\u0435\u0433\u043b\u0430\u043c\u0435\u043d\u0442\u043d\u043e\u0433\u043e\u0437\u0430\u0434\u0430\u043d\u0438\u044f \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u0435\u0438\u043c\u044fxml \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0447\u0442\u0435\u043d\u0438\u044f\u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u0432\u043e\u0434\u043d\u0430\u044f\u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u0430 \u0441\u0432\u044f\u0437\u044c\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\u0432\u044b\u0431\u043e\u0440\u0430 \u0441\u0432\u044f\u0437\u044c\u043f\u043e\u0442\u0438\u043f\u0443 \u0441\u0432\u044f\u0437\u044c\u043f\u043e\u0442\u0438\u043f\u0443\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u0435\u0440\u0438\u0430\u043b\u0438\u0437\u0430\u0442\u043e\u0440xdto \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043a\u043b\u0438\u0435\u043d\u0442\u0430windows \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043a\u043b\u0438\u0435\u043d\u0442\u0430\u0444\u0430\u0439\u043b \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043a\u0440\u0438\u043f\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0438 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u044b\u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u044f\u044e\u0449\u0438\u0445\u0446\u0435\u043d\u0442\u0440\u043e\u0432windows \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u044b\u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u044f\u044e\u0449\u0438\u0445\u0446\u0435\u043d\u0442\u0440\u043e\u0432\u0444\u0430\u0439\u043b \u0441\u0436\u0430\u0442\u0438\u0435\u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0430\u044f\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044e \u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u0435\u043a\u043b\u0430\u0432\u0438\u0448 \u0441\u0440\u0430\u0432\u043d\u0435\u043d\u0438\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u0430\u044f\u0434\u0430\u0442\u0430\u043d\u0430\u0447\u0430\u043b\u0430 \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0439\u043f\u0435\u0440\u0438\u043e\u0434 \u0441\u0445\u0435\u043c\u0430xml \u0441\u0445\u0435\u043c\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0430\u0431\u043b\u0438\u0447\u043d\u044b\u0439\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442 \u0442\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0439\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442 \u0442\u0435\u0441\u0442\u0438\u0440\u0443\u0435\u043c\u043e\u0435\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0442\u0438\u043f\u0434\u0430\u043d\u043d\u044b\u0445xml \u0443\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u0439\u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0444\u0430\u0431\u0440\u0438\u043a\u0430xdto \u0444\u0430\u0439\u043b \u0444\u0430\u0439\u043b\u043e\u0432\u044b\u0439\u043f\u043e\u0442\u043e\u043a \u0444\u0430\u0441\u0435\u0442\u0434\u043b\u0438\u043d\u044bxs \u0444\u0430\u0441\u0435\u0442\u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u0430\u0440\u0430\u0437\u0440\u044f\u0434\u043e\u0432\u0434\u0440\u043e\u0431\u043d\u043e\u0439\u0447\u0430\u0441\u0442\u0438xs \u0444\u0430\u0441\u0435\u0442\u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0433\u043e\u0432\u043a\u043b\u044e\u0447\u0430\u044e\u0449\u0435\u0433\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044fxs \u0444\u0430\u0441\u0435\u0442\u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0433\u043e\u0438\u0441\u043a\u043b\u044e\u0447\u0430\u044e\u0449\u0435\u0433\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044fxs \u0444\u0430\u0441\u0435\u0442\u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0439\u0434\u043b\u0438\u043d\u044bxs \u0444\u0430\u0441\u0435\u0442\u043c\u0438\u043d\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0433\u043e\u0432\u043a\u043b\u044e\u0447\u0430\u044e\u0449\u0435\u0433\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044fxs \u0444\u0430\u0441\u0435\u0442\u043c\u0438\u043d\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0433\u043e\u0438\u0441\u043a\u043b\u044e\u0447\u0430\u044e\u0449\u0435\u0433\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044fxs \u0444\u0430\u0441\u0435\u0442\u043c\u0438\u043d\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0439\u0434\u043b\u0438\u043d\u044bxs \u0444\u0430\u0441\u0435\u0442\u043e\u0431\u0440\u0430\u0437\u0446\u0430xs \u0444\u0430\u0441\u0435\u0442\u043e\u0431\u0449\u0435\u0433\u043e\u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u0430\u0440\u0430\u0437\u0440\u044f\u0434\u043e\u0432xs \u0444\u0430\u0441\u0435\u0442\u043f\u0435\u0440\u0435\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u044fxs \u0444\u0430\u0441\u0435\u0442\u043f\u0440\u043e\u0431\u0435\u043b\u044c\u043d\u044b\u0445\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432xs \u0444\u0438\u043b\u044c\u0442\u0440\u0443\u0437\u043b\u043e\u0432dom \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u0430\u044f\u0441\u0442\u0440\u043e\u043a\u0430 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442 \u0444\u0440\u0430\u0433\u043c\u0435\u043d\u0442xs \u0445\u0435\u0448\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435\u0434\u0430\u043d\u043d\u044b\u0445 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0446\u0432\u0435\u0442 \u0447\u0442\u0435\u043d\u0438\u0435fastinfoset \u0447\u0442\u0435\u043d\u0438\u0435html \u0447\u0442\u0435\u043d\u0438\u0435json \u0447\u0442\u0435\u043d\u0438\u0435xml \u0447\u0442\u0435\u043d\u0438\u0435zip\u0444\u0430\u0439\u043b\u0430 \u0447\u0442\u0435\u043d\u0438\u0435\u0434\u0430\u043d\u043d\u044b\u0445 \u0447\u0442\u0435\u043d\u0438\u0435\u0442\u0435\u043a\u0441\u0442\u0430 \u0447\u0442\u0435\u043d\u0438\u0435\u0443\u0437\u043b\u043e\u0432dom \u0448\u0440\u0438\u0444\u0442 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430\u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438\u0434\u0430\u043d\u043d\u044b\u0445 comsafearray \u0434\u0435\u0440\u0435\u0432\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u043c\u0430\u0441\u0441\u0438\u0432 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u0441\u043f\u0438\u0441\u043e\u043a\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u0444\u0438\u043a\u0441\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u0430\u044f\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0430 \u0444\u0438\u043a\u0441\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u0435\u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u0444\u0438\u043a\u0441\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439\u043c\u0430\u0441\u0441\u0438\u0432 ",
+literal:e},contains:[{className:"meta",begin:"#|&",end:"$",keywords:{$pattern:x,
+"meta-keyword":n+"\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c\u0438\u0437\u0444\u0430\u0439\u043b\u0430 \u0432\u0435\u0431\u043a\u043b\u0438\u0435\u043d\u0442 \u0432\u043c\u0435\u0441\u0442\u043e \u0432\u043d\u0435\u0448\u043d\u0435\u0435\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u043a\u043b\u0438\u0435\u043d\u0442 \u043a\u043e\u043d\u0435\u0446\u043e\u0431\u043b\u0430\u0441\u0442\u0438 \u043c\u043e\u0431\u0438\u043b\u044c\u043d\u043e\u0435\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u043a\u043b\u0438\u0435\u043d\u0442 \u043c\u043e\u0431\u0438\u043b\u044c\u043d\u043e\u0435\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0441\u0435\u0440\u0432\u0435\u0440 \u043d\u0430\u043a\u043b\u0438\u0435\u043d\u0442\u0435 \u043d\u0430\u043a\u043b\u0438\u0435\u043d\u0442\u0435\u043d\u0430\u0441\u0435\u0440\u0432\u0435\u0440\u0435 \u043d\u0430\u043a\u043b\u0438\u0435\u043d\u0442\u0435\u043d\u0430\u0441\u0435\u0440\u0432\u0435\u0440\u0435\u0431\u0435\u0437\u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0430 \u043d\u0430\u0441\u0435\u0440\u0432\u0435\u0440\u0435 \u043d\u0430\u0441\u0435\u0440\u0432\u0435\u0440\u0435\u0431\u0435\u0437\u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c \u043f\u0435\u0440\u0435\u0434 \u043f\u043e\u0441\u043b\u0435 \u0441\u0435\u0440\u0432\u0435\u0440 \u0442\u043e\u043b\u0441\u0442\u044b\u0439\u043a\u043b\u0438\u0435\u043d\u0442\u043e\u0431\u044b\u0447\u043d\u043e\u0435\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0442\u043e\u043b\u0441\u0442\u044b\u0439\u043a\u043b\u0438\u0435\u043d\u0442\u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0435\u043c\u043e\u0435\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0442\u043e\u043d\u043a\u0438\u0439\u043a\u043b\u0438\u0435\u043d\u0442 "
+},contains:[m]},{className:"function",variants:[{
+begin:"\u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u0430|\u0444\u0443\u043d\u043a\u0446\u0438\u044f",
+end:"\\)",
+keywords:"\u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u0430 \u0444\u0443\u043d\u043a\u0446\u0438\u044f"
+},{
+begin:"\u043a\u043e\u043d\u0435\u0446\u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b|\u043a\u043e\u043d\u0435\u0446\u0444\u0443\u043d\u043a\u0446\u0438\u0438",
+keywords:"\u043a\u043e\u043d\u0435\u0446\u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b \u043a\u043e\u043d\u0435\u0446\u0444\u0443\u043d\u043a\u0446\u0438\u0438"
+}],contains:[{begin:"\\(",end:"\\)",endsParent:!0,contains:[{className:"params",
+begin:x,end:",",excludeEnd:!0,endsWithParent:!0,keywords:{$pattern:x,
+keyword:"\u0437\u043d\u0430\u0447",literal:e},contains:[o,t,a]},m]
+},s.inherit(s.TITLE_MODE,{begin:x})]},m,{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 a5c1990ade..8a8d1195af 100644
--- a/vendor/assets/javascripts/highlightjs/languages/abnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/abnf.min.js
@@ -1 +1,11 @@
-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",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(a=e)?"string"==typeof a?a:a.source:null;var a
+})).join("")}return a=>{const s={ruleDeclaration:/^[a-zA-Z][a-zA-Z0-9-]*/,
+unexpectedChars:/[!@#$^&',?+~`|:]/},n=a.COMMENT(/;/,/$/),r={
+className:"attribute",begin:e(s.ruleDeclaration,/(?=\s*=)/)};return{
+name:"Augmented Backus-Naur Form",illegal:s.unexpectedChars,
+keywords:["ALPHA","BIT","CHAR","CR","CRLF","CTL","DIGIT","DQUOTE","HEXDIG","HTAB","LF","LWSP","OCTET","SP","VCHAR","WSP"],
+contains:[r,n,{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]/},a.QUOTE_STRING_MODE,a.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 ff272f62af..f93ce1362e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
@@ -1 +1,14 @@
-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",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(...n){
+return n.map((n=>e(n))).join("")}function a(...n){
+return"("+n.map((n=>e(n))).join("|")+")"}return e=>{
+const l=["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(/"/,a(...l)),end:/"/,keywords:l,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 df9c5c2049..b5303700de 100644
--- a/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
@@ -1 +1,16 @@
-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",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>({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:[n.APOS_STRING_MODE,n.QUOTE_STRING_MODE,n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,n.C_NUMBER_MODE,{
+className:"class",beginKeywords:"package",end:/\{/,contains:[n.TITLE_MODE]},{
+className:"class",beginKeywords:"class interface",end:/\{/,excludeEnd:!0,
+contains:[{beginKeywords:"extends implements"},n.TITLE_MODE]},{className:"meta",
+beginKeywords:"import include",end:/;/,keywords:{"meta-keyword":"import include"
+}},{className:"function",beginKeywords:"function",end:/[{;]/,excludeEnd:!0,
+illegal:/\S/,contains:[n.TITLE_MODE,{className:"params",begin:/\(/,end:/\)/,
+contains:[n.APOS_STRING_MODE,n.QUOTE_STRING_MODE,n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,{
+className:"rest_arg",begin:/[.]{3}/,end:/[a-zA-Z_$][a-zA-Z0-9_$]*/,relevance:10
+}]},{begin:e(/:\s*/,/([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)/)}]},n.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 e03496b8bb..8296751a23 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ada.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ada.min.js
@@ -1 +1,25 @@
-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",(()=>{"use strict";return e=>{
+const n="[A-Za-z](_?[A-Za-z0-9.])*",s="[]\\{\\}%#'\"",a=e.COMMENT("--","$"),r={
+begin:"\\s+:\\s+",end:"\\s*(:=|;|\\)|=>|$)",illegal:s,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:[a,{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:s},{
+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:[a,{className:"title",
+begin:"(\\bwith\\s+)?\\b(function|procedure)\\s+",end:"(\\(|\\s+|$)",
+excludeBegin:!0,excludeEnd:!0,illegal:s},r,{className:"type",
+begin:"\\breturn\\s+",end:"(\\s+|;|$)",keywords:"return",excludeBegin:!0,
+excludeEnd:!0,endsParent:!0,illegal:s}]},{className:"type",
+begin:"\\b(sub)?type\\s+",end:"\\s+",keywords:"type",excludeBegin:!0,illegal:s
+},r]}}})());
\ 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..2667adbc65 100644
--- a/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
@@ -1 +1,21 @@
-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",(()=>{"use strict";return 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_\\.]+;$|\\bfunction\\s*[^\\(])",contains:[{
+className:"string",begin:"'",end:"'",illegal:"\\n",
+contains:[e.BACKSLASH_ESCAPE],relevance:0},{className:"string",begin:'"""',
+end:'"""'},{className:"string",begin:'"',end:'"',illegal:"\\n",
+contains:[e.BACKSLASH_ESCAPE],relevance:0
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"string",
+begin:"^\\s*\\[",end:"\\]"},{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",relevance:0,
+begin:"(-?)(\\b0[xXbBoOdD][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..737a9729ff 100644
--- a/vendor/assets/javascripts/highlightjs/languages/apache.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/apache.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";return e=>{const 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 c3954e7148..23209df4c6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/applescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/applescript.min.js
@@ -1 +1,20 @@
-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",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function t(...t){
+return t.map((t=>e(t))).join("")}function n(...t){
+return"("+t.map((t=>e(t))).join("|")+")"}return e=>{
+const r=e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),i={className:"params",
+begin:/\(/,end:/\)/,contains:["self",e.C_NUMBER_MODE,r]
+},o=e.COMMENT(/--/,/$/),a=[o,e.COMMENT(/\(\*/,/\*\)/,{contains:["self",o]
+}),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:[r,e.C_NUMBER_MODE,{className:"built_in",
+begin:t(/\b/,n(/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/)
+},{className:"built_in",begin:/^\s*return\b/},{className:"literal",
+begin:/\b(text item delimiters|current application|missing value)\b/},{
+className:"keyword",
+begin:t(/\b/,n(/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|path)/,/(date|time) string/,/quoted form/),/\b/)
+},{beginKeywords:"on",illegal:/[${=;\n]/,contains:[e.UNDERSCORE_TITLE_MODE,i]
+},...a],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 f53c988840..607168fb88 100644
--- a/vendor/assets/javascripts/highlightjs/languages/arcade.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/arcade.min.js
@@ -1 +1,26 @@
-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",(()=>{"use strict";return e=>{
+const 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]
+;const s=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:s}]}]
+}],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:s}],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 cfb0188b95..20ac353119 100644
--- a/vendor/assets/javascripts/highlightjs/languages/arduino.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/arduino.min.js
@@ -1 +1,45 @@
-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.aliases=["ino"],t}}());
\ No newline at end of file
+hljs.registerLanguage("arduino",(()=>{"use strict";function e(e){
+return((...e)=>e.map((e=>(e=>e?"string"==typeof e?e:e.source:null)(e))).join(""))("(",e,")?")
+}return t=>{const r=(t=>{const r=t.COMMENT("//","$",{contains:[{begin:/\\\n/}]
+}),n="[a-zA-Z_]\\w*::",i="(decltype\\(auto\\)|"+e(n)+"[a-zA-Z_]\\w*"+e("<[^<>]+>")+")",a={
+className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},s={className:"string",
+variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",
+contains:[t.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:"."},t.END_SAME_AS_BEGIN({
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
+className:"number",variants:[{begin:"\\b(0b[01']+)"},{
+begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
+},{
+begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
+}],relevance:0},l={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},t.inherit(s,{className:"meta-string"}),{
+className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"
+},r,t.C_BLOCK_COMMENT_MODE]},c={className:"title",begin:e(n)+t.IDENT_RE,
+relevance:0},d=e(n)+t.IDENT_RE+"\\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_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"},m=[l,a,r,t.C_BLOCK_COMMENT_MODE,o,s],p={
+variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{
+beginKeywords:"new throw return else",end:/;/}],keywords:u,contains:m.concat([{
+begin:/\(/,end:/\)/,keywords:u,contains:m.concat(["self"]),relevance:0}]),
+relevance:0},g={className:"function",begin:"("+i+"[\\*&\\s]+)+"+d,
+returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:u,illegal:/[^\w\s\*&:<>.]/,
+contains:[{begin:"decltype\\(auto\\)",keywords:u,relevance:0},{begin:d,
+returnBegin:!0,contains:[c],relevance:0},{className:"params",begin:/\(/,
+end:/\)/,keywords:u,relevance:0,contains:[r,t.C_BLOCK_COMMENT_MODE,s,o,a,{
+begin:/\(/,end:/\)/,keywords:u,relevance:0,
+contains:["self",r,t.C_BLOCK_COMMENT_MODE,s,o,a]}]
+},a,r,t.C_BLOCK_COMMENT_MODE,l]};return{name:"C++",
+aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:u,illegal:"</",
+contains:[].concat(p,g,m,[l,{
+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:u,contains:["self",a]},{begin:t.IDENT_RE+"::",keywords:u},{
+className:"class",beginKeywords:"enum class struct union",end:/[{;:<>=]/,
+contains:[{beginKeywords:"final class struct"},t.TITLE_MODE]}]),exports:{
+preprocessor:l,strings:s,keywords:u}}})(t),n=r.keywords
+;return n.keyword+=" boolean byte word String",
+n.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",
+n.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",
+r.name="Arduino",r.aliases=["ino"],r.supersetOf="cpp",r}})());
\ 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..60bcaa6fe4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/armasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/armasm.min.js
@@ -1 +1,15 @@
-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",(()=>{"use strict";return 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 8f409e3aba..b24ea1835c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
@@ -1 +1,36 @@
-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",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>{const a=[{className:"strong",begin:/\*{2}([^\n]+?)\*{2}/
+},{className:"strong",
+begin:e(/\*\*/,/((\*(?!\*)|\\[^\n]|[^*\n\\])+\n)+/,/(\*(?!\*)|\\[^\n]|[^*\n\\])*/,/\*\*/),
+relevance:0},{className:"strong",begin:/\B\*(\S|\S[^\n]*?\S)\*(?!\w)/},{
+className:"strong",begin:/\*[^\s]([^\n]+\n)+([^\n]+)\*/}],s=[{
+className:"emphasis",begin:/_{2}([^\n]+?)_{2}/},{className:"emphasis",
+begin:e(/__/,/((_(?!_)|\\[^\n]|[^_\n\\])+\n)+/,/(_(?!_)|\\[^\n]|[^_\n\\])*/,/__/),
+relevance:0},{className:"emphasis",begin:/\b_(\S|\S[^\n]*?\S)_(?!\w)/},{
+className:"emphasis",begin:/_[^\s]([^\n]+\n)+([^\n]+)_/},{className:"emphasis",
+begin:"\\B'(?!['\\s])",end:"(\\n{2}|')",contains:[{begin:"\\\\'\\w",relevance:0
+}],relevance:0}];return{name:"AsciiDoc",aliases:["adoc"],
+contains:[n.COMMENT("^/{4,}\\n","\\n/{4,}$",{relevance:10
+}),n.COMMENT("^//","$",{relevance:0}),{className:"title",begin:"^\\.\\w.*$"},{
+begin:"^[=\\*]{4,}\\n",end:"\\n^[=\\*]{4,}$",relevance:10},{className:"section",
+relevance:10,variants:[{begin:"^(={1,6})[ \t].+?([ \t]\\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},{
+begin:/\\[*_`]/},{begin:/\\\\\*{2}[^\n]*?\*{2}/},{begin:/\\\\_{2}[^\n]*_{2}/},{
+begin:/\\\\`{2}[^\n]*`{2}/},{begin:/[:;}][*_`](?![*_`])/},...a,...s,{
+className:"string",variants:[{begin:"``.+?''"},{begin:"`.+?'"}]},{
+className:"code",begin:/`{2}/,end:/(\n{2}|`{2})/},{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 ce0c916346..03dc97d309 100644
--- a/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
@@ -1 +1,31 @@
-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",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>{
+const 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{name:"AspectJ",keywords:t,illegal:/<\/|#/,
+contains:[n.COMMENT(/\/\*\*/,/\*\//,{relevance:0,contains:[{begin:/\w+@/,
+relevance:0},{className:"doctag",begin:/@[A-Za-z]+/}]
+}),n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,n.APOS_STRING_MODE,n.QUOTE_STRING_MODE,{
+className:"class",beginKeywords:"aspect",end:/[{;=]/,excludeEnd:!0,
+illegal:/[:;"\[\]]/,contains:[{
+beginKeywords:"extends implements pertypewithin perthis pertarget percflowbelow percflow issingleton"
+},n.UNDERSCORE_TITLE_MODE,{begin:/\([^\)]*/,end:/[)]+/,keywords:t+" "+i,
+excludeEnd:!1}]},{className:"class",beginKeywords:"class interface",end:/[{;=]/,
+excludeEnd:!0,relevance:0,keywords:"class interface",illegal:/[:"\[\]]/,
+contains:[{beginKeywords:"extends implements"},n.UNDERSCORE_TITLE_MODE]},{
+beginKeywords:"pointcut after before around throwing returning",end:/[)]/,
+excludeEnd:!1,illegal:/["\[\]]/,contains:[{
+begin:e(n.UNDERSCORE_IDENT_RE,/\s*\(/),returnBegin:!0,
+contains:[n.UNDERSCORE_TITLE_MODE]}]},{begin:/[:]/,returnBegin:!0,end:/[{;]/,
+relevance:0,excludeEnd:!1,keywords:t,illegal:/["\[\]]/,contains:[{
+begin:e(n.UNDERSCORE_IDENT_RE,/\s*\(/),keywords:t+" "+i,relevance:0
+},n.QUOTE_STRING_MODE]},{beginKeywords:"new throw",relevance:0},{
+className:"function",
+begin:/\w+ +\w+(\.\w+)?\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,returnBegin:!0,
+end:/[{;=]/,keywords:t,excludeEnd:!0,contains:[{
+begin:e(n.UNDERSCORE_IDENT_RE,/\s*\(/),returnBegin:!0,relevance:0,
+contains:[n.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,
+relevance:0,keywords:t,
+contains:[n.APOS_STRING_MODE,n.QUOTE_STRING_MODE,n.C_NUMBER_MODE,n.C_BLOCK_COMMENT_MODE]
+},n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE]},n.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 57309ec504..85bb906649 100644
--- a/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";return e=>{const 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 0a764db5d3..23f9bf9245 100644
--- a/vendor/assets/javascripts/highlightjs/languages/autoit.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/autoit.min.js
@@ -1 +1,20 @@
-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",(()=>{"use strict";return e=>{const 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 c76e16efc9..f59380496b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
@@ -1 +1,11 @@
-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",(()=>{"use strict";return r=>({
+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 bbba29d899..19cadac762 100644
--- a/vendor/assets/javascripts/highlightjs/languages/awk.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/awk.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return e=>({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 d2cfd1642c..f4396ffba8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/axapta.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/axapta.min.js
@@ -1 +1,9 @@
-hljs.registerLanguage("axapta",function(){"use strict";return function(e){return{name:"X++",aliases:["x++"],keywords:{keyword:"abstract as asc avg break breakpoint by byref case catch changecompany class client client common const continue count crosscompany delegate delete_from desc display div do edit else eventhandler exists extends final finally firstfast firstonly firstonly1 firstonly10 firstonly100 firstonly1000 flush for forceliterals forcenestedloop forceplaceholders forceselectorder forupdate from generateonly group hint if implements in index insert_recordset interface internal is join like maxof minof mod namespace new next nofetch notexists optimisticlock order outer pessimisticlock print private protected public readonly repeatableread retry return reverse select server setting static sum super switch this throw try ttsabort ttsbegin ttscommit unchecked update_recordset using validtimestate void where while",built_in:"anytype boolean byte char container date double enum guid int int64 long real short str utcdatetime var",literal:"default false null true"},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",(()=>{"use strict";return e=>({name:"X++",
+aliases:["x++"],keywords:{
+keyword:["abstract","as","asc","avg","break","breakpoint","by","byref","case","catch","changecompany","class","client","client","common","const","continue","count","crosscompany","delegate","delete_from","desc","display","div","do","edit","else","eventhandler","exists","extends","final","finally","firstfast","firstonly","firstonly1","firstonly10","firstonly100","firstonly1000","flush","for","forceliterals","forcenestedloop","forceplaceholders","forceselectorder","forupdate","from","generateonly","group","hint","if","implements","in","index","insert_recordset","interface","internal","is","join","like","maxof","minof","mod","namespace","new","next","nofetch","notexists","optimisticlock","order","outer","pessimisticlock","print","private","protected","public","readonly","repeatableread","retry","return","reverse","select","server","setting","static","sum","super","switch","this","throw","try","ttsabort","ttsbegin","ttscommit","unchecked","update_recordset","using","validtimestate","void","where","while"],
+built_in:["anytype","boolean","byte","char","container","date","double","enum","guid","int","int64","long","real","short","str","utcdatetime","var"],
+literal:["default","false","null","true"]},
+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 5f26bd4b1f..597e00514f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/bash.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/bash.min.js
@@ -1 +1,19 @@
-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 n={className:"subst",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]},t={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,n]};n.contains.push(t);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"},contains:[i,e.SHEBANG(),c,a,e.HASH_COMMENT_MODE,t,{className:"",begin:/\\"/},{className:"string",begin:/'/,end:/'/},s]}}}());
\ No newline at end of file
+hljs.registerLanguage("bash",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(s=e)?"string"==typeof s?s:s.source:null;var s
+})).join("")}return s=>{const n={},t={begin:/\$\{/,end:/\}/,contains:["self",{
+begin:/:-/,contains:[n]}]};Object.assign(n,{className:"variable",variants:[{
+begin:e(/\$[\w\d#@][\w\d_]*/,"(?![\\w\\d])(?![$])")},t]});const a={
+className:"subst",begin:/\$\(/,end:/\)/,contains:[s.BACKSLASH_ESCAPE]},i={
+begin:/<<-?\s*(?=\w+)/,starts:{contains:[s.END_SAME_AS_BEGIN({begin:/(\w+)/,
+end:/(\w+)/,className:"string"})]}},c={className:"string",begin:/"/,end:/"/,
+contains:[s.BACKSLASH_ESCAPE,n,a]};a.contains.push(c);const o={begin:/\$\(\(/,
+end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},s.NUMBER_MODE,n]
+},r=s.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10
+}),l={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,
+contains:[s.inherit(s.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"
+},contains:[r,s.SHEBANG(),l,o,s.HASH_COMMENT_MODE,i,c,{className:"",begin:/\\"/
+},{className:"string",begin:/'/,end:/'/},n]}}})());
\ 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..8363a51f9b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/basic.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/basic.min.js
@@ -1 +1,8 @@
-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",(()=>{"use strict";return E=>({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\\d+(\\.\\d+)?([edED]\\d+)?[#!]?",
+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 4bd045fa1f..2a91672f79 100644
--- a/vendor/assets/javascripts/highlightjs/languages/bnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/bnf.min.js
@@ -1 +1,5 @@
-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",(()=>{"use strict";return e=>({
+name:"Backus\u2013Naur Form",contains:[{className:"attribute",begin:/</,end:/>/
+},{begin:/::=/,end:/$/,contains:[{begin:/</,end:/>/
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.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 4f9ddaf023..aa5042c929 100644
--- a/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
@@ -1 +1,7 @@
-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",(()=>{"use strict";return e=>{const 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
index 976c759529..669dc8571b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/c-like.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/c-like.min.js
@@ -1 +1,45 @@
-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
+hljs.registerLanguage("c-like",(()=>{"use strict";function e(e){
+return((...e)=>e.map((e=>(e=>e?"string"==typeof e?e:e.source:null)(e))).join(""))("(",e,")?")
+}return t=>{const n=(t=>{const n=t.COMMENT("//","$",{contains:[{begin:/\\\n/}]
+}),a="[a-zA-Z_]\\w*::",r="(decltype\\(auto\\)|"+e(a)+"[a-zA-Z_]\\w*"+e("<[^<>]+>")+")",s={
+className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},i={className:"string",
+variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",
+contains:[t.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:"."},t.END_SAME_AS_BEGIN({
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},c={
+className:"number",variants:[{begin:"\\b(0b[01']+)"},{
+begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
+},{
+begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
+}],relevance:0},o={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},t.inherit(i,{className:"meta-string"}),{
+className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"
+},n,t.C_BLOCK_COMMENT_MODE]},l={className:"title",begin:e(a)+t.IDENT_RE,
+relevance:0},d=e(a)+t.IDENT_RE+"\\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_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"},p=[o,s,n,t.C_BLOCK_COMMENT_MODE,c,i],m={
+variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{
+beginKeywords:"new throw return else",end:/;/}],keywords:u,contains:p.concat([{
+begin:/\(/,end:/\)/,keywords:u,contains:p.concat(["self"]),relevance:0}]),
+relevance:0},_={className:"function",begin:"("+r+"[\\*&\\s]+)+"+d,
+returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:u,illegal:/[^\w\s\*&:<>.]/,
+contains:[{begin:"decltype\\(auto\\)",keywords:u,relevance:0},{begin:d,
+returnBegin:!0,contains:[l],relevance:0},{className:"params",begin:/\(/,
+end:/\)/,keywords:u,relevance:0,contains:[n,t.C_BLOCK_COMMENT_MODE,i,c,s,{
+begin:/\(/,end:/\)/,keywords:u,relevance:0,
+contains:["self",n,t.C_BLOCK_COMMENT_MODE,i,c,s]}]
+},s,n,t.C_BLOCK_COMMENT_MODE,o]};return{name:"C++",
+aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:u,illegal:"</",
+contains:[].concat(m,_,p,[o,{
+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:u,contains:["self",s]},{begin:t.IDENT_RE+"::",keywords:u},{
+className:"class",beginKeywords:"enum class struct union",end:/[{;:<>=]/,
+contains:[{beginKeywords:"final class struct"},t.TITLE_MODE]}]),exports:{
+preprocessor:o,strings:i,keywords:u}}})(t)
+;return n.disableAutodetect=!0,n.aliases=[],
+t.getLanguage("c")||n.aliases.push("c","h"),
+t.getLanguage("cpp")||n.aliases.push("cc","c++","h++","hpp","hh","hxx","cxx"),n}
+})());
\ 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
index c6f2e39cbf..57453e17ed 100644
--- a/vendor/assets/javascripts/highlightjs/languages/c.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/c.min.js
@@ -1 +1,40 @@
-hljs.registerLanguage("c",function(){"use strict";return function(e){var n=e.requireLanguage("c-like").rawDefinition();return n.name="C",n.aliases=["c","h"],n}}());
\ No newline at end of file
+hljs.registerLanguage("c",(()=>{"use strict";function e(e){
+return((...e)=>e.map((e=>(e=>e?"string"==typeof e?e:e.source:null)(e))).join(""))("(",e,")?")
+}return t=>{const n=t.COMMENT("//","$",{contains:[{begin:/\\\n/}]
+}),r="[a-zA-Z_]\\w*::",a="(decltype\\(auto\\)|"+e(r)+"[a-zA-Z_]\\w*"+e("<[^<>]+>")+")",i={
+className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},s={className:"string",
+variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",
+contains:[t.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:"."},t.END_SAME_AS_BEGIN({
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
+className:"number",variants:[{begin:"\\b(0b[01']+)"},{
+begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
+},{
+begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
+}],relevance:0},c={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},t.inherit(s,{className:"meta-string"}),{
+className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"
+},n,t.C_BLOCK_COMMENT_MODE]},l={className:"title",begin:e(r)+t.IDENT_RE,
+relevance:0},d=e(r)+t.IDENT_RE+"\\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_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"},m=[c,i,n,t.C_BLOCK_COMMENT_MODE,o,s],p={
+variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{
+beginKeywords:"new throw return else",end:/;/}],keywords:u,contains:m.concat([{
+begin:/\(/,end:/\)/,keywords:u,contains:m.concat(["self"]),relevance:0}]),
+relevance:0},_={className:"function",begin:"("+a+"[\\*&\\s]+)+"+d,
+returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:u,illegal:/[^\w\s\*&:<>.]/,
+contains:[{begin:"decltype\\(auto\\)",keywords:u,relevance:0},{begin:d,
+returnBegin:!0,contains:[l],relevance:0},{className:"params",begin:/\(/,
+end:/\)/,keywords:u,relevance:0,contains:[n,t.C_BLOCK_COMMENT_MODE,s,o,i,{
+begin:/\(/,end:/\)/,keywords:u,relevance:0,
+contains:["self",n,t.C_BLOCK_COMMENT_MODE,s,o,i]}]
+},i,n,t.C_BLOCK_COMMENT_MODE,c]};return{name:"C",aliases:["c","h"],keywords:u,
+disableAutodetect:!0,illegal:"</",contains:[].concat(p,_,m,[c,{
+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:u,contains:["self",i]},{begin:t.IDENT_RE+"::",keywords:u},{
+className:"class",beginKeywords:"enum class struct union",end:/[{;:<>=]/,
+contains:[{beginKeywords:"final class struct"},t.TITLE_MODE]}]),exports:{
+preprocessor:c,strings:s,keywords:u}}}})());
\ 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..725be0016f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cal.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cal.min.js
@@ -1 +1,12 @@
-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",(()=>{"use strict";return e=>{
+const 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 8e6a795cbf..fcd5bc029e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
@@ -1 +1,12 @@
-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",(()=>{"use strict";return n=>({
+name:"Cap\u2019n 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 054140701b..bb0d764af4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
@@ -1 +1,12 @@
-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",(()=>{"use strict";return e=>{
+const 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",s={
+className:"subst",excludeBegin:!0,excludeEnd:!0,begin:/``/,end:/``/,keywords:a,
+relevance:10},n=[{className:"string",begin:'"""',end:'"""',relevance:10},{
+className:"string",begin:'"',end:'"',contains:[s]},{className:"string",
+begin:"'",end:"'"},{className:"number",
+begin:"#[0-9a-fA-F_]+|\\$[01_]+|[0-9_]+(?:\\.[0-9_](?:[eE][+-]?\\d+)?)?[kMGTPmunpf]?",
+relevance:0}];return s.contains=n,{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(n)}}})());
\ 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..c5d052d1e0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/clean.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/clean.min.js
@@ -1 +1,6 @@
-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",(()=>{"use strict";return e=>({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 25dff78bc6..26762aa468 100644
--- a/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
@@ -1 +1,3 @@
-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",(()=>{"use strict";return e=>({
+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 1aec1783da..de8a5bac90 100644
--- a/vendor/assets/javascripts/highlightjs/languages/clojure.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/clojure.min.js
@@ -1 +1,17 @@
-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",(()=>{"use strict";return e=>{
+const t="a-zA-Z_\\-!.?+*=<>&#'",n="["+t+"]["+t+"0-9/;:]*",r="def defonce defprotocol defstruct defmulti defmethod defn- defn defmacro deftype defrecord",a={
+$pattern:n,
+"builtin-name":r+" cond apply if-not if-let if not not= =|0 <|0 >|0 <=|0 >=|0 ==|0 +|0 /|0 *|0 -|0 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"
+},s={begin:n,relevance:0},o={className:"number",begin:"[-+]?\\d+(\\.\\d+)?",
+relevance:0},i=e.inherit(e.QUOTE_STRING_MODE,{illegal:null
+}),c=e.COMMENT(";","$",{relevance:0}),d={className:"literal",
+begin:/\b(true|false|nil)\b/},l={begin:"[\\[\\{]",end:"[\\]\\}]"},m={
+className:"comment",begin:"\\^"+n},p=e.COMMENT("\\^\\{","\\}"),u={
+className:"symbol",begin:"[:]{1,2}"+n},f={begin:"\\(",end:"\\)"},h={
+endsWithParent:!0,relevance:0},y={keywords:a,className:"name",begin:n,
+relevance:0,starts:h},g=[f,i,m,p,c,u,l,o,d,s],b={beginKeywords:r,lexemes:n,
+end:'(\\[|#|\\d|"|:|\\{|\\)|\\(|$)',contains:[{className:"title",begin:n,
+relevance:0,excludeEnd:!0,endsParent:!0}].concat(g)}
+;return f.contains=[e.COMMENT("comment",""),b,y,h],
+h.contains=g,l.contains=g,p.contains=[l],{name:"Clojure",aliases:["clj"],
+illegal:/\S/,contains:[f,i,m,p,c,u,l,o,d]}}})());
\ 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..24b3233066 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cmake.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cmake.min.js
@@ -1 +1,5 @@
-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",(()=>{"use strict";return e=>({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 e686acc5b9..41d1c53066 100644
--- a/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
@@ -1 +1,27 @@
-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",(()=>{"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 r=>{const t={
+keyword:e.concat(["then","unless","until","loop","by","when","and","or","is","isnt","not"]).filter((i=["var","const","let","function","static"],
+e=>!i.includes(e))),literal:n.concat(["yes","no","on","off"]),
+built_in:a.concat(["npm","print"])};var i;const s="[A-Za-z$_][0-9A-Za-z$_]*",o={
+className:"subst",begin:/#\{/,end:/\}/,keywords:t
+},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
+;const l=r.inherit(r.TITLE_MODE,{begin:s}),d="(\\(.*\\)\\s*)?\\B[-=]>",g={
+className:"params",begin:"\\([^\\(]",returnBegin:!0,contains:[{begin:/\(/,
+end:/\)/,keywords:t,contains:["self"].concat(c)}]};return{name:"CoffeeScript",
+aliases:["coffee","cson","iced"],keywords:t,illegal:/\/\*/,
+contains:c.concat([r.COMMENT("###","###"),r.HASH_COMMENT_MODE,{
+className:"function",begin:"^\\s*"+s+"\\s*=\\s*"+d,end:"[-=]>",returnBegin:!0,
+contains:[l,g]},{begin:/[:\(,=]\s*/,relevance:0,contains:[{className:"function",
+begin:d,end:"[-=]>",returnBegin:!0,contains:[g]}]},{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 964f7b41e4..4b396401a5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/coq.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/coq.min.js
@@ -1 +1,6 @@
-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",(()=>{"use strict";return e=>({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 266e69da04..c24904561a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cos.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cos.min.js
@@ -1 +1,14 @@
-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",(()=>{"use strict";return e=>({
+name:"Cach\xe9 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 f3f0ab329c..f774777c78 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cpp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cpp.min.js
@@ -1 +1,41 @@
-hljs.registerLanguage("cpp",function(){"use strict";return function(e){var i=e.requireLanguage("c-like").rawDefinition();return i.disableAutodetect=!1,i.name="C++",i.aliases=["cc","c++","h++","hpp","hh","hxx","cxx"],i}}());
\ No newline at end of file
+hljs.registerLanguage("cpp",(()=>{"use strict";function e(e){
+return((...e)=>e.map((e=>(e=>e?"string"==typeof e?e:e.source:null)(e))).join(""))("(",e,")?")
+}return t=>{const n=t.COMMENT("//","$",{contains:[{begin:/\\\n/}]
+}),r="[a-zA-Z_]\\w*::",a="(decltype\\(auto\\)|"+e(r)+"[a-zA-Z_]\\w*"+e("<[^<>]+>")+")",i={
+className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},s={className:"string",
+variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",
+contains:[t.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:"."},t.END_SAME_AS_BEGIN({
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
+className:"number",variants:[{begin:"\\b(0b[01']+)"},{
+begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
+},{
+begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
+}],relevance:0},c={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},t.inherit(s,{className:"meta-string"}),{
+className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"
+},n,t.C_BLOCK_COMMENT_MODE]},l={className:"title",begin:e(r)+t.IDENT_RE,
+relevance:0},d=e(r)+t.IDENT_RE+"\\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_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"},m=[c,i,n,t.C_BLOCK_COMMENT_MODE,o,s],p={
+variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{
+beginKeywords:"new throw return else",end:/;/}],keywords:u,contains:m.concat([{
+begin:/\(/,end:/\)/,keywords:u,contains:m.concat(["self"]),relevance:0}]),
+relevance:0},_={className:"function",begin:"("+a+"[\\*&\\s]+)+"+d,
+returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:u,illegal:/[^\w\s\*&:<>.]/,
+contains:[{begin:"decltype\\(auto\\)",keywords:u,relevance:0},{begin:d,
+returnBegin:!0,contains:[l],relevance:0},{className:"params",begin:/\(/,
+end:/\)/,keywords:u,relevance:0,contains:[n,t.C_BLOCK_COMMENT_MODE,s,o,i,{
+begin:/\(/,end:/\)/,keywords:u,relevance:0,
+contains:["self",n,t.C_BLOCK_COMMENT_MODE,s,o,i]}]
+},i,n,t.C_BLOCK_COMMENT_MODE,c]};return{name:"C++",
+aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:u,illegal:"</",
+contains:[].concat(p,_,m,[c,{
+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:u,contains:["self",i]},{begin:t.IDENT_RE+"::",keywords:u},{
+className:"class",beginKeywords:"enum class struct union",end:/[{;:<>=]/,
+contains:[{beginKeywords:"final class struct"},t.TITLE_MODE]}]),exports:{
+preprocessor:c,strings:s,keywords: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..3c908774aa 100644
--- a/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
@@ -1 +1,18 @@
-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",(()=>{"use strict";return e=>{
+const 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 6979ccbe6e..04ab860ed7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/crystal.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/crystal.min.js
@@ -1 +1,45 @@
-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",(()=>{"use strict";return e=>{
+const n="(_?[ui](8|16|32|64|128))?",i="[a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|[=!]~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~|]|//|//=|&[-+*]=?|&\\*\\*|\\[\\][=?]?",s="[A-Za-z_]\\w*(::\\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"},t={className:"subst",begin:/#\{/,end:/\}/,keywords:a
+},c={className:"template-variable",variants:[{begin:"\\{\\{",end:"\\}\\}"},{
+begin:"\\{%",end:"%\\}"}],keywords:a};function r(e,n){const i=[{begin:e,end:n}]
+;return i[0].contains=i,i}const l={className:"string",
+contains:[e.BACKSLASH_ESCAPE,t],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},b={
+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},o={
+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,t],variants:[{begin:"//[a-z]*",relevance:0},{
+begin:"/(?!\\/)",end:"/[a-z]*"}]}],relevance:0},g=[c,l,b,{className:"regexp",
+contains:[e.BACKSLASH_ESCAPE,t],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},o,{
+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:s}),{begin:"<"}]},{className:"class",beginKeywords:"lib enum union",
+end:"$|;",illegal:/=/,contains:[e.HASH_COMMENT_MODE,e.inherit(e.TITLE_MODE,{
+begin:s})]},{beginKeywords:"annotation",end:"$|;",illegal:/=/,
+contains:[e.HASH_COMMENT_MODE,e.inherit(e.TITLE_MODE,{begin:s})],relevance:2},{
+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:2},{
+className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"(!|\\?)?:",relevance:0},{
+className:"symbol",begin:":",contains:[l,{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 t.contains=g,c.contains=g.slice(1),{name:"Crystal",aliases:["cr"],
+keywords:a,contains:g}}})());
\ 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
index ca4d0acb71..348c323d10 100644
--- a/vendor/assets/javascripts/highlightjs/languages/csharp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/csharp.min.js
@@ -1 +1,45 @@
-hljs.registerLanguage("csharp",function(){"use strict";return function(e){var n={keyword:["abstract","as","base","break","case","class","const","continue","do","else","event","explicit","extern","finally","fixed","for","foreach","goto","if","implicit","in","interface","internal","is","lock","namespace","new","operator","out","override","params","private","protected","public","readonly","record","ref","return","sealed","sizeof","stackalloc","static","struct","switch","this","throw","try","typeof","unchecked","unsafe","using","virtual","void","volatile","while"].concat(["add","alias","and","ascending","async","await","by","descending","equals","from","get","global","group","init","into","join","let","nameof","not","notnull","on","or","orderby","partial","remove","select","set","unmanaged","value","var","when","where","with","yield"]).join(" "),built_in:"bool byte char decimal delegate double dynamic enum float int long nint nuint object sbyte short string ulong unit ushort",literal:"default false null 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/}),r={className:"subst",begin:"{",end:"}",keywords:n},l=e.inherit(r,{illegal:/\n/}),c={className:"string",begin:/\$"/,end:'"',illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},e.BACKSLASH_ESCAPE,l]},o={className:"string",begin:/\$@"/,end:'"',contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},r]},d=e.inherit(o,{illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},l]});r.contains=[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.C_BLOCK_COMMENT_MODE],l.contains=[d,c,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.inherit(e.C_BLOCK_COMMENT_MODE,{illegal:/\n/})];var g={variants:[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},E={begin:"<",end:">",contains:[{beginKeywords:"in out"},i]},_=e.IDENT_RE+"(<"+e.IDENT_RE+"(\\s*,\\s*"+e.IDENT_RE+")*>)?(\\[\\])?",b={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"}},g,a,{beginKeywords:"class interface",end:/[{;=]/,illegal:/[^\s:,]/,contains:[{beginKeywords:"where class"},i,E,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]},{beginKeywords:"record",end:/[{;=]/,illegal:/[^\s:]/,contains:[i,E,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:"("+_+"\\s+)+"+e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0,end:/\s*[{;=]/,excludeEnd:!0,keywords:n,contains:[{beginKeywords:"public private protected static internal protected abstract async extern override unsafe virtual new sealed partial"},{begin:e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0,contains:[e.TITLE_MODE,E],relevance:0},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0,contains:[g,a,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},b]}}}());
\ No newline at end of file
+hljs.registerLanguage("csharp",(()=>{"use strict";return e=>{var n={
+keyword:["abstract","as","base","break","case","class","const","continue","do","else","event","explicit","extern","finally","fixed","for","foreach","goto","if","implicit","in","interface","internal","is","lock","namespace","new","operator","out","override","params","private","protected","public","readonly","record","ref","return","sealed","sizeof","stackalloc","static","struct","switch","this","throw","try","typeof","unchecked","unsafe","using","virtual","void","volatile","while"].concat(["add","alias","and","ascending","async","await","by","descending","equals","from","get","global","group","init","into","join","let","nameof","not","notnull","on","or","orderby","partial","remove","select","set","unmanaged","value|0","var","when","where","with","yield"]),
+built_in:["bool","byte","char","decimal","delegate","double","dynamic","enum","float","int","long","nint","nuint","object","sbyte","short","string","ulong","unit","ushort"],
+literal:["default","false","null","true"]},a=e.inherit(e.TITLE_MODE,{
+begin:"[a-zA-Z](\\.?\\w)*"}),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:"string",begin:'@"',end:'"',contains:[{begin:'""'}]
+},t=e.inherit(s,{illegal:/\n/}),r={className:"subst",begin:/\{/,end:/\}/,
+keywords:n},l=e.inherit(r,{illegal:/\n/}),c={className:"string",begin:/\$"/,
+end:'"',illegal:/\n/,contains:[{begin:/\{\{/},{begin:/\}\}/
+},e.BACKSLASH_ESCAPE,l]},o={className:"string",begin:/\$@"/,end:'"',contains:[{
+begin:/\{\{/},{begin:/\}\}/},{begin:'""'},r]},d=e.inherit(o,{illegal:/\n/,
+contains:[{begin:/\{\{/},{begin:/\}\}/},{begin:'""'},l]})
+;r.contains=[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,i,e.C_BLOCK_COMMENT_MODE],
+l.contains=[d,c,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,i,e.inherit(e.C_BLOCK_COMMENT_MODE,{
+illegal:/\n/})];var g={variants:[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]
+},E={begin:"<",end:">",contains:[{beginKeywords:"in out"},a]
+},_=e.IDENT_RE+"(<"+e.IDENT_RE+"(\\s*,\\s*"+e.IDENT_RE+")*>)?(\\[\\])?",b={
+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"
+}},g,i,{beginKeywords:"class interface",relevance:0,end:/[{;=]/,
+illegal:/[^\s:,]/,contains:[{beginKeywords:"where class"
+},a,E,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{beginKeywords:"namespace",
+relevance:0,end:/[{;=]/,illegal:/[^\s:]/,
+contains:[a,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{
+beginKeywords:"record",relevance:0,end:/[{;=]/,illegal:/[^\s:]/,
+contains:[a,E,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:"("+_+"\\s+)+"+e.IDENT_RE+"\\s*(<.+>\\s*)?\\(",returnBegin:!0,
+end:/\s*[{;=]/,excludeEnd:!0,keywords:n,contains:[{
+beginKeywords:"public private protected static internal protected abstract async extern override unsafe virtual new sealed partial",
+relevance:0},{begin:e.IDENT_RE+"\\s*(<.+>\\s*)?\\(",returnBegin:!0,
+contains:[e.TITLE_MODE,E],relevance:0},{className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0,
+contains:[g,i,e.C_BLOCK_COMMENT_MODE]
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},b]}}})());
\ 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..30d1db026e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/csp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/csp.min.js
@@ -1 +1,5 @@
-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",(()=>{"use strict";return e=>({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 0e944b0cee..e2990d9377 100644
--- a/vendor/assets/javascripts/highlightjs/languages/css.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/css.min.js
@@ -1 +1,26 @@
-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",(()=>{"use strict"
+;const e=["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","main","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"],t=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],i=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],o=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],r=["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-display","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-variation-settings","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","src","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()
+;return n=>{const a=(e=>({IMPORTANT:{className:"meta",begin:"!important"},
+HEXCOLOR:{className:"number",begin:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"},
+ATTRIBUTE_SELECTOR_MODE:{className:"selector-attr",begin:/\[/,end:/\]/,
+illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]}
+}))(n),l=[n.APOS_STRING_MODE,n.QUOTE_STRING_MODE];return{name:"CSS",
+case_insensitive:!0,illegal:/[=|'\$]/,keywords:{keyframePosition:"from to"},
+classNameAliases:{keyframePosition:"selector-tag"},
+contains:[n.C_BLOCK_COMMENT_MODE,{begin:/-(webkit|moz|ms|o)-(?=[a-z])/
+},n.CSS_NUMBER_MODE,{className:"selector-id",begin:/#[A-Za-z0-9_-]+/,relevance:0
+},{className:"selector-class",begin:"\\.[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0
+},a.ATTRIBUTE_SELECTOR_MODE,{className:"selector-pseudo",variants:[{
+begin:":("+i.join("|")+")"},{begin:"::("+o.join("|")+")"}]},{
+className:"attribute",begin:"\\b("+r.join("|")+")\\b"},{begin:":",end:"[;}]",
+contains:[a.HEXCOLOR,a.IMPORTANT,n.CSS_NUMBER_MODE,...l,{
+begin:/(url|data-uri)\(/,end:/\)/,relevance:0,keywords:{built_in:"url data-uri"
+},contains:[{className:"string",begin:/[^)]/,endsWithParent:!0,excludeEnd:!0}]
+},{className:"built_in",begin:/[\w-]+(?=\()/}]},{
+begin:(s=/@/,((...e)=>e.map((e=>(e=>e?"string"==typeof e?e:e.source:null)(e))).join(""))("(?=",s,")")),
+end:"[{;]",relevance:0,illegal:/:/,contains:[{className:"keyword",
+begin:/@-?\w[\w]*(-\w+)*/},{begin:/\s/,endsWithParent:!0,excludeEnd:!0,
+relevance:0,keywords:{$pattern:/[a-z-]+/,keyword:"and or not only",
+attribute:t.join(" ")},contains:[{begin:/[a-z-]+(?=:)/,className:"attribute"
+},...l,n.CSS_NUMBER_MODE]}]},{className:"selector-tag",
+begin:"\\b("+e.join("|")+")\\b"}]};var s}})());
\ 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..c01a042654 100644
--- a/vendor/assets/javascripts/highlightjs/languages/d.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/d.min.js
@@ -1 +1,19 @@
-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",(()=>{"use strict";return e=>{const 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_]*)([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 a352396f51..62effa7c67 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dart.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dart.min.js
@@ -1 +1,20 @@
-hljs.registerLanguage("dart",function(){"use strict";return function(e){const 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]}]};t.contains=[e.C_NUMBER_MODE,a];const i=["Comparable","DateTime","Duration","Function","Iterable","Iterator","List","Map","Match","Object","Pattern","RegExp","Set","Stopwatch","String","StringBuffer","StringSink","Symbol","Type","Uri","bool","double","int","num","Element","ElementList"],r=i.map(e=>e+"?");return{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:i.concat(r).concat(["Never","Null","dynamic","print","document","querySelector","querySelectorAll","window"]).join(" "),$pattern:/[A-Za-z][A-Za-z0-9_]*\??/},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",(()=>{"use strict";return e=>{const n={
+className:"subst",variants:[{begin:"\\$[A-Za-z0-9_]+"}]},a={className:"subst",
+variants:[{begin:/\$\{/,end:/\}/}],keywords:"true false null this is new super"
+},t={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,a]},{begin:'"""',
+end:'"""',contains:[e.BACKSLASH_ESCAPE,n,a]},{begin:"'",end:"'",illegal:"\\n",
+contains:[e.BACKSLASH_ESCAPE,n,a]},{begin:'"',end:'"',illegal:"\\n",
+contains:[e.BACKSLASH_ESCAPE,n,a]}]};a.contains=[e.C_NUMBER_MODE,t]
+;const i=["Comparable","DateTime","Duration","Function","Iterable","Iterator","List","Map","Match","Object","Pattern","RegExp","Set","Stopwatch","String","StringBuffer","StringSink","Symbol","Type","Uri","bool","double","int","num","Element","ElementList"],r=i.map((e=>e+"?"))
+;return{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:i.concat(r).concat(["Never","Null","dynamic","print","document","querySelector","querySelectorAll","window"]),
+$pattern:/[A-Za-z][A-Za-z0-9_]*\??/},
+contains:[t,e.COMMENT(/\/\*\*(?!\/)/,/\*\//,{subLanguage:"markdown",relevance:0
+}),e.COMMENT(/\/{3,} ?/,/$/,{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 6ea2a6f275..ad4888c1d8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/delphi.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/delphi.min.js
@@ -1 +1,16 @@
-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",(()=>{"use strict";return e=>{
+const 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})],t={className:"meta",
+variants:[{begin:/\{\$/,end:/\}/},{begin:/\(\*\$/,end:/\*\)/}]},n={
+className:"string",begin:/'/,end:/'/,contains:[{begin:/''/}]},s={
+className:"string",begin:/(#\d+)+/},i={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:[n,s,t].concat(a)},t].concat(a)};return{name:"Delphi",
+aliases:["dpr","dfm","pas","pascal","freepascal","lazarus","lpr","lfm"],
+case_insensitive:!0,keywords:r,illegal:/"|\$[G-Zg-z]|\/\*|<\/|\|/,
+contains:[n,s,e.NUMBER_MODE,{className:"number",relevance:0,variants:[{
+begin:"\\$[0-9A-Fa-f]+"},{begin:"&[0-7]+"},{begin:"%[01]+"}]},i,c,t].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 e0dcabc804..bd267354b5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/diff.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/diff.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return e=>({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:/^index/,end:/$/},{begin:/={3,}/,end:/$/},{begin:/^-{3}/,end:/$/
+},{begin:/^\*{3} /,end:/$/},{begin:/^\+{3}/,end:/$/},{begin:/^\*{15}$/},{
+begin:/^diff --git/,end:/$/}]},{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 13036d19f0..b95e87ca4a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/django.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/django.min.js
@@ -1 +1,11 @@
-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",(()=>{"use strict";return e=>{const 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 f9f29359a1..68dbbea4ad 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dns.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dns.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return d=>({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 2bb92c9b3c..e6cda1b296 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
@@ -1 +1,6 @@
-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",(()=>{"use strict";return e=>({
+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 5b17c1536e..a6a5e11823 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dos.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dos.min.js
@@ -1 +1,11 @@
-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",(()=>{"use strict";return e=>{
+const 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 625e2491ee..a618dbf9d5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return e=>({
+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 99ade5e8f2..ba4e9f09a3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dts.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dts.min.js
@@ -1 +1,21 @@
-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",(()=>{"use strict";return e=>{const 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]},_={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,_,r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,n]
+},i,d,l,_,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 57896b00ce..9786a867ba 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dust.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dust.min.js
@@ -1 +1,7 @@
-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",(()=>{"use strict";return e=>({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 2610d604f1..654fa5b6f3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
@@ -1 +1,7 @@
-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",(()=>{"use strict";return e=>{
+const a=e.COMMENT(/\(\*/,/\*\)/);return{name:"Extended Backus-Naur Form",
+illegal:/\S/,contains:[a,{className:"attribute",
+begin:/^[ ]*[a-zA-Z]+([\s_-]+[a-zA-Z]+)*/},{begin:/=/,end:/[.;]/,contains:[a,{
+className:"meta",begin:/\?.*\?/},{className:"string",
+variants:[e.APOS_STRING_MODE,e.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 a4ad84d10e..ba104417da 100644
--- a/vendor/assets/javascripts/highlightjs/languages/elixir.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/elixir.min.js
@@ -1 +1,29 @@
-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",(()=>{"use strict";return e=>{
+const 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 61eeb765c6..c08d929a65 100644
--- a/vendor/assets/javascripts/highlightjs/languages/elm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/elm.min.js
@@ -1 +1,16 @@
-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",(()=>{"use strict";return e=>{const 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 f6f09f120a..e760aade7b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/erb.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/erb.min.js
@@ -1 +1,3 @@
-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",(()=>{"use strict";return e=>({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 0289bf52e3..dc8e5829fc 100644
--- a/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>({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
+},n.COMMENT("%","$"),{className:"number",
+begin:"\\b(\\d+(_\\d+)*#[a-fA-F0-9]+(_[a-fA-F0-9]+)*|\\d+(_\\d+)*(\\.\\d+(_\\d+)*)?([eE][-+]?\\d+)?)",
+relevance:0},n.APOS_STRING_MODE,n.QUOTE_STRING_MODE,{
+begin:e(/\?(::)?/,/([A-Z]\w*)/,/((::)[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 3ab6a9cb8a..fc3af4cfb3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/erlang.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/erlang.min.js
@@ -1 +1,25 @@
-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",(()=>{"use strict";return e=>{
+const 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("%","$"),s={className:"number",
+begin:"\\b(\\d+(_\\d+)*#[a-fA-F0-9]+(_[a-fA-F0-9]+)*|\\d+(_\\d+)*(\\.\\d+(_\\d+)*)?([eE][-+]?\\d+)?)",
+relevance:0},c={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,c,e.inherit(e.APOS_STRING_MODE,{className:""
+}),g,t,e.QUOTE_STRING_MODE,s,d,o,l,b]
+;const E=[i,c,g,t,e.QUOTE_STRING_MODE,s,d,o,l,b]
+;t.contains[1].contains=E,d.contains=E,b.contains[1].contains=E;const u={
+className:"params",begin:"\\(",end:"\\)",contains:E};return{name:"Erlang",
+aliases:["erl"],keywords:a,illegal:"(</|\\*=|\\+=|-=|/\\*|\\*/|\\(\\*|\\*\\))",
+contains:[{className:"function",begin:"^"+n+"\\s*\\(",end:"->",returnBegin:!0,
+illegal:"\\(|#|//|/\\*|\\\\|:|;",contains:[u,e.inherit(e.TITLE_MODE,{begin:n})],
+starts:{end:";|\\.",keywords:a,contains:E}},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"].map((e=>e+"|1.5")).join(" ")
+},contains:[u]},s,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 88f1939ebf..2fc910a2f6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/excel.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/excel.min.js
@@ -1 +1,10 @@
-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",(()=>{"use strict";return E=>({
+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 0474876a72..2afa008643 100644
--- a/vendor/assets/javascripts/highlightjs/languages/fix.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/fix.min.js
@@ -1 +1,6 @@
-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",(()=>{"use strict";return e=>({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 a8ef06d91b..f600b87497 100644
--- a/vendor/assets/javascripts/highlightjs/languages/flix.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/flix.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return e=>({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",relevance:0,
+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 8043a96862..f352661b2c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/fortran.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/fortran.min.js
@@ -1 +1,16 @@
-hljs.registerLanguage("fortran",function(){"use strict";return function(e){const n={variants:[e.COMMENT("!","$",{relevance:0}),e.COMMENT("^C[ ]","$",{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",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>{const a={variants:[n.COMMENT("!","$",{relevance:0
+}),n.COMMENT("^C[ ]","$",{relevance:0}),n.COMMENT("^C$","$",{relevance:0})]
+},t=/(_[a-z_\d]+)?/,i=/([de][+-]?\d+)?/,c={className:"number",variants:[{
+begin:e(/\b\d+/,/\.(\d*)/,i,t)},{begin:e(/\b\d+/,i,t)},{begin:e(/\.\d+/,i,t)}],
+relevance:0},o={className:"function",
+beginKeywords:"subroutine function program",illegal:"[${=\\n]",
+contains:[n.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:[n.APOS_STRING_MODE,n.QUOTE_STRING_MODE]},o,{begin:/^C\s*=(?!=)/,
+relevance:0},a,c]}}})());
\ 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..e83a5f5ab3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";return e=>{const 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("\\(\\*(\\s)","\\*\\)",{
+contains:["self"]}),{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 a25e7316b3..da0e61aa3d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gams.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gams.min.js
@@ -1 +1,29 @@
-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",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>{const 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"
+},i={className:"symbol",variants:[{begin:/=[lgenxc]=/},{begin:/\$/}]},s={
+className:"comment",variants:[{begin:"'",end:"'"},{begin:'"',end:'"'}],
+illegal:"\\n",contains:[n.BACKSLASH_ESCAPE]},o={begin:"/",end:"/",keywords:a,
+contains:[s,n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,n.C_NUMBER_MODE]
+},t=/[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+/,r={
+begin:/[a-z][a-z0-9_]*(\([a-z0-9_, ]*\))?[ \t]+/,excludeBegin:!0,end:"$",
+endsWithParent:!0,contains:[s,o,{className:"comment",
+begin:e(t,(l=e(/[ ]+/,t),e("(",l,")*"))),relevance:0}]};var l;return{
+name:"GAMS",aliases:["gms"],case_insensitive:!0,keywords:a,
+contains:[n.COMMENT(/^\$ontext/,/^\$offtext/),{className:"meta",
+begin:"^\\$[a-z0-9]+",end:"$",returnBegin:!0,contains:[{
+className:"meta-keyword",begin:"^\\$[a-z0-9]+"}]
+},n.COMMENT("^\\*","$"),n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,{
+beginKeywords:"set sets parameter parameters variable variables scalar scalars equation equations",
+end:";",
+contains:[n.COMMENT("^\\*","$"),n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,o,r]
+},{beginKeywords:"table",end:";",returnBegin:!0,contains:[{
+beginKeywords:"table",end:"$",contains:[r]
+},n.COMMENT("^\\*","$"),n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,n.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},i]},n.C_NUMBER_MODE,i]}}
+})());
\ 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..beaec6fbf0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gauss.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gauss.min.js
@@ -1 +1,35 @@
-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",(()=>{"use strict";return e=>{const 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=(t,r,n)=>{
+const 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 60c6c3988e..c863c781da 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gcode.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gcode.min.js
@@ -1 +1,16 @@
-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",(()=>{"use strict";return e=>{
+const a=e.inherit(e.C_NUMBER_MODE,{
+begin:"([-+]?((\\.\\d+)|(\\d+)(\\.\\d*)?))|"+e.C_NUMBER_RE
+}),n=[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.COMMENT(/\(/,/\)/),a,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)(\\[)",contains:[a],
+end:"\\]"},{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(n)}}})());
\ 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..b6f5cdc4af 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
@@ -1 +1,7 @@
-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",(()=>{"use strict";return e=>({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 e5746faa20..c5fe952758 100644
--- a/vendor/assets/javascripts/highlightjs/languages/glsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/glsl.min.js
@@ -1 +1,8 @@
-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",(()=>{"use strict";return e=>({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 fdf7734990..6ece0be13c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gml.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return e=>({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|0 y|0 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 9f78f66105..030efe49fb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/go.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/go.min.js
@@ -1 +1,11 @@
-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",(()=>{"use strict";return e=>{const 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 a56cf56665..b5fb645810 100644
--- a/vendor/assets/javascripts/highlightjs/languages/golo.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/golo.min.js
@@ -1 +1,6 @@
-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",(()=>{"use strict";return e=>({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 9d39fb6dd5..0bdab47e05 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gradle.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gradle.min.js
@@ -1 +1,6 @@
-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",(()=>{"use strict";return e=>({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 31821980b6..5a6db07a72 100644
--- a/vendor/assets/javascripts/highlightjs/languages/groovy.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/groovy.min.js
@@ -1 +1,19 @@
-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",(()=>{"use strict";function e(e,n={}){
+return n.variants=e,n}return n=>{
+const a="[A-Za-z0-9_$]+",t=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]+"}]})]),s={className:"regexp",begin:/~?\/[^\/\n]+\//,
+contains:[n.BACKSLASH_ESCAPE]
+},i=e([n.BINARY_NUMBER_MODE,n.C_NUMBER_MODE]),r=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({binary:"groovy",relevance:10}),t,r,s,i,{
+className:"class",beginKeywords:"class interface trait enum",end:/\{/,
+illegal:":",contains:[{beginKeywords:"extends implements"
+},n.UNDERSCORE_TITLE_MODE]},{className:"meta",begin:"@[A-Za-z]+",relevance:0},{
+className:"attr",begin:a+"[ \t]*:",relevance:0},{begin:/\?/,end:/:/,relevance:0,
+contains:[t,r,s,i,"self"]},{className:"symbol",
+begin:"^[ \t]*"+(l=a+":",((...e)=>e.map((e=>(e=>e?"string"==typeof e?e:e.source:null)(e))).join(""))("(?=",l,")")),
+excludeBegin:!0,end:a+":",relevance:0}],illegal:/#|<\//};var l}})());
\ 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..2c6d4e268a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/haml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/haml.min.js
@@ -1 +1,15 @@
-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",(()=>{"use strict";return e=>({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 a0fee8b64b..be129623f0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
@@ -1 +1,29 @@
-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",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(...n){
+return n.map((n=>e(n))).join("")}return a=>{const t={
+"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"]
+},s=/\[\]|\[[^\]]+\]/,i=/[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/,r=((...n)=>"("+n.map((n=>e(n))).join("|")+")")(/""|"[^"]+"/,/''|'[^']+'/,s,i),l=n(n("(",/\.|\.\/|\//,")?"),r,(h=n(/(\.|\/)/,r),
+n("(",h,")*"))),c=n("(",s,"|",i,")(?==)"),o={begin:l,lexemes:/[\w.\/]+/
+},m=a.inherit(o,{keywords:{literal:["true","false","undefined","null"]}}),d={
+begin:/\(/,end:/\)/},g={className:"attr",begin:c,relevance:0,starts:{begin:/=/,
+end:/=/,starts:{
+contains:[a.NUMBER_MODE,a.QUOTE_STRING_MODE,a.APOS_STRING_MODE,m,d]}}},b={
+contains:[a.NUMBER_MODE,a.QUOTE_STRING_MODE,a.APOS_STRING_MODE,{begin:/as\s+\|/,
+keywords:{keyword:"as"},end:/\|/,contains:[{begin:/\w+/}]},g,m,d],returnEnd:!0
+},u=a.inherit(o,{className:"name",keywords:t,starts:a.inherit(b,{end:/\)/})})
+;var h;d.contains=[u];const N=a.inherit(o,{keywords:t,className:"name",
+starts:a.inherit(b,{end:/\}\}/})}),p=a.inherit(o,{keywords:t,className:"name"
+}),E=a.inherit(o,{className:"name",keywords:t,starts:a.inherit(b,{end:/\}\}/})})
+;return{name:"Handlebars",
+aliases:["hbs","html.hbs","html.handlebars","htmlbars"],case_insensitive:!0,
+subLanguage:"xml",contains:[{begin:/\\\{\{/,skip:!0},{begin:/\\\\(?=\{\{)/,
+skip:!0},a.COMMENT(/\{\{!--/,/--\}\}/),a.COMMENT(/\{\{!/,/\}\}/),{
+className:"template-tag",begin:/\{\{\{\{(?!\/)/,end:/\}\}\}\}/,contains:[N],
+starts:{end:/\{\{\{\{\//,returnEnd:!0,subLanguage:"xml"}},{
+className:"template-tag",begin:/\{\{\{\{\//,end:/\}\}\}\}/,contains:[p]},{
+className:"template-tag",begin:/\{\{#/,end:/\}\}/,contains:[N]},{
+className:"template-tag",begin:/\{\{(?=else\}\})/,end:/\}\}/,keywords:"else"},{
+className:"template-tag",begin:/\{\{(?=else if)/,end:/\}\}/,keywords:"else if"
+},{className:"template-tag",begin:/\{\{\//,end:/\}\}/,contains:[p]},{
+className:"template-variable",begin:/\{\{\{/,end:/\}\}\}/,contains:[E]},{
+className:"template-variable",begin:/\{\{/,end:/\}\}/,contains:[E]}]}}})());
\ 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..39ac8820d7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/haskell.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/haskell.min.js
@@ -1 +1,23 @@
-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",(()=>{"use strict";return e=>{const 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 9e1612ee9e..62e28ea11e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/haxe.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/haxe.min.js
@@ -1 +1,25 @@
-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",(()=>{"use strict";return e=>({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 3846f5113f..33181794ae 100644
--- a/vendor/assets/javascripts/highlightjs/languages/hsp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/hsp.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";return e=>({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 f735d0618e..f510719c6d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/htmlbars.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/htmlbars.min.js
@@ -1 +1,31 @@
-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",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(...n){
+return n.map((n=>e(n))).join("")}return a=>{const t=function(a){const t={
+"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"]
+},s=/\[\]|\[[^\]]+\]/,i=/[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/,r=((...n)=>"("+n.map((n=>e(n))).join("|")+")")(/""|"[^"]+"/,/''|'[^']+'/,s,i),l=n(n("(",/\.|\.\/|\//,")?"),r,(c=n(/(\.|\/)/,r),
+n("(",c,")*")));var c;const o=n("(",s,"|",i,")(?==)"),m={begin:l,
+lexemes:/[\w.\/]+/},d=a.inherit(m,{keywords:{
+literal:["true","false","undefined","null"]}}),g={begin:/\(/,end:/\)/},b={
+className:"attr",begin:o,relevance:0,starts:{begin:/=/,end:/=/,starts:{
+contains:[a.NUMBER_MODE,a.QUOTE_STRING_MODE,a.APOS_STRING_MODE,d,g]}}},u={
+contains:[a.NUMBER_MODE,a.QUOTE_STRING_MODE,a.APOS_STRING_MODE,{begin:/as\s+\|/,
+keywords:{keyword:"as"},end:/\|/,contains:[{begin:/\w+/}]},b,d,g],returnEnd:!0
+},h=a.inherit(m,{className:"name",keywords:t,starts:a.inherit(u,{end:/\)/})})
+;g.contains=[h];const N=a.inherit(m,{keywords:t,className:"name",
+starts:a.inherit(u,{end:/\}\}/})}),p=a.inherit(m,{keywords:t,className:"name"
+}),E=a.inherit(m,{className:"name",keywords:t,starts:a.inherit(u,{end:/\}\}/})})
+;return{name:"Handlebars",
+aliases:["hbs","html.hbs","html.handlebars","htmlbars"],case_insensitive:!0,
+subLanguage:"xml",contains:[{begin:/\\\{\{/,skip:!0},{begin:/\\\\(?=\{\{)/,
+skip:!0},a.COMMENT(/\{\{!--/,/--\}\}/),a.COMMENT(/\{\{!/,/\}\}/),{
+className:"template-tag",begin:/\{\{\{\{(?!\/)/,end:/\}\}\}\}/,contains:[N],
+starts:{end:/\{\{\{\{\//,returnEnd:!0,subLanguage:"xml"}},{
+className:"template-tag",begin:/\{\{\{\{\//,end:/\}\}\}\}/,contains:[p]},{
+className:"template-tag",begin:/\{\{#/,end:/\}\}/,contains:[N]},{
+className:"template-tag",begin:/\{\{(?=else\}\})/,end:/\}\}/,keywords:"else"},{
+className:"template-tag",begin:/\{\{(?=else if)/,end:/\}\}/,keywords:"else if"
+},{className:"template-tag",begin:/\{\{\//,end:/\}\}/,contains:[p]},{
+className:"template-variable",begin:/\{\{\{/,end:/\}\}\}/,contains:[E]},{
+className:"template-variable",begin:/\{\{/,end:/\}\}/,contains:[E]}]}}(a)
+;return t.name="HTMLbars",a.getLanguage("handlebars")&&(t.disableAutodetect=!0),
+t}})());
\ 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..c029b53764 100644
--- a/vendor/assets/javascripts/highlightjs/languages/http.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/http.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>{const a="HTTP/(2|1\\.[01])",s=[{className:"attribute",
+begin:e("^",/[A-Za-z][A-Za-z0-9-]*/,"(?=\\:\\s)"),starts:{contains:[{
+className:"punctuation",begin:/: /,relevance:0,starts:{end:"$",relevance:0}}]}
+},{begin:"\\n\\n",starts:{subLanguage:[],endsWithParent:!0}}];return{
+name:"HTTP",aliases:["https"],illegal:/\S/,contains:[{begin:"^(?="+a+" \\d{3})",
+end:/$/,contains:[{className:"meta",begin:a},{className:"number",
+begin:"\\b\\d{3}\\b"}],starts:{end:/\b\B/,illegal:/\S/,contains:s}},{
+begin:"(?=^[A-Z]+ (.*?) "+a+"$)",end:/$/,contains:[{className:"string",
+begin:" ",end:" ",excludeBegin:!0,excludeEnd:!0},{className:"meta",begin:a},{
+className:"keyword",begin:"[A-Z]+"}],starts:{end:/\b\B/,illegal:/\S/,contains:s}
+}]}}})());
\ 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..5a4b10e136 100644
--- a/vendor/assets/javascripts/highlightjs/languages/hy.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/hy.min.js
@@ -1 +1,14 @@
-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",(()=>{"use strict";return e=>{
+var a="a-zA-Z_\\-!.?+*=<>&#'",t="["+a+"]["+a+"0-9/;:]*",i={$pattern: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 | |= ~"
+},r={begin:t,relevance:0},n={className:"number",begin:"[-+]?\\d+(\\.\\d+)?",
+relevance:0},s=e.inherit(e.QUOTE_STRING_MODE,{illegal:null
+}),o=e.COMMENT(";","$",{relevance:0}),l={className:"literal",
+begin:/\b([Tt]rue|[Ff]alse|nil|None)\b/},c={begin:"[\\[\\{]",end:"[\\]\\}]"},d={
+className:"comment",begin:"\\^"+t},m=e.COMMENT("\\^\\{","\\}"),p={
+className:"symbol",begin:"[:]{1,2}"+t},u={begin:"\\(",end:"\\)"},f={
+endsWithParent:!0,relevance:0},g={className:"name",relevance:0,keywords:i,
+begin:t,starts:f},h=[u,s,d,m,o,p,c,n,l,r]
+;return u.contains=[e.COMMENT("comment",""),g,f],f.contains=h,c.contains=h,{
+name:"Hy",aliases:["hylang"],illegal:/\S/,
+contains:[e.SHEBANG(),u,s,d,m,o,p,c,n,l]}}})());
\ 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..9b55134bb0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/inform7.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/inform7.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return e=>({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 f59cbd4d82..a052335414 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ini.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ini.min.js
@@ -1 +1,16 @@
-hljs.registerLanguage("ini",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(...n){return n.map(n=>e(n)).join("")}return function(a){var s={className:"number",relevance:0,variants:[{begin:/([\+\-]+)?[\d]+_[\d_]+/},{begin:a.NUMBER_RE}]},i=a.COMMENT();i.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];var t={className:"variable",variants:[{begin:/\$[\w\d"][\w\d_]*/},{begin:/\$\{(.*?)}/}]},r={className:"literal",begin:/\bon|off|true|false|yes|no\b/},l={className:"string",contains:[a.BACKSLASH_ESCAPE],variants:[{begin:"'''",end:"'''",relevance:10},{begin:'"""',end:'"""',relevance:10},{begin:'"',end:'"'},{begin:"'",end:"'"}]},c={begin:/\[/,end:/\]/,contains:[i,r,t,l,s,"self"],relevance:0},g="("+[/[A-Za-z0-9_-]+/,/"(\\"|[^"])*"/,/'[^']*'/].map(n=>e(n)).join("|")+")";return{name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,contains:[i,{className:"section",begin:/\[+/,end:/\]+/},{begin:n(g,"(\\s*\\.\\s*",g,")*",n("(?=",/\s*=\s*[^#\s]/,")")),className:"attr",starts:{end:/$/,contains:[i,c,r,t,l,s]}}]}}}());
\ No newline at end of file
+hljs.registerLanguage("ini",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(...n){
+return n.map((n=>e(n))).join("")}return s=>{const a={className:"number",
+relevance:0,variants:[{begin:/([+-]+)?[\d]+_[\d_]+/},{begin:s.NUMBER_RE}]
+},i=s.COMMENT();i.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];const t={
+className:"variable",variants:[{begin:/\$[\w\d"][\w\d_]*/},{begin:/\$\{(.*?)\}/
+}]},r={className:"literal",begin:/\bon|off|true|false|yes|no\b/},l={
+className:"string",contains:[s.BACKSLASH_ESCAPE],variants:[{begin:"'''",
+end:"'''",relevance:10},{begin:'"""',end:'"""',relevance:10},{begin:'"',end:'"'
+},{begin:"'",end:"'"}]},c={begin:/\[/,end:/\]/,contains:[i,r,t,l,a,"self"],
+relevance:0
+},g="("+[/[A-Za-z0-9_-]+/,/"(\\"|[^"])*"/,/'[^']*'/].map((n=>e(n))).join("|")+")"
+;return{name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,
+contains:[i,{className:"section",begin:/\[+/,end:/\]+/},{
+begin:n(g,"(\\s*\\.\\s*",g,")*",n("(?=",/\s*=\s*[^#\s]/,")")),className:"attr",
+starts:{end:/$/,contains:[i,c,r,t,l,a]}}]}}})());
\ 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..88a7987cee 100644
--- a/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
@@ -1 +1,14 @@
-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",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>{const t=/(_[a-z_\d]+)?/,i=/([de][+-]?\d+)?/,a={
+className:"number",variants:[{begin:e(/\b\d+/,/\.(\d*)/,i,t)},{
+begin:e(/\b\d+/,i,t)},{begin:e(/\.\d+/,i,t)}],relevance:0};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:[n.inherit(n.APOS_STRING_MODE,{className:"string",
+relevance:0}),n.inherit(n.QUOTE_STRING_MODE,{className:"string",relevance:0}),{
+className:"function",beginKeywords:"subroutine function program",
+illegal:"[${=\\n]",contains:[n.UNDERSCORE_TITLE_MODE,{className:"params",
+begin:"\\(",end:"\\)"}]},n.COMMENT("!","$",{relevance:0
+}),n.COMMENT("begin_doc","end_doc",{relevance:10}),a]}}})());
\ 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 ae7a4054da..21e5186dc5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/isbl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/isbl.min.js
@@ -1 +1,24 @@
-hljs.registerLanguage("isbl",function(){"use strict";return function(S){var E="[A-Za-zА-Яа-яёЁ_!][A-Za-zА-Яа-яёЁ_0-9]*",_={className:"number",begin:S.NUMBER_RE,relevance:0},T={className:"string",variants:[{begin:'"',end:'"'},{begin:"'",end:"'"}]},R={className:"doctag",begin:"\\b(?:TODO|DONE|BEGIN|END|STUB|CHG|FIXME|NOTE|BUG|XXX)\\b",relevance:0},O={variants:[{className:"comment",begin:"//",end:"$",relevance:0,contains:[S.PHRASAL_WORDS_MODE,R]},{className:"comment",begin:"/\\*",end:"\\*/",relevance:0,contains:[S.PHRASAL_WORDS_MODE,R]}]},C={$pattern:E,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={begin:"\\.\\s*"+S.UNDERSCORE_IDENT_RE,keywords:C,relevance:0},N={className:"type",begin:":[ \\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)",end:"[ \\t]*=",excludeEnd:!0},A={className:"variable",keywords:C,begin:E,relevance:0,contains:[N,I]};return{name:"ISBL",aliases:["isbl"],case_insensitive:!0,keywords:C,illegal:"\\$|\\?|%|,|;$|~|#|@|</",contains:[{className:"function",begin:"[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]*\\(",end:"\\)$",returnBegin:!0,keywords:C,illegal:"[\\[\\]\\|\\$\\?%,~#@]",contains:[{className:"title",keywords:{$pattern:E,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Дат ФмтДат ФмтСтр ФмтЧсл Формат ЦМассивЭлемент ЦНаборДанныхРеквизит ЦПодстр "},begin:"[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]*\\(",end:"\\(",returnBegin:!0,excludeEnd:!0},I,A,T,_,O]},N,I,A,T,_,O]}}}());
\ No newline at end of file
+hljs.registerLanguage("isbl",(()=>{"use strict";return S=>{
+const E="[A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_!][A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_0-9]*",_={
+className:"number",begin:S.NUMBER_RE,relevance:0},T={className:"string",
+variants:[{begin:'"',end:'"'},{begin:"'",end:"'"}]},R={className:"doctag",
+begin:"\\b(?:TODO|DONE|BEGIN|END|STUB|CHG|FIXME|NOTE|BUG|XXX)\\b",relevance:0
+},O={variants:[{className:"comment",begin:"//",end:"$",relevance:0,
+contains:[S.PHRASAL_WORDS_MODE,R]},{className:"comment",begin:"/\\*",end:"\\*/",
+relevance:0,contains:[S.PHRASAL_WORDS_MODE,R]}]},C={$pattern:E,
+keyword:"and \u0438 else \u0438\u043d\u0430\u0447\u0435 endexcept endfinally endforeach \u043a\u043e\u043d\u0435\u0446\u0432\u0441\u0435 endif \u043a\u043e\u043d\u0435\u0446\u0435\u0441\u043b\u0438 endwhile \u043a\u043e\u043d\u0435\u0446\u043f\u043e\u043a\u0430 except exitfor finally foreach \u0432\u0441\u0435 if \u0435\u0441\u043b\u0438 in \u0432 not \u043d\u0435 or \u0438\u043b\u0438 try while \u043f\u043e\u043a\u0430 ",
+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\u0415 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 \u0412\u044b\u0437\u043e\u0432\u0421\u043f\u043e\u0441\u043e\u0431 \u0418\u043c\u044f\u041e\u0442\u0447\u0435\u0442\u0430 \u0420\u0435\u043a\u0432\u0417\u043d\u0430\u0447 ",
+literal:"null true false nil "},I={begin:"\\.\\s*"+S.UNDERSCORE_IDENT_RE,
+keywords:C,relevance:0},N={className:"type",
+begin:":[ \\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)",
+end:"[ \\t]*=",excludeEnd:!0},A={className:"variable",keywords:C,begin:E,
+relevance:0,contains:[N,I]
+},e="[A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_][A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_0-9]*\\("
+;return{name:"ISBL",aliases:["isbl"],case_insensitive:!0,keywords:C,
+illegal:"\\$|\\?|%|,|;$|~|#|@|</",contains:[{className:"function",begin:e,
+end:"\\)$",returnBegin:!0,keywords:C,illegal:"[\\[\\]\\|\\$\\?%,~#@]",
+contains:[{className:"title",keywords:{$pattern:E,
+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 \u0410\u043d\u0430\u043b\u0438\u0437 \u0411\u0430\u0437\u0430\u0414\u0430\u043d\u043d\u044b\u0445 \u0411\u043b\u043e\u043a\u0415\u0441\u0442\u044c \u0411\u043b\u043e\u043a\u0415\u0441\u0442\u044c\u0420\u0430\u0441\u0448 \u0411\u043b\u043e\u043a\u0418\u043d\u0444\u043e \u0411\u043b\u043e\u043a\u0421\u043d\u044f\u0442\u044c \u0411\u043b\u043e\u043a\u0421\u043d\u044f\u0442\u044c\u0420\u0430\u0441\u0448 \u0411\u043b\u043e\u043a\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0412\u0432\u043e\u0434 \u0412\u0432\u043e\u0434\u041c\u0435\u043d\u044e \u0412\u0435\u0434\u0421 \u0412\u0435\u0434\u0421\u043f\u0440 \u0412\u0435\u0440\u0445\u043d\u044f\u044f\u0413\u0440\u0430\u043d\u0438\u0446\u0430\u041c\u0430\u0441\u0441\u0438\u0432\u0430 \u0412\u043d\u0435\u0448\u041f\u0440\u043e\u0433\u0440 \u0412\u043e\u0441\u0441\u0442 \u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f\u041f\u0430\u043f\u043a\u0430 \u0412\u0440\u0435\u043c\u044f \u0412\u044b\u0431\u043e\u0440SQL \u0412\u044b\u0431\u0440\u0430\u0442\u044c\u0417\u0430\u043f\u0438\u0441\u044c \u0412\u044b\u0434\u0435\u043b\u0438\u0442\u044c\u0421\u0442\u0440 \u0412\u044b\u0437\u0432\u0430\u0442\u044c \u0412\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0412\u044b\u043f\u041f\u0440\u043e\u0433\u0440 \u0413\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438\u0439\u0424\u0430\u0439\u043b \u0413\u0440\u0443\u043f\u043f\u0430\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0414\u0430\u0442\u0430\u0412\u0440\u0435\u043c\u044f\u0421\u0435\u0440\u0432 \u0414\u0435\u043d\u044c\u041d\u0435\u0434\u0435\u043b\u0438 \u0414\u0438\u0430\u043b\u043e\u0433\u0414\u0430\u041d\u0435\u0442 \u0414\u043b\u0438\u043d\u0430\u0421\u0442\u0440 \u0414\u043e\u0431\u041f\u043e\u0434\u0441\u0442\u0440 \u0415\u041f\u0443\u0441\u0442\u043e \u0415\u0441\u043b\u0438\u0422\u043e \u0415\u0427\u0438\u0441\u043b\u043e \u0417\u0430\u043c\u041f\u043e\u0434\u0441\u0442\u0440 \u0417\u0430\u043f\u0438\u0441\u044c\u0421\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a\u0430 \u0417\u043d\u0430\u0447\u041f\u043e\u043b\u044f\u0421\u043f\u0440 \u0418\u0414\u0422\u0438\u043f\u0421\u043f\u0440 \u0418\u0437\u0432\u043b\u0435\u0447\u044c\u0414\u0438\u0441\u043a \u0418\u0437\u0432\u043b\u0435\u0447\u044c\u0418\u043c\u044f\u0424\u0430\u0439\u043b\u0430 \u0418\u0437\u0432\u043b\u0435\u0447\u044c\u041f\u0443\u0442\u044c \u0418\u0437\u0432\u043b\u0435\u0447\u044c\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435 \u0418\u0437\u043c\u0414\u0430\u0442 \u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c\u0420\u0430\u0437\u043c\u0435\u0440\u041c\u0430\u0441\u0441\u0438\u0432\u0430 \u0418\u0437\u043c\u0435\u0440\u0435\u043d\u0438\u0439\u041c\u0430\u0441\u0441\u0438\u0432\u0430 \u0418\u043c\u044f\u041e\u0440\u0433 \u0418\u043c\u044f\u041f\u043e\u043b\u044f\u0421\u043f\u0440 \u0418\u043d\u0434\u0435\u043a\u0441 \u0418\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440\u0417\u0430\u043a\u0440\u044b\u0442\u044c \u0418\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0418\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440\u0428\u0430\u0433 \u0418\u043d\u0442\u0435\u0440\u0430\u043a\u0442\u0438\u0432\u043d\u044b\u0439\u0420\u0435\u0436\u0438\u043c \u0418\u0442\u043e\u0433\u0422\u0431\u043b\u0421\u043f\u0440 \u041a\u043e\u0434\u0412\u0438\u0434\u0412\u0435\u0434\u0421\u043f\u0440 \u041a\u043e\u0434\u0412\u0438\u0434\u0421\u043f\u0440\u041f\u043e\u0418\u0414 \u041a\u043e\u0434\u041f\u043eAnalit \u041a\u043e\u0434\u0421\u0438\u043c\u0432\u043e\u043b\u0430 \u041a\u043e\u0434\u0421\u043f\u0440 \u041a\u043e\u043b\u041f\u043e\u0434\u0441\u0442\u0440 \u041a\u043e\u043b\u041f\u0440\u043e\u043f \u041a\u043e\u043d\u041c\u0435\u0441 \u041a\u043e\u043d\u0441\u0442 \u041a\u043e\u043d\u0441\u0442\u0415\u0441\u0442\u044c \u041a\u043e\u043d\u0441\u0442\u0417\u043d\u0430\u0447 \u041a\u043e\u043d\u0422\u0440\u0430\u043d \u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0424\u0430\u0439\u043b \u041a\u043e\u043f\u0438\u044f\u0421\u0442\u0440 \u041a\u041f\u0435\u0440\u0438\u043e\u0434 \u041a\u0421\u0442\u0440\u0422\u0431\u043b\u0421\u043f\u0440 \u041c\u0430\u043a\u0441 \u041c\u0430\u043a\u0441\u0421\u0442\u0440\u0422\u0431\u043b\u0421\u043f\u0440 \u041c\u0430\u0441\u0441\u0438\u0432 \u041c\u0435\u043d\u044e \u041c\u0435\u043d\u044e\u0420\u0430\u0441\u0448 \u041c\u0438\u043d \u041d\u0430\u0431\u043e\u0440\u0414\u0430\u043d\u043d\u044b\u0445\u041d\u0430\u0439\u0442\u0438\u0420\u0430\u0441\u0448 \u041d\u0430\u0438\u043c\u0412\u0438\u0434\u0421\u043f\u0440 \u041d\u0430\u0438\u043c\u041f\u043eAnalit \u041d\u0430\u0438\u043c\u0421\u043f\u0440 \u041d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c\u041f\u0435\u0440\u0435\u0432\u043e\u0434\u044b\u0421\u0442\u0440\u043e\u043a \u041d\u0430\u0447\u041c\u0435\u0441 \u041d\u0430\u0447\u0422\u0440\u0430\u043d \u041d\u0438\u0436\u043d\u044f\u044f\u0413\u0440\u0430\u043d\u0438\u0446\u0430\u041c\u0430\u0441\u0441\u0438\u0432\u0430 \u041d\u043e\u043c\u0435\u0440\u0421\u043f\u0440 \u041d\u041f\u0435\u0440\u0438\u043e\u0434 \u041e\u043a\u043d\u043e \u041e\u043a\u0440 \u041e\u043a\u0440\u0443\u0436\u0435\u043d\u0438\u0435 \u041e\u0442\u043b\u0418\u043d\u0444\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u041e\u0442\u043b\u0418\u043d\u0444\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u041e\u0442\u0447\u0435\u0442 \u041e\u0442\u0447\u0435\u0442\u0410\u043d\u0430\u043b \u041e\u0442\u0447\u0435\u0442\u0418\u043d\u0442 \u041f\u0430\u043f\u043a\u0430\u0421\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u041f\u0430\u0443\u0437\u0430 \u041f\u0412\u044b\u0431\u043e\u0440SQL \u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c\u0424\u0430\u0439\u043b \u041f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u044b\u0435 \u041f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u044c\u0424\u0430\u0439\u043b \u041f\u043e\u0434\u0441\u0442\u0440 \u041f\u043e\u0438\u0441\u043a\u041f\u043e\u0434\u0441\u0442\u0440 \u041f\u043e\u0438\u0441\u043a\u0421\u0442\u0440 \u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0418\u0414\u0422\u0430\u0431\u043b\u0438\u0446\u044b \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0418\u0414 \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0418\u043c\u044f \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0421\u0442\u0430\u0442\u0443\u0441 \u041f\u0440\u0435\u0440\u0432\u0430\u0442\u044c \u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 \u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0417\u043d\u0430\u0447 \u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c\u0423\u0441\u043b\u043e\u0432\u0438\u0435 \u0420\u0430\u0437\u0431\u0421\u0442\u0440 \u0420\u0430\u0437\u043d\u0412\u0440\u0435\u043c\u044f \u0420\u0430\u0437\u043d\u0414\u0430\u0442 \u0420\u0430\u0437\u043d\u0414\u0430\u0442\u0430\u0412\u0440\u0435\u043c\u044f \u0420\u0430\u0437\u043d\u0420\u0430\u0431\u0412\u0440\u0435\u043c\u044f \u0420\u0435\u0433\u0423\u0441\u0442\u0412\u0440\u0435\u043c \u0420\u0435\u0433\u0423\u0441\u0442\u0414\u0430\u0442 \u0420\u0435\u0433\u0423\u0441\u0442\u0427\u0441\u043b \u0420\u0435\u0434\u0422\u0435\u043a\u0441\u0442 \u0420\u0435\u0435\u0441\u0442\u0440\u0417\u0430\u043f\u0438\u0441\u044c \u0420\u0435\u0435\u0441\u0442\u0440\u0421\u043f\u0438\u0441\u043e\u043a\u0418\u043c\u0435\u043d\u041f\u0430\u0440\u0430\u043c \u0420\u0435\u0435\u0441\u0442\u0440\u0427\u0442\u0435\u043d\u0438\u0435 \u0420\u0435\u043a\u0432\u0421\u043f\u0440 \u0420\u0435\u043a\u0432\u0421\u043f\u0440\u041f\u0440 \u0421\u0435\u0433\u043e\u0434\u043d\u044f \u0421\u0435\u0439\u0447\u0430\u0441 \u0421\u0435\u0440\u0432\u0435\u0440 \u0421\u0435\u0440\u0432\u0435\u0440\u041f\u0440\u043e\u0446\u0435\u0441\u0441\u0418\u0414 \u0421\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0424\u0430\u0439\u043b\u0421\u0447\u0438\u0442\u0430\u0442\u044c \u0421\u0436\u041f\u0440\u043e\u0431 \u0421\u0438\u043c\u0432\u043e\u043b \u0421\u0438\u0441\u0442\u0435\u043c\u0430\u0414\u0438\u0440\u0435\u043a\u0442\u0443\u043c\u041a\u043e\u0434 \u0421\u0438\u0441\u0442\u0435\u043c\u0430\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u0421\u0438\u0441\u0442\u0435\u043c\u0430\u041a\u043e\u0434 \u0421\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435\u0417\u0430\u043a\u0440\u044b\u0442\u044c \u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0414\u0438\u0430\u043b\u043e\u0433 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0414\u0438\u0430\u043b\u043e\u0433\u0412\u044b\u0431\u043e\u0440\u0430\u0418\u0437\u0414\u0432\u0443\u0445\u0421\u043f\u0438\u0441\u043a\u043e\u0432 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0414\u0438\u0430\u043b\u043e\u0433\u0412\u044b\u0431\u043e\u0440\u0430\u041f\u0430\u043f\u043a\u0438 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0414\u0438\u0430\u043b\u043e\u0433\u041e\u0442\u043a\u0440\u044b\u0442\u0438\u044f\u0424\u0430\u0439\u043b\u0430 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0414\u0438\u0430\u043b\u043e\u0433\u0421\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f\u0424\u0430\u0439\u043b\u0430 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0417\u0430\u043f\u0440\u043e\u0441 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0418\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0418\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u041a\u044d\u0448\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439\u0421\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u041c\u0430\u0441\u0441\u0438\u0432 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u041d\u0430\u0431\u043e\u0440\u0414\u0430\u043d\u043d\u044b\u0445 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u041e\u0431\u044a\u0435\u043a\u0442 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u041e\u0442\u0447\u0435\u0442 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u041f\u0430\u043f\u043a\u0443 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0421\u043f\u0438\u0441\u043e\u043a \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0421\u043f\u0438\u0441\u043e\u043a\u0421\u0442\u0440\u043e\u043a \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0421\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0421\u0446\u0435\u043d\u0430\u0440\u0438\u0439 \u0421\u043e\u0437\u0434\u0421\u043f\u0440 \u0421\u043e\u0441\u0442\u0421\u043f\u0440 \u0421\u043e\u0445\u0440 \u0421\u043e\u0445\u0440\u0421\u043f\u0440 \u0421\u043f\u0438\u0441\u043e\u043a\u0421\u0438\u0441\u0442\u0435\u043c \u0421\u043f\u0440 \u0421\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a \u0421\u043f\u0440\u0411\u043b\u043e\u043a\u0415\u0441\u0442\u044c \u0421\u043f\u0440\u0411\u043b\u043e\u043a\u0421\u043d\u044f\u0442\u044c \u0421\u043f\u0440\u0411\u043b\u043e\u043a\u0421\u043d\u044f\u0442\u044c\u0420\u0430\u0441\u0448 \u0421\u043f\u0440\u0411\u043b\u043e\u043a\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0421\u043f\u0440\u0418\u0437\u043c\u041d\u0430\u0431\u0414\u0430\u043d \u0421\u043f\u0440\u041a\u043e\u0434 \u0421\u043f\u0440\u041d\u043e\u043c\u0435\u0440 \u0421\u043f\u0440\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0421\u043f\u0440\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0421\u043f\u0440\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0421\u043f\u0440\u041f\u0430\u0440\u0430\u043c \u0421\u043f\u0440\u041f\u043e\u043b\u0435\u0417\u043d\u0430\u0447 \u0421\u043f\u0440\u041f\u043e\u043b\u0435\u0418\u043c\u044f \u0421\u043f\u0440\u0420\u0435\u043a\u0432 \u0421\u043f\u0440\u0420\u0435\u043a\u0432\u0412\u0432\u0435\u0434\u0417\u043d \u0421\u043f\u0440\u0420\u0435\u043a\u0432\u041d\u043e\u0432\u044b\u0435 \u0421\u043f\u0440\u0420\u0435\u043a\u0432\u041f\u0440 \u0421\u043f\u0440\u0420\u0435\u043a\u0432\u041f\u0440\u0435\u0434\u0417\u043d \u0421\u043f\u0440\u0420\u0435\u043a\u0432\u0420\u0435\u0436\u0438\u043c \u0421\u043f\u0440\u0420\u0435\u043a\u0432\u0422\u0438\u043f\u0422\u0435\u043a\u0441\u0442 \u0421\u043f\u0440\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0421\u043f\u0440\u0421\u043e\u0441\u0442 \u0421\u043f\u0440\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0421\u043f\u0440\u0422\u0431\u043b\u0418\u0442\u043e\u0433 \u0421\u043f\u0440\u0422\u0431\u043b\u0421\u0442\u0440 \u0421\u043f\u0440\u0422\u0431\u043b\u0421\u0442\u0440\u041a\u043e\u043b \u0421\u043f\u0440\u0422\u0431\u043b\u0421\u0442\u0440\u041c\u0430\u043a\u0441 \u0421\u043f\u0440\u0422\u0431\u043b\u0421\u0442\u0440\u041c\u0438\u043d \u0421\u043f\u0440\u0422\u0431\u043b\u0421\u0442\u0440\u041f\u0440\u0435\u0434 \u0421\u043f\u0440\u0422\u0431\u043b\u0421\u0442\u0440\u0421\u043b\u0435\u0434 \u0421\u043f\u0440\u0422\u0431\u043b\u0421\u0442\u0440\u0421\u043e\u0437\u0434 \u0421\u043f\u0440\u0422\u0431\u043b\u0421\u0442\u0440\u0423\u0434 \u0421\u043f\u0440\u0422\u0435\u043a\u041f\u0440\u0435\u0434\u0441\u0442 \u0421\u043f\u0440\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0421\u0440\u0430\u0432\u043d\u0438\u0442\u044c\u0421\u0442\u0440 \u0421\u0442\u0440\u0412\u0435\u0440\u0445\u0420\u0435\u0433\u0438\u0441\u0442\u0440 \u0421\u0442\u0440\u041d\u0438\u0436\u043d\u0420\u0435\u0433\u0438\u0441\u0442\u0440 \u0421\u0442\u0440\u0422\u0431\u043b\u0421\u043f\u0440 \u0421\u0443\u043c\u041f\u0440\u043e\u043f \u0421\u0446\u0435\u043d\u0430\u0440\u0438\u0439 \u0421\u0446\u0435\u043d\u0430\u0440\u0438\u0439\u041f\u0430\u0440\u0430\u043c \u0422\u0435\u043a\u0412\u0435\u0440\u0441\u0438\u044f \u0422\u0435\u043a\u041e\u0440\u0433 \u0422\u043e\u0447\u043d \u0422\u0440\u0430\u043d \u0422\u0440\u0430\u043d\u0441\u043b\u0438\u0442\u0435\u0440\u0430\u0446\u0438\u044f \u0423\u0434\u0430\u043b\u0438\u0442\u044c\u0422\u0430\u0431\u043b\u0438\u0446\u0443 \u0423\u0434\u0430\u043b\u0438\u0442\u044c\u0424\u0430\u0439\u043b \u0423\u0434\u0421\u043f\u0440 \u0423\u0434\u0421\u0442\u0440\u0422\u0431\u043b\u0421\u043f\u0440 \u0423\u0441\u0442 \u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438\u041a\u043e\u043d\u0441\u0442\u0430\u043d\u0442 \u0424\u0430\u0439\u043b\u0410\u0442\u0440\u0438\u0431\u0443\u0442\u0421\u0447\u0438\u0442\u0430\u0442\u044c \u0424\u0430\u0439\u043b\u0410\u0442\u0440\u0438\u0431\u0443\u0442\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0424\u0430\u0439\u043b\u0412\u0440\u0435\u043c\u044f \u0424\u0430\u0439\u043b\u0412\u0440\u0435\u043c\u044f\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0424\u0430\u0439\u043b\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0424\u0430\u0439\u043b\u0417\u0430\u043d\u044f\u0442 \u0424\u0430\u0439\u043b\u0417\u0430\u043f\u0438\u0441\u0430\u0442\u044c \u0424\u0430\u0439\u043b\u0418\u0441\u043a\u0430\u0442\u044c \u0424\u0430\u0439\u043b\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0424\u0430\u0439\u043b\u041c\u043e\u0436\u043d\u043e\u0427\u0438\u0442\u0430\u0442\u044c \u0424\u0430\u0439\u043b\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0424\u0430\u0439\u043b\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c \u0424\u0430\u0439\u043b\u041f\u0435\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0424\u0430\u0439\u043b\u041f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u044c \u0424\u0430\u0439\u043b\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0424\u0430\u0439\u043b\u0420\u0430\u0437\u043c\u0435\u0440 \u0424\u0430\u0439\u043b\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0424\u0430\u0439\u043b\u0421\u0441\u044b\u043b\u043a\u0430\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0424\u0430\u0439\u043b\u0421\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u0424\u0430\u0439\u043b\u0421\u0447\u0438\u0442\u0430\u0442\u044c \u0424\u0430\u0439\u043b\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0424\u043c\u0442SQL\u0414\u0430\u0442 \u0424\u043c\u0442\u0414\u0430\u0442 \u0424\u043c\u0442\u0421\u0442\u0440 \u0424\u043c\u0442\u0427\u0441\u043b \u0424\u043e\u0440\u043c\u0430\u0442 \u0426\u041c\u0430\u0441\u0441\u0438\u0432\u042d\u043b\u0435\u043c\u0435\u043d\u0442 \u0426\u041d\u0430\u0431\u043e\u0440\u0414\u0430\u043d\u043d\u044b\u0445\u0420\u0435\u043a\u0432\u0438\u0437\u0438\u0442 \u0426\u041f\u043e\u0434\u0441\u0442\u0440 "
+},begin:e,end:"\\(",returnBegin:!0,excludeEnd:!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 a73b55f66f..9d612a2159 100644
--- a/vendor/assets/javascripts/highlightjs/languages/java.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/java.min.js
@@ -1 +1,35 @@
-hljs.registerLanguage("java",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(e){return a("(",e,")?")}function a(...n){return n.map(n=>e(n)).join("")}function s(...n){return"("+n.map(n=>e(n)).join("|")+")"}return function(e){var 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",i={className:"meta",begin:"@[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*",contains:[{begin:/\(/,end:/\)/,contains:["self"]}]},t=e=>a("[",e,"]+([",e,"_]*[",e,"]+)?"),c={className:"number",variants:[{begin:`\\b(0[bB]${t("01")})[lL]?`},{begin:`\\b(0${t("0-7")})[dDfFlL]?`},{begin:a(/\b0[xX]/,s(a(t("a-fA-F0-9"),/\./,t("a-fA-F0-9")),a(t("a-fA-F0-9"),/\.?/),a(/\./,t("a-fA-F0-9"))),/([pP][+-]?(\d+))?/,/[fFdDlL]?/)},{begin:a(/\b/,s(a(/\d*\./,t("\\d")),t("\\d")),/[eE][+-]?[\d]+[dDfF]?/)},{begin:a(/\b/,t(/\d/),n(/\.?/),n(t(/\d/)),/[dDfFlL]?/)}],relevance:0};return{name:"Java",aliases:["jsp"],keywords:r,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 enum",end:/[{;=]/,excludeEnd:!0,keywords:"class interface enum",illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"new throw return else",relevance:0},{className:"class",begin:"record\\s+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,excludeEnd:!0,end:/[{;=]/,keywords:r,contains:[{beginKeywords:"record"},{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,keywords:r,relevance:0,contains:[e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{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:r,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,keywords:r,relevance:0,contains:[i,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]},c,i]}}}());
\ No newline at end of file
+hljs.registerLanguage("java",(()=>{"use strict"
+;var e="\\.([0-9](_*[0-9])*)",n="[0-9a-fA-F](_*[0-9a-fA-F])*",a={
+className:"number",variants:[{
+begin:`(\\b([0-9](_*[0-9])*)((${e})|\\.)?|(${e}))[eE][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
+},{begin:`\\b([0-9](_*[0-9])*)((${e})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{
+begin:`(${e})[fFdD]?\\b`},{begin:"\\b([0-9](_*[0-9])*)[fFdD]\\b"},{
+begin:`\\b0[xX]((${n})\\.?|(${n})?\\.(${n}))[pP][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
+},{begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${n})[lL]?\\b`},{
+begin:"\\b0(_*[0-7])*[lL]?\\b"},{begin:"\\b0[bB][01](_*[01])*[lL]?\\b"}],
+relevance:0};return e=>{
+var n="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={
+className:"meta",begin:"@[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*",
+contains:[{begin:/\(/,end:/\)/,contains:["self"]}]};const r=a;return{
+name:"Java",aliases:["jsp"],keywords:n,illegal:/<\/|#/,
+contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,
+relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]}),{
+begin:/import java\.[a-z]+\./,keywords:"import",relevance:2
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{
+className:"class",beginKeywords:"class interface enum",end:/[{;=]/,
+excludeEnd:!0,relevance:1,keywords:"class interface enum",illegal:/[:"\[\]]/,
+contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{
+beginKeywords:"new throw return else",relevance:0},{className:"class",
+begin:"record\\s+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,excludeEnd:!0,
+end:/[{;=]/,keywords:n,contains:[{beginKeywords:"record"},{
+begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,
+contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,
+keywords:n,relevance:0,contains:[e.C_BLOCK_COMMENT_MODE]
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"function",
+begin:"([\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*(<[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*(\\s*,\\s*[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*)*>)?\\s+)+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(",
+returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:n,contains:[{
+begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,
+contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,
+keywords:n,relevance:0,
+contains:[s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,r,e.C_BLOCK_COMMENT_MODE]
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},r,s]}}})());
\ 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 5303271c57..767b474f73 100644
--- a/vendor/assets/javascripts/highlightjs/languages/javascript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/javascript.min.js
@@ -1 +1,61 @@
-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",(()=>{"use strict"
+;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["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"],a=["true","false","null","undefined","NaN","Infinity"],s=[].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 r(e){return t("(?=",e,")")}function t(...e){return e.map((e=>{
+return(n=e)?"string"==typeof n?n:n.source:null;var n})).join("")}return i=>{
+const c=e,o={begin:/<[A-Za-z0-9\\._:-]+/,end:/\/[A-Za-z0-9\\._:-]+>|\/>/,
+isTrulyOpeningTag:(e,n)=>{const a=e[0].length+e.index,s=e.input[a]
+;"<"!==s?">"===s&&(((e,{after:n})=>{const a="</"+e[0].slice(1)
+;return-1!==e.input.indexOf(a,n)})(e,{after:a
+})||n.ignoreMatch()):n.ignoreMatch()}},l={$pattern:e,keyword:n,literal:a,
+built_in:s},b="\\.([0-9](_?[0-9])*)",g="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",d={
+className:"number",variants:[{
+begin:`(\\b(${g})((${b})|\\.)?|(${b}))[eE][+-]?([0-9](_?[0-9])*)\\b`},{
+begin:`\\b(${g})\\b((${b})\\b|\\.)?|(${b})\\b`},{
+begin:"\\b(0|[1-9](_?[0-9])*)n\\b"},{
+begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b"},{
+begin:"\\b0[bB][0-1](_?[0-1])*n?\\b"},{begin:"\\b0[oO][0-7](_?[0-7])*n?\\b"},{
+begin:"\\b0[0-7]+n?\\b"}],relevance:0},E={className:"subst",begin:"\\$\\{",
+end:"\\}",keywords:l,contains:[]},u={begin:"html`",end:"",starts:{end:"`",
+returnEnd:!1,contains:[i.BACKSLASH_ESCAPE,E],subLanguage:"xml"}},_={
+begin:"css`",end:"",starts:{end:"`",returnEnd:!1,
+contains:[i.BACKSLASH_ESCAPE,E],subLanguage:"css"}},m={className:"string",
+begin:"`",end:"`",contains:[i.BACKSLASH_ESCAPE,E]},N={className:"comment",
+variants:[i.COMMENT(/\/\*\*(?!\/)/,"\\*/",{relevance:0,contains:[{
+className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type",begin:"\\{",
+end:"\\}",relevance:0},{className:"variable",begin:c+"(?=\\s*(-)|$)",
+endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]
+}),i.C_BLOCK_COMMENT_MODE,i.C_LINE_COMMENT_MODE]
+},y=[i.APOS_STRING_MODE,i.QUOTE_STRING_MODE,u,_,m,d,i.REGEXP_MODE]
+;E.contains=y.concat({begin:/\{/,end:/\}/,keywords:l,contains:["self"].concat(y)
+});const f=[].concat(N,E.contains),A=f.concat([{begin:/\(/,end:/\)/,keywords:l,
+contains:["self"].concat(f)}]),p={className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:l,contains:A};return{name:"Javascript",
+aliases:["js","jsx","mjs","cjs"],keywords:l,exports:{PARAMS_CONTAINS:A},
+illegal:/#(?![$_A-z])/,contains:[i.SHEBANG({label:"shebang",binary:"node",
+relevance:5}),{label:"use_strict",className:"meta",relevance:10,
+begin:/^\s*['"]use (strict|asm)['"]/
+},i.APOS_STRING_MODE,i.QUOTE_STRING_MODE,u,_,m,N,d,{
+begin:t(/[{,\n]\s*/,r(t(/(((\/\/.*$)|(\/\*(\*[^/]|[^*])*\*\/))\s*)*/,c+"\\s*:"))),
+relevance:0,contains:[{className:"attr",begin:c+r("\\s*:"),relevance:0}]},{
+begin:"("+i.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
+keywords:"return throw case",contains:[N,i.REGEXP_MODE,{className:"function",
+begin:"(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+i.UNDERSCORE_IDENT_RE+")\\s*=>",
+returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{
+begin:i.UNDERSCORE_IDENT_RE,relevance:0},{className:null,begin:/\(\s*\)/,skip:!0
+},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:l,contains:A}]}]
+},{begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{
+variants:[{begin:"<>",end:"</>"},{begin:o.begin,"on:begin":o.isTrulyOpeningTag,
+end:o.end}],subLanguage:"xml",contains:[{begin:o.begin,end:o.end,skip:!0,
+contains:["self"]}]}],relevance:0},{className:"function",
+beginKeywords:"function",end:/[{;]/,excludeEnd:!0,keywords:l,
+contains:["self",i.inherit(i.TITLE_MODE,{begin:c}),p],illegal:/%/},{
+beginKeywords:"while if switch catch for"},{className:"function",
+begin:i.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{",
+returnBegin:!0,contains:[p,i.inherit(i.TITLE_MODE,{begin:c})]},{variants:[{
+begin:"\\."+c},{begin:"\\$"+c}],relevance:0},{className:"class",
+beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"[\]]/,contains:[{
+beginKeywords:"extends"},i.UNDERSCORE_TITLE_MODE]},{begin:/\b(?=constructor)/,
+end:/[{;]/,excludeEnd:!0,contains:[i.inherit(i.TITLE_MODE,{begin:c}),"self",p]
+},{begin:"(get|set)\\s+(?="+c+"\\()",end:/\{/,keywords:"get set",
+contains:[i.inherit(i.TITLE_MODE,{begin:c}),{begin:/\(\)/},p]},{begin:/\$[(.]/}]
+}}})());
\ 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..ea06f3bd52 100644
--- a/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return e=>({
+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 4a4f63c40f..7b977164d2 100644
--- a/vendor/assets/javascripts/highlightjs/languages/json.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/json.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return n=>{const e={
+literal:"true false null"
+},i=[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE],a=[n.QUOTE_STRING_MODE,n.C_NUMBER_MODE],l={
+end:",",endsWithParent:!0,excludeEnd:!0,contains:a,keywords:e},t={begin:/\{/,
+end:/\}/,contains:[{className:"attr",begin:/"/,end:/"/,
+contains:[n.BACKSLASH_ESCAPE],illegal:"\\n"},n.inherit(l,{begin:/:/
+})].concat(i),illegal:"\\S"},s={begin:"\\[",end:"\\]",contains:[n.inherit(l)],
+illegal:"\\S"};return a.push(t,s),i.forEach((n=>{a.push(n)})),{name:"JSON",
+contains:a,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 02cd223a50..a59835d620 100644
--- a/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
@@ -1 +1,3 @@
-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",(()=>{"use strict";return a=>({
+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 0df157736b..ba9f173b66 100644
--- a/vendor/assets/javascripts/highlightjs/languages/julia.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/julia.min.js
@@ -1 +1,17 @@
-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",(()=>{"use strict";return e=>{
+var r="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",t={$pattern:r,
+keyword:["baremodule","begin","break","catch","ccall","const","continue","do","else","elseif","end","export","false","finally","for","function","global","if","import","in","isa","let","local","macro","module","quote","return","true","try","using","where","while"],
+literal:["ARGS","C_NULL","DEPOT_PATH","ENDIAN_BOM","ENV","Inf","Inf16","Inf32","Inf64","InsertionSort","LOAD_PATH","MergeSort","NaN","NaN16","NaN32","NaN64","PROGRAM_FILE","QuickSort","RoundDown","RoundFromZero","RoundNearest","RoundNearestTiesAway","RoundNearestTiesUp","RoundToZero","RoundUp","VERSION|0","devnull","false","im","missing","nothing","pi","stderr","stdin","stdout","true","undef","\u03c0","\u212f"],
+built_in:["AbstractArray","AbstractChannel","AbstractChar","AbstractDict","AbstractDisplay","AbstractFloat","AbstractIrrational","AbstractMatrix","AbstractRange","AbstractSet","AbstractString","AbstractUnitRange","AbstractVecOrMat","AbstractVector","Any","ArgumentError","Array","AssertionError","BigFloat","BigInt","BitArray","BitMatrix","BitSet","BitVector","Bool","BoundsError","CapturedException","CartesianIndex","CartesianIndices","Cchar","Cdouble","Cfloat","Channel","Char","Cint","Cintmax_t","Clong","Clonglong","Cmd","Colon","Complex","ComplexF16","ComplexF32","ComplexF64","CompositeException","Condition","Cptrdiff_t","Cshort","Csize_t","Cssize_t","Cstring","Cuchar","Cuint","Cuintmax_t","Culong","Culonglong","Cushort","Cvoid","Cwchar_t","Cwstring","DataType","DenseArray","DenseMatrix","DenseVecOrMat","DenseVector","Dict","DimensionMismatch","Dims","DivideError","DomainError","EOFError","Enum","ErrorException","Exception","ExponentialBackOff","Expr","Float16","Float32","Float64","Function","GlobalRef","HTML","IO","IOBuffer","IOContext","IOStream","IdDict","IndexCartesian","IndexLinear","IndexStyle","InexactError","InitError","Int","Int128","Int16","Int32","Int64","Int8","Integer","InterruptException","InvalidStateException","Irrational","KeyError","LinRange","LineNumberNode","LinearIndices","LoadError","MIME","Matrix","Method","MethodError","Missing","MissingException","Module","NTuple","NamedTuple","Nothing","Number","OrdinalRange","OutOfMemoryError","OverflowError","Pair","PartialQuickSort","PermutedDimsArray","Pipe","ProcessFailedException","Ptr","QuoteNode","Rational","RawFD","ReadOnlyMemoryError","Real","ReentrantLock","Ref","Regex","RegexMatch","RoundingMode","SegmentationFault","Set","Signed","Some","StackOverflowError","StepRange","StepRangeLen","StridedArray","StridedMatrix","StridedVecOrMat","StridedVector","String","StringIndexError","SubArray","SubString","SubstitutionString","Symbol","SystemError","Task","TaskFailedException","Text","TextDisplay","Timer","Tuple","Type","TypeError","TypeVar","UInt","UInt128","UInt16","UInt32","UInt64","UInt8","UndefInitializer","UndefKeywordError","UndefRefError","UndefVarError","Union","UnionAll","UnitRange","Unsigned","Val","Vararg","VecElement","VecOrMat","Vector","VersionNumber","WeakKeyDict","WeakRef"]
+},n={keywords:t,illegal:/<\//},a={className:"subst",begin:/\$\(/,end:/\)/,
+keywords:t},i={className:"variable",begin:"\\$"+r},o={className:"string",
+contains:[e.BACKSLASH_ESCAPE,a,i],variants:[{begin:/\w*"""/,end:/"""\w*/,
+relevance:10},{begin:/\w*"/,end:/"\w*/}]},s={className:"string",
+contains:[e.BACKSLASH_ESCAPE,a,i],begin:"`",end:"`"},l={className:"meta",
+begin:"@"+r};return n.name="Julia",n.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]+)'/},o,s,l,{
+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:/<:/
+}],a.contains=n.contains,n}})());
\ 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 7fdff47e4b..71ee87452f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
@@ -1 +1,44 @@
-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",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",(()=>{"use strict"
+;var e="\\.([0-9](_*[0-9])*)",n="[0-9a-fA-F](_*[0-9a-fA-F])*",a={
+className:"number",variants:[{
+begin:`(\\b([0-9](_*[0-9])*)((${e})|\\.)?|(${e}))[eE][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
+},{begin:`\\b([0-9](_*[0-9])*)((${e})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{
+begin:`(${e})[fFdD]?\\b`},{begin:"\\b([0-9](_*[0-9])*)[fFdD]\\b"},{
+begin:`\\b0[xX]((${n})\\.?|(${n})?\\.(${n}))[pP][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
+},{begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${n})[lL]?\\b`},{
+begin:"\\b0(_*[0-7])*[lL]?\\b"},{begin:"\\b0[bB][01](_*[01])*[lL]?\\b"}],
+relevance:0};return e=>{const 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",
+built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",
+literal:"true false null"},i={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"
+},s={className:"subst",begin:/\$\{/,end:/\}/,contains:[e.C_NUMBER_MODE]},t={
+className:"variable",begin:"\\$"+e.UNDERSCORE_IDENT_RE},r={className:"string",
+variants:[{begin:'"""',end:'"""(?=[^"])',contains:[t,s]},{begin:"'",end:"'",
+illegal:/\n/,contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"',illegal:/\n/,
+contains:[e.BACKSLASH_ESCAPE,t,s]}]};s.contains.push(r);const l={
+className:"meta",
+begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"
+},c={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/,
+end:/\)/,contains:[e.inherit(r,{className:"meta-string"})]}]
+},o=a,b=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),E={
+variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,
+contains:[]}]},d=E;return d.variants[1].contains=[E],E.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,b,{className:"keyword",
+begin:/\b(break|continue|return|this)\b/,starts:{contains:[{className:"symbol",
+begin:/@\w+/}]}},i,l,c,{className:"function",beginKeywords:"fun",end:"[(]|$",
+returnBegin:!0,excludeEnd:!0,keywords:n,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:[E,e.C_LINE_COMMENT_MODE,b],relevance:0
+},e.C_LINE_COMMENT_MODE,b,l,c,r,e.C_NUMBER_MODE]},b]},{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},l,c]},r,{className:"meta",begin:"^#!/usr/bin/env",
+end:"$",illegal:"\n"},o]}}})());
\ 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..8cfb11618a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lasso.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lasso.min.js
@@ -1 +1,27 @@
-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",(()=>{"use strict";return e=>{
+const a="<\\?(lasso(script)?|=)",n="\\]|\\?>",r={
+$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"
+},t=e.COMMENT("\x3c!--","--\x3e",{relevance:0}),s={className:"meta",
+begin:"\\[noprocess\\]",starts:{end:"\\[/noprocess\\]",returnEnd:!0,contains:[t]
+}},i={className:"meta",begin:"\\[/noprocess|"+a
+},l=[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:r,contains:[{
+className:"meta",begin:n,relevance:0,starts:{end:"\\[|"+a,returnEnd:!0,
+relevance:0,contains:[t]}},s,i,{className:"meta",begin:"\\[no_square_brackets",
+starts:{end:"\\[/no_square_brackets\\]",keywords:r,contains:[{className:"meta",
+begin:n,relevance:0,starts:{end:"\\[noprocess\\]|"+a,returnEnd:!0,contains:[t]}
+},s,i].concat(l)}},{className:"meta",begin:"\\[",relevance:0},{className:"meta",
+begin:"^#!",end:"lasso9$",relevance:10}].concat(l)}}})());
\ 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
index aa36ad2b37..d69c700492 100644
--- a/vendor/assets/javascripts/highlightjs/languages/latex.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/latex.min.js
@@ -1 +1,33 @@
-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
+hljs.registerLanguage("latex",(()=>{"use strict";return e=>{const n=[{
+begin:/\^{6}[0-9a-f]{6}/},{begin:/\^{5}[0-9a-f]{5}/},{begin:/\^{4}[0-9a-f]{4}/
+},{begin:/\^{3}[0-9a-f]{3}/},{begin:/\^{2}[0-9a-f]{2}/},{
+begin:/\^{2}[\u0000-\u007f]/}],a=[{className:"keyword",begin:/\\/,relevance:0,
+contains:[{endsParent:!0,begin:((...e)=>"("+e.map((e=>{
+return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("|")+")")(...["(?:NeedsTeXFormat|RequirePackage|GetIdInfo)","Provides(?:Expl)?(?:Package|Class|File)","(?:DeclareOption|ProcessOptions)","(?:documentclass|usepackage|input|include)","makeat(?:letter|other)","ExplSyntax(?:On|Off)","(?:new|renew|provide)?command","(?:re)newenvironment","(?:New|Renew|Provide|Declare)(?:Expandable)?DocumentCommand","(?:New|Renew|Provide|Declare)DocumentEnvironment","(?:(?:e|g|x)?def|let)","(?:begin|end)","(?:part|chapter|(?:sub){0,2}section|(?:sub)?paragraph)","caption","(?:label|(?:eq|page|name)?ref|(?:paren|foot|super)?cite)","(?:alpha|beta|[Gg]amma|[Dd]elta|(?:var)?epsilon|zeta|eta|[Tt]heta|vartheta)","(?:iota|(?:var)?kappa|[Ll]ambda|mu|nu|[Xx]i|[Pp]i|varpi|(?:var)rho)","(?:[Ss]igma|varsigma|tau|[Uu]psilon|[Pp]hi|varphi|chi|[Pp]si|[Oo]mega)","(?:frac|sum|prod|lim|infty|times|sqrt|leq|geq|left|right|middle|[bB]igg?)","(?:[lr]angle|q?quad|[lcvdi]?dots|d?dot|hat|tilde|bar)"].map((e=>e+"(?![a-zA-Z@:_])")))
+},{endsParent:!0,
+begin:RegExp(["(?:__)?[a-zA-Z]{2,}_[a-zA-Z](?:_?[a-zA-Z])+:[a-zA-Z]*","[lgc]__?[a-zA-Z](?:_?[a-zA-Z])*_[a-zA-Z]{2,}","[qs]__?[a-zA-Z](?:_?[a-zA-Z])+","use(?:_i)?:[a-zA-Z]*","(?:else|fi|or):","(?:if|cs|exp):w","(?:hbox|vbox):n","::[a-zA-Z]_unbraced","::[a-zA-Z:]"].map((e=>e+"(?![a-zA-Z:_])")).join("|"))
+},{endsParent:!0,variants:n},{endsParent:!0,relevance:0,variants:[{
+begin:/[a-zA-Z@]+/},{begin:/[^a-zA-Z@]?/}]}]},{className:"params",relevance:0,
+begin:/#+\d?/},{variants:n},{className:"built_in",relevance:0,begin:/[$&^_]/},{
+className:"meta",begin:"% !TeX",end:"$",relevance:10},e.COMMENT("%","$",{
+relevance:0})],i={begin:/\{/,end:/\}/,relevance:0,contains:["self",...a]
+},t=e.inherit(i,{relevance:0,endsParent:!0,contains:[i,...a]}),r={begin:/\[/,
+end:/\]/,endsParent:!0,relevance:0,contains:[i,...a]},s={begin:/\s+/,relevance:0
+},c=[t],l=[r],o=(e,n)=>({contains:[s],starts:{relevance:0,contains:e,starts:n}
+}),d=(e,n)=>({begin:"\\\\"+e+"(?![a-zA-Z@:_])",keywords:{$pattern:/\\[a-zA-Z]+/,
+keyword:"\\"+e},relevance:0,contains:[s],starts:n}),g=(n,a)=>e.inherit({
+begin:"\\\\begin(?=[ \t]*(\\r?\\n[ \t]*)?\\{"+n+"\\})",keywords:{
+$pattern:/\\[a-zA-Z]+/,keyword:"\\begin"},relevance:0
+},o(c,a)),m=(n="string")=>e.END_SAME_AS_BEGIN({className:n,begin:/(.|\r?\n)/,
+end:/(.|\r?\n)/,excludeBegin:!0,excludeEnd:!0,endsParent:!0}),b=e=>({
+className:"string",end:"(?=\\\\end\\{"+e+"\\})"}),p=(e="string")=>({relevance:0,
+begin:/\{/,starts:{endsParent:!0,contains:[{className:e,end:/(?=\})/,
+endsParent:!0,contains:[{begin:/\{/,end:/\}/,relevance:0,contains:["self"]}]}]}
+});return{name:"LaTeX",aliases:["TeX"],
+contains:[...["verb","lstinline"].map((e=>d(e,{contains:[m()]}))),d("mint",o(c,{
+contains:[m()]})),d("mintinline",o(c,{contains:[p(),m()]})),d("url",{
+contains:[p("link"),p("link")]}),d("hyperref",{contains:[p("link")]
+}),d("href",o(l,{contains:[p("link")]
+})),...[].concat(...["","\\*"].map((e=>[g("verbatim"+e,b("verbatim"+e)),g("filecontents"+e,o(c,b("filecontents"+e))),...["","B","L"].map((n=>g(n+"Verbatim"+e,o(l,b(n+"Verbatim"+e)))))]))),g("minted",o(l,o(c,b("minted")))),...a]
+}}})());
\ 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..a240dae412 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ldif.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ldif.min.js
@@ -1 +1,5 @@
-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",(()=>{"use strict";return e=>({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 36c2625447..4b0daae980 100644
--- a/vendor/assets/javascripts/highlightjs/languages/leaf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/leaf.min.js
@@ -1 +1,6 @@
-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",(()=>{"use strict";return e=>({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 878011f1cd..145b89cbd7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/less.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/less.min.js
@@ -1 +1,36 @@
-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",(()=>{"use strict"
+;const e=["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","main","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"],t=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],i=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],o=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],n=["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-display","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-variation-settings","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","src","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(),r=i.concat(o)
+;return a=>{const s=(e=>({IMPORTANT:{className:"meta",begin:"!important"},
+HEXCOLOR:{className:"number",begin:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"},
+ATTRIBUTE_SELECTOR_MODE:{className:"selector-attr",begin:/\[/,end:/\]/,
+illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]}
+}))(a),l=r,d="([\\w-]+|@\\{[\\w-]+\\})",c=[],g=[],b=e=>({className:"string",
+begin:"~?"+e+".*?"+e}),m=(e,t,i)=>({className:e,begin:t,relevance:i}),u={
+$pattern:/[a-z-]+/,keyword:"and or not only",attribute:t.join(" ")},p={
+begin:"\\(",end:"\\)",contains:g,keywords:u,relevance:0}
+;g.push(a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,b("'"),b('"'),a.CSS_NUMBER_MODE,{
+begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]",
+excludeEnd:!0}
+},s.HEXCOLOR,p,m("variable","@@?[\\w-]+",10),m("variable","@\\{[\\w-]+\\}"),m("built_in","~?`[^`]*?`"),{
+className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0
+},s.IMPORTANT);const f=g.concat({begin:/\{/,end:/\}/,contains:c}),h={
+beginKeywords:"when",endsWithParent:!0,contains:[{beginKeywords:"and not"
+}].concat(g)},w={begin:d+"\\s*:",returnBegin:!0,end:/[;}]/,relevance:0,
+contains:[{begin:/-(webkit|moz|ms|o)-/},{className:"attribute",
+begin:"\\b("+n.join("|")+")\\b",end:/(?=:)/,starts:{endsWithParent:!0,
+illegal:"[<=$]",relevance:0,contains:g}}]},v={className:"keyword",
+begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",
+starts:{end:"[;{}]",keywords:u,returnEnd:!0,contains:g,relevance:0}},y={
+className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{
+begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:f}},k={variants:[{
+begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:d,end:/\{/}],returnBegin:!0,
+returnEnd:!0,illegal:"[<='$\"]",relevance:0,
+contains:[a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,h,m("keyword","all\\b"),m("variable","@\\{[\\w-]+\\}"),{
+begin:"\\b("+e.join("|")+")\\b",className:"selector-tag"
+},m("selector-tag",d+"%?",0),m("selector-id","#"+d),m("selector-class","\\."+d,0),m("selector-tag","&",0),s.ATTRIBUTE_SELECTOR_MODE,{
+className:"selector-pseudo",begin:":("+i.join("|")+")"},{
+className:"selector-pseudo",begin:"::("+o.join("|")+")"},{begin:"\\(",end:"\\)",
+contains:f},{begin:"!important"}]},E={begin:`[\\w-]+:(:)?(${l.join("|")})`,
+returnBegin:!0,contains:[k]}
+;return c.push(a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,v,y,E,w,k),{
+name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:c}}})());
\ 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..63a58d7f23 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lisp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lisp.min.js
@@ -1 +1,15 @@
-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",(()=>{"use strict";return e=>{
+var n="[a-zA-Z_\\-+\\*\\/<=>&#][a-zA-Z0-9_\\-+*\\/<=>&#!]*",a="\\|[^]*?\\|",i="(-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|-)?\\d+)?",s={
+className:"literal",begin:"\\b(t{1}|nil)\\b"},l={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}),r={begin:"\\*",end:"\\*"},t={
+className:"symbol",begin:"[:&]"+n},c={begin:n,relevance:0},d={begin:a},o={
+contains:[l,b,r,t,{begin:"\\(",end:"\\)",contains:["self",s,b,l,c]},c],
+variants:[{begin:"['`]\\(",end:"\\)"},{begin:"\\(quote ",end:"\\)",keywords:{
+name:"quote"}},{begin:"'"+a}]},v={variants:[{begin:"'"+n},{
+begin:"#'"+n+"(::"+n+")*"}]},m={begin:"\\(\\s*",end:"\\)"},u={endsWithParent:!0,
+relevance:0};return m.contains=[{className:"name",variants:[{begin:n,relevance:0
+},{begin:a}]},u],u.contains=[o,v,m,s,l,b,g,r,t,d,c],{name:"Lisp",illegal:/\S/,
+contains:[l,e.SHEBANG(),s,b,g,o,v,m,c]}}})());
\ 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..fa425918c2 100644
--- a/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
@@ -1 +1,21 @@
-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",(()=>{"use strict";return e=>{const 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 9c8962db59..0de79ce41d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/livescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/livescript.min.js
@@ -1 +1,34 @@
-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",(()=>{"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 t=>{const 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"]),
+literal:n.concat(["yes","no","on","off","it","that","void"]),
+built_in:a.concat(["npm","print"])
+},s="[A-Za-z$_](?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*",i=t.inherit(t.TITLE_MODE,{
+begin:s}),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:/\/(?![ *])(\\.|[^\\\n])*?\/[gim]*(?=\W)/}]},{begin:"@"+s},{begin:"``",
+end:"``",excludeBegin:!0,excludeEnd:!0,subLanguage:"javascript"}];o.contains=l
+;const 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:[i,d],
+returnBegin:!0,variants:[{
+begin:"("+s+"\\s*(?:=|:=)\\s*)?(\\(.*\\)\\s*)?\\B->\\*?",end:"->\\*?"},{
+begin:"("+s+"\\s*(?:=|:=)\\s*)?!?(\\(.*\\)\\s*)?\\B[-~]{1,2}>\\*?",
+end:"[-~]{1,2}>\\*?"},{
+begin:"("+s+"\\s*(?:=|:=)\\s*)?(\\(.*\\)\\s*)?\\B!?[-~]{1,2}>\\*?",
+end:"!?[-~]{1,2}>\\*?"}]},{className:"class",beginKeywords:"class",end:"$",
+illegal:/[:="\[\]]/,contains:[{beginKeywords:"extends",endsWithParent:!0,
+illegal:/[:="\[\]]/,contains:[i]},i]},{begin:s+":",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 75ca9d2b42..ff33e7e2cd 100644
--- a/vendor/assets/javascripts/highlightjs/languages/llvm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/llvm.min.js
@@ -1 +1,14 @@
-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",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>{const a=/([-a-zA-Z$._][\w$.-]*)/,t={
+className:"variable",variants:[{begin:e(/%/,a)},{begin:/%\d+/},{begin:/#\d+/}]
+},i={className:"title",variants:[{begin:e(/@/,a)},{begin:/@\d+/},{begin:e(/!/,a)
+},{begin:e(/!\d+/,a)},{begin:/!\d+/}]};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:"type",begin:/\bi\d+(?=\s|\b)/},n.COMMENT(/;\s*$/,null,{
+relevance:0}),n.COMMENT(/;/,/$/),n.QUOTE_STRING_MODE,{className:"string",
+variants:[{begin:/"/,end:/[^\\]"/}]},i,{className:"punctuation",relevance:0,
+begin:/,/},{className:"operator",relevance:0,begin:/=/},t,{className:"symbol",
+variants:[{begin:/^\s*[a-z]+:/}],relevance:0},{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 e55634d20b..465cfd6470 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lsl.min.js
@@ -1 +1,19 @@
-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",(()=>{"use strict";return E=>{var T={
+className:"number",relevance:0,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 8073263fbb..7991ced6be 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lua.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lua.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";return e=>{
+const t="\\[=*\\[",a="\\]=*\\]",n={begin:t,end:a,contains:["self"]
+},o=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[",a,{contains:[n],
+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:o.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:o}].concat(o)
+},e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",
+begin:t,end:a,contains:[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..6644354064 100644
--- a/vendor/assets/javascripts/highlightjs/languages/makefile.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/makefile.min.js
@@ -1 +1,12 @@
-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",(()=>{"use strict";return e=>{const i={
+className:"variable",variants:[{begin:"\\$\\("+e.UNDERSCORE_IDENT_RE+"\\)",
+contains:[e.BACKSLASH_ESCAPE]},{begin:/\$[@%<?\^\+\*]/}]},a={className:"string",
+begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i]},n={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]},s={begin:"^"+e.UNDERSCORE_IDENT_RE+"\\s*(?=[:+?]?=)"},r={
+className:"section",begin:/^[^\s]+:/,end:/$/,contains:[i]};return{
+name:"Makefile",aliases:["mk","mak","make"],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,a,n,s,{className:"meta",begin:/^\.PHONY:/,
+end:/$/,keywords:{$pattern:/[\.\w]+/,"meta-keyword":".PHONY"}},r]}}})());
\ 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..0760aa9045 100644
--- a/vendor/assets/javascripts/highlightjs/languages/markdown.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/markdown.min.js
@@ -1 +1,29 @@
-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",(()=>{"use strict";function n(...n){
+return n.map((n=>{return(e=n)?"string"==typeof e?e:e.source:null;var e
+})).join("")}return e=>{const a={begin:/<\/?[A-Za-z_]/,end:">",
+subLanguage:"xml",relevance:0},i={variants:[{begin:/\[.+?\]\[.*?\]/,relevance:0
+},{begin:/\[.+?\]\(((data|javascript|mailto):|(?:http|ftp)s?:\/\/).*?\)/,
+relevance:2},{begin:n(/\[.+?\]\(/,/[A-Za-z][A-Za-z0-9+.-]*/,/:\/\/.*?\)/),
+relevance:2},{begin:/\[.+?\]\([./?&#].*?\)/,relevance:1},{
+begin:/\[.+?\]\(.*?\)/,relevance:0}],returnBegin:!0,contains:[{
+className:"string",relevance:0,begin:"\\[",end:"\\]",excludeBegin:!0,
+returnEnd:!0},{className:"link",relevance:0,begin:"\\]\\(",end:"\\)",
+excludeBegin:!0,excludeEnd:!0},{className:"symbol",relevance:0,begin:"\\]\\[",
+end:"\\]",excludeBegin:!0,excludeEnd:!0}]},s={className:"strong",contains:[],
+variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},c={
+className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{
+begin:/_(?!_)/,end:/_/,relevance:0}]};s.contains.push(c),c.contains.push(s)
+;let t=[a,i]
+;return s.contains=s.contains.concat(t),c.contains=c.contains.concat(t),
+t=t.concat(s,c),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{
+className:"section",variants:[{begin:"^#{1,6}",end:"$",contains:t},{
+begin:"(?=^.+?\\n[=-]{2,}$)",contains:[{begin:"^[=-]*$"},{begin:"^",end:"\\n",
+contains:t}]}]},a,{className:"bullet",begin:"^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)",
+end:"\\s+",excludeEnd:!0},s,c,{className:"quote",begin:"^>\\s+",contains:t,
+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:"$"},i,{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 3bc834f92b..c50c49507e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
@@ -1 +1,22 @@
-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 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 CylindricalDecomposition D 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 DynamicWrapperBoxOptions E 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 ExtremeValueDistribution FaceForm 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 GumbelDistribution HaarWavelet 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 HypothesisTestData I 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 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 JoinAcross Joined JoinedCurve JoinedCurveBox JoinedCurveBoxOptions JoinForm JordanDecomposition JordanModelDecomposition JulianDate JuliaSetBoettcher JuliaSetIterationCount JuliaSetPlot JuliaSetPoints K 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 KVertexConnectedGraphQ LABColor 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 LyonsGroupLy MachineID 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 MultivariateTDistribution N 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 NyquistPlot O 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 OwnValues Package 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 PyramidBoxOptions QBinomial 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 QuotientRemainder RadialGradientImage 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 RussellRaoDissimilarity SameQ 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 SystemTest Tab 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 TypeSpecifier UnateQ 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 UtilityFunction V2Get 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 VoronoiMesh WaitAll 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 Wronskian XMLElement XMLObject XMLTemplate Xnor Xor XYZColor Yellow Yesterday YuleDissimilarity ZernikeR 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"},contains:[e.COMMENT("\\(\\*","\\*\\)",{contains:["self"]}),e.QUOTE_STRING_MODE,e.C_NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("mathematica",(()=>{"use strict"
+;const e=["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","AdjacentMeshCells","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","AllowVersionUpdate","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","AnnotationKeys","AnnotationRules","AnnotationValue","Annuity","AnnuityDue","Annulus","AnomalyDetection","AnomalyDetector","AnomalyDetectorFunction","Anonymous","Antialiasing","AntihermitianMatrixQ","Antisymmetric","AntisymmetricMatrixQ","Antonyms","AnyOrder","AnySubset","AnyTrue","Apart","ApartSquareFree","APIFunction","Appearance","AppearanceElements","AppearanceRules","AppellF1","Append","AppendCheck","AppendLayer","AppendTo","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","Asymptotic","AsymptoticDSolveValue","AsymptoticEqual","AsymptoticEquivalent","AsymptoticGreater","AsymptoticGreaterEqual","AsymptoticIntegrate","AsymptoticLess","AsymptoticLessEqual","AsymptoticOutputTracker","AsymptoticProduct","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","AudioEncoding","AudioFade","AudioFrequencyShift","AudioGenerator","AudioIdentify","AudioInputDevice","AudioInsert","AudioInstanceQ","AudioIntervals","AudioJoin","AudioLabel","AudioLength","AudioLocalMeasurements","AudioLooping","AudioLoudness","AudioMeasurements","AudioNormalize","AudioOutputDevice","AudioOverlay","AudioPad","AudioPan","AudioPartition","AudioPause","AudioPitchShift","AudioPlay","AudioPlot","AudioQ","AudioRecord","AudioReplace","AudioResample","AudioReverb","AudioReverse","AudioSampleRate","AudioSpectralMap","AudioSpectralTransformation","AudioSplit","AudioStop","AudioStream","AudioStreams","AudioTimeStretch","AudioTracks","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","CategoricalDistribution","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","CharacterNormalize","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","ClosingSaveDialog","CloudAccountData","CloudBase","CloudConnect","CloudConnections","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","CloudUserID","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","ComplementedEntityClass","CompleteGraph","CompleteGraphQ","CompleteKaryTree","CompletionsListPacket","Complex","ComplexContourPlot","Complexes","ComplexExpand","ComplexInfinity","ComplexityFunction","ComplexListPlot","ComplexPlot","ComplexPlot3D","ComplexRegionPlot","ComplexStreamPlot","ComplexVectorPlot","ComponentMeasurements","ComponentwiseContextMenu","Compose","ComposeList","ComposeSeries","CompositeQ","Composition","CompoundElement","CompoundExpression","CompoundPoissonDistribution","CompoundPoissonProcess","CompoundRenewalProcess","Compress","CompressedData","CompressionLevel","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","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","CreateDataStructure","CreateDataSystemModel","CreateDialog","CreateDirectory","CreateDocument","CreateFile","CreateIntermediateDirectories","CreateManagedLibraryExpression","CreateNotebook","CreatePacletArchive","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","CurryApplied","CurvatureFlowFilter","CurveClosed","Cyan","CycleGraph","CycleIndexPolynomial","Cycles","CyclicGroup","Cyclotomic","Cylinder","CylinderBox","CylindricalDecomposition","D","DagumDistribution","DamData","DamerauLevenshteinDistance","DampingFactor","Darker","Dashed","Dashing","DatabaseConnect","DatabaseDisconnect","DatabaseReference","Databin","DatabinAdd","DatabinRemove","Databins","DatabinUpload","DataCompression","DataDistribution","DataRange","DataReversed","Dataset","DatasetDisplayPanel","DataStructure","DataStructureQ","Date","DateBounds","Dated","DateDelimiters","DateDifference","DatedUnit","DateFormat","DateFunction","DateHistogram","DateInterval","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","DiscreteAsymptotic","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","DynamicWrapperBoxOptions","E","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","EdgeTaggedGraph","EdgeTaggedGraphQ","EdgeTags","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","ExpressionGraph","ExpressionPacket","ExpressionUUID","ExpToTrig","ExtendedEntityClass","ExtendedGCD","Extension","ExtentElementFunction","ExtentMarkers","ExtentSize","ExternalBundle","ExternalCall","ExternalDataCharacterEncoding","ExternalEvaluate","ExternalFunction","ExternalFunctionName","ExternalIdentifier","ExternalObject","ExternalOptions","ExternalSessionObject","ExternalSessions","ExternalStorageBase","ExternalStorageDownload","ExternalStorageGet","ExternalStorageObject","ExternalStoragePut","ExternalStorageUpload","ExternalTypeSignature","ExternalValue","Extract","ExtractArchive","ExtractLayer","ExtractPacletArchive","ExtremeValueDistribution","FaceAlign","FaceForm","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","FindImageText","FindIndependentEdgeSet","FindIndependentVertexSet","FindInstance","FindIntegerNullVector","FindKClan","FindKClique","FindKClub","FindKPlex","FindLibrary","FindLinearRecurrence","FindList","FindMatchingColor","FindMaximum","FindMaximumCut","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","ForceVersionInstall","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","FussellVeselyImportance","GaborFilter","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","GenerateFileSignature","GenerateHTTPResponse","GenerateSecuredAuthenticationKey","GenerateSymmetricKey","GeneratingFunction","GeneratorDescription","GeneratorHistoryLength","GeneratorOutputType","Generic","GenericCylindricalDecomposition","GenomeData","GenomeLookup","GeoAntipode","GeoArea","GeoArraySize","GeoBackground","GeoBoundingBox","GeoBounds","GeoBoundsRegion","GeoBubbleChart","GeoCenter","GeoCircle","GeoContourPlot","GeoDensityPlot","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","GeometricOptimization","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","GoochShading","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","GumbelDistribution","HaarWavelet","HadamardMatrix","HalfLine","HalfNormalDistribution","HalfPlane","HalfSpace","HalftoneShading","HamiltonianGraphQ","HammingDistance","HammingWindow","HandlerFunctions","HandlerFunctionsKeys","HankelH1","HankelH2","HankelMatrix","HankelTransform","HannPoissonWindow","HannWindow","HaradaNortonGroupHN","HararyGraph","HarmonicMean","HarmonicMeanFilter","HarmonicNumber","Hash","HatchFilling","HatchShading","Haversine","HazardFunction","Head","HeadCompose","HeaderAlignment","HeaderBackground","HeaderDisplayFunction","HeaderLines","HeaderSize","HeaderStyle","Heads","HeavisideLambda","HeavisidePi","HeavisideTheta","HeldGroupHe","HeldPart","HelpBrowserLookup","HelpBrowserNotebook","HelpBrowserSettings","Here","HermiteDecomposition","HermiteH","HermitianMatrixQ","HessenbergDecomposition","Hessian","HeunB","HeunBPrime","HeunC","HeunCPrime","HeunD","HeunDPrime","HeunG","HeunGPrime","HeunT","HeunTPrime","HexadecimalCharacter","Hexahedron","HexahedronBox","HexahedronBoxOptions","HiddenItems","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","HyperlinkAction","HyperlinkCreationSettings","Hyperplane","Hyphenation","HyphenationOptions","HypoexponentialDistribution","HypothesisTestData","I","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","ImageLabels","ImageLegends","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","IndexEdgeTaggedGraph","IndexGraph","IndexTag","Inequality","InexactNumberQ","InexactNumbers","InfiniteFuture","InfiniteLine","InfinitePast","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","IntersectedEntityClass","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","ItemDisplayFunction","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","JoinAcross","Joined","JoinedCurve","JoinedCurveBox","JoinedCurveBoxOptions","JoinForm","JordanDecomposition","JordanModelDecomposition","JulianDate","JuliaSetBoettcher","JuliaSetIterationCount","JuliaSetPlot","JuliaSetPoints","K","KagiChart","KaiserBesselWindow","KaiserWindow","KalmanEstimator","KalmanFilter","KarhunenLoeveDecomposition","KaryTree","KatzCentrality","KCoreComponents","KDistribution","KEdgeConnectedComponents","KEdgeConnectedGraphQ","KeepExistingVersion","KelvinBei","KelvinBer","KelvinKei","KelvinKer","KendallTau","KendallTauTest","KernelExecute","KernelFunction","KernelMixtureDistribution","KernelObject","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","KVertexConnectedGraphQ","LABColor","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","Looping","LossFunction","LowerCaseQ","LowerLeftArrow","LowerRightArrow","LowerTriangularize","LowerTriangularMatrixQ","LowpassFilter","LQEstimatorGains","LQGRegulator","LQOutputRegulatorGains","LQRegulatorGains","LUBackSubstitution","LucasL","LuccioSamiComponents","LUDecomposition","LunarEclipse","LUVColor","LyapunovSolve","LyonsGroupLy","MachineID","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","MaxDate","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","MeshConnectivityGraph","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","MinDate","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","MoleculeRecognize","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","MultivariateTDistribution","N","NakagamiDistribution","NameQ","Names","NamespaceBox","NamespaceBoxOptions","Nand","NArgMax","NArgMin","NBernoulliB","NBodySimulation","NBodySimulationData","NCache","NDEigensystem","NDEigenvalues","NDSolve","NDSolveValue","Nearest","NearestFunction","NearestMeshCells","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","NetGANOperator","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","NyquistPlot","O","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","OperatorApplied","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","OwnValues","Package","PackingMethod","PackPaclet","PacletDataRebuild","PacletDirectoryAdd","PacletDirectoryLoad","PacletDirectoryRemove","PacletDirectoryUnload","PacletDisable","PacletEnable","PacletFind","PacletFindRemote","PacletInformation","PacletInstall","PacletInstallSubmit","PacletNewerQ","PacletObject","PacletObjectQ","PacletSite","PacletSiteObject","PacletSiteRegister","PacletSites","PacletSiteUnregister","PacletSiteUpdate","PacletUninstall","PacletUpdate","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","ParametricRampLayer","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","PatternFilling","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","PyramidBoxOptions","QBinomial","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","QuotientRemainder","RadialGradientImage","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","RebuildPacletData","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","RegionBoundaryStyle","RegionBounds","RegionCentroid","RegionDifference","RegionDimension","RegionDisjoint","RegionDistance","RegionDistanceFunction","RegionEmbeddingDimension","RegionEqual","RegionFillingStyle","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","RemoveVideoStream","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","ResourceSystemPath","ResourceUpdate","ResourceVersion","ResponseForm","Rest","RestartInterval","Restricted","Resultant","ResumePacket","Return","ReturnEntersInput","ReturnExpressionPacket","ReturnInputFormPacket","ReturnPacket","ReturnReceiptFunction","ReturnTextPacket","Reverse","ReverseApplied","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","RussellRaoDissimilarity","SameQ","SameTest","SameTestProperties","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","SeriesTermGoal","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","SpeakerMatchQ","SpeakTextPacket","SpearmanRankTest","SpearmanRho","SpeciesData","SpecificityGoal","SpectralLineData","Spectrogram","SpectrogramArray","Specularity","SpeechCases","SpeechInterpreter","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","StippleShading","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","StructuredArrayHeadQ","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","SubsetCases","SubsetCount","SubsetEqual","SubsetMap","SubsetPosition","SubsetQ","SubsetReplace","Subsets","SubStar","SubstitutionSystem","Subsuperscript","SubsuperscriptBox","SubsuperscriptBoxOptions","SubtitleEncoding","SubtitleTracks","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","SurfaceAppearance","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","SystemCredential","SystemCredentialData","SystemCredentialKey","SystemCredentialKeys","SystemCredentialStoreObject","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","SystemTest","Tab","TabFilling","Table","TableAlignments","TableDepth","TableDirections","TableForm","TableHeadings","TableSpacing","TableView","TableViewBox","TableViewBoxBackground","TableViewBoxItemSize","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","TimeRemaining","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","ToonShading","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","TrainingUpdateSchedule","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","TypeSpecifier","UnateQ","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","UnionedEntityClass","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","UpdatePacletSites","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","UtilityFunction","V2Get","ValenceErrorHandling","ValidationLength","ValidationSet","Value","ValueBox","ValueBoxOptions","ValueDimensions","ValueForm","ValuePreprocessingFunction","ValueQ","Values","ValuesData","Variables","Variance","VarianceEquivalenceTest","VarianceEstimatorFunction","VarianceGammaDistribution","VarianceTest","VectorAngle","VectorAround","VectorAspectRatio","VectorColorFunction","VectorColorFunctionScaling","VectorDensityPlot","VectorGlyphData","VectorGreater","VectorGreaterEqual","VectorLess","VectorLessEqual","VectorMarkers","VectorPlot","VectorPlot3D","VectorPoints","VectorQ","VectorRange","Vectors","VectorScale","VectorScaling","VectorSizes","VectorStyle","Vee","Verbatim","Verbose","VerboseConvertToPostScriptPacket","VerificationTest","VerifyConvergence","VerifyDerivedKey","VerifyDigitalSignature","VerifyFileSignature","VerifyInterpretation","VerifySecurityCertificates","VerifySolutions","VerifyTestAssumptions","Version","VersionedPreferences","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","Video","VideoEncoding","VideoExtractFrames","VideoFrameList","VideoFrameMap","VideoPause","VideoPlay","VideoQ","VideoStop","VideoStream","VideoStreams","VideoTimeSeries","VideoTracks","VideoTrim","ViewAngle","ViewCenter","ViewMatrix","ViewPoint","ViewPointSelectorSettings","ViewPort","ViewProjection","ViewRange","ViewVector","ViewVertical","VirtualGroupData","Visible","VisibleCell","VoiceStyleData","VoigtDistribution","VolcanoData","Volume","VonMisesDistribution","VoronoiMesh","WaitAll","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","WikidataData","WikidataSearch","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","Wronskian","XMLElement","XMLObject","XMLTemplate","Xnor","Xor","XYZColor","Yellow","Yesterday","YuleDissimilarity","ZernikeR","ZeroSymmetric","ZeroTest","ZeroWidthTimes","Zeta","ZetaZero","ZIPCodeData","ZipfDistribution","ZoomCenter","ZoomFactor","ZTest","ZTransform","$Aborted","$ActivationGroupID","$ActivationKey","$ActivationUserRegistered","$AddOnsDirectory","$AllowDataUpdates","$AllowExternalChannelFunctions","$AllowInternet","$AssertFunction","$Assumptions","$AsynchronousTask","$AudioDecoders","$AudioEncoders","$AudioInputDevices","$AudioOutputDevices","$BaseDirectory","$BasePacletsDirectory","$BatchInput","$BatchOutput","$BlockchainBase","$BoxForms","$ByteOrdering","$CacheBaseDirectory","$Canceled","$ChannelBase","$CharacterEncoding","$CharacterEncodings","$CloudAccountName","$CloudBase","$CloudConnected","$CloudConnection","$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","$DataStructures","$DateStringFormat","$DefaultAudioInputDevice","$DefaultAudioOutputDevice","$DefaultFont","$DefaultFrontEnd","$DefaultImagingDevice","$DefaultLocalBase","$DefaultMailbox","$DefaultNetworkInterface","$DefaultPath","$DefaultProxyRules","$DefaultSystemCredentialStore","$Display","$DisplayFunction","$DistributedContexts","$DynamicEvaluation","$Echo","$EmbedCodeEnvironments","$EmbeddableServices","$EntityStores","$Epilog","$EvaluationCloudBase","$EvaluationCloudObject","$EvaluationEnvironment","$ExportFormats","$ExternalIdentifierTypes","$ExternalStorageBase","$Failed","$FinancialDataSource","$FontFamilies","$FormatType","$FrontEnd","$FrontEndSession","$GeoEntityTypes","$GeoLocation","$GeoLocationCity","$GeoLocationCountry","$GeoLocationPrecision","$GeoLocationSource","$HistoryLength","$HomeDirectory","$HTMLExportRules","$HTTPCookies","$HTTPRequest","$IgnoreEOF","$ImageFormattingWidth","$ImageResolution","$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","$NotebookInlineStorageLimit","$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","$RootDirectory","$ScheduledTask","$ScriptCommandLine","$ScriptInputString","$SecuredAuthenticationKeyTokens","$ServiceCreditsAvailable","$Services","$SessionID","$SetParentLink","$SharedFunctions","$SharedVariables","$SoundDisplay","$SoundDisplayFunction","$SourceLink","$SSHAuthentication","$SubtitleDecoders","$SubtitleEncoders","$SummaryBoxDataSizeLimit","$SuppressInputFormHeads","$SynchronousEvaluation","$SyntaxHandler","$System","$SystemCharacterEncoding","$SystemCredentialStore","$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","$UserBasePacletsDirectory","$UserDocumentsDirectory","$Username","$UserName","$UserURLBase","$Version","$VersionNumber","$VideoDecoders","$VideoEncoders","$VoiceStyles","$WolframDocumentsDirectory","$WolframID","$WolframUUID"]
+;function t(e){return e?"string"==typeof e?e:e.source:null}function i(e){
+return o("(",e,")?")}function o(...e){return e.map((e=>t(e))).join("")}
+function a(...e){return"("+e.map((e=>t(e))).join("|")+")"}return t=>{
+const n=a(o(/([2-9]|[1-2]\d|[3][0-5])\^\^/,/(\w*\.\w+|\w+\.\w*|\w+)/),/(\d*\.\d+|\d+\.\d*|\d+)/),r={
+className:"number",relevance:0,
+begin:o(n,i(a(/``[+-]?(\d*\.\d+|\d+\.\d*|\d+)/,/`([+-]?(\d*\.\d+|\d+\.\d*|\d+))?/)),i(/\*\^[+-]?\d+/))
+},l=/[a-zA-Z$][a-zA-Z0-9$]*/,s=new Set(e),c={variants:[{
+className:"builtin-symbol",begin:l,"on:begin":(e,t)=>{
+s.has(e[0])||t.ignoreMatch()}},{className:"symbol",relevance:0,begin:l}]},u={
+className:"message-name",relevance:0,begin:o("::",l)};return{name:"Mathematica",
+aliases:["mma","wl"],classNameAliases:{brace:"punctuation",pattern:"type",
+slot:"type",symbol:"variable","named-character":"variable",
+"builtin-symbol":"built_in","message-name":"string"},
+contains:[t.COMMENT(/\(\*/,/\*\)/,{contains:["self"]}),{className:"pattern",
+relevance:0,begin:/([a-zA-Z$][a-zA-Z0-9$]*)?_+([a-zA-Z$][a-zA-Z0-9$]*)?/},{
+className:"slot",relevance:0,begin:/#[a-zA-Z$][a-zA-Z0-9$]*|#+[0-9]?/},u,c,{
+className:"named-character",begin:/\\\[[$a-zA-Z][$a-zA-Z0-9]+\]/
+},t.QUOTE_STRING_MODE,r,{className:"operator",relevance:0,
+begin:/[+\-*/,;.:@~=><&|_`'^?!%]+/},{className:"brace",relevance:0,
+begin:/[[\](){}]/}]}}})());
\ 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 665481ea46..6da4a50128 100644
--- a/vendor/assets/javascripts/highlightjs/languages/matlab.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/matlab.min.js
@@ -1 +1,14 @@
-hljs.registerLanguage("matlab",function(){"use strict";return function(e){var a={relevance:0,contains:[{begin:"('|\\.')+"}]};return{name:"Matlab",keywords:{keyword:"arguments break case catch classdef continue else elseif end enumeration 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",(()=>{"use strict";return e=>{var a={relevance:0,
+contains:[{begin:"('|\\.')+"}]};return{name:"Matlab",keywords:{
+keyword:"arguments break case catch classdef continue else elseif end enumeration 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|0 inf nan isnan isinf isfinite j|0 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 45ef823e58..aa2d52a8fe 100644
--- a/vendor/assets/javascripts/highlightjs/languages/maxima.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/maxima.min.js
@@ -1 +1,11 @@
-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",(()=>{"use strict";return e=>({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 881a207921..3b5cb89049 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mel.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mel.min.js
@@ -1 +1,6 @@
-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",(()=>{"use strict";return e=>({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 e1dae67331..b88d467143 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mercury.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mercury.min.js
@@ -1 +1,14 @@
-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",(()=>{"use strict";return e=>{
+const 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 7d7591939d..7b4662e3de 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
@@ -1 +1,14 @@
-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",(()=>{"use strict";return e=>({
+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 a899554444..3ec1778bc4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mizar.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mizar.min.js
@@ -1 +1,3 @@
-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",(()=>{"use strict";return e=>({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 96b75d3188..3b762cede5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
@@ -1 +1,5 @@
-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",(()=>{"use strict";return e=>({
+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 2e41eb5c04..e8c677a2d4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/monkey.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/monkey.min.js
@@ -1 +1,15 @@
-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",(()=>{"use strict";return e=>{const 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 e3be4ead57..979d5f7726 100644
--- a/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
@@ -1 +1,22 @@
-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",(()=>{"use strict";return e=>{const 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},t=[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=t
+;const i=e.inherit(e.TITLE_MODE,{begin:s}),r="(\\(.*\\)\\s*)?\\B[-=]>",l={
+className:"params",begin:"\\([^\\(]",returnBegin:!0,contains:[{begin:/\(/,
+end:/\)/,keywords:n,contains:["self"].concat(t)}]};return{name:"MoonScript",
+aliases:["moon"],keywords:n,illegal:/\/\*/,
+contains:t.concat([e.COMMENT("--","$"),{className:"function",
+begin:"^\\s*"+s+"\\s*=\\s*"+r,end:"[-=]>",returnBegin:!0,contains:[i,l]},{
+begin:/[\(,:=]\s*/,relevance:0,contains:[{className:"function",begin:r,
+end:"[-=]>",returnBegin:!0,contains:[l]}]},{className:"class",
+beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{
+beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[i]},i]
+},{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 cd7e12d6f9..83659f8afa 100644
--- a/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
@@ -1 +1,11 @@
-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",(()=>{"use strict";return e=>({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]
+},{className:"string",begin:'"',end:'"',contains:[e.BACKSLASH_ESCAPE]},{
+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 bdccaae572..32100fa99d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nginx.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nginx.min.js
@@ -1 +1,19 @@
-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",(()=>{"use strict";return e=>{const 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
index b1a83ffd0d..bd14696515 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nim.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nim.min.js
@@ -1 +1,14 @@
-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
+hljs.registerLanguage("nim",(()=>{"use strict";return e=>({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 9fdc5b3b8f..71e2736c28 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nix.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nix.min.js
@@ -1 +1,10 @@
-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",(()=>{"use strict";return e=>{const 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},s={className:"string",
+contains:[i],variants:[{begin:"''",end:"''"},{begin:'"',end:'"'}]
+},t=[e.NUMBER_MODE,e.HASH_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,{
+begin:/[a-zA-Z0-9-_]+(\s*=)/,returnBegin:!0,relevance:0,contains:[{
+className:"attr",begin:/\S+/}]}];return i.contains=t,{name:"Nix",
+aliases:["nixos"],keywords:n,contains:t}}})());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/node-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/node-repl.min.js
new file mode 100644
index 0000000000..c78b2db40b
--- /dev/null
+++ b/vendor/assets/javascripts/highlightjs/languages/node-repl.min.js
@@ -0,0 +1,4 @@
+hljs.registerLanguage("node-repl",(()=>{"use strict";return e=>({
+name:"Node REPL",contains:[{className:"meta",starts:{end:/ |$/,starts:{end:"$",
+subLanguage:"javascript"}},variants:[{begin:/^>(?=[ ]|$)/},{
+begin:/^\.\.\.(?=[ ]|$)/}]}]})})());
\ 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 2b4f476f38..d0768fa123 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nsis.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nsis.min.js
@@ -1 +1,18 @@
-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 FileWriteUTF16LE FileSeek FileWrite FileWriteByte FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetKnownFolderPath GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfRtlLanguage IfShellVarContextAll 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 LoadAndSetImage LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestLongPathAware ManifestMaxVersionTested ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PEAddResource PEDllCharacteristics PERemoveResource PESubsysVer Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText 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",(()=>{"use strict";return e=>{const 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 FileWriteUTF16LE FileSeek FileWrite FileWriteByte FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetKnownFolderPath GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfRtlLanguage IfShellVarContextAll 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 LoadAndSetImage LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestLongPathAware ManifestMaxVersionTested ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PEAddResource PEDllCharacteristics PERemoveResource PESubsysVer Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText 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 c12ca0ae73..33b70ebaa1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
@@ -1 +1,21 @@
-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","obj-c++","objective-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",(()=>{"use strict";return e=>{
+const n=/[a-zA-Z@][a-zA-Z0-9_]*/,_={$pattern:n,
+keyword:"@interface @class @protocol @implementation"};return{
+name:"Objective-C",aliases:["mm","objc","obj-c","obj-c++","objective-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 6093d9e1fc..60807c398e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";return e=>({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 65b62f3e06..c83ef17551 100644
--- a/vendor/assets/javascripts/highlightjs/languages/openscad.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/openscad.min.js
@@ -1 +1,14 @@
-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",(()=>{"use strict";return e=>{const 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 d5fd001b5e..a630bd4a63 100644
--- a/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
@@ -1 +1,14 @@
-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",(()=>{"use strict";return e=>{const 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 0aac1441d2..38583a58c6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/parser3.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/parser3.min.js
@@ -1 +1,10 @@
-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",(()=>{"use strict";return e=>{
+const 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 b3cb6332ac..3f4813265d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/perl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/perl.min.js
@@ -1 +1,38 @@
-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",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(...n){
+return n.map((n=>e(n))).join("")}function t(...n){
+return"("+n.map((n=>e(n))).join("|")+")"}return e=>{
+const r=/[dualxmsipngr]{0,12}/,s={$pattern:/[\w.]+/,
+keyword:"abs accept alarm and atan2 bind binmode bless break caller chdir chmod chomp chop chown chr chroot close closedir connect continue cos crypt dbmclose dbmopen defined delete die do dump each else elsif endgrent endhostent endnetent endprotoent endpwent endservent eof eval exec exists exit exp fcntl fileno flock for foreach fork format formline getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername getpgrp getpriority getprotobyname getprotobynumber getprotoent getpwent getpwnam getpwuid getservbyname getservbyport getservent getsockname getsockopt given glob gmtime goto grep gt hex if index int ioctl join keys kill last lc lcfirst length link listen local localtime log lstat lt ma map mkdir msgctl msgget msgrcv msgsnd my ne next no not oct open opendir or ord our pack package pipe pop pos print printf prototype push q|0 qq quotemeta qw qx rand read readdir readline readlink readpipe recv redo ref rename require reset return reverse rewinddir rindex rmdir say scalar seek seekdir select semctl semget semop send setgrent sethostent setnetent setpgrp setpriority setprotoent setpwent setservent setsockopt shift shmctl shmget shmread shmwrite shutdown sin sleep socket socketpair sort splice split sprintf sqrt srand stat state study sub substr symlink syscall sysopen sysread sysseek system syswrite tell telldir tie tied time times tr truncate uc ucfirst umask undef unless unlink unpack unshift untie until use utime values vec wait waitpid wantarray warn when while write x|0 xor y|0"
+},i={className:"subst",begin:"[$@]\\{",end:"\\}",keywords:s},a={begin:/->\{/,
+end:/\}/},o={variants:[{begin:/\$\d/},{
+begin:n(/[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/,"(?![A-Za-z])(?![@$%])")
+},{begin:/[$%@][^\s\w{]/,relevance:0}]
+},c=[e.BACKSLASH_ESCAPE,i,o],g=[/!/,/\//,/\|/,/\?/,/'/,/"/,/#/],l=(e,t,s="\\1")=>{
+const i="\\1"===s?s:n(s,t)
+;return n(n("(?:",e,")"),t,/(?:\\.|[^\\\/])*?/,i,/(?:\\.|[^\\\/])*?/,s,r)
+},d=(e,t,s)=>n(n("(?:",e,")"),t,/(?:\\.|[^\\\/])*?/,s,r),p=[o,e.HASH_COMMENT_MODE,e.COMMENT(/^=\w/,/=cut/,{
+endsWithParent:!0}),a,{className:"string",contains:c,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+\}/,relevance:0},{
+begin:"-?\\w+\\s*=>",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",variants:[{
+begin:l("s|tr|y",t(...g))},{begin:l("s|tr|y","\\(","\\)")},{
+begin:l("s|tr|y","\\[","\\]")},{begin:l("s|tr|y","\\{","\\}")}],relevance:2},{
+className:"regexp",variants:[{begin:/(m|qr)\/\//,relevance:0},{
+begin:d("(?:m|qr)?",/\//,/\//)},{begin:d("m|qr",t(...g),/\1/)},{
+begin:d("m|qr",/\(/,/\)/)},{begin:d("m|qr",/\[/,/\]/)},{
+begin:d("m|qr",/\{/,/\}/)}]}]},{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 i.contains=p,a.contains=p,{name:"Perl",aliases:["pl","pm"],keywords:s,
+contains:p}}})());
\ 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..9934dc50bb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/pf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pf.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return t=>({
+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 df4d4fd6e3..3f2f122714 100644
--- a/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
@@ -1 +1,68 @@
-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",(()=>{"use strict";return E=>{
+const T=E.COMMENT("--","$"),N="\\$([a-zA-Z_]?|[a-zA-Z_][a-zA-Z_0-9]*)\\$",A="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 ",R=A.trim().split(" ").map((E=>E.split("|")[0])).join("|"),I="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((E=>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("+I+")\\s*\\("},{begin:"\\.("+R+")\\b"},{
+begin:"\\b("+R+")\\s+PATH\\b",keywords:{keyword:"PATH",
+type:A.replace("PATH ","")}},{className:"type",begin:"\\b("+R+")\\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:N,end:N,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
index 9cca0e2ab4..c4e46e8744 100644
--- a/vendor/assets/javascripts/highlightjs/languages/php-template.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/php-template.min.js
@@ -1 +1,7 @@
-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
+hljs.registerLanguage("php-template",(()=>{"use strict";return n=>({
+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 a1a3fac85e..6869bea0fa 100644
--- a/vendor/assets/javascripts/highlightjs/languages/php.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/php.min.js
@@ -1 +1,32 @@
-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:"subst",variants:[{begin:/\$\w+/},{begin:/\{\$/,end:/\}/}]},n=e.inherit(e.APOS_STRING_MODE,{illegal:null}),i=e.inherit(e.QUOTE_STRING_MODE,{illegal:null,contains:e.QUOTE_STRING_MODE.contains.concat(a)}),o=e.END_SAME_AS_BEGIN({begin:/<<<[ \t]*(\w+)\n/,end:/[ \t]*(\w+)\b/,contains:e.QUOTE_STRING_MODE.contains.concat(a)}),l={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[e.inherit(n,{begin:"b'",end:"'"}),e.inherit(i,{begin:'b"',end:'"'}),i,n,o]},s={variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},c={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:c,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"}),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:c,contains:["self",r,e.C_BLOCK_COMMENT_MODE,l,s]}]},{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:"=>"},l,s]}}}());
\ No newline at end of file
+hljs.registerLanguage("php",(()=>{"use strict";return e=>{const r={
+className:"variable",
+begin:"\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(?![A-Za-z0-9])(?![$])"},t={
+className:"meta",variants:[{begin:/<\?php/,relevance:10},{begin:/<\?[=]?/},{
+begin:/\?>/}]},a={className:"subst",variants:[{begin:/\$\w+/},{begin:/\{\$/,
+end:/\}/}]},n=e.inherit(e.APOS_STRING_MODE,{illegal:null
+}),i=e.inherit(e.QUOTE_STRING_MODE,{illegal:null,
+contains:e.QUOTE_STRING_MODE.contains.concat(a)}),o=e.END_SAME_AS_BEGIN({
+begin:/<<<[ \t]*(\w+)\n/,end:/[ \t]*(\w+)\b/,
+contains:e.QUOTE_STRING_MODE.contains.concat(a)}),l={className:"string",
+contains:[e.BACKSLASH_ESCAPE,t],variants:[e.inherit(n,{begin:"b'",end:"'"
+}),e.inherit(i,{begin:'b"',end:'"'}),i,n,o]},c={
+variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},s={
+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 match|0 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","php8"],
+case_insensitive:!0,keywords:s,
+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"}),t,{className:"keyword",begin:/\$this\b/},r,{
+begin:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{className:"function",
+relevance:0,beginKeywords:"fn function",end:/[;{]/,excludeEnd:!0,
+illegal:"[$%\\[]",contains:[e.UNDERSCORE_TITLE_MODE,{begin:"=>"},{
+className:"params",begin:"\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0,
+keywords:s,contains:["self",r,e.C_BLOCK_COMMENT_MODE,l,c]}]},{className:"class",
+beginKeywords:"class interface",relevance:0,end:/\{/,excludeEnd:!0,
+illegal:/[:($"]/,contains:[{beginKeywords:"extends implements"
+},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"namespace",relevance:0,end:";",
+illegal:/[.']/,contains:[e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"use",
+relevance:0,end:";",contains:[e.UNDERSCORE_TITLE_MODE]},l,c]}}})());
\ 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..cc20384b45 100644
--- a/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
@@ -1 +1,2 @@
-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",(()=>{"use strict";return t=>({
+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 a795161ba9..6c72874016 100644
--- a/vendor/assets/javascripts/highlightjs/languages/pony.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pony.min.js
@@ -1 +1,11 @@
-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",(()=>{"use strict";return e=>({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 4893b16070..874be85d3b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/powershell.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/powershell.min.js
@@ -1 +1,38 @@
-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",(()=>{"use strict";return e=>{const 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|Mount|Out|Publish|Restore|Save|Sync|Unpublish|Update|Approve|Assert|Build|Complete|Confirm|Deny|Deploy|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 577ee7daf8..c7a474d05a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/processing.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/processing.min.js
@@ -1 +1,8 @@
-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",(()=>{"use strict";return e=>({
+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 94d6c5557e..c40796e1d6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/profile.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/profile.min.js
@@ -1 +1,8 @@
-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",(()=>{"use strict";return e=>({
+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 0a06c993dd..53d7e90c1d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/prolog.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/prolog.min.js
@@ -1 +1,10 @@
-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",(()=>{"use strict";return n=>{const 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]},g=[{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=g,a.contains=g,{name:"Prolog",
+contains:g.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 16c77ffc26..745ab4c86a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/properties.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/properties.min.js
@@ -1 +1,10 @@
-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",(()=>{"use strict";return e=>{
+var n="[ \\t\\f]*",a=n+"[:=]"+n,t="("+a+"|[ \\t\\f]+)",r="([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",s="([^\\\\:= \\t\\f\\n]|\\\\.)+",i={
+end:t,relevance:0,starts:{className:"string",end:/$/,relevance:0,contains:[{
+begin:"\\\\\\\\"},{begin:"\\\\\\n"}]}};return{name:".properties",
+case_insensitive:!0,illegal:/\S/,contains:[e.COMMENT("^\\s*[!#]","$"),{
+returnBegin:!0,variants:[{begin:r+a,relevance:1},{begin:r+"[ \\t\\f]+",
+relevance:0}],contains:[{className:"attr",begin:r,endsParent:!0,relevance:0}],
+starts:i},{begin:s+t,returnBegin:!0,relevance:0,contains:[{className:"meta",
+begin:s,endsParent:!0,relevance:0}],starts:i},{className:"attr",relevance:0,
+begin:s+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 5fcdfca0e7..f9630f7217 100644
--- a/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
@@ -1 +1,10 @@
-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,e.C_BLOCK_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",(()=>{"use strict";return e=>({
+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,e.C_BLOCK_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_]+(?=\s*=[^\n]+;$)/}]})})());
\ 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..b1f2138ab5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/puppet.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/puppet.min.js
@@ -1 +1,16 @@
-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",(()=>{"use strict";return e=>{
+const s=e.COMMENT("#","$"),r="([A-Za-z_]|::)(\\w|::)*",a=e.inherit(e.TITLE_MODE,{
+begin:r}),n={className:"variable",begin:"\\$"+r},i={className:"string",
+contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/
+}]};return{name:"Puppet",aliases:["pp"],contains:[s,n,i,{beginKeywords:"class",
+end:"\\{|;",illegal:/=/,contains:[a,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:[i,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},n]}],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..b7fbef50c5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return e=>({
+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
index 3b6ef2323c..f4541ac428 100644
--- a/vendor/assets/javascripts/highlightjs/languages/python-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/python-repl.min.js
@@ -1 +1,4 @@
-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
+hljs.registerLanguage("python-repl",(()=>{"use strict";return s=>({
+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 c74071fa2f..bd7cdd902b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/python.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/python.min.js
@@ -1 +1,35 @@
-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",(()=>{"use strict";return e=>{const n={
+keyword:["and","as","assert","async","await","break","class","continue","def","del","elif","else","except","finally","for","","from","global","if","import","in","is","lambda","nonlocal|10","not","or","pass","raise","return","try","while","with","yield"],
+built_in:["__import__","abs","all","any","ascii","bin","bool","breakpoint","bytearray","bytes","callable","chr","classmethod","compile","complex","delattr","dict","dir","divmod","enumerate","eval","exec","filter","float","format","frozenset","getattr","globals","hasattr","hash","help","hex","id","input","int","isinstance","issubclass","iter","len","list","locals","map","max","memoryview","min","next","object","oct","open","ord","pow","print","property","range","repr","reversed","round","set","setattr","slice","sorted","staticmethod","str","sum","super","tuple","type","vars","zip"],
+literal:["__debug__","Ellipsis","False","None","NotImplemented","True"]},a={
+className:"meta",begin:/^(>>>|\.\.\.) /},s={className:"subst",begin:/\{/,
+end:/\}/,keywords:n,illegal:/#/},i={begin:/\{\{/,relevance:0},r={
+className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{
+begin:/([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?'''/,end:/'''/,
+contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{
+begin:/([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?"""/,end:/"""/,
+contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{
+begin:/([fF][rR]|[rR][fF]|[fF])'''/,end:/'''/,
+contains:[e.BACKSLASH_ESCAPE,a,i,s]},{begin:/([fF][rR]|[rR][fF]|[fF])"""/,
+end:/"""/,contains:[e.BACKSLASH_ESCAPE,a,i,s]},{begin:/([uU]|[rR])'/,end:/'/,
+relevance:10},{begin:/([uU]|[rR])"/,end:/"/,relevance:10},{
+begin:/([bB]|[bB][rR]|[rR][bB])'/,end:/'/},{begin:/([bB]|[bB][rR]|[rR][bB])"/,
+end:/"/},{begin:/([fF][rR]|[rR][fF]|[fF])'/,end:/'/,
+contains:[e.BACKSLASH_ESCAPE,i,s]},{begin:/([fF][rR]|[rR][fF]|[fF])"/,end:/"/,
+contains:[e.BACKSLASH_ESCAPE,i,s]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]
+},t="[0-9](_?[0-9])*",l=`(\\b(${t}))?\\.(${t})|\\b(${t})\\.`,b={
+className:"number",relevance:0,variants:[{
+begin:`(\\b(${t})|(${l}))[eE][+-]?(${t})[jJ]?\\b`},{begin:`(${l})[jJ]?`},{
+begin:"\\b([1-9](_?[0-9])*|0+(_?0)*)[lLjJ]?\\b"},{
+begin:"\\b0[bB](_?[01])+[lL]?\\b"},{begin:"\\b0[oO](_?[0-7])+[lL]?\\b"},{
+begin:"\\b0[xX](_?[0-9a-fA-F])+[lL]?\\b"},{begin:`\\b(${t})[jJ]\\b`}]},o={
+className:"params",variants:[{begin:/\(\s*\)/,skip:!0,className:null},{
+begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:n,
+contains:["self",a,b,r,e.HASH_COMMENT_MODE]}]};return s.contains=[r,b,a],{
+name:"Python",aliases:["py","gyp","ipython"],keywords:n,
+illegal:/(<\/|->|\?)|=>/,contains:[a,b,{begin:/\bself\b/},{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,o,{begin:/->/,
+endsWithParent:!0,keywords:"None"}]},{className:"meta",begin:/^[\t ]*@/,
+end:/(?=#)|$/,contains:[b,o,r]},{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 94da55353e..68a0c11912 100644
--- a/vendor/assets/javascripts/highlightjs/languages/q.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/q.min.js
@@ -1 +1,6 @@
-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",(()=>{"use strict";return e=>({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 de27c0b92f..0e6f71e6ac 100644
--- a/vendor/assets/javascripts/highlightjs/languages/qml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/qml.min.js
@@ -1 +1,29 @@
-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",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>{const r="[a-zA-Z_][a-zA-Z0-9\\._]*",a={
+className:"attribute",begin:"\\bid\\s*:",starts:{className:"string",end:r,
+returnEnd:!1}},t={begin:r+"\\s*:",returnBegin:!0,contains:[{
+className:"attribute",begin:r,end:"\\s*:",excludeEnd:!0,relevance:0}],
+relevance:0},i={begin:e(r,/\s*\{/),end:/\{/,returnBegin:!0,relevance:0,
+contains:[n.inherit(n.TITLE_MODE,{begin:r})]};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)['"]/
+},n.APOS_STRING_MODE,n.QUOTE_STRING_MODE,{className:"string",begin:"`",end:"`",
+contains:[n.BACKSLASH_ESCAPE,{className:"subst",begin:"\\$\\{",end:"\\}"}]
+},n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,{className:"number",variants:[{
+begin:"\\b(0[bB][01]+)"},{begin:"\\b(0[oO][0-7]+)"},{begin:n.C_NUMBER_RE}],
+relevance:0},{begin:"("+n.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
+keywords:"return throw case",
+contains:[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,n.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:[n.inherit(n.TITLE_MODE,{begin:/[A-Za-z$_][0-9A-Za-z$_]*/
+}),{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,
+contains:[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE]}],illegal:/\[|%/},{
+begin:"\\."+n.IDENT_RE,relevance:0},a,t,i],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 a892f66f7e..8d48be9dbe 100644
--- a/vendor/assets/javascripts/highlightjs/languages/r.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/r.min.js
@@ -1 +1,32 @@
-hljs.registerLanguage("r",function(){"use strict";return function(e){const n=/(?:(?:[a-zA-Z]|\.[._a-zA-Z])[._a-zA-Z0-9]*)|\.(?!\d)/;return{name:"R",keywords:{$pattern:n,keyword:"function if in break next repeat else for while",literal:"NULL NA TRUE FALSE Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10",built_in:"LETTERS letters month.abb month.name pi T F abs acos acosh all any anyNA Arg as.call as.characteras.complex as.double as.environment as.integer as.logicalas.null.default as.numeric as.raw asin asinh atan atanh attrattributes baseenv browser c call ceiling class Conj cos coshcospi cummax cummin cumprod cumsum digamma dim dimnamesemptyenv exp expression floor forceAndCall gamma gc.timeglobalenv Im interactive invisible is.array is.atomic is.callis.character is.complex is.double is.environment is.expressionis.finite is.function is.infinite is.integer is.languageis.list is.logical is.matrix is.na is.name is.nan is.nullis.numeric is.object is.pairlist is.raw is.recursive is.singleis.symbol lazyLoadDBfetch length lgamma list log max minmissing Mod names nargs nzchar oldClass on.exit pos.to.envproc.time prod quote range Re rep retracemem return roundseq_along seq_len seq.int sign signif sin sinh sinpi sqrtstandardGeneric substitute sum switch tan tanh tanpi tracememtrigamma trunc unclass untracemem UseMethod xtfrm"},contains:[e.COMMENT(/#'/,/$/,{contains:[{className:"doctag",begin:"@examples",starts:{contains:[{begin:/\n/},{begin:/#'\s*(?=@[a-zA-Z]+)/,endsParent:!0},{begin:/#'/,end:/$/,excludeBegin:!0}]}},{className:"doctag",begin:"@param",end:/$/,contains:[{className:"variable",variants:[{begin:n},{begin:/`(?:\\.|[^`])+`/}],endsParent:!0}]},{className:"doctag",begin:/@[a-zA-Z]+/},{className:"meta-keyword",begin:/\\[a-zA-Z]+/}]}),e.HASH_COMMENT_MODE,{className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[e.END_SAME_AS_BEGIN({begin:/[rR]"(-*)\(/,end:/\)(-*)"/}),e.END_SAME_AS_BEGIN({begin:/[rR]"(-*)\{/,end:/\}(-*)"/}),e.END_SAME_AS_BEGIN({begin:/[rR]"(-*)\[/,end:/\](-*)"/}),e.END_SAME_AS_BEGIN({begin:/[rR]'(-*)\(/,end:/\)(-*)'/}),e.END_SAME_AS_BEGIN({begin:/[rR]'(-*)\{/,end:/\}(-*)'/}),e.END_SAME_AS_BEGIN({begin:/[rR]'(-*)\[/,end:/\](-*)'/}),{begin:'"',end:'"',relevance:0},{begin:"'",end:"'",relevance:0}]},{className:"number",variants:[{begin:/(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/},{begin:/(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+([pP][+-]?\d+)?[Li]?/},{begin:/(?<![a-zA-Z0-9._])(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?[Li]?/}],relevance:0},{begin:"%",end:"%"},{begin:"`",end:"`",contains:[{begin:/\\./}]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("r",(()=>{"use strict";function e(...e){return e.map((e=>{
+return(a=e)?"string"==typeof a?a:a.source:null;var a})).join("")}return a=>{
+const n=/(?:(?:[a-zA-Z]|\.[._a-zA-Z])[._a-zA-Z0-9]*)|\.(?!\d)/;return{name:"R",
+illegal:/->/,keywords:{$pattern:n,
+keyword:"function if in break next repeat else for while",
+literal:"NULL NA TRUE FALSE Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10",
+built_in:"LETTERS letters month.abb month.name pi T F abs acos acosh all any anyNA Arg as.call as.character as.complex as.double as.environment as.integer as.logical as.null.default as.numeric as.raw asin asinh atan atanh attr attributes baseenv browser c call ceiling class Conj cos cosh cospi cummax cummin cumprod cumsum digamma dim dimnames emptyenv exp expression floor forceAndCall gamma gc.time globalenv Im interactive invisible is.array is.atomic is.call is.character is.complex is.double is.environment is.expression is.finite is.function is.infinite is.integer is.language is.list is.logical is.matrix is.na is.name is.nan is.null is.numeric is.object is.pairlist is.raw is.recursive is.single is.symbol lazyLoadDBfetch length lgamma list log max min missing Mod names nargs nzchar oldClass on.exit pos.to.env proc.time prod quote range Re rep retracemem return round seq_along seq_len seq.int sign signif sin sinh sinpi sqrt standardGeneric substitute sum switch tan tanh tanpi tracemem trigamma trunc unclass untracemem UseMethod xtfrm"
+},compilerExtensions:[(a,n)=>{if(!a.beforeMatch)return
+;if(a.starts)throw Error("beforeMatch cannot be used with starts")
+;const i=Object.assign({},a);Object.keys(a).forEach((e=>{delete a[e]
+})),a.begin=e(i.beforeMatch,e("(?=",i.begin,")")),a.starts={relevance:0,
+contains:[Object.assign(i,{endsParent:!0})]},a.relevance=0,delete i.beforeMatch
+}],contains:[a.COMMENT(/#'/,/$/,{contains:[{className:"doctag",
+begin:"@examples",starts:{contains:[{begin:/\n/},{begin:/#'\s*(?=@[a-zA-Z]+)/,
+endsParent:!0},{begin:/#'/,end:/$/,excludeBegin:!0}]}},{className:"doctag",
+begin:"@param",end:/$/,contains:[{className:"variable",variants:[{begin:n},{
+begin:/`(?:\\.|[^`\\])+`/}],endsParent:!0}]},{className:"doctag",
+begin:/@[a-zA-Z]+/},{className:"meta-keyword",begin:/\\[a-zA-Z]+/}]
+}),a.HASH_COMMENT_MODE,{className:"string",contains:[a.BACKSLASH_ESCAPE],
+variants:[a.END_SAME_AS_BEGIN({begin:/[rR]"(-*)\(/,end:/\)(-*)"/
+}),a.END_SAME_AS_BEGIN({begin:/[rR]"(-*)\{/,end:/\}(-*)"/
+}),a.END_SAME_AS_BEGIN({begin:/[rR]"(-*)\[/,end:/\](-*)"/
+}),a.END_SAME_AS_BEGIN({begin:/[rR]'(-*)\(/,end:/\)(-*)'/
+}),a.END_SAME_AS_BEGIN({begin:/[rR]'(-*)\{/,end:/\}(-*)'/
+}),a.END_SAME_AS_BEGIN({begin:/[rR]'(-*)\[/,end:/\](-*)'/}),{begin:'"',end:'"',
+relevance:0},{begin:"'",end:"'",relevance:0}]},{className:"number",relevance:0,
+beforeMatch:/([^a-zA-Z0-9._])/,variants:[{
+match:/0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/},{
+match:/0[xX][0-9a-fA-F]+([pP][+-]?\d+)?[Li]?/},{
+match:/(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?[Li]?/}]},{begin:"%",end:"%"},{
+begin:e(/[a-zA-Z][a-zA-Z_0-9]*/,"\\s+<-\\s+")},{begin:"`",end:"`",contains:[{
+begin:/\\./}]}]}}})());
\ 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..969192876f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
@@ -1 +1,40 @@
-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",(()=>{"use strict";return e=>{
+const n="~?[a-z$_][0-9a-zA-Z$_]*",a="`?[A-Z$_][0-9a-zA-Z$_]*",s="("+["||","++","**","+.","*","/","*.","/.","..."].map((e=>e.split("").map((e=>"\\"+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*)*)?\\))?){0,2}"
+},{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);const 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}]},v={
+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(v),{
+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:"--\x3e",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)},v]}}})());
\ 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..eef9d64b7c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/rib.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/rib.min.js
@@ -1 +1,5 @@
-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",(()=>{"use strict";return e=>({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 4606eeaff1..a80bad20c9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
@@ -1 +1,11 @@
-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",(()=>{"use strict";return e=>{
+const n="[a-zA-Z-_][^\\n{]+\\{",a={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 "+n,end:/\}/,
+keywords:"facet",contains:[a,e.HASH_COMMENT_MODE]},{begin:"^\\s*instance of "+n,
+end:/\}/,
+keywords:"name count channels instance-data instance-state instance of",
+illegal:/\S/,contains:["self",a,e.HASH_COMMENT_MODE]},{begin:"^"+n,end:/\}/,
+contains:[a,e.HASH_COMMENT_MODE]},e.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 af2cf1aa59..d4563e456e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/routeros.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/routeros.min.js
@@ -1 +1,21 @@
-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",(()=>{"use strict";return e=>{
+const r="foreach do while for if from to step else on-error and or not in",n="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:n,
+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(" :")
+},contains:[{variants:[{begin:/\/\*/,end:/\*\//},{begin:/\/\//,end:/$/},{
+begin:/<\//,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("+n.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|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)+"
+},{begin:/\.\./,relevance:0}]}]}}})());
\ 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..043591bae5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/rsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/rsl.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return e=>({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 4b52defe67..45333aff75 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ruby.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ruby.min.js
@@ -1 +1,48 @@
-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",(()=>{"use strict";function e(...e){
+return e.map((e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n
+})).join("")}return n=>{
+const a="([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)",i={
+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 __FILE__",
+built_in:"proc lambda",literal:"true false nil"},s={className:"doctag",
+begin:"@[A-Za-z]+"},r={begin:"#<",end:">"},b=[n.COMMENT("#","$",{contains:[s]
+}),n.COMMENT("^=begin","^=end",{contains:[s],relevance:10
+}),n.COMMENT("^__END__","\\n$")],c={className:"subst",begin:/#\{/,end:/\}/,
+keywords:i},t={className:"string",contains:[n.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})/},{begin:/\B\?(\\x[A-Fa-f0-9]{1,2})/},{
+begin:/\B\?(\\u\{?[A-Fa-f0-9]{1,6}\}?)/},{
+begin:/\B\?(\\M-\\C-|\\M-\\c|\\c\\M-|\\M-|\\C-\\M-)[\x20-\x7e]/},{
+begin:/\B\?\\(c|C-)[\x20-\x7e]/},{begin:/\B\?\\?\S/},{
+begin:/<<[-~]?'?(\w+)\n(?:[^\n]*\n)*?\s*\1\b/,returnBegin:!0,contains:[{
+begin:/<<[-~]?'?/},n.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,
+contains:[n.BACKSLASH_ESCAPE,c]})]}]},g="[0-9](_?[0-9])*",d={className:"number",
+relevance:0,variants:[{
+begin:`\\b([1-9](_?[0-9])*|0)(\\.(${g}))?([eE][+-]?(${g})|r)?i?\\b`},{
+begin:"\\b0[dD][0-9](_?[0-9])*r?i?\\b"},{begin:"\\b0[bB][0-1](_?[0-1])*r?i?\\b"
+},{begin:"\\b0[oO][0-7](_?[0-7])*r?i?\\b"},{
+begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*r?i?\\b"},{
+begin:"\\b0(_?[0-7])+r?i?\\b"}]},l={className:"params",begin:"\\(",end:"\\)",
+endsParent:!0,keywords:i},o=[t,{className:"class",beginKeywords:"class module",
+end:"$|;",illegal:/=/,contains:[n.inherit(n.TITLE_MODE,{
+begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|!)?"}),{begin:"<\\s*",contains:[{
+begin:"("+n.IDENT_RE+"::)?"+n.IDENT_RE,relevance:0}]}].concat(b)},{
+className:"function",begin:e(/def\s*/,(_=a+"\\s*(\\(|;|$)",e("(?=",_,")"))),
+relevance:0,keywords:"def",end:"$|;",contains:[n.inherit(n.TITLE_MODE,{begin:a
+}),l].concat(b)},{begin:n.IDENT_RE+"::"},{className:"symbol",
+begin:n.UNDERSCORE_IDENT_RE+"(!|\\?)?:",relevance:0},{className:"symbol",
+begin:":(?!\\s)",contains:[t,{begin:a}],relevance:0},d,{className:"variable",
+begin:"(\\$\\W)|((\\$|@@?)(\\w+))(?=[^@$?])(?![A-Za-z])(?![@$?'])"},{
+className:"params",begin:/\|/,end:/\|/,relevance:0,keywords:i},{
+begin:"("+n.RE_STARTERS_RE+"|unless)\\s*",keywords:"unless",contains:[{
+className:"regexp",contains:[n.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,b),relevance:0}].concat(r,b);var _;c.contains=o,l.contains=o
+;const E=[{begin:/^\s*=>/,starts:{end:"$",contains:o}},{className:"meta",
+begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d+(p\\d+)?[^\\d][^>]+>)(?=[ ])",
+starts:{end:"$",contains:o}}];return b.unshift(r),{name:"Ruby",
+aliases:["rb","gemspec","podspec","thor","irb"],keywords:i,illegal:/\/\*/,
+contains:[n.SHEBANG({binary:"ruby"})].concat(E).concat(b).concat(o)}}})());
\ 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..ef0bd72322 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
@@ -1 +1,8 @@
-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",(()=>{"use strict";return T=>({
+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+",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 37ec123f25..495d20eaf1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/rust.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/rust.min.js
@@ -1 +1,21 @@
-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",(()=>{"use strict";return e=>{
+const 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 5c03807171..914654b33f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sas.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sas.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";return e=>({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 2ab49f3af8..1027c473e6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scala.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scala.min.js
@@ -1 +1,20 @@
-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",(()=>{"use strict";return e=>{const n={
+className:"subst",variants:[{begin:"\\$[A-Za-z0-9_]+"},{begin:/\$\{/,end:/\}/}]
+},a={className:"string",variants:[{begin:'"""',end:'"""'},{begin:'"',end:'"',
+illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{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:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{
+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 9ab4af08d4..27c5698ec1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scheme.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scheme.min.js
@@ -1 +1,17 @@
-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",(()=>{"use strict";return e=>{
+const 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},g={variants:[{
+begin:/'/},{begin:"`"}],contains:[{begin:"\\(",end:"\\)",
+contains:["self",r,i,a,s,l]}]},u={className:"name",relevance:0,begin:t,
+keywords:n},d={variants:[{begin:"\\(",end:"\\)"},{begin:"\\[",end:"\\]"}],
+contains:[{begin:/lambda/,endsWithParent:!0,returnBegin:!0,contains:[u,{
+endsParent:!0,variants:[{begin:/\(/,end:/\)/},{begin:/\[/,end:/\]/}],
+contains:[s]}]},u,o]};return o.contains=[r,a,i,s,l,g,d].concat(c),{
+name:"Scheme",illegal:/\S/,contains:[e.SHEBANG(),a,i,l,g,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..f5ae31f56e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scilab.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scilab.min.js
@@ -1 +1,12 @@
-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",(()=>{"use strict";return e=>{
+const 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]*[\\.']+",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 96d9774934..7da85e508c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scss.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scss.min.js
@@ -1 +1,25 @@
-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",(()=>{"use strict"
+;const e=["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","main","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"],t=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],i=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],r=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],o=["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-display","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-variation-settings","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","src","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()
+;return a=>{const n=(e=>({IMPORTANT:{className:"meta",begin:"!important"},
+HEXCOLOR:{className:"number",begin:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"},
+ATTRIBUTE_SELECTOR_MODE:{className:"selector-attr",begin:/\[/,end:/\]/,
+illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]}
+}))(a),l=r,s=i,d="@[a-z-]+",c={className:"variable",
+begin:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b"};return{name:"SCSS",case_insensitive:!0,
+illegal:"[=/|']",contains:[a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,{
+className:"selector-id",begin:"#[A-Za-z0-9_-]+",relevance:0},{
+className:"selector-class",begin:"\\.[A-Za-z0-9_-]+",relevance:0
+},n.ATTRIBUTE_SELECTOR_MODE,{className:"selector-tag",
+begin:"\\b("+e.join("|")+")\\b",relevance:0},{className:"selector-pseudo",
+begin:":("+s.join("|")+")"},{className:"selector-pseudo",
+begin:"::("+l.join("|")+")"},c,{begin:/\(/,end:/\)/,contains:[a.CSS_NUMBER_MODE]
+},{className:"attribute",begin:"\\b("+o.join("|")+")\\b"},{
+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:[c,n.HEXCOLOR,a.CSS_NUMBER_MODE,a.QUOTE_STRING_MODE,a.APOS_STRING_MODE,n.IMPORTANT]
+},{begin:"@(page|font-face)",lexemes:d,keywords:"@page @font-face"},{begin:"@",
+end:"[{;]",returnBegin:!0,keywords:{$pattern:/[a-z-]+/,
+keyword:"and or not only",attribute:t.join(" ")},contains:[{begin:d,
+className:"keyword"},{begin:/[a-z-]+(?=:)/,className:"attribute"
+},c,a.QUOTE_STRING_MODE,a.APOS_STRING_MODE,n.HEXCOLOR,a.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 713ebe819e..a633b148c5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/shell.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/shell.min.js
@@ -1 +1,4 @@
-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",(()=>{"use strict";return s=>({
+name:"Shell Session",aliases:["console"],contains:[{className:"meta",
+begin:/^\s{0,3}[/~\w\d[\]()@-]*[>%$#]/,starts:{end:/[^\\](?=\s*$)/,
+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 d280e6ce9d..192f771ead 100644
--- a/vendor/assets/javascripts/highlightjs/languages/smali.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/smali.min.js
@@ -1 +1,12 @@
-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",(()=>{"use strict";return e=>{
+const 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 05ef50cf30..dbd1e50905 100644
--- a/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return e=>{
+const n="[a-z][a-zA-Z0-9_]*",a={className:"string",begin:"\\$.{1}"},s={
+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:n+":",relevance:0
+},e.C_NUMBER_MODE,s,a,{begin:"\\|[ ]*"+n+"([ ]+"+n+")*[ ]*\\|",returnBegin:!0,
+end:/\|/,illegal:/\S/,contains:[{begin:"(\\|[ ]*)?"+n}]},{begin:"#\\(",
+end:"\\)",contains:[e.APOS_STRING_MODE,a,e.C_NUMBER_MODE,s]}]}}})());
\ 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..ab840b6f8c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sml.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";return e=>({
+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 730aacd285..46a5ed13c9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sqf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sqf.min.js
@@ -1 +1,15 @@
-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",(()=>{"use strict";return e=>{const 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 3e49bf82ea..b57f035789 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sql.min.js
@@ -1 +1,18 @@
-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",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function r(...r){
+return r.map((r=>e(r))).join("")}function t(...r){
+return"("+r.map((r=>e(r))).join("|")+")"}return e=>{
+const n=e.COMMENT("--","$"),a=["true","false","unknown"],i=["bigint","binary","blob","boolean","char","character","clob","date","dec","decfloat","decimal","float","int","integer","interval","nchar","nclob","national","numeric","real","row","smallint","time","timestamp","varchar","varying","varbinary"],s=["abs","acos","array_agg","asin","atan","avg","cast","ceil","ceiling","coalesce","corr","cos","cosh","count","covar_pop","covar_samp","cume_dist","dense_rank","deref","element","exp","extract","first_value","floor","json_array","json_arrayagg","json_exists","json_object","json_objectagg","json_query","json_table","json_table_primitive","json_value","lag","last_value","lead","listagg","ln","log","log10","lower","max","min","mod","nth_value","ntile","nullif","percent_rank","percentile_cont","percentile_disc","position","position_regex","power","rank","regr_avgx","regr_avgy","regr_count","regr_intercept","regr_r2","regr_slope","regr_sxx","regr_sxy","regr_syy","row_number","sin","sinh","sqrt","stddev_pop","stddev_samp","substring","substring_regex","sum","tan","tanh","translate","translate_regex","treat","trim","trim_array","unnest","upper","value_of","var_pop","var_samp","width_bucket"],o=["create table","insert into","primary key","foreign key","not null","alter table","add constraint","grouping sets","on overflow","character set","respect nulls","ignore nulls","nulls first","nulls last","depth first","breadth first"],c=s,l=["abs","acos","all","allocate","alter","and","any","are","array","array_agg","array_max_cardinality","as","asensitive","asin","asymmetric","at","atan","atomic","authorization","avg","begin","begin_frame","begin_partition","between","bigint","binary","blob","boolean","both","by","call","called","cardinality","cascaded","case","cast","ceil","ceiling","char","char_length","character","character_length","check","classifier","clob","close","coalesce","collate","collect","column","commit","condition","connect","constraint","contains","convert","copy","corr","corresponding","cos","cosh","count","covar_pop","covar_samp","create","cross","cube","cume_dist","current","current_catalog","current_date","current_default_transform_group","current_path","current_role","current_row","current_schema","current_time","current_timestamp","current_path","current_role","current_transform_group_for_type","current_user","cursor","cycle","date","day","deallocate","dec","decimal","decfloat","declare","default","define","delete","dense_rank","deref","describe","deterministic","disconnect","distinct","double","drop","dynamic","each","element","else","empty","end","end_frame","end_partition","end-exec","equals","escape","every","except","exec","execute","exists","exp","external","extract","false","fetch","filter","first_value","float","floor","for","foreign","frame_row","free","from","full","function","fusion","get","global","grant","group","grouping","groups","having","hold","hour","identity","in","indicator","initial","inner","inout","insensitive","insert","int","integer","intersect","intersection","interval","into","is","join","json_array","json_arrayagg","json_exists","json_object","json_objectagg","json_query","json_table","json_table_primitive","json_value","lag","language","large","last_value","lateral","lead","leading","left","like","like_regex","listagg","ln","local","localtime","localtimestamp","log","log10","lower","match","match_number","match_recognize","matches","max","member","merge","method","min","minute","mod","modifies","module","month","multiset","national","natural","nchar","nclob","new","no","none","normalize","not","nth_value","ntile","null","nullif","numeric","octet_length","occurrences_regex","of","offset","old","omit","on","one","only","open","or","order","out","outer","over","overlaps","overlay","parameter","partition","pattern","per","percent","percent_rank","percentile_cont","percentile_disc","period","portion","position","position_regex","power","precedes","precision","prepare","primary","procedure","ptf","range","rank","reads","real","recursive","ref","references","referencing","regr_avgx","regr_avgy","regr_count","regr_intercept","regr_r2","regr_slope","regr_sxx","regr_sxy","regr_syy","release","result","return","returns","revoke","right","rollback","rollup","row","row_number","rows","running","savepoint","scope","scroll","search","second","seek","select","sensitive","session_user","set","show","similar","sin","sinh","skip","smallint","some","specific","specifictype","sql","sqlexception","sqlstate","sqlwarning","sqrt","start","static","stddev_pop","stddev_samp","submultiset","subset","substring","substring_regex","succeeds","sum","symmetric","system","system_time","system_user","table","tablesample","tan","tanh","then","time","timestamp","timezone_hour","timezone_minute","to","trailing","translate","translate_regex","translation","treat","trigger","trim","trim_array","true","truncate","uescape","union","unique","unknown","unnest","update   ","upper","user","using","value","values","value_of","var_pop","var_samp","varbinary","varchar","varying","versioning","when","whenever","where","width_bucket","window","with","within","without","year","add","asc","collation","desc","final","first","last","view"].filter((e=>!s.includes(e))),u={
+begin:r(/\b/,t(...c),/\s*\(/),keywords:{built_in:c}};return{name:"SQL",
+case_insensitive:!0,illegal:/[{}]|<\//,keywords:{$pattern:/\b[\w\.]+/,
+keyword:((e,{exceptions:r,when:t}={})=>{const n=t
+;return r=r||[],e.map((e=>e.match(/\|\d+$/)||r.includes(e)?e:n(e)?e+"|0":e))
+})(l,{when:e=>e.length<3}),literal:a,type:i,
+built_in:["current_catalog","current_date","current_default_transform_group","current_path","current_role","current_schema","current_transform_group_for_type","current_user","session_user","system_time","system_user","current_time","localtime","current_timestamp","localtimestamp"]
+},contains:[{begin:t(...o),keywords:{$pattern:/[\w\.]+/,keyword:l.concat(o),
+literal:a,type:i}},{className:"type",
+begin:t("double precision","large object","with timezone","without timezone")
+},u,{className:"variable",begin:/@[a-z0-9]+/},{className:"string",variants:[{
+begin:/'/,end:/'/,contains:[{begin:/''/}]}]},{begin:/"/,end:/"/,contains:[{
+begin:/""/}]},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,n,{className:"operator",
+begin:/[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,relevance:0}]}}})());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/sql_more.min.js b/vendor/assets/javascripts/highlightjs/languages/sql_more.min.js
new file mode 100644
index 0000000000..02a6fb3297
--- /dev/null
+++ b/vendor/assets/javascripts/highlightjs/languages/sql_more.min.js
@@ -0,0 +1,13 @@
+hljs.registerLanguage("sql_more",(()=>{"use strict";return e=>{
+var t=e.COMMENT("--","$");return{name:"SQL (more)",aliases:["mysql","oracle"],
+disableAutodetect:!0,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 1dcb6b78e6..66e62a746c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/stan.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/stan.min.js
@@ -1 +1,15 @@
-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",(()=>{"use strict";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"]),
+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 6ad1868312..906f7c4a39 100644
--- a/vendor/assets/javascripts/highlightjs/languages/stata.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/stata.min.js
@@ -1 +1,10 @@
-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",(()=>{"use strict";return e=>({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 b46e0e0ac9..d866a8d83a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/step21.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/step21.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return e=>({
+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 96c0aa18f4..0e404857f5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/stylus.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/stylus.min.js
@@ -1 +1,27 @@
-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",(()=>{"use strict"
+;const e=["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","main","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"],t=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],i=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],o=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],r=["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-display","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-variation-settings","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","src","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()
+;return n=>{const a=(e=>({IMPORTANT:{className:"meta",begin:"!important"},
+HEXCOLOR:{className:"number",begin:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"},
+ATTRIBUTE_SELECTOR_MODE:{className:"selector-attr",begin:/\[/,end:/\]/,
+illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]}}))(n),s={
+className:"variable",begin:"\\$"+n.IDENT_RE},l="(?=[.\\s\\n[:,(])";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:[n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,a.HEXCOLOR,{
+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("+e.join("|")+")"+l,className:"selector-tag"},{
+className:"selector-pseudo",begin:"&?:("+i.join("|")+")"+l},{
+className:"selector-pseudo",begin:"&?::("+o.join("|")+")"+l
+},a.ATTRIBUTE_SELECTOR_MODE,{className:"keyword",begin:/@media/,starts:{
+end:/[{;}]/,keywords:{$pattern:/[a-z-]+/,keyword:"and or not only",
+attribute:t.join(" ")},contains:[n.CSS_NUMBER_MODE]}},{className:"keyword",
+begin:"@((-(o|moz|ms|webkit)-)?(charset|css|debug|extend|font-face|for|import|include|keyframes|media|mixin|page|warn|while))\\b"
+},s,n.CSS_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:[a.HEXCOLOR,s,n.APOS_STRING_MODE,n.CSS_NUMBER_MODE,n.QUOTE_STRING_MODE]
+}]},{className:"attribute",begin:"\\b("+r.join("|")+")\\b",starts:{end:/;|$/,
+contains:[a.HEXCOLOR,s,n.APOS_STRING_MODE,n.QUOTE_STRING_MODE,n.CSS_NUMBER_MODE,n.C_BLOCK_COMMENT_MODE,a.IMPORTANT],
+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 5796a4fa37..0b89fab82d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/subunit.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/subunit.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return s=>({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 584096ba69..744798754c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/swift.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/swift.min.js
@@ -1 +1,61 @@
-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",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(e){return a("(?=",e,")")}
+function a(...n){return n.map((n=>e(n))).join("")}function t(...n){
+return"("+n.map((n=>e(n))).join("|")+")"}
+const i=e=>a(/\b/,e,/\w$/.test(e)?/\b/:/\B/),s=["Protocol","Type"].map(i),u=["init","self"].map(i),c=["Any","Self"],r=["associatedtype",/as\?/,/as!/,"as","break","case","catch","class","continue","convenience","default","defer","deinit","didSet","do","dynamic","else","enum","extension","fallthrough",/fileprivate\(set\)/,"fileprivate","final","for","func","get","guard","if","import","indirect","infix",/init\?/,/init!/,"inout",/internal\(set\)/,"internal","in","is","lazy","let","mutating","nonmutating",/open\(set\)/,"open","operator","optional","override","postfix","precedencegroup","prefix",/private\(set\)/,"private","protocol",/public\(set\)/,"public","repeat","required","rethrows","return","set","some","static","struct","subscript","super","switch","throws","throw",/try\?/,/try!/,"try","typealias",/unowned\(safe\)/,/unowned\(unsafe\)/,"unowned","var","weak","where","while","willSet"],o=["false","nil","true"],l=["assignment","associativity","higherThan","left","lowerThan","none","right"],m=["#colorLiteral","#column","#dsohandle","#else","#elseif","#endif","#error","#file","#fileID","#fileLiteral","#filePath","#function","#if","#imageLiteral","#keyPath","#line","#selector","#sourceLocation","#warn_unqualified_access","#warning"],d=["abs","all","any","assert","assertionFailure","debugPrint","dump","fatalError","getVaList","isKnownUniquelyReferenced","max","min","numericCast","pointwiseMax","pointwiseMin","precondition","preconditionFailure","print","readLine","repeatElement","sequence","stride","swap","swift_unboxFromSwiftValueWithType","transcode","type","unsafeBitCast","unsafeDowncast","withExtendedLifetime","withUnsafeMutablePointer","withUnsafePointer","withVaList","withoutActuallyEscaping","zip"],p=t(/[/=\-+!*%<>&|^~?]/,/[\u00A1-\u00A7]/,/[\u00A9\u00AB]/,/[\u00AC\u00AE]/,/[\u00B0\u00B1]/,/[\u00B6\u00BB\u00BF\u00D7\u00F7]/,/[\u2016-\u2017]/,/[\u2020-\u2027]/,/[\u2030-\u203E]/,/[\u2041-\u2053]/,/[\u2055-\u205E]/,/[\u2190-\u23FF]/,/[\u2500-\u2775]/,/[\u2794-\u2BFF]/,/[\u2E00-\u2E7F]/,/[\u3001-\u3003]/,/[\u3008-\u3020]/,/[\u3030]/),F=t(p,/[\u0300-\u036F]/,/[\u1DC0-\u1DFF]/,/[\u20D0-\u20FF]/,/[\uFE00-\uFE0F]/,/[\uFE20-\uFE2F]/),b=a(p,F,"*"),h=t(/[a-zA-Z_]/,/[\u00A8\u00AA\u00AD\u00AF\u00B2-\u00B5\u00B7-\u00BA]/,/[\u00BC-\u00BE\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF]/,/[\u0100-\u02FF\u0370-\u167F\u1681-\u180D\u180F-\u1DBF]/,/[\u1E00-\u1FFF]/,/[\u200B-\u200D\u202A-\u202E\u203F-\u2040\u2054\u2060-\u206F]/,/[\u2070-\u20CF\u2100-\u218F\u2460-\u24FF\u2776-\u2793]/,/[\u2C00-\u2DFF\u2E80-\u2FFF]/,/[\u3004-\u3007\u3021-\u302F\u3031-\u303F\u3040-\uD7FF]/,/[\uF900-\uFD3D\uFD40-\uFDCF\uFDF0-\uFE1F\uFE30-\uFE44]/,/[\uFE47-\uFEFE\uFF00-\uFFFD]/),f=t(h,/\d/,/[\u0300-\u036F\u1DC0-\u1DFF\u20D0-\u20FF\uFE20-\uFE2F]/),w=a(h,f,"*"),y=a(/[A-Z]/,f,"*"),g=["autoclosure",a(/convention\(/,t("swift","block","c"),/\)/),"discardableResult","dynamicCallable","dynamicMemberLookup","escaping","frozen","GKInspectable","IBAction","IBDesignable","IBInspectable","IBOutlet","IBSegueAction","inlinable","main","nonobjc","NSApplicationMain","NSCopying","NSManaged",a(/objc\(/,w,/\)/),"objc","objcMembers","propertyWrapper","requires_stored_property_inits","testable","UIApplicationMain","unknown","usableFromInline"],E=["iOS","iOSApplicationExtension","macOS","macOSApplicationExtension","macCatalyst","macCatalystApplicationExtension","watchOS","watchOSApplicationExtension","tvOS","tvOSApplicationExtension","swift"]
+;return e=>{const p={match:/\s+/,relevance:0},h=e.COMMENT("/\\*","\\*/",{
+contains:["self"]}),v=[e.C_LINE_COMMENT_MODE,h],N={className:"keyword",
+begin:a(/\./,n(t(...s,...u))),end:t(...s,...u),excludeBegin:!0},A={
+match:a(/\./,t(...r)),relevance:0
+},C=r.filter((e=>"string"==typeof e)).concat(["_|0"]),_={variants:[{
+className:"keyword",
+match:t(...r.filter((e=>"string"!=typeof e)).concat(c).map(i),...u)}]},D={
+$pattern:t(/\b\w+/,/#\w+/),keyword:C.concat(m),literal:o},B=[N,A,_],k=[{
+match:a(/\./,t(...d)),relevance:0},{className:"built_in",
+match:a(/\b/,t(...d),/(?=\()/)}],M={match:/->/,relevance:0},S=[M,{
+className:"operator",relevance:0,variants:[{match:b},{match:`\\.(\\.|${F})+`}]
+}],x="([0-9a-fA-F]_*)+",I={className:"number",relevance:0,variants:[{
+match:"\\b(([0-9]_*)+)(\\.(([0-9]_*)+))?([eE][+-]?(([0-9]_*)+))?\\b"},{
+match:`\\b0x(${x})(\\.(${x}))?([pP][+-]?(([0-9]_*)+))?\\b`},{
+match:/\b0o([0-7]_*)+\b/},{match:/\b0b([01]_*)+\b/}]},O=(e="")=>({
+className:"subst",variants:[{match:a(/\\/,e,/[0\\tnr"']/)},{
+match:a(/\\/,e,/u\{[0-9a-fA-F]{1,8}\}/)}]}),T=(e="")=>({className:"subst",
+match:a(/\\/,e,/[\t ]*(?:[\r\n]|\r\n)/)}),L=(e="")=>({className:"subst",
+label:"interpol",begin:a(/\\/,e,/\(/),end:/\)/}),P=(e="")=>({begin:a(e,/"""/),
+end:a(/"""/,e),contains:[O(e),T(e),L(e)]}),$=(e="")=>({begin:a(e,/"/),
+end:a(/"/,e),contains:[O(e),L(e)]}),K={className:"string",
+variants:[P(),P("#"),P("##"),P("###"),$(),$("#"),$("##"),$("###")]},j={
+match:a(/`/,w,/`/)},z=[j,{className:"variable",match:/\$\d+/},{
+className:"variable",match:`\\$${f}+`}],q=[{match:/(@|#)available/,
+className:"keyword",starts:{contains:[{begin:/\(/,end:/\)/,keywords:E,
+contains:[...S,I,K]}]}},{className:"keyword",match:a(/@/,t(...g))},{
+className:"meta",match:a(/@/,w)}],U={match:n(/\b[A-Z]/),relevance:0,contains:[{
+className:"type",
+match:a(/(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)/,f,"+")
+},{className:"type",match:y,relevance:0},{match:/[?!]+/,relevance:0},{
+match:/\.\.\./,relevance:0},{match:a(/\s+&\s+/,n(y)),relevance:0}]},Z={
+begin:/</,end:/>/,keywords:D,contains:[...v,...B,...q,M,U]};U.contains.push(Z)
+;const G={begin:/\(/,end:/\)/,relevance:0,keywords:D,contains:["self",{
+match:a(w,/\s*:/),keywords:"_|0",relevance:0
+},...v,...B,...k,...S,I,K,...z,...q,U]},H={beginKeywords:"func",contains:[{
+className:"title",match:t(j.match,w,b),endsParent:!0,relevance:0},p]},R={
+begin:/</,end:/>/,contains:[...v,U]},V={begin:/\(/,end:/\)/,keywords:D,
+contains:[{begin:t(n(a(w,/\s*:/)),n(a(w,/\s+/,w,/\s*:/))),end:/:/,relevance:0,
+contains:[{className:"keyword",match:/\b_\b/},{className:"params",match:w}]
+},...v,...B,...S,I,K,...q,U,G],endsParent:!0,illegal:/["']/},W={
+className:"function",match:n(/\bfunc\b/),contains:[H,R,V,p],illegal:[/\[/,/%/]
+},X={className:"function",match:/\b(subscript|init[?!]?)\s*(?=[<(])/,keywords:{
+keyword:"subscript init init? init!",$pattern:/\w+[?!]?/},contains:[R,V,p],
+illegal:/\[|%/},J={beginKeywords:"operator",end:e.MATCH_NOTHING_RE,contains:[{
+className:"title",match:b,endsParent:!0,relevance:0}]},Q={
+beginKeywords:"precedencegroup",end:e.MATCH_NOTHING_RE,contains:[{
+className:"title",match:y,relevance:0},{begin:/{/,end:/}/,relevance:0,
+endsParent:!0,keywords:[...l,...o],contains:[U]}]};for(const e of K.variants){
+const n=e.contains.find((e=>"interpol"===e.label));n.keywords=D
+;const a=[...B,...k,...S,I,K,...z];n.contains=[...a,{begin:/\(/,end:/\)/,
+contains:["self",...a]}]}return{name:"Swift",keywords:D,contains:[...v,W,X,{
+className:"class",beginKeywords:"struct protocol class extension enum",
+end:"\\{",excludeEnd:!0,keywords:D,contains:[e.inherit(e.TITLE_MODE,{
+begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/}),...B]},J,Q,{
+beginKeywords:"import",end:/$/,contains:[...v],relevance:0
+},...B,...k,...S,I,K,...z,...q,U,G]}}})());
\ 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..85f10435a7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
@@ -1 +1,6 @@
-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",(()=>{"use strict";return e=>({
+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 148836811d..0635d4d4f1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tap.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tap.min.js
@@ -1 +1,7 @@
-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",(()=>{"use strict";return e=>({
+name:"Test Anything Protocol",case_insensitive:!0,
+contains:[e.HASH_COMMENT_MODE,{className:"meta",variants:[{
+begin:"^TAP version (\\d+)$"},{begin:"^1\\.\\.(\\d+)$"}]},{begin:/---$/,
+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 f49662b24f..cd652fb026 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tcl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tcl.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";return e=>({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 7b89a56e9b..730d2b0130 100644
--- a/vendor/assets/javascripts/highlightjs/languages/thrift.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/thrift.min.js
@@ -1 +1,10 @@
-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",(()=>{"use strict";return e=>{
+const t="bool byte i16 i32 i64 double string binary";return{name:"Thrift",
+keywords:{
+keyword:"namespace const typedef struct enum service exception void oneway set list map required optional",
+built_in:t,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:t,
+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 9da6d9f3ff..07eddff042 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tp.min.js
@@ -1 +1,18 @@
-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",(()=>{"use strict";return O=>{const 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 5dd66f42c8..d9b6814755 100644
--- a/vendor/assets/javascripts/highlightjs/languages/twig.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/twig.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";return 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((e=>"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 636139370c..f96782428a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/typescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/typescript.min.js
@@ -1 +1,75 @@
-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",(()=>{"use strict"
+;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["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"],a=["true","false","null","undefined","NaN","Infinity"],s=[].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 t(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 i=>{
+const c={$pattern:e,
+keyword:n.concat(["type","namespace","typedef","interface","public","private","protected","implements","declare","abstract","readonly"]),
+literal:a,
+built_in:s.concat(["any","void","number","boolean","string","object","never","enum"])
+},o={className:"meta",begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},l=(e,n,a)=>{
+const s=e.contains.findIndex((e=>e.label===n))
+;if(-1===s)throw Error("can not find mode to replace");e.contains.splice(s,1,a)
+},b=(i=>{const c=e,o={begin:/<[A-Za-z0-9\\._:-]+/,
+end:/\/[A-Za-z0-9\\._:-]+>|\/>/,isTrulyOpeningTag:(e,n)=>{
+const a=e[0].length+e.index,s=e.input[a];"<"!==s?">"===s&&(((e,{after:n})=>{
+const a="</"+e[0].slice(1);return-1!==e.input.indexOf(a,n)})(e,{after:a
+})||n.ignoreMatch()):n.ignoreMatch()}},l={$pattern:e,keyword:n,literal:a,
+built_in:s},b="\\.([0-9](_?[0-9])*)",d="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",g={
+className:"number",variants:[{
+begin:`(\\b(${d})((${b})|\\.)?|(${b}))[eE][+-]?([0-9](_?[0-9])*)\\b`},{
+begin:`\\b(${d})\\b((${b})\\b|\\.)?|(${b})\\b`},{
+begin:"\\b(0|[1-9](_?[0-9])*)n\\b"},{
+begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b"},{
+begin:"\\b0[bB][0-1](_?[0-1])*n?\\b"},{begin:"\\b0[oO][0-7](_?[0-7])*n?\\b"},{
+begin:"\\b0[0-7]+n?\\b"}],relevance:0},u={className:"subst",begin:"\\$\\{",
+end:"\\}",keywords:l,contains:[]},E={begin:"html`",end:"",starts:{end:"`",
+returnEnd:!1,contains:[i.BACKSLASH_ESCAPE,u],subLanguage:"xml"}},m={
+begin:"css`",end:"",starts:{end:"`",returnEnd:!1,
+contains:[i.BACKSLASH_ESCAPE,u],subLanguage:"css"}},_={className:"string",
+begin:"`",end:"`",contains:[i.BACKSLASH_ESCAPE,u]},y={className:"comment",
+variants:[i.COMMENT(/\/\*\*(?!\/)/,"\\*/",{relevance:0,contains:[{
+className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type",begin:"\\{",
+end:"\\}",relevance:0},{className:"variable",begin:c+"(?=\\s*(-)|$)",
+endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]
+}),i.C_BLOCK_COMMENT_MODE,i.C_LINE_COMMENT_MODE]
+},p=[i.APOS_STRING_MODE,i.QUOTE_STRING_MODE,E,m,_,g,i.REGEXP_MODE]
+;u.contains=p.concat({begin:/\{/,end:/\}/,keywords:l,contains:["self"].concat(p)
+});const N=[].concat(y,u.contains),f=N.concat([{begin:/\(/,end:/\)/,keywords:l,
+contains:["self"].concat(N)}]),A={className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:l,contains:f};return{name:"Javascript",
+aliases:["js","jsx","mjs","cjs"],keywords:l,exports:{PARAMS_CONTAINS:f},
+illegal:/#(?![$_A-z])/,contains:[i.SHEBANG({label:"shebang",binary:"node",
+relevance:5}),{label:"use_strict",className:"meta",relevance:10,
+begin:/^\s*['"]use (strict|asm)['"]/
+},i.APOS_STRING_MODE,i.QUOTE_STRING_MODE,E,m,_,y,g,{
+begin:r(/[{,\n]\s*/,t(r(/(((\/\/.*$)|(\/\*(\*[^/]|[^*])*\*\/))\s*)*/,c+"\\s*:"))),
+relevance:0,contains:[{className:"attr",begin:c+t("\\s*:"),relevance:0}]},{
+begin:"("+i.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
+keywords:"return throw case",contains:[y,i.REGEXP_MODE,{className:"function",
+begin:"(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+i.UNDERSCORE_IDENT_RE+")\\s*=>",
+returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{
+begin:i.UNDERSCORE_IDENT_RE,relevance:0},{className:null,begin:/\(\s*\)/,skip:!0
+},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:l,contains:f}]}]
+},{begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{
+variants:[{begin:"<>",end:"</>"},{begin:o.begin,"on:begin":o.isTrulyOpeningTag,
+end:o.end}],subLanguage:"xml",contains:[{begin:o.begin,end:o.end,skip:!0,
+contains:["self"]}]}],relevance:0},{className:"function",
+beginKeywords:"function",end:/[{;]/,excludeEnd:!0,keywords:l,
+contains:["self",i.inherit(i.TITLE_MODE,{begin:c}),A],illegal:/%/},{
+beginKeywords:"while if switch catch for"},{className:"function",
+begin:i.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{",
+returnBegin:!0,contains:[A,i.inherit(i.TITLE_MODE,{begin:c})]},{variants:[{
+begin:"\\."+c},{begin:"\\$"+c}],relevance:0},{className:"class",
+beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"[\]]/,contains:[{
+beginKeywords:"extends"},i.UNDERSCORE_TITLE_MODE]},{begin:/\b(?=constructor)/,
+end:/[{;]/,excludeEnd:!0,contains:[i.inherit(i.TITLE_MODE,{begin:c}),"self",A]
+},{begin:"(get|set)\\s+(?="+c+"\\()",end:/\{/,keywords:"get set",
+contains:[i.inherit(i.TITLE_MODE,{begin:c}),{begin:/\(\)/},A]},{begin:/\$[(.]/}]
+}})(i)
+;return Object.assign(b.keywords,c),b.exports.PARAMS_CONTAINS.push(o),b.contains=b.contains.concat([o,{
+beginKeywords:"namespace",end:/\{/,excludeEnd:!0},{beginKeywords:"interface",
+end:/\{/,excludeEnd:!0,keywords:"interface extends"
+}]),l(b,"shebang",i.SHEBANG()),l(b,"use_strict",{className:"meta",relevance:10,
+begin:/^\s*['"]use strict['"]/
+}),b.contains.find((e=>"function"===e.className)).relevance=0,Object.assign(b,{
+name:"TypeScript",aliases:["ts"]}),b}})());
\ 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..213b5d26fc 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vala.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vala.min.js
@@ -1 +1,9 @@
-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",(()=>{"use strict";return e=>({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 93630f628b..a10d4c2022 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
@@ -1 +1,26 @@
-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",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(...n){
+return n.map((n=>e(n))).join("")}function t(...n){
+return"("+n.map((n=>e(n))).join("|")+")"}return e=>{
+const a=/\d{1,2}\/\d{1,2}\/\d{4}/,i=/\d{4}-\d{1,2}-\d{1,2}/,s=/(\d|1[012])(:\d+){0,2} *(AM|PM)/,r=/\d{1,2}(:\d{1,2}){1,2}/,o={
+className:"literal",variants:[{begin:n(/# */,t(i,a),/ *#/)},{
+begin:n(/# */,r,/ *#/)},{begin:n(/# */,s,/ *#/)},{
+begin:n(/# */,t(i,a),/ +/,t(s,r),/ *#/)}]},l=e.COMMENT(/'''/,/$/,{contains:[{
+className:"doctag",begin:/<\/?/,end:/>/}]}),c=e.COMMENT(null,/$/,{variants:[{
+begin:/'/},{begin:/([\t ]|^)REM(?=\s)/}]});return{name:"Visual Basic .NET",
+aliases:["vb"],case_insensitive:!0,classNameAliases:{label:"symbol"},keywords:{
+keyword:"addhandler alias aggregate ansi as async 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 iterator join key let lib loop me mid module mustinherit mustoverride mybase myclass namespace narrowing new next notinheritable notoverridable of off on operator option optional order overloads overridable overrides paramarray partial preserve private property protected public raiseevent readonly redim 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 yield",
+built_in:"addressof and andalso await directcast gettype getxmlnamespace is isfalse isnot istrue like mod nameof new not or orelse trycast typeof xor cbool cbyte cchar cdate cdbl cdec cint clng cobj csbyte cshort csng cstr cuint culng cushort",
+type:"boolean byte char date decimal double integer long object sbyte short single string uinteger ulong ushort",
+literal:"true false nothing"},
+illegal:"//|\\{|\\}|endif|gosub|variant|wend|^\\$ ",contains:[{
+className:"string",begin:/"(""|[^/n])"C\b/},{className:"string",begin:/"/,
+end:/"/,illegal:/\n/,contains:[{begin:/""/}]},o,{className:"number",relevance:0,
+variants:[{begin:/\b\d[\d_]*((\.[\d_]+(E[+-]?[\d_]+)?)|(E[+-]?[\d_]+))[RFD@!#]?/
+},{begin:/\b\d[\d_]*((U?[SIL])|[%&])?/},{begin:/&H[\dA-F_]+((U?[SIL])|[%&])?/},{
+begin:/&O[0-7_]+((U?[SIL])|[%&])?/},{begin:/&B[01_]+((U?[SIL])|[%&])?/}]},{
+className:"label",begin:/^\w+:/},l,c,{className:"meta",
+begin:/[\t ]*#(const|disable|else|elseif|enable|end|externalsource|if|region)\b/,
+end:/$/,keywords:{
+"meta-keyword":"const disable else elseif enable end externalsource if region then"
+},contains:[c]}]}}})());
\ 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..5592331d30 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
@@ -1 +1,3 @@
-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",(()=>{"use strict";return e=>({
+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 0825dfce62..ef89473cbf 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
@@ -1 +1,12 @@
-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",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function t(...t){
+return t.map((t=>e(t))).join("")}function r(...t){
+return"("+t.map((t=>e(t))).join("|")+")"}return e=>{
+const i="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 split  cint sin datepart ltrim sqr time derived eval date formatpercent exp inputbox left ascw chrw regexp cstr err".split(" ")
+;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:["server","response","request","scriptengine","scriptenginebuildversion","scriptengineminorversion","scriptenginemajorversion"],
+literal:"true false null nothing empty"},illegal:"//",contains:[{
+begin:t(r(...i),"\\s*\\("),relevance:0,keywords:{built_in:i}
+},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 7ffd5be95a..0c98ac0202 100644
--- a/vendor/assets/javascripts/highlightjs/languages/verilog.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/verilog.min.js
@@ -1 +1,13 @@
-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",(()=>{"use strict";return e=>({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 ef95aa3196..f1a1c6efd2 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
@@ -1 +1,12 @@
-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",(()=>{"use strict";return e=>({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 49269bf56e..47d9d0a295 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vim.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vim.min.js
@@ -1 +1,10 @@
-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",(()=>{"use strict";return e=>({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 f062a8f340..d68222fea4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
@@ -1 +1,18 @@
-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",(()=>{"use strict";return s=>({
+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 2eb49c06ee..d5ab8ccf56 100644
--- a/vendor/assets/javascripts/highlightjs/languages/xl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/xl.min.js
@@ -1 +1,14 @@
-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",(()=>{"use strict";return e=>{const 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 abe4a6d0a5..54f7b872d2 100644
--- a/vendor/assets/javascripts/highlightjs/languages/xml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/xml.min.js
@@ -1 +1,29 @@
-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",(()=>{"use strict";function e(e){
+return e?"string"==typeof e?e:e.source:null}function n(e){return a("(?=",e,")")}
+function a(...n){return n.map((n=>e(n))).join("")}function s(...n){
+return"("+n.map((n=>e(n))).join("|")+")"}return e=>{
+const t=a(/[A-Z_]/,a("(",/[A-Z0-9_.-]*:/,")?"),/[A-Z0-9_.-]*/),i={
+className:"symbol",begin:/&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;/},r={begin:/\s/,
+contains:[{className:"meta-keyword",begin:/#?[a-z_][a-z1-9_-]+/,illegal:/\n/}]
+},c=e.inherit(r,{begin:/\(/,end:/\)/}),l=e.inherit(e.APOS_STRING_MODE,{
+className:"meta-string"}),g=e.inherit(e.QUOTE_STRING_MODE,{
+className:"meta-string"}),m={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:[i]},{begin:/'/,end:/'/,contains:[i]},{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:[r,g,l,c,{begin:/\[/,end:/\]/,contains:[{className:"meta",
+begin:/<![a-z]/,end:/>/,contains:[r,c,g,l]}]}]},e.COMMENT(/<!--/,/-->/,{
+relevance:10}),{begin:/<!\[CDATA\[/,end:/\]\]>/,relevance:10},i,{
+className:"meta",begin:/<\?xml/,end:/\?>/,relevance:10},{className:"tag",
+begin:/<style(?=\s|>)/,end:/>/,keywords:{name:"style"},contains:[m],starts:{
+end:/<\/style>/,returnEnd:!0,subLanguage:["css","xml"]}},{className:"tag",
+begin:/<script(?=\s|>)/,end:/>/,keywords:{name:"script"},contains:[m],starts:{
+end:/<\/script>/,returnEnd:!0,subLanguage:["javascript","handlebars","xml"]}},{
+className:"tag",begin:/<>|<\/>/},{className:"tag",
+begin:a(/</,n(a(t,s(/\/>/,/>/,/\s/)))),end:/\/?>/,contains:[{className:"name",
+begin:t,relevance:0,starts:m}]},{className:"tag",begin:a(/<\//,n(a(t,/>/))),
+contains:[{className:"name",begin:t,relevance:0},{begin:/>/,relevance:0}]}]}}
+})());
\ 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..17813d0ba7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
@@ -1 +1,32 @@
-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",(()=>{"use strict";return e=>({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+\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 587b8795ff..2d12a1f7d0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/yaml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/yaml.min.js
@@ -1 +1,24 @@
-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",(()=>{"use strict";return 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,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:"[\\|>]([1-9]?[+-])?[ ]*\\n( +)[^ ][^\\n]*\\n(\\2[^\\n]+\\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",relevance:0},t,g,s],r=[...b]
+;return r.pop(),r.push(i),l.contains=r,{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 a375158d37..57758e8e46 100644
--- a/vendor/assets/javascripts/highlightjs/languages/zephir.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/zephir.min.js
@@ -1 +1,18 @@
-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",(()=>{"use strict";return e=>{const n={
+className:"string",contains:[e.BACKSLASH_ESCAPE],
+variants:[e.inherit(e.APOS_STRING_MODE,{illegal:null
+}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]},s=e.UNDERSCORE_TITLE_MODE,a={
+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:[s,{className:"params",begin:/\(/,end:/\)/,keywords:i,
+contains:["self",e.C_BLOCK_COMMENT_MODE,n,a]}]},{className:"class",
+beginKeywords:"class interface",end:/\{/,excludeEnd:!0,illegal:/[:($"]/,
+contains:[{beginKeywords:"extends implements"},s]},{beginKeywords:"namespace",
+end:/;/,illegal:/[.']/,contains:[s]},{beginKeywords:"use",end:/;/,contains:[s]
+},{begin:/=>/},n,a]}}})());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/package.json b/vendor/assets/javascripts/highlightjs/package.json
index 7046804b51..188addc935 100644
--- a/vendor/assets/javascripts/highlightjs/package.json
+++ b/vendor/assets/javascripts/highlightjs/package.json
@@ -6,1128 +6,311 @@
       "syntax"
    ],
    "homepage": "https://highlightjs.org/",
-   "version": "10.2.1",
+   "version": "10.6.0",
    "author": {
       "name": "Ivan Sagalaev",
       "email": "maniac@softwaremaniacs.org"
    },
    "contributors": [
-      {
-         "name": "Gidi Meir Morris",
-         "email": "gidi@gidi.io"
-      },
-      {
-         "name": "Jan T. Sott",
-         "email": "git@idleberg.com"
-      },
-      {
-         "name": "Li Xuanji",
-         "email": "xuanji@gmail.com"
-      },
-      {
-         "name": "Marcos Cáceres",
-         "email": "marcos@marcosc.com"
-      },
-      {
-         "name": "Sang Dang",
-         "email": "sang.dang@polku.io"
-      },
-      {
-         "name": "Josh Goebel",
-         "email": "hello@joshgoebel.com"
-      },
-      {
-         "name": "Ivan Sagalaev (original author)",
-         "email": "maniac@softwaremaniacs.org"
-      },
-      {
-         "name": "Jeremy Hull",
-         "email": "sourdrums@gmail.com"
-      },
-      {
-         "name": "Oleg Efimov",
-         "email": "efimovov@gmail.com"
-      },
-      {
-         "name": "Peter Leonov",
-         "email": "gojpeg@gmail.com"
-      },
-      {
-         "name": "Vanessa Sochat",
-         "email": "@vsoch"
-      },
-      {
-         "name": "Victor Karamzin",
-         "email": "Victor.Karamzin@enterra-inc.com"
-      },
-      {
-         "name": "Vsevolod Solovyov",
-         "email": "vsevolod.solovyov@gmail.com"
-      },
-      {
-         "name": "Anton Kovalyov",
-         "email": "anton@kovalyov.net"
-      },
-      {
-         "name": "Nikita Ledyaev",
-         "email": "lenikita@yandex.ru"
-      },
-      {
-         "name": "Konstantin Evdokimenko",
-         "email": "qewerty@gmail.com"
-      },
-      {
-         "name": "Dmitri Roudakov",
-         "email": "dmitri@roudakov.ru"
-      },
-      {
-         "name": "Yuri Ivanov",
-         "email": "ivanov@supersoft.ru"
-      },
-      {
-         "name": "Vladimir Ermakov",
-         "email": "vooon341@mail.ru"
-      },
-      {
-         "name": "Vladimir Gubarkov",
-         "email": "xonixx@gmail.com"
-      },
-      {
-         "name": "Brian Beck",
-         "email": "exogen@gmail.com"
-      },
-      {
-         "name": "MajestiC",
-         "email": "majestic2k@gmail.com"
-      },
-      {
-         "name": "Vasily Polovnyov",
-         "email": "vast@whiteants.net"
-      },
-      {
-         "name": "Vladimir Epifanov",
-         "email": "voldmar@voldmar.ru"
-      },
-      {
-         "name": "Alexander Makarov",
-         "email": "sam@rmcreative.ru"
-      },
-      {
-         "name": "Vah",
-         "email": "vahtenberg@gmail.com"
-      },
-      {
-         "name": "Shuen-Huei Guan",
-         "email": "drake.guan@gmail.com"
-      },
-      {
-         "name": "Jason Diamond",
-         "email": "jason@diamond.name"
-      },
-      {
-         "name": "Michal Gabrukiewicz",
-         "email": "mgabru@gmail.com"
-      },
-      {
-         "name": "Ruslan Keba",
-         "email": "rukeba@gmail.com"
-      },
-      {
-         "name": "Sergey Baranov",
-         "email": "segyrn@yandex.ru"
-      },
-      {
-         "name": "Zaripov Yura",
-         "email": "yur4ik7@ukr.net"
-      },
-      {
-         "name": "Oleg Volchkov",
-         "email": "oleg@volchkov.net"
-      },
-      {
-         "name": "Vasily Mikhailitchenko",
-         "email": "vaskas@programica.ru"
-      },
-      {
-         "name": "Jan Berkel",
-         "email": "jan.berkel@gmail.com"
-      },
-      {
-         "name": "Vladimir Moskva",
-         "email": "vladmos@gmail.com"
-      },
-      {
-         "name": "Loren Segal",
-         "email": "lsegal@soen.ca"
-      },
-      {
-         "name": "Andrew Fedorov",
-         "email": "dmmdrs@mail.ru"
-      },
-      {
-         "name": "Igor Kalnitsky",
-         "email": "igor@kalnitsky.org"
-      },
-      {
-         "name": "Valerii Hiora",
-         "email": "valerii.hiora@gmail.com"
-      },
-      {
-         "name": "Nikolay Zakharov",
-         "email": "nikolay.desh@gmail.com"
-      },
-      {
-         "name": "Dmitry Kovega",
-         "email": "arhibot@gmail.com"
-      },
-      {
-         "name": "Sergey Ignatov",
-         "email": "sergey@ignatov.spb.su"
-      },
-      {
-         "name": "Antono Vasiljev",
-         "email": "self@antono.info"
-      },
-      {
-         "name": "Stephan Kountso",
-         "email": "steplg@gmail.com"
-      },
-      {
-         "name": "pumbur",
-         "email": "pumbur@pumbur.net"
-      },
-      {
-         "name": "John Crepezzi",
-         "email": "john.crepezzi@gmail.com"
-      },
-      {
-         "name": "Andrey Vlasovskikh",
-         "email": "andrey.vlasovskikh@gmail.com"
-      },
-      {
-         "name": "Alexander Myadzel",
-         "email": "myadzel@gmail.com"
-      },
-      {
-         "name": "Evgeny Stepanischev",
-         "email": "imbolk@gmail.com"
-      },
-      {
-         "name": "Dmytrii Nagirniak",
-         "email": "dnagir@gmail.com"
-      },
-      {
-         "name": "Luigi Maselli",
-         "email": "grigio.org@gmail.com"
-      },
-      {
-         "name": "Denis Bardadym",
-         "email": "bardadymchik@gmail.com"
-      },
-      {
-         "name": "Aahan Krish",
-         "email": "geekpanth3r@gmail.com"
-      },
-      {
-         "name": "Ilya Baryshev",
-         "email": "baryshev@gmail.com"
-      },
-      {
-         "name": "Aleksandar Ruzicic",
-         "email": "aleksandar@ruzicic.info"
-      },
-      {
-         "name": "Joe Cheng",
-         "email": "joe@rstudio.org"
-      },
-      {
-         "name": "Angel G. Olloqui",
-         "email": "angelgarcia.mail@gmail.com"
-      },
-      {
-         "name": "Jason Tate",
-         "email": "adminz@web-cms-designs.com"
-      },
-      {
-         "name": "Sergey Tikhomirov",
-         "email": "sergey@tikhomirov.io"
-      },
-      {
-         "name": "Marc Fornos",
-         "email": "marc.fornos@gmail.com"
-      },
-      {
-         "name": "Yoshihide Jimbo",
-         "email": "yjimbo@gmail.com"
-      },
-      {
-         "name": "Casey Duncan",
-         "email": "casey.duncan@gmail.com"
-      },
-      {
-         "name": "Eugene Nizhibitsky",
-         "email": "nizhibitsky@gmail.com"
-      },
-      {
-         "name": "Alberto Gimeno",
-         "email": "gimenete@gmail.com"
-      },
-      {
-         "name": "Kirk Kimmel",
-         "email": "kimmel.k.programmer@gmail.com"
-      },
-      {
-         "name": "Nathan Grigg",
-         "email": "nathan@nathanamy.org"
-      },
-      {
-         "name": "Dr. Drang",
-         "email": "drdrang@gmail.com"
-      },
-      {
-         "name": "Robin Ward",
-         "email": "robin.ward@gmail.com"
-      },
-      {
-         "name": "Dmitry Medvinsky",
-         "email": "me@dmedvinsky.name"
-      },
-      {
-         "name": "Jason Jacobson",
-         "email": "jason.a.jacobson@gmail.com"
-      },
-      {
-         "name": "Jonas Follesø",
-         "email": "jonas@follesoe.no"
-      },
-      {
-         "name": "Dan Allen",
-         "email": "dan.j.allen@gmail.com"
-      },
-      {
-         "name": "noformnocontent",
-         "email": "i@noformnocontent.com"
-      },
-      {
-         "name": "Damien White",
-         "email": "damien.white@visoftinc.com"
-      },
-      {
-         "name": "Alexander Marenin",
-         "email": "great_muchacho@mail.ru"
-      },
-      {
-         "name": "Cédric Néhémie",
-         "email": "cedric.nehemie@gmail.com"
-      },
-      {
-         "name": "Simon Madine",
-         "email": "simon@angryrobotzombie.com"
-      },
-      {
-         "name": "Benjamin Pannell",
-         "email": "contact@sierrasoftworks.com"
-      },
-      {
-         "name": "Eric Knibbe",
-         "email": "eric@lassosoft.com"
-      },
-      {
-         "name": "Poren Chiang",
-         "email": "ren.chiang@gmail.com"
-      },
-      {
-         "name": "Kelley van Evert",
-         "email": "kelleyvanevert@gmail.com"
-      },
-      {
-         "name": "Kurt Emch",
-         "email": "kurt@kurtemch.com"
-      },
-      {
-         "name": "Mehdi Dogguy",
-         "email": "mehdi@dogguy.org"
-      },
-      {
-         "name": "Nicolas Braud-Santoni",
-         "email": "nicolas.braud-santoni@ens-cachan.fr"
-      },
-      {
-         "name": "Ralf Bitter",
-         "email": "rabit@revigniter.com"
-      },
-      {
-         "name": "Sylvestre Ledru",
-         "email": "sylvestre.ledru@scilab-enterprises.com"
-      },
-      {
-         "name": "Troy Kershaw",
-         "email": "hello@troykershaw.com"
-      },
-      {
-         "name": "Zena Treep",
-         "email": "zena.treep@gmail.com"
-      },
-      {
-         "name": "Daniel Kvasnicka",
-         "email": "dkvasnicka@vendavo.com"
-      },
-      {
-         "name": "Carlo Kok",
-         "email": "ck@remobjects.com"
-      },
-      {
-         "name": "Bram de Haan",
-         "email": "info@atelierbramdehaan.nl"
-      },
-      {
-         "name": "Seongwon Lee",
-         "email": "dlimpid@gmail.com"
-      },
-      {
-         "name": "Zaven Muradyan",
-         "email": "megalivoithos@gmail.com"
-      },
-      {
-         "name": "Brent Bradbury",
-         "email": "brent@brentium.com"
-      },
-      {
-         "name": "Martin Dilling-Hansen",
-         "email": "martindlling@gmail.com"
-      },
-      {
-         "name": "Ilya Vassilevsky",
-         "email": "vassilevsky@gmail.com"
-      },
-      {
-         "name": "Josh Adams",
-         "email": "josh@isotope11.com"
-      },
-      {
-         "name": "Dan Tao",
-         "email": "daniel.tao@gmail.com"
-      },
-      {
-         "name": "Jeff Escalante",
-         "email": "hello@jenius.me"
-      },
-      {
-         "name": "Jun Yang",
-         "email": "yangjvn@126.com"
-      },
-      {
-         "name": "Nikolay Lisienko",
-         "email": "info@neor.ru"
-      },
-      {
-         "name": "Heiko August",
-         "email": "post@auge8472.de"
-      },
-      {
-         "name": "Domen Kožar",
-         "email": "domen@dev.si"
-      },
-      {
-         "name": "Travis Odom",
-         "email": "travis.a.odom@gmail.com"
-      },
-      {
-         "name": "innocenat",
-         "email": "innocenat@gmail.com"
-      },
-      {
-         "name": "Arthur Bikmullin",
-         "email": "devolonter@gmail.com"
-      },
-      {
-         "name": "Pascal Hurni",
-         "email": "phi@ruby-reactive.org"
-      },
-      {
-         "name": "Roman Shmatov",
-         "email": "romanshmatov@gmail.com"
-      },
-      {
-         "name": "Nic West",
-         "email": "nic@letolab.com"
-      },
-      {
-         "name": "Panu Horsmalahti",
-         "email": "panu.horsmalahti@iki.fi"
-      },
-      {
-         "name": "Flaviu Tamas",
-         "email": "tamas.flaviu@gmail.com"
-      },
-      {
-         "name": "Damian Mee",
-         "email": "mee.damian@gmail.com"
-      },
-      {
-         "name": "Christopher Kaster",
-         "email": "ikasoki@gmail.com"
-      },
-      {
-         "name": "Chris Eidhof",
-         "email": "chris@eidhof.nl"
-      },
-      {
-         "name": "Nate Cook",
-         "email": "natecook@gmail.com"
-      },
-      {
-         "name": "Matt Diephouse",
-         "email": "matt@diephouse.com"
-      },
-      {
-         "name": "Erik Osheim",
-         "email": "d_m@plastic-idolatry.com"
-      },
-      {
-         "name": "Guillaume Laforge",
-         "email": "glaforge@gmail.com"
-      },
-      {
-         "name": "Lucas Mazza",
-         "email": "lucastmazza@gmail.com"
-      },
-      {
-         "name": "Maxim Dikun",
-         "email": "dikmax@gmail.com"
-      },
-      {
-         "name": "Henrik Feldt",
-         "email": "henrik@haf.se"
-      },
-      {
-         "name": "Anton Kochkov",
-         "email": "anton.kochkov@gmail.com"
-      },
-      {
-         "name": "Michael Allen",
-         "email": "Michael.Allen@benefitfocus.com"
-      },
-      {
-         "name": "JP Verkamp",
-         "email": "me@jverkamp.com"
-      },
-      {
-         "name": "Adam Joseph Cook",
-         "email": "adam.joseph.cook@gmail.com"
-      },
-      {
-         "name": "Sergey Vidyuk",
-         "email": "svidyuk@gmail.com"
-      },
-      {
-         "name": "Radek Liska",
-         "email": "radekliska@gmail.com"
-      },
-      {
-         "name": "Jose Molina Colmenero",
-         "email": "gaudy41@gmail.com"
-      },
-      {
-         "name": "Max Mikhailov",
-         "email": "seven.phases.max@gmail.com"
-      },
-      {
-         "name": "Bryant Williams",
-         "email": "b.n.williams@gmail.com"
-      },
-      {
-         "name": "Erik Paluka",
-         "email": "erik.paluka@gmail.com"
-      },
-      {
-         "name": "Luke Holder",
-         "email": "lukemh@gmail.com"
-      },
-      {
-         "name": "David Mohundro",
-         "email": "david@mohundro.com"
-      },
-      {
-         "name": "Nicholas Blumhardt",
-         "email": "nblumhardt@nblumhardt.com"
-      },
-      {
-         "name": "Christophe de Dinechin",
-         "email": "christophe@taodyne.com"
-      },
-      {
-         "name": "Taneli Vatanen",
-         "email": "taneli.vatanen@gmail.com"
-      },
-      {
-         "name": "Jen Evers-Corvina",
-         "email": "jen@sevvie.net"
-      },
-      {
-         "name": "Kassio Borges",
-         "email": "kassioborgesm@gmail.com"
-      },
-      {
-         "name": "Cedric Sohrauer",
-         "email": "sohrauer@googlemail.com"
-      },
-      {
-         "name": "Mickaël Delahaye",
-         "email": "mickael.delahaye@gmail.com"
-      },
-      {
-         "name": "Hakan Özler",
-         "email": "ozler.hakan@gmail.com"
-      },
-      {
-         "name": "Trey Shugart",
-         "email": "treshugart@gmail.com"
-      },
-      {
-         "name": "Vincent Zurczak",
-         "email": "vzurczak@linagora.com"
-      },
-      {
-         "name": "Adam Joseph Cook",
-         "email": "adam.joseph.cook@gmail.com"
-      },
-      {
-         "name": "Edwin Dalorzo",
-         "email": "edwin@dalorzo.org"
-      },
-      {
-         "name": "mucaho",
-         "email": "mkucko@gmail.com"
-      },
-      {
-         "name": "Dennis Titze",
-         "email": "dennis.titze@gmail.com"
-      },
-      {
-         "name": "Jon Evans",
-         "email": "jon@craftyjon.com"
-      },
-      {
-         "name": "Brian Quistorff",
-         "email": "bquistorff@gmail.com"
-      },
-      {
-         "name": "Jonathan Suever",
-         "email": "suever@gmail.com"
-      },
-      {
-         "name": "Alexis Hénaut",
-         "email": "alexis@henaut.net"
-      },
-      {
-         "name": "Chris Kiehl",
-         "email": "audionautic@gmail.com"
-      },
-      {
-         "name": "Peter Piwowarski",
-         "email": "oldlaptop654@aol.com"
-      },
-      {
-         "name": "Kenta Sato",
-         "email": "bicycle1885@gmail.com"
-      },
-      {
-         "name": "Anthony Scemama",
-         "email": "scemama@irsamc.ups-tlse.fr"
-      },
-      {
-         "name": "Taufik Nurrohman",
-         "email": "latitudu.latitudu@gmail.com"
-      },
-      {
-         "name": "Pedro Oliveira",
-         "email": "kanytu@gmail.com"
-      },
-      {
-         "name": "Gu Yiling",
-         "email": "justice360@gmail.com"
-      },
-      {
-         "name": "Thomas Applencourt",
-         "email": "thomas.applencourt@irsamc.ups-tlse.fr"
-      },
-      {
-         "name": "Andrew Farmer",
-         "email": "ahfarmer@gmail.com"
-      },
-      {
-         "name": "Sergey Mashkov",
-         "email": "cy6erGn0m@gmail.com"
-      },
-      {
-         "name": "Raivo Laanemets",
-         "email": "raivo@infdot.com"
-      },
-      {
-         "name": "Kenneth Fuglsang",
-         "email": "kfuglsang@gmail.com"
-      },
-      {
-         "name": "David Anson",
-         "email": "david@dlaa.me"
-      },
-      {
-         "name": "Louis Barranqueiro",
-         "email": "louis.barranqueiro@gmail.com"
-      },
-      {
-         "name": "Tim Schumacher",
-         "email": "tim@datenknoten.me"
-      },
-      {
-         "name": "Lucas Werkmeister",
-         "email": "mail@lucaswerkmeister.de"
-      },
-      {
-         "name": "Dan Panzarella",
-         "email": "alsoelp@gmail.com"
-      },
-      {
-         "name": "Bruno Dias",
-         "email": "bruno.r.dias@gmail.com"
-      },
-      {
-         "name": "Jay Strybis",
-         "email": "jay.strybis@gmail.com"
-      },
-      {
-         "name": "Guillaume Gomez",
-         "email": "guillaume1.gomez@gmail.com"
-      },
-      {
-         "name": "Janis Voigtländer",
-         "email": "janis.voigtlaender@gmail.com"
-      },
-      {
-         "name": "Dirk Kirsten",
-         "email": "dk@basex.org"
-      },
-      {
-         "name": "MY Sun",
-         "email": "simonmysun@gmail.com"
-      },
-      {
-         "name": "Vadimtro",
-         "email": "vadimtro@yahoo.com"
-      },
-      {
-         "name": "Benjamin Auder",
-         "email": "benjamin.auder@gmail.com"
-      },
-      {
-         "name": "Dotan Dimet",
-         "email": "dotan@corky.net"
-      },
-      {
-         "name": "Manh Tuan",
-         "email": "junookyo@gmail.com"
-      },
-      {
-         "name": "Philippe Charrière",
-         "email": "ph.charriere@gmail.com"
-      },
-      {
-         "name": "Stefan Bechert",
-         "email": "stefan.bechert@gmx.net"
-      },
-      {
-         "name": "Samuel Reed",
-         "email": "sam@bitmex.com"
-      },
-      {
-         "name": "Yury Selivanov",
-         "email": "yselivanov@gmail.com"
-      },
-      {
-         "name": "Tsuyusato Kitsune",
-         "email": "make.just.on@gmail.com"
-      },
-      {
-         "name": "Mick MacCallum",
-         "email": "micksmaccallum@gmail.com"
-      },
-      {
-         "name": "Kristoffer Gronlund",
-         "email": "kgronlund@suse.com"
-      },
-      {
-         "name": "Søren Enevoldsen",
-         "email": "senevoldsen90@gmail.com"
-      },
-      {
-         "name": "Daniel Rosenwasser",
-         "email": "DanielRosenwasser@users.noreply.github.com"
-      },
-      {
-         "name": "Ladislav Prskavec",
-         "email": "ladislav@prskavec.net"
-      },
-      {
-         "name": "Jan Kühle",
-         "email": "jkuehle90@gmail.com"
-      },
-      {
-         "name": "Stefan Wienert",
-         "email": "stwienert@gmail.com"
-      },
-      {
-         "name": "Nikita Savchenko",
-         "email": "zitros.lab@gmail.com"
-      },
-      {
-         "name": "Stefania Mellai",
-         "email": "s.mellai@arduino.cc"
-      },
-      {
-         "name": "Nebuleon Fumika",
-         "email": "nebuleon.fumika@gmail.com"
-      },
-      {
-         "name": "prince",
-         "email": "MC.prince.0203@gmail.com"
-      },
-      {
-         "name": "Brendan Rocks",
-         "email": "rocks.brendan@gmail.com"
-      },
-      {
-         "name": "Raphaël Assénat",
-         "email": "raph@raphnet.net"
-      },
-      {
-         "name": "Matt Evans",
-         "email": "matt@aptech.com"
-      },
-      {
-         "name": "Martin Braun",
-         "email": "martin.braun@ettus.com"
-      },
-      {
-         "name": "Boris Cherny",
-         "email": "boris@performancejs.com"
-      },
-      {
-         "name": "John Foster",
-         "email": "jfoster@esri.com"
-      },
-      {
-         "name": "Robert Dodier",
-         "email": "robert.dodier@gmail.com"
-      },
-      {
-         "name": "Anthony Dugois",
-         "email": "dev.anthonydugois@gmail.com"
-      },
-      {
-         "name": "Qeole",
-         "email": "qeole@outlook.com"
-      },
-      {
-         "name": "Denis Ciccale",
-         "email": "dciccale@gmail.com"
-      },
-      {
-         "name": "Michael Johnston",
-         "email": "lastobelus@gmail.com"
-      },
-      {
-         "name": "Taras",
-         "email": "oxdef@oxdef.info"
-      },
-      {
-         "name": "Philipp Wolfer",
-         "email": "ph.wolfer@gmail.com"
-      },
-      {
-         "name": "Mikko Kouhia",
-         "email": "mikko.kouhia@iki.fi"
-      },
-      {
-         "name": "Billy Quith",
-         "email": "chinbillybilbo@gmail.com"
-      },
-      {
-         "name": "Herbert Shin",
-         "email": "initbar@protonmail.ch"
-      },
-      {
-         "name": "Tristano Ajmone",
-         "email": "tajmone@gmail.com"
-      },
-      {
-         "name": "Taisuke Fujimoto",
-         "email": "temp-impl@users.noreply.github.com"
-      },
-      {
-         "name": "Boone Severson",
-         "email": "boone.severson@gmail.com"
-      },
-      {
-         "name": "Victor Zhou",
-         "email": "OiCMudkips@users.noreply.github.com"
-      },
-      {
-         "name": "Lars Schulna",
-         "email": "kartoffelbrei.mit.muskatnuss@gmail.org"
-      },
-      {
-         "name": "Jacob Childress",
-         "email": "jacobc@gmail.com"
-      },
-      {
-         "name": "Gavin Siu",
-         "email": "gavsiu@gmail.com"
-      },
-      {
-         "name": "Builder's Brewery",
-         "email": "buildersbrewery@gmail.com"
-      },
-      {
-         "name": "Sergey Bronnikov",
-         "email": "sergeyb@bronevichok.ru"
-      },
-      {
-         "name": "Joe Eli McIlvain",
-         "email": "joe.eli.mac@gmail.org"
-      },
-      {
-         "name": "Stephan Boyer",
-         "email": "stephan@stephanboyer.com"
-      },
-      {
-         "name": "Alex McKibben",
-         "email": "alex@nullscope.net"
-      },
-      {
-         "name": "Daniel Gamage",
-         "email": "hellodanielgamage@gmail.com"
-      },
-      {
-         "name": "Matthew Daly",
-         "email": "matthewbdaly@gmail.com"
-      },
-      {
-         "name": "Magnus Madsen",
-         "email": "mmadsen@uwaterloo.ca"
-      },
-      {
-         "name": "Camil Staps",
-         "email": "info@camilstaps.nl"
-      },
-      {
-         "name": "Alexander Lichter",
-         "email": "manniL@gmx.net"
-      },
-      {
-         "name": "Nicolas Le Gall",
-         "email": "contact@nlegall.fr"
-      },
-      {
-         "name": "Kenton Hamaluik",
-         "email": "kentonh@gmail.com"
-      },
-      {
-         "name": "Marvin Saignat",
-         "email": "contact@zgmrvn.com"
-      },
-      {
-         "name": "Michael Rodler",
-         "email": "contact@f0rki.at"
-      },
-      {
-         "name": "Sergey Sobko",
-         "email": "s.sobko@profitware.ru"
-      },
-      {
-         "name": "Hale Chan",
-         "email": "halechan@qq.com"
-      },
-      {
-         "name": "Kasper Andersen",
-         "email": "kma_untrusted@protonmail.com"
-      },
-      {
-         "name": "Philipp A.",
-         "email": "flying-sheep@web.de"
-      },
-      {
-         "name": "Guannan Wei",
-         "email": "guannanwei@outlook.com"
-      },
-      {
-         "name": "Sam Wu",
-         "email": "samsam2310@gmail.com"
-      },
-      {
-         "name": "Ike Ku",
-         "email": "dempfi@yahoo.com"
-      },
-      {
-         "name": "Andres Täht",
-         "email": "andres.taht@gmail.com"
-      },
-      {
-         "name": "Rene Saarsoo",
-         "email": "nene@triin.net"
-      },
-      {
-         "name": "Jordi Petit",
-         "email": "jordi.petit@gmail.com"
-      },
-      {
-         "name": "Raphaël Parrëe",
-         "email": "rparree@edc4it.com"
-      },
-      {
-         "name": "Joël Porquet",
-         "email": "joel@porquet.org"
-      },
-      {
-         "name": "Alex Arslan",
-         "email": "ararslan@comcast.net"
-      },
-      {
-         "name": "Stanislav Belov",
-         "email": "stbelov@gmail.com"
-      },
-      {
-         "name": "Ivan Dementev",
-         "email": "ivan_div@mail.ru"
-      },
-      {
-         "name": "Nicolas LLOBERA",
-         "email": "nllobera@gmail.com"
-      },
-      {
-         "name": "Morten Piibeleht",
-         "email": "morten.piibeleht@gmail.com"
-      },
-      {
-         "name": "Martin Clausen",
-         "email": "martin.clausene@gmail.com"
-      },
-      {
-         "name": "Arctic Ice Studio",
-         "email": "development@arcticicestudio.com"
-      },
-      {
-         "name": "Google Inc. (David Benjamin)",
-         "email": "davidben@google.com"
-      },
-      {
-         "name": "Ahmad Awais",
-         "email": "me@AhmadAwais.com"
-      },
-      {
-         "name": "Duncan Paterson",
-         "email": "duncan@exist-db.org"
-      },
-      {
-         "name": "Tristian Kelly",
-         "email": "tristian.kelly560@gmail.com"
-      },
-      {
-         "name": "Melissa Geels",
-         "email": "melissa@nimble.tools"
-      },
-      {
-         "name": "Dmitriy Tarasov",
-         "email": "dimatar@gmail.com"
-      },
-      {
-         "name": "Egor Rogov",
-         "email": "e.rogov@postgrespro.ru"
-      },
-      {
-         "name": "Meseta",
-         "email": "meseta@gmail.com"
-      },
-      {
-         "name": "Harmon",
-         "email": "Harmon.Public@gmail.com"
-      },
-      {
-         "name": "Eric Bailey",
-         "email": "eric.w.bailey@gmail.com"
-      },
-      {
-         "name": "Gustavo Costa",
-         "email": "gusbemacbe@gmail.com"
-      },
-      {
-         "name": "Jeffrey Arnold",
-         "email": "jeffrey.arnold@gmail.com"
-      },
-      {
-         "name": "Antoine Boisier-Michaud",
-         "email": "aboisiermichaud@gmail.com"
-      },
-      {
-         "name": "Alejandro Isaza",
-         "email": "al@isaza.ca"
-      },
-      {
-         "name": "Laurent Voullemier",
-         "email": "laurent.voullemier@gmail.com"
-      },
-      {
-         "name": "Sean T. Allen",
-         "email": "sean@monkeysnatchbanana.com"
-      },
-      {
-         "name": "Greg Cline",
-         "email": "gregrcline@gmail.com"
-      },
-      {
-         "name": "Sejin Jeon",
-         "email": "jinaidy93@gmail.com"
-      },
-      {
-         "name": "Taif Alimov",
-         "email": "inzeppelin@gmail.com"
-      },
-      {
-         "name": "Yuri Mazursky",
-         "email": "mail@colomolome.com"
-      },
-      {
-         "name": "Carl Baxter",
-         "email": "carl@cbax.tech"
-      },
-      {
-         "name": "Thomas Reichel",
-         "email": "tom.p.reichel@gmail.com"
-      },
-      {
-         "name": "G8t Guy",
-         "email": "g8tguy@g8tguy.com"
-      },
-      {
-         "name": "Samia Ali",
-         "email": "samiaab1990@gmail.com"
-      },
-      {
-         "name": "Alexandre Grison",
-         "email": "a.grison@gmail.com"
-      },
-      {
-         "name": "Jim Mason",
-         "email": "jmason@ibinx.com"
-      },
-      {
-         "name": "lioshi",
-         "email": "lioshi@lioshi.com"
-      },
-      {
-         "name": "David Pine",
-         "email": "david.pine.7@gmail.com"
-      }
+      "Josh Goebel <hello@joshgoebel.com>",
+      "Egor Rogov <e.rogov@postgrespro.ru>",
+      "Vladimir Jimenez <me@allejo.io>",
+      "Ivan Sagalaev <maniac@softwaremaniacs.org>",
+      "Jeremy Hull <sourdrums@gmail.com>",
+      "Oleg Efimov <efimovov@gmail.com>",
+      "Gidi Meir Morris <gidi@gidi.io>",
+      "Jan T. Sott <git@idleberg.com>",
+      "Li Xuanji <xuanji@gmail.com>",
+      "Marcos Cáceres <marcos@marcosc.com>",
+      "Sang Dang <sang.dang@polku.io>",
+      "Peter Leonov <gojpeg@gmail.com>",
+      "Vanessa Sochat (https://github.com/vsoch)",
+      "Victor Karamzin <Victor.Karamzin@enterra-inc.com>",
+      "Vsevolod Solovyov <vsevolod.solovyov@gmail.com>",
+      "Anton Kovalyov <anton@kovalyov.net>",
+      "Nikita Ledyaev <lenikita@yandex.ru>",
+      "Konstantin Evdokimenko <qewerty@gmail.com>",
+      "Dmitri Roudakov <dmitri@roudakov.ru>",
+      "Yuri Ivanov <ivanov@supersoft.ru>",
+      "Vladimir Ermakov <vooon341@mail.ru>",
+      "Vladimir Gubarkov <xonixx@gmail.com>",
+      "Brian Beck <exogen@gmail.com>",
+      "MajestiC <majestic2k@gmail.com>",
+      "Vasily Polovnyov <vast@whiteants.net>",
+      "Vladimir Epifanov <voldmar@voldmar.ru>",
+      "Alexander Makarov <sam@rmcreative.ru>",
+      "Vah <vahtenberg@gmail.com>",
+      "Shuen-Huei Guan <drake.guan@gmail.com>",
+      "Jason Diamond <jason@diamond.name>",
+      "Michal Gabrukiewicz <mgabru@gmail.com>",
+      "Ruslan Keba <rukeba@gmail.com>",
+      "Sergey Baranov <segyrn@yandex.ru>",
+      "Zaripov Yura <yur4ik7@ukr.net>",
+      "Oleg Volchkov <oleg@volchkov.net>",
+      "Vasily Mikhailitchenko <vaskas@programica.ru>",
+      "Jan Berkel <jan.berkel@gmail.com>",
+      "Vladimir Moskva <vladmos@gmail.com>",
+      "Loren Segal <lsegal@soen.ca>",
+      "Andrew Fedorov <dmmdrs@mail.ru>",
+      "Igor Kalnitsky <igor@kalnitsky.org>",
+      "Valerii Hiora <valerii.hiora@gmail.com>",
+      "Nikolay Zakharov <nikolay.desh@gmail.com>",
+      "Dmitry Kovega <arhibot@gmail.com>",
+      "Sergey Ignatov <sergey@ignatov.spb.su>",
+      "Antono Vasiljev <self@antono.info>",
+      "Stephan Kountso <steplg@gmail.com>",
+      "pumbur <pumbur@pumbur.net>",
+      "John Crepezzi <john.crepezzi@gmail.com>",
+      "Andrey Vlasovskikh <andrey.vlasovskikh@gmail.com>",
+      "Alexander Myadzel <myadzel@gmail.com>",
+      "Evgeny Stepanischev <imbolk@gmail.com>",
+      "Dmytrii Nagirniak <dnagir@gmail.com>",
+      "Luigi Maselli <grigio.org@gmail.com>",
+      "Denis Bardadym <bardadymchik@gmail.com>",
+      "Aahan Krish <geekpanth3r@gmail.com>",
+      "Ilya Baryshev <baryshev@gmail.com>",
+      "Aleksandar Ruzicic <aleksandar@ruzicic.info>",
+      "Joe Cheng <joe@rstudio.org>",
+      "Angel G. Olloqui <angelgarcia.mail@gmail.com>",
+      "Jason Tate <adminz@web-cms-designs.com>",
+      "Sergey Tikhomirov <sergey@tikhomirov.io>",
+      "Marc Fornos <marc.fornos@gmail.com>",
+      "Yoshihide Jimbo <yjimbo@gmail.com>",
+      "Casey Duncan <casey.duncan@gmail.com>",
+      "Eugene Nizhibitsky <nizhibitsky@gmail.com>",
+      "Alberto Gimeno <gimenete@gmail.com>",
+      "Kirk Kimmel <kimmel.k.programmer@gmail.com>",
+      "Nathan Grigg <nathan@nathanamy.org>",
+      "Dr. Drang <drdrang@gmail.com>",
+      "Robin Ward <robin.ward@gmail.com>",
+      "Dmitry Medvinsky <me@dmedvinsky.name>",
+      "Jason Jacobson <jason.a.jacobson@gmail.com>",
+      "Jonas Follesø <jonas@follesoe.no>",
+      "Dan Allen <dan.j.allen@gmail.com>",
+      "noformnocontent <i@noformnocontent.com>",
+      "Damien White <damien.white@visoftinc.com>",
+      "Alexander Marenin <great_muchacho@mail.ru>",
+      "Cédric Néhémie <cedric.nehemie@gmail.com>",
+      "Simon Madine <simon@angryrobotzombie.com>",
+      "Benjamin Pannell <contact@sierrasoftworks.com>",
+      "Eric Knibbe <eric@lassosoft.com>",
+      "Poren Chiang <ren.chiang@gmail.com>",
+      "Kelley van Evert <kelleyvanevert@gmail.com>",
+      "Kurt Emch <kurt@kurtemch.com>",
+      "Mehdi Dogguy <mehdi@dogguy.org>",
+      "Nicolas Braud-Santoni <nicolas.braud-santoni@ens-cachan.fr>",
+      "Ralf Bitter <rabit@revigniter.com>",
+      "Sylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>",
+      "Troy Kershaw <hello@troykershaw.com>",
+      "Zena Treep <zena.treep@gmail.com>",
+      "Daniel Kvasnicka <dkvasnicka@vendavo.com>",
+      "Carlo Kok <ck@remobjects.com>",
+      "Bram de Haan <info@atelierbramdehaan.nl>",
+      "Seongwon Lee <dlimpid@gmail.com>",
+      "Zaven Muradyan <megalivoithos@gmail.com>",
+      "Brent Bradbury <brent@brentium.com>",
+      "Martin Dilling-Hansen <martindlling@gmail.com>",
+      "Ilya Vassilevsky <vassilevsky@gmail.com>",
+      "Josh Adams <josh@isotope11.com>",
+      "Dan Tao <daniel.tao@gmail.com>",
+      "Jeff Escalante <hello@jenius.me>",
+      "Jun Yang <yangjvn@126.com>",
+      "Nikolay Lisienko <info@neor.ru>",
+      "Heiko August <post@auge8472.de>",
+      "Domen Kožar <domen@dev.si>",
+      "Travis Odom <travis.a.odom@gmail.com>",
+      "innocenat <innocenat@gmail.com>",
+      "Arthur Bikmullin <devolonter@gmail.com>",
+      "Pascal Hurni <phi@ruby-reactive.org>",
+      "Roman Shmatov <romanshmatov@gmail.com>",
+      "Nic West <nic@letolab.com>",
+      "Panu Horsmalahti <panu.horsmalahti@iki.fi>",
+      "Flaviu Tamas <tamas.flaviu@gmail.com>",
+      "Damian Mee <mee.damian@gmail.com>",
+      "Christopher Kaster <ikasoki@gmail.com>",
+      "Chris Eidhof <chris@eidhof.nl>",
+      "Nate Cook <natecook@gmail.com>",
+      "Matt Diephouse <matt@diephouse.com>",
+      "Erik Osheim <d_m@plastic-idolatry.com>",
+      "Guillaume Laforge <glaforge@gmail.com>",
+      "Lucas Mazza <lucastmazza@gmail.com>",
+      "Maxim Dikun <dikmax@gmail.com>",
+      "Henrik Feldt <henrik@haf.se>",
+      "Anton Kochkov <anton.kochkov@gmail.com>",
+      "Michael Allen <Michael.Allen@benefitfocus.com>",
+      "JP Verkamp <me@jverkamp.com>",
+      "Adam Joseph Cook <adam.joseph.cook@gmail.com>",
+      "Sergey Vidyuk <svidyuk@gmail.com>",
+      "Radek Liska <radekliska@gmail.com>",
+      "Jose Molina Colmenero <gaudy41@gmail.com>",
+      "Max Mikhailov <seven.phases.max@gmail.com>",
+      "Bryant Williams <b.n.williams@gmail.com>",
+      "Erik Paluka <erik.paluka@gmail.com>",
+      "Luke Holder <lukemh@gmail.com>",
+      "David Mohundro <david@mohundro.com>",
+      "Nicholas Blumhardt <nblumhardt@nblumhardt.com>",
+      "Christophe de Dinechin <christophe@taodyne.com>",
+      "Taneli Vatanen <taneli.vatanen@gmail.com>",
+      "Jen Evers-Corvina <jen@sevvie.net>",
+      "Kassio Borges <kassioborgesm@gmail.com>",
+      "Cedric Sohrauer <sohrauer@googlemail.com>",
+      "Mickaël Delahaye <mickael.delahaye@gmail.com>",
+      "Hakan Özler <ozler.hakan@gmail.com>",
+      "Trey Shugart <treshugart@gmail.com>",
+      "Vincent Zurczak <vzurczak@linagora.com>",
+      "Adam Joseph Cook <adam.joseph.cook@gmail.com>",
+      "Edwin Dalorzo <edwin@dalorzo.org>",
+      "mucaho <mkucko@gmail.com>",
+      "Dennis Titze <dennis.titze@gmail.com>",
+      "Jon Evans <jon@craftyjon.com>",
+      "Brian Quistorff <bquistorff@gmail.com>",
+      "Jonathan Suever <suever@gmail.com>",
+      "Alexis Hénaut <alexis@henaut.net>",
+      "Chris Kiehl <audionautic@gmail.com>",
+      "Peter Piwowarski <oldlaptop654@aol.com>",
+      "Kenta Sato <bicycle1885@gmail.com>",
+      "Anthony Scemama <scemama@irsamc.ups-tlse.fr>",
+      "Taufik Nurrohman <latitudu.latitudu@gmail.com>",
+      "Pedro Oliveira <kanytu@gmail.com>",
+      "Gu Yiling <justice360@gmail.com>",
+      "Thomas Applencourt <thomas.applencourt@irsamc.ups-tlse.fr>",
+      "Andrew Farmer <ahfarmer@gmail.com>",
+      "Sergey Mashkov <cy6erGn0m@gmail.com>",
+      "Raivo Laanemets <raivo@infdot.com>",
+      "Kenneth Fuglsang <kfuglsang@gmail.com>",
+      "David Anson <david@dlaa.me>",
+      "Louis Barranqueiro <louis.barranqueiro@gmail.com>",
+      "Tim Schumacher <tim@datenknoten.me>",
+      "Lucas Werkmeister <mail@lucaswerkmeister.de>",
+      "Dan Panzarella <alsoelp@gmail.com>",
+      "Bruno Dias <bruno.r.dias@gmail.com>",
+      "Jay Strybis <jay.strybis@gmail.com>",
+      "Guillaume Gomez <guillaume1.gomez@gmail.com>",
+      "Janis Voigtländer <janis.voigtlaender@gmail.com>",
+      "Dirk Kirsten <dk@basex.org>",
+      "MY Sun <simonmysun@gmail.com>",
+      "Vadimtro <vadimtro@yahoo.com>",
+      "Benjamin Auder <benjamin.auder@gmail.com>",
+      "Dotan Dimet <dotan@corky.net>",
+      "Manh Tuan <junookyo@gmail.com>",
+      "Philippe Charrière <ph.charriere@gmail.com>",
+      "Stefan Bechert <stefan.bechert@gmx.net>",
+      "Samuel Reed <sam@bitmex.com>",
+      "Yury Selivanov <yselivanov@gmail.com>",
+      "Tsuyusato Kitsune <make.just.on@gmail.com>",
+      "Mick MacCallum <micksmaccallum@gmail.com>",
+      "Kristoffer Gronlund <kgronlund@suse.com>",
+      "Søren Enevoldsen <senevoldsen90@gmail.com>",
+      "Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>",
+      "Ladislav Prskavec <ladislav@prskavec.net>",
+      "Jan Kühle <jkuehle90@gmail.com>",
+      "Stefan Wienert <stwienert@gmail.com>",
+      "Nikita Savchenko <zitros.lab@gmail.com>",
+      "Stefania Mellai <s.mellai@arduino.cc>",
+      "Nebuleon Fumika <nebuleon.fumika@gmail.com>",
+      "prince <MC.prince.0203@gmail.com>",
+      "Brendan Rocks <rocks.brendan@gmail.com>",
+      "Raphaël Assénat <raph@raphnet.net>",
+      "Matt Evans <matt@aptech.com>",
+      "Martin Braun <martin.braun@ettus.com>",
+      "Boris Cherny <boris@performancejs.com>",
+      "John Foster <jfoster@esri.com>",
+      "Robert Dodier <robert.dodier@gmail.com>",
+      "Anthony Dugois <dev.anthonydugois@gmail.com>",
+      "Qeole <qeole@outlook.com>",
+      "Denis Ciccale <dciccale@gmail.com>",
+      "Michael Johnston <lastobelus@gmail.com>",
+      "Taras <oxdef@oxdef.info>",
+      "Philipp Wolfer <ph.wolfer@gmail.com>",
+      "Mikko Kouhia <mikko.kouhia@iki.fi>",
+      "Billy Quith <chinbillybilbo@gmail.com>",
+      "Herbert Shin <initbar@protonmail.ch>",
+      "Tristano Ajmone <tajmone@gmail.com>",
+      "Taisuke Fujimoto <temp-impl@users.noreply.github.com>",
+      "Boone Severson <boone.severson@gmail.com>",
+      "Victor Zhou <OiCMudkips@users.noreply.github.com>",
+      "Lars Schulna <kartoffelbrei.mit.muskatnuss@gmail.org>",
+      "Jacob Childress <jacobc@gmail.com>",
+      "Gavin Siu <gavsiu@gmail.com>",
+      "Builder's Brewery <buildersbrewery@gmail.com>",
+      "Sergey Bronnikov <sergeyb@bronevichok.ru>",
+      "Joe Eli McIlvain <joe.eli.mac@gmail.org>",
+      "Stephan Boyer <stephan@stephanboyer.com>",
+      "Alex McKibben <alex@nullscope.net>",
+      "Daniel Gamage <hellodanielgamage@gmail.com>",
+      "Matthew Daly <matthewbdaly@gmail.com>",
+      "Magnus Madsen <mmadsen@uwaterloo.ca>",
+      "Camil Staps <info@camilstaps.nl>",
+      "Alexander Lichter <manniL@gmx.net>",
+      "Nicolas Le Gall <contact@nlegall.fr>",
+      "Kenton Hamaluik <kentonh@gmail.com>",
+      "Marvin Saignat <contact@zgmrvn.com>",
+      "Michael Rodler <contact@f0rki.at>",
+      "Sergey Sobko <s.sobko@profitware.ru>",
+      "Hale Chan <halechan@qq.com>",
+      "Kasper Andersen <kma_untrusted@protonmail.com>",
+      "Philipp A. <flying-sheep@web.de>",
+      "Guannan Wei <guannanwei@outlook.com>",
+      "Sam Wu <samsam2310@gmail.com>",
+      "Ike Ku <dempfi@yahoo.com>",
+      "Andres Täht <andres.taht@gmail.com>",
+      "Rene Saarsoo <nene@triin.net>",
+      "Jordi Petit <jordi.petit@gmail.com>",
+      "Raphaël Parrëe <rparree@edc4it.com>",
+      "Joël Porquet <joel@porquet.org>",
+      "Alex Arslan <ararslan@comcast.net>",
+      "Stanislav Belov <stbelov@gmail.com>",
+      "Ivan Dementev <ivan_div@mail.ru>",
+      "Nicolas LLOBERA <nllobera@gmail.com>",
+      "Morten Piibeleht <morten.piibeleht@gmail.com>",
+      "Martin Clausen <martin.clausene@gmail.com>",
+      "Arctic Ice Studio <development@arcticicestudio.com>",
+      "Google Inc. ",
+      "Ahmad Awais <me@AhmadAwais.com>",
+      "Duncan Paterson <duncan@exist-db.org>",
+      "Tristian Kelly <tristian.kelly560@gmail.com>",
+      "Melissa Geels <melissa@nimble.tools>",
+      "Dmitriy Tarasov <dimatar@gmail.com>",
+      "Egor Rogov <e.rogov@postgrespro.ru>",
+      "Meseta <meseta@gmail.com>",
+      "Harmon <Harmon.Public@gmail.com>",
+      "Eric Bailey <eric.w.bailey@gmail.com>",
+      "Gustavo Costa <gusbemacbe@gmail.com>",
+      "Jeffrey Arnold <jeffrey.arnold@gmail.com>",
+      "Antoine Boisier-Michaud <aboisiermichaud@gmail.com>",
+      "Alejandro Isaza <al@isaza.ca>",
+      "Laurent Voullemier <laurent.voullemier@gmail.com>",
+      "Sean T. Allen <sean@monkeysnatchbanana.com>",
+      "Greg Cline <gregrcline@gmail.com>",
+      "Sejin Jeon <jinaidy93@gmail.com>",
+      "Taif Alimov <inzeppelin@gmail.com>",
+      "Yuri Mazursky <mail@colomolome.com>",
+      "Carl Baxter <carl@cbax.tech>",
+      "Thomas Reichel <tom.p.reichel@gmail.com>",
+      "G8t Guy <g8tguy@g8tguy.com>",
+      "Samia Ali <samiaab1990@gmail.com>",
+      "Alexandre Grison <a.grison@gmail.com>",
+      "Jim Mason <jmason@ibinx.com>",
+      "lioshi <lioshi@lioshi.com>",
+      "David Pine <david.pine.7@gmail.com>",
+      "Konrad Rudolph <konrad.rudolph@gmail.com>",
+      "Tom Wallace <thomasmichaelwallace@gmail.com>",
+      "Michael Newton (https://github.com/miken32)",
+      "Richard Gibson (https://github.com/gibson042)",
+      "Fredrik Ekre <ekrefredrik@gmail.com>",
+      "Jan Pilzer (https://github.com/Hirse)",
+      "Jonathan Sharpe <mail@jonrshar.pe>",
+      "Michael Rush <michaelrush@gmail.com>",
+      "Florian Bezdeka <florian@bezdeka.de>",
+      "Marat Nagayev <nagaevmt@yandex.ru>",
+      "Patrick Scheibe <patrick@halirutan.de>",
+      "Kyle Brown (https://github.com/kylebrown9)",
+      "Marcus Ortiz <mportiz08@gmail.com>",
+      "Guillaume Grossetie <ggrossetie@yuzutech.fr>",
+      "Steven Van Impe <steven.vanimpe@icloud.com>",
+      "Martin Dørum <martid0311@gmail.com>",
+      "John Haugeland <stonecypher@gmail.com>",
+      "davidhcefx <davidhu0903ex3@gmail.com>"
    ],
    "bugs": {
       "url": "https://github.com/highlightjs/highlight.js/issues"
@@ -1141,7 +324,8 @@
    "types": "./types/index.d.ts",
    "scripts": {
       "mocha": "mocha",
-      "lint": "eslint -c .eslintrc.js src/*.js src/lib/*.js",
+      "lint": "eslint src/*.js src/lib/*.js src/plugins/*.js demo/*.js",
+      "lint-languages": "eslint --no-eslintrc -c .eslintrc.lang.js src/languages/**/*.js",
       "build_and_test": "npm run build && npm run test",
       "build": "node ./tools/build.js -t node",
       "build-cdn": "node ./tools/build.js -t cdn",
@@ -1156,34 +340,34 @@
       "node": "*"
    },
    "devDependencies": {
-      "@typescript-eslint/eslint-plugin": "^3.2.0",
-      "@typescript-eslint/parser": "^3.2.0",
-      "clean-css": "^4.2.3",
+      "@rollup/plugin-commonjs": "^17.0.0",
+      "@rollup/plugin-json": "^4.1.0",
+      "@rollup/plugin-node-resolve": "^11.1.0",
+      "@typescript-eslint/eslint-plugin": "^4.6.1",
+      "@typescript-eslint/parser": "^4.6.1",
+      "clean-css": "^5.0.1",
       "cli-table": "^0.3.1",
       "colors": "^1.1.2",
-      "commander": "^5.1.0",
-      "del": "^5.1.0",
+      "commander": "^7.0.0",
+      "deep-freeze-es6": "^1.4.1",
+      "del": "^6.0.0",
       "dependency-resolver": "^2.0.1",
-      "eslint": "^7.2.0",
-      "eslint-config-standard": "^14.1.1",
-      "eslint-plugin-import": "^2.21.2",
+      "eslint": "^7.12.1",
+      "eslint-config-standard": "^16.0.1",
+      "eslint-plugin-import": "^2.22.1",
       "eslint-plugin-node": "^11.1.0",
       "eslint-plugin-promise": "^4.2.1",
-      "eslint-plugin-standard": "^4.0.1",
       "glob": "^7.1.6",
-      "glob-promise": "^3.4.0",
+      "glob-promise": "^4.0.1",
       "handlebars": "^4.7.6",
-      "js-beautify": "^1.11.0",
-      "jsdom": "^16.2.2",
-      "lodash": "^4.17.19",
-      "mocha": "^8.1.3",
-      "rollup": "^2.0.0",
-      "rollup-plugin-commonjs": "^10.1.0",
-      "rollup-plugin-json": "^4.0.0",
+      "jsdom": "^16.4.0",
+      "lodash": "^4.17.20",
+      "mocha": "^8.2.1",
+      "refa": "^0.4.1",
+      "rollup": "^2.33.1",
       "should": "^13.2.3",
-      "terser": "^4.3.9",
+      "terser": "^5.3.8",
       "tiny-worker": "^2.3.0",
-      "typescript": "^4.0.0-dev.20200512"
-   },
-   "dependencies": {}
+      "typescript": "^4.0.5"
+   }
 }
\ No newline at end of file
diff --git a/vendor/assets/javascripts/jquery.ba-resize.js b/vendor/assets/javascripts/jquery.ba-resize.js
deleted file mode 100644
index 1f41d37915..0000000000
--- a/vendor/assets/javascripts/jquery.ba-resize.js
+++ /dev/null
@@ -1,246 +0,0 @@
-/*!
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-
-// Script: jQuery resize event
-//
-// *Version: 1.1, Last updated: 3/14/2010*
-// 
-// Project Home - http://benalman.com/projects/jquery-resize-plugin/
-// GitHub       - http://github.com/cowboy/jquery-resize/
-// Source       - http://github.com/cowboy/jquery-resize/raw/master/jquery.ba-resize.js
-// (Minified)   - http://github.com/cowboy/jquery-resize/raw/master/jquery.ba-resize.min.js (1.0kb)
-// 
-// About: License
-// 
-// Copyright (c) 2010 "Cowboy" Ben Alman,
-// Dual licensed under the MIT and GPL licenses.
-// http://benalman.com/about/license/
-// 
-// About: Examples
-// 
-// This working example, complete with fully commented code, illustrates a few
-// ways in which this plugin can be used.
-// 
-// resize event - http://benalman.com/code/projects/jquery-resize/examples/resize/
-// 
-// About: Support and Testing
-// 
-// Information about what version or versions of jQuery this plugin has been
-// tested with, what browsers it has been tested in, and where the unit tests
-// reside (so you can test it yourself).
-// 
-// jQuery Versions - 1.3.2, 1.4.1, 1.4.2
-// Browsers Tested - Internet Explorer 6-8, Firefox 2-3.6, Safari 3-4, Chrome, Opera 9.6-10.1.
-// Unit Tests      - http://benalman.com/code/projects/jquery-resize/unit/
-// 
-// About: Release History
-// 
-// 1.1 - (3/14/2010) Fixed a minor bug that was causing the event to trigger
-//       immediately after bind in some circumstances. Also changed $.fn.data
-//       to $.data to improve performance.
-// 1.0 - (2/10/2010) Initial release
-
-(function($,window,undefined){
-  '$:nomunge'; // Used by YUI compressor.
-  
-  // A jQuery object containing all non-window elements to which the resize
-  // event is bound.
-  var elems = $([]),
-    
-    // Extend $.resize if it already exists, otherwise create it.
-    jq_resize = $.resize = $.extend( $.resize, {} ),
-    
-    timeout_id,
-    
-    // Reused strings.
-    str_setTimeout = 'setTimeout',
-    str_resize = 'resize',
-    str_data = str_resize + '-special-event',
-    str_delay = 'delay',
-    str_throttle = 'throttleWindow';
-  
-  // Property: jQuery.resize.delay
-  // 
-  // The numeric interval (in milliseconds) at which the resize event polling
-  // loop executes. Defaults to 250.
-  
-  jq_resize[ str_delay ] = 250;
-  
-  // Property: jQuery.resize.throttleWindow
-  // 
-  // Throttle the native window object resize event to fire no more than once
-  // every <jQuery.resize.delay> milliseconds. Defaults to true.
-  // 
-  // Because the window object has its own resize event, it doesn't need to be
-  // provided by this plugin, and its execution can be left entirely up to the
-  // browser. However, since certain browsers fire the resize event continuously
-  // while others do not, enabling this will throttle the window resize event,
-  // making event behavior consistent across all elements in all browsers.
-  // 
-  // While setting this property to false will disable window object resize
-  // event throttling, please note that this property must be changed before any
-  // window object resize event callbacks are bound.
-  
-  jq_resize[ str_throttle ] = true;
-  
-  // Event: resize event
-  // 
-  // Fired when an element's width or height changes. Because browsers only
-  // provide this event for the window element, for other elements a polling
-  // loop is initialized, running every <jQuery.resize.delay> milliseconds
-  // to see if elements' dimensions have changed. You may bind with either
-  // .resize( fn ) or .bind( "resize", fn ), and unbind with .unbind( "resize" ).
-  // 
-  // Usage:
-  // 
-  // > jQuery('selector').bind( 'resize', function(e) {
-  // >   // element's width or height has changed!
-  // >   ...
-  // > });
-  // 
-  // Additional Notes:
-  // 
-  // * The polling loop is not created until at least one callback is actually
-  //   bound to the 'resize' event, and this single polling loop is shared
-  //   across all elements.
-  // 
-  // Double firing issue in jQuery 1.3.2:
-  // 
-  // While this plugin works in jQuery 1.3.2, if an element's event callbacks
-  // are manually triggered via .trigger( 'resize' ) or .resize() those
-  // callbacks may double-fire, due to limitations in the jQuery 1.3.2 special
-  // events system. This is not an issue when using jQuery 1.4+.
-  // 
-  // > // While this works in jQuery 1.4+
-  // > $(elem).css({ width: new_w, height: new_h }).resize();
-  // > 
-  // > // In jQuery 1.3.2, you need to do this:
-  // > var elem = $(elem);
-  // > elem.css({ width: new_w, height: new_h });
-  // > elem.data( 'resize-special-event', { width: elem.width(), height: elem.height() } );
-  // > elem.resize();
-      
-  $.event.special[ str_resize ] = {
-    
-    // Called only when the first 'resize' event callback is bound per element.
-    setup: function() {
-      // Since window has its own native 'resize' event, return false so that
-      // jQuery will bind the event using DOM methods. Since only 'window'
-      // objects have a .setTimeout method, this should be a sufficient test.
-      // Unless, of course, we're throttling the 'resize' event for window.
-      if ( !jq_resize[ str_throttle ] && this[ str_setTimeout ] ) { return false; }
-      
-      var elem = $(this);
-      
-      // Add this element to the list of internal elements to monitor.
-      elems = elems.add( elem );
-      
-      // Initialize data store on the element.
-      $.data( this, str_data, { w: elem.width(), h: elem.height() } );
-      
-      // If this is the first element added, start the polling loop.
-      if ( elems.length === 1 ) {
-        loopy();
-      }
-    },
-    
-    // Called only when the last 'resize' event callback is unbound per element.
-    teardown: function() {
-      // Since window has its own native 'resize' event, return false so that
-      // jQuery will unbind the event using DOM methods. Since only 'window'
-      // objects have a .setTimeout method, this should be a sufficient test.
-      // Unless, of course, we're throttling the 'resize' event for window.
-      if ( !jq_resize[ str_throttle ] && this[ str_setTimeout ] ) { return false; }
-      
-      var elem = $(this);
-      
-      // Remove this element from the list of internal elements to monitor.
-      elems = elems.not( elem );
-      
-      // Remove any data stored on the element.
-      elem.removeData( str_data );
-      
-      // If this is the last element removed, stop the polling loop.
-      if ( !elems.length ) {
-        clearTimeout( timeout_id );
-      }
-    },
-    
-    // Called every time a 'resize' event callback is bound per element (new in
-    // jQuery 1.4).
-    add: function( handleObj ) {
-      // Since window has its own native 'resize' event, return false so that
-      // jQuery doesn't modify the event object. Unless, of course, we're
-      // throttling the 'resize' event for window.
-      if ( !jq_resize[ str_throttle ] && this[ str_setTimeout ] ) { return false; }
-      
-      var old_handler;
-      
-      // The new_handler function is executed every time the event is triggered.
-      // This is used to update the internal element data store with the width
-      // and height when the event is triggered manually, to avoid double-firing
-      // of the event callback. See the "Double firing issue in jQuery 1.3.2"
-      // comments above for more information.
-      
-      function new_handler( e, w, h ) {
-        var elem = $(this),
-          data = $.data( this, str_data );
-        
-        // If called from the polling loop, w and h will be passed in as
-        // arguments. If called manually, via .trigger( 'resize' ) or .resize(),
-        // those values will need to be computed.
-        data.w = w !== undefined ? w : elem.width();
-        data.h = h !== undefined ? h : elem.height();
-        
-        old_handler.apply( this, arguments );
-      };
-      
-      // This may seem a little complicated, but it normalizes the special event
-      // .add method between jQuery 1.4/1.4.1 and 1.4.2+
-      if ( $.isFunction( handleObj ) ) {
-        // 1.4, 1.4.1
-        old_handler = handleObj;
-        return new_handler;
-      } else {
-        // 1.4.2+
-        old_handler = handleObj.handler;
-        handleObj.handler = new_handler;
-      }
-    }
-    
-  };
-  
-  function loopy() {
-    
-    // Start the polling loop, asynchronously.
-    timeout_id = window[ str_setTimeout ](function(){
-      
-      // Iterate over all elements to which the 'resize' event is bound.
-      elems.each(function(){
-        var elem = $(this),
-          width = elem.width(),
-          height = elem.height(),
-          data = $.data( this, str_data );
-        
-        // If element size has changed since the last time, update the element
-        // data store and trigger the 'resize' event.
-        if ( width !== data.w || height !== data.h ) {
-          elem.trigger( str_resize, [ data.w = width, data.h = height ] );
-        }
-        
-      });
-      
-      // Loop.
-      loopy();
-      
-    }, jq_resize[ str_delay ] );
-    
-  };
-  
-})(jQuery,this);
diff --git a/vendor/assets/javascripts/lodash.js b/vendor/assets/javascripts/lodash.js
index 1029863fce..9f352389c1 100644
--- a/vendor/assets/javascripts/lodash.js
+++ b/vendor/assets/javascripts/lodash.js
@@ -13,7 +13,7 @@
   var undefined;
 
   /** Used as the semantic version number. */
-  var VERSION = '4.17.15';
+  var VERSION = '4.17.21';
 
   /** Used as the size to enable large array optimizations. */
   var LARGE_ARRAY_SIZE = 200;
@@ -127,8 +127,11 @@
    */
   var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
 
-  /** Used to match leading and trailing whitespace. */
-  var reTrim = /^\s+|\s+$/g;
+  /** Used to match leading whitespace. */
+  var reTrimStart = /^\s+/;
+
+  /** Used to match a single whitespace character. */
+  var reWhitespace = /\s/;
 
   /** Used to match wrap detail comments. */
   var reWrapComment = /\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,
@@ -628,6 +631,19 @@
     return result;
   }
 
+  /**
+   * The base implementation of `_.trim`.
+   *
+   * @private
+   * @param {string} string The string to trim.
+   * @returns {string} Returns the trimmed string.
+   */
+  function baseTrim(string) {
+    return string
+      ? string.slice(0, trimmedEndIndex(string) + 1).replace(reTrimStart, '')
+      : string;
+  }
+
   /**
    * The base implementation of `_.unary` without support for storing metadata.
    *
@@ -837,6 +853,21 @@
       : asciiToArray(string);
   }
 
+  /**
+   * Used by `_.trim` and `_.trimEnd` to get the index of the last non-whitespace
+   * character of `string`.
+   *
+   * @private
+   * @param {string} string The string to inspect.
+   * @returns {number} Returns the index of the last non-whitespace character.
+   */
+  function trimmedEndIndex(string) {
+    var index = string.length;
+
+    while (index-- && reWhitespace.test(string.charAt(index))) {}
+    return index;
+  }
+
   /**
    * Converts a Unicode `string` to an array.
    *
@@ -2824,8 +2855,21 @@
    * @returns {Array} Returns the new sorted array.
    */
   function baseOrderBy(collection, iteratees, orders) {
+    if (iteratees.length) {
+      iteratees = arrayMap(iteratees, function(iteratee) {
+        if (isArray(iteratee)) {
+          return function(value) {
+            return baseGet(value, iteratee.length === 1 ? iteratee[0] : iteratee);
+          }
+        }
+        return iteratee;
+      });
+    } else {
+      iteratees = [identity];
+    }
+
     var index = -1;
-    iteratees = arrayMap(iteratees.length ? iteratees : [identity], baseUnary(getIteratee()));
+    iteratees = arrayMap(iteratees, baseUnary(getIteratee()));
 
     var result = baseMap(collection, function(value, key, collection) {
       var criteria = arrayMap(iteratees, function(iteratee) {
@@ -2952,6 +2996,10 @@
       var key = toKey(path[index]),
           newValue = value;
 
+      if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+        return object;
+      }
+
       if (index != lastIndex) {
         var objValue = nested[key];
         newValue = customizer ? customizer(objValue, key, nested) : undefined;
@@ -3826,10 +3874,11 @@
     if (arrLength != othLength && !(isPartial && othLength > arrLength)) {
       return false;
     }
-    // Assume cyclic values are equal.
-    var stacked = stack.get(array);
-    if (stacked && stack.get(other)) {
-      return stacked == other;
+    // Check that cyclic values are equal.
+    var arrStacked = stack.get(array);
+    var othStacked = stack.get(other);
+    if (arrStacked && othStacked) {
+      return arrStacked == other && othStacked == array;
     }
     var index = -1,
         result = true,
@@ -3991,10 +4040,11 @@
         return false;
       }
     }
-    // Assume cyclic values are equal.
-    var stacked = stack.get(object);
-    if (stacked && stack.get(other)) {
-      return stacked == other;
+    // Check that cyclic values are equal.
+    var objStacked = stack.get(object);
+    var othStacked = stack.get(other);
+    if (objStacked && othStacked) {
+      return objStacked == other && othStacked == object;
     }
     var result = true;
     stack.set(object, other);
@@ -5596,6 +5646,10 @@
    * // The `_.property` iteratee shorthand.
    * _.filter(users, 'active');
    * // => objects for ['barney']
+   *
+   * // Combining several predicates using `_.overEvery` or `_.overSome`.
+   * _.filter(users, _.overSome([{ 'age': 36 }, ['age', 40]]));
+   * // => objects for ['fred', 'barney']
    */
   function filter(collection, predicate) {
     var func = isArray(collection) ? arrayFilter : baseFilter;
@@ -5855,15 +5909,15 @@
    * var users = [
    *   { 'user': 'fred',   'age': 48 },
    *   { 'user': 'barney', 'age': 36 },
-   *   { 'user': 'fred',   'age': 40 },
+   *   { 'user': 'fred',   'age': 30 },
    *   { 'user': 'barney', 'age': 34 }
    * ];
    *
    * _.sortBy(users, [function(o) { return o.user; }]);
-   * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 40]]
+   * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 30]]
    *
    * _.sortBy(users, ['user', 'age']);
-   * // => objects for [['barney', 34], ['barney', 36], ['fred', 40], ['fred', 48]]
+   * // => objects for [['barney', 34], ['barney', 36], ['fred', 30], ['fred', 48]]
    */
   var sortBy = baseRest(function(collection, iteratees) {
     if (collection == null) {
@@ -6953,7 +7007,7 @@
     if (typeof value != 'string') {
       return value === 0 ? value : +value;
     }
-    value = value.replace(reTrim, '');
+    value = baseTrim(value);
     var isBinary = reIsBinary.test(value);
     return (isBinary || reIsOctal.test(value))
       ? freeParseInt(value.slice(2), isBinary ? 2 : 8)
diff --git a/vendor/assets/javascripts/popper.js b/vendor/assets/javascripts/popper.js
index 69224d9c9d..f6210215ff 100644
--- a/vendor/assets/javascripts/popper.js
+++ b/vendor/assets/javascripts/popper.js
@@ -1731,4 +1731,4 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 })));
-//# sourceMappingURL=popper.js.map
+//# sourceMappingURL=/popper.js.map
diff --git a/vendor/assets/javascripts/pretender.js b/vendor/assets/javascripts/pretender.js
new file mode 100644
index 0000000000..f489fc7ca3
--- /dev/null
+++ b/vendor/assets/javascripts/pretender.js
@@ -0,0 +1,487 @@
+(function(self) {
+'use strict';
+
+var appearsBrowserified = typeof self !== 'undefined' &&
+                          typeof process !== 'undefined' &&
+                          Object.prototype.toString.call(process) === '[object Object]';
+
+var RouteRecognizer = appearsBrowserified ? require('route-recognizer') : self.RouteRecognizer;
+var FakeXMLHttpRequest = appearsBrowserified ? require('fake-xml-http-request') : self.FakeXMLHttpRequest;
+
+/**
+ * parseURL - decompose a URL into its parts
+ * @param  {String} url a URL
+ * @return {Object} parts of the URL, including the following
+ *
+ * 'https://www.yahoo.com:1234/mypage?test=yes#abc'
+ *
+ * {
+ *   host: 'www.yahoo.com:1234',
+ *   protocol: 'https:',
+ *   search: '?test=yes',
+ *   hash: '#abc',
+ *   href: 'https://www.yahoo.com:1234/mypage?test=yes#abc',
+ *   pathname: '/mypage',
+ *   fullpath: '/mypage?test=yes'
+ * }
+ */
+function parseURL(url) {
+  // TODO: something for when document isn't present... #yolo
+  var anchor = document.createElement('a');
+  anchor.href = url;
+
+  if (!anchor.host) {
+    anchor.href = anchor.href; // IE: load the host and protocol
+  }
+
+  var pathname = anchor.pathname;
+  if (pathname.charAt(0) !== '/') {
+    pathname = '/' + pathname; // IE: prepend leading slash
+  }
+
+  var host = anchor.host;
+  if (anchor.port === '80' || anchor.port === '443') {
+    host = anchor.hostname; // IE: remove default port
+  }
+
+  return {
+    host: host,
+    protocol: anchor.protocol,
+    search: anchor.search,
+    hash: anchor.hash,
+    href: anchor.href,
+    pathname: pathname,
+    fullpath: pathname + (anchor.search || '') + (anchor.hash || '')
+  };
+}
+
+
+/**
+ * Registry
+ *
+ * A registry is a map of HTTP verbs to route recognizers.
+ */
+
+function Registry(/* host */) {
+  // Herein we keep track of RouteRecognizer instances
+  // keyed by HTTP method. Feel free to add more as needed.
+  this.verbs = {
+    GET: new RouteRecognizer(),
+    PUT: new RouteRecognizer(),
+    POST: new RouteRecognizer(),
+    DELETE: new RouteRecognizer(),
+    PATCH: new RouteRecognizer(),
+    HEAD: new RouteRecognizer(),
+    OPTIONS: new RouteRecognizer()
+  };
+}
+
+/**
+ * Hosts
+ *
+ * a map of hosts to Registries, ultimately allowing
+ * a per-host-and-port, per HTTP verb lookup of RouteRecognizers
+ */
+function Hosts() {
+  this._registries = {};
+}
+
+/**
+ * Hosts#forURL - retrieve a map of HTTP verbs to RouteRecognizers
+ *                for a given URL
+ *
+ * @param  {String} url a URL
+ * @return {Registry}   a map of HTTP verbs to RouteRecognizers
+ *                      corresponding to the provided URL's
+ *                      hostname and port
+ */
+Hosts.prototype.forURL = function(url) {
+  var host = parseURL(url).host;
+  var registry = this._registries[host];
+
+  if (registry === undefined) {
+    registry = (this._registries[host] = new Registry(host));
+  }
+
+  return registry.verbs;
+};
+
+
+function Pretender(/* routeMap1, routeMap2, ..., options*/) {
+  this.hosts = new Hosts();
+
+  var lastArg = arguments[arguments.length - 1];
+  var options = typeof lastArg === 'object' ? lastArg : null;
+  var shouldNotTrack = options && (options.trackRequests === false);
+  var noopArray = { push: function() {}, length: 0 };
+
+  this.handlers = [];
+  this.handledRequests = shouldNotTrack ? noopArray: [];
+  this.passthroughRequests = shouldNotTrack ? noopArray: [];
+  this.unhandledRequests = shouldNotTrack ? noopArray: [];
+  this.requestReferences = [];
+  this.forcePassthrough = options && (options.forcePassthrough === true);
+  this.disableUnhandled = options && (options.disableUnhandled === true);
+
+  // reference the native XMLHttpRequest object so
+  // it can be restored later
+  this._nativeXMLHttpRequest = self.XMLHttpRequest;
+  this.running = false;
+  var ctx = { pretender: this };
+  this.ctx = ctx;
+
+  // capture xhr requests, channeling them into
+  // the route map.
+  self.XMLHttpRequest = interceptor(ctx);
+
+  // 'start' the server
+  this.running = true;
+
+  // trigger the route map DSL.
+  var argLength = options ? arguments.length - 1 : arguments.length;
+  for (var i = 0; i < argLength; i++) {
+    this.map(arguments[i]);
+  }
+}
+
+function interceptor(ctx) {
+  function FakeRequest() {
+    // super()
+    FakeXMLHttpRequest.call(this);
+  }
+  FakeRequest.prototype = Object.create(FakeXMLHttpRequest.prototype);
+  FakeRequest.prototype.constructor = FakeRequest;
+
+  // extend
+  FakeRequest.prototype.send = function send() {
+    if (!ctx.pretender.running) {
+      throw new Error('You shut down a Pretender instance while there was a pending request. ' +
+            'That request just tried to complete. Check to see if you accidentally shut down ' +
+            'a pretender earlier than you intended to');
+    }
+
+    FakeXMLHttpRequest.prototype.send.apply(this, arguments);
+
+    if (ctx.pretender.checkPassthrough(this)) {
+      var xhr = createPassthrough(this);
+      xhr.send.apply(xhr, arguments);
+    } else {
+      ctx.pretender.handleRequest(this);
+    }
+  };
+
+
+  function createPassthrough(fakeXHR) {
+    // event types to handle on the xhr
+    var evts = ['error', 'timeout', 'abort', 'readystatechange'];
+
+    // event types to handle on the xhr.upload
+    var uploadEvents = [];
+
+    // properties to copy from the native xhr to fake xhr
+    var lifecycleProps = ['readyState', 'responseText', 'responseXML', 'status', 'statusText'];
+
+    var xhr = fakeXHR._passthroughRequest = new ctx.pretender._nativeXMLHttpRequest();
+    xhr.open(fakeXHR.method, fakeXHR.url, fakeXHR.async, fakeXHR.username, fakeXHR.password);
+
+    if (fakeXHR.responseType === 'arraybuffer') {
+      lifecycleProps = ['readyState', 'response', 'status', 'statusText'];
+      xhr.responseType = fakeXHR.responseType;
+    }
+
+    // use onload if the browser supports it
+    if ('onload' in xhr) {
+      evts.push('load');
+    }
+
+    // add progress event for async calls
+    // avoid using progress events for sync calls, they will hang https://bugs.webkit.org/show_bug.cgi?id=40996.
+    if (fakeXHR.async && fakeXHR.responseType !== 'arraybuffer') {
+      evts.push('progress');
+      uploadEvents.push('progress');
+    }
+
+    // update `propertyNames` properties from `fromXHR` to `toXHR`
+    function copyLifecycleProperties(propertyNames, fromXHR, toXHR) {
+      for (var i = 0; i < propertyNames.length; i++) {
+        var prop = propertyNames[i];
+        if (prop in fromXHR) {
+          toXHR[prop] = fromXHR[prop];
+        }
+      }
+    }
+
+    // fire fake event on `eventable`
+    function dispatchEvent(eventable, eventType, event) {
+      eventable.dispatchEvent(event);
+      if (eventable['on' + eventType]) {
+        eventable['on' + eventType](event);
+      }
+    }
+
+    // set the on- handler on the native xhr for the given eventType
+    function createHandler(eventType) {
+      xhr['on' + eventType] = function(event) {
+        copyLifecycleProperties(lifecycleProps, xhr, fakeXHR);
+        dispatchEvent(fakeXHR, eventType, event);
+      };
+    }
+
+    // set the on- handler on the native xhr's `upload` property for
+    // the given eventType
+    function createUploadHandler(eventType) {
+      if (xhr.upload) {
+        xhr.upload['on' + eventType] = function(event) {
+          dispatchEvent(fakeXHR.upload, eventType, event);
+        };
+      }
+    }
+
+    var i;
+    for (i = 0; i < evts.length; i++) {
+      createHandler(evts[i]);
+    }
+    for (i = 0; i < uploadEvents.length; i++) {
+      createUploadHandler(uploadEvents[i]);
+    }
+
+    if (fakeXHR.async) {
+      xhr.timeout = fakeXHR.timeout;
+      xhr.withCredentials = fakeXHR.withCredentials;
+    }
+    for (var h in fakeXHR.requestHeaders) {
+      xhr.setRequestHeader(h, fakeXHR.requestHeaders[h]);
+    }
+    return xhr;
+  }
+
+  FakeRequest.prototype._passthroughCheck = function(method, args) {
+    if (this._passthroughRequest) {
+      return this._passthroughRequest[method].apply(this._passthroughRequest, args);
+    }
+    return FakeXMLHttpRequest.prototype[method].apply(this, args);
+  };
+
+  FakeRequest.prototype.abort = function abort() {
+    return this._passthroughCheck('abort', arguments);
+  };
+
+  FakeRequest.prototype.getResponseHeader = function getResponseHeader() {
+    return this._passthroughCheck('getResponseHeader', arguments);
+  };
+
+  FakeRequest.prototype.getAllResponseHeaders = function getAllResponseHeaders() {
+    return this._passthroughCheck('getAllResponseHeaders', arguments);
+  };
+
+  if (ctx.pretender._nativeXMLHttpRequest.prototype._passthroughCheck) {
+    console.warn('You created a second Pretender instance while there was already one running. ' +
+          'Running two Pretender servers at once will lead to unexpected results and will ' +
+          'be removed entirely in a future major version.' +
+          'Please call .shutdown() on your instances when you no longer need them to respond.');
+  }
+  return FakeRequest;
+}
+
+function verbify(verb) {
+  return function(path, handler, async) {
+    return this.register(verb, path, handler, async);
+  };
+}
+
+function scheduleProgressEvent(request, startTime, totalTime) {
+  setTimeout(function() {
+    if (!request.aborted && !request.status) {
+      var ellapsedTime = new Date().getTime() - startTime.getTime();
+      request.upload._progress(true, ellapsedTime, totalTime);
+      request._progress(true, ellapsedTime, totalTime);
+      scheduleProgressEvent(request, startTime, totalTime);
+    }
+  }, 50);
+}
+
+function isArray(array) {
+  return Object.prototype.toString.call(array) === '[object Array]';
+}
+
+var PASSTHROUGH = {};
+
+Pretender.prototype = {
+  get: verbify('GET'),
+  post: verbify('POST'),
+  put: verbify('PUT'),
+  'delete': verbify('DELETE'),
+  patch: verbify('PATCH'),
+  head: verbify('HEAD'),
+  options: verbify('OPTIONS'),
+  map: function(maps) {
+    maps.call(this);
+  },
+  register: function register(verb, url, handler, async) {
+    if (!handler) {
+      throw new Error('The function you tried passing to Pretender to handle ' +
+        verb + ' ' + url + ' is undefined or missing.');
+    }
+
+    handler.numberOfCalls = 0;
+    handler.async = async;
+    this.handlers.push(handler);
+
+    var registry = this.hosts.forURL(url)[verb];
+
+    registry.add([{
+      path: parseURL(url).fullpath,
+      handler: handler
+    }]);
+
+    return handler;
+  },
+  passthrough: PASSTHROUGH,
+  checkPassthrough: function checkPassthrough(request) {
+    var verb = request.method.toUpperCase();
+    var path = parseURL(request.url).fullpath;
+    var recognized = this.hosts.forURL(request.url)[verb].recognize(path);
+    var match = recognized && recognized[0];
+
+    if ((match && match.handler === PASSTHROUGH) || this.forcePassthrough)  {
+      this.passthroughRequests.push(request);
+      this.passthroughRequest(verb, path, request);
+      return true;
+    }
+
+    return false;
+  },
+  handleRequest: function handleRequest(request) {
+    var verb = request.method.toUpperCase();
+    var path = request.url;
+
+    var handler = this._handlerFor(verb, path, request);
+
+    if (handler) {
+      handler.handler.numberOfCalls++;
+      var async = handler.handler.async;
+      this.handledRequests.push(request);
+
+      var pretender = this;
+
+      var _handleRequest = function(statusHeadersAndBody) {
+        if (!isArray(statusHeadersAndBody)) {
+          var note = 'Remember to `return [status, headers, body];` in your route handler.';
+          throw new Error('Nothing returned by handler for ' + path + '. ' + note);
+        }
+
+        var status = statusHeadersAndBody[0],
+            headers = pretender.prepareHeaders(statusHeadersAndBody[1]),
+            body = pretender.prepareBody(statusHeadersAndBody[2], headers);
+
+        pretender.handleResponse(request, async, function() {
+          request.respond(status, headers, body);
+          pretender.handledRequest(verb, path, request);
+        });
+      };
+
+      try {
+        var result = handler.handler(request);
+        if (result && typeof result.then === 'function') {
+          // `result` is a promise, resolve it
+          result.then(function(resolvedResult) {
+            _handleRequest(resolvedResult);
+          });
+        } else {
+          _handleRequest(result);
+        }
+      } catch (error) {
+        this.erroredRequest(verb, path, request, error);
+        this.resolve(request);
+      }
+    } else {
+      if (!this.disableUnhandled) {
+        this.unhandledRequests.push(request);
+        this.unhandledRequest(verb, path, request);
+      }
+    }
+  },
+  handleResponse: function handleResponse(request, strategy, callback) {
+    var delay = typeof strategy === 'function' ? strategy() : strategy;
+    delay = typeof delay === 'boolean' || typeof delay === 'number' ? delay : 0;
+
+    if (delay === false) {
+      callback();
+    } else {
+      var pretender = this;
+      pretender.requestReferences.push({
+        request: request,
+        callback: callback
+      });
+
+      if (delay !== true) {
+        scheduleProgressEvent(request, new Date(), delay);
+        setTimeout(function() {
+          pretender.resolve(request);
+        }, delay);
+      }
+    }
+  },
+  resolve: function resolve(request) {
+    for (var i = 0, len = this.requestReferences.length; i < len; i++) {
+      var res = this.requestReferences[i];
+      if (res.request === request) {
+        res.callback();
+        this.requestReferences.splice(i, 1);
+        break;
+      }
+    }
+  },
+  requiresManualResolution: function(verb, path) {
+    var handler = this._handlerFor(verb.toUpperCase(), path, {});
+    if (!handler) { return false; }
+
+    var async = handler.handler.async;
+    return typeof async === 'function' ? async() === true : async === true;
+  },
+  prepareBody: function(body) { return body; },
+  prepareHeaders: function(headers) { return headers; },
+  handledRequest: function(/* verb, path, request */) { /* no-op */},
+  passthroughRequest: function(/* verb, path, request */) { /* no-op */},
+  unhandledRequest: function(verb, path/*, request */) {
+    throw new Error('Pretender intercepted ' + verb + ' ' +
+      path + ' but no handler was defined for this type of request');
+  },
+  erroredRequest: function(verb, path, request, error) {
+    error.message = 'Pretender intercepted ' + verb + ' ' +
+      path + ' but encountered an error: ' + error.message;
+    throw error;
+  },
+  _handlerFor: function(verb, url, request) {
+    var registry = this.hosts.forURL(url)[verb];
+    var matches = registry.recognize(parseURL(url).fullpath);
+
+    var match = matches ? matches[0] : null;
+    if (match) {
+      request.params = match.params;
+      request.queryParams = matches.queryParams;
+    }
+
+    return match;
+  },
+  shutdown: function shutdown() {
+    self.XMLHttpRequest = this._nativeXMLHttpRequest;
+    this.ctx.pretender = undefined;
+    // 'stop' the server
+    this.running = false;
+  }
+};
+
+Pretender.parseURL = parseURL;
+Pretender.Hosts = Hosts;
+Pretender.Registry = Registry;
+
+if (typeof module === 'object') {
+  module.exports = Pretender;
+} else if (typeof define !== 'undefined') {
+  define('pretender', [], function() {
+    return Pretender;
+  });
+}
+self.Pretender = Pretender;
+}(self));
diff --git a/vendor/assets/javascripts/qunit.js b/vendor/assets/javascripts/qunit.js
new file mode 100644
index 0000000000..e30bb19153
--- /dev/null
+++ b/vendor/assets/javascripts/qunit.js
@@ -0,0 +1,6566 @@
+/*!
+ * QUnit 2.8.0
+ * https://qunitjs.com/
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license
+ * https://jquery.org/license
+ *
+ * Date: 2018-11-02T16:17Z
+ */
+(function (global$1) {
+  'use strict';
+
+  global$1 = global$1 && global$1.hasOwnProperty('default') ? global$1['default'] : global$1;
+
+  var window$1 = global$1.window;
+  var self$1 = global$1.self;
+  var console = global$1.console;
+  var setTimeout$1 = global$1.setTimeout;
+  var clearTimeout = global$1.clearTimeout;
+
+  var document$1 = window$1 && window$1.document;
+  var navigator = window$1 && window$1.navigator;
+
+  var localSessionStorage = function () {
+  	var x = "qunit-test-string";
+  	try {
+  		global$1.sessionStorage.setItem(x, x);
+  		global$1.sessionStorage.removeItem(x);
+  		return global$1.sessionStorage;
+  	} catch (e) {
+  		return undefined;
+  	}
+  }();
+
+  /**
+   * Returns a function that proxies to the given method name on the globals
+   * console object. The proxy will also detect if the console doesn't exist and
+   * will appropriately no-op. This allows support for IE9, which doesn't have a
+   * console if the developer tools are not open.
+   */
+  function consoleProxy(method) {
+  	return function () {
+  		if (console) {
+  			console[method].apply(console, arguments);
+  		}
+  	};
+  }
+
+  var Logger = {
+  	warn: consoleProxy("warn")
+  };
+
+  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  };
+
+
+
+
+
+
+
+
+
+
+
+  var classCallCheck = function (instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  };
+
+  var createClass = function () {
+    function defineProperties(target, props) {
+      for (var i = 0; i < props.length; i++) {
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+      }
+    }
+
+    return function (Constructor, protoProps, staticProps) {
+      if (protoProps) defineProperties(Constructor.prototype, protoProps);
+      if (staticProps) defineProperties(Constructor, staticProps);
+      return Constructor;
+    };
+  }();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  var toConsumableArray = function (arr) {
+    if (Array.isArray(arr)) {
+      for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
+
+      return arr2;
+    } else {
+      return Array.from(arr);
+    }
+  };
+
+  var toString = Object.prototype.toString;
+  var hasOwn = Object.prototype.hasOwnProperty;
+  var now = Date.now || function () {
+  	return new Date().getTime();
+  };
+
+  var hasPerformanceApi = detectPerformanceApi();
+  var performance = hasPerformanceApi ? window$1.performance : undefined;
+  var performanceNow = hasPerformanceApi ? performance.now.bind(performance) : now;
+
+  function detectPerformanceApi() {
+  	return window$1 && typeof window$1.performance !== "undefined" && typeof window$1.performance.mark === "function" && typeof window$1.performance.measure === "function";
+  }
+
+  function measure(comment, startMark, endMark) {
+
+  	// `performance.measure` may fail if the mark could not be found.
+  	// reasons a specific mark could not be found include: outside code invoking `performance.clearMarks()`
+  	try {
+  		performance.measure(comment, startMark, endMark);
+  	} catch (ex) {
+  		Logger.warn("performance.measure could not be executed because of ", ex.message);
+  	}
+  }
+
+  var defined = {
+  	document: window$1 && window$1.document !== undefined,
+  	setTimeout: setTimeout$1 !== undefined
+  };
+
+  // Returns a new Array with the elements that are in a but not in b
+  function diff(a, b) {
+  	var i,
+  	    j,
+  	    result = a.slice();
+
+  	for (i = 0; i < result.length; i++) {
+  		for (j = 0; j < b.length; j++) {
+  			if (result[i] === b[j]) {
+  				result.splice(i, 1);
+  				i--;
+  				break;
+  			}
+  		}
+  	}
+  	return result;
+  }
+
+  /**
+   * Determines whether an element exists in a given array or not.
+   *
+   * @method inArray
+   * @param {Any} elem
+   * @param {Array} array
+   * @return {Boolean}
+   */
+  function inArray(elem, array) {
+  	return array.indexOf(elem) !== -1;
+  }
+
+  /**
+   * Makes a clone of an object using only Array or Object as base,
+   * and copies over the own enumerable properties.
+   *
+   * @param {Object} obj
+   * @return {Object} New object with only the own properties (recursively).
+   */
+  function objectValues(obj) {
+  	var key,
+  	    val,
+  	    vals = is("array", obj) ? [] : {};
+  	for (key in obj) {
+  		if (hasOwn.call(obj, key)) {
+  			val = obj[key];
+  			vals[key] = val === Object(val) ? objectValues(val) : val;
+  		}
+  	}
+  	return vals;
+  }
+
+  function extend(a, b, undefOnly) {
+  	for (var prop in b) {
+  		if (hasOwn.call(b, prop)) {
+  			if (b[prop] === undefined) {
+  				delete a[prop];
+  			} else if (!(undefOnly && typeof a[prop] !== "undefined")) {
+  				a[prop] = b[prop];
+  			}
+  		}
+  	}
+
+  	return a;
+  }
+
+  function objectType(obj) {
+  	if (typeof obj === "undefined") {
+  		return "undefined";
+  	}
+
+  	// Consider: typeof null === object
+  	if (obj === null) {
+  		return "null";
+  	}
+
+  	var match = toString.call(obj).match(/^\[object\s(.*)\]$/),
+  	    type = match && match[1];
+
+  	switch (type) {
+  		case "Number":
+  			if (isNaN(obj)) {
+  				return "nan";
+  			}
+  			return "number";
+  		case "String":
+  		case "Boolean":
+  		case "Array":
+  		case "Set":
+  		case "Map":
+  		case "Date":
+  		case "RegExp":
+  		case "Function":
+  		case "Symbol":
+  			return type.toLowerCase();
+  		default:
+  			return typeof obj === "undefined" ? "undefined" : _typeof(obj);
+  	}
+  }
+
+  // Safe object type checking
+  function is(type, obj) {
+  	return objectType(obj) === type;
+  }
+
+  // Based on Java's String.hashCode, a simple but not
+  // rigorously collision resistant hashing function
+  function generateHash(module, testName) {
+  	var str = module + "\x1C" + testName;
+  	var hash = 0;
+
+  	for (var i = 0; i < str.length; i++) {
+  		hash = (hash << 5) - hash + str.charCodeAt(i);
+  		hash |= 0;
+  	}
+
+  	// Convert the possibly negative integer hash code into an 8 character hex string, which isn't
+  	// strictly necessary but increases user understanding that the id is a SHA-like hash
+  	var hex = (0x100000000 + hash).toString(16);
+  	if (hex.length < 8) {
+  		hex = "0000000" + hex;
+  	}
+
+  	return hex.slice(-8);
+  }
+
+  // Test for equality any JavaScript type.
+  // Authors: Philippe Rathé <prathe@gmail.com>, David Chan <david@troi.org>
+  var equiv = (function () {
+
+  	// Value pairs queued for comparison. Used for breadth-first processing order, recursion
+  	// detection and avoiding repeated comparison (see below for details).
+  	// Elements are { a: val, b: val }.
+  	var pairs = [];
+
+  	var getProto = Object.getPrototypeOf || function (obj) {
+  		return obj.__proto__;
+  	};
+
+  	function useStrictEquality(a, b) {
+
+  		// This only gets called if a and b are not strict equal, and is used to compare on
+  		// the primitive values inside object wrappers. For example:
+  		// `var i = 1;`
+  		// `var j = new Number(1);`
+  		// Neither a nor b can be null, as a !== b and they have the same type.
+  		if ((typeof a === "undefined" ? "undefined" : _typeof(a)) === "object") {
+  			a = a.valueOf();
+  		}
+  		if ((typeof b === "undefined" ? "undefined" : _typeof(b)) === "object") {
+  			b = b.valueOf();
+  		}
+
+  		return a === b;
+  	}
+
+  	function compareConstructors(a, b) {
+  		var protoA = getProto(a);
+  		var protoB = getProto(b);
+
+  		// Comparing constructors is more strict than using `instanceof`
+  		if (a.constructor === b.constructor) {
+  			return true;
+  		}
+
+  		// Ref #851
+  		// If the obj prototype descends from a null constructor, treat it
+  		// as a null prototype.
+  		if (protoA && protoA.constructor === null) {
+  			protoA = null;
+  		}
+  		if (protoB && protoB.constructor === null) {
+  			protoB = null;
+  		}
+
+  		// Allow objects with no prototype to be equivalent to
+  		// objects with Object as their constructor.
+  		if (protoA === null && protoB === Object.prototype || protoB === null && protoA === Object.prototype) {
+  			return true;
+  		}
+
+  		return false;
+  	}
+
+  	function getRegExpFlags(regexp) {
+  		return "flags" in regexp ? regexp.flags : regexp.toString().match(/[gimuy]*$/)[0];
+  	}
+
+  	function isContainer(val) {
+  		return ["object", "array", "map", "set"].indexOf(objectType(val)) !== -1;
+  	}
+
+  	function breadthFirstCompareChild(a, b) {
+
+  		// If a is a container not reference-equal to b, postpone the comparison to the
+  		// end of the pairs queue -- unless (a, b) has been seen before, in which case skip
+  		// over the pair.
+  		if (a === b) {
+  			return true;
+  		}
+  		if (!isContainer(a)) {
+  			return typeEquiv(a, b);
+  		}
+  		if (pairs.every(function (pair) {
+  			return pair.a !== a || pair.b !== b;
+  		})) {
+
+  			// Not yet started comparing this pair
+  			pairs.push({ a: a, b: b });
+  		}
+  		return true;
+  	}
+
+  	var callbacks = {
+  		"string": useStrictEquality,
+  		"boolean": useStrictEquality,
+  		"number": useStrictEquality,
+  		"null": useStrictEquality,
+  		"undefined": useStrictEquality,
+  		"symbol": useStrictEquality,
+  		"date": useStrictEquality,
+
+  		"nan": function nan() {
+  			return true;
+  		},
+
+  		"regexp": function regexp(a, b) {
+  			return a.source === b.source &&
+
+  			// Include flags in the comparison
+  			getRegExpFlags(a) === getRegExpFlags(b);
+  		},
+
+  		// abort (identical references / instance methods were skipped earlier)
+  		"function": function _function() {
+  			return false;
+  		},
+
+  		"array": function array(a, b) {
+  			var i, len;
+
+  			len = a.length;
+  			if (len !== b.length) {
+
+  				// Safe and faster
+  				return false;
+  			}
+
+  			for (i = 0; i < len; i++) {
+
+  				// Compare non-containers; queue non-reference-equal containers
+  				if (!breadthFirstCompareChild(a[i], b[i])) {
+  					return false;
+  				}
+  			}
+  			return true;
+  		},
+
+  		// Define sets a and b to be equivalent if for each element aVal in a, there
+  		// is some element bVal in b such that aVal and bVal are equivalent. Element
+  		// repetitions are not counted, so these are equivalent:
+  		// a = new Set( [ {}, [], [] ] );
+  		// b = new Set( [ {}, {}, [] ] );
+  		"set": function set$$1(a, b) {
+  			var innerEq,
+  			    outerEq = true;
+
+  			if (a.size !== b.size) {
+
+  				// This optimization has certain quirks because of the lack of
+  				// repetition counting. For instance, adding the same
+  				// (reference-identical) element to two equivalent sets can
+  				// make them non-equivalent.
+  				return false;
+  			}
+
+  			a.forEach(function (aVal) {
+
+  				// Short-circuit if the result is already known. (Using for...of
+  				// with a break clause would be cleaner here, but it would cause
+  				// a syntax error on older Javascript implementations even if
+  				// Set is unused)
+  				if (!outerEq) {
+  					return;
+  				}
+
+  				innerEq = false;
+
+  				b.forEach(function (bVal) {
+  					var parentPairs;
+
+  					// Likewise, short-circuit if the result is already known
+  					if (innerEq) {
+  						return;
+  					}
+
+  					// Swap out the global pairs list, as the nested call to
+  					// innerEquiv will clobber its contents
+  					parentPairs = pairs;
+  					if (innerEquiv(bVal, aVal)) {
+  						innerEq = true;
+  					}
+
+  					// Replace the global pairs list
+  					pairs = parentPairs;
+  				});
+
+  				if (!innerEq) {
+  					outerEq = false;
+  				}
+  			});
+
+  			return outerEq;
+  		},
+
+  		// Define maps a and b to be equivalent if for each key-value pair (aKey, aVal)
+  		// in a, there is some key-value pair (bKey, bVal) in b such that
+  		// [ aKey, aVal ] and [ bKey, bVal ] are equivalent. Key repetitions are not
+  		// counted, so these are equivalent:
+  		// a = new Map( [ [ {}, 1 ], [ {}, 1 ], [ [], 1 ] ] );
+  		// b = new Map( [ [ {}, 1 ], [ [], 1 ], [ [], 1 ] ] );
+  		"map": function map(a, b) {
+  			var innerEq,
+  			    outerEq = true;
+
+  			if (a.size !== b.size) {
+
+  				// This optimization has certain quirks because of the lack of
+  				// repetition counting. For instance, adding the same
+  				// (reference-identical) key-value pair to two equivalent maps
+  				// can make them non-equivalent.
+  				return false;
+  			}
+
+  			a.forEach(function (aVal, aKey) {
+
+  				// Short-circuit if the result is already known. (Using for...of
+  				// with a break clause would be cleaner here, but it would cause
+  				// a syntax error on older Javascript implementations even if
+  				// Map is unused)
+  				if (!outerEq) {
+  					return;
+  				}
+
+  				innerEq = false;
+
+  				b.forEach(function (bVal, bKey) {
+  					var parentPairs;
+
+  					// Likewise, short-circuit if the result is already known
+  					if (innerEq) {
+  						return;
+  					}
+
+  					// Swap out the global pairs list, as the nested call to
+  					// innerEquiv will clobber its contents
+  					parentPairs = pairs;
+  					if (innerEquiv([bVal, bKey], [aVal, aKey])) {
+  						innerEq = true;
+  					}
+
+  					// Replace the global pairs list
+  					pairs = parentPairs;
+  				});
+
+  				if (!innerEq) {
+  					outerEq = false;
+  				}
+  			});
+
+  			return outerEq;
+  		},
+
+  		"object": function object(a, b) {
+  			var i,
+  			    aProperties = [],
+  			    bProperties = [];
+
+  			if (compareConstructors(a, b) === false) {
+  				return false;
+  			}
+
+  			// Be strict: don't ensure hasOwnProperty and go deep
+  			for (i in a) {
+
+  				// Collect a's properties
+  				aProperties.push(i);
+
+  				// Skip OOP methods that look the same
+  				if (a.constructor !== Object && typeof a.constructor !== "undefined" && typeof a[i] === "function" && typeof b[i] === "function" && a[i].toString() === b[i].toString()) {
+  					continue;
+  				}
+
+  				// Compare non-containers; queue non-reference-equal containers
+  				if (!breadthFirstCompareChild(a[i], b[i])) {
+  					return false;
+  				}
+  			}
+
+  			for (i in b) {
+
+  				// Collect b's properties
+  				bProperties.push(i);
+  			}
+
+  			// Ensures identical properties name
+  			return typeEquiv(aProperties.sort(), bProperties.sort());
+  		}
+  	};
+
+  	function typeEquiv(a, b) {
+  		var type = objectType(a);
+
+  		// Callbacks for containers will append to the pairs queue to achieve breadth-first
+  		// search order. The pairs queue is also used to avoid reprocessing any pair of
+  		// containers that are reference-equal to a previously visited pair (a special case
+  		// this being recursion detection).
+  		//
+  		// Because of this approach, once typeEquiv returns a false value, it should not be
+  		// called again without clearing the pair queue else it may wrongly report a visited
+  		// pair as being equivalent.
+  		return objectType(b) === type && callbacks[type](a, b);
+  	}
+
+  	function innerEquiv(a, b) {
+  		var i, pair;
+
+  		// We're done when there's nothing more to compare
+  		if (arguments.length < 2) {
+  			return true;
+  		}
+
+  		// Clear the global pair queue and add the top-level values being compared
+  		pairs = [{ a: a, b: b }];
+
+  		for (i = 0; i < pairs.length; i++) {
+  			pair = pairs[i];
+
+  			// Perform type-specific comparison on any pairs that are not strictly
+  			// equal. For container types, that comparison will postpone comparison
+  			// of any sub-container pair to the end of the pair queue. This gives
+  			// breadth-first search order. It also avoids the reprocessing of
+  			// reference-equal siblings, cousins etc, which can have a significant speed
+  			// impact when comparing a container of small objects each of which has a
+  			// reference to the same (singleton) large object.
+  			if (pair.a !== pair.b && !typeEquiv(pair.a, pair.b)) {
+  				return false;
+  			}
+  		}
+
+  		// ...across all consecutive argument pairs
+  		return arguments.length === 2 || innerEquiv.apply(this, [].slice.call(arguments, 1));
+  	}
+
+  	return function () {
+  		var result = innerEquiv.apply(undefined, arguments);
+
+  		// Release any retained objects
+  		pairs.length = 0;
+  		return result;
+  	};
+  })();
+
+  /**
+   * Config object: Maintain internal state
+   * Later exposed as QUnit.config
+   * `config` initialized at top of scope
+   */
+  var config = {
+
+  	// The queue of tests to run
+  	queue: [],
+
+  	// Block until document ready
+  	blocking: true,
+
+  	// By default, run previously failed tests first
+  	// very useful in combination with "Hide passed tests" checked
+  	reorder: true,
+
+  	// By default, modify document.title when suite is done
+  	altertitle: true,
+
+  	// HTML Reporter: collapse every test except the first failing test
+  	// If false, all failing tests will be expanded
+  	collapse: true,
+
+  	// By default, scroll to top of the page when suite is done
+  	scrolltop: true,
+
+  	// Depth up-to which object will be dumped
+  	maxDepth: 5,
+
+  	// When enabled, all tests must call expect()
+  	requireExpects: false,
+
+  	// Placeholder for user-configurable form-exposed URL parameters
+  	urlConfig: [],
+
+  	// Set of all modules.
+  	modules: [],
+
+  	// The first unnamed module
+  	currentModule: {
+  		name: "",
+  		tests: [],
+  		childModules: [],
+  		testsRun: 0,
+  		unskippedTestsRun: 0,
+  		hooks: {
+  			before: [],
+  			beforeEach: [],
+  			afterEach: [],
+  			after: []
+  		}
+  	},
+
+  	callbacks: {},
+
+  	// The storage module to use for reordering tests
+  	storage: localSessionStorage
+  };
+
+  // take a predefined QUnit.config and extend the defaults
+  var globalConfig = window$1 && window$1.QUnit && window$1.QUnit.config;
+
+  // only extend the global config if there is no QUnit overload
+  if (window$1 && window$1.QUnit && !window$1.QUnit.version) {
+  	extend(config, globalConfig);
+  }
+
+  // Push a loose unnamed module to the modules collection
+  config.modules.push(config.currentModule);
+
+  // Based on jsDump by Ariel Flesler
+  // http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html
+  var dump = (function () {
+  	function quote(str) {
+  		return "\"" + str.toString().replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"";
+  	}
+  	function literal(o) {
+  		return o + "";
+  	}
+  	function join(pre, arr, post) {
+  		var s = dump.separator(),
+  		    base = dump.indent(),
+  		    inner = dump.indent(1);
+  		if (arr.join) {
+  			arr = arr.join("," + s + inner);
+  		}
+  		if (!arr) {
+  			return pre + post;
+  		}
+  		return [pre, inner + arr, base + post].join(s);
+  	}
+  	function array(arr, stack) {
+  		var i = arr.length,
+  		    ret = new Array(i);
+
+  		if (dump.maxDepth && dump.depth > dump.maxDepth) {
+  			return "[object Array]";
+  		}
+
+  		this.up();
+  		while (i--) {
+  			ret[i] = this.parse(arr[i], undefined, stack);
+  		}
+  		this.down();
+  		return join("[", ret, "]");
+  	}
+
+  	function isArray(obj) {
+  		return (
+
+  			//Native Arrays
+  			toString.call(obj) === "[object Array]" ||
+
+  			// NodeList objects
+  			typeof obj.length === "number" && obj.item !== undefined && (obj.length ? obj.item(0) === obj[0] : obj.item(0) === null && obj[0] === undefined)
+  		);
+  	}
+
+  	var reName = /^function (\w+)/,
+  	    dump = {
+
+  		// The objType is used mostly internally, you can fix a (custom) type in advance
+  		parse: function parse(obj, objType, stack) {
+  			stack = stack || [];
+  			var res,
+  			    parser,
+  			    parserType,
+  			    objIndex = stack.indexOf(obj);
+
+  			if (objIndex !== -1) {
+  				return "recursion(" + (objIndex - stack.length) + ")";
+  			}
+
+  			objType = objType || this.typeOf(obj);
+  			parser = this.parsers[objType];
+  			parserType = typeof parser === "undefined" ? "undefined" : _typeof(parser);
+
+  			if (parserType === "function") {
+  				stack.push(obj);
+  				res = parser.call(this, obj, stack);
+  				stack.pop();
+  				return res;
+  			}
+  			return parserType === "string" ? parser : this.parsers.error;
+  		},
+  		typeOf: function typeOf(obj) {
+  			var type;
+
+  			if (obj === null) {
+  				type = "null";
+  			} else if (typeof obj === "undefined") {
+  				type = "undefined";
+  			} else if (is("regexp", obj)) {
+  				type = "regexp";
+  			} else if (is("date", obj)) {
+  				type = "date";
+  			} else if (is("function", obj)) {
+  				type = "function";
+  			} else if (obj.setInterval !== undefined && obj.document !== undefined && obj.nodeType === undefined) {
+  				type = "window";
+  			} else if (obj.nodeType === 9) {
+  				type = "document";
+  			} else if (obj.nodeType) {
+  				type = "node";
+  			} else if (isArray(obj)) {
+  				type = "array";
+  			} else if (obj.constructor === Error.prototype.constructor) {
+  				type = "error";
+  			} else {
+  				type = typeof obj === "undefined" ? "undefined" : _typeof(obj);
+  			}
+  			return type;
+  		},
+
+  		separator: function separator() {
+  			if (this.multiline) {
+  				return this.HTML ? "<br />" : "\n";
+  			} else {
+  				return this.HTML ? "&#160;" : " ";
+  			}
+  		},
+
+  		// Extra can be a number, shortcut for increasing-calling-decreasing
+  		indent: function indent(extra) {
+  			if (!this.multiline) {
+  				return "";
+  			}
+  			var chr = this.indentChar;
+  			if (this.HTML) {
+  				chr = chr.replace(/\t/g, "   ").replace(/ /g, "&#160;");
+  			}
+  			return new Array(this.depth + (extra || 0)).join(chr);
+  		},
+  		up: function up(a) {
+  			this.depth += a || 1;
+  		},
+  		down: function down(a) {
+  			this.depth -= a || 1;
+  		},
+  		setParser: function setParser(name, parser) {
+  			this.parsers[name] = parser;
+  		},
+
+  		// The next 3 are exposed so you can use them
+  		quote: quote,
+  		literal: literal,
+  		join: join,
+  		depth: 1,
+  		maxDepth: config.maxDepth,
+
+  		// This is the list of parsers, to modify them, use dump.setParser
+  		parsers: {
+  			window: "[Window]",
+  			document: "[Document]",
+  			error: function error(_error) {
+  				return "Error(\"" + _error.message + "\")";
+  			},
+  			unknown: "[Unknown]",
+  			"null": "null",
+  			"undefined": "undefined",
+  			"function": function _function(fn) {
+  				var ret = "function",
+
+
+  				// Functions never have name in IE
+  				name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1];
+
+  				if (name) {
+  					ret += " " + name;
+  				}
+  				ret += "(";
+
+  				ret = [ret, dump.parse(fn, "functionArgs"), "){"].join("");
+  				return join(ret, dump.parse(fn, "functionCode"), "}");
+  			},
+  			array: array,
+  			nodelist: array,
+  			"arguments": array,
+  			object: function object(map, stack) {
+  				var keys,
+  				    key,
+  				    val,
+  				    i,
+  				    nonEnumerableProperties,
+  				    ret = [];
+
+  				if (dump.maxDepth && dump.depth > dump.maxDepth) {
+  					return "[object Object]";
+  				}
+
+  				dump.up();
+  				keys = [];
+  				for (key in map) {
+  					keys.push(key);
+  				}
+
+  				// Some properties are not always enumerable on Error objects.
+  				nonEnumerableProperties = ["message", "name"];
+  				for (i in nonEnumerableProperties) {
+  					key = nonEnumerableProperties[i];
+  					if (key in map && !inArray(key, keys)) {
+  						keys.push(key);
+  					}
+  				}
+  				keys.sort();
+  				for (i = 0; i < keys.length; i++) {
+  					key = keys[i];
+  					val = map[key];
+  					ret.push(dump.parse(key, "key") + ": " + dump.parse(val, undefined, stack));
+  				}
+  				dump.down();
+  				return join("{", ret, "}");
+  			},
+  			node: function node(_node) {
+  				var len,
+  				    i,
+  				    val,
+  				    open = dump.HTML ? "&lt;" : "<",
+  				    close = dump.HTML ? "&gt;" : ">",
+  				    tag = _node.nodeName.toLowerCase(),
+  				    ret = open + tag,
+  				    attrs = _node.attributes;
+
+  				if (attrs) {
+  					for (i = 0, len = attrs.length; i < len; i++) {
+  						val = attrs[i].nodeValue;
+
+  						// IE6 includes all attributes in .attributes, even ones not explicitly
+  						// set. Those have values like undefined, null, 0, false, "" or
+  						// "inherit".
+  						if (val && val !== "inherit") {
+  							ret += " " + attrs[i].nodeName + "=" + dump.parse(val, "attribute");
+  						}
+  					}
+  				}
+  				ret += close;
+
+  				// Show content of TextNode or CDATASection
+  				if (_node.nodeType === 3 || _node.nodeType === 4) {
+  					ret += _node.nodeValue;
+  				}
+
+  				return ret + open + "/" + tag + close;
+  			},
+
+  			// Function calls it internally, it's the arguments part of the function
+  			functionArgs: function functionArgs(fn) {
+  				var args,
+  				    l = fn.length;
+
+  				if (!l) {
+  					return "";
+  				}
+
+  				args = new Array(l);
+  				while (l--) {
+
+  					// 97 is 'a'
+  					args[l] = String.fromCharCode(97 + l);
+  				}
+  				return " " + args.join(", ") + " ";
+  			},
+
+  			// Object calls it internally, the key part of an item in a map
+  			key: quote,
+
+  			// Function calls it internally, it's the content of the function
+  			functionCode: "[code]",
+
+  			// Node calls it internally, it's a html attribute value
+  			attribute: quote,
+  			string: quote,
+  			date: quote,
+  			regexp: literal,
+  			number: literal,
+  			"boolean": literal,
+  			symbol: function symbol(sym) {
+  				return sym.toString();
+  			}
+  		},
+
+  		// If true, entities are escaped ( <, >, \t, space and \n )
+  		HTML: false,
+
+  		// Indentation unit
+  		indentChar: "  ",
+
+  		// If true, items in a collection, are separated by a \n, else just a space.
+  		multiline: true
+  	};
+
+  	return dump;
+  })();
+
+  var SuiteReport = function () {
+  	function SuiteReport(name, parentSuite) {
+  		classCallCheck(this, SuiteReport);
+
+  		this.name = name;
+  		this.fullName = parentSuite ? parentSuite.fullName.concat(name) : [];
+
+  		this.tests = [];
+  		this.childSuites = [];
+
+  		if (parentSuite) {
+  			parentSuite.pushChildSuite(this);
+  		}
+  	}
+
+  	createClass(SuiteReport, [{
+  		key: "start",
+  		value: function start(recordTime) {
+  			if (recordTime) {
+  				this._startTime = performanceNow();
+
+  				if (performance) {
+  					var suiteLevel = this.fullName.length;
+  					performance.mark("qunit_suite_" + suiteLevel + "_start");
+  				}
+  			}
+
+  			return {
+  				name: this.name,
+  				fullName: this.fullName.slice(),
+  				tests: this.tests.map(function (test) {
+  					return test.start();
+  				}),
+  				childSuites: this.childSuites.map(function (suite) {
+  					return suite.start();
+  				}),
+  				testCounts: {
+  					total: this.getTestCounts().total
+  				}
+  			};
+  		}
+  	}, {
+  		key: "end",
+  		value: function end(recordTime) {
+  			if (recordTime) {
+  				this._endTime = performanceNow();
+
+  				if (performance) {
+  					var suiteLevel = this.fullName.length;
+  					performance.mark("qunit_suite_" + suiteLevel + "_end");
+
+  					var suiteName = this.fullName.join(" – ");
+
+  					measure(suiteLevel === 0 ? "QUnit Test Run" : "QUnit Test Suite: " + suiteName, "qunit_suite_" + suiteLevel + "_start", "qunit_suite_" + suiteLevel + "_end");
+  				}
+  			}
+
+  			return {
+  				name: this.name,
+  				fullName: this.fullName.slice(),
+  				tests: this.tests.map(function (test) {
+  					return test.end();
+  				}),
+  				childSuites: this.childSuites.map(function (suite) {
+  					return suite.end();
+  				}),
+  				testCounts: this.getTestCounts(),
+  				runtime: this.getRuntime(),
+  				status: this.getStatus()
+  			};
+  		}
+  	}, {
+  		key: "pushChildSuite",
+  		value: function pushChildSuite(suite) {
+  			this.childSuites.push(suite);
+  		}
+  	}, {
+  		key: "pushTest",
+  		value: function pushTest(test) {
+  			this.tests.push(test);
+  		}
+  	}, {
+  		key: "getRuntime",
+  		value: function getRuntime() {
+  			return this._endTime - this._startTime;
+  		}
+  	}, {
+  		key: "getTestCounts",
+  		value: function getTestCounts() {
+  			var counts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : { passed: 0, failed: 0, skipped: 0, todo: 0, total: 0 };
+
+  			counts = this.tests.reduce(function (counts, test) {
+  				if (test.valid) {
+  					counts[test.getStatus()]++;
+  					counts.total++;
+  				}
+
+  				return counts;
+  			}, counts);
+
+  			return this.childSuites.reduce(function (counts, suite) {
+  				return suite.getTestCounts(counts);
+  			}, counts);
+  		}
+  	}, {
+  		key: "getStatus",
+  		value: function getStatus() {
+  			var _getTestCounts = this.getTestCounts(),
+  			    total = _getTestCounts.total,
+  			    failed = _getTestCounts.failed,
+  			    skipped = _getTestCounts.skipped,
+  			    todo = _getTestCounts.todo;
+
+  			if (failed) {
+  				return "failed";
+  			} else {
+  				if (skipped === total) {
+  					return "skipped";
+  				} else if (todo === total) {
+  					return "todo";
+  				} else {
+  					return "passed";
+  				}
+  			}
+  		}
+  	}]);
+  	return SuiteReport;
+  }();
+
+  var focused = false;
+
+  var moduleStack = [];
+
+  function createModule(name, testEnvironment, modifiers) {
+  	var parentModule = moduleStack.length ? moduleStack.slice(-1)[0] : null;
+  	var moduleName = parentModule !== null ? [parentModule.name, name].join(" > ") : name;
+  	var parentSuite = parentModule ? parentModule.suiteReport : globalSuite;
+
+  	var skip = parentModule !== null && parentModule.skip || modifiers.skip;
+  	var todo = parentModule !== null && parentModule.todo || modifiers.todo;
+
+  	var module = {
+  		name: moduleName,
+  		parentModule: parentModule,
+  		tests: [],
+  		moduleId: generateHash(moduleName),
+  		testsRun: 0,
+  		unskippedTestsRun: 0,
+  		childModules: [],
+  		suiteReport: new SuiteReport(name, parentSuite),
+
+  		// Pass along `skip` and `todo` properties from parent module, in case
+  		// there is one, to childs. And use own otherwise.
+  		// This property will be used to mark own tests and tests of child suites
+  		// as either `skipped` or `todo`.
+  		skip: skip,
+  		todo: skip ? false : todo
+  	};
+
+  	var env = {};
+  	if (parentModule) {
+  		parentModule.childModules.push(module);
+  		extend(env, parentModule.testEnvironment);
+  	}
+  	extend(env, testEnvironment);
+  	module.testEnvironment = env;
+
+  	config.modules.push(module);
+  	return module;
+  }
+
+  function processModule(name, options, executeNow) {
+  	var modifiers = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+
+  	if (objectType(options) === "function") {
+  		executeNow = options;
+  		options = undefined;
+  	}
+
+  	var module = createModule(name, options, modifiers);
+
+  	// Move any hooks to a 'hooks' object
+  	var testEnvironment = module.testEnvironment;
+  	var hooks = module.hooks = {};
+
+  	setHookFromEnvironment(hooks, testEnvironment, "before");
+  	setHookFromEnvironment(hooks, testEnvironment, "beforeEach");
+  	setHookFromEnvironment(hooks, testEnvironment, "afterEach");
+  	setHookFromEnvironment(hooks, testEnvironment, "after");
+
+  	var moduleFns = {
+  		before: setHookFunction(module, "before"),
+  		beforeEach: setHookFunction(module, "beforeEach"),
+  		afterEach: setHookFunction(module, "afterEach"),
+  		after: setHookFunction(module, "after")
+  	};
+
+  	var currentModule = config.currentModule;
+  	if (objectType(executeNow) === "function") {
+  		moduleStack.push(module);
+  		config.currentModule = module;
+  		executeNow.call(module.testEnvironment, moduleFns);
+  		moduleStack.pop();
+  		module = module.parentModule || currentModule;
+  	}
+
+  	config.currentModule = module;
+
+  	function setHookFromEnvironment(hooks, environment, name) {
+  		var potentialHook = environment[name];
+  		hooks[name] = typeof potentialHook === "function" ? [potentialHook] : [];
+  		delete environment[name];
+  	}
+
+  	function setHookFunction(module, hookName) {
+  		return function setHook(callback) {
+  			module.hooks[hookName].push(callback);
+  		};
+  	}
+  }
+
+  function module$1(name, options, executeNow) {
+  	if (focused) {
+  		return;
+  	}
+
+  	processModule(name, options, executeNow);
+  }
+
+  module$1.only = function () {
+  	if (focused) {
+  		return;
+  	}
+
+  	config.modules.length = 0;
+  	config.queue.length = 0;
+
+  	module$1.apply(undefined, arguments);
+
+  	focused = true;
+  };
+
+  module$1.skip = function (name, options, executeNow) {
+  	if (focused) {
+  		return;
+  	}
+
+  	processModule(name, options, executeNow, { skip: true });
+  };
+
+  module$1.todo = function (name, options, executeNow) {
+  	if (focused) {
+  		return;
+  	}
+
+  	processModule(name, options, executeNow, { todo: true });
+  };
+
+  var LISTENERS = Object.create(null);
+  var SUPPORTED_EVENTS = ["runStart", "suiteStart", "testStart", "assertion", "testEnd", "suiteEnd", "runEnd"];
+
+  /**
+   * Emits an event with the specified data to all currently registered listeners.
+   * Callbacks will fire in the order in which they are registered (FIFO). This
+   * function is not exposed publicly; it is used by QUnit internals to emit
+   * logging events.
+   *
+   * @private
+   * @method emit
+   * @param {String} eventName
+   * @param {Object} data
+   * @return {Void}
+   */
+  function emit(eventName, data) {
+  	if (objectType(eventName) !== "string") {
+  		throw new TypeError("eventName must be a string when emitting an event");
+  	}
+
+  	// Clone the callbacks in case one of them registers a new callback
+  	var originalCallbacks = LISTENERS[eventName];
+  	var callbacks = originalCallbacks ? [].concat(toConsumableArray(originalCallbacks)) : [];
+
+  	for (var i = 0; i < callbacks.length; i++) {
+  		callbacks[i](data);
+  	}
+  }
+
+  /**
+   * Registers a callback as a listener to the specified event.
+   *
+   * @public
+   * @method on
+   * @param {String} eventName
+   * @param {Function} callback
+   * @return {Void}
+   */
+  function on(eventName, callback) {
+  	if (objectType(eventName) !== "string") {
+  		throw new TypeError("eventName must be a string when registering a listener");
+  	} else if (!inArray(eventName, SUPPORTED_EVENTS)) {
+  		var events = SUPPORTED_EVENTS.join(", ");
+  		throw new Error("\"" + eventName + "\" is not a valid event; must be one of: " + events + ".");
+  	} else if (objectType(callback) !== "function") {
+  		throw new TypeError("callback must be a function when registering a listener");
+  	}
+
+  	if (!LISTENERS[eventName]) {
+  		LISTENERS[eventName] = [];
+  	}
+
+  	// Don't register the same callback more than once
+  	if (!inArray(callback, LISTENERS[eventName])) {
+  		LISTENERS[eventName].push(callback);
+  	}
+  }
+
+  function objectOrFunction(x) {
+    var type = typeof x === 'undefined' ? 'undefined' : _typeof(x);
+    return x !== null && (type === 'object' || type === 'function');
+  }
+
+  function isFunction(x) {
+    return typeof x === 'function';
+  }
+
+
+
+  var _isArray = void 0;
+  if (Array.isArray) {
+    _isArray = Array.isArray;
+  } else {
+    _isArray = function _isArray(x) {
+      return Object.prototype.toString.call(x) === '[object Array]';
+    };
+  }
+
+  var isArray = _isArray;
+
+  var len = 0;
+  var vertxNext = void 0;
+  var customSchedulerFn = void 0;
+
+  var asap = function asap(callback, arg) {
+    queue[len] = callback;
+    queue[len + 1] = arg;
+    len += 2;
+    if (len === 2) {
+      // If len is 2, that means that we need to schedule an async flush.
+      // If additional callbacks are queued before the queue is flushed, they
+      // will be processed by this flush that we are scheduling.
+      if (customSchedulerFn) {
+        customSchedulerFn(flush);
+      } else {
+        scheduleFlush();
+      }
+    }
+  };
+
+  function setScheduler(scheduleFn) {
+    customSchedulerFn = scheduleFn;
+  }
+
+  function setAsap(asapFn) {
+    asap = asapFn;
+  }
+
+  var browserWindow = typeof window !== 'undefined' ? window : undefined;
+  var browserGlobal = browserWindow || {};
+  var BrowserMutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
+  var isNode = typeof self === 'undefined' && typeof process !== 'undefined' && {}.toString.call(process) === '[object process]';
+
+  // test for web worker but not in IE10
+  var isWorker = typeof Uint8ClampedArray !== 'undefined' && typeof importScripts !== 'undefined' && typeof MessageChannel !== 'undefined';
+
+  // node
+  function useNextTick() {
+    // node version 0.10.x displays a deprecation warning when nextTick is used recursively
+    // see https://github.com/cujojs/when/issues/410 for details
+    return function () {
+      return process.nextTick(flush);
+    };
+  }
+
+  // vertx
+  function useVertxTimer() {
+    if (typeof vertxNext !== 'undefined') {
+      return function () {
+        vertxNext(flush);
+      };
+    }
+
+    return useSetTimeout();
+  }
+
+  function useMutationObserver() {
+    var iterations = 0;
+    var observer = new BrowserMutationObserver(flush);
+    var node = document.createTextNode('');
+    observer.observe(node, { characterData: true });
+
+    return function () {
+      node.data = iterations = ++iterations % 2;
+    };
+  }
+
+  // web worker
+  function useMessageChannel() {
+    var channel = new MessageChannel();
+    channel.port1.onmessage = flush;
+    return function () {
+      return channel.port2.postMessage(0);
+    };
+  }
+
+  function useSetTimeout() {
+    // Store setTimeout reference so es6-promise will be unaffected by
+    // other code modifying setTimeout (like sinon.useFakeTimers())
+    var globalSetTimeout = setTimeout;
+    return function () {
+      return globalSetTimeout(flush, 1);
+    };
+  }
+
+  var queue = new Array(1000);
+  function flush() {
+    for (var i = 0; i < len; i += 2) {
+      var callback = queue[i];
+      var arg = queue[i + 1];
+
+      callback(arg);
+
+      queue[i] = undefined;
+      queue[i + 1] = undefined;
+    }
+
+    len = 0;
+  }
+
+  function attemptVertx() {
+    try {
+      var vertx = Function('return this')().require('vertx');
+      vertxNext = vertx.runOnLoop || vertx.runOnContext;
+      return useVertxTimer();
+    } catch (e) {
+      return useSetTimeout();
+    }
+  }
+
+  var scheduleFlush = void 0;
+  // Decide what async method to use to triggering processing of queued callbacks:
+  if (isNode) {
+    scheduleFlush = useNextTick();
+  } else if (BrowserMutationObserver) {
+    scheduleFlush = useMutationObserver();
+  } else if (isWorker) {
+    scheduleFlush = useMessageChannel();
+  } else if (browserWindow === undefined && typeof require === 'function') {
+    scheduleFlush = attemptVertx();
+  } else {
+    scheduleFlush = useSetTimeout();
+  }
+
+  function then(onFulfillment, onRejection) {
+    var parent = this;
+
+    var child = new this.constructor(noop);
+
+    if (child[PROMISE_ID] === undefined) {
+      makePromise(child);
+    }
+
+    var _state = parent._state;
+
+
+    if (_state) {
+      var callback = arguments[_state - 1];
+      asap(function () {
+        return invokeCallback(_state, child, callback, parent._result);
+      });
+    } else {
+      subscribe(parent, child, onFulfillment, onRejection);
+    }
+
+    return child;
+  }
+
+  /**
+    `Promise.resolve` returns a promise that will become resolved with the
+    passed `value`. It is shorthand for the following:
+
+    ```javascript
+    let promise = new Promise(function(resolve, reject){
+      resolve(1);
+    });
+
+    promise.then(function(value){
+      // value === 1
+    });
+    ```
+
+    Instead of writing the above, your code now simply becomes the following:
+
+    ```javascript
+    let promise = Promise.resolve(1);
+
+    promise.then(function(value){
+      // value === 1
+    });
+    ```
+
+    @method resolve
+    @static
+    @param {Any} value value that the returned promise will be resolved with
+    Useful for tooling.
+    @return {Promise} a promise that will become fulfilled with the given
+    `value`
+  */
+  function resolve$1(object) {
+    /*jshint validthis:true */
+    var Constructor = this;
+
+    if (object && (typeof object === 'undefined' ? 'undefined' : _typeof(object)) === 'object' && object.constructor === Constructor) {
+      return object;
+    }
+
+    var promise = new Constructor(noop);
+    resolve(promise, object);
+    return promise;
+  }
+
+  var PROMISE_ID = Math.random().toString(36).substring(2);
+
+  function noop() {}
+
+  var PENDING = void 0;
+  var FULFILLED = 1;
+  var REJECTED = 2;
+
+  var TRY_CATCH_ERROR = { error: null };
+
+  function selfFulfillment() {
+    return new TypeError("You cannot resolve a promise with itself");
+  }
+
+  function cannotReturnOwn() {
+    return new TypeError('A promises callback cannot return that same promise.');
+  }
+
+  function getThen(promise) {
+    try {
+      return promise.then;
+    } catch (error) {
+      TRY_CATCH_ERROR.error = error;
+      return TRY_CATCH_ERROR;
+    }
+  }
+
+  function tryThen(then$$1, value, fulfillmentHandler, rejectionHandler) {
+    try {
+      then$$1.call(value, fulfillmentHandler, rejectionHandler);
+    } catch (e) {
+      return e;
+    }
+  }
+
+  function handleForeignThenable(promise, thenable, then$$1) {
+    asap(function (promise) {
+      var sealed = false;
+      var error = tryThen(then$$1, thenable, function (value) {
+        if (sealed) {
+          return;
+        }
+        sealed = true;
+        if (thenable !== value) {
+          resolve(promise, value);
+        } else {
+          fulfill(promise, value);
+        }
+      }, function (reason) {
+        if (sealed) {
+          return;
+        }
+        sealed = true;
+
+        reject(promise, reason);
+      }, 'Settle: ' + (promise._label || ' unknown promise'));
+
+      if (!sealed && error) {
+        sealed = true;
+        reject(promise, error);
+      }
+    }, promise);
+  }
+
+  function handleOwnThenable(promise, thenable) {
+    if (thenable._state === FULFILLED) {
+      fulfill(promise, thenable._result);
+    } else if (thenable._state === REJECTED) {
+      reject(promise, thenable._result);
+    } else {
+      subscribe(thenable, undefined, function (value) {
+        return resolve(promise, value);
+      }, function (reason) {
+        return reject(promise, reason);
+      });
+    }
+  }
+
+  function handleMaybeThenable(promise, maybeThenable, then$$1) {
+    if (maybeThenable.constructor === promise.constructor && then$$1 === then && maybeThenable.constructor.resolve === resolve$1) {
+      handleOwnThenable(promise, maybeThenable);
+    } else {
+      if (then$$1 === TRY_CATCH_ERROR) {
+        reject(promise, TRY_CATCH_ERROR.error);
+        TRY_CATCH_ERROR.error = null;
+      } else if (then$$1 === undefined) {
+        fulfill(promise, maybeThenable);
+      } else if (isFunction(then$$1)) {
+        handleForeignThenable(promise, maybeThenable, then$$1);
+      } else {
+        fulfill(promise, maybeThenable);
+      }
+    }
+  }
+
+  function resolve(promise, value) {
+    if (promise === value) {
+      reject(promise, selfFulfillment());
+    } else if (objectOrFunction(value)) {
+      handleMaybeThenable(promise, value, getThen(value));
+    } else {
+      fulfill(promise, value);
+    }
+  }
+
+  function publishRejection(promise) {
+    if (promise._onerror) {
+      promise._onerror(promise._result);
+    }
+
+    publish(promise);
+  }
+
+  function fulfill(promise, value) {
+    if (promise._state !== PENDING) {
+      return;
+    }
+
+    promise._result = value;
+    promise._state = FULFILLED;
+
+    if (promise._subscribers.length !== 0) {
+      asap(publish, promise);
+    }
+  }
+
+  function reject(promise, reason) {
+    if (promise._state !== PENDING) {
+      return;
+    }
+    promise._state = REJECTED;
+    promise._result = reason;
+
+    asap(publishRejection, promise);
+  }
+
+  function subscribe(parent, child, onFulfillment, onRejection) {
+    var _subscribers = parent._subscribers;
+    var length = _subscribers.length;
+
+
+    parent._onerror = null;
+
+    _subscribers[length] = child;
+    _subscribers[length + FULFILLED] = onFulfillment;
+    _subscribers[length + REJECTED] = onRejection;
+
+    if (length === 0 && parent._state) {
+      asap(publish, parent);
+    }
+  }
+
+  function publish(promise) {
+    var subscribers = promise._subscribers;
+    var settled = promise._state;
+
+    if (subscribers.length === 0) {
+      return;
+    }
+
+    var child = void 0,
+        callback = void 0,
+        detail = promise._result;
+
+    for (var i = 0; i < subscribers.length; i += 3) {
+      child = subscribers[i];
+      callback = subscribers[i + settled];
+
+      if (child) {
+        invokeCallback(settled, child, callback, detail);
+      } else {
+        callback(detail);
+      }
+    }
+
+    promise._subscribers.length = 0;
+  }
+
+  function tryCatch(callback, detail) {
+    try {
+      return callback(detail);
+    } catch (e) {
+      TRY_CATCH_ERROR.error = e;
+      return TRY_CATCH_ERROR;
+    }
+  }
+
+  function invokeCallback(settled, promise, callback, detail) {
+    var hasCallback = isFunction(callback),
+        value = void 0,
+        error = void 0,
+        succeeded = void 0,
+        failed = void 0;
+
+    if (hasCallback) {
+      value = tryCatch(callback, detail);
+
+      if (value === TRY_CATCH_ERROR) {
+        failed = true;
+        error = value.error;
+        value.error = null;
+      } else {
+        succeeded = true;
+      }
+
+      if (promise === value) {
+        reject(promise, cannotReturnOwn());
+        return;
+      }
+    } else {
+      value = detail;
+      succeeded = true;
+    }
+
+    if (promise._state !== PENDING) {
+      // noop
+    } else if (hasCallback && succeeded) {
+      resolve(promise, value);
+    } else if (failed) {
+      reject(promise, error);
+    } else if (settled === FULFILLED) {
+      fulfill(promise, value);
+    } else if (settled === REJECTED) {
+      reject(promise, value);
+    }
+  }
+
+  function initializePromise(promise, resolver) {
+    try {
+      resolver(function resolvePromise(value) {
+        resolve(promise, value);
+      }, function rejectPromise(reason) {
+        reject(promise, reason);
+      });
+    } catch (e) {
+      reject(promise, e);
+    }
+  }
+
+  var id = 0;
+  function nextId() {
+    return id++;
+  }
+
+  function makePromise(promise) {
+    promise[PROMISE_ID] = id++;
+    promise._state = undefined;
+    promise._result = undefined;
+    promise._subscribers = [];
+  }
+
+  function validationError() {
+    return new Error('Array Methods must be provided an Array');
+  }
+
+  var Enumerator = function () {
+    function Enumerator(Constructor, input) {
+      classCallCheck(this, Enumerator);
+
+      this._instanceConstructor = Constructor;
+      this.promise = new Constructor(noop);
+
+      if (!this.promise[PROMISE_ID]) {
+        makePromise(this.promise);
+      }
+
+      if (isArray(input)) {
+        this.length = input.length;
+        this._remaining = input.length;
+
+        this._result = new Array(this.length);
+
+        if (this.length === 0) {
+          fulfill(this.promise, this._result);
+        } else {
+          this.length = this.length || 0;
+          this._enumerate(input);
+          if (this._remaining === 0) {
+            fulfill(this.promise, this._result);
+          }
+        }
+      } else {
+        reject(this.promise, validationError());
+      }
+    }
+
+    createClass(Enumerator, [{
+      key: '_enumerate',
+      value: function _enumerate(input) {
+        for (var i = 0; this._state === PENDING && i < input.length; i++) {
+          this._eachEntry(input[i], i);
+        }
+      }
+    }, {
+      key: '_eachEntry',
+      value: function _eachEntry(entry, i) {
+        var c = this._instanceConstructor;
+        var resolve$$1 = c.resolve;
+
+
+        if (resolve$$1 === resolve$1) {
+          var _then = getThen(entry);
+
+          if (_then === then && entry._state !== PENDING) {
+            this._settledAt(entry._state, i, entry._result);
+          } else if (typeof _then !== 'function') {
+            this._remaining--;
+            this._result[i] = entry;
+          } else if (c === Promise$2) {
+            var promise = new c(noop);
+            handleMaybeThenable(promise, entry, _then);
+            this._willSettleAt(promise, i);
+          } else {
+            this._willSettleAt(new c(function (resolve$$1) {
+              return resolve$$1(entry);
+            }), i);
+          }
+        } else {
+          this._willSettleAt(resolve$$1(entry), i);
+        }
+      }
+    }, {
+      key: '_settledAt',
+      value: function _settledAt(state, i, value) {
+        var promise = this.promise;
+
+
+        if (promise._state === PENDING) {
+          this._remaining--;
+
+          if (state === REJECTED) {
+            reject(promise, value);
+          } else {
+            this._result[i] = value;
+          }
+        }
+
+        if (this._remaining === 0) {
+          fulfill(promise, this._result);
+        }
+      }
+    }, {
+      key: '_willSettleAt',
+      value: function _willSettleAt(promise, i) {
+        var enumerator = this;
+
+        subscribe(promise, undefined, function (value) {
+          return enumerator._settledAt(FULFILLED, i, value);
+        }, function (reason) {
+          return enumerator._settledAt(REJECTED, i, reason);
+        });
+      }
+    }]);
+    return Enumerator;
+  }();
+
+  /**
+    `Promise.all` accepts an array of promises, and returns a new promise which
+    is fulfilled with an array of fulfillment values for the passed promises, or
+    rejected with the reason of the first passed promise to be rejected. It casts all
+    elements of the passed iterable to promises as it runs this algorithm.
+
+    Example:
+
+    ```javascript
+    let promise1 = resolve(1);
+    let promise2 = resolve(2);
+    let promise3 = resolve(3);
+    let promises = [ promise1, promise2, promise3 ];
+
+    Promise.all(promises).then(function(array){
+      // The array here would be [ 1, 2, 3 ];
+    });
+    ```
+
+    If any of the `promises` given to `all` are rejected, the first promise
+    that is rejected will be given as an argument to the returned promises's
+    rejection handler. For example:
+
+    Example:
+
+    ```javascript
+    let promise1 = resolve(1);
+    let promise2 = reject(new Error("2"));
+    let promise3 = reject(new Error("3"));
+    let promises = [ promise1, promise2, promise3 ];
+
+    Promise.all(promises).then(function(array){
+      // Code here never runs because there are rejected promises!
+    }, function(error) {
+      // error.message === "2"
+    });
+    ```
+
+    @method all
+    @static
+    @param {Array} entries array of promises
+    @param {String} label optional string for labeling the promise.
+    Useful for tooling.
+    @return {Promise} promise that is fulfilled when all `promises` have been
+    fulfilled, or rejected if any of them become rejected.
+    @static
+  */
+  function all(entries) {
+    return new Enumerator(this, entries).promise;
+  }
+
+  /**
+    `Promise.race` returns a new promise which is settled in the same way as the
+    first passed promise to settle.
+
+    Example:
+
+    ```javascript
+    let promise1 = new Promise(function(resolve, reject){
+      setTimeout(function(){
+        resolve('promise 1');
+      }, 200);
+    });
+
+    let promise2 = new Promise(function(resolve, reject){
+      setTimeout(function(){
+        resolve('promise 2');
+      }, 100);
+    });
+
+    Promise.race([promise1, promise2]).then(function(result){
+      // result === 'promise 2' because it was resolved before promise1
+      // was resolved.
+    });
+    ```
+
+    `Promise.race` is deterministic in that only the state of the first
+    settled promise matters. For example, even if other promises given to the
+    `promises` array argument are resolved, but the first settled promise has
+    become rejected before the other promises became fulfilled, the returned
+    promise will become rejected:
+
+    ```javascript
+    let promise1 = new Promise(function(resolve, reject){
+      setTimeout(function(){
+        resolve('promise 1');
+      }, 200);
+    });
+
+    let promise2 = new Promise(function(resolve, reject){
+      setTimeout(function(){
+        reject(new Error('promise 2'));
+      }, 100);
+    });
+
+    Promise.race([promise1, promise2]).then(function(result){
+      // Code here never runs
+    }, function(reason){
+      // reason.message === 'promise 2' because promise 2 became rejected before
+      // promise 1 became fulfilled
+    });
+    ```
+
+    An example real-world use case is implementing timeouts:
+
+    ```javascript
+    Promise.race([ajax('foo.json'), timeout(5000)])
+    ```
+
+    @method race
+    @static
+    @param {Array} promises array of promises to observe
+    Useful for tooling.
+    @return {Promise} a promise which settles in the same way as the first passed
+    promise to settle.
+  */
+  function race(entries) {
+    /*jshint validthis:true */
+    var Constructor = this;
+
+    if (!isArray(entries)) {
+      return new Constructor(function (_, reject) {
+        return reject(new TypeError('You must pass an array to race.'));
+      });
+    } else {
+      return new Constructor(function (resolve, reject) {
+        var length = entries.length;
+        for (var i = 0; i < length; i++) {
+          Constructor.resolve(entries[i]).then(resolve, reject);
+        }
+      });
+    }
+  }
+
+  /**
+    `Promise.reject` returns a promise rejected with the passed `reason`.
+    It is shorthand for the following:
+
+    ```javascript
+    let promise = new Promise(function(resolve, reject){
+      reject(new Error('WHOOPS'));
+    });
+
+    promise.then(function(value){
+      // Code here doesn't run because the promise is rejected!
+    }, function(reason){
+      // reason.message === 'WHOOPS'
+    });
+    ```
+
+    Instead of writing the above, your code now simply becomes the following:
+
+    ```javascript
+    let promise = Promise.reject(new Error('WHOOPS'));
+
+    promise.then(function(value){
+      // Code here doesn't run because the promise is rejected!
+    }, function(reason){
+      // reason.message === 'WHOOPS'
+    });
+    ```
+
+    @method reject
+    @static
+    @param {Any} reason value that the returned promise will be rejected with.
+    Useful for tooling.
+    @return {Promise} a promise rejected with the given `reason`.
+  */
+  function reject$1(reason) {
+    /*jshint validthis:true */
+    var Constructor = this;
+    var promise = new Constructor(noop);
+    reject(promise, reason);
+    return promise;
+  }
+
+  function needsResolver() {
+    throw new TypeError('You must pass a resolver function as the first argument to the promise constructor');
+  }
+
+  function needsNew() {
+    throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.");
+  }
+
+  /**
+    Promise objects represent the eventual result of an asynchronous operation. The
+    primary way of interacting with a promise is through its `then` method, which
+    registers callbacks to receive either a promise's eventual value or the reason
+    why the promise cannot be fulfilled.
+
+    Terminology
+    -----------
+
+    - `promise` is an object or function with a `then` method whose behavior conforms to this specification.
+    - `thenable` is an object or function that defines a `then` method.
+    - `value` is any legal JavaScript value (including undefined, a thenable, or a promise).
+    - `exception` is a value that is thrown using the throw statement.
+    - `reason` is a value that indicates why a promise was rejected.
+    - `settled` the final resting state of a promise, fulfilled or rejected.
+
+    A promise can be in one of three states: pending, fulfilled, or rejected.
+
+    Promises that are fulfilled have a fulfillment value and are in the fulfilled
+    state.  Promises that are rejected have a rejection reason and are in the
+    rejected state.  A fulfillment value is never a thenable.
+
+    Promises can also be said to *resolve* a value.  If this value is also a
+    promise, then the original promise's settled state will match the value's
+    settled state.  So a promise that *resolves* a promise that rejects will
+    itself reject, and a promise that *resolves* a promise that fulfills will
+    itself fulfill.
+
+
+    Basic Usage:
+    ------------
+
+    ```js
+    let promise = new Promise(function(resolve, reject) {
+      // on success
+      resolve(value);
+
+      // on failure
+      reject(reason);
+    });
+
+    promise.then(function(value) {
+      // on fulfillment
+    }, function(reason) {
+      // on rejection
+    });
+    ```
+
+    Advanced Usage:
+    ---------------
+
+    Promises shine when abstracting away asynchronous interactions such as
+    `XMLHttpRequest`s.
+
+    ```js
+    function getJSON(url) {
+      return new Promise(function(resolve, reject){
+        let xhr = new XMLHttpRequest();
+
+        xhr.open('GET', url);
+        xhr.onreadystatechange = handler;
+        xhr.responseType = 'json';
+        xhr.setRequestHeader('Accept', 'application/json');
+        xhr.send();
+
+        function handler() {
+          if (this.readyState === this.DONE) {
+            if (this.status === 200) {
+              resolve(this.response);
+            } else {
+              reject(new Error('getJSON: `' + url + '` failed with status: [' + this.status + ']'));
+            }
+          }
+        };
+      });
+    }
+
+    getJSON('/posts.json').then(function(json) {
+      // on fulfillment
+    }, function(reason) {
+      // on rejection
+    });
+    ```
+
+    Unlike callbacks, promises are great composable primitives.
+
+    ```js
+    Promise.all([
+      getJSON('/posts'),
+      getJSON('/comments')
+    ]).then(function(values){
+      values[0] // => postsJSON
+      values[1] // => commentsJSON
+
+      return values;
+    });
+    ```
+
+    @class Promise
+    @param {Function} resolver
+    Useful for tooling.
+    @constructor
+  */
+
+  var Promise$2 = function () {
+    function Promise(resolver) {
+      classCallCheck(this, Promise);
+
+      this[PROMISE_ID] = nextId();
+      this._result = this._state = undefined;
+      this._subscribers = [];
+
+      if (noop !== resolver) {
+        typeof resolver !== 'function' && needsResolver();
+        this instanceof Promise ? initializePromise(this, resolver) : needsNew();
+      }
+    }
+
+    /**
+    The primary way of interacting with a promise is through its `then` method,
+    which registers callbacks to receive either a promise's eventual value or the
+    reason why the promise cannot be fulfilled.
+     ```js
+    findUser().then(function(user){
+      // user is available
+    }, function(reason){
+      // user is unavailable, and you are given the reason why
+    });
+    ```
+     Chaining
+    --------
+     The return value of `then` is itself a promise.  This second, 'downstream'
+    promise is resolved with the return value of the first promise's fulfillment
+    or rejection handler, or rejected if the handler throws an exception.
+     ```js
+    findUser().then(function (user) {
+      return user.name;
+    }, function (reason) {
+      return 'default name';
+    }).then(function (userName) {
+      // If `findUser` fulfilled, `userName` will be the user's name, otherwise it
+      // will be `'default name'`
+    });
+     findUser().then(function (user) {
+      throw new Error('Found user, but still unhappy');
+    }, function (reason) {
+      throw new Error('`findUser` rejected and we're unhappy');
+    }).then(function (value) {
+      // never reached
+    }, function (reason) {
+      // if `findUser` fulfilled, `reason` will be 'Found user, but still unhappy'.
+      // If `findUser` rejected, `reason` will be '`findUser` rejected and we're unhappy'.
+    });
+    ```
+    If the downstream promise does not specify a rejection handler, rejection reasons will be propagated further downstream.
+     ```js
+    findUser().then(function (user) {
+      throw new PedagogicalException('Upstream error');
+    }).then(function (value) {
+      // never reached
+    }).then(function (value) {
+      // never reached
+    }, function (reason) {
+      // The `PedgagocialException` is propagated all the way down to here
+    });
+    ```
+     Assimilation
+    ------------
+     Sometimes the value you want to propagate to a downstream promise can only be
+    retrieved asynchronously. This can be achieved by returning a promise in the
+    fulfillment or rejection handler. The downstream promise will then be pending
+    until the returned promise is settled. This is called *assimilation*.
+     ```js
+    findUser().then(function (user) {
+      return findCommentsByAuthor(user);
+    }).then(function (comments) {
+      // The user's comments are now available
+    });
+    ```
+     If the assimliated promise rejects, then the downstream promise will also reject.
+     ```js
+    findUser().then(function (user) {
+      return findCommentsByAuthor(user);
+    }).then(function (comments) {
+      // If `findCommentsByAuthor` fulfills, we'll have the value here
+    }, function (reason) {
+      // If `findCommentsByAuthor` rejects, we'll have the reason here
+    });
+    ```
+     Simple Example
+    --------------
+     Synchronous Example
+     ```javascript
+    let result;
+     try {
+      result = findResult();
+      // success
+    } catch(reason) {
+      // failure
+    }
+    ```
+     Errback Example
+     ```js
+    findResult(function(result, err){
+      if (err) {
+        // failure
+      } else {
+        // success
+      }
+    });
+    ```
+     Promise Example;
+     ```javascript
+    findResult().then(function(result){
+      // success
+    }, function(reason){
+      // failure
+    });
+    ```
+     Advanced Example
+    --------------
+     Synchronous Example
+     ```javascript
+    let author, books;
+     try {
+      author = findAuthor();
+      books  = findBooksByAuthor(author);
+      // success
+    } catch(reason) {
+      // failure
+    }
+    ```
+     Errback Example
+     ```js
+     function foundBooks(books) {
+     }
+     function failure(reason) {
+     }
+     findAuthor(function(author, err){
+      if (err) {
+        failure(err);
+        // failure
+      } else {
+        try {
+          findBoooksByAuthor(author, function(books, err) {
+            if (err) {
+              failure(err);
+            } else {
+              try {
+                foundBooks(books);
+              } catch(reason) {
+                failure(reason);
+              }
+            }
+          });
+        } catch(error) {
+          failure(err);
+        }
+        // success
+      }
+    });
+    ```
+     Promise Example;
+     ```javascript
+    findAuthor().
+      then(findBooksByAuthor).
+      then(function(books){
+        // found books
+    }).catch(function(reason){
+      // something went wrong
+    });
+    ```
+     @method then
+    @param {Function} onFulfilled
+    @param {Function} onRejected
+    Useful for tooling.
+    @return {Promise}
+    */
+
+    /**
+    `catch` is simply sugar for `then(undefined, onRejection)` which makes it the same
+    as the catch block of a try/catch statement.
+    ```js
+    function findAuthor(){
+    throw new Error('couldn't find that author');
+    }
+    // synchronous
+    try {
+    findAuthor();
+    } catch(reason) {
+    // something went wrong
+    }
+    // async with promises
+    findAuthor().catch(function(reason){
+    // something went wrong
+    });
+    ```
+    @method catch
+    @param {Function} onRejection
+    Useful for tooling.
+    @return {Promise}
+    */
+
+
+    createClass(Promise, [{
+      key: 'catch',
+      value: function _catch(onRejection) {
+        return this.then(null, onRejection);
+      }
+
+      /**
+        `finally` will be invoked regardless of the promise's fate just as native
+        try/catch/finally behaves
+      
+        Synchronous example:
+      
+        ```js
+        findAuthor() {
+          if (Math.random() > 0.5) {
+            throw new Error();
+          }
+          return new Author();
+        }
+      
+        try {
+          return findAuthor(); // succeed or fail
+        } catch(error) {
+          return findOtherAuther();
+        } finally {
+          // always runs
+          // doesn't affect the return value
+        }
+        ```
+      
+        Asynchronous example:
+      
+        ```js
+        findAuthor().catch(function(reason){
+          return findOtherAuther();
+        }).finally(function(){
+          // author was either found, or not
+        });
+        ```
+      
+        @method finally
+        @param {Function} callback
+        @return {Promise}
+      */
+
+    }, {
+      key: 'finally',
+      value: function _finally(callback) {
+        var promise = this;
+        var constructor = promise.constructor;
+
+        if (isFunction(callback)) {
+          return promise.then(function (value) {
+            return constructor.resolve(callback()).then(function () {
+              return value;
+            });
+          }, function (reason) {
+            return constructor.resolve(callback()).then(function () {
+              throw reason;
+            });
+          });
+        }
+
+        return promise.then(callback, callback);
+      }
+    }]);
+    return Promise;
+  }();
+
+  Promise$2.prototype.then = then;
+  Promise$2.all = all;
+  Promise$2.race = race;
+  Promise$2.resolve = resolve$1;
+  Promise$2.reject = reject$1;
+  Promise$2._setScheduler = setScheduler;
+  Promise$2._setAsap = setAsap;
+  Promise$2._asap = asap;
+
+  /*global self*/
+  function polyfill() {
+    var local = void 0;
+
+    if (typeof global !== 'undefined') {
+      local = global;
+    } else if (typeof self !== 'undefined') {
+      local = self;
+    } else {
+      try {
+        local = Function('return this')();
+      } catch (e) {
+        throw new Error('polyfill failed because global object is unavailable in this environment');
+      }
+    }
+
+    var P = local.Promise;
+
+    if (P) {
+      var promiseToString = null;
+      try {
+        promiseToString = Object.prototype.toString.call(P.resolve());
+      } catch (e) {
+        // silently ignored
+      }
+
+      if (promiseToString === '[object Promise]' && !P.cast) {
+        return;
+      }
+    }
+
+    local.Promise = Promise$2;
+  }
+
+  // Strange compat..
+  Promise$2.polyfill = polyfill;
+  Promise$2.Promise = Promise$2;
+
+  var Promise$1 = typeof Promise !== "undefined" ? Promise : Promise$2;
+
+  // Register logging callbacks
+  function registerLoggingCallbacks(obj) {
+  	var i,
+  	    l,
+  	    key,
+  	    callbackNames = ["begin", "done", "log", "testStart", "testDone", "moduleStart", "moduleDone"];
+
+  	function registerLoggingCallback(key) {
+  		var loggingCallback = function loggingCallback(callback) {
+  			if (objectType(callback) !== "function") {
+  				throw new Error("QUnit logging methods require a callback function as their first parameters.");
+  			}
+
+  			config.callbacks[key].push(callback);
+  		};
+
+  		return loggingCallback;
+  	}
+
+  	for (i = 0, l = callbackNames.length; i < l; i++) {
+  		key = callbackNames[i];
+
+  		// Initialize key collection of logging callback
+  		if (objectType(config.callbacks[key]) === "undefined") {
+  			config.callbacks[key] = [];
+  		}
+
+  		obj[key] = registerLoggingCallback(key);
+  	}
+  }
+
+  function runLoggingCallbacks(key, args) {
+  	var callbacks = config.callbacks[key];
+
+  	// Handling 'log' callbacks separately. Unlike the other callbacks,
+  	// the log callback is not controlled by the processing queue,
+  	// but rather used by asserts. Hence to promisfy the 'log' callback
+  	// would mean promisfying each step of a test
+  	if (key === "log") {
+  		callbacks.map(function (callback) {
+  			return callback(args);
+  		});
+  		return;
+  	}
+
+  	// ensure that each callback is executed serially
+  	return callbacks.reduce(function (promiseChain, callback) {
+  		return promiseChain.then(function () {
+  			return Promise$1.resolve(callback(args));
+  		});
+  	}, Promise$1.resolve([]));
+  }
+
+  // Doesn't support IE9, it will return undefined on these browsers
+  // See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
+  var fileName = (sourceFromStacktrace(0) || "").replace(/(:\d+)+\)?/, "").replace(/.+\//, "");
+
+  function extractStacktrace(e, offset) {
+  	offset = offset === undefined ? 4 : offset;
+
+  	var stack, include, i;
+
+  	if (e && e.stack) {
+  		stack = e.stack.split("\n");
+  		if (/^error$/i.test(stack[0])) {
+  			stack.shift();
+  		}
+  		if (fileName) {
+  			include = [];
+  			for (i = offset; i < stack.length; i++) {
+  				if (stack[i].indexOf(fileName) !== -1) {
+  					break;
+  				}
+  				include.push(stack[i]);
+  			}
+  			if (include.length) {
+  				return include.join("\n");
+  			}
+  		}
+  		return stack[offset];
+  	}
+  }
+
+  function sourceFromStacktrace(offset) {
+  	var error = new Error();
+
+  	// Support: Safari <=7 only, IE <=10 - 11 only
+  	// Not all browsers generate the `stack` property for `new Error()`, see also #636
+  	if (!error.stack) {
+  		try {
+  			throw error;
+  		} catch (err) {
+  			error = err;
+  		}
+  	}
+
+  	return extractStacktrace(error, offset);
+  }
+
+  var priorityCount = 0;
+  var unitSampler = void 0;
+
+  // This is a queue of functions that are tasks within a single test.
+  // After tests are dequeued from config.queue they are expanded into
+  // a set of tasks in this queue.
+  var taskQueue = [];
+
+  /**
+   * Advances the taskQueue to the next task. If the taskQueue is empty,
+   * process the testQueue
+   */
+  function advance() {
+  	advanceTaskQueue();
+
+  	if (!taskQueue.length && !config.blocking && !config.current) {
+  		advanceTestQueue();
+  	}
+  }
+
+  /**
+   * Advances the taskQueue with an increased depth
+   */
+  function advanceTaskQueue() {
+  	var start = now();
+  	config.depth = (config.depth || 0) + 1;
+
+  	processTaskQueue(start);
+
+  	config.depth--;
+  }
+
+  /**
+   * Process the first task on the taskQueue as a promise.
+   * Each task is a function returned by https://github.com/qunitjs/qunit/blob/master/src/test.js#L381
+   */
+  function processTaskQueue(start) {
+  	if (taskQueue.length && !config.blocking) {
+  		var elapsedTime = now() - start;
+
+  		if (!defined.setTimeout || config.updateRate <= 0 || elapsedTime < config.updateRate) {
+  			var task = taskQueue.shift();
+  			Promise$1.resolve(task()).then(function () {
+  				if (!taskQueue.length) {
+  					advance();
+  				} else {
+  					processTaskQueue(start);
+  				}
+  			});
+  		} else {
+  			setTimeout$1(advance);
+  		}
+  	}
+  }
+
+  /**
+   * Advance the testQueue to the next test to process. Call done() if testQueue completes.
+   */
+  function advanceTestQueue() {
+  	if (!config.blocking && !config.queue.length && config.depth === 0) {
+  		done();
+  		return;
+  	}
+
+  	var testTasks = config.queue.shift();
+  	addToTaskQueue(testTasks());
+
+  	if (priorityCount > 0) {
+  		priorityCount--;
+  	}
+
+  	advance();
+  }
+
+  /**
+   * Enqueue the tasks for a test into the task queue.
+   * @param {Array} tasksArray
+   */
+  function addToTaskQueue(tasksArray) {
+  	taskQueue.push.apply(taskQueue, toConsumableArray(tasksArray));
+  }
+
+  /**
+   * Return the number of tasks remaining in the task queue to be processed.
+   * @return {Number}
+   */
+  function taskQueueLength() {
+  	return taskQueue.length;
+  }
+
+  /**
+   * Adds a test to the TestQueue for execution.
+   * @param {Function} testTasksFunc
+   * @param {Boolean} prioritize
+   * @param {String} seed
+   */
+  function addToTestQueue(testTasksFunc, prioritize, seed) {
+  	if (prioritize) {
+  		config.queue.splice(priorityCount++, 0, testTasksFunc);
+  	} else if (seed) {
+  		if (!unitSampler) {
+  			unitSampler = unitSamplerGenerator(seed);
+  		}
+
+  		// Insert into a random position after all prioritized items
+  		var index = Math.floor(unitSampler() * (config.queue.length - priorityCount + 1));
+  		config.queue.splice(priorityCount + index, 0, testTasksFunc);
+  	} else {
+  		config.queue.push(testTasksFunc);
+  	}
+  }
+
+  /**
+   * Creates a seeded "sample" generator which is used for randomizing tests.
+   */
+  function unitSamplerGenerator(seed) {
+
+  	// 32-bit xorshift, requires only a nonzero seed
+  	// http://excamera.com/sphinx/article-xorshift.html
+  	var sample = parseInt(generateHash(seed), 16) || -1;
+  	return function () {
+  		sample ^= sample << 13;
+  		sample ^= sample >>> 17;
+  		sample ^= sample << 5;
+
+  		// ECMAScript has no unsigned number type
+  		if (sample < 0) {
+  			sample += 0x100000000;
+  		}
+
+  		return sample / 0x100000000;
+  	};
+  }
+
+  /**
+   * This function is called when the ProcessingQueue is done processing all
+   * items. It handles emitting the final run events.
+   */
+  function done() {
+  	var storage = config.storage;
+
+  	ProcessingQueue.finished = true;
+
+  	var runtime = now() - config.started;
+  	var passed = config.stats.all - config.stats.bad;
+
+  	if (config.stats.all === 0) {
+
+  		if (config.filter && config.filter.length) {
+  			throw new Error("No tests matched the filter \"" + config.filter + "\".");
+  		}
+
+  		if (config.module && config.module.length) {
+  			throw new Error("No tests matched the module \"" + config.module + "\".");
+  		}
+
+  		if (config.moduleId && config.moduleId.length) {
+  			throw new Error("No tests matched the moduleId \"" + config.moduleId + "\".");
+  		}
+
+  		if (config.testId && config.testId.length) {
+  			throw new Error("No tests matched the testId \"" + config.testId + "\".");
+  		}
+
+  		throw new Error("No tests were run.");
+  	}
+
+  	emit("runEnd", globalSuite.end(true));
+  	runLoggingCallbacks("done", {
+  		passed: passed,
+  		failed: config.stats.bad,
+  		total: config.stats.all,
+  		runtime: runtime
+  	}).then(function () {
+
+  		// Clear own storage items if all tests passed
+  		if (storage && config.stats.bad === 0) {
+  			for (var i = storage.length - 1; i >= 0; i--) {
+  				var key = storage.key(i);
+
+  				if (key.indexOf("qunit-test-") === 0) {
+  					storage.removeItem(key);
+  				}
+  			}
+  		}
+  	});
+  }
+
+  var ProcessingQueue = {
+  	finished: false,
+  	add: addToTestQueue,
+  	advance: advance,
+  	taskCount: taskQueueLength
+  };
+
+  var TestReport = function () {
+  	function TestReport(name, suite, options) {
+  		classCallCheck(this, TestReport);
+
+  		this.name = name;
+  		this.suiteName = suite.name;
+  		this.fullName = suite.fullName.concat(name);
+  		this.runtime = 0;
+  		this.assertions = [];
+
+  		this.skipped = !!options.skip;
+  		this.todo = !!options.todo;
+
+  		this.valid = options.valid;
+
+  		this._startTime = 0;
+  		this._endTime = 0;
+
+  		suite.pushTest(this);
+  	}
+
+  	createClass(TestReport, [{
+  		key: "start",
+  		value: function start(recordTime) {
+  			if (recordTime) {
+  				this._startTime = performanceNow();
+  				if (performance) {
+  					performance.mark("qunit_test_start");
+  				}
+  			}
+
+  			return {
+  				name: this.name,
+  				suiteName: this.suiteName,
+  				fullName: this.fullName.slice()
+  			};
+  		}
+  	}, {
+  		key: "end",
+  		value: function end(recordTime) {
+  			if (recordTime) {
+  				this._endTime = performanceNow();
+  				if (performance) {
+  					performance.mark("qunit_test_end");
+
+  					var testName = this.fullName.join(" – ");
+
+  					measure("QUnit Test: " + testName, "qunit_test_start", "qunit_test_end");
+  				}
+  			}
+
+  			return extend(this.start(), {
+  				runtime: this.getRuntime(),
+  				status: this.getStatus(),
+  				errors: this.getFailedAssertions(),
+  				assertions: this.getAssertions()
+  			});
+  		}
+  	}, {
+  		key: "pushAssertion",
+  		value: function pushAssertion(assertion) {
+  			this.assertions.push(assertion);
+  		}
+  	}, {
+  		key: "getRuntime",
+  		value: function getRuntime() {
+  			return this._endTime - this._startTime;
+  		}
+  	}, {
+  		key: "getStatus",
+  		value: function getStatus() {
+  			if (this.skipped) {
+  				return "skipped";
+  			}
+
+  			var testPassed = this.getFailedAssertions().length > 0 ? this.todo : !this.todo;
+
+  			if (!testPassed) {
+  				return "failed";
+  			} else if (this.todo) {
+  				return "todo";
+  			} else {
+  				return "passed";
+  			}
+  		}
+  	}, {
+  		key: "getFailedAssertions",
+  		value: function getFailedAssertions() {
+  			return this.assertions.filter(function (assertion) {
+  				return !assertion.passed;
+  			});
+  		}
+  	}, {
+  		key: "getAssertions",
+  		value: function getAssertions() {
+  			return this.assertions.slice();
+  		}
+
+  		// Remove actual and expected values from assertions. This is to prevent
+  		// leaking memory throughout a test suite.
+
+  	}, {
+  		key: "slimAssertions",
+  		value: function slimAssertions() {
+  			this.assertions = this.assertions.map(function (assertion) {
+  				delete assertion.actual;
+  				delete assertion.expected;
+  				return assertion;
+  			});
+  		}
+  	}]);
+  	return TestReport;
+  }();
+
+  var focused$1 = false;
+
+  function Test(settings) {
+  	var i, l;
+
+  	++Test.count;
+
+  	this.expected = null;
+  	this.assertions = [];
+  	this.semaphore = 0;
+  	this.module = config.currentModule;
+  	this.stack = sourceFromStacktrace(3);
+  	this.steps = [];
+  	this.timeout = undefined;
+
+  	// If a module is skipped, all its tests and the tests of the child suites
+  	// should be treated as skipped even if they are defined as `only` or `todo`.
+  	// As for `todo` module, all its tests will be treated as `todo` except for
+  	// tests defined as `skip` which will be left intact.
+  	//
+  	// So, if a test is defined as `todo` and is inside a skipped module, we should
+  	// then treat that test as if was defined as `skip`.
+  	if (this.module.skip) {
+  		settings.skip = true;
+  		settings.todo = false;
+
+  		// Skipped tests should be left intact
+  	} else if (this.module.todo && !settings.skip) {
+  		settings.todo = true;
+  	}
+
+  	extend(this, settings);
+
+  	this.testReport = new TestReport(settings.testName, this.module.suiteReport, {
+  		todo: settings.todo,
+  		skip: settings.skip,
+  		valid: this.valid()
+  	});
+
+  	// Register unique strings
+  	for (i = 0, l = this.module.tests; i < l.length; i++) {
+  		if (this.module.tests[i].name === this.testName) {
+  			this.testName += " ";
+  		}
+  	}
+
+  	this.testId = generateHash(this.module.name, this.testName);
+
+  	this.module.tests.push({
+  		name: this.testName,
+  		testId: this.testId,
+  		skip: !!settings.skip
+  	});
+
+  	if (settings.skip) {
+
+  		// Skipped tests will fully ignore any sent callback
+  		this.callback = function () {};
+  		this.async = false;
+  		this.expected = 0;
+  	} else {
+  		if (typeof this.callback !== "function") {
+  			var method = this.todo ? "todo" : "test";
+
+  			// eslint-disable-next-line max-len
+  			throw new TypeError("You must provide a function as a test callback to QUnit." + method + "(\"" + settings.testName + "\")");
+  		}
+
+  		this.assert = new Assert(this);
+  	}
+  }
+
+  Test.count = 0;
+
+  function getNotStartedModules(startModule) {
+  	var module = startModule,
+  	    modules = [];
+
+  	while (module && module.testsRun === 0) {
+  		modules.push(module);
+  		module = module.parentModule;
+  	}
+
+  	// The above push modules from the child to the parent
+  	// return a reversed order with the top being the top most parent module
+  	return modules.reverse();
+  }
+
+  Test.prototype = {
+  	before: function before() {
+  		var _this = this;
+
+  		var module = this.module,
+  		    notStartedModules = getNotStartedModules(module);
+
+  		// ensure the callbacks are executed serially for each module
+  		var callbackPromises = notStartedModules.reduce(function (promiseChain, startModule) {
+  			return promiseChain.then(function () {
+  				startModule.stats = { all: 0, bad: 0, started: now() };
+  				emit("suiteStart", startModule.suiteReport.start(true));
+  				return runLoggingCallbacks("moduleStart", {
+  					name: startModule.name,
+  					tests: startModule.tests
+  				});
+  			});
+  		}, Promise$1.resolve([]));
+
+  		return callbackPromises.then(function () {
+  			config.current = _this;
+
+  			_this.testEnvironment = extend({}, module.testEnvironment);
+
+  			_this.started = now();
+  			emit("testStart", _this.testReport.start(true));
+  			return runLoggingCallbacks("testStart", {
+  				name: _this.testName,
+  				module: module.name,
+  				testId: _this.testId,
+  				previousFailure: _this.previousFailure
+  			}).then(function () {
+  				if (!config.pollution) {
+  					saveGlobal();
+  				}
+  			});
+  		});
+  	},
+
+  	run: function run() {
+  		var promise;
+
+  		config.current = this;
+
+  		this.callbackStarted = now();
+
+  		if (config.notrycatch) {
+  			runTest(this);
+  			return;
+  		}
+
+  		try {
+  			runTest(this);
+  		} catch (e) {
+  			this.pushFailure("Died on test #" + (this.assertions.length + 1) + " " + this.stack + ": " + (e.message || e), extractStacktrace(e, 0));
+
+  			// Else next test will carry the responsibility
+  			saveGlobal();
+
+  			// Restart the tests if they're blocking
+  			if (config.blocking) {
+  				internalRecover(this);
+  			}
+  		}
+
+  		function runTest(test) {
+  			promise = test.callback.call(test.testEnvironment, test.assert);
+  			test.resolvePromise(promise);
+
+  			// If the test has a "lock" on it, but the timeout is 0, then we push a
+  			// failure as the test should be synchronous.
+  			if (test.timeout === 0 && test.semaphore !== 0) {
+  				pushFailure("Test did not finish synchronously even though assert.timeout( 0 ) was used.", sourceFromStacktrace(2));
+  			}
+  		}
+  	},
+
+  	after: function after() {
+  		checkPollution();
+  	},
+
+  	queueHook: function queueHook(hook, hookName, hookOwner) {
+  		var _this2 = this;
+
+  		var callHook = function callHook() {
+  			var promise = hook.call(_this2.testEnvironment, _this2.assert);
+  			_this2.resolvePromise(promise, hookName);
+  		};
+
+  		var runHook = function runHook() {
+  			if (hookName === "before") {
+  				if (hookOwner.unskippedTestsRun !== 0) {
+  					return;
+  				}
+
+  				_this2.preserveEnvironment = true;
+  			}
+
+  			// The 'after' hook should only execute when there are not tests left and
+  			// when the 'after' and 'finish' tasks are the only tasks left to process
+  			if (hookName === "after" && hookOwner.unskippedTestsRun !== numberOfUnskippedTests(hookOwner) - 1 && (config.queue.length > 0 || ProcessingQueue.taskCount() > 2)) {
+  				return;
+  			}
+
+  			config.current = _this2;
+  			if (config.notrycatch) {
+  				callHook();
+  				return;
+  			}
+  			try {
+  				callHook();
+  			} catch (error) {
+  				_this2.pushFailure(hookName + " failed on " + _this2.testName + ": " + (error.message || error), extractStacktrace(error, 0));
+  			}
+  		};
+
+  		return runHook;
+  	},
+
+
+  	// Currently only used for module level hooks, can be used to add global level ones
+  	hooks: function hooks(handler) {
+  		var hooks = [];
+
+  		function processHooks(test, module) {
+  			if (module.parentModule) {
+  				processHooks(test, module.parentModule);
+  			}
+
+  			if (module.hooks[handler].length) {
+  				for (var i = 0; i < module.hooks[handler].length; i++) {
+  					hooks.push(test.queueHook(module.hooks[handler][i], handler, module));
+  				}
+  			}
+  		}
+
+  		// Hooks are ignored on skipped tests
+  		if (!this.skip) {
+  			processHooks(this, this.module);
+  		}
+
+  		return hooks;
+  	},
+
+
+  	finish: function finish() {
+  		config.current = this;
+
+  		// Release the test callback to ensure that anything referenced has been
+  		// released to be garbage collected.
+  		this.callback = undefined;
+
+  		if (this.steps.length) {
+  			var stepsList = this.steps.join(", ");
+  			this.pushFailure("Expected assert.verifySteps() to be called before end of test " + ("after using assert.step(). Unverified steps: " + stepsList), this.stack);
+  		}
+
+  		if (config.requireExpects && this.expected === null) {
+  			this.pushFailure("Expected number of assertions to be defined, but expect() was " + "not called.", this.stack);
+  		} else if (this.expected !== null && this.expected !== this.assertions.length) {
+  			this.pushFailure("Expected " + this.expected + " assertions, but " + this.assertions.length + " were run", this.stack);
+  		} else if (this.expected === null && !this.assertions.length) {
+  			this.pushFailure("Expected at least one assertion, but none were run - call " + "expect(0) to accept zero assertions.", this.stack);
+  		}
+
+  		var i,
+  		    module = this.module,
+  		    moduleName = module.name,
+  		    testName = this.testName,
+  		    skipped = !!this.skip,
+  		    todo = !!this.todo,
+  		    bad = 0,
+  		    storage = config.storage;
+
+  		this.runtime = now() - this.started;
+
+  		config.stats.all += this.assertions.length;
+  		module.stats.all += this.assertions.length;
+
+  		for (i = 0; i < this.assertions.length; i++) {
+  			if (!this.assertions[i].result) {
+  				bad++;
+  				config.stats.bad++;
+  				module.stats.bad++;
+  			}
+  		}
+
+  		notifyTestsRan(module, skipped);
+
+  		// Store result when possible
+  		if (storage) {
+  			if (bad) {
+  				storage.setItem("qunit-test-" + moduleName + "-" + testName, bad);
+  			} else {
+  				storage.removeItem("qunit-test-" + moduleName + "-" + testName);
+  			}
+  		}
+
+  		// After emitting the js-reporters event we cleanup the assertion data to
+  		// avoid leaking it. It is not used by the legacy testDone callbacks.
+  		emit("testEnd", this.testReport.end(true));
+  		this.testReport.slimAssertions();
+
+  		return runLoggingCallbacks("testDone", {
+  			name: testName,
+  			module: moduleName,
+  			skipped: skipped,
+  			todo: todo,
+  			failed: bad,
+  			passed: this.assertions.length - bad,
+  			total: this.assertions.length,
+  			runtime: skipped ? 0 : this.runtime,
+
+  			// HTML Reporter use
+  			assertions: this.assertions,
+  			testId: this.testId,
+
+  			// Source of Test
+  			source: this.stack
+  		}).then(function () {
+  			if (module.testsRun === numberOfTests(module)) {
+  				var completedModules = [module];
+
+  				// Check if the parent modules, iteratively, are done. If that the case,
+  				// we emit the `suiteEnd` event and trigger `moduleDone` callback.
+  				var parent = module.parentModule;
+  				while (parent && parent.testsRun === numberOfTests(parent)) {
+  					completedModules.push(parent);
+  					parent = parent.parentModule;
+  				}
+
+  				return completedModules.reduce(function (promiseChain, completedModule) {
+  					return promiseChain.then(function () {
+  						return logSuiteEnd(completedModule);
+  					});
+  				}, Promise$1.resolve([]));
+  			}
+  		}).then(function () {
+  			config.current = undefined;
+  		});
+
+  		function logSuiteEnd(module) {
+
+  			// Reset `module.hooks` to ensure that anything referenced in these hooks
+  			// has been released to be garbage collected.
+  			module.hooks = {};
+
+  			emit("suiteEnd", module.suiteReport.end(true));
+  			return runLoggingCallbacks("moduleDone", {
+  				name: module.name,
+  				tests: module.tests,
+  				failed: module.stats.bad,
+  				passed: module.stats.all - module.stats.bad,
+  				total: module.stats.all,
+  				runtime: now() - module.stats.started
+  			});
+  		}
+  	},
+
+  	preserveTestEnvironment: function preserveTestEnvironment() {
+  		if (this.preserveEnvironment) {
+  			this.module.testEnvironment = this.testEnvironment;
+  			this.testEnvironment = extend({}, this.module.testEnvironment);
+  		}
+  	},
+
+  	queue: function queue() {
+  		var test = this;
+
+  		if (!this.valid()) {
+  			return;
+  		}
+
+  		function runTest() {
+  			return [function () {
+  				return test.before();
+  			}].concat(toConsumableArray(test.hooks("before")), [function () {
+  				test.preserveTestEnvironment();
+  			}], toConsumableArray(test.hooks("beforeEach")), [function () {
+  				test.run();
+  			}], toConsumableArray(test.hooks("afterEach").reverse()), toConsumableArray(test.hooks("after").reverse()), [function () {
+  				test.after();
+  			}, function () {
+  				return test.finish();
+  			}]);
+  		}
+
+  		var previousFailCount = config.storage && +config.storage.getItem("qunit-test-" + this.module.name + "-" + this.testName);
+
+  		// Prioritize previously failed tests, detected from storage
+  		var prioritize = config.reorder && !!previousFailCount;
+
+  		this.previousFailure = !!previousFailCount;
+
+  		ProcessingQueue.add(runTest, prioritize, config.seed);
+
+  		// If the queue has already finished, we manually process the new test
+  		if (ProcessingQueue.finished) {
+  			ProcessingQueue.advance();
+  		}
+  	},
+
+
+  	pushResult: function pushResult(resultInfo) {
+  		if (this !== config.current) {
+  			throw new Error("Assertion occurred after test had finished.");
+  		}
+
+  		// Destructure of resultInfo = { result, actual, expected, message, negative }
+  		var source,
+  		    details = {
+  			module: this.module.name,
+  			name: this.testName,
+  			result: resultInfo.result,
+  			message: resultInfo.message,
+  			actual: resultInfo.actual,
+  			testId: this.testId,
+  			negative: resultInfo.negative || false,
+  			runtime: now() - this.started,
+  			todo: !!this.todo
+  		};
+
+  		if (hasOwn.call(resultInfo, "expected")) {
+  			details.expected = resultInfo.expected;
+  		}
+
+  		if (!resultInfo.result) {
+  			source = resultInfo.source || sourceFromStacktrace();
+
+  			if (source) {
+  				details.source = source;
+  			}
+  		}
+
+  		this.logAssertion(details);
+
+  		this.assertions.push({
+  			result: !!resultInfo.result,
+  			message: resultInfo.message
+  		});
+  	},
+
+  	pushFailure: function pushFailure(message, source, actual) {
+  		if (!(this instanceof Test)) {
+  			throw new Error("pushFailure() assertion outside test context, was " + sourceFromStacktrace(2));
+  		}
+
+  		this.pushResult({
+  			result: false,
+  			message: message || "error",
+  			actual: actual || null,
+  			source: source
+  		});
+  	},
+
+  	/**
+    * Log assertion details using both the old QUnit.log interface and
+    * QUnit.on( "assertion" ) interface.
+    *
+    * @private
+    */
+  	logAssertion: function logAssertion(details) {
+  		runLoggingCallbacks("log", details);
+
+  		var assertion = {
+  			passed: details.result,
+  			actual: details.actual,
+  			expected: details.expected,
+  			message: details.message,
+  			stack: details.source,
+  			todo: details.todo
+  		};
+  		this.testReport.pushAssertion(assertion);
+  		emit("assertion", assertion);
+  	},
+
+
+  	resolvePromise: function resolvePromise(promise, phase) {
+  		var then,
+  		    resume,
+  		    message,
+  		    test = this;
+  		if (promise != null) {
+  			then = promise.then;
+  			if (objectType(then) === "function") {
+  				resume = internalStop(test);
+  				if (config.notrycatch) {
+  					then.call(promise, function () {
+  						resume();
+  					});
+  				} else {
+  					then.call(promise, function () {
+  						resume();
+  					}, function (error) {
+  						message = "Promise rejected " + (!phase ? "during" : phase.replace(/Each$/, "")) + " \"" + test.testName + "\": " + (error && error.message || error);
+  						test.pushFailure(message, extractStacktrace(error, 0));
+
+  						// Else next test will carry the responsibility
+  						saveGlobal();
+
+  						// Unblock
+  						internalRecover(test);
+  					});
+  				}
+  			}
+  		}
+  	},
+
+  	valid: function valid() {
+  		var filter = config.filter,
+  		    regexFilter = /^(!?)\/([\w\W]*)\/(i?$)/.exec(filter),
+  		    module = config.module && config.module.toLowerCase(),
+  		    fullName = this.module.name + ": " + this.testName;
+
+  		function moduleChainNameMatch(testModule) {
+  			var testModuleName = testModule.name ? testModule.name.toLowerCase() : null;
+  			if (testModuleName === module) {
+  				return true;
+  			} else if (testModule.parentModule) {
+  				return moduleChainNameMatch(testModule.parentModule);
+  			} else {
+  				return false;
+  			}
+  		}
+
+  		function moduleChainIdMatch(testModule) {
+  			return inArray(testModule.moduleId, config.moduleId) || testModule.parentModule && moduleChainIdMatch(testModule.parentModule);
+  		}
+
+  		// Internally-generated tests are always valid
+  		if (this.callback && this.callback.validTest) {
+  			return true;
+  		}
+
+  		if (config.moduleId && config.moduleId.length > 0 && !moduleChainIdMatch(this.module)) {
+
+  			return false;
+  		}
+
+  		if (config.testId && config.testId.length > 0 && !inArray(this.testId, config.testId)) {
+
+  			return false;
+  		}
+
+  		if (module && !moduleChainNameMatch(this.module)) {
+  			return false;
+  		}
+
+  		if (!filter) {
+  			return true;
+  		}
+
+  		return regexFilter ? this.regexFilter(!!regexFilter[1], regexFilter[2], regexFilter[3], fullName) : this.stringFilter(filter, fullName);
+  	},
+
+  	regexFilter: function regexFilter(exclude, pattern, flags, fullName) {
+  		var regex = new RegExp(pattern, flags);
+  		var match = regex.test(fullName);
+
+  		return match !== exclude;
+  	},
+
+  	stringFilter: function stringFilter(filter, fullName) {
+  		filter = filter.toLowerCase();
+  		fullName = fullName.toLowerCase();
+
+  		var include = filter.charAt(0) !== "!";
+  		if (!include) {
+  			filter = filter.slice(1);
+  		}
+
+  		// If the filter matches, we need to honour include
+  		if (fullName.indexOf(filter) !== -1) {
+  			return include;
+  		}
+
+  		// Otherwise, do the opposite
+  		return !include;
+  	}
+  };
+
+  function pushFailure() {
+  	if (!config.current) {
+  		throw new Error("pushFailure() assertion outside test context, in " + sourceFromStacktrace(2));
+  	}
+
+  	// Gets current test obj
+  	var currentTest = config.current;
+
+  	return currentTest.pushFailure.apply(currentTest, arguments);
+  }
+
+  function saveGlobal() {
+  	config.pollution = [];
+
+  	if (config.noglobals) {
+  		for (var key in global$1) {
+  			if (hasOwn.call(global$1, key)) {
+
+  				// In Opera sometimes DOM element ids show up here, ignore them
+  				if (/^qunit-test-output/.test(key)) {
+  					continue;
+  				}
+  				config.pollution.push(key);
+  			}
+  		}
+  	}
+  }
+
+  function checkPollution() {
+  	var newGlobals,
+  	    deletedGlobals,
+  	    old = config.pollution;
+
+  	saveGlobal();
+
+  	newGlobals = diff(config.pollution, old);
+  	if (newGlobals.length > 0) {
+  		pushFailure("Introduced global variable(s): " + newGlobals.join(", "));
+  	}
+
+  	deletedGlobals = diff(old, config.pollution);
+  	if (deletedGlobals.length > 0) {
+  		pushFailure("Deleted global variable(s): " + deletedGlobals.join(", "));
+  	}
+  }
+
+  // Will be exposed as QUnit.test
+  function test(testName, callback) {
+  	if (focused$1) {
+  		return;
+  	}
+
+  	var newTest = new Test({
+  		testName: testName,
+  		callback: callback
+  	});
+
+  	newTest.queue();
+  }
+
+  function todo(testName, callback) {
+  	if (focused$1) {
+  		return;
+  	}
+
+  	var newTest = new Test({
+  		testName: testName,
+  		callback: callback,
+  		todo: true
+  	});
+
+  	newTest.queue();
+  }
+
+  // Will be exposed as QUnit.skip
+  function skip(testName) {
+  	if (focused$1) {
+  		return;
+  	}
+
+  	var test = new Test({
+  		testName: testName,
+  		skip: true
+  	});
+
+  	test.queue();
+  }
+
+  // Will be exposed as QUnit.only
+  function only(testName, callback) {
+  	if (focused$1) {
+  		return;
+  	}
+
+  	config.queue.length = 0;
+  	focused$1 = true;
+
+  	var newTest = new Test({
+  		testName: testName,
+  		callback: callback
+  	});
+
+  	newTest.queue();
+  }
+
+  // Put a hold on processing and return a function that will release it.
+  function internalStop(test) {
+  	test.semaphore += 1;
+  	config.blocking = true;
+
+  	// Set a recovery timeout, if so configured.
+  	if (defined.setTimeout) {
+  		var timeoutDuration = void 0;
+
+  		if (typeof test.timeout === "number") {
+  			timeoutDuration = test.timeout;
+  		} else if (typeof config.testTimeout === "number") {
+  			timeoutDuration = config.testTimeout;
+  		}
+
+  		if (typeof timeoutDuration === "number" && timeoutDuration > 0) {
+  			clearTimeout(config.timeout);
+  			config.timeout = setTimeout$1(function () {
+  				pushFailure("Test took longer than " + timeoutDuration + "ms; test timed out.", sourceFromStacktrace(2));
+  				internalRecover(test);
+  			}, timeoutDuration);
+  		}
+  	}
+
+  	var released = false;
+  	return function resume() {
+  		if (released) {
+  			return;
+  		}
+
+  		released = true;
+  		test.semaphore -= 1;
+  		internalStart(test);
+  	};
+  }
+
+  // Forcefully release all processing holds.
+  function internalRecover(test) {
+  	test.semaphore = 0;
+  	internalStart(test);
+  }
+
+  // Release a processing hold, scheduling a resumption attempt if no holds remain.
+  function internalStart(test) {
+
+  	// If semaphore is non-numeric, throw error
+  	if (isNaN(test.semaphore)) {
+  		test.semaphore = 0;
+
+  		pushFailure("Invalid value on test.semaphore", sourceFromStacktrace(2));
+  		return;
+  	}
+
+  	// Don't start until equal number of stop-calls
+  	if (test.semaphore > 0) {
+  		return;
+  	}
+
+  	// Throw an Error if start is called more often than stop
+  	if (test.semaphore < 0) {
+  		test.semaphore = 0;
+
+  		pushFailure("Tried to restart test while already started (test's semaphore was 0 already)", sourceFromStacktrace(2));
+  		return;
+  	}
+
+  	// Add a slight delay to allow more assertions etc.
+  	if (defined.setTimeout) {
+  		if (config.timeout) {
+  			clearTimeout(config.timeout);
+  		}
+  		config.timeout = setTimeout$1(function () {
+  			if (test.semaphore > 0) {
+  				return;
+  			}
+
+  			if (config.timeout) {
+  				clearTimeout(config.timeout);
+  			}
+
+  			begin();
+  		});
+  	} else {
+  		begin();
+  	}
+  }
+
+  function collectTests(module) {
+  	var tests = [].concat(module.tests);
+  	var modules = [].concat(toConsumableArray(module.childModules));
+
+  	// Do a breadth-first traversal of the child modules
+  	while (modules.length) {
+  		var nextModule = modules.shift();
+  		tests.push.apply(tests, nextModule.tests);
+  		modules.push.apply(modules, toConsumableArray(nextModule.childModules));
+  	}
+
+  	return tests;
+  }
+
+  function numberOfTests(module) {
+  	return collectTests(module).length;
+  }
+
+  function numberOfUnskippedTests(module) {
+  	return collectTests(module).filter(function (test) {
+  		return !test.skip;
+  	}).length;
+  }
+
+  function notifyTestsRan(module, skipped) {
+  	module.testsRun++;
+  	if (!skipped) {
+  		module.unskippedTestsRun++;
+  	}
+  	while (module = module.parentModule) {
+  		module.testsRun++;
+  		if (!skipped) {
+  			module.unskippedTestsRun++;
+  		}
+  	}
+  }
+
+  var Assert = function () {
+  	function Assert(testContext) {
+  		classCallCheck(this, Assert);
+
+  		this.test = testContext;
+  	}
+
+  	// Assert helpers
+
+  	createClass(Assert, [{
+  		key: "timeout",
+  		value: function timeout(duration) {
+  			if (typeof duration !== "number") {
+  				throw new Error("You must pass a number as the duration to assert.timeout");
+  			}
+
+  			this.test.timeout = duration;
+  		}
+
+  		// Documents a "step", which is a string value, in a test as a passing assertion
+
+  	}, {
+  		key: "step",
+  		value: function step(message) {
+  			var assertionMessage = message;
+  			var result = !!message;
+
+  			this.test.steps.push(message);
+
+  			if (objectType(message) === "undefined" || message === "") {
+  				assertionMessage = "You must provide a message to assert.step";
+  			} else if (objectType(message) !== "string") {
+  				assertionMessage = "You must provide a string value to assert.step";
+  				result = false;
+  			}
+
+  			this.pushResult({
+  				result: result,
+  				message: assertionMessage
+  			});
+  		}
+
+  		// Verifies the steps in a test match a given array of string values
+
+  	}, {
+  		key: "verifySteps",
+  		value: function verifySteps(steps, message) {
+
+  			// Since the steps array is just string values, we can clone with slice
+  			var actualStepsClone = this.test.steps.slice();
+  			this.deepEqual(actualStepsClone, steps, message);
+  			this.test.steps.length = 0;
+  		}
+
+  		// Specify the number of expected assertions to guarantee that failed test
+  		// (no assertions are run at all) don't slip through.
+
+  	}, {
+  		key: "expect",
+  		value: function expect(asserts) {
+  			if (arguments.length === 1) {
+  				this.test.expected = asserts;
+  			} else {
+  				return this.test.expected;
+  			}
+  		}
+
+  		// Put a hold on processing and return a function that will release it a maximum of once.
+
+  	}, {
+  		key: "async",
+  		value: function async(count) {
+  			var test$$1 = this.test;
+
+  			var popped = false,
+  			    acceptCallCount = count;
+
+  			if (typeof acceptCallCount === "undefined") {
+  				acceptCallCount = 1;
+  			}
+
+  			var resume = internalStop(test$$1);
+
+  			return function done() {
+  				if (config.current !== test$$1) {
+  					throw Error("assert.async callback called after test finished.");
+  				}
+
+  				if (popped) {
+  					test$$1.pushFailure("Too many calls to the `assert.async` callback", sourceFromStacktrace(2));
+  					return;
+  				}
+
+  				acceptCallCount -= 1;
+  				if (acceptCallCount > 0) {
+  					return;
+  				}
+
+  				popped = true;
+  				resume();
+  			};
+  		}
+
+  		// Exports test.push() to the user API
+  		// Alias of pushResult.
+
+  	}, {
+  		key: "push",
+  		value: function push(result, actual, expected, message, negative) {
+  			Logger.warn("assert.push is deprecated and will be removed in QUnit 3.0." + " Please use assert.pushResult instead (https://api.qunitjs.com/assert/pushResult).");
+
+  			var currentAssert = this instanceof Assert ? this : config.current.assert;
+  			return currentAssert.pushResult({
+  				result: result,
+  				actual: actual,
+  				expected: expected,
+  				message: message,
+  				negative: negative
+  			});
+  		}
+  	}, {
+  		key: "pushResult",
+  		value: function pushResult(resultInfo) {
+
+  			// Destructure of resultInfo = { result, actual, expected, message, negative }
+  			var assert = this;
+  			var currentTest = assert instanceof Assert && assert.test || config.current;
+
+  			// Backwards compatibility fix.
+  			// Allows the direct use of global exported assertions and QUnit.assert.*
+  			// Although, it's use is not recommended as it can leak assertions
+  			// to other tests from async tests, because we only get a reference to the current test,
+  			// not exactly the test where assertion were intended to be called.
+  			if (!currentTest) {
+  				throw new Error("assertion outside test context, in " + sourceFromStacktrace(2));
+  			}
+
+  			if (!(assert instanceof Assert)) {
+  				assert = currentTest.assert;
+  			}
+
+  			return assert.test.pushResult(resultInfo);
+  		}
+  	}, {
+  		key: "ok",
+  		value: function ok(result, message) {
+  			if (!message) {
+  				message = result ? "okay" : "failed, expected argument to be truthy, was: " + dump.parse(result);
+  			}
+
+  			this.pushResult({
+  				result: !!result,
+  				actual: result,
+  				expected: true,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "notOk",
+  		value: function notOk(result, message) {
+  			if (!message) {
+  				message = !result ? "okay" : "failed, expected argument to be falsy, was: " + dump.parse(result);
+  			}
+
+  			this.pushResult({
+  				result: !result,
+  				actual: result,
+  				expected: false,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "equal",
+  		value: function equal(actual, expected, message) {
+
+  			// eslint-disable-next-line eqeqeq
+  			var result = expected == actual;
+
+  			this.pushResult({
+  				result: result,
+  				actual: actual,
+  				expected: expected,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "notEqual",
+  		value: function notEqual(actual, expected, message) {
+
+  			// eslint-disable-next-line eqeqeq
+  			var result = expected != actual;
+
+  			this.pushResult({
+  				result: result,
+  				actual: actual,
+  				expected: expected,
+  				message: message,
+  				negative: true
+  			});
+  		}
+  	}, {
+  		key: "propEqual",
+  		value: function propEqual(actual, expected, message) {
+  			actual = objectValues(actual);
+  			expected = objectValues(expected);
+
+  			this.pushResult({
+  				result: equiv(actual, expected),
+  				actual: actual,
+  				expected: expected,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "notPropEqual",
+  		value: function notPropEqual(actual, expected, message) {
+  			actual = objectValues(actual);
+  			expected = objectValues(expected);
+
+  			this.pushResult({
+  				result: !equiv(actual, expected),
+  				actual: actual,
+  				expected: expected,
+  				message: message,
+  				negative: true
+  			});
+  		}
+  	}, {
+  		key: "deepEqual",
+  		value: function deepEqual(actual, expected, message) {
+  			this.pushResult({
+  				result: equiv(actual, expected),
+  				actual: actual,
+  				expected: expected,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "notDeepEqual",
+  		value: function notDeepEqual(actual, expected, message) {
+  			this.pushResult({
+  				result: !equiv(actual, expected),
+  				actual: actual,
+  				expected: expected,
+  				message: message,
+  				negative: true
+  			});
+  		}
+  	}, {
+  		key: "strictEqual",
+  		value: function strictEqual(actual, expected, message) {
+  			this.pushResult({
+  				result: expected === actual,
+  				actual: actual,
+  				expected: expected,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "notStrictEqual",
+  		value: function notStrictEqual(actual, expected, message) {
+  			this.pushResult({
+  				result: expected !== actual,
+  				actual: actual,
+  				expected: expected,
+  				message: message,
+  				negative: true
+  			});
+  		}
+  	}, {
+  		key: "throws",
+  		value: function throws(block, expected, message) {
+  			var actual = void 0,
+  			    result = false;
+
+  			var currentTest = this instanceof Assert && this.test || config.current;
+
+  			// 'expected' is optional unless doing string comparison
+  			if (objectType(expected) === "string") {
+  				if (message == null) {
+  					message = expected;
+  					expected = null;
+  				} else {
+  					throw new Error("throws/raises does not accept a string value for the expected argument.\n" + "Use a non-string object value (e.g. regExp) instead if it's necessary.");
+  				}
+  			}
+
+  			currentTest.ignoreGlobalErrors = true;
+  			try {
+  				block.call(currentTest.testEnvironment);
+  			} catch (e) {
+  				actual = e;
+  			}
+  			currentTest.ignoreGlobalErrors = false;
+
+  			if (actual) {
+  				var expectedType = objectType(expected);
+
+  				// We don't want to validate thrown error
+  				if (!expected) {
+  					result = true;
+  					expected = null;
+
+  					// Expected is a regexp
+  				} else if (expectedType === "regexp") {
+  					result = expected.test(errorString(actual));
+
+  					// Expected is a constructor, maybe an Error constructor
+  				} else if (expectedType === "function" && actual instanceof expected) {
+  					result = true;
+
+  					// Expected is an Error object
+  				} else if (expectedType === "object") {
+  					result = actual instanceof expected.constructor && actual.name === expected.name && actual.message === expected.message;
+
+  					// Expected is a validation function which returns true if validation passed
+  				} else if (expectedType === "function" && expected.call({}, actual) === true) {
+  					expected = null;
+  					result = true;
+  				}
+  			}
+
+  			currentTest.assert.pushResult({
+  				result: result,
+  				actual: actual,
+  				expected: expected,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "rejects",
+  		value: function rejects(promise, expected, message) {
+  			var result = false;
+
+  			var currentTest = this instanceof Assert && this.test || config.current;
+
+  			// 'expected' is optional unless doing string comparison
+  			if (objectType(expected) === "string") {
+  				if (message === undefined) {
+  					message = expected;
+  					expected = undefined;
+  				} else {
+  					message = "assert.rejects does not accept a string value for the expected " + "argument.\nUse a non-string object value (e.g. validator function) instead " + "if necessary.";
+
+  					currentTest.assert.pushResult({
+  						result: false,
+  						message: message
+  					});
+
+  					return;
+  				}
+  			}
+
+  			var then = promise && promise.then;
+  			if (objectType(then) !== "function") {
+  				var _message = "The value provided to `assert.rejects` in " + "\"" + currentTest.testName + "\" was not a promise.";
+
+  				currentTest.assert.pushResult({
+  					result: false,
+  					message: _message,
+  					actual: promise
+  				});
+
+  				return;
+  			}
+
+  			var done = this.async();
+
+  			return then.call(promise, function handleFulfillment() {
+  				var message = "The promise returned by the `assert.rejects` callback in " + "\"" + currentTest.testName + "\" did not reject.";
+
+  				currentTest.assert.pushResult({
+  					result: false,
+  					message: message,
+  					actual: promise
+  				});
+
+  				done();
+  			}, function handleRejection(actual) {
+  				var expectedType = objectType(expected);
+
+  				// We don't want to validate
+  				if (expected === undefined) {
+  					result = true;
+  					expected = actual;
+
+  					// Expected is a regexp
+  				} else if (expectedType === "regexp") {
+  					result = expected.test(errorString(actual));
+
+  					// Expected is a constructor, maybe an Error constructor
+  				} else if (expectedType === "function" && actual instanceof expected) {
+  					result = true;
+
+  					// Expected is an Error object
+  				} else if (expectedType === "object") {
+  					result = actual instanceof expected.constructor && actual.name === expected.name && actual.message === expected.message;
+
+  					// Expected is a validation function which returns true if validation passed
+  				} else {
+  					if (expectedType === "function") {
+  						result = expected.call({}, actual) === true;
+  						expected = null;
+
+  						// Expected is some other invalid type
+  					} else {
+  						result = false;
+  						message = "invalid expected value provided to `assert.rejects` " + "callback in \"" + currentTest.testName + "\": " + expectedType + ".";
+  					}
+  				}
+
+  				currentTest.assert.pushResult({
+  					result: result,
+  					actual: actual,
+  					expected: expected,
+  					message: message
+  				});
+
+  				done();
+  			});
+  		}
+  	}]);
+  	return Assert;
+  }();
+
+  // Provide an alternative to assert.throws(), for environments that consider throws a reserved word
+  // Known to us are: Closure Compiler, Narwhal
+  // eslint-disable-next-line dot-notation
+
+
+  Assert.prototype.raises = Assert.prototype["throws"];
+
+  /**
+   * Converts an error into a simple string for comparisons.
+   *
+   * @param {Error} error
+   * @return {String}
+   */
+  function errorString(error) {
+  	var resultErrorString = error.toString();
+
+  	if (resultErrorString.substring(0, 7) === "[object") {
+  		var name = error.name ? error.name.toString() : "Error";
+  		var message = error.message ? error.message.toString() : "";
+
+  		if (name && message) {
+  			return name + ": " + message;
+  		} else if (name) {
+  			return name;
+  		} else if (message) {
+  			return message;
+  		} else {
+  			return "Error";
+  		}
+  	} else {
+  		return resultErrorString;
+  	}
+  }
+
+  /* global module, exports, define */
+  function exportQUnit(QUnit) {
+
+  	if (defined.document) {
+
+  		// QUnit may be defined when it is preconfigured but then only QUnit and QUnit.config may be defined.
+  		if (window$1.QUnit && window$1.QUnit.version) {
+  			throw new Error("QUnit has already been defined.");
+  		}
+
+  		window$1.QUnit = QUnit;
+  	}
+
+  	// For nodejs
+  	if (typeof module !== "undefined" && module && module.exports) {
+  		module.exports = QUnit;
+
+  		// For consistency with CommonJS environments' exports
+  		module.exports.QUnit = QUnit;
+  	}
+
+  	// For CommonJS with exports, but without module.exports, like Rhino
+  	if (typeof exports !== "undefined" && exports) {
+  		exports.QUnit = QUnit;
+  	}
+
+  	if (typeof define === "function" && define.amd) {
+  		define(function () {
+  			return QUnit;
+  		});
+  		QUnit.config.autostart = false;
+  	}
+
+  	// For Web/Service Workers
+  	if (self$1 && self$1.WorkerGlobalScope && self$1 instanceof self$1.WorkerGlobalScope) {
+  		self$1.QUnit = QUnit;
+  	}
+  }
+
+  // Handle an unhandled exception. By convention, returns true if further
+  // error handling should be suppressed and false otherwise.
+  // In this case, we will only suppress further error handling if the
+  // "ignoreGlobalErrors" configuration option is enabled.
+  function onError(error) {
+  	for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+  		args[_key - 1] = arguments[_key];
+  	}
+
+  	if (config.current) {
+  		if (config.current.ignoreGlobalErrors) {
+  			return true;
+  		}
+  		pushFailure.apply(undefined, [error.message, error.stacktrace || error.fileName + ":" + error.lineNumber].concat(args));
+  	} else {
+  		test("global failure", extend(function () {
+  			pushFailure.apply(undefined, [error.message, error.stacktrace || error.fileName + ":" + error.lineNumber].concat(args));
+  		}, { validTest: true }));
+  	}
+
+  	return false;
+  }
+
+  // Handle an unhandled rejection
+  function onUnhandledRejection(reason) {
+  	var resultInfo = {
+  		result: false,
+  		message: reason.message || "error",
+  		actual: reason,
+  		source: reason.stack || sourceFromStacktrace(3)
+  	};
+
+  	var currentTest = config.current;
+  	if (currentTest) {
+  		currentTest.assert.pushResult(resultInfo);
+  	} else {
+  		test("global failure", extend(function (assert) {
+  			assert.pushResult(resultInfo);
+  		}, { validTest: true }));
+  	}
+  }
+
+  var QUnit = {};
+  var globalSuite = new SuiteReport();
+
+  // The initial "currentModule" represents the global (or top-level) module that
+  // is not explicitly defined by the user, therefore we add the "globalSuite" to
+  // it since each module has a suiteReport associated with it.
+  config.currentModule.suiteReport = globalSuite;
+
+  var globalStartCalled = false;
+  var runStarted = false;
+
+  // Figure out if we're running the tests from a server or not
+  QUnit.isLocal = !(defined.document && window$1.location.protocol !== "file:");
+
+  // Expose the current QUnit version
+  QUnit.version = "2.8.0";
+
+  extend(QUnit, {
+  	on: on,
+
+  	module: module$1,
+
+  	test: test,
+
+  	todo: todo,
+
+  	skip: skip,
+
+  	only: only,
+
+  	start: function start(count) {
+  		var globalStartAlreadyCalled = globalStartCalled;
+
+  		if (!config.current) {
+  			globalStartCalled = true;
+
+  			if (runStarted) {
+  				throw new Error("Called start() while test already started running");
+  			} else if (globalStartAlreadyCalled || count > 1) {
+  				throw new Error("Called start() outside of a test context too many times");
+  			} else if (config.autostart) {
+  				throw new Error("Called start() outside of a test context when " + "QUnit.config.autostart was true");
+  			} else if (!config.pageLoaded) {
+
+  				// The page isn't completely loaded yet, so we set autostart and then
+  				// load if we're in Node or wait for the browser's load event.
+  				config.autostart = true;
+
+  				// Starts from Node even if .load was not previously called. We still return
+  				// early otherwise we'll wind up "beginning" twice.
+  				if (!defined.document) {
+  					QUnit.load();
+  				}
+
+  				return;
+  			}
+  		} else {
+  			throw new Error("QUnit.start cannot be called inside a test context.");
+  		}
+
+  		scheduleBegin();
+  	},
+
+  	config: config,
+
+  	is: is,
+
+  	objectType: objectType,
+
+  	extend: extend,
+
+  	load: function load() {
+  		config.pageLoaded = true;
+
+  		// Initialize the configuration options
+  		extend(config, {
+  			stats: { all: 0, bad: 0 },
+  			started: 0,
+  			updateRate: 1000,
+  			autostart: true,
+  			filter: ""
+  		}, true);
+
+  		if (!runStarted) {
+  			config.blocking = false;
+
+  			if (config.autostart) {
+  				scheduleBegin();
+  			}
+  		}
+  	},
+
+  	stack: function stack(offset) {
+  		offset = (offset || 0) + 2;
+  		return sourceFromStacktrace(offset);
+  	},
+
+  	onError: onError,
+
+  	onUnhandledRejection: onUnhandledRejection
+  });
+
+  QUnit.pushFailure = pushFailure;
+  QUnit.assert = Assert.prototype;
+  QUnit.equiv = equiv;
+  QUnit.dump = dump;
+
+  registerLoggingCallbacks(QUnit);
+
+  function scheduleBegin() {
+
+  	runStarted = true;
+
+  	// Add a slight delay to allow definition of more modules and tests.
+  	if (defined.setTimeout) {
+  		setTimeout$1(function () {
+  			begin();
+  		});
+  	} else {
+  		begin();
+  	}
+  }
+
+  function unblockAndAdvanceQueue() {
+  	config.blocking = false;
+  	ProcessingQueue.advance();
+  }
+
+  function begin() {
+  	var i,
+  	    l,
+  	    modulesLog = [];
+
+  	// If the test run hasn't officially begun yet
+  	if (!config.started) {
+
+  		// Record the time of the test run's beginning
+  		config.started = now();
+
+  		// Delete the loose unnamed module if unused.
+  		if (config.modules[0].name === "" && config.modules[0].tests.length === 0) {
+  			config.modules.shift();
+  		}
+
+  		// Avoid unnecessary information by not logging modules' test environments
+  		for (i = 0, l = config.modules.length; i < l; i++) {
+  			modulesLog.push({
+  				name: config.modules[i].name,
+  				tests: config.modules[i].tests
+  			});
+  		}
+
+  		// The test run is officially beginning now
+  		emit("runStart", globalSuite.start(true));
+  		runLoggingCallbacks("begin", {
+  			totalTests: Test.count,
+  			modules: modulesLog
+  		}).then(unblockAndAdvanceQueue);
+  	} else {
+  		unblockAndAdvanceQueue();
+  	}
+  }
+
+  exportQUnit(QUnit);
+
+  (function () {
+
+  	if (typeof window$1 === "undefined" || typeof document$1 === "undefined") {
+  		return;
+  	}
+
+  	var config = QUnit.config,
+  	    hasOwn = Object.prototype.hasOwnProperty;
+
+  	// Stores fixture HTML for resetting later
+  	function storeFixture() {
+
+  		// Avoid overwriting user-defined values
+  		if (hasOwn.call(config, "fixture")) {
+  			return;
+  		}
+
+  		var fixture = document$1.getElementById("qunit-fixture");
+  		if (fixture) {
+  			config.fixture = fixture.cloneNode(true);
+  		}
+  	}
+
+  	QUnit.begin(storeFixture);
+
+  	// Resets the fixture DOM element if available.
+  	function resetFixture() {
+  		if (config.fixture == null) {
+  			return;
+  		}
+
+  		var fixture = document$1.getElementById("qunit-fixture");
+  		var resetFixtureType = _typeof(config.fixture);
+  		if (resetFixtureType === "string") {
+
+  			// support user defined values for `config.fixture`
+  			var newFixture = document$1.createElement("div");
+  			newFixture.setAttribute("id", "qunit-fixture");
+  			newFixture.innerHTML = config.fixture;
+  			fixture.parentNode.replaceChild(newFixture, fixture);
+  		} else {
+  			var clonedFixture = config.fixture.cloneNode(true);
+  			fixture.parentNode.replaceChild(clonedFixture, fixture);
+  		}
+  	}
+
+  	QUnit.testStart(resetFixture);
+  })();
+
+  (function () {
+
+  	// Only interact with URLs via window.location
+  	var location = typeof window$1 !== "undefined" && window$1.location;
+  	if (!location) {
+  		return;
+  	}
+
+  	var urlParams = getUrlParams();
+
+  	QUnit.urlParams = urlParams;
+
+  	// Match module/test by inclusion in an array
+  	QUnit.config.moduleId = [].concat(urlParams.moduleId || []);
+  	QUnit.config.testId = [].concat(urlParams.testId || []);
+
+  	// Exact case-insensitive match of the module name
+  	QUnit.config.module = urlParams.module;
+
+  	// Regular expression or case-insenstive substring match against "moduleName: testName"
+  	QUnit.config.filter = urlParams.filter;
+
+  	// Test order randomization
+  	if (urlParams.seed === true) {
+
+  		// Generate a random seed if the option is specified without a value
+  		QUnit.config.seed = Math.random().toString(36).slice(2);
+  	} else if (urlParams.seed) {
+  		QUnit.config.seed = urlParams.seed;
+  	}
+
+  	// Add URL-parameter-mapped config values with UI form rendering data
+  	QUnit.config.urlConfig.push({
+  		id: "hidepassed",
+  		label: "Hide passed tests",
+  		tooltip: "Only show tests and assertions that fail. Stored as query-strings."
+  	}, {
+  		id: "noglobals",
+  		label: "Check for Globals",
+  		tooltip: "Enabling this will test if any test introduces new properties on the " + "global object (`window` in Browsers). Stored as query-strings."
+  	}, {
+  		id: "notrycatch",
+  		label: "No try-catch",
+  		tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging " + "exceptions in IE reasonable. Stored as query-strings."
+  	});
+
+  	QUnit.begin(function () {
+  		var i,
+  		    option,
+  		    urlConfig = QUnit.config.urlConfig;
+
+  		for (i = 0; i < urlConfig.length; i++) {
+
+  			// Options can be either strings or objects with nonempty "id" properties
+  			option = QUnit.config.urlConfig[i];
+  			if (typeof option !== "string") {
+  				option = option.id;
+  			}
+
+  			if (QUnit.config[option] === undefined) {
+  				QUnit.config[option] = urlParams[option];
+  			}
+  		}
+  	});
+
+  	function getUrlParams() {
+  		var i, param, name, value;
+  		var urlParams = Object.create(null);
+  		var params = location.search.slice(1).split("&");
+  		var length = params.length;
+
+  		for (i = 0; i < length; i++) {
+  			if (params[i]) {
+  				param = params[i].split("=");
+  				name = decodeQueryParam(param[0]);
+
+  				// Allow just a key to turn on a flag, e.g., test.html?noglobals
+  				value = param.length === 1 || decodeQueryParam(param.slice(1).join("="));
+  				if (name in urlParams) {
+  					urlParams[name] = [].concat(urlParams[name], value);
+  				} else {
+  					urlParams[name] = value;
+  				}
+  			}
+  		}
+
+  		return urlParams;
+  	}
+
+  	function decodeQueryParam(param) {
+  		return decodeURIComponent(param.replace(/\+/g, "%20"));
+  	}
+  })();
+
+  var stats = {
+  	passedTests: 0,
+  	failedTests: 0,
+  	skippedTests: 0,
+  	todoTests: 0
+  };
+
+  // Escape text for attribute or text content.
+  function escapeText(s) {
+  	if (!s) {
+  		return "";
+  	}
+  	s = s + "";
+
+  	// Both single quotes and double quotes (for attributes)
+  	return s.replace(/['"<>&]/g, function (s) {
+  		switch (s) {
+  			case "'":
+  				return "&#039;";
+  			case "\"":
+  				return "&quot;";
+  			case "<":
+  				return "&lt;";
+  			case ">":
+  				return "&gt;";
+  			case "&":
+  				return "&amp;";
+  		}
+  	});
+  }
+
+  (function () {
+
+  	// Don't load the HTML Reporter on non-browser environments
+  	if (typeof window$1 === "undefined" || !window$1.document) {
+  		return;
+  	}
+
+  	var config = QUnit.config,
+  	    hiddenTests = [],
+  	    document = window$1.document,
+  	    collapseNext = false,
+  	    hasOwn = Object.prototype.hasOwnProperty,
+  	    unfilteredUrl = setUrl({ filter: undefined, module: undefined,
+  		moduleId: undefined, testId: undefined }),
+  	    modulesList = [];
+
+  	function addEvent(elem, type, fn) {
+  		elem.addEventListener(type, fn, false);
+  	}
+
+  	function removeEvent(elem, type, fn) {
+  		elem.removeEventListener(type, fn, false);
+  	}
+
+  	function addEvents(elems, type, fn) {
+  		var i = elems.length;
+  		while (i--) {
+  			addEvent(elems[i], type, fn);
+  		}
+  	}
+
+  	function hasClass(elem, name) {
+  		return (" " + elem.className + " ").indexOf(" " + name + " ") >= 0;
+  	}
+
+  	function addClass(elem, name) {
+  		if (!hasClass(elem, name)) {
+  			elem.className += (elem.className ? " " : "") + name;
+  		}
+  	}
+
+  	function toggleClass(elem, name, force) {
+  		if (force || typeof force === "undefined" && !hasClass(elem, name)) {
+  			addClass(elem, name);
+  		} else {
+  			removeClass(elem, name);
+  		}
+  	}
+
+  	function removeClass(elem, name) {
+  		var set = " " + elem.className + " ";
+
+  		// Class name may appear multiple times
+  		while (set.indexOf(" " + name + " ") >= 0) {
+  			set = set.replace(" " + name + " ", " ");
+  		}
+
+  		// Trim for prettiness
+  		elem.className = typeof set.trim === "function" ? set.trim() : set.replace(/^\s+|\s+$/g, "");
+  	}
+
+  	function id(name) {
+  		return document.getElementById && document.getElementById(name);
+  	}
+
+  	function abortTests() {
+  		var abortButton = id("qunit-abort-tests-button");
+  		if (abortButton) {
+  			abortButton.disabled = true;
+  			abortButton.innerHTML = "Aborting...";
+  		}
+  		QUnit.config.queue.length = 0;
+  		return false;
+  	}
+
+  	function interceptNavigation(ev) {
+  		applyUrlParams();
+
+  		if (ev && ev.preventDefault) {
+  			ev.preventDefault();
+  		}
+
+  		return false;
+  	}
+
+  	function getUrlConfigHtml() {
+  		var i,
+  		    j,
+  		    val,
+  		    escaped,
+  		    escapedTooltip,
+  		    selection = false,
+  		    urlConfig = config.urlConfig,
+  		    urlConfigHtml = "";
+
+  		for (i = 0; i < urlConfig.length; i++) {
+
+  			// Options can be either strings or objects with nonempty "id" properties
+  			val = config.urlConfig[i];
+  			if (typeof val === "string") {
+  				val = {
+  					id: val,
+  					label: val
+  				};
+  			}
+
+  			escaped = escapeText(val.id);
+  			escapedTooltip = escapeText(val.tooltip);
+
+  			if (!val.value || typeof val.value === "string") {
+  				urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + "' title='" + escapedTooltip + "'><input id='qunit-urlconfig-" + escaped + "' name='" + escaped + "' type='checkbox'" + (val.value ? " value='" + escapeText(val.value) + "'" : "") + (config[val.id] ? " checked='checked'" : "") + " title='" + escapedTooltip + "' />" + escapeText(val.label) + "</label>";
+  			} else {
+  				urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + "' title='" + escapedTooltip + "'>" + val.label + ": </label><select id='qunit-urlconfig-" + escaped + "' name='" + escaped + "' title='" + escapedTooltip + "'><option></option>";
+
+  				if (QUnit.is("array", val.value)) {
+  					for (j = 0; j < val.value.length; j++) {
+  						escaped = escapeText(val.value[j]);
+  						urlConfigHtml += "<option value='" + escaped + "'" + (config[val.id] === val.value[j] ? (selection = true) && " selected='selected'" : "") + ">" + escaped + "</option>";
+  					}
+  				} else {
+  					for (j in val.value) {
+  						if (hasOwn.call(val.value, j)) {
+  							urlConfigHtml += "<option value='" + escapeText(j) + "'" + (config[val.id] === j ? (selection = true) && " selected='selected'" : "") + ">" + escapeText(val.value[j]) + "</option>";
+  						}
+  					}
+  				}
+  				if (config[val.id] && !selection) {
+  					escaped = escapeText(config[val.id]);
+  					urlConfigHtml += "<option value='" + escaped + "' selected='selected' disabled='disabled'>" + escaped + "</option>";
+  				}
+  				urlConfigHtml += "</select>";
+  			}
+  		}
+
+  		return urlConfigHtml;
+  	}
+
+  	// Handle "click" events on toolbar checkboxes and "change" for select menus.
+  	// Updates the URL with the new state of `config.urlConfig` values.
+  	function toolbarChanged() {
+  		var updatedUrl,
+  		    value,
+  		    tests,
+  		    field = this,
+  		    params = {};
+
+  		// Detect if field is a select menu or a checkbox
+  		if ("selectedIndex" in field) {
+  			value = field.options[field.selectedIndex].value || undefined;
+  		} else {
+  			value = field.checked ? field.defaultValue || true : undefined;
+  		}
+
+  		params[field.name] = value;
+  		updatedUrl = setUrl(params);
+
+  		// Check if we can apply the change without a page refresh
+  		if ("hidepassed" === field.name && "replaceState" in window$1.history) {
+  			QUnit.urlParams[field.name] = value;
+  			config[field.name] = value || false;
+  			tests = id("qunit-tests");
+  			if (tests) {
+  				var length = tests.children.length;
+  				var children = tests.children;
+
+  				if (field.checked) {
+  					for (var i = 0; i < length; i++) {
+  						var test = children[i];
+
+  						if (test && test.className.indexOf("pass") > -1) {
+  							hiddenTests.push(test);
+  						}
+  					}
+
+  					var _iteratorNormalCompletion = true;
+  					var _didIteratorError = false;
+  					var _iteratorError = undefined;
+
+  					try {
+  						for (var _iterator = hiddenTests[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+  							var hiddenTest = _step.value;
+
+  							tests.removeChild(hiddenTest);
+  						}
+  					} catch (err) {
+  						_didIteratorError = true;
+  						_iteratorError = err;
+  					} finally {
+  						try {
+  							if (!_iteratorNormalCompletion && _iterator.return) {
+  								_iterator.return();
+  							}
+  						} finally {
+  							if (_didIteratorError) {
+  								throw _iteratorError;
+  							}
+  						}
+  					}
+  				} else {
+  					while ((test = hiddenTests.pop()) != null) {
+  						tests.appendChild(test);
+  					}
+  				}
+  			}
+  			window$1.history.replaceState(null, "", updatedUrl);
+  		} else {
+  			window$1.location = updatedUrl;
+  		}
+  	}
+
+  	function setUrl(params) {
+  		var key,
+  		    arrValue,
+  		    i,
+  		    querystring = "?",
+  		    location = window$1.location;
+
+  		params = QUnit.extend(QUnit.extend({}, QUnit.urlParams), params);
+
+  		for (key in params) {
+
+  			// Skip inherited or undefined properties
+  			if (hasOwn.call(params, key) && params[key] !== undefined) {
+
+  				// Output a parameter for each value of this key
+  				// (but usually just one)
+  				arrValue = [].concat(params[key]);
+  				for (i = 0; i < arrValue.length; i++) {
+  					querystring += encodeURIComponent(key);
+  					if (arrValue[i] !== true) {
+  						querystring += "=" + encodeURIComponent(arrValue[i]);
+  					}
+  					querystring += "&";
+  				}
+  			}
+  		}
+  		return location.protocol + "//" + location.host + location.pathname + querystring.slice(0, -1);
+  	}
+
+  	function applyUrlParams() {
+  		var i,
+  		    selectedModules = [],
+  		    modulesList = id("qunit-modulefilter-dropdown-list").getElementsByTagName("input"),
+  		    filter = id("qunit-filter-input").value;
+
+  		for (i = 0; i < modulesList.length; i++) {
+  			if (modulesList[i].checked) {
+  				selectedModules.push(modulesList[i].value);
+  			}
+  		}
+
+  		window$1.location = setUrl({
+  			filter: filter === "" ? undefined : filter,
+  			moduleId: selectedModules.length === 0 ? undefined : selectedModules,
+
+  			// Remove module and testId filter
+  			module: undefined,
+  			testId: undefined
+  		});
+  	}
+
+  	function toolbarUrlConfigContainer() {
+  		var urlConfigContainer = document.createElement("span");
+
+  		urlConfigContainer.innerHTML = getUrlConfigHtml();
+  		addClass(urlConfigContainer, "qunit-url-config");
+
+  		addEvents(urlConfigContainer.getElementsByTagName("input"), "change", toolbarChanged);
+  		addEvents(urlConfigContainer.getElementsByTagName("select"), "change", toolbarChanged);
+
+  		return urlConfigContainer;
+  	}
+
+  	function abortTestsButton() {
+  		var button = document.createElement("button");
+  		button.id = "qunit-abort-tests-button";
+  		button.innerHTML = "Abort";
+  		addEvent(button, "click", abortTests);
+  		return button;
+  	}
+
+  	function toolbarLooseFilter() {
+  		var filter = document.createElement("form"),
+  		    label = document.createElement("label"),
+  		    input = document.createElement("input"),
+  		    button = document.createElement("button");
+
+  		addClass(filter, "qunit-filter");
+
+  		label.innerHTML = "Filter: ";
+
+  		input.type = "text";
+  		input.value = config.filter || "";
+  		input.name = "filter";
+  		input.id = "qunit-filter-input";
+
+  		button.innerHTML = "Go";
+
+  		label.appendChild(input);
+
+  		filter.appendChild(label);
+  		filter.appendChild(document.createTextNode(" "));
+  		filter.appendChild(button);
+  		addEvent(filter, "submit", interceptNavigation);
+
+  		return filter;
+  	}
+
+  	function moduleListHtml() {
+  		var i,
+  		    checked,
+  		    html = "";
+
+  		for (i = 0; i < config.modules.length; i++) {
+  			if (config.modules[i].name !== "") {
+  				checked = config.moduleId.indexOf(config.modules[i].moduleId) > -1;
+  				html += "<li><label class='clickable" + (checked ? " checked" : "") + "'><input type='checkbox' " + "value='" + config.modules[i].moduleId + "'" + (checked ? " checked='checked'" : "") + " />" + escapeText(config.modules[i].name) + "</label></li>";
+  			}
+  		}
+
+  		return html;
+  	}
+
+  	function toolbarModuleFilter() {
+  		var allCheckbox,
+  		    commit,
+  		    reset,
+  		    moduleFilter = document.createElement("form"),
+  		    label = document.createElement("label"),
+  		    moduleSearch = document.createElement("input"),
+  		    dropDown = document.createElement("div"),
+  		    actions = document.createElement("span"),
+  		    dropDownList = document.createElement("ul"),
+  		    dirty = false;
+
+  		moduleSearch.id = "qunit-modulefilter-search";
+  		moduleSearch.autocomplete = "off";
+  		addEvent(moduleSearch, "input", searchInput);
+  		addEvent(moduleSearch, "input", searchFocus);
+  		addEvent(moduleSearch, "focus", searchFocus);
+  		addEvent(moduleSearch, "click", searchFocus);
+
+  		label.id = "qunit-modulefilter-search-container";
+  		label.innerHTML = "Module: ";
+  		label.appendChild(moduleSearch);
+
+  		actions.id = "qunit-modulefilter-actions";
+  		actions.innerHTML = "<button style='display:none'>Apply</button>" + "<button type='reset' style='display:none'>Reset</button>" + "<label class='clickable" + (config.moduleId.length ? "" : " checked") + "'><input type='checkbox'" + (config.moduleId.length ? "" : " checked='checked'") + " />All modules</label>";
+  		allCheckbox = actions.lastChild.firstChild;
+  		commit = actions.firstChild;
+  		reset = commit.nextSibling;
+  		addEvent(commit, "click", applyUrlParams);
+
+  		dropDownList.id = "qunit-modulefilter-dropdown-list";
+  		dropDownList.innerHTML = moduleListHtml();
+
+  		dropDown.id = "qunit-modulefilter-dropdown";
+  		dropDown.style.display = "none";
+  		dropDown.appendChild(actions);
+  		dropDown.appendChild(dropDownList);
+  		addEvent(dropDown, "change", selectionChange);
+  		selectionChange();
+
+  		moduleFilter.id = "qunit-modulefilter";
+  		moduleFilter.appendChild(label);
+  		moduleFilter.appendChild(dropDown);
+  		addEvent(moduleFilter, "submit", interceptNavigation);
+  		addEvent(moduleFilter, "reset", function () {
+
+  			// Let the reset happen, then update styles
+  			window$1.setTimeout(selectionChange);
+  		});
+
+  		// Enables show/hide for the dropdown
+  		function searchFocus() {
+  			if (dropDown.style.display !== "none") {
+  				return;
+  			}
+
+  			dropDown.style.display = "block";
+  			addEvent(document, "click", hideHandler);
+  			addEvent(document, "keydown", hideHandler);
+
+  			// Hide on Escape keydown or outside-container click
+  			function hideHandler(e) {
+  				var inContainer = moduleFilter.contains(e.target);
+
+  				if (e.keyCode === 27 || !inContainer) {
+  					if (e.keyCode === 27 && inContainer) {
+  						moduleSearch.focus();
+  					}
+  					dropDown.style.display = "none";
+  					removeEvent(document, "click", hideHandler);
+  					removeEvent(document, "keydown", hideHandler);
+  					moduleSearch.value = "";
+  					searchInput();
+  				}
+  			}
+  		}
+
+  		// Processes module search box input
+  		function searchInput() {
+  			var i,
+  			    item,
+  			    searchText = moduleSearch.value.toLowerCase(),
+  			    listItems = dropDownList.children;
+
+  			for (i = 0; i < listItems.length; i++) {
+  				item = listItems[i];
+  				if (!searchText || item.textContent.toLowerCase().indexOf(searchText) > -1) {
+  					item.style.display = "";
+  				} else {
+  					item.style.display = "none";
+  				}
+  			}
+  		}
+
+  		// Processes selection changes
+  		function selectionChange(evt) {
+  			var i,
+  			    item,
+  			    checkbox = evt && evt.target || allCheckbox,
+  			    modulesList = dropDownList.getElementsByTagName("input"),
+  			    selectedNames = [];
+
+  			toggleClass(checkbox.parentNode, "checked", checkbox.checked);
+
+  			dirty = false;
+  			if (checkbox.checked && checkbox !== allCheckbox) {
+  				allCheckbox.checked = false;
+  				removeClass(allCheckbox.parentNode, "checked");
+  			}
+  			for (i = 0; i < modulesList.length; i++) {
+  				item = modulesList[i];
+  				if (!evt) {
+  					toggleClass(item.parentNode, "checked", item.checked);
+  				} else if (checkbox === allCheckbox && checkbox.checked) {
+  					item.checked = false;
+  					removeClass(item.parentNode, "checked");
+  				}
+  				dirty = dirty || item.checked !== item.defaultChecked;
+  				if (item.checked) {
+  					selectedNames.push(item.parentNode.textContent);
+  				}
+  			}
+
+  			commit.style.display = reset.style.display = dirty ? "" : "none";
+  			moduleSearch.placeholder = selectedNames.join(", ") || allCheckbox.parentNode.textContent;
+  			moduleSearch.title = "Type to filter list. Current selection:\n" + (selectedNames.join("\n") || allCheckbox.parentNode.textContent);
+  		}
+
+  		return moduleFilter;
+  	}
+
+  	function appendToolbar() {
+  		var toolbar = id("qunit-testrunner-toolbar");
+
+  		if (toolbar) {
+  			toolbar.appendChild(toolbarUrlConfigContainer());
+  			toolbar.appendChild(toolbarModuleFilter());
+  			toolbar.appendChild(toolbarLooseFilter());
+  			toolbar.appendChild(document.createElement("div")).className = "clearfix";
+  		}
+  	}
+
+  	function appendHeader() {
+  		var header = id("qunit-header");
+
+  		if (header) {
+  			header.innerHTML = "<a href='" + escapeText(unfilteredUrl) + "'>" + header.innerHTML + "</a> ";
+  		}
+  	}
+
+  	function appendBanner() {
+  		var banner = id("qunit-banner");
+
+  		if (banner) {
+  			banner.className = "";
+  		}
+  	}
+
+  	function appendTestResults() {
+  		var tests = id("qunit-tests"),
+  		    result = id("qunit-testresult"),
+  		    controls;
+
+  		if (result) {
+  			result.parentNode.removeChild(result);
+  		}
+
+  		if (tests) {
+  			tests.innerHTML = "";
+  			result = document.createElement("p");
+  			result.id = "qunit-testresult";
+  			result.className = "result";
+  			tests.parentNode.insertBefore(result, tests);
+  			result.innerHTML = "<div id=\"qunit-testresult-display\">Running...<br />&#160;</div>" + "<div id=\"qunit-testresult-controls\"></div>" + "<div class=\"clearfix\"></div>";
+  			controls = id("qunit-testresult-controls");
+  		}
+
+  		if (controls) {
+  			controls.appendChild(abortTestsButton());
+  		}
+  	}
+
+  	function appendFilteredTest() {
+  		var testId = QUnit.config.testId;
+  		if (!testId || testId.length <= 0) {
+  			return "";
+  		}
+  		return "<div id='qunit-filteredTest'>Rerunning selected tests: " + escapeText(testId.join(", ")) + " <a id='qunit-clearFilter' href='" + escapeText(unfilteredUrl) + "'>Run all tests</a></div>";
+  	}
+
+  	function appendUserAgent() {
+  		var userAgent = id("qunit-userAgent");
+
+  		if (userAgent) {
+  			userAgent.innerHTML = "";
+  			userAgent.appendChild(document.createTextNode("QUnit " + QUnit.version + "; " + navigator.userAgent));
+  		}
+  	}
+
+  	function appendInterface() {
+  		var qunit = id("qunit");
+
+  		if (qunit) {
+  			qunit.innerHTML = "<h1 id='qunit-header'>" + escapeText(document.title) + "</h1>" + "<h2 id='qunit-banner'></h2>" + "<div id='qunit-testrunner-toolbar'></div>" + appendFilteredTest() + "<h2 id='qunit-userAgent'></h2>" + "<ol id='qunit-tests'></ol>";
+  		}
+
+  		appendHeader();
+  		appendBanner();
+  		appendTestResults();
+  		appendUserAgent();
+  		appendToolbar();
+  	}
+
+  	function appendTest(name, testId, moduleName) {
+  		var title,
+  		    rerunTrigger,
+  		    testBlock,
+  		    assertList,
+  		    tests = id("qunit-tests");
+
+  		if (!tests) {
+  			return;
+  		}
+
+  		title = document.createElement("strong");
+  		title.innerHTML = getNameHtml(name, moduleName);
+
+  		rerunTrigger = document.createElement("a");
+  		rerunTrigger.innerHTML = "Rerun";
+  		rerunTrigger.href = setUrl({ testId: testId });
+
+  		testBlock = document.createElement("li");
+  		testBlock.appendChild(title);
+  		testBlock.appendChild(rerunTrigger);
+  		testBlock.id = "qunit-test-output-" + testId;
+
+  		assertList = document.createElement("ol");
+  		assertList.className = "qunit-assert-list";
+
+  		testBlock.appendChild(assertList);
+
+  		tests.appendChild(testBlock);
+  	}
+
+  	// HTML Reporter initialization and load
+  	QUnit.begin(function (details) {
+  		var i, moduleObj;
+
+  		// Sort modules by name for the picker
+  		for (i = 0; i < details.modules.length; i++) {
+  			moduleObj = details.modules[i];
+  			if (moduleObj.name) {
+  				modulesList.push(moduleObj.name);
+  			}
+  		}
+  		modulesList.sort(function (a, b) {
+  			return a.localeCompare(b);
+  		});
+
+  		// Initialize QUnit elements
+  		appendInterface();
+  	});
+
+  	QUnit.done(function (details) {
+  		var banner = id("qunit-banner"),
+  		    tests = id("qunit-tests"),
+  		    abortButton = id("qunit-abort-tests-button"),
+  		    totalTests = stats.passedTests + stats.skippedTests + stats.todoTests + stats.failedTests,
+  		    html = [totalTests, " tests completed in ", details.runtime, " milliseconds, with ", stats.failedTests, " failed, ", stats.skippedTests, " skipped, and ", stats.todoTests, " todo.<br />", "<span class='passed'>", details.passed, "</span> assertions of <span class='total'>", details.total, "</span> passed, <span class='failed'>", details.failed, "</span> failed."].join(""),
+  		    test,
+  		    assertLi,
+  		    assertList;
+
+  		// Update remaing tests to aborted
+  		if (abortButton && abortButton.disabled) {
+  			html = "Tests aborted after " + details.runtime + " milliseconds.";
+
+  			for (var i = 0; i < tests.children.length; i++) {
+  				test = tests.children[i];
+  				if (test.className === "" || test.className === "running") {
+  					test.className = "aborted";
+  					assertList = test.getElementsByTagName("ol")[0];
+  					assertLi = document.createElement("li");
+  					assertLi.className = "fail";
+  					assertLi.innerHTML = "Test aborted.";
+  					assertList.appendChild(assertLi);
+  				}
+  			}
+  		}
+
+  		if (banner && (!abortButton || abortButton.disabled === false)) {
+  			banner.className = stats.failedTests ? "qunit-fail" : "qunit-pass";
+  		}
+
+  		if (abortButton) {
+  			abortButton.parentNode.removeChild(abortButton);
+  		}
+
+  		if (tests) {
+  			id("qunit-testresult-display").innerHTML = html;
+  		}
+
+  		if (config.altertitle && document.title) {
+
+  			// Show ✖ for good, ✔ for bad suite result in title
+  			// use escape sequences in case file gets loaded with non-utf-8
+  			// charset
+  			document.title = [stats.failedTests ? "\u2716" : "\u2714", document.title.replace(/^[\u2714\u2716] /i, "")].join(" ");
+  		}
+
+  		// Scroll back to top to show results
+  		if (config.scrolltop && window$1.scrollTo) {
+  			window$1.scrollTo(0, 0);
+  		}
+  	});
+
+  	function getNameHtml(name, module) {
+  		var nameHtml = "";
+
+  		if (module) {
+  			nameHtml = "<span class='module-name'>" + escapeText(module) + "</span>: ";
+  		}
+
+  		nameHtml += "<span class='test-name'>" + escapeText(name) + "</span>";
+
+  		return nameHtml;
+  	}
+
+  	QUnit.testStart(function (details) {
+  		var running, bad;
+
+  		appendTest(details.name, details.testId, details.module);
+
+  		running = id("qunit-testresult-display");
+
+  		if (running) {
+  			addClass(running, "running");
+
+  			bad = QUnit.config.reorder && details.previousFailure;
+
+  			running.innerHTML = [bad ? "Rerunning previously failed test: <br />" : "Running: <br />", getNameHtml(details.name, details.module)].join("");
+  		}
+  	});
+
+  	function stripHtml(string) {
+
+  		// Strip tags, html entity and whitespaces
+  		return string.replace(/<\/?[^>]+(>|$)/g, "").replace(/&quot;/g, "").replace(/\s+/g, "");
+  	}
+
+  	QUnit.log(function (details) {
+  		var assertList,
+  		    assertLi,
+  		    message,
+  		    expected,
+  		    actual,
+  		    diff,
+  		    showDiff = false,
+  		    testItem = id("qunit-test-output-" + details.testId);
+
+  		if (!testItem) {
+  			return;
+  		}
+
+  		message = escapeText(details.message) || (details.result ? "okay" : "failed");
+  		message = "<span class='test-message'>" + message + "</span>";
+  		message += "<span class='runtime'>@ " + details.runtime + " ms</span>";
+
+  		// The pushFailure doesn't provide details.expected
+  		// when it calls, it's implicit to also not show expected and diff stuff
+  		// Also, we need to check details.expected existence, as it can exist and be undefined
+  		if (!details.result && hasOwn.call(details, "expected")) {
+  			if (details.negative) {
+  				expected = "NOT " + QUnit.dump.parse(details.expected);
+  			} else {
+  				expected = QUnit.dump.parse(details.expected);
+  			}
+
+  			actual = QUnit.dump.parse(details.actual);
+  			message += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + escapeText(expected) + "</pre></td></tr>";
+
+  			if (actual !== expected) {
+
+  				message += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeText(actual) + "</pre></td></tr>";
+
+  				if (typeof details.actual === "number" && typeof details.expected === "number") {
+  					if (!isNaN(details.actual) && !isNaN(details.expected)) {
+  						showDiff = true;
+  						diff = details.actual - details.expected;
+  						diff = (diff > 0 ? "+" : "") + diff;
+  					}
+  				} else if (typeof details.actual !== "boolean" && typeof details.expected !== "boolean") {
+  					diff = QUnit.diff(expected, actual);
+
+  					// don't show diff if there is zero overlap
+  					showDiff = stripHtml(diff).length !== stripHtml(expected).length + stripHtml(actual).length;
+  				}
+
+  				if (showDiff) {
+  					message += "<tr class='test-diff'><th>Diff: </th><td><pre>" + diff + "</pre></td></tr>";
+  				}
+  			} else if (expected.indexOf("[object Array]") !== -1 || expected.indexOf("[object Object]") !== -1) {
+  				message += "<tr class='test-message'><th>Message: </th><td>" + "Diff suppressed as the depth of object is more than current max depth (" + QUnit.config.maxDepth + ").<p>Hint: Use <code>QUnit.dump.maxDepth</code> to " + " run with a higher max depth or <a href='" + escapeText(setUrl({ maxDepth: -1 })) + "'>" + "Rerun</a> without max depth.</p></td></tr>";
+  			} else {
+  				message += "<tr class='test-message'><th>Message: </th><td>" + "Diff suppressed as the expected and actual results have an equivalent" + " serialization</td></tr>";
+  			}
+
+  			if (details.source) {
+  				message += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText(details.source) + "</pre></td></tr>";
+  			}
+
+  			message += "</table>";
+
+  			// This occurs when pushFailure is set and we have an extracted stack trace
+  		} else if (!details.result && details.source) {
+  			message += "<table>" + "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText(details.source) + "</pre></td></tr>" + "</table>";
+  		}
+
+  		assertList = testItem.getElementsByTagName("ol")[0];
+
+  		assertLi = document.createElement("li");
+  		assertLi.className = details.result ? "pass" : "fail";
+  		assertLi.innerHTML = message;
+  		assertList.appendChild(assertLi);
+  	});
+
+  	QUnit.testDone(function (details) {
+  		var testTitle,
+  		    time,
+  		    testItem,
+  		    assertList,
+  		    status,
+  		    good,
+  		    bad,
+  		    testCounts,
+  		    skipped,
+  		    sourceName,
+  		    tests = id("qunit-tests");
+
+  		if (!tests) {
+  			return;
+  		}
+
+  		testItem = id("qunit-test-output-" + details.testId);
+
+  		removeClass(testItem, "running");
+
+  		if (details.failed > 0) {
+  			status = "failed";
+  		} else if (details.todo) {
+  			status = "todo";
+  		} else {
+  			status = details.skipped ? "skipped" : "passed";
+  		}
+
+  		assertList = testItem.getElementsByTagName("ol")[0];
+
+  		good = details.passed;
+  		bad = details.failed;
+
+  		// This test passed if it has no unexpected failed assertions
+  		var testPassed = details.failed > 0 ? details.todo : !details.todo;
+
+  		if (testPassed) {
+
+  			// Collapse the passing tests
+  			addClass(assertList, "qunit-collapsed");
+  		} else if (config.collapse) {
+  			if (!collapseNext) {
+
+  				// Skip collapsing the first failing test
+  				collapseNext = true;
+  			} else {
+
+  				// Collapse remaining tests
+  				addClass(assertList, "qunit-collapsed");
+  			}
+  		}
+
+  		// The testItem.firstChild is the test name
+  		testTitle = testItem.firstChild;
+
+  		testCounts = bad ? "<b class='failed'>" + bad + "</b>, " + "<b class='passed'>" + good + "</b>, " : "";
+
+  		testTitle.innerHTML += " <b class='counts'>(" + testCounts + details.assertions.length + ")</b>";
+
+  		if (details.skipped) {
+  			stats.skippedTests++;
+
+  			testItem.className = "skipped";
+  			skipped = document.createElement("em");
+  			skipped.className = "qunit-skipped-label";
+  			skipped.innerHTML = "skipped";
+  			testItem.insertBefore(skipped, testTitle);
+  		} else {
+  			addEvent(testTitle, "click", function () {
+  				toggleClass(assertList, "qunit-collapsed");
+  			});
+
+  			testItem.className = testPassed ? "pass" : "fail";
+
+  			if (details.todo) {
+  				var todoLabel = document.createElement("em");
+  				todoLabel.className = "qunit-todo-label";
+  				todoLabel.innerHTML = "todo";
+  				testItem.className += " todo";
+  				testItem.insertBefore(todoLabel, testTitle);
+  			}
+
+  			time = document.createElement("span");
+  			time.className = "runtime";
+  			time.innerHTML = details.runtime + " ms";
+  			testItem.insertBefore(time, assertList);
+
+  			if (!testPassed) {
+  				stats.failedTests++;
+  			} else if (details.todo) {
+  				stats.todoTests++;
+  			} else {
+  				stats.passedTests++;
+  			}
+  		}
+
+  		// Show the source of the test when showing assertions
+  		if (details.source) {
+  			sourceName = document.createElement("p");
+  			sourceName.innerHTML = "<strong>Source: </strong>" + details.source;
+  			addClass(sourceName, "qunit-source");
+  			if (testPassed) {
+  				addClass(sourceName, "qunit-collapsed");
+  			}
+  			addEvent(testTitle, "click", function () {
+  				toggleClass(sourceName, "qunit-collapsed");
+  			});
+  			testItem.appendChild(sourceName);
+  		}
+
+  		if (config.hidepassed && status === "passed") {
+
+  			// use removeChild instead of remove because of support
+  			hiddenTests.push(testItem);
+
+  			tests.removeChild(testItem);
+  		}
+  	});
+
+  	// Avoid readyState issue with phantomjs
+  	// Ref: #818
+  	var notPhantom = function (p) {
+  		return !(p && p.version && p.version.major > 0);
+  	}(window$1.phantom);
+
+  	if (notPhantom && document.readyState === "complete") {
+  		QUnit.load();
+  	} else {
+  		addEvent(window$1, "load", QUnit.load);
+  	}
+
+  	// Wrap window.onerror. We will call the original window.onerror to see if
+  	// the existing handler fully handles the error; if not, we will call the
+  	// QUnit.onError function.
+  	var originalWindowOnError = window$1.onerror;
+
+  	// Cover uncaught exceptions
+  	// Returning true will suppress the default browser handler,
+  	// returning false will let it run.
+  	window$1.onerror = function (message, fileName, lineNumber, columnNumber, errorObj) {
+  		var ret = false;
+  		if (originalWindowOnError) {
+  			for (var _len = arguments.length, args = Array(_len > 5 ? _len - 5 : 0), _key = 5; _key < _len; _key++) {
+  				args[_key - 5] = arguments[_key];
+  			}
+
+  			ret = originalWindowOnError.call.apply(originalWindowOnError, [this, message, fileName, lineNumber, columnNumber, errorObj].concat(args));
+  		}
+
+  		// Treat return value as window.onerror itself does,
+  		// Only do our handling if not suppressed.
+  		if (ret !== true) {
+  			var error = {
+  				message: message,
+  				fileName: fileName,
+  				lineNumber: lineNumber
+  			};
+
+  			// According to
+  			// https://blog.sentry.io/2016/01/04/client-javascript-reporting-window-onerror,
+  			// most modern browsers support an errorObj argument; use that to
+  			// get a full stack trace if it's available.
+  			if (errorObj && errorObj.stack) {
+  				error.stacktrace = extractStacktrace(errorObj, 0);
+  			}
+
+  			ret = QUnit.onError(error);
+  		}
+
+  		return ret;
+  	};
+
+  	// Listen for unhandled rejections, and call QUnit.onUnhandledRejection
+  	window$1.addEventListener("unhandledrejection", function (event) {
+  		QUnit.onUnhandledRejection(event.reason);
+  	});
+  })();
+
+  /*
+   * This file is a modified version of google-diff-match-patch's JavaScript implementation
+   * (https://code.google.com/p/google-diff-match-patch/source/browse/trunk/javascript/diff_match_patch_uncompressed.js),
+   * modifications are licensed as more fully set forth in LICENSE.txt.
+   *
+   * The original source of google-diff-match-patch is attributable and licensed as follows:
+   *
+   * Copyright 2006 Google Inc.
+   * https://code.google.com/p/google-diff-match-patch/
+   *
+   * Licensed under the Apache License, Version 2.0 (the "License");
+   * you may not use this file except in compliance with the License.
+   * You may obtain a copy of the License at
+   *
+   * https://www.apache.org/licenses/LICENSE-2.0
+   *
+   * Unless required by applicable law or agreed to in writing, software
+   * distributed under the License is distributed on an "AS IS" BASIS,
+   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   * See the License for the specific language governing permissions and
+   * limitations under the License.
+   *
+   * More Info:
+   *  https://code.google.com/p/google-diff-match-patch/
+   *
+   * Usage: QUnit.diff(expected, actual)
+   *
+   */
+  QUnit.diff = function () {
+  	function DiffMatchPatch() {}
+
+  	//  DIFF FUNCTIONS
+
+  	/**
+    * The data structure representing a diff is an array of tuples:
+    * [[DIFF_DELETE, 'Hello'], [DIFF_INSERT, 'Goodbye'], [DIFF_EQUAL, ' world.']]
+    * which means: delete 'Hello', add 'Goodbye' and keep ' world.'
+    */
+  	var DIFF_DELETE = -1,
+  	    DIFF_INSERT = 1,
+  	    DIFF_EQUAL = 0;
+
+  	/**
+    * Find the differences between two texts.  Simplifies the problem by stripping
+    * any common prefix or suffix off the texts before diffing.
+    * @param {string} text1 Old string to be diffed.
+    * @param {string} text2 New string to be diffed.
+    * @param {boolean=} optChecklines Optional speedup flag. If present and false,
+    *     then don't run a line-level diff first to identify the changed areas.
+    *     Defaults to true, which does a faster, slightly less optimal diff.
+    * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
+    */
+  	DiffMatchPatch.prototype.DiffMain = function (text1, text2, optChecklines) {
+  		var deadline, checklines, commonlength, commonprefix, commonsuffix, diffs;
+
+  		// The diff must be complete in up to 1 second.
+  		deadline = new Date().getTime() + 1000;
+
+  		// Check for null inputs.
+  		if (text1 === null || text2 === null) {
+  			throw new Error("Null input. (DiffMain)");
+  		}
+
+  		// Check for equality (speedup).
+  		if (text1 === text2) {
+  			if (text1) {
+  				return [[DIFF_EQUAL, text1]];
+  			}
+  			return [];
+  		}
+
+  		if (typeof optChecklines === "undefined") {
+  			optChecklines = true;
+  		}
+
+  		checklines = optChecklines;
+
+  		// Trim off common prefix (speedup).
+  		commonlength = this.diffCommonPrefix(text1, text2);
+  		commonprefix = text1.substring(0, commonlength);
+  		text1 = text1.substring(commonlength);
+  		text2 = text2.substring(commonlength);
+
+  		// Trim off common suffix (speedup).
+  		commonlength = this.diffCommonSuffix(text1, text2);
+  		commonsuffix = text1.substring(text1.length - commonlength);
+  		text1 = text1.substring(0, text1.length - commonlength);
+  		text2 = text2.substring(0, text2.length - commonlength);
+
+  		// Compute the diff on the middle block.
+  		diffs = this.diffCompute(text1, text2, checklines, deadline);
+
+  		// Restore the prefix and suffix.
+  		if (commonprefix) {
+  			diffs.unshift([DIFF_EQUAL, commonprefix]);
+  		}
+  		if (commonsuffix) {
+  			diffs.push([DIFF_EQUAL, commonsuffix]);
+  		}
+  		this.diffCleanupMerge(diffs);
+  		return diffs;
+  	};
+
+  	/**
+    * Reduce the number of edits by eliminating operationally trivial equalities.
+    * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
+    */
+  	DiffMatchPatch.prototype.diffCleanupEfficiency = function (diffs) {
+  		var changes, equalities, equalitiesLength, lastequality, pointer, preIns, preDel, postIns, postDel;
+  		changes = false;
+  		equalities = []; // Stack of indices where equalities are found.
+  		equalitiesLength = 0; // Keeping our own length var is faster in JS.
+  		/** @type {?string} */
+  		lastequality = null;
+
+  		// Always equal to diffs[equalities[equalitiesLength - 1]][1]
+  		pointer = 0; // Index of current position.
+
+  		// Is there an insertion operation before the last equality.
+  		preIns = false;
+
+  		// Is there a deletion operation before the last equality.
+  		preDel = false;
+
+  		// Is there an insertion operation after the last equality.
+  		postIns = false;
+
+  		// Is there a deletion operation after the last equality.
+  		postDel = false;
+  		while (pointer < diffs.length) {
+
+  			// Equality found.
+  			if (diffs[pointer][0] === DIFF_EQUAL) {
+  				if (diffs[pointer][1].length < 4 && (postIns || postDel)) {
+
+  					// Candidate found.
+  					equalities[equalitiesLength++] = pointer;
+  					preIns = postIns;
+  					preDel = postDel;
+  					lastequality = diffs[pointer][1];
+  				} else {
+
+  					// Not a candidate, and can never become one.
+  					equalitiesLength = 0;
+  					lastequality = null;
+  				}
+  				postIns = postDel = false;
+
+  				// An insertion or deletion.
+  			} else {
+
+  				if (diffs[pointer][0] === DIFF_DELETE) {
+  					postDel = true;
+  				} else {
+  					postIns = true;
+  				}
+
+  				/*
+       * Five types to be split:
+       * <ins>A</ins><del>B</del>XY<ins>C</ins><del>D</del>
+       * <ins>A</ins>X<ins>C</ins><del>D</del>
+       * <ins>A</ins><del>B</del>X<ins>C</ins>
+       * <ins>A</del>X<ins>C</ins><del>D</del>
+       * <ins>A</ins><del>B</del>X<del>C</del>
+       */
+  				if (lastequality && (preIns && preDel && postIns && postDel || lastequality.length < 2 && preIns + preDel + postIns + postDel === 3)) {
+
+  					// Duplicate record.
+  					diffs.splice(equalities[equalitiesLength - 1], 0, [DIFF_DELETE, lastequality]);
+
+  					// Change second copy to insert.
+  					diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT;
+  					equalitiesLength--; // Throw away the equality we just deleted;
+  					lastequality = null;
+  					if (preIns && preDel) {
+
+  						// No changes made which could affect previous entry, keep going.
+  						postIns = postDel = true;
+  						equalitiesLength = 0;
+  					} else {
+  						equalitiesLength--; // Throw away the previous equality.
+  						pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1;
+  						postIns = postDel = false;
+  					}
+  					changes = true;
+  				}
+  			}
+  			pointer++;
+  		}
+
+  		if (changes) {
+  			this.diffCleanupMerge(diffs);
+  		}
+  	};
+
+  	/**
+    * Convert a diff array into a pretty HTML report.
+    * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
+    * @param {integer} string to be beautified.
+    * @return {string} HTML representation.
+    */
+  	DiffMatchPatch.prototype.diffPrettyHtml = function (diffs) {
+  		var op,
+  		    data,
+  		    x,
+  		    html = [];
+  		for (x = 0; x < diffs.length; x++) {
+  			op = diffs[x][0]; // Operation (insert, delete, equal)
+  			data = diffs[x][1]; // Text of change.
+  			switch (op) {
+  				case DIFF_INSERT:
+  					html[x] = "<ins>" + escapeText(data) + "</ins>";
+  					break;
+  				case DIFF_DELETE:
+  					html[x] = "<del>" + escapeText(data) + "</del>";
+  					break;
+  				case DIFF_EQUAL:
+  					html[x] = "<span>" + escapeText(data) + "</span>";
+  					break;
+  			}
+  		}
+  		return html.join("");
+  	};
+
+  	/**
+    * Determine the common prefix of two strings.
+    * @param {string} text1 First string.
+    * @param {string} text2 Second string.
+    * @return {number} The number of characters common to the start of each
+    *     string.
+    */
+  	DiffMatchPatch.prototype.diffCommonPrefix = function (text1, text2) {
+  		var pointermid, pointermax, pointermin, pointerstart;
+
+  		// Quick check for common null cases.
+  		if (!text1 || !text2 || text1.charAt(0) !== text2.charAt(0)) {
+  			return 0;
+  		}
+
+  		// Binary search.
+  		// Performance analysis: https://neil.fraser.name/news/2007/10/09/
+  		pointermin = 0;
+  		pointermax = Math.min(text1.length, text2.length);
+  		pointermid = pointermax;
+  		pointerstart = 0;
+  		while (pointermin < pointermid) {
+  			if (text1.substring(pointerstart, pointermid) === text2.substring(pointerstart, pointermid)) {
+  				pointermin = pointermid;
+  				pointerstart = pointermin;
+  			} else {
+  				pointermax = pointermid;
+  			}
+  			pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
+  		}
+  		return pointermid;
+  	};
+
+  	/**
+    * Determine the common suffix of two strings.
+    * @param {string} text1 First string.
+    * @param {string} text2 Second string.
+    * @return {number} The number of characters common to the end of each string.
+    */
+  	DiffMatchPatch.prototype.diffCommonSuffix = function (text1, text2) {
+  		var pointermid, pointermax, pointermin, pointerend;
+
+  		// Quick check for common null cases.
+  		if (!text1 || !text2 || text1.charAt(text1.length - 1) !== text2.charAt(text2.length - 1)) {
+  			return 0;
+  		}
+
+  		// Binary search.
+  		// Performance analysis: https://neil.fraser.name/news/2007/10/09/
+  		pointermin = 0;
+  		pointermax = Math.min(text1.length, text2.length);
+  		pointermid = pointermax;
+  		pointerend = 0;
+  		while (pointermin < pointermid) {
+  			if (text1.substring(text1.length - pointermid, text1.length - pointerend) === text2.substring(text2.length - pointermid, text2.length - pointerend)) {
+  				pointermin = pointermid;
+  				pointerend = pointermin;
+  			} else {
+  				pointermax = pointermid;
+  			}
+  			pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
+  		}
+  		return pointermid;
+  	};
+
+  	/**
+    * Find the differences between two texts.  Assumes that the texts do not
+    * have any common prefix or suffix.
+    * @param {string} text1 Old string to be diffed.
+    * @param {string} text2 New string to be diffed.
+    * @param {boolean} checklines Speedup flag.  If false, then don't run a
+    *     line-level diff first to identify the changed areas.
+    *     If true, then run a faster, slightly less optimal diff.
+    * @param {number} deadline Time when the diff should be complete by.
+    * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffCompute = function (text1, text2, checklines, deadline) {
+  		var diffs, longtext, shorttext, i, hm, text1A, text2A, text1B, text2B, midCommon, diffsA, diffsB;
+
+  		if (!text1) {
+
+  			// Just add some text (speedup).
+  			return [[DIFF_INSERT, text2]];
+  		}
+
+  		if (!text2) {
+
+  			// Just delete some text (speedup).
+  			return [[DIFF_DELETE, text1]];
+  		}
+
+  		longtext = text1.length > text2.length ? text1 : text2;
+  		shorttext = text1.length > text2.length ? text2 : text1;
+  		i = longtext.indexOf(shorttext);
+  		if (i !== -1) {
+
+  			// Shorter text is inside the longer text (speedup).
+  			diffs = [[DIFF_INSERT, longtext.substring(0, i)], [DIFF_EQUAL, shorttext], [DIFF_INSERT, longtext.substring(i + shorttext.length)]];
+
+  			// Swap insertions for deletions if diff is reversed.
+  			if (text1.length > text2.length) {
+  				diffs[0][0] = diffs[2][0] = DIFF_DELETE;
+  			}
+  			return diffs;
+  		}
+
+  		if (shorttext.length === 1) {
+
+  			// Single character string.
+  			// After the previous speedup, the character can't be an equality.
+  			return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]];
+  		}
+
+  		// Check to see if the problem can be split in two.
+  		hm = this.diffHalfMatch(text1, text2);
+  		if (hm) {
+
+  			// A half-match was found, sort out the return data.
+  			text1A = hm[0];
+  			text1B = hm[1];
+  			text2A = hm[2];
+  			text2B = hm[3];
+  			midCommon = hm[4];
+
+  			// Send both pairs off for separate processing.
+  			diffsA = this.DiffMain(text1A, text2A, checklines, deadline);
+  			diffsB = this.DiffMain(text1B, text2B, checklines, deadline);
+
+  			// Merge the results.
+  			return diffsA.concat([[DIFF_EQUAL, midCommon]], diffsB);
+  		}
+
+  		if (checklines && text1.length > 100 && text2.length > 100) {
+  			return this.diffLineMode(text1, text2, deadline);
+  		}
+
+  		return this.diffBisect(text1, text2, deadline);
+  	};
+
+  	/**
+    * Do the two texts share a substring which is at least half the length of the
+    * longer text?
+    * This speedup can produce non-minimal diffs.
+    * @param {string} text1 First string.
+    * @param {string} text2 Second string.
+    * @return {Array.<string>} Five element Array, containing the prefix of
+    *     text1, the suffix of text1, the prefix of text2, the suffix of
+    *     text2 and the common middle.  Or null if there was no match.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffHalfMatch = function (text1, text2) {
+  		var longtext, shorttext, dmp, text1A, text2B, text2A, text1B, midCommon, hm1, hm2, hm;
+
+  		longtext = text1.length > text2.length ? text1 : text2;
+  		shorttext = text1.length > text2.length ? text2 : text1;
+  		if (longtext.length < 4 || shorttext.length * 2 < longtext.length) {
+  			return null; // Pointless.
+  		}
+  		dmp = this; // 'this' becomes 'window' in a closure.
+
+  		/**
+     * Does a substring of shorttext exist within longtext such that the substring
+     * is at least half the length of longtext?
+     * Closure, but does not reference any external variables.
+     * @param {string} longtext Longer string.
+     * @param {string} shorttext Shorter string.
+     * @param {number} i Start index of quarter length substring within longtext.
+     * @return {Array.<string>} Five element Array, containing the prefix of
+     *     longtext, the suffix of longtext, the prefix of shorttext, the suffix
+     *     of shorttext and the common middle.  Or null if there was no match.
+     * @private
+     */
+  		function diffHalfMatchI(longtext, shorttext, i) {
+  			var seed, j, bestCommon, prefixLength, suffixLength, bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB;
+
+  			// Start with a 1/4 length substring at position i as a seed.
+  			seed = longtext.substring(i, i + Math.floor(longtext.length / 4));
+  			j = -1;
+  			bestCommon = "";
+  			while ((j = shorttext.indexOf(seed, j + 1)) !== -1) {
+  				prefixLength = dmp.diffCommonPrefix(longtext.substring(i), shorttext.substring(j));
+  				suffixLength = dmp.diffCommonSuffix(longtext.substring(0, i), shorttext.substring(0, j));
+  				if (bestCommon.length < suffixLength + prefixLength) {
+  					bestCommon = shorttext.substring(j - suffixLength, j) + shorttext.substring(j, j + prefixLength);
+  					bestLongtextA = longtext.substring(0, i - suffixLength);
+  					bestLongtextB = longtext.substring(i + prefixLength);
+  					bestShorttextA = shorttext.substring(0, j - suffixLength);
+  					bestShorttextB = shorttext.substring(j + prefixLength);
+  				}
+  			}
+  			if (bestCommon.length * 2 >= longtext.length) {
+  				return [bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB, bestCommon];
+  			} else {
+  				return null;
+  			}
+  		}
+
+  		// First check if the second quarter is the seed for a half-match.
+  		hm1 = diffHalfMatchI(longtext, shorttext, Math.ceil(longtext.length / 4));
+
+  		// Check again based on the third quarter.
+  		hm2 = diffHalfMatchI(longtext, shorttext, Math.ceil(longtext.length / 2));
+  		if (!hm1 && !hm2) {
+  			return null;
+  		} else if (!hm2) {
+  			hm = hm1;
+  		} else if (!hm1) {
+  			hm = hm2;
+  		} else {
+
+  			// Both matched.  Select the longest.
+  			hm = hm1[4].length > hm2[4].length ? hm1 : hm2;
+  		}
+
+  		// A half-match was found, sort out the return data.
+  		if (text1.length > text2.length) {
+  			text1A = hm[0];
+  			text1B = hm[1];
+  			text2A = hm[2];
+  			text2B = hm[3];
+  		} else {
+  			text2A = hm[0];
+  			text2B = hm[1];
+  			text1A = hm[2];
+  			text1B = hm[3];
+  		}
+  		midCommon = hm[4];
+  		return [text1A, text1B, text2A, text2B, midCommon];
+  	};
+
+  	/**
+    * Do a quick line-level diff on both strings, then rediff the parts for
+    * greater accuracy.
+    * This speedup can produce non-minimal diffs.
+    * @param {string} text1 Old string to be diffed.
+    * @param {string} text2 New string to be diffed.
+    * @param {number} deadline Time when the diff should be complete by.
+    * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffLineMode = function (text1, text2, deadline) {
+  		var a, diffs, linearray, pointer, countInsert, countDelete, textInsert, textDelete, j;
+
+  		// Scan the text on a line-by-line basis first.
+  		a = this.diffLinesToChars(text1, text2);
+  		text1 = a.chars1;
+  		text2 = a.chars2;
+  		linearray = a.lineArray;
+
+  		diffs = this.DiffMain(text1, text2, false, deadline);
+
+  		// Convert the diff back to original text.
+  		this.diffCharsToLines(diffs, linearray);
+
+  		// Eliminate freak matches (e.g. blank lines)
+  		this.diffCleanupSemantic(diffs);
+
+  		// Rediff any replacement blocks, this time character-by-character.
+  		// Add a dummy entry at the end.
+  		diffs.push([DIFF_EQUAL, ""]);
+  		pointer = 0;
+  		countDelete = 0;
+  		countInsert = 0;
+  		textDelete = "";
+  		textInsert = "";
+  		while (pointer < diffs.length) {
+  			switch (diffs[pointer][0]) {
+  				case DIFF_INSERT:
+  					countInsert++;
+  					textInsert += diffs[pointer][1];
+  					break;
+  				case DIFF_DELETE:
+  					countDelete++;
+  					textDelete += diffs[pointer][1];
+  					break;
+  				case DIFF_EQUAL:
+
+  					// Upon reaching an equality, check for prior redundancies.
+  					if (countDelete >= 1 && countInsert >= 1) {
+
+  						// Delete the offending records and add the merged ones.
+  						diffs.splice(pointer - countDelete - countInsert, countDelete + countInsert);
+  						pointer = pointer - countDelete - countInsert;
+  						a = this.DiffMain(textDelete, textInsert, false, deadline);
+  						for (j = a.length - 1; j >= 0; j--) {
+  							diffs.splice(pointer, 0, a[j]);
+  						}
+  						pointer = pointer + a.length;
+  					}
+  					countInsert = 0;
+  					countDelete = 0;
+  					textDelete = "";
+  					textInsert = "";
+  					break;
+  			}
+  			pointer++;
+  		}
+  		diffs.pop(); // Remove the dummy entry at the end.
+
+  		return diffs;
+  	};
+
+  	/**
+    * Find the 'middle snake' of a diff, split the problem in two
+    * and return the recursively constructed diff.
+    * See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations.
+    * @param {string} text1 Old string to be diffed.
+    * @param {string} text2 New string to be diffed.
+    * @param {number} deadline Time at which to bail if not yet complete.
+    * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffBisect = function (text1, text2, deadline) {
+  		var text1Length, text2Length, maxD, vOffset, vLength, v1, v2, x, delta, front, k1start, k1end, k2start, k2end, k2Offset, k1Offset, x1, x2, y1, y2, d, k1, k2;
+
+  		// Cache the text lengths to prevent multiple calls.
+  		text1Length = text1.length;
+  		text2Length = text2.length;
+  		maxD = Math.ceil((text1Length + text2Length) / 2);
+  		vOffset = maxD;
+  		vLength = 2 * maxD;
+  		v1 = new Array(vLength);
+  		v2 = new Array(vLength);
+
+  		// Setting all elements to -1 is faster in Chrome & Firefox than mixing
+  		// integers and undefined.
+  		for (x = 0; x < vLength; x++) {
+  			v1[x] = -1;
+  			v2[x] = -1;
+  		}
+  		v1[vOffset + 1] = 0;
+  		v2[vOffset + 1] = 0;
+  		delta = text1Length - text2Length;
+
+  		// If the total number of characters is odd, then the front path will collide
+  		// with the reverse path.
+  		front = delta % 2 !== 0;
+
+  		// Offsets for start and end of k loop.
+  		// Prevents mapping of space beyond the grid.
+  		k1start = 0;
+  		k1end = 0;
+  		k2start = 0;
+  		k2end = 0;
+  		for (d = 0; d < maxD; d++) {
+
+  			// Bail out if deadline is reached.
+  			if (new Date().getTime() > deadline) {
+  				break;
+  			}
+
+  			// Walk the front path one step.
+  			for (k1 = -d + k1start; k1 <= d - k1end; k1 += 2) {
+  				k1Offset = vOffset + k1;
+  				if (k1 === -d || k1 !== d && v1[k1Offset - 1] < v1[k1Offset + 1]) {
+  					x1 = v1[k1Offset + 1];
+  				} else {
+  					x1 = v1[k1Offset - 1] + 1;
+  				}
+  				y1 = x1 - k1;
+  				while (x1 < text1Length && y1 < text2Length && text1.charAt(x1) === text2.charAt(y1)) {
+  					x1++;
+  					y1++;
+  				}
+  				v1[k1Offset] = x1;
+  				if (x1 > text1Length) {
+
+  					// Ran off the right of the graph.
+  					k1end += 2;
+  				} else if (y1 > text2Length) {
+
+  					// Ran off the bottom of the graph.
+  					k1start += 2;
+  				} else if (front) {
+  					k2Offset = vOffset + delta - k1;
+  					if (k2Offset >= 0 && k2Offset < vLength && v2[k2Offset] !== -1) {
+
+  						// Mirror x2 onto top-left coordinate system.
+  						x2 = text1Length - v2[k2Offset];
+  						if (x1 >= x2) {
+
+  							// Overlap detected.
+  							return this.diffBisectSplit(text1, text2, x1, y1, deadline);
+  						}
+  					}
+  				}
+  			}
+
+  			// Walk the reverse path one step.
+  			for (k2 = -d + k2start; k2 <= d - k2end; k2 += 2) {
+  				k2Offset = vOffset + k2;
+  				if (k2 === -d || k2 !== d && v2[k2Offset - 1] < v2[k2Offset + 1]) {
+  					x2 = v2[k2Offset + 1];
+  				} else {
+  					x2 = v2[k2Offset - 1] + 1;
+  				}
+  				y2 = x2 - k2;
+  				while (x2 < text1Length && y2 < text2Length && text1.charAt(text1Length - x2 - 1) === text2.charAt(text2Length - y2 - 1)) {
+  					x2++;
+  					y2++;
+  				}
+  				v2[k2Offset] = x2;
+  				if (x2 > text1Length) {
+
+  					// Ran off the left of the graph.
+  					k2end += 2;
+  				} else if (y2 > text2Length) {
+
+  					// Ran off the top of the graph.
+  					k2start += 2;
+  				} else if (!front) {
+  					k1Offset = vOffset + delta - k2;
+  					if (k1Offset >= 0 && k1Offset < vLength && v1[k1Offset] !== -1) {
+  						x1 = v1[k1Offset];
+  						y1 = vOffset + x1 - k1Offset;
+
+  						// Mirror x2 onto top-left coordinate system.
+  						x2 = text1Length - x2;
+  						if (x1 >= x2) {
+
+  							// Overlap detected.
+  							return this.diffBisectSplit(text1, text2, x1, y1, deadline);
+  						}
+  					}
+  				}
+  			}
+  		}
+
+  		// Diff took too long and hit the deadline or
+  		// number of diffs equals number of characters, no commonality at all.
+  		return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]];
+  	};
+
+  	/**
+    * Given the location of the 'middle snake', split the diff in two parts
+    * and recurse.
+    * @param {string} text1 Old string to be diffed.
+    * @param {string} text2 New string to be diffed.
+    * @param {number} x Index of split point in text1.
+    * @param {number} y Index of split point in text2.
+    * @param {number} deadline Time at which to bail if not yet complete.
+    * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffBisectSplit = function (text1, text2, x, y, deadline) {
+  		var text1a, text1b, text2a, text2b, diffs, diffsb;
+  		text1a = text1.substring(0, x);
+  		text2a = text2.substring(0, y);
+  		text1b = text1.substring(x);
+  		text2b = text2.substring(y);
+
+  		// Compute both diffs serially.
+  		diffs = this.DiffMain(text1a, text2a, false, deadline);
+  		diffsb = this.DiffMain(text1b, text2b, false, deadline);
+
+  		return diffs.concat(diffsb);
+  	};
+
+  	/**
+    * Reduce the number of edits by eliminating semantically trivial equalities.
+    * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
+    */
+  	DiffMatchPatch.prototype.diffCleanupSemantic = function (diffs) {
+  		var changes, equalities, equalitiesLength, lastequality, pointer, lengthInsertions2, lengthDeletions2, lengthInsertions1, lengthDeletions1, deletion, insertion, overlapLength1, overlapLength2;
+  		changes = false;
+  		equalities = []; // Stack of indices where equalities are found.
+  		equalitiesLength = 0; // Keeping our own length var is faster in JS.
+  		/** @type {?string} */
+  		lastequality = null;
+
+  		// Always equal to diffs[equalities[equalitiesLength - 1]][1]
+  		pointer = 0; // Index of current position.
+
+  		// Number of characters that changed prior to the equality.
+  		lengthInsertions1 = 0;
+  		lengthDeletions1 = 0;
+
+  		// Number of characters that changed after the equality.
+  		lengthInsertions2 = 0;
+  		lengthDeletions2 = 0;
+  		while (pointer < diffs.length) {
+  			if (diffs[pointer][0] === DIFF_EQUAL) {
+  				// Equality found.
+  				equalities[equalitiesLength++] = pointer;
+  				lengthInsertions1 = lengthInsertions2;
+  				lengthDeletions1 = lengthDeletions2;
+  				lengthInsertions2 = 0;
+  				lengthDeletions2 = 0;
+  				lastequality = diffs[pointer][1];
+  			} else {
+  				// An insertion or deletion.
+  				if (diffs[pointer][0] === DIFF_INSERT) {
+  					lengthInsertions2 += diffs[pointer][1].length;
+  				} else {
+  					lengthDeletions2 += diffs[pointer][1].length;
+  				}
+
+  				// Eliminate an equality that is smaller or equal to the edits on both
+  				// sides of it.
+  				if (lastequality && lastequality.length <= Math.max(lengthInsertions1, lengthDeletions1) && lastequality.length <= Math.max(lengthInsertions2, lengthDeletions2)) {
+
+  					// Duplicate record.
+  					diffs.splice(equalities[equalitiesLength - 1], 0, [DIFF_DELETE, lastequality]);
+
+  					// Change second copy to insert.
+  					diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT;
+
+  					// Throw away the equality we just deleted.
+  					equalitiesLength--;
+
+  					// Throw away the previous equality (it needs to be reevaluated).
+  					equalitiesLength--;
+  					pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1;
+
+  					// Reset the counters.
+  					lengthInsertions1 = 0;
+  					lengthDeletions1 = 0;
+  					lengthInsertions2 = 0;
+  					lengthDeletions2 = 0;
+  					lastequality = null;
+  					changes = true;
+  				}
+  			}
+  			pointer++;
+  		}
+
+  		// Normalize the diff.
+  		if (changes) {
+  			this.diffCleanupMerge(diffs);
+  		}
+
+  		// Find any overlaps between deletions and insertions.
+  		// e.g: <del>abcxxx</del><ins>xxxdef</ins>
+  		//   -> <del>abc</del>xxx<ins>def</ins>
+  		// e.g: <del>xxxabc</del><ins>defxxx</ins>
+  		//   -> <ins>def</ins>xxx<del>abc</del>
+  		// Only extract an overlap if it is as big as the edit ahead or behind it.
+  		pointer = 1;
+  		while (pointer < diffs.length) {
+  			if (diffs[pointer - 1][0] === DIFF_DELETE && diffs[pointer][0] === DIFF_INSERT) {
+  				deletion = diffs[pointer - 1][1];
+  				insertion = diffs[pointer][1];
+  				overlapLength1 = this.diffCommonOverlap(deletion, insertion);
+  				overlapLength2 = this.diffCommonOverlap(insertion, deletion);
+  				if (overlapLength1 >= overlapLength2) {
+  					if (overlapLength1 >= deletion.length / 2 || overlapLength1 >= insertion.length / 2) {
+
+  						// Overlap found.  Insert an equality and trim the surrounding edits.
+  						diffs.splice(pointer, 0, [DIFF_EQUAL, insertion.substring(0, overlapLength1)]);
+  						diffs[pointer - 1][1] = deletion.substring(0, deletion.length - overlapLength1);
+  						diffs[pointer + 1][1] = insertion.substring(overlapLength1);
+  						pointer++;
+  					}
+  				} else {
+  					if (overlapLength2 >= deletion.length / 2 || overlapLength2 >= insertion.length / 2) {
+
+  						// Reverse overlap found.
+  						// Insert an equality and swap and trim the surrounding edits.
+  						diffs.splice(pointer, 0, [DIFF_EQUAL, deletion.substring(0, overlapLength2)]);
+
+  						diffs[pointer - 1][0] = DIFF_INSERT;
+  						diffs[pointer - 1][1] = insertion.substring(0, insertion.length - overlapLength2);
+  						diffs[pointer + 1][0] = DIFF_DELETE;
+  						diffs[pointer + 1][1] = deletion.substring(overlapLength2);
+  						pointer++;
+  					}
+  				}
+  				pointer++;
+  			}
+  			pointer++;
+  		}
+  	};
+
+  	/**
+    * Determine if the suffix of one string is the prefix of another.
+    * @param {string} text1 First string.
+    * @param {string} text2 Second string.
+    * @return {number} The number of characters common to the end of the first
+    *     string and the start of the second string.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffCommonOverlap = function (text1, text2) {
+  		var text1Length, text2Length, textLength, best, length, pattern, found;
+
+  		// Cache the text lengths to prevent multiple calls.
+  		text1Length = text1.length;
+  		text2Length = text2.length;
+
+  		// Eliminate the null case.
+  		if (text1Length === 0 || text2Length === 0) {
+  			return 0;
+  		}
+
+  		// Truncate the longer string.
+  		if (text1Length > text2Length) {
+  			text1 = text1.substring(text1Length - text2Length);
+  		} else if (text1Length < text2Length) {
+  			text2 = text2.substring(0, text1Length);
+  		}
+  		textLength = Math.min(text1Length, text2Length);
+
+  		// Quick check for the worst case.
+  		if (text1 === text2) {
+  			return textLength;
+  		}
+
+  		// Start by looking for a single character match
+  		// and increase length until no match is found.
+  		// Performance analysis: https://neil.fraser.name/news/2010/11/04/
+  		best = 0;
+  		length = 1;
+  		while (true) {
+  			pattern = text1.substring(textLength - length);
+  			found = text2.indexOf(pattern);
+  			if (found === -1) {
+  				return best;
+  			}
+  			length += found;
+  			if (found === 0 || text1.substring(textLength - length) === text2.substring(0, length)) {
+  				best = length;
+  				length++;
+  			}
+  		}
+  	};
+
+  	/**
+    * Split two texts into an array of strings.  Reduce the texts to a string of
+    * hashes where each Unicode character represents one line.
+    * @param {string} text1 First string.
+    * @param {string} text2 Second string.
+    * @return {{chars1: string, chars2: string, lineArray: !Array.<string>}}
+    *     An object containing the encoded text1, the encoded text2 and
+    *     the array of unique strings.
+    *     The zeroth element of the array of unique strings is intentionally blank.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffLinesToChars = function (text1, text2) {
+  		var lineArray, lineHash, chars1, chars2;
+  		lineArray = []; // E.g. lineArray[4] === 'Hello\n'
+  		lineHash = {}; // E.g. lineHash['Hello\n'] === 4
+
+  		// '\x00' is a valid character, but various debuggers don't like it.
+  		// So we'll insert a junk entry to avoid generating a null character.
+  		lineArray[0] = "";
+
+  		/**
+     * Split a text into an array of strings.  Reduce the texts to a string of
+     * hashes where each Unicode character represents one line.
+     * Modifies linearray and linehash through being a closure.
+     * @param {string} text String to encode.
+     * @return {string} Encoded string.
+     * @private
+     */
+  		function diffLinesToCharsMunge(text) {
+  			var chars, lineStart, lineEnd, lineArrayLength, line;
+  			chars = "";
+
+  			// Walk the text, pulling out a substring for each line.
+  			// text.split('\n') would would temporarily double our memory footprint.
+  			// Modifying text would create many large strings to garbage collect.
+  			lineStart = 0;
+  			lineEnd = -1;
+
+  			// Keeping our own length variable is faster than looking it up.
+  			lineArrayLength = lineArray.length;
+  			while (lineEnd < text.length - 1) {
+  				lineEnd = text.indexOf("\n", lineStart);
+  				if (lineEnd === -1) {
+  					lineEnd = text.length - 1;
+  				}
+  				line = text.substring(lineStart, lineEnd + 1);
+  				lineStart = lineEnd + 1;
+
+  				var lineHashExists = lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : lineHash[line] !== undefined;
+
+  				if (lineHashExists) {
+  					chars += String.fromCharCode(lineHash[line]);
+  				} else {
+  					chars += String.fromCharCode(lineArrayLength);
+  					lineHash[line] = lineArrayLength;
+  					lineArray[lineArrayLength++] = line;
+  				}
+  			}
+  			return chars;
+  		}
+
+  		chars1 = diffLinesToCharsMunge(text1);
+  		chars2 = diffLinesToCharsMunge(text2);
+  		return {
+  			chars1: chars1,
+  			chars2: chars2,
+  			lineArray: lineArray
+  		};
+  	};
+
+  	/**
+    * Rehydrate the text in a diff from a string of line hashes to real lines of
+    * text.
+    * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
+    * @param {!Array.<string>} lineArray Array of unique strings.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffCharsToLines = function (diffs, lineArray) {
+  		var x, chars, text, y;
+  		for (x = 0; x < diffs.length; x++) {
+  			chars = diffs[x][1];
+  			text = [];
+  			for (y = 0; y < chars.length; y++) {
+  				text[y] = lineArray[chars.charCodeAt(y)];
+  			}
+  			diffs[x][1] = text.join("");
+  		}
+  	};
+
+  	/**
+    * Reorder and merge like edit sections.  Merge equalities.
+    * Any edit section can move as long as it doesn't cross an equality.
+    * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
+    */
+  	DiffMatchPatch.prototype.diffCleanupMerge = function (diffs) {
+  		var pointer, countDelete, countInsert, textInsert, textDelete, commonlength, changes, diffPointer, position;
+  		diffs.push([DIFF_EQUAL, ""]); // Add a dummy entry at the end.
+  		pointer = 0;
+  		countDelete = 0;
+  		countInsert = 0;
+  		textDelete = "";
+  		textInsert = "";
+
+  		while (pointer < diffs.length) {
+  			switch (diffs[pointer][0]) {
+  				case DIFF_INSERT:
+  					countInsert++;
+  					textInsert += diffs[pointer][1];
+  					pointer++;
+  					break;
+  				case DIFF_DELETE:
+  					countDelete++;
+  					textDelete += diffs[pointer][1];
+  					pointer++;
+  					break;
+  				case DIFF_EQUAL:
+
+  					// Upon reaching an equality, check for prior redundancies.
+  					if (countDelete + countInsert > 1) {
+  						if (countDelete !== 0 && countInsert !== 0) {
+
+  							// Factor out any common prefixes.
+  							commonlength = this.diffCommonPrefix(textInsert, textDelete);
+  							if (commonlength !== 0) {
+  								if (pointer - countDelete - countInsert > 0 && diffs[pointer - countDelete - countInsert - 1][0] === DIFF_EQUAL) {
+  									diffs[pointer - countDelete - countInsert - 1][1] += textInsert.substring(0, commonlength);
+  								} else {
+  									diffs.splice(0, 0, [DIFF_EQUAL, textInsert.substring(0, commonlength)]);
+  									pointer++;
+  								}
+  								textInsert = textInsert.substring(commonlength);
+  								textDelete = textDelete.substring(commonlength);
+  							}
+
+  							// Factor out any common suffixies.
+  							commonlength = this.diffCommonSuffix(textInsert, textDelete);
+  							if (commonlength !== 0) {
+  								diffs[pointer][1] = textInsert.substring(textInsert.length - commonlength) + diffs[pointer][1];
+  								textInsert = textInsert.substring(0, textInsert.length - commonlength);
+  								textDelete = textDelete.substring(0, textDelete.length - commonlength);
+  							}
+  						}
+
+  						// Delete the offending records and add the merged ones.
+  						if (countDelete === 0) {
+  							diffs.splice(pointer - countInsert, countDelete + countInsert, [DIFF_INSERT, textInsert]);
+  						} else if (countInsert === 0) {
+  							diffs.splice(pointer - countDelete, countDelete + countInsert, [DIFF_DELETE, textDelete]);
+  						} else {
+  							diffs.splice(pointer - countDelete - countInsert, countDelete + countInsert, [DIFF_DELETE, textDelete], [DIFF_INSERT, textInsert]);
+  						}
+  						pointer = pointer - countDelete - countInsert + (countDelete ? 1 : 0) + (countInsert ? 1 : 0) + 1;
+  					} else if (pointer !== 0 && diffs[pointer - 1][0] === DIFF_EQUAL) {
+
+  						// Merge this equality with the previous one.
+  						diffs[pointer - 1][1] += diffs[pointer][1];
+  						diffs.splice(pointer, 1);
+  					} else {
+  						pointer++;
+  					}
+  					countInsert = 0;
+  					countDelete = 0;
+  					textDelete = "";
+  					textInsert = "";
+  					break;
+  			}
+  		}
+  		if (diffs[diffs.length - 1][1] === "") {
+  			diffs.pop(); // Remove the dummy entry at the end.
+  		}
+
+  		// Second pass: look for single edits surrounded on both sides by equalities
+  		// which can be shifted sideways to eliminate an equality.
+  		// e.g: A<ins>BA</ins>C -> <ins>AB</ins>AC
+  		changes = false;
+  		pointer = 1;
+
+  		// Intentionally ignore the first and last element (don't need checking).
+  		while (pointer < diffs.length - 1) {
+  			if (diffs[pointer - 1][0] === DIFF_EQUAL && diffs[pointer + 1][0] === DIFF_EQUAL) {
+
+  				diffPointer = diffs[pointer][1];
+  				position = diffPointer.substring(diffPointer.length - diffs[pointer - 1][1].length);
+
+  				// This is a single edit surrounded by equalities.
+  				if (position === diffs[pointer - 1][1]) {
+
+  					// Shift the edit over the previous equality.
+  					diffs[pointer][1] = diffs[pointer - 1][1] + diffs[pointer][1].substring(0, diffs[pointer][1].length - diffs[pointer - 1][1].length);
+  					diffs[pointer + 1][1] = diffs[pointer - 1][1] + diffs[pointer + 1][1];
+  					diffs.splice(pointer - 1, 1);
+  					changes = true;
+  				} else if (diffPointer.substring(0, diffs[pointer + 1][1].length) === diffs[pointer + 1][1]) {
+
+  					// Shift the edit over the next equality.
+  					diffs[pointer - 1][1] += diffs[pointer + 1][1];
+  					diffs[pointer][1] = diffs[pointer][1].substring(diffs[pointer + 1][1].length) + diffs[pointer + 1][1];
+  					diffs.splice(pointer + 1, 1);
+  					changes = true;
+  				}
+  			}
+  			pointer++;
+  		}
+
+  		// If shifts were made, the diff needs reordering and another shift sweep.
+  		if (changes) {
+  			this.diffCleanupMerge(diffs);
+  		}
+  	};
+
+  	return function (o, n) {
+  		var diff, output, text;
+  		diff = new DiffMatchPatch();
+  		output = diff.DiffMain(o, n);
+  		diff.diffCleanupEfficiency(output);
+  		text = diff.diffPrettyHtml(output);
+
+  		return text;
+  	};
+  }();
+
+}((function() { return this; }())));
diff --git a/vendor/assets/javascripts/sinon.js b/vendor/assets/javascripts/sinon.js
new file mode 100644
index 0000000000..28ef29da7a
--- /dev/null
+++ b/vendor/assets/javascripts/sinon.js
@@ -0,0 +1,16500 @@
+/* Sinon.JS 9.0.3, 2020-08-11, @license BSD-3 */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.sinon = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+"use strict";
+
+var behavior = require("./sinon/behavior");
+var createSandbox = require("./sinon/create-sandbox");
+var extend = require("./sinon/util/core/extend");
+var fakeTimers = require("./sinon/util/fake-timers");
+var format = require("./sinon/util/core/format");
+var nise = require("nise");
+var Sandbox = require("./sinon/sandbox");
+var stub = require("./sinon/stub");
+
+var apiMethods = {
+    createSandbox: createSandbox,
+    assert: require("./sinon/assert"),
+    match: require("@sinonjs/samsam").createMatcher,
+    restoreObject: require("./sinon/restore-object"),
+
+    expectation: require("./sinon/mock-expectation"),
+    defaultConfig: require("./sinon/util/core/default-config"),
+
+    setFormatter: format.setFormatter,
+
+    // fake timers
+    timers: fakeTimers.timers,
+
+    // fake XHR
+    xhr: nise.fakeXhr.xhr,
+    FakeXMLHttpRequest: nise.fakeXhr.FakeXMLHttpRequest,
+
+    // fake server
+    fakeServer: nise.fakeServer,
+    fakeServerWithClock: nise.fakeServerWithClock,
+    createFakeServer: nise.fakeServer.create.bind(nise.fakeServer),
+    createFakeServerWithClock: nise.fakeServerWithClock.create.bind(nise.fakeServerWithClock),
+
+    addBehavior: function(name, fn) {
+        behavior.addBehavior(stub, name, fn);
+    }
+};
+
+var sandbox = new Sandbox();
+
+var api = extend(sandbox, apiMethods);
+
+module.exports = api;
+
+},{"./sinon/assert":2,"./sinon/behavior":3,"./sinon/create-sandbox":6,"./sinon/mock-expectation":9,"./sinon/restore-object":15,"./sinon/sandbox":16,"./sinon/stub":19,"./sinon/util/core/default-config":21,"./sinon/util/core/extend":23,"./sinon/util/core/format":24,"./sinon/util/fake-timers":37,"@sinonjs/samsam":109,"nise":128}],2:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var calledInOrder = require("@sinonjs/commons").calledInOrder;
+var createMatcher = require("@sinonjs/samsam").createMatcher;
+var orderByFirstCall = require("@sinonjs/commons").orderByFirstCall;
+var timesInWords = require("./util/core/times-in-words");
+var format = require("./util/core/format");
+var stringSlice = require("@sinonjs/commons").prototypes.string.slice;
+var globalObject = require("@sinonjs/commons").global;
+
+var arraySlice = arrayProto.slice;
+var concat = arrayProto.concat;
+var forEach = arrayProto.forEach;
+var join = arrayProto.join;
+var splice = arrayProto.splice;
+
+var assert;
+
+function verifyIsStub() {
+    var args = arraySlice(arguments);
+
+    forEach(args, function(method) {
+        if (!method) {
+            assert.fail("fake is not a spy");
+        }
+
+        if (method.proxy && method.proxy.isSinonProxy) {
+            verifyIsStub(method.proxy);
+        } else {
+            if (typeof method !== "function") {
+                assert.fail(method + " is not a function");
+            }
+
+            if (typeof method.getCall !== "function") {
+                assert.fail(method + " is not stubbed");
+            }
+        }
+    });
+}
+
+function verifyIsValidAssertion(assertionMethod, assertionArgs) {
+    switch (assertionMethod) {
+        case "notCalled":
+        case "called":
+        case "calledOnce":
+        case "calledTwice":
+        case "calledThrice":
+            if (assertionArgs.length !== 0) {
+                assert.fail(
+                    assertionMethod +
+                        " takes 1 argument but was called with " +
+                        (assertionArgs.length + 1) +
+                        " arguments"
+                );
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+function failAssertion(object, msg) {
+    var obj = object || globalObject;
+    var failMethod = obj.fail || assert.fail;
+    failMethod.call(obj, msg);
+}
+
+function mirrorPropAsAssertion(name, method, message) {
+    var msg = message;
+    var meth = method;
+    if (arguments.length === 2) {
+        msg = method;
+        meth = name;
+    }
+
+    assert[name] = function(fake) {
+        verifyIsStub(fake);
+
+        var args = arraySlice(arguments, 1);
+        var failed = false;
+
+        verifyIsValidAssertion(name, args);
+
+        if (typeof meth === "function") {
+            failed = !meth(fake);
+        } else {
+            failed = typeof fake[meth] === "function" ? !fake[meth].apply(fake, args) : !fake[meth];
+        }
+
+        if (failed) {
+            failAssertion(this, (fake.printf || fake.proxy.printf).apply(fake, concat([msg], args)));
+        } else {
+            assert.pass(name);
+        }
+    };
+}
+
+function exposedName(prefix, prop) {
+    return !prefix || /^fail/.test(prop) ? prop : prefix + stringSlice(prop, 0, 1).toUpperCase() + stringSlice(prop, 1);
+}
+
+assert = {
+    failException: "AssertError",
+
+    fail: function fail(message) {
+        var error = new Error(message);
+        error.name = this.failException || assert.failException;
+
+        throw error;
+    },
+
+    pass: function pass() {
+        return;
+    },
+
+    callOrder: function assertCallOrder() {
+        verifyIsStub.apply(null, arguments);
+        var expected = "";
+        var actual = "";
+
+        if (!calledInOrder(arguments)) {
+            try {
+                expected = join(arguments, ", ");
+                var calls = arraySlice(arguments);
+                var i = calls.length;
+                while (i) {
+                    if (!calls[--i].called) {
+                        splice(calls, i, 1);
+                    }
+                }
+                actual = join(orderByFirstCall(calls), ", ");
+            } catch (e) {
+                // If this fails, we'll just fall back to the blank string
+            }
+
+            failAssertion(this, "expected " + expected + " to be called in order but were called as " + actual);
+        } else {
+            assert.pass("callOrder");
+        }
+    },
+
+    callCount: function assertCallCount(method, count) {
+        verifyIsStub(method);
+
+        if (method.callCount !== count) {
+            var msg = "expected %n to be called " + timesInWords(count) + " but was called %c%C";
+            failAssertion(this, method.printf(msg));
+        } else {
+            assert.pass("callCount");
+        }
+    },
+
+    expose: function expose(target, options) {
+        if (!target) {
+            throw new TypeError("target is null or undefined");
+        }
+
+        var o = options || {};
+        var prefix = (typeof o.prefix === "undefined" && "assert") || o.prefix;
+        var includeFail = typeof o.includeFail === "undefined" || Boolean(o.includeFail);
+        var instance = this;
+
+        forEach(Object.keys(instance), function(method) {
+            if (method !== "expose" && (includeFail || !/^(fail)/.test(method))) {
+                target[exposedName(prefix, method)] = instance[method];
+            }
+        });
+
+        return target;
+    },
+
+    match: function match(actual, expectation) {
+        var matcher = createMatcher(expectation);
+        if (matcher.test(actual)) {
+            assert.pass("match");
+        } else {
+            var formatted = [
+                "expected value to match",
+                "    expected = " + format(expectation),
+                "    actual = " + format(actual)
+            ];
+
+            failAssertion(this, join(formatted, "\n"));
+        }
+    }
+};
+
+mirrorPropAsAssertion("called", "expected %n to have been called at least once but was never called");
+mirrorPropAsAssertion(
+    "notCalled",
+    function(spy) {
+        return !spy.called;
+    },
+    "expected %n to not have been called but was called %c%C"
+);
+mirrorPropAsAssertion("calledOnce", "expected %n to be called once but was called %c%C");
+mirrorPropAsAssertion("calledTwice", "expected %n to be called twice but was called %c%C");
+mirrorPropAsAssertion("calledThrice", "expected %n to be called thrice but was called %c%C");
+mirrorPropAsAssertion("calledOn", "expected %n to be called with %1 as this but was called with %t");
+mirrorPropAsAssertion("alwaysCalledOn", "expected %n to always be called with %1 as this but was called with %t");
+mirrorPropAsAssertion("calledWithNew", "expected %n to be called with new");
+mirrorPropAsAssertion("alwaysCalledWithNew", "expected %n to always be called with new");
+mirrorPropAsAssertion("calledWith", "expected %n to be called with arguments %D");
+mirrorPropAsAssertion("calledWithMatch", "expected %n to be called with match %D");
+mirrorPropAsAssertion("alwaysCalledWith", "expected %n to always be called with arguments %D");
+mirrorPropAsAssertion("alwaysCalledWithMatch", "expected %n to always be called with match %D");
+mirrorPropAsAssertion("calledWithExactly", "expected %n to be called with exact arguments %D");
+mirrorPropAsAssertion("calledOnceWithExactly", "expected %n to be called once and with exact arguments %D");
+mirrorPropAsAssertion("alwaysCalledWithExactly", "expected %n to always be called with exact arguments %D");
+mirrorPropAsAssertion("neverCalledWith", "expected %n to never be called with arguments %*%C");
+mirrorPropAsAssertion("neverCalledWithMatch", "expected %n to never be called with match %*%C");
+mirrorPropAsAssertion("threw", "%n did not throw exception%C");
+mirrorPropAsAssertion("alwaysThrew", "%n did not always throw exception%C");
+
+module.exports = assert;
+
+},{"./util/core/format":24,"./util/core/times-in-words":32,"@sinonjs/commons":44,"@sinonjs/samsam":109}],3:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var extend = require("./util/core/extend");
+var functionName = require("@sinonjs/commons").functionName;
+var nextTick = require("./util/core/next-tick");
+var valueToString = require("@sinonjs/commons").valueToString;
+var exportAsyncBehaviors = require("./util/core/export-async-behaviors");
+
+var concat = arrayProto.concat;
+var join = arrayProto.join;
+var reverse = arrayProto.reverse;
+var slice = arrayProto.slice;
+
+var useLeftMostCallback = -1;
+var useRightMostCallback = -2;
+
+function getCallback(behavior, args) {
+    var callArgAt = behavior.callArgAt;
+
+    if (callArgAt >= 0) {
+        return args[callArgAt];
+    }
+
+    var argumentList;
+
+    if (callArgAt === useLeftMostCallback) {
+        argumentList = args;
+    }
+
+    if (callArgAt === useRightMostCallback) {
+        argumentList = reverse(slice(args));
+    }
+
+    var callArgProp = behavior.callArgProp;
+
+    for (var i = 0, l = argumentList.length; i < l; ++i) {
+        if (!callArgProp && typeof argumentList[i] === "function") {
+            return argumentList[i];
+        }
+
+        if (callArgProp && argumentList[i] && typeof argumentList[i][callArgProp] === "function") {
+            return argumentList[i][callArgProp];
+        }
+    }
+
+    return null;
+}
+
+function getCallbackError(behavior, func, args) {
+    if (behavior.callArgAt < 0) {
+        var msg;
+
+        if (behavior.callArgProp) {
+            msg =
+                functionName(behavior.stub) +
+                " expected to yield to '" +
+                valueToString(behavior.callArgProp) +
+                "', but no object with such a property was passed.";
+        } else {
+            msg = functionName(behavior.stub) + " expected to yield, but no callback was passed.";
+        }
+
+        if (args.length > 0) {
+            msg += " Received [" + join(args, ", ") + "]";
+        }
+
+        return msg;
+    }
+
+    return "argument at index " + behavior.callArgAt + " is not a function: " + func;
+}
+
+function ensureArgs(name, behavior, args) {
+    // map function name to internal property
+    //   callsArg => callArgAt
+    var property = name.replace(/sArg/, "ArgAt");
+    var index = behavior[property];
+
+    if (index >= args.length) {
+        throw new TypeError(
+            name + " failed: " + (index + 1) + " arguments required but only " + args.length + " present"
+        );
+    }
+}
+
+function callCallback(behavior, args) {
+    if (typeof behavior.callArgAt === "number") {
+        ensureArgs("callsArg", behavior, args);
+        var func = getCallback(behavior, args);
+
+        if (typeof func !== "function") {
+            throw new TypeError(getCallbackError(behavior, func, args));
+        }
+
+        if (behavior.callbackAsync) {
+            nextTick(function() {
+                func.apply(behavior.callbackContext, behavior.callbackArguments);
+            });
+        } else {
+            return func.apply(behavior.callbackContext, behavior.callbackArguments);
+        }
+    }
+
+    return undefined;
+}
+
+var proto = {
+    create: function create(stub) {
+        var behavior = extend({}, proto);
+        delete behavior.create;
+        delete behavior.addBehavior;
+        delete behavior.createBehavior;
+        behavior.stub = stub;
+
+        if (stub.defaultBehavior && stub.defaultBehavior.promiseLibrary) {
+            behavior.promiseLibrary = stub.defaultBehavior.promiseLibrary;
+        }
+
+        return behavior;
+    },
+
+    isPresent: function isPresent() {
+        return (
+            typeof this.callArgAt === "number" ||
+            this.exception ||
+            this.exceptionCreator ||
+            typeof this.returnArgAt === "number" ||
+            this.returnThis ||
+            typeof this.resolveArgAt === "number" ||
+            this.resolveThis ||
+            typeof this.throwArgAt === "number" ||
+            this.fakeFn ||
+            this.returnValueDefined
+        );
+    },
+
+    /*eslint complexity: ["error", 20]*/
+    invoke: function invoke(context, args) {
+        /*
+         * callCallback (conditionally) calls ensureArgs
+         *
+         * Note: callCallback intentionally happens before
+         * everything else and cannot be moved lower
+         */
+        var returnValue = callCallback(this, args);
+
+        if (this.exception) {
+            throw this.exception;
+        } else if (this.exceptionCreator) {
+            this.exception = this.exceptionCreator();
+            this.exceptionCreator = undefined;
+            throw this.exception;
+        } else if (typeof this.returnArgAt === "number") {
+            ensureArgs("returnsArg", this, args);
+            return args[this.returnArgAt];
+        } else if (this.returnThis) {
+            return context;
+        } else if (typeof this.throwArgAt === "number") {
+            ensureArgs("throwsArg", this, args);
+            throw args[this.throwArgAt];
+        } else if (this.fakeFn) {
+            return this.fakeFn.apply(context, args);
+        } else if (typeof this.resolveArgAt === "number") {
+            ensureArgs("resolvesArg", this, args);
+            return (this.promiseLibrary || Promise).resolve(args[this.resolveArgAt]);
+        } else if (this.resolveThis) {
+            return (this.promiseLibrary || Promise).resolve(context);
+        } else if (this.resolve) {
+            return (this.promiseLibrary || Promise).resolve(this.returnValue);
+        } else if (this.reject) {
+            return (this.promiseLibrary || Promise).reject(this.returnValue);
+        } else if (this.callsThrough) {
+            var wrappedMethod = this.effectiveWrappedMethod();
+
+            return wrappedMethod.apply(context, args);
+        } else if (this.callsThroughWithNew) {
+            // Get the original method (assumed to be a constructor in this case)
+            var WrappedClass = this.effectiveWrappedMethod();
+            // Turn the arguments object into a normal array
+            var argsArray = slice(args);
+            // Call the constructor
+            var F = WrappedClass.bind.apply(WrappedClass, concat([null], argsArray));
+            return new F();
+        } else if (typeof this.returnValue !== "undefined") {
+            return this.returnValue;
+        } else if (typeof this.callArgAt === "number") {
+            return returnValue;
+        }
+
+        return this.returnValue;
+    },
+
+    effectiveWrappedMethod: function effectiveWrappedMethod() {
+        for (var stubb = this.stub; stubb; stubb = stubb.parent) {
+            if (stubb.wrappedMethod) {
+                return stubb.wrappedMethod;
+            }
+        }
+        throw new Error("Unable to find wrapped method");
+    },
+
+    onCall: function onCall(index) {
+        return this.stub.onCall(index);
+    },
+
+    onFirstCall: function onFirstCall() {
+        return this.stub.onFirstCall();
+    },
+
+    onSecondCall: function onSecondCall() {
+        return this.stub.onSecondCall();
+    },
+
+    onThirdCall: function onThirdCall() {
+        return this.stub.onThirdCall();
+    },
+
+    withArgs: function withArgs(/* arguments */) {
+        throw new Error(
+            'Defining a stub by invoking "stub.onCall(...).withArgs(...)" ' +
+                'is not supported. Use "stub.withArgs(...).onCall(...)" ' +
+                "to define sequential behavior for calls with certain arguments."
+        );
+    }
+};
+
+function createBehavior(behaviorMethod) {
+    return function() {
+        this.defaultBehavior = this.defaultBehavior || proto.create(this);
+        this.defaultBehavior[behaviorMethod].apply(this.defaultBehavior, arguments);
+        return this;
+    };
+}
+
+function addBehavior(stub, name, fn) {
+    proto[name] = function() {
+        fn.apply(this, concat([this], slice(arguments)));
+        return this.stub || this;
+    };
+
+    stub[name] = createBehavior(name);
+}
+
+proto.addBehavior = addBehavior;
+proto.createBehavior = createBehavior;
+
+var asyncBehaviors = exportAsyncBehaviors(proto);
+
+module.exports = extend.nonEnum({}, proto, asyncBehaviors);
+
+},{"./util/core/export-async-behaviors":22,"./util/core/extend":23,"./util/core/next-tick":31,"@sinonjs/commons":44}],4:[function(require,module,exports){
+"use strict";
+
+var walk = require("./util/core/walk");
+var getPropertyDescriptor = require("./util/core/get-property-descriptor");
+var hasOwnProperty = require("@sinonjs/commons").prototypes.object.hasOwnProperty;
+var push = require("@sinonjs/commons").prototypes.array.push;
+
+function collectMethod(methods, object, prop, propOwner) {
+    if (typeof getPropertyDescriptor(propOwner, prop).value === "function" && hasOwnProperty(object, prop)) {
+        push(methods, object[prop]);
+    }
+}
+
+// This function returns an array of all the own methods on the passed object
+function collectOwnMethods(object) {
+    var methods = [];
+
+    walk(object, collectMethod.bind(null, methods, object));
+
+    return methods;
+}
+
+module.exports = collectOwnMethods;
+
+},{"./util/core/get-property-descriptor":27,"./util/core/walk":35,"@sinonjs/commons":44}],5:[function(require,module,exports){
+"use strict";
+
+var supportsColor = require("supports-color");
+
+function colorize(str, color) {
+    if (supportsColor.stdout === false) {
+        return str;
+    }
+
+    return "\x1b[" + color + "m" + str + "\x1b[0m";
+}
+
+exports.red = function(str) {
+    return colorize(str, 31);
+};
+
+exports.green = function(str) {
+    return colorize(str, 32);
+};
+
+exports.cyan = function(str) {
+    return colorize(str, 96);
+};
+
+exports.white = function(str) {
+    return colorize(str, 39);
+};
+
+exports.bold = function(str) {
+    return colorize(str, 1);
+};
+
+},{"supports-color":130}],6:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var Sandbox = require("./sandbox");
+
+var forEach = arrayProto.forEach;
+var push = arrayProto.push;
+
+function prepareSandboxFromConfig(config) {
+    var sandbox = new Sandbox();
+
+    if (config.useFakeServer) {
+        if (typeof config.useFakeServer === "object") {
+            sandbox.serverPrototype = config.useFakeServer;
+        }
+
+        sandbox.useFakeServer();
+    }
+
+    if (config.useFakeTimers) {
+        if (typeof config.useFakeTimers === "object") {
+            sandbox.useFakeTimers(config.useFakeTimers);
+        } else {
+            sandbox.useFakeTimers();
+        }
+    }
+
+    return sandbox;
+}
+
+function exposeValue(sandbox, config, key, value) {
+    if (!value) {
+        return;
+    }
+
+    if (config.injectInto && !(key in config.injectInto)) {
+        config.injectInto[key] = value;
+        push(sandbox.injectedKeys, key);
+    } else {
+        push(sandbox.args, value);
+    }
+}
+
+function createSandbox(config) {
+    if (!config) {
+        return new Sandbox();
+    }
+
+    var configuredSandbox = prepareSandboxFromConfig(config);
+    configuredSandbox.args = configuredSandbox.args || [];
+    configuredSandbox.injectedKeys = [];
+    configuredSandbox.injectInto = config.injectInto;
+    var exposed = configuredSandbox.inject({});
+
+    if (config.properties) {
+        forEach(config.properties, function(prop) {
+            var value = exposed[prop] || (prop === "sandbox" && configuredSandbox);
+            exposeValue(configuredSandbox, config, prop, value);
+        });
+    } else {
+        exposeValue(configuredSandbox, config, "sandbox");
+    }
+
+    return configuredSandbox;
+}
+
+module.exports = createSandbox;
+
+},{"./sandbox":16,"@sinonjs/commons":44}],7:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var isPropertyConfigurable = require("./util/core/is-property-configurable");
+var exportAsyncBehaviors = require("./util/core/export-async-behaviors");
+var extend = require("./util/core/extend");
+
+var slice = arrayProto.slice;
+
+var useLeftMostCallback = -1;
+var useRightMostCallback = -2;
+
+function throwsException(fake, error, message) {
+    if (typeof error === "function") {
+        fake.exceptionCreator = error;
+    } else if (typeof error === "string") {
+        fake.exceptionCreator = function() {
+            var newException = new Error(message || "");
+            newException.name = error;
+            return newException;
+        };
+    } else if (!error) {
+        fake.exceptionCreator = function() {
+            return new Error("Error");
+        };
+    } else {
+        fake.exception = error;
+    }
+}
+
+var defaultBehaviors = {
+    callsFake: function callsFake(fake, fn) {
+        fake.fakeFn = fn;
+    },
+
+    callsArg: function callsArg(fake, index) {
+        if (typeof index !== "number") {
+            throw new TypeError("argument index is not number");
+        }
+
+        fake.callArgAt = index;
+        fake.callbackArguments = [];
+        fake.callbackContext = undefined;
+        fake.callArgProp = undefined;
+        fake.callbackAsync = false;
+    },
+
+    callsArgOn: function callsArgOn(fake, index, context) {
+        if (typeof index !== "number") {
+            throw new TypeError("argument index is not number");
+        }
+
+        fake.callArgAt = index;
+        fake.callbackArguments = [];
+        fake.callbackContext = context;
+        fake.callArgProp = undefined;
+        fake.callbackAsync = false;
+    },
+
+    callsArgWith: function callsArgWith(fake, index) {
+        if (typeof index !== "number") {
+            throw new TypeError("argument index is not number");
+        }
+
+        fake.callArgAt = index;
+        fake.callbackArguments = slice(arguments, 2);
+        fake.callbackContext = undefined;
+        fake.callArgProp = undefined;
+        fake.callbackAsync = false;
+    },
+
+    callsArgOnWith: function callsArgWith(fake, index, context) {
+        if (typeof index !== "number") {
+            throw new TypeError("argument index is not number");
+        }
+
+        fake.callArgAt = index;
+        fake.callbackArguments = slice(arguments, 3);
+        fake.callbackContext = context;
+        fake.callArgProp = undefined;
+        fake.callbackAsync = false;
+    },
+
+    usingPromise: function usingPromise(fake, promiseLibrary) {
+        fake.promiseLibrary = promiseLibrary;
+    },
+
+    yields: function(fake) {
+        fake.callArgAt = useLeftMostCallback;
+        fake.callbackArguments = slice(arguments, 1);
+        fake.callbackContext = undefined;
+        fake.callArgProp = undefined;
+        fake.callbackAsync = false;
+    },
+
+    yieldsRight: function(fake) {
+        fake.callArgAt = useRightMostCallback;
+        fake.callbackArguments = slice(arguments, 1);
+        fake.callbackContext = undefined;
+        fake.callArgProp = undefined;
+        fake.callbackAsync = false;
+    },
+
+    yieldsOn: function(fake, context) {
+        fake.callArgAt = useLeftMostCallback;
+        fake.callbackArguments = slice(arguments, 2);
+        fake.callbackContext = context;
+        fake.callArgProp = undefined;
+        fake.callbackAsync = false;
+    },
+
+    yieldsTo: function(fake, prop) {
+        fake.callArgAt = useLeftMostCallback;
+        fake.callbackArguments = slice(arguments, 2);
+        fake.callbackContext = undefined;
+        fake.callArgProp = prop;
+        fake.callbackAsync = false;
+    },
+
+    yieldsToOn: function(fake, prop, context) {
+        fake.callArgAt = useLeftMostCallback;
+        fake.callbackArguments = slice(arguments, 3);
+        fake.callbackContext = context;
+        fake.callArgProp = prop;
+        fake.callbackAsync = false;
+    },
+
+    throws: throwsException,
+    throwsException: throwsException,
+
+    returns: function returns(fake, value) {
+        fake.returnValue = value;
+        fake.resolve = false;
+        fake.reject = false;
+        fake.returnValueDefined = true;
+        fake.exception = undefined;
+        fake.exceptionCreator = undefined;
+        fake.fakeFn = undefined;
+    },
+
+    returnsArg: function returnsArg(fake, index) {
+        if (typeof index !== "number") {
+            throw new TypeError("argument index is not number");
+        }
+
+        fake.returnArgAt = index;
+    },
+
+    throwsArg: function throwsArg(fake, index) {
+        if (typeof index !== "number") {
+            throw new TypeError("argument index is not number");
+        }
+
+        fake.throwArgAt = index;
+    },
+
+    returnsThis: function returnsThis(fake) {
+        fake.returnThis = true;
+    },
+
+    resolves: function resolves(fake, value) {
+        fake.returnValue = value;
+        fake.resolve = true;
+        fake.resolveThis = false;
+        fake.reject = false;
+        fake.returnValueDefined = true;
+        fake.exception = undefined;
+        fake.exceptionCreator = undefined;
+        fake.fakeFn = undefined;
+    },
+
+    resolvesArg: function resolvesArg(fake, index) {
+        if (typeof index !== "number") {
+            throw new TypeError("argument index is not number");
+        }
+        fake.resolveArgAt = index;
+        fake.returnValue = undefined;
+        fake.resolve = true;
+        fake.resolveThis = false;
+        fake.reject = false;
+        fake.returnValueDefined = false;
+        fake.exception = undefined;
+        fake.exceptionCreator = undefined;
+        fake.fakeFn = undefined;
+    },
+
+    rejects: function rejects(fake, error, message) {
+        var reason;
+        if (typeof error === "string") {
+            reason = new Error(message || "");
+            reason.name = error;
+        } else if (!error) {
+            reason = new Error("Error");
+        } else {
+            reason = error;
+        }
+        fake.returnValue = reason;
+        fake.resolve = false;
+        fake.resolveThis = false;
+        fake.reject = true;
+        fake.returnValueDefined = true;
+        fake.exception = undefined;
+        fake.exceptionCreator = undefined;
+        fake.fakeFn = undefined;
+
+        return fake;
+    },
+
+    resolvesThis: function resolvesThis(fake) {
+        fake.returnValue = undefined;
+        fake.resolve = false;
+        fake.resolveThis = true;
+        fake.reject = false;
+        fake.returnValueDefined = false;
+        fake.exception = undefined;
+        fake.exceptionCreator = undefined;
+        fake.fakeFn = undefined;
+    },
+
+    callThrough: function callThrough(fake) {
+        fake.callsThrough = true;
+    },
+
+    callThroughWithNew: function callThroughWithNew(fake) {
+        fake.callsThroughWithNew = true;
+    },
+
+    get: function get(fake, getterFunction) {
+        var rootStub = fake.stub || fake;
+
+        Object.defineProperty(rootStub.rootObj, rootStub.propName, {
+            get: getterFunction,
+            configurable: isPropertyConfigurable(rootStub.rootObj, rootStub.propName)
+        });
+
+        return fake;
+    },
+
+    set: function set(fake, setterFunction) {
+        var rootStub = fake.stub || fake;
+
+        Object.defineProperty(
+            rootStub.rootObj,
+            rootStub.propName,
+            // eslint-disable-next-line accessor-pairs
+            {
+                set: setterFunction,
+                configurable: isPropertyConfigurable(rootStub.rootObj, rootStub.propName)
+            }
+        );
+
+        return fake;
+    },
+
+    value: function value(fake, newVal) {
+        var rootStub = fake.stub || fake;
+
+        Object.defineProperty(rootStub.rootObj, rootStub.propName, {
+            value: newVal,
+            enumerable: true,
+            configurable: rootStub.shadowsPropOnPrototype || isPropertyConfigurable(rootStub.rootObj, rootStub.propName)
+        });
+
+        return fake;
+    }
+};
+
+var asyncBehaviors = exportAsyncBehaviors(defaultBehaviors);
+
+module.exports = extend({}, defaultBehaviors, asyncBehaviors);
+
+},{"./util/core/export-async-behaviors":22,"./util/core/extend":23,"./util/core/is-property-configurable":30,"@sinonjs/commons":44}],8:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var createProxy = require("./proxy");
+var nextTick = require("./util/core/next-tick");
+
+var slice = arrayProto.slice;
+
+function getError(value) {
+    return value instanceof Error ? value : new Error(value);
+}
+
+var uuid = 0;
+function wrapFunc(f) {
+    var proxy;
+    var fakeInstance = function() {
+        var firstArg, lastArg;
+
+        if (arguments.length > 0) {
+            firstArg = arguments[0];
+            lastArg = arguments[arguments.length - 1];
+        }
+
+        var callback = lastArg && typeof lastArg === "function" ? lastArg : undefined;
+
+        proxy.firstArg = firstArg;
+        proxy.lastArg = lastArg;
+        proxy.callback = callback;
+
+        return f && f.apply(this, arguments);
+    };
+    proxy = createProxy(fakeInstance, f || fakeInstance);
+
+    proxy.displayName = "fake";
+    proxy.id = "fake#" + uuid++;
+
+    return proxy;
+}
+
+function fake(f) {
+    if (arguments.length > 0 && typeof f !== "function") {
+        throw new TypeError("Expected f argument to be a Function");
+    }
+
+    return wrapFunc(f);
+}
+
+fake.returns = function returns(value) {
+    function f() {
+        return value;
+    }
+
+    return wrapFunc(f);
+};
+
+fake.throws = function throws(value) {
+    function f() {
+        throw getError(value);
+    }
+
+    return wrapFunc(f);
+};
+
+fake.resolves = function resolves(value) {
+    function f() {
+        return Promise.resolve(value);
+    }
+
+    return wrapFunc(f);
+};
+
+fake.rejects = function rejects(value) {
+    function f() {
+        return Promise.reject(getError(value));
+    }
+
+    return wrapFunc(f);
+};
+
+function yieldInternal(async, values) {
+    function f() {
+        var callback = arguments[arguments.length - 1];
+        if (typeof callback !== "function") {
+            throw new TypeError("Expected last argument to be a function");
+        }
+        if (async) {
+            nextTick(function() {
+                callback.apply(null, values);
+            });
+        } else {
+            callback.apply(null, values);
+        }
+    }
+
+    return wrapFunc(f);
+}
+
+fake.yields = function yields() {
+    return yieldInternal(false, slice(arguments));
+};
+
+fake.yieldsAsync = function yieldsAsync() {
+    return yieldInternal(true, slice(arguments));
+};
+
+module.exports = fake;
+
+},{"./proxy":14,"./util/core/next-tick":31,"@sinonjs/commons":44}],9:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var proxyInvoke = require("./proxy-invoke");
+var proxyCallToString = require("./proxy-call").toString;
+var timesInWords = require("./util/core/times-in-words");
+var extend = require("./util/core/extend");
+var match = require("@sinonjs/samsam").createMatcher;
+var stub = require("./stub");
+var assert = require("./assert");
+var deepEqual = require("@sinonjs/samsam").deepEqual;
+var format = require("./util/core/format");
+var valueToString = require("@sinonjs/commons").valueToString;
+
+var every = arrayProto.every;
+var forEach = arrayProto.forEach;
+var push = arrayProto.push;
+var slice = arrayProto.slice;
+
+function callCountInWords(callCount) {
+    if (callCount === 0) {
+        return "never called";
+    }
+
+    return "called " + timesInWords(callCount);
+}
+
+function expectedCallCountInWords(expectation) {
+    var min = expectation.minCalls;
+    var max = expectation.maxCalls;
+
+    if (typeof min === "number" && typeof max === "number") {
+        var str = timesInWords(min);
+
+        if (min !== max) {
+            str = "at least " + str + " and at most " + timesInWords(max);
+        }
+
+        return str;
+    }
+
+    if (typeof min === "number") {
+        return "at least " + timesInWords(min);
+    }
+
+    return "at most " + timesInWords(max);
+}
+
+function receivedMinCalls(expectation) {
+    var hasMinLimit = typeof expectation.minCalls === "number";
+    return !hasMinLimit || expectation.callCount >= expectation.minCalls;
+}
+
+function receivedMaxCalls(expectation) {
+    if (typeof expectation.maxCalls !== "number") {
+        return false;
+    }
+
+    return expectation.callCount === expectation.maxCalls;
+}
+
+function verifyMatcher(possibleMatcher, arg) {
+    var isMatcher = match.isMatcher(possibleMatcher);
+
+    return (isMatcher && possibleMatcher.test(arg)) || true;
+}
+
+var mockExpectation = {
+    minCalls: 1,
+    maxCalls: 1,
+
+    create: function create(methodName) {
+        var expectation = extend.nonEnum(stub(), mockExpectation);
+        delete expectation.create;
+        expectation.method = methodName;
+
+        return expectation;
+    },
+
+    invoke: function invoke(func, thisValue, args) {
+        this.verifyCallAllowed(thisValue, args);
+
+        return proxyInvoke.apply(this, arguments);
+    },
+
+    atLeast: function atLeast(num) {
+        if (typeof num !== "number") {
+            throw new TypeError("'" + valueToString(num) + "' is not number");
+        }
+
+        if (!this.limitsSet) {
+            this.maxCalls = null;
+            this.limitsSet = true;
+        }
+
+        this.minCalls = num;
+
+        return this;
+    },
+
+    atMost: function atMost(num) {
+        if (typeof num !== "number") {
+            throw new TypeError("'" + valueToString(num) + "' is not number");
+        }
+
+        if (!this.limitsSet) {
+            this.minCalls = null;
+            this.limitsSet = true;
+        }
+
+        this.maxCalls = num;
+
+        return this;
+    },
+
+    never: function never() {
+        return this.exactly(0);
+    },
+
+    once: function once() {
+        return this.exactly(1);
+    },
+
+    twice: function twice() {
+        return this.exactly(2);
+    },
+
+    thrice: function thrice() {
+        return this.exactly(3);
+    },
+
+    exactly: function exactly(num) {
+        if (typeof num !== "number") {
+            throw new TypeError("'" + valueToString(num) + "' is not a number");
+        }
+
+        this.atLeast(num);
+        return this.atMost(num);
+    },
+
+    met: function met() {
+        return !this.failed && receivedMinCalls(this);
+    },
+
+    verifyCallAllowed: function verifyCallAllowed(thisValue, args) {
+        var expectedArguments = this.expectedArguments;
+
+        if (receivedMaxCalls(this)) {
+            this.failed = true;
+            mockExpectation.fail(this.method + " already called " + timesInWords(this.maxCalls));
+        }
+
+        if ("expectedThis" in this && this.expectedThis !== thisValue) {
+            mockExpectation.fail(
+                this.method +
+                    " called with " +
+                    valueToString(thisValue) +
+                    " as thisValue, expected " +
+                    valueToString(this.expectedThis)
+            );
+        }
+
+        if (!("expectedArguments" in this)) {
+            return;
+        }
+
+        if (!args) {
+            mockExpectation.fail(this.method + " received no arguments, expected " + format(expectedArguments));
+        }
+
+        if (args.length < expectedArguments.length) {
+            mockExpectation.fail(
+                this.method +
+                    " received too few arguments (" +
+                    format(args) +
+                    "), expected " +
+                    format(expectedArguments)
+            );
+        }
+
+        if (this.expectsExactArgCount && args.length !== expectedArguments.length) {
+            mockExpectation.fail(
+                this.method +
+                    " received too many arguments (" +
+                    format(args) +
+                    "), expected " +
+                    format(expectedArguments)
+            );
+        }
+
+        forEach(
+            expectedArguments,
+            function(expectedArgument, i) {
+                if (!verifyMatcher(expectedArgument, args[i])) {
+                    mockExpectation.fail(
+                        this.method +
+                            " received wrong arguments " +
+                            format(args) +
+                            ", didn't match " +
+                            String(expectedArguments)
+                    );
+                }
+
+                if (!deepEqual(args[i], expectedArgument)) {
+                    mockExpectation.fail(
+                        this.method +
+                            " received wrong arguments " +
+                            format(args) +
+                            ", expected " +
+                            format(expectedArguments)
+                    );
+                }
+            },
+            this
+        );
+    },
+
+    allowsCall: function allowsCall(thisValue, args) {
+        var expectedArguments = this.expectedArguments;
+
+        if (this.met() && receivedMaxCalls(this)) {
+            return false;
+        }
+
+        if ("expectedThis" in this && this.expectedThis !== thisValue) {
+            return false;
+        }
+
+        if (!("expectedArguments" in this)) {
+            return true;
+        }
+
+        // eslint-disable-next-line no-underscore-dangle
+        var _args = args || [];
+
+        if (_args.length < expectedArguments.length) {
+            return false;
+        }
+
+        if (this.expectsExactArgCount && _args.length !== expectedArguments.length) {
+            return false;
+        }
+
+        return every(expectedArguments, function(expectedArgument, i) {
+            if (!verifyMatcher(expectedArgument, _args[i])) {
+                return false;
+            }
+
+            if (!deepEqual(_args[i], expectedArgument)) {
+                return false;
+            }
+
+            return true;
+        });
+    },
+
+    withArgs: function withArgs() {
+        this.expectedArguments = slice(arguments);
+        return this;
+    },
+
+    withExactArgs: function withExactArgs() {
+        this.withArgs.apply(this, arguments);
+        this.expectsExactArgCount = true;
+        return this;
+    },
+
+    on: function on(thisValue) {
+        this.expectedThis = thisValue;
+        return this;
+    },
+
+    toString: function() {
+        var args = slice(this.expectedArguments || []);
+
+        if (!this.expectsExactArgCount) {
+            push(args, "[...]");
+        }
+
+        var callStr = proxyCallToString.call({
+            proxy: this.method || "anonymous mock expectation",
+            args: args
+        });
+
+        var message = callStr.replace(", [...", "[, ...") + " " + expectedCallCountInWords(this);
+
+        if (this.met()) {
+            return "Expectation met: " + message;
+        }
+
+        return "Expected " + message + " (" + callCountInWords(this.callCount) + ")";
+    },
+
+    verify: function verify() {
+        if (!this.met()) {
+            mockExpectation.fail(String(this));
+        } else {
+            mockExpectation.pass(String(this));
+        }
+
+        return true;
+    },
+
+    pass: function pass(message) {
+        assert.pass(message);
+    },
+
+    fail: function fail(message) {
+        var exception = new Error(message);
+        exception.name = "ExpectationError";
+
+        throw exception;
+    }
+};
+
+module.exports = mockExpectation;
+
+},{"./assert":2,"./proxy-call":12,"./proxy-invoke":13,"./stub":19,"./util/core/extend":23,"./util/core/format":24,"./util/core/times-in-words":32,"@sinonjs/commons":44,"@sinonjs/samsam":109}],10:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var mockExpectation = require("./mock-expectation");
+var proxyCallToString = require("./proxy-call").toString;
+var extend = require("./util/core/extend");
+var deepEqual = require("@sinonjs/samsam").deepEqual;
+var wrapMethod = require("./util/core/wrap-method");
+var usePromiseLibrary = require("./util/core/use-promise-library");
+
+var concat = arrayProto.concat;
+var filter = arrayProto.filter;
+var forEach = arrayProto.forEach;
+var every = arrayProto.every;
+var join = arrayProto.join;
+var push = arrayProto.push;
+var slice = arrayProto.slice;
+var unshift = arrayProto.unshift;
+
+function mock(object) {
+    if (!object || typeof object === "string") {
+        return mockExpectation.create(object ? object : "Anonymous mock");
+    }
+
+    return mock.create(object);
+}
+
+function each(collection, callback) {
+    var col = collection || [];
+
+    forEach(col, callback);
+}
+
+function arrayEquals(arr1, arr2, compareLength) {
+    if (compareLength && arr1.length !== arr2.length) {
+        return false;
+    }
+
+    return every(arr1, function(element, i) {
+        return deepEqual(arr2[i], element);
+    });
+}
+
+extend(mock, {
+    create: function create(object) {
+        if (!object) {
+            throw new TypeError("object is null");
+        }
+
+        var mockObject = extend.nonEnum({}, mock, { object: object });
+        delete mockObject.create;
+
+        return mockObject;
+    },
+
+    expects: function expects(method) {
+        if (!method) {
+            throw new TypeError("method is falsy");
+        }
+
+        if (!this.expectations) {
+            this.expectations = {};
+            this.proxies = [];
+            this.failures = [];
+        }
+
+        if (!this.expectations[method]) {
+            this.expectations[method] = [];
+            var mockObject = this;
+
+            wrapMethod(this.object, method, function() {
+                return mockObject.invokeMethod(method, this, arguments);
+            });
+
+            push(this.proxies, method);
+        }
+
+        var expectation = mockExpectation.create(method);
+        expectation.wrappedMethod = this.object[method].wrappedMethod;
+        push(this.expectations[method], expectation);
+        usePromiseLibrary(this.promiseLibrary, expectation);
+
+        return expectation;
+    },
+
+    restore: function restore() {
+        var object = this.object;
+
+        each(this.proxies, function(proxy) {
+            if (typeof object[proxy].restore === "function") {
+                object[proxy].restore();
+            }
+        });
+    },
+
+    verify: function verify() {
+        var expectations = this.expectations || {};
+        var messages = this.failures ? slice(this.failures) : [];
+        var met = [];
+
+        each(this.proxies, function(proxy) {
+            each(expectations[proxy], function(expectation) {
+                if (!expectation.met()) {
+                    push(messages, String(expectation));
+                } else {
+                    push(met, String(expectation));
+                }
+            });
+        });
+
+        this.restore();
+
+        if (messages.length > 0) {
+            mockExpectation.fail(join(concat(messages, met), "\n"));
+        } else if (met.length > 0) {
+            mockExpectation.pass(join(concat(messages, met), "\n"));
+        }
+
+        return true;
+    },
+
+    usingPromise: function usingPromise(promiseLibrary) {
+        this.promiseLibrary = promiseLibrary;
+
+        return this;
+    },
+
+    invokeMethod: function invokeMethod(method, thisValue, args) {
+        /* if we cannot find any matching files we will explicitly call mockExpection#fail with error messages */
+        /* eslint consistent-return: "off" */
+        var expectations = this.expectations && this.expectations[method] ? this.expectations[method] : [];
+        var currentArgs = args || [];
+        var available;
+
+        var expectationsWithMatchingArgs = filter(expectations, function(expectation) {
+            var expectedArgs = expectation.expectedArguments || [];
+
+            return arrayEquals(expectedArgs, currentArgs, expectation.expectsExactArgCount);
+        });
+
+        var expectationsToApply = filter(expectationsWithMatchingArgs, function(expectation) {
+            return !expectation.met() && expectation.allowsCall(thisValue, args);
+        });
+
+        if (expectationsToApply.length > 0) {
+            return expectationsToApply[0].apply(thisValue, args);
+        }
+
+        var messages = [];
+        var exhausted = 0;
+
+        forEach(expectationsWithMatchingArgs, function(expectation) {
+            if (expectation.allowsCall(thisValue, args)) {
+                available = available || expectation;
+            } else {
+                exhausted += 1;
+            }
+        });
+
+        if (available && exhausted === 0) {
+            return available.apply(thisValue, args);
+        }
+
+        forEach(expectations, function(expectation) {
+            push(messages, "    " + String(expectation));
+        });
+
+        unshift(
+            messages,
+            "Unexpected call: " +
+                proxyCallToString.call({
+                    proxy: method,
+                    args: args
+                })
+        );
+
+        var err = new Error();
+        if (!err.stack) {
+            // PhantomJS does not serialize the stack trace until the error has been thrown
+            try {
+                throw err;
+            } catch (e) {
+                /* empty */
+            }
+        }
+        push(
+            this.failures,
+            "Unexpected call: " +
+                proxyCallToString.call({
+                    proxy: method,
+                    args: args,
+                    stack: err.stack
+                })
+        );
+
+        mockExpectation.fail(join(messages, "\n"));
+    }
+});
+
+module.exports = mock;
+
+},{"./mock-expectation":9,"./proxy-call":12,"./util/core/extend":23,"./util/core/use-promise-library":33,"./util/core/wrap-method":36,"@sinonjs/commons":44,"@sinonjs/samsam":109}],11:[function(require,module,exports){
+"use strict";
+
+var push = require("@sinonjs/commons").prototypes.array.push;
+
+exports.incrementCallCount = function incrementCallCount(proxy) {
+    proxy.called = true;
+    proxy.callCount += 1;
+    proxy.notCalled = false;
+    proxy.calledOnce = proxy.callCount === 1;
+    proxy.calledTwice = proxy.callCount === 2;
+    proxy.calledThrice = proxy.callCount === 3;
+};
+
+exports.createCallProperties = function createCallProperties(proxy) {
+    proxy.firstCall = proxy.getCall(0);
+    proxy.secondCall = proxy.getCall(1);
+    proxy.thirdCall = proxy.getCall(2);
+    proxy.lastCall = proxy.getCall(proxy.callCount - 1);
+};
+
+exports.delegateToCalls = function delegateToCalls(
+    proxy,
+    method,
+    matchAny,
+    actual,
+    returnsValues,
+    notCalled,
+    totalCallCount
+) {
+    proxy[method] = function() {
+        if (!this.called) {
+            if (notCalled) {
+                return notCalled.apply(this, arguments);
+            }
+            return false;
+        }
+
+        if (totalCallCount !== undefined && this.callCount !== totalCallCount) {
+            return false;
+        }
+
+        var currentCall;
+        var matches = 0;
+        var returnValues = [];
+
+        for (var i = 0, l = this.callCount; i < l; i += 1) {
+            currentCall = this.getCall(i);
+            var returnValue = currentCall[actual || method].apply(currentCall, arguments);
+            push(returnValues, returnValue);
+            if (returnValue) {
+                matches += 1;
+
+                if (matchAny) {
+                    return true;
+                }
+            }
+        }
+
+        if (returnsValues) {
+            return returnValues;
+        }
+        return matches === this.callCount;
+    };
+};
+
+},{"@sinonjs/commons":44}],12:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var match = require("@sinonjs/samsam").createMatcher;
+var deepEqual = require("@sinonjs/samsam").deepEqual;
+var functionName = require("@sinonjs/commons").functionName;
+var sinonFormat = require("./util/core/format");
+var valueToString = require("@sinonjs/commons").valueToString;
+
+var concat = arrayProto.concat;
+var filter = arrayProto.filter;
+var join = arrayProto.join;
+var map = arrayProto.map;
+var reduce = arrayProto.reduce;
+var slice = arrayProto.slice;
+
+function throwYieldError(proxy, text, args) {
+    var msg = functionName(proxy) + text;
+    if (args.length) {
+        msg += " Received [" + join(slice(args), ", ") + "]";
+    }
+    throw new Error(msg);
+}
+
+var callProto = {
+    calledOn: function calledOn(thisValue) {
+        if (match.isMatcher(thisValue)) {
+            return thisValue.test(this.thisValue);
+        }
+        return this.thisValue === thisValue;
+    },
+
+    calledWith: function calledWith() {
+        var self = this;
+        var calledWithArgs = slice(arguments);
+
+        if (calledWithArgs.length > self.args.length) {
+            return false;
+        }
+
+        return reduce(
+            calledWithArgs,
+            function(prev, arg, i) {
+                return prev && deepEqual(self.args[i], arg);
+            },
+            true
+        );
+    },
+
+    calledWithMatch: function calledWithMatch() {
+        var self = this;
+        var calledWithMatchArgs = slice(arguments);
+
+        if (calledWithMatchArgs.length > self.args.length) {
+            return false;
+        }
+
+        return reduce(
+            calledWithMatchArgs,
+            function(prev, expectation, i) {
+                var actual = self.args[i];
+
+                return prev && match(expectation).test(actual);
+            },
+            true
+        );
+    },
+
+    calledWithExactly: function calledWithExactly() {
+        return arguments.length === this.args.length && this.calledWith.apply(this, arguments);
+    },
+
+    notCalledWith: function notCalledWith() {
+        return !this.calledWith.apply(this, arguments);
+    },
+
+    notCalledWithMatch: function notCalledWithMatch() {
+        return !this.calledWithMatch.apply(this, arguments);
+    },
+
+    returned: function returned(value) {
+        return deepEqual(this.returnValue, value);
+    },
+
+    threw: function threw(error) {
+        if (typeof error === "undefined" || !this.exception) {
+            return Boolean(this.exception);
+        }
+
+        return this.exception === error || this.exception.name === error;
+    },
+
+    calledWithNew: function calledWithNew() {
+        return this.proxy.prototype && this.thisValue instanceof this.proxy;
+    },
+
+    calledBefore: function(other) {
+        return this.callId < other.callId;
+    },
+
+    calledAfter: function(other) {
+        return this.callId > other.callId;
+    },
+
+    calledImmediatelyBefore: function(other) {
+        return this.callId === other.callId - 1;
+    },
+
+    calledImmediatelyAfter: function(other) {
+        return this.callId === other.callId + 1;
+    },
+
+    callArg: function(pos) {
+        this.ensureArgIsAFunction(pos);
+        return this.args[pos]();
+    },
+
+    callArgOn: function(pos, thisValue) {
+        this.ensureArgIsAFunction(pos);
+        return this.args[pos].apply(thisValue);
+    },
+
+    callArgWith: function(pos) {
+        return this.callArgOnWith.apply(this, concat([pos, null], slice(arguments, 1)));
+    },
+
+    callArgOnWith: function(pos, thisValue) {
+        this.ensureArgIsAFunction(pos);
+        var args = slice(arguments, 2);
+        return this.args[pos].apply(thisValue, args);
+    },
+
+    throwArg: function(pos) {
+        if (pos > this.args.length) {
+            throw new TypeError("Not enough arguments: " + pos + " required but only " + this.args.length + " present");
+        }
+
+        throw this.args[pos];
+    },
+
+    yield: function() {
+        return this.yieldOn.apply(this, concat([null], slice(arguments, 0)));
+    },
+
+    yieldOn: function(thisValue) {
+        var args = slice(this.args);
+        var yieldFn = filter(args, function(arg) {
+            return typeof arg === "function";
+        })[0];
+
+        if (!yieldFn) {
+            throwYieldError(this.proxy, " cannot yield since no callback was passed.", args);
+        }
+
+        return yieldFn.apply(thisValue, slice(arguments, 1));
+    },
+
+    yieldTo: function(prop) {
+        return this.yieldToOn.apply(this, concat([prop, null], slice(arguments, 1)));
+    },
+
+    yieldToOn: function(prop, thisValue) {
+        var args = slice(this.args);
+        var yieldArg = filter(args, function(arg) {
+            return arg && typeof arg[prop] === "function";
+        })[0];
+        var yieldFn = yieldArg && yieldArg[prop];
+
+        if (!yieldFn) {
+            throwYieldError(
+                this.proxy,
+                " cannot yield to '" + valueToString(prop) + "' since no callback was passed.",
+                args
+            );
+        }
+
+        return yieldFn.apply(thisValue, slice(arguments, 2));
+    },
+
+    toString: function() {
+        var callStr = this.proxy ? String(this.proxy) + "(" : "";
+        var formattedArgs;
+
+        if (!this.args) {
+            return ":(";
+        }
+
+        formattedArgs = map(this.args, function(arg) {
+            return sinonFormat(arg);
+        });
+
+        callStr = callStr + join(formattedArgs, ", ") + ")";
+
+        if (typeof this.returnValue !== "undefined") {
+            callStr += " => " + sinonFormat(this.returnValue);
+        }
+
+        if (this.exception) {
+            callStr += " !" + this.exception.name;
+
+            if (this.exception.message) {
+                callStr += "(" + this.exception.message + ")";
+            }
+        }
+        if (this.stack) {
+            // Omit the error message and the two top stack frames in sinon itself:
+            callStr += (this.stack.split("\n")[3] || "unknown").replace(/^\s*(?:at\s+|@)?/, " at ");
+        }
+
+        return callStr;
+    },
+
+    ensureArgIsAFunction: function(pos) {
+        if (typeof this.args[pos] !== "function") {
+            throw new TypeError(
+                "Expected argument at position " + pos + " to be a Function, but was " + typeof this.args[pos]
+            );
+        }
+    }
+};
+Object.defineProperty(callProto, "stack", {
+    enumerable: true,
+    configurable: true,
+    get: function() {
+        return (this.errorWithCallStack && this.errorWithCallStack.stack) || "";
+    }
+});
+
+callProto.invokeCallback = callProto.yield;
+
+function createProxyCall(proxy, thisValue, args, returnValue, exception, id, errorWithCallStack) {
+    if (typeof id !== "number") {
+        throw new TypeError("Call id is not a number");
+    }
+
+    var firstArg, lastArg;
+
+    if (args.length > 0) {
+        firstArg = args[0];
+        lastArg = args[args.length - 1];
+    }
+
+    var proxyCall = Object.create(callProto);
+    var callback = lastArg && typeof lastArg === "function" ? lastArg : undefined;
+
+    proxyCall.proxy = proxy;
+    proxyCall.thisValue = thisValue;
+    proxyCall.args = args;
+    proxyCall.firstArg = firstArg;
+    proxyCall.lastArg = lastArg;
+    proxyCall.callback = callback;
+    proxyCall.returnValue = returnValue;
+    proxyCall.exception = exception;
+    proxyCall.callId = id;
+    proxyCall.errorWithCallStack = errorWithCallStack;
+
+    return proxyCall;
+}
+createProxyCall.toString = callProto.toString; // used by mocks
+
+module.exports = createProxyCall;
+
+},{"./util/core/format":24,"@sinonjs/commons":44,"@sinonjs/samsam":109}],13:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var proxyCallUtil = require("./proxy-call-util");
+
+var push = arrayProto.push;
+var forEach = arrayProto.forEach;
+var concat = arrayProto.concat;
+var ErrorConstructor = Error.prototype.constructor;
+var bind = Function.prototype.bind;
+
+var callId = 0;
+
+module.exports = function invoke(func, thisValue, args) {
+    var matchings = this.matchingFakes(args);
+    var currentCallId = callId++;
+    var exception, returnValue;
+
+    proxyCallUtil.incrementCallCount(this);
+    push(this.thisValues, thisValue);
+    push(this.args, args);
+    push(this.callIds, currentCallId);
+    forEach(matchings, function(matching) {
+        proxyCallUtil.incrementCallCount(matching);
+        push(matching.thisValues, thisValue);
+        push(matching.args, args);
+        push(matching.callIds, currentCallId);
+    });
+
+    // Make call properties available from within the spied function:
+    proxyCallUtil.createCallProperties(this);
+    forEach(matchings, proxyCallUtil.createCallProperties);
+
+    try {
+        this.invoking = true;
+
+        var thisCall = this.getCall(this.callCount - 1);
+
+        if (thisCall.calledWithNew()) {
+            // Call through with `new`
+            returnValue = new (bind.apply(this.func || func, concat([thisValue], args)))();
+
+            if (typeof returnValue !== "object") {
+                returnValue = thisValue;
+            }
+        } else {
+            returnValue = (this.func || func).apply(thisValue, args);
+        }
+    } catch (e) {
+        exception = e;
+    } finally {
+        delete this.invoking;
+    }
+
+    push(this.exceptions, exception);
+    push(this.returnValues, returnValue);
+    forEach(matchings, function(matching) {
+        push(matching.exceptions, exception);
+        push(matching.returnValues, returnValue);
+    });
+
+    var err = new ErrorConstructor();
+    // 1. Please do not get stack at this point. It may be so very slow, and not actually used
+    // 2. PhantomJS does not serialize the stack trace until the error has been thrown:
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/Stack
+    try {
+        throw err;
+    } catch (e) {
+        /* empty */
+    }
+    push(this.errorsWithCallStack, err);
+    forEach(matchings, function(matching) {
+        push(matching.errorsWithCallStack, err);
+    });
+
+    // Make return value and exception available in the calls:
+    proxyCallUtil.createCallProperties(this);
+    forEach(matchings, proxyCallUtil.createCallProperties);
+
+    if (exception !== undefined) {
+        throw exception;
+    }
+
+    return returnValue;
+};
+
+},{"./proxy-call-util":11,"@sinonjs/commons":44}],14:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var extend = require("./util/core/extend");
+var functionToString = require("./util/core/function-to-string");
+var proxyCall = require("./proxy-call");
+var proxyCallUtil = require("./proxy-call-util");
+var proxyInvoke = require("./proxy-invoke");
+var sinonFormat = require("./util/core/format");
+
+var push = arrayProto.push;
+var forEach = arrayProto.forEach;
+var slice = arrayProto.slice;
+
+var emptyFakes = Object.freeze([]);
+
+// Public API
+var proxyApi = {
+    toString: functionToString,
+
+    named: function named(name) {
+        this.displayName = name;
+        var nameDescriptor = Object.getOwnPropertyDescriptor(this, "name");
+        if (nameDescriptor && nameDescriptor.configurable) {
+            // IE 11 functions don't have a name.
+            // Safari 9 has names that are not configurable.
+            nameDescriptor.value = name;
+            Object.defineProperty(this, "name", nameDescriptor);
+        }
+        return this;
+    },
+
+    invoke: proxyInvoke,
+
+    /*
+     * Hook for derived implementation to return fake instances matching the
+     * given arguments.
+     */
+    matchingFakes: function(/*args, strict*/) {
+        return emptyFakes;
+    },
+
+    getCall: function getCall(index) {
+        var i = index;
+        if (i < 0) {
+            // Negative indices means counting backwards from the last call
+            i += this.callCount;
+        }
+        if (i < 0 || i >= this.callCount) {
+            return null;
+        }
+
+        return proxyCall(
+            this,
+            this.thisValues[i],
+            this.args[i],
+            this.returnValues[i],
+            this.exceptions[i],
+            this.callIds[i],
+            this.errorsWithCallStack[i]
+        );
+    },
+
+    getCalls: function() {
+        var calls = [];
+        var i;
+
+        for (i = 0; i < this.callCount; i++) {
+            push(calls, this.getCall(i));
+        }
+
+        return calls;
+    },
+
+    calledBefore: function calledBefore(proxy) {
+        if (!this.called) {
+            return false;
+        }
+
+        if (!proxy.called) {
+            return true;
+        }
+
+        return this.callIds[0] < proxy.callIds[proxy.callIds.length - 1];
+    },
+
+    calledAfter: function calledAfter(proxy) {
+        if (!this.called || !proxy.called) {
+            return false;
+        }
+
+        return this.callIds[this.callCount - 1] > proxy.callIds[0];
+    },
+
+    calledImmediatelyBefore: function calledImmediatelyBefore(proxy) {
+        if (!this.called || !proxy.called) {
+            return false;
+        }
+
+        return this.callIds[this.callCount - 1] === proxy.callIds[proxy.callCount - 1] - 1;
+    },
+
+    calledImmediatelyAfter: function calledImmediatelyAfter(proxy) {
+        if (!this.called || !proxy.called) {
+            return false;
+        }
+
+        return this.callIds[this.callCount - 1] === proxy.callIds[proxy.callCount - 1] + 1;
+    },
+
+    formatters: require("./spy-formatters"),
+    printf: function(format) {
+        var spyInstance = this;
+        var args = slice(arguments, 1);
+        var formatter;
+
+        return (format || "").replace(/%(.)/g, function(match, specifyer) {
+            formatter = proxyApi.formatters[specifyer];
+
+            if (typeof formatter === "function") {
+                return String(formatter(spyInstance, args));
+            } else if (!isNaN(parseInt(specifyer, 10))) {
+                return sinonFormat(args[specifyer - 1]);
+            }
+
+            return "%" + specifyer;
+        });
+    },
+
+    resetHistory: function() {
+        if (this.invoking) {
+            var err = new Error(
+                "Cannot reset Sinon function while invoking it. " +
+                    "Move the call to .resetHistory outside of the callback."
+            );
+            err.name = "InvalidResetException";
+            throw err;
+        }
+
+        this.called = false;
+        this.notCalled = true;
+        this.calledOnce = false;
+        this.calledTwice = false;
+        this.calledThrice = false;
+        this.callCount = 0;
+        this.firstCall = null;
+        this.secondCall = null;
+        this.thirdCall = null;
+        this.lastCall = null;
+        this.args = [];
+        this.firstArg = null;
+        this.lastArg = null;
+        this.returnValues = [];
+        this.thisValues = [];
+        this.exceptions = [];
+        this.callIds = [];
+        this.errorsWithCallStack = [];
+
+        if (this.fakes) {
+            forEach(this.fakes, function(fake) {
+                fake.resetHistory();
+            });
+        }
+
+        return this;
+    }
+};
+
+var delegateToCalls = proxyCallUtil.delegateToCalls;
+delegateToCalls(proxyApi, "calledOn", true);
+delegateToCalls(proxyApi, "alwaysCalledOn", false, "calledOn");
+delegateToCalls(proxyApi, "calledWith", true);
+delegateToCalls(proxyApi, "calledOnceWith", true, "calledWith", false, undefined, 1);
+delegateToCalls(proxyApi, "calledWithMatch", true);
+delegateToCalls(proxyApi, "alwaysCalledWith", false, "calledWith");
+delegateToCalls(proxyApi, "alwaysCalledWithMatch", false, "calledWithMatch");
+delegateToCalls(proxyApi, "calledWithExactly", true);
+delegateToCalls(proxyApi, "calledOnceWithExactly", true, "calledWithExactly", false, undefined, 1);
+delegateToCalls(proxyApi, "alwaysCalledWithExactly", false, "calledWithExactly");
+delegateToCalls(proxyApi, "neverCalledWith", false, "notCalledWith", false, function() {
+    return true;
+});
+delegateToCalls(proxyApi, "neverCalledWithMatch", false, "notCalledWithMatch", false, function() {
+    return true;
+});
+delegateToCalls(proxyApi, "threw", true);
+delegateToCalls(proxyApi, "alwaysThrew", false, "threw");
+delegateToCalls(proxyApi, "returned", true);
+delegateToCalls(proxyApi, "alwaysReturned", false, "returned");
+delegateToCalls(proxyApi, "calledWithNew", true);
+delegateToCalls(proxyApi, "alwaysCalledWithNew", false, "calledWithNew");
+
+function createProxy(func, originalFunc) {
+    var proxy = wrapFunction(func, originalFunc);
+
+    // Inherit function properties:
+    extend(proxy, func);
+
+    proxy.prototype = func.prototype;
+
+    extend.nonEnum(proxy, proxyApi);
+
+    return proxy;
+}
+
+function wrapFunction(func, originalFunc) {
+    var arity = originalFunc.length;
+    var p;
+    // Do not change this to use an eval. Projects that depend on sinon block the use of eval.
+    // ref: https://github.com/sinonjs/sinon/issues/710
+    switch (arity) {
+        /*eslint-disable no-unused-vars, max-len*/
+        case 0:
+            p = function proxy() {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        case 1:
+            p = function proxy(a) {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        case 2:
+            p = function proxy(a, b) {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        case 3:
+            p = function proxy(a, b, c) {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        case 4:
+            p = function proxy(a, b, c, d) {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        case 5:
+            p = function proxy(a, b, c, d, e) {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        case 6:
+            p = function proxy(a, b, c, d, e, f) {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        case 7:
+            p = function proxy(a, b, c, d, e, f, g) {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        case 8:
+            p = function proxy(a, b, c, d, e, f, g, h) {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        case 9:
+            p = function proxy(a, b, c, d, e, f, g, h, i) {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        case 10:
+            p = function proxy(a, b, c, d, e, f, g, h, i, j) {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        case 11:
+            p = function proxy(a, b, c, d, e, f, g, h, i, j, k) {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        case 12:
+            p = function proxy(a, b, c, d, e, f, g, h, i, j, k, l) {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        default:
+            p = function proxy() {
+                return p.invoke(func, this, slice(arguments));
+            };
+            break;
+        /*eslint-enable*/
+    }
+    var nameDescriptor = Object.getOwnPropertyDescriptor(originalFunc, "name");
+    if (nameDescriptor && nameDescriptor.configurable) {
+        // IE 11 functions don't have a name.
+        // Safari 9 has names that are not configurable.
+        Object.defineProperty(p, "name", nameDescriptor);
+    }
+    extend.nonEnum(p, {
+        isSinonProxy: true,
+
+        called: false,
+        notCalled: true,
+        calledOnce: false,
+        calledTwice: false,
+        calledThrice: false,
+        callCount: 0,
+        firstCall: null,
+        firstArg: null,
+        secondCall: null,
+        thirdCall: null,
+        lastCall: null,
+        lastArg: null,
+        args: [],
+        returnValues: [],
+        thisValues: [],
+        exceptions: [],
+        callIds: [],
+        errorsWithCallStack: []
+    });
+    return p;
+}
+
+module.exports = createProxy;
+
+},{"./proxy-call":12,"./proxy-call-util":11,"./proxy-invoke":13,"./spy-formatters":17,"./util/core/extend":23,"./util/core/format":24,"./util/core/function-to-string":25,"@sinonjs/commons":44}],15:[function(require,module,exports){
+"use strict";
+
+var walkObject = require("./util/core/walk-object");
+
+function filter(object, property) {
+    return object[property].restore && object[property].restore.sinon;
+}
+
+function restore(object, property) {
+    object[property].restore();
+}
+
+function restoreObject(object) {
+    return walkObject(restore, object, filter);
+}
+
+module.exports = restoreObject;
+
+},{"./util/core/walk-object":34}],16:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var collectOwnMethods = require("./collect-own-methods");
+var getPropertyDescriptor = require("./util/core/get-property-descriptor");
+var isPropertyConfigurable = require("./util/core/is-property-configurable");
+var match = require("@sinonjs/samsam").createMatcher;
+var sinonAssert = require("./assert");
+var sinonClock = require("./util/fake-timers");
+var sinonMock = require("./mock");
+var sinonSpy = require("./spy");
+var sinonStub = require("./stub");
+var sinonFake = require("./fake");
+var valueToString = require("@sinonjs/commons").valueToString;
+var fakeServer = require("nise").fakeServer;
+var fakeXhr = require("nise").fakeXhr;
+var usePromiseLibrary = require("./util/core/use-promise-library");
+
+var filter = arrayProto.filter;
+var forEach = arrayProto.filter;
+var push = arrayProto.push;
+var reverse = arrayProto.reverse;
+
+function applyOnEach(fakes, method) {
+    var matchingFakes = filter(fakes, function(fake) {
+        return typeof fake[method] === "function";
+    });
+
+    forEach(matchingFakes, function(fake) {
+        fake[method]();
+    });
+}
+
+function Sandbox() {
+    var sandbox = this;
+    var collection = [];
+    var fakeRestorers = [];
+    var promiseLib;
+
+    sandbox.serverPrototype = fakeServer;
+
+    // this is for testing only
+    sandbox.getFakes = function getFakes() {
+        return collection;
+    };
+
+    // this is for testing only
+    sandbox.getRestorers = function() {
+        return fakeRestorers;
+    };
+
+    sandbox.createStubInstance = function createStubInstance() {
+        var stubbed = sinonStub.createStubInstance.apply(null, arguments);
+
+        var ownMethods = collectOwnMethods(stubbed);
+
+        forEach(ownMethods, function(method) {
+            push(collection, method);
+        });
+
+        usePromiseLibrary(promiseLib, ownMethods);
+
+        return stubbed;
+    };
+
+    sandbox.inject = function inject(obj) {
+        obj.spy = function() {
+            return sandbox.spy.apply(null, arguments);
+        };
+
+        obj.stub = function() {
+            return sandbox.stub.apply(null, arguments);
+        };
+
+        obj.mock = function() {
+            return sandbox.mock.apply(null, arguments);
+        };
+
+        obj.createStubInstance = function() {
+            return sandbox.createStubInstance.apply(sandbox, arguments);
+        };
+
+        obj.fake = function() {
+            return sandbox.fake.apply(null, arguments);
+        };
+
+        obj.replace = function() {
+            return sandbox.replace.apply(null, arguments);
+        };
+
+        obj.replaceSetter = function() {
+            return sandbox.replaceSetter.apply(null, arguments);
+        };
+
+        obj.replaceGetter = function() {
+            return sandbox.replaceGetter.apply(null, arguments);
+        };
+
+        if (sandbox.clock) {
+            obj.clock = sandbox.clock;
+        }
+
+        if (sandbox.server) {
+            obj.server = sandbox.server;
+            obj.requests = sandbox.server.requests;
+        }
+
+        obj.match = match;
+
+        return obj;
+    };
+
+    sandbox.mock = function mock() {
+        var m = sinonMock.apply(null, arguments);
+
+        push(collection, m);
+        usePromiseLibrary(promiseLib, m);
+
+        return m;
+    };
+
+    sandbox.reset = function reset() {
+        applyOnEach(collection, "reset");
+        applyOnEach(collection, "resetHistory");
+    };
+
+    sandbox.resetBehavior = function resetBehavior() {
+        applyOnEach(collection, "resetBehavior");
+    };
+
+    sandbox.resetHistory = function resetHistory() {
+        function privateResetHistory(f) {
+            var method = f.resetHistory || f.reset;
+            if (method) {
+                method.call(f);
+            }
+        }
+
+        forEach(collection, function(fake) {
+            if (typeof fake === "function") {
+                privateResetHistory(fake);
+                return;
+            }
+
+            var methods = [];
+            if (fake.get) {
+                push(methods, fake.get);
+            }
+
+            if (fake.set) {
+                push(methods, fake.set);
+            }
+
+            forEach(methods, privateResetHistory);
+        });
+    };
+
+    sandbox.restore = function restore() {
+        if (arguments.length) {
+            throw new Error("sandbox.restore() does not take any parameters. Perhaps you meant stub.restore()");
+        }
+
+        reverse(collection);
+        applyOnEach(collection, "restore");
+        collection = [];
+
+        forEach(fakeRestorers, function(restorer) {
+            restorer();
+        });
+        fakeRestorers = [];
+
+        sandbox.restoreContext();
+    };
+
+    sandbox.restoreContext = function restoreContext() {
+        var injectedKeys = sandbox.injectedKeys;
+        var injectInto = sandbox.injectInto;
+
+        if (!injectedKeys) {
+            return;
+        }
+
+        forEach(injectedKeys, function(injectedKey) {
+            delete injectInto[injectedKey];
+        });
+
+        injectedKeys = [];
+    };
+
+    function getFakeRestorer(object, property) {
+        var descriptor = getPropertyDescriptor(object, property);
+
+        function restorer() {
+            if (descriptor.isOwn) {
+                Object.defineProperty(object, property, descriptor);
+            } else {
+                delete object[property];
+            }
+        }
+        restorer.object = object;
+        restorer.property = property;
+        return restorer;
+    }
+
+    function verifyNotReplaced(object, property) {
+        forEach(fakeRestorers, function(fakeRestorer) {
+            if (fakeRestorer.object === object && fakeRestorer.property === property) {
+                throw new TypeError("Attempted to replace " + property + " which is already replaced");
+            }
+        });
+    }
+
+    sandbox.replace = function replace(object, property, replacement) {
+        var descriptor = getPropertyDescriptor(object, property);
+
+        if (typeof descriptor === "undefined") {
+            throw new TypeError("Cannot replace non-existent property " + valueToString(property));
+        }
+
+        if (typeof replacement === "undefined") {
+            throw new TypeError("Expected replacement argument to be defined");
+        }
+
+        if (typeof descriptor.get === "function") {
+            throw new Error("Use sandbox.replaceGetter for replacing getters");
+        }
+
+        if (typeof descriptor.set === "function") {
+            throw new Error("Use sandbox.replaceSetter for replacing setters");
+        }
+
+        if (typeof object[property] !== typeof replacement) {
+            throw new TypeError("Cannot replace " + typeof object[property] + " with " + typeof replacement);
+        }
+
+        verifyNotReplaced(object, property);
+
+        // store a function for restoring the replaced property
+        push(fakeRestorers, getFakeRestorer(object, property));
+
+        object[property] = replacement;
+
+        return replacement;
+    };
+
+    sandbox.replaceGetter = function replaceGetter(object, property, replacement) {
+        var descriptor = getPropertyDescriptor(object, property);
+
+        if (typeof descriptor === "undefined") {
+            throw new TypeError("Cannot replace non-existent property " + valueToString(property));
+        }
+
+        if (typeof replacement !== "function") {
+            throw new TypeError("Expected replacement argument to be a function");
+        }
+
+        if (typeof descriptor.get !== "function") {
+            throw new Error("`object.property` is not a getter");
+        }
+
+        verifyNotReplaced(object, property);
+
+        // store a function for restoring the replaced property
+        push(fakeRestorers, getFakeRestorer(object, property));
+
+        Object.defineProperty(object, property, {
+            get: replacement,
+            configurable: isPropertyConfigurable(object, property)
+        });
+
+        return replacement;
+    };
+
+    sandbox.replaceSetter = function replaceSetter(object, property, replacement) {
+        var descriptor = getPropertyDescriptor(object, property);
+
+        if (typeof descriptor === "undefined") {
+            throw new TypeError("Cannot replace non-existent property " + valueToString(property));
+        }
+
+        if (typeof replacement !== "function") {
+            throw new TypeError("Expected replacement argument to be a function");
+        }
+
+        if (typeof descriptor.set !== "function") {
+            throw new Error("`object.property` is not a setter");
+        }
+
+        verifyNotReplaced(object, property);
+
+        // store a function for restoring the replaced property
+        push(fakeRestorers, getFakeRestorer(object, property));
+
+        // eslint-disable-next-line accessor-pairs
+        Object.defineProperty(object, property, {
+            set: replacement,
+            configurable: isPropertyConfigurable(object, property)
+        });
+
+        return replacement;
+    };
+
+    function commonPostInitSetup(args, spy) {
+        var object = args[0];
+        var property = args[1];
+
+        var isSpyingOnEntireObject = typeof property === "undefined" && typeof object === "object";
+
+        if (isSpyingOnEntireObject) {
+            var ownMethods = collectOwnMethods(spy);
+
+            forEach(ownMethods, function(method) {
+                push(collection, method);
+            });
+
+            usePromiseLibrary(promiseLib, ownMethods);
+        } else {
+            push(collection, spy);
+            usePromiseLibrary(promiseLib, spy);
+        }
+
+        return spy;
+    }
+
+    sandbox.spy = function spy() {
+        var createdSpy = sinonSpy.apply(sinonSpy, arguments);
+        return commonPostInitSetup(arguments, createdSpy);
+    };
+
+    sandbox.stub = function stub() {
+        var createdStub = sinonStub.apply(sinonStub, arguments);
+        return commonPostInitSetup(arguments, createdStub);
+    };
+
+    // eslint-disable-next-line no-unused-vars
+    sandbox.fake = function fake(f) {
+        var s = sinonFake.apply(sinonFake, arguments);
+
+        push(collection, s);
+
+        return s;
+    };
+
+    forEach(Object.keys(sinonFake), function(key) {
+        var fakeBehavior = sinonFake[key];
+        if (typeof fakeBehavior === "function") {
+            sandbox.fake[key] = function() {
+                var s = fakeBehavior.apply(fakeBehavior, arguments);
+
+                push(collection, s);
+
+                return s;
+            };
+        }
+    });
+
+    sandbox.useFakeTimers = function useFakeTimers(args) {
+        var clock = sinonClock.useFakeTimers.call(null, args);
+
+        sandbox.clock = clock;
+        push(collection, clock);
+
+        return clock;
+    };
+
+    sandbox.verify = function verify() {
+        applyOnEach(collection, "verify");
+    };
+
+    sandbox.verifyAndRestore = function verifyAndRestore() {
+        var exception;
+
+        try {
+            sandbox.verify();
+        } catch (e) {
+            exception = e;
+        }
+
+        sandbox.restore();
+
+        if (exception) {
+            throw exception;
+        }
+    };
+
+    sandbox.useFakeServer = function useFakeServer() {
+        var proto = sandbox.serverPrototype || fakeServer;
+
+        if (!proto || !proto.create) {
+            return null;
+        }
+
+        sandbox.server = proto.create();
+        push(collection, sandbox.server);
+
+        return sandbox.server;
+    };
+
+    sandbox.useFakeXMLHttpRequest = function useFakeXMLHttpRequest() {
+        var xhr = fakeXhr.useFakeXMLHttpRequest();
+        push(collection, xhr);
+        return xhr;
+    };
+
+    sandbox.usingPromise = function usingPromise(promiseLibrary) {
+        promiseLib = promiseLibrary;
+        collection.promiseLibrary = promiseLibrary;
+
+        return sandbox;
+    };
+}
+
+Sandbox.prototype.assert = sinonAssert;
+Sandbox.prototype.match = match;
+
+module.exports = Sandbox;
+
+},{"./assert":2,"./collect-own-methods":4,"./fake":8,"./mock":10,"./spy":18,"./stub":19,"./util/core/get-property-descriptor":27,"./util/core/is-property-configurable":30,"./util/core/use-promise-library":33,"./util/fake-timers":37,"@sinonjs/commons":44,"@sinonjs/samsam":109,"nise":128}],17:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var color = require("./color");
+var match = require("@sinonjs/samsam").createMatcher;
+var timesInWords = require("./util/core/times-in-words");
+var sinonFormat = require("./util/core/format");
+var jsDiff = require("diff");
+
+var join = arrayProto.join;
+var map = arrayProto.map;
+var push = arrayProto.push;
+
+function colorSinonMatchText(matcher, calledArg, calledArgMessage) {
+    var calledArgumentMessage = calledArgMessage;
+    if (!matcher.test(calledArg)) {
+        matcher.message = color.red(matcher.message);
+        if (calledArgumentMessage) {
+            calledArgumentMessage = color.green(calledArgumentMessage);
+        }
+    }
+    return calledArgumentMessage + " " + matcher.message;
+}
+
+function colorDiffText(diff) {
+    var objects = map(diff, function(part) {
+        var text = part.value;
+        if (part.added) {
+            text = color.green(text);
+        } else if (part.removed) {
+            text = color.red(text);
+        }
+        if (diff.length === 2) {
+            text += " "; // format simple diffs
+        }
+        return text;
+    });
+    return join(objects, "");
+}
+
+module.exports = {
+    c: function(spyInstance) {
+        return timesInWords(spyInstance.callCount);
+    },
+
+    n: function(spyInstance) {
+        // eslint-disable-next-line local-rules/no-prototype-methods
+        return spyInstance.toString();
+    },
+
+    D: function(spyInstance, args) {
+        var message = "";
+
+        for (var i = 0, l = spyInstance.callCount; i < l; ++i) {
+            // describe multiple calls
+            if (l > 1) {
+                message += "\nCall " + (i + 1) + ":";
+            }
+            var calledArgs = spyInstance.getCall(i).args;
+            for (var j = 0; j < calledArgs.length || j < args.length; ++j) {
+                message += "\n";
+                var calledArgMessage = j < calledArgs.length ? sinonFormat(calledArgs[j]) : "";
+                if (match.isMatcher(args[j])) {
+                    message += colorSinonMatchText(args[j], calledArgs[j], calledArgMessage);
+                } else {
+                    var expectedArgMessage = j < args.length ? sinonFormat(args[j]) : "";
+                    var diff = jsDiff.diffJson(calledArgMessage, expectedArgMessage);
+                    message += colorDiffText(diff);
+                }
+            }
+        }
+
+        return message;
+    },
+
+    C: function(spyInstance) {
+        var calls = [];
+
+        for (var i = 0, l = spyInstance.callCount; i < l; ++i) {
+            // eslint-disable-next-line local-rules/no-prototype-methods
+            var stringifiedCall = "    " + spyInstance.getCall(i).toString();
+            if (/\n/.test(calls[i - 1])) {
+                stringifiedCall = "\n" + stringifiedCall;
+            }
+            push(calls, stringifiedCall);
+        }
+
+        return calls.length > 0 ? "\n" + join(calls, "\n") : "";
+    },
+
+    t: function(spyInstance) {
+        var objects = [];
+
+        for (var i = 0, l = spyInstance.callCount; i < l; ++i) {
+            push(objects, sinonFormat(spyInstance.thisValues[i]));
+        }
+
+        return join(objects, ", ");
+    },
+
+    "*": function(spyInstance, args) {
+        return join(
+            map(args, function(arg) {
+                return sinonFormat(arg);
+            }),
+            ", "
+        );
+    }
+};
+
+},{"./color":5,"./util/core/format":24,"./util/core/times-in-words":32,"@sinonjs/commons":44,"@sinonjs/samsam":109,"diff":113}],18:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var createProxy = require("./proxy");
+var extend = require("./util/core/extend");
+var functionName = require("@sinonjs/commons").functionName;
+var getPropertyDescriptor = require("./util/core/get-property-descriptor");
+var deepEqual = require("@sinonjs/samsam").deepEqual;
+var isEsModule = require("./util/core/is-es-module");
+var proxyCallUtil = require("./proxy-call-util");
+var walkObject = require("./util/core/walk-object");
+var wrapMethod = require("./util/core/wrap-method");
+var valueToString = require("@sinonjs/commons").valueToString;
+
+/* cache references to library methods so that they also can be stubbed without problems */
+var forEach = arrayProto.forEach;
+var pop = arrayProto.pop;
+var push = arrayProto.push;
+var slice = arrayProto.slice;
+var filter = Array.prototype.filter;
+
+var uuid = 0;
+
+function matches(fake, args, strict) {
+    var margs = fake.matchingArguments;
+    if (margs.length <= args.length && deepEqual(slice(args, 0, margs.length), margs)) {
+        return !strict || margs.length === args.length;
+    }
+    return false;
+}
+
+// Public API
+var spyApi = {
+    withArgs: function() {
+        var args = slice(arguments);
+        var matching = pop(this.matchingFakes(args, true));
+        if (matching) {
+            return matching;
+        }
+
+        var original = this;
+        var fake = this.instantiateFake();
+        fake.matchingArguments = args;
+        fake.parent = this;
+        push(this.fakes, fake);
+
+        fake.withArgs = function() {
+            return original.withArgs.apply(original, arguments);
+        };
+
+        forEach(original.args, function(arg, i) {
+            if (!matches(fake, arg)) {
+                return;
+            }
+
+            proxyCallUtil.incrementCallCount(fake);
+            push(fake.thisValues, original.thisValues[i]);
+            push(fake.args, arg);
+            push(fake.returnValues, original.returnValues[i]);
+            push(fake.exceptions, original.exceptions[i]);
+            push(fake.callIds, original.callIds[i]);
+        });
+
+        proxyCallUtil.createCallProperties(fake);
+
+        return fake;
+    },
+
+    // Override proxy default implementation
+    matchingFakes: function(args, strict) {
+        return filter.call(this.fakes, function(fake) {
+            return matches(fake, args, strict);
+        });
+    }
+};
+
+/* eslint-disable local-rules/no-prototype-methods */
+var delegateToCalls = proxyCallUtil.delegateToCalls;
+delegateToCalls(spyApi, "callArg", false, "callArgWith", true, function() {
+    throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
+});
+spyApi.callArgWith = spyApi.callArg;
+delegateToCalls(spyApi, "callArgOn", false, "callArgOnWith", true, function() {
+    throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
+});
+spyApi.callArgOnWith = spyApi.callArgOn;
+delegateToCalls(spyApi, "throwArg", false, "throwArg", false, function() {
+    throw new Error(this.toString() + " cannot throw arg since it was not yet invoked.");
+});
+delegateToCalls(spyApi, "yield", false, "yield", true, function() {
+    throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
+});
+// "invokeCallback" is an alias for "yield" since "yield" is invalid in strict mode.
+spyApi.invokeCallback = spyApi.yield;
+delegateToCalls(spyApi, "yieldOn", false, "yieldOn", true, function() {
+    throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
+});
+delegateToCalls(spyApi, "yieldTo", false, "yieldTo", true, function(property) {
+    throw new Error(
+        this.toString() + " cannot yield to '" + valueToString(property) + "' since it was not yet invoked."
+    );
+});
+delegateToCalls(spyApi, "yieldToOn", false, "yieldToOn", true, function(property) {
+    throw new Error(
+        this.toString() + " cannot yield to '" + valueToString(property) + "' since it was not yet invoked."
+    );
+});
+/* eslint-enable local-rules/no-prototype-methods */
+
+function createSpy(func) {
+    var name;
+    var funk = func;
+
+    if (typeof funk !== "function") {
+        funk = function() {
+            return;
+        };
+    } else {
+        name = functionName(funk);
+    }
+
+    var proxy = createProxy(funk, funk);
+
+    // Inherit spy API:
+    extend.nonEnum(proxy, spyApi);
+    extend.nonEnum(proxy, {
+        displayName: name || "spy",
+        fakes: [],
+        instantiateFake: createSpy,
+        id: "spy#" + uuid++
+    });
+    return proxy;
+}
+
+function spy(object, property, types) {
+    var descriptor, methodDesc;
+
+    if (isEsModule(object)) {
+        throw new TypeError("ES Modules cannot be spied");
+    }
+
+    if (!property && typeof object === "function") {
+        return createSpy(object);
+    }
+
+    if (!property && typeof object === "object") {
+        return walkObject(spy, object);
+    }
+
+    if (!object && !property) {
+        return createSpy(function() {
+            return;
+        });
+    }
+
+    if (!types) {
+        return wrapMethod(object, property, createSpy(object[property]));
+    }
+
+    descriptor = {};
+    methodDesc = getPropertyDescriptor(object, property);
+
+    forEach(types, function(type) {
+        descriptor[type] = createSpy(methodDesc[type]);
+    });
+
+    return wrapMethod(object, property, descriptor);
+}
+
+extend(spy, spyApi);
+module.exports = spy;
+
+},{"./proxy":14,"./proxy-call-util":11,"./util/core/extend":23,"./util/core/get-property-descriptor":27,"./util/core/is-es-module":28,"./util/core/walk-object":34,"./util/core/wrap-method":36,"@sinonjs/commons":44,"@sinonjs/samsam":109}],19:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var behavior = require("./behavior");
+var behaviors = require("./default-behaviors");
+var createProxy = require("./proxy");
+var functionName = require("@sinonjs/commons").functionName;
+var hasOwnProperty = require("@sinonjs/commons").prototypes.object.hasOwnProperty;
+var isNonExistentProperty = require("./util/core/is-non-existent-property");
+var spy = require("./spy");
+var extend = require("./util/core/extend");
+var getPropertyDescriptor = require("./util/core/get-property-descriptor");
+var isEsModule = require("./util/core/is-es-module");
+var wrapMethod = require("./util/core/wrap-method");
+var throwOnFalsyObject = require("./throw-on-falsy-object");
+var valueToString = require("@sinonjs/commons").valueToString;
+var walkObject = require("./util/core/walk-object");
+
+var forEach = arrayProto.forEach;
+var pop = arrayProto.pop;
+var slice = arrayProto.slice;
+var sort = arrayProto.sort;
+
+var uuid = 0;
+
+function createStub(originalFunc) {
+    var proxy;
+
+    function functionStub() {
+        var args = slice(arguments);
+        var matchings = proxy.matchingFakes(args);
+
+        var fnStub =
+            pop(
+                sort(matchings, function(a, b) {
+                    return a.matchingArguments.length - b.matchingArguments.length;
+                })
+            ) || proxy;
+        return getCurrentBehavior(fnStub).invoke(this, arguments);
+    }
+
+    proxy = createProxy(functionStub, originalFunc || functionStub);
+    // Inherit spy API:
+    extend.nonEnum(proxy, spy);
+    // Inherit stub API:
+    extend.nonEnum(proxy, stub);
+
+    var name = originalFunc ? functionName(originalFunc) : null;
+    extend.nonEnum(proxy, {
+        fakes: [],
+        instantiateFake: createStub,
+        displayName: name || "stub",
+        defaultBehavior: null,
+        behaviors: [],
+        id: "stub#" + uuid++
+    });
+
+    return proxy;
+}
+
+function stub(object, property) {
+    if (arguments.length > 2) {
+        throw new TypeError("stub(obj, 'meth', fn) has been removed, see documentation");
+    }
+
+    if (isEsModule(object)) {
+        throw new TypeError("ES Modules cannot be stubbed");
+    }
+
+    throwOnFalsyObject.apply(null, arguments);
+
+    if (isNonExistentProperty(object, property)) {
+        throw new TypeError("Cannot stub non-existent property " + valueToString(property));
+    }
+
+    var actualDescriptor = getPropertyDescriptor(object, property);
+    var isObjectOrFunction = typeof object === "object" || typeof object === "function";
+    var isStubbingEntireObject = typeof property === "undefined" && isObjectOrFunction;
+    var isCreatingNewStub = !object && typeof property === "undefined";
+    var isStubbingNonFuncProperty =
+        isObjectOrFunction &&
+        typeof property !== "undefined" &&
+        (typeof actualDescriptor === "undefined" || typeof actualDescriptor.value !== "function") &&
+        typeof descriptor === "undefined";
+
+    if (isStubbingEntireObject) {
+        return walkObject(stub, object);
+    }
+
+    if (isCreatingNewStub) {
+        return createStub();
+    }
+
+    var func = typeof actualDescriptor.value === "function" ? actualDescriptor.value : null;
+    var s = createStub(func);
+
+    extend.nonEnum(s, {
+        rootObj: object,
+        propName: property,
+        shadowsPropOnPrototype: !actualDescriptor.isOwn,
+        restore: function restore() {
+            if (actualDescriptor !== undefined && actualDescriptor.isOwn) {
+                Object.defineProperty(object, property, actualDescriptor);
+                return;
+            }
+
+            delete object[property];
+        }
+    });
+
+    return isStubbingNonFuncProperty ? s : wrapMethod(object, property, s);
+}
+
+stub.createStubInstance = function(constructor, overrides) {
+    if (typeof constructor !== "function") {
+        throw new TypeError("The constructor should be a function.");
+    }
+
+    var stubbedObject = stub(Object.create(constructor.prototype));
+
+    forEach(Object.keys(overrides || {}), function(propertyName) {
+        if (propertyName in stubbedObject) {
+            var value = overrides[propertyName];
+            if (value && value.createStubInstance) {
+                stubbedObject[propertyName] = value;
+            } else {
+                stubbedObject[propertyName].returns(value);
+            }
+        } else {
+            throw new Error("Cannot stub " + propertyName + ". Property does not exist!");
+        }
+    });
+    return stubbedObject;
+};
+
+/*eslint-disable no-use-before-define*/
+function getParentBehaviour(stubInstance) {
+    return stubInstance.parent && getCurrentBehavior(stubInstance.parent);
+}
+
+function getDefaultBehavior(stubInstance) {
+    return stubInstance.defaultBehavior || getParentBehaviour(stubInstance) || behavior.create(stubInstance);
+}
+
+function getCurrentBehavior(stubInstance) {
+    var currentBehavior = stubInstance.behaviors[stubInstance.callCount - 1];
+    return currentBehavior && currentBehavior.isPresent() ? currentBehavior : getDefaultBehavior(stubInstance);
+}
+/*eslint-enable no-use-before-define*/
+
+var proto = {
+    resetBehavior: function() {
+        this.defaultBehavior = null;
+        this.behaviors = [];
+
+        delete this.returnValue;
+        delete this.returnArgAt;
+        delete this.throwArgAt;
+        delete this.resolveArgAt;
+        delete this.fakeFn;
+        this.returnThis = false;
+        this.resolveThis = false;
+
+        forEach(this.fakes, function(fake) {
+            fake.resetBehavior();
+        });
+    },
+
+    reset: function() {
+        this.resetHistory();
+        this.resetBehavior();
+    },
+
+    onCall: function onCall(index) {
+        if (!this.behaviors[index]) {
+            this.behaviors[index] = behavior.create(this);
+        }
+
+        return this.behaviors[index];
+    },
+
+    onFirstCall: function onFirstCall() {
+        return this.onCall(0);
+    },
+
+    onSecondCall: function onSecondCall() {
+        return this.onCall(1);
+    },
+
+    onThirdCall: function onThirdCall() {
+        return this.onCall(2);
+    },
+
+    withArgs: function withArgs() {
+        var fake = spy.withArgs.apply(this, arguments);
+        if (this.defaultBehavior && this.defaultBehavior.promiseLibrary) {
+            fake.defaultBehavior = fake.defaultBehavior || behavior.create(fake);
+            fake.defaultBehavior.promiseLibrary = this.defaultBehavior.promiseLibrary;
+        }
+        return fake;
+    }
+};
+
+forEach(Object.keys(behavior), function(method) {
+    if (
+        hasOwnProperty(behavior, method) &&
+        !hasOwnProperty(proto, method) &&
+        method !== "create" &&
+        method !== "invoke"
+    ) {
+        proto[method] = behavior.createBehavior(method);
+    }
+});
+
+forEach(Object.keys(behaviors), function(method) {
+    if (hasOwnProperty(behaviors, method) && !hasOwnProperty(proto, method)) {
+        behavior.addBehavior(stub, method, behaviors[method]);
+    }
+});
+
+extend(stub, proto);
+module.exports = stub;
+
+},{"./behavior":3,"./default-behaviors":7,"./proxy":14,"./spy":18,"./throw-on-falsy-object":20,"./util/core/extend":23,"./util/core/get-property-descriptor":27,"./util/core/is-es-module":28,"./util/core/is-non-existent-property":29,"./util/core/walk-object":34,"./util/core/wrap-method":36,"@sinonjs/commons":44}],20:[function(require,module,exports){
+"use strict";
+var valueToString = require("@sinonjs/commons").valueToString;
+
+function throwOnFalsyObject(object, property) {
+    if (property && !object) {
+        var type = object === null ? "null" : "undefined";
+        throw new Error("Trying to stub property '" + valueToString(property) + "' of " + type);
+    }
+}
+
+module.exports = throwOnFalsyObject;
+
+},{"@sinonjs/commons":44}],21:[function(require,module,exports){
+"use strict";
+
+module.exports = {
+    injectInto: null,
+    properties: [
+        "spy",
+        "stub",
+        "mock",
+        "clock",
+        "server",
+        "requests",
+        "fake",
+        "replace",
+        "replaceSetter",
+        "replaceGetter",
+        "createStubInstance"
+    ],
+    useFakeTimers: true,
+    useFakeServer: true
+};
+
+},{}],22:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var reduce = arrayProto.reduce;
+
+module.exports = function exportAsyncBehaviors(behaviorMethods) {
+    return reduce(
+        Object.keys(behaviorMethods),
+        function(acc, method) {
+            // need to avoid creating another async versions of the newly added async methods
+            if (method.match(/^(callsArg|yields)/) && !method.match(/Async/)) {
+                acc[method + "Async"] = function() {
+                    var result = behaviorMethods[method].apply(this, arguments);
+                    this.callbackAsync = true;
+                    return result;
+                };
+            }
+            return acc;
+        },
+        {}
+    );
+};
+
+},{"@sinonjs/commons":44}],23:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var hasOwnProperty = require("@sinonjs/commons").prototypes.object.hasOwnProperty;
+
+var join = arrayProto.join;
+var push = arrayProto.push;
+var slice = arrayProto.slice;
+
+// Adapted from https://developer.mozilla.org/en/docs/ECMAScript_DontEnum_attribute#JScript_DontEnum_Bug
+var hasDontEnumBug = (function() {
+    var obj = {
+        constructor: function() {
+            return "0";
+        },
+        toString: function() {
+            return "1";
+        },
+        valueOf: function() {
+            return "2";
+        },
+        toLocaleString: function() {
+            return "3";
+        },
+        prototype: function() {
+            return "4";
+        },
+        isPrototypeOf: function() {
+            return "5";
+        },
+        propertyIsEnumerable: function() {
+            return "6";
+        },
+        hasOwnProperty: function() {
+            return "7";
+        },
+        length: function() {
+            return "8";
+        },
+        unique: function() {
+            return "9";
+        }
+    };
+
+    var result = [];
+    for (var prop in obj) {
+        if (hasOwnProperty(obj, prop)) {
+            push(result, obj[prop]());
+        }
+    }
+    return join(result, "") !== "0123456789";
+})();
+
+function extendCommon(target, sources, doCopy) {
+    var source, i, prop;
+
+    for (i = 0; i < sources.length; i++) {
+        source = sources[i];
+
+        for (prop in source) {
+            if (hasOwnProperty(source, prop)) {
+                doCopy(target, source, prop);
+            }
+        }
+
+        // Make sure we copy (own) toString method even when in JScript with DontEnum bug
+        // See https://developer.mozilla.org/en/docs/ECMAScript_DontEnum_attribute#JScript_DontEnum_Bug
+        if (hasDontEnumBug && hasOwnProperty(source, "toString") && source.toString !== target.toString) {
+            target.toString = source.toString;
+        }
+    }
+
+    return target;
+}
+
+/** Public: Extend target in place with all (own) properties from sources in-order. Thus, last source will
+ *         override properties in previous sources.
+ *
+ * @arg {Object} target - The Object to extend
+ * @arg {Object[]} sources - Objects to copy properties from.
+ *
+ * @returns {Object} the extended target
+ */
+module.exports = function extend(target /*, sources */) {
+    var sources = slice(arguments, 1);
+
+    return extendCommon(target, sources, function copyValue(dest, source, prop) {
+        dest[prop] = source[prop];
+    });
+};
+
+/** Public: Extend target in place with all (own) properties from sources in-order. Thus, last source will
+ *         override properties in previous sources. Define the properties as non enumerable.
+ *
+ * @arg {Object} target - The Object to extend
+ * @arg {Object[]} sources - Objects to copy properties from.
+ *
+ * @returns {Object} the extended target
+ */
+module.exports.nonEnum = function extendNonEnum(target /*, sources */) {
+    var sources = slice(arguments, 1);
+
+    return extendCommon(target, sources, function copyProperty(dest, source, prop) {
+        Object.defineProperty(dest, prop, {
+            value: source[prop],
+            enumerable: false,
+            configurable: true,
+            writable: true
+        });
+    });
+};
+
+},{"@sinonjs/commons":44}],24:[function(require,module,exports){
+"use strict";
+
+var formatio = require("@sinonjs/formatio");
+
+var formatter = formatio.configure({
+    quoteStrings: false,
+    limitChildrenCount: 250
+});
+
+var customFormatter;
+
+function format() {
+    if (customFormatter) {
+        return customFormatter.apply(null, arguments);
+    }
+
+    return formatter.ascii.apply(formatter, arguments);
+}
+
+format.setFormatter = function(aCustomFormatter) {
+    if (typeof aCustomFormatter !== "function") {
+        throw new Error("format.setFormatter must be called with a function");
+    }
+
+    customFormatter = aCustomFormatter;
+};
+
+module.exports = format;
+
+},{"@sinonjs/formatio":57}],25:[function(require,module,exports){
+"use strict";
+
+module.exports = function toString() {
+    var i, prop, thisValue;
+    if (this.getCall && this.callCount) {
+        i = this.callCount;
+
+        while (i--) {
+            thisValue = this.getCall(i).thisValue;
+
+            // eslint-disable-next-line guard-for-in
+            for (prop in thisValue) {
+                try {
+                    if (thisValue[prop] === this) {
+                        return prop;
+                    }
+                } catch (e) {
+                    // no-op - accessing props can throw an error, nothing to do here
+                }
+            }
+        }
+    }
+
+    return this.displayName || "sinon fake";
+};
+
+},{}],26:[function(require,module,exports){
+"use strict";
+
+/* istanbul ignore next : not testing that setTimeout works */
+function nextTick(callback) {
+    setTimeout(callback, 0);
+}
+
+module.exports = function getNextTick(process, setImmediate) {
+    if (typeof process === "object" && typeof process.nextTick === "function") {
+        return process.nextTick;
+    }
+
+    if (typeof setImmediate === "function") {
+        return setImmediate;
+    }
+
+    return nextTick;
+};
+
+},{}],27:[function(require,module,exports){
+"use strict";
+
+module.exports = function getPropertyDescriptor(object, property) {
+    var proto = object;
+    var descriptor;
+    var isOwn = Boolean(object && Object.getOwnPropertyDescriptor(object, property));
+
+    while (proto && !(descriptor = Object.getOwnPropertyDescriptor(proto, property))) {
+        proto = Object.getPrototypeOf(proto);
+    }
+
+    if (descriptor) {
+        descriptor.isOwn = isOwn;
+    }
+
+    return descriptor;
+};
+
+},{}],28:[function(require,module,exports){
+"use strict";
+
+/**
+ * Verify if an object is a ECMAScript Module
+ *
+ * As the exports from a module is immutable we cannot alter the exports
+ * using spies or stubs. Let the consumer know this to avoid bug reports
+ * on weird error messages.
+ *
+ * @param {Object} object The object to examine
+ *
+ * @returns {Boolean} true when the object is a module
+ */
+module.exports = function(object) {
+    return (
+        object && typeof Symbol !== "undefined" && object[Symbol.toStringTag] === "Module" && Object.isSealed(object)
+    );
+};
+
+},{}],29:[function(require,module,exports){
+"use strict";
+
+/**
+ * @param {*} object
+ * @param {String} property
+ * @returns whether a prop exists in the prototype chain
+ */
+function isNonExistentProperty(object, property) {
+    return object && typeof property !== "undefined" && !(property in object);
+}
+
+module.exports = isNonExistentProperty;
+
+},{}],30:[function(require,module,exports){
+"use strict";
+
+var getPropertyDescriptor = require("./get-property-descriptor");
+
+function isPropertyConfigurable(obj, propName) {
+    var propertyDescriptor = getPropertyDescriptor(obj, propName);
+
+    return propertyDescriptor ? propertyDescriptor.configurable : true;
+}
+
+module.exports = isPropertyConfigurable;
+
+},{"./get-property-descriptor":27}],31:[function(require,module,exports){
+"use strict";
+
+var globalObject = require("@sinonjs/commons").global;
+var getNextTick = require("./get-next-tick");
+
+module.exports = getNextTick(globalObject.process, globalObject.setImmediate);
+
+},{"./get-next-tick":26,"@sinonjs/commons":44}],32:[function(require,module,exports){
+"use strict";
+
+var array = [null, "once", "twice", "thrice"];
+
+module.exports = function timesInWords(count) {
+    return array[count] || (count || 0) + " times";
+};
+
+},{}],33:[function(require,module,exports){
+"use strict";
+
+var forEach = Array.prototype.forEach;
+
+function usePromiseLibrary(library, fakes) {
+    if (typeof library === "undefined") {
+        return;
+    }
+
+    if (Array.isArray(fakes)) {
+        forEach.call(fakes, usePromiseLibrary.bind(null, library));
+
+        return;
+    }
+
+    if (typeof fakes.usingPromise === "function") {
+        fakes.usingPromise(library);
+    }
+}
+
+module.exports = usePromiseLibrary;
+
+},{}],34:[function(require,module,exports){
+"use strict";
+
+var functionName = require("@sinonjs/commons").functionName;
+
+var getPropertyDescriptor = require("./get-property-descriptor");
+var walk = require("./walk");
+
+function walkObject(predicate, object, filter) {
+    var called = false;
+    var name = functionName(predicate);
+
+    if (!object) {
+        throw new Error("Trying to " + name + " object but received " + String(object));
+    }
+
+    walk(object, function(prop, propOwner) {
+        // we don't want to stub things like toString(), valueOf(), etc. so we only stub if the object
+        // is not Object.prototype
+        if (
+            propOwner !== Object.prototype &&
+            prop !== "constructor" &&
+            typeof getPropertyDescriptor(propOwner, prop).value === "function"
+        ) {
+            if (filter) {
+                if (filter(object, prop)) {
+                    called = true;
+                    predicate(object, prop);
+                }
+            } else {
+                called = true;
+                predicate(object, prop);
+            }
+        }
+    });
+
+    if (!called) {
+        throw new Error("Expected to " + name + " methods on object but found none");
+    }
+
+    return object;
+}
+
+module.exports = walkObject;
+
+},{"./get-property-descriptor":27,"./walk":35,"@sinonjs/commons":44}],35:[function(require,module,exports){
+"use strict";
+
+var forEach = require("@sinonjs/commons").prototypes.array.forEach;
+
+function walkInternal(obj, iterator, context, originalObj, seen) {
+    var proto, prop;
+
+    if (typeof Object.getOwnPropertyNames !== "function") {
+        // We explicitly want to enumerate through all of the prototype's properties
+        // in this case, therefore we deliberately leave out an own property check.
+        /* eslint-disable-next-line guard-for-in */
+        for (prop in obj) {
+            iterator.call(context, obj[prop], prop, obj);
+        }
+
+        return;
+    }
+
+    forEach(Object.getOwnPropertyNames(obj), function(k) {
+        if (seen[k] !== true) {
+            seen[k] = true;
+            var target = typeof Object.getOwnPropertyDescriptor(obj, k).get === "function" ? originalObj : obj;
+            iterator.call(context, k, target);
+        }
+    });
+
+    proto = Object.getPrototypeOf(obj);
+    if (proto) {
+        walkInternal(proto, iterator, context, originalObj, seen);
+    }
+}
+
+/* Walks the prototype chain of an object and iterates over every own property
+ * name encountered. The iterator is called in the same fashion that Array.prototype.forEach
+ * works, where it is passed the value, key, and own object as the 1st, 2nd, and 3rd positional
+ * argument, respectively. In cases where Object.getOwnPropertyNames is not available, walk will
+ * default to using a simple for..in loop.
+ *
+ * obj - The object to walk the prototype chain for.
+ * iterator - The function to be called on each pass of the walk.
+ * context - (Optional) When given, the iterator will be called with this object as the receiver.
+ */
+module.exports = function walk(obj, iterator, context) {
+    return walkInternal(obj, iterator, context, obj, {});
+};
+
+},{"@sinonjs/commons":44}],36:[function(require,module,exports){
+"use strict";
+
+var getPropertyDescriptor = require("./get-property-descriptor");
+var extend = require("./extend");
+var hasOwnProperty = require("@sinonjs/commons").prototypes.object.hasOwnProperty;
+var valueToString = require("@sinonjs/commons").valueToString;
+
+function isFunction(obj) {
+    return typeof obj === "function" || Boolean(obj && obj.constructor && obj.call && obj.apply);
+}
+
+function mirrorProperties(target, source) {
+    for (var prop in source) {
+        if (!hasOwnProperty(target, prop)) {
+            target[prop] = source[prop];
+        }
+    }
+}
+
+// Cheap way to detect if we have ES5 support.
+var hasES5Support = "keys" in Object;
+
+module.exports = function wrapMethod(object, property, method) {
+    if (!object) {
+        throw new TypeError("Should wrap property of object");
+    }
+
+    if (typeof method !== "function" && typeof method !== "object") {
+        throw new TypeError("Method wrapper should be a function or a property descriptor");
+    }
+
+    function checkWrappedMethod(wrappedMethod) {
+        var error;
+
+        if (!isFunction(wrappedMethod)) {
+            error = new TypeError(
+                "Attempted to wrap " + typeof wrappedMethod + " property " + valueToString(property) + " as function"
+            );
+        } else if (wrappedMethod.restore && wrappedMethod.restore.sinon) {
+            error = new TypeError("Attempted to wrap " + valueToString(property) + " which is already wrapped");
+        } else if (wrappedMethod.calledBefore) {
+            var verb = wrappedMethod.returns ? "stubbed" : "spied on";
+            error = new TypeError("Attempted to wrap " + valueToString(property) + " which is already " + verb);
+        }
+
+        if (error) {
+            if (wrappedMethod && wrappedMethod.stackTraceError) {
+                error.stack += "\n--------------\n" + wrappedMethod.stackTraceError.stack;
+            }
+            throw error;
+        }
+    }
+
+    var error, wrappedMethod, i, wrappedMethodDesc;
+
+    function simplePropertyAssignment() {
+        wrappedMethod = object[property];
+        checkWrappedMethod(wrappedMethod);
+        object[property] = method;
+        method.displayName = property;
+    }
+
+    // Firefox has a problem when using hasOwn.call on objects from other frames.
+    /* eslint-disable-next-line local-rules/no-prototype-methods */
+    var owned = object.hasOwnProperty ? object.hasOwnProperty(property) : hasOwnProperty(object, property);
+
+    if (hasES5Support) {
+        var methodDesc = typeof method === "function" ? { value: method } : method;
+        wrappedMethodDesc = getPropertyDescriptor(object, property);
+
+        if (!wrappedMethodDesc) {
+            error = new TypeError(
+                "Attempted to wrap " + typeof wrappedMethod + " property " + property + " as function"
+            );
+        } else if (wrappedMethodDesc.restore && wrappedMethodDesc.restore.sinon) {
+            error = new TypeError("Attempted to wrap " + property + " which is already wrapped");
+        }
+        if (error) {
+            if (wrappedMethodDesc && wrappedMethodDesc.stackTraceError) {
+                error.stack += "\n--------------\n" + wrappedMethodDesc.stackTraceError.stack;
+            }
+            throw error;
+        }
+
+        var types = Object.keys(methodDesc);
+        for (i = 0; i < types.length; i++) {
+            wrappedMethod = wrappedMethodDesc[types[i]];
+            checkWrappedMethod(wrappedMethod);
+        }
+
+        mirrorProperties(methodDesc, wrappedMethodDesc);
+        for (i = 0; i < types.length; i++) {
+            mirrorProperties(methodDesc[types[i]], wrappedMethodDesc[types[i]]);
+        }
+        Object.defineProperty(object, property, methodDesc);
+
+        // catch failing assignment
+        // this is the converse of the check in `.restore` below
+        if (typeof method === "function" && object[property] !== method) {
+            // correct any wrongdoings caused by the defineProperty call above,
+            // such as adding new items (if object was a Storage object)
+            delete object[property];
+            simplePropertyAssignment();
+        }
+    } else {
+        simplePropertyAssignment();
+    }
+
+    extend.nonEnum(method, {
+        displayName: property,
+
+        wrappedMethod: wrappedMethod,
+
+        // Set up an Error object for a stack trace which can be used later to find what line of
+        // code the original method was created on.
+        stackTraceError: new Error("Stack Trace for original"),
+
+        restore: function() {
+            // For prototype properties try to reset by delete first.
+            // If this fails (ex: localStorage on mobile safari) then force a reset
+            // via direct assignment.
+            if (!owned) {
+                // In some cases `delete` may throw an error
+                try {
+                    delete object[property];
+                } catch (e) {} // eslint-disable-line no-empty
+                // For native code functions `delete` fails without throwing an error
+                // on Chrome < 43, PhantomJS, etc.
+            } else if (hasES5Support) {
+                Object.defineProperty(object, property, wrappedMethodDesc);
+            }
+
+            if (hasES5Support) {
+                var descriptor = getPropertyDescriptor(object, property);
+                if (descriptor && descriptor.value === method) {
+                    object[property] = wrappedMethod;
+                }
+            } else {
+                // Use strict equality comparison to check failures then force a reset
+                // via direct assignment.
+                if (object[property] === method) {
+                    object[property] = wrappedMethod;
+                }
+            }
+        }
+    });
+
+    method.restore.sinon = true;
+
+    if (!hasES5Support) {
+        mirrorProperties(method, wrappedMethod);
+    }
+
+    return method;
+};
+
+},{"./extend":23,"./get-property-descriptor":27,"@sinonjs/commons":44}],37:[function(require,module,exports){
+"use strict";
+
+var extend = require("./core/extend");
+var FakeTimers = require("@sinonjs/fake-timers");
+var globalObject = require("@sinonjs/commons").global;
+
+function createClock(config, globalCtx) {
+    var FakeTimersCtx = FakeTimers;
+    if (globalCtx !== null && typeof globalCtx === "object") {
+        FakeTimersCtx = FakeTimers.withGlobal(globalCtx);
+    }
+    var clock = FakeTimersCtx.install(config);
+    clock.restore = clock.uninstall;
+    return clock;
+}
+
+function addIfDefined(obj, globalPropName) {
+    var globalProp = globalObject[globalPropName];
+    if (typeof globalProp !== "undefined") {
+        obj[globalPropName] = globalProp;
+    }
+}
+
+/**
+ * @param {number|Date|Object} dateOrConfig The unix epoch value to install with (default 0)
+ * @returns {Object} Returns a lolex clock instance
+ */
+exports.useFakeTimers = function(dateOrConfig) {
+    var hasArguments = typeof dateOrConfig !== "undefined";
+    var argumentIsDateLike =
+        (typeof dateOrConfig === "number" || dateOrConfig instanceof Date) && arguments.length === 1;
+    var argumentIsObject = dateOrConfig !== null && typeof dateOrConfig === "object" && arguments.length === 1;
+
+    if (!hasArguments) {
+        return createClock({
+            now: 0
+        });
+    }
+
+    if (argumentIsDateLike) {
+        return createClock({
+            now: dateOrConfig
+        });
+    }
+
+    if (argumentIsObject) {
+        var config = extend.nonEnum({}, dateOrConfig);
+        var globalCtx = config.global;
+        delete config.global;
+        return createClock(config, globalCtx);
+    }
+
+    throw new TypeError("useFakeTimers expected epoch or config object. See https://github.com/sinonjs/sinon");
+};
+
+exports.clock = {
+    create: function(now) {
+        return FakeTimers.createClock(now);
+    }
+};
+
+var timers = {
+    setTimeout: setTimeout,
+    clearTimeout: clearTimeout,
+    setInterval: setInterval,
+    clearInterval: clearInterval,
+    Date: Date
+};
+addIfDefined(timers, "setImmediate");
+addIfDefined(timers, "clearImmediate");
+
+exports.timers = timers;
+
+},{"./core/extend":23,"@sinonjs/commons":44,"@sinonjs/fake-timers":56}],38:[function(require,module,exports){
+"use strict";
+
+var every = require("./prototypes/array").every;
+
+/**
+ * @private
+ */
+function hasCallsLeft(callMap, spy) {
+    if (callMap[spy.id] === undefined) {
+        callMap[spy.id] = 0;
+    }
+
+    return callMap[spy.id] < spy.callCount;
+}
+
+/**
+ * @private
+ */
+function checkAdjacentCalls(callMap, spy, index, spies) {
+    var calledBeforeNext = true;
+
+    if (index !== spies.length - 1) {
+        calledBeforeNext = spy.calledBefore(spies[index + 1]);
+    }
+
+    if (hasCallsLeft(callMap, spy) && calledBeforeNext) {
+        callMap[spy.id] += 1;
+        return true;
+    }
+
+    return false;
+}
+
+/**
+ * A Sinon proxy object (fake, spy, stub)
+ *
+ * @typedef {object} SinonProxy
+ * @property {Function} calledBefore - A method that determines if this proxy was called before another one
+ * @property {string} id - Some id
+ * @property {number} callCount - Number of times this proxy has been called
+ */
+
+/**
+ * Returns true when the spies have been called in the order they were supplied in
+ *
+ * @param  {SinonProxy[] | SinonProxy} spies An array of proxies, or several proxies as arguments
+ * @returns {boolean} true when spies are called in order, false otherwise
+ */
+function calledInOrder(spies) {
+    var callMap = {};
+    // eslint-disable-next-line no-underscore-dangle
+    var _spies = arguments.length > 1 ? arguments : spies;
+
+    return every(_spies, checkAdjacentCalls.bind(null, callMap));
+}
+
+module.exports = calledInOrder;
+
+},{"./prototypes/array":46}],39:[function(require,module,exports){
+"use strict";
+
+var functionName = require("./function-name");
+
+/**
+ * Returns a display name for a value from a constructor
+ *
+ * @param  {object} value A value to examine
+ * @returns {(string|null)} A string or null
+ */
+function className(value) {
+    return (
+        (value.constructor && value.constructor.name) ||
+        // The next branch is for IE11 support only:
+        // Because the name property is not set on the prototype
+        // of the Function object, we finally try to grab the
+        // name from its definition. This will never be reached
+        // in node, so we are not able to test this properly.
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/name
+        (typeof value.constructor === "function" &&
+            /* istanbul ignore next */
+            functionName(value.constructor)) ||
+        null
+    );
+}
+
+module.exports = className;
+
+},{"./function-name":42}],40:[function(require,module,exports){
+/* eslint-disable no-console */
+"use strict";
+
+/**
+ * Returns a function that will invoke the supplied function and print a
+ * deprecation warning to the console each time it is called.
+ *
+ * @param  {Function} func
+ * @param  {string} msg
+ * @returns {Function}
+ */
+exports.wrap = function(func, msg) {
+    var wrapped = function() {
+        exports.printWarning(msg);
+        return func.apply(this, arguments);
+    };
+    if (func.prototype) {
+        wrapped.prototype = func.prototype;
+    }
+    return wrapped;
+};
+
+/**
+ * Returns a string which can be supplied to `wrap()` to notify the user that a
+ * particular part of the sinon API has been deprecated.
+ *
+ * @param  {string} packageName
+ * @param  {string} funcName
+ * @returns {string}
+ */
+exports.defaultMsg = function(packageName, funcName) {
+    return (
+        packageName +
+        "." +
+        funcName +
+        " is deprecated and will be removed from the public API in a future version of " +
+        packageName +
+        "."
+    );
+};
+
+/**
+ * Prints a warning on the console, when it exists
+ *
+ * @param  {string} msg
+ * @returns {undefined}
+ */
+exports.printWarning = function(msg) {
+    // Watch out for IE7 and below! :(
+    /* istanbul ignore next */
+    if (typeof console !== "undefined") {
+        if (console.info) {
+            console.info(msg);
+        } else {
+            console.log(msg);
+        }
+    }
+};
+
+},{}],41:[function(require,module,exports){
+"use strict";
+
+/**
+ * Returns true when fn returns true for all members of obj.
+ * This is an every implementation that works for all iterables
+ *
+ * @param  {object}   obj
+ * @param  {Function} fn
+ * @returns {boolean}
+ */
+module.exports = function every(obj, fn) {
+    var pass = true;
+
+    try {
+        /* eslint-disable-next-line local-rules/no-prototype-methods */
+        obj.forEach(function() {
+            if (!fn.apply(this, arguments)) {
+                // Throwing an error is the only way to break `forEach`
+                throw new Error();
+            }
+        });
+    } catch (e) {
+        pass = false;
+    }
+
+    return pass;
+};
+
+},{}],42:[function(require,module,exports){
+"use strict";
+
+/**
+ * Returns a display name for a function
+ *
+ * @param  {Function} func
+ * @returns {string}
+ */
+module.exports = function functionName(func) {
+    if (!func) {
+        return "";
+    }
+
+    try {
+        return (
+            func.displayName ||
+            func.name ||
+            // Use function decomposition as a last resort to get function
+            // name. Does not rely on function decomposition to work - if it
+            // doesn't debugging will be slightly less informative
+            // (i.e. toString will say 'spy' rather than 'myFunc').
+            (String(func).match(/function ([^\s(]+)/) || [])[1]
+        );
+    } catch (e) {
+        // Stringify may fail and we might get an exception, as a last-last
+        // resort fall back to empty string.
+        return "";
+    }
+};
+
+},{}],43:[function(require,module,exports){
+"use strict";
+
+/**
+ * A reference to the global object
+ *
+ * @type {object} globalObject
+ */
+var globalObject;
+
+/* istanbul ignore else */
+if (typeof global !== "undefined") {
+    // Node
+    globalObject = global;
+} else if (typeof window !== "undefined") {
+    // Browser
+    globalObject = window;
+} else {
+    // WebWorker
+    globalObject = self;
+}
+
+module.exports = globalObject;
+
+},{}],44:[function(require,module,exports){
+"use strict";
+
+module.exports = {
+    global: require("./global"),
+    calledInOrder: require("./called-in-order"),
+    className: require("./class-name"),
+    deprecated: require("./deprecated"),
+    every: require("./every"),
+    functionName: require("./function-name"),
+    orderByFirstCall: require("./order-by-first-call"),
+    prototypes: require("./prototypes"),
+    typeOf: require("./type-of"),
+    valueToString: require("./value-to-string")
+};
+
+},{"./called-in-order":38,"./class-name":39,"./deprecated":40,"./every":41,"./function-name":42,"./global":43,"./order-by-first-call":45,"./prototypes":49,"./type-of":54,"./value-to-string":55}],45:[function(require,module,exports){
+"use strict";
+
+var sort = require("./prototypes/array").sort;
+var slice = require("./prototypes/array").slice;
+
+/**
+ * @private
+ */
+function comparator(a, b) {
+    // uuid, won't ever be equal
+    var aCall = a.getCall(0);
+    var bCall = b.getCall(0);
+    var aId = (aCall && aCall.callId) || -1;
+    var bId = (bCall && bCall.callId) || -1;
+
+    return aId < bId ? -1 : 1;
+}
+
+/**
+ * A Sinon proxy object (fake, spy, stub)
+ *
+ * @typedef {object} SinonProxy
+ * @property {Function} getCall - A method that can return the first call
+ */
+
+/**
+ * Sorts an array of SinonProxy instances (fake, spy, stub) by their first call
+ *
+ * @param  {SinonProxy[] | SinonProxy} spies
+ * @returns {SinonProxy[]}
+ */
+function orderByFirstCall(spies) {
+    return sort(slice(spies), comparator);
+}
+
+module.exports = orderByFirstCall;
+
+},{"./prototypes/array":46}],46:[function(require,module,exports){
+"use strict";
+
+var copyPrototype = require("./copy-prototype");
+
+module.exports = copyPrototype(Array.prototype);
+
+},{"./copy-prototype":47}],47:[function(require,module,exports){
+"use strict";
+
+var call = Function.call;
+
+module.exports = function copyPrototypeMethods(prototype) {
+    /* eslint-disable local-rules/no-prototype-methods */
+    return Object.getOwnPropertyNames(prototype).reduce(function(result, name) {
+        // ignore size because it throws from Map
+        if (
+            name !== "size" &&
+            name !== "caller" &&
+            name !== "callee" &&
+            name !== "arguments" &&
+            typeof prototype[name] === "function"
+        ) {
+            result[name] = call.bind(prototype[name]);
+        }
+
+        return result;
+    }, Object.create(null));
+};
+
+},{}],48:[function(require,module,exports){
+"use strict";
+
+var copyPrototype = require("./copy-prototype");
+
+module.exports = copyPrototype(Function.prototype);
+
+},{"./copy-prototype":47}],49:[function(require,module,exports){
+"use strict";
+
+module.exports = {
+    array: require("./array"),
+    function: require("./function"),
+    map: require("./map"),
+    object: require("./object"),
+    set: require("./set"),
+    string: require("./string")
+};
+
+},{"./array":46,"./function":48,"./map":50,"./object":51,"./set":52,"./string":53}],50:[function(require,module,exports){
+"use strict";
+
+var copyPrototype = require("./copy-prototype");
+
+module.exports = copyPrototype(Map.prototype);
+
+},{"./copy-prototype":47}],51:[function(require,module,exports){
+"use strict";
+
+var copyPrototype = require("./copy-prototype");
+
+module.exports = copyPrototype(Object.prototype);
+
+},{"./copy-prototype":47}],52:[function(require,module,exports){
+"use strict";
+
+var copyPrototype = require("./copy-prototype");
+
+module.exports = copyPrototype(Set.prototype);
+
+},{"./copy-prototype":47}],53:[function(require,module,exports){
+"use strict";
+
+var copyPrototype = require("./copy-prototype");
+
+module.exports = copyPrototype(String.prototype);
+
+},{"./copy-prototype":47}],54:[function(require,module,exports){
+"use strict";
+
+var type = require("type-detect");
+
+/**
+ * Returns the lower-case result of running type from type-detect on the value
+ *
+ * @param  {*} value
+ * @returns {string}
+ */
+module.exports = function typeOf(value) {
+    return type(value).toLowerCase();
+};
+
+},{"type-detect":131}],55:[function(require,module,exports){
+"use strict";
+
+/**
+ * Returns a string representation of the value
+ *
+ * @param  {*} value
+ * @returns {string}
+ */
+function valueToString(value) {
+    if (value && value.toString) {
+        /* eslint-disable-next-line local-rules/no-prototype-methods */
+        return value.toString();
+    }
+    return String(value);
+}
+
+module.exports = valueToString;
+
+},{}],56:[function(require,module,exports){
+"use strict";
+
+var globalObject = require("@sinonjs/commons").global;
+
+// eslint-disable-next-line complexity
+function withGlobal(_global) {
+    var userAgent = _global.navigator && _global.navigator.userAgent;
+    var isRunningInIE = userAgent && userAgent.indexOf("MSIE ") > -1;
+    var maxTimeout = Math.pow(2, 31) - 1; //see https://heycam.github.io/webidl/#abstract-opdef-converttoint
+    var NOOP = function() {
+        return undefined;
+    };
+    var NOOP_ARRAY = function() {
+        return [];
+    };
+    var timeoutResult = _global.setTimeout(NOOP, 0);
+    var addTimerReturnsObject = typeof timeoutResult === "object";
+    var hrtimePresent =
+        _global.process && typeof _global.process.hrtime === "function";
+    var hrtimeBigintPresent =
+        hrtimePresent && typeof _global.process.hrtime.bigint === "function";
+    var nextTickPresent =
+        _global.process && typeof _global.process.nextTick === "function";
+    var utilPromisify = _global.process && require("util").promisify;
+    var performancePresent =
+        _global.performance && typeof _global.performance.now === "function";
+    var hasPerformancePrototype =
+        _global.Performance &&
+        (typeof _global.Performance).match(/^(function|object)$/);
+    var queueMicrotaskPresent = _global.hasOwnProperty("queueMicrotask");
+    var requestAnimationFramePresent =
+        _global.requestAnimationFrame &&
+        typeof _global.requestAnimationFrame === "function";
+    var cancelAnimationFramePresent =
+        _global.cancelAnimationFrame &&
+        typeof _global.cancelAnimationFrame === "function";
+    var requestIdleCallbackPresent =
+        _global.requestIdleCallback &&
+        typeof _global.requestIdleCallback === "function";
+    var cancelIdleCallbackPresent =
+        _global.cancelIdleCallback &&
+        typeof _global.cancelIdleCallback === "function";
+    var setImmediatePresent =
+        _global.setImmediate && typeof _global.setImmediate === "function";
+
+    // Make properties writable in IE, as per
+    // http://www.adequatelygood.com/Replacing-setTimeout-Globally.html
+    /* eslint-disable no-self-assign */
+    if (isRunningInIE) {
+        _global.setTimeout = _global.setTimeout;
+        _global.clearTimeout = _global.clearTimeout;
+        _global.setInterval = _global.setInterval;
+        _global.clearInterval = _global.clearInterval;
+        _global.Date = _global.Date;
+    }
+
+    // setImmediate is not a standard function
+    // avoid adding the prop to the window object if not present
+    if (setImmediatePresent) {
+        _global.setImmediate = _global.setImmediate;
+        _global.clearImmediate = _global.clearImmediate;
+    }
+    /* eslint-enable no-self-assign */
+
+    _global.clearTimeout(timeoutResult);
+
+    var NativeDate = _global.Date;
+    var uniqueTimerId = 1;
+
+    function isNumberFinite(num) {
+        if (Number.isFinite) {
+            return Number.isFinite(num);
+        }
+
+        if (typeof num !== "number") {
+            return false;
+        }
+
+        return isFinite(num);
+    }
+
+    /**
+     * Parse strings like "01:10:00" (meaning 1 hour, 10 minutes, 0 seconds) into
+     * number of milliseconds. This is used to support human-readable strings passed
+     * to clock.tick()
+     */
+    function parseTime(str) {
+        if (!str) {
+            return 0;
+        }
+
+        var strings = str.split(":");
+        var l = strings.length;
+        var i = l;
+        var ms = 0;
+        var parsed;
+
+        if (l > 3 || !/^(\d\d:){0,2}\d\d?$/.test(str)) {
+            throw new Error(
+                "tick only understands numbers, 'm:s' and 'h:m:s'. Each part must be two digits"
+            );
+        }
+
+        while (i--) {
+            parsed = parseInt(strings[i], 10);
+
+            if (parsed >= 60) {
+                throw new Error("Invalid time " + str);
+            }
+
+            ms += parsed * Math.pow(60, l - i - 1);
+        }
+
+        return ms * 1000;
+    }
+
+    /**
+     * Get the decimal part of the millisecond value as nanoseconds
+     *
+     * @param {Number} msFloat the number of milliseconds
+     * @returns {Number} an integer number of nanoseconds in the range [0,1e6)
+     *
+     * Example: nanoRemainer(123.456789) -> 456789
+     */
+    function nanoRemainder(msFloat) {
+        var modulo = 1e6;
+        var remainder = (msFloat * 1e6) % modulo;
+        var positiveRemainder = remainder < 0 ? remainder + modulo : remainder;
+
+        return Math.floor(positiveRemainder);
+    }
+
+    /**
+     * Used to grok the `now` parameter to createClock.
+     * @param epoch {Date|number} the system time
+     */
+    function getEpoch(epoch) {
+        if (!epoch) {
+            return 0;
+        }
+        if (typeof epoch.getTime === "function") {
+            return epoch.getTime();
+        }
+        if (typeof epoch === "number") {
+            return epoch;
+        }
+        throw new TypeError("now should be milliseconds since UNIX epoch");
+    }
+
+    function inRange(from, to, timer) {
+        return timer && timer.callAt >= from && timer.callAt <= to;
+    }
+
+    function mirrorDateProperties(target, source) {
+        var prop;
+        for (prop in source) {
+            if (source.hasOwnProperty(prop)) {
+                target[prop] = source[prop];
+            }
+        }
+
+        // set special now implementation
+        if (source.now) {
+            target.now = function now() {
+                return target.clock.now;
+            };
+        } else {
+            delete target.now;
+        }
+
+        // set special toSource implementation
+        if (source.toSource) {
+            target.toSource = function toSource() {
+                return source.toSource();
+            };
+        } else {
+            delete target.toSource;
+        }
+
+        // set special toString implementation
+        target.toString = function toString() {
+            return source.toString();
+        };
+
+        target.prototype = source.prototype;
+        target.parse = source.parse;
+        target.UTC = source.UTC;
+        target.prototype.toUTCString = source.prototype.toUTCString;
+
+        return target;
+    }
+
+    function createDate() {
+        function ClockDate(year, month, date, hour, minute, second, ms) {
+            // the Date constructor called as a function, ref Ecma-262 Edition 5.1, section 15.9.2.
+            // This remains so in the 10th edition of 2019 as well.
+            if (!(this instanceof ClockDate)) {
+                return new NativeDate(ClockDate.clock.now).toString();
+            }
+
+            // if Date is called as a constructor with 'new' keyword
+            // Defensive and verbose to avoid potential harm in passing
+            // explicit undefined when user does not pass argument
+            switch (arguments.length) {
+                case 0:
+                    return new NativeDate(ClockDate.clock.now);
+                case 1:
+                    return new NativeDate(year);
+                case 2:
+                    return new NativeDate(year, month);
+                case 3:
+                    return new NativeDate(year, month, date);
+                case 4:
+                    return new NativeDate(year, month, date, hour);
+                case 5:
+                    return new NativeDate(year, month, date, hour, minute);
+                case 6:
+                    return new NativeDate(
+                        year,
+                        month,
+                        date,
+                        hour,
+                        minute,
+                        second
+                    );
+                default:
+                    return new NativeDate(
+                        year,
+                        month,
+                        date,
+                        hour,
+                        minute,
+                        second,
+                        ms
+                    );
+            }
+        }
+
+        return mirrorDateProperties(ClockDate, NativeDate);
+    }
+
+    function enqueueJob(clock, job) {
+        // enqueues a microtick-deferred task - ecma262/#sec-enqueuejob
+        if (!clock.jobs) {
+            clock.jobs = [];
+        }
+        clock.jobs.push(job);
+    }
+
+    function runJobs(clock) {
+        // runs all microtick-deferred tasks - ecma262/#sec-runjobs
+        if (!clock.jobs) {
+            return;
+        }
+        for (var i = 0; i < clock.jobs.length; i++) {
+            var job = clock.jobs[i];
+            job.func.apply(null, job.args);
+            if (clock.loopLimit && i > clock.loopLimit) {
+                throw new Error(
+                    "Aborting after running " +
+                        clock.loopLimit +
+                        " timers, assuming an infinite loop!"
+                );
+            }
+        }
+        clock.jobs = [];
+    }
+
+    function addTimer(clock, timer) {
+        if (timer.func === undefined) {
+            throw new Error("Callback must be provided to timer calls");
+        }
+
+        timer.type = timer.immediate ? "Immediate" : "Timeout";
+
+        if (timer.hasOwnProperty("delay")) {
+            if (!isNumberFinite(timer.delay)) {
+                timer.delay = 0;
+            }
+            timer.delay = timer.delay > maxTimeout ? 1 : timer.delay;
+            timer.delay = Math.max(0, timer.delay);
+        }
+
+        if (timer.hasOwnProperty("interval")) {
+            timer.type = "Interval";
+            timer.interval = timer.interval > maxTimeout ? 1 : timer.interval;
+        }
+
+        if (timer.hasOwnProperty("animation")) {
+            timer.type = "AnimationFrame";
+            timer.animation = true;
+        }
+
+        if (!clock.timers) {
+            clock.timers = {};
+        }
+
+        timer.id = uniqueTimerId++;
+        timer.createdAt = clock.now;
+        timer.callAt =
+            clock.now + (parseInt(timer.delay) || (clock.duringTick ? 1 : 0));
+
+        clock.timers[timer.id] = timer;
+
+        if (addTimerReturnsObject) {
+            var res = {
+                id: timer.id,
+                ref: function() {
+                    return res;
+                },
+                unref: function() {
+                    return res;
+                },
+                refresh: function() {
+                    return res;
+                }
+            };
+            return res;
+        }
+
+        return timer.id;
+    }
+
+    /* eslint consistent-return: "off" */
+    function compareTimers(a, b) {
+        // Sort first by absolute timing
+        if (a.callAt < b.callAt) {
+            return -1;
+        }
+        if (a.callAt > b.callAt) {
+            return 1;
+        }
+
+        // Sort next by immediate, immediate timers take precedence
+        if (a.immediate && !b.immediate) {
+            return -1;
+        }
+        if (!a.immediate && b.immediate) {
+            return 1;
+        }
+
+        // Sort next by creation time, earlier-created timers take precedence
+        if (a.createdAt < b.createdAt) {
+            return -1;
+        }
+        if (a.createdAt > b.createdAt) {
+            return 1;
+        }
+
+        // Sort next by id, lower-id timers take precedence
+        if (a.id < b.id) {
+            return -1;
+        }
+        if (a.id > b.id) {
+            return 1;
+        }
+
+        // As timer ids are unique, no fallback `0` is necessary
+    }
+
+    function firstTimerInRange(clock, from, to) {
+        var timers = clock.timers;
+        var timer = null;
+        var id, isInRange;
+
+        for (id in timers) {
+            if (timers.hasOwnProperty(id)) {
+                isInRange = inRange(from, to, timers[id]);
+
+                if (
+                    isInRange &&
+                    (!timer || compareTimers(timer, timers[id]) === 1)
+                ) {
+                    timer = timers[id];
+                }
+            }
+        }
+
+        return timer;
+    }
+
+    function firstTimer(clock) {
+        var timers = clock.timers;
+        var timer = null;
+        var id;
+
+        for (id in timers) {
+            if (timers.hasOwnProperty(id)) {
+                if (!timer || compareTimers(timer, timers[id]) === 1) {
+                    timer = timers[id];
+                }
+            }
+        }
+
+        return timer;
+    }
+
+    function lastTimer(clock) {
+        var timers = clock.timers;
+        var timer = null;
+        var id;
+
+        for (id in timers) {
+            if (timers.hasOwnProperty(id)) {
+                if (!timer || compareTimers(timer, timers[id]) === -1) {
+                    timer = timers[id];
+                }
+            }
+        }
+
+        return timer;
+    }
+
+    function callTimer(clock, timer) {
+        if (typeof timer.interval === "number") {
+            clock.timers[timer.id].callAt += timer.interval;
+        } else {
+            delete clock.timers[timer.id];
+        }
+
+        if (typeof timer.func === "function") {
+            timer.func.apply(null, timer.args);
+        } else {
+            /* eslint no-eval: "off" */
+            eval(timer.func);
+        }
+    }
+
+    function clearTimer(clock, timerId, ttype) {
+        if (!timerId) {
+            // null appears to be allowed in most browsers, and appears to be
+            // relied upon by some libraries, like Bootstrap carousel
+            return;
+        }
+
+        if (!clock.timers) {
+            clock.timers = {};
+        }
+
+        // in Node, timerId is an object with .ref()/.unref(), and
+        // its .id field is the actual timer id.
+        var id = typeof timerId === "object" ? timerId.id : timerId;
+
+        if (clock.timers.hasOwnProperty(id)) {
+            // check that the ID matches a timer of the correct type
+            var timer = clock.timers[id];
+            if (timer.type === ttype) {
+                delete clock.timers[id];
+            } else {
+                var clear =
+                    ttype === "AnimationFrame"
+                        ? "cancelAnimationFrame"
+                        : "clear" + ttype;
+                var schedule =
+                    timer.type === "AnimationFrame"
+                        ? "requestAnimationFrame"
+                        : "set" + timer.type;
+                throw new Error(
+                    "Cannot clear timer: timer created with " +
+                        schedule +
+                        "() but cleared with " +
+                        clear +
+                        "()"
+                );
+            }
+        }
+    }
+
+    function uninstall(clock, target, config) {
+        var method, i, l;
+        var installedHrTime = "_hrtime";
+        var installedNextTick = "_nextTick";
+
+        for (i = 0, l = clock.methods.length; i < l; i++) {
+            method = clock.methods[i];
+            if (method === "hrtime" && target.process) {
+                target.process.hrtime = clock[installedHrTime];
+            } else if (method === "nextTick" && target.process) {
+                target.process.nextTick = clock[installedNextTick];
+            } else if (method === "performance") {
+                var originalPerfDescriptor = Object.getOwnPropertyDescriptor(
+                    clock,
+                    "_" + method
+                );
+                if (
+                    originalPerfDescriptor &&
+                    originalPerfDescriptor.get &&
+                    !originalPerfDescriptor.set
+                ) {
+                    Object.defineProperty(
+                        target,
+                        method,
+                        originalPerfDescriptor
+                    );
+                } else if (originalPerfDescriptor.configurable) {
+                    target[method] = clock["_" + method];
+                }
+            } else {
+                if (target[method] && target[method].hadOwnProperty) {
+                    target[method] = clock["_" + method];
+                    if (
+                        method === "clearInterval" &&
+                        config.shouldAdvanceTime === true
+                    ) {
+                        target[method](clock.attachedInterval);
+                    }
+                } else {
+                    try {
+                        delete target[method];
+                    } catch (ignore) {
+                        /* eslint no-empty: "off" */
+                    }
+                }
+            }
+        }
+
+        // Prevent multiple executions which will completely remove these props
+        clock.methods = [];
+
+        // return pending timers, to enable checking what timers remained on uninstall
+        if (!clock.timers) {
+            return [];
+        }
+        return Object.keys(clock.timers).map(function mapper(key) {
+            return clock.timers[key];
+        });
+    }
+
+    function hijackMethod(target, method, clock) {
+        var prop;
+        clock[method].hadOwnProperty = Object.prototype.hasOwnProperty.call(
+            target,
+            method
+        );
+        clock["_" + method] = target[method];
+
+        if (method === "Date") {
+            var date = mirrorDateProperties(clock[method], target[method]);
+            target[method] = date;
+        } else if (method === "performance") {
+            var originalPerfDescriptor = Object.getOwnPropertyDescriptor(
+                target,
+                method
+            );
+            // JSDOM has a read only performance field so we have to save/copy it differently
+            if (
+                originalPerfDescriptor &&
+                originalPerfDescriptor.get &&
+                !originalPerfDescriptor.set
+            ) {
+                Object.defineProperty(
+                    clock,
+                    "_" + method,
+                    originalPerfDescriptor
+                );
+
+                var perfDescriptor = Object.getOwnPropertyDescriptor(
+                    clock,
+                    method
+                );
+                Object.defineProperty(target, method, perfDescriptor);
+            } else {
+                target[method] = clock[method];
+            }
+        } else {
+            target[method] = function() {
+                return clock[method].apply(clock, arguments);
+            };
+
+            for (prop in clock[method]) {
+                if (clock[method].hasOwnProperty(prop)) {
+                    target[method][prop] = clock[method][prop];
+                }
+            }
+        }
+
+        target[method].clock = clock;
+    }
+
+    function doIntervalTick(clock, advanceTimeDelta) {
+        clock.tick(advanceTimeDelta);
+    }
+
+    var timers = {
+        setTimeout: _global.setTimeout,
+        clearTimeout: _global.clearTimeout,
+        setInterval: _global.setInterval,
+        clearInterval: _global.clearInterval,
+        Date: _global.Date
+    };
+
+    if (setImmediatePresent) {
+        timers.setImmediate = _global.setImmediate;
+        timers.clearImmediate = _global.clearImmediate;
+    }
+
+    if (hrtimePresent) {
+        timers.hrtime = _global.process.hrtime;
+    }
+
+    if (nextTickPresent) {
+        timers.nextTick = _global.process.nextTick;
+    }
+
+    if (performancePresent) {
+        timers.performance = _global.performance;
+    }
+
+    if (requestAnimationFramePresent) {
+        timers.requestAnimationFrame = _global.requestAnimationFrame;
+    }
+
+    if (queueMicrotaskPresent) {
+        timers.queueMicrotask = true;
+    }
+
+    if (cancelAnimationFramePresent) {
+        timers.cancelAnimationFrame = _global.cancelAnimationFrame;
+    }
+
+    if (requestIdleCallbackPresent) {
+        timers.requestIdleCallback = _global.requestIdleCallback;
+    }
+
+    if (cancelIdleCallbackPresent) {
+        timers.cancelIdleCallback = _global.cancelIdleCallback;
+    }
+
+    var keys =
+        Object.keys ||
+        function(obj) {
+            var ks = [];
+            var key;
+
+            for (key in obj) {
+                if (obj.hasOwnProperty(key)) {
+                    ks.push(key);
+                }
+            }
+
+            return ks;
+        };
+
+    var originalSetTimeout = _global.setImmediate || _global.setTimeout;
+
+    /**
+     * @param start {Date|number} the system time - non-integer values are floored
+     * @param loopLimit {number}  maximum number of timers that will be run when calling runAll()
+     */
+    function createClock(start, loopLimit) {
+        // eslint-disable-next-line no-param-reassign
+        start = Math.floor(getEpoch(start));
+        // eslint-disable-next-line no-param-reassign
+        loopLimit = loopLimit || 1000;
+        var nanos = 0;
+        var adjustedSystemTime = [0, 0]; // [millis, nanoremainder]
+
+        if (NativeDate === undefined) {
+            throw new Error(
+                "The global scope doesn't have a `Date` object" +
+                    " (see https://github.com/sinonjs/sinon/issues/1852#issuecomment-419622780)"
+            );
+        }
+
+        var clock = {
+            now: start,
+            timeouts: {},
+            Date: createDate(),
+            loopLimit: loopLimit
+        };
+
+        clock.Date.clock = clock;
+
+        function getTimeToNextFrame() {
+            return 16 - ((clock.now - start) % 16);
+        }
+
+        function hrtime(prev) {
+            var millisSinceStart = clock.now - adjustedSystemTime[0] - start;
+            var secsSinceStart = Math.floor(millisSinceStart / 1000);
+            var remainderInNanos =
+                (millisSinceStart - secsSinceStart * 1e3) * 1e6 +
+                nanos -
+                adjustedSystemTime[1];
+
+            if (Array.isArray(prev)) {
+                if (prev[1] > 1e9) {
+                    throw new TypeError(
+                        "Number of nanoseconds can't exceed a billion"
+                    );
+                }
+
+                var oldSecs = prev[0];
+                var nanoDiff = remainderInNanos - prev[1];
+                var secDiff = secsSinceStart - oldSecs;
+
+                if (nanoDiff < 0) {
+                    nanoDiff += 1e9;
+                    secDiff -= 1;
+                }
+
+                return [secDiff, nanoDiff];
+            }
+            return [secsSinceStart, remainderInNanos];
+        }
+
+        if (hrtimeBigintPresent) {
+            hrtime.bigint = function() {
+                var parts = hrtime();
+                return BigInt(parts[0]) * BigInt(1e9) + BigInt(parts[1]); // eslint-disable-line
+            };
+        }
+
+        clock.requestIdleCallback = function requestIdleCallback(
+            func,
+            timeout
+        ) {
+            var timeToNextIdlePeriod = 0;
+
+            if (clock.countTimers() > 0) {
+                timeToNextIdlePeriod = 50; // const for now
+            }
+
+            var result = addTimer(clock, {
+                func: func,
+                args: Array.prototype.slice.call(arguments, 2),
+                delay:
+                    typeof timeout === "undefined"
+                        ? timeToNextIdlePeriod
+                        : Math.min(timeout, timeToNextIdlePeriod)
+            });
+
+            return result.id || result;
+        };
+
+        clock.cancelIdleCallback = function cancelIdleCallback(timerId) {
+            return clearTimer(clock, timerId, "Timeout");
+        };
+
+        clock.setTimeout = function setTimeout(func, timeout) {
+            return addTimer(clock, {
+                func: func,
+                args: Array.prototype.slice.call(arguments, 2),
+                delay: timeout
+            });
+        };
+        if (typeof _global.Promise !== "undefined" && utilPromisify) {
+            clock.setTimeout[
+                utilPromisify.custom
+            ] = function promisifiedSetTimeout(timeout, arg) {
+                return new _global.Promise(function setTimeoutExecutor(
+                    resolve
+                ) {
+                    addTimer(clock, {
+                        func: resolve,
+                        args: [arg],
+                        delay: timeout
+                    });
+                });
+            };
+        }
+
+        clock.clearTimeout = function clearTimeout(timerId) {
+            return clearTimer(clock, timerId, "Timeout");
+        };
+
+        clock.nextTick = function nextTick(func) {
+            return enqueueJob(clock, {
+                func: func,
+                args: Array.prototype.slice.call(arguments, 1)
+            });
+        };
+
+        clock.queueMicrotask = function queueMicrotask(func) {
+            return clock.nextTick(func); // explicitly drop additional arguments
+        };
+
+        clock.setInterval = function setInterval(func, timeout) {
+            // eslint-disable-next-line no-param-reassign
+            timeout = parseInt(timeout, 10);
+            return addTimer(clock, {
+                func: func,
+                args: Array.prototype.slice.call(arguments, 2),
+                delay: timeout,
+                interval: timeout
+            });
+        };
+
+        clock.clearInterval = function clearInterval(timerId) {
+            return clearTimer(clock, timerId, "Interval");
+        };
+
+        if (setImmediatePresent) {
+            clock.setImmediate = function setImmediate(func) {
+                return addTimer(clock, {
+                    func: func,
+                    args: Array.prototype.slice.call(arguments, 1),
+                    immediate: true
+                });
+            };
+
+            if (typeof _global.Promise !== "undefined" && utilPromisify) {
+                clock.setImmediate[
+                    utilPromisify.custom
+                ] = function promisifiedSetImmediate(arg) {
+                    return new _global.Promise(function setImmediateExecutor(
+                        resolve
+                    ) {
+                        addTimer(clock, {
+                            func: resolve,
+                            args: [arg],
+                            immediate: true
+                        });
+                    });
+                };
+            }
+
+            clock.clearImmediate = function clearImmediate(timerId) {
+                return clearTimer(clock, timerId, "Immediate");
+            };
+        }
+
+        clock.countTimers = function countTimers() {
+            return (
+                Object.keys(clock.timers || {}).length +
+                (clock.jobs || []).length
+            );
+        };
+
+        clock.requestAnimationFrame = function requestAnimationFrame(func) {
+            var result = addTimer(clock, {
+                func: func,
+                delay: getTimeToNextFrame(),
+                args: [clock.now + getTimeToNextFrame()],
+                animation: true
+            });
+
+            return result.id || result;
+        };
+
+        clock.cancelAnimationFrame = function cancelAnimationFrame(timerId) {
+            return clearTimer(clock, timerId, "AnimationFrame");
+        };
+
+        clock.runMicrotasks = function runMicrotasks() {
+            runJobs(clock);
+        };
+
+        function doTick(tickValue, isAsync, resolve, reject) {
+            var msFloat =
+                typeof tickValue === "number"
+                    ? tickValue
+                    : parseTime(tickValue);
+            var ms = Math.floor(msFloat);
+            var remainder = nanoRemainder(msFloat);
+            var nanosTotal = nanos + remainder;
+            var tickTo = clock.now + ms;
+
+            if (msFloat < 0) {
+                throw new TypeError("Negative ticks are not supported");
+            }
+
+            // adjust for positive overflow
+            if (nanosTotal >= 1e6) {
+                tickTo += 1;
+                nanosTotal -= 1e6;
+            }
+
+            nanos = nanosTotal;
+            var tickFrom = clock.now;
+            var previous = clock.now;
+            var timer,
+                firstException,
+                oldNow,
+                nextPromiseTick,
+                compensationCheck,
+                postTimerCall;
+
+            clock.duringTick = true;
+
+            // perform microtasks
+            oldNow = clock.now;
+            runJobs(clock);
+            if (oldNow !== clock.now) {
+                // compensate for any setSystemTime() call during microtask callback
+                tickFrom += clock.now - oldNow;
+                tickTo += clock.now - oldNow;
+            }
+
+            function doTickInner() {
+                // perform each timer in the requested range
+                timer = firstTimerInRange(clock, tickFrom, tickTo);
+                // eslint-disable-next-line no-unmodified-loop-condition
+                while (timer && tickFrom <= tickTo) {
+                    if (clock.timers[timer.id]) {
+                        tickFrom = timer.callAt;
+                        clock.now = timer.callAt;
+                        oldNow = clock.now;
+                        try {
+                            runJobs(clock);
+                            callTimer(clock, timer);
+                        } catch (e) {
+                            firstException = firstException || e;
+                        }
+
+                        if (isAsync) {
+                            // finish up after native setImmediate callback to allow
+                            // all native es6 promises to process their callbacks after
+                            // each timer fires.
+                            originalSetTimeout(nextPromiseTick);
+                            return;
+                        }
+
+                        compensationCheck();
+                    }
+
+                    postTimerCall();
+                }
+
+                // perform process.nextTick()s again
+                oldNow = clock.now;
+                runJobs(clock);
+                if (oldNow !== clock.now) {
+                    // compensate for any setSystemTime() call during process.nextTick() callback
+                    tickFrom += clock.now - oldNow;
+                    tickTo += clock.now - oldNow;
+                }
+                clock.duringTick = false;
+
+                // corner case: during runJobs new timers were scheduled which could be in the range [clock.now, tickTo]
+                timer = firstTimerInRange(clock, tickFrom, tickTo);
+                if (timer) {
+                    try {
+                        clock.tick(tickTo - clock.now); // do it all again - for the remainder of the requested range
+                    } catch (e) {
+                        firstException = firstException || e;
+                    }
+                } else {
+                    // no timers remaining in the requested range: move the clock all the way to the end
+                    clock.now = tickTo;
+
+                    // update nanos
+                    nanos = nanosTotal;
+                }
+                if (firstException) {
+                    throw firstException;
+                }
+
+                if (isAsync) {
+                    resolve(clock.now);
+                } else {
+                    return clock.now;
+                }
+            }
+
+            nextPromiseTick =
+                isAsync &&
+                function() {
+                    try {
+                        compensationCheck();
+                        postTimerCall();
+                        doTickInner();
+                    } catch (e) {
+                        reject(e);
+                    }
+                };
+
+            compensationCheck = function() {
+                // compensate for any setSystemTime() call during timer callback
+                if (oldNow !== clock.now) {
+                    tickFrom += clock.now - oldNow;
+                    tickTo += clock.now - oldNow;
+                    previous += clock.now - oldNow;
+                }
+            };
+
+            postTimerCall = function() {
+                timer = firstTimerInRange(clock, previous, tickTo);
+                previous = tickFrom;
+            };
+
+            return doTickInner();
+        }
+
+        /**
+         * @param {tickValue} {String|Number} number of milliseconds or a human-readable value like "01:11:15"
+         */
+        clock.tick = function tick(tickValue) {
+            return doTick(tickValue, false);
+        };
+
+        if (typeof _global.Promise !== "undefined") {
+            clock.tickAsync = function tickAsync(ms) {
+                return new _global.Promise(function(resolve, reject) {
+                    originalSetTimeout(function() {
+                        try {
+                            doTick(ms, true, resolve, reject);
+                        } catch (e) {
+                            reject(e);
+                        }
+                    });
+                });
+            };
+        }
+
+        clock.next = function next() {
+            runJobs(clock);
+            var timer = firstTimer(clock);
+            if (!timer) {
+                return clock.now;
+            }
+
+            clock.duringTick = true;
+            try {
+                clock.now = timer.callAt;
+                callTimer(clock, timer);
+                runJobs(clock);
+                return clock.now;
+            } finally {
+                clock.duringTick = false;
+            }
+        };
+
+        if (typeof _global.Promise !== "undefined") {
+            clock.nextAsync = function nextAsync() {
+                return new _global.Promise(function(resolve, reject) {
+                    originalSetTimeout(function() {
+                        try {
+                            var timer = firstTimer(clock);
+                            if (!timer) {
+                                resolve(clock.now);
+                                return;
+                            }
+
+                            var err;
+                            clock.duringTick = true;
+                            clock.now = timer.callAt;
+                            try {
+                                callTimer(clock, timer);
+                            } catch (e) {
+                                err = e;
+                            }
+                            clock.duringTick = false;
+
+                            originalSetTimeout(function() {
+                                if (err) {
+                                    reject(err);
+                                } else {
+                                    resolve(clock.now);
+                                }
+                            });
+                        } catch (e) {
+                            reject(e);
+                        }
+                    });
+                });
+            };
+        }
+
+        clock.runAll = function runAll() {
+            var numTimers, i;
+            runJobs(clock);
+            for (i = 0; i < clock.loopLimit; i++) {
+                if (!clock.timers) {
+                    return clock.now;
+                }
+
+                numTimers = keys(clock.timers).length;
+                if (numTimers === 0) {
+                    return clock.now;
+                }
+
+                clock.next();
+            }
+
+            throw new Error(
+                "Aborting after running " +
+                    clock.loopLimit +
+                    " timers, assuming an infinite loop!"
+            );
+        };
+
+        clock.runToFrame = function runToFrame() {
+            return clock.tick(getTimeToNextFrame());
+        };
+
+        if (typeof _global.Promise !== "undefined") {
+            clock.runAllAsync = function runAllAsync() {
+                return new _global.Promise(function(resolve, reject) {
+                    var i = 0;
+                    function doRun() {
+                        originalSetTimeout(function() {
+                            try {
+                                var numTimers;
+                                if (i < clock.loopLimit) {
+                                    if (!clock.timers) {
+                                        resolve(clock.now);
+                                        return;
+                                    }
+
+                                    numTimers = Object.keys(clock.timers)
+                                        .length;
+                                    if (numTimers === 0) {
+                                        resolve(clock.now);
+                                        return;
+                                    }
+
+                                    clock.next();
+
+                                    i++;
+
+                                    doRun();
+                                    return;
+                                }
+
+                                reject(
+                                    new Error(
+                                        "Aborting after running " +
+                                            clock.loopLimit +
+                                            " timers, assuming an infinite loop!"
+                                    )
+                                );
+                            } catch (e) {
+                                reject(e);
+                            }
+                        });
+                    }
+                    doRun();
+                });
+            };
+        }
+
+        clock.runToLast = function runToLast() {
+            var timer = lastTimer(clock);
+            if (!timer) {
+                runJobs(clock);
+                return clock.now;
+            }
+
+            return clock.tick(timer.callAt - clock.now);
+        };
+
+        if (typeof _global.Promise !== "undefined") {
+            clock.runToLastAsync = function runToLastAsync() {
+                return new _global.Promise(function(resolve, reject) {
+                    originalSetTimeout(function() {
+                        try {
+                            var timer = lastTimer(clock);
+                            if (!timer) {
+                                resolve(clock.now);
+                            }
+
+                            resolve(clock.tickAsync(timer.callAt));
+                        } catch (e) {
+                            reject(e);
+                        }
+                    });
+                });
+            };
+        }
+
+        clock.reset = function reset() {
+            nanos = 0;
+            clock.timers = {};
+            clock.jobs = [];
+            clock.now = start;
+        };
+
+        clock.setSystemTime = function setSystemTime(systemTime) {
+            // determine time difference
+            var newNow = getEpoch(systemTime);
+            var difference = newNow - clock.now;
+            var id, timer;
+
+            adjustedSystemTime[0] = adjustedSystemTime[0] + difference;
+            adjustedSystemTime[1] = adjustedSystemTime[1] + nanos;
+            // update 'system clock'
+            clock.now = newNow;
+            nanos = 0;
+
+            // update timers and intervals to keep them stable
+            for (id in clock.timers) {
+                if (clock.timers.hasOwnProperty(id)) {
+                    timer = clock.timers[id];
+                    timer.createdAt += difference;
+                    timer.callAt += difference;
+                }
+            }
+        };
+
+        if (performancePresent) {
+            clock.performance = Object.create(null);
+
+            if (hasPerformancePrototype) {
+                var proto = _global.Performance.prototype;
+
+                Object.getOwnPropertyNames(proto).forEach(function(name) {
+                    if (name.indexOf("getEntries") === 0) {
+                        // match expected return type for getEntries functions
+                        clock.performance[name] = NOOP_ARRAY;
+                    } else {
+                        clock.performance[name] = NOOP;
+                    }
+                });
+            }
+
+            clock.performance.now = function FakeTimersNow() {
+                var hrt = hrtime();
+                var millis = hrt[0] * 1000 + hrt[1] / 1e6;
+                return millis;
+            };
+        }
+
+        if (hrtimePresent) {
+            clock.hrtime = hrtime;
+        }
+
+        return clock;
+    }
+
+    /**
+     * @param config {Object} optional config
+     * @param config.target {Object} the target to install timers in (default `window`)
+     * @param config.now {number|Date}  a number (in milliseconds) or a Date object (default epoch)
+     * @param config.toFake {string[]} names of the methods that should be faked.
+     * @param config.loopLimit {number} the maximum number of timers that will be run when calling runAll()
+     * @param config.shouldAdvanceTime {Boolean} tells FakeTimers to increment mocked time automatically (default false)
+     * @param config.advanceTimeDelta {Number} increment mocked time every <<advanceTimeDelta>> ms (default: 20ms)
+     */
+    // eslint-disable-next-line complexity
+    function install(config) {
+        if (
+            arguments.length > 1 ||
+            config instanceof Date ||
+            Array.isArray(config) ||
+            typeof config === "number"
+        ) {
+            throw new TypeError(
+                "FakeTimers.install called with " +
+                    String(config) +
+                    " install requires an object parameter"
+            );
+        }
+
+        // eslint-disable-next-line no-param-reassign
+        config = typeof config !== "undefined" ? config : {};
+        config.shouldAdvanceTime = config.shouldAdvanceTime || false;
+        config.advanceTimeDelta = config.advanceTimeDelta || 20;
+
+        var i, l;
+        var target = config.target || _global;
+        var clock = createClock(config.now, config.loopLimit);
+
+        clock.uninstall = function() {
+            return uninstall(clock, target, config);
+        };
+
+        clock.methods = config.toFake || [];
+
+        if (clock.methods.length === 0) {
+            // do not fake nextTick by default - GitHub#126
+            clock.methods = keys(timers).filter(function(key) {
+                return key !== "nextTick" && key !== "queueMicrotask";
+            });
+        }
+
+        for (i = 0, l = clock.methods.length; i < l; i++) {
+            if (clock.methods[i] === "hrtime") {
+                if (
+                    target.process &&
+                    typeof target.process.hrtime === "function"
+                ) {
+                    hijackMethod(target.process, clock.methods[i], clock);
+                }
+            } else if (clock.methods[i] === "nextTick") {
+                if (
+                    target.process &&
+                    typeof target.process.nextTick === "function"
+                ) {
+                    hijackMethod(target.process, clock.methods[i], clock);
+                }
+            } else {
+                if (
+                    clock.methods[i] === "setInterval" &&
+                    config.shouldAdvanceTime === true
+                ) {
+                    var intervalTick = doIntervalTick.bind(
+                        null,
+                        clock,
+                        config.advanceTimeDelta
+                    );
+                    var intervalId = target[clock.methods[i]](
+                        intervalTick,
+                        config.advanceTimeDelta
+                    );
+                    clock.attachedInterval = intervalId;
+                }
+                hijackMethod(target, clock.methods[i], clock);
+            }
+        }
+
+        return clock;
+    }
+
+    return {
+        timers: timers,
+        createClock: createClock,
+        install: install,
+        withGlobal: withGlobal
+    };
+}
+
+var defaultImplementation = withGlobal(globalObject);
+
+exports.timers = defaultImplementation.timers;
+exports.createClock = defaultImplementation.createClock;
+exports.install = defaultImplementation.install;
+exports.withGlobal = withGlobal;
+
+},{"@sinonjs/commons":44,"util":134}],57:[function(require,module,exports){
+"use strict";
+
+var samsam = require("@sinonjs/samsam");
+var functionName = require("@sinonjs/commons").functionName;
+var typeOf = require("@sinonjs/commons").typeOf;
+
+var formatio = {
+    excludeConstructors: ["Object", /^.$/],
+    quoteStrings: true,
+    limitChildrenCount: 0
+};
+
+var specialObjects = [];
+/* istanbul ignore else */
+if (typeof global !== "undefined") {
+    specialObjects.push({ object: global, value: "[object global]" });
+}
+if (typeof document !== "undefined") {
+    specialObjects.push({
+        object: document,
+        value: "[object HTMLDocument]"
+    });
+}
+if (typeof window !== "undefined") {
+    specialObjects.push({ object: window, value: "[object Window]" });
+}
+
+function constructorName(f, object) {
+    var name = functionName(object && object.constructor);
+    var excludes = f.excludeConstructors || formatio.excludeConstructors;
+
+    var i, l;
+    for (i = 0, l = excludes.length; i < l; ++i) {
+        if (typeof excludes[i] === "string" && excludes[i] === name) {
+            return "";
+        } else if (excludes[i].test && excludes[i].test(name)) {
+            return "";
+        }
+    }
+
+    return name;
+}
+
+function isCircular(object, objects) {
+    if (typeof object !== "object") {
+        return false;
+    }
+    var i, l;
+    for (i = 0, l = objects.length; i < l; ++i) {
+        if (objects[i] === object) {
+            return true;
+        }
+    }
+    return false;
+}
+
+// eslint-disable-next-line complexity
+function ascii(f, object, processed, indent) {
+    if (typeof object === "string") {
+        if (object.length === 0) {
+            return "(empty string)";
+        }
+        var qs = f.quoteStrings;
+        var quote = typeof qs !== "boolean" || qs;
+        // eslint-disable-next-line quotes
+        return processed || quote ? '"' + object + '"' : object;
+    }
+
+    if (typeof object === "symbol") {
+        return object.toString();
+    }
+
+    if (typeof object === "function" && !(object instanceof RegExp)) {
+        return ascii.func(object);
+    }
+
+    // eslint supports bigint as of version 6.0.0
+    // https://github.com/eslint/eslint/commit/e4ab0531c4e44c23494c6a802aa2329d15ac90e5
+    // eslint-disable-next-line
+    if (typeOf(object) === "bigint") {
+        return object.toString();
+    }
+
+    var internalProcessed = processed || [];
+
+    if (isCircular(object, internalProcessed)) {
+        return "[Circular]";
+    }
+
+    if (typeOf(object) === "array") {
+        return ascii.array.call(f, object, internalProcessed);
+    }
+
+    if (!object) {
+        return String(1 / object === -Infinity ? "-0" : object);
+    }
+    if (samsam.isElement(object)) {
+        return ascii.element(object);
+    }
+
+    if (
+        typeof object.toString === "function" &&
+        object.toString !== Object.prototype.toString
+    ) {
+        return object.toString();
+    }
+
+    var i, l;
+    for (i = 0, l = specialObjects.length; i < l; i++) {
+        if (object === specialObjects[i].object) {
+            return specialObjects[i].value;
+        }
+    }
+
+    if (samsam.isSet(object)) {
+        return ascii.set.call(f, object, internalProcessed);
+    }
+
+    if (object instanceof Map) {
+        return ascii.map.call(f, object, internalProcessed);
+    }
+
+    return ascii.object.call(f, object, internalProcessed, indent);
+}
+
+ascii.func = function(func) {
+    var funcName = functionName(func) || "";
+    return "function " + funcName + "() {}";
+};
+
+function delimit(str, delimiters) {
+    var delims = delimiters || ["[", "]"];
+    return delims[0] + str + delims[1];
+}
+
+ascii.array = function(array, processed, delimiters) {
+    processed.push(array);
+    var pieces = [];
+    var i, l;
+    l =
+        this.limitChildrenCount > 0
+            ? Math.min(this.limitChildrenCount, array.length)
+            : array.length;
+
+    for (i = 0; i < l; ++i) {
+        pieces.push(ascii(this, array[i], processed));
+    }
+
+    if (l < array.length) {
+        pieces.push("[... " + (array.length - l) + " more elements]");
+    }
+
+    return delimit(pieces.join(", "), delimiters);
+};
+
+ascii.set = function(set, processed) {
+    return ascii.array.call(this, Array.from(set), processed, ["Set {", "}"]);
+};
+
+ascii.map = function(map, processed) {
+    return ascii.array.call(this, Array.from(map), processed, ["Map [", "]"]);
+};
+
+function getSymbols(object) {
+    if (samsam.isArguments(object)) {
+        return [];
+    }
+
+    /* istanbul ignore else */
+    if (typeof Object.getOwnPropertySymbols === "function") {
+        return Object.getOwnPropertySymbols(object);
+    }
+
+    /* istanbul ignore next: This is only for IE, since getOwnPropertySymbols
+     * does not exist on Object there
+     */
+    return [];
+}
+
+ascii.object = function(object, processed, indent) {
+    processed.push(object);
+    var internalIndent = indent || 0;
+    var pieces = [];
+    var properties = Object.keys(object)
+        .sort()
+        .concat(getSymbols(object));
+    var length = 3;
+    var prop, str, obj, i, k, l;
+    l =
+        this.limitChildrenCount > 0
+            ? Math.min(this.limitChildrenCount, properties.length)
+            : properties.length;
+
+    for (i = 0; i < l; ++i) {
+        prop = properties[i];
+        obj = object[prop];
+
+        if (isCircular(obj, processed)) {
+            str = "[Circular]";
+        } else {
+            str = ascii(this, obj, processed, internalIndent + 2);
+        }
+
+        str =
+            (typeof prop === "string" && /\s/.test(prop)
+                ? // eslint-disable-next-line quotes
+                  '"' + prop + '"'
+                : prop.toString()) +
+            ": " +
+            str;
+        length += str.length;
+        pieces.push(str);
+    }
+
+    var cons = constructorName(this, object);
+    var prefix = cons ? "[" + cons + "] " : "";
+    var is = "";
+    for (i = 0, k = internalIndent; i < k; ++i) {
+        is += " ";
+    }
+
+    if (l < properties.length) {
+        pieces.push("[... " + (properties.length - l) + " more elements]");
+    }
+
+    if (length + internalIndent > 80) {
+        return (
+            prefix + "{\n  " + is + pieces.join(",\n  " + is) + "\n" + is + "}"
+        );
+    }
+    return prefix + "{ " + pieces.join(", ") + " }";
+};
+
+ascii.element = function(element) {
+    var tagName = element.tagName.toLowerCase();
+    var attrs = element.attributes;
+    var pairs = [];
+    var attr, attrName, i, l, val;
+
+    for (i = 0, l = attrs.length; i < l; ++i) {
+        attr = attrs.item(i);
+        attrName = attr.nodeName.toLowerCase().replace("html:", "");
+        val = attr.nodeValue;
+        if (attrName !== "contenteditable" || val !== "inherit") {
+            if (val) {
+                // eslint-disable-next-line quotes
+                pairs.push(attrName + '="' + val + '"');
+            }
+        }
+    }
+
+    var formatted = "<" + tagName + (pairs.length > 0 ? " " : "");
+    // SVG elements have undefined innerHTML
+    var content = element.innerHTML || "";
+
+    if (content.length > 20) {
+        content = content.substr(0, 20) + "[...]";
+    }
+
+    var res =
+        formatted + pairs.join(" ") + ">" + content + "</" + tagName + ">";
+
+    return res.replace(/ contentEditable="inherit"/, "");
+};
+
+function Formatio(options) {
+    // eslint-disable-next-line guard-for-in
+    for (var opt in options) {
+        this[opt] = options[opt];
+    }
+}
+
+Formatio.prototype = {
+    functionName: functionName,
+
+    configure: function(options) {
+        return new Formatio(options);
+    },
+
+    constructorName: function(object) {
+        return constructorName(this, object);
+    },
+
+    ascii: function(object, processed, indent) {
+        return ascii(this, object, processed, indent);
+    }
+};
+
+module.exports = Formatio.prototype;
+
+},{"@sinonjs/commons":44,"@sinonjs/samsam":83}],58:[function(require,module,exports){
+"use strict";
+
+var ARRAY_TYPES = [
+    Array,
+    Int8Array,
+    Uint8Array,
+    Uint8ClampedArray,
+    Int16Array,
+    Uint16Array,
+    Int32Array,
+    Uint32Array,
+    Float32Array,
+    Float64Array
+];
+
+module.exports = ARRAY_TYPES;
+
+},{}],59:[function(require,module,exports){
+"use strict";
+
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var deepEqual = require("./deep-equal").use(createMatcher); // eslint-disable-line no-use-before-define
+var every = require("@sinonjs/commons").every;
+var functionName = require("@sinonjs/commons").functionName;
+var get = require("lodash.get");
+var iterableToString = require("./iterable-to-string");
+var objectProto = require("@sinonjs/commons").prototypes.object;
+var typeOf = require("@sinonjs/commons").typeOf;
+var valueToString = require("@sinonjs/commons").valueToString;
+
+var assertMatcher = require("./create-matcher/assert-matcher");
+var assertMethodExists = require("./create-matcher/assert-method-exists");
+var assertType = require("./create-matcher/assert-type");
+var isIterable = require("./create-matcher/is-iterable");
+var isMatcher = require("./create-matcher/is-matcher");
+
+var matcherPrototype = require("./create-matcher/matcher-prototype");
+
+var arrayIndexOf = arrayProto.indexOf;
+var some = arrayProto.some;
+
+var hasOwnProperty = objectProto.hasOwnProperty;
+var objectToString = objectProto.toString;
+
+var TYPE_MAP = require("./create-matcher/type-map")(createMatcher); // eslint-disable-line no-use-before-define
+
+/**
+ * Creates a matcher object for the passed expectation
+ *
+ * @alias module:samsam.createMatcher
+ * @param {*} expectation An expecttation
+ * @param {string} message A message for the expectation
+ * @returns {object} A matcher object
+ */
+function createMatcher(expectation, message) {
+    var m = Object.create(matcherPrototype);
+    var type = typeOf(expectation);
+
+    if (message !== undefined && typeof message !== "string") {
+        throw new TypeError("Message should be a string");
+    }
+
+    if (arguments.length > 2) {
+        throw new TypeError(
+            "Expected 1 or 2 arguments, received " + arguments.length
+        );
+    }
+
+    if (type in TYPE_MAP) {
+        TYPE_MAP[type](m, expectation, message);
+    } else {
+        m.test = function(actual) {
+            return deepEqual(actual, expectation);
+        };
+    }
+
+    if (!m.message) {
+        m.message = "match(" + valueToString(expectation) + ")";
+    }
+
+    return m;
+}
+
+createMatcher.isMatcher = isMatcher;
+
+createMatcher.any = createMatcher(function() {
+    return true;
+}, "any");
+
+createMatcher.defined = createMatcher(function(actual) {
+    return actual !== null && actual !== undefined;
+}, "defined");
+
+createMatcher.truthy = createMatcher(function(actual) {
+    return Boolean(actual);
+}, "truthy");
+
+createMatcher.falsy = createMatcher(function(actual) {
+    return !actual;
+}, "falsy");
+
+createMatcher.same = function(expectation) {
+    return createMatcher(function(actual) {
+        return expectation === actual;
+    }, "same(" + valueToString(expectation) + ")");
+};
+
+createMatcher.in = function(arrayOfExpectations) {
+    if (typeOf(arrayOfExpectations) !== "array") {
+        throw new TypeError("array expected");
+    }
+
+    return createMatcher(function(actual) {
+        return some(arrayOfExpectations, function(expectation) {
+            return expectation === actual;
+        });
+    }, "in(" + valueToString(arrayOfExpectations) + ")");
+};
+
+createMatcher.typeOf = function(type) {
+    assertType(type, "string", "type");
+    return createMatcher(function(actual) {
+        return typeOf(actual) === type;
+    }, 'typeOf("' + type + '")');
+};
+
+createMatcher.instanceOf = function(type) {
+    /* istanbul ignore if */
+    if (
+        typeof Symbol === "undefined" ||
+        typeof Symbol.hasInstance === "undefined"
+    ) {
+        assertType(type, "function", "type");
+    } else {
+        assertMethodExists(
+            type,
+            Symbol.hasInstance,
+            "type",
+            "[Symbol.hasInstance]"
+        );
+    }
+    return createMatcher(function(actual) {
+        return actual instanceof type;
+    }, "instanceOf(" + (functionName(type) || objectToString(type)) + ")");
+};
+
+/**
+ * Creates a property matcher
+ *
+ * @private
+ * @param {Function} propertyTest A function to test the property against a value
+ * @param {string} messagePrefix A prefix to use for messages generated by the matcher
+ * @returns {object} A matcher
+ */
+function createPropertyMatcher(propertyTest, messagePrefix) {
+    return function(property, value) {
+        assertType(property, "string", "property");
+        var onlyProperty = arguments.length === 1;
+        var message = messagePrefix + '("' + property + '"';
+        if (!onlyProperty) {
+            message += ", " + valueToString(value);
+        }
+        message += ")";
+        return createMatcher(function(actual) {
+            if (
+                actual === undefined ||
+                actual === null ||
+                !propertyTest(actual, property)
+            ) {
+                return false;
+            }
+            return onlyProperty || deepEqual(actual[property], value);
+        }, message);
+    };
+}
+
+createMatcher.has = createPropertyMatcher(function(actual, property) {
+    if (typeof actual === "object") {
+        return property in actual;
+    }
+    return actual[property] !== undefined;
+}, "has");
+
+createMatcher.hasOwn = createPropertyMatcher(function(actual, property) {
+    return hasOwnProperty(actual, property);
+}, "hasOwn");
+
+createMatcher.hasNested = function(property, value) {
+    assertType(property, "string", "property");
+    var onlyProperty = arguments.length === 1;
+    var message = 'hasNested("' + property + '"';
+    if (!onlyProperty) {
+        message += ", " + valueToString(value);
+    }
+    message += ")";
+    return createMatcher(function(actual) {
+        if (
+            actual === undefined ||
+            actual === null ||
+            get(actual, property) === undefined
+        ) {
+            return false;
+        }
+        return onlyProperty || deepEqual(get(actual, property), value);
+    }, message);
+};
+
+createMatcher.every = function(predicate) {
+    assertMatcher(predicate);
+
+    return createMatcher(function(actual) {
+        if (typeOf(actual) === "object") {
+            return every(Object.keys(actual), function(key) {
+                return predicate.test(actual[key]);
+            });
+        }
+
+        return (
+            isIterable(actual) &&
+            every(actual, function(element) {
+                return predicate.test(element);
+            })
+        );
+    }, "every(" + predicate.message + ")");
+};
+
+createMatcher.some = function(predicate) {
+    assertMatcher(predicate);
+
+    return createMatcher(function(actual) {
+        if (typeOf(actual) === "object") {
+            return !every(Object.keys(actual), function(key) {
+                return !predicate.test(actual[key]);
+            });
+        }
+
+        return (
+            isIterable(actual) &&
+            !every(actual, function(element) {
+                return !predicate.test(element);
+            })
+        );
+    }, "some(" + predicate.message + ")");
+};
+
+createMatcher.array = createMatcher.typeOf("array");
+
+createMatcher.array.deepEquals = function(expectation) {
+    return createMatcher(function(actual) {
+        // Comparing lengths is the fastest way to spot a difference before iterating through every item
+        var sameLength = actual.length === expectation.length;
+        return (
+            typeOf(actual) === "array" &&
+            sameLength &&
+            every(actual, function(element, index) {
+                var expected = expectation[index];
+                return typeOf(expected) === "array" &&
+                    typeOf(element) === "array"
+                    ? createMatcher.array.deepEquals(expected).test(element)
+                    : deepEqual(expected, element);
+            })
+        );
+    }, "deepEquals([" + iterableToString(expectation) + "])");
+};
+
+createMatcher.array.startsWith = function(expectation) {
+    return createMatcher(function(actual) {
+        return (
+            typeOf(actual) === "array" &&
+            every(expectation, function(expectedElement, index) {
+                return actual[index] === expectedElement;
+            })
+        );
+    }, "startsWith([" + iterableToString(expectation) + "])");
+};
+
+createMatcher.array.endsWith = function(expectation) {
+    return createMatcher(function(actual) {
+        // This indicates the index in which we should start matching
+        var offset = actual.length - expectation.length;
+
+        return (
+            typeOf(actual) === "array" &&
+            every(expectation, function(expectedElement, index) {
+                return actual[offset + index] === expectedElement;
+            })
+        );
+    }, "endsWith([" + iterableToString(expectation) + "])");
+};
+
+createMatcher.array.contains = function(expectation) {
+    return createMatcher(function(actual) {
+        return (
+            typeOf(actual) === "array" &&
+            every(expectation, function(expectedElement) {
+                return arrayIndexOf(actual, expectedElement) !== -1;
+            })
+        );
+    }, "contains([" + iterableToString(expectation) + "])");
+};
+
+createMatcher.map = createMatcher.typeOf("map");
+
+createMatcher.map.deepEquals = function mapDeepEquals(expectation) {
+    return createMatcher(function(actual) {
+        // Comparing lengths is the fastest way to spot a difference before iterating through every item
+        var sameLength = actual.size === expectation.size;
+        return (
+            typeOf(actual) === "map" &&
+            sameLength &&
+            every(actual, function(element, key) {
+                return expectation.has(key) && expectation.get(key) === element;
+            })
+        );
+    }, "deepEquals(Map[" + iterableToString(expectation) + "])");
+};
+
+createMatcher.map.contains = function mapContains(expectation) {
+    return createMatcher(function(actual) {
+        return (
+            typeOf(actual) === "map" &&
+            every(expectation, function(element, key) {
+                return actual.has(key) && actual.get(key) === element;
+            })
+        );
+    }, "contains(Map[" + iterableToString(expectation) + "])");
+};
+
+createMatcher.set = createMatcher.typeOf("set");
+
+createMatcher.set.deepEquals = function setDeepEquals(expectation) {
+    return createMatcher(function(actual) {
+        // Comparing lengths is the fastest way to spot a difference before iterating through every item
+        var sameLength = actual.size === expectation.size;
+        return (
+            typeOf(actual) === "set" &&
+            sameLength &&
+            every(actual, function(element) {
+                return expectation.has(element);
+            })
+        );
+    }, "deepEquals(Set[" + iterableToString(expectation) + "])");
+};
+
+createMatcher.set.contains = function setContains(expectation) {
+    return createMatcher(function(actual) {
+        return (
+            typeOf(actual) === "set" &&
+            every(expectation, function(element) {
+                return actual.has(element);
+            })
+        );
+    }, "contains(Set[" + iterableToString(expectation) + "])");
+};
+
+createMatcher.bool = createMatcher.typeOf("boolean");
+createMatcher.number = createMatcher.typeOf("number");
+createMatcher.string = createMatcher.typeOf("string");
+createMatcher.object = createMatcher.typeOf("object");
+createMatcher.func = createMatcher.typeOf("function");
+createMatcher.regexp = createMatcher.typeOf("regexp");
+createMatcher.date = createMatcher.typeOf("date");
+createMatcher.symbol = createMatcher.typeOf("symbol");
+
+module.exports = createMatcher;
+
+},{"./create-matcher/assert-matcher":60,"./create-matcher/assert-method-exists":61,"./create-matcher/assert-type":62,"./create-matcher/is-iterable":63,"./create-matcher/is-matcher":64,"./create-matcher/matcher-prototype":66,"./create-matcher/type-map":67,"./deep-equal":68,"./iterable-to-string":81,"@sinonjs/commons":44,"lodash.get":116}],60:[function(require,module,exports){
+"use strict";
+
+var isMatcher = require("./is-matcher");
+
+/**
+ * Throws a TypeError when `value` is not a matcher
+ *
+ * @private
+ * @param {*} value The value to examine
+ */
+function assertMatcher(value) {
+    if (!isMatcher(value)) {
+        throw new TypeError("Matcher expected");
+    }
+}
+
+module.exports = assertMatcher;
+
+},{"./is-matcher":64}],61:[function(require,module,exports){
+"use strict";
+
+/**
+ * Throws a TypeError when expected method doesn't exist
+ *
+ * @private
+ * @param {*} value A value to examine
+ * @param {string} method The name of the method to look for
+ * @param {name} name A name to use for the error message
+ * @param {string} methodPath The name of the method to use for error messages
+ * @throws {TypeError} When the method doesn't exist
+ */
+function assertMethodExists(value, method, name, methodPath) {
+    if (value[method] === null || value[method] === undefined) {
+        throw new TypeError(
+            "Expected " + name + " to have method " + methodPath
+        );
+    }
+}
+
+module.exports = assertMethodExists;
+
+},{}],62:[function(require,module,exports){
+"use strict";
+
+var typeOf = require("@sinonjs/commons").typeOf;
+
+/**
+ * Ensures that value is of type
+ *
+ * @private
+ * @param {*} value A value to examine
+ * @param {string} type A basic JavaScript type to compare to, e.g. "object", "string"
+ * @param {string} name A string to use for the error message
+ * @throws {TypeError} If value is not of the expected type
+ * @returns {undefined}
+ */
+function assertType(value, type, name) {
+    var actual = typeOf(value);
+    if (actual !== type) {
+        throw new TypeError(
+            "Expected type of " +
+                name +
+                " to be " +
+                type +
+                ", but was " +
+                actual
+        );
+    }
+}
+
+module.exports = assertType;
+
+},{"@sinonjs/commons":44}],63:[function(require,module,exports){
+"use strict";
+
+var typeOf = require("@sinonjs/commons").typeOf;
+
+/**
+ * Returns `true` for iterables
+ *
+ * @private
+ * @param {*} value A value to examine
+ * @returns {boolean} Returns `true` when `value` looks like an iterable
+ */
+function isIterable(value) {
+    return Boolean(value) && typeOf(value.forEach) === "function";
+}
+
+module.exports = isIterable;
+
+},{"@sinonjs/commons":44}],64:[function(require,module,exports){
+"use strict";
+
+var isPrototypeOf = require("@sinonjs/commons").prototypes.object.isPrototypeOf;
+
+var matcherPrototype = require("./matcher-prototype");
+
+/**
+ * Returns `true` when `object` is a matcher
+ *
+ * @private
+ * @param {*} object A value to examine
+ * @returns {boolean} Returns `true` when `object` is a matcher
+ */
+function isMatcher(object) {
+    return isPrototypeOf(matcherPrototype, object);
+}
+
+module.exports = isMatcher;
+
+},{"./matcher-prototype":66,"@sinonjs/commons":44}],65:[function(require,module,exports){
+"use strict";
+
+var every = require("@sinonjs/commons").prototypes.array.every;
+var typeOf = require("@sinonjs/commons").typeOf;
+
+var deepEqualFactory = require("../deep-equal").use;
+
+var isMatcher = require("./is-matcher");
+/**
+ * Matches `actual` with `expectation`
+ *
+ * @private
+ * @param {*} actual A value to examine
+ * @param {object} expectation An object with properties to match on
+ * @param {object} matcher A matcher to use for comparison
+ * @returns {boolean} Returns true when `actual` matches all properties in `expectation`
+ */
+function matchObject(actual, expectation, matcher) {
+    var deepEqual = deepEqualFactory(matcher);
+    if (actual === null || actual === undefined) {
+        return false;
+    }
+
+    return every(Object.keys(expectation), function(key) {
+        var exp = expectation[key];
+        var act = actual[key];
+
+        if (isMatcher(exp)) {
+            if (!exp.test(act)) {
+                return false;
+            }
+        } else if (typeOf(exp) === "object") {
+            if (!matchObject(act, exp, matcher)) {
+                return false;
+            }
+        } else if (!deepEqual(act, exp)) {
+            return false;
+        }
+
+        return true;
+    });
+}
+
+module.exports = matchObject;
+
+},{"../deep-equal":68,"./is-matcher":64,"@sinonjs/commons":44}],66:[function(require,module,exports){
+"use strict";
+
+var matcherPrototype = {
+    toString: function() {
+        return this.message;
+    }
+};
+
+matcherPrototype.or = function(valueOrMatcher) {
+    var createMatcher = require("../create-matcher");
+    var isMatcher = createMatcher.isMatcher;
+
+    if (!arguments.length) {
+        throw new TypeError("Matcher expected");
+    }
+
+    var m2 = isMatcher(valueOrMatcher)
+        ? valueOrMatcher
+        : createMatcher(valueOrMatcher);
+    var m1 = this;
+    var or = Object.create(matcherPrototype);
+    or.test = function(actual) {
+        return m1.test(actual) || m2.test(actual);
+    };
+    or.message = m1.message + ".or(" + m2.message + ")";
+    return or;
+};
+
+matcherPrototype.and = function(valueOrMatcher) {
+    var createMatcher = require("../create-matcher");
+    var isMatcher = createMatcher.isMatcher;
+
+    if (!arguments.length) {
+        throw new TypeError("Matcher expected");
+    }
+
+    var m2 = isMatcher(valueOrMatcher)
+        ? valueOrMatcher
+        : createMatcher(valueOrMatcher);
+    var m1 = this;
+    var and = Object.create(matcherPrototype);
+    and.test = function(actual) {
+        return m1.test(actual) && m2.test(actual);
+    };
+    and.message = m1.message + ".and(" + m2.message + ")";
+    return and;
+};
+
+module.exports = matcherPrototype;
+
+},{"../create-matcher":59}],67:[function(require,module,exports){
+"use strict";
+
+var functionName = require("@sinonjs/commons").functionName;
+var join = require("@sinonjs/commons").prototypes.array.join;
+var map = require("@sinonjs/commons").prototypes.array.map;
+var stringIndexOf = require("@sinonjs/commons").prototypes.string.indexOf;
+var valueToString = require("@sinonjs/commons").valueToString;
+
+var matchObject = require("./match-object");
+
+var createTypeMap = function(match) {
+    return {
+        function: function(m, expectation, message) {
+            m.test = expectation;
+            m.message = message || "match(" + functionName(expectation) + ")";
+        },
+        number: function(m, expectation) {
+            m.test = function(actual) {
+                // we need type coercion here
+                return expectation == actual; // eslint-disable-line eqeqeq
+            };
+        },
+        object: function(m, expectation) {
+            var array = [];
+
+            if (typeof expectation.test === "function") {
+                m.test = function(actual) {
+                    return expectation.test(actual) === true;
+                };
+                m.message = "match(" + functionName(expectation.test) + ")";
+                return m;
+            }
+
+            array = map(Object.keys(expectation), function(key) {
+                return key + ": " + valueToString(expectation[key]);
+            });
+
+            m.test = function(actual) {
+                return matchObject(actual, expectation, match);
+            };
+            m.message = "match(" + join(array, ", ") + ")";
+
+            return m;
+        },
+        regexp: function(m, expectation) {
+            m.test = function(actual) {
+                return typeof actual === "string" && expectation.test(actual);
+            };
+        },
+        string: function(m, expectation) {
+            m.test = function(actual) {
+                return (
+                    typeof actual === "string" &&
+                    stringIndexOf(actual, expectation) !== -1
+                );
+            };
+            m.message = 'match("' + expectation + '")';
+        }
+    };
+};
+
+module.exports = createTypeMap;
+
+},{"./match-object":65,"@sinonjs/commons":44}],68:[function(require,module,exports){
+"use strict";
+
+var valueToString = require("@sinonjs/commons").valueToString;
+var className = require("@sinonjs/commons").className;
+var typeOf = require("@sinonjs/commons").typeOf;
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var objectProto = require("@sinonjs/commons").prototypes.object;
+var mapForEach = require("@sinonjs/commons").prototypes.map.forEach;
+
+var getClass = require("./get-class");
+var identical = require("./identical");
+var isArguments = require("./is-arguments");
+var isDate = require("./is-date");
+var isElement = require("./is-element");
+var isMap = require("./is-map");
+var isNaN = require("./is-nan");
+var isObject = require("./is-object");
+var isSet = require("./is-set");
+var isSubset = require("./is-subset");
+
+var concat = arrayProto.concat;
+var every = arrayProto.every;
+var push = arrayProto.push;
+
+var getTime = Date.prototype.getTime;
+var hasOwnProperty = objectProto.hasOwnProperty;
+var indexOf = arrayProto.indexOf;
+var keys = Object.keys;
+var getOwnPropertySymbols = Object.getOwnPropertySymbols;
+
+/**
+ * Deep equal comparison. Two values are "deep equal" when:
+ *
+ *   - They are equal, according to samsam.identical
+ *   - They are both date objects representing the same time
+ *   - They are both arrays containing elements that are all deepEqual
+ *   - They are objects with the same set of properties, and each property
+ *     in ``actual`` is deepEqual to the corresponding property in ``expectation``
+ *
+ * Supports cyclic objects.
+ *
+ * @alias module:samsam.deepEqual
+ * @param {*} actual The object to examine
+ * @param {*} expectation The object actual is expected to be equal to
+ * @param {object} match A value to match on
+ * @returns {boolean} Returns true when actual and expectation are considered equal
+ */
+function deepEqualCyclic(actual, expectation, match) {
+    // used for cyclic comparison
+    // contain already visited objects
+    var actualObjects = [];
+    var expectationObjects = [];
+    // contain pathes (position in the object structure)
+    // of the already visited objects
+    // indexes same as in objects arrays
+    var actualPaths = [];
+    var expectationPaths = [];
+    // contains combinations of already compared objects
+    // in the manner: { "$1['ref']$2['ref']": true }
+    var compared = {};
+
+    // does the recursion for the deep equal check
+    // eslint-disable-next-line complexity
+    return (function deepEqual(
+        actualObj,
+        expectationObj,
+        actualPath,
+        expectationPath
+    ) {
+        // If both are matchers they must be the same instance in order to be
+        // considered equal If we didn't do that we would end up running one
+        // matcher against the other
+        if (match && match.isMatcher(expectationObj)) {
+            if (match.isMatcher(actualObj)) {
+                return actualObj === expectationObj;
+            }
+            return expectationObj.test(actualObj);
+        }
+
+        var actualType = typeof actualObj;
+        var expectationType = typeof expectationObj;
+
+        if (
+            actualObj === expectationObj ||
+            isNaN(actualObj) ||
+            isNaN(expectationObj) ||
+            actualObj === null ||
+            expectationObj === null ||
+            actualObj === undefined ||
+            expectationObj === undefined ||
+            actualType !== "object" ||
+            expectationType !== "object"
+        ) {
+            return identical(actualObj, expectationObj);
+        }
+
+        // Elements are only equal if identical(expected, actual)
+        if (isElement(actualObj) || isElement(expectationObj)) {
+            return false;
+        }
+
+        var isActualDate = isDate(actualObj);
+        var isExpectationDate = isDate(expectationObj);
+        if (isActualDate || isExpectationDate) {
+            if (
+                !isActualDate ||
+                !isExpectationDate ||
+                getTime.call(actualObj) !== getTime.call(expectationObj)
+            ) {
+                return false;
+            }
+        }
+
+        if (actualObj instanceof RegExp && expectationObj instanceof RegExp) {
+            if (valueToString(actualObj) !== valueToString(expectationObj)) {
+                return false;
+            }
+        }
+
+        if (actualObj instanceof Error && expectationObj instanceof Error) {
+            return actualObj === expectationObj;
+        }
+
+        var actualClass = getClass(actualObj);
+        var expectationClass = getClass(expectationObj);
+        var actualKeys = keys(actualObj);
+        var expectationKeys = keys(expectationObj);
+        var actualName = className(actualObj);
+        var expectationName = className(expectationObj);
+        var expectationSymbols =
+            typeOf(getOwnPropertySymbols) === "function"
+                ? getOwnPropertySymbols(expectationObj)
+                : /* istanbul ignore next: cannot collect coverage for engine that doesn't support Symbol */
+                  [];
+        var expectationKeysAndSymbols = concat(
+            expectationKeys,
+            expectationSymbols
+        );
+
+        if (isArguments(actualObj) || isArguments(expectationObj)) {
+            if (actualObj.length !== expectationObj.length) {
+                return false;
+            }
+        } else {
+            if (
+                actualType !== expectationType ||
+                actualClass !== expectationClass ||
+                actualKeys.length !== expectationKeys.length ||
+                (actualName &&
+                    expectationName &&
+                    actualName !== expectationName)
+            ) {
+                return false;
+            }
+        }
+
+        if (isSet(actualObj) || isSet(expectationObj)) {
+            if (
+                !isSet(actualObj) ||
+                !isSet(expectationObj) ||
+                actualObj.size !== expectationObj.size
+            ) {
+                return false;
+            }
+
+            return isSubset(actualObj, expectationObj, deepEqual);
+        }
+
+        if (isMap(actualObj) || isMap(expectationObj)) {
+            if (
+                !isMap(actualObj) ||
+                !isMap(expectationObj) ||
+                actualObj.size !== expectationObj.size
+            ) {
+                return false;
+            }
+
+            var mapsDeeplyEqual = true;
+            mapForEach(actualObj, function(value, key) {
+                mapsDeeplyEqual =
+                    mapsDeeplyEqual &&
+                    deepEqualCyclic(value, expectationObj.get(key));
+            });
+
+            return mapsDeeplyEqual;
+        }
+
+        return every(expectationKeysAndSymbols, function(key) {
+            if (!hasOwnProperty(actualObj, key)) {
+                return false;
+            }
+
+            var actualValue = actualObj[key];
+            var expectationValue = expectationObj[key];
+            var actualObject = isObject(actualValue);
+            var expectationObject = isObject(expectationValue);
+            // determines, if the objects were already visited
+            // (it's faster to check for isObject first, than to
+            // get -1 from getIndex for non objects)
+            var actualIndex = actualObject
+                ? indexOf(actualObjects, actualValue)
+                : -1;
+            var expectationIndex = expectationObject
+                ? indexOf(expectationObjects, expectationValue)
+                : -1;
+            // determines the new paths of the objects
+            // - for non cyclic objects the current path will be extended
+            //   by current property name
+            // - for cyclic objects the stored path is taken
+            var newActualPath =
+                actualIndex !== -1
+                    ? actualPaths[actualIndex]
+                    : actualPath + "[" + JSON.stringify(key) + "]";
+            var newExpectationPath =
+                expectationIndex !== -1
+                    ? expectationPaths[expectationIndex]
+                    : expectationPath + "[" + JSON.stringify(key) + "]";
+            var combinedPath = newActualPath + newExpectationPath;
+
+            // stop recursion if current objects are already compared
+            if (compared[combinedPath]) {
+                return true;
+            }
+
+            // remember the current objects and their paths
+            if (actualIndex === -1 && actualObject) {
+                push(actualObjects, actualValue);
+                push(actualPaths, newActualPath);
+            }
+            if (expectationIndex === -1 && expectationObject) {
+                push(expectationObjects, expectationValue);
+                push(expectationPaths, newExpectationPath);
+            }
+
+            // remember that the current objects are already compared
+            if (actualObject && expectationObject) {
+                compared[combinedPath] = true;
+            }
+
+            // End of cyclic logic
+
+            // neither actualValue nor expectationValue is a cycle
+            // continue with next level
+            return deepEqual(
+                actualValue,
+                expectationValue,
+                newActualPath,
+                newExpectationPath
+            );
+        });
+    })(actual, expectation, "$1", "$2");
+}
+
+deepEqualCyclic.use = function(match) {
+    return function deepEqual(a, b) {
+        return deepEqualCyclic(a, b, match);
+    };
+};
+
+module.exports = deepEqualCyclic;
+
+},{"./get-class":69,"./identical":70,"./is-arguments":71,"./is-date":73,"./is-element":74,"./is-map":75,"./is-nan":76,"./is-object":78,"./is-set":79,"./is-subset":80,"@sinonjs/commons":44}],69:[function(require,module,exports){
+"use strict";
+
+var toString = require("@sinonjs/commons").prototypes.object.toString;
+
+/**
+ * Returns the internal `Class` by calling `Object.prototype.toString`
+ * with the provided value as `this`. Return value is a `String`, naming the
+ * internal class, e.g. "Array"
+ *
+ * @private
+ * @param  {*} value - Any value
+ * @returns {string} - A string representation of the `Class` of `value`
+ */
+function getClass(value) {
+    return toString(value).split(/[ \]]/)[1];
+}
+
+module.exports = getClass;
+
+},{"@sinonjs/commons":44}],70:[function(require,module,exports){
+"use strict";
+
+var isNaN = require("./is-nan");
+var isNegZero = require("./is-neg-zero");
+
+/**
+ * Strict equality check according to EcmaScript Harmony's `egal`.
+ *
+ * **From the Harmony wiki:**
+ * > An `egal` function simply makes available the internal `SameValue` function
+ * > from section 9.12 of the ES5 spec. If two values are egal, then they are not
+ * > observably distinguishable.
+ *
+ * `identical` returns `true` when `===` is `true`, except for `-0` and
+ * `+0`, where it returns `false`. Additionally, it returns `true` when
+ * `NaN` is compared to itself.
+ *
+ * @alias module:samsam.identical
+ * @param {*} obj1 The first value to compare
+ * @param {*} obj2 The second value to compare
+ * @returns {boolean} Returns `true` when the objects are *egal*, `false` otherwise
+ */
+function identical(obj1, obj2) {
+    if (obj1 === obj2 || (isNaN(obj1) && isNaN(obj2))) {
+        return obj1 !== 0 || isNegZero(obj1) === isNegZero(obj2);
+    }
+
+    return false;
+}
+
+module.exports = identical;
+
+},{"./is-nan":76,"./is-neg-zero":77}],71:[function(require,module,exports){
+"use strict";
+
+var getClass = require("./get-class");
+
+/**
+ * Returns `true` when `object` is an `arguments` object, `false` otherwise
+ *
+ * @alias module:samsam.isArguments
+ * @param  {*}  object - The object to examine
+ * @returns {boolean} `true` when `object` is an `arguments` object
+ */
+function isArguments(object) {
+    return getClass(object) === "Arguments";
+}
+
+module.exports = isArguments;
+
+},{"./get-class":69}],72:[function(require,module,exports){
+"use strict";
+
+var functionName = require("@sinonjs/commons").functionName;
+var indexOf = require("@sinonjs/commons").prototypes.array.indexOf;
+var map = require("@sinonjs/commons").prototypes.array.map;
+var ARRAY_TYPES = require("./array-types");
+var type = require("type-detect");
+
+/**
+ * Returns `true` when `object` is an array type, `false` otherwise
+ *
+ * @param  {*}  object - The object to examine
+ * @returns {boolean} `true` when `object` is an array type
+ * @private
+ */
+function isArrayType(object) {
+    return indexOf(map(ARRAY_TYPES, functionName), type(object)) !== -1;
+}
+
+module.exports = isArrayType;
+
+},{"./array-types":58,"@sinonjs/commons":44,"type-detect":131}],73:[function(require,module,exports){
+"use strict";
+
+/**
+ * Returns `true` when `value` is an instance of Date
+ *
+ * @private
+ * @param  {Date}  value The value to examine
+ * @returns {boolean}     `true` when `value` is an instance of Date
+ */
+function isDate(value) {
+    return value instanceof Date;
+}
+
+module.exports = isDate;
+
+},{}],74:[function(require,module,exports){
+"use strict";
+
+var div = typeof document !== "undefined" && document.createElement("div");
+
+/**
+ * Returns `true` when `object` is a DOM element node.
+ *
+ * Unlike Underscore.js/lodash, this function will return `false` if `object`
+ * is an *element-like* object, i.e. a regular object with a `nodeType`
+ * property that holds the value `1`.
+ *
+ * @alias module:samsam.isElement
+ * @param {object} object The object to examine
+ * @returns {boolean} Returns `true` for DOM element nodes
+ */
+function isElement(object) {
+    if (!object || object.nodeType !== 1 || !div) {
+        return false;
+    }
+    try {
+        object.appendChild(div);
+        object.removeChild(div);
+    } catch (e) {
+        return false;
+    }
+    return true;
+}
+
+module.exports = isElement;
+
+},{}],75:[function(require,module,exports){
+"use strict";
+
+/**
+ * Returns `true` when `value` is a Map
+ *
+ * @param {*} value A value to examine
+ * @returns {boolean} `true` when `value` is an instance of `Map`, `false` otherwise
+ * @private
+ */
+function isMap(value) {
+    return typeof Map !== "undefined" && value instanceof Map;
+}
+
+module.exports = isMap;
+
+},{}],76:[function(require,module,exports){
+"use strict";
+
+/**
+ * Compares a `value` to `NaN`
+ *
+ * @private
+ * @param {*} value A value to examine
+ * @returns {boolean} Returns `true` when `value` is `NaN`
+ */
+function isNaN(value) {
+    // Unlike global `isNaN`, this function avoids type coercion
+    // `typeof` check avoids IE host object issues, hat tip to
+    // lodash
+
+    // eslint-disable-next-line no-self-compare
+    return typeof value === "number" && value !== value;
+}
+
+module.exports = isNaN;
+
+},{}],77:[function(require,module,exports){
+"use strict";
+
+/**
+ * Returns `true` when `value` is `-0`
+ *
+ * @alias module:samsam.isNegZero
+ * @param {*} value A value to examine
+ * @returns {boolean} Returns `true` when `value` is `-0`
+ */
+function isNegZero(value) {
+    return value === 0 && 1 / value === -Infinity;
+}
+
+module.exports = isNegZero;
+
+},{}],78:[function(require,module,exports){
+"use strict";
+
+/**
+ * Returns `true` when the value is a regular Object and not a specialized Object
+ *
+ * This helps speed up deepEqual cyclic checks
+ *
+ * The premise is that only Objects are stored in the visited array.
+ * So if this function returns false, we don't have to do the
+ * expensive operation of searching for the value in the the array of already
+ * visited objects
+ *
+ * @private
+ * @param  {object}   value The object to examine
+ * @returns {boolean}       `true` when the object is a non-specialised object
+ */
+function isObject(value) {
+    return (
+        typeof value === "object" &&
+        value !== null &&
+        // none of these are collection objects, so we can return false
+        !(value instanceof Boolean) &&
+        !(value instanceof Date) &&
+        !(value instanceof Error) &&
+        !(value instanceof Number) &&
+        !(value instanceof RegExp) &&
+        !(value instanceof String)
+    );
+}
+
+module.exports = isObject;
+
+},{}],79:[function(require,module,exports){
+"use strict";
+
+/**
+ * Returns `true` when the argument is an instance of Set, `false` otherwise
+ *
+ * @alias module:samsam.isSet
+ * @param  {*}  val - A value to examine
+ * @returns {boolean} Returns `true` when the argument is an instance of Set, `false` otherwise
+ */
+function isSet(val) {
+    return (typeof Set !== "undefined" && val instanceof Set) || false;
+}
+
+module.exports = isSet;
+
+},{}],80:[function(require,module,exports){
+"use strict";
+
+var forEach = require("@sinonjs/commons").prototypes.set.forEach;
+
+/**
+ * Returns `true` when `s1` is a subset of `s2`, `false` otherwise
+ *
+ * @private
+ * @param  {Array|Set}  s1      The target value
+ * @param  {Array|Set}  s2      The containing value
+ * @param  {Function}  compare A comparison function, should return `true` when
+ *                             values are considered equal
+ * @returns {boolean} Returns `true` when `s1` is a subset of `s2`, `false`` otherwise
+ */
+function isSubset(s1, s2, compare) {
+    var allContained = true;
+    forEach(s1, function(v1) {
+        var includes = false;
+        forEach(s2, function(v2) {
+            if (compare(v2, v1)) {
+                includes = true;
+            }
+        });
+        allContained = allContained && includes;
+    });
+
+    return allContained;
+}
+
+module.exports = isSubset;
+
+},{"@sinonjs/commons":44}],81:[function(require,module,exports){
+"use strict";
+
+var slice = require("@sinonjs/commons").prototypes.string.slice;
+var typeOf = require("@sinonjs/commons").typeOf;
+var valueToString = require("@sinonjs/commons").valueToString;
+
+/**
+ * Creates a string represenation of an iterable object
+ *
+ * @private
+ * @param   {object} obj The iterable object to stringify
+ * @returns {string}     A string representation
+ */
+function iterableToString(obj) {
+    if (typeOf(obj) === "map") {
+        return mapToString(obj);
+    }
+
+    return genericIterableToString(obj);
+}
+
+/**
+ * Creates a string representation of a Map
+ *
+ * @private
+ * @param   {Map} map    The map to stringify
+ * @returns {string}     A string representation
+ */
+function mapToString(map) {
+    var representation = "";
+
+    /* eslint-disable-next-line local-rules/no-prototype-methods */
+    map.forEach(function(value, key) {
+        representation += "[" + stringify(key) + "," + stringify(value) + "],";
+    });
+
+    representation = slice(representation, 0, -1);
+    return representation;
+}
+
+/**
+ * Create a string represenation for an iterable
+ *
+ * @private
+ * @param   {object} iterable The iterable to stringify
+ * @returns {string}          A string representation
+ */
+function genericIterableToString(iterable) {
+    var representation = "";
+
+    /* eslint-disable-next-line local-rules/no-prototype-methods */
+    iterable.forEach(function(value) {
+        representation += stringify(value) + ",";
+    });
+
+    representation = slice(representation, 0, -1);
+    return representation;
+}
+
+/**
+ * Creates a string representation of the passed `item`
+ *
+ * @private
+ * @param  {object} item The item to stringify
+ * @returns {string}      A string representation of `item`
+ */
+function stringify(item) {
+    return typeof item === "string" ? "'" + item + "'" : valueToString(item);
+}
+
+module.exports = iterableToString;
+
+},{"@sinonjs/commons":44}],82:[function(require,module,exports){
+"use strict";
+
+var valueToString = require("@sinonjs/commons").valueToString;
+var indexOf = require("@sinonjs/commons").prototypes.string.indexOf;
+var forEach = require("@sinonjs/commons").prototypes.array.forEach;
+var type = require("type-detect");
+
+var engineCanCompareMaps = typeof Array.from === "function";
+var deepEqual = require("./deep-equal").use(match); // eslint-disable-line no-use-before-define
+var isArrayType = require("./is-array-type");
+var isSubset = require("./is-subset");
+var createMatcher = require("./create-matcher");
+
+/**
+ * Returns true when `array` contains all of `subset` as defined by the `compare`
+ * argument
+ *
+ * @param  {Array} array   An array to search for a subset
+ * @param  {Array} subset  The subset to find in the array
+ * @param  {Function} compare A comparison function
+ * @returns {boolean}         [description]
+ * @private
+ */
+function arrayContains(array, subset, compare) {
+    if (subset.length === 0) {
+        return true;
+    }
+    var i, l, j, k;
+    for (i = 0, l = array.length; i < l; ++i) {
+        if (compare(array[i], subset[0])) {
+            for (j = 0, k = subset.length; j < k; ++j) {
+                if (i + j >= l) {
+                    return false;
+                }
+                if (!compare(array[i + j], subset[j])) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+/* eslint-disable complexity */
+/**
+ * Matches an object with a matcher (or value)
+ *
+ * @alias module:samsam.match
+ * @param {object} object The object candidate to match
+ * @param {object} matcherOrValue A matcher or value to match against
+ * @returns {boolean} true when `object` matches `matcherOrValue`
+ */
+function match(object, matcherOrValue) {
+    if (matcherOrValue && typeof matcherOrValue.test === "function") {
+        return matcherOrValue.test(object);
+    }
+
+    switch (type(matcherOrValue)) {
+        case "bigint":
+        case "boolean":
+        case "number":
+        case "symbol":
+            return matcherOrValue === object;
+        case "function":
+            return matcherOrValue(object) === true;
+        case "string":
+            var notNull = typeof object === "string" || Boolean(object);
+            return (
+                notNull &&
+                indexOf(
+                    valueToString(object).toLowerCase(),
+                    matcherOrValue.toLowerCase()
+                ) >= 0
+            );
+        case "null":
+            return object === null;
+        case "undefined":
+            return typeof object === "undefined";
+        case "Date":
+            /* istanbul ignore else */
+            if (type(object) === "Date") {
+                return object.getTime() === matcherOrValue.getTime();
+            }
+            /* istanbul ignore next: this is basically the rest of the function, which is covered */
+            break;
+        case "Array":
+        case "Int8Array":
+        case "Uint8Array":
+        case "Uint8ClampedArray":
+        case "Int16Array":
+        case "Uint16Array":
+        case "Int32Array":
+        case "Uint32Array":
+        case "Float32Array":
+        case "Float64Array":
+            return (
+                isArrayType(matcherOrValue) &&
+                arrayContains(object, matcherOrValue, match)
+            );
+        case "Map":
+            /* istanbul ignore next: this is covered by a test, that is only run in IE, but we collect coverage information in node*/
+            if (!engineCanCompareMaps) {
+                throw new Error(
+                    "The JavaScript engine does not support Array.from and cannot reliably do value comparison of Map instances"
+                );
+            }
+
+            return (
+                type(object) === "Map" &&
+                arrayContains(
+                    Array.from(object),
+                    Array.from(matcherOrValue),
+                    match
+                )
+            );
+        default:
+            break;
+    }
+
+    switch (type(object)) {
+        case "null":
+            return false;
+        case "Set":
+            return isSubset(matcherOrValue, object, match);
+        default:
+            break;
+    }
+
+    /* istanbul ignore else */
+    if (matcherOrValue && typeof matcherOrValue === "object") {
+        if (matcherOrValue === object) {
+            return true;
+        }
+        if (typeof object !== "object") {
+            return false;
+        }
+        var prop;
+        // eslint-disable-next-line guard-for-in
+        for (prop in matcherOrValue) {
+            var value = object[prop];
+            if (
+                typeof value === "undefined" &&
+                typeof object.getAttribute === "function"
+            ) {
+                value = object.getAttribute(prop);
+            }
+            if (
+                matcherOrValue[prop] === null ||
+                typeof matcherOrValue[prop] === "undefined"
+            ) {
+                if (value !== matcherOrValue[prop]) {
+                    return false;
+                }
+            } else if (
+                typeof value === "undefined" ||
+                !deepEqual(value, matcherOrValue[prop])
+            ) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /* istanbul ignore next */
+    throw new Error("Matcher was an unknown or unsupported type");
+}
+/* eslint-enable complexity */
+
+forEach(Object.keys(createMatcher), function(key) {
+    match[key] = createMatcher[key];
+});
+
+module.exports = match;
+
+},{"./create-matcher":59,"./deep-equal":68,"./is-array-type":72,"./is-subset":80,"@sinonjs/commons":44,"type-detect":131}],83:[function(require,module,exports){
+"use strict";
+
+/**
+ * @module samsam
+ */
+var identical = require("./identical");
+var isArguments = require("./is-arguments");
+var isElement = require("./is-element");
+var isNegZero = require("./is-neg-zero");
+var isSet = require("./is-set");
+var isMap = require("./is-map");
+var match = require("./match");
+var deepEqualCyclic = require("./deep-equal").use(match);
+var createMatcher = require("./create-matcher");
+
+module.exports = {
+    createMatcher: createMatcher,
+    deepEqual: deepEqualCyclic,
+    identical: identical,
+    isArguments: isArguments,
+    isElement: isElement,
+    isMap: isMap,
+    isNegZero: isNegZero,
+    isSet: isSet,
+    match: match
+};
+
+},{"./create-matcher":59,"./deep-equal":68,"./identical":70,"./is-arguments":71,"./is-element":74,"./is-map":75,"./is-neg-zero":77,"./is-set":79,"./match":82}],84:[function(require,module,exports){
+arguments[4][58][0].apply(exports,arguments)
+},{"dup":58}],85:[function(require,module,exports){
+arguments[4][59][0].apply(exports,arguments)
+},{"./create-matcher/assert-matcher":86,"./create-matcher/assert-method-exists":87,"./create-matcher/assert-type":88,"./create-matcher/is-iterable":89,"./create-matcher/is-matcher":90,"./create-matcher/matcher-prototype":92,"./create-matcher/type-map":93,"./deep-equal":94,"./iterable-to-string":107,"@sinonjs/commons":44,"dup":59,"lodash.get":116}],86:[function(require,module,exports){
+arguments[4][60][0].apply(exports,arguments)
+},{"./is-matcher":90,"dup":60}],87:[function(require,module,exports){
+arguments[4][61][0].apply(exports,arguments)
+},{"dup":61}],88:[function(require,module,exports){
+arguments[4][62][0].apply(exports,arguments)
+},{"@sinonjs/commons":44,"dup":62}],89:[function(require,module,exports){
+arguments[4][63][0].apply(exports,arguments)
+},{"@sinonjs/commons":44,"dup":63}],90:[function(require,module,exports){
+arguments[4][64][0].apply(exports,arguments)
+},{"./matcher-prototype":92,"@sinonjs/commons":44,"dup":64}],91:[function(require,module,exports){
+"use strict";
+
+var every = require("@sinonjs/commons").prototypes.array.every;
+var concat = require("@sinonjs/commons").prototypes.array.concat;
+var typeOf = require("@sinonjs/commons").typeOf;
+
+var deepEqualFactory = require("../deep-equal").use;
+
+var isMatcher = require("./is-matcher");
+
+var keys = Object.keys;
+var getOwnPropertySymbols = Object.getOwnPropertySymbols;
+
+/**
+ * Matches `actual` with `expectation`
+ *
+ * @private
+ * @param {*} actual A value to examine
+ * @param {object} expectation An object with properties to match on
+ * @param {object} matcher A matcher to use for comparison
+ * @returns {boolean} Returns true when `actual` matches all properties in `expectation`
+ */
+function matchObject(actual, expectation, matcher) {
+    var deepEqual = deepEqualFactory(matcher);
+    if (actual === null || actual === undefined) {
+        return false;
+    }
+
+    var expectedKeys = keys(expectation);
+    /* istanbul ignore else: cannot collect coverage for engine that doesn't support Symbol */
+    if (typeOf(getOwnPropertySymbols) === "function") {
+        expectedKeys = concat(expectedKeys, getOwnPropertySymbols(expectation));
+    }
+
+    return every(expectedKeys, function(key) {
+        var exp = expectation[key];
+        var act = actual[key];
+
+        if (isMatcher(exp)) {
+            if (!exp.test(act)) {
+                return false;
+            }
+        } else if (typeOf(exp) === "object") {
+            if (!matchObject(act, exp, matcher)) {
+                return false;
+            }
+        } else if (!deepEqual(act, exp)) {
+            return false;
+        }
+
+        return true;
+    });
+}
+
+module.exports = matchObject;
+
+},{"../deep-equal":94,"./is-matcher":90,"@sinonjs/commons":44}],92:[function(require,module,exports){
+arguments[4][66][0].apply(exports,arguments)
+},{"../create-matcher":85,"dup":66}],93:[function(require,module,exports){
+arguments[4][67][0].apply(exports,arguments)
+},{"./match-object":91,"@sinonjs/commons":44,"dup":67}],94:[function(require,module,exports){
+arguments[4][68][0].apply(exports,arguments)
+},{"./get-class":95,"./identical":96,"./is-arguments":97,"./is-date":99,"./is-element":100,"./is-map":101,"./is-nan":102,"./is-object":104,"./is-set":105,"./is-subset":106,"@sinonjs/commons":44,"dup":68}],95:[function(require,module,exports){
+arguments[4][69][0].apply(exports,arguments)
+},{"@sinonjs/commons":44,"dup":69}],96:[function(require,module,exports){
+arguments[4][70][0].apply(exports,arguments)
+},{"./is-nan":102,"./is-neg-zero":103,"dup":70}],97:[function(require,module,exports){
+arguments[4][71][0].apply(exports,arguments)
+},{"./get-class":95,"dup":71}],98:[function(require,module,exports){
+arguments[4][72][0].apply(exports,arguments)
+},{"./array-types":84,"@sinonjs/commons":44,"dup":72,"type-detect":131}],99:[function(require,module,exports){
+arguments[4][73][0].apply(exports,arguments)
+},{"dup":73}],100:[function(require,module,exports){
+arguments[4][74][0].apply(exports,arguments)
+},{"dup":74}],101:[function(require,module,exports){
+arguments[4][75][0].apply(exports,arguments)
+},{"dup":75}],102:[function(require,module,exports){
+arguments[4][76][0].apply(exports,arguments)
+},{"dup":76}],103:[function(require,module,exports){
+arguments[4][77][0].apply(exports,arguments)
+},{"dup":77}],104:[function(require,module,exports){
+arguments[4][78][0].apply(exports,arguments)
+},{"dup":78}],105:[function(require,module,exports){
+arguments[4][79][0].apply(exports,arguments)
+},{"dup":79}],106:[function(require,module,exports){
+arguments[4][80][0].apply(exports,arguments)
+},{"@sinonjs/commons":44,"dup":80}],107:[function(require,module,exports){
+arguments[4][81][0].apply(exports,arguments)
+},{"@sinonjs/commons":44,"dup":81}],108:[function(require,module,exports){
+arguments[4][82][0].apply(exports,arguments)
+},{"./create-matcher":85,"./deep-equal":94,"./is-array-type":98,"./is-subset":106,"@sinonjs/commons":44,"dup":82,"type-detect":131}],109:[function(require,module,exports){
+arguments[4][83][0].apply(exports,arguments)
+},{"./create-matcher":85,"./deep-equal":94,"./identical":96,"./is-arguments":97,"./is-element":100,"./is-map":101,"./is-neg-zero":103,"./is-set":105,"./match":108,"dup":83}],110:[function(require,module,exports){
+// This is free and unencumbered software released into the public domain.
+// See LICENSE.md for more information.
+
+var encoding = require("./lib/encoding.js");
+
+module.exports = {
+  TextEncoder: encoding.TextEncoder,
+  TextDecoder: encoding.TextDecoder,
+};
+
+},{"./lib/encoding.js":112}],111:[function(require,module,exports){
+(function(global) {
+  'use strict';
+
+  if (typeof module !== "undefined" && module.exports) {
+    module.exports = global;
+  }
+
+  global["encoding-indexes"] =
+{
+  "big5":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,17392,19506,17923,17830,17784,160359,19831,17843,162993,19682,163013,15253,18230,18244,19527,19520,148159,144919,160594,159371,159954,19543,172881,18255,17882,19589,162924,19719,19108,18081,158499,29221,154196,137827,146950,147297,26189,22267,null,32149,22813,166841,15860,38708,162799,23515,138590,23204,13861,171696,23249,23479,23804,26478,34195,170309,29793,29853,14453,138579,145054,155681,16108,153822,15093,31484,40855,147809,166157,143850,133770,143966,17162,33924,40854,37935,18736,34323,22678,38730,37400,31184,31282,26208,27177,34973,29772,31685,26498,31276,21071,36934,13542,29636,155065,29894,40903,22451,18735,21580,16689,145038,22552,31346,162661,35727,18094,159368,16769,155033,31662,140476,40904,140481,140489,140492,40905,34052,144827,16564,40906,17633,175615,25281,28782,40907,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,12736,12737,12738,12739,12740,131340,12741,131281,131277,12742,12743,131275,139240,12744,131274,12745,12746,12747,12748,131342,12749,12750,256,193,461,192,274,201,282,200,332,211,465,210,null,7870,null,7872,202,257,225,462,224,593,275,233,283,232,299,237,464,236,333,243,466,242,363,250,468,249,470,472,474,476,252,null,7871,null,7873,234,609,9178,9179,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,172969,135493,null,25866,null,null,20029,28381,40270,37343,null,null,161589,25745,20250,20264,20392,20822,20852,20892,20964,21153,21160,21307,21326,21457,21464,22242,22768,22788,22791,22834,22836,23398,23454,23455,23706,24198,24635,25993,26622,26628,26725,27982,28860,30005,32420,32428,32442,32455,32463,32479,32518,32567,33402,33487,33647,35270,35774,35810,36710,36711,36718,29713,31996,32205,26950,31433,21031,null,null,null,null,37260,30904,37214,32956,null,36107,33014,133607,null,null,32927,40647,19661,40393,40460,19518,171510,159758,40458,172339,13761,null,28314,33342,29977,null,18705,39532,39567,40857,31111,164972,138698,132560,142054,20004,20097,20096,20103,20159,20203,20279,13388,20413,15944,20483,20616,13437,13459,13477,20870,22789,20955,20988,20997,20105,21113,21136,21287,13767,21417,13649,21424,13651,21442,21539,13677,13682,13953,21651,21667,21684,21689,21712,21743,21784,21795,21800,13720,21823,13733,13759,21975,13765,163204,21797,null,134210,134421,151851,21904,142534,14828,131905,36422,150968,169189,16467,164030,30586,142392,14900,18389,164189,158194,151018,25821,134524,135092,134357,135412,25741,36478,134806,134155,135012,142505,164438,148691,null,134470,170573,164073,18420,151207,142530,39602,14951,169460,16365,13574,152263,169940,161992,142660,40302,38933,null,17369,155813,25780,21731,142668,142282,135287,14843,135279,157402,157462,162208,25834,151634,134211,36456,139681,166732,132913,null,18443,131497,16378,22643,142733,null,148936,132348,155799,134988,134550,21881,16571,17338,null,19124,141926,135325,33194,39157,134556,25465,14846,141173,36288,22177,25724,15939,null,173569,134665,142031,142537,null,135368,145858,14738,14854,164507,13688,155209,139463,22098,134961,142514,169760,13500,27709,151099,null,null,161140,142987,139784,173659,167117,134778,134196,157724,32659,135375,141315,141625,13819,152035,134796,135053,134826,16275,134960,134471,135503,134732,null,134827,134057,134472,135360,135485,16377,140950,25650,135085,144372,161337,142286,134526,134527,142417,142421,14872,134808,135367,134958,173618,158544,167122,167321,167114,38314,21708,33476,21945,null,171715,39974,39606,161630,142830,28992,33133,33004,23580,157042,33076,14231,21343,164029,37302,134906,134671,134775,134907,13789,151019,13833,134358,22191,141237,135369,134672,134776,135288,135496,164359,136277,134777,151120,142756,23124,135197,135198,135413,135414,22428,134673,161428,164557,135093,134779,151934,14083,135094,135552,152280,172733,149978,137274,147831,164476,22681,21096,13850,153405,31666,23400,18432,19244,40743,18919,39967,39821,154484,143677,22011,13810,22153,20008,22786,138177,194680,38737,131206,20059,20155,13630,23587,24401,24516,14586,25164,25909,27514,27701,27706,28780,29227,20012,29357,149737,32594,31035,31993,32595,156266,13505,null,156491,32770,32896,157202,158033,21341,34916,35265,161970,35744,36125,38021,38264,38271,38376,167439,38886,39029,39118,39134,39267,170000,40060,40479,40644,27503,63751,20023,131207,38429,25143,38050,null,20539,28158,171123,40870,15817,34959,147790,28791,23797,19232,152013,13657,154928,24866,166450,36775,37366,29073,26393,29626,144001,172295,15499,137600,19216,30948,29698,20910,165647,16393,27235,172730,16931,34319,133743,31274,170311,166634,38741,28749,21284,139390,37876,30425,166371,40871,30685,20131,20464,20668,20015,20247,40872,21556,32139,22674,22736,138678,24210,24217,24514,141074,25995,144377,26905,27203,146531,27903,null,29184,148741,29580,16091,150035,23317,29881,35715,154788,153237,31379,31724,31939,32364,33528,34199,40873,34960,40874,36537,40875,36815,34143,39392,37409,40876,167353,136255,16497,17058,23066,null,null,null,39016,26475,17014,22333,null,34262,149883,33471,160013,19585,159092,23931,158485,159678,40877,40878,23446,40879,26343,32347,28247,31178,15752,17603,143958,141206,17306,17718,null,23765,146202,35577,23672,15634,144721,23928,40882,29015,17752,147692,138787,19575,14712,13386,131492,158785,35532,20404,131641,22975,33132,38998,170234,24379,134047,null,139713,166253,16642,18107,168057,16135,40883,172469,16632,14294,18167,158790,16764,165554,160767,17773,14548,152730,17761,17691,19849,19579,19830,17898,16328,150287,13921,17630,17597,16877,23870,23880,23894,15868,14351,23972,23993,14368,14392,24130,24253,24357,24451,14600,14612,14655,14669,24791,24893,23781,14729,25015,25017,25039,14776,25132,25232,25317,25368,14840,22193,14851,25570,25595,25607,25690,14923,25792,23829,22049,40863,14999,25990,15037,26111,26195,15090,26258,15138,26390,15170,26532,26624,15192,26698,26756,15218,15217,15227,26889,26947,29276,26980,27039,27013,15292,27094,15325,27237,27252,27249,27266,15340,27289,15346,27307,27317,27348,27382,27521,27585,27626,27765,27818,15563,27906,27910,27942,28033,15599,28068,28081,28181,28184,28201,28294,166336,28347,28386,28378,40831,28392,28393,28452,28468,15686,147265,28545,28606,15722,15733,29111,23705,15754,28716,15761,28752,28756,28783,28799,28809,131877,17345,13809,134872,147159,22462,159443,28990,153568,13902,27042,166889,23412,31305,153825,169177,31333,31357,154028,31419,31408,31426,31427,29137,156813,16842,31450,31453,31466,16879,21682,154625,31499,31573,31529,152334,154878,31650,31599,33692,154548,158847,31696,33825,31634,31672,154912,15789,154725,33938,31738,31750,31797,154817,31812,31875,149634,31910,26237,148856,31945,31943,31974,31860,31987,31989,31950,32359,17693,159300,32093,159446,29837,32137,32171,28981,32179,32210,147543,155689,32228,15635,32245,137209,32229,164717,32285,155937,155994,32366,32402,17195,37996,32295,32576,32577,32583,31030,156368,39393,32663,156497,32675,136801,131176,17756,145254,17667,164666,32762,156809,32773,32776,32797,32808,32815,172167,158915,32827,32828,32865,141076,18825,157222,146915,157416,26405,32935,166472,33031,33050,22704,141046,27775,156824,151480,25831,136330,33304,137310,27219,150117,150165,17530,33321,133901,158290,146814,20473,136445,34018,33634,158474,149927,144688,137075,146936,33450,26907,194964,16859,34123,33488,33562,134678,137140,14017,143741,144730,33403,33506,33560,147083,159139,158469,158615,144846,15807,33565,21996,33669,17675,159141,33708,33729,33747,13438,159444,27223,34138,13462,159298,143087,33880,154596,33905,15827,17636,27303,33866,146613,31064,33960,158614,159351,159299,34014,33807,33681,17568,33939,34020,154769,16960,154816,17731,34100,23282,159385,17703,34163,17686,26559,34326,165413,165435,34241,159880,34306,136578,159949,194994,17770,34344,13896,137378,21495,160666,34430,34673,172280,34798,142375,34737,34778,34831,22113,34412,26710,17935,34885,34886,161248,146873,161252,34910,34972,18011,34996,34997,25537,35013,30583,161551,35207,35210,35238,35241,35239,35260,166437,35303,162084,162493,35484,30611,37374,35472,162393,31465,162618,147343,18195,162616,29052,35596,35615,152624,152933,35647,35660,35661,35497,150138,35728,35739,35503,136927,17941,34895,35995,163156,163215,195028,14117,163155,36054,163224,163261,36114,36099,137488,36059,28764,36113,150729,16080,36215,36265,163842,135188,149898,15228,164284,160012,31463,36525,36534,36547,37588,36633,36653,164709,164882,36773,37635,172703,133712,36787,18730,166366,165181,146875,24312,143970,36857,172052,165564,165121,140069,14720,159447,36919,165180,162494,36961,165228,165387,37032,165651,37060,165606,37038,37117,37223,15088,37289,37316,31916,166195,138889,37390,27807,37441,37474,153017,37561,166598,146587,166668,153051,134449,37676,37739,166625,166891,28815,23235,166626,166629,18789,37444,166892,166969,166911,37747,37979,36540,38277,38310,37926,38304,28662,17081,140922,165592,135804,146990,18911,27676,38523,38550,16748,38563,159445,25050,38582,30965,166624,38589,21452,18849,158904,131700,156688,168111,168165,150225,137493,144138,38705,34370,38710,18959,17725,17797,150249,28789,23361,38683,38748,168405,38743,23370,168427,38751,37925,20688,143543,143548,38793,38815,38833,38846,38848,38866,38880,152684,38894,29724,169011,38911,38901,168989,162170,19153,38964,38963,38987,39014,15118,160117,15697,132656,147804,153350,39114,39095,39112,39111,19199,159015,136915,21936,39137,39142,39148,37752,39225,150057,19314,170071,170245,39413,39436,39483,39440,39512,153381,14020,168113,170965,39648,39650,170757,39668,19470,39700,39725,165376,20532,39732,158120,14531,143485,39760,39744,171326,23109,137315,39822,148043,39938,39935,39948,171624,40404,171959,172434,172459,172257,172323,172511,40318,40323,172340,40462,26760,40388,139611,172435,172576,137531,172595,40249,172217,172724,40592,40597,40606,40610,19764,40618,40623,148324,40641,15200,14821,15645,20274,14270,166955,40706,40712,19350,37924,159138,40727,40726,40761,22175,22154,40773,39352,168075,38898,33919,40802,40809,31452,40846,29206,19390,149877,149947,29047,150008,148296,150097,29598,166874,137466,31135,166270,167478,37737,37875,166468,37612,37761,37835,166252,148665,29207,16107,30578,31299,28880,148595,148472,29054,137199,28835,137406,144793,16071,137349,152623,137208,14114,136955,137273,14049,137076,137425,155467,14115,136896,22363,150053,136190,135848,136134,136374,34051,145062,34051,33877,149908,160101,146993,152924,147195,159826,17652,145134,170397,159526,26617,14131,15381,15847,22636,137506,26640,16471,145215,147681,147595,147727,158753,21707,22174,157361,22162,135135,134056,134669,37830,166675,37788,20216,20779,14361,148534,20156,132197,131967,20299,20362,153169,23144,131499,132043,14745,131850,132116,13365,20265,131776,167603,131701,35546,131596,20120,20685,20749,20386,20227,150030,147082,20290,20526,20588,20609,20428,20453,20568,20732,20825,20827,20829,20830,28278,144789,147001,147135,28018,137348,147081,20904,20931,132576,17629,132259,132242,132241,36218,166556,132878,21081,21156,133235,21217,37742,18042,29068,148364,134176,149932,135396,27089,134685,29817,16094,29849,29716,29782,29592,19342,150204,147597,21456,13700,29199,147657,21940,131909,21709,134086,22301,37469,38644,37734,22493,22413,22399,13886,22731,23193,166470,136954,137071,136976,23084,22968,37519,23166,23247,23058,153926,137715,137313,148117,14069,27909,29763,23073,155267,23169,166871,132115,37856,29836,135939,28933,18802,37896,166395,37821,14240,23582,23710,24158,24136,137622,137596,146158,24269,23375,137475,137476,14081,137376,14045,136958,14035,33066,166471,138682,144498,166312,24332,24334,137511,137131,23147,137019,23364,34324,161277,34912,24702,141408,140843,24539,16056,140719,140734,168072,159603,25024,131134,131142,140827,24985,24984,24693,142491,142599,149204,168269,25713,149093,142186,14889,142114,144464,170218,142968,25399,173147,25782,25393,25553,149987,142695,25252,142497,25659,25963,26994,15348,143502,144045,149897,144043,21773,144096,137433,169023,26318,144009,143795,15072,16784,152964,166690,152975,136956,152923,152613,30958,143619,137258,143924,13412,143887,143746,148169,26254,159012,26219,19347,26160,161904,138731,26211,144082,144097,26142,153714,14545,145466,145340,15257,145314,144382,29904,15254,26511,149034,26806,26654,15300,27326,14435,145365,148615,27187,27218,27337,27397,137490,25873,26776,27212,15319,27258,27479,147392,146586,37792,37618,166890,166603,37513,163870,166364,37991,28069,28427,149996,28007,147327,15759,28164,147516,23101,28170,22599,27940,30786,28987,148250,148086,28913,29264,29319,29332,149391,149285,20857,150180,132587,29818,147192,144991,150090,149783,155617,16134,16049,150239,166947,147253,24743,16115,29900,29756,37767,29751,17567,159210,17745,30083,16227,150745,150790,16216,30037,30323,173510,15129,29800,166604,149931,149902,15099,15821,150094,16127,149957,149747,37370,22322,37698,166627,137316,20703,152097,152039,30584,143922,30478,30479,30587,149143,145281,14942,149744,29752,29851,16063,150202,150215,16584,150166,156078,37639,152961,30750,30861,30856,30930,29648,31065,161601,153315,16654,31131,33942,31141,27181,147194,31290,31220,16750,136934,16690,37429,31217,134476,149900,131737,146874,137070,13719,21867,13680,13994,131540,134157,31458,23129,141045,154287,154268,23053,131675,30960,23082,154566,31486,16889,31837,31853,16913,154547,155324,155302,31949,150009,137136,31886,31868,31918,27314,32220,32263,32211,32590,156257,155996,162632,32151,155266,17002,158581,133398,26582,131150,144847,22468,156690,156664,149858,32733,31527,133164,154345,154947,31500,155150,39398,34373,39523,27164,144447,14818,150007,157101,39455,157088,33920,160039,158929,17642,33079,17410,32966,33033,33090,157620,39107,158274,33378,33381,158289,33875,159143,34320,160283,23174,16767,137280,23339,137377,23268,137432,34464,195004,146831,34861,160802,23042,34926,20293,34951,35007,35046,35173,35149,153219,35156,161669,161668,166901,166873,166812,166393,16045,33955,18165,18127,14322,35389,35356,169032,24397,37419,148100,26068,28969,28868,137285,40301,35999,36073,163292,22938,30659,23024,17262,14036,36394,36519,150537,36656,36682,17140,27736,28603,140065,18587,28537,28299,137178,39913,14005,149807,37051,37015,21873,18694,37307,37892,166475,16482,166652,37927,166941,166971,34021,35371,38297,38311,38295,38294,167220,29765,16066,149759,150082,148458,16103,143909,38543,167655,167526,167525,16076,149997,150136,147438,29714,29803,16124,38721,168112,26695,18973,168083,153567,38749,37736,166281,166950,166703,156606,37562,23313,35689,18748,29689,147995,38811,38769,39224,134950,24001,166853,150194,38943,169178,37622,169431,37349,17600,166736,150119,166756,39132,166469,16128,37418,18725,33812,39227,39245,162566,15869,39323,19311,39338,39516,166757,153800,27279,39457,23294,39471,170225,19344,170312,39356,19389,19351,37757,22642,135938,22562,149944,136424,30788,141087,146872,26821,15741,37976,14631,24912,141185,141675,24839,40015,40019,40059,39989,39952,39807,39887,171565,39839,172533,172286,40225,19630,147716,40472,19632,40204,172468,172269,172275,170287,40357,33981,159250,159711,158594,34300,17715,159140,159364,159216,33824,34286,159232,145367,155748,31202,144796,144960,18733,149982,15714,37851,37566,37704,131775,30905,37495,37965,20452,13376,36964,152925,30781,30804,30902,30795,137047,143817,149825,13978,20338,28634,28633,28702,28702,21524,147893,22459,22771,22410,40214,22487,28980,13487,147884,29163,158784,151447,23336,137141,166473,24844,23246,23051,17084,148616,14124,19323,166396,37819,37816,137430,134941,33906,158912,136211,148218,142374,148417,22932,146871,157505,32168,155995,155812,149945,149899,166394,37605,29666,16105,29876,166755,137375,16097,150195,27352,29683,29691,16086,150078,150164,137177,150118,132007,136228,149989,29768,149782,28837,149878,37508,29670,37727,132350,37681,166606,166422,37766,166887,153045,18741,166530,29035,149827,134399,22180,132634,134123,134328,21762,31172,137210,32254,136898,150096,137298,17710,37889,14090,166592,149933,22960,137407,137347,160900,23201,14050,146779,14000,37471,23161,166529,137314,37748,15565,133812,19094,14730,20724,15721,15692,136092,29045,17147,164376,28175,168164,17643,27991,163407,28775,27823,15574,147437,146989,28162,28428,15727,132085,30033,14012,13512,18048,16090,18545,22980,37486,18750,36673,166940,158656,22546,22472,14038,136274,28926,148322,150129,143331,135856,140221,26809,26983,136088,144613,162804,145119,166531,145366,144378,150687,27162,145069,158903,33854,17631,17614,159014,159057,158850,159710,28439,160009,33597,137018,33773,158848,159827,137179,22921,23170,137139,23137,23153,137477,147964,14125,23023,137020,14023,29070,37776,26266,148133,23150,23083,148115,27179,147193,161590,148571,148170,28957,148057,166369,20400,159016,23746,148686,163405,148413,27148,148054,135940,28838,28979,148457,15781,27871,194597,150095,32357,23019,23855,15859,24412,150109,137183,32164,33830,21637,146170,144128,131604,22398,133333,132633,16357,139166,172726,28675,168283,23920,29583,31955,166489,168992,20424,32743,29389,29456,162548,29496,29497,153334,29505,29512,16041,162584,36972,29173,149746,29665,33270,16074,30476,16081,27810,22269,29721,29726,29727,16098,16112,16116,16122,29907,16142,16211,30018,30061,30066,30093,16252,30152,30172,16320,30285,16343,30324,16348,30330,151388,29064,22051,35200,22633,16413,30531,16441,26465,16453,13787,30616,16490,16495,23646,30654,30667,22770,30744,28857,30748,16552,30777,30791,30801,30822,33864,152885,31027,26627,31026,16643,16649,31121,31129,36795,31238,36796,16743,31377,16818,31420,33401,16836,31439,31451,16847,20001,31586,31596,31611,31762,31771,16992,17018,31867,31900,17036,31928,17044,31981,36755,28864,134351,32207,32212,32208,32253,32686,32692,29343,17303,32800,32805,31545,32814,32817,32852,15820,22452,28832,32951,33001,17389,33036,29482,33038,33042,30048,33044,17409,15161,33110,33113,33114,17427,22586,33148,33156,17445,33171,17453,33189,22511,33217,33252,33364,17551,33446,33398,33482,33496,33535,17584,33623,38505,27018,33797,28917,33892,24803,33928,17668,33982,34017,34040,34064,34104,34130,17723,34159,34160,34272,17783,34418,34450,34482,34543,38469,34699,17926,17943,34990,35071,35108,35143,35217,162151,35369,35384,35476,35508,35921,36052,36082,36124,18328,22623,36291,18413,20206,36410,21976,22356,36465,22005,36528,18487,36558,36578,36580,36589,36594,36791,36801,36810,36812,36915,39364,18605,39136,37395,18718,37416,37464,37483,37553,37550,37567,37603,37611,37619,37620,37629,37699,37764,37805,18757,18769,40639,37911,21249,37917,37933,37950,18794,37972,38009,38189,38306,18855,38388,38451,18917,26528,18980,38720,18997,38834,38850,22100,19172,24808,39097,19225,39153,22596,39182,39193,20916,39196,39223,39234,39261,39266,19312,39365,19357,39484,39695,31363,39785,39809,39901,39921,39924,19565,39968,14191,138178,40265,39994,40702,22096,40339,40381,40384,40444,38134,36790,40571,40620,40625,40637,40646,38108,40674,40689,40696,31432,40772,131220,131767,132000,26906,38083,22956,132311,22592,38081,14265,132565,132629,132726,136890,22359,29043,133826,133837,134079,21610,194619,134091,21662,134139,134203,134227,134245,134268,24807,134285,22138,134325,134365,134381,134511,134578,134600,26965,39983,34725,134660,134670,134871,135056,134957,134771,23584,135100,24075,135260,135247,135286,26398,135291,135304,135318,13895,135359,135379,135471,135483,21348,33965,135907,136053,135990,35713,136567,136729,137155,137159,20088,28859,137261,137578,137773,137797,138282,138352,138412,138952,25283,138965,139029,29080,26709,139333,27113,14024,139900,140247,140282,141098,141425,141647,33533,141671,141715,142037,35237,142056,36768,142094,38840,142143,38983,39613,142412,null,142472,142519,154600,142600,142610,142775,142741,142914,143220,143308,143411,143462,144159,144350,24497,26184,26303,162425,144743,144883,29185,149946,30679,144922,145174,32391,131910,22709,26382,26904,146087,161367,155618,146961,147129,161278,139418,18640,19128,147737,166554,148206,148237,147515,148276,148374,150085,132554,20946,132625,22943,138920,15294,146687,148484,148694,22408,149108,14747,149295,165352,170441,14178,139715,35678,166734,39382,149522,149755,150037,29193,150208,134264,22885,151205,151430,132985,36570,151596,21135,22335,29041,152217,152601,147274,150183,21948,152646,152686,158546,37332,13427,152895,161330,152926,18200,152930,152934,153543,149823,153693,20582,13563,144332,24798,153859,18300,166216,154286,154505,154630,138640,22433,29009,28598,155906,162834,36950,156082,151450,35682,156674,156746,23899,158711,36662,156804,137500,35562,150006,156808,147439,156946,19392,157119,157365,141083,37989,153569,24981,23079,194765,20411,22201,148769,157436,20074,149812,38486,28047,158909,13848,35191,157593,157806,156689,157790,29151,157895,31554,168128,133649,157990,37124,158009,31301,40432,158202,39462,158253,13919,156777,131105,31107,158260,158555,23852,144665,33743,158621,18128,158884,30011,34917,159150,22710,14108,140685,159819,160205,15444,160384,160389,37505,139642,160395,37680,160486,149968,27705,38047,160848,134904,34855,35061,141606,164979,137137,28344,150058,137248,14756,14009,23568,31203,17727,26294,171181,170148,35139,161740,161880,22230,16607,136714,14753,145199,164072,136133,29101,33638,162269,168360,23143,19639,159919,166315,162301,162314,162571,163174,147834,31555,31102,163849,28597,172767,27139,164632,21410,159239,37823,26678,38749,164207,163875,158133,136173,143919,163912,23941,166960,163971,22293,38947,166217,23979,149896,26046,27093,21458,150181,147329,15377,26422,163984,164084,164142,139169,164175,164233,164271,164378,164614,164655,164746,13770,164968,165546,18682,25574,166230,30728,37461,166328,17394,166375,17375,166376,166726,166868,23032,166921,36619,167877,168172,31569,168208,168252,15863,168286,150218,36816,29327,22155,169191,169449,169392,169400,169778,170193,170313,170346,170435,170536,170766,171354,171419,32415,171768,171811,19620,38215,172691,29090,172799,19857,36882,173515,19868,134300,36798,21953,36794,140464,36793,150163,17673,32383,28502,27313,20202,13540,166700,161949,14138,36480,137205,163876,166764,166809,162366,157359,15851,161365,146615,153141,153942,20122,155265,156248,22207,134765,36366,23405,147080,150686,25566,25296,137206,137339,25904,22061,154698,21530,152337,15814,171416,19581,22050,22046,32585,155352,22901,146752,34672,19996,135146,134473,145082,33047,40286,36120,30267,40005,30286,30649,37701,21554,33096,33527,22053,33074,33816,32957,21994,31074,22083,21526,134813,13774,22021,22001,26353,164578,13869,30004,22000,21946,21655,21874,134209,134294,24272,151880,134774,142434,134818,40619,32090,21982,135285,25245,38765,21652,36045,29174,37238,25596,25529,25598,21865,142147,40050,143027,20890,13535,134567,20903,21581,21790,21779,30310,36397,157834,30129,32950,34820,34694,35015,33206,33820,135361,17644,29444,149254,23440,33547,157843,22139,141044,163119,147875,163187,159440,160438,37232,135641,37384,146684,173737,134828,134905,29286,138402,18254,151490,163833,135147,16634,40029,25887,142752,18675,149472,171388,135148,134666,24674,161187,135149,null,155720,135559,29091,32398,40272,19994,19972,13687,23309,27826,21351,13996,14812,21373,13989,149016,22682,150382,33325,21579,22442,154261,133497,null,14930,140389,29556,171692,19721,39917,146686,171824,19547,151465,169374,171998,33884,146870,160434,157619,145184,25390,32037,147191,146988,14890,36872,21196,15988,13946,17897,132238,30272,23280,134838,30842,163630,22695,16575,22140,39819,23924,30292,173108,40581,19681,30201,14331,24857,143578,148466,null,22109,135849,22439,149859,171526,21044,159918,13741,27722,40316,31830,39737,22494,137068,23635,25811,169168,156469,160100,34477,134440,159010,150242,134513,null,20990,139023,23950,38659,138705,40577,36940,31519,39682,23761,31651,25192,25397,39679,31695,39722,31870,39726,31810,31878,39957,31740,39689,40727,39963,149822,40794,21875,23491,20477,40600,20466,21088,15878,21201,22375,20566,22967,24082,38856,40363,36700,21609,38836,39232,38842,21292,24880,26924,21466,39946,40194,19515,38465,27008,20646,30022,137069,39386,21107,null,37209,38529,37212,null,37201,167575,25471,159011,27338,22033,37262,30074,25221,132092,29519,31856,154657,146685,null,149785,30422,39837,20010,134356,33726,34882,null,23626,27072,20717,22394,21023,24053,20174,27697,131570,20281,21660,21722,21146,36226,13822,24332,13811,null,27474,37244,40869,39831,38958,39092,39610,40616,40580,29050,31508,null,27642,34840,32632,null,22048,173642,36471,40787,null,36308,36431,40476,36353,25218,164733,36392,36469,31443,150135,31294,30936,27882,35431,30215,166490,40742,27854,34774,30147,172722,30803,194624,36108,29410,29553,35629,29442,29937,36075,150203,34351,24506,34976,17591,null,137275,159237,null,35454,140571,null,24829,30311,39639,40260,37742,39823,34805,null,34831,36087,29484,38689,39856,13782,29362,19463,31825,39242,155993,24921,19460,40598,24957,null,22367,24943,25254,25145,25294,14940,25058,21418,144373,25444,26626,13778,23895,166850,36826,167481,null,20697,138566,30982,21298,38456,134971,16485,null,30718,null,31938,155418,31962,31277,32870,32867,32077,29957,29938,35220,33306,26380,32866,160902,32859,29936,33027,30500,35209,157644,30035,159441,34729,34766,33224,34700,35401,36013,35651,30507,29944,34010,13877,27058,36262,null,35241,29800,28089,34753,147473,29927,15835,29046,24740,24988,15569,29026,24695,null,32625,166701,29264,24809,19326,21024,15384,146631,155351,161366,152881,137540,135934,170243,159196,159917,23745,156077,166415,145015,131310,157766,151310,17762,23327,156492,40784,40614,156267,12288,65292,12289,12290,65294,8231,65307,65306,65311,65281,65072,8230,8229,65104,65105,65106,183,65108,65109,65110,65111,65372,8211,65073,8212,65075,9588,65076,65103,65288,65289,65077,65078,65371,65373,65079,65080,12308,12309,65081,65082,12304,12305,65083,65084,12298,12299,65085,65086,12296,12297,65087,65088,12300,12301,65089,65090,12302,12303,65091,65092,65113,65114,65115,65116,65117,65118,8216,8217,8220,8221,12317,12318,8245,8242,65283,65286,65290,8251,167,12291,9675,9679,9651,9650,9678,9734,9733,9671,9670,9633,9632,9661,9660,12963,8453,175,65507,65343,717,65097,65098,65101,65102,65099,65100,65119,65120,65121,65291,65293,215,247,177,8730,65308,65310,65309,8806,8807,8800,8734,8786,8801,65122,65123,65124,65125,65126,65374,8745,8746,8869,8736,8735,8895,13266,13265,8747,8750,8757,8756,9792,9794,8853,8857,8593,8595,8592,8594,8598,8599,8601,8600,8741,8739,65295,65340,8725,65128,65284,65509,12306,65504,65505,65285,65312,8451,8457,65129,65130,65131,13269,13212,13213,13214,13262,13217,13198,13199,13252,176,20825,20827,20830,20829,20833,20835,21991,29929,31950,9601,9602,9603,9604,9605,9606,9607,9608,9615,9614,9613,9612,9611,9610,9609,9532,9524,9516,9508,9500,9620,9472,9474,9621,9484,9488,9492,9496,9581,9582,9584,9583,9552,9566,9578,9569,9698,9699,9701,9700,9585,9586,9587,65296,65297,65298,65299,65300,65301,65302,65303,65304,65305,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,12321,12322,12323,12324,12325,12326,12327,12328,12329,21313,21316,21317,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,65345,65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,12549,12550,12551,12552,12553,12554,12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570,12571,12572,12573,12574,12575,12576,12577,12578,12579,12580,12581,12582,12583,12584,12585,729,713,714,711,715,9216,9217,9218,9219,9220,9221,9222,9223,9224,9225,9226,9227,9228,9229,9230,9231,9232,9233,9234,9235,9236,9237,9238,9239,9240,9241,9242,9243,9244,9245,9246,9247,9249,8364,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,19968,20057,19969,19971,20035,20061,20102,20108,20154,20799,20837,20843,20960,20992,20993,21147,21269,21313,21340,21448,19977,19979,19976,19978,20011,20024,20961,20037,20040,20063,20062,20110,20129,20800,20995,21242,21315,21449,21475,22303,22763,22805,22823,22899,23376,23377,23379,23544,23567,23586,23608,23665,24029,24037,24049,24050,24051,24062,24178,24318,24331,24339,25165,19985,19984,19981,20013,20016,20025,20043,23609,20104,20113,20117,20114,20116,20130,20161,20160,20163,20166,20167,20173,20170,20171,20164,20803,20801,20839,20845,20846,20844,20887,20982,20998,20999,21000,21243,21246,21247,21270,21305,21320,21319,21317,21342,21380,21451,21450,21453,22764,22825,22827,22826,22829,23380,23569,23588,23610,23663,24052,24187,24319,24340,24341,24515,25096,25142,25163,25166,25903,25991,26007,26020,26041,26085,26352,26376,26408,27424,27490,27513,27595,27604,27611,27663,27700,28779,29226,29238,29243,29255,29273,29275,29356,29579,19993,19990,19989,19988,19992,20027,20045,20047,20046,20197,20184,20180,20181,20182,20183,20195,20196,20185,20190,20805,20804,20873,20874,20908,20985,20986,20984,21002,21152,21151,21253,21254,21271,21277,20191,21322,21321,21345,21344,21359,21358,21435,21487,21476,21491,21484,21486,21481,21480,21500,21496,21493,21483,21478,21482,21490,21489,21488,21477,21485,21499,22235,22234,22806,22830,22833,22900,22902,23381,23427,23612,24040,24039,24038,24066,24067,24179,24188,24321,24344,24343,24517,25098,25171,25172,25170,25169,26021,26086,26414,26412,26410,26411,26413,27491,27597,27665,27664,27704,27713,27712,27710,29359,29572,29577,29916,29926,29976,29983,29992,29993,30000,30001,30002,30003,30091,30333,30382,30399,30446,30683,30690,30707,31034,31166,31348,31435,19998,19999,20050,20051,20073,20121,20132,20134,20133,20223,20233,20249,20234,20245,20237,20240,20241,20239,20210,20214,20219,20208,20211,20221,20225,20235,20809,20807,20806,20808,20840,20849,20877,20912,21015,21009,21010,21006,21014,21155,21256,21281,21280,21360,21361,21513,21519,21516,21514,21520,21505,21515,21508,21521,21517,21512,21507,21518,21510,21522,22240,22238,22237,22323,22320,22312,22317,22316,22319,22313,22809,22810,22839,22840,22916,22904,22915,22909,22905,22914,22913,23383,23384,23431,23432,23429,23433,23546,23574,23673,24030,24070,24182,24180,24335,24347,24537,24534,25102,25100,25101,25104,25187,25179,25176,25910,26089,26088,26092,26093,26354,26355,26377,26429,26420,26417,26421,27425,27492,27515,27670,27741,27735,27737,27743,27744,27728,27733,27745,27739,27725,27726,28784,29279,29277,30334,31481,31859,31992,32566,32650,32701,32769,32771,32780,32786,32819,32895,32905,32907,32908,33251,33258,33267,33276,33292,33307,33311,33390,33394,33406,34411,34880,34892,34915,35199,38433,20018,20136,20301,20303,20295,20311,20318,20276,20315,20309,20272,20304,20305,20285,20282,20280,20291,20308,20284,20294,20323,20316,20320,20271,20302,20278,20313,20317,20296,20314,20812,20811,20813,20853,20918,20919,21029,21028,21033,21034,21032,21163,21161,21162,21164,21283,21363,21365,21533,21549,21534,21566,21542,21582,21543,21574,21571,21555,21576,21570,21531,21545,21578,21561,21563,21560,21550,21557,21558,21536,21564,21568,21553,21547,21535,21548,22250,22256,22244,22251,22346,22353,22336,22349,22343,22350,22334,22352,22351,22331,22767,22846,22941,22930,22952,22942,22947,22937,22934,22925,22948,22931,22922,22949,23389,23388,23386,23387,23436,23435,23439,23596,23616,23617,23615,23614,23696,23697,23700,23692,24043,24076,24207,24199,24202,24311,24324,24351,24420,24418,24439,24441,24536,24524,24535,24525,24561,24555,24568,24554,25106,25105,25220,25239,25238,25216,25206,25225,25197,25226,25212,25214,25209,25203,25234,25199,25240,25198,25237,25235,25233,25222,25913,25915,25912,26097,26356,26463,26446,26447,26448,26449,26460,26454,26462,26441,26438,26464,26451,26455,27493,27599,27714,27742,27801,27777,27784,27785,27781,27803,27754,27770,27792,27760,27788,27752,27798,27794,27773,27779,27762,27774,27764,27782,27766,27789,27796,27800,27778,28790,28796,28797,28792,29282,29281,29280,29380,29378,29590,29996,29995,30007,30008,30338,30447,30691,31169,31168,31167,31350,31995,32597,32918,32915,32925,32920,32923,32922,32946,33391,33426,33419,33421,35211,35282,35328,35895,35910,35925,35997,36196,36208,36275,36523,36554,36763,36784,36802,36806,36805,36804,24033,37009,37026,37034,37030,37027,37193,37318,37324,38450,38446,38449,38442,38444,20006,20054,20083,20107,20123,20126,20139,20140,20335,20381,20365,20339,20351,20332,20379,20363,20358,20355,20336,20341,20360,20329,20347,20374,20350,20367,20369,20346,20820,20818,20821,20841,20855,20854,20856,20925,20989,21051,21048,21047,21050,21040,21038,21046,21057,21182,21179,21330,21332,21331,21329,21350,21367,21368,21369,21462,21460,21463,21619,21621,21654,21624,21653,21632,21627,21623,21636,21650,21638,21628,21648,21617,21622,21644,21658,21602,21608,21643,21629,21646,22266,22403,22391,22378,22377,22369,22374,22372,22396,22812,22857,22855,22856,22852,22868,22974,22971,22996,22969,22958,22993,22982,22992,22989,22987,22995,22986,22959,22963,22994,22981,23391,23396,23395,23447,23450,23448,23452,23449,23451,23578,23624,23621,23622,23735,23713,23736,23721,23723,23729,23731,24088,24090,24086,24085,24091,24081,24184,24218,24215,24220,24213,24214,24310,24358,24359,24361,24448,24449,24447,24444,24541,24544,24573,24565,24575,24591,24596,24623,24629,24598,24618,24597,24609,24615,24617,24619,24603,25110,25109,25151,25150,25152,25215,25289,25292,25284,25279,25282,25273,25298,25307,25259,25299,25300,25291,25288,25256,25277,25276,25296,25305,25287,25293,25269,25306,25265,25304,25302,25303,25286,25260,25294,25918,26023,26044,26106,26132,26131,26124,26118,26114,26126,26112,26127,26133,26122,26119,26381,26379,26477,26507,26517,26481,26524,26483,26487,26503,26525,26519,26479,26480,26495,26505,26494,26512,26485,26522,26515,26492,26474,26482,27427,27494,27495,27519,27667,27675,27875,27880,27891,27825,27852,27877,27827,27837,27838,27836,27874,27819,27861,27859,27832,27844,27833,27841,27822,27863,27845,27889,27839,27835,27873,27867,27850,27820,27887,27868,27862,27872,28821,28814,28818,28810,28825,29228,29229,29240,29256,29287,29289,29376,29390,29401,29399,29392,29609,29608,29599,29611,29605,30013,30109,30105,30106,30340,30402,30450,30452,30693,30717,31038,31040,31041,31177,31176,31354,31353,31482,31998,32596,32652,32651,32773,32954,32933,32930,32945,32929,32939,32937,32948,32938,32943,33253,33278,33293,33459,33437,33433,33453,33469,33439,33465,33457,33452,33445,33455,33464,33443,33456,33470,33463,34382,34417,21021,34920,36555,36814,36820,36817,37045,37048,37041,37046,37319,37329,38263,38272,38428,38464,38463,38459,38468,38466,38585,38632,38738,38750,20127,20141,20142,20449,20405,20399,20415,20448,20433,20431,20445,20419,20406,20440,20447,20426,20439,20398,20432,20420,20418,20442,20430,20446,20407,20823,20882,20881,20896,21070,21059,21066,21069,21068,21067,21063,21191,21193,21187,21185,21261,21335,21371,21402,21467,21676,21696,21672,21710,21705,21688,21670,21683,21703,21698,21693,21674,21697,21700,21704,21679,21675,21681,21691,21673,21671,21695,22271,22402,22411,22432,22435,22434,22478,22446,22419,22869,22865,22863,22862,22864,23004,23000,23039,23011,23016,23043,23013,23018,23002,23014,23041,23035,23401,23459,23462,23460,23458,23461,23553,23630,23631,23629,23627,23769,23762,24055,24093,24101,24095,24189,24224,24230,24314,24328,24365,24421,24456,24453,24458,24459,24455,24460,24457,24594,24605,24608,24613,24590,24616,24653,24688,24680,24674,24646,24643,24684,24683,24682,24676,25153,25308,25366,25353,25340,25325,25345,25326,25341,25351,25329,25335,25327,25324,25342,25332,25361,25346,25919,25925,26027,26045,26082,26149,26157,26144,26151,26159,26143,26152,26161,26148,26359,26623,26579,26609,26580,26576,26604,26550,26543,26613,26601,26607,26564,26577,26548,26586,26597,26552,26575,26590,26611,26544,26585,26594,26589,26578,27498,27523,27526,27573,27602,27607,27679,27849,27915,27954,27946,27969,27941,27916,27953,27934,27927,27963,27965,27966,27958,27931,27893,27961,27943,27960,27945,27950,27957,27918,27947,28843,28858,28851,28844,28847,28845,28856,28846,28836,29232,29298,29295,29300,29417,29408,29409,29623,29642,29627,29618,29645,29632,29619,29978,29997,30031,30028,30030,30027,30123,30116,30117,30114,30115,30328,30342,30343,30344,30408,30406,30403,30405,30465,30457,30456,30473,30475,30462,30460,30471,30684,30722,30740,30732,30733,31046,31049,31048,31047,31161,31162,31185,31186,31179,31359,31361,31487,31485,31869,32002,32005,32000,32009,32007,32004,32006,32568,32654,32703,32772,32784,32781,32785,32822,32982,32997,32986,32963,32964,32972,32993,32987,32974,32990,32996,32989,33268,33314,33511,33539,33541,33507,33499,33510,33540,33509,33538,33545,33490,33495,33521,33537,33500,33492,33489,33502,33491,33503,33519,33542,34384,34425,34427,34426,34893,34923,35201,35284,35336,35330,35331,35998,36000,36212,36211,36276,36557,36556,36848,36838,36834,36842,36837,36845,36843,36836,36840,37066,37070,37057,37059,37195,37194,37325,38274,38480,38475,38476,38477,38754,38761,38859,38893,38899,38913,39080,39131,39135,39318,39321,20056,20147,20492,20493,20515,20463,20518,20517,20472,20521,20502,20486,20540,20511,20506,20498,20497,20474,20480,20500,20520,20465,20513,20491,20505,20504,20467,20462,20525,20522,20478,20523,20489,20860,20900,20901,20898,20941,20940,20934,20939,21078,21084,21076,21083,21085,21290,21375,21407,21405,21471,21736,21776,21761,21815,21756,21733,21746,21766,21754,21780,21737,21741,21729,21769,21742,21738,21734,21799,21767,21757,21775,22275,22276,22466,22484,22475,22467,22537,22799,22871,22872,22874,23057,23064,23068,23071,23067,23059,23020,23072,23075,23081,23077,23052,23049,23403,23640,23472,23475,23478,23476,23470,23477,23481,23480,23556,23633,23637,23632,23789,23805,23803,23786,23784,23792,23798,23809,23796,24046,24109,24107,24235,24237,24231,24369,24466,24465,24464,24665,24675,24677,24656,24661,24685,24681,24687,24708,24735,24730,24717,24724,24716,24709,24726,25159,25331,25352,25343,25422,25406,25391,25429,25410,25414,25423,25417,25402,25424,25405,25386,25387,25384,25421,25420,25928,25929,26009,26049,26053,26178,26185,26191,26179,26194,26188,26181,26177,26360,26388,26389,26391,26657,26680,26696,26694,26707,26681,26690,26708,26665,26803,26647,26700,26705,26685,26612,26704,26688,26684,26691,26666,26693,26643,26648,26689,27530,27529,27575,27683,27687,27688,27686,27684,27888,28010,28053,28040,28039,28006,28024,28023,27993,28051,28012,28041,28014,27994,28020,28009,28044,28042,28025,28037,28005,28052,28874,28888,28900,28889,28872,28879,29241,29305,29436,29433,29437,29432,29431,29574,29677,29705,29678,29664,29674,29662,30036,30045,30044,30042,30041,30142,30149,30151,30130,30131,30141,30140,30137,30146,30136,30347,30384,30410,30413,30414,30505,30495,30496,30504,30697,30768,30759,30776,30749,30772,30775,30757,30765,30752,30751,30770,31061,31056,31072,31071,31062,31070,31069,31063,31066,31204,31203,31207,31199,31206,31209,31192,31364,31368,31449,31494,31505,31881,32033,32023,32011,32010,32032,32034,32020,32016,32021,32026,32028,32013,32025,32027,32570,32607,32660,32709,32705,32774,32792,32789,32793,32791,32829,32831,33009,33026,33008,33029,33005,33012,33030,33016,33011,33032,33021,33034,33020,33007,33261,33260,33280,33296,33322,33323,33320,33324,33467,33579,33618,33620,33610,33592,33616,33609,33589,33588,33615,33586,33593,33590,33559,33600,33585,33576,33603,34388,34442,34474,34451,34468,34473,34444,34467,34460,34928,34935,34945,34946,34941,34937,35352,35344,35342,35340,35349,35338,35351,35347,35350,35343,35345,35912,35962,35961,36001,36002,36215,36524,36562,36564,36559,36785,36865,36870,36855,36864,36858,36852,36867,36861,36869,36856,37013,37089,37085,37090,37202,37197,37196,37336,37341,37335,37340,37337,38275,38498,38499,38497,38491,38493,38500,38488,38494,38587,39138,39340,39592,39640,39717,39730,39740,20094,20602,20605,20572,20551,20547,20556,20570,20553,20581,20598,20558,20565,20597,20596,20599,20559,20495,20591,20589,20828,20885,20976,21098,21103,21202,21209,21208,21205,21264,21263,21273,21311,21312,21310,21443,26364,21830,21866,21862,21828,21854,21857,21827,21834,21809,21846,21839,21845,21807,21860,21816,21806,21852,21804,21859,21811,21825,21847,22280,22283,22281,22495,22533,22538,22534,22496,22500,22522,22530,22581,22519,22521,22816,22882,23094,23105,23113,23142,23146,23104,23100,23138,23130,23110,23114,23408,23495,23493,23492,23490,23487,23494,23561,23560,23559,23648,23644,23645,23815,23814,23822,23835,23830,23842,23825,23849,23828,23833,23844,23847,23831,24034,24120,24118,24115,24119,24247,24248,24246,24245,24254,24373,24375,24407,24428,24425,24427,24471,24473,24478,24472,24481,24480,24476,24703,24739,24713,24736,24744,24779,24756,24806,24765,24773,24763,24757,24796,24764,24792,24789,24774,24799,24760,24794,24775,25114,25115,25160,25504,25511,25458,25494,25506,25509,25463,25447,25496,25514,25457,25513,25481,25475,25499,25451,25512,25476,25480,25497,25505,25516,25490,25487,25472,25467,25449,25448,25466,25949,25942,25937,25945,25943,21855,25935,25944,25941,25940,26012,26011,26028,26063,26059,26060,26062,26205,26202,26212,26216,26214,26206,26361,21207,26395,26753,26799,26786,26771,26805,26751,26742,26801,26791,26775,26800,26755,26820,26797,26758,26757,26772,26781,26792,26783,26785,26754,27442,27578,27627,27628,27691,28046,28092,28147,28121,28082,28129,28108,28132,28155,28154,28165,28103,28107,28079,28113,28078,28126,28153,28088,28151,28149,28101,28114,28186,28085,28122,28139,28120,28138,28145,28142,28136,28102,28100,28074,28140,28095,28134,28921,28937,28938,28925,28911,29245,29309,29313,29468,29467,29462,29459,29465,29575,29701,29706,29699,29702,29694,29709,29920,29942,29943,29980,29986,30053,30054,30050,30064,30095,30164,30165,30133,30154,30157,30350,30420,30418,30427,30519,30526,30524,30518,30520,30522,30827,30787,30798,31077,31080,31085,31227,31378,31381,31520,31528,31515,31532,31526,31513,31518,31534,31890,31895,31893,32070,32067,32113,32046,32057,32060,32064,32048,32051,32068,32047,32066,32050,32049,32573,32670,32666,32716,32718,32722,32796,32842,32838,33071,33046,33059,33067,33065,33072,33060,33282,33333,33335,33334,33337,33678,33694,33688,33656,33698,33686,33725,33707,33682,33674,33683,33673,33696,33655,33659,33660,33670,33703,34389,24426,34503,34496,34486,34500,34485,34502,34507,34481,34479,34505,34899,34974,34952,34987,34962,34966,34957,34955,35219,35215,35370,35357,35363,35365,35377,35373,35359,35355,35362,35913,35930,36009,36012,36011,36008,36010,36007,36199,36198,36286,36282,36571,36575,36889,36877,36890,36887,36899,36895,36893,36880,36885,36894,36896,36879,36898,36886,36891,36884,37096,37101,37117,37207,37326,37365,37350,37347,37351,37357,37353,38281,38506,38517,38515,38520,38512,38516,38518,38519,38508,38592,38634,38633,31456,31455,38914,38915,39770,40165,40565,40575,40613,40635,20642,20621,20613,20633,20625,20608,20630,20632,20634,26368,20977,21106,21108,21109,21097,21214,21213,21211,21338,21413,21883,21888,21927,21884,21898,21917,21912,21890,21916,21930,21908,21895,21899,21891,21939,21934,21919,21822,21938,21914,21947,21932,21937,21886,21897,21931,21913,22285,22575,22570,22580,22564,22576,22577,22561,22557,22560,22777,22778,22880,23159,23194,23167,23186,23195,23207,23411,23409,23506,23500,23507,23504,23562,23563,23601,23884,23888,23860,23879,24061,24133,24125,24128,24131,24190,24266,24257,24258,24260,24380,24429,24489,24490,24488,24785,24801,24754,24758,24800,24860,24867,24826,24853,24816,24827,24820,24936,24817,24846,24822,24841,24832,24850,25119,25161,25507,25484,25551,25536,25577,25545,25542,25549,25554,25571,25552,25569,25558,25581,25582,25462,25588,25578,25563,25682,25562,25593,25950,25958,25954,25955,26001,26000,26031,26222,26224,26228,26230,26223,26257,26234,26238,26231,26366,26367,26399,26397,26874,26837,26848,26840,26839,26885,26847,26869,26862,26855,26873,26834,26866,26851,26827,26829,26893,26898,26894,26825,26842,26990,26875,27454,27450,27453,27544,27542,27580,27631,27694,27695,27692,28207,28216,28244,28193,28210,28263,28234,28192,28197,28195,28187,28251,28248,28196,28246,28270,28205,28198,28271,28212,28237,28218,28204,28227,28189,28222,28363,28297,28185,28238,28259,28228,28274,28265,28255,28953,28954,28966,28976,28961,28982,29038,28956,29260,29316,29312,29494,29477,29492,29481,29754,29738,29747,29730,29733,29749,29750,29748,29743,29723,29734,29736,29989,29990,30059,30058,30178,30171,30179,30169,30168,30174,30176,30331,30332,30358,30355,30388,30428,30543,30701,30813,30828,30831,31245,31240,31243,31237,31232,31384,31383,31382,31461,31459,31561,31574,31558,31568,31570,31572,31565,31563,31567,31569,31903,31909,32094,32080,32104,32085,32043,32110,32114,32097,32102,32098,32112,32115,21892,32724,32725,32779,32850,32901,33109,33108,33099,33105,33102,33081,33094,33086,33100,33107,33140,33298,33308,33769,33795,33784,33805,33760,33733,33803,33729,33775,33777,33780,33879,33802,33776,33804,33740,33789,33778,33738,33848,33806,33796,33756,33799,33748,33759,34395,34527,34521,34541,34516,34523,34532,34512,34526,34903,35009,35010,34993,35203,35222,35387,35424,35413,35422,35388,35393,35412,35419,35408,35398,35380,35386,35382,35414,35937,35970,36015,36028,36019,36029,36033,36027,36032,36020,36023,36022,36031,36024,36234,36229,36225,36302,36317,36299,36314,36305,36300,36315,36294,36603,36600,36604,36764,36910,36917,36913,36920,36914,36918,37122,37109,37129,37118,37219,37221,37327,37396,37397,37411,37385,37406,37389,37392,37383,37393,38292,38287,38283,38289,38291,38290,38286,38538,38542,38539,38525,38533,38534,38541,38514,38532,38593,38597,38596,38598,38599,38639,38642,38860,38917,38918,38920,39143,39146,39151,39145,39154,39149,39342,39341,40643,40653,40657,20098,20653,20661,20658,20659,20677,20670,20652,20663,20667,20655,20679,21119,21111,21117,21215,21222,21220,21218,21219,21295,21983,21992,21971,21990,21966,21980,21959,21969,21987,21988,21999,21978,21985,21957,21958,21989,21961,22290,22291,22622,22609,22616,22615,22618,22612,22635,22604,22637,22602,22626,22610,22603,22887,23233,23241,23244,23230,23229,23228,23219,23234,23218,23913,23919,24140,24185,24265,24264,24338,24409,24492,24494,24858,24847,24904,24863,24819,24859,24825,24833,24840,24910,24908,24900,24909,24894,24884,24871,24845,24838,24887,25121,25122,25619,25662,25630,25642,25645,25661,25644,25615,25628,25620,25613,25654,25622,25623,25606,25964,26015,26032,26263,26249,26247,26248,26262,26244,26264,26253,26371,27028,26989,26970,26999,26976,26964,26997,26928,27010,26954,26984,26987,26974,26963,27001,27014,26973,26979,26971,27463,27506,27584,27583,27603,27645,28322,28335,28371,28342,28354,28304,28317,28359,28357,28325,28312,28348,28346,28331,28369,28310,28316,28356,28372,28330,28327,28340,29006,29017,29033,29028,29001,29031,29020,29036,29030,29004,29029,29022,28998,29032,29014,29242,29266,29495,29509,29503,29502,29807,29786,29781,29791,29790,29761,29759,29785,29787,29788,30070,30072,30208,30192,30209,30194,30193,30202,30207,30196,30195,30430,30431,30555,30571,30566,30558,30563,30585,30570,30572,30556,30565,30568,30562,30702,30862,30896,30871,30872,30860,30857,30844,30865,30867,30847,31098,31103,31105,33836,31165,31260,31258,31264,31252,31263,31262,31391,31392,31607,31680,31584,31598,31591,31921,31923,31925,32147,32121,32145,32129,32143,32091,32622,32617,32618,32626,32681,32680,32676,32854,32856,32902,32900,33137,33136,33144,33125,33134,33139,33131,33145,33146,33126,33285,33351,33922,33911,33853,33841,33909,33894,33899,33865,33900,33883,33852,33845,33889,33891,33897,33901,33862,34398,34396,34399,34553,34579,34568,34567,34560,34558,34555,34562,34563,34566,34570,34905,35039,35028,35033,35036,35032,35037,35041,35018,35029,35026,35228,35299,35435,35442,35443,35430,35433,35440,35463,35452,35427,35488,35441,35461,35437,35426,35438,35436,35449,35451,35390,35432,35938,35978,35977,36042,36039,36040,36036,36018,36035,36034,36037,36321,36319,36328,36335,36339,36346,36330,36324,36326,36530,36611,36617,36606,36618,36767,36786,36939,36938,36947,36930,36948,36924,36949,36944,36935,36943,36942,36941,36945,36926,36929,37138,37143,37228,37226,37225,37321,37431,37463,37432,37437,37440,37438,37467,37451,37476,37457,37428,37449,37453,37445,37433,37439,37466,38296,38552,38548,38549,38605,38603,38601,38602,38647,38651,38649,38646,38742,38772,38774,38928,38929,38931,38922,38930,38924,39164,39156,39165,39166,39347,39345,39348,39649,40169,40578,40718,40723,40736,20711,20718,20709,20694,20717,20698,20693,20687,20689,20721,20686,20713,20834,20979,21123,21122,21297,21421,22014,22016,22043,22039,22013,22036,22022,22025,22029,22030,22007,22038,22047,22024,22032,22006,22296,22294,22645,22654,22659,22675,22666,22649,22661,22653,22781,22821,22818,22820,22890,22889,23265,23270,23273,23255,23254,23256,23267,23413,23518,23527,23521,23525,23526,23528,23522,23524,23519,23565,23650,23940,23943,24155,24163,24149,24151,24148,24275,24278,24330,24390,24432,24505,24903,24895,24907,24951,24930,24931,24927,24922,24920,24949,25130,25735,25688,25684,25764,25720,25695,25722,25681,25703,25652,25709,25723,25970,26017,26071,26070,26274,26280,26269,27036,27048,27029,27073,27054,27091,27083,27035,27063,27067,27051,27060,27088,27085,27053,27084,27046,27075,27043,27465,27468,27699,28467,28436,28414,28435,28404,28457,28478,28448,28460,28431,28418,28450,28415,28399,28422,28465,28472,28466,28451,28437,28459,28463,28552,28458,28396,28417,28402,28364,28407,29076,29081,29053,29066,29060,29074,29246,29330,29334,29508,29520,29796,29795,29802,29808,29805,29956,30097,30247,30221,30219,30217,30227,30433,30435,30596,30589,30591,30561,30913,30879,30887,30899,30889,30883,31118,31119,31117,31278,31281,31402,31401,31469,31471,31649,31637,31627,31605,31639,31645,31636,31631,31672,31623,31620,31929,31933,31934,32187,32176,32156,32189,32190,32160,32202,32180,32178,32177,32186,32162,32191,32181,32184,32173,32210,32199,32172,32624,32736,32737,32735,32862,32858,32903,33104,33152,33167,33160,33162,33151,33154,33255,33274,33287,33300,33310,33355,33993,33983,33990,33988,33945,33950,33970,33948,33995,33976,33984,34003,33936,33980,34001,33994,34623,34588,34619,34594,34597,34612,34584,34645,34615,34601,35059,35074,35060,35065,35064,35069,35048,35098,35055,35494,35468,35486,35491,35469,35489,35475,35492,35498,35493,35496,35480,35473,35482,35495,35946,35981,35980,36051,36049,36050,36203,36249,36245,36348,36628,36626,36629,36627,36771,36960,36952,36956,36963,36953,36958,36962,36957,36955,37145,37144,37150,37237,37240,37239,37236,37496,37504,37509,37528,37526,37499,37523,37532,37544,37500,37521,38305,38312,38313,38307,38309,38308,38553,38556,38555,38604,38610,38656,38780,38789,38902,38935,38936,39087,39089,39171,39173,39180,39177,39361,39599,39600,39654,39745,39746,40180,40182,40179,40636,40763,40778,20740,20736,20731,20725,20729,20738,20744,20745,20741,20956,21127,21128,21129,21133,21130,21232,21426,22062,22075,22073,22066,22079,22068,22057,22099,22094,22103,22132,22070,22063,22064,22656,22687,22686,22707,22684,22702,22697,22694,22893,23305,23291,23307,23285,23308,23304,23534,23532,23529,23531,23652,23653,23965,23956,24162,24159,24161,24290,24282,24287,24285,24291,24288,24392,24433,24503,24501,24950,24935,24942,24925,24917,24962,24956,24944,24939,24958,24999,24976,25003,24974,25004,24986,24996,24980,25006,25134,25705,25711,25721,25758,25778,25736,25744,25776,25765,25747,25749,25769,25746,25774,25773,25771,25754,25772,25753,25762,25779,25973,25975,25976,26286,26283,26292,26289,27171,27167,27112,27137,27166,27161,27133,27169,27155,27146,27123,27138,27141,27117,27153,27472,27470,27556,27589,27590,28479,28540,28548,28497,28518,28500,28550,28525,28507,28536,28526,28558,28538,28528,28516,28567,28504,28373,28527,28512,28511,29087,29100,29105,29096,29270,29339,29518,29527,29801,29835,29827,29822,29824,30079,30240,30249,30239,30244,30246,30241,30242,30362,30394,30436,30606,30599,30604,30609,30603,30923,30917,30906,30922,30910,30933,30908,30928,31295,31292,31296,31293,31287,31291,31407,31406,31661,31665,31684,31668,31686,31687,31681,31648,31692,31946,32224,32244,32239,32251,32216,32236,32221,32232,32227,32218,32222,32233,32158,32217,32242,32249,32629,32631,32687,32745,32806,33179,33180,33181,33184,33178,33176,34071,34109,34074,34030,34092,34093,34067,34065,34083,34081,34068,34028,34085,34047,34054,34690,34676,34678,34656,34662,34680,34664,34649,34647,34636,34643,34907,34909,35088,35079,35090,35091,35093,35082,35516,35538,35527,35524,35477,35531,35576,35506,35529,35522,35519,35504,35542,35533,35510,35513,35547,35916,35918,35948,36064,36062,36070,36068,36076,36077,36066,36067,36060,36074,36065,36205,36255,36259,36395,36368,36381,36386,36367,36393,36383,36385,36382,36538,36637,36635,36639,36649,36646,36650,36636,36638,36645,36969,36974,36968,36973,36983,37168,37165,37159,37169,37255,37257,37259,37251,37573,37563,37559,37610,37548,37604,37569,37555,37564,37586,37575,37616,37554,38317,38321,38660,38662,38663,38665,38752,38797,38795,38799,38945,38955,38940,39091,39178,39187,39186,39192,39389,39376,39391,39387,39377,39381,39378,39385,39607,39662,39663,39719,39749,39748,39799,39791,40198,40201,40195,40617,40638,40654,22696,40786,20754,20760,20756,20752,20757,20864,20906,20957,21137,21139,21235,22105,22123,22137,22121,22116,22136,22122,22120,22117,22129,22127,22124,22114,22134,22721,22718,22727,22725,22894,23325,23348,23416,23536,23566,24394,25010,24977,25001,24970,25037,25014,25022,25034,25032,25136,25797,25793,25803,25787,25788,25818,25796,25799,25794,25805,25791,25810,25812,25790,25972,26310,26313,26297,26308,26311,26296,27197,27192,27194,27225,27243,27224,27193,27204,27234,27233,27211,27207,27189,27231,27208,27481,27511,27653,28610,28593,28577,28611,28580,28609,28583,28595,28608,28601,28598,28582,28576,28596,29118,29129,29136,29138,29128,29141,29113,29134,29145,29148,29123,29124,29544,29852,29859,29848,29855,29854,29922,29964,29965,30260,30264,30266,30439,30437,30624,30622,30623,30629,30952,30938,30956,30951,31142,31309,31310,31302,31308,31307,31418,31705,31761,31689,31716,31707,31713,31721,31718,31957,31958,32266,32273,32264,32283,32291,32286,32285,32265,32272,32633,32690,32752,32753,32750,32808,33203,33193,33192,33275,33288,33368,33369,34122,34137,34120,34152,34153,34115,34121,34157,34154,34142,34691,34719,34718,34722,34701,34913,35114,35122,35109,35115,35105,35242,35238,35558,35578,35563,35569,35584,35548,35559,35566,35582,35585,35586,35575,35565,35571,35574,35580,35947,35949,35987,36084,36420,36401,36404,36418,36409,36405,36667,36655,36664,36659,36776,36774,36981,36980,36984,36978,36988,36986,37172,37266,37664,37686,37624,37683,37679,37666,37628,37675,37636,37658,37648,37670,37665,37653,37678,37657,38331,38567,38568,38570,38613,38670,38673,38678,38669,38675,38671,38747,38748,38758,38808,38960,38968,38971,38967,38957,38969,38948,39184,39208,39198,39195,39201,39194,39405,39394,39409,39608,39612,39675,39661,39720,39825,40213,40227,40230,40232,40210,40219,40664,40660,40845,40860,20778,20767,20769,20786,21237,22158,22144,22160,22149,22151,22159,22741,22739,22737,22734,23344,23338,23332,23418,23607,23656,23996,23994,23997,23992,24171,24396,24509,25033,25026,25031,25062,25035,25138,25140,25806,25802,25816,25824,25840,25830,25836,25841,25826,25837,25986,25987,26329,26326,27264,27284,27268,27298,27292,27355,27299,27262,27287,27280,27296,27484,27566,27610,27656,28632,28657,28639,28640,28635,28644,28651,28655,28544,28652,28641,28649,28629,28654,28656,29159,29151,29166,29158,29157,29165,29164,29172,29152,29237,29254,29552,29554,29865,29872,29862,29864,30278,30274,30284,30442,30643,30634,30640,30636,30631,30637,30703,30967,30970,30964,30959,30977,31143,31146,31319,31423,31751,31757,31742,31735,31756,31712,31968,31964,31966,31970,31967,31961,31965,32302,32318,32326,32311,32306,32323,32299,32317,32305,32325,32321,32308,32313,32328,32309,32319,32303,32580,32755,32764,32881,32882,32880,32879,32883,33222,33219,33210,33218,33216,33215,33213,33225,33214,33256,33289,33393,34218,34180,34174,34204,34193,34196,34223,34203,34183,34216,34186,34407,34752,34769,34739,34770,34758,34731,34747,34746,34760,34763,35131,35126,35140,35128,35133,35244,35598,35607,35609,35611,35594,35616,35613,35588,35600,35905,35903,35955,36090,36093,36092,36088,36091,36264,36425,36427,36424,36426,36676,36670,36674,36677,36671,36991,36989,36996,36993,36994,36992,37177,37283,37278,37276,37709,37762,37672,37749,37706,37733,37707,37656,37758,37740,37723,37744,37722,37716,38346,38347,38348,38344,38342,38577,38584,38614,38684,38686,38816,38867,38982,39094,39221,39425,39423,39854,39851,39850,39853,40251,40255,40587,40655,40670,40668,40669,40667,40766,40779,21474,22165,22190,22745,22744,23352,24413,25059,25139,25844,25842,25854,25862,25850,25851,25847,26039,26332,26406,27315,27308,27331,27323,27320,27330,27310,27311,27487,27512,27567,28681,28683,28670,28678,28666,28689,28687,29179,29180,29182,29176,29559,29557,29863,29887,29973,30294,30296,30290,30653,30655,30651,30652,30990,31150,31329,31330,31328,31428,31429,31787,31783,31786,31774,31779,31777,31975,32340,32341,32350,32346,32353,32338,32345,32584,32761,32763,32887,32886,33229,33231,33290,34255,34217,34253,34256,34249,34224,34234,34233,34214,34799,34796,34802,34784,35206,35250,35316,35624,35641,35628,35627,35920,36101,36441,36451,36454,36452,36447,36437,36544,36681,36685,36999,36995,37000,37291,37292,37328,37780,37770,37782,37794,37811,37806,37804,37808,37784,37786,37783,38356,38358,38352,38357,38626,38620,38617,38619,38622,38692,38819,38822,38829,38905,38989,38991,38988,38990,38995,39098,39230,39231,39229,39214,39333,39438,39617,39683,39686,39759,39758,39757,39882,39881,39933,39880,39872,40273,40285,40288,40672,40725,40748,20787,22181,22750,22751,22754,23541,40848,24300,25074,25079,25078,25077,25856,25871,26336,26333,27365,27357,27354,27347,28699,28703,28712,28698,28701,28693,28696,29190,29197,29272,29346,29560,29562,29885,29898,29923,30087,30086,30303,30305,30663,31001,31153,31339,31337,31806,31807,31800,31805,31799,31808,32363,32365,32377,32361,32362,32645,32371,32694,32697,32696,33240,34281,34269,34282,34261,34276,34277,34295,34811,34821,34829,34809,34814,35168,35167,35158,35166,35649,35676,35672,35657,35674,35662,35663,35654,35673,36104,36106,36476,36466,36487,36470,36460,36474,36468,36692,36686,36781,37002,37003,37297,37294,37857,37841,37855,37827,37832,37852,37853,37846,37858,37837,37848,37860,37847,37864,38364,38580,38627,38698,38695,38753,38876,38907,39006,39000,39003,39100,39237,39241,39446,39449,39693,39912,39911,39894,39899,40329,40289,40306,40298,40300,40594,40599,40595,40628,21240,22184,22199,22198,22196,22204,22756,23360,23363,23421,23542,24009,25080,25082,25880,25876,25881,26342,26407,27372,28734,28720,28722,29200,29563,29903,30306,30309,31014,31018,31020,31019,31431,31478,31820,31811,31821,31983,31984,36782,32381,32380,32386,32588,32768,33242,33382,34299,34297,34321,34298,34310,34315,34311,34314,34836,34837,35172,35258,35320,35696,35692,35686,35695,35679,35691,36111,36109,36489,36481,36485,36482,37300,37323,37912,37891,37885,38369,38704,39108,39250,39249,39336,39467,39472,39479,39477,39955,39949,40569,40629,40680,40751,40799,40803,40801,20791,20792,22209,22208,22210,22804,23660,24013,25084,25086,25885,25884,26005,26345,27387,27396,27386,27570,28748,29211,29351,29910,29908,30313,30675,31824,32399,32396,32700,34327,34349,34330,34851,34850,34849,34847,35178,35180,35261,35700,35703,35709,36115,36490,36493,36491,36703,36783,37306,37934,37939,37941,37946,37944,37938,37931,38370,38712,38713,38706,38911,39015,39013,39255,39493,39491,39488,39486,39631,39764,39761,39981,39973,40367,40372,40386,40376,40605,40687,40729,40796,40806,40807,20796,20795,22216,22218,22217,23423,24020,24018,24398,25087,25892,27402,27489,28753,28760,29568,29924,30090,30318,30316,31155,31840,31839,32894,32893,33247,35186,35183,35324,35712,36118,36119,36497,36499,36705,37192,37956,37969,37970,38717,38718,38851,38849,39019,39253,39509,39501,39634,39706,40009,39985,39998,39995,40403,40407,40756,40812,40810,40852,22220,24022,25088,25891,25899,25898,26348,27408,29914,31434,31844,31843,31845,32403,32406,32404,33250,34360,34367,34865,35722,37008,37007,37987,37984,37988,38760,39023,39260,39514,39515,39511,39635,39636,39633,40020,40023,40022,40421,40607,40692,22225,22761,25900,28766,30321,30322,30679,32592,32648,34870,34873,34914,35731,35730,35734,33399,36123,37312,37994,38722,38728,38724,38854,39024,39519,39714,39768,40031,40441,40442,40572,40573,40711,40823,40818,24307,27414,28771,31852,31854,34875,35264,36513,37313,38002,38000,39025,39262,39638,39715,40652,28772,30682,35738,38007,38857,39522,39525,32412,35740,36522,37317,38013,38014,38012,40055,40056,40695,35924,38015,40474,29224,39530,39729,40475,40478,31858,9312,9313,9314,9315,9316,9317,9318,9319,9320,9321,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,20022,20031,20101,20128,20866,20886,20907,21241,21304,21353,21430,22794,23424,24027,12083,24191,24308,24400,24417,25908,26080,30098,30326,36789,38582,168,710,12541,12542,12445,12446,12291,20189,12293,12294,12295,12540,65339,65341,10045,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,8679,8632,8633,12751,131276,20058,131210,20994,17553,40880,20872,40881,161287,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,65506,65508,65287,65282,12849,8470,8481,12443,12444,11904,11908,11910,11911,11912,11914,11916,11917,11925,11932,11933,11941,11943,11946,11948,11950,11958,11964,11966,11974,11978,11980,11981,11983,11990,11991,11998,12003,null,null,null,643,592,603,596,629,339,248,331,650,618,20034,20060,20981,21274,21378,19975,19980,20039,20109,22231,64012,23662,24435,19983,20871,19982,20014,20115,20162,20169,20168,20888,21244,21356,21433,22304,22787,22828,23568,24063,26081,27571,27596,27668,29247,20017,20028,20200,20188,20201,20193,20189,20186,21004,21276,21324,22306,22307,22807,22831,23425,23428,23570,23611,23668,23667,24068,24192,24194,24521,25097,25168,27669,27702,27715,27711,27707,29358,29360,29578,31160,32906,38430,20238,20248,20268,20213,20244,20209,20224,20215,20232,20253,20226,20229,20258,20243,20228,20212,20242,20913,21011,21001,21008,21158,21282,21279,21325,21386,21511,22241,22239,22318,22314,22324,22844,22912,22908,22917,22907,22910,22903,22911,23382,23573,23589,23676,23674,23675,23678,24031,24181,24196,24322,24346,24436,24533,24532,24527,25180,25182,25188,25185,25190,25186,25177,25184,25178,25189,26095,26094,26430,26425,26424,26427,26426,26431,26428,26419,27672,27718,27730,27740,27727,27722,27732,27723,27724,28785,29278,29364,29365,29582,29994,30335,31349,32593,33400,33404,33408,33405,33407,34381,35198,37017,37015,37016,37019,37012,38434,38436,38432,38435,20310,20283,20322,20297,20307,20324,20286,20327,20306,20319,20289,20312,20269,20275,20287,20321,20879,20921,21020,21022,21025,21165,21166,21257,21347,21362,21390,21391,21552,21559,21546,21588,21573,21529,21532,21541,21528,21565,21583,21569,21544,21540,21575,22254,22247,22245,22337,22341,22348,22345,22347,22354,22790,22848,22950,22936,22944,22935,22926,22946,22928,22927,22951,22945,23438,23442,23592,23594,23693,23695,23688,23691,23689,23698,23690,23686,23699,23701,24032,24074,24078,24203,24201,24204,24200,24205,24325,24349,24440,24438,24530,24529,24528,24557,24552,24558,24563,24545,24548,24547,24570,24559,24567,24571,24576,24564,25146,25219,25228,25230,25231,25236,25223,25201,25211,25210,25200,25217,25224,25207,25213,25202,25204,25911,26096,26100,26099,26098,26101,26437,26439,26457,26453,26444,26440,26461,26445,26458,26443,27600,27673,27674,27768,27751,27755,27780,27787,27791,27761,27759,27753,27802,27757,27783,27797,27804,27750,27763,27749,27771,27790,28788,28794,29283,29375,29373,29379,29382,29377,29370,29381,29589,29591,29587,29588,29586,30010,30009,30100,30101,30337,31037,32820,32917,32921,32912,32914,32924,33424,33423,33413,33422,33425,33427,33418,33411,33412,35960,36809,36799,37023,37025,37029,37022,37031,37024,38448,38440,38447,38445,20019,20376,20348,20357,20349,20352,20359,20342,20340,20361,20356,20343,20300,20375,20330,20378,20345,20353,20344,20368,20380,20372,20382,20370,20354,20373,20331,20334,20894,20924,20926,21045,21042,21043,21062,21041,21180,21258,21259,21308,21394,21396,21639,21631,21633,21649,21634,21640,21611,21626,21630,21605,21612,21620,21606,21645,21615,21601,21600,21656,21603,21607,21604,22263,22265,22383,22386,22381,22379,22385,22384,22390,22400,22389,22395,22387,22388,22370,22376,22397,22796,22853,22965,22970,22991,22990,22962,22988,22977,22966,22972,22979,22998,22961,22973,22976,22984,22964,22983,23394,23397,23443,23445,23620,23623,23726,23716,23712,23733,23727,23720,23724,23711,23715,23725,23714,23722,23719,23709,23717,23734,23728,23718,24087,24084,24089,24360,24354,24355,24356,24404,24450,24446,24445,24542,24549,24621,24614,24601,24626,24587,24628,24586,24599,24627,24602,24606,24620,24610,24589,24592,24622,24595,24593,24588,24585,24604,25108,25149,25261,25268,25297,25278,25258,25270,25290,25262,25267,25263,25275,25257,25264,25272,25917,26024,26043,26121,26108,26116,26130,26120,26107,26115,26123,26125,26117,26109,26129,26128,26358,26378,26501,26476,26510,26514,26486,26491,26520,26502,26500,26484,26509,26508,26490,26527,26513,26521,26499,26493,26497,26488,26489,26516,27429,27520,27518,27614,27677,27795,27884,27883,27886,27865,27830,27860,27821,27879,27831,27856,27842,27834,27843,27846,27885,27890,27858,27869,27828,27786,27805,27776,27870,27840,27952,27853,27847,27824,27897,27855,27881,27857,28820,28824,28805,28819,28806,28804,28817,28822,28802,28826,28803,29290,29398,29387,29400,29385,29404,29394,29396,29402,29388,29393,29604,29601,29613,29606,29602,29600,29612,29597,29917,29928,30015,30016,30014,30092,30104,30383,30451,30449,30448,30453,30712,30716,30713,30715,30714,30711,31042,31039,31173,31352,31355,31483,31861,31997,32821,32911,32942,32931,32952,32949,32941,33312,33440,33472,33451,33434,33432,33435,33461,33447,33454,33468,33438,33466,33460,33448,33441,33449,33474,33444,33475,33462,33442,34416,34415,34413,34414,35926,36818,36811,36819,36813,36822,36821,36823,37042,37044,37039,37043,37040,38457,38461,38460,38458,38467,20429,20421,20435,20402,20425,20427,20417,20436,20444,20441,20411,20403,20443,20423,20438,20410,20416,20409,20460,21060,21065,21184,21186,21309,21372,21399,21398,21401,21400,21690,21665,21677,21669,21711,21699,33549,21687,21678,21718,21686,21701,21702,21664,21616,21692,21666,21694,21618,21726,21680,22453,22430,22431,22436,22412,22423,22429,22427,22420,22424,22415,22425,22437,22426,22421,22772,22797,22867,23009,23006,23022,23040,23025,23005,23034,23037,23036,23030,23012,23026,23031,23003,23017,23027,23029,23008,23038,23028,23021,23464,23628,23760,23768,23756,23767,23755,23771,23774,23770,23753,23751,23754,23766,23763,23764,23759,23752,23750,23758,23775,23800,24057,24097,24098,24099,24096,24100,24240,24228,24226,24219,24227,24229,24327,24366,24406,24454,24631,24633,24660,24690,24670,24645,24659,24647,24649,24667,24652,24640,24642,24671,24612,24644,24664,24678,24686,25154,25155,25295,25357,25355,25333,25358,25347,25323,25337,25359,25356,25336,25334,25344,25363,25364,25338,25365,25339,25328,25921,25923,26026,26047,26166,26145,26162,26165,26140,26150,26146,26163,26155,26170,26141,26164,26169,26158,26383,26384,26561,26610,26568,26554,26588,26555,26616,26584,26560,26551,26565,26603,26596,26591,26549,26573,26547,26615,26614,26606,26595,26562,26553,26574,26599,26608,26546,26620,26566,26605,26572,26542,26598,26587,26618,26569,26570,26563,26602,26571,27432,27522,27524,27574,27606,27608,27616,27680,27681,27944,27956,27949,27935,27964,27967,27922,27914,27866,27955,27908,27929,27962,27930,27921,27904,27933,27970,27905,27928,27959,27907,27919,27968,27911,27936,27948,27912,27938,27913,27920,28855,28831,28862,28849,28848,28833,28852,28853,28841,29249,29257,29258,29292,29296,29299,29294,29386,29412,29416,29419,29407,29418,29414,29411,29573,29644,29634,29640,29637,29625,29622,29621,29620,29675,29631,29639,29630,29635,29638,29624,29643,29932,29934,29998,30023,30024,30119,30122,30329,30404,30472,30467,30468,30469,30474,30455,30459,30458,30695,30696,30726,30737,30738,30725,30736,30735,30734,30729,30723,30739,31050,31052,31051,31045,31044,31189,31181,31183,31190,31182,31360,31358,31441,31488,31489,31866,31864,31865,31871,31872,31873,32003,32008,32001,32600,32657,32653,32702,32775,32782,32783,32788,32823,32984,32967,32992,32977,32968,32962,32976,32965,32995,32985,32988,32970,32981,32969,32975,32983,32998,32973,33279,33313,33428,33497,33534,33529,33543,33512,33536,33493,33594,33515,33494,33524,33516,33505,33522,33525,33548,33531,33526,33520,33514,33508,33504,33530,33523,33517,34423,34420,34428,34419,34881,34894,34919,34922,34921,35283,35332,35335,36210,36835,36833,36846,36832,37105,37053,37055,37077,37061,37054,37063,37067,37064,37332,37331,38484,38479,38481,38483,38474,38478,20510,20485,20487,20499,20514,20528,20507,20469,20468,20531,20535,20524,20470,20471,20503,20508,20512,20519,20533,20527,20529,20494,20826,20884,20883,20938,20932,20933,20936,20942,21089,21082,21074,21086,21087,21077,21090,21197,21262,21406,21798,21730,21783,21778,21735,21747,21732,21786,21759,21764,21768,21739,21777,21765,21745,21770,21755,21751,21752,21728,21774,21763,21771,22273,22274,22476,22578,22485,22482,22458,22470,22461,22460,22456,22454,22463,22471,22480,22457,22465,22798,22858,23065,23062,23085,23086,23061,23055,23063,23050,23070,23091,23404,23463,23469,23468,23555,23638,23636,23788,23807,23790,23793,23799,23808,23801,24105,24104,24232,24238,24234,24236,24371,24368,24423,24669,24666,24679,24641,24738,24712,24704,24722,24705,24733,24707,24725,24731,24727,24711,24732,24718,25113,25158,25330,25360,25430,25388,25412,25413,25398,25411,25572,25401,25419,25418,25404,25385,25409,25396,25432,25428,25433,25389,25415,25395,25434,25425,25400,25431,25408,25416,25930,25926,26054,26051,26052,26050,26186,26207,26183,26193,26386,26387,26655,26650,26697,26674,26675,26683,26699,26703,26646,26673,26652,26677,26667,26669,26671,26702,26692,26676,26653,26642,26644,26662,26664,26670,26701,26682,26661,26656,27436,27439,27437,27441,27444,27501,32898,27528,27622,27620,27624,27619,27618,27623,27685,28026,28003,28004,28022,27917,28001,28050,27992,28002,28013,28015,28049,28045,28143,28031,28038,27998,28007,28000,28055,28016,28028,27999,28034,28056,27951,28008,28043,28030,28032,28036,27926,28035,28027,28029,28021,28048,28892,28883,28881,28893,28875,32569,28898,28887,28882,28894,28896,28884,28877,28869,28870,28871,28890,28878,28897,29250,29304,29303,29302,29440,29434,29428,29438,29430,29427,29435,29441,29651,29657,29669,29654,29628,29671,29667,29673,29660,29650,29659,29652,29661,29658,29655,29656,29672,29918,29919,29940,29941,29985,30043,30047,30128,30145,30139,30148,30144,30143,30134,30138,30346,30409,30493,30491,30480,30483,30482,30499,30481,30485,30489,30490,30498,30503,30755,30764,30754,30773,30767,30760,30766,30763,30753,30761,30771,30762,30769,31060,31067,31055,31068,31059,31058,31057,31211,31212,31200,31214,31213,31210,31196,31198,31197,31366,31369,31365,31371,31372,31370,31367,31448,31504,31492,31507,31493,31503,31496,31498,31502,31497,31506,31876,31889,31882,31884,31880,31885,31877,32030,32029,32017,32014,32024,32022,32019,32031,32018,32015,32012,32604,32609,32606,32608,32605,32603,32662,32658,32707,32706,32704,32790,32830,32825,33018,33010,33017,33013,33025,33019,33024,33281,33327,33317,33587,33581,33604,33561,33617,33573,33622,33599,33601,33574,33564,33570,33602,33614,33563,33578,33544,33596,33613,33558,33572,33568,33591,33583,33577,33607,33605,33612,33619,33566,33580,33611,33575,33608,34387,34386,34466,34472,34454,34445,34449,34462,34439,34455,34438,34443,34458,34437,34469,34457,34465,34471,34453,34456,34446,34461,34448,34452,34883,34884,34925,34933,34934,34930,34944,34929,34943,34927,34947,34942,34932,34940,35346,35911,35927,35963,36004,36003,36214,36216,36277,36279,36278,36561,36563,36862,36853,36866,36863,36859,36868,36860,36854,37078,37088,37081,37082,37091,37087,37093,37080,37083,37079,37084,37092,37200,37198,37199,37333,37346,37338,38492,38495,38588,39139,39647,39727,20095,20592,20586,20577,20574,20576,20563,20555,20573,20594,20552,20557,20545,20571,20554,20578,20501,20549,20575,20585,20587,20579,20580,20550,20544,20590,20595,20567,20561,20944,21099,21101,21100,21102,21206,21203,21293,21404,21877,21878,21820,21837,21840,21812,21802,21841,21858,21814,21813,21808,21842,21829,21772,21810,21861,21838,21817,21832,21805,21819,21824,21835,22282,22279,22523,22548,22498,22518,22492,22516,22528,22509,22525,22536,22520,22539,22515,22479,22535,22510,22499,22514,22501,22508,22497,22542,22524,22544,22503,22529,22540,22513,22505,22512,22541,22532,22876,23136,23128,23125,23143,23134,23096,23093,23149,23120,23135,23141,23148,23123,23140,23127,23107,23133,23122,23108,23131,23112,23182,23102,23117,23097,23116,23152,23145,23111,23121,23126,23106,23132,23410,23406,23489,23488,23641,23838,23819,23837,23834,23840,23820,23848,23821,23846,23845,23823,23856,23826,23843,23839,23854,24126,24116,24241,24244,24249,24242,24243,24374,24376,24475,24470,24479,24714,24720,24710,24766,24752,24762,24787,24788,24783,24804,24793,24797,24776,24753,24795,24759,24778,24767,24771,24781,24768,25394,25445,25482,25474,25469,25533,25502,25517,25501,25495,25515,25486,25455,25479,25488,25454,25519,25461,25500,25453,25518,25468,25508,25403,25503,25464,25477,25473,25489,25485,25456,25939,26061,26213,26209,26203,26201,26204,26210,26392,26745,26759,26768,26780,26733,26734,26798,26795,26966,26735,26787,26796,26793,26741,26740,26802,26767,26743,26770,26748,26731,26738,26794,26752,26737,26750,26779,26774,26763,26784,26761,26788,26744,26747,26769,26764,26762,26749,27446,27443,27447,27448,27537,27535,27533,27534,27532,27690,28096,28075,28084,28083,28276,28076,28137,28130,28087,28150,28116,28160,28104,28128,28127,28118,28094,28133,28124,28125,28123,28148,28106,28093,28141,28144,28090,28117,28098,28111,28105,28112,28146,28115,28157,28119,28109,28131,28091,28922,28941,28919,28951,28916,28940,28912,28932,28915,28944,28924,28927,28934,28947,28928,28920,28918,28939,28930,28942,29310,29307,29308,29311,29469,29463,29447,29457,29464,29450,29448,29439,29455,29470,29576,29686,29688,29685,29700,29697,29693,29703,29696,29690,29692,29695,29708,29707,29684,29704,30052,30051,30158,30162,30159,30155,30156,30161,30160,30351,30345,30419,30521,30511,30509,30513,30514,30516,30515,30525,30501,30523,30517,30792,30802,30793,30797,30794,30796,30758,30789,30800,31076,31079,31081,31082,31075,31083,31073,31163,31226,31224,31222,31223,31375,31380,31376,31541,31559,31540,31525,31536,31522,31524,31539,31512,31530,31517,31537,31531,31533,31535,31538,31544,31514,31523,31892,31896,31894,31907,32053,32061,32056,32054,32058,32069,32044,32041,32065,32071,32062,32063,32074,32059,32040,32611,32661,32668,32669,32667,32714,32715,32717,32720,32721,32711,32719,32713,32799,32798,32795,32839,32835,32840,33048,33061,33049,33051,33069,33055,33068,33054,33057,33045,33063,33053,33058,33297,33336,33331,33338,33332,33330,33396,33680,33699,33704,33677,33658,33651,33700,33652,33679,33665,33685,33689,33653,33684,33705,33661,33667,33676,33693,33691,33706,33675,33662,33701,33711,33672,33687,33712,33663,33702,33671,33710,33654,33690,34393,34390,34495,34487,34498,34497,34501,34490,34480,34504,34489,34483,34488,34508,34484,34491,34492,34499,34493,34494,34898,34953,34965,34984,34978,34986,34970,34961,34977,34975,34968,34983,34969,34971,34967,34980,34988,34956,34963,34958,35202,35286,35289,35285,35376,35367,35372,35358,35897,35899,35932,35933,35965,36005,36221,36219,36217,36284,36290,36281,36287,36289,36568,36574,36573,36572,36567,36576,36577,36900,36875,36881,36892,36876,36897,37103,37098,37104,37108,37106,37107,37076,37099,37100,37097,37206,37208,37210,37203,37205,37356,37364,37361,37363,37368,37348,37369,37354,37355,37367,37352,37358,38266,38278,38280,38524,38509,38507,38513,38511,38591,38762,38916,39141,39319,20635,20629,20628,20638,20619,20643,20611,20620,20622,20637,20584,20636,20626,20610,20615,20831,20948,21266,21265,21412,21415,21905,21928,21925,21933,21879,22085,21922,21907,21896,21903,21941,21889,21923,21906,21924,21885,21900,21926,21887,21909,21921,21902,22284,22569,22583,22553,22558,22567,22563,22568,22517,22600,22565,22556,22555,22579,22591,22582,22574,22585,22584,22573,22572,22587,22881,23215,23188,23199,23162,23202,23198,23160,23206,23164,23205,23212,23189,23214,23095,23172,23178,23191,23171,23179,23209,23163,23165,23180,23196,23183,23187,23197,23530,23501,23499,23508,23505,23498,23502,23564,23600,23863,23875,23915,23873,23883,23871,23861,23889,23886,23893,23859,23866,23890,23869,23857,23897,23874,23865,23881,23864,23868,23858,23862,23872,23877,24132,24129,24408,24486,24485,24491,24777,24761,24780,24802,24782,24772,24852,24818,24842,24854,24837,24821,24851,24824,24828,24830,24769,24835,24856,24861,24848,24831,24836,24843,25162,25492,25521,25520,25550,25573,25576,25583,25539,25757,25587,25546,25568,25590,25557,25586,25589,25697,25567,25534,25565,25564,25540,25560,25555,25538,25543,25548,25547,25544,25584,25559,25561,25906,25959,25962,25956,25948,25960,25957,25996,26013,26014,26030,26064,26066,26236,26220,26235,26240,26225,26233,26218,26226,26369,26892,26835,26884,26844,26922,26860,26858,26865,26895,26838,26871,26859,26852,26870,26899,26896,26867,26849,26887,26828,26888,26992,26804,26897,26863,26822,26900,26872,26832,26877,26876,26856,26891,26890,26903,26830,26824,26845,26846,26854,26868,26833,26886,26836,26857,26901,26917,26823,27449,27451,27455,27452,27540,27543,27545,27541,27581,27632,27634,27635,27696,28156,28230,28231,28191,28233,28296,28220,28221,28229,28258,28203,28223,28225,28253,28275,28188,28211,28235,28224,28241,28219,28163,28206,28254,28264,28252,28257,28209,28200,28256,28273,28267,28217,28194,28208,28243,28261,28199,28280,28260,28279,28245,28281,28242,28262,28213,28214,28250,28960,28958,28975,28923,28974,28977,28963,28965,28962,28978,28959,28968,28986,28955,29259,29274,29320,29321,29318,29317,29323,29458,29451,29488,29474,29489,29491,29479,29490,29485,29478,29475,29493,29452,29742,29740,29744,29739,29718,29722,29729,29741,29745,29732,29731,29725,29737,29728,29746,29947,29999,30063,30060,30183,30170,30177,30182,30173,30175,30180,30167,30357,30354,30426,30534,30535,30532,30541,30533,30538,30542,30539,30540,30686,30700,30816,30820,30821,30812,30829,30833,30826,30830,30832,30825,30824,30814,30818,31092,31091,31090,31088,31234,31242,31235,31244,31236,31385,31462,31460,31562,31547,31556,31560,31564,31566,31552,31576,31557,31906,31902,31912,31905,32088,32111,32099,32083,32086,32103,32106,32079,32109,32092,32107,32082,32084,32105,32081,32095,32078,32574,32575,32613,32614,32674,32672,32673,32727,32849,32847,32848,33022,32980,33091,33098,33106,33103,33095,33085,33101,33082,33254,33262,33271,33272,33273,33284,33340,33341,33343,33397,33595,33743,33785,33827,33728,33768,33810,33767,33764,33788,33782,33808,33734,33736,33771,33763,33727,33793,33757,33765,33752,33791,33761,33739,33742,33750,33781,33737,33801,33807,33758,33809,33798,33730,33779,33749,33786,33735,33745,33770,33811,33731,33772,33774,33732,33787,33751,33762,33819,33755,33790,34520,34530,34534,34515,34531,34522,34538,34525,34539,34524,34540,34537,34519,34536,34513,34888,34902,34901,35002,35031,35001,35000,35008,35006,34998,35004,34999,35005,34994,35073,35017,35221,35224,35223,35293,35290,35291,35406,35405,35385,35417,35392,35415,35416,35396,35397,35410,35400,35409,35402,35404,35407,35935,35969,35968,36026,36030,36016,36025,36021,36228,36224,36233,36312,36307,36301,36295,36310,36316,36303,36309,36313,36296,36311,36293,36591,36599,36602,36601,36582,36590,36581,36597,36583,36584,36598,36587,36593,36588,36596,36585,36909,36916,36911,37126,37164,37124,37119,37116,37128,37113,37115,37121,37120,37127,37125,37123,37217,37220,37215,37218,37216,37377,37386,37413,37379,37402,37414,37391,37388,37376,37394,37375,37373,37382,37380,37415,37378,37404,37412,37401,37399,37381,37398,38267,38285,38284,38288,38535,38526,38536,38537,38531,38528,38594,38600,38595,38641,38640,38764,38768,38766,38919,39081,39147,40166,40697,20099,20100,20150,20669,20671,20678,20654,20676,20682,20660,20680,20674,20656,20673,20666,20657,20683,20681,20662,20664,20951,21114,21112,21115,21116,21955,21979,21964,21968,21963,21962,21981,21952,21972,21956,21993,21951,21970,21901,21967,21973,21986,21974,21960,22002,21965,21977,21954,22292,22611,22632,22628,22607,22605,22601,22639,22613,22606,22621,22617,22629,22619,22589,22627,22641,22780,23239,23236,23243,23226,23224,23217,23221,23216,23231,23240,23227,23238,23223,23232,23242,23220,23222,23245,23225,23184,23510,23512,23513,23583,23603,23921,23907,23882,23909,23922,23916,23902,23912,23911,23906,24048,24143,24142,24138,24141,24139,24261,24268,24262,24267,24263,24384,24495,24493,24823,24905,24906,24875,24901,24886,24882,24878,24902,24879,24911,24873,24896,25120,37224,25123,25125,25124,25541,25585,25579,25616,25618,25609,25632,25636,25651,25667,25631,25621,25624,25657,25655,25634,25635,25612,25638,25648,25640,25665,25653,25647,25610,25626,25664,25637,25639,25611,25575,25627,25646,25633,25614,25967,26002,26067,26246,26252,26261,26256,26251,26250,26265,26260,26232,26400,26982,26975,26936,26958,26978,26993,26943,26949,26986,26937,26946,26967,26969,27002,26952,26953,26933,26988,26931,26941,26981,26864,27000,26932,26985,26944,26991,26948,26998,26968,26945,26996,26956,26939,26955,26935,26972,26959,26961,26930,26962,26927,27003,26940,27462,27461,27459,27458,27464,27457,27547,64013,27643,27644,27641,27639,27640,28315,28374,28360,28303,28352,28319,28307,28308,28320,28337,28345,28358,28370,28349,28353,28318,28361,28343,28336,28365,28326,28367,28338,28350,28355,28380,28376,28313,28306,28302,28301,28324,28321,28351,28339,28368,28362,28311,28334,28323,28999,29012,29010,29027,29024,28993,29021,29026,29042,29048,29034,29025,28994,29016,28995,29003,29040,29023,29008,29011,28996,29005,29018,29263,29325,29324,29329,29328,29326,29500,29506,29499,29498,29504,29514,29513,29764,29770,29771,29778,29777,29783,29760,29775,29776,29774,29762,29766,29773,29780,29921,29951,29950,29949,29981,30073,30071,27011,30191,30223,30211,30199,30206,30204,30201,30200,30224,30203,30198,30189,30197,30205,30361,30389,30429,30549,30559,30560,30546,30550,30554,30569,30567,30548,30553,30573,30688,30855,30874,30868,30863,30852,30869,30853,30854,30881,30851,30841,30873,30848,30870,30843,31100,31106,31101,31097,31249,31256,31257,31250,31255,31253,31266,31251,31259,31248,31395,31394,31390,31467,31590,31588,31597,31604,31593,31602,31589,31603,31601,31600,31585,31608,31606,31587,31922,31924,31919,32136,32134,32128,32141,32127,32133,32122,32142,32123,32131,32124,32140,32148,32132,32125,32146,32621,32619,32615,32616,32620,32678,32677,32679,32731,32732,32801,33124,33120,33143,33116,33129,33115,33122,33138,26401,33118,33142,33127,33135,33092,33121,33309,33353,33348,33344,33346,33349,34033,33855,33878,33910,33913,33935,33933,33893,33873,33856,33926,33895,33840,33869,33917,33882,33881,33908,33907,33885,34055,33886,33847,33850,33844,33914,33859,33912,33842,33861,33833,33753,33867,33839,33858,33837,33887,33904,33849,33870,33868,33874,33903,33989,33934,33851,33863,33846,33843,33896,33918,33860,33835,33888,33876,33902,33872,34571,34564,34551,34572,34554,34518,34549,34637,34552,34574,34569,34561,34550,34573,34565,35030,35019,35021,35022,35038,35035,35034,35020,35024,35205,35227,35295,35301,35300,35297,35296,35298,35292,35302,35446,35462,35455,35425,35391,35447,35458,35460,35445,35459,35457,35444,35450,35900,35915,35914,35941,35940,35942,35974,35972,35973,36044,36200,36201,36241,36236,36238,36239,36237,36243,36244,36240,36242,36336,36320,36332,36337,36334,36304,36329,36323,36322,36327,36338,36331,36340,36614,36607,36609,36608,36613,36615,36616,36610,36619,36946,36927,36932,36937,36925,37136,37133,37135,37137,37142,37140,37131,37134,37230,37231,37448,37458,37424,37434,37478,37427,37477,37470,37507,37422,37450,37446,37485,37484,37455,37472,37479,37487,37430,37473,37488,37425,37460,37475,37456,37490,37454,37459,37452,37462,37426,38303,38300,38302,38299,38546,38547,38545,38551,38606,38650,38653,38648,38645,38771,38775,38776,38770,38927,38925,38926,39084,39158,39161,39343,39346,39344,39349,39597,39595,39771,40170,40173,40167,40576,40701,20710,20692,20695,20712,20723,20699,20714,20701,20708,20691,20716,20720,20719,20707,20704,20952,21120,21121,21225,21227,21296,21420,22055,22037,22028,22034,22012,22031,22044,22017,22035,22018,22010,22045,22020,22015,22009,22665,22652,22672,22680,22662,22657,22655,22644,22667,22650,22663,22673,22670,22646,22658,22664,22651,22676,22671,22782,22891,23260,23278,23269,23253,23274,23258,23277,23275,23283,23266,23264,23259,23276,23262,23261,23257,23272,23263,23415,23520,23523,23651,23938,23936,23933,23942,23930,23937,23927,23946,23945,23944,23934,23932,23949,23929,23935,24152,24153,24147,24280,24273,24279,24270,24284,24277,24281,24274,24276,24388,24387,24431,24502,24876,24872,24897,24926,24945,24947,24914,24915,24946,24940,24960,24948,24916,24954,24923,24933,24891,24938,24929,24918,25129,25127,25131,25643,25677,25691,25693,25716,25718,25714,25715,25725,25717,25702,25766,25678,25730,25694,25692,25675,25683,25696,25680,25727,25663,25708,25707,25689,25701,25719,25971,26016,26273,26272,26271,26373,26372,26402,27057,27062,27081,27040,27086,27030,27056,27052,27068,27025,27033,27022,27047,27021,27049,27070,27055,27071,27076,27069,27044,27092,27065,27082,27034,27087,27059,27027,27050,27041,27038,27097,27031,27024,27074,27061,27045,27078,27466,27469,27467,27550,27551,27552,27587,27588,27646,28366,28405,28401,28419,28453,28408,28471,28411,28462,28425,28494,28441,28442,28455,28440,28475,28434,28397,28426,28470,28531,28409,28398,28461,28480,28464,28476,28469,28395,28423,28430,28483,28421,28413,28406,28473,28444,28412,28474,28447,28429,28446,28424,28449,29063,29072,29065,29056,29061,29058,29071,29051,29062,29057,29079,29252,29267,29335,29333,29331,29507,29517,29521,29516,29794,29811,29809,29813,29810,29799,29806,29952,29954,29955,30077,30096,30230,30216,30220,30229,30225,30218,30228,30392,30593,30588,30597,30594,30574,30592,30575,30590,30595,30898,30890,30900,30893,30888,30846,30891,30878,30885,30880,30892,30882,30884,31128,31114,31115,31126,31125,31124,31123,31127,31112,31122,31120,31275,31306,31280,31279,31272,31270,31400,31403,31404,31470,31624,31644,31626,31633,31632,31638,31629,31628,31643,31630,31621,31640,21124,31641,31652,31618,31931,31935,31932,31930,32167,32183,32194,32163,32170,32193,32192,32197,32157,32206,32196,32198,32203,32204,32175,32185,32150,32188,32159,32166,32174,32169,32161,32201,32627,32738,32739,32741,32734,32804,32861,32860,33161,33158,33155,33159,33165,33164,33163,33301,33943,33956,33953,33951,33978,33998,33986,33964,33966,33963,33977,33972,33985,33997,33962,33946,33969,34000,33949,33959,33979,33954,33940,33991,33996,33947,33961,33967,33960,34006,33944,33974,33999,33952,34007,34004,34002,34011,33968,33937,34401,34611,34595,34600,34667,34624,34606,34590,34593,34585,34587,34627,34604,34625,34622,34630,34592,34610,34602,34605,34620,34578,34618,34609,34613,34626,34598,34599,34616,34596,34586,34608,34577,35063,35047,35057,35058,35066,35070,35054,35068,35062,35067,35056,35052,35051,35229,35233,35231,35230,35305,35307,35304,35499,35481,35467,35474,35471,35478,35901,35944,35945,36053,36047,36055,36246,36361,36354,36351,36365,36349,36362,36355,36359,36358,36357,36350,36352,36356,36624,36625,36622,36621,37155,37148,37152,37154,37151,37149,37146,37156,37153,37147,37242,37234,37241,37235,37541,37540,37494,37531,37498,37536,37524,37546,37517,37542,37530,37547,37497,37527,37503,37539,37614,37518,37506,37525,37538,37501,37512,37537,37514,37510,37516,37529,37543,37502,37511,37545,37533,37515,37421,38558,38561,38655,38744,38781,38778,38782,38787,38784,38786,38779,38788,38785,38783,38862,38861,38934,39085,39086,39170,39168,39175,39325,39324,39363,39353,39355,39354,39362,39357,39367,39601,39651,39655,39742,39743,39776,39777,39775,40177,40178,40181,40615,20735,20739,20784,20728,20742,20743,20726,20734,20747,20748,20733,20746,21131,21132,21233,21231,22088,22082,22092,22069,22081,22090,22089,22086,22104,22106,22080,22067,22077,22060,22078,22072,22058,22074,22298,22699,22685,22705,22688,22691,22703,22700,22693,22689,22783,23295,23284,23293,23287,23286,23299,23288,23298,23289,23297,23303,23301,23311,23655,23961,23959,23967,23954,23970,23955,23957,23968,23964,23969,23962,23966,24169,24157,24160,24156,32243,24283,24286,24289,24393,24498,24971,24963,24953,25009,25008,24994,24969,24987,24979,25007,25005,24991,24978,25002,24993,24973,24934,25011,25133,25710,25712,25750,25760,25733,25751,25756,25743,25739,25738,25740,25763,25759,25704,25777,25752,25974,25978,25977,25979,26034,26035,26293,26288,26281,26290,26295,26282,26287,27136,27142,27159,27109,27128,27157,27121,27108,27168,27135,27116,27106,27163,27165,27134,27175,27122,27118,27156,27127,27111,27200,27144,27110,27131,27149,27132,27115,27145,27140,27160,27173,27151,27126,27174,27143,27124,27158,27473,27557,27555,27554,27558,27649,27648,27647,27650,28481,28454,28542,28551,28614,28562,28557,28553,28556,28514,28495,28549,28506,28566,28534,28524,28546,28501,28530,28498,28496,28503,28564,28563,28509,28416,28513,28523,28541,28519,28560,28499,28555,28521,28543,28565,28515,28535,28522,28539,29106,29103,29083,29104,29088,29082,29097,29109,29085,29093,29086,29092,29089,29098,29084,29095,29107,29336,29338,29528,29522,29534,29535,29536,29533,29531,29537,29530,29529,29538,29831,29833,29834,29830,29825,29821,29829,29832,29820,29817,29960,29959,30078,30245,30238,30233,30237,30236,30243,30234,30248,30235,30364,30365,30366,30363,30605,30607,30601,30600,30925,30907,30927,30924,30929,30926,30932,30920,30915,30916,30921,31130,31137,31136,31132,31138,31131,27510,31289,31410,31412,31411,31671,31691,31678,31660,31694,31663,31673,31690,31669,31941,31944,31948,31947,32247,32219,32234,32231,32215,32225,32259,32250,32230,32246,32241,32240,32238,32223,32630,32684,32688,32685,32749,32747,32746,32748,32742,32744,32868,32871,33187,33183,33182,33173,33186,33177,33175,33302,33359,33363,33362,33360,33358,33361,34084,34107,34063,34048,34089,34062,34057,34061,34079,34058,34087,34076,34043,34091,34042,34056,34060,34036,34090,34034,34069,34039,34027,34035,34044,34066,34026,34025,34070,34046,34088,34077,34094,34050,34045,34078,34038,34097,34086,34023,34024,34032,34031,34041,34072,34080,34096,34059,34073,34095,34402,34646,34659,34660,34679,34785,34675,34648,34644,34651,34642,34657,34650,34641,34654,34669,34666,34640,34638,34655,34653,34671,34668,34682,34670,34652,34661,34639,34683,34677,34658,34663,34665,34906,35077,35084,35092,35083,35095,35096,35097,35078,35094,35089,35086,35081,35234,35236,35235,35309,35312,35308,35535,35526,35512,35539,35537,35540,35541,35515,35543,35518,35520,35525,35544,35523,35514,35517,35545,35902,35917,35983,36069,36063,36057,36072,36058,36061,36071,36256,36252,36257,36251,36384,36387,36389,36388,36398,36373,36379,36374,36369,36377,36390,36391,36372,36370,36376,36371,36380,36375,36378,36652,36644,36632,36634,36640,36643,36630,36631,36979,36976,36975,36967,36971,37167,37163,37161,37162,37170,37158,37166,37253,37254,37258,37249,37250,37252,37248,37584,37571,37572,37568,37593,37558,37583,37617,37599,37592,37609,37591,37597,37580,37615,37570,37608,37578,37576,37582,37606,37581,37589,37577,37600,37598,37607,37585,37587,37557,37601,37574,37556,38268,38316,38315,38318,38320,38564,38562,38611,38661,38664,38658,38746,38794,38798,38792,38864,38863,38942,38941,38950,38953,38952,38944,38939,38951,39090,39176,39162,39185,39188,39190,39191,39189,39388,39373,39375,39379,39380,39374,39369,39382,39384,39371,39383,39372,39603,39660,39659,39667,39666,39665,39750,39747,39783,39796,39793,39782,39798,39797,39792,39784,39780,39788,40188,40186,40189,40191,40183,40199,40192,40185,40187,40200,40197,40196,40579,40659,40719,40720,20764,20755,20759,20762,20753,20958,21300,21473,22128,22112,22126,22131,22118,22115,22125,22130,22110,22135,22300,22299,22728,22717,22729,22719,22714,22722,22716,22726,23319,23321,23323,23329,23316,23315,23312,23318,23336,23322,23328,23326,23535,23980,23985,23977,23975,23989,23984,23982,23978,23976,23986,23981,23983,23988,24167,24168,24166,24175,24297,24295,24294,24296,24293,24395,24508,24989,25000,24982,25029,25012,25030,25025,25036,25018,25023,25016,24972,25815,25814,25808,25807,25801,25789,25737,25795,25819,25843,25817,25907,25983,25980,26018,26312,26302,26304,26314,26315,26319,26301,26299,26298,26316,26403,27188,27238,27209,27239,27186,27240,27198,27229,27245,27254,27227,27217,27176,27226,27195,27199,27201,27242,27236,27216,27215,27220,27247,27241,27232,27196,27230,27222,27221,27213,27214,27206,27477,27476,27478,27559,27562,27563,27592,27591,27652,27651,27654,28589,28619,28579,28615,28604,28622,28616,28510,28612,28605,28574,28618,28584,28676,28581,28590,28602,28588,28586,28623,28607,28600,28578,28617,28587,28621,28591,28594,28592,29125,29122,29119,29112,29142,29120,29121,29131,29140,29130,29127,29135,29117,29144,29116,29126,29146,29147,29341,29342,29545,29542,29543,29548,29541,29547,29546,29823,29850,29856,29844,29842,29845,29857,29963,30080,30255,30253,30257,30269,30259,30268,30261,30258,30256,30395,30438,30618,30621,30625,30620,30619,30626,30627,30613,30617,30615,30941,30953,30949,30954,30942,30947,30939,30945,30946,30957,30943,30944,31140,31300,31304,31303,31414,31416,31413,31409,31415,31710,31715,31719,31709,31701,31717,31706,31720,31737,31700,31722,31714,31708,31723,31704,31711,31954,31956,31959,31952,31953,32274,32289,32279,32268,32287,32288,32275,32270,32284,32277,32282,32290,32267,32271,32278,32269,32276,32293,32292,32579,32635,32636,32634,32689,32751,32810,32809,32876,33201,33190,33198,33209,33205,33195,33200,33196,33204,33202,33207,33191,33266,33365,33366,33367,34134,34117,34155,34125,34131,34145,34136,34112,34118,34148,34113,34146,34116,34129,34119,34147,34110,34139,34161,34126,34158,34165,34133,34151,34144,34188,34150,34141,34132,34149,34156,34403,34405,34404,34715,34703,34711,34707,34706,34696,34689,34710,34712,34681,34695,34723,34693,34704,34705,34717,34692,34708,34716,34714,34697,35102,35110,35120,35117,35118,35111,35121,35106,35113,35107,35119,35116,35103,35313,35552,35554,35570,35572,35573,35549,35604,35556,35551,35568,35528,35550,35553,35560,35583,35567,35579,35985,35986,35984,36085,36078,36081,36080,36083,36204,36206,36261,36263,36403,36414,36408,36416,36421,36406,36412,36413,36417,36400,36415,36541,36662,36654,36661,36658,36665,36663,36660,36982,36985,36987,36998,37114,37171,37173,37174,37267,37264,37265,37261,37263,37671,37662,37640,37663,37638,37647,37754,37688,37692,37659,37667,37650,37633,37702,37677,37646,37645,37579,37661,37626,37669,37651,37625,37623,37684,37634,37668,37631,37673,37689,37685,37674,37652,37644,37643,37630,37641,37632,37627,37654,38332,38349,38334,38329,38330,38326,38335,38325,38333,38569,38612,38667,38674,38672,38809,38807,38804,38896,38904,38965,38959,38962,39204,39199,39207,39209,39326,39406,39404,39397,39396,39408,39395,39402,39401,39399,39609,39615,39604,39611,39670,39674,39673,39671,39731,39808,39813,39815,39804,39806,39803,39810,39827,39826,39824,39802,39829,39805,39816,40229,40215,40224,40222,40212,40233,40221,40216,40226,40208,40217,40223,40584,40582,40583,40622,40621,40661,40662,40698,40722,40765,20774,20773,20770,20772,20768,20777,21236,22163,22156,22157,22150,22148,22147,22142,22146,22143,22145,22742,22740,22735,22738,23341,23333,23346,23331,23340,23335,23334,23343,23342,23419,23537,23538,23991,24172,24170,24510,24507,25027,25013,25020,25063,25056,25061,25060,25064,25054,25839,25833,25827,25835,25828,25832,25985,25984,26038,26074,26322,27277,27286,27265,27301,27273,27295,27291,27297,27294,27271,27283,27278,27285,27267,27304,27300,27281,27263,27302,27290,27269,27276,27282,27483,27565,27657,28620,28585,28660,28628,28643,28636,28653,28647,28646,28638,28658,28637,28642,28648,29153,29169,29160,29170,29156,29168,29154,29555,29550,29551,29847,29874,29867,29840,29866,29869,29873,29861,29871,29968,29969,29970,29967,30084,30275,30280,30281,30279,30372,30441,30645,30635,30642,30647,30646,30644,30641,30632,30704,30963,30973,30978,30971,30972,30962,30981,30969,30974,30980,31147,31144,31324,31323,31318,31320,31316,31322,31422,31424,31425,31749,31759,31730,31744,31743,31739,31758,31732,31755,31731,31746,31753,31747,31745,31736,31741,31750,31728,31729,31760,31754,31976,32301,32316,32322,32307,38984,32312,32298,32329,32320,32327,32297,32332,32304,32315,32310,32324,32314,32581,32639,32638,32637,32756,32754,32812,33211,33220,33228,33226,33221,33223,33212,33257,33371,33370,33372,34179,34176,34191,34215,34197,34208,34187,34211,34171,34212,34202,34206,34167,34172,34185,34209,34170,34168,34135,34190,34198,34182,34189,34201,34205,34177,34210,34178,34184,34181,34169,34166,34200,34192,34207,34408,34750,34730,34733,34757,34736,34732,34745,34741,34748,34734,34761,34755,34754,34764,34743,34735,34756,34762,34740,34742,34751,34744,34749,34782,34738,35125,35123,35132,35134,35137,35154,35127,35138,35245,35247,35246,35314,35315,35614,35608,35606,35601,35589,35595,35618,35599,35602,35605,35591,35597,35592,35590,35612,35603,35610,35919,35952,35954,35953,35951,35989,35988,36089,36207,36430,36429,36435,36432,36428,36423,36675,36672,36997,36990,37176,37274,37282,37275,37273,37279,37281,37277,37280,37793,37763,37807,37732,37718,37703,37756,37720,37724,37750,37705,37712,37713,37728,37741,37775,37708,37738,37753,37719,37717,37714,37711,37745,37751,37755,37729,37726,37731,37735,37760,37710,37721,38343,38336,38345,38339,38341,38327,38574,38576,38572,38688,38687,38680,38685,38681,38810,38817,38812,38814,38813,38869,38868,38897,38977,38980,38986,38985,38981,38979,39205,39211,39212,39210,39219,39218,39215,39213,39217,39216,39320,39331,39329,39426,39418,39412,39415,39417,39416,39414,39419,39421,39422,39420,39427,39614,39678,39677,39681,39676,39752,39834,39848,39838,39835,39846,39841,39845,39844,39814,39842,39840,39855,40243,40257,40295,40246,40238,40239,40241,40248,40240,40261,40258,40259,40254,40247,40256,40253,32757,40237,40586,40585,40589,40624,40648,40666,40699,40703,40740,40739,40738,40788,40864,20785,20781,20782,22168,22172,22167,22170,22173,22169,22896,23356,23657,23658,24000,24173,24174,25048,25055,25069,25070,25073,25066,25072,25067,25046,25065,25855,25860,25853,25848,25857,25859,25852,26004,26075,26330,26331,26328,27333,27321,27325,27361,27334,27322,27318,27319,27335,27316,27309,27486,27593,27659,28679,28684,28685,28673,28677,28692,28686,28671,28672,28667,28710,28668,28663,28682,29185,29183,29177,29187,29181,29558,29880,29888,29877,29889,29886,29878,29883,29890,29972,29971,30300,30308,30297,30288,30291,30295,30298,30374,30397,30444,30658,30650,30975,30988,30995,30996,30985,30992,30994,30993,31149,31148,31327,31772,31785,31769,31776,31775,31789,31773,31782,31784,31778,31781,31792,32348,32336,32342,32355,32344,32354,32351,32337,32352,32343,32339,32693,32691,32759,32760,32885,33233,33234,33232,33375,33374,34228,34246,34240,34243,34242,34227,34229,34237,34247,34244,34239,34251,34254,34248,34245,34225,34230,34258,34340,34232,34231,34238,34409,34791,34790,34786,34779,34795,34794,34789,34783,34803,34788,34772,34780,34771,34797,34776,34787,34724,34775,34777,34817,34804,34792,34781,35155,35147,35151,35148,35142,35152,35153,35145,35626,35623,35619,35635,35632,35637,35655,35631,35644,35646,35633,35621,35639,35622,35638,35630,35620,35643,35645,35642,35906,35957,35993,35992,35991,36094,36100,36098,36096,36444,36450,36448,36439,36438,36446,36453,36455,36443,36442,36449,36445,36457,36436,36678,36679,36680,36683,37160,37178,37179,37182,37288,37285,37287,37295,37290,37813,37772,37778,37815,37787,37789,37769,37799,37774,37802,37790,37798,37781,37768,37785,37791,37773,37809,37777,37810,37796,37800,37812,37795,37797,38354,38355,38353,38579,38615,38618,24002,38623,38616,38621,38691,38690,38693,38828,38830,38824,38827,38820,38826,38818,38821,38871,38873,38870,38872,38906,38992,38993,38994,39096,39233,39228,39226,39439,39435,39433,39437,39428,39441,39434,39429,39431,39430,39616,39644,39688,39684,39685,39721,39733,39754,39756,39755,39879,39878,39875,39871,39873,39861,39864,39891,39862,39876,39865,39869,40284,40275,40271,40266,40283,40267,40281,40278,40268,40279,40274,40276,40287,40280,40282,40590,40588,40671,40705,40704,40726,40741,40747,40746,40745,40744,40780,40789,20788,20789,21142,21239,21428,22187,22189,22182,22183,22186,22188,22746,22749,22747,22802,23357,23358,23359,24003,24176,24511,25083,25863,25872,25869,25865,25868,25870,25988,26078,26077,26334,27367,27360,27340,27345,27353,27339,27359,27356,27344,27371,27343,27341,27358,27488,27568,27660,28697,28711,28704,28694,28715,28705,28706,28707,28713,28695,28708,28700,28714,29196,29194,29191,29186,29189,29349,29350,29348,29347,29345,29899,29893,29879,29891,29974,30304,30665,30666,30660,30705,31005,31003,31009,31004,30999,31006,31152,31335,31336,31795,31804,31801,31788,31803,31980,31978,32374,32373,32376,32368,32375,32367,32378,32370,32372,32360,32587,32586,32643,32646,32695,32765,32766,32888,33239,33237,33380,33377,33379,34283,34289,34285,34265,34273,34280,34266,34263,34284,34290,34296,34264,34271,34275,34268,34257,34288,34278,34287,34270,34274,34816,34810,34819,34806,34807,34825,34828,34827,34822,34812,34824,34815,34826,34818,35170,35162,35163,35159,35169,35164,35160,35165,35161,35208,35255,35254,35318,35664,35656,35658,35648,35667,35670,35668,35659,35669,35665,35650,35666,35671,35907,35959,35958,35994,36102,36103,36105,36268,36266,36269,36267,36461,36472,36467,36458,36463,36475,36546,36690,36689,36687,36688,36691,36788,37184,37183,37296,37293,37854,37831,37839,37826,37850,37840,37881,37868,37836,37849,37801,37862,37834,37844,37870,37859,37845,37828,37838,37824,37842,37863,38269,38362,38363,38625,38697,38699,38700,38696,38694,38835,38839,38838,38877,38878,38879,39004,39001,39005,38999,39103,39101,39099,39102,39240,39239,39235,39334,39335,39450,39445,39461,39453,39460,39451,39458,39456,39463,39459,39454,39452,39444,39618,39691,39690,39694,39692,39735,39914,39915,39904,39902,39908,39910,39906,39920,39892,39895,39916,39900,39897,39909,39893,39905,39898,40311,40321,40330,40324,40328,40305,40320,40312,40326,40331,40332,40317,40299,40308,40309,40304,40297,40325,40307,40315,40322,40303,40313,40319,40327,40296,40596,40593,40640,40700,40749,40768,40769,40781,40790,40791,40792,21303,22194,22197,22195,22755,23365,24006,24007,24302,24303,24512,24513,25081,25879,25878,25877,25875,26079,26344,26339,26340,27379,27376,27370,27368,27385,27377,27374,27375,28732,28725,28719,28727,28724,28721,28738,28728,28735,28730,28729,28736,28731,28723,28737,29203,29204,29352,29565,29564,29882,30379,30378,30398,30445,30668,30670,30671,30669,30706,31013,31011,31015,31016,31012,31017,31154,31342,31340,31341,31479,31817,31816,31818,31815,31813,31982,32379,32382,32385,32384,32698,32767,32889,33243,33241,33291,33384,33385,34338,34303,34305,34302,34331,34304,34294,34308,34313,34309,34316,34301,34841,34832,34833,34839,34835,34838,35171,35174,35257,35319,35680,35690,35677,35688,35683,35685,35687,35693,36270,36486,36488,36484,36697,36694,36695,36693,36696,36698,37005,37187,37185,37303,37301,37298,37299,37899,37907,37883,37920,37903,37908,37886,37909,37904,37928,37913,37901,37877,37888,37879,37895,37902,37910,37906,37882,37897,37880,37898,37887,37884,37900,37878,37905,37894,38366,38368,38367,38702,38703,38841,38843,38909,38910,39008,39010,39011,39007,39105,39106,39248,39246,39257,39244,39243,39251,39474,39476,39473,39468,39466,39478,39465,39470,39480,39469,39623,39626,39622,39696,39698,39697,39947,39944,39927,39941,39954,39928,40000,39943,39950,39942,39959,39956,39945,40351,40345,40356,40349,40338,40344,40336,40347,40352,40340,40348,40362,40343,40353,40346,40354,40360,40350,40355,40383,40361,40342,40358,40359,40601,40603,40602,40677,40676,40679,40678,40752,40750,40795,40800,40798,40797,40793,40849,20794,20793,21144,21143,22211,22205,22206,23368,23367,24011,24015,24305,25085,25883,27394,27388,27395,27384,27392,28739,28740,28746,28744,28745,28741,28742,29213,29210,29209,29566,29975,30314,30672,31021,31025,31023,31828,31827,31986,32394,32391,32392,32395,32390,32397,32589,32699,32816,33245,34328,34346,34342,34335,34339,34332,34329,34343,34350,34337,34336,34345,34334,34341,34857,34845,34843,34848,34852,34844,34859,34890,35181,35177,35182,35179,35322,35705,35704,35653,35706,35707,36112,36116,36271,36494,36492,36702,36699,36701,37190,37188,37189,37305,37951,37947,37942,37929,37949,37948,37936,37945,37930,37943,37932,37952,37937,38373,38372,38371,38709,38714,38847,38881,39012,39113,39110,39104,39256,39254,39481,39485,39494,39492,39490,39489,39482,39487,39629,39701,39703,39704,39702,39738,39762,39979,39965,39964,39980,39971,39976,39977,39972,39969,40375,40374,40380,40385,40391,40394,40399,40382,40389,40387,40379,40373,40398,40377,40378,40364,40392,40369,40365,40396,40371,40397,40370,40570,40604,40683,40686,40685,40731,40728,40730,40753,40782,40805,40804,40850,20153,22214,22213,22219,22897,23371,23372,24021,24017,24306,25889,25888,25894,25890,27403,27400,27401,27661,28757,28758,28759,28754,29214,29215,29353,29567,29912,29909,29913,29911,30317,30381,31029,31156,31344,31345,31831,31836,31833,31835,31834,31988,31985,32401,32591,32647,33246,33387,34356,34357,34355,34348,34354,34358,34860,34856,34854,34858,34853,35185,35263,35262,35323,35710,35716,35714,35718,35717,35711,36117,36501,36500,36506,36498,36496,36502,36503,36704,36706,37191,37964,37968,37962,37963,37967,37959,37957,37960,37961,37958,38719,38883,39018,39017,39115,39252,39259,39502,39507,39508,39500,39503,39496,39498,39497,39506,39504,39632,39705,39723,39739,39766,39765,40006,40008,39999,40004,39993,39987,40001,39996,39991,39988,39986,39997,39990,40411,40402,40414,40410,40395,40400,40412,40401,40415,40425,40409,40408,40406,40437,40405,40413,40630,40688,40757,40755,40754,40770,40811,40853,40866,20797,21145,22760,22759,22898,23373,24024,34863,24399,25089,25091,25092,25897,25893,26006,26347,27409,27410,27407,27594,28763,28762,29218,29570,29569,29571,30320,30676,31847,31846,32405,33388,34362,34368,34361,34364,34353,34363,34366,34864,34866,34862,34867,35190,35188,35187,35326,35724,35726,35723,35720,35909,36121,36504,36708,36707,37308,37986,37973,37981,37975,37982,38852,38853,38912,39510,39513,39710,39711,39712,40018,40024,40016,40010,40013,40011,40021,40025,40012,40014,40443,40439,40431,40419,40427,40440,40420,40438,40417,40430,40422,40434,40432,40418,40428,40436,40435,40424,40429,40642,40656,40690,40691,40710,40732,40760,40759,40758,40771,40783,40817,40816,40814,40815,22227,22221,23374,23661,25901,26349,26350,27411,28767,28769,28765,28768,29219,29915,29925,30677,31032,31159,31158,31850,32407,32649,33389,34371,34872,34871,34869,34891,35732,35733,36510,36511,36512,36509,37310,37309,37314,37995,37992,37993,38629,38726,38723,38727,38855,38885,39518,39637,39769,40035,40039,40038,40034,40030,40032,40450,40446,40455,40451,40454,40453,40448,40449,40457,40447,40445,40452,40608,40734,40774,40820,40821,40822,22228,25902,26040,27416,27417,27415,27418,28770,29222,29354,30680,30681,31033,31849,31851,31990,32410,32408,32411,32409,33248,33249,34374,34375,34376,35193,35194,35196,35195,35327,35736,35737,36517,36516,36515,37998,37997,37999,38001,38003,38729,39026,39263,40040,40046,40045,40459,40461,40464,40463,40466,40465,40609,40693,40713,40775,40824,40827,40826,40825,22302,28774,31855,34876,36274,36518,37315,38004,38008,38006,38005,39520,40052,40051,40049,40053,40468,40467,40694,40714,40868,28776,28773,31991,34410,34878,34877,34879,35742,35996,36521,36553,38731,39027,39028,39116,39265,39339,39524,39526,39527,39716,40469,40471,40776,25095,27422,29223,34380,36520,38018,38016,38017,39529,39528,39726,40473,29225,34379,35743,38019,40057,40631,30325,39531,40058,40477,28777,28778,40612,40830,40777,40856,30849,37561,35023,22715,24658,31911,23290,9556,9574,9559,9568,9580,9571,9562,9577,9565,9554,9572,9557,9566,9578,9569,9560,9575,9563,9555,9573,9558,9567,9579,9570,9561,9576,9564,9553,9552,9581,9582,9584,9583,65517,132423,37595,132575,147397,34124,17077,29679,20917,13897,149826,166372,37700,137691,33518,146632,30780,26436,25311,149811,166314,131744,158643,135941,20395,140525,20488,159017,162436,144896,150193,140563,20521,131966,24484,131968,131911,28379,132127,20605,20737,13434,20750,39020,14147,33814,149924,132231,20832,144308,20842,134143,139516,131813,140592,132494,143923,137603,23426,34685,132531,146585,20914,20920,40244,20937,20943,20945,15580,20947,150182,20915,20962,21314,20973,33741,26942,145197,24443,21003,21030,21052,21173,21079,21140,21177,21189,31765,34114,21216,34317,158483,21253,166622,21833,28377,147328,133460,147436,21299,21316,134114,27851,136998,26651,29653,24650,16042,14540,136936,29149,17570,21357,21364,165547,21374,21375,136598,136723,30694,21395,166555,21408,21419,21422,29607,153458,16217,29596,21441,21445,27721,20041,22526,21465,15019,134031,21472,147435,142755,21494,134263,21523,28793,21803,26199,27995,21613,158547,134516,21853,21647,21668,18342,136973,134877,15796,134477,166332,140952,21831,19693,21551,29719,21894,21929,22021,137431,147514,17746,148533,26291,135348,22071,26317,144010,26276,26285,22093,22095,30961,22257,38791,21502,22272,22255,22253,166758,13859,135759,22342,147877,27758,28811,22338,14001,158846,22502,136214,22531,136276,148323,22566,150517,22620,22698,13665,22752,22748,135740,22779,23551,22339,172368,148088,37843,13729,22815,26790,14019,28249,136766,23076,21843,136850,34053,22985,134478,158849,159018,137180,23001,137211,137138,159142,28017,137256,136917,23033,159301,23211,23139,14054,149929,23159,14088,23190,29797,23251,159649,140628,15749,137489,14130,136888,24195,21200,23414,25992,23420,162318,16388,18525,131588,23509,24928,137780,154060,132517,23539,23453,19728,23557,138052,23571,29646,23572,138405,158504,23625,18653,23685,23785,23791,23947,138745,138807,23824,23832,23878,138916,23738,24023,33532,14381,149761,139337,139635,33415,14390,15298,24110,27274,24181,24186,148668,134355,21414,20151,24272,21416,137073,24073,24308,164994,24313,24315,14496,24316,26686,37915,24333,131521,194708,15070,18606,135994,24378,157832,140240,24408,140401,24419,38845,159342,24434,37696,166454,24487,23990,15711,152144,139114,159992,140904,37334,131742,166441,24625,26245,137335,14691,15815,13881,22416,141236,31089,15936,24734,24740,24755,149890,149903,162387,29860,20705,23200,24932,33828,24898,194726,159442,24961,20980,132694,24967,23466,147383,141407,25043,166813,170333,25040,14642,141696,141505,24611,24924,25886,25483,131352,25285,137072,25301,142861,25452,149983,14871,25656,25592,136078,137212,25744,28554,142902,38932,147596,153373,25825,25829,38011,14950,25658,14935,25933,28438,150056,150051,25989,25965,25951,143486,26037,149824,19255,26065,16600,137257,26080,26083,24543,144384,26136,143863,143864,26180,143780,143781,26187,134773,26215,152038,26227,26228,138813,143921,165364,143816,152339,30661,141559,39332,26370,148380,150049,15147,27130,145346,26462,26471,26466,147917,168173,26583,17641,26658,28240,37436,26625,144358,159136,26717,144495,27105,27147,166623,26995,26819,144845,26881,26880,15666,14849,144956,15232,26540,26977,166474,17148,26934,27032,15265,132041,33635,20624,27129,144985,139562,27205,145155,27293,15347,26545,27336,168348,15373,27421,133411,24798,27445,27508,141261,28341,146139,132021,137560,14144,21537,146266,27617,147196,27612,27703,140427,149745,158545,27738,33318,27769,146876,17605,146877,147876,149772,149760,146633,14053,15595,134450,39811,143865,140433,32655,26679,159013,159137,159211,28054,27996,28284,28420,149887,147589,159346,34099,159604,20935,27804,28189,33838,166689,28207,146991,29779,147330,31180,28239,23185,143435,28664,14093,28573,146992,28410,136343,147517,17749,37872,28484,28508,15694,28532,168304,15675,28575,147780,28627,147601,147797,147513,147440,147380,147775,20959,147798,147799,147776,156125,28747,28798,28839,28801,28876,28885,28886,28895,16644,15848,29108,29078,148087,28971,28997,23176,29002,29038,23708,148325,29007,37730,148161,28972,148570,150055,150050,29114,166888,28861,29198,37954,29205,22801,37955,29220,37697,153093,29230,29248,149876,26813,29269,29271,15957,143428,26637,28477,29314,29482,29483,149539,165931,18669,165892,29480,29486,29647,29610,134202,158254,29641,29769,147938,136935,150052,26147,14021,149943,149901,150011,29687,29717,26883,150054,29753,132547,16087,29788,141485,29792,167602,29767,29668,29814,33721,29804,14128,29812,37873,27180,29826,18771,150156,147807,150137,166799,23366,166915,137374,29896,137608,29966,29929,29982,167641,137803,23511,167596,37765,30029,30026,30055,30062,151426,16132,150803,30094,29789,30110,30132,30210,30252,30289,30287,30319,30326,156661,30352,33263,14328,157969,157966,30369,30373,30391,30412,159647,33890,151709,151933,138780,30494,30502,30528,25775,152096,30552,144044,30639,166244,166248,136897,30708,30729,136054,150034,26826,30895,30919,30931,38565,31022,153056,30935,31028,30897,161292,36792,34948,166699,155779,140828,31110,35072,26882,31104,153687,31133,162617,31036,31145,28202,160038,16040,31174,168205,31188],
+  "euc-kr":[44034,44035,44037,44038,44043,44044,44045,44046,44047,44056,44062,44063,44065,44066,44067,44069,44070,44071,44072,44073,44074,44075,44078,44082,44083,44084,null,null,null,null,null,null,44085,44086,44087,44090,44091,44093,44094,44095,44097,44098,44099,44100,44101,44102,44103,44104,44105,44106,44108,44110,44111,44112,44113,44114,44115,44117,null,null,null,null,null,null,44118,44119,44121,44122,44123,44125,44126,44127,44128,44129,44130,44131,44132,44133,44134,44135,44136,44137,44138,44139,44140,44141,44142,44143,44146,44147,44149,44150,44153,44155,44156,44157,44158,44159,44162,44167,44168,44173,44174,44175,44177,44178,44179,44181,44182,44183,44184,44185,44186,44187,44190,44194,44195,44196,44197,44198,44199,44203,44205,44206,44209,44210,44211,44212,44213,44214,44215,44218,44222,44223,44224,44226,44227,44229,44230,44231,44233,44234,44235,44237,44238,44239,44240,44241,44242,44243,44244,44246,44248,44249,44250,44251,44252,44253,44254,44255,44258,44259,44261,44262,44265,44267,44269,44270,44274,44276,44279,44280,44281,44282,44283,44286,44287,44289,44290,44291,44293,44295,44296,44297,44298,44299,44302,44304,44306,44307,44308,44309,44310,44311,44313,44314,44315,44317,44318,44319,44321,44322,44323,44324,44325,44326,44327,44328,44330,44331,44334,44335,44336,44337,44338,44339,null,null,null,null,null,null,44342,44343,44345,44346,44347,44349,44350,44351,44352,44353,44354,44355,44358,44360,44362,44363,44364,44365,44366,44367,44369,44370,44371,44373,44374,44375,null,null,null,null,null,null,44377,44378,44379,44380,44381,44382,44383,44384,44386,44388,44389,44390,44391,44392,44393,44394,44395,44398,44399,44401,44402,44407,44408,44409,44410,44414,44416,44419,44420,44421,44422,44423,44426,44427,44429,44430,44431,44433,44434,44435,44436,44437,44438,44439,44440,44441,44442,44443,44446,44447,44448,44449,44450,44451,44453,44454,44455,44456,44457,44458,44459,44460,44461,44462,44463,44464,44465,44466,44467,44468,44469,44470,44472,44473,44474,44475,44476,44477,44478,44479,44482,44483,44485,44486,44487,44489,44490,44491,44492,44493,44494,44495,44498,44500,44501,44502,44503,44504,44505,44506,44507,44509,44510,44511,44513,44514,44515,44517,44518,44519,44520,44521,44522,44523,44524,44525,44526,44527,44528,44529,44530,44531,44532,44533,44534,44535,44538,44539,44541,44542,44546,44547,44548,44549,44550,44551,44554,44556,44558,44559,44560,44561,44562,44563,44565,44566,44567,44568,44569,44570,44571,44572,null,null,null,null,null,null,44573,44574,44575,44576,44577,44578,44579,44580,44581,44582,44583,44584,44585,44586,44587,44588,44589,44590,44591,44594,44595,44597,44598,44601,44603,44604,null,null,null,null,null,null,44605,44606,44607,44610,44612,44615,44616,44617,44619,44623,44625,44626,44627,44629,44631,44632,44633,44634,44635,44638,44642,44643,44644,44646,44647,44650,44651,44653,44654,44655,44657,44658,44659,44660,44661,44662,44663,44666,44670,44671,44672,44673,44674,44675,44678,44679,44680,44681,44682,44683,44685,44686,44687,44688,44689,44690,44691,44692,44693,44694,44695,44696,44697,44698,44699,44700,44701,44702,44703,44704,44705,44706,44707,44708,44709,44710,44711,44712,44713,44714,44715,44716,44717,44718,44719,44720,44721,44722,44723,44724,44725,44726,44727,44728,44729,44730,44731,44735,44737,44738,44739,44741,44742,44743,44744,44745,44746,44747,44750,44754,44755,44756,44757,44758,44759,44762,44763,44765,44766,44767,44768,44769,44770,44771,44772,44773,44774,44775,44777,44778,44780,44782,44783,44784,44785,44786,44787,44789,44790,44791,44793,44794,44795,44797,44798,44799,44800,44801,44802,44803,44804,44805,null,null,null,null,null,null,44806,44809,44810,44811,44812,44814,44815,44817,44818,44819,44820,44821,44822,44823,44824,44825,44826,44827,44828,44829,44830,44831,44832,44833,44834,44835,null,null,null,null,null,null,44836,44837,44838,44839,44840,44841,44842,44843,44846,44847,44849,44851,44853,44854,44855,44856,44857,44858,44859,44862,44864,44868,44869,44870,44871,44874,44875,44876,44877,44878,44879,44881,44882,44883,44884,44885,44886,44887,44888,44889,44890,44891,44894,44895,44896,44897,44898,44899,44902,44903,44904,44905,44906,44907,44908,44909,44910,44911,44912,44913,44914,44915,44916,44917,44918,44919,44920,44922,44923,44924,44925,44926,44927,44929,44930,44931,44933,44934,44935,44937,44938,44939,44940,44941,44942,44943,44946,44947,44948,44950,44951,44952,44953,44954,44955,44957,44958,44959,44960,44961,44962,44963,44964,44965,44966,44967,44968,44969,44970,44971,44972,44973,44974,44975,44976,44977,44978,44979,44980,44981,44982,44983,44986,44987,44989,44990,44991,44993,44994,44995,44996,44997,44998,45002,45004,45007,45008,45009,45010,45011,45013,45014,45015,45016,45017,45018,45019,45021,45022,45023,45024,45025,null,null,null,null,null,null,45026,45027,45028,45029,45030,45031,45034,45035,45036,45037,45038,45039,45042,45043,45045,45046,45047,45049,45050,45051,45052,45053,45054,45055,45058,45059,null,null,null,null,null,null,45061,45062,45063,45064,45065,45066,45067,45069,45070,45071,45073,45074,45075,45077,45078,45079,45080,45081,45082,45083,45086,45087,45088,45089,45090,45091,45092,45093,45094,45095,45097,45098,45099,45100,45101,45102,45103,45104,45105,45106,45107,45108,45109,45110,45111,45112,45113,45114,45115,45116,45117,45118,45119,45120,45121,45122,45123,45126,45127,45129,45131,45133,45135,45136,45137,45138,45142,45144,45146,45147,45148,45150,45151,45152,45153,45154,45155,45156,45157,45158,45159,45160,45161,45162,45163,45164,45165,45166,45167,45168,45169,45170,45171,45172,45173,45174,45175,45176,45177,45178,45179,45182,45183,45185,45186,45187,45189,45190,45191,45192,45193,45194,45195,45198,45200,45202,45203,45204,45205,45206,45207,45211,45213,45214,45219,45220,45221,45222,45223,45226,45232,45234,45238,45239,45241,45242,45243,45245,45246,45247,45248,45249,45250,45251,45254,45258,45259,45260,45261,45262,45263,45266,null,null,null,null,null,null,45267,45269,45270,45271,45273,45274,45275,45276,45277,45278,45279,45281,45282,45283,45284,45286,45287,45288,45289,45290,45291,45292,45293,45294,45295,45296,null,null,null,null,null,null,45297,45298,45299,45300,45301,45302,45303,45304,45305,45306,45307,45308,45309,45310,45311,45312,45313,45314,45315,45316,45317,45318,45319,45322,45325,45326,45327,45329,45332,45333,45334,45335,45338,45342,45343,45344,45345,45346,45350,45351,45353,45354,45355,45357,45358,45359,45360,45361,45362,45363,45366,45370,45371,45372,45373,45374,45375,45378,45379,45381,45382,45383,45385,45386,45387,45388,45389,45390,45391,45394,45395,45398,45399,45401,45402,45403,45405,45406,45407,45409,45410,45411,45412,45413,45414,45415,45416,45417,45418,45419,45420,45421,45422,45423,45424,45425,45426,45427,45428,45429,45430,45431,45434,45435,45437,45438,45439,45441,45443,45444,45445,45446,45447,45450,45452,45454,45455,45456,45457,45461,45462,45463,45465,45466,45467,45469,45470,45471,45472,45473,45474,45475,45476,45477,45478,45479,45481,45482,45483,45484,45485,45486,45487,45488,45489,45490,45491,45492,45493,45494,45495,45496,null,null,null,null,null,null,45497,45498,45499,45500,45501,45502,45503,45504,45505,45506,45507,45508,45509,45510,45511,45512,45513,45514,45515,45517,45518,45519,45521,45522,45523,45525,null,null,null,null,null,null,45526,45527,45528,45529,45530,45531,45534,45536,45537,45538,45539,45540,45541,45542,45543,45546,45547,45549,45550,45551,45553,45554,45555,45556,45557,45558,45559,45560,45562,45564,45566,45567,45568,45569,45570,45571,45574,45575,45577,45578,45581,45582,45583,45584,45585,45586,45587,45590,45592,45594,45595,45596,45597,45598,45599,45601,45602,45603,45604,45605,45606,45607,45608,45609,45610,45611,45612,45613,45614,45615,45616,45617,45618,45619,45621,45622,45623,45624,45625,45626,45627,45629,45630,45631,45632,45633,45634,45635,45636,45637,45638,45639,45640,45641,45642,45643,45644,45645,45646,45647,45648,45649,45650,45651,45652,45653,45654,45655,45657,45658,45659,45661,45662,45663,45665,45666,45667,45668,45669,45670,45671,45674,45675,45676,45677,45678,45679,45680,45681,45682,45683,45686,45687,45688,45689,45690,45691,45693,45694,45695,45696,45697,45698,45699,45702,45703,45704,45706,45707,45708,45709,45710,null,null,null,null,null,null,45711,45714,45715,45717,45718,45719,45723,45724,45725,45726,45727,45730,45732,45735,45736,45737,45739,45741,45742,45743,45745,45746,45747,45749,45750,45751,null,null,null,null,null,null,45752,45753,45754,45755,45756,45757,45758,45759,45760,45761,45762,45763,45764,45765,45766,45767,45770,45771,45773,45774,45775,45777,45779,45780,45781,45782,45783,45786,45788,45790,45791,45792,45793,45795,45799,45801,45802,45808,45809,45810,45814,45820,45821,45822,45826,45827,45829,45830,45831,45833,45834,45835,45836,45837,45838,45839,45842,45846,45847,45848,45849,45850,45851,45853,45854,45855,45856,45857,45858,45859,45860,45861,45862,45863,45864,45865,45866,45867,45868,45869,45870,45871,45872,45873,45874,45875,45876,45877,45878,45879,45880,45881,45882,45883,45884,45885,45886,45887,45888,45889,45890,45891,45892,45893,45894,45895,45896,45897,45898,45899,45900,45901,45902,45903,45904,45905,45906,45907,45911,45913,45914,45917,45920,45921,45922,45923,45926,45928,45930,45932,45933,45935,45938,45939,45941,45942,45943,45945,45946,45947,45948,45949,45950,45951,45954,45958,45959,45960,45961,45962,45963,45965,null,null,null,null,null,null,45966,45967,45969,45970,45971,45973,45974,45975,45976,45977,45978,45979,45980,45981,45982,45983,45986,45987,45988,45989,45990,45991,45993,45994,45995,45997,null,null,null,null,null,null,45998,45999,46000,46001,46002,46003,46004,46005,46006,46007,46008,46009,46010,46011,46012,46013,46014,46015,46016,46017,46018,46019,46022,46023,46025,46026,46029,46031,46033,46034,46035,46038,46040,46042,46044,46046,46047,46049,46050,46051,46053,46054,46055,46057,46058,46059,46060,46061,46062,46063,46064,46065,46066,46067,46068,46069,46070,46071,46072,46073,46074,46075,46077,46078,46079,46080,46081,46082,46083,46084,46085,46086,46087,46088,46089,46090,46091,46092,46093,46094,46095,46097,46098,46099,46100,46101,46102,46103,46105,46106,46107,46109,46110,46111,46113,46114,46115,46116,46117,46118,46119,46122,46124,46125,46126,46127,46128,46129,46130,46131,46133,46134,46135,46136,46137,46138,46139,46140,46141,46142,46143,46144,46145,46146,46147,46148,46149,46150,46151,46152,46153,46154,46155,46156,46157,46158,46159,46162,46163,46165,46166,46167,46169,46170,46171,46172,46173,46174,46175,46178,46180,46182,null,null,null,null,null,null,46183,46184,46185,46186,46187,46189,46190,46191,46192,46193,46194,46195,46196,46197,46198,46199,46200,46201,46202,46203,46204,46205,46206,46207,46209,46210,null,null,null,null,null,null,46211,46212,46213,46214,46215,46217,46218,46219,46220,46221,46222,46223,46224,46225,46226,46227,46228,46229,46230,46231,46232,46233,46234,46235,46236,46238,46239,46240,46241,46242,46243,46245,46246,46247,46249,46250,46251,46253,46254,46255,46256,46257,46258,46259,46260,46262,46264,46266,46267,46268,46269,46270,46271,46273,46274,46275,46277,46278,46279,46281,46282,46283,46284,46285,46286,46287,46289,46290,46291,46292,46294,46295,46296,46297,46298,46299,46302,46303,46305,46306,46309,46311,46312,46313,46314,46315,46318,46320,46322,46323,46324,46325,46326,46327,46329,46330,46331,46332,46333,46334,46335,46336,46337,46338,46339,46340,46341,46342,46343,46344,46345,46346,46347,46348,46349,46350,46351,46352,46353,46354,46355,46358,46359,46361,46362,46365,46366,46367,46368,46369,46370,46371,46374,46379,46380,46381,46382,46383,46386,46387,46389,46390,46391,46393,46394,46395,46396,46397,46398,46399,46402,46406,null,null,null,null,null,null,46407,46408,46409,46410,46414,46415,46417,46418,46419,46421,46422,46423,46424,46425,46426,46427,46430,46434,46435,46436,46437,46438,46439,46440,46441,46442,null,null,null,null,null,null,46443,46444,46445,46446,46447,46448,46449,46450,46451,46452,46453,46454,46455,46456,46457,46458,46459,46460,46461,46462,46463,46464,46465,46466,46467,46468,46469,46470,46471,46472,46473,46474,46475,46476,46477,46478,46479,46480,46481,46482,46483,46484,46485,46486,46487,46488,46489,46490,46491,46492,46493,46494,46495,46498,46499,46501,46502,46503,46505,46508,46509,46510,46511,46514,46518,46519,46520,46521,46522,46526,46527,46529,46530,46531,46533,46534,46535,46536,46537,46538,46539,46542,46546,46547,46548,46549,46550,46551,46553,46554,46555,46556,46557,46558,46559,46560,46561,46562,46563,46564,46565,46566,46567,46568,46569,46570,46571,46573,46574,46575,46576,46577,46578,46579,46580,46581,46582,46583,46584,46585,46586,46587,46588,46589,46590,46591,46592,46593,46594,46595,46596,46597,46598,46599,46600,46601,46602,46603,46604,46605,46606,46607,46610,46611,46613,46614,46615,46617,46618,46619,46620,46621,null,null,null,null,null,null,46622,46623,46624,46625,46626,46627,46628,46630,46631,46632,46633,46634,46635,46637,46638,46639,46640,46641,46642,46643,46645,46646,46647,46648,46649,46650,null,null,null,null,null,null,46651,46652,46653,46654,46655,46656,46657,46658,46659,46660,46661,46662,46663,46665,46666,46667,46668,46669,46670,46671,46672,46673,46674,46675,46676,46677,46678,46679,46680,46681,46682,46683,46684,46685,46686,46687,46688,46689,46690,46691,46693,46694,46695,46697,46698,46699,46700,46701,46702,46703,46704,46705,46706,46707,46708,46709,46710,46711,46712,46713,46714,46715,46716,46717,46718,46719,46720,46721,46722,46723,46724,46725,46726,46727,46728,46729,46730,46731,46732,46733,46734,46735,46736,46737,46738,46739,46740,46741,46742,46743,46744,46745,46746,46747,46750,46751,46753,46754,46755,46757,46758,46759,46760,46761,46762,46765,46766,46767,46768,46770,46771,46772,46773,46774,46775,46776,46777,46778,46779,46780,46781,46782,46783,46784,46785,46786,46787,46788,46789,46790,46791,46792,46793,46794,46795,46796,46797,46798,46799,46800,46801,46802,46803,46805,46806,46807,46808,46809,46810,46811,46812,46813,null,null,null,null,null,null,46814,46815,46816,46817,46818,46819,46820,46821,46822,46823,46824,46825,46826,46827,46828,46829,46830,46831,46833,46834,46835,46837,46838,46839,46841,46842,null,null,null,null,null,null,46843,46844,46845,46846,46847,46850,46851,46852,46854,46855,46856,46857,46858,46859,46860,46861,46862,46863,46864,46865,46866,46867,46868,46869,46870,46871,46872,46873,46874,46875,46876,46877,46878,46879,46880,46881,46882,46883,46884,46885,46886,46887,46890,46891,46893,46894,46897,46898,46899,46900,46901,46902,46903,46906,46908,46909,46910,46911,46912,46913,46914,46915,46917,46918,46919,46921,46922,46923,46925,46926,46927,46928,46929,46930,46931,46934,46935,46936,46937,46938,46939,46940,46941,46942,46943,46945,46946,46947,46949,46950,46951,46953,46954,46955,46956,46957,46958,46959,46962,46964,46966,46967,46968,46969,46970,46971,46974,46975,46977,46978,46979,46981,46982,46983,46984,46985,46986,46987,46990,46995,46996,46997,47002,47003,47005,47006,47007,47009,47010,47011,47012,47013,47014,47015,47018,47022,47023,47024,47025,47026,47027,47030,47031,47033,47034,47035,47036,47037,47038,47039,47040,47041,null,null,null,null,null,null,47042,47043,47044,47045,47046,47048,47050,47051,47052,47053,47054,47055,47056,47057,47058,47059,47060,47061,47062,47063,47064,47065,47066,47067,47068,47069,null,null,null,null,null,null,47070,47071,47072,47073,47074,47075,47076,47077,47078,47079,47080,47081,47082,47083,47086,47087,47089,47090,47091,47093,47094,47095,47096,47097,47098,47099,47102,47106,47107,47108,47109,47110,47114,47115,47117,47118,47119,47121,47122,47123,47124,47125,47126,47127,47130,47132,47134,47135,47136,47137,47138,47139,47142,47143,47145,47146,47147,47149,47150,47151,47152,47153,47154,47155,47158,47162,47163,47164,47165,47166,47167,47169,47170,47171,47173,47174,47175,47176,47177,47178,47179,47180,47181,47182,47183,47184,47186,47188,47189,47190,47191,47192,47193,47194,47195,47198,47199,47201,47202,47203,47205,47206,47207,47208,47209,47210,47211,47214,47216,47218,47219,47220,47221,47222,47223,47225,47226,47227,47229,47230,47231,47232,47233,47234,47235,47236,47237,47238,47239,47240,47241,47242,47243,47244,47246,47247,47248,47249,47250,47251,47252,47253,47254,47255,47256,47257,47258,47259,47260,47261,47262,47263,null,null,null,null,null,null,47264,47265,47266,47267,47268,47269,47270,47271,47273,47274,47275,47276,47277,47278,47279,47281,47282,47283,47285,47286,47287,47289,47290,47291,47292,47293,null,null,null,null,null,null,47294,47295,47298,47300,47302,47303,47304,47305,47306,47307,47309,47310,47311,47313,47314,47315,47317,47318,47319,47320,47321,47322,47323,47324,47326,47328,47330,47331,47332,47333,47334,47335,47338,47339,47341,47342,47343,47345,47346,47347,47348,47349,47350,47351,47354,47356,47358,47359,47360,47361,47362,47363,47365,47366,47367,47368,47369,47370,47371,47372,47373,47374,47375,47376,47377,47378,47379,47380,47381,47382,47383,47385,47386,47387,47388,47389,47390,47391,47393,47394,47395,47396,47397,47398,47399,47400,47401,47402,47403,47404,47405,47406,47407,47408,47409,47410,47411,47412,47413,47414,47415,47416,47417,47418,47419,47422,47423,47425,47426,47427,47429,47430,47431,47432,47433,47434,47435,47437,47438,47440,47442,47443,47444,47445,47446,47447,47450,47451,47453,47454,47455,47457,47458,47459,47460,47461,47462,47463,47466,47468,47470,47471,47472,47473,47474,47475,47478,47479,47481,47482,47483,47485,null,null,null,null,null,null,47486,47487,47488,47489,47490,47491,47494,47496,47499,47500,47503,47504,47505,47506,47507,47508,47509,47510,47511,47512,47513,47514,47515,47516,47517,47518,null,null,null,null,null,null,47519,47520,47521,47522,47523,47524,47525,47526,47527,47528,47529,47530,47531,47534,47535,47537,47538,47539,47541,47542,47543,47544,47545,47546,47547,47550,47552,47554,47555,47556,47557,47558,47559,47562,47563,47565,47571,47572,47573,47574,47575,47578,47580,47583,47584,47586,47590,47591,47593,47594,47595,47597,47598,47599,47600,47601,47602,47603,47606,47611,47612,47613,47614,47615,47618,47619,47620,47621,47622,47623,47625,47626,47627,47628,47629,47630,47631,47632,47633,47634,47635,47636,47638,47639,47640,47641,47642,47643,47644,47645,47646,47647,47648,47649,47650,47651,47652,47653,47654,47655,47656,47657,47658,47659,47660,47661,47662,47663,47664,47665,47666,47667,47668,47669,47670,47671,47674,47675,47677,47678,47679,47681,47683,47684,47685,47686,47687,47690,47692,47695,47696,47697,47698,47702,47703,47705,47706,47707,47709,47710,47711,47712,47713,47714,47715,47718,47722,47723,47724,47725,47726,47727,null,null,null,null,null,null,47730,47731,47733,47734,47735,47737,47738,47739,47740,47741,47742,47743,47744,47745,47746,47750,47752,47753,47754,47755,47757,47758,47759,47760,47761,47762,null,null,null,null,null,null,47763,47764,47765,47766,47767,47768,47769,47770,47771,47772,47773,47774,47775,47776,47777,47778,47779,47780,47781,47782,47783,47786,47789,47790,47791,47793,47795,47796,47797,47798,47799,47802,47804,47806,47807,47808,47809,47810,47811,47813,47814,47815,47817,47818,47819,47820,47821,47822,47823,47824,47825,47826,47827,47828,47829,47830,47831,47834,47835,47836,47837,47838,47839,47840,47841,47842,47843,47844,47845,47846,47847,47848,47849,47850,47851,47852,47853,47854,47855,47856,47857,47858,47859,47860,47861,47862,47863,47864,47865,47866,47867,47869,47870,47871,47873,47874,47875,47877,47878,47879,47880,47881,47882,47883,47884,47886,47888,47890,47891,47892,47893,47894,47895,47897,47898,47899,47901,47902,47903,47905,47906,47907,47908,47909,47910,47911,47912,47914,47916,47917,47918,47919,47920,47921,47922,47923,47927,47929,47930,47935,47936,47937,47938,47939,47942,47944,47946,47947,47948,47950,47953,47954,null,null,null,null,null,null,47955,47957,47958,47959,47961,47962,47963,47964,47965,47966,47967,47968,47970,47972,47973,47974,47975,47976,47977,47978,47979,47981,47982,47983,47984,47985,null,null,null,null,null,null,47986,47987,47988,47989,47990,47991,47992,47993,47994,47995,47996,47997,47998,47999,48000,48001,48002,48003,48004,48005,48006,48007,48009,48010,48011,48013,48014,48015,48017,48018,48019,48020,48021,48022,48023,48024,48025,48026,48027,48028,48029,48030,48031,48032,48033,48034,48035,48037,48038,48039,48041,48042,48043,48045,48046,48047,48048,48049,48050,48051,48053,48054,48056,48057,48058,48059,48060,48061,48062,48063,48065,48066,48067,48069,48070,48071,48073,48074,48075,48076,48077,48078,48079,48081,48082,48084,48085,48086,48087,48088,48089,48090,48091,48092,48093,48094,48095,48096,48097,48098,48099,48100,48101,48102,48103,48104,48105,48106,48107,48108,48109,48110,48111,48112,48113,48114,48115,48116,48117,48118,48119,48122,48123,48125,48126,48129,48131,48132,48133,48134,48135,48138,48142,48144,48146,48147,48153,48154,48160,48161,48162,48163,48166,48168,48170,48171,48172,48174,48175,48178,48179,48181,null,null,null,null,null,null,48182,48183,48185,48186,48187,48188,48189,48190,48191,48194,48198,48199,48200,48202,48203,48206,48207,48209,48210,48211,48212,48213,48214,48215,48216,48217,null,null,null,null,null,null,48218,48219,48220,48222,48223,48224,48225,48226,48227,48228,48229,48230,48231,48232,48233,48234,48235,48236,48237,48238,48239,48240,48241,48242,48243,48244,48245,48246,48247,48248,48249,48250,48251,48252,48253,48254,48255,48256,48257,48258,48259,48262,48263,48265,48266,48269,48271,48272,48273,48274,48275,48278,48280,48283,48284,48285,48286,48287,48290,48291,48293,48294,48297,48298,48299,48300,48301,48302,48303,48306,48310,48311,48312,48313,48314,48315,48318,48319,48321,48322,48323,48325,48326,48327,48328,48329,48330,48331,48332,48334,48338,48339,48340,48342,48343,48345,48346,48347,48349,48350,48351,48352,48353,48354,48355,48356,48357,48358,48359,48360,48361,48362,48363,48364,48365,48366,48367,48368,48369,48370,48371,48375,48377,48378,48379,48381,48382,48383,48384,48385,48386,48387,48390,48392,48394,48395,48396,48397,48398,48399,48401,48402,48403,48405,48406,48407,48408,48409,48410,48411,48412,48413,null,null,null,null,null,null,48414,48415,48416,48417,48418,48419,48421,48422,48423,48424,48425,48426,48427,48429,48430,48431,48432,48433,48434,48435,48436,48437,48438,48439,48440,48441,null,null,null,null,null,null,48442,48443,48444,48445,48446,48447,48449,48450,48451,48452,48453,48454,48455,48458,48459,48461,48462,48463,48465,48466,48467,48468,48469,48470,48471,48474,48475,48476,48477,48478,48479,48480,48481,48482,48483,48485,48486,48487,48489,48490,48491,48492,48493,48494,48495,48496,48497,48498,48499,48500,48501,48502,48503,48504,48505,48506,48507,48508,48509,48510,48511,48514,48515,48517,48518,48523,48524,48525,48526,48527,48530,48532,48534,48535,48536,48539,48541,48542,48543,48544,48545,48546,48547,48549,48550,48551,48552,48553,48554,48555,48556,48557,48558,48559,48561,48562,48563,48564,48565,48566,48567,48569,48570,48571,48572,48573,48574,48575,48576,48577,48578,48579,48580,48581,48582,48583,48584,48585,48586,48587,48588,48589,48590,48591,48592,48593,48594,48595,48598,48599,48601,48602,48603,48605,48606,48607,48608,48609,48610,48611,48612,48613,48614,48615,48616,48618,48619,48620,48621,48622,48623,48625,null,null,null,null,null,null,48626,48627,48629,48630,48631,48633,48634,48635,48636,48637,48638,48639,48641,48642,48644,48646,48647,48648,48649,48650,48651,48654,48655,48657,48658,48659,null,null,null,null,null,null,48661,48662,48663,48664,48665,48666,48667,48670,48672,48673,48674,48675,48676,48677,48678,48679,48680,48681,48682,48683,48684,48685,48686,48687,48688,48689,48690,48691,48692,48693,48694,48695,48696,48697,48698,48699,48700,48701,48702,48703,48704,48705,48706,48707,48710,48711,48713,48714,48715,48717,48719,48720,48721,48722,48723,48726,48728,48732,48733,48734,48735,48738,48739,48741,48742,48743,48745,48747,48748,48749,48750,48751,48754,48758,48759,48760,48761,48762,48766,48767,48769,48770,48771,48773,48774,48775,48776,48777,48778,48779,48782,48786,48787,48788,48789,48790,48791,48794,48795,48796,48797,48798,48799,48800,48801,48802,48803,48804,48805,48806,48807,48809,48810,48811,48812,48813,48814,48815,48816,48817,48818,48819,48820,48821,48822,48823,48824,48825,48826,48827,48828,48829,48830,48831,48832,48833,48834,48835,48836,48837,48838,48839,48840,48841,48842,48843,48844,48845,48846,48847,48850,48851,null,null,null,null,null,null,48853,48854,48857,48858,48859,48860,48861,48862,48863,48865,48866,48870,48871,48872,48873,48874,48875,48877,48878,48879,48880,48881,48882,48883,48884,48885,null,null,null,null,null,null,48886,48887,48888,48889,48890,48891,48892,48893,48894,48895,48896,48898,48899,48900,48901,48902,48903,48906,48907,48908,48909,48910,48911,48912,48913,48914,48915,48916,48917,48918,48919,48922,48926,48927,48928,48929,48930,48931,48932,48933,48934,48935,48936,48937,48938,48939,48940,48941,48942,48943,48944,48945,48946,48947,48948,48949,48950,48951,48952,48953,48954,48955,48956,48957,48958,48959,48962,48963,48965,48966,48967,48969,48970,48971,48972,48973,48974,48975,48978,48979,48980,48982,48983,48984,48985,48986,48987,48988,48989,48990,48991,48992,48993,48994,48995,48996,48997,48998,48999,49000,49001,49002,49003,49004,49005,49006,49007,49008,49009,49010,49011,49012,49013,49014,49015,49016,49017,49018,49019,49020,49021,49022,49023,49024,49025,49026,49027,49028,49029,49030,49031,49032,49033,49034,49035,49036,49037,49038,49039,49040,49041,49042,49043,49045,49046,49047,49048,49049,49050,49051,49052,49053,null,null,null,null,null,null,49054,49055,49056,49057,49058,49059,49060,49061,49062,49063,49064,49065,49066,49067,49068,49069,49070,49071,49073,49074,49075,49076,49077,49078,49079,49080,null,null,null,null,null,null,49081,49082,49083,49084,49085,49086,49087,49088,49089,49090,49091,49092,49094,49095,49096,49097,49098,49099,49102,49103,49105,49106,49107,49109,49110,49111,49112,49113,49114,49115,49117,49118,49120,49122,49123,49124,49125,49126,49127,49128,49129,49130,49131,49132,49133,49134,49135,49136,49137,49138,49139,49140,49141,49142,49143,49144,49145,49146,49147,49148,49149,49150,49151,49152,49153,49154,49155,49156,49157,49158,49159,49160,49161,49162,49163,49164,49165,49166,49167,49168,49169,49170,49171,49172,49173,49174,49175,49176,49177,49178,49179,49180,49181,49182,49183,49184,49185,49186,49187,49188,49189,49190,49191,49192,49193,49194,49195,49196,49197,49198,49199,49200,49201,49202,49203,49204,49205,49206,49207,49208,49209,49210,49211,49213,49214,49215,49216,49217,49218,49219,49220,49221,49222,49223,49224,49225,49226,49227,49228,49229,49230,49231,49232,49234,49235,49236,49237,49238,49239,49241,49242,49243,null,null,null,null,null,null,49245,49246,49247,49249,49250,49251,49252,49253,49254,49255,49258,49259,49260,49261,49262,49263,49264,49265,49266,49267,49268,49269,49270,49271,49272,49273,null,null,null,null,null,null,49274,49275,49276,49277,49278,49279,49280,49281,49282,49283,49284,49285,49286,49287,49288,49289,49290,49291,49292,49293,49294,49295,49298,49299,49301,49302,49303,49305,49306,49307,49308,49309,49310,49311,49314,49316,49318,49319,49320,49321,49322,49323,49326,49329,49330,49335,49336,49337,49338,49339,49342,49346,49347,49348,49350,49351,49354,49355,49357,49358,49359,49361,49362,49363,49364,49365,49366,49367,49370,49374,49375,49376,49377,49378,49379,49382,49383,49385,49386,49387,49389,49390,49391,49392,49393,49394,49395,49398,49400,49402,49403,49404,49405,49406,49407,49409,49410,49411,49413,49414,49415,49417,49418,49419,49420,49421,49422,49423,49425,49426,49427,49428,49430,49431,49432,49433,49434,49435,49441,49442,49445,49448,49449,49450,49451,49454,49458,49459,49460,49461,49463,49466,49467,49469,49470,49471,49473,49474,49475,49476,49477,49478,49479,49482,49486,49487,49488,49489,49490,49491,49494,49495,null,null,null,null,null,null,49497,49498,49499,49501,49502,49503,49504,49505,49506,49507,49510,49514,49515,49516,49517,49518,49519,49521,49522,49523,49525,49526,49527,49529,49530,49531,null,null,null,null,null,null,49532,49533,49534,49535,49536,49537,49538,49539,49540,49542,49543,49544,49545,49546,49547,49551,49553,49554,49555,49557,49559,49560,49561,49562,49563,49566,49568,49570,49571,49572,49574,49575,49578,49579,49581,49582,49583,49585,49586,49587,49588,49589,49590,49591,49592,49593,49594,49595,49596,49598,49599,49600,49601,49602,49603,49605,49606,49607,49609,49610,49611,49613,49614,49615,49616,49617,49618,49619,49621,49622,49625,49626,49627,49628,49629,49630,49631,49633,49634,49635,49637,49638,49639,49641,49642,49643,49644,49645,49646,49647,49650,49652,49653,49654,49655,49656,49657,49658,49659,49662,49663,49665,49666,49667,49669,49670,49671,49672,49673,49674,49675,49678,49680,49682,49683,49684,49685,49686,49687,49690,49691,49693,49694,49697,49698,49699,49700,49701,49702,49703,49706,49708,49710,49712,49715,49717,49718,49719,49720,49721,49722,49723,49724,49725,49726,49727,49728,49729,49730,49731,49732,49733,null,null,null,null,null,null,49734,49735,49737,49738,49739,49740,49741,49742,49743,49746,49747,49749,49750,49751,49753,49754,49755,49756,49757,49758,49759,49761,49762,49763,49764,49766,null,null,null,null,null,null,49767,49768,49769,49770,49771,49774,49775,49777,49778,49779,49781,49782,49783,49784,49785,49786,49787,49790,49792,49794,49795,49796,49797,49798,49799,49802,49803,49804,49805,49806,49807,49809,49810,49811,49812,49813,49814,49815,49817,49818,49820,49822,49823,49824,49825,49826,49827,49830,49831,49833,49834,49835,49838,49839,49840,49841,49842,49843,49846,49848,49850,49851,49852,49853,49854,49855,49856,49857,49858,49859,49860,49861,49862,49863,49864,49865,49866,49867,49868,49869,49870,49871,49872,49873,49874,49875,49876,49877,49878,49879,49880,49881,49882,49883,49886,49887,49889,49890,49893,49894,49895,49896,49897,49898,49902,49904,49906,49907,49908,49909,49911,49914,49917,49918,49919,49921,49922,49923,49924,49925,49926,49927,49930,49931,49934,49935,49936,49937,49938,49942,49943,49945,49946,49947,49949,49950,49951,49952,49953,49954,49955,49958,49959,49962,49963,49964,49965,49966,49967,49968,49969,49970,null,null,null,null,null,null,49971,49972,49973,49974,49975,49976,49977,49978,49979,49980,49981,49982,49983,49984,49985,49986,49987,49988,49990,49991,49992,49993,49994,49995,49996,49997,null,null,null,null,null,null,49998,49999,50000,50001,50002,50003,50004,50005,50006,50007,50008,50009,50010,50011,50012,50013,50014,50015,50016,50017,50018,50019,50020,50021,50022,50023,50026,50027,50029,50030,50031,50033,50035,50036,50037,50038,50039,50042,50043,50046,50047,50048,50049,50050,50051,50053,50054,50055,50057,50058,50059,50061,50062,50063,50064,50065,50066,50067,50068,50069,50070,50071,50072,50073,50074,50075,50076,50077,50078,50079,50080,50081,50082,50083,50084,50085,50086,50087,50088,50089,50090,50091,50092,50093,50094,50095,50096,50097,50098,50099,50100,50101,50102,50103,50104,50105,50106,50107,50108,50109,50110,50111,50113,50114,50115,50116,50117,50118,50119,50120,50121,50122,50123,50124,50125,50126,50127,50128,50129,50130,50131,50132,50133,50134,50135,50138,50139,50141,50142,50145,50147,50148,50149,50150,50151,50154,50155,50156,50158,50159,50160,50161,50162,50163,50166,50167,50169,50170,50171,50172,50173,50174,null,null,null,null,null,null,50175,50176,50177,50178,50179,50180,50181,50182,50183,50185,50186,50187,50188,50189,50190,50191,50193,50194,50195,50196,50197,50198,50199,50200,50201,50202,null,null,null,null,null,null,50203,50204,50205,50206,50207,50208,50209,50210,50211,50213,50214,50215,50216,50217,50218,50219,50221,50222,50223,50225,50226,50227,50229,50230,50231,50232,50233,50234,50235,50238,50239,50240,50241,50242,50243,50244,50245,50246,50247,50249,50250,50251,50252,50253,50254,50255,50256,50257,50258,50259,50260,50261,50262,50263,50264,50265,50266,50267,50268,50269,50270,50271,50272,50273,50274,50275,50278,50279,50281,50282,50283,50285,50286,50287,50288,50289,50290,50291,50294,50295,50296,50298,50299,50300,50301,50302,50303,50305,50306,50307,50308,50309,50310,50311,50312,50313,50314,50315,50316,50317,50318,50319,50320,50321,50322,50323,50325,50326,50327,50328,50329,50330,50331,50333,50334,50335,50336,50337,50338,50339,50340,50341,50342,50343,50344,50345,50346,50347,50348,50349,50350,50351,50352,50353,50354,50355,50356,50357,50358,50359,50361,50362,50363,50365,50366,50367,50368,50369,50370,50371,50372,50373,null,null,null,null,null,null,50374,50375,50376,50377,50378,50379,50380,50381,50382,50383,50384,50385,50386,50387,50388,50389,50390,50391,50392,50393,50394,50395,50396,50397,50398,50399,null,null,null,null,null,null,50400,50401,50402,50403,50404,50405,50406,50407,50408,50410,50411,50412,50413,50414,50415,50418,50419,50421,50422,50423,50425,50427,50428,50429,50430,50434,50435,50436,50437,50438,50439,50440,50441,50442,50443,50445,50446,50447,50449,50450,50451,50453,50454,50455,50456,50457,50458,50459,50461,50462,50463,50464,50465,50466,50467,50468,50469,50470,50471,50474,50475,50477,50478,50479,50481,50482,50483,50484,50485,50486,50487,50490,50492,50494,50495,50496,50497,50498,50499,50502,50503,50507,50511,50512,50513,50514,50518,50522,50523,50524,50527,50530,50531,50533,50534,50535,50537,50538,50539,50540,50541,50542,50543,50546,50550,50551,50552,50553,50554,50555,50558,50559,50561,50562,50563,50565,50566,50568,50569,50570,50571,50574,50576,50578,50579,50580,50582,50585,50586,50587,50589,50590,50591,50593,50594,50595,50596,50597,50598,50599,50600,50602,50603,50604,50605,50606,50607,50608,50609,50610,50611,50614,null,null,null,null,null,null,50615,50618,50623,50624,50625,50626,50627,50635,50637,50639,50642,50643,50645,50646,50647,50649,50650,50651,50652,50653,50654,50655,50658,50660,50662,50663,null,null,null,null,null,null,50664,50665,50666,50667,50671,50673,50674,50675,50677,50680,50681,50682,50683,50690,50691,50692,50697,50698,50699,50701,50702,50703,50705,50706,50707,50708,50709,50710,50711,50714,50717,50718,50719,50720,50721,50722,50723,50726,50727,50729,50730,50731,50735,50737,50738,50742,50744,50746,50748,50749,50750,50751,50754,50755,50757,50758,50759,50761,50762,50763,50764,50765,50766,50767,50770,50774,50775,50776,50777,50778,50779,50782,50783,50785,50786,50787,50788,50789,50790,50791,50792,50793,50794,50795,50797,50798,50800,50802,50803,50804,50805,50806,50807,50810,50811,50813,50814,50815,50817,50818,50819,50820,50821,50822,50823,50826,50828,50830,50831,50832,50833,50834,50835,50838,50839,50841,50842,50843,50845,50846,50847,50848,50849,50850,50851,50854,50856,50858,50859,50860,50861,50862,50863,50866,50867,50869,50870,50871,50875,50876,50877,50878,50879,50882,50884,50886,50887,50888,50889,50890,50891,50894,null,null,null,null,null,null,50895,50897,50898,50899,50901,50902,50903,50904,50905,50906,50907,50910,50911,50914,50915,50916,50917,50918,50919,50922,50923,50925,50926,50927,50929,50930,null,null,null,null,null,null,50931,50932,50933,50934,50935,50938,50939,50940,50942,50943,50944,50945,50946,50947,50950,50951,50953,50954,50955,50957,50958,50959,50960,50961,50962,50963,50966,50968,50970,50971,50972,50973,50974,50975,50978,50979,50981,50982,50983,50985,50986,50987,50988,50989,50990,50991,50994,50996,50998,51000,51001,51002,51003,51006,51007,51009,51010,51011,51013,51014,51015,51016,51017,51019,51022,51024,51033,51034,51035,51037,51038,51039,51041,51042,51043,51044,51045,51046,51047,51049,51050,51052,51053,51054,51055,51056,51057,51058,51059,51062,51063,51065,51066,51067,51071,51072,51073,51074,51078,51083,51084,51085,51087,51090,51091,51093,51097,51099,51100,51101,51102,51103,51106,51111,51112,51113,51114,51115,51118,51119,51121,51122,51123,51125,51126,51127,51128,51129,51130,51131,51134,51138,51139,51140,51141,51142,51143,51146,51147,51149,51151,51153,51154,51155,51156,51157,51158,51159,51161,51162,51163,51164,null,null,null,null,null,null,51166,51167,51168,51169,51170,51171,51173,51174,51175,51177,51178,51179,51181,51182,51183,51184,51185,51186,51187,51188,51189,51190,51191,51192,51193,51194,null,null,null,null,null,null,51195,51196,51197,51198,51199,51202,51203,51205,51206,51207,51209,51211,51212,51213,51214,51215,51218,51220,51223,51224,51225,51226,51227,51230,51231,51233,51234,51235,51237,51238,51239,51240,51241,51242,51243,51246,51248,51250,51251,51252,51253,51254,51255,51257,51258,51259,51261,51262,51263,51265,51266,51267,51268,51269,51270,51271,51274,51275,51278,51279,51280,51281,51282,51283,51285,51286,51287,51288,51289,51290,51291,51292,51293,51294,51295,51296,51297,51298,51299,51300,51301,51302,51303,51304,51305,51306,51307,51308,51309,51310,51311,51314,51315,51317,51318,51319,51321,51323,51324,51325,51326,51327,51330,51332,51336,51337,51338,51342,51343,51344,51345,51346,51347,51349,51350,51351,51352,51353,51354,51355,51356,51358,51360,51362,51363,51364,51365,51366,51367,51369,51370,51371,51372,51373,51374,51375,51376,51377,51378,51379,51380,51381,51382,51383,51384,51385,51386,51387,51390,51391,51392,51393,null,null,null,null,null,null,51394,51395,51397,51398,51399,51401,51402,51403,51405,51406,51407,51408,51409,51410,51411,51414,51416,51418,51419,51420,51421,51422,51423,51426,51427,51429,null,null,null,null,null,null,51430,51431,51432,51433,51434,51435,51436,51437,51438,51439,51440,51441,51442,51443,51444,51446,51447,51448,51449,51450,51451,51454,51455,51457,51458,51459,51463,51464,51465,51466,51467,51470,12288,12289,12290,183,8229,8230,168,12291,173,8213,8741,65340,8764,8216,8217,8220,8221,12308,12309,12296,12297,12298,12299,12300,12301,12302,12303,12304,12305,177,215,247,8800,8804,8805,8734,8756,176,8242,8243,8451,8491,65504,65505,65509,9794,9792,8736,8869,8978,8706,8711,8801,8786,167,8251,9734,9733,9675,9679,9678,9671,9670,9633,9632,9651,9650,9661,9660,8594,8592,8593,8595,8596,12307,8810,8811,8730,8765,8733,8757,8747,8748,8712,8715,8838,8839,8834,8835,8746,8745,8743,8744,65506,51472,51474,51475,51476,51477,51478,51479,51481,51482,51483,51484,51485,51486,51487,51488,51489,51490,51491,51492,51493,51494,51495,51496,51497,51498,51499,null,null,null,null,null,null,51501,51502,51503,51504,51505,51506,51507,51509,51510,51511,51512,51513,51514,51515,51516,51517,51518,51519,51520,51521,51522,51523,51524,51525,51526,51527,null,null,null,null,null,null,51528,51529,51530,51531,51532,51533,51534,51535,51538,51539,51541,51542,51543,51545,51546,51547,51548,51549,51550,51551,51554,51556,51557,51558,51559,51560,51561,51562,51563,51565,51566,51567,8658,8660,8704,8707,180,65374,711,728,733,730,729,184,731,161,191,720,8750,8721,8719,164,8457,8240,9665,9664,9655,9654,9828,9824,9825,9829,9831,9827,8857,9672,9635,9680,9681,9618,9636,9637,9640,9639,9638,9641,9832,9743,9742,9756,9758,182,8224,8225,8597,8599,8601,8598,8600,9837,9833,9834,9836,12927,12828,8470,13255,8482,13250,13272,8481,8364,174,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,51569,51570,51571,51573,51574,51575,51576,51577,51578,51579,51581,51582,51583,51584,51585,51586,51587,51588,51589,51590,51591,51594,51595,51597,51598,51599,null,null,null,null,null,null,51601,51602,51603,51604,51605,51606,51607,51610,51612,51614,51615,51616,51617,51618,51619,51620,51621,51622,51623,51624,51625,51626,51627,51628,51629,51630,null,null,null,null,null,null,51631,51632,51633,51634,51635,51636,51637,51638,51639,51640,51641,51642,51643,51644,51645,51646,51647,51650,51651,51653,51654,51657,51659,51660,51661,51662,51663,51666,51668,51671,51672,51675,65281,65282,65283,65284,65285,65286,65287,65288,65289,65290,65291,65292,65293,65294,65295,65296,65297,65298,65299,65300,65301,65302,65303,65304,65305,65306,65307,65308,65309,65310,65311,65312,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,65339,65510,65341,65342,65343,65344,65345,65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,65371,65372,65373,65507,51678,51679,51681,51683,51685,51686,51688,51689,51690,51691,51694,51698,51699,51700,51701,51702,51703,51706,51707,51709,51710,51711,51713,51714,51715,51716,null,null,null,null,null,null,51717,51718,51719,51722,51726,51727,51728,51729,51730,51731,51733,51734,51735,51737,51738,51739,51740,51741,51742,51743,51744,51745,51746,51747,51748,51749,null,null,null,null,null,null,51750,51751,51752,51754,51755,51756,51757,51758,51759,51760,51761,51762,51763,51764,51765,51766,51767,51768,51769,51770,51771,51772,51773,51774,51775,51776,51777,51778,51779,51780,51781,51782,12593,12594,12595,12596,12597,12598,12599,12600,12601,12602,12603,12604,12605,12606,12607,12608,12609,12610,12611,12612,12613,12614,12615,12616,12617,12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632,12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,12647,12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,12662,12663,12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679,12680,12681,12682,12683,12684,12685,12686,51783,51784,51785,51786,51787,51790,51791,51793,51794,51795,51797,51798,51799,51800,51801,51802,51803,51806,51810,51811,51812,51813,51814,51815,51817,51818,null,null,null,null,null,null,51819,51820,51821,51822,51823,51824,51825,51826,51827,51828,51829,51830,51831,51832,51833,51834,51835,51836,51838,51839,51840,51841,51842,51843,51845,51846,null,null,null,null,null,null,51847,51848,51849,51850,51851,51852,51853,51854,51855,51856,51857,51858,51859,51860,51861,51862,51863,51865,51866,51867,51868,51869,51870,51871,51872,51873,51874,51875,51876,51877,51878,51879,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,null,null,null,null,null,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,null,null,null,null,null,null,null,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,null,null,null,null,null,null,null,null,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,null,null,null,null,null,null,51880,51881,51882,51883,51884,51885,51886,51887,51888,51889,51890,51891,51892,51893,51894,51895,51896,51897,51898,51899,51902,51903,51905,51906,51907,51909,null,null,null,null,null,null,51910,51911,51912,51913,51914,51915,51918,51920,51922,51924,51925,51926,51927,51930,51931,51932,51933,51934,51935,51937,51938,51939,51940,51941,51942,51943,null,null,null,null,null,null,51944,51945,51946,51947,51949,51950,51951,51952,51953,51954,51955,51957,51958,51959,51960,51961,51962,51963,51964,51965,51966,51967,51968,51969,51970,51971,51972,51973,51974,51975,51977,51978,9472,9474,9484,9488,9496,9492,9500,9516,9508,9524,9532,9473,9475,9487,9491,9499,9495,9507,9523,9515,9531,9547,9504,9519,9512,9527,9535,9501,9520,9509,9528,9538,9490,9489,9498,9497,9494,9493,9486,9485,9502,9503,9505,9506,9510,9511,9513,9514,9517,9518,9521,9522,9525,9526,9529,9530,9533,9534,9536,9537,9539,9540,9541,9542,9543,9544,9545,9546,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,51979,51980,51981,51982,51983,51985,51986,51987,51989,51990,51991,51993,51994,51995,51996,51997,51998,51999,52002,52003,52004,52005,52006,52007,52008,52009,null,null,null,null,null,null,52010,52011,52012,52013,52014,52015,52016,52017,52018,52019,52020,52021,52022,52023,52024,52025,52026,52027,52028,52029,52030,52031,52032,52034,52035,52036,null,null,null,null,null,null,52037,52038,52039,52042,52043,52045,52046,52047,52049,52050,52051,52052,52053,52054,52055,52058,52059,52060,52062,52063,52064,52065,52066,52067,52069,52070,52071,52072,52073,52074,52075,52076,13205,13206,13207,8467,13208,13252,13219,13220,13221,13222,13209,13210,13211,13212,13213,13214,13215,13216,13217,13218,13258,13197,13198,13199,13263,13192,13193,13256,13223,13224,13232,13233,13234,13235,13236,13237,13238,13239,13240,13241,13184,13185,13186,13187,13188,13242,13243,13244,13245,13246,13247,13200,13201,13202,13203,13204,8486,13248,13249,13194,13195,13196,13270,13253,13229,13230,13231,13275,13225,13226,13227,13228,13277,13264,13267,13251,13257,13276,13254,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,52077,52078,52079,52080,52081,52082,52083,52084,52085,52086,52087,52090,52091,52092,52093,52094,52095,52096,52097,52098,52099,52100,52101,52102,52103,52104,null,null,null,null,null,null,52105,52106,52107,52108,52109,52110,52111,52112,52113,52114,52115,52116,52117,52118,52119,52120,52121,52122,52123,52125,52126,52127,52128,52129,52130,52131,null,null,null,null,null,null,52132,52133,52134,52135,52136,52137,52138,52139,52140,52141,52142,52143,52144,52145,52146,52147,52148,52149,52150,52151,52153,52154,52155,52156,52157,52158,52159,52160,52161,52162,52163,52164,198,208,170,294,null,306,null,319,321,216,338,186,222,358,330,null,12896,12897,12898,12899,12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,12910,12911,12912,12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,12923,9424,9425,9426,9427,9428,9429,9430,9431,9432,9433,9434,9435,9436,9437,9438,9439,9440,9441,9442,9443,9444,9445,9446,9447,9448,9449,9312,9313,9314,9315,9316,9317,9318,9319,9320,9321,9322,9323,9324,9325,9326,189,8531,8532,188,190,8539,8540,8541,8542,52165,52166,52167,52168,52169,52170,52171,52172,52173,52174,52175,52176,52177,52178,52179,52181,52182,52183,52184,52185,52186,52187,52188,52189,52190,52191,null,null,null,null,null,null,52192,52193,52194,52195,52197,52198,52200,52202,52203,52204,52205,52206,52207,52208,52209,52210,52211,52212,52213,52214,52215,52216,52217,52218,52219,52220,null,null,null,null,null,null,52221,52222,52223,52224,52225,52226,52227,52228,52229,52230,52231,52232,52233,52234,52235,52238,52239,52241,52242,52243,52245,52246,52247,52248,52249,52250,52251,52254,52255,52256,52259,52260,230,273,240,295,305,307,312,320,322,248,339,223,254,359,331,329,12800,12801,12802,12803,12804,12805,12806,12807,12808,12809,12810,12811,12812,12813,12814,12815,12816,12817,12818,12819,12820,12821,12822,12823,12824,12825,12826,12827,9372,9373,9374,9375,9376,9377,9378,9379,9380,9381,9382,9383,9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,9395,9396,9397,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345,9346,185,178,179,8308,8319,8321,8322,8323,8324,52261,52262,52266,52267,52269,52271,52273,52274,52275,52276,52277,52278,52279,52282,52287,52288,52289,52290,52291,52294,52295,52297,52298,52299,52301,52302,null,null,null,null,null,null,52303,52304,52305,52306,52307,52310,52314,52315,52316,52317,52318,52319,52321,52322,52323,52325,52327,52329,52330,52331,52332,52333,52334,52335,52337,52338,null,null,null,null,null,null,52339,52340,52342,52343,52344,52345,52346,52347,52348,52349,52350,52351,52352,52353,52354,52355,52356,52357,52358,52359,52360,52361,52362,52363,52364,52365,52366,52367,52368,52369,52370,52371,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,null,null,null,null,null,null,null,null,null,null,null,52372,52373,52374,52375,52378,52379,52381,52382,52383,52385,52386,52387,52388,52389,52390,52391,52394,52398,52399,52400,52401,52402,52403,52406,52407,52409,null,null,null,null,null,null,52410,52411,52413,52414,52415,52416,52417,52418,52419,52422,52424,52426,52427,52428,52429,52430,52431,52433,52434,52435,52437,52438,52439,52440,52441,52442,null,null,null,null,null,null,52443,52444,52445,52446,52447,52448,52449,52450,52451,52453,52454,52455,52456,52457,52458,52459,52461,52462,52463,52465,52466,52467,52468,52469,52470,52471,52472,52473,52474,52475,52476,52477,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,null,null,null,null,null,null,null,null,52478,52479,52480,52482,52483,52484,52485,52486,52487,52490,52491,52493,52494,52495,52497,52498,52499,52500,52501,52502,52503,52506,52508,52510,52511,52512,null,null,null,null,null,null,52513,52514,52515,52517,52518,52519,52521,52522,52523,52525,52526,52527,52528,52529,52530,52531,52532,52533,52534,52535,52536,52538,52539,52540,52541,52542,null,null,null,null,null,null,52543,52544,52545,52546,52547,52548,52549,52550,52551,52552,52553,52554,52555,52556,52557,52558,52559,52560,52561,52562,52563,52564,52565,52566,52567,52568,52569,52570,52571,52573,52574,52575,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,1072,1073,1074,1075,1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,null,null,null,null,null,null,null,null,null,null,null,null,null,52577,52578,52579,52581,52582,52583,52584,52585,52586,52587,52590,52592,52594,52595,52596,52597,52598,52599,52601,52602,52603,52604,52605,52606,52607,52608,null,null,null,null,null,null,52609,52610,52611,52612,52613,52614,52615,52617,52618,52619,52620,52621,52622,52623,52624,52625,52626,52627,52630,52631,52633,52634,52635,52637,52638,52639,null,null,null,null,null,null,52640,52641,52642,52643,52646,52648,52650,52651,52652,52653,52654,52655,52657,52658,52659,52660,52661,52662,52663,52664,52665,52666,52667,52668,52669,52670,52671,52672,52673,52674,52675,52677,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,52678,52679,52680,52681,52682,52683,52685,52686,52687,52689,52690,52691,52692,52693,52694,52695,52696,52697,52698,52699,52700,52701,52702,52703,52704,52705,null,null,null,null,null,null,52706,52707,52708,52709,52710,52711,52713,52714,52715,52717,52718,52719,52721,52722,52723,52724,52725,52726,52727,52730,52732,52734,52735,52736,52737,52738,null,null,null,null,null,null,52739,52741,52742,52743,52745,52746,52747,52749,52750,52751,52752,52753,52754,52755,52757,52758,52759,52760,52762,52763,52764,52765,52766,52767,52770,52771,52773,52774,52775,52777,52778,52779,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,52780,52781,52782,52783,52786,52788,52790,52791,52792,52793,52794,52795,52796,52797,52798,52799,52800,52801,52802,52803,52804,52805,52806,52807,52808,52809,null,null,null,null,null,null,52810,52811,52812,52813,52814,52815,52816,52817,52818,52819,52820,52821,52822,52823,52826,52827,52829,52830,52834,52835,52836,52837,52838,52839,52842,52844,null,null,null,null,null,null,52846,52847,52848,52849,52850,52851,52854,52855,52857,52858,52859,52861,52862,52863,52864,52865,52866,52867,52870,52872,52874,52875,52876,52877,52878,52879,52882,52883,52885,52886,52887,52889,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,52890,52891,52892,52893,52894,52895,52898,52902,52903,52904,52905,52906,52907,52910,52911,52912,52913,52914,52915,52916,52917,52918,52919,52920,52921,52922,null,null,null,null,null,null,52923,52924,52925,52926,52927,52928,52930,52931,52932,52933,52934,52935,52936,52937,52938,52939,52940,52941,52942,52943,52944,52945,52946,52947,52948,52949,null,null,null,null,null,null,52950,52951,52952,52953,52954,52955,52956,52957,52958,52959,52960,52961,52962,52963,52966,52967,52969,52970,52973,52974,52975,52976,52977,52978,52979,52982,52986,52987,52988,52989,52990,52991,44032,44033,44036,44039,44040,44041,44042,44048,44049,44050,44051,44052,44053,44054,44055,44057,44058,44059,44060,44061,44064,44068,44076,44077,44079,44080,44081,44088,44089,44092,44096,44107,44109,44116,44120,44124,44144,44145,44148,44151,44152,44154,44160,44161,44163,44164,44165,44166,44169,44170,44171,44172,44176,44180,44188,44189,44191,44192,44193,44200,44201,44202,44204,44207,44208,44216,44217,44219,44220,44221,44225,44228,44232,44236,44245,44247,44256,44257,44260,44263,44264,44266,44268,44271,44272,44273,44275,44277,44278,44284,44285,44288,44292,44294,52994,52995,52997,52998,52999,53001,53002,53003,53004,53005,53006,53007,53010,53012,53014,53015,53016,53017,53018,53019,53021,53022,53023,53025,53026,53027,null,null,null,null,null,null,53029,53030,53031,53032,53033,53034,53035,53038,53042,53043,53044,53045,53046,53047,53049,53050,53051,53052,53053,53054,53055,53056,53057,53058,53059,53060,null,null,null,null,null,null,53061,53062,53063,53064,53065,53066,53067,53068,53069,53070,53071,53072,53073,53074,53075,53078,53079,53081,53082,53083,53085,53086,53087,53088,53089,53090,53091,53094,53096,53098,53099,53100,44300,44301,44303,44305,44312,44316,44320,44329,44332,44333,44340,44341,44344,44348,44356,44357,44359,44361,44368,44372,44376,44385,44387,44396,44397,44400,44403,44404,44405,44406,44411,44412,44413,44415,44417,44418,44424,44425,44428,44432,44444,44445,44452,44471,44480,44481,44484,44488,44496,44497,44499,44508,44512,44516,44536,44537,44540,44543,44544,44545,44552,44553,44555,44557,44564,44592,44593,44596,44599,44600,44602,44608,44609,44611,44613,44614,44618,44620,44621,44622,44624,44628,44630,44636,44637,44639,44640,44641,44645,44648,44649,44652,44656,44664,53101,53102,53103,53106,53107,53109,53110,53111,53113,53114,53115,53116,53117,53118,53119,53121,53122,53123,53124,53126,53127,53128,53129,53130,53131,53133,null,null,null,null,null,null,53134,53135,53136,53137,53138,53139,53140,53141,53142,53143,53144,53145,53146,53147,53148,53149,53150,53151,53152,53154,53155,53156,53157,53158,53159,53161,null,null,null,null,null,null,53162,53163,53164,53165,53166,53167,53169,53170,53171,53172,53173,53174,53175,53176,53177,53178,53179,53180,53181,53182,53183,53184,53185,53186,53187,53189,53190,53191,53192,53193,53194,53195,44665,44667,44668,44669,44676,44677,44684,44732,44733,44734,44736,44740,44748,44749,44751,44752,44753,44760,44761,44764,44776,44779,44781,44788,44792,44796,44807,44808,44813,44816,44844,44845,44848,44850,44852,44860,44861,44863,44865,44866,44867,44872,44873,44880,44892,44893,44900,44901,44921,44928,44932,44936,44944,44945,44949,44956,44984,44985,44988,44992,44999,45000,45001,45003,45005,45006,45012,45020,45032,45033,45040,45041,45044,45048,45056,45057,45060,45068,45072,45076,45084,45085,45096,45124,45125,45128,45130,45132,45134,45139,45140,45141,45143,45145,53196,53197,53198,53199,53200,53201,53202,53203,53204,53205,53206,53207,53208,53209,53210,53211,53212,53213,53214,53215,53218,53219,53221,53222,53223,53225,null,null,null,null,null,null,53226,53227,53228,53229,53230,53231,53234,53236,53238,53239,53240,53241,53242,53243,53245,53246,53247,53249,53250,53251,53253,53254,53255,53256,53257,53258,null,null,null,null,null,null,53259,53260,53261,53262,53263,53264,53266,53267,53268,53269,53270,53271,53273,53274,53275,53276,53277,53278,53279,53280,53281,53282,53283,53284,53285,53286,53287,53288,53289,53290,53291,53292,45149,45180,45181,45184,45188,45196,45197,45199,45201,45208,45209,45210,45212,45215,45216,45217,45218,45224,45225,45227,45228,45229,45230,45231,45233,45235,45236,45237,45240,45244,45252,45253,45255,45256,45257,45264,45265,45268,45272,45280,45285,45320,45321,45323,45324,45328,45330,45331,45336,45337,45339,45340,45341,45347,45348,45349,45352,45356,45364,45365,45367,45368,45369,45376,45377,45380,45384,45392,45393,45396,45397,45400,45404,45408,45432,45433,45436,45440,45442,45448,45449,45451,45453,45458,45459,45460,45464,45468,45480,45516,45520,45524,45532,45533,53294,53295,53296,53297,53298,53299,53302,53303,53305,53306,53307,53309,53310,53311,53312,53313,53314,53315,53318,53320,53322,53323,53324,53325,53326,53327,null,null,null,null,null,null,53329,53330,53331,53333,53334,53335,53337,53338,53339,53340,53341,53342,53343,53345,53346,53347,53348,53349,53350,53351,53352,53353,53354,53355,53358,53359,null,null,null,null,null,null,53361,53362,53363,53365,53366,53367,53368,53369,53370,53371,53374,53375,53376,53378,53379,53380,53381,53382,53383,53384,53385,53386,53387,53388,53389,53390,53391,53392,53393,53394,53395,53396,45535,45544,45545,45548,45552,45561,45563,45565,45572,45573,45576,45579,45580,45588,45589,45591,45593,45600,45620,45628,45656,45660,45664,45672,45673,45684,45685,45692,45700,45701,45705,45712,45713,45716,45720,45721,45722,45728,45729,45731,45733,45734,45738,45740,45744,45748,45768,45769,45772,45776,45778,45784,45785,45787,45789,45794,45796,45797,45798,45800,45803,45804,45805,45806,45807,45811,45812,45813,45815,45816,45817,45818,45819,45823,45824,45825,45828,45832,45840,45841,45843,45844,45845,45852,45908,45909,45910,45912,45915,45916,45918,45919,45924,45925,53397,53398,53399,53400,53401,53402,53403,53404,53405,53406,53407,53408,53409,53410,53411,53414,53415,53417,53418,53419,53421,53422,53423,53424,53425,53426,null,null,null,null,null,null,53427,53430,53432,53434,53435,53436,53437,53438,53439,53442,53443,53445,53446,53447,53450,53451,53452,53453,53454,53455,53458,53462,53463,53464,53465,53466,null,null,null,null,null,null,53467,53470,53471,53473,53474,53475,53477,53478,53479,53480,53481,53482,53483,53486,53490,53491,53492,53493,53494,53495,53497,53498,53499,53500,53501,53502,53503,53504,53505,53506,53507,53508,45927,45929,45931,45934,45936,45937,45940,45944,45952,45953,45955,45956,45957,45964,45968,45972,45984,45985,45992,45996,46020,46021,46024,46027,46028,46030,46032,46036,46037,46039,46041,46043,46045,46048,46052,46056,46076,46096,46104,46108,46112,46120,46121,46123,46132,46160,46161,46164,46168,46176,46177,46179,46181,46188,46208,46216,46237,46244,46248,46252,46261,46263,46265,46272,46276,46280,46288,46293,46300,46301,46304,46307,46308,46310,46316,46317,46319,46321,46328,46356,46357,46360,46363,46364,46372,46373,46375,46376,46377,46378,46384,46385,46388,46392,53509,53510,53511,53512,53513,53514,53515,53516,53518,53519,53520,53521,53522,53523,53524,53525,53526,53527,53528,53529,53530,53531,53532,53533,53534,53535,null,null,null,null,null,null,53536,53537,53538,53539,53540,53541,53542,53543,53544,53545,53546,53547,53548,53549,53550,53551,53554,53555,53557,53558,53559,53561,53563,53564,53565,53566,null,null,null,null,null,null,53567,53570,53574,53575,53576,53577,53578,53579,53582,53583,53585,53586,53587,53589,53590,53591,53592,53593,53594,53595,53598,53600,53602,53603,53604,53605,53606,53607,53609,53610,53611,53613,46400,46401,46403,46404,46405,46411,46412,46413,46416,46420,46428,46429,46431,46432,46433,46496,46497,46500,46504,46506,46507,46512,46513,46515,46516,46517,46523,46524,46525,46528,46532,46540,46541,46543,46544,46545,46552,46572,46608,46609,46612,46616,46629,46636,46644,46664,46692,46696,46748,46749,46752,46756,46763,46764,46769,46804,46832,46836,46840,46848,46849,46853,46888,46889,46892,46895,46896,46904,46905,46907,46916,46920,46924,46932,46933,46944,46948,46952,46960,46961,46963,46965,46972,46973,46976,46980,46988,46989,46991,46992,46993,46994,46998,46999,53614,53615,53616,53617,53618,53619,53620,53621,53622,53623,53624,53625,53626,53627,53629,53630,53631,53632,53633,53634,53635,53637,53638,53639,53641,53642,null,null,null,null,null,null,53643,53644,53645,53646,53647,53648,53649,53650,53651,53652,53653,53654,53655,53656,53657,53658,53659,53660,53661,53662,53663,53666,53667,53669,53670,53671,null,null,null,null,null,null,53673,53674,53675,53676,53677,53678,53679,53682,53684,53686,53687,53688,53689,53691,53693,53694,53695,53697,53698,53699,53700,53701,53702,53703,53704,53705,53706,53707,53708,53709,53710,53711,47000,47001,47004,47008,47016,47017,47019,47020,47021,47028,47029,47032,47047,47049,47084,47085,47088,47092,47100,47101,47103,47104,47105,47111,47112,47113,47116,47120,47128,47129,47131,47133,47140,47141,47144,47148,47156,47157,47159,47160,47161,47168,47172,47185,47187,47196,47197,47200,47204,47212,47213,47215,47217,47224,47228,47245,47272,47280,47284,47288,47296,47297,47299,47301,47308,47312,47316,47325,47327,47329,47336,47337,47340,47344,47352,47353,47355,47357,47364,47384,47392,47420,47421,47424,47428,47436,47439,47441,47448,47449,47452,47456,47464,47465,53712,53713,53714,53715,53716,53717,53718,53719,53721,53722,53723,53724,53725,53726,53727,53728,53729,53730,53731,53732,53733,53734,53735,53736,53737,53738,null,null,null,null,null,null,53739,53740,53741,53742,53743,53744,53745,53746,53747,53749,53750,53751,53753,53754,53755,53756,53757,53758,53759,53760,53761,53762,53763,53764,53765,53766,null,null,null,null,null,null,53768,53770,53771,53772,53773,53774,53775,53777,53778,53779,53780,53781,53782,53783,53784,53785,53786,53787,53788,53789,53790,53791,53792,53793,53794,53795,53796,53797,53798,53799,53800,53801,47467,47469,47476,47477,47480,47484,47492,47493,47495,47497,47498,47501,47502,47532,47533,47536,47540,47548,47549,47551,47553,47560,47561,47564,47566,47567,47568,47569,47570,47576,47577,47579,47581,47582,47585,47587,47588,47589,47592,47596,47604,47605,47607,47608,47609,47610,47616,47617,47624,47637,47672,47673,47676,47680,47682,47688,47689,47691,47693,47694,47699,47700,47701,47704,47708,47716,47717,47719,47720,47721,47728,47729,47732,47736,47747,47748,47749,47751,47756,47784,47785,47787,47788,47792,47794,47800,47801,47803,47805,47812,47816,47832,47833,47868,53802,53803,53806,53807,53809,53810,53811,53813,53814,53815,53816,53817,53818,53819,53822,53824,53826,53827,53828,53829,53830,53831,53833,53834,53835,53836,null,null,null,null,null,null,53837,53838,53839,53840,53841,53842,53843,53844,53845,53846,53847,53848,53849,53850,53851,53853,53854,53855,53856,53857,53858,53859,53861,53862,53863,53864,null,null,null,null,null,null,53865,53866,53867,53868,53869,53870,53871,53872,53873,53874,53875,53876,53877,53878,53879,53880,53881,53882,53883,53884,53885,53886,53887,53890,53891,53893,53894,53895,53897,53898,53899,53900,47872,47876,47885,47887,47889,47896,47900,47904,47913,47915,47924,47925,47926,47928,47931,47932,47933,47934,47940,47941,47943,47945,47949,47951,47952,47956,47960,47969,47971,47980,48008,48012,48016,48036,48040,48044,48052,48055,48064,48068,48072,48080,48083,48120,48121,48124,48127,48128,48130,48136,48137,48139,48140,48141,48143,48145,48148,48149,48150,48151,48152,48155,48156,48157,48158,48159,48164,48165,48167,48169,48173,48176,48177,48180,48184,48192,48193,48195,48196,48197,48201,48204,48205,48208,48221,48260,48261,48264,48267,48268,48270,48276,48277,48279,53901,53902,53903,53906,53907,53908,53910,53911,53912,53913,53914,53915,53917,53918,53919,53921,53922,53923,53925,53926,53927,53928,53929,53930,53931,53933,null,null,null,null,null,null,53934,53935,53936,53938,53939,53940,53941,53942,53943,53946,53947,53949,53950,53953,53955,53956,53957,53958,53959,53962,53964,53965,53966,53967,53968,53969,null,null,null,null,null,null,53970,53971,53973,53974,53975,53977,53978,53979,53981,53982,53983,53984,53985,53986,53987,53990,53991,53992,53993,53994,53995,53996,53997,53998,53999,54002,54003,54005,54006,54007,54009,54010,48281,48282,48288,48289,48292,48295,48296,48304,48305,48307,48308,48309,48316,48317,48320,48324,48333,48335,48336,48337,48341,48344,48348,48372,48373,48374,48376,48380,48388,48389,48391,48393,48400,48404,48420,48428,48448,48456,48457,48460,48464,48472,48473,48484,48488,48512,48513,48516,48519,48520,48521,48522,48528,48529,48531,48533,48537,48538,48540,48548,48560,48568,48596,48597,48600,48604,48617,48624,48628,48632,48640,48643,48645,48652,48653,48656,48660,48668,48669,48671,48708,48709,48712,48716,48718,48724,48725,48727,48729,48730,48731,48736,48737,48740,54011,54012,54013,54014,54015,54018,54020,54022,54023,54024,54025,54026,54027,54031,54033,54034,54035,54037,54039,54040,54041,54042,54043,54046,54050,54051,null,null,null,null,null,null,54052,54054,54055,54058,54059,54061,54062,54063,54065,54066,54067,54068,54069,54070,54071,54074,54078,54079,54080,54081,54082,54083,54086,54087,54088,54089,null,null,null,null,null,null,54090,54091,54092,54093,54094,54095,54096,54097,54098,54099,54100,54101,54102,54103,54104,54105,54106,54107,54108,54109,54110,54111,54112,54113,54114,54115,54116,54117,54118,54119,54120,54121,48744,48746,48752,48753,48755,48756,48757,48763,48764,48765,48768,48772,48780,48781,48783,48784,48785,48792,48793,48808,48848,48849,48852,48855,48856,48864,48867,48868,48869,48876,48897,48904,48905,48920,48921,48923,48924,48925,48960,48961,48964,48968,48976,48977,48981,49044,49072,49093,49100,49101,49104,49108,49116,49119,49121,49212,49233,49240,49244,49248,49256,49257,49296,49297,49300,49304,49312,49313,49315,49317,49324,49325,49327,49328,49331,49332,49333,49334,49340,49341,49343,49344,49345,49349,49352,49353,49356,49360,49368,49369,49371,49372,49373,49380,54122,54123,54124,54125,54126,54127,54128,54129,54130,54131,54132,54133,54134,54135,54136,54137,54138,54139,54142,54143,54145,54146,54147,54149,54150,54151,null,null,null,null,null,null,54152,54153,54154,54155,54158,54162,54163,54164,54165,54166,54167,54170,54171,54173,54174,54175,54177,54178,54179,54180,54181,54182,54183,54186,54188,54190,null,null,null,null,null,null,54191,54192,54193,54194,54195,54197,54198,54199,54201,54202,54203,54205,54206,54207,54208,54209,54210,54211,54214,54215,54218,54219,54220,54221,54222,54223,54225,54226,54227,54228,54229,54230,49381,49384,49388,49396,49397,49399,49401,49408,49412,49416,49424,49429,49436,49437,49438,49439,49440,49443,49444,49446,49447,49452,49453,49455,49456,49457,49462,49464,49465,49468,49472,49480,49481,49483,49484,49485,49492,49493,49496,49500,49508,49509,49511,49512,49513,49520,49524,49528,49541,49548,49549,49550,49552,49556,49558,49564,49565,49567,49569,49573,49576,49577,49580,49584,49597,49604,49608,49612,49620,49623,49624,49632,49636,49640,49648,49649,49651,49660,49661,49664,49668,49676,49677,49679,49681,49688,49689,49692,49695,49696,49704,49705,49707,49709,54231,54233,54234,54235,54236,54237,54238,54239,54240,54242,54244,54245,54246,54247,54248,54249,54250,54251,54254,54255,54257,54258,54259,54261,54262,54263,null,null,null,null,null,null,54264,54265,54266,54267,54270,54272,54274,54275,54276,54277,54278,54279,54281,54282,54283,54284,54285,54286,54287,54288,54289,54290,54291,54292,54293,54294,null,null,null,null,null,null,54295,54296,54297,54298,54299,54300,54302,54303,54304,54305,54306,54307,54308,54309,54310,54311,54312,54313,54314,54315,54316,54317,54318,54319,54320,54321,54322,54323,54324,54325,54326,54327,49711,49713,49714,49716,49736,49744,49745,49748,49752,49760,49765,49772,49773,49776,49780,49788,49789,49791,49793,49800,49801,49808,49816,49819,49821,49828,49829,49832,49836,49837,49844,49845,49847,49849,49884,49885,49888,49891,49892,49899,49900,49901,49903,49905,49910,49912,49913,49915,49916,49920,49928,49929,49932,49933,49939,49940,49941,49944,49948,49956,49957,49960,49961,49989,50024,50025,50028,50032,50034,50040,50041,50044,50045,50052,50056,50060,50112,50136,50137,50140,50143,50144,50146,50152,50153,50157,50164,50165,50168,50184,50192,50212,50220,50224,54328,54329,54330,54331,54332,54333,54334,54335,54337,54338,54339,54341,54342,54343,54344,54345,54346,54347,54348,54349,54350,54351,54352,54353,54354,54355,null,null,null,null,null,null,54356,54357,54358,54359,54360,54361,54362,54363,54365,54366,54367,54369,54370,54371,54373,54374,54375,54376,54377,54378,54379,54380,54382,54384,54385,54386,null,null,null,null,null,null,54387,54388,54389,54390,54391,54394,54395,54397,54398,54401,54403,54404,54405,54406,54407,54410,54412,54414,54415,54416,54417,54418,54419,54421,54422,54423,54424,54425,54426,54427,54428,54429,50228,50236,50237,50248,50276,50277,50280,50284,50292,50293,50297,50304,50324,50332,50360,50364,50409,50416,50417,50420,50424,50426,50431,50432,50433,50444,50448,50452,50460,50472,50473,50476,50480,50488,50489,50491,50493,50500,50501,50504,50505,50506,50508,50509,50510,50515,50516,50517,50519,50520,50521,50525,50526,50528,50529,50532,50536,50544,50545,50547,50548,50549,50556,50557,50560,50564,50567,50572,50573,50575,50577,50581,50583,50584,50588,50592,50601,50612,50613,50616,50617,50619,50620,50621,50622,50628,50629,50630,50631,50632,50633,50634,50636,50638,54430,54431,54432,54433,54434,54435,54436,54437,54438,54439,54440,54442,54443,54444,54445,54446,54447,54448,54449,54450,54451,54452,54453,54454,54455,54456,null,null,null,null,null,null,54457,54458,54459,54460,54461,54462,54463,54464,54465,54466,54467,54468,54469,54470,54471,54472,54473,54474,54475,54477,54478,54479,54481,54482,54483,54485,null,null,null,null,null,null,54486,54487,54488,54489,54490,54491,54493,54494,54496,54497,54498,54499,54500,54501,54502,54503,54505,54506,54507,54509,54510,54511,54513,54514,54515,54516,54517,54518,54519,54521,54522,54524,50640,50641,50644,50648,50656,50657,50659,50661,50668,50669,50670,50672,50676,50678,50679,50684,50685,50686,50687,50688,50689,50693,50694,50695,50696,50700,50704,50712,50713,50715,50716,50724,50725,50728,50732,50733,50734,50736,50739,50740,50741,50743,50745,50747,50752,50753,50756,50760,50768,50769,50771,50772,50773,50780,50781,50784,50796,50799,50801,50808,50809,50812,50816,50824,50825,50827,50829,50836,50837,50840,50844,50852,50853,50855,50857,50864,50865,50868,50872,50873,50874,50880,50881,50883,50885,50892,50893,50896,50900,50908,50909,50912,50913,50920,54526,54527,54528,54529,54530,54531,54533,54534,54535,54537,54538,54539,54541,54542,54543,54544,54545,54546,54547,54550,54552,54553,54554,54555,54556,54557,null,null,null,null,null,null,54558,54559,54560,54561,54562,54563,54564,54565,54566,54567,54568,54569,54570,54571,54572,54573,54574,54575,54576,54577,54578,54579,54580,54581,54582,54583,null,null,null,null,null,null,54584,54585,54586,54587,54590,54591,54593,54594,54595,54597,54598,54599,54600,54601,54602,54603,54606,54608,54610,54611,54612,54613,54614,54615,54618,54619,54621,54622,54623,54625,54626,54627,50921,50924,50928,50936,50937,50941,50948,50949,50952,50956,50964,50965,50967,50969,50976,50977,50980,50984,50992,50993,50995,50997,50999,51004,51005,51008,51012,51018,51020,51021,51023,51025,51026,51027,51028,51029,51030,51031,51032,51036,51040,51048,51051,51060,51061,51064,51068,51069,51070,51075,51076,51077,51079,51080,51081,51082,51086,51088,51089,51092,51094,51095,51096,51098,51104,51105,51107,51108,51109,51110,51116,51117,51120,51124,51132,51133,51135,51136,51137,51144,51145,51148,51150,51152,51160,51165,51172,51176,51180,51200,51201,51204,51208,51210,54628,54630,54631,54634,54636,54638,54639,54640,54641,54642,54643,54646,54647,54649,54650,54651,54653,54654,54655,54656,54657,54658,54659,54662,54666,54667,null,null,null,null,null,null,54668,54669,54670,54671,54673,54674,54675,54676,54677,54678,54679,54680,54681,54682,54683,54684,54685,54686,54687,54688,54689,54690,54691,54692,54694,54695,null,null,null,null,null,null,54696,54697,54698,54699,54700,54701,54702,54703,54704,54705,54706,54707,54708,54709,54710,54711,54712,54713,54714,54715,54716,54717,54718,54719,54720,54721,54722,54723,54724,54725,54726,54727,51216,51217,51219,51221,51222,51228,51229,51232,51236,51244,51245,51247,51249,51256,51260,51264,51272,51273,51276,51277,51284,51312,51313,51316,51320,51322,51328,51329,51331,51333,51334,51335,51339,51340,51341,51348,51357,51359,51361,51368,51388,51389,51396,51400,51404,51412,51413,51415,51417,51424,51425,51428,51445,51452,51453,51456,51460,51461,51462,51468,51469,51471,51473,51480,51500,51508,51536,51537,51540,51544,51552,51553,51555,51564,51568,51572,51580,51592,51593,51596,51600,51608,51609,51611,51613,51648,51649,51652,51655,51656,51658,51664,51665,51667,54730,54731,54733,54734,54735,54737,54739,54740,54741,54742,54743,54746,54748,54750,54751,54752,54753,54754,54755,54758,54759,54761,54762,54763,54765,54766,null,null,null,null,null,null,54767,54768,54769,54770,54771,54774,54776,54778,54779,54780,54781,54782,54783,54786,54787,54789,54790,54791,54793,54794,54795,54796,54797,54798,54799,54802,null,null,null,null,null,null,54806,54807,54808,54809,54810,54811,54813,54814,54815,54817,54818,54819,54821,54822,54823,54824,54825,54826,54827,54828,54830,54831,54832,54833,54834,54835,54836,54837,54838,54839,54842,54843,51669,51670,51673,51674,51676,51677,51680,51682,51684,51687,51692,51693,51695,51696,51697,51704,51705,51708,51712,51720,51721,51723,51724,51725,51732,51736,51753,51788,51789,51792,51796,51804,51805,51807,51808,51809,51816,51837,51844,51864,51900,51901,51904,51908,51916,51917,51919,51921,51923,51928,51929,51936,51948,51956,51976,51984,51988,51992,52000,52001,52033,52040,52041,52044,52048,52056,52057,52061,52068,52088,52089,52124,52152,52180,52196,52199,52201,52236,52237,52240,52244,52252,52253,52257,52258,52263,52264,52265,52268,52270,52272,52280,52281,52283,54845,54846,54847,54849,54850,54851,54852,54854,54855,54858,54860,54862,54863,54864,54866,54867,54870,54871,54873,54874,54875,54877,54878,54879,54880,54881,null,null,null,null,null,null,54882,54883,54884,54885,54886,54888,54890,54891,54892,54893,54894,54895,54898,54899,54901,54902,54903,54904,54905,54906,54907,54908,54909,54910,54911,54912,null,null,null,null,null,null,54913,54914,54916,54918,54919,54920,54921,54922,54923,54926,54927,54929,54930,54931,54933,54934,54935,54936,54937,54938,54939,54940,54942,54944,54946,54947,54948,54949,54950,54951,54953,54954,52284,52285,52286,52292,52293,52296,52300,52308,52309,52311,52312,52313,52320,52324,52326,52328,52336,52341,52376,52377,52380,52384,52392,52393,52395,52396,52397,52404,52405,52408,52412,52420,52421,52423,52425,52432,52436,52452,52460,52464,52481,52488,52489,52492,52496,52504,52505,52507,52509,52516,52520,52524,52537,52572,52576,52580,52588,52589,52591,52593,52600,52616,52628,52629,52632,52636,52644,52645,52647,52649,52656,52676,52684,52688,52712,52716,52720,52728,52729,52731,52733,52740,52744,52748,52756,52761,52768,52769,52772,52776,52784,52785,52787,52789,54955,54957,54958,54959,54961,54962,54963,54964,54965,54966,54967,54968,54970,54972,54973,54974,54975,54976,54977,54978,54979,54982,54983,54985,54986,54987,null,null,null,null,null,null,54989,54990,54991,54992,54994,54995,54997,54998,55000,55002,55003,55004,55005,55006,55007,55009,55010,55011,55013,55014,55015,55017,55018,55019,55020,55021,null,null,null,null,null,null,55022,55023,55025,55026,55027,55028,55030,55031,55032,55033,55034,55035,55038,55039,55041,55042,55043,55045,55046,55047,55048,55049,55050,55051,55052,55053,55054,55055,55056,55058,55059,55060,52824,52825,52828,52831,52832,52833,52840,52841,52843,52845,52852,52853,52856,52860,52868,52869,52871,52873,52880,52881,52884,52888,52896,52897,52899,52900,52901,52908,52909,52929,52964,52965,52968,52971,52972,52980,52981,52983,52984,52985,52992,52993,52996,53000,53008,53009,53011,53013,53020,53024,53028,53036,53037,53039,53040,53041,53048,53076,53077,53080,53084,53092,53093,53095,53097,53104,53105,53108,53112,53120,53125,53132,53153,53160,53168,53188,53216,53217,53220,53224,53232,53233,53235,53237,53244,53248,53252,53265,53272,53293,53300,53301,53304,53308,55061,55062,55063,55066,55067,55069,55070,55071,55073,55074,55075,55076,55077,55078,55079,55082,55084,55086,55087,55088,55089,55090,55091,55094,55095,55097,null,null,null,null,null,null,55098,55099,55101,55102,55103,55104,55105,55106,55107,55109,55110,55112,55114,55115,55116,55117,55118,55119,55122,55123,55125,55130,55131,55132,55133,55134,null,null,null,null,null,null,55135,55138,55140,55142,55143,55144,55146,55147,55149,55150,55151,55153,55154,55155,55157,55158,55159,55160,55161,55162,55163,55166,55167,55168,55170,55171,55172,55173,55174,55175,55178,55179,53316,53317,53319,53321,53328,53332,53336,53344,53356,53357,53360,53364,53372,53373,53377,53412,53413,53416,53420,53428,53429,53431,53433,53440,53441,53444,53448,53449,53456,53457,53459,53460,53461,53468,53469,53472,53476,53484,53485,53487,53488,53489,53496,53517,53552,53553,53556,53560,53562,53568,53569,53571,53572,53573,53580,53581,53584,53588,53596,53597,53599,53601,53608,53612,53628,53636,53640,53664,53665,53668,53672,53680,53681,53683,53685,53690,53692,53696,53720,53748,53752,53767,53769,53776,53804,53805,53808,53812,53820,53821,53823,53825,53832,53852,55181,55182,55183,55185,55186,55187,55188,55189,55190,55191,55194,55196,55198,55199,55200,55201,55202,55203,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,53860,53888,53889,53892,53896,53904,53905,53909,53916,53920,53924,53932,53937,53944,53945,53948,53951,53952,53954,53960,53961,53963,53972,53976,53980,53988,53989,54000,54001,54004,54008,54016,54017,54019,54021,54028,54029,54030,54032,54036,54038,54044,54045,54047,54048,54049,54053,54056,54057,54060,54064,54072,54073,54075,54076,54077,54084,54085,54140,54141,54144,54148,54156,54157,54159,54160,54161,54168,54169,54172,54176,54184,54185,54187,54189,54196,54200,54204,54212,54213,54216,54217,54224,54232,54241,54243,54252,54253,54256,54260,54268,54269,54271,54273,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,54280,54301,54336,54340,54364,54368,54372,54381,54383,54392,54393,54396,54399,54400,54402,54408,54409,54411,54413,54420,54441,54476,54480,54484,54492,54495,54504,54508,54512,54520,54523,54525,54532,54536,54540,54548,54549,54551,54588,54589,54592,54596,54604,54605,54607,54609,54616,54617,54620,54624,54629,54632,54633,54635,54637,54644,54645,54648,54652,54660,54661,54663,54664,54665,54672,54693,54728,54729,54732,54736,54738,54744,54745,54747,54749,54756,54757,54760,54764,54772,54773,54775,54777,54784,54785,54788,54792,54800,54801,54803,54804,54805,54812,54816,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,54820,54829,54840,54841,54844,54848,54853,54856,54857,54859,54861,54865,54868,54869,54872,54876,54887,54889,54896,54897,54900,54915,54917,54924,54925,54928,54932,54941,54943,54945,54952,54956,54960,54969,54971,54980,54981,54984,54988,54993,54996,54999,55001,55008,55012,55016,55024,55029,55036,55037,55040,55044,55057,55064,55065,55068,55072,55080,55081,55083,55085,55092,55093,55096,55100,55108,55111,55113,55120,55121,55124,55126,55127,55128,55129,55136,55137,55139,55141,55145,55148,55152,55156,55164,55165,55169,55176,55177,55180,55184,55192,55193,55195,55197,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,20285,20339,20551,20729,21152,21487,21621,21733,22025,23233,23478,26247,26550,26551,26607,27468,29634,30146,31292,33499,33540,34903,34952,35382,36040,36303,36603,36838,39381,21051,21364,21508,24682,24932,27580,29647,33050,35258,35282,38307,20355,21002,22718,22904,23014,24178,24185,25031,25536,26438,26604,26751,28567,30286,30475,30965,31240,31487,31777,32925,33390,33393,35563,38291,20075,21917,26359,28212,30883,31469,33883,35088,34638,38824,21208,22350,22570,23884,24863,25022,25121,25954,26577,27204,28187,29976,30131,30435,30640,32058,37039,37969,37970,40853,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,21283,23724,30002,32987,37440,38296,21083,22536,23004,23713,23831,24247,24378,24394,24951,27743,30074,30086,31968,32115,32177,32652,33108,33313,34193,35137,35611,37628,38477,40007,20171,20215,20491,20977,22607,24887,24894,24936,25913,27114,28433,30117,30342,30422,31623,33445,33995,63744,37799,38283,21888,23458,22353,63745,31923,32697,37301,20520,21435,23621,24040,25298,25454,25818,25831,28192,28844,31067,36317,36382,63746,36989,37445,37624,20094,20214,20581,24062,24314,24838,26967,33137,34388,36423,37749,39467,20062,20625,26480,26688,20745,21133,21138,27298,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,30652,37392,40660,21163,24623,36850,20552,25001,25581,25802,26684,27268,28608,33160,35233,38548,22533,29309,29356,29956,32121,32365,32937,35211,35700,36963,40273,25225,27770,28500,32080,32570,35363,20860,24906,31645,35609,37463,37772,20140,20435,20510,20670,20742,21185,21197,21375,22384,22659,24218,24465,24950,25004,25806,25964,26223,26299,26356,26775,28039,28805,28913,29855,29861,29898,30169,30828,30956,31455,31478,32069,32147,32789,32831,33051,33686,35686,36629,36885,37857,38915,38968,39514,39912,20418,21843,22586,22865,23395,23622,24760,25106,26690,26800,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,26856,28330,30028,30328,30926,31293,31995,32363,32380,35336,35489,35903,38542,40388,21476,21481,21578,21617,22266,22993,23396,23611,24235,25335,25911,25925,25970,26272,26543,27073,27837,30204,30352,30590,31295,32660,32771,32929,33167,33510,33533,33776,34241,34865,34996,35493,63747,36764,37678,38599,39015,39640,40723,21741,26011,26354,26767,31296,35895,40288,22256,22372,23825,26118,26801,26829,28414,29736,34974,39908,27752,63748,39592,20379,20844,20849,21151,23380,24037,24656,24685,25329,25511,25915,29657,31354,34467,36002,38799,20018,23521,25096,26524,29916,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,31185,33747,35463,35506,36328,36942,37707,38982,24275,27112,34303,37101,63749,20896,23448,23532,24931,26874,27454,28748,29743,29912,31649,32592,33733,35264,36011,38364,39208,21038,24669,25324,36866,20362,20809,21281,22745,24291,26336,27960,28826,29378,29654,31568,33009,37979,21350,25499,32619,20054,20608,22602,22750,24618,24871,25296,27088,39745,23439,32024,32945,36703,20132,20689,21676,21932,23308,23968,24039,25898,25934,26657,27211,29409,30350,30703,32094,32761,33184,34126,34527,36611,36686,37066,39171,39509,39851,19992,20037,20061,20167,20465,20855,21246,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,21312,21475,21477,21646,22036,22389,22434,23495,23943,24272,25084,25304,25937,26552,26601,27083,27472,27590,27628,27714,28317,28792,29399,29590,29699,30655,30697,31350,32127,32777,33276,33285,33290,33503,34914,35635,36092,36544,36881,37041,37476,37558,39378,39493,40169,40407,40860,22283,23616,33738,38816,38827,40628,21531,31384,32676,35033,36557,37089,22528,23624,25496,31391,23470,24339,31353,31406,33422,36524,20518,21048,21240,21367,22280,25331,25458,27402,28099,30519,21413,29527,34152,36470,38357,26426,27331,28528,35437,36556,39243,63750,26231,27512,36020,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,39740,63751,21483,22317,22862,25542,27131,29674,30789,31418,31429,31998,33909,35215,36211,36917,38312,21243,22343,30023,31584,33740,37406,63752,27224,20811,21067,21127,25119,26840,26997,38553,20677,21156,21220,25027,26020,26681,27135,29822,31563,33465,33771,35250,35641,36817,39241,63753,20170,22935,25810,26129,27278,29748,31105,31165,33449,34942,34943,35167,63754,37670,20235,21450,24613,25201,27762,32026,32102,20120,20834,30684,32943,20225,20238,20854,20864,21980,22120,22331,22522,22524,22804,22855,22931,23492,23696,23822,24049,24190,24524,25216,26071,26083,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,26398,26399,26462,26827,26820,27231,27450,27683,27773,27778,28103,29592,29734,29738,29826,29859,30072,30079,30849,30959,31041,31047,31048,31098,31637,32000,32186,32648,32774,32813,32908,35352,35663,35912,36215,37665,37668,39138,39249,39438,39439,39525,40594,32202,20342,21513,25326,26708,37329,21931,20794,63755,63756,23068,25062,63757,25295,25343,63758,63759,63760,63761,63762,63763,37027,63764,63765,63766,63767,63768,35582,63769,63770,63771,63772,26262,63773,29014,63774,63775,38627,63776,25423,25466,21335,63777,26511,26976,28275,63778,30007,63779,63780,63781,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,32013,63782,63783,34930,22218,23064,63784,63785,63786,63787,63788,20035,63789,20839,22856,26608,32784,63790,22899,24180,25754,31178,24565,24684,25288,25467,23527,23511,21162,63791,22900,24361,24594,63792,63793,63794,29785,63795,63796,63797,63798,63799,63800,39377,63801,63802,63803,63804,63805,63806,63807,63808,63809,63810,63811,28611,63812,63813,33215,36786,24817,63814,63815,33126,63816,63817,23615,63818,63819,63820,63821,63822,63823,63824,63825,23273,35365,26491,32016,63826,63827,63828,63829,63830,63831,33021,63832,63833,23612,27877,21311,28346,22810,33590,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,20025,20150,20294,21934,22296,22727,24406,26039,26086,27264,27573,28237,30701,31471,31774,32222,34507,34962,37170,37723,25787,28606,29562,30136,36948,21846,22349,25018,25812,26311,28129,28251,28525,28601,30192,32835,33213,34113,35203,35527,35674,37663,27795,30035,31572,36367,36957,21776,22530,22616,24162,25095,25758,26848,30070,31958,34739,40680,20195,22408,22382,22823,23565,23729,24118,24453,25140,25825,29619,33274,34955,36024,38538,40667,23429,24503,24755,20498,20992,21040,22294,22581,22615,23566,23648,23798,23947,24230,24466,24764,25361,25481,25623,26691,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,26873,27330,28120,28193,28372,28644,29182,30428,30585,31153,31291,33796,35241,36077,36339,36424,36867,36884,36947,37117,37709,38518,38876,27602,28678,29272,29346,29544,30563,31167,31716,32411,35712,22697,24775,25958,26109,26302,27788,28958,29129,35930,38931,20077,31361,20189,20908,20941,21205,21516,24999,26481,26704,26847,27934,28540,30140,30643,31461,33012,33891,37509,20828,26007,26460,26515,30168,31431,33651,63834,35910,36887,38957,23663,33216,33434,36929,36975,37389,24471,23965,27225,29128,30331,31561,34276,35588,37159,39472,21895,25078,63835,30313,32645,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,34367,34746,35064,37007,63836,27931,28889,29662,32097,33853,63837,37226,39409,63838,20098,21365,27396,27410,28734,29211,34349,40478,21068,36771,23888,25829,25900,27414,28651,31811,32412,34253,35172,35261,25289,33240,34847,24266,26391,28010,29436,29701,29807,34690,37086,20358,23821,24480,33802,20919,25504,30053,20142,20486,20841,20937,26753,27153,31918,31921,31975,33391,35538,36635,37327,20406,20791,21237,21570,24300,24942,25150,26053,27354,28670,31018,34268,34851,38317,39522,39530,40599,40654,21147,26310,27511,28701,31019,36706,38722,24976,25088,25891,28451,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,29001,29833,32244,32879,34030,36646,36899,37706,20925,21015,21155,27916,28872,35010,24265,25986,27566,28610,31806,29557,20196,20278,22265,63839,23738,23994,24604,29618,31533,32666,32718,32838,36894,37428,38646,38728,38936,40801,20363,28583,31150,37300,38583,21214,63840,25736,25796,27347,28510,28696,29200,30439,32769,34310,34396,36335,36613,38706,39791,40442,40565,30860,31103,32160,33737,37636,40575,40595,35542,22751,24324,26407,28711,29903,31840,32894,20769,28712,29282,30922,36034,36058,36084,38647,20102,20698,23534,24278,26009,29134,30274,30637,32842,34044,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,36988,39719,40845,22744,23105,23650,27155,28122,28431,30267,32047,32311,34078,35128,37860,38475,21129,26066,26611,27060,27969,28316,28687,29705,29792,30041,30244,30827,35628,39006,20845,25134,38520,20374,20523,23833,28138,32184,36650,24459,24900,26647,63841,38534,21202,32907,20956,20940,26974,31260,32190,33777,38517,20442,21033,21400,21519,21774,23653,24743,26446,26792,28012,29313,29432,29702,29827,63842,30178,31852,32633,32696,33673,35023,35041,37324,37328,38626,39881,21533,28542,29136,29848,34298,36522,38563,40023,40607,26519,28107,29747,33256,38678,30764,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,31435,31520,31890,25705,29802,30194,30908,30952,39340,39764,40635,23518,24149,28448,33180,33707,37000,19975,21325,23081,24018,24398,24930,25405,26217,26364,28415,28459,28771,30622,33836,34067,34875,36627,39237,39995,21788,25273,26411,27819,33545,35178,38778,20129,22916,24536,24537,26395,32178,32596,33426,33579,33725,36638,37017,22475,22969,23186,23504,26151,26522,26757,27599,29028,32629,36023,36067,36993,39749,33032,35978,38476,39488,40613,23391,27667,29467,30450,30431,33804,20906,35219,20813,20885,21193,26825,27796,30468,30496,32191,32236,38754,40629,28357,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,34065,20901,21517,21629,26126,26269,26919,28319,30399,30609,33559,33986,34719,37225,37528,40180,34946,20398,20882,21215,22982,24125,24917,25720,25721,26286,26576,27169,27597,27611,29279,29281,29761,30520,30683,32791,33468,33541,35584,35624,35980,26408,27792,29287,30446,30566,31302,40361,27519,27794,22818,26406,33945,21359,22675,22937,24287,25551,26164,26483,28218,29483,31447,33495,37672,21209,24043,25006,25035,25098,25287,25771,26080,26969,27494,27595,28961,29687,30045,32326,33310,33538,34154,35491,36031,38695,40289,22696,40664,20497,21006,21563,21839,25991,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,27766,32010,32011,32862,34442,38272,38639,21247,27797,29289,21619,23194,23614,23883,24396,24494,26410,26806,26979,28220,28228,30473,31859,32654,34183,35598,36855,38753,40692,23735,24758,24845,25003,25935,26107,26108,27665,27887,29599,29641,32225,38292,23494,34588,35600,21085,21338,25293,25615,25778,26420,27192,27850,29632,29854,31636,31893,32283,33162,33334,34180,36843,38649,39361,20276,21322,21453,21467,25292,25644,25856,26001,27075,27886,28504,29677,30036,30242,30436,30460,30928,30971,31020,32070,33324,34784,36820,38930,39151,21187,25300,25765,28196,28497,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,30332,36299,37297,37474,39662,39747,20515,20621,22346,22952,23592,24135,24439,25151,25918,26041,26049,26121,26507,27036,28354,30917,32033,32938,33152,33323,33459,33953,34444,35370,35607,37030,38450,40848,20493,20467,63843,22521,24472,25308,25490,26479,28227,28953,30403,32972,32986,35060,35061,35097,36064,36649,37197,38506,20271,20336,24091,26575,26658,30333,30334,39748,24161,27146,29033,29140,30058,63844,32321,34115,34281,39132,20240,31567,32624,38309,20961,24070,26805,27710,27726,27867,29359,31684,33539,27861,29754,20731,21128,22721,25816,27287,29863,30294,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,30887,34327,38370,38713,63845,21342,24321,35722,36776,36783,37002,21029,30629,40009,40712,19993,20482,20853,23643,24183,26142,26170,26564,26821,28851,29953,30149,31177,31453,36647,39200,39432,20445,22561,22577,23542,26222,27493,27921,28282,28541,29668,29995,33769,35036,35091,35676,36628,20239,20693,21264,21340,23443,24489,26381,31119,33145,33583,34068,35079,35206,36665,36667,39333,39954,26412,20086,20472,22857,23553,23791,23792,25447,26834,28925,29090,29739,32299,34028,34562,36898,37586,40179,19981,20184,20463,20613,21078,21103,21542,21648,22496,22827,23142,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,23386,23413,23500,24220,63846,25206,25975,26023,28014,28325,29238,31526,31807,32566,33104,33105,33178,33344,33433,33705,35331,36000,36070,36091,36212,36282,37096,37340,38428,38468,39385,40167,21271,20998,21545,22132,22707,22868,22894,24575,24996,25198,26128,27774,28954,30406,31881,31966,32027,33452,36033,38640,63847,20315,24343,24447,25282,23849,26379,26842,30844,32323,40300,19989,20633,21269,21290,21329,22915,23138,24199,24754,24970,25161,25209,26000,26503,27047,27604,27606,27607,27608,27832,63848,29749,30202,30738,30865,31189,31192,31875,32203,32737,32933,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,33086,33218,33778,34586,35048,35513,35692,36027,37145,38750,39131,40763,22188,23338,24428,25996,27315,27567,27996,28657,28693,29277,29613,36007,36051,38971,24977,27703,32856,39425,20045,20107,20123,20181,20282,20284,20351,20447,20735,21490,21496,21766,21987,22235,22763,22882,23057,23531,23546,23556,24051,24107,24473,24605,25448,26012,26031,26614,26619,26797,27515,27801,27863,28195,28681,29509,30722,31038,31040,31072,31169,31721,32023,32114,32902,33293,33678,34001,34503,35039,35408,35422,35613,36060,36198,36781,37034,39164,39391,40605,21066,63849,26388,63850,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,20632,21034,23665,25955,27733,29642,29987,30109,31639,33948,37240,38704,20087,25746,27578,29022,34217,19977,63851,26441,26862,28183,33439,34072,34923,25591,28545,37394,39087,19978,20663,20687,20767,21830,21930,22039,23360,23577,23776,24120,24202,24224,24258,24819,26705,27233,28248,29245,29248,29376,30456,31077,31665,32724,35059,35316,35443,35937,36062,38684,22622,29885,36093,21959,63852,31329,32034,33394,29298,29983,29989,63853,31513,22661,22779,23996,24207,24246,24464,24661,25234,25471,25933,26257,26329,26360,26646,26866,29312,29790,31598,32110,32214,32626,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,32997,33298,34223,35199,35475,36893,37604,40653,40736,22805,22893,24109,24796,26132,26227,26512,27728,28101,28511,30707,30889,33990,37323,37675,20185,20682,20808,21892,23307,23459,25159,25982,26059,28210,29053,29697,29764,29831,29887,30316,31146,32218,32341,32680,33146,33203,33337,34330,34796,35445,36323,36984,37521,37925,39245,39854,21352,23633,26964,27844,27945,28203,33292,34203,35131,35373,35498,38634,40807,21089,26297,27570,32406,34814,36109,38275,38493,25885,28041,29166,63854,22478,22995,23468,24615,24826,25104,26143,26207,29481,29689,30427,30465,31596,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,32854,32882,33125,35488,37266,19990,21218,27506,27927,31237,31545,32048,63855,36016,21484,22063,22609,23477,23567,23569,24034,25152,25475,25620,26157,26803,27836,28040,28335,28703,28836,29138,29990,30095,30094,30233,31505,31712,31787,32032,32057,34092,34157,34311,35380,36877,36961,37045,37559,38902,39479,20439,23660,26463,28049,31903,32396,35606,36118,36895,23403,24061,25613,33984,36956,39137,29575,23435,24730,26494,28126,35359,35494,36865,38924,21047,63856,28753,30862,37782,34928,37335,20462,21463,22013,22234,22402,22781,23234,23432,23723,23744,24101,24833,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,25101,25163,25480,25628,25910,25976,27193,27530,27700,27929,28465,29159,29417,29560,29703,29874,30246,30561,31168,31319,31466,31929,32143,32172,32353,32670,33065,33585,33936,34010,34282,34966,35504,35728,36664,36930,36995,37228,37526,37561,38539,38567,38568,38614,38656,38920,39318,39635,39706,21460,22654,22809,23408,23487,28113,28506,29087,29729,29881,32901,33789,24033,24455,24490,24642,26092,26642,26991,27219,27529,27957,28147,29667,30462,30636,31565,32020,33059,33308,33600,34036,34147,35426,35524,37255,37662,38918,39348,25100,34899,36848,37477,23815,23847,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,23913,29791,33181,34664,28629,25342,32722,35126,35186,19998,20056,20711,21213,21319,25215,26119,32361,34821,38494,20365,21273,22070,22987,23204,23608,23630,23629,24066,24337,24643,26045,26159,26178,26558,26612,29468,30690,31034,32709,33940,33997,35222,35430,35433,35553,35925,35962,22516,23508,24335,24687,25325,26893,27542,28252,29060,31698,34645,35672,36606,39135,39166,20280,20353,20449,21627,23072,23480,24892,26032,26216,29180,30003,31070,32051,33102,33251,33688,34218,34254,34563,35338,36523,36763,63857,36805,22833,23460,23526,24713,23529,23563,24515,27777,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,63858,28145,28683,29978,33455,35574,20160,21313,63859,38617,27663,20126,20420,20818,21854,23077,23784,25105,29273,33469,33706,34558,34905,35357,38463,38597,39187,40201,40285,22538,23731,23997,24132,24801,24853,25569,27138,28197,37122,37716,38990,39952,40823,23433,23736,25353,26191,26696,30524,38593,38797,38996,39839,26017,35585,36555,38332,21813,23721,24022,24245,26263,30284,33780,38343,22739,25276,29390,40232,20208,22830,24591,26171,27523,31207,40230,21395,21696,22467,23830,24859,26326,28079,30861,33406,38552,38724,21380,25212,25494,28082,32266,33099,38989,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,27387,32588,40367,40474,20063,20539,20918,22812,24825,25590,26928,29242,32822,63860,37326,24369,63861,63862,32004,33509,33903,33979,34277,36493,63863,20335,63864,63865,22756,23363,24665,25562,25880,25965,26264,63866,26954,27171,27915,28673,29036,30162,30221,31155,31344,63867,32650,63868,35140,63869,35731,37312,38525,63870,39178,22276,24481,26044,28417,30208,31142,35486,39341,39770,40812,20740,25014,25233,27277,33222,20547,22576,24422,28937,35328,35578,23420,34326,20474,20796,22196,22852,25513,28153,23978,26989,20870,20104,20313,63871,63872,63873,22914,63874,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,63875,27487,27741,63876,29877,30998,63877,33287,33349,33593,36671,36701,63878,39192,63879,63880,63881,20134,63882,22495,24441,26131,63883,63884,30123,32377,35695,63885,36870,39515,22181,22567,23032,23071,23476,63886,24310,63887,63888,25424,25403,63889,26941,27783,27839,28046,28051,28149,28436,63890,28895,28982,29017,63891,29123,29141,63892,30799,30831,63893,31605,32227,63894,32303,63895,34893,36575,63896,63897,63898,37467,63899,40182,63900,63901,63902,24709,28037,63903,29105,63904,63905,38321,21421,63906,63907,63908,26579,63909,28814,28976,29744,33398,33490,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,63910,38331,39653,40573,26308,63911,29121,33865,63912,63913,22603,63914,63915,23992,24433,63916,26144,26254,27001,27054,27704,27891,28214,28481,28634,28699,28719,29008,29151,29552,63917,29787,63918,29908,30408,31310,32403,63919,63920,33521,35424,36814,63921,37704,63922,38681,63923,63924,20034,20522,63925,21000,21473,26355,27757,28618,29450,30591,31330,33454,34269,34306,63926,35028,35427,35709,35947,63927,37555,63928,38675,38928,20116,20237,20425,20658,21320,21566,21555,21978,22626,22714,22887,23067,23524,24735,63929,25034,25942,26111,26212,26791,27738,28595,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,28879,29100,29522,31613,34568,35492,39986,40711,23627,27779,29508,29577,37434,28331,29797,30239,31337,32277,34314,20800,22725,25793,29934,29973,30320,32705,37013,38605,39252,28198,29926,31401,31402,33253,34521,34680,35355,23113,23436,23451,26785,26880,28003,29609,29715,29740,30871,32233,32747,33048,33109,33694,35916,38446,38929,26352,24448,26106,26505,27754,29579,20525,23043,27498,30702,22806,23916,24013,29477,30031,63930,63931,20709,20985,22575,22829,22934,23002,23525,63932,63933,23970,25303,25622,25747,25854,63934,26332,63935,27208,63936,29183,29796,63937,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,31368,31407,32327,32350,32768,33136,63938,34799,35201,35616,36953,63939,36992,39250,24958,27442,28020,32287,35109,36785,20433,20653,20887,21191,22471,22665,23481,24248,24898,27029,28044,28263,28342,29076,29794,29992,29996,32883,33592,33993,36362,37780,37854,63940,20110,20305,20598,20778,21448,21451,21491,23431,23507,23588,24858,24962,26100,29275,29591,29760,30402,31056,31121,31161,32006,32701,33419,34261,34398,36802,36935,37109,37354,38533,38632,38633,21206,24423,26093,26161,26671,29020,31286,37057,38922,20113,63941,27218,27550,28560,29065,32792,33464,34131,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,36939,38549,38642,38907,34074,39729,20112,29066,38596,20803,21407,21729,22291,22290,22435,23195,23236,23491,24616,24895,25588,27781,27961,28274,28304,29232,29503,29783,33489,34945,36677,36960,63942,38498,39000,40219,26376,36234,37470,20301,20553,20702,21361,22285,22996,23041,23561,24944,26256,28205,29234,29771,32239,32963,33806,33894,34111,34655,34907,35096,35586,36949,38859,39759,20083,20369,20754,20842,63943,21807,21929,23418,23461,24188,24189,24254,24736,24799,24840,24841,25540,25912,26377,63944,26580,26586,63945,26977,26978,27833,27943,63946,28216,63947,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,28641,29494,29495,63948,29788,30001,63949,30290,63950,63951,32173,33278,33848,35029,35480,35547,35565,36400,36418,36938,36926,36986,37193,37321,37742,63952,63953,22537,63954,27603,32905,32946,63955,63956,20801,22891,23609,63957,63958,28516,29607,32996,36103,63959,37399,38287,63960,63961,63962,63963,32895,25102,28700,32104,34701,63964,22432,24681,24903,27575,35518,37504,38577,20057,21535,28139,34093,38512,38899,39150,25558,27875,37009,20957,25033,33210,40441,20381,20506,20736,23452,24847,25087,25836,26885,27589,30097,30691,32681,33380,34191,34811,34915,35516,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,35696,37291,20108,20197,20234,63965,63966,22839,23016,63967,24050,24347,24411,24609,63968,63969,63970,63971,29246,29669,63972,30064,30157,63973,31227,63974,32780,32819,32900,33505,33617,63975,63976,36029,36019,36999,63977,63978,39156,39180,63979,63980,28727,30410,32714,32716,32764,35610,20154,20161,20995,21360,63981,21693,22240,23035,23493,24341,24525,28270,63982,63983,32106,33589,63984,34451,35469,63985,38765,38775,63986,63987,19968,20314,20350,22777,26085,28322,36920,37808,39353,20219,22764,22922,23001,24641,63988,63989,31252,63990,33615,36035,20837,21316,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,63991,63992,63993,20173,21097,23381,33471,20180,21050,21672,22985,23039,23376,23383,23388,24675,24904,28363,28825,29038,29574,29943,30133,30913,32043,32773,33258,33576,34071,34249,35566,36039,38604,20316,21242,22204,26027,26152,28796,28856,29237,32189,33421,37196,38592,40306,23409,26855,27544,28538,30430,23697,26283,28507,31668,31786,34870,38620,19976,20183,21280,22580,22715,22767,22892,23559,24115,24196,24373,25484,26290,26454,27167,27299,27404,28479,29254,63994,29520,29835,31456,31911,33144,33247,33255,33674,33900,34083,34196,34255,35037,36115,37292,38263,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,38556,20877,21705,22312,23472,25165,26448,26685,26771,28221,28371,28797,32289,35009,36001,36617,40779,40782,29229,31631,35533,37658,20295,20302,20786,21632,22992,24213,25269,26485,26990,27159,27822,28186,29401,29482,30141,31672,32053,33511,33785,33879,34295,35419,36015,36487,36889,37048,38606,40799,21219,21514,23265,23490,25688,25973,28404,29380,63995,30340,31309,31515,31821,32318,32735,33659,35627,36042,36196,36321,36447,36842,36857,36969,37841,20291,20346,20659,20840,20856,21069,21098,22625,22652,22880,23560,23637,24283,24731,25136,26643,27583,27656,28593,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,29006,29728,30000,30008,30033,30322,31564,31627,31661,31686,32399,35438,36670,36681,37439,37523,37666,37931,38651,39002,39019,39198,20999,25130,25240,27993,30308,31434,31680,32118,21344,23742,24215,28472,28857,31896,38673,39822,40670,25509,25722,34678,19969,20117,20141,20572,20597,21576,22979,23450,24128,24237,24311,24449,24773,25402,25919,25972,26060,26230,26232,26622,26984,27273,27491,27712,28096,28136,28191,28254,28702,28833,29582,29693,30010,30555,30855,31118,31243,31357,31934,32142,33351,35330,35562,35998,37165,37194,37336,37478,37580,37664,38662,38742,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,38748,38914,40718,21046,21137,21884,22564,24093,24351,24716,25552,26799,28639,31085,31532,33229,34234,35069,35576,36420,37261,38500,38555,38717,38988,40778,20430,20806,20939,21161,22066,24340,24427,25514,25805,26089,26177,26362,26361,26397,26781,26839,27133,28437,28526,29031,29157,29226,29866,30522,31062,31066,31199,31264,31381,31895,31967,32068,32368,32903,34299,34468,35412,35519,36249,36481,36896,36973,37347,38459,38613,40165,26063,31751,36275,37827,23384,23562,21330,25305,29469,20519,23447,24478,24752,24939,26837,28121,29742,31278,32066,32156,32305,33131,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,36394,36405,37758,37912,20304,22352,24038,24231,25387,32618,20027,20303,20367,20570,23005,32964,21610,21608,22014,22863,23449,24030,24282,26205,26417,26609,26666,27880,27954,28234,28557,28855,29664,30087,31820,32002,32044,32162,33311,34523,35387,35461,36208,36490,36659,36913,37198,37202,37956,39376,31481,31909,20426,20737,20934,22472,23535,23803,26201,27197,27994,28310,28652,28940,30063,31459,34850,36897,36981,38603,39423,33537,20013,20210,34886,37325,21373,27355,26987,27713,33914,22686,24974,26366,25327,28893,29969,30151,32338,33976,35657,36104,20043,21482,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,21675,22320,22336,24535,25345,25351,25711,25903,26088,26234,26525,26547,27490,27744,27802,28460,30693,30757,31049,31063,32025,32930,33026,33267,33437,33463,34584,35468,63996,36100,36286,36978,30452,31257,31287,32340,32887,21767,21972,22645,25391,25634,26185,26187,26733,27035,27524,27941,28337,29645,29800,29857,30043,30137,30433,30494,30603,31206,32265,32285,33275,34095,34967,35386,36049,36587,36784,36914,37805,38499,38515,38663,20356,21489,23018,23241,24089,26702,29894,30142,31209,31378,33187,34541,36074,36300,36845,26015,26389,63997,22519,28503,32221,36655,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,37878,38598,24501,25074,28548,19988,20376,20511,21449,21983,23919,24046,27425,27492,30923,31642,63998,36425,36554,36974,25417,25662,30528,31364,37679,38015,40810,25776,28591,29158,29864,29914,31428,31762,32386,31922,32408,35738,36106,38013,39184,39244,21049,23519,25830,26413,32046,20717,21443,22649,24920,24921,25082,26028,31449,35730,35734,20489,20513,21109,21809,23100,24288,24432,24884,25950,26124,26166,26274,27085,28356,28466,29462,30241,31379,33081,33369,33750,33980,20661,22512,23488,23528,24425,25505,30758,32181,33756,34081,37319,37365,20874,26613,31574,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,36012,20932,22971,24765,34389,20508,63999,21076,23610,24957,25114,25299,25842,26021,28364,30240,33034,36448,38495,38587,20191,21315,21912,22825,24029,25797,27849,28154,29588,31359,33307,34214,36068,36368,36983,37351,38369,38433,38854,20984,21746,21894,24505,25764,28552,32180,36639,36685,37941,20681,23574,27838,28155,29979,30651,31805,31844,35449,35522,22558,22974,24086,25463,29266,30090,30571,35548,36028,36626,24307,26228,28152,32893,33729,35531,38737,39894,64000,21059,26367,28053,28399,32224,35558,36910,36958,39636,21021,21119,21736,24980,25220,25307,26786,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,26898,26970,27189,28818,28966,30813,30977,30990,31186,31245,32918,33400,33493,33609,34121,35970,36229,37218,37259,37294,20419,22225,29165,30679,34560,35320,23544,24534,26449,37032,21474,22618,23541,24740,24961,25696,32317,32880,34085,37507,25774,20652,23828,26368,22684,25277,25512,26894,27000,27166,28267,30394,31179,33467,33833,35535,36264,36861,37138,37195,37276,37648,37656,37786,38619,39478,39949,19985,30044,31069,31482,31569,31689,32302,33988,36441,36468,36600,36880,26149,26943,29763,20986,26414,40668,20805,24544,27798,34802,34909,34935,24756,33205,33795,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,36101,21462,21561,22068,23094,23601,28810,32736,32858,33030,33261,36259,37257,39519,40434,20596,20164,21408,24827,28204,23652,20360,20516,21988,23769,24159,24677,26772,27835,28100,29118,30164,30196,30305,31258,31305,32199,32251,32622,33268,34473,36636,38601,39347,40786,21063,21189,39149,35242,19971,26578,28422,20405,23522,26517,27784,28024,29723,30759,37341,37756,34756,31204,31281,24555,20182,21668,21822,22702,22949,24816,25171,25302,26422,26965,33333,38464,39345,39389,20524,21331,21828,22396,64001,25176,64002,25826,26219,26589,28609,28655,29730,29752,35351,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,37944,21585,22022,22374,24392,24986,27470,28760,28845,32187,35477,22890,33067,25506,30472,32829,36010,22612,25645,27067,23445,24081,28271,64003,34153,20812,21488,22826,24608,24907,27526,27760,27888,31518,32974,33492,36294,37040,39089,64004,25799,28580,25745,25860,20814,21520,22303,35342,24927,26742,64005,30171,31570,32113,36890,22534,27084,33151,35114,36864,38969,20600,22871,22956,25237,36879,39722,24925,29305,38358,22369,23110,24052,25226,25773,25850,26487,27874,27966,29228,29750,30772,32631,33453,36315,38935,21028,22338,26495,29256,29923,36009,36774,37393,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,38442,20843,21485,25420,20329,21764,24726,25943,27803,28031,29260,29437,31255,35207,35997,24429,28558,28921,33192,24846,20415,20559,25153,29255,31687,32232,32745,36941,38829,39449,36022,22378,24179,26544,33805,35413,21536,23318,24163,24290,24330,25987,32954,34109,38281,38491,20296,21253,21261,21263,21638,21754,22275,24067,24598,25243,25265,25429,64006,27873,28006,30129,30770,32990,33071,33502,33889,33970,34957,35090,36875,37610,39165,39825,24133,26292,26333,28689,29190,64007,20469,21117,24426,24915,26451,27161,28418,29922,31080,34920,35961,39111,39108,39491,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,21697,31263,26963,35575,35914,39080,39342,24444,25259,30130,30382,34987,36991,38466,21305,24380,24517,27852,29644,30050,30091,31558,33534,39325,20047,36924,19979,20309,21414,22799,24264,26160,27827,29781,33655,34662,36032,36944,38686,39957,22737,23416,34384,35604,40372,23506,24680,24717,26097,27735,28450,28579,28698,32597,32752,38289,38290,38480,38867,21106,36676,20989,21547,21688,21859,21898,27323,28085,32216,33382,37532,38519,40569,21512,21704,30418,34532,38308,38356,38492,20130,20233,23022,23270,24055,24658,25239,26477,26689,27782,28207,32568,32923,33322,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,64008,64009,38917,20133,20565,21683,22419,22874,23401,23475,25032,26999,28023,28707,34809,35299,35442,35559,36994,39405,39608,21182,26680,20502,24184,26447,33607,34892,20139,21521,22190,29670,37141,38911,39177,39255,39321,22099,22687,34395,35377,25010,27382,29563,36562,27463,38570,39511,22869,29184,36203,38761,20436,23796,24358,25080,26203,27883,28843,29572,29625,29694,30505,30541,32067,32098,32291,33335,34898,64010,36066,37449,39023,23377,31348,34880,38913,23244,20448,21332,22846,23805,25406,28025,29433,33029,33031,33698,37583,38960,20136,20804,21009,22411,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,24418,27842,28366,28677,28752,28847,29074,29673,29801,33610,34722,34913,36872,37026,37795,39336,20846,24407,24800,24935,26291,34137,36426,37295,38795,20046,20114,21628,22741,22778,22909,23733,24359,25142,25160,26122,26215,27627,28009,28111,28246,28408,28564,28640,28649,28765,29392,29733,29786,29920,30355,31068,31946,32286,32993,33446,33899,33983,34382,34399,34676,35703,35946,37804,38912,39013,24785,25110,37239,23130,26127,28151,28222,29759,39746,24573,24794,31503,21700,24344,27742,27859,27946,28888,32005,34425,35340,40251,21270,21644,23301,27194,28779,30069,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,31117,31166,33457,33775,35441,35649,36008,38772,64011,25844,25899,30906,30907,31339,20024,21914,22864,23462,24187,24739,25563,27489,26213,26707,28185,29029,29872,32008,36996,39529,39973,27963,28369,29502,35905,38346,20976,24140,24488,24653,24822,24880,24908,26179,26180,27045,27841,28255,28361,28514,29004,29852,30343,31681,31783,33618,34647,36945,38541,40643,21295,22238,24315,24458,24674,24724,25079,26214,26371,27292,28142,28590,28784,29546,32362,33214,33588,34516,35496,36036,21123,29554,23446,27243,37892,21742,22150,23389,25928,25989,26313,26783,28045,28102,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,29243,32948,37237,39501,20399,20505,21402,21518,21564,21897,21957,24127,24460,26429,29030,29661,36869,21211,21235,22628,22734,28932,29071,29179,34224,35347,26248,34216,21927,26244,29002,33841,21321,21913,27585,24409,24509,25582,26249,28999,35569,36637,40638,20241,25658,28875,30054,34407,24676,35662,40440,20807,20982,21256,27958,33016,40657,26133,27427,28824,30165,21507,23673,32007,35350,27424,27453,27462,21560,24688,27965,32725,33288,20694,20958,21916,22123,22221,23020,23305,24076,24985,24984,25137,26206,26342,29081,29113,29114,29351,31143,31232,32690,35440,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null],
+  "gb18030":[19970,19972,19973,19974,19983,19986,19991,19999,20000,20001,20003,20006,20009,20014,20015,20017,20019,20021,20023,20028,20032,20033,20034,20036,20038,20042,20049,20053,20055,20058,20059,20066,20067,20068,20069,20071,20072,20074,20075,20076,20077,20078,20079,20082,20084,20085,20086,20087,20088,20089,20090,20091,20092,20093,20095,20096,20097,20098,20099,20100,20101,20103,20106,20112,20118,20119,20121,20124,20125,20126,20131,20138,20143,20144,20145,20148,20150,20151,20152,20153,20156,20157,20158,20168,20172,20175,20176,20178,20186,20187,20188,20192,20194,20198,20199,20201,20205,20206,20207,20209,20212,20216,20217,20218,20220,20222,20224,20226,20227,20228,20229,20230,20231,20232,20235,20236,20242,20243,20244,20245,20246,20252,20253,20257,20259,20264,20265,20268,20269,20270,20273,20275,20277,20279,20281,20283,20286,20287,20288,20289,20290,20292,20293,20295,20296,20297,20298,20299,20300,20306,20308,20310,20321,20322,20326,20328,20330,20331,20333,20334,20337,20338,20341,20343,20344,20345,20346,20349,20352,20353,20354,20357,20358,20359,20362,20364,20366,20368,20370,20371,20373,20374,20376,20377,20378,20380,20382,20383,20385,20386,20388,20395,20397,20400,20401,20402,20403,20404,20406,20407,20408,20409,20410,20411,20412,20413,20414,20416,20417,20418,20422,20423,20424,20425,20427,20428,20429,20434,20435,20436,20437,20438,20441,20443,20448,20450,20452,20453,20455,20459,20460,20464,20466,20468,20469,20470,20471,20473,20475,20476,20477,20479,20480,20481,20482,20483,20484,20485,20486,20487,20488,20489,20490,20491,20494,20496,20497,20499,20501,20502,20503,20507,20509,20510,20512,20514,20515,20516,20519,20523,20527,20528,20529,20530,20531,20532,20533,20534,20535,20536,20537,20539,20541,20543,20544,20545,20546,20548,20549,20550,20553,20554,20555,20557,20560,20561,20562,20563,20564,20566,20567,20568,20569,20571,20573,20574,20575,20576,20577,20578,20579,20580,20582,20583,20584,20585,20586,20587,20589,20590,20591,20592,20593,20594,20595,20596,20597,20600,20601,20602,20604,20605,20609,20610,20611,20612,20614,20615,20617,20618,20619,20620,20622,20623,20624,20625,20626,20627,20628,20629,20630,20631,20632,20633,20634,20635,20636,20637,20638,20639,20640,20641,20642,20644,20646,20650,20651,20653,20654,20655,20656,20657,20659,20660,20661,20662,20663,20664,20665,20668,20669,20670,20671,20672,20673,20674,20675,20676,20677,20678,20679,20680,20681,20682,20683,20684,20685,20686,20688,20689,20690,20691,20692,20693,20695,20696,20697,20699,20700,20701,20702,20703,20704,20705,20706,20707,20708,20709,20712,20713,20714,20715,20719,20720,20721,20722,20724,20726,20727,20728,20729,20730,20732,20733,20734,20735,20736,20737,20738,20739,20740,20741,20744,20745,20746,20748,20749,20750,20751,20752,20753,20755,20756,20757,20758,20759,20760,20761,20762,20763,20764,20765,20766,20767,20768,20770,20771,20772,20773,20774,20775,20776,20777,20778,20779,20780,20781,20782,20783,20784,20785,20786,20787,20788,20789,20790,20791,20792,20793,20794,20795,20796,20797,20798,20802,20807,20810,20812,20814,20815,20816,20818,20819,20823,20824,20825,20827,20829,20830,20831,20832,20833,20835,20836,20838,20839,20841,20842,20847,20850,20858,20862,20863,20867,20868,20870,20871,20874,20875,20878,20879,20880,20881,20883,20884,20888,20890,20893,20894,20895,20897,20899,20902,20903,20904,20905,20906,20909,20910,20916,20920,20921,20922,20926,20927,20929,20930,20931,20933,20936,20938,20941,20942,20944,20946,20947,20948,20949,20950,20951,20952,20953,20954,20956,20958,20959,20962,20963,20965,20966,20967,20968,20969,20970,20972,20974,20977,20978,20980,20983,20990,20996,20997,21001,21003,21004,21007,21008,21011,21012,21013,21020,21022,21023,21025,21026,21027,21029,21030,21031,21034,21036,21039,21041,21042,21044,21045,21052,21054,21060,21061,21062,21063,21064,21065,21067,21070,21071,21074,21075,21077,21079,21080,21081,21082,21083,21085,21087,21088,21090,21091,21092,21094,21096,21099,21100,21101,21102,21104,21105,21107,21108,21109,21110,21111,21112,21113,21114,21115,21116,21118,21120,21123,21124,21125,21126,21127,21129,21130,21131,21132,21133,21134,21135,21137,21138,21140,21141,21142,21143,21144,21145,21146,21148,21156,21157,21158,21159,21166,21167,21168,21172,21173,21174,21175,21176,21177,21178,21179,21180,21181,21184,21185,21186,21188,21189,21190,21192,21194,21196,21197,21198,21199,21201,21203,21204,21205,21207,21209,21210,21211,21212,21213,21214,21216,21217,21218,21219,21221,21222,21223,21224,21225,21226,21227,21228,21229,21230,21231,21233,21234,21235,21236,21237,21238,21239,21240,21243,21244,21245,21249,21250,21251,21252,21255,21257,21258,21259,21260,21262,21265,21266,21267,21268,21272,21275,21276,21278,21279,21282,21284,21285,21287,21288,21289,21291,21292,21293,21295,21296,21297,21298,21299,21300,21301,21302,21303,21304,21308,21309,21312,21314,21316,21318,21323,21324,21325,21328,21332,21336,21337,21339,21341,21349,21352,21354,21356,21357,21362,21366,21369,21371,21372,21373,21374,21376,21377,21379,21383,21384,21386,21390,21391,21392,21393,21394,21395,21396,21398,21399,21401,21403,21404,21406,21408,21409,21412,21415,21418,21419,21420,21421,21423,21424,21425,21426,21427,21428,21429,21431,21432,21433,21434,21436,21437,21438,21440,21443,21444,21445,21446,21447,21454,21455,21456,21458,21459,21461,21466,21468,21469,21470,21473,21474,21479,21492,21498,21502,21503,21504,21506,21509,21511,21515,21524,21528,21529,21530,21532,21538,21540,21541,21546,21552,21555,21558,21559,21562,21565,21567,21569,21570,21572,21573,21575,21577,21580,21581,21582,21583,21585,21594,21597,21598,21599,21600,21601,21603,21605,21607,21609,21610,21611,21612,21613,21614,21615,21616,21620,21625,21626,21630,21631,21633,21635,21637,21639,21640,21641,21642,21645,21649,21651,21655,21656,21660,21662,21663,21664,21665,21666,21669,21678,21680,21682,21685,21686,21687,21689,21690,21692,21694,21699,21701,21706,21707,21718,21720,21723,21728,21729,21730,21731,21732,21739,21740,21743,21744,21745,21748,21749,21750,21751,21752,21753,21755,21758,21760,21762,21763,21764,21765,21768,21770,21771,21772,21773,21774,21778,21779,21781,21782,21783,21784,21785,21786,21788,21789,21790,21791,21793,21797,21798,21800,21801,21803,21805,21810,21812,21813,21814,21816,21817,21818,21819,21821,21824,21826,21829,21831,21832,21835,21836,21837,21838,21839,21841,21842,21843,21844,21847,21848,21849,21850,21851,21853,21854,21855,21856,21858,21859,21864,21865,21867,21871,21872,21873,21874,21875,21876,21881,21882,21885,21887,21893,21894,21900,21901,21902,21904,21906,21907,21909,21910,21911,21914,21915,21918,21920,21921,21922,21923,21924,21925,21926,21928,21929,21930,21931,21932,21933,21934,21935,21936,21938,21940,21942,21944,21946,21948,21951,21952,21953,21954,21955,21958,21959,21960,21962,21963,21966,21967,21968,21973,21975,21976,21977,21978,21979,21982,21984,21986,21991,21993,21997,21998,22000,22001,22004,22006,22008,22009,22010,22011,22012,22015,22018,22019,22020,22021,22022,22023,22026,22027,22029,22032,22033,22034,22035,22036,22037,22038,22039,22041,22042,22044,22045,22048,22049,22050,22053,22054,22056,22057,22058,22059,22062,22063,22064,22067,22069,22071,22072,22074,22076,22077,22078,22080,22081,22082,22083,22084,22085,22086,22087,22088,22089,22090,22091,22095,22096,22097,22098,22099,22101,22102,22106,22107,22109,22110,22111,22112,22113,22115,22117,22118,22119,22125,22126,22127,22128,22130,22131,22132,22133,22135,22136,22137,22138,22141,22142,22143,22144,22145,22146,22147,22148,22151,22152,22153,22154,22155,22156,22157,22160,22161,22162,22164,22165,22166,22167,22168,22169,22170,22171,22172,22173,22174,22175,22176,22177,22178,22180,22181,22182,22183,22184,22185,22186,22187,22188,22189,22190,22192,22193,22194,22195,22196,22197,22198,22200,22201,22202,22203,22205,22206,22207,22208,22209,22210,22211,22212,22213,22214,22215,22216,22217,22219,22220,22221,22222,22223,22224,22225,22226,22227,22229,22230,22232,22233,22236,22243,22245,22246,22247,22248,22249,22250,22252,22254,22255,22258,22259,22262,22263,22264,22267,22268,22272,22273,22274,22277,22279,22283,22284,22285,22286,22287,22288,22289,22290,22291,22292,22293,22294,22295,22296,22297,22298,22299,22301,22302,22304,22305,22306,22308,22309,22310,22311,22315,22321,22322,22324,22325,22326,22327,22328,22332,22333,22335,22337,22339,22340,22341,22342,22344,22345,22347,22354,22355,22356,22357,22358,22360,22361,22370,22371,22373,22375,22380,22382,22384,22385,22386,22388,22389,22392,22393,22394,22397,22398,22399,22400,22401,22407,22408,22409,22410,22413,22414,22415,22416,22417,22420,22421,22422,22423,22424,22425,22426,22428,22429,22430,22431,22437,22440,22442,22444,22447,22448,22449,22451,22453,22454,22455,22457,22458,22459,22460,22461,22462,22463,22464,22465,22468,22469,22470,22471,22472,22473,22474,22476,22477,22480,22481,22483,22486,22487,22491,22492,22494,22497,22498,22499,22501,22502,22503,22504,22505,22506,22507,22508,22510,22512,22513,22514,22515,22517,22518,22519,22523,22524,22526,22527,22529,22531,22532,22533,22536,22537,22538,22540,22542,22543,22544,22546,22547,22548,22550,22551,22552,22554,22555,22556,22557,22559,22562,22563,22565,22566,22567,22568,22569,22571,22572,22573,22574,22575,22577,22578,22579,22580,22582,22583,22584,22585,22586,22587,22588,22589,22590,22591,22592,22593,22594,22595,22597,22598,22599,22600,22601,22602,22603,22606,22607,22608,22610,22611,22613,22614,22615,22617,22618,22619,22620,22621,22623,22624,22625,22626,22627,22628,22630,22631,22632,22633,22634,22637,22638,22639,22640,22641,22642,22643,22644,22645,22646,22647,22648,22649,22650,22651,22652,22653,22655,22658,22660,22662,22663,22664,22666,22667,22668,22669,22670,22671,22672,22673,22676,22677,22678,22679,22680,22683,22684,22685,22688,22689,22690,22691,22692,22693,22694,22695,22698,22699,22700,22701,22702,22703,22704,22705,22706,22707,22708,22709,22710,22711,22712,22713,22714,22715,22717,22718,22719,22720,22722,22723,22724,22726,22727,22728,22729,22730,22731,22732,22733,22734,22735,22736,22738,22739,22740,22742,22743,22744,22745,22746,22747,22748,22749,22750,22751,22752,22753,22754,22755,22757,22758,22759,22760,22761,22762,22765,22767,22769,22770,22772,22773,22775,22776,22778,22779,22780,22781,22782,22783,22784,22785,22787,22789,22790,22792,22793,22794,22795,22796,22798,22800,22801,22802,22803,22807,22808,22811,22813,22814,22816,22817,22818,22819,22822,22824,22828,22832,22834,22835,22837,22838,22843,22845,22846,22847,22848,22851,22853,22854,22858,22860,22861,22864,22866,22867,22873,22875,22876,22877,22878,22879,22881,22883,22884,22886,22887,22888,22889,22890,22891,22892,22893,22894,22895,22896,22897,22898,22901,22903,22906,22907,22908,22910,22911,22912,22917,22921,22923,22924,22926,22927,22928,22929,22932,22933,22936,22938,22939,22940,22941,22943,22944,22945,22946,22950,22951,22956,22957,22960,22961,22963,22964,22965,22966,22967,22968,22970,22972,22973,22975,22976,22977,22978,22979,22980,22981,22983,22984,22985,22988,22989,22990,22991,22997,22998,23001,23003,23006,23007,23008,23009,23010,23012,23014,23015,23017,23018,23019,23021,23022,23023,23024,23025,23026,23027,23028,23029,23030,23031,23032,23034,23036,23037,23038,23040,23042,23050,23051,23053,23054,23055,23056,23058,23060,23061,23062,23063,23065,23066,23067,23069,23070,23073,23074,23076,23078,23079,23080,23082,23083,23084,23085,23086,23087,23088,23091,23093,23095,23096,23097,23098,23099,23101,23102,23103,23105,23106,23107,23108,23109,23111,23112,23115,23116,23117,23118,23119,23120,23121,23122,23123,23124,23126,23127,23128,23129,23131,23132,23133,23134,23135,23136,23137,23139,23140,23141,23142,23144,23145,23147,23148,23149,23150,23151,23152,23153,23154,23155,23160,23161,23163,23164,23165,23166,23168,23169,23170,23171,23172,23173,23174,23175,23176,23177,23178,23179,23180,23181,23182,23183,23184,23185,23187,23188,23189,23190,23191,23192,23193,23196,23197,23198,23199,23200,23201,23202,23203,23204,23205,23206,23207,23208,23209,23211,23212,23213,23214,23215,23216,23217,23220,23222,23223,23225,23226,23227,23228,23229,23231,23232,23235,23236,23237,23238,23239,23240,23242,23243,23245,23246,23247,23248,23249,23251,23253,23255,23257,23258,23259,23261,23262,23263,23266,23268,23269,23271,23272,23274,23276,23277,23278,23279,23280,23282,23283,23284,23285,23286,23287,23288,23289,23290,23291,23292,23293,23294,23295,23296,23297,23298,23299,23300,23301,23302,23303,23304,23306,23307,23308,23309,23310,23311,23312,23313,23314,23315,23316,23317,23320,23321,23322,23323,23324,23325,23326,23327,23328,23329,23330,23331,23332,23333,23334,23335,23336,23337,23338,23339,23340,23341,23342,23343,23344,23345,23347,23349,23350,23352,23353,23354,23355,23356,23357,23358,23359,23361,23362,23363,23364,23365,23366,23367,23368,23369,23370,23371,23372,23373,23374,23375,23378,23382,23390,23392,23393,23399,23400,23403,23405,23406,23407,23410,23412,23414,23415,23416,23417,23419,23420,23422,23423,23426,23430,23434,23437,23438,23440,23441,23442,23444,23446,23455,23463,23464,23465,23468,23469,23470,23471,23473,23474,23479,23482,23483,23484,23488,23489,23491,23496,23497,23498,23499,23501,23502,23503,23505,23508,23509,23510,23511,23512,23513,23514,23515,23516,23520,23522,23523,23526,23527,23529,23530,23531,23532,23533,23535,23537,23538,23539,23540,23541,23542,23543,23549,23550,23552,23554,23555,23557,23559,23560,23563,23564,23565,23566,23568,23570,23571,23575,23577,23579,23582,23583,23584,23585,23587,23590,23592,23593,23594,23595,23597,23598,23599,23600,23602,23603,23605,23606,23607,23619,23620,23622,23623,23628,23629,23634,23635,23636,23638,23639,23640,23642,23643,23644,23645,23647,23650,23652,23655,23656,23657,23658,23659,23660,23661,23664,23666,23667,23668,23669,23670,23671,23672,23675,23676,23677,23678,23680,23683,23684,23685,23686,23687,23689,23690,23691,23694,23695,23698,23699,23701,23709,23710,23711,23712,23713,23716,23717,23718,23719,23720,23722,23726,23727,23728,23730,23732,23734,23737,23738,23739,23740,23742,23744,23746,23747,23749,23750,23751,23752,23753,23754,23756,23757,23758,23759,23760,23761,23763,23764,23765,23766,23767,23768,23770,23771,23772,23773,23774,23775,23776,23778,23779,23783,23785,23787,23788,23790,23791,23793,23794,23795,23796,23797,23798,23799,23800,23801,23802,23804,23805,23806,23807,23808,23809,23812,23813,23816,23817,23818,23819,23820,23821,23823,23824,23825,23826,23827,23829,23831,23832,23833,23834,23836,23837,23839,23840,23841,23842,23843,23845,23848,23850,23851,23852,23855,23856,23857,23858,23859,23861,23862,23863,23864,23865,23866,23867,23868,23871,23872,23873,23874,23875,23876,23877,23878,23880,23881,23885,23886,23887,23888,23889,23890,23891,23892,23893,23894,23895,23897,23898,23900,23902,23903,23904,23905,23906,23907,23908,23909,23910,23911,23912,23914,23917,23918,23920,23921,23922,23923,23925,23926,23927,23928,23929,23930,23931,23932,23933,23934,23935,23936,23937,23939,23940,23941,23942,23943,23944,23945,23946,23947,23948,23949,23950,23951,23952,23953,23954,23955,23956,23957,23958,23959,23960,23962,23963,23964,23966,23967,23968,23969,23970,23971,23972,23973,23974,23975,23976,23977,23978,23979,23980,23981,23982,23983,23984,23985,23986,23987,23988,23989,23990,23992,23993,23994,23995,23996,23997,23998,23999,24000,24001,24002,24003,24004,24006,24007,24008,24009,24010,24011,24012,24014,24015,24016,24017,24018,24019,24020,24021,24022,24023,24024,24025,24026,24028,24031,24032,24035,24036,24042,24044,24045,24048,24053,24054,24056,24057,24058,24059,24060,24063,24064,24068,24071,24073,24074,24075,24077,24078,24082,24083,24087,24094,24095,24096,24097,24098,24099,24100,24101,24104,24105,24106,24107,24108,24111,24112,24114,24115,24116,24117,24118,24121,24122,24126,24127,24128,24129,24131,24134,24135,24136,24137,24138,24139,24141,24142,24143,24144,24145,24146,24147,24150,24151,24152,24153,24154,24156,24157,24159,24160,24163,24164,24165,24166,24167,24168,24169,24170,24171,24172,24173,24174,24175,24176,24177,24181,24183,24185,24190,24193,24194,24195,24197,24200,24201,24204,24205,24206,24210,24216,24219,24221,24225,24226,24227,24228,24232,24233,24234,24235,24236,24238,24239,24240,24241,24242,24244,24250,24251,24252,24253,24255,24256,24257,24258,24259,24260,24261,24262,24263,24264,24267,24268,24269,24270,24271,24272,24276,24277,24279,24280,24281,24282,24284,24285,24286,24287,24288,24289,24290,24291,24292,24293,24294,24295,24297,24299,24300,24301,24302,24303,24304,24305,24306,24307,24309,24312,24313,24315,24316,24317,24325,24326,24327,24329,24332,24333,24334,24336,24338,24340,24342,24345,24346,24348,24349,24350,24353,24354,24355,24356,24360,24363,24364,24366,24368,24370,24371,24372,24373,24374,24375,24376,24379,24381,24382,24383,24385,24386,24387,24388,24389,24390,24391,24392,24393,24394,24395,24396,24397,24398,24399,24401,24404,24409,24410,24411,24412,24414,24415,24416,24419,24421,24423,24424,24427,24430,24431,24434,24436,24437,24438,24440,24442,24445,24446,24447,24451,24454,24461,24462,24463,24465,24467,24468,24470,24474,24475,24477,24478,24479,24480,24482,24483,24484,24485,24486,24487,24489,24491,24492,24495,24496,24497,24498,24499,24500,24502,24504,24505,24506,24507,24510,24511,24512,24513,24514,24519,24520,24522,24523,24526,24531,24532,24533,24538,24539,24540,24542,24543,24546,24547,24549,24550,24552,24553,24556,24559,24560,24562,24563,24564,24566,24567,24569,24570,24572,24583,24584,24585,24587,24588,24592,24593,24595,24599,24600,24602,24606,24607,24610,24611,24612,24620,24621,24622,24624,24625,24626,24627,24628,24630,24631,24632,24633,24634,24637,24638,24640,24644,24645,24646,24647,24648,24649,24650,24652,24654,24655,24657,24659,24660,24662,24663,24664,24667,24668,24670,24671,24672,24673,24677,24678,24686,24689,24690,24692,24693,24695,24702,24704,24705,24706,24709,24710,24711,24712,24714,24715,24718,24719,24720,24721,24723,24725,24727,24728,24729,24732,24734,24737,24738,24740,24741,24743,24745,24746,24750,24752,24755,24757,24758,24759,24761,24762,24765,24766,24767,24768,24769,24770,24771,24772,24775,24776,24777,24780,24781,24782,24783,24784,24786,24787,24788,24790,24791,24793,24795,24798,24801,24802,24803,24804,24805,24810,24817,24818,24821,24823,24824,24827,24828,24829,24830,24831,24834,24835,24836,24837,24839,24842,24843,24844,24848,24849,24850,24851,24852,24854,24855,24856,24857,24859,24860,24861,24862,24865,24866,24869,24872,24873,24874,24876,24877,24878,24879,24880,24881,24882,24883,24884,24885,24886,24887,24888,24889,24890,24891,24892,24893,24894,24896,24897,24898,24899,24900,24901,24902,24903,24905,24907,24909,24911,24912,24914,24915,24916,24918,24919,24920,24921,24922,24923,24924,24926,24927,24928,24929,24931,24932,24933,24934,24937,24938,24939,24940,24941,24942,24943,24945,24946,24947,24948,24950,24952,24953,24954,24955,24956,24957,24958,24959,24960,24961,24962,24963,24964,24965,24966,24967,24968,24969,24970,24972,24973,24975,24976,24977,24978,24979,24981,24982,24983,24984,24985,24986,24987,24988,24990,24991,24992,24993,24994,24995,24996,24997,24998,25002,25003,25005,25006,25007,25008,25009,25010,25011,25012,25013,25014,25016,25017,25018,25019,25020,25021,25023,25024,25025,25027,25028,25029,25030,25031,25033,25036,25037,25038,25039,25040,25043,25045,25046,25047,25048,25049,25050,25051,25052,25053,25054,25055,25056,25057,25058,25059,25060,25061,25063,25064,25065,25066,25067,25068,25069,25070,25071,25072,25073,25074,25075,25076,25078,25079,25080,25081,25082,25083,25084,25085,25086,25088,25089,25090,25091,25092,25093,25095,25097,25107,25108,25113,25116,25117,25118,25120,25123,25126,25127,25128,25129,25131,25133,25135,25136,25137,25138,25141,25142,25144,25145,25146,25147,25148,25154,25156,25157,25158,25162,25167,25168,25173,25174,25175,25177,25178,25180,25181,25182,25183,25184,25185,25186,25188,25189,25192,25201,25202,25204,25205,25207,25208,25210,25211,25213,25217,25218,25219,25221,25222,25223,25224,25227,25228,25229,25230,25231,25232,25236,25241,25244,25245,25246,25251,25254,25255,25257,25258,25261,25262,25263,25264,25266,25267,25268,25270,25271,25272,25274,25278,25280,25281,25283,25291,25295,25297,25301,25309,25310,25312,25313,25316,25322,25323,25328,25330,25333,25336,25337,25338,25339,25344,25347,25348,25349,25350,25354,25355,25356,25357,25359,25360,25362,25363,25364,25365,25367,25368,25369,25372,25382,25383,25385,25388,25389,25390,25392,25393,25395,25396,25397,25398,25399,25400,25403,25404,25406,25407,25408,25409,25412,25415,25416,25418,25425,25426,25427,25428,25430,25431,25432,25433,25434,25435,25436,25437,25440,25444,25445,25446,25448,25450,25451,25452,25455,25456,25458,25459,25460,25461,25464,25465,25468,25469,25470,25471,25473,25475,25476,25477,25478,25483,25485,25489,25491,25492,25493,25495,25497,25498,25499,25500,25501,25502,25503,25505,25508,25510,25515,25519,25521,25522,25525,25526,25529,25531,25533,25535,25536,25537,25538,25539,25541,25543,25544,25546,25547,25548,25553,25555,25556,25557,25559,25560,25561,25562,25563,25564,25565,25567,25570,25572,25573,25574,25575,25576,25579,25580,25582,25583,25584,25585,25587,25589,25591,25593,25594,25595,25596,25598,25603,25604,25606,25607,25608,25609,25610,25613,25614,25617,25618,25621,25622,25623,25624,25625,25626,25629,25631,25634,25635,25636,25637,25639,25640,25641,25643,25646,25647,25648,25649,25650,25651,25653,25654,25655,25656,25657,25659,25660,25662,25664,25666,25667,25673,25675,25676,25677,25678,25679,25680,25681,25683,25685,25686,25687,25689,25690,25691,25692,25693,25695,25696,25697,25698,25699,25700,25701,25702,25704,25706,25707,25708,25710,25711,25712,25713,25714,25715,25716,25717,25718,25719,25723,25724,25725,25726,25727,25728,25729,25731,25734,25736,25737,25738,25739,25740,25741,25742,25743,25744,25747,25748,25751,25752,25754,25755,25756,25757,25759,25760,25761,25762,25763,25765,25766,25767,25768,25770,25771,25775,25777,25778,25779,25780,25782,25785,25787,25789,25790,25791,25793,25795,25796,25798,25799,25800,25801,25802,25803,25804,25807,25809,25811,25812,25813,25814,25817,25818,25819,25820,25821,25823,25824,25825,25827,25829,25831,25832,25833,25834,25835,25836,25837,25838,25839,25840,25841,25842,25843,25844,25845,25846,25847,25848,25849,25850,25851,25852,25853,25854,25855,25857,25858,25859,25860,25861,25862,25863,25864,25866,25867,25868,25869,25870,25871,25872,25873,25875,25876,25877,25878,25879,25881,25882,25883,25884,25885,25886,25887,25888,25889,25890,25891,25892,25894,25895,25896,25897,25898,25900,25901,25904,25905,25906,25907,25911,25914,25916,25917,25920,25921,25922,25923,25924,25926,25927,25930,25931,25933,25934,25936,25938,25939,25940,25943,25944,25946,25948,25951,25952,25953,25956,25957,25959,25960,25961,25962,25965,25966,25967,25969,25971,25973,25974,25976,25977,25978,25979,25980,25981,25982,25983,25984,25985,25986,25987,25988,25989,25990,25992,25993,25994,25997,25998,25999,26002,26004,26005,26006,26008,26010,26013,26014,26016,26018,26019,26022,26024,26026,26028,26030,26033,26034,26035,26036,26037,26038,26039,26040,26042,26043,26046,26047,26048,26050,26055,26056,26057,26058,26061,26064,26065,26067,26068,26069,26072,26073,26074,26075,26076,26077,26078,26079,26081,26083,26084,26090,26091,26098,26099,26100,26101,26104,26105,26107,26108,26109,26110,26111,26113,26116,26117,26119,26120,26121,26123,26125,26128,26129,26130,26134,26135,26136,26138,26139,26140,26142,26145,26146,26147,26148,26150,26153,26154,26155,26156,26158,26160,26162,26163,26167,26168,26169,26170,26171,26173,26175,26176,26178,26180,26181,26182,26183,26184,26185,26186,26189,26190,26192,26193,26200,26201,26203,26204,26205,26206,26208,26210,26211,26213,26215,26217,26218,26219,26220,26221,26225,26226,26227,26229,26232,26233,26235,26236,26237,26239,26240,26241,26243,26245,26246,26248,26249,26250,26251,26253,26254,26255,26256,26258,26259,26260,26261,26264,26265,26266,26267,26268,26270,26271,26272,26273,26274,26275,26276,26277,26278,26281,26282,26283,26284,26285,26287,26288,26289,26290,26291,26293,26294,26295,26296,26298,26299,26300,26301,26303,26304,26305,26306,26307,26308,26309,26310,26311,26312,26313,26314,26315,26316,26317,26318,26319,26320,26321,26322,26323,26324,26325,26326,26327,26328,26330,26334,26335,26336,26337,26338,26339,26340,26341,26343,26344,26346,26347,26348,26349,26350,26351,26353,26357,26358,26360,26362,26363,26365,26369,26370,26371,26372,26373,26374,26375,26380,26382,26383,26385,26386,26387,26390,26392,26393,26394,26396,26398,26400,26401,26402,26403,26404,26405,26407,26409,26414,26416,26418,26419,26422,26423,26424,26425,26427,26428,26430,26431,26433,26436,26437,26439,26442,26443,26445,26450,26452,26453,26455,26456,26457,26458,26459,26461,26466,26467,26468,26470,26471,26475,26476,26478,26481,26484,26486,26488,26489,26490,26491,26493,26496,26498,26499,26501,26502,26504,26506,26508,26509,26510,26511,26513,26514,26515,26516,26518,26521,26523,26527,26528,26529,26532,26534,26537,26540,26542,26545,26546,26548,26553,26554,26555,26556,26557,26558,26559,26560,26562,26565,26566,26567,26568,26569,26570,26571,26572,26573,26574,26581,26582,26583,26587,26591,26593,26595,26596,26598,26599,26600,26602,26603,26605,26606,26610,26613,26614,26615,26616,26617,26618,26619,26620,26622,26625,26626,26627,26628,26630,26637,26640,26642,26644,26645,26648,26649,26650,26651,26652,26654,26655,26656,26658,26659,26660,26661,26662,26663,26664,26667,26668,26669,26670,26671,26672,26673,26676,26677,26678,26682,26683,26687,26695,26699,26701,26703,26706,26710,26711,26712,26713,26714,26715,26716,26717,26718,26719,26730,26732,26733,26734,26735,26736,26737,26738,26739,26741,26744,26745,26746,26747,26748,26749,26750,26751,26752,26754,26756,26759,26760,26761,26762,26763,26764,26765,26766,26768,26769,26770,26772,26773,26774,26776,26777,26778,26779,26780,26781,26782,26783,26784,26785,26787,26788,26789,26793,26794,26795,26796,26798,26801,26802,26804,26806,26807,26808,26809,26810,26811,26812,26813,26814,26815,26817,26819,26820,26821,26822,26823,26824,26826,26828,26830,26831,26832,26833,26835,26836,26838,26839,26841,26843,26844,26845,26846,26847,26849,26850,26852,26853,26854,26855,26856,26857,26858,26859,26860,26861,26863,26866,26867,26868,26870,26871,26872,26875,26877,26878,26879,26880,26882,26883,26884,26886,26887,26888,26889,26890,26892,26895,26897,26899,26900,26901,26902,26903,26904,26905,26906,26907,26908,26909,26910,26913,26914,26915,26917,26918,26919,26920,26921,26922,26923,26924,26926,26927,26929,26930,26931,26933,26934,26935,26936,26938,26939,26940,26942,26944,26945,26947,26948,26949,26950,26951,26952,26953,26954,26955,26956,26957,26958,26959,26960,26961,26962,26963,26965,26966,26968,26969,26971,26972,26975,26977,26978,26980,26981,26983,26984,26985,26986,26988,26989,26991,26992,26994,26995,26996,26997,26998,27002,27003,27005,27006,27007,27009,27011,27013,27018,27019,27020,27022,27023,27024,27025,27026,27027,27030,27031,27033,27034,27037,27038,27039,27040,27041,27042,27043,27044,27045,27046,27049,27050,27052,27054,27055,27056,27058,27059,27061,27062,27064,27065,27066,27068,27069,27070,27071,27072,27074,27075,27076,27077,27078,27079,27080,27081,27083,27085,27087,27089,27090,27091,27093,27094,27095,27096,27097,27098,27100,27101,27102,27105,27106,27107,27108,27109,27110,27111,27112,27113,27114,27115,27116,27118,27119,27120,27121,27123,27124,27125,27126,27127,27128,27129,27130,27131,27132,27134,27136,27137,27138,27139,27140,27141,27142,27143,27144,27145,27147,27148,27149,27150,27151,27152,27153,27154,27155,27156,27157,27158,27161,27162,27163,27164,27165,27166,27168,27170,27171,27172,27173,27174,27175,27177,27179,27180,27181,27182,27184,27186,27187,27188,27190,27191,27192,27193,27194,27195,27196,27199,27200,27201,27202,27203,27205,27206,27208,27209,27210,27211,27212,27213,27214,27215,27217,27218,27219,27220,27221,27222,27223,27226,27228,27229,27230,27231,27232,27234,27235,27236,27238,27239,27240,27241,27242,27243,27244,27245,27246,27247,27248,27250,27251,27252,27253,27254,27255,27256,27258,27259,27261,27262,27263,27265,27266,27267,27269,27270,27271,27272,27273,27274,27275,27276,27277,27279,27282,27283,27284,27285,27286,27288,27289,27290,27291,27292,27293,27294,27295,27297,27298,27299,27300,27301,27302,27303,27304,27306,27309,27310,27311,27312,27313,27314,27315,27316,27317,27318,27319,27320,27321,27322,27323,27324,27325,27326,27327,27328,27329,27330,27331,27332,27333,27334,27335,27336,27337,27338,27339,27340,27341,27342,27343,27344,27345,27346,27347,27348,27349,27350,27351,27352,27353,27354,27355,27356,27357,27358,27359,27360,27361,27362,27363,27364,27365,27366,27367,27368,27369,27370,27371,27372,27373,27374,27375,27376,27377,27378,27379,27380,27381,27382,27383,27384,27385,27386,27387,27388,27389,27390,27391,27392,27393,27394,27395,27396,27397,27398,27399,27400,27401,27402,27403,27404,27405,27406,27407,27408,27409,27410,27411,27412,27413,27414,27415,27416,27417,27418,27419,27420,27421,27422,27423,27429,27430,27432,27433,27434,27435,27436,27437,27438,27439,27440,27441,27443,27444,27445,27446,27448,27451,27452,27453,27455,27456,27457,27458,27460,27461,27464,27466,27467,27469,27470,27471,27472,27473,27474,27475,27476,27477,27478,27479,27480,27482,27483,27484,27485,27486,27487,27488,27489,27496,27497,27499,27500,27501,27502,27503,27504,27505,27506,27507,27508,27509,27510,27511,27512,27514,27517,27518,27519,27520,27525,27528,27532,27534,27535,27536,27537,27540,27541,27543,27544,27545,27548,27549,27550,27551,27552,27554,27555,27556,27557,27558,27559,27560,27561,27563,27564,27565,27566,27567,27568,27569,27570,27574,27576,27577,27578,27579,27580,27581,27582,27584,27587,27588,27590,27591,27592,27593,27594,27596,27598,27600,27601,27608,27610,27612,27613,27614,27615,27616,27618,27619,27620,27621,27622,27623,27624,27625,27628,27629,27630,27632,27633,27634,27636,27638,27639,27640,27642,27643,27644,27646,27647,27648,27649,27650,27651,27652,27656,27657,27658,27659,27660,27662,27666,27671,27676,27677,27678,27680,27683,27685,27691,27692,27693,27697,27699,27702,27703,27705,27706,27707,27708,27710,27711,27715,27716,27717,27720,27723,27724,27725,27726,27727,27729,27730,27731,27734,27736,27737,27738,27746,27747,27749,27750,27751,27755,27756,27757,27758,27759,27761,27763,27765,27767,27768,27770,27771,27772,27775,27776,27780,27783,27786,27787,27789,27790,27793,27794,27797,27798,27799,27800,27802,27804,27805,27806,27808,27810,27816,27820,27823,27824,27828,27829,27830,27831,27834,27840,27841,27842,27843,27846,27847,27848,27851,27853,27854,27855,27857,27858,27864,27865,27866,27868,27869,27871,27876,27878,27879,27881,27884,27885,27890,27892,27897,27903,27904,27906,27907,27909,27910,27912,27913,27914,27917,27919,27920,27921,27923,27924,27925,27926,27928,27932,27933,27935,27936,27937,27938,27939,27940,27942,27944,27945,27948,27949,27951,27952,27956,27958,27959,27960,27962,27967,27968,27970,27972,27977,27980,27984,27989,27990,27991,27992,27995,27997,27999,28001,28002,28004,28005,28007,28008,28011,28012,28013,28016,28017,28018,28019,28021,28022,28025,28026,28027,28029,28030,28031,28032,28033,28035,28036,28038,28039,28042,28043,28045,28047,28048,28050,28054,28055,28056,28057,28058,28060,28066,28069,28076,28077,28080,28081,28083,28084,28086,28087,28089,28090,28091,28092,28093,28094,28097,28098,28099,28104,28105,28106,28109,28110,28111,28112,28114,28115,28116,28117,28119,28122,28123,28124,28127,28130,28131,28133,28135,28136,28137,28138,28141,28143,28144,28146,28148,28149,28150,28152,28154,28157,28158,28159,28160,28161,28162,28163,28164,28166,28167,28168,28169,28171,28175,28178,28179,28181,28184,28185,28187,28188,28190,28191,28194,28198,28199,28200,28202,28204,28206,28208,28209,28211,28213,28214,28215,28217,28219,28220,28221,28222,28223,28224,28225,28226,28229,28230,28231,28232,28233,28234,28235,28236,28239,28240,28241,28242,28245,28247,28249,28250,28252,28253,28254,28256,28257,28258,28259,28260,28261,28262,28263,28264,28265,28266,28268,28269,28271,28272,28273,28274,28275,28276,28277,28278,28279,28280,28281,28282,28283,28284,28285,28288,28289,28290,28292,28295,28296,28298,28299,28300,28301,28302,28305,28306,28307,28308,28309,28310,28311,28313,28314,28315,28317,28318,28320,28321,28323,28324,28326,28328,28329,28331,28332,28333,28334,28336,28339,28341,28344,28345,28348,28350,28351,28352,28355,28356,28357,28358,28360,28361,28362,28364,28365,28366,28368,28370,28374,28376,28377,28379,28380,28381,28387,28391,28394,28395,28396,28397,28398,28399,28400,28401,28402,28403,28405,28406,28407,28408,28410,28411,28412,28413,28414,28415,28416,28417,28419,28420,28421,28423,28424,28426,28427,28428,28429,28430,28432,28433,28434,28438,28439,28440,28441,28442,28443,28444,28445,28446,28447,28449,28450,28451,28453,28454,28455,28456,28460,28462,28464,28466,28468,28469,28471,28472,28473,28474,28475,28476,28477,28479,28480,28481,28482,28483,28484,28485,28488,28489,28490,28492,28494,28495,28496,28497,28498,28499,28500,28501,28502,28503,28505,28506,28507,28509,28511,28512,28513,28515,28516,28517,28519,28520,28521,28522,28523,28524,28527,28528,28529,28531,28533,28534,28535,28537,28539,28541,28542,28543,28544,28545,28546,28547,28549,28550,28551,28554,28555,28559,28560,28561,28562,28563,28564,28565,28566,28567,28568,28569,28570,28571,28573,28574,28575,28576,28578,28579,28580,28581,28582,28584,28585,28586,28587,28588,28589,28590,28591,28592,28593,28594,28596,28597,28599,28600,28602,28603,28604,28605,28606,28607,28609,28611,28612,28613,28614,28615,28616,28618,28619,28620,28621,28622,28623,28624,28627,28628,28629,28630,28631,28632,28633,28634,28635,28636,28637,28639,28642,28643,28644,28645,28646,28647,28648,28649,28650,28651,28652,28653,28656,28657,28658,28659,28660,28661,28662,28663,28664,28665,28666,28667,28668,28669,28670,28671,28672,28673,28674,28675,28676,28677,28678,28679,28680,28681,28682,28683,28684,28685,28686,28687,28688,28690,28691,28692,28693,28694,28695,28696,28697,28700,28701,28702,28703,28704,28705,28706,28708,28709,28710,28711,28712,28713,28714,28715,28716,28717,28718,28719,28720,28721,28722,28723,28724,28726,28727,28728,28730,28731,28732,28733,28734,28735,28736,28737,28738,28739,28740,28741,28742,28743,28744,28745,28746,28747,28749,28750,28752,28753,28754,28755,28756,28757,28758,28759,28760,28761,28762,28763,28764,28765,28767,28768,28769,28770,28771,28772,28773,28774,28775,28776,28777,28778,28782,28785,28786,28787,28788,28791,28793,28794,28795,28797,28801,28802,28803,28804,28806,28807,28808,28811,28812,28813,28815,28816,28817,28819,28823,28824,28826,28827,28830,28831,28832,28833,28834,28835,28836,28837,28838,28839,28840,28841,28842,28848,28850,28852,28853,28854,28858,28862,28863,28868,28869,28870,28871,28873,28875,28876,28877,28878,28879,28880,28881,28882,28883,28884,28885,28886,28887,28890,28892,28893,28894,28896,28897,28898,28899,28901,28906,28910,28912,28913,28914,28915,28916,28917,28918,28920,28922,28923,28924,28926,28927,28928,28929,28930,28931,28932,28933,28934,28935,28936,28939,28940,28941,28942,28943,28945,28946,28948,28951,28955,28956,28957,28958,28959,28960,28961,28962,28963,28964,28965,28967,28968,28969,28970,28971,28972,28973,28974,28978,28979,28980,28981,28983,28984,28985,28986,28987,28988,28989,28990,28991,28992,28993,28994,28995,28996,28998,28999,29000,29001,29003,29005,29007,29008,29009,29010,29011,29012,29013,29014,29015,29016,29017,29018,29019,29021,29023,29024,29025,29026,29027,29029,29033,29034,29035,29036,29037,29039,29040,29041,29044,29045,29046,29047,29049,29051,29052,29054,29055,29056,29057,29058,29059,29061,29062,29063,29064,29065,29067,29068,29069,29070,29072,29073,29074,29075,29077,29078,29079,29082,29083,29084,29085,29086,29089,29090,29091,29092,29093,29094,29095,29097,29098,29099,29101,29102,29103,29104,29105,29106,29108,29110,29111,29112,29114,29115,29116,29117,29118,29119,29120,29121,29122,29124,29125,29126,29127,29128,29129,29130,29131,29132,29133,29135,29136,29137,29138,29139,29142,29143,29144,29145,29146,29147,29148,29149,29150,29151,29153,29154,29155,29156,29158,29160,29161,29162,29163,29164,29165,29167,29168,29169,29170,29171,29172,29173,29174,29175,29176,29178,29179,29180,29181,29182,29183,29184,29185,29186,29187,29188,29189,29191,29192,29193,29194,29195,29196,29197,29198,29199,29200,29201,29202,29203,29204,29205,29206,29207,29208,29209,29210,29211,29212,29214,29215,29216,29217,29218,29219,29220,29221,29222,29223,29225,29227,29229,29230,29231,29234,29235,29236,29242,29244,29246,29248,29249,29250,29251,29252,29253,29254,29257,29258,29259,29262,29263,29264,29265,29267,29268,29269,29271,29272,29274,29276,29278,29280,29283,29284,29285,29288,29290,29291,29292,29293,29296,29297,29299,29300,29302,29303,29304,29307,29308,29309,29314,29315,29317,29318,29319,29320,29321,29324,29326,29328,29329,29331,29332,29333,29334,29335,29336,29337,29338,29339,29340,29341,29342,29344,29345,29346,29347,29348,29349,29350,29351,29352,29353,29354,29355,29358,29361,29362,29363,29365,29370,29371,29372,29373,29374,29375,29376,29381,29382,29383,29385,29386,29387,29388,29391,29393,29395,29396,29397,29398,29400,29402,29403,58566,58567,58568,58569,58570,58571,58572,58573,58574,58575,58576,58577,58578,58579,58580,58581,58582,58583,58584,58585,58586,58587,58588,58589,58590,58591,58592,58593,58594,58595,58596,58597,58598,58599,58600,58601,58602,58603,58604,58605,58606,58607,58608,58609,58610,58611,58612,58613,58614,58615,58616,58617,58618,58619,58620,58621,58622,58623,58624,58625,58626,58627,58628,58629,58630,58631,58632,58633,58634,58635,58636,58637,58638,58639,58640,58641,58642,58643,58644,58645,58646,58647,58648,58649,58650,58651,58652,58653,58654,58655,58656,58657,58658,58659,58660,58661,12288,12289,12290,183,713,711,168,12291,12293,8212,65374,8214,8230,8216,8217,8220,8221,12308,12309,12296,12297,12298,12299,12300,12301,12302,12303,12310,12311,12304,12305,177,215,247,8758,8743,8744,8721,8719,8746,8745,8712,8759,8730,8869,8741,8736,8978,8857,8747,8750,8801,8780,8776,8765,8733,8800,8814,8815,8804,8805,8734,8757,8756,9794,9792,176,8242,8243,8451,65284,164,65504,65505,8240,167,8470,9734,9733,9675,9679,9678,9671,9670,9633,9632,9651,9650,8251,8594,8592,8593,8595,12307,58662,58663,58664,58665,58666,58667,58668,58669,58670,58671,58672,58673,58674,58675,58676,58677,58678,58679,58680,58681,58682,58683,58684,58685,58686,58687,58688,58689,58690,58691,58692,58693,58694,58695,58696,58697,58698,58699,58700,58701,58702,58703,58704,58705,58706,58707,58708,58709,58710,58711,58712,58713,58714,58715,58716,58717,58718,58719,58720,58721,58722,58723,58724,58725,58726,58727,58728,58729,58730,58731,58732,58733,58734,58735,58736,58737,58738,58739,58740,58741,58742,58743,58744,58745,58746,58747,58748,58749,58750,58751,58752,58753,58754,58755,58756,58757,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,59238,59239,59240,59241,59242,59243,9352,9353,9354,9355,9356,9357,9358,9359,9360,9361,9362,9363,9364,9365,9366,9367,9368,9369,9370,9371,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345,9346,9347,9348,9349,9350,9351,9312,9313,9314,9315,9316,9317,9318,9319,9320,9321,8364,59245,12832,12833,12834,12835,12836,12837,12838,12839,12840,12841,59246,59247,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554,8555,59248,59249,58758,58759,58760,58761,58762,58763,58764,58765,58766,58767,58768,58769,58770,58771,58772,58773,58774,58775,58776,58777,58778,58779,58780,58781,58782,58783,58784,58785,58786,58787,58788,58789,58790,58791,58792,58793,58794,58795,58796,58797,58798,58799,58800,58801,58802,58803,58804,58805,58806,58807,58808,58809,58810,58811,58812,58813,58814,58815,58816,58817,58818,58819,58820,58821,58822,58823,58824,58825,58826,58827,58828,58829,58830,58831,58832,58833,58834,58835,58836,58837,58838,58839,58840,58841,58842,58843,58844,58845,58846,58847,58848,58849,58850,58851,58852,12288,65281,65282,65283,65509,65285,65286,65287,65288,65289,65290,65291,65292,65293,65294,65295,65296,65297,65298,65299,65300,65301,65302,65303,65304,65305,65306,65307,65308,65309,65310,65311,65312,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,65339,65340,65341,65342,65343,65344,65345,65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,65371,65372,65373,65507,58854,58855,58856,58857,58858,58859,58860,58861,58862,58863,58864,58865,58866,58867,58868,58869,58870,58871,58872,58873,58874,58875,58876,58877,58878,58879,58880,58881,58882,58883,58884,58885,58886,58887,58888,58889,58890,58891,58892,58893,58894,58895,58896,58897,58898,58899,58900,58901,58902,58903,58904,58905,58906,58907,58908,58909,58910,58911,58912,58913,58914,58915,58916,58917,58918,58919,58920,58921,58922,58923,58924,58925,58926,58927,58928,58929,58930,58931,58932,58933,58934,58935,58936,58937,58938,58939,58940,58941,58942,58943,58944,58945,58946,58947,58948,58949,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,59250,59251,59252,59253,59254,59255,59256,59257,59258,59259,59260,58950,58951,58952,58953,58954,58955,58956,58957,58958,58959,58960,58961,58962,58963,58964,58965,58966,58967,58968,58969,58970,58971,58972,58973,58974,58975,58976,58977,58978,58979,58980,58981,58982,58983,58984,58985,58986,58987,58988,58989,58990,58991,58992,58993,58994,58995,58996,58997,58998,58999,59000,59001,59002,59003,59004,59005,59006,59007,59008,59009,59010,59011,59012,59013,59014,59015,59016,59017,59018,59019,59020,59021,59022,59023,59024,59025,59026,59027,59028,59029,59030,59031,59032,59033,59034,59035,59036,59037,59038,59039,59040,59041,59042,59043,59044,59045,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,59261,59262,59263,59264,59265,59266,59267,59268,59046,59047,59048,59049,59050,59051,59052,59053,59054,59055,59056,59057,59058,59059,59060,59061,59062,59063,59064,59065,59066,59067,59068,59069,59070,59071,59072,59073,59074,59075,59076,59077,59078,59079,59080,59081,59082,59083,59084,59085,59086,59087,59088,59089,59090,59091,59092,59093,59094,59095,59096,59097,59098,59099,59100,59101,59102,59103,59104,59105,59106,59107,59108,59109,59110,59111,59112,59113,59114,59115,59116,59117,59118,59119,59120,59121,59122,59123,59124,59125,59126,59127,59128,59129,59130,59131,59132,59133,59134,59135,59136,59137,59138,59139,59140,59141,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,59269,59270,59271,59272,59273,59274,59275,59276,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,59277,59278,59279,59280,59281,59282,59283,65077,65078,65081,65082,65087,65088,65085,65086,65089,65090,65091,65092,59284,59285,65083,65084,65079,65080,65073,59286,65075,65076,59287,59288,59289,59290,59291,59292,59293,59294,59295,59142,59143,59144,59145,59146,59147,59148,59149,59150,59151,59152,59153,59154,59155,59156,59157,59158,59159,59160,59161,59162,59163,59164,59165,59166,59167,59168,59169,59170,59171,59172,59173,59174,59175,59176,59177,59178,59179,59180,59181,59182,59183,59184,59185,59186,59187,59188,59189,59190,59191,59192,59193,59194,59195,59196,59197,59198,59199,59200,59201,59202,59203,59204,59205,59206,59207,59208,59209,59210,59211,59212,59213,59214,59215,59216,59217,59218,59219,59220,59221,59222,59223,59224,59225,59226,59227,59228,59229,59230,59231,59232,59233,59234,59235,59236,59237,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,59296,59297,59298,59299,59300,59301,59302,59303,59304,59305,59306,59307,59308,59309,59310,1072,1073,1074,1075,1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,59311,59312,59313,59314,59315,59316,59317,59318,59319,59320,59321,59322,59323,714,715,729,8211,8213,8229,8245,8453,8457,8598,8599,8600,8601,8725,8735,8739,8786,8806,8807,8895,9552,9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566,9567,9568,9569,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,9581,9582,9583,9584,9585,9586,9587,9601,9602,9603,9604,9605,9606,9607,9608,9609,9610,9611,9612,9613,9614,9615,9619,9620,9621,9660,9661,9698,9699,9700,9701,9737,8853,12306,12317,12318,59324,59325,59326,59327,59328,59329,59330,59331,59332,59333,59334,257,225,462,224,275,233,283,232,299,237,464,236,333,243,466,242,363,250,468,249,470,472,474,476,252,234,593,7743,324,328,505,609,59337,59338,59339,59340,12549,12550,12551,12552,12553,12554,12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570,12571,12572,12573,12574,12575,12576,12577,12578,12579,12580,12581,12582,12583,12584,12585,59341,59342,59343,59344,59345,59346,59347,59348,59349,59350,59351,59352,59353,59354,59355,59356,59357,59358,59359,59360,59361,12321,12322,12323,12324,12325,12326,12327,12328,12329,12963,13198,13199,13212,13213,13214,13217,13252,13262,13265,13266,13269,65072,65506,65508,59362,8481,12849,59363,8208,59364,59365,59366,12540,12443,12444,12541,12542,12294,12445,12446,65097,65098,65099,65100,65101,65102,65103,65104,65105,65106,65108,65109,65110,65111,65113,65114,65115,65116,65117,65118,65119,65120,65121,65122,65123,65124,65125,65126,65128,65129,65130,65131,12350,12272,12273,12274,12275,12276,12277,12278,12279,12280,12281,12282,12283,12295,59380,59381,59382,59383,59384,59385,59386,59387,59388,59389,59390,59391,59392,9472,9473,9474,9475,9476,9477,9478,9479,9480,9481,9482,9483,9484,9485,9486,9487,9488,9489,9490,9491,9492,9493,9494,9495,9496,9497,9498,9499,9500,9501,9502,9503,9504,9505,9506,9507,9508,9509,9510,9511,9512,9513,9514,9515,9516,9517,9518,9519,9520,9521,9522,9523,9524,9525,9526,9527,9528,9529,9530,9531,9532,9533,9534,9535,9536,9537,9538,9539,9540,9541,9542,9543,9544,9545,9546,9547,59393,59394,59395,59396,59397,59398,59399,59400,59401,59402,59403,59404,59405,59406,59407,29404,29405,29407,29410,29411,29412,29413,29414,29415,29418,29419,29429,29430,29433,29437,29438,29439,29440,29442,29444,29445,29446,29447,29448,29449,29451,29452,29453,29455,29456,29457,29458,29460,29464,29465,29466,29471,29472,29475,29476,29478,29479,29480,29485,29487,29488,29490,29491,29493,29494,29498,29499,29500,29501,29504,29505,29506,29507,29508,29509,29510,29511,29512,29513,29514,29515,29516,29518,29519,29521,29523,29524,29525,29526,29528,29529,29530,29531,29532,29533,29534,29535,29537,29538,29539,29540,29541,29542,29543,29544,29545,29546,29547,29550,29552,29553,57344,57345,57346,57347,57348,57349,57350,57351,57352,57353,57354,57355,57356,57357,57358,57359,57360,57361,57362,57363,57364,57365,57366,57367,57368,57369,57370,57371,57372,57373,57374,57375,57376,57377,57378,57379,57380,57381,57382,57383,57384,57385,57386,57387,57388,57389,57390,57391,57392,57393,57394,57395,57396,57397,57398,57399,57400,57401,57402,57403,57404,57405,57406,57407,57408,57409,57410,57411,57412,57413,57414,57415,57416,57417,57418,57419,57420,57421,57422,57423,57424,57425,57426,57427,57428,57429,57430,57431,57432,57433,57434,57435,57436,57437,29554,29555,29556,29557,29558,29559,29560,29561,29562,29563,29564,29565,29567,29568,29569,29570,29571,29573,29574,29576,29578,29580,29581,29583,29584,29586,29587,29588,29589,29591,29592,29593,29594,29596,29597,29598,29600,29601,29603,29604,29605,29606,29607,29608,29610,29612,29613,29617,29620,29621,29622,29624,29625,29628,29629,29630,29631,29633,29635,29636,29637,29638,29639,29643,29644,29646,29650,29651,29652,29653,29654,29655,29656,29658,29659,29660,29661,29663,29665,29666,29667,29668,29670,29672,29674,29675,29676,29678,29679,29680,29681,29683,29684,29685,29686,29687,57438,57439,57440,57441,57442,57443,57444,57445,57446,57447,57448,57449,57450,57451,57452,57453,57454,57455,57456,57457,57458,57459,57460,57461,57462,57463,57464,57465,57466,57467,57468,57469,57470,57471,57472,57473,57474,57475,57476,57477,57478,57479,57480,57481,57482,57483,57484,57485,57486,57487,57488,57489,57490,57491,57492,57493,57494,57495,57496,57497,57498,57499,57500,57501,57502,57503,57504,57505,57506,57507,57508,57509,57510,57511,57512,57513,57514,57515,57516,57517,57518,57519,57520,57521,57522,57523,57524,57525,57526,57527,57528,57529,57530,57531,29688,29689,29690,29691,29692,29693,29694,29695,29696,29697,29698,29700,29703,29704,29707,29708,29709,29710,29713,29714,29715,29716,29717,29718,29719,29720,29721,29724,29725,29726,29727,29728,29729,29731,29732,29735,29737,29739,29741,29743,29745,29746,29751,29752,29753,29754,29755,29757,29758,29759,29760,29762,29763,29764,29765,29766,29767,29768,29769,29770,29771,29772,29773,29774,29775,29776,29777,29778,29779,29780,29782,29784,29789,29792,29793,29794,29795,29796,29797,29798,29799,29800,29801,29802,29803,29804,29806,29807,29809,29810,29811,29812,29813,29816,29817,29818,57532,57533,57534,57535,57536,57537,57538,57539,57540,57541,57542,57543,57544,57545,57546,57547,57548,57549,57550,57551,57552,57553,57554,57555,57556,57557,57558,57559,57560,57561,57562,57563,57564,57565,57566,57567,57568,57569,57570,57571,57572,57573,57574,57575,57576,57577,57578,57579,57580,57581,57582,57583,57584,57585,57586,57587,57588,57589,57590,57591,57592,57593,57594,57595,57596,57597,57598,57599,57600,57601,57602,57603,57604,57605,57606,57607,57608,57609,57610,57611,57612,57613,57614,57615,57616,57617,57618,57619,57620,57621,57622,57623,57624,57625,29819,29820,29821,29823,29826,29828,29829,29830,29832,29833,29834,29836,29837,29839,29841,29842,29843,29844,29845,29846,29847,29848,29849,29850,29851,29853,29855,29856,29857,29858,29859,29860,29861,29862,29866,29867,29868,29869,29870,29871,29872,29873,29874,29875,29876,29877,29878,29879,29880,29881,29883,29884,29885,29886,29887,29888,29889,29890,29891,29892,29893,29894,29895,29896,29897,29898,29899,29900,29901,29902,29903,29904,29905,29907,29908,29909,29910,29911,29912,29913,29914,29915,29917,29919,29921,29925,29927,29928,29929,29930,29931,29932,29933,29936,29937,29938,57626,57627,57628,57629,57630,57631,57632,57633,57634,57635,57636,57637,57638,57639,57640,57641,57642,57643,57644,57645,57646,57647,57648,57649,57650,57651,57652,57653,57654,57655,57656,57657,57658,57659,57660,57661,57662,57663,57664,57665,57666,57667,57668,57669,57670,57671,57672,57673,57674,57675,57676,57677,57678,57679,57680,57681,57682,57683,57684,57685,57686,57687,57688,57689,57690,57691,57692,57693,57694,57695,57696,57697,57698,57699,57700,57701,57702,57703,57704,57705,57706,57707,57708,57709,57710,57711,57712,57713,57714,57715,57716,57717,57718,57719,29939,29941,29944,29945,29946,29947,29948,29949,29950,29952,29953,29954,29955,29957,29958,29959,29960,29961,29962,29963,29964,29966,29968,29970,29972,29973,29974,29975,29979,29981,29982,29984,29985,29986,29987,29988,29990,29991,29994,29998,30004,30006,30009,30012,30013,30015,30017,30018,30019,30020,30022,30023,30025,30026,30029,30032,30033,30034,30035,30037,30038,30039,30040,30045,30046,30047,30048,30049,30050,30051,30052,30055,30056,30057,30059,30060,30061,30062,30063,30064,30065,30067,30069,30070,30071,30074,30075,30076,30077,30078,30080,30081,30082,30084,30085,30087,57720,57721,57722,57723,57724,57725,57726,57727,57728,57729,57730,57731,57732,57733,57734,57735,57736,57737,57738,57739,57740,57741,57742,57743,57744,57745,57746,57747,57748,57749,57750,57751,57752,57753,57754,57755,57756,57757,57758,57759,57760,57761,57762,57763,57764,57765,57766,57767,57768,57769,57770,57771,57772,57773,57774,57775,57776,57777,57778,57779,57780,57781,57782,57783,57784,57785,57786,57787,57788,57789,57790,57791,57792,57793,57794,57795,57796,57797,57798,57799,57800,57801,57802,57803,57804,57805,57806,57807,57808,57809,57810,57811,57812,57813,30088,30089,30090,30092,30093,30094,30096,30099,30101,30104,30107,30108,30110,30114,30118,30119,30120,30121,30122,30125,30134,30135,30138,30139,30143,30144,30145,30150,30155,30156,30158,30159,30160,30161,30163,30167,30169,30170,30172,30173,30175,30176,30177,30181,30185,30188,30189,30190,30191,30194,30195,30197,30198,30199,30200,30202,30203,30205,30206,30210,30212,30214,30215,30216,30217,30219,30221,30222,30223,30225,30226,30227,30228,30230,30234,30236,30237,30238,30241,30243,30247,30248,30252,30254,30255,30257,30258,30262,30263,30265,30266,30267,30269,30273,30274,30276,57814,57815,57816,57817,57818,57819,57820,57821,57822,57823,57824,57825,57826,57827,57828,57829,57830,57831,57832,57833,57834,57835,57836,57837,57838,57839,57840,57841,57842,57843,57844,57845,57846,57847,57848,57849,57850,57851,57852,57853,57854,57855,57856,57857,57858,57859,57860,57861,57862,57863,57864,57865,57866,57867,57868,57869,57870,57871,57872,57873,57874,57875,57876,57877,57878,57879,57880,57881,57882,57883,57884,57885,57886,57887,57888,57889,57890,57891,57892,57893,57894,57895,57896,57897,57898,57899,57900,57901,57902,57903,57904,57905,57906,57907,30277,30278,30279,30280,30281,30282,30283,30286,30287,30288,30289,30290,30291,30293,30295,30296,30297,30298,30299,30301,30303,30304,30305,30306,30308,30309,30310,30311,30312,30313,30314,30316,30317,30318,30320,30321,30322,30323,30324,30325,30326,30327,30329,30330,30332,30335,30336,30337,30339,30341,30345,30346,30348,30349,30351,30352,30354,30356,30357,30359,30360,30362,30363,30364,30365,30366,30367,30368,30369,30370,30371,30373,30374,30375,30376,30377,30378,30379,30380,30381,30383,30384,30387,30389,30390,30391,30392,30393,30394,30395,30396,30397,30398,30400,30401,30403,21834,38463,22467,25384,21710,21769,21696,30353,30284,34108,30702,33406,30861,29233,38552,38797,27688,23433,20474,25353,26263,23736,33018,26696,32942,26114,30414,20985,25942,29100,32753,34948,20658,22885,25034,28595,33453,25420,25170,21485,21543,31494,20843,30116,24052,25300,36299,38774,25226,32793,22365,38712,32610,29240,30333,26575,30334,25670,20336,36133,25308,31255,26001,29677,25644,25203,33324,39041,26495,29256,25198,25292,20276,29923,21322,21150,32458,37030,24110,26758,27036,33152,32465,26834,30917,34444,38225,20621,35876,33502,32990,21253,35090,21093,30404,30407,30409,30411,30412,30419,30421,30425,30426,30428,30429,30430,30432,30433,30434,30435,30436,30438,30439,30440,30441,30442,30443,30444,30445,30448,30451,30453,30454,30455,30458,30459,30461,30463,30464,30466,30467,30469,30470,30474,30476,30478,30479,30480,30481,30482,30483,30484,30485,30486,30487,30488,30491,30492,30493,30494,30497,30499,30500,30501,30503,30506,30507,30508,30510,30512,30513,30514,30515,30516,30521,30523,30525,30526,30527,30530,30532,30533,30534,30536,30537,30538,30539,30540,30541,30542,30543,30546,30547,30548,30549,30550,30551,30552,30553,30556,34180,38649,20445,22561,39281,23453,25265,25253,26292,35961,40077,29190,26479,30865,24754,21329,21271,36744,32972,36125,38049,20493,29384,22791,24811,28953,34987,22868,33519,26412,31528,23849,32503,29997,27893,36454,36856,36924,40763,27604,37145,31508,24444,30887,34006,34109,27605,27609,27606,24065,24199,30201,38381,25949,24330,24517,36767,22721,33218,36991,38491,38829,36793,32534,36140,25153,20415,21464,21342,36776,36777,36779,36941,26631,24426,33176,34920,40150,24971,21035,30250,24428,25996,28626,28392,23486,25672,20853,20912,26564,19993,31177,39292,28851,30557,30558,30559,30560,30564,30567,30569,30570,30573,30574,30575,30576,30577,30578,30579,30580,30581,30582,30583,30584,30586,30587,30588,30593,30594,30595,30598,30599,30600,30601,30602,30603,30607,30608,30611,30612,30613,30614,30615,30616,30617,30618,30619,30620,30621,30622,30625,30627,30628,30630,30632,30635,30637,30638,30639,30641,30642,30644,30646,30647,30648,30649,30650,30652,30654,30656,30657,30658,30659,30660,30661,30662,30663,30664,30665,30666,30667,30668,30670,30671,30672,30673,30674,30675,30676,30677,30678,30680,30681,30682,30685,30686,30687,30688,30689,30692,30149,24182,29627,33760,25773,25320,38069,27874,21338,21187,25615,38082,31636,20271,24091,33334,33046,33162,28196,27850,39539,25429,21340,21754,34917,22496,19981,24067,27493,31807,37096,24598,25830,29468,35009,26448,25165,36130,30572,36393,37319,24425,33756,34081,39184,21442,34453,27531,24813,24808,28799,33485,33329,20179,27815,34255,25805,31961,27133,26361,33609,21397,31574,20391,20876,27979,23618,36461,25554,21449,33580,33590,26597,30900,25661,23519,23700,24046,35815,25286,26612,35962,25600,25530,34633,39307,35863,32544,38130,20135,38416,39076,26124,29462,30694,30696,30698,30703,30704,30705,30706,30708,30709,30711,30713,30714,30715,30716,30723,30724,30725,30726,30727,30728,30730,30731,30734,30735,30736,30739,30741,30745,30747,30750,30752,30753,30754,30756,30760,30762,30763,30766,30767,30769,30770,30771,30773,30774,30781,30783,30785,30786,30787,30788,30790,30792,30793,30794,30795,30797,30799,30801,30803,30804,30808,30809,30810,30811,30812,30814,30815,30816,30817,30818,30819,30820,30821,30822,30823,30824,30825,30831,30832,30833,30834,30835,30836,30837,30838,30840,30841,30842,30843,30845,30846,30847,30848,30849,30850,30851,22330,23581,24120,38271,20607,32928,21378,25950,30021,21809,20513,36229,25220,38046,26397,22066,28526,24034,21557,28818,36710,25199,25764,25507,24443,28552,37108,33251,36784,23576,26216,24561,27785,38472,36225,34924,25745,31216,22478,27225,25104,21576,20056,31243,24809,28548,35802,25215,36894,39563,31204,21507,30196,25345,21273,27744,36831,24347,39536,32827,40831,20360,23610,36196,32709,26021,28861,20805,20914,34411,23815,23456,25277,37228,30068,36364,31264,24833,31609,20167,32504,30597,19985,33261,21021,20986,27249,21416,36487,38148,38607,28353,38500,26970,30852,30853,30854,30856,30858,30859,30863,30864,30866,30868,30869,30870,30873,30877,30878,30880,30882,30884,30886,30888,30889,30890,30891,30892,30893,30894,30895,30901,30902,30903,30904,30906,30907,30908,30909,30911,30912,30914,30915,30916,30918,30919,30920,30924,30925,30926,30927,30929,30930,30931,30934,30935,30936,30938,30939,30940,30941,30942,30943,30944,30945,30946,30947,30948,30949,30950,30951,30953,30954,30955,30957,30958,30959,30960,30961,30963,30965,30966,30968,30969,30971,30972,30973,30974,30975,30976,30978,30979,30980,30982,30983,30984,30985,30986,30987,30988,30784,20648,30679,25616,35302,22788,25571,24029,31359,26941,20256,33337,21912,20018,30126,31383,24162,24202,38383,21019,21561,28810,25462,38180,22402,26149,26943,37255,21767,28147,32431,34850,25139,32496,30133,33576,30913,38604,36766,24904,29943,35789,27492,21050,36176,27425,32874,33905,22257,21254,20174,19995,20945,31895,37259,31751,20419,36479,31713,31388,25703,23828,20652,33030,30209,31929,28140,32736,26449,23384,23544,30923,25774,25619,25514,25387,38169,25645,36798,31572,30249,25171,22823,21574,27513,20643,25140,24102,27526,20195,36151,34955,24453,36910,30989,30990,30991,30992,30993,30994,30996,30997,30998,30999,31000,31001,31002,31003,31004,31005,31007,31008,31009,31010,31011,31013,31014,31015,31016,31017,31018,31019,31020,31021,31022,31023,31024,31025,31026,31027,31029,31030,31031,31032,31033,31037,31039,31042,31043,31044,31045,31047,31050,31051,31052,31053,31054,31055,31056,31057,31058,31060,31061,31064,31065,31073,31075,31076,31078,31081,31082,31083,31084,31086,31088,31089,31090,31091,31092,31093,31094,31097,31099,31100,31101,31102,31103,31106,31107,31110,31111,31112,31113,31115,31116,31117,31118,31120,31121,31122,24608,32829,25285,20025,21333,37112,25528,32966,26086,27694,20294,24814,28129,35806,24377,34507,24403,25377,20826,33633,26723,20992,25443,36424,20498,23707,31095,23548,21040,31291,24764,36947,30423,24503,24471,30340,36460,28783,30331,31561,30634,20979,37011,22564,20302,28404,36842,25932,31515,29380,28068,32735,23265,25269,24213,22320,33922,31532,24093,24351,36882,32532,39072,25474,28359,30872,28857,20856,38747,22443,30005,20291,30008,24215,24806,22880,28096,27583,30857,21500,38613,20939,20993,25481,21514,38035,35843,36300,29241,30879,34678,36845,35853,21472,31123,31124,31125,31126,31127,31128,31129,31131,31132,31133,31134,31135,31136,31137,31138,31139,31140,31141,31142,31144,31145,31146,31147,31148,31149,31150,31151,31152,31153,31154,31156,31157,31158,31159,31160,31164,31167,31170,31172,31173,31175,31176,31178,31180,31182,31183,31184,31187,31188,31190,31191,31193,31194,31195,31196,31197,31198,31200,31201,31202,31205,31208,31210,31212,31214,31217,31218,31219,31220,31221,31222,31223,31225,31226,31228,31230,31231,31233,31236,31237,31239,31240,31241,31242,31244,31247,31248,31249,31250,31251,31253,31254,31256,31257,31259,31260,19969,30447,21486,38025,39030,40718,38189,23450,35746,20002,19996,20908,33891,25026,21160,26635,20375,24683,20923,27934,20828,25238,26007,38497,35910,36887,30168,37117,30563,27602,29322,29420,35835,22581,30585,36172,26460,38208,32922,24230,28193,22930,31471,30701,38203,27573,26029,32526,22534,20817,38431,23545,22697,21544,36466,25958,39039,22244,38045,30462,36929,25479,21702,22810,22842,22427,36530,26421,36346,33333,21057,24816,22549,34558,23784,40517,20420,39069,35769,23077,24694,21380,25212,36943,37122,39295,24681,32780,20799,32819,23572,39285,27953,20108,31261,31263,31265,31266,31268,31269,31270,31271,31272,31273,31274,31275,31276,31277,31278,31279,31280,31281,31282,31284,31285,31286,31288,31290,31294,31296,31297,31298,31299,31300,31301,31303,31304,31305,31306,31307,31308,31309,31310,31311,31312,31314,31315,31316,31317,31318,31320,31321,31322,31323,31324,31325,31326,31327,31328,31329,31330,31331,31332,31333,31334,31335,31336,31337,31338,31339,31340,31341,31342,31343,31345,31346,31347,31349,31355,31356,31357,31358,31362,31365,31367,31369,31370,31371,31372,31374,31375,31376,31379,31380,31385,31386,31387,31390,31393,31394,36144,21457,32602,31567,20240,20047,38400,27861,29648,34281,24070,30058,32763,27146,30718,38034,32321,20961,28902,21453,36820,33539,36137,29359,39277,27867,22346,33459,26041,32938,25151,38450,22952,20223,35775,32442,25918,33778,38750,21857,39134,32933,21290,35837,21536,32954,24223,27832,36153,33452,37210,21545,27675,20998,32439,22367,28954,27774,31881,22859,20221,24575,24868,31914,20016,23553,26539,34562,23792,38155,39118,30127,28925,36898,20911,32541,35773,22857,20964,20315,21542,22827,25975,32932,23413,25206,25282,36752,24133,27679,31526,20239,20440,26381,31395,31396,31399,31401,31402,31403,31406,31407,31408,31409,31410,31412,31413,31414,31415,31416,31417,31418,31419,31420,31421,31422,31424,31425,31426,31427,31428,31429,31430,31431,31432,31433,31434,31436,31437,31438,31439,31440,31441,31442,31443,31444,31445,31447,31448,31450,31451,31452,31453,31457,31458,31460,31463,31464,31465,31466,31467,31468,31470,31472,31473,31474,31475,31476,31477,31478,31479,31480,31483,31484,31486,31488,31489,31490,31493,31495,31497,31500,31501,31502,31504,31506,31507,31510,31511,31512,31514,31516,31517,31519,31521,31522,31523,31527,31529,31533,28014,28074,31119,34993,24343,29995,25242,36741,20463,37340,26023,33071,33105,24220,33104,36212,21103,35206,36171,22797,20613,20184,38428,29238,33145,36127,23500,35747,38468,22919,32538,21648,22134,22030,35813,25913,27010,38041,30422,28297,24178,29976,26438,26577,31487,32925,36214,24863,31174,25954,36195,20872,21018,38050,32568,32923,32434,23703,28207,26464,31705,30347,39640,33167,32660,31957,25630,38224,31295,21578,21733,27468,25601,25096,40509,33011,30105,21106,38761,33883,26684,34532,38401,38548,38124,20010,21508,32473,26681,36319,32789,26356,24218,32697,31535,31536,31538,31540,31541,31542,31543,31545,31547,31549,31551,31552,31553,31554,31555,31556,31558,31560,31562,31565,31566,31571,31573,31575,31577,31580,31582,31583,31585,31587,31588,31589,31590,31591,31592,31593,31594,31595,31596,31597,31599,31600,31603,31604,31606,31608,31610,31612,31613,31615,31617,31618,31619,31620,31622,31623,31624,31625,31626,31627,31628,31630,31631,31633,31634,31635,31638,31640,31641,31642,31643,31646,31647,31648,31651,31652,31653,31662,31663,31664,31666,31667,31669,31670,31671,31673,31674,31675,31676,31677,31678,31679,31680,31682,31683,31684,22466,32831,26775,24037,25915,21151,24685,40858,20379,36524,20844,23467,24339,24041,27742,25329,36129,20849,38057,21246,27807,33503,29399,22434,26500,36141,22815,36764,33735,21653,31629,20272,27837,23396,22993,40723,21476,34506,39592,35895,32929,25925,39038,22266,38599,21038,29916,21072,23521,25346,35074,20054,25296,24618,26874,20851,23448,20896,35266,31649,39302,32592,24815,28748,36143,20809,24191,36891,29808,35268,22317,30789,24402,40863,38394,36712,39740,35809,30328,26690,26588,36330,36149,21053,36746,28378,26829,38149,37101,22269,26524,35065,36807,21704,31685,31688,31689,31690,31691,31693,31694,31695,31696,31698,31700,31701,31702,31703,31704,31707,31708,31710,31711,31712,31714,31715,31716,31719,31720,31721,31723,31724,31725,31727,31728,31730,31731,31732,31733,31734,31736,31737,31738,31739,31741,31743,31744,31745,31746,31747,31748,31749,31750,31752,31753,31754,31757,31758,31760,31761,31762,31763,31764,31765,31767,31768,31769,31770,31771,31772,31773,31774,31776,31777,31778,31779,31780,31781,31784,31785,31787,31788,31789,31790,31791,31792,31793,31794,31795,31796,31797,31798,31799,31801,31802,31803,31804,31805,31806,31810,39608,23401,28023,27686,20133,23475,39559,37219,25000,37039,38889,21547,28085,23506,20989,21898,32597,32752,25788,25421,26097,25022,24717,28938,27735,27721,22831,26477,33322,22741,22158,35946,27627,37085,22909,32791,21495,28009,21621,21917,33655,33743,26680,31166,21644,20309,21512,30418,35977,38402,27827,28088,36203,35088,40548,36154,22079,40657,30165,24456,29408,24680,21756,20136,27178,34913,24658,36720,21700,28888,34425,40511,27946,23439,24344,32418,21897,20399,29492,21564,21402,20505,21518,21628,20046,24573,29786,22774,33899,32993,34676,29392,31946,28246,31811,31812,31813,31814,31815,31816,31817,31818,31819,31820,31822,31823,31824,31825,31826,31827,31828,31829,31830,31831,31832,31833,31834,31835,31836,31837,31838,31839,31840,31841,31842,31843,31844,31845,31846,31847,31848,31849,31850,31851,31852,31853,31854,31855,31856,31857,31858,31861,31862,31863,31864,31865,31866,31870,31871,31872,31873,31874,31875,31876,31877,31878,31879,31880,31882,31883,31884,31885,31886,31887,31888,31891,31892,31894,31897,31898,31899,31904,31905,31907,31910,31911,31912,31913,31915,31916,31917,31919,31920,31924,31925,31926,31927,31928,31930,31931,24359,34382,21804,25252,20114,27818,25143,33457,21719,21326,29502,28369,30011,21010,21270,35805,27088,24458,24576,28142,22351,27426,29615,26707,36824,32531,25442,24739,21796,30186,35938,28949,28067,23462,24187,33618,24908,40644,30970,34647,31783,30343,20976,24822,29004,26179,24140,24653,35854,28784,25381,36745,24509,24674,34516,22238,27585,24724,24935,21321,24800,26214,36159,31229,20250,28905,27719,35763,35826,32472,33636,26127,23130,39746,27985,28151,35905,27963,20249,28779,33719,25110,24785,38669,36135,31096,20987,22334,22522,26426,30072,31293,31215,31637,31935,31936,31938,31939,31940,31942,31945,31947,31950,31951,31952,31953,31954,31955,31956,31960,31962,31963,31965,31966,31969,31970,31971,31972,31973,31974,31975,31977,31978,31979,31980,31981,31982,31984,31985,31986,31987,31988,31989,31990,31991,31993,31994,31996,31997,31998,31999,32000,32001,32002,32003,32004,32005,32006,32007,32008,32009,32011,32012,32013,32014,32015,32016,32017,32018,32019,32020,32021,32022,32023,32024,32025,32026,32027,32028,32029,32030,32031,32033,32035,32036,32037,32038,32040,32041,32042,32044,32045,32046,32048,32049,32050,32051,32052,32053,32054,32908,39269,36857,28608,35749,40481,23020,32489,32521,21513,26497,26840,36753,31821,38598,21450,24613,30142,27762,21363,23241,32423,25380,20960,33034,24049,34015,25216,20864,23395,20238,31085,21058,24760,27982,23492,23490,35745,35760,26082,24524,38469,22931,32487,32426,22025,26551,22841,20339,23478,21152,33626,39050,36158,30002,38078,20551,31292,20215,26550,39550,23233,27516,30417,22362,23574,31546,38388,29006,20860,32937,33392,22904,32516,33575,26816,26604,30897,30839,25315,25441,31616,20461,21098,20943,33616,27099,37492,36341,36145,35265,38190,31661,20214,32055,32056,32057,32058,32059,32060,32061,32062,32063,32064,32065,32066,32067,32068,32069,32070,32071,32072,32073,32074,32075,32076,32077,32078,32079,32080,32081,32082,32083,32084,32085,32086,32087,32088,32089,32090,32091,32092,32093,32094,32095,32096,32097,32098,32099,32100,32101,32102,32103,32104,32105,32106,32107,32108,32109,32111,32112,32113,32114,32115,32116,32117,32118,32120,32121,32122,32123,32124,32125,32126,32127,32128,32129,32130,32131,32132,32133,32134,32135,32136,32137,32138,32139,32140,32141,32142,32143,32144,32145,32146,32147,32148,32149,32150,32151,32152,20581,33328,21073,39279,28176,28293,28071,24314,20725,23004,23558,27974,27743,30086,33931,26728,22870,35762,21280,37233,38477,34121,26898,30977,28966,33014,20132,37066,27975,39556,23047,22204,25605,38128,30699,20389,33050,29409,35282,39290,32564,32478,21119,25945,37237,36735,36739,21483,31382,25581,25509,30342,31224,34903,38454,25130,21163,33410,26708,26480,25463,30571,31469,27905,32467,35299,22992,25106,34249,33445,30028,20511,20171,30117,35819,23626,24062,31563,26020,37329,20170,27941,35167,32039,38182,20165,35880,36827,38771,26187,31105,36817,28908,28024,32153,32154,32155,32156,32157,32158,32159,32160,32161,32162,32163,32164,32165,32167,32168,32169,32170,32171,32172,32173,32175,32176,32177,32178,32179,32180,32181,32182,32183,32184,32185,32186,32187,32188,32189,32190,32191,32192,32193,32194,32195,32196,32197,32198,32199,32200,32201,32202,32203,32204,32205,32206,32207,32208,32209,32210,32211,32212,32213,32214,32215,32216,32217,32218,32219,32220,32221,32222,32223,32224,32225,32226,32227,32228,32229,32230,32231,32232,32233,32234,32235,32236,32237,32238,32239,32240,32241,32242,32243,32244,32245,32246,32247,32248,32249,32250,23613,21170,33606,20834,33550,30555,26230,40120,20140,24778,31934,31923,32463,20117,35686,26223,39048,38745,22659,25964,38236,24452,30153,38742,31455,31454,20928,28847,31384,25578,31350,32416,29590,38893,20037,28792,20061,37202,21417,25937,26087,33276,33285,21646,23601,30106,38816,25304,29401,30141,23621,39545,33738,23616,21632,30697,20030,27822,32858,25298,25454,24040,20855,36317,36382,38191,20465,21477,24807,28844,21095,25424,40515,23071,20518,30519,21367,32482,25733,25899,25225,25496,20500,29237,35273,20915,35776,32477,22343,33740,38055,20891,21531,23803,32251,32252,32253,32254,32255,32256,32257,32258,32259,32260,32261,32262,32263,32264,32265,32266,32267,32268,32269,32270,32271,32272,32273,32274,32275,32276,32277,32278,32279,32280,32281,32282,32283,32284,32285,32286,32287,32288,32289,32290,32291,32292,32293,32294,32295,32296,32297,32298,32299,32300,32301,32302,32303,32304,32305,32306,32307,32308,32309,32310,32311,32312,32313,32314,32316,32317,32318,32319,32320,32322,32323,32324,32325,32326,32328,32329,32330,32331,32332,32333,32334,32335,32336,32337,32338,32339,32340,32341,32342,32343,32344,32345,32346,32347,32348,32349,20426,31459,27994,37089,39567,21888,21654,21345,21679,24320,25577,26999,20975,24936,21002,22570,21208,22350,30733,30475,24247,24951,31968,25179,25239,20130,28821,32771,25335,28900,38752,22391,33499,26607,26869,30933,39063,31185,22771,21683,21487,28212,20811,21051,23458,35838,32943,21827,22438,24691,22353,21549,31354,24656,23380,25511,25248,21475,25187,23495,26543,21741,31391,33510,37239,24211,35044,22840,22446,25358,36328,33007,22359,31607,20393,24555,23485,27454,21281,31568,29378,26694,30719,30518,26103,20917,20111,30420,23743,31397,33909,22862,39745,20608,32350,32351,32352,32353,32354,32355,32356,32357,32358,32359,32360,32361,32362,32363,32364,32365,32366,32367,32368,32369,32370,32371,32372,32373,32374,32375,32376,32377,32378,32379,32380,32381,32382,32383,32384,32385,32387,32388,32389,32390,32391,32392,32393,32394,32395,32396,32397,32398,32399,32400,32401,32402,32403,32404,32405,32406,32407,32408,32409,32410,32412,32413,32414,32430,32436,32443,32444,32470,32484,32492,32505,32522,32528,32542,32567,32569,32571,32572,32573,32574,32575,32576,32577,32579,32582,32583,32584,32585,32586,32587,32588,32589,32590,32591,32594,32595,39304,24871,28291,22372,26118,25414,22256,25324,25193,24275,38420,22403,25289,21895,34593,33098,36771,21862,33713,26469,36182,34013,23146,26639,25318,31726,38417,20848,28572,35888,25597,35272,25042,32518,28866,28389,29701,27028,29436,24266,37070,26391,28010,25438,21171,29282,32769,20332,23013,37226,28889,28061,21202,20048,38647,38253,34174,30922,32047,20769,22418,25794,32907,31867,27882,26865,26974,20919,21400,26792,29313,40654,31729,29432,31163,28435,29702,26446,37324,40100,31036,33673,33620,21519,26647,20029,21385,21169,30782,21382,21033,20616,20363,20432,32598,32601,32603,32604,32605,32606,32608,32611,32612,32613,32614,32615,32619,32620,32621,32623,32624,32627,32629,32630,32631,32632,32634,32635,32636,32637,32639,32640,32642,32643,32644,32645,32646,32647,32648,32649,32651,32653,32655,32656,32657,32658,32659,32661,32662,32663,32664,32665,32667,32668,32672,32674,32675,32677,32678,32680,32681,32682,32683,32684,32685,32686,32689,32691,32692,32693,32694,32695,32698,32699,32702,32704,32706,32707,32708,32710,32711,32712,32713,32715,32717,32719,32720,32721,32722,32723,32726,32727,32729,32730,32731,32732,32733,32734,32738,32739,30178,31435,31890,27813,38582,21147,29827,21737,20457,32852,33714,36830,38256,24265,24604,28063,24088,25947,33080,38142,24651,28860,32451,31918,20937,26753,31921,33391,20004,36742,37327,26238,20142,35845,25769,32842,20698,30103,29134,23525,36797,28518,20102,25730,38243,24278,26009,21015,35010,28872,21155,29454,29747,26519,30967,38678,20020,37051,40158,28107,20955,36161,21533,25294,29618,33777,38646,40836,38083,20278,32666,20940,28789,38517,23725,39046,21478,20196,28316,29705,27060,30827,39311,30041,21016,30244,27969,26611,20845,40857,32843,21657,31548,31423,32740,32743,32744,32746,32747,32748,32749,32751,32754,32756,32757,32758,32759,32760,32761,32762,32765,32766,32767,32770,32775,32776,32777,32778,32782,32783,32785,32787,32794,32795,32797,32798,32799,32801,32803,32804,32811,32812,32813,32814,32815,32816,32818,32820,32825,32826,32828,32830,32832,32833,32836,32837,32839,32840,32841,32846,32847,32848,32849,32851,32853,32854,32855,32857,32859,32860,32861,32862,32863,32864,32865,32866,32867,32868,32869,32870,32871,32872,32875,32876,32877,32878,32879,32880,32882,32883,32884,32885,32886,32887,32888,32889,32890,32891,32892,32893,38534,22404,25314,38471,27004,23044,25602,31699,28431,38475,33446,21346,39045,24208,28809,25523,21348,34383,40065,40595,30860,38706,36335,36162,40575,28510,31108,24405,38470,25134,39540,21525,38109,20387,26053,23653,23649,32533,34385,27695,24459,29575,28388,32511,23782,25371,23402,28390,21365,20081,25504,30053,25249,36718,20262,20177,27814,32438,35770,33821,34746,32599,36923,38179,31657,39585,35064,33853,27931,39558,32476,22920,40635,29595,30721,34434,39532,39554,22043,21527,22475,20080,40614,21334,36808,33033,30610,39314,34542,28385,34067,26364,24930,28459,32894,32897,32898,32901,32904,32906,32909,32910,32911,32912,32913,32914,32916,32917,32919,32921,32926,32931,32934,32935,32936,32940,32944,32947,32949,32950,32952,32953,32955,32965,32967,32968,32969,32970,32971,32975,32976,32977,32978,32979,32980,32981,32984,32991,32992,32994,32995,32998,33006,33013,33015,33017,33019,33022,33023,33024,33025,33027,33028,33029,33031,33032,33035,33036,33045,33047,33049,33051,33052,33053,33055,33056,33057,33058,33059,33060,33061,33062,33063,33064,33065,33066,33067,33069,33070,33072,33075,33076,33077,33079,33081,33082,33083,33084,33085,33087,35881,33426,33579,30450,27667,24537,33725,29483,33541,38170,27611,30683,38086,21359,33538,20882,24125,35980,36152,20040,29611,26522,26757,37238,38665,29028,27809,30473,23186,38209,27599,32654,26151,23504,22969,23194,38376,38391,20204,33804,33945,27308,30431,38192,29467,26790,23391,30511,37274,38753,31964,36855,35868,24357,31859,31192,35269,27852,34588,23494,24130,26825,30496,32501,20885,20813,21193,23081,32517,38754,33495,25551,30596,34256,31186,28218,24217,22937,34065,28781,27665,25279,30399,25935,24751,38397,26126,34719,40483,38125,21517,21629,35884,25720,33088,33089,33090,33091,33092,33093,33095,33097,33101,33102,33103,33106,33110,33111,33112,33115,33116,33117,33118,33119,33121,33122,33123,33124,33126,33128,33130,33131,33132,33135,33138,33139,33141,33142,33143,33144,33153,33155,33156,33157,33158,33159,33161,33163,33164,33165,33166,33168,33170,33171,33172,33173,33174,33175,33177,33178,33182,33183,33184,33185,33186,33188,33189,33191,33193,33195,33196,33197,33198,33199,33200,33201,33202,33204,33205,33206,33207,33208,33209,33212,33213,33214,33215,33220,33221,33223,33224,33225,33227,33229,33230,33231,33232,33233,33234,33235,25721,34321,27169,33180,30952,25705,39764,25273,26411,33707,22696,40664,27819,28448,23518,38476,35851,29279,26576,25287,29281,20137,22982,27597,22675,26286,24149,21215,24917,26408,30446,30566,29287,31302,25343,21738,21584,38048,37027,23068,32435,27670,20035,22902,32784,22856,21335,30007,38590,22218,25376,33041,24700,38393,28118,21602,39297,20869,23273,33021,22958,38675,20522,27877,23612,25311,20320,21311,33147,36870,28346,34091,25288,24180,30910,25781,25467,24565,23064,37247,40479,23615,25423,32834,23421,21870,38218,38221,28037,24744,26592,29406,20957,23425,33236,33237,33238,33239,33240,33241,33242,33243,33244,33245,33246,33247,33248,33249,33250,33252,33253,33254,33256,33257,33259,33262,33263,33264,33265,33266,33269,33270,33271,33272,33273,33274,33277,33279,33283,33287,33288,33289,33290,33291,33294,33295,33297,33299,33301,33302,33303,33304,33305,33306,33309,33312,33316,33317,33318,33319,33321,33326,33330,33338,33340,33341,33343,33344,33345,33346,33347,33349,33350,33352,33354,33356,33357,33358,33360,33361,33362,33363,33364,33365,33366,33367,33369,33371,33372,33373,33374,33376,33377,33378,33379,33380,33381,33382,33383,33385,25319,27870,29275,25197,38062,32445,33043,27987,20892,24324,22900,21162,24594,22899,26262,34384,30111,25386,25062,31983,35834,21734,27431,40485,27572,34261,21589,20598,27812,21866,36276,29228,24085,24597,29750,25293,25490,29260,24472,28227,27966,25856,28504,30424,30928,30460,30036,21028,21467,20051,24222,26049,32810,32982,25243,21638,21032,28846,34957,36305,27873,21624,32986,22521,35060,36180,38506,37197,20329,27803,21943,30406,30768,25256,28921,28558,24429,34028,26842,30844,31735,33192,26379,40527,25447,30896,22383,30738,38713,25209,25259,21128,29749,27607,33386,33387,33388,33389,33393,33397,33398,33399,33400,33403,33404,33408,33409,33411,33413,33414,33415,33417,33420,33424,33427,33428,33429,33430,33434,33435,33438,33440,33442,33443,33447,33458,33461,33462,33466,33467,33468,33471,33472,33474,33475,33477,33478,33481,33488,33494,33497,33498,33501,33506,33511,33512,33513,33514,33516,33517,33518,33520,33522,33523,33525,33526,33528,33530,33532,33533,33534,33535,33536,33546,33547,33549,33552,33554,33555,33558,33560,33561,33565,33566,33567,33568,33569,33570,33571,33572,33573,33574,33577,33578,33582,33584,33586,33591,33595,33597,21860,33086,30130,30382,21305,30174,20731,23617,35692,31687,20559,29255,39575,39128,28418,29922,31080,25735,30629,25340,39057,36139,21697,32856,20050,22378,33529,33805,24179,20973,29942,35780,23631,22369,27900,39047,23110,30772,39748,36843,31893,21078,25169,38138,20166,33670,33889,33769,33970,22484,26420,22275,26222,28006,35889,26333,28689,26399,27450,26646,25114,22971,19971,20932,28422,26578,27791,20854,26827,22855,27495,30054,23822,33040,40784,26071,31048,31041,39569,36215,23682,20062,20225,21551,22865,30732,22120,27668,36804,24323,27773,27875,35755,25488,33598,33599,33601,33602,33604,33605,33608,33610,33611,33612,33613,33614,33619,33621,33622,33623,33624,33625,33629,33634,33648,33649,33650,33651,33652,33653,33654,33657,33658,33662,33663,33664,33665,33666,33667,33668,33671,33672,33674,33675,33676,33677,33679,33680,33681,33684,33685,33686,33687,33689,33690,33693,33695,33697,33698,33699,33700,33701,33702,33703,33708,33709,33710,33711,33717,33723,33726,33727,33730,33731,33732,33734,33736,33737,33739,33741,33742,33744,33745,33746,33747,33749,33751,33753,33754,33755,33758,33762,33763,33764,33766,33767,33768,33771,33772,33773,24688,27965,29301,25190,38030,38085,21315,36801,31614,20191,35878,20094,40660,38065,38067,21069,28508,36963,27973,35892,22545,23884,27424,27465,26538,21595,33108,32652,22681,34103,24378,25250,27207,38201,25970,24708,26725,30631,20052,20392,24039,38808,25772,32728,23789,20431,31373,20999,33540,19988,24623,31363,38054,20405,20146,31206,29748,21220,33465,25810,31165,23517,27777,38738,36731,27682,20542,21375,28165,25806,26228,27696,24773,39031,35831,24198,29756,31351,31179,19992,37041,29699,27714,22234,37195,27845,36235,21306,34502,26354,36527,23624,39537,28192,33774,33775,33779,33780,33781,33782,33783,33786,33787,33788,33790,33791,33792,33794,33797,33799,33800,33801,33802,33808,33810,33811,33812,33813,33814,33815,33817,33818,33819,33822,33823,33824,33825,33826,33827,33833,33834,33835,33836,33837,33838,33839,33840,33842,33843,33844,33845,33846,33847,33849,33850,33851,33854,33855,33856,33857,33858,33859,33860,33861,33863,33864,33865,33866,33867,33868,33869,33870,33871,33872,33874,33875,33876,33877,33878,33880,33885,33886,33887,33888,33890,33892,33893,33894,33895,33896,33898,33902,33903,33904,33906,33908,33911,33913,33915,33916,21462,23094,40843,36259,21435,22280,39079,26435,37275,27849,20840,30154,25331,29356,21048,21149,32570,28820,30264,21364,40522,27063,30830,38592,35033,32676,28982,29123,20873,26579,29924,22756,25880,22199,35753,39286,25200,32469,24825,28909,22764,20161,20154,24525,38887,20219,35748,20995,22922,32427,25172,20173,26085,25102,33592,33993,33635,34701,29076,28342,23481,32466,20887,25545,26580,32905,33593,34837,20754,23418,22914,36785,20083,27741,20837,35109,36719,38446,34122,29790,38160,38384,28070,33509,24369,25746,27922,33832,33134,40131,22622,36187,19977,21441,33917,33918,33919,33920,33921,33923,33924,33925,33926,33930,33933,33935,33936,33937,33938,33939,33940,33941,33942,33944,33946,33947,33949,33950,33951,33952,33954,33955,33956,33957,33958,33959,33960,33961,33962,33963,33964,33965,33966,33968,33969,33971,33973,33974,33975,33979,33980,33982,33984,33986,33987,33989,33990,33991,33992,33995,33996,33998,33999,34002,34004,34005,34007,34008,34009,34010,34011,34012,34014,34017,34018,34020,34023,34024,34025,34026,34027,34029,34030,34031,34033,34034,34035,34036,34037,34038,34039,34040,34041,34042,34043,34045,34046,34048,34049,34050,20254,25955,26705,21971,20007,25620,39578,25195,23234,29791,33394,28073,26862,20711,33678,30722,26432,21049,27801,32433,20667,21861,29022,31579,26194,29642,33515,26441,23665,21024,29053,34923,38378,38485,25797,36193,33203,21892,27733,25159,32558,22674,20260,21830,36175,26188,19978,23578,35059,26786,25422,31245,28903,33421,21242,38902,23569,21736,37045,32461,22882,36170,34503,33292,33293,36198,25668,23556,24913,28041,31038,35774,30775,30003,21627,20280,36523,28145,23072,32453,31070,27784,23457,23158,29978,32958,24910,28183,22768,29983,29989,29298,21319,32499,34051,34052,34053,34054,34055,34056,34057,34058,34059,34061,34062,34063,34064,34066,34068,34069,34070,34072,34073,34075,34076,34077,34078,34080,34082,34083,34084,34085,34086,34087,34088,34089,34090,34093,34094,34095,34096,34097,34098,34099,34100,34101,34102,34110,34111,34112,34113,34114,34116,34117,34118,34119,34123,34124,34125,34126,34127,34128,34129,34130,34131,34132,34133,34135,34136,34138,34139,34140,34141,34143,34144,34145,34146,34147,34149,34150,34151,34153,34154,34155,34156,34157,34158,34159,34160,34161,34163,34165,34166,34167,34168,34172,34173,34175,34176,34177,30465,30427,21097,32988,22307,24072,22833,29422,26045,28287,35799,23608,34417,21313,30707,25342,26102,20160,39135,34432,23454,35782,21490,30690,20351,23630,39542,22987,24335,31034,22763,19990,26623,20107,25325,35475,36893,21183,26159,21980,22124,36866,20181,20365,37322,39280,27663,24066,24643,23460,35270,35797,25910,25163,39318,23432,23551,25480,21806,21463,30246,20861,34092,26530,26803,27530,25234,36755,21460,33298,28113,30095,20070,36174,23408,29087,34223,26257,26329,32626,34560,40653,40736,23646,26415,36848,26641,26463,25101,31446,22661,24246,25968,28465,34178,34179,34182,34184,34185,34186,34187,34188,34189,34190,34192,34193,34194,34195,34196,34197,34198,34199,34200,34201,34202,34205,34206,34207,34208,34209,34210,34211,34213,34214,34215,34217,34219,34220,34221,34225,34226,34227,34228,34229,34230,34232,34234,34235,34236,34237,34238,34239,34240,34242,34243,34244,34245,34246,34247,34248,34250,34251,34252,34253,34254,34257,34258,34260,34262,34263,34264,34265,34266,34267,34269,34270,34271,34272,34273,34274,34275,34277,34278,34279,34280,34282,34283,34284,34285,34286,34287,34288,34289,34290,34291,34292,34293,34294,34295,34296,24661,21047,32781,25684,34928,29993,24069,26643,25332,38684,21452,29245,35841,27700,30561,31246,21550,30636,39034,33308,35828,30805,26388,28865,26031,25749,22070,24605,31169,21496,19997,27515,32902,23546,21987,22235,20282,20284,39282,24051,26494,32824,24578,39042,36865,23435,35772,35829,25628,33368,25822,22013,33487,37221,20439,32032,36895,31903,20723,22609,28335,23487,35785,32899,37240,33948,31639,34429,38539,38543,32485,39635,30862,23681,31319,36930,38567,31071,23385,25439,31499,34001,26797,21766,32553,29712,32034,38145,25152,22604,20182,23427,22905,22612,34297,34298,34300,34301,34302,34304,34305,34306,34307,34308,34310,34311,34312,34313,34314,34315,34316,34317,34318,34319,34320,34322,34323,34324,34325,34327,34328,34329,34330,34331,34332,34333,34334,34335,34336,34337,34338,34339,34340,34341,34342,34344,34346,34347,34348,34349,34350,34351,34352,34353,34354,34355,34356,34357,34358,34359,34361,34362,34363,34365,34366,34367,34368,34369,34370,34371,34372,34373,34374,34375,34376,34377,34378,34379,34380,34386,34387,34389,34390,34391,34392,34393,34395,34396,34397,34399,34400,34401,34403,34404,34405,34406,34407,34408,34409,34410,29549,25374,36427,36367,32974,33492,25260,21488,27888,37214,22826,24577,27760,22349,25674,36138,30251,28393,22363,27264,30192,28525,35885,35848,22374,27631,34962,30899,25506,21497,28845,27748,22616,25642,22530,26848,33179,21776,31958,20504,36538,28108,36255,28907,25487,28059,28372,32486,33796,26691,36867,28120,38518,35752,22871,29305,34276,33150,30140,35466,26799,21076,36386,38161,25552,39064,36420,21884,20307,26367,22159,24789,28053,21059,23625,22825,28155,22635,30000,29980,24684,33300,33094,25361,26465,36834,30522,36339,36148,38081,24086,21381,21548,28867,34413,34415,34416,34418,34419,34420,34421,34422,34423,34424,34435,34436,34437,34438,34439,34440,34441,34446,34447,34448,34449,34450,34452,34454,34455,34456,34457,34458,34459,34462,34463,34464,34465,34466,34469,34470,34475,34477,34478,34482,34483,34487,34488,34489,34491,34492,34493,34494,34495,34497,34498,34499,34501,34504,34508,34509,34514,34515,34517,34518,34519,34522,34524,34525,34528,34529,34530,34531,34533,34534,34535,34536,34538,34539,34540,34543,34549,34550,34551,34554,34555,34556,34557,34559,34561,34564,34565,34566,34571,34572,34574,34575,34576,34577,34580,34582,27712,24311,20572,20141,24237,25402,33351,36890,26704,37230,30643,21516,38108,24420,31461,26742,25413,31570,32479,30171,20599,25237,22836,36879,20984,31171,31361,22270,24466,36884,28034,23648,22303,21520,20820,28237,22242,25512,39059,33151,34581,35114,36864,21534,23663,33216,25302,25176,33073,40501,38464,39534,39548,26925,22949,25299,21822,25366,21703,34521,27964,23043,29926,34972,27498,22806,35916,24367,28286,29609,39037,20024,28919,23436,30871,25405,26202,30358,24779,23451,23113,19975,33109,27754,29579,20129,26505,32593,24448,26106,26395,24536,22916,23041,34585,34587,34589,34591,34592,34596,34598,34599,34600,34602,34603,34604,34605,34607,34608,34610,34611,34613,34614,34616,34617,34618,34620,34621,34624,34625,34626,34627,34628,34629,34630,34634,34635,34637,34639,34640,34641,34642,34644,34645,34646,34648,34650,34651,34652,34653,34654,34655,34657,34658,34662,34663,34664,34665,34666,34667,34668,34669,34671,34673,34674,34675,34677,34679,34680,34681,34682,34687,34688,34689,34692,34694,34695,34697,34698,34700,34702,34703,34704,34705,34706,34708,34709,34710,34712,34713,34714,34715,34716,34717,34718,34720,34721,34722,34723,34724,24013,24494,21361,38886,36829,26693,22260,21807,24799,20026,28493,32500,33479,33806,22996,20255,20266,23614,32428,26410,34074,21619,30031,32963,21890,39759,20301,28205,35859,23561,24944,21355,30239,28201,34442,25991,38395,32441,21563,31283,32010,38382,21985,32705,29934,25373,34583,28065,31389,25105,26017,21351,25569,27779,24043,21596,38056,20044,27745,35820,23627,26080,33436,26791,21566,21556,27595,27494,20116,25410,21320,33310,20237,20398,22366,25098,38654,26212,29289,21247,21153,24735,35823,26132,29081,26512,35199,30802,30717,26224,22075,21560,38177,29306,34725,34726,34727,34729,34730,34734,34736,34737,34738,34740,34742,34743,34744,34745,34747,34748,34750,34751,34753,34754,34755,34756,34757,34759,34760,34761,34764,34765,34766,34767,34768,34772,34773,34774,34775,34776,34777,34778,34780,34781,34782,34783,34785,34786,34787,34788,34790,34791,34792,34793,34795,34796,34797,34799,34800,34801,34802,34803,34804,34805,34806,34807,34808,34810,34811,34812,34813,34815,34816,34817,34818,34820,34821,34822,34823,34824,34825,34827,34828,34829,34830,34831,34832,34833,34834,34836,34839,34840,34841,34842,34844,34845,34846,34847,34848,34851,31232,24687,24076,24713,33181,22805,24796,29060,28911,28330,27728,29312,27268,34989,24109,20064,23219,21916,38115,27927,31995,38553,25103,32454,30606,34430,21283,38686,36758,26247,23777,20384,29421,19979,21414,22799,21523,25472,38184,20808,20185,40092,32420,21688,36132,34900,33335,38386,28046,24358,23244,26174,38505,29616,29486,21439,33146,39301,32673,23466,38519,38480,32447,30456,21410,38262,39321,31665,35140,28248,20065,32724,31077,35814,24819,21709,20139,39033,24055,27233,20687,21521,35937,33831,30813,38660,21066,21742,22179,38144,28040,23477,28102,26195,34852,34853,34854,34855,34856,34857,34858,34859,34860,34861,34862,34863,34864,34865,34867,34868,34869,34870,34871,34872,34874,34875,34877,34878,34879,34881,34882,34883,34886,34887,34888,34889,34890,34891,34894,34895,34896,34897,34898,34899,34901,34902,34904,34906,34907,34908,34909,34910,34911,34912,34918,34919,34922,34925,34927,34929,34931,34932,34933,34934,34936,34937,34938,34939,34940,34944,34947,34950,34951,34953,34954,34956,34958,34959,34960,34961,34963,34964,34965,34967,34968,34969,34970,34971,34973,34974,34975,34976,34977,34979,34981,34982,34983,34984,34985,34986,23567,23389,26657,32918,21880,31505,25928,26964,20123,27463,34638,38795,21327,25375,25658,37034,26012,32961,35856,20889,26800,21368,34809,25032,27844,27899,35874,23633,34218,33455,38156,27427,36763,26032,24571,24515,20449,34885,26143,33125,29481,24826,20852,21009,22411,24418,37026,34892,37266,24184,26447,24615,22995,20804,20982,33016,21256,27769,38596,29066,20241,20462,32670,26429,21957,38152,31168,34966,32483,22687,25100,38656,34394,22040,39035,24464,35768,33988,37207,21465,26093,24207,30044,24676,32110,23167,32490,32493,36713,21927,23459,24748,26059,29572,34988,34990,34991,34992,34994,34995,34996,34997,34998,35000,35001,35002,35003,35005,35006,35007,35008,35011,35012,35015,35016,35018,35019,35020,35021,35023,35024,35025,35027,35030,35031,35034,35035,35036,35037,35038,35040,35041,35046,35047,35049,35050,35051,35052,35053,35054,35055,35058,35061,35062,35063,35066,35067,35069,35071,35072,35073,35075,35076,35077,35078,35079,35080,35081,35083,35084,35085,35086,35087,35089,35092,35093,35094,35095,35096,35100,35101,35102,35103,35104,35106,35107,35108,35110,35111,35112,35113,35116,35117,35118,35119,35121,35122,35123,35125,35127,36873,30307,30505,32474,38772,34203,23398,31348,38634,34880,21195,29071,24490,26092,35810,23547,39535,24033,27529,27739,35757,35759,36874,36805,21387,25276,40486,40493,21568,20011,33469,29273,34460,23830,34905,28079,38597,21713,20122,35766,28937,21693,38409,28895,28153,30416,20005,30740,34578,23721,24310,35328,39068,38414,28814,27839,22852,25513,30524,34893,28436,33395,22576,29141,21388,30746,38593,21761,24422,28976,23476,35866,39564,27523,22830,40495,31207,26472,25196,20335,30113,32650,27915,38451,27687,20208,30162,20859,26679,28478,36992,33136,22934,29814,35128,35129,35130,35131,35132,35133,35134,35135,35136,35138,35139,35141,35142,35143,35144,35145,35146,35147,35148,35149,35150,35151,35152,35153,35154,35155,35156,35157,35158,35159,35160,35161,35162,35163,35164,35165,35168,35169,35170,35171,35172,35173,35175,35176,35177,35178,35179,35180,35181,35182,35183,35184,35185,35186,35187,35188,35189,35190,35191,35192,35193,35194,35196,35197,35198,35200,35202,35204,35205,35207,35208,35209,35210,35211,35212,35213,35214,35215,35216,35217,35218,35219,35220,35221,35222,35223,35224,35225,35226,35227,35228,35229,35230,35231,35232,35233,25671,23591,36965,31377,35875,23002,21676,33280,33647,35201,32768,26928,22094,32822,29239,37326,20918,20063,39029,25494,19994,21494,26355,33099,22812,28082,19968,22777,21307,25558,38129,20381,20234,34915,39056,22839,36951,31227,20202,33008,30097,27778,23452,23016,24413,26885,34433,20506,24050,20057,30691,20197,33402,25233,26131,37009,23673,20159,24441,33222,36920,32900,30123,20134,35028,24847,27589,24518,20041,30410,28322,35811,35758,35850,35793,24322,32764,32716,32462,33589,33643,22240,27575,38899,38452,23035,21535,38134,28139,23493,39278,23609,24341,38544,35234,35235,35236,35237,35238,35239,35240,35241,35242,35243,35244,35245,35246,35247,35248,35249,35250,35251,35252,35253,35254,35255,35256,35257,35258,35259,35260,35261,35262,35263,35264,35267,35277,35283,35284,35285,35287,35288,35289,35291,35293,35295,35296,35297,35298,35300,35303,35304,35305,35306,35308,35309,35310,35312,35313,35314,35316,35317,35318,35319,35320,35321,35322,35323,35324,35325,35326,35327,35329,35330,35331,35332,35333,35334,35336,35337,35338,35339,35340,35341,35342,35343,35344,35345,35346,35347,35348,35349,35350,35351,35352,35353,35354,35355,35356,35357,21360,33521,27185,23156,40560,24212,32552,33721,33828,33829,33639,34631,36814,36194,30408,24433,39062,30828,26144,21727,25317,20323,33219,30152,24248,38605,36362,34553,21647,27891,28044,27704,24703,21191,29992,24189,20248,24736,24551,23588,30001,37038,38080,29369,27833,28216,37193,26377,21451,21491,20305,37321,35825,21448,24188,36802,28132,20110,30402,27014,34398,24858,33286,20313,20446,36926,40060,24841,28189,28180,38533,20104,23089,38632,19982,23679,31161,23431,35821,32701,29577,22495,33419,37057,21505,36935,21947,23786,24481,24840,27442,29425,32946,35465,35358,35359,35360,35361,35362,35363,35364,35365,35366,35367,35368,35369,35370,35371,35372,35373,35374,35375,35376,35377,35378,35379,35380,35381,35382,35383,35384,35385,35386,35387,35388,35389,35391,35392,35393,35394,35395,35396,35397,35398,35399,35401,35402,35403,35404,35405,35406,35407,35408,35409,35410,35411,35412,35413,35414,35415,35416,35417,35418,35419,35420,35421,35422,35423,35424,35425,35426,35427,35428,35429,35430,35431,35432,35433,35434,35435,35436,35437,35438,35439,35440,35441,35442,35443,35444,35445,35446,35447,35448,35450,35451,35452,35453,35454,35455,35456,28020,23507,35029,39044,35947,39533,40499,28170,20900,20803,22435,34945,21407,25588,36757,22253,21592,22278,29503,28304,32536,36828,33489,24895,24616,38498,26352,32422,36234,36291,38053,23731,31908,26376,24742,38405,32792,20113,37095,21248,38504,20801,36816,34164,37213,26197,38901,23381,21277,30776,26434,26685,21705,28798,23472,36733,20877,22312,21681,25874,26242,36190,36163,33039,33900,36973,31967,20991,34299,26531,26089,28577,34468,36481,22122,36896,30338,28790,29157,36131,25321,21017,27901,36156,24590,22686,24974,26366,36192,25166,21939,28195,26413,36711,35457,35458,35459,35460,35461,35462,35463,35464,35467,35468,35469,35470,35471,35472,35473,35474,35476,35477,35478,35479,35480,35481,35482,35483,35484,35485,35486,35487,35488,35489,35490,35491,35492,35493,35494,35495,35496,35497,35498,35499,35500,35501,35502,35503,35504,35505,35506,35507,35508,35509,35510,35511,35512,35513,35514,35515,35516,35517,35518,35519,35520,35521,35522,35523,35524,35525,35526,35527,35528,35529,35530,35531,35532,35533,35534,35535,35536,35537,35538,35539,35540,35541,35542,35543,35544,35545,35546,35547,35548,35549,35550,35551,35552,35553,35554,35555,38113,38392,30504,26629,27048,21643,20045,28856,35784,25688,25995,23429,31364,20538,23528,30651,27617,35449,31896,27838,30415,26025,36759,23853,23637,34360,26632,21344,25112,31449,28251,32509,27167,31456,24432,28467,24352,25484,28072,26454,19976,24080,36134,20183,32960,30260,38556,25307,26157,25214,27836,36213,29031,32617,20806,32903,21484,36974,25240,21746,34544,36761,32773,38167,34071,36825,27993,29645,26015,30495,29956,30759,33275,36126,38024,20390,26517,30137,35786,38663,25391,38215,38453,33976,25379,30529,24449,29424,20105,24596,25972,25327,27491,25919,35556,35557,35558,35559,35560,35561,35562,35563,35564,35565,35566,35567,35568,35569,35570,35571,35572,35573,35574,35575,35576,35577,35578,35579,35580,35581,35582,35583,35584,35585,35586,35587,35588,35589,35590,35592,35593,35594,35595,35596,35597,35598,35599,35600,35601,35602,35603,35604,35605,35606,35607,35608,35609,35610,35611,35612,35613,35614,35615,35616,35617,35618,35619,35620,35621,35623,35624,35625,35626,35627,35628,35629,35630,35631,35632,35633,35634,35635,35636,35637,35638,35639,35640,35641,35642,35643,35644,35645,35646,35647,35648,35649,35650,35651,35652,35653,24103,30151,37073,35777,33437,26525,25903,21553,34584,30693,32930,33026,27713,20043,32455,32844,30452,26893,27542,25191,20540,20356,22336,25351,27490,36286,21482,26088,32440,24535,25370,25527,33267,33268,32622,24092,23769,21046,26234,31209,31258,36136,28825,30164,28382,27835,31378,20013,30405,24544,38047,34935,32456,31181,32959,37325,20210,20247,33311,21608,24030,27954,35788,31909,36724,32920,24090,21650,30385,23449,26172,39588,29664,26666,34523,26417,29482,35832,35803,36880,31481,28891,29038,25284,30633,22065,20027,33879,26609,21161,34496,36142,38136,31569,35654,35655,35656,35657,35658,35659,35660,35661,35662,35663,35664,35665,35666,35667,35668,35669,35670,35671,35672,35673,35674,35675,35676,35677,35678,35679,35680,35681,35682,35683,35684,35685,35687,35688,35689,35690,35691,35693,35694,35695,35696,35697,35698,35699,35700,35701,35702,35703,35704,35705,35706,35707,35708,35709,35710,35711,35712,35713,35714,35715,35716,35717,35718,35719,35720,35721,35722,35723,35724,35725,35726,35727,35728,35729,35730,35731,35732,35733,35734,35735,35736,35737,35738,35739,35740,35741,35742,35743,35756,35761,35771,35783,35792,35818,35849,35870,20303,27880,31069,39547,25235,29226,25341,19987,30742,36716,25776,36186,31686,26729,24196,35013,22918,25758,22766,29366,26894,38181,36861,36184,22368,32512,35846,20934,25417,25305,21331,26700,29730,33537,37196,21828,30528,28796,27978,20857,21672,36164,23039,28363,28100,23388,32043,20180,31869,28371,23376,33258,28173,23383,39683,26837,36394,23447,32508,24635,32437,37049,36208,22863,25549,31199,36275,21330,26063,31062,35781,38459,32452,38075,32386,22068,37257,26368,32618,23562,36981,26152,24038,20304,26590,20570,20316,22352,24231,59408,59409,59410,59411,59412,35896,35897,35898,35899,35900,35901,35902,35903,35904,35906,35907,35908,35909,35912,35914,35915,35917,35918,35919,35920,35921,35922,35923,35924,35926,35927,35928,35929,35931,35932,35933,35934,35935,35936,35939,35940,35941,35942,35943,35944,35945,35948,35949,35950,35951,35952,35953,35954,35956,35957,35958,35959,35963,35964,35965,35966,35967,35968,35969,35971,35972,35974,35975,35976,35979,35981,35982,35983,35984,35985,35986,35987,35989,35990,35991,35993,35994,35995,35996,35997,35998,35999,36000,36001,36002,36003,36004,36005,36006,36007,36008,36009,36010,36011,36012,36013,20109,19980,20800,19984,24319,21317,19989,20120,19998,39730,23404,22121,20008,31162,20031,21269,20039,22829,29243,21358,27664,22239,32996,39319,27603,30590,40727,20022,20127,40720,20060,20073,20115,33416,23387,21868,22031,20164,21389,21405,21411,21413,21422,38757,36189,21274,21493,21286,21294,21310,36188,21350,21347,20994,21000,21006,21037,21043,21055,21056,21068,21086,21089,21084,33967,21117,21122,21121,21136,21139,20866,32596,20155,20163,20169,20162,20200,20193,20203,20190,20251,20211,20258,20324,20213,20261,20263,20233,20267,20318,20327,25912,20314,20317,36014,36015,36016,36017,36018,36019,36020,36021,36022,36023,36024,36025,36026,36027,36028,36029,36030,36031,36032,36033,36034,36035,36036,36037,36038,36039,36040,36041,36042,36043,36044,36045,36046,36047,36048,36049,36050,36051,36052,36053,36054,36055,36056,36057,36058,36059,36060,36061,36062,36063,36064,36065,36066,36067,36068,36069,36070,36071,36072,36073,36074,36075,36076,36077,36078,36079,36080,36081,36082,36083,36084,36085,36086,36087,36088,36089,36090,36091,36092,36093,36094,36095,36096,36097,36098,36099,36100,36101,36102,36103,36104,36105,36106,36107,36108,36109,20319,20311,20274,20285,20342,20340,20369,20361,20355,20367,20350,20347,20394,20348,20396,20372,20454,20456,20458,20421,20442,20451,20444,20433,20447,20472,20521,20556,20467,20524,20495,20526,20525,20478,20508,20492,20517,20520,20606,20547,20565,20552,20558,20588,20603,20645,20647,20649,20666,20694,20742,20717,20716,20710,20718,20743,20747,20189,27709,20312,20325,20430,40864,27718,31860,20846,24061,40649,39320,20865,22804,21241,21261,35335,21264,20971,22809,20821,20128,20822,20147,34926,34980,20149,33044,35026,31104,23348,34819,32696,20907,20913,20925,20924,36110,36111,36112,36113,36114,36115,36116,36117,36118,36119,36120,36121,36122,36123,36124,36128,36177,36178,36183,36191,36197,36200,36201,36202,36204,36206,36207,36209,36210,36216,36217,36218,36219,36220,36221,36222,36223,36224,36226,36227,36230,36231,36232,36233,36236,36237,36238,36239,36240,36242,36243,36245,36246,36247,36248,36249,36250,36251,36252,36253,36254,36256,36257,36258,36260,36261,36262,36263,36264,36265,36266,36267,36268,36269,36270,36271,36272,36274,36278,36279,36281,36283,36285,36288,36289,36290,36293,36295,36296,36297,36298,36301,36304,36306,36307,36308,20935,20886,20898,20901,35744,35750,35751,35754,35764,35765,35767,35778,35779,35787,35791,35790,35794,35795,35796,35798,35800,35801,35804,35807,35808,35812,35816,35817,35822,35824,35827,35830,35833,35836,35839,35840,35842,35844,35847,35852,35855,35857,35858,35860,35861,35862,35865,35867,35864,35869,35871,35872,35873,35877,35879,35882,35883,35886,35887,35890,35891,35893,35894,21353,21370,38429,38434,38433,38449,38442,38461,38460,38466,38473,38484,38495,38503,38508,38514,38516,38536,38541,38551,38576,37015,37019,37021,37017,37036,37025,37044,37043,37046,37050,36309,36312,36313,36316,36320,36321,36322,36325,36326,36327,36329,36333,36334,36336,36337,36338,36340,36342,36348,36350,36351,36352,36353,36354,36355,36356,36358,36359,36360,36363,36365,36366,36368,36369,36370,36371,36373,36374,36375,36376,36377,36378,36379,36380,36384,36385,36388,36389,36390,36391,36392,36395,36397,36400,36402,36403,36404,36406,36407,36408,36411,36412,36414,36415,36419,36421,36422,36428,36429,36430,36431,36432,36435,36436,36437,36438,36439,36440,36442,36443,36444,36445,36446,36447,36448,36449,36450,36451,36452,36453,36455,36456,36458,36459,36462,36465,37048,37040,37071,37061,37054,37072,37060,37063,37075,37094,37090,37084,37079,37083,37099,37103,37118,37124,37154,37150,37155,37169,37167,37177,37187,37190,21005,22850,21154,21164,21165,21182,21759,21200,21206,21232,21471,29166,30669,24308,20981,20988,39727,21430,24321,30042,24047,22348,22441,22433,22654,22716,22725,22737,22313,22316,22314,22323,22329,22318,22319,22364,22331,22338,22377,22405,22379,22406,22396,22395,22376,22381,22390,22387,22445,22436,22412,22450,22479,22439,22452,22419,22432,22485,22488,22490,22489,22482,22456,22516,22511,22520,22500,22493,36467,36469,36471,36472,36473,36474,36475,36477,36478,36480,36482,36483,36484,36486,36488,36489,36490,36491,36492,36493,36494,36497,36498,36499,36501,36502,36503,36504,36505,36506,36507,36509,36511,36512,36513,36514,36515,36516,36517,36518,36519,36520,36521,36522,36525,36526,36528,36529,36531,36532,36533,36534,36535,36536,36537,36539,36540,36541,36542,36543,36544,36545,36546,36547,36548,36549,36550,36551,36552,36553,36554,36555,36556,36557,36559,36560,36561,36562,36563,36564,36565,36566,36567,36568,36569,36570,36571,36572,36573,36574,36575,36576,36577,36578,36579,36580,22539,22541,22525,22509,22528,22558,22553,22596,22560,22629,22636,22657,22665,22682,22656,39336,40729,25087,33401,33405,33407,33423,33418,33448,33412,33422,33425,33431,33433,33451,33464,33470,33456,33480,33482,33507,33432,33463,33454,33483,33484,33473,33449,33460,33441,33450,33439,33476,33486,33444,33505,33545,33527,33508,33551,33543,33500,33524,33490,33496,33548,33531,33491,33553,33562,33542,33556,33557,33504,33493,33564,33617,33627,33628,33544,33682,33596,33588,33585,33691,33630,33583,33615,33607,33603,33631,33600,33559,33632,33581,33594,33587,33638,33637,36581,36582,36583,36584,36585,36586,36587,36588,36589,36590,36591,36592,36593,36594,36595,36596,36597,36598,36599,36600,36601,36602,36603,36604,36605,36606,36607,36608,36609,36610,36611,36612,36613,36614,36615,36616,36617,36618,36619,36620,36621,36622,36623,36624,36625,36626,36627,36628,36629,36630,36631,36632,36633,36634,36635,36636,36637,36638,36639,36640,36641,36642,36643,36644,36645,36646,36647,36648,36649,36650,36651,36652,36653,36654,36655,36656,36657,36658,36659,36660,36661,36662,36663,36664,36665,36666,36667,36668,36669,36670,36671,36672,36673,36674,36675,36676,33640,33563,33641,33644,33642,33645,33646,33712,33656,33715,33716,33696,33706,33683,33692,33669,33660,33718,33705,33661,33720,33659,33688,33694,33704,33722,33724,33729,33793,33765,33752,22535,33816,33803,33757,33789,33750,33820,33848,33809,33798,33748,33759,33807,33795,33784,33785,33770,33733,33728,33830,33776,33761,33884,33873,33882,33881,33907,33927,33928,33914,33929,33912,33852,33862,33897,33910,33932,33934,33841,33901,33985,33997,34000,34022,33981,34003,33994,33983,33978,34016,33953,33977,33972,33943,34021,34019,34060,29965,34104,34032,34105,34079,34106,36677,36678,36679,36680,36681,36682,36683,36684,36685,36686,36687,36688,36689,36690,36691,36692,36693,36694,36695,36696,36697,36698,36699,36700,36701,36702,36703,36704,36705,36706,36707,36708,36709,36714,36736,36748,36754,36765,36768,36769,36770,36772,36773,36774,36775,36778,36780,36781,36782,36783,36786,36787,36788,36789,36791,36792,36794,36795,36796,36799,36800,36803,36806,36809,36810,36811,36812,36813,36815,36818,36822,36823,36826,36832,36833,36835,36839,36844,36847,36849,36850,36852,36853,36854,36858,36859,36860,36862,36863,36871,36872,36876,36878,36883,36885,36888,34134,34107,34047,34044,34137,34120,34152,34148,34142,34170,30626,34115,34162,34171,34212,34216,34183,34191,34169,34222,34204,34181,34233,34231,34224,34259,34241,34268,34303,34343,34309,34345,34326,34364,24318,24328,22844,22849,32823,22869,22874,22872,21263,23586,23589,23596,23604,25164,25194,25247,25275,25290,25306,25303,25326,25378,25334,25401,25419,25411,25517,25590,25457,25466,25486,25524,25453,25516,25482,25449,25518,25532,25586,25592,25568,25599,25540,25566,25550,25682,25542,25534,25669,25665,25611,25627,25632,25612,25638,25633,25694,25732,25709,25750,36889,36892,36899,36900,36901,36903,36904,36905,36906,36907,36908,36912,36913,36914,36915,36916,36919,36921,36922,36925,36927,36928,36931,36933,36934,36936,36937,36938,36939,36940,36942,36948,36949,36950,36953,36954,36956,36957,36958,36959,36960,36961,36964,36966,36967,36969,36970,36971,36972,36975,36976,36977,36978,36979,36982,36983,36984,36985,36986,36987,36988,36990,36993,36996,36997,36998,36999,37001,37002,37004,37005,37006,37007,37008,37010,37012,37014,37016,37018,37020,37022,37023,37024,37028,37029,37031,37032,37033,37035,37037,37042,37047,37052,37053,37055,37056,25722,25783,25784,25753,25786,25792,25808,25815,25828,25826,25865,25893,25902,24331,24530,29977,24337,21343,21489,21501,21481,21480,21499,21522,21526,21510,21579,21586,21587,21588,21590,21571,21537,21591,21593,21539,21554,21634,21652,21623,21617,21604,21658,21659,21636,21622,21606,21661,21712,21677,21698,21684,21714,21671,21670,21715,21716,21618,21667,21717,21691,21695,21708,21721,21722,21724,21673,21674,21668,21725,21711,21726,21787,21735,21792,21757,21780,21747,21794,21795,21775,21777,21799,21802,21863,21903,21941,21833,21869,21825,21845,21823,21840,21820,37058,37059,37062,37064,37065,37067,37068,37069,37074,37076,37077,37078,37080,37081,37082,37086,37087,37088,37091,37092,37093,37097,37098,37100,37102,37104,37105,37106,37107,37109,37110,37111,37113,37114,37115,37116,37119,37120,37121,37123,37125,37126,37127,37128,37129,37130,37131,37132,37133,37134,37135,37136,37137,37138,37139,37140,37141,37142,37143,37144,37146,37147,37148,37149,37151,37152,37153,37156,37157,37158,37159,37160,37161,37162,37163,37164,37165,37166,37168,37170,37171,37172,37173,37174,37175,37176,37178,37179,37180,37181,37182,37183,37184,37185,37186,37188,21815,21846,21877,21878,21879,21811,21808,21852,21899,21970,21891,21937,21945,21896,21889,21919,21886,21974,21905,21883,21983,21949,21950,21908,21913,21994,22007,21961,22047,21969,21995,21996,21972,21990,21981,21956,21999,21989,22002,22003,21964,21965,21992,22005,21988,36756,22046,22024,22028,22017,22052,22051,22014,22016,22055,22061,22104,22073,22103,22060,22093,22114,22105,22108,22092,22100,22150,22116,22129,22123,22139,22140,22149,22163,22191,22228,22231,22237,22241,22261,22251,22265,22271,22276,22282,22281,22300,24079,24089,24084,24081,24113,24123,24124,37189,37191,37192,37201,37203,37204,37205,37206,37208,37209,37211,37212,37215,37216,37222,37223,37224,37227,37229,37235,37242,37243,37244,37248,37249,37250,37251,37252,37254,37256,37258,37262,37263,37267,37268,37269,37270,37271,37272,37273,37276,37277,37278,37279,37280,37281,37284,37285,37286,37287,37288,37289,37291,37292,37296,37297,37298,37299,37302,37303,37304,37305,37307,37308,37309,37310,37311,37312,37313,37314,37315,37316,37317,37318,37320,37323,37328,37330,37331,37332,37333,37334,37335,37336,37337,37338,37339,37341,37342,37343,37344,37345,37346,37347,37348,37349,24119,24132,24148,24155,24158,24161,23692,23674,23693,23696,23702,23688,23704,23705,23697,23706,23708,23733,23714,23741,23724,23723,23729,23715,23745,23735,23748,23762,23780,23755,23781,23810,23811,23847,23846,23854,23844,23838,23814,23835,23896,23870,23860,23869,23916,23899,23919,23901,23915,23883,23882,23913,23924,23938,23961,23965,35955,23991,24005,24435,24439,24450,24455,24457,24460,24469,24473,24476,24488,24493,24501,24508,34914,24417,29357,29360,29364,29367,29368,29379,29377,29390,29389,29394,29416,29423,29417,29426,29428,29431,29441,29427,29443,29434,37350,37351,37352,37353,37354,37355,37356,37357,37358,37359,37360,37361,37362,37363,37364,37365,37366,37367,37368,37369,37370,37371,37372,37373,37374,37375,37376,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37387,37388,37389,37390,37391,37392,37393,37394,37395,37396,37397,37398,37399,37400,37401,37402,37403,37404,37405,37406,37407,37408,37409,37410,37411,37412,37413,37414,37415,37416,37417,37418,37419,37420,37421,37422,37423,37424,37425,37426,37427,37428,37429,37430,37431,37432,37433,37434,37435,37436,37437,37438,37439,37440,37441,37442,37443,37444,37445,29435,29463,29459,29473,29450,29470,29469,29461,29474,29497,29477,29484,29496,29489,29520,29517,29527,29536,29548,29551,29566,33307,22821,39143,22820,22786,39267,39271,39272,39273,39274,39275,39276,39284,39287,39293,39296,39300,39303,39306,39309,39312,39313,39315,39316,39317,24192,24209,24203,24214,24229,24224,24249,24245,24254,24243,36179,24274,24273,24283,24296,24298,33210,24516,24521,24534,24527,24579,24558,24580,24545,24548,24574,24581,24582,24554,24557,24568,24601,24629,24614,24603,24591,24589,24617,24619,24586,24639,24609,24696,24697,24699,24698,24642,37446,37447,37448,37449,37450,37451,37452,37453,37454,37455,37456,37457,37458,37459,37460,37461,37462,37463,37464,37465,37466,37467,37468,37469,37470,37471,37472,37473,37474,37475,37476,37477,37478,37479,37480,37481,37482,37483,37484,37485,37486,37487,37488,37489,37490,37491,37493,37494,37495,37496,37497,37498,37499,37500,37501,37502,37503,37504,37505,37506,37507,37508,37509,37510,37511,37512,37513,37514,37515,37516,37517,37519,37520,37521,37522,37523,37524,37525,37526,37527,37528,37529,37530,37531,37532,37533,37534,37535,37536,37537,37538,37539,37540,37541,37542,37543,24682,24701,24726,24730,24749,24733,24707,24722,24716,24731,24812,24763,24753,24797,24792,24774,24794,24756,24864,24870,24853,24867,24820,24832,24846,24875,24906,24949,25004,24980,24999,25015,25044,25077,24541,38579,38377,38379,38385,38387,38389,38390,38396,38398,38403,38404,38406,38408,38410,38411,38412,38413,38415,38418,38421,38422,38423,38425,38426,20012,29247,25109,27701,27732,27740,27722,27811,27781,27792,27796,27788,27752,27753,27764,27766,27782,27817,27856,27860,27821,27895,27896,27889,27863,27826,27872,27862,27898,27883,27886,27825,27859,27887,27902,37544,37545,37546,37547,37548,37549,37551,37552,37553,37554,37555,37556,37557,37558,37559,37560,37561,37562,37563,37564,37565,37566,37567,37568,37569,37570,37571,37572,37573,37574,37575,37577,37578,37579,37580,37581,37582,37583,37584,37585,37586,37587,37588,37589,37590,37591,37592,37593,37594,37595,37596,37597,37598,37599,37600,37601,37602,37603,37604,37605,37606,37607,37608,37609,37610,37611,37612,37613,37614,37615,37616,37617,37618,37619,37620,37621,37622,37623,37624,37625,37626,37627,37628,37629,37630,37631,37632,37633,37634,37635,37636,37637,37638,37639,37640,37641,27961,27943,27916,27971,27976,27911,27908,27929,27918,27947,27981,27950,27957,27930,27983,27986,27988,27955,28049,28015,28062,28064,27998,28051,28052,27996,28000,28028,28003,28186,28103,28101,28126,28174,28095,28128,28177,28134,28125,28121,28182,28075,28172,28078,28203,28270,28238,28267,28338,28255,28294,28243,28244,28210,28197,28228,28383,28337,28312,28384,28461,28386,28325,28327,28349,28347,28343,28375,28340,28367,28303,28354,28319,28514,28486,28487,28452,28437,28409,28463,28470,28491,28532,28458,28425,28457,28553,28557,28556,28536,28530,28540,28538,28625,37642,37643,37644,37645,37646,37647,37648,37649,37650,37651,37652,37653,37654,37655,37656,37657,37658,37659,37660,37661,37662,37663,37664,37665,37666,37667,37668,37669,37670,37671,37672,37673,37674,37675,37676,37677,37678,37679,37680,37681,37682,37683,37684,37685,37686,37687,37688,37689,37690,37691,37692,37693,37695,37696,37697,37698,37699,37700,37701,37702,37703,37704,37705,37706,37707,37708,37709,37710,37711,37712,37713,37714,37715,37716,37717,37718,37719,37720,37721,37722,37723,37724,37725,37726,37727,37728,37729,37730,37731,37732,37733,37734,37735,37736,37737,37739,28617,28583,28601,28598,28610,28641,28654,28638,28640,28655,28698,28707,28699,28729,28725,28751,28766,23424,23428,23445,23443,23461,23480,29999,39582,25652,23524,23534,35120,23536,36423,35591,36790,36819,36821,36837,36846,36836,36841,36838,36851,36840,36869,36868,36875,36902,36881,36877,36886,36897,36917,36918,36909,36911,36932,36945,36946,36944,36968,36952,36962,36955,26297,36980,36989,36994,37000,36995,37003,24400,24407,24406,24408,23611,21675,23632,23641,23409,23651,23654,32700,24362,24361,24365,33396,24380,39739,23662,22913,22915,22925,22953,22954,22947,37740,37741,37742,37743,37744,37745,37746,37747,37748,37749,37750,37751,37752,37753,37754,37755,37756,37757,37758,37759,37760,37761,37762,37763,37764,37765,37766,37767,37768,37769,37770,37771,37772,37773,37774,37776,37777,37778,37779,37780,37781,37782,37783,37784,37785,37786,37787,37788,37789,37790,37791,37792,37793,37794,37795,37796,37797,37798,37799,37800,37801,37802,37803,37804,37805,37806,37807,37808,37809,37810,37811,37812,37813,37814,37815,37816,37817,37818,37819,37820,37821,37822,37823,37824,37825,37826,37827,37828,37829,37830,37831,37832,37833,37835,37836,37837,22935,22986,22955,22942,22948,22994,22962,22959,22999,22974,23045,23046,23005,23048,23011,23000,23033,23052,23049,23090,23092,23057,23075,23059,23104,23143,23114,23125,23100,23138,23157,33004,23210,23195,23159,23162,23230,23275,23218,23250,23252,23224,23264,23267,23281,23254,23270,23256,23260,23305,23319,23318,23346,23351,23360,23573,23580,23386,23397,23411,23377,23379,23394,39541,39543,39544,39546,39551,39549,39552,39553,39557,39560,39562,39568,39570,39571,39574,39576,39579,39580,39581,39583,39584,39586,39587,39589,39591,32415,32417,32419,32421,32424,32425,37838,37839,37840,37841,37842,37843,37844,37845,37847,37848,37849,37850,37851,37852,37853,37854,37855,37856,37857,37858,37859,37860,37861,37862,37863,37864,37865,37866,37867,37868,37869,37870,37871,37872,37873,37874,37875,37876,37877,37878,37879,37880,37881,37882,37883,37884,37885,37886,37887,37888,37889,37890,37891,37892,37893,37894,37895,37896,37897,37898,37899,37900,37901,37902,37903,37904,37905,37906,37907,37908,37909,37910,37911,37912,37913,37914,37915,37916,37917,37918,37919,37920,37921,37922,37923,37924,37925,37926,37927,37928,37929,37930,37931,37932,37933,37934,32429,32432,32446,32448,32449,32450,32457,32459,32460,32464,32468,32471,32475,32480,32481,32488,32491,32494,32495,32497,32498,32525,32502,32506,32507,32510,32513,32514,32515,32519,32520,32523,32524,32527,32529,32530,32535,32537,32540,32539,32543,32545,32546,32547,32548,32549,32550,32551,32554,32555,32556,32557,32559,32560,32561,32562,32563,32565,24186,30079,24027,30014,37013,29582,29585,29614,29602,29599,29647,29634,29649,29623,29619,29632,29641,29640,29669,29657,39036,29706,29673,29671,29662,29626,29682,29711,29738,29787,29734,29733,29736,29744,29742,29740,37935,37936,37937,37938,37939,37940,37941,37942,37943,37944,37945,37946,37947,37948,37949,37951,37952,37953,37954,37955,37956,37957,37958,37959,37960,37961,37962,37963,37964,37965,37966,37967,37968,37969,37970,37971,37972,37973,37974,37975,37976,37977,37978,37979,37980,37981,37982,37983,37984,37985,37986,37987,37988,37989,37990,37991,37992,37993,37994,37996,37997,37998,37999,38000,38001,38002,38003,38004,38005,38006,38007,38008,38009,38010,38011,38012,38013,38014,38015,38016,38017,38018,38019,38020,38033,38038,38040,38087,38095,38099,38100,38106,38118,38139,38172,38176,29723,29722,29761,29788,29783,29781,29785,29815,29805,29822,29852,29838,29824,29825,29831,29835,29854,29864,29865,29840,29863,29906,29882,38890,38891,38892,26444,26451,26462,26440,26473,26533,26503,26474,26483,26520,26535,26485,26536,26526,26541,26507,26487,26492,26608,26633,26584,26634,26601,26544,26636,26585,26549,26586,26547,26589,26624,26563,26552,26594,26638,26561,26621,26674,26675,26720,26721,26702,26722,26692,26724,26755,26653,26709,26726,26689,26727,26688,26686,26698,26697,26665,26805,26767,26740,26743,26771,26731,26818,26990,26876,26911,26912,26873,38183,38195,38205,38211,38216,38219,38229,38234,38240,38254,38260,38261,38263,38264,38265,38266,38267,38268,38269,38270,38272,38273,38274,38275,38276,38277,38278,38279,38280,38281,38282,38283,38284,38285,38286,38287,38288,38289,38290,38291,38292,38293,38294,38295,38296,38297,38298,38299,38300,38301,38302,38303,38304,38305,38306,38307,38308,38309,38310,38311,38312,38313,38314,38315,38316,38317,38318,38319,38320,38321,38322,38323,38324,38325,38326,38327,38328,38329,38330,38331,38332,38333,38334,38335,38336,38337,38338,38339,38340,38341,38342,38343,38344,38345,38346,38347,26916,26864,26891,26881,26967,26851,26896,26993,26937,26976,26946,26973,27012,26987,27008,27032,27000,26932,27084,27015,27016,27086,27017,26982,26979,27001,27035,27047,27067,27051,27053,27092,27057,27073,27082,27103,27029,27104,27021,27135,27183,27117,27159,27160,27237,27122,27204,27198,27296,27216,27227,27189,27278,27257,27197,27176,27224,27260,27281,27280,27305,27287,27307,29495,29522,27521,27522,27527,27524,27538,27539,27533,27546,27547,27553,27562,36715,36717,36721,36722,36723,36725,36726,36728,36727,36729,36730,36732,36734,36737,36738,36740,36743,36747,38348,38349,38350,38351,38352,38353,38354,38355,38356,38357,38358,38359,38360,38361,38362,38363,38364,38365,38366,38367,38368,38369,38370,38371,38372,38373,38374,38375,38380,38399,38407,38419,38424,38427,38430,38432,38435,38436,38437,38438,38439,38440,38441,38443,38444,38445,38447,38448,38455,38456,38457,38458,38462,38465,38467,38474,38478,38479,38481,38482,38483,38486,38487,38488,38489,38490,38492,38493,38494,38496,38499,38501,38502,38507,38509,38510,38511,38512,38513,38515,38520,38521,38522,38523,38524,38525,38526,38527,38528,38529,38530,38531,38532,38535,38537,38538,36749,36750,36751,36760,36762,36558,25099,25111,25115,25119,25122,25121,25125,25124,25132,33255,29935,29940,29951,29967,29969,29971,25908,26094,26095,26096,26122,26137,26482,26115,26133,26112,28805,26359,26141,26164,26161,26166,26165,32774,26207,26196,26177,26191,26198,26209,26199,26231,26244,26252,26279,26269,26302,26331,26332,26342,26345,36146,36147,36150,36155,36157,36160,36165,36166,36168,36169,36167,36173,36181,36185,35271,35274,35275,35276,35278,35279,35280,35281,29294,29343,29277,29286,29295,29310,29311,29316,29323,29325,29327,29330,25352,25394,25520,38540,38542,38545,38546,38547,38549,38550,38554,38555,38557,38558,38559,38560,38561,38562,38563,38564,38565,38566,38568,38569,38570,38571,38572,38573,38574,38575,38577,38578,38580,38581,38583,38584,38586,38587,38591,38594,38595,38600,38602,38603,38608,38609,38611,38612,38614,38615,38616,38617,38618,38619,38620,38621,38622,38623,38625,38626,38627,38628,38629,38630,38631,38635,38636,38637,38638,38640,38641,38642,38644,38645,38648,38650,38651,38652,38653,38655,38658,38659,38661,38666,38667,38668,38672,38673,38674,38676,38677,38679,38680,38681,38682,38683,38685,38687,38688,25663,25816,32772,27626,27635,27645,27637,27641,27653,27655,27654,27661,27669,27672,27673,27674,27681,27689,27684,27690,27698,25909,25941,25963,29261,29266,29270,29232,34402,21014,32927,32924,32915,32956,26378,32957,32945,32939,32941,32948,32951,32999,33000,33001,33002,32987,32962,32964,32985,32973,32983,26384,32989,33003,33009,33012,33005,33037,33038,33010,33020,26389,33042,35930,33078,33054,33068,33048,33074,33096,33100,33107,33140,33113,33114,33137,33120,33129,33148,33149,33133,33127,22605,23221,33160,33154,33169,28373,33187,33194,33228,26406,33226,33211,38689,38690,38691,38692,38693,38694,38695,38696,38697,38699,38700,38702,38703,38705,38707,38708,38709,38710,38711,38714,38715,38716,38717,38719,38720,38721,38722,38723,38724,38725,38726,38727,38728,38729,38730,38731,38732,38733,38734,38735,38736,38737,38740,38741,38743,38744,38746,38748,38749,38751,38755,38756,38758,38759,38760,38762,38763,38764,38765,38766,38767,38768,38769,38770,38773,38775,38776,38777,38778,38779,38781,38782,38783,38784,38785,38786,38787,38788,38790,38791,38792,38793,38794,38796,38798,38799,38800,38803,38805,38806,38807,38809,38810,38811,38812,38813,33217,33190,27428,27447,27449,27459,27462,27481,39121,39122,39123,39125,39129,39130,27571,24384,27586,35315,26000,40785,26003,26044,26054,26052,26051,26060,26062,26066,26070,28800,28828,28822,28829,28859,28864,28855,28843,28849,28904,28874,28944,28947,28950,28975,28977,29043,29020,29032,28997,29042,29002,29048,29050,29080,29107,29109,29096,29088,29152,29140,29159,29177,29213,29224,28780,28952,29030,29113,25150,25149,25155,25160,25161,31035,31040,31046,31049,31067,31068,31059,31066,31074,31063,31072,31087,31079,31098,31109,31114,31130,31143,31155,24529,24528,38814,38815,38817,38818,38820,38821,38822,38823,38824,38825,38826,38828,38830,38832,38833,38835,38837,38838,38839,38840,38841,38842,38843,38844,38845,38846,38847,38848,38849,38850,38851,38852,38853,38854,38855,38856,38857,38858,38859,38860,38861,38862,38863,38864,38865,38866,38867,38868,38869,38870,38871,38872,38873,38874,38875,38876,38877,38878,38879,38880,38881,38882,38883,38884,38885,38888,38894,38895,38896,38897,38898,38900,38903,38904,38905,38906,38907,38908,38909,38910,38911,38912,38913,38914,38915,38916,38917,38918,38919,38920,38921,38922,38923,38924,38925,38926,24636,24669,24666,24679,24641,24665,24675,24747,24838,24845,24925,25001,24989,25035,25041,25094,32896,32895,27795,27894,28156,30710,30712,30720,30729,30743,30744,30737,26027,30765,30748,30749,30777,30778,30779,30751,30780,30757,30764,30755,30761,30798,30829,30806,30807,30758,30800,30791,30796,30826,30875,30867,30874,30855,30876,30881,30883,30898,30905,30885,30932,30937,30921,30956,30962,30981,30964,30995,31012,31006,31028,40859,40697,40699,40700,30449,30468,30477,30457,30471,30472,30490,30498,30489,30509,30502,30517,30520,30544,30545,30535,30531,30554,30568,38927,38928,38929,38930,38931,38932,38933,38934,38935,38936,38937,38938,38939,38940,38941,38942,38943,38944,38945,38946,38947,38948,38949,38950,38951,38952,38953,38954,38955,38956,38957,38958,38959,38960,38961,38962,38963,38964,38965,38966,38967,38968,38969,38970,38971,38972,38973,38974,38975,38976,38977,38978,38979,38980,38981,38982,38983,38984,38985,38986,38987,38988,38989,38990,38991,38992,38993,38994,38995,38996,38997,38998,38999,39000,39001,39002,39003,39004,39005,39006,39007,39008,39009,39010,39011,39012,39013,39014,39015,39016,39017,39018,39019,39020,39021,39022,30562,30565,30591,30605,30589,30592,30604,30609,30623,30624,30640,30645,30653,30010,30016,30030,30027,30024,30043,30066,30073,30083,32600,32609,32607,35400,32616,32628,32625,32633,32641,32638,30413,30437,34866,38021,38022,38023,38027,38026,38028,38029,38031,38032,38036,38039,38037,38042,38043,38044,38051,38052,38059,38058,38061,38060,38063,38064,38066,38068,38070,38071,38072,38073,38074,38076,38077,38079,38084,38088,38089,38090,38091,38092,38093,38094,38096,38097,38098,38101,38102,38103,38105,38104,38107,38110,38111,38112,38114,38116,38117,38119,38120,38122,39023,39024,39025,39026,39027,39028,39051,39054,39058,39061,39065,39075,39080,39081,39082,39083,39084,39085,39086,39087,39088,39089,39090,39091,39092,39093,39094,39095,39096,39097,39098,39099,39100,39101,39102,39103,39104,39105,39106,39107,39108,39109,39110,39111,39112,39113,39114,39115,39116,39117,39119,39120,39124,39126,39127,39131,39132,39133,39136,39137,39138,39139,39140,39141,39142,39145,39146,39147,39148,39149,39150,39151,39152,39153,39154,39155,39156,39157,39158,39159,39160,39161,39162,39163,39164,39165,39166,39167,39168,39169,39170,39171,39172,39173,39174,39175,38121,38123,38126,38127,38131,38132,38133,38135,38137,38140,38141,38143,38147,38146,38150,38151,38153,38154,38157,38158,38159,38162,38163,38164,38165,38166,38168,38171,38173,38174,38175,38178,38186,38187,38185,38188,38193,38194,38196,38198,38199,38200,38204,38206,38207,38210,38197,38212,38213,38214,38217,38220,38222,38223,38226,38227,38228,38230,38231,38232,38233,38235,38238,38239,38237,38241,38242,38244,38245,38246,38247,38248,38249,38250,38251,38252,38255,38257,38258,38259,38202,30695,30700,38601,31189,31213,31203,31211,31238,23879,31235,31234,31262,31252,39176,39177,39178,39179,39180,39182,39183,39185,39186,39187,39188,39189,39190,39191,39192,39193,39194,39195,39196,39197,39198,39199,39200,39201,39202,39203,39204,39205,39206,39207,39208,39209,39210,39211,39212,39213,39215,39216,39217,39218,39219,39220,39221,39222,39223,39224,39225,39226,39227,39228,39229,39230,39231,39232,39233,39234,39235,39236,39237,39238,39239,39240,39241,39242,39243,39244,39245,39246,39247,39248,39249,39250,39251,39254,39255,39256,39257,39258,39259,39260,39261,39262,39263,39264,39265,39266,39268,39270,39283,39288,39289,39291,39294,39298,39299,39305,31289,31287,31313,40655,39333,31344,30344,30350,30355,30361,30372,29918,29920,29996,40480,40482,40488,40489,40490,40491,40492,40498,40497,40502,40504,40503,40505,40506,40510,40513,40514,40516,40518,40519,40520,40521,40523,40524,40526,40529,40533,40535,40538,40539,40540,40542,40547,40550,40551,40552,40553,40554,40555,40556,40561,40557,40563,30098,30100,30102,30112,30109,30124,30115,30131,30132,30136,30148,30129,30128,30147,30146,30166,30157,30179,30184,30182,30180,30187,30183,30211,30193,30204,30207,30224,30208,30213,30220,30231,30218,30245,30232,30229,30233,39308,39310,39322,39323,39324,39325,39326,39327,39328,39329,39330,39331,39332,39334,39335,39337,39338,39339,39340,39341,39342,39343,39344,39345,39346,39347,39348,39349,39350,39351,39352,39353,39354,39355,39356,39357,39358,39359,39360,39361,39362,39363,39364,39365,39366,39367,39368,39369,39370,39371,39372,39373,39374,39375,39376,39377,39378,39379,39380,39381,39382,39383,39384,39385,39386,39387,39388,39389,39390,39391,39392,39393,39394,39395,39396,39397,39398,39399,39400,39401,39402,39403,39404,39405,39406,39407,39408,39409,39410,39411,39412,39413,39414,39415,39416,39417,30235,30268,30242,30240,30272,30253,30256,30271,30261,30275,30270,30259,30285,30302,30292,30300,30294,30315,30319,32714,31462,31352,31353,31360,31366,31368,31381,31398,31392,31404,31400,31405,31411,34916,34921,34930,34941,34943,34946,34978,35014,34999,35004,35017,35042,35022,35043,35045,35057,35098,35068,35048,35070,35056,35105,35097,35091,35099,35082,35124,35115,35126,35137,35174,35195,30091,32997,30386,30388,30684,32786,32788,32790,32796,32800,32802,32805,32806,32807,32809,32808,32817,32779,32821,32835,32838,32845,32850,32873,32881,35203,39032,39040,39043,39418,39419,39420,39421,39422,39423,39424,39425,39426,39427,39428,39429,39430,39431,39432,39433,39434,39435,39436,39437,39438,39439,39440,39441,39442,39443,39444,39445,39446,39447,39448,39449,39450,39451,39452,39453,39454,39455,39456,39457,39458,39459,39460,39461,39462,39463,39464,39465,39466,39467,39468,39469,39470,39471,39472,39473,39474,39475,39476,39477,39478,39479,39480,39481,39482,39483,39484,39485,39486,39487,39488,39489,39490,39491,39492,39493,39494,39495,39496,39497,39498,39499,39500,39501,39502,39503,39504,39505,39506,39507,39508,39509,39510,39511,39512,39513,39049,39052,39053,39055,39060,39066,39067,39070,39071,39073,39074,39077,39078,34381,34388,34412,34414,34431,34426,34428,34427,34472,34445,34443,34476,34461,34471,34467,34474,34451,34473,34486,34500,34485,34510,34480,34490,34481,34479,34505,34511,34484,34537,34545,34546,34541,34547,34512,34579,34526,34548,34527,34520,34513,34563,34567,34552,34568,34570,34573,34569,34595,34619,34590,34597,34606,34586,34622,34632,34612,34609,34601,34615,34623,34690,34594,34685,34686,34683,34656,34672,34636,34670,34699,34643,34659,34684,34660,34649,34661,34707,34735,34728,34770,39514,39515,39516,39517,39518,39519,39520,39521,39522,39523,39524,39525,39526,39527,39528,39529,39530,39531,39538,39555,39561,39565,39566,39572,39573,39577,39590,39593,39594,39595,39596,39597,39598,39599,39602,39603,39604,39605,39609,39611,39613,39614,39615,39619,39620,39622,39623,39624,39625,39626,39629,39630,39631,39632,39634,39636,39637,39638,39639,39641,39642,39643,39644,39645,39646,39648,39650,39651,39652,39653,39655,39656,39657,39658,39660,39662,39664,39665,39666,39667,39668,39669,39670,39671,39672,39674,39676,39677,39678,39679,39680,39681,39682,39684,39685,39686,34758,34696,34693,34733,34711,34691,34731,34789,34732,34741,34739,34763,34771,34749,34769,34752,34762,34779,34794,34784,34798,34838,34835,34814,34826,34843,34849,34873,34876,32566,32578,32580,32581,33296,31482,31485,31496,31491,31492,31509,31498,31531,31503,31559,31544,31530,31513,31534,31537,31520,31525,31524,31539,31550,31518,31576,31578,31557,31605,31564,31581,31584,31598,31611,31586,31602,31601,31632,31654,31655,31672,31660,31645,31656,31621,31658,31644,31650,31659,31668,31697,31681,31692,31709,31706,31717,31718,31722,31756,31742,31740,31759,31766,31755,39687,39689,39690,39691,39692,39693,39694,39696,39697,39698,39700,39701,39702,39703,39704,39705,39706,39707,39708,39709,39710,39712,39713,39714,39716,39717,39718,39719,39720,39721,39722,39723,39724,39725,39726,39728,39729,39731,39732,39733,39734,39735,39736,39737,39738,39741,39742,39743,39744,39750,39754,39755,39756,39758,39760,39762,39763,39765,39766,39767,39768,39769,39770,39771,39772,39773,39774,39775,39776,39777,39778,39779,39780,39781,39782,39783,39784,39785,39786,39787,39788,39789,39790,39791,39792,39793,39794,39795,39796,39797,39798,39799,39800,39801,39802,39803,31775,31786,31782,31800,31809,31808,33278,33281,33282,33284,33260,34884,33313,33314,33315,33325,33327,33320,33323,33336,33339,33331,33332,33342,33348,33353,33355,33359,33370,33375,33384,34942,34949,34952,35032,35039,35166,32669,32671,32679,32687,32688,32690,31868,25929,31889,31901,31900,31902,31906,31922,31932,31933,31937,31943,31948,31949,31944,31941,31959,31976,33390,26280,32703,32718,32725,32741,32737,32742,32745,32750,32755,31992,32119,32166,32174,32327,32411,40632,40628,36211,36228,36244,36241,36273,36199,36205,35911,35913,37194,37200,37198,37199,37220,39804,39805,39806,39807,39808,39809,39810,39811,39812,39813,39814,39815,39816,39817,39818,39819,39820,39821,39822,39823,39824,39825,39826,39827,39828,39829,39830,39831,39832,39833,39834,39835,39836,39837,39838,39839,39840,39841,39842,39843,39844,39845,39846,39847,39848,39849,39850,39851,39852,39853,39854,39855,39856,39857,39858,39859,39860,39861,39862,39863,39864,39865,39866,39867,39868,39869,39870,39871,39872,39873,39874,39875,39876,39877,39878,39879,39880,39881,39882,39883,39884,39885,39886,39887,39888,39889,39890,39891,39892,39893,39894,39895,39896,39897,39898,39899,37218,37217,37232,37225,37231,37245,37246,37234,37236,37241,37260,37253,37264,37261,37265,37282,37283,37290,37293,37294,37295,37301,37300,37306,35925,40574,36280,36331,36357,36441,36457,36277,36287,36284,36282,36292,36310,36311,36314,36318,36302,36303,36315,36294,36332,36343,36344,36323,36345,36347,36324,36361,36349,36372,36381,36383,36396,36398,36387,36399,36410,36416,36409,36405,36413,36401,36425,36417,36418,36433,36434,36426,36464,36470,36476,36463,36468,36485,36495,36500,36496,36508,36510,35960,35970,35978,35973,35992,35988,26011,35286,35294,35290,35292,39900,39901,39902,39903,39904,39905,39906,39907,39908,39909,39910,39911,39912,39913,39914,39915,39916,39917,39918,39919,39920,39921,39922,39923,39924,39925,39926,39927,39928,39929,39930,39931,39932,39933,39934,39935,39936,39937,39938,39939,39940,39941,39942,39943,39944,39945,39946,39947,39948,39949,39950,39951,39952,39953,39954,39955,39956,39957,39958,39959,39960,39961,39962,39963,39964,39965,39966,39967,39968,39969,39970,39971,39972,39973,39974,39975,39976,39977,39978,39979,39980,39981,39982,39983,39984,39985,39986,39987,39988,39989,39990,39991,39992,39993,39994,39995,35301,35307,35311,35390,35622,38739,38633,38643,38639,38662,38657,38664,38671,38670,38698,38701,38704,38718,40832,40835,40837,40838,40839,40840,40841,40842,40844,40702,40715,40717,38585,38588,38589,38606,38610,30655,38624,37518,37550,37576,37694,37738,37834,37775,37950,37995,40063,40066,40069,40070,40071,40072,31267,40075,40078,40080,40081,40082,40084,40085,40090,40091,40094,40095,40096,40097,40098,40099,40101,40102,40103,40104,40105,40107,40109,40110,40112,40113,40114,40115,40116,40117,40118,40119,40122,40123,40124,40125,40132,40133,40134,40135,40138,40139,39996,39997,39998,39999,40000,40001,40002,40003,40004,40005,40006,40007,40008,40009,40010,40011,40012,40013,40014,40015,40016,40017,40018,40019,40020,40021,40022,40023,40024,40025,40026,40027,40028,40029,40030,40031,40032,40033,40034,40035,40036,40037,40038,40039,40040,40041,40042,40043,40044,40045,40046,40047,40048,40049,40050,40051,40052,40053,40054,40055,40056,40057,40058,40059,40061,40062,40064,40067,40068,40073,40074,40076,40079,40083,40086,40087,40088,40089,40093,40106,40108,40111,40121,40126,40127,40128,40129,40130,40136,40137,40145,40146,40154,40155,40160,40161,40140,40141,40142,40143,40144,40147,40148,40149,40151,40152,40153,40156,40157,40159,40162,38780,38789,38801,38802,38804,38831,38827,38819,38834,38836,39601,39600,39607,40536,39606,39610,39612,39617,39616,39621,39618,39627,39628,39633,39749,39747,39751,39753,39752,39757,39761,39144,39181,39214,39253,39252,39647,39649,39654,39663,39659,39675,39661,39673,39688,39695,39699,39711,39715,40637,40638,32315,40578,40583,40584,40587,40594,37846,40605,40607,40667,40668,40669,40672,40671,40674,40681,40679,40677,40682,40687,40738,40748,40751,40761,40759,40765,40766,40772,40163,40164,40165,40166,40167,40168,40169,40170,40171,40172,40173,40174,40175,40176,40177,40178,40179,40180,40181,40182,40183,40184,40185,40186,40187,40188,40189,40190,40191,40192,40193,40194,40195,40196,40197,40198,40199,40200,40201,40202,40203,40204,40205,40206,40207,40208,40209,40210,40211,40212,40213,40214,40215,40216,40217,40218,40219,40220,40221,40222,40223,40224,40225,40226,40227,40228,40229,40230,40231,40232,40233,40234,40235,40236,40237,40238,40239,40240,40241,40242,40243,40244,40245,40246,40247,40248,40249,40250,40251,40252,40253,40254,40255,40256,40257,40258,57908,57909,57910,57911,57912,57913,57914,57915,57916,57917,57918,57919,57920,57921,57922,57923,57924,57925,57926,57927,57928,57929,57930,57931,57932,57933,57934,57935,57936,57937,57938,57939,57940,57941,57942,57943,57944,57945,57946,57947,57948,57949,57950,57951,57952,57953,57954,57955,57956,57957,57958,57959,57960,57961,57962,57963,57964,57965,57966,57967,57968,57969,57970,57971,57972,57973,57974,57975,57976,57977,57978,57979,57980,57981,57982,57983,57984,57985,57986,57987,57988,57989,57990,57991,57992,57993,57994,57995,57996,57997,57998,57999,58000,58001,40259,40260,40261,40262,40263,40264,40265,40266,40267,40268,40269,40270,40271,40272,40273,40274,40275,40276,40277,40278,40279,40280,40281,40282,40283,40284,40285,40286,40287,40288,40289,40290,40291,40292,40293,40294,40295,40296,40297,40298,40299,40300,40301,40302,40303,40304,40305,40306,40307,40308,40309,40310,40311,40312,40313,40314,40315,40316,40317,40318,40319,40320,40321,40322,40323,40324,40325,40326,40327,40328,40329,40330,40331,40332,40333,40334,40335,40336,40337,40338,40339,40340,40341,40342,40343,40344,40345,40346,40347,40348,40349,40350,40351,40352,40353,40354,58002,58003,58004,58005,58006,58007,58008,58009,58010,58011,58012,58013,58014,58015,58016,58017,58018,58019,58020,58021,58022,58023,58024,58025,58026,58027,58028,58029,58030,58031,58032,58033,58034,58035,58036,58037,58038,58039,58040,58041,58042,58043,58044,58045,58046,58047,58048,58049,58050,58051,58052,58053,58054,58055,58056,58057,58058,58059,58060,58061,58062,58063,58064,58065,58066,58067,58068,58069,58070,58071,58072,58073,58074,58075,58076,58077,58078,58079,58080,58081,58082,58083,58084,58085,58086,58087,58088,58089,58090,58091,58092,58093,58094,58095,40355,40356,40357,40358,40359,40360,40361,40362,40363,40364,40365,40366,40367,40368,40369,40370,40371,40372,40373,40374,40375,40376,40377,40378,40379,40380,40381,40382,40383,40384,40385,40386,40387,40388,40389,40390,40391,40392,40393,40394,40395,40396,40397,40398,40399,40400,40401,40402,40403,40404,40405,40406,40407,40408,40409,40410,40411,40412,40413,40414,40415,40416,40417,40418,40419,40420,40421,40422,40423,40424,40425,40426,40427,40428,40429,40430,40431,40432,40433,40434,40435,40436,40437,40438,40439,40440,40441,40442,40443,40444,40445,40446,40447,40448,40449,40450,58096,58097,58098,58099,58100,58101,58102,58103,58104,58105,58106,58107,58108,58109,58110,58111,58112,58113,58114,58115,58116,58117,58118,58119,58120,58121,58122,58123,58124,58125,58126,58127,58128,58129,58130,58131,58132,58133,58134,58135,58136,58137,58138,58139,58140,58141,58142,58143,58144,58145,58146,58147,58148,58149,58150,58151,58152,58153,58154,58155,58156,58157,58158,58159,58160,58161,58162,58163,58164,58165,58166,58167,58168,58169,58170,58171,58172,58173,58174,58175,58176,58177,58178,58179,58180,58181,58182,58183,58184,58185,58186,58187,58188,58189,40451,40452,40453,40454,40455,40456,40457,40458,40459,40460,40461,40462,40463,40464,40465,40466,40467,40468,40469,40470,40471,40472,40473,40474,40475,40476,40477,40478,40484,40487,40494,40496,40500,40507,40508,40512,40525,40528,40530,40531,40532,40534,40537,40541,40543,40544,40545,40546,40549,40558,40559,40562,40564,40565,40566,40567,40568,40569,40570,40571,40572,40573,40576,40577,40579,40580,40581,40582,40585,40586,40588,40589,40590,40591,40592,40593,40596,40597,40598,40599,40600,40601,40602,40603,40604,40606,40608,40609,40610,40611,40612,40613,40615,40616,40617,40618,58190,58191,58192,58193,58194,58195,58196,58197,58198,58199,58200,58201,58202,58203,58204,58205,58206,58207,58208,58209,58210,58211,58212,58213,58214,58215,58216,58217,58218,58219,58220,58221,58222,58223,58224,58225,58226,58227,58228,58229,58230,58231,58232,58233,58234,58235,58236,58237,58238,58239,58240,58241,58242,58243,58244,58245,58246,58247,58248,58249,58250,58251,58252,58253,58254,58255,58256,58257,58258,58259,58260,58261,58262,58263,58264,58265,58266,58267,58268,58269,58270,58271,58272,58273,58274,58275,58276,58277,58278,58279,58280,58281,58282,58283,40619,40620,40621,40622,40623,40624,40625,40626,40627,40629,40630,40631,40633,40634,40636,40639,40640,40641,40642,40643,40645,40646,40647,40648,40650,40651,40652,40656,40658,40659,40661,40662,40663,40665,40666,40670,40673,40675,40676,40678,40680,40683,40684,40685,40686,40688,40689,40690,40691,40692,40693,40694,40695,40696,40698,40701,40703,40704,40705,40706,40707,40708,40709,40710,40711,40712,40713,40714,40716,40719,40721,40722,40724,40725,40726,40728,40730,40731,40732,40733,40734,40735,40737,40739,40740,40741,40742,40743,40744,40745,40746,40747,40749,40750,40752,40753,58284,58285,58286,58287,58288,58289,58290,58291,58292,58293,58294,58295,58296,58297,58298,58299,58300,58301,58302,58303,58304,58305,58306,58307,58308,58309,58310,58311,58312,58313,58314,58315,58316,58317,58318,58319,58320,58321,58322,58323,58324,58325,58326,58327,58328,58329,58330,58331,58332,58333,58334,58335,58336,58337,58338,58339,58340,58341,58342,58343,58344,58345,58346,58347,58348,58349,58350,58351,58352,58353,58354,58355,58356,58357,58358,58359,58360,58361,58362,58363,58364,58365,58366,58367,58368,58369,58370,58371,58372,58373,58374,58375,58376,58377,40754,40755,40756,40757,40758,40760,40762,40764,40767,40768,40769,40770,40771,40773,40774,40775,40776,40777,40778,40779,40780,40781,40782,40783,40786,40787,40788,40789,40790,40791,40792,40793,40794,40795,40796,40797,40798,40799,40800,40801,40802,40803,40804,40805,40806,40807,40808,40809,40810,40811,40812,40813,40814,40815,40816,40817,40818,40819,40820,40821,40822,40823,40824,40825,40826,40827,40828,40829,40830,40833,40834,40845,40846,40847,40848,40849,40850,40851,40852,40853,40854,40855,40856,40860,40861,40862,40865,40866,40867,40868,40869,63788,63865,63893,63975,63985,58378,58379,58380,58381,58382,58383,58384,58385,58386,58387,58388,58389,58390,58391,58392,58393,58394,58395,58396,58397,58398,58399,58400,58401,58402,58403,58404,58405,58406,58407,58408,58409,58410,58411,58412,58413,58414,58415,58416,58417,58418,58419,58420,58421,58422,58423,58424,58425,58426,58427,58428,58429,58430,58431,58432,58433,58434,58435,58436,58437,58438,58439,58440,58441,58442,58443,58444,58445,58446,58447,58448,58449,58450,58451,58452,58453,58454,58455,58456,58457,58458,58459,58460,58461,58462,58463,58464,58465,58466,58467,58468,58469,58470,58471,64012,64013,64014,64015,64017,64019,64020,64024,64031,64032,64033,64035,64036,64039,64040,64041,11905,59414,59415,59416,11908,13427,13383,11912,11915,59422,13726,13850,13838,11916,11927,14702,14616,59430,14799,14815,14963,14800,59435,59436,15182,15470,15584,11943,59441,59442,11946,16470,16735,11950,17207,11955,11958,11959,59451,17329,17324,11963,17373,17622,18017,17996,59459,18211,18217,18300,18317,11978,18759,18810,18813,18818,18819,18821,18822,18847,18843,18871,18870,59476,59477,19619,19615,19616,19617,19575,19618,19731,19732,19733,19734,19735,19736,19737,19886,59492,58472,58473,58474,58475,58476,58477,58478,58479,58480,58481,58482,58483,58484,58485,58486,58487,58488,58489,58490,58491,58492,58493,58494,58495,58496,58497,58498,58499,58500,58501,58502,58503,58504,58505,58506,58507,58508,58509,58510,58511,58512,58513,58514,58515,58516,58517,58518,58519,58520,58521,58522,58523,58524,58525,58526,58527,58528,58529,58530,58531,58532,58533,58534,58535,58536,58537,58538,58539,58540,58541,58542,58543,58544,58545,58546,58547,58548,58549,58550,58551,58552,58553,58554,58555,58556,58557,58558,58559,58560,58561,58562,58563,58564,58565],
+  "gb18030-ranges":[[0,128],[36,165],[38,169],[45,178],[50,184],[81,216],[89,226],[95,235],[96,238],[100,244],[103,248],[104,251],[105,253],[109,258],[126,276],[133,284],[148,300],[172,325],[175,329],[179,334],[208,364],[306,463],[307,465],[308,467],[309,469],[310,471],[311,473],[312,475],[313,477],[341,506],[428,594],[443,610],[544,712],[545,716],[558,730],[741,930],[742,938],[749,962],[750,970],[805,1026],[819,1104],[820,1106],[7922,8209],[7924,8215],[7925,8218],[7927,8222],[7934,8231],[7943,8241],[7944,8244],[7945,8246],[7950,8252],[8062,8365],[8148,8452],[8149,8454],[8152,8458],[8164,8471],[8174,8482],[8236,8556],[8240,8570],[8262,8596],[8264,8602],[8374,8713],[8380,8720],[8381,8722],[8384,8726],[8388,8731],[8390,8737],[8392,8740],[8393,8742],[8394,8748],[8396,8751],[8401,8760],[8406,8766],[8416,8777],[8419,8781],[8424,8787],[8437,8802],[8439,8808],[8445,8816],[8482,8854],[8485,8858],[8496,8870],[8521,8896],[8603,8979],[8936,9322],[8946,9372],[9046,9548],[9050,9588],[9063,9616],[9066,9622],[9076,9634],[9092,9652],[9100,9662],[9108,9672],[9111,9676],[9113,9680],[9131,9702],[9162,9735],[9164,9738],[9218,9793],[9219,9795],[11329,11906],[11331,11909],[11334,11913],[11336,11917],[11346,11928],[11361,11944],[11363,11947],[11366,11951],[11370,11956],[11372,11960],[11375,11964],[11389,11979],[11682,12284],[11686,12292],[11687,12312],[11692,12319],[11694,12330],[11714,12351],[11716,12436],[11723,12447],[11725,12535],[11730,12543],[11736,12586],[11982,12842],[11989,12850],[12102,12964],[12336,13200],[12348,13215],[12350,13218],[12384,13253],[12393,13263],[12395,13267],[12397,13270],[12510,13384],[12553,13428],[12851,13727],[12962,13839],[12973,13851],[13738,14617],[13823,14703],[13919,14801],[13933,14816],[14080,14964],[14298,15183],[14585,15471],[14698,15585],[15583,16471],[15847,16736],[16318,17208],[16434,17325],[16438,17330],[16481,17374],[16729,17623],[17102,17997],[17122,18018],[17315,18212],[17320,18218],[17402,18301],[17418,18318],[17859,18760],[17909,18811],[17911,18814],[17915,18820],[17916,18823],[17936,18844],[17939,18848],[17961,18872],[18664,19576],[18703,19620],[18814,19738],[18962,19887],[19043,40870],[33469,59244],[33470,59336],[33471,59367],[33484,59413],[33485,59417],[33490,59423],[33497,59431],[33501,59437],[33505,59443],[33513,59452],[33520,59460],[33536,59478],[33550,59493],[37845,63789],[37921,63866],[37948,63894],[38029,63976],[38038,63986],[38064,64016],[38065,64018],[38066,64021],[38069,64025],[38075,64034],[38076,64037],[38078,64042],[39108,65074],[39109,65093],[39113,65107],[39114,65112],[39115,65127],[39116,65132],[39265,65375],[39394,65510],[189000,65536]],
+  "jis0208":[12288,12289,12290,65292,65294,12539,65306,65307,65311,65281,12443,12444,180,65344,168,65342,65507,65343,12541,12542,12445,12446,12291,20189,12293,12294,12295,12540,8213,8208,65295,65340,65374,8741,65372,8230,8229,8216,8217,8220,8221,65288,65289,12308,12309,65339,65341,65371,65373,12296,12297,12298,12299,12300,12301,12302,12303,12304,12305,65291,65293,177,215,247,65309,8800,65308,65310,8806,8807,8734,8756,9794,9792,176,8242,8243,8451,65509,65284,65504,65505,65285,65283,65286,65290,65312,167,9734,9733,9675,9679,9678,9671,9670,9633,9632,9651,9650,9661,9660,8251,12306,8594,8592,8593,8595,12307,null,null,null,null,null,null,null,null,null,null,null,8712,8715,8838,8839,8834,8835,8746,8745,null,null,null,null,null,null,null,null,8743,8744,65506,8658,8660,8704,8707,null,null,null,null,null,null,null,null,null,null,null,8736,8869,8978,8706,8711,8801,8786,8810,8811,8730,8765,8733,8757,8747,8748,null,null,null,null,null,null,null,8491,8240,9839,9837,9834,8224,8225,182,null,null,null,null,9711,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,65296,65297,65298,65299,65300,65301,65302,65303,65304,65305,null,null,null,null,null,null,null,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,null,null,null,null,null,null,65345,65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,null,null,null,null,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,null,null,null,null,null,null,null,null,null,null,null,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,null,null,null,null,null,null,null,null,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,null,null,null,null,null,null,null,null,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,1072,1073,1074,1075,1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,null,null,null,null,null,null,null,null,null,null,null,null,null,9472,9474,9484,9488,9496,9492,9500,9516,9508,9524,9532,9473,9475,9487,9491,9499,9495,9507,9523,9515,9531,9547,9504,9519,9512,9527,9535,9501,9520,9509,9528,9538,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,9312,9313,9314,9315,9316,9317,9318,9319,9320,9321,9322,9323,9324,9325,9326,9327,9328,9329,9330,9331,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,null,13129,13076,13090,13133,13080,13095,13059,13110,13137,13143,13069,13094,13091,13099,13130,13115,13212,13213,13214,13198,13199,13252,13217,null,null,null,null,null,null,null,null,13179,12317,12319,8470,13261,8481,12964,12965,12966,12967,12968,12849,12850,12857,13182,13181,13180,8786,8801,8747,8750,8721,8730,8869,8736,8735,8895,8757,8745,8746,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,20124,21782,23043,38463,21696,24859,25384,23030,36898,33909,33564,31312,24746,25569,28197,26093,33894,33446,39925,26771,22311,26017,25201,23451,22992,34427,39156,32098,32190,39822,25110,31903,34999,23433,24245,25353,26263,26696,38343,38797,26447,20197,20234,20301,20381,20553,22258,22839,22996,23041,23561,24799,24847,24944,26131,26885,28858,30031,30064,31227,32173,32239,32963,33806,34915,35586,36949,36986,21307,20117,20133,22495,32946,37057,30959,19968,22769,28322,36920,31282,33576,33419,39983,20801,21360,21693,21729,22240,23035,24341,39154,28139,32996,34093,38498,38512,38560,38907,21515,21491,23431,28879,32701,36802,38632,21359,40284,31418,19985,30867,33276,28198,22040,21764,27421,34074,39995,23013,21417,28006,29916,38287,22082,20113,36939,38642,33615,39180,21473,21942,23344,24433,26144,26355,26628,27704,27891,27945,29787,30408,31310,38964,33521,34907,35424,37613,28082,30123,30410,39365,24742,35585,36234,38322,27022,21421,20870,22290,22576,22852,23476,24310,24616,25513,25588,27839,28436,28814,28948,29017,29141,29503,32257,33398,33489,34199,36960,37467,40219,22633,26044,27738,29989,20985,22830,22885,24448,24540,25276,26106,27178,27431,27572,29579,32705,35158,40236,40206,40644,23713,27798,33659,20740,23627,25014,33222,26742,29281,20057,20474,21368,24681,28201,31311,38899,19979,21270,20206,20309,20285,20385,20339,21152,21487,22025,22799,23233,23478,23521,31185,26247,26524,26550,27468,27827,28779,29634,31117,31166,31292,31623,33457,33499,33540,33655,33775,33747,34662,35506,22057,36008,36838,36942,38686,34442,20420,23784,25105,29273,30011,33253,33469,34558,36032,38597,39187,39381,20171,20250,35299,22238,22602,22730,24315,24555,24618,24724,24674,25040,25106,25296,25913,39745,26214,26800,28023,28784,30028,30342,32117,33445,34809,38283,38542,35997,20977,21182,22806,21683,23475,23830,24936,27010,28079,30861,33995,34903,35442,37799,39608,28012,39336,34521,22435,26623,34510,37390,21123,22151,21508,24275,25313,25785,26684,26680,27579,29554,30906,31339,35226,35282,36203,36611,37101,38307,38548,38761,23398,23731,27005,38989,38990,25499,31520,27179,27263,26806,39949,28511,21106,21917,24688,25324,27963,28167,28369,33883,35088,36676,19988,39993,21494,26907,27194,38788,26666,20828,31427,33970,37340,37772,22107,40232,26658,33541,33841,31909,21000,33477,29926,20094,20355,20896,23506,21002,21208,21223,24059,21914,22570,23014,23436,23448,23515,24178,24185,24739,24863,24931,25022,25563,25954,26577,26707,26874,27454,27475,27735,28450,28567,28485,29872,29976,30435,30475,31487,31649,31777,32233,32566,32752,32925,33382,33694,35251,35532,36011,36996,37969,38291,38289,38306,38501,38867,39208,33304,20024,21547,23736,24012,29609,30284,30524,23721,32747,36107,38593,38929,38996,39000,20225,20238,21361,21916,22120,22522,22855,23305,23492,23696,24076,24190,24524,25582,26426,26071,26082,26399,26827,26820,27231,24112,27589,27671,27773,30079,31048,23395,31232,32000,24509,35215,35352,36020,36215,36556,36637,39138,39438,39740,20096,20605,20736,22931,23452,25135,25216,25836,27450,29344,30097,31047,32681,34811,35516,35696,25516,33738,38816,21513,21507,21931,26708,27224,35440,30759,26485,40653,21364,23458,33050,34384,36870,19992,20037,20167,20241,21450,21560,23470,24339,24613,25937,26429,27714,27762,27875,28792,29699,31350,31406,31496,32026,31998,32102,26087,29275,21435,23621,24040,25298,25312,25369,28192,34394,35377,36317,37624,28417,31142,39770,20136,20139,20140,20379,20384,20689,20807,31478,20849,20982,21332,21281,21375,21483,21932,22659,23777,24375,24394,24623,24656,24685,25375,25945,27211,27841,29378,29421,30703,33016,33029,33288,34126,37111,37857,38911,39255,39514,20208,20957,23597,26241,26989,23616,26354,26997,29577,26704,31873,20677,21220,22343,24062,37670,26020,27427,27453,29748,31105,31165,31563,32202,33465,33740,34943,35167,35641,36817,37329,21535,37504,20061,20534,21477,21306,29399,29590,30697,33510,36527,39366,39368,39378,20855,24858,34398,21936,31354,20598,23507,36935,38533,20018,27355,37351,23633,23624,25496,31391,27795,38772,36705,31402,29066,38536,31874,26647,32368,26705,37740,21234,21531,34219,35347,32676,36557,37089,21350,34952,31041,20418,20670,21009,20804,21843,22317,29674,22411,22865,24418,24452,24693,24950,24935,25001,25522,25658,25964,26223,26690,28179,30054,31293,31995,32076,32153,32331,32619,33550,33610,34509,35336,35427,35686,36605,38938,40335,33464,36814,39912,21127,25119,25731,28608,38553,26689,20625,27424,27770,28500,31348,32080,34880,35363,26376,20214,20537,20518,20581,20860,21048,21091,21927,22287,22533,23244,24314,25010,25080,25331,25458,26908,27177,29309,29356,29486,30740,30831,32121,30476,32937,35211,35609,36066,36562,36963,37749,38522,38997,39443,40568,20803,21407,21427,24187,24358,28187,28304,29572,29694,32067,33335,35328,35578,38480,20046,20491,21476,21628,22266,22993,23396,24049,24235,24359,25144,25925,26543,28246,29392,31946,34996,32929,32993,33776,34382,35463,36328,37431,38599,39015,40723,20116,20114,20237,21320,21577,21566,23087,24460,24481,24735,26791,27278,29786,30849,35486,35492,35703,37264,20062,39881,20132,20348,20399,20505,20502,20809,20844,21151,21177,21246,21402,21475,21521,21518,21897,22353,22434,22909,23380,23389,23439,24037,24039,24055,24184,24195,24218,24247,24344,24658,24908,25239,25304,25511,25915,26114,26179,26356,26477,26657,26775,27083,27743,27946,28009,28207,28317,30002,30343,30828,31295,31968,32005,32024,32094,32177,32789,32771,32943,32945,33108,33167,33322,33618,34892,34913,35611,36002,36092,37066,37237,37489,30783,37628,38308,38477,38917,39321,39640,40251,21083,21163,21495,21512,22741,25335,28640,35946,36703,40633,20811,21051,21578,22269,31296,37239,40288,40658,29508,28425,33136,29969,24573,24794,39592,29403,36796,27492,38915,20170,22256,22372,22718,23130,24680,25031,26127,26118,26681,26801,28151,30165,32058,33390,39746,20123,20304,21449,21766,23919,24038,24046,26619,27801,29811,30722,35408,37782,35039,22352,24231,25387,20661,20652,20877,26368,21705,22622,22971,23472,24425,25165,25505,26685,27507,28168,28797,37319,29312,30741,30758,31085,25998,32048,33756,35009,36617,38555,21092,22312,26448,32618,36001,20916,22338,38442,22586,27018,32948,21682,23822,22524,30869,40442,20316,21066,21643,25662,26152,26388,26613,31364,31574,32034,37679,26716,39853,31545,21273,20874,21047,23519,25334,25774,25830,26413,27578,34217,38609,30352,39894,25420,37638,39851,30399,26194,19977,20632,21442,23665,24808,25746,25955,26719,29158,29642,29987,31639,32386,34453,35715,36059,37240,39184,26028,26283,27531,20181,20180,20282,20351,21050,21496,21490,21987,22235,22763,22987,22985,23039,23376,23629,24066,24107,24535,24605,25351,25903,23388,26031,26045,26088,26525,27490,27515,27663,29509,31049,31169,31992,32025,32043,32930,33026,33267,35222,35422,35433,35430,35468,35566,36039,36060,38604,39164,27503,20107,20284,20365,20816,23383,23546,24904,25345,26178,27425,28363,27835,29246,29885,30164,30913,31034,32780,32819,33258,33940,36766,27728,40575,24335,35672,40235,31482,36600,23437,38635,19971,21489,22519,22833,23241,23460,24713,28287,28422,30142,36074,23455,34048,31712,20594,26612,33437,23649,34122,32286,33294,20889,23556,25448,36198,26012,29038,31038,32023,32773,35613,36554,36974,34503,37034,20511,21242,23610,26451,28796,29237,37196,37320,37675,33509,23490,24369,24825,20027,21462,23432,25163,26417,27530,29417,29664,31278,33131,36259,37202,39318,20754,21463,21610,23551,25480,27193,32172,38656,22234,21454,21608,23447,23601,24030,20462,24833,25342,27954,31168,31179,32066,32333,32722,33261,33311,33936,34886,35186,35728,36468,36655,36913,37195,37228,38598,37276,20160,20303,20805,21313,24467,25102,26580,27713,28171,29539,32294,37325,37507,21460,22809,23487,28113,31069,32302,31899,22654,29087,20986,34899,36848,20426,23803,26149,30636,31459,33308,39423,20934,24490,26092,26991,27529,28147,28310,28516,30462,32020,24033,36981,37255,38918,20966,21021,25152,26257,26329,28186,24246,32210,32626,26360,34223,34295,35576,21161,21465,22899,24207,24464,24661,37604,38500,20663,20767,21213,21280,21319,21484,21736,21830,21809,22039,22888,22974,23100,23477,23558,23567,23569,23578,24196,24202,24288,24432,25215,25220,25307,25484,25463,26119,26124,26157,26230,26494,26786,27167,27189,27836,28040,28169,28248,28988,28966,29031,30151,30465,30813,30977,31077,31216,31456,31505,31911,32057,32918,33750,33931,34121,34909,35059,35359,35388,35412,35443,35937,36062,37284,37478,37758,37912,38556,38808,19978,19976,19998,20055,20887,21104,22478,22580,22732,23330,24120,24773,25854,26465,26454,27972,29366,30067,31331,33976,35698,37304,37664,22065,22516,39166,25325,26893,27542,29165,32340,32887,33394,35302,39135,34645,36785,23611,20280,20449,20405,21767,23072,23517,23529,24515,24910,25391,26032,26187,26862,27035,28024,28145,30003,30137,30495,31070,31206,32051,33251,33455,34218,35242,35386,36523,36763,36914,37341,38663,20154,20161,20995,22645,22764,23563,29978,23613,33102,35338,36805,38499,38765,31525,35535,38920,37218,22259,21416,36887,21561,22402,24101,25512,27700,28810,30561,31883,32736,34928,36930,37204,37648,37656,38543,29790,39620,23815,23913,25968,26530,36264,38619,25454,26441,26905,33733,38935,38592,35070,28548,25722,23544,19990,28716,30045,26159,20932,21046,21218,22995,24449,24615,25104,25919,25972,26143,26228,26866,26646,27491,28165,29298,29983,30427,31934,32854,22768,35069,35199,35488,35475,35531,36893,37266,38738,38745,25993,31246,33030,38587,24109,24796,25114,26021,26132,26512,30707,31309,31821,32318,33034,36012,36196,36321,36447,30889,20999,25305,25509,25666,25240,35373,31363,31680,35500,38634,32118,33292,34633,20185,20808,21315,21344,23459,23554,23574,24029,25126,25159,25776,26643,26676,27849,27973,27927,26579,28508,29006,29053,26059,31359,31661,32218,32330,32680,33146,33307,33337,34214,35438,36046,36341,36984,36983,37549,37521,38275,39854,21069,21892,28472,28982,20840,31109,32341,33203,31950,22092,22609,23720,25514,26366,26365,26970,29401,30095,30094,30990,31062,31199,31895,32032,32068,34311,35380,38459,36961,40736,20711,21109,21452,21474,20489,21930,22766,22863,29245,23435,23652,21277,24803,24819,25436,25475,25407,25531,25805,26089,26361,24035,27085,27133,28437,29157,20105,30185,30456,31379,31967,32207,32156,32865,33609,33624,33900,33980,34299,35013,36208,36865,36973,37783,38684,39442,20687,22679,24974,33235,34101,36104,36896,20419,20596,21063,21363,24687,25417,26463,28204,36275,36895,20439,23646,36042,26063,32154,21330,34966,20854,25539,23384,23403,23562,25613,26449,36956,20182,22810,22826,27760,35409,21822,22549,22949,24816,25171,26561,33333,26965,38464,39364,39464,20307,22534,23550,32784,23729,24111,24453,24608,24907,25140,26367,27888,28382,32974,33151,33492,34955,36024,36864,36910,38538,40667,39899,20195,21488,22823,31532,37261,38988,40441,28381,28711,21331,21828,23429,25176,25246,25299,27810,28655,29730,35351,37944,28609,35582,33592,20967,34552,21482,21481,20294,36948,36784,22890,33073,24061,31466,36799,26842,35895,29432,40008,27197,35504,20025,21336,22022,22374,25285,25506,26086,27470,28129,28251,28845,30701,31471,31658,32187,32829,32966,34507,35477,37723,22243,22727,24382,26029,26262,27264,27573,30007,35527,20516,30693,22320,24347,24677,26234,27744,30196,31258,32622,33268,34584,36933,39347,31689,30044,31481,31569,33988,36880,31209,31378,33590,23265,30528,20013,20210,23449,24544,25277,26172,26609,27880,34411,34935,35387,37198,37619,39376,27159,28710,29482,33511,33879,36015,19969,20806,20939,21899,23541,24086,24115,24193,24340,24373,24427,24500,25074,25361,26274,26397,28526,29266,30010,30522,32884,33081,33144,34678,35519,35548,36229,36339,37530,38263,38914,40165,21189,25431,30452,26389,27784,29645,36035,37806,38515,27941,22684,26894,27084,36861,37786,30171,36890,22618,26626,25524,27131,20291,28460,26584,36795,34086,32180,37716,26943,28528,22378,22775,23340,32044,29226,21514,37347,40372,20141,20302,20572,20597,21059,35998,21576,22564,23450,24093,24213,24237,24311,24351,24716,25269,25402,25552,26799,27712,30855,31118,31243,32224,33351,35330,35558,36420,36883,37048,37165,37336,40718,27877,25688,25826,25973,28404,30340,31515,36969,37841,28346,21746,24505,25764,36685,36845,37444,20856,22635,22825,23637,24215,28155,32399,29980,36028,36578,39003,28857,20253,27583,28593,30000,38651,20814,21520,22581,22615,22956,23648,24466,26007,26460,28193,30331,33759,36077,36884,37117,37709,30757,30778,21162,24230,22303,22900,24594,20498,20826,20908,20941,20992,21776,22612,22616,22871,23445,23798,23947,24764,25237,25645,26481,26691,26812,26847,30423,28120,28271,28059,28783,29128,24403,30168,31095,31561,31572,31570,31958,32113,21040,33891,34153,34276,35342,35588,35910,36367,36867,36879,37913,38518,38957,39472,38360,20685,21205,21516,22530,23566,24999,25758,27934,30643,31461,33012,33796,36947,37509,23776,40199,21311,24471,24499,28060,29305,30563,31167,31716,27602,29420,35501,26627,27233,20984,31361,26932,23626,40182,33515,23493,37193,28702,22136,23663,24775,25958,27788,35930,36929,38931,21585,26311,37389,22856,37027,20869,20045,20970,34201,35598,28760,25466,37707,26978,39348,32260,30071,21335,26976,36575,38627,27741,20108,23612,24336,36841,21250,36049,32905,34425,24319,26085,20083,20837,22914,23615,38894,20219,22922,24525,35469,28641,31152,31074,23527,33905,29483,29105,24180,24565,25467,25754,29123,31896,20035,24316,20043,22492,22178,24745,28611,32013,33021,33075,33215,36786,35223,34468,24052,25226,25773,35207,26487,27874,27966,29750,30772,23110,32629,33453,39340,20467,24259,25309,25490,25943,26479,30403,29260,32972,32954,36649,37197,20493,22521,23186,26757,26995,29028,29437,36023,22770,36064,38506,36889,34687,31204,30695,33833,20271,21093,21338,25293,26575,27850,30333,31636,31893,33334,34180,36843,26333,28448,29190,32283,33707,39361,40614,20989,31665,30834,31672,32903,31560,27368,24161,32908,30033,30048,20843,37474,28300,30330,37271,39658,20240,32624,25244,31567,38309,40169,22138,22617,34532,38588,20276,21028,21322,21453,21467,24070,25644,26001,26495,27710,27726,29256,29359,29677,30036,32321,33324,34281,36009,31684,37318,29033,38930,39151,25405,26217,30058,30436,30928,34115,34542,21290,21329,21542,22915,24199,24444,24754,25161,25209,25259,26000,27604,27852,30130,30382,30865,31192,32203,32631,32933,34987,35513,36027,36991,38750,39131,27147,31800,20633,23614,24494,26503,27608,29749,30473,32654,40763,26570,31255,21305,30091,39661,24422,33181,33777,32920,24380,24517,30050,31558,36924,26727,23019,23195,32016,30334,35628,20469,24426,27161,27703,28418,29922,31080,34920,35413,35961,24287,25551,30149,31186,33495,37672,37618,33948,34541,39981,21697,24428,25996,27996,28693,36007,36051,38971,25935,29942,19981,20184,22496,22827,23142,23500,20904,24067,24220,24598,25206,25975,26023,26222,28014,29238,31526,33104,33178,33433,35676,36000,36070,36212,38428,38468,20398,25771,27494,33310,33889,34154,37096,23553,26963,39080,33914,34135,20239,21103,24489,24133,26381,31119,33145,35079,35206,28149,24343,25173,27832,20175,29289,39826,20998,21563,22132,22707,24996,25198,28954,22894,31881,31966,32027,38640,25991,32862,19993,20341,20853,22592,24163,24179,24330,26564,20006,34109,38281,38491,31859,38913,20731,22721,30294,30887,21029,30629,34065,31622,20559,22793,29255,31687,32232,36794,36820,36941,20415,21193,23081,24321,38829,20445,33303,37610,22275,25429,27497,29995,35036,36628,31298,21215,22675,24917,25098,26286,27597,31807,33769,20515,20472,21253,21574,22577,22857,23453,23792,23791,23849,24214,25265,25447,25918,26041,26379,27861,27873,28921,30770,32299,32990,33459,33804,34028,34562,35090,35370,35914,37030,37586,39165,40179,40300,20047,20129,20621,21078,22346,22952,24125,24536,24537,25151,26292,26395,26576,26834,20882,32033,32938,33192,35584,35980,36031,37502,38450,21536,38956,21271,20693,21340,22696,25778,26420,29287,30566,31302,37350,21187,27809,27526,22528,24140,22868,26412,32763,20961,30406,25705,30952,39764,40635,22475,22969,26151,26522,27598,21737,27097,24149,33180,26517,39850,26622,40018,26717,20134,20451,21448,25273,26411,27819,36804,20397,32365,40639,19975,24930,28288,28459,34067,21619,26410,39749,24051,31637,23724,23494,34588,28234,34001,31252,33032,22937,31885,27665,30496,21209,22818,28961,29279,30683,38695,40289,26891,23167,23064,20901,21517,21629,26126,30431,36855,37528,40180,23018,29277,28357,20813,26825,32191,32236,38754,40634,25720,27169,33538,22916,23391,27611,29467,30450,32178,32791,33945,20786,26408,40665,30446,26466,21247,39173,23588,25147,31870,36016,21839,24758,32011,38272,21249,20063,20918,22812,29242,32822,37326,24357,30690,21380,24441,32004,34220,35379,36493,38742,26611,34222,37971,24841,24840,27833,30290,35565,36664,21807,20305,20778,21191,21451,23461,24189,24736,24962,25558,26377,26586,28263,28044,29494,29495,30001,31056,35029,35480,36938,37009,37109,38596,34701,22805,20104,20313,19982,35465,36671,38928,20653,24188,22934,23481,24248,25562,25594,25793,26332,26954,27096,27915,28342,29076,29992,31407,32650,32768,33865,33993,35201,35617,36362,36965,38525,39178,24958,25233,27442,27779,28020,32716,32764,28096,32645,34746,35064,26469,33713,38972,38647,27931,32097,33853,37226,20081,21365,23888,27396,28651,34253,34349,35239,21033,21519,23653,26446,26792,29702,29827,30178,35023,35041,37324,38626,38520,24459,29575,31435,33870,25504,30053,21129,27969,28316,29705,30041,30827,31890,38534,31452,40845,20406,24942,26053,34396,20102,20142,20698,20001,20940,23534,26009,26753,28092,29471,30274,30637,31260,31975,33391,35538,36988,37327,38517,38936,21147,32209,20523,21400,26519,28107,29136,29747,33256,36650,38563,40023,40607,29792,22593,28057,32047,39006,20196,20278,20363,20919,21169,23994,24604,29618,31036,33491,37428,38583,38646,38666,40599,40802,26278,27508,21015,21155,28872,35010,24265,24651,24976,28451,29001,31806,32244,32879,34030,36899,37676,21570,39791,27347,28809,36034,36335,38706,21172,23105,24266,24324,26391,27004,27028,28010,28431,29282,29436,31725,32769,32894,34635,37070,20845,40595,31108,32907,37682,35542,20525,21644,35441,27498,36036,33031,24785,26528,40434,20121,20120,39952,35435,34241,34152,26880,28286,30871,33109,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,24332,19984,19989,20010,20017,20022,20028,20031,20034,20054,20056,20098,20101,35947,20106,33298,24333,20110,20126,20127,20128,20130,20144,20147,20150,20174,20173,20164,20166,20162,20183,20190,20205,20191,20215,20233,20314,20272,20315,20317,20311,20295,20342,20360,20367,20376,20347,20329,20336,20369,20335,20358,20374,20760,20436,20447,20430,20440,20443,20433,20442,20432,20452,20453,20506,20520,20500,20522,20517,20485,20252,20470,20513,20521,20524,20478,20463,20497,20486,20547,20551,26371,20565,20560,20552,20570,20566,20588,20600,20608,20634,20613,20660,20658,20681,20682,20659,20674,20694,20702,20709,20717,20707,20718,20729,20725,20745,20737,20738,20758,20757,20756,20762,20769,20794,20791,20796,20795,20799,20800,20818,20812,20820,20834,31480,20841,20842,20846,20864,20866,22232,20876,20873,20879,20881,20883,20885,20886,20900,20902,20898,20905,20906,20907,20915,20913,20914,20912,20917,20925,20933,20937,20955,20960,34389,20969,20973,20976,20981,20990,20996,21003,21012,21006,21031,21034,21038,21043,21049,21071,21060,21067,21068,21086,21076,21098,21108,21097,21107,21119,21117,21133,21140,21138,21105,21128,21137,36776,36775,21164,21165,21180,21173,21185,21197,21207,21214,21219,21222,39149,21216,21235,21237,21240,21241,21254,21256,30008,21261,21264,21263,21269,21274,21283,21295,21297,21299,21304,21312,21318,21317,19991,21321,21325,20950,21342,21353,21358,22808,21371,21367,21378,21398,21408,21414,21413,21422,21424,21430,21443,31762,38617,21471,26364,29166,21486,21480,21485,21498,21505,21565,21568,21548,21549,21564,21550,21558,21545,21533,21582,21647,21621,21646,21599,21617,21623,21616,21650,21627,21632,21622,21636,21648,21638,21703,21666,21688,21669,21676,21700,21704,21672,21675,21698,21668,21694,21692,21720,21733,21734,21775,21780,21757,21742,21741,21754,21730,21817,21824,21859,21836,21806,21852,21829,21846,21847,21816,21811,21853,21913,21888,21679,21898,21919,21883,21886,21912,21918,21934,21884,21891,21929,21895,21928,21978,21957,21983,21956,21980,21988,21972,22036,22007,22038,22014,22013,22043,22009,22094,22096,29151,22068,22070,22066,22072,22123,22116,22063,22124,22122,22150,22144,22154,22176,22164,22159,22181,22190,22198,22196,22210,22204,22209,22211,22208,22216,22222,22225,22227,22231,22254,22265,22272,22271,22276,22281,22280,22283,22285,22291,22296,22294,21959,22300,22310,22327,22328,22350,22331,22336,22351,22377,22464,22408,22369,22399,22409,22419,22432,22451,22436,22442,22448,22467,22470,22484,22482,22483,22538,22486,22499,22539,22553,22557,22642,22561,22626,22603,22640,27584,22610,22589,22649,22661,22713,22687,22699,22714,22750,22715,22712,22702,22725,22739,22737,22743,22745,22744,22757,22748,22756,22751,22767,22778,22777,22779,22780,22781,22786,22794,22800,22811,26790,22821,22828,22829,22834,22840,22846,31442,22869,22864,22862,22874,22872,22882,22880,22887,22892,22889,22904,22913,22941,20318,20395,22947,22962,22982,23016,23004,22925,23001,23002,23077,23071,23057,23068,23049,23066,23104,23148,23113,23093,23094,23138,23146,23194,23228,23230,23243,23234,23229,23267,23255,23270,23273,23254,23290,23291,23308,23307,23318,23346,23248,23338,23350,23358,23363,23365,23360,23377,23381,23386,23387,23397,23401,23408,23411,23413,23416,25992,23418,23424,23427,23462,23480,23491,23495,23497,23508,23504,23524,23526,23522,23518,23525,23531,23536,23542,23539,23557,23559,23560,23565,23571,23584,23586,23592,23608,23609,23617,23622,23630,23635,23632,23631,23409,23660,23662,20066,23670,23673,23692,23697,23700,22939,23723,23739,23734,23740,23735,23749,23742,23751,23769,23785,23805,23802,23789,23948,23786,23819,23829,23831,23900,23839,23835,23825,23828,23842,23834,23833,23832,23884,23890,23886,23883,23916,23923,23926,23943,23940,23938,23970,23965,23980,23982,23997,23952,23991,23996,24009,24013,24019,24018,24022,24027,24043,24050,24053,24075,24090,24089,24081,24091,24118,24119,24132,24131,24128,24142,24151,24148,24159,24162,24164,24135,24181,24182,24186,40636,24191,24224,24257,24258,24264,24272,24271,24278,24291,24285,24282,24283,24290,24289,24296,24297,24300,24305,24307,24304,24308,24312,24318,24323,24329,24413,24412,24331,24337,24342,24361,24365,24376,24385,24392,24396,24398,24367,24401,24406,24407,24409,24417,24429,24435,24439,24451,24450,24447,24458,24456,24465,24455,24478,24473,24472,24480,24488,24493,24508,24534,24571,24548,24568,24561,24541,24755,24575,24609,24672,24601,24592,24617,24590,24625,24603,24597,24619,24614,24591,24634,24666,24641,24682,24695,24671,24650,24646,24653,24675,24643,24676,24642,24684,24683,24665,24705,24717,24807,24707,24730,24708,24731,24726,24727,24722,24743,24715,24801,24760,24800,24787,24756,24560,24765,24774,24757,24792,24909,24853,24838,24822,24823,24832,24820,24826,24835,24865,24827,24817,24845,24846,24903,24894,24872,24871,24906,24895,24892,24876,24884,24893,24898,24900,24947,24951,24920,24921,24922,24939,24948,24943,24933,24945,24927,24925,24915,24949,24985,24982,24967,25004,24980,24986,24970,24977,25003,25006,25036,25034,25033,25079,25032,25027,25030,25018,25035,32633,25037,25062,25059,25078,25082,25076,25087,25085,25084,25086,25088,25096,25097,25101,25100,25108,25115,25118,25121,25130,25134,25136,25138,25139,25153,25166,25182,25187,25179,25184,25192,25212,25218,25225,25214,25234,25235,25238,25300,25219,25236,25303,25297,25275,25295,25343,25286,25812,25288,25308,25292,25290,25282,25287,25243,25289,25356,25326,25329,25383,25346,25352,25327,25333,25424,25406,25421,25628,25423,25494,25486,25472,25515,25462,25507,25487,25481,25503,25525,25451,25449,25534,25577,25536,25542,25571,25545,25554,25590,25540,25622,25652,25606,25619,25638,25654,25885,25623,25640,25615,25703,25711,25718,25678,25898,25749,25747,25765,25769,25736,25788,25818,25810,25797,25799,25787,25816,25794,25841,25831,33289,25824,25825,25260,25827,25839,25900,25846,25844,25842,25850,25856,25853,25880,25884,25861,25892,25891,25899,25908,25909,25911,25910,25912,30027,25928,25942,25941,25933,25944,25950,25949,25970,25976,25986,25987,35722,26011,26015,26027,26039,26051,26054,26049,26052,26060,26066,26075,26073,26080,26081,26097,26482,26122,26115,26107,26483,26165,26166,26164,26140,26191,26180,26185,26177,26206,26205,26212,26215,26216,26207,26210,26224,26243,26248,26254,26249,26244,26264,26269,26305,26297,26313,26302,26300,26308,26296,26326,26330,26336,26175,26342,26345,26352,26357,26359,26383,26390,26398,26406,26407,38712,26414,26431,26422,26433,26424,26423,26438,26462,26464,26457,26467,26468,26505,26480,26537,26492,26474,26508,26507,26534,26529,26501,26551,26607,26548,26604,26547,26601,26552,26596,26590,26589,26594,26606,26553,26574,26566,26599,27292,26654,26694,26665,26688,26701,26674,26702,26803,26667,26713,26723,26743,26751,26783,26767,26797,26772,26781,26779,26755,27310,26809,26740,26805,26784,26810,26895,26765,26750,26881,26826,26888,26840,26914,26918,26849,26892,26829,26836,26855,26837,26934,26898,26884,26839,26851,26917,26873,26848,26863,26920,26922,26906,26915,26913,26822,27001,26999,26972,27000,26987,26964,27006,26990,26937,26996,26941,26969,26928,26977,26974,26973,27009,26986,27058,27054,27088,27071,27073,27091,27070,27086,23528,27082,27101,27067,27075,27047,27182,27025,27040,27036,27029,27060,27102,27112,27138,27163,27135,27402,27129,27122,27111,27141,27057,27166,27117,27156,27115,27146,27154,27329,27171,27155,27204,27148,27250,27190,27256,27207,27234,27225,27238,27208,27192,27170,27280,27277,27296,27268,27298,27299,27287,34327,27323,27331,27330,27320,27315,27308,27358,27345,27359,27306,27354,27370,27387,27397,34326,27386,27410,27414,39729,27423,27448,27447,30428,27449,39150,27463,27459,27465,27472,27481,27476,27483,27487,27489,27512,27513,27519,27520,27524,27523,27533,27544,27541,27550,27556,27562,27563,27567,27570,27569,27571,27575,27580,27590,27595,27603,27615,27628,27627,27635,27631,40638,27656,27667,27668,27675,27684,27683,27742,27733,27746,27754,27778,27789,27802,27777,27803,27774,27752,27763,27794,27792,27844,27889,27859,27837,27863,27845,27869,27822,27825,27838,27834,27867,27887,27865,27882,27935,34893,27958,27947,27965,27960,27929,27957,27955,27922,27916,28003,28051,28004,27994,28025,27993,28046,28053,28644,28037,28153,28181,28170,28085,28103,28134,28088,28102,28140,28126,28108,28136,28114,28101,28154,28121,28132,28117,28138,28142,28205,28270,28206,28185,28274,28255,28222,28195,28267,28203,28278,28237,28191,28227,28218,28238,28196,28415,28189,28216,28290,28330,28312,28361,28343,28371,28349,28335,28356,28338,28372,28373,28303,28325,28354,28319,28481,28433,28748,28396,28408,28414,28479,28402,28465,28399,28466,28364,28478,28435,28407,28550,28538,28536,28545,28544,28527,28507,28659,28525,28546,28540,28504,28558,28561,28610,28518,28595,28579,28577,28580,28601,28614,28586,28639,28629,28652,28628,28632,28657,28654,28635,28681,28683,28666,28689,28673,28687,28670,28699,28698,28532,28701,28696,28703,28720,28734,28722,28753,28771,28825,28818,28847,28913,28844,28856,28851,28846,28895,28875,28893,28889,28937,28925,28956,28953,29029,29013,29064,29030,29026,29004,29014,29036,29071,29179,29060,29077,29096,29100,29143,29113,29118,29138,29129,29140,29134,29152,29164,29159,29173,29180,29177,29183,29197,29200,29211,29224,29229,29228,29232,29234,29243,29244,29247,29248,29254,29259,29272,29300,29310,29314,29313,29319,29330,29334,29346,29351,29369,29362,29379,29382,29380,29390,29394,29410,29408,29409,29433,29431,20495,29463,29450,29468,29462,29469,29492,29487,29481,29477,29502,29518,29519,40664,29527,29546,29544,29552,29560,29557,29563,29562,29640,29619,29646,29627,29632,29669,29678,29662,29858,29701,29807,29733,29688,29746,29754,29781,29759,29791,29785,29761,29788,29801,29808,29795,29802,29814,29822,29835,29854,29863,29898,29903,29908,29681,29920,29923,29927,29929,29934,29938,29936,29937,29944,29943,29956,29955,29957,29964,29966,29965,29973,29971,29982,29990,29996,30012,30020,30029,30026,30025,30043,30022,30042,30057,30052,30055,30059,30061,30072,30070,30086,30087,30068,30090,30089,30082,30100,30106,30109,30117,30115,30146,30131,30147,30133,30141,30136,30140,30129,30157,30154,30162,30169,30179,30174,30206,30207,30204,30209,30192,30202,30194,30195,30219,30221,30217,30239,30247,30240,30241,30242,30244,30260,30256,30267,30279,30280,30278,30300,30296,30305,30306,30312,30313,30314,30311,30316,30320,30322,30326,30328,30332,30336,30339,30344,30347,30350,30358,30355,30361,30362,30384,30388,30392,30393,30394,30402,30413,30422,30418,30430,30433,30437,30439,30442,34351,30459,30472,30471,30468,30505,30500,30494,30501,30502,30491,30519,30520,30535,30554,30568,30571,30555,30565,30591,30590,30585,30606,30603,30609,30624,30622,30640,30646,30649,30655,30652,30653,30651,30663,30669,30679,30682,30684,30691,30702,30716,30732,30738,31014,30752,31018,30789,30862,30836,30854,30844,30874,30860,30883,30901,30890,30895,30929,30918,30923,30932,30910,30908,30917,30922,30956,30951,30938,30973,30964,30983,30994,30993,31001,31020,31019,31040,31072,31063,31071,31066,31061,31059,31098,31103,31114,31133,31143,40779,31146,31150,31155,31161,31162,31177,31189,31207,31212,31201,31203,31240,31245,31256,31257,31264,31263,31104,31281,31291,31294,31287,31299,31319,31305,31329,31330,31337,40861,31344,31353,31357,31368,31383,31381,31384,31382,31401,31432,31408,31414,31429,31428,31423,36995,31431,31434,31437,31439,31445,31443,31449,31450,31453,31457,31458,31462,31469,31472,31490,31503,31498,31494,31539,31512,31513,31518,31541,31528,31542,31568,31610,31492,31565,31499,31564,31557,31605,31589,31604,31591,31600,31601,31596,31598,31645,31640,31647,31629,31644,31642,31627,31634,31631,31581,31641,31691,31681,31692,31695,31668,31686,31709,31721,31761,31764,31718,31717,31840,31744,31751,31763,31731,31735,31767,31757,31734,31779,31783,31786,31775,31799,31787,31805,31820,31811,31828,31823,31808,31824,31832,31839,31844,31830,31845,31852,31861,31875,31888,31908,31917,31906,31915,31905,31912,31923,31922,31921,31918,31929,31933,31936,31941,31938,31960,31954,31964,31970,39739,31983,31986,31988,31990,31994,32006,32002,32028,32021,32010,32069,32075,32046,32050,32063,32053,32070,32115,32086,32078,32114,32104,32110,32079,32099,32147,32137,32091,32143,32125,32155,32186,32174,32163,32181,32199,32189,32171,32317,32162,32175,32220,32184,32159,32176,32216,32221,32228,32222,32251,32242,32225,32261,32266,32291,32289,32274,32305,32287,32265,32267,32290,32326,32358,32315,32309,32313,32323,32311,32306,32314,32359,32349,32342,32350,32345,32346,32377,32362,32361,32380,32379,32387,32213,32381,36782,32383,32392,32393,32396,32402,32400,32403,32404,32406,32398,32411,32412,32568,32570,32581,32588,32589,32590,32592,32593,32597,32596,32600,32607,32608,32616,32617,32615,32632,32642,32646,32643,32648,32647,32652,32660,32670,32669,32666,32675,32687,32690,32697,32686,32694,32696,35697,32709,32710,32714,32725,32724,32737,32742,32745,32755,32761,39132,32774,32772,32779,32786,32792,32793,32796,32801,32808,32831,32827,32842,32838,32850,32856,32858,32863,32866,32872,32883,32882,32880,32886,32889,32893,32895,32900,32902,32901,32923,32915,32922,32941,20880,32940,32987,32997,32985,32989,32964,32986,32982,33033,33007,33009,33051,33065,33059,33071,33099,38539,33094,33086,33107,33105,33020,33137,33134,33125,33126,33140,33155,33160,33162,33152,33154,33184,33173,33188,33187,33119,33171,33193,33200,33205,33214,33208,33213,33216,33218,33210,33225,33229,33233,33241,33240,33224,33242,33247,33248,33255,33274,33275,33278,33281,33282,33285,33287,33290,33293,33296,33302,33321,33323,33336,33331,33344,33369,33368,33373,33370,33375,33380,33378,33384,33386,33387,33326,33393,33399,33400,33406,33421,33426,33451,33439,33467,33452,33505,33507,33503,33490,33524,33523,33530,33683,33539,33531,33529,33502,33542,33500,33545,33497,33589,33588,33558,33586,33585,33600,33593,33616,33605,33583,33579,33559,33560,33669,33690,33706,33695,33698,33686,33571,33678,33671,33674,33660,33717,33651,33653,33696,33673,33704,33780,33811,33771,33742,33789,33795,33752,33803,33729,33783,33799,33760,33778,33805,33826,33824,33725,33848,34054,33787,33901,33834,33852,34138,33924,33911,33899,33965,33902,33922,33897,33862,33836,33903,33913,33845,33994,33890,33977,33983,33951,34009,33997,33979,34010,34000,33985,33990,34006,33953,34081,34047,34036,34071,34072,34092,34079,34069,34068,34044,34112,34147,34136,34120,34113,34306,34123,34133,34176,34212,34184,34193,34186,34216,34157,34196,34203,34282,34183,34204,34167,34174,34192,34249,34234,34255,34233,34256,34261,34269,34277,34268,34297,34314,34323,34315,34302,34298,34310,34338,34330,34352,34367,34381,20053,34388,34399,34407,34417,34451,34467,34473,34474,34443,34444,34486,34479,34500,34502,34480,34505,34851,34475,34516,34526,34537,34540,34527,34523,34543,34578,34566,34568,34560,34563,34555,34577,34569,34573,34553,34570,34612,34623,34615,34619,34597,34601,34586,34656,34655,34680,34636,34638,34676,34647,34664,34670,34649,34643,34659,34666,34821,34722,34719,34690,34735,34763,34749,34752,34768,38614,34731,34756,34739,34759,34758,34747,34799,34802,34784,34831,34829,34814,34806,34807,34830,34770,34833,34838,34837,34850,34849,34865,34870,34873,34855,34875,34884,34882,34898,34905,34910,34914,34923,34945,34942,34974,34933,34941,34997,34930,34946,34967,34962,34990,34969,34978,34957,34980,34992,35007,34993,35011,35012,35028,35032,35033,35037,35065,35074,35068,35060,35048,35058,35076,35084,35082,35091,35139,35102,35109,35114,35115,35137,35140,35131,35126,35128,35148,35101,35168,35166,35174,35172,35181,35178,35183,35188,35191,35198,35203,35208,35210,35219,35224,35233,35241,35238,35244,35247,35250,35258,35261,35263,35264,35290,35292,35293,35303,35316,35320,35331,35350,35344,35340,35355,35357,35365,35382,35393,35419,35410,35398,35400,35452,35437,35436,35426,35461,35458,35460,35496,35489,35473,35493,35494,35482,35491,35524,35533,35522,35546,35563,35571,35559,35556,35569,35604,35552,35554,35575,35550,35547,35596,35591,35610,35553,35606,35600,35607,35616,35635,38827,35622,35627,35646,35624,35649,35660,35663,35662,35657,35670,35675,35674,35691,35679,35692,35695,35700,35709,35712,35724,35726,35730,35731,35734,35737,35738,35898,35905,35903,35912,35916,35918,35920,35925,35938,35948,35960,35962,35970,35977,35973,35978,35981,35982,35988,35964,35992,25117,36013,36010,36029,36018,36019,36014,36022,36040,36033,36068,36067,36058,36093,36090,36091,36100,36101,36106,36103,36111,36109,36112,40782,36115,36045,36116,36118,36199,36205,36209,36211,36225,36249,36290,36286,36282,36303,36314,36310,36300,36315,36299,36330,36331,36319,36323,36348,36360,36361,36351,36381,36382,36368,36383,36418,36405,36400,36404,36426,36423,36425,36428,36432,36424,36441,36452,36448,36394,36451,36437,36470,36466,36476,36481,36487,36485,36484,36491,36490,36499,36497,36500,36505,36522,36513,36524,36528,36550,36529,36542,36549,36552,36555,36571,36579,36604,36603,36587,36606,36618,36613,36629,36626,36633,36627,36636,36639,36635,36620,36646,36659,36667,36665,36677,36674,36670,36684,36681,36678,36686,36695,36700,36706,36707,36708,36764,36767,36771,36781,36783,36791,36826,36837,36834,36842,36847,36999,36852,36869,36857,36858,36881,36885,36897,36877,36894,36886,36875,36903,36918,36917,36921,36856,36943,36944,36945,36946,36878,36937,36926,36950,36952,36958,36968,36975,36982,38568,36978,36994,36989,36993,36992,37002,37001,37007,37032,37039,37041,37045,37090,37092,25160,37083,37122,37138,37145,37170,37168,37194,37206,37208,37219,37221,37225,37235,37234,37259,37257,37250,37282,37291,37295,37290,37301,37300,37306,37312,37313,37321,37323,37328,37334,37343,37345,37339,37372,37365,37366,37406,37375,37396,37420,37397,37393,37470,37463,37445,37449,37476,37448,37525,37439,37451,37456,37532,37526,37523,37531,37466,37583,37561,37559,37609,37647,37626,37700,37678,37657,37666,37658,37667,37690,37685,37691,37724,37728,37756,37742,37718,37808,37804,37805,37780,37817,37846,37847,37864,37861,37848,37827,37853,37840,37832,37860,37914,37908,37907,37891,37895,37904,37942,37931,37941,37921,37946,37953,37970,37956,37979,37984,37986,37982,37994,37417,38000,38005,38007,38013,37978,38012,38014,38017,38015,38274,38279,38282,38292,38294,38296,38297,38304,38312,38311,38317,38332,38331,38329,38334,38346,28662,38339,38349,38348,38357,38356,38358,38364,38369,38373,38370,38433,38440,38446,38447,38466,38476,38479,38475,38519,38492,38494,38493,38495,38502,38514,38508,38541,38552,38549,38551,38570,38567,38577,38578,38576,38580,38582,38584,38585,38606,38603,38601,38605,35149,38620,38669,38613,38649,38660,38662,38664,38675,38670,38673,38671,38678,38681,38692,38698,38704,38713,38717,38718,38724,38726,38728,38722,38729,38748,38752,38756,38758,38760,21202,38763,38769,38777,38789,38780,38785,38778,38790,38795,38799,38800,38812,38824,38822,38819,38835,38836,38851,38854,38856,38859,38876,38893,40783,38898,31455,38902,38901,38927,38924,38968,38948,38945,38967,38973,38982,38991,38987,39019,39023,39024,39025,39028,39027,39082,39087,39089,39094,39108,39107,39110,39145,39147,39171,39177,39186,39188,39192,39201,39197,39198,39204,39200,39212,39214,39229,39230,39234,39241,39237,39248,39243,39249,39250,39244,39253,39319,39320,39333,39341,39342,39356,39391,39387,39389,39384,39377,39405,39406,39409,39410,39419,39416,39425,39439,39429,39394,39449,39467,39479,39493,39490,39488,39491,39486,39509,39501,39515,39511,39519,39522,39525,39524,39529,39531,39530,39597,39600,39612,39616,39631,39633,39635,39636,39646,39647,39650,39651,39654,39663,39659,39662,39668,39665,39671,39675,39686,39704,39706,39711,39714,39715,39717,39719,39720,39721,39722,39726,39727,39730,39748,39747,39759,39757,39758,39761,39768,39796,39827,39811,39825,39830,39831,39839,39840,39848,39860,39872,39882,39865,39878,39887,39889,39890,39907,39906,39908,39892,39905,39994,39922,39921,39920,39957,39956,39945,39955,39948,39942,39944,39954,39946,39940,39982,39963,39973,39972,39969,39984,40007,39986,40006,39998,40026,40032,40039,40054,40056,40167,40172,40176,40201,40200,40171,40195,40198,40234,40230,40367,40227,40223,40260,40213,40210,40257,40255,40254,40262,40264,40285,40286,40292,40273,40272,40281,40306,40329,40327,40363,40303,40314,40346,40356,40361,40370,40388,40385,40379,40376,40378,40390,40399,40386,40409,40403,40440,40422,40429,40431,40445,40474,40475,40478,40565,40569,40573,40577,40584,40587,40588,40594,40597,40593,40605,40613,40617,40632,40618,40621,38753,40652,40654,40655,40656,40660,40668,40670,40669,40672,40677,40680,40687,40692,40694,40695,40697,40699,40700,40701,40711,40712,30391,40725,40737,40748,40766,40778,40786,40788,40803,40799,40800,40801,40806,40807,40812,40810,40823,40818,40822,40853,40860,40864,22575,27079,36953,29796,20956,29081,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,32394,35100,37704,37512,34012,20425,28859,26161,26824,37625,26363,24389,20008,20193,20220,20224,20227,20281,20310,20370,20362,20378,20372,20429,20544,20514,20479,20510,20550,20592,20546,20628,20724,20696,20810,20836,20893,20926,20972,21013,21148,21158,21184,21211,21248,21255,21284,21362,21395,21426,21469,64014,21660,21642,21673,21759,21894,22361,22373,22444,22472,22471,64015,64016,22686,22706,22795,22867,22875,22877,22883,22948,22970,23382,23488,29999,23512,23532,23582,23718,23738,23797,23847,23891,64017,23874,23917,23992,23993,24016,24353,24372,24423,24503,24542,24669,24709,24714,24798,24789,24864,24818,24849,24887,24880,24984,25107,25254,25589,25696,25757,25806,25934,26112,26133,26171,26121,26158,26142,26148,26213,26199,26201,64018,26227,26265,26272,26290,26303,26362,26382,63785,26470,26555,26706,26560,26625,26692,26831,64019,26984,64020,27032,27106,27184,27243,27206,27251,27262,27362,27364,27606,27711,27740,27782,27759,27866,27908,28039,28015,28054,28076,28111,28152,28146,28156,28217,28252,28199,28220,28351,28552,28597,28661,28677,28679,28712,28805,28843,28943,28932,29020,28998,28999,64021,29121,29182,29361,29374,29476,64022,29559,29629,29641,29654,29667,29650,29703,29685,29734,29738,29737,29742,29794,29833,29855,29953,30063,30338,30364,30366,30363,30374,64023,30534,21167,30753,30798,30820,30842,31024,64024,64025,64026,31124,64027,31131,31441,31463,64028,31467,31646,64029,32072,32092,32183,32160,32214,32338,32583,32673,64030,33537,33634,33663,33735,33782,33864,33972,34131,34137,34155,64031,34224,64032,64033,34823,35061,35346,35383,35449,35495,35518,35551,64034,35574,35667,35711,36080,36084,36114,36214,64035,36559,64036,64037,36967,37086,64038,37141,37159,37338,37335,37342,37357,37358,37348,37349,37382,37392,37386,37434,37440,37436,37454,37465,37457,37433,37479,37543,37495,37496,37607,37591,37593,37584,64039,37589,37600,37587,37669,37665,37627,64040,37662,37631,37661,37634,37744,37719,37796,37830,37854,37880,37937,37957,37960,38290,63964,64041,38557,38575,38707,38715,38723,38733,38735,38737,38741,38999,39013,64042,64043,39207,64044,39326,39502,39641,39644,39797,39794,39823,39857,39867,39936,40304,40299,64045,40473,40657,null,null,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,65506,65508,65287,65282,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,65506,65508,65287,65282,12849,8470,8481,8757,32394,35100,37704,37512,34012,20425,28859,26161,26824,37625,26363,24389,20008,20193,20220,20224,20227,20281,20310,20370,20362,20378,20372,20429,20544,20514,20479,20510,20550,20592,20546,20628,20724,20696,20810,20836,20893,20926,20972,21013,21148,21158,21184,21211,21248,21255,21284,21362,21395,21426,21469,64014,21660,21642,21673,21759,21894,22361,22373,22444,22472,22471,64015,64016,22686,22706,22795,22867,22875,22877,22883,22948,22970,23382,23488,29999,23512,23532,23582,23718,23738,23797,23847,23891,64017,23874,23917,23992,23993,24016,24353,24372,24423,24503,24542,24669,24709,24714,24798,24789,24864,24818,24849,24887,24880,24984,25107,25254,25589,25696,25757,25806,25934,26112,26133,26171,26121,26158,26142,26148,26213,26199,26201,64018,26227,26265,26272,26290,26303,26362,26382,63785,26470,26555,26706,26560,26625,26692,26831,64019,26984,64020,27032,27106,27184,27243,27206,27251,27262,27362,27364,27606,27711,27740,27782,27759,27866,27908,28039,28015,28054,28076,28111,28152,28146,28156,28217,28252,28199,28220,28351,28552,28597,28661,28677,28679,28712,28805,28843,28943,28932,29020,28998,28999,64021,29121,29182,29361,29374,29476,64022,29559,29629,29641,29654,29667,29650,29703,29685,29734,29738,29737,29742,29794,29833,29855,29953,30063,30338,30364,30366,30363,30374,64023,30534,21167,30753,30798,30820,30842,31024,64024,64025,64026,31124,64027,31131,31441,31463,64028,31467,31646,64029,32072,32092,32183,32160,32214,32338,32583,32673,64030,33537,33634,33663,33735,33782,33864,33972,34131,34137,34155,64031,34224,64032,64033,34823,35061,35346,35383,35449,35495,35518,35551,64034,35574,35667,35711,36080,36084,36114,36214,64035,36559,64036,64037,36967,37086,64038,37141,37159,37338,37335,37342,37357,37358,37348,37349,37382,37392,37386,37434,37440,37436,37454,37465,37457,37433,37479,37543,37495,37496,37607,37591,37593,37584,64039,37589,37600,37587,37669,37665,37627,64040,37662,37631,37661,37634,37744,37719,37796,37830,37854,37880,37937,37957,37960,38290,63964,64041,38557,38575,38707,38715,38723,38733,38735,38737,38741,38999,39013,64042,64043,39207,64044,39326,39502,39641,39644,39797,39794,39823,39857,39867,39936,40304,40299,64045,40473,40657,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null],
+  "jis0212":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,728,711,184,729,733,175,731,730,65374,900,901,null,null,null,null,null,null,null,null,161,166,191,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,186,170,169,174,8482,164,8470,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,902,904,905,906,938,null,908,null,910,939,null,911,null,null,null,null,940,941,942,943,970,912,972,962,973,971,944,974,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1038,1039,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1118,1119,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,198,272,null,294,null,306,null,321,319,null,330,216,338,null,358,222,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,230,273,240,295,305,307,312,322,320,329,331,248,339,223,359,254,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,193,192,196,194,258,461,256,260,197,195,262,264,268,199,266,270,201,200,203,202,282,278,274,280,null,284,286,290,288,292,205,204,207,206,463,304,298,302,296,308,310,313,317,315,323,327,325,209,211,210,214,212,465,336,332,213,340,344,342,346,348,352,350,356,354,218,217,220,219,364,467,368,362,370,366,360,471,475,473,469,372,221,376,374,377,381,379,null,null,null,null,null,null,null,225,224,228,226,259,462,257,261,229,227,263,265,269,231,267,271,233,232,235,234,283,279,275,281,501,285,287,null,289,293,237,236,239,238,464,null,299,303,297,309,311,314,318,316,324,328,326,241,243,242,246,244,466,337,333,245,341,345,343,347,349,353,351,357,355,250,249,252,251,365,468,369,363,371,367,361,472,476,474,470,373,253,255,375,378,382,380,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,19970,19972,19973,19980,19986,19999,20003,20004,20008,20011,20014,20015,20016,20021,20032,20033,20036,20039,20049,20058,20060,20067,20072,20073,20084,20085,20089,20095,20109,20118,20119,20125,20143,20153,20163,20176,20186,20187,20192,20193,20194,20200,20207,20209,20211,20213,20221,20222,20223,20224,20226,20227,20232,20235,20236,20242,20245,20246,20247,20249,20270,20273,20320,20275,20277,20279,20281,20283,20286,20288,20290,20296,20297,20299,20300,20306,20308,20310,20312,20319,20323,20330,20332,20334,20337,20343,20344,20345,20346,20349,20350,20353,20354,20356,20357,20361,20362,20364,20366,20368,20370,20371,20372,20375,20377,20378,20382,20383,20402,20407,20409,20411,20412,20413,20414,20416,20417,20421,20422,20424,20425,20427,20428,20429,20431,20434,20444,20448,20450,20464,20466,20476,20477,20479,20480,20481,20484,20487,20490,20492,20494,20496,20499,20503,20504,20507,20508,20509,20510,20514,20519,20526,20528,20530,20531,20533,20544,20545,20546,20549,20550,20554,20556,20558,20561,20562,20563,20567,20569,20575,20576,20578,20579,20582,20583,20586,20589,20592,20593,20539,20609,20611,20612,20614,20618,20622,20623,20624,20626,20627,20628,20630,20635,20636,20638,20639,20640,20641,20642,20650,20655,20656,20665,20666,20669,20672,20675,20676,20679,20684,20686,20688,20691,20692,20696,20700,20701,20703,20706,20708,20710,20712,20713,20719,20721,20726,20730,20734,20739,20742,20743,20744,20747,20748,20749,20750,20722,20752,20759,20761,20763,20764,20765,20766,20771,20775,20776,20780,20781,20783,20785,20787,20788,20789,20792,20793,20802,20810,20815,20819,20821,20823,20824,20831,20836,20838,20862,20867,20868,20875,20878,20888,20893,20897,20899,20909,20920,20922,20924,20926,20927,20930,20936,20943,20945,20946,20947,20949,20952,20958,20962,20965,20974,20978,20979,20980,20983,20993,20994,20997,21010,21011,21013,21014,21016,21026,21032,21041,21042,21045,21052,21061,21065,21077,21079,21080,21082,21084,21087,21088,21089,21094,21102,21111,21112,21113,21120,21122,21125,21130,21132,21139,21141,21142,21143,21144,21146,21148,21156,21157,21158,21159,21167,21168,21174,21175,21176,21178,21179,21181,21184,21188,21190,21192,21196,21199,21201,21204,21206,21211,21212,21217,21221,21224,21225,21226,21228,21232,21233,21236,21238,21239,21248,21251,21258,21259,21260,21265,21267,21272,21275,21276,21278,21279,21285,21287,21288,21289,21291,21292,21293,21296,21298,21301,21308,21309,21310,21314,21324,21323,21337,21339,21345,21347,21349,21356,21357,21362,21369,21374,21379,21383,21384,21390,21395,21396,21401,21405,21409,21412,21418,21419,21423,21426,21428,21429,21431,21432,21434,21437,21440,21445,21455,21458,21459,21461,21466,21469,21470,21472,21478,21479,21493,21506,21523,21530,21537,21543,21544,21546,21551,21553,21556,21557,21571,21572,21575,21581,21583,21598,21602,21604,21606,21607,21609,21611,21613,21614,21620,21631,21633,21635,21637,21640,21641,21645,21649,21653,21654,21660,21663,21665,21670,21671,21673,21674,21677,21678,21681,21687,21689,21690,21691,21695,21702,21706,21709,21710,21728,21738,21740,21743,21750,21756,21758,21759,21760,21761,21765,21768,21769,21772,21773,21774,21781,21802,21803,21810,21813,21814,21819,21820,21821,21825,21831,21833,21834,21837,21840,21841,21848,21850,21851,21854,21856,21857,21860,21862,21887,21889,21890,21894,21896,21902,21903,21905,21906,21907,21908,21911,21923,21924,21933,21938,21951,21953,21955,21958,21961,21963,21964,21966,21969,21970,21971,21975,21976,21979,21982,21986,21993,22006,22015,22021,22024,22026,22029,22030,22031,22032,22033,22034,22041,22060,22064,22067,22069,22071,22073,22075,22076,22077,22079,22080,22081,22083,22084,22086,22089,22091,22093,22095,22100,22110,22112,22113,22114,22115,22118,22121,22125,22127,22129,22130,22133,22148,22149,22152,22155,22156,22165,22169,22170,22173,22174,22175,22182,22183,22184,22185,22187,22188,22189,22193,22195,22199,22206,22213,22217,22218,22219,22223,22224,22220,22221,22233,22236,22237,22239,22241,22244,22245,22246,22247,22248,22257,22251,22253,22262,22263,22273,22274,22279,22282,22284,22289,22293,22298,22299,22301,22304,22306,22307,22308,22309,22313,22314,22316,22318,22319,22323,22324,22333,22334,22335,22341,22342,22348,22349,22354,22370,22373,22375,22376,22379,22381,22382,22383,22384,22385,22387,22388,22389,22391,22393,22394,22395,22396,22398,22401,22403,22412,22420,22423,22425,22426,22428,22429,22430,22431,22433,22421,22439,22440,22441,22444,22456,22461,22471,22472,22476,22479,22485,22493,22494,22500,22502,22503,22505,22509,22512,22517,22518,22520,22525,22526,22527,22531,22532,22536,22537,22497,22540,22541,22555,22558,22559,22560,22566,22567,22573,22578,22585,22591,22601,22604,22605,22607,22608,22613,22623,22625,22628,22631,22632,22648,22652,22655,22656,22657,22663,22664,22665,22666,22668,22669,22671,22672,22676,22678,22685,22688,22689,22690,22694,22697,22705,22706,22724,22716,22722,22728,22733,22734,22736,22738,22740,22742,22746,22749,22753,22754,22761,22771,22789,22790,22795,22796,22802,22803,22804,34369,22813,22817,22819,22820,22824,22831,22832,22835,22837,22838,22847,22851,22854,22866,22867,22873,22875,22877,22878,22879,22881,22883,22891,22893,22895,22898,22901,22902,22905,22907,22908,22923,22924,22926,22930,22933,22935,22943,22948,22951,22957,22958,22959,22960,22963,22967,22970,22972,22977,22979,22980,22984,22986,22989,22994,23005,23006,23007,23011,23012,23015,23022,23023,23025,23026,23028,23031,23040,23044,23052,23053,23054,23058,23059,23070,23075,23076,23079,23080,23082,23085,23088,23108,23109,23111,23112,23116,23120,23125,23134,23139,23141,23143,23149,23159,23162,23163,23166,23179,23184,23187,23190,23193,23196,23198,23199,23200,23202,23207,23212,23217,23218,23219,23221,23224,23226,23227,23231,23236,23238,23240,23247,23258,23260,23264,23269,23274,23278,23285,23286,23293,23296,23297,23304,23319,23348,23321,23323,23325,23329,23333,23341,23352,23361,23371,23372,23378,23382,23390,23400,23406,23407,23420,23421,23422,23423,23425,23428,23430,23434,23438,23440,23441,23443,23444,23446,23464,23465,23468,23469,23471,23473,23474,23479,23482,23484,23488,23489,23501,23503,23510,23511,23512,23513,23514,23520,23535,23537,23540,23549,23564,23575,23582,23583,23587,23590,23593,23595,23596,23598,23600,23602,23605,23606,23641,23642,23644,23650,23651,23655,23656,23657,23661,23664,23668,23669,23674,23675,23676,23677,23687,23688,23690,23695,23698,23709,23711,23712,23714,23715,23718,23722,23730,23732,23733,23738,23753,23755,23762,23773,23767,23790,23793,23794,23796,23809,23814,23821,23826,23851,23843,23844,23846,23847,23857,23860,23865,23869,23871,23874,23875,23878,23880,23893,23889,23897,23882,23903,23904,23905,23906,23908,23914,23917,23920,23929,23930,23934,23935,23937,23939,23944,23946,23954,23955,23956,23957,23961,23963,23967,23968,23975,23979,23984,23988,23992,23993,24003,24007,24011,24016,24014,24024,24025,24032,24036,24041,24056,24057,24064,24071,24077,24082,24084,24085,24088,24095,24096,24110,24104,24114,24117,24126,24139,24144,24137,24145,24150,24152,24155,24156,24158,24168,24170,24171,24172,24173,24174,24176,24192,24203,24206,24226,24228,24229,24232,24234,24236,24241,24243,24253,24254,24255,24262,24268,24267,24270,24273,24274,24276,24277,24284,24286,24293,24299,24322,24326,24327,24328,24334,24345,24348,24349,24353,24354,24355,24356,24360,24363,24364,24366,24368,24372,24374,24379,24381,24383,24384,24388,24389,24391,24397,24400,24404,24408,24411,24416,24419,24420,24423,24431,24434,24436,24437,24440,24442,24445,24446,24457,24461,24463,24470,24476,24477,24482,24487,24491,24484,24492,24495,24496,24497,24504,24516,24519,24520,24521,24523,24528,24529,24530,24531,24532,24542,24545,24546,24552,24553,24554,24556,24557,24558,24559,24562,24563,24566,24570,24572,24583,24586,24589,24595,24596,24599,24600,24602,24607,24612,24621,24627,24629,24640,24647,24648,24649,24652,24657,24660,24662,24663,24669,24673,24679,24689,24702,24703,24706,24710,24712,24714,24718,24721,24723,24725,24728,24733,24734,24738,24740,24741,24744,24752,24753,24759,24763,24766,24770,24772,24776,24777,24778,24779,24782,24783,24788,24789,24793,24795,24797,24798,24802,24805,24818,24821,24824,24828,24829,24834,24839,24842,24844,24848,24849,24850,24851,24852,24854,24855,24857,24860,24862,24866,24874,24875,24880,24881,24885,24886,24887,24889,24897,24901,24902,24905,24926,24928,24940,24946,24952,24955,24956,24959,24960,24961,24963,24964,24971,24973,24978,24979,24983,24984,24988,24989,24991,24992,24997,25000,25002,25005,25016,25017,25020,25024,25025,25026,25038,25039,25045,25052,25053,25054,25055,25057,25058,25063,25065,25061,25068,25069,25071,25089,25091,25092,25095,25107,25109,25116,25120,25122,25123,25127,25129,25131,25145,25149,25154,25155,25156,25158,25164,25168,25169,25170,25172,25174,25178,25180,25188,25197,25199,25203,25210,25213,25229,25230,25231,25232,25254,25256,25267,25270,25271,25274,25278,25279,25284,25294,25301,25302,25306,25322,25330,25332,25340,25341,25347,25348,25354,25355,25357,25360,25363,25366,25368,25385,25386,25389,25397,25398,25401,25404,25409,25410,25411,25412,25414,25418,25419,25422,25426,25427,25428,25432,25435,25445,25446,25452,25453,25457,25460,25461,25464,25468,25469,25471,25474,25476,25479,25482,25488,25492,25493,25497,25498,25502,25508,25510,25517,25518,25519,25533,25537,25541,25544,25550,25553,25555,25556,25557,25564,25568,25573,25578,25580,25586,25587,25589,25592,25593,25609,25610,25616,25618,25620,25624,25630,25632,25634,25636,25637,25641,25642,25647,25648,25653,25661,25663,25675,25679,25681,25682,25683,25684,25690,25691,25692,25693,25695,25696,25697,25699,25709,25715,25716,25723,25725,25733,25735,25743,25744,25745,25752,25753,25755,25757,25759,25761,25763,25766,25768,25772,25779,25789,25790,25791,25796,25801,25802,25803,25804,25806,25808,25809,25813,25815,25828,25829,25833,25834,25837,25840,25845,25847,25851,25855,25857,25860,25864,25865,25866,25871,25875,25876,25878,25881,25883,25886,25887,25890,25894,25897,25902,25905,25914,25916,25917,25923,25927,25929,25936,25938,25940,25951,25952,25959,25963,25978,25981,25985,25989,25994,26002,26005,26008,26013,26016,26019,26022,26030,26034,26035,26036,26047,26050,26056,26057,26062,26064,26068,26070,26072,26079,26096,26098,26100,26101,26105,26110,26111,26112,26116,26120,26121,26125,26129,26130,26133,26134,26141,26142,26145,26146,26147,26148,26150,26153,26154,26155,26156,26158,26160,26161,26163,26169,26167,26176,26181,26182,26186,26188,26193,26190,26199,26200,26201,26203,26204,26208,26209,26363,26218,26219,26220,26238,26227,26229,26239,26231,26232,26233,26235,26240,26236,26251,26252,26253,26256,26258,26265,26266,26267,26268,26271,26272,26276,26285,26289,26290,26293,26299,26303,26304,26306,26307,26312,26316,26318,26319,26324,26331,26335,26344,26347,26348,26350,26362,26373,26375,26382,26387,26393,26396,26400,26402,26419,26430,26437,26439,26440,26444,26452,26453,26461,26470,26476,26478,26484,26486,26491,26497,26500,26510,26511,26513,26515,26518,26520,26521,26523,26544,26545,26546,26549,26555,26556,26557,26617,26560,26562,26563,26565,26568,26569,26578,26583,26585,26588,26593,26598,26608,26610,26614,26615,26706,26644,26649,26653,26655,26664,26663,26668,26669,26671,26672,26673,26675,26683,26687,26692,26693,26698,26700,26709,26711,26712,26715,26731,26734,26735,26736,26737,26738,26741,26745,26746,26747,26748,26754,26756,26758,26760,26774,26776,26778,26780,26785,26787,26789,26793,26794,26798,26802,26811,26821,26824,26828,26831,26832,26833,26835,26838,26841,26844,26845,26853,26856,26858,26859,26860,26861,26864,26865,26869,26870,26875,26876,26877,26886,26889,26890,26896,26897,26899,26902,26903,26929,26931,26933,26936,26939,26946,26949,26953,26958,26967,26971,26979,26980,26981,26982,26984,26985,26988,26992,26993,26994,27002,27003,27007,27008,27021,27026,27030,27032,27041,27045,27046,27048,27051,27053,27055,27063,27064,27066,27068,27077,27080,27089,27094,27095,27106,27109,27118,27119,27121,27123,27125,27134,27136,27137,27139,27151,27153,27157,27162,27165,27168,27172,27176,27184,27186,27188,27191,27195,27198,27199,27205,27206,27209,27210,27214,27216,27217,27218,27221,27222,27227,27236,27239,27242,27249,27251,27262,27265,27267,27270,27271,27273,27275,27281,27291,27293,27294,27295,27301,27307,27311,27312,27313,27316,27325,27326,27327,27334,27337,27336,27340,27344,27348,27349,27350,27356,27357,27364,27367,27372,27376,27377,27378,27388,27389,27394,27395,27398,27399,27401,27407,27408,27409,27415,27419,27422,27428,27432,27435,27436,27439,27445,27446,27451,27455,27462,27466,27469,27474,27478,27480,27485,27488,27495,27499,27502,27504,27509,27517,27518,27522,27525,27543,27547,27551,27552,27554,27555,27560,27561,27564,27565,27566,27568,27576,27577,27581,27582,27587,27588,27593,27596,27606,27610,27617,27619,27622,27623,27630,27633,27639,27641,27647,27650,27652,27653,27657,27661,27662,27664,27666,27673,27679,27686,27687,27688,27692,27694,27699,27701,27702,27706,27707,27711,27722,27723,27725,27727,27730,27732,27737,27739,27740,27755,27757,27759,27764,27766,27768,27769,27771,27781,27782,27783,27785,27796,27797,27799,27800,27804,27807,27824,27826,27828,27842,27846,27853,27855,27856,27857,27858,27860,27862,27866,27868,27872,27879,27881,27883,27884,27886,27890,27892,27908,27911,27914,27918,27919,27921,27923,27930,27942,27943,27944,27751,27950,27951,27953,27961,27964,27967,27991,27998,27999,28001,28005,28007,28015,28016,28028,28034,28039,28049,28050,28052,28054,28055,28056,28074,28076,28084,28087,28089,28093,28095,28100,28104,28106,28110,28111,28118,28123,28125,28127,28128,28130,28133,28137,28143,28144,28148,28150,28156,28160,28164,28190,28194,28199,28210,28214,28217,28219,28220,28228,28229,28232,28233,28235,28239,28241,28242,28243,28244,28247,28252,28253,28254,28258,28259,28264,28275,28283,28285,28301,28307,28313,28320,28327,28333,28334,28337,28339,28347,28351,28352,28353,28355,28359,28360,28362,28365,28366,28367,28395,28397,28398,28409,28411,28413,28420,28424,28426,28428,28429,28438,28440,28442,28443,28454,28457,28458,28463,28464,28467,28470,28475,28476,28461,28495,28497,28498,28499,28503,28505,28506,28509,28510,28513,28514,28520,28524,28541,28542,28547,28551,28552,28555,28556,28557,28560,28562,28563,28564,28566,28570,28575,28576,28581,28582,28583,28584,28590,28591,28592,28597,28598,28604,28613,28615,28616,28618,28634,28638,28648,28649,28656,28661,28665,28668,28669,28672,28677,28678,28679,28685,28695,28704,28707,28719,28724,28727,28729,28732,28739,28740,28744,28745,28746,28747,28756,28757,28765,28766,28750,28772,28773,28780,28782,28789,28790,28798,28801,28805,28806,28820,28821,28822,28823,28824,28827,28836,28843,28848,28849,28852,28855,28874,28881,28883,28884,28885,28886,28888,28892,28900,28922,28931,28932,28933,28934,28935,28939,28940,28943,28958,28960,28971,28973,28975,28976,28977,28984,28993,28997,28998,28999,29002,29003,29008,29010,29015,29018,29020,29022,29024,29032,29049,29056,29061,29063,29068,29074,29082,29083,29088,29090,29103,29104,29106,29107,29114,29119,29120,29121,29124,29131,29132,29139,29142,29145,29146,29148,29176,29182,29184,29191,29192,29193,29203,29207,29210,29213,29215,29220,29227,29231,29236,29240,29241,29249,29250,29251,29253,29262,29263,29264,29267,29269,29270,29274,29276,29278,29280,29283,29288,29291,29294,29295,29297,29303,29304,29307,29308,29311,29316,29321,29325,29326,29331,29339,29352,29357,29358,29361,29364,29374,29377,29383,29385,29388,29397,29398,29400,29407,29413,29427,29428,29434,29435,29438,29442,29444,29445,29447,29451,29453,29458,29459,29464,29465,29470,29474,29476,29479,29480,29484,29489,29490,29493,29498,29499,29501,29507,29517,29520,29522,29526,29528,29533,29534,29535,29536,29542,29543,29545,29547,29548,29550,29551,29553,29559,29561,29564,29568,29569,29571,29573,29574,29582,29584,29587,29589,29591,29592,29596,29598,29599,29600,29602,29605,29606,29610,29611,29613,29621,29623,29625,29628,29629,29631,29637,29638,29641,29643,29644,29647,29650,29651,29654,29657,29661,29665,29667,29670,29671,29673,29684,29685,29687,29689,29690,29691,29693,29695,29696,29697,29700,29703,29706,29713,29722,29723,29732,29734,29736,29737,29738,29739,29740,29741,29742,29743,29744,29745,29753,29760,29763,29764,29766,29767,29771,29773,29777,29778,29783,29789,29794,29798,29799,29800,29803,29805,29806,29809,29810,29824,29825,29829,29830,29831,29833,29839,29840,29841,29842,29848,29849,29850,29852,29855,29856,29857,29859,29862,29864,29865,29866,29867,29870,29871,29873,29874,29877,29881,29883,29887,29896,29897,29900,29904,29907,29912,29914,29915,29918,29919,29924,29928,29930,29931,29935,29940,29946,29947,29948,29951,29958,29970,29974,29975,29984,29985,29988,29991,29993,29994,29999,30006,30009,30013,30014,30015,30016,30019,30023,30024,30030,30032,30034,30039,30046,30047,30049,30063,30065,30073,30074,30075,30076,30077,30078,30081,30085,30096,30098,30099,30101,30105,30108,30114,30116,30132,30138,30143,30144,30145,30148,30150,30156,30158,30159,30167,30172,30175,30176,30177,30180,30183,30188,30190,30191,30193,30201,30208,30210,30211,30212,30215,30216,30218,30220,30223,30226,30227,30229,30230,30233,30235,30236,30237,30238,30243,30245,30246,30249,30253,30258,30259,30261,30264,30265,30266,30268,30282,30272,30273,30275,30276,30277,30281,30283,30293,30297,30303,30308,30309,30317,30318,30319,30321,30324,30337,30341,30348,30349,30357,30363,30364,30365,30367,30368,30370,30371,30372,30373,30374,30375,30376,30378,30381,30397,30401,30405,30409,30411,30412,30414,30420,30425,30432,30438,30440,30444,30448,30449,30454,30457,30460,30464,30470,30474,30478,30482,30484,30485,30487,30489,30490,30492,30498,30504,30509,30510,30511,30516,30517,30518,30521,30525,30526,30530,30533,30534,30538,30541,30542,30543,30546,30550,30551,30556,30558,30559,30560,30562,30564,30567,30570,30572,30576,30578,30579,30580,30586,30589,30592,30596,30604,30605,30612,30613,30614,30618,30623,30626,30631,30634,30638,30639,30641,30645,30654,30659,30665,30673,30674,30677,30681,30686,30687,30688,30692,30694,30698,30700,30704,30705,30708,30712,30715,30725,30726,30729,30733,30734,30737,30749,30753,30754,30755,30765,30766,30768,30773,30775,30787,30788,30791,30792,30796,30798,30802,30812,30814,30816,30817,30819,30820,30824,30826,30830,30842,30846,30858,30863,30868,30872,30881,30877,30878,30879,30884,30888,30892,30893,30896,30897,30898,30899,30907,30909,30911,30919,30920,30921,30924,30926,30930,30931,30933,30934,30948,30939,30943,30944,30945,30950,30954,30962,30963,30976,30966,30967,30970,30971,30975,30982,30988,30992,31002,31004,31006,31007,31008,31013,31015,31017,31021,31025,31028,31029,31035,31037,31039,31044,31045,31046,31050,31051,31055,31057,31060,31064,31067,31068,31079,31081,31083,31090,31097,31099,31100,31102,31115,31116,31121,31123,31124,31125,31126,31128,31131,31132,31137,31144,31145,31147,31151,31153,31156,31160,31163,31170,31172,31175,31176,31178,31183,31188,31190,31194,31197,31198,31200,31202,31205,31210,31211,31213,31217,31224,31228,31234,31235,31239,31241,31242,31244,31249,31253,31259,31262,31265,31271,31275,31277,31279,31280,31284,31285,31288,31289,31290,31300,31301,31303,31304,31308,31317,31318,31321,31324,31325,31327,31328,31333,31335,31338,31341,31349,31352,31358,31360,31362,31365,31366,31370,31371,31376,31377,31380,31390,31392,31395,31404,31411,31413,31417,31419,31420,31430,31433,31436,31438,31441,31451,31464,31465,31467,31468,31473,31476,31483,31485,31486,31495,31508,31519,31523,31527,31529,31530,31531,31533,31534,31535,31536,31537,31540,31549,31551,31552,31553,31559,31566,31573,31584,31588,31590,31593,31594,31597,31599,31602,31603,31607,31620,31625,31630,31632,31633,31638,31643,31646,31648,31653,31660,31663,31664,31666,31669,31670,31674,31675,31676,31677,31682,31685,31688,31690,31700,31702,31703,31705,31706,31707,31720,31722,31730,31732,31733,31736,31737,31738,31740,31742,31745,31746,31747,31748,31750,31753,31755,31756,31758,31759,31769,31771,31776,31781,31782,31784,31788,31793,31795,31796,31798,31801,31802,31814,31818,31829,31825,31826,31827,31833,31834,31835,31836,31837,31838,31841,31843,31847,31849,31853,31854,31856,31858,31865,31868,31869,31878,31879,31887,31892,31902,31904,31910,31920,31926,31927,31930,31931,31932,31935,31940,31943,31944,31945,31949,31951,31955,31956,31957,31959,31961,31962,31965,31974,31977,31979,31989,32003,32007,32008,32009,32015,32017,32018,32019,32022,32029,32030,32035,32038,32042,32045,32049,32060,32061,32062,32064,32065,32071,32072,32077,32081,32083,32087,32089,32090,32092,32093,32101,32103,32106,32112,32120,32122,32123,32127,32129,32130,32131,32133,32134,32136,32139,32140,32141,32145,32150,32151,32157,32158,32166,32167,32170,32179,32182,32183,32185,32194,32195,32196,32197,32198,32204,32205,32206,32215,32217,32256,32226,32229,32230,32234,32235,32237,32241,32245,32246,32249,32250,32264,32272,32273,32277,32279,32284,32285,32288,32295,32296,32300,32301,32303,32307,32310,32319,32324,32325,32327,32334,32336,32338,32344,32351,32353,32354,32357,32363,32366,32367,32371,32376,32382,32385,32390,32391,32394,32397,32401,32405,32408,32410,32413,32414,32572,32571,32573,32574,32575,32579,32580,32583,32591,32594,32595,32603,32604,32605,32609,32611,32612,32613,32614,32621,32625,32637,32638,32639,32640,32651,32653,32655,32656,32657,32662,32663,32668,32673,32674,32678,32682,32685,32692,32700,32703,32704,32707,32712,32718,32719,32731,32735,32739,32741,32744,32748,32750,32751,32754,32762,32765,32766,32767,32775,32776,32778,32781,32782,32783,32785,32787,32788,32790,32797,32798,32799,32800,32804,32806,32812,32814,32816,32820,32821,32823,32825,32826,32828,32830,32832,32836,32864,32868,32870,32877,32881,32885,32897,32904,32910,32924,32926,32934,32935,32939,32952,32953,32968,32973,32975,32978,32980,32981,32983,32984,32992,33005,33006,33008,33010,33011,33014,33017,33018,33022,33027,33035,33046,33047,33048,33052,33054,33056,33060,33063,33068,33072,33077,33082,33084,33093,33095,33098,33100,33106,33111,33120,33121,33127,33128,33129,33133,33135,33143,33153,33168,33156,33157,33158,33163,33166,33174,33176,33179,33182,33186,33198,33202,33204,33211,33227,33219,33221,33226,33230,33231,33237,33239,33243,33245,33246,33249,33252,33259,33260,33264,33265,33266,33269,33270,33272,33273,33277,33279,33280,33283,33295,33299,33300,33305,33306,33309,33313,33314,33320,33330,33332,33338,33347,33348,33349,33350,33355,33358,33359,33361,33366,33372,33376,33379,33383,33389,33396,33403,33405,33407,33408,33409,33411,33412,33415,33417,33418,33422,33425,33428,33430,33432,33434,33435,33440,33441,33443,33444,33447,33448,33449,33450,33454,33456,33458,33460,33463,33466,33468,33470,33471,33478,33488,33493,33498,33504,33506,33508,33512,33514,33517,33519,33526,33527,33533,33534,33536,33537,33543,33544,33546,33547,33620,33563,33565,33566,33567,33569,33570,33580,33581,33582,33584,33587,33591,33594,33596,33597,33602,33603,33604,33607,33613,33614,33617,33621,33622,33623,33648,33656,33661,33663,33664,33666,33668,33670,33677,33682,33684,33685,33688,33689,33691,33692,33693,33702,33703,33705,33708,33726,33727,33728,33735,33737,33743,33744,33745,33748,33757,33619,33768,33770,33782,33784,33785,33788,33793,33798,33802,33807,33809,33813,33817,33709,33839,33849,33861,33863,33864,33866,33869,33871,33873,33874,33878,33880,33881,33882,33884,33888,33892,33893,33895,33898,33904,33907,33908,33910,33912,33916,33917,33921,33925,33938,33939,33941,33950,33958,33960,33961,33962,33967,33969,33972,33978,33981,33982,33984,33986,33991,33992,33996,33999,34003,34012,34023,34026,34031,34032,34033,34034,34039,34098,34042,34043,34045,34050,34051,34055,34060,34062,34064,34076,34078,34082,34083,34084,34085,34087,34090,34091,34095,34099,34100,34102,34111,34118,34127,34128,34129,34130,34131,34134,34137,34140,34141,34142,34143,34144,34145,34146,34148,34155,34159,34169,34170,34171,34173,34175,34177,34181,34182,34185,34187,34188,34191,34195,34200,34205,34207,34208,34210,34213,34215,34228,34230,34231,34232,34236,34237,34238,34239,34242,34247,34250,34251,34254,34221,34264,34266,34271,34272,34278,34280,34285,34291,34294,34300,34303,34304,34308,34309,34317,34318,34320,34321,34322,34328,34329,34331,34334,34337,34343,34345,34358,34360,34362,34364,34365,34368,34370,34374,34386,34387,34390,34391,34392,34393,34397,34400,34401,34402,34403,34404,34409,34412,34415,34421,34422,34423,34426,34445,34449,34454,34456,34458,34460,34465,34470,34471,34472,34477,34481,34483,34484,34485,34487,34488,34489,34495,34496,34497,34499,34501,34513,34514,34517,34519,34522,34524,34528,34531,34533,34535,34440,34554,34556,34557,34564,34565,34567,34571,34574,34575,34576,34579,34580,34585,34590,34591,34593,34595,34600,34606,34607,34609,34610,34617,34618,34620,34621,34622,34624,34627,34629,34637,34648,34653,34657,34660,34661,34671,34673,34674,34683,34691,34692,34693,34694,34695,34696,34697,34699,34700,34704,34707,34709,34711,34712,34713,34718,34720,34723,34727,34732,34733,34734,34737,34741,34750,34751,34753,34760,34761,34762,34766,34773,34774,34777,34778,34780,34783,34786,34787,34788,34794,34795,34797,34801,34803,34808,34810,34815,34817,34819,34822,34825,34826,34827,34832,34841,34834,34835,34836,34840,34842,34843,34844,34846,34847,34856,34861,34862,34864,34866,34869,34874,34876,34881,34883,34885,34888,34889,34890,34891,34894,34897,34901,34902,34904,34906,34908,34911,34912,34916,34921,34929,34937,34939,34944,34968,34970,34971,34972,34975,34976,34984,34986,35002,35005,35006,35008,35018,35019,35020,35021,35022,35025,35026,35027,35035,35038,35047,35055,35056,35057,35061,35063,35073,35078,35085,35086,35087,35093,35094,35096,35097,35098,35100,35104,35110,35111,35112,35120,35121,35122,35125,35129,35130,35134,35136,35138,35141,35142,35145,35151,35154,35159,35162,35163,35164,35169,35170,35171,35179,35182,35184,35187,35189,35194,35195,35196,35197,35209,35213,35216,35220,35221,35227,35228,35231,35232,35237,35248,35252,35253,35254,35255,35260,35284,35285,35286,35287,35288,35301,35305,35307,35309,35313,35315,35318,35321,35325,35327,35332,35333,35335,35343,35345,35346,35348,35349,35358,35360,35362,35364,35366,35371,35372,35375,35381,35383,35389,35390,35392,35395,35397,35399,35401,35405,35406,35411,35414,35415,35416,35420,35421,35425,35429,35431,35445,35446,35447,35449,35450,35451,35454,35455,35456,35459,35462,35467,35471,35472,35474,35478,35479,35481,35487,35495,35497,35502,35503,35507,35510,35511,35515,35518,35523,35526,35528,35529,35530,35537,35539,35540,35541,35543,35549,35551,35564,35568,35572,35573,35574,35580,35583,35589,35590,35595,35601,35612,35614,35615,35594,35629,35632,35639,35644,35650,35651,35652,35653,35654,35656,35666,35667,35668,35673,35661,35678,35683,35693,35702,35704,35705,35708,35710,35713,35716,35717,35723,35725,35727,35732,35733,35740,35742,35743,35896,35897,35901,35902,35909,35911,35913,35915,35919,35921,35923,35924,35927,35928,35931,35933,35929,35939,35940,35942,35944,35945,35949,35955,35957,35958,35963,35966,35974,35975,35979,35984,35986,35987,35993,35995,35996,36004,36025,36026,36037,36038,36041,36043,36047,36054,36053,36057,36061,36065,36072,36076,36079,36080,36082,36085,36087,36088,36094,36095,36097,36099,36105,36114,36119,36123,36197,36201,36204,36206,36223,36226,36228,36232,36237,36240,36241,36245,36254,36255,36256,36262,36267,36268,36271,36274,36277,36279,36281,36283,36288,36293,36294,36295,36296,36298,36302,36305,36308,36309,36311,36313,36324,36325,36327,36332,36336,36284,36337,36338,36340,36349,36353,36356,36357,36358,36363,36369,36372,36374,36384,36385,36386,36387,36390,36391,36401,36403,36406,36407,36408,36409,36413,36416,36417,36427,36429,36430,36431,36436,36443,36444,36445,36446,36449,36450,36457,36460,36461,36463,36464,36465,36473,36474,36475,36482,36483,36489,36496,36498,36501,36506,36507,36509,36510,36514,36519,36521,36525,36526,36531,36533,36538,36539,36544,36545,36547,36548,36551,36559,36561,36564,36572,36584,36590,36592,36593,36599,36601,36602,36589,36608,36610,36615,36616,36623,36624,36630,36631,36632,36638,36640,36641,36643,36645,36647,36648,36652,36653,36654,36660,36661,36662,36663,36666,36672,36673,36675,36679,36687,36689,36690,36691,36692,36693,36696,36701,36702,36709,36765,36768,36769,36772,36773,36774,36789,36790,36792,36798,36800,36801,36806,36810,36811,36813,36816,36818,36819,36821,36832,36835,36836,36840,36846,36849,36853,36854,36859,36862,36866,36868,36872,36876,36888,36891,36904,36905,36911,36906,36908,36909,36915,36916,36919,36927,36931,36932,36940,36955,36957,36962,36966,36967,36972,36976,36980,36985,36997,37000,37003,37004,37006,37008,37013,37015,37016,37017,37019,37024,37025,37026,37029,37040,37042,37043,37044,37046,37053,37068,37054,37059,37060,37061,37063,37064,37077,37079,37080,37081,37084,37085,37087,37093,37074,37110,37099,37103,37104,37108,37118,37119,37120,37124,37125,37126,37128,37133,37136,37140,37142,37143,37144,37146,37148,37150,37152,37157,37154,37155,37159,37161,37166,37167,37169,37172,37174,37175,37177,37178,37180,37181,37187,37191,37192,37199,37203,37207,37209,37210,37211,37217,37220,37223,37229,37236,37241,37242,37243,37249,37251,37253,37254,37258,37262,37265,37267,37268,37269,37272,37278,37281,37286,37288,37292,37293,37294,37296,37297,37298,37299,37302,37307,37308,37309,37311,37314,37315,37317,37331,37332,37335,37337,37338,37342,37348,37349,37353,37354,37356,37357,37358,37359,37360,37361,37367,37369,37371,37373,37376,37377,37380,37381,37382,37383,37385,37386,37388,37392,37394,37395,37398,37400,37404,37405,37411,37412,37413,37414,37416,37422,37423,37424,37427,37429,37430,37432,37433,37434,37436,37438,37440,37442,37443,37446,37447,37450,37453,37454,37455,37457,37464,37465,37468,37469,37472,37473,37477,37479,37480,37481,37486,37487,37488,37493,37494,37495,37496,37497,37499,37500,37501,37503,37512,37513,37514,37517,37518,37522,37527,37529,37535,37536,37540,37541,37543,37544,37547,37551,37554,37558,37560,37562,37563,37564,37565,37567,37568,37569,37570,37571,37573,37574,37575,37576,37579,37580,37581,37582,37584,37587,37589,37591,37592,37593,37596,37597,37599,37600,37601,37603,37605,37607,37608,37612,37614,37616,37625,37627,37631,37632,37634,37640,37645,37649,37652,37653,37660,37661,37662,37663,37665,37668,37669,37671,37673,37674,37683,37684,37686,37687,37703,37704,37705,37712,37713,37714,37717,37719,37720,37722,37726,37732,37733,37735,37737,37738,37741,37743,37744,37745,37747,37748,37750,37754,37757,37759,37760,37761,37762,37768,37770,37771,37773,37775,37778,37781,37784,37787,37790,37793,37795,37796,37798,37800,37803,37812,37813,37814,37818,37801,37825,37828,37829,37830,37831,37833,37834,37835,37836,37837,37843,37849,37852,37854,37855,37858,37862,37863,37881,37879,37880,37882,37883,37885,37889,37890,37892,37896,37897,37901,37902,37903,37909,37910,37911,37919,37934,37935,37937,37938,37939,37940,37947,37951,37949,37955,37957,37960,37962,37964,37973,37977,37980,37983,37985,37987,37992,37995,37997,37998,37999,38001,38002,38020,38019,38264,38265,38270,38276,38280,38284,38285,38286,38301,38302,38303,38305,38310,38313,38315,38316,38324,38326,38330,38333,38335,38342,38344,38345,38347,38352,38353,38354,38355,38361,38362,38365,38366,38367,38368,38372,38374,38429,38430,38434,38436,38437,38438,38444,38449,38451,38455,38456,38457,38458,38460,38461,38465,38482,38484,38486,38487,38488,38497,38510,38516,38523,38524,38526,38527,38529,38530,38531,38532,38537,38545,38550,38554,38557,38559,38564,38565,38566,38569,38574,38575,38579,38586,38602,38610,23986,38616,38618,38621,38622,38623,38633,38639,38641,38650,38658,38659,38661,38665,38682,38683,38685,38689,38690,38691,38696,38705,38707,38721,38723,38730,38734,38735,38741,38743,38744,38746,38747,38755,38759,38762,38766,38771,38774,38775,38776,38779,38781,38783,38784,38793,38805,38806,38807,38809,38810,38814,38815,38818,38828,38830,38833,38834,38837,38838,38840,38841,38842,38844,38846,38847,38849,38852,38853,38855,38857,38858,38860,38861,38862,38864,38865,38868,38871,38872,38873,38877,38878,38880,38875,38881,38884,38895,38897,38900,38903,38904,38906,38919,38922,38937,38925,38926,38932,38934,38940,38942,38944,38947,38950,38955,38958,38959,38960,38962,38963,38965,38949,38974,38980,38983,38986,38993,38994,38995,38998,38999,39001,39002,39010,39011,39013,39014,39018,39020,39083,39085,39086,39088,39092,39095,39096,39098,39099,39103,39106,39109,39112,39116,39137,39139,39141,39142,39143,39146,39155,39158,39170,39175,39176,39185,39189,39190,39191,39194,39195,39196,39199,39202,39206,39207,39211,39217,39218,39219,39220,39221,39225,39226,39227,39228,39232,39233,39238,39239,39240,39245,39246,39252,39256,39257,39259,39260,39262,39263,39264,39323,39325,39327,39334,39344,39345,39346,39349,39353,39354,39357,39359,39363,39369,39379,39380,39385,39386,39388,39390,39399,39402,39403,39404,39408,39412,39413,39417,39421,39422,39426,39427,39428,39435,39436,39440,39441,39446,39454,39456,39458,39459,39460,39463,39469,39470,39475,39477,39478,39480,39495,39489,39492,39498,39499,39500,39502,39505,39508,39510,39517,39594,39596,39598,39599,39602,39604,39605,39606,39609,39611,39614,39615,39617,39619,39622,39624,39630,39632,39634,39637,39638,39639,39643,39644,39648,39652,39653,39655,39657,39660,39666,39667,39669,39673,39674,39677,39679,39680,39681,39682,39683,39684,39685,39688,39689,39691,39692,39693,39694,39696,39698,39702,39705,39707,39708,39712,39718,39723,39725,39731,39732,39733,39735,39737,39738,39741,39752,39755,39756,39765,39766,39767,39771,39774,39777,39779,39781,39782,39784,39786,39787,39788,39789,39790,39795,39797,39799,39800,39801,39807,39808,39812,39813,39814,39815,39817,39818,39819,39821,39823,39824,39828,39834,39837,39838,39846,39847,39849,39852,39856,39857,39858,39863,39864,39867,39868,39870,39871,39873,39879,39880,39886,39888,39895,39896,39901,39903,39909,39911,39914,39915,39919,39923,39927,39928,39929,39930,39933,39935,39936,39938,39947,39951,39953,39958,39960,39961,39962,39964,39966,39970,39971,39974,39975,39976,39977,39978,39985,39989,39990,39991,39997,40001,40003,40004,40005,40009,40010,40014,40015,40016,40019,40020,40022,40024,40027,40029,40030,40031,40035,40041,40042,40028,40043,40040,40046,40048,40050,40053,40055,40059,40166,40178,40183,40185,40203,40194,40209,40215,40216,40220,40221,40222,40239,40240,40242,40243,40244,40250,40252,40261,40253,40258,40259,40263,40266,40275,40276,40287,40291,40290,40293,40297,40298,40299,40304,40310,40311,40315,40316,40318,40323,40324,40326,40330,40333,40334,40338,40339,40341,40342,40343,40344,40353,40362,40364,40366,40369,40373,40377,40380,40383,40387,40391,40393,40394,40404,40405,40406,40407,40410,40414,40415,40416,40421,40423,40425,40427,40430,40432,40435,40436,40446,40458,40450,40455,40462,40464,40465,40466,40469,40470,40473,40476,40477,40570,40571,40572,40576,40578,40579,40580,40581,40583,40590,40591,40598,40600,40603,40606,40612,40616,40620,40622,40623,40624,40627,40628,40629,40646,40648,40651,40661,40671,40676,40679,40684,40685,40686,40688,40689,40690,40693,40696,40703,40706,40707,40713,40719,40720,40721,40722,40724,40726,40727,40729,40730,40731,40735,40738,40742,40746,40747,40751,40753,40754,40756,40759,40761,40762,40764,40765,40767,40769,40771,40772,40773,40774,40775,40787,40789,40790,40791,40792,40794,40797,40798,40808,40809,40813,40814,40815,40816,40817,40819,40821,40826,40829,40847,40848,40849,40850,40852,40854,40855,40862,40865,40866,40867,40869,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null],
+  "ibm866":[1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,9617,9618,9619,9474,9508,9569,9570,9558,9557,9571,9553,9559,9565,9564,9563,9488,9492,9524,9516,9500,9472,9532,9566,9567,9562,9556,9577,9574,9568,9552,9580,9575,9576,9572,9573,9561,9560,9554,9555,9579,9578,9496,9484,9608,9604,9612,9616,9600,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1025,1105,1028,1108,1031,1111,1038,1118,176,8729,183,8730,8470,164,9632,160],
+  "iso-8859-2":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,728,321,164,317,346,167,168,352,350,356,377,173,381,379,176,261,731,322,180,318,347,711,184,353,351,357,378,733,382,380,340,193,194,258,196,313,262,199,268,201,280,203,282,205,206,270,272,323,327,211,212,336,214,215,344,366,218,368,220,221,354,223,341,225,226,259,228,314,263,231,269,233,281,235,283,237,238,271,273,324,328,243,244,337,246,247,345,367,250,369,252,253,355,729],
+  "iso-8859-3":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,294,728,163,164,null,292,167,168,304,350,286,308,173,null,379,176,295,178,179,180,181,293,183,184,305,351,287,309,189,null,380,192,193,194,null,196,266,264,199,200,201,202,203,204,205,206,207,null,209,210,211,212,288,214,215,284,217,218,219,220,364,348,223,224,225,226,null,228,267,265,231,232,233,234,235,236,237,238,239,null,241,242,243,244,289,246,247,285,249,250,251,252,365,349,729],
+  "iso-8859-4":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,312,342,164,296,315,167,168,352,274,290,358,173,381,175,176,261,731,343,180,297,316,711,184,353,275,291,359,330,382,331,256,193,194,195,196,197,198,302,268,201,280,203,278,205,206,298,272,325,332,310,212,213,214,215,216,370,218,219,220,360,362,223,257,225,226,227,228,229,230,303,269,233,281,235,279,237,238,299,273,326,333,311,244,245,246,247,248,371,250,251,252,361,363,729],
+  "iso-8859-5":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,173,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,8470,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,167,1118,1119],
+  "iso-8859-6":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,null,null,null,164,null,null,null,null,null,null,null,1548,173,null,null,null,null,null,null,null,null,null,null,null,null,null,1563,null,null,null,1567,null,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,null,null,null,null,null,1600,1601,1602,1603,1604,1605,1606,1607,1608,1609,1610,1611,1612,1613,1614,1615,1616,1617,1618,null,null,null,null,null,null,null,null,null,null,null,null,null],
+  "iso-8859-7":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,8216,8217,163,8364,8367,166,167,168,169,890,171,172,173,null,8213,176,177,178,179,900,901,902,183,904,905,906,187,908,189,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,null,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,null],
+  "iso-8859-8":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,null,162,163,164,165,166,167,168,169,215,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,247,187,188,189,190,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,8215,1488,1489,1490,1491,1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510,1511,1512,1513,1514,null,null,8206,8207,null],
+  "iso-8859-10":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,274,290,298,296,310,167,315,272,352,358,381,173,362,330,176,261,275,291,299,297,311,183,316,273,353,359,382,8213,363,331,256,193,194,195,196,197,198,302,268,201,280,203,278,205,206,207,208,325,332,211,212,213,214,360,216,370,218,219,220,221,222,223,257,225,226,227,228,229,230,303,269,233,281,235,279,237,238,239,240,326,333,243,244,245,246,361,248,371,250,251,252,253,254,312],
+  "iso-8859-13":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,8221,162,163,164,8222,166,167,216,169,342,171,172,173,174,198,176,177,178,179,8220,181,182,183,248,185,343,187,188,189,190,230,260,302,256,262,196,197,280,274,268,201,377,278,290,310,298,315,352,323,325,211,332,213,214,215,370,321,346,362,220,379,381,223,261,303,257,263,228,229,281,275,269,233,378,279,291,311,299,316,353,324,326,243,333,245,246,247,371,322,347,363,252,380,382,8217],
+  "iso-8859-14":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,7682,7683,163,266,267,7690,167,7808,169,7810,7691,7922,173,174,376,7710,7711,288,289,7744,7745,182,7766,7809,7767,7811,7776,7923,7812,7813,7777,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,372,209,210,211,212,213,214,7786,216,217,218,219,220,221,374,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,373,241,242,243,244,245,246,7787,248,249,250,251,252,253,375,255],
+  "iso-8859-15":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,8364,165,352,167,353,169,170,171,172,173,174,175,176,177,178,179,381,181,182,183,382,185,186,187,338,339,376,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255],
+  "iso-8859-16":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,261,321,8364,8222,352,167,353,169,536,171,377,173,378,379,176,177,268,322,381,8221,182,183,382,269,537,187,338,339,376,380,192,193,194,258,196,262,198,199,200,201,202,203,204,205,206,207,272,323,210,211,212,336,214,346,368,217,218,219,220,280,538,223,224,225,226,259,228,263,230,231,232,233,234,235,236,237,238,239,273,324,242,243,244,337,246,347,369,249,250,251,252,281,539,255],
+  "koi8-r":[9472,9474,9484,9488,9492,9496,9500,9508,9516,9524,9532,9600,9604,9608,9612,9616,9617,9618,9619,8992,9632,8729,8730,8776,8804,8805,160,8993,176,178,183,247,9552,9553,9554,1105,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566,9567,9568,9569,1025,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,169,1102,1072,1073,1094,1076,1077,1092,1075,1093,1080,1081,1082,1083,1084,1085,1086,1087,1103,1088,1089,1090,1091,1078,1074,1100,1099,1079,1096,1101,1097,1095,1098,1070,1040,1041,1062,1044,1045,1060,1043,1061,1048,1049,1050,1051,1052,1053,1054,1055,1071,1056,1057,1058,1059,1046,1042,1068,1067,1047,1064,1069,1065,1063,1066],
+  "koi8-u":[9472,9474,9484,9488,9492,9496,9500,9508,9516,9524,9532,9600,9604,9608,9612,9616,9617,9618,9619,8992,9632,8729,8730,8776,8804,8805,160,8993,176,178,183,247,9552,9553,9554,1105,1108,9556,1110,1111,9559,9560,9561,9562,9563,1169,1118,9566,9567,9568,9569,1025,1028,9571,1030,1031,9574,9575,9576,9577,9578,1168,1038,169,1102,1072,1073,1094,1076,1077,1092,1075,1093,1080,1081,1082,1083,1084,1085,1086,1087,1103,1088,1089,1090,1091,1078,1074,1100,1099,1079,1096,1101,1097,1095,1098,1070,1040,1041,1062,1044,1045,1060,1043,1061,1048,1049,1050,1051,1052,1053,1054,1055,1071,1056,1057,1058,1059,1046,1042,1068,1067,1047,1064,1069,1065,1063,1066],
+  "macintosh":[196,197,199,201,209,214,220,225,224,226,228,227,229,231,233,232,234,235,237,236,238,239,241,243,242,244,246,245,250,249,251,252,8224,176,162,163,167,8226,182,223,174,169,8482,180,168,8800,198,216,8734,177,8804,8805,165,181,8706,8721,8719,960,8747,170,186,937,230,248,191,161,172,8730,402,8776,8710,171,187,8230,160,192,195,213,338,339,8211,8212,8220,8221,8216,8217,247,9674,255,376,8260,8364,8249,8250,64257,64258,8225,183,8218,8222,8240,194,202,193,203,200,205,206,207,204,211,212,63743,210,218,219,217,305,710,732,175,728,729,730,184,733,731,711],
+  "windows-874":[8364,129,130,131,132,8230,134,135,136,137,138,139,140,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,152,153,154,155,156,157,158,159,160,3585,3586,3587,3588,3589,3590,3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,3604,3605,3606,3607,3608,3609,3610,3611,3612,3613,3614,3615,3616,3617,3618,3619,3620,3621,3622,3623,3624,3625,3626,3627,3628,3629,3630,3631,3632,3633,3634,3635,3636,3637,3638,3639,3640,3641,3642,null,null,null,null,3647,3648,3649,3650,3651,3652,3653,3654,3655,3656,3657,3658,3659,3660,3661,3662,3663,3664,3665,3666,3667,3668,3669,3670,3671,3672,3673,3674,3675,null,null,null,null],
+  "windows-1250":[8364,129,8218,131,8222,8230,8224,8225,136,8240,352,8249,346,356,381,377,144,8216,8217,8220,8221,8226,8211,8212,152,8482,353,8250,347,357,382,378,160,711,728,321,164,260,166,167,168,169,350,171,172,173,174,379,176,177,731,322,180,181,182,183,184,261,351,187,317,733,318,380,340,193,194,258,196,313,262,199,268,201,280,203,282,205,206,270,272,323,327,211,212,336,214,215,344,366,218,368,220,221,354,223,341,225,226,259,228,314,263,231,269,233,281,235,283,237,238,271,273,324,328,243,244,337,246,247,345,367,250,369,252,253,355,729],
+  "windows-1251":[1026,1027,8218,1107,8222,8230,8224,8225,8364,8240,1033,8249,1034,1036,1035,1039,1106,8216,8217,8220,8221,8226,8211,8212,152,8482,1113,8250,1114,1116,1115,1119,160,1038,1118,1032,164,1168,166,167,1025,169,1028,171,172,173,174,1031,176,177,1030,1110,1169,181,182,183,1105,8470,1108,187,1112,1029,1109,1111,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103],
+  "windows-1252":[8364,129,8218,402,8222,8230,8224,8225,710,8240,352,8249,338,141,381,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,353,8250,339,157,382,376,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255],
+  "windows-1253":[8364,129,8218,402,8222,8230,8224,8225,136,8240,138,8249,140,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,152,8482,154,8250,156,157,158,159,160,901,902,163,164,165,166,167,168,169,null,171,172,173,174,8213,176,177,178,179,900,181,182,183,904,905,906,187,908,189,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,null,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,null],
+  "windows-1254":[8364,129,8218,402,8222,8230,8224,8225,710,8240,352,8249,338,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,353,8250,339,157,158,376,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,286,209,210,211,212,213,214,215,216,217,218,219,220,304,350,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,287,241,242,243,244,245,246,247,248,249,250,251,252,305,351,255],
+  "windows-1255":[8364,129,8218,402,8222,8230,8224,8225,710,8240,138,8249,140,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,154,8250,156,157,158,159,160,161,162,163,8362,165,166,167,168,169,215,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,247,187,188,189,190,191,1456,1457,1458,1459,1460,1461,1462,1463,1464,1465,1466,1467,1468,1469,1470,1471,1472,1473,1474,1475,1520,1521,1522,1523,1524,null,null,null,null,null,null,null,1488,1489,1490,1491,1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510,1511,1512,1513,1514,null,null,8206,8207,null],
+  "windows-1256":[8364,1662,8218,402,8222,8230,8224,8225,710,8240,1657,8249,338,1670,1688,1672,1711,8216,8217,8220,8221,8226,8211,8212,1705,8482,1681,8250,339,8204,8205,1722,160,1548,162,163,164,165,166,167,168,169,1726,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,1563,187,188,189,190,1567,1729,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,215,1591,1592,1593,1594,1600,1601,1602,1603,224,1604,226,1605,1606,1607,1608,231,232,233,234,235,1609,1610,238,239,1611,1612,1613,1614,244,1615,1616,247,1617,249,1618,251,252,8206,8207,1746],
+  "windows-1257":[8364,129,8218,131,8222,8230,8224,8225,136,8240,138,8249,140,168,711,184,144,8216,8217,8220,8221,8226,8211,8212,152,8482,154,8250,156,175,731,159,160,null,162,163,164,null,166,167,216,169,342,171,172,173,174,198,176,177,178,179,180,181,182,183,248,185,343,187,188,189,190,230,260,302,256,262,196,197,280,274,268,201,377,278,290,310,298,315,352,323,325,211,332,213,214,215,370,321,346,362,220,379,381,223,261,303,257,263,228,229,281,275,269,233,378,279,291,311,299,316,353,324,326,243,333,245,246,247,371,322,347,363,252,380,382,729],
+  "windows-1258":[8364,129,8218,402,8222,8230,8224,8225,710,8240,138,8249,338,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,154,8250,339,157,158,376,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,258,196,197,198,199,200,201,202,203,768,205,206,207,272,209,777,211,212,416,214,215,216,217,218,219,220,431,771,223,224,225,226,259,228,229,230,231,232,233,234,235,769,237,238,239,273,241,803,243,244,417,246,247,248,249,250,251,252,432,8363,255],
+  "x-mac-cyrillic":[1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,8224,176,1168,163,167,8226,182,1030,174,169,8482,1026,1106,8800,1027,1107,8734,177,8804,8805,1110,181,1169,1032,1028,1108,1031,1111,1033,1113,1034,1114,1112,1029,172,8730,402,8776,8710,171,187,8230,160,1035,1115,1036,1116,1109,8211,8212,8220,8221,8216,8217,247,8222,1038,1118,1039,1119,8470,1025,1105,1103,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,8364]
+};
+
+// For strict environments where `this` inside the global scope
+// is `undefined`, take a pure object instead
+}(this || {}));
+},{}],112:[function(require,module,exports){
+// This is free and unencumbered software released into the public domain.
+// See LICENSE.md for more information.
+
+/**
+ * @fileoverview Global |this| required for resolving indexes in node.
+ * @suppress {globalThis}
+ */
+(function(global) {
+  'use strict';
+
+  // If we're in node require encoding-indexes and attach it to the global.
+  if (typeof module !== "undefined" && module.exports &&
+    !global["encoding-indexes"]) {
+    global["encoding-indexes"] =
+      require("./encoding-indexes.js")["encoding-indexes"];
+  }
+
+  //
+  // Utilities
+  //
+
+  /**
+   * @param {number} a The number to test.
+   * @param {number} min The minimum value in the range, inclusive.
+   * @param {number} max The maximum value in the range, inclusive.
+   * @return {boolean} True if a >= min and a <= max.
+   */
+  function inRange(a, min, max) {
+    return min <= a && a <= max;
+  }
+
+  /**
+   * @param {!Array.<*>} array The array to check.
+   * @param {*} item The item to look for in the array.
+   * @return {boolean} True if the item appears in the array.
+   */
+  function includes(array, item) {
+    return array.indexOf(item) !== -1;
+  }
+
+  var floor = Math.floor;
+
+  /**
+   * @param {*} o
+   * @return {Object}
+   */
+  function ToDictionary(o) {
+    if (o === undefined) return {};
+    if (o === Object(o)) return o;
+    throw TypeError('Could not convert argument to dictionary');
+  }
+
+  /**
+   * @param {string} string Input string of UTF-16 code units.
+   * @return {!Array.<number>} Code points.
+   */
+  function stringToCodePoints(string) {
+    // https://heycam.github.io/webidl/#dfn-obtain-unicode
+
+    // 1. Let S be the DOMString value.
+    var s = String(string);
+
+    // 2. Let n be the length of S.
+    var n = s.length;
+
+    // 3. Initialize i to 0.
+    var i = 0;
+
+    // 4. Initialize U to be an empty sequence of Unicode characters.
+    var u = [];
+
+    // 5. While i < n:
+    while (i < n) {
+
+      // 1. Let c be the code unit in S at index i.
+      var c = s.charCodeAt(i);
+
+      // 2. Depending on the value of c:
+
+      // c < 0xD800 or c > 0xDFFF
+      if (c < 0xD800 || c > 0xDFFF) {
+        // Append to U the Unicode character with code point c.
+        u.push(c);
+      }
+
+      // 0xDC00 ≤ c ≤ 0xDFFF
+      else if (0xDC00 <= c && c <= 0xDFFF) {
+        // Append to U a U+FFFD REPLACEMENT CHARACTER.
+        u.push(0xFFFD);
+      }
+
+      // 0xD800 ≤ c ≤ 0xDBFF
+      else if (0xD800 <= c && c <= 0xDBFF) {
+        // 1. If i = n−1, then append to U a U+FFFD REPLACEMENT
+        // CHARACTER.
+        if (i === n - 1) {
+          u.push(0xFFFD);
+        }
+        // 2. Otherwise, i < n−1:
+        else {
+          // 1. Let d be the code unit in S at index i+1.
+          var d = s.charCodeAt(i + 1);
+
+          // 2. If 0xDC00 ≤ d ≤ 0xDFFF, then:
+          if (0xDC00 <= d && d <= 0xDFFF) {
+            // 1. Let a be c & 0x3FF.
+            var a = c & 0x3FF;
+
+            // 2. Let b be d & 0x3FF.
+            var b = d & 0x3FF;
+
+            // 3. Append to U the Unicode character with code point
+            // 2^16+2^10*a+b.
+            u.push(0x10000 + (a << 10) + b);
+
+            // 4. Set i to i+1.
+            i += 1;
+          }
+
+          // 3. Otherwise, d < 0xDC00 or d > 0xDFFF. Append to U a
+          // U+FFFD REPLACEMENT CHARACTER.
+          else  {
+            u.push(0xFFFD);
+          }
+        }
+      }
+
+      // 3. Set i to i+1.
+      i += 1;
+    }
+
+    // 6. Return U.
+    return u;
+  }
+
+  /**
+   * @param {!Array.<number>} code_points Array of code points.
+   * @return {string} string String of UTF-16 code units.
+   */
+  function codePointsToString(code_points) {
+    var s = '';
+    for (var i = 0; i < code_points.length; ++i) {
+      var cp = code_points[i];
+      if (cp <= 0xFFFF) {
+        s += String.fromCharCode(cp);
+      } else {
+        cp -= 0x10000;
+        s += String.fromCharCode((cp >> 10) + 0xD800,
+                                 (cp & 0x3FF) + 0xDC00);
+      }
+    }
+    return s;
+  }
+
+
+  //
+  // Implementation of Encoding specification
+  // https://encoding.spec.whatwg.org/
+  //
+
+  //
+  // 4. Terminology
+  //
+
+  /**
+   * An ASCII byte is a byte in the range 0x00 to 0x7F, inclusive.
+   * @param {number} a The number to test.
+   * @return {boolean} True if a is in the range 0x00 to 0x7F, inclusive.
+   */
+  function isASCIIByte(a) {
+    return 0x00 <= a && a <= 0x7F;
+  }
+
+  /**
+   * An ASCII code point is a code point in the range U+0000 to
+   * U+007F, inclusive.
+   */
+  var isASCIICodePoint = isASCIIByte;
+
+
+  /**
+   * End-of-stream is a special token that signifies no more tokens
+   * are in the stream.
+   * @const
+   */ var end_of_stream = -1;
+
+  /**
+   * A stream represents an ordered sequence of tokens.
+   *
+   * @constructor
+   * @param {!(Array.<number>|Uint8Array)} tokens Array of tokens that provide
+   * the stream.
+   */
+  function Stream(tokens) {
+    /** @type {!Array.<number>} */
+    this.tokens = [].slice.call(tokens);
+    // Reversed as push/pop is more efficient than shift/unshift.
+    this.tokens.reverse();
+  }
+
+  Stream.prototype = {
+    /**
+     * @return {boolean} True if end-of-stream has been hit.
+     */
+    endOfStream: function() {
+      return !this.tokens.length;
+    },
+
+    /**
+     * When a token is read from a stream, the first token in the
+     * stream must be returned and subsequently removed, and
+     * end-of-stream must be returned otherwise.
+     *
+     * @return {number} Get the next token from the stream, or
+     * end_of_stream.
+     */
+     read: function() {
+      if (!this.tokens.length)
+        return end_of_stream;
+       return this.tokens.pop();
+     },
+
+    /**
+     * When one or more tokens are prepended to a stream, those tokens
+     * must be inserted, in given order, before the first token in the
+     * stream.
+     *
+     * @param {(number|!Array.<number>)} token The token(s) to prepend to the
+     * stream.
+     */
+    prepend: function(token) {
+      if (Array.isArray(token)) {
+        var tokens = /**@type {!Array.<number>}*/(token);
+        while (tokens.length)
+          this.tokens.push(tokens.pop());
+      } else {
+        this.tokens.push(token);
+      }
+    },
+
+    /**
+     * When one or more tokens are pushed to a stream, those tokens
+     * must be inserted, in given order, after the last token in the
+     * stream.
+     *
+     * @param {(number|!Array.<number>)} token The tokens(s) to push to the
+     * stream.
+     */
+    push: function(token) {
+      if (Array.isArray(token)) {
+        var tokens = /**@type {!Array.<number>}*/(token);
+        while (tokens.length)
+          this.tokens.unshift(tokens.shift());
+      } else {
+        this.tokens.unshift(token);
+      }
+    }
+  };
+
+  //
+  // 5. Encodings
+  //
+
+  // 5.1 Encoders and decoders
+
+  /** @const */
+  var finished = -1;
+
+  /**
+   * @param {boolean} fatal If true, decoding errors raise an exception.
+   * @param {number=} opt_code_point Override the standard fallback code point.
+   * @return {number} The code point to insert on a decoding error.
+   */
+  function decoderError(fatal, opt_code_point) {
+    if (fatal)
+      throw TypeError('Decoder error');
+    return opt_code_point || 0xFFFD;
+  }
+
+  /**
+   * @param {number} code_point The code point that could not be encoded.
+   * @return {number} Always throws, no value is actually returned.
+   */
+  function encoderError(code_point) {
+    throw TypeError('The code point ' + code_point + ' could not be encoded.');
+  }
+
+  /** @interface */
+  function Decoder() {}
+  Decoder.prototype = {
+    /**
+     * @param {Stream} stream The stream of bytes being decoded.
+     * @param {number} bite The next byte read from the stream.
+     * @return {?(number|!Array.<number>)} The next code point(s)
+     *     decoded, or null if not enough data exists in the input
+     *     stream to decode a complete code point, or |finished|.
+     */
+    handler: function(stream, bite) {}
+  };
+
+  /** @interface */
+  function Encoder() {}
+  Encoder.prototype = {
+    /**
+     * @param {Stream} stream The stream of code points being encoded.
+     * @param {number} code_point Next code point read from the stream.
+     * @return {(number|!Array.<number>)} Byte(s) to emit, or |finished|.
+     */
+    handler: function(stream, code_point) {}
+  };
+
+  // 5.2 Names and labels
+
+  // TODO: Define @typedef for Encoding: {name:string,labels:Array.<string>}
+  // https://github.com/google/closure-compiler/issues/247
+
+  /**
+   * @param {string} label The encoding label.
+   * @return {?{name:string,labels:Array.<string>}}
+   */
+  function getEncoding(label) {
+    // 1. Remove any leading and trailing ASCII whitespace from label.
+    label = String(label).trim().toLowerCase();
+
+    // 2. If label is an ASCII case-insensitive match for any of the
+    // labels listed in the table below, return the corresponding
+    // encoding, and failure otherwise.
+    if (Object.prototype.hasOwnProperty.call(label_to_encoding, label)) {
+      return label_to_encoding[label];
+    }
+    return null;
+  }
+
+  /**
+   * Encodings table: https://encoding.spec.whatwg.org/encodings.json
+   * @const
+   * @type {!Array.<{
+   *          heading: string,
+   *          encodings: Array.<{name:string,labels:Array.<string>}>
+   *        }>}
+   */
+  var encodings = [
+    {
+      "encodings": [
+        {
+          "labels": [
+            "unicode-1-1-utf-8",
+            "utf-8",
+            "utf8"
+          ],
+          "name": "UTF-8"
+        }
+      ],
+      "heading": "The Encoding"
+    },
+    {
+      "encodings": [
+        {
+          "labels": [
+            "866",
+            "cp866",
+            "csibm866",
+            "ibm866"
+          ],
+          "name": "IBM866"
+        },
+        {
+          "labels": [
+            "csisolatin2",
+            "iso-8859-2",
+            "iso-ir-101",
+            "iso8859-2",
+            "iso88592",
+            "iso_8859-2",
+            "iso_8859-2:1987",
+            "l2",
+            "latin2"
+          ],
+          "name": "ISO-8859-2"
+        },
+        {
+          "labels": [
+            "csisolatin3",
+            "iso-8859-3",
+            "iso-ir-109",
+            "iso8859-3",
+            "iso88593",
+            "iso_8859-3",
+            "iso_8859-3:1988",
+            "l3",
+            "latin3"
+          ],
+          "name": "ISO-8859-3"
+        },
+        {
+          "labels": [
+            "csisolatin4",
+            "iso-8859-4",
+            "iso-ir-110",
+            "iso8859-4",
+            "iso88594",
+            "iso_8859-4",
+            "iso_8859-4:1988",
+            "l4",
+            "latin4"
+          ],
+          "name": "ISO-8859-4"
+        },
+        {
+          "labels": [
+            "csisolatincyrillic",
+            "cyrillic",
+            "iso-8859-5",
+            "iso-ir-144",
+            "iso8859-5",
+            "iso88595",
+            "iso_8859-5",
+            "iso_8859-5:1988"
+          ],
+          "name": "ISO-8859-5"
+        },
+        {
+          "labels": [
+            "arabic",
+            "asmo-708",
+            "csiso88596e",
+            "csiso88596i",
+            "csisolatinarabic",
+            "ecma-114",
+            "iso-8859-6",
+            "iso-8859-6-e",
+            "iso-8859-6-i",
+            "iso-ir-127",
+            "iso8859-6",
+            "iso88596",
+            "iso_8859-6",
+            "iso_8859-6:1987"
+          ],
+          "name": "ISO-8859-6"
+        },
+        {
+          "labels": [
+            "csisolatingreek",
+            "ecma-118",
+            "elot_928",
+            "greek",
+            "greek8",
+            "iso-8859-7",
+            "iso-ir-126",
+            "iso8859-7",
+            "iso88597",
+            "iso_8859-7",
+            "iso_8859-7:1987",
+            "sun_eu_greek"
+          ],
+          "name": "ISO-8859-7"
+        },
+        {
+          "labels": [
+            "csiso88598e",
+            "csisolatinhebrew",
+            "hebrew",
+            "iso-8859-8",
+            "iso-8859-8-e",
+            "iso-ir-138",
+            "iso8859-8",
+            "iso88598",
+            "iso_8859-8",
+            "iso_8859-8:1988",
+            "visual"
+          ],
+          "name": "ISO-8859-8"
+        },
+        {
+          "labels": [
+            "csiso88598i",
+            "iso-8859-8-i",
+            "logical"
+          ],
+          "name": "ISO-8859-8-I"
+        },
+        {
+          "labels": [
+            "csisolatin6",
+            "iso-8859-10",
+            "iso-ir-157",
+            "iso8859-10",
+            "iso885910",
+            "l6",
+            "latin6"
+          ],
+          "name": "ISO-8859-10"
+        },
+        {
+          "labels": [
+            "iso-8859-13",
+            "iso8859-13",
+            "iso885913"
+          ],
+          "name": "ISO-8859-13"
+        },
+        {
+          "labels": [
+            "iso-8859-14",
+            "iso8859-14",
+            "iso885914"
+          ],
+          "name": "ISO-8859-14"
+        },
+        {
+          "labels": [
+            "csisolatin9",
+            "iso-8859-15",
+            "iso8859-15",
+            "iso885915",
+            "iso_8859-15",
+            "l9"
+          ],
+          "name": "ISO-8859-15"
+        },
+        {
+          "labels": [
+            "iso-8859-16"
+          ],
+          "name": "ISO-8859-16"
+        },
+        {
+          "labels": [
+            "cskoi8r",
+            "koi",
+            "koi8",
+            "koi8-r",
+            "koi8_r"
+          ],
+          "name": "KOI8-R"
+        },
+        {
+          "labels": [
+            "koi8-ru",
+            "koi8-u"
+          ],
+          "name": "KOI8-U"
+        },
+        {
+          "labels": [
+            "csmacintosh",
+            "mac",
+            "macintosh",
+            "x-mac-roman"
+          ],
+          "name": "macintosh"
+        },
+        {
+          "labels": [
+            "dos-874",
+            "iso-8859-11",
+            "iso8859-11",
+            "iso885911",
+            "tis-620",
+            "windows-874"
+          ],
+          "name": "windows-874"
+        },
+        {
+          "labels": [
+            "cp1250",
+            "windows-1250",
+            "x-cp1250"
+          ],
+          "name": "windows-1250"
+        },
+        {
+          "labels": [
+            "cp1251",
+            "windows-1251",
+            "x-cp1251"
+          ],
+          "name": "windows-1251"
+        },
+        {
+          "labels": [
+            "ansi_x3.4-1968",
+            "ascii",
+            "cp1252",
+            "cp819",
+            "csisolatin1",
+            "ibm819",
+            "iso-8859-1",
+            "iso-ir-100",
+            "iso8859-1",
+            "iso88591",
+            "iso_8859-1",
+            "iso_8859-1:1987",
+            "l1",
+            "latin1",
+            "us-ascii",
+            "windows-1252",
+            "x-cp1252"
+          ],
+          "name": "windows-1252"
+        },
+        {
+          "labels": [
+            "cp1253",
+            "windows-1253",
+            "x-cp1253"
+          ],
+          "name": "windows-1253"
+        },
+        {
+          "labels": [
+            "cp1254",
+            "csisolatin5",
+            "iso-8859-9",
+            "iso-ir-148",
+            "iso8859-9",
+            "iso88599",
+            "iso_8859-9",
+            "iso_8859-9:1989",
+            "l5",
+            "latin5",
+            "windows-1254",
+            "x-cp1254"
+          ],
+          "name": "windows-1254"
+        },
+        {
+          "labels": [
+            "cp1255",
+            "windows-1255",
+            "x-cp1255"
+          ],
+          "name": "windows-1255"
+        },
+        {
+          "labels": [
+            "cp1256",
+            "windows-1256",
+            "x-cp1256"
+          ],
+          "name": "windows-1256"
+        },
+        {
+          "labels": [
+            "cp1257",
+            "windows-1257",
+            "x-cp1257"
+          ],
+          "name": "windows-1257"
+        },
+        {
+          "labels": [
+            "cp1258",
+            "windows-1258",
+            "x-cp1258"
+          ],
+          "name": "windows-1258"
+        },
+        {
+          "labels": [
+            "x-mac-cyrillic",
+            "x-mac-ukrainian"
+          ],
+          "name": "x-mac-cyrillic"
+        }
+      ],
+      "heading": "Legacy single-byte encodings"
+    },
+    {
+      "encodings": [
+        {
+          "labels": [
+            "chinese",
+            "csgb2312",
+            "csiso58gb231280",
+            "gb2312",
+            "gb_2312",
+            "gb_2312-80",
+            "gbk",
+            "iso-ir-58",
+            "x-gbk"
+          ],
+          "name": "GBK"
+        },
+        {
+          "labels": [
+            "gb18030"
+          ],
+          "name": "gb18030"
+        }
+      ],
+      "heading": "Legacy multi-byte Chinese (simplified) encodings"
+    },
+    {
+      "encodings": [
+        {
+          "labels": [
+            "big5",
+            "big5-hkscs",
+            "cn-big5",
+            "csbig5",
+            "x-x-big5"
+          ],
+          "name": "Big5"
+        }
+      ],
+      "heading": "Legacy multi-byte Chinese (traditional) encodings"
+    },
+    {
+      "encodings": [
+        {
+          "labels": [
+            "cseucpkdfmtjapanese",
+            "euc-jp",
+            "x-euc-jp"
+          ],
+          "name": "EUC-JP"
+        },
+        {
+          "labels": [
+            "csiso2022jp",
+            "iso-2022-jp"
+          ],
+          "name": "ISO-2022-JP"
+        },
+        {
+          "labels": [
+            "csshiftjis",
+            "ms932",
+            "ms_kanji",
+            "shift-jis",
+            "shift_jis",
+            "sjis",
+            "windows-31j",
+            "x-sjis"
+          ],
+          "name": "Shift_JIS"
+        }
+      ],
+      "heading": "Legacy multi-byte Japanese encodings"
+    },
+    {
+      "encodings": [
+        {
+          "labels": [
+            "cseuckr",
+            "csksc56011987",
+            "euc-kr",
+            "iso-ir-149",
+            "korean",
+            "ks_c_5601-1987",
+            "ks_c_5601-1989",
+            "ksc5601",
+            "ksc_5601",
+            "windows-949"
+          ],
+          "name": "EUC-KR"
+        }
+      ],
+      "heading": "Legacy multi-byte Korean encodings"
+    },
+    {
+      "encodings": [
+        {
+          "labels": [
+            "csiso2022kr",
+            "hz-gb-2312",
+            "iso-2022-cn",
+            "iso-2022-cn-ext",
+            "iso-2022-kr"
+          ],
+          "name": "replacement"
+        },
+        {
+          "labels": [
+            "utf-16be"
+          ],
+          "name": "UTF-16BE"
+        },
+        {
+          "labels": [
+            "utf-16",
+            "utf-16le"
+          ],
+          "name": "UTF-16LE"
+        },
+        {
+          "labels": [
+            "x-user-defined"
+          ],
+          "name": "x-user-defined"
+        }
+      ],
+      "heading": "Legacy miscellaneous encodings"
+    }
+  ];
+
+  // Label to encoding registry.
+  /** @type {Object.<string,{name:string,labels:Array.<string>}>} */
+  var label_to_encoding = {};
+  encodings.forEach(function(category) {
+    category.encodings.forEach(function(encoding) {
+      encoding.labels.forEach(function(label) {
+        label_to_encoding[label] = encoding;
+      });
+    });
+  });
+
+  // Registry of of encoder/decoder factories, by encoding name.
+  /** @type {Object.<string, function({fatal:boolean}): Encoder>} */
+  var encoders = {};
+  /** @type {Object.<string, function({fatal:boolean}): Decoder>} */
+  var decoders = {};
+
+  //
+  // 6. Indexes
+  //
+
+  /**
+   * @param {number} pointer The |pointer| to search for.
+   * @param {(!Array.<?number>|undefined)} index The |index| to search within.
+   * @return {?number} The code point corresponding to |pointer| in |index|,
+   *     or null if |code point| is not in |index|.
+   */
+  function indexCodePointFor(pointer, index) {
+    if (!index) return null;
+    return index[pointer] || null;
+  }
+
+  /**
+   * @param {number} code_point The |code point| to search for.
+   * @param {!Array.<?number>} index The |index| to search within.
+   * @return {?number} The first pointer corresponding to |code point| in
+   *     |index|, or null if |code point| is not in |index|.
+   */
+  function indexPointerFor(code_point, index) {
+    var pointer = index.indexOf(code_point);
+    return pointer === -1 ? null : pointer;
+  }
+
+  /**
+   * @param {string} name Name of the index.
+   * @return {(!Array.<number>|!Array.<Array.<number>>)}
+   *  */
+  function index(name) {
+    if (!('encoding-indexes' in global)) {
+      throw Error("Indexes missing." +
+                  " Did you forget to include encoding-indexes.js first?");
+    }
+    return global['encoding-indexes'][name];
+  }
+
+  /**
+   * @param {number} pointer The |pointer| to search for in the gb18030 index.
+   * @return {?number} The code point corresponding to |pointer| in |index|,
+   *     or null if |code point| is not in the gb18030 index.
+   */
+  function indexGB18030RangesCodePointFor(pointer) {
+    // 1. If pointer is greater than 39419 and less than 189000, or
+    // pointer is greater than 1237575, return null.
+    if ((pointer > 39419 && pointer < 189000) || (pointer > 1237575))
+      return null;
+
+    // 2. If pointer is 7457, return code point U+E7C7.
+    if (pointer === 7457) return 0xE7C7;
+
+    // 3. Let offset be the last pointer in index gb18030 ranges that
+    // is equal to or less than pointer and let code point offset be
+    // its corresponding code point.
+    var offset = 0;
+    var code_point_offset = 0;
+    var idx = index('gb18030-ranges');
+    var i;
+    for (i = 0; i < idx.length; ++i) {
+      /** @type {!Array.<number>} */
+      var entry = idx[i];
+      if (entry[0] <= pointer) {
+        offset = entry[0];
+        code_point_offset = entry[1];
+      } else {
+        break;
+      }
+    }
+
+    // 4. Return a code point whose value is code point offset +
+    // pointer − offset.
+    return code_point_offset + pointer - offset;
+  }
+
+  /**
+   * @param {number} code_point The |code point| to locate in the gb18030 index.
+   * @return {number} The first pointer corresponding to |code point| in the
+   *     gb18030 index.
+   */
+  function indexGB18030RangesPointerFor(code_point) {
+    // 1. If code point is U+E7C7, return pointer 7457.
+    if (code_point === 0xE7C7) return 7457;
+
+    // 2. Let offset be the last code point in index gb18030 ranges
+    // that is equal to or less than code point and let pointer offset
+    // be its corresponding pointer.
+    var offset = 0;
+    var pointer_offset = 0;
+    var idx = index('gb18030-ranges');
+    var i;
+    for (i = 0; i < idx.length; ++i) {
+      /** @type {!Array.<number>} */
+      var entry = idx[i];
+      if (entry[1] <= code_point) {
+        offset = entry[1];
+        pointer_offset = entry[0];
+      } else {
+        break;
+      }
+    }
+
+    // 3. Return a pointer whose value is pointer offset + code point
+    // − offset.
+    return pointer_offset + code_point - offset;
+  }
+
+  /**
+   * @param {number} code_point The |code_point| to search for in the Shift_JIS
+   *     index.
+   * @return {?number} The code point corresponding to |pointer| in |index|,
+   *     or null if |code point| is not in the Shift_JIS index.
+   */
+  function indexShiftJISPointerFor(code_point) {
+    // 1. Let index be index jis0208 excluding all entries whose
+    // pointer is in the range 8272 to 8835, inclusive.
+    shift_jis_index = shift_jis_index ||
+      index('jis0208').map(function(code_point, pointer) {
+        return inRange(pointer, 8272, 8835) ? null : code_point;
+      });
+    var index_ = shift_jis_index;
+
+    // 2. Return the index pointer for code point in index.
+    return index_.indexOf(code_point);
+  }
+  var shift_jis_index;
+
+  /**
+   * @param {number} code_point The |code_point| to search for in the big5
+   *     index.
+   * @return {?number} The code point corresponding to |pointer| in |index|,
+   *     or null if |code point| is not in the big5 index.
+   */
+  function indexBig5PointerFor(code_point) {
+    // 1. Let index be index Big5 excluding all entries whose pointer
+    big5_index_no_hkscs = big5_index_no_hkscs ||
+      index('big5').map(function(code_point, pointer) {
+        return (pointer < (0xA1 - 0x81) * 157) ? null : code_point;
+      });
+    var index_ = big5_index_no_hkscs;
+
+    // 2. If code point is U+2550, U+255E, U+2561, U+256A, U+5341, or
+    // U+5345, return the last pointer corresponding to code point in
+    // index.
+    if (code_point === 0x2550 || code_point === 0x255E ||
+        code_point === 0x2561 || code_point === 0x256A ||
+        code_point === 0x5341 || code_point === 0x5345) {
+      return index_.lastIndexOf(code_point);
+    }
+
+    // 3. Return the index pointer for code point in index.
+    return indexPointerFor(code_point, index_);
+  }
+  var big5_index_no_hkscs;
+
+  //
+  // 8. API
+  //
+
+  /** @const */ var DEFAULT_ENCODING = 'utf-8';
+
+  // 8.1 Interface TextDecoder
+
+  /**
+   * @constructor
+   * @param {string=} label The label of the encoding;
+   *     defaults to 'utf-8'.
+   * @param {Object=} options
+   */
+  function TextDecoder(label, options) {
+    // Web IDL conventions
+    if (!(this instanceof TextDecoder))
+      throw TypeError('Called as a function. Did you forget \'new\'?');
+    label = label !== undefined ? String(label) : DEFAULT_ENCODING;
+    options = ToDictionary(options);
+
+    // A TextDecoder object has an associated encoding, decoder,
+    // stream, ignore BOM flag (initially unset), BOM seen flag
+    // (initially unset), error mode (initially replacement), and do
+    // not flush flag (initially unset).
+
+    /** @private */
+    this._encoding = null;
+    /** @private @type {?Decoder} */
+    this._decoder = null;
+    /** @private @type {boolean} */
+    this._ignoreBOM = false;
+    /** @private @type {boolean} */
+    this._BOMseen = false;
+    /** @private @type {string} */
+    this._error_mode = 'replacement';
+    /** @private @type {boolean} */
+    this._do_not_flush = false;
+
+
+    // 1. Let encoding be the result of getting an encoding from
+    // label.
+    var encoding = getEncoding(label);
+
+    // 2. If encoding is failure or replacement, throw a RangeError.
+    if (encoding === null || encoding.name === 'replacement')
+      throw RangeError('Unknown encoding: ' + label);
+    if (!decoders[encoding.name]) {
+      throw Error('Decoder not present.' +
+                  ' Did you forget to include encoding-indexes.js first?');
+    }
+
+    // 3. Let dec be a new TextDecoder object.
+    var dec = this;
+
+    // 4. Set dec's encoding to encoding.
+    dec._encoding = encoding;
+
+    // 5. If options's fatal member is true, set dec's error mode to
+    // fatal.
+    if (Boolean(options['fatal']))
+      dec._error_mode = 'fatal';
+
+    // 6. If options's ignoreBOM member is true, set dec's ignore BOM
+    // flag.
+    if (Boolean(options['ignoreBOM']))
+      dec._ignoreBOM = true;
+
+    // For pre-ES5 runtimes:
+    if (!Object.defineProperty) {
+      this.encoding = dec._encoding.name.toLowerCase();
+      this.fatal = dec._error_mode === 'fatal';
+      this.ignoreBOM = dec._ignoreBOM;
+    }
+
+    // 7. Return dec.
+    return dec;
+  }
+
+  if (Object.defineProperty) {
+    // The encoding attribute's getter must return encoding's name.
+    Object.defineProperty(TextDecoder.prototype, 'encoding', {
+      /** @this {TextDecoder} */
+      get: function() { return this._encoding.name.toLowerCase(); }
+    });
+
+    // The fatal attribute's getter must return true if error mode
+    // is fatal, and false otherwise.
+    Object.defineProperty(TextDecoder.prototype, 'fatal', {
+      /** @this {TextDecoder} */
+      get: function() { return this._error_mode === 'fatal'; }
+    });
+
+    // The ignoreBOM attribute's getter must return true if ignore
+    // BOM flag is set, and false otherwise.
+    Object.defineProperty(TextDecoder.prototype, 'ignoreBOM', {
+      /** @this {TextDecoder} */
+      get: function() { return this._ignoreBOM; }
+    });
+  }
+
+  /**
+   * @param {BufferSource=} input The buffer of bytes to decode.
+   * @param {Object=} options
+   * @return {string} The decoded string.
+   */
+  TextDecoder.prototype.decode = function decode(input, options) {
+    var bytes;
+    if (typeof input === 'object' && input instanceof ArrayBuffer) {
+      bytes = new Uint8Array(input);
+    } else if (typeof input === 'object' && 'buffer' in input &&
+               input.buffer instanceof ArrayBuffer) {
+      bytes = new Uint8Array(input.buffer,
+                             input.byteOffset,
+                             input.byteLength);
+    } else {
+      bytes = new Uint8Array(0);
+    }
+
+    options = ToDictionary(options);
+
+    // 1. If the do not flush flag is unset, set decoder to a new
+    // encoding's decoder, set stream to a new stream, and unset the
+    // BOM seen flag.
+    if (!this._do_not_flush) {
+      this._decoder = decoders[this._encoding.name]({
+        fatal: this._error_mode === 'fatal'});
+      this._BOMseen = false;
+    }
+
+    // 2. If options's stream is true, set the do not flush flag, and
+    // unset the do not flush flag otherwise.
+    this._do_not_flush = Boolean(options['stream']);
+
+    // 3. If input is given, push a copy of input to stream.
+    // TODO: Align with spec algorithm - maintain stream on instance.
+    var input_stream = new Stream(bytes);
+
+    // 4. Let output be a new stream.
+    var output = [];
+
+    /** @type {?(number|!Array.<number>)} */
+    var result;
+
+    // 5. While true:
+    while (true) {
+      // 1. Let token be the result of reading from stream.
+      var token = input_stream.read();
+
+      // 2. If token is end-of-stream and the do not flush flag is
+      // set, return output, serialized.
+      // TODO: Align with spec algorithm.
+      if (token === end_of_stream)
+        break;
+
+      // 3. Otherwise, run these subsubsteps:
+
+      // 1. Let result be the result of processing token for decoder,
+      // stream, output, and error mode.
+      result = this._decoder.handler(input_stream, token);
+
+      // 2. If result is finished, return output, serialized.
+      if (result === finished)
+        break;
+
+      if (result !== null) {
+        if (Array.isArray(result))
+          output.push.apply(output, /**@type {!Array.<number>}*/(result));
+        else
+          output.push(result);
+      }
+
+      // 3. Otherwise, if result is error, throw a TypeError.
+      // (Thrown in handler)
+
+      // 4. Otherwise, do nothing.
+    }
+    // TODO: Align with spec algorithm.
+    if (!this._do_not_flush) {
+      do {
+        result = this._decoder.handler(input_stream, input_stream.read());
+        if (result === finished)
+          break;
+        if (result === null)
+          continue;
+        if (Array.isArray(result))
+          output.push.apply(output, /**@type {!Array.<number>}*/(result));
+        else
+          output.push(result);
+      } while (!input_stream.endOfStream());
+      this._decoder = null;
+    }
+
+    // A TextDecoder object also has an associated serialize stream
+    // algorithm...
+    /**
+     * @param {!Array.<number>} stream
+     * @return {string}
+     * @this {TextDecoder}
+     */
+    function serializeStream(stream) {
+      // 1. Let token be the result of reading from stream.
+      // (Done in-place on array, rather than as a stream)
+
+      // 2. If encoding is UTF-8, UTF-16BE, or UTF-16LE, and ignore
+      // BOM flag and BOM seen flag are unset, run these subsubsteps:
+      if (includes(['UTF-8', 'UTF-16LE', 'UTF-16BE'], this._encoding.name) &&
+          !this._ignoreBOM && !this._BOMseen) {
+        if (stream.length > 0 && stream[0] === 0xFEFF) {
+          // 1. If token is U+FEFF, set BOM seen flag.
+          this._BOMseen = true;
+          stream.shift();
+        } else if (stream.length > 0) {
+          // 2. Otherwise, if token is not end-of-stream, set BOM seen
+          // flag and append token to stream.
+          this._BOMseen = true;
+        } else {
+          // 3. Otherwise, if token is not end-of-stream, append token
+          // to output.
+          // (no-op)
+        }
+      }
+      // 4. Otherwise, return output.
+      return codePointsToString(stream);
+    }
+
+    return serializeStream.call(this, output);
+  };
+
+  // 8.2 Interface TextEncoder
+
+  /**
+   * @constructor
+   * @param {string=} label The label of the encoding. NONSTANDARD.
+   * @param {Object=} options NONSTANDARD.
+   */
+  function TextEncoder(label, options) {
+    // Web IDL conventions
+    if (!(this instanceof TextEncoder))
+      throw TypeError('Called as a function. Did you forget \'new\'?');
+    options = ToDictionary(options);
+
+    // A TextEncoder object has an associated encoding and encoder.
+
+    /** @private */
+    this._encoding = null;
+    /** @private @type {?Encoder} */
+    this._encoder = null;
+
+    // Non-standard
+    /** @private @type {boolean} */
+    this._do_not_flush = false;
+    /** @private @type {string} */
+    this._fatal = Boolean(options['fatal']) ? 'fatal' : 'replacement';
+
+    // 1. Let enc be a new TextEncoder object.
+    var enc = this;
+
+    // 2. Set enc's encoding to UTF-8's encoder.
+    if (Boolean(options['NONSTANDARD_allowLegacyEncoding'])) {
+      // NONSTANDARD behavior.
+      label = label !== undefined ? String(label) : DEFAULT_ENCODING;
+      var encoding = getEncoding(label);
+      if (encoding === null || encoding.name === 'replacement')
+        throw RangeError('Unknown encoding: ' + label);
+      if (!encoders[encoding.name]) {
+        throw Error('Encoder not present.' +
+                    ' Did you forget to include encoding-indexes.js first?');
+      }
+      enc._encoding = encoding;
+    } else {
+      // Standard behavior.
+      enc._encoding = getEncoding('utf-8');
+
+      if (label !== undefined && 'console' in global) {
+        console.warn('TextEncoder constructor called with encoding label, '
+                     + 'which is ignored.');
+      }
+    }
+
+    // For pre-ES5 runtimes:
+    if (!Object.defineProperty)
+      this.encoding = enc._encoding.name.toLowerCase();
+
+    // 3. Return enc.
+    return enc;
+  }
+
+  if (Object.defineProperty) {
+    // The encoding attribute's getter must return encoding's name.
+    Object.defineProperty(TextEncoder.prototype, 'encoding', {
+      /** @this {TextEncoder} */
+      get: function() { return this._encoding.name.toLowerCase(); }
+    });
+  }
+
+  /**
+   * @param {string=} opt_string The string to encode.
+   * @param {Object=} options
+   * @return {!Uint8Array} Encoded bytes, as a Uint8Array.
+   */
+  TextEncoder.prototype.encode = function encode(opt_string, options) {
+    opt_string = opt_string === undefined ? '' : String(opt_string);
+    options = ToDictionary(options);
+
+    // NOTE: This option is nonstandard. None of the encodings
+    // permitted for encoding (i.e. UTF-8, UTF-16) are stateful when
+    // the input is a USVString so streaming is not necessary.
+    if (!this._do_not_flush)
+      this._encoder = encoders[this._encoding.name]({
+        fatal: this._fatal === 'fatal'});
+    this._do_not_flush = Boolean(options['stream']);
+
+    // 1. Convert input to a stream.
+    var input = new Stream(stringToCodePoints(opt_string));
+
+    // 2. Let output be a new stream
+    var output = [];
+
+    /** @type {?(number|!Array.<number>)} */
+    var result;
+    // 3. While true, run these substeps:
+    while (true) {
+      // 1. Let token be the result of reading from input.
+      var token = input.read();
+      if (token === end_of_stream)
+        break;
+      // 2. Let result be the result of processing token for encoder,
+      // input, output.
+      result = this._encoder.handler(input, token);
+      if (result === finished)
+        break;
+      if (Array.isArray(result))
+        output.push.apply(output, /**@type {!Array.<number>}*/(result));
+      else
+        output.push(result);
+    }
+    // TODO: Align with spec algorithm.
+    if (!this._do_not_flush) {
+      while (true) {
+        result = this._encoder.handler(input, input.read());
+        if (result === finished)
+          break;
+        if (Array.isArray(result))
+          output.push.apply(output, /**@type {!Array.<number>}*/(result));
+        else
+          output.push(result);
+      }
+      this._encoder = null;
+    }
+    // 3. If result is finished, convert output into a byte sequence,
+    // and then return a Uint8Array object wrapping an ArrayBuffer
+    // containing output.
+    return new Uint8Array(output);
+  };
+
+
+  //
+  // 9. The encoding
+  //
+
+  // 9.1 utf-8
+
+  // 9.1.1 utf-8 decoder
+  /**
+   * @constructor
+   * @implements {Decoder}
+   * @param {{fatal: boolean}} options
+   */
+  function UTF8Decoder(options) {
+    var fatal = options.fatal;
+
+    // utf-8's decoder's has an associated utf-8 code point, utf-8
+    // bytes seen, and utf-8 bytes needed (all initially 0), a utf-8
+    // lower boundary (initially 0x80), and a utf-8 upper boundary
+    // (initially 0xBF).
+    var /** @type {number} */ utf8_code_point = 0,
+        /** @type {number} */ utf8_bytes_seen = 0,
+        /** @type {number} */ utf8_bytes_needed = 0,
+        /** @type {number} */ utf8_lower_boundary = 0x80,
+        /** @type {number} */ utf8_upper_boundary = 0xBF;
+
+    /**
+     * @param {Stream} stream The stream of bytes being decoded.
+     * @param {number} bite The next byte read from the stream.
+     * @return {?(number|!Array.<number>)} The next code point(s)
+     *     decoded, or null if not enough data exists in the input
+     *     stream to decode a complete code point.
+     */
+    this.handler = function(stream, bite) {
+      // 1. If byte is end-of-stream and utf-8 bytes needed is not 0,
+      // set utf-8 bytes needed to 0 and return error.
+      if (bite === end_of_stream && utf8_bytes_needed !== 0) {
+        utf8_bytes_needed = 0;
+        return decoderError(fatal);
+      }
+
+      // 2. If byte is end-of-stream, return finished.
+      if (bite === end_of_stream)
+        return finished;
+
+      // 3. If utf-8 bytes needed is 0, based on byte:
+      if (utf8_bytes_needed === 0) {
+
+        // 0x00 to 0x7F
+        if (inRange(bite, 0x00, 0x7F)) {
+          // Return a code point whose value is byte.
+          return bite;
+        }
+
+        // 0xC2 to 0xDF
+        else if (inRange(bite, 0xC2, 0xDF)) {
+          // 1. Set utf-8 bytes needed to 1.
+          utf8_bytes_needed = 1;
+
+          // 2. Set UTF-8 code point to byte & 0x1F.
+          utf8_code_point = bite & 0x1F;
+        }
+
+        // 0xE0 to 0xEF
+        else if (inRange(bite, 0xE0, 0xEF)) {
+          // 1. If byte is 0xE0, set utf-8 lower boundary to 0xA0.
+          if (bite === 0xE0)
+            utf8_lower_boundary = 0xA0;
+          // 2. If byte is 0xED, set utf-8 upper boundary to 0x9F.
+          if (bite === 0xED)
+            utf8_upper_boundary = 0x9F;
+          // 3. Set utf-8 bytes needed to 2.
+          utf8_bytes_needed = 2;
+          // 4. Set UTF-8 code point to byte & 0xF.
+          utf8_code_point = bite & 0xF;
+        }
+
+        // 0xF0 to 0xF4
+        else if (inRange(bite, 0xF0, 0xF4)) {
+          // 1. If byte is 0xF0, set utf-8 lower boundary to 0x90.
+          if (bite === 0xF0)
+            utf8_lower_boundary = 0x90;
+          // 2. If byte is 0xF4, set utf-8 upper boundary to 0x8F.
+          if (bite === 0xF4)
+            utf8_upper_boundary = 0x8F;
+          // 3. Set utf-8 bytes needed to 3.
+          utf8_bytes_needed = 3;
+          // 4. Set UTF-8 code point to byte & 0x7.
+          utf8_code_point = bite & 0x7;
+        }
+
+        // Otherwise
+        else {
+          // Return error.
+          return decoderError(fatal);
+        }
+
+        // Return continue.
+        return null;
+      }
+
+      // 4. If byte is not in the range utf-8 lower boundary to utf-8
+      // upper boundary, inclusive, run these substeps:
+      if (!inRange(bite, utf8_lower_boundary, utf8_upper_boundary)) {
+
+        // 1. Set utf-8 code point, utf-8 bytes needed, and utf-8
+        // bytes seen to 0, set utf-8 lower boundary to 0x80, and set
+        // utf-8 upper boundary to 0xBF.
+        utf8_code_point = utf8_bytes_needed = utf8_bytes_seen = 0;
+        utf8_lower_boundary = 0x80;
+        utf8_upper_boundary = 0xBF;
+
+        // 2. Prepend byte to stream.
+        stream.prepend(bite);
+
+        // 3. Return error.
+        return decoderError(fatal);
+      }
+
+      // 5. Set utf-8 lower boundary to 0x80 and utf-8 upper boundary
+      // to 0xBF.
+      utf8_lower_boundary = 0x80;
+      utf8_upper_boundary = 0xBF;
+
+      // 6. Set UTF-8 code point to (UTF-8 code point << 6) | (byte &
+      // 0x3F)
+      utf8_code_point = (utf8_code_point << 6) | (bite & 0x3F);
+
+      // 7. Increase utf-8 bytes seen by one.
+      utf8_bytes_seen += 1;
+
+      // 8. If utf-8 bytes seen is not equal to utf-8 bytes needed,
+      // continue.
+      if (utf8_bytes_seen !== utf8_bytes_needed)
+        return null;
+
+      // 9. Let code point be utf-8 code point.
+      var code_point = utf8_code_point;
+
+      // 10. Set utf-8 code point, utf-8 bytes needed, and utf-8 bytes
+      // seen to 0.
+      utf8_code_point = utf8_bytes_needed = utf8_bytes_seen = 0;
+
+      // 11. Return a code point whose value is code point.
+      return code_point;
+    };
+  }
+
+  // 9.1.2 utf-8 encoder
+  /**
+   * @constructor
+   * @implements {Encoder}
+   * @param {{fatal: boolean}} options
+   */
+  function UTF8Encoder(options) {
+    var fatal = options.fatal;
+    /**
+     * @param {Stream} stream Input stream.
+     * @param {number} code_point Next code point read from the stream.
+     * @return {(number|!Array.<number>)} Byte(s) to emit.
+     */
+    this.handler = function(stream, code_point) {
+      // 1. If code point is end-of-stream, return finished.
+      if (code_point === end_of_stream)
+        return finished;
+
+      // 2. If code point is an ASCII code point, return a byte whose
+      // value is code point.
+      if (isASCIICodePoint(code_point))
+        return code_point;
+
+      // 3. Set count and offset based on the range code point is in:
+      var count, offset;
+      // U+0080 to U+07FF, inclusive:
+      if (inRange(code_point, 0x0080, 0x07FF)) {
+        // 1 and 0xC0
+        count = 1;
+        offset = 0xC0;
+      }
+      // U+0800 to U+FFFF, inclusive:
+      else if (inRange(code_point, 0x0800, 0xFFFF)) {
+        // 2 and 0xE0
+        count = 2;
+        offset = 0xE0;
+      }
+      // U+10000 to U+10FFFF, inclusive:
+      else if (inRange(code_point, 0x10000, 0x10FFFF)) {
+        // 3 and 0xF0
+        count = 3;
+        offset = 0xF0;
+      }
+
+      // 4. Let bytes be a byte sequence whose first byte is (code
+      // point >> (6 × count)) + offset.
+      var bytes = [(code_point >> (6 * count)) + offset];
+
+      // 5. Run these substeps while count is greater than 0:
+      while (count > 0) {
+
+        // 1. Set temp to code point >> (6 × (count − 1)).
+        var temp = code_point >> (6 * (count - 1));
+
+        // 2. Append to bytes 0x80 | (temp & 0x3F).
+        bytes.push(0x80 | (temp & 0x3F));
+
+        // 3. Decrease count by one.
+        count -= 1;
+      }
+
+      // 6. Return bytes bytes, in order.
+      return bytes;
+    };
+  }
+
+  /** @param {{fatal: boolean}} options */
+  encoders['UTF-8'] = function(options) {
+    return new UTF8Encoder(options);
+  };
+  /** @param {{fatal: boolean}} options */
+  decoders['UTF-8'] = function(options) {
+    return new UTF8Decoder(options);
+  };
+
+  //
+  // 10. Legacy single-byte encodings
+  //
+
+  // 10.1 single-byte decoder
+  /**
+   * @constructor
+   * @implements {Decoder}
+   * @param {!Array.<number>} index The encoding index.
+   * @param {{fatal: boolean}} options
+   */
+  function SingleByteDecoder(index, options) {
+    var fatal = options.fatal;
+    /**
+     * @param {Stream} stream The stream of bytes being decoded.
+     * @param {number} bite The next byte read from the stream.
+     * @return {?(number|!Array.<number>)} The next code point(s)
+     *     decoded, or null if not enough data exists in the input
+     *     stream to decode a complete code point.
+     */
+    this.handler = function(stream, bite) {
+      // 1. If byte is end-of-stream, return finished.
+      if (bite === end_of_stream)
+        return finished;
+
+      // 2. If byte is an ASCII byte, return a code point whose value
+      // is byte.
+      if (isASCIIByte(bite))
+        return bite;
+
+      // 3. Let code point be the index code point for byte − 0x80 in
+      // index single-byte.
+      var code_point = index[bite - 0x80];
+
+      // 4. If code point is null, return error.
+      if (code_point === null)
+        return decoderError(fatal);
+
+      // 5. Return a code point whose value is code point.
+      return code_point;
+    };
+  }
+
+  // 10.2 single-byte encoder
+  /**
+   * @constructor
+   * @implements {Encoder}
+   * @param {!Array.<?number>} index The encoding index.
+   * @param {{fatal: boolean}} options
+   */
+  function SingleByteEncoder(index, options) {
+    var fatal = options.fatal;
+    /**
+     * @param {Stream} stream Input stream.
+     * @param {number} code_point Next code point read from the stream.
+     * @return {(number|!Array.<number>)} Byte(s) to emit.
+     */
+    this.handler = function(stream, code_point) {
+      // 1. If code point is end-of-stream, return finished.
+      if (code_point === end_of_stream)
+        return finished;
+
+      // 2. If code point is an ASCII code point, return a byte whose
+      // value is code point.
+      if (isASCIICodePoint(code_point))
+        return code_point;
+
+      // 3. Let pointer be the index pointer for code point in index
+      // single-byte.
+      var pointer = indexPointerFor(code_point, index);
+
+      // 4. If pointer is null, return error with code point.
+      if (pointer === null)
+        encoderError(code_point);
+
+      // 5. Return a byte whose value is pointer + 0x80.
+      return pointer + 0x80;
+    };
+  }
+
+  (function() {
+    if (!('encoding-indexes' in global))
+      return;
+    encodings.forEach(function(category) {
+      if (category.heading !== 'Legacy single-byte encodings')
+        return;
+      category.encodings.forEach(function(encoding) {
+        var name = encoding.name;
+        var idx = index(name.toLowerCase());
+        /** @param {{fatal: boolean}} options */
+        decoders[name] = function(options) {
+          return new SingleByteDecoder(idx, options);
+        };
+        /** @param {{fatal: boolean}} options */
+        encoders[name] = function(options) {
+          return new SingleByteEncoder(idx, options);
+        };
+      });
+    });
+  }());
+
+  //
+  // 11. Legacy multi-byte Chinese (simplified) encodings
+  //
+
+  // 11.1 gbk
+
+  // 11.1.1 gbk decoder
+  // gbk's decoder is gb18030's decoder.
+  /** @param {{fatal: boolean}} options */
+  decoders['GBK'] = function(options) {
+    return new GB18030Decoder(options);
+  };
+
+  // 11.1.2 gbk encoder
+  // gbk's encoder is gb18030's encoder with its gbk flag set.
+  /** @param {{fatal: boolean}} options */
+  encoders['GBK'] = function(options) {
+    return new GB18030Encoder(options, true);
+  };
+
+  // 11.2 gb18030
+
+  // 11.2.1 gb18030 decoder
+  /**
+   * @constructor
+   * @implements {Decoder}
+   * @param {{fatal: boolean}} options
+   */
+  function GB18030Decoder(options) {
+    var fatal = options.fatal;
+    // gb18030's decoder has an associated gb18030 first, gb18030
+    // second, and gb18030 third (all initially 0x00).
+    var /** @type {number} */ gb18030_first = 0x00,
+        /** @type {number} */ gb18030_second = 0x00,
+        /** @type {number} */ gb18030_third = 0x00;
+    /**
+     * @param {Stream} stream The stream of bytes being decoded.
+     * @param {number} bite The next byte read from the stream.
+     * @return {?(number|!Array.<number>)} The next code point(s)
+     *     decoded, or null if not enough data exists in the input
+     *     stream to decode a complete code point.
+     */
+    this.handler = function(stream, bite) {
+      // 1. If byte is end-of-stream and gb18030 first, gb18030
+      // second, and gb18030 third are 0x00, return finished.
+      if (bite === end_of_stream && gb18030_first === 0x00 &&
+          gb18030_second === 0x00 && gb18030_third === 0x00) {
+        return finished;
+      }
+      // 2. If byte is end-of-stream, and gb18030 first, gb18030
+      // second, or gb18030 third is not 0x00, set gb18030 first,
+      // gb18030 second, and gb18030 third to 0x00, and return error.
+      if (bite === end_of_stream &&
+          (gb18030_first !== 0x00 || gb18030_second !== 0x00 ||
+           gb18030_third !== 0x00)) {
+        gb18030_first = 0x00;
+        gb18030_second = 0x00;
+        gb18030_third = 0x00;
+        decoderError(fatal);
+      }
+      var code_point;
+      // 3. If gb18030 third is not 0x00, run these substeps:
+      if (gb18030_third !== 0x00) {
+        // 1. Let code point be null.
+        code_point = null;
+        // 2. If byte is in the range 0x30 to 0x39, inclusive, set
+        // code point to the index gb18030 ranges code point for
+        // (((gb18030 first − 0x81) × 10 + gb18030 second − 0x30) ×
+        // 126 + gb18030 third − 0x81) × 10 + byte − 0x30.
+        if (inRange(bite, 0x30, 0x39)) {
+          code_point = indexGB18030RangesCodePointFor(
+              (((gb18030_first - 0x81) * 10 + gb18030_second - 0x30) * 126 +
+               gb18030_third - 0x81) * 10 + bite - 0x30);
+        }
+
+        // 3. Let buffer be a byte sequence consisting of gb18030
+        // second, gb18030 third, and byte, in order.
+        var buffer = [gb18030_second, gb18030_third, bite];
+
+        // 4. Set gb18030 first, gb18030 second, and gb18030 third to
+        // 0x00.
+        gb18030_first = 0x00;
+        gb18030_second = 0x00;
+        gb18030_third = 0x00;
+
+        // 5. If code point is null, prepend buffer to stream and
+        // return error.
+        if (code_point === null) {
+          stream.prepend(buffer);
+          return decoderError(fatal);
+        }
+
+        // 6. Return a code point whose value is code point.
+        return code_point;
+      }
+
+      // 4. If gb18030 second is not 0x00, run these substeps:
+      if (gb18030_second !== 0x00) {
+
+        // 1. If byte is in the range 0x81 to 0xFE, inclusive, set
+        // gb18030 third to byte and return continue.
+        if (inRange(bite, 0x81, 0xFE)) {
+          gb18030_third = bite;
+          return null;
+        }
+
+        // 2. Prepend gb18030 second followed by byte to stream, set
+        // gb18030 first and gb18030 second to 0x00, and return error.
+        stream.prepend([gb18030_second, bite]);
+        gb18030_first = 0x00;
+        gb18030_second = 0x00;
+        return decoderError(fatal);
+      }
+
+      // 5. If gb18030 first is not 0x00, run these substeps:
+      if (gb18030_first !== 0x00) {
+
+        // 1. If byte is in the range 0x30 to 0x39, inclusive, set
+        // gb18030 second to byte and return continue.
+        if (inRange(bite, 0x30, 0x39)) {
+          gb18030_second = bite;
+          return null;
+        }
+
+        // 2. Let lead be gb18030 first, let pointer be null, and set
+        // gb18030 first to 0x00.
+        var lead = gb18030_first;
+        var pointer = null;
+        gb18030_first = 0x00;
+
+        // 3. Let offset be 0x40 if byte is less than 0x7F and 0x41
+        // otherwise.
+        var offset = bite < 0x7F ? 0x40 : 0x41;
+
+        // 4. If byte is in the range 0x40 to 0x7E, inclusive, or 0x80
+        // to 0xFE, inclusive, set pointer to (lead − 0x81) × 190 +
+        // (byte − offset).
+        if (inRange(bite, 0x40, 0x7E) || inRange(bite, 0x80, 0xFE))
+          pointer = (lead - 0x81) * 190 + (bite - offset);
+
+        // 5. Let code point be null if pointer is null and the index
+        // code point for pointer in index gb18030 otherwise.
+        code_point = pointer === null ? null :
+            indexCodePointFor(pointer, index('gb18030'));
+
+        // 6. If code point is null and byte is an ASCII byte, prepend
+        // byte to stream.
+        if (code_point === null && isASCIIByte(bite))
+          stream.prepend(bite);
+
+        // 7. If code point is null, return error.
+        if (code_point === null)
+          return decoderError(fatal);
+
+        // 8. Return a code point whose value is code point.
+        return code_point;
+      }
+
+      // 6. If byte is an ASCII byte, return a code point whose value
+      // is byte.
+      if (isASCIIByte(bite))
+        return bite;
+
+      // 7. If byte is 0x80, return code point U+20AC.
+      if (bite === 0x80)
+        return 0x20AC;
+
+      // 8. If byte is in the range 0x81 to 0xFE, inclusive, set
+      // gb18030 first to byte and return continue.
+      if (inRange(bite, 0x81, 0xFE)) {
+        gb18030_first = bite;
+        return null;
+      }
+
+      // 9. Return error.
+      return decoderError(fatal);
+    };
+  }
+
+  // 11.2.2 gb18030 encoder
+  /**
+   * @constructor
+   * @implements {Encoder}
+   * @param {{fatal: boolean}} options
+   * @param {boolean=} gbk_flag
+   */
+  function GB18030Encoder(options, gbk_flag) {
+    var fatal = options.fatal;
+    // gb18030's decoder has an associated gbk flag (initially unset).
+    /**
+     * @param {Stream} stream Input stream.
+     * @param {number} code_point Next code point read from the stream.
+     * @return {(number|!Array.<number>)} Byte(s) to emit.
+     */
+    this.handler = function(stream, code_point) {
+      // 1. If code point is end-of-stream, return finished.
+      if (code_point === end_of_stream)
+        return finished;
+
+      // 2. If code point is an ASCII code point, return a byte whose
+      // value is code point.
+      if (isASCIICodePoint(code_point))
+        return code_point;
+
+      // 3. If code point is U+E5E5, return error with code point.
+      if (code_point === 0xE5E5)
+        return encoderError(code_point);
+
+      // 4. If the gbk flag is set and code point is U+20AC, return
+      // byte 0x80.
+      if (gbk_flag && code_point === 0x20AC)
+        return 0x80;
+
+      // 5. Let pointer be the index pointer for code point in index
+      // gb18030.
+      var pointer = indexPointerFor(code_point, index('gb18030'));
+
+      // 6. If pointer is not null, run these substeps:
+      if (pointer !== null) {
+
+        // 1. Let lead be floor(pointer / 190) + 0x81.
+        var lead = floor(pointer / 190) + 0x81;
+
+        // 2. Let trail be pointer % 190.
+        var trail = pointer % 190;
+
+        // 3. Let offset be 0x40 if trail is less than 0x3F and 0x41 otherwise.
+        var offset = trail < 0x3F ? 0x40 : 0x41;
+
+        // 4. Return two bytes whose values are lead and trail + offset.
+        return [lead, trail + offset];
+      }
+
+      // 7. If gbk flag is set, return error with code point.
+      if (gbk_flag)
+        return encoderError(code_point);
+
+      // 8. Set pointer to the index gb18030 ranges pointer for code
+      // point.
+      pointer = indexGB18030RangesPointerFor(code_point);
+
+      // 9. Let byte1 be floor(pointer / 10 / 126 / 10).
+      var byte1 = floor(pointer / 10 / 126 / 10);
+
+      // 10. Set pointer to pointer − byte1 × 10 × 126 × 10.
+      pointer = pointer - byte1 * 10 * 126 * 10;
+
+      // 11. Let byte2 be floor(pointer / 10 / 126).
+      var byte2 = floor(pointer / 10 / 126);
+
+      // 12. Set pointer to pointer − byte2 × 10 × 126.
+      pointer = pointer - byte2 * 10 * 126;
+
+      // 13. Let byte3 be floor(pointer / 10).
+      var byte3 = floor(pointer / 10);
+
+      // 14. Let byte4 be pointer − byte3 × 10.
+      var byte4 = pointer - byte3 * 10;
+
+      // 15. Return four bytes whose values are byte1 + 0x81, byte2 +
+      // 0x30, byte3 + 0x81, byte4 + 0x30.
+      return [byte1 + 0x81,
+              byte2 + 0x30,
+              byte3 + 0x81,
+              byte4 + 0x30];
+    };
+  }
+
+  /** @param {{fatal: boolean}} options */
+  encoders['gb18030'] = function(options) {
+    return new GB18030Encoder(options);
+  };
+  /** @param {{fatal: boolean}} options */
+  decoders['gb18030'] = function(options) {
+    return new GB18030Decoder(options);
+  };
+
+
+  //
+  // 12. Legacy multi-byte Chinese (traditional) encodings
+  //
+
+  // 12.1 Big5
+
+  // 12.1.1 Big5 decoder
+  /**
+   * @constructor
+   * @implements {Decoder}
+   * @param {{fatal: boolean}} options
+   */
+  function Big5Decoder(options) {
+    var fatal = options.fatal;
+    // Big5's decoder has an associated Big5 lead (initially 0x00).
+    var /** @type {number} */ Big5_lead = 0x00;
+
+    /**
+     * @param {Stream} stream The stream of bytes being decoded.
+     * @param {number} bite The next byte read from the stream.
+     * @return {?(number|!Array.<number>)} The next code point(s)
+     *     decoded, or null if not enough data exists in the input
+     *     stream to decode a complete code point.
+     */
+    this.handler = function(stream, bite) {
+      // 1. If byte is end-of-stream and Big5 lead is not 0x00, set
+      // Big5 lead to 0x00 and return error.
+      if (bite === end_of_stream && Big5_lead !== 0x00) {
+        Big5_lead = 0x00;
+        return decoderError(fatal);
+      }
+
+      // 2. If byte is end-of-stream and Big5 lead is 0x00, return
+      // finished.
+      if (bite === end_of_stream && Big5_lead === 0x00)
+        return finished;
+
+      // 3. If Big5 lead is not 0x00, let lead be Big5 lead, let
+      // pointer be null, set Big5 lead to 0x00, and then run these
+      // substeps:
+      if (Big5_lead !== 0x00) {
+        var lead = Big5_lead;
+        var pointer = null;
+        Big5_lead = 0x00;
+
+        // 1. Let offset be 0x40 if byte is less than 0x7F and 0x62
+        // otherwise.
+        var offset = bite < 0x7F ? 0x40 : 0x62;
+
+        // 2. If byte is in the range 0x40 to 0x7E, inclusive, or 0xA1
+        // to 0xFE, inclusive, set pointer to (lead − 0x81) × 157 +
+        // (byte − offset).
+        if (inRange(bite, 0x40, 0x7E) || inRange(bite, 0xA1, 0xFE))
+          pointer = (lead - 0x81) * 157 + (bite - offset);
+
+        // 3. If there is a row in the table below whose first column
+        // is pointer, return the two code points listed in its second
+        // column
+        // Pointer | Code points
+        // --------+--------------
+        // 1133    | U+00CA U+0304
+        // 1135    | U+00CA U+030C
+        // 1164    | U+00EA U+0304
+        // 1166    | U+00EA U+030C
+        switch (pointer) {
+          case 1133: return [0x00CA, 0x0304];
+          case 1135: return [0x00CA, 0x030C];
+          case 1164: return [0x00EA, 0x0304];
+          case 1166: return [0x00EA, 0x030C];
+        }
+
+        // 4. Let code point be null if pointer is null and the index
+        // code point for pointer in index Big5 otherwise.
+        var code_point = (pointer === null) ? null :
+            indexCodePointFor(pointer, index('big5'));
+
+        // 5. If code point is null and byte is an ASCII byte, prepend
+        // byte to stream.
+        if (code_point === null && isASCIIByte(bite))
+          stream.prepend(bite);
+
+        // 6. If code point is null, return error.
+        if (code_point === null)
+          return decoderError(fatal);
+
+        // 7. Return a code point whose value is code point.
+        return code_point;
+      }
+
+      // 4. If byte is an ASCII byte, return a code point whose value
+      // is byte.
+      if (isASCIIByte(bite))
+        return bite;
+
+      // 5. If byte is in the range 0x81 to 0xFE, inclusive, set Big5
+      // lead to byte and return continue.
+      if (inRange(bite, 0x81, 0xFE)) {
+        Big5_lead = bite;
+        return null;
+      }
+
+      // 6. Return error.
+      return decoderError(fatal);
+    };
+  }
+
+  // 12.1.2 Big5 encoder
+  /**
+   * @constructor
+   * @implements {Encoder}
+   * @param {{fatal: boolean}} options
+   */
+  function Big5Encoder(options) {
+    var fatal = options.fatal;
+    /**
+     * @param {Stream} stream Input stream.
+     * @param {number} code_point Next code point read from the stream.
+     * @return {(number|!Array.<number>)} Byte(s) to emit.
+     */
+    this.handler = function(stream, code_point) {
+      // 1. If code point is end-of-stream, return finished.
+      if (code_point === end_of_stream)
+        return finished;
+
+      // 2. If code point is an ASCII code point, return a byte whose
+      // value is code point.
+      if (isASCIICodePoint(code_point))
+        return code_point;
+
+      // 3. Let pointer be the index Big5 pointer for code point.
+      var pointer = indexBig5PointerFor(code_point);
+
+      // 4. If pointer is null, return error with code point.
+      if (pointer === null)
+        return encoderError(code_point);
+
+      // 5. Let lead be floor(pointer / 157) + 0x81.
+      var lead = floor(pointer / 157) + 0x81;
+
+      // 6. If lead is less than 0xA1, return error with code point.
+      if (lead < 0xA1)
+        return encoderError(code_point);
+
+      // 7. Let trail be pointer % 157.
+      var trail = pointer % 157;
+
+      // 8. Let offset be 0x40 if trail is less than 0x3F and 0x62
+      // otherwise.
+      var offset = trail < 0x3F ? 0x40 : 0x62;
+
+      // Return two bytes whose values are lead and trail + offset.
+      return [lead, trail + offset];
+    };
+  }
+
+  /** @param {{fatal: boolean}} options */
+  encoders['Big5'] = function(options) {
+    return new Big5Encoder(options);
+  };
+  /** @param {{fatal: boolean}} options */
+  decoders['Big5'] = function(options) {
+    return new Big5Decoder(options);
+  };
+
+
+  //
+  // 13. Legacy multi-byte Japanese encodings
+  //
+
+  // 13.1 euc-jp
+
+  // 13.1.1 euc-jp decoder
+  /**
+   * @constructor
+   * @implements {Decoder}
+   * @param {{fatal: boolean}} options
+   */
+  function EUCJPDecoder(options) {
+    var fatal = options.fatal;
+
+    // euc-jp's decoder has an associated euc-jp jis0212 flag
+    // (initially unset) and euc-jp lead (initially 0x00).
+    var /** @type {boolean} */ eucjp_jis0212_flag = false,
+        /** @type {number} */ eucjp_lead = 0x00;
+
+    /**
+     * @param {Stream} stream The stream of bytes being decoded.
+     * @param {number} bite The next byte read from the stream.
+     * @return {?(number|!Array.<number>)} The next code point(s)
+     *     decoded, or null if not enough data exists in the input
+     *     stream to decode a complete code point.
+     */
+    this.handler = function(stream, bite) {
+      // 1. If byte is end-of-stream and euc-jp lead is not 0x00, set
+      // euc-jp lead to 0x00, and return error.
+      if (bite === end_of_stream && eucjp_lead !== 0x00) {
+        eucjp_lead = 0x00;
+        return decoderError(fatal);
+      }
+
+      // 2. If byte is end-of-stream and euc-jp lead is 0x00, return
+      // finished.
+      if (bite === end_of_stream && eucjp_lead === 0x00)
+        return finished;
+
+      // 3. If euc-jp lead is 0x8E and byte is in the range 0xA1 to
+      // 0xDF, inclusive, set euc-jp lead to 0x00 and return a code
+      // point whose value is 0xFF61 − 0xA1 + byte.
+      if (eucjp_lead === 0x8E && inRange(bite, 0xA1, 0xDF)) {
+        eucjp_lead = 0x00;
+        return 0xFF61 - 0xA1 + bite;
+      }
+
+      // 4. If euc-jp lead is 0x8F and byte is in the range 0xA1 to
+      // 0xFE, inclusive, set the euc-jp jis0212 flag, set euc-jp lead
+      // to byte, and return continue.
+      if (eucjp_lead === 0x8F && inRange(bite, 0xA1, 0xFE)) {
+        eucjp_jis0212_flag = true;
+        eucjp_lead = bite;
+        return null;
+      }
+
+      // 5. If euc-jp lead is not 0x00, let lead be euc-jp lead, set
+      // euc-jp lead to 0x00, and run these substeps:
+      if (eucjp_lead !== 0x00) {
+        var lead = eucjp_lead;
+        eucjp_lead = 0x00;
+
+        // 1. Let code point be null.
+        var code_point = null;
+
+        // 2. If lead and byte are both in the range 0xA1 to 0xFE,
+        // inclusive, set code point to the index code point for (lead
+        // − 0xA1) × 94 + byte − 0xA1 in index jis0208 if the euc-jp
+        // jis0212 flag is unset and in index jis0212 otherwise.
+        if (inRange(lead, 0xA1, 0xFE) && inRange(bite, 0xA1, 0xFE)) {
+          code_point = indexCodePointFor(
+            (lead - 0xA1) * 94 + (bite - 0xA1),
+            index(!eucjp_jis0212_flag ? 'jis0208' : 'jis0212'));
+        }
+
+        // 3. Unset the euc-jp jis0212 flag.
+        eucjp_jis0212_flag = false;
+
+        // 4. If byte is not in the range 0xA1 to 0xFE, inclusive,
+        // prepend byte to stream.
+        if (!inRange(bite, 0xA1, 0xFE))
+          stream.prepend(bite);
+
+        // 5. If code point is null, return error.
+        if (code_point === null)
+          return decoderError(fatal);
+
+        // 6. Return a code point whose value is code point.
+        return code_point;
+      }
+
+      // 6. If byte is an ASCII byte, return a code point whose value
+      // is byte.
+      if (isASCIIByte(bite))
+        return bite;
+
+      // 7. If byte is 0x8E, 0x8F, or in the range 0xA1 to 0xFE,
+      // inclusive, set euc-jp lead to byte and return continue.
+      if (bite === 0x8E || bite === 0x8F || inRange(bite, 0xA1, 0xFE)) {
+        eucjp_lead = bite;
+        return null;
+      }
+
+      // 8. Return error.
+      return decoderError(fatal);
+    };
+  }
+
+  // 13.1.2 euc-jp encoder
+  /**
+   * @constructor
+   * @implements {Encoder}
+   * @param {{fatal: boolean}} options
+   */
+  function EUCJPEncoder(options) {
+    var fatal = options.fatal;
+    /**
+     * @param {Stream} stream Input stream.
+     * @param {number} code_point Next code point read from the stream.
+     * @return {(number|!Array.<number>)} Byte(s) to emit.
+     */
+    this.handler = function(stream, code_point) {
+      // 1. If code point is end-of-stream, return finished.
+      if (code_point === end_of_stream)
+        return finished;
+
+      // 2. If code point is an ASCII code point, return a byte whose
+      // value is code point.
+      if (isASCIICodePoint(code_point))
+        return code_point;
+
+      // 3. If code point is U+00A5, return byte 0x5C.
+      if (code_point === 0x00A5)
+        return 0x5C;
+
+      // 4. If code point is U+203E, return byte 0x7E.
+      if (code_point === 0x203E)
+        return 0x7E;
+
+      // 5. If code point is in the range U+FF61 to U+FF9F, inclusive,
+      // return two bytes whose values are 0x8E and code point −
+      // 0xFF61 + 0xA1.
+      if (inRange(code_point, 0xFF61, 0xFF9F))
+        return [0x8E, code_point - 0xFF61 + 0xA1];
+
+      // 6. If code point is U+2212, set it to U+FF0D.
+      if (code_point === 0x2212)
+        code_point = 0xFF0D;
+
+      // 7. Let pointer be the index pointer for code point in index
+      // jis0208.
+      var pointer = indexPointerFor(code_point, index('jis0208'));
+
+      // 8. If pointer is null, return error with code point.
+      if (pointer === null)
+        return encoderError(code_point);
+
+      // 9. Let lead be floor(pointer / 94) + 0xA1.
+      var lead = floor(pointer / 94) + 0xA1;
+
+      // 10. Let trail be pointer % 94 + 0xA1.
+      var trail = pointer % 94 + 0xA1;
+
+      // 11. Return two bytes whose values are lead and trail.
+      return [lead, trail];
+    };
+  }
+
+  /** @param {{fatal: boolean}} options */
+  encoders['EUC-JP'] = function(options) {
+    return new EUCJPEncoder(options);
+  };
+  /** @param {{fatal: boolean}} options */
+  decoders['EUC-JP'] = function(options) {
+    return new EUCJPDecoder(options);
+  };
+
+  // 13.2 iso-2022-jp
+
+  // 13.2.1 iso-2022-jp decoder
+  /**
+   * @constructor
+   * @implements {Decoder}
+   * @param {{fatal: boolean}} options
+   */
+  function ISO2022JPDecoder(options) {
+    var fatal = options.fatal;
+    /** @enum */
+    var states = {
+      ASCII: 0,
+      Roman: 1,
+      Katakana: 2,
+      LeadByte: 3,
+      TrailByte: 4,
+      EscapeStart: 5,
+      Escape: 6
+    };
+    // iso-2022-jp's decoder has an associated iso-2022-jp decoder
+    // state (initially ASCII), iso-2022-jp decoder output state
+    // (initially ASCII), iso-2022-jp lead (initially 0x00), and
+    // iso-2022-jp output flag (initially unset).
+    var /** @type {number} */ iso2022jp_decoder_state = states.ASCII,
+        /** @type {number} */ iso2022jp_decoder_output_state = states.ASCII,
+        /** @type {number} */ iso2022jp_lead = 0x00,
+        /** @type {boolean} */ iso2022jp_output_flag = false;
+    /**
+     * @param {Stream} stream The stream of bytes being decoded.
+     * @param {number} bite The next byte read from the stream.
+     * @return {?(number|!Array.<number>)} The next code point(s)
+     *     decoded, or null if not enough data exists in the input
+     *     stream to decode a complete code point.
+     */
+    this.handler = function(stream, bite) {
+      // switching on iso-2022-jp decoder state:
+      switch (iso2022jp_decoder_state) {
+      default:
+      case states.ASCII:
+        // ASCII
+        // Based on byte:
+
+        // 0x1B
+        if (bite === 0x1B) {
+          // Set iso-2022-jp decoder state to escape start and return
+          // continue.
+          iso2022jp_decoder_state = states.EscapeStart;
+          return null;
+        }
+
+        // 0x00 to 0x7F, excluding 0x0E, 0x0F, and 0x1B
+        if (inRange(bite, 0x00, 0x7F) && bite !== 0x0E
+            && bite !== 0x0F && bite !== 0x1B) {
+          // Unset the iso-2022-jp output flag and return a code point
+          // whose value is byte.
+          iso2022jp_output_flag = false;
+          return bite;
+        }
+
+        // end-of-stream
+        if (bite === end_of_stream) {
+          // Return finished.
+          return finished;
+        }
+
+        // Otherwise
+        // Unset the iso-2022-jp output flag and return error.
+        iso2022jp_output_flag = false;
+        return decoderError(fatal);
+
+      case states.Roman:
+        // Roman
+        // Based on byte:
+
+        // 0x1B
+        if (bite === 0x1B) {
+          // Set iso-2022-jp decoder state to escape start and return
+          // continue.
+          iso2022jp_decoder_state = states.EscapeStart;
+          return null;
+        }
+
+        // 0x5C
+        if (bite === 0x5C) {
+          // Unset the iso-2022-jp output flag and return code point
+          // U+00A5.
+          iso2022jp_output_flag = false;
+          return 0x00A5;
+        }
+
+        // 0x7E
+        if (bite === 0x7E) {
+          // Unset the iso-2022-jp output flag and return code point
+          // U+203E.
+          iso2022jp_output_flag = false;
+          return 0x203E;
+        }
+
+        // 0x00 to 0x7F, excluding 0x0E, 0x0F, 0x1B, 0x5C, and 0x7E
+        if (inRange(bite, 0x00, 0x7F) && bite !== 0x0E && bite !== 0x0F
+            && bite !== 0x1B && bite !== 0x5C && bite !== 0x7E) {
+          // Unset the iso-2022-jp output flag and return a code point
+          // whose value is byte.
+          iso2022jp_output_flag = false;
+          return bite;
+        }
+
+        // end-of-stream
+        if (bite === end_of_stream) {
+          // Return finished.
+          return finished;
+        }
+
+        // Otherwise
+        // Unset the iso-2022-jp output flag and return error.
+        iso2022jp_output_flag = false;
+        return decoderError(fatal);
+
+      case states.Katakana:
+        // Katakana
+        // Based on byte:
+
+        // 0x1B
+        if (bite === 0x1B) {
+          // Set iso-2022-jp decoder state to escape start and return
+          // continue.
+          iso2022jp_decoder_state = states.EscapeStart;
+          return null;
+        }
+
+        // 0x21 to 0x5F
+        if (inRange(bite, 0x21, 0x5F)) {
+          // Unset the iso-2022-jp output flag and return a code point
+          // whose value is 0xFF61 − 0x21 + byte.
+          iso2022jp_output_flag = false;
+          return 0xFF61 - 0x21 + bite;
+        }
+
+        // end-of-stream
+        if (bite === end_of_stream) {
+          // Return finished.
+          return finished;
+        }
+
+        // Otherwise
+        // Unset the iso-2022-jp output flag and return error.
+        iso2022jp_output_flag = false;
+        return decoderError(fatal);
+
+      case states.LeadByte:
+        // Lead byte
+        // Based on byte:
+
+        // 0x1B
+        if (bite === 0x1B) {
+          // Set iso-2022-jp decoder state to escape start and return
+          // continue.
+          iso2022jp_decoder_state = states.EscapeStart;
+          return null;
+        }
+
+        // 0x21 to 0x7E
+        if (inRange(bite, 0x21, 0x7E)) {
+          // Unset the iso-2022-jp output flag, set iso-2022-jp lead
+          // to byte, iso-2022-jp decoder state to trail byte, and
+          // return continue.
+          iso2022jp_output_flag = false;
+          iso2022jp_lead = bite;
+          iso2022jp_decoder_state = states.TrailByte;
+          return null;
+        }
+
+        // end-of-stream
+        if (bite === end_of_stream) {
+          // Return finished.
+          return finished;
+        }
+
+        // Otherwise
+        // Unset the iso-2022-jp output flag and return error.
+        iso2022jp_output_flag = false;
+        return decoderError(fatal);
+
+      case states.TrailByte:
+        // Trail byte
+        // Based on byte:
+
+        // 0x1B
+        if (bite === 0x1B) {
+          // Set iso-2022-jp decoder state to escape start and return
+          // continue.
+          iso2022jp_decoder_state = states.EscapeStart;
+          return decoderError(fatal);
+        }
+
+        // 0x21 to 0x7E
+        if (inRange(bite, 0x21, 0x7E)) {
+          // 1. Set the iso-2022-jp decoder state to lead byte.
+          iso2022jp_decoder_state = states.LeadByte;
+
+          // 2. Let pointer be (iso-2022-jp lead − 0x21) × 94 + byte − 0x21.
+          var pointer = (iso2022jp_lead - 0x21) * 94 + bite - 0x21;
+
+          // 3. Let code point be the index code point for pointer in
+          // index jis0208.
+          var code_point = indexCodePointFor(pointer, index('jis0208'));
+
+          // 4. If code point is null, return error.
+          if (code_point === null)
+            return decoderError(fatal);
+
+          // 5. Return a code point whose value is code point.
+          return code_point;
+        }
+
+        // end-of-stream
+        if (bite === end_of_stream) {
+          // Set the iso-2022-jp decoder state to lead byte, prepend
+          // byte to stream, and return error.
+          iso2022jp_decoder_state = states.LeadByte;
+          stream.prepend(bite);
+          return decoderError(fatal);
+        }
+
+        // Otherwise
+        // Set iso-2022-jp decoder state to lead byte and return
+        // error.
+        iso2022jp_decoder_state = states.LeadByte;
+        return decoderError(fatal);
+
+      case states.EscapeStart:
+        // Escape start
+
+        // 1. If byte is either 0x24 or 0x28, set iso-2022-jp lead to
+        // byte, iso-2022-jp decoder state to escape, and return
+        // continue.
+        if (bite === 0x24 || bite === 0x28) {
+          iso2022jp_lead = bite;
+          iso2022jp_decoder_state = states.Escape;
+          return null;
+        }
+
+        // 2. Prepend byte to stream.
+        stream.prepend(bite);
+
+        // 3. Unset the iso-2022-jp output flag, set iso-2022-jp
+        // decoder state to iso-2022-jp decoder output state, and
+        // return error.
+        iso2022jp_output_flag = false;
+        iso2022jp_decoder_state = iso2022jp_decoder_output_state;
+        return decoderError(fatal);
+
+      case states.Escape:
+        // Escape
+
+        // 1. Let lead be iso-2022-jp lead and set iso-2022-jp lead to
+        // 0x00.
+        var lead = iso2022jp_lead;
+        iso2022jp_lead = 0x00;
+
+        // 2. Let state be null.
+        var state = null;
+
+        // 3. If lead is 0x28 and byte is 0x42, set state to ASCII.
+        if (lead === 0x28 && bite === 0x42)
+          state = states.ASCII;
+
+        // 4. If lead is 0x28 and byte is 0x4A, set state to Roman.
+        if (lead === 0x28 && bite === 0x4A)
+          state = states.Roman;
+
+        // 5. If lead is 0x28 and byte is 0x49, set state to Katakana.
+        if (lead === 0x28 && bite === 0x49)
+          state = states.Katakana;
+
+        // 6. If lead is 0x24 and byte is either 0x40 or 0x42, set
+        // state to lead byte.
+        if (lead === 0x24 && (bite === 0x40 || bite === 0x42))
+          state = states.LeadByte;
+
+        // 7. If state is non-null, run these substeps:
+        if (state !== null) {
+          // 1. Set iso-2022-jp decoder state and iso-2022-jp decoder
+          // output state to states.
+          iso2022jp_decoder_state = iso2022jp_decoder_state = state;
+
+          // 2. Let output flag be the iso-2022-jp output flag.
+          var output_flag = iso2022jp_output_flag;
+
+          // 3. Set the iso-2022-jp output flag.
+          iso2022jp_output_flag = true;
+
+          // 4. Return continue, if output flag is unset, and error
+          // otherwise.
+          return !output_flag ? null : decoderError(fatal);
+        }
+
+        // 8. Prepend lead and byte to stream.
+        stream.prepend([lead, bite]);
+
+        // 9. Unset the iso-2022-jp output flag, set iso-2022-jp
+        // decoder state to iso-2022-jp decoder output state and
+        // return error.
+        iso2022jp_output_flag = false;
+        iso2022jp_decoder_state = iso2022jp_decoder_output_state;
+        return decoderError(fatal);
+      }
+    };
+  }
+
+  // 13.2.2 iso-2022-jp encoder
+  /**
+   * @constructor
+   * @implements {Encoder}
+   * @param {{fatal: boolean}} options
+   */
+  function ISO2022JPEncoder(options) {
+    var fatal = options.fatal;
+    // iso-2022-jp's encoder has an associated iso-2022-jp encoder
+    // state which is one of ASCII, Roman, and jis0208 (initially
+    // ASCII).
+    /** @enum */
+    var states = {
+      ASCII: 0,
+      Roman: 1,
+      jis0208: 2
+    };
+    var /** @type {number} */ iso2022jp_state = states.ASCII;
+    /**
+     * @param {Stream} stream Input stream.
+     * @param {number} code_point Next code point read from the stream.
+     * @return {(number|!Array.<number>)} Byte(s) to emit.
+     */
+    this.handler = function(stream, code_point) {
+      // 1. If code point is end-of-stream and iso-2022-jp encoder
+      // state is not ASCII, prepend code point to stream, set
+      // iso-2022-jp encoder state to ASCII, and return three bytes
+      // 0x1B 0x28 0x42.
+      if (code_point === end_of_stream &&
+          iso2022jp_state !== states.ASCII) {
+        stream.prepend(code_point);
+        iso2022jp_state = states.ASCII;
+        return [0x1B, 0x28, 0x42];
+      }
+
+      // 2. If code point is end-of-stream and iso-2022-jp encoder
+      // state is ASCII, return finished.
+      if (code_point === end_of_stream && iso2022jp_state === states.ASCII)
+        return finished;
+
+      // 3. If ISO-2022-JP encoder state is ASCII or Roman, and code
+      // point is U+000E, U+000F, or U+001B, return error with U+FFFD.
+      if ((iso2022jp_state === states.ASCII ||
+           iso2022jp_state === states.Roman) &&
+          (code_point === 0x000E || code_point === 0x000F ||
+           code_point === 0x001B)) {
+        return encoderError(0xFFFD);
+      }
+
+      // 4. If iso-2022-jp encoder state is ASCII and code point is an
+      // ASCII code point, return a byte whose value is code point.
+      if (iso2022jp_state === states.ASCII &&
+          isASCIICodePoint(code_point))
+        return code_point;
+
+      // 5. If iso-2022-jp encoder state is Roman and code point is an
+      // ASCII code point, excluding U+005C and U+007E, or is U+00A5
+      // or U+203E, run these substeps:
+      if (iso2022jp_state === states.Roman &&
+          ((isASCIICodePoint(code_point) &&
+           code_point !== 0x005C && code_point !== 0x007E) ||
+          (code_point == 0x00A5 || code_point == 0x203E))) {
+
+        // 1. If code point is an ASCII code point, return a byte
+        // whose value is code point.
+        if (isASCIICodePoint(code_point))
+          return code_point;
+
+        // 2. If code point is U+00A5, return byte 0x5C.
+        if (code_point === 0x00A5)
+          return 0x5C;
+
+        // 3. If code point is U+203E, return byte 0x7E.
+        if (code_point === 0x203E)
+          return 0x7E;
+      }
+
+      // 6. If code point is an ASCII code point, and iso-2022-jp
+      // encoder state is not ASCII, prepend code point to stream, set
+      // iso-2022-jp encoder state to ASCII, and return three bytes
+      // 0x1B 0x28 0x42.
+      if (isASCIICodePoint(code_point) &&
+          iso2022jp_state !== states.ASCII) {
+        stream.prepend(code_point);
+        iso2022jp_state = states.ASCII;
+        return [0x1B, 0x28, 0x42];
+      }
+
+      // 7. If code point is either U+00A5 or U+203E, and iso-2022-jp
+      // encoder state is not Roman, prepend code point to stream, set
+      // iso-2022-jp encoder state to Roman, and return three bytes
+      // 0x1B 0x28 0x4A.
+      if ((code_point === 0x00A5 || code_point === 0x203E) &&
+          iso2022jp_state !== states.Roman) {
+        stream.prepend(code_point);
+        iso2022jp_state = states.Roman;
+        return [0x1B, 0x28, 0x4A];
+      }
+
+      // 8. If code point is U+2212, set it to U+FF0D.
+      if (code_point === 0x2212)
+        code_point = 0xFF0D;
+
+      // 9. Let pointer be the index pointer for code point in index
+      // jis0208.
+      var pointer = indexPointerFor(code_point, index('jis0208'));
+
+      // 10. If pointer is null, return error with code point.
+      if (pointer === null)
+        return encoderError(code_point);
+
+      // 11. If iso-2022-jp encoder state is not jis0208, prepend code
+      // point to stream, set iso-2022-jp encoder state to jis0208,
+      // and return three bytes 0x1B 0x24 0x42.
+      if (iso2022jp_state !== states.jis0208) {
+        stream.prepend(code_point);
+        iso2022jp_state = states.jis0208;
+        return [0x1B, 0x24, 0x42];
+      }
+
+      // 12. Let lead be floor(pointer / 94) + 0x21.
+      var lead = floor(pointer / 94) + 0x21;
+
+      // 13. Let trail be pointer % 94 + 0x21.
+      var trail = pointer % 94 + 0x21;
+
+      // 14. Return two bytes whose values are lead and trail.
+      return [lead, trail];
+    };
+  }
+
+  /** @param {{fatal: boolean}} options */
+  encoders['ISO-2022-JP'] = function(options) {
+    return new ISO2022JPEncoder(options);
+  };
+  /** @param {{fatal: boolean}} options */
+  decoders['ISO-2022-JP'] = function(options) {
+    return new ISO2022JPDecoder(options);
+  };
+
+  // 13.3 Shift_JIS
+
+  // 13.3.1 Shift_JIS decoder
+  /**
+   * @constructor
+   * @implements {Decoder}
+   * @param {{fatal: boolean}} options
+   */
+  function ShiftJISDecoder(options) {
+    var fatal = options.fatal;
+    // Shift_JIS's decoder has an associated Shift_JIS lead (initially
+    // 0x00).
+    var /** @type {number} */ Shift_JIS_lead = 0x00;
+    /**
+     * @param {Stream} stream The stream of bytes being decoded.
+     * @param {number} bite The next byte read from the stream.
+     * @return {?(number|!Array.<number>)} The next code point(s)
+     *     decoded, or null if not enough data exists in the input
+     *     stream to decode a complete code point.
+     */
+    this.handler = function(stream, bite) {
+      // 1. If byte is end-of-stream and Shift_JIS lead is not 0x00,
+      // set Shift_JIS lead to 0x00 and return error.
+      if (bite === end_of_stream && Shift_JIS_lead !== 0x00) {
+        Shift_JIS_lead = 0x00;
+        return decoderError(fatal);
+      }
+
+      // 2. If byte is end-of-stream and Shift_JIS lead is 0x00,
+      // return finished.
+      if (bite === end_of_stream && Shift_JIS_lead === 0x00)
+        return finished;
+
+      // 3. If Shift_JIS lead is not 0x00, let lead be Shift_JIS lead,
+      // let pointer be null, set Shift_JIS lead to 0x00, and then run
+      // these substeps:
+      if (Shift_JIS_lead !== 0x00) {
+        var lead = Shift_JIS_lead;
+        var pointer = null;
+        Shift_JIS_lead = 0x00;
+
+        // 1. Let offset be 0x40, if byte is less than 0x7F, and 0x41
+        // otherwise.
+        var offset = (bite < 0x7F) ? 0x40 : 0x41;
+
+        // 2. Let lead offset be 0x81, if lead is less than 0xA0, and
+        // 0xC1 otherwise.
+        var lead_offset = (lead < 0xA0) ? 0x81 : 0xC1;
+
+        // 3. If byte is in the range 0x40 to 0x7E, inclusive, or 0x80
+        // to 0xFC, inclusive, set pointer to (lead − lead offset) ×
+        // 188 + byte − offset.
+        if (inRange(bite, 0x40, 0x7E) || inRange(bite, 0x80, 0xFC))
+          pointer = (lead - lead_offset) * 188 + bite - offset;
+
+        // 4. If pointer is in the range 8836 to 10715, inclusive,
+        // return a code point whose value is 0xE000 − 8836 + pointer.
+        if (inRange(pointer, 8836, 10715))
+          return 0xE000 - 8836 + pointer;
+
+        // 5. Let code point be null, if pointer is null, and the
+        // index code point for pointer in index jis0208 otherwise.
+        var code_point = (pointer === null) ? null :
+              indexCodePointFor(pointer, index('jis0208'));
+
+        // 6. If code point is null and byte is an ASCII byte, prepend
+        // byte to stream.
+        if (code_point === null && isASCIIByte(bite))
+          stream.prepend(bite);
+
+        // 7. If code point is null, return error.
+        if (code_point === null)
+          return decoderError(fatal);
+
+        // 8. Return a code point whose value is code point.
+        return code_point;
+      }
+
+      // 4. If byte is an ASCII byte or 0x80, return a code point
+      // whose value is byte.
+      if (isASCIIByte(bite) || bite === 0x80)
+        return bite;
+
+      // 5. If byte is in the range 0xA1 to 0xDF, inclusive, return a
+      // code point whose value is 0xFF61 − 0xA1 + byte.
+      if (inRange(bite, 0xA1, 0xDF))
+        return 0xFF61 - 0xA1 + bite;
+
+      // 6. If byte is in the range 0x81 to 0x9F, inclusive, or 0xE0
+      // to 0xFC, inclusive, set Shift_JIS lead to byte and return
+      // continue.
+      if (inRange(bite, 0x81, 0x9F) || inRange(bite, 0xE0, 0xFC)) {
+        Shift_JIS_lead = bite;
+        return null;
+      }
+
+      // 7. Return error.
+      return decoderError(fatal);
+    };
+  }
+
+  // 13.3.2 Shift_JIS encoder
+  /**
+   * @constructor
+   * @implements {Encoder}
+   * @param {{fatal: boolean}} options
+   */
+  function ShiftJISEncoder(options) {
+    var fatal = options.fatal;
+    /**
+     * @param {Stream} stream Input stream.
+     * @param {number} code_point Next code point read from the stream.
+     * @return {(number|!Array.<number>)} Byte(s) to emit.
+     */
+    this.handler = function(stream, code_point) {
+      // 1. If code point is end-of-stream, return finished.
+      if (code_point === end_of_stream)
+        return finished;
+
+      // 2. If code point is an ASCII code point or U+0080, return a
+      // byte whose value is code point.
+      if (isASCIICodePoint(code_point) || code_point === 0x0080)
+        return code_point;
+
+      // 3. If code point is U+00A5, return byte 0x5C.
+      if (code_point === 0x00A5)
+        return 0x5C;
+
+      // 4. If code point is U+203E, return byte 0x7E.
+      if (code_point === 0x203E)
+        return 0x7E;
+
+      // 5. If code point is in the range U+FF61 to U+FF9F, inclusive,
+      // return a byte whose value is code point − 0xFF61 + 0xA1.
+      if (inRange(code_point, 0xFF61, 0xFF9F))
+        return code_point - 0xFF61 + 0xA1;
+
+      // 6. If code point is U+2212, set it to U+FF0D.
+      if (code_point === 0x2212)
+        code_point = 0xFF0D;
+
+      // 7. Let pointer be the index Shift_JIS pointer for code point.
+      var pointer = indexShiftJISPointerFor(code_point);
+
+      // 8. If pointer is null, return error with code point.
+      if (pointer === null)
+        return encoderError(code_point);
+
+      // 9. Let lead be floor(pointer / 188).
+      var lead = floor(pointer / 188);
+
+      // 10. Let lead offset be 0x81, if lead is less than 0x1F, and
+      // 0xC1 otherwise.
+      var lead_offset = (lead < 0x1F) ? 0x81 : 0xC1;
+
+      // 11. Let trail be pointer % 188.
+      var trail = pointer % 188;
+
+      // 12. Let offset be 0x40, if trail is less than 0x3F, and 0x41
+      // otherwise.
+      var offset = (trail < 0x3F) ? 0x40 : 0x41;
+
+      // 13. Return two bytes whose values are lead + lead offset and
+      // trail + offset.
+      return [lead + lead_offset, trail + offset];
+    };
+  }
+
+  /** @param {{fatal: boolean}} options */
+  encoders['Shift_JIS'] = function(options) {
+    return new ShiftJISEncoder(options);
+  };
+  /** @param {{fatal: boolean}} options */
+  decoders['Shift_JIS'] = function(options) {
+    return new ShiftJISDecoder(options);
+  };
+
+  //
+  // 14. Legacy multi-byte Korean encodings
+  //
+
+  // 14.1 euc-kr
+
+  // 14.1.1 euc-kr decoder
+  /**
+   * @constructor
+   * @implements {Decoder}
+   * @param {{fatal: boolean}} options
+   */
+  function EUCKRDecoder(options) {
+    var fatal = options.fatal;
+
+    // euc-kr's decoder has an associated euc-kr lead (initially 0x00).
+    var /** @type {number} */ euckr_lead = 0x00;
+    /**
+     * @param {Stream} stream The stream of bytes being decoded.
+     * @param {number} bite The next byte read from the stream.
+     * @return {?(number|!Array.<number>)} The next code point(s)
+     *     decoded, or null if not enough data exists in the input
+     *     stream to decode a complete code point.
+     */
+    this.handler = function(stream, bite) {
+      // 1. If byte is end-of-stream and euc-kr lead is not 0x00, set
+      // euc-kr lead to 0x00 and return error.
+      if (bite === end_of_stream && euckr_lead !== 0) {
+        euckr_lead = 0x00;
+        return decoderError(fatal);
+      }
+
+      // 2. If byte is end-of-stream and euc-kr lead is 0x00, return
+      // finished.
+      if (bite === end_of_stream && euckr_lead === 0)
+        return finished;
+
+      // 3. If euc-kr lead is not 0x00, let lead be euc-kr lead, let
+      // pointer be null, set euc-kr lead to 0x00, and then run these
+      // substeps:
+      if (euckr_lead !== 0x00) {
+        var lead = euckr_lead;
+        var pointer = null;
+        euckr_lead = 0x00;
+
+        // 1. If byte is in the range 0x41 to 0xFE, inclusive, set
+        // pointer to (lead − 0x81) × 190 + (byte − 0x41).
+        if (inRange(bite, 0x41, 0xFE))
+          pointer = (lead - 0x81) * 190 + (bite - 0x41);
+
+        // 2. Let code point be null, if pointer is null, and the
+        // index code point for pointer in index euc-kr otherwise.
+        var code_point = (pointer === null)
+              ? null : indexCodePointFor(pointer, index('euc-kr'));
+
+        // 3. If code point is null and byte is an ASCII byte, prepend
+        // byte to stream.
+        if (pointer === null && isASCIIByte(bite))
+          stream.prepend(bite);
+
+        // 4. If code point is null, return error.
+        if (code_point === null)
+          return decoderError(fatal);
+
+        // 5. Return a code point whose value is code point.
+        return code_point;
+      }
+
+      // 4. If byte is an ASCII byte, return a code point whose value
+      // is byte.
+      if (isASCIIByte(bite))
+        return bite;
+
+      // 5. If byte is in the range 0x81 to 0xFE, inclusive, set
+      // euc-kr lead to byte and return continue.
+      if (inRange(bite, 0x81, 0xFE)) {
+        euckr_lead = bite;
+        return null;
+      }
+
+      // 6. Return error.
+      return decoderError(fatal);
+    };
+  }
+
+  // 14.1.2 euc-kr encoder
+  /**
+   * @constructor
+   * @implements {Encoder}
+   * @param {{fatal: boolean}} options
+   */
+  function EUCKREncoder(options) {
+    var fatal = options.fatal;
+    /**
+     * @param {Stream} stream Input stream.
+     * @param {number} code_point Next code point read from the stream.
+     * @return {(number|!Array.<number>)} Byte(s) to emit.
+     */
+    this.handler = function(stream, code_point) {
+      // 1. If code point is end-of-stream, return finished.
+      if (code_point === end_of_stream)
+        return finished;
+
+      // 2. If code point is an ASCII code point, return a byte whose
+      // value is code point.
+      if (isASCIICodePoint(code_point))
+        return code_point;
+
+      // 3. Let pointer be the index pointer for code point in index
+      // euc-kr.
+      var pointer = indexPointerFor(code_point, index('euc-kr'));
+
+      // 4. If pointer is null, return error with code point.
+      if (pointer === null)
+        return encoderError(code_point);
+
+      // 5. Let lead be floor(pointer / 190) + 0x81.
+      var lead = floor(pointer / 190) + 0x81;
+
+      // 6. Let trail be pointer % 190 + 0x41.
+      var trail = (pointer % 190) + 0x41;
+
+      // 7. Return two bytes whose values are lead and trail.
+      return [lead, trail];
+    };
+  }
+
+  /** @param {{fatal: boolean}} options */
+  encoders['EUC-KR'] = function(options) {
+    return new EUCKREncoder(options);
+  };
+  /** @param {{fatal: boolean}} options */
+  decoders['EUC-KR'] = function(options) {
+    return new EUCKRDecoder(options);
+  };
+
+
+  //
+  // 15. Legacy miscellaneous encodings
+  //
+
+  // 15.1 replacement
+
+  // Not needed - API throws RangeError
+
+  // 15.2 Common infrastructure for utf-16be and utf-16le
+
+  /**
+   * @param {number} code_unit
+   * @param {boolean} utf16be
+   * @return {!Array.<number>} bytes
+   */
+  function convertCodeUnitToBytes(code_unit, utf16be) {
+    // 1. Let byte1 be code unit >> 8.
+    var byte1 = code_unit >> 8;
+
+    // 2. Let byte2 be code unit & 0x00FF.
+    var byte2 = code_unit & 0x00FF;
+
+    // 3. Then return the bytes in order:
+        // utf-16be flag is set: byte1, then byte2.
+    if (utf16be)
+      return [byte1, byte2];
+    // utf-16be flag is unset: byte2, then byte1.
+    return [byte2, byte1];
+  }
+
+  // 15.2.1 shared utf-16 decoder
+  /**
+   * @constructor
+   * @implements {Decoder}
+   * @param {boolean} utf16_be True if big-endian, false if little-endian.
+   * @param {{fatal: boolean}} options
+   */
+  function UTF16Decoder(utf16_be, options) {
+    var fatal = options.fatal;
+    var /** @type {?number} */ utf16_lead_byte = null,
+        /** @type {?number} */ utf16_lead_surrogate = null;
+    /**
+     * @param {Stream} stream The stream of bytes being decoded.
+     * @param {number} bite The next byte read from the stream.
+     * @return {?(number|!Array.<number>)} The next code point(s)
+     *     decoded, or null if not enough data exists in the input
+     *     stream to decode a complete code point.
+     */
+    this.handler = function(stream, bite) {
+      // 1. If byte is end-of-stream and either utf-16 lead byte or
+      // utf-16 lead surrogate is not null, set utf-16 lead byte and
+      // utf-16 lead surrogate to null, and return error.
+      if (bite === end_of_stream && (utf16_lead_byte !== null ||
+                                utf16_lead_surrogate !== null)) {
+        return decoderError(fatal);
+      }
+
+      // 2. If byte is end-of-stream and utf-16 lead byte and utf-16
+      // lead surrogate are null, return finished.
+      if (bite === end_of_stream && utf16_lead_byte === null &&
+          utf16_lead_surrogate === null) {
+        return finished;
+      }
+
+      // 3. If utf-16 lead byte is null, set utf-16 lead byte to byte
+      // and return continue.
+      if (utf16_lead_byte === null) {
+        utf16_lead_byte = bite;
+        return null;
+      }
+
+      // 4. Let code unit be the result of:
+      var code_unit;
+      if (utf16_be) {
+        // utf-16be decoder flag is set
+        //   (utf-16 lead byte << 8) + byte.
+        code_unit = (utf16_lead_byte << 8) + bite;
+      } else {
+        // utf-16be decoder flag is unset
+        //   (byte << 8) + utf-16 lead byte.
+        code_unit = (bite << 8) + utf16_lead_byte;
+      }
+      // Then set utf-16 lead byte to null.
+      utf16_lead_byte = null;
+
+      // 5. If utf-16 lead surrogate is not null, let lead surrogate
+      // be utf-16 lead surrogate, set utf-16 lead surrogate to null,
+      // and then run these substeps:
+      if (utf16_lead_surrogate !== null) {
+        var lead_surrogate = utf16_lead_surrogate;
+        utf16_lead_surrogate = null;
+
+        // 1. If code unit is in the range U+DC00 to U+DFFF,
+        // inclusive, return a code point whose value is 0x10000 +
+        // ((lead surrogate − 0xD800) << 10) + (code unit − 0xDC00).
+        if (inRange(code_unit, 0xDC00, 0xDFFF)) {
+          return 0x10000 + (lead_surrogate - 0xD800) * 0x400 +
+              (code_unit - 0xDC00);
+        }
+
+        // 2. Prepend the sequence resulting of converting code unit
+        // to bytes using utf-16be decoder flag to stream and return
+        // error.
+        stream.prepend(convertCodeUnitToBytes(code_unit, utf16_be));
+        return decoderError(fatal);
+      }
+
+      // 6. If code unit is in the range U+D800 to U+DBFF, inclusive,
+      // set utf-16 lead surrogate to code unit and return continue.
+      if (inRange(code_unit, 0xD800, 0xDBFF)) {
+        utf16_lead_surrogate = code_unit;
+        return null;
+      }
+
+      // 7. If code unit is in the range U+DC00 to U+DFFF, inclusive,
+      // return error.
+      if (inRange(code_unit, 0xDC00, 0xDFFF))
+        return decoderError(fatal);
+
+      // 8. Return code point code unit.
+      return code_unit;
+    };
+  }
+
+  // 15.2.2 shared utf-16 encoder
+  /**
+   * @constructor
+   * @implements {Encoder}
+   * @param {boolean} utf16_be True if big-endian, false if little-endian.
+   * @param {{fatal: boolean}} options
+   */
+  function UTF16Encoder(utf16_be, options) {
+    var fatal = options.fatal;
+    /**
+     * @param {Stream} stream Input stream.
+     * @param {number} code_point Next code point read from the stream.
+     * @return {(number|!Array.<number>)} Byte(s) to emit.
+     */
+    this.handler = function(stream, code_point) {
+      // 1. If code point is end-of-stream, return finished.
+      if (code_point === end_of_stream)
+        return finished;
+
+      // 2. If code point is in the range U+0000 to U+FFFF, inclusive,
+      // return the sequence resulting of converting code point to
+      // bytes using utf-16be encoder flag.
+      if (inRange(code_point, 0x0000, 0xFFFF))
+        return convertCodeUnitToBytes(code_point, utf16_be);
+
+      // 3. Let lead be ((code point − 0x10000) >> 10) + 0xD800,
+      // converted to bytes using utf-16be encoder flag.
+      var lead = convertCodeUnitToBytes(
+        ((code_point - 0x10000) >> 10) + 0xD800, utf16_be);
+
+      // 4. Let trail be ((code point − 0x10000) & 0x3FF) + 0xDC00,
+      // converted to bytes using utf-16be encoder flag.
+      var trail = convertCodeUnitToBytes(
+        ((code_point - 0x10000) & 0x3FF) + 0xDC00, utf16_be);
+
+      // 5. Return a byte sequence of lead followed by trail.
+      return lead.concat(trail);
+    };
+  }
+
+  // 15.3 utf-16be
+  // 15.3.1 utf-16be decoder
+  /** @param {{fatal: boolean}} options */
+  encoders['UTF-16BE'] = function(options) {
+    return new UTF16Encoder(true, options);
+  };
+  // 15.3.2 utf-16be encoder
+  /** @param {{fatal: boolean}} options */
+  decoders['UTF-16BE'] = function(options) {
+    return new UTF16Decoder(true, options);
+  };
+
+  // 15.4 utf-16le
+  // 15.4.1 utf-16le decoder
+  /** @param {{fatal: boolean}} options */
+  encoders['UTF-16LE'] = function(options) {
+    return new UTF16Encoder(false, options);
+  };
+  // 15.4.2 utf-16le encoder
+  /** @param {{fatal: boolean}} options */
+  decoders['UTF-16LE'] = function(options) {
+    return new UTF16Decoder(false, options);
+  };
+
+  // 15.5 x-user-defined
+
+  // 15.5.1 x-user-defined decoder
+  /**
+   * @constructor
+   * @implements {Decoder}
+   * @param {{fatal: boolean}} options
+   */
+  function XUserDefinedDecoder(options) {
+    var fatal = options.fatal;
+    /**
+     * @param {Stream} stream The stream of bytes being decoded.
+     * @param {number} bite The next byte read from the stream.
+     * @return {?(number|!Array.<number>)} The next code point(s)
+     *     decoded, or null if not enough data exists in the input
+     *     stream to decode a complete code point.
+     */
+    this.handler = function(stream, bite) {
+      // 1. If byte is end-of-stream, return finished.
+      if (bite === end_of_stream)
+        return finished;
+
+      // 2. If byte is an ASCII byte, return a code point whose value
+      // is byte.
+      if (isASCIIByte(bite))
+        return bite;
+
+      // 3. Return a code point whose value is 0xF780 + byte − 0x80.
+      return 0xF780 + bite - 0x80;
+    };
+  }
+
+  // 15.5.2 x-user-defined encoder
+  /**
+   * @constructor
+   * @implements {Encoder}
+   * @param {{fatal: boolean}} options
+   */
+  function XUserDefinedEncoder(options) {
+    var fatal = options.fatal;
+    /**
+     * @param {Stream} stream Input stream.
+     * @param {number} code_point Next code point read from the stream.
+     * @return {(number|!Array.<number>)} Byte(s) to emit.
+     */
+    this.handler = function(stream, code_point) {
+      // 1.If code point is end-of-stream, return finished.
+      if (code_point === end_of_stream)
+        return finished;
+
+      // 2. If code point is an ASCII code point, return a byte whose
+      // value is code point.
+      if (isASCIICodePoint(code_point))
+        return code_point;
+
+      // 3. If code point is in the range U+F780 to U+F7FF, inclusive,
+      // return a byte whose value is code point − 0xF780 + 0x80.
+      if (inRange(code_point, 0xF780, 0xF7FF))
+        return code_point - 0xF780 + 0x80;
+
+      // 4. Return error with code point.
+      return encoderError(code_point);
+    };
+  }
+
+  /** @param {{fatal: boolean}} options */
+  encoders['x-user-defined'] = function(options) {
+    return new XUserDefinedEncoder(options);
+  };
+  /** @param {{fatal: boolean}} options */
+  decoders['x-user-defined'] = function(options) {
+    return new XUserDefinedDecoder(options);
+  };
+
+  if (!global['TextEncoder'])
+    global['TextEncoder'] = TextEncoder;
+  if (!global['TextDecoder'])
+    global['TextDecoder'] = TextDecoder;
+
+  if (typeof module !== "undefined" && module.exports) {
+    module.exports = {
+      TextEncoder: global['TextEncoder'],
+      TextDecoder: global['TextDecoder'],
+      EncodingIndexes: global["encoding-indexes"]
+    };
+  }
+
+// For strict environments where `this` inside the global scope
+// is `undefined`, take a pure object instead
+}(this || {}));
+},{"./encoding-indexes.js":111}],113:[function(require,module,exports){
+/*!
+
+ diff v4.0.1
+
+Software License Agreement (BSD License)
+
+Copyright (c) 2009-2015, Kevin Decker <kpdecker@gmail.com>
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of Kevin Decker nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+@license
+*/
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+  typeof define === 'function' && define.amd ? define(['exports'], factory) :
+  (global = global || self, factory(global.Diff = {}));
+}(this, function (exports) { 'use strict';
+
+  function Diff() {}
+  Diff.prototype = {
+    diff: function diff(oldString, newString) {
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var callback = options.callback;
+
+      if (typeof options === 'function') {
+        callback = options;
+        options = {};
+      }
+
+      this.options = options;
+      var self = this;
+
+      function done(value) {
+        if (callback) {
+          setTimeout(function () {
+            callback(undefined, value);
+          }, 0);
+          return true;
+        } else {
+          return value;
+        }
+      } // Allow subclasses to massage the input prior to running
+
+
+      oldString = this.castInput(oldString);
+      newString = this.castInput(newString);
+      oldString = this.removeEmpty(this.tokenize(oldString));
+      newString = this.removeEmpty(this.tokenize(newString));
+      var newLen = newString.length,
+          oldLen = oldString.length;
+      var editLength = 1;
+      var maxEditLength = newLen + oldLen;
+      var bestPath = [{
+        newPos: -1,
+        components: []
+      }]; // Seed editLength = 0, i.e. the content starts with the same values
+
+      var oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);
+
+      if (bestPath[0].newPos + 1 >= newLen && oldPos + 1 >= oldLen) {
+        // Identity per the equality and tokenizer
+        return done([{
+          value: this.join(newString),
+          count: newString.length
+        }]);
+      } // Main worker method. checks all permutations of a given edit length for acceptance.
+
+
+      function execEditLength() {
+        for (var diagonalPath = -1 * editLength; diagonalPath <= editLength; diagonalPath += 2) {
+          var basePath = void 0;
+
+          var addPath = bestPath[diagonalPath - 1],
+              removePath = bestPath[diagonalPath + 1],
+              _oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
+
+          if (addPath) {
+            // No one else is going to attempt to use this value, clear it
+            bestPath[diagonalPath - 1] = undefined;
+          }
+
+          var canAdd = addPath && addPath.newPos + 1 < newLen,
+              canRemove = removePath && 0 <= _oldPos && _oldPos < oldLen;
+
+          if (!canAdd && !canRemove) {
+            // If this path is a terminal then prune
+            bestPath[diagonalPath] = undefined;
+            continue;
+          } // Select the diagonal that we want to branch from. We select the prior
+          // path whose position in the new string is the farthest from the origin
+          // and does not pass the bounds of the diff graph
+
+
+          if (!canAdd || canRemove && addPath.newPos < removePath.newPos) {
+            basePath = clonePath(removePath);
+            self.pushComponent(basePath.components, undefined, true);
+          } else {
+            basePath = addPath; // No need to clone, we've pulled it from the list
+
+            basePath.newPos++;
+            self.pushComponent(basePath.components, true, undefined);
+          }
+
+          _oldPos = self.extractCommon(basePath, newString, oldString, diagonalPath); // If we have hit the end of both strings, then we are done
+
+          if (basePath.newPos + 1 >= newLen && _oldPos + 1 >= oldLen) {
+            return done(buildValues(self, basePath.components, newString, oldString, self.useLongestToken));
+          } else {
+            // Otherwise track this path as a potential candidate and continue.
+            bestPath[diagonalPath] = basePath;
+          }
+        }
+
+        editLength++;
+      } // Performs the length of edit iteration. Is a bit fugly as this has to support the
+      // sync and async mode which is never fun. Loops over execEditLength until a value
+      // is produced.
+
+
+      if (callback) {
+        (function exec() {
+          setTimeout(function () {
+            // This should not happen, but we want to be safe.
+
+            /* istanbul ignore next */
+            if (editLength > maxEditLength) {
+              return callback();
+            }
+
+            if (!execEditLength()) {
+              exec();
+            }
+          }, 0);
+        })();
+      } else {
+        while (editLength <= maxEditLength) {
+          var ret = execEditLength();
+
+          if (ret) {
+            return ret;
+          }
+        }
+      }
+    },
+    pushComponent: function pushComponent(components, added, removed) {
+      var last = components[components.length - 1];
+
+      if (last && last.added === added && last.removed === removed) {
+        // We need to clone here as the component clone operation is just
+        // as shallow array clone
+        components[components.length - 1] = {
+          count: last.count + 1,
+          added: added,
+          removed: removed
+        };
+      } else {
+        components.push({
+          count: 1,
+          added: added,
+          removed: removed
+        });
+      }
+    },
+    extractCommon: function extractCommon(basePath, newString, oldString, diagonalPath) {
+      var newLen = newString.length,
+          oldLen = oldString.length,
+          newPos = basePath.newPos,
+          oldPos = newPos - diagonalPath,
+          commonCount = 0;
+
+      while (newPos + 1 < newLen && oldPos + 1 < oldLen && this.equals(newString[newPos + 1], oldString[oldPos + 1])) {
+        newPos++;
+        oldPos++;
+        commonCount++;
+      }
+
+      if (commonCount) {
+        basePath.components.push({
+          count: commonCount
+        });
+      }
+
+      basePath.newPos = newPos;
+      return oldPos;
+    },
+    equals: function equals(left, right) {
+      if (this.options.comparator) {
+        return this.options.comparator(left, right);
+      } else {
+        return left === right || this.options.ignoreCase && left.toLowerCase() === right.toLowerCase();
+      }
+    },
+    removeEmpty: function removeEmpty(array) {
+      var ret = [];
+
+      for (var i = 0; i < array.length; i++) {
+        if (array[i]) {
+          ret.push(array[i]);
+        }
+      }
+
+      return ret;
+    },
+    castInput: function castInput(value) {
+      return value;
+    },
+    tokenize: function tokenize(value) {
+      return value.split('');
+    },
+    join: function join(chars) {
+      return chars.join('');
+    }
+  };
+
+  function buildValues(diff, components, newString, oldString, useLongestToken) {
+    var componentPos = 0,
+        componentLen = components.length,
+        newPos = 0,
+        oldPos = 0;
+
+    for (; componentPos < componentLen; componentPos++) {
+      var component = components[componentPos];
+
+      if (!component.removed) {
+        if (!component.added && useLongestToken) {
+          var value = newString.slice(newPos, newPos + component.count);
+          value = value.map(function (value, i) {
+            var oldValue = oldString[oldPos + i];
+            return oldValue.length > value.length ? oldValue : value;
+          });
+          component.value = diff.join(value);
+        } else {
+          component.value = diff.join(newString.slice(newPos, newPos + component.count));
+        }
+
+        newPos += component.count; // Common case
+
+        if (!component.added) {
+          oldPos += component.count;
+        }
+      } else {
+        component.value = diff.join(oldString.slice(oldPos, oldPos + component.count));
+        oldPos += component.count; // Reverse add and remove so removes are output first to match common convention
+        // The diffing algorithm is tied to add then remove output and this is the simplest
+        // route to get the desired output with minimal overhead.
+
+        if (componentPos && components[componentPos - 1].added) {
+          var tmp = components[componentPos - 1];
+          components[componentPos - 1] = components[componentPos];
+          components[componentPos] = tmp;
+        }
+      }
+    } // Special case handle for when one terminal is ignored (i.e. whitespace).
+    // For this case we merge the terminal into the prior string and drop the change.
+    // This is only available for string mode.
+
+
+    var lastComponent = components[componentLen - 1];
+
+    if (componentLen > 1 && typeof lastComponent.value === 'string' && (lastComponent.added || lastComponent.removed) && diff.equals('', lastComponent.value)) {
+      components[componentLen - 2].value += lastComponent.value;
+      components.pop();
+    }
+
+    return components;
+  }
+
+  function clonePath(path) {
+    return {
+      newPos: path.newPos,
+      components: path.components.slice(0)
+    };
+  }
+
+  var characterDiff = new Diff();
+  function diffChars(oldStr, newStr, options) {
+    return characterDiff.diff(oldStr, newStr, options);
+  }
+
+  function generateOptions(options, defaults) {
+    if (typeof options === 'function') {
+      defaults.callback = options;
+    } else if (options) {
+      for (var name in options) {
+        /* istanbul ignore else */
+        if (options.hasOwnProperty(name)) {
+          defaults[name] = options[name];
+        }
+      }
+    }
+
+    return defaults;
+  }
+
+  //
+  // Ranges and exceptions:
+  // Latin-1 Supplement, 0080–00FF
+  //  - U+00D7  × Multiplication sign
+  //  - U+00F7  ÷ Division sign
+  // Latin Extended-A, 0100–017F
+  // Latin Extended-B, 0180–024F
+  // IPA Extensions, 0250–02AF
+  // Spacing Modifier Letters, 02B0–02FF
+  //  - U+02C7  ˇ &#711;  Caron
+  //  - U+02D8  ˘ &#728;  Breve
+  //  - U+02D9  ˙ &#729;  Dot Above
+  //  - U+02DA  ˚ &#730;  Ring Above
+  //  - U+02DB  ˛ &#731;  Ogonek
+  //  - U+02DC  ˜ &#732;  Small Tilde
+  //  - U+02DD  ˝ &#733;  Double Acute Accent
+  // Latin Extended Additional, 1E00–1EFF
+
+  var extendedWordChars = /^[A-Za-z\xC0-\u02C6\u02C8-\u02D7\u02DE-\u02FF\u1E00-\u1EFF]+$/;
+  var reWhitespace = /\S/;
+  var wordDiff = new Diff();
+
+  wordDiff.equals = function (left, right) {
+    if (this.options.ignoreCase) {
+      left = left.toLowerCase();
+      right = right.toLowerCase();
+    }
+
+    return left === right || this.options.ignoreWhitespace && !reWhitespace.test(left) && !reWhitespace.test(right);
+  };
+
+  wordDiff.tokenize = function (value) {
+    var tokens = value.split(/(\s+|[()[\]{}'"]|\b)/); // Join the boundary splits that we do not consider to be boundaries. This is primarily the extended Latin character set.
+
+    for (var i = 0; i < tokens.length - 1; i++) {
+      // If we have an empty string in the next field and we have only word chars before and after, merge
+      if (!tokens[i + 1] && tokens[i + 2] && extendedWordChars.test(tokens[i]) && extendedWordChars.test(tokens[i + 2])) {
+        tokens[i] += tokens[i + 2];
+        tokens.splice(i + 1, 2);
+        i--;
+      }
+    }
+
+    return tokens;
+  };
+
+  function diffWords(oldStr, newStr, options) {
+    options = generateOptions(options, {
+      ignoreWhitespace: true
+    });
+    return wordDiff.diff(oldStr, newStr, options);
+  }
+  function diffWordsWithSpace(oldStr, newStr, options) {
+    return wordDiff.diff(oldStr, newStr, options);
+  }
+
+  var lineDiff = new Diff();
+
+  lineDiff.tokenize = function (value) {
+    var retLines = [],
+        linesAndNewlines = value.split(/(\n|\r\n)/); // Ignore the final empty token that occurs if the string ends with a new line
+
+    if (!linesAndNewlines[linesAndNewlines.length - 1]) {
+      linesAndNewlines.pop();
+    } // Merge the content and line separators into single tokens
+
+
+    for (var i = 0; i < linesAndNewlines.length; i++) {
+      var line = linesAndNewlines[i];
+
+      if (i % 2 && !this.options.newlineIsToken) {
+        retLines[retLines.length - 1] += line;
+      } else {
+        if (this.options.ignoreWhitespace) {
+          line = line.trim();
+        }
+
+        retLines.push(line);
+      }
+    }
+
+    return retLines;
+  };
+
+  function diffLines(oldStr, newStr, callback) {
+    return lineDiff.diff(oldStr, newStr, callback);
+  }
+  function diffTrimmedLines(oldStr, newStr, callback) {
+    var options = generateOptions(callback, {
+      ignoreWhitespace: true
+    });
+    return lineDiff.diff(oldStr, newStr, options);
+  }
+
+  var sentenceDiff = new Diff();
+
+  sentenceDiff.tokenize = function (value) {
+    return value.split(/(\S.+?[.!?])(?=\s+|$)/);
+  };
+
+  function diffSentences(oldStr, newStr, callback) {
+    return sentenceDiff.diff(oldStr, newStr, callback);
+  }
+
+  var cssDiff = new Diff();
+
+  cssDiff.tokenize = function (value) {
+    return value.split(/([{}:;,]|\s+)/);
+  };
+
+  function diffCss(oldStr, newStr, callback) {
+    return cssDiff.diff(oldStr, newStr, callback);
+  }
+
+  function _typeof(obj) {
+    if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
+      _typeof = function (obj) {
+        return typeof obj;
+      };
+    } else {
+      _typeof = function (obj) {
+        return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+      };
+    }
+
+    return _typeof(obj);
+  }
+
+  function _toConsumableArray(arr) {
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread();
+  }
+
+  function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) {
+      for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
+
+      return arr2;
+    }
+  }
+
+  function _iterableToArray(iter) {
+    if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter);
+  }
+
+  function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance");
+  }
+
+  var objectPrototypeToString = Object.prototype.toString;
+  var jsonDiff = new Diff(); // Discriminate between two lines of pretty-printed, serialized JSON where one of them has a
+  // dangling comma and the other doesn't. Turns out including the dangling comma yields the nicest output:
+
+  jsonDiff.useLongestToken = true;
+  jsonDiff.tokenize = lineDiff.tokenize;
+
+  jsonDiff.castInput = function (value) {
+    var _this$options = this.options,
+        undefinedReplacement = _this$options.undefinedReplacement,
+        _this$options$stringi = _this$options.stringifyReplacer,
+        stringifyReplacer = _this$options$stringi === void 0 ? function (k, v) {
+      return typeof v === 'undefined' ? undefinedReplacement : v;
+    } : _this$options$stringi;
+    return typeof value === 'string' ? value : JSON.stringify(canonicalize(value, null, null, stringifyReplacer), stringifyReplacer, '  ');
+  };
+
+  jsonDiff.equals = function (left, right) {
+    return Diff.prototype.equals.call(jsonDiff, left.replace(/,([\r\n])/g, '$1'), right.replace(/,([\r\n])/g, '$1'));
+  };
+
+  function diffJson(oldObj, newObj, options) {
+    return jsonDiff.diff(oldObj, newObj, options);
+  } // This function handles the presence of circular references by bailing out when encountering an
+  // object that is already on the "stack" of items being processed. Accepts an optional replacer
+
+  function canonicalize(obj, stack, replacementStack, replacer, key) {
+    stack = stack || [];
+    replacementStack = replacementStack || [];
+
+    if (replacer) {
+      obj = replacer(key, obj);
+    }
+
+    var i;
+
+    for (i = 0; i < stack.length; i += 1) {
+      if (stack[i] === obj) {
+        return replacementStack[i];
+      }
+    }
+
+    var canonicalizedObj;
+
+    if ('[object Array]' === objectPrototypeToString.call(obj)) {
+      stack.push(obj);
+      canonicalizedObj = new Array(obj.length);
+      replacementStack.push(canonicalizedObj);
+
+      for (i = 0; i < obj.length; i += 1) {
+        canonicalizedObj[i] = canonicalize(obj[i], stack, replacementStack, replacer, key);
+      }
+
+      stack.pop();
+      replacementStack.pop();
+      return canonicalizedObj;
+    }
+
+    if (obj && obj.toJSON) {
+      obj = obj.toJSON();
+    }
+
+    if (_typeof(obj) === 'object' && obj !== null) {
+      stack.push(obj);
+      canonicalizedObj = {};
+      replacementStack.push(canonicalizedObj);
+
+      var sortedKeys = [],
+          _key;
+
+      for (_key in obj) {
+        /* istanbul ignore else */
+        if (obj.hasOwnProperty(_key)) {
+          sortedKeys.push(_key);
+        }
+      }
+
+      sortedKeys.sort();
+
+      for (i = 0; i < sortedKeys.length; i += 1) {
+        _key = sortedKeys[i];
+        canonicalizedObj[_key] = canonicalize(obj[_key], stack, replacementStack, replacer, _key);
+      }
+
+      stack.pop();
+      replacementStack.pop();
+    } else {
+      canonicalizedObj = obj;
+    }
+
+    return canonicalizedObj;
+  }
+
+  var arrayDiff = new Diff();
+
+  arrayDiff.tokenize = function (value) {
+    return value.slice();
+  };
+
+  arrayDiff.join = arrayDiff.removeEmpty = function (value) {
+    return value;
+  };
+
+  function diffArrays(oldArr, newArr, callback) {
+    return arrayDiff.diff(oldArr, newArr, callback);
+  }
+
+  function parsePatch(uniDiff) {
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var diffstr = uniDiff.split(/\r\n|[\n\v\f\r\x85]/),
+        delimiters = uniDiff.match(/\r\n|[\n\v\f\r\x85]/g) || [],
+        list = [],
+        i = 0;
+
+    function parseIndex() {
+      var index = {};
+      list.push(index); // Parse diff metadata
+
+      while (i < diffstr.length) {
+        var line = diffstr[i]; // File header found, end parsing diff metadata
+
+        if (/^(\-\-\-|\+\+\+|@@)\s/.test(line)) {
+          break;
+        } // Diff index
+
+
+        var header = /^(?:Index:|diff(?: -r \w+)+)\s+(.+?)\s*$/.exec(line);
+
+        if (header) {
+          index.index = header[1];
+        }
+
+        i++;
+      } // Parse file headers if they are defined. Unified diff requires them, but
+      // there's no technical issues to have an isolated hunk without file header
+
+
+      parseFileHeader(index);
+      parseFileHeader(index); // Parse hunks
+
+      index.hunks = [];
+
+      while (i < diffstr.length) {
+        var _line = diffstr[i];
+
+        if (/^(Index:|diff|\-\-\-|\+\+\+)\s/.test(_line)) {
+          break;
+        } else if (/^@@/.test(_line)) {
+          index.hunks.push(parseHunk());
+        } else if (_line && options.strict) {
+          // Ignore unexpected content unless in strict mode
+          throw new Error('Unknown line ' + (i + 1) + ' ' + JSON.stringify(_line));
+        } else {
+          i++;
+        }
+      }
+    } // Parses the --- and +++ headers, if none are found, no lines
+    // are consumed.
+
+
+    function parseFileHeader(index) {
+      var fileHeader = /^(---|\+\+\+)\s+(.*)$/.exec(diffstr[i]);
+
+      if (fileHeader) {
+        var keyPrefix = fileHeader[1] === '---' ? 'old' : 'new';
+        var data = fileHeader[2].split('\t', 2);
+        var fileName = data[0].replace(/\\\\/g, '\\');
+
+        if (/^".*"$/.test(fileName)) {
+          fileName = fileName.substr(1, fileName.length - 2);
+        }
+
+        index[keyPrefix + 'FileName'] = fileName;
+        index[keyPrefix + 'Header'] = (data[1] || '').trim();
+        i++;
+      }
+    } // Parses a hunk
+    // This assumes that we are at the start of a hunk.
+
+
+    function parseHunk() {
+      var chunkHeaderIndex = i,
+          chunkHeaderLine = diffstr[i++],
+          chunkHeader = chunkHeaderLine.split(/@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
+      var hunk = {
+        oldStart: +chunkHeader[1],
+        oldLines: +chunkHeader[2] || 1,
+        newStart: +chunkHeader[3],
+        newLines: +chunkHeader[4] || 1,
+        lines: [],
+        linedelimiters: []
+      };
+      var addCount = 0,
+          removeCount = 0;
+
+      for (; i < diffstr.length; i++) {
+        // Lines starting with '---' could be mistaken for the "remove line" operation
+        // But they could be the header for the next file. Therefore prune such cases out.
+        if (diffstr[i].indexOf('--- ') === 0 && i + 2 < diffstr.length && diffstr[i + 1].indexOf('+++ ') === 0 && diffstr[i + 2].indexOf('@@') === 0) {
+          break;
+        }
+
+        var operation = diffstr[i].length == 0 && i != diffstr.length - 1 ? ' ' : diffstr[i][0];
+
+        if (operation === '+' || operation === '-' || operation === ' ' || operation === '\\') {
+          hunk.lines.push(diffstr[i]);
+          hunk.linedelimiters.push(delimiters[i] || '\n');
+
+          if (operation === '+') {
+            addCount++;
+          } else if (operation === '-') {
+            removeCount++;
+          } else if (operation === ' ') {
+            addCount++;
+            removeCount++;
+          }
+        } else {
+          break;
+        }
+      } // Handle the empty block count case
+
+
+      if (!addCount && hunk.newLines === 1) {
+        hunk.newLines = 0;
+      }
+
+      if (!removeCount && hunk.oldLines === 1) {
+        hunk.oldLines = 0;
+      } // Perform optional sanity checking
+
+
+      if (options.strict) {
+        if (addCount !== hunk.newLines) {
+          throw new Error('Added line count did not match for hunk at line ' + (chunkHeaderIndex + 1));
+        }
+
+        if (removeCount !== hunk.oldLines) {
+          throw new Error('Removed line count did not match for hunk at line ' + (chunkHeaderIndex + 1));
+        }
+      }
+
+      return hunk;
+    }
+
+    while (i < diffstr.length) {
+      parseIndex();
+    }
+
+    return list;
+  }
+
+  // Iterator that traverses in the range of [min, max], stepping
+  // by distance from a given start position. I.e. for [0, 4], with
+  // start of 2, this will iterate 2, 3, 1, 4, 0.
+  function distanceIterator (start, minLine, maxLine) {
+    var wantForward = true,
+        backwardExhausted = false,
+        forwardExhausted = false,
+        localOffset = 1;
+    return function iterator() {
+      if (wantForward && !forwardExhausted) {
+        if (backwardExhausted) {
+          localOffset++;
+        } else {
+          wantForward = false;
+        } // Check if trying to fit beyond text length, and if not, check it fits
+        // after offset location (or desired location on first iteration)
+
+
+        if (start + localOffset <= maxLine) {
+          return localOffset;
+        }
+
+        forwardExhausted = true;
+      }
+
+      if (!backwardExhausted) {
+        if (!forwardExhausted) {
+          wantForward = true;
+        } // Check if trying to fit before text beginning, and if not, check it fits
+        // before offset location
+
+
+        if (minLine <= start - localOffset) {
+          return -localOffset++;
+        }
+
+        backwardExhausted = true;
+        return iterator();
+      } // We tried to fit hunk before text beginning and beyond text length, then
+      // hunk can't fit on the text. Return undefined
+
+    };
+  }
+
+  function applyPatch(source, uniDiff) {
+    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+    if (typeof uniDiff === 'string') {
+      uniDiff = parsePatch(uniDiff);
+    }
+
+    if (Array.isArray(uniDiff)) {
+      if (uniDiff.length > 1) {
+        throw new Error('applyPatch only works with a single input.');
+      }
+
+      uniDiff = uniDiff[0];
+    } // Apply the diff to the input
+
+
+    var lines = source.split(/\r\n|[\n\v\f\r\x85]/),
+        delimiters = source.match(/\r\n|[\n\v\f\r\x85]/g) || [],
+        hunks = uniDiff.hunks,
+        compareLine = options.compareLine || function (lineNumber, line, operation, patchContent) {
+      return line === patchContent;
+    },
+        errorCount = 0,
+        fuzzFactor = options.fuzzFactor || 0,
+        minLine = 0,
+        offset = 0,
+        removeEOFNL,
+        addEOFNL;
+    /**
+     * Checks if the hunk exactly fits on the provided location
+     */
+
+
+    function hunkFits(hunk, toPos) {
+      for (var j = 0; j < hunk.lines.length; j++) {
+        var line = hunk.lines[j],
+            operation = line.length > 0 ? line[0] : ' ',
+            content = line.length > 0 ? line.substr(1) : line;
+
+        if (operation === ' ' || operation === '-') {
+          // Context sanity check
+          if (!compareLine(toPos + 1, lines[toPos], operation, content)) {
+            errorCount++;
+
+            if (errorCount > fuzzFactor) {
+              return false;
+            }
+          }
+
+          toPos++;
+        }
+      }
+
+      return true;
+    } // Search best fit offsets for each hunk based on the previous ones
+
+
+    for (var i = 0; i < hunks.length; i++) {
+      var hunk = hunks[i],
+          maxLine = lines.length - hunk.oldLines,
+          localOffset = 0,
+          toPos = offset + hunk.oldStart - 1;
+      var iterator = distanceIterator(toPos, minLine, maxLine);
+
+      for (; localOffset !== undefined; localOffset = iterator()) {
+        if (hunkFits(hunk, toPos + localOffset)) {
+          hunk.offset = offset += localOffset;
+          break;
+        }
+      }
+
+      if (localOffset === undefined) {
+        return false;
+      } // Set lower text limit to end of the current hunk, so next ones don't try
+      // to fit over already patched text
+
+
+      minLine = hunk.offset + hunk.oldStart + hunk.oldLines;
+    } // Apply patch hunks
+
+
+    var diffOffset = 0;
+
+    for (var _i = 0; _i < hunks.length; _i++) {
+      var _hunk = hunks[_i],
+          _toPos = _hunk.oldStart + _hunk.offset + diffOffset - 1;
+
+      diffOffset += _hunk.newLines - _hunk.oldLines;
+
+      if (_toPos < 0) {
+        // Creating a new file
+        _toPos = 0;
+      }
+
+      for (var j = 0; j < _hunk.lines.length; j++) {
+        var line = _hunk.lines[j],
+            operation = line.length > 0 ? line[0] : ' ',
+            content = line.length > 0 ? line.substr(1) : line,
+            delimiter = _hunk.linedelimiters[j];
+
+        if (operation === ' ') {
+          _toPos++;
+        } else if (operation === '-') {
+          lines.splice(_toPos, 1);
+          delimiters.splice(_toPos, 1);
+          /* istanbul ignore else */
+        } else if (operation === '+') {
+          lines.splice(_toPos, 0, content);
+          delimiters.splice(_toPos, 0, delimiter);
+          _toPos++;
+        } else if (operation === '\\') {
+          var previousOperation = _hunk.lines[j - 1] ? _hunk.lines[j - 1][0] : null;
+
+          if (previousOperation === '+') {
+            removeEOFNL = true;
+          } else if (previousOperation === '-') {
+            addEOFNL = true;
+          }
+        }
+      }
+    } // Handle EOFNL insertion/removal
+
+
+    if (removeEOFNL) {
+      while (!lines[lines.length - 1]) {
+        lines.pop();
+        delimiters.pop();
+      }
+    } else if (addEOFNL) {
+      lines.push('');
+      delimiters.push('\n');
+    }
+
+    for (var _k = 0; _k < lines.length - 1; _k++) {
+      lines[_k] = lines[_k] + delimiters[_k];
+    }
+
+    return lines.join('');
+  } // Wrapper that supports multiple file patches via callbacks.
+
+  function applyPatches(uniDiff, options) {
+    if (typeof uniDiff === 'string') {
+      uniDiff = parsePatch(uniDiff);
+    }
+
+    var currentIndex = 0;
+
+    function processIndex() {
+      var index = uniDiff[currentIndex++];
+
+      if (!index) {
+        return options.complete();
+      }
+
+      options.loadFile(index, function (err, data) {
+        if (err) {
+          return options.complete(err);
+        }
+
+        var updatedContent = applyPatch(data, index, options);
+        options.patched(index, updatedContent, function (err) {
+          if (err) {
+            return options.complete(err);
+          }
+
+          processIndex();
+        });
+      });
+    }
+
+    processIndex();
+  }
+
+  function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {
+    if (!options) {
+      options = {};
+    }
+
+    if (typeof options.context === 'undefined') {
+      options.context = 4;
+    }
+
+    var diff = diffLines(oldStr, newStr, options);
+    diff.push({
+      value: '',
+      lines: []
+    }); // Append an empty value to make cleanup easier
+
+    function contextLines(lines) {
+      return lines.map(function (entry) {
+        return ' ' + entry;
+      });
+    }
+
+    var hunks = [];
+    var oldRangeStart = 0,
+        newRangeStart = 0,
+        curRange = [],
+        oldLine = 1,
+        newLine = 1;
+
+    var _loop = function _loop(i) {
+      var current = diff[i],
+          lines = current.lines || current.value.replace(/\n$/, '').split('\n');
+      current.lines = lines;
+
+      if (current.added || current.removed) {
+        var _curRange;
+
+        // If we have previous context, start with that
+        if (!oldRangeStart) {
+          var prev = diff[i - 1];
+          oldRangeStart = oldLine;
+          newRangeStart = newLine;
+
+          if (prev) {
+            curRange = options.context > 0 ? contextLines(prev.lines.slice(-options.context)) : [];
+            oldRangeStart -= curRange.length;
+            newRangeStart -= curRange.length;
+          }
+        } // Output our changes
+
+
+        (_curRange = curRange).push.apply(_curRange, _toConsumableArray(lines.map(function (entry) {
+          return (current.added ? '+' : '-') + entry;
+        }))); // Track the updated file position
+
+
+        if (current.added) {
+          newLine += lines.length;
+        } else {
+          oldLine += lines.length;
+        }
+      } else {
+        // Identical context lines. Track line changes
+        if (oldRangeStart) {
+          // Close out any changes that have been output (or join overlapping)
+          if (lines.length <= options.context * 2 && i < diff.length - 2) {
+            var _curRange2;
+
+            // Overlapping
+            (_curRange2 = curRange).push.apply(_curRange2, _toConsumableArray(contextLines(lines)));
+          } else {
+            var _curRange3;
+
+            // end the range and output
+            var contextSize = Math.min(lines.length, options.context);
+
+            (_curRange3 = curRange).push.apply(_curRange3, _toConsumableArray(contextLines(lines.slice(0, contextSize))));
+
+            var hunk = {
+              oldStart: oldRangeStart,
+              oldLines: oldLine - oldRangeStart + contextSize,
+              newStart: newRangeStart,
+              newLines: newLine - newRangeStart + contextSize,
+              lines: curRange
+            };
+
+            if (i >= diff.length - 2 && lines.length <= options.context) {
+              // EOF is inside this hunk
+              var oldEOFNewline = /\n$/.test(oldStr);
+              var newEOFNewline = /\n$/.test(newStr);
+              var noNlBeforeAdds = lines.length == 0 && curRange.length > hunk.oldLines;
+
+              if (!oldEOFNewline && noNlBeforeAdds) {
+                // special case: old has no eol and no trailing context; no-nl can end up before adds
+                curRange.splice(hunk.oldLines, 0, '\\ No newline at end of file');
+              }
+
+              if (!oldEOFNewline && !noNlBeforeAdds || !newEOFNewline) {
+                curRange.push('\\ No newline at end of file');
+              }
+            }
+
+            hunks.push(hunk);
+            oldRangeStart = 0;
+            newRangeStart = 0;
+            curRange = [];
+          }
+        }
+
+        oldLine += lines.length;
+        newLine += lines.length;
+      }
+    };
+
+    for (var i = 0; i < diff.length; i++) {
+      _loop(i);
+    }
+
+    return {
+      oldFileName: oldFileName,
+      newFileName: newFileName,
+      oldHeader: oldHeader,
+      newHeader: newHeader,
+      hunks: hunks
+    };
+  }
+  function createTwoFilesPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {
+    var diff = structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options);
+    var ret = [];
+
+    if (oldFileName == newFileName) {
+      ret.push('Index: ' + oldFileName);
+    }
+
+    ret.push('===================================================================');
+    ret.push('--- ' + diff.oldFileName + (typeof diff.oldHeader === 'undefined' ? '' : '\t' + diff.oldHeader));
+    ret.push('+++ ' + diff.newFileName + (typeof diff.newHeader === 'undefined' ? '' : '\t' + diff.newHeader));
+
+    for (var i = 0; i < diff.hunks.length; i++) {
+      var hunk = diff.hunks[i];
+      ret.push('@@ -' + hunk.oldStart + ',' + hunk.oldLines + ' +' + hunk.newStart + ',' + hunk.newLines + ' @@');
+      ret.push.apply(ret, hunk.lines);
+    }
+
+    return ret.join('\n') + '\n';
+  }
+  function createPatch(fileName, oldStr, newStr, oldHeader, newHeader, options) {
+    return createTwoFilesPatch(fileName, fileName, oldStr, newStr, oldHeader, newHeader, options);
+  }
+
+  function arrayEqual(a, b) {
+    if (a.length !== b.length) {
+      return false;
+    }
+
+    return arrayStartsWith(a, b);
+  }
+  function arrayStartsWith(array, start) {
+    if (start.length > array.length) {
+      return false;
+    }
+
+    for (var i = 0; i < start.length; i++) {
+      if (start[i] !== array[i]) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  function calcLineCount(hunk) {
+    var _calcOldNewLineCount = calcOldNewLineCount(hunk.lines),
+        oldLines = _calcOldNewLineCount.oldLines,
+        newLines = _calcOldNewLineCount.newLines;
+
+    if (oldLines !== undefined) {
+      hunk.oldLines = oldLines;
+    } else {
+      delete hunk.oldLines;
+    }
+
+    if (newLines !== undefined) {
+      hunk.newLines = newLines;
+    } else {
+      delete hunk.newLines;
+    }
+  }
+  function merge(mine, theirs, base) {
+    mine = loadPatch(mine, base);
+    theirs = loadPatch(theirs, base);
+    var ret = {}; // For index we just let it pass through as it doesn't have any necessary meaning.
+    // Leaving sanity checks on this to the API consumer that may know more about the
+    // meaning in their own context.
+
+    if (mine.index || theirs.index) {
+      ret.index = mine.index || theirs.index;
+    }
+
+    if (mine.newFileName || theirs.newFileName) {
+      if (!fileNameChanged(mine)) {
+        // No header or no change in ours, use theirs (and ours if theirs does not exist)
+        ret.oldFileName = theirs.oldFileName || mine.oldFileName;
+        ret.newFileName = theirs.newFileName || mine.newFileName;
+        ret.oldHeader = theirs.oldHeader || mine.oldHeader;
+        ret.newHeader = theirs.newHeader || mine.newHeader;
+      } else if (!fileNameChanged(theirs)) {
+        // No header or no change in theirs, use ours
+        ret.oldFileName = mine.oldFileName;
+        ret.newFileName = mine.newFileName;
+        ret.oldHeader = mine.oldHeader;
+        ret.newHeader = mine.newHeader;
+      } else {
+        // Both changed... figure it out
+        ret.oldFileName = selectField(ret, mine.oldFileName, theirs.oldFileName);
+        ret.newFileName = selectField(ret, mine.newFileName, theirs.newFileName);
+        ret.oldHeader = selectField(ret, mine.oldHeader, theirs.oldHeader);
+        ret.newHeader = selectField(ret, mine.newHeader, theirs.newHeader);
+      }
+    }
+
+    ret.hunks = [];
+    var mineIndex = 0,
+        theirsIndex = 0,
+        mineOffset = 0,
+        theirsOffset = 0;
+
+    while (mineIndex < mine.hunks.length || theirsIndex < theirs.hunks.length) {
+      var mineCurrent = mine.hunks[mineIndex] || {
+        oldStart: Infinity
+      },
+          theirsCurrent = theirs.hunks[theirsIndex] || {
+        oldStart: Infinity
+      };
+
+      if (hunkBefore(mineCurrent, theirsCurrent)) {
+        // This patch does not overlap with any of the others, yay.
+        ret.hunks.push(cloneHunk(mineCurrent, mineOffset));
+        mineIndex++;
+        theirsOffset += mineCurrent.newLines - mineCurrent.oldLines;
+      } else if (hunkBefore(theirsCurrent, mineCurrent)) {
+        // This patch does not overlap with any of the others, yay.
+        ret.hunks.push(cloneHunk(theirsCurrent, theirsOffset));
+        theirsIndex++;
+        mineOffset += theirsCurrent.newLines - theirsCurrent.oldLines;
+      } else {
+        // Overlap, merge as best we can
+        var mergedHunk = {
+          oldStart: Math.min(mineCurrent.oldStart, theirsCurrent.oldStart),
+          oldLines: 0,
+          newStart: Math.min(mineCurrent.newStart + mineOffset, theirsCurrent.oldStart + theirsOffset),
+          newLines: 0,
+          lines: []
+        };
+        mergeLines(mergedHunk, mineCurrent.oldStart, mineCurrent.lines, theirsCurrent.oldStart, theirsCurrent.lines);
+        theirsIndex++;
+        mineIndex++;
+        ret.hunks.push(mergedHunk);
+      }
+    }
+
+    return ret;
+  }
+
+  function loadPatch(param, base) {
+    if (typeof param === 'string') {
+      if (/^@@/m.test(param) || /^Index:/m.test(param)) {
+        return parsePatch(param)[0];
+      }
+
+      if (!base) {
+        throw new Error('Must provide a base reference or pass in a patch');
+      }
+
+      return structuredPatch(undefined, undefined, base, param);
+    }
+
+    return param;
+  }
+
+  function fileNameChanged(patch) {
+    return patch.newFileName && patch.newFileName !== patch.oldFileName;
+  }
+
+  function selectField(index, mine, theirs) {
+    if (mine === theirs) {
+      return mine;
+    } else {
+      index.conflict = true;
+      return {
+        mine: mine,
+        theirs: theirs
+      };
+    }
+  }
+
+  function hunkBefore(test, check) {
+    return test.oldStart < check.oldStart && test.oldStart + test.oldLines < check.oldStart;
+  }
+
+  function cloneHunk(hunk, offset) {
+    return {
+      oldStart: hunk.oldStart,
+      oldLines: hunk.oldLines,
+      newStart: hunk.newStart + offset,
+      newLines: hunk.newLines,
+      lines: hunk.lines
+    };
+  }
+
+  function mergeLines(hunk, mineOffset, mineLines, theirOffset, theirLines) {
+    // This will generally result in a conflicted hunk, but there are cases where the context
+    // is the only overlap where we can successfully merge the content here.
+    var mine = {
+      offset: mineOffset,
+      lines: mineLines,
+      index: 0
+    },
+        their = {
+      offset: theirOffset,
+      lines: theirLines,
+      index: 0
+    }; // Handle any leading content
+
+    insertLeading(hunk, mine, their);
+    insertLeading(hunk, their, mine); // Now in the overlap content. Scan through and select the best changes from each.
+
+    while (mine.index < mine.lines.length && their.index < their.lines.length) {
+      var mineCurrent = mine.lines[mine.index],
+          theirCurrent = their.lines[their.index];
+
+      if ((mineCurrent[0] === '-' || mineCurrent[0] === '+') && (theirCurrent[0] === '-' || theirCurrent[0] === '+')) {
+        // Both modified ...
+        mutualChange(hunk, mine, their);
+      } else if (mineCurrent[0] === '+' && theirCurrent[0] === ' ') {
+        var _hunk$lines;
+
+        // Mine inserted
+        (_hunk$lines = hunk.lines).push.apply(_hunk$lines, _toConsumableArray(collectChange(mine)));
+      } else if (theirCurrent[0] === '+' && mineCurrent[0] === ' ') {
+        var _hunk$lines2;
+
+        // Theirs inserted
+        (_hunk$lines2 = hunk.lines).push.apply(_hunk$lines2, _toConsumableArray(collectChange(their)));
+      } else if (mineCurrent[0] === '-' && theirCurrent[0] === ' ') {
+        // Mine removed or edited
+        removal(hunk, mine, their);
+      } else if (theirCurrent[0] === '-' && mineCurrent[0] === ' ') {
+        // Their removed or edited
+        removal(hunk, their, mine, true);
+      } else if (mineCurrent === theirCurrent) {
+        // Context identity
+        hunk.lines.push(mineCurrent);
+        mine.index++;
+        their.index++;
+      } else {
+        // Context mismatch
+        conflict(hunk, collectChange(mine), collectChange(their));
+      }
+    } // Now push anything that may be remaining
+
+
+    insertTrailing(hunk, mine);
+    insertTrailing(hunk, their);
+    calcLineCount(hunk);
+  }
+
+  function mutualChange(hunk, mine, their) {
+    var myChanges = collectChange(mine),
+        theirChanges = collectChange(their);
+
+    if (allRemoves(myChanges) && allRemoves(theirChanges)) {
+      // Special case for remove changes that are supersets of one another
+      if (arrayStartsWith(myChanges, theirChanges) && skipRemoveSuperset(their, myChanges, myChanges.length - theirChanges.length)) {
+        var _hunk$lines3;
+
+        (_hunk$lines3 = hunk.lines).push.apply(_hunk$lines3, _toConsumableArray(myChanges));
+
+        return;
+      } else if (arrayStartsWith(theirChanges, myChanges) && skipRemoveSuperset(mine, theirChanges, theirChanges.length - myChanges.length)) {
+        var _hunk$lines4;
+
+        (_hunk$lines4 = hunk.lines).push.apply(_hunk$lines4, _toConsumableArray(theirChanges));
+
+        return;
+      }
+    } else if (arrayEqual(myChanges, theirChanges)) {
+      var _hunk$lines5;
+
+      (_hunk$lines5 = hunk.lines).push.apply(_hunk$lines5, _toConsumableArray(myChanges));
+
+      return;
+    }
+
+    conflict(hunk, myChanges, theirChanges);
+  }
+
+  function removal(hunk, mine, their, swap) {
+    var myChanges = collectChange(mine),
+        theirChanges = collectContext(their, myChanges);
+
+    if (theirChanges.merged) {
+      var _hunk$lines6;
+
+      (_hunk$lines6 = hunk.lines).push.apply(_hunk$lines6, _toConsumableArray(theirChanges.merged));
+    } else {
+      conflict(hunk, swap ? theirChanges : myChanges, swap ? myChanges : theirChanges);
+    }
+  }
+
+  function conflict(hunk, mine, their) {
+    hunk.conflict = true;
+    hunk.lines.push({
+      conflict: true,
+      mine: mine,
+      theirs: their
+    });
+  }
+
+  function insertLeading(hunk, insert, their) {
+    while (insert.offset < their.offset && insert.index < insert.lines.length) {
+      var line = insert.lines[insert.index++];
+      hunk.lines.push(line);
+      insert.offset++;
+    }
+  }
+
+  function insertTrailing(hunk, insert) {
+    while (insert.index < insert.lines.length) {
+      var line = insert.lines[insert.index++];
+      hunk.lines.push(line);
+    }
+  }
+
+  function collectChange(state) {
+    var ret = [],
+        operation = state.lines[state.index][0];
+
+    while (state.index < state.lines.length) {
+      var line = state.lines[state.index]; // Group additions that are immediately after subtractions and treat them as one "atomic" modify change.
+
+      if (operation === '-' && line[0] === '+') {
+        operation = '+';
+      }
+
+      if (operation === line[0]) {
+        ret.push(line);
+        state.index++;
+      } else {
+        break;
+      }
+    }
+
+    return ret;
+  }
+
+  function collectContext(state, matchChanges) {
+    var changes = [],
+        merged = [],
+        matchIndex = 0,
+        contextChanges = false,
+        conflicted = false;
+
+    while (matchIndex < matchChanges.length && state.index < state.lines.length) {
+      var change = state.lines[state.index],
+          match = matchChanges[matchIndex]; // Once we've hit our add, then we are done
+
+      if (match[0] === '+') {
+        break;
+      }
+
+      contextChanges = contextChanges || change[0] !== ' ';
+      merged.push(match);
+      matchIndex++; // Consume any additions in the other block as a conflict to attempt
+      // to pull in the remaining context after this
+
+      if (change[0] === '+') {
+        conflicted = true;
+
+        while (change[0] === '+') {
+          changes.push(change);
+          change = state.lines[++state.index];
+        }
+      }
+
+      if (match.substr(1) === change.substr(1)) {
+        changes.push(change);
+        state.index++;
+      } else {
+        conflicted = true;
+      }
+    }
+
+    if ((matchChanges[matchIndex] || '')[0] === '+' && contextChanges) {
+      conflicted = true;
+    }
+
+    if (conflicted) {
+      return changes;
+    }
+
+    while (matchIndex < matchChanges.length) {
+      merged.push(matchChanges[matchIndex++]);
+    }
+
+    return {
+      merged: merged,
+      changes: changes
+    };
+  }
+
+  function allRemoves(changes) {
+    return changes.reduce(function (prev, change) {
+      return prev && change[0] === '-';
+    }, true);
+  }
+
+  function skipRemoveSuperset(state, removeChanges, delta) {
+    for (var i = 0; i < delta; i++) {
+      var changeContent = removeChanges[removeChanges.length - delta + i].substr(1);
+
+      if (state.lines[state.index + i] !== ' ' + changeContent) {
+        return false;
+      }
+    }
+
+    state.index += delta;
+    return true;
+  }
+
+  function calcOldNewLineCount(lines) {
+    var oldLines = 0;
+    var newLines = 0;
+    lines.forEach(function (line) {
+      if (typeof line !== 'string') {
+        var myCount = calcOldNewLineCount(line.mine);
+        var theirCount = calcOldNewLineCount(line.theirs);
+
+        if (oldLines !== undefined) {
+          if (myCount.oldLines === theirCount.oldLines) {
+            oldLines += myCount.oldLines;
+          } else {
+            oldLines = undefined;
+          }
+        }
+
+        if (newLines !== undefined) {
+          if (myCount.newLines === theirCount.newLines) {
+            newLines += myCount.newLines;
+          } else {
+            newLines = undefined;
+          }
+        }
+      } else {
+        if (newLines !== undefined && (line[0] === '+' || line[0] === ' ')) {
+          newLines++;
+        }
+
+        if (oldLines !== undefined && (line[0] === '-' || line[0] === ' ')) {
+          oldLines++;
+        }
+      }
+    });
+    return {
+      oldLines: oldLines,
+      newLines: newLines
+    };
+  }
+
+  // See: http://code.google.com/p/google-diff-match-patch/wiki/API
+  function convertChangesToDMP(changes) {
+    var ret = [],
+        change,
+        operation;
+
+    for (var i = 0; i < changes.length; i++) {
+      change = changes[i];
+
+      if (change.added) {
+        operation = 1;
+      } else if (change.removed) {
+        operation = -1;
+      } else {
+        operation = 0;
+      }
+
+      ret.push([operation, change.value]);
+    }
+
+    return ret;
+  }
+
+  function convertChangesToXML(changes) {
+    var ret = [];
+
+    for (var i = 0; i < changes.length; i++) {
+      var change = changes[i];
+
+      if (change.added) {
+        ret.push('<ins>');
+      } else if (change.removed) {
+        ret.push('<del>');
+      }
+
+      ret.push(escapeHTML(change.value));
+
+      if (change.added) {
+        ret.push('</ins>');
+      } else if (change.removed) {
+        ret.push('</del>');
+      }
+    }
+
+    return ret.join('');
+  }
+
+  function escapeHTML(s) {
+    var n = s;
+    n = n.replace(/&/g, '&amp;');
+    n = n.replace(/</g, '&lt;');
+    n = n.replace(/>/g, '&gt;');
+    n = n.replace(/"/g, '&quot;');
+    return n;
+  }
+
+  /* See LICENSE file for terms of use */
+
+  exports.Diff = Diff;
+  exports.diffChars = diffChars;
+  exports.diffWords = diffWords;
+  exports.diffWordsWithSpace = diffWordsWithSpace;
+  exports.diffLines = diffLines;
+  exports.diffTrimmedLines = diffTrimmedLines;
+  exports.diffSentences = diffSentences;
+  exports.diffCss = diffCss;
+  exports.diffJson = diffJson;
+  exports.diffArrays = diffArrays;
+  exports.structuredPatch = structuredPatch;
+  exports.createTwoFilesPatch = createTwoFilesPatch;
+  exports.createPatch = createPatch;
+  exports.applyPatch = applyPatch;
+  exports.applyPatches = applyPatches;
+  exports.parsePatch = parsePatch;
+  exports.merge = merge;
+  exports.convertChangesToDMP = convertChangesToDMP;
+  exports.convertChangesToXML = convertChangesToXML;
+  exports.canonicalize = canonicalize;
+
+  Object.defineProperty(exports, '__esModule', { value: true });
+
+}));
+
+},{}],114:[function(require,module,exports){
+module.exports = Array.isArray || function (arr) {
+  return Object.prototype.toString.call(arr) == '[object Array]';
+};
+
+},{}],115:[function(require,module,exports){
+module.exports = extend;
+
+/*
+  var obj = {a: 3, b: 5};
+  extend(obj, {a: 4, c: 8}); // {a: 4, b: 5, c: 8}
+  obj; // {a: 4, b: 5, c: 8}
+
+  var obj = {a: 3, b: 5};
+  extend({}, obj, {a: 4, c: 8}); // {a: 4, b: 5, c: 8}
+  obj; // {a: 3, b: 5}
+
+  var arr = [1, 2, 3];
+  var obj = {a: 3, b: 5};
+  extend(obj, {c: arr}); // {a: 3, b: 5, c: [1, 2, 3]}
+  arr.push(4);
+  obj; // {a: 3, b: 5, c: [1, 2, 3, 4]}
+
+  var arr = [1, 2, 3];
+  var obj = {a: 3, b: 5};
+  extend(true, obj, {c: arr}); // {a: 3, b: 5, c: [1, 2, 3]}
+  arr.push(4);
+  obj; // {a: 3, b: 5, c: [1, 2, 3]}
+
+  extend({a: 4, b: 5}); // {a: 4, b: 5}
+  extend({a: 4, b: 5}, 3); {a: 4, b: 5}
+  extend({a: 4, b: 5}, true); {a: 4, b: 5}
+  extend('hello', {a: 4, b: 5}); // throws
+  extend(3, {a: 4, b: 5}); // throws
+*/
+
+function extend(/* [deep], obj1, obj2, [objn] */) {
+  var args = [].slice.call(arguments);
+  var deep = false;
+  if (typeof args[0] == 'boolean') {
+    deep = args.shift();
+  }
+  var result = args[0];
+  if (isUnextendable(result)) {
+    throw new Error('extendee must be an object');
+  }
+  var extenders = args.slice(1);
+  var len = extenders.length;
+  for (var i = 0; i < len; i++) {
+    var extender = extenders[i];
+    for (var key in extender) {
+      if (extender.hasOwnProperty(key)) {
+        var value = extender[key];
+        if (deep && isCloneable(value)) {
+          var base = Array.isArray(value) ? [] : {};
+          result[key] = extend(
+            true,
+            result.hasOwnProperty(key) && !isUnextendable(result[key])
+              ? result[key]
+              : base,
+            value
+          );
+        } else {
+          result[key] = value;
+        }
+      }
+    }
+  }
+  return result;
+}
+
+function isCloneable(obj) {
+  return Array.isArray(obj) || {}.toString.call(obj) == '[object Object]';
+}
+
+function isUnextendable(val) {
+  return !val || (typeof val != 'object' && typeof val != 'function');
+}
+
+},{}],116:[function(require,module,exports){
+/**
+ * lodash (Custom Build) <https://lodash.com/>
+ * Build: `lodash modularize exports="npm" -o ./`
+ * Copyright jQuery Foundation and other contributors <https://jquery.org/>
+ * Released under MIT license <https://lodash.com/license>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ */
+
+/** Used as the `TypeError` message for "Functions" methods. */
+var FUNC_ERROR_TEXT = 'Expected a function';
+
+/** Used to stand-in for `undefined` hash values. */
+var HASH_UNDEFINED = '__lodash_hash_undefined__';
+
+/** Used as references for various `Number` constants. */
+var INFINITY = 1 / 0;
+
+/** `Object#toString` result references. */
+var funcTag = '[object Function]',
+    genTag = '[object GeneratorFunction]',
+    symbolTag = '[object Symbol]';
+
+/** Used to match property names within property paths. */
+var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,
+    reIsPlainProp = /^\w*$/,
+    reLeadingDot = /^\./,
+    rePropName = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g;
+
+/**
+ * Used to match `RegExp`
+ * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).
+ */
+var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
+
+/** Used to match backslashes in property paths. */
+var reEscapeChar = /\\(\\)?/g;
+
+/** Used to detect host constructors (Safari). */
+var reIsHostCtor = /^\[object .+?Constructor\]$/;
+
+/** Detect free variable `global` from Node.js. */
+var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
+
+/** Detect free variable `self`. */
+var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
+
+/** Used as a reference to the global object. */
+var root = freeGlobal || freeSelf || Function('return this')();
+
+/**
+ * Gets the value at `key` of `object`.
+ *
+ * @private
+ * @param {Object} [object] The object to query.
+ * @param {string} key The key of the property to get.
+ * @returns {*} Returns the property value.
+ */
+function getValue(object, key) {
+  return object == null ? undefined : object[key];
+}
+
+/**
+ * Checks if `value` is a host object in IE < 9.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a host object, else `false`.
+ */
+function isHostObject(value) {
+  // Many host objects are `Object` objects that can coerce to strings
+  // despite having improperly defined `toString` methods.
+  var result = false;
+  if (value != null && typeof value.toString != 'function') {
+    try {
+      result = !!(value + '');
+    } catch (e) {}
+  }
+  return result;
+}
+
+/** Used for built-in method references. */
+var arrayProto = Array.prototype,
+    funcProto = Function.prototype,
+    objectProto = Object.prototype;
+
+/** Used to detect overreaching core-js shims. */
+var coreJsData = root['__core-js_shared__'];
+
+/** Used to detect methods masquerading as native. */
+var maskSrcKey = (function() {
+  var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || '');
+  return uid ? ('Symbol(src)_1.' + uid) : '';
+}());
+
+/** Used to resolve the decompiled source of functions. */
+var funcToString = funcProto.toString;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var objectToString = objectProto.toString;
+
+/** Used to detect if a method is native. */
+var reIsNative = RegExp('^' +
+  funcToString.call(hasOwnProperty).replace(reRegExpChar, '\\$&')
+  .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
+);
+
+/** Built-in value references. */
+var Symbol = root.Symbol,
+    splice = arrayProto.splice;
+
+/* Built-in method references that are verified to be native. */
+var Map = getNative(root, 'Map'),
+    nativeCreate = getNative(Object, 'create');
+
+/** Used to convert symbols to primitives and strings. */
+var symbolProto = Symbol ? Symbol.prototype : undefined,
+    symbolToString = symbolProto ? symbolProto.toString : undefined;
+
+/**
+ * Creates a hash object.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function Hash(entries) {
+  var index = -1,
+      length = entries ? entries.length : 0;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+
+/**
+ * Removes all key-value entries from the hash.
+ *
+ * @private
+ * @name clear
+ * @memberOf Hash
+ */
+function hashClear() {
+  this.__data__ = nativeCreate ? nativeCreate(null) : {};
+}
+
+/**
+ * Removes `key` and its value from the hash.
+ *
+ * @private
+ * @name delete
+ * @memberOf Hash
+ * @param {Object} hash The hash to modify.
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function hashDelete(key) {
+  return this.has(key) && delete this.__data__[key];
+}
+
+/**
+ * Gets the hash value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf Hash
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function hashGet(key) {
+  var data = this.__data__;
+  if (nativeCreate) {
+    var result = data[key];
+    return result === HASH_UNDEFINED ? undefined : result;
+  }
+  return hasOwnProperty.call(data, key) ? data[key] : undefined;
+}
+
+/**
+ * Checks if a hash value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf Hash
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function hashHas(key) {
+  var data = this.__data__;
+  return nativeCreate ? data[key] !== undefined : hasOwnProperty.call(data, key);
+}
+
+/**
+ * Sets the hash `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf Hash
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the hash instance.
+ */
+function hashSet(key, value) {
+  var data = this.__data__;
+  data[key] = (nativeCreate && value === undefined) ? HASH_UNDEFINED : value;
+  return this;
+}
+
+// Add methods to `Hash`.
+Hash.prototype.clear = hashClear;
+Hash.prototype['delete'] = hashDelete;
+Hash.prototype.get = hashGet;
+Hash.prototype.has = hashHas;
+Hash.prototype.set = hashSet;
+
+/**
+ * Creates an list cache object.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function ListCache(entries) {
+  var index = -1,
+      length = entries ? entries.length : 0;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+
+/**
+ * Removes all key-value entries from the list cache.
+ *
+ * @private
+ * @name clear
+ * @memberOf ListCache
+ */
+function listCacheClear() {
+  this.__data__ = [];
+}
+
+/**
+ * Removes `key` and its value from the list cache.
+ *
+ * @private
+ * @name delete
+ * @memberOf ListCache
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function listCacheDelete(key) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  if (index < 0) {
+    return false;
+  }
+  var lastIndex = data.length - 1;
+  if (index == lastIndex) {
+    data.pop();
+  } else {
+    splice.call(data, index, 1);
+  }
+  return true;
+}
+
+/**
+ * Gets the list cache value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf ListCache
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function listCacheGet(key) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  return index < 0 ? undefined : data[index][1];
+}
+
+/**
+ * Checks if a list cache value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf ListCache
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function listCacheHas(key) {
+  return assocIndexOf(this.__data__, key) > -1;
+}
+
+/**
+ * Sets the list cache `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf ListCache
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the list cache instance.
+ */
+function listCacheSet(key, value) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  if (index < 0) {
+    data.push([key, value]);
+  } else {
+    data[index][1] = value;
+  }
+  return this;
+}
+
+// Add methods to `ListCache`.
+ListCache.prototype.clear = listCacheClear;
+ListCache.prototype['delete'] = listCacheDelete;
+ListCache.prototype.get = listCacheGet;
+ListCache.prototype.has = listCacheHas;
+ListCache.prototype.set = listCacheSet;
+
+/**
+ * Creates a map cache object to store key-value pairs.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function MapCache(entries) {
+  var index = -1,
+      length = entries ? entries.length : 0;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+
+/**
+ * Removes all key-value entries from the map.
+ *
+ * @private
+ * @name clear
+ * @memberOf MapCache
+ */
+function mapCacheClear() {
+  this.__data__ = {
+    'hash': new Hash,
+    'map': new (Map || ListCache),
+    'string': new Hash
+  };
+}
+
+/**
+ * Removes `key` and its value from the map.
+ *
+ * @private
+ * @name delete
+ * @memberOf MapCache
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function mapCacheDelete(key) {
+  return getMapData(this, key)['delete'](key);
+}
+
+/**
+ * Gets the map value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf MapCache
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function mapCacheGet(key) {
+  return getMapData(this, key).get(key);
+}
+
+/**
+ * Checks if a map value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf MapCache
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function mapCacheHas(key) {
+  return getMapData(this, key).has(key);
+}
+
+/**
+ * Sets the map `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf MapCache
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the map cache instance.
+ */
+function mapCacheSet(key, value) {
+  getMapData(this, key).set(key, value);
+  return this;
+}
+
+// Add methods to `MapCache`.
+MapCache.prototype.clear = mapCacheClear;
+MapCache.prototype['delete'] = mapCacheDelete;
+MapCache.prototype.get = mapCacheGet;
+MapCache.prototype.has = mapCacheHas;
+MapCache.prototype.set = mapCacheSet;
+
+/**
+ * Gets the index at which the `key` is found in `array` of key-value pairs.
+ *
+ * @private
+ * @param {Array} array The array to inspect.
+ * @param {*} key The key to search for.
+ * @returns {number} Returns the index of the matched value, else `-1`.
+ */
+function assocIndexOf(array, key) {
+  var length = array.length;
+  while (length--) {
+    if (eq(array[length][0], key)) {
+      return length;
+    }
+  }
+  return -1;
+}
+
+/**
+ * The base implementation of `_.get` without support for default values.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {Array|string} path The path of the property to get.
+ * @returns {*} Returns the resolved value.
+ */
+function baseGet(object, path) {
+  path = isKey(path, object) ? [path] : castPath(path);
+
+  var index = 0,
+      length = path.length;
+
+  while (object != null && index < length) {
+    object = object[toKey(path[index++])];
+  }
+  return (index && index == length) ? object : undefined;
+}
+
+/**
+ * The base implementation of `_.isNative` without bad shim checks.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a native function,
+ *  else `false`.
+ */
+function baseIsNative(value) {
+  if (!isObject(value) || isMasked(value)) {
+    return false;
+  }
+  var pattern = (isFunction(value) || isHostObject(value)) ? reIsNative : reIsHostCtor;
+  return pattern.test(toSource(value));
+}
+
+/**
+ * The base implementation of `_.toString` which doesn't convert nullish
+ * values to empty strings.
+ *
+ * @private
+ * @param {*} value The value to process.
+ * @returns {string} Returns the string.
+ */
+function baseToString(value) {
+  // Exit early for strings to avoid a performance hit in some environments.
+  if (typeof value == 'string') {
+    return value;
+  }
+  if (isSymbol(value)) {
+    return symbolToString ? symbolToString.call(value) : '';
+  }
+  var result = (value + '');
+  return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;
+}
+
+/**
+ * Casts `value` to a path array if it's not one.
+ *
+ * @private
+ * @param {*} value The value to inspect.
+ * @returns {Array} Returns the cast property path array.
+ */
+function castPath(value) {
+  return isArray(value) ? value : stringToPath(value);
+}
+
+/**
+ * Gets the data for `map`.
+ *
+ * @private
+ * @param {Object} map The map to query.
+ * @param {string} key The reference key.
+ * @returns {*} Returns the map data.
+ */
+function getMapData(map, key) {
+  var data = map.__data__;
+  return isKeyable(key)
+    ? data[typeof key == 'string' ? 'string' : 'hash']
+    : data.map;
+}
+
+/**
+ * Gets the native function at `key` of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {string} key The key of the method to get.
+ * @returns {*} Returns the function if it's native, else `undefined`.
+ */
+function getNative(object, key) {
+  var value = getValue(object, key);
+  return baseIsNative(value) ? value : undefined;
+}
+
+/**
+ * Checks if `value` is a property name and not a property path.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @param {Object} [object] The object to query keys on.
+ * @returns {boolean} Returns `true` if `value` is a property name, else `false`.
+ */
+function isKey(value, object) {
+  if (isArray(value)) {
+    return false;
+  }
+  var type = typeof value;
+  if (type == 'number' || type == 'symbol' || type == 'boolean' ||
+      value == null || isSymbol(value)) {
+    return true;
+  }
+  return reIsPlainProp.test(value) || !reIsDeepProp.test(value) ||
+    (object != null && value in Object(object));
+}
+
+/**
+ * Checks if `value` is suitable for use as unique object key.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is suitable, else `false`.
+ */
+function isKeyable(value) {
+  var type = typeof value;
+  return (type == 'string' || type == 'number' || type == 'symbol' || type == 'boolean')
+    ? (value !== '__proto__')
+    : (value === null);
+}
+
+/**
+ * Checks if `func` has its source masked.
+ *
+ * @private
+ * @param {Function} func The function to check.
+ * @returns {boolean} Returns `true` if `func` is masked, else `false`.
+ */
+function isMasked(func) {
+  return !!maskSrcKey && (maskSrcKey in func);
+}
+
+/**
+ * Converts `string` to a property path array.
+ *
+ * @private
+ * @param {string} string The string to convert.
+ * @returns {Array} Returns the property path array.
+ */
+var stringToPath = memoize(function(string) {
+  string = toString(string);
+
+  var result = [];
+  if (reLeadingDot.test(string)) {
+    result.push('');
+  }
+  string.replace(rePropName, function(match, number, quote, string) {
+    result.push(quote ? string.replace(reEscapeChar, '$1') : (number || match));
+  });
+  return result;
+});
+
+/**
+ * Converts `value` to a string key if it's not a string or symbol.
+ *
+ * @private
+ * @param {*} value The value to inspect.
+ * @returns {string|symbol} Returns the key.
+ */
+function toKey(value) {
+  if (typeof value == 'string' || isSymbol(value)) {
+    return value;
+  }
+  var result = (value + '');
+  return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;
+}
+
+/**
+ * Converts `func` to its source code.
+ *
+ * @private
+ * @param {Function} func The function to process.
+ * @returns {string} Returns the source code.
+ */
+function toSource(func) {
+  if (func != null) {
+    try {
+      return funcToString.call(func);
+    } catch (e) {}
+    try {
+      return (func + '');
+    } catch (e) {}
+  }
+  return '';
+}
+
+/**
+ * Creates a function that memoizes the result of `func`. If `resolver` is
+ * provided, it determines the cache key for storing the result based on the
+ * arguments provided to the memoized function. By default, the first argument
+ * provided to the memoized function is used as the map cache key. The `func`
+ * is invoked with the `this` binding of the memoized function.
+ *
+ * **Note:** The cache is exposed as the `cache` property on the memoized
+ * function. Its creation may be customized by replacing the `_.memoize.Cache`
+ * constructor with one whose instances implement the
+ * [`Map`](http://ecma-international.org/ecma-262/7.0/#sec-properties-of-the-map-prototype-object)
+ * method interface of `delete`, `get`, `has`, and `set`.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Function
+ * @param {Function} func The function to have its output memoized.
+ * @param {Function} [resolver] The function to resolve the cache key.
+ * @returns {Function} Returns the new memoized function.
+ * @example
+ *
+ * var object = { 'a': 1, 'b': 2 };
+ * var other = { 'c': 3, 'd': 4 };
+ *
+ * var values = _.memoize(_.values);
+ * values(object);
+ * // => [1, 2]
+ *
+ * values(other);
+ * // => [3, 4]
+ *
+ * object.a = 2;
+ * values(object);
+ * // => [1, 2]
+ *
+ * // Modify the result cache.
+ * values.cache.set(object, ['a', 'b']);
+ * values(object);
+ * // => ['a', 'b']
+ *
+ * // Replace `_.memoize.Cache`.
+ * _.memoize.Cache = WeakMap;
+ */
+function memoize(func, resolver) {
+  if (typeof func != 'function' || (resolver && typeof resolver != 'function')) {
+    throw new TypeError(FUNC_ERROR_TEXT);
+  }
+  var memoized = function() {
+    var args = arguments,
+        key = resolver ? resolver.apply(this, args) : args[0],
+        cache = memoized.cache;
+
+    if (cache.has(key)) {
+      return cache.get(key);
+    }
+    var result = func.apply(this, args);
+    memoized.cache = cache.set(key, result);
+    return result;
+  };
+  memoized.cache = new (memoize.Cache || MapCache);
+  return memoized;
+}
+
+// Assign cache to `_.memoize`.
+memoize.Cache = MapCache;
+
+/**
+ * Performs a
+ * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+ * comparison between two values to determine if they are equivalent.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to compare.
+ * @param {*} other The other value to compare.
+ * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+ * @example
+ *
+ * var object = { 'a': 1 };
+ * var other = { 'a': 1 };
+ *
+ * _.eq(object, object);
+ * // => true
+ *
+ * _.eq(object, other);
+ * // => false
+ *
+ * _.eq('a', 'a');
+ * // => true
+ *
+ * _.eq('a', Object('a'));
+ * // => false
+ *
+ * _.eq(NaN, NaN);
+ * // => true
+ */
+function eq(value, other) {
+  return value === other || (value !== value && other !== other);
+}
+
+/**
+ * Checks if `value` is classified as an `Array` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an array, else `false`.
+ * @example
+ *
+ * _.isArray([1, 2, 3]);
+ * // => true
+ *
+ * _.isArray(document.body.children);
+ * // => false
+ *
+ * _.isArray('abc');
+ * // => false
+ *
+ * _.isArray(_.noop);
+ * // => false
+ */
+var isArray = Array.isArray;
+
+/**
+ * Checks if `value` is classified as a `Function` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a function, else `false`.
+ * @example
+ *
+ * _.isFunction(_);
+ * // => true
+ *
+ * _.isFunction(/abc/);
+ * // => false
+ */
+function isFunction(value) {
+  // The use of `Object#toString` avoids issues with the `typeof` operator
+  // in Safari 8-9 which returns 'object' for typed array and other constructors.
+  var tag = isObject(value) ? objectToString.call(value) : '';
+  return tag == funcTag || tag == genTag;
+}
+
+/**
+ * Checks if `value` is the
+ * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)
+ * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(_.noop);
+ * // => true
+ *
+ * _.isObject(null);
+ * // => false
+ */
+function isObject(value) {
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+/**
+ * Checks if `value` is object-like. A value is object-like if it's not `null`
+ * and has a `typeof` result of "object".
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ * @example
+ *
+ * _.isObjectLike({});
+ * // => true
+ *
+ * _.isObjectLike([1, 2, 3]);
+ * // => true
+ *
+ * _.isObjectLike(_.noop);
+ * // => false
+ *
+ * _.isObjectLike(null);
+ * // => false
+ */
+function isObjectLike(value) {
+  return !!value && typeof value == 'object';
+}
+
+/**
+ * Checks if `value` is classified as a `Symbol` primitive or object.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.
+ * @example
+ *
+ * _.isSymbol(Symbol.iterator);
+ * // => true
+ *
+ * _.isSymbol('abc');
+ * // => false
+ */
+function isSymbol(value) {
+  return typeof value == 'symbol' ||
+    (isObjectLike(value) && objectToString.call(value) == symbolTag);
+}
+
+/**
+ * Converts `value` to a string. An empty string is returned for `null`
+ * and `undefined` values. The sign of `-0` is preserved.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to process.
+ * @returns {string} Returns the string.
+ * @example
+ *
+ * _.toString(null);
+ * // => ''
+ *
+ * _.toString(-0);
+ * // => '-0'
+ *
+ * _.toString([1, 2, 3]);
+ * // => '1,2,3'
+ */
+function toString(value) {
+  return value == null ? '' : baseToString(value);
+}
+
+/**
+ * Gets the value at `path` of `object`. If the resolved value is
+ * `undefined`, the `defaultValue` is returned in its place.
+ *
+ * @static
+ * @memberOf _
+ * @since 3.7.0
+ * @category Object
+ * @param {Object} object The object to query.
+ * @param {Array|string} path The path of the property to get.
+ * @param {*} [defaultValue] The value returned for `undefined` resolved values.
+ * @returns {*} Returns the resolved value.
+ * @example
+ *
+ * var object = { 'a': [{ 'b': { 'c': 3 } }] };
+ *
+ * _.get(object, 'a[0].b.c');
+ * // => 3
+ *
+ * _.get(object, ['a', '0', 'b', 'c']);
+ * // => 3
+ *
+ * _.get(object, 'a.b.c', 'default');
+ * // => 'default'
+ */
+function get(object, path, defaultValue) {
+  var result = object == null ? undefined : baseGet(object, path);
+  return result === undefined ? defaultValue : result;
+}
+
+module.exports = get;
+
+},{}],117:[function(require,module,exports){
+"use strict";
+
+// cache a reference to setTimeout, so that our reference won't be stubbed out
+// when using fake timers and errors will still get logged
+// https://github.com/cjohansen/Sinon.JS/issues/381
+var realSetTimeout = setTimeout;
+
+function configureLogger(config) {
+    // eslint-disable-next-line no-param-reassign
+    config = config || {};
+    // Function which prints errors.
+    if (!config.hasOwnProperty("logger")) {
+        // eslint-disable-next-line no-empty-function
+        config.logger = function() {};
+    }
+    // When set to true, any errors logged will be thrown immediately;
+    // If set to false, the errors will be thrown in separate execution frame.
+    if (!config.hasOwnProperty("useImmediateExceptions")) {
+        config.useImmediateExceptions = true;
+    }
+    // wrap realSetTimeout with something we can stub in tests
+    if (!config.hasOwnProperty("setTimeout")) {
+        config.setTimeout = realSetTimeout;
+    }
+
+    return function logError(label, e) {
+        var msg = label + " threw exception: ";
+        var err = {
+            name: e.name || label,
+            message: e.message || e.toString(),
+            stack: e.stack
+        };
+
+        function throwLoggedError() {
+            err.message = msg + err.message;
+            throw err;
+        }
+
+        config.logger(msg + "[" + err.name + "] " + err.message);
+
+        if (err.stack) {
+            config.logger(err.stack);
+        }
+
+        if (config.useImmediateExceptions) {
+            throwLoggedError();
+        } else {
+            config.setTimeout(throwLoggedError, 0);
+        }
+    };
+}
+
+module.exports = configureLogger;
+
+},{}],118:[function(require,module,exports){
+"use strict";
+
+var Event = require("./event");
+
+function CustomEvent(type, customData, target) {
+    this.initEvent(type, false, false, target);
+    this.detail = customData.detail || null;
+}
+
+CustomEvent.prototype = new Event();
+
+CustomEvent.prototype.constructor = CustomEvent;
+
+module.exports = CustomEvent;
+
+},{"./event":120}],119:[function(require,module,exports){
+"use strict";
+
+function flattenOptions(options) {
+    if (options !== Object(options)) {
+        return {
+            capture: Boolean(options),
+            once: false,
+            passive: false
+        };
+    }
+    return {
+        capture: Boolean(options.capture),
+        once: Boolean(options.once),
+        passive: Boolean(options.passive)
+    };
+}
+function not(fn) {
+    return function() {
+        return !fn.apply(this, arguments);
+    };
+}
+function hasListenerFilter(listener, capture) {
+    return function(listenerSpec) {
+        return (
+            listenerSpec.capture === capture &&
+            listenerSpec.listener === listener
+        );
+    };
+}
+
+var EventTarget = {
+    // https://dom.spec.whatwg.org/#dom-eventtarget-addeventlistener
+    addEventListener: function addEventListener(
+        event,
+        listener,
+        providedOptions
+    ) {
+        // 3. Let capture, passive, and once be the result of flattening more options.
+        // Flatten property before executing step 2,
+        // feture detection is usually based on registering handler with options object,
+        // that has getter defined
+        // addEventListener("load", () => {}, {
+        //    get once() { supportsOnce = true; }
+        // });
+        var options = flattenOptions(providedOptions);
+
+        // 2. If callback is null, then return.
+        if (listener === null || listener === undefined) {
+            return;
+        }
+
+        this.eventListeners = this.eventListeners || {};
+        this.eventListeners[event] = this.eventListeners[event] || [];
+
+        // 4. If context object’s associated list of event listener
+        //    does not contain an event listener whose type is type,
+        //    callback is callback, and capture is capture, then append
+        //    a new event listener to it, whose type is type, callback is
+        //    callback, capture is capture, passive is passive, and once is once.
+        if (
+            !this.eventListeners[event].some(
+                hasListenerFilter(listener, options.capture)
+            )
+        ) {
+            this.eventListeners[event].push({
+                listener: listener,
+                capture: options.capture,
+                once: options.once
+            });
+        }
+    },
+
+    // https://dom.spec.whatwg.org/#dom-eventtarget-removeeventlistener
+    removeEventListener: function removeEventListener(
+        event,
+        listener,
+        providedOptions
+    ) {
+        if (!this.eventListeners || !this.eventListeners[event]) {
+            return;
+        }
+
+        // 2. Let capture be the result of flattening options.
+        var options = flattenOptions(providedOptions);
+
+        // 3. If there is an event listener in the associated list of
+        //    event listeners whose type is type, callback is callback,
+        //    and capture is capture, then set that event listener’s
+        //    removed to true and remove it from the associated list of event listeners.
+        this.eventListeners[event] = this.eventListeners[event].filter(
+            not(hasListenerFilter(listener, options.capture))
+        );
+    },
+
+    dispatchEvent: function dispatchEvent(event) {
+        if (!this.eventListeners || !this.eventListeners[event.type]) {
+            return Boolean(event.defaultPrevented);
+        }
+
+        var self = this;
+        var type = event.type;
+        var listeners = self.eventListeners[type];
+
+        // Remove listeners, that should be dispatched once
+        // before running dispatch loop to avoid nested dispatch issues
+        self.eventListeners[type] = listeners.filter(function(listenerSpec) {
+            return !listenerSpec.once;
+        });
+        listeners.forEach(function(listenerSpec) {
+            var listener = listenerSpec.listener;
+            if (typeof listener === "function") {
+                listener.call(self, event);
+            } else {
+                listener.handleEvent(event);
+            }
+        });
+
+        return Boolean(event.defaultPrevented);
+    }
+};
+
+module.exports = EventTarget;
+
+},{}],120:[function(require,module,exports){
+"use strict";
+
+function Event(type, bubbles, cancelable, target) {
+    this.initEvent(type, bubbles, cancelable, target);
+}
+
+Event.prototype = {
+    initEvent: function(type, bubbles, cancelable, target) {
+        this.type = type;
+        this.bubbles = bubbles;
+        this.cancelable = cancelable;
+        this.target = target;
+        this.currentTarget = target;
+    },
+
+    // eslint-disable-next-line no-empty-function
+    stopPropagation: function() {},
+
+    preventDefault: function() {
+        this.defaultPrevented = true;
+    }
+};
+
+module.exports = Event;
+
+},{}],121:[function(require,module,exports){
+"use strict";
+
+module.exports = {
+    Event: require("./event"),
+    ProgressEvent: require("./progress-event"),
+    CustomEvent: require("./custom-event"),
+    EventTarget: require("./event-target")
+};
+
+},{"./custom-event":118,"./event":120,"./event-target":119,"./progress-event":122}],122:[function(require,module,exports){
+"use strict";
+
+var Event = require("./event");
+
+function ProgressEvent(type, progressEventRaw, target) {
+    this.initEvent(type, false, false, target);
+    this.loaded =
+        typeof progressEventRaw.loaded === "number"
+            ? progressEventRaw.loaded
+            : null;
+    this.total =
+        typeof progressEventRaw.total === "number"
+            ? progressEventRaw.total
+            : null;
+    this.lengthComputable = Boolean(progressEventRaw.total);
+}
+
+ProgressEvent.prototype = new Event();
+
+ProgressEvent.prototype.constructor = ProgressEvent;
+
+module.exports = ProgressEvent;
+
+},{"./event":120}],123:[function(require,module,exports){
+"use strict";
+
+var FakeTimers = require("@sinonjs/fake-timers");
+var fakeServer = require("./index");
+
+// eslint-disable-next-line no-empty-function
+function Server() {}
+Server.prototype = fakeServer;
+
+var fakeServerWithClock = new Server();
+
+fakeServerWithClock.addRequest = function addRequest(xhr) {
+    if (xhr.async) {
+        if (typeof setTimeout.clock === "object") {
+            this.clock = setTimeout.clock;
+        } else {
+            this.clock = FakeTimers.install();
+            this.resetClock = true;
+        }
+
+        if (!this.longestTimeout) {
+            var clockSetTimeout = this.clock.setTimeout;
+            var clockSetInterval = this.clock.setInterval;
+            var server = this;
+
+            this.clock.setTimeout = function(fn, timeout) {
+                server.longestTimeout = Math.max(
+                    timeout,
+                    server.longestTimeout || 0
+                );
+
+                return clockSetTimeout.apply(this, arguments);
+            };
+
+            this.clock.setInterval = function(fn, timeout) {
+                server.longestTimeout = Math.max(
+                    timeout,
+                    server.longestTimeout || 0
+                );
+
+                return clockSetInterval.apply(this, arguments);
+            };
+        }
+    }
+
+    return fakeServer.addRequest.call(this, xhr);
+};
+
+fakeServerWithClock.respond = function respond() {
+    var returnVal = fakeServer.respond.apply(this, arguments);
+
+    if (this.clock) {
+        this.clock.tick(this.longestTimeout || 0);
+        this.longestTimeout = 0;
+
+        if (this.resetClock) {
+            this.clock.uninstall();
+            this.resetClock = false;
+        }
+    }
+
+    return returnVal;
+};
+
+fakeServerWithClock.restore = function restore() {
+    if (this.clock) {
+        this.clock.uninstall();
+    }
+
+    return fakeServer.restore.apply(this, arguments);
+};
+
+module.exports = fakeServerWithClock;
+
+},{"./index":124,"@sinonjs/fake-timers":56}],124:[function(require,module,exports){
+"use strict";
+
+var fakeXhr = require("../fake-xhr");
+var push = [].push;
+var log = require("./log");
+var configureLogError = require("../configure-logger");
+var pathToRegexp = require("path-to-regexp");
+
+var supportsArrayBuffer = typeof ArrayBuffer !== "undefined";
+
+function responseArray(handler) {
+    var response = handler;
+
+    if (Object.prototype.toString.call(handler) !== "[object Array]") {
+        response = [200, {}, handler];
+    }
+
+    if (typeof response[2] !== "string") {
+        if (!supportsArrayBuffer) {
+            throw new TypeError(
+                "Fake server response body should be a string, but was " +
+                    typeof response[2]
+            );
+        } else if (!(response[2] instanceof ArrayBuffer)) {
+            throw new TypeError(
+                "Fake server response body should be a string or ArrayBuffer, but was " +
+                    typeof response[2]
+            );
+        }
+    }
+
+    return response;
+}
+
+function getDefaultWindowLocation() {
+    var winloc = {
+        hostname: "localhost",
+        port: process.env.PORT || 80,
+        protocol: "http:"
+    };
+    winloc.host =
+        winloc.hostname +
+        (String(winloc.port) === "80" ? "" : ":" + winloc.port);
+    return winloc;
+}
+
+function getWindowLocation() {
+    if (typeof window === "undefined") {
+        // Fallback
+        return getDefaultWindowLocation();
+    }
+
+    if (typeof window.location !== "undefined") {
+        // Browsers place location on window
+        return window.location;
+    }
+
+    if (
+        typeof window.window !== "undefined" &&
+        typeof window.window.location !== "undefined"
+    ) {
+        // React Native on Android places location on window.window
+        return window.window.location;
+    }
+
+    return getDefaultWindowLocation();
+}
+
+function matchOne(response, reqMethod, reqUrl) {
+    var rmeth = response.method;
+    var matchMethod = !rmeth || rmeth.toLowerCase() === reqMethod.toLowerCase();
+    var url = response.url;
+    var matchUrl =
+        !url ||
+        url === reqUrl ||
+        (typeof url.test === "function" && url.test(reqUrl));
+
+    return matchMethod && matchUrl;
+}
+
+function match(response, request) {
+    var wloc = getWindowLocation();
+
+    var rCurrLoc = new RegExp("^" + wloc.protocol + "//" + wloc.host + "/");
+
+    var requestUrl = request.url;
+
+    if (!/^https?:\/\//.test(requestUrl) || rCurrLoc.test(requestUrl)) {
+        requestUrl = requestUrl.replace(rCurrLoc, "/");
+    }
+
+    if (matchOne(response, this.getHTTPMethod(request), requestUrl)) {
+        if (typeof response.response === "function") {
+            var ru = response.url;
+            var args = [request].concat(
+                ru && typeof ru.exec === "function"
+                    ? ru.exec(requestUrl).slice(1)
+                    : []
+            );
+            return response.response.apply(response, args);
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+function incrementRequestCount() {
+    var count = ++this.requestCount;
+
+    this.requested = true;
+
+    this.requestedOnce = count === 1;
+    this.requestedTwice = count === 2;
+    this.requestedThrice = count === 3;
+
+    this.firstRequest = this.getRequest(0);
+    this.secondRequest = this.getRequest(1);
+    this.thirdRequest = this.getRequest(2);
+
+    this.lastRequest = this.getRequest(count - 1);
+}
+
+var fakeServer = {
+    create: function(config) {
+        var server = Object.create(this);
+        server.configure(config);
+        this.xhr = fakeXhr.useFakeXMLHttpRequest();
+        server.requests = [];
+        server.requestCount = 0;
+        server.queue = [];
+        server.responses = [];
+
+        this.xhr.onCreate = function(xhrObj) {
+            xhrObj.unsafeHeadersEnabled = function() {
+                return !(server.unsafeHeadersEnabled === false);
+            };
+            server.addRequest(xhrObj);
+        };
+
+        return server;
+    },
+
+    configure: function(config) {
+        var self = this;
+        var whitelist = {
+            autoRespond: true,
+            autoRespondAfter: true,
+            respondImmediately: true,
+            fakeHTTPMethods: true,
+            logger: true,
+            unsafeHeadersEnabled: true
+        };
+
+        // eslint-disable-next-line no-param-reassign
+        config = config || {};
+
+        Object.keys(config).forEach(function(setting) {
+            if (setting in whitelist) {
+                self[setting] = config[setting];
+            }
+        });
+
+        self.logError = configureLogError(config);
+    },
+
+    addRequest: function addRequest(xhrObj) {
+        var server = this;
+        push.call(this.requests, xhrObj);
+
+        incrementRequestCount.call(this);
+
+        xhrObj.onSend = function() {
+            server.handleRequest(this);
+
+            if (server.respondImmediately) {
+                server.respond();
+            } else if (server.autoRespond && !server.responding) {
+                setTimeout(function() {
+                    server.responding = false;
+                    server.respond();
+                }, server.autoRespondAfter || 10);
+
+                server.responding = true;
+            }
+        };
+    },
+
+    getHTTPMethod: function getHTTPMethod(request) {
+        if (this.fakeHTTPMethods && /post/i.test(request.method)) {
+            var matches = (request.requestBody || "").match(
+                /_method=([^\b;]+)/
+            );
+            return matches ? matches[1] : request.method;
+        }
+
+        return request.method;
+    },
+
+    handleRequest: function handleRequest(xhr) {
+        if (xhr.async) {
+            push.call(this.queue, xhr);
+        } else {
+            this.processRequest(xhr);
+        }
+    },
+
+    logger: function() {
+        // no-op; override via configure()
+    },
+
+    logError: configureLogError({}),
+
+    log: log,
+
+    respondWith: function respondWith(method, url, body) {
+        if (arguments.length === 1 && typeof method !== "function") {
+            this.response = responseArray(method);
+            return;
+        }
+
+        if (arguments.length === 1) {
+            // eslint-disable-next-line no-param-reassign
+            body = method;
+            // eslint-disable-next-line no-param-reassign
+            url = method = null;
+        }
+
+        if (arguments.length === 2) {
+            // eslint-disable-next-line no-param-reassign
+            body = url;
+            // eslint-disable-next-line no-param-reassign
+            url = method;
+            // eslint-disable-next-line no-param-reassign
+            method = null;
+        }
+
+        // Escape port number to prevent "named" parameters in 'path-to-regexp' module
+        if (typeof url === "string" && url !== "" && /:[0-9]+\//.test(url)) {
+            var m = url.match(/^(https?:\/\/.*?):([0-9]+\/.*)$/);
+            // eslint-disable-next-line no-param-reassign
+            url = m[1] + "\\:" + m[2];
+        }
+
+        push.call(this.responses, {
+            method: method,
+            url:
+                typeof url === "string" && url !== "" ? pathToRegexp(url) : url,
+            response: typeof body === "function" ? body : responseArray(body)
+        });
+    },
+
+    respond: function respond() {
+        if (arguments.length > 0) {
+            this.respondWith.apply(this, arguments);
+        }
+
+        var queue = this.queue || [];
+        var requests = queue.splice(0, queue.length);
+        var self = this;
+
+        requests.forEach(function(request) {
+            self.processRequest(request);
+        });
+    },
+
+    respondAll: function respondAll() {
+        if (this.respondImmediately) {
+            return;
+        }
+
+        this.queue = this.requests.slice(0);
+
+        var request;
+        while ((request = this.queue.shift())) {
+            this.processRequest(request);
+        }
+    },
+
+    processRequest: function processRequest(request) {
+        try {
+            if (request.aborted) {
+                return;
+            }
+
+            var response = this.response || [404, {}, ""];
+
+            if (this.responses) {
+                for (var l = this.responses.length, i = l - 1; i >= 0; i--) {
+                    if (match.call(this, this.responses[i], request)) {
+                        response = this.responses[i].response;
+                        break;
+                    }
+                }
+            }
+
+            if (request.readyState !== 4) {
+                this.log(response, request);
+
+                request.respond(response[0], response[1], response[2]);
+            }
+        } catch (e) {
+            this.logError("Fake server request processing", e);
+        }
+    },
+
+    restore: function restore() {
+        return this.xhr.restore && this.xhr.restore.apply(this.xhr, arguments);
+    },
+
+    getRequest: function getRequest(index) {
+        return this.requests[index] || null;
+    },
+
+    reset: function reset() {
+        this.resetBehavior();
+        this.resetHistory();
+    },
+
+    resetBehavior: function resetBehavior() {
+        this.responses.length = this.queue.length = 0;
+    },
+
+    resetHistory: function resetHistory() {
+        this.requests.length = this.requestCount = 0;
+
+        this.requestedOnce = this.requestedTwice = this.requestedThrice = this.requested = false;
+
+        this.firstRequest = this.secondRequest = this.thirdRequest = this.lastRequest = null;
+    }
+};
+
+module.exports = fakeServer;
+
+},{"../configure-logger":117,"../fake-xhr":127,"./log":125,"path-to-regexp":129}],125:[function(require,module,exports){
+"use strict";
+var inspect = require("util").inspect;
+
+function log(response, request) {
+    var str;
+
+    str = "Request:\n" + inspect(request) + "\n\n";
+    str += "Response:\n" + inspect(response) + "\n\n";
+
+    /* istanbul ignore else: when this.logger is not a function, it can't be called */
+    if (typeof this.logger === "function") {
+        this.logger(str);
+    }
+}
+
+module.exports = log;
+
+},{"util":134}],126:[function(require,module,exports){
+"use strict";
+
+exports.isSupported = (function() {
+    try {
+        return Boolean(new Blob());
+    } catch (e) {
+        return false;
+    }
+})();
+
+},{}],127:[function(require,module,exports){
+"use strict";
+
+var GlobalTextEncoder =
+    typeof TextEncoder !== "undefined"
+        ? TextEncoder
+        : require("@sinonjs/text-encoding").TextEncoder;
+var globalObject = require("@sinonjs/commons").global;
+var configureLogError = require("../configure-logger");
+var sinonEvent = require("../event");
+var extend = require("just-extend");
+
+var supportsProgress = typeof ProgressEvent !== "undefined";
+var supportsCustomEvent = typeof CustomEvent !== "undefined";
+var supportsFormData = typeof FormData !== "undefined";
+var supportsArrayBuffer = typeof ArrayBuffer !== "undefined";
+var supportsBlob = require("./blob").isSupported;
+
+function getWorkingXHR(globalScope) {
+    var supportsXHR = typeof globalScope.XMLHttpRequest !== "undefined";
+    if (supportsXHR) {
+        return globalScope.XMLHttpRequest;
+    }
+
+    var supportsActiveX = typeof globalScope.ActiveXObject !== "undefined";
+    if (supportsActiveX) {
+        return function() {
+            return new globalScope.ActiveXObject("MSXML2.XMLHTTP.3.0");
+        };
+    }
+
+    return false;
+}
+
+// Ref: https://fetch.spec.whatwg.org/#forbidden-header-name
+var unsafeHeaders = {
+    "Accept-Charset": true,
+    "Access-Control-Request-Headers": true,
+    "Access-Control-Request-Method": true,
+    "Accept-Encoding": true,
+    Connection: true,
+    "Content-Length": true,
+    Cookie: true,
+    Cookie2: true,
+    "Content-Transfer-Encoding": true,
+    Date: true,
+    DNT: true,
+    Expect: true,
+    Host: true,
+    "Keep-Alive": true,
+    Origin: true,
+    Referer: true,
+    TE: true,
+    Trailer: true,
+    "Transfer-Encoding": true,
+    Upgrade: true,
+    "User-Agent": true,
+    Via: true
+};
+
+function EventTargetHandler() {
+    var self = this;
+    var events = [
+        "loadstart",
+        "progress",
+        "abort",
+        "error",
+        "load",
+        "timeout",
+        "loadend"
+    ];
+
+    function addEventListener(eventName) {
+        self.addEventListener(eventName, function(event) {
+            var listener = self["on" + eventName];
+
+            if (listener && typeof listener === "function") {
+                listener.call(this, event);
+            }
+        });
+    }
+
+    events.forEach(addEventListener);
+}
+
+EventTargetHandler.prototype = sinonEvent.EventTarget;
+
+function normalizeHeaderValue(value) {
+    // Ref: https://fetch.spec.whatwg.org/#http-whitespace-bytes
+    /*eslint no-control-regex: "off"*/
+    return value.replace(/^[\x09\x0A\x0D\x20]+|[\x09\x0A\x0D\x20]+$/g, "");
+}
+
+function getHeader(headers, header) {
+    var foundHeader = Object.keys(headers).filter(function(h) {
+        return h.toLowerCase() === header.toLowerCase();
+    });
+
+    return foundHeader[0] || null;
+}
+
+function excludeSetCookie2Header(header) {
+    return !/^Set-Cookie2?$/i.test(header);
+}
+
+function verifyResponseBodyType(body, responseType) {
+    var error = null;
+    var isString = typeof body === "string";
+
+    if (responseType === "arraybuffer") {
+        if (!isString && !(body instanceof ArrayBuffer)) {
+            error = new Error(
+                "Attempted to respond to fake XMLHttpRequest with " +
+                    body +
+                    ", which is not a string or ArrayBuffer."
+            );
+            error.name = "InvalidBodyException";
+        }
+    } else if (!isString) {
+        error = new Error(
+            "Attempted to respond to fake XMLHttpRequest with " +
+                body +
+                ", which is not a string."
+        );
+        error.name = "InvalidBodyException";
+    }
+
+    if (error) {
+        throw error;
+    }
+}
+
+function convertToArrayBuffer(body, encoding) {
+    if (body instanceof ArrayBuffer) {
+        return body;
+    }
+
+    return new GlobalTextEncoder(encoding || "utf-8").encode(body).buffer;
+}
+
+function isXmlContentType(contentType) {
+    return (
+        !contentType ||
+        /(text\/xml)|(application\/xml)|(\+xml)/.test(contentType)
+    );
+}
+
+function clearResponse(xhr) {
+    if (xhr.responseType === "" || xhr.responseType === "text") {
+        xhr.response = xhr.responseText = "";
+    } else {
+        xhr.response = xhr.responseText = null;
+    }
+    xhr.responseXML = null;
+}
+
+function fakeXMLHttpRequestFor(globalScope) {
+    var isReactNative =
+        globalScope.navigator &&
+        globalScope.navigator.product === "ReactNative";
+    var sinonXhr = { XMLHttpRequest: globalScope.XMLHttpRequest };
+    sinonXhr.GlobalXMLHttpRequest = globalScope.XMLHttpRequest;
+    sinonXhr.GlobalActiveXObject = globalScope.ActiveXObject;
+    sinonXhr.supportsActiveX =
+        typeof sinonXhr.GlobalActiveXObject !== "undefined";
+    sinonXhr.supportsXHR = typeof sinonXhr.GlobalXMLHttpRequest !== "undefined";
+    sinonXhr.workingXHR = getWorkingXHR(globalScope);
+    sinonXhr.supportsTimeout =
+        sinonXhr.supportsXHR &&
+        "timeout" in new sinonXhr.GlobalXMLHttpRequest();
+    sinonXhr.supportsCORS =
+        isReactNative ||
+        (sinonXhr.supportsXHR &&
+            "withCredentials" in new sinonXhr.GlobalXMLHttpRequest());
+
+    // Note that for FakeXMLHttpRequest to work pre ES5
+    // we lose some of the alignment with the spec.
+    // To ensure as close a match as possible,
+    // set responseType before calling open, send or respond;
+    function FakeXMLHttpRequest(config) {
+        EventTargetHandler.call(this);
+        this.readyState = FakeXMLHttpRequest.UNSENT;
+        this.requestHeaders = {};
+        this.requestBody = null;
+        this.status = 0;
+        this.statusText = "";
+        this.upload = new EventTargetHandler();
+        this.responseType = "";
+        this.response = "";
+        this.logError = configureLogError(config);
+
+        if (sinonXhr.supportsTimeout) {
+            this.timeout = 0;
+        }
+
+        if (sinonXhr.supportsCORS) {
+            this.withCredentials = false;
+        }
+
+        if (typeof FakeXMLHttpRequest.onCreate === "function") {
+            FakeXMLHttpRequest.onCreate(this);
+        }
+    }
+
+    function verifyState(xhr) {
+        if (xhr.readyState !== FakeXMLHttpRequest.OPENED) {
+            throw new Error("INVALID_STATE_ERR");
+        }
+
+        if (xhr.sendFlag) {
+            throw new Error("INVALID_STATE_ERR");
+        }
+    }
+
+    // largest arity in XHR is 5 - XHR#open
+    var apply = function(obj, method, args) {
+        switch (args.length) {
+            case 0:
+                return obj[method]();
+            case 1:
+                return obj[method](args[0]);
+            case 2:
+                return obj[method](args[0], args[1]);
+            case 3:
+                return obj[method](args[0], args[1], args[2]);
+            case 4:
+                return obj[method](args[0], args[1], args[2], args[3]);
+            case 5:
+                return obj[method](args[0], args[1], args[2], args[3], args[4]);
+            default:
+                throw new Error("Unhandled case");
+        }
+    };
+
+    FakeXMLHttpRequest.filters = [];
+    FakeXMLHttpRequest.addFilter = function addFilter(fn) {
+        this.filters.push(fn);
+    };
+    FakeXMLHttpRequest.defake = function defake(fakeXhr, xhrArgs) {
+        var xhr = new sinonXhr.workingXHR(); // eslint-disable-line new-cap
+
+        [
+            "open",
+            "setRequestHeader",
+            "abort",
+            "getResponseHeader",
+            "getAllResponseHeaders",
+            "addEventListener",
+            "overrideMimeType",
+            "removeEventListener"
+        ].forEach(function(method) {
+            fakeXhr[method] = function() {
+                return apply(xhr, method, arguments);
+            };
+        });
+
+        fakeXhr.send = function() {
+            // Ref: https://xhr.spec.whatwg.org/#the-responsetype-attribute
+            if (xhr.responseType !== fakeXhr.responseType) {
+                xhr.responseType = fakeXhr.responseType;
+            }
+            return apply(xhr, "send", arguments);
+        };
+
+        var copyAttrs = function(args) {
+            args.forEach(function(attr) {
+                fakeXhr[attr] = xhr[attr];
+            });
+        };
+
+        var stateChangeStart = function() {
+            fakeXhr.readyState = xhr.readyState;
+            if (xhr.readyState >= FakeXMLHttpRequest.HEADERS_RECEIVED) {
+                copyAttrs(["status", "statusText"]);
+            }
+            if (xhr.readyState >= FakeXMLHttpRequest.LOADING) {
+                copyAttrs(["response"]);
+                if (xhr.responseType === "" || xhr.responseType === "text") {
+                    copyAttrs(["responseText"]);
+                }
+            }
+            if (
+                xhr.readyState === FakeXMLHttpRequest.DONE &&
+                (xhr.responseType === "" || xhr.responseType === "document")
+            ) {
+                copyAttrs(["responseXML"]);
+            }
+        };
+
+        var stateChangeEnd = function() {
+            if (fakeXhr.onreadystatechange) {
+                // eslint-disable-next-line no-useless-call
+                fakeXhr.onreadystatechange.call(fakeXhr, {
+                    target: fakeXhr,
+                    currentTarget: fakeXhr
+                });
+            }
+        };
+
+        var stateChange = function stateChange() {
+            stateChangeStart();
+            stateChangeEnd();
+        };
+
+        if (xhr.addEventListener) {
+            xhr.addEventListener("readystatechange", stateChangeStart);
+
+            Object.keys(fakeXhr.eventListeners).forEach(function(event) {
+                /*eslint-disable no-loop-func*/
+                fakeXhr.eventListeners[event].forEach(function(handler) {
+                    xhr.addEventListener(event, handler.listener, {
+                        capture: handler.capture,
+                        once: handler.once
+                    });
+                });
+                /*eslint-enable no-loop-func*/
+            });
+
+            xhr.addEventListener("readystatechange", stateChangeEnd);
+        } else {
+            xhr.onreadystatechange = stateChange;
+        }
+        apply(xhr, "open", xhrArgs);
+    };
+    FakeXMLHttpRequest.useFilters = false;
+
+    function verifyRequestOpened(xhr) {
+        if (xhr.readyState !== FakeXMLHttpRequest.OPENED) {
+            throw new Error("INVALID_STATE_ERR - " + xhr.readyState);
+        }
+    }
+
+    function verifyRequestSent(xhr) {
+        if (xhr.readyState === FakeXMLHttpRequest.DONE) {
+            throw new Error("Request done");
+        }
+    }
+
+    function verifyHeadersReceived(xhr) {
+        if (
+            xhr.async &&
+            xhr.readyState !== FakeXMLHttpRequest.HEADERS_RECEIVED
+        ) {
+            throw new Error("No headers received");
+        }
+    }
+
+    function convertResponseBody(responseType, contentType, body) {
+        if (responseType === "" || responseType === "text") {
+            return body;
+        } else if (supportsArrayBuffer && responseType === "arraybuffer") {
+            return convertToArrayBuffer(body);
+        } else if (responseType === "json") {
+            try {
+                return JSON.parse(body);
+            } catch (e) {
+                // Return parsing failure as null
+                return null;
+            }
+        } else if (supportsBlob && responseType === "blob") {
+            var blobOptions = {};
+            if (contentType) {
+                blobOptions.type = contentType;
+            }
+            return new Blob([convertToArrayBuffer(body)], blobOptions);
+        } else if (responseType === "document") {
+            if (isXmlContentType(contentType)) {
+                return FakeXMLHttpRequest.parseXML(body);
+            }
+            return null;
+        }
+        throw new Error("Invalid responseType " + responseType);
+    }
+
+    /**
+     * Steps to follow when there is an error, according to:
+     * https://xhr.spec.whatwg.org/#request-error-steps
+     */
+    function requestErrorSteps(xhr) {
+        clearResponse(xhr);
+        xhr.errorFlag = true;
+        xhr.requestHeaders = {};
+        xhr.responseHeaders = {};
+
+        if (
+            xhr.readyState !== FakeXMLHttpRequest.UNSENT &&
+            xhr.sendFlag &&
+            xhr.readyState !== FakeXMLHttpRequest.DONE
+        ) {
+            xhr.readyStateChange(FakeXMLHttpRequest.DONE);
+            xhr.sendFlag = false;
+        }
+    }
+
+    FakeXMLHttpRequest.parseXML = function parseXML(text) {
+        // Treat empty string as parsing failure
+        if (text !== "") {
+            try {
+                if (typeof DOMParser !== "undefined") {
+                    var parser = new DOMParser();
+                    var parsererrorNS = "";
+
+                    try {
+                        var parsererrors = parser
+                            .parseFromString("INVALID", "text/xml")
+                            .getElementsByTagName("parsererror");
+                        if (parsererrors.length) {
+                            parsererrorNS = parsererrors[0].namespaceURI;
+                        }
+                    } catch (e) {
+                        // passing invalid XML makes IE11 throw
+                        // so no namespace needs to be determined
+                    }
+
+                    var result;
+                    try {
+                        result = parser.parseFromString(text, "text/xml");
+                    } catch (err) {
+                        return null;
+                    }
+
+                    return result.getElementsByTagNameNS(
+                        parsererrorNS,
+                        "parsererror"
+                    ).length
+                        ? null
+                        : result;
+                }
+                var xmlDoc = new window.ActiveXObject("Microsoft.XMLDOM");
+                xmlDoc.async = "false";
+                xmlDoc.loadXML(text);
+                return xmlDoc.parseError.errorCode !== 0 ? null : xmlDoc;
+            } catch (e) {
+                // Unable to parse XML - no biggie
+            }
+        }
+
+        return null;
+    };
+
+    FakeXMLHttpRequest.statusCodes = {
+        100: "Continue",
+        101: "Switching Protocols",
+        200: "OK",
+        201: "Created",
+        202: "Accepted",
+        203: "Non-Authoritative Information",
+        204: "No Content",
+        205: "Reset Content",
+        206: "Partial Content",
+        207: "Multi-Status",
+        300: "Multiple Choice",
+        301: "Moved Permanently",
+        302: "Found",
+        303: "See Other",
+        304: "Not Modified",
+        305: "Use Proxy",
+        307: "Temporary Redirect",
+        400: "Bad Request",
+        401: "Unauthorized",
+        402: "Payment Required",
+        403: "Forbidden",
+        404: "Not Found",
+        405: "Method Not Allowed",
+        406: "Not Acceptable",
+        407: "Proxy Authentication Required",
+        408: "Request Timeout",
+        409: "Conflict",
+        410: "Gone",
+        411: "Length Required",
+        412: "Precondition Failed",
+        413: "Request Entity Too Large",
+        414: "Request-URI Too Long",
+        415: "Unsupported Media Type",
+        416: "Requested Range Not Satisfiable",
+        417: "Expectation Failed",
+        422: "Unprocessable Entity",
+        500: "Internal Server Error",
+        501: "Not Implemented",
+        502: "Bad Gateway",
+        503: "Service Unavailable",
+        504: "Gateway Timeout",
+        505: "HTTP Version Not Supported"
+    };
+
+    extend(FakeXMLHttpRequest.prototype, sinonEvent.EventTarget, {
+        async: true,
+
+        open: function open(method, url, async, username, password) {
+            this.method = method;
+            this.url = url;
+            this.async = typeof async === "boolean" ? async : true;
+            this.username = username;
+            this.password = password;
+            clearResponse(this);
+            this.requestHeaders = {};
+            this.sendFlag = false;
+
+            if (FakeXMLHttpRequest.useFilters === true) {
+                var xhrArgs = arguments;
+                var defake = FakeXMLHttpRequest.filters.some(function(filter) {
+                    return filter.apply(this, xhrArgs);
+                });
+                if (defake) {
+                    FakeXMLHttpRequest.defake(this, arguments);
+                    return;
+                }
+            }
+            this.readyStateChange(FakeXMLHttpRequest.OPENED);
+        },
+
+        readyStateChange: function readyStateChange(state) {
+            this.readyState = state;
+
+            var readyStateChangeEvent = new sinonEvent.Event(
+                "readystatechange",
+                false,
+                false,
+                this
+            );
+            var event, progress;
+
+            if (typeof this.onreadystatechange === "function") {
+                try {
+                    this.onreadystatechange(readyStateChangeEvent);
+                } catch (e) {
+                    this.logError("Fake XHR onreadystatechange handler", e);
+                }
+            }
+
+            if (this.readyState === FakeXMLHttpRequest.DONE) {
+                if (this.timedOut || this.aborted || this.status === 0) {
+                    progress = { loaded: 0, total: 0 };
+                    event =
+                        (this.timedOut && "timeout") ||
+                        (this.aborted && "abort") ||
+                        "error";
+                } else {
+                    progress = { loaded: 100, total: 100 };
+                    event = "load";
+                }
+
+                if (supportsProgress) {
+                    this.upload.dispatchEvent(
+                        new sinonEvent.ProgressEvent("progress", progress, this)
+                    );
+                    this.upload.dispatchEvent(
+                        new sinonEvent.ProgressEvent(event, progress, this)
+                    );
+                    this.upload.dispatchEvent(
+                        new sinonEvent.ProgressEvent("loadend", progress, this)
+                    );
+                }
+
+                this.dispatchEvent(
+                    new sinonEvent.ProgressEvent("progress", progress, this)
+                );
+                this.dispatchEvent(
+                    new sinonEvent.ProgressEvent(event, progress, this)
+                );
+                this.dispatchEvent(
+                    new sinonEvent.ProgressEvent("loadend", progress, this)
+                );
+            }
+
+            this.dispatchEvent(readyStateChangeEvent);
+        },
+
+        // Ref https://xhr.spec.whatwg.org/#the-setrequestheader()-method
+        setRequestHeader: function setRequestHeader(header, value) {
+            if (typeof value !== "string") {
+                throw new TypeError(
+                    "By RFC7230, section 3.2.4, header values should be strings. Got " +
+                        typeof value
+                );
+            }
+            verifyState(this);
+
+            var checkUnsafeHeaders = true;
+            if (typeof this.unsafeHeadersEnabled === "function") {
+                checkUnsafeHeaders = this.unsafeHeadersEnabled();
+            }
+
+            if (
+                checkUnsafeHeaders &&
+                (getHeader(unsafeHeaders, header) !== null ||
+                    /^(Sec-|Proxy-)/i.test(header))
+            ) {
+                throw new Error(
+                    // eslint-disable-next-line quotes
+                    'Refused to set unsafe header "' + header + '"'
+                );
+            }
+
+            // eslint-disable-next-line no-param-reassign
+            value = normalizeHeaderValue(value);
+
+            var existingHeader = getHeader(this.requestHeaders, header);
+            if (existingHeader) {
+                this.requestHeaders[existingHeader] += ", " + value;
+            } else {
+                this.requestHeaders[header] = value;
+            }
+        },
+
+        setStatus: function setStatus(status) {
+            var sanitizedStatus = typeof status === "number" ? status : 200;
+
+            verifyRequestOpened(this);
+            this.status = sanitizedStatus;
+            this.statusText = FakeXMLHttpRequest.statusCodes[sanitizedStatus];
+        },
+
+        // Helps testing
+        setResponseHeaders: function setResponseHeaders(headers) {
+            verifyRequestOpened(this);
+
+            var responseHeaders = (this.responseHeaders = {});
+
+            Object.keys(headers).forEach(function(header) {
+                responseHeaders[header] = headers[header];
+            });
+
+            if (this.async) {
+                this.readyStateChange(FakeXMLHttpRequest.HEADERS_RECEIVED);
+            } else {
+                this.readyState = FakeXMLHttpRequest.HEADERS_RECEIVED;
+            }
+        },
+
+        // Currently treats ALL data as a DOMString (i.e. no Document)
+        send: function send(data) {
+            verifyState(this);
+
+            if (!/^(head)$/i.test(this.method)) {
+                var contentType = getHeader(
+                    this.requestHeaders,
+                    "Content-Type"
+                );
+                if (this.requestHeaders[contentType]) {
+                    var value = this.requestHeaders[contentType].split(";");
+                    this.requestHeaders[contentType] =
+                        value[0] + ";charset=utf-8";
+                } else if (supportsFormData && !(data instanceof FormData)) {
+                    this.requestHeaders["Content-Type"] =
+                        "text/plain;charset=utf-8";
+                }
+
+                this.requestBody = data;
+            }
+
+            this.errorFlag = false;
+            this.sendFlag = this.async;
+            clearResponse(this);
+
+            if (typeof this.onSend === "function") {
+                this.onSend(this);
+            }
+
+            // Only listen if setInterval and Date are a stubbed.
+            if (
+                sinonXhr.supportsTimeout &&
+                typeof setInterval.clock === "object" &&
+                typeof Date.clock === "object"
+            ) {
+                var initiatedTime = Date.now();
+                var self = this;
+
+                // Listen to any possible tick by fake timers and check to see if timeout has
+                // been exceeded. It's important to note that timeout can be changed while a request
+                // is in flight, so we must check anytime the end user forces a clock tick to make
+                // sure timeout hasn't changed.
+                // https://xhr.spec.whatwg.org/#dfnReturnLink-2
+                var clearIntervalId = setInterval(function() {
+                    // Check if the readyState has been reset or is done. If this is the case, there
+                    // should be no timeout. This will also prevent aborted requests and
+                    // fakeServerWithClock from triggering unnecessary responses.
+                    if (
+                        self.readyState === FakeXMLHttpRequest.UNSENT ||
+                        self.readyState === FakeXMLHttpRequest.DONE
+                    ) {
+                        clearInterval(clearIntervalId);
+                    } else if (
+                        typeof self.timeout === "number" &&
+                        self.timeout > 0
+                    ) {
+                        if (Date.now() >= initiatedTime + self.timeout) {
+                            self.triggerTimeout();
+                            clearInterval(clearIntervalId);
+                        }
+                    }
+                }, 1);
+            }
+
+            this.dispatchEvent(
+                new sinonEvent.Event("loadstart", false, false, this)
+            );
+        },
+
+        abort: function abort() {
+            this.aborted = true;
+            requestErrorSteps(this);
+            this.readyState = FakeXMLHttpRequest.UNSENT;
+        },
+
+        error: function() {
+            clearResponse(this);
+            this.errorFlag = true;
+            this.requestHeaders = {};
+            this.responseHeaders = {};
+
+            this.readyStateChange(FakeXMLHttpRequest.DONE);
+        },
+
+        triggerTimeout: function triggerTimeout() {
+            if (sinonXhr.supportsTimeout) {
+                this.timedOut = true;
+                requestErrorSteps(this);
+            }
+        },
+
+        getResponseHeader: function getResponseHeader(header) {
+            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
+                return null;
+            }
+
+            if (/^Set-Cookie2?$/i.test(header)) {
+                return null;
+            }
+
+            // eslint-disable-next-line no-param-reassign
+            header = getHeader(this.responseHeaders, header);
+
+            return this.responseHeaders[header] || null;
+        },
+
+        getAllResponseHeaders: function getAllResponseHeaders() {
+            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
+                return "";
+            }
+
+            var responseHeaders = this.responseHeaders;
+            var headers = Object.keys(responseHeaders)
+                .filter(excludeSetCookie2Header)
+                .reduce(function(prev, header) {
+                    var value = responseHeaders[header];
+
+                    return prev + (header + ": " + value + "\r\n");
+                }, "");
+
+            return headers;
+        },
+
+        setResponseBody: function setResponseBody(body) {
+            verifyRequestSent(this);
+            verifyHeadersReceived(this);
+            verifyResponseBodyType(body, this.responseType);
+            var contentType =
+                this.overriddenMimeType ||
+                this.getResponseHeader("Content-Type");
+
+            var isTextResponse =
+                this.responseType === "" || this.responseType === "text";
+            clearResponse(this);
+            if (this.async) {
+                var chunkSize = this.chunkSize || 10;
+                var index = 0;
+
+                do {
+                    this.readyStateChange(FakeXMLHttpRequest.LOADING);
+
+                    if (isTextResponse) {
+                        this.responseText = this.response += body.substring(
+                            index,
+                            index + chunkSize
+                        );
+                    }
+                    index += chunkSize;
+                } while (index < body.length);
+            }
+
+            this.response = convertResponseBody(
+                this.responseType,
+                contentType,
+                body
+            );
+            if (isTextResponse) {
+                this.responseText = this.response;
+            }
+
+            if (this.responseType === "document") {
+                this.responseXML = this.response;
+            } else if (
+                this.responseType === "" &&
+                isXmlContentType(contentType)
+            ) {
+                this.responseXML = FakeXMLHttpRequest.parseXML(
+                    this.responseText
+                );
+            }
+            this.readyStateChange(FakeXMLHttpRequest.DONE);
+        },
+
+        respond: function respond(status, headers, body) {
+            this.setStatus(status);
+            this.setResponseHeaders(headers || {});
+            this.setResponseBody(body || "");
+        },
+
+        uploadProgress: function uploadProgress(progressEventRaw) {
+            if (supportsProgress) {
+                this.upload.dispatchEvent(
+                    new sinonEvent.ProgressEvent(
+                        "progress",
+                        progressEventRaw,
+                        this.upload
+                    )
+                );
+            }
+        },
+
+        downloadProgress: function downloadProgress(progressEventRaw) {
+            if (supportsProgress) {
+                this.dispatchEvent(
+                    new sinonEvent.ProgressEvent(
+                        "progress",
+                        progressEventRaw,
+                        this
+                    )
+                );
+            }
+        },
+
+        uploadError: function uploadError(error) {
+            if (supportsCustomEvent) {
+                this.upload.dispatchEvent(
+                    new sinonEvent.CustomEvent("error", { detail: error })
+                );
+            }
+        },
+
+        overrideMimeType: function overrideMimeType(type) {
+            if (this.readyState >= FakeXMLHttpRequest.LOADING) {
+                throw new Error("INVALID_STATE_ERR");
+            }
+            this.overriddenMimeType = type;
+        }
+    });
+
+    var states = {
+        UNSENT: 0,
+        OPENED: 1,
+        HEADERS_RECEIVED: 2,
+        LOADING: 3,
+        DONE: 4
+    };
+
+    extend(FakeXMLHttpRequest, states);
+    extend(FakeXMLHttpRequest.prototype, states);
+
+    function useFakeXMLHttpRequest() {
+        FakeXMLHttpRequest.restore = function restore(keepOnCreate) {
+            if (sinonXhr.supportsXHR) {
+                globalScope.XMLHttpRequest = sinonXhr.GlobalXMLHttpRequest;
+            }
+
+            if (sinonXhr.supportsActiveX) {
+                globalScope.ActiveXObject = sinonXhr.GlobalActiveXObject;
+            }
+
+            delete FakeXMLHttpRequest.restore;
+
+            if (keepOnCreate !== true) {
+                delete FakeXMLHttpRequest.onCreate;
+            }
+        };
+        if (sinonXhr.supportsXHR) {
+            globalScope.XMLHttpRequest = FakeXMLHttpRequest;
+        }
+
+        if (sinonXhr.supportsActiveX) {
+            globalScope.ActiveXObject = function ActiveXObject(objId) {
+                if (
+                    objId === "Microsoft.XMLHTTP" ||
+                    /^Msxml2\.XMLHTTP/i.test(objId)
+                ) {
+                    return new FakeXMLHttpRequest();
+                }
+
+                return new sinonXhr.GlobalActiveXObject(objId);
+            };
+        }
+
+        return FakeXMLHttpRequest;
+    }
+
+    return {
+        xhr: sinonXhr,
+        FakeXMLHttpRequest: FakeXMLHttpRequest,
+        useFakeXMLHttpRequest: useFakeXMLHttpRequest
+    };
+}
+
+module.exports = extend(fakeXMLHttpRequestFor(globalObject), {
+    fakeXMLHttpRequestFor: fakeXMLHttpRequestFor
+});
+
+},{"../configure-logger":117,"../event":121,"./blob":126,"@sinonjs/commons":44,"@sinonjs/text-encoding":110,"just-extend":115}],128:[function(require,module,exports){
+"use strict";
+
+module.exports = {
+    fakeServer: require("./fake-server"),
+    fakeServerWithClock: require("./fake-server/fake-server-with-clock"),
+    fakeXhr: require("./fake-xhr")
+};
+
+},{"./fake-server":124,"./fake-server/fake-server-with-clock":123,"./fake-xhr":127}],129:[function(require,module,exports){
+var isarray = require('isarray')
+
+/**
+ * Expose `pathToRegexp`.
+ */
+module.exports = pathToRegexp
+module.exports.parse = parse
+module.exports.compile = compile
+module.exports.tokensToFunction = tokensToFunction
+module.exports.tokensToRegExp = tokensToRegExp
+
+/**
+ * The main path matching regexp utility.
+ *
+ * @type {RegExp}
+ */
+var PATH_REGEXP = new RegExp([
+  // Match escaped characters that would otherwise appear in future matches.
+  // This allows the user to escape special characters that won't transform.
+  '(\\\\.)',
+  // Match Express-style parameters and un-named parameters with a prefix
+  // and optional suffixes. Matches appear as:
+  //
+  // "/:test(\\d+)?" => ["/", "test", "\d+", undefined, "?", undefined]
+  // "/route(\\d+)"  => [undefined, undefined, undefined, "\d+", undefined, undefined]
+  // "/*"            => ["/", undefined, undefined, undefined, undefined, "*"]
+  '([\\/.])?(?:(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?|(\\*))'
+].join('|'), 'g')
+
+/**
+ * Parse a string for the raw tokens.
+ *
+ * @param  {string}  str
+ * @param  {Object=} options
+ * @return {!Array}
+ */
+function parse (str, options) {
+  var tokens = []
+  var key = 0
+  var index = 0
+  var path = ''
+  var defaultDelimiter = options && options.delimiter || '/'
+  var res
+
+  while ((res = PATH_REGEXP.exec(str)) != null) {
+    var m = res[0]
+    var escaped = res[1]
+    var offset = res.index
+    path += str.slice(index, offset)
+    index = offset + m.length
+
+    // Ignore already escaped sequences.
+    if (escaped) {
+      path += escaped[1]
+      continue
+    }
+
+    var next = str[index]
+    var prefix = res[2]
+    var name = res[3]
+    var capture = res[4]
+    var group = res[5]
+    var modifier = res[6]
+    var asterisk = res[7]
+
+    // Push the current path onto the tokens.
+    if (path) {
+      tokens.push(path)
+      path = ''
+    }
+
+    var partial = prefix != null && next != null && next !== prefix
+    var repeat = modifier === '+' || modifier === '*'
+    var optional = modifier === '?' || modifier === '*'
+    var delimiter = res[2] || defaultDelimiter
+    var pattern = capture || group
+
+    tokens.push({
+      name: name || key++,
+      prefix: prefix || '',
+      delimiter: delimiter,
+      optional: optional,
+      repeat: repeat,
+      partial: partial,
+      asterisk: !!asterisk,
+      pattern: pattern ? escapeGroup(pattern) : (asterisk ? '.*' : '[^' + escapeString(delimiter) + ']+?')
+    })
+  }
+
+  // Match any characters still remaining.
+  if (index < str.length) {
+    path += str.substr(index)
+  }
+
+  // If the path exists, push it onto the end.
+  if (path) {
+    tokens.push(path)
+  }
+
+  return tokens
+}
+
+/**
+ * Compile a string to a template function for the path.
+ *
+ * @param  {string}             str
+ * @param  {Object=}            options
+ * @return {!function(Object=, Object=)}
+ */
+function compile (str, options) {
+  return tokensToFunction(parse(str, options), options)
+}
+
+/**
+ * Prettier encoding of URI path segments.
+ *
+ * @param  {string}
+ * @return {string}
+ */
+function encodeURIComponentPretty (str) {
+  return encodeURI(str).replace(/[\/?#]/g, function (c) {
+    return '%' + c.charCodeAt(0).toString(16).toUpperCase()
+  })
+}
+
+/**
+ * Encode the asterisk parameter. Similar to `pretty`, but allows slashes.
+ *
+ * @param  {string}
+ * @return {string}
+ */
+function encodeAsterisk (str) {
+  return encodeURI(str).replace(/[?#]/g, function (c) {
+    return '%' + c.charCodeAt(0).toString(16).toUpperCase()
+  })
+}
+
+/**
+ * Expose a method for transforming tokens into the path function.
+ */
+function tokensToFunction (tokens, options) {
+  // Compile all the tokens into regexps.
+  var matches = new Array(tokens.length)
+
+  // Compile all the patterns before compilation.
+  for (var i = 0; i < tokens.length; i++) {
+    if (typeof tokens[i] === 'object') {
+      matches[i] = new RegExp('^(?:' + tokens[i].pattern + ')$', flags(options))
+    }
+  }
+
+  return function (obj, opts) {
+    var path = ''
+    var data = obj || {}
+    var options = opts || {}
+    var encode = options.pretty ? encodeURIComponentPretty : encodeURIComponent
+
+    for (var i = 0; i < tokens.length; i++) {
+      var token = tokens[i]
+
+      if (typeof token === 'string') {
+        path += token
+
+        continue
+      }
+
+      var value = data[token.name]
+      var segment
+
+      if (value == null) {
+        if (token.optional) {
+          // Prepend partial segment prefixes.
+          if (token.partial) {
+            path += token.prefix
+          }
+
+          continue
+        } else {
+          throw new TypeError('Expected "' + token.name + '" to be defined')
+        }
+      }
+
+      if (isarray(value)) {
+        if (!token.repeat) {
+          throw new TypeError('Expected "' + token.name + '" to not repeat, but received `' + JSON.stringify(value) + '`')
+        }
+
+        if (value.length === 0) {
+          if (token.optional) {
+            continue
+          } else {
+            throw new TypeError('Expected "' + token.name + '" to not be empty')
+          }
+        }
+
+        for (var j = 0; j < value.length; j++) {
+          segment = encode(value[j])
+
+          if (!matches[i].test(segment)) {
+            throw new TypeError('Expected all "' + token.name + '" to match "' + token.pattern + '", but received `' + JSON.stringify(segment) + '`')
+          }
+
+          path += (j === 0 ? token.prefix : token.delimiter) + segment
+        }
+
+        continue
+      }
+
+      segment = token.asterisk ? encodeAsterisk(value) : encode(value)
+
+      if (!matches[i].test(segment)) {
+        throw new TypeError('Expected "' + token.name + '" to match "' + token.pattern + '", but received "' + segment + '"')
+      }
+
+      path += token.prefix + segment
+    }
+
+    return path
+  }
+}
+
+/**
+ * Escape a regular expression string.
+ *
+ * @param  {string} str
+ * @return {string}
+ */
+function escapeString (str) {
+  return str.replace(/([.+*?=^!:${}()[\]|\/\\])/g, '\\$1')
+}
+
+/**
+ * Escape the capturing group by escaping special characters and meaning.
+ *
+ * @param  {string} group
+ * @return {string}
+ */
+function escapeGroup (group) {
+  return group.replace(/([=!:$\/()])/g, '\\$1')
+}
+
+/**
+ * Attach the keys as a property of the regexp.
+ *
+ * @param  {!RegExp} re
+ * @param  {Array}   keys
+ * @return {!RegExp}
+ */
+function attachKeys (re, keys) {
+  re.keys = keys
+  return re
+}
+
+/**
+ * Get the flags for a regexp from the options.
+ *
+ * @param  {Object} options
+ * @return {string}
+ */
+function flags (options) {
+  return options && options.sensitive ? '' : 'i'
+}
+
+/**
+ * Pull out keys from a regexp.
+ *
+ * @param  {!RegExp} path
+ * @param  {!Array}  keys
+ * @return {!RegExp}
+ */
+function regexpToRegexp (path, keys) {
+  // Use a negative lookahead to match only capturing groups.
+  var groups = path.source.match(/\((?!\?)/g)
+
+  if (groups) {
+    for (var i = 0; i < groups.length; i++) {
+      keys.push({
+        name: i,
+        prefix: null,
+        delimiter: null,
+        optional: false,
+        repeat: false,
+        partial: false,
+        asterisk: false,
+        pattern: null
+      })
+    }
+  }
+
+  return attachKeys(path, keys)
+}
+
+/**
+ * Transform an array into a regexp.
+ *
+ * @param  {!Array}  path
+ * @param  {Array}   keys
+ * @param  {!Object} options
+ * @return {!RegExp}
+ */
+function arrayToRegexp (path, keys, options) {
+  var parts = []
+
+  for (var i = 0; i < path.length; i++) {
+    parts.push(pathToRegexp(path[i], keys, options).source)
+  }
+
+  var regexp = new RegExp('(?:' + parts.join('|') + ')', flags(options))
+
+  return attachKeys(regexp, keys)
+}
+
+/**
+ * Create a path regexp from string input.
+ *
+ * @param  {string}  path
+ * @param  {!Array}  keys
+ * @param  {!Object} options
+ * @return {!RegExp}
+ */
+function stringToRegexp (path, keys, options) {
+  return tokensToRegExp(parse(path, options), keys, options)
+}
+
+/**
+ * Expose a function for taking tokens and returning a RegExp.
+ *
+ * @param  {!Array}          tokens
+ * @param  {(Array|Object)=} keys
+ * @param  {Object=}         options
+ * @return {!RegExp}
+ */
+function tokensToRegExp (tokens, keys, options) {
+  if (!isarray(keys)) {
+    options = /** @type {!Object} */ (keys || options)
+    keys = []
+  }
+
+  options = options || {}
+
+  var strict = options.strict
+  var end = options.end !== false
+  var route = ''
+
+  // Iterate over the tokens and create our regexp string.
+  for (var i = 0; i < tokens.length; i++) {
+    var token = tokens[i]
+
+    if (typeof token === 'string') {
+      route += escapeString(token)
+    } else {
+      var prefix = escapeString(token.prefix)
+      var capture = '(?:' + token.pattern + ')'
+
+      keys.push(token)
+
+      if (token.repeat) {
+        capture += '(?:' + prefix + capture + ')*'
+      }
+
+      if (token.optional) {
+        if (!token.partial) {
+          capture = '(?:' + prefix + '(' + capture + '))?'
+        } else {
+          capture = prefix + '(' + capture + ')?'
+        }
+      } else {
+        capture = prefix + '(' + capture + ')'
+      }
+
+      route += capture
+    }
+  }
+
+  var delimiter = escapeString(options.delimiter || '/')
+  var endsWithDelimiter = route.slice(-delimiter.length) === delimiter
+
+  // In non-strict mode we allow a slash at the end of match. If the path to
+  // match already ends with a slash, we remove it for consistency. The slash
+  // is valid at the end of a path match, not in the middle. This is important
+  // in non-ending mode, where "/test/" shouldn't match "/test//route".
+  if (!strict) {
+    route = (endsWithDelimiter ? route.slice(0, -delimiter.length) : route) + '(?:' + delimiter + '(?=$))?'
+  }
+
+  if (end) {
+    route += '$'
+  } else {
+    // In non-ending mode, we need the capturing groups to match as much as
+    // possible by using a positive lookahead to the end or next path segment.
+    route += strict && endsWithDelimiter ? '' : '(?=' + delimiter + '|$)'
+  }
+
+  return attachKeys(new RegExp('^' + route, flags(options)), keys)
+}
+
+/**
+ * Normalize the given path string, returning a regular expression.
+ *
+ * An empty array can be passed in for the keys, which will hold the
+ * placeholder key descriptions. For example, using `/user/:id`, `keys` will
+ * contain `[{ name: 'id', delimiter: '/', optional: false, repeat: false }]`.
+ *
+ * @param  {(string|RegExp|Array)} path
+ * @param  {(Array|Object)=}       keys
+ * @param  {Object=}               options
+ * @return {!RegExp}
+ */
+function pathToRegexp (path, keys, options) {
+  if (!isarray(keys)) {
+    options = /** @type {!Object} */ (keys || options)
+    keys = []
+  }
+
+  options = options || {}
+
+  if (path instanceof RegExp) {
+    return regexpToRegexp(path, /** @type {!Array} */ (keys))
+  }
+
+  if (isarray(path)) {
+    return arrayToRegexp(/** @type {!Array} */ (path), /** @type {!Array} */ (keys), options)
+  }
+
+  return stringToRegexp(/** @type {string} */ (path), /** @type {!Array} */ (keys), options)
+}
+
+},{"isarray":114}],130:[function(require,module,exports){
+'use strict';
+module.exports = {
+	stdout: false,
+	stderr: false
+};
+
+},{}],131:[function(require,module,exports){
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(global.typeDetect = factory());
+}(this, (function () { 'use strict';
+
+/* !
+ * type-detect
+ * Copyright(c) 2013 jake luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+var promiseExists = typeof Promise === 'function';
+
+/* eslint-disable no-undef */
+var globalObject = typeof self === 'object' ? self : global; // eslint-disable-line id-blacklist
+
+var symbolExists = typeof Symbol !== 'undefined';
+var mapExists = typeof Map !== 'undefined';
+var setExists = typeof Set !== 'undefined';
+var weakMapExists = typeof WeakMap !== 'undefined';
+var weakSetExists = typeof WeakSet !== 'undefined';
+var dataViewExists = typeof DataView !== 'undefined';
+var symbolIteratorExists = symbolExists && typeof Symbol.iterator !== 'undefined';
+var symbolToStringTagExists = symbolExists && typeof Symbol.toStringTag !== 'undefined';
+var setEntriesExists = setExists && typeof Set.prototype.entries === 'function';
+var mapEntriesExists = mapExists && typeof Map.prototype.entries === 'function';
+var setIteratorPrototype = setEntriesExists && Object.getPrototypeOf(new Set().entries());
+var mapIteratorPrototype = mapEntriesExists && Object.getPrototypeOf(new Map().entries());
+var arrayIteratorExists = symbolIteratorExists && typeof Array.prototype[Symbol.iterator] === 'function';
+var arrayIteratorPrototype = arrayIteratorExists && Object.getPrototypeOf([][Symbol.iterator]());
+var stringIteratorExists = symbolIteratorExists && typeof String.prototype[Symbol.iterator] === 'function';
+var stringIteratorPrototype = stringIteratorExists && Object.getPrototypeOf(''[Symbol.iterator]());
+var toStringLeftSliceLength = 8;
+var toStringRightSliceLength = -1;
+/**
+ * ### typeOf (obj)
+ *
+ * Uses `Object.prototype.toString` to determine the type of an object,
+ * normalising behaviour across engine versions & well optimised.
+ *
+ * @param {Mixed} object
+ * @return {String} object type
+ * @api public
+ */
+function typeDetect(obj) {
+  /* ! Speed optimisation
+   * Pre:
+   *   string literal     x 3,039,035 ops/sec ±1.62% (78 runs sampled)
+   *   boolean literal    x 1,424,138 ops/sec ±4.54% (75 runs sampled)
+   *   number literal     x 1,653,153 ops/sec ±1.91% (82 runs sampled)
+   *   undefined          x 9,978,660 ops/sec ±1.92% (75 runs sampled)
+   *   function           x 2,556,769 ops/sec ±1.73% (77 runs sampled)
+   * Post:
+   *   string literal     x 38,564,796 ops/sec ±1.15% (79 runs sampled)
+   *   boolean literal    x 31,148,940 ops/sec ±1.10% (79 runs sampled)
+   *   number literal     x 32,679,330 ops/sec ±1.90% (78 runs sampled)
+   *   undefined          x 32,363,368 ops/sec ±1.07% (82 runs sampled)
+   *   function           x 31,296,870 ops/sec ±0.96% (83 runs sampled)
+   */
+  var typeofObj = typeof obj;
+  if (typeofObj !== 'object') {
+    return typeofObj;
+  }
+
+  /* ! Speed optimisation
+   * Pre:
+   *   null               x 28,645,765 ops/sec ±1.17% (82 runs sampled)
+   * Post:
+   *   null               x 36,428,962 ops/sec ±1.37% (84 runs sampled)
+   */
+  if (obj === null) {
+    return 'null';
+  }
+
+  /* ! Spec Conformance
+   * Test: `Object.prototype.toString.call(window)``
+   *  - Node === "[object global]"
+   *  - Chrome === "[object global]"
+   *  - Firefox === "[object Window]"
+   *  - PhantomJS === "[object Window]"
+   *  - Safari === "[object Window]"
+   *  - IE 11 === "[object Window]"
+   *  - IE Edge === "[object Window]"
+   * Test: `Object.prototype.toString.call(this)``
+   *  - Chrome Worker === "[object global]"
+   *  - Firefox Worker === "[object DedicatedWorkerGlobalScope]"
+   *  - Safari Worker === "[object DedicatedWorkerGlobalScope]"
+   *  - IE 11 Worker === "[object WorkerGlobalScope]"
+   *  - IE Edge Worker === "[object WorkerGlobalScope]"
+   */
+  if (obj === globalObject) {
+    return 'global';
+  }
+
+  /* ! Speed optimisation
+   * Pre:
+   *   array literal      x 2,888,352 ops/sec ±0.67% (82 runs sampled)
+   * Post:
+   *   array literal      x 22,479,650 ops/sec ±0.96% (81 runs sampled)
+   */
+  if (
+    Array.isArray(obj) &&
+    (symbolToStringTagExists === false || !(Symbol.toStringTag in obj))
+  ) {
+    return 'Array';
+  }
+
+  // Not caching existence of `window` and related properties due to potential
+  // for `window` to be unset before tests in quasi-browser environments.
+  if (typeof window === 'object' && window !== null) {
+    /* ! Spec Conformance
+     * (https://html.spec.whatwg.org/multipage/browsers.html#location)
+     * WhatWG HTML$7.7.3 - The `Location` interface
+     * Test: `Object.prototype.toString.call(window.location)``
+     *  - IE <=11 === "[object Object]"
+     *  - IE Edge <=13 === "[object Object]"
+     */
+    if (typeof window.location === 'object' && obj === window.location) {
+      return 'Location';
+    }
+
+    /* ! Spec Conformance
+     * (https://html.spec.whatwg.org/#document)
+     * WhatWG HTML$3.1.1 - The `Document` object
+     * Note: Most browsers currently adher to the W3C DOM Level 2 spec
+     *       (https://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-26809268)
+     *       which suggests that browsers should use HTMLTableCellElement for
+     *       both TD and TH elements. WhatWG separates these.
+     *       WhatWG HTML states:
+     *         > For historical reasons, Window objects must also have a
+     *         > writable, configurable, non-enumerable property named
+     *         > HTMLDocument whose value is the Document interface object.
+     * Test: `Object.prototype.toString.call(document)``
+     *  - Chrome === "[object HTMLDocument]"
+     *  - Firefox === "[object HTMLDocument]"
+     *  - Safari === "[object HTMLDocument]"
+     *  - IE <=10 === "[object Document]"
+     *  - IE 11 === "[object HTMLDocument]"
+     *  - IE Edge <=13 === "[object HTMLDocument]"
+     */
+    if (typeof window.document === 'object' && obj === window.document) {
+      return 'Document';
+    }
+
+    if (typeof window.navigator === 'object') {
+      /* ! Spec Conformance
+       * (https://html.spec.whatwg.org/multipage/webappapis.html#mimetypearray)
+       * WhatWG HTML$8.6.1.5 - Plugins - Interface MimeTypeArray
+       * Test: `Object.prototype.toString.call(navigator.mimeTypes)``
+       *  - IE <=10 === "[object MSMimeTypesCollection]"
+       */
+      if (typeof window.navigator.mimeTypes === 'object' &&
+          obj === window.navigator.mimeTypes) {
+        return 'MimeTypeArray';
+      }
+
+      /* ! Spec Conformance
+       * (https://html.spec.whatwg.org/multipage/webappapis.html#pluginarray)
+       * WhatWG HTML$8.6.1.5 - Plugins - Interface PluginArray
+       * Test: `Object.prototype.toString.call(navigator.plugins)``
+       *  - IE <=10 === "[object MSPluginsCollection]"
+       */
+      if (typeof window.navigator.plugins === 'object' &&
+          obj === window.navigator.plugins) {
+        return 'PluginArray';
+      }
+    }
+
+    if ((typeof window.HTMLElement === 'function' ||
+        typeof window.HTMLElement === 'object') &&
+        obj instanceof window.HTMLElement) {
+      /* ! Spec Conformance
+      * (https://html.spec.whatwg.org/multipage/webappapis.html#pluginarray)
+      * WhatWG HTML$4.4.4 - The `blockquote` element - Interface `HTMLQuoteElement`
+      * Test: `Object.prototype.toString.call(document.createElement('blockquote'))``
+      *  - IE <=10 === "[object HTMLBlockElement]"
+      */
+      if (obj.tagName === 'BLOCKQUOTE') {
+        return 'HTMLQuoteElement';
+      }
+
+      /* ! Spec Conformance
+       * (https://html.spec.whatwg.org/#htmltabledatacellelement)
+       * WhatWG HTML$4.9.9 - The `td` element - Interface `HTMLTableDataCellElement`
+       * Note: Most browsers currently adher to the W3C DOM Level 2 spec
+       *       (https://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-82915075)
+       *       which suggests that browsers should use HTMLTableCellElement for
+       *       both TD and TH elements. WhatWG separates these.
+       * Test: Object.prototype.toString.call(document.createElement('td'))
+       *  - Chrome === "[object HTMLTableCellElement]"
+       *  - Firefox === "[object HTMLTableCellElement]"
+       *  - Safari === "[object HTMLTableCellElement]"
+       */
+      if (obj.tagName === 'TD') {
+        return 'HTMLTableDataCellElement';
+      }
+
+      /* ! Spec Conformance
+       * (https://html.spec.whatwg.org/#htmltableheadercellelement)
+       * WhatWG HTML$4.9.9 - The `td` element - Interface `HTMLTableHeaderCellElement`
+       * Note: Most browsers currently adher to the W3C DOM Level 2 spec
+       *       (https://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-82915075)
+       *       which suggests that browsers should use HTMLTableCellElement for
+       *       both TD and TH elements. WhatWG separates these.
+       * Test: Object.prototype.toString.call(document.createElement('th'))
+       *  - Chrome === "[object HTMLTableCellElement]"
+       *  - Firefox === "[object HTMLTableCellElement]"
+       *  - Safari === "[object HTMLTableCellElement]"
+       */
+      if (obj.tagName === 'TH') {
+        return 'HTMLTableHeaderCellElement';
+      }
+    }
+  }
+
+  /* ! Speed optimisation
+  * Pre:
+  *   Float64Array       x 625,644 ops/sec ±1.58% (80 runs sampled)
+  *   Float32Array       x 1,279,852 ops/sec ±2.91% (77 runs sampled)
+  *   Uint32Array        x 1,178,185 ops/sec ±1.95% (83 runs sampled)
+  *   Uint16Array        x 1,008,380 ops/sec ±2.25% (80 runs sampled)
+  *   Uint8Array         x 1,128,040 ops/sec ±2.11% (81 runs sampled)
+  *   Int32Array         x 1,170,119 ops/sec ±2.88% (80 runs sampled)
+  *   Int16Array         x 1,176,348 ops/sec ±5.79% (86 runs sampled)
+  *   Int8Array          x 1,058,707 ops/sec ±4.94% (77 runs sampled)
+  *   Uint8ClampedArray  x 1,110,633 ops/sec ±4.20% (80 runs sampled)
+  * Post:
+  *   Float64Array       x 7,105,671 ops/sec ±13.47% (64 runs sampled)
+  *   Float32Array       x 5,887,912 ops/sec ±1.46% (82 runs sampled)
+  *   Uint32Array        x 6,491,661 ops/sec ±1.76% (79 runs sampled)
+  *   Uint16Array        x 6,559,795 ops/sec ±1.67% (82 runs sampled)
+  *   Uint8Array         x 6,463,966 ops/sec ±1.43% (85 runs sampled)
+  *   Int32Array         x 5,641,841 ops/sec ±3.49% (81 runs sampled)
+  *   Int16Array         x 6,583,511 ops/sec ±1.98% (80 runs sampled)
+  *   Int8Array          x 6,606,078 ops/sec ±1.74% (81 runs sampled)
+  *   Uint8ClampedArray  x 6,602,224 ops/sec ±1.77% (83 runs sampled)
+  */
+  var stringTag = (symbolToStringTagExists && obj[Symbol.toStringTag]);
+  if (typeof stringTag === 'string') {
+    return stringTag;
+  }
+
+  var objPrototype = Object.getPrototypeOf(obj);
+  /* ! Speed optimisation
+  * Pre:
+  *   regex literal      x 1,772,385 ops/sec ±1.85% (77 runs sampled)
+  *   regex constructor  x 2,143,634 ops/sec ±2.46% (78 runs sampled)
+  * Post:
+  *   regex literal      x 3,928,009 ops/sec ±0.65% (78 runs sampled)
+  *   regex constructor  x 3,931,108 ops/sec ±0.58% (84 runs sampled)
+  */
+  if (objPrototype === RegExp.prototype) {
+    return 'RegExp';
+  }
+
+  /* ! Speed optimisation
+  * Pre:
+  *   date               x 2,130,074 ops/sec ±4.42% (68 runs sampled)
+  * Post:
+  *   date               x 3,953,779 ops/sec ±1.35% (77 runs sampled)
+  */
+  if (objPrototype === Date.prototype) {
+    return 'Date';
+  }
+
+  /* ! Spec Conformance
+   * (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-promise.prototype-@@tostringtag)
+   * ES6$25.4.5.4 - Promise.prototype[@@toStringTag] should be "Promise":
+   * Test: `Object.prototype.toString.call(Promise.resolve())``
+   *  - Chrome <=47 === "[object Object]"
+   *  - Edge <=20 === "[object Object]"
+   *  - Firefox 29-Latest === "[object Promise]"
+   *  - Safari 7.1-Latest === "[object Promise]"
+   */
+  if (promiseExists && objPrototype === Promise.prototype) {
+    return 'Promise';
+  }
+
+  /* ! Speed optimisation
+  * Pre:
+  *   set                x 2,222,186 ops/sec ±1.31% (82 runs sampled)
+  * Post:
+  *   set                x 4,545,879 ops/sec ±1.13% (83 runs sampled)
+  */
+  if (setExists && objPrototype === Set.prototype) {
+    return 'Set';
+  }
+
+  /* ! Speed optimisation
+  * Pre:
+  *   map                x 2,396,842 ops/sec ±1.59% (81 runs sampled)
+  * Post:
+  *   map                x 4,183,945 ops/sec ±6.59% (82 runs sampled)
+  */
+  if (mapExists && objPrototype === Map.prototype) {
+    return 'Map';
+  }
+
+  /* ! Speed optimisation
+  * Pre:
+  *   weakset            x 1,323,220 ops/sec ±2.17% (76 runs sampled)
+  * Post:
+  *   weakset            x 4,237,510 ops/sec ±2.01% (77 runs sampled)
+  */
+  if (weakSetExists && objPrototype === WeakSet.prototype) {
+    return 'WeakSet';
+  }
+
+  /* ! Speed optimisation
+  * Pre:
+  *   weakmap            x 1,500,260 ops/sec ±2.02% (78 runs sampled)
+  * Post:
+  *   weakmap            x 3,881,384 ops/sec ±1.45% (82 runs sampled)
+  */
+  if (weakMapExists && objPrototype === WeakMap.prototype) {
+    return 'WeakMap';
+  }
+
+  /* ! Spec Conformance
+   * (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-dataview.prototype-@@tostringtag)
+   * ES6$24.2.4.21 - DataView.prototype[@@toStringTag] should be "DataView":
+   * Test: `Object.prototype.toString.call(new DataView(new ArrayBuffer(1)))``
+   *  - Edge <=13 === "[object Object]"
+   */
+  if (dataViewExists && objPrototype === DataView.prototype) {
+    return 'DataView';
+  }
+
+  /* ! Spec Conformance
+   * (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-%mapiteratorprototype%-@@tostringtag)
+   * ES6$23.1.5.2.2 - %MapIteratorPrototype%[@@toStringTag] should be "Map Iterator":
+   * Test: `Object.prototype.toString.call(new Map().entries())``
+   *  - Edge <=13 === "[object Object]"
+   */
+  if (mapExists && objPrototype === mapIteratorPrototype) {
+    return 'Map Iterator';
+  }
+
+  /* ! Spec Conformance
+   * (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-%setiteratorprototype%-@@tostringtag)
+   * ES6$23.2.5.2.2 - %SetIteratorPrototype%[@@toStringTag] should be "Set Iterator":
+   * Test: `Object.prototype.toString.call(new Set().entries())``
+   *  - Edge <=13 === "[object Object]"
+   */
+  if (setExists && objPrototype === setIteratorPrototype) {
+    return 'Set Iterator';
+  }
+
+  /* ! Spec Conformance
+   * (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-%arrayiteratorprototype%-@@tostringtag)
+   * ES6$22.1.5.2.2 - %ArrayIteratorPrototype%[@@toStringTag] should be "Array Iterator":
+   * Test: `Object.prototype.toString.call([][Symbol.iterator]())``
+   *  - Edge <=13 === "[object Object]"
+   */
+  if (arrayIteratorExists && objPrototype === arrayIteratorPrototype) {
+    return 'Array Iterator';
+  }
+
+  /* ! Spec Conformance
+   * (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-%stringiteratorprototype%-@@tostringtag)
+   * ES6$21.1.5.2.2 - %StringIteratorPrototype%[@@toStringTag] should be "String Iterator":
+   * Test: `Object.prototype.toString.call(''[Symbol.iterator]())``
+   *  - Edge <=13 === "[object Object]"
+   */
+  if (stringIteratorExists && objPrototype === stringIteratorPrototype) {
+    return 'String Iterator';
+  }
+
+  /* ! Speed optimisation
+  * Pre:
+  *   object from null   x 2,424,320 ops/sec ±1.67% (76 runs sampled)
+  * Post:
+  *   object from null   x 5,838,000 ops/sec ±0.99% (84 runs sampled)
+  */
+  if (objPrototype === null) {
+    return 'Object';
+  }
+
+  return Object
+    .prototype
+    .toString
+    .call(obj)
+    .slice(toStringLeftSliceLength, toStringRightSliceLength);
+}
+
+return typeDetect;
+
+})));
+
+},{}],132:[function(require,module,exports){
+if (typeof Object.create === 'function') {
+  // implementation from standard node.js 'util' module
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    ctor.prototype = Object.create(superCtor.prototype, {
+      constructor: {
+        value: ctor,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+  };
+} else {
+  // old school shim for old browsers
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    var TempCtor = function () {}
+    TempCtor.prototype = superCtor.prototype
+    ctor.prototype = new TempCtor()
+    ctor.prototype.constructor = ctor
+  }
+}
+
+},{}],133:[function(require,module,exports){
+module.exports = function isBuffer(arg) {
+  return arg && typeof arg === 'object'
+    && typeof arg.copy === 'function'
+    && typeof arg.fill === 'function'
+    && typeof arg.readUInt8 === 'function';
+}
+},{}],134:[function(require,module,exports){
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var formatRegExp = /%[sdj%]/g;
+exports.format = function(f) {
+  if (!isString(f)) {
+    var objects = [];
+    for (var i = 0; i < arguments.length; i++) {
+      objects.push(inspect(arguments[i]));
+    }
+    return objects.join(' ');
+  }
+
+  var i = 1;
+  var args = arguments;
+  var len = args.length;
+  var str = String(f).replace(formatRegExp, function(x) {
+    if (x === '%%') return '%';
+    if (i >= len) return x;
+    switch (x) {
+      case '%s': return String(args[i++]);
+      case '%d': return Number(args[i++]);
+      case '%j':
+        try {
+          return JSON.stringify(args[i++]);
+        } catch (_) {
+          return '[Circular]';
+        }
+      default:
+        return x;
+    }
+  });
+  for (var x = args[i]; i < len; x = args[++i]) {
+    if (isNull(x) || !isObject(x)) {
+      str += ' ' + x;
+    } else {
+      str += ' ' + inspect(x);
+    }
+  }
+  return str;
+};
+
+
+// Mark that a method should not be used.
+// Returns a modified function which warns once by default.
+// If --no-deprecation is set, then it is a no-op.
+exports.deprecate = function(fn, msg) {
+  // Allow for deprecating things in the process of starting up.
+  if (isUndefined(global.process)) {
+    return function() {
+      return exports.deprecate(fn, msg).apply(this, arguments);
+    };
+  }
+
+  if (process.noDeprecation === true) {
+    return fn;
+  }
+
+  var warned = false;
+  function deprecated() {
+    if (!warned) {
+      if (process.throwDeprecation) {
+        throw new Error(msg);
+      } else if (process.traceDeprecation) {
+        console.trace(msg);
+      } else {
+        console.error(msg);
+      }
+      warned = true;
+    }
+    return fn.apply(this, arguments);
+  }
+
+  return deprecated;
+};
+
+
+var debugs = {};
+var debugEnviron;
+exports.debuglog = function(set) {
+  if (isUndefined(debugEnviron))
+    debugEnviron = process.env.NODE_DEBUG || '';
+  set = set.toUpperCase();
+  if (!debugs[set]) {
+    if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
+      var pid = process.pid;
+      debugs[set] = function() {
+        var msg = exports.format.apply(exports, arguments);
+        console.error('%s %d: %s', set, pid, msg);
+      };
+    } else {
+      debugs[set] = function() {};
+    }
+  }
+  return debugs[set];
+};
+
+
+/**
+ * Echos the value of a value. Trys to print the value out
+ * in the best way possible given the different types.
+ *
+ * @param {Object} obj The object to print out.
+ * @param {Object} opts Optional options object that alters the output.
+ */
+/* legacy: obj, showHidden, depth, colors*/
+function inspect(obj, opts) {
+  // default options
+  var ctx = {
+    seen: [],
+    stylize: stylizeNoColor
+  };
+  // legacy...
+  if (arguments.length >= 3) ctx.depth = arguments[2];
+  if (arguments.length >= 4) ctx.colors = arguments[3];
+  if (isBoolean(opts)) {
+    // legacy...
+    ctx.showHidden = opts;
+  } else if (opts) {
+    // got an "options" object
+    exports._extend(ctx, opts);
+  }
+  // set default options
+  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
+  if (isUndefined(ctx.depth)) ctx.depth = 2;
+  if (isUndefined(ctx.colors)) ctx.colors = false;
+  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
+  if (ctx.colors) ctx.stylize = stylizeWithColor;
+  return formatValue(ctx, obj, ctx.depth);
+}
+exports.inspect = inspect;
+
+
+// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
+inspect.colors = {
+  'bold' : [1, 22],
+  'italic' : [3, 23],
+  'underline' : [4, 24],
+  'inverse' : [7, 27],
+  'white' : [37, 39],
+  'grey' : [90, 39],
+  'black' : [30, 39],
+  'blue' : [34, 39],
+  'cyan' : [36, 39],
+  'green' : [32, 39],
+  'magenta' : [35, 39],
+  'red' : [31, 39],
+  'yellow' : [33, 39]
+};
+
+// Don't use 'blue' not visible on cmd.exe
+inspect.styles = {
+  'special': 'cyan',
+  'number': 'yellow',
+  'boolean': 'yellow',
+  'undefined': 'grey',
+  'null': 'bold',
+  'string': 'green',
+  'date': 'magenta',
+  // "name": intentionally not styling
+  'regexp': 'red'
+};
+
+
+function stylizeWithColor(str, styleType) {
+  var style = inspect.styles[styleType];
+
+  if (style) {
+    return '\u001b[' + inspect.colors[style][0] + 'm' + str +
+           '\u001b[' + inspect.colors[style][1] + 'm';
+  } else {
+    return str;
+  }
+}
+
+
+function stylizeNoColor(str, styleType) {
+  return str;
+}
+
+
+function arrayToHash(array) {
+  var hash = {};
+
+  array.forEach(function(val, idx) {
+    hash[val] = true;
+  });
+
+  return hash;
+}
+
+
+function formatValue(ctx, value, recurseTimes) {
+  // Provide a hook for user-specified inspect functions.
+  // Check that value is an object with an inspect function on it
+  if (ctx.customInspect &&
+      value &&
+      isFunction(value.inspect) &&
+      // Filter out the util module, it's inspect function is special
+      value.inspect !== exports.inspect &&
+      // Also filter out any prototype objects using the circular check.
+      !(value.constructor && value.constructor.prototype === value)) {
+    var ret = value.inspect(recurseTimes, ctx);
+    if (!isString(ret)) {
+      ret = formatValue(ctx, ret, recurseTimes);
+    }
+    return ret;
+  }
+
+  // Primitive types cannot have properties
+  var primitive = formatPrimitive(ctx, value);
+  if (primitive) {
+    return primitive;
+  }
+
+  // Look up the keys of the object.
+  var keys = Object.keys(value);
+  var visibleKeys = arrayToHash(keys);
+
+  if (ctx.showHidden) {
+    keys = Object.getOwnPropertyNames(value);
+  }
+
+  // IE doesn't make error fields non-enumerable
+  // http://msdn.microsoft.com/en-us/library/ie/dww52sbt(v=vs.94).aspx
+  if (isError(value)
+      && (keys.indexOf('message') >= 0 || keys.indexOf('description') >= 0)) {
+    return formatError(value);
+  }
+
+  // Some type of object without properties can be shortcutted.
+  if (keys.length === 0) {
+    if (isFunction(value)) {
+      var name = value.name ? ': ' + value.name : '';
+      return ctx.stylize('[Function' + name + ']', 'special');
+    }
+    if (isRegExp(value)) {
+      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+    }
+    if (isDate(value)) {
+      return ctx.stylize(Date.prototype.toString.call(value), 'date');
+    }
+    if (isError(value)) {
+      return formatError(value);
+    }
+  }
+
+  var base = '', array = false, braces = ['{', '}'];
+
+  // Make Array say that they are Array
+  if (isArray(value)) {
+    array = true;
+    braces = ['[', ']'];
+  }
+
+  // Make functions say that they are functions
+  if (isFunction(value)) {
+    var n = value.name ? ': ' + value.name : '';
+    base = ' [Function' + n + ']';
+  }
+
+  // Make RegExps say that they are RegExps
+  if (isRegExp(value)) {
+    base = ' ' + RegExp.prototype.toString.call(value);
+  }
+
+  // Make dates with properties first say the date
+  if (isDate(value)) {
+    base = ' ' + Date.prototype.toUTCString.call(value);
+  }
+
+  // Make error with message first say the error
+  if (isError(value)) {
+    base = ' ' + formatError(value);
+  }
+
+  if (keys.length === 0 && (!array || value.length == 0)) {
+    return braces[0] + base + braces[1];
+  }
+
+  if (recurseTimes < 0) {
+    if (isRegExp(value)) {
+      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+    } else {
+      return ctx.stylize('[Object]', 'special');
+    }
+  }
+
+  ctx.seen.push(value);
+
+  var output;
+  if (array) {
+    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
+  } else {
+    output = keys.map(function(key) {
+      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+    });
+  }
+
+  ctx.seen.pop();
+
+  return reduceToSingleString(output, base, braces);
+}
+
+
+function formatPrimitive(ctx, value) {
+  if (isUndefined(value))
+    return ctx.stylize('undefined', 'undefined');
+  if (isString(value)) {
+    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
+                                             .replace(/'/g, "\\'")
+                                             .replace(/\\"/g, '"') + '\'';
+    return ctx.stylize(simple, 'string');
+  }
+  if (isNumber(value))
+    return ctx.stylize('' + value, 'number');
+  if (isBoolean(value))
+    return ctx.stylize('' + value, 'boolean');
+  // For some reason typeof null is "object", so special case here.
+  if (isNull(value))
+    return ctx.stylize('null', 'null');
+}
+
+
+function formatError(value) {
+  return '[' + Error.prototype.toString.call(value) + ']';
+}
+
+
+function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
+  var output = [];
+  for (var i = 0, l = value.length; i < l; ++i) {
+    if (hasOwnProperty(value, String(i))) {
+      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+          String(i), true));
+    } else {
+      output.push('');
+    }
+  }
+  keys.forEach(function(key) {
+    if (!key.match(/^\d+$/)) {
+      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+          key, true));
+    }
+  });
+  return output;
+}
+
+
+function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+  var name, str, desc;
+  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
+  if (desc.get) {
+    if (desc.set) {
+      str = ctx.stylize('[Getter/Setter]', 'special');
+    } else {
+      str = ctx.stylize('[Getter]', 'special');
+    }
+  } else {
+    if (desc.set) {
+      str = ctx.stylize('[Setter]', 'special');
+    }
+  }
+  if (!hasOwnProperty(visibleKeys, key)) {
+    name = '[' + key + ']';
+  }
+  if (!str) {
+    if (ctx.seen.indexOf(desc.value) < 0) {
+      if (isNull(recurseTimes)) {
+        str = formatValue(ctx, desc.value, null);
+      } else {
+        str = formatValue(ctx, desc.value, recurseTimes - 1);
+      }
+      if (str.indexOf('\n') > -1) {
+        if (array) {
+          str = str.split('\n').map(function(line) {
+            return '  ' + line;
+          }).join('\n').substr(2);
+        } else {
+          str = '\n' + str.split('\n').map(function(line) {
+            return '   ' + line;
+          }).join('\n');
+        }
+      }
+    } else {
+      str = ctx.stylize('[Circular]', 'special');
+    }
+  }
+  if (isUndefined(name)) {
+    if (array && key.match(/^\d+$/)) {
+      return str;
+    }
+    name = JSON.stringify('' + key);
+    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+      name = name.substr(1, name.length - 2);
+      name = ctx.stylize(name, 'name');
+    } else {
+      name = name.replace(/'/g, "\\'")
+                 .replace(/\\"/g, '"')
+                 .replace(/(^"|"$)/g, "'");
+      name = ctx.stylize(name, 'string');
+    }
+  }
+
+  return name + ': ' + str;
+}
+
+
+function reduceToSingleString(output, base, braces) {
+  var numLinesEst = 0;
+  var length = output.reduce(function(prev, cur) {
+    numLinesEst++;
+    if (cur.indexOf('\n') >= 0) numLinesEst++;
+    return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
+  }, 0);
+
+  if (length > 60) {
+    return braces[0] +
+           (base === '' ? '' : base + '\n ') +
+           ' ' +
+           output.join(',\n  ') +
+           ' ' +
+           braces[1];
+  }
+
+  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+}
+
+
+// NOTE: These type checking functions intentionally don't use `instanceof`
+// because it is fragile and can be easily faked with `Object.create()`.
+function isArray(ar) {
+  return Array.isArray(ar);
+}
+exports.isArray = isArray;
+
+function isBoolean(arg) {
+  return typeof arg === 'boolean';
+}
+exports.isBoolean = isBoolean;
+
+function isNull(arg) {
+  return arg === null;
+}
+exports.isNull = isNull;
+
+function isNullOrUndefined(arg) {
+  return arg == null;
+}
+exports.isNullOrUndefined = isNullOrUndefined;
+
+function isNumber(arg) {
+  return typeof arg === 'number';
+}
+exports.isNumber = isNumber;
+
+function isString(arg) {
+  return typeof arg === 'string';
+}
+exports.isString = isString;
+
+function isSymbol(arg) {
+  return typeof arg === 'symbol';
+}
+exports.isSymbol = isSymbol;
+
+function isUndefined(arg) {
+  return arg === void 0;
+}
+exports.isUndefined = isUndefined;
+
+function isRegExp(re) {
+  return isObject(re) && objectToString(re) === '[object RegExp]';
+}
+exports.isRegExp = isRegExp;
+
+function isObject(arg) {
+  return typeof arg === 'object' && arg !== null;
+}
+exports.isObject = isObject;
+
+function isDate(d) {
+  return isObject(d) && objectToString(d) === '[object Date]';
+}
+exports.isDate = isDate;
+
+function isError(e) {
+  return isObject(e) &&
+      (objectToString(e) === '[object Error]' || e instanceof Error);
+}
+exports.isError = isError;
+
+function isFunction(arg) {
+  return typeof arg === 'function';
+}
+exports.isFunction = isFunction;
+
+function isPrimitive(arg) {
+  return arg === null ||
+         typeof arg === 'boolean' ||
+         typeof arg === 'number' ||
+         typeof arg === 'string' ||
+         typeof arg === 'symbol' ||  // ES6 symbol
+         typeof arg === 'undefined';
+}
+exports.isPrimitive = isPrimitive;
+
+exports.isBuffer = require('./support/isBuffer');
+
+function objectToString(o) {
+  return Object.prototype.toString.call(o);
+}
+
+
+function pad(n) {
+  return n < 10 ? '0' + n.toString(10) : n.toString(10);
+}
+
+
+var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
+              'Oct', 'Nov', 'Dec'];
+
+// 26 Feb 16:19:34
+function timestamp() {
+  var d = new Date();
+  var time = [pad(d.getHours()),
+              pad(d.getMinutes()),
+              pad(d.getSeconds())].join(':');
+  return [d.getDate(), months[d.getMonth()], time].join(' ');
+}
+
+
+// log is just a thin wrapper to console.log that prepends a timestamp
+exports.log = function() {
+  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
+};
+
+
+/**
+ * Inherit the prototype methods from one constructor into another.
+ *
+ * The Function.prototype.inherits from lang.js rewritten as a standalone
+ * function (not on Function.prototype). NOTE: If this file is to be loaded
+ * during bootstrapping this function needs to be rewritten using some native
+ * functions as prototype setup using normal JavaScript does not work as
+ * expected during bootstrapping (see mirror.js in r114903).
+ *
+ * @param {function} ctor Constructor function which needs to inherit the
+ *     prototype.
+ * @param {function} superCtor Constructor function to inherit prototype from.
+ */
+exports.inherits = require('inherits');
+
+exports._extend = function(origin, add) {
+  // Don't do anything if add isn't an object
+  if (!add || !isObject(add)) return origin;
+
+  var keys = Object.keys(add);
+  var i = keys.length;
+  while (i--) {
+    origin[keys[i]] = add[keys[i]];
+  }
+  return origin;
+};
+
+function hasOwnProperty(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+}
+
+},{"./support/isBuffer":133,"inherits":132}]},{},[1])(1)
+});
+
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["node_modules/browser-pack/_prelude.js","lib/sinon.js","lib/sinon/assert.js","lib/sinon/behavior.js","lib/sinon/collect-own-methods.js","lib/sinon/color.js","lib/sinon/create-sandbox.js","lib/sinon/default-behaviors.js","lib/sinon/fake.js","lib/sinon/mock-expectation.js","lib/sinon/mock.js","lib/sinon/proxy-call-util.js","lib/sinon/proxy-call.js","lib/sinon/proxy-invoke.js","lib/sinon/proxy.js","lib/sinon/restore-object.js","lib/sinon/sandbox.js","lib/sinon/spy-formatters.js","lib/sinon/spy.js","lib/sinon/stub.js","lib/sinon/throw-on-falsy-object.js","lib/sinon/util/core/default-config.js","lib/sinon/util/core/export-async-behaviors.js","lib/sinon/util/core/extend.js","lib/sinon/util/core/format.js","lib/sinon/util/core/function-to-string.js","lib/sinon/util/core/get-next-tick.js","lib/sinon/util/core/get-property-descriptor.js","lib/sinon/util/core/is-es-module.js","lib/sinon/util/core/is-non-existent-property.js","lib/sinon/util/core/is-property-configurable.js","lib/sinon/util/core/next-tick.js","lib/sinon/util/core/times-in-words.js","lib/sinon/util/core/use-promise-library.js","lib/sinon/util/core/walk-object.js","lib/sinon/util/core/walk.js","lib/sinon/util/core/wrap-method.js","lib/sinon/util/fake-timers.js","node_modules/@sinonjs/commons/lib/called-in-order.js","node_modules/@sinonjs/commons/lib/class-name.js","node_modules/@sinonjs/commons/lib/deprecated.js","node_modules/@sinonjs/commons/lib/every.js","node_modules/@sinonjs/commons/lib/function-name.js","node_modules/@sinonjs/commons/lib/global.js","node_modules/@sinonjs/commons/lib/index.js","node_modules/@sinonjs/commons/lib/order-by-first-call.js","node_modules/@sinonjs/commons/lib/prototypes/array.js","node_modules/@sinonjs/commons/lib/prototypes/copy-prototype.js","node_modules/@sinonjs/commons/lib/prototypes/function.js","node_modules/@sinonjs/commons/lib/prototypes/index.js","node_modules/@sinonjs/commons/lib/prototypes/map.js","node_modules/@sinonjs/commons/lib/prototypes/object.js","node_modules/@sinonjs/commons/lib/prototypes/set.js","node_modules/@sinonjs/commons/lib/prototypes/string.js","node_modules/@sinonjs/commons/lib/type-of.js","node_modules/@sinonjs/commons/lib/value-to-string.js","node_modules/@sinonjs/fake-timers/src/fake-timers-src.js","node_modules/@sinonjs/formatio/lib/formatio.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/array-types.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/create-matcher.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/create-matcher/assert-matcher.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/create-matcher/assert-method-exists.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/create-matcher/assert-type.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/create-matcher/is-iterable.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/create-matcher/is-matcher.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/create-matcher/match-object.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/create-matcher/matcher-prototype.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/create-matcher/type-map.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/deep-equal.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/get-class.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/identical.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/is-arguments.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/is-array-type.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/is-date.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/is-element.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/is-map.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/is-nan.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/is-neg-zero.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/is-object.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/is-set.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/is-subset.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/iterable-to-string.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/match.js","node_modules/@sinonjs/formatio/node_modules/@sinonjs/samsam/lib/samsam.js","node_modules/@sinonjs/samsam/lib/create-matcher/match-object.js","node_modules/@sinonjs/text-encoding/index.js","node_modules/@sinonjs/text-encoding/lib/encoding-indexes.js","node_modules/@sinonjs/text-encoding/lib/encoding.js","node_modules/diff/dist/diff.js","node_modules/isarray/index.js","node_modules/just-extend/index.js","node_modules/lodash.get/index.js","node_modules/nise/lib/configure-logger/index.js","node_modules/nise/lib/event/custom-event.js","node_modules/nise/lib/event/event-target.js","node_modules/nise/lib/event/event.js","node_modules/nise/lib/event/index.js","node_modules/nise/lib/event/progress-event.js","node_modules/nise/lib/fake-server/fake-server-with-clock.js","node_modules/nise/lib/fake-server/index.js","node_modules/nise/lib/fake-server/log.js","node_modules/nise/lib/fake-xhr/blob.js","node_modules/nise/lib/fake-xhr/index.js","node_modules/nise/lib/index.js","node_modules/path-to-regexp/index.js","node_modules/supports-color/browser.js","node_modules/type-detect/type-detect.js","node_modules/util/node_modules/inherits/inherits_browser.js","node_modules/util/support/isBufferBrowser.js","node_modules/util/util.js"],"names":[],"mappings":"AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxNA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1PA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9QA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1GA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5TA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5TA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChaA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7GA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3KA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9NA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACXA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/GA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACZA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACXA;AACA;AACA;AACA;AACA;AACA;AACA;;ACNA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3JA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACdA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpCA;AACA;AACA;AACA;AACA;AACA;;ACLA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;;ACLA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACVA;AACA;AACA;AACA;AACA;AACA;;ACLA;AACA;AACA;AACA;AACA;AACA;;ACLA;AACA;AACA;AACA;AACA;AACA;;ACLA;AACA;AACA;AACA;AACA;AACA;;ACLA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACbA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtyCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjSA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3VA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACdA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACdA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACdA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACdA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9KA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;;AC1BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACvDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACTA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChvGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjjDA;AACA;AACA;AACA;;ACHA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACn6BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACdA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1HA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACRA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9UA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACTA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACz4BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1aA;AACA;AACA;AACA;AACA;AACA;;ACLA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpYA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;;ACLA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c=\"function\"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error(\"Cannot find module '\"+i+\"'\");throw a.code=\"MODULE_NOT_FOUND\",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u=\"function\"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()","\"use strict\";\n\nvar behavior = require(\"./sinon/behavior\");\nvar createSandbox = require(\"./sinon/create-sandbox\");\nvar extend = require(\"./sinon/util/core/extend\");\nvar fakeTimers = require(\"./sinon/util/fake-timers\");\nvar format = require(\"./sinon/util/core/format\");\nvar nise = require(\"nise\");\nvar Sandbox = require(\"./sinon/sandbox\");\nvar stub = require(\"./sinon/stub\");\n\nvar apiMethods = {\n    createSandbox: createSandbox,\n    assert: require(\"./sinon/assert\"),\n    match: require(\"@sinonjs/samsam\").createMatcher,\n    restoreObject: require(\"./sinon/restore-object\"),\n\n    expectation: require(\"./sinon/mock-expectation\"),\n    defaultConfig: require(\"./sinon/util/core/default-config\"),\n\n    setFormatter: format.setFormatter,\n\n    // fake timers\n    timers: fakeTimers.timers,\n\n    // fake XHR\n    xhr: nise.fakeXhr.xhr,\n    FakeXMLHttpRequest: nise.fakeXhr.FakeXMLHttpRequest,\n\n    // fake server\n    fakeServer: nise.fakeServer,\n    fakeServerWithClock: nise.fakeServerWithClock,\n    createFakeServer: nise.fakeServer.create.bind(nise.fakeServer),\n    createFakeServerWithClock: nise.fakeServerWithClock.create.bind(nise.fakeServerWithClock),\n\n    addBehavior: function(name, fn) {\n        behavior.addBehavior(stub, name, fn);\n    }\n};\n\nvar sandbox = new Sandbox();\n\nvar api = extend(sandbox, apiMethods);\n\nmodule.exports = api;\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar calledInOrder = require(\"@sinonjs/commons\").calledInOrder;\nvar createMatcher = require(\"@sinonjs/samsam\").createMatcher;\nvar orderByFirstCall = require(\"@sinonjs/commons\").orderByFirstCall;\nvar timesInWords = require(\"./util/core/times-in-words\");\nvar format = require(\"./util/core/format\");\nvar stringSlice = require(\"@sinonjs/commons\").prototypes.string.slice;\nvar globalObject = require(\"@sinonjs/commons\").global;\n\nvar arraySlice = arrayProto.slice;\nvar concat = arrayProto.concat;\nvar forEach = arrayProto.forEach;\nvar join = arrayProto.join;\nvar splice = arrayProto.splice;\n\nvar assert;\n\nfunction verifyIsStub() {\n    var args = arraySlice(arguments);\n\n    forEach(args, function(method) {\n        if (!method) {\n            assert.fail(\"fake is not a spy\");\n        }\n\n        if (method.proxy && method.proxy.isSinonProxy) {\n            verifyIsStub(method.proxy);\n        } else {\n            if (typeof method !== \"function\") {\n                assert.fail(method + \" is not a function\");\n            }\n\n            if (typeof method.getCall !== \"function\") {\n                assert.fail(method + \" is not stubbed\");\n            }\n        }\n    });\n}\n\nfunction verifyIsValidAssertion(assertionMethod, assertionArgs) {\n    switch (assertionMethod) {\n        case \"notCalled\":\n        case \"called\":\n        case \"calledOnce\":\n        case \"calledTwice\":\n        case \"calledThrice\":\n            if (assertionArgs.length !== 0) {\n                assert.fail(\n                    assertionMethod +\n                        \" takes 1 argument but was called with \" +\n                        (assertionArgs.length + 1) +\n                        \" arguments\"\n                );\n            }\n            break;\n        default:\n            break;\n    }\n}\n\nfunction failAssertion(object, msg) {\n    var obj = object || globalObject;\n    var failMethod = obj.fail || assert.fail;\n    failMethod.call(obj, msg);\n}\n\nfunction mirrorPropAsAssertion(name, method, message) {\n    var msg = message;\n    var meth = method;\n    if (arguments.length === 2) {\n        msg = method;\n        meth = name;\n    }\n\n    assert[name] = function(fake) {\n        verifyIsStub(fake);\n\n        var args = arraySlice(arguments, 1);\n        var failed = false;\n\n        verifyIsValidAssertion(name, args);\n\n        if (typeof meth === \"function\") {\n            failed = !meth(fake);\n        } else {\n            failed = typeof fake[meth] === \"function\" ? !fake[meth].apply(fake, args) : !fake[meth];\n        }\n\n        if (failed) {\n            failAssertion(this, (fake.printf || fake.proxy.printf).apply(fake, concat([msg], args)));\n        } else {\n            assert.pass(name);\n        }\n    };\n}\n\nfunction exposedName(prefix, prop) {\n    return !prefix || /^fail/.test(prop) ? prop : prefix + stringSlice(prop, 0, 1).toUpperCase() + stringSlice(prop, 1);\n}\n\nassert = {\n    failException: \"AssertError\",\n\n    fail: function fail(message) {\n        var error = new Error(message);\n        error.name = this.failException || assert.failException;\n\n        throw error;\n    },\n\n    pass: function pass() {\n        return;\n    },\n\n    callOrder: function assertCallOrder() {\n        verifyIsStub.apply(null, arguments);\n        var expected = \"\";\n        var actual = \"\";\n\n        if (!calledInOrder(arguments)) {\n            try {\n                expected = join(arguments, \", \");\n                var calls = arraySlice(arguments);\n                var i = calls.length;\n                while (i) {\n                    if (!calls[--i].called) {\n                        splice(calls, i, 1);\n                    }\n                }\n                actual = join(orderByFirstCall(calls), \", \");\n            } catch (e) {\n                // If this fails, we'll just fall back to the blank string\n            }\n\n            failAssertion(this, \"expected \" + expected + \" to be called in order but were called as \" + actual);\n        } else {\n            assert.pass(\"callOrder\");\n        }\n    },\n\n    callCount: function assertCallCount(method, count) {\n        verifyIsStub(method);\n\n        if (method.callCount !== count) {\n            var msg = \"expected %n to be called \" + timesInWords(count) + \" but was called %c%C\";\n            failAssertion(this, method.printf(msg));\n        } else {\n            assert.pass(\"callCount\");\n        }\n    },\n\n    expose: function expose(target, options) {\n        if (!target) {\n            throw new TypeError(\"target is null or undefined\");\n        }\n\n        var o = options || {};\n        var prefix = (typeof o.prefix === \"undefined\" && \"assert\") || o.prefix;\n        var includeFail = typeof o.includeFail === \"undefined\" || Boolean(o.includeFail);\n        var instance = this;\n\n        forEach(Object.keys(instance), function(method) {\n            if (method !== \"expose\" && (includeFail || !/^(fail)/.test(method))) {\n                target[exposedName(prefix, method)] = instance[method];\n            }\n        });\n\n        return target;\n    },\n\n    match: function match(actual, expectation) {\n        var matcher = createMatcher(expectation);\n        if (matcher.test(actual)) {\n            assert.pass(\"match\");\n        } else {\n            var formatted = [\n                \"expected value to match\",\n                \"    expected = \" + format(expectation),\n                \"    actual = \" + format(actual)\n            ];\n\n            failAssertion(this, join(formatted, \"\\n\"));\n        }\n    }\n};\n\nmirrorPropAsAssertion(\"called\", \"expected %n to have been called at least once but was never called\");\nmirrorPropAsAssertion(\n    \"notCalled\",\n    function(spy) {\n        return !spy.called;\n    },\n    \"expected %n to not have been called but was called %c%C\"\n);\nmirrorPropAsAssertion(\"calledOnce\", \"expected %n to be called once but was called %c%C\");\nmirrorPropAsAssertion(\"calledTwice\", \"expected %n to be called twice but was called %c%C\");\nmirrorPropAsAssertion(\"calledThrice\", \"expected %n to be called thrice but was called %c%C\");\nmirrorPropAsAssertion(\"calledOn\", \"expected %n to be called with %1 as this but was called with %t\");\nmirrorPropAsAssertion(\"alwaysCalledOn\", \"expected %n to always be called with %1 as this but was called with %t\");\nmirrorPropAsAssertion(\"calledWithNew\", \"expected %n to be called with new\");\nmirrorPropAsAssertion(\"alwaysCalledWithNew\", \"expected %n to always be called with new\");\nmirrorPropAsAssertion(\"calledWith\", \"expected %n to be called with arguments %D\");\nmirrorPropAsAssertion(\"calledWithMatch\", \"expected %n to be called with match %D\");\nmirrorPropAsAssertion(\"alwaysCalledWith\", \"expected %n to always be called with arguments %D\");\nmirrorPropAsAssertion(\"alwaysCalledWithMatch\", \"expected %n to always be called with match %D\");\nmirrorPropAsAssertion(\"calledWithExactly\", \"expected %n to be called with exact arguments %D\");\nmirrorPropAsAssertion(\"calledOnceWithExactly\", \"expected %n to be called once and with exact arguments %D\");\nmirrorPropAsAssertion(\"alwaysCalledWithExactly\", \"expected %n to always be called with exact arguments %D\");\nmirrorPropAsAssertion(\"neverCalledWith\", \"expected %n to never be called with arguments %*%C\");\nmirrorPropAsAssertion(\"neverCalledWithMatch\", \"expected %n to never be called with match %*%C\");\nmirrorPropAsAssertion(\"threw\", \"%n did not throw exception%C\");\nmirrorPropAsAssertion(\"alwaysThrew\", \"%n did not always throw exception%C\");\n\nmodule.exports = assert;\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar extend = require(\"./util/core/extend\");\nvar functionName = require(\"@sinonjs/commons\").functionName;\nvar nextTick = require(\"./util/core/next-tick\");\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\nvar exportAsyncBehaviors = require(\"./util/core/export-async-behaviors\");\n\nvar concat = arrayProto.concat;\nvar join = arrayProto.join;\nvar reverse = arrayProto.reverse;\nvar slice = arrayProto.slice;\n\nvar useLeftMostCallback = -1;\nvar useRightMostCallback = -2;\n\nfunction getCallback(behavior, args) {\n    var callArgAt = behavior.callArgAt;\n\n    if (callArgAt >= 0) {\n        return args[callArgAt];\n    }\n\n    var argumentList;\n\n    if (callArgAt === useLeftMostCallback) {\n        argumentList = args;\n    }\n\n    if (callArgAt === useRightMostCallback) {\n        argumentList = reverse(slice(args));\n    }\n\n    var callArgProp = behavior.callArgProp;\n\n    for (var i = 0, l = argumentList.length; i < l; ++i) {\n        if (!callArgProp && typeof argumentList[i] === \"function\") {\n            return argumentList[i];\n        }\n\n        if (callArgProp && argumentList[i] && typeof argumentList[i][callArgProp] === \"function\") {\n            return argumentList[i][callArgProp];\n        }\n    }\n\n    return null;\n}\n\nfunction getCallbackError(behavior, func, args) {\n    if (behavior.callArgAt < 0) {\n        var msg;\n\n        if (behavior.callArgProp) {\n            msg =\n                functionName(behavior.stub) +\n                \" expected to yield to '\" +\n                valueToString(behavior.callArgProp) +\n                \"', but no object with such a property was passed.\";\n        } else {\n            msg = functionName(behavior.stub) + \" expected to yield, but no callback was passed.\";\n        }\n\n        if (args.length > 0) {\n            msg += \" Received [\" + join(args, \", \") + \"]\";\n        }\n\n        return msg;\n    }\n\n    return \"argument at index \" + behavior.callArgAt + \" is not a function: \" + func;\n}\n\nfunction ensureArgs(name, behavior, args) {\n    // map function name to internal property\n    //   callsArg => callArgAt\n    var property = name.replace(/sArg/, \"ArgAt\");\n    var index = behavior[property];\n\n    if (index >= args.length) {\n        throw new TypeError(\n            name + \" failed: \" + (index + 1) + \" arguments required but only \" + args.length + \" present\"\n        );\n    }\n}\n\nfunction callCallback(behavior, args) {\n    if (typeof behavior.callArgAt === \"number\") {\n        ensureArgs(\"callsArg\", behavior, args);\n        var func = getCallback(behavior, args);\n\n        if (typeof func !== \"function\") {\n            throw new TypeError(getCallbackError(behavior, func, args));\n        }\n\n        if (behavior.callbackAsync) {\n            nextTick(function() {\n                func.apply(behavior.callbackContext, behavior.callbackArguments);\n            });\n        } else {\n            return func.apply(behavior.callbackContext, behavior.callbackArguments);\n        }\n    }\n\n    return undefined;\n}\n\nvar proto = {\n    create: function create(stub) {\n        var behavior = extend({}, proto);\n        delete behavior.create;\n        delete behavior.addBehavior;\n        delete behavior.createBehavior;\n        behavior.stub = stub;\n\n        if (stub.defaultBehavior && stub.defaultBehavior.promiseLibrary) {\n            behavior.promiseLibrary = stub.defaultBehavior.promiseLibrary;\n        }\n\n        return behavior;\n    },\n\n    isPresent: function isPresent() {\n        return (\n            typeof this.callArgAt === \"number\" ||\n            this.exception ||\n            this.exceptionCreator ||\n            typeof this.returnArgAt === \"number\" ||\n            this.returnThis ||\n            typeof this.resolveArgAt === \"number\" ||\n            this.resolveThis ||\n            typeof this.throwArgAt === \"number\" ||\n            this.fakeFn ||\n            this.returnValueDefined\n        );\n    },\n\n    /*eslint complexity: [\"error\", 20]*/\n    invoke: function invoke(context, args) {\n        /*\n         * callCallback (conditionally) calls ensureArgs\n         *\n         * Note: callCallback intentionally happens before\n         * everything else and cannot be moved lower\n         */\n        var returnValue = callCallback(this, args);\n\n        if (this.exception) {\n            throw this.exception;\n        } else if (this.exceptionCreator) {\n            this.exception = this.exceptionCreator();\n            this.exceptionCreator = undefined;\n            throw this.exception;\n        } else if (typeof this.returnArgAt === \"number\") {\n            ensureArgs(\"returnsArg\", this, args);\n            return args[this.returnArgAt];\n        } else if (this.returnThis) {\n            return context;\n        } else if (typeof this.throwArgAt === \"number\") {\n            ensureArgs(\"throwsArg\", this, args);\n            throw args[this.throwArgAt];\n        } else if (this.fakeFn) {\n            return this.fakeFn.apply(context, args);\n        } else if (typeof this.resolveArgAt === \"number\") {\n            ensureArgs(\"resolvesArg\", this, args);\n            return (this.promiseLibrary || Promise).resolve(args[this.resolveArgAt]);\n        } else if (this.resolveThis) {\n            return (this.promiseLibrary || Promise).resolve(context);\n        } else if (this.resolve) {\n            return (this.promiseLibrary || Promise).resolve(this.returnValue);\n        } else if (this.reject) {\n            return (this.promiseLibrary || Promise).reject(this.returnValue);\n        } else if (this.callsThrough) {\n            var wrappedMethod = this.effectiveWrappedMethod();\n\n            return wrappedMethod.apply(context, args);\n        } else if (this.callsThroughWithNew) {\n            // Get the original method (assumed to be a constructor in this case)\n            var WrappedClass = this.effectiveWrappedMethod();\n            // Turn the arguments object into a normal array\n            var argsArray = slice(args);\n            // Call the constructor\n            var F = WrappedClass.bind.apply(WrappedClass, concat([null], argsArray));\n            return new F();\n        } else if (typeof this.returnValue !== \"undefined\") {\n            return this.returnValue;\n        } else if (typeof this.callArgAt === \"number\") {\n            return returnValue;\n        }\n\n        return this.returnValue;\n    },\n\n    effectiveWrappedMethod: function effectiveWrappedMethod() {\n        for (var stubb = this.stub; stubb; stubb = stubb.parent) {\n            if (stubb.wrappedMethod) {\n                return stubb.wrappedMethod;\n            }\n        }\n        throw new Error(\"Unable to find wrapped method\");\n    },\n\n    onCall: function onCall(index) {\n        return this.stub.onCall(index);\n    },\n\n    onFirstCall: function onFirstCall() {\n        return this.stub.onFirstCall();\n    },\n\n    onSecondCall: function onSecondCall() {\n        return this.stub.onSecondCall();\n    },\n\n    onThirdCall: function onThirdCall() {\n        return this.stub.onThirdCall();\n    },\n\n    withArgs: function withArgs(/* arguments */) {\n        throw new Error(\n            'Defining a stub by invoking \"stub.onCall(...).withArgs(...)\" ' +\n                'is not supported. Use \"stub.withArgs(...).onCall(...)\" ' +\n                \"to define sequential behavior for calls with certain arguments.\"\n        );\n    }\n};\n\nfunction createBehavior(behaviorMethod) {\n    return function() {\n        this.defaultBehavior = this.defaultBehavior || proto.create(this);\n        this.defaultBehavior[behaviorMethod].apply(this.defaultBehavior, arguments);\n        return this;\n    };\n}\n\nfunction addBehavior(stub, name, fn) {\n    proto[name] = function() {\n        fn.apply(this, concat([this], slice(arguments)));\n        return this.stub || this;\n    };\n\n    stub[name] = createBehavior(name);\n}\n\nproto.addBehavior = addBehavior;\nproto.createBehavior = createBehavior;\n\nvar asyncBehaviors = exportAsyncBehaviors(proto);\n\nmodule.exports = extend.nonEnum({}, proto, asyncBehaviors);\n","\"use strict\";\n\nvar walk = require(\"./util/core/walk\");\nvar getPropertyDescriptor = require(\"./util/core/get-property-descriptor\");\nvar hasOwnProperty = require(\"@sinonjs/commons\").prototypes.object.hasOwnProperty;\nvar push = require(\"@sinonjs/commons\").prototypes.array.push;\n\nfunction collectMethod(methods, object, prop, propOwner) {\n    if (typeof getPropertyDescriptor(propOwner, prop).value === \"function\" && hasOwnProperty(object, prop)) {\n        push(methods, object[prop]);\n    }\n}\n\n// This function returns an array of all the own methods on the passed object\nfunction collectOwnMethods(object) {\n    var methods = [];\n\n    walk(object, collectMethod.bind(null, methods, object));\n\n    return methods;\n}\n\nmodule.exports = collectOwnMethods;\n","\"use strict\";\n\nvar supportsColor = require(\"supports-color\");\n\nfunction colorize(str, color) {\n    if (supportsColor.stdout === false) {\n        return str;\n    }\n\n    return \"\\x1b[\" + color + \"m\" + str + \"\\x1b[0m\";\n}\n\nexports.red = function(str) {\n    return colorize(str, 31);\n};\n\nexports.green = function(str) {\n    return colorize(str, 32);\n};\n\nexports.cyan = function(str) {\n    return colorize(str, 96);\n};\n\nexports.white = function(str) {\n    return colorize(str, 39);\n};\n\nexports.bold = function(str) {\n    return colorize(str, 1);\n};\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar Sandbox = require(\"./sandbox\");\n\nvar forEach = arrayProto.forEach;\nvar push = arrayProto.push;\n\nfunction prepareSandboxFromConfig(config) {\n    var sandbox = new Sandbox();\n\n    if (config.useFakeServer) {\n        if (typeof config.useFakeServer === \"object\") {\n            sandbox.serverPrototype = config.useFakeServer;\n        }\n\n        sandbox.useFakeServer();\n    }\n\n    if (config.useFakeTimers) {\n        if (typeof config.useFakeTimers === \"object\") {\n            sandbox.useFakeTimers(config.useFakeTimers);\n        } else {\n            sandbox.useFakeTimers();\n        }\n    }\n\n    return sandbox;\n}\n\nfunction exposeValue(sandbox, config, key, value) {\n    if (!value) {\n        return;\n    }\n\n    if (config.injectInto && !(key in config.injectInto)) {\n        config.injectInto[key] = value;\n        push(sandbox.injectedKeys, key);\n    } else {\n        push(sandbox.args, value);\n    }\n}\n\nfunction createSandbox(config) {\n    if (!config) {\n        return new Sandbox();\n    }\n\n    var configuredSandbox = prepareSandboxFromConfig(config);\n    configuredSandbox.args = configuredSandbox.args || [];\n    configuredSandbox.injectedKeys = [];\n    configuredSandbox.injectInto = config.injectInto;\n    var exposed = configuredSandbox.inject({});\n\n    if (config.properties) {\n        forEach(config.properties, function(prop) {\n            var value = exposed[prop] || (prop === \"sandbox\" && configuredSandbox);\n            exposeValue(configuredSandbox, config, prop, value);\n        });\n    } else {\n        exposeValue(configuredSandbox, config, \"sandbox\");\n    }\n\n    return configuredSandbox;\n}\n\nmodule.exports = createSandbox;\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar isPropertyConfigurable = require(\"./util/core/is-property-configurable\");\nvar exportAsyncBehaviors = require(\"./util/core/export-async-behaviors\");\nvar extend = require(\"./util/core/extend\");\n\nvar slice = arrayProto.slice;\n\nvar useLeftMostCallback = -1;\nvar useRightMostCallback = -2;\n\nfunction throwsException(fake, error, message) {\n    if (typeof error === \"function\") {\n        fake.exceptionCreator = error;\n    } else if (typeof error === \"string\") {\n        fake.exceptionCreator = function() {\n            var newException = new Error(message || \"\");\n            newException.name = error;\n            return newException;\n        };\n    } else if (!error) {\n        fake.exceptionCreator = function() {\n            return new Error(\"Error\");\n        };\n    } else {\n        fake.exception = error;\n    }\n}\n\nvar defaultBehaviors = {\n    callsFake: function callsFake(fake, fn) {\n        fake.fakeFn = fn;\n    },\n\n    callsArg: function callsArg(fake, index) {\n        if (typeof index !== \"number\") {\n            throw new TypeError(\"argument index is not number\");\n        }\n\n        fake.callArgAt = index;\n        fake.callbackArguments = [];\n        fake.callbackContext = undefined;\n        fake.callArgProp = undefined;\n        fake.callbackAsync = false;\n    },\n\n    callsArgOn: function callsArgOn(fake, index, context) {\n        if (typeof index !== \"number\") {\n            throw new TypeError(\"argument index is not number\");\n        }\n\n        fake.callArgAt = index;\n        fake.callbackArguments = [];\n        fake.callbackContext = context;\n        fake.callArgProp = undefined;\n        fake.callbackAsync = false;\n    },\n\n    callsArgWith: function callsArgWith(fake, index) {\n        if (typeof index !== \"number\") {\n            throw new TypeError(\"argument index is not number\");\n        }\n\n        fake.callArgAt = index;\n        fake.callbackArguments = slice(arguments, 2);\n        fake.callbackContext = undefined;\n        fake.callArgProp = undefined;\n        fake.callbackAsync = false;\n    },\n\n    callsArgOnWith: function callsArgWith(fake, index, context) {\n        if (typeof index !== \"number\") {\n            throw new TypeError(\"argument index is not number\");\n        }\n\n        fake.callArgAt = index;\n        fake.callbackArguments = slice(arguments, 3);\n        fake.callbackContext = context;\n        fake.callArgProp = undefined;\n        fake.callbackAsync = false;\n    },\n\n    usingPromise: function usingPromise(fake, promiseLibrary) {\n        fake.promiseLibrary = promiseLibrary;\n    },\n\n    yields: function(fake) {\n        fake.callArgAt = useLeftMostCallback;\n        fake.callbackArguments = slice(arguments, 1);\n        fake.callbackContext = undefined;\n        fake.callArgProp = undefined;\n        fake.callbackAsync = false;\n    },\n\n    yieldsRight: function(fake) {\n        fake.callArgAt = useRightMostCallback;\n        fake.callbackArguments = slice(arguments, 1);\n        fake.callbackContext = undefined;\n        fake.callArgProp = undefined;\n        fake.callbackAsync = false;\n    },\n\n    yieldsOn: function(fake, context) {\n        fake.callArgAt = useLeftMostCallback;\n        fake.callbackArguments = slice(arguments, 2);\n        fake.callbackContext = context;\n        fake.callArgProp = undefined;\n        fake.callbackAsync = false;\n    },\n\n    yieldsTo: function(fake, prop) {\n        fake.callArgAt = useLeftMostCallback;\n        fake.callbackArguments = slice(arguments, 2);\n        fake.callbackContext = undefined;\n        fake.callArgProp = prop;\n        fake.callbackAsync = false;\n    },\n\n    yieldsToOn: function(fake, prop, context) {\n        fake.callArgAt = useLeftMostCallback;\n        fake.callbackArguments = slice(arguments, 3);\n        fake.callbackContext = context;\n        fake.callArgProp = prop;\n        fake.callbackAsync = false;\n    },\n\n    throws: throwsException,\n    throwsException: throwsException,\n\n    returns: function returns(fake, value) {\n        fake.returnValue = value;\n        fake.resolve = false;\n        fake.reject = false;\n        fake.returnValueDefined = true;\n        fake.exception = undefined;\n        fake.exceptionCreator = undefined;\n        fake.fakeFn = undefined;\n    },\n\n    returnsArg: function returnsArg(fake, index) {\n        if (typeof index !== \"number\") {\n            throw new TypeError(\"argument index is not number\");\n        }\n\n        fake.returnArgAt = index;\n    },\n\n    throwsArg: function throwsArg(fake, index) {\n        if (typeof index !== \"number\") {\n            throw new TypeError(\"argument index is not number\");\n        }\n\n        fake.throwArgAt = index;\n    },\n\n    returnsThis: function returnsThis(fake) {\n        fake.returnThis = true;\n    },\n\n    resolves: function resolves(fake, value) {\n        fake.returnValue = value;\n        fake.resolve = true;\n        fake.resolveThis = false;\n        fake.reject = false;\n        fake.returnValueDefined = true;\n        fake.exception = undefined;\n        fake.exceptionCreator = undefined;\n        fake.fakeFn = undefined;\n    },\n\n    resolvesArg: function resolvesArg(fake, index) {\n        if (typeof index !== \"number\") {\n            throw new TypeError(\"argument index is not number\");\n        }\n        fake.resolveArgAt = index;\n        fake.returnValue = undefined;\n        fake.resolve = true;\n        fake.resolveThis = false;\n        fake.reject = false;\n        fake.returnValueDefined = false;\n        fake.exception = undefined;\n        fake.exceptionCreator = undefined;\n        fake.fakeFn = undefined;\n    },\n\n    rejects: function rejects(fake, error, message) {\n        var reason;\n        if (typeof error === \"string\") {\n            reason = new Error(message || \"\");\n            reason.name = error;\n        } else if (!error) {\n            reason = new Error(\"Error\");\n        } else {\n            reason = error;\n        }\n        fake.returnValue = reason;\n        fake.resolve = false;\n        fake.resolveThis = false;\n        fake.reject = true;\n        fake.returnValueDefined = true;\n        fake.exception = undefined;\n        fake.exceptionCreator = undefined;\n        fake.fakeFn = undefined;\n\n        return fake;\n    },\n\n    resolvesThis: function resolvesThis(fake) {\n        fake.returnValue = undefined;\n        fake.resolve = false;\n        fake.resolveThis = true;\n        fake.reject = false;\n        fake.returnValueDefined = false;\n        fake.exception = undefined;\n        fake.exceptionCreator = undefined;\n        fake.fakeFn = undefined;\n    },\n\n    callThrough: function callThrough(fake) {\n        fake.callsThrough = true;\n    },\n\n    callThroughWithNew: function callThroughWithNew(fake) {\n        fake.callsThroughWithNew = true;\n    },\n\n    get: function get(fake, getterFunction) {\n        var rootStub = fake.stub || fake;\n\n        Object.defineProperty(rootStub.rootObj, rootStub.propName, {\n            get: getterFunction,\n            configurable: isPropertyConfigurable(rootStub.rootObj, rootStub.propName)\n        });\n\n        return fake;\n    },\n\n    set: function set(fake, setterFunction) {\n        var rootStub = fake.stub || fake;\n\n        Object.defineProperty(\n            rootStub.rootObj,\n            rootStub.propName,\n            // eslint-disable-next-line accessor-pairs\n            {\n                set: setterFunction,\n                configurable: isPropertyConfigurable(rootStub.rootObj, rootStub.propName)\n            }\n        );\n\n        return fake;\n    },\n\n    value: function value(fake, newVal) {\n        var rootStub = fake.stub || fake;\n\n        Object.defineProperty(rootStub.rootObj, rootStub.propName, {\n            value: newVal,\n            enumerable: true,\n            configurable: rootStub.shadowsPropOnPrototype || isPropertyConfigurable(rootStub.rootObj, rootStub.propName)\n        });\n\n        return fake;\n    }\n};\n\nvar asyncBehaviors = exportAsyncBehaviors(defaultBehaviors);\n\nmodule.exports = extend({}, defaultBehaviors, asyncBehaviors);\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar createProxy = require(\"./proxy\");\nvar nextTick = require(\"./util/core/next-tick\");\n\nvar slice = arrayProto.slice;\n\nfunction getError(value) {\n    return value instanceof Error ? value : new Error(value);\n}\n\nvar uuid = 0;\nfunction wrapFunc(f) {\n    var proxy;\n    var fakeInstance = function() {\n        var firstArg, lastArg;\n\n        if (arguments.length > 0) {\n            firstArg = arguments[0];\n            lastArg = arguments[arguments.length - 1];\n        }\n\n        var callback = lastArg && typeof lastArg === \"function\" ? lastArg : undefined;\n\n        proxy.firstArg = firstArg;\n        proxy.lastArg = lastArg;\n        proxy.callback = callback;\n\n        return f && f.apply(this, arguments);\n    };\n    proxy = createProxy(fakeInstance, f || fakeInstance);\n\n    proxy.displayName = \"fake\";\n    proxy.id = \"fake#\" + uuid++;\n\n    return proxy;\n}\n\nfunction fake(f) {\n    if (arguments.length > 0 && typeof f !== \"function\") {\n        throw new TypeError(\"Expected f argument to be a Function\");\n    }\n\n    return wrapFunc(f);\n}\n\nfake.returns = function returns(value) {\n    function f() {\n        return value;\n    }\n\n    return wrapFunc(f);\n};\n\nfake.throws = function throws(value) {\n    function f() {\n        throw getError(value);\n    }\n\n    return wrapFunc(f);\n};\n\nfake.resolves = function resolves(value) {\n    function f() {\n        return Promise.resolve(value);\n    }\n\n    return wrapFunc(f);\n};\n\nfake.rejects = function rejects(value) {\n    function f() {\n        return Promise.reject(getError(value));\n    }\n\n    return wrapFunc(f);\n};\n\nfunction yieldInternal(async, values) {\n    function f() {\n        var callback = arguments[arguments.length - 1];\n        if (typeof callback !== \"function\") {\n            throw new TypeError(\"Expected last argument to be a function\");\n        }\n        if (async) {\n            nextTick(function() {\n                callback.apply(null, values);\n            });\n        } else {\n            callback.apply(null, values);\n        }\n    }\n\n    return wrapFunc(f);\n}\n\nfake.yields = function yields() {\n    return yieldInternal(false, slice(arguments));\n};\n\nfake.yieldsAsync = function yieldsAsync() {\n    return yieldInternal(true, slice(arguments));\n};\n\nmodule.exports = fake;\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar proxyInvoke = require(\"./proxy-invoke\");\nvar proxyCallToString = require(\"./proxy-call\").toString;\nvar timesInWords = require(\"./util/core/times-in-words\");\nvar extend = require(\"./util/core/extend\");\nvar match = require(\"@sinonjs/samsam\").createMatcher;\nvar stub = require(\"./stub\");\nvar assert = require(\"./assert\");\nvar deepEqual = require(\"@sinonjs/samsam\").deepEqual;\nvar format = require(\"./util/core/format\");\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\n\nvar every = arrayProto.every;\nvar forEach = arrayProto.forEach;\nvar push = arrayProto.push;\nvar slice = arrayProto.slice;\n\nfunction callCountInWords(callCount) {\n    if (callCount === 0) {\n        return \"never called\";\n    }\n\n    return \"called \" + timesInWords(callCount);\n}\n\nfunction expectedCallCountInWords(expectation) {\n    var min = expectation.minCalls;\n    var max = expectation.maxCalls;\n\n    if (typeof min === \"number\" && typeof max === \"number\") {\n        var str = timesInWords(min);\n\n        if (min !== max) {\n            str = \"at least \" + str + \" and at most \" + timesInWords(max);\n        }\n\n        return str;\n    }\n\n    if (typeof min === \"number\") {\n        return \"at least \" + timesInWords(min);\n    }\n\n    return \"at most \" + timesInWords(max);\n}\n\nfunction receivedMinCalls(expectation) {\n    var hasMinLimit = typeof expectation.minCalls === \"number\";\n    return !hasMinLimit || expectation.callCount >= expectation.minCalls;\n}\n\nfunction receivedMaxCalls(expectation) {\n    if (typeof expectation.maxCalls !== \"number\") {\n        return false;\n    }\n\n    return expectation.callCount === expectation.maxCalls;\n}\n\nfunction verifyMatcher(possibleMatcher, arg) {\n    var isMatcher = match.isMatcher(possibleMatcher);\n\n    return (isMatcher && possibleMatcher.test(arg)) || true;\n}\n\nvar mockExpectation = {\n    minCalls: 1,\n    maxCalls: 1,\n\n    create: function create(methodName) {\n        var expectation = extend.nonEnum(stub(), mockExpectation);\n        delete expectation.create;\n        expectation.method = methodName;\n\n        return expectation;\n    },\n\n    invoke: function invoke(func, thisValue, args) {\n        this.verifyCallAllowed(thisValue, args);\n\n        return proxyInvoke.apply(this, arguments);\n    },\n\n    atLeast: function atLeast(num) {\n        if (typeof num !== \"number\") {\n            throw new TypeError(\"'\" + valueToString(num) + \"' is not number\");\n        }\n\n        if (!this.limitsSet) {\n            this.maxCalls = null;\n            this.limitsSet = true;\n        }\n\n        this.minCalls = num;\n\n        return this;\n    },\n\n    atMost: function atMost(num) {\n        if (typeof num !== \"number\") {\n            throw new TypeError(\"'\" + valueToString(num) + \"' is not number\");\n        }\n\n        if (!this.limitsSet) {\n            this.minCalls = null;\n            this.limitsSet = true;\n        }\n\n        this.maxCalls = num;\n\n        return this;\n    },\n\n    never: function never() {\n        return this.exactly(0);\n    },\n\n    once: function once() {\n        return this.exactly(1);\n    },\n\n    twice: function twice() {\n        return this.exactly(2);\n    },\n\n    thrice: function thrice() {\n        return this.exactly(3);\n    },\n\n    exactly: function exactly(num) {\n        if (typeof num !== \"number\") {\n            throw new TypeError(\"'\" + valueToString(num) + \"' is not a number\");\n        }\n\n        this.atLeast(num);\n        return this.atMost(num);\n    },\n\n    met: function met() {\n        return !this.failed && receivedMinCalls(this);\n    },\n\n    verifyCallAllowed: function verifyCallAllowed(thisValue, args) {\n        var expectedArguments = this.expectedArguments;\n\n        if (receivedMaxCalls(this)) {\n            this.failed = true;\n            mockExpectation.fail(this.method + \" already called \" + timesInWords(this.maxCalls));\n        }\n\n        if (\"expectedThis\" in this && this.expectedThis !== thisValue) {\n            mockExpectation.fail(\n                this.method +\n                    \" called with \" +\n                    valueToString(thisValue) +\n                    \" as thisValue, expected \" +\n                    valueToString(this.expectedThis)\n            );\n        }\n\n        if (!(\"expectedArguments\" in this)) {\n            return;\n        }\n\n        if (!args) {\n            mockExpectation.fail(this.method + \" received no arguments, expected \" + format(expectedArguments));\n        }\n\n        if (args.length < expectedArguments.length) {\n            mockExpectation.fail(\n                this.method +\n                    \" received too few arguments (\" +\n                    format(args) +\n                    \"), expected \" +\n                    format(expectedArguments)\n            );\n        }\n\n        if (this.expectsExactArgCount && args.length !== expectedArguments.length) {\n            mockExpectation.fail(\n                this.method +\n                    \" received too many arguments (\" +\n                    format(args) +\n                    \"), expected \" +\n                    format(expectedArguments)\n            );\n        }\n\n        forEach(\n            expectedArguments,\n            function(expectedArgument, i) {\n                if (!verifyMatcher(expectedArgument, args[i])) {\n                    mockExpectation.fail(\n                        this.method +\n                            \" received wrong arguments \" +\n                            format(args) +\n                            \", didn't match \" +\n                            String(expectedArguments)\n                    );\n                }\n\n                if (!deepEqual(args[i], expectedArgument)) {\n                    mockExpectation.fail(\n                        this.method +\n                            \" received wrong arguments \" +\n                            format(args) +\n                            \", expected \" +\n                            format(expectedArguments)\n                    );\n                }\n            },\n            this\n        );\n    },\n\n    allowsCall: function allowsCall(thisValue, args) {\n        var expectedArguments = this.expectedArguments;\n\n        if (this.met() && receivedMaxCalls(this)) {\n            return false;\n        }\n\n        if (\"expectedThis\" in this && this.expectedThis !== thisValue) {\n            return false;\n        }\n\n        if (!(\"expectedArguments\" in this)) {\n            return true;\n        }\n\n        // eslint-disable-next-line no-underscore-dangle\n        var _args = args || [];\n\n        if (_args.length < expectedArguments.length) {\n            return false;\n        }\n\n        if (this.expectsExactArgCount && _args.length !== expectedArguments.length) {\n            return false;\n        }\n\n        return every(expectedArguments, function(expectedArgument, i) {\n            if (!verifyMatcher(expectedArgument, _args[i])) {\n                return false;\n            }\n\n            if (!deepEqual(_args[i], expectedArgument)) {\n                return false;\n            }\n\n            return true;\n        });\n    },\n\n    withArgs: function withArgs() {\n        this.expectedArguments = slice(arguments);\n        return this;\n    },\n\n    withExactArgs: function withExactArgs() {\n        this.withArgs.apply(this, arguments);\n        this.expectsExactArgCount = true;\n        return this;\n    },\n\n    on: function on(thisValue) {\n        this.expectedThis = thisValue;\n        return this;\n    },\n\n    toString: function() {\n        var args = slice(this.expectedArguments || []);\n\n        if (!this.expectsExactArgCount) {\n            push(args, \"[...]\");\n        }\n\n        var callStr = proxyCallToString.call({\n            proxy: this.method || \"anonymous mock expectation\",\n            args: args\n        });\n\n        var message = callStr.replace(\", [...\", \"[, ...\") + \" \" + expectedCallCountInWords(this);\n\n        if (this.met()) {\n            return \"Expectation met: \" + message;\n        }\n\n        return \"Expected \" + message + \" (\" + callCountInWords(this.callCount) + \")\";\n    },\n\n    verify: function verify() {\n        if (!this.met()) {\n            mockExpectation.fail(String(this));\n        } else {\n            mockExpectation.pass(String(this));\n        }\n\n        return true;\n    },\n\n    pass: function pass(message) {\n        assert.pass(message);\n    },\n\n    fail: function fail(message) {\n        var exception = new Error(message);\n        exception.name = \"ExpectationError\";\n\n        throw exception;\n    }\n};\n\nmodule.exports = mockExpectation;\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar mockExpectation = require(\"./mock-expectation\");\nvar proxyCallToString = require(\"./proxy-call\").toString;\nvar extend = require(\"./util/core/extend\");\nvar deepEqual = require(\"@sinonjs/samsam\").deepEqual;\nvar wrapMethod = require(\"./util/core/wrap-method\");\nvar usePromiseLibrary = require(\"./util/core/use-promise-library\");\n\nvar concat = arrayProto.concat;\nvar filter = arrayProto.filter;\nvar forEach = arrayProto.forEach;\nvar every = arrayProto.every;\nvar join = arrayProto.join;\nvar push = arrayProto.push;\nvar slice = arrayProto.slice;\nvar unshift = arrayProto.unshift;\n\nfunction mock(object) {\n    if (!object || typeof object === \"string\") {\n        return mockExpectation.create(object ? object : \"Anonymous mock\");\n    }\n\n    return mock.create(object);\n}\n\nfunction each(collection, callback) {\n    var col = collection || [];\n\n    forEach(col, callback);\n}\n\nfunction arrayEquals(arr1, arr2, compareLength) {\n    if (compareLength && arr1.length !== arr2.length) {\n        return false;\n    }\n\n    return every(arr1, function(element, i) {\n        return deepEqual(arr2[i], element);\n    });\n}\n\nextend(mock, {\n    create: function create(object) {\n        if (!object) {\n            throw new TypeError(\"object is null\");\n        }\n\n        var mockObject = extend.nonEnum({}, mock, { object: object });\n        delete mockObject.create;\n\n        return mockObject;\n    },\n\n    expects: function expects(method) {\n        if (!method) {\n            throw new TypeError(\"method is falsy\");\n        }\n\n        if (!this.expectations) {\n            this.expectations = {};\n            this.proxies = [];\n            this.failures = [];\n        }\n\n        if (!this.expectations[method]) {\n            this.expectations[method] = [];\n            var mockObject = this;\n\n            wrapMethod(this.object, method, function() {\n                return mockObject.invokeMethod(method, this, arguments);\n            });\n\n            push(this.proxies, method);\n        }\n\n        var expectation = mockExpectation.create(method);\n        expectation.wrappedMethod = this.object[method].wrappedMethod;\n        push(this.expectations[method], expectation);\n        usePromiseLibrary(this.promiseLibrary, expectation);\n\n        return expectation;\n    },\n\n    restore: function restore() {\n        var object = this.object;\n\n        each(this.proxies, function(proxy) {\n            if (typeof object[proxy].restore === \"function\") {\n                object[proxy].restore();\n            }\n        });\n    },\n\n    verify: function verify() {\n        var expectations = this.expectations || {};\n        var messages = this.failures ? slice(this.failures) : [];\n        var met = [];\n\n        each(this.proxies, function(proxy) {\n            each(expectations[proxy], function(expectation) {\n                if (!expectation.met()) {\n                    push(messages, String(expectation));\n                } else {\n                    push(met, String(expectation));\n                }\n            });\n        });\n\n        this.restore();\n\n        if (messages.length > 0) {\n            mockExpectation.fail(join(concat(messages, met), \"\\n\"));\n        } else if (met.length > 0) {\n            mockExpectation.pass(join(concat(messages, met), \"\\n\"));\n        }\n\n        return true;\n    },\n\n    usingPromise: function usingPromise(promiseLibrary) {\n        this.promiseLibrary = promiseLibrary;\n\n        return this;\n    },\n\n    invokeMethod: function invokeMethod(method, thisValue, args) {\n        /* if we cannot find any matching files we will explicitly call mockExpection#fail with error messages */\n        /* eslint consistent-return: \"off\" */\n        var expectations = this.expectations && this.expectations[method] ? this.expectations[method] : [];\n        var currentArgs = args || [];\n        var available;\n\n        var expectationsWithMatchingArgs = filter(expectations, function(expectation) {\n            var expectedArgs = expectation.expectedArguments || [];\n\n            return arrayEquals(expectedArgs, currentArgs, expectation.expectsExactArgCount);\n        });\n\n        var expectationsToApply = filter(expectationsWithMatchingArgs, function(expectation) {\n            return !expectation.met() && expectation.allowsCall(thisValue, args);\n        });\n\n        if (expectationsToApply.length > 0) {\n            return expectationsToApply[0].apply(thisValue, args);\n        }\n\n        var messages = [];\n        var exhausted = 0;\n\n        forEach(expectationsWithMatchingArgs, function(expectation) {\n            if (expectation.allowsCall(thisValue, args)) {\n                available = available || expectation;\n            } else {\n                exhausted += 1;\n            }\n        });\n\n        if (available && exhausted === 0) {\n            return available.apply(thisValue, args);\n        }\n\n        forEach(expectations, function(expectation) {\n            push(messages, \"    \" + String(expectation));\n        });\n\n        unshift(\n            messages,\n            \"Unexpected call: \" +\n                proxyCallToString.call({\n                    proxy: method,\n                    args: args\n                })\n        );\n\n        var err = new Error();\n        if (!err.stack) {\n            // PhantomJS does not serialize the stack trace until the error has been thrown\n            try {\n                throw err;\n            } catch (e) {\n                /* empty */\n            }\n        }\n        push(\n            this.failures,\n            \"Unexpected call: \" +\n                proxyCallToString.call({\n                    proxy: method,\n                    args: args,\n                    stack: err.stack\n                })\n        );\n\n        mockExpectation.fail(join(messages, \"\\n\"));\n    }\n});\n\nmodule.exports = mock;\n","\"use strict\";\n\nvar push = require(\"@sinonjs/commons\").prototypes.array.push;\n\nexports.incrementCallCount = function incrementCallCount(proxy) {\n    proxy.called = true;\n    proxy.callCount += 1;\n    proxy.notCalled = false;\n    proxy.calledOnce = proxy.callCount === 1;\n    proxy.calledTwice = proxy.callCount === 2;\n    proxy.calledThrice = proxy.callCount === 3;\n};\n\nexports.createCallProperties = function createCallProperties(proxy) {\n    proxy.firstCall = proxy.getCall(0);\n    proxy.secondCall = proxy.getCall(1);\n    proxy.thirdCall = proxy.getCall(2);\n    proxy.lastCall = proxy.getCall(proxy.callCount - 1);\n};\n\nexports.delegateToCalls = function delegateToCalls(\n    proxy,\n    method,\n    matchAny,\n    actual,\n    returnsValues,\n    notCalled,\n    totalCallCount\n) {\n    proxy[method] = function() {\n        if (!this.called) {\n            if (notCalled) {\n                return notCalled.apply(this, arguments);\n            }\n            return false;\n        }\n\n        if (totalCallCount !== undefined && this.callCount !== totalCallCount) {\n            return false;\n        }\n\n        var currentCall;\n        var matches = 0;\n        var returnValues = [];\n\n        for (var i = 0, l = this.callCount; i < l; i += 1) {\n            currentCall = this.getCall(i);\n            var returnValue = currentCall[actual || method].apply(currentCall, arguments);\n            push(returnValues, returnValue);\n            if (returnValue) {\n                matches += 1;\n\n                if (matchAny) {\n                    return true;\n                }\n            }\n        }\n\n        if (returnsValues) {\n            return returnValues;\n        }\n        return matches === this.callCount;\n    };\n};\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar match = require(\"@sinonjs/samsam\").createMatcher;\nvar deepEqual = require(\"@sinonjs/samsam\").deepEqual;\nvar functionName = require(\"@sinonjs/commons\").functionName;\nvar sinonFormat = require(\"./util/core/format\");\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\n\nvar concat = arrayProto.concat;\nvar filter = arrayProto.filter;\nvar join = arrayProto.join;\nvar map = arrayProto.map;\nvar reduce = arrayProto.reduce;\nvar slice = arrayProto.slice;\n\nfunction throwYieldError(proxy, text, args) {\n    var msg = functionName(proxy) + text;\n    if (args.length) {\n        msg += \" Received [\" + join(slice(args), \", \") + \"]\";\n    }\n    throw new Error(msg);\n}\n\nvar callProto = {\n    calledOn: function calledOn(thisValue) {\n        if (match.isMatcher(thisValue)) {\n            return thisValue.test(this.thisValue);\n        }\n        return this.thisValue === thisValue;\n    },\n\n    calledWith: function calledWith() {\n        var self = this;\n        var calledWithArgs = slice(arguments);\n\n        if (calledWithArgs.length > self.args.length) {\n            return false;\n        }\n\n        return reduce(\n            calledWithArgs,\n            function(prev, arg, i) {\n                return prev && deepEqual(self.args[i], arg);\n            },\n            true\n        );\n    },\n\n    calledWithMatch: function calledWithMatch() {\n        var self = this;\n        var calledWithMatchArgs = slice(arguments);\n\n        if (calledWithMatchArgs.length > self.args.length) {\n            return false;\n        }\n\n        return reduce(\n            calledWithMatchArgs,\n            function(prev, expectation, i) {\n                var actual = self.args[i];\n\n                return prev && match(expectation).test(actual);\n            },\n            true\n        );\n    },\n\n    calledWithExactly: function calledWithExactly() {\n        return arguments.length === this.args.length && this.calledWith.apply(this, arguments);\n    },\n\n    notCalledWith: function notCalledWith() {\n        return !this.calledWith.apply(this, arguments);\n    },\n\n    notCalledWithMatch: function notCalledWithMatch() {\n        return !this.calledWithMatch.apply(this, arguments);\n    },\n\n    returned: function returned(value) {\n        return deepEqual(this.returnValue, value);\n    },\n\n    threw: function threw(error) {\n        if (typeof error === \"undefined\" || !this.exception) {\n            return Boolean(this.exception);\n        }\n\n        return this.exception === error || this.exception.name === error;\n    },\n\n    calledWithNew: function calledWithNew() {\n        return this.proxy.prototype && this.thisValue instanceof this.proxy;\n    },\n\n    calledBefore: function(other) {\n        return this.callId < other.callId;\n    },\n\n    calledAfter: function(other) {\n        return this.callId > other.callId;\n    },\n\n    calledImmediatelyBefore: function(other) {\n        return this.callId === other.callId - 1;\n    },\n\n    calledImmediatelyAfter: function(other) {\n        return this.callId === other.callId + 1;\n    },\n\n    callArg: function(pos) {\n        this.ensureArgIsAFunction(pos);\n        return this.args[pos]();\n    },\n\n    callArgOn: function(pos, thisValue) {\n        this.ensureArgIsAFunction(pos);\n        return this.args[pos].apply(thisValue);\n    },\n\n    callArgWith: function(pos) {\n        return this.callArgOnWith.apply(this, concat([pos, null], slice(arguments, 1)));\n    },\n\n    callArgOnWith: function(pos, thisValue) {\n        this.ensureArgIsAFunction(pos);\n        var args = slice(arguments, 2);\n        return this.args[pos].apply(thisValue, args);\n    },\n\n    throwArg: function(pos) {\n        if (pos > this.args.length) {\n            throw new TypeError(\"Not enough arguments: \" + pos + \" required but only \" + this.args.length + \" present\");\n        }\n\n        throw this.args[pos];\n    },\n\n    yield: function() {\n        return this.yieldOn.apply(this, concat([null], slice(arguments, 0)));\n    },\n\n    yieldOn: function(thisValue) {\n        var args = slice(this.args);\n        var yieldFn = filter(args, function(arg) {\n            return typeof arg === \"function\";\n        })[0];\n\n        if (!yieldFn) {\n            throwYieldError(this.proxy, \" cannot yield since no callback was passed.\", args);\n        }\n\n        return yieldFn.apply(thisValue, slice(arguments, 1));\n    },\n\n    yieldTo: function(prop) {\n        return this.yieldToOn.apply(this, concat([prop, null], slice(arguments, 1)));\n    },\n\n    yieldToOn: function(prop, thisValue) {\n        var args = slice(this.args);\n        var yieldArg = filter(args, function(arg) {\n            return arg && typeof arg[prop] === \"function\";\n        })[0];\n        var yieldFn = yieldArg && yieldArg[prop];\n\n        if (!yieldFn) {\n            throwYieldError(\n                this.proxy,\n                \" cannot yield to '\" + valueToString(prop) + \"' since no callback was passed.\",\n                args\n            );\n        }\n\n        return yieldFn.apply(thisValue, slice(arguments, 2));\n    },\n\n    toString: function() {\n        var callStr = this.proxy ? String(this.proxy) + \"(\" : \"\";\n        var formattedArgs;\n\n        if (!this.args) {\n            return \":(\";\n        }\n\n        formattedArgs = map(this.args, function(arg) {\n            return sinonFormat(arg);\n        });\n\n        callStr = callStr + join(formattedArgs, \", \") + \")\";\n\n        if (typeof this.returnValue !== \"undefined\") {\n            callStr += \" => \" + sinonFormat(this.returnValue);\n        }\n\n        if (this.exception) {\n            callStr += \" !\" + this.exception.name;\n\n            if (this.exception.message) {\n                callStr += \"(\" + this.exception.message + \")\";\n            }\n        }\n        if (this.stack) {\n            // Omit the error message and the two top stack frames in sinon itself:\n            callStr += (this.stack.split(\"\\n\")[3] || \"unknown\").replace(/^\\s*(?:at\\s+|@)?/, \" at \");\n        }\n\n        return callStr;\n    },\n\n    ensureArgIsAFunction: function(pos) {\n        if (typeof this.args[pos] !== \"function\") {\n            throw new TypeError(\n                \"Expected argument at position \" + pos + \" to be a Function, but was \" + typeof this.args[pos]\n            );\n        }\n    }\n};\nObject.defineProperty(callProto, \"stack\", {\n    enumerable: true,\n    configurable: true,\n    get: function() {\n        return (this.errorWithCallStack && this.errorWithCallStack.stack) || \"\";\n    }\n});\n\ncallProto.invokeCallback = callProto.yield;\n\nfunction createProxyCall(proxy, thisValue, args, returnValue, exception, id, errorWithCallStack) {\n    if (typeof id !== \"number\") {\n        throw new TypeError(\"Call id is not a number\");\n    }\n\n    var firstArg, lastArg;\n\n    if (args.length > 0) {\n        firstArg = args[0];\n        lastArg = args[args.length - 1];\n    }\n\n    var proxyCall = Object.create(callProto);\n    var callback = lastArg && typeof lastArg === \"function\" ? lastArg : undefined;\n\n    proxyCall.proxy = proxy;\n    proxyCall.thisValue = thisValue;\n    proxyCall.args = args;\n    proxyCall.firstArg = firstArg;\n    proxyCall.lastArg = lastArg;\n    proxyCall.callback = callback;\n    proxyCall.returnValue = returnValue;\n    proxyCall.exception = exception;\n    proxyCall.callId = id;\n    proxyCall.errorWithCallStack = errorWithCallStack;\n\n    return proxyCall;\n}\ncreateProxyCall.toString = callProto.toString; // used by mocks\n\nmodule.exports = createProxyCall;\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar proxyCallUtil = require(\"./proxy-call-util\");\n\nvar push = arrayProto.push;\nvar forEach = arrayProto.forEach;\nvar concat = arrayProto.concat;\nvar ErrorConstructor = Error.prototype.constructor;\nvar bind = Function.prototype.bind;\n\nvar callId = 0;\n\nmodule.exports = function invoke(func, thisValue, args) {\n    var matchings = this.matchingFakes(args);\n    var currentCallId = callId++;\n    var exception, returnValue;\n\n    proxyCallUtil.incrementCallCount(this);\n    push(this.thisValues, thisValue);\n    push(this.args, args);\n    push(this.callIds, currentCallId);\n    forEach(matchings, function(matching) {\n        proxyCallUtil.incrementCallCount(matching);\n        push(matching.thisValues, thisValue);\n        push(matching.args, args);\n        push(matching.callIds, currentCallId);\n    });\n\n    // Make call properties available from within the spied function:\n    proxyCallUtil.createCallProperties(this);\n    forEach(matchings, proxyCallUtil.createCallProperties);\n\n    try {\n        this.invoking = true;\n\n        var thisCall = this.getCall(this.callCount - 1);\n\n        if (thisCall.calledWithNew()) {\n            // Call through with `new`\n            returnValue = new (bind.apply(this.func || func, concat([thisValue], args)))();\n\n            if (typeof returnValue !== \"object\") {\n                returnValue = thisValue;\n            }\n        } else {\n            returnValue = (this.func || func).apply(thisValue, args);\n        }\n    } catch (e) {\n        exception = e;\n    } finally {\n        delete this.invoking;\n    }\n\n    push(this.exceptions, exception);\n    push(this.returnValues, returnValue);\n    forEach(matchings, function(matching) {\n        push(matching.exceptions, exception);\n        push(matching.returnValues, returnValue);\n    });\n\n    var err = new ErrorConstructor();\n    // 1. Please do not get stack at this point. It may be so very slow, and not actually used\n    // 2. PhantomJS does not serialize the stack trace until the error has been thrown:\n    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/Stack\n    try {\n        throw err;\n    } catch (e) {\n        /* empty */\n    }\n    push(this.errorsWithCallStack, err);\n    forEach(matchings, function(matching) {\n        push(matching.errorsWithCallStack, err);\n    });\n\n    // Make return value and exception available in the calls:\n    proxyCallUtil.createCallProperties(this);\n    forEach(matchings, proxyCallUtil.createCallProperties);\n\n    if (exception !== undefined) {\n        throw exception;\n    }\n\n    return returnValue;\n};\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar extend = require(\"./util/core/extend\");\nvar functionToString = require(\"./util/core/function-to-string\");\nvar proxyCall = require(\"./proxy-call\");\nvar proxyCallUtil = require(\"./proxy-call-util\");\nvar proxyInvoke = require(\"./proxy-invoke\");\nvar sinonFormat = require(\"./util/core/format\");\n\nvar push = arrayProto.push;\nvar forEach = arrayProto.forEach;\nvar slice = arrayProto.slice;\n\nvar emptyFakes = Object.freeze([]);\n\n// Public API\nvar proxyApi = {\n    toString: functionToString,\n\n    named: function named(name) {\n        this.displayName = name;\n        var nameDescriptor = Object.getOwnPropertyDescriptor(this, \"name\");\n        if (nameDescriptor && nameDescriptor.configurable) {\n            // IE 11 functions don't have a name.\n            // Safari 9 has names that are not configurable.\n            nameDescriptor.value = name;\n            Object.defineProperty(this, \"name\", nameDescriptor);\n        }\n        return this;\n    },\n\n    invoke: proxyInvoke,\n\n    /*\n     * Hook for derived implementation to return fake instances matching the\n     * given arguments.\n     */\n    matchingFakes: function(/*args, strict*/) {\n        return emptyFakes;\n    },\n\n    getCall: function getCall(index) {\n        var i = index;\n        if (i < 0) {\n            // Negative indices means counting backwards from the last call\n            i += this.callCount;\n        }\n        if (i < 0 || i >= this.callCount) {\n            return null;\n        }\n\n        return proxyCall(\n            this,\n            this.thisValues[i],\n            this.args[i],\n            this.returnValues[i],\n            this.exceptions[i],\n            this.callIds[i],\n            this.errorsWithCallStack[i]\n        );\n    },\n\n    getCalls: function() {\n        var calls = [];\n        var i;\n\n        for (i = 0; i < this.callCount; i++) {\n            push(calls, this.getCall(i));\n        }\n\n        return calls;\n    },\n\n    calledBefore: function calledBefore(proxy) {\n        if (!this.called) {\n            return false;\n        }\n\n        if (!proxy.called) {\n            return true;\n        }\n\n        return this.callIds[0] < proxy.callIds[proxy.callIds.length - 1];\n    },\n\n    calledAfter: function calledAfter(proxy) {\n        if (!this.called || !proxy.called) {\n            return false;\n        }\n\n        return this.callIds[this.callCount - 1] > proxy.callIds[0];\n    },\n\n    calledImmediatelyBefore: function calledImmediatelyBefore(proxy) {\n        if (!this.called || !proxy.called) {\n            return false;\n        }\n\n        return this.callIds[this.callCount - 1] === proxy.callIds[proxy.callCount - 1] - 1;\n    },\n\n    calledImmediatelyAfter: function calledImmediatelyAfter(proxy) {\n        if (!this.called || !proxy.called) {\n            return false;\n        }\n\n        return this.callIds[this.callCount - 1] === proxy.callIds[proxy.callCount - 1] + 1;\n    },\n\n    formatters: require(\"./spy-formatters\"),\n    printf: function(format) {\n        var spyInstance = this;\n        var args = slice(arguments, 1);\n        var formatter;\n\n        return (format || \"\").replace(/%(.)/g, function(match, specifyer) {\n            formatter = proxyApi.formatters[specifyer];\n\n            if (typeof formatter === \"function\") {\n                return String(formatter(spyInstance, args));\n            } else if (!isNaN(parseInt(specifyer, 10))) {\n                return sinonFormat(args[specifyer - 1]);\n            }\n\n            return \"%\" + specifyer;\n        });\n    },\n\n    resetHistory: function() {\n        if (this.invoking) {\n            var err = new Error(\n                \"Cannot reset Sinon function while invoking it. \" +\n                    \"Move the call to .resetHistory outside of the callback.\"\n            );\n            err.name = \"InvalidResetException\";\n            throw err;\n        }\n\n        this.called = false;\n        this.notCalled = true;\n        this.calledOnce = false;\n        this.calledTwice = false;\n        this.calledThrice = false;\n        this.callCount = 0;\n        this.firstCall = null;\n        this.secondCall = null;\n        this.thirdCall = null;\n        this.lastCall = null;\n        this.args = [];\n        this.firstArg = null;\n        this.lastArg = null;\n        this.returnValues = [];\n        this.thisValues = [];\n        this.exceptions = [];\n        this.callIds = [];\n        this.errorsWithCallStack = [];\n\n        if (this.fakes) {\n            forEach(this.fakes, function(fake) {\n                fake.resetHistory();\n            });\n        }\n\n        return this;\n    }\n};\n\nvar delegateToCalls = proxyCallUtil.delegateToCalls;\ndelegateToCalls(proxyApi, \"calledOn\", true);\ndelegateToCalls(proxyApi, \"alwaysCalledOn\", false, \"calledOn\");\ndelegateToCalls(proxyApi, \"calledWith\", true);\ndelegateToCalls(proxyApi, \"calledOnceWith\", true, \"calledWith\", false, undefined, 1);\ndelegateToCalls(proxyApi, \"calledWithMatch\", true);\ndelegateToCalls(proxyApi, \"alwaysCalledWith\", false, \"calledWith\");\ndelegateToCalls(proxyApi, \"alwaysCalledWithMatch\", false, \"calledWithMatch\");\ndelegateToCalls(proxyApi, \"calledWithExactly\", true);\ndelegateToCalls(proxyApi, \"calledOnceWithExactly\", true, \"calledWithExactly\", false, undefined, 1);\ndelegateToCalls(proxyApi, \"alwaysCalledWithExactly\", false, \"calledWithExactly\");\ndelegateToCalls(proxyApi, \"neverCalledWith\", false, \"notCalledWith\", false, function() {\n    return true;\n});\ndelegateToCalls(proxyApi, \"neverCalledWithMatch\", false, \"notCalledWithMatch\", false, function() {\n    return true;\n});\ndelegateToCalls(proxyApi, \"threw\", true);\ndelegateToCalls(proxyApi, \"alwaysThrew\", false, \"threw\");\ndelegateToCalls(proxyApi, \"returned\", true);\ndelegateToCalls(proxyApi, \"alwaysReturned\", false, \"returned\");\ndelegateToCalls(proxyApi, \"calledWithNew\", true);\ndelegateToCalls(proxyApi, \"alwaysCalledWithNew\", false, \"calledWithNew\");\n\nfunction createProxy(func, originalFunc) {\n    var proxy = wrapFunction(func, originalFunc);\n\n    // Inherit function properties:\n    extend(proxy, func);\n\n    proxy.prototype = func.prototype;\n\n    extend.nonEnum(proxy, proxyApi);\n\n    return proxy;\n}\n\nfunction wrapFunction(func, originalFunc) {\n    var arity = originalFunc.length;\n    var p;\n    // Do not change this to use an eval. Projects that depend on sinon block the use of eval.\n    // ref: https://github.com/sinonjs/sinon/issues/710\n    switch (arity) {\n        /*eslint-disable no-unused-vars, max-len*/\n        case 0:\n            p = function proxy() {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        case 1:\n            p = function proxy(a) {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        case 2:\n            p = function proxy(a, b) {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        case 3:\n            p = function proxy(a, b, c) {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        case 4:\n            p = function proxy(a, b, c, d) {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        case 5:\n            p = function proxy(a, b, c, d, e) {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        case 6:\n            p = function proxy(a, b, c, d, e, f) {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        case 7:\n            p = function proxy(a, b, c, d, e, f, g) {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        case 8:\n            p = function proxy(a, b, c, d, e, f, g, h) {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        case 9:\n            p = function proxy(a, b, c, d, e, f, g, h, i) {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        case 10:\n            p = function proxy(a, b, c, d, e, f, g, h, i, j) {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        case 11:\n            p = function proxy(a, b, c, d, e, f, g, h, i, j, k) {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        case 12:\n            p = function proxy(a, b, c, d, e, f, g, h, i, j, k, l) {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        default:\n            p = function proxy() {\n                return p.invoke(func, this, slice(arguments));\n            };\n            break;\n        /*eslint-enable*/\n    }\n    var nameDescriptor = Object.getOwnPropertyDescriptor(originalFunc, \"name\");\n    if (nameDescriptor && nameDescriptor.configurable) {\n        // IE 11 functions don't have a name.\n        // Safari 9 has names that are not configurable.\n        Object.defineProperty(p, \"name\", nameDescriptor);\n    }\n    extend.nonEnum(p, {\n        isSinonProxy: true,\n\n        called: false,\n        notCalled: true,\n        calledOnce: false,\n        calledTwice: false,\n        calledThrice: false,\n        callCount: 0,\n        firstCall: null,\n        firstArg: null,\n        secondCall: null,\n        thirdCall: null,\n        lastCall: null,\n        lastArg: null,\n        args: [],\n        returnValues: [],\n        thisValues: [],\n        exceptions: [],\n        callIds: [],\n        errorsWithCallStack: []\n    });\n    return p;\n}\n\nmodule.exports = createProxy;\n","\"use strict\";\n\nvar walkObject = require(\"./util/core/walk-object\");\n\nfunction filter(object, property) {\n    return object[property].restore && object[property].restore.sinon;\n}\n\nfunction restore(object, property) {\n    object[property].restore();\n}\n\nfunction restoreObject(object) {\n    return walkObject(restore, object, filter);\n}\n\nmodule.exports = restoreObject;\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar collectOwnMethods = require(\"./collect-own-methods\");\nvar getPropertyDescriptor = require(\"./util/core/get-property-descriptor\");\nvar isPropertyConfigurable = require(\"./util/core/is-property-configurable\");\nvar match = require(\"@sinonjs/samsam\").createMatcher;\nvar sinonAssert = require(\"./assert\");\nvar sinonClock = require(\"./util/fake-timers\");\nvar sinonMock = require(\"./mock\");\nvar sinonSpy = require(\"./spy\");\nvar sinonStub = require(\"./stub\");\nvar sinonFake = require(\"./fake\");\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\nvar fakeServer = require(\"nise\").fakeServer;\nvar fakeXhr = require(\"nise\").fakeXhr;\nvar usePromiseLibrary = require(\"./util/core/use-promise-library\");\n\nvar filter = arrayProto.filter;\nvar forEach = arrayProto.filter;\nvar push = arrayProto.push;\nvar reverse = arrayProto.reverse;\n\nfunction applyOnEach(fakes, method) {\n    var matchingFakes = filter(fakes, function(fake) {\n        return typeof fake[method] === \"function\";\n    });\n\n    forEach(matchingFakes, function(fake) {\n        fake[method]();\n    });\n}\n\nfunction Sandbox() {\n    var sandbox = this;\n    var collection = [];\n    var fakeRestorers = [];\n    var promiseLib;\n\n    sandbox.serverPrototype = fakeServer;\n\n    // this is for testing only\n    sandbox.getFakes = function getFakes() {\n        return collection;\n    };\n\n    // this is for testing only\n    sandbox.getRestorers = function() {\n        return fakeRestorers;\n    };\n\n    sandbox.createStubInstance = function createStubInstance() {\n        var stubbed = sinonStub.createStubInstance.apply(null, arguments);\n\n        var ownMethods = collectOwnMethods(stubbed);\n\n        forEach(ownMethods, function(method) {\n            push(collection, method);\n        });\n\n        usePromiseLibrary(promiseLib, ownMethods);\n\n        return stubbed;\n    };\n\n    sandbox.inject = function inject(obj) {\n        obj.spy = function() {\n            return sandbox.spy.apply(null, arguments);\n        };\n\n        obj.stub = function() {\n            return sandbox.stub.apply(null, arguments);\n        };\n\n        obj.mock = function() {\n            return sandbox.mock.apply(null, arguments);\n        };\n\n        obj.createStubInstance = function() {\n            return sandbox.createStubInstance.apply(sandbox, arguments);\n        };\n\n        obj.fake = function() {\n            return sandbox.fake.apply(null, arguments);\n        };\n\n        obj.replace = function() {\n            return sandbox.replace.apply(null, arguments);\n        };\n\n        obj.replaceSetter = function() {\n            return sandbox.replaceSetter.apply(null, arguments);\n        };\n\n        obj.replaceGetter = function() {\n            return sandbox.replaceGetter.apply(null, arguments);\n        };\n\n        if (sandbox.clock) {\n            obj.clock = sandbox.clock;\n        }\n\n        if (sandbox.server) {\n            obj.server = sandbox.server;\n            obj.requests = sandbox.server.requests;\n        }\n\n        obj.match = match;\n\n        return obj;\n    };\n\n    sandbox.mock = function mock() {\n        var m = sinonMock.apply(null, arguments);\n\n        push(collection, m);\n        usePromiseLibrary(promiseLib, m);\n\n        return m;\n    };\n\n    sandbox.reset = function reset() {\n        applyOnEach(collection, \"reset\");\n        applyOnEach(collection, \"resetHistory\");\n    };\n\n    sandbox.resetBehavior = function resetBehavior() {\n        applyOnEach(collection, \"resetBehavior\");\n    };\n\n    sandbox.resetHistory = function resetHistory() {\n        function privateResetHistory(f) {\n            var method = f.resetHistory || f.reset;\n            if (method) {\n                method.call(f);\n            }\n        }\n\n        forEach(collection, function(fake) {\n            if (typeof fake === \"function\") {\n                privateResetHistory(fake);\n                return;\n            }\n\n            var methods = [];\n            if (fake.get) {\n                push(methods, fake.get);\n            }\n\n            if (fake.set) {\n                push(methods, fake.set);\n            }\n\n            forEach(methods, privateResetHistory);\n        });\n    };\n\n    sandbox.restore = function restore() {\n        if (arguments.length) {\n            throw new Error(\"sandbox.restore() does not take any parameters. Perhaps you meant stub.restore()\");\n        }\n\n        reverse(collection);\n        applyOnEach(collection, \"restore\");\n        collection = [];\n\n        forEach(fakeRestorers, function(restorer) {\n            restorer();\n        });\n        fakeRestorers = [];\n\n        sandbox.restoreContext();\n    };\n\n    sandbox.restoreContext = function restoreContext() {\n        var injectedKeys = sandbox.injectedKeys;\n        var injectInto = sandbox.injectInto;\n\n        if (!injectedKeys) {\n            return;\n        }\n\n        forEach(injectedKeys, function(injectedKey) {\n            delete injectInto[injectedKey];\n        });\n\n        injectedKeys = [];\n    };\n\n    function getFakeRestorer(object, property) {\n        var descriptor = getPropertyDescriptor(object, property);\n\n        function restorer() {\n            if (descriptor.isOwn) {\n                Object.defineProperty(object, property, descriptor);\n            } else {\n                delete object[property];\n            }\n        }\n        restorer.object = object;\n        restorer.property = property;\n        return restorer;\n    }\n\n    function verifyNotReplaced(object, property) {\n        forEach(fakeRestorers, function(fakeRestorer) {\n            if (fakeRestorer.object === object && fakeRestorer.property === property) {\n                throw new TypeError(\"Attempted to replace \" + property + \" which is already replaced\");\n            }\n        });\n    }\n\n    sandbox.replace = function replace(object, property, replacement) {\n        var descriptor = getPropertyDescriptor(object, property);\n\n        if (typeof descriptor === \"undefined\") {\n            throw new TypeError(\"Cannot replace non-existent property \" + valueToString(property));\n        }\n\n        if (typeof replacement === \"undefined\") {\n            throw new TypeError(\"Expected replacement argument to be defined\");\n        }\n\n        if (typeof descriptor.get === \"function\") {\n            throw new Error(\"Use sandbox.replaceGetter for replacing getters\");\n        }\n\n        if (typeof descriptor.set === \"function\") {\n            throw new Error(\"Use sandbox.replaceSetter for replacing setters\");\n        }\n\n        if (typeof object[property] !== typeof replacement) {\n            throw new TypeError(\"Cannot replace \" + typeof object[property] + \" with \" + typeof replacement);\n        }\n\n        verifyNotReplaced(object, property);\n\n        // store a function for restoring the replaced property\n        push(fakeRestorers, getFakeRestorer(object, property));\n\n        object[property] = replacement;\n\n        return replacement;\n    };\n\n    sandbox.replaceGetter = function replaceGetter(object, property, replacement) {\n        var descriptor = getPropertyDescriptor(object, property);\n\n        if (typeof descriptor === \"undefined\") {\n            throw new TypeError(\"Cannot replace non-existent property \" + valueToString(property));\n        }\n\n        if (typeof replacement !== \"function\") {\n            throw new TypeError(\"Expected replacement argument to be a function\");\n        }\n\n        if (typeof descriptor.get !== \"function\") {\n            throw new Error(\"`object.property` is not a getter\");\n        }\n\n        verifyNotReplaced(object, property);\n\n        // store a function for restoring the replaced property\n        push(fakeRestorers, getFakeRestorer(object, property));\n\n        Object.defineProperty(object, property, {\n            get: replacement,\n            configurable: isPropertyConfigurable(object, property)\n        });\n\n        return replacement;\n    };\n\n    sandbox.replaceSetter = function replaceSetter(object, property, replacement) {\n        var descriptor = getPropertyDescriptor(object, property);\n\n        if (typeof descriptor === \"undefined\") {\n            throw new TypeError(\"Cannot replace non-existent property \" + valueToString(property));\n        }\n\n        if (typeof replacement !== \"function\") {\n            throw new TypeError(\"Expected replacement argument to be a function\");\n        }\n\n        if (typeof descriptor.set !== \"function\") {\n            throw new Error(\"`object.property` is not a setter\");\n        }\n\n        verifyNotReplaced(object, property);\n\n        // store a function for restoring the replaced property\n        push(fakeRestorers, getFakeRestorer(object, property));\n\n        // eslint-disable-next-line accessor-pairs\n        Object.defineProperty(object, property, {\n            set: replacement,\n            configurable: isPropertyConfigurable(object, property)\n        });\n\n        return replacement;\n    };\n\n    function commonPostInitSetup(args, spy) {\n        var object = args[0];\n        var property = args[1];\n\n        var isSpyingOnEntireObject = typeof property === \"undefined\" && typeof object === \"object\";\n\n        if (isSpyingOnEntireObject) {\n            var ownMethods = collectOwnMethods(spy);\n\n            forEach(ownMethods, function(method) {\n                push(collection, method);\n            });\n\n            usePromiseLibrary(promiseLib, ownMethods);\n        } else {\n            push(collection, spy);\n            usePromiseLibrary(promiseLib, spy);\n        }\n\n        return spy;\n    }\n\n    sandbox.spy = function spy() {\n        var createdSpy = sinonSpy.apply(sinonSpy, arguments);\n        return commonPostInitSetup(arguments, createdSpy);\n    };\n\n    sandbox.stub = function stub() {\n        var createdStub = sinonStub.apply(sinonStub, arguments);\n        return commonPostInitSetup(arguments, createdStub);\n    };\n\n    // eslint-disable-next-line no-unused-vars\n    sandbox.fake = function fake(f) {\n        var s = sinonFake.apply(sinonFake, arguments);\n\n        push(collection, s);\n\n        return s;\n    };\n\n    forEach(Object.keys(sinonFake), function(key) {\n        var fakeBehavior = sinonFake[key];\n        if (typeof fakeBehavior === \"function\") {\n            sandbox.fake[key] = function() {\n                var s = fakeBehavior.apply(fakeBehavior, arguments);\n\n                push(collection, s);\n\n                return s;\n            };\n        }\n    });\n\n    sandbox.useFakeTimers = function useFakeTimers(args) {\n        var clock = sinonClock.useFakeTimers.call(null, args);\n\n        sandbox.clock = clock;\n        push(collection, clock);\n\n        return clock;\n    };\n\n    sandbox.verify = function verify() {\n        applyOnEach(collection, \"verify\");\n    };\n\n    sandbox.verifyAndRestore = function verifyAndRestore() {\n        var exception;\n\n        try {\n            sandbox.verify();\n        } catch (e) {\n            exception = e;\n        }\n\n        sandbox.restore();\n\n        if (exception) {\n            throw exception;\n        }\n    };\n\n    sandbox.useFakeServer = function useFakeServer() {\n        var proto = sandbox.serverPrototype || fakeServer;\n\n        if (!proto || !proto.create) {\n            return null;\n        }\n\n        sandbox.server = proto.create();\n        push(collection, sandbox.server);\n\n        return sandbox.server;\n    };\n\n    sandbox.useFakeXMLHttpRequest = function useFakeXMLHttpRequest() {\n        var xhr = fakeXhr.useFakeXMLHttpRequest();\n        push(collection, xhr);\n        return xhr;\n    };\n\n    sandbox.usingPromise = function usingPromise(promiseLibrary) {\n        promiseLib = promiseLibrary;\n        collection.promiseLibrary = promiseLibrary;\n\n        return sandbox;\n    };\n}\n\nSandbox.prototype.assert = sinonAssert;\nSandbox.prototype.match = match;\n\nmodule.exports = Sandbox;\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar color = require(\"./color\");\nvar match = require(\"@sinonjs/samsam\").createMatcher;\nvar timesInWords = require(\"./util/core/times-in-words\");\nvar sinonFormat = require(\"./util/core/format\");\nvar jsDiff = require(\"diff\");\n\nvar join = arrayProto.join;\nvar map = arrayProto.map;\nvar push = arrayProto.push;\n\nfunction colorSinonMatchText(matcher, calledArg, calledArgMessage) {\n    var calledArgumentMessage = calledArgMessage;\n    if (!matcher.test(calledArg)) {\n        matcher.message = color.red(matcher.message);\n        if (calledArgumentMessage) {\n            calledArgumentMessage = color.green(calledArgumentMessage);\n        }\n    }\n    return calledArgumentMessage + \" \" + matcher.message;\n}\n\nfunction colorDiffText(diff) {\n    var objects = map(diff, function(part) {\n        var text = part.value;\n        if (part.added) {\n            text = color.green(text);\n        } else if (part.removed) {\n            text = color.red(text);\n        }\n        if (diff.length === 2) {\n            text += \" \"; // format simple diffs\n        }\n        return text;\n    });\n    return join(objects, \"\");\n}\n\nmodule.exports = {\n    c: function(spyInstance) {\n        return timesInWords(spyInstance.callCount);\n    },\n\n    n: function(spyInstance) {\n        // eslint-disable-next-line local-rules/no-prototype-methods\n        return spyInstance.toString();\n    },\n\n    D: function(spyInstance, args) {\n        var message = \"\";\n\n        for (var i = 0, l = spyInstance.callCount; i < l; ++i) {\n            // describe multiple calls\n            if (l > 1) {\n                message += \"\\nCall \" + (i + 1) + \":\";\n            }\n            var calledArgs = spyInstance.getCall(i).args;\n            for (var j = 0; j < calledArgs.length || j < args.length; ++j) {\n                message += \"\\n\";\n                var calledArgMessage = j < calledArgs.length ? sinonFormat(calledArgs[j]) : \"\";\n                if (match.isMatcher(args[j])) {\n                    message += colorSinonMatchText(args[j], calledArgs[j], calledArgMessage);\n                } else {\n                    var expectedArgMessage = j < args.length ? sinonFormat(args[j]) : \"\";\n                    var diff = jsDiff.diffJson(calledArgMessage, expectedArgMessage);\n                    message += colorDiffText(diff);\n                }\n            }\n        }\n\n        return message;\n    },\n\n    C: function(spyInstance) {\n        var calls = [];\n\n        for (var i = 0, l = spyInstance.callCount; i < l; ++i) {\n            // eslint-disable-next-line local-rules/no-prototype-methods\n            var stringifiedCall = \"    \" + spyInstance.getCall(i).toString();\n            if (/\\n/.test(calls[i - 1])) {\n                stringifiedCall = \"\\n\" + stringifiedCall;\n            }\n            push(calls, stringifiedCall);\n        }\n\n        return calls.length > 0 ? \"\\n\" + join(calls, \"\\n\") : \"\";\n    },\n\n    t: function(spyInstance) {\n        var objects = [];\n\n        for (var i = 0, l = spyInstance.callCount; i < l; ++i) {\n            push(objects, sinonFormat(spyInstance.thisValues[i]));\n        }\n\n        return join(objects, \", \");\n    },\n\n    \"*\": function(spyInstance, args) {\n        return join(\n            map(args, function(arg) {\n                return sinonFormat(arg);\n            }),\n            \", \"\n        );\n    }\n};\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar createProxy = require(\"./proxy\");\nvar extend = require(\"./util/core/extend\");\nvar functionName = require(\"@sinonjs/commons\").functionName;\nvar getPropertyDescriptor = require(\"./util/core/get-property-descriptor\");\nvar deepEqual = require(\"@sinonjs/samsam\").deepEqual;\nvar isEsModule = require(\"./util/core/is-es-module\");\nvar proxyCallUtil = require(\"./proxy-call-util\");\nvar walkObject = require(\"./util/core/walk-object\");\nvar wrapMethod = require(\"./util/core/wrap-method\");\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\n\n/* cache references to library methods so that they also can be stubbed without problems */\nvar forEach = arrayProto.forEach;\nvar pop = arrayProto.pop;\nvar push = arrayProto.push;\nvar slice = arrayProto.slice;\nvar filter = Array.prototype.filter;\n\nvar uuid = 0;\n\nfunction matches(fake, args, strict) {\n    var margs = fake.matchingArguments;\n    if (margs.length <= args.length && deepEqual(slice(args, 0, margs.length), margs)) {\n        return !strict || margs.length === args.length;\n    }\n    return false;\n}\n\n// Public API\nvar spyApi = {\n    withArgs: function() {\n        var args = slice(arguments);\n        var matching = pop(this.matchingFakes(args, true));\n        if (matching) {\n            return matching;\n        }\n\n        var original = this;\n        var fake = this.instantiateFake();\n        fake.matchingArguments = args;\n        fake.parent = this;\n        push(this.fakes, fake);\n\n        fake.withArgs = function() {\n            return original.withArgs.apply(original, arguments);\n        };\n\n        forEach(original.args, function(arg, i) {\n            if (!matches(fake, arg)) {\n                return;\n            }\n\n            proxyCallUtil.incrementCallCount(fake);\n            push(fake.thisValues, original.thisValues[i]);\n            push(fake.args, arg);\n            push(fake.returnValues, original.returnValues[i]);\n            push(fake.exceptions, original.exceptions[i]);\n            push(fake.callIds, original.callIds[i]);\n        });\n\n        proxyCallUtil.createCallProperties(fake);\n\n        return fake;\n    },\n\n    // Override proxy default implementation\n    matchingFakes: function(args, strict) {\n        return filter.call(this.fakes, function(fake) {\n            return matches(fake, args, strict);\n        });\n    }\n};\n\n/* eslint-disable local-rules/no-prototype-methods */\nvar delegateToCalls = proxyCallUtil.delegateToCalls;\ndelegateToCalls(spyApi, \"callArg\", false, \"callArgWith\", true, function() {\n    throw new Error(this.toString() + \" cannot call arg since it was not yet invoked.\");\n});\nspyApi.callArgWith = spyApi.callArg;\ndelegateToCalls(spyApi, \"callArgOn\", false, \"callArgOnWith\", true, function() {\n    throw new Error(this.toString() + \" cannot call arg since it was not yet invoked.\");\n});\nspyApi.callArgOnWith = spyApi.callArgOn;\ndelegateToCalls(spyApi, \"throwArg\", false, \"throwArg\", false, function() {\n    throw new Error(this.toString() + \" cannot throw arg since it was not yet invoked.\");\n});\ndelegateToCalls(spyApi, \"yield\", false, \"yield\", true, function() {\n    throw new Error(this.toString() + \" cannot yield since it was not yet invoked.\");\n});\n// \"invokeCallback\" is an alias for \"yield\" since \"yield\" is invalid in strict mode.\nspyApi.invokeCallback = spyApi.yield;\ndelegateToCalls(spyApi, \"yieldOn\", false, \"yieldOn\", true, function() {\n    throw new Error(this.toString() + \" cannot yield since it was not yet invoked.\");\n});\ndelegateToCalls(spyApi, \"yieldTo\", false, \"yieldTo\", true, function(property) {\n    throw new Error(\n        this.toString() + \" cannot yield to '\" + valueToString(property) + \"' since it was not yet invoked.\"\n    );\n});\ndelegateToCalls(spyApi, \"yieldToOn\", false, \"yieldToOn\", true, function(property) {\n    throw new Error(\n        this.toString() + \" cannot yield to '\" + valueToString(property) + \"' since it was not yet invoked.\"\n    );\n});\n/* eslint-enable local-rules/no-prototype-methods */\n\nfunction createSpy(func) {\n    var name;\n    var funk = func;\n\n    if (typeof funk !== \"function\") {\n        funk = function() {\n            return;\n        };\n    } else {\n        name = functionName(funk);\n    }\n\n    var proxy = createProxy(funk, funk);\n\n    // Inherit spy API:\n    extend.nonEnum(proxy, spyApi);\n    extend.nonEnum(proxy, {\n        displayName: name || \"spy\",\n        fakes: [],\n        instantiateFake: createSpy,\n        id: \"spy#\" + uuid++\n    });\n    return proxy;\n}\n\nfunction spy(object, property, types) {\n    var descriptor, methodDesc;\n\n    if (isEsModule(object)) {\n        throw new TypeError(\"ES Modules cannot be spied\");\n    }\n\n    if (!property && typeof object === \"function\") {\n        return createSpy(object);\n    }\n\n    if (!property && typeof object === \"object\") {\n        return walkObject(spy, object);\n    }\n\n    if (!object && !property) {\n        return createSpy(function() {\n            return;\n        });\n    }\n\n    if (!types) {\n        return wrapMethod(object, property, createSpy(object[property]));\n    }\n\n    descriptor = {};\n    methodDesc = getPropertyDescriptor(object, property);\n\n    forEach(types, function(type) {\n        descriptor[type] = createSpy(methodDesc[type]);\n    });\n\n    return wrapMethod(object, property, descriptor);\n}\n\nextend(spy, spyApi);\nmodule.exports = spy;\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar behavior = require(\"./behavior\");\nvar behaviors = require(\"./default-behaviors\");\nvar createProxy = require(\"./proxy\");\nvar functionName = require(\"@sinonjs/commons\").functionName;\nvar hasOwnProperty = require(\"@sinonjs/commons\").prototypes.object.hasOwnProperty;\nvar isNonExistentProperty = require(\"./util/core/is-non-existent-property\");\nvar spy = require(\"./spy\");\nvar extend = require(\"./util/core/extend\");\nvar getPropertyDescriptor = require(\"./util/core/get-property-descriptor\");\nvar isEsModule = require(\"./util/core/is-es-module\");\nvar wrapMethod = require(\"./util/core/wrap-method\");\nvar throwOnFalsyObject = require(\"./throw-on-falsy-object\");\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\nvar walkObject = require(\"./util/core/walk-object\");\n\nvar forEach = arrayProto.forEach;\nvar pop = arrayProto.pop;\nvar slice = arrayProto.slice;\nvar sort = arrayProto.sort;\n\nvar uuid = 0;\n\nfunction createStub(originalFunc) {\n    var proxy;\n\n    function functionStub() {\n        var args = slice(arguments);\n        var matchings = proxy.matchingFakes(args);\n\n        var fnStub =\n            pop(\n                sort(matchings, function(a, b) {\n                    return a.matchingArguments.length - b.matchingArguments.length;\n                })\n            ) || proxy;\n        return getCurrentBehavior(fnStub).invoke(this, arguments);\n    }\n\n    proxy = createProxy(functionStub, originalFunc || functionStub);\n    // Inherit spy API:\n    extend.nonEnum(proxy, spy);\n    // Inherit stub API:\n    extend.nonEnum(proxy, stub);\n\n    var name = originalFunc ? functionName(originalFunc) : null;\n    extend.nonEnum(proxy, {\n        fakes: [],\n        instantiateFake: createStub,\n        displayName: name || \"stub\",\n        defaultBehavior: null,\n        behaviors: [],\n        id: \"stub#\" + uuid++\n    });\n\n    return proxy;\n}\n\nfunction stub(object, property) {\n    if (arguments.length > 2) {\n        throw new TypeError(\"stub(obj, 'meth', fn) has been removed, see documentation\");\n    }\n\n    if (isEsModule(object)) {\n        throw new TypeError(\"ES Modules cannot be stubbed\");\n    }\n\n    throwOnFalsyObject.apply(null, arguments);\n\n    if (isNonExistentProperty(object, property)) {\n        throw new TypeError(\"Cannot stub non-existent property \" + valueToString(property));\n    }\n\n    var actualDescriptor = getPropertyDescriptor(object, property);\n    var isObjectOrFunction = typeof object === \"object\" || typeof object === \"function\";\n    var isStubbingEntireObject = typeof property === \"undefined\" && isObjectOrFunction;\n    var isCreatingNewStub = !object && typeof property === \"undefined\";\n    var isStubbingNonFuncProperty =\n        isObjectOrFunction &&\n        typeof property !== \"undefined\" &&\n        (typeof actualDescriptor === \"undefined\" || typeof actualDescriptor.value !== \"function\") &&\n        typeof descriptor === \"undefined\";\n\n    if (isStubbingEntireObject) {\n        return walkObject(stub, object);\n    }\n\n    if (isCreatingNewStub) {\n        return createStub();\n    }\n\n    var func = typeof actualDescriptor.value === \"function\" ? actualDescriptor.value : null;\n    var s = createStub(func);\n\n    extend.nonEnum(s, {\n        rootObj: object,\n        propName: property,\n        shadowsPropOnPrototype: !actualDescriptor.isOwn,\n        restore: function restore() {\n            if (actualDescriptor !== undefined && actualDescriptor.isOwn) {\n                Object.defineProperty(object, property, actualDescriptor);\n                return;\n            }\n\n            delete object[property];\n        }\n    });\n\n    return isStubbingNonFuncProperty ? s : wrapMethod(object, property, s);\n}\n\nstub.createStubInstance = function(constructor, overrides) {\n    if (typeof constructor !== \"function\") {\n        throw new TypeError(\"The constructor should be a function.\");\n    }\n\n    var stubbedObject = stub(Object.create(constructor.prototype));\n\n    forEach(Object.keys(overrides || {}), function(propertyName) {\n        if (propertyName in stubbedObject) {\n            var value = overrides[propertyName];\n            if (value && value.createStubInstance) {\n                stubbedObject[propertyName] = value;\n            } else {\n                stubbedObject[propertyName].returns(value);\n            }\n        } else {\n            throw new Error(\"Cannot stub \" + propertyName + \". Property does not exist!\");\n        }\n    });\n    return stubbedObject;\n};\n\n/*eslint-disable no-use-before-define*/\nfunction getParentBehaviour(stubInstance) {\n    return stubInstance.parent && getCurrentBehavior(stubInstance.parent);\n}\n\nfunction getDefaultBehavior(stubInstance) {\n    return stubInstance.defaultBehavior || getParentBehaviour(stubInstance) || behavior.create(stubInstance);\n}\n\nfunction getCurrentBehavior(stubInstance) {\n    var currentBehavior = stubInstance.behaviors[stubInstance.callCount - 1];\n    return currentBehavior && currentBehavior.isPresent() ? currentBehavior : getDefaultBehavior(stubInstance);\n}\n/*eslint-enable no-use-before-define*/\n\nvar proto = {\n    resetBehavior: function() {\n        this.defaultBehavior = null;\n        this.behaviors = [];\n\n        delete this.returnValue;\n        delete this.returnArgAt;\n        delete this.throwArgAt;\n        delete this.resolveArgAt;\n        delete this.fakeFn;\n        this.returnThis = false;\n        this.resolveThis = false;\n\n        forEach(this.fakes, function(fake) {\n            fake.resetBehavior();\n        });\n    },\n\n    reset: function() {\n        this.resetHistory();\n        this.resetBehavior();\n    },\n\n    onCall: function onCall(index) {\n        if (!this.behaviors[index]) {\n            this.behaviors[index] = behavior.create(this);\n        }\n\n        return this.behaviors[index];\n    },\n\n    onFirstCall: function onFirstCall() {\n        return this.onCall(0);\n    },\n\n    onSecondCall: function onSecondCall() {\n        return this.onCall(1);\n    },\n\n    onThirdCall: function onThirdCall() {\n        return this.onCall(2);\n    },\n\n    withArgs: function withArgs() {\n        var fake = spy.withArgs.apply(this, arguments);\n        if (this.defaultBehavior && this.defaultBehavior.promiseLibrary) {\n            fake.defaultBehavior = fake.defaultBehavior || behavior.create(fake);\n            fake.defaultBehavior.promiseLibrary = this.defaultBehavior.promiseLibrary;\n        }\n        return fake;\n    }\n};\n\nforEach(Object.keys(behavior), function(method) {\n    if (\n        hasOwnProperty(behavior, method) &&\n        !hasOwnProperty(proto, method) &&\n        method !== \"create\" &&\n        method !== \"invoke\"\n    ) {\n        proto[method] = behavior.createBehavior(method);\n    }\n});\n\nforEach(Object.keys(behaviors), function(method) {\n    if (hasOwnProperty(behaviors, method) && !hasOwnProperty(proto, method)) {\n        behavior.addBehavior(stub, method, behaviors[method]);\n    }\n});\n\nextend(stub, proto);\nmodule.exports = stub;\n","\"use strict\";\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\n\nfunction throwOnFalsyObject(object, property) {\n    if (property && !object) {\n        var type = object === null ? \"null\" : \"undefined\";\n        throw new Error(\"Trying to stub property '\" + valueToString(property) + \"' of \" + type);\n    }\n}\n\nmodule.exports = throwOnFalsyObject;\n","\"use strict\";\n\nmodule.exports = {\n    injectInto: null,\n    properties: [\n        \"spy\",\n        \"stub\",\n        \"mock\",\n        \"clock\",\n        \"server\",\n        \"requests\",\n        \"fake\",\n        \"replace\",\n        \"replaceSetter\",\n        \"replaceGetter\",\n        \"createStubInstance\"\n    ],\n    useFakeTimers: true,\n    useFakeServer: true\n};\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar reduce = arrayProto.reduce;\n\nmodule.exports = function exportAsyncBehaviors(behaviorMethods) {\n    return reduce(\n        Object.keys(behaviorMethods),\n        function(acc, method) {\n            // need to avoid creating another async versions of the newly added async methods\n            if (method.match(/^(callsArg|yields)/) && !method.match(/Async/)) {\n                acc[method + \"Async\"] = function() {\n                    var result = behaviorMethods[method].apply(this, arguments);\n                    this.callbackAsync = true;\n                    return result;\n                };\n            }\n            return acc;\n        },\n        {}\n    );\n};\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar hasOwnProperty = require(\"@sinonjs/commons\").prototypes.object.hasOwnProperty;\n\nvar join = arrayProto.join;\nvar push = arrayProto.push;\nvar slice = arrayProto.slice;\n\n// Adapted from https://developer.mozilla.org/en/docs/ECMAScript_DontEnum_attribute#JScript_DontEnum_Bug\nvar hasDontEnumBug = (function() {\n    var obj = {\n        constructor: function() {\n            return \"0\";\n        },\n        toString: function() {\n            return \"1\";\n        },\n        valueOf: function() {\n            return \"2\";\n        },\n        toLocaleString: function() {\n            return \"3\";\n        },\n        prototype: function() {\n            return \"4\";\n        },\n        isPrototypeOf: function() {\n            return \"5\";\n        },\n        propertyIsEnumerable: function() {\n            return \"6\";\n        },\n        hasOwnProperty: function() {\n            return \"7\";\n        },\n        length: function() {\n            return \"8\";\n        },\n        unique: function() {\n            return \"9\";\n        }\n    };\n\n    var result = [];\n    for (var prop in obj) {\n        if (hasOwnProperty(obj, prop)) {\n            push(result, obj[prop]());\n        }\n    }\n    return join(result, \"\") !== \"0123456789\";\n})();\n\nfunction extendCommon(target, sources, doCopy) {\n    var source, i, prop;\n\n    for (i = 0; i < sources.length; i++) {\n        source = sources[i];\n\n        for (prop in source) {\n            if (hasOwnProperty(source, prop)) {\n                doCopy(target, source, prop);\n            }\n        }\n\n        // Make sure we copy (own) toString method even when in JScript with DontEnum bug\n        // See https://developer.mozilla.org/en/docs/ECMAScript_DontEnum_attribute#JScript_DontEnum_Bug\n        if (hasDontEnumBug && hasOwnProperty(source, \"toString\") && source.toString !== target.toString) {\n            target.toString = source.toString;\n        }\n    }\n\n    return target;\n}\n\n/** Public: Extend target in place with all (own) properties from sources in-order. Thus, last source will\n *         override properties in previous sources.\n *\n * @arg {Object} target - The Object to extend\n * @arg {Object[]} sources - Objects to copy properties from.\n *\n * @returns {Object} the extended target\n */\nmodule.exports = function extend(target /*, sources */) {\n    var sources = slice(arguments, 1);\n\n    return extendCommon(target, sources, function copyValue(dest, source, prop) {\n        dest[prop] = source[prop];\n    });\n};\n\n/** Public: Extend target in place with all (own) properties from sources in-order. Thus, last source will\n *         override properties in previous sources. Define the properties as non enumerable.\n *\n * @arg {Object} target - The Object to extend\n * @arg {Object[]} sources - Objects to copy properties from.\n *\n * @returns {Object} the extended target\n */\nmodule.exports.nonEnum = function extendNonEnum(target /*, sources */) {\n    var sources = slice(arguments, 1);\n\n    return extendCommon(target, sources, function copyProperty(dest, source, prop) {\n        Object.defineProperty(dest, prop, {\n            value: source[prop],\n            enumerable: false,\n            configurable: true,\n            writable: true\n        });\n    });\n};\n","\"use strict\";\n\nvar formatio = require(\"@sinonjs/formatio\");\n\nvar formatter = formatio.configure({\n    quoteStrings: false,\n    limitChildrenCount: 250\n});\n\nvar customFormatter;\n\nfunction format() {\n    if (customFormatter) {\n        return customFormatter.apply(null, arguments);\n    }\n\n    return formatter.ascii.apply(formatter, arguments);\n}\n\nformat.setFormatter = function(aCustomFormatter) {\n    if (typeof aCustomFormatter !== \"function\") {\n        throw new Error(\"format.setFormatter must be called with a function\");\n    }\n\n    customFormatter = aCustomFormatter;\n};\n\nmodule.exports = format;\n","\"use strict\";\n\nmodule.exports = function toString() {\n    var i, prop, thisValue;\n    if (this.getCall && this.callCount) {\n        i = this.callCount;\n\n        while (i--) {\n            thisValue = this.getCall(i).thisValue;\n\n            // eslint-disable-next-line guard-for-in\n            for (prop in thisValue) {\n                try {\n                    if (thisValue[prop] === this) {\n                        return prop;\n                    }\n                } catch (e) {\n                    // no-op - accessing props can throw an error, nothing to do here\n                }\n            }\n        }\n    }\n\n    return this.displayName || \"sinon fake\";\n};\n","\"use strict\";\n\n/* istanbul ignore next : not testing that setTimeout works */\nfunction nextTick(callback) {\n    setTimeout(callback, 0);\n}\n\nmodule.exports = function getNextTick(process, setImmediate) {\n    if (typeof process === \"object\" && typeof process.nextTick === \"function\") {\n        return process.nextTick;\n    }\n\n    if (typeof setImmediate === \"function\") {\n        return setImmediate;\n    }\n\n    return nextTick;\n};\n","\"use strict\";\n\nmodule.exports = function getPropertyDescriptor(object, property) {\n    var proto = object;\n    var descriptor;\n    var isOwn = Boolean(object && Object.getOwnPropertyDescriptor(object, property));\n\n    while (proto && !(descriptor = Object.getOwnPropertyDescriptor(proto, property))) {\n        proto = Object.getPrototypeOf(proto);\n    }\n\n    if (descriptor) {\n        descriptor.isOwn = isOwn;\n    }\n\n    return descriptor;\n};\n","\"use strict\";\n\n/**\n * Verify if an object is a ECMAScript Module\n *\n * As the exports from a module is immutable we cannot alter the exports\n * using spies or stubs. Let the consumer know this to avoid bug reports\n * on weird error messages.\n *\n * @param {Object} object The object to examine\n *\n * @returns {Boolean} true when the object is a module\n */\nmodule.exports = function(object) {\n    return (\n        object && typeof Symbol !== \"undefined\" && object[Symbol.toStringTag] === \"Module\" && Object.isSealed(object)\n    );\n};\n","\"use strict\";\n\n/**\n * @param {*} object\n * @param {String} property\n * @returns whether a prop exists in the prototype chain\n */\nfunction isNonExistentProperty(object, property) {\n    return object && typeof property !== \"undefined\" && !(property in object);\n}\n\nmodule.exports = isNonExistentProperty;\n","\"use strict\";\n\nvar getPropertyDescriptor = require(\"./get-property-descriptor\");\n\nfunction isPropertyConfigurable(obj, propName) {\n    var propertyDescriptor = getPropertyDescriptor(obj, propName);\n\n    return propertyDescriptor ? propertyDescriptor.configurable : true;\n}\n\nmodule.exports = isPropertyConfigurable;\n","\"use strict\";\n\nvar globalObject = require(\"@sinonjs/commons\").global;\nvar getNextTick = require(\"./get-next-tick\");\n\nmodule.exports = getNextTick(globalObject.process, globalObject.setImmediate);\n","\"use strict\";\n\nvar array = [null, \"once\", \"twice\", \"thrice\"];\n\nmodule.exports = function timesInWords(count) {\n    return array[count] || (count || 0) + \" times\";\n};\n","\"use strict\";\n\nvar forEach = Array.prototype.forEach;\n\nfunction usePromiseLibrary(library, fakes) {\n    if (typeof library === \"undefined\") {\n        return;\n    }\n\n    if (Array.isArray(fakes)) {\n        forEach.call(fakes, usePromiseLibrary.bind(null, library));\n\n        return;\n    }\n\n    if (typeof fakes.usingPromise === \"function\") {\n        fakes.usingPromise(library);\n    }\n}\n\nmodule.exports = usePromiseLibrary;\n","\"use strict\";\n\nvar functionName = require(\"@sinonjs/commons\").functionName;\n\nvar getPropertyDescriptor = require(\"./get-property-descriptor\");\nvar walk = require(\"./walk\");\n\nfunction walkObject(predicate, object, filter) {\n    var called = false;\n    var name = functionName(predicate);\n\n    if (!object) {\n        throw new Error(\"Trying to \" + name + \" object but received \" + String(object));\n    }\n\n    walk(object, function(prop, propOwner) {\n        // we don't want to stub things like toString(), valueOf(), etc. so we only stub if the object\n        // is not Object.prototype\n        if (\n            propOwner !== Object.prototype &&\n            prop !== \"constructor\" &&\n            typeof getPropertyDescriptor(propOwner, prop).value === \"function\"\n        ) {\n            if (filter) {\n                if (filter(object, prop)) {\n                    called = true;\n                    predicate(object, prop);\n                }\n            } else {\n                called = true;\n                predicate(object, prop);\n            }\n        }\n    });\n\n    if (!called) {\n        throw new Error(\"Expected to \" + name + \" methods on object but found none\");\n    }\n\n    return object;\n}\n\nmodule.exports = walkObject;\n","\"use strict\";\n\nvar forEach = require(\"@sinonjs/commons\").prototypes.array.forEach;\n\nfunction walkInternal(obj, iterator, context, originalObj, seen) {\n    var proto, prop;\n\n    if (typeof Object.getOwnPropertyNames !== \"function\") {\n        // We explicitly want to enumerate through all of the prototype's properties\n        // in this case, therefore we deliberately leave out an own property check.\n        /* eslint-disable-next-line guard-for-in */\n        for (prop in obj) {\n            iterator.call(context, obj[prop], prop, obj);\n        }\n\n        return;\n    }\n\n    forEach(Object.getOwnPropertyNames(obj), function(k) {\n        if (seen[k] !== true) {\n            seen[k] = true;\n            var target = typeof Object.getOwnPropertyDescriptor(obj, k).get === \"function\" ? originalObj : obj;\n            iterator.call(context, k, target);\n        }\n    });\n\n    proto = Object.getPrototypeOf(obj);\n    if (proto) {\n        walkInternal(proto, iterator, context, originalObj, seen);\n    }\n}\n\n/* Walks the prototype chain of an object and iterates over every own property\n * name encountered. The iterator is called in the same fashion that Array.prototype.forEach\n * works, where it is passed the value, key, and own object as the 1st, 2nd, and 3rd positional\n * argument, respectively. In cases where Object.getOwnPropertyNames is not available, walk will\n * default to using a simple for..in loop.\n *\n * obj - The object to walk the prototype chain for.\n * iterator - The function to be called on each pass of the walk.\n * context - (Optional) When given, the iterator will be called with this object as the receiver.\n */\nmodule.exports = function walk(obj, iterator, context) {\n    return walkInternal(obj, iterator, context, obj, {});\n};\n","\"use strict\";\n\nvar getPropertyDescriptor = require(\"./get-property-descriptor\");\nvar extend = require(\"./extend\");\nvar hasOwnProperty = require(\"@sinonjs/commons\").prototypes.object.hasOwnProperty;\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\n\nfunction isFunction(obj) {\n    return typeof obj === \"function\" || Boolean(obj && obj.constructor && obj.call && obj.apply);\n}\n\nfunction mirrorProperties(target, source) {\n    for (var prop in source) {\n        if (!hasOwnProperty(target, prop)) {\n            target[prop] = source[prop];\n        }\n    }\n}\n\n// Cheap way to detect if we have ES5 support.\nvar hasES5Support = \"keys\" in Object;\n\nmodule.exports = function wrapMethod(object, property, method) {\n    if (!object) {\n        throw new TypeError(\"Should wrap property of object\");\n    }\n\n    if (typeof method !== \"function\" && typeof method !== \"object\") {\n        throw new TypeError(\"Method wrapper should be a function or a property descriptor\");\n    }\n\n    function checkWrappedMethod(wrappedMethod) {\n        var error;\n\n        if (!isFunction(wrappedMethod)) {\n            error = new TypeError(\n                \"Attempted to wrap \" + typeof wrappedMethod + \" property \" + valueToString(property) + \" as function\"\n            );\n        } else if (wrappedMethod.restore && wrappedMethod.restore.sinon) {\n            error = new TypeError(\"Attempted to wrap \" + valueToString(property) + \" which is already wrapped\");\n        } else if (wrappedMethod.calledBefore) {\n            var verb = wrappedMethod.returns ? \"stubbed\" : \"spied on\";\n            error = new TypeError(\"Attempted to wrap \" + valueToString(property) + \" which is already \" + verb);\n        }\n\n        if (error) {\n            if (wrappedMethod && wrappedMethod.stackTraceError) {\n                error.stack += \"\\n--------------\\n\" + wrappedMethod.stackTraceError.stack;\n            }\n            throw error;\n        }\n    }\n\n    var error, wrappedMethod, i, wrappedMethodDesc;\n\n    function simplePropertyAssignment() {\n        wrappedMethod = object[property];\n        checkWrappedMethod(wrappedMethod);\n        object[property] = method;\n        method.displayName = property;\n    }\n\n    // Firefox has a problem when using hasOwn.call on objects from other frames.\n    /* eslint-disable-next-line local-rules/no-prototype-methods */\n    var owned = object.hasOwnProperty ? object.hasOwnProperty(property) : hasOwnProperty(object, property);\n\n    if (hasES5Support) {\n        var methodDesc = typeof method === \"function\" ? { value: method } : method;\n        wrappedMethodDesc = getPropertyDescriptor(object, property);\n\n        if (!wrappedMethodDesc) {\n            error = new TypeError(\n                \"Attempted to wrap \" + typeof wrappedMethod + \" property \" + property + \" as function\"\n            );\n        } else if (wrappedMethodDesc.restore && wrappedMethodDesc.restore.sinon) {\n            error = new TypeError(\"Attempted to wrap \" + property + \" which is already wrapped\");\n        }\n        if (error) {\n            if (wrappedMethodDesc && wrappedMethodDesc.stackTraceError) {\n                error.stack += \"\\n--------------\\n\" + wrappedMethodDesc.stackTraceError.stack;\n            }\n            throw error;\n        }\n\n        var types = Object.keys(methodDesc);\n        for (i = 0; i < types.length; i++) {\n            wrappedMethod = wrappedMethodDesc[types[i]];\n            checkWrappedMethod(wrappedMethod);\n        }\n\n        mirrorProperties(methodDesc, wrappedMethodDesc);\n        for (i = 0; i < types.length; i++) {\n            mirrorProperties(methodDesc[types[i]], wrappedMethodDesc[types[i]]);\n        }\n        Object.defineProperty(object, property, methodDesc);\n\n        // catch failing assignment\n        // this is the converse of the check in `.restore` below\n        if (typeof method === \"function\" && object[property] !== method) {\n            // correct any wrongdoings caused by the defineProperty call above,\n            // such as adding new items (if object was a Storage object)\n            delete object[property];\n            simplePropertyAssignment();\n        }\n    } else {\n        simplePropertyAssignment();\n    }\n\n    extend.nonEnum(method, {\n        displayName: property,\n\n        wrappedMethod: wrappedMethod,\n\n        // Set up an Error object for a stack trace which can be used later to find what line of\n        // code the original method was created on.\n        stackTraceError: new Error(\"Stack Trace for original\"),\n\n        restore: function() {\n            // For prototype properties try to reset by delete first.\n            // If this fails (ex: localStorage on mobile safari) then force a reset\n            // via direct assignment.\n            if (!owned) {\n                // In some cases `delete` may throw an error\n                try {\n                    delete object[property];\n                } catch (e) {} // eslint-disable-line no-empty\n                // For native code functions `delete` fails without throwing an error\n                // on Chrome < 43, PhantomJS, etc.\n            } else if (hasES5Support) {\n                Object.defineProperty(object, property, wrappedMethodDesc);\n            }\n\n            if (hasES5Support) {\n                var descriptor = getPropertyDescriptor(object, property);\n                if (descriptor && descriptor.value === method) {\n                    object[property] = wrappedMethod;\n                }\n            } else {\n                // Use strict equality comparison to check failures then force a reset\n                // via direct assignment.\n                if (object[property] === method) {\n                    object[property] = wrappedMethod;\n                }\n            }\n        }\n    });\n\n    method.restore.sinon = true;\n\n    if (!hasES5Support) {\n        mirrorProperties(method, wrappedMethod);\n    }\n\n    return method;\n};\n","\"use strict\";\n\nvar extend = require(\"./core/extend\");\nvar FakeTimers = require(\"@sinonjs/fake-timers\");\nvar globalObject = require(\"@sinonjs/commons\").global;\n\nfunction createClock(config, globalCtx) {\n    var FakeTimersCtx = FakeTimers;\n    if (globalCtx !== null && typeof globalCtx === \"object\") {\n        FakeTimersCtx = FakeTimers.withGlobal(globalCtx);\n    }\n    var clock = FakeTimersCtx.install(config);\n    clock.restore = clock.uninstall;\n    return clock;\n}\n\nfunction addIfDefined(obj, globalPropName) {\n    var globalProp = globalObject[globalPropName];\n    if (typeof globalProp !== \"undefined\") {\n        obj[globalPropName] = globalProp;\n    }\n}\n\n/**\n * @param {number|Date|Object} dateOrConfig The unix epoch value to install with (default 0)\n * @returns {Object} Returns a lolex clock instance\n */\nexports.useFakeTimers = function(dateOrConfig) {\n    var hasArguments = typeof dateOrConfig !== \"undefined\";\n    var argumentIsDateLike =\n        (typeof dateOrConfig === \"number\" || dateOrConfig instanceof Date) && arguments.length === 1;\n    var argumentIsObject = dateOrConfig !== null && typeof dateOrConfig === \"object\" && arguments.length === 1;\n\n    if (!hasArguments) {\n        return createClock({\n            now: 0\n        });\n    }\n\n    if (argumentIsDateLike) {\n        return createClock({\n            now: dateOrConfig\n        });\n    }\n\n    if (argumentIsObject) {\n        var config = extend.nonEnum({}, dateOrConfig);\n        var globalCtx = config.global;\n        delete config.global;\n        return createClock(config, globalCtx);\n    }\n\n    throw new TypeError(\"useFakeTimers expected epoch or config object. See https://github.com/sinonjs/sinon\");\n};\n\nexports.clock = {\n    create: function(now) {\n        return FakeTimers.createClock(now);\n    }\n};\n\nvar timers = {\n    setTimeout: setTimeout,\n    clearTimeout: clearTimeout,\n    setInterval: setInterval,\n    clearInterval: clearInterval,\n    Date: Date\n};\naddIfDefined(timers, \"setImmediate\");\naddIfDefined(timers, \"clearImmediate\");\n\nexports.timers = timers;\n","\"use strict\";\n\nvar every = require(\"./prototypes/array\").every;\n\n/**\n * @private\n */\nfunction hasCallsLeft(callMap, spy) {\n    if (callMap[spy.id] === undefined) {\n        callMap[spy.id] = 0;\n    }\n\n    return callMap[spy.id] < spy.callCount;\n}\n\n/**\n * @private\n */\nfunction checkAdjacentCalls(callMap, spy, index, spies) {\n    var calledBeforeNext = true;\n\n    if (index !== spies.length - 1) {\n        calledBeforeNext = spy.calledBefore(spies[index + 1]);\n    }\n\n    if (hasCallsLeft(callMap, spy) && calledBeforeNext) {\n        callMap[spy.id] += 1;\n        return true;\n    }\n\n    return false;\n}\n\n/**\n * A Sinon proxy object (fake, spy, stub)\n *\n * @typedef {object} SinonProxy\n * @property {Function} calledBefore - A method that determines if this proxy was called before another one\n * @property {string} id - Some id\n * @property {number} callCount - Number of times this proxy has been called\n */\n\n/**\n * Returns true when the spies have been called in the order they were supplied in\n *\n * @param  {SinonProxy[] | SinonProxy} spies An array of proxies, or several proxies as arguments\n * @returns {boolean} true when spies are called in order, false otherwise\n */\nfunction calledInOrder(spies) {\n    var callMap = {};\n    // eslint-disable-next-line no-underscore-dangle\n    var _spies = arguments.length > 1 ? arguments : spies;\n\n    return every(_spies, checkAdjacentCalls.bind(null, callMap));\n}\n\nmodule.exports = calledInOrder;\n","\"use strict\";\n\nvar functionName = require(\"./function-name\");\n\n/**\n * Returns a display name for a value from a constructor\n *\n * @param  {object} value A value to examine\n * @returns {(string|null)} A string or null\n */\nfunction className(value) {\n    return (\n        (value.constructor && value.constructor.name) ||\n        // The next branch is for IE11 support only:\n        // Because the name property is not set on the prototype\n        // of the Function object, we finally try to grab the\n        // name from its definition. This will never be reached\n        // in node, so we are not able to test this properly.\n        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/name\n        (typeof value.constructor === \"function\" &&\n            /* istanbul ignore next */\n            functionName(value.constructor)) ||\n        null\n    );\n}\n\nmodule.exports = className;\n","/* eslint-disable no-console */\n\"use strict\";\n\n/**\n * Returns a function that will invoke the supplied function and print a\n * deprecation warning to the console each time it is called.\n *\n * @param  {Function} func\n * @param  {string} msg\n * @returns {Function}\n */\nexports.wrap = function(func, msg) {\n    var wrapped = function() {\n        exports.printWarning(msg);\n        return func.apply(this, arguments);\n    };\n    if (func.prototype) {\n        wrapped.prototype = func.prototype;\n    }\n    return wrapped;\n};\n\n/**\n * Returns a string which can be supplied to `wrap()` to notify the user that a\n * particular part of the sinon API has been deprecated.\n *\n * @param  {string} packageName\n * @param  {string} funcName\n * @returns {string}\n */\nexports.defaultMsg = function(packageName, funcName) {\n    return (\n        packageName +\n        \".\" +\n        funcName +\n        \" is deprecated and will be removed from the public API in a future version of \" +\n        packageName +\n        \".\"\n    );\n};\n\n/**\n * Prints a warning on the console, when it exists\n *\n * @param  {string} msg\n * @returns {undefined}\n */\nexports.printWarning = function(msg) {\n    // Watch out for IE7 and below! :(\n    /* istanbul ignore next */\n    if (typeof console !== \"undefined\") {\n        if (console.info) {\n            console.info(msg);\n        } else {\n            console.log(msg);\n        }\n    }\n};\n","\"use strict\";\n\n/**\n * Returns true when fn returns true for all members of obj.\n * This is an every implementation that works for all iterables\n *\n * @param  {object}   obj\n * @param  {Function} fn\n * @returns {boolean}\n */\nmodule.exports = function every(obj, fn) {\n    var pass = true;\n\n    try {\n        /* eslint-disable-next-line local-rules/no-prototype-methods */\n        obj.forEach(function() {\n            if (!fn.apply(this, arguments)) {\n                // Throwing an error is the only way to break `forEach`\n                throw new Error();\n            }\n        });\n    } catch (e) {\n        pass = false;\n    }\n\n    return pass;\n};\n","\"use strict\";\n\n/**\n * Returns a display name for a function\n *\n * @param  {Function} func\n * @returns {string}\n */\nmodule.exports = function functionName(func) {\n    if (!func) {\n        return \"\";\n    }\n\n    try {\n        return (\n            func.displayName ||\n            func.name ||\n            // Use function decomposition as a last resort to get function\n            // name. Does not rely on function decomposition to work - if it\n            // doesn't debugging will be slightly less informative\n            // (i.e. toString will say 'spy' rather than 'myFunc').\n            (String(func).match(/function ([^\\s(]+)/) || [])[1]\n        );\n    } catch (e) {\n        // Stringify may fail and we might get an exception, as a last-last\n        // resort fall back to empty string.\n        return \"\";\n    }\n};\n","\"use strict\";\n\n/**\n * A reference to the global object\n *\n * @type {object} globalObject\n */\nvar globalObject;\n\n/* istanbul ignore else */\nif (typeof global !== \"undefined\") {\n    // Node\n    globalObject = global;\n} else if (typeof window !== \"undefined\") {\n    // Browser\n    globalObject = window;\n} else {\n    // WebWorker\n    globalObject = self;\n}\n\nmodule.exports = globalObject;\n","\"use strict\";\n\nmodule.exports = {\n    global: require(\"./global\"),\n    calledInOrder: require(\"./called-in-order\"),\n    className: require(\"./class-name\"),\n    deprecated: require(\"./deprecated\"),\n    every: require(\"./every\"),\n    functionName: require(\"./function-name\"),\n    orderByFirstCall: require(\"./order-by-first-call\"),\n    prototypes: require(\"./prototypes\"),\n    typeOf: require(\"./type-of\"),\n    valueToString: require(\"./value-to-string\")\n};\n","\"use strict\";\n\nvar sort = require(\"./prototypes/array\").sort;\nvar slice = require(\"./prototypes/array\").slice;\n\n/**\n * @private\n */\nfunction comparator(a, b) {\n    // uuid, won't ever be equal\n    var aCall = a.getCall(0);\n    var bCall = b.getCall(0);\n    var aId = (aCall && aCall.callId) || -1;\n    var bId = (bCall && bCall.callId) || -1;\n\n    return aId < bId ? -1 : 1;\n}\n\n/**\n * A Sinon proxy object (fake, spy, stub)\n *\n * @typedef {object} SinonProxy\n * @property {Function} getCall - A method that can return the first call\n */\n\n/**\n * Sorts an array of SinonProxy instances (fake, spy, stub) by their first call\n *\n * @param  {SinonProxy[] | SinonProxy} spies\n * @returns {SinonProxy[]}\n */\nfunction orderByFirstCall(spies) {\n    return sort(slice(spies), comparator);\n}\n\nmodule.exports = orderByFirstCall;\n","\"use strict\";\n\nvar copyPrototype = require(\"./copy-prototype\");\n\nmodule.exports = copyPrototype(Array.prototype);\n","\"use strict\";\n\nvar call = Function.call;\n\nmodule.exports = function copyPrototypeMethods(prototype) {\n    /* eslint-disable local-rules/no-prototype-methods */\n    return Object.getOwnPropertyNames(prototype).reduce(function(result, name) {\n        // ignore size because it throws from Map\n        if (\n            name !== \"size\" &&\n            name !== \"caller\" &&\n            name !== \"callee\" &&\n            name !== \"arguments\" &&\n            typeof prototype[name] === \"function\"\n        ) {\n            result[name] = call.bind(prototype[name]);\n        }\n\n        return result;\n    }, Object.create(null));\n};\n","\"use strict\";\n\nvar copyPrototype = require(\"./copy-prototype\");\n\nmodule.exports = copyPrototype(Function.prototype);\n","\"use strict\";\n\nmodule.exports = {\n    array: require(\"./array\"),\n    function: require(\"./function\"),\n    map: require(\"./map\"),\n    object: require(\"./object\"),\n    set: require(\"./set\"),\n    string: require(\"./string\")\n};\n","\"use strict\";\n\nvar copyPrototype = require(\"./copy-prototype\");\n\nmodule.exports = copyPrototype(Map.prototype);\n","\"use strict\";\n\nvar copyPrototype = require(\"./copy-prototype\");\n\nmodule.exports = copyPrototype(Object.prototype);\n","\"use strict\";\n\nvar copyPrototype = require(\"./copy-prototype\");\n\nmodule.exports = copyPrototype(Set.prototype);\n","\"use strict\";\n\nvar copyPrototype = require(\"./copy-prototype\");\n\nmodule.exports = copyPrototype(String.prototype);\n","\"use strict\";\n\nvar type = require(\"type-detect\");\n\n/**\n * Returns the lower-case result of running type from type-detect on the value\n *\n * @param  {*} value\n * @returns {string}\n */\nmodule.exports = function typeOf(value) {\n    return type(value).toLowerCase();\n};\n","\"use strict\";\n\n/**\n * Returns a string representation of the value\n *\n * @param  {*} value\n * @returns {string}\n */\nfunction valueToString(value) {\n    if (value && value.toString) {\n        /* eslint-disable-next-line local-rules/no-prototype-methods */\n        return value.toString();\n    }\n    return String(value);\n}\n\nmodule.exports = valueToString;\n","\"use strict\";\n\nvar globalObject = require(\"@sinonjs/commons\").global;\n\n// eslint-disable-next-line complexity\nfunction withGlobal(_global) {\n    var userAgent = _global.navigator && _global.navigator.userAgent;\n    var isRunningInIE = userAgent && userAgent.indexOf(\"MSIE \") > -1;\n    var maxTimeout = Math.pow(2, 31) - 1; //see https://heycam.github.io/webidl/#abstract-opdef-converttoint\n    var NOOP = function() {\n        return undefined;\n    };\n    var NOOP_ARRAY = function() {\n        return [];\n    };\n    var timeoutResult = _global.setTimeout(NOOP, 0);\n    var addTimerReturnsObject = typeof timeoutResult === \"object\";\n    var hrtimePresent =\n        _global.process && typeof _global.process.hrtime === \"function\";\n    var hrtimeBigintPresent =\n        hrtimePresent && typeof _global.process.hrtime.bigint === \"function\";\n    var nextTickPresent =\n        _global.process && typeof _global.process.nextTick === \"function\";\n    var utilPromisify = _global.process && require(\"util\").promisify;\n    var performancePresent =\n        _global.performance && typeof _global.performance.now === \"function\";\n    var hasPerformancePrototype =\n        _global.Performance &&\n        (typeof _global.Performance).match(/^(function|object)$/);\n    var queueMicrotaskPresent = _global.hasOwnProperty(\"queueMicrotask\");\n    var requestAnimationFramePresent =\n        _global.requestAnimationFrame &&\n        typeof _global.requestAnimationFrame === \"function\";\n    var cancelAnimationFramePresent =\n        _global.cancelAnimationFrame &&\n        typeof _global.cancelAnimationFrame === \"function\";\n    var requestIdleCallbackPresent =\n        _global.requestIdleCallback &&\n        typeof _global.requestIdleCallback === \"function\";\n    var cancelIdleCallbackPresent =\n        _global.cancelIdleCallback &&\n        typeof _global.cancelIdleCallback === \"function\";\n    var setImmediatePresent =\n        _global.setImmediate && typeof _global.setImmediate === \"function\";\n\n    // Make properties writable in IE, as per\n    // http://www.adequatelygood.com/Replacing-setTimeout-Globally.html\n    /* eslint-disable no-self-assign */\n    if (isRunningInIE) {\n        _global.setTimeout = _global.setTimeout;\n        _global.clearTimeout = _global.clearTimeout;\n        _global.setInterval = _global.setInterval;\n        _global.clearInterval = _global.clearInterval;\n        _global.Date = _global.Date;\n    }\n\n    // setImmediate is not a standard function\n    // avoid adding the prop to the window object if not present\n    if (setImmediatePresent) {\n        _global.setImmediate = _global.setImmediate;\n        _global.clearImmediate = _global.clearImmediate;\n    }\n    /* eslint-enable no-self-assign */\n\n    _global.clearTimeout(timeoutResult);\n\n    var NativeDate = _global.Date;\n    var uniqueTimerId = 1;\n\n    function isNumberFinite(num) {\n        if (Number.isFinite) {\n            return Number.isFinite(num);\n        }\n\n        if (typeof num !== \"number\") {\n            return false;\n        }\n\n        return isFinite(num);\n    }\n\n    /**\n     * Parse strings like \"01:10:00\" (meaning 1 hour, 10 minutes, 0 seconds) into\n     * number of milliseconds. This is used to support human-readable strings passed\n     * to clock.tick()\n     */\n    function parseTime(str) {\n        if (!str) {\n            return 0;\n        }\n\n        var strings = str.split(\":\");\n        var l = strings.length;\n        var i = l;\n        var ms = 0;\n        var parsed;\n\n        if (l > 3 || !/^(\\d\\d:){0,2}\\d\\d?$/.test(str)) {\n            throw new Error(\n                \"tick only understands numbers, 'm:s' and 'h:m:s'. Each part must be two digits\"\n            );\n        }\n\n        while (i--) {\n            parsed = parseInt(strings[i], 10);\n\n            if (parsed >= 60) {\n                throw new Error(\"Invalid time \" + str);\n            }\n\n            ms += parsed * Math.pow(60, l - i - 1);\n        }\n\n        return ms * 1000;\n    }\n\n    /**\n     * Get the decimal part of the millisecond value as nanoseconds\n     *\n     * @param {Number} msFloat the number of milliseconds\n     * @returns {Number} an integer number of nanoseconds in the range [0,1e6)\n     *\n     * Example: nanoRemainer(123.456789) -> 456789\n     */\n    function nanoRemainder(msFloat) {\n        var modulo = 1e6;\n        var remainder = (msFloat * 1e6) % modulo;\n        var positiveRemainder = remainder < 0 ? remainder + modulo : remainder;\n\n        return Math.floor(positiveRemainder);\n    }\n\n    /**\n     * Used to grok the `now` parameter to createClock.\n     * @param epoch {Date|number} the system time\n     */\n    function getEpoch(epoch) {\n        if (!epoch) {\n            return 0;\n        }\n        if (typeof epoch.getTime === \"function\") {\n            return epoch.getTime();\n        }\n        if (typeof epoch === \"number\") {\n            return epoch;\n        }\n        throw new TypeError(\"now should be milliseconds since UNIX epoch\");\n    }\n\n    function inRange(from, to, timer) {\n        return timer && timer.callAt >= from && timer.callAt <= to;\n    }\n\n    function mirrorDateProperties(target, source) {\n        var prop;\n        for (prop in source) {\n            if (source.hasOwnProperty(prop)) {\n                target[prop] = source[prop];\n            }\n        }\n\n        // set special now implementation\n        if (source.now) {\n            target.now = function now() {\n                return target.clock.now;\n            };\n        } else {\n            delete target.now;\n        }\n\n        // set special toSource implementation\n        if (source.toSource) {\n            target.toSource = function toSource() {\n                return source.toSource();\n            };\n        } else {\n            delete target.toSource;\n        }\n\n        // set special toString implementation\n        target.toString = function toString() {\n            return source.toString();\n        };\n\n        target.prototype = source.prototype;\n        target.parse = source.parse;\n        target.UTC = source.UTC;\n        target.prototype.toUTCString = source.prototype.toUTCString;\n\n        return target;\n    }\n\n    function createDate() {\n        function ClockDate(year, month, date, hour, minute, second, ms) {\n            // the Date constructor called as a function, ref Ecma-262 Edition 5.1, section 15.9.2.\n            // This remains so in the 10th edition of 2019 as well.\n            if (!(this instanceof ClockDate)) {\n                return new NativeDate(ClockDate.clock.now).toString();\n            }\n\n            // if Date is called as a constructor with 'new' keyword\n            // Defensive and verbose to avoid potential harm in passing\n            // explicit undefined when user does not pass argument\n            switch (arguments.length) {\n                case 0:\n                    return new NativeDate(ClockDate.clock.now);\n                case 1:\n                    return new NativeDate(year);\n                case 2:\n                    return new NativeDate(year, month);\n                case 3:\n                    return new NativeDate(year, month, date);\n                case 4:\n                    return new NativeDate(year, month, date, hour);\n                case 5:\n                    return new NativeDate(year, month, date, hour, minute);\n                case 6:\n                    return new NativeDate(\n                        year,\n                        month,\n                        date,\n                        hour,\n                        minute,\n                        second\n                    );\n                default:\n                    return new NativeDate(\n                        year,\n                        month,\n                        date,\n                        hour,\n                        minute,\n                        second,\n                        ms\n                    );\n            }\n        }\n\n        return mirrorDateProperties(ClockDate, NativeDate);\n    }\n\n    function enqueueJob(clock, job) {\n        // enqueues a microtick-deferred task - ecma262/#sec-enqueuejob\n        if (!clock.jobs) {\n            clock.jobs = [];\n        }\n        clock.jobs.push(job);\n    }\n\n    function runJobs(clock) {\n        // runs all microtick-deferred tasks - ecma262/#sec-runjobs\n        if (!clock.jobs) {\n            return;\n        }\n        for (var i = 0; i < clock.jobs.length; i++) {\n            var job = clock.jobs[i];\n            job.func.apply(null, job.args);\n            if (clock.loopLimit && i > clock.loopLimit) {\n                throw new Error(\n                    \"Aborting after running \" +\n                        clock.loopLimit +\n                        \" timers, assuming an infinite loop!\"\n                );\n            }\n        }\n        clock.jobs = [];\n    }\n\n    function addTimer(clock, timer) {\n        if (timer.func === undefined) {\n            throw new Error(\"Callback must be provided to timer calls\");\n        }\n\n        timer.type = timer.immediate ? \"Immediate\" : \"Timeout\";\n\n        if (timer.hasOwnProperty(\"delay\")) {\n            if (!isNumberFinite(timer.delay)) {\n                timer.delay = 0;\n            }\n            timer.delay = timer.delay > maxTimeout ? 1 : timer.delay;\n            timer.delay = Math.max(0, timer.delay);\n        }\n\n        if (timer.hasOwnProperty(\"interval\")) {\n            timer.type = \"Interval\";\n            timer.interval = timer.interval > maxTimeout ? 1 : timer.interval;\n        }\n\n        if (timer.hasOwnProperty(\"animation\")) {\n            timer.type = \"AnimationFrame\";\n            timer.animation = true;\n        }\n\n        if (!clock.timers) {\n            clock.timers = {};\n        }\n\n        timer.id = uniqueTimerId++;\n        timer.createdAt = clock.now;\n        timer.callAt =\n            clock.now + (parseInt(timer.delay) || (clock.duringTick ? 1 : 0));\n\n        clock.timers[timer.id] = timer;\n\n        if (addTimerReturnsObject) {\n            var res = {\n                id: timer.id,\n                ref: function() {\n                    return res;\n                },\n                unref: function() {\n                    return res;\n                },\n                refresh: function() {\n                    return res;\n                }\n            };\n            return res;\n        }\n\n        return timer.id;\n    }\n\n    /* eslint consistent-return: \"off\" */\n    function compareTimers(a, b) {\n        // Sort first by absolute timing\n        if (a.callAt < b.callAt) {\n            return -1;\n        }\n        if (a.callAt > b.callAt) {\n            return 1;\n        }\n\n        // Sort next by immediate, immediate timers take precedence\n        if (a.immediate && !b.immediate) {\n            return -1;\n        }\n        if (!a.immediate && b.immediate) {\n            return 1;\n        }\n\n        // Sort next by creation time, earlier-created timers take precedence\n        if (a.createdAt < b.createdAt) {\n            return -1;\n        }\n        if (a.createdAt > b.createdAt) {\n            return 1;\n        }\n\n        // Sort next by id, lower-id timers take precedence\n        if (a.id < b.id) {\n            return -1;\n        }\n        if (a.id > b.id) {\n            return 1;\n        }\n\n        // As timer ids are unique, no fallback `0` is necessary\n    }\n\n    function firstTimerInRange(clock, from, to) {\n        var timers = clock.timers;\n        var timer = null;\n        var id, isInRange;\n\n        for (id in timers) {\n            if (timers.hasOwnProperty(id)) {\n                isInRange = inRange(from, to, timers[id]);\n\n                if (\n                    isInRange &&\n                    (!timer || compareTimers(timer, timers[id]) === 1)\n                ) {\n                    timer = timers[id];\n                }\n            }\n        }\n\n        return timer;\n    }\n\n    function firstTimer(clock) {\n        var timers = clock.timers;\n        var timer = null;\n        var id;\n\n        for (id in timers) {\n            if (timers.hasOwnProperty(id)) {\n                if (!timer || compareTimers(timer, timers[id]) === 1) {\n                    timer = timers[id];\n                }\n            }\n        }\n\n        return timer;\n    }\n\n    function lastTimer(clock) {\n        var timers = clock.timers;\n        var timer = null;\n        var id;\n\n        for (id in timers) {\n            if (timers.hasOwnProperty(id)) {\n                if (!timer || compareTimers(timer, timers[id]) === -1) {\n                    timer = timers[id];\n                }\n            }\n        }\n\n        return timer;\n    }\n\n    function callTimer(clock, timer) {\n        if (typeof timer.interval === \"number\") {\n            clock.timers[timer.id].callAt += timer.interval;\n        } else {\n            delete clock.timers[timer.id];\n        }\n\n        if (typeof timer.func === \"function\") {\n            timer.func.apply(null, timer.args);\n        } else {\n            /* eslint no-eval: \"off\" */\n            eval(timer.func);\n        }\n    }\n\n    function clearTimer(clock, timerId, ttype) {\n        if (!timerId) {\n            // null appears to be allowed in most browsers, and appears to be\n            // relied upon by some libraries, like Bootstrap carousel\n            return;\n        }\n\n        if (!clock.timers) {\n            clock.timers = {};\n        }\n\n        // in Node, timerId is an object with .ref()/.unref(), and\n        // its .id field is the actual timer id.\n        var id = typeof timerId === \"object\" ? timerId.id : timerId;\n\n        if (clock.timers.hasOwnProperty(id)) {\n            // check that the ID matches a timer of the correct type\n            var timer = clock.timers[id];\n            if (timer.type === ttype) {\n                delete clock.timers[id];\n            } else {\n                var clear =\n                    ttype === \"AnimationFrame\"\n                        ? \"cancelAnimationFrame\"\n                        : \"clear\" + ttype;\n                var schedule =\n                    timer.type === \"AnimationFrame\"\n                        ? \"requestAnimationFrame\"\n                        : \"set\" + timer.type;\n                throw new Error(\n                    \"Cannot clear timer: timer created with \" +\n                        schedule +\n                        \"() but cleared with \" +\n                        clear +\n                        \"()\"\n                );\n            }\n        }\n    }\n\n    function uninstall(clock, target, config) {\n        var method, i, l;\n        var installedHrTime = \"_hrtime\";\n        var installedNextTick = \"_nextTick\";\n\n        for (i = 0, l = clock.methods.length; i < l; i++) {\n            method = clock.methods[i];\n            if (method === \"hrtime\" && target.process) {\n                target.process.hrtime = clock[installedHrTime];\n            } else if (method === \"nextTick\" && target.process) {\n                target.process.nextTick = clock[installedNextTick];\n            } else if (method === \"performance\") {\n                var originalPerfDescriptor = Object.getOwnPropertyDescriptor(\n                    clock,\n                    \"_\" + method\n                );\n                if (\n                    originalPerfDescriptor &&\n                    originalPerfDescriptor.get &&\n                    !originalPerfDescriptor.set\n                ) {\n                    Object.defineProperty(\n                        target,\n                        method,\n                        originalPerfDescriptor\n                    );\n                } else if (originalPerfDescriptor.configurable) {\n                    target[method] = clock[\"_\" + method];\n                }\n            } else {\n                if (target[method] && target[method].hadOwnProperty) {\n                    target[method] = clock[\"_\" + method];\n                    if (\n                        method === \"clearInterval\" &&\n                        config.shouldAdvanceTime === true\n                    ) {\n                        target[method](clock.attachedInterval);\n                    }\n                } else {\n                    try {\n                        delete target[method];\n                    } catch (ignore) {\n                        /* eslint no-empty: \"off\" */\n                    }\n                }\n            }\n        }\n\n        // Prevent multiple executions which will completely remove these props\n        clock.methods = [];\n\n        // return pending timers, to enable checking what timers remained on uninstall\n        if (!clock.timers) {\n            return [];\n        }\n        return Object.keys(clock.timers).map(function mapper(key) {\n            return clock.timers[key];\n        });\n    }\n\n    function hijackMethod(target, method, clock) {\n        var prop;\n        clock[method].hadOwnProperty = Object.prototype.hasOwnProperty.call(\n            target,\n            method\n        );\n        clock[\"_\" + method] = target[method];\n\n        if (method === \"Date\") {\n            var date = mirrorDateProperties(clock[method], target[method]);\n            target[method] = date;\n        } else if (method === \"performance\") {\n            var originalPerfDescriptor = Object.getOwnPropertyDescriptor(\n                target,\n                method\n            );\n            // JSDOM has a read only performance field so we have to save/copy it differently\n            if (\n                originalPerfDescriptor &&\n                originalPerfDescriptor.get &&\n                !originalPerfDescriptor.set\n            ) {\n                Object.defineProperty(\n                    clock,\n                    \"_\" + method,\n                    originalPerfDescriptor\n                );\n\n                var perfDescriptor = Object.getOwnPropertyDescriptor(\n                    clock,\n                    method\n                );\n                Object.defineProperty(target, method, perfDescriptor);\n            } else {\n                target[method] = clock[method];\n            }\n        } else {\n            target[method] = function() {\n                return clock[method].apply(clock, arguments);\n            };\n\n            for (prop in clock[method]) {\n                if (clock[method].hasOwnProperty(prop)) {\n                    target[method][prop] = clock[method][prop];\n                }\n            }\n        }\n\n        target[method].clock = clock;\n    }\n\n    function doIntervalTick(clock, advanceTimeDelta) {\n        clock.tick(advanceTimeDelta);\n    }\n\n    var timers = {\n        setTimeout: _global.setTimeout,\n        clearTimeout: _global.clearTimeout,\n        setInterval: _global.setInterval,\n        clearInterval: _global.clearInterval,\n        Date: _global.Date\n    };\n\n    if (setImmediatePresent) {\n        timers.setImmediate = _global.setImmediate;\n        timers.clearImmediate = _global.clearImmediate;\n    }\n\n    if (hrtimePresent) {\n        timers.hrtime = _global.process.hrtime;\n    }\n\n    if (nextTickPresent) {\n        timers.nextTick = _global.process.nextTick;\n    }\n\n    if (performancePresent) {\n        timers.performance = _global.performance;\n    }\n\n    if (requestAnimationFramePresent) {\n        timers.requestAnimationFrame = _global.requestAnimationFrame;\n    }\n\n    if (queueMicrotaskPresent) {\n        timers.queueMicrotask = true;\n    }\n\n    if (cancelAnimationFramePresent) {\n        timers.cancelAnimationFrame = _global.cancelAnimationFrame;\n    }\n\n    if (requestIdleCallbackPresent) {\n        timers.requestIdleCallback = _global.requestIdleCallback;\n    }\n\n    if (cancelIdleCallbackPresent) {\n        timers.cancelIdleCallback = _global.cancelIdleCallback;\n    }\n\n    var keys =\n        Object.keys ||\n        function(obj) {\n            var ks = [];\n            var key;\n\n            for (key in obj) {\n                if (obj.hasOwnProperty(key)) {\n                    ks.push(key);\n                }\n            }\n\n            return ks;\n        };\n\n    var originalSetTimeout = _global.setImmediate || _global.setTimeout;\n\n    /**\n     * @param start {Date|number} the system time - non-integer values are floored\n     * @param loopLimit {number}  maximum number of timers that will be run when calling runAll()\n     */\n    function createClock(start, loopLimit) {\n        // eslint-disable-next-line no-param-reassign\n        start = Math.floor(getEpoch(start));\n        // eslint-disable-next-line no-param-reassign\n        loopLimit = loopLimit || 1000;\n        var nanos = 0;\n        var adjustedSystemTime = [0, 0]; // [millis, nanoremainder]\n\n        if (NativeDate === undefined) {\n            throw new Error(\n                \"The global scope doesn't have a `Date` object\" +\n                    \" (see https://github.com/sinonjs/sinon/issues/1852#issuecomment-419622780)\"\n            );\n        }\n\n        var clock = {\n            now: start,\n            timeouts: {},\n            Date: createDate(),\n            loopLimit: loopLimit\n        };\n\n        clock.Date.clock = clock;\n\n        function getTimeToNextFrame() {\n            return 16 - ((clock.now - start) % 16);\n        }\n\n        function hrtime(prev) {\n            var millisSinceStart = clock.now - adjustedSystemTime[0] - start;\n            var secsSinceStart = Math.floor(millisSinceStart / 1000);\n            var remainderInNanos =\n                (millisSinceStart - secsSinceStart * 1e3) * 1e6 +\n                nanos -\n                adjustedSystemTime[1];\n\n            if (Array.isArray(prev)) {\n                if (prev[1] > 1e9) {\n                    throw new TypeError(\n                        \"Number of nanoseconds can't exceed a billion\"\n                    );\n                }\n\n                var oldSecs = prev[0];\n                var nanoDiff = remainderInNanos - prev[1];\n                var secDiff = secsSinceStart - oldSecs;\n\n                if (nanoDiff < 0) {\n                    nanoDiff += 1e9;\n                    secDiff -= 1;\n                }\n\n                return [secDiff, nanoDiff];\n            }\n            return [secsSinceStart, remainderInNanos];\n        }\n\n        if (hrtimeBigintPresent) {\n            hrtime.bigint = function() {\n                var parts = hrtime();\n                return BigInt(parts[0]) * BigInt(1e9) + BigInt(parts[1]); // eslint-disable-line\n            };\n        }\n\n        clock.requestIdleCallback = function requestIdleCallback(\n            func,\n            timeout\n        ) {\n            var timeToNextIdlePeriod = 0;\n\n            if (clock.countTimers() > 0) {\n                timeToNextIdlePeriod = 50; // const for now\n            }\n\n            var result = addTimer(clock, {\n                func: func,\n                args: Array.prototype.slice.call(arguments, 2),\n                delay:\n                    typeof timeout === \"undefined\"\n                        ? timeToNextIdlePeriod\n                        : Math.min(timeout, timeToNextIdlePeriod)\n            });\n\n            return result.id || result;\n        };\n\n        clock.cancelIdleCallback = function cancelIdleCallback(timerId) {\n            return clearTimer(clock, timerId, \"Timeout\");\n        };\n\n        clock.setTimeout = function setTimeout(func, timeout) {\n            return addTimer(clock, {\n                func: func,\n                args: Array.prototype.slice.call(arguments, 2),\n                delay: timeout\n            });\n        };\n        if (typeof _global.Promise !== \"undefined\" && utilPromisify) {\n            clock.setTimeout[\n                utilPromisify.custom\n            ] = function promisifiedSetTimeout(timeout, arg) {\n                return new _global.Promise(function setTimeoutExecutor(\n                    resolve\n                ) {\n                    addTimer(clock, {\n                        func: resolve,\n                        args: [arg],\n                        delay: timeout\n                    });\n                });\n            };\n        }\n\n        clock.clearTimeout = function clearTimeout(timerId) {\n            return clearTimer(clock, timerId, \"Timeout\");\n        };\n\n        clock.nextTick = function nextTick(func) {\n            return enqueueJob(clock, {\n                func: func,\n                args: Array.prototype.slice.call(arguments, 1)\n            });\n        };\n\n        clock.queueMicrotask = function queueMicrotask(func) {\n            return clock.nextTick(func); // explicitly drop additional arguments\n        };\n\n        clock.setInterval = function setInterval(func, timeout) {\n            // eslint-disable-next-line no-param-reassign\n            timeout = parseInt(timeout, 10);\n            return addTimer(clock, {\n                func: func,\n                args: Array.prototype.slice.call(arguments, 2),\n                delay: timeout,\n                interval: timeout\n            });\n        };\n\n        clock.clearInterval = function clearInterval(timerId) {\n            return clearTimer(clock, timerId, \"Interval\");\n        };\n\n        if (setImmediatePresent) {\n            clock.setImmediate = function setImmediate(func) {\n                return addTimer(clock, {\n                    func: func,\n                    args: Array.prototype.slice.call(arguments, 1),\n                    immediate: true\n                });\n            };\n\n            if (typeof _global.Promise !== \"undefined\" && utilPromisify) {\n                clock.setImmediate[\n                    utilPromisify.custom\n                ] = function promisifiedSetImmediate(arg) {\n                    return new _global.Promise(function setImmediateExecutor(\n                        resolve\n                    ) {\n                        addTimer(clock, {\n                            func: resolve,\n                            args: [arg],\n                            immediate: true\n                        });\n                    });\n                };\n            }\n\n            clock.clearImmediate = function clearImmediate(timerId) {\n                return clearTimer(clock, timerId, \"Immediate\");\n            };\n        }\n\n        clock.countTimers = function countTimers() {\n            return (\n                Object.keys(clock.timers || {}).length +\n                (clock.jobs || []).length\n            );\n        };\n\n        clock.requestAnimationFrame = function requestAnimationFrame(func) {\n            var result = addTimer(clock, {\n                func: func,\n                delay: getTimeToNextFrame(),\n                args: [clock.now + getTimeToNextFrame()],\n                animation: true\n            });\n\n            return result.id || result;\n        };\n\n        clock.cancelAnimationFrame = function cancelAnimationFrame(timerId) {\n            return clearTimer(clock, timerId, \"AnimationFrame\");\n        };\n\n        clock.runMicrotasks = function runMicrotasks() {\n            runJobs(clock);\n        };\n\n        function doTick(tickValue, isAsync, resolve, reject) {\n            var msFloat =\n                typeof tickValue === \"number\"\n                    ? tickValue\n                    : parseTime(tickValue);\n            var ms = Math.floor(msFloat);\n            var remainder = nanoRemainder(msFloat);\n            var nanosTotal = nanos + remainder;\n            var tickTo = clock.now + ms;\n\n            if (msFloat < 0) {\n                throw new TypeError(\"Negative ticks are not supported\");\n            }\n\n            // adjust for positive overflow\n            if (nanosTotal >= 1e6) {\n                tickTo += 1;\n                nanosTotal -= 1e6;\n            }\n\n            nanos = nanosTotal;\n            var tickFrom = clock.now;\n            var previous = clock.now;\n            var timer,\n                firstException,\n                oldNow,\n                nextPromiseTick,\n                compensationCheck,\n                postTimerCall;\n\n            clock.duringTick = true;\n\n            // perform microtasks\n            oldNow = clock.now;\n            runJobs(clock);\n            if (oldNow !== clock.now) {\n                // compensate for any setSystemTime() call during microtask callback\n                tickFrom += clock.now - oldNow;\n                tickTo += clock.now - oldNow;\n            }\n\n            function doTickInner() {\n                // perform each timer in the requested range\n                timer = firstTimerInRange(clock, tickFrom, tickTo);\n                // eslint-disable-next-line no-unmodified-loop-condition\n                while (timer && tickFrom <= tickTo) {\n                    if (clock.timers[timer.id]) {\n                        tickFrom = timer.callAt;\n                        clock.now = timer.callAt;\n                        oldNow = clock.now;\n                        try {\n                            runJobs(clock);\n                            callTimer(clock, timer);\n                        } catch (e) {\n                            firstException = firstException || e;\n                        }\n\n                        if (isAsync) {\n                            // finish up after native setImmediate callback to allow\n                            // all native es6 promises to process their callbacks after\n                            // each timer fires.\n                            originalSetTimeout(nextPromiseTick);\n                            return;\n                        }\n\n                        compensationCheck();\n                    }\n\n                    postTimerCall();\n                }\n\n                // perform process.nextTick()s again\n                oldNow = clock.now;\n                runJobs(clock);\n                if (oldNow !== clock.now) {\n                    // compensate for any setSystemTime() call during process.nextTick() callback\n                    tickFrom += clock.now - oldNow;\n                    tickTo += clock.now - oldNow;\n                }\n                clock.duringTick = false;\n\n                // corner case: during runJobs new timers were scheduled which could be in the range [clock.now, tickTo]\n                timer = firstTimerInRange(clock, tickFrom, tickTo);\n                if (timer) {\n                    try {\n                        clock.tick(tickTo - clock.now); // do it all again - for the remainder of the requested range\n                    } catch (e) {\n                        firstException = firstException || e;\n                    }\n                } else {\n                    // no timers remaining in the requested range: move the clock all the way to the end\n                    clock.now = tickTo;\n\n                    // update nanos\n                    nanos = nanosTotal;\n                }\n                if (firstException) {\n                    throw firstException;\n                }\n\n                if (isAsync) {\n                    resolve(clock.now);\n                } else {\n                    return clock.now;\n                }\n            }\n\n            nextPromiseTick =\n                isAsync &&\n                function() {\n                    try {\n                        compensationCheck();\n                        postTimerCall();\n                        doTickInner();\n                    } catch (e) {\n                        reject(e);\n                    }\n                };\n\n            compensationCheck = function() {\n                // compensate for any setSystemTime() call during timer callback\n                if (oldNow !== clock.now) {\n                    tickFrom += clock.now - oldNow;\n                    tickTo += clock.now - oldNow;\n                    previous += clock.now - oldNow;\n                }\n            };\n\n            postTimerCall = function() {\n                timer = firstTimerInRange(clock, previous, tickTo);\n                previous = tickFrom;\n            };\n\n            return doTickInner();\n        }\n\n        /**\n         * @param {tickValue} {String|Number} number of milliseconds or a human-readable value like \"01:11:15\"\n         */\n        clock.tick = function tick(tickValue) {\n            return doTick(tickValue, false);\n        };\n\n        if (typeof _global.Promise !== \"undefined\") {\n            clock.tickAsync = function tickAsync(ms) {\n                return new _global.Promise(function(resolve, reject) {\n                    originalSetTimeout(function() {\n                        try {\n                            doTick(ms, true, resolve, reject);\n                        } catch (e) {\n                            reject(e);\n                        }\n                    });\n                });\n            };\n        }\n\n        clock.next = function next() {\n            runJobs(clock);\n            var timer = firstTimer(clock);\n            if (!timer) {\n                return clock.now;\n            }\n\n            clock.duringTick = true;\n            try {\n                clock.now = timer.callAt;\n                callTimer(clock, timer);\n                runJobs(clock);\n                return clock.now;\n            } finally {\n                clock.duringTick = false;\n            }\n        };\n\n        if (typeof _global.Promise !== \"undefined\") {\n            clock.nextAsync = function nextAsync() {\n                return new _global.Promise(function(resolve, reject) {\n                    originalSetTimeout(function() {\n                        try {\n                            var timer = firstTimer(clock);\n                            if (!timer) {\n                                resolve(clock.now);\n                                return;\n                            }\n\n                            var err;\n                            clock.duringTick = true;\n                            clock.now = timer.callAt;\n                            try {\n                                callTimer(clock, timer);\n                            } catch (e) {\n                                err = e;\n                            }\n                            clock.duringTick = false;\n\n                            originalSetTimeout(function() {\n                                if (err) {\n                                    reject(err);\n                                } else {\n                                    resolve(clock.now);\n                                }\n                            });\n                        } catch (e) {\n                            reject(e);\n                        }\n                    });\n                });\n            };\n        }\n\n        clock.runAll = function runAll() {\n            var numTimers, i;\n            runJobs(clock);\n            for (i = 0; i < clock.loopLimit; i++) {\n                if (!clock.timers) {\n                    return clock.now;\n                }\n\n                numTimers = keys(clock.timers).length;\n                if (numTimers === 0) {\n                    return clock.now;\n                }\n\n                clock.next();\n            }\n\n            throw new Error(\n                \"Aborting after running \" +\n                    clock.loopLimit +\n                    \" timers, assuming an infinite loop!\"\n            );\n        };\n\n        clock.runToFrame = function runToFrame() {\n            return clock.tick(getTimeToNextFrame());\n        };\n\n        if (typeof _global.Promise !== \"undefined\") {\n            clock.runAllAsync = function runAllAsync() {\n                return new _global.Promise(function(resolve, reject) {\n                    var i = 0;\n                    function doRun() {\n                        originalSetTimeout(function() {\n                            try {\n                                var numTimers;\n                                if (i < clock.loopLimit) {\n                                    if (!clock.timers) {\n                                        resolve(clock.now);\n                                        return;\n                                    }\n\n                                    numTimers = Object.keys(clock.timers)\n                                        .length;\n                                    if (numTimers === 0) {\n                                        resolve(clock.now);\n                                        return;\n                                    }\n\n                                    clock.next();\n\n                                    i++;\n\n                                    doRun();\n                                    return;\n                                }\n\n                                reject(\n                                    new Error(\n                                        \"Aborting after running \" +\n                                            clock.loopLimit +\n                                            \" timers, assuming an infinite loop!\"\n                                    )\n                                );\n                            } catch (e) {\n                                reject(e);\n                            }\n                        });\n                    }\n                    doRun();\n                });\n            };\n        }\n\n        clock.runToLast = function runToLast() {\n            var timer = lastTimer(clock);\n            if (!timer) {\n                runJobs(clock);\n                return clock.now;\n            }\n\n            return clock.tick(timer.callAt - clock.now);\n        };\n\n        if (typeof _global.Promise !== \"undefined\") {\n            clock.runToLastAsync = function runToLastAsync() {\n                return new _global.Promise(function(resolve, reject) {\n                    originalSetTimeout(function() {\n                        try {\n                            var timer = lastTimer(clock);\n                            if (!timer) {\n                                resolve(clock.now);\n                            }\n\n                            resolve(clock.tickAsync(timer.callAt));\n                        } catch (e) {\n                            reject(e);\n                        }\n                    });\n                });\n            };\n        }\n\n        clock.reset = function reset() {\n            nanos = 0;\n            clock.timers = {};\n            clock.jobs = [];\n            clock.now = start;\n        };\n\n        clock.setSystemTime = function setSystemTime(systemTime) {\n            // determine time difference\n            var newNow = getEpoch(systemTime);\n            var difference = newNow - clock.now;\n            var id, timer;\n\n            adjustedSystemTime[0] = adjustedSystemTime[0] + difference;\n            adjustedSystemTime[1] = adjustedSystemTime[1] + nanos;\n            // update 'system clock'\n            clock.now = newNow;\n            nanos = 0;\n\n            // update timers and intervals to keep them stable\n            for (id in clock.timers) {\n                if (clock.timers.hasOwnProperty(id)) {\n                    timer = clock.timers[id];\n                    timer.createdAt += difference;\n                    timer.callAt += difference;\n                }\n            }\n        };\n\n        if (performancePresent) {\n            clock.performance = Object.create(null);\n\n            if (hasPerformancePrototype) {\n                var proto = _global.Performance.prototype;\n\n                Object.getOwnPropertyNames(proto).forEach(function(name) {\n                    if (name.indexOf(\"getEntries\") === 0) {\n                        // match expected return type for getEntries functions\n                        clock.performance[name] = NOOP_ARRAY;\n                    } else {\n                        clock.performance[name] = NOOP;\n                    }\n                });\n            }\n\n            clock.performance.now = function FakeTimersNow() {\n                var hrt = hrtime();\n                var millis = hrt[0] * 1000 + hrt[1] / 1e6;\n                return millis;\n            };\n        }\n\n        if (hrtimePresent) {\n            clock.hrtime = hrtime;\n        }\n\n        return clock;\n    }\n\n    /**\n     * @param config {Object} optional config\n     * @param config.target {Object} the target to install timers in (default `window`)\n     * @param config.now {number|Date}  a number (in milliseconds) or a Date object (default epoch)\n     * @param config.toFake {string[]} names of the methods that should be faked.\n     * @param config.loopLimit {number} the maximum number of timers that will be run when calling runAll()\n     * @param config.shouldAdvanceTime {Boolean} tells FakeTimers to increment mocked time automatically (default false)\n     * @param config.advanceTimeDelta {Number} increment mocked time every <<advanceTimeDelta>> ms (default: 20ms)\n     */\n    // eslint-disable-next-line complexity\n    function install(config) {\n        if (\n            arguments.length > 1 ||\n            config instanceof Date ||\n            Array.isArray(config) ||\n            typeof config === \"number\"\n        ) {\n            throw new TypeError(\n                \"FakeTimers.install called with \" +\n                    String(config) +\n                    \" install requires an object parameter\"\n            );\n        }\n\n        // eslint-disable-next-line no-param-reassign\n        config = typeof config !== \"undefined\" ? config : {};\n        config.shouldAdvanceTime = config.shouldAdvanceTime || false;\n        config.advanceTimeDelta = config.advanceTimeDelta || 20;\n\n        var i, l;\n        var target = config.target || _global;\n        var clock = createClock(config.now, config.loopLimit);\n\n        clock.uninstall = function() {\n            return uninstall(clock, target, config);\n        };\n\n        clock.methods = config.toFake || [];\n\n        if (clock.methods.length === 0) {\n            // do not fake nextTick by default - GitHub#126\n            clock.methods = keys(timers).filter(function(key) {\n                return key !== \"nextTick\" && key !== \"queueMicrotask\";\n            });\n        }\n\n        for (i = 0, l = clock.methods.length; i < l; i++) {\n            if (clock.methods[i] === \"hrtime\") {\n                if (\n                    target.process &&\n                    typeof target.process.hrtime === \"function\"\n                ) {\n                    hijackMethod(target.process, clock.methods[i], clock);\n                }\n            } else if (clock.methods[i] === \"nextTick\") {\n                if (\n                    target.process &&\n                    typeof target.process.nextTick === \"function\"\n                ) {\n                    hijackMethod(target.process, clock.methods[i], clock);\n                }\n            } else {\n                if (\n                    clock.methods[i] === \"setInterval\" &&\n                    config.shouldAdvanceTime === true\n                ) {\n                    var intervalTick = doIntervalTick.bind(\n                        null,\n                        clock,\n                        config.advanceTimeDelta\n                    );\n                    var intervalId = target[clock.methods[i]](\n                        intervalTick,\n                        config.advanceTimeDelta\n                    );\n                    clock.attachedInterval = intervalId;\n                }\n                hijackMethod(target, clock.methods[i], clock);\n            }\n        }\n\n        return clock;\n    }\n\n    return {\n        timers: timers,\n        createClock: createClock,\n        install: install,\n        withGlobal: withGlobal\n    };\n}\n\nvar defaultImplementation = withGlobal(globalObject);\n\nexports.timers = defaultImplementation.timers;\nexports.createClock = defaultImplementation.createClock;\nexports.install = defaultImplementation.install;\nexports.withGlobal = withGlobal;\n","\"use strict\";\n\nvar samsam = require(\"@sinonjs/samsam\");\nvar functionName = require(\"@sinonjs/commons\").functionName;\nvar typeOf = require(\"@sinonjs/commons\").typeOf;\n\nvar formatio = {\n    excludeConstructors: [\"Object\", /^.$/],\n    quoteStrings: true,\n    limitChildrenCount: 0\n};\n\nvar specialObjects = [];\n/* istanbul ignore else */\nif (typeof global !== \"undefined\") {\n    specialObjects.push({ object: global, value: \"[object global]\" });\n}\nif (typeof document !== \"undefined\") {\n    specialObjects.push({\n        object: document,\n        value: \"[object HTMLDocument]\"\n    });\n}\nif (typeof window !== \"undefined\") {\n    specialObjects.push({ object: window, value: \"[object Window]\" });\n}\n\nfunction constructorName(f, object) {\n    var name = functionName(object && object.constructor);\n    var excludes = f.excludeConstructors || formatio.excludeConstructors;\n\n    var i, l;\n    for (i = 0, l = excludes.length; i < l; ++i) {\n        if (typeof excludes[i] === \"string\" && excludes[i] === name) {\n            return \"\";\n        } else if (excludes[i].test && excludes[i].test(name)) {\n            return \"\";\n        }\n    }\n\n    return name;\n}\n\nfunction isCircular(object, objects) {\n    if (typeof object !== \"object\") {\n        return false;\n    }\n    var i, l;\n    for (i = 0, l = objects.length; i < l; ++i) {\n        if (objects[i] === object) {\n            return true;\n        }\n    }\n    return false;\n}\n\n// eslint-disable-next-line complexity\nfunction ascii(f, object, processed, indent) {\n    if (typeof object === \"string\") {\n        if (object.length === 0) {\n            return \"(empty string)\";\n        }\n        var qs = f.quoteStrings;\n        var quote = typeof qs !== \"boolean\" || qs;\n        // eslint-disable-next-line quotes\n        return processed || quote ? '\"' + object + '\"' : object;\n    }\n\n    if (typeof object === \"symbol\") {\n        return object.toString();\n    }\n\n    if (typeof object === \"function\" && !(object instanceof RegExp)) {\n        return ascii.func(object);\n    }\n\n    // eslint supports bigint as of version 6.0.0\n    // https://github.com/eslint/eslint/commit/e4ab0531c4e44c23494c6a802aa2329d15ac90e5\n    // eslint-disable-next-line\n    if (typeOf(object) === \"bigint\") {\n        return object.toString();\n    }\n\n    var internalProcessed = processed || [];\n\n    if (isCircular(object, internalProcessed)) {\n        return \"[Circular]\";\n    }\n\n    if (typeOf(object) === \"array\") {\n        return ascii.array.call(f, object, internalProcessed);\n    }\n\n    if (!object) {\n        return String(1 / object === -Infinity ? \"-0\" : object);\n    }\n    if (samsam.isElement(object)) {\n        return ascii.element(object);\n    }\n\n    if (\n        typeof object.toString === \"function\" &&\n        object.toString !== Object.prototype.toString\n    ) {\n        return object.toString();\n    }\n\n    var i, l;\n    for (i = 0, l = specialObjects.length; i < l; i++) {\n        if (object === specialObjects[i].object) {\n            return specialObjects[i].value;\n        }\n    }\n\n    if (samsam.isSet(object)) {\n        return ascii.set.call(f, object, internalProcessed);\n    }\n\n    if (object instanceof Map) {\n        return ascii.map.call(f, object, internalProcessed);\n    }\n\n    return ascii.object.call(f, object, internalProcessed, indent);\n}\n\nascii.func = function(func) {\n    var funcName = functionName(func) || \"\";\n    return \"function \" + funcName + \"() {}\";\n};\n\nfunction delimit(str, delimiters) {\n    var delims = delimiters || [\"[\", \"]\"];\n    return delims[0] + str + delims[1];\n}\n\nascii.array = function(array, processed, delimiters) {\n    processed.push(array);\n    var pieces = [];\n    var i, l;\n    l =\n        this.limitChildrenCount > 0\n            ? Math.min(this.limitChildrenCount, array.length)\n            : array.length;\n\n    for (i = 0; i < l; ++i) {\n        pieces.push(ascii(this, array[i], processed));\n    }\n\n    if (l < array.length) {\n        pieces.push(\"[... \" + (array.length - l) + \" more elements]\");\n    }\n\n    return delimit(pieces.join(\", \"), delimiters);\n};\n\nascii.set = function(set, processed) {\n    return ascii.array.call(this, Array.from(set), processed, [\"Set {\", \"}\"]);\n};\n\nascii.map = function(map, processed) {\n    return ascii.array.call(this, Array.from(map), processed, [\"Map [\", \"]\"]);\n};\n\nfunction getSymbols(object) {\n    if (samsam.isArguments(object)) {\n        return [];\n    }\n\n    /* istanbul ignore else */\n    if (typeof Object.getOwnPropertySymbols === \"function\") {\n        return Object.getOwnPropertySymbols(object);\n    }\n\n    /* istanbul ignore next: This is only for IE, since getOwnPropertySymbols\n     * does not exist on Object there\n     */\n    return [];\n}\n\nascii.object = function(object, processed, indent) {\n    processed.push(object);\n    var internalIndent = indent || 0;\n    var pieces = [];\n    var properties = Object.keys(object)\n        .sort()\n        .concat(getSymbols(object));\n    var length = 3;\n    var prop, str, obj, i, k, l;\n    l =\n        this.limitChildrenCount > 0\n            ? Math.min(this.limitChildrenCount, properties.length)\n            : properties.length;\n\n    for (i = 0; i < l; ++i) {\n        prop = properties[i];\n        obj = object[prop];\n\n        if (isCircular(obj, processed)) {\n            str = \"[Circular]\";\n        } else {\n            str = ascii(this, obj, processed, internalIndent + 2);\n        }\n\n        str =\n            (typeof prop === \"string\" && /\\s/.test(prop)\n                ? // eslint-disable-next-line quotes\n                  '\"' + prop + '\"'\n                : prop.toString()) +\n            \": \" +\n            str;\n        length += str.length;\n        pieces.push(str);\n    }\n\n    var cons = constructorName(this, object);\n    var prefix = cons ? \"[\" + cons + \"] \" : \"\";\n    var is = \"\";\n    for (i = 0, k = internalIndent; i < k; ++i) {\n        is += \" \";\n    }\n\n    if (l < properties.length) {\n        pieces.push(\"[... \" + (properties.length - l) + \" more elements]\");\n    }\n\n    if (length + internalIndent > 80) {\n        return (\n            prefix + \"{\\n  \" + is + pieces.join(\",\\n  \" + is) + \"\\n\" + is + \"}\"\n        );\n    }\n    return prefix + \"{ \" + pieces.join(\", \") + \" }\";\n};\n\nascii.element = function(element) {\n    var tagName = element.tagName.toLowerCase();\n    var attrs = element.attributes;\n    var pairs = [];\n    var attr, attrName, i, l, val;\n\n    for (i = 0, l = attrs.length; i < l; ++i) {\n        attr = attrs.item(i);\n        attrName = attr.nodeName.toLowerCase().replace(\"html:\", \"\");\n        val = attr.nodeValue;\n        if (attrName !== \"contenteditable\" || val !== \"inherit\") {\n            if (val) {\n                // eslint-disable-next-line quotes\n                pairs.push(attrName + '=\"' + val + '\"');\n            }\n        }\n    }\n\n    var formatted = \"<\" + tagName + (pairs.length > 0 ? \" \" : \"\");\n    // SVG elements have undefined innerHTML\n    var content = element.innerHTML || \"\";\n\n    if (content.length > 20) {\n        content = content.substr(0, 20) + \"[...]\";\n    }\n\n    var res =\n        formatted + pairs.join(\" \") + \">\" + content + \"</\" + tagName + \">\";\n\n    return res.replace(/ contentEditable=\"inherit\"/, \"\");\n};\n\nfunction Formatio(options) {\n    // eslint-disable-next-line guard-for-in\n    for (var opt in options) {\n        this[opt] = options[opt];\n    }\n}\n\nFormatio.prototype = {\n    functionName: functionName,\n\n    configure: function(options) {\n        return new Formatio(options);\n    },\n\n    constructorName: function(object) {\n        return constructorName(this, object);\n    },\n\n    ascii: function(object, processed, indent) {\n        return ascii(this, object, processed, indent);\n    }\n};\n\nmodule.exports = Formatio.prototype;\n","\"use strict\";\n\nvar ARRAY_TYPES = [\n    Array,\n    Int8Array,\n    Uint8Array,\n    Uint8ClampedArray,\n    Int16Array,\n    Uint16Array,\n    Int32Array,\n    Uint32Array,\n    Float32Array,\n    Float64Array\n];\n\nmodule.exports = ARRAY_TYPES;\n","\"use strict\";\n\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar deepEqual = require(\"./deep-equal\").use(createMatcher); // eslint-disable-line no-use-before-define\nvar every = require(\"@sinonjs/commons\").every;\nvar functionName = require(\"@sinonjs/commons\").functionName;\nvar get = require(\"lodash.get\");\nvar iterableToString = require(\"./iterable-to-string\");\nvar objectProto = require(\"@sinonjs/commons\").prototypes.object;\nvar typeOf = require(\"@sinonjs/commons\").typeOf;\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\n\nvar assertMatcher = require(\"./create-matcher/assert-matcher\");\nvar assertMethodExists = require(\"./create-matcher/assert-method-exists\");\nvar assertType = require(\"./create-matcher/assert-type\");\nvar isIterable = require(\"./create-matcher/is-iterable\");\nvar isMatcher = require(\"./create-matcher/is-matcher\");\n\nvar matcherPrototype = require(\"./create-matcher/matcher-prototype\");\n\nvar arrayIndexOf = arrayProto.indexOf;\nvar some = arrayProto.some;\n\nvar hasOwnProperty = objectProto.hasOwnProperty;\nvar objectToString = objectProto.toString;\n\nvar TYPE_MAP = require(\"./create-matcher/type-map\")(createMatcher); // eslint-disable-line no-use-before-define\n\n/**\n * Creates a matcher object for the passed expectation\n *\n * @alias module:samsam.createMatcher\n * @param {*} expectation An expecttation\n * @param {string} message A message for the expectation\n * @returns {object} A matcher object\n */\nfunction createMatcher(expectation, message) {\n    var m = Object.create(matcherPrototype);\n    var type = typeOf(expectation);\n\n    if (message !== undefined && typeof message !== \"string\") {\n        throw new TypeError(\"Message should be a string\");\n    }\n\n    if (arguments.length > 2) {\n        throw new TypeError(\n            \"Expected 1 or 2 arguments, received \" + arguments.length\n        );\n    }\n\n    if (type in TYPE_MAP) {\n        TYPE_MAP[type](m, expectation, message);\n    } else {\n        m.test = function(actual) {\n            return deepEqual(actual, expectation);\n        };\n    }\n\n    if (!m.message) {\n        m.message = \"match(\" + valueToString(expectation) + \")\";\n    }\n\n    return m;\n}\n\ncreateMatcher.isMatcher = isMatcher;\n\ncreateMatcher.any = createMatcher(function() {\n    return true;\n}, \"any\");\n\ncreateMatcher.defined = createMatcher(function(actual) {\n    return actual !== null && actual !== undefined;\n}, \"defined\");\n\ncreateMatcher.truthy = createMatcher(function(actual) {\n    return Boolean(actual);\n}, \"truthy\");\n\ncreateMatcher.falsy = createMatcher(function(actual) {\n    return !actual;\n}, \"falsy\");\n\ncreateMatcher.same = function(expectation) {\n    return createMatcher(function(actual) {\n        return expectation === actual;\n    }, \"same(\" + valueToString(expectation) + \")\");\n};\n\ncreateMatcher.in = function(arrayOfExpectations) {\n    if (typeOf(arrayOfExpectations) !== \"array\") {\n        throw new TypeError(\"array expected\");\n    }\n\n    return createMatcher(function(actual) {\n        return some(arrayOfExpectations, function(expectation) {\n            return expectation === actual;\n        });\n    }, \"in(\" + valueToString(arrayOfExpectations) + \")\");\n};\n\ncreateMatcher.typeOf = function(type) {\n    assertType(type, \"string\", \"type\");\n    return createMatcher(function(actual) {\n        return typeOf(actual) === type;\n    }, 'typeOf(\"' + type + '\")');\n};\n\ncreateMatcher.instanceOf = function(type) {\n    /* istanbul ignore if */\n    if (\n        typeof Symbol === \"undefined\" ||\n        typeof Symbol.hasInstance === \"undefined\"\n    ) {\n        assertType(type, \"function\", \"type\");\n    } else {\n        assertMethodExists(\n            type,\n            Symbol.hasInstance,\n            \"type\",\n            \"[Symbol.hasInstance]\"\n        );\n    }\n    return createMatcher(function(actual) {\n        return actual instanceof type;\n    }, \"instanceOf(\" + (functionName(type) || objectToString(type)) + \")\");\n};\n\n/**\n * Creates a property matcher\n *\n * @private\n * @param {Function} propertyTest A function to test the property against a value\n * @param {string} messagePrefix A prefix to use for messages generated by the matcher\n * @returns {object} A matcher\n */\nfunction createPropertyMatcher(propertyTest, messagePrefix) {\n    return function(property, value) {\n        assertType(property, \"string\", \"property\");\n        var onlyProperty = arguments.length === 1;\n        var message = messagePrefix + '(\"' + property + '\"';\n        if (!onlyProperty) {\n            message += \", \" + valueToString(value);\n        }\n        message += \")\";\n        return createMatcher(function(actual) {\n            if (\n                actual === undefined ||\n                actual === null ||\n                !propertyTest(actual, property)\n            ) {\n                return false;\n            }\n            return onlyProperty || deepEqual(actual[property], value);\n        }, message);\n    };\n}\n\ncreateMatcher.has = createPropertyMatcher(function(actual, property) {\n    if (typeof actual === \"object\") {\n        return property in actual;\n    }\n    return actual[property] !== undefined;\n}, \"has\");\n\ncreateMatcher.hasOwn = createPropertyMatcher(function(actual, property) {\n    return hasOwnProperty(actual, property);\n}, \"hasOwn\");\n\ncreateMatcher.hasNested = function(property, value) {\n    assertType(property, \"string\", \"property\");\n    var onlyProperty = arguments.length === 1;\n    var message = 'hasNested(\"' + property + '\"';\n    if (!onlyProperty) {\n        message += \", \" + valueToString(value);\n    }\n    message += \")\";\n    return createMatcher(function(actual) {\n        if (\n            actual === undefined ||\n            actual === null ||\n            get(actual, property) === undefined\n        ) {\n            return false;\n        }\n        return onlyProperty || deepEqual(get(actual, property), value);\n    }, message);\n};\n\ncreateMatcher.every = function(predicate) {\n    assertMatcher(predicate);\n\n    return createMatcher(function(actual) {\n        if (typeOf(actual) === \"object\") {\n            return every(Object.keys(actual), function(key) {\n                return predicate.test(actual[key]);\n            });\n        }\n\n        return (\n            isIterable(actual) &&\n            every(actual, function(element) {\n                return predicate.test(element);\n            })\n        );\n    }, \"every(\" + predicate.message + \")\");\n};\n\ncreateMatcher.some = function(predicate) {\n    assertMatcher(predicate);\n\n    return createMatcher(function(actual) {\n        if (typeOf(actual) === \"object\") {\n            return !every(Object.keys(actual), function(key) {\n                return !predicate.test(actual[key]);\n            });\n        }\n\n        return (\n            isIterable(actual) &&\n            !every(actual, function(element) {\n                return !predicate.test(element);\n            })\n        );\n    }, \"some(\" + predicate.message + \")\");\n};\n\ncreateMatcher.array = createMatcher.typeOf(\"array\");\n\ncreateMatcher.array.deepEquals = function(expectation) {\n    return createMatcher(function(actual) {\n        // Comparing lengths is the fastest way to spot a difference before iterating through every item\n        var sameLength = actual.length === expectation.length;\n        return (\n            typeOf(actual) === \"array\" &&\n            sameLength &&\n            every(actual, function(element, index) {\n                var expected = expectation[index];\n                return typeOf(expected) === \"array\" &&\n                    typeOf(element) === \"array\"\n                    ? createMatcher.array.deepEquals(expected).test(element)\n                    : deepEqual(expected, element);\n            })\n        );\n    }, \"deepEquals([\" + iterableToString(expectation) + \"])\");\n};\n\ncreateMatcher.array.startsWith = function(expectation) {\n    return createMatcher(function(actual) {\n        return (\n            typeOf(actual) === \"array\" &&\n            every(expectation, function(expectedElement, index) {\n                return actual[index] === expectedElement;\n            })\n        );\n    }, \"startsWith([\" + iterableToString(expectation) + \"])\");\n};\n\ncreateMatcher.array.endsWith = function(expectation) {\n    return createMatcher(function(actual) {\n        // This indicates the index in which we should start matching\n        var offset = actual.length - expectation.length;\n\n        return (\n            typeOf(actual) === \"array\" &&\n            every(expectation, function(expectedElement, index) {\n                return actual[offset + index] === expectedElement;\n            })\n        );\n    }, \"endsWith([\" + iterableToString(expectation) + \"])\");\n};\n\ncreateMatcher.array.contains = function(expectation) {\n    return createMatcher(function(actual) {\n        return (\n            typeOf(actual) === \"array\" &&\n            every(expectation, function(expectedElement) {\n                return arrayIndexOf(actual, expectedElement) !== -1;\n            })\n        );\n    }, \"contains([\" + iterableToString(expectation) + \"])\");\n};\n\ncreateMatcher.map = createMatcher.typeOf(\"map\");\n\ncreateMatcher.map.deepEquals = function mapDeepEquals(expectation) {\n    return createMatcher(function(actual) {\n        // Comparing lengths is the fastest way to spot a difference before iterating through every item\n        var sameLength = actual.size === expectation.size;\n        return (\n            typeOf(actual) === \"map\" &&\n            sameLength &&\n            every(actual, function(element, key) {\n                return expectation.has(key) && expectation.get(key) === element;\n            })\n        );\n    }, \"deepEquals(Map[\" + iterableToString(expectation) + \"])\");\n};\n\ncreateMatcher.map.contains = function mapContains(expectation) {\n    return createMatcher(function(actual) {\n        return (\n            typeOf(actual) === \"map\" &&\n            every(expectation, function(element, key) {\n                return actual.has(key) && actual.get(key) === element;\n            })\n        );\n    }, \"contains(Map[\" + iterableToString(expectation) + \"])\");\n};\n\ncreateMatcher.set = createMatcher.typeOf(\"set\");\n\ncreateMatcher.set.deepEquals = function setDeepEquals(expectation) {\n    return createMatcher(function(actual) {\n        // Comparing lengths is the fastest way to spot a difference before iterating through every item\n        var sameLength = actual.size === expectation.size;\n        return (\n            typeOf(actual) === \"set\" &&\n            sameLength &&\n            every(actual, function(element) {\n                return expectation.has(element);\n            })\n        );\n    }, \"deepEquals(Set[\" + iterableToString(expectation) + \"])\");\n};\n\ncreateMatcher.set.contains = function setContains(expectation) {\n    return createMatcher(function(actual) {\n        return (\n            typeOf(actual) === \"set\" &&\n            every(expectation, function(element) {\n                return actual.has(element);\n            })\n        );\n    }, \"contains(Set[\" + iterableToString(expectation) + \"])\");\n};\n\ncreateMatcher.bool = createMatcher.typeOf(\"boolean\");\ncreateMatcher.number = createMatcher.typeOf(\"number\");\ncreateMatcher.string = createMatcher.typeOf(\"string\");\ncreateMatcher.object = createMatcher.typeOf(\"object\");\ncreateMatcher.func = createMatcher.typeOf(\"function\");\ncreateMatcher.regexp = createMatcher.typeOf(\"regexp\");\ncreateMatcher.date = createMatcher.typeOf(\"date\");\ncreateMatcher.symbol = createMatcher.typeOf(\"symbol\");\n\nmodule.exports = createMatcher;\n","\"use strict\";\n\nvar isMatcher = require(\"./is-matcher\");\n\n/**\n * Throws a TypeError when `value` is not a matcher\n *\n * @private\n * @param {*} value The value to examine\n */\nfunction assertMatcher(value) {\n    if (!isMatcher(value)) {\n        throw new TypeError(\"Matcher expected\");\n    }\n}\n\nmodule.exports = assertMatcher;\n","\"use strict\";\n\n/**\n * Throws a TypeError when expected method doesn't exist\n *\n * @private\n * @param {*} value A value to examine\n * @param {string} method The name of the method to look for\n * @param {name} name A name to use for the error message\n * @param {string} methodPath The name of the method to use for error messages\n * @throws {TypeError} When the method doesn't exist\n */\nfunction assertMethodExists(value, method, name, methodPath) {\n    if (value[method] === null || value[method] === undefined) {\n        throw new TypeError(\n            \"Expected \" + name + \" to have method \" + methodPath\n        );\n    }\n}\n\nmodule.exports = assertMethodExists;\n","\"use strict\";\n\nvar typeOf = require(\"@sinonjs/commons\").typeOf;\n\n/**\n * Ensures that value is of type\n *\n * @private\n * @param {*} value A value to examine\n * @param {string} type A basic JavaScript type to compare to, e.g. \"object\", \"string\"\n * @param {string} name A string to use for the error message\n * @throws {TypeError} If value is not of the expected type\n * @returns {undefined}\n */\nfunction assertType(value, type, name) {\n    var actual = typeOf(value);\n    if (actual !== type) {\n        throw new TypeError(\n            \"Expected type of \" +\n                name +\n                \" to be \" +\n                type +\n                \", but was \" +\n                actual\n        );\n    }\n}\n\nmodule.exports = assertType;\n","\"use strict\";\n\nvar typeOf = require(\"@sinonjs/commons\").typeOf;\n\n/**\n * Returns `true` for iterables\n *\n * @private\n * @param {*} value A value to examine\n * @returns {boolean} Returns `true` when `value` looks like an iterable\n */\nfunction isIterable(value) {\n    return Boolean(value) && typeOf(value.forEach) === \"function\";\n}\n\nmodule.exports = isIterable;\n","\"use strict\";\n\nvar isPrototypeOf = require(\"@sinonjs/commons\").prototypes.object.isPrototypeOf;\n\nvar matcherPrototype = require(\"./matcher-prototype\");\n\n/**\n * Returns `true` when `object` is a matcher\n *\n * @private\n * @param {*} object A value to examine\n * @returns {boolean} Returns `true` when `object` is a matcher\n */\nfunction isMatcher(object) {\n    return isPrototypeOf(matcherPrototype, object);\n}\n\nmodule.exports = isMatcher;\n","\"use strict\";\n\nvar every = require(\"@sinonjs/commons\").prototypes.array.every;\nvar typeOf = require(\"@sinonjs/commons\").typeOf;\n\nvar deepEqualFactory = require(\"../deep-equal\").use;\n\nvar isMatcher = require(\"./is-matcher\");\n/**\n * Matches `actual` with `expectation`\n *\n * @private\n * @param {*} actual A value to examine\n * @param {object} expectation An object with properties to match on\n * @param {object} matcher A matcher to use for comparison\n * @returns {boolean} Returns true when `actual` matches all properties in `expectation`\n */\nfunction matchObject(actual, expectation, matcher) {\n    var deepEqual = deepEqualFactory(matcher);\n    if (actual === null || actual === undefined) {\n        return false;\n    }\n\n    return every(Object.keys(expectation), function(key) {\n        var exp = expectation[key];\n        var act = actual[key];\n\n        if (isMatcher(exp)) {\n            if (!exp.test(act)) {\n                return false;\n            }\n        } else if (typeOf(exp) === \"object\") {\n            if (!matchObject(act, exp, matcher)) {\n                return false;\n            }\n        } else if (!deepEqual(act, exp)) {\n            return false;\n        }\n\n        return true;\n    });\n}\n\nmodule.exports = matchObject;\n","\"use strict\";\n\nvar matcherPrototype = {\n    toString: function() {\n        return this.message;\n    }\n};\n\nmatcherPrototype.or = function(valueOrMatcher) {\n    var createMatcher = require(\"../create-matcher\");\n    var isMatcher = createMatcher.isMatcher;\n\n    if (!arguments.length) {\n        throw new TypeError(\"Matcher expected\");\n    }\n\n    var m2 = isMatcher(valueOrMatcher)\n        ? valueOrMatcher\n        : createMatcher(valueOrMatcher);\n    var m1 = this;\n    var or = Object.create(matcherPrototype);\n    or.test = function(actual) {\n        return m1.test(actual) || m2.test(actual);\n    };\n    or.message = m1.message + \".or(\" + m2.message + \")\";\n    return or;\n};\n\nmatcherPrototype.and = function(valueOrMatcher) {\n    var createMatcher = require(\"../create-matcher\");\n    var isMatcher = createMatcher.isMatcher;\n\n    if (!arguments.length) {\n        throw new TypeError(\"Matcher expected\");\n    }\n\n    var m2 = isMatcher(valueOrMatcher)\n        ? valueOrMatcher\n        : createMatcher(valueOrMatcher);\n    var m1 = this;\n    var and = Object.create(matcherPrototype);\n    and.test = function(actual) {\n        return m1.test(actual) && m2.test(actual);\n    };\n    and.message = m1.message + \".and(\" + m2.message + \")\";\n    return and;\n};\n\nmodule.exports = matcherPrototype;\n","\"use strict\";\n\nvar functionName = require(\"@sinonjs/commons\").functionName;\nvar join = require(\"@sinonjs/commons\").prototypes.array.join;\nvar map = require(\"@sinonjs/commons\").prototypes.array.map;\nvar stringIndexOf = require(\"@sinonjs/commons\").prototypes.string.indexOf;\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\n\nvar matchObject = require(\"./match-object\");\n\nvar createTypeMap = function(match) {\n    return {\n        function: function(m, expectation, message) {\n            m.test = expectation;\n            m.message = message || \"match(\" + functionName(expectation) + \")\";\n        },\n        number: function(m, expectation) {\n            m.test = function(actual) {\n                // we need type coercion here\n                return expectation == actual; // eslint-disable-line eqeqeq\n            };\n        },\n        object: function(m, expectation) {\n            var array = [];\n\n            if (typeof expectation.test === \"function\") {\n                m.test = function(actual) {\n                    return expectation.test(actual) === true;\n                };\n                m.message = \"match(\" + functionName(expectation.test) + \")\";\n                return m;\n            }\n\n            array = map(Object.keys(expectation), function(key) {\n                return key + \": \" + valueToString(expectation[key]);\n            });\n\n            m.test = function(actual) {\n                return matchObject(actual, expectation, match);\n            };\n            m.message = \"match(\" + join(array, \", \") + \")\";\n\n            return m;\n        },\n        regexp: function(m, expectation) {\n            m.test = function(actual) {\n                return typeof actual === \"string\" && expectation.test(actual);\n            };\n        },\n        string: function(m, expectation) {\n            m.test = function(actual) {\n                return (\n                    typeof actual === \"string\" &&\n                    stringIndexOf(actual, expectation) !== -1\n                );\n            };\n            m.message = 'match(\"' + expectation + '\")';\n        }\n    };\n};\n\nmodule.exports = createTypeMap;\n","\"use strict\";\n\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\nvar className = require(\"@sinonjs/commons\").className;\nvar typeOf = require(\"@sinonjs/commons\").typeOf;\nvar arrayProto = require(\"@sinonjs/commons\").prototypes.array;\nvar objectProto = require(\"@sinonjs/commons\").prototypes.object;\nvar mapForEach = require(\"@sinonjs/commons\").prototypes.map.forEach;\n\nvar getClass = require(\"./get-class\");\nvar identical = require(\"./identical\");\nvar isArguments = require(\"./is-arguments\");\nvar isDate = require(\"./is-date\");\nvar isElement = require(\"./is-element\");\nvar isMap = require(\"./is-map\");\nvar isNaN = require(\"./is-nan\");\nvar isObject = require(\"./is-object\");\nvar isSet = require(\"./is-set\");\nvar isSubset = require(\"./is-subset\");\n\nvar concat = arrayProto.concat;\nvar every = arrayProto.every;\nvar push = arrayProto.push;\n\nvar getTime = Date.prototype.getTime;\nvar hasOwnProperty = objectProto.hasOwnProperty;\nvar indexOf = arrayProto.indexOf;\nvar keys = Object.keys;\nvar getOwnPropertySymbols = Object.getOwnPropertySymbols;\n\n/**\n * Deep equal comparison. Two values are \"deep equal\" when:\n *\n *   - They are equal, according to samsam.identical\n *   - They are both date objects representing the same time\n *   - They are both arrays containing elements that are all deepEqual\n *   - They are objects with the same set of properties, and each property\n *     in ``actual`` is deepEqual to the corresponding property in ``expectation``\n *\n * Supports cyclic objects.\n *\n * @alias module:samsam.deepEqual\n * @param {*} actual The object to examine\n * @param {*} expectation The object actual is expected to be equal to\n * @param {object} match A value to match on\n * @returns {boolean} Returns true when actual and expectation are considered equal\n */\nfunction deepEqualCyclic(actual, expectation, match) {\n    // used for cyclic comparison\n    // contain already visited objects\n    var actualObjects = [];\n    var expectationObjects = [];\n    // contain pathes (position in the object structure)\n    // of the already visited objects\n    // indexes same as in objects arrays\n    var actualPaths = [];\n    var expectationPaths = [];\n    // contains combinations of already compared objects\n    // in the manner: { \"$1['ref']$2['ref']\": true }\n    var compared = {};\n\n    // does the recursion for the deep equal check\n    // eslint-disable-next-line complexity\n    return (function deepEqual(\n        actualObj,\n        expectationObj,\n        actualPath,\n        expectationPath\n    ) {\n        // If both are matchers they must be the same instance in order to be\n        // considered equal If we didn't do that we would end up running one\n        // matcher against the other\n        if (match && match.isMatcher(expectationObj)) {\n            if (match.isMatcher(actualObj)) {\n                return actualObj === expectationObj;\n            }\n            return expectationObj.test(actualObj);\n        }\n\n        var actualType = typeof actualObj;\n        var expectationType = typeof expectationObj;\n\n        if (\n            actualObj === expectationObj ||\n            isNaN(actualObj) ||\n            isNaN(expectationObj) ||\n            actualObj === null ||\n            expectationObj === null ||\n            actualObj === undefined ||\n            expectationObj === undefined ||\n            actualType !== \"object\" ||\n            expectationType !== \"object\"\n        ) {\n            return identical(actualObj, expectationObj);\n        }\n\n        // Elements are only equal if identical(expected, actual)\n        if (isElement(actualObj) || isElement(expectationObj)) {\n            return false;\n        }\n\n        var isActualDate = isDate(actualObj);\n        var isExpectationDate = isDate(expectationObj);\n        if (isActualDate || isExpectationDate) {\n            if (\n                !isActualDate ||\n                !isExpectationDate ||\n                getTime.call(actualObj) !== getTime.call(expectationObj)\n            ) {\n                return false;\n            }\n        }\n\n        if (actualObj instanceof RegExp && expectationObj instanceof RegExp) {\n            if (valueToString(actualObj) !== valueToString(expectationObj)) {\n                return false;\n            }\n        }\n\n        if (actualObj instanceof Error && expectationObj instanceof Error) {\n            return actualObj === expectationObj;\n        }\n\n        var actualClass = getClass(actualObj);\n        var expectationClass = getClass(expectationObj);\n        var actualKeys = keys(actualObj);\n        var expectationKeys = keys(expectationObj);\n        var actualName = className(actualObj);\n        var expectationName = className(expectationObj);\n        var expectationSymbols =\n            typeOf(getOwnPropertySymbols) === \"function\"\n                ? getOwnPropertySymbols(expectationObj)\n                : /* istanbul ignore next: cannot collect coverage for engine that doesn't support Symbol */\n                  [];\n        var expectationKeysAndSymbols = concat(\n            expectationKeys,\n            expectationSymbols\n        );\n\n        if (isArguments(actualObj) || isArguments(expectationObj)) {\n            if (actualObj.length !== expectationObj.length) {\n                return false;\n            }\n        } else {\n            if (\n                actualType !== expectationType ||\n                actualClass !== expectationClass ||\n                actualKeys.length !== expectationKeys.length ||\n                (actualName &&\n                    expectationName &&\n                    actualName !== expectationName)\n            ) {\n                return false;\n            }\n        }\n\n        if (isSet(actualObj) || isSet(expectationObj)) {\n            if (\n                !isSet(actualObj) ||\n                !isSet(expectationObj) ||\n                actualObj.size !== expectationObj.size\n            ) {\n                return false;\n            }\n\n            return isSubset(actualObj, expectationObj, deepEqual);\n        }\n\n        if (isMap(actualObj) || isMap(expectationObj)) {\n            if (\n                !isMap(actualObj) ||\n                !isMap(expectationObj) ||\n                actualObj.size !== expectationObj.size\n            ) {\n                return false;\n            }\n\n            var mapsDeeplyEqual = true;\n            mapForEach(actualObj, function(value, key) {\n                mapsDeeplyEqual =\n                    mapsDeeplyEqual &&\n                    deepEqualCyclic(value, expectationObj.get(key));\n            });\n\n            return mapsDeeplyEqual;\n        }\n\n        return every(expectationKeysAndSymbols, function(key) {\n            if (!hasOwnProperty(actualObj, key)) {\n                return false;\n            }\n\n            var actualValue = actualObj[key];\n            var expectationValue = expectationObj[key];\n            var actualObject = isObject(actualValue);\n            var expectationObject = isObject(expectationValue);\n            // determines, if the objects were already visited\n            // (it's faster to check for isObject first, than to\n            // get -1 from getIndex for non objects)\n            var actualIndex = actualObject\n                ? indexOf(actualObjects, actualValue)\n                : -1;\n            var expectationIndex = expectationObject\n                ? indexOf(expectationObjects, expectationValue)\n                : -1;\n            // determines the new paths of the objects\n            // - for non cyclic objects the current path will be extended\n            //   by current property name\n            // - for cyclic objects the stored path is taken\n            var newActualPath =\n                actualIndex !== -1\n                    ? actualPaths[actualIndex]\n                    : actualPath + \"[\" + JSON.stringify(key) + \"]\";\n            var newExpectationPath =\n                expectationIndex !== -1\n                    ? expectationPaths[expectationIndex]\n                    : expectationPath + \"[\" + JSON.stringify(key) + \"]\";\n            var combinedPath = newActualPath + newExpectationPath;\n\n            // stop recursion if current objects are already compared\n            if (compared[combinedPath]) {\n                return true;\n            }\n\n            // remember the current objects and their paths\n            if (actualIndex === -1 && actualObject) {\n                push(actualObjects, actualValue);\n                push(actualPaths, newActualPath);\n            }\n            if (expectationIndex === -1 && expectationObject) {\n                push(expectationObjects, expectationValue);\n                push(expectationPaths, newExpectationPath);\n            }\n\n            // remember that the current objects are already compared\n            if (actualObject && expectationObject) {\n                compared[combinedPath] = true;\n            }\n\n            // End of cyclic logic\n\n            // neither actualValue nor expectationValue is a cycle\n            // continue with next level\n            return deepEqual(\n                actualValue,\n                expectationValue,\n                newActualPath,\n                newExpectationPath\n            );\n        });\n    })(actual, expectation, \"$1\", \"$2\");\n}\n\ndeepEqualCyclic.use = function(match) {\n    return function deepEqual(a, b) {\n        return deepEqualCyclic(a, b, match);\n    };\n};\n\nmodule.exports = deepEqualCyclic;\n","\"use strict\";\n\nvar toString = require(\"@sinonjs/commons\").prototypes.object.toString;\n\n/**\n * Returns the internal `Class` by calling `Object.prototype.toString`\n * with the provided value as `this`. Return value is a `String`, naming the\n * internal class, e.g. \"Array\"\n *\n * @private\n * @param  {*} value - Any value\n * @returns {string} - A string representation of the `Class` of `value`\n */\nfunction getClass(value) {\n    return toString(value).split(/[ \\]]/)[1];\n}\n\nmodule.exports = getClass;\n","\"use strict\";\n\nvar isNaN = require(\"./is-nan\");\nvar isNegZero = require(\"./is-neg-zero\");\n\n/**\n * Strict equality check according to EcmaScript Harmony's `egal`.\n *\n * **From the Harmony wiki:**\n * > An `egal` function simply makes available the internal `SameValue` function\n * > from section 9.12 of the ES5 spec. If two values are egal, then they are not\n * > observably distinguishable.\n *\n * `identical` returns `true` when `===` is `true`, except for `-0` and\n * `+0`, where it returns `false`. Additionally, it returns `true` when\n * `NaN` is compared to itself.\n *\n * @alias module:samsam.identical\n * @param {*} obj1 The first value to compare\n * @param {*} obj2 The second value to compare\n * @returns {boolean} Returns `true` when the objects are *egal*, `false` otherwise\n */\nfunction identical(obj1, obj2) {\n    if (obj1 === obj2 || (isNaN(obj1) && isNaN(obj2))) {\n        return obj1 !== 0 || isNegZero(obj1) === isNegZero(obj2);\n    }\n\n    return false;\n}\n\nmodule.exports = identical;\n","\"use strict\";\n\nvar getClass = require(\"./get-class\");\n\n/**\n * Returns `true` when `object` is an `arguments` object, `false` otherwise\n *\n * @alias module:samsam.isArguments\n * @param  {*}  object - The object to examine\n * @returns {boolean} `true` when `object` is an `arguments` object\n */\nfunction isArguments(object) {\n    return getClass(object) === \"Arguments\";\n}\n\nmodule.exports = isArguments;\n","\"use strict\";\n\nvar functionName = require(\"@sinonjs/commons\").functionName;\nvar indexOf = require(\"@sinonjs/commons\").prototypes.array.indexOf;\nvar map = require(\"@sinonjs/commons\").prototypes.array.map;\nvar ARRAY_TYPES = require(\"./array-types\");\nvar type = require(\"type-detect\");\n\n/**\n * Returns `true` when `object` is an array type, `false` otherwise\n *\n * @param  {*}  object - The object to examine\n * @returns {boolean} `true` when `object` is an array type\n * @private\n */\nfunction isArrayType(object) {\n    return indexOf(map(ARRAY_TYPES, functionName), type(object)) !== -1;\n}\n\nmodule.exports = isArrayType;\n","\"use strict\";\n\n/**\n * Returns `true` when `value` is an instance of Date\n *\n * @private\n * @param  {Date}  value The value to examine\n * @returns {boolean}     `true` when `value` is an instance of Date\n */\nfunction isDate(value) {\n    return value instanceof Date;\n}\n\nmodule.exports = isDate;\n","\"use strict\";\n\nvar div = typeof document !== \"undefined\" && document.createElement(\"div\");\n\n/**\n * Returns `true` when `object` is a DOM element node.\n *\n * Unlike Underscore.js/lodash, this function will return `false` if `object`\n * is an *element-like* object, i.e. a regular object with a `nodeType`\n * property that holds the value `1`.\n *\n * @alias module:samsam.isElement\n * @param {object} object The object to examine\n * @returns {boolean} Returns `true` for DOM element nodes\n */\nfunction isElement(object) {\n    if (!object || object.nodeType !== 1 || !div) {\n        return false;\n    }\n    try {\n        object.appendChild(div);\n        object.removeChild(div);\n    } catch (e) {\n        return false;\n    }\n    return true;\n}\n\nmodule.exports = isElement;\n","\"use strict\";\n\n/**\n * Returns `true` when `value` is a Map\n *\n * @param {*} value A value to examine\n * @returns {boolean} `true` when `value` is an instance of `Map`, `false` otherwise\n * @private\n */\nfunction isMap(value) {\n    return typeof Map !== \"undefined\" && value instanceof Map;\n}\n\nmodule.exports = isMap;\n","\"use strict\";\n\n/**\n * Compares a `value` to `NaN`\n *\n * @private\n * @param {*} value A value to examine\n * @returns {boolean} Returns `true` when `value` is `NaN`\n */\nfunction isNaN(value) {\n    // Unlike global `isNaN`, this function avoids type coercion\n    // `typeof` check avoids IE host object issues, hat tip to\n    // lodash\n\n    // eslint-disable-next-line no-self-compare\n    return typeof value === \"number\" && value !== value;\n}\n\nmodule.exports = isNaN;\n","\"use strict\";\n\n/**\n * Returns `true` when `value` is `-0`\n *\n * @alias module:samsam.isNegZero\n * @param {*} value A value to examine\n * @returns {boolean} Returns `true` when `value` is `-0`\n */\nfunction isNegZero(value) {\n    return value === 0 && 1 / value === -Infinity;\n}\n\nmodule.exports = isNegZero;\n","\"use strict\";\n\n/**\n * Returns `true` when the value is a regular Object and not a specialized Object\n *\n * This helps speed up deepEqual cyclic checks\n *\n * The premise is that only Objects are stored in the visited array.\n * So if this function returns false, we don't have to do the\n * expensive operation of searching for the value in the the array of already\n * visited objects\n *\n * @private\n * @param  {object}   value The object to examine\n * @returns {boolean}       `true` when the object is a non-specialised object\n */\nfunction isObject(value) {\n    return (\n        typeof value === \"object\" &&\n        value !== null &&\n        // none of these are collection objects, so we can return false\n        !(value instanceof Boolean) &&\n        !(value instanceof Date) &&\n        !(value instanceof Error) &&\n        !(value instanceof Number) &&\n        !(value instanceof RegExp) &&\n        !(value instanceof String)\n    );\n}\n\nmodule.exports = isObject;\n","\"use strict\";\n\n/**\n * Returns `true` when the argument is an instance of Set, `false` otherwise\n *\n * @alias module:samsam.isSet\n * @param  {*}  val - A value to examine\n * @returns {boolean} Returns `true` when the argument is an instance of Set, `false` otherwise\n */\nfunction isSet(val) {\n    return (typeof Set !== \"undefined\" && val instanceof Set) || false;\n}\n\nmodule.exports = isSet;\n","\"use strict\";\n\nvar forEach = require(\"@sinonjs/commons\").prototypes.set.forEach;\n\n/**\n * Returns `true` when `s1` is a subset of `s2`, `false` otherwise\n *\n * @private\n * @param  {Array|Set}  s1      The target value\n * @param  {Array|Set}  s2      The containing value\n * @param  {Function}  compare A comparison function, should return `true` when\n *                             values are considered equal\n * @returns {boolean} Returns `true` when `s1` is a subset of `s2`, `false`` otherwise\n */\nfunction isSubset(s1, s2, compare) {\n    var allContained = true;\n    forEach(s1, function(v1) {\n        var includes = false;\n        forEach(s2, function(v2) {\n            if (compare(v2, v1)) {\n                includes = true;\n            }\n        });\n        allContained = allContained && includes;\n    });\n\n    return allContained;\n}\n\nmodule.exports = isSubset;\n","\"use strict\";\n\nvar slice = require(\"@sinonjs/commons\").prototypes.string.slice;\nvar typeOf = require(\"@sinonjs/commons\").typeOf;\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\n\n/**\n * Creates a string represenation of an iterable object\n *\n * @private\n * @param   {object} obj The iterable object to stringify\n * @returns {string}     A string representation\n */\nfunction iterableToString(obj) {\n    if (typeOf(obj) === \"map\") {\n        return mapToString(obj);\n    }\n\n    return genericIterableToString(obj);\n}\n\n/**\n * Creates a string representation of a Map\n *\n * @private\n * @param   {Map} map    The map to stringify\n * @returns {string}     A string representation\n */\nfunction mapToString(map) {\n    var representation = \"\";\n\n    /* eslint-disable-next-line local-rules/no-prototype-methods */\n    map.forEach(function(value, key) {\n        representation += \"[\" + stringify(key) + \",\" + stringify(value) + \"],\";\n    });\n\n    representation = slice(representation, 0, -1);\n    return representation;\n}\n\n/**\n * Create a string represenation for an iterable\n *\n * @private\n * @param   {object} iterable The iterable to stringify\n * @returns {string}          A string representation\n */\nfunction genericIterableToString(iterable) {\n    var representation = \"\";\n\n    /* eslint-disable-next-line local-rules/no-prototype-methods */\n    iterable.forEach(function(value) {\n        representation += stringify(value) + \",\";\n    });\n\n    representation = slice(representation, 0, -1);\n    return representation;\n}\n\n/**\n * Creates a string representation of the passed `item`\n *\n * @private\n * @param  {object} item The item to stringify\n * @returns {string}      A string representation of `item`\n */\nfunction stringify(item) {\n    return typeof item === \"string\" ? \"'\" + item + \"'\" : valueToString(item);\n}\n\nmodule.exports = iterableToString;\n","\"use strict\";\n\nvar valueToString = require(\"@sinonjs/commons\").valueToString;\nvar indexOf = require(\"@sinonjs/commons\").prototypes.string.indexOf;\nvar forEach = require(\"@sinonjs/commons\").prototypes.array.forEach;\nvar type = require(\"type-detect\");\n\nvar engineCanCompareMaps = typeof Array.from === \"function\";\nvar deepEqual = require(\"./deep-equal\").use(match); // eslint-disable-line no-use-before-define\nvar isArrayType = require(\"./is-array-type\");\nvar isSubset = require(\"./is-subset\");\nvar createMatcher = require(\"./create-matcher\");\n\n/**\n * Returns true when `array` contains all of `subset` as defined by the `compare`\n * argument\n *\n * @param  {Array} array   An array to search for a subset\n * @param  {Array} subset  The subset to find in the array\n * @param  {Function} compare A comparison function\n * @returns {boolean}         [description]\n * @private\n */\nfunction arrayContains(array, subset, compare) {\n    if (subset.length === 0) {\n        return true;\n    }\n    var i, l, j, k;\n    for (i = 0, l = array.length; i < l; ++i) {\n        if (compare(array[i], subset[0])) {\n            for (j = 0, k = subset.length; j < k; ++j) {\n                if (i + j >= l) {\n                    return false;\n                }\n                if (!compare(array[i + j], subset[j])) {\n                    return false;\n                }\n            }\n            return true;\n        }\n    }\n    return false;\n}\n\n/* eslint-disable complexity */\n/**\n * Matches an object with a matcher (or value)\n *\n * @alias module:samsam.match\n * @param {object} object The object candidate to match\n * @param {object} matcherOrValue A matcher or value to match against\n * @returns {boolean} true when `object` matches `matcherOrValue`\n */\nfunction match(object, matcherOrValue) {\n    if (matcherOrValue && typeof matcherOrValue.test === \"function\") {\n        return matcherOrValue.test(object);\n    }\n\n    switch (type(matcherOrValue)) {\n        case \"bigint\":\n        case \"boolean\":\n        case \"number\":\n        case \"symbol\":\n            return matcherOrValue === object;\n        case \"function\":\n            return matcherOrValue(object) === true;\n        case \"string\":\n            var notNull = typeof object === \"string\" || Boolean(object);\n            return (\n                notNull &&\n                indexOf(\n                    valueToString(object).toLowerCase(),\n                    matcherOrValue.toLowerCase()\n                ) >= 0\n            );\n        case \"null\":\n            return object === null;\n        case \"undefined\":\n            return typeof object === \"undefined\";\n        case \"Date\":\n            /* istanbul ignore else */\n            if (type(object) === \"Date\") {\n                return object.getTime() === matcherOrValue.getTime();\n            }\n            /* istanbul ignore next: this is basically the rest of the function, which is covered */\n            break;\n        case \"Array\":\n        case \"Int8Array\":\n        case \"Uint8Array\":\n        case \"Uint8ClampedArray\":\n        case \"Int16Array\":\n        case \"Uint16Array\":\n        case \"Int32Array\":\n        case \"Uint32Array\":\n        case \"Float32Array\":\n        case \"Float64Array\":\n            return (\n                isArrayType(matcherOrValue) &&\n                arrayContains(object, matcherOrValue, match)\n            );\n        case \"Map\":\n            /* istanbul ignore next: this is covered by a test, that is only run in IE, but we collect coverage information in node*/\n            if (!engineCanCompareMaps) {\n                throw new Error(\n                    \"The JavaScript engine does not support Array.from and cannot reliably do value comparison of Map instances\"\n                );\n            }\n\n            return (\n                type(object) === \"Map\" &&\n                arrayContains(\n                    Array.from(object),\n                    Array.from(matcherOrValue),\n                    match\n                )\n            );\n        default:\n            break;\n    }\n\n    switch (type(object)) {\n        case \"null\":\n            return false;\n        case \"Set\":\n            return isSubset(matcherOrValue, object, match);\n        default:\n            break;\n    }\n\n    /* istanbul ignore else */\n    if (matcherOrValue && typeof matcherOrValue === \"object\") {\n        if (matcherOrValue === object) {\n            return true;\n        }\n        if (typeof object !== \"object\") {\n            return false;\n        }\n        var prop;\n        // eslint-disable-next-line guard-for-in\n        for (prop in matcherOrValue) {\n            var value = object[prop];\n            if (\n                typeof value === \"undefined\" &&\n                typeof object.getAttribute === \"function\"\n            ) {\n                value = object.getAttribute(prop);\n            }\n            if (\n                matcherOrValue[prop] === null ||\n                typeof matcherOrValue[prop] === \"undefined\"\n            ) {\n                if (value !== matcherOrValue[prop]) {\n                    return false;\n                }\n            } else if (\n                typeof value === \"undefined\" ||\n                !deepEqual(value, matcherOrValue[prop])\n            ) {\n                return false;\n            }\n        }\n        return true;\n    }\n\n    /* istanbul ignore next */\n    throw new Error(\"Matcher was an unknown or unsupported type\");\n}\n/* eslint-enable complexity */\n\nforEach(Object.keys(createMatcher), function(key) {\n    match[key] = createMatcher[key];\n});\n\nmodule.exports = match;\n","\"use strict\";\n\n/**\n * @module samsam\n */\nvar identical = require(\"./identical\");\nvar isArguments = require(\"./is-arguments\");\nvar isElement = require(\"./is-element\");\nvar isNegZero = require(\"./is-neg-zero\");\nvar isSet = require(\"./is-set\");\nvar isMap = require(\"./is-map\");\nvar match = require(\"./match\");\nvar deepEqualCyclic = require(\"./deep-equal\").use(match);\nvar createMatcher = require(\"./create-matcher\");\n\nmodule.exports = {\n    createMatcher: createMatcher,\n    deepEqual: deepEqualCyclic,\n    identical: identical,\n    isArguments: isArguments,\n    isElement: isElement,\n    isMap: isMap,\n    isNegZero: isNegZero,\n    isSet: isSet,\n    match: match\n};\n","\"use strict\";\n\nvar every = require(\"@sinonjs/commons\").prototypes.array.every;\nvar concat = require(\"@sinonjs/commons\").prototypes.array.concat;\nvar typeOf = require(\"@sinonjs/commons\").typeOf;\n\nvar deepEqualFactory = require(\"../deep-equal\").use;\n\nvar isMatcher = require(\"./is-matcher\");\n\nvar keys = Object.keys;\nvar getOwnPropertySymbols = Object.getOwnPropertySymbols;\n\n/**\n * Matches `actual` with `expectation`\n *\n * @private\n * @param {*} actual A value to examine\n * @param {object} expectation An object with properties to match on\n * @param {object} matcher A matcher to use for comparison\n * @returns {boolean} Returns true when `actual` matches all properties in `expectation`\n */\nfunction matchObject(actual, expectation, matcher) {\n    var deepEqual = deepEqualFactory(matcher);\n    if (actual === null || actual === undefined) {\n        return false;\n    }\n\n    var expectedKeys = keys(expectation);\n    /* istanbul ignore else: cannot collect coverage for engine that doesn't support Symbol */\n    if (typeOf(getOwnPropertySymbols) === \"function\") {\n        expectedKeys = concat(expectedKeys, getOwnPropertySymbols(expectation));\n    }\n\n    return every(expectedKeys, function(key) {\n        var exp = expectation[key];\n        var act = actual[key];\n\n        if (isMatcher(exp)) {\n            if (!exp.test(act)) {\n                return false;\n            }\n        } else if (typeOf(exp) === \"object\") {\n            if (!matchObject(act, exp, matcher)) {\n                return false;\n            }\n        } else if (!deepEqual(act, exp)) {\n            return false;\n        }\n\n        return true;\n    });\n}\n\nmodule.exports = matchObject;\n","// This is free and unencumbered software released into the public domain.\n// See LICENSE.md for more information.\n\nvar encoding = require(\"./lib/encoding.js\");\n\nmodule.exports = {\n  TextEncoder: encoding.TextEncoder,\n  TextDecoder: encoding.TextDecoder,\n};\n","(function(global) {\n  'use strict';\n\n  if (typeof module !== \"undefined\" && module.exports) {\n    module.exports = global;\n  }\n\n  global[\"encoding-indexes\"] =\n{\n  \"big5\":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,17392,19506,17923,17830,17784,160359,19831,17843,162993,19682,163013,15253,18230,18244,19527,19520,148159,144919,160594,159371,159954,19543,172881,18255,17882,19589,162924,19719,19108,18081,158499,29221,154196,137827,146950,147297,26189,22267,null,32149,22813,166841,15860,38708,162799,23515,138590,23204,13861,171696,23249,23479,23804,26478,34195,170309,29793,29853,14453,138579,145054,155681,16108,153822,15093,31484,40855,147809,166157,143850,133770,143966,17162,33924,40854,37935,18736,34323,22678,38730,37400,31184,31282,26208,27177,34973,29772,31685,26498,31276,21071,36934,13542,29636,155065,29894,40903,22451,18735,21580,16689,145038,22552,31346,162661,35727,18094,159368,16769,155033,31662,140476,40904,140481,140489,140492,40905,34052,144827,16564,40906,17633,175615,25281,28782,40907,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,12736,12737,12738,12739,12740,131340,12741,131281,131277,12742,12743,131275,139240,12744,131274,12745,12746,12747,12748,131342,12749,12750,256,193,461,192,274,201,282,200,332,211,465,210,null,7870,null,7872,202,257,225,462,224,593,275,233,283,232,299,237,464,236,333,243,466,242,363,250,468,249,470,472,474,476,252,null,7871,null,7873,234,609,9178,9179,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,172969,135493,null,25866,null,null,20029,28381,40270,37343,null,null,161589,25745,20250,20264,20392,20822,20852,20892,20964,21153,21160,21307,21326,21457,21464,22242,22768,22788,22791,22834,22836,23398,23454,23455,23706,24198,24635,25993,26622,26628,26725,27982,28860,30005,32420,32428,32442,32455,32463,32479,32518,32567,33402,33487,33647,35270,35774,35810,36710,36711,36718,29713,31996,32205,26950,31433,21031,null,null,null,null,37260,30904,37214,32956,null,36107,33014,133607,null,null,32927,40647,19661,40393,40460,19518,171510,159758,40458,172339,13761,null,28314,33342,29977,null,18705,39532,39567,40857,31111,164972,138698,132560,142054,20004,20097,20096,20103,20159,20203,20279,13388,20413,15944,20483,20616,13437,13459,13477,20870,22789,20955,20988,20997,20105,21113,21136,21287,13767,21417,13649,21424,13651,21442,21539,13677,13682,13953,21651,21667,21684,21689,21712,21743,21784,21795,21800,13720,21823,13733,13759,21975,13765,163204,21797,null,134210,134421,151851,21904,142534,14828,131905,36422,150968,169189,16467,164030,30586,142392,14900,18389,164189,158194,151018,25821,134524,135092,134357,135412,25741,36478,134806,134155,135012,142505,164438,148691,null,134470,170573,164073,18420,151207,142530,39602,14951,169460,16365,13574,152263,169940,161992,142660,40302,38933,null,17369,155813,25780,21731,142668,142282,135287,14843,135279,157402,157462,162208,25834,151634,134211,36456,139681,166732,132913,null,18443,131497,16378,22643,142733,null,148936,132348,155799,134988,134550,21881,16571,17338,null,19124,141926,135325,33194,39157,134556,25465,14846,141173,36288,22177,25724,15939,null,173569,134665,142031,142537,null,135368,145858,14738,14854,164507,13688,155209,139463,22098,134961,142514,169760,13500,27709,151099,null,null,161140,142987,139784,173659,167117,134778,134196,157724,32659,135375,141315,141625,13819,152035,134796,135053,134826,16275,134960,134471,135503,134732,null,134827,134057,134472,135360,135485,16377,140950,25650,135085,144372,161337,142286,134526,134527,142417,142421,14872,134808,135367,134958,173618,158544,167122,167321,167114,38314,21708,33476,21945,null,171715,39974,39606,161630,142830,28992,33133,33004,23580,157042,33076,14231,21343,164029,37302,134906,134671,134775,134907,13789,151019,13833,134358,22191,141237,135369,134672,134776,135288,135496,164359,136277,134777,151120,142756,23124,135197,135198,135413,135414,22428,134673,161428,164557,135093,134779,151934,14083,135094,135552,152280,172733,149978,137274,147831,164476,22681,21096,13850,153405,31666,23400,18432,19244,40743,18919,39967,39821,154484,143677,22011,13810,22153,20008,22786,138177,194680,38737,131206,20059,20155,13630,23587,24401,24516,14586,25164,25909,27514,27701,27706,28780,29227,20012,29357,149737,32594,31035,31993,32595,156266,13505,null,156491,32770,32896,157202,158033,21341,34916,35265,161970,35744,36125,38021,38264,38271,38376,167439,38886,39029,39118,39134,39267,170000,40060,40479,40644,27503,63751,20023,131207,38429,25143,38050,null,20539,28158,171123,40870,15817,34959,147790,28791,23797,19232,152013,13657,154928,24866,166450,36775,37366,29073,26393,29626,144001,172295,15499,137600,19216,30948,29698,20910,165647,16393,27235,172730,16931,34319,133743,31274,170311,166634,38741,28749,21284,139390,37876,30425,166371,40871,30685,20131,20464,20668,20015,20247,40872,21556,32139,22674,22736,138678,24210,24217,24514,141074,25995,144377,26905,27203,146531,27903,null,29184,148741,29580,16091,150035,23317,29881,35715,154788,153237,31379,31724,31939,32364,33528,34199,40873,34960,40874,36537,40875,36815,34143,39392,37409,40876,167353,136255,16497,17058,23066,null,null,null,39016,26475,17014,22333,null,34262,149883,33471,160013,19585,159092,23931,158485,159678,40877,40878,23446,40879,26343,32347,28247,31178,15752,17603,143958,141206,17306,17718,null,23765,146202,35577,23672,15634,144721,23928,40882,29015,17752,147692,138787,19575,14712,13386,131492,158785,35532,20404,131641,22975,33132,38998,170234,24379,134047,null,139713,166253,16642,18107,168057,16135,40883,172469,16632,14294,18167,158790,16764,165554,160767,17773,14548,152730,17761,17691,19849,19579,19830,17898,16328,150287,13921,17630,17597,16877,23870,23880,23894,15868,14351,23972,23993,14368,14392,24130,24253,24357,24451,14600,14612,14655,14669,24791,24893,23781,14729,25015,25017,25039,14776,25132,25232,25317,25368,14840,22193,14851,25570,25595,25607,25690,14923,25792,23829,22049,40863,14999,25990,15037,26111,26195,15090,26258,15138,26390,15170,26532,26624,15192,26698,26756,15218,15217,15227,26889,26947,29276,26980,27039,27013,15292,27094,15325,27237,27252,27249,27266,15340,27289,15346,27307,27317,27348,27382,27521,27585,27626,27765,27818,15563,27906,27910,27942,28033,15599,28068,28081,28181,28184,28201,28294,166336,28347,28386,28378,40831,28392,28393,28452,28468,15686,147265,28545,28606,15722,15733,29111,23705,15754,28716,15761,28752,28756,28783,28799,28809,131877,17345,13809,134872,147159,22462,159443,28990,153568,13902,27042,166889,23412,31305,153825,169177,31333,31357,154028,31419,31408,31426,31427,29137,156813,16842,31450,31453,31466,16879,21682,154625,31499,31573,31529,152334,154878,31650,31599,33692,154548,158847,31696,33825,31634,31672,154912,15789,154725,33938,31738,31750,31797,154817,31812,31875,149634,31910,26237,148856,31945,31943,31974,31860,31987,31989,31950,32359,17693,159300,32093,159446,29837,32137,32171,28981,32179,32210,147543,155689,32228,15635,32245,137209,32229,164717,32285,155937,155994,32366,32402,17195,37996,32295,32576,32577,32583,31030,156368,39393,32663,156497,32675,136801,131176,17756,145254,17667,164666,32762,156809,32773,32776,32797,32808,32815,172167,158915,32827,32828,32865,141076,18825,157222,146915,157416,26405,32935,166472,33031,33050,22704,141046,27775,156824,151480,25831,136330,33304,137310,27219,150117,150165,17530,33321,133901,158290,146814,20473,136445,34018,33634,158474,149927,144688,137075,146936,33450,26907,194964,16859,34123,33488,33562,134678,137140,14017,143741,144730,33403,33506,33560,147083,159139,158469,158615,144846,15807,33565,21996,33669,17675,159141,33708,33729,33747,13438,159444,27223,34138,13462,159298,143087,33880,154596,33905,15827,17636,27303,33866,146613,31064,33960,158614,159351,159299,34014,33807,33681,17568,33939,34020,154769,16960,154816,17731,34100,23282,159385,17703,34163,17686,26559,34326,165413,165435,34241,159880,34306,136578,159949,194994,17770,34344,13896,137378,21495,160666,34430,34673,172280,34798,142375,34737,34778,34831,22113,34412,26710,17935,34885,34886,161248,146873,161252,34910,34972,18011,34996,34997,25537,35013,30583,161551,35207,35210,35238,35241,35239,35260,166437,35303,162084,162493,35484,30611,37374,35472,162393,31465,162618,147343,18195,162616,29052,35596,35615,152624,152933,35647,35660,35661,35497,150138,35728,35739,35503,136927,17941,34895,35995,163156,163215,195028,14117,163155,36054,163224,163261,36114,36099,137488,36059,28764,36113,150729,16080,36215,36265,163842,135188,149898,15228,164284,160012,31463,36525,36534,36547,37588,36633,36653,164709,164882,36773,37635,172703,133712,36787,18730,166366,165181,146875,24312,143970,36857,172052,165564,165121,140069,14720,159447,36919,165180,162494,36961,165228,165387,37032,165651,37060,165606,37038,37117,37223,15088,37289,37316,31916,166195,138889,37390,27807,37441,37474,153017,37561,166598,146587,166668,153051,134449,37676,37739,166625,166891,28815,23235,166626,166629,18789,37444,166892,166969,166911,37747,37979,36540,38277,38310,37926,38304,28662,17081,140922,165592,135804,146990,18911,27676,38523,38550,16748,38563,159445,25050,38582,30965,166624,38589,21452,18849,158904,131700,156688,168111,168165,150225,137493,144138,38705,34370,38710,18959,17725,17797,150249,28789,23361,38683,38748,168405,38743,23370,168427,38751,37925,20688,143543,143548,38793,38815,38833,38846,38848,38866,38880,152684,38894,29724,169011,38911,38901,168989,162170,19153,38964,38963,38987,39014,15118,160117,15697,132656,147804,153350,39114,39095,39112,39111,19199,159015,136915,21936,39137,39142,39148,37752,39225,150057,19314,170071,170245,39413,39436,39483,39440,39512,153381,14020,168113,170965,39648,39650,170757,39668,19470,39700,39725,165376,20532,39732,158120,14531,143485,39760,39744,171326,23109,137315,39822,148043,39938,39935,39948,171624,40404,171959,172434,172459,172257,172323,172511,40318,40323,172340,40462,26760,40388,139611,172435,172576,137531,172595,40249,172217,172724,40592,40597,40606,40610,19764,40618,40623,148324,40641,15200,14821,15645,20274,14270,166955,40706,40712,19350,37924,159138,40727,40726,40761,22175,22154,40773,39352,168075,38898,33919,40802,40809,31452,40846,29206,19390,149877,149947,29047,150008,148296,150097,29598,166874,137466,31135,166270,167478,37737,37875,166468,37612,37761,37835,166252,148665,29207,16107,30578,31299,28880,148595,148472,29054,137199,28835,137406,144793,16071,137349,152623,137208,14114,136955,137273,14049,137076,137425,155467,14115,136896,22363,150053,136190,135848,136134,136374,34051,145062,34051,33877,149908,160101,146993,152924,147195,159826,17652,145134,170397,159526,26617,14131,15381,15847,22636,137506,26640,16471,145215,147681,147595,147727,158753,21707,22174,157361,22162,135135,134056,134669,37830,166675,37788,20216,20779,14361,148534,20156,132197,131967,20299,20362,153169,23144,131499,132043,14745,131850,132116,13365,20265,131776,167603,131701,35546,131596,20120,20685,20749,20386,20227,150030,147082,20290,20526,20588,20609,20428,20453,20568,20732,20825,20827,20829,20830,28278,144789,147001,147135,28018,137348,147081,20904,20931,132576,17629,132259,132242,132241,36218,166556,132878,21081,21156,133235,21217,37742,18042,29068,148364,134176,149932,135396,27089,134685,29817,16094,29849,29716,29782,29592,19342,150204,147597,21456,13700,29199,147657,21940,131909,21709,134086,22301,37469,38644,37734,22493,22413,22399,13886,22731,23193,166470,136954,137071,136976,23084,22968,37519,23166,23247,23058,153926,137715,137313,148117,14069,27909,29763,23073,155267,23169,166871,132115,37856,29836,135939,28933,18802,37896,166395,37821,14240,23582,23710,24158,24136,137622,137596,146158,24269,23375,137475,137476,14081,137376,14045,136958,14035,33066,166471,138682,144498,166312,24332,24334,137511,137131,23147,137019,23364,34324,161277,34912,24702,141408,140843,24539,16056,140719,140734,168072,159603,25024,131134,131142,140827,24985,24984,24693,142491,142599,149204,168269,25713,149093,142186,14889,142114,144464,170218,142968,25399,173147,25782,25393,25553,149987,142695,25252,142497,25659,25963,26994,15348,143502,144045,149897,144043,21773,144096,137433,169023,26318,144009,143795,15072,16784,152964,166690,152975,136956,152923,152613,30958,143619,137258,143924,13412,143887,143746,148169,26254,159012,26219,19347,26160,161904,138731,26211,144082,144097,26142,153714,14545,145466,145340,15257,145314,144382,29904,15254,26511,149034,26806,26654,15300,27326,14435,145365,148615,27187,27218,27337,27397,137490,25873,26776,27212,15319,27258,27479,147392,146586,37792,37618,166890,166603,37513,163870,166364,37991,28069,28427,149996,28007,147327,15759,28164,147516,23101,28170,22599,27940,30786,28987,148250,148086,28913,29264,29319,29332,149391,149285,20857,150180,132587,29818,147192,144991,150090,149783,155617,16134,16049,150239,166947,147253,24743,16115,29900,29756,37767,29751,17567,159210,17745,30083,16227,150745,150790,16216,30037,30323,173510,15129,29800,166604,149931,149902,15099,15821,150094,16127,149957,149747,37370,22322,37698,166627,137316,20703,152097,152039,30584,143922,30478,30479,30587,149143,145281,14942,149744,29752,29851,16063,150202,150215,16584,150166,156078,37639,152961,30750,30861,30856,30930,29648,31065,161601,153315,16654,31131,33942,31141,27181,147194,31290,31220,16750,136934,16690,37429,31217,134476,149900,131737,146874,137070,13719,21867,13680,13994,131540,134157,31458,23129,141045,154287,154268,23053,131675,30960,23082,154566,31486,16889,31837,31853,16913,154547,155324,155302,31949,150009,137136,31886,31868,31918,27314,32220,32263,32211,32590,156257,155996,162632,32151,155266,17002,158581,133398,26582,131150,144847,22468,156690,156664,149858,32733,31527,133164,154345,154947,31500,155150,39398,34373,39523,27164,144447,14818,150007,157101,39455,157088,33920,160039,158929,17642,33079,17410,32966,33033,33090,157620,39107,158274,33378,33381,158289,33875,159143,34320,160283,23174,16767,137280,23339,137377,23268,137432,34464,195004,146831,34861,160802,23042,34926,20293,34951,35007,35046,35173,35149,153219,35156,161669,161668,166901,166873,166812,166393,16045,33955,18165,18127,14322,35389,35356,169032,24397,37419,148100,26068,28969,28868,137285,40301,35999,36073,163292,22938,30659,23024,17262,14036,36394,36519,150537,36656,36682,17140,27736,28603,140065,18587,28537,28299,137178,39913,14005,149807,37051,37015,21873,18694,37307,37892,166475,16482,166652,37927,166941,166971,34021,35371,38297,38311,38295,38294,167220,29765,16066,149759,150082,148458,16103,143909,38543,167655,167526,167525,16076,149997,150136,147438,29714,29803,16124,38721,168112,26695,18973,168083,153567,38749,37736,166281,166950,166703,156606,37562,23313,35689,18748,29689,147995,38811,38769,39224,134950,24001,166853,150194,38943,169178,37622,169431,37349,17600,166736,150119,166756,39132,166469,16128,37418,18725,33812,39227,39245,162566,15869,39323,19311,39338,39516,166757,153800,27279,39457,23294,39471,170225,19344,170312,39356,19389,19351,37757,22642,135938,22562,149944,136424,30788,141087,146872,26821,15741,37976,14631,24912,141185,141675,24839,40015,40019,40059,39989,39952,39807,39887,171565,39839,172533,172286,40225,19630,147716,40472,19632,40204,172468,172269,172275,170287,40357,33981,159250,159711,158594,34300,17715,159140,159364,159216,33824,34286,159232,145367,155748,31202,144796,144960,18733,149982,15714,37851,37566,37704,131775,30905,37495,37965,20452,13376,36964,152925,30781,30804,30902,30795,137047,143817,149825,13978,20338,28634,28633,28702,28702,21524,147893,22459,22771,22410,40214,22487,28980,13487,147884,29163,158784,151447,23336,137141,166473,24844,23246,23051,17084,148616,14124,19323,166396,37819,37816,137430,134941,33906,158912,136211,148218,142374,148417,22932,146871,157505,32168,155995,155812,149945,149899,166394,37605,29666,16105,29876,166755,137375,16097,150195,27352,29683,29691,16086,150078,150164,137177,150118,132007,136228,149989,29768,149782,28837,149878,37508,29670,37727,132350,37681,166606,166422,37766,166887,153045,18741,166530,29035,149827,134399,22180,132634,134123,134328,21762,31172,137210,32254,136898,150096,137298,17710,37889,14090,166592,149933,22960,137407,137347,160900,23201,14050,146779,14000,37471,23161,166529,137314,37748,15565,133812,19094,14730,20724,15721,15692,136092,29045,17147,164376,28175,168164,17643,27991,163407,28775,27823,15574,147437,146989,28162,28428,15727,132085,30033,14012,13512,18048,16090,18545,22980,37486,18750,36673,166940,158656,22546,22472,14038,136274,28926,148322,150129,143331,135856,140221,26809,26983,136088,144613,162804,145119,166531,145366,144378,150687,27162,145069,158903,33854,17631,17614,159014,159057,158850,159710,28439,160009,33597,137018,33773,158848,159827,137179,22921,23170,137139,23137,23153,137477,147964,14125,23023,137020,14023,29070,37776,26266,148133,23150,23083,148115,27179,147193,161590,148571,148170,28957,148057,166369,20400,159016,23746,148686,163405,148413,27148,148054,135940,28838,28979,148457,15781,27871,194597,150095,32357,23019,23855,15859,24412,150109,137183,32164,33830,21637,146170,144128,131604,22398,133333,132633,16357,139166,172726,28675,168283,23920,29583,31955,166489,168992,20424,32743,29389,29456,162548,29496,29497,153334,29505,29512,16041,162584,36972,29173,149746,29665,33270,16074,30476,16081,27810,22269,29721,29726,29727,16098,16112,16116,16122,29907,16142,16211,30018,30061,30066,30093,16252,30152,30172,16320,30285,16343,30324,16348,30330,151388,29064,22051,35200,22633,16413,30531,16441,26465,16453,13787,30616,16490,16495,23646,30654,30667,22770,30744,28857,30748,16552,30777,30791,30801,30822,33864,152885,31027,26627,31026,16643,16649,31121,31129,36795,31238,36796,16743,31377,16818,31420,33401,16836,31439,31451,16847,20001,31586,31596,31611,31762,31771,16992,17018,31867,31900,17036,31928,17044,31981,36755,28864,134351,32207,32212,32208,32253,32686,32692,29343,17303,32800,32805,31545,32814,32817,32852,15820,22452,28832,32951,33001,17389,33036,29482,33038,33042,30048,33044,17409,15161,33110,33113,33114,17427,22586,33148,33156,17445,33171,17453,33189,22511,33217,33252,33364,17551,33446,33398,33482,33496,33535,17584,33623,38505,27018,33797,28917,33892,24803,33928,17668,33982,34017,34040,34064,34104,34130,17723,34159,34160,34272,17783,34418,34450,34482,34543,38469,34699,17926,17943,34990,35071,35108,35143,35217,162151,35369,35384,35476,35508,35921,36052,36082,36124,18328,22623,36291,18413,20206,36410,21976,22356,36465,22005,36528,18487,36558,36578,36580,36589,36594,36791,36801,36810,36812,36915,39364,18605,39136,37395,18718,37416,37464,37483,37553,37550,37567,37603,37611,37619,37620,37629,37699,37764,37805,18757,18769,40639,37911,21249,37917,37933,37950,18794,37972,38009,38189,38306,18855,38388,38451,18917,26528,18980,38720,18997,38834,38850,22100,19172,24808,39097,19225,39153,22596,39182,39193,20916,39196,39223,39234,39261,39266,19312,39365,19357,39484,39695,31363,39785,39809,39901,39921,39924,19565,39968,14191,138178,40265,39994,40702,22096,40339,40381,40384,40444,38134,36790,40571,40620,40625,40637,40646,38108,40674,40689,40696,31432,40772,131220,131767,132000,26906,38083,22956,132311,22592,38081,14265,132565,132629,132726,136890,22359,29043,133826,133837,134079,21610,194619,134091,21662,134139,134203,134227,134245,134268,24807,134285,22138,134325,134365,134381,134511,134578,134600,26965,39983,34725,134660,134670,134871,135056,134957,134771,23584,135100,24075,135260,135247,135286,26398,135291,135304,135318,13895,135359,135379,135471,135483,21348,33965,135907,136053,135990,35713,136567,136729,137155,137159,20088,28859,137261,137578,137773,137797,138282,138352,138412,138952,25283,138965,139029,29080,26709,139333,27113,14024,139900,140247,140282,141098,141425,141647,33533,141671,141715,142037,35237,142056,36768,142094,38840,142143,38983,39613,142412,null,142472,142519,154600,142600,142610,142775,142741,142914,143220,143308,143411,143462,144159,144350,24497,26184,26303,162425,144743,144883,29185,149946,30679,144922,145174,32391,131910,22709,26382,26904,146087,161367,155618,146961,147129,161278,139418,18640,19128,147737,166554,148206,148237,147515,148276,148374,150085,132554,20946,132625,22943,138920,15294,146687,148484,148694,22408,149108,14747,149295,165352,170441,14178,139715,35678,166734,39382,149522,149755,150037,29193,150208,134264,22885,151205,151430,132985,36570,151596,21135,22335,29041,152217,152601,147274,150183,21948,152646,152686,158546,37332,13427,152895,161330,152926,18200,152930,152934,153543,149823,153693,20582,13563,144332,24798,153859,18300,166216,154286,154505,154630,138640,22433,29009,28598,155906,162834,36950,156082,151450,35682,156674,156746,23899,158711,36662,156804,137500,35562,150006,156808,147439,156946,19392,157119,157365,141083,37989,153569,24981,23079,194765,20411,22201,148769,157436,20074,149812,38486,28047,158909,13848,35191,157593,157806,156689,157790,29151,157895,31554,168128,133649,157990,37124,158009,31301,40432,158202,39462,158253,13919,156777,131105,31107,158260,158555,23852,144665,33743,158621,18128,158884,30011,34917,159150,22710,14108,140685,159819,160205,15444,160384,160389,37505,139642,160395,37680,160486,149968,27705,38047,160848,134904,34855,35061,141606,164979,137137,28344,150058,137248,14756,14009,23568,31203,17727,26294,171181,170148,35139,161740,161880,22230,16607,136714,14753,145199,164072,136133,29101,33638,162269,168360,23143,19639,159919,166315,162301,162314,162571,163174,147834,31555,31102,163849,28597,172767,27139,164632,21410,159239,37823,26678,38749,164207,163875,158133,136173,143919,163912,23941,166960,163971,22293,38947,166217,23979,149896,26046,27093,21458,150181,147329,15377,26422,163984,164084,164142,139169,164175,164233,164271,164378,164614,164655,164746,13770,164968,165546,18682,25574,166230,30728,37461,166328,17394,166375,17375,166376,166726,166868,23032,166921,36619,167877,168172,31569,168208,168252,15863,168286,150218,36816,29327,22155,169191,169449,169392,169400,169778,170193,170313,170346,170435,170536,170766,171354,171419,32415,171768,171811,19620,38215,172691,29090,172799,19857,36882,173515,19868,134300,36798,21953,36794,140464,36793,150163,17673,32383,28502,27313,20202,13540,166700,161949,14138,36480,137205,163876,166764,166809,162366,157359,15851,161365,146615,153141,153942,20122,155265,156248,22207,134765,36366,23405,147080,150686,25566,25296,137206,137339,25904,22061,154698,21530,152337,15814,171416,19581,22050,22046,32585,155352,22901,146752,34672,19996,135146,134473,145082,33047,40286,36120,30267,40005,30286,30649,37701,21554,33096,33527,22053,33074,33816,32957,21994,31074,22083,21526,134813,13774,22021,22001,26353,164578,13869,30004,22000,21946,21655,21874,134209,134294,24272,151880,134774,142434,134818,40619,32090,21982,135285,25245,38765,21652,36045,29174,37238,25596,25529,25598,21865,142147,40050,143027,20890,13535,134567,20903,21581,21790,21779,30310,36397,157834,30129,32950,34820,34694,35015,33206,33820,135361,17644,29444,149254,23440,33547,157843,22139,141044,163119,147875,163187,159440,160438,37232,135641,37384,146684,173737,134828,134905,29286,138402,18254,151490,163833,135147,16634,40029,25887,142752,18675,149472,171388,135148,134666,24674,161187,135149,null,155720,135559,29091,32398,40272,19994,19972,13687,23309,27826,21351,13996,14812,21373,13989,149016,22682,150382,33325,21579,22442,154261,133497,null,14930,140389,29556,171692,19721,39917,146686,171824,19547,151465,169374,171998,33884,146870,160434,157619,145184,25390,32037,147191,146988,14890,36872,21196,15988,13946,17897,132238,30272,23280,134838,30842,163630,22695,16575,22140,39819,23924,30292,173108,40581,19681,30201,14331,24857,143578,148466,null,22109,135849,22439,149859,171526,21044,159918,13741,27722,40316,31830,39737,22494,137068,23635,25811,169168,156469,160100,34477,134440,159010,150242,134513,null,20990,139023,23950,38659,138705,40577,36940,31519,39682,23761,31651,25192,25397,39679,31695,39722,31870,39726,31810,31878,39957,31740,39689,40727,39963,149822,40794,21875,23491,20477,40600,20466,21088,15878,21201,22375,20566,22967,24082,38856,40363,36700,21609,38836,39232,38842,21292,24880,26924,21466,39946,40194,19515,38465,27008,20646,30022,137069,39386,21107,null,37209,38529,37212,null,37201,167575,25471,159011,27338,22033,37262,30074,25221,132092,29519,31856,154657,146685,null,149785,30422,39837,20010,134356,33726,34882,null,23626,27072,20717,22394,21023,24053,20174,27697,131570,20281,21660,21722,21146,36226,13822,24332,13811,null,27474,37244,40869,39831,38958,39092,39610,40616,40580,29050,31508,null,27642,34840,32632,null,22048,173642,36471,40787,null,36308,36431,40476,36353,25218,164733,36392,36469,31443,150135,31294,30936,27882,35431,30215,166490,40742,27854,34774,30147,172722,30803,194624,36108,29410,29553,35629,29442,29937,36075,150203,34351,24506,34976,17591,null,137275,159237,null,35454,140571,null,24829,30311,39639,40260,37742,39823,34805,null,34831,36087,29484,38689,39856,13782,29362,19463,31825,39242,155993,24921,19460,40598,24957,null,22367,24943,25254,25145,25294,14940,25058,21418,144373,25444,26626,13778,23895,166850,36826,167481,null,20697,138566,30982,21298,38456,134971,16485,null,30718,null,31938,155418,31962,31277,32870,32867,32077,29957,29938,35220,33306,26380,32866,160902,32859,29936,33027,30500,35209,157644,30035,159441,34729,34766,33224,34700,35401,36013,35651,30507,29944,34010,13877,27058,36262,null,35241,29800,28089,34753,147473,29927,15835,29046,24740,24988,15569,29026,24695,null,32625,166701,29264,24809,19326,21024,15384,146631,155351,161366,152881,137540,135934,170243,159196,159917,23745,156077,166415,145015,131310,157766,151310,17762,23327,156492,40784,40614,156267,12288,65292,12289,12290,65294,8231,65307,65306,65311,65281,65072,8230,8229,65104,65105,65106,183,65108,65109,65110,65111,65372,8211,65073,8212,65075,9588,65076,65103,65288,65289,65077,65078,65371,65373,65079,65080,12308,12309,65081,65082,12304,12305,65083,65084,12298,12299,65085,65086,12296,12297,65087,65088,12300,12301,65089,65090,12302,12303,65091,65092,65113,65114,65115,65116,65117,65118,8216,8217,8220,8221,12317,12318,8245,8242,65283,65286,65290,8251,167,12291,9675,9679,9651,9650,9678,9734,9733,9671,9670,9633,9632,9661,9660,12963,8453,175,65507,65343,717,65097,65098,65101,65102,65099,65100,65119,65120,65121,65291,65293,215,247,177,8730,65308,65310,65309,8806,8807,8800,8734,8786,8801,65122,65123,65124,65125,65126,65374,8745,8746,8869,8736,8735,8895,13266,13265,8747,8750,8757,8756,9792,9794,8853,8857,8593,8595,8592,8594,8598,8599,8601,8600,8741,8739,65295,65340,8725,65128,65284,65509,12306,65504,65505,65285,65312,8451,8457,65129,65130,65131,13269,13212,13213,13214,13262,13217,13198,13199,13252,176,20825,20827,20830,20829,20833,20835,21991,29929,31950,9601,9602,9603,9604,9605,9606,9607,9608,9615,9614,9613,9612,9611,9610,9609,9532,9524,9516,9508,9500,9620,9472,9474,9621,9484,9488,9492,9496,9581,9582,9584,9583,9552,9566,9578,9569,9698,9699,9701,9700,9585,9586,9587,65296,65297,65298,65299,65300,65301,65302,65303,65304,65305,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,12321,12322,12323,12324,12325,12326,12327,12328,12329,21313,21316,21317,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,65345,65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,12549,12550,12551,12552,12553,12554,12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570,12571,12572,12573,12574,12575,12576,12577,12578,12579,12580,12581,12582,12583,12584,12585,729,713,714,711,715,9216,9217,9218,9219,9220,9221,9222,9223,9224,9225,9226,9227,9228,9229,9230,9231,9232,9233,9234,9235,9236,9237,9238,9239,9240,9241,9242,9243,9244,9245,9246,9247,9249,8364,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,19968,20057,19969,19971,20035,20061,20102,20108,20154,20799,20837,20843,20960,20992,20993,21147,21269,21313,21340,21448,19977,19979,19976,19978,20011,20024,20961,20037,20040,20063,20062,20110,20129,20800,20995,21242,21315,21449,21475,22303,22763,22805,22823,22899,23376,23377,23379,23544,23567,23586,23608,23665,24029,24037,24049,24050,24051,24062,24178,24318,24331,24339,25165,19985,19984,19981,20013,20016,20025,20043,23609,20104,20113,20117,20114,20116,20130,20161,20160,20163,20166,20167,20173,20170,20171,20164,20803,20801,20839,20845,20846,20844,20887,20982,20998,20999,21000,21243,21246,21247,21270,21305,21320,21319,21317,21342,21380,21451,21450,21453,22764,22825,22827,22826,22829,23380,23569,23588,23610,23663,24052,24187,24319,24340,24341,24515,25096,25142,25163,25166,25903,25991,26007,26020,26041,26085,26352,26376,26408,27424,27490,27513,27595,27604,27611,27663,27700,28779,29226,29238,29243,29255,29273,29275,29356,29579,19993,19990,19989,19988,19992,20027,20045,20047,20046,20197,20184,20180,20181,20182,20183,20195,20196,20185,20190,20805,20804,20873,20874,20908,20985,20986,20984,21002,21152,21151,21253,21254,21271,21277,20191,21322,21321,21345,21344,21359,21358,21435,21487,21476,21491,21484,21486,21481,21480,21500,21496,21493,21483,21478,21482,21490,21489,21488,21477,21485,21499,22235,22234,22806,22830,22833,22900,22902,23381,23427,23612,24040,24039,24038,24066,24067,24179,24188,24321,24344,24343,24517,25098,25171,25172,25170,25169,26021,26086,26414,26412,26410,26411,26413,27491,27597,27665,27664,27704,27713,27712,27710,29359,29572,29577,29916,29926,29976,29983,29992,29993,30000,30001,30002,30003,30091,30333,30382,30399,30446,30683,30690,30707,31034,31166,31348,31435,19998,19999,20050,20051,20073,20121,20132,20134,20133,20223,20233,20249,20234,20245,20237,20240,20241,20239,20210,20214,20219,20208,20211,20221,20225,20235,20809,20807,20806,20808,20840,20849,20877,20912,21015,21009,21010,21006,21014,21155,21256,21281,21280,21360,21361,21513,21519,21516,21514,21520,21505,21515,21508,21521,21517,21512,21507,21518,21510,21522,22240,22238,22237,22323,22320,22312,22317,22316,22319,22313,22809,22810,22839,22840,22916,22904,22915,22909,22905,22914,22913,23383,23384,23431,23432,23429,23433,23546,23574,23673,24030,24070,24182,24180,24335,24347,24537,24534,25102,25100,25101,25104,25187,25179,25176,25910,26089,26088,26092,26093,26354,26355,26377,26429,26420,26417,26421,27425,27492,27515,27670,27741,27735,27737,27743,27744,27728,27733,27745,27739,27725,27726,28784,29279,29277,30334,31481,31859,31992,32566,32650,32701,32769,32771,32780,32786,32819,32895,32905,32907,32908,33251,33258,33267,33276,33292,33307,33311,33390,33394,33406,34411,34880,34892,34915,35199,38433,20018,20136,20301,20303,20295,20311,20318,20276,20315,20309,20272,20304,20305,20285,20282,20280,20291,20308,20284,20294,20323,20316,20320,20271,20302,20278,20313,20317,20296,20314,20812,20811,20813,20853,20918,20919,21029,21028,21033,21034,21032,21163,21161,21162,21164,21283,21363,21365,21533,21549,21534,21566,21542,21582,21543,21574,21571,21555,21576,21570,21531,21545,21578,21561,21563,21560,21550,21557,21558,21536,21564,21568,21553,21547,21535,21548,22250,22256,22244,22251,22346,22353,22336,22349,22343,22350,22334,22352,22351,22331,22767,22846,22941,22930,22952,22942,22947,22937,22934,22925,22948,22931,22922,22949,23389,23388,23386,23387,23436,23435,23439,23596,23616,23617,23615,23614,23696,23697,23700,23692,24043,24076,24207,24199,24202,24311,24324,24351,24420,24418,24439,24441,24536,24524,24535,24525,24561,24555,24568,24554,25106,25105,25220,25239,25238,25216,25206,25225,25197,25226,25212,25214,25209,25203,25234,25199,25240,25198,25237,25235,25233,25222,25913,25915,25912,26097,26356,26463,26446,26447,26448,26449,26460,26454,26462,26441,26438,26464,26451,26455,27493,27599,27714,27742,27801,27777,27784,27785,27781,27803,27754,27770,27792,27760,27788,27752,27798,27794,27773,27779,27762,27774,27764,27782,27766,27789,27796,27800,27778,28790,28796,28797,28792,29282,29281,29280,29380,29378,29590,29996,29995,30007,30008,30338,30447,30691,31169,31168,31167,31350,31995,32597,32918,32915,32925,32920,32923,32922,32946,33391,33426,33419,33421,35211,35282,35328,35895,35910,35925,35997,36196,36208,36275,36523,36554,36763,36784,36802,36806,36805,36804,24033,37009,37026,37034,37030,37027,37193,37318,37324,38450,38446,38449,38442,38444,20006,20054,20083,20107,20123,20126,20139,20140,20335,20381,20365,20339,20351,20332,20379,20363,20358,20355,20336,20341,20360,20329,20347,20374,20350,20367,20369,20346,20820,20818,20821,20841,20855,20854,20856,20925,20989,21051,21048,21047,21050,21040,21038,21046,21057,21182,21179,21330,21332,21331,21329,21350,21367,21368,21369,21462,21460,21463,21619,21621,21654,21624,21653,21632,21627,21623,21636,21650,21638,21628,21648,21617,21622,21644,21658,21602,21608,21643,21629,21646,22266,22403,22391,22378,22377,22369,22374,22372,22396,22812,22857,22855,22856,22852,22868,22974,22971,22996,22969,22958,22993,22982,22992,22989,22987,22995,22986,22959,22963,22994,22981,23391,23396,23395,23447,23450,23448,23452,23449,23451,23578,23624,23621,23622,23735,23713,23736,23721,23723,23729,23731,24088,24090,24086,24085,24091,24081,24184,24218,24215,24220,24213,24214,24310,24358,24359,24361,24448,24449,24447,24444,24541,24544,24573,24565,24575,24591,24596,24623,24629,24598,24618,24597,24609,24615,24617,24619,24603,25110,25109,25151,25150,25152,25215,25289,25292,25284,25279,25282,25273,25298,25307,25259,25299,25300,25291,25288,25256,25277,25276,25296,25305,25287,25293,25269,25306,25265,25304,25302,25303,25286,25260,25294,25918,26023,26044,26106,26132,26131,26124,26118,26114,26126,26112,26127,26133,26122,26119,26381,26379,26477,26507,26517,26481,26524,26483,26487,26503,26525,26519,26479,26480,26495,26505,26494,26512,26485,26522,26515,26492,26474,26482,27427,27494,27495,27519,27667,27675,27875,27880,27891,27825,27852,27877,27827,27837,27838,27836,27874,27819,27861,27859,27832,27844,27833,27841,27822,27863,27845,27889,27839,27835,27873,27867,27850,27820,27887,27868,27862,27872,28821,28814,28818,28810,28825,29228,29229,29240,29256,29287,29289,29376,29390,29401,29399,29392,29609,29608,29599,29611,29605,30013,30109,30105,30106,30340,30402,30450,30452,30693,30717,31038,31040,31041,31177,31176,31354,31353,31482,31998,32596,32652,32651,32773,32954,32933,32930,32945,32929,32939,32937,32948,32938,32943,33253,33278,33293,33459,33437,33433,33453,33469,33439,33465,33457,33452,33445,33455,33464,33443,33456,33470,33463,34382,34417,21021,34920,36555,36814,36820,36817,37045,37048,37041,37046,37319,37329,38263,38272,38428,38464,38463,38459,38468,38466,38585,38632,38738,38750,20127,20141,20142,20449,20405,20399,20415,20448,20433,20431,20445,20419,20406,20440,20447,20426,20439,20398,20432,20420,20418,20442,20430,20446,20407,20823,20882,20881,20896,21070,21059,21066,21069,21068,21067,21063,21191,21193,21187,21185,21261,21335,21371,21402,21467,21676,21696,21672,21710,21705,21688,21670,21683,21703,21698,21693,21674,21697,21700,21704,21679,21675,21681,21691,21673,21671,21695,22271,22402,22411,22432,22435,22434,22478,22446,22419,22869,22865,22863,22862,22864,23004,23000,23039,23011,23016,23043,23013,23018,23002,23014,23041,23035,23401,23459,23462,23460,23458,23461,23553,23630,23631,23629,23627,23769,23762,24055,24093,24101,24095,24189,24224,24230,24314,24328,24365,24421,24456,24453,24458,24459,24455,24460,24457,24594,24605,24608,24613,24590,24616,24653,24688,24680,24674,24646,24643,24684,24683,24682,24676,25153,25308,25366,25353,25340,25325,25345,25326,25341,25351,25329,25335,25327,25324,25342,25332,25361,25346,25919,25925,26027,26045,26082,26149,26157,26144,26151,26159,26143,26152,26161,26148,26359,26623,26579,26609,26580,26576,26604,26550,26543,26613,26601,26607,26564,26577,26548,26586,26597,26552,26575,26590,26611,26544,26585,26594,26589,26578,27498,27523,27526,27573,27602,27607,27679,27849,27915,27954,27946,27969,27941,27916,27953,27934,27927,27963,27965,27966,27958,27931,27893,27961,27943,27960,27945,27950,27957,27918,27947,28843,28858,28851,28844,28847,28845,28856,28846,28836,29232,29298,29295,29300,29417,29408,29409,29623,29642,29627,29618,29645,29632,29619,29978,29997,30031,30028,30030,30027,30123,30116,30117,30114,30115,30328,30342,30343,30344,30408,30406,30403,30405,30465,30457,30456,30473,30475,30462,30460,30471,30684,30722,30740,30732,30733,31046,31049,31048,31047,31161,31162,31185,31186,31179,31359,31361,31487,31485,31869,32002,32005,32000,32009,32007,32004,32006,32568,32654,32703,32772,32784,32781,32785,32822,32982,32997,32986,32963,32964,32972,32993,32987,32974,32990,32996,32989,33268,33314,33511,33539,33541,33507,33499,33510,33540,33509,33538,33545,33490,33495,33521,33537,33500,33492,33489,33502,33491,33503,33519,33542,34384,34425,34427,34426,34893,34923,35201,35284,35336,35330,35331,35998,36000,36212,36211,36276,36557,36556,36848,36838,36834,36842,36837,36845,36843,36836,36840,37066,37070,37057,37059,37195,37194,37325,38274,38480,38475,38476,38477,38754,38761,38859,38893,38899,38913,39080,39131,39135,39318,39321,20056,20147,20492,20493,20515,20463,20518,20517,20472,20521,20502,20486,20540,20511,20506,20498,20497,20474,20480,20500,20520,20465,20513,20491,20505,20504,20467,20462,20525,20522,20478,20523,20489,20860,20900,20901,20898,20941,20940,20934,20939,21078,21084,21076,21083,21085,21290,21375,21407,21405,21471,21736,21776,21761,21815,21756,21733,21746,21766,21754,21780,21737,21741,21729,21769,21742,21738,21734,21799,21767,21757,21775,22275,22276,22466,22484,22475,22467,22537,22799,22871,22872,22874,23057,23064,23068,23071,23067,23059,23020,23072,23075,23081,23077,23052,23049,23403,23640,23472,23475,23478,23476,23470,23477,23481,23480,23556,23633,23637,23632,23789,23805,23803,23786,23784,23792,23798,23809,23796,24046,24109,24107,24235,24237,24231,24369,24466,24465,24464,24665,24675,24677,24656,24661,24685,24681,24687,24708,24735,24730,24717,24724,24716,24709,24726,25159,25331,25352,25343,25422,25406,25391,25429,25410,25414,25423,25417,25402,25424,25405,25386,25387,25384,25421,25420,25928,25929,26009,26049,26053,26178,26185,26191,26179,26194,26188,26181,26177,26360,26388,26389,26391,26657,26680,26696,26694,26707,26681,26690,26708,26665,26803,26647,26700,26705,26685,26612,26704,26688,26684,26691,26666,26693,26643,26648,26689,27530,27529,27575,27683,27687,27688,27686,27684,27888,28010,28053,28040,28039,28006,28024,28023,27993,28051,28012,28041,28014,27994,28020,28009,28044,28042,28025,28037,28005,28052,28874,28888,28900,28889,28872,28879,29241,29305,29436,29433,29437,29432,29431,29574,29677,29705,29678,29664,29674,29662,30036,30045,30044,30042,30041,30142,30149,30151,30130,30131,30141,30140,30137,30146,30136,30347,30384,30410,30413,30414,30505,30495,30496,30504,30697,30768,30759,30776,30749,30772,30775,30757,30765,30752,30751,30770,31061,31056,31072,31071,31062,31070,31069,31063,31066,31204,31203,31207,31199,31206,31209,31192,31364,31368,31449,31494,31505,31881,32033,32023,32011,32010,32032,32034,32020,32016,32021,32026,32028,32013,32025,32027,32570,32607,32660,32709,32705,32774,32792,32789,32793,32791,32829,32831,33009,33026,33008,33029,33005,33012,33030,33016,33011,33032,33021,33034,33020,33007,33261,33260,33280,33296,33322,33323,33320,33324,33467,33579,33618,33620,33610,33592,33616,33609,33589,33588,33615,33586,33593,33590,33559,33600,33585,33576,33603,34388,34442,34474,34451,34468,34473,34444,34467,34460,34928,34935,34945,34946,34941,34937,35352,35344,35342,35340,35349,35338,35351,35347,35350,35343,35345,35912,35962,35961,36001,36002,36215,36524,36562,36564,36559,36785,36865,36870,36855,36864,36858,36852,36867,36861,36869,36856,37013,37089,37085,37090,37202,37197,37196,37336,37341,37335,37340,37337,38275,38498,38499,38497,38491,38493,38500,38488,38494,38587,39138,39340,39592,39640,39717,39730,39740,20094,20602,20605,20572,20551,20547,20556,20570,20553,20581,20598,20558,20565,20597,20596,20599,20559,20495,20591,20589,20828,20885,20976,21098,21103,21202,21209,21208,21205,21264,21263,21273,21311,21312,21310,21443,26364,21830,21866,21862,21828,21854,21857,21827,21834,21809,21846,21839,21845,21807,21860,21816,21806,21852,21804,21859,21811,21825,21847,22280,22283,22281,22495,22533,22538,22534,22496,22500,22522,22530,22581,22519,22521,22816,22882,23094,23105,23113,23142,23146,23104,23100,23138,23130,23110,23114,23408,23495,23493,23492,23490,23487,23494,23561,23560,23559,23648,23644,23645,23815,23814,23822,23835,23830,23842,23825,23849,23828,23833,23844,23847,23831,24034,24120,24118,24115,24119,24247,24248,24246,24245,24254,24373,24375,24407,24428,24425,24427,24471,24473,24478,24472,24481,24480,24476,24703,24739,24713,24736,24744,24779,24756,24806,24765,24773,24763,24757,24796,24764,24792,24789,24774,24799,24760,24794,24775,25114,25115,25160,25504,25511,25458,25494,25506,25509,25463,25447,25496,25514,25457,25513,25481,25475,25499,25451,25512,25476,25480,25497,25505,25516,25490,25487,25472,25467,25449,25448,25466,25949,25942,25937,25945,25943,21855,25935,25944,25941,25940,26012,26011,26028,26063,26059,26060,26062,26205,26202,26212,26216,26214,26206,26361,21207,26395,26753,26799,26786,26771,26805,26751,26742,26801,26791,26775,26800,26755,26820,26797,26758,26757,26772,26781,26792,26783,26785,26754,27442,27578,27627,27628,27691,28046,28092,28147,28121,28082,28129,28108,28132,28155,28154,28165,28103,28107,28079,28113,28078,28126,28153,28088,28151,28149,28101,28114,28186,28085,28122,28139,28120,28138,28145,28142,28136,28102,28100,28074,28140,28095,28134,28921,28937,28938,28925,28911,29245,29309,29313,29468,29467,29462,29459,29465,29575,29701,29706,29699,29702,29694,29709,29920,29942,29943,29980,29986,30053,30054,30050,30064,30095,30164,30165,30133,30154,30157,30350,30420,30418,30427,30519,30526,30524,30518,30520,30522,30827,30787,30798,31077,31080,31085,31227,31378,31381,31520,31528,31515,31532,31526,31513,31518,31534,31890,31895,31893,32070,32067,32113,32046,32057,32060,32064,32048,32051,32068,32047,32066,32050,32049,32573,32670,32666,32716,32718,32722,32796,32842,32838,33071,33046,33059,33067,33065,33072,33060,33282,33333,33335,33334,33337,33678,33694,33688,33656,33698,33686,33725,33707,33682,33674,33683,33673,33696,33655,33659,33660,33670,33703,34389,24426,34503,34496,34486,34500,34485,34502,34507,34481,34479,34505,34899,34974,34952,34987,34962,34966,34957,34955,35219,35215,35370,35357,35363,35365,35377,35373,35359,35355,35362,35913,35930,36009,36012,36011,36008,36010,36007,36199,36198,36286,36282,36571,36575,36889,36877,36890,36887,36899,36895,36893,36880,36885,36894,36896,36879,36898,36886,36891,36884,37096,37101,37117,37207,37326,37365,37350,37347,37351,37357,37353,38281,38506,38517,38515,38520,38512,38516,38518,38519,38508,38592,38634,38633,31456,31455,38914,38915,39770,40165,40565,40575,40613,40635,20642,20621,20613,20633,20625,20608,20630,20632,20634,26368,20977,21106,21108,21109,21097,21214,21213,21211,21338,21413,21883,21888,21927,21884,21898,21917,21912,21890,21916,21930,21908,21895,21899,21891,21939,21934,21919,21822,21938,21914,21947,21932,21937,21886,21897,21931,21913,22285,22575,22570,22580,22564,22576,22577,22561,22557,22560,22777,22778,22880,23159,23194,23167,23186,23195,23207,23411,23409,23506,23500,23507,23504,23562,23563,23601,23884,23888,23860,23879,24061,24133,24125,24128,24131,24190,24266,24257,24258,24260,24380,24429,24489,24490,24488,24785,24801,24754,24758,24800,24860,24867,24826,24853,24816,24827,24820,24936,24817,24846,24822,24841,24832,24850,25119,25161,25507,25484,25551,25536,25577,25545,25542,25549,25554,25571,25552,25569,25558,25581,25582,25462,25588,25578,25563,25682,25562,25593,25950,25958,25954,25955,26001,26000,26031,26222,26224,26228,26230,26223,26257,26234,26238,26231,26366,26367,26399,26397,26874,26837,26848,26840,26839,26885,26847,26869,26862,26855,26873,26834,26866,26851,26827,26829,26893,26898,26894,26825,26842,26990,26875,27454,27450,27453,27544,27542,27580,27631,27694,27695,27692,28207,28216,28244,28193,28210,28263,28234,28192,28197,28195,28187,28251,28248,28196,28246,28270,28205,28198,28271,28212,28237,28218,28204,28227,28189,28222,28363,28297,28185,28238,28259,28228,28274,28265,28255,28953,28954,28966,28976,28961,28982,29038,28956,29260,29316,29312,29494,29477,29492,29481,29754,29738,29747,29730,29733,29749,29750,29748,29743,29723,29734,29736,29989,29990,30059,30058,30178,30171,30179,30169,30168,30174,30176,30331,30332,30358,30355,30388,30428,30543,30701,30813,30828,30831,31245,31240,31243,31237,31232,31384,31383,31382,31461,31459,31561,31574,31558,31568,31570,31572,31565,31563,31567,31569,31903,31909,32094,32080,32104,32085,32043,32110,32114,32097,32102,32098,32112,32115,21892,32724,32725,32779,32850,32901,33109,33108,33099,33105,33102,33081,33094,33086,33100,33107,33140,33298,33308,33769,33795,33784,33805,33760,33733,33803,33729,33775,33777,33780,33879,33802,33776,33804,33740,33789,33778,33738,33848,33806,33796,33756,33799,33748,33759,34395,34527,34521,34541,34516,34523,34532,34512,34526,34903,35009,35010,34993,35203,35222,35387,35424,35413,35422,35388,35393,35412,35419,35408,35398,35380,35386,35382,35414,35937,35970,36015,36028,36019,36029,36033,36027,36032,36020,36023,36022,36031,36024,36234,36229,36225,36302,36317,36299,36314,36305,36300,36315,36294,36603,36600,36604,36764,36910,36917,36913,36920,36914,36918,37122,37109,37129,37118,37219,37221,37327,37396,37397,37411,37385,37406,37389,37392,37383,37393,38292,38287,38283,38289,38291,38290,38286,38538,38542,38539,38525,38533,38534,38541,38514,38532,38593,38597,38596,38598,38599,38639,38642,38860,38917,38918,38920,39143,39146,39151,39145,39154,39149,39342,39341,40643,40653,40657,20098,20653,20661,20658,20659,20677,20670,20652,20663,20667,20655,20679,21119,21111,21117,21215,21222,21220,21218,21219,21295,21983,21992,21971,21990,21966,21980,21959,21969,21987,21988,21999,21978,21985,21957,21958,21989,21961,22290,22291,22622,22609,22616,22615,22618,22612,22635,22604,22637,22602,22626,22610,22603,22887,23233,23241,23244,23230,23229,23228,23219,23234,23218,23913,23919,24140,24185,24265,24264,24338,24409,24492,24494,24858,24847,24904,24863,24819,24859,24825,24833,24840,24910,24908,24900,24909,24894,24884,24871,24845,24838,24887,25121,25122,25619,25662,25630,25642,25645,25661,25644,25615,25628,25620,25613,25654,25622,25623,25606,25964,26015,26032,26263,26249,26247,26248,26262,26244,26264,26253,26371,27028,26989,26970,26999,26976,26964,26997,26928,27010,26954,26984,26987,26974,26963,27001,27014,26973,26979,26971,27463,27506,27584,27583,27603,27645,28322,28335,28371,28342,28354,28304,28317,28359,28357,28325,28312,28348,28346,28331,28369,28310,28316,28356,28372,28330,28327,28340,29006,29017,29033,29028,29001,29031,29020,29036,29030,29004,29029,29022,28998,29032,29014,29242,29266,29495,29509,29503,29502,29807,29786,29781,29791,29790,29761,29759,29785,29787,29788,30070,30072,30208,30192,30209,30194,30193,30202,30207,30196,30195,30430,30431,30555,30571,30566,30558,30563,30585,30570,30572,30556,30565,30568,30562,30702,30862,30896,30871,30872,30860,30857,30844,30865,30867,30847,31098,31103,31105,33836,31165,31260,31258,31264,31252,31263,31262,31391,31392,31607,31680,31584,31598,31591,31921,31923,31925,32147,32121,32145,32129,32143,32091,32622,32617,32618,32626,32681,32680,32676,32854,32856,32902,32900,33137,33136,33144,33125,33134,33139,33131,33145,33146,33126,33285,33351,33922,33911,33853,33841,33909,33894,33899,33865,33900,33883,33852,33845,33889,33891,33897,33901,33862,34398,34396,34399,34553,34579,34568,34567,34560,34558,34555,34562,34563,34566,34570,34905,35039,35028,35033,35036,35032,35037,35041,35018,35029,35026,35228,35299,35435,35442,35443,35430,35433,35440,35463,35452,35427,35488,35441,35461,35437,35426,35438,35436,35449,35451,35390,35432,35938,35978,35977,36042,36039,36040,36036,36018,36035,36034,36037,36321,36319,36328,36335,36339,36346,36330,36324,36326,36530,36611,36617,36606,36618,36767,36786,36939,36938,36947,36930,36948,36924,36949,36944,36935,36943,36942,36941,36945,36926,36929,37138,37143,37228,37226,37225,37321,37431,37463,37432,37437,37440,37438,37467,37451,37476,37457,37428,37449,37453,37445,37433,37439,37466,38296,38552,38548,38549,38605,38603,38601,38602,38647,38651,38649,38646,38742,38772,38774,38928,38929,38931,38922,38930,38924,39164,39156,39165,39166,39347,39345,39348,39649,40169,40578,40718,40723,40736,20711,20718,20709,20694,20717,20698,20693,20687,20689,20721,20686,20713,20834,20979,21123,21122,21297,21421,22014,22016,22043,22039,22013,22036,22022,22025,22029,22030,22007,22038,22047,22024,22032,22006,22296,22294,22645,22654,22659,22675,22666,22649,22661,22653,22781,22821,22818,22820,22890,22889,23265,23270,23273,23255,23254,23256,23267,23413,23518,23527,23521,23525,23526,23528,23522,23524,23519,23565,23650,23940,23943,24155,24163,24149,24151,24148,24275,24278,24330,24390,24432,24505,24903,24895,24907,24951,24930,24931,24927,24922,24920,24949,25130,25735,25688,25684,25764,25720,25695,25722,25681,25703,25652,25709,25723,25970,26017,26071,26070,26274,26280,26269,27036,27048,27029,27073,27054,27091,27083,27035,27063,27067,27051,27060,27088,27085,27053,27084,27046,27075,27043,27465,27468,27699,28467,28436,28414,28435,28404,28457,28478,28448,28460,28431,28418,28450,28415,28399,28422,28465,28472,28466,28451,28437,28459,28463,28552,28458,28396,28417,28402,28364,28407,29076,29081,29053,29066,29060,29074,29246,29330,29334,29508,29520,29796,29795,29802,29808,29805,29956,30097,30247,30221,30219,30217,30227,30433,30435,30596,30589,30591,30561,30913,30879,30887,30899,30889,30883,31118,31119,31117,31278,31281,31402,31401,31469,31471,31649,31637,31627,31605,31639,31645,31636,31631,31672,31623,31620,31929,31933,31934,32187,32176,32156,32189,32190,32160,32202,32180,32178,32177,32186,32162,32191,32181,32184,32173,32210,32199,32172,32624,32736,32737,32735,32862,32858,32903,33104,33152,33167,33160,33162,33151,33154,33255,33274,33287,33300,33310,33355,33993,33983,33990,33988,33945,33950,33970,33948,33995,33976,33984,34003,33936,33980,34001,33994,34623,34588,34619,34594,34597,34612,34584,34645,34615,34601,35059,35074,35060,35065,35064,35069,35048,35098,35055,35494,35468,35486,35491,35469,35489,35475,35492,35498,35493,35496,35480,35473,35482,35495,35946,35981,35980,36051,36049,36050,36203,36249,36245,36348,36628,36626,36629,36627,36771,36960,36952,36956,36963,36953,36958,36962,36957,36955,37145,37144,37150,37237,37240,37239,37236,37496,37504,37509,37528,37526,37499,37523,37532,37544,37500,37521,38305,38312,38313,38307,38309,38308,38553,38556,38555,38604,38610,38656,38780,38789,38902,38935,38936,39087,39089,39171,39173,39180,39177,39361,39599,39600,39654,39745,39746,40180,40182,40179,40636,40763,40778,20740,20736,20731,20725,20729,20738,20744,20745,20741,20956,21127,21128,21129,21133,21130,21232,21426,22062,22075,22073,22066,22079,22068,22057,22099,22094,22103,22132,22070,22063,22064,22656,22687,22686,22707,22684,22702,22697,22694,22893,23305,23291,23307,23285,23308,23304,23534,23532,23529,23531,23652,23653,23965,23956,24162,24159,24161,24290,24282,24287,24285,24291,24288,24392,24433,24503,24501,24950,24935,24942,24925,24917,24962,24956,24944,24939,24958,24999,24976,25003,24974,25004,24986,24996,24980,25006,25134,25705,25711,25721,25758,25778,25736,25744,25776,25765,25747,25749,25769,25746,25774,25773,25771,25754,25772,25753,25762,25779,25973,25975,25976,26286,26283,26292,26289,27171,27167,27112,27137,27166,27161,27133,27169,27155,27146,27123,27138,27141,27117,27153,27472,27470,27556,27589,27590,28479,28540,28548,28497,28518,28500,28550,28525,28507,28536,28526,28558,28538,28528,28516,28567,28504,28373,28527,28512,28511,29087,29100,29105,29096,29270,29339,29518,29527,29801,29835,29827,29822,29824,30079,30240,30249,30239,30244,30246,30241,30242,30362,30394,30436,30606,30599,30604,30609,30603,30923,30917,30906,30922,30910,30933,30908,30928,31295,31292,31296,31293,31287,31291,31407,31406,31661,31665,31684,31668,31686,31687,31681,31648,31692,31946,32224,32244,32239,32251,32216,32236,32221,32232,32227,32218,32222,32233,32158,32217,32242,32249,32629,32631,32687,32745,32806,33179,33180,33181,33184,33178,33176,34071,34109,34074,34030,34092,34093,34067,34065,34083,34081,34068,34028,34085,34047,34054,34690,34676,34678,34656,34662,34680,34664,34649,34647,34636,34643,34907,34909,35088,35079,35090,35091,35093,35082,35516,35538,35527,35524,35477,35531,35576,35506,35529,35522,35519,35504,35542,35533,35510,35513,35547,35916,35918,35948,36064,36062,36070,36068,36076,36077,36066,36067,36060,36074,36065,36205,36255,36259,36395,36368,36381,36386,36367,36393,36383,36385,36382,36538,36637,36635,36639,36649,36646,36650,36636,36638,36645,36969,36974,36968,36973,36983,37168,37165,37159,37169,37255,37257,37259,37251,37573,37563,37559,37610,37548,37604,37569,37555,37564,37586,37575,37616,37554,38317,38321,38660,38662,38663,38665,38752,38797,38795,38799,38945,38955,38940,39091,39178,39187,39186,39192,39389,39376,39391,39387,39377,39381,39378,39385,39607,39662,39663,39719,39749,39748,39799,39791,40198,40201,40195,40617,40638,40654,22696,40786,20754,20760,20756,20752,20757,20864,20906,20957,21137,21139,21235,22105,22123,22137,22121,22116,22136,22122,22120,22117,22129,22127,22124,22114,22134,22721,22718,22727,22725,22894,23325,23348,23416,23536,23566,24394,25010,24977,25001,24970,25037,25014,25022,25034,25032,25136,25797,25793,25803,25787,25788,25818,25796,25799,25794,25805,25791,25810,25812,25790,25972,26310,26313,26297,26308,26311,26296,27197,27192,27194,27225,27243,27224,27193,27204,27234,27233,27211,27207,27189,27231,27208,27481,27511,27653,28610,28593,28577,28611,28580,28609,28583,28595,28608,28601,28598,28582,28576,28596,29118,29129,29136,29138,29128,29141,29113,29134,29145,29148,29123,29124,29544,29852,29859,29848,29855,29854,29922,29964,29965,30260,30264,30266,30439,30437,30624,30622,30623,30629,30952,30938,30956,30951,31142,31309,31310,31302,31308,31307,31418,31705,31761,31689,31716,31707,31713,31721,31718,31957,31958,32266,32273,32264,32283,32291,32286,32285,32265,32272,32633,32690,32752,32753,32750,32808,33203,33193,33192,33275,33288,33368,33369,34122,34137,34120,34152,34153,34115,34121,34157,34154,34142,34691,34719,34718,34722,34701,34913,35114,35122,35109,35115,35105,35242,35238,35558,35578,35563,35569,35584,35548,35559,35566,35582,35585,35586,35575,35565,35571,35574,35580,35947,35949,35987,36084,36420,36401,36404,36418,36409,36405,36667,36655,36664,36659,36776,36774,36981,36980,36984,36978,36988,36986,37172,37266,37664,37686,37624,37683,37679,37666,37628,37675,37636,37658,37648,37670,37665,37653,37678,37657,38331,38567,38568,38570,38613,38670,38673,38678,38669,38675,38671,38747,38748,38758,38808,38960,38968,38971,38967,38957,38969,38948,39184,39208,39198,39195,39201,39194,39405,39394,39409,39608,39612,39675,39661,39720,39825,40213,40227,40230,40232,40210,40219,40664,40660,40845,40860,20778,20767,20769,20786,21237,22158,22144,22160,22149,22151,22159,22741,22739,22737,22734,23344,23338,23332,23418,23607,23656,23996,23994,23997,23992,24171,24396,24509,25033,25026,25031,25062,25035,25138,25140,25806,25802,25816,25824,25840,25830,25836,25841,25826,25837,25986,25987,26329,26326,27264,27284,27268,27298,27292,27355,27299,27262,27287,27280,27296,27484,27566,27610,27656,28632,28657,28639,28640,28635,28644,28651,28655,28544,28652,28641,28649,28629,28654,28656,29159,29151,29166,29158,29157,29165,29164,29172,29152,29237,29254,29552,29554,29865,29872,29862,29864,30278,30274,30284,30442,30643,30634,30640,30636,30631,30637,30703,30967,30970,30964,30959,30977,31143,31146,31319,31423,31751,31757,31742,31735,31756,31712,31968,31964,31966,31970,31967,31961,31965,32302,32318,32326,32311,32306,32323,32299,32317,32305,32325,32321,32308,32313,32328,32309,32319,32303,32580,32755,32764,32881,32882,32880,32879,32883,33222,33219,33210,33218,33216,33215,33213,33225,33214,33256,33289,33393,34218,34180,34174,34204,34193,34196,34223,34203,34183,34216,34186,34407,34752,34769,34739,34770,34758,34731,34747,34746,34760,34763,35131,35126,35140,35128,35133,35244,35598,35607,35609,35611,35594,35616,35613,35588,35600,35905,35903,35955,36090,36093,36092,36088,36091,36264,36425,36427,36424,36426,36676,36670,36674,36677,36671,36991,36989,36996,36993,36994,36992,37177,37283,37278,37276,37709,37762,37672,37749,37706,37733,37707,37656,37758,37740,37723,37744,37722,37716,38346,38347,38348,38344,38342,38577,38584,38614,38684,38686,38816,38867,38982,39094,39221,39425,39423,39854,39851,39850,39853,40251,40255,40587,40655,40670,40668,40669,40667,40766,40779,21474,22165,22190,22745,22744,23352,24413,25059,25139,25844,25842,25854,25862,25850,25851,25847,26039,26332,26406,27315,27308,27331,27323,27320,27330,27310,27311,27487,27512,27567,28681,28683,28670,28678,28666,28689,28687,29179,29180,29182,29176,29559,29557,29863,29887,29973,30294,30296,30290,30653,30655,30651,30652,30990,31150,31329,31330,31328,31428,31429,31787,31783,31786,31774,31779,31777,31975,32340,32341,32350,32346,32353,32338,32345,32584,32761,32763,32887,32886,33229,33231,33290,34255,34217,34253,34256,34249,34224,34234,34233,34214,34799,34796,34802,34784,35206,35250,35316,35624,35641,35628,35627,35920,36101,36441,36451,36454,36452,36447,36437,36544,36681,36685,36999,36995,37000,37291,37292,37328,37780,37770,37782,37794,37811,37806,37804,37808,37784,37786,37783,38356,38358,38352,38357,38626,38620,38617,38619,38622,38692,38819,38822,38829,38905,38989,38991,38988,38990,38995,39098,39230,39231,39229,39214,39333,39438,39617,39683,39686,39759,39758,39757,39882,39881,39933,39880,39872,40273,40285,40288,40672,40725,40748,20787,22181,22750,22751,22754,23541,40848,24300,25074,25079,25078,25077,25856,25871,26336,26333,27365,27357,27354,27347,28699,28703,28712,28698,28701,28693,28696,29190,29197,29272,29346,29560,29562,29885,29898,29923,30087,30086,30303,30305,30663,31001,31153,31339,31337,31806,31807,31800,31805,31799,31808,32363,32365,32377,32361,32362,32645,32371,32694,32697,32696,33240,34281,34269,34282,34261,34276,34277,34295,34811,34821,34829,34809,34814,35168,35167,35158,35166,35649,35676,35672,35657,35674,35662,35663,35654,35673,36104,36106,36476,36466,36487,36470,36460,36474,36468,36692,36686,36781,37002,37003,37297,37294,37857,37841,37855,37827,37832,37852,37853,37846,37858,37837,37848,37860,37847,37864,38364,38580,38627,38698,38695,38753,38876,38907,39006,39000,39003,39100,39237,39241,39446,39449,39693,39912,39911,39894,39899,40329,40289,40306,40298,40300,40594,40599,40595,40628,21240,22184,22199,22198,22196,22204,22756,23360,23363,23421,23542,24009,25080,25082,25880,25876,25881,26342,26407,27372,28734,28720,28722,29200,29563,29903,30306,30309,31014,31018,31020,31019,31431,31478,31820,31811,31821,31983,31984,36782,32381,32380,32386,32588,32768,33242,33382,34299,34297,34321,34298,34310,34315,34311,34314,34836,34837,35172,35258,35320,35696,35692,35686,35695,35679,35691,36111,36109,36489,36481,36485,36482,37300,37323,37912,37891,37885,38369,38704,39108,39250,39249,39336,39467,39472,39479,39477,39955,39949,40569,40629,40680,40751,40799,40803,40801,20791,20792,22209,22208,22210,22804,23660,24013,25084,25086,25885,25884,26005,26345,27387,27396,27386,27570,28748,29211,29351,29910,29908,30313,30675,31824,32399,32396,32700,34327,34349,34330,34851,34850,34849,34847,35178,35180,35261,35700,35703,35709,36115,36490,36493,36491,36703,36783,37306,37934,37939,37941,37946,37944,37938,37931,38370,38712,38713,38706,38911,39015,39013,39255,39493,39491,39488,39486,39631,39764,39761,39981,39973,40367,40372,40386,40376,40605,40687,40729,40796,40806,40807,20796,20795,22216,22218,22217,23423,24020,24018,24398,25087,25892,27402,27489,28753,28760,29568,29924,30090,30318,30316,31155,31840,31839,32894,32893,33247,35186,35183,35324,35712,36118,36119,36497,36499,36705,37192,37956,37969,37970,38717,38718,38851,38849,39019,39253,39509,39501,39634,39706,40009,39985,39998,39995,40403,40407,40756,40812,40810,40852,22220,24022,25088,25891,25899,25898,26348,27408,29914,31434,31844,31843,31845,32403,32406,32404,33250,34360,34367,34865,35722,37008,37007,37987,37984,37988,38760,39023,39260,39514,39515,39511,39635,39636,39633,40020,40023,40022,40421,40607,40692,22225,22761,25900,28766,30321,30322,30679,32592,32648,34870,34873,34914,35731,35730,35734,33399,36123,37312,37994,38722,38728,38724,38854,39024,39519,39714,39768,40031,40441,40442,40572,40573,40711,40823,40818,24307,27414,28771,31852,31854,34875,35264,36513,37313,38002,38000,39025,39262,39638,39715,40652,28772,30682,35738,38007,38857,39522,39525,32412,35740,36522,37317,38013,38014,38012,40055,40056,40695,35924,38015,40474,29224,39530,39729,40475,40478,31858,9312,9313,9314,9315,9316,9317,9318,9319,9320,9321,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,20022,20031,20101,20128,20866,20886,20907,21241,21304,21353,21430,22794,23424,24027,12083,24191,24308,24400,24417,25908,26080,30098,30326,36789,38582,168,710,12541,12542,12445,12446,12291,20189,12293,12294,12295,12540,65339,65341,10045,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,8679,8632,8633,12751,131276,20058,131210,20994,17553,40880,20872,40881,161287,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,65506,65508,65287,65282,12849,8470,8481,12443,12444,11904,11908,11910,11911,11912,11914,11916,11917,11925,11932,11933,11941,11943,11946,11948,11950,11958,11964,11966,11974,11978,11980,11981,11983,11990,11991,11998,12003,null,null,null,643,592,603,596,629,339,248,331,650,618,20034,20060,20981,21274,21378,19975,19980,20039,20109,22231,64012,23662,24435,19983,20871,19982,20014,20115,20162,20169,20168,20888,21244,21356,21433,22304,22787,22828,23568,24063,26081,27571,27596,27668,29247,20017,20028,20200,20188,20201,20193,20189,20186,21004,21276,21324,22306,22307,22807,22831,23425,23428,23570,23611,23668,23667,24068,24192,24194,24521,25097,25168,27669,27702,27715,27711,27707,29358,29360,29578,31160,32906,38430,20238,20248,20268,20213,20244,20209,20224,20215,20232,20253,20226,20229,20258,20243,20228,20212,20242,20913,21011,21001,21008,21158,21282,21279,21325,21386,21511,22241,22239,22318,22314,22324,22844,22912,22908,22917,22907,22910,22903,22911,23382,23573,23589,23676,23674,23675,23678,24031,24181,24196,24322,24346,24436,24533,24532,24527,25180,25182,25188,25185,25190,25186,25177,25184,25178,25189,26095,26094,26430,26425,26424,26427,26426,26431,26428,26419,27672,27718,27730,27740,27727,27722,27732,27723,27724,28785,29278,29364,29365,29582,29994,30335,31349,32593,33400,33404,33408,33405,33407,34381,35198,37017,37015,37016,37019,37012,38434,38436,38432,38435,20310,20283,20322,20297,20307,20324,20286,20327,20306,20319,20289,20312,20269,20275,20287,20321,20879,20921,21020,21022,21025,21165,21166,21257,21347,21362,21390,21391,21552,21559,21546,21588,21573,21529,21532,21541,21528,21565,21583,21569,21544,21540,21575,22254,22247,22245,22337,22341,22348,22345,22347,22354,22790,22848,22950,22936,22944,22935,22926,22946,22928,22927,22951,22945,23438,23442,23592,23594,23693,23695,23688,23691,23689,23698,23690,23686,23699,23701,24032,24074,24078,24203,24201,24204,24200,24205,24325,24349,24440,24438,24530,24529,24528,24557,24552,24558,24563,24545,24548,24547,24570,24559,24567,24571,24576,24564,25146,25219,25228,25230,25231,25236,25223,25201,25211,25210,25200,25217,25224,25207,25213,25202,25204,25911,26096,26100,26099,26098,26101,26437,26439,26457,26453,26444,26440,26461,26445,26458,26443,27600,27673,27674,27768,27751,27755,27780,27787,27791,27761,27759,27753,27802,27757,27783,27797,27804,27750,27763,27749,27771,27790,28788,28794,29283,29375,29373,29379,29382,29377,29370,29381,29589,29591,29587,29588,29586,30010,30009,30100,30101,30337,31037,32820,32917,32921,32912,32914,32924,33424,33423,33413,33422,33425,33427,33418,33411,33412,35960,36809,36799,37023,37025,37029,37022,37031,37024,38448,38440,38447,38445,20019,20376,20348,20357,20349,20352,20359,20342,20340,20361,20356,20343,20300,20375,20330,20378,20345,20353,20344,20368,20380,20372,20382,20370,20354,20373,20331,20334,20894,20924,20926,21045,21042,21043,21062,21041,21180,21258,21259,21308,21394,21396,21639,21631,21633,21649,21634,21640,21611,21626,21630,21605,21612,21620,21606,21645,21615,21601,21600,21656,21603,21607,21604,22263,22265,22383,22386,22381,22379,22385,22384,22390,22400,22389,22395,22387,22388,22370,22376,22397,22796,22853,22965,22970,22991,22990,22962,22988,22977,22966,22972,22979,22998,22961,22973,22976,22984,22964,22983,23394,23397,23443,23445,23620,23623,23726,23716,23712,23733,23727,23720,23724,23711,23715,23725,23714,23722,23719,23709,23717,23734,23728,23718,24087,24084,24089,24360,24354,24355,24356,24404,24450,24446,24445,24542,24549,24621,24614,24601,24626,24587,24628,24586,24599,24627,24602,24606,24620,24610,24589,24592,24622,24595,24593,24588,24585,24604,25108,25149,25261,25268,25297,25278,25258,25270,25290,25262,25267,25263,25275,25257,25264,25272,25917,26024,26043,26121,26108,26116,26130,26120,26107,26115,26123,26125,26117,26109,26129,26128,26358,26378,26501,26476,26510,26514,26486,26491,26520,26502,26500,26484,26509,26508,26490,26527,26513,26521,26499,26493,26497,26488,26489,26516,27429,27520,27518,27614,27677,27795,27884,27883,27886,27865,27830,27860,27821,27879,27831,27856,27842,27834,27843,27846,27885,27890,27858,27869,27828,27786,27805,27776,27870,27840,27952,27853,27847,27824,27897,27855,27881,27857,28820,28824,28805,28819,28806,28804,28817,28822,28802,28826,28803,29290,29398,29387,29400,29385,29404,29394,29396,29402,29388,29393,29604,29601,29613,29606,29602,29600,29612,29597,29917,29928,30015,30016,30014,30092,30104,30383,30451,30449,30448,30453,30712,30716,30713,30715,30714,30711,31042,31039,31173,31352,31355,31483,31861,31997,32821,32911,32942,32931,32952,32949,32941,33312,33440,33472,33451,33434,33432,33435,33461,33447,33454,33468,33438,33466,33460,33448,33441,33449,33474,33444,33475,33462,33442,34416,34415,34413,34414,35926,36818,36811,36819,36813,36822,36821,36823,37042,37044,37039,37043,37040,38457,38461,38460,38458,38467,20429,20421,20435,20402,20425,20427,20417,20436,20444,20441,20411,20403,20443,20423,20438,20410,20416,20409,20460,21060,21065,21184,21186,21309,21372,21399,21398,21401,21400,21690,21665,21677,21669,21711,21699,33549,21687,21678,21718,21686,21701,21702,21664,21616,21692,21666,21694,21618,21726,21680,22453,22430,22431,22436,22412,22423,22429,22427,22420,22424,22415,22425,22437,22426,22421,22772,22797,22867,23009,23006,23022,23040,23025,23005,23034,23037,23036,23030,23012,23026,23031,23003,23017,23027,23029,23008,23038,23028,23021,23464,23628,23760,23768,23756,23767,23755,23771,23774,23770,23753,23751,23754,23766,23763,23764,23759,23752,23750,23758,23775,23800,24057,24097,24098,24099,24096,24100,24240,24228,24226,24219,24227,24229,24327,24366,24406,24454,24631,24633,24660,24690,24670,24645,24659,24647,24649,24667,24652,24640,24642,24671,24612,24644,24664,24678,24686,25154,25155,25295,25357,25355,25333,25358,25347,25323,25337,25359,25356,25336,25334,25344,25363,25364,25338,25365,25339,25328,25921,25923,26026,26047,26166,26145,26162,26165,26140,26150,26146,26163,26155,26170,26141,26164,26169,26158,26383,26384,26561,26610,26568,26554,26588,26555,26616,26584,26560,26551,26565,26603,26596,26591,26549,26573,26547,26615,26614,26606,26595,26562,26553,26574,26599,26608,26546,26620,26566,26605,26572,26542,26598,26587,26618,26569,26570,26563,26602,26571,27432,27522,27524,27574,27606,27608,27616,27680,27681,27944,27956,27949,27935,27964,27967,27922,27914,27866,27955,27908,27929,27962,27930,27921,27904,27933,27970,27905,27928,27959,27907,27919,27968,27911,27936,27948,27912,27938,27913,27920,28855,28831,28862,28849,28848,28833,28852,28853,28841,29249,29257,29258,29292,29296,29299,29294,29386,29412,29416,29419,29407,29418,29414,29411,29573,29644,29634,29640,29637,29625,29622,29621,29620,29675,29631,29639,29630,29635,29638,29624,29643,29932,29934,29998,30023,30024,30119,30122,30329,30404,30472,30467,30468,30469,30474,30455,30459,30458,30695,30696,30726,30737,30738,30725,30736,30735,30734,30729,30723,30739,31050,31052,31051,31045,31044,31189,31181,31183,31190,31182,31360,31358,31441,31488,31489,31866,31864,31865,31871,31872,31873,32003,32008,32001,32600,32657,32653,32702,32775,32782,32783,32788,32823,32984,32967,32992,32977,32968,32962,32976,32965,32995,32985,32988,32970,32981,32969,32975,32983,32998,32973,33279,33313,33428,33497,33534,33529,33543,33512,33536,33493,33594,33515,33494,33524,33516,33505,33522,33525,33548,33531,33526,33520,33514,33508,33504,33530,33523,33517,34423,34420,34428,34419,34881,34894,34919,34922,34921,35283,35332,35335,36210,36835,36833,36846,36832,37105,37053,37055,37077,37061,37054,37063,37067,37064,37332,37331,38484,38479,38481,38483,38474,38478,20510,20485,20487,20499,20514,20528,20507,20469,20468,20531,20535,20524,20470,20471,20503,20508,20512,20519,20533,20527,20529,20494,20826,20884,20883,20938,20932,20933,20936,20942,21089,21082,21074,21086,21087,21077,21090,21197,21262,21406,21798,21730,21783,21778,21735,21747,21732,21786,21759,21764,21768,21739,21777,21765,21745,21770,21755,21751,21752,21728,21774,21763,21771,22273,22274,22476,22578,22485,22482,22458,22470,22461,22460,22456,22454,22463,22471,22480,22457,22465,22798,22858,23065,23062,23085,23086,23061,23055,23063,23050,23070,23091,23404,23463,23469,23468,23555,23638,23636,23788,23807,23790,23793,23799,23808,23801,24105,24104,24232,24238,24234,24236,24371,24368,24423,24669,24666,24679,24641,24738,24712,24704,24722,24705,24733,24707,24725,24731,24727,24711,24732,24718,25113,25158,25330,25360,25430,25388,25412,25413,25398,25411,25572,25401,25419,25418,25404,25385,25409,25396,25432,25428,25433,25389,25415,25395,25434,25425,25400,25431,25408,25416,25930,25926,26054,26051,26052,26050,26186,26207,26183,26193,26386,26387,26655,26650,26697,26674,26675,26683,26699,26703,26646,26673,26652,26677,26667,26669,26671,26702,26692,26676,26653,26642,26644,26662,26664,26670,26701,26682,26661,26656,27436,27439,27437,27441,27444,27501,32898,27528,27622,27620,27624,27619,27618,27623,27685,28026,28003,28004,28022,27917,28001,28050,27992,28002,28013,28015,28049,28045,28143,28031,28038,27998,28007,28000,28055,28016,28028,27999,28034,28056,27951,28008,28043,28030,28032,28036,27926,28035,28027,28029,28021,28048,28892,28883,28881,28893,28875,32569,28898,28887,28882,28894,28896,28884,28877,28869,28870,28871,28890,28878,28897,29250,29304,29303,29302,29440,29434,29428,29438,29430,29427,29435,29441,29651,29657,29669,29654,29628,29671,29667,29673,29660,29650,29659,29652,29661,29658,29655,29656,29672,29918,29919,29940,29941,29985,30043,30047,30128,30145,30139,30148,30144,30143,30134,30138,30346,30409,30493,30491,30480,30483,30482,30499,30481,30485,30489,30490,30498,30503,30755,30764,30754,30773,30767,30760,30766,30763,30753,30761,30771,30762,30769,31060,31067,31055,31068,31059,31058,31057,31211,31212,31200,31214,31213,31210,31196,31198,31197,31366,31369,31365,31371,31372,31370,31367,31448,31504,31492,31507,31493,31503,31496,31498,31502,31497,31506,31876,31889,31882,31884,31880,31885,31877,32030,32029,32017,32014,32024,32022,32019,32031,32018,32015,32012,32604,32609,32606,32608,32605,32603,32662,32658,32707,32706,32704,32790,32830,32825,33018,33010,33017,33013,33025,33019,33024,33281,33327,33317,33587,33581,33604,33561,33617,33573,33622,33599,33601,33574,33564,33570,33602,33614,33563,33578,33544,33596,33613,33558,33572,33568,33591,33583,33577,33607,33605,33612,33619,33566,33580,33611,33575,33608,34387,34386,34466,34472,34454,34445,34449,34462,34439,34455,34438,34443,34458,34437,34469,34457,34465,34471,34453,34456,34446,34461,34448,34452,34883,34884,34925,34933,34934,34930,34944,34929,34943,34927,34947,34942,34932,34940,35346,35911,35927,35963,36004,36003,36214,36216,36277,36279,36278,36561,36563,36862,36853,36866,36863,36859,36868,36860,36854,37078,37088,37081,37082,37091,37087,37093,37080,37083,37079,37084,37092,37200,37198,37199,37333,37346,37338,38492,38495,38588,39139,39647,39727,20095,20592,20586,20577,20574,20576,20563,20555,20573,20594,20552,20557,20545,20571,20554,20578,20501,20549,20575,20585,20587,20579,20580,20550,20544,20590,20595,20567,20561,20944,21099,21101,21100,21102,21206,21203,21293,21404,21877,21878,21820,21837,21840,21812,21802,21841,21858,21814,21813,21808,21842,21829,21772,21810,21861,21838,21817,21832,21805,21819,21824,21835,22282,22279,22523,22548,22498,22518,22492,22516,22528,22509,22525,22536,22520,22539,22515,22479,22535,22510,22499,22514,22501,22508,22497,22542,22524,22544,22503,22529,22540,22513,22505,22512,22541,22532,22876,23136,23128,23125,23143,23134,23096,23093,23149,23120,23135,23141,23148,23123,23140,23127,23107,23133,23122,23108,23131,23112,23182,23102,23117,23097,23116,23152,23145,23111,23121,23126,23106,23132,23410,23406,23489,23488,23641,23838,23819,23837,23834,23840,23820,23848,23821,23846,23845,23823,23856,23826,23843,23839,23854,24126,24116,24241,24244,24249,24242,24243,24374,24376,24475,24470,24479,24714,24720,24710,24766,24752,24762,24787,24788,24783,24804,24793,24797,24776,24753,24795,24759,24778,24767,24771,24781,24768,25394,25445,25482,25474,25469,25533,25502,25517,25501,25495,25515,25486,25455,25479,25488,25454,25519,25461,25500,25453,25518,25468,25508,25403,25503,25464,25477,25473,25489,25485,25456,25939,26061,26213,26209,26203,26201,26204,26210,26392,26745,26759,26768,26780,26733,26734,26798,26795,26966,26735,26787,26796,26793,26741,26740,26802,26767,26743,26770,26748,26731,26738,26794,26752,26737,26750,26779,26774,26763,26784,26761,26788,26744,26747,26769,26764,26762,26749,27446,27443,27447,27448,27537,27535,27533,27534,27532,27690,28096,28075,28084,28083,28276,28076,28137,28130,28087,28150,28116,28160,28104,28128,28127,28118,28094,28133,28124,28125,28123,28148,28106,28093,28141,28144,28090,28117,28098,28111,28105,28112,28146,28115,28157,28119,28109,28131,28091,28922,28941,28919,28951,28916,28940,28912,28932,28915,28944,28924,28927,28934,28947,28928,28920,28918,28939,28930,28942,29310,29307,29308,29311,29469,29463,29447,29457,29464,29450,29448,29439,29455,29470,29576,29686,29688,29685,29700,29697,29693,29703,29696,29690,29692,29695,29708,29707,29684,29704,30052,30051,30158,30162,30159,30155,30156,30161,30160,30351,30345,30419,30521,30511,30509,30513,30514,30516,30515,30525,30501,30523,30517,30792,30802,30793,30797,30794,30796,30758,30789,30800,31076,31079,31081,31082,31075,31083,31073,31163,31226,31224,31222,31223,31375,31380,31376,31541,31559,31540,31525,31536,31522,31524,31539,31512,31530,31517,31537,31531,31533,31535,31538,31544,31514,31523,31892,31896,31894,31907,32053,32061,32056,32054,32058,32069,32044,32041,32065,32071,32062,32063,32074,32059,32040,32611,32661,32668,32669,32667,32714,32715,32717,32720,32721,32711,32719,32713,32799,32798,32795,32839,32835,32840,33048,33061,33049,33051,33069,33055,33068,33054,33057,33045,33063,33053,33058,33297,33336,33331,33338,33332,33330,33396,33680,33699,33704,33677,33658,33651,33700,33652,33679,33665,33685,33689,33653,33684,33705,33661,33667,33676,33693,33691,33706,33675,33662,33701,33711,33672,33687,33712,33663,33702,33671,33710,33654,33690,34393,34390,34495,34487,34498,34497,34501,34490,34480,34504,34489,34483,34488,34508,34484,34491,34492,34499,34493,34494,34898,34953,34965,34984,34978,34986,34970,34961,34977,34975,34968,34983,34969,34971,34967,34980,34988,34956,34963,34958,35202,35286,35289,35285,35376,35367,35372,35358,35897,35899,35932,35933,35965,36005,36221,36219,36217,36284,36290,36281,36287,36289,36568,36574,36573,36572,36567,36576,36577,36900,36875,36881,36892,36876,36897,37103,37098,37104,37108,37106,37107,37076,37099,37100,37097,37206,37208,37210,37203,37205,37356,37364,37361,37363,37368,37348,37369,37354,37355,37367,37352,37358,38266,38278,38280,38524,38509,38507,38513,38511,38591,38762,38916,39141,39319,20635,20629,20628,20638,20619,20643,20611,20620,20622,20637,20584,20636,20626,20610,20615,20831,20948,21266,21265,21412,21415,21905,21928,21925,21933,21879,22085,21922,21907,21896,21903,21941,21889,21923,21906,21924,21885,21900,21926,21887,21909,21921,21902,22284,22569,22583,22553,22558,22567,22563,22568,22517,22600,22565,22556,22555,22579,22591,22582,22574,22585,22584,22573,22572,22587,22881,23215,23188,23199,23162,23202,23198,23160,23206,23164,23205,23212,23189,23214,23095,23172,23178,23191,23171,23179,23209,23163,23165,23180,23196,23183,23187,23197,23530,23501,23499,23508,23505,23498,23502,23564,23600,23863,23875,23915,23873,23883,23871,23861,23889,23886,23893,23859,23866,23890,23869,23857,23897,23874,23865,23881,23864,23868,23858,23862,23872,23877,24132,24129,24408,24486,24485,24491,24777,24761,24780,24802,24782,24772,24852,24818,24842,24854,24837,24821,24851,24824,24828,24830,24769,24835,24856,24861,24848,24831,24836,24843,25162,25492,25521,25520,25550,25573,25576,25583,25539,25757,25587,25546,25568,25590,25557,25586,25589,25697,25567,25534,25565,25564,25540,25560,25555,25538,25543,25548,25547,25544,25584,25559,25561,25906,25959,25962,25956,25948,25960,25957,25996,26013,26014,26030,26064,26066,26236,26220,26235,26240,26225,26233,26218,26226,26369,26892,26835,26884,26844,26922,26860,26858,26865,26895,26838,26871,26859,26852,26870,26899,26896,26867,26849,26887,26828,26888,26992,26804,26897,26863,26822,26900,26872,26832,26877,26876,26856,26891,26890,26903,26830,26824,26845,26846,26854,26868,26833,26886,26836,26857,26901,26917,26823,27449,27451,27455,27452,27540,27543,27545,27541,27581,27632,27634,27635,27696,28156,28230,28231,28191,28233,28296,28220,28221,28229,28258,28203,28223,28225,28253,28275,28188,28211,28235,28224,28241,28219,28163,28206,28254,28264,28252,28257,28209,28200,28256,28273,28267,28217,28194,28208,28243,28261,28199,28280,28260,28279,28245,28281,28242,28262,28213,28214,28250,28960,28958,28975,28923,28974,28977,28963,28965,28962,28978,28959,28968,28986,28955,29259,29274,29320,29321,29318,29317,29323,29458,29451,29488,29474,29489,29491,29479,29490,29485,29478,29475,29493,29452,29742,29740,29744,29739,29718,29722,29729,29741,29745,29732,29731,29725,29737,29728,29746,29947,29999,30063,30060,30183,30170,30177,30182,30173,30175,30180,30167,30357,30354,30426,30534,30535,30532,30541,30533,30538,30542,30539,30540,30686,30700,30816,30820,30821,30812,30829,30833,30826,30830,30832,30825,30824,30814,30818,31092,31091,31090,31088,31234,31242,31235,31244,31236,31385,31462,31460,31562,31547,31556,31560,31564,31566,31552,31576,31557,31906,31902,31912,31905,32088,32111,32099,32083,32086,32103,32106,32079,32109,32092,32107,32082,32084,32105,32081,32095,32078,32574,32575,32613,32614,32674,32672,32673,32727,32849,32847,32848,33022,32980,33091,33098,33106,33103,33095,33085,33101,33082,33254,33262,33271,33272,33273,33284,33340,33341,33343,33397,33595,33743,33785,33827,33728,33768,33810,33767,33764,33788,33782,33808,33734,33736,33771,33763,33727,33793,33757,33765,33752,33791,33761,33739,33742,33750,33781,33737,33801,33807,33758,33809,33798,33730,33779,33749,33786,33735,33745,33770,33811,33731,33772,33774,33732,33787,33751,33762,33819,33755,33790,34520,34530,34534,34515,34531,34522,34538,34525,34539,34524,34540,34537,34519,34536,34513,34888,34902,34901,35002,35031,35001,35000,35008,35006,34998,35004,34999,35005,34994,35073,35017,35221,35224,35223,35293,35290,35291,35406,35405,35385,35417,35392,35415,35416,35396,35397,35410,35400,35409,35402,35404,35407,35935,35969,35968,36026,36030,36016,36025,36021,36228,36224,36233,36312,36307,36301,36295,36310,36316,36303,36309,36313,36296,36311,36293,36591,36599,36602,36601,36582,36590,36581,36597,36583,36584,36598,36587,36593,36588,36596,36585,36909,36916,36911,37126,37164,37124,37119,37116,37128,37113,37115,37121,37120,37127,37125,37123,37217,37220,37215,37218,37216,37377,37386,37413,37379,37402,37414,37391,37388,37376,37394,37375,37373,37382,37380,37415,37378,37404,37412,37401,37399,37381,37398,38267,38285,38284,38288,38535,38526,38536,38537,38531,38528,38594,38600,38595,38641,38640,38764,38768,38766,38919,39081,39147,40166,40697,20099,20100,20150,20669,20671,20678,20654,20676,20682,20660,20680,20674,20656,20673,20666,20657,20683,20681,20662,20664,20951,21114,21112,21115,21116,21955,21979,21964,21968,21963,21962,21981,21952,21972,21956,21993,21951,21970,21901,21967,21973,21986,21974,21960,22002,21965,21977,21954,22292,22611,22632,22628,22607,22605,22601,22639,22613,22606,22621,22617,22629,22619,22589,22627,22641,22780,23239,23236,23243,23226,23224,23217,23221,23216,23231,23240,23227,23238,23223,23232,23242,23220,23222,23245,23225,23184,23510,23512,23513,23583,23603,23921,23907,23882,23909,23922,23916,23902,23912,23911,23906,24048,24143,24142,24138,24141,24139,24261,24268,24262,24267,24263,24384,24495,24493,24823,24905,24906,24875,24901,24886,24882,24878,24902,24879,24911,24873,24896,25120,37224,25123,25125,25124,25541,25585,25579,25616,25618,25609,25632,25636,25651,25667,25631,25621,25624,25657,25655,25634,25635,25612,25638,25648,25640,25665,25653,25647,25610,25626,25664,25637,25639,25611,25575,25627,25646,25633,25614,25967,26002,26067,26246,26252,26261,26256,26251,26250,26265,26260,26232,26400,26982,26975,26936,26958,26978,26993,26943,26949,26986,26937,26946,26967,26969,27002,26952,26953,26933,26988,26931,26941,26981,26864,27000,26932,26985,26944,26991,26948,26998,26968,26945,26996,26956,26939,26955,26935,26972,26959,26961,26930,26962,26927,27003,26940,27462,27461,27459,27458,27464,27457,27547,64013,27643,27644,27641,27639,27640,28315,28374,28360,28303,28352,28319,28307,28308,28320,28337,28345,28358,28370,28349,28353,28318,28361,28343,28336,28365,28326,28367,28338,28350,28355,28380,28376,28313,28306,28302,28301,28324,28321,28351,28339,28368,28362,28311,28334,28323,28999,29012,29010,29027,29024,28993,29021,29026,29042,29048,29034,29025,28994,29016,28995,29003,29040,29023,29008,29011,28996,29005,29018,29263,29325,29324,29329,29328,29326,29500,29506,29499,29498,29504,29514,29513,29764,29770,29771,29778,29777,29783,29760,29775,29776,29774,29762,29766,29773,29780,29921,29951,29950,29949,29981,30073,30071,27011,30191,30223,30211,30199,30206,30204,30201,30200,30224,30203,30198,30189,30197,30205,30361,30389,30429,30549,30559,30560,30546,30550,30554,30569,30567,30548,30553,30573,30688,30855,30874,30868,30863,30852,30869,30853,30854,30881,30851,30841,30873,30848,30870,30843,31100,31106,31101,31097,31249,31256,31257,31250,31255,31253,31266,31251,31259,31248,31395,31394,31390,31467,31590,31588,31597,31604,31593,31602,31589,31603,31601,31600,31585,31608,31606,31587,31922,31924,31919,32136,32134,32128,32141,32127,32133,32122,32142,32123,32131,32124,32140,32148,32132,32125,32146,32621,32619,32615,32616,32620,32678,32677,32679,32731,32732,32801,33124,33120,33143,33116,33129,33115,33122,33138,26401,33118,33142,33127,33135,33092,33121,33309,33353,33348,33344,33346,33349,34033,33855,33878,33910,33913,33935,33933,33893,33873,33856,33926,33895,33840,33869,33917,33882,33881,33908,33907,33885,34055,33886,33847,33850,33844,33914,33859,33912,33842,33861,33833,33753,33867,33839,33858,33837,33887,33904,33849,33870,33868,33874,33903,33989,33934,33851,33863,33846,33843,33896,33918,33860,33835,33888,33876,33902,33872,34571,34564,34551,34572,34554,34518,34549,34637,34552,34574,34569,34561,34550,34573,34565,35030,35019,35021,35022,35038,35035,35034,35020,35024,35205,35227,35295,35301,35300,35297,35296,35298,35292,35302,35446,35462,35455,35425,35391,35447,35458,35460,35445,35459,35457,35444,35450,35900,35915,35914,35941,35940,35942,35974,35972,35973,36044,36200,36201,36241,36236,36238,36239,36237,36243,36244,36240,36242,36336,36320,36332,36337,36334,36304,36329,36323,36322,36327,36338,36331,36340,36614,36607,36609,36608,36613,36615,36616,36610,36619,36946,36927,36932,36937,36925,37136,37133,37135,37137,37142,37140,37131,37134,37230,37231,37448,37458,37424,37434,37478,37427,37477,37470,37507,37422,37450,37446,37485,37484,37455,37472,37479,37487,37430,37473,37488,37425,37460,37475,37456,37490,37454,37459,37452,37462,37426,38303,38300,38302,38299,38546,38547,38545,38551,38606,38650,38653,38648,38645,38771,38775,38776,38770,38927,38925,38926,39084,39158,39161,39343,39346,39344,39349,39597,39595,39771,40170,40173,40167,40576,40701,20710,20692,20695,20712,20723,20699,20714,20701,20708,20691,20716,20720,20719,20707,20704,20952,21120,21121,21225,21227,21296,21420,22055,22037,22028,22034,22012,22031,22044,22017,22035,22018,22010,22045,22020,22015,22009,22665,22652,22672,22680,22662,22657,22655,22644,22667,22650,22663,22673,22670,22646,22658,22664,22651,22676,22671,22782,22891,23260,23278,23269,23253,23274,23258,23277,23275,23283,23266,23264,23259,23276,23262,23261,23257,23272,23263,23415,23520,23523,23651,23938,23936,23933,23942,23930,23937,23927,23946,23945,23944,23934,23932,23949,23929,23935,24152,24153,24147,24280,24273,24279,24270,24284,24277,24281,24274,24276,24388,24387,24431,24502,24876,24872,24897,24926,24945,24947,24914,24915,24946,24940,24960,24948,24916,24954,24923,24933,24891,24938,24929,24918,25129,25127,25131,25643,25677,25691,25693,25716,25718,25714,25715,25725,25717,25702,25766,25678,25730,25694,25692,25675,25683,25696,25680,25727,25663,25708,25707,25689,25701,25719,25971,26016,26273,26272,26271,26373,26372,26402,27057,27062,27081,27040,27086,27030,27056,27052,27068,27025,27033,27022,27047,27021,27049,27070,27055,27071,27076,27069,27044,27092,27065,27082,27034,27087,27059,27027,27050,27041,27038,27097,27031,27024,27074,27061,27045,27078,27466,27469,27467,27550,27551,27552,27587,27588,27646,28366,28405,28401,28419,28453,28408,28471,28411,28462,28425,28494,28441,28442,28455,28440,28475,28434,28397,28426,28470,28531,28409,28398,28461,28480,28464,28476,28469,28395,28423,28430,28483,28421,28413,28406,28473,28444,28412,28474,28447,28429,28446,28424,28449,29063,29072,29065,29056,29061,29058,29071,29051,29062,29057,29079,29252,29267,29335,29333,29331,29507,29517,29521,29516,29794,29811,29809,29813,29810,29799,29806,29952,29954,29955,30077,30096,30230,30216,30220,30229,30225,30218,30228,30392,30593,30588,30597,30594,30574,30592,30575,30590,30595,30898,30890,30900,30893,30888,30846,30891,30878,30885,30880,30892,30882,30884,31128,31114,31115,31126,31125,31124,31123,31127,31112,31122,31120,31275,31306,31280,31279,31272,31270,31400,31403,31404,31470,31624,31644,31626,31633,31632,31638,31629,31628,31643,31630,31621,31640,21124,31641,31652,31618,31931,31935,31932,31930,32167,32183,32194,32163,32170,32193,32192,32197,32157,32206,32196,32198,32203,32204,32175,32185,32150,32188,32159,32166,32174,32169,32161,32201,32627,32738,32739,32741,32734,32804,32861,32860,33161,33158,33155,33159,33165,33164,33163,33301,33943,33956,33953,33951,33978,33998,33986,33964,33966,33963,33977,33972,33985,33997,33962,33946,33969,34000,33949,33959,33979,33954,33940,33991,33996,33947,33961,33967,33960,34006,33944,33974,33999,33952,34007,34004,34002,34011,33968,33937,34401,34611,34595,34600,34667,34624,34606,34590,34593,34585,34587,34627,34604,34625,34622,34630,34592,34610,34602,34605,34620,34578,34618,34609,34613,34626,34598,34599,34616,34596,34586,34608,34577,35063,35047,35057,35058,35066,35070,35054,35068,35062,35067,35056,35052,35051,35229,35233,35231,35230,35305,35307,35304,35499,35481,35467,35474,35471,35478,35901,35944,35945,36053,36047,36055,36246,36361,36354,36351,36365,36349,36362,36355,36359,36358,36357,36350,36352,36356,36624,36625,36622,36621,37155,37148,37152,37154,37151,37149,37146,37156,37153,37147,37242,37234,37241,37235,37541,37540,37494,37531,37498,37536,37524,37546,37517,37542,37530,37547,37497,37527,37503,37539,37614,37518,37506,37525,37538,37501,37512,37537,37514,37510,37516,37529,37543,37502,37511,37545,37533,37515,37421,38558,38561,38655,38744,38781,38778,38782,38787,38784,38786,38779,38788,38785,38783,38862,38861,38934,39085,39086,39170,39168,39175,39325,39324,39363,39353,39355,39354,39362,39357,39367,39601,39651,39655,39742,39743,39776,39777,39775,40177,40178,40181,40615,20735,20739,20784,20728,20742,20743,20726,20734,20747,20748,20733,20746,21131,21132,21233,21231,22088,22082,22092,22069,22081,22090,22089,22086,22104,22106,22080,22067,22077,22060,22078,22072,22058,22074,22298,22699,22685,22705,22688,22691,22703,22700,22693,22689,22783,23295,23284,23293,23287,23286,23299,23288,23298,23289,23297,23303,23301,23311,23655,23961,23959,23967,23954,23970,23955,23957,23968,23964,23969,23962,23966,24169,24157,24160,24156,32243,24283,24286,24289,24393,24498,24971,24963,24953,25009,25008,24994,24969,24987,24979,25007,25005,24991,24978,25002,24993,24973,24934,25011,25133,25710,25712,25750,25760,25733,25751,25756,25743,25739,25738,25740,25763,25759,25704,25777,25752,25974,25978,25977,25979,26034,26035,26293,26288,26281,26290,26295,26282,26287,27136,27142,27159,27109,27128,27157,27121,27108,27168,27135,27116,27106,27163,27165,27134,27175,27122,27118,27156,27127,27111,27200,27144,27110,27131,27149,27132,27115,27145,27140,27160,27173,27151,27126,27174,27143,27124,27158,27473,27557,27555,27554,27558,27649,27648,27647,27650,28481,28454,28542,28551,28614,28562,28557,28553,28556,28514,28495,28549,28506,28566,28534,28524,28546,28501,28530,28498,28496,28503,28564,28563,28509,28416,28513,28523,28541,28519,28560,28499,28555,28521,28543,28565,28515,28535,28522,28539,29106,29103,29083,29104,29088,29082,29097,29109,29085,29093,29086,29092,29089,29098,29084,29095,29107,29336,29338,29528,29522,29534,29535,29536,29533,29531,29537,29530,29529,29538,29831,29833,29834,29830,29825,29821,29829,29832,29820,29817,29960,29959,30078,30245,30238,30233,30237,30236,30243,30234,30248,30235,30364,30365,30366,30363,30605,30607,30601,30600,30925,30907,30927,30924,30929,30926,30932,30920,30915,30916,30921,31130,31137,31136,31132,31138,31131,27510,31289,31410,31412,31411,31671,31691,31678,31660,31694,31663,31673,31690,31669,31941,31944,31948,31947,32247,32219,32234,32231,32215,32225,32259,32250,32230,32246,32241,32240,32238,32223,32630,32684,32688,32685,32749,32747,32746,32748,32742,32744,32868,32871,33187,33183,33182,33173,33186,33177,33175,33302,33359,33363,33362,33360,33358,33361,34084,34107,34063,34048,34089,34062,34057,34061,34079,34058,34087,34076,34043,34091,34042,34056,34060,34036,34090,34034,34069,34039,34027,34035,34044,34066,34026,34025,34070,34046,34088,34077,34094,34050,34045,34078,34038,34097,34086,34023,34024,34032,34031,34041,34072,34080,34096,34059,34073,34095,34402,34646,34659,34660,34679,34785,34675,34648,34644,34651,34642,34657,34650,34641,34654,34669,34666,34640,34638,34655,34653,34671,34668,34682,34670,34652,34661,34639,34683,34677,34658,34663,34665,34906,35077,35084,35092,35083,35095,35096,35097,35078,35094,35089,35086,35081,35234,35236,35235,35309,35312,35308,35535,35526,35512,35539,35537,35540,35541,35515,35543,35518,35520,35525,35544,35523,35514,35517,35545,35902,35917,35983,36069,36063,36057,36072,36058,36061,36071,36256,36252,36257,36251,36384,36387,36389,36388,36398,36373,36379,36374,36369,36377,36390,36391,36372,36370,36376,36371,36380,36375,36378,36652,36644,36632,36634,36640,36643,36630,36631,36979,36976,36975,36967,36971,37167,37163,37161,37162,37170,37158,37166,37253,37254,37258,37249,37250,37252,37248,37584,37571,37572,37568,37593,37558,37583,37617,37599,37592,37609,37591,37597,37580,37615,37570,37608,37578,37576,37582,37606,37581,37589,37577,37600,37598,37607,37585,37587,37557,37601,37574,37556,38268,38316,38315,38318,38320,38564,38562,38611,38661,38664,38658,38746,38794,38798,38792,38864,38863,38942,38941,38950,38953,38952,38944,38939,38951,39090,39176,39162,39185,39188,39190,39191,39189,39388,39373,39375,39379,39380,39374,39369,39382,39384,39371,39383,39372,39603,39660,39659,39667,39666,39665,39750,39747,39783,39796,39793,39782,39798,39797,39792,39784,39780,39788,40188,40186,40189,40191,40183,40199,40192,40185,40187,40200,40197,40196,40579,40659,40719,40720,20764,20755,20759,20762,20753,20958,21300,21473,22128,22112,22126,22131,22118,22115,22125,22130,22110,22135,22300,22299,22728,22717,22729,22719,22714,22722,22716,22726,23319,23321,23323,23329,23316,23315,23312,23318,23336,23322,23328,23326,23535,23980,23985,23977,23975,23989,23984,23982,23978,23976,23986,23981,23983,23988,24167,24168,24166,24175,24297,24295,24294,24296,24293,24395,24508,24989,25000,24982,25029,25012,25030,25025,25036,25018,25023,25016,24972,25815,25814,25808,25807,25801,25789,25737,25795,25819,25843,25817,25907,25983,25980,26018,26312,26302,26304,26314,26315,26319,26301,26299,26298,26316,26403,27188,27238,27209,27239,27186,27240,27198,27229,27245,27254,27227,27217,27176,27226,27195,27199,27201,27242,27236,27216,27215,27220,27247,27241,27232,27196,27230,27222,27221,27213,27214,27206,27477,27476,27478,27559,27562,27563,27592,27591,27652,27651,27654,28589,28619,28579,28615,28604,28622,28616,28510,28612,28605,28574,28618,28584,28676,28581,28590,28602,28588,28586,28623,28607,28600,28578,28617,28587,28621,28591,28594,28592,29125,29122,29119,29112,29142,29120,29121,29131,29140,29130,29127,29135,29117,29144,29116,29126,29146,29147,29341,29342,29545,29542,29543,29548,29541,29547,29546,29823,29850,29856,29844,29842,29845,29857,29963,30080,30255,30253,30257,30269,30259,30268,30261,30258,30256,30395,30438,30618,30621,30625,30620,30619,30626,30627,30613,30617,30615,30941,30953,30949,30954,30942,30947,30939,30945,30946,30957,30943,30944,31140,31300,31304,31303,31414,31416,31413,31409,31415,31710,31715,31719,31709,31701,31717,31706,31720,31737,31700,31722,31714,31708,31723,31704,31711,31954,31956,31959,31952,31953,32274,32289,32279,32268,32287,32288,32275,32270,32284,32277,32282,32290,32267,32271,32278,32269,32276,32293,32292,32579,32635,32636,32634,32689,32751,32810,32809,32876,33201,33190,33198,33209,33205,33195,33200,33196,33204,33202,33207,33191,33266,33365,33366,33367,34134,34117,34155,34125,34131,34145,34136,34112,34118,34148,34113,34146,34116,34129,34119,34147,34110,34139,34161,34126,34158,34165,34133,34151,34144,34188,34150,34141,34132,34149,34156,34403,34405,34404,34715,34703,34711,34707,34706,34696,34689,34710,34712,34681,34695,34723,34693,34704,34705,34717,34692,34708,34716,34714,34697,35102,35110,35120,35117,35118,35111,35121,35106,35113,35107,35119,35116,35103,35313,35552,35554,35570,35572,35573,35549,35604,35556,35551,35568,35528,35550,35553,35560,35583,35567,35579,35985,35986,35984,36085,36078,36081,36080,36083,36204,36206,36261,36263,36403,36414,36408,36416,36421,36406,36412,36413,36417,36400,36415,36541,36662,36654,36661,36658,36665,36663,36660,36982,36985,36987,36998,37114,37171,37173,37174,37267,37264,37265,37261,37263,37671,37662,37640,37663,37638,37647,37754,37688,37692,37659,37667,37650,37633,37702,37677,37646,37645,37579,37661,37626,37669,37651,37625,37623,37684,37634,37668,37631,37673,37689,37685,37674,37652,37644,37643,37630,37641,37632,37627,37654,38332,38349,38334,38329,38330,38326,38335,38325,38333,38569,38612,38667,38674,38672,38809,38807,38804,38896,38904,38965,38959,38962,39204,39199,39207,39209,39326,39406,39404,39397,39396,39408,39395,39402,39401,39399,39609,39615,39604,39611,39670,39674,39673,39671,39731,39808,39813,39815,39804,39806,39803,39810,39827,39826,39824,39802,39829,39805,39816,40229,40215,40224,40222,40212,40233,40221,40216,40226,40208,40217,40223,40584,40582,40583,40622,40621,40661,40662,40698,40722,40765,20774,20773,20770,20772,20768,20777,21236,22163,22156,22157,22150,22148,22147,22142,22146,22143,22145,22742,22740,22735,22738,23341,23333,23346,23331,23340,23335,23334,23343,23342,23419,23537,23538,23991,24172,24170,24510,24507,25027,25013,25020,25063,25056,25061,25060,25064,25054,25839,25833,25827,25835,25828,25832,25985,25984,26038,26074,26322,27277,27286,27265,27301,27273,27295,27291,27297,27294,27271,27283,27278,27285,27267,27304,27300,27281,27263,27302,27290,27269,27276,27282,27483,27565,27657,28620,28585,28660,28628,28643,28636,28653,28647,28646,28638,28658,28637,28642,28648,29153,29169,29160,29170,29156,29168,29154,29555,29550,29551,29847,29874,29867,29840,29866,29869,29873,29861,29871,29968,29969,29970,29967,30084,30275,30280,30281,30279,30372,30441,30645,30635,30642,30647,30646,30644,30641,30632,30704,30963,30973,30978,30971,30972,30962,30981,30969,30974,30980,31147,31144,31324,31323,31318,31320,31316,31322,31422,31424,31425,31749,31759,31730,31744,31743,31739,31758,31732,31755,31731,31746,31753,31747,31745,31736,31741,31750,31728,31729,31760,31754,31976,32301,32316,32322,32307,38984,32312,32298,32329,32320,32327,32297,32332,32304,32315,32310,32324,32314,32581,32639,32638,32637,32756,32754,32812,33211,33220,33228,33226,33221,33223,33212,33257,33371,33370,33372,34179,34176,34191,34215,34197,34208,34187,34211,34171,34212,34202,34206,34167,34172,34185,34209,34170,34168,34135,34190,34198,34182,34189,34201,34205,34177,34210,34178,34184,34181,34169,34166,34200,34192,34207,34408,34750,34730,34733,34757,34736,34732,34745,34741,34748,34734,34761,34755,34754,34764,34743,34735,34756,34762,34740,34742,34751,34744,34749,34782,34738,35125,35123,35132,35134,35137,35154,35127,35138,35245,35247,35246,35314,35315,35614,35608,35606,35601,35589,35595,35618,35599,35602,35605,35591,35597,35592,35590,35612,35603,35610,35919,35952,35954,35953,35951,35989,35988,36089,36207,36430,36429,36435,36432,36428,36423,36675,36672,36997,36990,37176,37274,37282,37275,37273,37279,37281,37277,37280,37793,37763,37807,37732,37718,37703,37756,37720,37724,37750,37705,37712,37713,37728,37741,37775,37708,37738,37753,37719,37717,37714,37711,37745,37751,37755,37729,37726,37731,37735,37760,37710,37721,38343,38336,38345,38339,38341,38327,38574,38576,38572,38688,38687,38680,38685,38681,38810,38817,38812,38814,38813,38869,38868,38897,38977,38980,38986,38985,38981,38979,39205,39211,39212,39210,39219,39218,39215,39213,39217,39216,39320,39331,39329,39426,39418,39412,39415,39417,39416,39414,39419,39421,39422,39420,39427,39614,39678,39677,39681,39676,39752,39834,39848,39838,39835,39846,39841,39845,39844,39814,39842,39840,39855,40243,40257,40295,40246,40238,40239,40241,40248,40240,40261,40258,40259,40254,40247,40256,40253,32757,40237,40586,40585,40589,40624,40648,40666,40699,40703,40740,40739,40738,40788,40864,20785,20781,20782,22168,22172,22167,22170,22173,22169,22896,23356,23657,23658,24000,24173,24174,25048,25055,25069,25070,25073,25066,25072,25067,25046,25065,25855,25860,25853,25848,25857,25859,25852,26004,26075,26330,26331,26328,27333,27321,27325,27361,27334,27322,27318,27319,27335,27316,27309,27486,27593,27659,28679,28684,28685,28673,28677,28692,28686,28671,28672,28667,28710,28668,28663,28682,29185,29183,29177,29187,29181,29558,29880,29888,29877,29889,29886,29878,29883,29890,29972,29971,30300,30308,30297,30288,30291,30295,30298,30374,30397,30444,30658,30650,30975,30988,30995,30996,30985,30992,30994,30993,31149,31148,31327,31772,31785,31769,31776,31775,31789,31773,31782,31784,31778,31781,31792,32348,32336,32342,32355,32344,32354,32351,32337,32352,32343,32339,32693,32691,32759,32760,32885,33233,33234,33232,33375,33374,34228,34246,34240,34243,34242,34227,34229,34237,34247,34244,34239,34251,34254,34248,34245,34225,34230,34258,34340,34232,34231,34238,34409,34791,34790,34786,34779,34795,34794,34789,34783,34803,34788,34772,34780,34771,34797,34776,34787,34724,34775,34777,34817,34804,34792,34781,35155,35147,35151,35148,35142,35152,35153,35145,35626,35623,35619,35635,35632,35637,35655,35631,35644,35646,35633,35621,35639,35622,35638,35630,35620,35643,35645,35642,35906,35957,35993,35992,35991,36094,36100,36098,36096,36444,36450,36448,36439,36438,36446,36453,36455,36443,36442,36449,36445,36457,36436,36678,36679,36680,36683,37160,37178,37179,37182,37288,37285,37287,37295,37290,37813,37772,37778,37815,37787,37789,37769,37799,37774,37802,37790,37798,37781,37768,37785,37791,37773,37809,37777,37810,37796,37800,37812,37795,37797,38354,38355,38353,38579,38615,38618,24002,38623,38616,38621,38691,38690,38693,38828,38830,38824,38827,38820,38826,38818,38821,38871,38873,38870,38872,38906,38992,38993,38994,39096,39233,39228,39226,39439,39435,39433,39437,39428,39441,39434,39429,39431,39430,39616,39644,39688,39684,39685,39721,39733,39754,39756,39755,39879,39878,39875,39871,39873,39861,39864,39891,39862,39876,39865,39869,40284,40275,40271,40266,40283,40267,40281,40278,40268,40279,40274,40276,40287,40280,40282,40590,40588,40671,40705,40704,40726,40741,40747,40746,40745,40744,40780,40789,20788,20789,21142,21239,21428,22187,22189,22182,22183,22186,22188,22746,22749,22747,22802,23357,23358,23359,24003,24176,24511,25083,25863,25872,25869,25865,25868,25870,25988,26078,26077,26334,27367,27360,27340,27345,27353,27339,27359,27356,27344,27371,27343,27341,27358,27488,27568,27660,28697,28711,28704,28694,28715,28705,28706,28707,28713,28695,28708,28700,28714,29196,29194,29191,29186,29189,29349,29350,29348,29347,29345,29899,29893,29879,29891,29974,30304,30665,30666,30660,30705,31005,31003,31009,31004,30999,31006,31152,31335,31336,31795,31804,31801,31788,31803,31980,31978,32374,32373,32376,32368,32375,32367,32378,32370,32372,32360,32587,32586,32643,32646,32695,32765,32766,32888,33239,33237,33380,33377,33379,34283,34289,34285,34265,34273,34280,34266,34263,34284,34290,34296,34264,34271,34275,34268,34257,34288,34278,34287,34270,34274,34816,34810,34819,34806,34807,34825,34828,34827,34822,34812,34824,34815,34826,34818,35170,35162,35163,35159,35169,35164,35160,35165,35161,35208,35255,35254,35318,35664,35656,35658,35648,35667,35670,35668,35659,35669,35665,35650,35666,35671,35907,35959,35958,35994,36102,36103,36105,36268,36266,36269,36267,36461,36472,36467,36458,36463,36475,36546,36690,36689,36687,36688,36691,36788,37184,37183,37296,37293,37854,37831,37839,37826,37850,37840,37881,37868,37836,37849,37801,37862,37834,37844,37870,37859,37845,37828,37838,37824,37842,37863,38269,38362,38363,38625,38697,38699,38700,38696,38694,38835,38839,38838,38877,38878,38879,39004,39001,39005,38999,39103,39101,39099,39102,39240,39239,39235,39334,39335,39450,39445,39461,39453,39460,39451,39458,39456,39463,39459,39454,39452,39444,39618,39691,39690,39694,39692,39735,39914,39915,39904,39902,39908,39910,39906,39920,39892,39895,39916,39900,39897,39909,39893,39905,39898,40311,40321,40330,40324,40328,40305,40320,40312,40326,40331,40332,40317,40299,40308,40309,40304,40297,40325,40307,40315,40322,40303,40313,40319,40327,40296,40596,40593,40640,40700,40749,40768,40769,40781,40790,40791,40792,21303,22194,22197,22195,22755,23365,24006,24007,24302,24303,24512,24513,25081,25879,25878,25877,25875,26079,26344,26339,26340,27379,27376,27370,27368,27385,27377,27374,27375,28732,28725,28719,28727,28724,28721,28738,28728,28735,28730,28729,28736,28731,28723,28737,29203,29204,29352,29565,29564,29882,30379,30378,30398,30445,30668,30670,30671,30669,30706,31013,31011,31015,31016,31012,31017,31154,31342,31340,31341,31479,31817,31816,31818,31815,31813,31982,32379,32382,32385,32384,32698,32767,32889,33243,33241,33291,33384,33385,34338,34303,34305,34302,34331,34304,34294,34308,34313,34309,34316,34301,34841,34832,34833,34839,34835,34838,35171,35174,35257,35319,35680,35690,35677,35688,35683,35685,35687,35693,36270,36486,36488,36484,36697,36694,36695,36693,36696,36698,37005,37187,37185,37303,37301,37298,37299,37899,37907,37883,37920,37903,37908,37886,37909,37904,37928,37913,37901,37877,37888,37879,37895,37902,37910,37906,37882,37897,37880,37898,37887,37884,37900,37878,37905,37894,38366,38368,38367,38702,38703,38841,38843,38909,38910,39008,39010,39011,39007,39105,39106,39248,39246,39257,39244,39243,39251,39474,39476,39473,39468,39466,39478,39465,39470,39480,39469,39623,39626,39622,39696,39698,39697,39947,39944,39927,39941,39954,39928,40000,39943,39950,39942,39959,39956,39945,40351,40345,40356,40349,40338,40344,40336,40347,40352,40340,40348,40362,40343,40353,40346,40354,40360,40350,40355,40383,40361,40342,40358,40359,40601,40603,40602,40677,40676,40679,40678,40752,40750,40795,40800,40798,40797,40793,40849,20794,20793,21144,21143,22211,22205,22206,23368,23367,24011,24015,24305,25085,25883,27394,27388,27395,27384,27392,28739,28740,28746,28744,28745,28741,28742,29213,29210,29209,29566,29975,30314,30672,31021,31025,31023,31828,31827,31986,32394,32391,32392,32395,32390,32397,32589,32699,32816,33245,34328,34346,34342,34335,34339,34332,34329,34343,34350,34337,34336,34345,34334,34341,34857,34845,34843,34848,34852,34844,34859,34890,35181,35177,35182,35179,35322,35705,35704,35653,35706,35707,36112,36116,36271,36494,36492,36702,36699,36701,37190,37188,37189,37305,37951,37947,37942,37929,37949,37948,37936,37945,37930,37943,37932,37952,37937,38373,38372,38371,38709,38714,38847,38881,39012,39113,39110,39104,39256,39254,39481,39485,39494,39492,39490,39489,39482,39487,39629,39701,39703,39704,39702,39738,39762,39979,39965,39964,39980,39971,39976,39977,39972,39969,40375,40374,40380,40385,40391,40394,40399,40382,40389,40387,40379,40373,40398,40377,40378,40364,40392,40369,40365,40396,40371,40397,40370,40570,40604,40683,40686,40685,40731,40728,40730,40753,40782,40805,40804,40850,20153,22214,22213,22219,22897,23371,23372,24021,24017,24306,25889,25888,25894,25890,27403,27400,27401,27661,28757,28758,28759,28754,29214,29215,29353,29567,29912,29909,29913,29911,30317,30381,31029,31156,31344,31345,31831,31836,31833,31835,31834,31988,31985,32401,32591,32647,33246,33387,34356,34357,34355,34348,34354,34358,34860,34856,34854,34858,34853,35185,35263,35262,35323,35710,35716,35714,35718,35717,35711,36117,36501,36500,36506,36498,36496,36502,36503,36704,36706,37191,37964,37968,37962,37963,37967,37959,37957,37960,37961,37958,38719,38883,39018,39017,39115,39252,39259,39502,39507,39508,39500,39503,39496,39498,39497,39506,39504,39632,39705,39723,39739,39766,39765,40006,40008,39999,40004,39993,39987,40001,39996,39991,39988,39986,39997,39990,40411,40402,40414,40410,40395,40400,40412,40401,40415,40425,40409,40408,40406,40437,40405,40413,40630,40688,40757,40755,40754,40770,40811,40853,40866,20797,21145,22760,22759,22898,23373,24024,34863,24399,25089,25091,25092,25897,25893,26006,26347,27409,27410,27407,27594,28763,28762,29218,29570,29569,29571,30320,30676,31847,31846,32405,33388,34362,34368,34361,34364,34353,34363,34366,34864,34866,34862,34867,35190,35188,35187,35326,35724,35726,35723,35720,35909,36121,36504,36708,36707,37308,37986,37973,37981,37975,37982,38852,38853,38912,39510,39513,39710,39711,39712,40018,40024,40016,40010,40013,40011,40021,40025,40012,40014,40443,40439,40431,40419,40427,40440,40420,40438,40417,40430,40422,40434,40432,40418,40428,40436,40435,40424,40429,40642,40656,40690,40691,40710,40732,40760,40759,40758,40771,40783,40817,40816,40814,40815,22227,22221,23374,23661,25901,26349,26350,27411,28767,28769,28765,28768,29219,29915,29925,30677,31032,31159,31158,31850,32407,32649,33389,34371,34872,34871,34869,34891,35732,35733,36510,36511,36512,36509,37310,37309,37314,37995,37992,37993,38629,38726,38723,38727,38855,38885,39518,39637,39769,40035,40039,40038,40034,40030,40032,40450,40446,40455,40451,40454,40453,40448,40449,40457,40447,40445,40452,40608,40734,40774,40820,40821,40822,22228,25902,26040,27416,27417,27415,27418,28770,29222,29354,30680,30681,31033,31849,31851,31990,32410,32408,32411,32409,33248,33249,34374,34375,34376,35193,35194,35196,35195,35327,35736,35737,36517,36516,36515,37998,37997,37999,38001,38003,38729,39026,39263,40040,40046,40045,40459,40461,40464,40463,40466,40465,40609,40693,40713,40775,40824,40827,40826,40825,22302,28774,31855,34876,36274,36518,37315,38004,38008,38006,38005,39520,40052,40051,40049,40053,40468,40467,40694,40714,40868,28776,28773,31991,34410,34878,34877,34879,35742,35996,36521,36553,38731,39027,39028,39116,39265,39339,39524,39526,39527,39716,40469,40471,40776,25095,27422,29223,34380,36520,38018,38016,38017,39529,39528,39726,40473,29225,34379,35743,38019,40057,40631,30325,39531,40058,40477,28777,28778,40612,40830,40777,40856,30849,37561,35023,22715,24658,31911,23290,9556,9574,9559,9568,9580,9571,9562,9577,9565,9554,9572,9557,9566,9578,9569,9560,9575,9563,9555,9573,9558,9567,9579,9570,9561,9576,9564,9553,9552,9581,9582,9584,9583,65517,132423,37595,132575,147397,34124,17077,29679,20917,13897,149826,166372,37700,137691,33518,146632,30780,26436,25311,149811,166314,131744,158643,135941,20395,140525,20488,159017,162436,144896,150193,140563,20521,131966,24484,131968,131911,28379,132127,20605,20737,13434,20750,39020,14147,33814,149924,132231,20832,144308,20842,134143,139516,131813,140592,132494,143923,137603,23426,34685,132531,146585,20914,20920,40244,20937,20943,20945,15580,20947,150182,20915,20962,21314,20973,33741,26942,145197,24443,21003,21030,21052,21173,21079,21140,21177,21189,31765,34114,21216,34317,158483,21253,166622,21833,28377,147328,133460,147436,21299,21316,134114,27851,136998,26651,29653,24650,16042,14540,136936,29149,17570,21357,21364,165547,21374,21375,136598,136723,30694,21395,166555,21408,21419,21422,29607,153458,16217,29596,21441,21445,27721,20041,22526,21465,15019,134031,21472,147435,142755,21494,134263,21523,28793,21803,26199,27995,21613,158547,134516,21853,21647,21668,18342,136973,134877,15796,134477,166332,140952,21831,19693,21551,29719,21894,21929,22021,137431,147514,17746,148533,26291,135348,22071,26317,144010,26276,26285,22093,22095,30961,22257,38791,21502,22272,22255,22253,166758,13859,135759,22342,147877,27758,28811,22338,14001,158846,22502,136214,22531,136276,148323,22566,150517,22620,22698,13665,22752,22748,135740,22779,23551,22339,172368,148088,37843,13729,22815,26790,14019,28249,136766,23076,21843,136850,34053,22985,134478,158849,159018,137180,23001,137211,137138,159142,28017,137256,136917,23033,159301,23211,23139,14054,149929,23159,14088,23190,29797,23251,159649,140628,15749,137489,14130,136888,24195,21200,23414,25992,23420,162318,16388,18525,131588,23509,24928,137780,154060,132517,23539,23453,19728,23557,138052,23571,29646,23572,138405,158504,23625,18653,23685,23785,23791,23947,138745,138807,23824,23832,23878,138916,23738,24023,33532,14381,149761,139337,139635,33415,14390,15298,24110,27274,24181,24186,148668,134355,21414,20151,24272,21416,137073,24073,24308,164994,24313,24315,14496,24316,26686,37915,24333,131521,194708,15070,18606,135994,24378,157832,140240,24408,140401,24419,38845,159342,24434,37696,166454,24487,23990,15711,152144,139114,159992,140904,37334,131742,166441,24625,26245,137335,14691,15815,13881,22416,141236,31089,15936,24734,24740,24755,149890,149903,162387,29860,20705,23200,24932,33828,24898,194726,159442,24961,20980,132694,24967,23466,147383,141407,25043,166813,170333,25040,14642,141696,141505,24611,24924,25886,25483,131352,25285,137072,25301,142861,25452,149983,14871,25656,25592,136078,137212,25744,28554,142902,38932,147596,153373,25825,25829,38011,14950,25658,14935,25933,28438,150056,150051,25989,25965,25951,143486,26037,149824,19255,26065,16600,137257,26080,26083,24543,144384,26136,143863,143864,26180,143780,143781,26187,134773,26215,152038,26227,26228,138813,143921,165364,143816,152339,30661,141559,39332,26370,148380,150049,15147,27130,145346,26462,26471,26466,147917,168173,26583,17641,26658,28240,37436,26625,144358,159136,26717,144495,27105,27147,166623,26995,26819,144845,26881,26880,15666,14849,144956,15232,26540,26977,166474,17148,26934,27032,15265,132041,33635,20624,27129,144985,139562,27205,145155,27293,15347,26545,27336,168348,15373,27421,133411,24798,27445,27508,141261,28341,146139,132021,137560,14144,21537,146266,27617,147196,27612,27703,140427,149745,158545,27738,33318,27769,146876,17605,146877,147876,149772,149760,146633,14053,15595,134450,39811,143865,140433,32655,26679,159013,159137,159211,28054,27996,28284,28420,149887,147589,159346,34099,159604,20935,27804,28189,33838,166689,28207,146991,29779,147330,31180,28239,23185,143435,28664,14093,28573,146992,28410,136343,147517,17749,37872,28484,28508,15694,28532,168304,15675,28575,147780,28627,147601,147797,147513,147440,147380,147775,20959,147798,147799,147776,156125,28747,28798,28839,28801,28876,28885,28886,28895,16644,15848,29108,29078,148087,28971,28997,23176,29002,29038,23708,148325,29007,37730,148161,28972,148570,150055,150050,29114,166888,28861,29198,37954,29205,22801,37955,29220,37697,153093,29230,29248,149876,26813,29269,29271,15957,143428,26637,28477,29314,29482,29483,149539,165931,18669,165892,29480,29486,29647,29610,134202,158254,29641,29769,147938,136935,150052,26147,14021,149943,149901,150011,29687,29717,26883,150054,29753,132547,16087,29788,141485,29792,167602,29767,29668,29814,33721,29804,14128,29812,37873,27180,29826,18771,150156,147807,150137,166799,23366,166915,137374,29896,137608,29966,29929,29982,167641,137803,23511,167596,37765,30029,30026,30055,30062,151426,16132,150803,30094,29789,30110,30132,30210,30252,30289,30287,30319,30326,156661,30352,33263,14328,157969,157966,30369,30373,30391,30412,159647,33890,151709,151933,138780,30494,30502,30528,25775,152096,30552,144044,30639,166244,166248,136897,30708,30729,136054,150034,26826,30895,30919,30931,38565,31022,153056,30935,31028,30897,161292,36792,34948,166699,155779,140828,31110,35072,26882,31104,153687,31133,162617,31036,31145,28202,160038,16040,31174,168205,31188],\n  \"euc-kr\":[44034,44035,44037,44038,44043,44044,44045,44046,44047,44056,44062,44063,44065,44066,44067,44069,44070,44071,44072,44073,44074,44075,44078,44082,44083,44084,null,null,null,null,null,null,44085,44086,44087,44090,44091,44093,44094,44095,44097,44098,44099,44100,44101,44102,44103,44104,44105,44106,44108,44110,44111,44112,44113,44114,44115,44117,null,null,null,null,null,null,44118,44119,44121,44122,44123,44125,44126,44127,44128,44129,44130,44131,44132,44133,44134,44135,44136,44137,44138,44139,44140,44141,44142,44143,44146,44147,44149,44150,44153,44155,44156,44157,44158,44159,44162,44167,44168,44173,44174,44175,44177,44178,44179,44181,44182,44183,44184,44185,44186,44187,44190,44194,44195,44196,44197,44198,44199,44203,44205,44206,44209,44210,44211,44212,44213,44214,44215,44218,44222,44223,44224,44226,44227,44229,44230,44231,44233,44234,44235,44237,44238,44239,44240,44241,44242,44243,44244,44246,44248,44249,44250,44251,44252,44253,44254,44255,44258,44259,44261,44262,44265,44267,44269,44270,44274,44276,44279,44280,44281,44282,44283,44286,44287,44289,44290,44291,44293,44295,44296,44297,44298,44299,44302,44304,44306,44307,44308,44309,44310,44311,44313,44314,44315,44317,44318,44319,44321,44322,44323,44324,44325,44326,44327,44328,44330,44331,44334,44335,44336,44337,44338,44339,null,null,null,null,null,null,44342,44343,44345,44346,44347,44349,44350,44351,44352,44353,44354,44355,44358,44360,44362,44363,44364,44365,44366,44367,44369,44370,44371,44373,44374,44375,null,null,null,null,null,null,44377,44378,44379,44380,44381,44382,44383,44384,44386,44388,44389,44390,44391,44392,44393,44394,44395,44398,44399,44401,44402,44407,44408,44409,44410,44414,44416,44419,44420,44421,44422,44423,44426,44427,44429,44430,44431,44433,44434,44435,44436,44437,44438,44439,44440,44441,44442,44443,44446,44447,44448,44449,44450,44451,44453,44454,44455,44456,44457,44458,44459,44460,44461,44462,44463,44464,44465,44466,44467,44468,44469,44470,44472,44473,44474,44475,44476,44477,44478,44479,44482,44483,44485,44486,44487,44489,44490,44491,44492,44493,44494,44495,44498,44500,44501,44502,44503,44504,44505,44506,44507,44509,44510,44511,44513,44514,44515,44517,44518,44519,44520,44521,44522,44523,44524,44525,44526,44527,44528,44529,44530,44531,44532,44533,44534,44535,44538,44539,44541,44542,44546,44547,44548,44549,44550,44551,44554,44556,44558,44559,44560,44561,44562,44563,44565,44566,44567,44568,44569,44570,44571,44572,null,null,null,null,null,null,44573,44574,44575,44576,44577,44578,44579,44580,44581,44582,44583,44584,44585,44586,44587,44588,44589,44590,44591,44594,44595,44597,44598,44601,44603,44604,null,null,null,null,null,null,44605,44606,44607,44610,44612,44615,44616,44617,44619,44623,44625,44626,44627,44629,44631,44632,44633,44634,44635,44638,44642,44643,44644,44646,44647,44650,44651,44653,44654,44655,44657,44658,44659,44660,44661,44662,44663,44666,44670,44671,44672,44673,44674,44675,44678,44679,44680,44681,44682,44683,44685,44686,44687,44688,44689,44690,44691,44692,44693,44694,44695,44696,44697,44698,44699,44700,44701,44702,44703,44704,44705,44706,44707,44708,44709,44710,44711,44712,44713,44714,44715,44716,44717,44718,44719,44720,44721,44722,44723,44724,44725,44726,44727,44728,44729,44730,44731,44735,44737,44738,44739,44741,44742,44743,44744,44745,44746,44747,44750,44754,44755,44756,44757,44758,44759,44762,44763,44765,44766,44767,44768,44769,44770,44771,44772,44773,44774,44775,44777,44778,44780,44782,44783,44784,44785,44786,44787,44789,44790,44791,44793,44794,44795,44797,44798,44799,44800,44801,44802,44803,44804,44805,null,null,null,null,null,null,44806,44809,44810,44811,44812,44814,44815,44817,44818,44819,44820,44821,44822,44823,44824,44825,44826,44827,44828,44829,44830,44831,44832,44833,44834,44835,null,null,null,null,null,null,44836,44837,44838,44839,44840,44841,44842,44843,44846,44847,44849,44851,44853,44854,44855,44856,44857,44858,44859,44862,44864,44868,44869,44870,44871,44874,44875,44876,44877,44878,44879,44881,44882,44883,44884,44885,44886,44887,44888,44889,44890,44891,44894,44895,44896,44897,44898,44899,44902,44903,44904,44905,44906,44907,44908,44909,44910,44911,44912,44913,44914,44915,44916,44917,44918,44919,44920,44922,44923,44924,44925,44926,44927,44929,44930,44931,44933,44934,44935,44937,44938,44939,44940,44941,44942,44943,44946,44947,44948,44950,44951,44952,44953,44954,44955,44957,44958,44959,44960,44961,44962,44963,44964,44965,44966,44967,44968,44969,44970,44971,44972,44973,44974,44975,44976,44977,44978,44979,44980,44981,44982,44983,44986,44987,44989,44990,44991,44993,44994,44995,44996,44997,44998,45002,45004,45007,45008,45009,45010,45011,45013,45014,45015,45016,45017,45018,45019,45021,45022,45023,45024,45025,null,null,null,null,null,null,45026,45027,45028,45029,45030,45031,45034,45035,45036,45037,45038,45039,45042,45043,45045,45046,45047,45049,45050,45051,45052,45053,45054,45055,45058,45059,null,null,null,null,null,null,45061,45062,45063,45064,45065,45066,45067,45069,45070,45071,45073,45074,45075,45077,45078,45079,45080,45081,45082,45083,45086,45087,45088,45089,45090,45091,45092,45093,45094,45095,45097,45098,45099,45100,45101,45102,45103,45104,45105,45106,45107,45108,45109,45110,45111,45112,45113,45114,45115,45116,45117,45118,45119,45120,45121,45122,45123,45126,45127,45129,45131,45133,45135,45136,45137,45138,45142,45144,45146,45147,45148,45150,45151,45152,45153,45154,45155,45156,45157,45158,45159,45160,45161,45162,45163,45164,45165,45166,45167,45168,45169,45170,45171,45172,45173,45174,45175,45176,45177,45178,45179,45182,45183,45185,45186,45187,45189,45190,45191,45192,45193,45194,45195,45198,45200,45202,45203,45204,45205,45206,45207,45211,45213,45214,45219,45220,45221,45222,45223,45226,45232,45234,45238,45239,45241,45242,45243,45245,45246,45247,45248,45249,45250,45251,45254,45258,45259,45260,45261,45262,45263,45266,null,null,null,null,null,null,45267,45269,45270,45271,45273,45274,45275,45276,45277,45278,45279,45281,45282,45283,45284,45286,45287,45288,45289,45290,45291,45292,45293,45294,45295,45296,null,null,null,null,null,null,45297,45298,45299,45300,45301,45302,45303,45304,45305,45306,45307,45308,45309,45310,45311,45312,45313,45314,45315,45316,45317,45318,45319,45322,45325,45326,45327,45329,45332,45333,45334,45335,45338,45342,45343,45344,45345,45346,45350,45351,45353,45354,45355,45357,45358,45359,45360,45361,45362,45363,45366,45370,45371,45372,45373,45374,45375,45378,45379,45381,45382,45383,45385,45386,45387,45388,45389,45390,45391,45394,45395,45398,45399,45401,45402,45403,45405,45406,45407,45409,45410,45411,45412,45413,45414,45415,45416,45417,45418,45419,45420,45421,45422,45423,45424,45425,45426,45427,45428,45429,45430,45431,45434,45435,45437,45438,45439,45441,45443,45444,45445,45446,45447,45450,45452,45454,45455,45456,45457,45461,45462,45463,45465,45466,45467,45469,45470,45471,45472,45473,45474,45475,45476,45477,45478,45479,45481,45482,45483,45484,45485,45486,45487,45488,45489,45490,45491,45492,45493,45494,45495,45496,null,null,null,null,null,null,45497,45498,45499,45500,45501,45502,45503,45504,45505,45506,45507,45508,45509,45510,45511,45512,45513,45514,45515,45517,45518,45519,45521,45522,45523,45525,null,null,null,null,null,null,45526,45527,45528,45529,45530,45531,45534,45536,45537,45538,45539,45540,45541,45542,45543,45546,45547,45549,45550,45551,45553,45554,45555,45556,45557,45558,45559,45560,45562,45564,45566,45567,45568,45569,45570,45571,45574,45575,45577,45578,45581,45582,45583,45584,45585,45586,45587,45590,45592,45594,45595,45596,45597,45598,45599,45601,45602,45603,45604,45605,45606,45607,45608,45609,45610,45611,45612,45613,45614,45615,45616,45617,45618,45619,45621,45622,45623,45624,45625,45626,45627,45629,45630,45631,45632,45633,45634,45635,45636,45637,45638,45639,45640,45641,45642,45643,45644,45645,45646,45647,45648,45649,45650,45651,45652,45653,45654,45655,45657,45658,45659,45661,45662,45663,45665,45666,45667,45668,45669,45670,45671,45674,45675,45676,45677,45678,45679,45680,45681,45682,45683,45686,45687,45688,45689,45690,45691,45693,45694,45695,45696,45697,45698,45699,45702,45703,45704,45706,45707,45708,45709,45710,null,null,null,null,null,null,45711,45714,45715,45717,45718,45719,45723,45724,45725,45726,45727,45730,45732,45735,45736,45737,45739,45741,45742,45743,45745,45746,45747,45749,45750,45751,null,null,null,null,null,null,45752,45753,45754,45755,45756,45757,45758,45759,45760,45761,45762,45763,45764,45765,45766,45767,45770,45771,45773,45774,45775,45777,45779,45780,45781,45782,45783,45786,45788,45790,45791,45792,45793,45795,45799,45801,45802,45808,45809,45810,45814,45820,45821,45822,45826,45827,45829,45830,45831,45833,45834,45835,45836,45837,45838,45839,45842,45846,45847,45848,45849,45850,45851,45853,45854,45855,45856,45857,45858,45859,45860,45861,45862,45863,45864,45865,45866,45867,45868,45869,45870,45871,45872,45873,45874,45875,45876,45877,45878,45879,45880,45881,45882,45883,45884,45885,45886,45887,45888,45889,45890,45891,45892,45893,45894,45895,45896,45897,45898,45899,45900,45901,45902,45903,45904,45905,45906,45907,45911,45913,45914,45917,45920,45921,45922,45923,45926,45928,45930,45932,45933,45935,45938,45939,45941,45942,45943,45945,45946,45947,45948,45949,45950,45951,45954,45958,45959,45960,45961,45962,45963,45965,null,null,null,null,null,null,45966,45967,45969,45970,45971,45973,45974,45975,45976,45977,45978,45979,45980,45981,45982,45983,45986,45987,45988,45989,45990,45991,45993,45994,45995,45997,null,null,null,null,null,null,45998,45999,46000,46001,46002,46003,46004,46005,46006,46007,46008,46009,46010,46011,46012,46013,46014,46015,46016,46017,46018,46019,46022,46023,46025,46026,46029,46031,46033,46034,46035,46038,46040,46042,46044,46046,46047,46049,46050,46051,46053,46054,46055,46057,46058,46059,46060,46061,46062,46063,46064,46065,46066,46067,46068,46069,46070,46071,46072,46073,46074,46075,46077,46078,46079,46080,46081,46082,46083,46084,46085,46086,46087,46088,46089,46090,46091,46092,46093,46094,46095,46097,46098,46099,46100,46101,46102,46103,46105,46106,46107,46109,46110,46111,46113,46114,46115,46116,46117,46118,46119,46122,46124,46125,46126,46127,46128,46129,46130,46131,46133,46134,46135,46136,46137,46138,46139,46140,46141,46142,46143,46144,46145,46146,46147,46148,46149,46150,46151,46152,46153,46154,46155,46156,46157,46158,46159,46162,46163,46165,46166,46167,46169,46170,46171,46172,46173,46174,46175,46178,46180,46182,null,null,null,null,null,null,46183,46184,46185,46186,46187,46189,46190,46191,46192,46193,46194,46195,46196,46197,46198,46199,46200,46201,46202,46203,46204,46205,46206,46207,46209,46210,null,null,null,null,null,null,46211,46212,46213,46214,46215,46217,46218,46219,46220,46221,46222,46223,46224,46225,46226,46227,46228,46229,46230,46231,46232,46233,46234,46235,46236,46238,46239,46240,46241,46242,46243,46245,46246,46247,46249,46250,46251,46253,46254,46255,46256,46257,46258,46259,46260,46262,46264,46266,46267,46268,46269,46270,46271,46273,46274,46275,46277,46278,46279,46281,46282,46283,46284,46285,46286,46287,46289,46290,46291,46292,46294,46295,46296,46297,46298,46299,46302,46303,46305,46306,46309,46311,46312,46313,46314,46315,46318,46320,46322,46323,46324,46325,46326,46327,46329,46330,46331,46332,46333,46334,46335,46336,46337,46338,46339,46340,46341,46342,46343,46344,46345,46346,46347,46348,46349,46350,46351,46352,46353,46354,46355,46358,46359,46361,46362,46365,46366,46367,46368,46369,46370,46371,46374,46379,46380,46381,46382,46383,46386,46387,46389,46390,46391,46393,46394,46395,46396,46397,46398,46399,46402,46406,null,null,null,null,null,null,46407,46408,46409,46410,46414,46415,46417,46418,46419,46421,46422,46423,46424,46425,46426,46427,46430,46434,46435,46436,46437,46438,46439,46440,46441,46442,null,null,null,null,null,null,46443,46444,46445,46446,46447,46448,46449,46450,46451,46452,46453,46454,46455,46456,46457,46458,46459,46460,46461,46462,46463,46464,46465,46466,46467,46468,46469,46470,46471,46472,46473,46474,46475,46476,46477,46478,46479,46480,46481,46482,46483,46484,46485,46486,46487,46488,46489,46490,46491,46492,46493,46494,46495,46498,46499,46501,46502,46503,46505,46508,46509,46510,46511,46514,46518,46519,46520,46521,46522,46526,46527,46529,46530,46531,46533,46534,46535,46536,46537,46538,46539,46542,46546,46547,46548,46549,46550,46551,46553,46554,46555,46556,46557,46558,46559,46560,46561,46562,46563,46564,46565,46566,46567,46568,46569,46570,46571,46573,46574,46575,46576,46577,46578,46579,46580,46581,46582,46583,46584,46585,46586,46587,46588,46589,46590,46591,46592,46593,46594,46595,46596,46597,46598,46599,46600,46601,46602,46603,46604,46605,46606,46607,46610,46611,46613,46614,46615,46617,46618,46619,46620,46621,null,null,null,null,null,null,46622,46623,46624,46625,46626,46627,46628,46630,46631,46632,46633,46634,46635,46637,46638,46639,46640,46641,46642,46643,46645,46646,46647,46648,46649,46650,null,null,null,null,null,null,46651,46652,46653,46654,46655,46656,46657,46658,46659,46660,46661,46662,46663,46665,46666,46667,46668,46669,46670,46671,46672,46673,46674,46675,46676,46677,46678,46679,46680,46681,46682,46683,46684,46685,46686,46687,46688,46689,46690,46691,46693,46694,46695,46697,46698,46699,46700,46701,46702,46703,46704,46705,46706,46707,46708,46709,46710,46711,46712,46713,46714,46715,46716,46717,46718,46719,46720,46721,46722,46723,46724,46725,46726,46727,46728,46729,46730,46731,46732,46733,46734,46735,46736,46737,46738,46739,46740,46741,46742,46743,46744,46745,46746,46747,46750,46751,46753,46754,46755,46757,46758,46759,46760,46761,46762,46765,46766,46767,46768,46770,46771,46772,46773,46774,46775,46776,46777,46778,46779,46780,46781,46782,46783,46784,46785,46786,46787,46788,46789,46790,46791,46792,46793,46794,46795,46796,46797,46798,46799,46800,46801,46802,46803,46805,46806,46807,46808,46809,46810,46811,46812,46813,null,null,null,null,null,null,46814,46815,46816,46817,46818,46819,46820,46821,46822,46823,46824,46825,46826,46827,46828,46829,46830,46831,46833,46834,46835,46837,46838,46839,46841,46842,null,null,null,null,null,null,46843,46844,46845,46846,46847,46850,46851,46852,46854,46855,46856,46857,46858,46859,46860,46861,46862,46863,46864,46865,46866,46867,46868,46869,46870,46871,46872,46873,46874,46875,46876,46877,46878,46879,46880,46881,46882,46883,46884,46885,46886,46887,46890,46891,46893,46894,46897,46898,46899,46900,46901,46902,46903,46906,46908,46909,46910,46911,46912,46913,46914,46915,46917,46918,46919,46921,46922,46923,46925,46926,46927,46928,46929,46930,46931,46934,46935,46936,46937,46938,46939,46940,46941,46942,46943,46945,46946,46947,46949,46950,46951,46953,46954,46955,46956,46957,46958,46959,46962,46964,46966,46967,46968,46969,46970,46971,46974,46975,46977,46978,46979,46981,46982,46983,46984,46985,46986,46987,46990,46995,46996,46997,47002,47003,47005,47006,47007,47009,47010,47011,47012,47013,47014,47015,47018,47022,47023,47024,47025,47026,47027,47030,47031,47033,47034,47035,47036,47037,47038,47039,47040,47041,null,null,null,null,null,null,47042,47043,47044,47045,47046,47048,47050,47051,47052,47053,47054,47055,47056,47057,47058,47059,47060,47061,47062,47063,47064,47065,47066,47067,47068,47069,null,null,null,null,null,null,47070,47071,47072,47073,47074,47075,47076,47077,47078,47079,47080,47081,47082,47083,47086,47087,47089,47090,47091,47093,47094,47095,47096,47097,47098,47099,47102,47106,47107,47108,47109,47110,47114,47115,47117,47118,47119,47121,47122,47123,47124,47125,47126,47127,47130,47132,47134,47135,47136,47137,47138,47139,47142,47143,47145,47146,47147,47149,47150,47151,47152,47153,47154,47155,47158,47162,47163,47164,47165,47166,47167,47169,47170,47171,47173,47174,47175,47176,47177,47178,47179,47180,47181,47182,47183,47184,47186,47188,47189,47190,47191,47192,47193,47194,47195,47198,47199,47201,47202,47203,47205,47206,47207,47208,47209,47210,47211,47214,47216,47218,47219,47220,47221,47222,47223,47225,47226,47227,47229,47230,47231,47232,47233,47234,47235,47236,47237,47238,47239,47240,47241,47242,47243,47244,47246,47247,47248,47249,47250,47251,47252,47253,47254,47255,47256,47257,47258,47259,47260,47261,47262,47263,null,null,null,null,null,null,47264,47265,47266,47267,47268,47269,47270,47271,47273,47274,47275,47276,47277,47278,47279,47281,47282,47283,47285,47286,47287,47289,47290,47291,47292,47293,null,null,null,null,null,null,47294,47295,47298,47300,47302,47303,47304,47305,47306,47307,47309,47310,47311,47313,47314,47315,47317,47318,47319,47320,47321,47322,47323,47324,47326,47328,47330,47331,47332,47333,47334,47335,47338,47339,47341,47342,47343,47345,47346,47347,47348,47349,47350,47351,47354,47356,47358,47359,47360,47361,47362,47363,47365,47366,47367,47368,47369,47370,47371,47372,47373,47374,47375,47376,47377,47378,47379,47380,47381,47382,47383,47385,47386,47387,47388,47389,47390,47391,47393,47394,47395,47396,47397,47398,47399,47400,47401,47402,47403,47404,47405,47406,47407,47408,47409,47410,47411,47412,47413,47414,47415,47416,47417,47418,47419,47422,47423,47425,47426,47427,47429,47430,47431,47432,47433,47434,47435,47437,47438,47440,47442,47443,47444,47445,47446,47447,47450,47451,47453,47454,47455,47457,47458,47459,47460,47461,47462,47463,47466,47468,47470,47471,47472,47473,47474,47475,47478,47479,47481,47482,47483,47485,null,null,null,null,null,null,47486,47487,47488,47489,47490,47491,47494,47496,47499,47500,47503,47504,47505,47506,47507,47508,47509,47510,47511,47512,47513,47514,47515,47516,47517,47518,null,null,null,null,null,null,47519,47520,47521,47522,47523,47524,47525,47526,47527,47528,47529,47530,47531,47534,47535,47537,47538,47539,47541,47542,47543,47544,47545,47546,47547,47550,47552,47554,47555,47556,47557,47558,47559,47562,47563,47565,47571,47572,47573,47574,47575,47578,47580,47583,47584,47586,47590,47591,47593,47594,47595,47597,47598,47599,47600,47601,47602,47603,47606,47611,47612,47613,47614,47615,47618,47619,47620,47621,47622,47623,47625,47626,47627,47628,47629,47630,47631,47632,47633,47634,47635,47636,47638,47639,47640,47641,47642,47643,47644,47645,47646,47647,47648,47649,47650,47651,47652,47653,47654,47655,47656,47657,47658,47659,47660,47661,47662,47663,47664,47665,47666,47667,47668,47669,47670,47671,47674,47675,47677,47678,47679,47681,47683,47684,47685,47686,47687,47690,47692,47695,47696,47697,47698,47702,47703,47705,47706,47707,47709,47710,47711,47712,47713,47714,47715,47718,47722,47723,47724,47725,47726,47727,null,null,null,null,null,null,47730,47731,47733,47734,47735,47737,47738,47739,47740,47741,47742,47743,47744,47745,47746,47750,47752,47753,47754,47755,47757,47758,47759,47760,47761,47762,null,null,null,null,null,null,47763,47764,47765,47766,47767,47768,47769,47770,47771,47772,47773,47774,47775,47776,47777,47778,47779,47780,47781,47782,47783,47786,47789,47790,47791,47793,47795,47796,47797,47798,47799,47802,47804,47806,47807,47808,47809,47810,47811,47813,47814,47815,47817,47818,47819,47820,47821,47822,47823,47824,47825,47826,47827,47828,47829,47830,47831,47834,47835,47836,47837,47838,47839,47840,47841,47842,47843,47844,47845,47846,47847,47848,47849,47850,47851,47852,47853,47854,47855,47856,47857,47858,47859,47860,47861,47862,47863,47864,47865,47866,47867,47869,47870,47871,47873,47874,47875,47877,47878,47879,47880,47881,47882,47883,47884,47886,47888,47890,47891,47892,47893,47894,47895,47897,47898,47899,47901,47902,47903,47905,47906,47907,47908,47909,47910,47911,47912,47914,47916,47917,47918,47919,47920,47921,47922,47923,47927,47929,47930,47935,47936,47937,47938,47939,47942,47944,47946,47947,47948,47950,47953,47954,null,null,null,null,null,null,47955,47957,47958,47959,47961,47962,47963,47964,47965,47966,47967,47968,47970,47972,47973,47974,47975,47976,47977,47978,47979,47981,47982,47983,47984,47985,null,null,null,null,null,null,47986,47987,47988,47989,47990,47991,47992,47993,47994,47995,47996,47997,47998,47999,48000,48001,48002,48003,48004,48005,48006,48007,48009,48010,48011,48013,48014,48015,48017,48018,48019,48020,48021,48022,48023,48024,48025,48026,48027,48028,48029,48030,48031,48032,48033,48034,48035,48037,48038,48039,48041,48042,48043,48045,48046,48047,48048,48049,48050,48051,48053,48054,48056,48057,48058,48059,48060,48061,48062,48063,48065,48066,48067,48069,48070,48071,48073,48074,48075,48076,48077,48078,48079,48081,48082,48084,48085,48086,48087,48088,48089,48090,48091,48092,48093,48094,48095,48096,48097,48098,48099,48100,48101,48102,48103,48104,48105,48106,48107,48108,48109,48110,48111,48112,48113,48114,48115,48116,48117,48118,48119,48122,48123,48125,48126,48129,48131,48132,48133,48134,48135,48138,48142,48144,48146,48147,48153,48154,48160,48161,48162,48163,48166,48168,48170,48171,48172,48174,48175,48178,48179,48181,null,null,null,null,null,null,48182,48183,48185,48186,48187,48188,48189,48190,48191,48194,48198,48199,48200,48202,48203,48206,48207,48209,48210,48211,48212,48213,48214,48215,48216,48217,null,null,null,null,null,null,48218,48219,48220,48222,48223,48224,48225,48226,48227,48228,48229,48230,48231,48232,48233,48234,48235,48236,48237,48238,48239,48240,48241,48242,48243,48244,48245,48246,48247,48248,48249,48250,48251,48252,48253,48254,48255,48256,48257,48258,48259,48262,48263,48265,48266,48269,48271,48272,48273,48274,48275,48278,48280,48283,48284,48285,48286,48287,48290,48291,48293,48294,48297,48298,48299,48300,48301,48302,48303,48306,48310,48311,48312,48313,48314,48315,48318,48319,48321,48322,48323,48325,48326,48327,48328,48329,48330,48331,48332,48334,48338,48339,48340,48342,48343,48345,48346,48347,48349,48350,48351,48352,48353,48354,48355,48356,48357,48358,48359,48360,48361,48362,48363,48364,48365,48366,48367,48368,48369,48370,48371,48375,48377,48378,48379,48381,48382,48383,48384,48385,48386,48387,48390,48392,48394,48395,48396,48397,48398,48399,48401,48402,48403,48405,48406,48407,48408,48409,48410,48411,48412,48413,null,null,null,null,null,null,48414,48415,48416,48417,48418,48419,48421,48422,48423,48424,48425,48426,48427,48429,48430,48431,48432,48433,48434,48435,48436,48437,48438,48439,48440,48441,null,null,null,null,null,null,48442,48443,48444,48445,48446,48447,48449,48450,48451,48452,48453,48454,48455,48458,48459,48461,48462,48463,48465,48466,48467,48468,48469,48470,48471,48474,48475,48476,48477,48478,48479,48480,48481,48482,48483,48485,48486,48487,48489,48490,48491,48492,48493,48494,48495,48496,48497,48498,48499,48500,48501,48502,48503,48504,48505,48506,48507,48508,48509,48510,48511,48514,48515,48517,48518,48523,48524,48525,48526,48527,48530,48532,48534,48535,48536,48539,48541,48542,48543,48544,48545,48546,48547,48549,48550,48551,48552,48553,48554,48555,48556,48557,48558,48559,48561,48562,48563,48564,48565,48566,48567,48569,48570,48571,48572,48573,48574,48575,48576,48577,48578,48579,48580,48581,48582,48583,48584,48585,48586,48587,48588,48589,48590,48591,48592,48593,48594,48595,48598,48599,48601,48602,48603,48605,48606,48607,48608,48609,48610,48611,48612,48613,48614,48615,48616,48618,48619,48620,48621,48622,48623,48625,null,null,null,null,null,null,48626,48627,48629,48630,48631,48633,48634,48635,48636,48637,48638,48639,48641,48642,48644,48646,48647,48648,48649,48650,48651,48654,48655,48657,48658,48659,null,null,null,null,null,null,48661,48662,48663,48664,48665,48666,48667,48670,48672,48673,48674,48675,48676,48677,48678,48679,48680,48681,48682,48683,48684,48685,48686,48687,48688,48689,48690,48691,48692,48693,48694,48695,48696,48697,48698,48699,48700,48701,48702,48703,48704,48705,48706,48707,48710,48711,48713,48714,48715,48717,48719,48720,48721,48722,48723,48726,48728,48732,48733,48734,48735,48738,48739,48741,48742,48743,48745,48747,48748,48749,48750,48751,48754,48758,48759,48760,48761,48762,48766,48767,48769,48770,48771,48773,48774,48775,48776,48777,48778,48779,48782,48786,48787,48788,48789,48790,48791,48794,48795,48796,48797,48798,48799,48800,48801,48802,48803,48804,48805,48806,48807,48809,48810,48811,48812,48813,48814,48815,48816,48817,48818,48819,48820,48821,48822,48823,48824,48825,48826,48827,48828,48829,48830,48831,48832,48833,48834,48835,48836,48837,48838,48839,48840,48841,48842,48843,48844,48845,48846,48847,48850,48851,null,null,null,null,null,null,48853,48854,48857,48858,48859,48860,48861,48862,48863,48865,48866,48870,48871,48872,48873,48874,48875,48877,48878,48879,48880,48881,48882,48883,48884,48885,null,null,null,null,null,null,48886,48887,48888,48889,48890,48891,48892,48893,48894,48895,48896,48898,48899,48900,48901,48902,48903,48906,48907,48908,48909,48910,48911,48912,48913,48914,48915,48916,48917,48918,48919,48922,48926,48927,48928,48929,48930,48931,48932,48933,48934,48935,48936,48937,48938,48939,48940,48941,48942,48943,48944,48945,48946,48947,48948,48949,48950,48951,48952,48953,48954,48955,48956,48957,48958,48959,48962,48963,48965,48966,48967,48969,48970,48971,48972,48973,48974,48975,48978,48979,48980,48982,48983,48984,48985,48986,48987,48988,48989,48990,48991,48992,48993,48994,48995,48996,48997,48998,48999,49000,49001,49002,49003,49004,49005,49006,49007,49008,49009,49010,49011,49012,49013,49014,49015,49016,49017,49018,49019,49020,49021,49022,49023,49024,49025,49026,49027,49028,49029,49030,49031,49032,49033,49034,49035,49036,49037,49038,49039,49040,49041,49042,49043,49045,49046,49047,49048,49049,49050,49051,49052,49053,null,null,null,null,null,null,49054,49055,49056,49057,49058,49059,49060,49061,49062,49063,49064,49065,49066,49067,49068,49069,49070,49071,49073,49074,49075,49076,49077,49078,49079,49080,null,null,null,null,null,null,49081,49082,49083,49084,49085,49086,49087,49088,49089,49090,49091,49092,49094,49095,49096,49097,49098,49099,49102,49103,49105,49106,49107,49109,49110,49111,49112,49113,49114,49115,49117,49118,49120,49122,49123,49124,49125,49126,49127,49128,49129,49130,49131,49132,49133,49134,49135,49136,49137,49138,49139,49140,49141,49142,49143,49144,49145,49146,49147,49148,49149,49150,49151,49152,49153,49154,49155,49156,49157,49158,49159,49160,49161,49162,49163,49164,49165,49166,49167,49168,49169,49170,49171,49172,49173,49174,49175,49176,49177,49178,49179,49180,49181,49182,49183,49184,49185,49186,49187,49188,49189,49190,49191,49192,49193,49194,49195,49196,49197,49198,49199,49200,49201,49202,49203,49204,49205,49206,49207,49208,49209,49210,49211,49213,49214,49215,49216,49217,49218,49219,49220,49221,49222,49223,49224,49225,49226,49227,49228,49229,49230,49231,49232,49234,49235,49236,49237,49238,49239,49241,49242,49243,null,null,null,null,null,null,49245,49246,49247,49249,49250,49251,49252,49253,49254,49255,49258,49259,49260,49261,49262,49263,49264,49265,49266,49267,49268,49269,49270,49271,49272,49273,null,null,null,null,null,null,49274,49275,49276,49277,49278,49279,49280,49281,49282,49283,49284,49285,49286,49287,49288,49289,49290,49291,49292,49293,49294,49295,49298,49299,49301,49302,49303,49305,49306,49307,49308,49309,49310,49311,49314,49316,49318,49319,49320,49321,49322,49323,49326,49329,49330,49335,49336,49337,49338,49339,49342,49346,49347,49348,49350,49351,49354,49355,49357,49358,49359,49361,49362,49363,49364,49365,49366,49367,49370,49374,49375,49376,49377,49378,49379,49382,49383,49385,49386,49387,49389,49390,49391,49392,49393,49394,49395,49398,49400,49402,49403,49404,49405,49406,49407,49409,49410,49411,49413,49414,49415,49417,49418,49419,49420,49421,49422,49423,49425,49426,49427,49428,49430,49431,49432,49433,49434,49435,49441,49442,49445,49448,49449,49450,49451,49454,49458,49459,49460,49461,49463,49466,49467,49469,49470,49471,49473,49474,49475,49476,49477,49478,49479,49482,49486,49487,49488,49489,49490,49491,49494,49495,null,null,null,null,null,null,49497,49498,49499,49501,49502,49503,49504,49505,49506,49507,49510,49514,49515,49516,49517,49518,49519,49521,49522,49523,49525,49526,49527,49529,49530,49531,null,null,null,null,null,null,49532,49533,49534,49535,49536,49537,49538,49539,49540,49542,49543,49544,49545,49546,49547,49551,49553,49554,49555,49557,49559,49560,49561,49562,49563,49566,49568,49570,49571,49572,49574,49575,49578,49579,49581,49582,49583,49585,49586,49587,49588,49589,49590,49591,49592,49593,49594,49595,49596,49598,49599,49600,49601,49602,49603,49605,49606,49607,49609,49610,49611,49613,49614,49615,49616,49617,49618,49619,49621,49622,49625,49626,49627,49628,49629,49630,49631,49633,49634,49635,49637,49638,49639,49641,49642,49643,49644,49645,49646,49647,49650,49652,49653,49654,49655,49656,49657,49658,49659,49662,49663,49665,49666,49667,49669,49670,49671,49672,49673,49674,49675,49678,49680,49682,49683,49684,49685,49686,49687,49690,49691,49693,49694,49697,49698,49699,49700,49701,49702,49703,49706,49708,49710,49712,49715,49717,49718,49719,49720,49721,49722,49723,49724,49725,49726,49727,49728,49729,49730,49731,49732,49733,null,null,null,null,null,null,49734,49735,49737,49738,49739,49740,49741,49742,49743,49746,49747,49749,49750,49751,49753,49754,49755,49756,49757,49758,49759,49761,49762,49763,49764,49766,null,null,null,null,null,null,49767,49768,49769,49770,49771,49774,49775,49777,49778,49779,49781,49782,49783,49784,49785,49786,49787,49790,49792,49794,49795,49796,49797,49798,49799,49802,49803,49804,49805,49806,49807,49809,49810,49811,49812,49813,49814,49815,49817,49818,49820,49822,49823,49824,49825,49826,49827,49830,49831,49833,49834,49835,49838,49839,49840,49841,49842,49843,49846,49848,49850,49851,49852,49853,49854,49855,49856,49857,49858,49859,49860,49861,49862,49863,49864,49865,49866,49867,49868,49869,49870,49871,49872,49873,49874,49875,49876,49877,49878,49879,49880,49881,49882,49883,49886,49887,49889,49890,49893,49894,49895,49896,49897,49898,49902,49904,49906,49907,49908,49909,49911,49914,49917,49918,49919,49921,49922,49923,49924,49925,49926,49927,49930,49931,49934,49935,49936,49937,49938,49942,49943,49945,49946,49947,49949,49950,49951,49952,49953,49954,49955,49958,49959,49962,49963,49964,49965,49966,49967,49968,49969,49970,null,null,null,null,null,null,49971,49972,49973,49974,49975,49976,49977,49978,49979,49980,49981,49982,49983,49984,49985,49986,49987,49988,49990,49991,49992,49993,49994,49995,49996,49997,null,null,null,null,null,null,49998,49999,50000,50001,50002,50003,50004,50005,50006,50007,50008,50009,50010,50011,50012,50013,50014,50015,50016,50017,50018,50019,50020,50021,50022,50023,50026,50027,50029,50030,50031,50033,50035,50036,50037,50038,50039,50042,50043,50046,50047,50048,50049,50050,50051,50053,50054,50055,50057,50058,50059,50061,50062,50063,50064,50065,50066,50067,50068,50069,50070,50071,50072,50073,50074,50075,50076,50077,50078,50079,50080,50081,50082,50083,50084,50085,50086,50087,50088,50089,50090,50091,50092,50093,50094,50095,50096,50097,50098,50099,50100,50101,50102,50103,50104,50105,50106,50107,50108,50109,50110,50111,50113,50114,50115,50116,50117,50118,50119,50120,50121,50122,50123,50124,50125,50126,50127,50128,50129,50130,50131,50132,50133,50134,50135,50138,50139,50141,50142,50145,50147,50148,50149,50150,50151,50154,50155,50156,50158,50159,50160,50161,50162,50163,50166,50167,50169,50170,50171,50172,50173,50174,null,null,null,null,null,null,50175,50176,50177,50178,50179,50180,50181,50182,50183,50185,50186,50187,50188,50189,50190,50191,50193,50194,50195,50196,50197,50198,50199,50200,50201,50202,null,null,null,null,null,null,50203,50204,50205,50206,50207,50208,50209,50210,50211,50213,50214,50215,50216,50217,50218,50219,50221,50222,50223,50225,50226,50227,50229,50230,50231,50232,50233,50234,50235,50238,50239,50240,50241,50242,50243,50244,50245,50246,50247,50249,50250,50251,50252,50253,50254,50255,50256,50257,50258,50259,50260,50261,50262,50263,50264,50265,50266,50267,50268,50269,50270,50271,50272,50273,50274,50275,50278,50279,50281,50282,50283,50285,50286,50287,50288,50289,50290,50291,50294,50295,50296,50298,50299,50300,50301,50302,50303,50305,50306,50307,50308,50309,50310,50311,50312,50313,50314,50315,50316,50317,50318,50319,50320,50321,50322,50323,50325,50326,50327,50328,50329,50330,50331,50333,50334,50335,50336,50337,50338,50339,50340,50341,50342,50343,50344,50345,50346,50347,50348,50349,50350,50351,50352,50353,50354,50355,50356,50357,50358,50359,50361,50362,50363,50365,50366,50367,50368,50369,50370,50371,50372,50373,null,null,null,null,null,null,50374,50375,50376,50377,50378,50379,50380,50381,50382,50383,50384,50385,50386,50387,50388,50389,50390,50391,50392,50393,50394,50395,50396,50397,50398,50399,null,null,null,null,null,null,50400,50401,50402,50403,50404,50405,50406,50407,50408,50410,50411,50412,50413,50414,50415,50418,50419,50421,50422,50423,50425,50427,50428,50429,50430,50434,50435,50436,50437,50438,50439,50440,50441,50442,50443,50445,50446,50447,50449,50450,50451,50453,50454,50455,50456,50457,50458,50459,50461,50462,50463,50464,50465,50466,50467,50468,50469,50470,50471,50474,50475,50477,50478,50479,50481,50482,50483,50484,50485,50486,50487,50490,50492,50494,50495,50496,50497,50498,50499,50502,50503,50507,50511,50512,50513,50514,50518,50522,50523,50524,50527,50530,50531,50533,50534,50535,50537,50538,50539,50540,50541,50542,50543,50546,50550,50551,50552,50553,50554,50555,50558,50559,50561,50562,50563,50565,50566,50568,50569,50570,50571,50574,50576,50578,50579,50580,50582,50585,50586,50587,50589,50590,50591,50593,50594,50595,50596,50597,50598,50599,50600,50602,50603,50604,50605,50606,50607,50608,50609,50610,50611,50614,null,null,null,null,null,null,50615,50618,50623,50624,50625,50626,50627,50635,50637,50639,50642,50643,50645,50646,50647,50649,50650,50651,50652,50653,50654,50655,50658,50660,50662,50663,null,null,null,null,null,null,50664,50665,50666,50667,50671,50673,50674,50675,50677,50680,50681,50682,50683,50690,50691,50692,50697,50698,50699,50701,50702,50703,50705,50706,50707,50708,50709,50710,50711,50714,50717,50718,50719,50720,50721,50722,50723,50726,50727,50729,50730,50731,50735,50737,50738,50742,50744,50746,50748,50749,50750,50751,50754,50755,50757,50758,50759,50761,50762,50763,50764,50765,50766,50767,50770,50774,50775,50776,50777,50778,50779,50782,50783,50785,50786,50787,50788,50789,50790,50791,50792,50793,50794,50795,50797,50798,50800,50802,50803,50804,50805,50806,50807,50810,50811,50813,50814,50815,50817,50818,50819,50820,50821,50822,50823,50826,50828,50830,50831,50832,50833,50834,50835,50838,50839,50841,50842,50843,50845,50846,50847,50848,50849,50850,50851,50854,50856,50858,50859,50860,50861,50862,50863,50866,50867,50869,50870,50871,50875,50876,50877,50878,50879,50882,50884,50886,50887,50888,50889,50890,50891,50894,null,null,null,null,null,null,50895,50897,50898,50899,50901,50902,50903,50904,50905,50906,50907,50910,50911,50914,50915,50916,50917,50918,50919,50922,50923,50925,50926,50927,50929,50930,null,null,null,null,null,null,50931,50932,50933,50934,50935,50938,50939,50940,50942,50943,50944,50945,50946,50947,50950,50951,50953,50954,50955,50957,50958,50959,50960,50961,50962,50963,50966,50968,50970,50971,50972,50973,50974,50975,50978,50979,50981,50982,50983,50985,50986,50987,50988,50989,50990,50991,50994,50996,50998,51000,51001,51002,51003,51006,51007,51009,51010,51011,51013,51014,51015,51016,51017,51019,51022,51024,51033,51034,51035,51037,51038,51039,51041,51042,51043,51044,51045,51046,51047,51049,51050,51052,51053,51054,51055,51056,51057,51058,51059,51062,51063,51065,51066,51067,51071,51072,51073,51074,51078,51083,51084,51085,51087,51090,51091,51093,51097,51099,51100,51101,51102,51103,51106,51111,51112,51113,51114,51115,51118,51119,51121,51122,51123,51125,51126,51127,51128,51129,51130,51131,51134,51138,51139,51140,51141,51142,51143,51146,51147,51149,51151,51153,51154,51155,51156,51157,51158,51159,51161,51162,51163,51164,null,null,null,null,null,null,51166,51167,51168,51169,51170,51171,51173,51174,51175,51177,51178,51179,51181,51182,51183,51184,51185,51186,51187,51188,51189,51190,51191,51192,51193,51194,null,null,null,null,null,null,51195,51196,51197,51198,51199,51202,51203,51205,51206,51207,51209,51211,51212,51213,51214,51215,51218,51220,51223,51224,51225,51226,51227,51230,51231,51233,51234,51235,51237,51238,51239,51240,51241,51242,51243,51246,51248,51250,51251,51252,51253,51254,51255,51257,51258,51259,51261,51262,51263,51265,51266,51267,51268,51269,51270,51271,51274,51275,51278,51279,51280,51281,51282,51283,51285,51286,51287,51288,51289,51290,51291,51292,51293,51294,51295,51296,51297,51298,51299,51300,51301,51302,51303,51304,51305,51306,51307,51308,51309,51310,51311,51314,51315,51317,51318,51319,51321,51323,51324,51325,51326,51327,51330,51332,51336,51337,51338,51342,51343,51344,51345,51346,51347,51349,51350,51351,51352,51353,51354,51355,51356,51358,51360,51362,51363,51364,51365,51366,51367,51369,51370,51371,51372,51373,51374,51375,51376,51377,51378,51379,51380,51381,51382,51383,51384,51385,51386,51387,51390,51391,51392,51393,null,null,null,null,null,null,51394,51395,51397,51398,51399,51401,51402,51403,51405,51406,51407,51408,51409,51410,51411,51414,51416,51418,51419,51420,51421,51422,51423,51426,51427,51429,null,null,null,null,null,null,51430,51431,51432,51433,51434,51435,51436,51437,51438,51439,51440,51441,51442,51443,51444,51446,51447,51448,51449,51450,51451,51454,51455,51457,51458,51459,51463,51464,51465,51466,51467,51470,12288,12289,12290,183,8229,8230,168,12291,173,8213,8741,65340,8764,8216,8217,8220,8221,12308,12309,12296,12297,12298,12299,12300,12301,12302,12303,12304,12305,177,215,247,8800,8804,8805,8734,8756,176,8242,8243,8451,8491,65504,65505,65509,9794,9792,8736,8869,8978,8706,8711,8801,8786,167,8251,9734,9733,9675,9679,9678,9671,9670,9633,9632,9651,9650,9661,9660,8594,8592,8593,8595,8596,12307,8810,8811,8730,8765,8733,8757,8747,8748,8712,8715,8838,8839,8834,8835,8746,8745,8743,8744,65506,51472,51474,51475,51476,51477,51478,51479,51481,51482,51483,51484,51485,51486,51487,51488,51489,51490,51491,51492,51493,51494,51495,51496,51497,51498,51499,null,null,null,null,null,null,51501,51502,51503,51504,51505,51506,51507,51509,51510,51511,51512,51513,51514,51515,51516,51517,51518,51519,51520,51521,51522,51523,51524,51525,51526,51527,null,null,null,null,null,null,51528,51529,51530,51531,51532,51533,51534,51535,51538,51539,51541,51542,51543,51545,51546,51547,51548,51549,51550,51551,51554,51556,51557,51558,51559,51560,51561,51562,51563,51565,51566,51567,8658,8660,8704,8707,180,65374,711,728,733,730,729,184,731,161,191,720,8750,8721,8719,164,8457,8240,9665,9664,9655,9654,9828,9824,9825,9829,9831,9827,8857,9672,9635,9680,9681,9618,9636,9637,9640,9639,9638,9641,9832,9743,9742,9756,9758,182,8224,8225,8597,8599,8601,8598,8600,9837,9833,9834,9836,12927,12828,8470,13255,8482,13250,13272,8481,8364,174,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,51569,51570,51571,51573,51574,51575,51576,51577,51578,51579,51581,51582,51583,51584,51585,51586,51587,51588,51589,51590,51591,51594,51595,51597,51598,51599,null,null,null,null,null,null,51601,51602,51603,51604,51605,51606,51607,51610,51612,51614,51615,51616,51617,51618,51619,51620,51621,51622,51623,51624,51625,51626,51627,51628,51629,51630,null,null,null,null,null,null,51631,51632,51633,51634,51635,51636,51637,51638,51639,51640,51641,51642,51643,51644,51645,51646,51647,51650,51651,51653,51654,51657,51659,51660,51661,51662,51663,51666,51668,51671,51672,51675,65281,65282,65283,65284,65285,65286,65287,65288,65289,65290,65291,65292,65293,65294,65295,65296,65297,65298,65299,65300,65301,65302,65303,65304,65305,65306,65307,65308,65309,65310,65311,65312,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,65339,65510,65341,65342,65343,65344,65345,65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,65371,65372,65373,65507,51678,51679,51681,51683,51685,51686,51688,51689,51690,51691,51694,51698,51699,51700,51701,51702,51703,51706,51707,51709,51710,51711,51713,51714,51715,51716,null,null,null,null,null,null,51717,51718,51719,51722,51726,51727,51728,51729,51730,51731,51733,51734,51735,51737,51738,51739,51740,51741,51742,51743,51744,51745,51746,51747,51748,51749,null,null,null,null,null,null,51750,51751,51752,51754,51755,51756,51757,51758,51759,51760,51761,51762,51763,51764,51765,51766,51767,51768,51769,51770,51771,51772,51773,51774,51775,51776,51777,51778,51779,51780,51781,51782,12593,12594,12595,12596,12597,12598,12599,12600,12601,12602,12603,12604,12605,12606,12607,12608,12609,12610,12611,12612,12613,12614,12615,12616,12617,12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632,12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,12647,12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,12662,12663,12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679,12680,12681,12682,12683,12684,12685,12686,51783,51784,51785,51786,51787,51790,51791,51793,51794,51795,51797,51798,51799,51800,51801,51802,51803,51806,51810,51811,51812,51813,51814,51815,51817,51818,null,null,null,null,null,null,51819,51820,51821,51822,51823,51824,51825,51826,51827,51828,51829,51830,51831,51832,51833,51834,51835,51836,51838,51839,51840,51841,51842,51843,51845,51846,null,null,null,null,null,null,51847,51848,51849,51850,51851,51852,51853,51854,51855,51856,51857,51858,51859,51860,51861,51862,51863,51865,51866,51867,51868,51869,51870,51871,51872,51873,51874,51875,51876,51877,51878,51879,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,null,null,null,null,null,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,null,null,null,null,null,null,null,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,null,null,null,null,null,null,null,null,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,null,null,null,null,null,null,51880,51881,51882,51883,51884,51885,51886,51887,51888,51889,51890,51891,51892,51893,51894,51895,51896,51897,51898,51899,51902,51903,51905,51906,51907,51909,null,null,null,null,null,null,51910,51911,51912,51913,51914,51915,51918,51920,51922,51924,51925,51926,51927,51930,51931,51932,51933,51934,51935,51937,51938,51939,51940,51941,51942,51943,null,null,null,null,null,null,51944,51945,51946,51947,51949,51950,51951,51952,51953,51954,51955,51957,51958,51959,51960,51961,51962,51963,51964,51965,51966,51967,51968,51969,51970,51971,51972,51973,51974,51975,51977,51978,9472,9474,9484,9488,9496,9492,9500,9516,9508,9524,9532,9473,9475,9487,9491,9499,9495,9507,9523,9515,9531,9547,9504,9519,9512,9527,9535,9501,9520,9509,9528,9538,9490,9489,9498,9497,9494,9493,9486,9485,9502,9503,9505,9506,9510,9511,9513,9514,9517,9518,9521,9522,9525,9526,9529,9530,9533,9534,9536,9537,9539,9540,9541,9542,9543,9544,9545,9546,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,51979,51980,51981,51982,51983,51985,51986,51987,51989,51990,51991,51993,51994,51995,51996,51997,51998,51999,52002,52003,52004,52005,52006,52007,52008,52009,null,null,null,null,null,null,52010,52011,52012,52013,52014,52015,52016,52017,52018,52019,52020,52021,52022,52023,52024,52025,52026,52027,52028,52029,52030,52031,52032,52034,52035,52036,null,null,null,null,null,null,52037,52038,52039,52042,52043,52045,52046,52047,52049,52050,52051,52052,52053,52054,52055,52058,52059,52060,52062,52063,52064,52065,52066,52067,52069,52070,52071,52072,52073,52074,52075,52076,13205,13206,13207,8467,13208,13252,13219,13220,13221,13222,13209,13210,13211,13212,13213,13214,13215,13216,13217,13218,13258,13197,13198,13199,13263,13192,13193,13256,13223,13224,13232,13233,13234,13235,13236,13237,13238,13239,13240,13241,13184,13185,13186,13187,13188,13242,13243,13244,13245,13246,13247,13200,13201,13202,13203,13204,8486,13248,13249,13194,13195,13196,13270,13253,13229,13230,13231,13275,13225,13226,13227,13228,13277,13264,13267,13251,13257,13276,13254,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,52077,52078,52079,52080,52081,52082,52083,52084,52085,52086,52087,52090,52091,52092,52093,52094,52095,52096,52097,52098,52099,52100,52101,52102,52103,52104,null,null,null,null,null,null,52105,52106,52107,52108,52109,52110,52111,52112,52113,52114,52115,52116,52117,52118,52119,52120,52121,52122,52123,52125,52126,52127,52128,52129,52130,52131,null,null,null,null,null,null,52132,52133,52134,52135,52136,52137,52138,52139,52140,52141,52142,52143,52144,52145,52146,52147,52148,52149,52150,52151,52153,52154,52155,52156,52157,52158,52159,52160,52161,52162,52163,52164,198,208,170,294,null,306,null,319,321,216,338,186,222,358,330,null,12896,12897,12898,12899,12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,12910,12911,12912,12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,12923,9424,9425,9426,9427,9428,9429,9430,9431,9432,9433,9434,9435,9436,9437,9438,9439,9440,9441,9442,9443,9444,9445,9446,9447,9448,9449,9312,9313,9314,9315,9316,9317,9318,9319,9320,9321,9322,9323,9324,9325,9326,189,8531,8532,188,190,8539,8540,8541,8542,52165,52166,52167,52168,52169,52170,52171,52172,52173,52174,52175,52176,52177,52178,52179,52181,52182,52183,52184,52185,52186,52187,52188,52189,52190,52191,null,null,null,null,null,null,52192,52193,52194,52195,52197,52198,52200,52202,52203,52204,52205,52206,52207,52208,52209,52210,52211,52212,52213,52214,52215,52216,52217,52218,52219,52220,null,null,null,null,null,null,52221,52222,52223,52224,52225,52226,52227,52228,52229,52230,52231,52232,52233,52234,52235,52238,52239,52241,52242,52243,52245,52246,52247,52248,52249,52250,52251,52254,52255,52256,52259,52260,230,273,240,295,305,307,312,320,322,248,339,223,254,359,331,329,12800,12801,12802,12803,12804,12805,12806,12807,12808,12809,12810,12811,12812,12813,12814,12815,12816,12817,12818,12819,12820,12821,12822,12823,12824,12825,12826,12827,9372,9373,9374,9375,9376,9377,9378,9379,9380,9381,9382,9383,9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,9395,9396,9397,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345,9346,185,178,179,8308,8319,8321,8322,8323,8324,52261,52262,52266,52267,52269,52271,52273,52274,52275,52276,52277,52278,52279,52282,52287,52288,52289,52290,52291,52294,52295,52297,52298,52299,52301,52302,null,null,null,null,null,null,52303,52304,52305,52306,52307,52310,52314,52315,52316,52317,52318,52319,52321,52322,52323,52325,52327,52329,52330,52331,52332,52333,52334,52335,52337,52338,null,null,null,null,null,null,52339,52340,52342,52343,52344,52345,52346,52347,52348,52349,52350,52351,52352,52353,52354,52355,52356,52357,52358,52359,52360,52361,52362,52363,52364,52365,52366,52367,52368,52369,52370,52371,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,null,null,null,null,null,null,null,null,null,null,null,52372,52373,52374,52375,52378,52379,52381,52382,52383,52385,52386,52387,52388,52389,52390,52391,52394,52398,52399,52400,52401,52402,52403,52406,52407,52409,null,null,null,null,null,null,52410,52411,52413,52414,52415,52416,52417,52418,52419,52422,52424,52426,52427,52428,52429,52430,52431,52433,52434,52435,52437,52438,52439,52440,52441,52442,null,null,null,null,null,null,52443,52444,52445,52446,52447,52448,52449,52450,52451,52453,52454,52455,52456,52457,52458,52459,52461,52462,52463,52465,52466,52467,52468,52469,52470,52471,52472,52473,52474,52475,52476,52477,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,null,null,null,null,null,null,null,null,52478,52479,52480,52482,52483,52484,52485,52486,52487,52490,52491,52493,52494,52495,52497,52498,52499,52500,52501,52502,52503,52506,52508,52510,52511,52512,null,null,null,null,null,null,52513,52514,52515,52517,52518,52519,52521,52522,52523,52525,52526,52527,52528,52529,52530,52531,52532,52533,52534,52535,52536,52538,52539,52540,52541,52542,null,null,null,null,null,null,52543,52544,52545,52546,52547,52548,52549,52550,52551,52552,52553,52554,52555,52556,52557,52558,52559,52560,52561,52562,52563,52564,52565,52566,52567,52568,52569,52570,52571,52573,52574,52575,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,1072,1073,1074,1075,1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,null,null,null,null,null,null,null,null,null,null,null,null,null,52577,52578,52579,52581,52582,52583,52584,52585,52586,52587,52590,52592,52594,52595,52596,52597,52598,52599,52601,52602,52603,52604,52605,52606,52607,52608,null,null,null,null,null,null,52609,52610,52611,52612,52613,52614,52615,52617,52618,52619,52620,52621,52622,52623,52624,52625,52626,52627,52630,52631,52633,52634,52635,52637,52638,52639,null,null,null,null,null,null,52640,52641,52642,52643,52646,52648,52650,52651,52652,52653,52654,52655,52657,52658,52659,52660,52661,52662,52663,52664,52665,52666,52667,52668,52669,52670,52671,52672,52673,52674,52675,52677,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,52678,52679,52680,52681,52682,52683,52685,52686,52687,52689,52690,52691,52692,52693,52694,52695,52696,52697,52698,52699,52700,52701,52702,52703,52704,52705,null,null,null,null,null,null,52706,52707,52708,52709,52710,52711,52713,52714,52715,52717,52718,52719,52721,52722,52723,52724,52725,52726,52727,52730,52732,52734,52735,52736,52737,52738,null,null,null,null,null,null,52739,52741,52742,52743,52745,52746,52747,52749,52750,52751,52752,52753,52754,52755,52757,52758,52759,52760,52762,52763,52764,52765,52766,52767,52770,52771,52773,52774,52775,52777,52778,52779,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,52780,52781,52782,52783,52786,52788,52790,52791,52792,52793,52794,52795,52796,52797,52798,52799,52800,52801,52802,52803,52804,52805,52806,52807,52808,52809,null,null,null,null,null,null,52810,52811,52812,52813,52814,52815,52816,52817,52818,52819,52820,52821,52822,52823,52826,52827,52829,52830,52834,52835,52836,52837,52838,52839,52842,52844,null,null,null,null,null,null,52846,52847,52848,52849,52850,52851,52854,52855,52857,52858,52859,52861,52862,52863,52864,52865,52866,52867,52870,52872,52874,52875,52876,52877,52878,52879,52882,52883,52885,52886,52887,52889,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,52890,52891,52892,52893,52894,52895,52898,52902,52903,52904,52905,52906,52907,52910,52911,52912,52913,52914,52915,52916,52917,52918,52919,52920,52921,52922,null,null,null,null,null,null,52923,52924,52925,52926,52927,52928,52930,52931,52932,52933,52934,52935,52936,52937,52938,52939,52940,52941,52942,52943,52944,52945,52946,52947,52948,52949,null,null,null,null,null,null,52950,52951,52952,52953,52954,52955,52956,52957,52958,52959,52960,52961,52962,52963,52966,52967,52969,52970,52973,52974,52975,52976,52977,52978,52979,52982,52986,52987,52988,52989,52990,52991,44032,44033,44036,44039,44040,44041,44042,44048,44049,44050,44051,44052,44053,44054,44055,44057,44058,44059,44060,44061,44064,44068,44076,44077,44079,44080,44081,44088,44089,44092,44096,44107,44109,44116,44120,44124,44144,44145,44148,44151,44152,44154,44160,44161,44163,44164,44165,44166,44169,44170,44171,44172,44176,44180,44188,44189,44191,44192,44193,44200,44201,44202,44204,44207,44208,44216,44217,44219,44220,44221,44225,44228,44232,44236,44245,44247,44256,44257,44260,44263,44264,44266,44268,44271,44272,44273,44275,44277,44278,44284,44285,44288,44292,44294,52994,52995,52997,52998,52999,53001,53002,53003,53004,53005,53006,53007,53010,53012,53014,53015,53016,53017,53018,53019,53021,53022,53023,53025,53026,53027,null,null,null,null,null,null,53029,53030,53031,53032,53033,53034,53035,53038,53042,53043,53044,53045,53046,53047,53049,53050,53051,53052,53053,53054,53055,53056,53057,53058,53059,53060,null,null,null,null,null,null,53061,53062,53063,53064,53065,53066,53067,53068,53069,53070,53071,53072,53073,53074,53075,53078,53079,53081,53082,53083,53085,53086,53087,53088,53089,53090,53091,53094,53096,53098,53099,53100,44300,44301,44303,44305,44312,44316,44320,44329,44332,44333,44340,44341,44344,44348,44356,44357,44359,44361,44368,44372,44376,44385,44387,44396,44397,44400,44403,44404,44405,44406,44411,44412,44413,44415,44417,44418,44424,44425,44428,44432,44444,44445,44452,44471,44480,44481,44484,44488,44496,44497,44499,44508,44512,44516,44536,44537,44540,44543,44544,44545,44552,44553,44555,44557,44564,44592,44593,44596,44599,44600,44602,44608,44609,44611,44613,44614,44618,44620,44621,44622,44624,44628,44630,44636,44637,44639,44640,44641,44645,44648,44649,44652,44656,44664,53101,53102,53103,53106,53107,53109,53110,53111,53113,53114,53115,53116,53117,53118,53119,53121,53122,53123,53124,53126,53127,53128,53129,53130,53131,53133,null,null,null,null,null,null,53134,53135,53136,53137,53138,53139,53140,53141,53142,53143,53144,53145,53146,53147,53148,53149,53150,53151,53152,53154,53155,53156,53157,53158,53159,53161,null,null,null,null,null,null,53162,53163,53164,53165,53166,53167,53169,53170,53171,53172,53173,53174,53175,53176,53177,53178,53179,53180,53181,53182,53183,53184,53185,53186,53187,53189,53190,53191,53192,53193,53194,53195,44665,44667,44668,44669,44676,44677,44684,44732,44733,44734,44736,44740,44748,44749,44751,44752,44753,44760,44761,44764,44776,44779,44781,44788,44792,44796,44807,44808,44813,44816,44844,44845,44848,44850,44852,44860,44861,44863,44865,44866,44867,44872,44873,44880,44892,44893,44900,44901,44921,44928,44932,44936,44944,44945,44949,44956,44984,44985,44988,44992,44999,45000,45001,45003,45005,45006,45012,45020,45032,45033,45040,45041,45044,45048,45056,45057,45060,45068,45072,45076,45084,45085,45096,45124,45125,45128,45130,45132,45134,45139,45140,45141,45143,45145,53196,53197,53198,53199,53200,53201,53202,53203,53204,53205,53206,53207,53208,53209,53210,53211,53212,53213,53214,53215,53218,53219,53221,53222,53223,53225,null,null,null,null,null,null,53226,53227,53228,53229,53230,53231,53234,53236,53238,53239,53240,53241,53242,53243,53245,53246,53247,53249,53250,53251,53253,53254,53255,53256,53257,53258,null,null,null,null,null,null,53259,53260,53261,53262,53263,53264,53266,53267,53268,53269,53270,53271,53273,53274,53275,53276,53277,53278,53279,53280,53281,53282,53283,53284,53285,53286,53287,53288,53289,53290,53291,53292,45149,45180,45181,45184,45188,45196,45197,45199,45201,45208,45209,45210,45212,45215,45216,45217,45218,45224,45225,45227,45228,45229,45230,45231,45233,45235,45236,45237,45240,45244,45252,45253,45255,45256,45257,45264,45265,45268,45272,45280,45285,45320,45321,45323,45324,45328,45330,45331,45336,45337,45339,45340,45341,45347,45348,45349,45352,45356,45364,45365,45367,45368,45369,45376,45377,45380,45384,45392,45393,45396,45397,45400,45404,45408,45432,45433,45436,45440,45442,45448,45449,45451,45453,45458,45459,45460,45464,45468,45480,45516,45520,45524,45532,45533,53294,53295,53296,53297,53298,53299,53302,53303,53305,53306,53307,53309,53310,53311,53312,53313,53314,53315,53318,53320,53322,53323,53324,53325,53326,53327,null,null,null,null,null,null,53329,53330,53331,53333,53334,53335,53337,53338,53339,53340,53341,53342,53343,53345,53346,53347,53348,53349,53350,53351,53352,53353,53354,53355,53358,53359,null,null,null,null,null,null,53361,53362,53363,53365,53366,53367,53368,53369,53370,53371,53374,53375,53376,53378,53379,53380,53381,53382,53383,53384,53385,53386,53387,53388,53389,53390,53391,53392,53393,53394,53395,53396,45535,45544,45545,45548,45552,45561,45563,45565,45572,45573,45576,45579,45580,45588,45589,45591,45593,45600,45620,45628,45656,45660,45664,45672,45673,45684,45685,45692,45700,45701,45705,45712,45713,45716,45720,45721,45722,45728,45729,45731,45733,45734,45738,45740,45744,45748,45768,45769,45772,45776,45778,45784,45785,45787,45789,45794,45796,45797,45798,45800,45803,45804,45805,45806,45807,45811,45812,45813,45815,45816,45817,45818,45819,45823,45824,45825,45828,45832,45840,45841,45843,45844,45845,45852,45908,45909,45910,45912,45915,45916,45918,45919,45924,45925,53397,53398,53399,53400,53401,53402,53403,53404,53405,53406,53407,53408,53409,53410,53411,53414,53415,53417,53418,53419,53421,53422,53423,53424,53425,53426,null,null,null,null,null,null,53427,53430,53432,53434,53435,53436,53437,53438,53439,53442,53443,53445,53446,53447,53450,53451,53452,53453,53454,53455,53458,53462,53463,53464,53465,53466,null,null,null,null,null,null,53467,53470,53471,53473,53474,53475,53477,53478,53479,53480,53481,53482,53483,53486,53490,53491,53492,53493,53494,53495,53497,53498,53499,53500,53501,53502,53503,53504,53505,53506,53507,53508,45927,45929,45931,45934,45936,45937,45940,45944,45952,45953,45955,45956,45957,45964,45968,45972,45984,45985,45992,45996,46020,46021,46024,46027,46028,46030,46032,46036,46037,46039,46041,46043,46045,46048,46052,46056,46076,46096,46104,46108,46112,46120,46121,46123,46132,46160,46161,46164,46168,46176,46177,46179,46181,46188,46208,46216,46237,46244,46248,46252,46261,46263,46265,46272,46276,46280,46288,46293,46300,46301,46304,46307,46308,46310,46316,46317,46319,46321,46328,46356,46357,46360,46363,46364,46372,46373,46375,46376,46377,46378,46384,46385,46388,46392,53509,53510,53511,53512,53513,53514,53515,53516,53518,53519,53520,53521,53522,53523,53524,53525,53526,53527,53528,53529,53530,53531,53532,53533,53534,53535,null,null,null,null,null,null,53536,53537,53538,53539,53540,53541,53542,53543,53544,53545,53546,53547,53548,53549,53550,53551,53554,53555,53557,53558,53559,53561,53563,53564,53565,53566,null,null,null,null,null,null,53567,53570,53574,53575,53576,53577,53578,53579,53582,53583,53585,53586,53587,53589,53590,53591,53592,53593,53594,53595,53598,53600,53602,53603,53604,53605,53606,53607,53609,53610,53611,53613,46400,46401,46403,46404,46405,46411,46412,46413,46416,46420,46428,46429,46431,46432,46433,46496,46497,46500,46504,46506,46507,46512,46513,46515,46516,46517,46523,46524,46525,46528,46532,46540,46541,46543,46544,46545,46552,46572,46608,46609,46612,46616,46629,46636,46644,46664,46692,46696,46748,46749,46752,46756,46763,46764,46769,46804,46832,46836,46840,46848,46849,46853,46888,46889,46892,46895,46896,46904,46905,46907,46916,46920,46924,46932,46933,46944,46948,46952,46960,46961,46963,46965,46972,46973,46976,46980,46988,46989,46991,46992,46993,46994,46998,46999,53614,53615,53616,53617,53618,53619,53620,53621,53622,53623,53624,53625,53626,53627,53629,53630,53631,53632,53633,53634,53635,53637,53638,53639,53641,53642,null,null,null,null,null,null,53643,53644,53645,53646,53647,53648,53649,53650,53651,53652,53653,53654,53655,53656,53657,53658,53659,53660,53661,53662,53663,53666,53667,53669,53670,53671,null,null,null,null,null,null,53673,53674,53675,53676,53677,53678,53679,53682,53684,53686,53687,53688,53689,53691,53693,53694,53695,53697,53698,53699,53700,53701,53702,53703,53704,53705,53706,53707,53708,53709,53710,53711,47000,47001,47004,47008,47016,47017,47019,47020,47021,47028,47029,47032,47047,47049,47084,47085,47088,47092,47100,47101,47103,47104,47105,47111,47112,47113,47116,47120,47128,47129,47131,47133,47140,47141,47144,47148,47156,47157,47159,47160,47161,47168,47172,47185,47187,47196,47197,47200,47204,47212,47213,47215,47217,47224,47228,47245,47272,47280,47284,47288,47296,47297,47299,47301,47308,47312,47316,47325,47327,47329,47336,47337,47340,47344,47352,47353,47355,47357,47364,47384,47392,47420,47421,47424,47428,47436,47439,47441,47448,47449,47452,47456,47464,47465,53712,53713,53714,53715,53716,53717,53718,53719,53721,53722,53723,53724,53725,53726,53727,53728,53729,53730,53731,53732,53733,53734,53735,53736,53737,53738,null,null,null,null,null,null,53739,53740,53741,53742,53743,53744,53745,53746,53747,53749,53750,53751,53753,53754,53755,53756,53757,53758,53759,53760,53761,53762,53763,53764,53765,53766,null,null,null,null,null,null,53768,53770,53771,53772,53773,53774,53775,53777,53778,53779,53780,53781,53782,53783,53784,53785,53786,53787,53788,53789,53790,53791,53792,53793,53794,53795,53796,53797,53798,53799,53800,53801,47467,47469,47476,47477,47480,47484,47492,47493,47495,47497,47498,47501,47502,47532,47533,47536,47540,47548,47549,47551,47553,47560,47561,47564,47566,47567,47568,47569,47570,47576,47577,47579,47581,47582,47585,47587,47588,47589,47592,47596,47604,47605,47607,47608,47609,47610,47616,47617,47624,47637,47672,47673,47676,47680,47682,47688,47689,47691,47693,47694,47699,47700,47701,47704,47708,47716,47717,47719,47720,47721,47728,47729,47732,47736,47747,47748,47749,47751,47756,47784,47785,47787,47788,47792,47794,47800,47801,47803,47805,47812,47816,47832,47833,47868,53802,53803,53806,53807,53809,53810,53811,53813,53814,53815,53816,53817,53818,53819,53822,53824,53826,53827,53828,53829,53830,53831,53833,53834,53835,53836,null,null,null,null,null,null,53837,53838,53839,53840,53841,53842,53843,53844,53845,53846,53847,53848,53849,53850,53851,53853,53854,53855,53856,53857,53858,53859,53861,53862,53863,53864,null,null,null,null,null,null,53865,53866,53867,53868,53869,53870,53871,53872,53873,53874,53875,53876,53877,53878,53879,53880,53881,53882,53883,53884,53885,53886,53887,53890,53891,53893,53894,53895,53897,53898,53899,53900,47872,47876,47885,47887,47889,47896,47900,47904,47913,47915,47924,47925,47926,47928,47931,47932,47933,47934,47940,47941,47943,47945,47949,47951,47952,47956,47960,47969,47971,47980,48008,48012,48016,48036,48040,48044,48052,48055,48064,48068,48072,48080,48083,48120,48121,48124,48127,48128,48130,48136,48137,48139,48140,48141,48143,48145,48148,48149,48150,48151,48152,48155,48156,48157,48158,48159,48164,48165,48167,48169,48173,48176,48177,48180,48184,48192,48193,48195,48196,48197,48201,48204,48205,48208,48221,48260,48261,48264,48267,48268,48270,48276,48277,48279,53901,53902,53903,53906,53907,53908,53910,53911,53912,53913,53914,53915,53917,53918,53919,53921,53922,53923,53925,53926,53927,53928,53929,53930,53931,53933,null,null,null,null,null,null,53934,53935,53936,53938,53939,53940,53941,53942,53943,53946,53947,53949,53950,53953,53955,53956,53957,53958,53959,53962,53964,53965,53966,53967,53968,53969,null,null,null,null,null,null,53970,53971,53973,53974,53975,53977,53978,53979,53981,53982,53983,53984,53985,53986,53987,53990,53991,53992,53993,53994,53995,53996,53997,53998,53999,54002,54003,54005,54006,54007,54009,54010,48281,48282,48288,48289,48292,48295,48296,48304,48305,48307,48308,48309,48316,48317,48320,48324,48333,48335,48336,48337,48341,48344,48348,48372,48373,48374,48376,48380,48388,48389,48391,48393,48400,48404,48420,48428,48448,48456,48457,48460,48464,48472,48473,48484,48488,48512,48513,48516,48519,48520,48521,48522,48528,48529,48531,48533,48537,48538,48540,48548,48560,48568,48596,48597,48600,48604,48617,48624,48628,48632,48640,48643,48645,48652,48653,48656,48660,48668,48669,48671,48708,48709,48712,48716,48718,48724,48725,48727,48729,48730,48731,48736,48737,48740,54011,54012,54013,54014,54015,54018,54020,54022,54023,54024,54025,54026,54027,54031,54033,54034,54035,54037,54039,54040,54041,54042,54043,54046,54050,54051,null,null,null,null,null,null,54052,54054,54055,54058,54059,54061,54062,54063,54065,54066,54067,54068,54069,54070,54071,54074,54078,54079,54080,54081,54082,54083,54086,54087,54088,54089,null,null,null,null,null,null,54090,54091,54092,54093,54094,54095,54096,54097,54098,54099,54100,54101,54102,54103,54104,54105,54106,54107,54108,54109,54110,54111,54112,54113,54114,54115,54116,54117,54118,54119,54120,54121,48744,48746,48752,48753,48755,48756,48757,48763,48764,48765,48768,48772,48780,48781,48783,48784,48785,48792,48793,48808,48848,48849,48852,48855,48856,48864,48867,48868,48869,48876,48897,48904,48905,48920,48921,48923,48924,48925,48960,48961,48964,48968,48976,48977,48981,49044,49072,49093,49100,49101,49104,49108,49116,49119,49121,49212,49233,49240,49244,49248,49256,49257,49296,49297,49300,49304,49312,49313,49315,49317,49324,49325,49327,49328,49331,49332,49333,49334,49340,49341,49343,49344,49345,49349,49352,49353,49356,49360,49368,49369,49371,49372,49373,49380,54122,54123,54124,54125,54126,54127,54128,54129,54130,54131,54132,54133,54134,54135,54136,54137,54138,54139,54142,54143,54145,54146,54147,54149,54150,54151,null,null,null,null,null,null,54152,54153,54154,54155,54158,54162,54163,54164,54165,54166,54167,54170,54171,54173,54174,54175,54177,54178,54179,54180,54181,54182,54183,54186,54188,54190,null,null,null,null,null,null,54191,54192,54193,54194,54195,54197,54198,54199,54201,54202,54203,54205,54206,54207,54208,54209,54210,54211,54214,54215,54218,54219,54220,54221,54222,54223,54225,54226,54227,54228,54229,54230,49381,49384,49388,49396,49397,49399,49401,49408,49412,49416,49424,49429,49436,49437,49438,49439,49440,49443,49444,49446,49447,49452,49453,49455,49456,49457,49462,49464,49465,49468,49472,49480,49481,49483,49484,49485,49492,49493,49496,49500,49508,49509,49511,49512,49513,49520,49524,49528,49541,49548,49549,49550,49552,49556,49558,49564,49565,49567,49569,49573,49576,49577,49580,49584,49597,49604,49608,49612,49620,49623,49624,49632,49636,49640,49648,49649,49651,49660,49661,49664,49668,49676,49677,49679,49681,49688,49689,49692,49695,49696,49704,49705,49707,49709,54231,54233,54234,54235,54236,54237,54238,54239,54240,54242,54244,54245,54246,54247,54248,54249,54250,54251,54254,54255,54257,54258,54259,54261,54262,54263,null,null,null,null,null,null,54264,54265,54266,54267,54270,54272,54274,54275,54276,54277,54278,54279,54281,54282,54283,54284,54285,54286,54287,54288,54289,54290,54291,54292,54293,54294,null,null,null,null,null,null,54295,54296,54297,54298,54299,54300,54302,54303,54304,54305,54306,54307,54308,54309,54310,54311,54312,54313,54314,54315,54316,54317,54318,54319,54320,54321,54322,54323,54324,54325,54326,54327,49711,49713,49714,49716,49736,49744,49745,49748,49752,49760,49765,49772,49773,49776,49780,49788,49789,49791,49793,49800,49801,49808,49816,49819,49821,49828,49829,49832,49836,49837,49844,49845,49847,49849,49884,49885,49888,49891,49892,49899,49900,49901,49903,49905,49910,49912,49913,49915,49916,49920,49928,49929,49932,49933,49939,49940,49941,49944,49948,49956,49957,49960,49961,49989,50024,50025,50028,50032,50034,50040,50041,50044,50045,50052,50056,50060,50112,50136,50137,50140,50143,50144,50146,50152,50153,50157,50164,50165,50168,50184,50192,50212,50220,50224,54328,54329,54330,54331,54332,54333,54334,54335,54337,54338,54339,54341,54342,54343,54344,54345,54346,54347,54348,54349,54350,54351,54352,54353,54354,54355,null,null,null,null,null,null,54356,54357,54358,54359,54360,54361,54362,54363,54365,54366,54367,54369,54370,54371,54373,54374,54375,54376,54377,54378,54379,54380,54382,54384,54385,54386,null,null,null,null,null,null,54387,54388,54389,54390,54391,54394,54395,54397,54398,54401,54403,54404,54405,54406,54407,54410,54412,54414,54415,54416,54417,54418,54419,54421,54422,54423,54424,54425,54426,54427,54428,54429,50228,50236,50237,50248,50276,50277,50280,50284,50292,50293,50297,50304,50324,50332,50360,50364,50409,50416,50417,50420,50424,50426,50431,50432,50433,50444,50448,50452,50460,50472,50473,50476,50480,50488,50489,50491,50493,50500,50501,50504,50505,50506,50508,50509,50510,50515,50516,50517,50519,50520,50521,50525,50526,50528,50529,50532,50536,50544,50545,50547,50548,50549,50556,50557,50560,50564,50567,50572,50573,50575,50577,50581,50583,50584,50588,50592,50601,50612,50613,50616,50617,50619,50620,50621,50622,50628,50629,50630,50631,50632,50633,50634,50636,50638,54430,54431,54432,54433,54434,54435,54436,54437,54438,54439,54440,54442,54443,54444,54445,54446,54447,54448,54449,54450,54451,54452,54453,54454,54455,54456,null,null,null,null,null,null,54457,54458,54459,54460,54461,54462,54463,54464,54465,54466,54467,54468,54469,54470,54471,54472,54473,54474,54475,54477,54478,54479,54481,54482,54483,54485,null,null,null,null,null,null,54486,54487,54488,54489,54490,54491,54493,54494,54496,54497,54498,54499,54500,54501,54502,54503,54505,54506,54507,54509,54510,54511,54513,54514,54515,54516,54517,54518,54519,54521,54522,54524,50640,50641,50644,50648,50656,50657,50659,50661,50668,50669,50670,50672,50676,50678,50679,50684,50685,50686,50687,50688,50689,50693,50694,50695,50696,50700,50704,50712,50713,50715,50716,50724,50725,50728,50732,50733,50734,50736,50739,50740,50741,50743,50745,50747,50752,50753,50756,50760,50768,50769,50771,50772,50773,50780,50781,50784,50796,50799,50801,50808,50809,50812,50816,50824,50825,50827,50829,50836,50837,50840,50844,50852,50853,50855,50857,50864,50865,50868,50872,50873,50874,50880,50881,50883,50885,50892,50893,50896,50900,50908,50909,50912,50913,50920,54526,54527,54528,54529,54530,54531,54533,54534,54535,54537,54538,54539,54541,54542,54543,54544,54545,54546,54547,54550,54552,54553,54554,54555,54556,54557,null,null,null,null,null,null,54558,54559,54560,54561,54562,54563,54564,54565,54566,54567,54568,54569,54570,54571,54572,54573,54574,54575,54576,54577,54578,54579,54580,54581,54582,54583,null,null,null,null,null,null,54584,54585,54586,54587,54590,54591,54593,54594,54595,54597,54598,54599,54600,54601,54602,54603,54606,54608,54610,54611,54612,54613,54614,54615,54618,54619,54621,54622,54623,54625,54626,54627,50921,50924,50928,50936,50937,50941,50948,50949,50952,50956,50964,50965,50967,50969,50976,50977,50980,50984,50992,50993,50995,50997,50999,51004,51005,51008,51012,51018,51020,51021,51023,51025,51026,51027,51028,51029,51030,51031,51032,51036,51040,51048,51051,51060,51061,51064,51068,51069,51070,51075,51076,51077,51079,51080,51081,51082,51086,51088,51089,51092,51094,51095,51096,51098,51104,51105,51107,51108,51109,51110,51116,51117,51120,51124,51132,51133,51135,51136,51137,51144,51145,51148,51150,51152,51160,51165,51172,51176,51180,51200,51201,51204,51208,51210,54628,54630,54631,54634,54636,54638,54639,54640,54641,54642,54643,54646,54647,54649,54650,54651,54653,54654,54655,54656,54657,54658,54659,54662,54666,54667,null,null,null,null,null,null,54668,54669,54670,54671,54673,54674,54675,54676,54677,54678,54679,54680,54681,54682,54683,54684,54685,54686,54687,54688,54689,54690,54691,54692,54694,54695,null,null,null,null,null,null,54696,54697,54698,54699,54700,54701,54702,54703,54704,54705,54706,54707,54708,54709,54710,54711,54712,54713,54714,54715,54716,54717,54718,54719,54720,54721,54722,54723,54724,54725,54726,54727,51216,51217,51219,51221,51222,51228,51229,51232,51236,51244,51245,51247,51249,51256,51260,51264,51272,51273,51276,51277,51284,51312,51313,51316,51320,51322,51328,51329,51331,51333,51334,51335,51339,51340,51341,51348,51357,51359,51361,51368,51388,51389,51396,51400,51404,51412,51413,51415,51417,51424,51425,51428,51445,51452,51453,51456,51460,51461,51462,51468,51469,51471,51473,51480,51500,51508,51536,51537,51540,51544,51552,51553,51555,51564,51568,51572,51580,51592,51593,51596,51600,51608,51609,51611,51613,51648,51649,51652,51655,51656,51658,51664,51665,51667,54730,54731,54733,54734,54735,54737,54739,54740,54741,54742,54743,54746,54748,54750,54751,54752,54753,54754,54755,54758,54759,54761,54762,54763,54765,54766,null,null,null,null,null,null,54767,54768,54769,54770,54771,54774,54776,54778,54779,54780,54781,54782,54783,54786,54787,54789,54790,54791,54793,54794,54795,54796,54797,54798,54799,54802,null,null,null,null,null,null,54806,54807,54808,54809,54810,54811,54813,54814,54815,54817,54818,54819,54821,54822,54823,54824,54825,54826,54827,54828,54830,54831,54832,54833,54834,54835,54836,54837,54838,54839,54842,54843,51669,51670,51673,51674,51676,51677,51680,51682,51684,51687,51692,51693,51695,51696,51697,51704,51705,51708,51712,51720,51721,51723,51724,51725,51732,51736,51753,51788,51789,51792,51796,51804,51805,51807,51808,51809,51816,51837,51844,51864,51900,51901,51904,51908,51916,51917,51919,51921,51923,51928,51929,51936,51948,51956,51976,51984,51988,51992,52000,52001,52033,52040,52041,52044,52048,52056,52057,52061,52068,52088,52089,52124,52152,52180,52196,52199,52201,52236,52237,52240,52244,52252,52253,52257,52258,52263,52264,52265,52268,52270,52272,52280,52281,52283,54845,54846,54847,54849,54850,54851,54852,54854,54855,54858,54860,54862,54863,54864,54866,54867,54870,54871,54873,54874,54875,54877,54878,54879,54880,54881,null,null,null,null,null,null,54882,54883,54884,54885,54886,54888,54890,54891,54892,54893,54894,54895,54898,54899,54901,54902,54903,54904,54905,54906,54907,54908,54909,54910,54911,54912,null,null,null,null,null,null,54913,54914,54916,54918,54919,54920,54921,54922,54923,54926,54927,54929,54930,54931,54933,54934,54935,54936,54937,54938,54939,54940,54942,54944,54946,54947,54948,54949,54950,54951,54953,54954,52284,52285,52286,52292,52293,52296,52300,52308,52309,52311,52312,52313,52320,52324,52326,52328,52336,52341,52376,52377,52380,52384,52392,52393,52395,52396,52397,52404,52405,52408,52412,52420,52421,52423,52425,52432,52436,52452,52460,52464,52481,52488,52489,52492,52496,52504,52505,52507,52509,52516,52520,52524,52537,52572,52576,52580,52588,52589,52591,52593,52600,52616,52628,52629,52632,52636,52644,52645,52647,52649,52656,52676,52684,52688,52712,52716,52720,52728,52729,52731,52733,52740,52744,52748,52756,52761,52768,52769,52772,52776,52784,52785,52787,52789,54955,54957,54958,54959,54961,54962,54963,54964,54965,54966,54967,54968,54970,54972,54973,54974,54975,54976,54977,54978,54979,54982,54983,54985,54986,54987,null,null,null,null,null,null,54989,54990,54991,54992,54994,54995,54997,54998,55000,55002,55003,55004,55005,55006,55007,55009,55010,55011,55013,55014,55015,55017,55018,55019,55020,55021,null,null,null,null,null,null,55022,55023,55025,55026,55027,55028,55030,55031,55032,55033,55034,55035,55038,55039,55041,55042,55043,55045,55046,55047,55048,55049,55050,55051,55052,55053,55054,55055,55056,55058,55059,55060,52824,52825,52828,52831,52832,52833,52840,52841,52843,52845,52852,52853,52856,52860,52868,52869,52871,52873,52880,52881,52884,52888,52896,52897,52899,52900,52901,52908,52909,52929,52964,52965,52968,52971,52972,52980,52981,52983,52984,52985,52992,52993,52996,53000,53008,53009,53011,53013,53020,53024,53028,53036,53037,53039,53040,53041,53048,53076,53077,53080,53084,53092,53093,53095,53097,53104,53105,53108,53112,53120,53125,53132,53153,53160,53168,53188,53216,53217,53220,53224,53232,53233,53235,53237,53244,53248,53252,53265,53272,53293,53300,53301,53304,53308,55061,55062,55063,55066,55067,55069,55070,55071,55073,55074,55075,55076,55077,55078,55079,55082,55084,55086,55087,55088,55089,55090,55091,55094,55095,55097,null,null,null,null,null,null,55098,55099,55101,55102,55103,55104,55105,55106,55107,55109,55110,55112,55114,55115,55116,55117,55118,55119,55122,55123,55125,55130,55131,55132,55133,55134,null,null,null,null,null,null,55135,55138,55140,55142,55143,55144,55146,55147,55149,55150,55151,55153,55154,55155,55157,55158,55159,55160,55161,55162,55163,55166,55167,55168,55170,55171,55172,55173,55174,55175,55178,55179,53316,53317,53319,53321,53328,53332,53336,53344,53356,53357,53360,53364,53372,53373,53377,53412,53413,53416,53420,53428,53429,53431,53433,53440,53441,53444,53448,53449,53456,53457,53459,53460,53461,53468,53469,53472,53476,53484,53485,53487,53488,53489,53496,53517,53552,53553,53556,53560,53562,53568,53569,53571,53572,53573,53580,53581,53584,53588,53596,53597,53599,53601,53608,53612,53628,53636,53640,53664,53665,53668,53672,53680,53681,53683,53685,53690,53692,53696,53720,53748,53752,53767,53769,53776,53804,53805,53808,53812,53820,53821,53823,53825,53832,53852,55181,55182,55183,55185,55186,55187,55188,55189,55190,55191,55194,55196,55198,55199,55200,55201,55202,55203,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,53860,53888,53889,53892,53896,53904,53905,53909,53916,53920,53924,53932,53937,53944,53945,53948,53951,53952,53954,53960,53961,53963,53972,53976,53980,53988,53989,54000,54001,54004,54008,54016,54017,54019,54021,54028,54029,54030,54032,54036,54038,54044,54045,54047,54048,54049,54053,54056,54057,54060,54064,54072,54073,54075,54076,54077,54084,54085,54140,54141,54144,54148,54156,54157,54159,54160,54161,54168,54169,54172,54176,54184,54185,54187,54189,54196,54200,54204,54212,54213,54216,54217,54224,54232,54241,54243,54252,54253,54256,54260,54268,54269,54271,54273,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,54280,54301,54336,54340,54364,54368,54372,54381,54383,54392,54393,54396,54399,54400,54402,54408,54409,54411,54413,54420,54441,54476,54480,54484,54492,54495,54504,54508,54512,54520,54523,54525,54532,54536,54540,54548,54549,54551,54588,54589,54592,54596,54604,54605,54607,54609,54616,54617,54620,54624,54629,54632,54633,54635,54637,54644,54645,54648,54652,54660,54661,54663,54664,54665,54672,54693,54728,54729,54732,54736,54738,54744,54745,54747,54749,54756,54757,54760,54764,54772,54773,54775,54777,54784,54785,54788,54792,54800,54801,54803,54804,54805,54812,54816,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,54820,54829,54840,54841,54844,54848,54853,54856,54857,54859,54861,54865,54868,54869,54872,54876,54887,54889,54896,54897,54900,54915,54917,54924,54925,54928,54932,54941,54943,54945,54952,54956,54960,54969,54971,54980,54981,54984,54988,54993,54996,54999,55001,55008,55012,55016,55024,55029,55036,55037,55040,55044,55057,55064,55065,55068,55072,55080,55081,55083,55085,55092,55093,55096,55100,55108,55111,55113,55120,55121,55124,55126,55127,55128,55129,55136,55137,55139,55141,55145,55148,55152,55156,55164,55165,55169,55176,55177,55180,55184,55192,55193,55195,55197,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,20285,20339,20551,20729,21152,21487,21621,21733,22025,23233,23478,26247,26550,26551,26607,27468,29634,30146,31292,33499,33540,34903,34952,35382,36040,36303,36603,36838,39381,21051,21364,21508,24682,24932,27580,29647,33050,35258,35282,38307,20355,21002,22718,22904,23014,24178,24185,25031,25536,26438,26604,26751,28567,30286,30475,30965,31240,31487,31777,32925,33390,33393,35563,38291,20075,21917,26359,28212,30883,31469,33883,35088,34638,38824,21208,22350,22570,23884,24863,25022,25121,25954,26577,27204,28187,29976,30131,30435,30640,32058,37039,37969,37970,40853,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,21283,23724,30002,32987,37440,38296,21083,22536,23004,23713,23831,24247,24378,24394,24951,27743,30074,30086,31968,32115,32177,32652,33108,33313,34193,35137,35611,37628,38477,40007,20171,20215,20491,20977,22607,24887,24894,24936,25913,27114,28433,30117,30342,30422,31623,33445,33995,63744,37799,38283,21888,23458,22353,63745,31923,32697,37301,20520,21435,23621,24040,25298,25454,25818,25831,28192,28844,31067,36317,36382,63746,36989,37445,37624,20094,20214,20581,24062,24314,24838,26967,33137,34388,36423,37749,39467,20062,20625,26480,26688,20745,21133,21138,27298,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,30652,37392,40660,21163,24623,36850,20552,25001,25581,25802,26684,27268,28608,33160,35233,38548,22533,29309,29356,29956,32121,32365,32937,35211,35700,36963,40273,25225,27770,28500,32080,32570,35363,20860,24906,31645,35609,37463,37772,20140,20435,20510,20670,20742,21185,21197,21375,22384,22659,24218,24465,24950,25004,25806,25964,26223,26299,26356,26775,28039,28805,28913,29855,29861,29898,30169,30828,30956,31455,31478,32069,32147,32789,32831,33051,33686,35686,36629,36885,37857,38915,38968,39514,39912,20418,21843,22586,22865,23395,23622,24760,25106,26690,26800,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,26856,28330,30028,30328,30926,31293,31995,32363,32380,35336,35489,35903,38542,40388,21476,21481,21578,21617,22266,22993,23396,23611,24235,25335,25911,25925,25970,26272,26543,27073,27837,30204,30352,30590,31295,32660,32771,32929,33167,33510,33533,33776,34241,34865,34996,35493,63747,36764,37678,38599,39015,39640,40723,21741,26011,26354,26767,31296,35895,40288,22256,22372,23825,26118,26801,26829,28414,29736,34974,39908,27752,63748,39592,20379,20844,20849,21151,23380,24037,24656,24685,25329,25511,25915,29657,31354,34467,36002,38799,20018,23521,25096,26524,29916,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,31185,33747,35463,35506,36328,36942,37707,38982,24275,27112,34303,37101,63749,20896,23448,23532,24931,26874,27454,28748,29743,29912,31649,32592,33733,35264,36011,38364,39208,21038,24669,25324,36866,20362,20809,21281,22745,24291,26336,27960,28826,29378,29654,31568,33009,37979,21350,25499,32619,20054,20608,22602,22750,24618,24871,25296,27088,39745,23439,32024,32945,36703,20132,20689,21676,21932,23308,23968,24039,25898,25934,26657,27211,29409,30350,30703,32094,32761,33184,34126,34527,36611,36686,37066,39171,39509,39851,19992,20037,20061,20167,20465,20855,21246,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,21312,21475,21477,21646,22036,22389,22434,23495,23943,24272,25084,25304,25937,26552,26601,27083,27472,27590,27628,27714,28317,28792,29399,29590,29699,30655,30697,31350,32127,32777,33276,33285,33290,33503,34914,35635,36092,36544,36881,37041,37476,37558,39378,39493,40169,40407,40860,22283,23616,33738,38816,38827,40628,21531,31384,32676,35033,36557,37089,22528,23624,25496,31391,23470,24339,31353,31406,33422,36524,20518,21048,21240,21367,22280,25331,25458,27402,28099,30519,21413,29527,34152,36470,38357,26426,27331,28528,35437,36556,39243,63750,26231,27512,36020,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,39740,63751,21483,22317,22862,25542,27131,29674,30789,31418,31429,31998,33909,35215,36211,36917,38312,21243,22343,30023,31584,33740,37406,63752,27224,20811,21067,21127,25119,26840,26997,38553,20677,21156,21220,25027,26020,26681,27135,29822,31563,33465,33771,35250,35641,36817,39241,63753,20170,22935,25810,26129,27278,29748,31105,31165,33449,34942,34943,35167,63754,37670,20235,21450,24613,25201,27762,32026,32102,20120,20834,30684,32943,20225,20238,20854,20864,21980,22120,22331,22522,22524,22804,22855,22931,23492,23696,23822,24049,24190,24524,25216,26071,26083,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,26398,26399,26462,26827,26820,27231,27450,27683,27773,27778,28103,29592,29734,29738,29826,29859,30072,30079,30849,30959,31041,31047,31048,31098,31637,32000,32186,32648,32774,32813,32908,35352,35663,35912,36215,37665,37668,39138,39249,39438,39439,39525,40594,32202,20342,21513,25326,26708,37329,21931,20794,63755,63756,23068,25062,63757,25295,25343,63758,63759,63760,63761,63762,63763,37027,63764,63765,63766,63767,63768,35582,63769,63770,63771,63772,26262,63773,29014,63774,63775,38627,63776,25423,25466,21335,63777,26511,26976,28275,63778,30007,63779,63780,63781,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,32013,63782,63783,34930,22218,23064,63784,63785,63786,63787,63788,20035,63789,20839,22856,26608,32784,63790,22899,24180,25754,31178,24565,24684,25288,25467,23527,23511,21162,63791,22900,24361,24594,63792,63793,63794,29785,63795,63796,63797,63798,63799,63800,39377,63801,63802,63803,63804,63805,63806,63807,63808,63809,63810,63811,28611,63812,63813,33215,36786,24817,63814,63815,33126,63816,63817,23615,63818,63819,63820,63821,63822,63823,63824,63825,23273,35365,26491,32016,63826,63827,63828,63829,63830,63831,33021,63832,63833,23612,27877,21311,28346,22810,33590,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,20025,20150,20294,21934,22296,22727,24406,26039,26086,27264,27573,28237,30701,31471,31774,32222,34507,34962,37170,37723,25787,28606,29562,30136,36948,21846,22349,25018,25812,26311,28129,28251,28525,28601,30192,32835,33213,34113,35203,35527,35674,37663,27795,30035,31572,36367,36957,21776,22530,22616,24162,25095,25758,26848,30070,31958,34739,40680,20195,22408,22382,22823,23565,23729,24118,24453,25140,25825,29619,33274,34955,36024,38538,40667,23429,24503,24755,20498,20992,21040,22294,22581,22615,23566,23648,23798,23947,24230,24466,24764,25361,25481,25623,26691,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,26873,27330,28120,28193,28372,28644,29182,30428,30585,31153,31291,33796,35241,36077,36339,36424,36867,36884,36947,37117,37709,38518,38876,27602,28678,29272,29346,29544,30563,31167,31716,32411,35712,22697,24775,25958,26109,26302,27788,28958,29129,35930,38931,20077,31361,20189,20908,20941,21205,21516,24999,26481,26704,26847,27934,28540,30140,30643,31461,33012,33891,37509,20828,26007,26460,26515,30168,31431,33651,63834,35910,36887,38957,23663,33216,33434,36929,36975,37389,24471,23965,27225,29128,30331,31561,34276,35588,37159,39472,21895,25078,63835,30313,32645,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,34367,34746,35064,37007,63836,27931,28889,29662,32097,33853,63837,37226,39409,63838,20098,21365,27396,27410,28734,29211,34349,40478,21068,36771,23888,25829,25900,27414,28651,31811,32412,34253,35172,35261,25289,33240,34847,24266,26391,28010,29436,29701,29807,34690,37086,20358,23821,24480,33802,20919,25504,30053,20142,20486,20841,20937,26753,27153,31918,31921,31975,33391,35538,36635,37327,20406,20791,21237,21570,24300,24942,25150,26053,27354,28670,31018,34268,34851,38317,39522,39530,40599,40654,21147,26310,27511,28701,31019,36706,38722,24976,25088,25891,28451,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,29001,29833,32244,32879,34030,36646,36899,37706,20925,21015,21155,27916,28872,35010,24265,25986,27566,28610,31806,29557,20196,20278,22265,63839,23738,23994,24604,29618,31533,32666,32718,32838,36894,37428,38646,38728,38936,40801,20363,28583,31150,37300,38583,21214,63840,25736,25796,27347,28510,28696,29200,30439,32769,34310,34396,36335,36613,38706,39791,40442,40565,30860,31103,32160,33737,37636,40575,40595,35542,22751,24324,26407,28711,29903,31840,32894,20769,28712,29282,30922,36034,36058,36084,38647,20102,20698,23534,24278,26009,29134,30274,30637,32842,34044,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,36988,39719,40845,22744,23105,23650,27155,28122,28431,30267,32047,32311,34078,35128,37860,38475,21129,26066,26611,27060,27969,28316,28687,29705,29792,30041,30244,30827,35628,39006,20845,25134,38520,20374,20523,23833,28138,32184,36650,24459,24900,26647,63841,38534,21202,32907,20956,20940,26974,31260,32190,33777,38517,20442,21033,21400,21519,21774,23653,24743,26446,26792,28012,29313,29432,29702,29827,63842,30178,31852,32633,32696,33673,35023,35041,37324,37328,38626,39881,21533,28542,29136,29848,34298,36522,38563,40023,40607,26519,28107,29747,33256,38678,30764,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,31435,31520,31890,25705,29802,30194,30908,30952,39340,39764,40635,23518,24149,28448,33180,33707,37000,19975,21325,23081,24018,24398,24930,25405,26217,26364,28415,28459,28771,30622,33836,34067,34875,36627,39237,39995,21788,25273,26411,27819,33545,35178,38778,20129,22916,24536,24537,26395,32178,32596,33426,33579,33725,36638,37017,22475,22969,23186,23504,26151,26522,26757,27599,29028,32629,36023,36067,36993,39749,33032,35978,38476,39488,40613,23391,27667,29467,30450,30431,33804,20906,35219,20813,20885,21193,26825,27796,30468,30496,32191,32236,38754,40629,28357,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,34065,20901,21517,21629,26126,26269,26919,28319,30399,30609,33559,33986,34719,37225,37528,40180,34946,20398,20882,21215,22982,24125,24917,25720,25721,26286,26576,27169,27597,27611,29279,29281,29761,30520,30683,32791,33468,33541,35584,35624,35980,26408,27792,29287,30446,30566,31302,40361,27519,27794,22818,26406,33945,21359,22675,22937,24287,25551,26164,26483,28218,29483,31447,33495,37672,21209,24043,25006,25035,25098,25287,25771,26080,26969,27494,27595,28961,29687,30045,32326,33310,33538,34154,35491,36031,38695,40289,22696,40664,20497,21006,21563,21839,25991,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,27766,32010,32011,32862,34442,38272,38639,21247,27797,29289,21619,23194,23614,23883,24396,24494,26410,26806,26979,28220,28228,30473,31859,32654,34183,35598,36855,38753,40692,23735,24758,24845,25003,25935,26107,26108,27665,27887,29599,29641,32225,38292,23494,34588,35600,21085,21338,25293,25615,25778,26420,27192,27850,29632,29854,31636,31893,32283,33162,33334,34180,36843,38649,39361,20276,21322,21453,21467,25292,25644,25856,26001,27075,27886,28504,29677,30036,30242,30436,30460,30928,30971,31020,32070,33324,34784,36820,38930,39151,21187,25300,25765,28196,28497,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,30332,36299,37297,37474,39662,39747,20515,20621,22346,22952,23592,24135,24439,25151,25918,26041,26049,26121,26507,27036,28354,30917,32033,32938,33152,33323,33459,33953,34444,35370,35607,37030,38450,40848,20493,20467,63843,22521,24472,25308,25490,26479,28227,28953,30403,32972,32986,35060,35061,35097,36064,36649,37197,38506,20271,20336,24091,26575,26658,30333,30334,39748,24161,27146,29033,29140,30058,63844,32321,34115,34281,39132,20240,31567,32624,38309,20961,24070,26805,27710,27726,27867,29359,31684,33539,27861,29754,20731,21128,22721,25816,27287,29863,30294,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,30887,34327,38370,38713,63845,21342,24321,35722,36776,36783,37002,21029,30629,40009,40712,19993,20482,20853,23643,24183,26142,26170,26564,26821,28851,29953,30149,31177,31453,36647,39200,39432,20445,22561,22577,23542,26222,27493,27921,28282,28541,29668,29995,33769,35036,35091,35676,36628,20239,20693,21264,21340,23443,24489,26381,31119,33145,33583,34068,35079,35206,36665,36667,39333,39954,26412,20086,20472,22857,23553,23791,23792,25447,26834,28925,29090,29739,32299,34028,34562,36898,37586,40179,19981,20184,20463,20613,21078,21103,21542,21648,22496,22827,23142,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,23386,23413,23500,24220,63846,25206,25975,26023,28014,28325,29238,31526,31807,32566,33104,33105,33178,33344,33433,33705,35331,36000,36070,36091,36212,36282,37096,37340,38428,38468,39385,40167,21271,20998,21545,22132,22707,22868,22894,24575,24996,25198,26128,27774,28954,30406,31881,31966,32027,33452,36033,38640,63847,20315,24343,24447,25282,23849,26379,26842,30844,32323,40300,19989,20633,21269,21290,21329,22915,23138,24199,24754,24970,25161,25209,26000,26503,27047,27604,27606,27607,27608,27832,63848,29749,30202,30738,30865,31189,31192,31875,32203,32737,32933,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,33086,33218,33778,34586,35048,35513,35692,36027,37145,38750,39131,40763,22188,23338,24428,25996,27315,27567,27996,28657,28693,29277,29613,36007,36051,38971,24977,27703,32856,39425,20045,20107,20123,20181,20282,20284,20351,20447,20735,21490,21496,21766,21987,22235,22763,22882,23057,23531,23546,23556,24051,24107,24473,24605,25448,26012,26031,26614,26619,26797,27515,27801,27863,28195,28681,29509,30722,31038,31040,31072,31169,31721,32023,32114,32902,33293,33678,34001,34503,35039,35408,35422,35613,36060,36198,36781,37034,39164,39391,40605,21066,63849,26388,63850,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,20632,21034,23665,25955,27733,29642,29987,30109,31639,33948,37240,38704,20087,25746,27578,29022,34217,19977,63851,26441,26862,28183,33439,34072,34923,25591,28545,37394,39087,19978,20663,20687,20767,21830,21930,22039,23360,23577,23776,24120,24202,24224,24258,24819,26705,27233,28248,29245,29248,29376,30456,31077,31665,32724,35059,35316,35443,35937,36062,38684,22622,29885,36093,21959,63852,31329,32034,33394,29298,29983,29989,63853,31513,22661,22779,23996,24207,24246,24464,24661,25234,25471,25933,26257,26329,26360,26646,26866,29312,29790,31598,32110,32214,32626,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,32997,33298,34223,35199,35475,36893,37604,40653,40736,22805,22893,24109,24796,26132,26227,26512,27728,28101,28511,30707,30889,33990,37323,37675,20185,20682,20808,21892,23307,23459,25159,25982,26059,28210,29053,29697,29764,29831,29887,30316,31146,32218,32341,32680,33146,33203,33337,34330,34796,35445,36323,36984,37521,37925,39245,39854,21352,23633,26964,27844,27945,28203,33292,34203,35131,35373,35498,38634,40807,21089,26297,27570,32406,34814,36109,38275,38493,25885,28041,29166,63854,22478,22995,23468,24615,24826,25104,26143,26207,29481,29689,30427,30465,31596,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,32854,32882,33125,35488,37266,19990,21218,27506,27927,31237,31545,32048,63855,36016,21484,22063,22609,23477,23567,23569,24034,25152,25475,25620,26157,26803,27836,28040,28335,28703,28836,29138,29990,30095,30094,30233,31505,31712,31787,32032,32057,34092,34157,34311,35380,36877,36961,37045,37559,38902,39479,20439,23660,26463,28049,31903,32396,35606,36118,36895,23403,24061,25613,33984,36956,39137,29575,23435,24730,26494,28126,35359,35494,36865,38924,21047,63856,28753,30862,37782,34928,37335,20462,21463,22013,22234,22402,22781,23234,23432,23723,23744,24101,24833,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,25101,25163,25480,25628,25910,25976,27193,27530,27700,27929,28465,29159,29417,29560,29703,29874,30246,30561,31168,31319,31466,31929,32143,32172,32353,32670,33065,33585,33936,34010,34282,34966,35504,35728,36664,36930,36995,37228,37526,37561,38539,38567,38568,38614,38656,38920,39318,39635,39706,21460,22654,22809,23408,23487,28113,28506,29087,29729,29881,32901,33789,24033,24455,24490,24642,26092,26642,26991,27219,27529,27957,28147,29667,30462,30636,31565,32020,33059,33308,33600,34036,34147,35426,35524,37255,37662,38918,39348,25100,34899,36848,37477,23815,23847,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,23913,29791,33181,34664,28629,25342,32722,35126,35186,19998,20056,20711,21213,21319,25215,26119,32361,34821,38494,20365,21273,22070,22987,23204,23608,23630,23629,24066,24337,24643,26045,26159,26178,26558,26612,29468,30690,31034,32709,33940,33997,35222,35430,35433,35553,35925,35962,22516,23508,24335,24687,25325,26893,27542,28252,29060,31698,34645,35672,36606,39135,39166,20280,20353,20449,21627,23072,23480,24892,26032,26216,29180,30003,31070,32051,33102,33251,33688,34218,34254,34563,35338,36523,36763,63857,36805,22833,23460,23526,24713,23529,23563,24515,27777,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,63858,28145,28683,29978,33455,35574,20160,21313,63859,38617,27663,20126,20420,20818,21854,23077,23784,25105,29273,33469,33706,34558,34905,35357,38463,38597,39187,40201,40285,22538,23731,23997,24132,24801,24853,25569,27138,28197,37122,37716,38990,39952,40823,23433,23736,25353,26191,26696,30524,38593,38797,38996,39839,26017,35585,36555,38332,21813,23721,24022,24245,26263,30284,33780,38343,22739,25276,29390,40232,20208,22830,24591,26171,27523,31207,40230,21395,21696,22467,23830,24859,26326,28079,30861,33406,38552,38724,21380,25212,25494,28082,32266,33099,38989,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,27387,32588,40367,40474,20063,20539,20918,22812,24825,25590,26928,29242,32822,63860,37326,24369,63861,63862,32004,33509,33903,33979,34277,36493,63863,20335,63864,63865,22756,23363,24665,25562,25880,25965,26264,63866,26954,27171,27915,28673,29036,30162,30221,31155,31344,63867,32650,63868,35140,63869,35731,37312,38525,63870,39178,22276,24481,26044,28417,30208,31142,35486,39341,39770,40812,20740,25014,25233,27277,33222,20547,22576,24422,28937,35328,35578,23420,34326,20474,20796,22196,22852,25513,28153,23978,26989,20870,20104,20313,63871,63872,63873,22914,63874,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,63875,27487,27741,63876,29877,30998,63877,33287,33349,33593,36671,36701,63878,39192,63879,63880,63881,20134,63882,22495,24441,26131,63883,63884,30123,32377,35695,63885,36870,39515,22181,22567,23032,23071,23476,63886,24310,63887,63888,25424,25403,63889,26941,27783,27839,28046,28051,28149,28436,63890,28895,28982,29017,63891,29123,29141,63892,30799,30831,63893,31605,32227,63894,32303,63895,34893,36575,63896,63897,63898,37467,63899,40182,63900,63901,63902,24709,28037,63903,29105,63904,63905,38321,21421,63906,63907,63908,26579,63909,28814,28976,29744,33398,33490,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,63910,38331,39653,40573,26308,63911,29121,33865,63912,63913,22603,63914,63915,23992,24433,63916,26144,26254,27001,27054,27704,27891,28214,28481,28634,28699,28719,29008,29151,29552,63917,29787,63918,29908,30408,31310,32403,63919,63920,33521,35424,36814,63921,37704,63922,38681,63923,63924,20034,20522,63925,21000,21473,26355,27757,28618,29450,30591,31330,33454,34269,34306,63926,35028,35427,35709,35947,63927,37555,63928,38675,38928,20116,20237,20425,20658,21320,21566,21555,21978,22626,22714,22887,23067,23524,24735,63929,25034,25942,26111,26212,26791,27738,28595,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,28879,29100,29522,31613,34568,35492,39986,40711,23627,27779,29508,29577,37434,28331,29797,30239,31337,32277,34314,20800,22725,25793,29934,29973,30320,32705,37013,38605,39252,28198,29926,31401,31402,33253,34521,34680,35355,23113,23436,23451,26785,26880,28003,29609,29715,29740,30871,32233,32747,33048,33109,33694,35916,38446,38929,26352,24448,26106,26505,27754,29579,20525,23043,27498,30702,22806,23916,24013,29477,30031,63930,63931,20709,20985,22575,22829,22934,23002,23525,63932,63933,23970,25303,25622,25747,25854,63934,26332,63935,27208,63936,29183,29796,63937,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,31368,31407,32327,32350,32768,33136,63938,34799,35201,35616,36953,63939,36992,39250,24958,27442,28020,32287,35109,36785,20433,20653,20887,21191,22471,22665,23481,24248,24898,27029,28044,28263,28342,29076,29794,29992,29996,32883,33592,33993,36362,37780,37854,63940,20110,20305,20598,20778,21448,21451,21491,23431,23507,23588,24858,24962,26100,29275,29591,29760,30402,31056,31121,31161,32006,32701,33419,34261,34398,36802,36935,37109,37354,38533,38632,38633,21206,24423,26093,26161,26671,29020,31286,37057,38922,20113,63941,27218,27550,28560,29065,32792,33464,34131,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,36939,38549,38642,38907,34074,39729,20112,29066,38596,20803,21407,21729,22291,22290,22435,23195,23236,23491,24616,24895,25588,27781,27961,28274,28304,29232,29503,29783,33489,34945,36677,36960,63942,38498,39000,40219,26376,36234,37470,20301,20553,20702,21361,22285,22996,23041,23561,24944,26256,28205,29234,29771,32239,32963,33806,33894,34111,34655,34907,35096,35586,36949,38859,39759,20083,20369,20754,20842,63943,21807,21929,23418,23461,24188,24189,24254,24736,24799,24840,24841,25540,25912,26377,63944,26580,26586,63945,26977,26978,27833,27943,63946,28216,63947,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,28641,29494,29495,63948,29788,30001,63949,30290,63950,63951,32173,33278,33848,35029,35480,35547,35565,36400,36418,36938,36926,36986,37193,37321,37742,63952,63953,22537,63954,27603,32905,32946,63955,63956,20801,22891,23609,63957,63958,28516,29607,32996,36103,63959,37399,38287,63960,63961,63962,63963,32895,25102,28700,32104,34701,63964,22432,24681,24903,27575,35518,37504,38577,20057,21535,28139,34093,38512,38899,39150,25558,27875,37009,20957,25033,33210,40441,20381,20506,20736,23452,24847,25087,25836,26885,27589,30097,30691,32681,33380,34191,34811,34915,35516,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,35696,37291,20108,20197,20234,63965,63966,22839,23016,63967,24050,24347,24411,24609,63968,63969,63970,63971,29246,29669,63972,30064,30157,63973,31227,63974,32780,32819,32900,33505,33617,63975,63976,36029,36019,36999,63977,63978,39156,39180,63979,63980,28727,30410,32714,32716,32764,35610,20154,20161,20995,21360,63981,21693,22240,23035,23493,24341,24525,28270,63982,63983,32106,33589,63984,34451,35469,63985,38765,38775,63986,63987,19968,20314,20350,22777,26085,28322,36920,37808,39353,20219,22764,22922,23001,24641,63988,63989,31252,63990,33615,36035,20837,21316,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,63991,63992,63993,20173,21097,23381,33471,20180,21050,21672,22985,23039,23376,23383,23388,24675,24904,28363,28825,29038,29574,29943,30133,30913,32043,32773,33258,33576,34071,34249,35566,36039,38604,20316,21242,22204,26027,26152,28796,28856,29237,32189,33421,37196,38592,40306,23409,26855,27544,28538,30430,23697,26283,28507,31668,31786,34870,38620,19976,20183,21280,22580,22715,22767,22892,23559,24115,24196,24373,25484,26290,26454,27167,27299,27404,28479,29254,63994,29520,29835,31456,31911,33144,33247,33255,33674,33900,34083,34196,34255,35037,36115,37292,38263,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,38556,20877,21705,22312,23472,25165,26448,26685,26771,28221,28371,28797,32289,35009,36001,36617,40779,40782,29229,31631,35533,37658,20295,20302,20786,21632,22992,24213,25269,26485,26990,27159,27822,28186,29401,29482,30141,31672,32053,33511,33785,33879,34295,35419,36015,36487,36889,37048,38606,40799,21219,21514,23265,23490,25688,25973,28404,29380,63995,30340,31309,31515,31821,32318,32735,33659,35627,36042,36196,36321,36447,36842,36857,36969,37841,20291,20346,20659,20840,20856,21069,21098,22625,22652,22880,23560,23637,24283,24731,25136,26643,27583,27656,28593,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,29006,29728,30000,30008,30033,30322,31564,31627,31661,31686,32399,35438,36670,36681,37439,37523,37666,37931,38651,39002,39019,39198,20999,25130,25240,27993,30308,31434,31680,32118,21344,23742,24215,28472,28857,31896,38673,39822,40670,25509,25722,34678,19969,20117,20141,20572,20597,21576,22979,23450,24128,24237,24311,24449,24773,25402,25919,25972,26060,26230,26232,26622,26984,27273,27491,27712,28096,28136,28191,28254,28702,28833,29582,29693,30010,30555,30855,31118,31243,31357,31934,32142,33351,35330,35562,35998,37165,37194,37336,37478,37580,37664,38662,38742,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,38748,38914,40718,21046,21137,21884,22564,24093,24351,24716,25552,26799,28639,31085,31532,33229,34234,35069,35576,36420,37261,38500,38555,38717,38988,40778,20430,20806,20939,21161,22066,24340,24427,25514,25805,26089,26177,26362,26361,26397,26781,26839,27133,28437,28526,29031,29157,29226,29866,30522,31062,31066,31199,31264,31381,31895,31967,32068,32368,32903,34299,34468,35412,35519,36249,36481,36896,36973,37347,38459,38613,40165,26063,31751,36275,37827,23384,23562,21330,25305,29469,20519,23447,24478,24752,24939,26837,28121,29742,31278,32066,32156,32305,33131,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,36394,36405,37758,37912,20304,22352,24038,24231,25387,32618,20027,20303,20367,20570,23005,32964,21610,21608,22014,22863,23449,24030,24282,26205,26417,26609,26666,27880,27954,28234,28557,28855,29664,30087,31820,32002,32044,32162,33311,34523,35387,35461,36208,36490,36659,36913,37198,37202,37956,39376,31481,31909,20426,20737,20934,22472,23535,23803,26201,27197,27994,28310,28652,28940,30063,31459,34850,36897,36981,38603,39423,33537,20013,20210,34886,37325,21373,27355,26987,27713,33914,22686,24974,26366,25327,28893,29969,30151,32338,33976,35657,36104,20043,21482,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,21675,22320,22336,24535,25345,25351,25711,25903,26088,26234,26525,26547,27490,27744,27802,28460,30693,30757,31049,31063,32025,32930,33026,33267,33437,33463,34584,35468,63996,36100,36286,36978,30452,31257,31287,32340,32887,21767,21972,22645,25391,25634,26185,26187,26733,27035,27524,27941,28337,29645,29800,29857,30043,30137,30433,30494,30603,31206,32265,32285,33275,34095,34967,35386,36049,36587,36784,36914,37805,38499,38515,38663,20356,21489,23018,23241,24089,26702,29894,30142,31209,31378,33187,34541,36074,36300,36845,26015,26389,63997,22519,28503,32221,36655,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,37878,38598,24501,25074,28548,19988,20376,20511,21449,21983,23919,24046,27425,27492,30923,31642,63998,36425,36554,36974,25417,25662,30528,31364,37679,38015,40810,25776,28591,29158,29864,29914,31428,31762,32386,31922,32408,35738,36106,38013,39184,39244,21049,23519,25830,26413,32046,20717,21443,22649,24920,24921,25082,26028,31449,35730,35734,20489,20513,21109,21809,23100,24288,24432,24884,25950,26124,26166,26274,27085,28356,28466,29462,30241,31379,33081,33369,33750,33980,20661,22512,23488,23528,24425,25505,30758,32181,33756,34081,37319,37365,20874,26613,31574,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,36012,20932,22971,24765,34389,20508,63999,21076,23610,24957,25114,25299,25842,26021,28364,30240,33034,36448,38495,38587,20191,21315,21912,22825,24029,25797,27849,28154,29588,31359,33307,34214,36068,36368,36983,37351,38369,38433,38854,20984,21746,21894,24505,25764,28552,32180,36639,36685,37941,20681,23574,27838,28155,29979,30651,31805,31844,35449,35522,22558,22974,24086,25463,29266,30090,30571,35548,36028,36626,24307,26228,28152,32893,33729,35531,38737,39894,64000,21059,26367,28053,28399,32224,35558,36910,36958,39636,21021,21119,21736,24980,25220,25307,26786,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,26898,26970,27189,28818,28966,30813,30977,30990,31186,31245,32918,33400,33493,33609,34121,35970,36229,37218,37259,37294,20419,22225,29165,30679,34560,35320,23544,24534,26449,37032,21474,22618,23541,24740,24961,25696,32317,32880,34085,37507,25774,20652,23828,26368,22684,25277,25512,26894,27000,27166,28267,30394,31179,33467,33833,35535,36264,36861,37138,37195,37276,37648,37656,37786,38619,39478,39949,19985,30044,31069,31482,31569,31689,32302,33988,36441,36468,36600,36880,26149,26943,29763,20986,26414,40668,20805,24544,27798,34802,34909,34935,24756,33205,33795,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,36101,21462,21561,22068,23094,23601,28810,32736,32858,33030,33261,36259,37257,39519,40434,20596,20164,21408,24827,28204,23652,20360,20516,21988,23769,24159,24677,26772,27835,28100,29118,30164,30196,30305,31258,31305,32199,32251,32622,33268,34473,36636,38601,39347,40786,21063,21189,39149,35242,19971,26578,28422,20405,23522,26517,27784,28024,29723,30759,37341,37756,34756,31204,31281,24555,20182,21668,21822,22702,22949,24816,25171,25302,26422,26965,33333,38464,39345,39389,20524,21331,21828,22396,64001,25176,64002,25826,26219,26589,28609,28655,29730,29752,35351,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,37944,21585,22022,22374,24392,24986,27470,28760,28845,32187,35477,22890,33067,25506,30472,32829,36010,22612,25645,27067,23445,24081,28271,64003,34153,20812,21488,22826,24608,24907,27526,27760,27888,31518,32974,33492,36294,37040,39089,64004,25799,28580,25745,25860,20814,21520,22303,35342,24927,26742,64005,30171,31570,32113,36890,22534,27084,33151,35114,36864,38969,20600,22871,22956,25237,36879,39722,24925,29305,38358,22369,23110,24052,25226,25773,25850,26487,27874,27966,29228,29750,30772,32631,33453,36315,38935,21028,22338,26495,29256,29923,36009,36774,37393,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,38442,20843,21485,25420,20329,21764,24726,25943,27803,28031,29260,29437,31255,35207,35997,24429,28558,28921,33192,24846,20415,20559,25153,29255,31687,32232,32745,36941,38829,39449,36022,22378,24179,26544,33805,35413,21536,23318,24163,24290,24330,25987,32954,34109,38281,38491,20296,21253,21261,21263,21638,21754,22275,24067,24598,25243,25265,25429,64006,27873,28006,30129,30770,32990,33071,33502,33889,33970,34957,35090,36875,37610,39165,39825,24133,26292,26333,28689,29190,64007,20469,21117,24426,24915,26451,27161,28418,29922,31080,34920,35961,39111,39108,39491,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,21697,31263,26963,35575,35914,39080,39342,24444,25259,30130,30382,34987,36991,38466,21305,24380,24517,27852,29644,30050,30091,31558,33534,39325,20047,36924,19979,20309,21414,22799,24264,26160,27827,29781,33655,34662,36032,36944,38686,39957,22737,23416,34384,35604,40372,23506,24680,24717,26097,27735,28450,28579,28698,32597,32752,38289,38290,38480,38867,21106,36676,20989,21547,21688,21859,21898,27323,28085,32216,33382,37532,38519,40569,21512,21704,30418,34532,38308,38356,38492,20130,20233,23022,23270,24055,24658,25239,26477,26689,27782,28207,32568,32923,33322,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,64008,64009,38917,20133,20565,21683,22419,22874,23401,23475,25032,26999,28023,28707,34809,35299,35442,35559,36994,39405,39608,21182,26680,20502,24184,26447,33607,34892,20139,21521,22190,29670,37141,38911,39177,39255,39321,22099,22687,34395,35377,25010,27382,29563,36562,27463,38570,39511,22869,29184,36203,38761,20436,23796,24358,25080,26203,27883,28843,29572,29625,29694,30505,30541,32067,32098,32291,33335,34898,64010,36066,37449,39023,23377,31348,34880,38913,23244,20448,21332,22846,23805,25406,28025,29433,33029,33031,33698,37583,38960,20136,20804,21009,22411,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,24418,27842,28366,28677,28752,28847,29074,29673,29801,33610,34722,34913,36872,37026,37795,39336,20846,24407,24800,24935,26291,34137,36426,37295,38795,20046,20114,21628,22741,22778,22909,23733,24359,25142,25160,26122,26215,27627,28009,28111,28246,28408,28564,28640,28649,28765,29392,29733,29786,29920,30355,31068,31946,32286,32993,33446,33899,33983,34382,34399,34676,35703,35946,37804,38912,39013,24785,25110,37239,23130,26127,28151,28222,29759,39746,24573,24794,31503,21700,24344,27742,27859,27946,28888,32005,34425,35340,40251,21270,21644,23301,27194,28779,30069,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,31117,31166,33457,33775,35441,35649,36008,38772,64011,25844,25899,30906,30907,31339,20024,21914,22864,23462,24187,24739,25563,27489,26213,26707,28185,29029,29872,32008,36996,39529,39973,27963,28369,29502,35905,38346,20976,24140,24488,24653,24822,24880,24908,26179,26180,27045,27841,28255,28361,28514,29004,29852,30343,31681,31783,33618,34647,36945,38541,40643,21295,22238,24315,24458,24674,24724,25079,26214,26371,27292,28142,28590,28784,29546,32362,33214,33588,34516,35496,36036,21123,29554,23446,27243,37892,21742,22150,23389,25928,25989,26313,26783,28045,28102,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,29243,32948,37237,39501,20399,20505,21402,21518,21564,21897,21957,24127,24460,26429,29030,29661,36869,21211,21235,22628,22734,28932,29071,29179,34224,35347,26248,34216,21927,26244,29002,33841,21321,21913,27585,24409,24509,25582,26249,28999,35569,36637,40638,20241,25658,28875,30054,34407,24676,35662,40440,20807,20982,21256,27958,33016,40657,26133,27427,28824,30165,21507,23673,32007,35350,27424,27453,27462,21560,24688,27965,32725,33288,20694,20958,21916,22123,22221,23020,23305,24076,24985,24984,25137,26206,26342,29081,29113,29114,29351,31143,31232,32690,35440,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null],\n  \"gb18030\":[19970,19972,19973,19974,19983,19986,19991,19999,20000,20001,20003,20006,20009,20014,20015,20017,20019,20021,20023,20028,20032,20033,20034,20036,20038,20042,20049,20053,20055,20058,20059,20066,20067,20068,20069,20071,20072,20074,20075,20076,20077,20078,20079,20082,20084,20085,20086,20087,20088,20089,20090,20091,20092,20093,20095,20096,20097,20098,20099,20100,20101,20103,20106,20112,20118,20119,20121,20124,20125,20126,20131,20138,20143,20144,20145,20148,20150,20151,20152,20153,20156,20157,20158,20168,20172,20175,20176,20178,20186,20187,20188,20192,20194,20198,20199,20201,20205,20206,20207,20209,20212,20216,20217,20218,20220,20222,20224,20226,20227,20228,20229,20230,20231,20232,20235,20236,20242,20243,20244,20245,20246,20252,20253,20257,20259,20264,20265,20268,20269,20270,20273,20275,20277,20279,20281,20283,20286,20287,20288,20289,20290,20292,20293,20295,20296,20297,20298,20299,20300,20306,20308,20310,20321,20322,20326,20328,20330,20331,20333,20334,20337,20338,20341,20343,20344,20345,20346,20349,20352,20353,20354,20357,20358,20359,20362,20364,20366,20368,20370,20371,20373,20374,20376,20377,20378,20380,20382,20383,20385,20386,20388,20395,20397,20400,20401,20402,20403,20404,20406,20407,20408,20409,20410,20411,20412,20413,20414,20416,20417,20418,20422,20423,20424,20425,20427,20428,20429,20434,20435,20436,20437,20438,20441,20443,20448,20450,20452,20453,20455,20459,20460,20464,20466,20468,20469,20470,20471,20473,20475,20476,20477,20479,20480,20481,20482,20483,20484,20485,20486,20487,20488,20489,20490,20491,20494,20496,20497,20499,20501,20502,20503,20507,20509,20510,20512,20514,20515,20516,20519,20523,20527,20528,20529,20530,20531,20532,20533,20534,20535,20536,20537,20539,20541,20543,20544,20545,20546,20548,20549,20550,20553,20554,20555,20557,20560,20561,20562,20563,20564,20566,20567,20568,20569,20571,20573,20574,20575,20576,20577,20578,20579,20580,20582,20583,20584,20585,20586,20587,20589,20590,20591,20592,20593,20594,20595,20596,20597,20600,20601,20602,20604,20605,20609,20610,20611,20612,20614,20615,20617,20618,20619,20620,20622,20623,20624,20625,20626,20627,20628,20629,20630,20631,20632,20633,20634,20635,20636,20637,20638,20639,20640,20641,20642,20644,20646,20650,20651,20653,20654,20655,20656,20657,20659,20660,20661,20662,20663,20664,20665,20668,20669,20670,20671,20672,20673,20674,20675,20676,20677,20678,20679,20680,20681,20682,20683,20684,20685,20686,20688,20689,20690,20691,20692,20693,20695,20696,20697,20699,20700,20701,20702,20703,20704,20705,20706,20707,20708,20709,20712,20713,20714,20715,20719,20720,20721,20722,20724,20726,20727,20728,20729,20730,20732,20733,20734,20735,20736,20737,20738,20739,20740,20741,20744,20745,20746,20748,20749,20750,20751,20752,20753,20755,20756,20757,20758,20759,20760,20761,20762,20763,20764,20765,20766,20767,20768,20770,20771,20772,20773,20774,20775,20776,20777,20778,20779,20780,20781,20782,20783,20784,20785,20786,20787,20788,20789,20790,20791,20792,20793,20794,20795,20796,20797,20798,20802,20807,20810,20812,20814,20815,20816,20818,20819,20823,20824,20825,20827,20829,20830,20831,20832,20833,20835,20836,20838,20839,20841,20842,20847,20850,20858,20862,20863,20867,20868,20870,20871,20874,20875,20878,20879,20880,20881,20883,20884,20888,20890,20893,20894,20895,20897,20899,20902,20903,20904,20905,20906,20909,20910,20916,20920,20921,20922,20926,20927,20929,20930,20931,20933,20936,20938,20941,20942,20944,20946,20947,20948,20949,20950,20951,20952,20953,20954,20956,20958,20959,20962,20963,20965,20966,20967,20968,20969,20970,20972,20974,20977,20978,20980,20983,20990,20996,20997,21001,21003,21004,21007,21008,21011,21012,21013,21020,21022,21023,21025,21026,21027,21029,21030,21031,21034,21036,21039,21041,21042,21044,21045,21052,21054,21060,21061,21062,21063,21064,21065,21067,21070,21071,21074,21075,21077,21079,21080,21081,21082,21083,21085,21087,21088,21090,21091,21092,21094,21096,21099,21100,21101,21102,21104,21105,21107,21108,21109,21110,21111,21112,21113,21114,21115,21116,21118,21120,21123,21124,21125,21126,21127,21129,21130,21131,21132,21133,21134,21135,21137,21138,21140,21141,21142,21143,21144,21145,21146,21148,21156,21157,21158,21159,21166,21167,21168,21172,21173,21174,21175,21176,21177,21178,21179,21180,21181,21184,21185,21186,21188,21189,21190,21192,21194,21196,21197,21198,21199,21201,21203,21204,21205,21207,21209,21210,21211,21212,21213,21214,21216,21217,21218,21219,21221,21222,21223,21224,21225,21226,21227,21228,21229,21230,21231,21233,21234,21235,21236,21237,21238,21239,21240,21243,21244,21245,21249,21250,21251,21252,21255,21257,21258,21259,21260,21262,21265,21266,21267,21268,21272,21275,21276,21278,21279,21282,21284,21285,21287,21288,21289,21291,21292,21293,21295,21296,21297,21298,21299,21300,21301,21302,21303,21304,21308,21309,21312,21314,21316,21318,21323,21324,21325,21328,21332,21336,21337,21339,21341,21349,21352,21354,21356,21357,21362,21366,21369,21371,21372,21373,21374,21376,21377,21379,21383,21384,21386,21390,21391,21392,21393,21394,21395,21396,21398,21399,21401,21403,21404,21406,21408,21409,21412,21415,21418,21419,21420,21421,21423,21424,21425,21426,21427,21428,21429,21431,21432,21433,21434,21436,21437,21438,21440,21443,21444,21445,21446,21447,21454,21455,21456,21458,21459,21461,21466,21468,21469,21470,21473,21474,21479,21492,21498,21502,21503,21504,21506,21509,21511,21515,21524,21528,21529,21530,21532,21538,21540,21541,21546,21552,21555,21558,21559,21562,21565,21567,21569,21570,21572,21573,21575,21577,21580,21581,21582,21583,21585,21594,21597,21598,21599,21600,21601,21603,21605,21607,21609,21610,21611,21612,21613,21614,21615,21616,21620,21625,21626,21630,21631,21633,21635,21637,21639,21640,21641,21642,21645,21649,21651,21655,21656,21660,21662,21663,21664,21665,21666,21669,21678,21680,21682,21685,21686,21687,21689,21690,21692,21694,21699,21701,21706,21707,21718,21720,21723,21728,21729,21730,21731,21732,21739,21740,21743,21744,21745,21748,21749,21750,21751,21752,21753,21755,21758,21760,21762,21763,21764,21765,21768,21770,21771,21772,21773,21774,21778,21779,21781,21782,21783,21784,21785,21786,21788,21789,21790,21791,21793,21797,21798,21800,21801,21803,21805,21810,21812,21813,21814,21816,21817,21818,21819,21821,21824,21826,21829,21831,21832,21835,21836,21837,21838,21839,21841,21842,21843,21844,21847,21848,21849,21850,21851,21853,21854,21855,21856,21858,21859,21864,21865,21867,21871,21872,21873,21874,21875,21876,21881,21882,21885,21887,21893,21894,21900,21901,21902,21904,21906,21907,21909,21910,21911,21914,21915,21918,21920,21921,21922,21923,21924,21925,21926,21928,21929,21930,21931,21932,21933,21934,21935,21936,21938,21940,21942,21944,21946,21948,21951,21952,21953,21954,21955,21958,21959,21960,21962,21963,21966,21967,21968,21973,21975,21976,21977,21978,21979,21982,21984,21986,21991,21993,21997,21998,22000,22001,22004,22006,22008,22009,22010,22011,22012,22015,22018,22019,22020,22021,22022,22023,22026,22027,22029,22032,22033,22034,22035,22036,22037,22038,22039,22041,22042,22044,22045,22048,22049,22050,22053,22054,22056,22057,22058,22059,22062,22063,22064,22067,22069,22071,22072,22074,22076,22077,22078,22080,22081,22082,22083,22084,22085,22086,22087,22088,22089,22090,22091,22095,22096,22097,22098,22099,22101,22102,22106,22107,22109,22110,22111,22112,22113,22115,22117,22118,22119,22125,22126,22127,22128,22130,22131,22132,22133,22135,22136,22137,22138,22141,22142,22143,22144,22145,22146,22147,22148,22151,22152,22153,22154,22155,22156,22157,22160,22161,22162,22164,22165,22166,22167,22168,22169,22170,22171,22172,22173,22174,22175,22176,22177,22178,22180,22181,22182,22183,22184,22185,22186,22187,22188,22189,22190,22192,22193,22194,22195,22196,22197,22198,22200,22201,22202,22203,22205,22206,22207,22208,22209,22210,22211,22212,22213,22214,22215,22216,22217,22219,22220,22221,22222,22223,22224,22225,22226,22227,22229,22230,22232,22233,22236,22243,22245,22246,22247,22248,22249,22250,22252,22254,22255,22258,22259,22262,22263,22264,22267,22268,22272,22273,22274,22277,22279,22283,22284,22285,22286,22287,22288,22289,22290,22291,22292,22293,22294,22295,22296,22297,22298,22299,22301,22302,22304,22305,22306,22308,22309,22310,22311,22315,22321,22322,22324,22325,22326,22327,22328,22332,22333,22335,22337,22339,22340,22341,22342,22344,22345,22347,22354,22355,22356,22357,22358,22360,22361,22370,22371,22373,22375,22380,22382,22384,22385,22386,22388,22389,22392,22393,22394,22397,22398,22399,22400,22401,22407,22408,22409,22410,22413,22414,22415,22416,22417,22420,22421,22422,22423,22424,22425,22426,22428,22429,22430,22431,22437,22440,22442,22444,22447,22448,22449,22451,22453,22454,22455,22457,22458,22459,22460,22461,22462,22463,22464,22465,22468,22469,22470,22471,22472,22473,22474,22476,22477,22480,22481,22483,22486,22487,22491,22492,22494,22497,22498,22499,22501,22502,22503,22504,22505,22506,22507,22508,22510,22512,22513,22514,22515,22517,22518,22519,22523,22524,22526,22527,22529,22531,22532,22533,22536,22537,22538,22540,22542,22543,22544,22546,22547,22548,22550,22551,22552,22554,22555,22556,22557,22559,22562,22563,22565,22566,22567,22568,22569,22571,22572,22573,22574,22575,22577,22578,22579,22580,22582,22583,22584,22585,22586,22587,22588,22589,22590,22591,22592,22593,22594,22595,22597,22598,22599,22600,22601,22602,22603,22606,22607,22608,22610,22611,22613,22614,22615,22617,22618,22619,22620,22621,22623,22624,22625,22626,22627,22628,22630,22631,22632,22633,22634,22637,22638,22639,22640,22641,22642,22643,22644,22645,22646,22647,22648,22649,22650,22651,22652,22653,22655,22658,22660,22662,22663,22664,22666,22667,22668,22669,22670,22671,22672,22673,22676,22677,22678,22679,22680,22683,22684,22685,22688,22689,22690,22691,22692,22693,22694,22695,22698,22699,22700,22701,22702,22703,22704,22705,22706,22707,22708,22709,22710,22711,22712,22713,22714,22715,22717,22718,22719,22720,22722,22723,22724,22726,22727,22728,22729,22730,22731,22732,22733,22734,22735,22736,22738,22739,22740,22742,22743,22744,22745,22746,22747,22748,22749,22750,22751,22752,22753,22754,22755,22757,22758,22759,22760,22761,22762,22765,22767,22769,22770,22772,22773,22775,22776,22778,22779,22780,22781,22782,22783,22784,22785,22787,22789,22790,22792,22793,22794,22795,22796,22798,22800,22801,22802,22803,22807,22808,22811,22813,22814,22816,22817,22818,22819,22822,22824,22828,22832,22834,22835,22837,22838,22843,22845,22846,22847,22848,22851,22853,22854,22858,22860,22861,22864,22866,22867,22873,22875,22876,22877,22878,22879,22881,22883,22884,22886,22887,22888,22889,22890,22891,22892,22893,22894,22895,22896,22897,22898,22901,22903,22906,22907,22908,22910,22911,22912,22917,22921,22923,22924,22926,22927,22928,22929,22932,22933,22936,22938,22939,22940,22941,22943,22944,22945,22946,22950,22951,22956,22957,22960,22961,22963,22964,22965,22966,22967,22968,22970,22972,22973,22975,22976,22977,22978,22979,22980,22981,22983,22984,22985,22988,22989,22990,22991,22997,22998,23001,23003,23006,23007,23008,23009,23010,23012,23014,23015,23017,23018,23019,23021,23022,23023,23024,23025,23026,23027,23028,23029,23030,23031,23032,23034,23036,23037,23038,23040,23042,23050,23051,23053,23054,23055,23056,23058,23060,23061,23062,23063,23065,23066,23067,23069,23070,23073,23074,23076,23078,23079,23080,23082,23083,23084,23085,23086,23087,23088,23091,23093,23095,23096,23097,23098,23099,23101,23102,23103,23105,23106,23107,23108,23109,23111,23112,23115,23116,23117,23118,23119,23120,23121,23122,23123,23124,23126,23127,23128,23129,23131,23132,23133,23134,23135,23136,23137,23139,23140,23141,23142,23144,23145,23147,23148,23149,23150,23151,23152,23153,23154,23155,23160,23161,23163,23164,23165,23166,23168,23169,23170,23171,23172,23173,23174,23175,23176,23177,23178,23179,23180,23181,23182,23183,23184,23185,23187,23188,23189,23190,23191,23192,23193,23196,23197,23198,23199,23200,23201,23202,23203,23204,23205,23206,23207,23208,23209,23211,23212,23213,23214,23215,23216,23217,23220,23222,23223,23225,23226,23227,23228,23229,23231,23232,23235,23236,23237,23238,23239,23240,23242,23243,23245,23246,23247,23248,23249,23251,23253,23255,23257,23258,23259,23261,23262,23263,23266,23268,23269,23271,23272,23274,23276,23277,23278,23279,23280,23282,23283,23284,23285,23286,23287,23288,23289,23290,23291,23292,23293,23294,23295,23296,23297,23298,23299,23300,23301,23302,23303,23304,23306,23307,23308,23309,23310,23311,23312,23313,23314,23315,23316,23317,23320,23321,23322,23323,23324,23325,23326,23327,23328,23329,23330,23331,23332,23333,23334,23335,23336,23337,23338,23339,23340,23341,23342,23343,23344,23345,23347,23349,23350,23352,23353,23354,23355,23356,23357,23358,23359,23361,23362,23363,23364,23365,23366,23367,23368,23369,23370,23371,23372,23373,23374,23375,23378,23382,23390,23392,23393,23399,23400,23403,23405,23406,23407,23410,23412,23414,23415,23416,23417,23419,23420,23422,23423,23426,23430,23434,23437,23438,23440,23441,23442,23444,23446,23455,23463,23464,23465,23468,23469,23470,23471,23473,23474,23479,23482,23483,23484,23488,23489,23491,23496,23497,23498,23499,23501,23502,23503,23505,23508,23509,23510,23511,23512,23513,23514,23515,23516,23520,23522,23523,23526,23527,23529,23530,23531,23532,23533,23535,23537,23538,23539,23540,23541,23542,23543,23549,23550,23552,23554,23555,23557,23559,23560,23563,23564,23565,23566,23568,23570,23571,23575,23577,23579,23582,23583,23584,23585,23587,23590,23592,23593,23594,23595,23597,23598,23599,23600,23602,23603,23605,23606,23607,23619,23620,23622,23623,23628,23629,23634,23635,23636,23638,23639,23640,23642,23643,23644,23645,23647,23650,23652,23655,23656,23657,23658,23659,23660,23661,23664,23666,23667,23668,23669,23670,23671,23672,23675,23676,23677,23678,23680,23683,23684,23685,23686,23687,23689,23690,23691,23694,23695,23698,23699,23701,23709,23710,23711,23712,23713,23716,23717,23718,23719,23720,23722,23726,23727,23728,23730,23732,23734,23737,23738,23739,23740,23742,23744,23746,23747,23749,23750,23751,23752,23753,23754,23756,23757,23758,23759,23760,23761,23763,23764,23765,23766,23767,23768,23770,23771,23772,23773,23774,23775,23776,23778,23779,23783,23785,23787,23788,23790,23791,23793,23794,23795,23796,23797,23798,23799,23800,23801,23802,23804,23805,23806,23807,23808,23809,23812,23813,23816,23817,23818,23819,23820,23821,23823,23824,23825,23826,23827,23829,23831,23832,23833,23834,23836,23837,23839,23840,23841,23842,23843,23845,23848,23850,23851,23852,23855,23856,23857,23858,23859,23861,23862,23863,23864,23865,23866,23867,23868,23871,23872,23873,23874,23875,23876,23877,23878,23880,23881,23885,23886,23887,23888,23889,23890,23891,23892,23893,23894,23895,23897,23898,23900,23902,23903,23904,23905,23906,23907,23908,23909,23910,23911,23912,23914,23917,23918,23920,23921,23922,23923,23925,23926,23927,23928,23929,23930,23931,23932,23933,23934,23935,23936,23937,23939,23940,23941,23942,23943,23944,23945,23946,23947,23948,23949,23950,23951,23952,23953,23954,23955,23956,23957,23958,23959,23960,23962,23963,23964,23966,23967,23968,23969,23970,23971,23972,23973,23974,23975,23976,23977,23978,23979,23980,23981,23982,23983,23984,23985,23986,23987,23988,23989,23990,23992,23993,23994,23995,23996,23997,23998,23999,24000,24001,24002,24003,24004,24006,24007,24008,24009,24010,24011,24012,24014,24015,24016,24017,24018,24019,24020,24021,24022,24023,24024,24025,24026,24028,24031,24032,24035,24036,24042,24044,24045,24048,24053,24054,24056,24057,24058,24059,24060,24063,24064,24068,24071,24073,24074,24075,24077,24078,24082,24083,24087,24094,24095,24096,24097,24098,24099,24100,24101,24104,24105,24106,24107,24108,24111,24112,24114,24115,24116,24117,24118,24121,24122,24126,24127,24128,24129,24131,24134,24135,24136,24137,24138,24139,24141,24142,24143,24144,24145,24146,24147,24150,24151,24152,24153,24154,24156,24157,24159,24160,24163,24164,24165,24166,24167,24168,24169,24170,24171,24172,24173,24174,24175,24176,24177,24181,24183,24185,24190,24193,24194,24195,24197,24200,24201,24204,24205,24206,24210,24216,24219,24221,24225,24226,24227,24228,24232,24233,24234,24235,24236,24238,24239,24240,24241,24242,24244,24250,24251,24252,24253,24255,24256,24257,24258,24259,24260,24261,24262,24263,24264,24267,24268,24269,24270,24271,24272,24276,24277,24279,24280,24281,24282,24284,24285,24286,24287,24288,24289,24290,24291,24292,24293,24294,24295,24297,24299,24300,24301,24302,24303,24304,24305,24306,24307,24309,24312,24313,24315,24316,24317,24325,24326,24327,24329,24332,24333,24334,24336,24338,24340,24342,24345,24346,24348,24349,24350,24353,24354,24355,24356,24360,24363,24364,24366,24368,24370,24371,24372,24373,24374,24375,24376,24379,24381,24382,24383,24385,24386,24387,24388,24389,24390,24391,24392,24393,24394,24395,24396,24397,24398,24399,24401,24404,24409,24410,24411,24412,24414,24415,24416,24419,24421,24423,24424,24427,24430,24431,24434,24436,24437,24438,24440,24442,24445,24446,24447,24451,24454,24461,24462,24463,24465,24467,24468,24470,24474,24475,24477,24478,24479,24480,24482,24483,24484,24485,24486,24487,24489,24491,24492,24495,24496,24497,24498,24499,24500,24502,24504,24505,24506,24507,24510,24511,24512,24513,24514,24519,24520,24522,24523,24526,24531,24532,24533,24538,24539,24540,24542,24543,24546,24547,24549,24550,24552,24553,24556,24559,24560,24562,24563,24564,24566,24567,24569,24570,24572,24583,24584,24585,24587,24588,24592,24593,24595,24599,24600,24602,24606,24607,24610,24611,24612,24620,24621,24622,24624,24625,24626,24627,24628,24630,24631,24632,24633,24634,24637,24638,24640,24644,24645,24646,24647,24648,24649,24650,24652,24654,24655,24657,24659,24660,24662,24663,24664,24667,24668,24670,24671,24672,24673,24677,24678,24686,24689,24690,24692,24693,24695,24702,24704,24705,24706,24709,24710,24711,24712,24714,24715,24718,24719,24720,24721,24723,24725,24727,24728,24729,24732,24734,24737,24738,24740,24741,24743,24745,24746,24750,24752,24755,24757,24758,24759,24761,24762,24765,24766,24767,24768,24769,24770,24771,24772,24775,24776,24777,24780,24781,24782,24783,24784,24786,24787,24788,24790,24791,24793,24795,24798,24801,24802,24803,24804,24805,24810,24817,24818,24821,24823,24824,24827,24828,24829,24830,24831,24834,24835,24836,24837,24839,24842,24843,24844,24848,24849,24850,24851,24852,24854,24855,24856,24857,24859,24860,24861,24862,24865,24866,24869,24872,24873,24874,24876,24877,24878,24879,24880,24881,24882,24883,24884,24885,24886,24887,24888,24889,24890,24891,24892,24893,24894,24896,24897,24898,24899,24900,24901,24902,24903,24905,24907,24909,24911,24912,24914,24915,24916,24918,24919,24920,24921,24922,24923,24924,24926,24927,24928,24929,24931,24932,24933,24934,24937,24938,24939,24940,24941,24942,24943,24945,24946,24947,24948,24950,24952,24953,24954,24955,24956,24957,24958,24959,24960,24961,24962,24963,24964,24965,24966,24967,24968,24969,24970,24972,24973,24975,24976,24977,24978,24979,24981,24982,24983,24984,24985,24986,24987,24988,24990,24991,24992,24993,24994,24995,24996,24997,24998,25002,25003,25005,25006,25007,25008,25009,25010,25011,25012,25013,25014,25016,25017,25018,25019,25020,25021,25023,25024,25025,25027,25028,25029,25030,25031,25033,25036,25037,25038,25039,25040,25043,25045,25046,25047,25048,25049,25050,25051,25052,25053,25054,25055,25056,25057,25058,25059,25060,25061,25063,25064,25065,25066,25067,25068,25069,25070,25071,25072,25073,25074,25075,25076,25078,25079,25080,25081,25082,25083,25084,25085,25086,25088,25089,25090,25091,25092,25093,25095,25097,25107,25108,25113,25116,25117,25118,25120,25123,25126,25127,25128,25129,25131,25133,25135,25136,25137,25138,25141,25142,25144,25145,25146,25147,25148,25154,25156,25157,25158,25162,25167,25168,25173,25174,25175,25177,25178,25180,25181,25182,25183,25184,25185,25186,25188,25189,25192,25201,25202,25204,25205,25207,25208,25210,25211,25213,25217,25218,25219,25221,25222,25223,25224,25227,25228,25229,25230,25231,25232,25236,25241,25244,25245,25246,25251,25254,25255,25257,25258,25261,25262,25263,25264,25266,25267,25268,25270,25271,25272,25274,25278,25280,25281,25283,25291,25295,25297,25301,25309,25310,25312,25313,25316,25322,25323,25328,25330,25333,25336,25337,25338,25339,25344,25347,25348,25349,25350,25354,25355,25356,25357,25359,25360,25362,25363,25364,25365,25367,25368,25369,25372,25382,25383,25385,25388,25389,25390,25392,25393,25395,25396,25397,25398,25399,25400,25403,25404,25406,25407,25408,25409,25412,25415,25416,25418,25425,25426,25427,25428,25430,25431,25432,25433,25434,25435,25436,25437,25440,25444,25445,25446,25448,25450,25451,25452,25455,25456,25458,25459,25460,25461,25464,25465,25468,25469,25470,25471,25473,25475,25476,25477,25478,25483,25485,25489,25491,25492,25493,25495,25497,25498,25499,25500,25501,25502,25503,25505,25508,25510,25515,25519,25521,25522,25525,25526,25529,25531,25533,25535,25536,25537,25538,25539,25541,25543,25544,25546,25547,25548,25553,25555,25556,25557,25559,25560,25561,25562,25563,25564,25565,25567,25570,25572,25573,25574,25575,25576,25579,25580,25582,25583,25584,25585,25587,25589,25591,25593,25594,25595,25596,25598,25603,25604,25606,25607,25608,25609,25610,25613,25614,25617,25618,25621,25622,25623,25624,25625,25626,25629,25631,25634,25635,25636,25637,25639,25640,25641,25643,25646,25647,25648,25649,25650,25651,25653,25654,25655,25656,25657,25659,25660,25662,25664,25666,25667,25673,25675,25676,25677,25678,25679,25680,25681,25683,25685,25686,25687,25689,25690,25691,25692,25693,25695,25696,25697,25698,25699,25700,25701,25702,25704,25706,25707,25708,25710,25711,25712,25713,25714,25715,25716,25717,25718,25719,25723,25724,25725,25726,25727,25728,25729,25731,25734,25736,25737,25738,25739,25740,25741,25742,25743,25744,25747,25748,25751,25752,25754,25755,25756,25757,25759,25760,25761,25762,25763,25765,25766,25767,25768,25770,25771,25775,25777,25778,25779,25780,25782,25785,25787,25789,25790,25791,25793,25795,25796,25798,25799,25800,25801,25802,25803,25804,25807,25809,25811,25812,25813,25814,25817,25818,25819,25820,25821,25823,25824,25825,25827,25829,25831,25832,25833,25834,25835,25836,25837,25838,25839,25840,25841,25842,25843,25844,25845,25846,25847,25848,25849,25850,25851,25852,25853,25854,25855,25857,25858,25859,25860,25861,25862,25863,25864,25866,25867,25868,25869,25870,25871,25872,25873,25875,25876,25877,25878,25879,25881,25882,25883,25884,25885,25886,25887,25888,25889,25890,25891,25892,25894,25895,25896,25897,25898,25900,25901,25904,25905,25906,25907,25911,25914,25916,25917,25920,25921,25922,25923,25924,25926,25927,25930,25931,25933,25934,25936,25938,25939,25940,25943,25944,25946,25948,25951,25952,25953,25956,25957,25959,25960,25961,25962,25965,25966,25967,25969,25971,25973,25974,25976,25977,25978,25979,25980,25981,25982,25983,25984,25985,25986,25987,25988,25989,25990,25992,25993,25994,25997,25998,25999,26002,26004,26005,26006,26008,26010,26013,26014,26016,26018,26019,26022,26024,26026,26028,26030,26033,26034,26035,26036,26037,26038,26039,26040,26042,26043,26046,26047,26048,26050,26055,26056,26057,26058,26061,26064,26065,26067,26068,26069,26072,26073,26074,26075,26076,26077,26078,26079,26081,26083,26084,26090,26091,26098,26099,26100,26101,26104,26105,26107,26108,26109,26110,26111,26113,26116,26117,26119,26120,26121,26123,26125,26128,26129,26130,26134,26135,26136,26138,26139,26140,26142,26145,26146,26147,26148,26150,26153,26154,26155,26156,26158,26160,26162,26163,26167,26168,26169,26170,26171,26173,26175,26176,26178,26180,26181,26182,26183,26184,26185,26186,26189,26190,26192,26193,26200,26201,26203,26204,26205,26206,26208,26210,26211,26213,26215,26217,26218,26219,26220,26221,26225,26226,26227,26229,26232,26233,26235,26236,26237,26239,26240,26241,26243,26245,26246,26248,26249,26250,26251,26253,26254,26255,26256,26258,26259,26260,26261,26264,26265,26266,26267,26268,26270,26271,26272,26273,26274,26275,26276,26277,26278,26281,26282,26283,26284,26285,26287,26288,26289,26290,26291,26293,26294,26295,26296,26298,26299,26300,26301,26303,26304,26305,26306,26307,26308,26309,26310,26311,26312,26313,26314,26315,26316,26317,26318,26319,26320,26321,26322,26323,26324,26325,26326,26327,26328,26330,26334,26335,26336,26337,26338,26339,26340,26341,26343,26344,26346,26347,26348,26349,26350,26351,26353,26357,26358,26360,26362,26363,26365,26369,26370,26371,26372,26373,26374,26375,26380,26382,26383,26385,26386,26387,26390,26392,26393,26394,26396,26398,26400,26401,26402,26403,26404,26405,26407,26409,26414,26416,26418,26419,26422,26423,26424,26425,26427,26428,26430,26431,26433,26436,26437,26439,26442,26443,26445,26450,26452,26453,26455,26456,26457,26458,26459,26461,26466,26467,26468,26470,26471,26475,26476,26478,26481,26484,26486,26488,26489,26490,26491,26493,26496,26498,26499,26501,26502,26504,26506,26508,26509,26510,26511,26513,26514,26515,26516,26518,26521,26523,26527,26528,26529,26532,26534,26537,26540,26542,26545,26546,26548,26553,26554,26555,26556,26557,26558,26559,26560,26562,26565,26566,26567,26568,26569,26570,26571,26572,26573,26574,26581,26582,26583,26587,26591,26593,26595,26596,26598,26599,26600,26602,26603,26605,26606,26610,26613,26614,26615,26616,26617,26618,26619,26620,26622,26625,26626,26627,26628,26630,26637,26640,26642,26644,26645,26648,26649,26650,26651,26652,26654,26655,26656,26658,26659,26660,26661,26662,26663,26664,26667,26668,26669,26670,26671,26672,26673,26676,26677,26678,26682,26683,26687,26695,26699,26701,26703,26706,26710,26711,26712,26713,26714,26715,26716,26717,26718,26719,26730,26732,26733,26734,26735,26736,26737,26738,26739,26741,26744,26745,26746,26747,26748,26749,26750,26751,26752,26754,26756,26759,26760,26761,26762,26763,26764,26765,26766,26768,26769,26770,26772,26773,26774,26776,26777,26778,26779,26780,26781,26782,26783,26784,26785,26787,26788,26789,26793,26794,26795,26796,26798,26801,26802,26804,26806,26807,26808,26809,26810,26811,26812,26813,26814,26815,26817,26819,26820,26821,26822,26823,26824,26826,26828,26830,26831,26832,26833,26835,26836,26838,26839,26841,26843,26844,26845,26846,26847,26849,26850,26852,26853,26854,26855,26856,26857,26858,26859,26860,26861,26863,26866,26867,26868,26870,26871,26872,26875,26877,26878,26879,26880,26882,26883,26884,26886,26887,26888,26889,26890,26892,26895,26897,26899,26900,26901,26902,26903,26904,26905,26906,26907,26908,26909,26910,26913,26914,26915,26917,26918,26919,26920,26921,26922,26923,26924,26926,26927,26929,26930,26931,26933,26934,26935,26936,26938,26939,26940,26942,26944,26945,26947,26948,26949,26950,26951,26952,26953,26954,26955,26956,26957,26958,26959,26960,26961,26962,26963,26965,26966,26968,26969,26971,26972,26975,26977,26978,26980,26981,26983,26984,26985,26986,26988,26989,26991,26992,26994,26995,26996,26997,26998,27002,27003,27005,27006,27007,27009,27011,27013,27018,27019,27020,27022,27023,27024,27025,27026,27027,27030,27031,27033,27034,27037,27038,27039,27040,27041,27042,27043,27044,27045,27046,27049,27050,27052,27054,27055,27056,27058,27059,27061,27062,27064,27065,27066,27068,27069,27070,27071,27072,27074,27075,27076,27077,27078,27079,27080,27081,27083,27085,27087,27089,27090,27091,27093,27094,27095,27096,27097,27098,27100,27101,27102,27105,27106,27107,27108,27109,27110,27111,27112,27113,27114,27115,27116,27118,27119,27120,27121,27123,27124,27125,27126,27127,27128,27129,27130,27131,27132,27134,27136,27137,27138,27139,27140,27141,27142,27143,27144,27145,27147,27148,27149,27150,27151,27152,27153,27154,27155,27156,27157,27158,27161,27162,27163,27164,27165,27166,27168,27170,27171,27172,27173,27174,27175,27177,27179,27180,27181,27182,27184,27186,27187,27188,27190,27191,27192,27193,27194,27195,27196,27199,27200,27201,27202,27203,27205,27206,27208,27209,27210,27211,27212,27213,27214,27215,27217,27218,27219,27220,27221,27222,27223,27226,27228,27229,27230,27231,27232,27234,27235,27236,27238,27239,27240,27241,27242,27243,27244,27245,27246,27247,27248,27250,27251,27252,27253,27254,27255,27256,27258,27259,27261,27262,27263,27265,27266,27267,27269,27270,27271,27272,27273,27274,27275,27276,27277,27279,27282,27283,27284,27285,27286,27288,27289,27290,27291,27292,27293,27294,27295,27297,27298,27299,27300,27301,27302,27303,27304,27306,27309,27310,27311,27312,27313,27314,27315,27316,27317,27318,27319,27320,27321,27322,27323,27324,27325,27326,27327,27328,27329,27330,27331,27332,27333,27334,27335,27336,27337,27338,27339,27340,27341,27342,27343,27344,27345,27346,27347,27348,27349,27350,27351,27352,27353,27354,27355,27356,27357,27358,27359,27360,27361,27362,27363,27364,27365,27366,27367,27368,27369,27370,27371,27372,27373,27374,27375,27376,27377,27378,27379,27380,27381,27382,27383,27384,27385,27386,27387,27388,27389,27390,27391,27392,27393,27394,27395,27396,27397,27398,27399,27400,27401,27402,27403,27404,27405,27406,27407,27408,27409,27410,27411,27412,27413,27414,27415,27416,27417,27418,27419,27420,27421,27422,27423,27429,27430,27432,27433,27434,27435,27436,27437,27438,27439,27440,27441,27443,27444,27445,27446,27448,27451,27452,27453,27455,27456,27457,27458,27460,27461,27464,27466,27467,27469,27470,27471,27472,27473,27474,27475,27476,27477,27478,27479,27480,27482,27483,27484,27485,27486,27487,27488,27489,27496,27497,27499,27500,27501,27502,27503,27504,27505,27506,27507,27508,27509,27510,27511,27512,27514,27517,27518,27519,27520,27525,27528,27532,27534,27535,27536,27537,27540,27541,27543,27544,27545,27548,27549,27550,27551,27552,27554,27555,27556,27557,27558,27559,27560,27561,27563,27564,27565,27566,27567,27568,27569,27570,27574,27576,27577,27578,27579,27580,27581,27582,27584,27587,27588,27590,27591,27592,27593,27594,27596,27598,27600,27601,27608,27610,27612,27613,27614,27615,27616,27618,27619,27620,27621,27622,27623,27624,27625,27628,27629,27630,27632,27633,27634,27636,27638,27639,27640,27642,27643,27644,27646,27647,27648,27649,27650,27651,27652,27656,27657,27658,27659,27660,27662,27666,27671,27676,27677,27678,27680,27683,27685,27691,27692,27693,27697,27699,27702,27703,27705,27706,27707,27708,27710,27711,27715,27716,27717,27720,27723,27724,27725,27726,27727,27729,27730,27731,27734,27736,27737,27738,27746,27747,27749,27750,27751,27755,27756,27757,27758,27759,27761,27763,27765,27767,27768,27770,27771,27772,27775,27776,27780,27783,27786,27787,27789,27790,27793,27794,27797,27798,27799,27800,27802,27804,27805,27806,27808,27810,27816,27820,27823,27824,27828,27829,27830,27831,27834,27840,27841,27842,27843,27846,27847,27848,27851,27853,27854,27855,27857,27858,27864,27865,27866,27868,27869,27871,27876,27878,27879,27881,27884,27885,27890,27892,27897,27903,27904,27906,27907,27909,27910,27912,27913,27914,27917,27919,27920,27921,27923,27924,27925,27926,27928,27932,27933,27935,27936,27937,27938,27939,27940,27942,27944,27945,27948,27949,27951,27952,27956,27958,27959,27960,27962,27967,27968,27970,27972,27977,27980,27984,27989,27990,27991,27992,27995,27997,27999,28001,28002,28004,28005,28007,28008,28011,28012,28013,28016,28017,28018,28019,28021,28022,28025,28026,28027,28029,28030,28031,28032,28033,28035,28036,28038,28039,28042,28043,28045,28047,28048,28050,28054,28055,28056,28057,28058,28060,28066,28069,28076,28077,28080,28081,28083,28084,28086,28087,28089,28090,28091,28092,28093,28094,28097,28098,28099,28104,28105,28106,28109,28110,28111,28112,28114,28115,28116,28117,28119,28122,28123,28124,28127,28130,28131,28133,28135,28136,28137,28138,28141,28143,28144,28146,28148,28149,28150,28152,28154,28157,28158,28159,28160,28161,28162,28163,28164,28166,28167,28168,28169,28171,28175,28178,28179,28181,28184,28185,28187,28188,28190,28191,28194,28198,28199,28200,28202,28204,28206,28208,28209,28211,28213,28214,28215,28217,28219,28220,28221,28222,28223,28224,28225,28226,28229,28230,28231,28232,28233,28234,28235,28236,28239,28240,28241,28242,28245,28247,28249,28250,28252,28253,28254,28256,28257,28258,28259,28260,28261,28262,28263,28264,28265,28266,28268,28269,28271,28272,28273,28274,28275,28276,28277,28278,28279,28280,28281,28282,28283,28284,28285,28288,28289,28290,28292,28295,28296,28298,28299,28300,28301,28302,28305,28306,28307,28308,28309,28310,28311,28313,28314,28315,28317,28318,28320,28321,28323,28324,28326,28328,28329,28331,28332,28333,28334,28336,28339,28341,28344,28345,28348,28350,28351,28352,28355,28356,28357,28358,28360,28361,28362,28364,28365,28366,28368,28370,28374,28376,28377,28379,28380,28381,28387,28391,28394,28395,28396,28397,28398,28399,28400,28401,28402,28403,28405,28406,28407,28408,28410,28411,28412,28413,28414,28415,28416,28417,28419,28420,28421,28423,28424,28426,28427,28428,28429,28430,28432,28433,28434,28438,28439,28440,28441,28442,28443,28444,28445,28446,28447,28449,28450,28451,28453,28454,28455,28456,28460,28462,28464,28466,28468,28469,28471,28472,28473,28474,28475,28476,28477,28479,28480,28481,28482,28483,28484,28485,28488,28489,28490,28492,28494,28495,28496,28497,28498,28499,28500,28501,28502,28503,28505,28506,28507,28509,28511,28512,28513,28515,28516,28517,28519,28520,28521,28522,28523,28524,28527,28528,28529,28531,28533,28534,28535,28537,28539,28541,28542,28543,28544,28545,28546,28547,28549,28550,28551,28554,28555,28559,28560,28561,28562,28563,28564,28565,28566,28567,28568,28569,28570,28571,28573,28574,28575,28576,28578,28579,28580,28581,28582,28584,28585,28586,28587,28588,28589,28590,28591,28592,28593,28594,28596,28597,28599,28600,28602,28603,28604,28605,28606,28607,28609,28611,28612,28613,28614,28615,28616,28618,28619,28620,28621,28622,28623,28624,28627,28628,28629,28630,28631,28632,28633,28634,28635,28636,28637,28639,28642,28643,28644,28645,28646,28647,28648,28649,28650,28651,28652,28653,28656,28657,28658,28659,28660,28661,28662,28663,28664,28665,28666,28667,28668,28669,28670,28671,28672,28673,28674,28675,28676,28677,28678,28679,28680,28681,28682,28683,28684,28685,28686,28687,28688,28690,28691,28692,28693,28694,28695,28696,28697,28700,28701,28702,28703,28704,28705,28706,28708,28709,28710,28711,28712,28713,28714,28715,28716,28717,28718,28719,28720,28721,28722,28723,28724,28726,28727,28728,28730,28731,28732,28733,28734,28735,28736,28737,28738,28739,28740,28741,28742,28743,28744,28745,28746,28747,28749,28750,28752,28753,28754,28755,28756,28757,28758,28759,28760,28761,28762,28763,28764,28765,28767,28768,28769,28770,28771,28772,28773,28774,28775,28776,28777,28778,28782,28785,28786,28787,28788,28791,28793,28794,28795,28797,28801,28802,28803,28804,28806,28807,28808,28811,28812,28813,28815,28816,28817,28819,28823,28824,28826,28827,28830,28831,28832,28833,28834,28835,28836,28837,28838,28839,28840,28841,28842,28848,28850,28852,28853,28854,28858,28862,28863,28868,28869,28870,28871,28873,28875,28876,28877,28878,28879,28880,28881,28882,28883,28884,28885,28886,28887,28890,28892,28893,28894,28896,28897,28898,28899,28901,28906,28910,28912,28913,28914,28915,28916,28917,28918,28920,28922,28923,28924,28926,28927,28928,28929,28930,28931,28932,28933,28934,28935,28936,28939,28940,28941,28942,28943,28945,28946,28948,28951,28955,28956,28957,28958,28959,28960,28961,28962,28963,28964,28965,28967,28968,28969,28970,28971,28972,28973,28974,28978,28979,28980,28981,28983,28984,28985,28986,28987,28988,28989,28990,28991,28992,28993,28994,28995,28996,28998,28999,29000,29001,29003,29005,29007,29008,29009,29010,29011,29012,29013,29014,29015,29016,29017,29018,29019,29021,29023,29024,29025,29026,29027,29029,29033,29034,29035,29036,29037,29039,29040,29041,29044,29045,29046,29047,29049,29051,29052,29054,29055,29056,29057,29058,29059,29061,29062,29063,29064,29065,29067,29068,29069,29070,29072,29073,29074,29075,29077,29078,29079,29082,29083,29084,29085,29086,29089,29090,29091,29092,29093,29094,29095,29097,29098,29099,29101,29102,29103,29104,29105,29106,29108,29110,29111,29112,29114,29115,29116,29117,29118,29119,29120,29121,29122,29124,29125,29126,29127,29128,29129,29130,29131,29132,29133,29135,29136,29137,29138,29139,29142,29143,29144,29145,29146,29147,29148,29149,29150,29151,29153,29154,29155,29156,29158,29160,29161,29162,29163,29164,29165,29167,29168,29169,29170,29171,29172,29173,29174,29175,29176,29178,29179,29180,29181,29182,29183,29184,29185,29186,29187,29188,29189,29191,29192,29193,29194,29195,29196,29197,29198,29199,29200,29201,29202,29203,29204,29205,29206,29207,29208,29209,29210,29211,29212,29214,29215,29216,29217,29218,29219,29220,29221,29222,29223,29225,29227,29229,29230,29231,29234,29235,29236,29242,29244,29246,29248,29249,29250,29251,29252,29253,29254,29257,29258,29259,29262,29263,29264,29265,29267,29268,29269,29271,29272,29274,29276,29278,29280,29283,29284,29285,29288,29290,29291,29292,29293,29296,29297,29299,29300,29302,29303,29304,29307,29308,29309,29314,29315,29317,29318,29319,29320,29321,29324,29326,29328,29329,29331,29332,29333,29334,29335,29336,29337,29338,29339,29340,29341,29342,29344,29345,29346,29347,29348,29349,29350,29351,29352,29353,29354,29355,29358,29361,29362,29363,29365,29370,29371,29372,29373,29374,29375,29376,29381,29382,29383,29385,29386,29387,29388,29391,29393,29395,29396,29397,29398,29400,29402,29403,58566,58567,58568,58569,58570,58571,58572,58573,58574,58575,58576,58577,58578,58579,58580,58581,58582,58583,58584,58585,58586,58587,58588,58589,58590,58591,58592,58593,58594,58595,58596,58597,58598,58599,58600,58601,58602,58603,58604,58605,58606,58607,58608,58609,58610,58611,58612,58613,58614,58615,58616,58617,58618,58619,58620,58621,58622,58623,58624,58625,58626,58627,58628,58629,58630,58631,58632,58633,58634,58635,58636,58637,58638,58639,58640,58641,58642,58643,58644,58645,58646,58647,58648,58649,58650,58651,58652,58653,58654,58655,58656,58657,58658,58659,58660,58661,12288,12289,12290,183,713,711,168,12291,12293,8212,65374,8214,8230,8216,8217,8220,8221,12308,12309,12296,12297,12298,12299,12300,12301,12302,12303,12310,12311,12304,12305,177,215,247,8758,8743,8744,8721,8719,8746,8745,8712,8759,8730,8869,8741,8736,8978,8857,8747,8750,8801,8780,8776,8765,8733,8800,8814,8815,8804,8805,8734,8757,8756,9794,9792,176,8242,8243,8451,65284,164,65504,65505,8240,167,8470,9734,9733,9675,9679,9678,9671,9670,9633,9632,9651,9650,8251,8594,8592,8593,8595,12307,58662,58663,58664,58665,58666,58667,58668,58669,58670,58671,58672,58673,58674,58675,58676,58677,58678,58679,58680,58681,58682,58683,58684,58685,58686,58687,58688,58689,58690,58691,58692,58693,58694,58695,58696,58697,58698,58699,58700,58701,58702,58703,58704,58705,58706,58707,58708,58709,58710,58711,58712,58713,58714,58715,58716,58717,58718,58719,58720,58721,58722,58723,58724,58725,58726,58727,58728,58729,58730,58731,58732,58733,58734,58735,58736,58737,58738,58739,58740,58741,58742,58743,58744,58745,58746,58747,58748,58749,58750,58751,58752,58753,58754,58755,58756,58757,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,59238,59239,59240,59241,59242,59243,9352,9353,9354,9355,9356,9357,9358,9359,9360,9361,9362,9363,9364,9365,9366,9367,9368,9369,9370,9371,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345,9346,9347,9348,9349,9350,9351,9312,9313,9314,9315,9316,9317,9318,9319,9320,9321,8364,59245,12832,12833,12834,12835,12836,12837,12838,12839,12840,12841,59246,59247,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554,8555,59248,59249,58758,58759,58760,58761,58762,58763,58764,58765,58766,58767,58768,58769,58770,58771,58772,58773,58774,58775,58776,58777,58778,58779,58780,58781,58782,58783,58784,58785,58786,58787,58788,58789,58790,58791,58792,58793,58794,58795,58796,58797,58798,58799,58800,58801,58802,58803,58804,58805,58806,58807,58808,58809,58810,58811,58812,58813,58814,58815,58816,58817,58818,58819,58820,58821,58822,58823,58824,58825,58826,58827,58828,58829,58830,58831,58832,58833,58834,58835,58836,58837,58838,58839,58840,58841,58842,58843,58844,58845,58846,58847,58848,58849,58850,58851,58852,12288,65281,65282,65283,65509,65285,65286,65287,65288,65289,65290,65291,65292,65293,65294,65295,65296,65297,65298,65299,65300,65301,65302,65303,65304,65305,65306,65307,65308,65309,65310,65311,65312,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,65339,65340,65341,65342,65343,65344,65345,65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,65371,65372,65373,65507,58854,58855,58856,58857,58858,58859,58860,58861,58862,58863,58864,58865,58866,58867,58868,58869,58870,58871,58872,58873,58874,58875,58876,58877,58878,58879,58880,58881,58882,58883,58884,58885,58886,58887,58888,58889,58890,58891,58892,58893,58894,58895,58896,58897,58898,58899,58900,58901,58902,58903,58904,58905,58906,58907,58908,58909,58910,58911,58912,58913,58914,58915,58916,58917,58918,58919,58920,58921,58922,58923,58924,58925,58926,58927,58928,58929,58930,58931,58932,58933,58934,58935,58936,58937,58938,58939,58940,58941,58942,58943,58944,58945,58946,58947,58948,58949,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,59250,59251,59252,59253,59254,59255,59256,59257,59258,59259,59260,58950,58951,58952,58953,58954,58955,58956,58957,58958,58959,58960,58961,58962,58963,58964,58965,58966,58967,58968,58969,58970,58971,58972,58973,58974,58975,58976,58977,58978,58979,58980,58981,58982,58983,58984,58985,58986,58987,58988,58989,58990,58991,58992,58993,58994,58995,58996,58997,58998,58999,59000,59001,59002,59003,59004,59005,59006,59007,59008,59009,59010,59011,59012,59013,59014,59015,59016,59017,59018,59019,59020,59021,59022,59023,59024,59025,59026,59027,59028,59029,59030,59031,59032,59033,59034,59035,59036,59037,59038,59039,59040,59041,59042,59043,59044,59045,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,59261,59262,59263,59264,59265,59266,59267,59268,59046,59047,59048,59049,59050,59051,59052,59053,59054,59055,59056,59057,59058,59059,59060,59061,59062,59063,59064,59065,59066,59067,59068,59069,59070,59071,59072,59073,59074,59075,59076,59077,59078,59079,59080,59081,59082,59083,59084,59085,59086,59087,59088,59089,59090,59091,59092,59093,59094,59095,59096,59097,59098,59099,59100,59101,59102,59103,59104,59105,59106,59107,59108,59109,59110,59111,59112,59113,59114,59115,59116,59117,59118,59119,59120,59121,59122,59123,59124,59125,59126,59127,59128,59129,59130,59131,59132,59133,59134,59135,59136,59137,59138,59139,59140,59141,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,59269,59270,59271,59272,59273,59274,59275,59276,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,59277,59278,59279,59280,59281,59282,59283,65077,65078,65081,65082,65087,65088,65085,65086,65089,65090,65091,65092,59284,59285,65083,65084,65079,65080,65073,59286,65075,65076,59287,59288,59289,59290,59291,59292,59293,59294,59295,59142,59143,59144,59145,59146,59147,59148,59149,59150,59151,59152,59153,59154,59155,59156,59157,59158,59159,59160,59161,59162,59163,59164,59165,59166,59167,59168,59169,59170,59171,59172,59173,59174,59175,59176,59177,59178,59179,59180,59181,59182,59183,59184,59185,59186,59187,59188,59189,59190,59191,59192,59193,59194,59195,59196,59197,59198,59199,59200,59201,59202,59203,59204,59205,59206,59207,59208,59209,59210,59211,59212,59213,59214,59215,59216,59217,59218,59219,59220,59221,59222,59223,59224,59225,59226,59227,59228,59229,59230,59231,59232,59233,59234,59235,59236,59237,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,59296,59297,59298,59299,59300,59301,59302,59303,59304,59305,59306,59307,59308,59309,59310,1072,1073,1074,1075,1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,59311,59312,59313,59314,59315,59316,59317,59318,59319,59320,59321,59322,59323,714,715,729,8211,8213,8229,8245,8453,8457,8598,8599,8600,8601,8725,8735,8739,8786,8806,8807,8895,9552,9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566,9567,9568,9569,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,9581,9582,9583,9584,9585,9586,9587,9601,9602,9603,9604,9605,9606,9607,9608,9609,9610,9611,9612,9613,9614,9615,9619,9620,9621,9660,9661,9698,9699,9700,9701,9737,8853,12306,12317,12318,59324,59325,59326,59327,59328,59329,59330,59331,59332,59333,59334,257,225,462,224,275,233,283,232,299,237,464,236,333,243,466,242,363,250,468,249,470,472,474,476,252,234,593,7743,324,328,505,609,59337,59338,59339,59340,12549,12550,12551,12552,12553,12554,12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570,12571,12572,12573,12574,12575,12576,12577,12578,12579,12580,12581,12582,12583,12584,12585,59341,59342,59343,59344,59345,59346,59347,59348,59349,59350,59351,59352,59353,59354,59355,59356,59357,59358,59359,59360,59361,12321,12322,12323,12324,12325,12326,12327,12328,12329,12963,13198,13199,13212,13213,13214,13217,13252,13262,13265,13266,13269,65072,65506,65508,59362,8481,12849,59363,8208,59364,59365,59366,12540,12443,12444,12541,12542,12294,12445,12446,65097,65098,65099,65100,65101,65102,65103,65104,65105,65106,65108,65109,65110,65111,65113,65114,65115,65116,65117,65118,65119,65120,65121,65122,65123,65124,65125,65126,65128,65129,65130,65131,12350,12272,12273,12274,12275,12276,12277,12278,12279,12280,12281,12282,12283,12295,59380,59381,59382,59383,59384,59385,59386,59387,59388,59389,59390,59391,59392,9472,9473,9474,9475,9476,9477,9478,9479,9480,9481,9482,9483,9484,9485,9486,9487,9488,9489,9490,9491,9492,9493,9494,9495,9496,9497,9498,9499,9500,9501,9502,9503,9504,9505,9506,9507,9508,9509,9510,9511,9512,9513,9514,9515,9516,9517,9518,9519,9520,9521,9522,9523,9524,9525,9526,9527,9528,9529,9530,9531,9532,9533,9534,9535,9536,9537,9538,9539,9540,9541,9542,9543,9544,9545,9546,9547,59393,59394,59395,59396,59397,59398,59399,59400,59401,59402,59403,59404,59405,59406,59407,29404,29405,29407,29410,29411,29412,29413,29414,29415,29418,29419,29429,29430,29433,29437,29438,29439,29440,29442,29444,29445,29446,29447,29448,29449,29451,29452,29453,29455,29456,29457,29458,29460,29464,29465,29466,29471,29472,29475,29476,29478,29479,29480,29485,29487,29488,29490,29491,29493,29494,29498,29499,29500,29501,29504,29505,29506,29507,29508,29509,29510,29511,29512,29513,29514,29515,29516,29518,29519,29521,29523,29524,29525,29526,29528,29529,29530,29531,29532,29533,29534,29535,29537,29538,29539,29540,29541,29542,29543,29544,29545,29546,29547,29550,29552,29553,57344,57345,57346,57347,57348,57349,57350,57351,57352,57353,57354,57355,57356,57357,57358,57359,57360,57361,57362,57363,57364,57365,57366,57367,57368,57369,57370,57371,57372,57373,57374,57375,57376,57377,57378,57379,57380,57381,57382,57383,57384,57385,57386,57387,57388,57389,57390,57391,57392,57393,57394,57395,57396,57397,57398,57399,57400,57401,57402,57403,57404,57405,57406,57407,57408,57409,57410,57411,57412,57413,57414,57415,57416,57417,57418,57419,57420,57421,57422,57423,57424,57425,57426,57427,57428,57429,57430,57431,57432,57433,57434,57435,57436,57437,29554,29555,29556,29557,29558,29559,29560,29561,29562,29563,29564,29565,29567,29568,29569,29570,29571,29573,29574,29576,29578,29580,29581,29583,29584,29586,29587,29588,29589,29591,29592,29593,29594,29596,29597,29598,29600,29601,29603,29604,29605,29606,29607,29608,29610,29612,29613,29617,29620,29621,29622,29624,29625,29628,29629,29630,29631,29633,29635,29636,29637,29638,29639,29643,29644,29646,29650,29651,29652,29653,29654,29655,29656,29658,29659,29660,29661,29663,29665,29666,29667,29668,29670,29672,29674,29675,29676,29678,29679,29680,29681,29683,29684,29685,29686,29687,57438,57439,57440,57441,57442,57443,57444,57445,57446,57447,57448,57449,57450,57451,57452,57453,57454,57455,57456,57457,57458,57459,57460,57461,57462,57463,57464,57465,57466,57467,57468,57469,57470,57471,57472,57473,57474,57475,57476,57477,57478,57479,57480,57481,57482,57483,57484,57485,57486,57487,57488,57489,57490,57491,57492,57493,57494,57495,57496,57497,57498,57499,57500,57501,57502,57503,57504,57505,57506,57507,57508,57509,57510,57511,57512,57513,57514,57515,57516,57517,57518,57519,57520,57521,57522,57523,57524,57525,57526,57527,57528,57529,57530,57531,29688,29689,29690,29691,29692,29693,29694,29695,29696,29697,29698,29700,29703,29704,29707,29708,29709,29710,29713,29714,29715,29716,29717,29718,29719,29720,29721,29724,29725,29726,29727,29728,29729,29731,29732,29735,29737,29739,29741,29743,29745,29746,29751,29752,29753,29754,29755,29757,29758,29759,29760,29762,29763,29764,29765,29766,29767,29768,29769,29770,29771,29772,29773,29774,29775,29776,29777,29778,29779,29780,29782,29784,29789,29792,29793,29794,29795,29796,29797,29798,29799,29800,29801,29802,29803,29804,29806,29807,29809,29810,29811,29812,29813,29816,29817,29818,57532,57533,57534,57535,57536,57537,57538,57539,57540,57541,57542,57543,57544,57545,57546,57547,57548,57549,57550,57551,57552,57553,57554,57555,57556,57557,57558,57559,57560,57561,57562,57563,57564,57565,57566,57567,57568,57569,57570,57571,57572,57573,57574,57575,57576,57577,57578,57579,57580,57581,57582,57583,57584,57585,57586,57587,57588,57589,57590,57591,57592,57593,57594,57595,57596,57597,57598,57599,57600,57601,57602,57603,57604,57605,57606,57607,57608,57609,57610,57611,57612,57613,57614,57615,57616,57617,57618,57619,57620,57621,57622,57623,57624,57625,29819,29820,29821,29823,29826,29828,29829,29830,29832,29833,29834,29836,29837,29839,29841,29842,29843,29844,29845,29846,29847,29848,29849,29850,29851,29853,29855,29856,29857,29858,29859,29860,29861,29862,29866,29867,29868,29869,29870,29871,29872,29873,29874,29875,29876,29877,29878,29879,29880,29881,29883,29884,29885,29886,29887,29888,29889,29890,29891,29892,29893,29894,29895,29896,29897,29898,29899,29900,29901,29902,29903,29904,29905,29907,29908,29909,29910,29911,29912,29913,29914,29915,29917,29919,29921,29925,29927,29928,29929,29930,29931,29932,29933,29936,29937,29938,57626,57627,57628,57629,57630,57631,57632,57633,57634,57635,57636,57637,57638,57639,57640,57641,57642,57643,57644,57645,57646,57647,57648,57649,57650,57651,57652,57653,57654,57655,57656,57657,57658,57659,57660,57661,57662,57663,57664,57665,57666,57667,57668,57669,57670,57671,57672,57673,57674,57675,57676,57677,57678,57679,57680,57681,57682,57683,57684,57685,57686,57687,57688,57689,57690,57691,57692,57693,57694,57695,57696,57697,57698,57699,57700,57701,57702,57703,57704,57705,57706,57707,57708,57709,57710,57711,57712,57713,57714,57715,57716,57717,57718,57719,29939,29941,29944,29945,29946,29947,29948,29949,29950,29952,29953,29954,29955,29957,29958,29959,29960,29961,29962,29963,29964,29966,29968,29970,29972,29973,29974,29975,29979,29981,29982,29984,29985,29986,29987,29988,29990,29991,29994,29998,30004,30006,30009,30012,30013,30015,30017,30018,30019,30020,30022,30023,30025,30026,30029,30032,30033,30034,30035,30037,30038,30039,30040,30045,30046,30047,30048,30049,30050,30051,30052,30055,30056,30057,30059,30060,30061,30062,30063,30064,30065,30067,30069,30070,30071,30074,30075,30076,30077,30078,30080,30081,30082,30084,30085,30087,57720,57721,57722,57723,57724,57725,57726,57727,57728,57729,57730,57731,57732,57733,57734,57735,57736,57737,57738,57739,57740,57741,57742,57743,57744,57745,57746,57747,57748,57749,57750,57751,57752,57753,57754,57755,57756,57757,57758,57759,57760,57761,57762,57763,57764,57765,57766,57767,57768,57769,57770,57771,57772,57773,57774,57775,57776,57777,57778,57779,57780,57781,57782,57783,57784,57785,57786,57787,57788,57789,57790,57791,57792,57793,57794,57795,57796,57797,57798,57799,57800,57801,57802,57803,57804,57805,57806,57807,57808,57809,57810,57811,57812,57813,30088,30089,30090,30092,30093,30094,30096,30099,30101,30104,30107,30108,30110,30114,30118,30119,30120,30121,30122,30125,30134,30135,30138,30139,30143,30144,30145,30150,30155,30156,30158,30159,30160,30161,30163,30167,30169,30170,30172,30173,30175,30176,30177,30181,30185,30188,30189,30190,30191,30194,30195,30197,30198,30199,30200,30202,30203,30205,30206,30210,30212,30214,30215,30216,30217,30219,30221,30222,30223,30225,30226,30227,30228,30230,30234,30236,30237,30238,30241,30243,30247,30248,30252,30254,30255,30257,30258,30262,30263,30265,30266,30267,30269,30273,30274,30276,57814,57815,57816,57817,57818,57819,57820,57821,57822,57823,57824,57825,57826,57827,57828,57829,57830,57831,57832,57833,57834,57835,57836,57837,57838,57839,57840,57841,57842,57843,57844,57845,57846,57847,57848,57849,57850,57851,57852,57853,57854,57855,57856,57857,57858,57859,57860,57861,57862,57863,57864,57865,57866,57867,57868,57869,57870,57871,57872,57873,57874,57875,57876,57877,57878,57879,57880,57881,57882,57883,57884,57885,57886,57887,57888,57889,57890,57891,57892,57893,57894,57895,57896,57897,57898,57899,57900,57901,57902,57903,57904,57905,57906,57907,30277,30278,30279,30280,30281,30282,30283,30286,30287,30288,30289,30290,30291,30293,30295,30296,30297,30298,30299,30301,30303,30304,30305,30306,30308,30309,30310,30311,30312,30313,30314,30316,30317,30318,30320,30321,30322,30323,30324,30325,30326,30327,30329,30330,30332,30335,30336,30337,30339,30341,30345,30346,30348,30349,30351,30352,30354,30356,30357,30359,30360,30362,30363,30364,30365,30366,30367,30368,30369,30370,30371,30373,30374,30375,30376,30377,30378,30379,30380,30381,30383,30384,30387,30389,30390,30391,30392,30393,30394,30395,30396,30397,30398,30400,30401,30403,21834,38463,22467,25384,21710,21769,21696,30353,30284,34108,30702,33406,30861,29233,38552,38797,27688,23433,20474,25353,26263,23736,33018,26696,32942,26114,30414,20985,25942,29100,32753,34948,20658,22885,25034,28595,33453,25420,25170,21485,21543,31494,20843,30116,24052,25300,36299,38774,25226,32793,22365,38712,32610,29240,30333,26575,30334,25670,20336,36133,25308,31255,26001,29677,25644,25203,33324,39041,26495,29256,25198,25292,20276,29923,21322,21150,32458,37030,24110,26758,27036,33152,32465,26834,30917,34444,38225,20621,35876,33502,32990,21253,35090,21093,30404,30407,30409,30411,30412,30419,30421,30425,30426,30428,30429,30430,30432,30433,30434,30435,30436,30438,30439,30440,30441,30442,30443,30444,30445,30448,30451,30453,30454,30455,30458,30459,30461,30463,30464,30466,30467,30469,30470,30474,30476,30478,30479,30480,30481,30482,30483,30484,30485,30486,30487,30488,30491,30492,30493,30494,30497,30499,30500,30501,30503,30506,30507,30508,30510,30512,30513,30514,30515,30516,30521,30523,30525,30526,30527,30530,30532,30533,30534,30536,30537,30538,30539,30540,30541,30542,30543,30546,30547,30548,30549,30550,30551,30552,30553,30556,34180,38649,20445,22561,39281,23453,25265,25253,26292,35961,40077,29190,26479,30865,24754,21329,21271,36744,32972,36125,38049,20493,29384,22791,24811,28953,34987,22868,33519,26412,31528,23849,32503,29997,27893,36454,36856,36924,40763,27604,37145,31508,24444,30887,34006,34109,27605,27609,27606,24065,24199,30201,38381,25949,24330,24517,36767,22721,33218,36991,38491,38829,36793,32534,36140,25153,20415,21464,21342,36776,36777,36779,36941,26631,24426,33176,34920,40150,24971,21035,30250,24428,25996,28626,28392,23486,25672,20853,20912,26564,19993,31177,39292,28851,30557,30558,30559,30560,30564,30567,30569,30570,30573,30574,30575,30576,30577,30578,30579,30580,30581,30582,30583,30584,30586,30587,30588,30593,30594,30595,30598,30599,30600,30601,30602,30603,30607,30608,30611,30612,30613,30614,30615,30616,30617,30618,30619,30620,30621,30622,30625,30627,30628,30630,30632,30635,30637,30638,30639,30641,30642,30644,30646,30647,30648,30649,30650,30652,30654,30656,30657,30658,30659,30660,30661,30662,30663,30664,30665,30666,30667,30668,30670,30671,30672,30673,30674,30675,30676,30677,30678,30680,30681,30682,30685,30686,30687,30688,30689,30692,30149,24182,29627,33760,25773,25320,38069,27874,21338,21187,25615,38082,31636,20271,24091,33334,33046,33162,28196,27850,39539,25429,21340,21754,34917,22496,19981,24067,27493,31807,37096,24598,25830,29468,35009,26448,25165,36130,30572,36393,37319,24425,33756,34081,39184,21442,34453,27531,24813,24808,28799,33485,33329,20179,27815,34255,25805,31961,27133,26361,33609,21397,31574,20391,20876,27979,23618,36461,25554,21449,33580,33590,26597,30900,25661,23519,23700,24046,35815,25286,26612,35962,25600,25530,34633,39307,35863,32544,38130,20135,38416,39076,26124,29462,30694,30696,30698,30703,30704,30705,30706,30708,30709,30711,30713,30714,30715,30716,30723,30724,30725,30726,30727,30728,30730,30731,30734,30735,30736,30739,30741,30745,30747,30750,30752,30753,30754,30756,30760,30762,30763,30766,30767,30769,30770,30771,30773,30774,30781,30783,30785,30786,30787,30788,30790,30792,30793,30794,30795,30797,30799,30801,30803,30804,30808,30809,30810,30811,30812,30814,30815,30816,30817,30818,30819,30820,30821,30822,30823,30824,30825,30831,30832,30833,30834,30835,30836,30837,30838,30840,30841,30842,30843,30845,30846,30847,30848,30849,30850,30851,22330,23581,24120,38271,20607,32928,21378,25950,30021,21809,20513,36229,25220,38046,26397,22066,28526,24034,21557,28818,36710,25199,25764,25507,24443,28552,37108,33251,36784,23576,26216,24561,27785,38472,36225,34924,25745,31216,22478,27225,25104,21576,20056,31243,24809,28548,35802,25215,36894,39563,31204,21507,30196,25345,21273,27744,36831,24347,39536,32827,40831,20360,23610,36196,32709,26021,28861,20805,20914,34411,23815,23456,25277,37228,30068,36364,31264,24833,31609,20167,32504,30597,19985,33261,21021,20986,27249,21416,36487,38148,38607,28353,38500,26970,30852,30853,30854,30856,30858,30859,30863,30864,30866,30868,30869,30870,30873,30877,30878,30880,30882,30884,30886,30888,30889,30890,30891,30892,30893,30894,30895,30901,30902,30903,30904,30906,30907,30908,30909,30911,30912,30914,30915,30916,30918,30919,30920,30924,30925,30926,30927,30929,30930,30931,30934,30935,30936,30938,30939,30940,30941,30942,30943,30944,30945,30946,30947,30948,30949,30950,30951,30953,30954,30955,30957,30958,30959,30960,30961,30963,30965,30966,30968,30969,30971,30972,30973,30974,30975,30976,30978,30979,30980,30982,30983,30984,30985,30986,30987,30988,30784,20648,30679,25616,35302,22788,25571,24029,31359,26941,20256,33337,21912,20018,30126,31383,24162,24202,38383,21019,21561,28810,25462,38180,22402,26149,26943,37255,21767,28147,32431,34850,25139,32496,30133,33576,30913,38604,36766,24904,29943,35789,27492,21050,36176,27425,32874,33905,22257,21254,20174,19995,20945,31895,37259,31751,20419,36479,31713,31388,25703,23828,20652,33030,30209,31929,28140,32736,26449,23384,23544,30923,25774,25619,25514,25387,38169,25645,36798,31572,30249,25171,22823,21574,27513,20643,25140,24102,27526,20195,36151,34955,24453,36910,30989,30990,30991,30992,30993,30994,30996,30997,30998,30999,31000,31001,31002,31003,31004,31005,31007,31008,31009,31010,31011,31013,31014,31015,31016,31017,31018,31019,31020,31021,31022,31023,31024,31025,31026,31027,31029,31030,31031,31032,31033,31037,31039,31042,31043,31044,31045,31047,31050,31051,31052,31053,31054,31055,31056,31057,31058,31060,31061,31064,31065,31073,31075,31076,31078,31081,31082,31083,31084,31086,31088,31089,31090,31091,31092,31093,31094,31097,31099,31100,31101,31102,31103,31106,31107,31110,31111,31112,31113,31115,31116,31117,31118,31120,31121,31122,24608,32829,25285,20025,21333,37112,25528,32966,26086,27694,20294,24814,28129,35806,24377,34507,24403,25377,20826,33633,26723,20992,25443,36424,20498,23707,31095,23548,21040,31291,24764,36947,30423,24503,24471,30340,36460,28783,30331,31561,30634,20979,37011,22564,20302,28404,36842,25932,31515,29380,28068,32735,23265,25269,24213,22320,33922,31532,24093,24351,36882,32532,39072,25474,28359,30872,28857,20856,38747,22443,30005,20291,30008,24215,24806,22880,28096,27583,30857,21500,38613,20939,20993,25481,21514,38035,35843,36300,29241,30879,34678,36845,35853,21472,31123,31124,31125,31126,31127,31128,31129,31131,31132,31133,31134,31135,31136,31137,31138,31139,31140,31141,31142,31144,31145,31146,31147,31148,31149,31150,31151,31152,31153,31154,31156,31157,31158,31159,31160,31164,31167,31170,31172,31173,31175,31176,31178,31180,31182,31183,31184,31187,31188,31190,31191,31193,31194,31195,31196,31197,31198,31200,31201,31202,31205,31208,31210,31212,31214,31217,31218,31219,31220,31221,31222,31223,31225,31226,31228,31230,31231,31233,31236,31237,31239,31240,31241,31242,31244,31247,31248,31249,31250,31251,31253,31254,31256,31257,31259,31260,19969,30447,21486,38025,39030,40718,38189,23450,35746,20002,19996,20908,33891,25026,21160,26635,20375,24683,20923,27934,20828,25238,26007,38497,35910,36887,30168,37117,30563,27602,29322,29420,35835,22581,30585,36172,26460,38208,32922,24230,28193,22930,31471,30701,38203,27573,26029,32526,22534,20817,38431,23545,22697,21544,36466,25958,39039,22244,38045,30462,36929,25479,21702,22810,22842,22427,36530,26421,36346,33333,21057,24816,22549,34558,23784,40517,20420,39069,35769,23077,24694,21380,25212,36943,37122,39295,24681,32780,20799,32819,23572,39285,27953,20108,31261,31263,31265,31266,31268,31269,31270,31271,31272,31273,31274,31275,31276,31277,31278,31279,31280,31281,31282,31284,31285,31286,31288,31290,31294,31296,31297,31298,31299,31300,31301,31303,31304,31305,31306,31307,31308,31309,31310,31311,31312,31314,31315,31316,31317,31318,31320,31321,31322,31323,31324,31325,31326,31327,31328,31329,31330,31331,31332,31333,31334,31335,31336,31337,31338,31339,31340,31341,31342,31343,31345,31346,31347,31349,31355,31356,31357,31358,31362,31365,31367,31369,31370,31371,31372,31374,31375,31376,31379,31380,31385,31386,31387,31390,31393,31394,36144,21457,32602,31567,20240,20047,38400,27861,29648,34281,24070,30058,32763,27146,30718,38034,32321,20961,28902,21453,36820,33539,36137,29359,39277,27867,22346,33459,26041,32938,25151,38450,22952,20223,35775,32442,25918,33778,38750,21857,39134,32933,21290,35837,21536,32954,24223,27832,36153,33452,37210,21545,27675,20998,32439,22367,28954,27774,31881,22859,20221,24575,24868,31914,20016,23553,26539,34562,23792,38155,39118,30127,28925,36898,20911,32541,35773,22857,20964,20315,21542,22827,25975,32932,23413,25206,25282,36752,24133,27679,31526,20239,20440,26381,31395,31396,31399,31401,31402,31403,31406,31407,31408,31409,31410,31412,31413,31414,31415,31416,31417,31418,31419,31420,31421,31422,31424,31425,31426,31427,31428,31429,31430,31431,31432,31433,31434,31436,31437,31438,31439,31440,31441,31442,31443,31444,31445,31447,31448,31450,31451,31452,31453,31457,31458,31460,31463,31464,31465,31466,31467,31468,31470,31472,31473,31474,31475,31476,31477,31478,31479,31480,31483,31484,31486,31488,31489,31490,31493,31495,31497,31500,31501,31502,31504,31506,31507,31510,31511,31512,31514,31516,31517,31519,31521,31522,31523,31527,31529,31533,28014,28074,31119,34993,24343,29995,25242,36741,20463,37340,26023,33071,33105,24220,33104,36212,21103,35206,36171,22797,20613,20184,38428,29238,33145,36127,23500,35747,38468,22919,32538,21648,22134,22030,35813,25913,27010,38041,30422,28297,24178,29976,26438,26577,31487,32925,36214,24863,31174,25954,36195,20872,21018,38050,32568,32923,32434,23703,28207,26464,31705,30347,39640,33167,32660,31957,25630,38224,31295,21578,21733,27468,25601,25096,40509,33011,30105,21106,38761,33883,26684,34532,38401,38548,38124,20010,21508,32473,26681,36319,32789,26356,24218,32697,31535,31536,31538,31540,31541,31542,31543,31545,31547,31549,31551,31552,31553,31554,31555,31556,31558,31560,31562,31565,31566,31571,31573,31575,31577,31580,31582,31583,31585,31587,31588,31589,31590,31591,31592,31593,31594,31595,31596,31597,31599,31600,31603,31604,31606,31608,31610,31612,31613,31615,31617,31618,31619,31620,31622,31623,31624,31625,31626,31627,31628,31630,31631,31633,31634,31635,31638,31640,31641,31642,31643,31646,31647,31648,31651,31652,31653,31662,31663,31664,31666,31667,31669,31670,31671,31673,31674,31675,31676,31677,31678,31679,31680,31682,31683,31684,22466,32831,26775,24037,25915,21151,24685,40858,20379,36524,20844,23467,24339,24041,27742,25329,36129,20849,38057,21246,27807,33503,29399,22434,26500,36141,22815,36764,33735,21653,31629,20272,27837,23396,22993,40723,21476,34506,39592,35895,32929,25925,39038,22266,38599,21038,29916,21072,23521,25346,35074,20054,25296,24618,26874,20851,23448,20896,35266,31649,39302,32592,24815,28748,36143,20809,24191,36891,29808,35268,22317,30789,24402,40863,38394,36712,39740,35809,30328,26690,26588,36330,36149,21053,36746,28378,26829,38149,37101,22269,26524,35065,36807,21704,31685,31688,31689,31690,31691,31693,31694,31695,31696,31698,31700,31701,31702,31703,31704,31707,31708,31710,31711,31712,31714,31715,31716,31719,31720,31721,31723,31724,31725,31727,31728,31730,31731,31732,31733,31734,31736,31737,31738,31739,31741,31743,31744,31745,31746,31747,31748,31749,31750,31752,31753,31754,31757,31758,31760,31761,31762,31763,31764,31765,31767,31768,31769,31770,31771,31772,31773,31774,31776,31777,31778,31779,31780,31781,31784,31785,31787,31788,31789,31790,31791,31792,31793,31794,31795,31796,31797,31798,31799,31801,31802,31803,31804,31805,31806,31810,39608,23401,28023,27686,20133,23475,39559,37219,25000,37039,38889,21547,28085,23506,20989,21898,32597,32752,25788,25421,26097,25022,24717,28938,27735,27721,22831,26477,33322,22741,22158,35946,27627,37085,22909,32791,21495,28009,21621,21917,33655,33743,26680,31166,21644,20309,21512,30418,35977,38402,27827,28088,36203,35088,40548,36154,22079,40657,30165,24456,29408,24680,21756,20136,27178,34913,24658,36720,21700,28888,34425,40511,27946,23439,24344,32418,21897,20399,29492,21564,21402,20505,21518,21628,20046,24573,29786,22774,33899,32993,34676,29392,31946,28246,31811,31812,31813,31814,31815,31816,31817,31818,31819,31820,31822,31823,31824,31825,31826,31827,31828,31829,31830,31831,31832,31833,31834,31835,31836,31837,31838,31839,31840,31841,31842,31843,31844,31845,31846,31847,31848,31849,31850,31851,31852,31853,31854,31855,31856,31857,31858,31861,31862,31863,31864,31865,31866,31870,31871,31872,31873,31874,31875,31876,31877,31878,31879,31880,31882,31883,31884,31885,31886,31887,31888,31891,31892,31894,31897,31898,31899,31904,31905,31907,31910,31911,31912,31913,31915,31916,31917,31919,31920,31924,31925,31926,31927,31928,31930,31931,24359,34382,21804,25252,20114,27818,25143,33457,21719,21326,29502,28369,30011,21010,21270,35805,27088,24458,24576,28142,22351,27426,29615,26707,36824,32531,25442,24739,21796,30186,35938,28949,28067,23462,24187,33618,24908,40644,30970,34647,31783,30343,20976,24822,29004,26179,24140,24653,35854,28784,25381,36745,24509,24674,34516,22238,27585,24724,24935,21321,24800,26214,36159,31229,20250,28905,27719,35763,35826,32472,33636,26127,23130,39746,27985,28151,35905,27963,20249,28779,33719,25110,24785,38669,36135,31096,20987,22334,22522,26426,30072,31293,31215,31637,31935,31936,31938,31939,31940,31942,31945,31947,31950,31951,31952,31953,31954,31955,31956,31960,31962,31963,31965,31966,31969,31970,31971,31972,31973,31974,31975,31977,31978,31979,31980,31981,31982,31984,31985,31986,31987,31988,31989,31990,31991,31993,31994,31996,31997,31998,31999,32000,32001,32002,32003,32004,32005,32006,32007,32008,32009,32011,32012,32013,32014,32015,32016,32017,32018,32019,32020,32021,32022,32023,32024,32025,32026,32027,32028,32029,32030,32031,32033,32035,32036,32037,32038,32040,32041,32042,32044,32045,32046,32048,32049,32050,32051,32052,32053,32054,32908,39269,36857,28608,35749,40481,23020,32489,32521,21513,26497,26840,36753,31821,38598,21450,24613,30142,27762,21363,23241,32423,25380,20960,33034,24049,34015,25216,20864,23395,20238,31085,21058,24760,27982,23492,23490,35745,35760,26082,24524,38469,22931,32487,32426,22025,26551,22841,20339,23478,21152,33626,39050,36158,30002,38078,20551,31292,20215,26550,39550,23233,27516,30417,22362,23574,31546,38388,29006,20860,32937,33392,22904,32516,33575,26816,26604,30897,30839,25315,25441,31616,20461,21098,20943,33616,27099,37492,36341,36145,35265,38190,31661,20214,32055,32056,32057,32058,32059,32060,32061,32062,32063,32064,32065,32066,32067,32068,32069,32070,32071,32072,32073,32074,32075,32076,32077,32078,32079,32080,32081,32082,32083,32084,32085,32086,32087,32088,32089,32090,32091,32092,32093,32094,32095,32096,32097,32098,32099,32100,32101,32102,32103,32104,32105,32106,32107,32108,32109,32111,32112,32113,32114,32115,32116,32117,32118,32120,32121,32122,32123,32124,32125,32126,32127,32128,32129,32130,32131,32132,32133,32134,32135,32136,32137,32138,32139,32140,32141,32142,32143,32144,32145,32146,32147,32148,32149,32150,32151,32152,20581,33328,21073,39279,28176,28293,28071,24314,20725,23004,23558,27974,27743,30086,33931,26728,22870,35762,21280,37233,38477,34121,26898,30977,28966,33014,20132,37066,27975,39556,23047,22204,25605,38128,30699,20389,33050,29409,35282,39290,32564,32478,21119,25945,37237,36735,36739,21483,31382,25581,25509,30342,31224,34903,38454,25130,21163,33410,26708,26480,25463,30571,31469,27905,32467,35299,22992,25106,34249,33445,30028,20511,20171,30117,35819,23626,24062,31563,26020,37329,20170,27941,35167,32039,38182,20165,35880,36827,38771,26187,31105,36817,28908,28024,32153,32154,32155,32156,32157,32158,32159,32160,32161,32162,32163,32164,32165,32167,32168,32169,32170,32171,32172,32173,32175,32176,32177,32178,32179,32180,32181,32182,32183,32184,32185,32186,32187,32188,32189,32190,32191,32192,32193,32194,32195,32196,32197,32198,32199,32200,32201,32202,32203,32204,32205,32206,32207,32208,32209,32210,32211,32212,32213,32214,32215,32216,32217,32218,32219,32220,32221,32222,32223,32224,32225,32226,32227,32228,32229,32230,32231,32232,32233,32234,32235,32236,32237,32238,32239,32240,32241,32242,32243,32244,32245,32246,32247,32248,32249,32250,23613,21170,33606,20834,33550,30555,26230,40120,20140,24778,31934,31923,32463,20117,35686,26223,39048,38745,22659,25964,38236,24452,30153,38742,31455,31454,20928,28847,31384,25578,31350,32416,29590,38893,20037,28792,20061,37202,21417,25937,26087,33276,33285,21646,23601,30106,38816,25304,29401,30141,23621,39545,33738,23616,21632,30697,20030,27822,32858,25298,25454,24040,20855,36317,36382,38191,20465,21477,24807,28844,21095,25424,40515,23071,20518,30519,21367,32482,25733,25899,25225,25496,20500,29237,35273,20915,35776,32477,22343,33740,38055,20891,21531,23803,32251,32252,32253,32254,32255,32256,32257,32258,32259,32260,32261,32262,32263,32264,32265,32266,32267,32268,32269,32270,32271,32272,32273,32274,32275,32276,32277,32278,32279,32280,32281,32282,32283,32284,32285,32286,32287,32288,32289,32290,32291,32292,32293,32294,32295,32296,32297,32298,32299,32300,32301,32302,32303,32304,32305,32306,32307,32308,32309,32310,32311,32312,32313,32314,32316,32317,32318,32319,32320,32322,32323,32324,32325,32326,32328,32329,32330,32331,32332,32333,32334,32335,32336,32337,32338,32339,32340,32341,32342,32343,32344,32345,32346,32347,32348,32349,20426,31459,27994,37089,39567,21888,21654,21345,21679,24320,25577,26999,20975,24936,21002,22570,21208,22350,30733,30475,24247,24951,31968,25179,25239,20130,28821,32771,25335,28900,38752,22391,33499,26607,26869,30933,39063,31185,22771,21683,21487,28212,20811,21051,23458,35838,32943,21827,22438,24691,22353,21549,31354,24656,23380,25511,25248,21475,25187,23495,26543,21741,31391,33510,37239,24211,35044,22840,22446,25358,36328,33007,22359,31607,20393,24555,23485,27454,21281,31568,29378,26694,30719,30518,26103,20917,20111,30420,23743,31397,33909,22862,39745,20608,32350,32351,32352,32353,32354,32355,32356,32357,32358,32359,32360,32361,32362,32363,32364,32365,32366,32367,32368,32369,32370,32371,32372,32373,32374,32375,32376,32377,32378,32379,32380,32381,32382,32383,32384,32385,32387,32388,32389,32390,32391,32392,32393,32394,32395,32396,32397,32398,32399,32400,32401,32402,32403,32404,32405,32406,32407,32408,32409,32410,32412,32413,32414,32430,32436,32443,32444,32470,32484,32492,32505,32522,32528,32542,32567,32569,32571,32572,32573,32574,32575,32576,32577,32579,32582,32583,32584,32585,32586,32587,32588,32589,32590,32591,32594,32595,39304,24871,28291,22372,26118,25414,22256,25324,25193,24275,38420,22403,25289,21895,34593,33098,36771,21862,33713,26469,36182,34013,23146,26639,25318,31726,38417,20848,28572,35888,25597,35272,25042,32518,28866,28389,29701,27028,29436,24266,37070,26391,28010,25438,21171,29282,32769,20332,23013,37226,28889,28061,21202,20048,38647,38253,34174,30922,32047,20769,22418,25794,32907,31867,27882,26865,26974,20919,21400,26792,29313,40654,31729,29432,31163,28435,29702,26446,37324,40100,31036,33673,33620,21519,26647,20029,21385,21169,30782,21382,21033,20616,20363,20432,32598,32601,32603,32604,32605,32606,32608,32611,32612,32613,32614,32615,32619,32620,32621,32623,32624,32627,32629,32630,32631,32632,32634,32635,32636,32637,32639,32640,32642,32643,32644,32645,32646,32647,32648,32649,32651,32653,32655,32656,32657,32658,32659,32661,32662,32663,32664,32665,32667,32668,32672,32674,32675,32677,32678,32680,32681,32682,32683,32684,32685,32686,32689,32691,32692,32693,32694,32695,32698,32699,32702,32704,32706,32707,32708,32710,32711,32712,32713,32715,32717,32719,32720,32721,32722,32723,32726,32727,32729,32730,32731,32732,32733,32734,32738,32739,30178,31435,31890,27813,38582,21147,29827,21737,20457,32852,33714,36830,38256,24265,24604,28063,24088,25947,33080,38142,24651,28860,32451,31918,20937,26753,31921,33391,20004,36742,37327,26238,20142,35845,25769,32842,20698,30103,29134,23525,36797,28518,20102,25730,38243,24278,26009,21015,35010,28872,21155,29454,29747,26519,30967,38678,20020,37051,40158,28107,20955,36161,21533,25294,29618,33777,38646,40836,38083,20278,32666,20940,28789,38517,23725,39046,21478,20196,28316,29705,27060,30827,39311,30041,21016,30244,27969,26611,20845,40857,32843,21657,31548,31423,32740,32743,32744,32746,32747,32748,32749,32751,32754,32756,32757,32758,32759,32760,32761,32762,32765,32766,32767,32770,32775,32776,32777,32778,32782,32783,32785,32787,32794,32795,32797,32798,32799,32801,32803,32804,32811,32812,32813,32814,32815,32816,32818,32820,32825,32826,32828,32830,32832,32833,32836,32837,32839,32840,32841,32846,32847,32848,32849,32851,32853,32854,32855,32857,32859,32860,32861,32862,32863,32864,32865,32866,32867,32868,32869,32870,32871,32872,32875,32876,32877,32878,32879,32880,32882,32883,32884,32885,32886,32887,32888,32889,32890,32891,32892,32893,38534,22404,25314,38471,27004,23044,25602,31699,28431,38475,33446,21346,39045,24208,28809,25523,21348,34383,40065,40595,30860,38706,36335,36162,40575,28510,31108,24405,38470,25134,39540,21525,38109,20387,26053,23653,23649,32533,34385,27695,24459,29575,28388,32511,23782,25371,23402,28390,21365,20081,25504,30053,25249,36718,20262,20177,27814,32438,35770,33821,34746,32599,36923,38179,31657,39585,35064,33853,27931,39558,32476,22920,40635,29595,30721,34434,39532,39554,22043,21527,22475,20080,40614,21334,36808,33033,30610,39314,34542,28385,34067,26364,24930,28459,32894,32897,32898,32901,32904,32906,32909,32910,32911,32912,32913,32914,32916,32917,32919,32921,32926,32931,32934,32935,32936,32940,32944,32947,32949,32950,32952,32953,32955,32965,32967,32968,32969,32970,32971,32975,32976,32977,32978,32979,32980,32981,32984,32991,32992,32994,32995,32998,33006,33013,33015,33017,33019,33022,33023,33024,33025,33027,33028,33029,33031,33032,33035,33036,33045,33047,33049,33051,33052,33053,33055,33056,33057,33058,33059,33060,33061,33062,33063,33064,33065,33066,33067,33069,33070,33072,33075,33076,33077,33079,33081,33082,33083,33084,33085,33087,35881,33426,33579,30450,27667,24537,33725,29483,33541,38170,27611,30683,38086,21359,33538,20882,24125,35980,36152,20040,29611,26522,26757,37238,38665,29028,27809,30473,23186,38209,27599,32654,26151,23504,22969,23194,38376,38391,20204,33804,33945,27308,30431,38192,29467,26790,23391,30511,37274,38753,31964,36855,35868,24357,31859,31192,35269,27852,34588,23494,24130,26825,30496,32501,20885,20813,21193,23081,32517,38754,33495,25551,30596,34256,31186,28218,24217,22937,34065,28781,27665,25279,30399,25935,24751,38397,26126,34719,40483,38125,21517,21629,35884,25720,33088,33089,33090,33091,33092,33093,33095,33097,33101,33102,33103,33106,33110,33111,33112,33115,33116,33117,33118,33119,33121,33122,33123,33124,33126,33128,33130,33131,33132,33135,33138,33139,33141,33142,33143,33144,33153,33155,33156,33157,33158,33159,33161,33163,33164,33165,33166,33168,33170,33171,33172,33173,33174,33175,33177,33178,33182,33183,33184,33185,33186,33188,33189,33191,33193,33195,33196,33197,33198,33199,33200,33201,33202,33204,33205,33206,33207,33208,33209,33212,33213,33214,33215,33220,33221,33223,33224,33225,33227,33229,33230,33231,33232,33233,33234,33235,25721,34321,27169,33180,30952,25705,39764,25273,26411,33707,22696,40664,27819,28448,23518,38476,35851,29279,26576,25287,29281,20137,22982,27597,22675,26286,24149,21215,24917,26408,30446,30566,29287,31302,25343,21738,21584,38048,37027,23068,32435,27670,20035,22902,32784,22856,21335,30007,38590,22218,25376,33041,24700,38393,28118,21602,39297,20869,23273,33021,22958,38675,20522,27877,23612,25311,20320,21311,33147,36870,28346,34091,25288,24180,30910,25781,25467,24565,23064,37247,40479,23615,25423,32834,23421,21870,38218,38221,28037,24744,26592,29406,20957,23425,33236,33237,33238,33239,33240,33241,33242,33243,33244,33245,33246,33247,33248,33249,33250,33252,33253,33254,33256,33257,33259,33262,33263,33264,33265,33266,33269,33270,33271,33272,33273,33274,33277,33279,33283,33287,33288,33289,33290,33291,33294,33295,33297,33299,33301,33302,33303,33304,33305,33306,33309,33312,33316,33317,33318,33319,33321,33326,33330,33338,33340,33341,33343,33344,33345,33346,33347,33349,33350,33352,33354,33356,33357,33358,33360,33361,33362,33363,33364,33365,33366,33367,33369,33371,33372,33373,33374,33376,33377,33378,33379,33380,33381,33382,33383,33385,25319,27870,29275,25197,38062,32445,33043,27987,20892,24324,22900,21162,24594,22899,26262,34384,30111,25386,25062,31983,35834,21734,27431,40485,27572,34261,21589,20598,27812,21866,36276,29228,24085,24597,29750,25293,25490,29260,24472,28227,27966,25856,28504,30424,30928,30460,30036,21028,21467,20051,24222,26049,32810,32982,25243,21638,21032,28846,34957,36305,27873,21624,32986,22521,35060,36180,38506,37197,20329,27803,21943,30406,30768,25256,28921,28558,24429,34028,26842,30844,31735,33192,26379,40527,25447,30896,22383,30738,38713,25209,25259,21128,29749,27607,33386,33387,33388,33389,33393,33397,33398,33399,33400,33403,33404,33408,33409,33411,33413,33414,33415,33417,33420,33424,33427,33428,33429,33430,33434,33435,33438,33440,33442,33443,33447,33458,33461,33462,33466,33467,33468,33471,33472,33474,33475,33477,33478,33481,33488,33494,33497,33498,33501,33506,33511,33512,33513,33514,33516,33517,33518,33520,33522,33523,33525,33526,33528,33530,33532,33533,33534,33535,33536,33546,33547,33549,33552,33554,33555,33558,33560,33561,33565,33566,33567,33568,33569,33570,33571,33572,33573,33574,33577,33578,33582,33584,33586,33591,33595,33597,21860,33086,30130,30382,21305,30174,20731,23617,35692,31687,20559,29255,39575,39128,28418,29922,31080,25735,30629,25340,39057,36139,21697,32856,20050,22378,33529,33805,24179,20973,29942,35780,23631,22369,27900,39047,23110,30772,39748,36843,31893,21078,25169,38138,20166,33670,33889,33769,33970,22484,26420,22275,26222,28006,35889,26333,28689,26399,27450,26646,25114,22971,19971,20932,28422,26578,27791,20854,26827,22855,27495,30054,23822,33040,40784,26071,31048,31041,39569,36215,23682,20062,20225,21551,22865,30732,22120,27668,36804,24323,27773,27875,35755,25488,33598,33599,33601,33602,33604,33605,33608,33610,33611,33612,33613,33614,33619,33621,33622,33623,33624,33625,33629,33634,33648,33649,33650,33651,33652,33653,33654,33657,33658,33662,33663,33664,33665,33666,33667,33668,33671,33672,33674,33675,33676,33677,33679,33680,33681,33684,33685,33686,33687,33689,33690,33693,33695,33697,33698,33699,33700,33701,33702,33703,33708,33709,33710,33711,33717,33723,33726,33727,33730,33731,33732,33734,33736,33737,33739,33741,33742,33744,33745,33746,33747,33749,33751,33753,33754,33755,33758,33762,33763,33764,33766,33767,33768,33771,33772,33773,24688,27965,29301,25190,38030,38085,21315,36801,31614,20191,35878,20094,40660,38065,38067,21069,28508,36963,27973,35892,22545,23884,27424,27465,26538,21595,33108,32652,22681,34103,24378,25250,27207,38201,25970,24708,26725,30631,20052,20392,24039,38808,25772,32728,23789,20431,31373,20999,33540,19988,24623,31363,38054,20405,20146,31206,29748,21220,33465,25810,31165,23517,27777,38738,36731,27682,20542,21375,28165,25806,26228,27696,24773,39031,35831,24198,29756,31351,31179,19992,37041,29699,27714,22234,37195,27845,36235,21306,34502,26354,36527,23624,39537,28192,33774,33775,33779,33780,33781,33782,33783,33786,33787,33788,33790,33791,33792,33794,33797,33799,33800,33801,33802,33808,33810,33811,33812,33813,33814,33815,33817,33818,33819,33822,33823,33824,33825,33826,33827,33833,33834,33835,33836,33837,33838,33839,33840,33842,33843,33844,33845,33846,33847,33849,33850,33851,33854,33855,33856,33857,33858,33859,33860,33861,33863,33864,33865,33866,33867,33868,33869,33870,33871,33872,33874,33875,33876,33877,33878,33880,33885,33886,33887,33888,33890,33892,33893,33894,33895,33896,33898,33902,33903,33904,33906,33908,33911,33913,33915,33916,21462,23094,40843,36259,21435,22280,39079,26435,37275,27849,20840,30154,25331,29356,21048,21149,32570,28820,30264,21364,40522,27063,30830,38592,35033,32676,28982,29123,20873,26579,29924,22756,25880,22199,35753,39286,25200,32469,24825,28909,22764,20161,20154,24525,38887,20219,35748,20995,22922,32427,25172,20173,26085,25102,33592,33993,33635,34701,29076,28342,23481,32466,20887,25545,26580,32905,33593,34837,20754,23418,22914,36785,20083,27741,20837,35109,36719,38446,34122,29790,38160,38384,28070,33509,24369,25746,27922,33832,33134,40131,22622,36187,19977,21441,33917,33918,33919,33920,33921,33923,33924,33925,33926,33930,33933,33935,33936,33937,33938,33939,33940,33941,33942,33944,33946,33947,33949,33950,33951,33952,33954,33955,33956,33957,33958,33959,33960,33961,33962,33963,33964,33965,33966,33968,33969,33971,33973,33974,33975,33979,33980,33982,33984,33986,33987,33989,33990,33991,33992,33995,33996,33998,33999,34002,34004,34005,34007,34008,34009,34010,34011,34012,34014,34017,34018,34020,34023,34024,34025,34026,34027,34029,34030,34031,34033,34034,34035,34036,34037,34038,34039,34040,34041,34042,34043,34045,34046,34048,34049,34050,20254,25955,26705,21971,20007,25620,39578,25195,23234,29791,33394,28073,26862,20711,33678,30722,26432,21049,27801,32433,20667,21861,29022,31579,26194,29642,33515,26441,23665,21024,29053,34923,38378,38485,25797,36193,33203,21892,27733,25159,32558,22674,20260,21830,36175,26188,19978,23578,35059,26786,25422,31245,28903,33421,21242,38902,23569,21736,37045,32461,22882,36170,34503,33292,33293,36198,25668,23556,24913,28041,31038,35774,30775,30003,21627,20280,36523,28145,23072,32453,31070,27784,23457,23158,29978,32958,24910,28183,22768,29983,29989,29298,21319,32499,34051,34052,34053,34054,34055,34056,34057,34058,34059,34061,34062,34063,34064,34066,34068,34069,34070,34072,34073,34075,34076,34077,34078,34080,34082,34083,34084,34085,34086,34087,34088,34089,34090,34093,34094,34095,34096,34097,34098,34099,34100,34101,34102,34110,34111,34112,34113,34114,34116,34117,34118,34119,34123,34124,34125,34126,34127,34128,34129,34130,34131,34132,34133,34135,34136,34138,34139,34140,34141,34143,34144,34145,34146,34147,34149,34150,34151,34153,34154,34155,34156,34157,34158,34159,34160,34161,34163,34165,34166,34167,34168,34172,34173,34175,34176,34177,30465,30427,21097,32988,22307,24072,22833,29422,26045,28287,35799,23608,34417,21313,30707,25342,26102,20160,39135,34432,23454,35782,21490,30690,20351,23630,39542,22987,24335,31034,22763,19990,26623,20107,25325,35475,36893,21183,26159,21980,22124,36866,20181,20365,37322,39280,27663,24066,24643,23460,35270,35797,25910,25163,39318,23432,23551,25480,21806,21463,30246,20861,34092,26530,26803,27530,25234,36755,21460,33298,28113,30095,20070,36174,23408,29087,34223,26257,26329,32626,34560,40653,40736,23646,26415,36848,26641,26463,25101,31446,22661,24246,25968,28465,34178,34179,34182,34184,34185,34186,34187,34188,34189,34190,34192,34193,34194,34195,34196,34197,34198,34199,34200,34201,34202,34205,34206,34207,34208,34209,34210,34211,34213,34214,34215,34217,34219,34220,34221,34225,34226,34227,34228,34229,34230,34232,34234,34235,34236,34237,34238,34239,34240,34242,34243,34244,34245,34246,34247,34248,34250,34251,34252,34253,34254,34257,34258,34260,34262,34263,34264,34265,34266,34267,34269,34270,34271,34272,34273,34274,34275,34277,34278,34279,34280,34282,34283,34284,34285,34286,34287,34288,34289,34290,34291,34292,34293,34294,34295,34296,24661,21047,32781,25684,34928,29993,24069,26643,25332,38684,21452,29245,35841,27700,30561,31246,21550,30636,39034,33308,35828,30805,26388,28865,26031,25749,22070,24605,31169,21496,19997,27515,32902,23546,21987,22235,20282,20284,39282,24051,26494,32824,24578,39042,36865,23435,35772,35829,25628,33368,25822,22013,33487,37221,20439,32032,36895,31903,20723,22609,28335,23487,35785,32899,37240,33948,31639,34429,38539,38543,32485,39635,30862,23681,31319,36930,38567,31071,23385,25439,31499,34001,26797,21766,32553,29712,32034,38145,25152,22604,20182,23427,22905,22612,34297,34298,34300,34301,34302,34304,34305,34306,34307,34308,34310,34311,34312,34313,34314,34315,34316,34317,34318,34319,34320,34322,34323,34324,34325,34327,34328,34329,34330,34331,34332,34333,34334,34335,34336,34337,34338,34339,34340,34341,34342,34344,34346,34347,34348,34349,34350,34351,34352,34353,34354,34355,34356,34357,34358,34359,34361,34362,34363,34365,34366,34367,34368,34369,34370,34371,34372,34373,34374,34375,34376,34377,34378,34379,34380,34386,34387,34389,34390,34391,34392,34393,34395,34396,34397,34399,34400,34401,34403,34404,34405,34406,34407,34408,34409,34410,29549,25374,36427,36367,32974,33492,25260,21488,27888,37214,22826,24577,27760,22349,25674,36138,30251,28393,22363,27264,30192,28525,35885,35848,22374,27631,34962,30899,25506,21497,28845,27748,22616,25642,22530,26848,33179,21776,31958,20504,36538,28108,36255,28907,25487,28059,28372,32486,33796,26691,36867,28120,38518,35752,22871,29305,34276,33150,30140,35466,26799,21076,36386,38161,25552,39064,36420,21884,20307,26367,22159,24789,28053,21059,23625,22825,28155,22635,30000,29980,24684,33300,33094,25361,26465,36834,30522,36339,36148,38081,24086,21381,21548,28867,34413,34415,34416,34418,34419,34420,34421,34422,34423,34424,34435,34436,34437,34438,34439,34440,34441,34446,34447,34448,34449,34450,34452,34454,34455,34456,34457,34458,34459,34462,34463,34464,34465,34466,34469,34470,34475,34477,34478,34482,34483,34487,34488,34489,34491,34492,34493,34494,34495,34497,34498,34499,34501,34504,34508,34509,34514,34515,34517,34518,34519,34522,34524,34525,34528,34529,34530,34531,34533,34534,34535,34536,34538,34539,34540,34543,34549,34550,34551,34554,34555,34556,34557,34559,34561,34564,34565,34566,34571,34572,34574,34575,34576,34577,34580,34582,27712,24311,20572,20141,24237,25402,33351,36890,26704,37230,30643,21516,38108,24420,31461,26742,25413,31570,32479,30171,20599,25237,22836,36879,20984,31171,31361,22270,24466,36884,28034,23648,22303,21520,20820,28237,22242,25512,39059,33151,34581,35114,36864,21534,23663,33216,25302,25176,33073,40501,38464,39534,39548,26925,22949,25299,21822,25366,21703,34521,27964,23043,29926,34972,27498,22806,35916,24367,28286,29609,39037,20024,28919,23436,30871,25405,26202,30358,24779,23451,23113,19975,33109,27754,29579,20129,26505,32593,24448,26106,26395,24536,22916,23041,34585,34587,34589,34591,34592,34596,34598,34599,34600,34602,34603,34604,34605,34607,34608,34610,34611,34613,34614,34616,34617,34618,34620,34621,34624,34625,34626,34627,34628,34629,34630,34634,34635,34637,34639,34640,34641,34642,34644,34645,34646,34648,34650,34651,34652,34653,34654,34655,34657,34658,34662,34663,34664,34665,34666,34667,34668,34669,34671,34673,34674,34675,34677,34679,34680,34681,34682,34687,34688,34689,34692,34694,34695,34697,34698,34700,34702,34703,34704,34705,34706,34708,34709,34710,34712,34713,34714,34715,34716,34717,34718,34720,34721,34722,34723,34724,24013,24494,21361,38886,36829,26693,22260,21807,24799,20026,28493,32500,33479,33806,22996,20255,20266,23614,32428,26410,34074,21619,30031,32963,21890,39759,20301,28205,35859,23561,24944,21355,30239,28201,34442,25991,38395,32441,21563,31283,32010,38382,21985,32705,29934,25373,34583,28065,31389,25105,26017,21351,25569,27779,24043,21596,38056,20044,27745,35820,23627,26080,33436,26791,21566,21556,27595,27494,20116,25410,21320,33310,20237,20398,22366,25098,38654,26212,29289,21247,21153,24735,35823,26132,29081,26512,35199,30802,30717,26224,22075,21560,38177,29306,34725,34726,34727,34729,34730,34734,34736,34737,34738,34740,34742,34743,34744,34745,34747,34748,34750,34751,34753,34754,34755,34756,34757,34759,34760,34761,34764,34765,34766,34767,34768,34772,34773,34774,34775,34776,34777,34778,34780,34781,34782,34783,34785,34786,34787,34788,34790,34791,34792,34793,34795,34796,34797,34799,34800,34801,34802,34803,34804,34805,34806,34807,34808,34810,34811,34812,34813,34815,34816,34817,34818,34820,34821,34822,34823,34824,34825,34827,34828,34829,34830,34831,34832,34833,34834,34836,34839,34840,34841,34842,34844,34845,34846,34847,34848,34851,31232,24687,24076,24713,33181,22805,24796,29060,28911,28330,27728,29312,27268,34989,24109,20064,23219,21916,38115,27927,31995,38553,25103,32454,30606,34430,21283,38686,36758,26247,23777,20384,29421,19979,21414,22799,21523,25472,38184,20808,20185,40092,32420,21688,36132,34900,33335,38386,28046,24358,23244,26174,38505,29616,29486,21439,33146,39301,32673,23466,38519,38480,32447,30456,21410,38262,39321,31665,35140,28248,20065,32724,31077,35814,24819,21709,20139,39033,24055,27233,20687,21521,35937,33831,30813,38660,21066,21742,22179,38144,28040,23477,28102,26195,34852,34853,34854,34855,34856,34857,34858,34859,34860,34861,34862,34863,34864,34865,34867,34868,34869,34870,34871,34872,34874,34875,34877,34878,34879,34881,34882,34883,34886,34887,34888,34889,34890,34891,34894,34895,34896,34897,34898,34899,34901,34902,34904,34906,34907,34908,34909,34910,34911,34912,34918,34919,34922,34925,34927,34929,34931,34932,34933,34934,34936,34937,34938,34939,34940,34944,34947,34950,34951,34953,34954,34956,34958,34959,34960,34961,34963,34964,34965,34967,34968,34969,34970,34971,34973,34974,34975,34976,34977,34979,34981,34982,34983,34984,34985,34986,23567,23389,26657,32918,21880,31505,25928,26964,20123,27463,34638,38795,21327,25375,25658,37034,26012,32961,35856,20889,26800,21368,34809,25032,27844,27899,35874,23633,34218,33455,38156,27427,36763,26032,24571,24515,20449,34885,26143,33125,29481,24826,20852,21009,22411,24418,37026,34892,37266,24184,26447,24615,22995,20804,20982,33016,21256,27769,38596,29066,20241,20462,32670,26429,21957,38152,31168,34966,32483,22687,25100,38656,34394,22040,39035,24464,35768,33988,37207,21465,26093,24207,30044,24676,32110,23167,32490,32493,36713,21927,23459,24748,26059,29572,34988,34990,34991,34992,34994,34995,34996,34997,34998,35000,35001,35002,35003,35005,35006,35007,35008,35011,35012,35015,35016,35018,35019,35020,35021,35023,35024,35025,35027,35030,35031,35034,35035,35036,35037,35038,35040,35041,35046,35047,35049,35050,35051,35052,35053,35054,35055,35058,35061,35062,35063,35066,35067,35069,35071,35072,35073,35075,35076,35077,35078,35079,35080,35081,35083,35084,35085,35086,35087,35089,35092,35093,35094,35095,35096,35100,35101,35102,35103,35104,35106,35107,35108,35110,35111,35112,35113,35116,35117,35118,35119,35121,35122,35123,35125,35127,36873,30307,30505,32474,38772,34203,23398,31348,38634,34880,21195,29071,24490,26092,35810,23547,39535,24033,27529,27739,35757,35759,36874,36805,21387,25276,40486,40493,21568,20011,33469,29273,34460,23830,34905,28079,38597,21713,20122,35766,28937,21693,38409,28895,28153,30416,20005,30740,34578,23721,24310,35328,39068,38414,28814,27839,22852,25513,30524,34893,28436,33395,22576,29141,21388,30746,38593,21761,24422,28976,23476,35866,39564,27523,22830,40495,31207,26472,25196,20335,30113,32650,27915,38451,27687,20208,30162,20859,26679,28478,36992,33136,22934,29814,35128,35129,35130,35131,35132,35133,35134,35135,35136,35138,35139,35141,35142,35143,35144,35145,35146,35147,35148,35149,35150,35151,35152,35153,35154,35155,35156,35157,35158,35159,35160,35161,35162,35163,35164,35165,35168,35169,35170,35171,35172,35173,35175,35176,35177,35178,35179,35180,35181,35182,35183,35184,35185,35186,35187,35188,35189,35190,35191,35192,35193,35194,35196,35197,35198,35200,35202,35204,35205,35207,35208,35209,35210,35211,35212,35213,35214,35215,35216,35217,35218,35219,35220,35221,35222,35223,35224,35225,35226,35227,35228,35229,35230,35231,35232,35233,25671,23591,36965,31377,35875,23002,21676,33280,33647,35201,32768,26928,22094,32822,29239,37326,20918,20063,39029,25494,19994,21494,26355,33099,22812,28082,19968,22777,21307,25558,38129,20381,20234,34915,39056,22839,36951,31227,20202,33008,30097,27778,23452,23016,24413,26885,34433,20506,24050,20057,30691,20197,33402,25233,26131,37009,23673,20159,24441,33222,36920,32900,30123,20134,35028,24847,27589,24518,20041,30410,28322,35811,35758,35850,35793,24322,32764,32716,32462,33589,33643,22240,27575,38899,38452,23035,21535,38134,28139,23493,39278,23609,24341,38544,35234,35235,35236,35237,35238,35239,35240,35241,35242,35243,35244,35245,35246,35247,35248,35249,35250,35251,35252,35253,35254,35255,35256,35257,35258,35259,35260,35261,35262,35263,35264,35267,35277,35283,35284,35285,35287,35288,35289,35291,35293,35295,35296,35297,35298,35300,35303,35304,35305,35306,35308,35309,35310,35312,35313,35314,35316,35317,35318,35319,35320,35321,35322,35323,35324,35325,35326,35327,35329,35330,35331,35332,35333,35334,35336,35337,35338,35339,35340,35341,35342,35343,35344,35345,35346,35347,35348,35349,35350,35351,35352,35353,35354,35355,35356,35357,21360,33521,27185,23156,40560,24212,32552,33721,33828,33829,33639,34631,36814,36194,30408,24433,39062,30828,26144,21727,25317,20323,33219,30152,24248,38605,36362,34553,21647,27891,28044,27704,24703,21191,29992,24189,20248,24736,24551,23588,30001,37038,38080,29369,27833,28216,37193,26377,21451,21491,20305,37321,35825,21448,24188,36802,28132,20110,30402,27014,34398,24858,33286,20313,20446,36926,40060,24841,28189,28180,38533,20104,23089,38632,19982,23679,31161,23431,35821,32701,29577,22495,33419,37057,21505,36935,21947,23786,24481,24840,27442,29425,32946,35465,35358,35359,35360,35361,35362,35363,35364,35365,35366,35367,35368,35369,35370,35371,35372,35373,35374,35375,35376,35377,35378,35379,35380,35381,35382,35383,35384,35385,35386,35387,35388,35389,35391,35392,35393,35394,35395,35396,35397,35398,35399,35401,35402,35403,35404,35405,35406,35407,35408,35409,35410,35411,35412,35413,35414,35415,35416,35417,35418,35419,35420,35421,35422,35423,35424,35425,35426,35427,35428,35429,35430,35431,35432,35433,35434,35435,35436,35437,35438,35439,35440,35441,35442,35443,35444,35445,35446,35447,35448,35450,35451,35452,35453,35454,35455,35456,28020,23507,35029,39044,35947,39533,40499,28170,20900,20803,22435,34945,21407,25588,36757,22253,21592,22278,29503,28304,32536,36828,33489,24895,24616,38498,26352,32422,36234,36291,38053,23731,31908,26376,24742,38405,32792,20113,37095,21248,38504,20801,36816,34164,37213,26197,38901,23381,21277,30776,26434,26685,21705,28798,23472,36733,20877,22312,21681,25874,26242,36190,36163,33039,33900,36973,31967,20991,34299,26531,26089,28577,34468,36481,22122,36896,30338,28790,29157,36131,25321,21017,27901,36156,24590,22686,24974,26366,36192,25166,21939,28195,26413,36711,35457,35458,35459,35460,35461,35462,35463,35464,35467,35468,35469,35470,35471,35472,35473,35474,35476,35477,35478,35479,35480,35481,35482,35483,35484,35485,35486,35487,35488,35489,35490,35491,35492,35493,35494,35495,35496,35497,35498,35499,35500,35501,35502,35503,35504,35505,35506,35507,35508,35509,35510,35511,35512,35513,35514,35515,35516,35517,35518,35519,35520,35521,35522,35523,35524,35525,35526,35527,35528,35529,35530,35531,35532,35533,35534,35535,35536,35537,35538,35539,35540,35541,35542,35543,35544,35545,35546,35547,35548,35549,35550,35551,35552,35553,35554,35555,38113,38392,30504,26629,27048,21643,20045,28856,35784,25688,25995,23429,31364,20538,23528,30651,27617,35449,31896,27838,30415,26025,36759,23853,23637,34360,26632,21344,25112,31449,28251,32509,27167,31456,24432,28467,24352,25484,28072,26454,19976,24080,36134,20183,32960,30260,38556,25307,26157,25214,27836,36213,29031,32617,20806,32903,21484,36974,25240,21746,34544,36761,32773,38167,34071,36825,27993,29645,26015,30495,29956,30759,33275,36126,38024,20390,26517,30137,35786,38663,25391,38215,38453,33976,25379,30529,24449,29424,20105,24596,25972,25327,27491,25919,35556,35557,35558,35559,35560,35561,35562,35563,35564,35565,35566,35567,35568,35569,35570,35571,35572,35573,35574,35575,35576,35577,35578,35579,35580,35581,35582,35583,35584,35585,35586,35587,35588,35589,35590,35592,35593,35594,35595,35596,35597,35598,35599,35600,35601,35602,35603,35604,35605,35606,35607,35608,35609,35610,35611,35612,35613,35614,35615,35616,35617,35618,35619,35620,35621,35623,35624,35625,35626,35627,35628,35629,35630,35631,35632,35633,35634,35635,35636,35637,35638,35639,35640,35641,35642,35643,35644,35645,35646,35647,35648,35649,35650,35651,35652,35653,24103,30151,37073,35777,33437,26525,25903,21553,34584,30693,32930,33026,27713,20043,32455,32844,30452,26893,27542,25191,20540,20356,22336,25351,27490,36286,21482,26088,32440,24535,25370,25527,33267,33268,32622,24092,23769,21046,26234,31209,31258,36136,28825,30164,28382,27835,31378,20013,30405,24544,38047,34935,32456,31181,32959,37325,20210,20247,33311,21608,24030,27954,35788,31909,36724,32920,24090,21650,30385,23449,26172,39588,29664,26666,34523,26417,29482,35832,35803,36880,31481,28891,29038,25284,30633,22065,20027,33879,26609,21161,34496,36142,38136,31569,35654,35655,35656,35657,35658,35659,35660,35661,35662,35663,35664,35665,35666,35667,35668,35669,35670,35671,35672,35673,35674,35675,35676,35677,35678,35679,35680,35681,35682,35683,35684,35685,35687,35688,35689,35690,35691,35693,35694,35695,35696,35697,35698,35699,35700,35701,35702,35703,35704,35705,35706,35707,35708,35709,35710,35711,35712,35713,35714,35715,35716,35717,35718,35719,35720,35721,35722,35723,35724,35725,35726,35727,35728,35729,35730,35731,35732,35733,35734,35735,35736,35737,35738,35739,35740,35741,35742,35743,35756,35761,35771,35783,35792,35818,35849,35870,20303,27880,31069,39547,25235,29226,25341,19987,30742,36716,25776,36186,31686,26729,24196,35013,22918,25758,22766,29366,26894,38181,36861,36184,22368,32512,35846,20934,25417,25305,21331,26700,29730,33537,37196,21828,30528,28796,27978,20857,21672,36164,23039,28363,28100,23388,32043,20180,31869,28371,23376,33258,28173,23383,39683,26837,36394,23447,32508,24635,32437,37049,36208,22863,25549,31199,36275,21330,26063,31062,35781,38459,32452,38075,32386,22068,37257,26368,32618,23562,36981,26152,24038,20304,26590,20570,20316,22352,24231,59408,59409,59410,59411,59412,35896,35897,35898,35899,35900,35901,35902,35903,35904,35906,35907,35908,35909,35912,35914,35915,35917,35918,35919,35920,35921,35922,35923,35924,35926,35927,35928,35929,35931,35932,35933,35934,35935,35936,35939,35940,35941,35942,35943,35944,35945,35948,35949,35950,35951,35952,35953,35954,35956,35957,35958,35959,35963,35964,35965,35966,35967,35968,35969,35971,35972,35974,35975,35976,35979,35981,35982,35983,35984,35985,35986,35987,35989,35990,35991,35993,35994,35995,35996,35997,35998,35999,36000,36001,36002,36003,36004,36005,36006,36007,36008,36009,36010,36011,36012,36013,20109,19980,20800,19984,24319,21317,19989,20120,19998,39730,23404,22121,20008,31162,20031,21269,20039,22829,29243,21358,27664,22239,32996,39319,27603,30590,40727,20022,20127,40720,20060,20073,20115,33416,23387,21868,22031,20164,21389,21405,21411,21413,21422,38757,36189,21274,21493,21286,21294,21310,36188,21350,21347,20994,21000,21006,21037,21043,21055,21056,21068,21086,21089,21084,33967,21117,21122,21121,21136,21139,20866,32596,20155,20163,20169,20162,20200,20193,20203,20190,20251,20211,20258,20324,20213,20261,20263,20233,20267,20318,20327,25912,20314,20317,36014,36015,36016,36017,36018,36019,36020,36021,36022,36023,36024,36025,36026,36027,36028,36029,36030,36031,36032,36033,36034,36035,36036,36037,36038,36039,36040,36041,36042,36043,36044,36045,36046,36047,36048,36049,36050,36051,36052,36053,36054,36055,36056,36057,36058,36059,36060,36061,36062,36063,36064,36065,36066,36067,36068,36069,36070,36071,36072,36073,36074,36075,36076,36077,36078,36079,36080,36081,36082,36083,36084,36085,36086,36087,36088,36089,36090,36091,36092,36093,36094,36095,36096,36097,36098,36099,36100,36101,36102,36103,36104,36105,36106,36107,36108,36109,20319,20311,20274,20285,20342,20340,20369,20361,20355,20367,20350,20347,20394,20348,20396,20372,20454,20456,20458,20421,20442,20451,20444,20433,20447,20472,20521,20556,20467,20524,20495,20526,20525,20478,20508,20492,20517,20520,20606,20547,20565,20552,20558,20588,20603,20645,20647,20649,20666,20694,20742,20717,20716,20710,20718,20743,20747,20189,27709,20312,20325,20430,40864,27718,31860,20846,24061,40649,39320,20865,22804,21241,21261,35335,21264,20971,22809,20821,20128,20822,20147,34926,34980,20149,33044,35026,31104,23348,34819,32696,20907,20913,20925,20924,36110,36111,36112,36113,36114,36115,36116,36117,36118,36119,36120,36121,36122,36123,36124,36128,36177,36178,36183,36191,36197,36200,36201,36202,36204,36206,36207,36209,36210,36216,36217,36218,36219,36220,36221,36222,36223,36224,36226,36227,36230,36231,36232,36233,36236,36237,36238,36239,36240,36242,36243,36245,36246,36247,36248,36249,36250,36251,36252,36253,36254,36256,36257,36258,36260,36261,36262,36263,36264,36265,36266,36267,36268,36269,36270,36271,36272,36274,36278,36279,36281,36283,36285,36288,36289,36290,36293,36295,36296,36297,36298,36301,36304,36306,36307,36308,20935,20886,20898,20901,35744,35750,35751,35754,35764,35765,35767,35778,35779,35787,35791,35790,35794,35795,35796,35798,35800,35801,35804,35807,35808,35812,35816,35817,35822,35824,35827,35830,35833,35836,35839,35840,35842,35844,35847,35852,35855,35857,35858,35860,35861,35862,35865,35867,35864,35869,35871,35872,35873,35877,35879,35882,35883,35886,35887,35890,35891,35893,35894,21353,21370,38429,38434,38433,38449,38442,38461,38460,38466,38473,38484,38495,38503,38508,38514,38516,38536,38541,38551,38576,37015,37019,37021,37017,37036,37025,37044,37043,37046,37050,36309,36312,36313,36316,36320,36321,36322,36325,36326,36327,36329,36333,36334,36336,36337,36338,36340,36342,36348,36350,36351,36352,36353,36354,36355,36356,36358,36359,36360,36363,36365,36366,36368,36369,36370,36371,36373,36374,36375,36376,36377,36378,36379,36380,36384,36385,36388,36389,36390,36391,36392,36395,36397,36400,36402,36403,36404,36406,36407,36408,36411,36412,36414,36415,36419,36421,36422,36428,36429,36430,36431,36432,36435,36436,36437,36438,36439,36440,36442,36443,36444,36445,36446,36447,36448,36449,36450,36451,36452,36453,36455,36456,36458,36459,36462,36465,37048,37040,37071,37061,37054,37072,37060,37063,37075,37094,37090,37084,37079,37083,37099,37103,37118,37124,37154,37150,37155,37169,37167,37177,37187,37190,21005,22850,21154,21164,21165,21182,21759,21200,21206,21232,21471,29166,30669,24308,20981,20988,39727,21430,24321,30042,24047,22348,22441,22433,22654,22716,22725,22737,22313,22316,22314,22323,22329,22318,22319,22364,22331,22338,22377,22405,22379,22406,22396,22395,22376,22381,22390,22387,22445,22436,22412,22450,22479,22439,22452,22419,22432,22485,22488,22490,22489,22482,22456,22516,22511,22520,22500,22493,36467,36469,36471,36472,36473,36474,36475,36477,36478,36480,36482,36483,36484,36486,36488,36489,36490,36491,36492,36493,36494,36497,36498,36499,36501,36502,36503,36504,36505,36506,36507,36509,36511,36512,36513,36514,36515,36516,36517,36518,36519,36520,36521,36522,36525,36526,36528,36529,36531,36532,36533,36534,36535,36536,36537,36539,36540,36541,36542,36543,36544,36545,36546,36547,36548,36549,36550,36551,36552,36553,36554,36555,36556,36557,36559,36560,36561,36562,36563,36564,36565,36566,36567,36568,36569,36570,36571,36572,36573,36574,36575,36576,36577,36578,36579,36580,22539,22541,22525,22509,22528,22558,22553,22596,22560,22629,22636,22657,22665,22682,22656,39336,40729,25087,33401,33405,33407,33423,33418,33448,33412,33422,33425,33431,33433,33451,33464,33470,33456,33480,33482,33507,33432,33463,33454,33483,33484,33473,33449,33460,33441,33450,33439,33476,33486,33444,33505,33545,33527,33508,33551,33543,33500,33524,33490,33496,33548,33531,33491,33553,33562,33542,33556,33557,33504,33493,33564,33617,33627,33628,33544,33682,33596,33588,33585,33691,33630,33583,33615,33607,33603,33631,33600,33559,33632,33581,33594,33587,33638,33637,36581,36582,36583,36584,36585,36586,36587,36588,36589,36590,36591,36592,36593,36594,36595,36596,36597,36598,36599,36600,36601,36602,36603,36604,36605,36606,36607,36608,36609,36610,36611,36612,36613,36614,36615,36616,36617,36618,36619,36620,36621,36622,36623,36624,36625,36626,36627,36628,36629,36630,36631,36632,36633,36634,36635,36636,36637,36638,36639,36640,36641,36642,36643,36644,36645,36646,36647,36648,36649,36650,36651,36652,36653,36654,36655,36656,36657,36658,36659,36660,36661,36662,36663,36664,36665,36666,36667,36668,36669,36670,36671,36672,36673,36674,36675,36676,33640,33563,33641,33644,33642,33645,33646,33712,33656,33715,33716,33696,33706,33683,33692,33669,33660,33718,33705,33661,33720,33659,33688,33694,33704,33722,33724,33729,33793,33765,33752,22535,33816,33803,33757,33789,33750,33820,33848,33809,33798,33748,33759,33807,33795,33784,33785,33770,33733,33728,33830,33776,33761,33884,33873,33882,33881,33907,33927,33928,33914,33929,33912,33852,33862,33897,33910,33932,33934,33841,33901,33985,33997,34000,34022,33981,34003,33994,33983,33978,34016,33953,33977,33972,33943,34021,34019,34060,29965,34104,34032,34105,34079,34106,36677,36678,36679,36680,36681,36682,36683,36684,36685,36686,36687,36688,36689,36690,36691,36692,36693,36694,36695,36696,36697,36698,36699,36700,36701,36702,36703,36704,36705,36706,36707,36708,36709,36714,36736,36748,36754,36765,36768,36769,36770,36772,36773,36774,36775,36778,36780,36781,36782,36783,36786,36787,36788,36789,36791,36792,36794,36795,36796,36799,36800,36803,36806,36809,36810,36811,36812,36813,36815,36818,36822,36823,36826,36832,36833,36835,36839,36844,36847,36849,36850,36852,36853,36854,36858,36859,36860,36862,36863,36871,36872,36876,36878,36883,36885,36888,34134,34107,34047,34044,34137,34120,34152,34148,34142,34170,30626,34115,34162,34171,34212,34216,34183,34191,34169,34222,34204,34181,34233,34231,34224,34259,34241,34268,34303,34343,34309,34345,34326,34364,24318,24328,22844,22849,32823,22869,22874,22872,21263,23586,23589,23596,23604,25164,25194,25247,25275,25290,25306,25303,25326,25378,25334,25401,25419,25411,25517,25590,25457,25466,25486,25524,25453,25516,25482,25449,25518,25532,25586,25592,25568,25599,25540,25566,25550,25682,25542,25534,25669,25665,25611,25627,25632,25612,25638,25633,25694,25732,25709,25750,36889,36892,36899,36900,36901,36903,36904,36905,36906,36907,36908,36912,36913,36914,36915,36916,36919,36921,36922,36925,36927,36928,36931,36933,36934,36936,36937,36938,36939,36940,36942,36948,36949,36950,36953,36954,36956,36957,36958,36959,36960,36961,36964,36966,36967,36969,36970,36971,36972,36975,36976,36977,36978,36979,36982,36983,36984,36985,36986,36987,36988,36990,36993,36996,36997,36998,36999,37001,37002,37004,37005,37006,37007,37008,37010,37012,37014,37016,37018,37020,37022,37023,37024,37028,37029,37031,37032,37033,37035,37037,37042,37047,37052,37053,37055,37056,25722,25783,25784,25753,25786,25792,25808,25815,25828,25826,25865,25893,25902,24331,24530,29977,24337,21343,21489,21501,21481,21480,21499,21522,21526,21510,21579,21586,21587,21588,21590,21571,21537,21591,21593,21539,21554,21634,21652,21623,21617,21604,21658,21659,21636,21622,21606,21661,21712,21677,21698,21684,21714,21671,21670,21715,21716,21618,21667,21717,21691,21695,21708,21721,21722,21724,21673,21674,21668,21725,21711,21726,21787,21735,21792,21757,21780,21747,21794,21795,21775,21777,21799,21802,21863,21903,21941,21833,21869,21825,21845,21823,21840,21820,37058,37059,37062,37064,37065,37067,37068,37069,37074,37076,37077,37078,37080,37081,37082,37086,37087,37088,37091,37092,37093,37097,37098,37100,37102,37104,37105,37106,37107,37109,37110,37111,37113,37114,37115,37116,37119,37120,37121,37123,37125,37126,37127,37128,37129,37130,37131,37132,37133,37134,37135,37136,37137,37138,37139,37140,37141,37142,37143,37144,37146,37147,37148,37149,37151,37152,37153,37156,37157,37158,37159,37160,37161,37162,37163,37164,37165,37166,37168,37170,37171,37172,37173,37174,37175,37176,37178,37179,37180,37181,37182,37183,37184,37185,37186,37188,21815,21846,21877,21878,21879,21811,21808,21852,21899,21970,21891,21937,21945,21896,21889,21919,21886,21974,21905,21883,21983,21949,21950,21908,21913,21994,22007,21961,22047,21969,21995,21996,21972,21990,21981,21956,21999,21989,22002,22003,21964,21965,21992,22005,21988,36756,22046,22024,22028,22017,22052,22051,22014,22016,22055,22061,22104,22073,22103,22060,22093,22114,22105,22108,22092,22100,22150,22116,22129,22123,22139,22140,22149,22163,22191,22228,22231,22237,22241,22261,22251,22265,22271,22276,22282,22281,22300,24079,24089,24084,24081,24113,24123,24124,37189,37191,37192,37201,37203,37204,37205,37206,37208,37209,37211,37212,37215,37216,37222,37223,37224,37227,37229,37235,37242,37243,37244,37248,37249,37250,37251,37252,37254,37256,37258,37262,37263,37267,37268,37269,37270,37271,37272,37273,37276,37277,37278,37279,37280,37281,37284,37285,37286,37287,37288,37289,37291,37292,37296,37297,37298,37299,37302,37303,37304,37305,37307,37308,37309,37310,37311,37312,37313,37314,37315,37316,37317,37318,37320,37323,37328,37330,37331,37332,37333,37334,37335,37336,37337,37338,37339,37341,37342,37343,37344,37345,37346,37347,37348,37349,24119,24132,24148,24155,24158,24161,23692,23674,23693,23696,23702,23688,23704,23705,23697,23706,23708,23733,23714,23741,23724,23723,23729,23715,23745,23735,23748,23762,23780,23755,23781,23810,23811,23847,23846,23854,23844,23838,23814,23835,23896,23870,23860,23869,23916,23899,23919,23901,23915,23883,23882,23913,23924,23938,23961,23965,35955,23991,24005,24435,24439,24450,24455,24457,24460,24469,24473,24476,24488,24493,24501,24508,34914,24417,29357,29360,29364,29367,29368,29379,29377,29390,29389,29394,29416,29423,29417,29426,29428,29431,29441,29427,29443,29434,37350,37351,37352,37353,37354,37355,37356,37357,37358,37359,37360,37361,37362,37363,37364,37365,37366,37367,37368,37369,37370,37371,37372,37373,37374,37375,37376,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37387,37388,37389,37390,37391,37392,37393,37394,37395,37396,37397,37398,37399,37400,37401,37402,37403,37404,37405,37406,37407,37408,37409,37410,37411,37412,37413,37414,37415,37416,37417,37418,37419,37420,37421,37422,37423,37424,37425,37426,37427,37428,37429,37430,37431,37432,37433,37434,37435,37436,37437,37438,37439,37440,37441,37442,37443,37444,37445,29435,29463,29459,29473,29450,29470,29469,29461,29474,29497,29477,29484,29496,29489,29520,29517,29527,29536,29548,29551,29566,33307,22821,39143,22820,22786,39267,39271,39272,39273,39274,39275,39276,39284,39287,39293,39296,39300,39303,39306,39309,39312,39313,39315,39316,39317,24192,24209,24203,24214,24229,24224,24249,24245,24254,24243,36179,24274,24273,24283,24296,24298,33210,24516,24521,24534,24527,24579,24558,24580,24545,24548,24574,24581,24582,24554,24557,24568,24601,24629,24614,24603,24591,24589,24617,24619,24586,24639,24609,24696,24697,24699,24698,24642,37446,37447,37448,37449,37450,37451,37452,37453,37454,37455,37456,37457,37458,37459,37460,37461,37462,37463,37464,37465,37466,37467,37468,37469,37470,37471,37472,37473,37474,37475,37476,37477,37478,37479,37480,37481,37482,37483,37484,37485,37486,37487,37488,37489,37490,37491,37493,37494,37495,37496,37497,37498,37499,37500,37501,37502,37503,37504,37505,37506,37507,37508,37509,37510,37511,37512,37513,37514,37515,37516,37517,37519,37520,37521,37522,37523,37524,37525,37526,37527,37528,37529,37530,37531,37532,37533,37534,37535,37536,37537,37538,37539,37540,37541,37542,37543,24682,24701,24726,24730,24749,24733,24707,24722,24716,24731,24812,24763,24753,24797,24792,24774,24794,24756,24864,24870,24853,24867,24820,24832,24846,24875,24906,24949,25004,24980,24999,25015,25044,25077,24541,38579,38377,38379,38385,38387,38389,38390,38396,38398,38403,38404,38406,38408,38410,38411,38412,38413,38415,38418,38421,38422,38423,38425,38426,20012,29247,25109,27701,27732,27740,27722,27811,27781,27792,27796,27788,27752,27753,27764,27766,27782,27817,27856,27860,27821,27895,27896,27889,27863,27826,27872,27862,27898,27883,27886,27825,27859,27887,27902,37544,37545,37546,37547,37548,37549,37551,37552,37553,37554,37555,37556,37557,37558,37559,37560,37561,37562,37563,37564,37565,37566,37567,37568,37569,37570,37571,37572,37573,37574,37575,37577,37578,37579,37580,37581,37582,37583,37584,37585,37586,37587,37588,37589,37590,37591,37592,37593,37594,37595,37596,37597,37598,37599,37600,37601,37602,37603,37604,37605,37606,37607,37608,37609,37610,37611,37612,37613,37614,37615,37616,37617,37618,37619,37620,37621,37622,37623,37624,37625,37626,37627,37628,37629,37630,37631,37632,37633,37634,37635,37636,37637,37638,37639,37640,37641,27961,27943,27916,27971,27976,27911,27908,27929,27918,27947,27981,27950,27957,27930,27983,27986,27988,27955,28049,28015,28062,28064,27998,28051,28052,27996,28000,28028,28003,28186,28103,28101,28126,28174,28095,28128,28177,28134,28125,28121,28182,28075,28172,28078,28203,28270,28238,28267,28338,28255,28294,28243,28244,28210,28197,28228,28383,28337,28312,28384,28461,28386,28325,28327,28349,28347,28343,28375,28340,28367,28303,28354,28319,28514,28486,28487,28452,28437,28409,28463,28470,28491,28532,28458,28425,28457,28553,28557,28556,28536,28530,28540,28538,28625,37642,37643,37644,37645,37646,37647,37648,37649,37650,37651,37652,37653,37654,37655,37656,37657,37658,37659,37660,37661,37662,37663,37664,37665,37666,37667,37668,37669,37670,37671,37672,37673,37674,37675,37676,37677,37678,37679,37680,37681,37682,37683,37684,37685,37686,37687,37688,37689,37690,37691,37692,37693,37695,37696,37697,37698,37699,37700,37701,37702,37703,37704,37705,37706,37707,37708,37709,37710,37711,37712,37713,37714,37715,37716,37717,37718,37719,37720,37721,37722,37723,37724,37725,37726,37727,37728,37729,37730,37731,37732,37733,37734,37735,37736,37737,37739,28617,28583,28601,28598,28610,28641,28654,28638,28640,28655,28698,28707,28699,28729,28725,28751,28766,23424,23428,23445,23443,23461,23480,29999,39582,25652,23524,23534,35120,23536,36423,35591,36790,36819,36821,36837,36846,36836,36841,36838,36851,36840,36869,36868,36875,36902,36881,36877,36886,36897,36917,36918,36909,36911,36932,36945,36946,36944,36968,36952,36962,36955,26297,36980,36989,36994,37000,36995,37003,24400,24407,24406,24408,23611,21675,23632,23641,23409,23651,23654,32700,24362,24361,24365,33396,24380,39739,23662,22913,22915,22925,22953,22954,22947,37740,37741,37742,37743,37744,37745,37746,37747,37748,37749,37750,37751,37752,37753,37754,37755,37756,37757,37758,37759,37760,37761,37762,37763,37764,37765,37766,37767,37768,37769,37770,37771,37772,37773,37774,37776,37777,37778,37779,37780,37781,37782,37783,37784,37785,37786,37787,37788,37789,37790,37791,37792,37793,37794,37795,37796,37797,37798,37799,37800,37801,37802,37803,37804,37805,37806,37807,37808,37809,37810,37811,37812,37813,37814,37815,37816,37817,37818,37819,37820,37821,37822,37823,37824,37825,37826,37827,37828,37829,37830,37831,37832,37833,37835,37836,37837,22935,22986,22955,22942,22948,22994,22962,22959,22999,22974,23045,23046,23005,23048,23011,23000,23033,23052,23049,23090,23092,23057,23075,23059,23104,23143,23114,23125,23100,23138,23157,33004,23210,23195,23159,23162,23230,23275,23218,23250,23252,23224,23264,23267,23281,23254,23270,23256,23260,23305,23319,23318,23346,23351,23360,23573,23580,23386,23397,23411,23377,23379,23394,39541,39543,39544,39546,39551,39549,39552,39553,39557,39560,39562,39568,39570,39571,39574,39576,39579,39580,39581,39583,39584,39586,39587,39589,39591,32415,32417,32419,32421,32424,32425,37838,37839,37840,37841,37842,37843,37844,37845,37847,37848,37849,37850,37851,37852,37853,37854,37855,37856,37857,37858,37859,37860,37861,37862,37863,37864,37865,37866,37867,37868,37869,37870,37871,37872,37873,37874,37875,37876,37877,37878,37879,37880,37881,37882,37883,37884,37885,37886,37887,37888,37889,37890,37891,37892,37893,37894,37895,37896,37897,37898,37899,37900,37901,37902,37903,37904,37905,37906,37907,37908,37909,37910,37911,37912,37913,37914,37915,37916,37917,37918,37919,37920,37921,37922,37923,37924,37925,37926,37927,37928,37929,37930,37931,37932,37933,37934,32429,32432,32446,32448,32449,32450,32457,32459,32460,32464,32468,32471,32475,32480,32481,32488,32491,32494,32495,32497,32498,32525,32502,32506,32507,32510,32513,32514,32515,32519,32520,32523,32524,32527,32529,32530,32535,32537,32540,32539,32543,32545,32546,32547,32548,32549,32550,32551,32554,32555,32556,32557,32559,32560,32561,32562,32563,32565,24186,30079,24027,30014,37013,29582,29585,29614,29602,29599,29647,29634,29649,29623,29619,29632,29641,29640,29669,29657,39036,29706,29673,29671,29662,29626,29682,29711,29738,29787,29734,29733,29736,29744,29742,29740,37935,37936,37937,37938,37939,37940,37941,37942,37943,37944,37945,37946,37947,37948,37949,37951,37952,37953,37954,37955,37956,37957,37958,37959,37960,37961,37962,37963,37964,37965,37966,37967,37968,37969,37970,37971,37972,37973,37974,37975,37976,37977,37978,37979,37980,37981,37982,37983,37984,37985,37986,37987,37988,37989,37990,37991,37992,37993,37994,37996,37997,37998,37999,38000,38001,38002,38003,38004,38005,38006,38007,38008,38009,38010,38011,38012,38013,38014,38015,38016,38017,38018,38019,38020,38033,38038,38040,38087,38095,38099,38100,38106,38118,38139,38172,38176,29723,29722,29761,29788,29783,29781,29785,29815,29805,29822,29852,29838,29824,29825,29831,29835,29854,29864,29865,29840,29863,29906,29882,38890,38891,38892,26444,26451,26462,26440,26473,26533,26503,26474,26483,26520,26535,26485,26536,26526,26541,26507,26487,26492,26608,26633,26584,26634,26601,26544,26636,26585,26549,26586,26547,26589,26624,26563,26552,26594,26638,26561,26621,26674,26675,26720,26721,26702,26722,26692,26724,26755,26653,26709,26726,26689,26727,26688,26686,26698,26697,26665,26805,26767,26740,26743,26771,26731,26818,26990,26876,26911,26912,26873,38183,38195,38205,38211,38216,38219,38229,38234,38240,38254,38260,38261,38263,38264,38265,38266,38267,38268,38269,38270,38272,38273,38274,38275,38276,38277,38278,38279,38280,38281,38282,38283,38284,38285,38286,38287,38288,38289,38290,38291,38292,38293,38294,38295,38296,38297,38298,38299,38300,38301,38302,38303,38304,38305,38306,38307,38308,38309,38310,38311,38312,38313,38314,38315,38316,38317,38318,38319,38320,38321,38322,38323,38324,38325,38326,38327,38328,38329,38330,38331,38332,38333,38334,38335,38336,38337,38338,38339,38340,38341,38342,38343,38344,38345,38346,38347,26916,26864,26891,26881,26967,26851,26896,26993,26937,26976,26946,26973,27012,26987,27008,27032,27000,26932,27084,27015,27016,27086,27017,26982,26979,27001,27035,27047,27067,27051,27053,27092,27057,27073,27082,27103,27029,27104,27021,27135,27183,27117,27159,27160,27237,27122,27204,27198,27296,27216,27227,27189,27278,27257,27197,27176,27224,27260,27281,27280,27305,27287,27307,29495,29522,27521,27522,27527,27524,27538,27539,27533,27546,27547,27553,27562,36715,36717,36721,36722,36723,36725,36726,36728,36727,36729,36730,36732,36734,36737,36738,36740,36743,36747,38348,38349,38350,38351,38352,38353,38354,38355,38356,38357,38358,38359,38360,38361,38362,38363,38364,38365,38366,38367,38368,38369,38370,38371,38372,38373,38374,38375,38380,38399,38407,38419,38424,38427,38430,38432,38435,38436,38437,38438,38439,38440,38441,38443,38444,38445,38447,38448,38455,38456,38457,38458,38462,38465,38467,38474,38478,38479,38481,38482,38483,38486,38487,38488,38489,38490,38492,38493,38494,38496,38499,38501,38502,38507,38509,38510,38511,38512,38513,38515,38520,38521,38522,38523,38524,38525,38526,38527,38528,38529,38530,38531,38532,38535,38537,38538,36749,36750,36751,36760,36762,36558,25099,25111,25115,25119,25122,25121,25125,25124,25132,33255,29935,29940,29951,29967,29969,29971,25908,26094,26095,26096,26122,26137,26482,26115,26133,26112,28805,26359,26141,26164,26161,26166,26165,32774,26207,26196,26177,26191,26198,26209,26199,26231,26244,26252,26279,26269,26302,26331,26332,26342,26345,36146,36147,36150,36155,36157,36160,36165,36166,36168,36169,36167,36173,36181,36185,35271,35274,35275,35276,35278,35279,35280,35281,29294,29343,29277,29286,29295,29310,29311,29316,29323,29325,29327,29330,25352,25394,25520,38540,38542,38545,38546,38547,38549,38550,38554,38555,38557,38558,38559,38560,38561,38562,38563,38564,38565,38566,38568,38569,38570,38571,38572,38573,38574,38575,38577,38578,38580,38581,38583,38584,38586,38587,38591,38594,38595,38600,38602,38603,38608,38609,38611,38612,38614,38615,38616,38617,38618,38619,38620,38621,38622,38623,38625,38626,38627,38628,38629,38630,38631,38635,38636,38637,38638,38640,38641,38642,38644,38645,38648,38650,38651,38652,38653,38655,38658,38659,38661,38666,38667,38668,38672,38673,38674,38676,38677,38679,38680,38681,38682,38683,38685,38687,38688,25663,25816,32772,27626,27635,27645,27637,27641,27653,27655,27654,27661,27669,27672,27673,27674,27681,27689,27684,27690,27698,25909,25941,25963,29261,29266,29270,29232,34402,21014,32927,32924,32915,32956,26378,32957,32945,32939,32941,32948,32951,32999,33000,33001,33002,32987,32962,32964,32985,32973,32983,26384,32989,33003,33009,33012,33005,33037,33038,33010,33020,26389,33042,35930,33078,33054,33068,33048,33074,33096,33100,33107,33140,33113,33114,33137,33120,33129,33148,33149,33133,33127,22605,23221,33160,33154,33169,28373,33187,33194,33228,26406,33226,33211,38689,38690,38691,38692,38693,38694,38695,38696,38697,38699,38700,38702,38703,38705,38707,38708,38709,38710,38711,38714,38715,38716,38717,38719,38720,38721,38722,38723,38724,38725,38726,38727,38728,38729,38730,38731,38732,38733,38734,38735,38736,38737,38740,38741,38743,38744,38746,38748,38749,38751,38755,38756,38758,38759,38760,38762,38763,38764,38765,38766,38767,38768,38769,38770,38773,38775,38776,38777,38778,38779,38781,38782,38783,38784,38785,38786,38787,38788,38790,38791,38792,38793,38794,38796,38798,38799,38800,38803,38805,38806,38807,38809,38810,38811,38812,38813,33217,33190,27428,27447,27449,27459,27462,27481,39121,39122,39123,39125,39129,39130,27571,24384,27586,35315,26000,40785,26003,26044,26054,26052,26051,26060,26062,26066,26070,28800,28828,28822,28829,28859,28864,28855,28843,28849,28904,28874,28944,28947,28950,28975,28977,29043,29020,29032,28997,29042,29002,29048,29050,29080,29107,29109,29096,29088,29152,29140,29159,29177,29213,29224,28780,28952,29030,29113,25150,25149,25155,25160,25161,31035,31040,31046,31049,31067,31068,31059,31066,31074,31063,31072,31087,31079,31098,31109,31114,31130,31143,31155,24529,24528,38814,38815,38817,38818,38820,38821,38822,38823,38824,38825,38826,38828,38830,38832,38833,38835,38837,38838,38839,38840,38841,38842,38843,38844,38845,38846,38847,38848,38849,38850,38851,38852,38853,38854,38855,38856,38857,38858,38859,38860,38861,38862,38863,38864,38865,38866,38867,38868,38869,38870,38871,38872,38873,38874,38875,38876,38877,38878,38879,38880,38881,38882,38883,38884,38885,38888,38894,38895,38896,38897,38898,38900,38903,38904,38905,38906,38907,38908,38909,38910,38911,38912,38913,38914,38915,38916,38917,38918,38919,38920,38921,38922,38923,38924,38925,38926,24636,24669,24666,24679,24641,24665,24675,24747,24838,24845,24925,25001,24989,25035,25041,25094,32896,32895,27795,27894,28156,30710,30712,30720,30729,30743,30744,30737,26027,30765,30748,30749,30777,30778,30779,30751,30780,30757,30764,30755,30761,30798,30829,30806,30807,30758,30800,30791,30796,30826,30875,30867,30874,30855,30876,30881,30883,30898,30905,30885,30932,30937,30921,30956,30962,30981,30964,30995,31012,31006,31028,40859,40697,40699,40700,30449,30468,30477,30457,30471,30472,30490,30498,30489,30509,30502,30517,30520,30544,30545,30535,30531,30554,30568,38927,38928,38929,38930,38931,38932,38933,38934,38935,38936,38937,38938,38939,38940,38941,38942,38943,38944,38945,38946,38947,38948,38949,38950,38951,38952,38953,38954,38955,38956,38957,38958,38959,38960,38961,38962,38963,38964,38965,38966,38967,38968,38969,38970,38971,38972,38973,38974,38975,38976,38977,38978,38979,38980,38981,38982,38983,38984,38985,38986,38987,38988,38989,38990,38991,38992,38993,38994,38995,38996,38997,38998,38999,39000,39001,39002,39003,39004,39005,39006,39007,39008,39009,39010,39011,39012,39013,39014,39015,39016,39017,39018,39019,39020,39021,39022,30562,30565,30591,30605,30589,30592,30604,30609,30623,30624,30640,30645,30653,30010,30016,30030,30027,30024,30043,30066,30073,30083,32600,32609,32607,35400,32616,32628,32625,32633,32641,32638,30413,30437,34866,38021,38022,38023,38027,38026,38028,38029,38031,38032,38036,38039,38037,38042,38043,38044,38051,38052,38059,38058,38061,38060,38063,38064,38066,38068,38070,38071,38072,38073,38074,38076,38077,38079,38084,38088,38089,38090,38091,38092,38093,38094,38096,38097,38098,38101,38102,38103,38105,38104,38107,38110,38111,38112,38114,38116,38117,38119,38120,38122,39023,39024,39025,39026,39027,39028,39051,39054,39058,39061,39065,39075,39080,39081,39082,39083,39084,39085,39086,39087,39088,39089,39090,39091,39092,39093,39094,39095,39096,39097,39098,39099,39100,39101,39102,39103,39104,39105,39106,39107,39108,39109,39110,39111,39112,39113,39114,39115,39116,39117,39119,39120,39124,39126,39127,39131,39132,39133,39136,39137,39138,39139,39140,39141,39142,39145,39146,39147,39148,39149,39150,39151,39152,39153,39154,39155,39156,39157,39158,39159,39160,39161,39162,39163,39164,39165,39166,39167,39168,39169,39170,39171,39172,39173,39174,39175,38121,38123,38126,38127,38131,38132,38133,38135,38137,38140,38141,38143,38147,38146,38150,38151,38153,38154,38157,38158,38159,38162,38163,38164,38165,38166,38168,38171,38173,38174,38175,38178,38186,38187,38185,38188,38193,38194,38196,38198,38199,38200,38204,38206,38207,38210,38197,38212,38213,38214,38217,38220,38222,38223,38226,38227,38228,38230,38231,38232,38233,38235,38238,38239,38237,38241,38242,38244,38245,38246,38247,38248,38249,38250,38251,38252,38255,38257,38258,38259,38202,30695,30700,38601,31189,31213,31203,31211,31238,23879,31235,31234,31262,31252,39176,39177,39178,39179,39180,39182,39183,39185,39186,39187,39188,39189,39190,39191,39192,39193,39194,39195,39196,39197,39198,39199,39200,39201,39202,39203,39204,39205,39206,39207,39208,39209,39210,39211,39212,39213,39215,39216,39217,39218,39219,39220,39221,39222,39223,39224,39225,39226,39227,39228,39229,39230,39231,39232,39233,39234,39235,39236,39237,39238,39239,39240,39241,39242,39243,39244,39245,39246,39247,39248,39249,39250,39251,39254,39255,39256,39257,39258,39259,39260,39261,39262,39263,39264,39265,39266,39268,39270,39283,39288,39289,39291,39294,39298,39299,39305,31289,31287,31313,40655,39333,31344,30344,30350,30355,30361,30372,29918,29920,29996,40480,40482,40488,40489,40490,40491,40492,40498,40497,40502,40504,40503,40505,40506,40510,40513,40514,40516,40518,40519,40520,40521,40523,40524,40526,40529,40533,40535,40538,40539,40540,40542,40547,40550,40551,40552,40553,40554,40555,40556,40561,40557,40563,30098,30100,30102,30112,30109,30124,30115,30131,30132,30136,30148,30129,30128,30147,30146,30166,30157,30179,30184,30182,30180,30187,30183,30211,30193,30204,30207,30224,30208,30213,30220,30231,30218,30245,30232,30229,30233,39308,39310,39322,39323,39324,39325,39326,39327,39328,39329,39330,39331,39332,39334,39335,39337,39338,39339,39340,39341,39342,39343,39344,39345,39346,39347,39348,39349,39350,39351,39352,39353,39354,39355,39356,39357,39358,39359,39360,39361,39362,39363,39364,39365,39366,39367,39368,39369,39370,39371,39372,39373,39374,39375,39376,39377,39378,39379,39380,39381,39382,39383,39384,39385,39386,39387,39388,39389,39390,39391,39392,39393,39394,39395,39396,39397,39398,39399,39400,39401,39402,39403,39404,39405,39406,39407,39408,39409,39410,39411,39412,39413,39414,39415,39416,39417,30235,30268,30242,30240,30272,30253,30256,30271,30261,30275,30270,30259,30285,30302,30292,30300,30294,30315,30319,32714,31462,31352,31353,31360,31366,31368,31381,31398,31392,31404,31400,31405,31411,34916,34921,34930,34941,34943,34946,34978,35014,34999,35004,35017,35042,35022,35043,35045,35057,35098,35068,35048,35070,35056,35105,35097,35091,35099,35082,35124,35115,35126,35137,35174,35195,30091,32997,30386,30388,30684,32786,32788,32790,32796,32800,32802,32805,32806,32807,32809,32808,32817,32779,32821,32835,32838,32845,32850,32873,32881,35203,39032,39040,39043,39418,39419,39420,39421,39422,39423,39424,39425,39426,39427,39428,39429,39430,39431,39432,39433,39434,39435,39436,39437,39438,39439,39440,39441,39442,39443,39444,39445,39446,39447,39448,39449,39450,39451,39452,39453,39454,39455,39456,39457,39458,39459,39460,39461,39462,39463,39464,39465,39466,39467,39468,39469,39470,39471,39472,39473,39474,39475,39476,39477,39478,39479,39480,39481,39482,39483,39484,39485,39486,39487,39488,39489,39490,39491,39492,39493,39494,39495,39496,39497,39498,39499,39500,39501,39502,39503,39504,39505,39506,39507,39508,39509,39510,39511,39512,39513,39049,39052,39053,39055,39060,39066,39067,39070,39071,39073,39074,39077,39078,34381,34388,34412,34414,34431,34426,34428,34427,34472,34445,34443,34476,34461,34471,34467,34474,34451,34473,34486,34500,34485,34510,34480,34490,34481,34479,34505,34511,34484,34537,34545,34546,34541,34547,34512,34579,34526,34548,34527,34520,34513,34563,34567,34552,34568,34570,34573,34569,34595,34619,34590,34597,34606,34586,34622,34632,34612,34609,34601,34615,34623,34690,34594,34685,34686,34683,34656,34672,34636,34670,34699,34643,34659,34684,34660,34649,34661,34707,34735,34728,34770,39514,39515,39516,39517,39518,39519,39520,39521,39522,39523,39524,39525,39526,39527,39528,39529,39530,39531,39538,39555,39561,39565,39566,39572,39573,39577,39590,39593,39594,39595,39596,39597,39598,39599,39602,39603,39604,39605,39609,39611,39613,39614,39615,39619,39620,39622,39623,39624,39625,39626,39629,39630,39631,39632,39634,39636,39637,39638,39639,39641,39642,39643,39644,39645,39646,39648,39650,39651,39652,39653,39655,39656,39657,39658,39660,39662,39664,39665,39666,39667,39668,39669,39670,39671,39672,39674,39676,39677,39678,39679,39680,39681,39682,39684,39685,39686,34758,34696,34693,34733,34711,34691,34731,34789,34732,34741,34739,34763,34771,34749,34769,34752,34762,34779,34794,34784,34798,34838,34835,34814,34826,34843,34849,34873,34876,32566,32578,32580,32581,33296,31482,31485,31496,31491,31492,31509,31498,31531,31503,31559,31544,31530,31513,31534,31537,31520,31525,31524,31539,31550,31518,31576,31578,31557,31605,31564,31581,31584,31598,31611,31586,31602,31601,31632,31654,31655,31672,31660,31645,31656,31621,31658,31644,31650,31659,31668,31697,31681,31692,31709,31706,31717,31718,31722,31756,31742,31740,31759,31766,31755,39687,39689,39690,39691,39692,39693,39694,39696,39697,39698,39700,39701,39702,39703,39704,39705,39706,39707,39708,39709,39710,39712,39713,39714,39716,39717,39718,39719,39720,39721,39722,39723,39724,39725,39726,39728,39729,39731,39732,39733,39734,39735,39736,39737,39738,39741,39742,39743,39744,39750,39754,39755,39756,39758,39760,39762,39763,39765,39766,39767,39768,39769,39770,39771,39772,39773,39774,39775,39776,39777,39778,39779,39780,39781,39782,39783,39784,39785,39786,39787,39788,39789,39790,39791,39792,39793,39794,39795,39796,39797,39798,39799,39800,39801,39802,39803,31775,31786,31782,31800,31809,31808,33278,33281,33282,33284,33260,34884,33313,33314,33315,33325,33327,33320,33323,33336,33339,33331,33332,33342,33348,33353,33355,33359,33370,33375,33384,34942,34949,34952,35032,35039,35166,32669,32671,32679,32687,32688,32690,31868,25929,31889,31901,31900,31902,31906,31922,31932,31933,31937,31943,31948,31949,31944,31941,31959,31976,33390,26280,32703,32718,32725,32741,32737,32742,32745,32750,32755,31992,32119,32166,32174,32327,32411,40632,40628,36211,36228,36244,36241,36273,36199,36205,35911,35913,37194,37200,37198,37199,37220,39804,39805,39806,39807,39808,39809,39810,39811,39812,39813,39814,39815,39816,39817,39818,39819,39820,39821,39822,39823,39824,39825,39826,39827,39828,39829,39830,39831,39832,39833,39834,39835,39836,39837,39838,39839,39840,39841,39842,39843,39844,39845,39846,39847,39848,39849,39850,39851,39852,39853,39854,39855,39856,39857,39858,39859,39860,39861,39862,39863,39864,39865,39866,39867,39868,39869,39870,39871,39872,39873,39874,39875,39876,39877,39878,39879,39880,39881,39882,39883,39884,39885,39886,39887,39888,39889,39890,39891,39892,39893,39894,39895,39896,39897,39898,39899,37218,37217,37232,37225,37231,37245,37246,37234,37236,37241,37260,37253,37264,37261,37265,37282,37283,37290,37293,37294,37295,37301,37300,37306,35925,40574,36280,36331,36357,36441,36457,36277,36287,36284,36282,36292,36310,36311,36314,36318,36302,36303,36315,36294,36332,36343,36344,36323,36345,36347,36324,36361,36349,36372,36381,36383,36396,36398,36387,36399,36410,36416,36409,36405,36413,36401,36425,36417,36418,36433,36434,36426,36464,36470,36476,36463,36468,36485,36495,36500,36496,36508,36510,35960,35970,35978,35973,35992,35988,26011,35286,35294,35290,35292,39900,39901,39902,39903,39904,39905,39906,39907,39908,39909,39910,39911,39912,39913,39914,39915,39916,39917,39918,39919,39920,39921,39922,39923,39924,39925,39926,39927,39928,39929,39930,39931,39932,39933,39934,39935,39936,39937,39938,39939,39940,39941,39942,39943,39944,39945,39946,39947,39948,39949,39950,39951,39952,39953,39954,39955,39956,39957,39958,39959,39960,39961,39962,39963,39964,39965,39966,39967,39968,39969,39970,39971,39972,39973,39974,39975,39976,39977,39978,39979,39980,39981,39982,39983,39984,39985,39986,39987,39988,39989,39990,39991,39992,39993,39994,39995,35301,35307,35311,35390,35622,38739,38633,38643,38639,38662,38657,38664,38671,38670,38698,38701,38704,38718,40832,40835,40837,40838,40839,40840,40841,40842,40844,40702,40715,40717,38585,38588,38589,38606,38610,30655,38624,37518,37550,37576,37694,37738,37834,37775,37950,37995,40063,40066,40069,40070,40071,40072,31267,40075,40078,40080,40081,40082,40084,40085,40090,40091,40094,40095,40096,40097,40098,40099,40101,40102,40103,40104,40105,40107,40109,40110,40112,40113,40114,40115,40116,40117,40118,40119,40122,40123,40124,40125,40132,40133,40134,40135,40138,40139,39996,39997,39998,39999,40000,40001,40002,40003,40004,40005,40006,40007,40008,40009,40010,40011,40012,40013,40014,40015,40016,40017,40018,40019,40020,40021,40022,40023,40024,40025,40026,40027,40028,40029,40030,40031,40032,40033,40034,40035,40036,40037,40038,40039,40040,40041,40042,40043,40044,40045,40046,40047,40048,40049,40050,40051,40052,40053,40054,40055,40056,40057,40058,40059,40061,40062,40064,40067,40068,40073,40074,40076,40079,40083,40086,40087,40088,40089,40093,40106,40108,40111,40121,40126,40127,40128,40129,40130,40136,40137,40145,40146,40154,40155,40160,40161,40140,40141,40142,40143,40144,40147,40148,40149,40151,40152,40153,40156,40157,40159,40162,38780,38789,38801,38802,38804,38831,38827,38819,38834,38836,39601,39600,39607,40536,39606,39610,39612,39617,39616,39621,39618,39627,39628,39633,39749,39747,39751,39753,39752,39757,39761,39144,39181,39214,39253,39252,39647,39649,39654,39663,39659,39675,39661,39673,39688,39695,39699,39711,39715,40637,40638,32315,40578,40583,40584,40587,40594,37846,40605,40607,40667,40668,40669,40672,40671,40674,40681,40679,40677,40682,40687,40738,40748,40751,40761,40759,40765,40766,40772,40163,40164,40165,40166,40167,40168,40169,40170,40171,40172,40173,40174,40175,40176,40177,40178,40179,40180,40181,40182,40183,40184,40185,40186,40187,40188,40189,40190,40191,40192,40193,40194,40195,40196,40197,40198,40199,40200,40201,40202,40203,40204,40205,40206,40207,40208,40209,40210,40211,40212,40213,40214,40215,40216,40217,40218,40219,40220,40221,40222,40223,40224,40225,40226,40227,40228,40229,40230,40231,40232,40233,40234,40235,40236,40237,40238,40239,40240,40241,40242,40243,40244,40245,40246,40247,40248,40249,40250,40251,40252,40253,40254,40255,40256,40257,40258,57908,57909,57910,57911,57912,57913,57914,57915,57916,57917,57918,57919,57920,57921,57922,57923,57924,57925,57926,57927,57928,57929,57930,57931,57932,57933,57934,57935,57936,57937,57938,57939,57940,57941,57942,57943,57944,57945,57946,57947,57948,57949,57950,57951,57952,57953,57954,57955,57956,57957,57958,57959,57960,57961,57962,57963,57964,57965,57966,57967,57968,57969,57970,57971,57972,57973,57974,57975,57976,57977,57978,57979,57980,57981,57982,57983,57984,57985,57986,57987,57988,57989,57990,57991,57992,57993,57994,57995,57996,57997,57998,57999,58000,58001,40259,40260,40261,40262,40263,40264,40265,40266,40267,40268,40269,40270,40271,40272,40273,40274,40275,40276,40277,40278,40279,40280,40281,40282,40283,40284,40285,40286,40287,40288,40289,40290,40291,40292,40293,40294,40295,40296,40297,40298,40299,40300,40301,40302,40303,40304,40305,40306,40307,40308,40309,40310,40311,40312,40313,40314,40315,40316,40317,40318,40319,40320,40321,40322,40323,40324,40325,40326,40327,40328,40329,40330,40331,40332,40333,40334,40335,40336,40337,40338,40339,40340,40341,40342,40343,40344,40345,40346,40347,40348,40349,40350,40351,40352,40353,40354,58002,58003,58004,58005,58006,58007,58008,58009,58010,58011,58012,58013,58014,58015,58016,58017,58018,58019,58020,58021,58022,58023,58024,58025,58026,58027,58028,58029,58030,58031,58032,58033,58034,58035,58036,58037,58038,58039,58040,58041,58042,58043,58044,58045,58046,58047,58048,58049,58050,58051,58052,58053,58054,58055,58056,58057,58058,58059,58060,58061,58062,58063,58064,58065,58066,58067,58068,58069,58070,58071,58072,58073,58074,58075,58076,58077,58078,58079,58080,58081,58082,58083,58084,58085,58086,58087,58088,58089,58090,58091,58092,58093,58094,58095,40355,40356,40357,40358,40359,40360,40361,40362,40363,40364,40365,40366,40367,40368,40369,40370,40371,40372,40373,40374,40375,40376,40377,40378,40379,40380,40381,40382,40383,40384,40385,40386,40387,40388,40389,40390,40391,40392,40393,40394,40395,40396,40397,40398,40399,40400,40401,40402,40403,40404,40405,40406,40407,40408,40409,40410,40411,40412,40413,40414,40415,40416,40417,40418,40419,40420,40421,40422,40423,40424,40425,40426,40427,40428,40429,40430,40431,40432,40433,40434,40435,40436,40437,40438,40439,40440,40441,40442,40443,40444,40445,40446,40447,40448,40449,40450,58096,58097,58098,58099,58100,58101,58102,58103,58104,58105,58106,58107,58108,58109,58110,58111,58112,58113,58114,58115,58116,58117,58118,58119,58120,58121,58122,58123,58124,58125,58126,58127,58128,58129,58130,58131,58132,58133,58134,58135,58136,58137,58138,58139,58140,58141,58142,58143,58144,58145,58146,58147,58148,58149,58150,58151,58152,58153,58154,58155,58156,58157,58158,58159,58160,58161,58162,58163,58164,58165,58166,58167,58168,58169,58170,58171,58172,58173,58174,58175,58176,58177,58178,58179,58180,58181,58182,58183,58184,58185,58186,58187,58188,58189,40451,40452,40453,40454,40455,40456,40457,40458,40459,40460,40461,40462,40463,40464,40465,40466,40467,40468,40469,40470,40471,40472,40473,40474,40475,40476,40477,40478,40484,40487,40494,40496,40500,40507,40508,40512,40525,40528,40530,40531,40532,40534,40537,40541,40543,40544,40545,40546,40549,40558,40559,40562,40564,40565,40566,40567,40568,40569,40570,40571,40572,40573,40576,40577,40579,40580,40581,40582,40585,40586,40588,40589,40590,40591,40592,40593,40596,40597,40598,40599,40600,40601,40602,40603,40604,40606,40608,40609,40610,40611,40612,40613,40615,40616,40617,40618,58190,58191,58192,58193,58194,58195,58196,58197,58198,58199,58200,58201,58202,58203,58204,58205,58206,58207,58208,58209,58210,58211,58212,58213,58214,58215,58216,58217,58218,58219,58220,58221,58222,58223,58224,58225,58226,58227,58228,58229,58230,58231,58232,58233,58234,58235,58236,58237,58238,58239,58240,58241,58242,58243,58244,58245,58246,58247,58248,58249,58250,58251,58252,58253,58254,58255,58256,58257,58258,58259,58260,58261,58262,58263,58264,58265,58266,58267,58268,58269,58270,58271,58272,58273,58274,58275,58276,58277,58278,58279,58280,58281,58282,58283,40619,40620,40621,40622,40623,40624,40625,40626,40627,40629,40630,40631,40633,40634,40636,40639,40640,40641,40642,40643,40645,40646,40647,40648,40650,40651,40652,40656,40658,40659,40661,40662,40663,40665,40666,40670,40673,40675,40676,40678,40680,40683,40684,40685,40686,40688,40689,40690,40691,40692,40693,40694,40695,40696,40698,40701,40703,40704,40705,40706,40707,40708,40709,40710,40711,40712,40713,40714,40716,40719,40721,40722,40724,40725,40726,40728,40730,40731,40732,40733,40734,40735,40737,40739,40740,40741,40742,40743,40744,40745,40746,40747,40749,40750,40752,40753,58284,58285,58286,58287,58288,58289,58290,58291,58292,58293,58294,58295,58296,58297,58298,58299,58300,58301,58302,58303,58304,58305,58306,58307,58308,58309,58310,58311,58312,58313,58314,58315,58316,58317,58318,58319,58320,58321,58322,58323,58324,58325,58326,58327,58328,58329,58330,58331,58332,58333,58334,58335,58336,58337,58338,58339,58340,58341,58342,58343,58344,58345,58346,58347,58348,58349,58350,58351,58352,58353,58354,58355,58356,58357,58358,58359,58360,58361,58362,58363,58364,58365,58366,58367,58368,58369,58370,58371,58372,58373,58374,58375,58376,58377,40754,40755,40756,40757,40758,40760,40762,40764,40767,40768,40769,40770,40771,40773,40774,40775,40776,40777,40778,40779,40780,40781,40782,40783,40786,40787,40788,40789,40790,40791,40792,40793,40794,40795,40796,40797,40798,40799,40800,40801,40802,40803,40804,40805,40806,40807,40808,40809,40810,40811,40812,40813,40814,40815,40816,40817,40818,40819,40820,40821,40822,40823,40824,40825,40826,40827,40828,40829,40830,40833,40834,40845,40846,40847,40848,40849,40850,40851,40852,40853,40854,40855,40856,40860,40861,40862,40865,40866,40867,40868,40869,63788,63865,63893,63975,63985,58378,58379,58380,58381,58382,58383,58384,58385,58386,58387,58388,58389,58390,58391,58392,58393,58394,58395,58396,58397,58398,58399,58400,58401,58402,58403,58404,58405,58406,58407,58408,58409,58410,58411,58412,58413,58414,58415,58416,58417,58418,58419,58420,58421,58422,58423,58424,58425,58426,58427,58428,58429,58430,58431,58432,58433,58434,58435,58436,58437,58438,58439,58440,58441,58442,58443,58444,58445,58446,58447,58448,58449,58450,58451,58452,58453,58454,58455,58456,58457,58458,58459,58460,58461,58462,58463,58464,58465,58466,58467,58468,58469,58470,58471,64012,64013,64014,64015,64017,64019,64020,64024,64031,64032,64033,64035,64036,64039,64040,64041,11905,59414,59415,59416,11908,13427,13383,11912,11915,59422,13726,13850,13838,11916,11927,14702,14616,59430,14799,14815,14963,14800,59435,59436,15182,15470,15584,11943,59441,59442,11946,16470,16735,11950,17207,11955,11958,11959,59451,17329,17324,11963,17373,17622,18017,17996,59459,18211,18217,18300,18317,11978,18759,18810,18813,18818,18819,18821,18822,18847,18843,18871,18870,59476,59477,19619,19615,19616,19617,19575,19618,19731,19732,19733,19734,19735,19736,19737,19886,59492,58472,58473,58474,58475,58476,58477,58478,58479,58480,58481,58482,58483,58484,58485,58486,58487,58488,58489,58490,58491,58492,58493,58494,58495,58496,58497,58498,58499,58500,58501,58502,58503,58504,58505,58506,58507,58508,58509,58510,58511,58512,58513,58514,58515,58516,58517,58518,58519,58520,58521,58522,58523,58524,58525,58526,58527,58528,58529,58530,58531,58532,58533,58534,58535,58536,58537,58538,58539,58540,58541,58542,58543,58544,58545,58546,58547,58548,58549,58550,58551,58552,58553,58554,58555,58556,58557,58558,58559,58560,58561,58562,58563,58564,58565],\n  \"gb18030-ranges\":[[0,128],[36,165],[38,169],[45,178],[50,184],[81,216],[89,226],[95,235],[96,238],[100,244],[103,248],[104,251],[105,253],[109,258],[126,276],[133,284],[148,300],[172,325],[175,329],[179,334],[208,364],[306,463],[307,465],[308,467],[309,469],[310,471],[311,473],[312,475],[313,477],[341,506],[428,594],[443,610],[544,712],[545,716],[558,730],[741,930],[742,938],[749,962],[750,970],[805,1026],[819,1104],[820,1106],[7922,8209],[7924,8215],[7925,8218],[7927,8222],[7934,8231],[7943,8241],[7944,8244],[7945,8246],[7950,8252],[8062,8365],[8148,8452],[8149,8454],[8152,8458],[8164,8471],[8174,8482],[8236,8556],[8240,8570],[8262,8596],[8264,8602],[8374,8713],[8380,8720],[8381,8722],[8384,8726],[8388,8731],[8390,8737],[8392,8740],[8393,8742],[8394,8748],[8396,8751],[8401,8760],[8406,8766],[8416,8777],[8419,8781],[8424,8787],[8437,8802],[8439,8808],[8445,8816],[8482,8854],[8485,8858],[8496,8870],[8521,8896],[8603,8979],[8936,9322],[8946,9372],[9046,9548],[9050,9588],[9063,9616],[9066,9622],[9076,9634],[9092,9652],[9100,9662],[9108,9672],[9111,9676],[9113,9680],[9131,9702],[9162,9735],[9164,9738],[9218,9793],[9219,9795],[11329,11906],[11331,11909],[11334,11913],[11336,11917],[11346,11928],[11361,11944],[11363,11947],[11366,11951],[11370,11956],[11372,11960],[11375,11964],[11389,11979],[11682,12284],[11686,12292],[11687,12312],[11692,12319],[11694,12330],[11714,12351],[11716,12436],[11723,12447],[11725,12535],[11730,12543],[11736,12586],[11982,12842],[11989,12850],[12102,12964],[12336,13200],[12348,13215],[12350,13218],[12384,13253],[12393,13263],[12395,13267],[12397,13270],[12510,13384],[12553,13428],[12851,13727],[12962,13839],[12973,13851],[13738,14617],[13823,14703],[13919,14801],[13933,14816],[14080,14964],[14298,15183],[14585,15471],[14698,15585],[15583,16471],[15847,16736],[16318,17208],[16434,17325],[16438,17330],[16481,17374],[16729,17623],[17102,17997],[17122,18018],[17315,18212],[17320,18218],[17402,18301],[17418,18318],[17859,18760],[17909,18811],[17911,18814],[17915,18820],[17916,18823],[17936,18844],[17939,18848],[17961,18872],[18664,19576],[18703,19620],[18814,19738],[18962,19887],[19043,40870],[33469,59244],[33470,59336],[33471,59367],[33484,59413],[33485,59417],[33490,59423],[33497,59431],[33501,59437],[33505,59443],[33513,59452],[33520,59460],[33536,59478],[33550,59493],[37845,63789],[37921,63866],[37948,63894],[38029,63976],[38038,63986],[38064,64016],[38065,64018],[38066,64021],[38069,64025],[38075,64034],[38076,64037],[38078,64042],[39108,65074],[39109,65093],[39113,65107],[39114,65112],[39115,65127],[39116,65132],[39265,65375],[39394,65510],[189000,65536]],\n  \"jis0208\":[12288,12289,12290,65292,65294,12539,65306,65307,65311,65281,12443,12444,180,65344,168,65342,65507,65343,12541,12542,12445,12446,12291,20189,12293,12294,12295,12540,8213,8208,65295,65340,65374,8741,65372,8230,8229,8216,8217,8220,8221,65288,65289,12308,12309,65339,65341,65371,65373,12296,12297,12298,12299,12300,12301,12302,12303,12304,12305,65291,65293,177,215,247,65309,8800,65308,65310,8806,8807,8734,8756,9794,9792,176,8242,8243,8451,65509,65284,65504,65505,65285,65283,65286,65290,65312,167,9734,9733,9675,9679,9678,9671,9670,9633,9632,9651,9650,9661,9660,8251,12306,8594,8592,8593,8595,12307,null,null,null,null,null,null,null,null,null,null,null,8712,8715,8838,8839,8834,8835,8746,8745,null,null,null,null,null,null,null,null,8743,8744,65506,8658,8660,8704,8707,null,null,null,null,null,null,null,null,null,null,null,8736,8869,8978,8706,8711,8801,8786,8810,8811,8730,8765,8733,8757,8747,8748,null,null,null,null,null,null,null,8491,8240,9839,9837,9834,8224,8225,182,null,null,null,null,9711,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,65296,65297,65298,65299,65300,65301,65302,65303,65304,65305,null,null,null,null,null,null,null,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,null,null,null,null,null,null,65345,65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,null,null,null,null,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,null,null,null,null,null,null,null,null,null,null,null,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,null,null,null,null,null,null,null,null,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,null,null,null,null,null,null,null,null,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,1072,1073,1074,1075,1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,null,null,null,null,null,null,null,null,null,null,null,null,null,9472,9474,9484,9488,9496,9492,9500,9516,9508,9524,9532,9473,9475,9487,9491,9499,9495,9507,9523,9515,9531,9547,9504,9519,9512,9527,9535,9501,9520,9509,9528,9538,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,9312,9313,9314,9315,9316,9317,9318,9319,9320,9321,9322,9323,9324,9325,9326,9327,9328,9329,9330,9331,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,null,13129,13076,13090,13133,13080,13095,13059,13110,13137,13143,13069,13094,13091,13099,13130,13115,13212,13213,13214,13198,13199,13252,13217,null,null,null,null,null,null,null,null,13179,12317,12319,8470,13261,8481,12964,12965,12966,12967,12968,12849,12850,12857,13182,13181,13180,8786,8801,8747,8750,8721,8730,8869,8736,8735,8895,8757,8745,8746,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,20124,21782,23043,38463,21696,24859,25384,23030,36898,33909,33564,31312,24746,25569,28197,26093,33894,33446,39925,26771,22311,26017,25201,23451,22992,34427,39156,32098,32190,39822,25110,31903,34999,23433,24245,25353,26263,26696,38343,38797,26447,20197,20234,20301,20381,20553,22258,22839,22996,23041,23561,24799,24847,24944,26131,26885,28858,30031,30064,31227,32173,32239,32963,33806,34915,35586,36949,36986,21307,20117,20133,22495,32946,37057,30959,19968,22769,28322,36920,31282,33576,33419,39983,20801,21360,21693,21729,22240,23035,24341,39154,28139,32996,34093,38498,38512,38560,38907,21515,21491,23431,28879,32701,36802,38632,21359,40284,31418,19985,30867,33276,28198,22040,21764,27421,34074,39995,23013,21417,28006,29916,38287,22082,20113,36939,38642,33615,39180,21473,21942,23344,24433,26144,26355,26628,27704,27891,27945,29787,30408,31310,38964,33521,34907,35424,37613,28082,30123,30410,39365,24742,35585,36234,38322,27022,21421,20870,22290,22576,22852,23476,24310,24616,25513,25588,27839,28436,28814,28948,29017,29141,29503,32257,33398,33489,34199,36960,37467,40219,22633,26044,27738,29989,20985,22830,22885,24448,24540,25276,26106,27178,27431,27572,29579,32705,35158,40236,40206,40644,23713,27798,33659,20740,23627,25014,33222,26742,29281,20057,20474,21368,24681,28201,31311,38899,19979,21270,20206,20309,20285,20385,20339,21152,21487,22025,22799,23233,23478,23521,31185,26247,26524,26550,27468,27827,28779,29634,31117,31166,31292,31623,33457,33499,33540,33655,33775,33747,34662,35506,22057,36008,36838,36942,38686,34442,20420,23784,25105,29273,30011,33253,33469,34558,36032,38597,39187,39381,20171,20250,35299,22238,22602,22730,24315,24555,24618,24724,24674,25040,25106,25296,25913,39745,26214,26800,28023,28784,30028,30342,32117,33445,34809,38283,38542,35997,20977,21182,22806,21683,23475,23830,24936,27010,28079,30861,33995,34903,35442,37799,39608,28012,39336,34521,22435,26623,34510,37390,21123,22151,21508,24275,25313,25785,26684,26680,27579,29554,30906,31339,35226,35282,36203,36611,37101,38307,38548,38761,23398,23731,27005,38989,38990,25499,31520,27179,27263,26806,39949,28511,21106,21917,24688,25324,27963,28167,28369,33883,35088,36676,19988,39993,21494,26907,27194,38788,26666,20828,31427,33970,37340,37772,22107,40232,26658,33541,33841,31909,21000,33477,29926,20094,20355,20896,23506,21002,21208,21223,24059,21914,22570,23014,23436,23448,23515,24178,24185,24739,24863,24931,25022,25563,25954,26577,26707,26874,27454,27475,27735,28450,28567,28485,29872,29976,30435,30475,31487,31649,31777,32233,32566,32752,32925,33382,33694,35251,35532,36011,36996,37969,38291,38289,38306,38501,38867,39208,33304,20024,21547,23736,24012,29609,30284,30524,23721,32747,36107,38593,38929,38996,39000,20225,20238,21361,21916,22120,22522,22855,23305,23492,23696,24076,24190,24524,25582,26426,26071,26082,26399,26827,26820,27231,24112,27589,27671,27773,30079,31048,23395,31232,32000,24509,35215,35352,36020,36215,36556,36637,39138,39438,39740,20096,20605,20736,22931,23452,25135,25216,25836,27450,29344,30097,31047,32681,34811,35516,35696,25516,33738,38816,21513,21507,21931,26708,27224,35440,30759,26485,40653,21364,23458,33050,34384,36870,19992,20037,20167,20241,21450,21560,23470,24339,24613,25937,26429,27714,27762,27875,28792,29699,31350,31406,31496,32026,31998,32102,26087,29275,21435,23621,24040,25298,25312,25369,28192,34394,35377,36317,37624,28417,31142,39770,20136,20139,20140,20379,20384,20689,20807,31478,20849,20982,21332,21281,21375,21483,21932,22659,23777,24375,24394,24623,24656,24685,25375,25945,27211,27841,29378,29421,30703,33016,33029,33288,34126,37111,37857,38911,39255,39514,20208,20957,23597,26241,26989,23616,26354,26997,29577,26704,31873,20677,21220,22343,24062,37670,26020,27427,27453,29748,31105,31165,31563,32202,33465,33740,34943,35167,35641,36817,37329,21535,37504,20061,20534,21477,21306,29399,29590,30697,33510,36527,39366,39368,39378,20855,24858,34398,21936,31354,20598,23507,36935,38533,20018,27355,37351,23633,23624,25496,31391,27795,38772,36705,31402,29066,38536,31874,26647,32368,26705,37740,21234,21531,34219,35347,32676,36557,37089,21350,34952,31041,20418,20670,21009,20804,21843,22317,29674,22411,22865,24418,24452,24693,24950,24935,25001,25522,25658,25964,26223,26690,28179,30054,31293,31995,32076,32153,32331,32619,33550,33610,34509,35336,35427,35686,36605,38938,40335,33464,36814,39912,21127,25119,25731,28608,38553,26689,20625,27424,27770,28500,31348,32080,34880,35363,26376,20214,20537,20518,20581,20860,21048,21091,21927,22287,22533,23244,24314,25010,25080,25331,25458,26908,27177,29309,29356,29486,30740,30831,32121,30476,32937,35211,35609,36066,36562,36963,37749,38522,38997,39443,40568,20803,21407,21427,24187,24358,28187,28304,29572,29694,32067,33335,35328,35578,38480,20046,20491,21476,21628,22266,22993,23396,24049,24235,24359,25144,25925,26543,28246,29392,31946,34996,32929,32993,33776,34382,35463,36328,37431,38599,39015,40723,20116,20114,20237,21320,21577,21566,23087,24460,24481,24735,26791,27278,29786,30849,35486,35492,35703,37264,20062,39881,20132,20348,20399,20505,20502,20809,20844,21151,21177,21246,21402,21475,21521,21518,21897,22353,22434,22909,23380,23389,23439,24037,24039,24055,24184,24195,24218,24247,24344,24658,24908,25239,25304,25511,25915,26114,26179,26356,26477,26657,26775,27083,27743,27946,28009,28207,28317,30002,30343,30828,31295,31968,32005,32024,32094,32177,32789,32771,32943,32945,33108,33167,33322,33618,34892,34913,35611,36002,36092,37066,37237,37489,30783,37628,38308,38477,38917,39321,39640,40251,21083,21163,21495,21512,22741,25335,28640,35946,36703,40633,20811,21051,21578,22269,31296,37239,40288,40658,29508,28425,33136,29969,24573,24794,39592,29403,36796,27492,38915,20170,22256,22372,22718,23130,24680,25031,26127,26118,26681,26801,28151,30165,32058,33390,39746,20123,20304,21449,21766,23919,24038,24046,26619,27801,29811,30722,35408,37782,35039,22352,24231,25387,20661,20652,20877,26368,21705,22622,22971,23472,24425,25165,25505,26685,27507,28168,28797,37319,29312,30741,30758,31085,25998,32048,33756,35009,36617,38555,21092,22312,26448,32618,36001,20916,22338,38442,22586,27018,32948,21682,23822,22524,30869,40442,20316,21066,21643,25662,26152,26388,26613,31364,31574,32034,37679,26716,39853,31545,21273,20874,21047,23519,25334,25774,25830,26413,27578,34217,38609,30352,39894,25420,37638,39851,30399,26194,19977,20632,21442,23665,24808,25746,25955,26719,29158,29642,29987,31639,32386,34453,35715,36059,37240,39184,26028,26283,27531,20181,20180,20282,20351,21050,21496,21490,21987,22235,22763,22987,22985,23039,23376,23629,24066,24107,24535,24605,25351,25903,23388,26031,26045,26088,26525,27490,27515,27663,29509,31049,31169,31992,32025,32043,32930,33026,33267,35222,35422,35433,35430,35468,35566,36039,36060,38604,39164,27503,20107,20284,20365,20816,23383,23546,24904,25345,26178,27425,28363,27835,29246,29885,30164,30913,31034,32780,32819,33258,33940,36766,27728,40575,24335,35672,40235,31482,36600,23437,38635,19971,21489,22519,22833,23241,23460,24713,28287,28422,30142,36074,23455,34048,31712,20594,26612,33437,23649,34122,32286,33294,20889,23556,25448,36198,26012,29038,31038,32023,32773,35613,36554,36974,34503,37034,20511,21242,23610,26451,28796,29237,37196,37320,37675,33509,23490,24369,24825,20027,21462,23432,25163,26417,27530,29417,29664,31278,33131,36259,37202,39318,20754,21463,21610,23551,25480,27193,32172,38656,22234,21454,21608,23447,23601,24030,20462,24833,25342,27954,31168,31179,32066,32333,32722,33261,33311,33936,34886,35186,35728,36468,36655,36913,37195,37228,38598,37276,20160,20303,20805,21313,24467,25102,26580,27713,28171,29539,32294,37325,37507,21460,22809,23487,28113,31069,32302,31899,22654,29087,20986,34899,36848,20426,23803,26149,30636,31459,33308,39423,20934,24490,26092,26991,27529,28147,28310,28516,30462,32020,24033,36981,37255,38918,20966,21021,25152,26257,26329,28186,24246,32210,32626,26360,34223,34295,35576,21161,21465,22899,24207,24464,24661,37604,38500,20663,20767,21213,21280,21319,21484,21736,21830,21809,22039,22888,22974,23100,23477,23558,23567,23569,23578,24196,24202,24288,24432,25215,25220,25307,25484,25463,26119,26124,26157,26230,26494,26786,27167,27189,27836,28040,28169,28248,28988,28966,29031,30151,30465,30813,30977,31077,31216,31456,31505,31911,32057,32918,33750,33931,34121,34909,35059,35359,35388,35412,35443,35937,36062,37284,37478,37758,37912,38556,38808,19978,19976,19998,20055,20887,21104,22478,22580,22732,23330,24120,24773,25854,26465,26454,27972,29366,30067,31331,33976,35698,37304,37664,22065,22516,39166,25325,26893,27542,29165,32340,32887,33394,35302,39135,34645,36785,23611,20280,20449,20405,21767,23072,23517,23529,24515,24910,25391,26032,26187,26862,27035,28024,28145,30003,30137,30495,31070,31206,32051,33251,33455,34218,35242,35386,36523,36763,36914,37341,38663,20154,20161,20995,22645,22764,23563,29978,23613,33102,35338,36805,38499,38765,31525,35535,38920,37218,22259,21416,36887,21561,22402,24101,25512,27700,28810,30561,31883,32736,34928,36930,37204,37648,37656,38543,29790,39620,23815,23913,25968,26530,36264,38619,25454,26441,26905,33733,38935,38592,35070,28548,25722,23544,19990,28716,30045,26159,20932,21046,21218,22995,24449,24615,25104,25919,25972,26143,26228,26866,26646,27491,28165,29298,29983,30427,31934,32854,22768,35069,35199,35488,35475,35531,36893,37266,38738,38745,25993,31246,33030,38587,24109,24796,25114,26021,26132,26512,30707,31309,31821,32318,33034,36012,36196,36321,36447,30889,20999,25305,25509,25666,25240,35373,31363,31680,35500,38634,32118,33292,34633,20185,20808,21315,21344,23459,23554,23574,24029,25126,25159,25776,26643,26676,27849,27973,27927,26579,28508,29006,29053,26059,31359,31661,32218,32330,32680,33146,33307,33337,34214,35438,36046,36341,36984,36983,37549,37521,38275,39854,21069,21892,28472,28982,20840,31109,32341,33203,31950,22092,22609,23720,25514,26366,26365,26970,29401,30095,30094,30990,31062,31199,31895,32032,32068,34311,35380,38459,36961,40736,20711,21109,21452,21474,20489,21930,22766,22863,29245,23435,23652,21277,24803,24819,25436,25475,25407,25531,25805,26089,26361,24035,27085,27133,28437,29157,20105,30185,30456,31379,31967,32207,32156,32865,33609,33624,33900,33980,34299,35013,36208,36865,36973,37783,38684,39442,20687,22679,24974,33235,34101,36104,36896,20419,20596,21063,21363,24687,25417,26463,28204,36275,36895,20439,23646,36042,26063,32154,21330,34966,20854,25539,23384,23403,23562,25613,26449,36956,20182,22810,22826,27760,35409,21822,22549,22949,24816,25171,26561,33333,26965,38464,39364,39464,20307,22534,23550,32784,23729,24111,24453,24608,24907,25140,26367,27888,28382,32974,33151,33492,34955,36024,36864,36910,38538,40667,39899,20195,21488,22823,31532,37261,38988,40441,28381,28711,21331,21828,23429,25176,25246,25299,27810,28655,29730,35351,37944,28609,35582,33592,20967,34552,21482,21481,20294,36948,36784,22890,33073,24061,31466,36799,26842,35895,29432,40008,27197,35504,20025,21336,22022,22374,25285,25506,26086,27470,28129,28251,28845,30701,31471,31658,32187,32829,32966,34507,35477,37723,22243,22727,24382,26029,26262,27264,27573,30007,35527,20516,30693,22320,24347,24677,26234,27744,30196,31258,32622,33268,34584,36933,39347,31689,30044,31481,31569,33988,36880,31209,31378,33590,23265,30528,20013,20210,23449,24544,25277,26172,26609,27880,34411,34935,35387,37198,37619,39376,27159,28710,29482,33511,33879,36015,19969,20806,20939,21899,23541,24086,24115,24193,24340,24373,24427,24500,25074,25361,26274,26397,28526,29266,30010,30522,32884,33081,33144,34678,35519,35548,36229,36339,37530,38263,38914,40165,21189,25431,30452,26389,27784,29645,36035,37806,38515,27941,22684,26894,27084,36861,37786,30171,36890,22618,26626,25524,27131,20291,28460,26584,36795,34086,32180,37716,26943,28528,22378,22775,23340,32044,29226,21514,37347,40372,20141,20302,20572,20597,21059,35998,21576,22564,23450,24093,24213,24237,24311,24351,24716,25269,25402,25552,26799,27712,30855,31118,31243,32224,33351,35330,35558,36420,36883,37048,37165,37336,40718,27877,25688,25826,25973,28404,30340,31515,36969,37841,28346,21746,24505,25764,36685,36845,37444,20856,22635,22825,23637,24215,28155,32399,29980,36028,36578,39003,28857,20253,27583,28593,30000,38651,20814,21520,22581,22615,22956,23648,24466,26007,26460,28193,30331,33759,36077,36884,37117,37709,30757,30778,21162,24230,22303,22900,24594,20498,20826,20908,20941,20992,21776,22612,22616,22871,23445,23798,23947,24764,25237,25645,26481,26691,26812,26847,30423,28120,28271,28059,28783,29128,24403,30168,31095,31561,31572,31570,31958,32113,21040,33891,34153,34276,35342,35588,35910,36367,36867,36879,37913,38518,38957,39472,38360,20685,21205,21516,22530,23566,24999,25758,27934,30643,31461,33012,33796,36947,37509,23776,40199,21311,24471,24499,28060,29305,30563,31167,31716,27602,29420,35501,26627,27233,20984,31361,26932,23626,40182,33515,23493,37193,28702,22136,23663,24775,25958,27788,35930,36929,38931,21585,26311,37389,22856,37027,20869,20045,20970,34201,35598,28760,25466,37707,26978,39348,32260,30071,21335,26976,36575,38627,27741,20108,23612,24336,36841,21250,36049,32905,34425,24319,26085,20083,20837,22914,23615,38894,20219,22922,24525,35469,28641,31152,31074,23527,33905,29483,29105,24180,24565,25467,25754,29123,31896,20035,24316,20043,22492,22178,24745,28611,32013,33021,33075,33215,36786,35223,34468,24052,25226,25773,35207,26487,27874,27966,29750,30772,23110,32629,33453,39340,20467,24259,25309,25490,25943,26479,30403,29260,32972,32954,36649,37197,20493,22521,23186,26757,26995,29028,29437,36023,22770,36064,38506,36889,34687,31204,30695,33833,20271,21093,21338,25293,26575,27850,30333,31636,31893,33334,34180,36843,26333,28448,29190,32283,33707,39361,40614,20989,31665,30834,31672,32903,31560,27368,24161,32908,30033,30048,20843,37474,28300,30330,37271,39658,20240,32624,25244,31567,38309,40169,22138,22617,34532,38588,20276,21028,21322,21453,21467,24070,25644,26001,26495,27710,27726,29256,29359,29677,30036,32321,33324,34281,36009,31684,37318,29033,38930,39151,25405,26217,30058,30436,30928,34115,34542,21290,21329,21542,22915,24199,24444,24754,25161,25209,25259,26000,27604,27852,30130,30382,30865,31192,32203,32631,32933,34987,35513,36027,36991,38750,39131,27147,31800,20633,23614,24494,26503,27608,29749,30473,32654,40763,26570,31255,21305,30091,39661,24422,33181,33777,32920,24380,24517,30050,31558,36924,26727,23019,23195,32016,30334,35628,20469,24426,27161,27703,28418,29922,31080,34920,35413,35961,24287,25551,30149,31186,33495,37672,37618,33948,34541,39981,21697,24428,25996,27996,28693,36007,36051,38971,25935,29942,19981,20184,22496,22827,23142,23500,20904,24067,24220,24598,25206,25975,26023,26222,28014,29238,31526,33104,33178,33433,35676,36000,36070,36212,38428,38468,20398,25771,27494,33310,33889,34154,37096,23553,26963,39080,33914,34135,20239,21103,24489,24133,26381,31119,33145,35079,35206,28149,24343,25173,27832,20175,29289,39826,20998,21563,22132,22707,24996,25198,28954,22894,31881,31966,32027,38640,25991,32862,19993,20341,20853,22592,24163,24179,24330,26564,20006,34109,38281,38491,31859,38913,20731,22721,30294,30887,21029,30629,34065,31622,20559,22793,29255,31687,32232,36794,36820,36941,20415,21193,23081,24321,38829,20445,33303,37610,22275,25429,27497,29995,35036,36628,31298,21215,22675,24917,25098,26286,27597,31807,33769,20515,20472,21253,21574,22577,22857,23453,23792,23791,23849,24214,25265,25447,25918,26041,26379,27861,27873,28921,30770,32299,32990,33459,33804,34028,34562,35090,35370,35914,37030,37586,39165,40179,40300,20047,20129,20621,21078,22346,22952,24125,24536,24537,25151,26292,26395,26576,26834,20882,32033,32938,33192,35584,35980,36031,37502,38450,21536,38956,21271,20693,21340,22696,25778,26420,29287,30566,31302,37350,21187,27809,27526,22528,24140,22868,26412,32763,20961,30406,25705,30952,39764,40635,22475,22969,26151,26522,27598,21737,27097,24149,33180,26517,39850,26622,40018,26717,20134,20451,21448,25273,26411,27819,36804,20397,32365,40639,19975,24930,28288,28459,34067,21619,26410,39749,24051,31637,23724,23494,34588,28234,34001,31252,33032,22937,31885,27665,30496,21209,22818,28961,29279,30683,38695,40289,26891,23167,23064,20901,21517,21629,26126,30431,36855,37528,40180,23018,29277,28357,20813,26825,32191,32236,38754,40634,25720,27169,33538,22916,23391,27611,29467,30450,32178,32791,33945,20786,26408,40665,30446,26466,21247,39173,23588,25147,31870,36016,21839,24758,32011,38272,21249,20063,20918,22812,29242,32822,37326,24357,30690,21380,24441,32004,34220,35379,36493,38742,26611,34222,37971,24841,24840,27833,30290,35565,36664,21807,20305,20778,21191,21451,23461,24189,24736,24962,25558,26377,26586,28263,28044,29494,29495,30001,31056,35029,35480,36938,37009,37109,38596,34701,22805,20104,20313,19982,35465,36671,38928,20653,24188,22934,23481,24248,25562,25594,25793,26332,26954,27096,27915,28342,29076,29992,31407,32650,32768,33865,33993,35201,35617,36362,36965,38525,39178,24958,25233,27442,27779,28020,32716,32764,28096,32645,34746,35064,26469,33713,38972,38647,27931,32097,33853,37226,20081,21365,23888,27396,28651,34253,34349,35239,21033,21519,23653,26446,26792,29702,29827,30178,35023,35041,37324,38626,38520,24459,29575,31435,33870,25504,30053,21129,27969,28316,29705,30041,30827,31890,38534,31452,40845,20406,24942,26053,34396,20102,20142,20698,20001,20940,23534,26009,26753,28092,29471,30274,30637,31260,31975,33391,35538,36988,37327,38517,38936,21147,32209,20523,21400,26519,28107,29136,29747,33256,36650,38563,40023,40607,29792,22593,28057,32047,39006,20196,20278,20363,20919,21169,23994,24604,29618,31036,33491,37428,38583,38646,38666,40599,40802,26278,27508,21015,21155,28872,35010,24265,24651,24976,28451,29001,31806,32244,32879,34030,36899,37676,21570,39791,27347,28809,36034,36335,38706,21172,23105,24266,24324,26391,27004,27028,28010,28431,29282,29436,31725,32769,32894,34635,37070,20845,40595,31108,32907,37682,35542,20525,21644,35441,27498,36036,33031,24785,26528,40434,20121,20120,39952,35435,34241,34152,26880,28286,30871,33109,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,24332,19984,19989,20010,20017,20022,20028,20031,20034,20054,20056,20098,20101,35947,20106,33298,24333,20110,20126,20127,20128,20130,20144,20147,20150,20174,20173,20164,20166,20162,20183,20190,20205,20191,20215,20233,20314,20272,20315,20317,20311,20295,20342,20360,20367,20376,20347,20329,20336,20369,20335,20358,20374,20760,20436,20447,20430,20440,20443,20433,20442,20432,20452,20453,20506,20520,20500,20522,20517,20485,20252,20470,20513,20521,20524,20478,20463,20497,20486,20547,20551,26371,20565,20560,20552,20570,20566,20588,20600,20608,20634,20613,20660,20658,20681,20682,20659,20674,20694,20702,20709,20717,20707,20718,20729,20725,20745,20737,20738,20758,20757,20756,20762,20769,20794,20791,20796,20795,20799,20800,20818,20812,20820,20834,31480,20841,20842,20846,20864,20866,22232,20876,20873,20879,20881,20883,20885,20886,20900,20902,20898,20905,20906,20907,20915,20913,20914,20912,20917,20925,20933,20937,20955,20960,34389,20969,20973,20976,20981,20990,20996,21003,21012,21006,21031,21034,21038,21043,21049,21071,21060,21067,21068,21086,21076,21098,21108,21097,21107,21119,21117,21133,21140,21138,21105,21128,21137,36776,36775,21164,21165,21180,21173,21185,21197,21207,21214,21219,21222,39149,21216,21235,21237,21240,21241,21254,21256,30008,21261,21264,21263,21269,21274,21283,21295,21297,21299,21304,21312,21318,21317,19991,21321,21325,20950,21342,21353,21358,22808,21371,21367,21378,21398,21408,21414,21413,21422,21424,21430,21443,31762,38617,21471,26364,29166,21486,21480,21485,21498,21505,21565,21568,21548,21549,21564,21550,21558,21545,21533,21582,21647,21621,21646,21599,21617,21623,21616,21650,21627,21632,21622,21636,21648,21638,21703,21666,21688,21669,21676,21700,21704,21672,21675,21698,21668,21694,21692,21720,21733,21734,21775,21780,21757,21742,21741,21754,21730,21817,21824,21859,21836,21806,21852,21829,21846,21847,21816,21811,21853,21913,21888,21679,21898,21919,21883,21886,21912,21918,21934,21884,21891,21929,21895,21928,21978,21957,21983,21956,21980,21988,21972,22036,22007,22038,22014,22013,22043,22009,22094,22096,29151,22068,22070,22066,22072,22123,22116,22063,22124,22122,22150,22144,22154,22176,22164,22159,22181,22190,22198,22196,22210,22204,22209,22211,22208,22216,22222,22225,22227,22231,22254,22265,22272,22271,22276,22281,22280,22283,22285,22291,22296,22294,21959,22300,22310,22327,22328,22350,22331,22336,22351,22377,22464,22408,22369,22399,22409,22419,22432,22451,22436,22442,22448,22467,22470,22484,22482,22483,22538,22486,22499,22539,22553,22557,22642,22561,22626,22603,22640,27584,22610,22589,22649,22661,22713,22687,22699,22714,22750,22715,22712,22702,22725,22739,22737,22743,22745,22744,22757,22748,22756,22751,22767,22778,22777,22779,22780,22781,22786,22794,22800,22811,26790,22821,22828,22829,22834,22840,22846,31442,22869,22864,22862,22874,22872,22882,22880,22887,22892,22889,22904,22913,22941,20318,20395,22947,22962,22982,23016,23004,22925,23001,23002,23077,23071,23057,23068,23049,23066,23104,23148,23113,23093,23094,23138,23146,23194,23228,23230,23243,23234,23229,23267,23255,23270,23273,23254,23290,23291,23308,23307,23318,23346,23248,23338,23350,23358,23363,23365,23360,23377,23381,23386,23387,23397,23401,23408,23411,23413,23416,25992,23418,23424,23427,23462,23480,23491,23495,23497,23508,23504,23524,23526,23522,23518,23525,23531,23536,23542,23539,23557,23559,23560,23565,23571,23584,23586,23592,23608,23609,23617,23622,23630,23635,23632,23631,23409,23660,23662,20066,23670,23673,23692,23697,23700,22939,23723,23739,23734,23740,23735,23749,23742,23751,23769,23785,23805,23802,23789,23948,23786,23819,23829,23831,23900,23839,23835,23825,23828,23842,23834,23833,23832,23884,23890,23886,23883,23916,23923,23926,23943,23940,23938,23970,23965,23980,23982,23997,23952,23991,23996,24009,24013,24019,24018,24022,24027,24043,24050,24053,24075,24090,24089,24081,24091,24118,24119,24132,24131,24128,24142,24151,24148,24159,24162,24164,24135,24181,24182,24186,40636,24191,24224,24257,24258,24264,24272,24271,24278,24291,24285,24282,24283,24290,24289,24296,24297,24300,24305,24307,24304,24308,24312,24318,24323,24329,24413,24412,24331,24337,24342,24361,24365,24376,24385,24392,24396,24398,24367,24401,24406,24407,24409,24417,24429,24435,24439,24451,24450,24447,24458,24456,24465,24455,24478,24473,24472,24480,24488,24493,24508,24534,24571,24548,24568,24561,24541,24755,24575,24609,24672,24601,24592,24617,24590,24625,24603,24597,24619,24614,24591,24634,24666,24641,24682,24695,24671,24650,24646,24653,24675,24643,24676,24642,24684,24683,24665,24705,24717,24807,24707,24730,24708,24731,24726,24727,24722,24743,24715,24801,24760,24800,24787,24756,24560,24765,24774,24757,24792,24909,24853,24838,24822,24823,24832,24820,24826,24835,24865,24827,24817,24845,24846,24903,24894,24872,24871,24906,24895,24892,24876,24884,24893,24898,24900,24947,24951,24920,24921,24922,24939,24948,24943,24933,24945,24927,24925,24915,24949,24985,24982,24967,25004,24980,24986,24970,24977,25003,25006,25036,25034,25033,25079,25032,25027,25030,25018,25035,32633,25037,25062,25059,25078,25082,25076,25087,25085,25084,25086,25088,25096,25097,25101,25100,25108,25115,25118,25121,25130,25134,25136,25138,25139,25153,25166,25182,25187,25179,25184,25192,25212,25218,25225,25214,25234,25235,25238,25300,25219,25236,25303,25297,25275,25295,25343,25286,25812,25288,25308,25292,25290,25282,25287,25243,25289,25356,25326,25329,25383,25346,25352,25327,25333,25424,25406,25421,25628,25423,25494,25486,25472,25515,25462,25507,25487,25481,25503,25525,25451,25449,25534,25577,25536,25542,25571,25545,25554,25590,25540,25622,25652,25606,25619,25638,25654,25885,25623,25640,25615,25703,25711,25718,25678,25898,25749,25747,25765,25769,25736,25788,25818,25810,25797,25799,25787,25816,25794,25841,25831,33289,25824,25825,25260,25827,25839,25900,25846,25844,25842,25850,25856,25853,25880,25884,25861,25892,25891,25899,25908,25909,25911,25910,25912,30027,25928,25942,25941,25933,25944,25950,25949,25970,25976,25986,25987,35722,26011,26015,26027,26039,26051,26054,26049,26052,26060,26066,26075,26073,26080,26081,26097,26482,26122,26115,26107,26483,26165,26166,26164,26140,26191,26180,26185,26177,26206,26205,26212,26215,26216,26207,26210,26224,26243,26248,26254,26249,26244,26264,26269,26305,26297,26313,26302,26300,26308,26296,26326,26330,26336,26175,26342,26345,26352,26357,26359,26383,26390,26398,26406,26407,38712,26414,26431,26422,26433,26424,26423,26438,26462,26464,26457,26467,26468,26505,26480,26537,26492,26474,26508,26507,26534,26529,26501,26551,26607,26548,26604,26547,26601,26552,26596,26590,26589,26594,26606,26553,26574,26566,26599,27292,26654,26694,26665,26688,26701,26674,26702,26803,26667,26713,26723,26743,26751,26783,26767,26797,26772,26781,26779,26755,27310,26809,26740,26805,26784,26810,26895,26765,26750,26881,26826,26888,26840,26914,26918,26849,26892,26829,26836,26855,26837,26934,26898,26884,26839,26851,26917,26873,26848,26863,26920,26922,26906,26915,26913,26822,27001,26999,26972,27000,26987,26964,27006,26990,26937,26996,26941,26969,26928,26977,26974,26973,27009,26986,27058,27054,27088,27071,27073,27091,27070,27086,23528,27082,27101,27067,27075,27047,27182,27025,27040,27036,27029,27060,27102,27112,27138,27163,27135,27402,27129,27122,27111,27141,27057,27166,27117,27156,27115,27146,27154,27329,27171,27155,27204,27148,27250,27190,27256,27207,27234,27225,27238,27208,27192,27170,27280,27277,27296,27268,27298,27299,27287,34327,27323,27331,27330,27320,27315,27308,27358,27345,27359,27306,27354,27370,27387,27397,34326,27386,27410,27414,39729,27423,27448,27447,30428,27449,39150,27463,27459,27465,27472,27481,27476,27483,27487,27489,27512,27513,27519,27520,27524,27523,27533,27544,27541,27550,27556,27562,27563,27567,27570,27569,27571,27575,27580,27590,27595,27603,27615,27628,27627,27635,27631,40638,27656,27667,27668,27675,27684,27683,27742,27733,27746,27754,27778,27789,27802,27777,27803,27774,27752,27763,27794,27792,27844,27889,27859,27837,27863,27845,27869,27822,27825,27838,27834,27867,27887,27865,27882,27935,34893,27958,27947,27965,27960,27929,27957,27955,27922,27916,28003,28051,28004,27994,28025,27993,28046,28053,28644,28037,28153,28181,28170,28085,28103,28134,28088,28102,28140,28126,28108,28136,28114,28101,28154,28121,28132,28117,28138,28142,28205,28270,28206,28185,28274,28255,28222,28195,28267,28203,28278,28237,28191,28227,28218,28238,28196,28415,28189,28216,28290,28330,28312,28361,28343,28371,28349,28335,28356,28338,28372,28373,28303,28325,28354,28319,28481,28433,28748,28396,28408,28414,28479,28402,28465,28399,28466,28364,28478,28435,28407,28550,28538,28536,28545,28544,28527,28507,28659,28525,28546,28540,28504,28558,28561,28610,28518,28595,28579,28577,28580,28601,28614,28586,28639,28629,28652,28628,28632,28657,28654,28635,28681,28683,28666,28689,28673,28687,28670,28699,28698,28532,28701,28696,28703,28720,28734,28722,28753,28771,28825,28818,28847,28913,28844,28856,28851,28846,28895,28875,28893,28889,28937,28925,28956,28953,29029,29013,29064,29030,29026,29004,29014,29036,29071,29179,29060,29077,29096,29100,29143,29113,29118,29138,29129,29140,29134,29152,29164,29159,29173,29180,29177,29183,29197,29200,29211,29224,29229,29228,29232,29234,29243,29244,29247,29248,29254,29259,29272,29300,29310,29314,29313,29319,29330,29334,29346,29351,29369,29362,29379,29382,29380,29390,29394,29410,29408,29409,29433,29431,20495,29463,29450,29468,29462,29469,29492,29487,29481,29477,29502,29518,29519,40664,29527,29546,29544,29552,29560,29557,29563,29562,29640,29619,29646,29627,29632,29669,29678,29662,29858,29701,29807,29733,29688,29746,29754,29781,29759,29791,29785,29761,29788,29801,29808,29795,29802,29814,29822,29835,29854,29863,29898,29903,29908,29681,29920,29923,29927,29929,29934,29938,29936,29937,29944,29943,29956,29955,29957,29964,29966,29965,29973,29971,29982,29990,29996,30012,30020,30029,30026,30025,30043,30022,30042,30057,30052,30055,30059,30061,30072,30070,30086,30087,30068,30090,30089,30082,30100,30106,30109,30117,30115,30146,30131,30147,30133,30141,30136,30140,30129,30157,30154,30162,30169,30179,30174,30206,30207,30204,30209,30192,30202,30194,30195,30219,30221,30217,30239,30247,30240,30241,30242,30244,30260,30256,30267,30279,30280,30278,30300,30296,30305,30306,30312,30313,30314,30311,30316,30320,30322,30326,30328,30332,30336,30339,30344,30347,30350,30358,30355,30361,30362,30384,30388,30392,30393,30394,30402,30413,30422,30418,30430,30433,30437,30439,30442,34351,30459,30472,30471,30468,30505,30500,30494,30501,30502,30491,30519,30520,30535,30554,30568,30571,30555,30565,30591,30590,30585,30606,30603,30609,30624,30622,30640,30646,30649,30655,30652,30653,30651,30663,30669,30679,30682,30684,30691,30702,30716,30732,30738,31014,30752,31018,30789,30862,30836,30854,30844,30874,30860,30883,30901,30890,30895,30929,30918,30923,30932,30910,30908,30917,30922,30956,30951,30938,30973,30964,30983,30994,30993,31001,31020,31019,31040,31072,31063,31071,31066,31061,31059,31098,31103,31114,31133,31143,40779,31146,31150,31155,31161,31162,31177,31189,31207,31212,31201,31203,31240,31245,31256,31257,31264,31263,31104,31281,31291,31294,31287,31299,31319,31305,31329,31330,31337,40861,31344,31353,31357,31368,31383,31381,31384,31382,31401,31432,31408,31414,31429,31428,31423,36995,31431,31434,31437,31439,31445,31443,31449,31450,31453,31457,31458,31462,31469,31472,31490,31503,31498,31494,31539,31512,31513,31518,31541,31528,31542,31568,31610,31492,31565,31499,31564,31557,31605,31589,31604,31591,31600,31601,31596,31598,31645,31640,31647,31629,31644,31642,31627,31634,31631,31581,31641,31691,31681,31692,31695,31668,31686,31709,31721,31761,31764,31718,31717,31840,31744,31751,31763,31731,31735,31767,31757,31734,31779,31783,31786,31775,31799,31787,31805,31820,31811,31828,31823,31808,31824,31832,31839,31844,31830,31845,31852,31861,31875,31888,31908,31917,31906,31915,31905,31912,31923,31922,31921,31918,31929,31933,31936,31941,31938,31960,31954,31964,31970,39739,31983,31986,31988,31990,31994,32006,32002,32028,32021,32010,32069,32075,32046,32050,32063,32053,32070,32115,32086,32078,32114,32104,32110,32079,32099,32147,32137,32091,32143,32125,32155,32186,32174,32163,32181,32199,32189,32171,32317,32162,32175,32220,32184,32159,32176,32216,32221,32228,32222,32251,32242,32225,32261,32266,32291,32289,32274,32305,32287,32265,32267,32290,32326,32358,32315,32309,32313,32323,32311,32306,32314,32359,32349,32342,32350,32345,32346,32377,32362,32361,32380,32379,32387,32213,32381,36782,32383,32392,32393,32396,32402,32400,32403,32404,32406,32398,32411,32412,32568,32570,32581,32588,32589,32590,32592,32593,32597,32596,32600,32607,32608,32616,32617,32615,32632,32642,32646,32643,32648,32647,32652,32660,32670,32669,32666,32675,32687,32690,32697,32686,32694,32696,35697,32709,32710,32714,32725,32724,32737,32742,32745,32755,32761,39132,32774,32772,32779,32786,32792,32793,32796,32801,32808,32831,32827,32842,32838,32850,32856,32858,32863,32866,32872,32883,32882,32880,32886,32889,32893,32895,32900,32902,32901,32923,32915,32922,32941,20880,32940,32987,32997,32985,32989,32964,32986,32982,33033,33007,33009,33051,33065,33059,33071,33099,38539,33094,33086,33107,33105,33020,33137,33134,33125,33126,33140,33155,33160,33162,33152,33154,33184,33173,33188,33187,33119,33171,33193,33200,33205,33214,33208,33213,33216,33218,33210,33225,33229,33233,33241,33240,33224,33242,33247,33248,33255,33274,33275,33278,33281,33282,33285,33287,33290,33293,33296,33302,33321,33323,33336,33331,33344,33369,33368,33373,33370,33375,33380,33378,33384,33386,33387,33326,33393,33399,33400,33406,33421,33426,33451,33439,33467,33452,33505,33507,33503,33490,33524,33523,33530,33683,33539,33531,33529,33502,33542,33500,33545,33497,33589,33588,33558,33586,33585,33600,33593,33616,33605,33583,33579,33559,33560,33669,33690,33706,33695,33698,33686,33571,33678,33671,33674,33660,33717,33651,33653,33696,33673,33704,33780,33811,33771,33742,33789,33795,33752,33803,33729,33783,33799,33760,33778,33805,33826,33824,33725,33848,34054,33787,33901,33834,33852,34138,33924,33911,33899,33965,33902,33922,33897,33862,33836,33903,33913,33845,33994,33890,33977,33983,33951,34009,33997,33979,34010,34000,33985,33990,34006,33953,34081,34047,34036,34071,34072,34092,34079,34069,34068,34044,34112,34147,34136,34120,34113,34306,34123,34133,34176,34212,34184,34193,34186,34216,34157,34196,34203,34282,34183,34204,34167,34174,34192,34249,34234,34255,34233,34256,34261,34269,34277,34268,34297,34314,34323,34315,34302,34298,34310,34338,34330,34352,34367,34381,20053,34388,34399,34407,34417,34451,34467,34473,34474,34443,34444,34486,34479,34500,34502,34480,34505,34851,34475,34516,34526,34537,34540,34527,34523,34543,34578,34566,34568,34560,34563,34555,34577,34569,34573,34553,34570,34612,34623,34615,34619,34597,34601,34586,34656,34655,34680,34636,34638,34676,34647,34664,34670,34649,34643,34659,34666,34821,34722,34719,34690,34735,34763,34749,34752,34768,38614,34731,34756,34739,34759,34758,34747,34799,34802,34784,34831,34829,34814,34806,34807,34830,34770,34833,34838,34837,34850,34849,34865,34870,34873,34855,34875,34884,34882,34898,34905,34910,34914,34923,34945,34942,34974,34933,34941,34997,34930,34946,34967,34962,34990,34969,34978,34957,34980,34992,35007,34993,35011,35012,35028,35032,35033,35037,35065,35074,35068,35060,35048,35058,35076,35084,35082,35091,35139,35102,35109,35114,35115,35137,35140,35131,35126,35128,35148,35101,35168,35166,35174,35172,35181,35178,35183,35188,35191,35198,35203,35208,35210,35219,35224,35233,35241,35238,35244,35247,35250,35258,35261,35263,35264,35290,35292,35293,35303,35316,35320,35331,35350,35344,35340,35355,35357,35365,35382,35393,35419,35410,35398,35400,35452,35437,35436,35426,35461,35458,35460,35496,35489,35473,35493,35494,35482,35491,35524,35533,35522,35546,35563,35571,35559,35556,35569,35604,35552,35554,35575,35550,35547,35596,35591,35610,35553,35606,35600,35607,35616,35635,38827,35622,35627,35646,35624,35649,35660,35663,35662,35657,35670,35675,35674,35691,35679,35692,35695,35700,35709,35712,35724,35726,35730,35731,35734,35737,35738,35898,35905,35903,35912,35916,35918,35920,35925,35938,35948,35960,35962,35970,35977,35973,35978,35981,35982,35988,35964,35992,25117,36013,36010,36029,36018,36019,36014,36022,36040,36033,36068,36067,36058,36093,36090,36091,36100,36101,36106,36103,36111,36109,36112,40782,36115,36045,36116,36118,36199,36205,36209,36211,36225,36249,36290,36286,36282,36303,36314,36310,36300,36315,36299,36330,36331,36319,36323,36348,36360,36361,36351,36381,36382,36368,36383,36418,36405,36400,36404,36426,36423,36425,36428,36432,36424,36441,36452,36448,36394,36451,36437,36470,36466,36476,36481,36487,36485,36484,36491,36490,36499,36497,36500,36505,36522,36513,36524,36528,36550,36529,36542,36549,36552,36555,36571,36579,36604,36603,36587,36606,36618,36613,36629,36626,36633,36627,36636,36639,36635,36620,36646,36659,36667,36665,36677,36674,36670,36684,36681,36678,36686,36695,36700,36706,36707,36708,36764,36767,36771,36781,36783,36791,36826,36837,36834,36842,36847,36999,36852,36869,36857,36858,36881,36885,36897,36877,36894,36886,36875,36903,36918,36917,36921,36856,36943,36944,36945,36946,36878,36937,36926,36950,36952,36958,36968,36975,36982,38568,36978,36994,36989,36993,36992,37002,37001,37007,37032,37039,37041,37045,37090,37092,25160,37083,37122,37138,37145,37170,37168,37194,37206,37208,37219,37221,37225,37235,37234,37259,37257,37250,37282,37291,37295,37290,37301,37300,37306,37312,37313,37321,37323,37328,37334,37343,37345,37339,37372,37365,37366,37406,37375,37396,37420,37397,37393,37470,37463,37445,37449,37476,37448,37525,37439,37451,37456,37532,37526,37523,37531,37466,37583,37561,37559,37609,37647,37626,37700,37678,37657,37666,37658,37667,37690,37685,37691,37724,37728,37756,37742,37718,37808,37804,37805,37780,37817,37846,37847,37864,37861,37848,37827,37853,37840,37832,37860,37914,37908,37907,37891,37895,37904,37942,37931,37941,37921,37946,37953,37970,37956,37979,37984,37986,37982,37994,37417,38000,38005,38007,38013,37978,38012,38014,38017,38015,38274,38279,38282,38292,38294,38296,38297,38304,38312,38311,38317,38332,38331,38329,38334,38346,28662,38339,38349,38348,38357,38356,38358,38364,38369,38373,38370,38433,38440,38446,38447,38466,38476,38479,38475,38519,38492,38494,38493,38495,38502,38514,38508,38541,38552,38549,38551,38570,38567,38577,38578,38576,38580,38582,38584,38585,38606,38603,38601,38605,35149,38620,38669,38613,38649,38660,38662,38664,38675,38670,38673,38671,38678,38681,38692,38698,38704,38713,38717,38718,38724,38726,38728,38722,38729,38748,38752,38756,38758,38760,21202,38763,38769,38777,38789,38780,38785,38778,38790,38795,38799,38800,38812,38824,38822,38819,38835,38836,38851,38854,38856,38859,38876,38893,40783,38898,31455,38902,38901,38927,38924,38968,38948,38945,38967,38973,38982,38991,38987,39019,39023,39024,39025,39028,39027,39082,39087,39089,39094,39108,39107,39110,39145,39147,39171,39177,39186,39188,39192,39201,39197,39198,39204,39200,39212,39214,39229,39230,39234,39241,39237,39248,39243,39249,39250,39244,39253,39319,39320,39333,39341,39342,39356,39391,39387,39389,39384,39377,39405,39406,39409,39410,39419,39416,39425,39439,39429,39394,39449,39467,39479,39493,39490,39488,39491,39486,39509,39501,39515,39511,39519,39522,39525,39524,39529,39531,39530,39597,39600,39612,39616,39631,39633,39635,39636,39646,39647,39650,39651,39654,39663,39659,39662,39668,39665,39671,39675,39686,39704,39706,39711,39714,39715,39717,39719,39720,39721,39722,39726,39727,39730,39748,39747,39759,39757,39758,39761,39768,39796,39827,39811,39825,39830,39831,39839,39840,39848,39860,39872,39882,39865,39878,39887,39889,39890,39907,39906,39908,39892,39905,39994,39922,39921,39920,39957,39956,39945,39955,39948,39942,39944,39954,39946,39940,39982,39963,39973,39972,39969,39984,40007,39986,40006,39998,40026,40032,40039,40054,40056,40167,40172,40176,40201,40200,40171,40195,40198,40234,40230,40367,40227,40223,40260,40213,40210,40257,40255,40254,40262,40264,40285,40286,40292,40273,40272,40281,40306,40329,40327,40363,40303,40314,40346,40356,40361,40370,40388,40385,40379,40376,40378,40390,40399,40386,40409,40403,40440,40422,40429,40431,40445,40474,40475,40478,40565,40569,40573,40577,40584,40587,40588,40594,40597,40593,40605,40613,40617,40632,40618,40621,38753,40652,40654,40655,40656,40660,40668,40670,40669,40672,40677,40680,40687,40692,40694,40695,40697,40699,40700,40701,40711,40712,30391,40725,40737,40748,40766,40778,40786,40788,40803,40799,40800,40801,40806,40807,40812,40810,40823,40818,40822,40853,40860,40864,22575,27079,36953,29796,20956,29081,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,32394,35100,37704,37512,34012,20425,28859,26161,26824,37625,26363,24389,20008,20193,20220,20224,20227,20281,20310,20370,20362,20378,20372,20429,20544,20514,20479,20510,20550,20592,20546,20628,20724,20696,20810,20836,20893,20926,20972,21013,21148,21158,21184,21211,21248,21255,21284,21362,21395,21426,21469,64014,21660,21642,21673,21759,21894,22361,22373,22444,22472,22471,64015,64016,22686,22706,22795,22867,22875,22877,22883,22948,22970,23382,23488,29999,23512,23532,23582,23718,23738,23797,23847,23891,64017,23874,23917,23992,23993,24016,24353,24372,24423,24503,24542,24669,24709,24714,24798,24789,24864,24818,24849,24887,24880,24984,25107,25254,25589,25696,25757,25806,25934,26112,26133,26171,26121,26158,26142,26148,26213,26199,26201,64018,26227,26265,26272,26290,26303,26362,26382,63785,26470,26555,26706,26560,26625,26692,26831,64019,26984,64020,27032,27106,27184,27243,27206,27251,27262,27362,27364,27606,27711,27740,27782,27759,27866,27908,28039,28015,28054,28076,28111,28152,28146,28156,28217,28252,28199,28220,28351,28552,28597,28661,28677,28679,28712,28805,28843,28943,28932,29020,28998,28999,64021,29121,29182,29361,29374,29476,64022,29559,29629,29641,29654,29667,29650,29703,29685,29734,29738,29737,29742,29794,29833,29855,29953,30063,30338,30364,30366,30363,30374,64023,30534,21167,30753,30798,30820,30842,31024,64024,64025,64026,31124,64027,31131,31441,31463,64028,31467,31646,64029,32072,32092,32183,32160,32214,32338,32583,32673,64030,33537,33634,33663,33735,33782,33864,33972,34131,34137,34155,64031,34224,64032,64033,34823,35061,35346,35383,35449,35495,35518,35551,64034,35574,35667,35711,36080,36084,36114,36214,64035,36559,64036,64037,36967,37086,64038,37141,37159,37338,37335,37342,37357,37358,37348,37349,37382,37392,37386,37434,37440,37436,37454,37465,37457,37433,37479,37543,37495,37496,37607,37591,37593,37584,64039,37589,37600,37587,37669,37665,37627,64040,37662,37631,37661,37634,37744,37719,37796,37830,37854,37880,37937,37957,37960,38290,63964,64041,38557,38575,38707,38715,38723,38733,38735,38737,38741,38999,39013,64042,64043,39207,64044,39326,39502,39641,39644,39797,39794,39823,39857,39867,39936,40304,40299,64045,40473,40657,null,null,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,65506,65508,65287,65282,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,65506,65508,65287,65282,12849,8470,8481,8757,32394,35100,37704,37512,34012,20425,28859,26161,26824,37625,26363,24389,20008,20193,20220,20224,20227,20281,20310,20370,20362,20378,20372,20429,20544,20514,20479,20510,20550,20592,20546,20628,20724,20696,20810,20836,20893,20926,20972,21013,21148,21158,21184,21211,21248,21255,21284,21362,21395,21426,21469,64014,21660,21642,21673,21759,21894,22361,22373,22444,22472,22471,64015,64016,22686,22706,22795,22867,22875,22877,22883,22948,22970,23382,23488,29999,23512,23532,23582,23718,23738,23797,23847,23891,64017,23874,23917,23992,23993,24016,24353,24372,24423,24503,24542,24669,24709,24714,24798,24789,24864,24818,24849,24887,24880,24984,25107,25254,25589,25696,25757,25806,25934,26112,26133,26171,26121,26158,26142,26148,26213,26199,26201,64018,26227,26265,26272,26290,26303,26362,26382,63785,26470,26555,26706,26560,26625,26692,26831,64019,26984,64020,27032,27106,27184,27243,27206,27251,27262,27362,27364,27606,27711,27740,27782,27759,27866,27908,28039,28015,28054,28076,28111,28152,28146,28156,28217,28252,28199,28220,28351,28552,28597,28661,28677,28679,28712,28805,28843,28943,28932,29020,28998,28999,64021,29121,29182,29361,29374,29476,64022,29559,29629,29641,29654,29667,29650,29703,29685,29734,29738,29737,29742,29794,29833,29855,29953,30063,30338,30364,30366,30363,30374,64023,30534,21167,30753,30798,30820,30842,31024,64024,64025,64026,31124,64027,31131,31441,31463,64028,31467,31646,64029,32072,32092,32183,32160,32214,32338,32583,32673,64030,33537,33634,33663,33735,33782,33864,33972,34131,34137,34155,64031,34224,64032,64033,34823,35061,35346,35383,35449,35495,35518,35551,64034,35574,35667,35711,36080,36084,36114,36214,64035,36559,64036,64037,36967,37086,64038,37141,37159,37338,37335,37342,37357,37358,37348,37349,37382,37392,37386,37434,37440,37436,37454,37465,37457,37433,37479,37543,37495,37496,37607,37591,37593,37584,64039,37589,37600,37587,37669,37665,37627,64040,37662,37631,37661,37634,37744,37719,37796,37830,37854,37880,37937,37957,37960,38290,63964,64041,38557,38575,38707,38715,38723,38733,38735,38737,38741,38999,39013,64042,64043,39207,64044,39326,39502,39641,39644,39797,39794,39823,39857,39867,39936,40304,40299,64045,40473,40657,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null],\n  \"jis0212\":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,728,711,184,729,733,175,731,730,65374,900,901,null,null,null,null,null,null,null,null,161,166,191,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,186,170,169,174,8482,164,8470,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,902,904,905,906,938,null,908,null,910,939,null,911,null,null,null,null,940,941,942,943,970,912,972,962,973,971,944,974,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1038,1039,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1118,1119,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,198,272,null,294,null,306,null,321,319,null,330,216,338,null,358,222,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,230,273,240,295,305,307,312,322,320,329,331,248,339,223,359,254,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,193,192,196,194,258,461,256,260,197,195,262,264,268,199,266,270,201,200,203,202,282,278,274,280,null,284,286,290,288,292,205,204,207,206,463,304,298,302,296,308,310,313,317,315,323,327,325,209,211,210,214,212,465,336,332,213,340,344,342,346,348,352,350,356,354,218,217,220,219,364,467,368,362,370,366,360,471,475,473,469,372,221,376,374,377,381,379,null,null,null,null,null,null,null,225,224,228,226,259,462,257,261,229,227,263,265,269,231,267,271,233,232,235,234,283,279,275,281,501,285,287,null,289,293,237,236,239,238,464,null,299,303,297,309,311,314,318,316,324,328,326,241,243,242,246,244,466,337,333,245,341,345,343,347,349,353,351,357,355,250,249,252,251,365,468,369,363,371,367,361,472,476,474,470,373,253,255,375,378,382,380,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,19970,19972,19973,19980,19986,19999,20003,20004,20008,20011,20014,20015,20016,20021,20032,20033,20036,20039,20049,20058,20060,20067,20072,20073,20084,20085,20089,20095,20109,20118,20119,20125,20143,20153,20163,20176,20186,20187,20192,20193,20194,20200,20207,20209,20211,20213,20221,20222,20223,20224,20226,20227,20232,20235,20236,20242,20245,20246,20247,20249,20270,20273,20320,20275,20277,20279,20281,20283,20286,20288,20290,20296,20297,20299,20300,20306,20308,20310,20312,20319,20323,20330,20332,20334,20337,20343,20344,20345,20346,20349,20350,20353,20354,20356,20357,20361,20362,20364,20366,20368,20370,20371,20372,20375,20377,20378,20382,20383,20402,20407,20409,20411,20412,20413,20414,20416,20417,20421,20422,20424,20425,20427,20428,20429,20431,20434,20444,20448,20450,20464,20466,20476,20477,20479,20480,20481,20484,20487,20490,20492,20494,20496,20499,20503,20504,20507,20508,20509,20510,20514,20519,20526,20528,20530,20531,20533,20544,20545,20546,20549,20550,20554,20556,20558,20561,20562,20563,20567,20569,20575,20576,20578,20579,20582,20583,20586,20589,20592,20593,20539,20609,20611,20612,20614,20618,20622,20623,20624,20626,20627,20628,20630,20635,20636,20638,20639,20640,20641,20642,20650,20655,20656,20665,20666,20669,20672,20675,20676,20679,20684,20686,20688,20691,20692,20696,20700,20701,20703,20706,20708,20710,20712,20713,20719,20721,20726,20730,20734,20739,20742,20743,20744,20747,20748,20749,20750,20722,20752,20759,20761,20763,20764,20765,20766,20771,20775,20776,20780,20781,20783,20785,20787,20788,20789,20792,20793,20802,20810,20815,20819,20821,20823,20824,20831,20836,20838,20862,20867,20868,20875,20878,20888,20893,20897,20899,20909,20920,20922,20924,20926,20927,20930,20936,20943,20945,20946,20947,20949,20952,20958,20962,20965,20974,20978,20979,20980,20983,20993,20994,20997,21010,21011,21013,21014,21016,21026,21032,21041,21042,21045,21052,21061,21065,21077,21079,21080,21082,21084,21087,21088,21089,21094,21102,21111,21112,21113,21120,21122,21125,21130,21132,21139,21141,21142,21143,21144,21146,21148,21156,21157,21158,21159,21167,21168,21174,21175,21176,21178,21179,21181,21184,21188,21190,21192,21196,21199,21201,21204,21206,21211,21212,21217,21221,21224,21225,21226,21228,21232,21233,21236,21238,21239,21248,21251,21258,21259,21260,21265,21267,21272,21275,21276,21278,21279,21285,21287,21288,21289,21291,21292,21293,21296,21298,21301,21308,21309,21310,21314,21324,21323,21337,21339,21345,21347,21349,21356,21357,21362,21369,21374,21379,21383,21384,21390,21395,21396,21401,21405,21409,21412,21418,21419,21423,21426,21428,21429,21431,21432,21434,21437,21440,21445,21455,21458,21459,21461,21466,21469,21470,21472,21478,21479,21493,21506,21523,21530,21537,21543,21544,21546,21551,21553,21556,21557,21571,21572,21575,21581,21583,21598,21602,21604,21606,21607,21609,21611,21613,21614,21620,21631,21633,21635,21637,21640,21641,21645,21649,21653,21654,21660,21663,21665,21670,21671,21673,21674,21677,21678,21681,21687,21689,21690,21691,21695,21702,21706,21709,21710,21728,21738,21740,21743,21750,21756,21758,21759,21760,21761,21765,21768,21769,21772,21773,21774,21781,21802,21803,21810,21813,21814,21819,21820,21821,21825,21831,21833,21834,21837,21840,21841,21848,21850,21851,21854,21856,21857,21860,21862,21887,21889,21890,21894,21896,21902,21903,21905,21906,21907,21908,21911,21923,21924,21933,21938,21951,21953,21955,21958,21961,21963,21964,21966,21969,21970,21971,21975,21976,21979,21982,21986,21993,22006,22015,22021,22024,22026,22029,22030,22031,22032,22033,22034,22041,22060,22064,22067,22069,22071,22073,22075,22076,22077,22079,22080,22081,22083,22084,22086,22089,22091,22093,22095,22100,22110,22112,22113,22114,22115,22118,22121,22125,22127,22129,22130,22133,22148,22149,22152,22155,22156,22165,22169,22170,22173,22174,22175,22182,22183,22184,22185,22187,22188,22189,22193,22195,22199,22206,22213,22217,22218,22219,22223,22224,22220,22221,22233,22236,22237,22239,22241,22244,22245,22246,22247,22248,22257,22251,22253,22262,22263,22273,22274,22279,22282,22284,22289,22293,22298,22299,22301,22304,22306,22307,22308,22309,22313,22314,22316,22318,22319,22323,22324,22333,22334,22335,22341,22342,22348,22349,22354,22370,22373,22375,22376,22379,22381,22382,22383,22384,22385,22387,22388,22389,22391,22393,22394,22395,22396,22398,22401,22403,22412,22420,22423,22425,22426,22428,22429,22430,22431,22433,22421,22439,22440,22441,22444,22456,22461,22471,22472,22476,22479,22485,22493,22494,22500,22502,22503,22505,22509,22512,22517,22518,22520,22525,22526,22527,22531,22532,22536,22537,22497,22540,22541,22555,22558,22559,22560,22566,22567,22573,22578,22585,22591,22601,22604,22605,22607,22608,22613,22623,22625,22628,22631,22632,22648,22652,22655,22656,22657,22663,22664,22665,22666,22668,22669,22671,22672,22676,22678,22685,22688,22689,22690,22694,22697,22705,22706,22724,22716,22722,22728,22733,22734,22736,22738,22740,22742,22746,22749,22753,22754,22761,22771,22789,22790,22795,22796,22802,22803,22804,34369,22813,22817,22819,22820,22824,22831,22832,22835,22837,22838,22847,22851,22854,22866,22867,22873,22875,22877,22878,22879,22881,22883,22891,22893,22895,22898,22901,22902,22905,22907,22908,22923,22924,22926,22930,22933,22935,22943,22948,22951,22957,22958,22959,22960,22963,22967,22970,22972,22977,22979,22980,22984,22986,22989,22994,23005,23006,23007,23011,23012,23015,23022,23023,23025,23026,23028,23031,23040,23044,23052,23053,23054,23058,23059,23070,23075,23076,23079,23080,23082,23085,23088,23108,23109,23111,23112,23116,23120,23125,23134,23139,23141,23143,23149,23159,23162,23163,23166,23179,23184,23187,23190,23193,23196,23198,23199,23200,23202,23207,23212,23217,23218,23219,23221,23224,23226,23227,23231,23236,23238,23240,23247,23258,23260,23264,23269,23274,23278,23285,23286,23293,23296,23297,23304,23319,23348,23321,23323,23325,23329,23333,23341,23352,23361,23371,23372,23378,23382,23390,23400,23406,23407,23420,23421,23422,23423,23425,23428,23430,23434,23438,23440,23441,23443,23444,23446,23464,23465,23468,23469,23471,23473,23474,23479,23482,23484,23488,23489,23501,23503,23510,23511,23512,23513,23514,23520,23535,23537,23540,23549,23564,23575,23582,23583,23587,23590,23593,23595,23596,23598,23600,23602,23605,23606,23641,23642,23644,23650,23651,23655,23656,23657,23661,23664,23668,23669,23674,23675,23676,23677,23687,23688,23690,23695,23698,23709,23711,23712,23714,23715,23718,23722,23730,23732,23733,23738,23753,23755,23762,23773,23767,23790,23793,23794,23796,23809,23814,23821,23826,23851,23843,23844,23846,23847,23857,23860,23865,23869,23871,23874,23875,23878,23880,23893,23889,23897,23882,23903,23904,23905,23906,23908,23914,23917,23920,23929,23930,23934,23935,23937,23939,23944,23946,23954,23955,23956,23957,23961,23963,23967,23968,23975,23979,23984,23988,23992,23993,24003,24007,24011,24016,24014,24024,24025,24032,24036,24041,24056,24057,24064,24071,24077,24082,24084,24085,24088,24095,24096,24110,24104,24114,24117,24126,24139,24144,24137,24145,24150,24152,24155,24156,24158,24168,24170,24171,24172,24173,24174,24176,24192,24203,24206,24226,24228,24229,24232,24234,24236,24241,24243,24253,24254,24255,24262,24268,24267,24270,24273,24274,24276,24277,24284,24286,24293,24299,24322,24326,24327,24328,24334,24345,24348,24349,24353,24354,24355,24356,24360,24363,24364,24366,24368,24372,24374,24379,24381,24383,24384,24388,24389,24391,24397,24400,24404,24408,24411,24416,24419,24420,24423,24431,24434,24436,24437,24440,24442,24445,24446,24457,24461,24463,24470,24476,24477,24482,24487,24491,24484,24492,24495,24496,24497,24504,24516,24519,24520,24521,24523,24528,24529,24530,24531,24532,24542,24545,24546,24552,24553,24554,24556,24557,24558,24559,24562,24563,24566,24570,24572,24583,24586,24589,24595,24596,24599,24600,24602,24607,24612,24621,24627,24629,24640,24647,24648,24649,24652,24657,24660,24662,24663,24669,24673,24679,24689,24702,24703,24706,24710,24712,24714,24718,24721,24723,24725,24728,24733,24734,24738,24740,24741,24744,24752,24753,24759,24763,24766,24770,24772,24776,24777,24778,24779,24782,24783,24788,24789,24793,24795,24797,24798,24802,24805,24818,24821,24824,24828,24829,24834,24839,24842,24844,24848,24849,24850,24851,24852,24854,24855,24857,24860,24862,24866,24874,24875,24880,24881,24885,24886,24887,24889,24897,24901,24902,24905,24926,24928,24940,24946,24952,24955,24956,24959,24960,24961,24963,24964,24971,24973,24978,24979,24983,24984,24988,24989,24991,24992,24997,25000,25002,25005,25016,25017,25020,25024,25025,25026,25038,25039,25045,25052,25053,25054,25055,25057,25058,25063,25065,25061,25068,25069,25071,25089,25091,25092,25095,25107,25109,25116,25120,25122,25123,25127,25129,25131,25145,25149,25154,25155,25156,25158,25164,25168,25169,25170,25172,25174,25178,25180,25188,25197,25199,25203,25210,25213,25229,25230,25231,25232,25254,25256,25267,25270,25271,25274,25278,25279,25284,25294,25301,25302,25306,25322,25330,25332,25340,25341,25347,25348,25354,25355,25357,25360,25363,25366,25368,25385,25386,25389,25397,25398,25401,25404,25409,25410,25411,25412,25414,25418,25419,25422,25426,25427,25428,25432,25435,25445,25446,25452,25453,25457,25460,25461,25464,25468,25469,25471,25474,25476,25479,25482,25488,25492,25493,25497,25498,25502,25508,25510,25517,25518,25519,25533,25537,25541,25544,25550,25553,25555,25556,25557,25564,25568,25573,25578,25580,25586,25587,25589,25592,25593,25609,25610,25616,25618,25620,25624,25630,25632,25634,25636,25637,25641,25642,25647,25648,25653,25661,25663,25675,25679,25681,25682,25683,25684,25690,25691,25692,25693,25695,25696,25697,25699,25709,25715,25716,25723,25725,25733,25735,25743,25744,25745,25752,25753,25755,25757,25759,25761,25763,25766,25768,25772,25779,25789,25790,25791,25796,25801,25802,25803,25804,25806,25808,25809,25813,25815,25828,25829,25833,25834,25837,25840,25845,25847,25851,25855,25857,25860,25864,25865,25866,25871,25875,25876,25878,25881,25883,25886,25887,25890,25894,25897,25902,25905,25914,25916,25917,25923,25927,25929,25936,25938,25940,25951,25952,25959,25963,25978,25981,25985,25989,25994,26002,26005,26008,26013,26016,26019,26022,26030,26034,26035,26036,26047,26050,26056,26057,26062,26064,26068,26070,26072,26079,26096,26098,26100,26101,26105,26110,26111,26112,26116,26120,26121,26125,26129,26130,26133,26134,26141,26142,26145,26146,26147,26148,26150,26153,26154,26155,26156,26158,26160,26161,26163,26169,26167,26176,26181,26182,26186,26188,26193,26190,26199,26200,26201,26203,26204,26208,26209,26363,26218,26219,26220,26238,26227,26229,26239,26231,26232,26233,26235,26240,26236,26251,26252,26253,26256,26258,26265,26266,26267,26268,26271,26272,26276,26285,26289,26290,26293,26299,26303,26304,26306,26307,26312,26316,26318,26319,26324,26331,26335,26344,26347,26348,26350,26362,26373,26375,26382,26387,26393,26396,26400,26402,26419,26430,26437,26439,26440,26444,26452,26453,26461,26470,26476,26478,26484,26486,26491,26497,26500,26510,26511,26513,26515,26518,26520,26521,26523,26544,26545,26546,26549,26555,26556,26557,26617,26560,26562,26563,26565,26568,26569,26578,26583,26585,26588,26593,26598,26608,26610,26614,26615,26706,26644,26649,26653,26655,26664,26663,26668,26669,26671,26672,26673,26675,26683,26687,26692,26693,26698,26700,26709,26711,26712,26715,26731,26734,26735,26736,26737,26738,26741,26745,26746,26747,26748,26754,26756,26758,26760,26774,26776,26778,26780,26785,26787,26789,26793,26794,26798,26802,26811,26821,26824,26828,26831,26832,26833,26835,26838,26841,26844,26845,26853,26856,26858,26859,26860,26861,26864,26865,26869,26870,26875,26876,26877,26886,26889,26890,26896,26897,26899,26902,26903,26929,26931,26933,26936,26939,26946,26949,26953,26958,26967,26971,26979,26980,26981,26982,26984,26985,26988,26992,26993,26994,27002,27003,27007,27008,27021,27026,27030,27032,27041,27045,27046,27048,27051,27053,27055,27063,27064,27066,27068,27077,27080,27089,27094,27095,27106,27109,27118,27119,27121,27123,27125,27134,27136,27137,27139,27151,27153,27157,27162,27165,27168,27172,27176,27184,27186,27188,27191,27195,27198,27199,27205,27206,27209,27210,27214,27216,27217,27218,27221,27222,27227,27236,27239,27242,27249,27251,27262,27265,27267,27270,27271,27273,27275,27281,27291,27293,27294,27295,27301,27307,27311,27312,27313,27316,27325,27326,27327,27334,27337,27336,27340,27344,27348,27349,27350,27356,27357,27364,27367,27372,27376,27377,27378,27388,27389,27394,27395,27398,27399,27401,27407,27408,27409,27415,27419,27422,27428,27432,27435,27436,27439,27445,27446,27451,27455,27462,27466,27469,27474,27478,27480,27485,27488,27495,27499,27502,27504,27509,27517,27518,27522,27525,27543,27547,27551,27552,27554,27555,27560,27561,27564,27565,27566,27568,27576,27577,27581,27582,27587,27588,27593,27596,27606,27610,27617,27619,27622,27623,27630,27633,27639,27641,27647,27650,27652,27653,27657,27661,27662,27664,27666,27673,27679,27686,27687,27688,27692,27694,27699,27701,27702,27706,27707,27711,27722,27723,27725,27727,27730,27732,27737,27739,27740,27755,27757,27759,27764,27766,27768,27769,27771,27781,27782,27783,27785,27796,27797,27799,27800,27804,27807,27824,27826,27828,27842,27846,27853,27855,27856,27857,27858,27860,27862,27866,27868,27872,27879,27881,27883,27884,27886,27890,27892,27908,27911,27914,27918,27919,27921,27923,27930,27942,27943,27944,27751,27950,27951,27953,27961,27964,27967,27991,27998,27999,28001,28005,28007,28015,28016,28028,28034,28039,28049,28050,28052,28054,28055,28056,28074,28076,28084,28087,28089,28093,28095,28100,28104,28106,28110,28111,28118,28123,28125,28127,28128,28130,28133,28137,28143,28144,28148,28150,28156,28160,28164,28190,28194,28199,28210,28214,28217,28219,28220,28228,28229,28232,28233,28235,28239,28241,28242,28243,28244,28247,28252,28253,28254,28258,28259,28264,28275,28283,28285,28301,28307,28313,28320,28327,28333,28334,28337,28339,28347,28351,28352,28353,28355,28359,28360,28362,28365,28366,28367,28395,28397,28398,28409,28411,28413,28420,28424,28426,28428,28429,28438,28440,28442,28443,28454,28457,28458,28463,28464,28467,28470,28475,28476,28461,28495,28497,28498,28499,28503,28505,28506,28509,28510,28513,28514,28520,28524,28541,28542,28547,28551,28552,28555,28556,28557,28560,28562,28563,28564,28566,28570,28575,28576,28581,28582,28583,28584,28590,28591,28592,28597,28598,28604,28613,28615,28616,28618,28634,28638,28648,28649,28656,28661,28665,28668,28669,28672,28677,28678,28679,28685,28695,28704,28707,28719,28724,28727,28729,28732,28739,28740,28744,28745,28746,28747,28756,28757,28765,28766,28750,28772,28773,28780,28782,28789,28790,28798,28801,28805,28806,28820,28821,28822,28823,28824,28827,28836,28843,28848,28849,28852,28855,28874,28881,28883,28884,28885,28886,28888,28892,28900,28922,28931,28932,28933,28934,28935,28939,28940,28943,28958,28960,28971,28973,28975,28976,28977,28984,28993,28997,28998,28999,29002,29003,29008,29010,29015,29018,29020,29022,29024,29032,29049,29056,29061,29063,29068,29074,29082,29083,29088,29090,29103,29104,29106,29107,29114,29119,29120,29121,29124,29131,29132,29139,29142,29145,29146,29148,29176,29182,29184,29191,29192,29193,29203,29207,29210,29213,29215,29220,29227,29231,29236,29240,29241,29249,29250,29251,29253,29262,29263,29264,29267,29269,29270,29274,29276,29278,29280,29283,29288,29291,29294,29295,29297,29303,29304,29307,29308,29311,29316,29321,29325,29326,29331,29339,29352,29357,29358,29361,29364,29374,29377,29383,29385,29388,29397,29398,29400,29407,29413,29427,29428,29434,29435,29438,29442,29444,29445,29447,29451,29453,29458,29459,29464,29465,29470,29474,29476,29479,29480,29484,29489,29490,29493,29498,29499,29501,29507,29517,29520,29522,29526,29528,29533,29534,29535,29536,29542,29543,29545,29547,29548,29550,29551,29553,29559,29561,29564,29568,29569,29571,29573,29574,29582,29584,29587,29589,29591,29592,29596,29598,29599,29600,29602,29605,29606,29610,29611,29613,29621,29623,29625,29628,29629,29631,29637,29638,29641,29643,29644,29647,29650,29651,29654,29657,29661,29665,29667,29670,29671,29673,29684,29685,29687,29689,29690,29691,29693,29695,29696,29697,29700,29703,29706,29713,29722,29723,29732,29734,29736,29737,29738,29739,29740,29741,29742,29743,29744,29745,29753,29760,29763,29764,29766,29767,29771,29773,29777,29778,29783,29789,29794,29798,29799,29800,29803,29805,29806,29809,29810,29824,29825,29829,29830,29831,29833,29839,29840,29841,29842,29848,29849,29850,29852,29855,29856,29857,29859,29862,29864,29865,29866,29867,29870,29871,29873,29874,29877,29881,29883,29887,29896,29897,29900,29904,29907,29912,29914,29915,29918,29919,29924,29928,29930,29931,29935,29940,29946,29947,29948,29951,29958,29970,29974,29975,29984,29985,29988,29991,29993,29994,29999,30006,30009,30013,30014,30015,30016,30019,30023,30024,30030,30032,30034,30039,30046,30047,30049,30063,30065,30073,30074,30075,30076,30077,30078,30081,30085,30096,30098,30099,30101,30105,30108,30114,30116,30132,30138,30143,30144,30145,30148,30150,30156,30158,30159,30167,30172,30175,30176,30177,30180,30183,30188,30190,30191,30193,30201,30208,30210,30211,30212,30215,30216,30218,30220,30223,30226,30227,30229,30230,30233,30235,30236,30237,30238,30243,30245,30246,30249,30253,30258,30259,30261,30264,30265,30266,30268,30282,30272,30273,30275,30276,30277,30281,30283,30293,30297,30303,30308,30309,30317,30318,30319,30321,30324,30337,30341,30348,30349,30357,30363,30364,30365,30367,30368,30370,30371,30372,30373,30374,30375,30376,30378,30381,30397,30401,30405,30409,30411,30412,30414,30420,30425,30432,30438,30440,30444,30448,30449,30454,30457,30460,30464,30470,30474,30478,30482,30484,30485,30487,30489,30490,30492,30498,30504,30509,30510,30511,30516,30517,30518,30521,30525,30526,30530,30533,30534,30538,30541,30542,30543,30546,30550,30551,30556,30558,30559,30560,30562,30564,30567,30570,30572,30576,30578,30579,30580,30586,30589,30592,30596,30604,30605,30612,30613,30614,30618,30623,30626,30631,30634,30638,30639,30641,30645,30654,30659,30665,30673,30674,30677,30681,30686,30687,30688,30692,30694,30698,30700,30704,30705,30708,30712,30715,30725,30726,30729,30733,30734,30737,30749,30753,30754,30755,30765,30766,30768,30773,30775,30787,30788,30791,30792,30796,30798,30802,30812,30814,30816,30817,30819,30820,30824,30826,30830,30842,30846,30858,30863,30868,30872,30881,30877,30878,30879,30884,30888,30892,30893,30896,30897,30898,30899,30907,30909,30911,30919,30920,30921,30924,30926,30930,30931,30933,30934,30948,30939,30943,30944,30945,30950,30954,30962,30963,30976,30966,30967,30970,30971,30975,30982,30988,30992,31002,31004,31006,31007,31008,31013,31015,31017,31021,31025,31028,31029,31035,31037,31039,31044,31045,31046,31050,31051,31055,31057,31060,31064,31067,31068,31079,31081,31083,31090,31097,31099,31100,31102,31115,31116,31121,31123,31124,31125,31126,31128,31131,31132,31137,31144,31145,31147,31151,31153,31156,31160,31163,31170,31172,31175,31176,31178,31183,31188,31190,31194,31197,31198,31200,31202,31205,31210,31211,31213,31217,31224,31228,31234,31235,31239,31241,31242,31244,31249,31253,31259,31262,31265,31271,31275,31277,31279,31280,31284,31285,31288,31289,31290,31300,31301,31303,31304,31308,31317,31318,31321,31324,31325,31327,31328,31333,31335,31338,31341,31349,31352,31358,31360,31362,31365,31366,31370,31371,31376,31377,31380,31390,31392,31395,31404,31411,31413,31417,31419,31420,31430,31433,31436,31438,31441,31451,31464,31465,31467,31468,31473,31476,31483,31485,31486,31495,31508,31519,31523,31527,31529,31530,31531,31533,31534,31535,31536,31537,31540,31549,31551,31552,31553,31559,31566,31573,31584,31588,31590,31593,31594,31597,31599,31602,31603,31607,31620,31625,31630,31632,31633,31638,31643,31646,31648,31653,31660,31663,31664,31666,31669,31670,31674,31675,31676,31677,31682,31685,31688,31690,31700,31702,31703,31705,31706,31707,31720,31722,31730,31732,31733,31736,31737,31738,31740,31742,31745,31746,31747,31748,31750,31753,31755,31756,31758,31759,31769,31771,31776,31781,31782,31784,31788,31793,31795,31796,31798,31801,31802,31814,31818,31829,31825,31826,31827,31833,31834,31835,31836,31837,31838,31841,31843,31847,31849,31853,31854,31856,31858,31865,31868,31869,31878,31879,31887,31892,31902,31904,31910,31920,31926,31927,31930,31931,31932,31935,31940,31943,31944,31945,31949,31951,31955,31956,31957,31959,31961,31962,31965,31974,31977,31979,31989,32003,32007,32008,32009,32015,32017,32018,32019,32022,32029,32030,32035,32038,32042,32045,32049,32060,32061,32062,32064,32065,32071,32072,32077,32081,32083,32087,32089,32090,32092,32093,32101,32103,32106,32112,32120,32122,32123,32127,32129,32130,32131,32133,32134,32136,32139,32140,32141,32145,32150,32151,32157,32158,32166,32167,32170,32179,32182,32183,32185,32194,32195,32196,32197,32198,32204,32205,32206,32215,32217,32256,32226,32229,32230,32234,32235,32237,32241,32245,32246,32249,32250,32264,32272,32273,32277,32279,32284,32285,32288,32295,32296,32300,32301,32303,32307,32310,32319,32324,32325,32327,32334,32336,32338,32344,32351,32353,32354,32357,32363,32366,32367,32371,32376,32382,32385,32390,32391,32394,32397,32401,32405,32408,32410,32413,32414,32572,32571,32573,32574,32575,32579,32580,32583,32591,32594,32595,32603,32604,32605,32609,32611,32612,32613,32614,32621,32625,32637,32638,32639,32640,32651,32653,32655,32656,32657,32662,32663,32668,32673,32674,32678,32682,32685,32692,32700,32703,32704,32707,32712,32718,32719,32731,32735,32739,32741,32744,32748,32750,32751,32754,32762,32765,32766,32767,32775,32776,32778,32781,32782,32783,32785,32787,32788,32790,32797,32798,32799,32800,32804,32806,32812,32814,32816,32820,32821,32823,32825,32826,32828,32830,32832,32836,32864,32868,32870,32877,32881,32885,32897,32904,32910,32924,32926,32934,32935,32939,32952,32953,32968,32973,32975,32978,32980,32981,32983,32984,32992,33005,33006,33008,33010,33011,33014,33017,33018,33022,33027,33035,33046,33047,33048,33052,33054,33056,33060,33063,33068,33072,33077,33082,33084,33093,33095,33098,33100,33106,33111,33120,33121,33127,33128,33129,33133,33135,33143,33153,33168,33156,33157,33158,33163,33166,33174,33176,33179,33182,33186,33198,33202,33204,33211,33227,33219,33221,33226,33230,33231,33237,33239,33243,33245,33246,33249,33252,33259,33260,33264,33265,33266,33269,33270,33272,33273,33277,33279,33280,33283,33295,33299,33300,33305,33306,33309,33313,33314,33320,33330,33332,33338,33347,33348,33349,33350,33355,33358,33359,33361,33366,33372,33376,33379,33383,33389,33396,33403,33405,33407,33408,33409,33411,33412,33415,33417,33418,33422,33425,33428,33430,33432,33434,33435,33440,33441,33443,33444,33447,33448,33449,33450,33454,33456,33458,33460,33463,33466,33468,33470,33471,33478,33488,33493,33498,33504,33506,33508,33512,33514,33517,33519,33526,33527,33533,33534,33536,33537,33543,33544,33546,33547,33620,33563,33565,33566,33567,33569,33570,33580,33581,33582,33584,33587,33591,33594,33596,33597,33602,33603,33604,33607,33613,33614,33617,33621,33622,33623,33648,33656,33661,33663,33664,33666,33668,33670,33677,33682,33684,33685,33688,33689,33691,33692,33693,33702,33703,33705,33708,33726,33727,33728,33735,33737,33743,33744,33745,33748,33757,33619,33768,33770,33782,33784,33785,33788,33793,33798,33802,33807,33809,33813,33817,33709,33839,33849,33861,33863,33864,33866,33869,33871,33873,33874,33878,33880,33881,33882,33884,33888,33892,33893,33895,33898,33904,33907,33908,33910,33912,33916,33917,33921,33925,33938,33939,33941,33950,33958,33960,33961,33962,33967,33969,33972,33978,33981,33982,33984,33986,33991,33992,33996,33999,34003,34012,34023,34026,34031,34032,34033,34034,34039,34098,34042,34043,34045,34050,34051,34055,34060,34062,34064,34076,34078,34082,34083,34084,34085,34087,34090,34091,34095,34099,34100,34102,34111,34118,34127,34128,34129,34130,34131,34134,34137,34140,34141,34142,34143,34144,34145,34146,34148,34155,34159,34169,34170,34171,34173,34175,34177,34181,34182,34185,34187,34188,34191,34195,34200,34205,34207,34208,34210,34213,34215,34228,34230,34231,34232,34236,34237,34238,34239,34242,34247,34250,34251,34254,34221,34264,34266,34271,34272,34278,34280,34285,34291,34294,34300,34303,34304,34308,34309,34317,34318,34320,34321,34322,34328,34329,34331,34334,34337,34343,34345,34358,34360,34362,34364,34365,34368,34370,34374,34386,34387,34390,34391,34392,34393,34397,34400,34401,34402,34403,34404,34409,34412,34415,34421,34422,34423,34426,34445,34449,34454,34456,34458,34460,34465,34470,34471,34472,34477,34481,34483,34484,34485,34487,34488,34489,34495,34496,34497,34499,34501,34513,34514,34517,34519,34522,34524,34528,34531,34533,34535,34440,34554,34556,34557,34564,34565,34567,34571,34574,34575,34576,34579,34580,34585,34590,34591,34593,34595,34600,34606,34607,34609,34610,34617,34618,34620,34621,34622,34624,34627,34629,34637,34648,34653,34657,34660,34661,34671,34673,34674,34683,34691,34692,34693,34694,34695,34696,34697,34699,34700,34704,34707,34709,34711,34712,34713,34718,34720,34723,34727,34732,34733,34734,34737,34741,34750,34751,34753,34760,34761,34762,34766,34773,34774,34777,34778,34780,34783,34786,34787,34788,34794,34795,34797,34801,34803,34808,34810,34815,34817,34819,34822,34825,34826,34827,34832,34841,34834,34835,34836,34840,34842,34843,34844,34846,34847,34856,34861,34862,34864,34866,34869,34874,34876,34881,34883,34885,34888,34889,34890,34891,34894,34897,34901,34902,34904,34906,34908,34911,34912,34916,34921,34929,34937,34939,34944,34968,34970,34971,34972,34975,34976,34984,34986,35002,35005,35006,35008,35018,35019,35020,35021,35022,35025,35026,35027,35035,35038,35047,35055,35056,35057,35061,35063,35073,35078,35085,35086,35087,35093,35094,35096,35097,35098,35100,35104,35110,35111,35112,35120,35121,35122,35125,35129,35130,35134,35136,35138,35141,35142,35145,35151,35154,35159,35162,35163,35164,35169,35170,35171,35179,35182,35184,35187,35189,35194,35195,35196,35197,35209,35213,35216,35220,35221,35227,35228,35231,35232,35237,35248,35252,35253,35254,35255,35260,35284,35285,35286,35287,35288,35301,35305,35307,35309,35313,35315,35318,35321,35325,35327,35332,35333,35335,35343,35345,35346,35348,35349,35358,35360,35362,35364,35366,35371,35372,35375,35381,35383,35389,35390,35392,35395,35397,35399,35401,35405,35406,35411,35414,35415,35416,35420,35421,35425,35429,35431,35445,35446,35447,35449,35450,35451,35454,35455,35456,35459,35462,35467,35471,35472,35474,35478,35479,35481,35487,35495,35497,35502,35503,35507,35510,35511,35515,35518,35523,35526,35528,35529,35530,35537,35539,35540,35541,35543,35549,35551,35564,35568,35572,35573,35574,35580,35583,35589,35590,35595,35601,35612,35614,35615,35594,35629,35632,35639,35644,35650,35651,35652,35653,35654,35656,35666,35667,35668,35673,35661,35678,35683,35693,35702,35704,35705,35708,35710,35713,35716,35717,35723,35725,35727,35732,35733,35740,35742,35743,35896,35897,35901,35902,35909,35911,35913,35915,35919,35921,35923,35924,35927,35928,35931,35933,35929,35939,35940,35942,35944,35945,35949,35955,35957,35958,35963,35966,35974,35975,35979,35984,35986,35987,35993,35995,35996,36004,36025,36026,36037,36038,36041,36043,36047,36054,36053,36057,36061,36065,36072,36076,36079,36080,36082,36085,36087,36088,36094,36095,36097,36099,36105,36114,36119,36123,36197,36201,36204,36206,36223,36226,36228,36232,36237,36240,36241,36245,36254,36255,36256,36262,36267,36268,36271,36274,36277,36279,36281,36283,36288,36293,36294,36295,36296,36298,36302,36305,36308,36309,36311,36313,36324,36325,36327,36332,36336,36284,36337,36338,36340,36349,36353,36356,36357,36358,36363,36369,36372,36374,36384,36385,36386,36387,36390,36391,36401,36403,36406,36407,36408,36409,36413,36416,36417,36427,36429,36430,36431,36436,36443,36444,36445,36446,36449,36450,36457,36460,36461,36463,36464,36465,36473,36474,36475,36482,36483,36489,36496,36498,36501,36506,36507,36509,36510,36514,36519,36521,36525,36526,36531,36533,36538,36539,36544,36545,36547,36548,36551,36559,36561,36564,36572,36584,36590,36592,36593,36599,36601,36602,36589,36608,36610,36615,36616,36623,36624,36630,36631,36632,36638,36640,36641,36643,36645,36647,36648,36652,36653,36654,36660,36661,36662,36663,36666,36672,36673,36675,36679,36687,36689,36690,36691,36692,36693,36696,36701,36702,36709,36765,36768,36769,36772,36773,36774,36789,36790,36792,36798,36800,36801,36806,36810,36811,36813,36816,36818,36819,36821,36832,36835,36836,36840,36846,36849,36853,36854,36859,36862,36866,36868,36872,36876,36888,36891,36904,36905,36911,36906,36908,36909,36915,36916,36919,36927,36931,36932,36940,36955,36957,36962,36966,36967,36972,36976,36980,36985,36997,37000,37003,37004,37006,37008,37013,37015,37016,37017,37019,37024,37025,37026,37029,37040,37042,37043,37044,37046,37053,37068,37054,37059,37060,37061,37063,37064,37077,37079,37080,37081,37084,37085,37087,37093,37074,37110,37099,37103,37104,37108,37118,37119,37120,37124,37125,37126,37128,37133,37136,37140,37142,37143,37144,37146,37148,37150,37152,37157,37154,37155,37159,37161,37166,37167,37169,37172,37174,37175,37177,37178,37180,37181,37187,37191,37192,37199,37203,37207,37209,37210,37211,37217,37220,37223,37229,37236,37241,37242,37243,37249,37251,37253,37254,37258,37262,37265,37267,37268,37269,37272,37278,37281,37286,37288,37292,37293,37294,37296,37297,37298,37299,37302,37307,37308,37309,37311,37314,37315,37317,37331,37332,37335,37337,37338,37342,37348,37349,37353,37354,37356,37357,37358,37359,37360,37361,37367,37369,37371,37373,37376,37377,37380,37381,37382,37383,37385,37386,37388,37392,37394,37395,37398,37400,37404,37405,37411,37412,37413,37414,37416,37422,37423,37424,37427,37429,37430,37432,37433,37434,37436,37438,37440,37442,37443,37446,37447,37450,37453,37454,37455,37457,37464,37465,37468,37469,37472,37473,37477,37479,37480,37481,37486,37487,37488,37493,37494,37495,37496,37497,37499,37500,37501,37503,37512,37513,37514,37517,37518,37522,37527,37529,37535,37536,37540,37541,37543,37544,37547,37551,37554,37558,37560,37562,37563,37564,37565,37567,37568,37569,37570,37571,37573,37574,37575,37576,37579,37580,37581,37582,37584,37587,37589,37591,37592,37593,37596,37597,37599,37600,37601,37603,37605,37607,37608,37612,37614,37616,37625,37627,37631,37632,37634,37640,37645,37649,37652,37653,37660,37661,37662,37663,37665,37668,37669,37671,37673,37674,37683,37684,37686,37687,37703,37704,37705,37712,37713,37714,37717,37719,37720,37722,37726,37732,37733,37735,37737,37738,37741,37743,37744,37745,37747,37748,37750,37754,37757,37759,37760,37761,37762,37768,37770,37771,37773,37775,37778,37781,37784,37787,37790,37793,37795,37796,37798,37800,37803,37812,37813,37814,37818,37801,37825,37828,37829,37830,37831,37833,37834,37835,37836,37837,37843,37849,37852,37854,37855,37858,37862,37863,37881,37879,37880,37882,37883,37885,37889,37890,37892,37896,37897,37901,37902,37903,37909,37910,37911,37919,37934,37935,37937,37938,37939,37940,37947,37951,37949,37955,37957,37960,37962,37964,37973,37977,37980,37983,37985,37987,37992,37995,37997,37998,37999,38001,38002,38020,38019,38264,38265,38270,38276,38280,38284,38285,38286,38301,38302,38303,38305,38310,38313,38315,38316,38324,38326,38330,38333,38335,38342,38344,38345,38347,38352,38353,38354,38355,38361,38362,38365,38366,38367,38368,38372,38374,38429,38430,38434,38436,38437,38438,38444,38449,38451,38455,38456,38457,38458,38460,38461,38465,38482,38484,38486,38487,38488,38497,38510,38516,38523,38524,38526,38527,38529,38530,38531,38532,38537,38545,38550,38554,38557,38559,38564,38565,38566,38569,38574,38575,38579,38586,38602,38610,23986,38616,38618,38621,38622,38623,38633,38639,38641,38650,38658,38659,38661,38665,38682,38683,38685,38689,38690,38691,38696,38705,38707,38721,38723,38730,38734,38735,38741,38743,38744,38746,38747,38755,38759,38762,38766,38771,38774,38775,38776,38779,38781,38783,38784,38793,38805,38806,38807,38809,38810,38814,38815,38818,38828,38830,38833,38834,38837,38838,38840,38841,38842,38844,38846,38847,38849,38852,38853,38855,38857,38858,38860,38861,38862,38864,38865,38868,38871,38872,38873,38877,38878,38880,38875,38881,38884,38895,38897,38900,38903,38904,38906,38919,38922,38937,38925,38926,38932,38934,38940,38942,38944,38947,38950,38955,38958,38959,38960,38962,38963,38965,38949,38974,38980,38983,38986,38993,38994,38995,38998,38999,39001,39002,39010,39011,39013,39014,39018,39020,39083,39085,39086,39088,39092,39095,39096,39098,39099,39103,39106,39109,39112,39116,39137,39139,39141,39142,39143,39146,39155,39158,39170,39175,39176,39185,39189,39190,39191,39194,39195,39196,39199,39202,39206,39207,39211,39217,39218,39219,39220,39221,39225,39226,39227,39228,39232,39233,39238,39239,39240,39245,39246,39252,39256,39257,39259,39260,39262,39263,39264,39323,39325,39327,39334,39344,39345,39346,39349,39353,39354,39357,39359,39363,39369,39379,39380,39385,39386,39388,39390,39399,39402,39403,39404,39408,39412,39413,39417,39421,39422,39426,39427,39428,39435,39436,39440,39441,39446,39454,39456,39458,39459,39460,39463,39469,39470,39475,39477,39478,39480,39495,39489,39492,39498,39499,39500,39502,39505,39508,39510,39517,39594,39596,39598,39599,39602,39604,39605,39606,39609,39611,39614,39615,39617,39619,39622,39624,39630,39632,39634,39637,39638,39639,39643,39644,39648,39652,39653,39655,39657,39660,39666,39667,39669,39673,39674,39677,39679,39680,39681,39682,39683,39684,39685,39688,39689,39691,39692,39693,39694,39696,39698,39702,39705,39707,39708,39712,39718,39723,39725,39731,39732,39733,39735,39737,39738,39741,39752,39755,39756,39765,39766,39767,39771,39774,39777,39779,39781,39782,39784,39786,39787,39788,39789,39790,39795,39797,39799,39800,39801,39807,39808,39812,39813,39814,39815,39817,39818,39819,39821,39823,39824,39828,39834,39837,39838,39846,39847,39849,39852,39856,39857,39858,39863,39864,39867,39868,39870,39871,39873,39879,39880,39886,39888,39895,39896,39901,39903,39909,39911,39914,39915,39919,39923,39927,39928,39929,39930,39933,39935,39936,39938,39947,39951,39953,39958,39960,39961,39962,39964,39966,39970,39971,39974,39975,39976,39977,39978,39985,39989,39990,39991,39997,40001,40003,40004,40005,40009,40010,40014,40015,40016,40019,40020,40022,40024,40027,40029,40030,40031,40035,40041,40042,40028,40043,40040,40046,40048,40050,40053,40055,40059,40166,40178,40183,40185,40203,40194,40209,40215,40216,40220,40221,40222,40239,40240,40242,40243,40244,40250,40252,40261,40253,40258,40259,40263,40266,40275,40276,40287,40291,40290,40293,40297,40298,40299,40304,40310,40311,40315,40316,40318,40323,40324,40326,40330,40333,40334,40338,40339,40341,40342,40343,40344,40353,40362,40364,40366,40369,40373,40377,40380,40383,40387,40391,40393,40394,40404,40405,40406,40407,40410,40414,40415,40416,40421,40423,40425,40427,40430,40432,40435,40436,40446,40458,40450,40455,40462,40464,40465,40466,40469,40470,40473,40476,40477,40570,40571,40572,40576,40578,40579,40580,40581,40583,40590,40591,40598,40600,40603,40606,40612,40616,40620,40622,40623,40624,40627,40628,40629,40646,40648,40651,40661,40671,40676,40679,40684,40685,40686,40688,40689,40690,40693,40696,40703,40706,40707,40713,40719,40720,40721,40722,40724,40726,40727,40729,40730,40731,40735,40738,40742,40746,40747,40751,40753,40754,40756,40759,40761,40762,40764,40765,40767,40769,40771,40772,40773,40774,40775,40787,40789,40790,40791,40792,40794,40797,40798,40808,40809,40813,40814,40815,40816,40817,40819,40821,40826,40829,40847,40848,40849,40850,40852,40854,40855,40862,40865,40866,40867,40869,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null],\n  \"ibm866\":[1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,9617,9618,9619,9474,9508,9569,9570,9558,9557,9571,9553,9559,9565,9564,9563,9488,9492,9524,9516,9500,9472,9532,9566,9567,9562,9556,9577,9574,9568,9552,9580,9575,9576,9572,9573,9561,9560,9554,9555,9579,9578,9496,9484,9608,9604,9612,9616,9600,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1025,1105,1028,1108,1031,1111,1038,1118,176,8729,183,8730,8470,164,9632,160],\n  \"iso-8859-2\":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,728,321,164,317,346,167,168,352,350,356,377,173,381,379,176,261,731,322,180,318,347,711,184,353,351,357,378,733,382,380,340,193,194,258,196,313,262,199,268,201,280,203,282,205,206,270,272,323,327,211,212,336,214,215,344,366,218,368,220,221,354,223,341,225,226,259,228,314,263,231,269,233,281,235,283,237,238,271,273,324,328,243,244,337,246,247,345,367,250,369,252,253,355,729],\n  \"iso-8859-3\":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,294,728,163,164,null,292,167,168,304,350,286,308,173,null,379,176,295,178,179,180,181,293,183,184,305,351,287,309,189,null,380,192,193,194,null,196,266,264,199,200,201,202,203,204,205,206,207,null,209,210,211,212,288,214,215,284,217,218,219,220,364,348,223,224,225,226,null,228,267,265,231,232,233,234,235,236,237,238,239,null,241,242,243,244,289,246,247,285,249,250,251,252,365,349,729],\n  \"iso-8859-4\":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,312,342,164,296,315,167,168,352,274,290,358,173,381,175,176,261,731,343,180,297,316,711,184,353,275,291,359,330,382,331,256,193,194,195,196,197,198,302,268,201,280,203,278,205,206,298,272,325,332,310,212,213,214,215,216,370,218,219,220,360,362,223,257,225,226,227,228,229,230,303,269,233,281,235,279,237,238,299,273,326,333,311,244,245,246,247,248,371,250,251,252,361,363,729],\n  \"iso-8859-5\":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,173,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,8470,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,167,1118,1119],\n  \"iso-8859-6\":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,null,null,null,164,null,null,null,null,null,null,null,1548,173,null,null,null,null,null,null,null,null,null,null,null,null,null,1563,null,null,null,1567,null,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,null,null,null,null,null,1600,1601,1602,1603,1604,1605,1606,1607,1608,1609,1610,1611,1612,1613,1614,1615,1616,1617,1618,null,null,null,null,null,null,null,null,null,null,null,null,null],\n  \"iso-8859-7\":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,8216,8217,163,8364,8367,166,167,168,169,890,171,172,173,null,8213,176,177,178,179,900,901,902,183,904,905,906,187,908,189,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,null,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,null],\n  \"iso-8859-8\":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,null,162,163,164,165,166,167,168,169,215,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,247,187,188,189,190,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,8215,1488,1489,1490,1491,1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510,1511,1512,1513,1514,null,null,8206,8207,null],\n  \"iso-8859-10\":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,274,290,298,296,310,167,315,272,352,358,381,173,362,330,176,261,275,291,299,297,311,183,316,273,353,359,382,8213,363,331,256,193,194,195,196,197,198,302,268,201,280,203,278,205,206,207,208,325,332,211,212,213,214,360,216,370,218,219,220,221,222,223,257,225,226,227,228,229,230,303,269,233,281,235,279,237,238,239,240,326,333,243,244,245,246,361,248,371,250,251,252,253,254,312],\n  \"iso-8859-13\":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,8221,162,163,164,8222,166,167,216,169,342,171,172,173,174,198,176,177,178,179,8220,181,182,183,248,185,343,187,188,189,190,230,260,302,256,262,196,197,280,274,268,201,377,278,290,310,298,315,352,323,325,211,332,213,214,215,370,321,346,362,220,379,381,223,261,303,257,263,228,229,281,275,269,233,378,279,291,311,299,316,353,324,326,243,333,245,246,247,371,322,347,363,252,380,382,8217],\n  \"iso-8859-14\":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,7682,7683,163,266,267,7690,167,7808,169,7810,7691,7922,173,174,376,7710,7711,288,289,7744,7745,182,7766,7809,7767,7811,7776,7923,7812,7813,7777,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,372,209,210,211,212,213,214,7786,216,217,218,219,220,221,374,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,373,241,242,243,244,245,246,7787,248,249,250,251,252,253,375,255],\n  \"iso-8859-15\":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,8364,165,352,167,353,169,170,171,172,173,174,175,176,177,178,179,381,181,182,183,382,185,186,187,338,339,376,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255],\n  \"iso-8859-16\":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,261,321,8364,8222,352,167,353,169,536,171,377,173,378,379,176,177,268,322,381,8221,182,183,382,269,537,187,338,339,376,380,192,193,194,258,196,262,198,199,200,201,202,203,204,205,206,207,272,323,210,211,212,336,214,346,368,217,218,219,220,280,538,223,224,225,226,259,228,263,230,231,232,233,234,235,236,237,238,239,273,324,242,243,244,337,246,347,369,249,250,251,252,281,539,255],\n  \"koi8-r\":[9472,9474,9484,9488,9492,9496,9500,9508,9516,9524,9532,9600,9604,9608,9612,9616,9617,9618,9619,8992,9632,8729,8730,8776,8804,8805,160,8993,176,178,183,247,9552,9553,9554,1105,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566,9567,9568,9569,1025,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,169,1102,1072,1073,1094,1076,1077,1092,1075,1093,1080,1081,1082,1083,1084,1085,1086,1087,1103,1088,1089,1090,1091,1078,1074,1100,1099,1079,1096,1101,1097,1095,1098,1070,1040,1041,1062,1044,1045,1060,1043,1061,1048,1049,1050,1051,1052,1053,1054,1055,1071,1056,1057,1058,1059,1046,1042,1068,1067,1047,1064,1069,1065,1063,1066],\n  \"koi8-u\":[9472,9474,9484,9488,9492,9496,9500,9508,9516,9524,9532,9600,9604,9608,9612,9616,9617,9618,9619,8992,9632,8729,8730,8776,8804,8805,160,8993,176,178,183,247,9552,9553,9554,1105,1108,9556,1110,1111,9559,9560,9561,9562,9563,1169,1118,9566,9567,9568,9569,1025,1028,9571,1030,1031,9574,9575,9576,9577,9578,1168,1038,169,1102,1072,1073,1094,1076,1077,1092,1075,1093,1080,1081,1082,1083,1084,1085,1086,1087,1103,1088,1089,1090,1091,1078,1074,1100,1099,1079,1096,1101,1097,1095,1098,1070,1040,1041,1062,1044,1045,1060,1043,1061,1048,1049,1050,1051,1052,1053,1054,1055,1071,1056,1057,1058,1059,1046,1042,1068,1067,1047,1064,1069,1065,1063,1066],\n  \"macintosh\":[196,197,199,201,209,214,220,225,224,226,228,227,229,231,233,232,234,235,237,236,238,239,241,243,242,244,246,245,250,249,251,252,8224,176,162,163,167,8226,182,223,174,169,8482,180,168,8800,198,216,8734,177,8804,8805,165,181,8706,8721,8719,960,8747,170,186,937,230,248,191,161,172,8730,402,8776,8710,171,187,8230,160,192,195,213,338,339,8211,8212,8220,8221,8216,8217,247,9674,255,376,8260,8364,8249,8250,64257,64258,8225,183,8218,8222,8240,194,202,193,203,200,205,206,207,204,211,212,63743,210,218,219,217,305,710,732,175,728,729,730,184,733,731,711],\n  \"windows-874\":[8364,129,130,131,132,8230,134,135,136,137,138,139,140,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,152,153,154,155,156,157,158,159,160,3585,3586,3587,3588,3589,3590,3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,3604,3605,3606,3607,3608,3609,3610,3611,3612,3613,3614,3615,3616,3617,3618,3619,3620,3621,3622,3623,3624,3625,3626,3627,3628,3629,3630,3631,3632,3633,3634,3635,3636,3637,3638,3639,3640,3641,3642,null,null,null,null,3647,3648,3649,3650,3651,3652,3653,3654,3655,3656,3657,3658,3659,3660,3661,3662,3663,3664,3665,3666,3667,3668,3669,3670,3671,3672,3673,3674,3675,null,null,null,null],\n  \"windows-1250\":[8364,129,8218,131,8222,8230,8224,8225,136,8240,352,8249,346,356,381,377,144,8216,8217,8220,8221,8226,8211,8212,152,8482,353,8250,347,357,382,378,160,711,728,321,164,260,166,167,168,169,350,171,172,173,174,379,176,177,731,322,180,181,182,183,184,261,351,187,317,733,318,380,340,193,194,258,196,313,262,199,268,201,280,203,282,205,206,270,272,323,327,211,212,336,214,215,344,366,218,368,220,221,354,223,341,225,226,259,228,314,263,231,269,233,281,235,283,237,238,271,273,324,328,243,244,337,246,247,345,367,250,369,252,253,355,729],\n  \"windows-1251\":[1026,1027,8218,1107,8222,8230,8224,8225,8364,8240,1033,8249,1034,1036,1035,1039,1106,8216,8217,8220,8221,8226,8211,8212,152,8482,1113,8250,1114,1116,1115,1119,160,1038,1118,1032,164,1168,166,167,1025,169,1028,171,172,173,174,1031,176,177,1030,1110,1169,181,182,183,1105,8470,1108,187,1112,1029,1109,1111,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103],\n  \"windows-1252\":[8364,129,8218,402,8222,8230,8224,8225,710,8240,352,8249,338,141,381,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,353,8250,339,157,382,376,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255],\n  \"windows-1253\":[8364,129,8218,402,8222,8230,8224,8225,136,8240,138,8249,140,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,152,8482,154,8250,156,157,158,159,160,901,902,163,164,165,166,167,168,169,null,171,172,173,174,8213,176,177,178,179,900,181,182,183,904,905,906,187,908,189,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,null,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,null],\n  \"windows-1254\":[8364,129,8218,402,8222,8230,8224,8225,710,8240,352,8249,338,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,353,8250,339,157,158,376,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,286,209,210,211,212,213,214,215,216,217,218,219,220,304,350,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,287,241,242,243,244,245,246,247,248,249,250,251,252,305,351,255],\n  \"windows-1255\":[8364,129,8218,402,8222,8230,8224,8225,710,8240,138,8249,140,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,154,8250,156,157,158,159,160,161,162,163,8362,165,166,167,168,169,215,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,247,187,188,189,190,191,1456,1457,1458,1459,1460,1461,1462,1463,1464,1465,1466,1467,1468,1469,1470,1471,1472,1473,1474,1475,1520,1521,1522,1523,1524,null,null,null,null,null,null,null,1488,1489,1490,1491,1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510,1511,1512,1513,1514,null,null,8206,8207,null],\n  \"windows-1256\":[8364,1662,8218,402,8222,8230,8224,8225,710,8240,1657,8249,338,1670,1688,1672,1711,8216,8217,8220,8221,8226,8211,8212,1705,8482,1681,8250,339,8204,8205,1722,160,1548,162,163,164,165,166,167,168,169,1726,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,1563,187,188,189,190,1567,1729,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,215,1591,1592,1593,1594,1600,1601,1602,1603,224,1604,226,1605,1606,1607,1608,231,232,233,234,235,1609,1610,238,239,1611,1612,1613,1614,244,1615,1616,247,1617,249,1618,251,252,8206,8207,1746],\n  \"windows-1257\":[8364,129,8218,131,8222,8230,8224,8225,136,8240,138,8249,140,168,711,184,144,8216,8217,8220,8221,8226,8211,8212,152,8482,154,8250,156,175,731,159,160,null,162,163,164,null,166,167,216,169,342,171,172,173,174,198,176,177,178,179,180,181,182,183,248,185,343,187,188,189,190,230,260,302,256,262,196,197,280,274,268,201,377,278,290,310,298,315,352,323,325,211,332,213,214,215,370,321,346,362,220,379,381,223,261,303,257,263,228,229,281,275,269,233,378,279,291,311,299,316,353,324,326,243,333,245,246,247,371,322,347,363,252,380,382,729],\n  \"windows-1258\":[8364,129,8218,402,8222,8230,8224,8225,710,8240,138,8249,338,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,154,8250,339,157,158,376,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,258,196,197,198,199,200,201,202,203,768,205,206,207,272,209,777,211,212,416,214,215,216,217,218,219,220,431,771,223,224,225,226,259,228,229,230,231,232,233,234,235,769,237,238,239,273,241,803,243,244,417,246,247,248,249,250,251,252,432,8363,255],\n  \"x-mac-cyrillic\":[1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,8224,176,1168,163,167,8226,182,1030,174,169,8482,1026,1106,8800,1027,1107,8734,177,8804,8805,1110,181,1169,1032,1028,1108,1031,1111,1033,1113,1034,1114,1112,1029,172,8730,402,8776,8710,171,187,8230,160,1035,1115,1036,1116,1109,8211,8212,8220,8221,8216,8217,247,8222,1038,1118,1039,1119,8470,1025,1105,1103,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,8364]\n};\n\n// For strict environments where `this` inside the global scope\n// is `undefined`, take a pure object instead\n}(this || {}));","// This is free and unencumbered software released into the public domain.\n// See LICENSE.md for more information.\n\n/**\n * @fileoverview Global |this| required for resolving indexes in node.\n * @suppress {globalThis}\n */\n(function(global) {\n  'use strict';\n\n  // If we're in node require encoding-indexes and attach it to the global.\n  if (typeof module !== \"undefined\" && module.exports &&\n    !global[\"encoding-indexes\"]) {\n    global[\"encoding-indexes\"] =\n      require(\"./encoding-indexes.js\")[\"encoding-indexes\"];\n  }\n\n  //\n  // Utilities\n  //\n\n  /**\n   * @param {number} a The number to test.\n   * @param {number} min The minimum value in the range, inclusive.\n   * @param {number} max The maximum value in the range, inclusive.\n   * @return {boolean} True if a >= min and a <= max.\n   */\n  function inRange(a, min, max) {\n    return min <= a && a <= max;\n  }\n\n  /**\n   * @param {!Array.<*>} array The array to check.\n   * @param {*} item The item to look for in the array.\n   * @return {boolean} True if the item appears in the array.\n   */\n  function includes(array, item) {\n    return array.indexOf(item) !== -1;\n  }\n\n  var floor = Math.floor;\n\n  /**\n   * @param {*} o\n   * @return {Object}\n   */\n  function ToDictionary(o) {\n    if (o === undefined) return {};\n    if (o === Object(o)) return o;\n    throw TypeError('Could not convert argument to dictionary');\n  }\n\n  /**\n   * @param {string} string Input string of UTF-16 code units.\n   * @return {!Array.<number>} Code points.\n   */\n  function stringToCodePoints(string) {\n    // https://heycam.github.io/webidl/#dfn-obtain-unicode\n\n    // 1. Let S be the DOMString value.\n    var s = String(string);\n\n    // 2. Let n be the length of S.\n    var n = s.length;\n\n    // 3. Initialize i to 0.\n    var i = 0;\n\n    // 4. Initialize U to be an empty sequence of Unicode characters.\n    var u = [];\n\n    // 5. While i < n:\n    while (i < n) {\n\n      // 1. Let c be the code unit in S at index i.\n      var c = s.charCodeAt(i);\n\n      // 2. Depending on the value of c:\n\n      // c < 0xD800 or c > 0xDFFF\n      if (c < 0xD800 || c > 0xDFFF) {\n        // Append to U the Unicode character with code point c.\n        u.push(c);\n      }\n\n      // 0xDC00 ≤ c ≤ 0xDFFF\n      else if (0xDC00 <= c && c <= 0xDFFF) {\n        // Append to U a U+FFFD REPLACEMENT CHARACTER.\n        u.push(0xFFFD);\n      }\n\n      // 0xD800 ≤ c ≤ 0xDBFF\n      else if (0xD800 <= c && c <= 0xDBFF) {\n        // 1. If i = n−1, then append to U a U+FFFD REPLACEMENT\n        // CHARACTER.\n        if (i === n - 1) {\n          u.push(0xFFFD);\n        }\n        // 2. Otherwise, i < n−1:\n        else {\n          // 1. Let d be the code unit in S at index i+1.\n          var d = s.charCodeAt(i + 1);\n\n          // 2. If 0xDC00 ≤ d ≤ 0xDFFF, then:\n          if (0xDC00 <= d && d <= 0xDFFF) {\n            // 1. Let a be c & 0x3FF.\n            var a = c & 0x3FF;\n\n            // 2. Let b be d & 0x3FF.\n            var b = d & 0x3FF;\n\n            // 3. Append to U the Unicode character with code point\n            // 2^16+2^10*a+b.\n            u.push(0x10000 + (a << 10) + b);\n\n            // 4. Set i to i+1.\n            i += 1;\n          }\n\n          // 3. Otherwise, d < 0xDC00 or d > 0xDFFF. Append to U a\n          // U+FFFD REPLACEMENT CHARACTER.\n          else  {\n            u.push(0xFFFD);\n          }\n        }\n      }\n\n      // 3. Set i to i+1.\n      i += 1;\n    }\n\n    // 6. Return U.\n    return u;\n  }\n\n  /**\n   * @param {!Array.<number>} code_points Array of code points.\n   * @return {string} string String of UTF-16 code units.\n   */\n  function codePointsToString(code_points) {\n    var s = '';\n    for (var i = 0; i < code_points.length; ++i) {\n      var cp = code_points[i];\n      if (cp <= 0xFFFF) {\n        s += String.fromCharCode(cp);\n      } else {\n        cp -= 0x10000;\n        s += String.fromCharCode((cp >> 10) + 0xD800,\n                                 (cp & 0x3FF) + 0xDC00);\n      }\n    }\n    return s;\n  }\n\n\n  //\n  // Implementation of Encoding specification\n  // https://encoding.spec.whatwg.org/\n  //\n\n  //\n  // 4. Terminology\n  //\n\n  /**\n   * An ASCII byte is a byte in the range 0x00 to 0x7F, inclusive.\n   * @param {number} a The number to test.\n   * @return {boolean} True if a is in the range 0x00 to 0x7F, inclusive.\n   */\n  function isASCIIByte(a) {\n    return 0x00 <= a && a <= 0x7F;\n  }\n\n  /**\n   * An ASCII code point is a code point in the range U+0000 to\n   * U+007F, inclusive.\n   */\n  var isASCIICodePoint = isASCIIByte;\n\n\n  /**\n   * End-of-stream is a special token that signifies no more tokens\n   * are in the stream.\n   * @const\n   */ var end_of_stream = -1;\n\n  /**\n   * A stream represents an ordered sequence of tokens.\n   *\n   * @constructor\n   * @param {!(Array.<number>|Uint8Array)} tokens Array of tokens that provide\n   * the stream.\n   */\n  function Stream(tokens) {\n    /** @type {!Array.<number>} */\n    this.tokens = [].slice.call(tokens);\n    // Reversed as push/pop is more efficient than shift/unshift.\n    this.tokens.reverse();\n  }\n\n  Stream.prototype = {\n    /**\n     * @return {boolean} True if end-of-stream has been hit.\n     */\n    endOfStream: function() {\n      return !this.tokens.length;\n    },\n\n    /**\n     * When a token is read from a stream, the first token in the\n     * stream must be returned and subsequently removed, and\n     * end-of-stream must be returned otherwise.\n     *\n     * @return {number} Get the next token from the stream, or\n     * end_of_stream.\n     */\n     read: function() {\n      if (!this.tokens.length)\n        return end_of_stream;\n       return this.tokens.pop();\n     },\n\n    /**\n     * When one or more tokens are prepended to a stream, those tokens\n     * must be inserted, in given order, before the first token in the\n     * stream.\n     *\n     * @param {(number|!Array.<number>)} token The token(s) to prepend to the\n     * stream.\n     */\n    prepend: function(token) {\n      if (Array.isArray(token)) {\n        var tokens = /**@type {!Array.<number>}*/(token);\n        while (tokens.length)\n          this.tokens.push(tokens.pop());\n      } else {\n        this.tokens.push(token);\n      }\n    },\n\n    /**\n     * When one or more tokens are pushed to a stream, those tokens\n     * must be inserted, in given order, after the last token in the\n     * stream.\n     *\n     * @param {(number|!Array.<number>)} token The tokens(s) to push to the\n     * stream.\n     */\n    push: function(token) {\n      if (Array.isArray(token)) {\n        var tokens = /**@type {!Array.<number>}*/(token);\n        while (tokens.length)\n          this.tokens.unshift(tokens.shift());\n      } else {\n        this.tokens.unshift(token);\n      }\n    }\n  };\n\n  //\n  // 5. Encodings\n  //\n\n  // 5.1 Encoders and decoders\n\n  /** @const */\n  var finished = -1;\n\n  /**\n   * @param {boolean} fatal If true, decoding errors raise an exception.\n   * @param {number=} opt_code_point Override the standard fallback code point.\n   * @return {number} The code point to insert on a decoding error.\n   */\n  function decoderError(fatal, opt_code_point) {\n    if (fatal)\n      throw TypeError('Decoder error');\n    return opt_code_point || 0xFFFD;\n  }\n\n  /**\n   * @param {number} code_point The code point that could not be encoded.\n   * @return {number} Always throws, no value is actually returned.\n   */\n  function encoderError(code_point) {\n    throw TypeError('The code point ' + code_point + ' could not be encoded.');\n  }\n\n  /** @interface */\n  function Decoder() {}\n  Decoder.prototype = {\n    /**\n     * @param {Stream} stream The stream of bytes being decoded.\n     * @param {number} bite The next byte read from the stream.\n     * @return {?(number|!Array.<number>)} The next code point(s)\n     *     decoded, or null if not enough data exists in the input\n     *     stream to decode a complete code point, or |finished|.\n     */\n    handler: function(stream, bite) {}\n  };\n\n  /** @interface */\n  function Encoder() {}\n  Encoder.prototype = {\n    /**\n     * @param {Stream} stream The stream of code points being encoded.\n     * @param {number} code_point Next code point read from the stream.\n     * @return {(number|!Array.<number>)} Byte(s) to emit, or |finished|.\n     */\n    handler: function(stream, code_point) {}\n  };\n\n  // 5.2 Names and labels\n\n  // TODO: Define @typedef for Encoding: {name:string,labels:Array.<string>}\n  // https://github.com/google/closure-compiler/issues/247\n\n  /**\n   * @param {string} label The encoding label.\n   * @return {?{name:string,labels:Array.<string>}}\n   */\n  function getEncoding(label) {\n    // 1. Remove any leading and trailing ASCII whitespace from label.\n    label = String(label).trim().toLowerCase();\n\n    // 2. If label is an ASCII case-insensitive match for any of the\n    // labels listed in the table below, return the corresponding\n    // encoding, and failure otherwise.\n    if (Object.prototype.hasOwnProperty.call(label_to_encoding, label)) {\n      return label_to_encoding[label];\n    }\n    return null;\n  }\n\n  /**\n   * Encodings table: https://encoding.spec.whatwg.org/encodings.json\n   * @const\n   * @type {!Array.<{\n   *          heading: string,\n   *          encodings: Array.<{name:string,labels:Array.<string>}>\n   *        }>}\n   */\n  var encodings = [\n    {\n      \"encodings\": [\n        {\n          \"labels\": [\n            \"unicode-1-1-utf-8\",\n            \"utf-8\",\n            \"utf8\"\n          ],\n          \"name\": \"UTF-8\"\n        }\n      ],\n      \"heading\": \"The Encoding\"\n    },\n    {\n      \"encodings\": [\n        {\n          \"labels\": [\n            \"866\",\n            \"cp866\",\n            \"csibm866\",\n            \"ibm866\"\n          ],\n          \"name\": \"IBM866\"\n        },\n        {\n          \"labels\": [\n            \"csisolatin2\",\n            \"iso-8859-2\",\n            \"iso-ir-101\",\n            \"iso8859-2\",\n            \"iso88592\",\n            \"iso_8859-2\",\n            \"iso_8859-2:1987\",\n            \"l2\",\n            \"latin2\"\n          ],\n          \"name\": \"ISO-8859-2\"\n        },\n        {\n          \"labels\": [\n            \"csisolatin3\",\n            \"iso-8859-3\",\n            \"iso-ir-109\",\n            \"iso8859-3\",\n            \"iso88593\",\n            \"iso_8859-3\",\n            \"iso_8859-3:1988\",\n            \"l3\",\n            \"latin3\"\n          ],\n          \"name\": \"ISO-8859-3\"\n        },\n        {\n          \"labels\": [\n            \"csisolatin4\",\n            \"iso-8859-4\",\n            \"iso-ir-110\",\n            \"iso8859-4\",\n            \"iso88594\",\n            \"iso_8859-4\",\n            \"iso_8859-4:1988\",\n            \"l4\",\n            \"latin4\"\n          ],\n          \"name\": \"ISO-8859-4\"\n        },\n        {\n          \"labels\": [\n            \"csisolatincyrillic\",\n            \"cyrillic\",\n            \"iso-8859-5\",\n            \"iso-ir-144\",\n            \"iso8859-5\",\n            \"iso88595\",\n            \"iso_8859-5\",\n            \"iso_8859-5:1988\"\n          ],\n          \"name\": \"ISO-8859-5\"\n        },\n        {\n          \"labels\": [\n            \"arabic\",\n            \"asmo-708\",\n            \"csiso88596e\",\n            \"csiso88596i\",\n            \"csisolatinarabic\",\n            \"ecma-114\",\n            \"iso-8859-6\",\n            \"iso-8859-6-e\",\n            \"iso-8859-6-i\",\n            \"iso-ir-127\",\n            \"iso8859-6\",\n            \"iso88596\",\n            \"iso_8859-6\",\n            \"iso_8859-6:1987\"\n          ],\n          \"name\": \"ISO-8859-6\"\n        },\n        {\n          \"labels\": [\n            \"csisolatingreek\",\n            \"ecma-118\",\n            \"elot_928\",\n            \"greek\",\n            \"greek8\",\n            \"iso-8859-7\",\n            \"iso-ir-126\",\n            \"iso8859-7\",\n            \"iso88597\",\n            \"iso_8859-7\",\n            \"iso_8859-7:1987\",\n            \"sun_eu_greek\"\n          ],\n          \"name\": \"ISO-8859-7\"\n        },\n        {\n          \"labels\": [\n            \"csiso88598e\",\n            \"csisolatinhebrew\",\n            \"hebrew\",\n            \"iso-8859-8\",\n            \"iso-8859-8-e\",\n            \"iso-ir-138\",\n            \"iso8859-8\",\n            \"iso88598\",\n            \"iso_8859-8\",\n            \"iso_8859-8:1988\",\n            \"visual\"\n          ],\n          \"name\": \"ISO-8859-8\"\n        },\n        {\n          \"labels\": [\n            \"csiso88598i\",\n            \"iso-8859-8-i\",\n            \"logical\"\n          ],\n          \"name\": \"ISO-8859-8-I\"\n        },\n        {\n          \"labels\": [\n            \"csisolatin6\",\n            \"iso-8859-10\",\n            \"iso-ir-157\",\n            \"iso8859-10\",\n            \"iso885910\",\n            \"l6\",\n            \"latin6\"\n          ],\n          \"name\": \"ISO-8859-10\"\n        },\n        {\n          \"labels\": [\n            \"iso-8859-13\",\n            \"iso8859-13\",\n            \"iso885913\"\n          ],\n          \"name\": \"ISO-8859-13\"\n        },\n        {\n          \"labels\": [\n            \"iso-8859-14\",\n            \"iso8859-14\",\n            \"iso885914\"\n          ],\n          \"name\": \"ISO-8859-14\"\n        },\n        {\n          \"labels\": [\n            \"csisolatin9\",\n            \"iso-8859-15\",\n            \"iso8859-15\",\n            \"iso885915\",\n            \"iso_8859-15\",\n            \"l9\"\n          ],\n          \"name\": \"ISO-8859-15\"\n        },\n        {\n          \"labels\": [\n            \"iso-8859-16\"\n          ],\n          \"name\": \"ISO-8859-16\"\n        },\n        {\n          \"labels\": [\n            \"cskoi8r\",\n            \"koi\",\n            \"koi8\",\n            \"koi8-r\",\n            \"koi8_r\"\n          ],\n          \"name\": \"KOI8-R\"\n        },\n        {\n          \"labels\": [\n            \"koi8-ru\",\n            \"koi8-u\"\n          ],\n          \"name\": \"KOI8-U\"\n        },\n        {\n          \"labels\": [\n            \"csmacintosh\",\n            \"mac\",\n            \"macintosh\",\n            \"x-mac-roman\"\n          ],\n          \"name\": \"macintosh\"\n        },\n        {\n          \"labels\": [\n            \"dos-874\",\n            \"iso-8859-11\",\n            \"iso8859-11\",\n            \"iso885911\",\n            \"tis-620\",\n            \"windows-874\"\n          ],\n          \"name\": \"windows-874\"\n        },\n        {\n          \"labels\": [\n            \"cp1250\",\n            \"windows-1250\",\n            \"x-cp1250\"\n          ],\n          \"name\": \"windows-1250\"\n        },\n        {\n          \"labels\": [\n            \"cp1251\",\n            \"windows-1251\",\n            \"x-cp1251\"\n          ],\n          \"name\": \"windows-1251\"\n        },\n        {\n          \"labels\": [\n            \"ansi_x3.4-1968\",\n            \"ascii\",\n            \"cp1252\",\n            \"cp819\",\n            \"csisolatin1\",\n            \"ibm819\",\n            \"iso-8859-1\",\n            \"iso-ir-100\",\n            \"iso8859-1\",\n            \"iso88591\",\n            \"iso_8859-1\",\n            \"iso_8859-1:1987\",\n            \"l1\",\n            \"latin1\",\n            \"us-ascii\",\n            \"windows-1252\",\n            \"x-cp1252\"\n          ],\n          \"name\": \"windows-1252\"\n        },\n        {\n          \"labels\": [\n            \"cp1253\",\n            \"windows-1253\",\n            \"x-cp1253\"\n          ],\n          \"name\": \"windows-1253\"\n        },\n        {\n          \"labels\": [\n            \"cp1254\",\n            \"csisolatin5\",\n            \"iso-8859-9\",\n            \"iso-ir-148\",\n            \"iso8859-9\",\n            \"iso88599\",\n            \"iso_8859-9\",\n            \"iso_8859-9:1989\",\n            \"l5\",\n            \"latin5\",\n            \"windows-1254\",\n            \"x-cp1254\"\n          ],\n          \"name\": \"windows-1254\"\n        },\n        {\n          \"labels\": [\n            \"cp1255\",\n            \"windows-1255\",\n            \"x-cp1255\"\n          ],\n          \"name\": \"windows-1255\"\n        },\n        {\n          \"labels\": [\n            \"cp1256\",\n            \"windows-1256\",\n            \"x-cp1256\"\n          ],\n          \"name\": \"windows-1256\"\n        },\n        {\n          \"labels\": [\n            \"cp1257\",\n            \"windows-1257\",\n            \"x-cp1257\"\n          ],\n          \"name\": \"windows-1257\"\n        },\n        {\n          \"labels\": [\n            \"cp1258\",\n            \"windows-1258\",\n            \"x-cp1258\"\n          ],\n          \"name\": \"windows-1258\"\n        },\n        {\n          \"labels\": [\n            \"x-mac-cyrillic\",\n            \"x-mac-ukrainian\"\n          ],\n          \"name\": \"x-mac-cyrillic\"\n        }\n      ],\n      \"heading\": \"Legacy single-byte encodings\"\n    },\n    {\n      \"encodings\": [\n        {\n          \"labels\": [\n            \"chinese\",\n            \"csgb2312\",\n            \"csiso58gb231280\",\n            \"gb2312\",\n            \"gb_2312\",\n            \"gb_2312-80\",\n            \"gbk\",\n            \"iso-ir-58\",\n            \"x-gbk\"\n          ],\n          \"name\": \"GBK\"\n        },\n        {\n          \"labels\": [\n            \"gb18030\"\n          ],\n          \"name\": \"gb18030\"\n        }\n      ],\n      \"heading\": \"Legacy multi-byte Chinese (simplified) encodings\"\n    },\n    {\n      \"encodings\": [\n        {\n          \"labels\": [\n            \"big5\",\n            \"big5-hkscs\",\n            \"cn-big5\",\n            \"csbig5\",\n            \"x-x-big5\"\n          ],\n          \"name\": \"Big5\"\n        }\n      ],\n      \"heading\": \"Legacy multi-byte Chinese (traditional) encodings\"\n    },\n    {\n      \"encodings\": [\n        {\n          \"labels\": [\n            \"cseucpkdfmtjapanese\",\n            \"euc-jp\",\n            \"x-euc-jp\"\n          ],\n          \"name\": \"EUC-JP\"\n        },\n        {\n          \"labels\": [\n            \"csiso2022jp\",\n            \"iso-2022-jp\"\n          ],\n          \"name\": \"ISO-2022-JP\"\n        },\n        {\n          \"labels\": [\n            \"csshiftjis\",\n            \"ms932\",\n            \"ms_kanji\",\n            \"shift-jis\",\n            \"shift_jis\",\n            \"sjis\",\n            \"windows-31j\",\n            \"x-sjis\"\n          ],\n          \"name\": \"Shift_JIS\"\n        }\n      ],\n      \"heading\": \"Legacy multi-byte Japanese encodings\"\n    },\n    {\n      \"encodings\": [\n        {\n          \"labels\": [\n            \"cseuckr\",\n            \"csksc56011987\",\n            \"euc-kr\",\n            \"iso-ir-149\",\n            \"korean\",\n            \"ks_c_5601-1987\",\n            \"ks_c_5601-1989\",\n            \"ksc5601\",\n            \"ksc_5601\",\n            \"windows-949\"\n          ],\n          \"name\": \"EUC-KR\"\n        }\n      ],\n      \"heading\": \"Legacy multi-byte Korean encodings\"\n    },\n    {\n      \"encodings\": [\n        {\n          \"labels\": [\n            \"csiso2022kr\",\n            \"hz-gb-2312\",\n            \"iso-2022-cn\",\n            \"iso-2022-cn-ext\",\n            \"iso-2022-kr\"\n          ],\n          \"name\": \"replacement\"\n        },\n        {\n          \"labels\": [\n            \"utf-16be\"\n          ],\n          \"name\": \"UTF-16BE\"\n        },\n        {\n          \"labels\": [\n            \"utf-16\",\n            \"utf-16le\"\n          ],\n          \"name\": \"UTF-16LE\"\n        },\n        {\n          \"labels\": [\n            \"x-user-defined\"\n          ],\n          \"name\": \"x-user-defined\"\n        }\n      ],\n      \"heading\": \"Legacy miscellaneous encodings\"\n    }\n  ];\n\n  // Label to encoding registry.\n  /** @type {Object.<string,{name:string,labels:Array.<string>}>} */\n  var label_to_encoding = {};\n  encodings.forEach(function(category) {\n    category.encodings.forEach(function(encoding) {\n      encoding.labels.forEach(function(label) {\n        label_to_encoding[label] = encoding;\n      });\n    });\n  });\n\n  // Registry of of encoder/decoder factories, by encoding name.\n  /** @type {Object.<string, function({fatal:boolean}): Encoder>} */\n  var encoders = {};\n  /** @type {Object.<string, function({fatal:boolean}): Decoder>} */\n  var decoders = {};\n\n  //\n  // 6. Indexes\n  //\n\n  /**\n   * @param {number} pointer The |pointer| to search for.\n   * @param {(!Array.<?number>|undefined)} index The |index| to search within.\n   * @return {?number} The code point corresponding to |pointer| in |index|,\n   *     or null if |code point| is not in |index|.\n   */\n  function indexCodePointFor(pointer, index) {\n    if (!index) return null;\n    return index[pointer] || null;\n  }\n\n  /**\n   * @param {number} code_point The |code point| to search for.\n   * @param {!Array.<?number>} index The |index| to search within.\n   * @return {?number} The first pointer corresponding to |code point| in\n   *     |index|, or null if |code point| is not in |index|.\n   */\n  function indexPointerFor(code_point, index) {\n    var pointer = index.indexOf(code_point);\n    return pointer === -1 ? null : pointer;\n  }\n\n  /**\n   * @param {string} name Name of the index.\n   * @return {(!Array.<number>|!Array.<Array.<number>>)}\n   *  */\n  function index(name) {\n    if (!('encoding-indexes' in global)) {\n      throw Error(\"Indexes missing.\" +\n                  \" Did you forget to include encoding-indexes.js first?\");\n    }\n    return global['encoding-indexes'][name];\n  }\n\n  /**\n   * @param {number} pointer The |pointer| to search for in the gb18030 index.\n   * @return {?number} The code point corresponding to |pointer| in |index|,\n   *     or null if |code point| is not in the gb18030 index.\n   */\n  function indexGB18030RangesCodePointFor(pointer) {\n    // 1. If pointer is greater than 39419 and less than 189000, or\n    // pointer is greater than 1237575, return null.\n    if ((pointer > 39419 && pointer < 189000) || (pointer > 1237575))\n      return null;\n\n    // 2. If pointer is 7457, return code point U+E7C7.\n    if (pointer === 7457) return 0xE7C7;\n\n    // 3. Let offset be the last pointer in index gb18030 ranges that\n    // is equal to or less than pointer and let code point offset be\n    // its corresponding code point.\n    var offset = 0;\n    var code_point_offset = 0;\n    var idx = index('gb18030-ranges');\n    var i;\n    for (i = 0; i < idx.length; ++i) {\n      /** @type {!Array.<number>} */\n      var entry = idx[i];\n      if (entry[0] <= pointer) {\n        offset = entry[0];\n        code_point_offset = entry[1];\n      } else {\n        break;\n      }\n    }\n\n    // 4. Return a code point whose value is code point offset +\n    // pointer − offset.\n    return code_point_offset + pointer - offset;\n  }\n\n  /**\n   * @param {number} code_point The |code point| to locate in the gb18030 index.\n   * @return {number} The first pointer corresponding to |code point| in the\n   *     gb18030 index.\n   */\n  function indexGB18030RangesPointerFor(code_point) {\n    // 1. If code point is U+E7C7, return pointer 7457.\n    if (code_point === 0xE7C7) return 7457;\n\n    // 2. Let offset be the last code point in index gb18030 ranges\n    // that is equal to or less than code point and let pointer offset\n    // be its corresponding pointer.\n    var offset = 0;\n    var pointer_offset = 0;\n    var idx = index('gb18030-ranges');\n    var i;\n    for (i = 0; i < idx.length; ++i) {\n      /** @type {!Array.<number>} */\n      var entry = idx[i];\n      if (entry[1] <= code_point) {\n        offset = entry[1];\n        pointer_offset = entry[0];\n      } else {\n        break;\n      }\n    }\n\n    // 3. Return a pointer whose value is pointer offset + code point\n    // − offset.\n    return pointer_offset + code_point - offset;\n  }\n\n  /**\n   * @param {number} code_point The |code_point| to search for in the Shift_JIS\n   *     index.\n   * @return {?number} The code point corresponding to |pointer| in |index|,\n   *     or null if |code point| is not in the Shift_JIS index.\n   */\n  function indexShiftJISPointerFor(code_point) {\n    // 1. Let index be index jis0208 excluding all entries whose\n    // pointer is in the range 8272 to 8835, inclusive.\n    shift_jis_index = shift_jis_index ||\n      index('jis0208').map(function(code_point, pointer) {\n        return inRange(pointer, 8272, 8835) ? null : code_point;\n      });\n    var index_ = shift_jis_index;\n\n    // 2. Return the index pointer for code point in index.\n    return index_.indexOf(code_point);\n  }\n  var shift_jis_index;\n\n  /**\n   * @param {number} code_point The |code_point| to search for in the big5\n   *     index.\n   * @return {?number} The code point corresponding to |pointer| in |index|,\n   *     or null if |code point| is not in the big5 index.\n   */\n  function indexBig5PointerFor(code_point) {\n    // 1. Let index be index Big5 excluding all entries whose pointer\n    big5_index_no_hkscs = big5_index_no_hkscs ||\n      index('big5').map(function(code_point, pointer) {\n        return (pointer < (0xA1 - 0x81) * 157) ? null : code_point;\n      });\n    var index_ = big5_index_no_hkscs;\n\n    // 2. If code point is U+2550, U+255E, U+2561, U+256A, U+5341, or\n    // U+5345, return the last pointer corresponding to code point in\n    // index.\n    if (code_point === 0x2550 || code_point === 0x255E ||\n        code_point === 0x2561 || code_point === 0x256A ||\n        code_point === 0x5341 || code_point === 0x5345) {\n      return index_.lastIndexOf(code_point);\n    }\n\n    // 3. Return the index pointer for code point in index.\n    return indexPointerFor(code_point, index_);\n  }\n  var big5_index_no_hkscs;\n\n  //\n  // 8. API\n  //\n\n  /** @const */ var DEFAULT_ENCODING = 'utf-8';\n\n  // 8.1 Interface TextDecoder\n\n  /**\n   * @constructor\n   * @param {string=} label The label of the encoding;\n   *     defaults to 'utf-8'.\n   * @param {Object=} options\n   */\n  function TextDecoder(label, options) {\n    // Web IDL conventions\n    if (!(this instanceof TextDecoder))\n      throw TypeError('Called as a function. Did you forget \\'new\\'?');\n    label = label !== undefined ? String(label) : DEFAULT_ENCODING;\n    options = ToDictionary(options);\n\n    // A TextDecoder object has an associated encoding, decoder,\n    // stream, ignore BOM flag (initially unset), BOM seen flag\n    // (initially unset), error mode (initially replacement), and do\n    // not flush flag (initially unset).\n\n    /** @private */\n    this._encoding = null;\n    /** @private @type {?Decoder} */\n    this._decoder = null;\n    /** @private @type {boolean} */\n    this._ignoreBOM = false;\n    /** @private @type {boolean} */\n    this._BOMseen = false;\n    /** @private @type {string} */\n    this._error_mode = 'replacement';\n    /** @private @type {boolean} */\n    this._do_not_flush = false;\n\n\n    // 1. Let encoding be the result of getting an encoding from\n    // label.\n    var encoding = getEncoding(label);\n\n    // 2. If encoding is failure or replacement, throw a RangeError.\n    if (encoding === null || encoding.name === 'replacement')\n      throw RangeError('Unknown encoding: ' + label);\n    if (!decoders[encoding.name]) {\n      throw Error('Decoder not present.' +\n                  ' Did you forget to include encoding-indexes.js first?');\n    }\n\n    // 3. Let dec be a new TextDecoder object.\n    var dec = this;\n\n    // 4. Set dec's encoding to encoding.\n    dec._encoding = encoding;\n\n    // 5. If options's fatal member is true, set dec's error mode to\n    // fatal.\n    if (Boolean(options['fatal']))\n      dec._error_mode = 'fatal';\n\n    // 6. If options's ignoreBOM member is true, set dec's ignore BOM\n    // flag.\n    if (Boolean(options['ignoreBOM']))\n      dec._ignoreBOM = true;\n\n    // For pre-ES5 runtimes:\n    if (!Object.defineProperty) {\n      this.encoding = dec._encoding.name.toLowerCase();\n      this.fatal = dec._error_mode === 'fatal';\n      this.ignoreBOM = dec._ignoreBOM;\n    }\n\n    // 7. Return dec.\n    return dec;\n  }\n\n  if (Object.defineProperty) {\n    // The encoding attribute's getter must return encoding's name.\n    Object.defineProperty(TextDecoder.prototype, 'encoding', {\n      /** @this {TextDecoder} */\n      get: function() { return this._encoding.name.toLowerCase(); }\n    });\n\n    // The fatal attribute's getter must return true if error mode\n    // is fatal, and false otherwise.\n    Object.defineProperty(TextDecoder.prototype, 'fatal', {\n      /** @this {TextDecoder} */\n      get: function() { return this._error_mode === 'fatal'; }\n    });\n\n    // The ignoreBOM attribute's getter must return true if ignore\n    // BOM flag is set, and false otherwise.\n    Object.defineProperty(TextDecoder.prototype, 'ignoreBOM', {\n      /** @this {TextDecoder} */\n      get: function() { return this._ignoreBOM; }\n    });\n  }\n\n  /**\n   * @param {BufferSource=} input The buffer of bytes to decode.\n   * @param {Object=} options\n   * @return {string} The decoded string.\n   */\n  TextDecoder.prototype.decode = function decode(input, options) {\n    var bytes;\n    if (typeof input === 'object' && input instanceof ArrayBuffer) {\n      bytes = new Uint8Array(input);\n    } else if (typeof input === 'object' && 'buffer' in input &&\n               input.buffer instanceof ArrayBuffer) {\n      bytes = new Uint8Array(input.buffer,\n                             input.byteOffset,\n                             input.byteLength);\n    } else {\n      bytes = new Uint8Array(0);\n    }\n\n    options = ToDictionary(options);\n\n    // 1. If the do not flush flag is unset, set decoder to a new\n    // encoding's decoder, set stream to a new stream, and unset the\n    // BOM seen flag.\n    if (!this._do_not_flush) {\n      this._decoder = decoders[this._encoding.name]({\n        fatal: this._error_mode === 'fatal'});\n      this._BOMseen = false;\n    }\n\n    // 2. If options's stream is true, set the do not flush flag, and\n    // unset the do not flush flag otherwise.\n    this._do_not_flush = Boolean(options['stream']);\n\n    // 3. If input is given, push a copy of input to stream.\n    // TODO: Align with spec algorithm - maintain stream on instance.\n    var input_stream = new Stream(bytes);\n\n    // 4. Let output be a new stream.\n    var output = [];\n\n    /** @type {?(number|!Array.<number>)} */\n    var result;\n\n    // 5. While true:\n    while (true) {\n      // 1. Let token be the result of reading from stream.\n      var token = input_stream.read();\n\n      // 2. If token is end-of-stream and the do not flush flag is\n      // set, return output, serialized.\n      // TODO: Align with spec algorithm.\n      if (token === end_of_stream)\n        break;\n\n      // 3. Otherwise, run these subsubsteps:\n\n      // 1. Let result be the result of processing token for decoder,\n      // stream, output, and error mode.\n      result = this._decoder.handler(input_stream, token);\n\n      // 2. If result is finished, return output, serialized.\n      if (result === finished)\n        break;\n\n      if (result !== null) {\n        if (Array.isArray(result))\n          output.push.apply(output, /**@type {!Array.<number>}*/(result));\n        else\n          output.push(result);\n      }\n\n      // 3. Otherwise, if result is error, throw a TypeError.\n      // (Thrown in handler)\n\n      // 4. Otherwise, do nothing.\n    }\n    // TODO: Align with spec algorithm.\n    if (!this._do_not_flush) {\n      do {\n        result = this._decoder.handler(input_stream, input_stream.read());\n        if (result === finished)\n          break;\n        if (result === null)\n          continue;\n        if (Array.isArray(result))\n          output.push.apply(output, /**@type {!Array.<number>}*/(result));\n        else\n          output.push(result);\n      } while (!input_stream.endOfStream());\n      this._decoder = null;\n    }\n\n    // A TextDecoder object also has an associated serialize stream\n    // algorithm...\n    /**\n     * @param {!Array.<number>} stream\n     * @return {string}\n     * @this {TextDecoder}\n     */\n    function serializeStream(stream) {\n      // 1. Let token be the result of reading from stream.\n      // (Done in-place on array, rather than as a stream)\n\n      // 2. If encoding is UTF-8, UTF-16BE, or UTF-16LE, and ignore\n      // BOM flag and BOM seen flag are unset, run these subsubsteps:\n      if (includes(['UTF-8', 'UTF-16LE', 'UTF-16BE'], this._encoding.name) &&\n          !this._ignoreBOM && !this._BOMseen) {\n        if (stream.length > 0 && stream[0] === 0xFEFF) {\n          // 1. If token is U+FEFF, set BOM seen flag.\n          this._BOMseen = true;\n          stream.shift();\n        } else if (stream.length > 0) {\n          // 2. Otherwise, if token is not end-of-stream, set BOM seen\n          // flag and append token to stream.\n          this._BOMseen = true;\n        } else {\n          // 3. Otherwise, if token is not end-of-stream, append token\n          // to output.\n          // (no-op)\n        }\n      }\n      // 4. Otherwise, return output.\n      return codePointsToString(stream);\n    }\n\n    return serializeStream.call(this, output);\n  };\n\n  // 8.2 Interface TextEncoder\n\n  /**\n   * @constructor\n   * @param {string=} label The label of the encoding. NONSTANDARD.\n   * @param {Object=} options NONSTANDARD.\n   */\n  function TextEncoder(label, options) {\n    // Web IDL conventions\n    if (!(this instanceof TextEncoder))\n      throw TypeError('Called as a function. Did you forget \\'new\\'?');\n    options = ToDictionary(options);\n\n    // A TextEncoder object has an associated encoding and encoder.\n\n    /** @private */\n    this._encoding = null;\n    /** @private @type {?Encoder} */\n    this._encoder = null;\n\n    // Non-standard\n    /** @private @type {boolean} */\n    this._do_not_flush = false;\n    /** @private @type {string} */\n    this._fatal = Boolean(options['fatal']) ? 'fatal' : 'replacement';\n\n    // 1. Let enc be a new TextEncoder object.\n    var enc = this;\n\n    // 2. Set enc's encoding to UTF-8's encoder.\n    if (Boolean(options['NONSTANDARD_allowLegacyEncoding'])) {\n      // NONSTANDARD behavior.\n      label = label !== undefined ? String(label) : DEFAULT_ENCODING;\n      var encoding = getEncoding(label);\n      if (encoding === null || encoding.name === 'replacement')\n        throw RangeError('Unknown encoding: ' + label);\n      if (!encoders[encoding.name]) {\n        throw Error('Encoder not present.' +\n                    ' Did you forget to include encoding-indexes.js first?');\n      }\n      enc._encoding = encoding;\n    } else {\n      // Standard behavior.\n      enc._encoding = getEncoding('utf-8');\n\n      if (label !== undefined && 'console' in global) {\n        console.warn('TextEncoder constructor called with encoding label, '\n                     + 'which is ignored.');\n      }\n    }\n\n    // For pre-ES5 runtimes:\n    if (!Object.defineProperty)\n      this.encoding = enc._encoding.name.toLowerCase();\n\n    // 3. Return enc.\n    return enc;\n  }\n\n  if (Object.defineProperty) {\n    // The encoding attribute's getter must return encoding's name.\n    Object.defineProperty(TextEncoder.prototype, 'encoding', {\n      /** @this {TextEncoder} */\n      get: function() { return this._encoding.name.toLowerCase(); }\n    });\n  }\n\n  /**\n   * @param {string=} opt_string The string to encode.\n   * @param {Object=} options\n   * @return {!Uint8Array} Encoded bytes, as a Uint8Array.\n   */\n  TextEncoder.prototype.encode = function encode(opt_string, options) {\n    opt_string = opt_string === undefined ? '' : String(opt_string);\n    options = ToDictionary(options);\n\n    // NOTE: This option is nonstandard. None of the encodings\n    // permitted for encoding (i.e. UTF-8, UTF-16) are stateful when\n    // the input is a USVString so streaming is not necessary.\n    if (!this._do_not_flush)\n      this._encoder = encoders[this._encoding.name]({\n        fatal: this._fatal === 'fatal'});\n    this._do_not_flush = Boolean(options['stream']);\n\n    // 1. Convert input to a stream.\n    var input = new Stream(stringToCodePoints(opt_string));\n\n    // 2. Let output be a new stream\n    var output = [];\n\n    /** @type {?(number|!Array.<number>)} */\n    var result;\n    // 3. While true, run these substeps:\n    while (true) {\n      // 1. Let token be the result of reading from input.\n      var token = input.read();\n      if (token === end_of_stream)\n        break;\n      // 2. Let result be the result of processing token for encoder,\n      // input, output.\n      result = this._encoder.handler(input, token);\n      if (result === finished)\n        break;\n      if (Array.isArray(result))\n        output.push.apply(output, /**@type {!Array.<number>}*/(result));\n      else\n        output.push(result);\n    }\n    // TODO: Align with spec algorithm.\n    if (!this._do_not_flush) {\n      while (true) {\n        result = this._encoder.handler(input, input.read());\n        if (result === finished)\n          break;\n        if (Array.isArray(result))\n          output.push.apply(output, /**@type {!Array.<number>}*/(result));\n        else\n          output.push(result);\n      }\n      this._encoder = null;\n    }\n    // 3. If result is finished, convert output into a byte sequence,\n    // and then return a Uint8Array object wrapping an ArrayBuffer\n    // containing output.\n    return new Uint8Array(output);\n  };\n\n\n  //\n  // 9. The encoding\n  //\n\n  // 9.1 utf-8\n\n  // 9.1.1 utf-8 decoder\n  /**\n   * @constructor\n   * @implements {Decoder}\n   * @param {{fatal: boolean}} options\n   */\n  function UTF8Decoder(options) {\n    var fatal = options.fatal;\n\n    // utf-8's decoder's has an associated utf-8 code point, utf-8\n    // bytes seen, and utf-8 bytes needed (all initially 0), a utf-8\n    // lower boundary (initially 0x80), and a utf-8 upper boundary\n    // (initially 0xBF).\n    var /** @type {number} */ utf8_code_point = 0,\n        /** @type {number} */ utf8_bytes_seen = 0,\n        /** @type {number} */ utf8_bytes_needed = 0,\n        /** @type {number} */ utf8_lower_boundary = 0x80,\n        /** @type {number} */ utf8_upper_boundary = 0xBF;\n\n    /**\n     * @param {Stream} stream The stream of bytes being decoded.\n     * @param {number} bite The next byte read from the stream.\n     * @return {?(number|!Array.<number>)} The next code point(s)\n     *     decoded, or null if not enough data exists in the input\n     *     stream to decode a complete code point.\n     */\n    this.handler = function(stream, bite) {\n      // 1. If byte is end-of-stream and utf-8 bytes needed is not 0,\n      // set utf-8 bytes needed to 0 and return error.\n      if (bite === end_of_stream && utf8_bytes_needed !== 0) {\n        utf8_bytes_needed = 0;\n        return decoderError(fatal);\n      }\n\n      // 2. If byte is end-of-stream, return finished.\n      if (bite === end_of_stream)\n        return finished;\n\n      // 3. If utf-8 bytes needed is 0, based on byte:\n      if (utf8_bytes_needed === 0) {\n\n        // 0x00 to 0x7F\n        if (inRange(bite, 0x00, 0x7F)) {\n          // Return a code point whose value is byte.\n          return bite;\n        }\n\n        // 0xC2 to 0xDF\n        else if (inRange(bite, 0xC2, 0xDF)) {\n          // 1. Set utf-8 bytes needed to 1.\n          utf8_bytes_needed = 1;\n\n          // 2. Set UTF-8 code point to byte & 0x1F.\n          utf8_code_point = bite & 0x1F;\n        }\n\n        // 0xE0 to 0xEF\n        else if (inRange(bite, 0xE0, 0xEF)) {\n          // 1. If byte is 0xE0, set utf-8 lower boundary to 0xA0.\n          if (bite === 0xE0)\n            utf8_lower_boundary = 0xA0;\n          // 2. If byte is 0xED, set utf-8 upper boundary to 0x9F.\n          if (bite === 0xED)\n            utf8_upper_boundary = 0x9F;\n          // 3. Set utf-8 bytes needed to 2.\n          utf8_bytes_needed = 2;\n          // 4. Set UTF-8 code point to byte & 0xF.\n          utf8_code_point = bite & 0xF;\n        }\n\n        // 0xF0 to 0xF4\n        else if (inRange(bite, 0xF0, 0xF4)) {\n          // 1. If byte is 0xF0, set utf-8 lower boundary to 0x90.\n          if (bite === 0xF0)\n            utf8_lower_boundary = 0x90;\n          // 2. If byte is 0xF4, set utf-8 upper boundary to 0x8F.\n          if (bite === 0xF4)\n            utf8_upper_boundary = 0x8F;\n          // 3. Set utf-8 bytes needed to 3.\n          utf8_bytes_needed = 3;\n          // 4. Set UTF-8 code point to byte & 0x7.\n          utf8_code_point = bite & 0x7;\n        }\n\n        // Otherwise\n        else {\n          // Return error.\n          return decoderError(fatal);\n        }\n\n        // Return continue.\n        return null;\n      }\n\n      // 4. If byte is not in the range utf-8 lower boundary to utf-8\n      // upper boundary, inclusive, run these substeps:\n      if (!inRange(bite, utf8_lower_boundary, utf8_upper_boundary)) {\n\n        // 1. Set utf-8 code point, utf-8 bytes needed, and utf-8\n        // bytes seen to 0, set utf-8 lower boundary to 0x80, and set\n        // utf-8 upper boundary to 0xBF.\n        utf8_code_point = utf8_bytes_needed = utf8_bytes_seen = 0;\n        utf8_lower_boundary = 0x80;\n        utf8_upper_boundary = 0xBF;\n\n        // 2. Prepend byte to stream.\n        stream.prepend(bite);\n\n        // 3. Return error.\n        return decoderError(fatal);\n      }\n\n      // 5. Set utf-8 lower boundary to 0x80 and utf-8 upper boundary\n      // to 0xBF.\n      utf8_lower_boundary = 0x80;\n      utf8_upper_boundary = 0xBF;\n\n      // 6. Set UTF-8 code point to (UTF-8 code point << 6) | (byte &\n      // 0x3F)\n      utf8_code_point = (utf8_code_point << 6) | (bite & 0x3F);\n\n      // 7. Increase utf-8 bytes seen by one.\n      utf8_bytes_seen += 1;\n\n      // 8. If utf-8 bytes seen is not equal to utf-8 bytes needed,\n      // continue.\n      if (utf8_bytes_seen !== utf8_bytes_needed)\n        return null;\n\n      // 9. Let code point be utf-8 code point.\n      var code_point = utf8_code_point;\n\n      // 10. Set utf-8 code point, utf-8 bytes needed, and utf-8 bytes\n      // seen to 0.\n      utf8_code_point = utf8_bytes_needed = utf8_bytes_seen = 0;\n\n      // 11. Return a code point whose value is code point.\n      return code_point;\n    };\n  }\n\n  // 9.1.2 utf-8 encoder\n  /**\n   * @constructor\n   * @implements {Encoder}\n   * @param {{fatal: boolean}} options\n   */\n  function UTF8Encoder(options) {\n    var fatal = options.fatal;\n    /**\n     * @param {Stream} stream Input stream.\n     * @param {number} code_point Next code point read from the stream.\n     * @return {(number|!Array.<number>)} Byte(s) to emit.\n     */\n    this.handler = function(stream, code_point) {\n      // 1. If code point is end-of-stream, return finished.\n      if (code_point === end_of_stream)\n        return finished;\n\n      // 2. If code point is an ASCII code point, return a byte whose\n      // value is code point.\n      if (isASCIICodePoint(code_point))\n        return code_point;\n\n      // 3. Set count and offset based on the range code point is in:\n      var count, offset;\n      // U+0080 to U+07FF, inclusive:\n      if (inRange(code_point, 0x0080, 0x07FF)) {\n        // 1 and 0xC0\n        count = 1;\n        offset = 0xC0;\n      }\n      // U+0800 to U+FFFF, inclusive:\n      else if (inRange(code_point, 0x0800, 0xFFFF)) {\n        // 2 and 0xE0\n        count = 2;\n        offset = 0xE0;\n      }\n      // U+10000 to U+10FFFF, inclusive:\n      else if (inRange(code_point, 0x10000, 0x10FFFF)) {\n        // 3 and 0xF0\n        count = 3;\n        offset = 0xF0;\n      }\n\n      // 4. Let bytes be a byte sequence whose first byte is (code\n      // point >> (6 × count)) + offset.\n      var bytes = [(code_point >> (6 * count)) + offset];\n\n      // 5. Run these substeps while count is greater than 0:\n      while (count > 0) {\n\n        // 1. Set temp to code point >> (6 × (count − 1)).\n        var temp = code_point >> (6 * (count - 1));\n\n        // 2. Append to bytes 0x80 | (temp & 0x3F).\n        bytes.push(0x80 | (temp & 0x3F));\n\n        // 3. Decrease count by one.\n        count -= 1;\n      }\n\n      // 6. Return bytes bytes, in order.\n      return bytes;\n    };\n  }\n\n  /** @param {{fatal: boolean}} options */\n  encoders['UTF-8'] = function(options) {\n    return new UTF8Encoder(options);\n  };\n  /** @param {{fatal: boolean}} options */\n  decoders['UTF-8'] = function(options) {\n    return new UTF8Decoder(options);\n  };\n\n  //\n  // 10. Legacy single-byte encodings\n  //\n\n  // 10.1 single-byte decoder\n  /**\n   * @constructor\n   * @implements {Decoder}\n   * @param {!Array.<number>} index The encoding index.\n   * @param {{fatal: boolean}} options\n   */\n  function SingleByteDecoder(index, options) {\n    var fatal = options.fatal;\n    /**\n     * @param {Stream} stream The stream of bytes being decoded.\n     * @param {number} bite The next byte read from the stream.\n     * @return {?(number|!Array.<number>)} The next code point(s)\n     *     decoded, or null if not enough data exists in the input\n     *     stream to decode a complete code point.\n     */\n    this.handler = function(stream, bite) {\n      // 1. If byte is end-of-stream, return finished.\n      if (bite === end_of_stream)\n        return finished;\n\n      // 2. If byte is an ASCII byte, return a code point whose value\n      // is byte.\n      if (isASCIIByte(bite))\n        return bite;\n\n      // 3. Let code point be the index code point for byte − 0x80 in\n      // index single-byte.\n      var code_point = index[bite - 0x80];\n\n      // 4. If code point is null, return error.\n      if (code_point === null)\n        return decoderError(fatal);\n\n      // 5. Return a code point whose value is code point.\n      return code_point;\n    };\n  }\n\n  // 10.2 single-byte encoder\n  /**\n   * @constructor\n   * @implements {Encoder}\n   * @param {!Array.<?number>} index The encoding index.\n   * @param {{fatal: boolean}} options\n   */\n  function SingleByteEncoder(index, options) {\n    var fatal = options.fatal;\n    /**\n     * @param {Stream} stream Input stream.\n     * @param {number} code_point Next code point read from the stream.\n     * @return {(number|!Array.<number>)} Byte(s) to emit.\n     */\n    this.handler = function(stream, code_point) {\n      // 1. If code point is end-of-stream, return finished.\n      if (code_point === end_of_stream)\n        return finished;\n\n      // 2. If code point is an ASCII code point, return a byte whose\n      // value is code point.\n      if (isASCIICodePoint(code_point))\n        return code_point;\n\n      // 3. Let pointer be the index pointer for code point in index\n      // single-byte.\n      var pointer = indexPointerFor(code_point, index);\n\n      // 4. If pointer is null, return error with code point.\n      if (pointer === null)\n        encoderError(code_point);\n\n      // 5. Return a byte whose value is pointer + 0x80.\n      return pointer + 0x80;\n    };\n  }\n\n  (function() {\n    if (!('encoding-indexes' in global))\n      return;\n    encodings.forEach(function(category) {\n      if (category.heading !== 'Legacy single-byte encodings')\n        return;\n      category.encodings.forEach(function(encoding) {\n        var name = encoding.name;\n        var idx = index(name.toLowerCase());\n        /** @param {{fatal: boolean}} options */\n        decoders[name] = function(options) {\n          return new SingleByteDecoder(idx, options);\n        };\n        /** @param {{fatal: boolean}} options */\n        encoders[name] = function(options) {\n          return new SingleByteEncoder(idx, options);\n        };\n      });\n    });\n  }());\n\n  //\n  // 11. Legacy multi-byte Chinese (simplified) encodings\n  //\n\n  // 11.1 gbk\n\n  // 11.1.1 gbk decoder\n  // gbk's decoder is gb18030's decoder.\n  /** @param {{fatal: boolean}} options */\n  decoders['GBK'] = function(options) {\n    return new GB18030Decoder(options);\n  };\n\n  // 11.1.2 gbk encoder\n  // gbk's encoder is gb18030's encoder with its gbk flag set.\n  /** @param {{fatal: boolean}} options */\n  encoders['GBK'] = function(options) {\n    return new GB18030Encoder(options, true);\n  };\n\n  // 11.2 gb18030\n\n  // 11.2.1 gb18030 decoder\n  /**\n   * @constructor\n   * @implements {Decoder}\n   * @param {{fatal: boolean}} options\n   */\n  function GB18030Decoder(options) {\n    var fatal = options.fatal;\n    // gb18030's decoder has an associated gb18030 first, gb18030\n    // second, and gb18030 third (all initially 0x00).\n    var /** @type {number} */ gb18030_first = 0x00,\n        /** @type {number} */ gb18030_second = 0x00,\n        /** @type {number} */ gb18030_third = 0x00;\n    /**\n     * @param {Stream} stream The stream of bytes being decoded.\n     * @param {number} bite The next byte read from the stream.\n     * @return {?(number|!Array.<number>)} The next code point(s)\n     *     decoded, or null if not enough data exists in the input\n     *     stream to decode a complete code point.\n     */\n    this.handler = function(stream, bite) {\n      // 1. If byte is end-of-stream and gb18030 first, gb18030\n      // second, and gb18030 third are 0x00, return finished.\n      if (bite === end_of_stream && gb18030_first === 0x00 &&\n          gb18030_second === 0x00 && gb18030_third === 0x00) {\n        return finished;\n      }\n      // 2. If byte is end-of-stream, and gb18030 first, gb18030\n      // second, or gb18030 third is not 0x00, set gb18030 first,\n      // gb18030 second, and gb18030 third to 0x00, and return error.\n      if (bite === end_of_stream &&\n          (gb18030_first !== 0x00 || gb18030_second !== 0x00 ||\n           gb18030_third !== 0x00)) {\n        gb18030_first = 0x00;\n        gb18030_second = 0x00;\n        gb18030_third = 0x00;\n        decoderError(fatal);\n      }\n      var code_point;\n      // 3. If gb18030 third is not 0x00, run these substeps:\n      if (gb18030_third !== 0x00) {\n        // 1. Let code point be null.\n        code_point = null;\n        // 2. If byte is in the range 0x30 to 0x39, inclusive, set\n        // code point to the index gb18030 ranges code point for\n        // (((gb18030 first − 0x81) × 10 + gb18030 second − 0x30) ×\n        // 126 + gb18030 third − 0x81) × 10 + byte − 0x30.\n        if (inRange(bite, 0x30, 0x39)) {\n          code_point = indexGB18030RangesCodePointFor(\n              (((gb18030_first - 0x81) * 10 + gb18030_second - 0x30) * 126 +\n               gb18030_third - 0x81) * 10 + bite - 0x30);\n        }\n\n        // 3. Let buffer be a byte sequence consisting of gb18030\n        // second, gb18030 third, and byte, in order.\n        var buffer = [gb18030_second, gb18030_third, bite];\n\n        // 4. Set gb18030 first, gb18030 second, and gb18030 third to\n        // 0x00.\n        gb18030_first = 0x00;\n        gb18030_second = 0x00;\n        gb18030_third = 0x00;\n\n        // 5. If code point is null, prepend buffer to stream and\n        // return error.\n        if (code_point === null) {\n          stream.prepend(buffer);\n          return decoderError(fatal);\n        }\n\n        // 6. Return a code point whose value is code point.\n        return code_point;\n      }\n\n      // 4. If gb18030 second is not 0x00, run these substeps:\n      if (gb18030_second !== 0x00) {\n\n        // 1. If byte is in the range 0x81 to 0xFE, inclusive, set\n        // gb18030 third to byte and return continue.\n        if (inRange(bite, 0x81, 0xFE)) {\n          gb18030_third = bite;\n          return null;\n        }\n\n        // 2. Prepend gb18030 second followed by byte to stream, set\n        // gb18030 first and gb18030 second to 0x00, and return error.\n        stream.prepend([gb18030_second, bite]);\n        gb18030_first = 0x00;\n        gb18030_second = 0x00;\n        return decoderError(fatal);\n      }\n\n      // 5. If gb18030 first is not 0x00, run these substeps:\n      if (gb18030_first !== 0x00) {\n\n        // 1. If byte is in the range 0x30 to 0x39, inclusive, set\n        // gb18030 second to byte and return continue.\n        if (inRange(bite, 0x30, 0x39)) {\n          gb18030_second = bite;\n          return null;\n        }\n\n        // 2. Let lead be gb18030 first, let pointer be null, and set\n        // gb18030 first to 0x00.\n        var lead = gb18030_first;\n        var pointer = null;\n        gb18030_first = 0x00;\n\n        // 3. Let offset be 0x40 if byte is less than 0x7F and 0x41\n        // otherwise.\n        var offset = bite < 0x7F ? 0x40 : 0x41;\n\n        // 4. If byte is in the range 0x40 to 0x7E, inclusive, or 0x80\n        // to 0xFE, inclusive, set pointer to (lead − 0x81) × 190 +\n        // (byte − offset).\n        if (inRange(bite, 0x40, 0x7E) || inRange(bite, 0x80, 0xFE))\n          pointer = (lead - 0x81) * 190 + (bite - offset);\n\n        // 5. Let code point be null if pointer is null and the index\n        // code point for pointer in index gb18030 otherwise.\n        code_point = pointer === null ? null :\n            indexCodePointFor(pointer, index('gb18030'));\n\n        // 6. If code point is null and byte is an ASCII byte, prepend\n        // byte to stream.\n        if (code_point === null && isASCIIByte(bite))\n          stream.prepend(bite);\n\n        // 7. If code point is null, return error.\n        if (code_point === null)\n          return decoderError(fatal);\n\n        // 8. Return a code point whose value is code point.\n        return code_point;\n      }\n\n      // 6. If byte is an ASCII byte, return a code point whose value\n      // is byte.\n      if (isASCIIByte(bite))\n        return bite;\n\n      // 7. If byte is 0x80, return code point U+20AC.\n      if (bite === 0x80)\n        return 0x20AC;\n\n      // 8. If byte is in the range 0x81 to 0xFE, inclusive, set\n      // gb18030 first to byte and return continue.\n      if (inRange(bite, 0x81, 0xFE)) {\n        gb18030_first = bite;\n        return null;\n      }\n\n      // 9. Return error.\n      return decoderError(fatal);\n    };\n  }\n\n  // 11.2.2 gb18030 encoder\n  /**\n   * @constructor\n   * @implements {Encoder}\n   * @param {{fatal: boolean}} options\n   * @param {boolean=} gbk_flag\n   */\n  function GB18030Encoder(options, gbk_flag) {\n    var fatal = options.fatal;\n    // gb18030's decoder has an associated gbk flag (initially unset).\n    /**\n     * @param {Stream} stream Input stream.\n     * @param {number} code_point Next code point read from the stream.\n     * @return {(number|!Array.<number>)} Byte(s) to emit.\n     */\n    this.handler = function(stream, code_point) {\n      // 1. If code point is end-of-stream, return finished.\n      if (code_point === end_of_stream)\n        return finished;\n\n      // 2. If code point is an ASCII code point, return a byte whose\n      // value is code point.\n      if (isASCIICodePoint(code_point))\n        return code_point;\n\n      // 3. If code point is U+E5E5, return error with code point.\n      if (code_point === 0xE5E5)\n        return encoderError(code_point);\n\n      // 4. If the gbk flag is set and code point is U+20AC, return\n      // byte 0x80.\n      if (gbk_flag && code_point === 0x20AC)\n        return 0x80;\n\n      // 5. Let pointer be the index pointer for code point in index\n      // gb18030.\n      var pointer = indexPointerFor(code_point, index('gb18030'));\n\n      // 6. If pointer is not null, run these substeps:\n      if (pointer !== null) {\n\n        // 1. Let lead be floor(pointer / 190) + 0x81.\n        var lead = floor(pointer / 190) + 0x81;\n\n        // 2. Let trail be pointer % 190.\n        var trail = pointer % 190;\n\n        // 3. Let offset be 0x40 if trail is less than 0x3F and 0x41 otherwise.\n        var offset = trail < 0x3F ? 0x40 : 0x41;\n\n        // 4. Return two bytes whose values are lead and trail + offset.\n        return [lead, trail + offset];\n      }\n\n      // 7. If gbk flag is set, return error with code point.\n      if (gbk_flag)\n        return encoderError(code_point);\n\n      // 8. Set pointer to the index gb18030 ranges pointer for code\n      // point.\n      pointer = indexGB18030RangesPointerFor(code_point);\n\n      // 9. Let byte1 be floor(pointer / 10 / 126 / 10).\n      var byte1 = floor(pointer / 10 / 126 / 10);\n\n      // 10. Set pointer to pointer − byte1 × 10 × 126 × 10.\n      pointer = pointer - byte1 * 10 * 126 * 10;\n\n      // 11. Let byte2 be floor(pointer / 10 / 126).\n      var byte2 = floor(pointer / 10 / 126);\n\n      // 12. Set pointer to pointer − byte2 × 10 × 126.\n      pointer = pointer - byte2 * 10 * 126;\n\n      // 13. Let byte3 be floor(pointer / 10).\n      var byte3 = floor(pointer / 10);\n\n      // 14. Let byte4 be pointer − byte3 × 10.\n      var byte4 = pointer - byte3 * 10;\n\n      // 15. Return four bytes whose values are byte1 + 0x81, byte2 +\n      // 0x30, byte3 + 0x81, byte4 + 0x30.\n      return [byte1 + 0x81,\n              byte2 + 0x30,\n              byte3 + 0x81,\n              byte4 + 0x30];\n    };\n  }\n\n  /** @param {{fatal: boolean}} options */\n  encoders['gb18030'] = function(options) {\n    return new GB18030Encoder(options);\n  };\n  /** @param {{fatal: boolean}} options */\n  decoders['gb18030'] = function(options) {\n    return new GB18030Decoder(options);\n  };\n\n\n  //\n  // 12. Legacy multi-byte Chinese (traditional) encodings\n  //\n\n  // 12.1 Big5\n\n  // 12.1.1 Big5 decoder\n  /**\n   * @constructor\n   * @implements {Decoder}\n   * @param {{fatal: boolean}} options\n   */\n  function Big5Decoder(options) {\n    var fatal = options.fatal;\n    // Big5's decoder has an associated Big5 lead (initially 0x00).\n    var /** @type {number} */ Big5_lead = 0x00;\n\n    /**\n     * @param {Stream} stream The stream of bytes being decoded.\n     * @param {number} bite The next byte read from the stream.\n     * @return {?(number|!Array.<number>)} The next code point(s)\n     *     decoded, or null if not enough data exists in the input\n     *     stream to decode a complete code point.\n     */\n    this.handler = function(stream, bite) {\n      // 1. If byte is end-of-stream and Big5 lead is not 0x00, set\n      // Big5 lead to 0x00 and return error.\n      if (bite === end_of_stream && Big5_lead !== 0x00) {\n        Big5_lead = 0x00;\n        return decoderError(fatal);\n      }\n\n      // 2. If byte is end-of-stream and Big5 lead is 0x00, return\n      // finished.\n      if (bite === end_of_stream && Big5_lead === 0x00)\n        return finished;\n\n      // 3. If Big5 lead is not 0x00, let lead be Big5 lead, let\n      // pointer be null, set Big5 lead to 0x00, and then run these\n      // substeps:\n      if (Big5_lead !== 0x00) {\n        var lead = Big5_lead;\n        var pointer = null;\n        Big5_lead = 0x00;\n\n        // 1. Let offset be 0x40 if byte is less than 0x7F and 0x62\n        // otherwise.\n        var offset = bite < 0x7F ? 0x40 : 0x62;\n\n        // 2. If byte is in the range 0x40 to 0x7E, inclusive, or 0xA1\n        // to 0xFE, inclusive, set pointer to (lead − 0x81) × 157 +\n        // (byte − offset).\n        if (inRange(bite, 0x40, 0x7E) || inRange(bite, 0xA1, 0xFE))\n          pointer = (lead - 0x81) * 157 + (bite - offset);\n\n        // 3. If there is a row in the table below whose first column\n        // is pointer, return the two code points listed in its second\n        // column\n        // Pointer | Code points\n        // --------+--------------\n        // 1133    | U+00CA U+0304\n        // 1135    | U+00CA U+030C\n        // 1164    | U+00EA U+0304\n        // 1166    | U+00EA U+030C\n        switch (pointer) {\n          case 1133: return [0x00CA, 0x0304];\n          case 1135: return [0x00CA, 0x030C];\n          case 1164: return [0x00EA, 0x0304];\n          case 1166: return [0x00EA, 0x030C];\n        }\n\n        // 4. Let code point be null if pointer is null and the index\n        // code point for pointer in index Big5 otherwise.\n        var code_point = (pointer === null) ? null :\n            indexCodePointFor(pointer, index('big5'));\n\n        // 5. If code point is null and byte is an ASCII byte, prepend\n        // byte to stream.\n        if (code_point === null && isASCIIByte(bite))\n          stream.prepend(bite);\n\n        // 6. If code point is null, return error.\n        if (code_point === null)\n          return decoderError(fatal);\n\n        // 7. Return a code point whose value is code point.\n        return code_point;\n      }\n\n      // 4. If byte is an ASCII byte, return a code point whose value\n      // is byte.\n      if (isASCIIByte(bite))\n        return bite;\n\n      // 5. If byte is in the range 0x81 to 0xFE, inclusive, set Big5\n      // lead to byte and return continue.\n      if (inRange(bite, 0x81, 0xFE)) {\n        Big5_lead = bite;\n        return null;\n      }\n\n      // 6. Return error.\n      return decoderError(fatal);\n    };\n  }\n\n  // 12.1.2 Big5 encoder\n  /**\n   * @constructor\n   * @implements {Encoder}\n   * @param {{fatal: boolean}} options\n   */\n  function Big5Encoder(options) {\n    var fatal = options.fatal;\n    /**\n     * @param {Stream} stream Input stream.\n     * @param {number} code_point Next code point read from the stream.\n     * @return {(number|!Array.<number>)} Byte(s) to emit.\n     */\n    this.handler = function(stream, code_point) {\n      // 1. If code point is end-of-stream, return finished.\n      if (code_point === end_of_stream)\n        return finished;\n\n      // 2. If code point is an ASCII code point, return a byte whose\n      // value is code point.\n      if (isASCIICodePoint(code_point))\n        return code_point;\n\n      // 3. Let pointer be the index Big5 pointer for code point.\n      var pointer = indexBig5PointerFor(code_point);\n\n      // 4. If pointer is null, return error with code point.\n      if (pointer === null)\n        return encoderError(code_point);\n\n      // 5. Let lead be floor(pointer / 157) + 0x81.\n      var lead = floor(pointer / 157) + 0x81;\n\n      // 6. If lead is less than 0xA1, return error with code point.\n      if (lead < 0xA1)\n        return encoderError(code_point);\n\n      // 7. Let trail be pointer % 157.\n      var trail = pointer % 157;\n\n      // 8. Let offset be 0x40 if trail is less than 0x3F and 0x62\n      // otherwise.\n      var offset = trail < 0x3F ? 0x40 : 0x62;\n\n      // Return two bytes whose values are lead and trail + offset.\n      return [lead, trail + offset];\n    };\n  }\n\n  /** @param {{fatal: boolean}} options */\n  encoders['Big5'] = function(options) {\n    return new Big5Encoder(options);\n  };\n  /** @param {{fatal: boolean}} options */\n  decoders['Big5'] = function(options) {\n    return new Big5Decoder(options);\n  };\n\n\n  //\n  // 13. Legacy multi-byte Japanese encodings\n  //\n\n  // 13.1 euc-jp\n\n  // 13.1.1 euc-jp decoder\n  /**\n   * @constructor\n   * @implements {Decoder}\n   * @param {{fatal: boolean}} options\n   */\n  function EUCJPDecoder(options) {\n    var fatal = options.fatal;\n\n    // euc-jp's decoder has an associated euc-jp jis0212 flag\n    // (initially unset) and euc-jp lead (initially 0x00).\n    var /** @type {boolean} */ eucjp_jis0212_flag = false,\n        /** @type {number} */ eucjp_lead = 0x00;\n\n    /**\n     * @param {Stream} stream The stream of bytes being decoded.\n     * @param {number} bite The next byte read from the stream.\n     * @return {?(number|!Array.<number>)} The next code point(s)\n     *     decoded, or null if not enough data exists in the input\n     *     stream to decode a complete code point.\n     */\n    this.handler = function(stream, bite) {\n      // 1. If byte is end-of-stream and euc-jp lead is not 0x00, set\n      // euc-jp lead to 0x00, and return error.\n      if (bite === end_of_stream && eucjp_lead !== 0x00) {\n        eucjp_lead = 0x00;\n        return decoderError(fatal);\n      }\n\n      // 2. If byte is end-of-stream and euc-jp lead is 0x00, return\n      // finished.\n      if (bite === end_of_stream && eucjp_lead === 0x00)\n        return finished;\n\n      // 3. If euc-jp lead is 0x8E and byte is in the range 0xA1 to\n      // 0xDF, inclusive, set euc-jp lead to 0x00 and return a code\n      // point whose value is 0xFF61 − 0xA1 + byte.\n      if (eucjp_lead === 0x8E && inRange(bite, 0xA1, 0xDF)) {\n        eucjp_lead = 0x00;\n        return 0xFF61 - 0xA1 + bite;\n      }\n\n      // 4. If euc-jp lead is 0x8F and byte is in the range 0xA1 to\n      // 0xFE, inclusive, set the euc-jp jis0212 flag, set euc-jp lead\n      // to byte, and return continue.\n      if (eucjp_lead === 0x8F && inRange(bite, 0xA1, 0xFE)) {\n        eucjp_jis0212_flag = true;\n        eucjp_lead = bite;\n        return null;\n      }\n\n      // 5. If euc-jp lead is not 0x00, let lead be euc-jp lead, set\n      // euc-jp lead to 0x00, and run these substeps:\n      if (eucjp_lead !== 0x00) {\n        var lead = eucjp_lead;\n        eucjp_lead = 0x00;\n\n        // 1. Let code point be null.\n        var code_point = null;\n\n        // 2. If lead and byte are both in the range 0xA1 to 0xFE,\n        // inclusive, set code point to the index code point for (lead\n        // − 0xA1) × 94 + byte − 0xA1 in index jis0208 if the euc-jp\n        // jis0212 flag is unset and in index jis0212 otherwise.\n        if (inRange(lead, 0xA1, 0xFE) && inRange(bite, 0xA1, 0xFE)) {\n          code_point = indexCodePointFor(\n            (lead - 0xA1) * 94 + (bite - 0xA1),\n            index(!eucjp_jis0212_flag ? 'jis0208' : 'jis0212'));\n        }\n\n        // 3. Unset the euc-jp jis0212 flag.\n        eucjp_jis0212_flag = false;\n\n        // 4. If byte is not in the range 0xA1 to 0xFE, inclusive,\n        // prepend byte to stream.\n        if (!inRange(bite, 0xA1, 0xFE))\n          stream.prepend(bite);\n\n        // 5. If code point is null, return error.\n        if (code_point === null)\n          return decoderError(fatal);\n\n        // 6. Return a code point whose value is code point.\n        return code_point;\n      }\n\n      // 6. If byte is an ASCII byte, return a code point whose value\n      // is byte.\n      if (isASCIIByte(bite))\n        return bite;\n\n      // 7. If byte is 0x8E, 0x8F, or in the range 0xA1 to 0xFE,\n      // inclusive, set euc-jp lead to byte and return continue.\n      if (bite === 0x8E || bite === 0x8F || inRange(bite, 0xA1, 0xFE)) {\n        eucjp_lead = bite;\n        return null;\n      }\n\n      // 8. Return error.\n      return decoderError(fatal);\n    };\n  }\n\n  // 13.1.2 euc-jp encoder\n  /**\n   * @constructor\n   * @implements {Encoder}\n   * @param {{fatal: boolean}} options\n   */\n  function EUCJPEncoder(options) {\n    var fatal = options.fatal;\n    /**\n     * @param {Stream} stream Input stream.\n     * @param {number} code_point Next code point read from the stream.\n     * @return {(number|!Array.<number>)} Byte(s) to emit.\n     */\n    this.handler = function(stream, code_point) {\n      // 1. If code point is end-of-stream, return finished.\n      if (code_point === end_of_stream)\n        return finished;\n\n      // 2. If code point is an ASCII code point, return a byte whose\n      // value is code point.\n      if (isASCIICodePoint(code_point))\n        return code_point;\n\n      // 3. If code point is U+00A5, return byte 0x5C.\n      if (code_point === 0x00A5)\n        return 0x5C;\n\n      // 4. If code point is U+203E, return byte 0x7E.\n      if (code_point === 0x203E)\n        return 0x7E;\n\n      // 5. If code point is in the range U+FF61 to U+FF9F, inclusive,\n      // return two bytes whose values are 0x8E and code point −\n      // 0xFF61 + 0xA1.\n      if (inRange(code_point, 0xFF61, 0xFF9F))\n        return [0x8E, code_point - 0xFF61 + 0xA1];\n\n      // 6. If code point is U+2212, set it to U+FF0D.\n      if (code_point === 0x2212)\n        code_point = 0xFF0D;\n\n      // 7. Let pointer be the index pointer for code point in index\n      // jis0208.\n      var pointer = indexPointerFor(code_point, index('jis0208'));\n\n      // 8. If pointer is null, return error with code point.\n      if (pointer === null)\n        return encoderError(code_point);\n\n      // 9. Let lead be floor(pointer / 94) + 0xA1.\n      var lead = floor(pointer / 94) + 0xA1;\n\n      // 10. Let trail be pointer % 94 + 0xA1.\n      var trail = pointer % 94 + 0xA1;\n\n      // 11. Return two bytes whose values are lead and trail.\n      return [lead, trail];\n    };\n  }\n\n  /** @param {{fatal: boolean}} options */\n  encoders['EUC-JP'] = function(options) {\n    return new EUCJPEncoder(options);\n  };\n  /** @param {{fatal: boolean}} options */\n  decoders['EUC-JP'] = function(options) {\n    return new EUCJPDecoder(options);\n  };\n\n  // 13.2 iso-2022-jp\n\n  // 13.2.1 iso-2022-jp decoder\n  /**\n   * @constructor\n   * @implements {Decoder}\n   * @param {{fatal: boolean}} options\n   */\n  function ISO2022JPDecoder(options) {\n    var fatal = options.fatal;\n    /** @enum */\n    var states = {\n      ASCII: 0,\n      Roman: 1,\n      Katakana: 2,\n      LeadByte: 3,\n      TrailByte: 4,\n      EscapeStart: 5,\n      Escape: 6\n    };\n    // iso-2022-jp's decoder has an associated iso-2022-jp decoder\n    // state (initially ASCII), iso-2022-jp decoder output state\n    // (initially ASCII), iso-2022-jp lead (initially 0x00), and\n    // iso-2022-jp output flag (initially unset).\n    var /** @type {number} */ iso2022jp_decoder_state = states.ASCII,\n        /** @type {number} */ iso2022jp_decoder_output_state = states.ASCII,\n        /** @type {number} */ iso2022jp_lead = 0x00,\n        /** @type {boolean} */ iso2022jp_output_flag = false;\n    /**\n     * @param {Stream} stream The stream of bytes being decoded.\n     * @param {number} bite The next byte read from the stream.\n     * @return {?(number|!Array.<number>)} The next code point(s)\n     *     decoded, or null if not enough data exists in the input\n     *     stream to decode a complete code point.\n     */\n    this.handler = function(stream, bite) {\n      // switching on iso-2022-jp decoder state:\n      switch (iso2022jp_decoder_state) {\n      default:\n      case states.ASCII:\n        // ASCII\n        // Based on byte:\n\n        // 0x1B\n        if (bite === 0x1B) {\n          // Set iso-2022-jp decoder state to escape start and return\n          // continue.\n          iso2022jp_decoder_state = states.EscapeStart;\n          return null;\n        }\n\n        // 0x00 to 0x7F, excluding 0x0E, 0x0F, and 0x1B\n        if (inRange(bite, 0x00, 0x7F) && bite !== 0x0E\n            && bite !== 0x0F && bite !== 0x1B) {\n          // Unset the iso-2022-jp output flag and return a code point\n          // whose value is byte.\n          iso2022jp_output_flag = false;\n          return bite;\n        }\n\n        // end-of-stream\n        if (bite === end_of_stream) {\n          // Return finished.\n          return finished;\n        }\n\n        // Otherwise\n        // Unset the iso-2022-jp output flag and return error.\n        iso2022jp_output_flag = false;\n        return decoderError(fatal);\n\n      case states.Roman:\n        // Roman\n        // Based on byte:\n\n        // 0x1B\n        if (bite === 0x1B) {\n          // Set iso-2022-jp decoder state to escape start and return\n          // continue.\n          iso2022jp_decoder_state = states.EscapeStart;\n          return null;\n        }\n\n        // 0x5C\n        if (bite === 0x5C) {\n          // Unset the iso-2022-jp output flag and return code point\n          // U+00A5.\n          iso2022jp_output_flag = false;\n          return 0x00A5;\n        }\n\n        // 0x7E\n        if (bite === 0x7E) {\n          // Unset the iso-2022-jp output flag and return code point\n          // U+203E.\n          iso2022jp_output_flag = false;\n          return 0x203E;\n        }\n\n        // 0x00 to 0x7F, excluding 0x0E, 0x0F, 0x1B, 0x5C, and 0x7E\n        if (inRange(bite, 0x00, 0x7F) && bite !== 0x0E && bite !== 0x0F\n            && bite !== 0x1B && bite !== 0x5C && bite !== 0x7E) {\n          // Unset the iso-2022-jp output flag and return a code point\n          // whose value is byte.\n          iso2022jp_output_flag = false;\n          return bite;\n        }\n\n        // end-of-stream\n        if (bite === end_of_stream) {\n          // Return finished.\n          return finished;\n        }\n\n        // Otherwise\n        // Unset the iso-2022-jp output flag and return error.\n        iso2022jp_output_flag = false;\n        return decoderError(fatal);\n\n      case states.Katakana:\n        // Katakana\n        // Based on byte:\n\n        // 0x1B\n        if (bite === 0x1B) {\n          // Set iso-2022-jp decoder state to escape start and return\n          // continue.\n          iso2022jp_decoder_state = states.EscapeStart;\n          return null;\n        }\n\n        // 0x21 to 0x5F\n        if (inRange(bite, 0x21, 0x5F)) {\n          // Unset the iso-2022-jp output flag and return a code point\n          // whose value is 0xFF61 − 0x21 + byte.\n          iso2022jp_output_flag = false;\n          return 0xFF61 - 0x21 + bite;\n        }\n\n        // end-of-stream\n        if (bite === end_of_stream) {\n          // Return finished.\n          return finished;\n        }\n\n        // Otherwise\n        // Unset the iso-2022-jp output flag and return error.\n        iso2022jp_output_flag = false;\n        return decoderError(fatal);\n\n      case states.LeadByte:\n        // Lead byte\n        // Based on byte:\n\n        // 0x1B\n        if (bite === 0x1B) {\n          // Set iso-2022-jp decoder state to escape start and return\n          // continue.\n          iso2022jp_decoder_state = states.EscapeStart;\n          return null;\n        }\n\n        // 0x21 to 0x7E\n        if (inRange(bite, 0x21, 0x7E)) {\n          // Unset the iso-2022-jp output flag, set iso-2022-jp lead\n          // to byte, iso-2022-jp decoder state to trail byte, and\n          // return continue.\n          iso2022jp_output_flag = false;\n          iso2022jp_lead = bite;\n          iso2022jp_decoder_state = states.TrailByte;\n          return null;\n        }\n\n        // end-of-stream\n        if (bite === end_of_stream) {\n          // Return finished.\n          return finished;\n        }\n\n        // Otherwise\n        // Unset the iso-2022-jp output flag and return error.\n        iso2022jp_output_flag = false;\n        return decoderError(fatal);\n\n      case states.TrailByte:\n        // Trail byte\n        // Based on byte:\n\n        // 0x1B\n        if (bite === 0x1B) {\n          // Set iso-2022-jp decoder state to escape start and return\n          // continue.\n          iso2022jp_decoder_state = states.EscapeStart;\n          return decoderError(fatal);\n        }\n\n        // 0x21 to 0x7E\n        if (inRange(bite, 0x21, 0x7E)) {\n          // 1. Set the iso-2022-jp decoder state to lead byte.\n          iso2022jp_decoder_state = states.LeadByte;\n\n          // 2. Let pointer be (iso-2022-jp lead − 0x21) × 94 + byte − 0x21.\n          var pointer = (iso2022jp_lead - 0x21) * 94 + bite - 0x21;\n\n          // 3. Let code point be the index code point for pointer in\n          // index jis0208.\n          var code_point = indexCodePointFor(pointer, index('jis0208'));\n\n          // 4. If code point is null, return error.\n          if (code_point === null)\n            return decoderError(fatal);\n\n          // 5. Return a code point whose value is code point.\n          return code_point;\n        }\n\n        // end-of-stream\n        if (bite === end_of_stream) {\n          // Set the iso-2022-jp decoder state to lead byte, prepend\n          // byte to stream, and return error.\n          iso2022jp_decoder_state = states.LeadByte;\n          stream.prepend(bite);\n          return decoderError(fatal);\n        }\n\n        // Otherwise\n        // Set iso-2022-jp decoder state to lead byte and return\n        // error.\n        iso2022jp_decoder_state = states.LeadByte;\n        return decoderError(fatal);\n\n      case states.EscapeStart:\n        // Escape start\n\n        // 1. If byte is either 0x24 or 0x28, set iso-2022-jp lead to\n        // byte, iso-2022-jp decoder state to escape, and return\n        // continue.\n        if (bite === 0x24 || bite === 0x28) {\n          iso2022jp_lead = bite;\n          iso2022jp_decoder_state = states.Escape;\n          return null;\n        }\n\n        // 2. Prepend byte to stream.\n        stream.prepend(bite);\n\n        // 3. Unset the iso-2022-jp output flag, set iso-2022-jp\n        // decoder state to iso-2022-jp decoder output state, and\n        // return error.\n        iso2022jp_output_flag = false;\n        iso2022jp_decoder_state = iso2022jp_decoder_output_state;\n        return decoderError(fatal);\n\n      case states.Escape:\n        // Escape\n\n        // 1. Let lead be iso-2022-jp lead and set iso-2022-jp lead to\n        // 0x00.\n        var lead = iso2022jp_lead;\n        iso2022jp_lead = 0x00;\n\n        // 2. Let state be null.\n        var state = null;\n\n        // 3. If lead is 0x28 and byte is 0x42, set state to ASCII.\n        if (lead === 0x28 && bite === 0x42)\n          state = states.ASCII;\n\n        // 4. If lead is 0x28 and byte is 0x4A, set state to Roman.\n        if (lead === 0x28 && bite === 0x4A)\n          state = states.Roman;\n\n        // 5. If lead is 0x28 and byte is 0x49, set state to Katakana.\n        if (lead === 0x28 && bite === 0x49)\n          state = states.Katakana;\n\n        // 6. If lead is 0x24 and byte is either 0x40 or 0x42, set\n        // state to lead byte.\n        if (lead === 0x24 && (bite === 0x40 || bite === 0x42))\n          state = states.LeadByte;\n\n        // 7. If state is non-null, run these substeps:\n        if (state !== null) {\n          // 1. Set iso-2022-jp decoder state and iso-2022-jp decoder\n          // output state to states.\n          iso2022jp_decoder_state = iso2022jp_decoder_state = state;\n\n          // 2. Let output flag be the iso-2022-jp output flag.\n          var output_flag = iso2022jp_output_flag;\n\n          // 3. Set the iso-2022-jp output flag.\n          iso2022jp_output_flag = true;\n\n          // 4. Return continue, if output flag is unset, and error\n          // otherwise.\n          return !output_flag ? null : decoderError(fatal);\n        }\n\n        // 8. Prepend lead and byte to stream.\n        stream.prepend([lead, bite]);\n\n        // 9. Unset the iso-2022-jp output flag, set iso-2022-jp\n        // decoder state to iso-2022-jp decoder output state and\n        // return error.\n        iso2022jp_output_flag = false;\n        iso2022jp_decoder_state = iso2022jp_decoder_output_state;\n        return decoderError(fatal);\n      }\n    };\n  }\n\n  // 13.2.2 iso-2022-jp encoder\n  /**\n   * @constructor\n   * @implements {Encoder}\n   * @param {{fatal: boolean}} options\n   */\n  function ISO2022JPEncoder(options) {\n    var fatal = options.fatal;\n    // iso-2022-jp's encoder has an associated iso-2022-jp encoder\n    // state which is one of ASCII, Roman, and jis0208 (initially\n    // ASCII).\n    /** @enum */\n    var states = {\n      ASCII: 0,\n      Roman: 1,\n      jis0208: 2\n    };\n    var /** @type {number} */ iso2022jp_state = states.ASCII;\n    /**\n     * @param {Stream} stream Input stream.\n     * @param {number} code_point Next code point read from the stream.\n     * @return {(number|!Array.<number>)} Byte(s) to emit.\n     */\n    this.handler = function(stream, code_point) {\n      // 1. If code point is end-of-stream and iso-2022-jp encoder\n      // state is not ASCII, prepend code point to stream, set\n      // iso-2022-jp encoder state to ASCII, and return three bytes\n      // 0x1B 0x28 0x42.\n      if (code_point === end_of_stream &&\n          iso2022jp_state !== states.ASCII) {\n        stream.prepend(code_point);\n        iso2022jp_state = states.ASCII;\n        return [0x1B, 0x28, 0x42];\n      }\n\n      // 2. If code point is end-of-stream and iso-2022-jp encoder\n      // state is ASCII, return finished.\n      if (code_point === end_of_stream && iso2022jp_state === states.ASCII)\n        return finished;\n\n      // 3. If ISO-2022-JP encoder state is ASCII or Roman, and code\n      // point is U+000E, U+000F, or U+001B, return error with U+FFFD.\n      if ((iso2022jp_state === states.ASCII ||\n           iso2022jp_state === states.Roman) &&\n          (code_point === 0x000E || code_point === 0x000F ||\n           code_point === 0x001B)) {\n        return encoderError(0xFFFD);\n      }\n\n      // 4. If iso-2022-jp encoder state is ASCII and code point is an\n      // ASCII code point, return a byte whose value is code point.\n      if (iso2022jp_state === states.ASCII &&\n          isASCIICodePoint(code_point))\n        return code_point;\n\n      // 5. If iso-2022-jp encoder state is Roman and code point is an\n      // ASCII code point, excluding U+005C and U+007E, or is U+00A5\n      // or U+203E, run these substeps:\n      if (iso2022jp_state === states.Roman &&\n          ((isASCIICodePoint(code_point) &&\n           code_point !== 0x005C && code_point !== 0x007E) ||\n          (code_point == 0x00A5 || code_point == 0x203E))) {\n\n        // 1. If code point is an ASCII code point, return a byte\n        // whose value is code point.\n        if (isASCIICodePoint(code_point))\n          return code_point;\n\n        // 2. If code point is U+00A5, return byte 0x5C.\n        if (code_point === 0x00A5)\n          return 0x5C;\n\n        // 3. If code point is U+203E, return byte 0x7E.\n        if (code_point === 0x203E)\n          return 0x7E;\n      }\n\n      // 6. If code point is an ASCII code point, and iso-2022-jp\n      // encoder state is not ASCII, prepend code point to stream, set\n      // iso-2022-jp encoder state to ASCII, and return three bytes\n      // 0x1B 0x28 0x42.\n      if (isASCIICodePoint(code_point) &&\n          iso2022jp_state !== states.ASCII) {\n        stream.prepend(code_point);\n        iso2022jp_state = states.ASCII;\n        return [0x1B, 0x28, 0x42];\n      }\n\n      // 7. If code point is either U+00A5 or U+203E, and iso-2022-jp\n      // encoder state is not Roman, prepend code point to stream, set\n      // iso-2022-jp encoder state to Roman, and return three bytes\n      // 0x1B 0x28 0x4A.\n      if ((code_point === 0x00A5 || code_point === 0x203E) &&\n          iso2022jp_state !== states.Roman) {\n        stream.prepend(code_point);\n        iso2022jp_state = states.Roman;\n        return [0x1B, 0x28, 0x4A];\n      }\n\n      // 8. If code point is U+2212, set it to U+FF0D.\n      if (code_point === 0x2212)\n        code_point = 0xFF0D;\n\n      // 9. Let pointer be the index pointer for code point in index\n      // jis0208.\n      var pointer = indexPointerFor(code_point, index('jis0208'));\n\n      // 10. If pointer is null, return error with code point.\n      if (pointer === null)\n        return encoderError(code_point);\n\n      // 11. If iso-2022-jp encoder state is not jis0208, prepend code\n      // point to stream, set iso-2022-jp encoder state to jis0208,\n      // and return three bytes 0x1B 0x24 0x42.\n      if (iso2022jp_state !== states.jis0208) {\n        stream.prepend(code_point);\n        iso2022jp_state = states.jis0208;\n        return [0x1B, 0x24, 0x42];\n      }\n\n      // 12. Let lead be floor(pointer / 94) + 0x21.\n      var lead = floor(pointer / 94) + 0x21;\n\n      // 13. Let trail be pointer % 94 + 0x21.\n      var trail = pointer % 94 + 0x21;\n\n      // 14. Return two bytes whose values are lead and trail.\n      return [lead, trail];\n    };\n  }\n\n  /** @param {{fatal: boolean}} options */\n  encoders['ISO-2022-JP'] = function(options) {\n    return new ISO2022JPEncoder(options);\n  };\n  /** @param {{fatal: boolean}} options */\n  decoders['ISO-2022-JP'] = function(options) {\n    return new ISO2022JPDecoder(options);\n  };\n\n  // 13.3 Shift_JIS\n\n  // 13.3.1 Shift_JIS decoder\n  /**\n   * @constructor\n   * @implements {Decoder}\n   * @param {{fatal: boolean}} options\n   */\n  function ShiftJISDecoder(options) {\n    var fatal = options.fatal;\n    // Shift_JIS's decoder has an associated Shift_JIS lead (initially\n    // 0x00).\n    var /** @type {number} */ Shift_JIS_lead = 0x00;\n    /**\n     * @param {Stream} stream The stream of bytes being decoded.\n     * @param {number} bite The next byte read from the stream.\n     * @return {?(number|!Array.<number>)} The next code point(s)\n     *     decoded, or null if not enough data exists in the input\n     *     stream to decode a complete code point.\n     */\n    this.handler = function(stream, bite) {\n      // 1. If byte is end-of-stream and Shift_JIS lead is not 0x00,\n      // set Shift_JIS lead to 0x00 and return error.\n      if (bite === end_of_stream && Shift_JIS_lead !== 0x00) {\n        Shift_JIS_lead = 0x00;\n        return decoderError(fatal);\n      }\n\n      // 2. If byte is end-of-stream and Shift_JIS lead is 0x00,\n      // return finished.\n      if (bite === end_of_stream && Shift_JIS_lead === 0x00)\n        return finished;\n\n      // 3. If Shift_JIS lead is not 0x00, let lead be Shift_JIS lead,\n      // let pointer be null, set Shift_JIS lead to 0x00, and then run\n      // these substeps:\n      if (Shift_JIS_lead !== 0x00) {\n        var lead = Shift_JIS_lead;\n        var pointer = null;\n        Shift_JIS_lead = 0x00;\n\n        // 1. Let offset be 0x40, if byte is less than 0x7F, and 0x41\n        // otherwise.\n        var offset = (bite < 0x7F) ? 0x40 : 0x41;\n\n        // 2. Let lead offset be 0x81, if lead is less than 0xA0, and\n        // 0xC1 otherwise.\n        var lead_offset = (lead < 0xA0) ? 0x81 : 0xC1;\n\n        // 3. If byte is in the range 0x40 to 0x7E, inclusive, or 0x80\n        // to 0xFC, inclusive, set pointer to (lead − lead offset) ×\n        // 188 + byte − offset.\n        if (inRange(bite, 0x40, 0x7E) || inRange(bite, 0x80, 0xFC))\n          pointer = (lead - lead_offset) * 188 + bite - offset;\n\n        // 4. If pointer is in the range 8836 to 10715, inclusive,\n        // return a code point whose value is 0xE000 − 8836 + pointer.\n        if (inRange(pointer, 8836, 10715))\n          return 0xE000 - 8836 + pointer;\n\n        // 5. Let code point be null, if pointer is null, and the\n        // index code point for pointer in index jis0208 otherwise.\n        var code_point = (pointer === null) ? null :\n              indexCodePointFor(pointer, index('jis0208'));\n\n        // 6. If code point is null and byte is an ASCII byte, prepend\n        // byte to stream.\n        if (code_point === null && isASCIIByte(bite))\n          stream.prepend(bite);\n\n        // 7. If code point is null, return error.\n        if (code_point === null)\n          return decoderError(fatal);\n\n        // 8. Return a code point whose value is code point.\n        return code_point;\n      }\n\n      // 4. If byte is an ASCII byte or 0x80, return a code point\n      // whose value is byte.\n      if (isASCIIByte(bite) || bite === 0x80)\n        return bite;\n\n      // 5. If byte is in the range 0xA1 to 0xDF, inclusive, return a\n      // code point whose value is 0xFF61 − 0xA1 + byte.\n      if (inRange(bite, 0xA1, 0xDF))\n        return 0xFF61 - 0xA1 + bite;\n\n      // 6. If byte is in the range 0x81 to 0x9F, inclusive, or 0xE0\n      // to 0xFC, inclusive, set Shift_JIS lead to byte and return\n      // continue.\n      if (inRange(bite, 0x81, 0x9F) || inRange(bite, 0xE0, 0xFC)) {\n        Shift_JIS_lead = bite;\n        return null;\n      }\n\n      // 7. Return error.\n      return decoderError(fatal);\n    };\n  }\n\n  // 13.3.2 Shift_JIS encoder\n  /**\n   * @constructor\n   * @implements {Encoder}\n   * @param {{fatal: boolean}} options\n   */\n  function ShiftJISEncoder(options) {\n    var fatal = options.fatal;\n    /**\n     * @param {Stream} stream Input stream.\n     * @param {number} code_point Next code point read from the stream.\n     * @return {(number|!Array.<number>)} Byte(s) to emit.\n     */\n    this.handler = function(stream, code_point) {\n      // 1. If code point is end-of-stream, return finished.\n      if (code_point === end_of_stream)\n        return finished;\n\n      // 2. If code point is an ASCII code point or U+0080, return a\n      // byte whose value is code point.\n      if (isASCIICodePoint(code_point) || code_point === 0x0080)\n        return code_point;\n\n      // 3. If code point is U+00A5, return byte 0x5C.\n      if (code_point === 0x00A5)\n        return 0x5C;\n\n      // 4. If code point is U+203E, return byte 0x7E.\n      if (code_point === 0x203E)\n        return 0x7E;\n\n      // 5. If code point is in the range U+FF61 to U+FF9F, inclusive,\n      // return a byte whose value is code point − 0xFF61 + 0xA1.\n      if (inRange(code_point, 0xFF61, 0xFF9F))\n        return code_point - 0xFF61 + 0xA1;\n\n      // 6. If code point is U+2212, set it to U+FF0D.\n      if (code_point === 0x2212)\n        code_point = 0xFF0D;\n\n      // 7. Let pointer be the index Shift_JIS pointer for code point.\n      var pointer = indexShiftJISPointerFor(code_point);\n\n      // 8. If pointer is null, return error with code point.\n      if (pointer === null)\n        return encoderError(code_point);\n\n      // 9. Let lead be floor(pointer / 188).\n      var lead = floor(pointer / 188);\n\n      // 10. Let lead offset be 0x81, if lead is less than 0x1F, and\n      // 0xC1 otherwise.\n      var lead_offset = (lead < 0x1F) ? 0x81 : 0xC1;\n\n      // 11. Let trail be pointer % 188.\n      var trail = pointer % 188;\n\n      // 12. Let offset be 0x40, if trail is less than 0x3F, and 0x41\n      // otherwise.\n      var offset = (trail < 0x3F) ? 0x40 : 0x41;\n\n      // 13. Return two bytes whose values are lead + lead offset and\n      // trail + offset.\n      return [lead + lead_offset, trail + offset];\n    };\n  }\n\n  /** @param {{fatal: boolean}} options */\n  encoders['Shift_JIS'] = function(options) {\n    return new ShiftJISEncoder(options);\n  };\n  /** @param {{fatal: boolean}} options */\n  decoders['Shift_JIS'] = function(options) {\n    return new ShiftJISDecoder(options);\n  };\n\n  //\n  // 14. Legacy multi-byte Korean encodings\n  //\n\n  // 14.1 euc-kr\n\n  // 14.1.1 euc-kr decoder\n  /**\n   * @constructor\n   * @implements {Decoder}\n   * @param {{fatal: boolean}} options\n   */\n  function EUCKRDecoder(options) {\n    var fatal = options.fatal;\n\n    // euc-kr's decoder has an associated euc-kr lead (initially 0x00).\n    var /** @type {number} */ euckr_lead = 0x00;\n    /**\n     * @param {Stream} stream The stream of bytes being decoded.\n     * @param {number} bite The next byte read from the stream.\n     * @return {?(number|!Array.<number>)} The next code point(s)\n     *     decoded, or null if not enough data exists in the input\n     *     stream to decode a complete code point.\n     */\n    this.handler = function(stream, bite) {\n      // 1. If byte is end-of-stream and euc-kr lead is not 0x00, set\n      // euc-kr lead to 0x00 and return error.\n      if (bite === end_of_stream && euckr_lead !== 0) {\n        euckr_lead = 0x00;\n        return decoderError(fatal);\n      }\n\n      // 2. If byte is end-of-stream and euc-kr lead is 0x00, return\n      // finished.\n      if (bite === end_of_stream && euckr_lead === 0)\n        return finished;\n\n      // 3. If euc-kr lead is not 0x00, let lead be euc-kr lead, let\n      // pointer be null, set euc-kr lead to 0x00, and then run these\n      // substeps:\n      if (euckr_lead !== 0x00) {\n        var lead = euckr_lead;\n        var pointer = null;\n        euckr_lead = 0x00;\n\n        // 1. If byte is in the range 0x41 to 0xFE, inclusive, set\n        // pointer to (lead − 0x81) × 190 + (byte − 0x41).\n        if (inRange(bite, 0x41, 0xFE))\n          pointer = (lead - 0x81) * 190 + (bite - 0x41);\n\n        // 2. Let code point be null, if pointer is null, and the\n        // index code point for pointer in index euc-kr otherwise.\n        var code_point = (pointer === null)\n              ? null : indexCodePointFor(pointer, index('euc-kr'));\n\n        // 3. If code point is null and byte is an ASCII byte, prepend\n        // byte to stream.\n        if (pointer === null && isASCIIByte(bite))\n          stream.prepend(bite);\n\n        // 4. If code point is null, return error.\n        if (code_point === null)\n          return decoderError(fatal);\n\n        // 5. Return a code point whose value is code point.\n        return code_point;\n      }\n\n      // 4. If byte is an ASCII byte, return a code point whose value\n      // is byte.\n      if (isASCIIByte(bite))\n        return bite;\n\n      // 5. If byte is in the range 0x81 to 0xFE, inclusive, set\n      // euc-kr lead to byte and return continue.\n      if (inRange(bite, 0x81, 0xFE)) {\n        euckr_lead = bite;\n        return null;\n      }\n\n      // 6. Return error.\n      return decoderError(fatal);\n    };\n  }\n\n  // 14.1.2 euc-kr encoder\n  /**\n   * @constructor\n   * @implements {Encoder}\n   * @param {{fatal: boolean}} options\n   */\n  function EUCKREncoder(options) {\n    var fatal = options.fatal;\n    /**\n     * @param {Stream} stream Input stream.\n     * @param {number} code_point Next code point read from the stream.\n     * @return {(number|!Array.<number>)} Byte(s) to emit.\n     */\n    this.handler = function(stream, code_point) {\n      // 1. If code point is end-of-stream, return finished.\n      if (code_point === end_of_stream)\n        return finished;\n\n      // 2. If code point is an ASCII code point, return a byte whose\n      // value is code point.\n      if (isASCIICodePoint(code_point))\n        return code_point;\n\n      // 3. Let pointer be the index pointer for code point in index\n      // euc-kr.\n      var pointer = indexPointerFor(code_point, index('euc-kr'));\n\n      // 4. If pointer is null, return error with code point.\n      if (pointer === null)\n        return encoderError(code_point);\n\n      // 5. Let lead be floor(pointer / 190) + 0x81.\n      var lead = floor(pointer / 190) + 0x81;\n\n      // 6. Let trail be pointer % 190 + 0x41.\n      var trail = (pointer % 190) + 0x41;\n\n      // 7. Return two bytes whose values are lead and trail.\n      return [lead, trail];\n    };\n  }\n\n  /** @param {{fatal: boolean}} options */\n  encoders['EUC-KR'] = function(options) {\n    return new EUCKREncoder(options);\n  };\n  /** @param {{fatal: boolean}} options */\n  decoders['EUC-KR'] = function(options) {\n    return new EUCKRDecoder(options);\n  };\n\n\n  //\n  // 15. Legacy miscellaneous encodings\n  //\n\n  // 15.1 replacement\n\n  // Not needed - API throws RangeError\n\n  // 15.2 Common infrastructure for utf-16be and utf-16le\n\n  /**\n   * @param {number} code_unit\n   * @param {boolean} utf16be\n   * @return {!Array.<number>} bytes\n   */\n  function convertCodeUnitToBytes(code_unit, utf16be) {\n    // 1. Let byte1 be code unit >> 8.\n    var byte1 = code_unit >> 8;\n\n    // 2. Let byte2 be code unit & 0x00FF.\n    var byte2 = code_unit & 0x00FF;\n\n    // 3. Then return the bytes in order:\n        // utf-16be flag is set: byte1, then byte2.\n    if (utf16be)\n      return [byte1, byte2];\n    // utf-16be flag is unset: byte2, then byte1.\n    return [byte2, byte1];\n  }\n\n  // 15.2.1 shared utf-16 decoder\n  /**\n   * @constructor\n   * @implements {Decoder}\n   * @param {boolean} utf16_be True if big-endian, false if little-endian.\n   * @param {{fatal: boolean}} options\n   */\n  function UTF16Decoder(utf16_be, options) {\n    var fatal = options.fatal;\n    var /** @type {?number} */ utf16_lead_byte = null,\n        /** @type {?number} */ utf16_lead_surrogate = null;\n    /**\n     * @param {Stream} stream The stream of bytes being decoded.\n     * @param {number} bite The next byte read from the stream.\n     * @return {?(number|!Array.<number>)} The next code point(s)\n     *     decoded, or null if not enough data exists in the input\n     *     stream to decode a complete code point.\n     */\n    this.handler = function(stream, bite) {\n      // 1. If byte is end-of-stream and either utf-16 lead byte or\n      // utf-16 lead surrogate is not null, set utf-16 lead byte and\n      // utf-16 lead surrogate to null, and return error.\n      if (bite === end_of_stream && (utf16_lead_byte !== null ||\n                                utf16_lead_surrogate !== null)) {\n        return decoderError(fatal);\n      }\n\n      // 2. If byte is end-of-stream and utf-16 lead byte and utf-16\n      // lead surrogate are null, return finished.\n      if (bite === end_of_stream && utf16_lead_byte === null &&\n          utf16_lead_surrogate === null) {\n        return finished;\n      }\n\n      // 3. If utf-16 lead byte is null, set utf-16 lead byte to byte\n      // and return continue.\n      if (utf16_lead_byte === null) {\n        utf16_lead_byte = bite;\n        return null;\n      }\n\n      // 4. Let code unit be the result of:\n      var code_unit;\n      if (utf16_be) {\n        // utf-16be decoder flag is set\n        //   (utf-16 lead byte << 8) + byte.\n        code_unit = (utf16_lead_byte << 8) + bite;\n      } else {\n        // utf-16be decoder flag is unset\n        //   (byte << 8) + utf-16 lead byte.\n        code_unit = (bite << 8) + utf16_lead_byte;\n      }\n      // Then set utf-16 lead byte to null.\n      utf16_lead_byte = null;\n\n      // 5. If utf-16 lead surrogate is not null, let lead surrogate\n      // be utf-16 lead surrogate, set utf-16 lead surrogate to null,\n      // and then run these substeps:\n      if (utf16_lead_surrogate !== null) {\n        var lead_surrogate = utf16_lead_surrogate;\n        utf16_lead_surrogate = null;\n\n        // 1. If code unit is in the range U+DC00 to U+DFFF,\n        // inclusive, return a code point whose value is 0x10000 +\n        // ((lead surrogate − 0xD800) << 10) + (code unit − 0xDC00).\n        if (inRange(code_unit, 0xDC00, 0xDFFF)) {\n          return 0x10000 + (lead_surrogate - 0xD800) * 0x400 +\n              (code_unit - 0xDC00);\n        }\n\n        // 2. Prepend the sequence resulting of converting code unit\n        // to bytes using utf-16be decoder flag to stream and return\n        // error.\n        stream.prepend(convertCodeUnitToBytes(code_unit, utf16_be));\n        return decoderError(fatal);\n      }\n\n      // 6. If code unit is in the range U+D800 to U+DBFF, inclusive,\n      // set utf-16 lead surrogate to code unit and return continue.\n      if (inRange(code_unit, 0xD800, 0xDBFF)) {\n        utf16_lead_surrogate = code_unit;\n        return null;\n      }\n\n      // 7. If code unit is in the range U+DC00 to U+DFFF, inclusive,\n      // return error.\n      if (inRange(code_unit, 0xDC00, 0xDFFF))\n        return decoderError(fatal);\n\n      // 8. Return code point code unit.\n      return code_unit;\n    };\n  }\n\n  // 15.2.2 shared utf-16 encoder\n  /**\n   * @constructor\n   * @implements {Encoder}\n   * @param {boolean} utf16_be True if big-endian, false if little-endian.\n   * @param {{fatal: boolean}} options\n   */\n  function UTF16Encoder(utf16_be, options) {\n    var fatal = options.fatal;\n    /**\n     * @param {Stream} stream Input stream.\n     * @param {number} code_point Next code point read from the stream.\n     * @return {(number|!Array.<number>)} Byte(s) to emit.\n     */\n    this.handler = function(stream, code_point) {\n      // 1. If code point is end-of-stream, return finished.\n      if (code_point === end_of_stream)\n        return finished;\n\n      // 2. If code point is in the range U+0000 to U+FFFF, inclusive,\n      // return the sequence resulting of converting code point to\n      // bytes using utf-16be encoder flag.\n      if (inRange(code_point, 0x0000, 0xFFFF))\n        return convertCodeUnitToBytes(code_point, utf16_be);\n\n      // 3. Let lead be ((code point − 0x10000) >> 10) + 0xD800,\n      // converted to bytes using utf-16be encoder flag.\n      var lead = convertCodeUnitToBytes(\n        ((code_point - 0x10000) >> 10) + 0xD800, utf16_be);\n\n      // 4. Let trail be ((code point − 0x10000) & 0x3FF) + 0xDC00,\n      // converted to bytes using utf-16be encoder flag.\n      var trail = convertCodeUnitToBytes(\n        ((code_point - 0x10000) & 0x3FF) + 0xDC00, utf16_be);\n\n      // 5. Return a byte sequence of lead followed by trail.\n      return lead.concat(trail);\n    };\n  }\n\n  // 15.3 utf-16be\n  // 15.3.1 utf-16be decoder\n  /** @param {{fatal: boolean}} options */\n  encoders['UTF-16BE'] = function(options) {\n    return new UTF16Encoder(true, options);\n  };\n  // 15.3.2 utf-16be encoder\n  /** @param {{fatal: boolean}} options */\n  decoders['UTF-16BE'] = function(options) {\n    return new UTF16Decoder(true, options);\n  };\n\n  // 15.4 utf-16le\n  // 15.4.1 utf-16le decoder\n  /** @param {{fatal: boolean}} options */\n  encoders['UTF-16LE'] = function(options) {\n    return new UTF16Encoder(false, options);\n  };\n  // 15.4.2 utf-16le encoder\n  /** @param {{fatal: boolean}} options */\n  decoders['UTF-16LE'] = function(options) {\n    return new UTF16Decoder(false, options);\n  };\n\n  // 15.5 x-user-defined\n\n  // 15.5.1 x-user-defined decoder\n  /**\n   * @constructor\n   * @implements {Decoder}\n   * @param {{fatal: boolean}} options\n   */\n  function XUserDefinedDecoder(options) {\n    var fatal = options.fatal;\n    /**\n     * @param {Stream} stream The stream of bytes being decoded.\n     * @param {number} bite The next byte read from the stream.\n     * @return {?(number|!Array.<number>)} The next code point(s)\n     *     decoded, or null if not enough data exists in the input\n     *     stream to decode a complete code point.\n     */\n    this.handler = function(stream, bite) {\n      // 1. If byte is end-of-stream, return finished.\n      if (bite === end_of_stream)\n        return finished;\n\n      // 2. If byte is an ASCII byte, return a code point whose value\n      // is byte.\n      if (isASCIIByte(bite))\n        return bite;\n\n      // 3. Return a code point whose value is 0xF780 + byte − 0x80.\n      return 0xF780 + bite - 0x80;\n    };\n  }\n\n  // 15.5.2 x-user-defined encoder\n  /**\n   * @constructor\n   * @implements {Encoder}\n   * @param {{fatal: boolean}} options\n   */\n  function XUserDefinedEncoder(options) {\n    var fatal = options.fatal;\n    /**\n     * @param {Stream} stream Input stream.\n     * @param {number} code_point Next code point read from the stream.\n     * @return {(number|!Array.<number>)} Byte(s) to emit.\n     */\n    this.handler = function(stream, code_point) {\n      // 1.If code point is end-of-stream, return finished.\n      if (code_point === end_of_stream)\n        return finished;\n\n      // 2. If code point is an ASCII code point, return a byte whose\n      // value is code point.\n      if (isASCIICodePoint(code_point))\n        return code_point;\n\n      // 3. If code point is in the range U+F780 to U+F7FF, inclusive,\n      // return a byte whose value is code point − 0xF780 + 0x80.\n      if (inRange(code_point, 0xF780, 0xF7FF))\n        return code_point - 0xF780 + 0x80;\n\n      // 4. Return error with code point.\n      return encoderError(code_point);\n    };\n  }\n\n  /** @param {{fatal: boolean}} options */\n  encoders['x-user-defined'] = function(options) {\n    return new XUserDefinedEncoder(options);\n  };\n  /** @param {{fatal: boolean}} options */\n  decoders['x-user-defined'] = function(options) {\n    return new XUserDefinedDecoder(options);\n  };\n\n  if (!global['TextEncoder'])\n    global['TextEncoder'] = TextEncoder;\n  if (!global['TextDecoder'])\n    global['TextDecoder'] = TextDecoder;\n\n  if (typeof module !== \"undefined\" && module.exports) {\n    module.exports = {\n      TextEncoder: global['TextEncoder'],\n      TextDecoder: global['TextDecoder'],\n      EncodingIndexes: global[\"encoding-indexes\"]\n    };\n  }\n\n// For strict environments where `this` inside the global scope\n// is `undefined`, take a pure object instead\n}(this || {}));","/*!\n\n diff v4.0.1\n\nSoftware License Agreement (BSD License)\n\nCopyright (c) 2009-2015, Kevin Decker <kpdecker@gmail.com>\n\nAll rights reserved.\n\nRedistribution and use of this software in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n* Redistributions of source code must retain the above\n  copyright notice, this list of conditions and the\n  following disclaimer.\n\n* Redistributions in binary form must reproduce the above\n  copyright notice, this list of conditions and the\n  following disclaimer in the documentation and/or other\n  materials provided with the distribution.\n\n* Neither the name of Kevin Decker nor the names of its\n  contributors may be used to endorse or promote products\n  derived from this software without specific prior\n  written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR\nIMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND\nFITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR\nCONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER\nIN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\nOF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n@license\n*/\n(function (global, factory) {\n  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :\n  typeof define === 'function' && define.amd ? define(['exports'], factory) :\n  (global = global || self, factory(global.Diff = {}));\n}(this, function (exports) { 'use strict';\n\n  function Diff() {}\n  Diff.prototype = {\n    diff: function diff(oldString, newString) {\n      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};\n      var callback = options.callback;\n\n      if (typeof options === 'function') {\n        callback = options;\n        options = {};\n      }\n\n      this.options = options;\n      var self = this;\n\n      function done(value) {\n        if (callback) {\n          setTimeout(function () {\n            callback(undefined, value);\n          }, 0);\n          return true;\n        } else {\n          return value;\n        }\n      } // Allow subclasses to massage the input prior to running\n\n\n      oldString = this.castInput(oldString);\n      newString = this.castInput(newString);\n      oldString = this.removeEmpty(this.tokenize(oldString));\n      newString = this.removeEmpty(this.tokenize(newString));\n      var newLen = newString.length,\n          oldLen = oldString.length;\n      var editLength = 1;\n      var maxEditLength = newLen + oldLen;\n      var bestPath = [{\n        newPos: -1,\n        components: []\n      }]; // Seed editLength = 0, i.e. the content starts with the same values\n\n      var oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);\n\n      if (bestPath[0].newPos + 1 >= newLen && oldPos + 1 >= oldLen) {\n        // Identity per the equality and tokenizer\n        return done([{\n          value: this.join(newString),\n          count: newString.length\n        }]);\n      } // Main worker method. checks all permutations of a given edit length for acceptance.\n\n\n      function execEditLength() {\n        for (var diagonalPath = -1 * editLength; diagonalPath <= editLength; diagonalPath += 2) {\n          var basePath = void 0;\n\n          var addPath = bestPath[diagonalPath - 1],\n              removePath = bestPath[diagonalPath + 1],\n              _oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;\n\n          if (addPath) {\n            // No one else is going to attempt to use this value, clear it\n            bestPath[diagonalPath - 1] = undefined;\n          }\n\n          var canAdd = addPath && addPath.newPos + 1 < newLen,\n              canRemove = removePath && 0 <= _oldPos && _oldPos < oldLen;\n\n          if (!canAdd && !canRemove) {\n            // If this path is a terminal then prune\n            bestPath[diagonalPath] = undefined;\n            continue;\n          } // Select the diagonal that we want to branch from. We select the prior\n          // path whose position in the new string is the farthest from the origin\n          // and does not pass the bounds of the diff graph\n\n\n          if (!canAdd || canRemove && addPath.newPos < removePath.newPos) {\n            basePath = clonePath(removePath);\n            self.pushComponent(basePath.components, undefined, true);\n          } else {\n            basePath = addPath; // No need to clone, we've pulled it from the list\n\n            basePath.newPos++;\n            self.pushComponent(basePath.components, true, undefined);\n          }\n\n          _oldPos = self.extractCommon(basePath, newString, oldString, diagonalPath); // If we have hit the end of both strings, then we are done\n\n          if (basePath.newPos + 1 >= newLen && _oldPos + 1 >= oldLen) {\n            return done(buildValues(self, basePath.components, newString, oldString, self.useLongestToken));\n          } else {\n            // Otherwise track this path as a potential candidate and continue.\n            bestPath[diagonalPath] = basePath;\n          }\n        }\n\n        editLength++;\n      } // Performs the length of edit iteration. Is a bit fugly as this has to support the\n      // sync and async mode which is never fun. Loops over execEditLength until a value\n      // is produced.\n\n\n      if (callback) {\n        (function exec() {\n          setTimeout(function () {\n            // This should not happen, but we want to be safe.\n\n            /* istanbul ignore next */\n            if (editLength > maxEditLength) {\n              return callback();\n            }\n\n            if (!execEditLength()) {\n              exec();\n            }\n          }, 0);\n        })();\n      } else {\n        while (editLength <= maxEditLength) {\n          var ret = execEditLength();\n\n          if (ret) {\n            return ret;\n          }\n        }\n      }\n    },\n    pushComponent: function pushComponent(components, added, removed) {\n      var last = components[components.length - 1];\n\n      if (last && last.added === added && last.removed === removed) {\n        // We need to clone here as the component clone operation is just\n        // as shallow array clone\n        components[components.length - 1] = {\n          count: last.count + 1,\n          added: added,\n          removed: removed\n        };\n      } else {\n        components.push({\n          count: 1,\n          added: added,\n          removed: removed\n        });\n      }\n    },\n    extractCommon: function extractCommon(basePath, newString, oldString, diagonalPath) {\n      var newLen = newString.length,\n          oldLen = oldString.length,\n          newPos = basePath.newPos,\n          oldPos = newPos - diagonalPath,\n          commonCount = 0;\n\n      while (newPos + 1 < newLen && oldPos + 1 < oldLen && this.equals(newString[newPos + 1], oldString[oldPos + 1])) {\n        newPos++;\n        oldPos++;\n        commonCount++;\n      }\n\n      if (commonCount) {\n        basePath.components.push({\n          count: commonCount\n        });\n      }\n\n      basePath.newPos = newPos;\n      return oldPos;\n    },\n    equals: function equals(left, right) {\n      if (this.options.comparator) {\n        return this.options.comparator(left, right);\n      } else {\n        return left === right || this.options.ignoreCase && left.toLowerCase() === right.toLowerCase();\n      }\n    },\n    removeEmpty: function removeEmpty(array) {\n      var ret = [];\n\n      for (var i = 0; i < array.length; i++) {\n        if (array[i]) {\n          ret.push(array[i]);\n        }\n      }\n\n      return ret;\n    },\n    castInput: function castInput(value) {\n      return value;\n    },\n    tokenize: function tokenize(value) {\n      return value.split('');\n    },\n    join: function join(chars) {\n      return chars.join('');\n    }\n  };\n\n  function buildValues(diff, components, newString, oldString, useLongestToken) {\n    var componentPos = 0,\n        componentLen = components.length,\n        newPos = 0,\n        oldPos = 0;\n\n    for (; componentPos < componentLen; componentPos++) {\n      var component = components[componentPos];\n\n      if (!component.removed) {\n        if (!component.added && useLongestToken) {\n          var value = newString.slice(newPos, newPos + component.count);\n          value = value.map(function (value, i) {\n            var oldValue = oldString[oldPos + i];\n            return oldValue.length > value.length ? oldValue : value;\n          });\n          component.value = diff.join(value);\n        } else {\n          component.value = diff.join(newString.slice(newPos, newPos + component.count));\n        }\n\n        newPos += component.count; // Common case\n\n        if (!component.added) {\n          oldPos += component.count;\n        }\n      } else {\n        component.value = diff.join(oldString.slice(oldPos, oldPos + component.count));\n        oldPos += component.count; // Reverse add and remove so removes are output first to match common convention\n        // The diffing algorithm is tied to add then remove output and this is the simplest\n        // route to get the desired output with minimal overhead.\n\n        if (componentPos && components[componentPos - 1].added) {\n          var tmp = components[componentPos - 1];\n          components[componentPos - 1] = components[componentPos];\n          components[componentPos] = tmp;\n        }\n      }\n    } // Special case handle for when one terminal is ignored (i.e. whitespace).\n    // For this case we merge the terminal into the prior string and drop the change.\n    // This is only available for string mode.\n\n\n    var lastComponent = components[componentLen - 1];\n\n    if (componentLen > 1 && typeof lastComponent.value === 'string' && (lastComponent.added || lastComponent.removed) && diff.equals('', lastComponent.value)) {\n      components[componentLen - 2].value += lastComponent.value;\n      components.pop();\n    }\n\n    return components;\n  }\n\n  function clonePath(path) {\n    return {\n      newPos: path.newPos,\n      components: path.components.slice(0)\n    };\n  }\n\n  var characterDiff = new Diff();\n  function diffChars(oldStr, newStr, options) {\n    return characterDiff.diff(oldStr, newStr, options);\n  }\n\n  function generateOptions(options, defaults) {\n    if (typeof options === 'function') {\n      defaults.callback = options;\n    } else if (options) {\n      for (var name in options) {\n        /* istanbul ignore else */\n        if (options.hasOwnProperty(name)) {\n          defaults[name] = options[name];\n        }\n      }\n    }\n\n    return defaults;\n  }\n\n  //\n  // Ranges and exceptions:\n  // Latin-1 Supplement, 0080–00FF\n  //  - U+00D7  × Multiplication sign\n  //  - U+00F7  ÷ Division sign\n  // Latin Extended-A, 0100–017F\n  // Latin Extended-B, 0180–024F\n  // IPA Extensions, 0250–02AF\n  // Spacing Modifier Letters, 02B0–02FF\n  //  - U+02C7  ˇ &#711;  Caron\n  //  - U+02D8  ˘ &#728;  Breve\n  //  - U+02D9  ˙ &#729;  Dot Above\n  //  - U+02DA  ˚ &#730;  Ring Above\n  //  - U+02DB  ˛ &#731;  Ogonek\n  //  - U+02DC  ˜ &#732;  Small Tilde\n  //  - U+02DD  ˝ &#733;  Double Acute Accent\n  // Latin Extended Additional, 1E00–1EFF\n\n  var extendedWordChars = /^[A-Za-z\\xC0-\\u02C6\\u02C8-\\u02D7\\u02DE-\\u02FF\\u1E00-\\u1EFF]+$/;\n  var reWhitespace = /\\S/;\n  var wordDiff = new Diff();\n\n  wordDiff.equals = function (left, right) {\n    if (this.options.ignoreCase) {\n      left = left.toLowerCase();\n      right = right.toLowerCase();\n    }\n\n    return left === right || this.options.ignoreWhitespace && !reWhitespace.test(left) && !reWhitespace.test(right);\n  };\n\n  wordDiff.tokenize = function (value) {\n    var tokens = value.split(/(\\s+|[()[\\]{}'\"]|\\b)/); // Join the boundary splits that we do not consider to be boundaries. This is primarily the extended Latin character set.\n\n    for (var i = 0; i < tokens.length - 1; i++) {\n      // If we have an empty string in the next field and we have only word chars before and after, merge\n      if (!tokens[i + 1] && tokens[i + 2] && extendedWordChars.test(tokens[i]) && extendedWordChars.test(tokens[i + 2])) {\n        tokens[i] += tokens[i + 2];\n        tokens.splice(i + 1, 2);\n        i--;\n      }\n    }\n\n    return tokens;\n  };\n\n  function diffWords(oldStr, newStr, options) {\n    options = generateOptions(options, {\n      ignoreWhitespace: true\n    });\n    return wordDiff.diff(oldStr, newStr, options);\n  }\n  function diffWordsWithSpace(oldStr, newStr, options) {\n    return wordDiff.diff(oldStr, newStr, options);\n  }\n\n  var lineDiff = new Diff();\n\n  lineDiff.tokenize = function (value) {\n    var retLines = [],\n        linesAndNewlines = value.split(/(\\n|\\r\\n)/); // Ignore the final empty token that occurs if the string ends with a new line\n\n    if (!linesAndNewlines[linesAndNewlines.length - 1]) {\n      linesAndNewlines.pop();\n    } // Merge the content and line separators into single tokens\n\n\n    for (var i = 0; i < linesAndNewlines.length; i++) {\n      var line = linesAndNewlines[i];\n\n      if (i % 2 && !this.options.newlineIsToken) {\n        retLines[retLines.length - 1] += line;\n      } else {\n        if (this.options.ignoreWhitespace) {\n          line = line.trim();\n        }\n\n        retLines.push(line);\n      }\n    }\n\n    return retLines;\n  };\n\n  function diffLines(oldStr, newStr, callback) {\n    return lineDiff.diff(oldStr, newStr, callback);\n  }\n  function diffTrimmedLines(oldStr, newStr, callback) {\n    var options = generateOptions(callback, {\n      ignoreWhitespace: true\n    });\n    return lineDiff.diff(oldStr, newStr, options);\n  }\n\n  var sentenceDiff = new Diff();\n\n  sentenceDiff.tokenize = function (value) {\n    return value.split(/(\\S.+?[.!?])(?=\\s+|$)/);\n  };\n\n  function diffSentences(oldStr, newStr, callback) {\n    return sentenceDiff.diff(oldStr, newStr, callback);\n  }\n\n  var cssDiff = new Diff();\n\n  cssDiff.tokenize = function (value) {\n    return value.split(/([{}:;,]|\\s+)/);\n  };\n\n  function diffCss(oldStr, newStr, callback) {\n    return cssDiff.diff(oldStr, newStr, callback);\n  }\n\n  function _typeof(obj) {\n    if (typeof Symbol === \"function\" && typeof Symbol.iterator === \"symbol\") {\n      _typeof = function (obj) {\n        return typeof obj;\n      };\n    } else {\n      _typeof = function (obj) {\n        return obj && typeof Symbol === \"function\" && obj.constructor === Symbol && obj !== Symbol.prototype ? \"symbol\" : typeof obj;\n      };\n    }\n\n    return _typeof(obj);\n  }\n\n  function _toConsumableArray(arr) {\n    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread();\n  }\n\n  function _arrayWithoutHoles(arr) {\n    if (Array.isArray(arr)) {\n      for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];\n\n      return arr2;\n    }\n  }\n\n  function _iterableToArray(iter) {\n    if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === \"[object Arguments]\") return Array.from(iter);\n  }\n\n  function _nonIterableSpread() {\n    throw new TypeError(\"Invalid attempt to spread non-iterable instance\");\n  }\n\n  var objectPrototypeToString = Object.prototype.toString;\n  var jsonDiff = new Diff(); // Discriminate between two lines of pretty-printed, serialized JSON where one of them has a\n  // dangling comma and the other doesn't. Turns out including the dangling comma yields the nicest output:\n\n  jsonDiff.useLongestToken = true;\n  jsonDiff.tokenize = lineDiff.tokenize;\n\n  jsonDiff.castInput = function (value) {\n    var _this$options = this.options,\n        undefinedReplacement = _this$options.undefinedReplacement,\n        _this$options$stringi = _this$options.stringifyReplacer,\n        stringifyReplacer = _this$options$stringi === void 0 ? function (k, v) {\n      return typeof v === 'undefined' ? undefinedReplacement : v;\n    } : _this$options$stringi;\n    return typeof value === 'string' ? value : JSON.stringify(canonicalize(value, null, null, stringifyReplacer), stringifyReplacer, '  ');\n  };\n\n  jsonDiff.equals = function (left, right) {\n    return Diff.prototype.equals.call(jsonDiff, left.replace(/,([\\r\\n])/g, '$1'), right.replace(/,([\\r\\n])/g, '$1'));\n  };\n\n  function diffJson(oldObj, newObj, options) {\n    return jsonDiff.diff(oldObj, newObj, options);\n  } // This function handles the presence of circular references by bailing out when encountering an\n  // object that is already on the \"stack\" of items being processed. Accepts an optional replacer\n\n  function canonicalize(obj, stack, replacementStack, replacer, key) {\n    stack = stack || [];\n    replacementStack = replacementStack || [];\n\n    if (replacer) {\n      obj = replacer(key, obj);\n    }\n\n    var i;\n\n    for (i = 0; i < stack.length; i += 1) {\n      if (stack[i] === obj) {\n        return replacementStack[i];\n      }\n    }\n\n    var canonicalizedObj;\n\n    if ('[object Array]' === objectPrototypeToString.call(obj)) {\n      stack.push(obj);\n      canonicalizedObj = new Array(obj.length);\n      replacementStack.push(canonicalizedObj);\n\n      for (i = 0; i < obj.length; i += 1) {\n        canonicalizedObj[i] = canonicalize(obj[i], stack, replacementStack, replacer, key);\n      }\n\n      stack.pop();\n      replacementStack.pop();\n      return canonicalizedObj;\n    }\n\n    if (obj && obj.toJSON) {\n      obj = obj.toJSON();\n    }\n\n    if (_typeof(obj) === 'object' && obj !== null) {\n      stack.push(obj);\n      canonicalizedObj = {};\n      replacementStack.push(canonicalizedObj);\n\n      var sortedKeys = [],\n          _key;\n\n      for (_key in obj) {\n        /* istanbul ignore else */\n        if (obj.hasOwnProperty(_key)) {\n          sortedKeys.push(_key);\n        }\n      }\n\n      sortedKeys.sort();\n\n      for (i = 0; i < sortedKeys.length; i += 1) {\n        _key = sortedKeys[i];\n        canonicalizedObj[_key] = canonicalize(obj[_key], stack, replacementStack, replacer, _key);\n      }\n\n      stack.pop();\n      replacementStack.pop();\n    } else {\n      canonicalizedObj = obj;\n    }\n\n    return canonicalizedObj;\n  }\n\n  var arrayDiff = new Diff();\n\n  arrayDiff.tokenize = function (value) {\n    return value.slice();\n  };\n\n  arrayDiff.join = arrayDiff.removeEmpty = function (value) {\n    return value;\n  };\n\n  function diffArrays(oldArr, newArr, callback) {\n    return arrayDiff.diff(oldArr, newArr, callback);\n  }\n\n  function parsePatch(uniDiff) {\n    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};\n    var diffstr = uniDiff.split(/\\r\\n|[\\n\\v\\f\\r\\x85]/),\n        delimiters = uniDiff.match(/\\r\\n|[\\n\\v\\f\\r\\x85]/g) || [],\n        list = [],\n        i = 0;\n\n    function parseIndex() {\n      var index = {};\n      list.push(index); // Parse diff metadata\n\n      while (i < diffstr.length) {\n        var line = diffstr[i]; // File header found, end parsing diff metadata\n\n        if (/^(\\-\\-\\-|\\+\\+\\+|@@)\\s/.test(line)) {\n          break;\n        } // Diff index\n\n\n        var header = /^(?:Index:|diff(?: -r \\w+)+)\\s+(.+?)\\s*$/.exec(line);\n\n        if (header) {\n          index.index = header[1];\n        }\n\n        i++;\n      } // Parse file headers if they are defined. Unified diff requires them, but\n      // there's no technical issues to have an isolated hunk without file header\n\n\n      parseFileHeader(index);\n      parseFileHeader(index); // Parse hunks\n\n      index.hunks = [];\n\n      while (i < diffstr.length) {\n        var _line = diffstr[i];\n\n        if (/^(Index:|diff|\\-\\-\\-|\\+\\+\\+)\\s/.test(_line)) {\n          break;\n        } else if (/^@@/.test(_line)) {\n          index.hunks.push(parseHunk());\n        } else if (_line && options.strict) {\n          // Ignore unexpected content unless in strict mode\n          throw new Error('Unknown line ' + (i + 1) + ' ' + JSON.stringify(_line));\n        } else {\n          i++;\n        }\n      }\n    } // Parses the --- and +++ headers, if none are found, no lines\n    // are consumed.\n\n\n    function parseFileHeader(index) {\n      var fileHeader = /^(---|\\+\\+\\+)\\s+(.*)$/.exec(diffstr[i]);\n\n      if (fileHeader) {\n        var keyPrefix = fileHeader[1] === '---' ? 'old' : 'new';\n        var data = fileHeader[2].split('\\t', 2);\n        var fileName = data[0].replace(/\\\\\\\\/g, '\\\\');\n\n        if (/^\".*\"$/.test(fileName)) {\n          fileName = fileName.substr(1, fileName.length - 2);\n        }\n\n        index[keyPrefix + 'FileName'] = fileName;\n        index[keyPrefix + 'Header'] = (data[1] || '').trim();\n        i++;\n      }\n    } // Parses a hunk\n    // This assumes that we are at the start of a hunk.\n\n\n    function parseHunk() {\n      var chunkHeaderIndex = i,\n          chunkHeaderLine = diffstr[i++],\n          chunkHeader = chunkHeaderLine.split(/@@ -(\\d+)(?:,(\\d+))? \\+(\\d+)(?:,(\\d+))? @@/);\n      var hunk = {\n        oldStart: +chunkHeader[1],\n        oldLines: +chunkHeader[2] || 1,\n        newStart: +chunkHeader[3],\n        newLines: +chunkHeader[4] || 1,\n        lines: [],\n        linedelimiters: []\n      };\n      var addCount = 0,\n          removeCount = 0;\n\n      for (; i < diffstr.length; i++) {\n        // Lines starting with '---' could be mistaken for the \"remove line\" operation\n        // But they could be the header for the next file. Therefore prune such cases out.\n        if (diffstr[i].indexOf('--- ') === 0 && i + 2 < diffstr.length && diffstr[i + 1].indexOf('+++ ') === 0 && diffstr[i + 2].indexOf('@@') === 0) {\n          break;\n        }\n\n        var operation = diffstr[i].length == 0 && i != diffstr.length - 1 ? ' ' : diffstr[i][0];\n\n        if (operation === '+' || operation === '-' || operation === ' ' || operation === '\\\\') {\n          hunk.lines.push(diffstr[i]);\n          hunk.linedelimiters.push(delimiters[i] || '\\n');\n\n          if (operation === '+') {\n            addCount++;\n          } else if (operation === '-') {\n            removeCount++;\n          } else if (operation === ' ') {\n            addCount++;\n            removeCount++;\n          }\n        } else {\n          break;\n        }\n      } // Handle the empty block count case\n\n\n      if (!addCount && hunk.newLines === 1) {\n        hunk.newLines = 0;\n      }\n\n      if (!removeCount && hunk.oldLines === 1) {\n        hunk.oldLines = 0;\n      } // Perform optional sanity checking\n\n\n      if (options.strict) {\n        if (addCount !== hunk.newLines) {\n          throw new Error('Added line count did not match for hunk at line ' + (chunkHeaderIndex + 1));\n        }\n\n        if (removeCount !== hunk.oldLines) {\n          throw new Error('Removed line count did not match for hunk at line ' + (chunkHeaderIndex + 1));\n        }\n      }\n\n      return hunk;\n    }\n\n    while (i < diffstr.length) {\n      parseIndex();\n    }\n\n    return list;\n  }\n\n  // Iterator that traverses in the range of [min, max], stepping\n  // by distance from a given start position. I.e. for [0, 4], with\n  // start of 2, this will iterate 2, 3, 1, 4, 0.\n  function distanceIterator (start, minLine, maxLine) {\n    var wantForward = true,\n        backwardExhausted = false,\n        forwardExhausted = false,\n        localOffset = 1;\n    return function iterator() {\n      if (wantForward && !forwardExhausted) {\n        if (backwardExhausted) {\n          localOffset++;\n        } else {\n          wantForward = false;\n        } // Check if trying to fit beyond text length, and if not, check it fits\n        // after offset location (or desired location on first iteration)\n\n\n        if (start + localOffset <= maxLine) {\n          return localOffset;\n        }\n\n        forwardExhausted = true;\n      }\n\n      if (!backwardExhausted) {\n        if (!forwardExhausted) {\n          wantForward = true;\n        } // Check if trying to fit before text beginning, and if not, check it fits\n        // before offset location\n\n\n        if (minLine <= start - localOffset) {\n          return -localOffset++;\n        }\n\n        backwardExhausted = true;\n        return iterator();\n      } // We tried to fit hunk before text beginning and beyond text length, then\n      // hunk can't fit on the text. Return undefined\n\n    };\n  }\n\n  function applyPatch(source, uniDiff) {\n    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};\n\n    if (typeof uniDiff === 'string') {\n      uniDiff = parsePatch(uniDiff);\n    }\n\n    if (Array.isArray(uniDiff)) {\n      if (uniDiff.length > 1) {\n        throw new Error('applyPatch only works with a single input.');\n      }\n\n      uniDiff = uniDiff[0];\n    } // Apply the diff to the input\n\n\n    var lines = source.split(/\\r\\n|[\\n\\v\\f\\r\\x85]/),\n        delimiters = source.match(/\\r\\n|[\\n\\v\\f\\r\\x85]/g) || [],\n        hunks = uniDiff.hunks,\n        compareLine = options.compareLine || function (lineNumber, line, operation, patchContent) {\n      return line === patchContent;\n    },\n        errorCount = 0,\n        fuzzFactor = options.fuzzFactor || 0,\n        minLine = 0,\n        offset = 0,\n        removeEOFNL,\n        addEOFNL;\n    /**\n     * Checks if the hunk exactly fits on the provided location\n     */\n\n\n    function hunkFits(hunk, toPos) {\n      for (var j = 0; j < hunk.lines.length; j++) {\n        var line = hunk.lines[j],\n            operation = line.length > 0 ? line[0] : ' ',\n            content = line.length > 0 ? line.substr(1) : line;\n\n        if (operation === ' ' || operation === '-') {\n          // Context sanity check\n          if (!compareLine(toPos + 1, lines[toPos], operation, content)) {\n            errorCount++;\n\n            if (errorCount > fuzzFactor) {\n              return false;\n            }\n          }\n\n          toPos++;\n        }\n      }\n\n      return true;\n    } // Search best fit offsets for each hunk based on the previous ones\n\n\n    for (var i = 0; i < hunks.length; i++) {\n      var hunk = hunks[i],\n          maxLine = lines.length - hunk.oldLines,\n          localOffset = 0,\n          toPos = offset + hunk.oldStart - 1;\n      var iterator = distanceIterator(toPos, minLine, maxLine);\n\n      for (; localOffset !== undefined; localOffset = iterator()) {\n        if (hunkFits(hunk, toPos + localOffset)) {\n          hunk.offset = offset += localOffset;\n          break;\n        }\n      }\n\n      if (localOffset === undefined) {\n        return false;\n      } // Set lower text limit to end of the current hunk, so next ones don't try\n      // to fit over already patched text\n\n\n      minLine = hunk.offset + hunk.oldStart + hunk.oldLines;\n    } // Apply patch hunks\n\n\n    var diffOffset = 0;\n\n    for (var _i = 0; _i < hunks.length; _i++) {\n      var _hunk = hunks[_i],\n          _toPos = _hunk.oldStart + _hunk.offset + diffOffset - 1;\n\n      diffOffset += _hunk.newLines - _hunk.oldLines;\n\n      if (_toPos < 0) {\n        // Creating a new file\n        _toPos = 0;\n      }\n\n      for (var j = 0; j < _hunk.lines.length; j++) {\n        var line = _hunk.lines[j],\n            operation = line.length > 0 ? line[0] : ' ',\n            content = line.length > 0 ? line.substr(1) : line,\n            delimiter = _hunk.linedelimiters[j];\n\n        if (operation === ' ') {\n          _toPos++;\n        } else if (operation === '-') {\n          lines.splice(_toPos, 1);\n          delimiters.splice(_toPos, 1);\n          /* istanbul ignore else */\n        } else if (operation === '+') {\n          lines.splice(_toPos, 0, content);\n          delimiters.splice(_toPos, 0, delimiter);\n          _toPos++;\n        } else if (operation === '\\\\') {\n          var previousOperation = _hunk.lines[j - 1] ? _hunk.lines[j - 1][0] : null;\n\n          if (previousOperation === '+') {\n            removeEOFNL = true;\n          } else if (previousOperation === '-') {\n            addEOFNL = true;\n          }\n        }\n      }\n    } // Handle EOFNL insertion/removal\n\n\n    if (removeEOFNL) {\n      while (!lines[lines.length - 1]) {\n        lines.pop();\n        delimiters.pop();\n      }\n    } else if (addEOFNL) {\n      lines.push('');\n      delimiters.push('\\n');\n    }\n\n    for (var _k = 0; _k < lines.length - 1; _k++) {\n      lines[_k] = lines[_k] + delimiters[_k];\n    }\n\n    return lines.join('');\n  } // Wrapper that supports multiple file patches via callbacks.\n\n  function applyPatches(uniDiff, options) {\n    if (typeof uniDiff === 'string') {\n      uniDiff = parsePatch(uniDiff);\n    }\n\n    var currentIndex = 0;\n\n    function processIndex() {\n      var index = uniDiff[currentIndex++];\n\n      if (!index) {\n        return options.complete();\n      }\n\n      options.loadFile(index, function (err, data) {\n        if (err) {\n          return options.complete(err);\n        }\n\n        var updatedContent = applyPatch(data, index, options);\n        options.patched(index, updatedContent, function (err) {\n          if (err) {\n            return options.complete(err);\n          }\n\n          processIndex();\n        });\n      });\n    }\n\n    processIndex();\n  }\n\n  function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {\n    if (!options) {\n      options = {};\n    }\n\n    if (typeof options.context === 'undefined') {\n      options.context = 4;\n    }\n\n    var diff = diffLines(oldStr, newStr, options);\n    diff.push({\n      value: '',\n      lines: []\n    }); // Append an empty value to make cleanup easier\n\n    function contextLines(lines) {\n      return lines.map(function (entry) {\n        return ' ' + entry;\n      });\n    }\n\n    var hunks = [];\n    var oldRangeStart = 0,\n        newRangeStart = 0,\n        curRange = [],\n        oldLine = 1,\n        newLine = 1;\n\n    var _loop = function _loop(i) {\n      var current = diff[i],\n          lines = current.lines || current.value.replace(/\\n$/, '').split('\\n');\n      current.lines = lines;\n\n      if (current.added || current.removed) {\n        var _curRange;\n\n        // If we have previous context, start with that\n        if (!oldRangeStart) {\n          var prev = diff[i - 1];\n          oldRangeStart = oldLine;\n          newRangeStart = newLine;\n\n          if (prev) {\n            curRange = options.context > 0 ? contextLines(prev.lines.slice(-options.context)) : [];\n            oldRangeStart -= curRange.length;\n            newRangeStart -= curRange.length;\n          }\n        } // Output our changes\n\n\n        (_curRange = curRange).push.apply(_curRange, _toConsumableArray(lines.map(function (entry) {\n          return (current.added ? '+' : '-') + entry;\n        }))); // Track the updated file position\n\n\n        if (current.added) {\n          newLine += lines.length;\n        } else {\n          oldLine += lines.length;\n        }\n      } else {\n        // Identical context lines. Track line changes\n        if (oldRangeStart) {\n          // Close out any changes that have been output (or join overlapping)\n          if (lines.length <= options.context * 2 && i < diff.length - 2) {\n            var _curRange2;\n\n            // Overlapping\n            (_curRange2 = curRange).push.apply(_curRange2, _toConsumableArray(contextLines(lines)));\n          } else {\n            var _curRange3;\n\n            // end the range and output\n            var contextSize = Math.min(lines.length, options.context);\n\n            (_curRange3 = curRange).push.apply(_curRange3, _toConsumableArray(contextLines(lines.slice(0, contextSize))));\n\n            var hunk = {\n              oldStart: oldRangeStart,\n              oldLines: oldLine - oldRangeStart + contextSize,\n              newStart: newRangeStart,\n              newLines: newLine - newRangeStart + contextSize,\n              lines: curRange\n            };\n\n            if (i >= diff.length - 2 && lines.length <= options.context) {\n              // EOF is inside this hunk\n              var oldEOFNewline = /\\n$/.test(oldStr);\n              var newEOFNewline = /\\n$/.test(newStr);\n              var noNlBeforeAdds = lines.length == 0 && curRange.length > hunk.oldLines;\n\n              if (!oldEOFNewline && noNlBeforeAdds) {\n                // special case: old has no eol and no trailing context; no-nl can end up before adds\n                curRange.splice(hunk.oldLines, 0, '\\\\ No newline at end of file');\n              }\n\n              if (!oldEOFNewline && !noNlBeforeAdds || !newEOFNewline) {\n                curRange.push('\\\\ No newline at end of file');\n              }\n            }\n\n            hunks.push(hunk);\n            oldRangeStart = 0;\n            newRangeStart = 0;\n            curRange = [];\n          }\n        }\n\n        oldLine += lines.length;\n        newLine += lines.length;\n      }\n    };\n\n    for (var i = 0; i < diff.length; i++) {\n      _loop(i);\n    }\n\n    return {\n      oldFileName: oldFileName,\n      newFileName: newFileName,\n      oldHeader: oldHeader,\n      newHeader: newHeader,\n      hunks: hunks\n    };\n  }\n  function createTwoFilesPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {\n    var diff = structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options);\n    var ret = [];\n\n    if (oldFileName == newFileName) {\n      ret.push('Index: ' + oldFileName);\n    }\n\n    ret.push('===================================================================');\n    ret.push('--- ' + diff.oldFileName + (typeof diff.oldHeader === 'undefined' ? '' : '\\t' + diff.oldHeader));\n    ret.push('+++ ' + diff.newFileName + (typeof diff.newHeader === 'undefined' ? '' : '\\t' + diff.newHeader));\n\n    for (var i = 0; i < diff.hunks.length; i++) {\n      var hunk = diff.hunks[i];\n      ret.push('@@ -' + hunk.oldStart + ',' + hunk.oldLines + ' +' + hunk.newStart + ',' + hunk.newLines + ' @@');\n      ret.push.apply(ret, hunk.lines);\n    }\n\n    return ret.join('\\n') + '\\n';\n  }\n  function createPatch(fileName, oldStr, newStr, oldHeader, newHeader, options) {\n    return createTwoFilesPatch(fileName, fileName, oldStr, newStr, oldHeader, newHeader, options);\n  }\n\n  function arrayEqual(a, b) {\n    if (a.length !== b.length) {\n      return false;\n    }\n\n    return arrayStartsWith(a, b);\n  }\n  function arrayStartsWith(array, start) {\n    if (start.length > array.length) {\n      return false;\n    }\n\n    for (var i = 0; i < start.length; i++) {\n      if (start[i] !== array[i]) {\n        return false;\n      }\n    }\n\n    return true;\n  }\n\n  function calcLineCount(hunk) {\n    var _calcOldNewLineCount = calcOldNewLineCount(hunk.lines),\n        oldLines = _calcOldNewLineCount.oldLines,\n        newLines = _calcOldNewLineCount.newLines;\n\n    if (oldLines !== undefined) {\n      hunk.oldLines = oldLines;\n    } else {\n      delete hunk.oldLines;\n    }\n\n    if (newLines !== undefined) {\n      hunk.newLines = newLines;\n    } else {\n      delete hunk.newLines;\n    }\n  }\n  function merge(mine, theirs, base) {\n    mine = loadPatch(mine, base);\n    theirs = loadPatch(theirs, base);\n    var ret = {}; // For index we just let it pass through as it doesn't have any necessary meaning.\n    // Leaving sanity checks on this to the API consumer that may know more about the\n    // meaning in their own context.\n\n    if (mine.index || theirs.index) {\n      ret.index = mine.index || theirs.index;\n    }\n\n    if (mine.newFileName || theirs.newFileName) {\n      if (!fileNameChanged(mine)) {\n        // No header or no change in ours, use theirs (and ours if theirs does not exist)\n        ret.oldFileName = theirs.oldFileName || mine.oldFileName;\n        ret.newFileName = theirs.newFileName || mine.newFileName;\n        ret.oldHeader = theirs.oldHeader || mine.oldHeader;\n        ret.newHeader = theirs.newHeader || mine.newHeader;\n      } else if (!fileNameChanged(theirs)) {\n        // No header or no change in theirs, use ours\n        ret.oldFileName = mine.oldFileName;\n        ret.newFileName = mine.newFileName;\n        ret.oldHeader = mine.oldHeader;\n        ret.newHeader = mine.newHeader;\n      } else {\n        // Both changed... figure it out\n        ret.oldFileName = selectField(ret, mine.oldFileName, theirs.oldFileName);\n        ret.newFileName = selectField(ret, mine.newFileName, theirs.newFileName);\n        ret.oldHeader = selectField(ret, mine.oldHeader, theirs.oldHeader);\n        ret.newHeader = selectField(ret, mine.newHeader, theirs.newHeader);\n      }\n    }\n\n    ret.hunks = [];\n    var mineIndex = 0,\n        theirsIndex = 0,\n        mineOffset = 0,\n        theirsOffset = 0;\n\n    while (mineIndex < mine.hunks.length || theirsIndex < theirs.hunks.length) {\n      var mineCurrent = mine.hunks[mineIndex] || {\n        oldStart: Infinity\n      },\n          theirsCurrent = theirs.hunks[theirsIndex] || {\n        oldStart: Infinity\n      };\n\n      if (hunkBefore(mineCurrent, theirsCurrent)) {\n        // This patch does not overlap with any of the others, yay.\n        ret.hunks.push(cloneHunk(mineCurrent, mineOffset));\n        mineIndex++;\n        theirsOffset += mineCurrent.newLines - mineCurrent.oldLines;\n      } else if (hunkBefore(theirsCurrent, mineCurrent)) {\n        // This patch does not overlap with any of the others, yay.\n        ret.hunks.push(cloneHunk(theirsCurrent, theirsOffset));\n        theirsIndex++;\n        mineOffset += theirsCurrent.newLines - theirsCurrent.oldLines;\n      } else {\n        // Overlap, merge as best we can\n        var mergedHunk = {\n          oldStart: Math.min(mineCurrent.oldStart, theirsCurrent.oldStart),\n          oldLines: 0,\n          newStart: Math.min(mineCurrent.newStart + mineOffset, theirsCurrent.oldStart + theirsOffset),\n          newLines: 0,\n          lines: []\n        };\n        mergeLines(mergedHunk, mineCurrent.oldStart, mineCurrent.lines, theirsCurrent.oldStart, theirsCurrent.lines);\n        theirsIndex++;\n        mineIndex++;\n        ret.hunks.push(mergedHunk);\n      }\n    }\n\n    return ret;\n  }\n\n  function loadPatch(param, base) {\n    if (typeof param === 'string') {\n      if (/^@@/m.test(param) || /^Index:/m.test(param)) {\n        return parsePatch(param)[0];\n      }\n\n      if (!base) {\n        throw new Error('Must provide a base reference or pass in a patch');\n      }\n\n      return structuredPatch(undefined, undefined, base, param);\n    }\n\n    return param;\n  }\n\n  function fileNameChanged(patch) {\n    return patch.newFileName && patch.newFileName !== patch.oldFileName;\n  }\n\n  function selectField(index, mine, theirs) {\n    if (mine === theirs) {\n      return mine;\n    } else {\n      index.conflict = true;\n      return {\n        mine: mine,\n        theirs: theirs\n      };\n    }\n  }\n\n  function hunkBefore(test, check) {\n    return test.oldStart < check.oldStart && test.oldStart + test.oldLines < check.oldStart;\n  }\n\n  function cloneHunk(hunk, offset) {\n    return {\n      oldStart: hunk.oldStart,\n      oldLines: hunk.oldLines,\n      newStart: hunk.newStart + offset,\n      newLines: hunk.newLines,\n      lines: hunk.lines\n    };\n  }\n\n  function mergeLines(hunk, mineOffset, mineLines, theirOffset, theirLines) {\n    // This will generally result in a conflicted hunk, but there are cases where the context\n    // is the only overlap where we can successfully merge the content here.\n    var mine = {\n      offset: mineOffset,\n      lines: mineLines,\n      index: 0\n    },\n        their = {\n      offset: theirOffset,\n      lines: theirLines,\n      index: 0\n    }; // Handle any leading content\n\n    insertLeading(hunk, mine, their);\n    insertLeading(hunk, their, mine); // Now in the overlap content. Scan through and select the best changes from each.\n\n    while (mine.index < mine.lines.length && their.index < their.lines.length) {\n      var mineCurrent = mine.lines[mine.index],\n          theirCurrent = their.lines[their.index];\n\n      if ((mineCurrent[0] === '-' || mineCurrent[0] === '+') && (theirCurrent[0] === '-' || theirCurrent[0] === '+')) {\n        // Both modified ...\n        mutualChange(hunk, mine, their);\n      } else if (mineCurrent[0] === '+' && theirCurrent[0] === ' ') {\n        var _hunk$lines;\n\n        // Mine inserted\n        (_hunk$lines = hunk.lines).push.apply(_hunk$lines, _toConsumableArray(collectChange(mine)));\n      } else if (theirCurrent[0] === '+' && mineCurrent[0] === ' ') {\n        var _hunk$lines2;\n\n        // Theirs inserted\n        (_hunk$lines2 = hunk.lines).push.apply(_hunk$lines2, _toConsumableArray(collectChange(their)));\n      } else if (mineCurrent[0] === '-' && theirCurrent[0] === ' ') {\n        // Mine removed or edited\n        removal(hunk, mine, their);\n      } else if (theirCurrent[0] === '-' && mineCurrent[0] === ' ') {\n        // Their removed or edited\n        removal(hunk, their, mine, true);\n      } else if (mineCurrent === theirCurrent) {\n        // Context identity\n        hunk.lines.push(mineCurrent);\n        mine.index++;\n        their.index++;\n      } else {\n        // Context mismatch\n        conflict(hunk, collectChange(mine), collectChange(their));\n      }\n    } // Now push anything that may be remaining\n\n\n    insertTrailing(hunk, mine);\n    insertTrailing(hunk, their);\n    calcLineCount(hunk);\n  }\n\n  function mutualChange(hunk, mine, their) {\n    var myChanges = collectChange(mine),\n        theirChanges = collectChange(their);\n\n    if (allRemoves(myChanges) && allRemoves(theirChanges)) {\n      // Special case for remove changes that are supersets of one another\n      if (arrayStartsWith(myChanges, theirChanges) && skipRemoveSuperset(their, myChanges, myChanges.length - theirChanges.length)) {\n        var _hunk$lines3;\n\n        (_hunk$lines3 = hunk.lines).push.apply(_hunk$lines3, _toConsumableArray(myChanges));\n\n        return;\n      } else if (arrayStartsWith(theirChanges, myChanges) && skipRemoveSuperset(mine, theirChanges, theirChanges.length - myChanges.length)) {\n        var _hunk$lines4;\n\n        (_hunk$lines4 = hunk.lines).push.apply(_hunk$lines4, _toConsumableArray(theirChanges));\n\n        return;\n      }\n    } else if (arrayEqual(myChanges, theirChanges)) {\n      var _hunk$lines5;\n\n      (_hunk$lines5 = hunk.lines).push.apply(_hunk$lines5, _toConsumableArray(myChanges));\n\n      return;\n    }\n\n    conflict(hunk, myChanges, theirChanges);\n  }\n\n  function removal(hunk, mine, their, swap) {\n    var myChanges = collectChange(mine),\n        theirChanges = collectContext(their, myChanges);\n\n    if (theirChanges.merged) {\n      var _hunk$lines6;\n\n      (_hunk$lines6 = hunk.lines).push.apply(_hunk$lines6, _toConsumableArray(theirChanges.merged));\n    } else {\n      conflict(hunk, swap ? theirChanges : myChanges, swap ? myChanges : theirChanges);\n    }\n  }\n\n  function conflict(hunk, mine, their) {\n    hunk.conflict = true;\n    hunk.lines.push({\n      conflict: true,\n      mine: mine,\n      theirs: their\n    });\n  }\n\n  function insertLeading(hunk, insert, their) {\n    while (insert.offset < their.offset && insert.index < insert.lines.length) {\n      var line = insert.lines[insert.index++];\n      hunk.lines.push(line);\n      insert.offset++;\n    }\n  }\n\n  function insertTrailing(hunk, insert) {\n    while (insert.index < insert.lines.length) {\n      var line = insert.lines[insert.index++];\n      hunk.lines.push(line);\n    }\n  }\n\n  function collectChange(state) {\n    var ret = [],\n        operation = state.lines[state.index][0];\n\n    while (state.index < state.lines.length) {\n      var line = state.lines[state.index]; // Group additions that are immediately after subtractions and treat them as one \"atomic\" modify change.\n\n      if (operation === '-' && line[0] === '+') {\n        operation = '+';\n      }\n\n      if (operation === line[0]) {\n        ret.push(line);\n        state.index++;\n      } else {\n        break;\n      }\n    }\n\n    return ret;\n  }\n\n  function collectContext(state, matchChanges) {\n    var changes = [],\n        merged = [],\n        matchIndex = 0,\n        contextChanges = false,\n        conflicted = false;\n\n    while (matchIndex < matchChanges.length && state.index < state.lines.length) {\n      var change = state.lines[state.index],\n          match = matchChanges[matchIndex]; // Once we've hit our add, then we are done\n\n      if (match[0] === '+') {\n        break;\n      }\n\n      contextChanges = contextChanges || change[0] !== ' ';\n      merged.push(match);\n      matchIndex++; // Consume any additions in the other block as a conflict to attempt\n      // to pull in the remaining context after this\n\n      if (change[0] === '+') {\n        conflicted = true;\n\n        while (change[0] === '+') {\n          changes.push(change);\n          change = state.lines[++state.index];\n        }\n      }\n\n      if (match.substr(1) === change.substr(1)) {\n        changes.push(change);\n        state.index++;\n      } else {\n        conflicted = true;\n      }\n    }\n\n    if ((matchChanges[matchIndex] || '')[0] === '+' && contextChanges) {\n      conflicted = true;\n    }\n\n    if (conflicted) {\n      return changes;\n    }\n\n    while (matchIndex < matchChanges.length) {\n      merged.push(matchChanges[matchIndex++]);\n    }\n\n    return {\n      merged: merged,\n      changes: changes\n    };\n  }\n\n  function allRemoves(changes) {\n    return changes.reduce(function (prev, change) {\n      return prev && change[0] === '-';\n    }, true);\n  }\n\n  function skipRemoveSuperset(state, removeChanges, delta) {\n    for (var i = 0; i < delta; i++) {\n      var changeContent = removeChanges[removeChanges.length - delta + i].substr(1);\n\n      if (state.lines[state.index + i] !== ' ' + changeContent) {\n        return false;\n      }\n    }\n\n    state.index += delta;\n    return true;\n  }\n\n  function calcOldNewLineCount(lines) {\n    var oldLines = 0;\n    var newLines = 0;\n    lines.forEach(function (line) {\n      if (typeof line !== 'string') {\n        var myCount = calcOldNewLineCount(line.mine);\n        var theirCount = calcOldNewLineCount(line.theirs);\n\n        if (oldLines !== undefined) {\n          if (myCount.oldLines === theirCount.oldLines) {\n            oldLines += myCount.oldLines;\n          } else {\n            oldLines = undefined;\n          }\n        }\n\n        if (newLines !== undefined) {\n          if (myCount.newLines === theirCount.newLines) {\n            newLines += myCount.newLines;\n          } else {\n            newLines = undefined;\n          }\n        }\n      } else {\n        if (newLines !== undefined && (line[0] === '+' || line[0] === ' ')) {\n          newLines++;\n        }\n\n        if (oldLines !== undefined && (line[0] === '-' || line[0] === ' ')) {\n          oldLines++;\n        }\n      }\n    });\n    return {\n      oldLines: oldLines,\n      newLines: newLines\n    };\n  }\n\n  // See: http://code.google.com/p/google-diff-match-patch/wiki/API\n  function convertChangesToDMP(changes) {\n    var ret = [],\n        change,\n        operation;\n\n    for (var i = 0; i < changes.length; i++) {\n      change = changes[i];\n\n      if (change.added) {\n        operation = 1;\n      } else if (change.removed) {\n        operation = -1;\n      } else {\n        operation = 0;\n      }\n\n      ret.push([operation, change.value]);\n    }\n\n    return ret;\n  }\n\n  function convertChangesToXML(changes) {\n    var ret = [];\n\n    for (var i = 0; i < changes.length; i++) {\n      var change = changes[i];\n\n      if (change.added) {\n        ret.push('<ins>');\n      } else if (change.removed) {\n        ret.push('<del>');\n      }\n\n      ret.push(escapeHTML(change.value));\n\n      if (change.added) {\n        ret.push('</ins>');\n      } else if (change.removed) {\n        ret.push('</del>');\n      }\n    }\n\n    return ret.join('');\n  }\n\n  function escapeHTML(s) {\n    var n = s;\n    n = n.replace(/&/g, '&amp;');\n    n = n.replace(/</g, '&lt;');\n    n = n.replace(/>/g, '&gt;');\n    n = n.replace(/\"/g, '&quot;');\n    return n;\n  }\n\n  /* See LICENSE file for terms of use */\n\n  exports.Diff = Diff;\n  exports.diffChars = diffChars;\n  exports.diffWords = diffWords;\n  exports.diffWordsWithSpace = diffWordsWithSpace;\n  exports.diffLines = diffLines;\n  exports.diffTrimmedLines = diffTrimmedLines;\n  exports.diffSentences = diffSentences;\n  exports.diffCss = diffCss;\n  exports.diffJson = diffJson;\n  exports.diffArrays = diffArrays;\n  exports.structuredPatch = structuredPatch;\n  exports.createTwoFilesPatch = createTwoFilesPatch;\n  exports.createPatch = createPatch;\n  exports.applyPatch = applyPatch;\n  exports.applyPatches = applyPatches;\n  exports.parsePatch = parsePatch;\n  exports.merge = merge;\n  exports.convertChangesToDMP = convertChangesToDMP;\n  exports.convertChangesToXML = convertChangesToXML;\n  exports.canonicalize = canonicalize;\n\n  Object.defineProperty(exports, '__esModule', { value: true });\n\n}));\n","module.exports = Array.isArray || function (arr) {\n  return Object.prototype.toString.call(arr) == '[object Array]';\n};\n","module.exports = extend;\n\n/*\n  var obj = {a: 3, b: 5};\n  extend(obj, {a: 4, c: 8}); // {a: 4, b: 5, c: 8}\n  obj; // {a: 4, b: 5, c: 8}\n\n  var obj = {a: 3, b: 5};\n  extend({}, obj, {a: 4, c: 8}); // {a: 4, b: 5, c: 8}\n  obj; // {a: 3, b: 5}\n\n  var arr = [1, 2, 3];\n  var obj = {a: 3, b: 5};\n  extend(obj, {c: arr}); // {a: 3, b: 5, c: [1, 2, 3]}\n  arr.push(4);\n  obj; // {a: 3, b: 5, c: [1, 2, 3, 4]}\n\n  var arr = [1, 2, 3];\n  var obj = {a: 3, b: 5};\n  extend(true, obj, {c: arr}); // {a: 3, b: 5, c: [1, 2, 3]}\n  arr.push(4);\n  obj; // {a: 3, b: 5, c: [1, 2, 3]}\n\n  extend({a: 4, b: 5}); // {a: 4, b: 5}\n  extend({a: 4, b: 5}, 3); {a: 4, b: 5}\n  extend({a: 4, b: 5}, true); {a: 4, b: 5}\n  extend('hello', {a: 4, b: 5}); // throws\n  extend(3, {a: 4, b: 5}); // throws\n*/\n\nfunction extend(/* [deep], obj1, obj2, [objn] */) {\n  var args = [].slice.call(arguments);\n  var deep = false;\n  if (typeof args[0] == 'boolean') {\n    deep = args.shift();\n  }\n  var result = args[0];\n  if (isUnextendable(result)) {\n    throw new Error('extendee must be an object');\n  }\n  var extenders = args.slice(1);\n  var len = extenders.length;\n  for (var i = 0; i < len; i++) {\n    var extender = extenders[i];\n    for (var key in extender) {\n      if (extender.hasOwnProperty(key)) {\n        var value = extender[key];\n        if (deep && isCloneable(value)) {\n          var base = Array.isArray(value) ? [] : {};\n          result[key] = extend(\n            true,\n            result.hasOwnProperty(key) && !isUnextendable(result[key])\n              ? result[key]\n              : base,\n            value\n          );\n        } else {\n          result[key] = value;\n        }\n      }\n    }\n  }\n  return result;\n}\n\nfunction isCloneable(obj) {\n  return Array.isArray(obj) || {}.toString.call(obj) == '[object Object]';\n}\n\nfunction isUnextendable(val) {\n  return !val || (typeof val != 'object' && typeof val != 'function');\n}\n","/**\n * lodash (Custom Build) <https://lodash.com/>\n * Build: `lodash modularize exports=\"npm\" -o ./`\n * Copyright jQuery Foundation and other contributors <https://jquery.org/>\n * Released under MIT license <https://lodash.com/license>\n * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>\n * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors\n */\n\n/** Used as the `TypeError` message for \"Functions\" methods. */\nvar FUNC_ERROR_TEXT = 'Expected a function';\n\n/** Used to stand-in for `undefined` hash values. */\nvar HASH_UNDEFINED = '__lodash_hash_undefined__';\n\n/** Used as references for various `Number` constants. */\nvar INFINITY = 1 / 0;\n\n/** `Object#toString` result references. */\nvar funcTag = '[object Function]',\n    genTag = '[object GeneratorFunction]',\n    symbolTag = '[object Symbol]';\n\n/** Used to match property names within property paths. */\nvar reIsDeepProp = /\\.|\\[(?:[^[\\]]*|([\"'])(?:(?!\\1)[^\\\\]|\\\\.)*?\\1)\\]/,\n    reIsPlainProp = /^\\w*$/,\n    reLeadingDot = /^\\./,\n    rePropName = /[^.[\\]]+|\\[(?:(-?\\d+(?:\\.\\d+)?)|([\"'])((?:(?!\\2)[^\\\\]|\\\\.)*?)\\2)\\]|(?=(?:\\.|\\[\\])(?:\\.|\\[\\]|$))/g;\n\n/**\n * Used to match `RegExp`\n * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).\n */\nvar reRegExpChar = /[\\\\^$.*+?()[\\]{}|]/g;\n\n/** Used to match backslashes in property paths. */\nvar reEscapeChar = /\\\\(\\\\)?/g;\n\n/** Used to detect host constructors (Safari). */\nvar reIsHostCtor = /^\\[object .+?Constructor\\]$/;\n\n/** Detect free variable `global` from Node.js. */\nvar freeGlobal = typeof global == 'object' && global && global.Object === Object && global;\n\n/** Detect free variable `self`. */\nvar freeSelf = typeof self == 'object' && self && self.Object === Object && self;\n\n/** Used as a reference to the global object. */\nvar root = freeGlobal || freeSelf || Function('return this')();\n\n/**\n * Gets the value at `key` of `object`.\n *\n * @private\n * @param {Object} [object] The object to query.\n * @param {string} key The key of the property to get.\n * @returns {*} Returns the property value.\n */\nfunction getValue(object, key) {\n  return object == null ? undefined : object[key];\n}\n\n/**\n * Checks if `value` is a host object in IE < 9.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a host object, else `false`.\n */\nfunction isHostObject(value) {\n  // Many host objects are `Object` objects that can coerce to strings\n  // despite having improperly defined `toString` methods.\n  var result = false;\n  if (value != null && typeof value.toString != 'function') {\n    try {\n      result = !!(value + '');\n    } catch (e) {}\n  }\n  return result;\n}\n\n/** Used for built-in method references. */\nvar arrayProto = Array.prototype,\n    funcProto = Function.prototype,\n    objectProto = Object.prototype;\n\n/** Used to detect overreaching core-js shims. */\nvar coreJsData = root['__core-js_shared__'];\n\n/** Used to detect methods masquerading as native. */\nvar maskSrcKey = (function() {\n  var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || '');\n  return uid ? ('Symbol(src)_1.' + uid) : '';\n}());\n\n/** Used to resolve the decompiled source of functions. */\nvar funcToString = funcProto.toString;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Used to resolve the\n * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objectToString = objectProto.toString;\n\n/** Used to detect if a method is native. */\nvar reIsNative = RegExp('^' +\n  funcToString.call(hasOwnProperty).replace(reRegExpChar, '\\\\$&')\n  .replace(/hasOwnProperty|(function).*?(?=\\\\\\()| for .+?(?=\\\\\\])/g, '$1.*?') + '$'\n);\n\n/** Built-in value references. */\nvar Symbol = root.Symbol,\n    splice = arrayProto.splice;\n\n/* Built-in method references that are verified to be native. */\nvar Map = getNative(root, 'Map'),\n    nativeCreate = getNative(Object, 'create');\n\n/** Used to convert symbols to primitives and strings. */\nvar symbolProto = Symbol ? Symbol.prototype : undefined,\n    symbolToString = symbolProto ? symbolProto.toString : undefined;\n\n/**\n * Creates a hash object.\n *\n * @private\n * @constructor\n * @param {Array} [entries] The key-value pairs to cache.\n */\nfunction Hash(entries) {\n  var index = -1,\n      length = entries ? entries.length : 0;\n\n  this.clear();\n  while (++index < length) {\n    var entry = entries[index];\n    this.set(entry[0], entry[1]);\n  }\n}\n\n/**\n * Removes all key-value entries from the hash.\n *\n * @private\n * @name clear\n * @memberOf Hash\n */\nfunction hashClear() {\n  this.__data__ = nativeCreate ? nativeCreate(null) : {};\n}\n\n/**\n * Removes `key` and its value from the hash.\n *\n * @private\n * @name delete\n * @memberOf Hash\n * @param {Object} hash The hash to modify.\n * @param {string} key The key of the value to remove.\n * @returns {boolean} Returns `true` if the entry was removed, else `false`.\n */\nfunction hashDelete(key) {\n  return this.has(key) && delete this.__data__[key];\n}\n\n/**\n * Gets the hash value for `key`.\n *\n * @private\n * @name get\n * @memberOf Hash\n * @param {string} key The key of the value to get.\n * @returns {*} Returns the entry value.\n */\nfunction hashGet(key) {\n  var data = this.__data__;\n  if (nativeCreate) {\n    var result = data[key];\n    return result === HASH_UNDEFINED ? undefined : result;\n  }\n  return hasOwnProperty.call(data, key) ? data[key] : undefined;\n}\n\n/**\n * Checks if a hash value for `key` exists.\n *\n * @private\n * @name has\n * @memberOf Hash\n * @param {string} key The key of the entry to check.\n * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.\n */\nfunction hashHas(key) {\n  var data = this.__data__;\n  return nativeCreate ? data[key] !== undefined : hasOwnProperty.call(data, key);\n}\n\n/**\n * Sets the hash `key` to `value`.\n *\n * @private\n * @name set\n * @memberOf Hash\n * @param {string} key The key of the value to set.\n * @param {*} value The value to set.\n * @returns {Object} Returns the hash instance.\n */\nfunction hashSet(key, value) {\n  var data = this.__data__;\n  data[key] = (nativeCreate && value === undefined) ? HASH_UNDEFINED : value;\n  return this;\n}\n\n// Add methods to `Hash`.\nHash.prototype.clear = hashClear;\nHash.prototype['delete'] = hashDelete;\nHash.prototype.get = hashGet;\nHash.prototype.has = hashHas;\nHash.prototype.set = hashSet;\n\n/**\n * Creates an list cache object.\n *\n * @private\n * @constructor\n * @param {Array} [entries] The key-value pairs to cache.\n */\nfunction ListCache(entries) {\n  var index = -1,\n      length = entries ? entries.length : 0;\n\n  this.clear();\n  while (++index < length) {\n    var entry = entries[index];\n    this.set(entry[0], entry[1]);\n  }\n}\n\n/**\n * Removes all key-value entries from the list cache.\n *\n * @private\n * @name clear\n * @memberOf ListCache\n */\nfunction listCacheClear() {\n  this.__data__ = [];\n}\n\n/**\n * Removes `key` and its value from the list cache.\n *\n * @private\n * @name delete\n * @memberOf ListCache\n * @param {string} key The key of the value to remove.\n * @returns {boolean} Returns `true` if the entry was removed, else `false`.\n */\nfunction listCacheDelete(key) {\n  var data = this.__data__,\n      index = assocIndexOf(data, key);\n\n  if (index < 0) {\n    return false;\n  }\n  var lastIndex = data.length - 1;\n  if (index == lastIndex) {\n    data.pop();\n  } else {\n    splice.call(data, index, 1);\n  }\n  return true;\n}\n\n/**\n * Gets the list cache value for `key`.\n *\n * @private\n * @name get\n * @memberOf ListCache\n * @param {string} key The key of the value to get.\n * @returns {*} Returns the entry value.\n */\nfunction listCacheGet(key) {\n  var data = this.__data__,\n      index = assocIndexOf(data, key);\n\n  return index < 0 ? undefined : data[index][1];\n}\n\n/**\n * Checks if a list cache value for `key` exists.\n *\n * @private\n * @name has\n * @memberOf ListCache\n * @param {string} key The key of the entry to check.\n * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.\n */\nfunction listCacheHas(key) {\n  return assocIndexOf(this.__data__, key) > -1;\n}\n\n/**\n * Sets the list cache `key` to `value`.\n *\n * @private\n * @name set\n * @memberOf ListCache\n * @param {string} key The key of the value to set.\n * @param {*} value The value to set.\n * @returns {Object} Returns the list cache instance.\n */\nfunction listCacheSet(key, value) {\n  var data = this.__data__,\n      index = assocIndexOf(data, key);\n\n  if (index < 0) {\n    data.push([key, value]);\n  } else {\n    data[index][1] = value;\n  }\n  return this;\n}\n\n// Add methods to `ListCache`.\nListCache.prototype.clear = listCacheClear;\nListCache.prototype['delete'] = listCacheDelete;\nListCache.prototype.get = listCacheGet;\nListCache.prototype.has = listCacheHas;\nListCache.prototype.set = listCacheSet;\n\n/**\n * Creates a map cache object to store key-value pairs.\n *\n * @private\n * @constructor\n * @param {Array} [entries] The key-value pairs to cache.\n */\nfunction MapCache(entries) {\n  var index = -1,\n      length = entries ? entries.length : 0;\n\n  this.clear();\n  while (++index < length) {\n    var entry = entries[index];\n    this.set(entry[0], entry[1]);\n  }\n}\n\n/**\n * Removes all key-value entries from the map.\n *\n * @private\n * @name clear\n * @memberOf MapCache\n */\nfunction mapCacheClear() {\n  this.__data__ = {\n    'hash': new Hash,\n    'map': new (Map || ListCache),\n    'string': new Hash\n  };\n}\n\n/**\n * Removes `key` and its value from the map.\n *\n * @private\n * @name delete\n * @memberOf MapCache\n * @param {string} key The key of the value to remove.\n * @returns {boolean} Returns `true` if the entry was removed, else `false`.\n */\nfunction mapCacheDelete(key) {\n  return getMapData(this, key)['delete'](key);\n}\n\n/**\n * Gets the map value for `key`.\n *\n * @private\n * @name get\n * @memberOf MapCache\n * @param {string} key The key of the value to get.\n * @returns {*} Returns the entry value.\n */\nfunction mapCacheGet(key) {\n  return getMapData(this, key).get(key);\n}\n\n/**\n * Checks if a map value for `key` exists.\n *\n * @private\n * @name has\n * @memberOf MapCache\n * @param {string} key The key of the entry to check.\n * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.\n */\nfunction mapCacheHas(key) {\n  return getMapData(this, key).has(key);\n}\n\n/**\n * Sets the map `key` to `value`.\n *\n * @private\n * @name set\n * @memberOf MapCache\n * @param {string} key The key of the value to set.\n * @param {*} value The value to set.\n * @returns {Object} Returns the map cache instance.\n */\nfunction mapCacheSet(key, value) {\n  getMapData(this, key).set(key, value);\n  return this;\n}\n\n// Add methods to `MapCache`.\nMapCache.prototype.clear = mapCacheClear;\nMapCache.prototype['delete'] = mapCacheDelete;\nMapCache.prototype.get = mapCacheGet;\nMapCache.prototype.has = mapCacheHas;\nMapCache.prototype.set = mapCacheSet;\n\n/**\n * Gets the index at which the `key` is found in `array` of key-value pairs.\n *\n * @private\n * @param {Array} array The array to inspect.\n * @param {*} key The key to search for.\n * @returns {number} Returns the index of the matched value, else `-1`.\n */\nfunction assocIndexOf(array, key) {\n  var length = array.length;\n  while (length--) {\n    if (eq(array[length][0], key)) {\n      return length;\n    }\n  }\n  return -1;\n}\n\n/**\n * The base implementation of `_.get` without support for default values.\n *\n * @private\n * @param {Object} object The object to query.\n * @param {Array|string} path The path of the property to get.\n * @returns {*} Returns the resolved value.\n */\nfunction baseGet(object, path) {\n  path = isKey(path, object) ? [path] : castPath(path);\n\n  var index = 0,\n      length = path.length;\n\n  while (object != null && index < length) {\n    object = object[toKey(path[index++])];\n  }\n  return (index && index == length) ? object : undefined;\n}\n\n/**\n * The base implementation of `_.isNative` without bad shim checks.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a native function,\n *  else `false`.\n */\nfunction baseIsNative(value) {\n  if (!isObject(value) || isMasked(value)) {\n    return false;\n  }\n  var pattern = (isFunction(value) || isHostObject(value)) ? reIsNative : reIsHostCtor;\n  return pattern.test(toSource(value));\n}\n\n/**\n * The base implementation of `_.toString` which doesn't convert nullish\n * values to empty strings.\n *\n * @private\n * @param {*} value The value to process.\n * @returns {string} Returns the string.\n */\nfunction baseToString(value) {\n  // Exit early for strings to avoid a performance hit in some environments.\n  if (typeof value == 'string') {\n    return value;\n  }\n  if (isSymbol(value)) {\n    return symbolToString ? symbolToString.call(value) : '';\n  }\n  var result = (value + '');\n  return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;\n}\n\n/**\n * Casts `value` to a path array if it's not one.\n *\n * @private\n * @param {*} value The value to inspect.\n * @returns {Array} Returns the cast property path array.\n */\nfunction castPath(value) {\n  return isArray(value) ? value : stringToPath(value);\n}\n\n/**\n * Gets the data for `map`.\n *\n * @private\n * @param {Object} map The map to query.\n * @param {string} key The reference key.\n * @returns {*} Returns the map data.\n */\nfunction getMapData(map, key) {\n  var data = map.__data__;\n  return isKeyable(key)\n    ? data[typeof key == 'string' ? 'string' : 'hash']\n    : data.map;\n}\n\n/**\n * Gets the native function at `key` of `object`.\n *\n * @private\n * @param {Object} object The object to query.\n * @param {string} key The key of the method to get.\n * @returns {*} Returns the function if it's native, else `undefined`.\n */\nfunction getNative(object, key) {\n  var value = getValue(object, key);\n  return baseIsNative(value) ? value : undefined;\n}\n\n/**\n * Checks if `value` is a property name and not a property path.\n *\n * @private\n * @param {*} value The value to check.\n * @param {Object} [object] The object to query keys on.\n * @returns {boolean} Returns `true` if `value` is a property name, else `false`.\n */\nfunction isKey(value, object) {\n  if (isArray(value)) {\n    return false;\n  }\n  var type = typeof value;\n  if (type == 'number' || type == 'symbol' || type == 'boolean' ||\n      value == null || isSymbol(value)) {\n    return true;\n  }\n  return reIsPlainProp.test(value) || !reIsDeepProp.test(value) ||\n    (object != null && value in Object(object));\n}\n\n/**\n * Checks if `value` is suitable for use as unique object key.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is suitable, else `false`.\n */\nfunction isKeyable(value) {\n  var type = typeof value;\n  return (type == 'string' || type == 'number' || type == 'symbol' || type == 'boolean')\n    ? (value !== '__proto__')\n    : (value === null);\n}\n\n/**\n * Checks if `func` has its source masked.\n *\n * @private\n * @param {Function} func The function to check.\n * @returns {boolean} Returns `true` if `func` is masked, else `false`.\n */\nfunction isMasked(func) {\n  return !!maskSrcKey && (maskSrcKey in func);\n}\n\n/**\n * Converts `string` to a property path array.\n *\n * @private\n * @param {string} string The string to convert.\n * @returns {Array} Returns the property path array.\n */\nvar stringToPath = memoize(function(string) {\n  string = toString(string);\n\n  var result = [];\n  if (reLeadingDot.test(string)) {\n    result.push('');\n  }\n  string.replace(rePropName, function(match, number, quote, string) {\n    result.push(quote ? string.replace(reEscapeChar, '$1') : (number || match));\n  });\n  return result;\n});\n\n/**\n * Converts `value` to a string key if it's not a string or symbol.\n *\n * @private\n * @param {*} value The value to inspect.\n * @returns {string|symbol} Returns the key.\n */\nfunction toKey(value) {\n  if (typeof value == 'string' || isSymbol(value)) {\n    return value;\n  }\n  var result = (value + '');\n  return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;\n}\n\n/**\n * Converts `func` to its source code.\n *\n * @private\n * @param {Function} func The function to process.\n * @returns {string} Returns the source code.\n */\nfunction toSource(func) {\n  if (func != null) {\n    try {\n      return funcToString.call(func);\n    } catch (e) {}\n    try {\n      return (func + '');\n    } catch (e) {}\n  }\n  return '';\n}\n\n/**\n * Creates a function that memoizes the result of `func`. If `resolver` is\n * provided, it determines the cache key for storing the result based on the\n * arguments provided to the memoized function. By default, the first argument\n * provided to the memoized function is used as the map cache key. The `func`\n * is invoked with the `this` binding of the memoized function.\n *\n * **Note:** The cache is exposed as the `cache` property on the memoized\n * function. Its creation may be customized by replacing the `_.memoize.Cache`\n * constructor with one whose instances implement the\n * [`Map`](http://ecma-international.org/ecma-262/7.0/#sec-properties-of-the-map-prototype-object)\n * method interface of `delete`, `get`, `has`, and `set`.\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Function\n * @param {Function} func The function to have its output memoized.\n * @param {Function} [resolver] The function to resolve the cache key.\n * @returns {Function} Returns the new memoized function.\n * @example\n *\n * var object = { 'a': 1, 'b': 2 };\n * var other = { 'c': 3, 'd': 4 };\n *\n * var values = _.memoize(_.values);\n * values(object);\n * // => [1, 2]\n *\n * values(other);\n * // => [3, 4]\n *\n * object.a = 2;\n * values(object);\n * // => [1, 2]\n *\n * // Modify the result cache.\n * values.cache.set(object, ['a', 'b']);\n * values(object);\n * // => ['a', 'b']\n *\n * // Replace `_.memoize.Cache`.\n * _.memoize.Cache = WeakMap;\n */\nfunction memoize(func, resolver) {\n  if (typeof func != 'function' || (resolver && typeof resolver != 'function')) {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  var memoized = function() {\n    var args = arguments,\n        key = resolver ? resolver.apply(this, args) : args[0],\n        cache = memoized.cache;\n\n    if (cache.has(key)) {\n      return cache.get(key);\n    }\n    var result = func.apply(this, args);\n    memoized.cache = cache.set(key, result);\n    return result;\n  };\n  memoized.cache = new (memoize.Cache || MapCache);\n  return memoized;\n}\n\n// Assign cache to `_.memoize`.\nmemoize.Cache = MapCache;\n\n/**\n * Performs a\n * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)\n * comparison between two values to determine if they are equivalent.\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to compare.\n * @param {*} other The other value to compare.\n * @returns {boolean} Returns `true` if the values are equivalent, else `false`.\n * @example\n *\n * var object = { 'a': 1 };\n * var other = { 'a': 1 };\n *\n * _.eq(object, object);\n * // => true\n *\n * _.eq(object, other);\n * // => false\n *\n * _.eq('a', 'a');\n * // => true\n *\n * _.eq('a', Object('a'));\n * // => false\n *\n * _.eq(NaN, NaN);\n * // => true\n */\nfunction eq(value, other) {\n  return value === other || (value !== value && other !== other);\n}\n\n/**\n * Checks if `value` is classified as an `Array` object.\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is an array, else `false`.\n * @example\n *\n * _.isArray([1, 2, 3]);\n * // => true\n *\n * _.isArray(document.body.children);\n * // => false\n *\n * _.isArray('abc');\n * // => false\n *\n * _.isArray(_.noop);\n * // => false\n */\nvar isArray = Array.isArray;\n\n/**\n * Checks if `value` is classified as a `Function` object.\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a function, else `false`.\n * @example\n *\n * _.isFunction(_);\n * // => true\n *\n * _.isFunction(/abc/);\n * // => false\n */\nfunction isFunction(value) {\n  // The use of `Object#toString` avoids issues with the `typeof` operator\n  // in Safari 8-9 which returns 'object' for typed array and other constructors.\n  var tag = isObject(value) ? objectToString.call(value) : '';\n  return tag == funcTag || tag == genTag;\n}\n\n/**\n * Checks if `value` is the\n * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)\n * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is an object, else `false`.\n * @example\n *\n * _.isObject({});\n * // => true\n *\n * _.isObject([1, 2, 3]);\n * // => true\n *\n * _.isObject(_.noop);\n * // => true\n *\n * _.isObject(null);\n * // => false\n */\nfunction isObject(value) {\n  var type = typeof value;\n  return !!value && (type == 'object' || type == 'function');\n}\n\n/**\n * Checks if `value` is object-like. A value is object-like if it's not `null`\n * and has a `typeof` result of \"object\".\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is object-like, else `false`.\n * @example\n *\n * _.isObjectLike({});\n * // => true\n *\n * _.isObjectLike([1, 2, 3]);\n * // => true\n *\n * _.isObjectLike(_.noop);\n * // => false\n *\n * _.isObjectLike(null);\n * // => false\n */\nfunction isObjectLike(value) {\n  return !!value && typeof value == 'object';\n}\n\n/**\n * Checks if `value` is classified as a `Symbol` primitive or object.\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.\n * @example\n *\n * _.isSymbol(Symbol.iterator);\n * // => true\n *\n * _.isSymbol('abc');\n * // => false\n */\nfunction isSymbol(value) {\n  return typeof value == 'symbol' ||\n    (isObjectLike(value) && objectToString.call(value) == symbolTag);\n}\n\n/**\n * Converts `value` to a string. An empty string is returned for `null`\n * and `undefined` values. The sign of `-0` is preserved.\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to process.\n * @returns {string} Returns the string.\n * @example\n *\n * _.toString(null);\n * // => ''\n *\n * _.toString(-0);\n * // => '-0'\n *\n * _.toString([1, 2, 3]);\n * // => '1,2,3'\n */\nfunction toString(value) {\n  return value == null ? '' : baseToString(value);\n}\n\n/**\n * Gets the value at `path` of `object`. If the resolved value is\n * `undefined`, the `defaultValue` is returned in its place.\n *\n * @static\n * @memberOf _\n * @since 3.7.0\n * @category Object\n * @param {Object} object The object to query.\n * @param {Array|string} path The path of the property to get.\n * @param {*} [defaultValue] The value returned for `undefined` resolved values.\n * @returns {*} Returns the resolved value.\n * @example\n *\n * var object = { 'a': [{ 'b': { 'c': 3 } }] };\n *\n * _.get(object, 'a[0].b.c');\n * // => 3\n *\n * _.get(object, ['a', '0', 'b', 'c']);\n * // => 3\n *\n * _.get(object, 'a.b.c', 'default');\n * // => 'default'\n */\nfunction get(object, path, defaultValue) {\n  var result = object == null ? undefined : baseGet(object, path);\n  return result === undefined ? defaultValue : result;\n}\n\nmodule.exports = get;\n","\"use strict\";\n\n// cache a reference to setTimeout, so that our reference won't be stubbed out\n// when using fake timers and errors will still get logged\n// https://github.com/cjohansen/Sinon.JS/issues/381\nvar realSetTimeout = setTimeout;\n\nfunction configureLogger(config) {\n    // eslint-disable-next-line no-param-reassign\n    config = config || {};\n    // Function which prints errors.\n    if (!config.hasOwnProperty(\"logger\")) {\n        // eslint-disable-next-line no-empty-function\n        config.logger = function() {};\n    }\n    // When set to true, any errors logged will be thrown immediately;\n    // If set to false, the errors will be thrown in separate execution frame.\n    if (!config.hasOwnProperty(\"useImmediateExceptions\")) {\n        config.useImmediateExceptions = true;\n    }\n    // wrap realSetTimeout with something we can stub in tests\n    if (!config.hasOwnProperty(\"setTimeout\")) {\n        config.setTimeout = realSetTimeout;\n    }\n\n    return function logError(label, e) {\n        var msg = label + \" threw exception: \";\n        var err = {\n            name: e.name || label,\n            message: e.message || e.toString(),\n            stack: e.stack\n        };\n\n        function throwLoggedError() {\n            err.message = msg + err.message;\n            throw err;\n        }\n\n        config.logger(msg + \"[\" + err.name + \"] \" + err.message);\n\n        if (err.stack) {\n            config.logger(err.stack);\n        }\n\n        if (config.useImmediateExceptions) {\n            throwLoggedError();\n        } else {\n            config.setTimeout(throwLoggedError, 0);\n        }\n    };\n}\n\nmodule.exports = configureLogger;\n","\"use strict\";\n\nvar Event = require(\"./event\");\n\nfunction CustomEvent(type, customData, target) {\n    this.initEvent(type, false, false, target);\n    this.detail = customData.detail || null;\n}\n\nCustomEvent.prototype = new Event();\n\nCustomEvent.prototype.constructor = CustomEvent;\n\nmodule.exports = CustomEvent;\n","\"use strict\";\n\nfunction flattenOptions(options) {\n    if (options !== Object(options)) {\n        return {\n            capture: Boolean(options),\n            once: false,\n            passive: false\n        };\n    }\n    return {\n        capture: Boolean(options.capture),\n        once: Boolean(options.once),\n        passive: Boolean(options.passive)\n    };\n}\nfunction not(fn) {\n    return function() {\n        return !fn.apply(this, arguments);\n    };\n}\nfunction hasListenerFilter(listener, capture) {\n    return function(listenerSpec) {\n        return (\n            listenerSpec.capture === capture &&\n            listenerSpec.listener === listener\n        );\n    };\n}\n\nvar EventTarget = {\n    // https://dom.spec.whatwg.org/#dom-eventtarget-addeventlistener\n    addEventListener: function addEventListener(\n        event,\n        listener,\n        providedOptions\n    ) {\n        // 3. Let capture, passive, and once be the result of flattening more options.\n        // Flatten property before executing step 2,\n        // feture detection is usually based on registering handler with options object,\n        // that has getter defined\n        // addEventListener(\"load\", () => {}, {\n        //    get once() { supportsOnce = true; }\n        // });\n        var options = flattenOptions(providedOptions);\n\n        // 2. If callback is null, then return.\n        if (listener === null || listener === undefined) {\n            return;\n        }\n\n        this.eventListeners = this.eventListeners || {};\n        this.eventListeners[event] = this.eventListeners[event] || [];\n\n        // 4. If context object’s associated list of event listener\n        //    does not contain an event listener whose type is type,\n        //    callback is callback, and capture is capture, then append\n        //    a new event listener to it, whose type is type, callback is\n        //    callback, capture is capture, passive is passive, and once is once.\n        if (\n            !this.eventListeners[event].some(\n                hasListenerFilter(listener, options.capture)\n            )\n        ) {\n            this.eventListeners[event].push({\n                listener: listener,\n                capture: options.capture,\n                once: options.once\n            });\n        }\n    },\n\n    // https://dom.spec.whatwg.org/#dom-eventtarget-removeeventlistener\n    removeEventListener: function removeEventListener(\n        event,\n        listener,\n        providedOptions\n    ) {\n        if (!this.eventListeners || !this.eventListeners[event]) {\n            return;\n        }\n\n        // 2. Let capture be the result of flattening options.\n        var options = flattenOptions(providedOptions);\n\n        // 3. If there is an event listener in the associated list of\n        //    event listeners whose type is type, callback is callback,\n        //    and capture is capture, then set that event listener’s\n        //    removed to true and remove it from the associated list of event listeners.\n        this.eventListeners[event] = this.eventListeners[event].filter(\n            not(hasListenerFilter(listener, options.capture))\n        );\n    },\n\n    dispatchEvent: function dispatchEvent(event) {\n        if (!this.eventListeners || !this.eventListeners[event.type]) {\n            return Boolean(event.defaultPrevented);\n        }\n\n        var self = this;\n        var type = event.type;\n        var listeners = self.eventListeners[type];\n\n        // Remove listeners, that should be dispatched once\n        // before running dispatch loop to avoid nested dispatch issues\n        self.eventListeners[type] = listeners.filter(function(listenerSpec) {\n            return !listenerSpec.once;\n        });\n        listeners.forEach(function(listenerSpec) {\n            var listener = listenerSpec.listener;\n            if (typeof listener === \"function\") {\n                listener.call(self, event);\n            } else {\n                listener.handleEvent(event);\n            }\n        });\n\n        return Boolean(event.defaultPrevented);\n    }\n};\n\nmodule.exports = EventTarget;\n","\"use strict\";\n\nfunction Event(type, bubbles, cancelable, target) {\n    this.initEvent(type, bubbles, cancelable, target);\n}\n\nEvent.prototype = {\n    initEvent: function(type, bubbles, cancelable, target) {\n        this.type = type;\n        this.bubbles = bubbles;\n        this.cancelable = cancelable;\n        this.target = target;\n        this.currentTarget = target;\n    },\n\n    // eslint-disable-next-line no-empty-function\n    stopPropagation: function() {},\n\n    preventDefault: function() {\n        this.defaultPrevented = true;\n    }\n};\n\nmodule.exports = Event;\n","\"use strict\";\n\nmodule.exports = {\n    Event: require(\"./event\"),\n    ProgressEvent: require(\"./progress-event\"),\n    CustomEvent: require(\"./custom-event\"),\n    EventTarget: require(\"./event-target\")\n};\n","\"use strict\";\n\nvar Event = require(\"./event\");\n\nfunction ProgressEvent(type, progressEventRaw, target) {\n    this.initEvent(type, false, false, target);\n    this.loaded =\n        typeof progressEventRaw.loaded === \"number\"\n            ? progressEventRaw.loaded\n            : null;\n    this.total =\n        typeof progressEventRaw.total === \"number\"\n            ? progressEventRaw.total\n            : null;\n    this.lengthComputable = Boolean(progressEventRaw.total);\n}\n\nProgressEvent.prototype = new Event();\n\nProgressEvent.prototype.constructor = ProgressEvent;\n\nmodule.exports = ProgressEvent;\n","\"use strict\";\n\nvar FakeTimers = require(\"@sinonjs/fake-timers\");\nvar fakeServer = require(\"./index\");\n\n// eslint-disable-next-line no-empty-function\nfunction Server() {}\nServer.prototype = fakeServer;\n\nvar fakeServerWithClock = new Server();\n\nfakeServerWithClock.addRequest = function addRequest(xhr) {\n    if (xhr.async) {\n        if (typeof setTimeout.clock === \"object\") {\n            this.clock = setTimeout.clock;\n        } else {\n            this.clock = FakeTimers.install();\n            this.resetClock = true;\n        }\n\n        if (!this.longestTimeout) {\n            var clockSetTimeout = this.clock.setTimeout;\n            var clockSetInterval = this.clock.setInterval;\n            var server = this;\n\n            this.clock.setTimeout = function(fn, timeout) {\n                server.longestTimeout = Math.max(\n                    timeout,\n                    server.longestTimeout || 0\n                );\n\n                return clockSetTimeout.apply(this, arguments);\n            };\n\n            this.clock.setInterval = function(fn, timeout) {\n                server.longestTimeout = Math.max(\n                    timeout,\n                    server.longestTimeout || 0\n                );\n\n                return clockSetInterval.apply(this, arguments);\n            };\n        }\n    }\n\n    return fakeServer.addRequest.call(this, xhr);\n};\n\nfakeServerWithClock.respond = function respond() {\n    var returnVal = fakeServer.respond.apply(this, arguments);\n\n    if (this.clock) {\n        this.clock.tick(this.longestTimeout || 0);\n        this.longestTimeout = 0;\n\n        if (this.resetClock) {\n            this.clock.uninstall();\n            this.resetClock = false;\n        }\n    }\n\n    return returnVal;\n};\n\nfakeServerWithClock.restore = function restore() {\n    if (this.clock) {\n        this.clock.uninstall();\n    }\n\n    return fakeServer.restore.apply(this, arguments);\n};\n\nmodule.exports = fakeServerWithClock;\n","\"use strict\";\n\nvar fakeXhr = require(\"../fake-xhr\");\nvar push = [].push;\nvar log = require(\"./log\");\nvar configureLogError = require(\"../configure-logger\");\nvar pathToRegexp = require(\"path-to-regexp\");\n\nvar supportsArrayBuffer = typeof ArrayBuffer !== \"undefined\";\n\nfunction responseArray(handler) {\n    var response = handler;\n\n    if (Object.prototype.toString.call(handler) !== \"[object Array]\") {\n        response = [200, {}, handler];\n    }\n\n    if (typeof response[2] !== \"string\") {\n        if (!supportsArrayBuffer) {\n            throw new TypeError(\n                \"Fake server response body should be a string, but was \" +\n                    typeof response[2]\n            );\n        } else if (!(response[2] instanceof ArrayBuffer)) {\n            throw new TypeError(\n                \"Fake server response body should be a string or ArrayBuffer, but was \" +\n                    typeof response[2]\n            );\n        }\n    }\n\n    return response;\n}\n\nfunction getDefaultWindowLocation() {\n    var winloc = {\n        hostname: \"localhost\",\n        port: process.env.PORT || 80,\n        protocol: \"http:\"\n    };\n    winloc.host =\n        winloc.hostname +\n        (String(winloc.port) === \"80\" ? \"\" : \":\" + winloc.port);\n    return winloc;\n}\n\nfunction getWindowLocation() {\n    if (typeof window === \"undefined\") {\n        // Fallback\n        return getDefaultWindowLocation();\n    }\n\n    if (typeof window.location !== \"undefined\") {\n        // Browsers place location on window\n        return window.location;\n    }\n\n    if (\n        typeof window.window !== \"undefined\" &&\n        typeof window.window.location !== \"undefined\"\n    ) {\n        // React Native on Android places location on window.window\n        return window.window.location;\n    }\n\n    return getDefaultWindowLocation();\n}\n\nfunction matchOne(response, reqMethod, reqUrl) {\n    var rmeth = response.method;\n    var matchMethod = !rmeth || rmeth.toLowerCase() === reqMethod.toLowerCase();\n    var url = response.url;\n    var matchUrl =\n        !url ||\n        url === reqUrl ||\n        (typeof url.test === \"function\" && url.test(reqUrl));\n\n    return matchMethod && matchUrl;\n}\n\nfunction match(response, request) {\n    var wloc = getWindowLocation();\n\n    var rCurrLoc = new RegExp(\"^\" + wloc.protocol + \"//\" + wloc.host + \"/\");\n\n    var requestUrl = request.url;\n\n    if (!/^https?:\\/\\//.test(requestUrl) || rCurrLoc.test(requestUrl)) {\n        requestUrl = requestUrl.replace(rCurrLoc, \"/\");\n    }\n\n    if (matchOne(response, this.getHTTPMethod(request), requestUrl)) {\n        if (typeof response.response === \"function\") {\n            var ru = response.url;\n            var args = [request].concat(\n                ru && typeof ru.exec === \"function\"\n                    ? ru.exec(requestUrl).slice(1)\n                    : []\n            );\n            return response.response.apply(response, args);\n        }\n\n        return true;\n    }\n\n    return false;\n}\n\nfunction incrementRequestCount() {\n    var count = ++this.requestCount;\n\n    this.requested = true;\n\n    this.requestedOnce = count === 1;\n    this.requestedTwice = count === 2;\n    this.requestedThrice = count === 3;\n\n    this.firstRequest = this.getRequest(0);\n    this.secondRequest = this.getRequest(1);\n    this.thirdRequest = this.getRequest(2);\n\n    this.lastRequest = this.getRequest(count - 1);\n}\n\nvar fakeServer = {\n    create: function(config) {\n        var server = Object.create(this);\n        server.configure(config);\n        this.xhr = fakeXhr.useFakeXMLHttpRequest();\n        server.requests = [];\n        server.requestCount = 0;\n        server.queue = [];\n        server.responses = [];\n\n        this.xhr.onCreate = function(xhrObj) {\n            xhrObj.unsafeHeadersEnabled = function() {\n                return !(server.unsafeHeadersEnabled === false);\n            };\n            server.addRequest(xhrObj);\n        };\n\n        return server;\n    },\n\n    configure: function(config) {\n        var self = this;\n        var whitelist = {\n            autoRespond: true,\n            autoRespondAfter: true,\n            respondImmediately: true,\n            fakeHTTPMethods: true,\n            logger: true,\n            unsafeHeadersEnabled: true\n        };\n\n        // eslint-disable-next-line no-param-reassign\n        config = config || {};\n\n        Object.keys(config).forEach(function(setting) {\n            if (setting in whitelist) {\n                self[setting] = config[setting];\n            }\n        });\n\n        self.logError = configureLogError(config);\n    },\n\n    addRequest: function addRequest(xhrObj) {\n        var server = this;\n        push.call(this.requests, xhrObj);\n\n        incrementRequestCount.call(this);\n\n        xhrObj.onSend = function() {\n            server.handleRequest(this);\n\n            if (server.respondImmediately) {\n                server.respond();\n            } else if (server.autoRespond && !server.responding) {\n                setTimeout(function() {\n                    server.responding = false;\n                    server.respond();\n                }, server.autoRespondAfter || 10);\n\n                server.responding = true;\n            }\n        };\n    },\n\n    getHTTPMethod: function getHTTPMethod(request) {\n        if (this.fakeHTTPMethods && /post/i.test(request.method)) {\n            var matches = (request.requestBody || \"\").match(\n                /_method=([^\\b;]+)/\n            );\n            return matches ? matches[1] : request.method;\n        }\n\n        return request.method;\n    },\n\n    handleRequest: function handleRequest(xhr) {\n        if (xhr.async) {\n            push.call(this.queue, xhr);\n        } else {\n            this.processRequest(xhr);\n        }\n    },\n\n    logger: function() {\n        // no-op; override via configure()\n    },\n\n    logError: configureLogError({}),\n\n    log: log,\n\n    respondWith: function respondWith(method, url, body) {\n        if (arguments.length === 1 && typeof method !== \"function\") {\n            this.response = responseArray(method);\n            return;\n        }\n\n        if (arguments.length === 1) {\n            // eslint-disable-next-line no-param-reassign\n            body = method;\n            // eslint-disable-next-line no-param-reassign\n            url = method = null;\n        }\n\n        if (arguments.length === 2) {\n            // eslint-disable-next-line no-param-reassign\n            body = url;\n            // eslint-disable-next-line no-param-reassign\n            url = method;\n            // eslint-disable-next-line no-param-reassign\n            method = null;\n        }\n\n        // Escape port number to prevent \"named\" parameters in 'path-to-regexp' module\n        if (typeof url === \"string\" && url !== \"\" && /:[0-9]+\\//.test(url)) {\n            var m = url.match(/^(https?:\\/\\/.*?):([0-9]+\\/.*)$/);\n            // eslint-disable-next-line no-param-reassign\n            url = m[1] + \"\\\\:\" + m[2];\n        }\n\n        push.call(this.responses, {\n            method: method,\n            url:\n                typeof url === \"string\" && url !== \"\" ? pathToRegexp(url) : url,\n            response: typeof body === \"function\" ? body : responseArray(body)\n        });\n    },\n\n    respond: function respond() {\n        if (arguments.length > 0) {\n            this.respondWith.apply(this, arguments);\n        }\n\n        var queue = this.queue || [];\n        var requests = queue.splice(0, queue.length);\n        var self = this;\n\n        requests.forEach(function(request) {\n            self.processRequest(request);\n        });\n    },\n\n    respondAll: function respondAll() {\n        if (this.respondImmediately) {\n            return;\n        }\n\n        this.queue = this.requests.slice(0);\n\n        var request;\n        while ((request = this.queue.shift())) {\n            this.processRequest(request);\n        }\n    },\n\n    processRequest: function processRequest(request) {\n        try {\n            if (request.aborted) {\n                return;\n            }\n\n            var response = this.response || [404, {}, \"\"];\n\n            if (this.responses) {\n                for (var l = this.responses.length, i = l - 1; i >= 0; i--) {\n                    if (match.call(this, this.responses[i], request)) {\n                        response = this.responses[i].response;\n                        break;\n                    }\n                }\n            }\n\n            if (request.readyState !== 4) {\n                this.log(response, request);\n\n                request.respond(response[0], response[1], response[2]);\n            }\n        } catch (e) {\n            this.logError(\"Fake server request processing\", e);\n        }\n    },\n\n    restore: function restore() {\n        return this.xhr.restore && this.xhr.restore.apply(this.xhr, arguments);\n    },\n\n    getRequest: function getRequest(index) {\n        return this.requests[index] || null;\n    },\n\n    reset: function reset() {\n        this.resetBehavior();\n        this.resetHistory();\n    },\n\n    resetBehavior: function resetBehavior() {\n        this.responses.length = this.queue.length = 0;\n    },\n\n    resetHistory: function resetHistory() {\n        this.requests.length = this.requestCount = 0;\n\n        this.requestedOnce = this.requestedTwice = this.requestedThrice = this.requested = false;\n\n        this.firstRequest = this.secondRequest = this.thirdRequest = this.lastRequest = null;\n    }\n};\n\nmodule.exports = fakeServer;\n","\"use strict\";\nvar inspect = require(\"util\").inspect;\n\nfunction log(response, request) {\n    var str;\n\n    str = \"Request:\\n\" + inspect(request) + \"\\n\\n\";\n    str += \"Response:\\n\" + inspect(response) + \"\\n\\n\";\n\n    /* istanbul ignore else: when this.logger is not a function, it can't be called */\n    if (typeof this.logger === \"function\") {\n        this.logger(str);\n    }\n}\n\nmodule.exports = log;\n","\"use strict\";\n\nexports.isSupported = (function() {\n    try {\n        return Boolean(new Blob());\n    } catch (e) {\n        return false;\n    }\n})();\n","\"use strict\";\n\nvar GlobalTextEncoder =\n    typeof TextEncoder !== \"undefined\"\n        ? TextEncoder\n        : require(\"@sinonjs/text-encoding\").TextEncoder;\nvar globalObject = require(\"@sinonjs/commons\").global;\nvar configureLogError = require(\"../configure-logger\");\nvar sinonEvent = require(\"../event\");\nvar extend = require(\"just-extend\");\n\nvar supportsProgress = typeof ProgressEvent !== \"undefined\";\nvar supportsCustomEvent = typeof CustomEvent !== \"undefined\";\nvar supportsFormData = typeof FormData !== \"undefined\";\nvar supportsArrayBuffer = typeof ArrayBuffer !== \"undefined\";\nvar supportsBlob = require(\"./blob\").isSupported;\n\nfunction getWorkingXHR(globalScope) {\n    var supportsXHR = typeof globalScope.XMLHttpRequest !== \"undefined\";\n    if (supportsXHR) {\n        return globalScope.XMLHttpRequest;\n    }\n\n    var supportsActiveX = typeof globalScope.ActiveXObject !== \"undefined\";\n    if (supportsActiveX) {\n        return function() {\n            return new globalScope.ActiveXObject(\"MSXML2.XMLHTTP.3.0\");\n        };\n    }\n\n    return false;\n}\n\n// Ref: https://fetch.spec.whatwg.org/#forbidden-header-name\nvar unsafeHeaders = {\n    \"Accept-Charset\": true,\n    \"Access-Control-Request-Headers\": true,\n    \"Access-Control-Request-Method\": true,\n    \"Accept-Encoding\": true,\n    Connection: true,\n    \"Content-Length\": true,\n    Cookie: true,\n    Cookie2: true,\n    \"Content-Transfer-Encoding\": true,\n    Date: true,\n    DNT: true,\n    Expect: true,\n    Host: true,\n    \"Keep-Alive\": true,\n    Origin: true,\n    Referer: true,\n    TE: true,\n    Trailer: true,\n    \"Transfer-Encoding\": true,\n    Upgrade: true,\n    \"User-Agent\": true,\n    Via: true\n};\n\nfunction EventTargetHandler() {\n    var self = this;\n    var events = [\n        \"loadstart\",\n        \"progress\",\n        \"abort\",\n        \"error\",\n        \"load\",\n        \"timeout\",\n        \"loadend\"\n    ];\n\n    function addEventListener(eventName) {\n        self.addEventListener(eventName, function(event) {\n            var listener = self[\"on\" + eventName];\n\n            if (listener && typeof listener === \"function\") {\n                listener.call(this, event);\n            }\n        });\n    }\n\n    events.forEach(addEventListener);\n}\n\nEventTargetHandler.prototype = sinonEvent.EventTarget;\n\nfunction normalizeHeaderValue(value) {\n    // Ref: https://fetch.spec.whatwg.org/#http-whitespace-bytes\n    /*eslint no-control-regex: \"off\"*/\n    return value.replace(/^[\\x09\\x0A\\x0D\\x20]+|[\\x09\\x0A\\x0D\\x20]+$/g, \"\");\n}\n\nfunction getHeader(headers, header) {\n    var foundHeader = Object.keys(headers).filter(function(h) {\n        return h.toLowerCase() === header.toLowerCase();\n    });\n\n    return foundHeader[0] || null;\n}\n\nfunction excludeSetCookie2Header(header) {\n    return !/^Set-Cookie2?$/i.test(header);\n}\n\nfunction verifyResponseBodyType(body, responseType) {\n    var error = null;\n    var isString = typeof body === \"string\";\n\n    if (responseType === \"arraybuffer\") {\n        if (!isString && !(body instanceof ArrayBuffer)) {\n            error = new Error(\n                \"Attempted to respond to fake XMLHttpRequest with \" +\n                    body +\n                    \", which is not a string or ArrayBuffer.\"\n            );\n            error.name = \"InvalidBodyException\";\n        }\n    } else if (!isString) {\n        error = new Error(\n            \"Attempted to respond to fake XMLHttpRequest with \" +\n                body +\n                \", which is not a string.\"\n        );\n        error.name = \"InvalidBodyException\";\n    }\n\n    if (error) {\n        throw error;\n    }\n}\n\nfunction convertToArrayBuffer(body, encoding) {\n    if (body instanceof ArrayBuffer) {\n        return body;\n    }\n\n    return new GlobalTextEncoder(encoding || \"utf-8\").encode(body).buffer;\n}\n\nfunction isXmlContentType(contentType) {\n    return (\n        !contentType ||\n        /(text\\/xml)|(application\\/xml)|(\\+xml)/.test(contentType)\n    );\n}\n\nfunction clearResponse(xhr) {\n    if (xhr.responseType === \"\" || xhr.responseType === \"text\") {\n        xhr.response = xhr.responseText = \"\";\n    } else {\n        xhr.response = xhr.responseText = null;\n    }\n    xhr.responseXML = null;\n}\n\nfunction fakeXMLHttpRequestFor(globalScope) {\n    var isReactNative =\n        globalScope.navigator &&\n        globalScope.navigator.product === \"ReactNative\";\n    var sinonXhr = { XMLHttpRequest: globalScope.XMLHttpRequest };\n    sinonXhr.GlobalXMLHttpRequest = globalScope.XMLHttpRequest;\n    sinonXhr.GlobalActiveXObject = globalScope.ActiveXObject;\n    sinonXhr.supportsActiveX =\n        typeof sinonXhr.GlobalActiveXObject !== \"undefined\";\n    sinonXhr.supportsXHR = typeof sinonXhr.GlobalXMLHttpRequest !== \"undefined\";\n    sinonXhr.workingXHR = getWorkingXHR(globalScope);\n    sinonXhr.supportsTimeout =\n        sinonXhr.supportsXHR &&\n        \"timeout\" in new sinonXhr.GlobalXMLHttpRequest();\n    sinonXhr.supportsCORS =\n        isReactNative ||\n        (sinonXhr.supportsXHR &&\n            \"withCredentials\" in new sinonXhr.GlobalXMLHttpRequest());\n\n    // Note that for FakeXMLHttpRequest to work pre ES5\n    // we lose some of the alignment with the spec.\n    // To ensure as close a match as possible,\n    // set responseType before calling open, send or respond;\n    function FakeXMLHttpRequest(config) {\n        EventTargetHandler.call(this);\n        this.readyState = FakeXMLHttpRequest.UNSENT;\n        this.requestHeaders = {};\n        this.requestBody = null;\n        this.status = 0;\n        this.statusText = \"\";\n        this.upload = new EventTargetHandler();\n        this.responseType = \"\";\n        this.response = \"\";\n        this.logError = configureLogError(config);\n\n        if (sinonXhr.supportsTimeout) {\n            this.timeout = 0;\n        }\n\n        if (sinonXhr.supportsCORS) {\n            this.withCredentials = false;\n        }\n\n        if (typeof FakeXMLHttpRequest.onCreate === \"function\") {\n            FakeXMLHttpRequest.onCreate(this);\n        }\n    }\n\n    function verifyState(xhr) {\n        if (xhr.readyState !== FakeXMLHttpRequest.OPENED) {\n            throw new Error(\"INVALID_STATE_ERR\");\n        }\n\n        if (xhr.sendFlag) {\n            throw new Error(\"INVALID_STATE_ERR\");\n        }\n    }\n\n    // largest arity in XHR is 5 - XHR#open\n    var apply = function(obj, method, args) {\n        switch (args.length) {\n            case 0:\n                return obj[method]();\n            case 1:\n                return obj[method](args[0]);\n            case 2:\n                return obj[method](args[0], args[1]);\n            case 3:\n                return obj[method](args[0], args[1], args[2]);\n            case 4:\n                return obj[method](args[0], args[1], args[2], args[3]);\n            case 5:\n                return obj[method](args[0], args[1], args[2], args[3], args[4]);\n            default:\n                throw new Error(\"Unhandled case\");\n        }\n    };\n\n    FakeXMLHttpRequest.filters = [];\n    FakeXMLHttpRequest.addFilter = function addFilter(fn) {\n        this.filters.push(fn);\n    };\n    FakeXMLHttpRequest.defake = function defake(fakeXhr, xhrArgs) {\n        var xhr = new sinonXhr.workingXHR(); // eslint-disable-line new-cap\n\n        [\n            \"open\",\n            \"setRequestHeader\",\n            \"abort\",\n            \"getResponseHeader\",\n            \"getAllResponseHeaders\",\n            \"addEventListener\",\n            \"overrideMimeType\",\n            \"removeEventListener\"\n        ].forEach(function(method) {\n            fakeXhr[method] = function() {\n                return apply(xhr, method, arguments);\n            };\n        });\n\n        fakeXhr.send = function() {\n            // Ref: https://xhr.spec.whatwg.org/#the-responsetype-attribute\n            if (xhr.responseType !== fakeXhr.responseType) {\n                xhr.responseType = fakeXhr.responseType;\n            }\n            return apply(xhr, \"send\", arguments);\n        };\n\n        var copyAttrs = function(args) {\n            args.forEach(function(attr) {\n                fakeXhr[attr] = xhr[attr];\n            });\n        };\n\n        var stateChangeStart = function() {\n            fakeXhr.readyState = xhr.readyState;\n            if (xhr.readyState >= FakeXMLHttpRequest.HEADERS_RECEIVED) {\n                copyAttrs([\"status\", \"statusText\"]);\n            }\n            if (xhr.readyState >= FakeXMLHttpRequest.LOADING) {\n                copyAttrs([\"response\"]);\n                if (xhr.responseType === \"\" || xhr.responseType === \"text\") {\n                    copyAttrs([\"responseText\"]);\n                }\n            }\n            if (\n                xhr.readyState === FakeXMLHttpRequest.DONE &&\n                (xhr.responseType === \"\" || xhr.responseType === \"document\")\n            ) {\n                copyAttrs([\"responseXML\"]);\n            }\n        };\n\n        var stateChangeEnd = function() {\n            if (fakeXhr.onreadystatechange) {\n                // eslint-disable-next-line no-useless-call\n                fakeXhr.onreadystatechange.call(fakeXhr, {\n                    target: fakeXhr,\n                    currentTarget: fakeXhr\n                });\n            }\n        };\n\n        var stateChange = function stateChange() {\n            stateChangeStart();\n            stateChangeEnd();\n        };\n\n        if (xhr.addEventListener) {\n            xhr.addEventListener(\"readystatechange\", stateChangeStart);\n\n            Object.keys(fakeXhr.eventListeners).forEach(function(event) {\n                /*eslint-disable no-loop-func*/\n                fakeXhr.eventListeners[event].forEach(function(handler) {\n                    xhr.addEventListener(event, handler.listener, {\n                        capture: handler.capture,\n                        once: handler.once\n                    });\n                });\n                /*eslint-enable no-loop-func*/\n            });\n\n            xhr.addEventListener(\"readystatechange\", stateChangeEnd);\n        } else {\n            xhr.onreadystatechange = stateChange;\n        }\n        apply(xhr, \"open\", xhrArgs);\n    };\n    FakeXMLHttpRequest.useFilters = false;\n\n    function verifyRequestOpened(xhr) {\n        if (xhr.readyState !== FakeXMLHttpRequest.OPENED) {\n            throw new Error(\"INVALID_STATE_ERR - \" + xhr.readyState);\n        }\n    }\n\n    function verifyRequestSent(xhr) {\n        if (xhr.readyState === FakeXMLHttpRequest.DONE) {\n            throw new Error(\"Request done\");\n        }\n    }\n\n    function verifyHeadersReceived(xhr) {\n        if (\n            xhr.async &&\n            xhr.readyState !== FakeXMLHttpRequest.HEADERS_RECEIVED\n        ) {\n            throw new Error(\"No headers received\");\n        }\n    }\n\n    function convertResponseBody(responseType, contentType, body) {\n        if (responseType === \"\" || responseType === \"text\") {\n            return body;\n        } else if (supportsArrayBuffer && responseType === \"arraybuffer\") {\n            return convertToArrayBuffer(body);\n        } else if (responseType === \"json\") {\n            try {\n                return JSON.parse(body);\n            } catch (e) {\n                // Return parsing failure as null\n                return null;\n            }\n        } else if (supportsBlob && responseType === \"blob\") {\n            var blobOptions = {};\n            if (contentType) {\n                blobOptions.type = contentType;\n            }\n            return new Blob([convertToArrayBuffer(body)], blobOptions);\n        } else if (responseType === \"document\") {\n            if (isXmlContentType(contentType)) {\n                return FakeXMLHttpRequest.parseXML(body);\n            }\n            return null;\n        }\n        throw new Error(\"Invalid responseType \" + responseType);\n    }\n\n    /**\n     * Steps to follow when there is an error, according to:\n     * https://xhr.spec.whatwg.org/#request-error-steps\n     */\n    function requestErrorSteps(xhr) {\n        clearResponse(xhr);\n        xhr.errorFlag = true;\n        xhr.requestHeaders = {};\n        xhr.responseHeaders = {};\n\n        if (\n            xhr.readyState !== FakeXMLHttpRequest.UNSENT &&\n            xhr.sendFlag &&\n            xhr.readyState !== FakeXMLHttpRequest.DONE\n        ) {\n            xhr.readyStateChange(FakeXMLHttpRequest.DONE);\n            xhr.sendFlag = false;\n        }\n    }\n\n    FakeXMLHttpRequest.parseXML = function parseXML(text) {\n        // Treat empty string as parsing failure\n        if (text !== \"\") {\n            try {\n                if (typeof DOMParser !== \"undefined\") {\n                    var parser = new DOMParser();\n                    var parsererrorNS = \"\";\n\n                    try {\n                        var parsererrors = parser\n                            .parseFromString(\"INVALID\", \"text/xml\")\n                            .getElementsByTagName(\"parsererror\");\n                        if (parsererrors.length) {\n                            parsererrorNS = parsererrors[0].namespaceURI;\n                        }\n                    } catch (e) {\n                        // passing invalid XML makes IE11 throw\n                        // so no namespace needs to be determined\n                    }\n\n                    var result;\n                    try {\n                        result = parser.parseFromString(text, \"text/xml\");\n                    } catch (err) {\n                        return null;\n                    }\n\n                    return result.getElementsByTagNameNS(\n                        parsererrorNS,\n                        \"parsererror\"\n                    ).length\n                        ? null\n                        : result;\n                }\n                var xmlDoc = new window.ActiveXObject(\"Microsoft.XMLDOM\");\n                xmlDoc.async = \"false\";\n                xmlDoc.loadXML(text);\n                return xmlDoc.parseError.errorCode !== 0 ? null : xmlDoc;\n            } catch (e) {\n                // Unable to parse XML - no biggie\n            }\n        }\n\n        return null;\n    };\n\n    FakeXMLHttpRequest.statusCodes = {\n        100: \"Continue\",\n        101: \"Switching Protocols\",\n        200: \"OK\",\n        201: \"Created\",\n        202: \"Accepted\",\n        203: \"Non-Authoritative Information\",\n        204: \"No Content\",\n        205: \"Reset Content\",\n        206: \"Partial Content\",\n        207: \"Multi-Status\",\n        300: \"Multiple Choice\",\n        301: \"Moved Permanently\",\n        302: \"Found\",\n        303: \"See Other\",\n        304: \"Not Modified\",\n        305: \"Use Proxy\",\n        307: \"Temporary Redirect\",\n        400: \"Bad Request\",\n        401: \"Unauthorized\",\n        402: \"Payment Required\",\n        403: \"Forbidden\",\n        404: \"Not Found\",\n        405: \"Method Not Allowed\",\n        406: \"Not Acceptable\",\n        407: \"Proxy Authentication Required\",\n        408: \"Request Timeout\",\n        409: \"Conflict\",\n        410: \"Gone\",\n        411: \"Length Required\",\n        412: \"Precondition Failed\",\n        413: \"Request Entity Too Large\",\n        414: \"Request-URI Too Long\",\n        415: \"Unsupported Media Type\",\n        416: \"Requested Range Not Satisfiable\",\n        417: \"Expectation Failed\",\n        422: \"Unprocessable Entity\",\n        500: \"Internal Server Error\",\n        501: \"Not Implemented\",\n        502: \"Bad Gateway\",\n        503: \"Service Unavailable\",\n        504: \"Gateway Timeout\",\n        505: \"HTTP Version Not Supported\"\n    };\n\n    extend(FakeXMLHttpRequest.prototype, sinonEvent.EventTarget, {\n        async: true,\n\n        open: function open(method, url, async, username, password) {\n            this.method = method;\n            this.url = url;\n            this.async = typeof async === \"boolean\" ? async : true;\n            this.username = username;\n            this.password = password;\n            clearResponse(this);\n            this.requestHeaders = {};\n            this.sendFlag = false;\n\n            if (FakeXMLHttpRequest.useFilters === true) {\n                var xhrArgs = arguments;\n                var defake = FakeXMLHttpRequest.filters.some(function(filter) {\n                    return filter.apply(this, xhrArgs);\n                });\n                if (defake) {\n                    FakeXMLHttpRequest.defake(this, arguments);\n                    return;\n                }\n            }\n            this.readyStateChange(FakeXMLHttpRequest.OPENED);\n        },\n\n        readyStateChange: function readyStateChange(state) {\n            this.readyState = state;\n\n            var readyStateChangeEvent = new sinonEvent.Event(\n                \"readystatechange\",\n                false,\n                false,\n                this\n            );\n            var event, progress;\n\n            if (typeof this.onreadystatechange === \"function\") {\n                try {\n                    this.onreadystatechange(readyStateChangeEvent);\n                } catch (e) {\n                    this.logError(\"Fake XHR onreadystatechange handler\", e);\n                }\n            }\n\n            if (this.readyState === FakeXMLHttpRequest.DONE) {\n                if (this.timedOut || this.aborted || this.status === 0) {\n                    progress = { loaded: 0, total: 0 };\n                    event =\n                        (this.timedOut && \"timeout\") ||\n                        (this.aborted && \"abort\") ||\n                        \"error\";\n                } else {\n                    progress = { loaded: 100, total: 100 };\n                    event = \"load\";\n                }\n\n                if (supportsProgress) {\n                    this.upload.dispatchEvent(\n                        new sinonEvent.ProgressEvent(\"progress\", progress, this)\n                    );\n                    this.upload.dispatchEvent(\n                        new sinonEvent.ProgressEvent(event, progress, this)\n                    );\n                    this.upload.dispatchEvent(\n                        new sinonEvent.ProgressEvent(\"loadend\", progress, this)\n                    );\n                }\n\n                this.dispatchEvent(\n                    new sinonEvent.ProgressEvent(\"progress\", progress, this)\n                );\n                this.dispatchEvent(\n                    new sinonEvent.ProgressEvent(event, progress, this)\n                );\n                this.dispatchEvent(\n                    new sinonEvent.ProgressEvent(\"loadend\", progress, this)\n                );\n            }\n\n            this.dispatchEvent(readyStateChangeEvent);\n        },\n\n        // Ref https://xhr.spec.whatwg.org/#the-setrequestheader()-method\n        setRequestHeader: function setRequestHeader(header, value) {\n            if (typeof value !== \"string\") {\n                throw new TypeError(\n                    \"By RFC7230, section 3.2.4, header values should be strings. Got \" +\n                        typeof value\n                );\n            }\n            verifyState(this);\n\n            var checkUnsafeHeaders = true;\n            if (typeof this.unsafeHeadersEnabled === \"function\") {\n                checkUnsafeHeaders = this.unsafeHeadersEnabled();\n            }\n\n            if (\n                checkUnsafeHeaders &&\n                (getHeader(unsafeHeaders, header) !== null ||\n                    /^(Sec-|Proxy-)/i.test(header))\n            ) {\n                throw new Error(\n                    // eslint-disable-next-line quotes\n                    'Refused to set unsafe header \"' + header + '\"'\n                );\n            }\n\n            // eslint-disable-next-line no-param-reassign\n            value = normalizeHeaderValue(value);\n\n            var existingHeader = getHeader(this.requestHeaders, header);\n            if (existingHeader) {\n                this.requestHeaders[existingHeader] += \", \" + value;\n            } else {\n                this.requestHeaders[header] = value;\n            }\n        },\n\n        setStatus: function setStatus(status) {\n            var sanitizedStatus = typeof status === \"number\" ? status : 200;\n\n            verifyRequestOpened(this);\n            this.status = sanitizedStatus;\n            this.statusText = FakeXMLHttpRequest.statusCodes[sanitizedStatus];\n        },\n\n        // Helps testing\n        setResponseHeaders: function setResponseHeaders(headers) {\n            verifyRequestOpened(this);\n\n            var responseHeaders = (this.responseHeaders = {});\n\n            Object.keys(headers).forEach(function(header) {\n                responseHeaders[header] = headers[header];\n            });\n\n            if (this.async) {\n                this.readyStateChange(FakeXMLHttpRequest.HEADERS_RECEIVED);\n            } else {\n                this.readyState = FakeXMLHttpRequest.HEADERS_RECEIVED;\n            }\n        },\n\n        // Currently treats ALL data as a DOMString (i.e. no Document)\n        send: function send(data) {\n            verifyState(this);\n\n            if (!/^(head)$/i.test(this.method)) {\n                var contentType = getHeader(\n                    this.requestHeaders,\n                    \"Content-Type\"\n                );\n                if (this.requestHeaders[contentType]) {\n                    var value = this.requestHeaders[contentType].split(\";\");\n                    this.requestHeaders[contentType] =\n                        value[0] + \";charset=utf-8\";\n                } else if (supportsFormData && !(data instanceof FormData)) {\n                    this.requestHeaders[\"Content-Type\"] =\n                        \"text/plain;charset=utf-8\";\n                }\n\n                this.requestBody = data;\n            }\n\n            this.errorFlag = false;\n            this.sendFlag = this.async;\n            clearResponse(this);\n\n            if (typeof this.onSend === \"function\") {\n                this.onSend(this);\n            }\n\n            // Only listen if setInterval and Date are a stubbed.\n            if (\n                sinonXhr.supportsTimeout &&\n                typeof setInterval.clock === \"object\" &&\n                typeof Date.clock === \"object\"\n            ) {\n                var initiatedTime = Date.now();\n                var self = this;\n\n                // Listen to any possible tick by fake timers and check to see if timeout has\n                // been exceeded. It's important to note that timeout can be changed while a request\n                // is in flight, so we must check anytime the end user forces a clock tick to make\n                // sure timeout hasn't changed.\n                // https://xhr.spec.whatwg.org/#dfnReturnLink-2\n                var clearIntervalId = setInterval(function() {\n                    // Check if the readyState has been reset or is done. If this is the case, there\n                    // should be no timeout. This will also prevent aborted requests and\n                    // fakeServerWithClock from triggering unnecessary responses.\n                    if (\n                        self.readyState === FakeXMLHttpRequest.UNSENT ||\n                        self.readyState === FakeXMLHttpRequest.DONE\n                    ) {\n                        clearInterval(clearIntervalId);\n                    } else if (\n                        typeof self.timeout === \"number\" &&\n                        self.timeout > 0\n                    ) {\n                        if (Date.now() >= initiatedTime + self.timeout) {\n                            self.triggerTimeout();\n                            clearInterval(clearIntervalId);\n                        }\n                    }\n                }, 1);\n            }\n\n            this.dispatchEvent(\n                new sinonEvent.Event(\"loadstart\", false, false, this)\n            );\n        },\n\n        abort: function abort() {\n            this.aborted = true;\n            requestErrorSteps(this);\n            this.readyState = FakeXMLHttpRequest.UNSENT;\n        },\n\n        error: function() {\n            clearResponse(this);\n            this.errorFlag = true;\n            this.requestHeaders = {};\n            this.responseHeaders = {};\n\n            this.readyStateChange(FakeXMLHttpRequest.DONE);\n        },\n\n        triggerTimeout: function triggerTimeout() {\n            if (sinonXhr.supportsTimeout) {\n                this.timedOut = true;\n                requestErrorSteps(this);\n            }\n        },\n\n        getResponseHeader: function getResponseHeader(header) {\n            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {\n                return null;\n            }\n\n            if (/^Set-Cookie2?$/i.test(header)) {\n                return null;\n            }\n\n            // eslint-disable-next-line no-param-reassign\n            header = getHeader(this.responseHeaders, header);\n\n            return this.responseHeaders[header] || null;\n        },\n\n        getAllResponseHeaders: function getAllResponseHeaders() {\n            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {\n                return \"\";\n            }\n\n            var responseHeaders = this.responseHeaders;\n            var headers = Object.keys(responseHeaders)\n                .filter(excludeSetCookie2Header)\n                .reduce(function(prev, header) {\n                    var value = responseHeaders[header];\n\n                    return prev + (header + \": \" + value + \"\\r\\n\");\n                }, \"\");\n\n            return headers;\n        },\n\n        setResponseBody: function setResponseBody(body) {\n            verifyRequestSent(this);\n            verifyHeadersReceived(this);\n            verifyResponseBodyType(body, this.responseType);\n            var contentType =\n                this.overriddenMimeType ||\n                this.getResponseHeader(\"Content-Type\");\n\n            var isTextResponse =\n                this.responseType === \"\" || this.responseType === \"text\";\n            clearResponse(this);\n            if (this.async) {\n                var chunkSize = this.chunkSize || 10;\n                var index = 0;\n\n                do {\n                    this.readyStateChange(FakeXMLHttpRequest.LOADING);\n\n                    if (isTextResponse) {\n                        this.responseText = this.response += body.substring(\n                            index,\n                            index + chunkSize\n                        );\n                    }\n                    index += chunkSize;\n                } while (index < body.length);\n            }\n\n            this.response = convertResponseBody(\n                this.responseType,\n                contentType,\n                body\n            );\n            if (isTextResponse) {\n                this.responseText = this.response;\n            }\n\n            if (this.responseType === \"document\") {\n                this.responseXML = this.response;\n            } else if (\n                this.responseType === \"\" &&\n                isXmlContentType(contentType)\n            ) {\n                this.responseXML = FakeXMLHttpRequest.parseXML(\n                    this.responseText\n                );\n            }\n            this.readyStateChange(FakeXMLHttpRequest.DONE);\n        },\n\n        respond: function respond(status, headers, body) {\n            this.setStatus(status);\n            this.setResponseHeaders(headers || {});\n            this.setResponseBody(body || \"\");\n        },\n\n        uploadProgress: function uploadProgress(progressEventRaw) {\n            if (supportsProgress) {\n                this.upload.dispatchEvent(\n                    new sinonEvent.ProgressEvent(\n                        \"progress\",\n                        progressEventRaw,\n                        this.upload\n                    )\n                );\n            }\n        },\n\n        downloadProgress: function downloadProgress(progressEventRaw) {\n            if (supportsProgress) {\n                this.dispatchEvent(\n                    new sinonEvent.ProgressEvent(\n                        \"progress\",\n                        progressEventRaw,\n                        this\n                    )\n                );\n            }\n        },\n\n        uploadError: function uploadError(error) {\n            if (supportsCustomEvent) {\n                this.upload.dispatchEvent(\n                    new sinonEvent.CustomEvent(\"error\", { detail: error })\n                );\n            }\n        },\n\n        overrideMimeType: function overrideMimeType(type) {\n            if (this.readyState >= FakeXMLHttpRequest.LOADING) {\n                throw new Error(\"INVALID_STATE_ERR\");\n            }\n            this.overriddenMimeType = type;\n        }\n    });\n\n    var states = {\n        UNSENT: 0,\n        OPENED: 1,\n        HEADERS_RECEIVED: 2,\n        LOADING: 3,\n        DONE: 4\n    };\n\n    extend(FakeXMLHttpRequest, states);\n    extend(FakeXMLHttpRequest.prototype, states);\n\n    function useFakeXMLHttpRequest() {\n        FakeXMLHttpRequest.restore = function restore(keepOnCreate) {\n            if (sinonXhr.supportsXHR) {\n                globalScope.XMLHttpRequest = sinonXhr.GlobalXMLHttpRequest;\n            }\n\n            if (sinonXhr.supportsActiveX) {\n                globalScope.ActiveXObject = sinonXhr.GlobalActiveXObject;\n            }\n\n            delete FakeXMLHttpRequest.restore;\n\n            if (keepOnCreate !== true) {\n                delete FakeXMLHttpRequest.onCreate;\n            }\n        };\n        if (sinonXhr.supportsXHR) {\n            globalScope.XMLHttpRequest = FakeXMLHttpRequest;\n        }\n\n        if (sinonXhr.supportsActiveX) {\n            globalScope.ActiveXObject = function ActiveXObject(objId) {\n                if (\n                    objId === \"Microsoft.XMLHTTP\" ||\n                    /^Msxml2\\.XMLHTTP/i.test(objId)\n                ) {\n                    return new FakeXMLHttpRequest();\n                }\n\n                return new sinonXhr.GlobalActiveXObject(objId);\n            };\n        }\n\n        return FakeXMLHttpRequest;\n    }\n\n    return {\n        xhr: sinonXhr,\n        FakeXMLHttpRequest: FakeXMLHttpRequest,\n        useFakeXMLHttpRequest: useFakeXMLHttpRequest\n    };\n}\n\nmodule.exports = extend(fakeXMLHttpRequestFor(globalObject), {\n    fakeXMLHttpRequestFor: fakeXMLHttpRequestFor\n});\n","\"use strict\";\n\nmodule.exports = {\n    fakeServer: require(\"./fake-server\"),\n    fakeServerWithClock: require(\"./fake-server/fake-server-with-clock\"),\n    fakeXhr: require(\"./fake-xhr\")\n};\n","var isarray = require('isarray')\n\n/**\n * Expose `pathToRegexp`.\n */\nmodule.exports = pathToRegexp\nmodule.exports.parse = parse\nmodule.exports.compile = compile\nmodule.exports.tokensToFunction = tokensToFunction\nmodule.exports.tokensToRegExp = tokensToRegExp\n\n/**\n * The main path matching regexp utility.\n *\n * @type {RegExp}\n */\nvar PATH_REGEXP = new RegExp([\n  // Match escaped characters that would otherwise appear in future matches.\n  // This allows the user to escape special characters that won't transform.\n  '(\\\\\\\\.)',\n  // Match Express-style parameters and un-named parameters with a prefix\n  // and optional suffixes. Matches appear as:\n  //\n  // \"/:test(\\\\d+)?\" => [\"/\", \"test\", \"\\d+\", undefined, \"?\", undefined]\n  // \"/route(\\\\d+)\"  => [undefined, undefined, undefined, \"\\d+\", undefined, undefined]\n  // \"/*\"            => [\"/\", undefined, undefined, undefined, undefined, \"*\"]\n  '([\\\\/.])?(?:(?:\\\\:(\\\\w+)(?:\\\\(((?:\\\\\\\\.|[^\\\\\\\\()])+)\\\\))?|\\\\(((?:\\\\\\\\.|[^\\\\\\\\()])+)\\\\))([+*?])?|(\\\\*))'\n].join('|'), 'g')\n\n/**\n * Parse a string for the raw tokens.\n *\n * @param  {string}  str\n * @param  {Object=} options\n * @return {!Array}\n */\nfunction parse (str, options) {\n  var tokens = []\n  var key = 0\n  var index = 0\n  var path = ''\n  var defaultDelimiter = options && options.delimiter || '/'\n  var res\n\n  while ((res = PATH_REGEXP.exec(str)) != null) {\n    var m = res[0]\n    var escaped = res[1]\n    var offset = res.index\n    path += str.slice(index, offset)\n    index = offset + m.length\n\n    // Ignore already escaped sequences.\n    if (escaped) {\n      path += escaped[1]\n      continue\n    }\n\n    var next = str[index]\n    var prefix = res[2]\n    var name = res[3]\n    var capture = res[4]\n    var group = res[5]\n    var modifier = res[6]\n    var asterisk = res[7]\n\n    // Push the current path onto the tokens.\n    if (path) {\n      tokens.push(path)\n      path = ''\n    }\n\n    var partial = prefix != null && next != null && next !== prefix\n    var repeat = modifier === '+' || modifier === '*'\n    var optional = modifier === '?' || modifier === '*'\n    var delimiter = res[2] || defaultDelimiter\n    var pattern = capture || group\n\n    tokens.push({\n      name: name || key++,\n      prefix: prefix || '',\n      delimiter: delimiter,\n      optional: optional,\n      repeat: repeat,\n      partial: partial,\n      asterisk: !!asterisk,\n      pattern: pattern ? escapeGroup(pattern) : (asterisk ? '.*' : '[^' + escapeString(delimiter) + ']+?')\n    })\n  }\n\n  // Match any characters still remaining.\n  if (index < str.length) {\n    path += str.substr(index)\n  }\n\n  // If the path exists, push it onto the end.\n  if (path) {\n    tokens.push(path)\n  }\n\n  return tokens\n}\n\n/**\n * Compile a string to a template function for the path.\n *\n * @param  {string}             str\n * @param  {Object=}            options\n * @return {!function(Object=, Object=)}\n */\nfunction compile (str, options) {\n  return tokensToFunction(parse(str, options), options)\n}\n\n/**\n * Prettier encoding of URI path segments.\n *\n * @param  {string}\n * @return {string}\n */\nfunction encodeURIComponentPretty (str) {\n  return encodeURI(str).replace(/[\\/?#]/g, function (c) {\n    return '%' + c.charCodeAt(0).toString(16).toUpperCase()\n  })\n}\n\n/**\n * Encode the asterisk parameter. Similar to `pretty`, but allows slashes.\n *\n * @param  {string}\n * @return {string}\n */\nfunction encodeAsterisk (str) {\n  return encodeURI(str).replace(/[?#]/g, function (c) {\n    return '%' + c.charCodeAt(0).toString(16).toUpperCase()\n  })\n}\n\n/**\n * Expose a method for transforming tokens into the path function.\n */\nfunction tokensToFunction (tokens, options) {\n  // Compile all the tokens into regexps.\n  var matches = new Array(tokens.length)\n\n  // Compile all the patterns before compilation.\n  for (var i = 0; i < tokens.length; i++) {\n    if (typeof tokens[i] === 'object') {\n      matches[i] = new RegExp('^(?:' + tokens[i].pattern + ')$', flags(options))\n    }\n  }\n\n  return function (obj, opts) {\n    var path = ''\n    var data = obj || {}\n    var options = opts || {}\n    var encode = options.pretty ? encodeURIComponentPretty : encodeURIComponent\n\n    for (var i = 0; i < tokens.length; i++) {\n      var token = tokens[i]\n\n      if (typeof token === 'string') {\n        path += token\n\n        continue\n      }\n\n      var value = data[token.name]\n      var segment\n\n      if (value == null) {\n        if (token.optional) {\n          // Prepend partial segment prefixes.\n          if (token.partial) {\n            path += token.prefix\n          }\n\n          continue\n        } else {\n          throw new TypeError('Expected \"' + token.name + '\" to be defined')\n        }\n      }\n\n      if (isarray(value)) {\n        if (!token.repeat) {\n          throw new TypeError('Expected \"' + token.name + '\" to not repeat, but received `' + JSON.stringify(value) + '`')\n        }\n\n        if (value.length === 0) {\n          if (token.optional) {\n            continue\n          } else {\n            throw new TypeError('Expected \"' + token.name + '\" to not be empty')\n          }\n        }\n\n        for (var j = 0; j < value.length; j++) {\n          segment = encode(value[j])\n\n          if (!matches[i].test(segment)) {\n            throw new TypeError('Expected all \"' + token.name + '\" to match \"' + token.pattern + '\", but received `' + JSON.stringify(segment) + '`')\n          }\n\n          path += (j === 0 ? token.prefix : token.delimiter) + segment\n        }\n\n        continue\n      }\n\n      segment = token.asterisk ? encodeAsterisk(value) : encode(value)\n\n      if (!matches[i].test(segment)) {\n        throw new TypeError('Expected \"' + token.name + '\" to match \"' + token.pattern + '\", but received \"' + segment + '\"')\n      }\n\n      path += token.prefix + segment\n    }\n\n    return path\n  }\n}\n\n/**\n * Escape a regular expression string.\n *\n * @param  {string} str\n * @return {string}\n */\nfunction escapeString (str) {\n  return str.replace(/([.+*?=^!:${}()[\\]|\\/\\\\])/g, '\\\\$1')\n}\n\n/**\n * Escape the capturing group by escaping special characters and meaning.\n *\n * @param  {string} group\n * @return {string}\n */\nfunction escapeGroup (group) {\n  return group.replace(/([=!:$\\/()])/g, '\\\\$1')\n}\n\n/**\n * Attach the keys as a property of the regexp.\n *\n * @param  {!RegExp} re\n * @param  {Array}   keys\n * @return {!RegExp}\n */\nfunction attachKeys (re, keys) {\n  re.keys = keys\n  return re\n}\n\n/**\n * Get the flags for a regexp from the options.\n *\n * @param  {Object} options\n * @return {string}\n */\nfunction flags (options) {\n  return options && options.sensitive ? '' : 'i'\n}\n\n/**\n * Pull out keys from a regexp.\n *\n * @param  {!RegExp} path\n * @param  {!Array}  keys\n * @return {!RegExp}\n */\nfunction regexpToRegexp (path, keys) {\n  // Use a negative lookahead to match only capturing groups.\n  var groups = path.source.match(/\\((?!\\?)/g)\n\n  if (groups) {\n    for (var i = 0; i < groups.length; i++) {\n      keys.push({\n        name: i,\n        prefix: null,\n        delimiter: null,\n        optional: false,\n        repeat: false,\n        partial: false,\n        asterisk: false,\n        pattern: null\n      })\n    }\n  }\n\n  return attachKeys(path, keys)\n}\n\n/**\n * Transform an array into a regexp.\n *\n * @param  {!Array}  path\n * @param  {Array}   keys\n * @param  {!Object} options\n * @return {!RegExp}\n */\nfunction arrayToRegexp (path, keys, options) {\n  var parts = []\n\n  for (var i = 0; i < path.length; i++) {\n    parts.push(pathToRegexp(path[i], keys, options).source)\n  }\n\n  var regexp = new RegExp('(?:' + parts.join('|') + ')', flags(options))\n\n  return attachKeys(regexp, keys)\n}\n\n/**\n * Create a path regexp from string input.\n *\n * @param  {string}  path\n * @param  {!Array}  keys\n * @param  {!Object} options\n * @return {!RegExp}\n */\nfunction stringToRegexp (path, keys, options) {\n  return tokensToRegExp(parse(path, options), keys, options)\n}\n\n/**\n * Expose a function for taking tokens and returning a RegExp.\n *\n * @param  {!Array}          tokens\n * @param  {(Array|Object)=} keys\n * @param  {Object=}         options\n * @return {!RegExp}\n */\nfunction tokensToRegExp (tokens, keys, options) {\n  if (!isarray(keys)) {\n    options = /** @type {!Object} */ (keys || options)\n    keys = []\n  }\n\n  options = options || {}\n\n  var strict = options.strict\n  var end = options.end !== false\n  var route = ''\n\n  // Iterate over the tokens and create our regexp string.\n  for (var i = 0; i < tokens.length; i++) {\n    var token = tokens[i]\n\n    if (typeof token === 'string') {\n      route += escapeString(token)\n    } else {\n      var prefix = escapeString(token.prefix)\n      var capture = '(?:' + token.pattern + ')'\n\n      keys.push(token)\n\n      if (token.repeat) {\n        capture += '(?:' + prefix + capture + ')*'\n      }\n\n      if (token.optional) {\n        if (!token.partial) {\n          capture = '(?:' + prefix + '(' + capture + '))?'\n        } else {\n          capture = prefix + '(' + capture + ')?'\n        }\n      } else {\n        capture = prefix + '(' + capture + ')'\n      }\n\n      route += capture\n    }\n  }\n\n  var delimiter = escapeString(options.delimiter || '/')\n  var endsWithDelimiter = route.slice(-delimiter.length) === delimiter\n\n  // In non-strict mode we allow a slash at the end of match. If the path to\n  // match already ends with a slash, we remove it for consistency. The slash\n  // is valid at the end of a path match, not in the middle. This is important\n  // in non-ending mode, where \"/test/\" shouldn't match \"/test//route\".\n  if (!strict) {\n    route = (endsWithDelimiter ? route.slice(0, -delimiter.length) : route) + '(?:' + delimiter + '(?=$))?'\n  }\n\n  if (end) {\n    route += '$'\n  } else {\n    // In non-ending mode, we need the capturing groups to match as much as\n    // possible by using a positive lookahead to the end or next path segment.\n    route += strict && endsWithDelimiter ? '' : '(?=' + delimiter + '|$)'\n  }\n\n  return attachKeys(new RegExp('^' + route, flags(options)), keys)\n}\n\n/**\n * Normalize the given path string, returning a regular expression.\n *\n * An empty array can be passed in for the keys, which will hold the\n * placeholder key descriptions. For example, using `/user/:id`, `keys` will\n * contain `[{ name: 'id', delimiter: '/', optional: false, repeat: false }]`.\n *\n * @param  {(string|RegExp|Array)} path\n * @param  {(Array|Object)=}       keys\n * @param  {Object=}               options\n * @return {!RegExp}\n */\nfunction pathToRegexp (path, keys, options) {\n  if (!isarray(keys)) {\n    options = /** @type {!Object} */ (keys || options)\n    keys = []\n  }\n\n  options = options || {}\n\n  if (path instanceof RegExp) {\n    return regexpToRegexp(path, /** @type {!Array} */ (keys))\n  }\n\n  if (isarray(path)) {\n    return arrayToRegexp(/** @type {!Array} */ (path), /** @type {!Array} */ (keys), options)\n  }\n\n  return stringToRegexp(/** @type {string} */ (path), /** @type {!Array} */ (keys), options)\n}\n","'use strict';\nmodule.exports = {\n\tstdout: false,\n\tstderr: false\n};\n","(function (global, factory) {\n\ttypeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :\n\ttypeof define === 'function' && define.amd ? define(factory) :\n\t(global.typeDetect = factory());\n}(this, (function () { 'use strict';\n\n/* !\n * type-detect\n * Copyright(c) 2013 jake luer <jake@alogicalparadox.com>\n * MIT Licensed\n */\nvar promiseExists = typeof Promise === 'function';\n\n/* eslint-disable no-undef */\nvar globalObject = typeof self === 'object' ? self : global; // eslint-disable-line id-blacklist\n\nvar symbolExists = typeof Symbol !== 'undefined';\nvar mapExists = typeof Map !== 'undefined';\nvar setExists = typeof Set !== 'undefined';\nvar weakMapExists = typeof WeakMap !== 'undefined';\nvar weakSetExists = typeof WeakSet !== 'undefined';\nvar dataViewExists = typeof DataView !== 'undefined';\nvar symbolIteratorExists = symbolExists && typeof Symbol.iterator !== 'undefined';\nvar symbolToStringTagExists = symbolExists && typeof Symbol.toStringTag !== 'undefined';\nvar setEntriesExists = setExists && typeof Set.prototype.entries === 'function';\nvar mapEntriesExists = mapExists && typeof Map.prototype.entries === 'function';\nvar setIteratorPrototype = setEntriesExists && Object.getPrototypeOf(new Set().entries());\nvar mapIteratorPrototype = mapEntriesExists && Object.getPrototypeOf(new Map().entries());\nvar arrayIteratorExists = symbolIteratorExists && typeof Array.prototype[Symbol.iterator] === 'function';\nvar arrayIteratorPrototype = arrayIteratorExists && Object.getPrototypeOf([][Symbol.iterator]());\nvar stringIteratorExists = symbolIteratorExists && typeof String.prototype[Symbol.iterator] === 'function';\nvar stringIteratorPrototype = stringIteratorExists && Object.getPrototypeOf(''[Symbol.iterator]());\nvar toStringLeftSliceLength = 8;\nvar toStringRightSliceLength = -1;\n/**\n * ### typeOf (obj)\n *\n * Uses `Object.prototype.toString` to determine the type of an object,\n * normalising behaviour across engine versions & well optimised.\n *\n * @param {Mixed} object\n * @return {String} object type\n * @api public\n */\nfunction typeDetect(obj) {\n  /* ! Speed optimisation\n   * Pre:\n   *   string literal     x 3,039,035 ops/sec ±1.62% (78 runs sampled)\n   *   boolean literal    x 1,424,138 ops/sec ±4.54% (75 runs sampled)\n   *   number literal     x 1,653,153 ops/sec ±1.91% (82 runs sampled)\n   *   undefined          x 9,978,660 ops/sec ±1.92% (75 runs sampled)\n   *   function           x 2,556,769 ops/sec ±1.73% (77 runs sampled)\n   * Post:\n   *   string literal     x 38,564,796 ops/sec ±1.15% (79 runs sampled)\n   *   boolean literal    x 31,148,940 ops/sec ±1.10% (79 runs sampled)\n   *   number literal     x 32,679,330 ops/sec ±1.90% (78 runs sampled)\n   *   undefined          x 32,363,368 ops/sec ±1.07% (82 runs sampled)\n   *   function           x 31,296,870 ops/sec ±0.96% (83 runs sampled)\n   */\n  var typeofObj = typeof obj;\n  if (typeofObj !== 'object') {\n    return typeofObj;\n  }\n\n  /* ! Speed optimisation\n   * Pre:\n   *   null               x 28,645,765 ops/sec ±1.17% (82 runs sampled)\n   * Post:\n   *   null               x 36,428,962 ops/sec ±1.37% (84 runs sampled)\n   */\n  if (obj === null) {\n    return 'null';\n  }\n\n  /* ! Spec Conformance\n   * Test: `Object.prototype.toString.call(window)``\n   *  - Node === \"[object global]\"\n   *  - Chrome === \"[object global]\"\n   *  - Firefox === \"[object Window]\"\n   *  - PhantomJS === \"[object Window]\"\n   *  - Safari === \"[object Window]\"\n   *  - IE 11 === \"[object Window]\"\n   *  - IE Edge === \"[object Window]\"\n   * Test: `Object.prototype.toString.call(this)``\n   *  - Chrome Worker === \"[object global]\"\n   *  - Firefox Worker === \"[object DedicatedWorkerGlobalScope]\"\n   *  - Safari Worker === \"[object DedicatedWorkerGlobalScope]\"\n   *  - IE 11 Worker === \"[object WorkerGlobalScope]\"\n   *  - IE Edge Worker === \"[object WorkerGlobalScope]\"\n   */\n  if (obj === globalObject) {\n    return 'global';\n  }\n\n  /* ! Speed optimisation\n   * Pre:\n   *   array literal      x 2,888,352 ops/sec ±0.67% (82 runs sampled)\n   * Post:\n   *   array literal      x 22,479,650 ops/sec ±0.96% (81 runs sampled)\n   */\n  if (\n    Array.isArray(obj) &&\n    (symbolToStringTagExists === false || !(Symbol.toStringTag in obj))\n  ) {\n    return 'Array';\n  }\n\n  // Not caching existence of `window` and related properties due to potential\n  // for `window` to be unset before tests in quasi-browser environments.\n  if (typeof window === 'object' && window !== null) {\n    /* ! Spec Conformance\n     * (https://html.spec.whatwg.org/multipage/browsers.html#location)\n     * WhatWG HTML$7.7.3 - The `Location` interface\n     * Test: `Object.prototype.toString.call(window.location)``\n     *  - IE <=11 === \"[object Object]\"\n     *  - IE Edge <=13 === \"[object Object]\"\n     */\n    if (typeof window.location === 'object' && obj === window.location) {\n      return 'Location';\n    }\n\n    /* ! Spec Conformance\n     * (https://html.spec.whatwg.org/#document)\n     * WhatWG HTML$3.1.1 - The `Document` object\n     * Note: Most browsers currently adher to the W3C DOM Level 2 spec\n     *       (https://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-26809268)\n     *       which suggests that browsers should use HTMLTableCellElement for\n     *       both TD and TH elements. WhatWG separates these.\n     *       WhatWG HTML states:\n     *         > For historical reasons, Window objects must also have a\n     *         > writable, configurable, non-enumerable property named\n     *         > HTMLDocument whose value is the Document interface object.\n     * Test: `Object.prototype.toString.call(document)``\n     *  - Chrome === \"[object HTMLDocument]\"\n     *  - Firefox === \"[object HTMLDocument]\"\n     *  - Safari === \"[object HTMLDocument]\"\n     *  - IE <=10 === \"[object Document]\"\n     *  - IE 11 === \"[object HTMLDocument]\"\n     *  - IE Edge <=13 === \"[object HTMLDocument]\"\n     */\n    if (typeof window.document === 'object' && obj === window.document) {\n      return 'Document';\n    }\n\n    if (typeof window.navigator === 'object') {\n      /* ! Spec Conformance\n       * (https://html.spec.whatwg.org/multipage/webappapis.html#mimetypearray)\n       * WhatWG HTML$8.6.1.5 - Plugins - Interface MimeTypeArray\n       * Test: `Object.prototype.toString.call(navigator.mimeTypes)``\n       *  - IE <=10 === \"[object MSMimeTypesCollection]\"\n       */\n      if (typeof window.navigator.mimeTypes === 'object' &&\n          obj === window.navigator.mimeTypes) {\n        return 'MimeTypeArray';\n      }\n\n      /* ! Spec Conformance\n       * (https://html.spec.whatwg.org/multipage/webappapis.html#pluginarray)\n       * WhatWG HTML$8.6.1.5 - Plugins - Interface PluginArray\n       * Test: `Object.prototype.toString.call(navigator.plugins)``\n       *  - IE <=10 === \"[object MSPluginsCollection]\"\n       */\n      if (typeof window.navigator.plugins === 'object' &&\n          obj === window.navigator.plugins) {\n        return 'PluginArray';\n      }\n    }\n\n    if ((typeof window.HTMLElement === 'function' ||\n        typeof window.HTMLElement === 'object') &&\n        obj instanceof window.HTMLElement) {\n      /* ! Spec Conformance\n      * (https://html.spec.whatwg.org/multipage/webappapis.html#pluginarray)\n      * WhatWG HTML$4.4.4 - The `blockquote` element - Interface `HTMLQuoteElement`\n      * Test: `Object.prototype.toString.call(document.createElement('blockquote'))``\n      *  - IE <=10 === \"[object HTMLBlockElement]\"\n      */\n      if (obj.tagName === 'BLOCKQUOTE') {\n        return 'HTMLQuoteElement';\n      }\n\n      /* ! Spec Conformance\n       * (https://html.spec.whatwg.org/#htmltabledatacellelement)\n       * WhatWG HTML$4.9.9 - The `td` element - Interface `HTMLTableDataCellElement`\n       * Note: Most browsers currently adher to the W3C DOM Level 2 spec\n       *       (https://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-82915075)\n       *       which suggests that browsers should use HTMLTableCellElement for\n       *       both TD and TH elements. WhatWG separates these.\n       * Test: Object.prototype.toString.call(document.createElement('td'))\n       *  - Chrome === \"[object HTMLTableCellElement]\"\n       *  - Firefox === \"[object HTMLTableCellElement]\"\n       *  - Safari === \"[object HTMLTableCellElement]\"\n       */\n      if (obj.tagName === 'TD') {\n        return 'HTMLTableDataCellElement';\n      }\n\n      /* ! Spec Conformance\n       * (https://html.spec.whatwg.org/#htmltableheadercellelement)\n       * WhatWG HTML$4.9.9 - The `td` element - Interface `HTMLTableHeaderCellElement`\n       * Note: Most browsers currently adher to the W3C DOM Level 2 spec\n       *       (https://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-82915075)\n       *       which suggests that browsers should use HTMLTableCellElement for\n       *       both TD and TH elements. WhatWG separates these.\n       * Test: Object.prototype.toString.call(document.createElement('th'))\n       *  - Chrome === \"[object HTMLTableCellElement]\"\n       *  - Firefox === \"[object HTMLTableCellElement]\"\n       *  - Safari === \"[object HTMLTableCellElement]\"\n       */\n      if (obj.tagName === 'TH') {\n        return 'HTMLTableHeaderCellElement';\n      }\n    }\n  }\n\n  /* ! Speed optimisation\n  * Pre:\n  *   Float64Array       x 625,644 ops/sec ±1.58% (80 runs sampled)\n  *   Float32Array       x 1,279,852 ops/sec ±2.91% (77 runs sampled)\n  *   Uint32Array        x 1,178,185 ops/sec ±1.95% (83 runs sampled)\n  *   Uint16Array        x 1,008,380 ops/sec ±2.25% (80 runs sampled)\n  *   Uint8Array         x 1,128,040 ops/sec ±2.11% (81 runs sampled)\n  *   Int32Array         x 1,170,119 ops/sec ±2.88% (80 runs sampled)\n  *   Int16Array         x 1,176,348 ops/sec ±5.79% (86 runs sampled)\n  *   Int8Array          x 1,058,707 ops/sec ±4.94% (77 runs sampled)\n  *   Uint8ClampedArray  x 1,110,633 ops/sec ±4.20% (80 runs sampled)\n  * Post:\n  *   Float64Array       x 7,105,671 ops/sec ±13.47% (64 runs sampled)\n  *   Float32Array       x 5,887,912 ops/sec ±1.46% (82 runs sampled)\n  *   Uint32Array        x 6,491,661 ops/sec ±1.76% (79 runs sampled)\n  *   Uint16Array        x 6,559,795 ops/sec ±1.67% (82 runs sampled)\n  *   Uint8Array         x 6,463,966 ops/sec ±1.43% (85 runs sampled)\n  *   Int32Array         x 5,641,841 ops/sec ±3.49% (81 runs sampled)\n  *   Int16Array         x 6,583,511 ops/sec ±1.98% (80 runs sampled)\n  *   Int8Array          x 6,606,078 ops/sec ±1.74% (81 runs sampled)\n  *   Uint8ClampedArray  x 6,602,224 ops/sec ±1.77% (83 runs sampled)\n  */\n  var stringTag = (symbolToStringTagExists && obj[Symbol.toStringTag]);\n  if (typeof stringTag === 'string') {\n    return stringTag;\n  }\n\n  var objPrototype = Object.getPrototypeOf(obj);\n  /* ! Speed optimisation\n  * Pre:\n  *   regex literal      x 1,772,385 ops/sec ±1.85% (77 runs sampled)\n  *   regex constructor  x 2,143,634 ops/sec ±2.46% (78 runs sampled)\n  * Post:\n  *   regex literal      x 3,928,009 ops/sec ±0.65% (78 runs sampled)\n  *   regex constructor  x 3,931,108 ops/sec ±0.58% (84 runs sampled)\n  */\n  if (objPrototype === RegExp.prototype) {\n    return 'RegExp';\n  }\n\n  /* ! Speed optimisation\n  * Pre:\n  *   date               x 2,130,074 ops/sec ±4.42% (68 runs sampled)\n  * Post:\n  *   date               x 3,953,779 ops/sec ±1.35% (77 runs sampled)\n  */\n  if (objPrototype === Date.prototype) {\n    return 'Date';\n  }\n\n  /* ! Spec Conformance\n   * (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-promise.prototype-@@tostringtag)\n   * ES6$25.4.5.4 - Promise.prototype[@@toStringTag] should be \"Promise\":\n   * Test: `Object.prototype.toString.call(Promise.resolve())``\n   *  - Chrome <=47 === \"[object Object]\"\n   *  - Edge <=20 === \"[object Object]\"\n   *  - Firefox 29-Latest === \"[object Promise]\"\n   *  - Safari 7.1-Latest === \"[object Promise]\"\n   */\n  if (promiseExists && objPrototype === Promise.prototype) {\n    return 'Promise';\n  }\n\n  /* ! Speed optimisation\n  * Pre:\n  *   set                x 2,222,186 ops/sec ±1.31% (82 runs sampled)\n  * Post:\n  *   set                x 4,545,879 ops/sec ±1.13% (83 runs sampled)\n  */\n  if (setExists && objPrototype === Set.prototype) {\n    return 'Set';\n  }\n\n  /* ! Speed optimisation\n  * Pre:\n  *   map                x 2,396,842 ops/sec ±1.59% (81 runs sampled)\n  * Post:\n  *   map                x 4,183,945 ops/sec ±6.59% (82 runs sampled)\n  */\n  if (mapExists && objPrototype === Map.prototype) {\n    return 'Map';\n  }\n\n  /* ! Speed optimisation\n  * Pre:\n  *   weakset            x 1,323,220 ops/sec ±2.17% (76 runs sampled)\n  * Post:\n  *   weakset            x 4,237,510 ops/sec ±2.01% (77 runs sampled)\n  */\n  if (weakSetExists && objPrototype === WeakSet.prototype) {\n    return 'WeakSet';\n  }\n\n  /* ! Speed optimisation\n  * Pre:\n  *   weakmap            x 1,500,260 ops/sec ±2.02% (78 runs sampled)\n  * Post:\n  *   weakmap            x 3,881,384 ops/sec ±1.45% (82 runs sampled)\n  */\n  if (weakMapExists && objPrototype === WeakMap.prototype) {\n    return 'WeakMap';\n  }\n\n  /* ! Spec Conformance\n   * (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-dataview.prototype-@@tostringtag)\n   * ES6$24.2.4.21 - DataView.prototype[@@toStringTag] should be \"DataView\":\n   * Test: `Object.prototype.toString.call(new DataView(new ArrayBuffer(1)))``\n   *  - Edge <=13 === \"[object Object]\"\n   */\n  if (dataViewExists && objPrototype === DataView.prototype) {\n    return 'DataView';\n  }\n\n  /* ! Spec Conformance\n   * (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-%mapiteratorprototype%-@@tostringtag)\n   * ES6$23.1.5.2.2 - %MapIteratorPrototype%[@@toStringTag] should be \"Map Iterator\":\n   * Test: `Object.prototype.toString.call(new Map().entries())``\n   *  - Edge <=13 === \"[object Object]\"\n   */\n  if (mapExists && objPrototype === mapIteratorPrototype) {\n    return 'Map Iterator';\n  }\n\n  /* ! Spec Conformance\n   * (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-%setiteratorprototype%-@@tostringtag)\n   * ES6$23.2.5.2.2 - %SetIteratorPrototype%[@@toStringTag] should be \"Set Iterator\":\n   * Test: `Object.prototype.toString.call(new Set().entries())``\n   *  - Edge <=13 === \"[object Object]\"\n   */\n  if (setExists && objPrototype === setIteratorPrototype) {\n    return 'Set Iterator';\n  }\n\n  /* ! Spec Conformance\n   * (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-%arrayiteratorprototype%-@@tostringtag)\n   * ES6$22.1.5.2.2 - %ArrayIteratorPrototype%[@@toStringTag] should be \"Array Iterator\":\n   * Test: `Object.prototype.toString.call([][Symbol.iterator]())``\n   *  - Edge <=13 === \"[object Object]\"\n   */\n  if (arrayIteratorExists && objPrototype === arrayIteratorPrototype) {\n    return 'Array Iterator';\n  }\n\n  /* ! Spec Conformance\n   * (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-%stringiteratorprototype%-@@tostringtag)\n   * ES6$21.1.5.2.2 - %StringIteratorPrototype%[@@toStringTag] should be \"String Iterator\":\n   * Test: `Object.prototype.toString.call(''[Symbol.iterator]())``\n   *  - Edge <=13 === \"[object Object]\"\n   */\n  if (stringIteratorExists && objPrototype === stringIteratorPrototype) {\n    return 'String Iterator';\n  }\n\n  /* ! Speed optimisation\n  * Pre:\n  *   object from null   x 2,424,320 ops/sec ±1.67% (76 runs sampled)\n  * Post:\n  *   object from null   x 5,838,000 ops/sec ±0.99% (84 runs sampled)\n  */\n  if (objPrototype === null) {\n    return 'Object';\n  }\n\n  return Object\n    .prototype\n    .toString\n    .call(obj)\n    .slice(toStringLeftSliceLength, toStringRightSliceLength);\n}\n\nreturn typeDetect;\n\n})));\n","if (typeof Object.create === 'function') {\n  // implementation from standard node.js 'util' module\n  module.exports = function inherits(ctor, superCtor) {\n    ctor.super_ = superCtor\n    ctor.prototype = Object.create(superCtor.prototype, {\n      constructor: {\n        value: ctor,\n        enumerable: false,\n        writable: true,\n        configurable: true\n      }\n    });\n  };\n} else {\n  // old school shim for old browsers\n  module.exports = function inherits(ctor, superCtor) {\n    ctor.super_ = superCtor\n    var TempCtor = function () {}\n    TempCtor.prototype = superCtor.prototype\n    ctor.prototype = new TempCtor()\n    ctor.prototype.constructor = ctor\n  }\n}\n","module.exports = function isBuffer(arg) {\n  return arg && typeof arg === 'object'\n    && typeof arg.copy === 'function'\n    && typeof arg.fill === 'function'\n    && typeof arg.readUInt8 === 'function';\n}","// Copyright Joyent, Inc. and other Node contributors.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a\n// copy of this software and associated documentation files (the\n// \"Software\"), to deal in the Software without restriction, including\n// without limitation the rights to use, copy, modify, merge, publish,\n// distribute, sublicense, and/or sell copies of the Software, and to permit\n// persons to whom the Software is furnished to do so, subject to the\n// following conditions:\n//\n// The above copyright notice and this permission notice shall be included\n// in all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\n// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN\n// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\n// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\n// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE\n// USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nvar formatRegExp = /%[sdj%]/g;\nexports.format = function(f) {\n  if (!isString(f)) {\n    var objects = [];\n    for (var i = 0; i < arguments.length; i++) {\n      objects.push(inspect(arguments[i]));\n    }\n    return objects.join(' ');\n  }\n\n  var i = 1;\n  var args = arguments;\n  var len = args.length;\n  var str = String(f).replace(formatRegExp, function(x) {\n    if (x === '%%') return '%';\n    if (i >= len) return x;\n    switch (x) {\n      case '%s': return String(args[i++]);\n      case '%d': return Number(args[i++]);\n      case '%j':\n        try {\n          return JSON.stringify(args[i++]);\n        } catch (_) {\n          return '[Circular]';\n        }\n      default:\n        return x;\n    }\n  });\n  for (var x = args[i]; i < len; x = args[++i]) {\n    if (isNull(x) || !isObject(x)) {\n      str += ' ' + x;\n    } else {\n      str += ' ' + inspect(x);\n    }\n  }\n  return str;\n};\n\n\n// Mark that a method should not be used.\n// Returns a modified function which warns once by default.\n// If --no-deprecation is set, then it is a no-op.\nexports.deprecate = function(fn, msg) {\n  // Allow for deprecating things in the process of starting up.\n  if (isUndefined(global.process)) {\n    return function() {\n      return exports.deprecate(fn, msg).apply(this, arguments);\n    };\n  }\n\n  if (process.noDeprecation === true) {\n    return fn;\n  }\n\n  var warned = false;\n  function deprecated() {\n    if (!warned) {\n      if (process.throwDeprecation) {\n        throw new Error(msg);\n      } else if (process.traceDeprecation) {\n        console.trace(msg);\n      } else {\n        console.error(msg);\n      }\n      warned = true;\n    }\n    return fn.apply(this, arguments);\n  }\n\n  return deprecated;\n};\n\n\nvar debugs = {};\nvar debugEnviron;\nexports.debuglog = function(set) {\n  if (isUndefined(debugEnviron))\n    debugEnviron = process.env.NODE_DEBUG || '';\n  set = set.toUpperCase();\n  if (!debugs[set]) {\n    if (new RegExp('\\\\b' + set + '\\\\b', 'i').test(debugEnviron)) {\n      var pid = process.pid;\n      debugs[set] = function() {\n        var msg = exports.format.apply(exports, arguments);\n        console.error('%s %d: %s', set, pid, msg);\n      };\n    } else {\n      debugs[set] = function() {};\n    }\n  }\n  return debugs[set];\n};\n\n\n/**\n * Echos the value of a value. Trys to print the value out\n * in the best way possible given the different types.\n *\n * @param {Object} obj The object to print out.\n * @param {Object} opts Optional options object that alters the output.\n */\n/* legacy: obj, showHidden, depth, colors*/\nfunction inspect(obj, opts) {\n  // default options\n  var ctx = {\n    seen: [],\n    stylize: stylizeNoColor\n  };\n  // legacy...\n  if (arguments.length >= 3) ctx.depth = arguments[2];\n  if (arguments.length >= 4) ctx.colors = arguments[3];\n  if (isBoolean(opts)) {\n    // legacy...\n    ctx.showHidden = opts;\n  } else if (opts) {\n    // got an \"options\" object\n    exports._extend(ctx, opts);\n  }\n  // set default options\n  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;\n  if (isUndefined(ctx.depth)) ctx.depth = 2;\n  if (isUndefined(ctx.colors)) ctx.colors = false;\n  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;\n  if (ctx.colors) ctx.stylize = stylizeWithColor;\n  return formatValue(ctx, obj, ctx.depth);\n}\nexports.inspect = inspect;\n\n\n// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics\ninspect.colors = {\n  'bold' : [1, 22],\n  'italic' : [3, 23],\n  'underline' : [4, 24],\n  'inverse' : [7, 27],\n  'white' : [37, 39],\n  'grey' : [90, 39],\n  'black' : [30, 39],\n  'blue' : [34, 39],\n  'cyan' : [36, 39],\n  'green' : [32, 39],\n  'magenta' : [35, 39],\n  'red' : [31, 39],\n  'yellow' : [33, 39]\n};\n\n// Don't use 'blue' not visible on cmd.exe\ninspect.styles = {\n  'special': 'cyan',\n  'number': 'yellow',\n  'boolean': 'yellow',\n  'undefined': 'grey',\n  'null': 'bold',\n  'string': 'green',\n  'date': 'magenta',\n  // \"name\": intentionally not styling\n  'regexp': 'red'\n};\n\n\nfunction stylizeWithColor(str, styleType) {\n  var style = inspect.styles[styleType];\n\n  if (style) {\n    return '\\u001b[' + inspect.colors[style][0] + 'm' + str +\n           '\\u001b[' + inspect.colors[style][1] + 'm';\n  } else {\n    return str;\n  }\n}\n\n\nfunction stylizeNoColor(str, styleType) {\n  return str;\n}\n\n\nfunction arrayToHash(array) {\n  var hash = {};\n\n  array.forEach(function(val, idx) {\n    hash[val] = true;\n  });\n\n  return hash;\n}\n\n\nfunction formatValue(ctx, value, recurseTimes) {\n  // Provide a hook for user-specified inspect functions.\n  // Check that value is an object with an inspect function on it\n  if (ctx.customInspect &&\n      value &&\n      isFunction(value.inspect) &&\n      // Filter out the util module, it's inspect function is special\n      value.inspect !== exports.inspect &&\n      // Also filter out any prototype objects using the circular check.\n      !(value.constructor && value.constructor.prototype === value)) {\n    var ret = value.inspect(recurseTimes, ctx);\n    if (!isString(ret)) {\n      ret = formatValue(ctx, ret, recurseTimes);\n    }\n    return ret;\n  }\n\n  // Primitive types cannot have properties\n  var primitive = formatPrimitive(ctx, value);\n  if (primitive) {\n    return primitive;\n  }\n\n  // Look up the keys of the object.\n  var keys = Object.keys(value);\n  var visibleKeys = arrayToHash(keys);\n\n  if (ctx.showHidden) {\n    keys = Object.getOwnPropertyNames(value);\n  }\n\n  // IE doesn't make error fields non-enumerable\n  // http://msdn.microsoft.com/en-us/library/ie/dww52sbt(v=vs.94).aspx\n  if (isError(value)\n      && (keys.indexOf('message') >= 0 || keys.indexOf('description') >= 0)) {\n    return formatError(value);\n  }\n\n  // Some type of object without properties can be shortcutted.\n  if (keys.length === 0) {\n    if (isFunction(value)) {\n      var name = value.name ? ': ' + value.name : '';\n      return ctx.stylize('[Function' + name + ']', 'special');\n    }\n    if (isRegExp(value)) {\n      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');\n    }\n    if (isDate(value)) {\n      return ctx.stylize(Date.prototype.toString.call(value), 'date');\n    }\n    if (isError(value)) {\n      return formatError(value);\n    }\n  }\n\n  var base = '', array = false, braces = ['{', '}'];\n\n  // Make Array say that they are Array\n  if (isArray(value)) {\n    array = true;\n    braces = ['[', ']'];\n  }\n\n  // Make functions say that they are functions\n  if (isFunction(value)) {\n    var n = value.name ? ': ' + value.name : '';\n    base = ' [Function' + n + ']';\n  }\n\n  // Make RegExps say that they are RegExps\n  if (isRegExp(value)) {\n    base = ' ' + RegExp.prototype.toString.call(value);\n  }\n\n  // Make dates with properties first say the date\n  if (isDate(value)) {\n    base = ' ' + Date.prototype.toUTCString.call(value);\n  }\n\n  // Make error with message first say the error\n  if (isError(value)) {\n    base = ' ' + formatError(value);\n  }\n\n  if (keys.length === 0 && (!array || value.length == 0)) {\n    return braces[0] + base + braces[1];\n  }\n\n  if (recurseTimes < 0) {\n    if (isRegExp(value)) {\n      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');\n    } else {\n      return ctx.stylize('[Object]', 'special');\n    }\n  }\n\n  ctx.seen.push(value);\n\n  var output;\n  if (array) {\n    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);\n  } else {\n    output = keys.map(function(key) {\n      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);\n    });\n  }\n\n  ctx.seen.pop();\n\n  return reduceToSingleString(output, base, braces);\n}\n\n\nfunction formatPrimitive(ctx, value) {\n  if (isUndefined(value))\n    return ctx.stylize('undefined', 'undefined');\n  if (isString(value)) {\n    var simple = '\\'' + JSON.stringify(value).replace(/^\"|\"$/g, '')\n                                             .replace(/'/g, \"\\\\'\")\n                                             .replace(/\\\\\"/g, '\"') + '\\'';\n    return ctx.stylize(simple, 'string');\n  }\n  if (isNumber(value))\n    return ctx.stylize('' + value, 'number');\n  if (isBoolean(value))\n    return ctx.stylize('' + value, 'boolean');\n  // For some reason typeof null is \"object\", so special case here.\n  if (isNull(value))\n    return ctx.stylize('null', 'null');\n}\n\n\nfunction formatError(value) {\n  return '[' + Error.prototype.toString.call(value) + ']';\n}\n\n\nfunction formatArray(ctx, value, recurseTimes, visibleKeys, keys) {\n  var output = [];\n  for (var i = 0, l = value.length; i < l; ++i) {\n    if (hasOwnProperty(value, String(i))) {\n      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,\n          String(i), true));\n    } else {\n      output.push('');\n    }\n  }\n  keys.forEach(function(key) {\n    if (!key.match(/^\\d+$/)) {\n      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,\n          key, true));\n    }\n  });\n  return output;\n}\n\n\nfunction formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {\n  var name, str, desc;\n  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };\n  if (desc.get) {\n    if (desc.set) {\n      str = ctx.stylize('[Getter/Setter]', 'special');\n    } else {\n      str = ctx.stylize('[Getter]', 'special');\n    }\n  } else {\n    if (desc.set) {\n      str = ctx.stylize('[Setter]', 'special');\n    }\n  }\n  if (!hasOwnProperty(visibleKeys, key)) {\n    name = '[' + key + ']';\n  }\n  if (!str) {\n    if (ctx.seen.indexOf(desc.value) < 0) {\n      if (isNull(recurseTimes)) {\n        str = formatValue(ctx, desc.value, null);\n      } else {\n        str = formatValue(ctx, desc.value, recurseTimes - 1);\n      }\n      if (str.indexOf('\\n') > -1) {\n        if (array) {\n          str = str.split('\\n').map(function(line) {\n            return '  ' + line;\n          }).join('\\n').substr(2);\n        } else {\n          str = '\\n' + str.split('\\n').map(function(line) {\n            return '   ' + line;\n          }).join('\\n');\n        }\n      }\n    } else {\n      str = ctx.stylize('[Circular]', 'special');\n    }\n  }\n  if (isUndefined(name)) {\n    if (array && key.match(/^\\d+$/)) {\n      return str;\n    }\n    name = JSON.stringify('' + key);\n    if (name.match(/^\"([a-zA-Z_][a-zA-Z_0-9]*)\"$/)) {\n      name = name.substr(1, name.length - 2);\n      name = ctx.stylize(name, 'name');\n    } else {\n      name = name.replace(/'/g, \"\\\\'\")\n                 .replace(/\\\\\"/g, '\"')\n                 .replace(/(^\"|\"$)/g, \"'\");\n      name = ctx.stylize(name, 'string');\n    }\n  }\n\n  return name + ': ' + str;\n}\n\n\nfunction reduceToSingleString(output, base, braces) {\n  var numLinesEst = 0;\n  var length = output.reduce(function(prev, cur) {\n    numLinesEst++;\n    if (cur.indexOf('\\n') >= 0) numLinesEst++;\n    return prev + cur.replace(/\\u001b\\[\\d\\d?m/g, '').length + 1;\n  }, 0);\n\n  if (length > 60) {\n    return braces[0] +\n           (base === '' ? '' : base + '\\n ') +\n           ' ' +\n           output.join(',\\n  ') +\n           ' ' +\n           braces[1];\n  }\n\n  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];\n}\n\n\n// NOTE: These type checking functions intentionally don't use `instanceof`\n// because it is fragile and can be easily faked with `Object.create()`.\nfunction isArray(ar) {\n  return Array.isArray(ar);\n}\nexports.isArray = isArray;\n\nfunction isBoolean(arg) {\n  return typeof arg === 'boolean';\n}\nexports.isBoolean = isBoolean;\n\nfunction isNull(arg) {\n  return arg === null;\n}\nexports.isNull = isNull;\n\nfunction isNullOrUndefined(arg) {\n  return arg == null;\n}\nexports.isNullOrUndefined = isNullOrUndefined;\n\nfunction isNumber(arg) {\n  return typeof arg === 'number';\n}\nexports.isNumber = isNumber;\n\nfunction isString(arg) {\n  return typeof arg === 'string';\n}\nexports.isString = isString;\n\nfunction isSymbol(arg) {\n  return typeof arg === 'symbol';\n}\nexports.isSymbol = isSymbol;\n\nfunction isUndefined(arg) {\n  return arg === void 0;\n}\nexports.isUndefined = isUndefined;\n\nfunction isRegExp(re) {\n  return isObject(re) && objectToString(re) === '[object RegExp]';\n}\nexports.isRegExp = isRegExp;\n\nfunction isObject(arg) {\n  return typeof arg === 'object' && arg !== null;\n}\nexports.isObject = isObject;\n\nfunction isDate(d) {\n  return isObject(d) && objectToString(d) === '[object Date]';\n}\nexports.isDate = isDate;\n\nfunction isError(e) {\n  return isObject(e) &&\n      (objectToString(e) === '[object Error]' || e instanceof Error);\n}\nexports.isError = isError;\n\nfunction isFunction(arg) {\n  return typeof arg === 'function';\n}\nexports.isFunction = isFunction;\n\nfunction isPrimitive(arg) {\n  return arg === null ||\n         typeof arg === 'boolean' ||\n         typeof arg === 'number' ||\n         typeof arg === 'string' ||\n         typeof arg === 'symbol' ||  // ES6 symbol\n         typeof arg === 'undefined';\n}\nexports.isPrimitive = isPrimitive;\n\nexports.isBuffer = require('./support/isBuffer');\n\nfunction objectToString(o) {\n  return Object.prototype.toString.call(o);\n}\n\n\nfunction pad(n) {\n  return n < 10 ? '0' + n.toString(10) : n.toString(10);\n}\n\n\nvar months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',\n              'Oct', 'Nov', 'Dec'];\n\n// 26 Feb 16:19:34\nfunction timestamp() {\n  var d = new Date();\n  var time = [pad(d.getHours()),\n              pad(d.getMinutes()),\n              pad(d.getSeconds())].join(':');\n  return [d.getDate(), months[d.getMonth()], time].join(' ');\n}\n\n\n// log is just a thin wrapper to console.log that prepends a timestamp\nexports.log = function() {\n  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));\n};\n\n\n/**\n * Inherit the prototype methods from one constructor into another.\n *\n * The Function.prototype.inherits from lang.js rewritten as a standalone\n * function (not on Function.prototype). NOTE: If this file is to be loaded\n * during bootstrapping this function needs to be rewritten using some native\n * functions as prototype setup using normal JavaScript does not work as\n * expected during bootstrapping (see mirror.js in r114903).\n *\n * @param {function} ctor Constructor function which needs to inherit the\n *     prototype.\n * @param {function} superCtor Constructor function to inherit prototype from.\n */\nexports.inherits = require('inherits');\n\nexports._extend = function(origin, add) {\n  // Don't do anything if add isn't an object\n  if (!add || !isObject(add)) return origin;\n\n  var keys = Object.keys(add);\n  var i = keys.length;\n  while (i--) {\n    origin[keys[i]] = add[keys[i]];\n  }\n  return origin;\n};\n\nfunction hasOwnProperty(obj, prop) {\n  return Object.prototype.hasOwnProperty.call(obj, prop);\n}\n"]}
diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg
index 343b5b6abc..0ffba1b76e 100644
--- a/vendor/assets/svg-icons/discourse-additional.svg
+++ b/vendor/assets/svg-icons/discourse-additional.svg
@@ -27,4 +27,9 @@ 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 Amazon" icon from svgrepo.com, with a brand-colored arrow -->
+  <symbol id='discourse-amazon' viewBox="0 0 291 291">
+    <path style="fill:#ff8a24;" d="M252.089,239.901c-120.033,57.126-194.528,9.331-242.214-19.7c-2.95-1.83-7.966,0.428-3.614,5.426 c15.886,19.263,67.95,65.692,135.909,65.692c68.005,0,108.462-37.107,113.523-43.58 C260.719,241.321,257.169,237.78,252.089,239.901z M285.8,221.284c-3.223-4.197-19.6-4.98-29.906-3.714 c-10.324,1.229-25.818,7.538-24.471,11.325c0.692,1.42,2.103,0.783,9.195,0.146c7.11-0.71,27.029-3.223,31.18,2.203 c4.17,5.462-6.354,31.49-8.275,35.687c-1.857,4.197,0.71,5.28,4.197,2.485c3.441-2.795,9.668-10.032,13.847-20.274 C285.718,238.845,288.249,224.479,285.8,221.284z"/>
+    <path d="M221.71,149.219V53.557C221.71,37.125,205.815,0,148.689,0C91.572,0,61.184,35.696,61.184,67.85 l47.74,4.27c0,0,10.633-32.136,35.313-32.136s22.987,19.992,22.987,24.316v20.784C135.607,86.149,57.096,95.18,57.096,161.382 c0,71.191,89.863,74.177,119.332,28.167c1.138,1.866,2.431,3.696,4.051,5.408c10.843,11.398,25.308,24.981,25.308,24.981 l36.852-36.415C242.658,183.513,221.71,167.071,221.71,149.219z M112.511,152.578c0-30.579,32.764-36.779,54.722-37.507v26.319 C167.224,193.527,112.511,185.634,112.511,152.578z"/>
+  </symbol>
 </svg>
diff --git a/vendor/assets/svg-icons/emoji.svg b/vendor/assets/svg-icons/emoji.svg
new file mode 100644
index 0000000000..9b71517693
--- /dev/null
+++ b/vendor/assets/svg-icons/emoji.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
+  <symbol overflow="visible" viewBox="0 0 216.3 152.3" id="emoji-icon">
+    <path d="M121.1 70.7c1.9 2 5.1 2.1 7.2.2l.2-.2 31.2-32.2c9.1-9.4 8.6-24.9-1.6-33.5-8.8-7.5-22-6.2-30.1 2.2l-3.2 3.3-3.2-3.3c-8.1-8.4-21.3-9.7-30.1-2.2-10.1 8.6-10.7 24.2-1.6 33.5l31.2 32.2zM53.5 45.3C23.9 45.3 0 69.2 0 98.8s23.9 53.5 53.5 53.5 53.5-24 53.5-53.5-23.9-53.5-53.5-53.5zm18.8 24.6c5.5 0 9.9 4.4 9.9 9.9s-4.4 9.9-9.9 9.9-9.9-4.4-9.9-9.9c-.1-5.5 4.4-9.9 9.9-9.9zm-38.2 0c5.5 0 9.9 4.4 9.9 9.9s-4.4 9.9-9.9 9.9-9.9-4.4-9.9-9.9 4.4-9.9 9.9-9.9zm52.4 45.4c-8.2 9.8-20.2 15.5-33.1 15.5s-24.9-5.6-33.1-15.5c-3.9-4.7 3.2-10.6 7.1-5.9 6.5 7.7 15.9 12.2 26 12.2s19.5-4.4 26-12.2c3.8-4.7 10.9 1.2 7.1 5.9zm129.8-22.5c0-6.4-6.3-9.5-13.3-9.5h-24c1.5-6 10.3-13.8 10.3-22.8 0-15.5-10.1-17.2-15.2-17.2-4.3 0-6.2 8.3-7.2 12.2-1.1 4.6-2.2 9.3-5.4 12.4-6.7 6.8-10.3 15.3-18.4 23.5-.7-1.8-2.6-3.1-4.7-3.1h-10.7c-2.8 0-5.1 2.2-5.1 4.9V142c0 2.7 2.3 4.9 5.1 4.9h10.7c2.8 0 5.1-2.2 5.1-4.9v-.9c.3.1.6.2.9.2 3.3.1 7.8 1.9 11.1 3.4 6.7 3 15.1 6.7 25.3 6.7h.6c9 0 19.7-.1 24-6.3 1.8-2.5 2.7-4.4.5-9.9 5-3 7-10 1-15 8-5 8-13 1-17 6.1-1.9 8.5-6.6 8.4-10.4z"></path>
+  </symbol>
+</svg>
diff --git a/yarn.lock b/yarn.lock
index 483c5a306c..c207206175 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14,6 +14,13 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
+"@babel/code-frame@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
+  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
+  dependencies:
+    "@babel/highlight" "^7.12.13"
+
 "@babel/generator@^7.11.5":
   version "7.11.6"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620"
@@ -23,6 +30,26 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.0.tgz#bd00d4394ca22f220390c56a0b5b85568ec1ec0c"
+  integrity sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==
+  dependencies:
+    "@babel/types" "^7.13.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/helper-create-class-features-plugin@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.0.tgz#28d04ad9cfbd1ed1d8b988c9ea7b945263365846"
+  integrity sha512-twwzhthM4/+6o9766AW2ZBHpIHPSGrPGk1+WfHiu13u/lBnggXGNYCpeAyVfNwGDKfkhEDp+WOD/xafoJ2iLjA==
+  dependencies:
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-member-expression-to-functions" "^7.13.0"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+
 "@babel/helper-function-name@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
@@ -32,6 +59,15 @@
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
+"@babel/helper-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
+  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-get-function-arity@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
@@ -39,6 +75,42 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
+"@babel/helper-get-function-arity@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
+  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-member-expression-to-functions@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091"
+  integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==
+  dependencies:
+    "@babel/types" "^7.13.0"
+
+"@babel/helper-optimise-call-expression@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
+  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-plugin-utils@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
+  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
+
+"@babel/helper-replace-supers@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24"
+  integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.13.0"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
 "@babel/helper-split-export-declaration@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
@@ -46,11 +118,23 @@
   dependencies:
     "@babel/types" "^7.11.0"
 
+"@babel/helper-split-export-declaration@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
+  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-validator-identifier@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
   integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
+"@babel/helper-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+
 "@babel/highlight@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
@@ -60,11 +144,33 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c"
+  integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.10.4", "@babel/parser@^7.11.5", "@babel/parser@^7.7.0":
   version "7.11.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
   integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
 
+"@babel/parser@^7.12.13", "@babel/parser@^7.13.0":
+  version "7.13.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.4.tgz#340211b0da94a351a6f10e63671fa727333d13ab"
+  integrity sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==
+
+"@babel/plugin-proposal-class-properties@^7.10.4":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37"
+  integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
 "@babel/template@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
@@ -74,6 +180,30 @@
     "@babel/parser" "^7.10.4"
     "@babel/types" "^7.10.4"
 
+"@babel/template@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
+  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/parser" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
+"@babel/traverse@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc"
+  integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.0"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.13.0"
+    "@babel/types" "^7.13.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.19"
+
 "@babel/traverse@^7.7.0":
   version "7.11.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3"
@@ -98,6 +228,15 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.12.13", "@babel/types@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80"
+  integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    lodash "^4.17.19"
+    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"
@@ -147,6 +286,31 @@
     "@glimmer/interfaces" "^0.54.2"
     "@simple-dom/interface" "^1.4.0"
 
+"@highlightjs/cdn-assets@^10.6.0":
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/@highlightjs/cdn-assets/-/cdn-assets-10.6.0.tgz#ec1404662cd20ed3de4e918d952f01af6350d5d0"
+  integrity sha512-u1nkZi2HRsZ3FuvnafUxhv6Bk3tyXboG4F0SE+QQJk+GhAxRQaENPMdZ6zVVQg6Vsv9r23VyWJLo4Vnw72NIxQ==
+
+"@json-editor/json-editor@^2.5.2":
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/@json-editor/json-editor/-/json-editor-2.5.2.tgz#d6f348d7e2f5bf9ccf2e3b34f637143674265e7f"
+  integrity sha512-OqrPtRw8FM2mSZbAFFvvxW6j8JvXCoQbhMgSiryhmcoByh3tQk+PuhK+2+bk9K/zn9PAt9KQsAiSc9sv6WIr/A==
+  dependencies:
+    core-js "^3.6.5"
+
+"@mixer/parallel-prettier@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@mixer/parallel-prettier/-/parallel-prettier-2.0.1.tgz#fd69bb55e38b3c1dbb2f1a534ea1a0cd3fe34946"
+  integrity sha512-bx/rdOhJ2EOxQTm4cQQBsdbg+IwaQHh/ugIZMsWNEILXLJWQukCv+6fDUBZkoIk/zEoW45uIrCugARCuuDwrWw==
+  dependencies:
+    chalk "^4.1.0"
+    commander "^7.0.0"
+    glob-stream "^6.1.0"
+    ignore "^5.1.8"
+    ora "^5.3.0"
+    prettier "^2.0.4"
+    rxjs "^6.6.3"
+
 "@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"
@@ -394,6 +558,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@@ -407,6 +576,15 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
+bl@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
+  integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
 blueimp-canvas-to-blob@3:
   version "3.28.0"
   resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.28.0.tgz#c8ab4dc6bb08774a7f273798cdf94b0776adf6c8"
@@ -489,6 +667,14 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
+buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -564,10 +750,10 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chart.js@2.9.3:
-  version "2.9.3"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.3.tgz#ae3884114dafd381bc600f5b35a189138aac1ef7"
-  integrity sha512-+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw==
+chart.js@2.9.4:
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684"
+  integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==
   dependencies:
     chartjs-color "^2.1.0"
     moment "^2.10.2"
@@ -633,6 +819,11 @@ cli-spinners@^2.2.0:
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f"
   integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==
 
+cli-spinners@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.5.0.tgz#12763e47251bf951cb75c201dfa58ff1bcb2d047"
+  integrity sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==
+
 cli-width@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
@@ -720,6 +911,11 @@ commander@^5.1.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
   integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
 
+commander@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2"
+  integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==
+
 component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
@@ -745,6 +941,11 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
+core-js@^3.6.5:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.0.tgz#790b1bb11553a2272b36e2625c7179db345492f8"
+  integrity sha512-PyFBJaLq93FlyYdsndE5VaueA9K5cNB7CGzeCj191YYLhkQM0gdZR2SKihM70oF0wdqKSKClv/tEBOpoRmdOVQ==
+
 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"
@@ -836,6 +1037,13 @@ diff@^4.0.2:
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
+diffhtml@^1.0.0-beta.18:
+  version "1.0.0-beta.18"
+  resolved "https://registry.yarnpkg.com/diffhtml/-/diffhtml-1.0.0-beta.18.tgz#b5255f6eb9e358fa279b423ea7d168b061a9146d"
+  integrity sha512-DEsiAiSNxTE7vTpfRtT4SPm1cxQRahIbzvLXNKquOh95+BQOS24IGX6s7sJihYgk7XN6cYy2xqMwO+pEDWGtpg==
+  dependencies:
+    "@babel/plugin-proposal-class-properties" "^7.10.4"
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -850,6 +1058,16 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.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"
+
 ember-rfc176-data@^0.3.11:
   version "0.3.15"
   resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.15.tgz#af3f1da5a0339b6feda380edc2f7190e0f416c2d"
@@ -901,7 +1119,7 @@ emoji-regex@^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:
+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==
@@ -935,10 +1153,10 @@ 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.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.5.tgz#29e274eeccd3071d86aaa9333c6550ceeb23b1cd"
-  integrity sha512-/2DgKfIAKRHP+ktNvYCvK2z0NVmgpMe4le1HcrXtj0EzRswqsUN1kbaU81X3cnG4iEuKxyf0n0Hp+2kHuneatg==
+eslint-config-discourse@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.8.tgz#c297831876811ea08203aa348d1ba2a963b2ae78"
+  integrity sha512-ZSQfhliiO5Cfa7WcKoMkN4wW/1rBJpecpMJpfjiFsElfgPj4EV4Pzksi5CvFnRbJDoZh6DYYrQfO+tW062VOUA==
   dependencies:
     babel-eslint "^10.1.0"
     ember-template-lint "^2.11.0"
@@ -948,7 +1166,7 @@ eslint-config-discourse@^1.1.5:
     eslint-plugin-ember "^6.10.0"
     eslint-plugin-lodash "^7.1.0"
     eslint-plugin-node "^8.0.0"
-    prettier "2.1.2"
+    prettier "2.2.1"
 
 eslint-plugin-discourse-ember@latest:
   version "0.0.3"
@@ -1155,6 +1373,11 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
+extend@^3.0.0:
+  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"
@@ -1356,6 +1579,14 @@ 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=
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
 glob-parent@^5.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"
@@ -1363,6 +1594,22 @@ glob-parent@^5.0.0, glob-parent@^5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
+glob-stream@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
+  integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=
+  dependencies:
+    extend "^3.0.0"
+    glob "^7.1.1"
+    glob-parent "^3.1.0"
+    is-negated-glob "^1.0.0"
+    ordered-read-streams "^1.0.0"
+    pumpify "^1.3.5"
+    readable-stream "^2.1.5"
+    remove-trailing-separator "^1.0.1"
+    to-absolute-glob "^2.0.0"
+    unique-stream "^2.0.2"
+
 glob@7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
@@ -1375,7 +1622,7 @@ glob@7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.3:
+glob@^7.1.1, glob@^7.1.3:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -1436,10 +1683,10 @@ google-closure-compiler@20150901.x:
   resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20150901.0.0.tgz#3d01c6cade65790a9bfb4e30b2158b7635acbade"
   integrity sha1-PQHGyt5leQqb+04wshWLdjWsut4=
 
-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==
+handlebars@^4.7.4, handlebars@^4.7.7:
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
+  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
   dependencies:
     minimist "^1.2.5"
     neo-async "^2.6.0"
@@ -1489,10 +1736,6 @@ 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.2.1"
-  resolved "https://github.com/highlightjs/highlight.js#7942bea2dcf533574f59c00c679190591c06875d"
-
 homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -1515,12 +1758,17 @@ iconv-lite@^0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
 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.0.2, ignore@^5.1.4:
+ignore@^5.0.2, ignore@^5.1.4, ignore@^5.1.8:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
@@ -1546,15 +1794,15 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, 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==
 
 ini@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 inquirer@^7.0.0:
   version "7.3.3"
@@ -1580,6 +1828,14 @@ intersection-observer@^0.5.1:
   resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.5.1.tgz#e340fc56ce74290fe2b2394d1ce88c4353ac6dfa"
   integrity sha512-Zd7Plneq82kiXFixs7bX62YnuZ0BMRci9br7io88LwDyF3V43cQMI+G5IiTlTNTt+LsDUppl19J/M2Fp9UkH6g==
 
+is-absolute@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
+  dependencies:
+    is-relative "^1.0.0"
+    is-windows "^1.0.1"
+
 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"
@@ -1682,6 +1938,11 @@ is-interactive@^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-negated-glob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
+  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -1701,11 +1962,25 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-relative@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
+  dependencies:
+    is-unc-path "^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-unc-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
+  dependencies:
+    unc-path-regex "^0.1.2"
+
 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"
@@ -1755,10 +2030,6 @@ jquery-color@3.0.0-alpha.1:
   resolved "https://registry.yarnpkg.com/jquery-color/-/jquery-color-3.0.0-alpha.1.tgz#0c00ed91251bac45fc4ff3143939f434ef46d188"
   integrity sha512-UjsdBsWuehWLfnXfL4JZtxGbRB2eUz6Rhn3qxBKaVR3Qwm7fQlY1y/Va0o7GzDwGJnOvYKc3H+i2k7bC1yGcJg==
 
-"jquery-resize@https://github.com/cowboy/jquery-resize/":
-  version "0.0.0"
-  resolved "https://github.com/cowboy/jquery-resize/#21ae0ec06d751a408165a1714963173c2db6adfa"
-
 jquery-tags-input@1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/jquery-tags-input/-/jquery-tags-input-1.3.5.tgz#1c89cb95c61983ad14386d30a006920476b93ed7"
@@ -1892,15 +2163,10 @@ lodash.get@^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:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-
-lodash@^4.17.14, lodash@^4.17.19:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.19:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log-symbols@^3.0.0:
   version "3.0.0"
@@ -1909,6 +2175,13 @@ log-symbols@^3.0.0:
   dependencies:
     chalk "^2.4.2"
 
+log-symbols@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
+  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
+  dependencies:
+    chalk "^4.0.0"
+
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -2224,6 +2497,27 @@ ora@^4.0.4:
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
+ora@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.3.0.tgz#fb832899d3a1372fe71c8b2c534bbfe74961bb6f"
+  integrity sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==
+  dependencies:
+    bl "^4.0.3"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.5.0"
+    is-interactive "^1.0.0"
+    log-symbols "^4.0.0"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
+ordered-read-streams@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
+  integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=
+  dependencies:
+    readable-stream "^2.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"
@@ -2284,6 +2578,11 @@ 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"
@@ -2349,10 +2648,10 @@ pretender@^1.6:
     fake-xml-http-request "^1.6.0"
     route-recognizer "^0.3.3"
 
-prettier@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
-  integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
+prettier@2.2.1, prettier@^2.0.4:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
+  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
@@ -2369,6 +2668,14 @@ proxy-from-env@^1.0.0:
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
+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"
@@ -2377,6 +2684,15 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
+pumpify@^1.3.5:
+  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@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -2409,7 +2725,7 @@ qunit@2.8.0:
     sane "^4.0.0"
     walk-sync "0.3.2"
 
-readable-stream@^2.2.2:
+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.1.5, readable-stream@^2.2.2, 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==
@@ -2422,6 +2738,15 @@ readable-stream@^2.2.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@^3.4.0:
+  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"
+
 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"
@@ -2568,7 +2893,7 @@ run-parallel@^1.1.9:
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
   integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
 
-rxjs@^6.6.0:
+rxjs@^6.6.0, rxjs@^6.6.3:
   version "6.6.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
   integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
@@ -2580,6 +2905,11 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
+safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -2774,6 +3104,11 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.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==
+
 string-width@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -2792,6 +3127,13 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.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"
@@ -2852,6 +3194,22 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
+through2-filter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
+  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
+  dependencies:
+    through2 "~2.0.0"
+    xtend "~4.0.0"
+
+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"
+
 through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -2876,6 +3234,14 @@ tmpl@1.0.x:
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
   integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
+to-absolute-glob@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
+  integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=
+  dependencies:
+    is-absolute "^1.0.0"
+    is-negated-glob "^1.0.0"
+
 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"
@@ -2975,6 +3341,11 @@ ultron@~1.1.0:
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
   integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
+unc-path-regex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
+
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -2985,6 +3356,14 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^2.0.1"
 
+unique-stream@^2.0.2:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
+  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
+  dependencies:
+    json-stable-stringify-without-jsonify "^1.0.1"
+    through2-filter "^3.0.0"
+
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -3010,7 +3389,7 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, 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=
@@ -3074,6 +3453,13 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
+workbox-cacheable-response@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz#f53e079179c095a3f19e5313b284975c91428c91"
+  integrity sha512-Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw==
+  dependencies:
+    workbox-core "^4.3.1"
+
 workbox-core@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-4.3.1.tgz#005d2c6a06a171437afd6ca2904a5727ecd73be6"
@@ -3147,10 +3533,15 @@ ws@^6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
+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==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
 yargs-parser@^18.1.2:
   version "18.1.3"